From d467dd57472ebc001ee28eb6f01d6b468702e735 Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Mon, 29 Jul 2019 06:51:44 +0300
Subject: [PATCH 0001/3722] Add simple implementation of in-game leaderboard

---
 osu.Game/Screens/Play/InGameLeaderboard.cs    |  42 ++++
 osu.Game/Screens/Play/InGameScoreContainer.cs | 206 ++++++++++++++++++
 2 files changed, 248 insertions(+)
 create mode 100644 osu.Game/Screens/Play/InGameLeaderboard.cs
 create mode 100644 osu.Game/Screens/Play/InGameScoreContainer.cs

diff --git a/osu.Game/Screens/Play/InGameLeaderboard.cs b/osu.Game/Screens/Play/InGameLeaderboard.cs
new file mode 100644
index 0000000000..c8f5cf5fd7
--- /dev/null
+++ b/osu.Game/Screens/Play/InGameLeaderboard.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 osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Users;
+
+namespace osu.Game.Screens.Play
+{
+    public class InGameLeaderboard : CompositeDrawable
+    {
+        protected readonly InGameScoreContainer ScoresContainer;
+
+        public readonly BindableDouble PlayerCurrentScore = new BindableDouble();
+
+        private bool playerItemCreated;
+        private User playerUser;
+
+        public User PlayerUser
+        {
+            get => playerUser;
+            set
+            {
+                playerUser = value;
+
+                if (playerItemCreated)
+                    return;
+
+                ScoresContainer.AddRealTimePlayer(PlayerCurrentScore, playerUser);
+                playerItemCreated = true;
+            }
+        }
+
+        public InGameLeaderboard()
+        {
+            AutoSizeAxes = Axes.Y;
+
+            InternalChild = ScoresContainer = new InGameScoreContainer();
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/InGameScoreContainer.cs b/osu.Game/Screens/Play/InGameScoreContainer.cs
new file mode 100644
index 0000000000..eb4a0a2f38
--- /dev/null
+++ b/osu.Game/Screens/Play/InGameScoreContainer.cs
@@ -0,0 +1,206 @@
+// Copyright (c) ppy 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 Humanizer;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Scoring;
+using osu.Game.Users;
+using osuTK;
+
+namespace osu.Game.Screens.Play
+{
+    public class InGameScoreContainer : FillFlowContainer<InGameScoreItem>
+    {
+        /// <summary>
+        /// Whether to declare a new position for un-positioned players.
+        /// Must be disabled for online leaderboards with top 50 scores only.
+        /// </summary>
+        public bool DeclareNewPosition = true;
+
+        public InGameScoreContainer()
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+            Direction = FillDirection.Vertical;
+            Spacing = new Vector2(2.5f);
+            LayoutDuration = 500;
+            LayoutEasing = Easing.OutQuint;
+        }
+
+        public void AddRealTimePlayer(BindableDouble currentScore, User user = null)
+        {
+            if (currentScore == null)
+                return;
+
+            var scoreItem = addScore(currentScore.Value, user);
+            currentScore.ValueChanged += s => scoreItem.TotalScore = s.NewValue;
+        }
+
+        public void AddScore(ScoreInfo score, int? position = null)
+        {
+            if (score != null)
+                addScore(score.TotalScore, score.User, position);
+        }
+
+        private int maxPosition => this.Where(i => i.ScorePosition.HasValue).Max(i => i.ScorePosition) ?? 0;
+
+        private InGameScoreItem addScore(double totalScore, User user = null, int? position = null)
+        {
+            var scoreItem = new InGameScoreItem
+            {
+                User = user,
+                TotalScore = totalScore,
+                ScorePosition = position,
+                OnScoreChange = updateScores,
+            };
+
+            Add(scoreItem);
+            SetLayoutPosition(scoreItem, position ?? maxPosition + 1);
+
+            updateScores();
+
+            return scoreItem;
+        }
+
+        private void updateScores()
+        {
+            var orderedByScore = this.OrderByDescending(i => i.TotalScore).ToList();
+            var orderedPositions = this.OrderByDescending(i => i.ScorePosition.HasValue).ThenBy(i => i.ScorePosition).Select(i => i.ScorePosition).ToList();
+
+            for (int i = 0; i < Count; i++)
+            {
+                int newPosition = orderedPositions[i] ?? maxPosition + 1;
+
+                SetLayoutPosition(orderedByScore[i], newPosition);
+                orderedByScore[i].ScorePosition = DeclareNewPosition ? newPosition : orderedPositions[i];
+            }
+        }
+    }
+
+    public class InGameScoreItem : CompositeDrawable
+    {
+        private readonly OsuSpriteText positionText, positionSymbol, userString;
+        private readonly GlowingSpriteText scoreText;
+
+        public Action OnScoreChange;
+
+        private int? scorePosition;
+
+        public int? ScorePosition
+        {
+            get => scorePosition;
+            set
+            {
+                scorePosition = value;
+
+                if (scorePosition.HasValue)
+                    positionText.Text = $"#{scorePosition.Value.ToMetric(decimals: scorePosition < 100000 ? 1 : 0)}";
+
+                positionText.FadeTo(scorePosition.HasValue ? 1 : 0, 100);
+                positionSymbol.FadeTo(scorePosition.HasValue ? 1 : 0, 100);
+            }
+        }
+
+        private double totalScore;
+
+        public double TotalScore
+        {
+            get => totalScore;
+            set
+            {
+                totalScore = value;
+                scoreText.Text = totalScore.ToString("N0");
+
+                OnScoreChange?.Invoke();
+            }
+        }
+
+        private User user;
+
+        public User User
+        {
+            get => user;
+            set
+            {
+                user = value;
+                userString.Text = user?.Username;
+            }
+        }
+
+        public InGameScoreItem()
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+
+            InternalChild = new Container
+            {
+                Masking = true,
+                Anchor = Anchor.TopCentre,
+                Origin = Anchor.TopCentre,
+                AutoSizeAxes = Axes.Both,
+                Children = new Drawable[]
+                {
+                    new FillFlowContainer
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopRight,
+                        AutoSizeAxes = Axes.Both,
+                        Direction = FillDirection.Horizontal,
+                        Margin = new MarginPadding { Right = 2.5f },
+                        Spacing = new Vector2(2.5f),
+                        Children = new[]
+                        {
+                            positionText = new OsuSpriteText
+                            {
+                                Alpha = 0,
+                                Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold),
+                            },
+                            positionSymbol = new OsuSpriteText
+                            {
+                                Alpha = 0,
+                                Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold),
+                                Text = ">",
+                            },
+                        }
+                    },
+                    new FillFlowContainer
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopLeft,
+                        AutoSizeAxes = Axes.Both,
+                        Direction = FillDirection.Horizontal,
+                        Margin = new MarginPadding { Left = 2.5f },
+                        Spacing = new Vector2(2.5f),
+                        Children = new Drawable[]
+                        {
+                            userString = new OsuSpriteText
+                            {
+                                Size = new Vector2(80, 16),
+                                Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold, italics: true),
+                            },
+                            scoreText = new GlowingSpriteText
+                            {
+                                GlowColour = OsuColour.FromHex(@"83ccfa"),
+                                Font = OsuFont.Numeric.With(size: 14),
+                            }
+                        }
+                    },
+                },
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            positionText.Colour = colours.YellowLight;
+            positionSymbol.Colour = colours.Yellow;
+        }
+    }
+}

From 6233dc22e0b76bda53722e0aca270d67e0e39c8c Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Mon, 29 Jul 2019 06:52:42 +0300
Subject: [PATCH 0002/3722] Add simple tests for current implementation

---
 .../Gameplay/TestSceneInGameLeaderboard.cs    | 79 +++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
new file mode 100644
index 0000000000..36ed8f9b4c
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
@@ -0,0 +1,79 @@
+// Copyright (c) ppy 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.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Screens.Play;
+using osu.Game.Users;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    [TestFixture]
+    public class TestSceneInGameLeaderboard : OsuTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(InGameLeaderboard),
+            typeof(InGameScoreContainer),
+        };
+
+        private readonly TestInGameLeaderboard leaderboard;
+        private readonly BindableDouble playerScore;
+
+        public TestSceneInGameLeaderboard()
+        {
+            Add(leaderboard = new TestInGameLeaderboard
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Scale = new Vector2(2),
+                RelativeSizeAxes = Axes.X,
+                PlayerCurrentScore = { BindTarget = playerScore = new BindableDouble(1222333) }
+            });
+
+            AddStep("add player user", () => leaderboard.PlayerUser = new User { Username = "You" });
+            AddSliderStep("set player score", 50, 5000000, 1222333, v => playerScore.Value = v);
+        }
+
+        [Test]
+        public void TestPlayerScore()
+        {
+            var player2Score = new BindableDouble(1234567);
+            var player3Score = new BindableDouble(1111111);
+
+            AddStep("add player 2", () => leaderboard.AddDummyPlayer(player2Score, "Player 2"));
+            AddStep("add player 3", () => leaderboard.AddDummyPlayer(player3Score, "Player 3"));
+
+            AddAssert("is player 2 position #1", () => leaderboard.CheckPositionByUsername("Player 2", 1));
+            AddAssert("is player position #2", () => leaderboard.CheckPositionByUsername("You", 2));
+            AddAssert("is player 3 position #3", () => leaderboard.CheckPositionByUsername("Player 3", 3));
+
+            AddStep("set score above player 3", () => player2Score.Value = playerScore.Value - 500);
+            AddAssert("is player position #1", () => leaderboard.CheckPositionByUsername("You", 1));
+            AddAssert("is player 2 position #2", () => leaderboard.CheckPositionByUsername("Player 2", 2));
+            AddAssert("is player 3 position #3", () => leaderboard.CheckPositionByUsername("Player 3", 3));
+
+            AddStep("set score below players", () => player2Score.Value = playerScore.Value - 123456);
+            AddAssert("is player position #1", () => leaderboard.CheckPositionByUsername("You", 1));
+            AddAssert("is player 3 position #2", () => leaderboard.CheckPositionByUsername("Player 3", 2));
+            AddAssert("is player 2 position #3", () => leaderboard.CheckPositionByUsername("Player 2", 3));
+        }
+
+        private class TestInGameLeaderboard : InGameLeaderboard
+        {
+            public bool CheckPositionByUsername(string username, int? estimatedPosition)
+            {
+                var scoreItem = ScoresContainer.Where(i => i.User.Username == username).FirstOrDefault();
+
+                return scoreItem != null && scoreItem.ScorePosition == estimatedPosition;
+            }
+
+            public void AddDummyPlayer(BindableDouble currentScore, string username) => ScoresContainer.AddRealTimePlayer(currentScore, new User { Username = username });
+        }
+    }
+}

From 4874746525615cb5aaffbe6195d8038b7766543b Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Tue, 30 Jul 2019 12:32:12 +0300
Subject: [PATCH 0003/3722] Add OnScoreChange event

For use in scrolling system on a later PR
---
 osu.Game/Screens/Play/InGameScoreContainer.cs | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/InGameScoreContainer.cs b/osu.Game/Screens/Play/InGameScoreContainer.cs
index eb4a0a2f38..985e867510 100644
--- a/osu.Game/Screens/Play/InGameScoreContainer.cs
+++ b/osu.Game/Screens/Play/InGameScoreContainer.cs
@@ -18,6 +18,12 @@ namespace osu.Game.Screens.Play
 {
     public class InGameScoreContainer : FillFlowContainer<InGameScoreItem>
     {
+        /// <summary>
+        /// Called once an item's score has changed.
+        /// Useful for doing calculations on what score to show or hide next. (scrolling system)
+        /// </summary>
+        public event Action OnScoreChange;
+
         /// <summary>
         /// Whether to declare a new position for un-positioned players.
         /// Must be disabled for online leaderboards with top 50 scores only.
@@ -64,12 +70,12 @@ namespace osu.Game.Screens.Play
             Add(scoreItem);
             SetLayoutPosition(scoreItem, position ?? maxPosition + 1);
 
-            updateScores();
+            reorderPositions();
 
             return scoreItem;
         }
 
-        private void updateScores()
+        private void reorderPositions()
         {
             var orderedByScore = this.OrderByDescending(i => i.TotalScore).ToList();
             var orderedPositions = this.OrderByDescending(i => i.ScorePosition.HasValue).ThenBy(i => i.ScorePosition).Select(i => i.ScorePosition).ToList();
@@ -82,6 +88,13 @@ namespace osu.Game.Screens.Play
                 orderedByScore[i].ScorePosition = DeclareNewPosition ? newPosition : orderedPositions[i];
             }
         }
+
+        private void updateScores()
+        {
+            reorderPositions();
+
+            OnScoreChange?.Invoke();
+        }
     }
 
     public class InGameScoreItem : CompositeDrawable

From 32498d5d5088f4b009eec5d7304ea10f96dbb515 Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Tue, 30 Jul 2019 12:35:49 +0300
Subject: [PATCH 0004/3722] Add xmldocs and return score items.

Return for usage in later PR
---
 osu.Game/Screens/Play/InGameScoreContainer.cs | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Play/InGameScoreContainer.cs b/osu.Game/Screens/Play/InGameScoreContainer.cs
index 985e867510..0ebf475e18 100644
--- a/osu.Game/Screens/Play/InGameScoreContainer.cs
+++ b/osu.Game/Screens/Play/InGameScoreContainer.cs
@@ -40,20 +40,30 @@ namespace osu.Game.Screens.Play
             LayoutEasing = Easing.OutQuint;
         }
 
-        public void AddRealTimePlayer(BindableDouble currentScore, User user = null)
+        /// <summary>
+        /// Adds a real-time player score item whose score is updated via a <see cref="BindableDouble"/>.
+        /// </summary>
+        /// <param name="currentScore">The bindable current score of the player.</param>
+        /// <param name="user">The player user.</param>
+        /// <returns>Returns the drawable score item of that player.</returns>
+        public InGameScoreItem AddRealTimePlayer(BindableDouble currentScore, User user = null)
         {
             if (currentScore == null)
-                return;
+                return null;
 
             var scoreItem = addScore(currentScore.Value, user);
             currentScore.ValueChanged += s => scoreItem.TotalScore = s.NewValue;
+
+            return scoreItem;
         }
 
-        public void AddScore(ScoreInfo score, int? position = null)
-        {
-            if (score != null)
-                addScore(score.TotalScore, score.User, position);
-        }
+        /// <summary>
+        /// Adds a score item based off a <see cref="ScoreInfo"/> with an initial position.
+        /// </summary>
+        /// <param name="score">The score info to use for this item.</param>
+        /// <param name="position">The initial position of this item.</param>
+        /// <returns>Returns the drawable score item of that player.</returns>
+        public InGameScoreItem AddScore(ScoreInfo score, int? position = null) => score != null ? addScore(score.TotalScore, score.User, position) : null;
 
         private int maxPosition => this.Where(i => i.ScorePosition.HasValue).Max(i => i.ScorePosition) ?? 0;
 

From 77aa3a9fe56437c3b4aca91b12e87ee5880a8b39 Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Tue, 30 Jul 2019 12:37:01 +0300
Subject: [PATCH 0005/3722] Clear previous score items on SetUp

---
 osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
index 36ed8f9b4c..4a861428de 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
@@ -40,6 +40,9 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddSliderStep("set player score", 50, 5000000, 1222333, v => playerScore.Value = v);
         }
 
+        [SetUp]
+        public void SetUp() => leaderboard.ClearScores();
+
         [Test]
         public void TestPlayerScore()
         {
@@ -66,6 +69,8 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private class TestInGameLeaderboard : InGameLeaderboard
         {
+            public void ClearScores() => ScoresContainer.RemoveAll(s => s.User.Username != PlayerUser.Username);
+
             public bool CheckPositionByUsername(string username, int? estimatedPosition)
             {
                 var scoreItem = ScoresContainer.Where(i => i.User.Username == username).FirstOrDefault();

From 7675c679db84f0fa422b6f9034407527f36484af Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Wed, 31 Jul 2019 16:09:40 +0300
Subject: [PATCH 0006/3722] Fix reordering not declaring new position properly

Small bug fix
---
 osu.Game/Screens/Play/InGameScoreContainer.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/InGameScoreContainer.cs b/osu.Game/Screens/Play/InGameScoreContainer.cs
index 0ebf475e18..edccf6c45b 100644
--- a/osu.Game/Screens/Play/InGameScoreContainer.cs
+++ b/osu.Game/Screens/Play/InGameScoreContainer.cs
@@ -90,9 +90,11 @@ namespace osu.Game.Screens.Play
             var orderedByScore = this.OrderByDescending(i => i.TotalScore).ToList();
             var orderedPositions = this.OrderByDescending(i => i.ScorePosition.HasValue).ThenBy(i => i.ScorePosition).Select(i => i.ScorePosition).ToList();
 
+            var newDeclaredPosition = maxPosition + 1;
+
             for (int i = 0; i < Count; i++)
             {
-                int newPosition = orderedPositions[i] ?? maxPosition + 1;
+                int newPosition = orderedPositions[i] ?? newDeclaredPosition;
 
                 SetLayoutPosition(orderedByScore[i], newPosition);
                 orderedByScore[i].ScorePosition = DeclareNewPosition ? newPosition : orderedPositions[i];

From 5e4e15033025258a2ec6212c782c8cd72380d5f9 Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Sun, 4 Aug 2019 18:20:45 +0300
Subject: [PATCH 0007/3722] Use normal Action

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

diff --git a/osu.Game/Screens/Play/InGameScoreContainer.cs b/osu.Game/Screens/Play/InGameScoreContainer.cs
index edccf6c45b..2d45158095 100644
--- a/osu.Game/Screens/Play/InGameScoreContainer.cs
+++ b/osu.Game/Screens/Play/InGameScoreContainer.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Screens.Play
         /// Called once an item's score has changed.
         /// Useful for doing calculations on what score to show or hide next. (scrolling system)
         /// </summary>
-        public event Action OnScoreChange;
+        public Action OnScoreChange;
 
         /// <summary>
         /// Whether to declare a new position for un-positioned players.

From 9325c024bb08dcd468cc41a0f70d3df7f09f5d78 Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Sun, 4 Aug 2019 18:26:01 +0300
Subject: [PATCH 0008/3722] Add InitialPosition field

---
 osu.Game/Screens/Play/InGameScoreContainer.cs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/InGameScoreContainer.cs b/osu.Game/Screens/Play/InGameScoreContainer.cs
index 2d45158095..36dbec7fce 100644
--- a/osu.Game/Screens/Play/InGameScoreContainer.cs
+++ b/osu.Game/Screens/Play/InGameScoreContainer.cs
@@ -61,19 +61,18 @@ namespace osu.Game.Screens.Play
         /// Adds a score item based off a <see cref="ScoreInfo"/> with an initial position.
         /// </summary>
         /// <param name="score">The score info to use for this item.</param>
-        /// <param name="position">The initial position of this item.</param>
+        /// <param name="initialPosition">The initial position of this item.</param>
         /// <returns>Returns the drawable score item of that player.</returns>
-        public InGameScoreItem AddScore(ScoreInfo score, int? position = null) => score != null ? addScore(score.TotalScore, score.User, position) : null;
+        public InGameScoreItem AddScore(ScoreInfo score, int? initialPosition = null) => score != null ? addScore(score.TotalScore, score.User, initialPosition) : null;
 
         private int maxPosition => this.Where(i => i.ScorePosition.HasValue).Max(i => i.ScorePosition) ?? 0;
 
         private InGameScoreItem addScore(double totalScore, User user = null, int? position = null)
         {
-            var scoreItem = new InGameScoreItem
+            var scoreItem = new InGameScoreItem(position)
             {
                 User = user,
                 TotalScore = totalScore,
-                ScorePosition = position,
                 OnScoreChange = updateScores,
             };
 
@@ -117,6 +116,7 @@ namespace osu.Game.Screens.Play
         public Action OnScoreChange;
 
         private int? scorePosition;
+        public int? InitialPosition;
 
         public int? ScorePosition
         {
@@ -159,7 +159,7 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        public InGameScoreItem()
+        public InGameScoreItem(int? initialPosition)
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
@@ -219,6 +219,8 @@ namespace osu.Game.Screens.Play
                     },
                 },
             };
+
+            InitialPosition = ScorePosition = initialPosition;
         }
 
         [BackgroundDependencyLoader]

From 91f35dde58a3815ba25d731c6ed5fad8da1e98ab Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Sun, 4 Aug 2019 18:27:49 +0300
Subject: [PATCH 0009/3722] Actual fix of position declaring bug

---
 osu.Game/Screens/Play/InGameScoreContainer.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/InGameScoreContainer.cs b/osu.Game/Screens/Play/InGameScoreContainer.cs
index 36dbec7fce..3949307dca 100644
--- a/osu.Game/Screens/Play/InGameScoreContainer.cs
+++ b/osu.Game/Screens/Play/InGameScoreContainer.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Screens.Play
         /// <returns>Returns the drawable score item of that player.</returns>
         public InGameScoreItem AddScore(ScoreInfo score, int? initialPosition = null) => score != null ? addScore(score.TotalScore, score.User, initialPosition) : null;
 
-        private int maxPosition => this.Where(i => i.ScorePosition.HasValue).Max(i => i.ScorePosition) ?? 0;
+        private int maxPosition => this.Max(i => this.Any(item => item.InitialPosition.HasValue) ? i.InitialPosition : i.ScorePosition) ?? 0;
 
         private InGameScoreItem addScore(double totalScore, User user = null, int? position = null)
         {
@@ -87,13 +87,11 @@ namespace osu.Game.Screens.Play
         private void reorderPositions()
         {
             var orderedByScore = this.OrderByDescending(i => i.TotalScore).ToList();
-            var orderedPositions = this.OrderByDescending(i => i.ScorePosition.HasValue).ThenBy(i => i.ScorePosition).Select(i => i.ScorePosition).ToList();
-
-            var newDeclaredPosition = maxPosition + 1;
+            var orderedPositions = this.Select(i => this.Any(item => item.InitialPosition.HasValue) ? i.InitialPosition : i.ScorePosition).OrderByDescending(p => p.HasValue).ThenBy(p => p).ToList();
 
             for (int i = 0; i < Count; i++)
             {
-                int newPosition = orderedPositions[i] ?? newDeclaredPosition;
+                int newPosition = orderedPositions[i] ?? maxPosition + 1;
 
                 SetLayoutPosition(orderedByScore[i], newPosition);
                 orderedByScore[i].ScorePosition = DeclareNewPosition ? newPosition : orderedPositions[i];

From f5daf98aa530173f9e83dfc5a1b90b1fb2fd1591 Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Sun, 4 Aug 2019 18:28:40 +0300
Subject: [PATCH 0010/3722] Reset player state on setup

---
 .../Visual/Gameplay/TestSceneInGameLeaderboard.cs          | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
index 4a861428de..096b29d496 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
@@ -41,7 +41,12 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         [SetUp]
-        public void SetUp() => leaderboard.ClearScores();
+        public void SetUp()
+        {
+            leaderboard.ClearScores();
+            leaderboard.PlayerPosition = 1;
+            playerScore.Value = 1222333;
+        }
 
         [Test]
         public void TestPlayerScore()

From 598c02f8b9f266c1dbd3d0d2ee196a2ee7a28d73 Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Sun, 4 Aug 2019 18:31:32 +0300
Subject: [PATCH 0011/3722] Shorten Where().FirstOrDefault()

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
index 096b29d496..24b8033fbc 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public bool CheckPositionByUsername(string username, int? estimatedPosition)
             {
-                var scoreItem = ScoresContainer.Where(i => i.User.Username == username).FirstOrDefault();
+                var scoreItem = ScoresContainer.FirstOrDefault(i => i.User.Username == username);
 
                 return scoreItem != null && scoreItem.ScorePosition == estimatedPosition;
             }

From fdd00c0820355b10b8450e449512cd8067fb77ff Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Sun, 4 Aug 2019 18:35:53 +0300
Subject: [PATCH 0012/3722] Remove position fading

Unnecessary effect
---
 osu.Game/Screens/Play/InGameScoreContainer.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/InGameScoreContainer.cs b/osu.Game/Screens/Play/InGameScoreContainer.cs
index 3949307dca..f548b3de3f 100644
--- a/osu.Game/Screens/Play/InGameScoreContainer.cs
+++ b/osu.Game/Screens/Play/InGameScoreContainer.cs
@@ -126,8 +126,8 @@ namespace osu.Game.Screens.Play
                 if (scorePosition.HasValue)
                     positionText.Text = $"#{scorePosition.Value.ToMetric(decimals: scorePosition < 100000 ? 1 : 0)}";
 
-                positionText.FadeTo(scorePosition.HasValue ? 1 : 0, 100);
-                positionSymbol.FadeTo(scorePosition.HasValue ? 1 : 0, 100);
+                positionText.FadeTo(scorePosition.HasValue ? 1 : 0);
+                positionSymbol.FadeTo(scorePosition.HasValue ? 1 : 0);
             }
         }
 

From ca7a812e1cc822152ceff303d1323a608b6e141a Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Sun, 4 Aug 2019 18:39:42 +0300
Subject: [PATCH 0013/3722] Add PlayerPosition property

---
 osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
index 24b8033fbc..cd211d06ec 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
@@ -75,6 +75,11 @@ namespace osu.Game.Tests.Visual.Gameplay
         private class TestInGameLeaderboard : InGameLeaderboard
         {
             public void ClearScores() => ScoresContainer.RemoveAll(s => s.User.Username != PlayerUser.Username);
+            public int? PlayerPosition
+            {
+                get => PlayerScoreItem.ScorePosition;
+                set => PlayerScoreItem.ScorePosition = value;
+            }
 
             public bool CheckPositionByUsername(string username, int? estimatedPosition)
             {

From 472af16015c40745f59fa759e362f637f57e0f44 Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Sun, 4 Aug 2019 19:17:45 +0300
Subject: [PATCH 0014/3722] Revert unintended change

---
 .../Visual/Gameplay/TestSceneInGameLeaderboard.cs           | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
index cd211d06ec..0019212dfa 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
@@ -44,7 +44,6 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void SetUp()
         {
             leaderboard.ClearScores();
-            leaderboard.PlayerPosition = 1;
             playerScore.Value = 1222333;
         }
 
@@ -75,11 +74,6 @@ namespace osu.Game.Tests.Visual.Gameplay
         private class TestInGameLeaderboard : InGameLeaderboard
         {
             public void ClearScores() => ScoresContainer.RemoveAll(s => s.User.Username != PlayerUser.Username);
-            public int? PlayerPosition
-            {
-                get => PlayerScoreItem.ScorePosition;
-                set => PlayerScoreItem.ScorePosition = value;
-            }
 
             public bool CheckPositionByUsername(string username, int? estimatedPosition)
             {

From 1d314a1f4b86ce5fd6ea95804acb8d411d95413c Mon Sep 17 00:00:00 2001
From: voidedWarranties <wong.zhao@voidedxd.xyz>
Date: Wed, 11 Mar 2020 22:40:08 -0700
Subject: [PATCH 0015/3722] Prevent playback from going beyond song end

---
 .../Edit/Components/PlaybackControl.cs        |  3 +++
 osu.Game/Screens/Edit/EditorClock.cs          | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/osu.Game/Screens/Edit/Components/PlaybackControl.cs b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
index 897c6ec531..ff650a7ad7 100644
--- a/osu.Game/Screens/Edit/Components/PlaybackControl.cs
+++ b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
@@ -87,6 +87,9 @@ namespace osu.Game.Screens.Edit.Components
 
         private void togglePause()
         {
+            if ((adjustableClock as EditorClock)?.PlaybackFinished == true)
+                adjustableClock.Seek(0);
+
             if (adjustableClock.IsRunning)
                 adjustableClock.Stop();
             else
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index e5e47507f3..0e5b42fe69 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -21,6 +21,8 @@ namespace osu.Game.Screens.Edit
 
         private readonly BindableBeatDivisor beatDivisor;
 
+        public bool PlaybackFinished { get; private set; }
+
         public EditorClock(WorkingBeatmap beatmap, BindableBeatDivisor beatDivisor)
         {
             this.beatDivisor = beatDivisor;
@@ -37,6 +39,23 @@ namespace osu.Game.Screens.Edit
             TrackLength = trackLength;
         }
 
+        public override void ProcessFrame()
+        {
+            base.ProcessFrame();
+
+            if (CurrentTime >= TrackLength)
+            {
+                if (!PlaybackFinished)
+                {
+                    PlaybackFinished = true;
+                    Stop();
+                    Seek(TrackLength);
+                }
+            }
+            else
+                PlaybackFinished = false;
+        }
+
         /// <summary>
         /// Seek to the closest snappable beat from a time.
         /// </summary>

From 7e4f58c2d3adc15ccb14a69d99094de5efcd7c13 Mon Sep 17 00:00:00 2001
From: voidedWarranties <wong.zhao@voidedxd.xyz>
Date: Fri, 13 Mar 2020 16:42:05 -0700
Subject: [PATCH 0016/3722] Internalize both looping and stopping

---
 .../Screens/Edit/Components/PlaybackControl.cs     |  3 ---
 osu.Game/Screens/Edit/EditorClock.cs               | 14 ++++++++------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Edit/Components/PlaybackControl.cs b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
index ff650a7ad7..897c6ec531 100644
--- a/osu.Game/Screens/Edit/Components/PlaybackControl.cs
+++ b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
@@ -87,9 +87,6 @@ namespace osu.Game.Screens.Edit.Components
 
         private void togglePause()
         {
-            if ((adjustableClock as EditorClock)?.PlaybackFinished == true)
-                adjustableClock.Seek(0);
-
             if (adjustableClock.IsRunning)
                 adjustableClock.Stop();
             else
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index 0e5b42fe69..aef304bd6e 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Screens.Edit
 
         private readonly BindableBeatDivisor beatDivisor;
 
-        public bool PlaybackFinished { get; private set; }
+        private bool playbackFinished;
 
         public EditorClock(WorkingBeatmap beatmap, BindableBeatDivisor beatDivisor)
         {
@@ -43,17 +43,19 @@ namespace osu.Game.Screens.Edit
         {
             base.ProcessFrame();
 
-            if (CurrentTime >= TrackLength)
+            var playbackAlreadyStopped = playbackFinished;
+            playbackFinished = CurrentTime >= TrackLength;
+
+            if (playbackFinished && IsRunning)
             {
-                if (!PlaybackFinished)
+                if (!playbackAlreadyStopped)
                 {
-                    PlaybackFinished = true;
                     Stop();
                     Seek(TrackLength);
                 }
+                else
+                    Seek(0);
             }
-            else
-                PlaybackFinished = false;
         }
 
         /// <summary>

From a38c912c6d4060a85f5172adf1bcc89e0ed9dc0e Mon Sep 17 00:00:00 2001
From: voidedWarranties <wong.zhao@voidedxd.xyz>
Date: Sat, 21 Mar 2020 12:15:20 -0700
Subject: [PATCH 0017/3722] Test stopping behavior

---
 .../Visual/Editor/TestSceneEditorClock.cs     | 51 +++++++++++++++++++
 .../Visual/Editor/TimelineTestScene.cs        | 16 +++---
 2 files changed, 58 insertions(+), 9 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Editor/TestSceneEditorClock.cs

diff --git a/osu.Game.Tests/Visual/Editor/TestSceneEditorClock.cs b/osu.Game.Tests/Visual/Editor/TestSceneEditorClock.cs
new file mode 100644
index 0000000000..0b128a974c
--- /dev/null
+++ b/osu.Game.Tests/Visual/Editor/TestSceneEditorClock.cs
@@ -0,0 +1,51 @@
+// Copyright (c) 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.Framework.Graphics.Containers;
+using osu.Game.Screens.Edit.Components;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Editor
+{
+    [TestFixture]
+    public class TestSceneEditorClock : EditorClockTestScene
+    {
+        public TestSceneEditorClock()
+        {
+            Add(new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Children = new Drawable[]
+                {
+                    new TimeInfoContainer
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Size = new Vector2(200, 100)
+                    },
+                    new PlaybackControl
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Size = new Vector2(200, 100)
+                    }
+                }
+            });
+        }
+
+        [Test]
+        public void TestStopAtTrackEnd()
+        {
+            AddStep("Reset clock", () => Clock.Seek(0));
+            AddStep("Start clock", Clock.Start);
+            AddAssert("Clock running", () => Clock.IsRunning);
+            AddStep("Seek near end", () => Clock.Seek(Clock.TrackLength - 250));
+            AddUntilStep("Clock stops", () => !Clock.IsRunning);
+            AddAssert("Clock stopped at end", () => Clock.CurrentTime == Clock.TrackLength);
+            AddStep("Start clock again", Clock.Start);
+            AddAssert("Clock looped", () => Clock.IsRunning && Clock.CurrentTime < Clock.TrackLength);
+        }
+    }
+}
diff --git a/osu.Game.Tests/Visual/Editor/TimelineTestScene.cs b/osu.Game.Tests/Visual/Editor/TimelineTestScene.cs
index 7081eb3af5..83a0455b46 100644
--- a/osu.Game.Tests/Visual/Editor/TimelineTestScene.cs
+++ b/osu.Game.Tests/Visual/Editor/TimelineTestScene.cs
@@ -113,7 +113,6 @@ namespace osu.Game.Tests.Visual.Editor
         private class StartStopButton : OsuButton
         {
             private IAdjustableClock adjustableClock;
-            private bool started;
 
             public StartStopButton()
             {
@@ -132,18 +131,17 @@ namespace osu.Game.Tests.Visual.Editor
 
             private void onClick()
             {
-                if (started)
-                {
+                if (adjustableClock.IsRunning)
                     adjustableClock.Stop();
-                    Text = "Start";
-                }
                 else
-                {
                     adjustableClock.Start();
-                    Text = "Stop";
-                }
+            }
 
-                started = !started;
+            protected override void Update()
+            {
+                base.Update();
+
+                Text = adjustableClock.IsRunning ? "Stop" : "Start";
             }
         }
     }

From b41f3f1cad7312708d864269cfb1c587ed2353ca Mon Sep 17 00:00:00 2001
From: voidedWarranties <wong.zhao@voidedxd.xyz>
Date: Mon, 23 Mar 2020 22:37:53 -0700
Subject: [PATCH 0018/3722] Fix seeking back to beginning too early

---
 .../Compose/Components/Timeline/Timeline.cs   |  4 +++-
 osu.Game/Screens/Edit/EditorClock.cs          | 21 +++++++++++--------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index ddca5e42c2..590abf20b4 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -130,7 +130,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             if (!track.IsLoaded)
                 return;
 
-            adjustableClock.Seek(Current / Content.DrawWidth * track.Length);
+            double target = Current / Content.DrawWidth * track.Length;
+
+            adjustableClock.Seek(Math.Min(track.Length, target));
         }
 
         private void scrollToTrackTime()
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index aef304bd6e..b4ab867774 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -43,18 +43,21 @@ namespace osu.Game.Screens.Edit
         {
             base.ProcessFrame();
 
-            var playbackAlreadyStopped = playbackFinished;
-            playbackFinished = CurrentTime >= TrackLength;
-
-            if (playbackFinished && IsRunning)
+            if (IsRunning)
             {
-                if (!playbackAlreadyStopped)
+                var playbackAlreadyStopped = playbackFinished;
+                playbackFinished = CurrentTime >= TrackLength;
+
+                if (playbackFinished)
                 {
-                    Stop();
-                    Seek(TrackLength);
+                    if (!playbackAlreadyStopped)
+                    {
+                        Stop();
+                        Seek(TrackLength);
+                    }
+                    else
+                        Seek(0);
                 }
-                else
-                    Seek(0);
             }
         }
 

From d42c872f8f19923dd56388cd1ba632cc7298292a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 25 Mar 2020 16:02:20 +0900
Subject: [PATCH 0019/3722] Better ensure track restarted

---
 osu.Game.Tests/Visual/Editor/TestSceneEditorClock.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Editor/TestSceneEditorClock.cs b/osu.Game.Tests/Visual/Editor/TestSceneEditorClock.cs
index 0b128a974c..a824696022 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneEditorClock.cs
+++ b/osu.Game.Tests/Visual/Editor/TestSceneEditorClock.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Tests.Visual.Editor
             AddUntilStep("Clock stops", () => !Clock.IsRunning);
             AddAssert("Clock stopped at end", () => Clock.CurrentTime == Clock.TrackLength);
             AddStep("Start clock again", Clock.Start);
-            AddAssert("Clock looped", () => Clock.IsRunning && Clock.CurrentTime < Clock.TrackLength);
+            AddAssert("Clock looped to start", () => Clock.IsRunning && Clock.CurrentTime < 500);
         }
     }
 }

From dd6c9173da8b4d44f001cb057efa67c71e2d14a6 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Tue, 14 Apr 2020 18:42:00 +0300
Subject: [PATCH 0020/3722] Move DifficultyRecommender to OsuGameBase

---
 osu.Game/OsuGameBase.cs               | 5 +++++
 osu.Game/Screens/Select/SongSelect.cs | 5 +----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 5487bd9320..4b79e9f24c 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -33,6 +33,7 @@ using osu.Game.Resources;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
+using osu.Game.Screens.Select;
 using osu.Game.Skinning;
 using osuTK.Input;
 
@@ -240,6 +241,10 @@ namespace osu.Game
             dependencies.Cache(previewTrackManager = new PreviewTrackManager());
             Add(previewTrackManager);
 
+            DifficultyRecommender difficultyRecommender;
+            dependencies.Cache(difficultyRecommender = new DifficultyRecommender());
+            Add(difficultyRecommender);
+
             Ruleset.BindValueChanged(onRulesetChanged);
         }
 
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index f164056ede..7f35011379 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -81,8 +81,6 @@ namespace osu.Game.Screens.Select
 
         protected BeatmapCarousel Carousel { get; private set; }
 
-        private DifficultyRecommender recommender;
-
         private BeatmapInfoWedge beatmapInfoWedge;
         private DialogOverlay dialogOverlay;
 
@@ -104,14 +102,13 @@ namespace osu.Game.Screens.Select
         private MusicController music { get; set; }
 
         [BackgroundDependencyLoader(true)]
-        private void load(AudioManager audio, DialogOverlay dialog, OsuColour colours, SkinManager skins, ScoreManager scores)
+        private void load(AudioManager audio, DialogOverlay dialog, OsuColour colours, SkinManager skins, ScoreManager scores, DifficultyRecommender recommender)
         {
             // initial value transfer is required for FilterControl (it uses our re-cached bindables in its async load for the initial filter).
             transferRulesetValue();
 
             AddRangeInternal(new Drawable[]
             {
-                recommender = new DifficultyRecommender(),
                 new ResetScrollContainer(() => Carousel.ScrollToSelected())
                 {
                     RelativeSizeAxes = Axes.Y,

From 00d1cf1ce2b693348633919d649a15388f955072 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Tue, 14 Apr 2020 18:42:18 +0300
Subject: [PATCH 0021/3722] Recommend from all rulesets

---
 .../Screens/Select/DifficultyRecommender.cs   | 37 +++++++++++++++++--
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index 20cdca858a..76b1188298 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -44,16 +44,27 @@ namespace osu.Game.Screens.Select
         /// <returns>The recommended difficulty, or null if a recommendation could not be provided.</returns>
         public BeatmapInfo GetRecommendedBeatmap(IEnumerable<BeatmapInfo> beatmaps)
         {
-            if (recommendedStarDifficulty.TryGetValue(ruleset.Value, out var stars))
+            if (!recommendedStarDifficulty.Any())
+                return null;
+
+            BeatmapInfo beatmap = null;
+
+            foreach (var r in getBestRulesetOrder())
             {
-                return beatmaps.OrderBy(b =>
+                if (!recommendedStarDifficulty.TryGetValue(ruleset.Value, out var stars))
+                    break;
+
+                beatmap = beatmaps.Where(b => b.Ruleset.Equals(r)).OrderBy(b =>
                 {
                     var difference = b.StarDifficulty - stars;
                     return difference >= 0 ? difference * 2 : difference * -1; // prefer easier over harder
                 }).FirstOrDefault();
+
+                if (beatmap != null)
+                    break;
             }
 
-            return null;
+            return beatmap;
         }
 
         private void calculateRecommendedDifficulties()
@@ -72,6 +83,26 @@ namespace osu.Game.Screens.Select
             });
         }
 
+        private IEnumerable<RulesetInfo> bestRulesetOrder;
+
+        private IEnumerable<RulesetInfo> getBestRulesetOrder()
+        {
+            if (bestRulesetOrder != null)
+                return bestRulesetOrder;
+
+            var otherRulesets = recommendedStarDifficulty.ToList()
+                                                         .Where(pair => !pair.Key.Equals(ruleset.Value))
+                                                         .OrderBy(pair => pair.Value)
+                                                         .Select(pair => pair.Key)
+                                                         .Reverse();
+
+            var rulesetList = new List<RulesetInfo>(new[] { ruleset.Value });
+            rulesetList.AddRange(otherRulesets);
+
+            bestRulesetOrder = rulesetList;
+            return rulesetList;
+        }
+
         public void APIStateChanged(IAPIProvider api, APIState state)
         {
             switch (state)

From bbef94b4df15fd3e1b2f0f51f5c16e2243920a45 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Tue, 14 Apr 2020 18:56:20 +0300
Subject: [PATCH 0022/3722] Reset best order on ruleset change

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

diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index 76b1188298..bdc81ad066 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -32,6 +32,8 @@ namespace osu.Game.Screens.Select
         private void load()
         {
             api.Register(this);
+
+            ruleset.ValueChanged += _ => bestRulesetOrder = null;
         }
 
         /// <summary>

From 872551733f3b4c9e8fe4c7f21a4d0b8edf4ae3bb Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Tue, 14 Apr 2020 19:39:14 +0300
Subject: [PATCH 0023/3722] Present recommended beatmaps

---
 osu.Game/OsuGame.cs     | 14 +++++++++-----
 osu.Game/OsuGameBase.cs |  7 ++++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 5e93d760e3..64fe0f6733 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -322,7 +322,7 @@ namespace osu.Game
         /// </param>
         public void PresentBeatmap(BeatmapSetInfo beatmap, Predicate<BeatmapInfo> difficultyCriteria = null)
         {
-            difficultyCriteria ??= b => b.Ruleset.Equals(Ruleset.Value);
+            difficultyCriteria ??= _ => true;
 
             var databasedSet = beatmap.OnlineBeatmapSetID != null
                 ? BeatmapManager.QueryBeatmapSet(s => s.OnlineBeatmapSetID == beatmap.OnlineBeatmapSetID)
@@ -346,11 +346,15 @@ namespace osu.Game
                     return;
                 }
 
-                // Find first beatmap that matches our predicate.
-                var first = databasedSet.Beatmaps.Find(difficultyCriteria) ?? databasedSet.Beatmaps.First();
+                // Find beatmaps that match our predicate.
+                var beatmaps = databasedSet.Beatmaps.Where(b => difficultyCriteria(b));
+                if (!beatmaps.Any())
+                    beatmaps = databasedSet.Beatmaps;
 
-                Ruleset.Value = first.Ruleset;
-                Beatmap.Value = BeatmapManager.GetWorkingBeatmap(first);
+                var selection = DifficultyRecommender.GetRecommendedBeatmap(beatmaps);
+
+                Ruleset.Value = selection.Ruleset;
+                Beatmap.Value = BeatmapManager.GetWorkingBeatmap(selection);
             }, validScreens: new[] { typeof(PlaySongSelect) });
         }
 
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 4b79e9f24c..0c86017974 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -100,6 +100,9 @@ namespace osu.Game
 
         public bool IsDeployedBuild => AssemblyVersion.Major > 0;
 
+        [Cached]
+        protected readonly DifficultyRecommender DifficultyRecommender = new DifficultyRecommender();
+
         public virtual string Version
         {
             get
@@ -241,9 +244,7 @@ namespace osu.Game
             dependencies.Cache(previewTrackManager = new PreviewTrackManager());
             Add(previewTrackManager);
 
-            DifficultyRecommender difficultyRecommender;
-            dependencies.Cache(difficultyRecommender = new DifficultyRecommender());
-            Add(difficultyRecommender);
+            Add(DifficultyRecommender);
 
             Ruleset.BindValueChanged(onRulesetChanged);
         }

From 80949e89b934f0eaee7705da8e8f62f0dc47b6b3 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Tue, 14 Apr 2020 19:49:42 +0300
Subject: [PATCH 0024/3722] Offline fallback and commenting

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 64fe0f6733..e64ca3ad87 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -316,8 +316,8 @@ namespace osu.Game
         /// </summary>
         /// <param name="beatmap">The beatmap to select.</param>
         /// <param name="difficultyCriteria">
-        /// Optional predicate used to try and find a difficulty to select.
-        /// If omitted, this will try to present the first beatmap from the current ruleset.
+        /// Optional predicate used to filter which difficulties to select.
+        /// If omitted, this will try to present a recommended beatmap from the current ruleset.
         /// In case of failure the first difficulty of the set will be presented, ignoring the predicate.
         /// </param>
         public void PresentBeatmap(BeatmapSetInfo beatmap, Predicate<BeatmapInfo> difficultyCriteria = null)
@@ -351,7 +351,10 @@ namespace osu.Game
                 if (!beatmaps.Any())
                     beatmaps = databasedSet.Beatmaps;
 
-                var selection = DifficultyRecommender.GetRecommendedBeatmap(beatmaps);
+                var selection = DifficultyRecommender.GetRecommendedBeatmap(beatmaps) ?? (
+                    // fallback if a difficulty can't be recommended, maybe we are offline
+                    databasedSet.Beatmaps.Find(b => b.Ruleset.Equals(Ruleset.Value)) ?? databasedSet.Beatmaps.First()
+                );
 
                 Ruleset.Value = selection.Ruleset;
                 Beatmap.Value = BeatmapManager.GetWorkingBeatmap(selection);

From 58e122a7cb1c0b47365e1fe28c16f24d85ce0681 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Tue, 14 Apr 2020 19:56:41 +0300
Subject: [PATCH 0025/3722] Better fallback logic

---
 osu.Game/OsuGame.cs | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index e64ca3ad87..fea89155f5 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -322,8 +322,6 @@ namespace osu.Game
         /// </param>
         public void PresentBeatmap(BeatmapSetInfo beatmap, Predicate<BeatmapInfo> difficultyCriteria = null)
         {
-            difficultyCriteria ??= _ => true;
-
             var databasedSet = beatmap.OnlineBeatmapSetID != null
                 ? BeatmapManager.QueryBeatmapSet(s => s.OnlineBeatmapSetID == beatmap.OnlineBeatmapSetID)
                 : BeatmapManager.QueryBeatmapSet(s => s.Hash == beatmap.Hash);
@@ -347,14 +345,20 @@ namespace osu.Game
                 }
 
                 // Find beatmaps that match our predicate.
-                var beatmaps = databasedSet.Beatmaps.Where(b => difficultyCriteria(b));
+                var beatmaps = databasedSet.Beatmaps.Where(b => difficultyCriteria?.Invoke(b) ?? true);
                 if (!beatmaps.Any())
                     beatmaps = databasedSet.Beatmaps;
 
-                var selection = DifficultyRecommender.GetRecommendedBeatmap(beatmaps) ?? (
-                    // fallback if a difficulty can't be recommended, maybe we are offline
-                    databasedSet.Beatmaps.Find(b => b.Ruleset.Equals(Ruleset.Value)) ?? databasedSet.Beatmaps.First()
-                );
+                var selection = DifficultyRecommender.GetRecommendedBeatmap(beatmaps);
+
+                // fallback if a difficulty can't be recommended, maybe we are offline
+                if (selection == null)
+                {
+                    if (difficultyCriteria != null)
+                        selection = beatmaps.First();
+                    else
+                        selection = databasedSet.Beatmaps.Find(b => b.Ruleset.Equals(Ruleset.Value)) ?? databasedSet.Beatmaps.First();
+                }
 
                 Ruleset.Value = selection.Ruleset;
                 Beatmap.Value = BeatmapManager.GetWorkingBeatmap(selection);

From 47187ec14cbbcfe9ebb8157150cae30e1346c2aa Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Wed, 15 Apr 2020 18:04:23 +0300
Subject: [PATCH 0026/3722] Simplify recommended beatmap presenting

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index fea89155f5..68bf9c822f 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -346,19 +346,18 @@ namespace osu.Game
 
                 // Find beatmaps that match our predicate.
                 var beatmaps = databasedSet.Beatmaps.Where(b => difficultyCriteria?.Invoke(b) ?? true);
+
+                // Use all beatmaps if predicate matched nothing
                 if (!beatmaps.Any())
                     beatmaps = databasedSet.Beatmaps;
 
-                var selection = DifficultyRecommender.GetRecommendedBeatmap(beatmaps);
-
-                // fallback if a difficulty can't be recommended, maybe we are offline
-                if (selection == null)
-                {
-                    if (difficultyCriteria != null)
-                        selection = beatmaps.First();
-                    else
-                        selection = databasedSet.Beatmaps.Find(b => b.Ruleset.Equals(Ruleset.Value)) ?? databasedSet.Beatmaps.First();
-                }
+                // Try to select recommended beatmap
+                // This should give us a beatmap from current ruleset if there are any in our matched beatmaps
+                var selection = DifficultyRecommender.GetRecommendedBeatmap(beatmaps) ?? (
+                    // Fallback if a difficulty can't be recommended, maybe we are offline
+                    // First try to find a beatmap in current ruleset, otherwise use first beatmap
+                    beatmaps.FirstOrDefault(b => b.Ruleset.Equals(Ruleset.Value)) ?? beatmaps.First()
+                );
 
                 Ruleset.Value = selection.Ruleset;
                 Beatmap.Value = BeatmapManager.GetWorkingBeatmap(selection);

From b5c1752f0a40a731bdefc4c328c2b9cb05a953bf Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Wed, 15 Apr 2020 18:14:51 +0300
Subject: [PATCH 0027/3722] Calculate best ruleset order only once

---
 .../Screens/Select/DifficultyRecommender.cs   | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index bdc81ad066..e7536db356 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -32,8 +32,6 @@ namespace osu.Game.Screens.Select
         private void load()
         {
             api.Register(this);
-
-            ruleset.ValueChanged += _ => bestRulesetOrder = null;
         }
 
         /// <summary>
@@ -90,19 +88,22 @@ namespace osu.Game.Screens.Select
         private IEnumerable<RulesetInfo> getBestRulesetOrder()
         {
             if (bestRulesetOrder != null)
-                return bestRulesetOrder;
+                return moveCurrentRulesetToFirst();
 
-            var otherRulesets = recommendedStarDifficulty.ToList()
-                                                         .Where(pair => !pair.Key.Equals(ruleset.Value))
-                                                         .OrderBy(pair => pair.Value)
-                                                         .Select(pair => pair.Key)
-                                                         .Reverse();
+            bestRulesetOrder = recommendedStarDifficulty.ToList()
+                                                        .OrderBy(pair => pair.Value)
+                                                        .Select(pair => pair.Key)
+                                                        .Reverse();
 
-            var rulesetList = new List<RulesetInfo>(new[] { ruleset.Value });
-            rulesetList.AddRange(otherRulesets);
+            return moveCurrentRulesetToFirst();
+        }
 
-            bestRulesetOrder = rulesetList;
-            return rulesetList;
+        private IEnumerable<RulesetInfo> moveCurrentRulesetToFirst()
+        {
+            var orderedRulesets = bestRulesetOrder.ToList();
+            orderedRulesets.Remove(ruleset.Value);
+            orderedRulesets.Insert(0, ruleset.Value);
+            return orderedRulesets;
         }
 
         public void APIStateChanged(IAPIProvider api, APIState state)

From da9bd74e2eef2f08b85e6e8e15501f70299c4218 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Wed, 15 Apr 2020 20:19:17 +0300
Subject: [PATCH 0028/3722] Very basic testing

---
 .../TestSceneBeatmapRecommendations.cs        | 130 ++++++++++++++++++
 1 file changed, 130 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
new file mode 100644
index 0000000000..80a00ac9a1
--- /dev/null
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
@@ -0,0 +1,130 @@
+// Copyright (c) ppy 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.Allocation;
+using osu.Framework.Logging;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Screens.Select;
+using osu.Game.Tests.Visual.Navigation;
+using osu.Game.Users;
+
+namespace osu.Game.Tests.Visual.SongSelect
+{
+    public class TestSceneBeatmapRecommendations : OsuGameTestScene
+    {
+        [Resolved]
+        private DifficultyRecommender recommender { get; set; }
+
+        [SetUpSteps]
+        public new void SetUpSteps()
+        {
+            AddStep("register request handling", () =>
+            {
+                Logger.Log($"Registering request handling for {(DummyAPIAccess)API}");
+                ((DummyAPIAccess)API).HandleRequest = req =>
+                {
+                    Logger.Log($"New request {req}");
+
+                    switch (req)
+                    {
+                        case GetUserRequest userRequest:
+                            userRequest.TriggerSuccess(new User
+                            {
+                                Username = @"Dummy",
+                                Id = 1001,
+                                Statistics = new UserStatistics
+                                {
+                                    PP = 928 // Expected recommended star difficulty is 2.999
+                                }
+                            });
+                            break;
+                    }
+                };
+                // Force recommender to calculate its star ratings again
+                recommender.APIStateChanged(API, APIState.Online);
+            });
+        }
+
+        [Test]
+        public void TestPresentedBeatmapIsRecommended()
+        {
+            var importFunctions = importBeatmaps(5);
+
+            for (int i = 0; i < 5; i++)
+            {
+                presentAndConfirm(importFunctions[i], i);
+            }
+        }
+
+        private List<Func<BeatmapSetInfo>> importBeatmaps(int amount, RulesetInfo ruleset = null)
+        {
+            var importFunctions = new List<Func<BeatmapSetInfo>>();
+
+            for (int i = 0; i < amount; i++)
+            {
+                importFunctions.Add(importBeatmap(i, ruleset));
+            }
+
+            return importFunctions;
+        }
+
+        private Func<BeatmapSetInfo> importBeatmap(int i, RulesetInfo ruleset = null)
+        {
+            BeatmapSetInfo imported = null;
+            AddStep($"import beatmap {i * 1000}", () =>
+            {
+                var difficulty = new BeatmapDifficulty();
+                var metadata = new BeatmapMetadata
+                {
+                    Artist = "SomeArtist",
+                    AuthorString = "SomeAuthor",
+                    Title = $"import {i * 1000}"
+                };
+
+                var beatmaps = new List<BeatmapInfo>();
+
+                for (int j = 1; j <= 5; j++)
+                {
+                    beatmaps.Add(new BeatmapInfo
+                    {
+                        OnlineBeatmapID = j * 1024 + i * 5,
+                        Metadata = metadata,
+                        BaseDifficulty = difficulty,
+                        Ruleset = ruleset ?? new OsuRuleset().RulesetInfo,
+                        StarDifficulty = j,
+                    });
+                }
+
+                imported = Game.BeatmapManager.Import(new BeatmapSetInfo
+                {
+                    Hash = Guid.NewGuid().ToString(),
+                    OnlineBeatmapSetID = i,
+                    Metadata = metadata,
+                    Beatmaps = beatmaps,
+                }).Result;
+            });
+
+            AddAssert($"import {i * 1000} succeeded", () => imported != null);
+
+            return () => imported;
+        }
+
+        private void presentAndConfirm(Func<BeatmapSetInfo> getImport, int importedID)
+        {
+            AddStep("present beatmap", () => Game.PresentBeatmap(getImport()));
+
+            AddUntilStep("wait for song select", () => Game.ScreenStack.CurrentScreen is Screens.Select.SongSelect);
+            AddUntilStep("recommended beatmap displayed", () => Game.Beatmap.Value.BeatmapInfo.OnlineBeatmapID == importedID * 5 + 1024 * 3);
+            AddAssert("correct ruleset selected", () => Game.Ruleset.Value.ID == getImport().Beatmaps.First().Ruleset.ID);
+        }
+    }
+}

From 1ac9ee599088d893211bd6dbcdba16662275e745 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Fri, 17 Apr 2020 18:15:11 +0300
Subject: [PATCH 0029/3722] Optimize recommender (for custom rulesets)

---
 .../Screens/Select/DifficultyRecommender.cs   | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index e7536db356..07dfc3a85e 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -51,8 +51,7 @@ namespace osu.Game.Screens.Select
 
             foreach (var r in getBestRulesetOrder())
             {
-                if (!recommendedStarDifficulty.TryGetValue(ruleset.Value, out var stars))
-                    break;
+                recommendedStarDifficulty.TryGetValue(ruleset.Value, out var stars);
 
                 beatmap = beatmaps.Where(b => b.Ruleset.Equals(r)).OrderBy(b =>
                 {
@@ -75,6 +74,7 @@ namespace osu.Game.Screens.Select
 
                 req.Success += result =>
                 {
+                    bestRulesetOrder = null;
                     // algorithm taken from https://github.com/ppy/osu-web/blob/e6e2825516449e3d0f3f5e1852c6bdd3428c3437/app/Models/User.php#L1505
                     recommendedStarDifficulty[rulesetInfo] = Math.Pow((double)(result.Statistics.PP ?? 0), 0.4) * 0.195;
                 };
@@ -87,22 +87,30 @@ namespace osu.Game.Screens.Select
 
         private IEnumerable<RulesetInfo> getBestRulesetOrder()
         {
-            if (bestRulesetOrder != null)
-                return moveCurrentRulesetToFirst();
-
-            bestRulesetOrder = recommendedStarDifficulty.ToList()
-                                                        .OrderBy(pair => pair.Value)
-                                                        .Select(pair => pair.Key)
-                                                        .Reverse();
+            bestRulesetOrder ??= recommendedStarDifficulty.ToList()
+                                                          .OrderBy(pair => pair.Value)
+                                                          .Select(pair => pair.Key)
+                                                          .Reverse();
 
             return moveCurrentRulesetToFirst();
         }
 
         private IEnumerable<RulesetInfo> moveCurrentRulesetToFirst()
         {
-            var orderedRulesets = bestRulesetOrder.ToList();
-            orderedRulesets.Remove(ruleset.Value);
-            orderedRulesets.Insert(0, ruleset.Value);
+            List<RulesetInfo> orderedRulesets = null;
+
+            if (bestRulesetOrder.Contains(ruleset.Value))
+            {
+                orderedRulesets = bestRulesetOrder.ToList();
+                orderedRulesets.Remove(ruleset.Value);
+                orderedRulesets.Insert(0, ruleset.Value);
+            }
+            else
+            {
+                orderedRulesets = new List<RulesetInfo> { ruleset.Value };
+                orderedRulesets.AddRange(bestRulesetOrder);
+            }
+
             return orderedRulesets;
         }
 

From 90fa58b3b65c7221990bfbc12237577a489c4741 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Fri, 17 Apr 2020 19:55:51 +0300
Subject: [PATCH 0030/3722] More testing

---
 .../TestSceneBeatmapRecommendations.cs        | 96 +++++++++++++------
 .../Online/API/Requests/GetUserRequest.cs     |  6 +-
 2 files changed, 70 insertions(+), 32 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
index 80a00ac9a1..ec5fe65fdd 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
@@ -6,44 +6,53 @@ using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Logging;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Rulesets;
-using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Select;
 using osu.Game.Tests.Visual.Navigation;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.SongSelect
 {
+    [HeadlessTest]
     public class TestSceneBeatmapRecommendations : OsuGameTestScene
     {
         [Resolved]
         private DifficultyRecommender recommender { get; set; }
 
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
+
         [SetUpSteps]
         public new void SetUpSteps()
         {
             AddStep("register request handling", () =>
             {
-                Logger.Log($"Registering request handling for {(DummyAPIAccess)API}");
                 ((DummyAPIAccess)API).HandleRequest = req =>
                 {
-                    Logger.Log($"New request {req}");
-
                     switch (req)
                     {
                         case GetUserRequest userRequest:
+
+                            decimal pp = userRequest.Ruleset.ID switch
+                            {
+                                0 => 336, // Expected recommended star difficulty 2*
+                                1 => 928, // Expected recommended star difficulty 3*
+                                2 => 1905, // Expected recommended star difficulty 4*
+                                3 => 3329, // Expected recommended star difficulty 5*
+                                _ => 0
+                            };
+
                             userRequest.TriggerSuccess(new User
                             {
                                 Username = @"Dummy",
                                 Id = 1001,
                                 Statistics = new UserStatistics
                                 {
-                                    PP = 928 // Expected recommended star difficulty is 2.999
+                                    PP = pp
                                 }
                             });
                             break;
@@ -57,74 +66,103 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestPresentedBeatmapIsRecommended()
         {
-            var importFunctions = importBeatmaps(5);
+            var importFunctions = new List<Func<BeatmapSetInfo>>();
 
             for (int i = 0; i < 5; i++)
             {
-                presentAndConfirm(importFunctions[i], i);
+                importFunctions.Add(importBeatmap(i, new List<RulesetInfo> { null, null, null, null, null }));
             }
-        }
 
-        private List<Func<BeatmapSetInfo>> importBeatmaps(int amount, RulesetInfo ruleset = null)
-        {
-            var importFunctions = new List<Func<BeatmapSetInfo>>();
-
-            for (int i = 0; i < amount; i++)
+            for (int i = 0; i < 5; i++)
             {
-                importFunctions.Add(importBeatmap(i, ruleset));
+                presentAndConfirm(importFunctions[i], i, 2);
             }
-
-            return importFunctions;
         }
 
-        private Func<BeatmapSetInfo> importBeatmap(int i, RulesetInfo ruleset = null)
+        [Test]
+        public void TestBestRulesetIsRecommended()
+        {
+            var osuRuleset = rulesets.AvailableRulesets.First(r => r.ID == 0);
+            var taikoRuleset = rulesets.AvailableRulesets.First(r => r.ID == 1);
+            var catchRuleset = rulesets.AvailableRulesets.First(r => r.ID == 2);
+            var maniaRuleset = rulesets.AvailableRulesets.First(r => r.ID == 3);
+
+            var osuImport = importBeatmap(0, new List<RulesetInfo> { osuRuleset });
+            var mixedImport = importBeatmap(1, new List<RulesetInfo> { taikoRuleset, catchRuleset, maniaRuleset });
+
+            // Make sure we are on standard ruleset
+            presentAndConfirm(osuImport, 0, 1);
+
+            // Present mixed difficulty set, expect ruleset with highest star difficulty
+            presentAndConfirm(mixedImport, 1, 3);
+        }
+
+        [Test]
+        public void TestSecondBestRulesetIsRecommended()
+        {
+            var osuRuleset = rulesets.AvailableRulesets.First(r => r.ID == 0);
+            var taikoRuleset = rulesets.AvailableRulesets.First(r => r.ID == 1);
+            var catchRuleset = rulesets.AvailableRulesets.First(r => r.ID == 2);
+
+            var osuImport = importBeatmap(0, new List<RulesetInfo> { osuRuleset });
+            var mixedImport = importBeatmap(1, new List<RulesetInfo> { taikoRuleset, catchRuleset, taikoRuleset });
+
+            // Make sure we are on standard ruleset
+            presentAndConfirm(osuImport, 0, 1);
+
+            // Present mixed difficulty set, expect ruleset with highest star difficulty
+            presentAndConfirm(mixedImport, 1, 2);
+        }
+
+        private Func<BeatmapSetInfo> importBeatmap(int importID, List<RulesetInfo> rulesets)
         {
             BeatmapSetInfo imported = null;
-            AddStep($"import beatmap {i * 1000}", () =>
+            AddStep($"import beatmap {importID}", () =>
             {
                 var difficulty = new BeatmapDifficulty();
                 var metadata = new BeatmapMetadata
                 {
                     Artist = "SomeArtist",
                     AuthorString = "SomeAuthor",
-                    Title = $"import {i * 1000}"
+                    Title = $"import {importID}"
                 };
 
                 var beatmaps = new List<BeatmapInfo>();
+                int difficultyID = 1;
 
-                for (int j = 1; j <= 5; j++)
+                foreach (RulesetInfo r in rulesets)
                 {
                     beatmaps.Add(new BeatmapInfo
                     {
-                        OnlineBeatmapID = j * 1024 + i * 5,
+                        OnlineBeatmapID = importID + 1024 * difficultyID,
                         Metadata = metadata,
                         BaseDifficulty = difficulty,
-                        Ruleset = ruleset ?? new OsuRuleset().RulesetInfo,
-                        StarDifficulty = j,
+                        Ruleset = r ?? rulesets.First(),
+                        StarDifficulty = difficultyID,
                     });
+                    difficultyID++;
                 }
 
                 imported = Game.BeatmapManager.Import(new BeatmapSetInfo
                 {
                     Hash = Guid.NewGuid().ToString(),
-                    OnlineBeatmapSetID = i,
+                    OnlineBeatmapSetID = importID,
                     Metadata = metadata,
                     Beatmaps = beatmaps,
                 }).Result;
             });
 
-            AddAssert($"import {i * 1000} succeeded", () => imported != null);
+            AddAssert($"import {importID} succeeded", () => imported != null);
 
             return () => imported;
         }
 
-        private void presentAndConfirm(Func<BeatmapSetInfo> getImport, int importedID)
+        private void presentAndConfirm(Func<BeatmapSetInfo> getImport, int importedID, int expextedDiff)
         {
             AddStep("present beatmap", () => Game.PresentBeatmap(getImport()));
 
             AddUntilStep("wait for song select", () => Game.ScreenStack.CurrentScreen is Screens.Select.SongSelect);
-            AddUntilStep("recommended beatmap displayed", () => Game.Beatmap.Value.BeatmapInfo.OnlineBeatmapID == importedID * 5 + 1024 * 3);
-            AddAssert("correct ruleset selected", () => Game.Ruleset.Value.ID == getImport().Beatmaps.First().Ruleset.ID);
+            AddUntilStep("recommended beatmap displayed", () => Game.Beatmap.Value.BeatmapInfo.OnlineBeatmapID == importedID + 1024 * expextedDiff);
         }
     }
 }
diff --git a/osu.Game/Online/API/Requests/GetUserRequest.cs b/osu.Game/Online/API/Requests/GetUserRequest.cs
index 31b7e95b39..42aad6f9eb 100644
--- a/osu.Game/Online/API/Requests/GetUserRequest.cs
+++ b/osu.Game/Online/API/Requests/GetUserRequest.cs
@@ -9,14 +9,14 @@ namespace osu.Game.Online.API.Requests
     public class GetUserRequest : APIRequest<User>
     {
         private readonly long? userId;
-        private readonly RulesetInfo ruleset;
+        public readonly RulesetInfo Ruleset;
 
         public GetUserRequest(long? userId = null, RulesetInfo ruleset = null)
         {
             this.userId = userId;
-            this.ruleset = ruleset;
+            Ruleset = ruleset;
         }
 
-        protected override string Target => userId.HasValue ? $@"users/{userId}/{ruleset?.ShortName}" : $@"me/{ruleset?.ShortName}";
+        protected override string Target => userId.HasValue ? $@"users/{userId}/{Ruleset?.ShortName}" : $@"me/{Ruleset?.ShortName}";
     }
 }

From 4aaa00e3219611c387dcdf20dc4f04103bb7af07 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Fri, 17 Apr 2020 20:33:12 +0300
Subject: [PATCH 0031/3722] Fix CI complaints

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

diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index 07dfc3a85e..4d48cc3fe7 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -97,7 +97,7 @@ namespace osu.Game.Screens.Select
 
         private IEnumerable<RulesetInfo> moveCurrentRulesetToFirst()
         {
-            List<RulesetInfo> orderedRulesets = null;
+            List<RulesetInfo> orderedRulesets;
 
             if (bestRulesetOrder.Contains(ruleset.Value))
             {

From ce47b7ca932f85b2ac323b0c220da2eaa88dd3ef Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sat, 25 Apr 2020 10:21:01 +0300
Subject: [PATCH 0032/3722] Unnest in SetUpSteps

---
 .../TestSceneBeatmapRecommendations.cs        | 59 ++++++++++++-------
 1 file changed, 38 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
index ec5fe65fdd..3f2117a4f8 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
@@ -36,31 +36,48 @@ namespace osu.Game.Tests.Visual.SongSelect
                     switch (req)
                     {
                         case GetUserRequest userRequest:
-
-                            decimal pp = userRequest.Ruleset.ID switch
-                            {
-                                0 => 336, // Expected recommended star difficulty 2*
-                                1 => 928, // Expected recommended star difficulty 3*
-                                2 => 1905, // Expected recommended star difficulty 4*
-                                3 => 3329, // Expected recommended star difficulty 5*
-                                _ => 0
-                            };
-
-                            userRequest.TriggerSuccess(new User
-                            {
-                                Username = @"Dummy",
-                                Id = 1001,
-                                Statistics = new UserStatistics
-                                {
-                                    PP = pp
-                                }
-                            });
+                            userRequest.TriggerSuccess(getUser(userRequest.Ruleset.ID));
                             break;
                     }
                 };
-                // Force recommender to calculate its star ratings again
-                recommender.APIStateChanged(API, APIState.Online);
             });
+
+            // Force recommender to calculate its star ratings again
+            AddStep("calculate recommended SRs", () => recommender.APIStateChanged(API, APIState.Online));
+
+            User getUser(int? rulesetID)
+            {
+                return new User
+                {
+                    Username = @"Dummy",
+                    Id = 1001,
+                    Statistics = new UserStatistics
+                    {
+                        PP = getNecessaryPP(rulesetID)
+                    }
+                };
+            }
+
+            decimal getNecessaryPP(int? rulesetID)
+            {
+                switch (rulesetID)
+                {
+                    case 0:
+                        return 336;
+
+                    case 1:
+                        return 928;
+
+                    case 2:
+                        return 1905;
+
+                    case 3:
+                        return 3329;
+
+                    default:
+                        return 0;
+                }
+            }
         }
 
         [Test]

From 52416ea90a49f2632a2173ab1c55ca458883b4bc Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sat, 25 Apr 2020 10:22:19 +0300
Subject: [PATCH 0033/3722] Use GetRuleset

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

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
index 3f2117a4f8..aed1729d7d 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
@@ -99,10 +99,10 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestBestRulesetIsRecommended()
         {
-            var osuRuleset = rulesets.AvailableRulesets.First(r => r.ID == 0);
-            var taikoRuleset = rulesets.AvailableRulesets.First(r => r.ID == 1);
-            var catchRuleset = rulesets.AvailableRulesets.First(r => r.ID == 2);
-            var maniaRuleset = rulesets.AvailableRulesets.First(r => r.ID == 3);
+            var osuRuleset = rulesets.GetRuleset(0);
+            var taikoRuleset = rulesets.GetRuleset(1);
+            var catchRuleset = rulesets.GetRuleset(2);
+            var maniaRuleset = rulesets.GetRuleset(3);
 
             var osuImport = importBeatmap(0, new List<RulesetInfo> { osuRuleset });
             var mixedImport = importBeatmap(1, new List<RulesetInfo> { taikoRuleset, catchRuleset, maniaRuleset });
@@ -117,9 +117,9 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestSecondBestRulesetIsRecommended()
         {
-            var osuRuleset = rulesets.AvailableRulesets.First(r => r.ID == 0);
-            var taikoRuleset = rulesets.AvailableRulesets.First(r => r.ID == 1);
-            var catchRuleset = rulesets.AvailableRulesets.First(r => r.ID == 2);
+            var osuRuleset = rulesets.GetRuleset(0);
+            var taikoRuleset = rulesets.GetRuleset(1);
+            var catchRuleset = rulesets.GetRuleset(2);
 
             var osuImport = importBeatmap(0, new List<RulesetInfo> { osuRuleset });
             var mixedImport = importBeatmap(1, new List<RulesetInfo> { taikoRuleset, catchRuleset, taikoRuleset });

From e906ec4d92d8d75467684630a80c606053ff7484 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sat, 25 Apr 2020 10:25:07 +0300
Subject: [PATCH 0034/3722] Fix typo

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

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
index aed1729d7d..f3a118572f 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
@@ -174,12 +174,12 @@ namespace osu.Game.Tests.Visual.SongSelect
             return () => imported;
         }
 
-        private void presentAndConfirm(Func<BeatmapSetInfo> getImport, int importedID, int expextedDiff)
+        private void presentAndConfirm(Func<BeatmapSetInfo> getImport, int importedID, int expectedDiff)
         {
             AddStep("present beatmap", () => Game.PresentBeatmap(getImport()));
 
             AddUntilStep("wait for song select", () => Game.ScreenStack.CurrentScreen is Screens.Select.SongSelect);
-            AddUntilStep("recommended beatmap displayed", () => Game.Beatmap.Value.BeatmapInfo.OnlineBeatmapID == importedID + 1024 * expextedDiff);
+            AddUntilStep("recommended beatmap displayed", () => Game.Beatmap.Value.BeatmapInfo.OnlineBeatmapID == importedID + 1024 * expectedDiff);
         }
     }
 }

From e65acc34018df7f77594ae8fff8c369a62a01ef8 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sat, 25 Apr 2020 10:36:19 +0300
Subject: [PATCH 0035/3722] Other review suggestions

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

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
index f3a118572f..f49dae4033 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
@@ -87,12 +87,12 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             for (int i = 0; i < 5; i++)
             {
-                importFunctions.Add(importBeatmap(i, new List<RulesetInfo> { null, null, null, null, null }));
+                importFunctions.Add(importBeatmap(i, Enumerable.Repeat(rulesets.GetRuleset(0), 5)));
             }
 
             for (int i = 0; i < 5; i++)
             {
-                presentAndConfirm(importFunctions[i], i, 2);
+                presentAndConfirm(importFunctions[i], 2);
             }
         }
 
@@ -108,10 +108,10 @@ namespace osu.Game.Tests.Visual.SongSelect
             var mixedImport = importBeatmap(1, new List<RulesetInfo> { taikoRuleset, catchRuleset, maniaRuleset });
 
             // Make sure we are on standard ruleset
-            presentAndConfirm(osuImport, 0, 1);
+            presentAndConfirm(osuImport, 1);
 
             // Present mixed difficulty set, expect ruleset with highest star difficulty
-            presentAndConfirm(mixedImport, 1, 3);
+            presentAndConfirm(mixedImport, 3);
         }
 
         [Test]
@@ -125,13 +125,13 @@ namespace osu.Game.Tests.Visual.SongSelect
             var mixedImport = importBeatmap(1, new List<RulesetInfo> { taikoRuleset, catchRuleset, taikoRuleset });
 
             // Make sure we are on standard ruleset
-            presentAndConfirm(osuImport, 0, 1);
+            presentAndConfirm(osuImport, 1);
 
             // Present mixed difficulty set, expect ruleset with highest star difficulty
-            presentAndConfirm(mixedImport, 1, 2);
+            presentAndConfirm(mixedImport, 2);
         }
 
-        private Func<BeatmapSetInfo> importBeatmap(int importID, List<RulesetInfo> rulesets)
+        private Func<BeatmapSetInfo> importBeatmap(int importID, IEnumerable<RulesetInfo> rulesetEnumerable)
         {
             BeatmapSetInfo imported = null;
             AddStep($"import beatmap {importID}", () =>
@@ -147,14 +147,14 @@ namespace osu.Game.Tests.Visual.SongSelect
                 var beatmaps = new List<BeatmapInfo>();
                 int difficultyID = 1;
 
-                foreach (RulesetInfo r in rulesets)
+                foreach (RulesetInfo r in rulesetEnumerable)
                 {
                     beatmaps.Add(new BeatmapInfo
                     {
                         OnlineBeatmapID = importID + 1024 * difficultyID,
                         Metadata = metadata,
                         BaseDifficulty = difficulty,
-                        Ruleset = r ?? rulesets.First(),
+                        Ruleset = r ?? rulesets.AvailableRulesets.First(),
                         StarDifficulty = difficultyID,
                     });
                     difficultyID++;
@@ -174,12 +174,16 @@ namespace osu.Game.Tests.Visual.SongSelect
             return () => imported;
         }
 
-        private void presentAndConfirm(Func<BeatmapSetInfo> getImport, int importedID, int expectedDiff)
+        private void presentAndConfirm(Func<BeatmapSetInfo> getImport, int expectedDiff)
         {
             AddStep("present beatmap", () => Game.PresentBeatmap(getImport()));
 
             AddUntilStep("wait for song select", () => Game.ScreenStack.CurrentScreen is Screens.Select.SongSelect);
-            AddUntilStep("recommended beatmap displayed", () => Game.Beatmap.Value.BeatmapInfo.OnlineBeatmapID == importedID + 1024 * expectedDiff);
+            AddUntilStep("recommended beatmap displayed", () =>
+            {
+                int? expectedID = getImport().Beatmaps[expectedDiff - 1].OnlineBeatmapID;
+                return Game.Beatmap.Value.BeatmapInfo.OnlineBeatmapID == expectedID;
+            });
         }
     }
 }

From f68a7401b9577ca357ac931129133306b632a159 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sat, 25 Apr 2020 10:37:18 +0300
Subject: [PATCH 0036/3722] Fix comment

---
 .../Visual/SongSelect/TestSceneBeatmapRecommendations.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
index f49dae4033..a6e3e0c1c6 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
@@ -127,7 +127,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             // Make sure we are on standard ruleset
             presentAndConfirm(osuImport, 1);
 
-            // Present mixed difficulty set, expect ruleset with highest star difficulty
+            // Present mixed difficulty set, expect ruleset with second highest star difficulty
             presentAndConfirm(mixedImport, 2);
         }
 

From cea582992fa9075899d36d0a4792c7fe13db4bce Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sat, 25 Apr 2020 10:47:12 +0300
Subject: [PATCH 0037/3722] Fix early return check

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index eb86ef4116..9707475cc7 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -339,7 +339,7 @@ namespace osu.Game
                     menuScreen.LoadToSolo();
 
                 // we might even already be at the song
-                if (Beatmap.Value.BeatmapSetInfo.Hash == databasedSet.Hash && difficultyCriteria(Beatmap.Value.BeatmapInfo))
+                if (Beatmap.Value.BeatmapSetInfo.Hash == databasedSet.Hash && (difficultyCriteria?.Invoke(Beatmap.Value.BeatmapInfo) ?? true))
                 {
                     return;
                 }

From 16f53991a898e4b7aae75c8bbfc4935b6876cf57 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sat, 25 Apr 2020 10:50:00 +0300
Subject: [PATCH 0038/3722] Test presenting same beatmap more than once

---
 osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs b/osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs
index 27f5b29738..eb73fded2f 100644
--- a/osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs
@@ -55,8 +55,14 @@ namespace osu.Game.Tests.Visual.Navigation
             var secondimport = importBeatmap(3);
             presentAndConfirm(secondimport);
 
+            // Test presenting same beatmap more than once
+            presentAndConfirm(secondimport);
+
             presentSecondDifficultyAndConfirm(firstImport, 1);
             presentSecondDifficultyAndConfirm(secondimport, 3);
+
+            // Test presenting same beatmap more than once
+            presentSecondDifficultyAndConfirm(secondimport, 3);
         }
 
         [Test]

From 2913a8183538f823858aace50834f9e38a74b726 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 1 May 2020 16:59:45 +0200
Subject: [PATCH 0039/3722] Improve test code quality & safety

---
 .../Visual/Navigation/OsuGameTestScene.cs     |   2 +-
 .../TestSceneBeatmapRecommendations.cs        | 122 +++++++++---------
 2 files changed, 60 insertions(+), 64 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
index 31afce86ae..a3ef33b916 100644
--- a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
+++ b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Tests.Visual.Navigation
         }
 
         [SetUpSteps]
-        public void SetUpSteps()
+        public virtual void SetUpSteps()
         {
             AddStep("Create new game instance", () =>
             {
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
index a6e3e0c1c6..5fb4e80b51 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
@@ -11,23 +11,25 @@ using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 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.Screens.Select;
 using osu.Game.Tests.Visual.Navigation;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.SongSelect
 {
-    [HeadlessTest]
     public class TestSceneBeatmapRecommendations : OsuGameTestScene
     {
+        protected override bool UseOnlineAPI => false;
+
         [Resolved]
         private DifficultyRecommender recommender { get; set; }
 
-        [Resolved]
-        private RulesetStore rulesets { get; set; }
-
         [SetUpSteps]
-        public new void SetUpSteps()
+        public override void SetUpSteps()
         {
             AddStep("register request handling", () =>
             {
@@ -42,6 +44,8 @@ namespace osu.Game.Tests.Visual.SongSelect
                 };
             });
 
+            base.SetUpSteps();
+
             // Force recommender to calculate its star ratings again
             AddStep("calculate recommended SRs", () => recommender.APIStateChanged(API, APIState.Online));
 
@@ -83,97 +87,89 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestPresentedBeatmapIsRecommended()
         {
-            var importFunctions = new List<Func<BeatmapSetInfo>>();
+            List<BeatmapSetInfo> beatmapSets = null;
+            const int import_count = 5;
 
-            for (int i = 0; i < 5; i++)
+            AddStep("import 5 maps", () =>
             {
-                importFunctions.Add(importBeatmap(i, Enumerable.Repeat(rulesets.GetRuleset(0), 5)));
-            }
+                beatmapSets = new List<BeatmapSetInfo>();
 
-            for (int i = 0; i < 5; i++)
-            {
-                presentAndConfirm(importFunctions[i], 2);
-            }
+                for (int i = 0; i < import_count; ++i)
+                {
+                    beatmapSets.Add(importBeatmapSet(i, Enumerable.Repeat(new OsuRuleset().RulesetInfo, 5)));
+                }
+            });
+
+            AddAssert("all sets imported", () => ensureAllBeatmapSetsImported(beatmapSets));
+
+            presentAndConfirm(() => beatmapSets[3], 2);
         }
 
         [Test]
         public void TestBestRulesetIsRecommended()
         {
-            var osuRuleset = rulesets.GetRuleset(0);
-            var taikoRuleset = rulesets.GetRuleset(1);
-            var catchRuleset = rulesets.GetRuleset(2);
-            var maniaRuleset = rulesets.GetRuleset(3);
+            BeatmapSetInfo osuSet = null, mixedSet = null;
 
-            var osuImport = importBeatmap(0, new List<RulesetInfo> { osuRuleset });
-            var mixedImport = importBeatmap(1, new List<RulesetInfo> { taikoRuleset, catchRuleset, maniaRuleset });
+            AddStep("create osu! beatmapset", () => osuSet = importBeatmapSet(0, new[] { new OsuRuleset().RulesetInfo }));
+            AddStep("create mixed beatmapset", () => mixedSet = importBeatmapSet(1,
+                new[] { new TaikoRuleset().RulesetInfo, new CatchRuleset().RulesetInfo, new ManiaRuleset().RulesetInfo }));
+
+            AddAssert("all sets imported", () => ensureAllBeatmapSetsImported(new[] { osuSet, mixedSet }));
 
             // Make sure we are on standard ruleset
-            presentAndConfirm(osuImport, 1);
+            presentAndConfirm(() => osuSet, 1);
 
             // Present mixed difficulty set, expect ruleset with highest star difficulty
-            presentAndConfirm(mixedImport, 3);
+            presentAndConfirm(() => mixedSet, 3);
         }
 
         [Test]
         public void TestSecondBestRulesetIsRecommended()
         {
-            var osuRuleset = rulesets.GetRuleset(0);
-            var taikoRuleset = rulesets.GetRuleset(1);
-            var catchRuleset = rulesets.GetRuleset(2);
+            BeatmapSetInfo osuSet = null, mixedSet = null;
 
-            var osuImport = importBeatmap(0, new List<RulesetInfo> { osuRuleset });
-            var mixedImport = importBeatmap(1, new List<RulesetInfo> { taikoRuleset, catchRuleset, taikoRuleset });
+            AddStep("create osu! beatmapset", () => osuSet = importBeatmapSet(0, new[] { new OsuRuleset().RulesetInfo }));
+            AddStep("create mixed beatmapset", () => mixedSet = importBeatmapSet(1,
+                new[] { new TaikoRuleset().RulesetInfo, new CatchRuleset().RulesetInfo, new TaikoRuleset().RulesetInfo }));
+
+            AddAssert("all sets imported", () => ensureAllBeatmapSetsImported(new[] { osuSet, mixedSet }));
 
             // Make sure we are on standard ruleset
-            presentAndConfirm(osuImport, 1);
+            presentAndConfirm(() => osuSet, 1);
 
             // Present mixed difficulty set, expect ruleset with second highest star difficulty
-            presentAndConfirm(mixedImport, 2);
+            presentAndConfirm(() => mixedSet, 2);
         }
 
-        private Func<BeatmapSetInfo> importBeatmap(int importID, IEnumerable<RulesetInfo> rulesetEnumerable)
+        private BeatmapSetInfo importBeatmapSet(int importID, IEnumerable<RulesetInfo> difficultyRulesets)
         {
-            BeatmapSetInfo imported = null;
-            AddStep($"import beatmap {importID}", () =>
+            var metadata = new BeatmapMetadata
             {
-                var difficulty = new BeatmapDifficulty();
-                var metadata = new BeatmapMetadata
-                {
-                    Artist = "SomeArtist",
-                    AuthorString = "SomeAuthor",
-                    Title = $"import {importID}"
-                };
+                Artist = "SomeArtist",
+                AuthorString = "SomeAuthor",
+                Title = $"import {importID}"
+            };
 
-                var beatmaps = new List<BeatmapInfo>();
-                int difficultyID = 1;
-
-                foreach (RulesetInfo r in rulesetEnumerable)
+            var beatmapSet = new BeatmapSetInfo
+            {
+                Hash = Guid.NewGuid().ToString(),
+                OnlineBeatmapSetID = importID,
+                Metadata = metadata,
+                Beatmaps = difficultyRulesets.Select((ruleset, difficultyIndex) => new BeatmapInfo
                 {
-                    beatmaps.Add(new BeatmapInfo
-                    {
-                        OnlineBeatmapID = importID + 1024 * difficultyID,
-                        Metadata = metadata,
-                        BaseDifficulty = difficulty,
-                        Ruleset = r ?? rulesets.AvailableRulesets.First(),
-                        StarDifficulty = difficultyID,
-                    });
-                    difficultyID++;
-                }
-
-                imported = Game.BeatmapManager.Import(new BeatmapSetInfo
-                {
-                    Hash = Guid.NewGuid().ToString(),
-                    OnlineBeatmapSetID = importID,
+                    OnlineBeatmapID = importID * 1024 + difficultyIndex,
                     Metadata = metadata,
-                    Beatmaps = beatmaps,
-                }).Result;
-            });
+                    BaseDifficulty = new BeatmapDifficulty(),
+                    Ruleset = ruleset,
+                    StarDifficulty = difficultyIndex + 1
+                }).ToList()
+            };
 
-            AddAssert($"import {importID} succeeded", () => imported != null);
-
-            return () => imported;
+            return Game.BeatmapManager.Import(beatmapSet).Result;
         }
 
+        private bool ensureAllBeatmapSetsImported(IEnumerable<BeatmapSetInfo> beatmapSets) => beatmapSets.All(set => set != null);
+
         private void presentAndConfirm(Func<BeatmapSetInfo> getImport, int expectedDiff)
         {
             AddStep("present beatmap", () => Game.PresentBeatmap(getImport()));

From 9f091f3a5635cdca80c15511a7e888c70f0536f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 1 May 2020 17:02:28 +0200
Subject: [PATCH 0040/3722] Do not query API for custom rulesets

---
 osu.Game/Screens/Select/DifficultyRecommender.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index 4d48cc3fe7..e9c7f6c464 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -68,7 +68,8 @@ namespace osu.Game.Screens.Select
 
         private void calculateRecommendedDifficulties()
         {
-            rulesets.AvailableRulesets.ForEach(rulesetInfo =>
+            // only query API for built-in rulesets
+            rulesets.AvailableRulesets.Where(ruleset => ruleset.ID <= 3).ForEach(rulesetInfo =>
             {
                 var req = new GetUserRequest(api.LocalUser.Value.Id, rulesetInfo);
 

From 623611d9dc03e210f75615a260cde554aaef2a3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 1 May 2020 17:15:35 +0200
Subject: [PATCH 0041/3722] Simplify ruleset ordering

---
 osu.Game/Screens/Select/DifficultyRecommender.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index e9c7f6c464..0dc4ff95ca 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -88,10 +88,9 @@ namespace osu.Game.Screens.Select
 
         private IEnumerable<RulesetInfo> getBestRulesetOrder()
         {
-            bestRulesetOrder ??= recommendedStarDifficulty.ToList()
-                                                          .OrderBy(pair => pair.Value)
+            bestRulesetOrder ??= recommendedStarDifficulty.OrderByDescending(pair => pair.Value)
                                                           .Select(pair => pair.Key)
-                                                          .Reverse();
+                                                          .ToList();
 
             return moveCurrentRulesetToFirst();
         }

From 3cf60e6e00483b9fd39c001073e29517f2e2ed9e Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Fri, 1 May 2020 19:08:56 +0300
Subject: [PATCH 0042/3722] Add failing test

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

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
index 5fb4e80b51..68f31c5c73 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
@@ -141,6 +141,23 @@ namespace osu.Game.Tests.Visual.SongSelect
             presentAndConfirm(() => mixedSet, 2);
         }
 
+        [Test]
+        public void TestCorrectStarRatingIsUsed()
+        {
+            BeatmapSetInfo osuSet = null, maniaSet = null;
+
+            AddStep("create osu! beatmapset", () => osuSet = importBeatmapSet(0, new[] { new OsuRuleset().RulesetInfo }));
+            AddStep("create mania beatmapset", () => maniaSet = importBeatmapSet(1, Enumerable.Repeat(new ManiaRuleset().RulesetInfo, 10)));
+
+            AddAssert("all sets imported", () => ensureAllBeatmapSetsImported(new[] { osuSet, maniaSet }));
+
+            // Make sure we are on standard ruleset
+            presentAndConfirm(() => osuSet, 1);
+
+            // Present mania set, expect the difficulty that matches recommended mania star rating
+            presentAndConfirm(() => maniaSet, 5);
+        }
+
         private BeatmapSetInfo importBeatmapSet(int importID, IEnumerable<RulesetInfo> difficultyRulesets)
         {
             var metadata = new BeatmapMetadata
@@ -161,7 +178,8 @@ namespace osu.Game.Tests.Visual.SongSelect
                     Metadata = metadata,
                     BaseDifficulty = new BeatmapDifficulty(),
                     Ruleset = ruleset,
-                    StarDifficulty = difficultyIndex + 1
+                    StarDifficulty = difficultyIndex + 1,
+                    Version = $"SR{difficultyIndex + 1}"
                 }).ToList()
             };
 

From 1c04d58d6e55f2a09a237c53a4a2b700ecf0d74d Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Fri, 1 May 2020 19:44:35 +0300
Subject: [PATCH 0043/3722] Fix recommender's incorrect usage of current
 ruleset

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

diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index 0dc4ff95ca..0753bbc5bd 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Screens.Select
 
             foreach (var r in getBestRulesetOrder())
             {
-                recommendedStarDifficulty.TryGetValue(ruleset.Value, out var stars);
+                recommendedStarDifficulty.TryGetValue(r, out var stars);
 
                 beatmap = beatmaps.Where(b => b.Ruleset.Equals(r)).OrderBy(b =>
                 {

From d30e4061cce9ef69ffeb08b342a9f77109b8935e Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Fri, 1 May 2020 19:46:49 +0300
Subject: [PATCH 0044/3722] Add clarifying comment about pp choice

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

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
index 68f31c5c73..fc14af3ab5 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
@@ -67,16 +67,16 @@ namespace osu.Game.Tests.Visual.SongSelect
                 switch (rulesetID)
                 {
                     case 0:
-                        return 336;
+                        return 336; // recommended star rating of 2
 
                     case 1:
-                        return 928;
+                        return 928; // SR 3
 
                     case 2:
-                        return 1905;
+                        return 1905; // SR 4
 
                     case 3:
-                        return 3329;
+                        return 3329; // SR 5
 
                     default:
                         return 0;

From 030b55ae85460f8c1346c5d0574d7886e78bf3c9 Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Wed, 3 Jun 2020 17:55:15 +1200
Subject: [PATCH 0045/3722] Add a section to global keybind settings for song
 select

---
 .../Input/Bindings/GlobalActionContainer.cs     | 17 +++++++++++++++++
 .../KeyBinding/GlobalKeyBindingsSection.cs      | 12 ++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 71771abede..568022b00e 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -56,6 +56,13 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.Control, InputKey.Minus }, GlobalAction.DecreaseScrollSpeed),
         };
 
+        public IEnumerable<KeyBinding> SongSelectKeyBindings => new[]
+        {
+            new KeyBinding(InputKey.F1, GlobalAction.ToggleMods),
+            new KeyBinding(InputKey.F2, GlobalAction.SelectRandom),
+            new KeyBinding(InputKey.F3, GlobalAction.ToggleOptions)
+        };
+
         public IEnumerable<KeyBinding> AudioControlKeyBindings => new[]
         {
             new KeyBinding(new[] { InputKey.Alt, InputKey.Up }, GlobalAction.IncreaseVolume),
@@ -106,6 +113,16 @@ namespace osu.Game.Input.Bindings
         [Description("Toggle mute")]
         ToggleMute,
 
+        // Song select keybindings
+        [Description("Toggle mod selection overlay")]
+        ToggleMods,
+
+        [Description("Select a random beatmap")]
+        SelectRandom,
+
+        [Description("Toggle beatmap options overlay")]
+        ToggleOptions,
+
         // In-Game Keybindings
         [Description("Skip cutscene")]
         SkipCutscene,
diff --git a/osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs b/osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs
index 5b44c486a3..1ae6de4386 100644
--- a/osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs
+++ b/osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs
@@ -21,6 +21,7 @@ namespace osu.Game.Overlays.KeyBinding
         {
             Add(new DefaultBindingsSubsection(manager));
             Add(new AudioControlKeyBindingsSubsection(manager));
+            Add(new SongSelectKeyBindingSubsection(manager));
             Add(new InGameKeyBindingsSubsection(manager));
         }
 
@@ -35,6 +36,17 @@ namespace osu.Game.Overlays.KeyBinding
             }
         }
 
+        private class SongSelectKeyBindingSubsection : KeyBindingsSubsection
+        {
+            protected override string Header => "Song Select";
+
+            public SongSelectKeyBindingSubsection(GlobalActionContainer manager)
+                : base(null)
+            {
+                Defaults = manager.SongSelectKeyBindings;
+            }
+        }
+
         private class InGameKeyBindingsSubsection : KeyBindingsSubsection
         {
             protected override string Header => "In Game";

From 55953b9e858e3828f80abe54a6d4e5eed65f644f Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Wed, 3 Jun 2020 18:13:02 +1200
Subject: [PATCH 0046/3722] Add a keybinding for selecting the previous random
 beatmap Also gave the new actions more meaningful names

---
 osu.Game/Input/Bindings/GlobalActionContainer.cs | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 568022b00e..7257b0ce15 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -58,9 +58,10 @@ namespace osu.Game.Input.Bindings
 
         public IEnumerable<KeyBinding> SongSelectKeyBindings => new[]
         {
-            new KeyBinding(InputKey.F1, GlobalAction.ToggleMods),
-            new KeyBinding(InputKey.F2, GlobalAction.SelectRandom),
-            new KeyBinding(InputKey.F3, GlobalAction.ToggleOptions)
+            new KeyBinding(InputKey.F1, GlobalAction.ToggleModSelection),
+            new KeyBinding(InputKey.F2, GlobalAction.SelectNextRandom),
+            new KeyBinding(new[] { InputKey.Shift, InputKey.F2 }, GlobalAction.SelectPreviousRandom),
+            new KeyBinding(InputKey.F3, GlobalAction.ToggleBeatmapOptions)
         };
 
         public IEnumerable<KeyBinding> AudioControlKeyBindings => new[]
@@ -115,13 +116,16 @@ namespace osu.Game.Input.Bindings
 
         // Song select keybindings
         [Description("Toggle mod selection overlay")]
-        ToggleMods,
+        ToggleModSelection,
 
         [Description("Select a random beatmap")]
-        SelectRandom,
+        SelectNextRandom,
+
+        [Description("Select the last random beatmap")]
+        SelectPreviousRandom,
 
         [Description("Toggle beatmap options overlay")]
-        ToggleOptions,
+        ToggleBeatmapOptions,
 
         // In-Game Keybindings
         [Description("Skip cutscene")]

From 782fddb6f1e722d0814c60d7caf1681e76581e9e Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Thu, 4 Jun 2020 15:21:13 +1200
Subject: [PATCH 0047/3722] Modify FooterButton to implement IKeyBindingHandler
 for responding to hotkeys

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

diff --git a/osu.Game/Screens/Select/FooterButton.cs b/osu.Game/Screens/Select/FooterButton.cs
index 35970cd960..a8393a81d4 100644
--- a/osu.Game/Screens/Select/FooterButton.cs
+++ b/osu.Game/Screens/Select/FooterButton.cs
@@ -12,10 +12,12 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.Containers;
+using osu.Game.Input.Bindings;
+using osu.Framework.Input.Bindings;
 
 namespace osu.Game.Screens.Select
 {
-    public class FooterButton : OsuClickableContainer
+    public class FooterButton : OsuClickableContainer, IKeyBindingHandler<GlobalAction>
     {
         public const float SHEAR_WIDTH = 7.5f;
 
@@ -117,7 +119,7 @@ namespace osu.Game.Screens.Select
 
         public Action Hovered;
         public Action HoverLost;
-        public Key? Hotkey;
+        public GlobalAction? Hotkey;
 
         protected override void UpdateAfterChildren()
         {
@@ -167,15 +169,19 @@ namespace osu.Game.Screens.Select
             return base.OnClick(e);
         }
 
-        protected override bool OnKeyDown(KeyDownEvent e)
+        public virtual bool OnPressed(GlobalAction action)
         {
-            if (!e.Repeat && e.Key == Hotkey)
+            if (action == Hotkey)
             {
                 Click();
                 return true;
             }
+            return false;
+        }
 
-            return base.OnKeyDown(e);
+        public virtual void OnReleased(GlobalAction action)
+        {
+            
         }
     }
 }

From 18db31b50435802cac5b2c0437c293c611999575 Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Thu, 4 Jun 2020 15:25:05 +1200
Subject: [PATCH 0048/3722] Update FooterButtonMods to comply with the changes
 in FooterButton

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

diff --git a/osu.Game/Screens/Select/FooterButtonMods.cs b/osu.Game/Screens/Select/FooterButtonMods.cs
index 02333da0dc..cde8113fa9 100644
--- a/osu.Game/Screens/Select/FooterButtonMods.cs
+++ b/osu.Game/Screens/Select/FooterButtonMods.cs
@@ -14,11 +14,12 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osuTK;
 using osuTK.Graphics;
-using osuTK.Input;
+using osu.Framework.Input.Bindings;
+using osu.Game.Input.Bindings;
 
 namespace osu.Game.Screens.Select
 {
-    public class FooterButtonMods : FooterButton, IHasCurrentValue<IReadOnlyList<Mod>>
+    public class FooterButtonMods : FooterButton, IHasCurrentValue<IReadOnlyList<Mod>>, IKeyBindingHandler<GlobalAction>
     {
         public Bindable<IReadOnlyList<Mod>> Current
         {
@@ -57,7 +58,7 @@ namespace osu.Game.Screens.Select
             lowMultiplierColour = colours.Red;
             highMultiplierColour = colours.Green;
             Text = @"mods";
-            Hotkey = Key.F1;
+            Hotkey = GlobalAction.ToggleModSelection;
         }
 
         protected override void LoadComplete()

From 05e4499bc11890090477cbe8d027996399a9c60a Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Thu, 4 Jun 2020 15:25:18 +1200
Subject: [PATCH 0049/3722] Update FooterButtonOptions to comply with the
 changes in FooterButton

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

diff --git a/osu.Game/Screens/Select/FooterButtonOptions.cs b/osu.Game/Screens/Select/FooterButtonOptions.cs
index c000d8a8c8..e549656785 100644
--- a/osu.Game/Screens/Select/FooterButtonOptions.cs
+++ b/osu.Game/Screens/Select/FooterButtonOptions.cs
@@ -4,7 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Game.Graphics;
-using osuTK.Input;
+using osu.Game.Input.Bindings;
 
 namespace osu.Game.Screens.Select
 {
@@ -16,7 +16,7 @@ namespace osu.Game.Screens.Select
             SelectedColour = colours.Blue;
             DeselectedColour = SelectedColour.Opacity(0.5f);
             Text = @"options";
-            Hotkey = Key.F3;
+            Hotkey = GlobalAction.ToggleBeatmapOptions;
         }
     }
 }

From 568503ef991981f190e17f86d742d80082441560 Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Thu, 4 Jun 2020 16:07:50 +1200
Subject: [PATCH 0050/3722] Update FooterButtonRandom to comply with the
 changes in FooterButton FooterButtonRandom now has 2 Action variables, one
 for both primary and secondary

---
 osu.Game/Screens/Select/FooterButtonRandom.cs | 52 +++++++++++++------
 1 file changed, 35 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Screens/Select/FooterButtonRandom.cs b/osu.Game/Screens/Select/FooterButtonRandom.cs
index a42e6721db..728105200e 100644
--- a/osu.Game/Screens/Select/FooterButtonRandom.cs
+++ b/osu.Game/Screens/Select/FooterButtonRandom.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 osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osuTK.Input;
+using osu.Game.Input.Bindings;
 
 namespace osu.Game.Screens.Select
 {
     public class FooterButtonRandom : FooterButton
     {
+        public Action PrimaryAction { get; set; }
+        public Action SecondaryAction { get; set; }
+
         private readonly SpriteText secondaryText;
         private bool secondaryActive;
 
@@ -37,21 +40,7 @@ namespace osu.Game.Screens.Select
             SelectedColour = colours.Green;
             DeselectedColour = SelectedColour.Opacity(0.5f);
             Text = @"random";
-            Hotkey = Key.F2;
-        }
-
-        protected override bool OnKeyDown(KeyDownEvent e)
-        {
-            secondaryActive = e.ShiftPressed;
-            updateText();
-            return base.OnKeyDown(e);
-        }
-
-        protected override void OnKeyUp(KeyUpEvent e)
-        {
-            secondaryActive = e.ShiftPressed;
-            updateText();
-            base.OnKeyUp(e);
+            Hotkey = GlobalAction.SelectNextRandom;
         }
 
         private void updateText()
@@ -67,5 +56,34 @@ namespace osu.Game.Screens.Select
                 secondaryText.FadeOut(120, Easing.InQuad);
             }
         }
+
+        public override bool OnPressed(GlobalAction action)
+        {
+            switch (action)
+            {
+                case GlobalAction.SelectPreviousRandom:
+                    secondaryActive = true;
+                    Action = SecondaryAction;
+                    updateText();
+                    Click();
+                    return true;
+                case GlobalAction.SelectNextRandom:
+                    Action = PrimaryAction;
+                    updateText();
+                    Click();
+                    return true;
+                default:
+                    return false;
+            }
+        }
+
+        public override void OnReleased(GlobalAction action)
+        {
+            if (action == GlobalAction.SelectPreviousRandom)
+            {
+                secondaryActive = false;
+                updateText();
+            }
+        }
     }
 }

From aa08847bc9fb73b9f1c77dcb711726ef5abfe5e9 Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Thu, 4 Jun 2020 16:08:16 +1200
Subject: [PATCH 0051/3722] Set FooterButtonRandom actions properly when
 creating the button

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

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index d613b0ae8d..e22c055047 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -272,7 +272,7 @@ namespace osu.Game.Screens.Select
             if (Footer != null)
             {
                 Footer.AddButton(new FooterButtonMods { Current = Mods }, ModSelect);
-                Footer.AddButton(new FooterButtonRandom { Action = triggerRandom });
+                Footer.AddButton(new FooterButtonRandom { PrimaryAction = triggerNextRandom, SecondaryAction = triggerPreviousRandom });
                 Footer.AddButton(new FooterButtonOptions(), BeatmapOptions);
 
                 BeatmapOptions.AddButton(@"Remove", @"from unplayed", FontAwesome.Regular.TimesCircle, colours.Purple, null, Key.Number1);
@@ -496,12 +496,14 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        private void triggerRandom()
+        private void triggerNextRandom()
         {
-            if (GetContainingInputManager().CurrentState.Keyboard.ShiftPressed)
-                Carousel.SelectPreviousRandom();
-            else
-                Carousel.SelectNextRandom();
+            Carousel.SelectNextRandom();
+        }
+
+        private void triggerPreviousRandom()
+        {
+            Carousel.SelectPreviousRandom();
         }
 
         public override void OnEntering(IScreen last)

From aeb736e9d2a78d7b913a6acfc35c2494fa0e2acd Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Thu, 4 Jun 2020 16:13:50 +1200
Subject: [PATCH 0052/3722] Fix CodeFactor code style issues

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

diff --git a/osu.Game/Screens/Select/FooterButton.cs b/osu.Game/Screens/Select/FooterButton.cs
index a8393a81d4..6006d3cbfd 100644
--- a/osu.Game/Screens/Select/FooterButton.cs
+++ b/osu.Game/Screens/Select/FooterButton.cs
@@ -179,9 +179,6 @@ namespace osu.Game.Screens.Select
             return false;
         }
 
-        public virtual void OnReleased(GlobalAction action)
-        {
-            
-        }
+        public virtual void OnReleased(GlobalAction action) { }
     }
 }

From eb242085c689249663a938e171c5473b33139b18 Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Thu, 4 Jun 2020 16:24:32 +1200
Subject: [PATCH 0053/3722] Remove redundant interface from FooterButtonMods

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

diff --git a/osu.Game/Screens/Select/FooterButtonMods.cs b/osu.Game/Screens/Select/FooterButtonMods.cs
index cde8113fa9..b98b48a0c0 100644
--- a/osu.Game/Screens/Select/FooterButtonMods.cs
+++ b/osu.Game/Screens/Select/FooterButtonMods.cs
@@ -14,12 +14,11 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osuTK;
 using osuTK.Graphics;
-using osu.Framework.Input.Bindings;
 using osu.Game.Input.Bindings;
 
 namespace osu.Game.Screens.Select
 {
-    public class FooterButtonMods : FooterButton, IHasCurrentValue<IReadOnlyList<Mod>>, IKeyBindingHandler<GlobalAction>
+    public class FooterButtonMods : FooterButton, IHasCurrentValue<IReadOnlyList<Mod>>
     {
         public Bindable<IReadOnlyList<Mod>> Current
         {

From 7141bed78d2d5e9004a10a7cf92cd0b1f0cdf049 Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Thu, 4 Jun 2020 16:40:16 +1200
Subject: [PATCH 0054/3722] Remove redundant directive from FooterButton

---
 osu.Game/Screens/Select/FooterButton.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Select/FooterButton.cs b/osu.Game/Screens/Select/FooterButton.cs
index 6006d3cbfd..6ea519fb80 100644
--- a/osu.Game/Screens/Select/FooterButton.cs
+++ b/osu.Game/Screens/Select/FooterButton.cs
@@ -4,7 +4,6 @@
 using System;
 using osuTK;
 using osuTK.Graphics;
-using osuTK.Input;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;

From a78a8c0d0d4bd567aef4b3263edcde776d7fe743 Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Thu, 4 Jun 2020 16:59:04 +1200
Subject: [PATCH 0055/3722] Add missing blank lines

---
 osu.Game/Screens/Select/FooterButton.cs       | 1 +
 osu.Game/Screens/Select/FooterButtonRandom.cs | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Select/FooterButton.cs b/osu.Game/Screens/Select/FooterButton.cs
index 6ea519fb80..0502546de8 100644
--- a/osu.Game/Screens/Select/FooterButton.cs
+++ b/osu.Game/Screens/Select/FooterButton.cs
@@ -175,6 +175,7 @@ namespace osu.Game.Screens.Select
                 Click();
                 return true;
             }
+
             return false;
         }
 
diff --git a/osu.Game/Screens/Select/FooterButtonRandom.cs b/osu.Game/Screens/Select/FooterButtonRandom.cs
index 728105200e..fdb1159484 100644
--- a/osu.Game/Screens/Select/FooterButtonRandom.cs
+++ b/osu.Game/Screens/Select/FooterButtonRandom.cs
@@ -67,11 +67,13 @@ namespace osu.Game.Screens.Select
                     updateText();
                     Click();
                     return true;
+
                 case GlobalAction.SelectNextRandom:
                     Action = PrimaryAction;
                     updateText();
                     Click();
                     return true;
+
                 default:
                     return false;
             }

From bd3e40a8cfd6c103d05f399db4186cfc1c6339b7 Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Thu, 4 Jun 2020 20:57:24 +1200
Subject: [PATCH 0056/3722] Move default return out of switch/case

---
 osu.Game/Screens/Select/FooterButtonRandom.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/FooterButtonRandom.cs b/osu.Game/Screens/Select/FooterButtonRandom.cs
index fdb1159484..e2e5c63740 100644
--- a/osu.Game/Screens/Select/FooterButtonRandom.cs
+++ b/osu.Game/Screens/Select/FooterButtonRandom.cs
@@ -73,10 +73,9 @@ namespace osu.Game.Screens.Select
                     updateText();
                     Click();
                     return true;
-
-                default:
-                    return false;
             }
+
+            return false;
         }
 
         public override void OnReleased(GlobalAction action)

From df148cf9d1ffe5fbb9ed6caf3dd4727b215b971e Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Thu, 4 Jun 2020 20:58:19 +1200
Subject: [PATCH 0057/3722] Rename secondaryAction to rewindSearch

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

diff --git a/osu.Game/Screens/Select/FooterButtonRandom.cs b/osu.Game/Screens/Select/FooterButtonRandom.cs
index e2e5c63740..e239211c04 100644
--- a/osu.Game/Screens/Select/FooterButtonRandom.cs
+++ b/osu.Game/Screens/Select/FooterButtonRandom.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Screens.Select
         public Action SecondaryAction { get; set; }
 
         private readonly SpriteText secondaryText;
-        private bool secondaryActive;
+        private bool rewindSearch;
 
         public FooterButtonRandom()
         {
@@ -45,7 +45,7 @@ namespace osu.Game.Screens.Select
 
         private void updateText()
         {
-            if (secondaryActive)
+            if (rewindSearch)
             {
                 SpriteText.FadeOut(120, Easing.InQuad);
                 secondaryText.FadeIn(120, Easing.InQuad);
@@ -62,7 +62,7 @@ namespace osu.Game.Screens.Select
             switch (action)
             {
                 case GlobalAction.SelectPreviousRandom:
-                    secondaryActive = true;
+                    rewindSearch = true;
                     Action = SecondaryAction;
                     updateText();
                     Click();
@@ -82,7 +82,7 @@ namespace osu.Game.Screens.Select
         {
             if (action == GlobalAction.SelectPreviousRandom)
             {
-                secondaryActive = false;
+                rewindSearch = false;
                 updateText();
             }
         }

From 62984cb7f5da4380939200833cccfe06b4128816 Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Thu, 4 Jun 2020 20:58:53 +1200
Subject: [PATCH 0058/3722] Remove unused Hotkey assignment

---
 osu.Game/Screens/Select/FooterButtonRandom.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Select/FooterButtonRandom.cs b/osu.Game/Screens/Select/FooterButtonRandom.cs
index e239211c04..1c3c699a2d 100644
--- a/osu.Game/Screens/Select/FooterButtonRandom.cs
+++ b/osu.Game/Screens/Select/FooterButtonRandom.cs
@@ -40,7 +40,6 @@ namespace osu.Game.Screens.Select
             SelectedColour = colours.Green;
             DeselectedColour = SelectedColour.Opacity(0.5f);
             Text = @"random";
-            Hotkey = GlobalAction.SelectNextRandom;
         }
 
         private void updateText()

From 8533d7573dbc1d468cadc4aa82ecc58ab0631c56 Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Thu, 4 Jun 2020 21:00:29 +1200
Subject: [PATCH 0059/3722] Rename FooterButtonRandom actions to better
 describe what they are used for

---
 osu.Game/Screens/Select/FooterButtonRandom.cs | 8 ++++----
 osu.Game/Screens/Select/SongSelect.cs         | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Select/FooterButtonRandom.cs b/osu.Game/Screens/Select/FooterButtonRandom.cs
index 1c3c699a2d..9316d4e064 100644
--- a/osu.Game/Screens/Select/FooterButtonRandom.cs
+++ b/osu.Game/Screens/Select/FooterButtonRandom.cs
@@ -14,8 +14,8 @@ namespace osu.Game.Screens.Select
 {
     public class FooterButtonRandom : FooterButton
     {
-        public Action PrimaryAction { get; set; }
-        public Action SecondaryAction { get; set; }
+        public Action NextRandom { get; set; }
+        public Action PreviousRandom { get; set; }
 
         private readonly SpriteText secondaryText;
         private bool rewindSearch;
@@ -62,13 +62,13 @@ namespace osu.Game.Screens.Select
             {
                 case GlobalAction.SelectPreviousRandom:
                     rewindSearch = true;
-                    Action = SecondaryAction;
+                    Action = PreviousRandom;
                     updateText();
                     Click();
                     return true;
 
                 case GlobalAction.SelectNextRandom:
-                    Action = PrimaryAction;
+                    Action = NextRandom;
                     updateText();
                     Click();
                     return true;
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index e22c055047..70034780d1 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -272,7 +272,7 @@ namespace osu.Game.Screens.Select
             if (Footer != null)
             {
                 Footer.AddButton(new FooterButtonMods { Current = Mods }, ModSelect);
-                Footer.AddButton(new FooterButtonRandom { PrimaryAction = triggerNextRandom, SecondaryAction = triggerPreviousRandom });
+                Footer.AddButton(new FooterButtonRandom { NextRandom = triggerNextRandom, PreviousRandom = triggerPreviousRandom });
                 Footer.AddButton(new FooterButtonOptions(), BeatmapOptions);
 
                 BeatmapOptions.AddButton(@"Remove", @"from unplayed", FontAwesome.Regular.TimesCircle, colours.Purple, null, Key.Number1);

From cab132673aa226f77039311a005e0ac69379fb08 Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Thu, 4 Jun 2020 21:03:10 +1200
Subject: [PATCH 0060/3722] Break FooterButtonRandom creation into multiple
 lines

---
 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 70034780d1..fdec0395bd 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -272,7 +272,11 @@ namespace osu.Game.Screens.Select
             if (Footer != null)
             {
                 Footer.AddButton(new FooterButtonMods { Current = Mods }, ModSelect);
-                Footer.AddButton(new FooterButtonRandom { NextRandom = triggerNextRandom, PreviousRandom = triggerPreviousRandom });
+                Footer.AddButton(new FooterButtonRandom
+                {
+                    NextRandom = triggerNextRandom,
+                    PreviousRandom = triggerPreviousRandom
+                });
                 Footer.AddButton(new FooterButtonOptions(), BeatmapOptions);
 
                 BeatmapOptions.AddButton(@"Remove", @"from unplayed", FontAwesome.Regular.TimesCircle, colours.Purple, null, Key.Number1);

From cb6e4739107892079b84987a0322c2a5ba963a76 Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Thu, 4 Jun 2020 21:08:07 +1200
Subject: [PATCH 0061/3722] Remove triggerPreviousRandom from SongSelect

---
 osu.Game/Screens/Select/SongSelect.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index fdec0395bd..453ecd2b4e 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -275,7 +275,7 @@ namespace osu.Game.Screens.Select
                 Footer.AddButton(new FooterButtonRandom
                 {
                     NextRandom = triggerNextRandom,
-                    PreviousRandom = triggerPreviousRandom
+                    PreviousRandom = Carousel.SelectPreviousRandom
                 });
                 Footer.AddButton(new FooterButtonOptions(), BeatmapOptions);
 
@@ -505,11 +505,6 @@ namespace osu.Game.Screens.Select
             Carousel.SelectNextRandom();
         }
 
-        private void triggerPreviousRandom()
-        {
-            Carousel.SelectPreviousRandom();
-        }
-
         public override void OnEntering(IScreen last)
         {
             base.OnEntering(last);

From a40475e6aa95b2585e6d811824d5690fec21830a Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Thu, 4 Jun 2020 21:09:47 +1200
Subject: [PATCH 0062/3722] Remove triggerNextRandom from SongSelect

---
 osu.Game/Screens/Select/SongSelect.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 453ecd2b4e..6ca53bcfa9 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -274,7 +274,7 @@ namespace osu.Game.Screens.Select
                 Footer.AddButton(new FooterButtonMods { Current = Mods }, ModSelect);
                 Footer.AddButton(new FooterButtonRandom
                 {
-                    NextRandom = triggerNextRandom,
+                    NextRandom = () => Carousel.SelectNextRandom(),
                     PreviousRandom = Carousel.SelectPreviousRandom
                 });
                 Footer.AddButton(new FooterButtonOptions(), BeatmapOptions);
@@ -500,11 +500,6 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        private void triggerNextRandom()
-        {
-            Carousel.SelectNextRandom();
-        }
-
         public override void OnEntering(IScreen last)
         {
             base.OnEntering(last);

From 0e155c8eb9729106891708bee5eadc63acdf0ef6 Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Sun, 7 Jun 2020 15:34:19 +1200
Subject: [PATCH 0063/3722] Don't switch FooterButtonRandon Action on pressed.
 Instead, create a new Action that invokes either NextRandom or
 PreviousRandom, depending on rewindSearch

---
 osu.Game/Screens/Select/FooterButtonRandom.cs | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Select/FooterButtonRandom.cs b/osu.Game/Screens/Select/FooterButtonRandom.cs
index 9316d4e064..07de29a0ea 100644
--- a/osu.Game/Screens/Select/FooterButtonRandom.cs
+++ b/osu.Game/Screens/Select/FooterButtonRandom.cs
@@ -40,6 +40,17 @@ namespace osu.Game.Screens.Select
             SelectedColour = colours.Green;
             DeselectedColour = SelectedColour.Opacity(0.5f);
             Text = @"random";
+            Action = () =>
+            {
+                if (rewindSearch)
+                {
+                    PreviousRandom.Invoke();
+                }
+                else
+                {
+                    NextRandom.Invoke();
+                }
+            };
         }
 
         private void updateText()
@@ -58,23 +69,14 @@ namespace osu.Game.Screens.Select
 
         public override bool OnPressed(GlobalAction action)
         {
-            switch (action)
+            rewindSearch = action == GlobalAction.SelectPreviousRandom;
+            if (action != GlobalAction.SelectNextRandom && !rewindSearch)
             {
-                case GlobalAction.SelectPreviousRandom:
-                    rewindSearch = true;
-                    Action = PreviousRandom;
-                    updateText();
-                    Click();
-                    return true;
-
-                case GlobalAction.SelectNextRandom:
-                    Action = NextRandom;
-                    updateText();
-                    Click();
-                    return true;
+                return false;
             }
-
-            return false;
+            updateText();
+            Click();
+            return true;
         }
 
         public override void OnReleased(GlobalAction action)

From 7c04e9aca4a6a302ffd601fd4e406b645387daaa Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Sun, 7 Jun 2020 15:37:19 +1200
Subject: [PATCH 0064/3722] Move new GlobalAction keybinding entries to the end
 of the class. The new keybindings shouldn't mess with existing bindings
 anymore

---
 .../Input/Bindings/GlobalActionContainer.cs   | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 7257b0ce15..bdfad68a13 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -114,19 +114,6 @@ namespace osu.Game.Input.Bindings
         [Description("Toggle mute")]
         ToggleMute,
 
-        // Song select keybindings
-        [Description("Toggle mod selection overlay")]
-        ToggleModSelection,
-
-        [Description("Select a random beatmap")]
-        SelectNextRandom,
-
-        [Description("Select the last random beatmap")]
-        SelectPreviousRandom,
-
-        [Description("Toggle beatmap options overlay")]
-        ToggleBeatmapOptions,
-
         // In-Game Keybindings
         [Description("Skip cutscene")]
         SkipCutscene,
@@ -173,5 +160,18 @@ namespace osu.Game.Input.Bindings
 
         [Description("Next Selection")]
         SelectNext,
+
+        // Song select keybindings
+        [Description("Toggle mod selection overlay")]
+        ToggleModSelection,
+
+        [Description("Select a random beatmap")]
+        SelectNextRandom,
+
+        [Description("Select the last random beatmap")]
+        SelectPreviousRandom,
+
+        [Description("Toggle beatmap options overlay")]
+        ToggleBeatmapOptions,
     }
 }

From 8b7718116ded732bd062ee103dd875b8af9a6ed5 Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Sun, 7 Jun 2020 16:06:18 +1200
Subject: [PATCH 0065/3722] Add missing blank lines

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

diff --git a/osu.Game/Screens/Select/FooterButtonRandom.cs b/osu.Game/Screens/Select/FooterButtonRandom.cs
index 07de29a0ea..2c4dd58763 100644
--- a/osu.Game/Screens/Select/FooterButtonRandom.cs
+++ b/osu.Game/Screens/Select/FooterButtonRandom.cs
@@ -70,10 +70,12 @@ namespace osu.Game.Screens.Select
         public override bool OnPressed(GlobalAction action)
         {
             rewindSearch = action == GlobalAction.SelectPreviousRandom;
+
             if (action != GlobalAction.SelectNextRandom && !rewindSearch)
             {
                 return false;
             }
+
             updateText();
             Click();
             return true;

From bddd2b72ba257370e999a9f958f090cb83ef57c9 Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Mon, 8 Jun 2020 15:05:53 +1200
Subject: [PATCH 0066/3722] Remove secondaryText and related code from
 FooterButtonRandom

---
 osu.Game/Screens/Select/FooterButtonRandom.cs | 31 +------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff --git a/osu.Game/Screens/Select/FooterButtonRandom.cs b/osu.Game/Screens/Select/FooterButtonRandom.cs
index 2c4dd58763..7574d01a7b 100644
--- a/osu.Game/Screens/Select/FooterButtonRandom.cs
+++ b/osu.Game/Screens/Select/FooterButtonRandom.cs
@@ -17,22 +17,9 @@ namespace osu.Game.Screens.Select
         public Action NextRandom { get; set; }
         public Action PreviousRandom { get; set; }
 
-        private readonly SpriteText secondaryText;
         private bool rewindSearch;
 
-        public FooterButtonRandom()
-        {
-            TextContainer.Add(secondaryText = new OsuSpriteText
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Text = @"rewind",
-                Alpha = 0,
-            });
-
-            // force both text sprites to always be present to avoid width flickering while they're being swapped out
-            SpriteText.AlwaysPresent = secondaryText.AlwaysPresent = true;
-        }
+        public FooterButtonRandom() { }
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
@@ -53,20 +40,6 @@ namespace osu.Game.Screens.Select
             };
         }
 
-        private void updateText()
-        {
-            if (rewindSearch)
-            {
-                SpriteText.FadeOut(120, Easing.InQuad);
-                secondaryText.FadeIn(120, Easing.InQuad);
-            }
-            else
-            {
-                SpriteText.FadeIn(120, Easing.InQuad);
-                secondaryText.FadeOut(120, Easing.InQuad);
-            }
-        }
-
         public override bool OnPressed(GlobalAction action)
         {
             rewindSearch = action == GlobalAction.SelectPreviousRandom;
@@ -76,7 +49,6 @@ namespace osu.Game.Screens.Select
                 return false;
             }
 
-            updateText();
             Click();
             return true;
         }
@@ -86,7 +58,6 @@ namespace osu.Game.Screens.Select
             if (action == GlobalAction.SelectPreviousRandom)
             {
                 rewindSearch = false;
-                updateText();
             }
         }
     }

From ea9207e0ad21434d79eace9e527a3719ad1232c0 Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Mon, 8 Jun 2020 17:31:31 +1200
Subject: [PATCH 0067/3722] Clean up FooterButtonRandom Removed unnecessary
 using statements Removed unnecessary constructor

---
 osu.Game/Screens/Select/FooterButtonRandom.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game/Screens/Select/FooterButtonRandom.cs b/osu.Game/Screens/Select/FooterButtonRandom.cs
index 7574d01a7b..363c2e4c10 100644
--- a/osu.Game/Screens/Select/FooterButtonRandom.cs
+++ b/osu.Game/Screens/Select/FooterButtonRandom.cs
@@ -4,10 +4,7 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Input.Bindings;
 
 namespace osu.Game.Screens.Select
@@ -19,8 +16,6 @@ namespace osu.Game.Screens.Select
 
         private bool rewindSearch;
 
-        public FooterButtonRandom() { }
-
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {

From 9dc1eab6ae702550a6c3c8a9c5734183816a870f Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Wed, 10 Jun 2020 13:05:11 +1200
Subject: [PATCH 0068/3722] Improve code readability of FooterButtonRandom
 OnPressed

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

diff --git a/osu.Game/Screens/Select/FooterButtonRandom.cs b/osu.Game/Screens/Select/FooterButtonRandom.cs
index 363c2e4c10..b314971cb3 100644
--- a/osu.Game/Screens/Select/FooterButtonRandom.cs
+++ b/osu.Game/Screens/Select/FooterButtonRandom.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Screens.Select
         {
             rewindSearch = action == GlobalAction.SelectPreviousRandom;
 
-            if (action != GlobalAction.SelectNextRandom && !rewindSearch)
+            if (action != GlobalAction.SelectNextRandom && action != GlobalAction.SelectPreviousRandom)
             {
                 return false;
             }

From 080bf1e85a034e4a3fa58a91b66683fd482ca8b3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Jun 2020 13:46:16 +0900
Subject: [PATCH 0069/3722] Fix missing default inclusion

---
 osu.Game/Input/Bindings/GlobalActionContainer.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index bdfad68a13..4429bf27cf 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -21,7 +21,10 @@ namespace osu.Game.Input.Bindings
                 handler = game;
         }
 
-        public override IEnumerable<KeyBinding> DefaultKeyBindings => GlobalKeyBindings.Concat(InGameKeyBindings).Concat(AudioControlKeyBindings);
+        public override IEnumerable<KeyBinding> DefaultKeyBindings => GlobalKeyBindings
+                                                                      .Concat(InGameKeyBindings)
+                                                                      .Concat(AudioControlKeyBindings)
+                                                                      .Concat(SongSelectKeyBindings);
 
         public IEnumerable<KeyBinding> GlobalKeyBindings => new[]
         {

From e15324ca900cde9e37d3d52b79f27be690bd66eb Mon Sep 17 00:00:00 2001
From: "Jack Boswell (boswelja)" <boswelja@outlook.com>
Date: Mon, 15 Jun 2020 21:44:38 +1200
Subject: [PATCH 0070/3722] Shorten new binding descriptions

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

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 4429bf27cf..851a848b8f 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -165,16 +165,16 @@ namespace osu.Game.Input.Bindings
         SelectNext,
 
         // Song select keybindings
-        [Description("Toggle mod selection overlay")]
+        [Description("Toggle Mod Select")]
         ToggleModSelection,
 
-        [Description("Select a random beatmap")]
+        [Description("Random")]
         SelectNextRandom,
 
-        [Description("Select the last random beatmap")]
+        [Description("Rewind")]
         SelectPreviousRandom,
 
-        [Description("Toggle beatmap options overlay")]
+        [Description("Beatmap Options")]
         ToggleBeatmapOptions,
     }
 }

From 809338a28002c1bed4223b890560dd50662f0f37 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Tue, 17 Nov 2020 20:19:12 +0800
Subject: [PATCH 0071/3722] Init Import screen

---
 osu.Game/Screens/Import/FileImportScreen.cs | 318 ++++++++++++++++++++
 osu.Game/Screens/Menu/ButtonSystem.cs       |   2 +
 osu.Game/Screens/Menu/MainMenu.cs           |   4 +-
 3 files changed, 323 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Screens/Import/FileImportScreen.cs

diff --git a/osu.Game/Screens/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
new file mode 100644
index 0000000000..669c26101c
--- /dev/null
+++ b/osu.Game/Screens/Import/FileImportScreen.cs
@@ -0,0 +1,318 @@
+using System.IO;
+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.Shapes;
+using osu.Framework.Platform;
+using osu.Framework.Screens;
+using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterfaceV2;
+using osuTK;
+using osu.Game.Overlays.Settings;
+using osu.Game.Configuration;
+using osu.Game.Overlays;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Graphics.Containers;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Import
+{
+    public class FileImportScreen : OsuScreen
+    {
+        private Container contentContainer;
+        private FileSelector fileSelector;
+        private Container fileSelectContainer;
+
+        public override bool HideOverlaysOnEnter => true;
+
+        private string[] fileExtensions = { ".foo" };
+        private string defaultPath;
+
+        private readonly Bindable<FileInfo> currentFile = new Bindable<FileInfo>();
+        private readonly IBindable<DirectoryInfo> currentDirectory = new Bindable<DirectoryInfo>();
+        private readonly Bindable<FileFilterType> filterType = new Bindable<FileFilterType>(FileFilterType.All);
+        private TextFlowContainer currentFileText;
+        private OsuScrollContainer fileNameScroll;
+        private readonly OverlayColourProvider overlayColourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
+
+        [Resolved]
+        private OsuGameBase gameBase { get; set; }
+
+        [Resolved]
+        private DialogOverlay dialogOverlay { get; set; }
+
+        [BackgroundDependencyLoader(true)]
+        private void load(Storage storage)
+        {
+            storage.GetStorageForDirectory("imports");
+            var originalPath = storage.GetFullPath("imports", true);
+
+            defaultPath = originalPath;
+
+            InternalChild = contentContainer = new Container
+            {
+                Masking = true,
+                CornerRadius = 10,
+                RelativeSizeAxes = Axes.Both,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Size = new Vector2(0.9f, 0.8f),
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        Colour = overlayColourProvider.Background5,
+                        RelativeSizeAxes = Axes.Both,
+                    },
+                    fileSelectContainer = new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Width = 0.65f,
+                        Anchor = Anchor.TopLeft,
+                        Origin = Anchor.TopLeft,
+                    },
+                    new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Width = 0.35f,
+                        Anchor = Anchor.TopRight,
+                        Origin = Anchor.TopRight,
+                        Masking = true,
+                        CornerRadius = 10,
+                        Children = new Drawable[]
+                        {
+                            new GridContainer
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                RowDimensions = new[]
+                                {
+                                    new Dimension(),
+                                    new Dimension(GridSizeMode.AutoSize),
+                                },
+                                Content = new[]
+                                {
+                                    new Drawable[]
+                                    {
+                                        new Container
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                            Anchor = Anchor.TopCentre,
+                                            Origin = Anchor.TopCentre,
+                                            Children = new Drawable[]
+                                            {
+                                                new Box
+                                                {
+                                                    Colour = overlayColourProvider.Background3,
+                                                    RelativeSizeAxes = Axes.Both
+                                                },
+                                                fileNameScroll = new OsuScrollContainer
+                                                {
+                                                    Masking = false,
+                                                    RelativeSizeAxes = Axes.Both,
+                                                    Child = currentFileText = new TextFlowContainer(t => t.Font = OsuFont.Default.With(size: 30))
+                                                    {
+                                                        AutoSizeAxes = Axes.Y,
+                                                        RelativeSizeAxes = Axes.X,
+                                                        Anchor = Anchor.Centre,
+                                                        Origin = Anchor.Centre,
+                                                        TextAnchor = Anchor.Centre
+                                                    },
+                                                },
+                                            }
+                                        },
+                                    },
+                                    new Drawable[]
+                                    {
+                                        new Container
+                                        {
+                                            RelativeSizeAxes = Axes.X,
+                                            AutoSizeAxes = Axes.Y,
+                                            Children = new Drawable[]
+                                            {
+                                                new Box
+                                                {
+                                                    Colour = overlayColourProvider.Background4,
+                                                    RelativeSizeAxes = Axes.Both
+                                                },
+                                                new FillFlowContainer
+                                                {
+                                                    RelativeSizeAxes = Axes.X,
+                                                    AutoSizeAxes = Axes.Y,
+                                                    Spacing = new Vector2(10),
+                                                    Children = new Drawable[]
+                                                    {
+                                                        new SettingsEnumDropdown<FileFilterType>
+                                                        {
+                                                            Anchor = Anchor.BottomCentre,
+                                                            Origin = Anchor.BottomCentre,
+                                                            LabelText = "File Type",
+                                                            Current = filterType,
+                                                            Margin = new MarginPadding { Bottom = 15 }
+                                                        },
+                                                        new GridContainer
+                                                        {
+                                                            Anchor = Anchor.BottomCentre,
+                                                            Origin = Anchor.BottomCentre,
+                                                            AutoSizeAxes = Axes.Y,
+                                                            RelativeSizeAxes = Axes.X,
+                                                            Margin = new MarginPadding { Top = 15 },
+                                                            RowDimensions = new[]
+                                                            {
+                                                                new Dimension(GridSizeMode.AutoSize)
+                                                            },
+                                                            Content = new[]
+                                                            {
+                                                                new Drawable[]
+                                                                {
+                                                                    new TriangleButton
+                                                                    {
+                                                                        Anchor = Anchor.BottomCentre,
+                                                                        Origin = Anchor.BottomCentre,
+                                                                        RelativeSizeAxes = Axes.X,
+                                                                        Height = 50,
+                                                                        Width = 0.9f,
+                                                                        Text = "Refresh",
+                                                                        Action = refresh
+                                                                    },
+                                                                    new TriangleButton
+                                                                    {
+                                                                        Text = "Import",
+                                                                        Anchor = Anchor.BottomCentre,
+                                                                        Origin = Anchor.BottomCentre,
+                                                                        RelativeSizeAxes = Axes.X,
+                                                                        Height = 50,
+                                                                        Width = 0.9f,
+                                                                        Action = () =>
+                                                                        {
+                                                                            var d = currentFile.Value?.FullName;
+                                                                            if (d != null)
+                                                                                startImport(d);
+                                                                            else
+                                                                                currentFileText.FlashColour(Color4.Red, 500);
+                                                                        },
+                                                                    }
+                                                                },
+                                                            }
+                                                        },
+                                                    }
+                                                },
+                                            }
+                                        }
+                                    }
+                                }
+                            },
+                        }
+                    }
+                }
+            };
+
+            fileNameScroll.ScrollContent.Anchor = Anchor.Centre;
+            fileNameScroll.ScrollContent.Origin = Anchor.Centre;
+
+            currentFile.BindValueChanged(updateFileSelectionText, true);
+            currentDirectory.BindValueChanged(_ =>
+            {
+                currentFile.Value = null;
+            });
+
+            filterType.BindValueChanged(onFilterTypeChanged, true);
+        }
+
+        private void onFilterTypeChanged(ValueChangedEvent<FileFilterType> v)
+        {
+            switch (v.NewValue)
+            {
+                case FileFilterType.Beatmap:
+                    fileExtensions = new string[] { ".osz" };
+                    break;
+
+                case FileFilterType.Skin:
+                    fileExtensions = new string[] { ".osk" };
+                    break;
+
+                case FileFilterType.Replay:
+                    fileExtensions = new string[] { ".osr" };
+                    break;
+
+                default:
+                case FileFilterType.All:
+                    fileExtensions = new string[] { ".osk", ".osr", ".osz" };
+                    break;
+            }
+
+            refresh();
+        }
+
+        private void refresh()
+        {
+            currentFile.UnbindBindings();
+            currentDirectory.UnbindBindings();
+
+            fileSelector?.Expire();
+
+            var directory = currentDirectory.Value?.FullName ?? defaultPath;
+            fileSelector = new FileSelector(initialPath: directory, validFileExtensions: fileExtensions)
+            {
+                RelativeSizeAxes = Axes.Both
+            };
+
+            currentDirectory.BindTo(fileSelector.CurrentPath);
+            currentFile.BindTo(fileSelector.CurrentFile);
+
+            fileSelectContainer.Add(fileSelector);
+        }
+
+        private void updateFileSelectionText(ValueChangedEvent<FileInfo> v)
+        {
+            currentFileText.Text = v.NewValue?.Name ?? "Select a file";
+        }
+
+        public override void OnEntering(IScreen last)
+        {
+            base.OnEntering(last);
+
+            contentContainer.FadeOut().Then().ScaleTo(0.8f).RotateTo(-15).MoveToX(300)
+                            .Then()
+                            .ScaleTo(1, 1500, Easing.OutElastic)
+                            .FadeIn(500)
+                            .MoveToX(0, 500, Easing.OutQuint)
+                            .RotateTo(0, 500, Easing.OutQuint);
+        }
+
+        public override bool OnExiting(IScreen next)
+        {
+            contentContainer.ScaleTo(0.8f, 500, Easing.OutExpo).RotateTo(-15, 500, Easing.OutExpo).MoveToX(300, 500, Easing.OutQuint).FadeOut(500);
+            this.FadeOut(500, Easing.OutExpo);
+
+            return base.OnExiting(next);
+        }
+
+        private void startImport(string path)
+        {
+            if (string.IsNullOrEmpty(path))
+                return;
+
+            if (!File.Exists(path))
+            {
+                refresh();
+                currentFileText.Text = "File not exist";
+                currentFileText.FlashColour(Color4.Red, 500);
+                return;
+            }
+
+            string[] paths = { path };
+
+            Task.Factory.StartNew(() => gameBase.Import(paths), TaskCreationOptions.LongRunning);
+        }
+
+        public enum FileFilterType
+        {
+            Skin,
+            Beatmap,
+            Replay,
+            All
+        }
+    }
+}
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 4becdd58cd..1e0d27ac6a 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -41,6 +41,7 @@ namespace osu.Game.Screens.Menu
         public Action OnExit;
         public Action OnBeatmapListing;
         public Action OnSolo;
+        public Action OnImportButton;
         public Action OnSettings;
         public Action OnMulti;
         public Action OnChart;
@@ -131,6 +132,7 @@ namespace osu.Game.Screens.Menu
             buttonsTopLevel.Add(new Button(@"play", @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));
             buttonsTopLevel.Add(new Button(@"osu!editor", @"button-generic-select", OsuIcon.EditCircle, new Color4(238, 170, 0, 255), () => OnEdit?.Invoke(), 0, Key.E));
             buttonsTopLevel.Add(new Button(@"osu!direct", @"button-direct-select", OsuIcon.ChevronDownCircle, new Color4(165, 204, 0, 255), () => OnBeatmapListing?.Invoke(), 0, Key.D));
+            buttonsTopLevel.Add(new Button(@"Import File", @"button-generic-select", FontAwesome.Solid.File, new Color4(0, 86, 73, 255), () => OnImportButton?.Invoke()));
 
             if (host.CanExit)
                 buttonsTopLevel.Add(new Button(@"exit", string.Empty, OsuIcon.CrossCircle, new Color4(238, 51, 153, 255), () => OnExit?.Invoke(), 0, Key.Q));
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index c3ecd75963..69e4ea487e 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -19,6 +19,7 @@ using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Multi;
 using osu.Game.Screens.Select;
+using osu.Game.Screens.Import;
 
 namespace osu.Game.Screens.Menu
 {
@@ -105,6 +106,7 @@ namespace osu.Game.Screens.Menu
                             },
                             OnSolo = onSolo,
                             OnMulti = delegate { this.Push(new Multiplayer()); },
+                            OnImportButton = onImport,
                             OnExit = confirmAndExit,
                         }
                     }
@@ -144,7 +146,7 @@ namespace osu.Game.Screens.Menu
 
         [Resolved(canBeNull: true)]
         private OsuGame game { get; set; }
-
+        private void onImport() => this.Push(new FileImportScreen());
         private void confirmAndExit()
         {
             if (exitConfirmed) return;

From dcaebd2621a34055c4d8a68e27e21c7a0056c04d Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Tue, 17 Nov 2020 21:39:29 +0800
Subject: [PATCH 0072/3722] Add license text

---
 osu.Game/Screens/Import/FileImportScreen.cs | 4 +++-
 osu.Game/Screens/Menu/ButtonSystem.cs       | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
index 669c26101c..bcbc87e8cc 100644
--- a/osu.Game/Screens/Import/FileImportScreen.cs
+++ b/osu.Game/Screens/Import/FileImportScreen.cs
@@ -1,3 +1,6 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
 using System.IO;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
@@ -11,7 +14,6 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterfaceV2;
 using osuTK;
 using osu.Game.Overlays.Settings;
-using osu.Game.Configuration;
 using osu.Game.Overlays;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.Containers;
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 1e0d27ac6a..1722329c21 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -132,7 +132,10 @@ namespace osu.Game.Screens.Menu
             buttonsTopLevel.Add(new Button(@"play", @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));
             buttonsTopLevel.Add(new Button(@"osu!editor", @"button-generic-select", OsuIcon.EditCircle, new Color4(238, 170, 0, 255), () => OnEdit?.Invoke(), 0, Key.E));
             buttonsTopLevel.Add(new Button(@"osu!direct", @"button-direct-select", OsuIcon.ChevronDownCircle, new Color4(165, 204, 0, 255), () => OnBeatmapListing?.Invoke(), 0, Key.D));
-            buttonsTopLevel.Add(new Button(@"Import File", @"button-generic-select", FontAwesome.Solid.File, new Color4(0, 86, 73, 255), () => OnImportButton?.Invoke()));
+            if(RuntimeInfo.OS == RuntimeInfo.Platform.Android)
+            {
+                buttonsTopLevel.Add(new Button(@"Import File", @"button-generic-select", FontAwesome.Solid.File, new Color4(0, 86, 73, 255), () => OnImportButton?.Invoke()));
+            }        
 
             if (host.CanExit)
                 buttonsTopLevel.Add(new Button(@"exit", string.Empty, OsuIcon.CrossCircle, new Color4(238, 51, 153, 255), () => OnExit?.Invoke(), 0, Key.Q));

From 9a3dd12f309d2cccb3b50dfc92d2369f62b0f21d Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Wed, 18 Nov 2020 18:15:56 +0800
Subject: [PATCH 0073/3722] Move to debug settings

---
 .../Overlays/Settings/Sections/Debug/GeneralSettings.cs  | 9 ++++++++-
 osu.Game/Screens/Menu/ButtonSystem.cs                    | 5 -----
 osu.Game/Screens/Menu/MainMenu.cs                        | 4 +---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs
index f05b876d8f..22674f0879 100644
--- a/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs
@@ -4,6 +4,8 @@
 using osu.Framework.Allocation;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
+using osu.Framework.Screens;
+using osu.Game.Screens.Import;
 
 namespace osu.Game.Overlays.Settings.Sections.Debug
 {
@@ -12,7 +14,7 @@ namespace osu.Game.Overlays.Settings.Sections.Debug
         protected override string Header => "General";
 
         [BackgroundDependencyLoader]
-        private void load(FrameworkDebugConfigManager config, FrameworkConfigManager frameworkConfig)
+        private void load(FrameworkDebugConfigManager config, FrameworkConfigManager frameworkConfig, OsuGame game)
         {
             Children = new Drawable[]
             {
@@ -27,6 +29,11 @@ namespace osu.Game.Overlays.Settings.Sections.Debug
                     Current = config.GetBindable<bool>(DebugSetting.BypassFrontToBackPass)
                 }
             };
+            Add(new SettingsButton
+            {
+                Text = "Import files",
+                Action = () => game?.PerformFromScreen(menu => menu.Push(new FileImportScreen()))
+            });
         }
     }
 }
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 1722329c21..4becdd58cd 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -41,7 +41,6 @@ namespace osu.Game.Screens.Menu
         public Action OnExit;
         public Action OnBeatmapListing;
         public Action OnSolo;
-        public Action OnImportButton;
         public Action OnSettings;
         public Action OnMulti;
         public Action OnChart;
@@ -132,10 +131,6 @@ namespace osu.Game.Screens.Menu
             buttonsTopLevel.Add(new Button(@"play", @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));
             buttonsTopLevel.Add(new Button(@"osu!editor", @"button-generic-select", OsuIcon.EditCircle, new Color4(238, 170, 0, 255), () => OnEdit?.Invoke(), 0, Key.E));
             buttonsTopLevel.Add(new Button(@"osu!direct", @"button-direct-select", OsuIcon.ChevronDownCircle, new Color4(165, 204, 0, 255), () => OnBeatmapListing?.Invoke(), 0, Key.D));
-            if(RuntimeInfo.OS == RuntimeInfo.Platform.Android)
-            {
-                buttonsTopLevel.Add(new Button(@"Import File", @"button-generic-select", FontAwesome.Solid.File, new Color4(0, 86, 73, 255), () => OnImportButton?.Invoke()));
-            }        
 
             if (host.CanExit)
                 buttonsTopLevel.Add(new Button(@"exit", string.Empty, OsuIcon.CrossCircle, new Color4(238, 51, 153, 255), () => OnExit?.Invoke(), 0, Key.Q));
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 69e4ea487e..c3ecd75963 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -19,7 +19,6 @@ using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Multi;
 using osu.Game.Screens.Select;
-using osu.Game.Screens.Import;
 
 namespace osu.Game.Screens.Menu
 {
@@ -106,7 +105,6 @@ namespace osu.Game.Screens.Menu
                             },
                             OnSolo = onSolo,
                             OnMulti = delegate { this.Push(new Multiplayer()); },
-                            OnImportButton = onImport,
                             OnExit = confirmAndExit,
                         }
                     }
@@ -146,7 +144,7 @@ namespace osu.Game.Screens.Menu
 
         [Resolved(canBeNull: true)]
         private OsuGame game { get; set; }
-        private void onImport() => this.Push(new FileImportScreen());
+
         private void confirmAndExit()
         {
             if (exitConfirmed) return;

From 3b600f0a7b2dda8fa17ba85ee1563526bad44ece Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Fri, 20 Nov 2020 10:45:19 +0300
Subject: [PATCH 0074/3722] Target net5.0 instead of netcoreapp3

---
 global.json                                                     | 2 +-
 osu.Desktop/osu.Desktop.csproj                                  | 2 +-
 osu.Game.Benchmarks/osu.Game.Benchmarks.csproj                  | 2 +-
 .../osu.Game.Rulesets.Catch.Tests.csproj                        | 2 +-
 .../osu.Game.Rulesets.Mania.Tests.csproj                        | 2 +-
 osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj  | 2 +-
 .../osu.Game.Rulesets.Taiko.Tests.csproj                        | 2 +-
 osu.Game.Tests/osu.Game.Tests.csproj                            | 2 +-
 osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj      | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/global.json b/global.json
index 10b61047ac..2cb4c02970 100644
--- a/global.json
+++ b/global.json
@@ -2,7 +2,7 @@
   "sdk": {
     "allowPrerelease": false,
     "rollForward": "minor",
-    "version": "3.1.100"
+    "version": "5.0.100"
   },
   "msbuild-sdks": {
     "Microsoft.Build.Traversal": "2.2.3"
diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index 62e8f7c518..7f5154f456 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup Label="Project">
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <OutputType>WinExe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Description>A free-to-win rhythm game. Rhythm is just a *click* away!</Description>
diff --git a/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj b/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
index ff26f4afaa..7805bfcefc 100644
--- a/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
+++ b/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
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 dfe3bf8af4..a51b9830be 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
@@ -9,7 +9,7 @@
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj" />
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 892f27d27f..d314671bce 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
@@ -9,7 +9,7 @@
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj" />
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 3639c3616f..b0799bd3f5 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
@@ -9,7 +9,7 @@
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj" />
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 b59f3a4344..d3dbba4bfc 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
@@ -9,7 +9,7 @@
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj" />
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index c692bcd5e4..34de54411b 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -10,7 +10,7 @@
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj" />
diff --git a/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj b/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
index 5d55196dcf..d820794980 100644
--- a/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
+++ b/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj" />

From ca0e1c8cee1ffd03b2bb5fe773741012b90bb654 Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Fri, 20 Nov 2020 10:47:57 +0300
Subject: [PATCH 0075/3722] Update NuGet packages

---
 osu.Desktop/osu.Desktop.csproj                 | 4 ++--
 osu.Game.Tournament/osu.Game.Tournament.csproj | 2 +-
 osu.Game/osu.Game.csproj                       | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index 7f5154f456..2052c4bc25 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -24,11 +24,11 @@
     <ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="System.IO.Packaging" Version="4.7.0" />
+    <PackageReference Include="System.IO.Packaging" Version="5.0.0" />
     <PackageReference Include="ppy.squirrel.windows" Version="1.9.0.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.6" />
-    <PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
+    <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
     <PackageReference Include="DiscordRichPresence" Version="1.0.150" />
     <!-- .NET 3.1 SDK seems to cause issues with a runtime specification. This will likely be resolved in .NET 5. -->
     <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
diff --git a/osu.Game.Tournament/osu.Game.Tournament.csproj b/osu.Game.Tournament/osu.Game.Tournament.csproj
index 9cce40c9d3..b049542bb0 100644
--- a/osu.Game.Tournament/osu.Game.Tournament.csproj
+++ b/osu.Game.Tournament/osu.Game.Tournament.csproj
@@ -9,6 +9,6 @@
     <ProjectReference Include="..\osu.Game\osu.Game.csproj" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
+    <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 54f3fcede6..1670bf5b11 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -21,8 +21,8 @@
     <PackageReference Include="Dapper" Version="2.0.35" />
     <PackageReference Include="DiffPlex" Version="1.6.3" />
     <PackageReference Include="Humanizer" Version="2.8.26" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.9" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.9" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="5.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="5.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
@@ -31,6 +31,6 @@
     <PackageReference Include="Sentry" Version="2.1.6" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
 </Project>

From f562a7ea0df68baee20551108bb4bd9fd13d5747 Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Fri, 20 Nov 2020 11:52:17 +0300
Subject: [PATCH 0076/3722] Fix FileNotFoundException on startup

---
 osu.Desktop/osu.Desktop.csproj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index 2052c4bc25..53b9cdcf92 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -24,6 +24,8 @@
     <ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj" />
   </ItemGroup>
   <ItemGroup Label="Package References">
+	  <!-- WorkaroundWorkaround for a System.IO.FileNotFoundException on startup. Required because of old EF Core version. -->
+	  <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
     <PackageReference Include="System.IO.Packaging" Version="5.0.0" />
     <PackageReference Include="ppy.squirrel.windows" Version="1.9.0.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />

From 044622036cbc94adae124f68ec5fbff18befb2b4 Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Fri, 20 Nov 2020 11:53:17 +0300
Subject: [PATCH 0077/3722] Disable CA1416

---
 osu.Desktop/OsuGameDesktop.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index 0feab9a717..e2a06d7877 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -58,8 +58,10 @@ namespace osu.Desktop
 
             try
             {
+#pragma warning disable CA1416 // Validate platform compatibility
                 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 // Validate platform compatibility
 
                 if (checkExists(stableInstallPath))
                     return stableInstallPath;

From 1a676ef0d82c4d4cfd0d7fbac2338da3a763272f Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Fri, 20 Nov 2020 12:06:08 +0300
Subject: [PATCH 0078/3722] Resolve CA1416 properly using new API

---
 osu.Desktop/OsuGameDesktop.cs | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index e2a06d7877..f9c932b260 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.Versioning;
 using System.Threading.Tasks;
 using Microsoft.Win32;
 using osu.Desktop.Overlays;
@@ -56,19 +57,12 @@ namespace osu.Desktop
 
             string stableInstallPath;
 
-            try
+            if (OperatingSystem.IsWindows())
             {
-#pragma warning disable CA1416 // Validate platform compatibility
-                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 // Validate platform compatibility
-
+                stableInstallPath = getStableInstallPathFromRegistry();
                 if (checkExists(stableInstallPath))
                     return stableInstallPath;
             }
-            catch
-            {
-            }
 
             stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"osu!");
             if (checkExists(stableInstallPath))
@@ -81,6 +75,13 @@ namespace osu.Desktop
             return null;
         }
 
+        [SupportedOSPlatform("windows")]
+        private string getStableInstallPathFromRegistry()
+        {
+            using (RegistryKey key = Registry.ClassesRoot.OpenSubKey("osu"))
+                return key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty).ToString()?.Split('"')[1].Replace("osu!.exe", "");
+        }
+
         protected override UpdateManager CreateUpdateManager()
         {
             switch (RuntimeInfo.OS)

From 743541649706d9b9165197421860dfd0b3cf264d Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Fri, 20 Nov 2020 14:13:16 +0300
Subject: [PATCH 0079/3722] Workaround FileNotFoundException in a test projects

---
 osu.Desktop/osu.Desktop.csproj | 2 --
 osu.Game/osu.Game.csproj       | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index 53b9cdcf92..2052c4bc25 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -24,8 +24,6 @@
     <ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-	  <!-- WorkaroundWorkaround for a System.IO.FileNotFoundException on startup. Required because of old EF Core version. -->
-	  <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
     <PackageReference Include="System.IO.Packaging" Version="5.0.0" />
     <PackageReference Include="ppy.squirrel.windows" Version="1.9.0.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 1670bf5b11..1c6139b519 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -18,6 +18,8 @@
     </None>
   </ItemGroup>
   <ItemGroup Label="Package References">
+    <!-- WorkaroundWorkaround for a System.IO.FileNotFoundException on startup. Required because of old EF Core version. -->
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
     <PackageReference Include="Dapper" Version="2.0.35" />
     <PackageReference Include="DiffPlex" Version="1.6.3" />
     <PackageReference Include="Humanizer" Version="2.8.26" />

From 1feda1152da0b15835af3ce83bed31faf5fbed65 Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Sat, 21 Nov 2020 02:06:20 +0300
Subject: [PATCH 0080/3722] Fix InspectCode warnings

---
 osu.Desktop/OsuGameDesktop.cs                                | 2 +-
 osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs | 5 +++++
 osu.Game.Tournament/IPC/FileBasedIPC.cs                      | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index f9c932b260..dbbf6d048b 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -79,7 +79,7 @@ namespace osu.Desktop
         private string getStableInstallPathFromRegistry()
         {
             using (RegistryKey key = Registry.ClassesRoot.OpenSubKey("osu"))
-                return key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty).ToString()?.Split('"')[1].Replace("osu!.exe", "");
+                return key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty)?.ToString()?.Split('"')[1].Replace("osu!.exe", "");
         }
 
         protected override UpdateManager CreateUpdateManager()
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
index 35473ee76c..58992366ff 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.Diagnostics;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
@@ -73,6 +74,8 @@ namespace osu.Game.Tests.Visual.Gameplay
                 switch (args.Action)
                 {
                     case NotifyCollectionChangedAction.Add:
+                        Debug.Assert(args.NewItems != null, "args.NewItems != null");
+
                         foreach (int user in args.NewItems)
                         {
                             if (user == api.LocalUser.Value.Id)
@@ -82,6 +85,8 @@ namespace osu.Game.Tests.Visual.Gameplay
                         break;
 
                     case NotifyCollectionChangedAction.Remove:
+                        Debug.Assert(args.OldItems != null, "args.OldItems != null");
+
                         foreach (int user in args.OldItems)
                         {
                             if (user == api.LocalUser.Value.Id)
diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index 999ce61ac8..99147951b2 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -243,7 +243,7 @@ namespace osu.Game.Tournament.IPC
                 string stableInstallPath;
 
                 using (RegistryKey key = Registry.ClassesRoot.OpenSubKey("osu"))
-                    stableInstallPath = key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty).ToString().Split('"')[1].Replace("osu!.exe", "");
+                    stableInstallPath = key?.OpenSubKey(@"shell\open\command")?.GetValue(string.Empty)?.ToString().Split('"')[1].Replace("osu!.exe", "");
 
                 if (ipcFileExistsInDirectory(stableInstallPath))
                     return stableInstallPath;

From 6c5a6b42e59b53825fa73f29fb8de2a7eda42f08 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Sat, 21 Nov 2020 14:09:32 +0200
Subject: [PATCH 0081/3722] Only calculate recommended SR once

---
 osu.Game/Screens/Select/DifficultyRecommender.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index 2baabebdad..0e02b45650 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -69,8 +69,11 @@ namespace osu.Game.Screens.Select
             return beatmap;
         }
 
-        private void calculateRecommendedDifficulties()
+        private void calculateRecommendedDifficulties(bool onlyIfNoPreviousValues = false)
         {
+            if (recommendedStarDifficulty.Any() && onlyIfNoPreviousValues)
+                return;
+
             // only query API for built-in rulesets
             rulesets.AvailableRulesets.Where(ruleset => ruleset.ID <= 3).ForEach(rulesetInfo =>
             {
@@ -122,7 +125,7 @@ namespace osu.Game.Screens.Select
             switch (state.NewValue)
             {
                 case APIState.Online:
-                    calculateRecommendedDifficulties();
+                    calculateRecommendedDifficulties(true);
                     break;
             }
         });

From 72d9da5fac22583df2f275b1d5af65b1deb6e505 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Sat, 21 Nov 2020 14:26:09 +0200
Subject: [PATCH 0082/3722] Apply review suggestions

---
 osu.Game/OsuGame.cs                           | 25 +++++++++++--------
 .../Screens/Select/DifficultyRecommender.cs   | 14 +++--------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index e5a299d4b0..acc42bb660 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -335,11 +335,15 @@ namespace osu.Game
         /// The user should have already requested this interactively.
         /// </summary>
         /// <param name="beatmap">The beatmap to select.</param>
-        /// <param name="difficultyCriteria">
-        /// Optional predicate used to filter which difficulties to select.
-        /// If omitted, this will try to present a recommended beatmap from the current ruleset.
-        /// In case of failure the first difficulty of the set will be presented, ignoring the predicate.
-        /// </param>
+        /// <param name="difficultyCriteria">Optional predicate used to narrow the set of difficulties to select from when presenting.</param>
+        /// <remarks>
+        /// Among items satisfying the predicate, the order of preference is:
+        /// <list type="bullet">
+        /// <item>beatmap with recommended difficulty, as provided by <see cref="DifficultyRecommender"/>,</item>
+        /// <item>first beatmap from the current ruleset,</item>
+        /// <item>first beatmap from any ruleset.</item>
+        /// </list>
+        /// </remarks>
         public void PresentBeatmap(BeatmapSetInfo beatmap, Predicate<BeatmapInfo> difficultyCriteria = null)
         {
             var databasedSet = beatmap.OnlineBeatmapSetID != null
@@ -373,11 +377,12 @@ namespace osu.Game
 
                 // Try to select recommended beatmap
                 // This should give us a beatmap from current ruleset if there are any in our matched beatmaps
-                var selection = DifficultyRecommender.GetRecommendedBeatmap(beatmaps) ?? (
-                    // Fallback if a difficulty can't be recommended, maybe we are offline
-                    // First try to find a beatmap in current ruleset, otherwise use first beatmap
-                    beatmaps.FirstOrDefault(b => b.Ruleset.Equals(Ruleset.Value)) ?? beatmaps.First()
-                );
+                var selection = DifficultyRecommender.GetRecommendedBeatmap(beatmaps);
+                // Fallback if a difficulty can't be recommended, maybe we are offline
+                // First try to find a beatmap in current ruleset
+                selection ??= beatmaps.FirstOrDefault(b => b.Ruleset.Equals(Ruleset.Value));
+                // Otherwise use first beatmap
+                selection ??= beatmaps.First();
 
                 Ruleset.Value = selection.Ruleset;
                 Beatmap.Value = BeatmapManager.GetWorkingBeatmap(selection);
diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index 0e02b45650..ab64513ecb 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -81,7 +81,6 @@ namespace osu.Game.Screens.Select
 
                 req.Success += result =>
                 {
-                    bestRulesetOrder = null;
                     // algorithm taken from https://github.com/ppy/osu-web/blob/e6e2825516449e3d0f3f5e1852c6bdd3428c3437/app/Models/User.php#L1505
                     recommendedStarDifficulty[rulesetInfo] = Math.Pow((double)(result.Statistics.PP ?? 0), 0.4) * 0.195;
                 };
@@ -90,19 +89,12 @@ namespace osu.Game.Screens.Select
             });
         }
 
-        private IEnumerable<RulesetInfo> bestRulesetOrder;
-
         private IEnumerable<RulesetInfo> getBestRulesetOrder()
         {
-            bestRulesetOrder ??= recommendedStarDifficulty.OrderByDescending(pair => pair.Value)
-                                                          .Select(pair => pair.Key)
-                                                          .ToList();
+            IEnumerable<RulesetInfo> bestRulesetOrder = recommendedStarDifficulty.OrderByDescending(pair => pair.Value)
+                                                                                 .Select(pair => pair.Key)
+                                                                                 .ToList();
 
-            return moveCurrentRulesetToFirst();
-        }
-
-        private IEnumerable<RulesetInfo> moveCurrentRulesetToFirst()
-        {
             List<RulesetInfo> orderedRulesets;
 
             if (bestRulesetOrder.Contains(ruleset.Value))

From 07db977af5a61d0f45f80352f183f8db50f616c4 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Sat, 21 Nov 2020 14:36:43 +0200
Subject: [PATCH 0083/3722] Remove no longer necessary force calculation

Is no longer necessary because recommender uses bindable state value changes, compared to when the test was written, and runs the state change once on load
---
 .../Visual/SongSelect/TestSceneBeatmapRecommendations.cs       | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
index fc14af3ab5..8a4914a31b 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
@@ -46,9 +46,6 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             base.SetUpSteps();
 
-            // Force recommender to calculate its star ratings again
-            AddStep("calculate recommended SRs", () => recommender.APIStateChanged(API, APIState.Online));
-
             User getUser(int? rulesetID)
             {
                 return new User

From 07ee36a4ef2dde5ae2b524f672a124d3a8942efa Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Tue, 24 Nov 2020 17:18:19 +0800
Subject: [PATCH 0084/3722] Simplify code

---
 osu.Game/Screens/Import/FileImportScreen.cs | 118 ++++----------------
 1 file changed, 19 insertions(+), 99 deletions(-)

diff --git a/osu.Game/Screens/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
index bcbc87e8cc..2f2548c15a 100644
--- a/osu.Game/Screens/Import/FileImportScreen.cs
+++ b/osu.Game/Screens/Import/FileImportScreen.cs
@@ -13,7 +13,6 @@ using osu.Framework.Screens;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterfaceV2;
 using osuTK;
-using osu.Game.Overlays.Settings;
 using osu.Game.Overlays;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.Containers;
@@ -29,12 +28,11 @@ namespace osu.Game.Screens.Import
 
         public override bool HideOverlaysOnEnter => true;
 
-        private string[] fileExtensions = { ".foo" };
+        private string[] fileExtensions;
         private string defaultPath;
 
         private readonly Bindable<FileInfo> currentFile = new Bindable<FileInfo>();
         private readonly IBindable<DirectoryInfo> currentDirectory = new Bindable<DirectoryInfo>();
-        private readonly Bindable<FileFilterType> filterType = new Bindable<FileFilterType>(FileFilterType.All);
         private TextFlowContainer currentFileText;
         private OsuScrollContainer fileNameScroll;
         private readonly OverlayColourProvider overlayColourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
@@ -42,15 +40,12 @@ namespace osu.Game.Screens.Import
         [Resolved]
         private OsuGameBase gameBase { get; set; }
 
-        [Resolved]
-        private DialogOverlay dialogOverlay { get; set; }
-
         [BackgroundDependencyLoader(true)]
         private void load(Storage storage)
         {
             storage.GetStorageForDirectory("imports");
             var originalPath = storage.GetFullPath("imports", true);
-
+            fileExtensions = new string[] { ".osk", ".osr", ".osz" };
             defaultPath = originalPath;
 
             InternalChild = contentContainer = new Container
@@ -131,85 +126,43 @@ namespace osu.Game.Screens.Import
                                         {
                                             RelativeSizeAxes = Axes.X,
                                             AutoSizeAxes = Axes.Y,
+                                            Margin = new MarginPadding { Bottom = 15, Top =15 },
                                             Children = new Drawable[]
                                             {
-                                                new Box
-                                                {
-                                                    Colour = overlayColourProvider.Background4,
-                                                    RelativeSizeAxes = Axes.Both
-                                                },
                                                 new FillFlowContainer
                                                 {
                                                     RelativeSizeAxes = Axes.X,
                                                     AutoSizeAxes = Axes.Y,
-                                                    Spacing = new Vector2(10),
                                                     Children = new Drawable[]
                                                     {
-                                                        new SettingsEnumDropdown<FileFilterType>
-                                                        {
-                                                            Anchor = Anchor.BottomCentre,
-                                                            Origin = Anchor.BottomCentre,
-                                                            LabelText = "File Type",
-                                                            Current = filterType,
-                                                            Margin = new MarginPadding { Bottom = 15 }
-                                                        },
-                                                        new GridContainer
-                                                        {
-                                                            Anchor = Anchor.BottomCentre,
-                                                            Origin = Anchor.BottomCentre,
-                                                            AutoSizeAxes = Axes.Y,
-                                                            RelativeSizeAxes = Axes.X,
-                                                            Margin = new MarginPadding { Top = 15 },
-                                                            RowDimensions = new[]
+                                                            new TriangleButton
                                                             {
-                                                                new Dimension(GridSizeMode.AutoSize)
-                                                            },
-                                                            Content = new[]
-                                                            {
-                                                                new Drawable[]
+                                                                Text = "Import",
+                                                                Anchor = Anchor.BottomCentre,
+                                                                Origin = Anchor.BottomCentre,
+                                                                RelativeSizeAxes = Axes.X,
+                                                                Height = 50,
+                                                                Width = 0.9f,
+                                                                Action = () =>
                                                                 {
-                                                                    new TriangleButton
-                                                                    {
-                                                                        Anchor = Anchor.BottomCentre,
-                                                                        Origin = Anchor.BottomCentre,
-                                                                        RelativeSizeAxes = Axes.X,
-                                                                        Height = 50,
-                                                                        Width = 0.9f,
-                                                                        Text = "Refresh",
-                                                                        Action = refresh
-                                                                    },
-                                                                    new TriangleButton
-                                                                    {
-                                                                        Text = "Import",
-                                                                        Anchor = Anchor.BottomCentre,
-                                                                        Origin = Anchor.BottomCentre,
-                                                                        RelativeSizeAxes = Axes.X,
-                                                                        Height = 50,
-                                                                        Width = 0.9f,
-                                                                        Action = () =>
-                                                                        {
-                                                                            var d = currentFile.Value?.FullName;
-                                                                            if (d != null)
-                                                                                startImport(d);
-                                                                            else
-                                                                                currentFileText.FlashColour(Color4.Red, 500);
-                                                                        },
-                                                                    }
-                                                                },
+                                                                    var d = currentFile.Value?.FullName;
+                                                                    if (d != null)
+                                                                        startImport(d);
+                                                                    else
+                                                                        currentFileText.FlashColour(Color4.Red, 500);
+                                                                }
                                                             }
-                                                        },
                                                     }
-                                                },
+                                                }
                                             }
                                         }
                                     }
                                 }
-                            },
+                            }
                         }
                     }
                 }
             };
-
             fileNameScroll.ScrollContent.Anchor = Anchor.Centre;
             fileNameScroll.ScrollContent.Origin = Anchor.Centre;
 
@@ -218,37 +171,6 @@ namespace osu.Game.Screens.Import
             {
                 currentFile.Value = null;
             });
-
-            filterType.BindValueChanged(onFilterTypeChanged, true);
-        }
-
-        private void onFilterTypeChanged(ValueChangedEvent<FileFilterType> v)
-        {
-            switch (v.NewValue)
-            {
-                case FileFilterType.Beatmap:
-                    fileExtensions = new string[] { ".osz" };
-                    break;
-
-                case FileFilterType.Skin:
-                    fileExtensions = new string[] { ".osk" };
-                    break;
-
-                case FileFilterType.Replay:
-                    fileExtensions = new string[] { ".osr" };
-                    break;
-
-                default:
-                case FileFilterType.All:
-                    fileExtensions = new string[] { ".osk", ".osr", ".osz" };
-                    break;
-            }
-
-            refresh();
-        }
-
-        private void refresh()
-        {
             currentFile.UnbindBindings();
             currentDirectory.UnbindBindings();
 
@@ -265,7 +187,6 @@ namespace osu.Game.Screens.Import
 
             fileSelectContainer.Add(fileSelector);
         }
-
         private void updateFileSelectionText(ValueChangedEvent<FileInfo> v)
         {
             currentFileText.Text = v.NewValue?.Name ?? "Select a file";
@@ -298,7 +219,6 @@ namespace osu.Game.Screens.Import
 
             if (!File.Exists(path))
             {
-                refresh();
                 currentFileText.Text = "File not exist";
                 currentFileText.FlashColour(Color4.Red, 500);
                 return;

From 0b735b84cf205bb96f0e4d5308a64abf92ee9e63 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Tue, 24 Nov 2020 17:23:53 +0800
Subject: [PATCH 0085/3722] Remove unused enum

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

diff --git a/osu.Game/Screens/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
index 2f2548c15a..f53ea70f45 100644
--- a/osu.Game/Screens/Import/FileImportScreen.cs
+++ b/osu.Game/Screens/Import/FileImportScreen.cs
@@ -228,13 +228,5 @@ namespace osu.Game.Screens.Import
 
             Task.Factory.StartNew(() => gameBase.Import(paths), TaskCreationOptions.LongRunning);
         }
-
-        public enum FileFilterType
-        {
-            Skin,
-            Beatmap,
-            Replay,
-            All
-        }
     }
 }

From 7ab27399bf148eda81aba3e30c7e88d3d0aa7143 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Tue, 24 Nov 2020 18:04:34 +0800
Subject: [PATCH 0086/3722] Fix CI errors

---
 osu.Game/Screens/Import/FileImportScreen.cs | 37 ++++++++++-----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Screens/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
index f53ea70f45..88dcd6623f 100644
--- a/osu.Game/Screens/Import/FileImportScreen.cs
+++ b/osu.Game/Screens/Import/FileImportScreen.cs
@@ -28,9 +28,7 @@ namespace osu.Game.Screens.Import
 
         public override bool HideOverlaysOnEnter => true;
 
-        private string[] fileExtensions;
         private string defaultPath;
-
         private readonly Bindable<FileInfo> currentFile = new Bindable<FileInfo>();
         private readonly IBindable<DirectoryInfo> currentDirectory = new Bindable<DirectoryInfo>();
         private TextFlowContainer currentFileText;
@@ -45,7 +43,7 @@ namespace osu.Game.Screens.Import
         {
             storage.GetStorageForDirectory("imports");
             var originalPath = storage.GetFullPath("imports", true);
-            fileExtensions = new string[] { ".osk", ".osr", ".osz" };
+            string[] fileExtensions = { ".osk", ".osr", ".osz" };
             defaultPath = originalPath;
 
             InternalChild = contentContainer = new Container
@@ -126,7 +124,7 @@ namespace osu.Game.Screens.Import
                                         {
                                             RelativeSizeAxes = Axes.X,
                                             AutoSizeAxes = Axes.Y,
-                                            Margin = new MarginPadding { Bottom = 15, Top =15 },
+                                            Margin = new MarginPadding { Bottom = 15, Top =15 } ,
                                             Children = new Drawable[]
                                             {
                                                 new FillFlowContainer
@@ -135,21 +133,21 @@ namespace osu.Game.Screens.Import
                                                     AutoSizeAxes = Axes.Y,
                                                     Children = new Drawable[]
                                                     {
-                                                            new TriangleButton
-                                                            {
-                                                                Text = "Import",
-                                                                Anchor = Anchor.BottomCentre,
-                                                                Origin = Anchor.BottomCentre,
-                                                                RelativeSizeAxes = Axes.X,
-                                                                Height = 50,
-                                                                Width = 0.9f,
-                                                                Action = () =>
-                                                                {
-                                                                    var d = currentFile.Value?.FullName;
-                                                                    if (d != null)
-                                                                        startImport(d);
-                                                                    else
-                                                                        currentFileText.FlashColour(Color4.Red, 500);
+                                                        new TriangleButton
+                                                        {
+															Text = "Import",
+															Anchor = Anchor.BottomCentre,
+															Origin = Anchor.BottomCentre,
+															RelativeSizeAxes = Axes.X,
+															Height = 50,
+															Width = 0.9f,
+															Action = () =>
+															{
+                                                                var d = currentFile.Value?.FullName;
+                                                                if (d != null)
+                                                                    startImport(d);
+                                                                else
+                                                                    currentFileText.FlashColour(Color4.Red, 500);
                                                                 }
                                                             }
                                                     }
@@ -187,6 +185,7 @@ namespace osu.Game.Screens.Import
 
             fileSelectContainer.Add(fileSelector);
         }
+
         private void updateFileSelectionText(ValueChangedEvent<FileInfo> v)
         {
             currentFileText.Text = v.NewValue?.Name ?? "Select a file";

From 739c18a34d20eca3b542bbe2aad8e15d793e05e8 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Tue, 24 Nov 2020 18:25:38 +0800
Subject: [PATCH 0087/3722] dotnet format

---
 osu.Game/Screens/Import/FileImportScreen.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
index 88dcd6623f..39fd67c4e1 100644
--- a/osu.Game/Screens/Import/FileImportScreen.cs
+++ b/osu.Game/Screens/Import/FileImportScreen.cs
@@ -135,14 +135,14 @@ namespace osu.Game.Screens.Import
                                                     {
                                                         new TriangleButton
                                                         {
-															Text = "Import",
-															Anchor = Anchor.BottomCentre,
-															Origin = Anchor.BottomCentre,
-															RelativeSizeAxes = Axes.X,
-															Height = 50,
-															Width = 0.9f,
-															Action = () =>
-															{
+                                                            Text = "Import",
+                                                            Anchor = Anchor.BottomCentre,
+                                                            Origin = Anchor.BottomCentre,
+                                                            RelativeSizeAxes = Axes.X,
+                                                            Height = 50,
+                                                            Width = 0.9f,
+                                                            Action = () =>
+                                                            {
                                                                 var d = currentFile.Value?.FullName;
                                                                 if (d != null)
                                                                     startImport(d);

From 0009724c1a36914287df4c7b835078101b85520c Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Tue, 24 Nov 2020 18:48:32 +0800
Subject: [PATCH 0088/3722] Fix CI

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

diff --git a/osu.Game/Screens/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
index 39fd67c4e1..a59688a2a9 100644
--- a/osu.Game/Screens/Import/FileImportScreen.cs
+++ b/osu.Game/Screens/Import/FileImportScreen.cs
@@ -124,7 +124,7 @@ namespace osu.Game.Screens.Import
                                         {
                                             RelativeSizeAxes = Axes.X,
                                             AutoSizeAxes = Axes.Y,
-                                            Margin = new MarginPadding { Bottom = 15, Top =15 } ,
+                                            Margin = new MarginPadding { Bottom = 15, Top = 15 },
                                             Children = new Drawable[]
                                             {
                                                 new FillFlowContainer
@@ -148,8 +148,8 @@ namespace osu.Game.Screens.Import
                                                                     startImport(d);
                                                                 else
                                                                     currentFileText.FlashColour(Color4.Red, 500);
-                                                                }
                                                             }
+                                                        }
                                                     }
                                                 }
                                             }

From 579e61eab9502a205ed0a85a678e5d980d647bd2 Mon Sep 17 00:00:00 2001
From: PercyDan <50285552+PercyDan54@users.noreply.github.com>
Date: Sat, 28 Nov 2020 16:31:24 +0800
Subject: [PATCH 0089/3722] Allow null

---
 osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs
index 22674f0879..4a9c9bd8a2 100644
--- a/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Overlays.Settings.Sections.Debug
     {
         protected override string Header => "General";
 
-        [BackgroundDependencyLoader]
+        [BackgroundDependencyLoader(true)]
         private void load(FrameworkDebugConfigManager config, FrameworkConfigManager frameworkConfig, OsuGame game)
         {
             Children = new Drawable[]

From 2e5a40eddf839b6ce4cfbca727db92828e504562 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 1 Dec 2020 20:12:09 +0100
Subject: [PATCH 0090/3722] Add an IntentFilter to handle osu! files.

---
 osu.Android/OsuGameActivity.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index 7e250dce0e..b6e5742332 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using Android.App;
+using Android.Content;
 using Android.Content.PM;
 using Android.OS;
 using Android.Views;
@@ -9,7 +10,9 @@ using osu.Framework.Android;
 
 namespace osu.Android
 {
+
     [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false)]
+    [IntentFilter(new[] { Intent.ActionDefault }, Categories = new[] { Intent.CategoryDefault, Intent.CategoryBrowsable, Intent.CategoryAppFiles }, DataSchemes = new[] { "content" }, DataPathPatterns = new[] { ".*\\.osz", ".*\\.osk" }, DataMimeType = "application/*")]
     public class OsuGameActivity : AndroidGameActivity
     {
         protected override Framework.Game CreateGame() => new OsuGameAndroid(this);

From 005fa3a7eed9230828d7337cc200a405984bab6a Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 1 Dec 2020 20:28:15 +0100
Subject: [PATCH 0091/3722] Add ability to import files from a stream.

---
 osu.Game/Database/ArchiveModelManager.cs        |  8 ++++++++
 osu.Game/Database/ICanAcceptFiles.cs            |  9 +++++++++
 osu.Game/OsuGameBase.cs                         | 11 +++++++++++
 osu.Game/Screens/Edit/Setup/ResourcesSection.cs |  2 ++
 4 files changed, 30 insertions(+)

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 8bdc804311..9a7aa7b039 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -212,6 +212,14 @@ namespace osu.Game.Database
             return import;
         }
 
+        /// <summary>
+        /// Import one <typeparamref name="TModel"/> from a <see cref="Stream"/>.
+        /// </summary>
+        /// <param name="stream">The stream to import files from.</param>
+        /// <param name="filename">The filename of the archive being imported.</param>
+        public async Task Import(Stream stream, string filename)
+            => await Import(new ZipArchiveReader(stream, filename)); // we need to keep around the filename as some model managers (namely SkinManager) use the archive name to populate skin info
+
         /// <summary>
         /// Fired when the user requests to view the resulting import.
         /// </summary>
diff --git a/osu.Game/Database/ICanAcceptFiles.cs b/osu.Game/Database/ICanAcceptFiles.cs
index e4d92d957c..111701f0a4 100644
--- a/osu.Game/Database/ICanAcceptFiles.cs
+++ b/osu.Game/Database/ICanAcceptFiles.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.IO;
 using System.Threading.Tasks;
 
 namespace osu.Game.Database
@@ -17,6 +18,14 @@ namespace osu.Game.Database
         /// <param name="paths">The files which should be imported.</param>
         Task Import(params string[] paths);
 
+        /// <summary>
+        /// Import the specified stream.
+        /// </summary>
+        /// <param name="stream">The stream to import files from.</param>
+        /// <param name="filename">The filename of the archive being imported.</param>
+        /// <returns></returns>
+        Task Import(Stream stream, string filename);
+
         /// <summary>
         /// An array of accepted file extensions (in the standard format of ".abc").
         /// </summary>
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index e7b5d3304d..0fc2b8d1d7 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -395,6 +395,17 @@ namespace osu.Game
             }
         }
 
+        public async Task Import(Stream stream, string filename)
+        {
+            var extension = Path.GetExtension(filename)?.ToLowerInvariant();
+
+            foreach (var importer in fileImporters)
+            {
+                if (importer.HandledExtensions.Contains(extension))
+                    await importer.Import(stream, Path.GetFileNameWithoutExtension(filename));
+            }
+        }
+
         public IEnumerable<string> HandledExtensions => fileImporters.SelectMany(i => i.HandledExtensions);
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
index 17ecfdd52e..1527f240cb 100644
--- a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
+++ b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
@@ -99,6 +99,8 @@ namespace osu.Game.Screens.Edit.Setup
             return Task.CompletedTask;
         }
 
+        Task ICanAcceptFiles.Import(Stream stream, string filename) => Task.CompletedTask;
+
         protected override void LoadComplete()
         {
             base.LoadComplete();

From 827e957568d6efc53564193ae9196bbb13cc29bc Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 2 Dec 2020 18:03:49 +0100
Subject: [PATCH 0092/3722] Allow importing osz files / osk files from
 Downloads directory.

---
 osu.Android/OsuGameActivity.cs | 23 +++++++++++++++++++++--
 osu.Game/OsuGame.cs            | 16 ++++++++--------
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index b6e5742332..c41323b97f 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.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 System.Linq;
+using System.Threading.Tasks;
 using Android.App;
 using Android.Content;
 using Android.Content.PM;
@@ -12,10 +14,12 @@ namespace osu.Android
 {
 
     [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false)]
-    [IntentFilter(new[] { Intent.ActionDefault }, Categories = new[] { Intent.CategoryDefault, Intent.CategoryBrowsable, Intent.CategoryAppFiles }, DataSchemes = new[] { "content" }, DataPathPatterns = new[] { ".*\\.osz", ".*\\.osk" }, DataMimeType = "application/*")]
+    [IntentFilter(new[] { Intent.ActionDefault }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPatterns = new[] { ".*\\.osz", ".*\\.osk" }, DataMimeType = "application/*")]
     public class OsuGameActivity : AndroidGameActivity
     {
-        protected override Framework.Game CreateGame() => new OsuGameAndroid(this);
+        private OsuGameAndroid game;
+
+        protected override Framework.Game CreateGame() => game = new OsuGameAndroid(this);
 
         protected override void OnCreate(Bundle savedInstanceState)
         {
@@ -26,8 +30,23 @@ namespace osu.Android
 
             base.OnCreate(savedInstanceState);
 
+            OnNewIntent(Intent);
+
             Window.AddFlags(WindowManagerFlags.Fullscreen);
             Window.AddFlags(WindowManagerFlags.KeepScreenOn);
         }
+
+        protected override void OnNewIntent(Intent intent)
+        {
+            if (intent.Action == Intent.ActionView)
+            {
+                var filename = intent.Data.Path.Split('/').Last();
+                var stream = ContentResolver.OpenInputStream(intent.Data);
+                if (stream != null)
+                    // intent handler may run before the game has even loaded so we need to wait for the file importers to load before launching import
+                    game.WaitForReady(() => game, _ => Task.Run(() => game.Import(stream, filename))); 
+            }
+            base.OnNewIntent(intent);
+        }
     }
 }
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index bb638bcf3a..5b6b90fba5 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -267,7 +267,7 @@ namespace osu.Game
                 case LinkAction.OpenEditorTimestamp:
                 case LinkAction.JoinMultiplayerMatch:
                 case LinkAction.Spectate:
-                    waitForReady(() => notifications, _ => notifications.Post(new SimpleNotification
+                    WaitForReady(() => notifications, _ => notifications.Post(new SimpleNotification
                     {
                         Text = @"This link type is not yet supported!",
                         Icon = FontAwesome.Solid.LifeRing,
@@ -288,7 +288,7 @@ namespace osu.Game
             }
         });
 
-        public void OpenUrlExternally(string url) => waitForReady(() => externalLinkOpener, _ =>
+        public void OpenUrlExternally(string url) => WaitForReady(() => externalLinkOpener, _ =>
         {
             if (url.StartsWith('/'))
                 url = $"{API.Endpoint}{url}";
@@ -300,7 +300,7 @@ namespace osu.Game
         /// Open a specific channel in chat.
         /// </summary>
         /// <param name="channel">The channel to display.</param>
-        public void ShowChannel(string channel) => waitForReady(() => channelManager, _ =>
+        public void ShowChannel(string channel) => WaitForReady(() => channelManager, _ =>
         {
             try
             {
@@ -316,19 +316,19 @@ namespace osu.Game
         /// Show a beatmap set as an overlay.
         /// </summary>
         /// <param name="setId">The set to display.</param>
-        public void ShowBeatmapSet(int setId) => waitForReady(() => beatmapSetOverlay, _ => beatmapSetOverlay.FetchAndShowBeatmapSet(setId));
+        public void ShowBeatmapSet(int setId) => WaitForReady(() => beatmapSetOverlay, _ => beatmapSetOverlay.FetchAndShowBeatmapSet(setId));
 
         /// <summary>
         /// Show a user's profile as an overlay.
         /// </summary>
         /// <param name="userId">The user to display.</param>
-        public void ShowUser(int userId) => waitForReady(() => userProfile, _ => userProfile.ShowUser(userId));
+        public void ShowUser(int userId) => WaitForReady(() => userProfile, _ => userProfile.ShowUser(userId));
 
         /// <summary>
         /// Show a beatmap's set as an overlay, displaying the given beatmap.
         /// </summary>
         /// <param name="beatmapId">The beatmap to show.</param>
-        public void ShowBeatmap(int beatmapId) => waitForReady(() => beatmapSetOverlay, _ => beatmapSetOverlay.FetchAndShowBeatmap(beatmapId));
+        public void ShowBeatmap(int beatmapId) => WaitForReady(() => beatmapSetOverlay, _ => beatmapSetOverlay.FetchAndShowBeatmap(beatmapId));
 
         /// <summary>
         /// Present a beatmap at song select immediately.
@@ -483,13 +483,13 @@ namespace osu.Game
         /// <param name="retrieveInstance">A function to retrieve a (potentially not-yet-constructed) target instance.</param>
         /// <param name="action">The action to perform on the instance when load is confirmed.</param>
         /// <typeparam name="T">The type of the target instance.</typeparam>
-        private void waitForReady<T>(Func<T> retrieveInstance, Action<T> action)
+        public void WaitForReady<T>(Func<T> retrieveInstance, Action<T> action)
             where T : Drawable
         {
             var instance = retrieveInstance();
 
             if (ScreenStack == null || ScreenStack.CurrentScreen is StartupScreen || instance?.IsLoaded != true)
-                Schedule(() => waitForReady(retrieveInstance, action));
+                Schedule(() => WaitForReady(retrieveInstance, action));
             else
                 action(instance);
         }

From 48dad61a46494a588da1078e39295648b3c84dc0 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Thu, 3 Dec 2020 19:38:45 +0200
Subject: [PATCH 0093/3722] Apply review suggestions

---
 .../SongSelect/TestSceneBeatmapRecommendations.cs    |  2 --
 osu.Game/Rulesets/ILegacyRuleset.cs                  |  2 ++
 osu.Game/Screens/Select/DifficultyRecommender.cs     | 12 ++++++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
index 8a4914a31b..6c19206802 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
@@ -23,8 +23,6 @@ namespace osu.Game.Tests.Visual.SongSelect
 {
     public class TestSceneBeatmapRecommendations : OsuGameTestScene
     {
-        protected override bool UseOnlineAPI => false;
-
         [Resolved]
         private DifficultyRecommender recommender { get; set; }
 
diff --git a/osu.Game/Rulesets/ILegacyRuleset.cs b/osu.Game/Rulesets/ILegacyRuleset.cs
index 06a85b5261..f4b03baccd 100644
--- a/osu.Game/Rulesets/ILegacyRuleset.cs
+++ b/osu.Game/Rulesets/ILegacyRuleset.cs
@@ -5,6 +5,8 @@ namespace osu.Game.Rulesets
 {
     public interface ILegacyRuleset
     {
+        const int MAX_LEGACY_RULESET_ID = 3;
+
         /// <summary>
         /// Identifies the server-side ID of a legacy ruleset.
         /// </summary>
diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index ab64513ecb..f8aaf5c0fd 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -26,6 +26,8 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private Bindable<RulesetInfo> ruleset { get; set; }
 
+        private int storedUserId;
+
         private readonly Dictionary<RulesetInfo, double> recommendedStarDifficulty = new Dictionary<RulesetInfo, double>();
 
         private readonly IBindable<APIState> apiState = new Bindable<APIState>();
@@ -69,13 +71,15 @@ namespace osu.Game.Screens.Select
             return beatmap;
         }
 
-        private void calculateRecommendedDifficulties(bool onlyIfNoPreviousValues = false)
+        private void calculateRecommendedDifficulties()
         {
-            if (recommendedStarDifficulty.Any() && onlyIfNoPreviousValues)
+            if (recommendedStarDifficulty.Any() && api.LocalUser.Value.Id == storedUserId)
                 return;
 
+            storedUserId = api.LocalUser.Value.Id;
+
             // only query API for built-in rulesets
-            rulesets.AvailableRulesets.Where(ruleset => ruleset.ID <= 3).ForEach(rulesetInfo =>
+            rulesets.AvailableRulesets.Where(ruleset => ruleset.ID <= ILegacyRuleset.MAX_LEGACY_RULESET_ID).ForEach(rulesetInfo =>
             {
                 var req = new GetUserRequest(api.LocalUser.Value.Id, rulesetInfo);
 
@@ -117,7 +121,7 @@ namespace osu.Game.Screens.Select
             switch (state.NewValue)
             {
                 case APIState.Online:
-                    calculateRecommendedDifficulties(true);
+                    calculateRecommendedDifficulties();
                     break;
             }
         });

From 4cd2e207ac8b8353fd46019d0f446e8e258faf54 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Thu, 3 Dec 2020 19:53:06 +0200
Subject: [PATCH 0094/3722] Document getBestRulesetOrder

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

diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index f8aaf5c0fd..21e6629add 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -93,6 +93,9 @@ namespace osu.Game.Screens.Select
             });
         }
 
+        /// <returns>
+        /// Rulesets ordered by highest recommended star difficulty, except currently selected ruleset first
+        /// </returns>
         private IEnumerable<RulesetInfo> getBestRulesetOrder()
         {
             IEnumerable<RulesetInfo> bestRulesetOrder = recommendedStarDifficulty.OrderByDescending(pair => pair.Value)

From 49be4978bd400fc4ffb1036eb4f9cc23cfd79a07 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Thu, 3 Dec 2020 19:53:41 +0200
Subject: [PATCH 0095/3722] Avoid calling ToList twice

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

diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index 21e6629add..fa48316e9d 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -99,8 +99,7 @@ namespace osu.Game.Screens.Select
         private IEnumerable<RulesetInfo> getBestRulesetOrder()
         {
             IEnumerable<RulesetInfo> bestRulesetOrder = recommendedStarDifficulty.OrderByDescending(pair => pair.Value)
-                                                                                 .Select(pair => pair.Key)
-                                                                                 .ToList();
+                                                                                 .Select(pair => pair.Key);
 
             List<RulesetInfo> orderedRulesets;
 

From e792f070840bc3857467a3a3a74b00e0e7a075d3 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Thu, 3 Dec 2020 20:07:42 +0200
Subject: [PATCH 0096/3722] Add test for recommending current ruleset

---
 .../TestSceneBeatmapRecommendations.cs         | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
index 6c19206802..75a33af247 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
@@ -100,6 +100,24 @@ namespace osu.Game.Tests.Visual.SongSelect
             presentAndConfirm(() => beatmapSets[3], 2);
         }
 
+        [Test]
+        public void TestCurrentRulesetIsRecommended()
+        {
+            BeatmapSetInfo catchSet = null, mixedSet = null;
+
+            AddStep("create catch beatmapset", () => catchSet = importBeatmapSet(0, new[] { new CatchRuleset().RulesetInfo }));
+            AddStep("create mixed beatmapset", () => mixedSet = importBeatmapSet(1,
+                new[] { new TaikoRuleset().RulesetInfo, new CatchRuleset().RulesetInfo, new ManiaRuleset().RulesetInfo }));
+
+            AddAssert("all sets imported", () => ensureAllBeatmapSetsImported(new[] { catchSet, mixedSet }));
+
+            // Switch to catch
+            presentAndConfirm(() => catchSet, 1);
+
+            // Present mixed difficulty set, expect current ruleset to be selected
+            presentAndConfirm(() => mixedSet, 2);
+        }
+
         [Test]
         public void TestBestRulesetIsRecommended()
         {

From abe5a67bc5329702dd7b0176655b8796c1419c0b Mon Sep 17 00:00:00 2001
From: MATRIX-feather <midnightcarnival@outlook.com>
Date: Fri, 4 Dec 2020 03:14:07 +0800
Subject: [PATCH 0097/3722] Simplify implementation

---
 osu.Game/Screens/Import/FileImportScreen.cs | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
index a59688a2a9..211605e5c9 100644
--- a/osu.Game/Screens/Import/FileImportScreen.cs
+++ b/osu.Game/Screens/Import/FileImportScreen.cs
@@ -45,6 +45,7 @@ namespace osu.Game.Screens.Import
             var originalPath = storage.GetFullPath("imports", true);
             string[] fileExtensions = { ".osk", ".osr", ".osz" };
             defaultPath = originalPath;
+            var directory = currentDirectory.Value?.FullName ?? defaultPath;
 
             InternalChild = contentContainer = new Container
             {
@@ -67,6 +68,10 @@ namespace osu.Game.Screens.Import
                         Width = 0.65f,
                         Anchor = Anchor.TopLeft,
                         Origin = Anchor.TopLeft,
+                        Child = fileSelector = new FileSelector(initialPath: directory, validFileExtensions: fileExtensions)
+                        {
+                            RelativeSizeAxes = Axes.Both
+                        }
                     },
                     new Container
                     {
@@ -169,21 +174,9 @@ namespace osu.Game.Screens.Import
             {
                 currentFile.Value = null;
             });
-            currentFile.UnbindBindings();
-            currentDirectory.UnbindBindings();
-
-            fileSelector?.Expire();
-
-            var directory = currentDirectory.Value?.FullName ?? defaultPath;
-            fileSelector = new FileSelector(initialPath: directory, validFileExtensions: fileExtensions)
-            {
-                RelativeSizeAxes = Axes.Both
-            };
 
             currentDirectory.BindTo(fileSelector.CurrentPath);
             currentFile.BindTo(fileSelector.CurrentFile);
-
-            fileSelectContainer.Add(fileSelector);
         }
 
         private void updateFileSelectionText(ValueChangedEvent<FileInfo> v)

From 85de1a1d20cc5299a3c9443ff422da320d92d384 Mon Sep 17 00:00:00 2001
From: MATRIX-feather <midnightcarnival@outlook.com>
Date: Fri, 4 Dec 2020 03:19:20 +0800
Subject: [PATCH 0098/3722] Animation changes

---
 osu.Game/Screens/Import/FileImportScreen.cs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
index 211605e5c9..9fb8e22977 100644
--- a/osu.Game/Screens/Import/FileImportScreen.cs
+++ b/osu.Game/Screens/Import/FileImportScreen.cs
@@ -188,17 +188,16 @@ namespace osu.Game.Screens.Import
         {
             base.OnEntering(last);
 
-            contentContainer.FadeOut().Then().ScaleTo(0.8f).RotateTo(-15).MoveToX(300)
+            contentContainer.FadeOut().Then().ScaleTo(0.95f)
                             .Then()
-                            .ScaleTo(1, 1500, Easing.OutElastic)
-                            .FadeIn(500)
-                            .MoveToX(0, 500, Easing.OutQuint)
-                            .RotateTo(0, 500, Easing.OutQuint);
+                            .ScaleTo(1, 300, Easing.OutQuint)
+                            .FadeIn(300);
         }
 
         public override bool OnExiting(IScreen next)
         {
-            contentContainer.ScaleTo(0.8f, 500, Easing.OutExpo).RotateTo(-15, 500, Easing.OutExpo).MoveToX(300, 500, Easing.OutQuint).FadeOut(500);
+            contentContainer.ScaleTo(0.95f, 300, Easing.OutQuint)
+                            .FadeOut(300);
             this.FadeOut(500, Easing.OutExpo);
 
             return base.OnExiting(next);

From fb080284d2a03c3861d8c2430436c8a30c48d9a2 Mon Sep 17 00:00:00 2001
From: MATRIX-feather <midnightcarnival@outlook.com>
Date: Fri, 4 Dec 2020 04:10:08 +0800
Subject: [PATCH 0099/3722] Simplify UI implementation

---
 osu.Game/Screens/Import/FileImportScreen.cs | 153 +++++++-------------
 1 file changed, 54 insertions(+), 99 deletions(-)

diff --git a/osu.Game/Screens/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
index 9fb8e22977..9af87887b2 100644
--- a/osu.Game/Screens/Import/FileImportScreen.cs
+++ b/osu.Game/Screens/Import/FileImportScreen.cs
@@ -13,7 +13,6 @@ using osu.Framework.Screens;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterfaceV2;
 using osuTK;
-using osu.Game.Overlays;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.Containers;
 using osuTK.Graphics;
@@ -22,30 +21,32 @@ namespace osu.Game.Screens.Import
 {
     public class FileImportScreen : OsuScreen
     {
-        private Container contentContainer;
-        private FileSelector fileSelector;
-        private Container fileSelectContainer;
-
         public override bool HideOverlaysOnEnter => true;
 
-        private string defaultPath;
         private readonly Bindable<FileInfo> currentFile = new Bindable<FileInfo>();
         private readonly IBindable<DirectoryInfo> currentDirectory = new Bindable<DirectoryInfo>();
+
+        private FileSelector fileSelector;
+        private Container contentContainer;
         private TextFlowContainer currentFileText;
         private OsuScrollContainer fileNameScroll;
-        private readonly OverlayColourProvider overlayColourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
+
+        private const float duration = 300;
+        private const float button_height = 50;
+        private const float button_vertical_margin = 15;
 
         [Resolved]
         private OsuGameBase gameBase { get; set; }
 
+        [Resolved]
+        private OsuColour colours { get; set; }
+
         [BackgroundDependencyLoader(true)]
         private void load(Storage storage)
         {
             storage.GetStorageForDirectory("imports");
             var originalPath = storage.GetFullPath("imports", true);
             string[] fileExtensions = { ".osk", ".osr", ".osz" };
-            defaultPath = originalPath;
-            var directory = currentDirectory.Value?.FullName ?? defaultPath;
 
             InternalChild = contentContainer = new Container
             {
@@ -59,19 +60,13 @@ namespace osu.Game.Screens.Import
                 {
                     new Box
                     {
-                        Colour = overlayColourProvider.Background5,
+                        Colour = colours.GreySeafoamDark,
                         RelativeSizeAxes = Axes.Both,
                     },
-                    fileSelectContainer = new Container
+                    fileSelector = new FileSelector(initialPath: originalPath, validFileExtensions: fileExtensions)
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Width = 0.65f,
-                        Anchor = Anchor.TopLeft,
-                        Origin = Anchor.TopLeft,
-                        Child = fileSelector = new FileSelector(initialPath: directory, validFileExtensions: fileExtensions)
-                        {
-                            RelativeSizeAxes = Axes.Both
-                        }
+                        Width = 0.65f
                     },
                     new Container
                     {
@@ -79,87 +74,48 @@ namespace osu.Game.Screens.Import
                         Width = 0.35f,
                         Anchor = Anchor.TopRight,
                         Origin = Anchor.TopRight,
-                        Masking = true,
-                        CornerRadius = 10,
                         Children = new Drawable[]
                         {
-                            new GridContainer
+                            new Box
+                            {
+                                Colour = colours.GreySeafoamDarker,
+                                RelativeSizeAxes = Axes.Both
+                            },
+                            new Container
                             {
                                 RelativeSizeAxes = Axes.Both,
-                                RowDimensions = new[]
+                                Padding = new MarginPadding { Bottom = button_height + button_vertical_margin * 2 },
+                                Child = fileNameScroll = new OsuScrollContainer
                                 {
-                                    new Dimension(),
-                                    new Dimension(GridSizeMode.AutoSize),
-                                },
-                                Content = new[]
-                                {
-                                    new Drawable[]
+                                    RelativeSizeAxes = Axes.Both,
+                                    Anchor = Anchor.TopCentre,
+                                    Origin = Anchor.TopCentre,
+                                    Child = currentFileText = new TextFlowContainer(t => t.Font = OsuFont.Default.With(size: 30))
                                     {
-                                        new Container
-                                        {
-                                            RelativeSizeAxes = Axes.Both,
-                                            Anchor = Anchor.TopCentre,
-                                            Origin = Anchor.TopCentre,
-                                            Children = new Drawable[]
-                                            {
-                                                new Box
-                                                {
-                                                    Colour = overlayColourProvider.Background3,
-                                                    RelativeSizeAxes = Axes.Both
-                                                },
-                                                fileNameScroll = new OsuScrollContainer
-                                                {
-                                                    Masking = false,
-                                                    RelativeSizeAxes = Axes.Both,
-                                                    Child = currentFileText = new TextFlowContainer(t => t.Font = OsuFont.Default.With(size: 30))
-                                                    {
-                                                        AutoSizeAxes = Axes.Y,
-                                                        RelativeSizeAxes = Axes.X,
-                                                        Anchor = Anchor.Centre,
-                                                        Origin = Anchor.Centre,
-                                                        TextAnchor = Anchor.Centre
-                                                    },
-                                                },
-                                            }
-                                        },
+                                        AutoSizeAxes = Axes.Y,
+                                        RelativeSizeAxes = Axes.X,
+                                        Anchor = Anchor.Centre,
+                                        Origin = Anchor.Centre,
+                                        TextAnchor = Anchor.Centre
                                     },
-                                    new Drawable[]
-                                    {
-                                        new Container
-                                        {
-                                            RelativeSizeAxes = Axes.X,
-                                            AutoSizeAxes = Axes.Y,
-                                            Margin = new MarginPadding { Bottom = 15, Top = 15 },
-                                            Children = new Drawable[]
-                                            {
-                                                new FillFlowContainer
-                                                {
-                                                    RelativeSizeAxes = Axes.X,
-                                                    AutoSizeAxes = Axes.Y,
-                                                    Children = new Drawable[]
-                                                    {
-                                                        new TriangleButton
-                                                        {
-                                                            Text = "Import",
-                                                            Anchor = Anchor.BottomCentre,
-                                                            Origin = Anchor.BottomCentre,
-                                                            RelativeSizeAxes = Axes.X,
-                                                            Height = 50,
-                                                            Width = 0.9f,
-                                                            Action = () =>
-                                                            {
-                                                                var d = currentFile.Value?.FullName;
-                                                                if (d != null)
-                                                                    startImport(d);
-                                                                else
-                                                                    currentFileText.FlashColour(Color4.Red, 500);
-                                                            }
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
+                                },
+                            },
+                            new TriangleButton
+                            {
+                                Text = "Import",
+                                Anchor = Anchor.BottomCentre,
+                                Origin = Anchor.BottomCentre,
+                                RelativeSizeAxes = Axes.X,
+                                Height = button_height,
+                                Width = 0.9f,
+                                Margin = new MarginPadding { Vertical = button_vertical_margin },
+                                Action = () =>
+                                {
+                                    var d = currentFile.Value?.FullName;
+                                    if (d != null)
+                                        startImport(d);
+                                    else
+                                        currentFileText.FlashColour(Color4.Red, 500);
                                 }
                             }
                         }
@@ -190,15 +146,14 @@ namespace osu.Game.Screens.Import
 
             contentContainer.FadeOut().Then().ScaleTo(0.95f)
                             .Then()
-                            .ScaleTo(1, 300, Easing.OutQuint)
-                            .FadeIn(300);
+                            .ScaleTo(1, duration, Easing.OutQuint)
+                            .FadeIn(duration);
         }
 
         public override bool OnExiting(IScreen next)
         {
-            contentContainer.ScaleTo(0.95f, 300, Easing.OutQuint)
-                            .FadeOut(300);
-            this.FadeOut(500, Easing.OutExpo);
+            contentContainer.ScaleTo(0.95f, duration, Easing.OutQuint);
+            this.FadeOut(duration, Easing.OutQuint);
 
             return base.OnExiting(next);
         }
@@ -210,8 +165,8 @@ namespace osu.Game.Screens.Import
 
             if (!File.Exists(path))
             {
-                currentFileText.Text = "File not exist";
-                currentFileText.FlashColour(Color4.Red, 500);
+                currentFileText.Text = "No such file";
+                currentFileText.FlashColour(colours.Red, duration);
                 return;
             }
 

From 7104230ae3645392e051e1b998fb6c4bb809aabb Mon Sep 17 00:00:00 2001
From: MATRIX-feather <midnightcarnival@outlook.com>
Date: Fri, 4 Dec 2020 19:52:25 +0800
Subject: [PATCH 0100/3722] Add "onCurrentDirectoryChanged"

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

diff --git a/osu.Game/Screens/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
index 9af87887b2..e2e2b699f5 100644
--- a/osu.Game/Screens/Import/FileImportScreen.cs
+++ b/osu.Game/Screens/Import/FileImportScreen.cs
@@ -126,15 +126,17 @@ namespace osu.Game.Screens.Import
             fileNameScroll.ScrollContent.Origin = Anchor.Centre;
 
             currentFile.BindValueChanged(updateFileSelectionText, true);
-            currentDirectory.BindValueChanged(_ =>
-            {
-                currentFile.Value = null;
-            });
+            currentDirectory.BindValueChanged(onCurrentDirectoryChanged);
 
             currentDirectory.BindTo(fileSelector.CurrentPath);
             currentFile.BindTo(fileSelector.CurrentFile);
         }
 
+        private void onCurrentDirectoryChanged(ValueChangedEvent<DirectoryInfo> v)
+        {
+            currentFile.Value = null;
+        }
+
         private void updateFileSelectionText(ValueChangedEvent<FileInfo> v)
         {
             currentFileText.Text = v.NewValue?.Name ?? "Select a file";

From 825120fed3b3111b3dcd836a7ef18e4716160515 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Fri, 4 Dec 2020 18:49:01 +0100
Subject: [PATCH 0101/3722] Display import state in a notification.

---
 osu.Game/Database/ArchiveModelManager.cs | 37 +++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 9a7aa7b039..7b59726cd0 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -218,7 +218,42 @@ namespace osu.Game.Database
         /// <param name="stream">The stream to import files from.</param>
         /// <param name="filename">The filename of the archive being imported.</param>
         public async Task Import(Stream stream, string filename)
-            => await Import(new ZipArchiveReader(stream, filename)); // we need to keep around the filename as some model managers (namely SkinManager) use the archive name to populate skin info
+        {
+            var notification = new ProgressNotification
+            {
+                Progress = 0,
+                State = ProgressNotificationState.Active,
+                Text = $"{HumanisedModelName.Humanize(LetterCasing.Title)} import is initialising...",
+            };
+
+            PostNotification.Invoke(notification);
+
+            try
+            {
+                // we need to keep around the filename as some model managers (namely SkinManager) use the archive name to populate skin info
+                var imported = await Import(new ZipArchiveReader(stream, filename), notification.CancellationToken);
+
+                notification.CompletionText = $"Imported {imported}! Click to view.";
+                notification.CompletionClickAction += () =>
+                {
+                    PresentImport?.Invoke(new[] { imported });
+                    return true;
+                };
+                notification.State = ProgressNotificationState.Completed;
+            }
+            catch (TaskCanceledException)
+            {
+                throw;
+            }
+            catch (Exception e)
+            {
+                notification.Text = $"{HumanisedModelName.Humanize(LetterCasing.Title)} import failed!";
+                notification.State = ProgressNotificationState.Cancelled;
+                Logger.Error(e, $@"Could not import ({filename})", LoggingTarget.Database);
+            }
+
+            return;
+        }
 
         /// <summary>
         /// Fired when the user requests to view the resulting import.

From dd21de0cd526fb81c4d80beea034e343744a740a Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Fri, 4 Dec 2020 22:07:45 +0100
Subject: [PATCH 0102/3722] Fix code inspections.

---
 osu.Android/OsuGameActivity.cs           | 4 ++--
 osu.Game/Database/ArchiveModelManager.cs | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index c41323b97f..2b25c37d58 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -12,7 +12,6 @@ using osu.Framework.Android;
 
 namespace osu.Android
 {
-
     [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false)]
     [IntentFilter(new[] { Intent.ActionDefault }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPatterns = new[] { ".*\\.osz", ".*\\.osk" }, DataMimeType = "application/*")]
     public class OsuGameActivity : AndroidGameActivity
@@ -44,8 +43,9 @@ namespace osu.Android
                 var stream = ContentResolver.OpenInputStream(intent.Data);
                 if (stream != null)
                     // intent handler may run before the game has even loaded so we need to wait for the file importers to load before launching import
-                    game.WaitForReady(() => game, _ => Task.Run(() => game.Import(stream, filename))); 
+                    game.WaitForReady(() => game, _ => Task.Run(() => game.Import(stream, filename)));
             }
+
             base.OnNewIntent(intent);
         }
     }
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 7b59726cd0..f4208671d7 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -251,8 +251,6 @@ namespace osu.Game.Database
                 notification.State = ProgressNotificationState.Cancelled;
                 Logger.Error(e, $@"Could not import ({filename})", LoggingTarget.Database);
             }
-
-            return;
         }
 
         /// <summary>

From 280abdc473e8bd5e512c1456b906d757e98d6345 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sat, 5 Dec 2020 11:50:08 +0100
Subject: [PATCH 0103/3722] Use ContentResolver for getting filename.

---
 osu.Android/OsuGameActivity.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index 2b25c37d58..917a39148d 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -1,12 +1,12 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Linq;
 using System.Threading.Tasks;
 using Android.App;
 using Android.Content;
 using Android.Content.PM;
 using Android.OS;
+using Android.Provider;
 using Android.Views;
 using osu.Framework.Android;
 
@@ -39,11 +39,14 @@ namespace osu.Android
         {
             if (intent.Action == Intent.ActionView)
             {
-                var filename = intent.Data.Path.Split('/').Last();
+                var cursor = ContentResolver.Query(intent.Data, null, null, null);
+                var filename_column = cursor.GetColumnIndex(OpenableColumns.DisplayName);
+                cursor.MoveToFirst();
+
                 var stream = ContentResolver.OpenInputStream(intent.Data);
                 if (stream != null)
                     // intent handler may run before the game has even loaded so we need to wait for the file importers to load before launching import
-                    game.WaitForReady(() => game, _ => Task.Run(() => game.Import(stream, filename)));
+                    game.WaitForReady(() => game, _ => Task.Run(() => game.Import(stream, cursor.GetString(filename_column))));
             }
 
             base.OnNewIntent(intent);

From 0266410368a9ed8c62265ac67a21f8ef7e7d6593 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sat, 5 Dec 2020 18:30:40 +0100
Subject: [PATCH 0104/3722] Allow importing files through the android share
 sheet.

---
 osu.Android/OsuGameActivity.cs | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index 917a39148d..b331f3d734 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using Android.App;
 using Android.Content;
 using Android.Content.PM;
+using Android.Net;
 using Android.OS;
 using Android.Provider;
 using Android.Views;
@@ -13,7 +14,7 @@ using osu.Framework.Android;
 namespace osu.Android
 {
     [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false)]
-    [IntentFilter(new[] { Intent.ActionDefault }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPatterns = new[] { ".*\\.osz", ".*\\.osk" }, DataMimeType = "application/*")]
+    [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataPathPatterns = new[] { ".*\\.osz", ".*\\.osk" }, DataMimeType = "application/*")]
     public class OsuGameActivity : AndroidGameActivity
     {
         private OsuGameAndroid game;
@@ -37,19 +38,29 @@ namespace osu.Android
 
         protected override void OnNewIntent(Intent intent)
         {
-            if (intent.Action == Intent.ActionView)
+            if (intent.Action == Intent.ActionDefault)
             {
-                var cursor = ContentResolver.Query(intent.Data, null, null, null);
-                var filename_column = cursor.GetColumnIndex(OpenableColumns.DisplayName);
-                cursor.MoveToFirst();
-
-                var stream = ContentResolver.OpenInputStream(intent.Data);
-                if (stream != null)
-                    // intent handler may run before the game has even loaded so we need to wait for the file importers to load before launching import
-                    game.WaitForReady(() => game, _ => Task.Run(() => game.Import(stream, cursor.GetString(filename_column))));
+                if (intent.Scheme == ContentResolver.SchemeContent)
+                        handleImportFromUri(intent.Data);
             }
 
-            base.OnNewIntent(intent);
+            if (intent.Action == Intent.ActionSend)
+            {
+                var content = intent.ClipData.GetItemAt(0);
+                handleImportFromUri(content.Uri);
+            }
+        }
+
+        private void handleImportFromUri(Uri uri)
+        {
+            var cursor = ContentResolver.Query(uri, null, null, null);
+            var filename_column = cursor.GetColumnIndex(OpenableColumns.DisplayName);
+            cursor.MoveToFirst();
+
+            var stream = ContentResolver.OpenInputStream(uri);
+            if (stream != null)
+                // intent handler may run before the game has even loaded so we need to wait for the file importers to load before launching import
+                game.WaitForReady(() => game, _ => Task.Run(() => game.Import(stream, cursor.GetString(filename_column))));
         }
     }
 }

From 2ea8b105d51a42491b7663c2f5b6c01d6a467843 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sat, 5 Dec 2020 20:42:07 +0100
Subject: [PATCH 0105/3722] Apply review suggestions

---
 osu.Android/OsuGameActivity.cs | 11 ++++-------
 osu.Android/OsuGameAndroid.cs  |  9 +++++++++
 osu.Game/OsuGame.cs            |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index b331f3d734..a56206c969 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.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.Threading.Tasks;
 using Android.App;
 using Android.Content;
 using Android.Content.PM;
@@ -38,10 +37,9 @@ namespace osu.Android
 
         protected override void OnNewIntent(Intent intent)
         {
-            if (intent.Action == Intent.ActionDefault)
+            if (intent.Action == Intent.ActionDefault && intent.Scheme == ContentResolver.SchemeContent)
             {
-                if (intent.Scheme == ContentResolver.SchemeContent)
-                        handleImportFromUri(intent.Data);
+                handleImportFromUri(intent.Data);
             }
 
             if (intent.Action == Intent.ActionSend)
@@ -53,14 +51,13 @@ namespace osu.Android
 
         private void handleImportFromUri(Uri uri)
         {
-            var cursor = ContentResolver.Query(uri, null, null, null);
+            var cursor = ContentResolver.Query(uri, new[] { OpenableColumns.DisplayName }, null, null);
             var filename_column = cursor.GetColumnIndex(OpenableColumns.DisplayName);
             cursor.MoveToFirst();
 
             var stream = ContentResolver.OpenInputStream(uri);
             if (stream != null)
-                // intent handler may run before the game has even loaded so we need to wait for the file importers to load before launching import
-                game.WaitForReady(() => game, _ => Task.Run(() => game.Import(stream, cursor.GetString(filename_column))));
+                game.ScheduleImport(stream, cursor.GetString(filename_column));
         }
     }
 }
diff --git a/osu.Android/OsuGameAndroid.cs b/osu.Android/OsuGameAndroid.cs
index 21d6336b2c..81945ee083 100644
--- a/osu.Android/OsuGameAndroid.cs
+++ b/osu.Android/OsuGameAndroid.cs
@@ -2,6 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.IO;
+using System.Threading.Tasks;
 using Android.App;
 using Android.OS;
 using osu.Framework.Allocation;
@@ -65,6 +67,13 @@ namespace osu.Android
             }
         }
 
+        /// <summary>
+        /// Schedules a file to be imported once the game is loaded.
+        /// </summary>
+        /// <param name="stream">A stream to the file to import.</param>
+        /// <param name="filename">The filename of the file to import.</param>
+        public void ScheduleImport(Stream stream, string filename) => WaitForReady(() => this, _ => Task.Run(() => Import(stream, filename)));
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 5b6b90fba5..2c1db67d24 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -483,7 +483,7 @@ namespace osu.Game
         /// <param name="retrieveInstance">A function to retrieve a (potentially not-yet-constructed) target instance.</param>
         /// <param name="action">The action to perform on the instance when load is confirmed.</param>
         /// <typeparam name="T">The type of the target instance.</typeparam>
-        public void WaitForReady<T>(Func<T> retrieveInstance, Action<T> action)
+        protected void WaitForReady<T>(Func<T> retrieveInstance, Action<T> action)
             where T : Drawable
         {
             var instance = retrieveInstance();

From eda6e1fbddb46b9eec3a33a1417581154645ff8a Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 7 Dec 2020 13:11:13 +0100
Subject: [PATCH 0106/3722] Add tournament switching in the UI

---
 osu.Game.Tournament/IO/TournamentStorage.cs | 18 ++++++++++++++++++
 osu.Game.Tournament/Screens/SetupScreen.cs  | 13 +++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index 2e8a6ce667..66e27ddbb5 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -1,10 +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 osu.Framework.Bindables;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.IO;
 using System.IO;
+using System.Collections.Generic;
 using osu.Game.Tournament.Configuration;
 
 namespace osu.Game.Tournament.IO
@@ -13,12 +15,15 @@ namespace osu.Game.Tournament.IO
     {
         private const string default_tournament = "default";
         private readonly Storage storage;
+        private readonly Storage allTournaments;
         private readonly TournamentStorageManager storageConfig;
+        public readonly Bindable<string> CurrentTournament;
 
         public TournamentStorage(Storage storage)
             : base(storage.GetStorageForDirectory("tournaments"), string.Empty)
         {
             this.storage = storage;
+            allTournaments = UnderlyingStorage;
 
             storageConfig = new TournamentStorageManager(storage);
 
@@ -29,9 +34,22 @@ namespace osu.Game.Tournament.IO
             else
                 Migrate(UnderlyingStorage.GetStorageForDirectory(default_tournament));
 
+            CurrentTournament = new Bindable<string>(storageConfig.Get<string>(StorageConfig.CurrentTournament));
             Logger.Log("Using tournament storage: " + GetFullPath(string.Empty));
+
+            CurrentTournament.BindValueChanged(updateTournament, false);
         }
 
+        private void updateTournament(ValueChangedEvent<string> newTournament)
+        {
+            ChangeTargetStorage(allTournaments.GetStorageForDirectory(newTournament.NewValue));
+            Logger.Log("Changing tournament storage: " + GetFullPath(string.Empty));
+            storageConfig.Set(StorageConfig.CurrentTournament, newTournament.NewValue);
+            storageConfig.Save();
+        }
+
+        public IEnumerable<string> ListTournaments() => allTournaments.GetDirectories(string.Empty);
+
         public override void Migrate(Storage newStorage)
         {
             // this migration only happens once on moving to the per-tournament storage system.
diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index e78d3a9e83..9f34c36e64 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -9,8 +9,10 @@ using osu.Framework.Bindables;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Platform;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Tournament.IO;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Rulesets;
@@ -40,6 +42,9 @@ namespace osu.Game.Tournament.Screens
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
+        [Resolved]
+        private Storage storage { get; set; }
+
         [Resolved(canBeNull: true)]
         private TournamentSceneManager sceneManager { get; set; }
 
@@ -70,6 +75,7 @@ namespace osu.Game.Tournament.Screens
         private void reload()
         {
             var fileBasedIpc = ipc as FileBasedIPC;
+            var tourneyStorage = storage as TournamentStorage;
             fillFlow.Children = new Drawable[]
             {
                 new ActionableInfo
@@ -111,6 +117,13 @@ namespace osu.Game.Tournament.Screens
                     Items = rulesets.AvailableRulesets,
                     Current = LadderInfo.Ruleset,
                 },
+                new LabelledDropdown<string>
+                {
+                    Label = "Current tournament",
+                    Description = "Changes the background videos and bracket to match the selected tournament. This requires a restart after selecting to apply changes.",
+                    Items = tourneyStorage?.ListTournaments(),
+                    Current = tourneyStorage?.CurrentTournament,
+                },
                 resolution = new ResolutionSelector
                 {
                     Label = "Stream area resolution",

From 191f863a494dcbdab5aabb92c0686ddded29fabf Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 7 Dec 2020 13:14:59 +0100
Subject: [PATCH 0107/3722] Remove unncessary words from the description

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

diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index 9f34c36e64..f22cd13cea 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Tournament.Screens
                 new LabelledDropdown<string>
                 {
                     Label = "Current tournament",
-                    Description = "Changes the background videos and bracket to match the selected tournament. This requires a restart after selecting to apply changes.",
+                    Description = "Changes the background videos and bracket to match the selected tournament. This requires a restart to apply changes.",
                     Items = tourneyStorage?.ListTournaments(),
                     Current = tourneyStorage?.CurrentTournament,
                 },

From c778646f101d9f73709c5b76ae339b4ffeaef7c2 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 7 Dec 2020 18:01:57 +0100
Subject: [PATCH 0108/3722] Add support for importing replay files.

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

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index a56206c969..541455277d 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -13,7 +13,7 @@ using osu.Framework.Android;
 namespace osu.Android
 {
     [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false)]
-    [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataPathPatterns = new[] { ".*\\.osz", ".*\\.osk" }, DataMimeType = "application/*")]
+    [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataPathPatterns = new[] { ".*\\.osz", ".*\\.osk", ".*\\.osr" }, DataMimeType = "application/*")]
     public class OsuGameActivity : AndroidGameActivity
     {
         private OsuGameAndroid game;

From f980f413244c3252890868df1f32c2f1c88d3f81 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 7 Dec 2020 21:38:15 +0100
Subject: [PATCH 0109/3722] Address review

---
 osu.Game.Tournament/IO/TournamentStorage.cs |  6 ++----
 osu.Game.Tournament/Screens/SetupScreen.cs  | 12 +++++-------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index 66e27ddbb5..cf54c1f5ef 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -34,18 +34,16 @@ namespace osu.Game.Tournament.IO
             else
                 Migrate(UnderlyingStorage.GetStorageForDirectory(default_tournament));
 
-            CurrentTournament = new Bindable<string>(storageConfig.Get<string>(StorageConfig.CurrentTournament));
+            CurrentTournament = storageConfig.GetBindable<string>(StorageConfig.CurrentTournament);
             Logger.Log("Using tournament storage: " + GetFullPath(string.Empty));
 
-            CurrentTournament.BindValueChanged(updateTournament, false);
+            CurrentTournament.BindValueChanged(updateTournament);
         }
 
         private void updateTournament(ValueChangedEvent<string> newTournament)
         {
             ChangeTargetStorage(allTournaments.GetStorageForDirectory(newTournament.NewValue));
             Logger.Log("Changing tournament storage: " + GetFullPath(string.Empty));
-            storageConfig.Set(StorageConfig.CurrentTournament, newTournament.NewValue);
-            storageConfig.Save();
         }
 
         public IEnumerable<string> ListTournaments() => allTournaments.GetDirectories(string.Empty);
diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index f22cd13cea..3c9d3c949b 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -42,16 +42,14 @@ namespace osu.Game.Tournament.Screens
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
-        [Resolved]
-        private Storage storage { get; set; }
-
         [Resolved(canBeNull: true)]
         private TournamentSceneManager sceneManager { get; set; }
 
         private Bindable<Size> windowSize;
+        private TournamentStorage storage;
 
         [BackgroundDependencyLoader]
-        private void load(FrameworkConfigManager frameworkConfig)
+        private void load(FrameworkConfigManager frameworkConfig, Storage storage)
         {
             windowSize = frameworkConfig.GetBindable<Size>(FrameworkSetting.WindowedSize);
 
@@ -66,6 +64,7 @@ namespace osu.Game.Tournament.Screens
 
             api.LocalUser.BindValueChanged(_ => Schedule(reload));
             stableInfo.OnStableInfoSaved += () => Schedule(reload);
+            this.storage = (TournamentStorage)storage;
             reload();
         }
 
@@ -75,7 +74,6 @@ namespace osu.Game.Tournament.Screens
         private void reload()
         {
             var fileBasedIpc = ipc as FileBasedIPC;
-            var tourneyStorage = storage as TournamentStorage;
             fillFlow.Children = new Drawable[]
             {
                 new ActionableInfo
@@ -121,8 +119,8 @@ namespace osu.Game.Tournament.Screens
                 {
                     Label = "Current tournament",
                     Description = "Changes the background videos and bracket to match the selected tournament. This requires a restart to apply changes.",
-                    Items = tourneyStorage?.ListTournaments(),
-                    Current = tourneyStorage?.CurrentTournament,
+                    Items = storage.ListTournaments(),
+                    Current = storage.CurrentTournament,
                 },
                 resolution = new ResolutionSelector
                 {

From 6002014f952ee71992f54c267ed4c9967e5d5639 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 7 Dec 2020 22:07:54 +0100
Subject: [PATCH 0110/3722] Change underlyingstorage to alltournaments for
 clarity

---
 osu.Game.Tournament/IO/TournamentStorage.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index cf54c1f5ef..2ba1b6be8f 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -29,10 +29,10 @@ namespace osu.Game.Tournament.IO
 
             if (storage.Exists("tournament.ini"))
             {
-                ChangeTargetStorage(UnderlyingStorage.GetStorageForDirectory(storageConfig.Get<string>(StorageConfig.CurrentTournament)));
+                ChangeTargetStorage(allTournaments.GetStorageForDirectory(storageConfig.Get<string>(StorageConfig.CurrentTournament)));
             }
             else
-                Migrate(UnderlyingStorage.GetStorageForDirectory(default_tournament));
+                Migrate(allTournaments.GetStorageForDirectory(default_tournament));
 
             CurrentTournament = storageConfig.GetBindable<string>(StorageConfig.CurrentTournament);
             Logger.Log("Using tournament storage: " + GetFullPath(string.Empty));

From be4a668e0b83025c6c7d87f5964ea4887e62d606 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 4 Dec 2020 15:34:31 +0900
Subject: [PATCH 0111/3722] Add basic structure for multiplayer state and model
 components

---
 .../RealtimeMultiplayer/ISpectatorClient.cs   | 19 +++++++++++++++++++
 .../RealtimeMultiplayer/ISpectatorServer.cs   | 13 +++++++++++++
 .../RealtimeMultiplayer/MultiplayerRoom.cs    | 15 +++++++++++++++
 .../MultiplayerRoomState.cs                   | 17 +++++++++++++++++
 4 files changed, 64 insertions(+)
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/ISpectatorServer.cs
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomState.cs

diff --git a/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs b/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs
new file mode 100644
index 0000000000..8054c489c5
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.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.Threading.Tasks;
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    /// <summary>
+    /// An interface defining a spectator client instance.
+    /// </summary>
+    public interface IMultiplayerClient
+    {
+        /// <summary>
+        /// Signals that the room has changed state.
+        /// </summary>
+        /// <param name="state">The state of the room.</param>
+        Task RoomStateChanged(MultiplayerRoomState state);
+    }
+}
diff --git a/osu.Game/Online/RealtimeMultiplayer/ISpectatorServer.cs b/osu.Game/Online/RealtimeMultiplayer/ISpectatorServer.cs
new file mode 100644
index 0000000000..3d00eaaf6a
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/ISpectatorServer.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.
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    /// <summary>
+    /// An interface defining the spectator server instance.
+    /// </summary>
+    public interface IMultiplayerServer
+    {
+        // TODO: implement
+    }
+}
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
new file mode 100644
index 0000000000..ee1f42f7bf
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.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;
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    [Serializable]
+    public class MultiplayerRoom
+    {
+        public long RoomID { get; set; }
+
+        public MultiplayerRoomState State { get; set; }
+    }
+}
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomState.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomState.cs
new file mode 100644
index 0000000000..60e47e9027
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomState.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    /// <summary>
+    /// The current overall state of a realtime multiplayer room.
+    /// </summary>
+    public enum MultiplayerRoomState
+    {
+        Open,
+        WaitingForLoad,
+        Playing,
+        WaitingForResults,
+        Closed
+    }
+}

From daed27460c8f2b29349401d59ac4026f2fcf8e48 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 4 Dec 2020 17:23:57 +0900
Subject: [PATCH 0112/3722] Add simple user state class

---
 .../RealtimeMultiplayer/MultiplayerClientState.cs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs
new file mode 100644
index 0000000000..ac76f8999a
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.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.Online.RealtimeMultiplayer
+{
+    public class MultiplayerClientState
+    {
+        public MultiplayerClientState(in long roomId)
+        {
+            CurrentRoomID = roomId;
+        }
+
+        public long CurrentRoomID { get; }
+    }
+}

From f4ccbbd09261ac4ba63d4633d3d884841b4139c9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 4 Dec 2020 18:18:41 +0900
Subject: [PATCH 0113/3722] Add basic server implementation

---
 .../RealtimeMultiplayer/ISpectatorServer.cs       | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/ISpectatorServer.cs b/osu.Game/Online/RealtimeMultiplayer/ISpectatorServer.cs
index 3d00eaaf6a..ba7d7d3832 100644
--- a/osu.Game/Online/RealtimeMultiplayer/ISpectatorServer.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/ISpectatorServer.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 System.Threading.Tasks;
+
 namespace osu.Game.Online.RealtimeMultiplayer
 {
     /// <summary>
@@ -8,6 +10,17 @@ namespace osu.Game.Online.RealtimeMultiplayer
     /// </summary>
     public interface IMultiplayerServer
     {
-        // TODO: implement
+        /// <summary>
+        /// Request to join a multiplayer room.
+        /// </summary>
+        /// <param name="roomId">The databased room ID.</param>
+        /// <returns>Whether the room could be joined.</returns>
+        Task<bool> JoinRoom(long roomId);
+
+        /// <summary>
+        /// Request to leave the currently joined room.
+        /// </summary>
+        /// <param name="roomId">The databased room ID.</param>
+        Task LeaveRoom(long roomId);
     }
 }

From 8ebdb5723b19827960f08a60e3e0c252fb188208 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 7 Dec 2020 18:50:02 +0900
Subject: [PATCH 0114/3722] Add models for users and rooms

---
 .../RealtimeMultiplayer/MultiplayerRoom.cs    |  9 ++++++++
 .../MultiplayerRoomUser.cs                    | 21 +++++++++++++++++++
 .../MultiplayerUserState.cs                   | 13 ++++++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
index ee1f42f7bf..f42f8d7f5f 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 
 namespace osu.Game.Online.RealtimeMultiplayer
 {
@@ -11,5 +12,13 @@ namespace osu.Game.Online.RealtimeMultiplayer
         public long RoomID { get; set; }
 
         public MultiplayerRoomState State { get; set; }
+
+        public IReadOnlyList<MultiplayerRoomUser> Users => users;
+
+        private List<MultiplayerRoomUser> users = new List<MultiplayerRoomUser>();
+
+        public void Join(int user) => users.Add(new MultiplayerRoomUser(user));
+
+        public void Leave(int user) => users.RemoveAll(u => u.UserID == user);
     }
 }
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs
new file mode 100644
index 0000000000..c5fed1629c
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.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.Users;
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    public class MultiplayerRoomUser
+    {
+        public MultiplayerRoomUser(in int userId)
+        {
+            UserID = userId;
+        }
+
+        public long UserID { get; set; }
+
+        public MultiplayerUserState State { get; set; }
+
+        public User User { get; set; }
+    }
+}
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs
new file mode 100644
index 0000000000..6d6baa8017
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.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.
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    public enum MultiplayerUserState
+    {
+        Watching,
+        Ready,
+        Playing,
+        Results,
+    }
+}

From fdf025942b526ad34ce1a8cd25bd55f0acb6980c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 01:24:38 +0900
Subject: [PATCH 0115/3722] Ensure room is locked when mutating users

---
 .../RealtimeMultiplayer/MultiplayerRoom.cs    | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
index f42f8d7f5f..1a02dab5e0 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
@@ -9,16 +9,33 @@ namespace osu.Game.Online.RealtimeMultiplayer
     [Serializable]
     public class MultiplayerRoom
     {
+        private object writeLock = new object();
+
         public long RoomID { get; set; }
 
         public MultiplayerRoomState State { get; set; }
 
-        public IReadOnlyList<MultiplayerRoomUser> Users => users;
-
         private List<MultiplayerRoomUser> users = new List<MultiplayerRoomUser>();
 
-        public void Join(int user) => users.Add(new MultiplayerRoomUser(user));
+        public IReadOnlyList<MultiplayerRoomUser> Users
+        {
+            get
+            {
+                lock (writeLock)
+                    return users.ToArray();
+            }
+        }
 
-        public void Leave(int user) => users.RemoveAll(u => u.UserID == user);
+        public void Join(int user)
+        {
+            lock (writeLock)
+                users.Add(new MultiplayerRoomUser(user));
+        }
+
+        public void Leave(int user)
+        {
+            lock (writeLock)
+                users.RemoveAll(u => u.UserID == user);
+        }
     }
 }

From ca86524c922012b32e7a1420c54b49d96a6df3d6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 01:35:29 +0900
Subject: [PATCH 0116/3722] Add locking on join/leave operations

---
 .../RealtimeMultiplayer/MultiplayerRoom.cs    | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
index 1a02dab5e0..db3993255a 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
@@ -26,16 +26,25 @@ namespace osu.Game.Online.RealtimeMultiplayer
             }
         }
 
-        public void Join(int user)
+        public MultiplayerRoomUser Join(int userId)
         {
-            lock (writeLock)
-                users.Add(new MultiplayerRoomUser(user));
+            var user = new MultiplayerRoomUser(userId);
+            lock (writeLock) users.Add(user);
+            return user;
         }
 
-        public void Leave(int user)
+        public MultiplayerRoomUser Leave(int userId)
         {
             lock (writeLock)
-                users.RemoveAll(u => u.UserID == user);
+            {
+                var user = users.Find(u => u.UserID == userId);
+
+                if (user == null)
+                    return null;
+
+                users.Remove(user);
+                return user;
+            }
         }
     }
 }

From ff52a5ddc6bc5cbb4d5dfdf52fed460b6e660826 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 01:35:42 +0900
Subject: [PATCH 0117/3722] Add callbacks for join/leave events to notify other
 room occupants

---
 .../Online/RealtimeMultiplayer/ISpectatorClient.cs   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs b/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs
index 8054c489c5..d5f6baad43 100644
--- a/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs
@@ -15,5 +15,17 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// </summary>
         /// <param name="state">The state of the room.</param>
         Task RoomStateChanged(MultiplayerRoomState state);
+
+        /// <summary>
+        /// Signals that a user has joined the room.
+        /// </summary>
+        /// <param name="user">The user.</param>
+        Task UserJoined(MultiplayerRoomUser user);
+
+        /// <summary>
+        /// Signals that a user has left the room.
+        /// </summary>
+        /// <param name="user">The user.</param>
+        Task UserLeft(MultiplayerRoomUser user);
     }
 }

From 6e5846d91b7389575a91691851f6311de8a5cddc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 14:33:01 +0900
Subject: [PATCH 0118/3722] Fix serialization failure due to missing set

---
 osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs
index ac76f8999a..17c209ba26 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs
@@ -5,11 +5,11 @@ namespace osu.Game.Online.RealtimeMultiplayer
 {
     public class MultiplayerClientState
     {
+        public long CurrentRoomID { get; set; }
+
         public MultiplayerClientState(in long roomId)
         {
             CurrentRoomID = roomId;
         }
-
-        public long CurrentRoomID { get; }
     }
 }

From baf16cfbc3a30082996acb9bde002b58ff815105 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 14:33:38 +0900
Subject: [PATCH 0119/3722] Add room settings related model and event flow

---
 .../RealtimeMultiplayer/ISpectatorClient.cs   |  6 +++++
 .../RealtimeMultiplayer/MultiplayerRoom.cs    |  2 ++
 .../MultiplayerRoomSettings.cs                | 25 +++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs

diff --git a/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs b/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs
index d5f6baad43..1e6832e728 100644
--- a/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs
@@ -27,5 +27,11 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// </summary>
         /// <param name="user">The user.</param>
         Task UserLeft(MultiplayerRoomUser user);
+
+        /// <summary>
+        /// Signals that the settings for this room have changed.
+        /// </summary>
+        /// <param name="newSettings">The updated room settings.</param>
+        Task SettingsChanged(MultiplayerRoomSettings newSettings);
     }
 }
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
index db3993255a..61320b9d73 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
@@ -15,6 +15,8 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
         public MultiplayerRoomState State { get; set; }
 
+        public MultiplayerRoomSettings Settings { get; set; }
+
         private List<MultiplayerRoomUser> users = new List<MultiplayerRoomUser>();
 
         public IReadOnlyList<MultiplayerRoomUser> Users
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
new file mode 100644
index 0000000000..4c2c014cd9
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.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 System;
+using System.Collections.Generic;
+using System.Linq;
+using JetBrains.Annotations;
+using osu.Game.Online.API;
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    public class MultiplayerRoomSettings : IEquatable<MultiplayerRoomSettings>
+    {
+        public int? BeatmapID { get; set; }
+
+        public int? RulesetID { get; set; }
+
+        [NotNull]
+        public IEnumerable<APIMod> Mods { get; set; } = Enumerable.Empty<APIMod>();
+
+        public bool Equals(MultiplayerRoomSettings other) => BeatmapID == other?.BeatmapID && Mods.SequenceEqual(other?.Mods) && RulesetID == other?.RulesetID;
+
+        public override string ToString() => $"Beatmap:{BeatmapID} Mods:{string.Join(',', Mods)} Ruleset:{RulesetID}";
+    }
+}

From 882ace6efea12be861efc400d5b61e0a8dd48a0d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 14:33:47 +0900
Subject: [PATCH 0120/3722] Make MultiplayerRoomUser equatable

---
 .../MultiplayerRoomUser.cs                    | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs
index c5fed1629c..3daebe3dda 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs
@@ -1,21 +1,41 @@
 // Copyright (c) ppy 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.Online.RealtimeMultiplayer
 {
-    public class MultiplayerRoomUser
+    public class MultiplayerRoomUser : IEquatable<MultiplayerRoomUser>
     {
         public MultiplayerRoomUser(in int userId)
         {
             UserID = userId;
         }
 
-        public long UserID { get; set; }
+        public long UserID { get; }
 
         public MultiplayerUserState State { get; set; }
 
         public User User { get; set; }
+
+        public bool Equals(MultiplayerRoomUser other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+
+            return UserID == other.UserID;
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj)) return false;
+            if (ReferenceEquals(this, obj)) return true;
+            if (obj.GetType() != this.GetType()) return false;
+
+            return Equals((MultiplayerRoomUser)obj);
+        }
+
+        public override int GetHashCode() => UserID.GetHashCode();
     }
 }

From e193f8214df514f770d3bcad9ef41ce053255ed8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 14:39:26 +0900
Subject: [PATCH 0121/3722] Remove unnecessary room id from leave room request

---
 osu.Game/Online/RealtimeMultiplayer/ISpectatorServer.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/ISpectatorServer.cs b/osu.Game/Online/RealtimeMultiplayer/ISpectatorServer.cs
index ba7d7d3832..053ffa0462 100644
--- a/osu.Game/Online/RealtimeMultiplayer/ISpectatorServer.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/ISpectatorServer.cs
@@ -20,7 +20,6 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// <summary>
         /// Request to leave the currently joined room.
         /// </summary>
-        /// <param name="roomId">The databased room ID.</param>
-        Task LeaveRoom(long roomId);
+        Task LeaveRoom();
     }
 }

From b3bdaaa7b59dc6a58f4448a7a236e0b8f2756f6f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 14:49:36 +0900
Subject: [PATCH 0122/3722] Move exceptions to common code

---
 .../RealtimeMultiplayer/InvalidStateException.cs  | 15 +++++++++++++++
 .../RealtimeMultiplayer/NotJoinedRoomException.cs | 12 ++++++++++++
 .../UserAlreadyInMultiplayerRoom.cs               | 15 +++++++++++++++
 3 files changed, 42 insertions(+)
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/InvalidStateException.cs
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/UserAlreadyInMultiplayerRoom.cs

diff --git a/osu.Game/Online/RealtimeMultiplayer/InvalidStateException.cs b/osu.Game/Online/RealtimeMultiplayer/InvalidStateException.cs
new file mode 100644
index 0000000000..8393e7e925
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/InvalidStateException.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;
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    public class InvalidStateException : Exception
+    {
+        public InvalidStateException(string message)
+            : base(message)
+        {
+        }
+    }
+}
diff --git a/osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs b/osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs
new file mode 100644
index 0000000000..1b264d1ac5
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    public class NotJoinedRoomException : Exception
+    {
+        public NotJoinedRoomException()
+            : base("This user has not yet joined a multiplayer room.")
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/osu.Game/Online/RealtimeMultiplayer/UserAlreadyInMultiplayerRoom.cs b/osu.Game/Online/RealtimeMultiplayer/UserAlreadyInMultiplayerRoom.cs
new file mode 100644
index 0000000000..9a2090c710
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/UserAlreadyInMultiplayerRoom.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;
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    public class UserAlreadyInMultiplayerRoom : Exception
+    {
+        public UserAlreadyInMultiplayerRoom()
+            : base("This user is already in a room.")
+        {
+        }
+    }
+}

From 327799c263bd923f4b7b51b8e675914aabb1d74f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 14:51:48 +0900
Subject: [PATCH 0123/3722] Rename multiplayer server file to match class

---
 .../{ISpectatorServer.cs => IMultiplayerServer.cs}       | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
 rename osu.Game/Online/RealtimeMultiplayer/{ISpectatorServer.cs => IMultiplayerServer.cs} (66%)

diff --git a/osu.Game/Online/RealtimeMultiplayer/ISpectatorServer.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
similarity index 66%
rename from osu.Game/Online/RealtimeMultiplayer/ISpectatorServer.cs
rename to osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
index 053ffa0462..f6eb3b8ff5 100644
--- a/osu.Game/Online/RealtimeMultiplayer/ISpectatorServer.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
@@ -1,6 +1,3 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
 using System.Threading.Tasks;
 
 namespace osu.Game.Online.RealtimeMultiplayer
@@ -14,12 +11,12 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// Request to join a multiplayer room.
         /// </summary>
         /// <param name="roomId">The databased room ID.</param>
-        /// <returns>Whether the room could be joined.</returns>
-        Task<bool> JoinRoom(long roomId);
+        /// <exception cref="UserAlreadyInMultiplayerRoom">If the user is already in the requested (or another) room.</exception>
+        Task JoinRoom(long roomId);
 
         /// <summary>
         /// Request to leave the currently joined room.
         /// </summary>
         Task LeaveRoom();
     }
-}
+}
\ No newline at end of file

From 5a231cef1507289a2da1c4a719e26b195edccf01 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 15:46:11 +0900
Subject: [PATCH 0124/3722] Add thread safety for external operations on
 MultiplayerRoom

---
 .../RealtimeMultiplayer/MultiplayerRoom.cs    | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
index 61320b9d73..7c3724915f 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
@@ -9,8 +9,6 @@ namespace osu.Game.Online.RealtimeMultiplayer
     [Serializable]
     public class MultiplayerRoom
     {
-        private object writeLock = new object();
-
         public long RoomID { get; set; }
 
         public MultiplayerRoomState State { get; set; }
@@ -31,22 +29,34 @@ namespace osu.Game.Online.RealtimeMultiplayer
         public MultiplayerRoomUser Join(int userId)
         {
             var user = new MultiplayerRoomUser(userId);
-            lock (writeLock) users.Add(user);
+            PerformUpdate(_ => users.Add(user));
             return user;
         }
 
         public MultiplayerRoomUser Leave(int userId)
         {
-            lock (writeLock)
+            MultiplayerRoomUser user = null;
+
+            PerformUpdate(_ =>
             {
-                var user = users.Find(u => u.UserID == userId);
+                user = users.Find(u => u.UserID == userId);
 
-                if (user == null)
-                    return null;
+                if (user != null)
+                    users.Remove(user);
+            });
 
-                users.Remove(user);
-                return user;
-            }
+            return user;
+        }
+
+        private object writeLock = new object();
+
+        /// <summary>
+        /// Perform an update on this room in a thread-safe manner.
+        /// </summary>
+        /// <param name="action">The action to perform.</param>
+        public void PerformUpdate(Action<MultiplayerRoom> action)
+        {
+            lock (writeLock) action(this);
         }
     }
 }

From 4f449ba8217fa7ce930d2f608f55464d9da90ff0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 15:49:08 +0900
Subject: [PATCH 0125/3722] Rename idle state

---
 osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs
index 6d6baa8017..47a1226e29 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs
@@ -5,7 +5,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
 {
     public enum MultiplayerUserState
     {
-        Watching,
+        Idle,
         Ready,
         Playing,
         Results,

From 42b1e9d6a4185cea488227a159de1d256456bb4b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 15:54:52 +0900
Subject: [PATCH 0126/3722] Add xmldoc coverage of MultiplayerRoom

---
 .../RealtimeMultiplayer/MultiplayerRoom.cs    | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
index 7c3724915f..4bd8411344 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
@@ -9,14 +9,28 @@ namespace osu.Game.Online.RealtimeMultiplayer
     [Serializable]
     public class MultiplayerRoom
     {
+        /// <summary>
+        /// The ID of the room, used for database persistence.
+        /// </summary>
         public long RoomID { get; set; }
 
+        /// <summary>
+        /// The current state of the room (ie. whether it is in progress or otherwise).
+        /// </summary>
         public MultiplayerRoomState State { get; set; }
 
+        /// <summary>
+        /// All currently enforced game settings for this room.
+        /// </summary>
         public MultiplayerRoomSettings Settings { get; set; }
 
         private List<MultiplayerRoomUser> users = new List<MultiplayerRoomUser>();
 
+        private object writeLock = new object();
+
+        /// <summary>
+        /// All users which are currently in this room, in any state.
+        /// </summary>
         public IReadOnlyList<MultiplayerRoomUser> Users
         {
             get
@@ -26,6 +40,9 @@ namespace osu.Game.Online.RealtimeMultiplayer
             }
         }
 
+        /// <summary>
+        /// Join a new user to this room.
+        /// </summary>
         public MultiplayerRoomUser Join(int userId)
         {
             var user = new MultiplayerRoomUser(userId);
@@ -33,6 +50,9 @@ namespace osu.Game.Online.RealtimeMultiplayer
             return user;
         }
 
+        /// <summary>
+        /// Remove a user from this room.
+        /// </summary>
         public MultiplayerRoomUser Leave(int userId)
         {
             MultiplayerRoomUser user = null;
@@ -48,8 +68,6 @@ namespace osu.Game.Online.RealtimeMultiplayer
             return user;
         }
 
-        private object writeLock = new object();
-
         /// <summary>
         /// Perform an update on this room in a thread-safe manner.
         /// </summary>

From 2365d656104a66233ffe983907db64c5515b108c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 16:02:35 +0900
Subject: [PATCH 0127/3722] Move business logic out of MultiplayerRoom

---
 .../RealtimeMultiplayer/MultiplayerRoom.cs    | 48 +++----------------
 1 file changed, 7 insertions(+), 41 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
index 4bd8411344..dc7ced7a9a 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
@@ -6,6 +6,9 @@ using System.Collections.Generic;
 
 namespace osu.Game.Online.RealtimeMultiplayer
 {
+    /// <summary>
+    /// A multiplayer room.
+    /// </summary>
     [Serializable]
     public class MultiplayerRoom
     {
@@ -24,50 +27,13 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// </summary>
         public MultiplayerRoomSettings Settings { get; set; }
 
-        private List<MultiplayerRoomUser> users = new List<MultiplayerRoomUser>();
+        /// <summary>
+        /// All users currently in this room.
+        /// </summary>
+        public List<MultiplayerRoomUser> Users { get; set; } = new List<MultiplayerRoomUser>();
 
         private object writeLock = new object();
 
-        /// <summary>
-        /// All users which are currently in this room, in any state.
-        /// </summary>
-        public IReadOnlyList<MultiplayerRoomUser> Users
-        {
-            get
-            {
-                lock (writeLock)
-                    return users.ToArray();
-            }
-        }
-
-        /// <summary>
-        /// Join a new user to this room.
-        /// </summary>
-        public MultiplayerRoomUser Join(int userId)
-        {
-            var user = new MultiplayerRoomUser(userId);
-            PerformUpdate(_ => users.Add(user));
-            return user;
-        }
-
-        /// <summary>
-        /// Remove a user from this room.
-        /// </summary>
-        public MultiplayerRoomUser Leave(int userId)
-        {
-            MultiplayerRoomUser user = null;
-
-            PerformUpdate(_ =>
-            {
-                user = users.Find(u => u.UserID == userId);
-
-                if (user != null)
-                    users.Remove(user);
-            });
-
-            return user;
-        }
-
         /// <summary>
         /// Perform an update on this room in a thread-safe manner.
         /// </summary>

From 5d2ca7fc39be724fb6098b2c36076131220406c5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 16:15:51 +0900
Subject: [PATCH 0128/3722] Make remaining model classes nullable and
 serializable

---
 .../MultiplayerClientState.cs                 |  2 ++
 .../RealtimeMultiplayer/MultiplayerRoom.cs    |  9 ++++++++-
 .../MultiplayerRoomSettings.cs                |  7 ++++++-
 .../MultiplayerRoomState.cs                   |  2 ++
 .../MultiplayerRoomUser.cs                    | 19 ++++++++++---------
 5 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs
index 17c209ba26..8c440abba3 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.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 enable
+
 namespace osu.Game.Online.RealtimeMultiplayer
 {
     public class MultiplayerClientState
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
index dc7ced7a9a..e70e12c89e 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.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 enable
+
 using System;
 using System.Collections.Generic;
 
@@ -25,13 +27,18 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// <summary>
         /// All currently enforced game settings for this room.
         /// </summary>
-        public MultiplayerRoomSettings Settings { get; set; }
+        public MultiplayerRoomSettings Settings { get; set; } = MultiplayerRoomSettings.Empty();
 
         /// <summary>
         /// All users currently in this room.
         /// </summary>
         public List<MultiplayerRoomUser> Users { get; set; } = new List<MultiplayerRoomUser>();
 
+        /// <summary>
+        /// The host of this room, in control of changing room settings.
+        /// </summary>
+        public MultiplayerRoomUser? Host { get; set; }
+
         private object writeLock = new object();
 
         /// <summary>
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
index 4c2c014cd9..3137afa8a4 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.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 enable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -9,6 +11,7 @@ using osu.Game.Online.API;
 
 namespace osu.Game.Online.RealtimeMultiplayer
 {
+    [Serializable]
     public class MultiplayerRoomSettings : IEquatable<MultiplayerRoomSettings>
     {
         public int? BeatmapID { get; set; }
@@ -18,8 +21,10 @@ namespace osu.Game.Online.RealtimeMultiplayer
         [NotNull]
         public IEnumerable<APIMod> Mods { get; set; } = Enumerable.Empty<APIMod>();
 
-        public bool Equals(MultiplayerRoomSettings other) => BeatmapID == other?.BeatmapID && Mods.SequenceEqual(other?.Mods) && RulesetID == other?.RulesetID;
+        public bool Equals(MultiplayerRoomSettings other) => BeatmapID == other.BeatmapID && Mods.SequenceEqual(other.Mods) && RulesetID == other.RulesetID;
 
         public override string ToString() => $"Beatmap:{BeatmapID} Mods:{string.Join(',', Mods)} Ruleset:{RulesetID}";
+
+        public static MultiplayerRoomSettings Empty() => new MultiplayerRoomSettings();
     }
 }
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomState.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomState.cs
index 60e47e9027..9f76cd945e 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomState.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomState.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 enable
+
 namespace osu.Game.Online.RealtimeMultiplayer
 {
     /// <summary>
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs
index 3daebe3dda..17aca4458a 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs
@@ -1,27 +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.
 
+#nullable enable
+
 using System;
 using osu.Game.Users;
 
 namespace osu.Game.Online.RealtimeMultiplayer
 {
+    [Serializable]
     public class MultiplayerRoomUser : IEquatable<MultiplayerRoomUser>
     {
+        public readonly long UserID;
+
+        public MultiplayerUserState State { get; set; } = MultiplayerUserState.Idle;
+
+        public User? User { get; set; }
+
         public MultiplayerRoomUser(in int userId)
         {
             UserID = userId;
         }
 
-        public long UserID { get; }
-
-        public MultiplayerUserState State { get; set; }
-
-        public User User { get; set; }
-
         public bool Equals(MultiplayerRoomUser other)
         {
-            if (ReferenceEquals(null, other)) return false;
             if (ReferenceEquals(this, other)) return true;
 
             return UserID == other.UserID;
@@ -29,9 +31,8 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj)) return false;
             if (ReferenceEquals(this, obj)) return true;
-            if (obj.GetType() != this.GetType()) return false;
+            if (obj.GetType() != GetType()) return false;
 
             return Equals((MultiplayerRoomUser)obj);
         }

From 5f5c0d55336a2228becd3021e2ee348c56c55d58 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 16:15:58 +0900
Subject: [PATCH 0129/3722] Return room model when joining

---
 osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
index f6eb3b8ff5..a05a4c1e11 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// </summary>
         /// <param name="roomId">The databased room ID.</param>
         /// <exception cref="UserAlreadyInMultiplayerRoom">If the user is already in the requested (or another) room.</exception>
-        Task JoinRoom(long roomId);
+        Task<MultiplayerRoom> JoinRoom(long roomId);
 
         /// <summary>
         /// Request to leave the currently joined room.

From 71de7ce0a3abc0af75d210d54ceafca9c1f0f5b2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 16:32:45 +0900
Subject: [PATCH 0130/3722] Add missing methods to server interface

---
 .../RealtimeMultiplayer/IMultiplayerServer.cs      | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
index a05a4c1e11..44d7ecc2e9 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
@@ -18,5 +18,17 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// Request to leave the currently joined room.
         /// </summary>
         Task LeaveRoom();
+
+        /// <summary>
+        /// Transfer the host of the currently joined room to another user in the room.
+        /// </summary>
+        /// <param name="userId">The new user which is to become host.</param>
+        Task TransferHost(long userId);
+
+        /// <summary>
+        /// As the host, update the settings of the currently joined room.
+        /// </summary>
+        /// <param name="settings">The new settings to apply.</param>
+        Task ChangeSettings(MultiplayerRoomSettings settings);
     }
-}
\ No newline at end of file
+}

From a4ca8d2998dc9fa222aceeb09ae90bf013bdf542 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 16:44:47 +0900
Subject: [PATCH 0131/3722] Ensure multiplayer rooms are instantiated with a
 room ID

---
 osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
index e70e12c89e..8a88d8fc90 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// <summary>
         /// The ID of the room, used for database persistence.
         /// </summary>
-        public long RoomID { get; set; }
+        public readonly long RoomID;
 
         /// <summary>
         /// The current state of the room (ie. whether it is in progress or otherwise).
@@ -41,6 +41,11 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
         private object writeLock = new object();
 
+        public MultiplayerRoom(in long roomId)
+        {
+            RoomID = roomId;
+        }
+
         /// <summary>
         /// Perform an update on this room in a thread-safe manner.
         /// </summary>

From dbe048cdc6b6d893e92109d50fd3fa5732fa294c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 17:03:44 +0900
Subject: [PATCH 0132/3722] Add client method for notifying about host changes

---
 osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs b/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs
index 1e6832e728..f3dff0de86 100644
--- a/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs
@@ -28,6 +28,12 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// <param name="user">The user.</param>
         Task UserLeft(MultiplayerRoomUser user);
 
+        /// <summary>
+        /// Signal that the host of the room has changed.
+        /// </summary>
+        /// <param name="userId">The user ID of the new host.</param>
+        Task HostChanged(long userId);
+
         /// <summary>
         /// Signals that the settings for this room have changed.
         /// </summary>

From 11a7057289b20a195bd1be91e1a11681d2f29eb2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 17:41:56 +0900
Subject: [PATCH 0133/3722] Add notification flow for user state changes in
 room

---
 .../RealtimeMultiplayer/IMultiplayerServer.cs     |  7 +++++++
 .../RealtimeMultiplayer/ISpectatorClient.cs       |  7 +++++++
 .../RealtimeMultiplayer/InvalidStateChange.cs     | 15 +++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/InvalidStateChange.cs

diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
index 44d7ecc2e9..ad4aa5d2c2 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
@@ -30,5 +30,12 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// </summary>
         /// <param name="settings">The new settings to apply.</param>
         Task ChangeSettings(MultiplayerRoomSettings settings);
+
+        /// <summary>
+        /// Change the local user state in the currently joined room.
+        /// </summary>
+        /// <param name="newState">The proposed new state.</param>
+        /// <exception cref="InvalidStateChange">If the state change requested is not valid, given the previous state or room state.</exception>
+        Task ChangeState(MultiplayerUserState newState);
     }
 }
diff --git a/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs b/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs
index f3dff0de86..fa06652474 100644
--- a/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs
@@ -39,5 +39,12 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// </summary>
         /// <param name="newSettings">The updated room settings.</param>
         Task SettingsChanged(MultiplayerRoomSettings newSettings);
+
+        /// <summary>
+        /// Signals that a user in this room changed their state.
+        /// </summary>
+        /// <param name="userId">The ID of the user performing a state change.</param>
+        /// <param name="state">The new state of the user.</param>
+        Task UserStateChanged(long userId, MultiplayerUserState state);
     }
 }
diff --git a/osu.Game/Online/RealtimeMultiplayer/InvalidStateChange.cs b/osu.Game/Online/RealtimeMultiplayer/InvalidStateChange.cs
new file mode 100644
index 0000000000..d1016e95cb
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/InvalidStateChange.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;
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    public class InvalidStateChange : Exception
+    {
+        public InvalidStateChange(MultiplayerUserState oldState, MultiplayerUserState newState)
+            : base($"Cannot change from {oldState} to {newState}")
+        {
+        }
+    }
+}

From 345352be6757ab9225df004307e07a48de2523dd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 17:42:08 +0900
Subject: [PATCH 0134/3722] Mark PerformUpdate as an instant handle method
 (doesn't really help with anything)

---
 osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
index 8a88d8fc90..3fbc01a2f5 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Collections.Generic;
+using JetBrains.Annotations;
 
 namespace osu.Game.Online.RealtimeMultiplayer
 {
@@ -50,7 +51,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// Perform an update on this room in a thread-safe manner.
         /// </summary>
         /// <param name="action">The action to perform.</param>
-        public void PerformUpdate(Action<MultiplayerRoom> action)
+        public void PerformUpdate([InstantHandle] Action<MultiplayerRoom> action)
         {
             lock (writeLock) action(this);
         }

From 8eccfa476cbbff5a3e6ceb1e0cef9b2c0e74a683 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 18:02:14 +0900
Subject: [PATCH 0135/3722] Add loading states

---
 osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs
index 47a1226e29..948ed50cca 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs
@@ -7,6 +7,8 @@ namespace osu.Game.Online.RealtimeMultiplayer
     {
         Idle,
         Ready,
+        WaitingForLoad,
+        Loaded,
         Playing,
         Results,
     }

From 60550b73f77d0ec625c070fcd6eee395e8397149 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 18:18:20 +0900
Subject: [PATCH 0136/3722] Add missing states and xmldoc for all states'
 purposes

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

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs
index 948ed50cca..ed799f5252 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs
@@ -5,11 +5,51 @@ namespace osu.Game.Online.RealtimeMultiplayer
 {
     public enum MultiplayerUserState
     {
+        /// <summary>
+        /// The user is idle and waiting for something to happen (or watching the match but not participating).
+        /// </summary>
         Idle,
+
+        /// <summary>
+        /// The user has marked themselves as ready to participate and should be considered for the next game start.
+        /// </summary>
         Ready,
+
+        /// <summary>
+        /// The server is waiting for this user to finish loading. This is a reserved state, and is set by the server.
+        /// </summary>
+        /// <remarks>
+        /// All users in <see cref="Ready"/> state when the game start will be transitioned to this state.
+        /// All users in this state need to transition to <see cref="Loaded"/> before the game can start.
+        /// </remarks>
         WaitingForLoad,
+
+        /// <summary>
+        /// The user's client has marked itself as loaded and ready to begin gameplay.
+        /// </summary>
         Loaded,
+
+        /// <summary>
+        /// The user is currently playing in a game. This is a reserved state, and is set by the server.
+        /// </summary>
+        /// <remarks>
+        /// Once there are no remaining <see cref="WaitingForLoad"/> users, all users in <see cref="Loaded"/> state will be transitioned to this state.
+        /// At this point the game will start for all users.
+        /// </remarks>
         Playing,
+
+        /// <summary>
+        /// The user has finished playing and is ready to view results.
+        /// </summary>
+        /// <remarks>
+        /// Once all users transition from <see cref="Playing"/> to this state, the game will end and results will be distributed.
+        /// All users will be transitioned to the <see cref="Results"/> state.
+        /// </remarks>
+        FinishedPlay,
+
+        /// <summary>
+        /// The user is currently viewing results. This is a reserved state, and is set by the server.
+        /// </summary>
         Results,
     }
 }

From 147db0abe22642c8f449b3f121cc8040c98f17f4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 18:28:31 +0900
Subject: [PATCH 0137/3722] Fix client naming and xmldoc

---
 .../{ISpectatorClient.cs => IMultiplayerClient.cs}              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename osu.Game/Online/RealtimeMultiplayer/{ISpectatorClient.cs => IMultiplayerClient.cs} (96%)

diff --git a/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
similarity index 96%
rename from osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs
rename to osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
index fa06652474..e772ef39f9 100644
--- a/osu.Game/Online/RealtimeMultiplayer/ISpectatorClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 namespace osu.Game.Online.RealtimeMultiplayer
 {
     /// <summary>
-    /// An interface defining a spectator client instance.
+    /// An interface defining a multiplayer client instance.
     /// </summary>
     public interface IMultiplayerClient
     {

From 2aedd82e27a490a09c5efe526e2e45a7120b12e0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 18:30:58 +0900
Subject: [PATCH 0138/3722] Document room states and remove unnecessary
 WaitingForResults state

---
 .../RealtimeMultiplayer/MultiplayerRoomState.cs  | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomState.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomState.cs
index 9f76cd945e..69c04b09a8 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomState.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomState.cs
@@ -10,10 +10,24 @@ namespace osu.Game.Online.RealtimeMultiplayer
     /// </summary>
     public enum MultiplayerRoomState
     {
+        /// <summary>
+        /// The room is open and accepting new players.
+        /// </summary>
         Open,
+
+        /// <summary>
+        /// A game start has been triggered but players have not finished loading.
+        /// </summary>
         WaitingForLoad,
+
+        /// <summary>
+        /// A game is currently ongoing.
+        /// </summary>
         Playing,
-        WaitingForResults,
+
+        /// <summary>
+        /// The room has been disbanded and closed.
+        /// </summary>
         Closed
     }
 }

From 2433838d5887e84089496713857dbd8f12f797aa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 18:42:08 +0900
Subject: [PATCH 0139/3722] Add methods covering match start / end

---
 .../RealtimeMultiplayer/IMultiplayerClient.cs     | 15 +++++++++++++++
 .../RealtimeMultiplayer/IMultiplayerServer.cs     |  5 +++++
 2 files changed, 20 insertions(+)

diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
index e772ef39f9..1e59b62a9d 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
@@ -46,5 +46,20 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// <param name="userId">The ID of the user performing a state change.</param>
         /// <param name="state">The new state of the user.</param>
         Task UserStateChanged(long userId, MultiplayerUserState state);
+
+        /// <summary>
+        /// Signals that a match is to be started. Users in the <see cref="MultiplayerUserState.Ready"/> state should begin loading gameplay at this point.
+        /// </summary>
+        Task LoadRequested();
+
+        /// <summary>
+        /// Signals that a match has started. All loaded users' clients should now start gameplay as soon as possible.
+        /// </summary>
+        Task MatchStarted();
+
+        /// <summary>
+        /// Signals that the match has ended, all players have finished and results are ready to be displayed.
+        /// </summary>
+        Task ResultsReady();
     }
 }
diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
index ad4aa5d2c2..eb9eddbdf5 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
@@ -37,5 +37,10 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// <param name="newState">The proposed new state.</param>
         /// <exception cref="InvalidStateChange">If the state change requested is not valid, given the previous state or room state.</exception>
         Task ChangeState(MultiplayerUserState newState);
+
+        /// <summary>
+        /// As the host of a room, start the match.
+        /// </summary>
+        Task StartMatch();
     }
 }

From df908f90b2fe4ed8eab7804dbd32c0191d16c4ac Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 19:06:08 +0900
Subject: [PATCH 0140/3722] Add exception to be thrown when an operation is
 requested requiring host when not host

---
 .../RealtimeMultiplayer/IMultiplayerServer.cs     |  2 ++
 .../RealtimeMultiplayer/NotHostException.cs       | 15 +++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/NotHostException.cs

diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
index eb9eddbdf5..565c07d0ec 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
@@ -23,6 +23,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// Transfer the host of the currently joined room to another user in the room.
         /// </summary>
         /// <param name="userId">The new user which is to become host.</param>
+        /// <exception cref="NotHostException">A user other than the current host is attempting to transfer host.</exception>
         Task TransferHost(long userId);
 
         /// <summary>
@@ -41,6 +42,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// <summary>
         /// As the host of a room, start the match.
         /// </summary>
+        /// <exception cref="NotHostException">A user other than the current host is attempting to start the game.</exception>
         Task StartMatch();
     }
 }
diff --git a/osu.Game/Online/RealtimeMultiplayer/NotHostException.cs b/osu.Game/Online/RealtimeMultiplayer/NotHostException.cs
new file mode 100644
index 0000000000..e421c6ae28
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/NotHostException.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;
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    public class NotHostException : Exception
+    {
+        public NotHostException()
+            : base("User is attempting to perform a host level operation while not the host")
+        {
+        }
+    }
+}

From 021a11609326c10de152d53963c04bebc2a77e21 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 19:06:27 +0900
Subject: [PATCH 0141/3722] Add extra xmldoc covering the fact that
 MatchStarted is received by all users

---
 osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
index 1e59b62a9d..c89d99dd1c 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         Task LoadRequested();
 
         /// <summary>
-        /// Signals that a match has started. All loaded users' clients should now start gameplay as soon as possible.
+        /// Signals that a match has started. All user in the <see cref="MultiplayerUserState.Loaded"/> state should begin gameplay as soon as possible.
         /// </summary>
         Task MatchStarted();
 

From d76fabedf90c4c45eda7e0ead815170f3b3012e6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 19:44:22 +0900
Subject: [PATCH 0142/3722] Add note about LoadRequested only being sent to a
 subset of room users

---
 osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs   | 2 +-
 osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
index c89d99dd1c..e75b0da207 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         Task UserStateChanged(long userId, MultiplayerUserState state);
 
         /// <summary>
-        /// Signals that a match is to be started. Users in the <see cref="MultiplayerUserState.Ready"/> state should begin loading gameplay at this point.
+        /// Signals that a match is to be started. This will *only* be sent to clients which are to begin loading at this point.
         /// </summary>
         Task LoadRequested();
 
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs
index ed799f5252..ed9acd146e 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs
@@ -13,6 +13,10 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// <summary>
         /// The user has marked themselves as ready to participate and should be considered for the next game start.
         /// </summary>
+        /// <remarks>
+        /// Clients in this state will receive gameplay channel messages.
+        /// As a client the only thing to look for in this state is a <see cref="IMultiplayerClient.LoadRequested"/> call.
+        /// </remarks>
         Ready,
 
         /// <summary>

From aa68ae4ff27713f25ad42545baa905d83e29de4f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 20:10:23 +0900
Subject: [PATCH 0143/3722] Change locking mechanism for multiplayer rooms to
 use using-disposal pattern

Was required to lock over `await` calls server-side.
---
 .../RealtimeMultiplayer/LockUntilDisposal.cs  | 24 +++++++++++++++++++
 .../RealtimeMultiplayer/MultiplayerRoom.cs    |  9 ++-----
 2 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/LockUntilDisposal.cs

diff --git a/osu.Game/Online/RealtimeMultiplayer/LockUntilDisposal.cs b/osu.Game/Online/RealtimeMultiplayer/LockUntilDisposal.cs
new file mode 100644
index 0000000000..cd16fce2ee
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/LockUntilDisposal.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;
+using System.Threading;
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    public readonly struct LockUntilDisposal : IDisposable
+    {
+        private readonly object lockTarget;
+
+        public LockUntilDisposal(object lockTarget)
+        {
+            this.lockTarget = lockTarget;
+            Monitor.Enter(lockTarget);
+        }
+
+        public void Dispose()
+        {
+            Monitor.Exit(lockTarget);
+        }
+    }
+}
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
index 3fbc01a2f5..0f18ab6c89 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
@@ -5,7 +5,6 @@
 
 using System;
 using System.Collections.Generic;
-using JetBrains.Annotations;
 
 namespace osu.Game.Online.RealtimeMultiplayer
 {
@@ -48,12 +47,8 @@ namespace osu.Game.Online.RealtimeMultiplayer
         }
 
         /// <summary>
-        /// Perform an update on this room in a thread-safe manner.
+        /// Request a lock on this room to perform a thread-safe update.
         /// </summary>
-        /// <param name="action">The action to perform.</param>
-        public void PerformUpdate([InstantHandle] Action<MultiplayerRoom> action)
-        {
-            lock (writeLock) action(this);
-        }
+        public LockUntilDisposal LockForUpdate() => new LockUntilDisposal(writeLock);
     }
 }

From 02f5fda330306b6ae9b3a67dad6f50b2373562c6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 8 Dec 2020 21:15:10 +0900
Subject: [PATCH 0144/3722] Add missing final newline in file

---
 osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs b/osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs
index 1b264d1ac5..ca4a54f6d7 100644
--- a/osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs
@@ -9,4 +9,4 @@ namespace osu.Game.Online.RealtimeMultiplayer
         {
         }
     }
-}
\ No newline at end of file
+}

From d8838ddbfbda709e1b92e10e6914d8f492a23623 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 8 Dec 2020 18:48:50 +0100
Subject: [PATCH 0145/3722] Remove duplicated overload.

---
 osu.Game/Database/ArchiveModelManager.cs | 43 +-----------------------
 1 file changed, 1 insertion(+), 42 deletions(-)

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 3ec3b96579..6766ca2b77 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -218,48 +218,7 @@ namespace osu.Game.Database
             }
 
             return import;
-        }
-
-        /// <summary>
-        /// Import one <typeparamref name="TModel"/> from a <see cref="Stream"/>.
-        /// </summary>
-        /// <param name="stream">The stream to import files from.</param>
-        /// <param name="filename">The filename of the archive being imported.</param>
-        public async Task Import(Stream stream, string filename)
-        {
-            var notification = new ProgressNotification
-            {
-                Progress = 0,
-                State = ProgressNotificationState.Active,
-                Text = $"{HumanisedModelName.Humanize(LetterCasing.Title)} import is initialising...",
-            };
-
-            PostNotification.Invoke(notification);
-
-            try
-            {
-                // we need to keep around the filename as some model managers (namely SkinManager) use the archive name to populate skin info
-                var imported = await Import(new ZipArchiveReader(stream, filename), notification.CancellationToken);
-
-                notification.CompletionText = $"Imported {imported}! Click to view.";
-                notification.CompletionClickAction += () =>
-                {
-                    PresentImport?.Invoke(new[] { imported });
-                    return true;
-                };
-                notification.State = ProgressNotificationState.Completed;
-            }
-            catch (TaskCanceledException)
-            {
-                throw;
-            }
-            catch (Exception e)
-            {
-                notification.Text = $"{HumanisedModelName.Humanize(LetterCasing.Title)} import failed!";
-                notification.State = ProgressNotificationState.Cancelled;
-                Logger.Error(e, $@"Could not import ({filename})", LoggingTarget.Database);
-            }
-        }
+        }        
 
         /// <summary>
         /// Fired when the user requests to view the resulting import.

From aa7d22460d2b7e77bae25f7edd030fbef3cb71ba Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 8 Dec 2020 19:46:55 +0100
Subject: [PATCH 0146/3722] Override Import() instead.

---
 osu.Android/OsuGameActivity.cs           |  3 ++-
 osu.Android/OsuGameAndroid.cs            | 11 +++++------
 osu.Game/Database/ArchiveModelManager.cs |  2 +-
 osu.Game/OsuGameBase.cs                  |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index 541455277d..eb9df24bf7 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.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.Tasks;
 using Android.App;
 using Android.Content;
 using Android.Content.PM;
@@ -57,7 +58,7 @@ namespace osu.Android
 
             var stream = ContentResolver.OpenInputStream(uri);
             if (stream != null)
-                game.ScheduleImport(stream, cursor.GetString(filename_column));
+                Task.Factory.StartNew(() => game.Import(stream, cursor.GetString(filename_column)), TaskCreationOptions.LongRunning);
         }
     }
 }
diff --git a/osu.Android/OsuGameAndroid.cs b/osu.Android/OsuGameAndroid.cs
index 81945ee083..c9b27a16d6 100644
--- a/osu.Android/OsuGameAndroid.cs
+++ b/osu.Android/OsuGameAndroid.cs
@@ -67,12 +67,11 @@ namespace osu.Android
             }
         }
 
-        /// <summary>
-        /// Schedules a file to be imported once the game is loaded.
-        /// </summary>
-        /// <param name="stream">A stream to the file to import.</param>
-        /// <param name="filename">The filename of the file to import.</param>
-        public void ScheduleImport(Stream stream, string filename) => WaitForReady(() => this, _ => Task.Run(() => Import(stream, filename)));
+        public override Task Import(Stream stream, string filename)
+        {
+            WaitForReady(() => this, _ => Task.Run(() => base.Import(stream, filename)));
+            return Task.CompletedTask;
+        }
 
         protected override void LoadComplete()
         {
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 6766ca2b77..36cc4cce39 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -218,7 +218,7 @@ namespace osu.Game.Database
             }
 
             return import;
-        }        
+        }
 
         /// <summary>
         /// Fired when the user requests to view the resulting import.
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 0fc2b8d1d7..150569f1dd 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -395,7 +395,7 @@ namespace osu.Game
             }
         }
 
-        public async Task Import(Stream stream, string filename)
+        public virtual async Task Import(Stream stream, string filename)
         {
             var extension = Path.GetExtension(filename)?.ToLowerInvariant();
 

From 748035e80a4550305cc2b294c2ced3d254829c6e Mon Sep 17 00:00:00 2001
From: Xexxar <Xexxar.xexxar@gmail.com>
Date: Tue, 8 Dec 2020 16:53:52 -0600
Subject: [PATCH 0147/3722] changes to acc scaling curve for speed and aim pp

---
 .../Difficulty/OsuPerformanceCalculator.cs       | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 0ebe0ddc2d..f239289d7f 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -121,10 +121,11 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                                 : 0.0);
             }
 
-            // Scale the aim value with accuracy _slightly_
-            aimValue *= 0.5 + accuracy / 2.0;
-            // It is important to also consider accuracy difficulty when doing that
-            aimValue *= 0.98 + Math.Pow(Attributes.OverallDifficulty, 2) / 2500;
+            // Scale the speed value with accuracy _alot_
+            if (accuracy > .8)
+              aimValue *= 0.5 + Math.Pow(Math.Sin(2.5 * (accuracy - .8) * Math.PI), 2) / 2;
+            else
+              aimValue *= accuracy * (.5 / .8);
 
             return aimValue;
         }
@@ -154,8 +155,11 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             if (mods.Any(m => m is OsuModHidden))
                 speedValue *= 1.0 + 0.04 * (12.0 - Attributes.ApproachRate);
 
-            // Scale the speed value with accuracy _slightly_
-            speedValue *= 0.02 + accuracy;
+            // Scale the speed value with accuracy _alot_
+            if (accuracy > .8)
+              speedValue *= 0.5 + Math.Pow(Math.Sin(2.5 * (accuracy - .8) * Math.PI), 2) / 2;
+            else
+              speedValue *= accuracy * (.5 / .8);
             // It is important to also consider accuracy difficulty when doing that
             speedValue *= 0.96 + Math.Pow(Attributes.OverallDifficulty, 2) / 1600;
 

From ff5150a14d152242026cdd6be462088f2a15ad03 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Dec 2020 12:03:52 +0900
Subject: [PATCH 0148/3722] Fix typo in IMultiplayerClient xmldoc

---
 osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
index e75b0da207..c162f066d4 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         Task LoadRequested();
 
         /// <summary>
-        /// Signals that a match has started. All user in the <see cref="MultiplayerUserState.Loaded"/> state should begin gameplay as soon as possible.
+        /// Signals that a match has started. All users in the <see cref="MultiplayerUserState.Loaded"/> state should begin gameplay as soon as possible.
         /// </summary>
         Task MatchStarted();
 

From 2046cbe2d987fa12b46f6acfcd40a91a5cb283f1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Dec 2020 12:05:50 +0900
Subject: [PATCH 0149/3722] Add missing exceptions to server xmldoc

---
 osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
index 565c07d0ec..3c92f70a01 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
@@ -17,6 +17,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// <summary>
         /// Request to leave the currently joined room.
         /// </summary>
+        /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
         Task LeaveRoom();
 
         /// <summary>
@@ -24,12 +25,15 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// </summary>
         /// <param name="userId">The new user which is to become host.</param>
         /// <exception cref="NotHostException">A user other than the current host is attempting to transfer host.</exception>
+        /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
         Task TransferHost(long userId);
 
         /// <summary>
         /// As the host, update the settings of the currently joined room.
         /// </summary>
         /// <param name="settings">The new settings to apply.</param>
+        /// <exception cref="NotHostException">A user other than the current host is attempting to transfer host.</exception>
+        /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
         Task ChangeSettings(MultiplayerRoomSettings settings);
 
         /// <summary>
@@ -37,12 +41,14 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// </summary>
         /// <param name="newState">The proposed new state.</param>
         /// <exception cref="InvalidStateChange">If the state change requested is not valid, given the previous state or room state.</exception>
+        /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
         Task ChangeState(MultiplayerUserState newState);
 
         /// <summary>
         /// As the host of a room, start the match.
         /// </summary>
         /// <exception cref="NotHostException">A user other than the current host is attempting to start the game.</exception>
+        /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
         Task StartMatch();
     }
 }

From fd4fa963ac6e86265ad9db5e5335040ae1de5291 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Dec 2020 12:07:19 +0900
Subject: [PATCH 0150/3722] Standardise exception naming

---
 ...lreadyInMultiplayerRoom.cs => AlreadyInRoomException.cs} | 6 +++---
 osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs   | 4 ++--
 ...InvalidStateChange.cs => InvalidStateChangeException.cs} | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename osu.Game/Online/RealtimeMultiplayer/{UserAlreadyInMultiplayerRoom.cs => AlreadyInRoomException.cs} (60%)
 rename osu.Game/Online/RealtimeMultiplayer/{InvalidStateChange.cs => InvalidStateChangeException.cs} (65%)

diff --git a/osu.Game/Online/RealtimeMultiplayer/UserAlreadyInMultiplayerRoom.cs b/osu.Game/Online/RealtimeMultiplayer/AlreadyInRoomException.cs
similarity index 60%
rename from osu.Game/Online/RealtimeMultiplayer/UserAlreadyInMultiplayerRoom.cs
rename to osu.Game/Online/RealtimeMultiplayer/AlreadyInRoomException.cs
index 9a2090c710..f99bea651c 100644
--- a/osu.Game/Online/RealtimeMultiplayer/UserAlreadyInMultiplayerRoom.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/AlreadyInRoomException.cs
@@ -5,10 +5,10 @@ using System;
 
 namespace osu.Game.Online.RealtimeMultiplayer
 {
-    public class UserAlreadyInMultiplayerRoom : Exception
+    public class AlreadyInRoomException : Exception
     {
-        public UserAlreadyInMultiplayerRoom()
-            : base("This user is already in a room.")
+        public AlreadyInRoomException()
+            : base("This user is already in a multiplayer room.")
         {
         }
     }
diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
index 3c92f70a01..1bb6331c0a 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// Request to join a multiplayer room.
         /// </summary>
         /// <param name="roomId">The databased room ID.</param>
-        /// <exception cref="UserAlreadyInMultiplayerRoom">If the user is already in the requested (or another) room.</exception>
+        /// <exception cref="AlreadyInRoomException">If the user is already in the requested (or another) room.</exception>
         Task<MultiplayerRoom> JoinRoom(long roomId);
 
         /// <summary>
@@ -40,7 +40,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// Change the local user state in the currently joined room.
         /// </summary>
         /// <param name="newState">The proposed new state.</param>
-        /// <exception cref="InvalidStateChange">If the state change requested is not valid, given the previous state or room state.</exception>
+        /// <exception cref="InvalidStateChangeException">If the state change requested is not valid, given the previous state or room state.</exception>
         /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
         Task ChangeState(MultiplayerUserState newState);
 
diff --git a/osu.Game/Online/RealtimeMultiplayer/InvalidStateChange.cs b/osu.Game/Online/RealtimeMultiplayer/InvalidStateChangeException.cs
similarity index 65%
rename from osu.Game/Online/RealtimeMultiplayer/InvalidStateChange.cs
rename to osu.Game/Online/RealtimeMultiplayer/InvalidStateChangeException.cs
index d1016e95cb..1e33f55491 100644
--- a/osu.Game/Online/RealtimeMultiplayer/InvalidStateChange.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/InvalidStateChangeException.cs
@@ -5,9 +5,9 @@ using System;
 
 namespace osu.Game.Online.RealtimeMultiplayer
 {
-    public class InvalidStateChange : Exception
+    public class InvalidStateChangeException : Exception
     {
-        public InvalidStateChange(MultiplayerUserState oldState, MultiplayerUserState newState)
+        public InvalidStateChangeException(MultiplayerUserState oldState, MultiplayerUserState newState)
             : base($"Cannot change from {oldState} to {newState}")
         {
         }

From 1013749a83365c54d7585e1a4289c54113754e52 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Dec 2020 12:10:47 +0900
Subject: [PATCH 0151/3722] Change user id type to int

---
 osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs
index 17aca4458a..60f1c9e42e 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
     [Serializable]
     public class MultiplayerRoomUser : IEquatable<MultiplayerRoomUser>
     {
-        public readonly long UserID;
+        public readonly int UserID;
 
         public MultiplayerUserState State { get; set; } = MultiplayerUserState.Idle;
 

From 0eb5b16454647d0f1fa7de484b2f5eb15d6d37fc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Dec 2020 12:12:03 +0900
Subject: [PATCH 0152/3722] Remove Empty() implementation for RoomSettings
 until otherwise necessary

---
 osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs         | 2 +-
 osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
index 0f18ab6c89..24c20bded4 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// <summary>
         /// All currently enforced game settings for this room.
         /// </summary>
-        public MultiplayerRoomSettings Settings { get; set; } = MultiplayerRoomSettings.Empty();
+        public MultiplayerRoomSettings Settings { get; set; } = new MultiplayerRoomSettings();
 
         /// <summary>
         /// All users currently in this room.
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
index 3137afa8a4..8f0f4febd1 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
@@ -24,7 +24,5 @@ namespace osu.Game.Online.RealtimeMultiplayer
         public bool Equals(MultiplayerRoomSettings other) => BeatmapID == other.BeatmapID && Mods.SequenceEqual(other.Mods) && RulesetID == other.RulesetID;
 
         public override string ToString() => $"Beatmap:{BeatmapID} Mods:{string.Join(',', Mods)} Ruleset:{RulesetID}";
-
-        public static MultiplayerRoomSettings Empty() => new MultiplayerRoomSettings();
     }
 }

From 427d41bab5a08b998f6b8c3349e402f0c4315890 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Dec 2020 12:17:37 +0900
Subject: [PATCH 0153/3722] Add missing licence headers

---
 osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs     | 3 +++
 osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
index 1bb6331c0a..836260a26d 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
@@ -1,3 +1,6 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
 using System.Threading.Tasks;
 
 namespace osu.Game.Online.RealtimeMultiplayer
diff --git a/osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs b/osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs
index ca4a54f6d7..d71200a086 100644
--- a/osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs
@@ -1,3 +1,6 @@
+// Copyright (c) ppy 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.Online.RealtimeMultiplayer

From 48129c52d676d8e33d63852031e530fe4cef6b32 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Dec 2020 12:38:24 +0900
Subject: [PATCH 0154/3722] Change get-only property for now

---
 .../Online/RealtimeMultiplayer/MultiplayerClientState.cs     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs
index 8c440abba3..27fa0e9ac9 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs
@@ -1,13 +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;
+
 #nullable enable
 
 namespace osu.Game.Online.RealtimeMultiplayer
 {
+    [Serializable]
     public class MultiplayerClientState
     {
-        public long CurrentRoomID { get; set; }
+        public readonly long CurrentRoomID;
 
         public MultiplayerClientState(in long roomId)
         {

From c92c2cbfc01716b553369e376b9754d9f70c5262 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Dec 2020 14:46:43 +0900
Subject: [PATCH 0155/3722] Change exceptions which should be returned to the
 user to HubException type

See
https://docs.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.signalr.hubexception?view=aspnetcore-5.0.
---
 .../RealtimeMultiplayer/AlreadyInRoomException.cs      | 10 +++++++++-
 .../RealtimeMultiplayer/InvalidStateChangeException.cs | 10 +++++++++-
 .../Online/RealtimeMultiplayer/NotHostException.cs     | 10 +++++++++-
 .../RealtimeMultiplayer/NotJoinedRoomException.cs      | 10 +++++++++-
 4 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/AlreadyInRoomException.cs b/osu.Game/Online/RealtimeMultiplayer/AlreadyInRoomException.cs
index f99bea651c..7f3c2b339a 100644
--- a/osu.Game/Online/RealtimeMultiplayer/AlreadyInRoomException.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/AlreadyInRoomException.cs
@@ -2,14 +2,22 @@
 // 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.RealtimeMultiplayer
 {
-    public class AlreadyInRoomException : Exception
+    [Serializable]
+    public class AlreadyInRoomException : HubException
     {
         public AlreadyInRoomException()
             : base("This user is already in a multiplayer room.")
         {
         }
+
+        protected AlreadyInRoomException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
     }
 }
diff --git a/osu.Game/Online/RealtimeMultiplayer/InvalidStateChangeException.cs b/osu.Game/Online/RealtimeMultiplayer/InvalidStateChangeException.cs
index 1e33f55491..d9a276fc19 100644
--- a/osu.Game/Online/RealtimeMultiplayer/InvalidStateChangeException.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/InvalidStateChangeException.cs
@@ -2,14 +2,22 @@
 // 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.RealtimeMultiplayer
 {
-    public class InvalidStateChangeException : Exception
+    [Serializable]
+    public class InvalidStateChangeException : HubException
     {
         public InvalidStateChangeException(MultiplayerUserState oldState, MultiplayerUserState newState)
             : base($"Cannot change from {oldState} to {newState}")
         {
         }
+
+        protected InvalidStateChangeException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
     }
 }
diff --git a/osu.Game/Online/RealtimeMultiplayer/NotHostException.cs b/osu.Game/Online/RealtimeMultiplayer/NotHostException.cs
index e421c6ae28..56095043f0 100644
--- a/osu.Game/Online/RealtimeMultiplayer/NotHostException.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/NotHostException.cs
@@ -2,14 +2,22 @@
 // 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.RealtimeMultiplayer
 {
-    public class NotHostException : Exception
+    [Serializable]
+    public class NotHostException : HubException
     {
         public NotHostException()
             : base("User is attempting to perform a host level operation while not the host")
         {
         }
+
+        protected NotHostException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
     }
 }
diff --git a/osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs b/osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs
index d71200a086..7a6e089d0b 100644
--- a/osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs
@@ -2,14 +2,22 @@
 // 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.RealtimeMultiplayer
 {
-    public class NotJoinedRoomException : Exception
+    [Serializable]
+    public class NotJoinedRoomException : HubException
     {
         public NotJoinedRoomException()
             : base("This user has not yet joined a multiplayer room.")
         {
         }
+
+        protected NotJoinedRoomException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
     }
 }

From e09715d71efe23bdedf5a6b7718e6bdbe4ef2258 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Dec 2020 14:47:26 +0900
Subject: [PATCH 0156/3722] Add ToString implementation to MultiplayerRoom for
 easier debug

---
 osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
index 24c20bded4..1ba8d0c487 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
@@ -50,5 +50,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// Request a lock on this room to perform a thread-safe update.
         /// </summary>
         public LockUntilDisposal LockForUpdate() => new LockUntilDisposal(writeLock);
+
+        public override string ToString() => $"RoomID:{RoomID} Host:{Host?.UserID} Users:{Users.Count} State:{State} Settings: [{Settings}]";
     }
 }

From bef52af1da4da012d37eb78dc2ac62fa138a371e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Dec 2020 15:05:32 +0900
Subject: [PATCH 0157/3722] Move client state class to server implementation

Never used by client.
---
 .../MultiplayerClientState.cs                 | 20 -------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs
deleted file mode 100644
index 27fa0e9ac9..0000000000
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerClientState.cs
+++ /dev/null
@@ -1,20 +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;
-
-#nullable enable
-
-namespace osu.Game.Online.RealtimeMultiplayer
-{
-    [Serializable]
-    public class MultiplayerClientState
-    {
-        public readonly long CurrentRoomID;
-
-        public MultiplayerClientState(in long roomId)
-        {
-            CurrentRoomID = roomId;
-        }
-    }
-}

From ab00a15555a31394e23b9dd6277fc02aa25f9239 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Dec 2020 15:05:57 +0900
Subject: [PATCH 0158/3722] Add JsonConstructor specs to allow for correct
 deserialization of readonly fields

---
 osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs     | 2 ++
 osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
index 1ba8d0c487..5704ddd675 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace osu.Game.Online.RealtimeMultiplayer
 {
@@ -41,6 +42,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
         private object writeLock = new object();
 
+        [JsonConstructor]
         public MultiplayerRoom(in long roomId)
         {
             RoomID = roomId;
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs
index 60f1c9e42e..caf1a70197 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs
@@ -4,6 +4,7 @@
 #nullable enable
 
 using System;
+using Newtonsoft.Json;
 using osu.Game.Users;
 
 namespace osu.Game.Online.RealtimeMultiplayer
@@ -17,6 +18,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
         public User? User { get; set; }
 
+        [JsonConstructor]
         public MultiplayerRoomUser(in int userId)
         {
             UserID = userId;

From 578e5cb92e66a62bd81b08d2cb0c944cedca5030 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Dec 2020 15:59:13 +0900
Subject: [PATCH 0159/3722] Also make InvalidStateException serializable

---
 .../RealtimeMultiplayer/InvalidStateException.cs       | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/InvalidStateException.cs b/osu.Game/Online/RealtimeMultiplayer/InvalidStateException.cs
index 8393e7e925..7791bfc69f 100644
--- a/osu.Game/Online/RealtimeMultiplayer/InvalidStateException.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/InvalidStateException.cs
@@ -2,14 +2,22 @@
 // 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.RealtimeMultiplayer
 {
-    public class InvalidStateException : Exception
+    [Serializable]
+    public class InvalidStateException : HubException
     {
         public InvalidStateException(string message)
             : base(message)
         {
         }
+
+        protected InvalidStateException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
     }
 }

From 1e08b298b865cac8f05e13c4941a23a7b0131fa6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Dec 2020 16:01:09 +0900
Subject: [PATCH 0160/3722] Remove unnecessary exception type

---
 .../AlreadyInRoomException.cs                 | 23 -------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 osu.Game/Online/RealtimeMultiplayer/AlreadyInRoomException.cs

diff --git a/osu.Game/Online/RealtimeMultiplayer/AlreadyInRoomException.cs b/osu.Game/Online/RealtimeMultiplayer/AlreadyInRoomException.cs
deleted file mode 100644
index 7f3c2b339a..0000000000
--- a/osu.Game/Online/RealtimeMultiplayer/AlreadyInRoomException.cs
+++ /dev/null
@@ -1,23 +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.Runtime.Serialization;
-using Microsoft.AspNetCore.SignalR;
-
-namespace osu.Game.Online.RealtimeMultiplayer
-{
-    [Serializable]
-    public class AlreadyInRoomException : HubException
-    {
-        public AlreadyInRoomException()
-            : base("This user is already in a multiplayer room.")
-        {
-        }
-
-        protected AlreadyInRoomException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
-    }
-}

From bb97eae8b1b46df5162a6502a282b0915527dd6b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Dec 2020 16:02:37 +0900
Subject: [PATCH 0161/3722] Update outdated exception references in xmldoc

---
 osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
index 836260a26d..e2e7b6b991 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// Request to join a multiplayer room.
         /// </summary>
         /// <param name="roomId">The databased room ID.</param>
-        /// <exception cref="AlreadyInRoomException">If the user is already in the requested (or another) room.</exception>
+        /// <exception cref="InvalidStateException">If the user is already in the requested (or another) room.</exception>
         Task<MultiplayerRoom> JoinRoom(long roomId);
 
         /// <summary>
@@ -52,6 +52,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// </summary>
         /// <exception cref="NotHostException">A user other than the current host is attempting to start the game.</exception>
         /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
+        /// <exception cref="InvalidStateException">If an attempt to start the game occurs when the game's (or users') state disallows it.</exception>
         Task StartMatch();
     }
 }

From c8e3c7e77bb9b00356cd6b020ac212941d1b5fa5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 9 Dec 2020 17:45:07 +0900
Subject: [PATCH 0162/3722] Add stateful client interface

---
 .../IStatefulMultiplayerClient.cs               | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/IStatefulMultiplayerClient.cs

diff --git a/osu.Game/Online/RealtimeMultiplayer/IStatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/IStatefulMultiplayerClient.cs
new file mode 100644
index 0000000000..578092662a
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/IStatefulMultiplayerClient.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+#nullable enable
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    /// <summary>
+    /// A multiplayer client which maintains local room and user state. Also provides a proxy to access the <see cref="IMultiplayerServer"/>.
+    /// </summary>
+    public interface IStatefulMultiplayerClient : IMultiplayerClient, IMultiplayerServer
+    {
+        MultiplayerUserState State { get; }
+
+        MultiplayerRoom? Room { get; }
+    }
+}

From 6da854e37c3eb3b8f426904895f6ece374bea498 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 9 Dec 2020 13:32:59 +0100
Subject: [PATCH 0163/3722] Move scheduled import logic to OsuGame.

---
 osu.Android/OsuGameAndroid.cs | 6 ------
 osu.Game/OsuGame.cs           | 7 +++++++
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Android/OsuGameAndroid.cs b/osu.Android/OsuGameAndroid.cs
index c9b27a16d6..57512012f9 100644
--- a/osu.Android/OsuGameAndroid.cs
+++ b/osu.Android/OsuGameAndroid.cs
@@ -67,12 +67,6 @@ namespace osu.Android
             }
         }
 
-        public override Task Import(Stream stream, string filename)
-        {
-            WaitForReady(() => this, _ => Task.Run(() => base.Import(stream, filename)));
-            return Task.CompletedTask;
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 2c1db67d24..0ad58b2438 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -52,6 +52,7 @@ using osu.Game.Updater;
 using osu.Game.Utils;
 using LogLevel = osu.Framework.Logging.LogLevel;
 using osu.Game.Users;
+using System.IO;
 
 namespace osu.Game
 {
@@ -426,6 +427,12 @@ namespace osu.Game
             }, validScreens: new[] { typeof(PlaySongSelect) });
         }
 
+        public override Task Import(Stream stream, string filename)
+        {
+            WaitForReady(() => this, _ => Task.Run(() => base.Import(stream, filename)));
+            return Task.CompletedTask;
+        }
+
         protected virtual Loader CreateLoader() => new Loader();
 
         protected virtual UpdateManager CreateUpdateManager() => new UpdateManager();

From ac91f0e2707bf57eacacf079c4de09b1c108926d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 10 Dec 2020 00:25:46 +0900
Subject: [PATCH 0164/3722] Add extended limits to difficulty adjustment mod

---
 .../Mods/CatchModDifficultyAdjust.cs          | 12 ++-
 .../Mods/OsuModDifficultyAdjust.cs            | 12 ++-
 osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs | 79 ++++++++++++++++++-
 3 files changed, 97 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
index acdd0a420c..859dfb7647 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Catch.Mods
     public class CatchModDifficultyAdjust : ModDifficultyAdjust
     {
         [SettingSource("Circle Size", "Override a beatmap's set CS.", FIRST_SETTING_ORDER - 1)]
-        public BindableNumber<float> CircleSize { get; } = new BindableFloat
+        public BindableNumber<float> CircleSize { get; } = new BindableFloatWithLimitExtension
         {
             Precision = 0.1f,
             MinValue = 1,
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Catch.Mods
         };
 
         [SettingSource("Approach Rate", "Override a beatmap's set AR.", LAST_SETTING_ORDER + 1)]
-        public BindableNumber<float> ApproachRate { get; } = new BindableFloat
+        public BindableNumber<float> ApproachRate { get; } = new BindableFloatWithLimitExtension
         {
             Precision = 0.1f,
             MinValue = 1,
@@ -31,6 +31,14 @@ namespace osu.Game.Rulesets.Catch.Mods
             Value = 5,
         };
 
+        protected override void ApplyLimits(bool extended)
+        {
+            base.ApplyLimits(extended);
+
+            CircleSize.MaxValue = extended ? 11 : 10;
+            ApproachRate.MaxValue = extended ? 11 : 10;
+        }
+
         public override string SettingDescription
         {
             get
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
index ff995e38ce..a6ad2e75f1 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Osu.Mods
     public class OsuModDifficultyAdjust : ModDifficultyAdjust
     {
         [SettingSource("Circle Size", "Override a beatmap's set CS.", FIRST_SETTING_ORDER - 1)]
-        public BindableNumber<float> CircleSize { get; } = new BindableFloat
+        public BindableNumber<float> CircleSize { get; } = new BindableFloatWithLimitExtension
         {
             Precision = 0.1f,
             MinValue = 0,
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         };
 
         [SettingSource("Approach Rate", "Override a beatmap's set AR.", LAST_SETTING_ORDER + 1)]
-        public BindableNumber<float> ApproachRate { get; } = new BindableFloat
+        public BindableNumber<float> ApproachRate { get; } = new BindableFloatWithLimitExtension
         {
             Precision = 0.1f,
             MinValue = 0,
@@ -31,6 +31,14 @@ namespace osu.Game.Rulesets.Osu.Mods
             Value = 5,
         };
 
+        protected override void ApplyLimits(bool extended)
+        {
+            base.ApplyLimits(extended);
+
+            CircleSize.MaxValue = extended ? 11 : 10;
+            ApproachRate.MaxValue = extended ? 11 : 10;
+        }
+
         public override string SettingDescription
         {
             get
diff --git a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
index 165644edbe..7df663ad3a 100644
--- a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Mods
         protected const int LAST_SETTING_ORDER = 2;
 
         [SettingSource("HP Drain", "Override a beatmap's set HP.", FIRST_SETTING_ORDER)]
-        public BindableNumber<float> DrainRate { get; } = new BindableFloat
+        public BindableNumber<float> DrainRate { get; } = new BindableFloatWithLimitExtension
         {
             Precision = 0.1f,
             MinValue = 0,
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Mods
         };
 
         [SettingSource("Accuracy", "Override a beatmap's set OD.", LAST_SETTING_ORDER)]
-        public BindableNumber<float> OverallDifficulty { get; } = new BindableFloat
+        public BindableNumber<float> OverallDifficulty { get; } = new BindableFloatWithLimitExtension
         {
             Precision = 0.1f,
             MinValue = 0,
@@ -53,6 +53,24 @@ namespace osu.Game.Rulesets.Mods
             Value = 5,
         };
 
+        [SettingSource("Extended Limits", "Adjust difficulty beyond sane limits.")]
+        public BindableBool ExtendedLimits { get; } = new BindableBool();
+
+        protected ModDifficultyAdjust()
+        {
+            ExtendedLimits.BindValueChanged(extend => ApplyLimits(extend.NewValue));
+        }
+
+        /// <summary>
+        /// Changes the difficulty adjustment limits. Occurs when the value of <see cref="ExtendedLimits"/> is changed.
+        /// </summary>
+        /// <param name="extended">Whether limits should extend beyond sane ranges.</param>
+        protected virtual void ApplyLimits(bool extended)
+        {
+            DrainRate.MaxValue = extended ? 11 : 10;
+            OverallDifficulty.MaxValue = extended ? 11 : 10;
+        }
+
         public override string SettingDescription
         {
             get
@@ -123,5 +141,62 @@ namespace osu.Game.Rulesets.Mods
             difficulty.DrainRate = DrainRate.Value;
             difficulty.OverallDifficulty = OverallDifficulty.Value;
         }
+
+        /// <summary>
+        /// A <see cref="BindableDouble"/> that extends its min/max values to support any assigned value.
+        /// </summary>
+        protected class BindableDoubleWithLimitExtension : BindableDouble
+        {
+            public override double Value
+            {
+                get => base.Value;
+                set
+                {
+                    if (value < MinValue)
+                        MinValue = value;
+                    if (value > MaxValue)
+                        MaxValue = value;
+                    base.Value = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// A <see cref="BindableFloat"/> that extends its min/max values to support any assigned value.
+        /// </summary>
+        protected class BindableFloatWithLimitExtension : BindableFloat
+        {
+            public override float Value
+            {
+                get => base.Value;
+                set
+                {
+                    if (value < MinValue)
+                        MinValue = value;
+                    if (value > MaxValue)
+                        MaxValue = value;
+                    base.Value = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// A <see cref="BindableInt"/> that extends its min/max values to support any assigned value.
+        /// </summary>
+        protected class BindableIntWithLimitExtension : BindableInt
+        {
+            public override int Value
+            {
+                get => base.Value;
+                set
+                {
+                    if (value < MinValue)
+                        MinValue = value;
+                    if (value > MaxValue)
+                        MaxValue = value;
+                    base.Value = value;
+                }
+            }
+        }
     }
 }

From 47a93d8614eff32b5fd7bb9db8b81e8d97a47f34 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 10 Dec 2020 00:26:35 +0900
Subject: [PATCH 0165/3722] Adjust osu! hitobject fade-ins to support AR>10

---
 .../Objects/Drawables/Connections/FollowPointConnection.cs   | 5 ++++-
 osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs                | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
index 6e7b1050cb..40154ca84c 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
@@ -110,8 +110,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
             double startTime = start.GetEndTime();
             double duration = end.StartTime - startTime;
 
+            // For now, adjust the pre-empt for approach rates > 10.
+            double preempt = PREEMPT * Math.Min(1, start.TimePreempt / 450);
+
             fadeOutTime = startTime + fraction * duration;
-            fadeInTime = fadeOutTime - PREEMPT;
+            fadeInTime = fadeOutTime - preempt;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
index 15af141c99..6d28a576a4 100644
--- a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.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.Linq;
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
@@ -113,7 +114,7 @@ namespace osu.Game.Rulesets.Osu.Objects
             base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
 
             TimePreempt = (float)BeatmapDifficulty.DifficultyRange(difficulty.ApproachRate, 1800, 1200, 450);
-            TimeFadeIn = 400; // as per osu-stable
+            TimeFadeIn = 400 * Math.Min(1, TimePreempt / 450);
 
             Scale = (1.0f - 0.7f * (difficulty.CircleSize - 5) / 5) / 2;
         }

From 9835245ea29e3dcc053feb818b65f2e959cb5d06 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 10 Dec 2020 00:32:31 +0900
Subject: [PATCH 0166/3722] Add test

---
 .../Online/TestAPIModSerialization.cs         | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/osu.Game.Tests/Online/TestAPIModSerialization.cs b/osu.Game.Tests/Online/TestAPIModSerialization.cs
index 5948582d77..84862ebb07 100644
--- a/osu.Game.Tests/Online/TestAPIModSerialization.cs
+++ b/osu.Game.Tests/Online/TestAPIModSerialization.cs
@@ -68,12 +68,29 @@ namespace osu.Game.Tests.Online
             Assert.That(converted.FinalRate.Value, Is.EqualTo(0.25));
         }
 
+        [Test]
+        public void TestDeserialiseDifficultyAdjustModWithExtendedLimits()
+        {
+            var apiMod = new APIMod(new TestModDifficultyAdjust
+            {
+                OverallDifficulty = { Value = 11 },
+                ExtendedLimits = { Value = true }
+            });
+
+            var deserialised = JsonConvert.DeserializeObject<APIMod>(JsonConvert.SerializeObject(apiMod));
+            var converted = (TestModDifficultyAdjust)deserialised.ToMod(new TestRuleset());
+
+            Assert.That(converted.ExtendedLimits.Value, Is.True);
+            Assert.That(converted.OverallDifficulty.Value, Is.EqualTo(11));
+        }
+
         private class TestRuleset : Ruleset
         {
             public override IEnumerable<Mod> GetModsFor(ModType type) => new Mod[]
             {
                 new TestMod(),
                 new TestModTimeRamp(),
+                new TestModDifficultyAdjust()
             };
 
             public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => throw new System.NotImplementedException();
@@ -135,5 +152,9 @@ namespace osu.Game.Tests.Online
                 Value = true
             };
         }
+
+        private class TestModDifficultyAdjust : ModDifficultyAdjust
+        {
+        }
     }
 }

From 7e3fcfe43721ef34a2619084a9007f67de79ad92 Mon Sep 17 00:00:00 2001
From: Xexxar <Xexxar.xexxar@gmail.com>
Date: Wed, 9 Dec 2020 10:35:48 -0600
Subject: [PATCH 0167/3722] fixed issue with comment

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

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index f239289d7f..c35b739f81 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -121,7 +121,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                                 : 0.0);
             }
 
-            // Scale the speed value with accuracy _alot_
+            // Scale the aim value with accuracy _alot_
             if (accuracy > .8)
               aimValue *= 0.5 + Math.Pow(Math.Sin(2.5 * (accuracy - .8) * Math.PI), 2) / 2;
             else

From cfc34a63bd478b914ebf98f47eef25a08879c3d6 Mon Sep 17 00:00:00 2001
From: Xexxar <Xexxar.xexxar@gmail.com>
Date: Wed, 9 Dec 2020 11:21:03 -0600
Subject: [PATCH 0168/3722] realized i accidently deleted the OD scaling

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

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index c35b739f81..306c491210 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -126,6 +126,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty
               aimValue *= 0.5 + Math.Pow(Math.Sin(2.5 * (accuracy - .8) * Math.PI), 2) / 2;
             else
               aimValue *= accuracy * (.5 / .8);
+            // It is important to also consider accuracy difficulty when doing that
+            aimValue *= 0.975 + Math.Pow(Attributes.OverallDifficulty, 2) / 2000;
 
             return aimValue;
         }
@@ -161,7 +163,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             else
               speedValue *= accuracy * (.5 / .8);
             // It is important to also consider accuracy difficulty when doing that
-            speedValue *= 0.96 + Math.Pow(Attributes.OverallDifficulty, 2) / 1600;
+            speedValue *= 0.95 + Math.Pow(Attributes.OverallDifficulty, 2) / 1000;
 
             return speedValue;
         }

From 146e6a61935bb71a7dec3dac37b1c4791c88a061 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 9 Dec 2020 18:30:52 +0100
Subject: [PATCH 0169/3722] Fix formatting issues

---
 .../Difficulty/OsuPerformanceCalculator.cs                | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 306c491210..0306ef3ca0 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -123,9 +123,9 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
             // Scale the aim value with accuracy _alot_
             if (accuracy > .8)
-              aimValue *= 0.5 + Math.Pow(Math.Sin(2.5 * (accuracy - .8) * Math.PI), 2) / 2;
+                aimValue *= 0.5 + Math.Pow(Math.Sin(2.5 * (accuracy - .8) * Math.PI), 2) / 2;
             else
-              aimValue *= accuracy * (.5 / .8);
+                aimValue *= accuracy * (.5 / .8);
             // It is important to also consider accuracy difficulty when doing that
             aimValue *= 0.975 + Math.Pow(Attributes.OverallDifficulty, 2) / 2000;
 
@@ -159,9 +159,9 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
             // Scale the speed value with accuracy _alot_
             if (accuracy > .8)
-              speedValue *= 0.5 + Math.Pow(Math.Sin(2.5 * (accuracy - .8) * Math.PI), 2) / 2;
+                speedValue *= 0.5 + Math.Pow(Math.Sin(2.5 * (accuracy - .8) * Math.PI), 2) / 2;
             else
-              speedValue *= accuracy * (.5 / .8);
+                speedValue *= accuracy * (.5 / .8);
             // It is important to also consider accuracy difficulty when doing that
             speedValue *= 0.95 + Math.Pow(Attributes.OverallDifficulty, 2) / 1000;
 

From 051afe5a7a6838b40be5cea60d2d8d0af777ef43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 9 Dec 2020 18:31:51 +0100
Subject: [PATCH 0170/3722] Fix typos in comments

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

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 0306ef3ca0..477028b02b 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -121,7 +121,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                                 : 0.0);
             }
 
-            // Scale the aim value with accuracy _alot_
+            // Scale the aim value with accuracy _a lot_
             if (accuracy > .8)
                 aimValue *= 0.5 + Math.Pow(Math.Sin(2.5 * (accuracy - .8) * Math.PI), 2) / 2;
             else
@@ -157,7 +157,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             if (mods.Any(m => m is OsuModHidden))
                 speedValue *= 1.0 + 0.04 * (12.0 - Attributes.ApproachRate);
 
-            // Scale the speed value with accuracy _alot_
+            // Scale the speed value with accuracy _a lot_
             if (accuracy > .8)
                 speedValue *= 0.5 + Math.Pow(Math.Sin(2.5 * (accuracy - .8) * Math.PI), 2) / 2;
             else

From 05ad9aae8d221e0caf59ce282771d6996fb50abb Mon Sep 17 00:00:00 2001
From: Xexxar <Xexxar.xexxar@gmail.com>
Date: Wed, 9 Dec 2020 11:57:01 -0600
Subject: [PATCH 0171/3722] changed curve to linear OD + acc based curve

---
 .../Difficulty/OsuPerformanceCalculator.cs     | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 306c491210..87a6fbb23a 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -121,13 +121,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                                 : 0.0);
             }
 
-            // Scale the aim value with accuracy _alot_
-            if (accuracy > .8)
-              aimValue *= 0.5 + Math.Pow(Math.Sin(2.5 * (accuracy - .8) * Math.PI), 2) / 2;
-            else
-              aimValue *= accuracy * (.5 / .8);
-            // It is important to also consider accuracy difficulty when doing that
-            aimValue *= 0.975 + Math.Pow(Attributes.OverallDifficulty, 2) / 2000;
+            // Scale the aim value with accuracy and OD
+            aimValue *= .975 + Math.Pow(Attributes.OverallDifficulty, 2) / 1500 + 200 * (accuracy - 1) * Math.Pow(1 / Attributes.OverallDifficulty, 2);
 
             return aimValue;
         }
@@ -157,13 +152,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             if (mods.Any(m => m is OsuModHidden))
                 speedValue *= 1.0 + 0.04 * (12.0 - Attributes.ApproachRate);
 
-            // Scale the speed value with accuracy _alot_
-            if (accuracy > .8)
-              speedValue *= 0.5 + Math.Pow(Math.Sin(2.5 * (accuracy - .8) * Math.PI), 2) / 2;
-            else
-              speedValue *= accuracy * (.5 / .8);
-            // It is important to also consider accuracy difficulty when doing that
-            speedValue *= 0.95 + Math.Pow(Attributes.OverallDifficulty, 2) / 1000;
+            // Scale the speed value with accuracy and OD
+            speedValue *= .95 + Math.Pow(Attributes.OverallDifficulty, 2) / 750 + 200 * (accuracy - 1) * Math.Pow(1 / Attributes.OverallDifficulty, 2);
 
             return speedValue;
         }

From d604c51cbd50ef2b72e831d23937373df55b6a0f Mon Sep 17 00:00:00 2001
From: Xexxar <Xexxar.xexxar@gmail.com>
Date: Wed, 9 Dec 2020 13:04:14 -0600
Subject: [PATCH 0172/3722] capped scaling at OD 8 to prevent overscaling

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

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 87a6fbb23a..fce17071e4 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -122,7 +122,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             }
 
             // Scale the aim value with accuracy and OD
-            aimValue *= .975 + Math.Pow(Attributes.OverallDifficulty, 2) / 1500 + 200 * (accuracy - 1) * Math.Pow(1 / Attributes.OverallDifficulty, 2);
+            aimValue *= Math.Max(0, .975 + Math.Pow(Attributes.OverallDifficulty, 2) / 1500 + 200 * (accuracy - 1) * Math.Pow(1 / Math.Max(8, Attributes.OverallDifficulty), 2));
 
             return aimValue;
         }
@@ -153,7 +153,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                 speedValue *= 1.0 + 0.04 * (12.0 - Attributes.ApproachRate);
 
             // Scale the speed value with accuracy and OD
-            speedValue *= .95 + Math.Pow(Attributes.OverallDifficulty, 2) / 750 + 200 * (accuracy - 1) * Math.Pow(1 / Attributes.OverallDifficulty, 2);
+            speedValue *= Math.Max(0, .95 + Math.Pow(Attributes.OverallDifficulty, 2) / 750 + 200 * (accuracy - 1) * Math.Pow(1 / Math.Max(8, Attributes.OverallDifficulty), 2));
 
             return speedValue;
         }

From 54abc3bd4dd121fab5986b4a6c0f35bec5e0c037 Mon Sep 17 00:00:00 2001
From: Xexxar <Xexxar.xexxar@gmail.com>
Date: Wed, 9 Dec 2020 20:07:52 -0600
Subject: [PATCH 0173/3722] revert aim curve and add new 50s nerf

---
 .../Difficulty/OsuPerformanceCalculator.cs           | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index ddb5cb506d..2b9c817094 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -121,9 +121,11 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                                 : 0.0);
             }
 
-            // Scale the aim value with accuracy and OD
-            aimValue *= Math.Max(0, .975 + Math.Pow(Attributes.OverallDifficulty, 2) / 1500 + 200 * (accuracy - 1) * Math.Pow(1 / Math.Max(8, Attributes.OverallDifficulty), 2));
-
+            // Scale the aim value with accuracy _slightly_
+            aimValue *= 0.5 + accuracy / 2.0;
+            // It is important to also consider accuracy difficulty when doing that
+            aimValue *= 0.98 + Math.Pow(Attributes.OverallDifficulty, 2) / 2500;
+            
             return aimValue;
         }
 
@@ -153,7 +155,9 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                 speedValue *= 1.0 + 0.04 * (12.0 - Attributes.ApproachRate);
 
             // Scale the speed value with accuracy and OD
-            speedValue *= Math.Max(0, .95 + Math.Pow(Attributes.OverallDifficulty, 2) / 750 + 200 * (accuracy - 1) * Math.Pow(1 / Math.Max(8, Attributes.OverallDifficulty), 2));
+            speedValue *= (.95 + Math.Pow(Attributes.OverallDifficulty, 2) / 750) * Math.Pow(accuracy, (14.5 - Math.Max(Attributes.OverallDifficulty, 8)) / 2);
+            // Scale the speed value with # of 50s to punish doubletapping.
+            speedValue *= Math.Pow(0.98, countMeh < totalHits / 500.0 ? 0.5 * countMeh : countMeh - totalHits / 500.0 * 0.5);
 
             return speedValue;
         }

From 7c2f506b7902ec2c77048ccd058ec205fedd1570 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 10 Dec 2020 17:10:29 +0900
Subject: [PATCH 0174/3722] Port StanR's NF multiplier changes

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

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 030b0cf6d1..12192e36d4 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             double multiplier = 1.12; // This is being adjusted to keep the final pp value scaled around what it used to be when changing things
 
             if (mods.Any(m => m is OsuModNoFail))
-                multiplier *= 0.90;
+                multiplier *= Math.Max(0.90, 1.0 - 0.02 * countMiss);
 
             if (mods.Any(m => m is OsuModSpunOut))
                 multiplier *= 1.0 - Math.Pow((double)Attributes.SpinnerCount / totalHits, 0.85);

From b3d834731586f16cff8ea513ab1a361283b38078 Mon Sep 17 00:00:00 2001
From: Firmatorenio <smeshmunya@gmail.com>
Date: Thu, 10 Dec 2020 20:11:08 +0600
Subject: [PATCH 0175/3722] add support for ScorePosition into LegacyManiaSkin

---
 osu.Game/Skinning/LegacyManiaSkinConfiguration.cs       | 1 +
 osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs | 1 +
 osu.Game/Skinning/LegacyManiaSkinDecoder.cs             | 4 ++++
 3 files changed, 6 insertions(+)

diff --git a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
index 35a6140cbc..a8225a5bea 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
@@ -35,6 +35,7 @@ namespace osu.Game.Skinning
 
         public float HitPosition = (480 - 402) * POSITION_SCALE_FACTOR;
         public float LightPosition = (480 - 413) * POSITION_SCALE_FACTOR;
+        public float ScorePosition = (480 - 402 + 150) * POSITION_SCALE_FACTOR;
         public bool ShowJudgementLine = true;
         public bool KeysUnderNotes;
 
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index a99710ea96..9db6c8bf66 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -25,6 +25,7 @@ namespace osu.Game.Skinning
         LeftLineWidth,
         RightLineWidth,
         HitPosition,
+        ScorePosition,
         LightPosition,
         HitTargetImage,
         ShowJudgementLine,
diff --git a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
index 3dbec23194..49feb9c3f0 100644
--- a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
@@ -94,6 +94,10 @@ namespace osu.Game.Skinning
                         currentConfig.LightPosition = (480 - float.Parse(pair.Value, CultureInfo.InvariantCulture)) * LegacyManiaSkinConfiguration.POSITION_SCALE_FACTOR;
                         break;
 
+                    case "ScorePosition":
+                        currentConfig.ScorePosition = (480 - float.Parse(pair.Value, CultureInfo.InvariantCulture)) * LegacyManiaSkinConfiguration.POSITION_SCALE_FACTOR;
+                        break;
+
                     case "JudgementLine":
                         currentConfig.ShowJudgementLine = pair.Value == "1";
                         break;

From cc5639d2b42cfd9b05272fb659a72c879cd1e3c5 Mon Sep 17 00:00:00 2001
From: Xexxar <Xexxar.xexxar@gmail.com>
Date: Thu, 10 Dec 2020 09:48:40 -0600
Subject: [PATCH 0176/3722] added unneeded whitespace

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

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 2b9c817094..5a827eef96 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -125,7 +125,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             aimValue *= 0.5 + accuracy / 2.0;
             // It is important to also consider accuracy difficulty when doing that
             aimValue *= 0.98 + Math.Pow(Attributes.OverallDifficulty, 2) / 2500;
-            
+
             return aimValue;
         }
 

From 1f2946d64c988362c528b2401091252416a99cc2 Mon Sep 17 00:00:00 2001
From: Xexxar <Xexxar.xexxar@gmail.com>
Date: Thu, 10 Dec 2020 14:21:06 -0600
Subject: [PATCH 0177/3722] changed miss penalty curve to scale with totalhits

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

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 0ebe0ddc2d..8a641992d3 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -93,7 +93,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             aimValue *= lengthBonus;
 
             // Penalize misses exponentially. This mainly fixes tag4 maps and the likes until a per-hitobject solution is available
-            aimValue *= Math.Pow(0.97, countMiss);
+            if (countMiss > 0)
+                aimValue *= .97 * Math.Pow(1 - Math.Pow((double)countMiss / (double)totalHits, .775), Math.Pow(countMiss, .75));
 
             // Combo scaling
             if (Attributes.MaxCombo > 0)
@@ -139,7 +140,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             speedValue *= lengthBonus;
 
             // Penalize misses exponentially. This mainly fixes tag4 maps and the likes until a per-hitobject solution is available
-            speedValue *= Math.Pow(0.97, countMiss);
+            if (countMiss > 0)
+                speedValue *= .97 * Math.Pow(1 - Math.Pow((double)countMiss / (double)totalHits, .775), Math.Pow(countMiss, 1));
 
             // Combo scaling
             if (Attributes.MaxCombo > 0)

From fd0d793c6966beb9d93cffbbef9cc809e76e9d73 Mon Sep 17 00:00:00 2001
From: Xexxar <Xexxar.xexxar@gmail.com>
Date: Thu, 10 Dec 2020 18:51:54 -0600
Subject: [PATCH 0178/3722] changed the comment to reflect the change

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

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 8a641992d3..66ebc63243 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
             aimValue *= lengthBonus;
 
-            // Penalize misses exponentially. This mainly fixes tag4 maps and the likes until a per-hitobject solution is available
+            // Penalize misses by assessing # of misses relative to the total # of objects. Default a 3% reduction for any # of misses.
             if (countMiss > 0)
                 aimValue *= .97 * Math.Pow(1 - Math.Pow((double)countMiss / (double)totalHits, .775), Math.Pow(countMiss, .75));
 
@@ -139,7 +139,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                                  (totalHits > 2000 ? Math.Log10(totalHits / 2000.0) * 0.5 : 0.0);
             speedValue *= lengthBonus;
 
-            // Penalize misses exponentially. This mainly fixes tag4 maps and the likes until a per-hitobject solution is available
+            // Penalize misses by assessing # of misses relative to the total # of objects. Default a 3% reduction for any # of misses.
             if (countMiss > 0)
                 speedValue *= .97 * Math.Pow(1 - Math.Pow((double)countMiss / (double)totalHits, .775), Math.Pow(countMiss, 1));
 

From 3fb41a20b55aa7e2d5270195e1a182dec18ed80b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Dec 2020 13:27:52 +0900
Subject: [PATCH 0179/3722] Add room name to settings

---
 .../Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
index 8f0f4febd1..a5dcafefcd 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
@@ -18,11 +18,13 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
         public int? RulesetID { get; set; }
 
+        public string Name { get; set; } = "Unnamed room";
+
         [NotNull]
         public IEnumerable<APIMod> Mods { get; set; } = Enumerable.Empty<APIMod>();
 
-        public bool Equals(MultiplayerRoomSettings other) => BeatmapID == other.BeatmapID && Mods.SequenceEqual(other.Mods) && RulesetID == other.RulesetID;
+        public bool Equals(MultiplayerRoomSettings other) => BeatmapID == other.BeatmapID && Mods.SequenceEqual(other.Mods) && RulesetID == other.RulesetID && Name.Equals(other.Name, StringComparison.Ordinal);
 
-        public override string ToString() => $"Beatmap:{BeatmapID} Mods:{string.Join(',', Mods)} Ruleset:{RulesetID}";
+        public override string ToString() => $"Name:{Name} Beatmap:{BeatmapID} Mods:{string.Join(',', Mods)} Ruleset:{RulesetID}";
     }
 }

From c1c0b9a9db1c9a35114fd0535fc49ed3b5671e9d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Dec 2020 14:10:45 +0900
Subject: [PATCH 0180/3722] Add realtime to room categories

---
 osu.Game/Online/Multiplayer/RoomCategory.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/Multiplayer/RoomCategory.cs b/osu.Game/Online/Multiplayer/RoomCategory.cs
index 636a73a3e9..d6786a72fe 100644
--- a/osu.Game/Online/Multiplayer/RoomCategory.cs
+++ b/osu.Game/Online/Multiplayer/RoomCategory.cs
@@ -6,6 +6,7 @@ namespace osu.Game.Online.Multiplayer
     public enum RoomCategory
     {
         Normal,
-        Spotlight
+        Spotlight,
+        Realtime,
     }
 }

From 719b08b22fc0f078194b3fa54c64c78f88786666 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Dec 2020 14:11:42 +0900
Subject: [PATCH 0181/3722] Make room setting's BeatmapID non-nullable

---
 osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
index a5dcafefcd..3934b8c1d7 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
     [Serializable]
     public class MultiplayerRoomSettings : IEquatable<MultiplayerRoomSettings>
     {
-        public int? BeatmapID { get; set; }
+        public int BeatmapID { get; set; }
 
         public int? RulesetID { get; set; }
 

From d3b2e2b36eebcb6913244df225f4007bd014708b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Dec 2020 14:43:17 +0900
Subject: [PATCH 0182/3722] Change locking method to better allow cross-thread
 locking

---
 .../RealtimeMultiplayer/LockUntilDisposal.cs  | 24 -------------------
 .../RealtimeMultiplayer/MultiplayerRoom.cs    | 20 +++++++++++++++-
 2 files changed, 19 insertions(+), 25 deletions(-)
 delete mode 100644 osu.Game/Online/RealtimeMultiplayer/LockUntilDisposal.cs

diff --git a/osu.Game/Online/RealtimeMultiplayer/LockUntilDisposal.cs b/osu.Game/Online/RealtimeMultiplayer/LockUntilDisposal.cs
deleted file mode 100644
index cd16fce2ee..0000000000
--- a/osu.Game/Online/RealtimeMultiplayer/LockUntilDisposal.cs
+++ /dev/null
@@ -1,24 +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.Threading;
-
-namespace osu.Game.Online.RealtimeMultiplayer
-{
-    public readonly struct LockUntilDisposal : IDisposable
-    {
-        private readonly object lockTarget;
-
-        public LockUntilDisposal(object lockTarget)
-        {
-            this.lockTarget = lockTarget;
-            Monitor.Enter(lockTarget);
-        }
-
-        public void Dispose()
-        {
-            Monitor.Exit(lockTarget);
-        }
-    }
-}
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
index 5704ddd675..e009a34707 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
@@ -5,7 +5,9 @@
 
 using System;
 using System.Collections.Generic;
+using System.Threading;
 using Newtonsoft.Json;
+using osu.Framework.Allocation;
 
 namespace osu.Game.Online.RealtimeMultiplayer
 {
@@ -48,10 +50,26 @@ namespace osu.Game.Online.RealtimeMultiplayer
             RoomID = roomId;
         }
 
+        private object updateLock = new object();
+
+        private ManualResetEventSlim freeForWrite = new ManualResetEventSlim(true);
+
         /// <summary>
         /// Request a lock on this room to perform a thread-safe update.
         /// </summary>
-        public LockUntilDisposal LockForUpdate() => new LockUntilDisposal(writeLock);
+        public IDisposable LockForUpdate()
+        {
+            // ReSharper disable once InconsistentlySynchronizedField
+            freeForWrite.Wait();
+
+            lock (updateLock)
+            {
+                freeForWrite.Wait();
+                freeForWrite.Reset();
+
+                return new ValueInvokeOnDisposal<MultiplayerRoom>(this, r => freeForWrite.Set());
+            }
+        }
 
         public override string ToString() => $"RoomID:{RoomID} Host:{Host?.UserID} Users:{Users.Count} State:{State} Settings: [{Settings}]";
     }

From aedb18b9f21e0e98af5f3720369314658565a2aa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Dec 2020 18:14:33 +0900
Subject: [PATCH 0183/3722] Make RulesetID non-nullable

---
 osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
index 3934b8c1d7..d2f64235c3 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
     {
         public int BeatmapID { get; set; }
 
-        public int? RulesetID { get; set; }
+        public int RulesetID { get; set; }
 
         public string Name { get; set; } = "Unnamed room";
 

From 544160798b6448df40d9c2a9d85ca210f14fa3d4 Mon Sep 17 00:00:00 2001
From: Xexxar <Xexxar.xexxar@gmail.com>
Date: Fri, 11 Dec 2020 08:01:45 -0600
Subject: [PATCH 0184/3722] cleaned up mistakes and made quality changes

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

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 66ebc63243..2c41959d3f 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -94,7 +94,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
             // Penalize misses by assessing # of misses relative to the total # of objects. Default a 3% reduction for any # of misses.
             if (countMiss > 0)
-                aimValue *= .97 * Math.Pow(1 - Math.Pow((double)countMiss / (double)totalHits, .775), Math.Pow(countMiss, .75));
+                aimValue *= 0.97 * Math.Pow(1 - Math.Pow((double)countMiss / (double)totalHits, 0.775), countMiss);
 
             // Combo scaling
             if (Attributes.MaxCombo > 0)
@@ -141,7 +141,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
             // Penalize misses by assessing # of misses relative to the total # of objects. Default a 3% reduction for any # of misses.
             if (countMiss > 0)
-                speedValue *= .97 * Math.Pow(1 - Math.Pow((double)countMiss / (double)totalHits, .775), Math.Pow(countMiss, 1));
+                speedValue *= 0.97 * Math.Pow(1 - Math.Pow((double)countMiss / (double)totalHits, 0.775), countMiss);
 
             // Combo scaling
             if (Attributes.MaxCombo > 0)

From abc8a2982c68163e29a80736c5227d51d01d0417 Mon Sep 17 00:00:00 2001
From: Xexxar <Xexxar.xexxar@gmail.com>
Date: Fri, 11 Dec 2020 08:20:56 -0600
Subject: [PATCH 0185/3722] swapped ^.75 buff onto speed instead of aim

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

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 2c41959d3f..5d3552798c 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -94,7 +94,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
             // Penalize misses by assessing # of misses relative to the total # of objects. Default a 3% reduction for any # of misses.
             if (countMiss > 0)
-                aimValue *= 0.97 * Math.Pow(1 - Math.Pow((double)countMiss / (double)totalHits, 0.775), countMiss);
+                aimValue *= 0.97 * Math.Pow(1 - Math.Pow((double)countMiss / totalHits, 0.775), countMiss);
 
             // Combo scaling
             if (Attributes.MaxCombo > 0)
@@ -141,7 +141,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
             // Penalize misses by assessing # of misses relative to the total # of objects. Default a 3% reduction for any # of misses.
             if (countMiss > 0)
-                speedValue *= 0.97 * Math.Pow(1 - Math.Pow((double)countMiss / (double)totalHits, 0.775), countMiss);
+                speedValue *= 0.97 * Math.Pow(1 - Math.Pow((double)countMiss / totalHits, 0.775), Math.Pow(countMiss, .75));
 
             // Combo scaling
             if (Attributes.MaxCombo > 0)

From 3acaa63373f1465249b537a956b0b9901936cedd Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 11 Dec 2020 23:24:38 +0900
Subject: [PATCH 0186/3722] CI fixes

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

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 2c41959d3f..ebcebeae7c 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -94,7 +94,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
             // Penalize misses by assessing # of misses relative to the total # of objects. Default a 3% reduction for any # of misses.
             if (countMiss > 0)
-                aimValue *= 0.97 * Math.Pow(1 - Math.Pow((double)countMiss / (double)totalHits, 0.775), countMiss);
+                aimValue *= 0.97 * Math.Pow(1 - Math.Pow((double)countMiss / totalHits, 0.775), countMiss);
 
             // Combo scaling
             if (Attributes.MaxCombo > 0)
@@ -141,7 +141,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
             // Penalize misses by assessing # of misses relative to the total # of objects. Default a 3% reduction for any # of misses.
             if (countMiss > 0)
-                speedValue *= 0.97 * Math.Pow(1 - Math.Pow((double)countMiss / (double)totalHits, 0.775), countMiss);
+                speedValue *= 0.97 * Math.Pow(1 - Math.Pow((double)countMiss / totalHits, 0.775), countMiss);
 
             // Combo scaling
             if (Attributes.MaxCombo > 0)

From b7872a54b885a2572ec439e8e2a8c0cb2f47dccf Mon Sep 17 00:00:00 2001
From: Xexxar <Xexxar.xexxar@gmail.com>
Date: Fri, 11 Dec 2020 10:48:53 -0600
Subject: [PATCH 0187/3722] small factor rebalance

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

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 5d3552798c..a43c78f93f 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -141,7 +141,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
 
             // Penalize misses by assessing # of misses relative to the total # of objects. Default a 3% reduction for any # of misses.
             if (countMiss > 0)
-                speedValue *= 0.97 * Math.Pow(1 - Math.Pow((double)countMiss / totalHits, 0.775), Math.Pow(countMiss, .75));
+                speedValue *= 0.97 * Math.Pow(1 - Math.Pow((double)countMiss / totalHits, 0.775), Math.Pow(countMiss, .875));
 
             // Combo scaling
             if (Attributes.MaxCombo > 0)

From 08b79bb92126925a538eb8ff62a7c7d058f6c574 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sat, 12 Dec 2020 17:12:15 +0100
Subject: [PATCH 0188/3722] Store and return unstarted task for consumers to
 await on.

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 0ad58b2438..6c32e2e94c 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -429,8 +429,9 @@ namespace osu.Game
 
         public override Task Import(Stream stream, string filename)
         {
-            WaitForReady(() => this, _ => Task.Run(() => base.Import(stream, filename)));
-            return Task.CompletedTask;
+            var importTask = new Task(async () => await base.Import(stream, filename));
+            WaitForReady(() => this, _ => importTask.Start());
+            return importTask;
         }
 
         protected virtual Loader CreateLoader() => new Loader();

From 8292c746ea82e35412f717fe8d6db6921661e54e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 12 Dec 2020 22:42:40 +0100
Subject: [PATCH 0189/3722] Leverage hitobject model for strong hit instead of
 creating own

---
 osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
index e4c0766844..c1b422452e 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Utils;
@@ -9,7 +10,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Judgements;
 using osu.Game.Rulesets.Taiko.Objects;
@@ -126,7 +126,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
             var cpi = new ControlPointInfo();
             cpi.Add(0, new EffectControlPoint { KiaiMode = kiai });
 
-            Hit hit = new Hit();
+            Hit hit = new Hit { IsStrong = true };
             hit.ApplyDefaults(cpi, new BeatmapDifficulty());
 
             var h = new DrawableTestHit(hit) { X = RNG.NextSingle(hitResult == HitResult.Ok ? -0.1f : -0.05f, hitResult == HitResult.Ok ? 0.1f : 0.05f) };
@@ -134,7 +134,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
             DrawableRuleset.Playfield.Add(h);
 
             ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h, new JudgementResult(new HitObject(), new TaikoJudgement()) { Type = hitResult });
-            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(new TestStrongNestedHit(h), new JudgementResult(new HitObject(), new TaikoStrongJudgement()) { Type = HitResult.Great });
+            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h.NestedHitObjects.Single(), new JudgementResult(new HitObject(), new TaikoStrongJudgement()) { Type = HitResult.Great });
         }
 
         private void addMissJudgement()
@@ -210,15 +210,5 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
             DrawableRuleset.Playfield.Add(new DrawableHit(h));
         }
-
-        private class TestStrongNestedHit : DrawableStrongNestedHit
-        {
-            public TestStrongNestedHit(DrawableHitObject mainObject)
-                : base(new StrongHitObject { StartTime = mainObject.HitObject.StartTime }, mainObject)
-            {
-            }
-
-            public override bool OnPressed(TaikoAction action) => false;
-        }
     }
 }

From 34e7a36b382ba88d4e2ae74fceb8ad7833133090 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 12 Dec 2020 22:48:22 +0100
Subject: [PATCH 0190/3722] Fix kiai hit steps not working correctly

---
 osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.cs |  7 +++++--
 osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs   | 14 ++------------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.cs b/osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.cs
index fb0917341e..f048cad18c 100644
--- a/osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/DrawableTestHit.cs
@@ -13,12 +13,15 @@ namespace osu.Game.Rulesets.Taiko.Tests
     {
         public readonly HitResult Type;
 
-        public DrawableTestHit(Hit hit, HitResult type = HitResult.Great)
+        public DrawableTestHit(Hit hit, HitResult type = HitResult.Great, bool kiai = false)
             : base(hit)
         {
             Type = type;
 
-            HitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+            var controlPoints = new ControlPointInfo();
+            controlPoints.Add(0, new EffectControlPoint { KiaiMode = kiai });
+
+            HitObject.ApplyDefaults(controlPoints, new BeatmapDifficulty());
         }
 
         protected override void UpdateInitialTransforms()
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
index c1b422452e..14a127ac82 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
@@ -106,13 +106,8 @@ namespace osu.Game.Rulesets.Taiko.Tests
         {
             HitResult hitResult = RNG.Next(2) == 0 ? HitResult.Ok : HitResult.Great;
 
-            var cpi = new ControlPointInfo();
-            cpi.Add(0, new EffectControlPoint { KiaiMode = kiai });
-
             Hit hit = new Hit();
-            hit.ApplyDefaults(cpi, new BeatmapDifficulty());
-
-            var h = new DrawableTestHit(hit) { X = RNG.NextSingle(hitResult == HitResult.Ok ? -0.1f : -0.05f, hitResult == HitResult.Ok ? 0.1f : 0.05f) };
+            var h = new DrawableTestHit(hit, kiai: kiai) { X = RNG.NextSingle(hitResult == HitResult.Ok ? -0.1f : -0.05f, hitResult == HitResult.Ok ? 0.1f : 0.05f) };
 
             DrawableRuleset.Playfield.Add(h);
 
@@ -123,13 +118,8 @@ namespace osu.Game.Rulesets.Taiko.Tests
         {
             HitResult hitResult = RNG.Next(2) == 0 ? HitResult.Ok : HitResult.Great;
 
-            var cpi = new ControlPointInfo();
-            cpi.Add(0, new EffectControlPoint { KiaiMode = kiai });
-
             Hit hit = new Hit { IsStrong = true };
-            hit.ApplyDefaults(cpi, new BeatmapDifficulty());
-
-            var h = new DrawableTestHit(hit) { X = RNG.NextSingle(hitResult == HitResult.Ok ? -0.1f : -0.05f, hitResult == HitResult.Ok ? 0.1f : 0.05f) };
+            var h = new DrawableTestHit(hit, kiai: kiai) { X = RNG.NextSingle(hitResult == HitResult.Ok ? -0.1f : -0.05f, hitResult == HitResult.Ok ? 0.1f : 0.05f) };
 
             DrawableRuleset.Playfield.Add(h);
 

From 76193e221754455ac9638f7974437c2259b9fc5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 12 Dec 2020 22:52:01 +0100
Subject: [PATCH 0191/3722] Fix miss step not working

---
 osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
index 14a127ac82..d257712553 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
@@ -130,8 +130,11 @@ namespace osu.Game.Rulesets.Taiko.Tests
         private void addMissJudgement()
         {
             DrawableTestHit h;
-            DrawableRuleset.Playfield.Add(h = new DrawableTestHit(new Hit(), HitResult.Miss));
-            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h, new JudgementResult(new HitObject(), new TaikoJudgement()) { Type = HitResult.Miss });
+            DrawableRuleset.Playfield.Add(h = new DrawableTestHit(new Hit { StartTime = DrawableRuleset.Playfield.Time.Current }, HitResult.Miss)
+            {
+                Alpha = 0
+            });
+            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h, new JudgementResult(h.HitObject, new TaikoJudgement()) { Type = HitResult.Miss });
         }
 
         private void addBarLine(bool major, double delay = scroll_time)

From 43c0e2191deaad07687704619d69b2c10056c0a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 12 Dec 2020 23:50:12 +0100
Subject: [PATCH 0192/3722] Apply local fix for strong/colour not being applied
 correctly

---
 .../TestSceneHits.cs                          | 29 +++++++++++++++++--
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
index d257712553..1d51020a6f 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
@@ -2,10 +2,12 @@
 // 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.Graphics;
 using osu.Framework.Utils;
+using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Judgements;
@@ -118,7 +120,11 @@ namespace osu.Game.Rulesets.Taiko.Tests
         {
             HitResult hitResult = RNG.Next(2) == 0 ? HitResult.Ok : HitResult.Great;
 
-            Hit hit = new Hit { IsStrong = true };
+            Hit hit = new Hit
+            {
+                IsStrong = true,
+                Samples = createSamples(strong: true)
+            };
             var h = new DrawableTestHit(hit, kiai: kiai) { X = RNG.NextSingle(hitResult == HitResult.Ok ? -0.1f : -0.05f, hitResult == HitResult.Ok ? 0.1f : 0.05f) };
 
             DrawableRuleset.Playfield.Add(h);
@@ -166,6 +172,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
             {
                 StartTime = DrawableRuleset.Playfield.Time.Current + scroll_time,
                 IsStrong = strong,
+                Samples = createSamples(strong: strong),
                 Duration = duration,
                 TickRate = 8,
             };
@@ -183,7 +190,8 @@ namespace osu.Game.Rulesets.Taiko.Tests
             Hit h = new Hit
             {
                 StartTime = DrawableRuleset.Playfield.Time.Current + scroll_time,
-                IsStrong = strong
+                IsStrong = strong,
+                Samples = createSamples(HitType.Centre, strong)
             };
 
             h.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
@@ -196,12 +204,27 @@ namespace osu.Game.Rulesets.Taiko.Tests
             Hit h = new Hit
             {
                 StartTime = DrawableRuleset.Playfield.Time.Current + scroll_time,
-                IsStrong = strong
+                IsStrong = strong,
+                Samples = createSamples(HitType.Rim, strong)
             };
 
             h.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
             DrawableRuleset.Playfield.Add(new DrawableHit(h));
         }
+
+        // TODO: can be removed if a better way of handling colour/strong type and samples is developed
+        private IList<HitSampleInfo> createSamples(HitType? hitType = null, bool strong = false)
+        {
+            var samples = new List<HitSampleInfo>();
+
+            if (hitType == HitType.Rim)
+                samples.Add(new HitSampleInfo(HitSampleInfo.HIT_CLAP));
+
+            if (strong)
+                samples.Add(new HitSampleInfo(HitSampleInfo.HIT_FINISH));
+
+            return samples;
+        }
     }
 }

From 3a3b32186ee62acc40a66f9047a777d4d2b72b2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 13 Dec 2020 00:00:37 +0100
Subject: [PATCH 0193/3722] Make height test steps work better

---
 .../DrawableTaikoRulesetTestScene.cs                      | 8 +++++---
 osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs            | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/DrawableTaikoRulesetTestScene.cs b/osu.Game.Rulesets.Taiko.Tests/DrawableTaikoRulesetTestScene.cs
index d1c4a1c56d..783636a62d 100644
--- a/osu.Game.Rulesets.Taiko.Tests/DrawableTaikoRulesetTestScene.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/DrawableTaikoRulesetTestScene.cs
@@ -16,6 +16,8 @@ namespace osu.Game.Rulesets.Taiko.Tests
 {
     public abstract class DrawableTaikoRulesetTestScene : OsuTestScene
     {
+        protected const int DEFAULT_PLAYFIELD_CONTAINER_HEIGHT = 768;
+
         protected DrawableTaikoRuleset DrawableRuleset { get; private set; }
         protected Container PlayfieldContainer { get; private set; }
 
@@ -44,10 +46,10 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
             Add(PlayfieldContainer = new Container
             {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
+                Anchor = Anchor.TopCentre,
+                Origin = Anchor.TopCentre,
                 RelativeSizeAxes = Axes.X,
-                Height = 768,
+                Height = DEFAULT_PLAYFIELD_CONTAINER_HEIGHT,
                 Children = new[] { DrawableRuleset = new DrawableTaikoRuleset(new TaikoRuleset(), beatmap.GetPlayableBeatmap(new TaikoRuleset().RulesetInfo)) }
             });
         }
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
index 1d51020a6f..c3fa03d404 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
@@ -99,7 +99,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
                     break;
 
                 case 6:
-                    PlayfieldContainer.Delay(delay).ResizeTo(new Vector2(1, TaikoPlayfield.DEFAULT_HEIGHT), 500);
+                    PlayfieldContainer.Delay(delay).ResizeTo(new Vector2(1, DEFAULT_PLAYFIELD_CONTAINER_HEIGHT), 500);
                     break;
             }
         }

From 1ddc896b765a72c5135e2bd10e8759293dcce73b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 13 Dec 2020 12:18:29 +0100
Subject: [PATCH 0194/3722] Rename Strong{-> Nested}HitObject

---
 .../Skinning/TestSceneDrawableTaikoMascot.cs                | 2 +-
 .../Objects/Drawables/DrawableDrumRoll.cs                   | 6 +++---
 .../Objects/Drawables/DrawableDrumRollTick.cs               | 6 +++---
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs    | 6 +++---
 .../Objects/Drawables/DrawableStrongNestedHit.cs            | 4 ++--
 .../Objects/Drawables/DrawableTaikoHitObject.cs             | 6 +++---
 .../{StrongHitObject.cs => StrongNestedHitObject.cs}        | 2 +-
 osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs           | 2 +-
 8 files changed, 17 insertions(+), 17 deletions(-)
 rename osu.Game.Rulesets.Taiko/Objects/{StrongHitObject.cs => StrongNestedHitObject.cs} (89%)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
index 99e103da3b..e62841b2c4 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             createDrawableRuleset();
 
             assertStateAfterResult(new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Great }, TaikoMascotAnimationState.Idle);
-            assertStateAfterResult(new JudgementResult(new StrongHitObject(), new TaikoStrongJudgement()) { Type = HitResult.IgnoreMiss }, TaikoMascotAnimationState.Idle);
+            assertStateAfterResult(new JudgementResult(new StrongNestedHitObject(), new TaikoStrongJudgement()) { Type = HitResult.IgnoreMiss }, TaikoMascotAnimationState.Idle);
         }
 
         [Test]
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index 4ead4982a1..4330e426c1 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -154,7 +154,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             Content.X = DrawHeight / 2;
         }
 
-        protected override DrawableStrongNestedHit CreateStrongHit(StrongHitObject hitObject) => new StrongNestedHit(hitObject, this);
+        protected override DrawableStrongNestedHit CreateStrongHit(StrongNestedHitObject hitObject) => new StrongNestedHit(hitObject, this);
 
         private void updateColour()
         {
@@ -164,8 +164,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         private class StrongNestedHit : DrawableStrongNestedHit
         {
-            public StrongNestedHit(StrongHitObject strong, DrawableDrumRoll drumRoll)
-                : base(strong, drumRoll)
+            public StrongNestedHit(StrongNestedHitObject nestedHit, DrawableDrumRoll drumRoll)
+                : base(nestedHit, drumRoll)
             {
             }
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
index e68e40ae1c..c458a620bd 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
@@ -61,12 +61,12 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             return UpdateResult(true);
         }
 
-        protected override DrawableStrongNestedHit CreateStrongHit(StrongHitObject hitObject) => new StrongNestedHit(hitObject, this);
+        protected override DrawableStrongNestedHit CreateStrongHit(StrongNestedHitObject hitObject) => new StrongNestedHit(hitObject, this);
 
         private class StrongNestedHit : DrawableStrongNestedHit
         {
-            public StrongNestedHit(StrongHitObject strong, DrawableDrumRollTick tick)
-                : base(strong, tick)
+            public StrongNestedHit(StrongNestedHitObject nestedHit, DrawableDrumRollTick tick)
+                : base(nestedHit, tick)
             {
             }
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index d1751d8a75..5837a391b4 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -228,7 +228,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             }
         }
 
-        protected override DrawableStrongNestedHit CreateStrongHit(StrongHitObject hitObject) => new StrongNestedHit(hitObject, this);
+        protected override DrawableStrongNestedHit CreateStrongHit(StrongNestedHitObject hitObject) => new StrongNestedHit(hitObject, this);
 
         private class StrongNestedHit : DrawableStrongNestedHit
         {
@@ -240,8 +240,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
             public new DrawableHit MainObject => (DrawableHit)base.MainObject;
 
-            public StrongNestedHit(StrongHitObject strong, DrawableHit hit)
-                : base(strong, hit)
+            public StrongNestedHit(StrongNestedHitObject nestedHit, DrawableHit hit)
+                : base(nestedHit, hit)
             {
             }
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
index 108e42eea5..e1da357c47 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
@@ -13,8 +13,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
     {
         public readonly DrawableHitObject MainObject;
 
-        protected DrawableStrongNestedHit(StrongHitObject strong, DrawableHitObject mainObject)
-            : base(strong)
+        protected DrawableStrongNestedHit(StrongNestedHitObject nestedHit, DrawableHitObject mainObject)
+            : base(nestedHit)
         {
             MainObject = mainObject;
         }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
index ff5b221273..42f24f1f52 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
@@ -208,7 +208,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         {
             switch (hitObject)
             {
-                case StrongHitObject strong:
+                case StrongNestedHitObject strong:
                     return CreateStrongHit(strong);
             }
 
@@ -221,11 +221,11 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         protected abstract SkinnableDrawable CreateMainPiece();
 
         /// <summary>
-        /// Creates the handler for this <see cref="DrawableHitObject"/>'s <see cref="StrongHitObject"/>.
+        /// Creates the handler for this <see cref="DrawableHitObject"/>'s <see cref="StrongNestedHitObject"/>.
         /// This is only invoked if <see cref="TaikoHitObject.IsStrong"/> is true for <see cref="HitObject"/>.
         /// </summary>
         /// <param name="hitObject">The strong hitobject.</param>
         /// <returns>The strong hitobject handler.</returns>
-        protected virtual DrawableStrongNestedHit CreateStrongHit(StrongHitObject hitObject) => null;
+        protected virtual DrawableStrongNestedHit CreateStrongHit(StrongNestedHitObject hitObject) => null;
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/StrongHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs
similarity index 89%
rename from osu.Game.Rulesets.Taiko/Objects/StrongHitObject.cs
rename to osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs
index 72a04698be..b2def4c6e5 100644
--- a/osu.Game.Rulesets.Taiko/Objects/StrongHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs
@@ -7,7 +7,7 @@ using osu.Game.Rulesets.Taiko.Judgements;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
-    public class StrongHitObject : TaikoHitObject
+    public class StrongNestedHitObject : TaikoHitObject
     {
         public override Judgement CreateJudgement() => new TaikoStrongJudgement();
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs
index d2c37d965c..2c1e3f32f3 100644
--- a/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
             base.CreateNestedHitObjects(cancellationToken);
 
             if (IsStrong)
-                AddNested(new StrongHitObject { StartTime = this.GetEndTime() });
+                AddNested(new StrongNestedHitObject { StartTime = this.GetEndTime() });
         }
 
         public override Judgement CreateJudgement() => new TaikoJudgement();

From f74567e8eb393d351039c0208700cc703bfc3e3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 13 Dec 2020 12:36:39 +0100
Subject: [PATCH 0195/3722] Introduce base class for hitobjects that can be
 strong

---
 .../TaikoBeatmapConversionTest.cs             |  2 +-
 .../Beatmaps/TaikoBeatmapConverter.cs         |  4 +-
 .../Edit/TaikoSelectionHandler.cs             |  2 +-
 .../Drawables/DrawableTaikoHitObject.cs       |  2 +-
 osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs   |  2 +-
 .../Objects/DrumRollTick.cs                   |  2 +-
 osu.Game.Rulesets.Taiko/Objects/Hit.cs        |  2 +-
 osu.Game.Rulesets.Taiko/Objects/Swell.cs      |  2 -
 .../Objects/TaikoHitObject.cs                 | 44 -------------------
 .../Objects/TaikoStrongHitObject.cs           | 42 ++++++++++++++++++
 .../Replays/TaikoAutoGenerator.cs             |  4 +-
 osu.Game.Rulesets.Taiko/UI/HitExplosion.cs    |  2 +-
 osu.Game.Rulesets.Taiko/UI/TaikoHitTarget.cs  |  6 +--
 13 files changed, 56 insertions(+), 60 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs b/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
index 5e550a5d03..126af1a6ad 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
                 IsCentre = (hitObject as Hit)?.Type == HitType.Centre,
                 IsDrumRoll = hitObject is DrumRoll,
                 IsSwell = hitObject is Swell,
-                IsStrong = ((TaikoHitObject)hitObject).IsStrong
+                IsStrong = (hitObject as TaikoStrongHitObject)?.IsStrong == true
             };
         }
 
diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 607eaf5dbd..78a0d1fdff 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -65,8 +65,8 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
                 converted.HitObjects = converted.HitObjects.GroupBy(t => t.StartTime).Select(x =>
                 {
                     TaikoHitObject first = x.First();
-                    if (x.Skip(1).Any() && first.CanBeStrong)
-                        first.IsStrong = true;
+                    if (x.Skip(1).Any() && first is TaikoStrongHitObject strong)
+                        strong.IsStrong = true;
                     return first;
                 }).ToList();
             }
diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
index a05de1f217..7de920ca8c 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
@@ -96,7 +96,7 @@ namespace osu.Game.Rulesets.Taiko.Edit
             base.UpdateTernaryStates();
 
             selectionRimState.Value = GetStateFromSelection(EditorBeatmap.SelectedHitObjects.OfType<Hit>(), h => h.Type == HitType.Rim);
-            selectionStrongState.Value = GetStateFromSelection(EditorBeatmap.SelectedHitObjects.OfType<TaikoHitObject>(), h => h.IsStrong);
+            selectionStrongState.Value = GetStateFromSelection(EditorBeatmap.SelectedHitObjects.OfType<TaikoStrongHitObject>(), h => h.IsStrong);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
index 42f24f1f52..1e39e7e97e 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
@@ -158,7 +158,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         {
             base.LoadSamples();
 
-            if (HitObject.CanBeStrong)
+            if (HitObject is TaikoStrongHitObject)
                 isStrong.Value = getStrongSamples().Any();
         }
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
index 5f52160be1..471e1a7b2f 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
@@ -15,7 +15,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
-    public class DrumRoll : TaikoHitObject, IHasPath
+    public class DrumRoll : TaikoStrongHitObject, IHasPath
     {
         /// <summary>
         /// Drum roll distance that results in a duration of 1 speed-adjusted beat length.
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
index 8a8be3e38d..5c36a3203c 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
@@ -7,7 +7,7 @@ using osu.Game.Rulesets.Taiko.Judgements;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
-    public class DrumRollTick : TaikoHitObject
+    public class DrumRollTick : TaikoStrongHitObject
     {
         /// <summary>
         /// Whether this is the first (initial) tick of the slider.
diff --git a/osu.Game.Rulesets.Taiko/Objects/Hit.cs b/osu.Game.Rulesets.Taiko/Objects/Hit.cs
index 68cc8d0ead..d6385c810d 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Hit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Hit.cs
@@ -5,7 +5,7 @@ using osu.Framework.Bindables;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
-    public class Hit : TaikoHitObject
+    public class Hit : TaikoStrongHitObject
     {
         public readonly Bindable<HitType> TypeBindable = new Bindable<HitType>();
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/Swell.cs b/osu.Game.Rulesets.Taiko/Objects/Swell.cs
index bf8b7bc178..eeae6e79f8 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Swell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Swell.cs
@@ -17,8 +17,6 @@ namespace osu.Game.Rulesets.Taiko.Objects
             set => Duration = value - StartTime;
         }
 
-        public override bool CanBeStrong => false;
-
         public double Duration { get; set; }
 
         /// <summary>
diff --git a/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs
index 2c1e3f32f3..f047c03f4b 100644
--- a/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs
@@ -1,9 +1,6 @@
 // Copyright (c) ppy 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;
-using osu.Framework.Bindables;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
@@ -19,47 +16,6 @@ namespace osu.Game.Rulesets.Taiko.Objects
         /// </summary>
         public const float DEFAULT_SIZE = 0.45f;
 
-        /// <summary>
-        /// Scale multiplier for a strong drawable taiko hit object.
-        /// </summary>
-        public const float STRONG_SCALE = 1.4f;
-
-        /// <summary>
-        /// Default size of a strong drawable taiko hit object.
-        /// </summary>
-        public const float DEFAULT_STRONG_SIZE = DEFAULT_SIZE * STRONG_SCALE;
-
-        public readonly Bindable<bool> IsStrongBindable = new BindableBool();
-
-        /// <summary>
-        /// Whether this <see cref="TaikoHitObject"/> can be made a "strong" (large) hit.
-        /// </summary>
-        public virtual bool CanBeStrong => true;
-
-        /// <summary>
-        /// Whether this HitObject is a "strong" type.
-        /// Strong hit objects give more points for hitting the hit object with both keys.
-        /// </summary>
-        public bool IsStrong
-        {
-            get => IsStrongBindable.Value;
-            set
-            {
-                if (value && !CanBeStrong)
-                    throw new InvalidOperationException($"Object of type {GetType()} cannot be strong");
-
-                IsStrongBindable.Value = value;
-            }
-        }
-
-        protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
-        {
-            base.CreateNestedHitObjects(cancellationToken);
-
-            if (IsStrong)
-                AddNested(new StrongNestedHitObject { StartTime = this.GetEndTime() });
-        }
-
         public override Judgement CreateJudgement() => new TaikoJudgement();
 
         protected override HitWindows CreateHitWindows() => new TaikoHitWindows();
diff --git a/osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.cs
new file mode 100644
index 0000000000..a8d00b7681
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.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.Threading;
+using osu.Framework.Bindables;
+using osu.Game.Rulesets.Objects;
+
+namespace osu.Game.Rulesets.Taiko.Objects
+{
+    public abstract class TaikoStrongHitObject : TaikoHitObject
+    {
+        /// <summary>
+        /// Scale multiplier for a strong drawable taiko hit object.
+        /// </summary>
+        public const float STRONG_SCALE = 1.4f;
+
+        /// <summary>
+        /// Default size of a strong drawable taiko hit object.
+        /// </summary>
+        public const float DEFAULT_STRONG_SIZE = DEFAULT_SIZE * STRONG_SCALE;
+
+        public readonly Bindable<bool> IsStrongBindable = new BindableBool();
+
+        /// <summary>
+        /// Whether this HitObject is a "strong" type.
+        /// Strong hit objects give more points for hitting the hit object with both keys.
+        /// </summary>
+        public bool IsStrong
+        {
+            get => IsStrongBindable.Value;
+            set => IsStrongBindable.Value = value;
+        }
+
+        protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
+        {
+            base.CreateNestedHitObjects(cancellationToken);
+
+            if (IsStrong)
+                AddNested(new StrongNestedHitObject { StartTime = this.GetEndTime() });
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
index db2e5948f5..a3dbe672a4 100644
--- a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
+++ b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
@@ -102,13 +102,13 @@ namespace osu.Game.Rulesets.Taiko.Replays
 
                         if (hit.Type == HitType.Centre)
                         {
-                            actions = h.IsStrong
+                            actions = hit.IsStrong
                                 ? new[] { TaikoAction.LeftCentre, TaikoAction.RightCentre }
                                 : new[] { hitButton ? TaikoAction.LeftCentre : TaikoAction.RightCentre };
                         }
                         else
                         {
-                            actions = h.IsStrong
+                            actions = hit.IsStrong
                                 ? new[] { TaikoAction.LeftRim, TaikoAction.RightRim }
                                 : new[] { hitButton ? TaikoAction.LeftRim : TaikoAction.RightRim };
                         }
diff --git a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
index 247c0dde73..05408e1049 100644
--- a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         /// </summary>
         public void VisualiseSecondHit()
         {
-            this.ResizeTo(new Vector2(TaikoHitObject.DEFAULT_STRONG_SIZE), 50);
+            this.ResizeTo(new Vector2(TaikoStrongHitObject.DEFAULT_STRONG_SIZE), 50);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoHitTarget.cs b/osu.Game.Rulesets.Taiko/UI/TaikoHitTarget.cs
index caddc8b122..5d8145391d 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoHitTarget.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoHitTarget.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre,
                     RelativeSizeAxes = Axes.Y,
-                    Size = new Vector2(border_thickness, (1 - TaikoHitObject.DEFAULT_STRONG_SIZE) / 2f),
+                    Size = new Vector2(border_thickness, (1 - TaikoStrongHitObject.DEFAULT_STRONG_SIZE) / 2f),
                     Alpha = 0.1f
                 },
                 new CircularContainer
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     RelativeSizeAxes = Axes.Both,
-                    Size = new Vector2(TaikoHitObject.DEFAULT_STRONG_SIZE),
+                    Size = new Vector2(TaikoStrongHitObject.DEFAULT_STRONG_SIZE),
                     Masking = true,
                     BorderColour = Color4.White,
                     BorderThickness = border_thickness,
@@ -83,7 +83,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                     Anchor = Anchor.BottomCentre,
                     Origin = Anchor.BottomCentre,
                     RelativeSizeAxes = Axes.Y,
-                    Size = new Vector2(border_thickness, (1 - TaikoHitObject.DEFAULT_STRONG_SIZE) / 2f),
+                    Size = new Vector2(border_thickness, (1 - TaikoStrongHitObject.DEFAULT_STRONG_SIZE) / 2f),
                     Alpha = 0.1f
                 },
             };

From b1635ecd166456bfa0667c80af75f1ea642f603c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 13 Dec 2020 12:51:10 +0100
Subject: [PATCH 0196/3722] Reflect can-be-strong split in DHO structure

---
 .../Objects/Drawables/DrawableDrumRoll.cs     |   2 +-
 .../Objects/Drawables/DrawableDrumRollTick.cs |   2 +-
 .../Objects/Drawables/DrawableHit.cs          |   2 +-
 .../Drawables/DrawableTaikoHitObject.cs       |  82 +------------
 .../Drawables/DrawableTaikoStrongHitObject.cs | 110 ++++++++++++++++++
 .../Skinning/Legacy/LegacyCirclePiece.cs      |   4 +-
 6 files changed, 116 insertions(+), 86 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index 4330e426c1..3f8970e506 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -19,7 +19,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
-    public class DrawableDrumRoll : DrawableTaikoHitObject<DrumRoll>
+    public class DrawableDrumRoll : DrawableTaikoStrongHitObject<DrumRoll>
     {
         /// <summary>
         /// Number of rolling hits required to reach the dark/final colour.
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
index c458a620bd..c21b7983a0 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
@@ -9,7 +9,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
-    public class DrawableDrumRollTick : DrawableTaikoHitObject<DrumRollTick>
+    public class DrawableDrumRollTick : DrawableTaikoStrongHitObject<DrumRollTick>
     {
         /// <summary>
         /// The hit type corresponding to the <see cref="TaikoAction"/> that the user pressed to hit this <see cref="DrawableDrumRollTick"/>.
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index 5837a391b4..c82ac8498e 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -16,7 +16,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
-    public class DrawableHit : DrawableTaikoHitObject<Hit>
+    public class DrawableHit : DrawableTaikoStrongHitObject<Hit>
     {
         /// <summary>
         /// A list of keys which can result in hits for this HitObject.
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
index 1e39e7e97e..cf3aa69b6f 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
@@ -4,13 +4,11 @@
 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.Primitives;
 using osu.Framework.Input.Bindings;
 using osu.Game.Audio;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Skinning;
 using osuTK;
@@ -120,112 +118,34 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         protected Vector2 BaseSize;
         protected SkinnableDrawable MainPiece;
 
-        private readonly Bindable<bool> isStrong;
-
-        private readonly Container<DrawableStrongNestedHit> strongHitContainer;
-
         protected DrawableTaikoHitObject(TObject hitObject)
             : base(hitObject)
         {
             HitObject = hitObject;
-            isStrong = HitObject.IsStrongBindable.GetBoundCopy();
 
             Anchor = Anchor.CentreLeft;
             Origin = Anchor.Custom;
 
             RelativeSizeAxes = Axes.Both;
-
-            AddInternal(strongHitContainer = new Container<DrawableStrongNestedHit>());
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            isStrong.BindValueChanged(_ =>
-            {
-                // will overwrite samples, should only be called on change.
-                updateSamplesFromStrong();
-
-                RecreatePieces();
-            });
-
             RecreatePieces();
         }
 
-        private HitSampleInfo[] getStrongSamples() => HitObject.Samples.Where(s => s.Name == HitSampleInfo.HIT_FINISH).ToArray();
-
-        protected override void LoadSamples()
-        {
-            base.LoadSamples();
-
-            if (HitObject is TaikoStrongHitObject)
-                isStrong.Value = getStrongSamples().Any();
-        }
-
-        private void updateSamplesFromStrong()
-        {
-            var strongSamples = getStrongSamples();
-
-            if (isStrong.Value != strongSamples.Any())
-            {
-                if (isStrong.Value)
-                    HitObject.Samples.Add(new HitSampleInfo(HitSampleInfo.HIT_FINISH));
-                else
-                {
-                    foreach (var sample in strongSamples)
-                        HitObject.Samples.Remove(sample);
-                }
-            }
-        }
-
         protected virtual void RecreatePieces()
         {
-            Size = BaseSize = new Vector2(HitObject.IsStrong ? TaikoHitObject.DEFAULT_STRONG_SIZE : TaikoHitObject.DEFAULT_SIZE);
+            Size = BaseSize = new Vector2(TaikoHitObject.DEFAULT_SIZE);
 
             MainPiece?.Expire();
             Content.Add(MainPiece = CreateMainPiece());
         }
 
-        protected override void AddNestedHitObject(DrawableHitObject hitObject)
-        {
-            base.AddNestedHitObject(hitObject);
-
-            switch (hitObject)
-            {
-                case DrawableStrongNestedHit strong:
-                    strongHitContainer.Add(strong);
-                    break;
-            }
-        }
-
-        protected override void ClearNestedHitObjects()
-        {
-            base.ClearNestedHitObjects();
-            strongHitContainer.Clear();
-        }
-
-        protected override DrawableHitObject CreateNestedHitObject(HitObject hitObject)
-        {
-            switch (hitObject)
-            {
-                case StrongNestedHitObject strong:
-                    return CreateStrongHit(strong);
-            }
-
-            return base.CreateNestedHitObject(hitObject);
-        }
-
         // Most osu!taiko hitsounds are managed by the drum (see DrumSampleMapping).
         public override IEnumerable<HitSampleInfo> GetSamples() => Enumerable.Empty<HitSampleInfo>();
 
         protected abstract SkinnableDrawable CreateMainPiece();
-
-        /// <summary>
-        /// Creates the handler for this <see cref="DrawableHitObject"/>'s <see cref="StrongNestedHitObject"/>.
-        /// This is only invoked if <see cref="TaikoHitObject.IsStrong"/> is true for <see cref="HitObject"/>.
-        /// </summary>
-        /// <param name="hitObject">The strong hitobject.</param>
-        /// <returns>The strong hitobject handler.</returns>
-        protected virtual DrawableStrongNestedHit CreateStrongHit(StrongNestedHitObject hitObject) => null;
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs
new file mode 100644
index 0000000000..875612c8a1
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs
@@ -0,0 +1,110 @@
+// Copyright (c) ppy 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.Containers;
+using osu.Game.Audio;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
+using osuTK;
+
+namespace osu.Game.Rulesets.Taiko.Objects.Drawables
+{
+    public abstract class DrawableTaikoStrongHitObject<TObject> : DrawableTaikoHitObject<TObject>
+        where TObject : TaikoStrongHitObject
+    {
+        private readonly Bindable<bool> isStrong;
+
+        private readonly Container<DrawableStrongNestedHit> strongHitContainer;
+
+        protected DrawableTaikoStrongHitObject(TObject hitObject)
+            : base(hitObject)
+        {
+            isStrong = HitObject.IsStrongBindable.GetBoundCopy();
+
+            AddInternal(strongHitContainer = new Container<DrawableStrongNestedHit>());
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            isStrong.BindValueChanged(_ =>
+            {
+                // will overwrite samples, should only be called on change.
+                updateSamplesFromStrong();
+
+                RecreatePieces();
+            });
+        }
+
+        private HitSampleInfo[] getStrongSamples() => HitObject.Samples.Where(s => s.Name == HitSampleInfo.HIT_FINISH).ToArray();
+
+        protected override void LoadSamples()
+        {
+            base.LoadSamples();
+            isStrong.Value = getStrongSamples().Any();
+        }
+
+        private void updateSamplesFromStrong()
+        {
+            var strongSamples = getStrongSamples();
+
+            if (isStrong.Value != strongSamples.Any())
+            {
+                if (isStrong.Value)
+                    HitObject.Samples.Add(new HitSampleInfo(HitSampleInfo.HIT_FINISH));
+                else
+                {
+                    foreach (var sample in strongSamples)
+                        HitObject.Samples.Remove(sample);
+                }
+            }
+        }
+
+        protected override void RecreatePieces()
+        {
+            base.RecreatePieces();
+            if (HitObject.IsStrong)
+                Size = BaseSize = new Vector2(TaikoStrongHitObject.DEFAULT_STRONG_SIZE);
+        }
+
+        protected override void AddNestedHitObject(DrawableHitObject hitObject)
+        {
+            base.AddNestedHitObject(hitObject);
+
+            switch (hitObject)
+            {
+                case DrawableStrongNestedHit strong:
+                    strongHitContainer.Add(strong);
+                    break;
+            }
+        }
+
+        protected override void ClearNestedHitObjects()
+        {
+            base.ClearNestedHitObjects();
+            strongHitContainer.Clear();
+        }
+
+        protected override DrawableHitObject CreateNestedHitObject(HitObject hitObject)
+        {
+            switch (hitObject)
+            {
+                case StrongNestedHitObject strong:
+                    return CreateStrongHit(strong);
+            }
+
+            return base.CreateNestedHitObject(hitObject);
+        }
+
+        /// <summary>
+        /// Creates the handler for this <see cref="DrawableHitObject"/>'s <see cref="StrongNestedHitObject"/>.
+        /// This is only invoked if <see cref="TaikoStrongHitObject.IsStrong"/> is true for <see cref="HitObject"/>.
+        /// </summary>
+        /// <param name="hitObject">The strong hitobject.</param>
+        /// <returns>The strong hitobject handler.</returns>
+        protected abstract DrawableStrongNestedHit CreateStrongHit(StrongNestedHitObject hitObject);
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
index 821ddc3c04..52c9080633 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
@@ -7,7 +7,7 @@ using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Taiko.Objects.Drawables;
+using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
                 const string normal_hit = "taikohit";
                 const string big_hit = "taikobig";
 
-                string prefix = ((drawableHitObject as DrawableTaikoHitObject)?.HitObject.IsStrong ?? false) ? big_hit : normal_hit;
+                string prefix = ((drawableHitObject.HitObject as TaikoStrongHitObject)?.IsStrong ?? false) ? big_hit : normal_hit;
 
                 return skin.GetAnimation($"{prefix}{lookup}", true, false) ??
                        // fallback to regular size if "big" version doesn't exist.

From 4d444df6b3979852403e46e37c5a1c29237cfb21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 13 Dec 2020 12:53:42 +0100
Subject: [PATCH 0197/3722] Rename DHO CreateStrong{-> Nested}Hit

---
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs | 2 +-
 .../Objects/Drawables/DrawableDrumRollTick.cs                 | 2 +-
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs      | 2 +-
 .../Objects/Drawables/DrawableTaikoStrongHitObject.cs         | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index 3f8970e506..3a7b644158 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -154,7 +154,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             Content.X = DrawHeight / 2;
         }
 
-        protected override DrawableStrongNestedHit CreateStrongHit(StrongNestedHitObject hitObject) => new StrongNestedHit(hitObject, this);
+        protected override DrawableStrongNestedHit CreateStrongNestedHit(StrongNestedHitObject hitObject) => new StrongNestedHit(hitObject, this);
 
         private void updateColour()
         {
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
index c21b7983a0..bc83fc538c 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             return UpdateResult(true);
         }
 
-        protected override DrawableStrongNestedHit CreateStrongHit(StrongNestedHitObject hitObject) => new StrongNestedHit(hitObject, this);
+        protected override DrawableStrongNestedHit CreateStrongNestedHit(StrongNestedHitObject hitObject) => new StrongNestedHit(hitObject, this);
 
         private class StrongNestedHit : DrawableStrongNestedHit
         {
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index c82ac8498e..3928c4bb5e 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -228,7 +228,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             }
         }
 
-        protected override DrawableStrongNestedHit CreateStrongHit(StrongNestedHitObject hitObject) => new StrongNestedHit(hitObject, this);
+        protected override DrawableStrongNestedHit CreateStrongNestedHit(StrongNestedHitObject hitObject) => new StrongNestedHit(hitObject, this);
 
         private class StrongNestedHit : DrawableStrongNestedHit
         {
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs
index 875612c8a1..0aa8be2da5 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs
@@ -93,7 +93,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             switch (hitObject)
             {
                 case StrongNestedHitObject strong:
-                    return CreateStrongHit(strong);
+                    return CreateStrongNestedHit(strong);
             }
 
             return base.CreateNestedHitObject(hitObject);
@@ -105,6 +105,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         /// </summary>
         /// <param name="hitObject">The strong hitobject.</param>
         /// <returns>The strong hitobject handler.</returns>
-        protected abstract DrawableStrongNestedHit CreateStrongHit(StrongNestedHitObject hitObject);
+        protected abstract DrawableStrongNestedHit CreateStrongNestedHit(StrongNestedHitObject hitObject);
     }
 }

From 61c488cd5eb33314611e87035073112b6a5444b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 13 Dec 2020 12:59:46 +0100
Subject: [PATCH 0198/3722] Create HO-specific nested hit types

---
 .../Skinning/TestSceneDrawableTaikoMascot.cs             | 2 +-
 osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs              | 6 ++++++
 osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs          | 6 ++++++
 osu.Game.Rulesets.Taiko/Objects/Hit.cs                   | 6 ++++++
 osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs | 2 +-
 osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.cs  | 9 ++++++++-
 6 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
index e62841b2c4..8d1aafdcc2 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableTaikoMascot.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             createDrawableRuleset();
 
             assertStateAfterResult(new JudgementResult(new Hit(), new TaikoJudgement()) { Type = HitResult.Great }, TaikoMascotAnimationState.Idle);
-            assertStateAfterResult(new JudgementResult(new StrongNestedHitObject(), new TaikoStrongJudgement()) { Type = HitResult.IgnoreMiss }, TaikoMascotAnimationState.Idle);
+            assertStateAfterResult(new JudgementResult(new Hit.StrongNestedHit(), new TaikoStrongJudgement()) { Type = HitResult.IgnoreMiss }, TaikoMascotAnimationState.Idle);
         }
 
         [Test]
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
index 471e1a7b2f..93f95d6446 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
@@ -109,6 +109,12 @@ namespace osu.Game.Rulesets.Taiko.Objects
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
 
+        protected override StrongNestedHitObject CreateStrongNestedHit(double startTime) => new StrongNestedHit { StartTime = startTime };
+
+        public class StrongNestedHit : StrongNestedHitObject
+        {
+        }
+
         #region LegacyBeatmapEncoder
 
         double IHasDistance.Distance => Duration * Velocity;
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
index 5c36a3203c..6b6ffa8668 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
@@ -28,5 +28,11 @@ namespace osu.Game.Rulesets.Taiko.Objects
         public override Judgement CreateJudgement() => new TaikoDrumRollTickJudgement();
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
+
+        protected override StrongNestedHitObject CreateStrongNestedHit(double startTime) => new StrongNestedHit { StartTime = startTime };
+
+        public class StrongNestedHit : StrongNestedHitObject
+        {
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Hit.cs b/osu.Game.Rulesets.Taiko/Objects/Hit.cs
index d6385c810d..6bdde376f6 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Hit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Hit.cs
@@ -17,5 +17,11 @@ namespace osu.Game.Rulesets.Taiko.Objects
             get => TypeBindable.Value;
             set => TypeBindable.Value = value;
         }
+
+        protected override StrongNestedHitObject CreateStrongNestedHit(double startTime) => new StrongNestedHit { StartTime = startTime };
+
+        public class StrongNestedHit : StrongNestedHitObject
+        {
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs
index b2def4c6e5..a0b1d3ef9b 100644
--- a/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs
@@ -7,7 +7,7 @@ using osu.Game.Rulesets.Taiko.Judgements;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
-    public class StrongNestedHitObject : TaikoHitObject
+    public abstract class StrongNestedHitObject : TaikoHitObject
     {
         public override Judgement CreateJudgement() => new TaikoStrongJudgement();
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.cs
index a8d00b7681..6a8e33e718 100644
--- a/osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.cs
@@ -36,7 +36,14 @@ namespace osu.Game.Rulesets.Taiko.Objects
             base.CreateNestedHitObjects(cancellationToken);
 
             if (IsStrong)
-                AddNested(new StrongNestedHitObject { StartTime = this.GetEndTime() });
+                AddNested(CreateStrongNestedHit(this.GetEndTime()));
         }
+
+        /// <summary>
+        /// Creates a <see cref="StrongNestedHitObject"/> representing a second hit on this object.
+        /// This is only called if <see cref="IsStrong"/> is true.
+        /// </summary>
+        /// <param name="startTime">The start time of the nested hit.</param>
+        protected abstract StrongNestedHitObject CreateStrongNestedHit(double startTime);
     }
 }

From 60379b09dbc22a1b8229c45a5a74a8f384a2bb39 Mon Sep 17 00:00:00 2001
From: Firmatorenio <smeshmunya@gmail.com>
Date: Sun, 13 Dec 2020 18:14:41 +0600
Subject: [PATCH 0199/3722] added a container for the judgements to move up or
 down

---
 ...awableManiaJudgementAdjustmentContainer.cs | 23 +++++++++++++++++++
 osu.Game.Rulesets.Mania/UI/Stage.cs           |  8 +------
 2 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/UI/DrawableManiaJudgementAdjustmentContainer.cs

diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgementAdjustmentContainer.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgementAdjustmentContainer.cs
new file mode 100644
index 0000000000..b5abd9fb10
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgementAdjustmentContainer.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using osu.Game.Rulesets.UI;
+using osu.Framework.Graphics;
+
+namespace osu.Game.Rulesets.Mania.UI
+{
+    public class DrawableManiaJudgementAdjustmentContainer : JudgementContainer<DrawableManiaJudgement>
+    {
+        private float scorePosition => 0;
+        public DrawableManiaJudgementAdjustmentContainer(float hitTargetPosition)
+        {
+            Anchor = Anchor.TopCentre;
+            Origin = Anchor.Centre;
+            RelativeSizeAxes = Axes.Both;
+            Y = hitTargetPosition + 150;
+        }
+
+        public DrawableManiaJudgementAdjustmentContainer()
+            : this(110) { }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index 3d7960ffe3..73af205a37 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -101,13 +101,7 @@ namespace osu.Game.Rulesets.Mania.UI
                         {
                             RelativeSizeAxes = Axes.Both
                         },
-                        judgements = new JudgementContainer<DrawableManiaJudgement>
-                        {
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.Centre,
-                            RelativeSizeAxes = Axes.Both,
-                            Y = HIT_TARGET_POSITION + 150,
-                        },
+                        judgements = new DrawableManiaJudgementAdjustmentContainer(HIT_TARGET_POSITION),
                         topLevelContainer = new Container { RelativeSizeAxes = Axes.Both }
                     }
                 }

From 7d2b77cdbdf2f09b5c4938d3c87fe5b181682ab8 Mon Sep 17 00:00:00 2001
From: Graham Johnson <johnson.graham.ib@gmail.com>
Date: Sun, 13 Dec 2020 07:58:58 -0500
Subject: [PATCH 0200/3722] improve selection box rotation UX

---
 .../Screens/Edit/Compose/Components/SelectionBox.cs   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index 742d433760..347d9e3ba7 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -191,7 +191,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 {
                     Anchor = Anchor.TopCentre,
                     Y = -separation,
-                    HandleDrag = e => OnRotation?.Invoke(e.Delta.X),
+                    HandleDrag = e => OnRotation?.Invoke(convertDragEventToAngleOfRotation(e)),
                     OperationStarted = operationStarted,
                     OperationEnded = operationEnded
                 }
@@ -242,6 +242,15 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private int activeOperations;
 
+        private float convertDragEventToAngleOfRotation(DragEvent e)
+        {
+            // Adjust coordinate system to the center of SelectionBox
+            float startAngle = MathF.Atan2(e.LastMousePosition.Y - DrawHeight / 2, e.LastMousePosition.X - DrawWidth / 2);
+            float endAngle = MathF.Atan2(e.MousePosition.Y - DrawHeight / 2, e.MousePosition.X - DrawWidth / 2);
+
+            return (endAngle - startAngle) * 180 / MathF.PI;
+        }
+
         private void operationEnded()
         {
             if (--activeOperations == 0)

From 091b08b5070e4abac6999cf7e7a9c2ef4c71d560 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 13 Dec 2020 14:38:16 +0100
Subject: [PATCH 0201/3722] Scope drawable nested hits more closely to models

---
 .../Objects/Drawables/DrawableDrumRoll.cs                  | 6 +++---
 .../Objects/Drawables/DrawableDrumRollTick.cs              | 6 +++---
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs   | 6 +++---
 .../Objects/Drawables/DrawableTaikoStrongHitObject.cs      | 7 ++++---
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index 3a7b644158..0c6d28472d 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -19,7 +19,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
-    public class DrawableDrumRoll : DrawableTaikoStrongHitObject<DrumRoll>
+    public class DrawableDrumRoll : DrawableTaikoStrongHitObject<DrumRoll, DrumRoll.StrongNestedHit>
     {
         /// <summary>
         /// Number of rolling hits required to reach the dark/final colour.
@@ -154,7 +154,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             Content.X = DrawHeight / 2;
         }
 
-        protected override DrawableStrongNestedHit CreateStrongNestedHit(StrongNestedHitObject hitObject) => new StrongNestedHit(hitObject, this);
+        protected override DrawableStrongNestedHit CreateStrongNestedHit(DrumRoll.StrongNestedHit hitObject) => new StrongNestedHit(hitObject, this);
 
         private void updateColour()
         {
@@ -164,7 +164,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         private class StrongNestedHit : DrawableStrongNestedHit
         {
-            public StrongNestedHit(StrongNestedHitObject nestedHit, DrawableDrumRoll drumRoll)
+            public StrongNestedHit(DrumRoll.StrongNestedHit nestedHit, DrawableDrumRoll drumRoll)
                 : base(nestedHit, drumRoll)
             {
             }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
index bc83fc538c..c26e20f92c 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
@@ -9,7 +9,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
-    public class DrawableDrumRollTick : DrawableTaikoStrongHitObject<DrumRollTick>
+    public class DrawableDrumRollTick : DrawableTaikoStrongHitObject<DrumRollTick, DrumRollTick.StrongNestedHit>
     {
         /// <summary>
         /// The hit type corresponding to the <see cref="TaikoAction"/> that the user pressed to hit this <see cref="DrawableDrumRollTick"/>.
@@ -61,11 +61,11 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             return UpdateResult(true);
         }
 
-        protected override DrawableStrongNestedHit CreateStrongNestedHit(StrongNestedHitObject hitObject) => new StrongNestedHit(hitObject, this);
+        protected override DrawableStrongNestedHit CreateStrongNestedHit(DrumRollTick.StrongNestedHit hitObject) => new StrongNestedHit(hitObject, this);
 
         private class StrongNestedHit : DrawableStrongNestedHit
         {
-            public StrongNestedHit(StrongNestedHitObject nestedHit, DrawableDrumRollTick tick)
+            public StrongNestedHit(DrumRollTick.StrongNestedHit nestedHit, DrawableDrumRollTick tick)
                 : base(nestedHit, tick)
             {
             }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index 3928c4bb5e..31cb3d764d 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -16,7 +16,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
-    public class DrawableHit : DrawableTaikoStrongHitObject<Hit>
+    public class DrawableHit : DrawableTaikoStrongHitObject<Hit, Hit.StrongNestedHit>
     {
         /// <summary>
         /// A list of keys which can result in hits for this HitObject.
@@ -228,7 +228,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             }
         }
 
-        protected override DrawableStrongNestedHit CreateStrongNestedHit(StrongNestedHitObject hitObject) => new StrongNestedHit(hitObject, this);
+        protected override DrawableStrongNestedHit CreateStrongNestedHit(Hit.StrongNestedHit hitObject) => new StrongNestedHit(hitObject, this);
 
         private class StrongNestedHit : DrawableStrongNestedHit
         {
@@ -240,7 +240,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
             public new DrawableHit MainObject => (DrawableHit)base.MainObject;
 
-            public StrongNestedHit(StrongNestedHitObject nestedHit, DrawableHit hit)
+            public StrongNestedHit(Hit.StrongNestedHit nestedHit, DrawableHit hit)
                 : base(nestedHit, hit)
             {
             }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs
index 0aa8be2da5..04e584e15d 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs
@@ -12,8 +12,9 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
-    public abstract class DrawableTaikoStrongHitObject<TObject> : DrawableTaikoHitObject<TObject>
+    public abstract class DrawableTaikoStrongHitObject<TObject, TStrongNestedObject> : DrawableTaikoHitObject<TObject>
         where TObject : TaikoStrongHitObject
+        where TStrongNestedObject : StrongNestedHitObject
     {
         private readonly Bindable<bool> isStrong;
 
@@ -92,7 +93,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         {
             switch (hitObject)
             {
-                case StrongNestedHitObject strong:
+                case TStrongNestedObject strong:
                     return CreateStrongNestedHit(strong);
             }
 
@@ -105,6 +106,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         /// </summary>
         /// <param name="hitObject">The strong hitobject.</param>
         /// <returns>The strong hitobject handler.</returns>
-        protected abstract DrawableStrongNestedHit CreateStrongNestedHit(StrongNestedHitObject hitObject);
+        protected abstract DrawableStrongNestedHit CreateStrongNestedHit(TStrongNestedObject hitObject);
     }
 }

From 080f7a3e32d9d19bca0b25ebb184c8402d155d1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 13 Dec 2020 13:04:44 +0100
Subject: [PATCH 0202/3722] Add/fix up xmldocs with clarifications

---
 .../Objects/Drawables/DrawableStrongNestedHit.cs              | 2 +-
 osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs      | 4 ++++
 osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.cs       | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
index e1da357c47..d735d258b3 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
@@ -7,7 +7,7 @@ using osu.Game.Rulesets.Taiko.Judgements;
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
     /// <summary>
-    /// Used as a nested hitobject to provide <see cref="TaikoStrongJudgement"/>s for <see cref="DrawableTaikoHitObject"/>s.
+    /// Used as a nested hitobject to provide <see cref="TaikoStrongJudgement"/>s for <see cref="DrawableTaikoStrongHitObject{TObject, TNested}"/>s.
     /// </summary>
     public abstract class DrawableStrongNestedHit : DrawableTaikoHitObject
     {
diff --git a/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs
index a0b1d3ef9b..2e8989bc79 100644
--- a/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs
@@ -7,6 +7,10 @@ using osu.Game.Rulesets.Taiko.Judgements;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
+    /// <summary>
+    /// Base type for nested strong hits.
+    /// Used by <see cref="TaikoStrongHitObject"/>s to represent their strong bonus scoring portions.
+    /// </summary>
     public abstract class StrongNestedHitObject : TaikoHitObject
     {
         public override Judgement CreateJudgement() => new TaikoStrongJudgement();
diff --git a/osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.cs
index 6a8e33e718..861de95bae 100644
--- a/osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.cs
@@ -7,6 +7,9 @@ using osu.Game.Rulesets.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
+    /// <summary>
+    /// Base class for taiko hitobjects that can become strong (large).
+    /// </summary>
     public abstract class TaikoStrongHitObject : TaikoHitObject
     {
         /// <summary>

From acd07017d1cf3b9c3497b73915363ed3be109725 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 13 Dec 2020 16:36:09 +0100
Subject: [PATCH 0203/3722] Replace now-default SDL run config with legacy
 osuTK config

---
 .../{osu_SDL.xml => osu___legacy_osuTK_.xml}                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename .idea/.idea.osu.Desktop/.idea/runConfigurations/{osu_SDL.xml => osu___legacy_osuTK_.xml} (80%)

diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu_SDL.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu___legacy_osuTK_.xml
similarity index 80%
rename from .idea/.idea.osu.Desktop/.idea/runConfigurations/osu_SDL.xml
rename to .idea/.idea.osu.Desktop/.idea/runConfigurations/osu___legacy_osuTK_.xml
index 31f1fda09d..811fd9cc6d 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu_SDL.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu___legacy_osuTK_.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="osu! SDL" type="DotNetProject" factoryName=".NET Project" folderName="osu!" activateToolWindowBeforeRun="false">
+  <configuration default="false" name="osu! (legacy osuTK)" type="DotNetProject" factoryName=".NET Project" folderName="osu!" activateToolWindowBeforeRun="false">
     <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/netcoreapp3.1/osu!.dll" />
-    <option name="PROGRAM_PARAMETERS" value="--sdl" />
+    <option name="PROGRAM_PARAMETERS" value="--tk" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/netcoreapp3.1" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />

From f14e49c72e9dada5dc4771b15dd209528cc8ddef Mon Sep 17 00:00:00 2001
From: Firmatorenio <smeshmunya@gmail.com>
Date: Sun, 13 Dec 2020 19:59:34 +0600
Subject: [PATCH 0204/3722] fetch ScorePosition from the skin

---
 ...awableManiaJudgementAdjustmentContainer.cs | 29 +++++++++++++++----
 osu.Game.Rulesets.Mania/UI/Stage.cs           | 15 ++++++++--
 .../UI/Scrolling/ScrollingPlayfield.cs        | 14 ++++++++-
 3 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgementAdjustmentContainer.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgementAdjustmentContainer.cs
index b5abd9fb10..79e7d58f63 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgementAdjustmentContainer.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgementAdjustmentContainer.cs
@@ -8,16 +8,33 @@ namespace osu.Game.Rulesets.Mania.UI
 {
     public class DrawableManiaJudgementAdjustmentContainer : JudgementContainer<DrawableManiaJudgement>
     {
-        private float scorePosition => 0;
-        public DrawableManiaJudgementAdjustmentContainer(float hitTargetPosition)
+        private float hitTargetPosition = 110;
+        private float scorePosition;
+
+        public float HitTargetPosition
+        {
+            get => hitTargetPosition;
+            set
+            {
+                hitTargetPosition = value;
+                Y = value + scorePosition + 150;
+            }
+        }
+
+        public float ScorePosition
+        {
+            set
+            {
+                scorePosition = value;
+                Y = hitTargetPosition + value + 150;
+            }
+        }
+
+        public DrawableManiaJudgementAdjustmentContainer()
         {
             Anchor = Anchor.TopCentre;
             Origin = Anchor.Centre;
             RelativeSizeAxes = Axes.Both;
-            Y = hitTargetPosition + 150;
         }
-
-        public DrawableManiaJudgementAdjustmentContainer()
-            : this(110) { }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index 73af205a37..d06e341744 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -10,6 +10,7 @@ using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Mania.Skinning;
 using osu.Game.Rulesets.Mania.UI.Components;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
@@ -32,7 +33,7 @@ namespace osu.Game.Rulesets.Mania.UI
         public IReadOnlyList<Column> Columns => columnFlow.Content;
         private readonly ColumnFlow<Column> columnFlow;
 
-        private readonly JudgementContainer<DrawableManiaJudgement> judgements;
+        private DrawableManiaJudgementAdjustmentContainer judgements;
         private readonly DrawablePool<DrawableManiaJudgement> judgementPool;
 
         private readonly Drawable barLineContainer;
@@ -101,7 +102,10 @@ namespace osu.Game.Rulesets.Mania.UI
                         {
                             RelativeSizeAxes = Axes.Both
                         },
-                        judgements = new DrawableManiaJudgementAdjustmentContainer(HIT_TARGET_POSITION),
+                        judgements = new DrawableManiaJudgementAdjustmentContainer()
+                        {
+                            HitTargetPosition = HIT_TARGET_POSITION,
+                        },
                         topLevelContainer = new Container { RelativeSizeAxes = Axes.Both }
                     }
                 }
@@ -175,6 +179,13 @@ namespace osu.Game.Rulesets.Mania.UI
             }));
         }
 
+        protected override void OnSkinChanged()
+        {
+            judgements.ScorePosition = CurrentSkin.GetConfig<ManiaSkinConfigurationLookup, float>(
+                                                   new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.ScorePosition))
+                                               ?.Value ?? 0;
+        }
+
         protected override void Update()
         {
             // Due to masking differences, it is not possible to get the width of the columns container automatically
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
index 9dac3f4de1..e611f09dcf 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.UI.Scrolling
@@ -18,10 +19,21 @@ namespace osu.Game.Rulesets.UI.Scrolling
         [Resolved]
         protected IScrollingInfo ScrollingInfo { get; private set; }
 
+        protected ISkinSource CurrentSkin;
+
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(ISkinSource skin)
         {
             Direction.BindTo(ScrollingInfo.Direction);
+            CurrentSkin = skin;
+
+            skin.SourceChanged += OnSkinChanged;
+            OnSkinChanged();
+        }
+
+        protected virtual void OnSkinChanged()
+        {
+
         }
 
         /// <summary>

From 21088443199777bc68cbd7f502468435cc9e29d3 Mon Sep 17 00:00:00 2001
From: Firmatorenio <smeshmunya@gmail.com>
Date: Sun, 13 Dec 2020 22:00:46 +0600
Subject: [PATCH 0205/3722] apply ScorePosition to the judgement container

---
 osu.Game.Rulesets.Mania/UI/Stage.cs               | 5 ++---
 osu.Game/Skinning/LegacyManiaSkinConfiguration.cs | 2 +-
 osu.Game/Skinning/LegacySkin.cs                   | 3 +++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index d06e341744..db344a6934 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -181,9 +181,8 @@ namespace osu.Game.Rulesets.Mania.UI
 
         protected override void OnSkinChanged()
         {
-            judgements.ScorePosition = CurrentSkin.GetConfig<ManiaSkinConfigurationLookup, float>(
-                                                   new ManiaSkinConfigurationLookup(LegacyManiaSkinConfigurationLookups.ScorePosition))
-                                               ?.Value ?? 0;
+            judgements.ScorePosition = CurrentSkin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.ScorePosition)
+                                                   ?.Value ?? 0;
         }
 
         protected override void Update()
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
index a8225a5bea..40588f0ac4 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Skinning
 
         public float HitPosition = (480 - 402) * POSITION_SCALE_FACTOR;
         public float LightPosition = (480 - 413) * POSITION_SCALE_FACTOR;
-        public float ScorePosition = (480 - 402 + 150) * POSITION_SCALE_FACTOR;
+        public float ScorePosition = (480 - 300) * POSITION_SCALE_FACTOR;
         public bool ShowJudgementLine = true;
         public bool KeysUnderNotes;
 
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 63a22eba62..80b2fef35c 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -169,6 +169,9 @@ namespace osu.Game.Skinning
                 case LegacyManiaSkinConfigurationLookups.HitPosition:
                     return SkinUtils.As<TValue>(new Bindable<float>(existing.HitPosition));
 
+                case LegacyManiaSkinConfigurationLookups.ScorePosition:
+                    return SkinUtils.As<TValue>(new Bindable<float>(existing.ScorePosition));
+
                 case LegacyManiaSkinConfigurationLookups.LightPosition:
                     return SkinUtils.As<TValue>(new Bindable<float>(existing.LightPosition));
 

From 3741c2339a084244f98623b83b8cd71c35fe5d70 Mon Sep 17 00:00:00 2001
From: Firmatorenio <smeshmunya@gmail.com>
Date: Sun, 13 Dec 2020 22:43:36 +0600
Subject: [PATCH 0206/3722] simplify implementation and adjust the default
 values

---
 ...awableManiaJudgementAdjustmentContainer.cs | 40 -------------------
 osu.Game.Rulesets.Mania/UI/Stage.cs           | 12 +++---
 .../Skinning/LegacyManiaSkinConfiguration.cs  |  2 +-
 osu.Game/Skinning/LegacyManiaSkinDecoder.cs   |  2 +-
 4 files changed, 9 insertions(+), 47 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Mania/UI/DrawableManiaJudgementAdjustmentContainer.cs

diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgementAdjustmentContainer.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgementAdjustmentContainer.cs
deleted file mode 100644
index 79e7d58f63..0000000000
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgementAdjustmentContainer.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using osu.Game.Rulesets.UI;
-using osu.Framework.Graphics;
-
-namespace osu.Game.Rulesets.Mania.UI
-{
-    public class DrawableManiaJudgementAdjustmentContainer : JudgementContainer<DrawableManiaJudgement>
-    {
-        private float hitTargetPosition = 110;
-        private float scorePosition;
-
-        public float HitTargetPosition
-        {
-            get => hitTargetPosition;
-            set
-            {
-                hitTargetPosition = value;
-                Y = value + scorePosition + 150;
-            }
-        }
-
-        public float ScorePosition
-        {
-            set
-            {
-                scorePosition = value;
-                Y = hitTargetPosition + value + 150;
-            }
-        }
-
-        public DrawableManiaJudgementAdjustmentContainer()
-        {
-            Anchor = Anchor.TopCentre;
-            Origin = Anchor.Centre;
-            RelativeSizeAxes = Axes.Both;
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index db344a6934..7d6ddce815 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Mania.UI
         public IReadOnlyList<Column> Columns => columnFlow.Content;
         private readonly ColumnFlow<Column> columnFlow;
 
-        private DrawableManiaJudgementAdjustmentContainer judgements;
+        private JudgementContainer<DrawableManiaJudgement> judgements;
         private readonly DrawablePool<DrawableManiaJudgement> judgementPool;
 
         private readonly Drawable barLineContainer;
@@ -102,9 +102,11 @@ namespace osu.Game.Rulesets.Mania.UI
                         {
                             RelativeSizeAxes = Axes.Both
                         },
-                        judgements = new DrawableManiaJudgementAdjustmentContainer()
+                        judgements = new JudgementContainer<DrawableManiaJudgement>()
                         {
-                            HitTargetPosition = HIT_TARGET_POSITION,
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.Centre,
+                            RelativeSizeAxes = Axes.Both,
                         },
                         topLevelContainer = new Container { RelativeSizeAxes = Axes.Both }
                     }
@@ -181,8 +183,8 @@ namespace osu.Game.Rulesets.Mania.UI
 
         protected override void OnSkinChanged()
         {
-            judgements.ScorePosition = CurrentSkin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.ScorePosition)
-                                                   ?.Value ?? 0;
+            judgements.Y = CurrentSkin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.ScorePosition)
+                                                   ?.Value ?? HIT_TARGET_POSITION + 150;
         }
 
         protected override void Update()
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
index 40588f0ac4..77d390875b 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfiguration.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Skinning
 
         public float HitPosition = (480 - 402) * POSITION_SCALE_FACTOR;
         public float LightPosition = (480 - 413) * POSITION_SCALE_FACTOR;
-        public float ScorePosition = (480 - 300) * POSITION_SCALE_FACTOR;
+        public float ScorePosition = 300 * POSITION_SCALE_FACTOR;
         public bool ShowJudgementLine = true;
         public bool KeysUnderNotes;
 
diff --git a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
index 49feb9c3f0..6a04a95040 100644
--- a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Skinning
                         break;
 
                     case "ScorePosition":
-                        currentConfig.ScorePosition = (480 - float.Parse(pair.Value, CultureInfo.InvariantCulture)) * LegacyManiaSkinConfiguration.POSITION_SCALE_FACTOR;
+                        currentConfig.ScorePosition = (float.Parse(pair.Value, CultureInfo.InvariantCulture)) * LegacyManiaSkinConfiguration.POSITION_SCALE_FACTOR;
                         break;
 
                     case "JudgementLine":

From cf7303e07231f2df157207a67e91578c59e3c6f4 Mon Sep 17 00:00:00 2001
From: Firmatorenio <smeshmunya@gmail.com>
Date: Sun, 13 Dec 2020 22:54:01 +0600
Subject: [PATCH 0207/3722] dotnet format

---
 osu.Game.Rulesets.Mania/UI/Stage.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index 7d6ddce815..d2f5e6902a 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Mania.UI
         public IReadOnlyList<Column> Columns => columnFlow.Content;
         private readonly ColumnFlow<Column> columnFlow;
 
-        private JudgementContainer<DrawableManiaJudgement> judgements;
+        private readonly JudgementContainer<DrawableManiaJudgement> judgements;
         private readonly DrawablePool<DrawableManiaJudgement> judgementPool;
 
         private readonly Drawable barLineContainer;
@@ -102,7 +102,7 @@ namespace osu.Game.Rulesets.Mania.UI
                         {
                             RelativeSizeAxes = Axes.Both
                         },
-                        judgements = new JudgementContainer<DrawableManiaJudgement>()
+                        judgements = new JudgementContainer<DrawableManiaJudgement>
                         {
                             Anchor = Anchor.TopCentre,
                             Origin = Anchor.Centre,

From c83c3e92fcebfe9793633ed1b55fa330ab4028a0 Mon Sep 17 00:00:00 2001
From: Firmatorenio <smeshmunya@gmail.com>
Date: Mon, 14 Dec 2020 01:50:25 +0600
Subject: [PATCH 0208/3722] apply a private setter in a protected property

---
 osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
index e611f09dcf..7259bf293c 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
@@ -18,8 +18,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
         [Resolved]
         protected IScrollingInfo ScrollingInfo { get; private set; }
-
-        protected ISkinSource CurrentSkin;
+        protected ISkinSource CurrentSkin { get; private set; }
 
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin)

From beee9b89d53806803a45a87462c2711daa689225 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 13 Dec 2020 19:29:41 +0100
Subject: [PATCH 0209/3722] Change bar line SHOC to nested playfield

---
 .../UI/BarLinePlayfield.cs                    | 11 ++++
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs  | 62 ++++++++++++++++---
 2 files changed, 65 insertions(+), 8 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko/UI/BarLinePlayfield.cs

diff --git a/osu.Game.Rulesets.Taiko/UI/BarLinePlayfield.cs b/osu.Game.Rulesets.Taiko/UI/BarLinePlayfield.cs
new file mode 100644
index 0000000000..83d0a17e09
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/UI/BarLinePlayfield.cs
@@ -0,0 +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.Game.Rulesets.UI.Scrolling;
+
+namespace osu.Game.Rulesets.Taiko.UI
+{
+    public class BarLinePlayfield : ScrollingPlayfield
+    {
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 370760f03e..d20b190c86 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -10,6 +10,7 @@ using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
@@ -38,10 +39,15 @@ namespace osu.Game.Rulesets.Taiko.UI
         private SkinnableDrawable mascot;
 
         private ProxyContainer topLevelHitContainer;
-        private ScrollingHitObjectContainer barlineContainer;
         private Container rightArea;
         private Container leftArea;
 
+        /// <remarks>
+        /// <see cref="Playfield.AddNested"/> is purposefully not called on this to prevent i.e. being able to interact
+        /// with bar lines in the editor.
+        /// </remarks>
+        private BarLinePlayfield barLinePlayfield;
+
         private Container hitTargetOffsetContent;
 
         public TaikoPlayfield(ControlPointInfo controlPoints)
@@ -84,7 +90,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                             RelativeSizeAxes = Axes.Both,
                             Children = new Drawable[]
                             {
-                                barlineContainer = new ScrollingHitObjectContainer(),
+                                barLinePlayfield = new BarLinePlayfield(),
                                 new Container
                                 {
                                     Name = "Hit objects",
@@ -155,12 +161,50 @@ namespace osu.Game.Rulesets.Taiko.UI
             mascot.Scale = new Vector2(DrawHeight / DEFAULT_HEIGHT);
         }
 
+        #region Pooling support
+
+        public override void Add(HitObject h)
+        {
+            switch (h)
+            {
+                case BarLine barLine:
+                    barLinePlayfield.Add(barLine);
+                    break;
+
+                case TaikoHitObject taikoHitObject:
+                    base.Add(taikoHitObject);
+                    break;
+
+                default:
+                    throw new ArgumentException($"Unsupported {nameof(HitObject)} type: {h.GetType()}");
+            }
+        }
+
+        public override bool Remove(HitObject h)
+        {
+            switch (h)
+            {
+                case BarLine barLine:
+                    return barLinePlayfield.Remove(barLine);
+
+                case TaikoHitObject taikoHitObject:
+                    return base.Remove(taikoHitObject);
+
+                default:
+                    throw new ArgumentException($"Unsupported {nameof(HitObject)} type: {h.GetType()}");
+            }
+        }
+
+        #endregion
+
+        #region Non-pooling support
+
         public override void Add(DrawableHitObject h)
         {
             switch (h)
             {
-                case DrawableBarLine barline:
-                    barlineContainer.Add(barline);
+                case DrawableBarLine barLine:
+                    barLinePlayfield.Add(barLine);
                     break;
 
                 case DrawableTaikoHitObject taikoObject:
@@ -170,7 +214,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                     break;
 
                 default:
-                    throw new ArgumentException($"Unsupported {nameof(DrawableHitObject)} type");
+                    throw new ArgumentException($"Unsupported {nameof(DrawableHitObject)} type: {h.GetType()}");
             }
         }
 
@@ -178,8 +222,8 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             switch (h)
             {
-                case DrawableBarLine barline:
-                    return barlineContainer.Remove(barline);
+                case DrawableBarLine barLine:
+                    return barLinePlayfield.Remove(barLine);
 
                 case DrawableTaikoHitObject _:
                     h.OnNewResult -= OnNewResult;
@@ -187,10 +231,12 @@ namespace osu.Game.Rulesets.Taiko.UI
                     return base.Remove(h);
 
                 default:
-                    throw new ArgumentException($"Unsupported {nameof(DrawableHitObject)} type");
+                    throw new ArgumentException($"Unsupported {nameof(DrawableHitObject)} type: {h.GetType()}");
             }
         }
 
+        #endregion
+
         internal void OnNewResult(DrawableHitObject judgedObject, JudgementResult result)
         {
             if (!DisplayJudgements.Value)

From f83c5fa81d8f5291e0c3d75b37e65a35ec8b2a8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 13 Dec 2020 19:38:32 +0100
Subject: [PATCH 0210/3722] Add backing bindable for major field

---
 osu.Game.Rulesets.Taiko/Objects/BarLine.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/BarLine.cs b/osu.Game.Rulesets.Taiko/Objects/BarLine.cs
index 6306195704..bbfc02f975 100644
--- a/osu.Game.Rulesets.Taiko/Objects/BarLine.cs
+++ b/osu.Game.Rulesets.Taiko/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,13 @@ namespace osu.Game.Rulesets.Taiko.Objects
 {
     public class BarLine : TaikoHitObject, IBarLine
     {
-        public bool Major { get; set; }
+        public bool Major
+        {
+            get => MajorBindable.Value;
+            set => MajorBindable.Value = value;
+        }
+
+        public readonly Bindable<bool> MajorBindable = new BindableBool();
 
         public override Judgement CreateJudgement() => new IgnoreJudgement();
     }

From a8e86a20e1aa127ff35bfdf244feeb32b63f685f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 13 Dec 2020 19:59:07 +0100
Subject: [PATCH 0211/3722] Unify bar line types & prepare for pooling

---
 .../Skinning/TestSceneDrawableBarLine.cs      |   2 +-
 .../TestSceneHits.cs                          |   8 +-
 .../Objects/Drawables/DrawableBarLine.cs      | 110 +++++++++++++++---
 .../Objects/Drawables/DrawableBarLineMajor.cs |  67 -----------
 .../UI/DrawableTaikoRuleset.cs                |   2 +-
 5 files changed, 102 insertions(+), 87 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLineMajor.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableBarLine.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableBarLine.cs
index f6aec20d53..ff309f278e 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableBarLine.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneDrawableBarLine.cs
@@ -71,7 +71,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
                     }
                 };
 
-                hoc.Add(new DrawableBarLineMajor(createBarLineAtCurrentTime(true))
+                hoc.Add(new DrawableBarLine(createBarLineAtCurrentTime(true))
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
index c3fa03d404..18ee903977 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
@@ -145,9 +145,13 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
         private void addBarLine(bool major, double delay = scroll_time)
         {
-            BarLine bl = new BarLine { StartTime = DrawableRuleset.Playfield.Time.Current + delay };
+            BarLine bl = new BarLine
+            {
+                StartTime = DrawableRuleset.Playfield.Time.Current + delay,
+                Major = major
+            };
 
-            DrawableRuleset.Playfield.Add(major ? new DrawableBarLineMajor(bl) : new DrawableBarLine(bl));
+            DrawableRuleset.Playfield.Add(new DrawableBarLine(bl));
         }
 
         private void addSwell(double duration = default_duration)
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs
index aadcc420df..e7dd9a18c2 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs
@@ -1,7 +1,11 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using JetBrains.Annotations;
+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.Objects;
 using osuTK;
@@ -15,49 +19,123 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
     /// </summary>
     public class DrawableBarLine : DrawableHitObject<HitObject>
     {
+        public new BarLine HitObject => (BarLine)base.HitObject;
+
         /// <summary>
         /// The width of the line tracker.
         /// </summary>
         private const float tracker_width = 2f;
 
         /// <summary>
-        /// Fade out time calibrated to a pre-empt of 1000ms.
+        /// The vertical offset of the triangles from the line tracker.
         /// </summary>
-        private const float base_fadeout_time = 100f;
+        private const float triangle_offset = 10f;
+
+        /// <summary>
+        /// The size of the triangles.
+        /// </summary>
+        private const float triangle_size = 20f;
 
         /// <summary>
         /// The visual line tracker.
         /// </summary>
-        protected SkinnableDrawable Line;
+        private SkinnableDrawable line;
 
         /// <summary>
-        /// The bar line.
+        /// Container with triangles. Only visible for major lines.
         /// </summary>
-        protected readonly BarLine BarLine;
+        private Container triangleContainer;
 
-        public DrawableBarLine(BarLine barLine)
+        private readonly Bindable<bool> major = new Bindable<bool>();
+
+        public DrawableBarLine()
+            : this(null)
+        {
+        }
+
+        public DrawableBarLine([CanBeNull] BarLine barLine)
             : base(barLine)
         {
-            BarLine = barLine;
+        }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
             Anchor = Anchor.CentreLeft;
             Origin = Anchor.Centre;
 
             RelativeSizeAxes = Axes.Y;
             Width = tracker_width;
 
-            AddInternal(Line = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.BarLine), _ => new Box
+            AddRangeInternal(new Drawable[]
             {
-                RelativeSizeAxes = Axes.Both,
-                EdgeSmoothness = new Vector2(0.5f, 0),
-            })
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Alpha = 0.75f,
+                line = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.BarLine), _ => new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    EdgeSmoothness = new Vector2(0.5f, 0),
+                })
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+                triangleContainer = new Container
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new[]
+                    {
+                        new EquilateralTriangle
+                        {
+                            Name = "Top",
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
+                            Position = new Vector2(0, -triangle_offset),
+                            Size = new Vector2(-triangle_size),
+                            EdgeSmoothness = new Vector2(1),
+                        },
+                        new EquilateralTriangle
+                        {
+                            Name = "Bottom",
+                            Anchor = Anchor.BottomCentre,
+                            Origin = Anchor.TopCentre,
+                            Position = new Vector2(0, triangle_offset),
+                            Size = new Vector2(triangle_size),
+                            EdgeSmoothness = new Vector2(1),
+                        }
+                    }
+                }
             });
         }
 
-        protected override void UpdateHitStateTransforms(ArmedState state) => this.FadeOut(150);
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            major.BindValueChanged(majorChanged => updateMajor(majorChanged.NewValue), true);
+        }
+
+        private void updateMajor(bool major)
+        {
+            line.Alpha = major ? 1f : 0.75f;
+            triangleContainer.Alpha = major ? 1 : 0;
+        }
+
+        protected override void OnApply()
+        {
+            base.OnApply();
+            major.BindTo(HitObject.MajorBindable);
+        }
+
+        protected override void OnFree()
+        {
+            base.OnFree();
+            major.UnbindFrom(HitObject.MajorBindable);
+        }
+
+        protected override void UpdateHitStateTransforms(ArmedState state)
+        {
+            using (BeginAbsoluteSequence(HitObject.StartTime))
+                this.FadeOutFromOne(150).Expire();
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLineMajor.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLineMajor.cs
deleted file mode 100644
index 62aab3524b..0000000000
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLineMajor.cs
+++ /dev/null
@@ -1,67 +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;
-using osu.Framework.Graphics.Containers;
-using osuTK;
-using osu.Framework.Graphics.Shapes;
-
-namespace osu.Game.Rulesets.Taiko.Objects.Drawables
-{
-    public class DrawableBarLineMajor : DrawableBarLine
-    {
-        /// <summary>
-        /// The vertical offset of the triangles from the line tracker.
-        /// </summary>
-        private const float triangle_offfset = 10f;
-
-        /// <summary>
-        /// The size of the triangles.
-        /// </summary>
-        private const float triangle_size = 20f;
-
-        private readonly Container triangleContainer;
-
-        public DrawableBarLineMajor(BarLine barLine)
-            : base(barLine)
-        {
-            AddInternal(triangleContainer = new Container
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                RelativeSizeAxes = Axes.Both,
-                Children = new[]
-                {
-                    new EquilateralTriangle
-                    {
-                        Name = "Top",
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.TopCentre,
-                        Position = new Vector2(0, -triangle_offfset),
-                        Size = new Vector2(-triangle_size),
-                        EdgeSmoothness = new Vector2(1),
-                    },
-                    new EquilateralTriangle
-                    {
-                        Name = "Bottom",
-                        Anchor = Anchor.BottomCentre,
-                        Origin = Anchor.TopCentre,
-                        Position = new Vector2(0, triangle_offfset),
-                        Size = new Vector2(triangle_size),
-                        EdgeSmoothness = new Vector2(1),
-                    }
-                }
-            });
-
-            Line.Alpha = 1f;
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            using (triangleContainer.BeginAbsoluteSequence(HitObject.StartTime))
-                triangleContainer.FadeOut(150);
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
index e6aacf34dc..9ed5480777 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         [BackgroundDependencyLoader]
         private void load()
         {
-            new BarLineGenerator<BarLine>(Beatmap).BarLines.ForEach(bar => Playfield.Add(bar.Major ? new DrawableBarLineMajor(bar) : new DrawableBarLine(bar)));
+            new BarLineGenerator<BarLine>(Beatmap).BarLines.ForEach(bar => Playfield.Add(new DrawableBarLine(bar)));
 
             FrameStableComponents.Add(scroller = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.Scroller), _ => Empty())
             {

From 44dd9a57a8718da214ea801b35b9aca941518cc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 13 Dec 2020 20:03:24 +0100
Subject: [PATCH 0212/3722] Add abstract hit object application test scene

---
 .../HitObjectApplicationTestScene.cs          | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/HitObjectApplicationTestScene.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/HitObjectApplicationTestScene.cs b/osu.Game.Rulesets.Taiko.Tests/HitObjectApplicationTestScene.cs
new file mode 100644
index 0000000000..8e1b01385a
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/HitObjectApplicationTestScene.cs
@@ -0,0 +1,53 @@
+// Copyright (c) ppy 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.Testing;
+using osu.Framework.Timing;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Taiko.Tests
+{
+    public abstract class HitObjectApplicationTestScene : OsuTestScene
+    {
+        [Cached(typeof(IScrollingInfo))]
+        private ScrollingTestContainer.TestScrollingInfo info = new ScrollingTestContainer.TestScrollingInfo
+        {
+            Direction = { Value = ScrollingDirection.Left },
+            TimeRange = { Value = 1000 },
+        };
+
+        private ScrollingHitObjectContainer hitObjectContainer;
+
+        [SetUpSteps]
+        public void SetUp()
+            => AddStep("create SHOC", () => Child = hitObjectContainer = new ScrollingHitObjectContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                Height = 200,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Clock = new FramedClock(new StopwatchClock())
+            });
+
+        protected void AddHitObject(Func<DrawableHitObject> hitObject)
+            => AddStep("add to SHOC", () => hitObjectContainer.Add(hitObject.Invoke()));
+
+        protected void RemoveHitObject(Func<DrawableHitObject> hitObject)
+            => AddStep("remove from SHOC", () => hitObjectContainer.Remove(hitObject.Invoke()));
+
+        protected TObject PrepareObject<TObject>(TObject hitObject)
+            where TObject : TaikoHitObject
+        {
+            hitObject.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+            return hitObject;
+        }
+    }
+}

From c103c3691f53364298b517691739a19200ba915f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 13 Dec 2020 20:09:44 +0100
Subject: [PATCH 0213/3722] Add test for bar line application

---
 .../TestBarLineApplication.cs                 | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/TestBarLineApplication.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestBarLineApplication.cs b/osu.Game.Rulesets.Taiko.Tests/TestBarLineApplication.cs
new file mode 100644
index 0000000000..3e5a956d64
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/TestBarLineApplication.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 NUnit.Framework;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Taiko.Tests
+{
+    public class TestBarLineApplication : HitObjectApplicationTestScene
+    {
+        [Test]
+        public void TestApplyNewBarLine()
+        {
+            DrawableBarLine barLine = null;
+
+            AddHitObject(() => barLine = new DrawableBarLine(PrepareObject(new BarLine
+            {
+                StartTime = 400,
+                Major = true
+            })));
+
+            RemoveHitObject(() => barLine);
+
+            AddStep("apply new bar line", () => barLine.Apply(PrepareObject(new BarLine
+            {
+                StartTime = 200,
+                Major = false
+            }), null));
+
+            AddHitObject(() => barLine);
+        }
+    }
+}

From ea09cbddc6944a612e81b29a1236b02081c3d1c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 13 Dec 2020 20:12:54 +0100
Subject: [PATCH 0214/3722] Register bar line pool & use in drawable ruleset

---
 osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs     | 2 +-
 osu.Game.Rulesets.Taiko/UI/BarLinePlayfield.cs     | 8 ++++++++
 osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
index 18ee903977..7695ca067b 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
@@ -151,7 +151,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
                 Major = major
             };
 
-            DrawableRuleset.Playfield.Add(new DrawableBarLine(bl));
+            DrawableRuleset.Playfield.Add(bl);
         }
 
         private void addSwell(double duration = default_duration)
diff --git a/osu.Game.Rulesets.Taiko/UI/BarLinePlayfield.cs b/osu.Game.Rulesets.Taiko/UI/BarLinePlayfield.cs
index 83d0a17e09..cb878e8ea0 100644
--- a/osu.Game.Rulesets.Taiko/UI/BarLinePlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/BarLinePlayfield.cs
@@ -1,11 +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.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
 
 namespace osu.Game.Rulesets.Taiko.UI
 {
     public class BarLinePlayfield : ScrollingPlayfield
     {
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            RegisterPool<BarLine, DrawableBarLine>(15);
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
index 9ed5480777..bbf8cb8de0 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         [BackgroundDependencyLoader]
         private void load()
         {
-            new BarLineGenerator<BarLine>(Beatmap).BarLines.ForEach(bar => Playfield.Add(new DrawableBarLine(bar)));
+            new BarLineGenerator<BarLine>(Beatmap).BarLines.ForEach(bar => Playfield.Add(bar));
 
             FrameStableComponents.Add(scroller = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.Scroller), _ => Empty())
             {

From d275418b2598c14f5a217cf96ec45887ad4b7409 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 13 Dec 2020 23:17:26 +0100
Subject: [PATCH 0215/3722] Rename and simplify test

---
 .../HitObjectApplicationTestScene.cs               |  9 ++++-----
 ...plication.cs => TestSceneBarLineApplication.cs} | 14 ++++++--------
 2 files changed, 10 insertions(+), 13 deletions(-)
 rename osu.Game.Rulesets.Taiko.Tests/{TestBarLineApplication.cs => TestSceneBarLineApplication.cs} (68%)

diff --git a/osu.Game.Rulesets.Taiko.Tests/HitObjectApplicationTestScene.cs b/osu.Game.Rulesets.Taiko.Tests/HitObjectApplicationTestScene.cs
index 8e1b01385a..07c7b4d1db 100644
--- a/osu.Game.Rulesets.Taiko.Tests/HitObjectApplicationTestScene.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/HitObjectApplicationTestScene.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
@@ -37,11 +36,11 @@ namespace osu.Game.Rulesets.Taiko.Tests
                 Clock = new FramedClock(new StopwatchClock())
             });
 
-        protected void AddHitObject(Func<DrawableHitObject> hitObject)
-            => AddStep("add to SHOC", () => hitObjectContainer.Add(hitObject.Invoke()));
+        protected void AddHitObject(DrawableHitObject hitObject)
+            => AddStep("add to SHOC", () => hitObjectContainer.Add(hitObject));
 
-        protected void RemoveHitObject(Func<DrawableHitObject> hitObject)
-            => AddStep("remove from SHOC", () => hitObjectContainer.Remove(hitObject.Invoke()));
+        protected void RemoveHitObject(DrawableHitObject hitObject)
+            => AddStep("remove from SHOC", () => hitObjectContainer.Remove(hitObject));
 
         protected TObject PrepareObject<TObject>(TObject hitObject)
             where TObject : TaikoHitObject
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestBarLineApplication.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneBarLineApplication.cs
similarity index 68%
rename from osu.Game.Rulesets.Taiko.Tests/TestBarLineApplication.cs
rename to osu.Game.Rulesets.Taiko.Tests/TestSceneBarLineApplication.cs
index 3e5a956d64..65230a07bc 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestBarLineApplication.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneBarLineApplication.cs
@@ -7,28 +7,26 @@ using osu.Game.Rulesets.Taiko.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Taiko.Tests
 {
-    public class TestBarLineApplication : HitObjectApplicationTestScene
+    public class TestSceneBarLineApplication : HitObjectApplicationTestScene
     {
         [Test]
         public void TestApplyNewBarLine()
         {
-            DrawableBarLine barLine = null;
-
-            AddHitObject(() => barLine = new DrawableBarLine(PrepareObject(new BarLine
+            DrawableBarLine barLine = new DrawableBarLine(PrepareObject(new BarLine
             {
                 StartTime = 400,
                 Major = true
-            })));
+            }));
 
-            RemoveHitObject(() => barLine);
+            AddHitObject(barLine);
+            RemoveHitObject(barLine);
 
             AddStep("apply new bar line", () => barLine.Apply(PrepareObject(new BarLine
             {
                 StartTime = 200,
                 Major = false
             }), null));
-
-            AddHitObject(() => barLine);
+            AddHitObject(barLine);
         }
     }
 }

From 6b78045ff1b35b0d406d43494feda064d97a43ed Mon Sep 17 00:00:00 2001
From: Firmatorenio <smeshmunya@gmail.com>
Date: Mon, 14 Dec 2020 06:57:43 +0600
Subject: [PATCH 0216/3722] fix codefactor empty line complaint

---
 osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
index 7259bf293c..2f817a6c30 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
@@ -32,7 +32,6 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
         protected virtual void OnSkinChanged()
         {
-
         }
 
         /// <summary>

From 8da502da4405ad5658a702f67e8ad3eb71e24453 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 9 Dec 2020 17:46:36 +0900
Subject: [PATCH 0217/3722] Separate asymmetric CatchHitObject.X to EffectiveX
 and OriginalX

---
 .../Objects/CatchHitObject.cs                 | 25 +++++++++++--------
 .../Drawables/DrawableCatchHitObject.cs       |  4 +--
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index b86b3a7496..9fdd590464 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -16,23 +16,27 @@ namespace osu.Game.Rulesets.Catch.Objects
     {
         public const float OBJECT_RADIUS = 64;
 
-        // This value is after XOffset applied.
-        public readonly Bindable<float> XBindable = new Bindable<float>();
+        public readonly Bindable<float> OriginalXBindable = new Bindable<float>();
 
-        // This value is before XOffset applied.
-        private float originalX;
+        public float OriginalX
+        {
+            get => OriginalXBindable.Value;
+            set => OriginalXBindable.Value = value;
+        }
 
         /// <summary>
         /// The horizontal position of the fruit between 0 and <see cref="CatchPlayfield.WIDTH"/>.
         /// </summary>
         public float X
         {
-            // TODO: I don't like this asymmetry.
-            get => XBindable.Value;
-            // originalX is set by `XBindable.BindValueChanged`
-            set => XBindable.Value = value + xOffset;
+            get => EffectiveX;
+            set => OriginalXBindable.Value = value;
         }
 
+        public readonly Bindable<float> EffectiveXBindable = new Bindable<float>();
+
+        public float EffectiveX => EffectiveXBindable.Value;
+
         private float xOffset;
 
         /// <summary>
@@ -40,11 +44,10 @@ namespace osu.Game.Rulesets.Catch.Objects
         /// </summary>
         internal float XOffset
         {
-            get => xOffset;
             set
             {
                 xOffset = value;
-                XBindable.Value = originalX + xOffset;
+                EffectiveXBindable.Value = OriginalX + xOffset;
             }
         }
 
@@ -116,7 +119,7 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         protected CatchHitObject()
         {
-            XBindable.BindValueChanged(x => originalX = x.NewValue - xOffset);
+            OriginalXBindable.BindValueChanged(change => EffectiveXBindable.Value = change.NewValue + xOffset);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
index bfd124c691..131edb650f 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
@@ -38,14 +38,14 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         {
             base.OnApply();
 
-            XBindable.BindTo(HitObject.XBindable);
+            XBindable.BindTo(HitObject.EffectiveXBindable);
         }
 
         protected override void OnFree()
         {
             base.OnFree();
 
-            XBindable.UnbindFrom(HitObject.XBindable);
+            XBindable.UnbindFrom(HitObject.EffectiveXBindable);
         }
 
         public Func<CatchHitObject, bool> CheckPosition;

From c1f3f1c231c259ff4b494ce3bdcb3d11d3632469 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 9 Dec 2020 17:47:17 +0900
Subject: [PATCH 0218/3722] Obsolete `X` getter

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

diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index 9fdd590464..a5c254f2f1 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.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;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
@@ -29,6 +30,7 @@ namespace osu.Game.Rulesets.Catch.Objects
         /// </summary>
         public float X
         {
+            [Obsolete("Use EffectiveX instead")]
             get => EffectiveX;
             set => OriginalXBindable.Value = value;
         }

From 96f3e0dad8243d221592d99ed39949488d829e6f Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 9 Dec 2020 17:58:53 +0900
Subject: [PATCH 0219/3722] Replace CatchHitObject.X usage to EffectiveX and
 OriginalX

---
 .../CatchBeatmapConversionTest.cs                |  2 +-
 .../TestSceneCatcherArea.cs                      |  2 +-
 .../Beatmaps/CatchBeatmapProcessor.cs            | 14 +++++++-------
 .../Preprocessing/CatchDifficultyHitObject.cs    |  4 ++--
 .../Objects/Drawables/DrawableCatchHitObject.cs  |  2 +-
 osu.Game.Rulesets.Catch/Objects/JuiceStream.cs   |  8 ++++----
 .../Replays/CatchAutoGenerator.cs                | 16 ++++++++--------
 osu.Game.Rulesets.Catch/UI/Catcher.cs            |  6 +++---
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs b/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
index 466cbdaf8d..33fdcdaf1e 100644
--- a/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
@@ -84,7 +84,7 @@ namespace osu.Game.Rulesets.Catch.Tests
 
         public float Position
         {
-            get => HitObject?.X ?? position;
+            get => HitObject?.EffectiveX ?? position;
             set => position = value;
         }
 
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
index 31c285ef22..5079e57e5e 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Catch.Tests
 
         private void attemptCatch(Fruit fruit)
         {
-            fruit.X += catcher.X;
+            fruit.OriginalX += catcher.X;
             fruit.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty
             {
                 CircleSize = circleSize
diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
index 00ce9ea8c2..fac5d03833 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
 
                     case JuiceStream juiceStream:
                         // Todo: BUG!! Stable used the last control point as the final position of the path, but it should use the computed path instead.
-                        lastPosition = juiceStream.X + juiceStream.Path.ControlPoints[^1].Position.Value.X;
+                        lastPosition = juiceStream.OriginalX + juiceStream.Path.ControlPoints[^1].Position.Value.X;
 
                         // Todo: BUG!! Stable attempted to use the end time of the stream, but referenced it too early in execution and used the start time instead.
                         lastStartTime = juiceStream.StartTime;
@@ -86,7 +86,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                             catchObject.XOffset = 0;
 
                             if (catchObject is TinyDroplet)
-                                catchObject.XOffset = Math.Clamp(rng.Next(-20, 20), -catchObject.X, CatchPlayfield.WIDTH - catchObject.X);
+                                catchObject.XOffset = Math.Clamp(rng.Next(-20, 20), -catchObject.OriginalX, CatchPlayfield.WIDTH - catchObject.OriginalX);
                             else if (catchObject is Droplet)
                                 rng.Next(); // osu!stable retrieved a random droplet rotation
                         }
@@ -100,7 +100,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
 
         private static void applyHardRockOffset(CatchHitObject hitObject, ref float? lastPosition, ref double lastStartTime, FastRandom rng)
         {
-            float offsetPosition = hitObject.X;
+            float offsetPosition = hitObject.OriginalX;
             double startTime = hitObject.StartTime;
 
             if (lastPosition == null)
@@ -126,7 +126,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
             if (positionDiff == 0)
             {
                 applyRandomOffset(ref offsetPosition, timeDiff / 4d, rng);
-                hitObject.XOffset = offsetPosition - hitObject.X;
+                hitObject.XOffset = offsetPosition - hitObject.OriginalX;
                 return;
             }
 
@@ -134,7 +134,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
             if (Math.Abs(positionDiff) < timeDiff / 3)
                 applyOffset(ref offsetPosition, positionDiff);
 
-            hitObject.XOffset = offsetPosition - hitObject.X;
+            hitObject.XOffset = offsetPosition - hitObject.OriginalX;
 
             lastPosition = offsetPosition;
             lastStartTime = startTime;
@@ -230,9 +230,9 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                 currentObject.HyperDashTarget = null;
                 currentObject.DistanceToHyperDash = 0;
 
-                int thisDirection = nextObject.X > currentObject.X ? 1 : -1;
+                int thisDirection = nextObject.EffectiveX > currentObject.EffectiveX ? 1 : -1;
                 double timeToNext = nextObject.StartTime - currentObject.StartTime - 1000f / 60f / 4; // 1/4th of a frame of grace time, taken from osu-stable
-                double distanceToNext = Math.Abs(nextObject.X - currentObject.X) - (lastDirection == thisDirection ? lastExcess : halfCatcherWidth);
+                double distanceToNext = Math.Abs(nextObject.EffectiveX - currentObject.EffectiveX) - (lastDirection == thisDirection ? lastExcess : halfCatcherWidth);
                 float distanceToHyper = (float)(timeToNext * Catcher.BASE_SPEED - distanceToNext);
 
                 if (distanceToHyper < 0)
diff --git a/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs b/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs
index dcd410e08f..d936ef97ac 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/Preprocessing/CatchDifficultyHitObject.cs
@@ -32,8 +32,8 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Preprocessing
             // We will scale everything by this factor, so we can assume a uniform CircleSize among beatmaps.
             var scalingFactor = normalized_hitobject_radius / halfCatcherWidth;
 
-            NormalizedPosition = BaseObject.X * scalingFactor;
-            LastNormalizedPosition = LastObject.X * scalingFactor;
+            NormalizedPosition = BaseObject.EffectiveX * scalingFactor;
+            LastNormalizedPosition = LastObject.EffectiveX * scalingFactor;
 
             // Every strain interval is hard capped at the equivalent of 375 BPM streaming speed as a safety measure
             StrainTime = Math.Max(40, DeltaTime);
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
index 131edb650f..c511ea5006 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
         protected override double InitialLifetimeOffset => HitObject.TimePreempt;
 
-        protected override float SamplePlaybackPosition => HitObject.X / CatchPlayfield.WIDTH;
+        protected override float SamplePlaybackPosition => HitObject.EffectiveX / CatchPlayfield.WIDTH;
 
         public int RandomSeed => HitObject?.RandomSeed ?? 0;
 
diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index d5819935ad..35fd58826e 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Rulesets.Catch.Objects
                             AddNested(new TinyDroplet
                             {
                                 StartTime = t + lastEvent.Value.Time,
-                                X = X + Path.PositionAt(
+                                X = OriginalX + Path.PositionAt(
                                     lastEvent.Value.PathProgress + (t / sinceLastTick) * (e.PathProgress - lastEvent.Value.PathProgress)).X,
                             });
                         }
@@ -93,7 +93,7 @@ namespace osu.Game.Rulesets.Catch.Objects
                         {
                             Samples = dropletSamples,
                             StartTime = e.Time,
-                            X = X + Path.PositionAt(e.PathProgress).X,
+                            X = OriginalX + Path.PositionAt(e.PathProgress).X,
                         });
                         break;
 
@@ -104,14 +104,14 @@ namespace osu.Game.Rulesets.Catch.Objects
                         {
                             Samples = this.GetNodeSamples(nodeIndex++),
                             StartTime = e.Time,
-                            X = X + Path.PositionAt(e.PathProgress).X,
+                            X = OriginalX + Path.PositionAt(e.PathProgress).X,
                         });
                         break;
                 }
             }
         }
 
-        public float EndX => X + this.CurvePositionAt(1).X;
+        public float EndX => OriginalX + this.CurvePositionAt(1).X;
 
         public double Duration
         {
diff --git a/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs b/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
index dfc81ee8d9..32e8ab5da7 100644
--- a/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
+++ b/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Catch.Replays
 
             void moveToNext(PalpableCatchHitObject h)
             {
-                float positionChange = Math.Abs(lastPosition - h.X);
+                float positionChange = Math.Abs(lastPosition - h.EffectiveX);
                 double timeAvailable = h.StartTime - lastTime;
 
                 // So we can either make it there without a dash or not.
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Catch.Replays
                 // todo: get correct catcher size, based on difficulty CS.
                 const float catcher_width_half = CatcherArea.CATCHER_SIZE * 0.3f * 0.5f;
 
-                if (lastPosition - catcher_width_half < h.X && lastPosition + catcher_width_half > h.X)
+                if (lastPosition - catcher_width_half < h.EffectiveX && lastPosition + catcher_width_half > h.EffectiveX)
                 {
                     // we are already in the correct range.
                     lastTime = h.StartTime;
@@ -66,12 +66,12 @@ namespace osu.Game.Rulesets.Catch.Replays
 
                 if (impossibleJump)
                 {
-                    addFrame(h.StartTime, h.X);
+                    addFrame(h.StartTime, h.EffectiveX);
                 }
                 else if (h.HyperDash)
                 {
                     addFrame(h.StartTime - timeAvailable, lastPosition);
-                    addFrame(h.StartTime, h.X);
+                    addFrame(h.StartTime, h.EffectiveX);
                 }
                 else if (dashRequired)
                 {
@@ -80,23 +80,23 @@ namespace osu.Game.Rulesets.Catch.Replays
                     double timeWeNeedToSave = timeAtNormalSpeed - timeAvailable;
                     double timeAtDashSpeed = timeWeNeedToSave / 2;
 
-                    float midPosition = (float)Interpolation.Lerp(lastPosition, h.X, (float)timeAtDashSpeed / timeAvailable);
+                    float midPosition = (float)Interpolation.Lerp(lastPosition, h.EffectiveX, (float)timeAtDashSpeed / timeAvailable);
 
                     // dash movement
                     addFrame(h.StartTime - timeAvailable + 1, lastPosition, true);
                     addFrame(h.StartTime - timeAvailable + timeAtDashSpeed, midPosition);
-                    addFrame(h.StartTime, h.X);
+                    addFrame(h.StartTime, h.EffectiveX);
                 }
                 else
                 {
                     double timeBefore = positionChange / movement_speed;
 
                     addFrame(h.StartTime - timeBefore, lastPosition);
-                    addFrame(h.StartTime, h.X);
+                    addFrame(h.StartTime, h.EffectiveX);
                 }
 
                 lastTime = h.StartTime;
-                lastPosition = h.X;
+                lastPosition = h.EffectiveX;
             }
 
             foreach (var obj in Beatmap.HitObjects)
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index f164c2655a..ed875e7002 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -216,7 +216,7 @@ namespace osu.Game.Rulesets.Catch.UI
             var halfCatchWidth = catchWidth * 0.5f;
 
             // this stuff wil disappear once we move fruit to non-relative coordinate space in the future.
-            var catchObjectPosition = fruit.X;
+            var catchObjectPosition = fruit.EffectiveX;
             var catcherPosition = Position.X;
 
             return catchObjectPosition >= catcherPosition - halfCatchWidth &&
@@ -250,10 +250,10 @@ namespace osu.Game.Rulesets.Catch.UI
             {
                 var target = hitObject.HyperDashTarget;
                 var timeDifference = target.StartTime - hitObject.StartTime;
-                double positionDifference = target.X - X;
+                double positionDifference = target.EffectiveX - X;
                 var velocity = positionDifference / Math.Max(1.0, timeDifference - 1000.0 / 60.0);
 
-                SetHyperDashState(Math.Abs(velocity), target.X);
+                SetHyperDashState(Math.Abs(velocity), target.EffectiveX);
             }
             else
                 SetHyperDashState();

From cd2db59900f8d8b7f79dea26bb9a035fb334f503 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 14 Dec 2020 11:05:26 +0900
Subject: [PATCH 0220/3722] XBindable -> EffectiveXBindable in catch DHO

---
 .../Objects/Drawables/DrawableCatchHitObject.cs             | 6 +++---
 .../Objects/Drawables/DrawablePalpableCatchHitObject.cs     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
index c511ea5006..edd607a443 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
     public abstract class DrawableCatchHitObject : DrawableHitObject<CatchHitObject>
     {
-        public readonly Bindable<float> XBindable = new Bindable<float>();
+        public readonly Bindable<float> EffectiveXBindable = new Bindable<float>();
 
         protected override double InitialLifetimeOffset => HitObject.TimePreempt;
 
@@ -38,14 +38,14 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         {
             base.OnApply();
 
-            XBindable.BindTo(HitObject.EffectiveXBindable);
+            EffectiveXBindable.BindTo(HitObject.EffectiveXBindable);
         }
 
         protected override void OnFree()
         {
             base.OnFree();
 
-            XBindable.UnbindFrom(HitObject.EffectiveXBindable);
+            EffectiveXBindable.UnbindFrom(HitObject.EffectiveXBindable);
         }
 
         public Func<CatchHitObject, bool> CheckPosition;
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
index 7df06bd92d..d3fa43c6b6 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         [BackgroundDependencyLoader]
         private void load()
         {
-            XBindable.BindValueChanged(x =>
+            EffectiveXBindable.BindValueChanged(x =>
             {
                 X = x.NewValue;
             }, true);

From 089f3bebf57f3be57c8a1b2e525681a62f8d095a Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 14 Dec 2020 11:15:49 +0900
Subject: [PATCH 0221/3722] Add doc comments to catch hit object X properties

---
 osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index a5c254f2f1..d40821c840 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -19,6 +19,12 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         public readonly Bindable<float> OriginalXBindable = new Bindable<float>();
 
+        /// <summary>
+        /// The horizontal position of the hit object between 0 and <see cref="CatchPlayfield.WIDTH"/>.
+        /// </summary>
+        /// <remarks>
+        /// This value is the original value specified in the beatmap, not affected by beatmap processing.
+        /// </remarks>
         public float OriginalX
         {
             get => OriginalXBindable.Value;
@@ -37,12 +43,15 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         public readonly Bindable<float> EffectiveXBindable = new Bindable<float>();
 
+        /// <summary>
+        /// The effective horizontal position of the hit object between 0 and <see cref="CatchPlayfield.WIDTH"/>.
+        /// </summary>
         public float EffectiveX => EffectiveXBindable.Value;
 
         private float xOffset;
 
         /// <summary>
-        /// A random offset applied to <see cref="X"/>, set by the <see cref="CatchBeatmapProcessor"/>.
+        /// A random offset applied to the horizontal value, set by the <see cref="CatchBeatmapProcessor"/>.
         /// </summary>
         internal float XOffset
         {

From 36529bdd1b103ea5c5284b70e1cfbf30eec19f2b Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 14 Dec 2020 11:25:09 +0900
Subject: [PATCH 0222/3722] Use OriginalX for CatchHitObject.X instead of
 EffectiveX

And explicitly implement IHasXPosition interface to prevent use of the X property.
It should be preferred for beatmap conversion purpose.
---
 osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index d40821c840..6a040efb91 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
@@ -31,14 +30,11 @@ namespace osu.Game.Rulesets.Catch.Objects
             set => OriginalXBindable.Value = value;
         }
 
-        /// <summary>
-        /// The horizontal position of the fruit between 0 and <see cref="CatchPlayfield.WIDTH"/>.
-        /// </summary>
+        float IHasXPosition.X => OriginalX;
+
         public float X
         {
-            [Obsolete("Use EffectiveX instead")]
-            get => EffectiveX;
-            set => OriginalXBindable.Value = value;
+            set => OriginalX = value;
         }
 
         public readonly Bindable<float> EffectiveXBindable = new Bindable<float>();

From f621d977fc413835f411e1dc8cc57d61505ca71e Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 14 Dec 2020 11:32:34 +0900
Subject: [PATCH 0223/3722] Add some more doc comment

---
 osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index 6a040efb91..e689d6a178 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -23,6 +23,7 @@ namespace osu.Game.Rulesets.Catch.Objects
         /// </summary>
         /// <remarks>
         /// This value is the original value specified in the beatmap, not affected by beatmap processing.
+        /// It should be used instead of <see cref="EffectiveX"/> when working on a beatmap, not a gameplay.
         /// </remarks>
         public float OriginalX
         {
@@ -32,6 +33,9 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         float IHasXPosition.X => OriginalX;
 
+        /// <summary>
+        /// An alias of <see cref="OriginalX"/> setter.
+        /// </summary>
         public float X
         {
             set => OriginalX = value;

From 7cbbd74df247626ae917f766bcc6f03cd5e37a27 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 14 Dec 2020 11:38:07 +0900
Subject: [PATCH 0224/3722] Remove X setter from CatchHitObject

---
 .../Mods/TestSceneCatchModRelax.cs            |  8 +++----
 .../TestSceneAutoJuiceStream.cs               |  2 +-
 .../TestSceneCatchModHidden.cs                |  2 +-
 .../TestSceneCatchStacker.cs                  |  2 +-
 .../TestSceneCatcher.cs                       | 22 +++++++++----------
 .../TestSceneCatcherArea.cs                   |  2 +-
 .../TestSceneDrawableHitObjects.cs            |  6 ++---
 .../TestSceneHyperDash.cs                     | 14 ++++++------
 .../TestSceneJuiceStream.cs                   |  4 ++--
 .../Beatmaps/CatchBeatmapConverter.cs         |  4 ++--
 .../Objects/CatchHitObject.cs                 |  8 -------
 .../Objects/JuiceStream.cs                    |  6 ++---
 12 files changed, 36 insertions(+), 44 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs
index c01aff0aa0..da4834aa73 100644
--- a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs
@@ -32,22 +32,22 @@ namespace osu.Game.Rulesets.Catch.Tests.Mods
                 {
                     new Fruit
                     {
-                        X = CatchPlayfield.CENTER_X,
+                        OriginalX = CatchPlayfield.CENTER_X,
                         StartTime = 0
                     },
                     new Fruit
                     {
-                        X = 0,
+                        OriginalX = 0,
                         StartTime = 1000
                     },
                     new Fruit
                     {
-                        X = CatchPlayfield.WIDTH,
+                        OriginalX = CatchPlayfield.WIDTH,
                         StartTime = 2000
                     },
                     new JuiceStream
                     {
-                        X = CatchPlayfield.CENTER_X,
+                        OriginalX = CatchPlayfield.CENTER_X,
                         StartTime = 3000,
                         Path = new SliderPath(PathType.Linear, new[] { Vector2.Zero, Vector2.UnitY * 200 })
                     }
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
index f552c3c27b..45cf5095f6 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Catch.Tests
 
                 beatmap.HitObjects.Add(new JuiceStream
                 {
-                    X = CatchPlayfield.CENTER_X - width / 2,
+                    OriginalX = CatchPlayfield.CENTER_X - width / 2,
                     Path = new SliderPath(PathType.Linear, new[]
                     {
                         Vector2.Zero,
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs
index f15da29993..6af9c88088 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                         {
                             StartTime = 1000,
                             Path = new SliderPath(PathType.Linear, new[] { Vector2.Zero, new Vector2(0, -192) }),
-                            X = CatchPlayfield.WIDTH / 2
+                            OriginalX = CatchPlayfield.WIDTH / 2
                         }
                     }
                 },
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchStacker.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchStacker.cs
index 1ff31697b8..d7835bd8c4 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchStacker.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchStacker.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             {
                 beatmap.HitObjects.Add(new Fruit
                 {
-                    X = (0.5f + i / 2048f * (i % 10 - 5)) * CatchPlayfield.WIDTH,
+                    OriginalX = (0.5f + i / 2048f * (i % 10 - 5)) * CatchPlayfield.WIDTH,
                     StartTime = i * 100,
                     NewCombo = i % 8 == 0
                 });
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index e8bb57cdf3..d57e8e027e 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             JudgementResult result2 = null;
             AddStep("catch hyper fruit", () =>
             {
-                attemptCatch(new Fruit { HyperDashTarget = new Fruit { X = 100 } }, out drawableObject1, out result1);
+                attemptCatch(new Fruit { HyperDashTarget = new Fruit { OriginalX = 100 } }, out drawableObject1, out result1);
             });
             AddStep("catch normal fruit", () =>
             {
@@ -107,14 +107,14 @@ namespace osu.Game.Rulesets.Catch.Tests
             var halfWidth = Catcher.CalculateCatchWidth(new BeatmapDifficulty { CircleSize = 0 }) / 2;
             AddStep("catch fruit", () =>
             {
-                attemptCatch(new Fruit { X = -halfWidth + 1 });
-                attemptCatch(new Fruit { X = halfWidth - 1 });
+                attemptCatch(new Fruit { OriginalX = -halfWidth + 1 });
+                attemptCatch(new Fruit { OriginalX = halfWidth - 1 });
             });
             checkPlate(2);
             AddStep("miss fruit", () =>
             {
-                attemptCatch(new Fruit { X = -halfWidth - 1 });
-                attemptCatch(new Fruit { X = halfWidth + 1 });
+                attemptCatch(new Fruit { OriginalX = -halfWidth - 1 });
+                attemptCatch(new Fruit { OriginalX = halfWidth + 1 });
             });
             checkPlate(2);
         }
@@ -122,7 +122,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         [Test]
         public void TestFruitChangesCatcherState()
         {
-            AddStep("miss fruit", () => attemptCatch(new Fruit { X = 100 }));
+            AddStep("miss fruit", () => attemptCatch(new Fruit { OriginalX = 100 }));
             checkState(CatcherAnimationState.Fail);
             AddStep("catch fruit", () => attemptCatch(new Fruit()));
             checkState(CatcherAnimationState.Idle);
@@ -135,7 +135,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             AddStep("catch hyper fruit", () => attemptCatch(new Fruit
             {
-                HyperDashTarget = new Fruit { X = 100 }
+                HyperDashTarget = new Fruit { OriginalX = 100 }
             }));
             checkHyperDash(true);
             AddStep("catch normal fruit", () => attemptCatch(new Fruit()));
@@ -147,10 +147,10 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             AddStep("catch hyper kiai fruit", () => attemptCatch(new TestKiaiFruit
             {
-                HyperDashTarget = new Fruit { X = 100 }
+                HyperDashTarget = new Fruit { OriginalX = 100 }
             }));
             AddStep("catch tiny droplet", () => attemptCatch(new TinyDroplet()));
-            AddStep("miss tiny droplet", () => attemptCatch(new TinyDroplet { X = 100 }));
+            AddStep("miss tiny droplet", () => attemptCatch(new TinyDroplet { OriginalX = 100 }));
             // catcher state and hyper dash state is preserved
             checkState(CatcherAnimationState.Kiai);
             checkHyperDash(true);
@@ -161,9 +161,9 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             AddStep("catch hyper kiai fruit", () => attemptCatch(new TestKiaiFruit
             {
-                HyperDashTarget = new Fruit { X = 100 }
+                HyperDashTarget = new Fruit { OriginalX = 100 }
             }));
-            AddStep("miss banana", () => attemptCatch(new Banana { X = 100 }));
+            AddStep("miss banana", () => attemptCatch(new Banana { OriginalX = 100 }));
             // catcher state is preserved but hyper dash state is reset
             checkState(CatcherAnimationState.Kiai);
             checkHyperDash(false);
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
index 5079e57e5e..423c3b7a13 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddStep("catch fruit", () => attemptCatch(new Fruit()));
             AddStep("catch fruit last in combo", () => attemptCatch(new Fruit { LastInCombo = true }));
             AddStep("catch kiai fruit", () => attemptCatch(new TestSceneCatcher.TestKiaiFruit()));
-            AddStep("miss last in combo", () => attemptCatch(new Fruit { X = 100, LastInCombo = true }));
+            AddStep("miss last in combo", () => attemptCatch(new Fruit { OriginalX = 100, LastInCombo = true }));
         }
 
         private void attemptCatch(Fruit fruit)
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs
index 3e4995482d..2db534e8c9 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs
@@ -105,7 +105,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             {
                 var fruit = new Fruit
                 {
-                    X = getXCoords(hit),
+                    OriginalX = getXCoords(hit),
                     LastInCombo = i % 4 == 0,
                     StartTime = playfieldTime + 800 + (200 * i)
                 };
@@ -122,7 +122,7 @@ namespace osu.Game.Rulesets.Catch.Tests
 
             var juice = new JuiceStream
             {
-                X = xCoords,
+                OriginalX = xCoords,
                 StartTime = playfieldTime + 1000,
                 Path = new SliderPath(PathType.Linear, new[]
                 {
@@ -145,7 +145,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             {
                 var banana = new Banana
                 {
-                    X = getXCoords(hit),
+                    OriginalX = getXCoords(hit),
                     LastInCombo = i % 4 == 0,
                     StartTime = playfieldTime + 800 + (200 * i)
                 };
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
index db09b2bc6b..67af3c4420 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
@@ -70,20 +70,20 @@ namespace osu.Game.Rulesets.Catch.Tests
             beatmap.ControlPointInfo.Add(0, new TimingControlPoint());
 
             // Should produce a hyper-dash (edge case test)
-            beatmap.HitObjects.Add(new Fruit { StartTime = 1816, X = 56, NewCombo = true });
-            beatmap.HitObjects.Add(new Fruit { StartTime = 2008, X = 308, NewCombo = true });
+            beatmap.HitObjects.Add(new Fruit { StartTime = 1816, OriginalX = 56, NewCombo = true });
+            beatmap.HitObjects.Add(new Fruit { StartTime = 2008, OriginalX = 308, NewCombo = true });
 
             double startTime = 3000;
 
             const float left_x = 0.02f * CatchPlayfield.WIDTH;
             const float right_x = 0.98f * CatchPlayfield.WIDTH;
 
-            createObjects(() => new Fruit { X = left_x });
+            createObjects(() => new Fruit { OriginalX = left_x });
             createObjects(() => new TestJuiceStream(right_x), 1);
             createObjects(() => new TestJuiceStream(left_x), 1);
-            createObjects(() => new Fruit { X = right_x });
-            createObjects(() => new Fruit { X = left_x });
-            createObjects(() => new Fruit { X = right_x });
+            createObjects(() => new Fruit { OriginalX = right_x });
+            createObjects(() => new Fruit { OriginalX = left_x });
+            createObjects(() => new Fruit { OriginalX = right_x });
             createObjects(() => new TestJuiceStream(left_x), 1);
 
             beatmap.ControlPointInfo.Add(startTime, new TimingControlPoint
@@ -121,7 +121,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             public TestJuiceStream(float x)
             {
-                X = x;
+                OriginalX = x;
 
                 Path = new SliderPath(new[]
                 {
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs
index 269e783899..dbcf382d62 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             {
                 new JuiceStream
                 {
-                    X = CatchPlayfield.CENTER_X,
+                    OriginalX = CatchPlayfield.CENTER_X,
                     Path = new SliderPath(PathType.Linear, new[]
                     {
                         Vector2.Zero,
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                 },
                 new Banana
                 {
-                    X = CatchPlayfield.CENTER_X,
+                    OriginalX = CatchPlayfield.CENTER_X,
                     StartTime = 1000,
                     NewCombo = true
                 }
diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
index 34964fc4ae..55e86a7be2 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                         Path = curveData.Path,
                         NodeSamples = curveData.NodeSamples,
                         RepeatCount = curveData.RepeatCount,
-                        X = positionData?.X ?? 0,
+                        OriginalX = positionData?.X ?? 0,
                         NewCombo = comboData?.NewCombo ?? false,
                         ComboOffset = comboData?.ComboOffset ?? 0,
                         LegacyLastTickOffset = (obj as IHasLegacyLastTickOffset)?.LegacyLastTickOffset ?? 0
@@ -59,7 +59,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                         Samples = obj.Samples,
                         NewCombo = comboData?.NewCombo ?? false,
                         ComboOffset = comboData?.ComboOffset ?? 0,
-                        X = positionData?.X ?? 0
+                        OriginalX = positionData?.X ?? 0
                     }.Yield();
             }
         }
diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index e689d6a178..ebbbd44960 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -33,14 +33,6 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         float IHasXPosition.X => OriginalX;
 
-        /// <summary>
-        /// An alias of <see cref="OriginalX"/> setter.
-        /// </summary>
-        public float X
-        {
-            set => OriginalX = value;
-        }
-
         public readonly Bindable<float> EffectiveXBindable = new Bindable<float>();
 
         /// <summary>
diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index 35fd58826e..bda0457c83 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Rulesets.Catch.Objects
                             AddNested(new TinyDroplet
                             {
                                 StartTime = t + lastEvent.Value.Time,
-                                X = OriginalX + Path.PositionAt(
+                                OriginalX = OriginalX + Path.PositionAt(
                                     lastEvent.Value.PathProgress + (t / sinceLastTick) * (e.PathProgress - lastEvent.Value.PathProgress)).X,
                             });
                         }
@@ -93,7 +93,7 @@ namespace osu.Game.Rulesets.Catch.Objects
                         {
                             Samples = dropletSamples,
                             StartTime = e.Time,
-                            X = OriginalX + Path.PositionAt(e.PathProgress).X,
+                            OriginalX = OriginalX + Path.PositionAt(e.PathProgress).X,
                         });
                         break;
 
@@ -104,7 +104,7 @@ namespace osu.Game.Rulesets.Catch.Objects
                         {
                             Samples = this.GetNodeSamples(nodeIndex++),
                             StartTime = e.Time,
-                            X = OriginalX + Path.PositionAt(e.PathProgress).X,
+                            OriginalX = OriginalX + Path.PositionAt(e.PathProgress).X,
                         });
                         break;
                 }

From 1794bfeddba4b8533d10f9854f06a0f5e9731cc7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 14 Dec 2020 13:07:55 +0900
Subject: [PATCH 0225/3722] Move offset into legacy mania judgement

---
 .../Legacy/LegacyManiaJudgementPiece.cs       | 84 +++++++++++++++++++
 .../Legacy/ManiaLegacySkinTransformer.cs      |  3 +-
 .../UI/DrawableManiaJudgement.cs              | 53 +++++-------
 osu.Game.Rulesets.Mania/UI/Stage.cs           |  8 +-
 .../UI/Scrolling/ScrollingPlayfield.cs        |  9 --
 5 files changed, 108 insertions(+), 49 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs

diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs
new file mode 100644
index 0000000000..464d754205
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Animations;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Skinning;
+using osuTK;
+
+namespace osu.Game.Rulesets.Mania.Skinning.Legacy
+{
+    public class LegacyManiaJudgementPiece : CompositeDrawable, IAnimatableJudgement
+    {
+        private readonly HitResult result;
+        private readonly Drawable animation;
+
+        public LegacyManiaJudgementPiece(HitResult result, Drawable animation)
+        {
+            this.result = result;
+            this.animation = animation;
+
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+
+            AutoSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(ISkinSource skin)
+        {
+            float? scorePosition = skin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.ScorePosition)?.Value;
+
+            if (scorePosition != null)
+                scorePosition -= Stage.HIT_TARGET_POSITION + 150;
+
+            Y = scorePosition ?? 0;
+
+            if (animation != null)
+                InternalChild = animation;
+        }
+
+        public void PlayAnimation()
+        {
+            if (animation == null)
+                return;
+
+            (animation as IFramedAnimation)?.GotoFrame(0);
+
+            switch (result)
+            {
+                case HitResult.None:
+                    break;
+
+                case HitResult.Miss:
+                    animation.ScaleTo(1.6f);
+                    animation.ScaleTo(1, 100, Easing.In);
+
+                    animation.MoveTo(Vector2.Zero);
+                    animation.MoveToOffset(new Vector2(0, 100), 800, Easing.InQuint);
+
+                    animation.RotateTo(0);
+                    animation.RotateTo(40, 800, Easing.InQuint);
+
+                    this.FadeOutFromOne(800);
+                    break;
+
+                default:
+                    animation.ScaleTo(0.8f);
+                    animation.ScaleTo(1, 250, Easing.OutElastic);
+
+                    animation.Delay(50).ScaleTo(0.75f, 250);
+
+                    this.Delay(50).FadeOut(200);
+                    break;
+            }
+        }
+
+        public Drawable GetAboveHitObjectsProxiedContent() => null;
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
index 89f639e2fe..7e2a8823b6 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
@@ -136,7 +136,8 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
             string filename = this.GetManiaSkinConfig<string>(hitresult_mapping[result])?.Value
                               ?? default_hitresult_skin_filenames[result];
 
-            return this.GetAnimation(filename, true, true);
+            var animation = this.GetAnimation(filename, true, true);
+            return animation == null ? null : new LegacyManiaJudgementPiece(result, animation);
         }
 
         public override SampleChannel GetSample(ISampleInfo sampleInfo)
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.cs
index a3dcd0e57f..34d972e60f 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaJudgement.cs
@@ -5,7 +5,6 @@ using osu.Framework.Graphics;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
-using osuTK;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
@@ -20,37 +19,6 @@ namespace osu.Game.Rulesets.Mania.UI
         {
         }
 
-        protected override void ApplyMissAnimations()
-        {
-            if (!(JudgementBody.Drawable is DefaultManiaJudgementPiece))
-            {
-                // this is temporary logic until mania's skin transformer returns IAnimatableJudgements
-                JudgementBody.ScaleTo(1.6f);
-                JudgementBody.ScaleTo(1, 100, Easing.In);
-
-                JudgementBody.MoveTo(Vector2.Zero);
-                JudgementBody.MoveToOffset(new Vector2(0, 100), 800, Easing.InQuint);
-
-                JudgementBody.RotateTo(0);
-                JudgementBody.RotateTo(40, 800, Easing.InQuint);
-                JudgementBody.FadeOutFromOne(800);
-
-                LifetimeEnd = JudgementBody.LatestTransformEndTime;
-            }
-
-            base.ApplyMissAnimations();
-        }
-
-        protected override void ApplyHitAnimations()
-        {
-            JudgementBody.ScaleTo(0.8f);
-            JudgementBody.ScaleTo(1, 250, Easing.OutElastic);
-
-            JudgementBody.Delay(50)
-                         .ScaleTo(0.75f, 250)
-                         .FadeOut(200);
-        }
-
         protected override Drawable CreateDefaultJudgement(HitResult result) => new DefaultManiaJudgementPiece(result);
 
         private class DefaultManiaJudgementPiece : DefaultJudgementPiece
@@ -66,6 +34,27 @@ namespace osu.Game.Rulesets.Mania.UI
 
                 JudgementText.Font = JudgementText.Font.With(size: 25);
             }
+
+            public override void PlayAnimation()
+            {
+                base.PlayAnimation();
+
+                switch (Result)
+                {
+                    case HitResult.None:
+                    case HitResult.Miss:
+                        break;
+
+                    default:
+                        this.ScaleTo(0.8f);
+                        this.ScaleTo(1, 250, Easing.OutElastic);
+
+                        this.Delay(50)
+                            .ScaleTo(0.75f, 250)
+                            .FadeOut(200);
+                        break;
+                }
+            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index d2f5e6902a..dc34bffab1 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -10,7 +10,6 @@ using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
-using osu.Game.Rulesets.Mania.Skinning;
 using osu.Game.Rulesets.Mania.UI.Components;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
@@ -107,6 +106,7 @@ namespace osu.Game.Rulesets.Mania.UI
                             Anchor = Anchor.TopCentre,
                             Origin = Anchor.Centre,
                             RelativeSizeAxes = Axes.Both,
+                            Y = HIT_TARGET_POSITION + 150
                         },
                         topLevelContainer = new Container { RelativeSizeAxes = Axes.Both }
                     }
@@ -181,12 +181,6 @@ namespace osu.Game.Rulesets.Mania.UI
             }));
         }
 
-        protected override void OnSkinChanged()
-        {
-            judgements.Y = CurrentSkin.GetManiaSkinConfig<float>(LegacyManiaSkinConfigurationLookups.ScorePosition)
-                                                   ?.Value ?? HIT_TARGET_POSITION + 150;
-        }
-
         protected override void Update()
         {
             // Due to masking differences, it is not possible to get the width of the columns container automatically
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
index 4f76198b9f..844a249769 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
@@ -20,20 +20,11 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
         [Resolved]
         protected IScrollingInfo ScrollingInfo { get; private set; }
-        protected ISkinSource CurrentSkin { get; private set; }
 
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin)
         {
             Direction.BindTo(ScrollingInfo.Direction);
-            CurrentSkin = skin;
-
-            skin.SourceChanged += OnSkinChanged;
-            OnSkinChanged();
-        }
-
-        protected virtual void OnSkinChanged()
-        {
         }
 
         /// <summary>

From 028909353c8dc5b027a05ae5fb995ee278db9ede Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 14 Dec 2020 13:15:52 +0900
Subject: [PATCH 0226/3722] Revert one more change

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

diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
index 844a249769..475300c483 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
         protected IScrollingInfo ScrollingInfo { get; private set; }
 
         [BackgroundDependencyLoader]
-        private void load(ISkinSource skin)
+        private void load()
         {
             Direction.BindTo(ScrollingInfo.Direction);
         }

From d96399ea42130f3727d0188aa1ec8a0855c0b4b7 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 14 Dec 2020 13:18:14 +0900
Subject: [PATCH 0227/3722] Revert "Remove X setter from CatchHitObject"

This reverts commit 7cbbd74d
---
 .../Mods/TestSceneCatchModRelax.cs            |  8 +++----
 .../TestSceneAutoJuiceStream.cs               |  2 +-
 .../TestSceneCatchModHidden.cs                |  2 +-
 .../TestSceneCatchStacker.cs                  |  2 +-
 .../TestSceneCatcher.cs                       | 22 +++++++++----------
 .../TestSceneCatcherArea.cs                   |  2 +-
 .../TestSceneDrawableHitObjects.cs            |  6 ++---
 .../TestSceneHyperDash.cs                     | 14 ++++++------
 .../TestSceneJuiceStream.cs                   |  4 ++--
 .../Beatmaps/CatchBeatmapConverter.cs         |  4 ++--
 .../Objects/CatchHitObject.cs                 |  8 +++++++
 .../Objects/JuiceStream.cs                    |  6 ++---
 12 files changed, 44 insertions(+), 36 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs
index da4834aa73..c01aff0aa0 100644
--- a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs
@@ -32,22 +32,22 @@ namespace osu.Game.Rulesets.Catch.Tests.Mods
                 {
                     new Fruit
                     {
-                        OriginalX = CatchPlayfield.CENTER_X,
+                        X = CatchPlayfield.CENTER_X,
                         StartTime = 0
                     },
                     new Fruit
                     {
-                        OriginalX = 0,
+                        X = 0,
                         StartTime = 1000
                     },
                     new Fruit
                     {
-                        OriginalX = CatchPlayfield.WIDTH,
+                        X = CatchPlayfield.WIDTH,
                         StartTime = 2000
                     },
                     new JuiceStream
                     {
-                        OriginalX = CatchPlayfield.CENTER_X,
+                        X = CatchPlayfield.CENTER_X,
                         StartTime = 3000,
                         Path = new SliderPath(PathType.Linear, new[] { Vector2.Zero, Vector2.UnitY * 200 })
                     }
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
index 45cf5095f6..f552c3c27b 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Catch.Tests
 
                 beatmap.HitObjects.Add(new JuiceStream
                 {
-                    OriginalX = CatchPlayfield.CENTER_X - width / 2,
+                    X = CatchPlayfield.CENTER_X - width / 2,
                     Path = new SliderPath(PathType.Linear, new[]
                     {
                         Vector2.Zero,
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs
index 6af9c88088..f15da29993 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                         {
                             StartTime = 1000,
                             Path = new SliderPath(PathType.Linear, new[] { Vector2.Zero, new Vector2(0, -192) }),
-                            OriginalX = CatchPlayfield.WIDTH / 2
+                            X = CatchPlayfield.WIDTH / 2
                         }
                     }
                 },
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchStacker.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchStacker.cs
index d7835bd8c4..1ff31697b8 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchStacker.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchStacker.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             {
                 beatmap.HitObjects.Add(new Fruit
                 {
-                    OriginalX = (0.5f + i / 2048f * (i % 10 - 5)) * CatchPlayfield.WIDTH,
+                    X = (0.5f + i / 2048f * (i % 10 - 5)) * CatchPlayfield.WIDTH,
                     StartTime = i * 100,
                     NewCombo = i % 8 == 0
                 });
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index d57e8e027e..e8bb57cdf3 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             JudgementResult result2 = null;
             AddStep("catch hyper fruit", () =>
             {
-                attemptCatch(new Fruit { HyperDashTarget = new Fruit { OriginalX = 100 } }, out drawableObject1, out result1);
+                attemptCatch(new Fruit { HyperDashTarget = new Fruit { X = 100 } }, out drawableObject1, out result1);
             });
             AddStep("catch normal fruit", () =>
             {
@@ -107,14 +107,14 @@ namespace osu.Game.Rulesets.Catch.Tests
             var halfWidth = Catcher.CalculateCatchWidth(new BeatmapDifficulty { CircleSize = 0 }) / 2;
             AddStep("catch fruit", () =>
             {
-                attemptCatch(new Fruit { OriginalX = -halfWidth + 1 });
-                attemptCatch(new Fruit { OriginalX = halfWidth - 1 });
+                attemptCatch(new Fruit { X = -halfWidth + 1 });
+                attemptCatch(new Fruit { X = halfWidth - 1 });
             });
             checkPlate(2);
             AddStep("miss fruit", () =>
             {
-                attemptCatch(new Fruit { OriginalX = -halfWidth - 1 });
-                attemptCatch(new Fruit { OriginalX = halfWidth + 1 });
+                attemptCatch(new Fruit { X = -halfWidth - 1 });
+                attemptCatch(new Fruit { X = halfWidth + 1 });
             });
             checkPlate(2);
         }
@@ -122,7 +122,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         [Test]
         public void TestFruitChangesCatcherState()
         {
-            AddStep("miss fruit", () => attemptCatch(new Fruit { OriginalX = 100 }));
+            AddStep("miss fruit", () => attemptCatch(new Fruit { X = 100 }));
             checkState(CatcherAnimationState.Fail);
             AddStep("catch fruit", () => attemptCatch(new Fruit()));
             checkState(CatcherAnimationState.Idle);
@@ -135,7 +135,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             AddStep("catch hyper fruit", () => attemptCatch(new Fruit
             {
-                HyperDashTarget = new Fruit { OriginalX = 100 }
+                HyperDashTarget = new Fruit { X = 100 }
             }));
             checkHyperDash(true);
             AddStep("catch normal fruit", () => attemptCatch(new Fruit()));
@@ -147,10 +147,10 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             AddStep("catch hyper kiai fruit", () => attemptCatch(new TestKiaiFruit
             {
-                HyperDashTarget = new Fruit { OriginalX = 100 }
+                HyperDashTarget = new Fruit { X = 100 }
             }));
             AddStep("catch tiny droplet", () => attemptCatch(new TinyDroplet()));
-            AddStep("miss tiny droplet", () => attemptCatch(new TinyDroplet { OriginalX = 100 }));
+            AddStep("miss tiny droplet", () => attemptCatch(new TinyDroplet { X = 100 }));
             // catcher state and hyper dash state is preserved
             checkState(CatcherAnimationState.Kiai);
             checkHyperDash(true);
@@ -161,9 +161,9 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             AddStep("catch hyper kiai fruit", () => attemptCatch(new TestKiaiFruit
             {
-                HyperDashTarget = new Fruit { OriginalX = 100 }
+                HyperDashTarget = new Fruit { X = 100 }
             }));
-            AddStep("miss banana", () => attemptCatch(new Banana { OriginalX = 100 }));
+            AddStep("miss banana", () => attemptCatch(new Banana { X = 100 }));
             // catcher state is preserved but hyper dash state is reset
             checkState(CatcherAnimationState.Kiai);
             checkHyperDash(false);
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
index 423c3b7a13..5079e57e5e 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddStep("catch fruit", () => attemptCatch(new Fruit()));
             AddStep("catch fruit last in combo", () => attemptCatch(new Fruit { LastInCombo = true }));
             AddStep("catch kiai fruit", () => attemptCatch(new TestSceneCatcher.TestKiaiFruit()));
-            AddStep("miss last in combo", () => attemptCatch(new Fruit { OriginalX = 100, LastInCombo = true }));
+            AddStep("miss last in combo", () => attemptCatch(new Fruit { X = 100, LastInCombo = true }));
         }
 
         private void attemptCatch(Fruit fruit)
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs
index 2db534e8c9..3e4995482d 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs
@@ -105,7 +105,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             {
                 var fruit = new Fruit
                 {
-                    OriginalX = getXCoords(hit),
+                    X = getXCoords(hit),
                     LastInCombo = i % 4 == 0,
                     StartTime = playfieldTime + 800 + (200 * i)
                 };
@@ -122,7 +122,7 @@ namespace osu.Game.Rulesets.Catch.Tests
 
             var juice = new JuiceStream
             {
-                OriginalX = xCoords,
+                X = xCoords,
                 StartTime = playfieldTime + 1000,
                 Path = new SliderPath(PathType.Linear, new[]
                 {
@@ -145,7 +145,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             {
                 var banana = new Banana
                 {
-                    OriginalX = getXCoords(hit),
+                    X = getXCoords(hit),
                     LastInCombo = i % 4 == 0,
                     StartTime = playfieldTime + 800 + (200 * i)
                 };
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
index 67af3c4420..db09b2bc6b 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
@@ -70,20 +70,20 @@ namespace osu.Game.Rulesets.Catch.Tests
             beatmap.ControlPointInfo.Add(0, new TimingControlPoint());
 
             // Should produce a hyper-dash (edge case test)
-            beatmap.HitObjects.Add(new Fruit { StartTime = 1816, OriginalX = 56, NewCombo = true });
-            beatmap.HitObjects.Add(new Fruit { StartTime = 2008, OriginalX = 308, NewCombo = true });
+            beatmap.HitObjects.Add(new Fruit { StartTime = 1816, X = 56, NewCombo = true });
+            beatmap.HitObjects.Add(new Fruit { StartTime = 2008, X = 308, NewCombo = true });
 
             double startTime = 3000;
 
             const float left_x = 0.02f * CatchPlayfield.WIDTH;
             const float right_x = 0.98f * CatchPlayfield.WIDTH;
 
-            createObjects(() => new Fruit { OriginalX = left_x });
+            createObjects(() => new Fruit { X = left_x });
             createObjects(() => new TestJuiceStream(right_x), 1);
             createObjects(() => new TestJuiceStream(left_x), 1);
-            createObjects(() => new Fruit { OriginalX = right_x });
-            createObjects(() => new Fruit { OriginalX = left_x });
-            createObjects(() => new Fruit { OriginalX = right_x });
+            createObjects(() => new Fruit { X = right_x });
+            createObjects(() => new Fruit { X = left_x });
+            createObjects(() => new Fruit { X = right_x });
             createObjects(() => new TestJuiceStream(left_x), 1);
 
             beatmap.ControlPointInfo.Add(startTime, new TimingControlPoint
@@ -121,7 +121,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             public TestJuiceStream(float x)
             {
-                OriginalX = x;
+                X = x;
 
                 Path = new SliderPath(new[]
                 {
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs
index dbcf382d62..269e783899 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             {
                 new JuiceStream
                 {
-                    OriginalX = CatchPlayfield.CENTER_X,
+                    X = CatchPlayfield.CENTER_X,
                     Path = new SliderPath(PathType.Linear, new[]
                     {
                         Vector2.Zero,
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                 },
                 new Banana
                 {
-                    OriginalX = CatchPlayfield.CENTER_X,
+                    X = CatchPlayfield.CENTER_X,
                     StartTime = 1000,
                     NewCombo = true
                 }
diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
index 55e86a7be2..34964fc4ae 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                         Path = curveData.Path,
                         NodeSamples = curveData.NodeSamples,
                         RepeatCount = curveData.RepeatCount,
-                        OriginalX = positionData?.X ?? 0,
+                        X = positionData?.X ?? 0,
                         NewCombo = comboData?.NewCombo ?? false,
                         ComboOffset = comboData?.ComboOffset ?? 0,
                         LegacyLastTickOffset = (obj as IHasLegacyLastTickOffset)?.LegacyLastTickOffset ?? 0
@@ -59,7 +59,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                         Samples = obj.Samples,
                         NewCombo = comboData?.NewCombo ?? false,
                         ComboOffset = comboData?.ComboOffset ?? 0,
-                        OriginalX = positionData?.X ?? 0
+                        X = positionData?.X ?? 0
                     }.Yield();
             }
         }
diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index ebbbd44960..e689d6a178 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -33,6 +33,14 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         float IHasXPosition.X => OriginalX;
 
+        /// <summary>
+        /// An alias of <see cref="OriginalX"/> setter.
+        /// </summary>
+        public float X
+        {
+            set => OriginalX = value;
+        }
+
         public readonly Bindable<float> EffectiveXBindable = new Bindable<float>();
 
         /// <summary>
diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index bda0457c83..35fd58826e 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Rulesets.Catch.Objects
                             AddNested(new TinyDroplet
                             {
                                 StartTime = t + lastEvent.Value.Time,
-                                OriginalX = OriginalX + Path.PositionAt(
+                                X = OriginalX + Path.PositionAt(
                                     lastEvent.Value.PathProgress + (t / sinceLastTick) * (e.PathProgress - lastEvent.Value.PathProgress)).X,
                             });
                         }
@@ -93,7 +93,7 @@ namespace osu.Game.Rulesets.Catch.Objects
                         {
                             Samples = dropletSamples,
                             StartTime = e.Time,
-                            OriginalX = OriginalX + Path.PositionAt(e.PathProgress).X,
+                            X = OriginalX + Path.PositionAt(e.PathProgress).X,
                         });
                         break;
 
@@ -104,7 +104,7 @@ namespace osu.Game.Rulesets.Catch.Objects
                         {
                             Samples = this.GetNodeSamples(nodeIndex++),
                             StartTime = e.Time,
-                            OriginalX = OriginalX + Path.PositionAt(e.PathProgress).X,
+                            X = OriginalX + Path.PositionAt(e.PathProgress).X,
                         });
                         break;
                 }

From 0ad256a7626c6aa28c97f64ecc9bc9a1940c2f87 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 14 Dec 2020 13:18:32 +0900
Subject: [PATCH 0228/3722] Fix comment

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

diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index e689d6a178..6267eca7de 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Catch.Objects
         private float xOffset;
 
         /// <summary>
-        /// A random offset applied to the horizontal value, set by the <see cref="CatchBeatmapProcessor"/>.
+        /// A random offset applied to the horizontal position, set by the <see cref="CatchBeatmapProcessor"/>.
         /// </summary>
         internal float XOffset
         {

From 2e88e283d84c0547fd2f8272be87de6ccd8375d2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 14 Dec 2020 13:20:51 +0900
Subject: [PATCH 0229/3722] Remove unused using

---
 osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
index 475300c483..2b75f93f9e 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
@@ -4,7 +4,6 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.UI.Scrolling

From 5b5e883904298074b80671e87e0b88eca883127c Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 14 Dec 2020 13:39:07 +0900
Subject: [PATCH 0230/3722] Remove EffectiveXBindable (setting Value was not
 handled)

And use orthogonal `OriginalXBindable` and `XOffsetBindable`.
---
 .../TestSceneCatcherArea.cs                   |  2 +-
 .../Objects/CatchHitObject.cs                 | 52 +++++++------------
 .../Drawables/DrawableCatchHitObject.cs       |  9 ++--
 .../DrawablePalpableCatchHitObject.cs         |  6 +--
 4 files changed, 29 insertions(+), 40 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
index 5079e57e5e..1cbfa6338e 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Catch.Tests
 
         private void attemptCatch(Fruit fruit)
         {
-            fruit.OriginalX += catcher.X;
+            fruit.X = fruit.OriginalX + catcher.X;
             fruit.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty
             {
                 CircleSize = circleSize
diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index 6267eca7de..ae45182960 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -4,7 +4,6 @@
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Rulesets.Catch.Beatmaps;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
@@ -21,46 +20,40 @@ namespace osu.Game.Rulesets.Catch.Objects
         /// <summary>
         /// The horizontal position of the hit object between 0 and <see cref="CatchPlayfield.WIDTH"/>.
         /// </summary>
-        /// <remarks>
-        /// This value is the original value specified in the beatmap, not affected by beatmap processing.
-        /// It should be used instead of <see cref="EffectiveX"/> when working on a beatmap, not a gameplay.
-        /// </remarks>
-        public float OriginalX
+        public float X
         {
-            get => OriginalXBindable.Value;
             set => OriginalXBindable.Value = value;
         }
 
-        float IHasXPosition.X => OriginalX;
+        float IHasXPosition.X => OriginalXBindable.Value;
+
+        public readonly Bindable<float> XOffsetBindable = new Bindable<float>();
 
         /// <summary>
-        /// An alias of <see cref="OriginalX"/> setter.
+        /// A random offset applied to the horizontal position, set by the beatmap processing.
         /// </summary>
-        public float X
+        public float XOffset
         {
-            set => OriginalX = value;
+            set => XOffsetBindable.Value = value;
         }
 
-        public readonly Bindable<float> EffectiveXBindable = new Bindable<float>();
+        /// <summary>
+        /// The horizontal position of the hit object between 0 and <see cref="CatchPlayfield.WIDTH"/>.
+        /// </summary>
+        /// <remarks>
+        /// This value is the original <see cref="X"/> value specified in the beatmap, not affected by the beatmap processing.
+        /// Use <see cref="EffectiveX"/> for a gameplay.
+        /// </remarks>
+        public float OriginalX => OriginalXBindable.Value;
 
         /// <summary>
         /// The effective horizontal position of the hit object between 0 and <see cref="CatchPlayfield.WIDTH"/>.
         /// </summary>
-        public float EffectiveX => EffectiveXBindable.Value;
-
-        private float xOffset;
-
-        /// <summary>
-        /// A random offset applied to the horizontal position, set by the <see cref="CatchBeatmapProcessor"/>.
-        /// </summary>
-        internal float XOffset
-        {
-            set
-            {
-                xOffset = value;
-                EffectiveXBindable.Value = OriginalX + xOffset;
-            }
-        }
+        /// <remarks>
+        /// This value is the original <see cref="X"/> value plus the offset applied by the beatmap processing.
+        /// Use <see cref="OriginalX"/> if a value not affected by the offset is desired.
+        /// </remarks>
+        public float EffectiveX => OriginalXBindable.Value + XOffsetBindable.Value;
 
         public double TimePreempt = 1000;
 
@@ -127,10 +120,5 @@ namespace osu.Game.Rulesets.Catch.Objects
         }
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
-
-        protected CatchHitObject()
-        {
-            OriginalXBindable.BindValueChanged(change => EffectiveXBindable.Value = change.NewValue + xOffset);
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
index edd607a443..0c065948ef 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
@@ -15,7 +15,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
     public abstract class DrawableCatchHitObject : DrawableHitObject<CatchHitObject>
     {
-        public readonly Bindable<float> EffectiveXBindable = new Bindable<float>();
+        public readonly Bindable<float> OriginalXBindable = new Bindable<float>();
+        public readonly Bindable<float> XOffsetBindable = new Bindable<float>();
 
         protected override double InitialLifetimeOffset => HitObject.TimePreempt;
 
@@ -38,14 +39,16 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         {
             base.OnApply();
 
-            EffectiveXBindable.BindTo(HitObject.EffectiveXBindable);
+            OriginalXBindable.BindTo(HitObject.OriginalXBindable);
+            XOffsetBindable.BindTo(HitObject.XOffsetBindable);
         }
 
         protected override void OnFree()
         {
             base.OnFree();
 
-            EffectiveXBindable.UnbindFrom(HitObject.EffectiveXBindable);
+            OriginalXBindable.UnbindFrom(HitObject.OriginalXBindable);
+            XOffsetBindable.UnbindFrom(HitObject.XOffsetBindable);
         }
 
         public Func<CatchHitObject, bool> CheckPosition;
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
index d3fa43c6b6..84af7922f9 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
@@ -55,10 +55,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         [BackgroundDependencyLoader]
         private void load()
         {
-            EffectiveXBindable.BindValueChanged(x =>
-            {
-                X = x.NewValue;
-            }, true);
+            OriginalXBindable.BindValueChanged(_ => X = OriginalXBindable.Value + XOffsetBindable.Value);
+            XOffsetBindable.BindValueChanged(_ => X = OriginalXBindable.Value + XOffsetBindable.Value, true);
 
             ScaleBindable.BindValueChanged(scale =>
             {

From b81dbfc1921dabe9b846d752c7b4ca2a2a347c6d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Dec 2020 13:56:46 +0900
Subject: [PATCH 0231/3722] Move shared implementation to a named function

---
 .../Objects/Drawables/DrawablePalpableCatchHitObject.cs  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
index 84af7922f9..27cd7ed2bc 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
@@ -55,8 +55,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         [BackgroundDependencyLoader]
         private void load()
         {
-            OriginalXBindable.BindValueChanged(_ => X = OriginalXBindable.Value + XOffsetBindable.Value);
-            XOffsetBindable.BindValueChanged(_ => X = OriginalXBindable.Value + XOffsetBindable.Value, true);
+            OriginalXBindable.BindValueChanged(updateXPosition);
+            XOffsetBindable.BindValueChanged(updateXPosition, true);
 
             ScaleBindable.BindValueChanged(scale =>
             {
@@ -67,6 +67,11 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
             IndexInBeatmap.BindValueChanged(_ => UpdateComboColour());
         }
 
+        private void updateXPosition(ValueChangedEvent<float> _)
+        {
+            X = OriginalXBindable.Value + XOffsetBindable.Value;
+        }
+
         protected override void OnApply()
         {
             base.OnApply();

From a835ca9612e29fa71d66c852a0e4f5401bd3a465 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 14 Dec 2020 14:20:43 +0900
Subject: [PATCH 0232/3722] Fix anchors/origins for legacy pieces

---
 .../Skinning/Legacy/LegacyManiaJudgementPiece.cs          | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs
index 464d754205..9684cbb167 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs
@@ -40,7 +40,13 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
             Y = scorePosition ?? 0;
 
             if (animation != null)
-                InternalChild = animation;
+            {
+                InternalChild = animation.With(d =>
+                {
+                    d.Anchor = Anchor.Centre;
+                    d.Origin = Anchor.Centre;
+                });
+            }
         }
 
         public void PlayAnimation()

From 0d7f53b0b9b8d83835ac16aaf32d032c15b68dc9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Dec 2020 14:21:21 +0900
Subject: [PATCH 0233/3722] Fix gameplay loading too fast the first time
 entering a beatmap

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

diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 729119fa36..f59b36bc42 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -189,7 +189,7 @@ namespace osu.Game.Screens.Play
 
             // after an initial delay, start the debounced load check.
             // this will continue to execute even after resuming back on restart.
-            Scheduler.Add(new ScheduledDelegate(pushWhenLoaded, 1800, 0));
+            Scheduler.Add(new ScheduledDelegate(pushWhenLoaded, Clock.CurrentTime + 1800, 0));
 
             showMuteWarningIfNeeded();
         }

From 704150306324135bbb6ba4957627619fa294548c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Dec 2020 15:34:32 +0900
Subject: [PATCH 0234/3722] Avoid intermediary delegate

---
 .../Objects/Drawables/DrawableBarLine.cs                  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs
index e7dd9a18c2..9e50faabc1 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs
@@ -111,13 +111,13 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            major.BindValueChanged(majorChanged => updateMajor(majorChanged.NewValue), true);
+            major.BindValueChanged(updateMajor);
         }
 
-        private void updateMajor(bool major)
+        private void updateMajor(ValueChangedEvent<bool> major)
         {
-            line.Alpha = major ? 1f : 0.75f;
-            triangleContainer.Alpha = major ? 1 : 0;
+            line.Alpha = major.NewValue ? 1f : 0.75f;
+            triangleContainer.Alpha = major.NewValue ? 1 : 0;
         }
 
         protected override void OnApply()

From 51e8a05f181de7f34ef7b2f4290a3693069119e9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Dec 2020 16:44:29 +0900
Subject: [PATCH 0235/3722] Seal SetRecordTarget method to simplify
 modification

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

diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index c1a601eaae..b66a09aef1 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -268,7 +268,7 @@ namespace osu.Game.Rulesets.UI
             return false;
         }
 
-        public override void SetRecordTarget(Replay recordingReplay)
+        public sealed override void SetRecordTarget(Replay recordingReplay)
         {
             if (!(KeyBindingInputManager is IHasRecordingHandler recordingInputManager))
                 throw new InvalidOperationException($"A {nameof(KeyBindingInputManager)} which supports recording is not available");

From 1793385e96270a9b07050845b37b14fde04fe5c5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Dec 2020 16:52:14 +0900
Subject: [PATCH 0236/3722] Pass a score to the replay recorder to allow
 reading more general scoring data

---
 osu.Game.Rulesets.Catch/UI/CatchReplayRecorder.cs      |  4 ++--
 osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs     |  3 ++-
 osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs     |  3 ++-
 osu.Game.Rulesets.Mania/UI/ManiaReplayRecorder.cs      |  6 +++---
 osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs         |  3 ++-
 osu.Game.Rulesets.Osu/UI/OsuReplayRecorder.cs          |  6 +++---
 osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs     |  3 ++-
 osu.Game.Rulesets.Taiko/UI/TaikoReplayRecorder.cs      |  6 +++---
 .../Visual/Gameplay/TestSceneReplayRecorder.cs         |  5 +++--
 .../Visual/Gameplay/TestSceneReplayRecording.cs        |  5 +++--
 .../Visual/Gameplay/TestSceneSpectatorPlayback.cs      |  3 ++-
 osu.Game/Rulesets/UI/DrawableRuleset.cs                | 10 +++++-----
 osu.Game/Rulesets/UI/ReplayRecorder.cs                 | 10 +++++-----
 osu.Game/Screens/Play/Player.cs                        |  8 ++++----
 14 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatchReplayRecorder.cs b/osu.Game.Rulesets.Catch/UI/CatchReplayRecorder.cs
index 9a4d1f9585..1ddb5ac630 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchReplayRecorder.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchReplayRecorder.cs
@@ -2,10 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using osu.Game.Replays;
 using osu.Game.Rulesets.Catch.Replays;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.UI;
+using osu.Game.Scoring;
 using osuTK;
 
 namespace osu.Game.Rulesets.Catch.UI
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Catch.UI
     {
         private readonly CatchPlayfield playfield;
 
-        public CatchReplayRecorder(Replay target, CatchPlayfield playfield)
+        public CatchReplayRecorder(Score target, CatchPlayfield playfield)
             : base(target)
         {
             this.playfield = playfield;
diff --git a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
index 46733181e3..9389fa803b 100644
--- a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
@@ -13,6 +13,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Scoring;
 
 namespace osu.Game.Rulesets.Catch.UI
 {
@@ -31,7 +32,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
         protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new CatchFramedReplayInputHandler(replay);
 
-        protected override ReplayRecorder CreateReplayRecorder(Replay replay) => new CatchReplayRecorder(replay, (CatchPlayfield)Playfield);
+        protected override ReplayRecorder CreateReplayRecorder(Score score) => new CatchReplayRecorder(score, (CatchPlayfield)Playfield);
 
         protected override Playfield CreatePlayfield() => new CatchPlayfield(Beatmap.BeatmapInfo.BaseDifficulty, CreateDrawableRepresentation);
 
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 7f5b9a6ee0..941ac9816c 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -23,6 +23,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Scoring;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
@@ -132,6 +133,6 @@ namespace osu.Game.Rulesets.Mania.UI
 
         protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new ManiaFramedReplayInputHandler(replay);
 
-        protected override ReplayRecorder CreateReplayRecorder(Replay replay) => new ManiaReplayRecorder(replay);
+        protected override ReplayRecorder CreateReplayRecorder(Score score) => new ManiaReplayRecorder(score);
     }
 }
diff --git a/osu.Game.Rulesets.Mania/UI/ManiaReplayRecorder.cs b/osu.Game.Rulesets.Mania/UI/ManiaReplayRecorder.cs
index 18275000a2..b502d1f9e5 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaReplayRecorder.cs
+++ b/osu.Game.Rulesets.Mania/UI/ManiaReplayRecorder.cs
@@ -2,18 +2,18 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using osu.Game.Replays;
 using osu.Game.Rulesets.Mania.Replays;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.UI;
+using osu.Game.Scoring;
 using osuTK;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
     public class ManiaReplayRecorder : ReplayRecorder<ManiaAction>
     {
-        public ManiaReplayRecorder(Replay replay)
-            : base(replay)
+        public ManiaReplayRecorder(Score score)
+            : base(score)
         {
         }
 
diff --git a/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs b/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
index 69179137a6..df3f7c64e4 100644
--- a/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/UI/DrawableOsuRuleset.cs
@@ -14,6 +14,7 @@ using osu.Game.Rulesets.Osu.Configuration;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Replays;
 using osu.Game.Rulesets.UI;
+using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 using osuTK;
 
@@ -44,7 +45,7 @@ namespace osu.Game.Rulesets.Osu.UI
 
         protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new OsuFramedReplayInputHandler(replay);
 
-        protected override ReplayRecorder CreateReplayRecorder(Replay replay) => new OsuReplayRecorder(replay);
+        protected override ReplayRecorder CreateReplayRecorder(Score score) => new OsuReplayRecorder(score);
 
         public override double GameplayStartTime
         {
diff --git a/osu.Game.Rulesets.Osu/UI/OsuReplayRecorder.cs b/osu.Game.Rulesets.Osu/UI/OsuReplayRecorder.cs
index b68ea136d5..1304dfe416 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuReplayRecorder.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuReplayRecorder.cs
@@ -2,18 +2,18 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using osu.Game.Replays;
 using osu.Game.Rulesets.Osu.Replays;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.UI;
+using osu.Game.Scoring;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.UI
 {
     public class OsuReplayRecorder : ReplayRecorder<OsuAction>
     {
-        public OsuReplayRecorder(Replay replay)
-            : base(replay)
+        public OsuReplayRecorder(Score score)
+            : base(score)
         {
         }
 
diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
index bbf8cb8de0..9cf931ee0a 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
@@ -17,6 +17,7 @@ using osu.Game.Replays;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Scoring;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -82,6 +83,6 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new TaikoFramedReplayInputHandler(replay);
 
-        protected override ReplayRecorder CreateReplayRecorder(Replay replay) => new TaikoReplayRecorder(replay);
+        protected override ReplayRecorder CreateReplayRecorder(Score score) => new TaikoReplayRecorder(score);
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoReplayRecorder.cs b/osu.Game.Rulesets.Taiko/UI/TaikoReplayRecorder.cs
index 1859dabf03..e6391d1386 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoReplayRecorder.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoReplayRecorder.cs
@@ -2,18 +2,18 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using osu.Game.Replays;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Taiko.Replays;
 using osu.Game.Rulesets.UI;
+using osu.Game.Scoring;
 using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.UI
 {
     public class TaikoReplayRecorder : ReplayRecorder<TaikoAction>
     {
-        public TaikoReplayRecorder(Replay replay)
-            : base(replay)
+        public TaikoReplayRecorder(Score score)
+            : base(score)
         {
         }
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
index b72960931f..b2ad7ca5b4 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
@@ -19,6 +19,7 @@ using osu.Game.Replays;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.UI;
+using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Tests.Visual.UserInterface;
 using osuTK;
@@ -53,7 +54,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     {
                         recordingManager = new TestRulesetInputManager(new TestSceneModSettings.TestRulesetInfo(), 0, SimultaneousBindingMode.Unique)
                         {
-                            Recorder = recorder = new TestReplayRecorder(replay)
+                            Recorder = recorder = new TestReplayRecorder(new Score { Replay = replay })
                             {
                                 ScreenSpaceToGamefield = pos => recordingManager.ToLocalSpace(pos),
                             },
@@ -271,7 +272,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         internal class TestReplayRecorder : ReplayRecorder<TestAction>
         {
-            public TestReplayRecorder(Replay target)
+            public TestReplayRecorder(Score target)
                 : base(target)
             {
             }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecording.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecording.cs
index 6872b6a669..40c4214749 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecording.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecording.cs
@@ -15,6 +15,7 @@ using osu.Game.Replays;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.UI;
+using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Tests.Visual.UserInterface;
 using osuTK;
@@ -44,7 +45,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     {
                         recordingManager = new TestRulesetInputManager(new TestSceneModSettings.TestRulesetInfo(), 0, SimultaneousBindingMode.Unique)
                         {
-                            Recorder = new TestReplayRecorder(replay)
+                            Recorder = new TestReplayRecorder(new Score { Replay = replay })
                             {
                                 ScreenSpaceToGamefield = pos => recordingManager.ToLocalSpace(pos)
                             },
@@ -206,7 +207,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
     internal class TestReplayRecorder : ReplayRecorder<TestAction>
     {
-        public TestReplayRecorder(Replay target)
+        public TestReplayRecorder(Score target)
             : base(target)
         {
         }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
index 35473ee76c..e148fa381c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
@@ -27,6 +27,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Replays.Types;
 using osu.Game.Rulesets.UI;
+using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Tests.Visual.UserInterface;
 using osuTK;
@@ -348,7 +349,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         internal class TestReplayRecorder : ReplayRecorder<TestAction>
         {
             public TestReplayRecorder()
-                : base(new Replay())
+                : base(new Score())
             {
             }
 
diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index b66a09aef1..6940e43e5b 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -268,12 +268,12 @@ namespace osu.Game.Rulesets.UI
             return false;
         }
 
-        public sealed override void SetRecordTarget(Replay recordingReplay)
+        public sealed override void SetRecordTarget(Score score)
         {
             if (!(KeyBindingInputManager is IHasRecordingHandler recordingInputManager))
                 throw new InvalidOperationException($"A {nameof(KeyBindingInputManager)} which supports recording is not available");
 
-            var recorder = CreateReplayRecorder(recordingReplay);
+            var recorder = CreateReplayRecorder(score);
 
             if (recorder == null)
                 return;
@@ -327,7 +327,7 @@ namespace osu.Game.Rulesets.UI
 
         protected virtual ReplayInputHandler CreateReplayInputHandler(Replay replay) => null;
 
-        protected virtual ReplayRecorder CreateReplayRecorder(Replay replay) => null;
+        protected virtual ReplayRecorder CreateReplayRecorder(Score score) => null;
 
         /// <summary>
         /// Creates a Playfield.
@@ -516,8 +516,8 @@ namespace osu.Game.Rulesets.UI
         /// <summary>
         /// Sets a replay to be used to record gameplay.
         /// </summary>
-        /// <param name="recordingReplay">The target to be recorded to.</param>
-        public abstract void SetRecordTarget(Replay recordingReplay);
+        /// <param name="score">The target to be recorded to.</param>
+        public abstract void SetRecordTarget(Score score);
 
         /// <summary>
         /// Invoked when the interactive user requests resuming from a paused state.
diff --git a/osu.Game/Rulesets/UI/ReplayRecorder.cs b/osu.Game/Rulesets/UI/ReplayRecorder.cs
index 1438ebd37a..2918a3b445 100644
--- a/osu.Game/Rulesets/UI/ReplayRecorder.cs
+++ b/osu.Game/Rulesets/UI/ReplayRecorder.cs
@@ -10,8 +10,8 @@ using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Online.Spectator;
-using osu.Game.Replays;
 using osu.Game.Rulesets.Replays;
+using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 using osuTK;
 
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.UI
     public abstract class ReplayRecorder<T> : ReplayRecorder, IKeyBindingHandler<T>
         where T : struct
     {
-        private readonly Replay target;
+        private readonly Score target;
 
         private readonly List<T> pressedActions = new List<T>();
 
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.UI
         [Resolved]
         private GameplayBeatmap gameplayBeatmap { get; set; }
 
-        protected ReplayRecorder(Replay target)
+        protected ReplayRecorder(Score target)
         {
             this.target = target;
 
@@ -79,7 +79,7 @@ namespace osu.Game.Rulesets.UI
 
         private void recordFrame(bool important)
         {
-            var last = target.Frames.LastOrDefault();
+            var last = target.Replay.Frames.LastOrDefault();
 
             if (!important && last != null && Time.Current - last.Time < (1000d / RecordFrameRate))
                 return;
@@ -90,7 +90,7 @@ namespace osu.Game.Rulesets.UI
 
             if (frame != null)
             {
-                target.Frames.Add(frame);
+                target.Replay.Frames.Add(frame);
 
                 spectatorStreaming?.HandleFrame(frame);
             }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 7979b635aa..f7491ddfba 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -157,14 +157,14 @@ namespace osu.Game.Screens.Play
                 PrepareReplay();
         }
 
-        private Replay recordingReplay;
+        private Score recordingScore;
 
         /// <summary>
         /// Run any recording / playback setup for replays.
         /// </summary>
         protected virtual void PrepareReplay()
         {
-            DrawableRuleset.SetRecordTarget(recordingReplay = new Replay());
+            DrawableRuleset.SetRecordTarget(recordingScore = new Score { Replay = new Replay() });
         }
 
         [BackgroundDependencyLoader(true)]
@@ -758,9 +758,9 @@ namespace osu.Game.Screens.Play
 
             var score = new Score { ScoreInfo = CreateScore() };
 
-            if (recordingReplay?.Frames.Count > 0)
+            if (recordingScore?.Replay.Frames.Count > 0)
             {
-                score.Replay = recordingReplay;
+                score.Replay = recordingScore.Replay;
 
                 using (var stream = new MemoryStream())
                 {

From 64a2526678c07acd9b568ae11ff682f197306717 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Dec 2020 17:33:23 +0900
Subject: [PATCH 0237/3722] Add header class and basic flow for propagating
 data updates

---
 .../Visual/Gameplay/TestSceneSpectator.cs     |  3 +-
 osu.Game/Online/Spectator/FrameDataBundle.cs  |  8 ++++-
 osu.Game/Online/Spectator/FrameHeader.cs      | 35 +++++++++++++++++++
 .../Spectator/SpectatorStreamingClient.cs     | 12 +++++--
 osu.Game/Rulesets/UI/ReplayRecorder.cs        |  2 +-
 5 files changed, 55 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game/Online/Spectator/FrameHeader.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 72c6fd8d44..3e5b561a6f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -17,6 +17,7 @@ using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Replays;
 using osu.Game.Rulesets.UI;
+using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Tests.Beatmaps.IO;
 using osu.Game.Users;
@@ -272,7 +273,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     frames.Add(new LegacyReplayFrame(i * 100, RNG.Next(0, 512), RNG.Next(0, 512), buttonState));
                 }
 
-                var bundle = new FrameDataBundle(frames);
+                var bundle = new FrameDataBundle(new ScoreInfo(), frames);
                 ((ISpectatorClient)this).UserSentFrames(StreamingUser.Id, bundle);
 
                 if (!sentState)
diff --git a/osu.Game/Online/Spectator/FrameDataBundle.cs b/osu.Game/Online/Spectator/FrameDataBundle.cs
index 5281e61f9c..fecf88de22 100644
--- a/osu.Game/Online/Spectator/FrameDataBundle.cs
+++ b/osu.Game/Online/Spectator/FrameDataBundle.cs
@@ -1,20 +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.
 
+#nullable enable
+
 using System;
 using System.Collections.Generic;
 using osu.Game.Replays.Legacy;
+using osu.Game.Scoring;
 
 namespace osu.Game.Online.Spectator
 {
     [Serializable]
     public class FrameDataBundle
     {
+        public FrameHeader Header { get; set; }
+
         public IEnumerable<LegacyReplayFrame> Frames { get; set; }
 
-        public FrameDataBundle(IEnumerable<LegacyReplayFrame> frames)
+        public FrameDataBundle(ScoreInfo score, IEnumerable<LegacyReplayFrame> frames)
         {
             Frames = frames;
+            Header = new FrameHeader(score);
         }
     }
 }
diff --git a/osu.Game/Online/Spectator/FrameHeader.cs b/osu.Game/Online/Spectator/FrameHeader.cs
new file mode 100644
index 0000000000..0940eefa40
--- /dev/null
+++ b/osu.Game/Online/Spectator/FrameHeader.cs
@@ -0,0 +1,35 @@
+// Copyright (c) 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
+
+using System;
+using System.Collections.Generic;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
+
+namespace osu.Game.Online.Spectator
+{
+    [Serializable]
+    public class FrameHeader
+    {
+        public int Combo { get; set; }
+
+        public int MaxCombo { get; set; }
+
+        public Dictionary<HitResult, int> Statistics = new Dictionary<HitResult, int>();
+
+        /// <summary>
+        /// Construct header summary information from a point-in-time reference to a score which is actively being played.
+        /// </summary>
+        /// <param name="score">The score for reference.</param>
+        public FrameHeader(ScoreInfo score)
+        {
+            Combo = score.Combo;
+            MaxCombo = score.MaxCombo;
+
+            foreach (var kvp in score.Statistics)
+                Statistics[kvp.Key] = kvp.Value;
+        }
+    }
+}
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 08b524087a..0167a5d025 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -21,6 +21,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Replays.Types;
+using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 
 namespace osu.Game.Online.Spectator
@@ -52,6 +53,9 @@ namespace osu.Game.Online.Spectator
         [CanBeNull]
         private IBeatmap currentBeatmap;
 
+        [CanBeNull]
+        private Score currentScore;
+
         [Resolved]
         private IBindable<RulesetInfo> currentRuleset { get; set; }
 
@@ -203,7 +207,7 @@ namespace osu.Game.Online.Spectator
             return Task.CompletedTask;
         }
 
-        public void BeginPlaying(GameplayBeatmap beatmap)
+        public void BeginPlaying(GameplayBeatmap beatmap, Score score)
         {
             if (isPlaying)
                 throw new InvalidOperationException($"Cannot invoke {nameof(BeginPlaying)} when already playing");
@@ -216,6 +220,8 @@ namespace osu.Game.Online.Spectator
             currentState.Mods = currentMods.Value.Select(m => new APIMod(m));
 
             currentBeatmap = beatmap.PlayableBeatmap;
+            currentScore = score;
+
             beginPlaying();
         }
 
@@ -308,7 +314,9 @@ namespace osu.Game.Online.Spectator
 
             pendingFrames.Clear();
 
-            SendFrames(new FrameDataBundle(frames));
+            Debug.Assert(currentScore != null);
+
+            SendFrames(new FrameDataBundle(currentScore.ScoreInfo, frames));
 
             lastSendTime = Time.Current;
         }
diff --git a/osu.Game/Rulesets/UI/ReplayRecorder.cs b/osu.Game/Rulesets/UI/ReplayRecorder.cs
index 2918a3b445..a4d46e3888 100644
--- a/osu.Game/Rulesets/UI/ReplayRecorder.cs
+++ b/osu.Game/Rulesets/UI/ReplayRecorder.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.UI
 
             inputManager = GetContainingInputManager();
 
-            spectatorStreaming?.BeginPlaying(gameplayBeatmap);
+            spectatorStreaming?.BeginPlaying(gameplayBeatmap, target);
         }
 
         protected override void Dispose(bool isDisposing)

From ae22f75406970fb5521ac70ad756ae378be59d92 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Dec 2020 17:33:33 +0900
Subject: [PATCH 0238/3722] Bind replay recording score to judgement changes

---
 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 f7491ddfba..f40a7ccda8 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -165,6 +165,8 @@ namespace osu.Game.Screens.Play
         protected virtual void PrepareReplay()
         {
             DrawableRuleset.SetRecordTarget(recordingScore = new Score { Replay = new Replay() });
+
+            ScoreProcessor.NewJudgement += result => ScoreProcessor.PopulateScore(recordingScore.ScoreInfo);
         }
 
         [BackgroundDependencyLoader(true)]

From 79768f0aa412f00fa6d8e45101038cd8417e2c78 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Dec 2020 17:52:38 +0900
Subject: [PATCH 0239/3722] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index eaedcb7bc3..2a08cb7867 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1212.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1214.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index b4c7dca12f..960959f367 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.1212.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1214.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
     <PackageReference Include="Sentry" Version="2.1.8" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 7542aded86..a5bcb91c74 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1212.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1214.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -88,7 +88,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.1212.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1214.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From f3e6c586f7765c2ade6bf446e0605f792ef49bf9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Dec 2020 17:59:04 +0900
Subject: [PATCH 0240/3722] Change waitForReady back to private implementation

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 6c32e2e94c..888fd8c803 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -268,7 +268,7 @@ namespace osu.Game
                 case LinkAction.OpenEditorTimestamp:
                 case LinkAction.JoinMultiplayerMatch:
                 case LinkAction.Spectate:
-                    WaitForReady(() => notifications, _ => notifications.Post(new SimpleNotification
+                    waitForReady(() => notifications, _ => notifications.Post(new SimpleNotification
                     {
                         Text = @"This link type is not yet supported!",
                         Icon = FontAwesome.Solid.LifeRing,
@@ -289,7 +289,7 @@ namespace osu.Game
             }
         });
 
-        public void OpenUrlExternally(string url) => WaitForReady(() => externalLinkOpener, _ =>
+        public void OpenUrlExternally(string url) => waitForReady(() => externalLinkOpener, _ =>
         {
             if (url.StartsWith('/'))
                 url = $"{API.Endpoint}{url}";
@@ -301,7 +301,7 @@ namespace osu.Game
         /// Open a specific channel in chat.
         /// </summary>
         /// <param name="channel">The channel to display.</param>
-        public void ShowChannel(string channel) => WaitForReady(() => channelManager, _ =>
+        public void ShowChannel(string channel) => waitForReady(() => channelManager, _ =>
         {
             try
             {
@@ -317,19 +317,19 @@ namespace osu.Game
         /// Show a beatmap set as an overlay.
         /// </summary>
         /// <param name="setId">The set to display.</param>
-        public void ShowBeatmapSet(int setId) => WaitForReady(() => beatmapSetOverlay, _ => beatmapSetOverlay.FetchAndShowBeatmapSet(setId));
+        public void ShowBeatmapSet(int setId) => waitForReady(() => beatmapSetOverlay, _ => beatmapSetOverlay.FetchAndShowBeatmapSet(setId));
 
         /// <summary>
         /// Show a user's profile as an overlay.
         /// </summary>
         /// <param name="userId">The user to display.</param>
-        public void ShowUser(int userId) => WaitForReady(() => userProfile, _ => userProfile.ShowUser(userId));
+        public void ShowUser(int userId) => waitForReady(() => userProfile, _ => userProfile.ShowUser(userId));
 
         /// <summary>
         /// Show a beatmap's set as an overlay, displaying the given beatmap.
         /// </summary>
         /// <param name="beatmapId">The beatmap to show.</param>
-        public void ShowBeatmap(int beatmapId) => WaitForReady(() => beatmapSetOverlay, _ => beatmapSetOverlay.FetchAndShowBeatmap(beatmapId));
+        public void ShowBeatmap(int beatmapId) => waitForReady(() => beatmapSetOverlay, _ => beatmapSetOverlay.FetchAndShowBeatmap(beatmapId));
 
         /// <summary>
         /// Present a beatmap at song select immediately.
@@ -430,7 +430,7 @@ namespace osu.Game
         public override Task Import(Stream stream, string filename)
         {
             var importTask = new Task(async () => await base.Import(stream, filename));
-            WaitForReady(() => this, _ => importTask.Start());
+            waitForReady(() => this, _ => importTask.Start());
             return importTask;
         }
 
@@ -491,13 +491,13 @@ namespace osu.Game
         /// <param name="retrieveInstance">A function to retrieve a (potentially not-yet-constructed) target instance.</param>
         /// <param name="action">The action to perform on the instance when load is confirmed.</param>
         /// <typeparam name="T">The type of the target instance.</typeparam>
-        protected void WaitForReady<T>(Func<T> retrieveInstance, Action<T> action)
+        private void waitForReady<T>(Func<T> retrieveInstance, Action<T> action)
             where T : Drawable
         {
             var instance = retrieveInstance();
 
             if (ScreenStack == null || ScreenStack.CurrentScreen is StartupScreen || instance?.IsLoaded != true)
-                Schedule(() => WaitForReady(retrieveInstance, action));
+                Schedule(() => waitForReady(retrieveInstance, action));
             else
                 action(instance);
         }

From c5112edd08b5fea1688bbc4e339536b725f8cd7e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Dec 2020 18:03:01 +0900
Subject: [PATCH 0241/3722] Add comment regarding the reasoning for
 encapsulating the task in another

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 888fd8c803..d67d790ce2 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -429,8 +429,11 @@ namespace osu.Game
 
         public override Task Import(Stream stream, string filename)
         {
+            // encapsulate task as we don't want to begin the import process until in a ready state.
             var importTask = new Task(async () => await base.Import(stream, filename));
+
             waitForReady(() => this, _ => importTask.Start());
+
             return importTask;
         }
 

From 7bf04808485e78ea96c85176dcfdf8e3360cc89b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Dec 2020 18:12:23 +0900
Subject: [PATCH 0242/3722] Tidy up android-side code quality

---
 osu.Android/OsuGameActivity.cs | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index eb9df24bf7..9798d669d6 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -38,27 +38,38 @@ namespace osu.Android
 
         protected override void OnNewIntent(Intent intent)
         {
-            if (intent.Action == Intent.ActionDefault && intent.Scheme == ContentResolver.SchemeContent)
+            switch (intent.Action)
             {
-                handleImportFromUri(intent.Data);
-            }
+                case Intent.ActionDefault:
+                    if (intent.Scheme == ContentResolver.SchemeContent)
+                        handleImportFromUri(intent.Data);
+                    break;
 
-            if (intent.Action == Intent.ActionSend)
-            {
-                var content = intent.ClipData.GetItemAt(0);
-                handleImportFromUri(content.Uri);
+                case Intent.ActionSend:
+                {
+                    var content = intent.ClipData?.GetItemAt(0);
+                    if (content != null)
+                        handleImportFromUri(content.Uri);
+                    break;
+                }
             }
         }
 
         private void handleImportFromUri(Uri uri)
         {
-            var cursor = ContentResolver.Query(uri, new[] { OpenableColumns.DisplayName }, null, null);
-            var filename_column = cursor.GetColumnIndex(OpenableColumns.DisplayName);
+            var cursor = ContentResolver?.Query(uri, new[] { OpenableColumns.DisplayName }, null, null);
+
+            if (cursor == null)
+                return;
+
             cursor.MoveToFirst();
 
+            var filenameColumn = cursor.GetColumnIndex(OpenableColumns.DisplayName);
+
             var stream = ContentResolver.OpenInputStream(uri);
+
             if (stream != null)
-                Task.Factory.StartNew(() => game.Import(stream, cursor.GetString(filename_column)), TaskCreationOptions.LongRunning);
+                Task.Factory.StartNew(() => game.Import(stream, cursor.GetString(filenameColumn)), TaskCreationOptions.LongRunning);
         }
     }
 }

From 38e0b4e64dd3fbf26b3e39364ef0d968f66c193f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Dec 2020 18:13:32 +0900
Subject: [PATCH 0243/3722] Remove unused using statements

---
 osu.Android/OsuGameAndroid.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Android/OsuGameAndroid.cs b/osu.Android/OsuGameAndroid.cs
index 57512012f9..21d6336b2c 100644
--- a/osu.Android/OsuGameAndroid.cs
+++ b/osu.Android/OsuGameAndroid.cs
@@ -2,8 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.IO;
-using System.Threading.Tasks;
 using Android.App;
 using Android.OS;
 using osu.Framework.Allocation;

From 0d9c1cb5d338fc77cbd13b1f1f27efe0450102c6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 14 Dec 2020 18:41:24 +0900
Subject: [PATCH 0244/3722] Fix issues with data serialisation

---
 osu.Game/Online/Spectator/FrameDataBundle.cs |  8 +++++++
 osu.Game/Online/Spectator/FrameHeader.cs     | 17 ++++++++++-----
 osu.Game/Online/Spectator/StatisticPair.cs   | 23 ++++++++++++++++++++
 3 files changed, 43 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game/Online/Spectator/StatisticPair.cs

diff --git a/osu.Game/Online/Spectator/FrameDataBundle.cs b/osu.Game/Online/Spectator/FrameDataBundle.cs
index fecf88de22..a8d0434324 100644
--- a/osu.Game/Online/Spectator/FrameDataBundle.cs
+++ b/osu.Game/Online/Spectator/FrameDataBundle.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Collections.Generic;
+using Newtonsoft.Json;
 using osu.Game.Replays.Legacy;
 using osu.Game.Scoring;
 
@@ -22,5 +23,12 @@ namespace osu.Game.Online.Spectator
             Frames = frames;
             Header = new FrameHeader(score);
         }
+
+        [JsonConstructor]
+        public FrameDataBundle(FrameHeader header, IEnumerable<LegacyReplayFrame> frames)
+        {
+            Header = header;
+            Frames = frames;
+        }
     }
 }
diff --git a/osu.Game/Online/Spectator/FrameHeader.cs b/osu.Game/Online/Spectator/FrameHeader.cs
index 0940eefa40..9b6cc615a4 100644
--- a/osu.Game/Online/Spectator/FrameHeader.cs
+++ b/osu.Game/Online/Spectator/FrameHeader.cs
@@ -4,8 +4,8 @@
 #nullable enable
 
 using System;
-using System.Collections.Generic;
-using osu.Game.Rulesets.Scoring;
+using System.Linq;
+using Newtonsoft.Json;
 using osu.Game.Scoring;
 
 namespace osu.Game.Online.Spectator
@@ -17,7 +17,7 @@ namespace osu.Game.Online.Spectator
 
         public int MaxCombo { get; set; }
 
-        public Dictionary<HitResult, int> Statistics = new Dictionary<HitResult, int>();
+        public StatisticPair[] Statistics { get; set; }
 
         /// <summary>
         /// Construct header summary information from a point-in-time reference to a score which is actively being played.
@@ -28,8 +28,15 @@ namespace osu.Game.Online.Spectator
             Combo = score.Combo;
             MaxCombo = score.MaxCombo;
 
-            foreach (var kvp in score.Statistics)
-                Statistics[kvp.Key] = kvp.Value;
+            Statistics = score.Statistics.Select(kvp => new StatisticPair(kvp.Key, kvp.Value)).ToArray();
+        }
+
+        [JsonConstructor]
+        public FrameHeader(int combo, int maxCombo, StatisticPair[] statistics)
+        {
+            Combo = combo;
+            MaxCombo = maxCombo;
+            Statistics = statistics;
         }
     }
 }
diff --git a/osu.Game/Online/Spectator/StatisticPair.cs b/osu.Game/Online/Spectator/StatisticPair.cs
new file mode 100644
index 0000000000..793143a64c
--- /dev/null
+++ b/osu.Game/Online/Spectator/StatisticPair.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.
+
+using System;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Online.Spectator
+{
+    [Serializable]
+    public struct StatisticPair
+    {
+        public HitResult Result;
+        public int Count;
+
+        public StatisticPair(HitResult result, int count)
+        {
+            Result = result;
+            Count = count;
+        }
+
+        public override string ToString() => $"{Result}=>{Count}";
+    }
+}

From 54827d4e96c82beec3d8eccd650b074623ee775d Mon Sep 17 00:00:00 2001
From: Xexxar <xexxar.xexxar@gmail.com>
Date: Mon, 14 Dec 2020 12:41:24 -0600
Subject: [PATCH 0245/3722] fixed low 50s count still penalizing high obj count
 maps

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

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index 60df173223..af7786c3fd 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -159,7 +159,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             // Scale the speed value with accuracy and OD
             speedValue *= (.95 + Math.Pow(Attributes.OverallDifficulty, 2) / 750) * Math.Pow(accuracy, (14.5 - Math.Max(Attributes.OverallDifficulty, 8)) / 2);
             // Scale the speed value with # of 50s to punish doubletapping.
-            speedValue *= Math.Pow(0.98, countMeh < totalHits / 500.0 ? 0.5 * countMeh : countMeh - totalHits / 500.0 * 0.5);
+            speedValue *= Math.Pow(0.98, countMeh < totalHits / 500.0 ? 0 : countMeh - totalHits / 500.0);
 
             return speedValue;
         }

From a323c5ce580bee6ed909ee3bb84adc5baf5a9efe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 20:01:28 +0100
Subject: [PATCH 0246/3722] Use most backwards-compatible overload for query

---
 osu.Android/OsuGameActivity.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index 9798d669d6..fe9b292389 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -57,7 +57,9 @@ namespace osu.Android
 
         private void handleImportFromUri(Uri uri)
         {
-            var cursor = ContentResolver?.Query(uri, new[] { OpenableColumns.DisplayName }, null, null);
+            // there are more performant overloads of this method, but this one is the most backwards-compatible
+            // (dates back to API 1).
+            var cursor = ContentResolver?.Query(uri, null, null, null, null);
 
             if (cursor == null)
                 return;

From 1f6e5f4d329934d06b5423481806e1fc8c78ddb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 20:11:53 +0100
Subject: [PATCH 0247/3722] Copy archive contents to memory stream

---
 osu.Android/OsuGameActivity.cs | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index fe9b292389..f531b79d92 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.IO;
 using System.Threading.Tasks;
 using Android.App;
 using Android.Content;
@@ -69,9 +70,21 @@ namespace osu.Android
             var filenameColumn = cursor.GetColumnIndex(OpenableColumns.DisplayName);
 
             var stream = ContentResolver.OpenInputStream(uri);
+            string filename = cursor.GetString(filenameColumn);
 
             if (stream != null)
-                Task.Factory.StartNew(() => game.Import(stream, cursor.GetString(filenameColumn)), TaskCreationOptions.LongRunning);
+                Task.Factory.StartNew(() => runImport(stream, filename), TaskCreationOptions.LongRunning);
+        }
+
+        private Task runImport(Stream stream, string filename)
+        {
+            // SharpCompress requires archive streams to be seekable, which the stream opened by
+            // OpenInputStream() seems to not necessarily be.
+            // copy to an arbitrary-access memory stream to be able to proceed with the import.
+            var copy = new MemoryStream();
+            stream.CopyTo(copy);
+
+            return game.Import(copy, filename);
         }
     }
 }

From 3e3be56e468d5bdf8d6a3042d7d21159d7b7e538 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 20:23:49 +0100
Subject: [PATCH 0248/3722] Touch up and clarify intent handling

---
 osu.Android/OsuGameActivity.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index f531b79d92..28c9433095 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.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.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
 using Android.App;
@@ -31,13 +32,18 @@ namespace osu.Android
 
             base.OnCreate(savedInstanceState);
 
-            OnNewIntent(Intent);
+            // OnNewIntent() only fires for an activity if it's *re-launched* while it's on top of the activity stack.
+            // on first launch we still have to fire manually.
+            // reference: https://developer.android.com/reference/android/app/Activity#onNewIntent(android.content.Intent)
+            handleIntent(Intent);
 
             Window.AddFlags(WindowManagerFlags.Fullscreen);
             Window.AddFlags(WindowManagerFlags.KeepScreenOn);
         }
 
-        protected override void OnNewIntent(Intent intent)
+        protected override void OnNewIntent(Intent intent) => handleIntent(intent);
+
+        private void handleIntent(Intent intent)
         {
             switch (intent.Action)
             {

From f9d7945a6f96b9b7bf19c301a251372e6c3bb681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 21:03:49 +0100
Subject: [PATCH 0249/3722] Remove non-functional replay import for now

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

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index 28c9433095..cf0179e2ac 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -16,7 +16,7 @@ using osu.Framework.Android;
 namespace osu.Android
 {
     [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false)]
-    [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataPathPatterns = new[] { ".*\\.osz", ".*\\.osk", ".*\\.osr" }, DataMimeType = "application/*")]
+    [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataPathPatterns = new[] { ".*\\.osz", ".*\\.osk" }, DataMimeType = "application/*")]
     public class OsuGameActivity : AndroidGameActivity
     {
         private OsuGameAndroid game;

From 5af1ac1b537bfce3b993692dbdff1e01a4de7278 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 21:46:02 +0100
Subject: [PATCH 0250/3722] Rename TaikoStrong{-> able}HitObject

---
 osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs | 2 +-
 osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs   | 2 +-
 osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs       | 2 +-
 .../Objects/Drawables/DrawableTaikoStrongHitObject.cs       | 6 +++---
 osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs                 | 2 +-
 osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs             | 2 +-
 osu.Game.Rulesets.Taiko/Objects/Hit.cs                      | 2 +-
 osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs    | 2 +-
 ...{TaikoStrongHitObject.cs => TaikoStrongableHitObject.cs} | 2 +-
 .../Skinning/Legacy/LegacyCirclePiece.cs                    | 2 +-
 osu.Game.Rulesets.Taiko/UI/HitExplosion.cs                  | 2 +-
 osu.Game.Rulesets.Taiko/UI/TaikoHitTarget.cs                | 6 +++---
 12 files changed, 16 insertions(+), 16 deletions(-)
 rename osu.Game.Rulesets.Taiko/Objects/{TaikoStrongHitObject.cs => TaikoStrongableHitObject.cs} (96%)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs b/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
index 126af1a6ad..3d77fb05db 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
                 IsCentre = (hitObject as Hit)?.Type == HitType.Centre,
                 IsDrumRoll = hitObject is DrumRoll,
                 IsSwell = hitObject is Swell,
-                IsStrong = (hitObject as TaikoStrongHitObject)?.IsStrong == true
+                IsStrong = (hitObject as TaikoStrongableHitObject)?.IsStrong == true
             };
         }
 
diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 78a0d1fdff..1214c594aa 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
                 converted.HitObjects = converted.HitObjects.GroupBy(t => t.StartTime).Select(x =>
                 {
                     TaikoHitObject first = x.First();
-                    if (x.Skip(1).Any() && first is TaikoStrongHitObject strong)
+                    if (x.Skip(1).Any() && first is TaikoStrongableHitObject strong)
                         strong.IsStrong = true;
                     return first;
                 }).ToList();
diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
index 7de920ca8c..3fbcee44af 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
@@ -96,7 +96,7 @@ namespace osu.Game.Rulesets.Taiko.Edit
             base.UpdateTernaryStates();
 
             selectionRimState.Value = GetStateFromSelection(EditorBeatmap.SelectedHitObjects.OfType<Hit>(), h => h.Type == HitType.Rim);
-            selectionStrongState.Value = GetStateFromSelection(EditorBeatmap.SelectedHitObjects.OfType<TaikoStrongHitObject>(), h => h.IsStrong);
+            selectionStrongState.Value = GetStateFromSelection(EditorBeatmap.SelectedHitObjects.OfType<TaikoStrongableHitObject>(), h => h.IsStrong);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs
index 04e584e15d..614c12165e 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs
@@ -13,7 +13,7 @@ using osuTK;
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
     public abstract class DrawableTaikoStrongHitObject<TObject, TStrongNestedObject> : DrawableTaikoHitObject<TObject>
-        where TObject : TaikoStrongHitObject
+        where TObject : TaikoStrongableHitObject
         where TStrongNestedObject : StrongNestedHitObject
     {
         private readonly Bindable<bool> isStrong;
@@ -68,7 +68,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         {
             base.RecreatePieces();
             if (HitObject.IsStrong)
-                Size = BaseSize = new Vector2(TaikoStrongHitObject.DEFAULT_STRONG_SIZE);
+                Size = BaseSize = new Vector2(TaikoStrongableHitObject.DEFAULT_STRONG_SIZE);
         }
 
         protected override void AddNestedHitObject(DrawableHitObject hitObject)
@@ -102,7 +102,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         /// <summary>
         /// Creates the handler for this <see cref="DrawableHitObject"/>'s <see cref="StrongNestedHitObject"/>.
-        /// This is only invoked if <see cref="TaikoStrongHitObject.IsStrong"/> is true for <see cref="HitObject"/>.
+        /// This is only invoked if <see cref="TaikoStrongableHitObject.IsStrong"/> is true for <see cref="HitObject"/>.
         /// </summary>
         /// <param name="hitObject">The strong hitobject.</param>
         /// <returns>The strong hitobject handler.</returns>
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
index 93f95d6446..c0377c67a5 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
@@ -15,7 +15,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
-    public class DrumRoll : TaikoStrongHitObject, IHasPath
+    public class DrumRoll : TaikoStrongableHitObject, IHasPath
     {
         /// <summary>
         /// Drum roll distance that results in a duration of 1 speed-adjusted beat length.
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
index 6b6ffa8668..9d0336441e 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
@@ -7,7 +7,7 @@ using osu.Game.Rulesets.Taiko.Judgements;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
-    public class DrumRollTick : TaikoStrongHitObject
+    public class DrumRollTick : TaikoStrongableHitObject
     {
         /// <summary>
         /// Whether this is the first (initial) tick of the slider.
diff --git a/osu.Game.Rulesets.Taiko/Objects/Hit.cs b/osu.Game.Rulesets.Taiko/Objects/Hit.cs
index 6bdde376f6..1b51288605 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Hit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Hit.cs
@@ -5,7 +5,7 @@ using osu.Framework.Bindables;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
-    public class Hit : TaikoStrongHitObject
+    public class Hit : TaikoStrongableHitObject
     {
         public readonly Bindable<HitType> TypeBindable = new Bindable<HitType>();
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs
index 2e8989bc79..3b427e48c5 100644
--- a/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/StrongNestedHitObject.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
 {
     /// <summary>
     /// Base type for nested strong hits.
-    /// Used by <see cref="TaikoStrongHitObject"/>s to represent their strong bonus scoring portions.
+    /// Used by <see cref="TaikoStrongableHitObject"/>s to represent their strong bonus scoring portions.
     /// </summary>
     public abstract class StrongNestedHitObject : TaikoHitObject
     {
diff --git a/osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/TaikoStrongableHitObject.cs
similarity index 96%
rename from osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.cs
rename to osu.Game.Rulesets.Taiko/Objects/TaikoStrongableHitObject.cs
index 861de95bae..fcd055bcec 100644
--- a/osu.Game.Rulesets.Taiko/Objects/TaikoStrongHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/TaikoStrongableHitObject.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
     /// <summary>
     /// Base class for taiko hitobjects that can become strong (large).
     /// </summary>
-    public abstract class TaikoStrongHitObject : TaikoHitObject
+    public abstract class TaikoStrongableHitObject : TaikoHitObject
     {
         /// <summary>
         /// Scale multiplier for a strong drawable taiko hit object.
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
index 52c9080633..2b6c14ca63 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyCirclePiece.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
                 const string normal_hit = "taikohit";
                 const string big_hit = "taikobig";
 
-                string prefix = ((drawableHitObject.HitObject as TaikoStrongHitObject)?.IsStrong ?? false) ? big_hit : normal_hit;
+                string prefix = ((drawableHitObject.HitObject as TaikoStrongableHitObject)?.IsStrong ?? false) ? big_hit : normal_hit;
 
                 return skin.GetAnimation($"{prefix}{lookup}", true, false) ??
                        // fallback to regular size if "big" version doesn't exist.
diff --git a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
index 05408e1049..d1fb3348b9 100644
--- a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         /// </summary>
         public void VisualiseSecondHit()
         {
-            this.ResizeTo(new Vector2(TaikoStrongHitObject.DEFAULT_STRONG_SIZE), 50);
+            this.ResizeTo(new Vector2(TaikoStrongableHitObject.DEFAULT_STRONG_SIZE), 50);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoHitTarget.cs b/osu.Game.Rulesets.Taiko/UI/TaikoHitTarget.cs
index 5d8145391d..6401c6d09f 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoHitTarget.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoHitTarget.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre,
                     RelativeSizeAxes = Axes.Y,
-                    Size = new Vector2(border_thickness, (1 - TaikoStrongHitObject.DEFAULT_STRONG_SIZE) / 2f),
+                    Size = new Vector2(border_thickness, (1 - TaikoStrongableHitObject.DEFAULT_STRONG_SIZE) / 2f),
                     Alpha = 0.1f
                 },
                 new CircularContainer
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     RelativeSizeAxes = Axes.Both,
-                    Size = new Vector2(TaikoStrongHitObject.DEFAULT_STRONG_SIZE),
+                    Size = new Vector2(TaikoStrongableHitObject.DEFAULT_STRONG_SIZE),
                     Masking = true,
                     BorderColour = Color4.White,
                     BorderThickness = border_thickness,
@@ -83,7 +83,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                     Anchor = Anchor.BottomCentre,
                     Origin = Anchor.BottomCentre,
                     RelativeSizeAxes = Axes.Y,
-                    Size = new Vector2(border_thickness, (1 - TaikoStrongHitObject.DEFAULT_STRONG_SIZE) / 2f),
+                    Size = new Vector2(border_thickness, (1 - TaikoStrongableHitObject.DEFAULT_STRONG_SIZE) / 2f),
                     Alpha = 0.1f
                 },
             };

From c5a218f7c96afe0551d4f083075e9edb924a9405 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 21:46:28 +0100
Subject: [PATCH 0251/3722] Add "strongable" to user dictionary

---
 osu.sln.DotSettings | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index 3ef419c572..22ea73858e 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -928,5 +928,6 @@ private void load()
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=ruleset/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=rulesets/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=ruleset_0027s/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Strongable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Taiko/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Unranked/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

From 512549b4ea796e4b8f7e026cc1d2ad58db43ef46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 21:47:31 +0100
Subject: [PATCH 0252/3722] Rename DrawableTaikoStrong{-> able}HitObject

---
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs | 2 +-
 .../Objects/Drawables/DrawableDrumRollTick.cs                 | 2 +-
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs      | 2 +-
 .../Objects/Drawables/DrawableStrongNestedHit.cs              | 2 +-
 ...StrongHitObject.cs => DrawableTaikoStrongableHitObject.cs} | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename osu.Game.Rulesets.Taiko/Objects/Drawables/{DrawableTaikoStrongHitObject.cs => DrawableTaikoStrongableHitObject.cs} (94%)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index 0c6d28472d..4925b6fdfc 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -19,7 +19,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
-    public class DrawableDrumRoll : DrawableTaikoStrongHitObject<DrumRoll, DrumRoll.StrongNestedHit>
+    public class DrawableDrumRoll : DrawableTaikoStrongableHitObject<DrumRoll, DrumRoll.StrongNestedHit>
     {
         /// <summary>
         /// Number of rolling hits required to reach the dark/final colour.
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
index c26e20f92c..c6761de5e3 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
@@ -9,7 +9,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
-    public class DrawableDrumRollTick : DrawableTaikoStrongHitObject<DrumRollTick, DrumRollTick.StrongNestedHit>
+    public class DrawableDrumRollTick : DrawableTaikoStrongableHitObject<DrumRollTick, DrumRollTick.StrongNestedHit>
     {
         /// <summary>
         /// The hit type corresponding to the <see cref="TaikoAction"/> that the user pressed to hit this <see cref="DrawableDrumRollTick"/>.
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index 31cb3d764d..431f2980ec 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -16,7 +16,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
-    public class DrawableHit : DrawableTaikoStrongHitObject<Hit, Hit.StrongNestedHit>
+    public class DrawableHit : DrawableTaikoStrongableHitObject<Hit, Hit.StrongNestedHit>
     {
         /// <summary>
         /// A list of keys which can result in hits for this HitObject.
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
index d735d258b3..d2e8888197 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
@@ -7,7 +7,7 @@ using osu.Game.Rulesets.Taiko.Judgements;
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
     /// <summary>
-    /// Used as a nested hitobject to provide <see cref="TaikoStrongJudgement"/>s for <see cref="DrawableTaikoStrongHitObject{TObject, TNested}"/>s.
+    /// Used as a nested hitobject to provide <see cref="TaikoStrongJudgement"/>s for <see cref="DrawableTaikoStrongableHitObject{TObject,TStrongNestedObject}"/>s.
     /// </summary>
     public abstract class DrawableStrongNestedHit : DrawableTaikoHitObject
     {
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs
similarity index 94%
rename from osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs
rename to osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs
index 614c12165e..af3e94d9c6 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs
@@ -12,7 +12,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 {
-    public abstract class DrawableTaikoStrongHitObject<TObject, TStrongNestedObject> : DrawableTaikoHitObject<TObject>
+    public abstract class DrawableTaikoStrongableHitObject<TObject, TStrongNestedObject> : DrawableTaikoHitObject<TObject>
         where TObject : TaikoStrongableHitObject
         where TStrongNestedObject : StrongNestedHitObject
     {
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         private readonly Container<DrawableStrongNestedHit> strongHitContainer;
 
-        protected DrawableTaikoStrongHitObject(TObject hitObject)
+        protected DrawableTaikoStrongableHitObject(TObject hitObject)
             : base(hitObject)
         {
             isStrong = HitObject.IsStrongBindable.GetBoundCopy();

From 2051f49f78c98e79214cee4d3f5ae8f185545bc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 21:58:13 +0100
Subject: [PATCH 0253/3722] Ensure correct initial state of taiko bar lines

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

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs
index 9e50faabc1..d653f01db6 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            major.BindValueChanged(updateMajor);
+            major.BindValueChanged(updateMajor, true);
         }
 
         private void updateMajor(ValueChangedEvent<bool> major)

From 523e8034407435b3d4b1beeaea4a24a457bc9918 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 15 Dec 2020 00:28:00 +0100
Subject: [PATCH 0254/3722] Fix swells crashing on rapid seeks in editor

---
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
index 5c6278ed08..229d581d0c 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
@@ -168,7 +168,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
                 foreach (var t in ticks)
                 {
-                    if (!t.IsHit)
+                    if (!t.Result.HasResult)
                     {
                         nextTick = t;
                         break;
@@ -208,7 +208,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                         continue;
                     }
 
-                    tick.TriggerResult(false);
+                    if (!tick.Result.HasResult)
+                        tick.TriggerResult(false);
                 }
 
                 ApplyResult(r => r.Type = numHits > HitObject.RequiredHits / 2 ? HitResult.Ok : r.Judgement.MinResult);

From cba4657021286be23f5c0d90a89f5dca0da7de80 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Dec 2020 12:37:41 +0900
Subject: [PATCH 0255/3722] Get handled file extensions from game itself,
 rather than duplicating locally

---
 osu.Game/Screens/Import/FileImportScreen.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
index e2e2b699f5..24a498e8cd 100644
--- a/osu.Game/Screens/Import/FileImportScreen.cs
+++ b/osu.Game/Screens/Import/FileImportScreen.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -36,7 +37,7 @@ namespace osu.Game.Screens.Import
         private const float button_vertical_margin = 15;
 
         [Resolved]
-        private OsuGameBase gameBase { get; set; }
+        private OsuGameBase game { get; set; }
 
         [Resolved]
         private OsuColour colours { get; set; }
@@ -46,7 +47,6 @@ namespace osu.Game.Screens.Import
         {
             storage.GetStorageForDirectory("imports");
             var originalPath = storage.GetFullPath("imports", true);
-            string[] fileExtensions = { ".osk", ".osr", ".osz" };
 
             InternalChild = contentContainer = new Container
             {
@@ -63,7 +63,7 @@ namespace osu.Game.Screens.Import
                         Colour = colours.GreySeafoamDark,
                         RelativeSizeAxes = Axes.Both,
                     },
-                    fileSelector = new FileSelector(initialPath: originalPath, validFileExtensions: fileExtensions)
+                    fileSelector = new FileSelector(originalPath, game.HandledExtensions.ToArray())
                     {
                         RelativeSizeAxes = Axes.Both,
                         Width = 0.65f
@@ -174,7 +174,7 @@ namespace osu.Game.Screens.Import
 
             string[] paths = { path };
 
-            Task.Factory.StartNew(() => gameBase.Import(paths), TaskCreationOptions.LongRunning);
+            Task.Factory.StartNew(() => game.Import(paths), TaskCreationOptions.LongRunning);
         }
     }
 }

From 33f77f81f2d3af9dec7c1d6f9f94442e8211924c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Dec 2020 12:43:27 +0900
Subject: [PATCH 0256/3722] Disable the import button when no file is selected,
 rather than weird flash logic

---
 osu.Game/Screens/Import/FileImportScreen.cs | 24 +++++++++------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
index 24a498e8cd..da6d3f6622 100644
--- a/osu.Game/Screens/Import/FileImportScreen.cs
+++ b/osu.Game/Screens/Import/FileImportScreen.cs
@@ -32,6 +32,8 @@ namespace osu.Game.Screens.Import
         private TextFlowContainer currentFileText;
         private OsuScrollContainer fileNameScroll;
 
+        private TriangleButton importButton;
+
         private const float duration = 300;
         private const float button_height = 50;
         private const float button_vertical_margin = 15;
@@ -100,7 +102,7 @@ namespace osu.Game.Screens.Import
                                     },
                                 },
                             },
-                            new TriangleButton
+                            importButton = new TriangleButton
                             {
                                 Text = "Import",
                                 Anchor = Anchor.BottomCentre,
@@ -109,14 +111,7 @@ namespace osu.Game.Screens.Import
                                 Height = button_height,
                                 Width = 0.9f,
                                 Margin = new MarginPadding { Vertical = button_vertical_margin },
-                                Action = () =>
-                                {
-                                    var d = currentFile.Value?.FullName;
-                                    if (d != null)
-                                        startImport(d);
-                                    else
-                                        currentFileText.FlashColour(Color4.Red, 500);
-                                }
+                                Action = () => startImport(currentFile.Value?.FullName)
                             }
                         }
                     }
@@ -125,21 +120,22 @@ namespace osu.Game.Screens.Import
             fileNameScroll.ScrollContent.Anchor = Anchor.Centre;
             fileNameScroll.ScrollContent.Origin = Anchor.Centre;
 
-            currentFile.BindValueChanged(updateFileSelectionText, true);
-            currentDirectory.BindValueChanged(onCurrentDirectoryChanged);
+            currentFile.BindValueChanged(fileChanged, true);
+            currentDirectory.BindValueChanged(directoryChanged);
 
             currentDirectory.BindTo(fileSelector.CurrentPath);
             currentFile.BindTo(fileSelector.CurrentFile);
         }
 
-        private void onCurrentDirectoryChanged(ValueChangedEvent<DirectoryInfo> v)
+        private void directoryChanged(ValueChangedEvent<DirectoryInfo> v)
         {
             currentFile.Value = null;
         }
 
-        private void updateFileSelectionText(ValueChangedEvent<FileInfo> v)
+        private void fileChanged(ValueChangedEvent<FileInfo> selectedFile)
         {
-            currentFileText.Text = v.NewValue?.Name ?? "Select a file";
+            importButton.Enabled.Value = selectedFile.NewValue != null;
+            currentFileText.Text = selectedFile.NewValue?.Name ?? "Select a file";
         }
 
         public override void OnEntering(IScreen last)

From cafe81ab97cdf5565a168fe9c757b833bec64b35 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Dec 2020 12:52:38 +0900
Subject: [PATCH 0257/3722] Further refactoring and bindable simplification

---
 osu.Game/Screens/Import/FileImportScreen.cs | 37 +++++++++------------
 1 file changed, 15 insertions(+), 22 deletions(-)

diff --git a/osu.Game/Screens/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
index da6d3f6622..72032c82b8 100644
--- a/osu.Game/Screens/Import/FileImportScreen.cs
+++ b/osu.Game/Screens/Import/FileImportScreen.cs
@@ -12,11 +12,10 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
 using osuTK;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Graphics.Containers;
-using osuTK.Graphics;
 
 namespace osu.Game.Screens.Import
 {
@@ -24,13 +23,9 @@ namespace osu.Game.Screens.Import
     {
         public override bool HideOverlaysOnEnter => true;
 
-        private readonly Bindable<FileInfo> currentFile = new Bindable<FileInfo>();
-        private readonly IBindable<DirectoryInfo> currentDirectory = new Bindable<DirectoryInfo>();
-
         private FileSelector fileSelector;
         private Container contentContainer;
         private TextFlowContainer currentFileText;
-        private OsuScrollContainer fileNameScroll;
 
         private TriangleButton importButton;
 
@@ -47,9 +42,6 @@ namespace osu.Game.Screens.Import
         [BackgroundDependencyLoader(true)]
         private void load(Storage storage)
         {
-            storage.GetStorageForDirectory("imports");
-            var originalPath = storage.GetFullPath("imports", true);
-
             InternalChild = contentContainer = new Container
             {
                 Masking = true,
@@ -65,7 +57,7 @@ namespace osu.Game.Screens.Import
                         Colour = colours.GreySeafoamDark,
                         RelativeSizeAxes = Axes.Both,
                     },
-                    fileSelector = new FileSelector(originalPath, game.HandledExtensions.ToArray())
+                    fileSelector = new FileSelector(validFileExtensions: game.HandledExtensions.ToArray())
                     {
                         RelativeSizeAxes = Axes.Both,
                         Width = 0.65f
@@ -87,7 +79,7 @@ namespace osu.Game.Screens.Import
                             {
                                 RelativeSizeAxes = Axes.Both,
                                 Padding = new MarginPadding { Bottom = button_height + button_vertical_margin * 2 },
-                                Child = fileNameScroll = new OsuScrollContainer
+                                Child = new OsuScrollContainer
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                     Anchor = Anchor.TopCentre,
@@ -100,6 +92,11 @@ namespace osu.Game.Screens.Import
                                         Origin = Anchor.Centre,
                                         TextAnchor = Anchor.Centre
                                     },
+                                    ScrollContent =
+                                    {
+                                        Anchor = Anchor.Centre,
+                                        Origin = Anchor.Centre,
+                                    }
                                 },
                             },
                             importButton = new TriangleButton
@@ -111,25 +108,21 @@ namespace osu.Game.Screens.Import
                                 Height = button_height,
                                 Width = 0.9f,
                                 Margin = new MarginPadding { Vertical = button_vertical_margin },
-                                Action = () => startImport(currentFile.Value?.FullName)
+                                Action = () => startImport(fileSelector.CurrentFile.Value?.FullName)
                             }
                         }
                     }
                 }
             };
-            fileNameScroll.ScrollContent.Anchor = Anchor.Centre;
-            fileNameScroll.ScrollContent.Origin = Anchor.Centre;
 
-            currentFile.BindValueChanged(fileChanged, true);
-            currentDirectory.BindValueChanged(directoryChanged);
-
-            currentDirectory.BindTo(fileSelector.CurrentPath);
-            currentFile.BindTo(fileSelector.CurrentFile);
+            fileSelector.CurrentFile.BindValueChanged(fileChanged, true);
+            fileSelector.CurrentPath.BindValueChanged(directoryChanged);
         }
 
-        private void directoryChanged(ValueChangedEvent<DirectoryInfo> v)
+        private void directoryChanged(ValueChangedEvent<DirectoryInfo> _)
         {
-            currentFile.Value = null;
+            // this should probably be done by the selector itself, but let's do it here for now.
+            fileSelector.CurrentFile.Value = null;
         }
 
         private void fileChanged(ValueChangedEvent<FileInfo> selectedFile)

From db4f2d5ffbbcf3ba90a4aa5c563314c40d5bacb1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Dec 2020 12:52:45 +0900
Subject: [PATCH 0258/3722] Refresh view after import succeeds

---
 osu.Game/Screens/Import/FileImportScreen.cs | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
index 72032c82b8..3646dc819c 100644
--- a/osu.Game/Screens/Import/FileImportScreen.cs
+++ b/osu.Game/Screens/Import/FileImportScreen.cs
@@ -154,16 +154,17 @@ namespace osu.Game.Screens.Import
             if (string.IsNullOrEmpty(path))
                 return;
 
-            if (!File.Exists(path))
-            {
-                currentFileText.Text = "No such file";
-                currentFileText.FlashColour(colours.Red, duration);
-                return;
-            }
+            Task.Factory.StartNew(async () => await game.Import(path), TaskCreationOptions.LongRunning)
+                .ContinueWith(_ =>
+                {
+                    // some files will be deleted after successful import, so we want to refresh the view.
 
-            string[] paths = { path };
-
-            Task.Factory.StartNew(() => game.Import(paths), TaskCreationOptions.LongRunning);
+                    Schedule(() =>
+                    {
+                        // should probably be exposed as a refresh method.
+                        fileSelector.CurrentPath.TriggerChange();
+                    });
+                });
         }
     }
 }

From 0d4ac2f748b968cf972c8270b1dc2138857ced96 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Dec 2020 12:57:28 +0900
Subject: [PATCH 0259/3722] Refresh view after import completes

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

diff --git a/osu.Game/Screens/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
index 3646dc819c..5f7888d743 100644
--- a/osu.Game/Screens/Import/FileImportScreen.cs
+++ b/osu.Game/Screens/Import/FileImportScreen.cs
@@ -154,17 +154,17 @@ namespace osu.Game.Screens.Import
             if (string.IsNullOrEmpty(path))
                 return;
 
-            Task.Factory.StartNew(async () => await game.Import(path), TaskCreationOptions.LongRunning)
-                .ContinueWith(_ =>
-                {
-                    // some files will be deleted after successful import, so we want to refresh the view.
+            Task.Factory.StartNew(async () =>
+            {
+                await game.Import(path);
 
-                    Schedule(() =>
-                    {
-                        // should probably be exposed as a refresh method.
-                        fileSelector.CurrentPath.TriggerChange();
-                    });
+                // some files will be deleted after successful import, so we want to refresh the view.
+                Schedule(() =>
+                {
+                    // should probably be exposed as a refresh method.
+                    fileSelector.CurrentPath.TriggerChange();
                 });
+            }, TaskCreationOptions.LongRunning);
         }
     }
 }

From 10ee8ed8e86c392015a29ffa81c8798101066fd0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Dec 2020 13:02:38 +0900
Subject: [PATCH 0260/3722] Reorder functions and simplify transform logic

---
 osu.Game/Screens/Import/FileImportScreen.cs | 34 ++++++++++-----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Screens/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
index 5f7888d743..329623e03a 100644
--- a/osu.Game/Screens/Import/FileImportScreen.cs
+++ b/osu.Game/Screens/Import/FileImportScreen.cs
@@ -119,6 +119,22 @@ namespace osu.Game.Screens.Import
             fileSelector.CurrentPath.BindValueChanged(directoryChanged);
         }
 
+        public override void OnEntering(IScreen last)
+        {
+            base.OnEntering(last);
+
+            contentContainer.ScaleTo(0.95f).ScaleTo(1, duration, Easing.OutQuint);
+            this.FadeInFromZero(duration);
+        }
+
+        public override bool OnExiting(IScreen next)
+        {
+            contentContainer.ScaleTo(0.95f, duration, Easing.OutQuint);
+            this.FadeOut(duration, Easing.OutQuint);
+
+            return base.OnExiting(next);
+        }
+
         private void directoryChanged(ValueChangedEvent<DirectoryInfo> _)
         {
             // this should probably be done by the selector itself, but let's do it here for now.
@@ -131,24 +147,6 @@ namespace osu.Game.Screens.Import
             currentFileText.Text = selectedFile.NewValue?.Name ?? "Select a file";
         }
 
-        public override void OnEntering(IScreen last)
-        {
-            base.OnEntering(last);
-
-            contentContainer.FadeOut().Then().ScaleTo(0.95f)
-                            .Then()
-                            .ScaleTo(1, duration, Easing.OutQuint)
-                            .FadeIn(duration);
-        }
-
-        public override bool OnExiting(IScreen next)
-        {
-            contentContainer.ScaleTo(0.95f, duration, Easing.OutQuint);
-            this.FadeOut(duration, Easing.OutQuint);
-
-            return base.OnExiting(next);
-        }
-
         private void startImport(string path)
         {
             if (string.IsNullOrEmpty(path))

From f0e6b6eaf81c540382f70dc39dcdad249acaad42 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran <gagahpangeran@gmail.com>
Date: Tue, 15 Dec 2020 11:09:09 +0700
Subject: [PATCH 0261/3722] sort by ruleset id first then star diff

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

diff --git a/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanel.cs b/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanel.cs
index 88c15776cd..1567e18caa 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanel.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanel.cs
@@ -152,7 +152,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
             }
             else
             {
-                foreach (var b in SetInfo.Beatmaps.OrderBy(beatmap => beatmap.StarDifficulty))
+                foreach (var b in SetInfo.Beatmaps.OrderBy(beatmap => beatmap.Ruleset.ID).ThenBy(beatmap => beatmap.StarDifficulty))
                     icons.Add(new DifficultyIcon(b));
             }
 

From 8bdef0ff5573276ea4f2a7f6a833bd81098b84d9 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 15 Dec 2020 13:18:41 +0900
Subject: [PATCH 0262/3722] Code quality fix

Co-authored-by: Dean Herbert <pe@ppy.sh>
---
 osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index af7786c3fd..b235b59609 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -157,7 +157,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                 speedValue *= 1.0 + 0.04 * (12.0 - Attributes.ApproachRate);
 
             // Scale the speed value with accuracy and OD
-            speedValue *= (.95 + Math.Pow(Attributes.OverallDifficulty, 2) / 750) * Math.Pow(accuracy, (14.5 - Math.Max(Attributes.OverallDifficulty, 8)) / 2);
+            speedValue *= (0.95 + Math.Pow(Attributes.OverallDifficulty, 2) / 750) * Math.Pow(accuracy, (14.5 - Math.Max(Attributes.OverallDifficulty, 8)) / 2);
             // Scale the speed value with # of 50s to punish doubletapping.
             speedValue *= Math.Pow(0.98, countMeh < totalHits / 500.0 ? 0 : countMeh - totalHits / 500.0);
 

From 8362ad37e34c10d2ada7bd4468d851d6debdb45a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Dec 2020 15:22:14 +0900
Subject: [PATCH 0263/3722] Bring up-to-date with code changes

---
 .../Gameplay/TestSceneInGameLeaderboard.cs    | 26 ++++++++-----------
 osu.Game/Screens/Play/InGameScoreContainer.cs |  3 ++-
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
index 0019212dfa..4944a6477d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.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.
 
-using System;
-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.Screens.Play;
 using osu.Game.Users;
 using osuTK;
@@ -16,12 +15,6 @@ namespace osu.Game.Tests.Visual.Gameplay
     [TestFixture]
     public class TestSceneInGameLeaderboard : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(InGameLeaderboard),
-            typeof(InGameScoreContainer),
-        };
-
         private readonly TestInGameLeaderboard leaderboard;
         private readonly BindableDouble playerScore;
 
@@ -35,18 +28,21 @@ namespace osu.Game.Tests.Visual.Gameplay
                 RelativeSizeAxes = Axes.X,
                 PlayerCurrentScore = { BindTarget = playerScore = new BindableDouble(1222333) }
             });
+        }
+
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("reset leaderboard", () =>
+            {
+                leaderboard.ClearScores();
+                playerScore.Value = 1222333;
+            });
 
             AddStep("add player user", () => leaderboard.PlayerUser = new User { Username = "You" });
             AddSliderStep("set player score", 50, 5000000, 1222333, v => playerScore.Value = v);
         }
 
-        [SetUp]
-        public void SetUp()
-        {
-            leaderboard.ClearScores();
-            playerScore.Value = 1222333;
-        }
-
         [Test]
         public void TestPlayerScore()
         {
diff --git a/osu.Game/Screens/Play/InGameScoreContainer.cs b/osu.Game/Screens/Play/InGameScoreContainer.cs
index f548b3de3f..d3ec132351 100644
--- a/osu.Game/Screens/Play/InGameScoreContainer.cs
+++ b/osu.Game/Screens/Play/InGameScoreContainer.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using Humanizer;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
@@ -210,7 +211,7 @@ namespace osu.Game.Screens.Play
                             },
                             scoreText = new GlowingSpriteText
                             {
-                                GlowColour = OsuColour.FromHex(@"83ccfa"),
+                                GlowColour = Color4Extensions.FromHex(@"83ccfa"),
                                 Font = OsuFont.Numeric.With(size: 14),
                             }
                         }

From dd5572b20a9336562e30bcf14d4bc444d8d0f3be Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Dec 2020 15:26:20 +0900
Subject: [PATCH 0264/3722] Remove unnecessary methods and event

---
 osu.Game/Screens/Play/InGameScoreContainer.cs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Play/InGameScoreContainer.cs b/osu.Game/Screens/Play/InGameScoreContainer.cs
index d3ec132351..693020fc4c 100644
--- a/osu.Game/Screens/Play/InGameScoreContainer.cs
+++ b/osu.Game/Screens/Play/InGameScoreContainer.cs
@@ -19,12 +19,6 @@ namespace osu.Game.Screens.Play
 {
     public class InGameScoreContainer : FillFlowContainer<InGameScoreItem>
     {
-        /// <summary>
-        /// Called once an item's score has changed.
-        /// Useful for doing calculations on what score to show or hide next. (scrolling system)
-        /// </summary>
-        public Action OnScoreChange;
-
         /// <summary>
         /// Whether to declare a new position for un-positioned players.
         /// Must be disabled for online leaderboards with top 50 scores only.
@@ -101,9 +95,16 @@ namespace osu.Game.Screens.Play
 
         private void updateScores()
         {
-            reorderPositions();
+            var orderedByScore = this.OrderByDescending(i => i.TotalScore).ToList();
+            var orderedPositions = this.Select(i => this.Any(item => item.InitialPosition.HasValue) ? i.InitialPosition : i.ScorePosition).OrderByDescending(p => p.HasValue).ThenBy(p => p).ToList();
 
-            OnScoreChange?.Invoke();
+            for (int i = 0; i < Count; i++)
+            {
+                int newPosition = orderedPositions[i] ?? maxPosition + 1;
+
+                SetLayoutPosition(orderedByScore[i], newPosition);
+                orderedByScore[i].ScorePosition = DeclareNewPosition ? newPosition : orderedPositions[i];
+            }
         }
     }
 

From 8b68ccc0ff96f2bd0ae9b3076cdc19e2bff3ac26 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Dec 2020 15:27:26 +0900
Subject: [PATCH 0265/3722] Rename class and move inside HUD namespace

---
 .../Gameplay/TestSceneInGameLeaderboard.cs    |  34 +++---
 .../Screens/Play/HUD/GameplayLeaderboard.cs   | 104 ++++++++++++++++++
 .../GameplayLeaderboardScore.cs}              | 100 +----------------
 osu.Game/Screens/Play/InGameLeaderboard.cs    |  42 -------
 4 files changed, 122 insertions(+), 158 deletions(-)
 create mode 100644 osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
 rename osu.Game/Screens/Play/{InGameScoreContainer.cs => HUD/GameplayLeaderboardScore.cs} (52%)
 delete mode 100644 osu.Game/Screens/Play/InGameLeaderboard.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
index 4944a6477d..657eb7e8ba 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
@@ -6,27 +6,27 @@ using NUnit.Framework;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
-using osu.Game.Screens.Play;
+using osu.Game.Screens.Play.HUD;
 using osu.Game.Users;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [TestFixture]
-    public class TestSceneInGameLeaderboard : OsuTestScene
+    public class TestSceneGameplayLeaderboard : OsuTestScene
     {
-        private readonly TestInGameLeaderboard leaderboard;
-        private readonly BindableDouble playerScore;
+        private readonly TestGameplayLeaderboard leaderboard;
 
-        public TestSceneInGameLeaderboard()
+        private readonly BindableDouble playerScore = new BindableDouble();
+
+        public TestSceneGameplayLeaderboard()
         {
-            Add(leaderboard = new TestInGameLeaderboard
+            Add(leaderboard = new TestGameplayLeaderboard
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 Scale = new Vector2(2),
                 RelativeSizeAxes = Axes.X,
-                PlayerCurrentScore = { BindTarget = playerScore = new BindableDouble(1222333) }
             });
         }
 
@@ -35,11 +35,11 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("reset leaderboard", () =>
             {
-                leaderboard.ClearScores();
+                leaderboard.Clear();
                 playerScore.Value = 1222333;
             });
 
-            AddStep("add player user", () => leaderboard.PlayerUser = new User { Username = "You" });
+            AddStep("add player user", () => leaderboard.AddRealTimePlayer(playerScore, new User { Username = "You" }));
             AddSliderStep("set player score", 50, 5000000, 1222333, v => playerScore.Value = v);
         }
 
@@ -49,8 +49,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             var player2Score = new BindableDouble(1234567);
             var player3Score = new BindableDouble(1111111);
 
-            AddStep("add player 2", () => leaderboard.AddDummyPlayer(player2Score, "Player 2"));
-            AddStep("add player 3", () => leaderboard.AddDummyPlayer(player3Score, "Player 3"));
+            AddStep("add player 2", () => leaderboard.AddRealTimePlayer(player2Score, new User { Username = "Player 2" }));
+            AddStep("add player 3", () => leaderboard.AddRealTimePlayer(player3Score, new User { Username = "Player 3" }));
 
             AddAssert("is player 2 position #1", () => leaderboard.CheckPositionByUsername("Player 2", 1));
             AddAssert("is player position #2", () => leaderboard.CheckPositionByUsername("You", 2));
@@ -67,18 +67,14 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("is player 2 position #3", () => leaderboard.CheckPositionByUsername("Player 2", 3));
         }
 
-        private class TestInGameLeaderboard : InGameLeaderboard
+        private class TestGameplayLeaderboard : GameplayLeaderboard
         {
-            public void ClearScores() => ScoresContainer.RemoveAll(s => s.User.Username != PlayerUser.Username);
-
-            public bool CheckPositionByUsername(string username, int? estimatedPosition)
+            public bool CheckPositionByUsername(string username, int? expectedPosition)
             {
-                var scoreItem = ScoresContainer.FirstOrDefault(i => i.User.Username == username);
+                var scoreItem = this.FirstOrDefault(i => i.User.Username == username);
 
-                return scoreItem != null && scoreItem.ScorePosition == estimatedPosition;
+                return scoreItem != null && scoreItem.ScorePosition == expectedPosition;
             }
-
-            public void AddDummyPlayer(BindableDouble currentScore, string username) => ScoresContainer.AddRealTimePlayer(currentScore, new User { Username = username });
         }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
new file mode 100644
index 0000000000..9e1b9a3958
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -0,0 +1,104 @@
+// Copyright (c) ppy 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.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Scoring;
+using osu.Game.Users;
+using osuTK;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public class GameplayLeaderboard : FillFlowContainer<GameplayLeaderboardScore>
+    {
+        /// <summary>
+        /// Whether to declare a new position for un-positioned players.
+        /// Must be disabled for online leaderboards with top 50 scores only.
+        /// </summary>
+        public bool DeclareNewPosition = true;
+
+        public GameplayLeaderboard()
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+            Direction = FillDirection.Vertical;
+            Spacing = new Vector2(2.5f);
+            LayoutDuration = 500;
+            LayoutEasing = Easing.OutQuint;
+        }
+
+        /// <summary>
+        /// Adds a real-time player score item whose score is updated via a <see cref="BindableDouble"/>.
+        /// </summary>
+        /// <param name="currentScore">The bindable current score of the player.</param>
+        /// <param name="user">The player user.</param>
+        /// <returns>Returns the drawable score item of that player.</returns>
+        public GameplayLeaderboardScore AddRealTimePlayer(BindableDouble currentScore, User user = null)
+        {
+            if (currentScore == null)
+                return null;
+
+            var scoreItem = addScore(currentScore.Value, user);
+            currentScore.ValueChanged += s => scoreItem.TotalScore = s.NewValue;
+
+            return scoreItem;
+        }
+
+        /// <summary>
+        /// Adds a score item based off a <see cref="ScoreInfo"/> with an initial position.
+        /// </summary>
+        /// <param name="score">The score info to use for this item.</param>
+        /// <param name="initialPosition">The initial position of this item.</param>
+        /// <returns>Returns the drawable score item of that player.</returns>
+        public GameplayLeaderboardScore AddScore(ScoreInfo score, int? initialPosition = null) => score != null ? addScore(score.TotalScore, score.User, initialPosition) : null;
+
+        private int maxPosition => this.Max(i => this.Any(item => item.InitialPosition.HasValue) ? i.InitialPosition : i.ScorePosition) ?? 0;
+
+        private GameplayLeaderboardScore addScore(double totalScore, User user = null, int? position = null)
+        {
+            var scoreItem = new GameplayLeaderboardScore(position)
+            {
+                User = user,
+                TotalScore = totalScore,
+                OnScoreChange = updateScores,
+            };
+
+            Add(scoreItem);
+            SetLayoutPosition(scoreItem, position ?? maxPosition + 1);
+
+            reorderPositions();
+
+            return scoreItem;
+        }
+
+        private void reorderPositions()
+        {
+            var orderedByScore = this.OrderByDescending(i => i.TotalScore).ToList();
+            var orderedPositions = this.Select(i => this.Any(item => item.InitialPosition.HasValue) ? i.InitialPosition : i.ScorePosition).OrderByDescending(p => p.HasValue).ThenBy(p => p).ToList();
+
+            for (int i = 0; i < Count; i++)
+            {
+                int newPosition = orderedPositions[i] ?? maxPosition + 1;
+
+                SetLayoutPosition(orderedByScore[i], newPosition);
+                orderedByScore[i].ScorePosition = DeclareNewPosition ? newPosition : orderedPositions[i];
+            }
+        }
+
+        private void updateScores()
+        {
+            var orderedByScore = this.OrderByDescending(i => i.TotalScore).ToList();
+            var orderedPositions = this.Select(i => this.Any(item => item.InitialPosition.HasValue) ? i.InitialPosition : i.ScorePosition).OrderByDescending(p => p.HasValue).ThenBy(p => p).ToList();
+
+            for (int i = 0; i < Count; i++)
+            {
+                int newPosition = orderedPositions[i] ?? maxPosition + 1;
+
+                SetLayoutPosition(orderedByScore[i], newPosition);
+                orderedByScore[i].ScorePosition = DeclareNewPosition ? newPosition : orderedPositions[i];
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/InGameScoreContainer.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
similarity index 52%
rename from osu.Game/Screens/Play/InGameScoreContainer.cs
rename to osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 693020fc4c..3af7345ae1 100644
--- a/osu.Game/Screens/Play/InGameScoreContainer.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -2,113 +2,19 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Linq;
 using Humanizer;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Scoring;
 using osu.Game.Users;
 using osuTK;
 
-namespace osu.Game.Screens.Play
+namespace osu.Game.Screens.Play.HUD
 {
-    public class InGameScoreContainer : FillFlowContainer<InGameScoreItem>
-    {
-        /// <summary>
-        /// Whether to declare a new position for un-positioned players.
-        /// Must be disabled for online leaderboards with top 50 scores only.
-        /// </summary>
-        public bool DeclareNewPosition = true;
-
-        public InGameScoreContainer()
-        {
-            RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Axes.Y;
-            Direction = FillDirection.Vertical;
-            Spacing = new Vector2(2.5f);
-            LayoutDuration = 500;
-            LayoutEasing = Easing.OutQuint;
-        }
-
-        /// <summary>
-        /// Adds a real-time player score item whose score is updated via a <see cref="BindableDouble"/>.
-        /// </summary>
-        /// <param name="currentScore">The bindable current score of the player.</param>
-        /// <param name="user">The player user.</param>
-        /// <returns>Returns the drawable score item of that player.</returns>
-        public InGameScoreItem AddRealTimePlayer(BindableDouble currentScore, User user = null)
-        {
-            if (currentScore == null)
-                return null;
-
-            var scoreItem = addScore(currentScore.Value, user);
-            currentScore.ValueChanged += s => scoreItem.TotalScore = s.NewValue;
-
-            return scoreItem;
-        }
-
-        /// <summary>
-        /// Adds a score item based off a <see cref="ScoreInfo"/> with an initial position.
-        /// </summary>
-        /// <param name="score">The score info to use for this item.</param>
-        /// <param name="initialPosition">The initial position of this item.</param>
-        /// <returns>Returns the drawable score item of that player.</returns>
-        public InGameScoreItem AddScore(ScoreInfo score, int? initialPosition = null) => score != null ? addScore(score.TotalScore, score.User, initialPosition) : null;
-
-        private int maxPosition => this.Max(i => this.Any(item => item.InitialPosition.HasValue) ? i.InitialPosition : i.ScorePosition) ?? 0;
-
-        private InGameScoreItem addScore(double totalScore, User user = null, int? position = null)
-        {
-            var scoreItem = new InGameScoreItem(position)
-            {
-                User = user,
-                TotalScore = totalScore,
-                OnScoreChange = updateScores,
-            };
-
-            Add(scoreItem);
-            SetLayoutPosition(scoreItem, position ?? maxPosition + 1);
-
-            reorderPositions();
-
-            return scoreItem;
-        }
-
-        private void reorderPositions()
-        {
-            var orderedByScore = this.OrderByDescending(i => i.TotalScore).ToList();
-            var orderedPositions = this.Select(i => this.Any(item => item.InitialPosition.HasValue) ? i.InitialPosition : i.ScorePosition).OrderByDescending(p => p.HasValue).ThenBy(p => p).ToList();
-
-            for (int i = 0; i < Count; i++)
-            {
-                int newPosition = orderedPositions[i] ?? maxPosition + 1;
-
-                SetLayoutPosition(orderedByScore[i], newPosition);
-                orderedByScore[i].ScorePosition = DeclareNewPosition ? newPosition : orderedPositions[i];
-            }
-        }
-
-        private void updateScores()
-        {
-            var orderedByScore = this.OrderByDescending(i => i.TotalScore).ToList();
-            var orderedPositions = this.Select(i => this.Any(item => item.InitialPosition.HasValue) ? i.InitialPosition : i.ScorePosition).OrderByDescending(p => p.HasValue).ThenBy(p => p).ToList();
-
-            for (int i = 0; i < Count; i++)
-            {
-                int newPosition = orderedPositions[i] ?? maxPosition + 1;
-
-                SetLayoutPosition(orderedByScore[i], newPosition);
-                orderedByScore[i].ScorePosition = DeclareNewPosition ? newPosition : orderedPositions[i];
-            }
-        }
-    }
-
-    public class InGameScoreItem : CompositeDrawable
+    public class GameplayLeaderboardScore : CompositeDrawable
     {
         private readonly OsuSpriteText positionText, positionSymbol, userString;
         private readonly GlowingSpriteText scoreText;
@@ -159,7 +65,7 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        public InGameScoreItem(int? initialPosition)
+        public GameplayLeaderboardScore(int? initialPosition)
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
diff --git a/osu.Game/Screens/Play/InGameLeaderboard.cs b/osu.Game/Screens/Play/InGameLeaderboard.cs
deleted file mode 100644
index c8f5cf5fd7..0000000000
--- a/osu.Game/Screens/Play/InGameLeaderboard.cs
+++ /dev/null
@@ -1,42 +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.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Users;
-
-namespace osu.Game.Screens.Play
-{
-    public class InGameLeaderboard : CompositeDrawable
-    {
-        protected readonly InGameScoreContainer ScoresContainer;
-
-        public readonly BindableDouble PlayerCurrentScore = new BindableDouble();
-
-        private bool playerItemCreated;
-        private User playerUser;
-
-        public User PlayerUser
-        {
-            get => playerUser;
-            set
-            {
-                playerUser = value;
-
-                if (playerItemCreated)
-                    return;
-
-                ScoresContainer.AddRealTimePlayer(PlayerCurrentScore, playerUser);
-                playerItemCreated = true;
-            }
-        }
-
-        public InGameLeaderboard()
-        {
-            AutoSizeAxes = Axes.Y;
-
-            InternalChild = ScoresContainer = new InGameScoreContainer();
-        }
-    }
-}

From b5ab400ad78ac968b4b5a629bb5aacab39dd63eb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Dec 2020 15:44:43 +0900
Subject: [PATCH 0266/3722] Fix test filename not matching updated class name

---
 ...InGameLeaderboard.cs => TestSceneGameplayLeaderboard.cs} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename osu.Game.Tests/Visual/Gameplay/{TestSceneInGameLeaderboard.cs => TestSceneGameplayLeaderboard.cs} (89%)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
similarity index 89%
rename from osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
rename to osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
index 657eb7e8ba..df970c1c46 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneInGameLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 playerScore.Value = 1222333;
             });
 
-            AddStep("add player user", () => leaderboard.AddRealTimePlayer(playerScore, new User { Username = "You" }));
+            AddStep("add player user", () => leaderboard.AddPlayer(playerScore, new User { Username = "You" }));
             AddSliderStep("set player score", 50, 5000000, 1222333, v => playerScore.Value = v);
         }
 
@@ -49,8 +49,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             var player2Score = new BindableDouble(1234567);
             var player3Score = new BindableDouble(1111111);
 
-            AddStep("add player 2", () => leaderboard.AddRealTimePlayer(player2Score, new User { Username = "Player 2" }));
-            AddStep("add player 3", () => leaderboard.AddRealTimePlayer(player3Score, new User { Username = "Player 3" }));
+            AddStep("add player 2", () => leaderboard.AddPlayer(player2Score, new User { Username = "Player 2" }));
+            AddStep("add player 3", () => leaderboard.AddPlayer(player3Score, new User { Username = "Player 3" }));
 
             AddAssert("is player 2 position #1", () => leaderboard.CheckPositionByUsername("Player 2", 1));
             AddAssert("is player position #2", () => leaderboard.CheckPositionByUsername("You", 2));

From e37089af5e188e7dbb769ba4d891a25b48420412 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Dec 2020 15:44:56 +0900
Subject: [PATCH 0267/3722] Further code cleanup

---
 .../Screens/Play/HUD/GameplayLeaderboard.cs   | 65 ++++---------------
 .../Play/HUD/GameplayLeaderboardScore.cs      |  5 +-
 2 files changed, 15 insertions(+), 55 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index 9e1b9a3958..6ee654fb9e 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -1,11 +1,12 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Scoring;
 using osu.Game.Users;
 using osuTK;
 
@@ -13,52 +14,33 @@ namespace osu.Game.Screens.Play.HUD
 {
     public class GameplayLeaderboard : FillFlowContainer<GameplayLeaderboardScore>
     {
-        /// <summary>
-        /// Whether to declare a new position for un-positioned players.
-        /// Must be disabled for online leaderboards with top 50 scores only.
-        /// </summary>
-        public bool DeclareNewPosition = true;
-
         public GameplayLeaderboard()
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
+
             Direction = FillDirection.Vertical;
+
             Spacing = new Vector2(2.5f);
-            LayoutDuration = 500;
+
+            LayoutDuration = 250;
             LayoutEasing = Easing.OutQuint;
         }
 
         /// <summary>
-        /// Adds a real-time player score item whose score is updated via a <see cref="BindableDouble"/>.
+        /// Adds a player to the leaderboard.
         /// </summary>
         /// <param name="currentScore">The bindable current score of the player.</param>
-        /// <param name="user">The player user.</param>
-        /// <returns>Returns the drawable score item of that player.</returns>
-        public GameplayLeaderboardScore AddRealTimePlayer(BindableDouble currentScore, User user = null)
+        /// <param name="user">The player.</param>
+        public void AddPlayer([NotNull] BindableDouble currentScore, [NotNull] User user)
         {
-            if (currentScore == null)
-                return null;
-
             var scoreItem = addScore(currentScore.Value, user);
             currentScore.ValueChanged += s => scoreItem.TotalScore = s.NewValue;
-
-            return scoreItem;
         }
 
-        /// <summary>
-        /// Adds a score item based off a <see cref="ScoreInfo"/> with an initial position.
-        /// </summary>
-        /// <param name="score">The score info to use for this item.</param>
-        /// <param name="initialPosition">The initial position of this item.</param>
-        /// <returns>Returns the drawable score item of that player.</returns>
-        public GameplayLeaderboardScore AddScore(ScoreInfo score, int? initialPosition = null) => score != null ? addScore(score.TotalScore, score.User, initialPosition) : null;
-
-        private int maxPosition => this.Max(i => this.Any(item => item.InitialPosition.HasValue) ? i.InitialPosition : i.ScorePosition) ?? 0;
-
-        private GameplayLeaderboardScore addScore(double totalScore, User user = null, int? position = null)
+        private GameplayLeaderboardScore addScore(double totalScore, User user)
         {
-            var scoreItem = new GameplayLeaderboardScore(position)
+            var scoreItem = new GameplayLeaderboardScore
             {
                 User = user,
                 TotalScore = totalScore,
@@ -66,38 +48,19 @@ namespace osu.Game.Screens.Play.HUD
             };
 
             Add(scoreItem);
-            SetLayoutPosition(scoreItem, position ?? maxPosition + 1);
-
-            reorderPositions();
+            updateScores();
 
             return scoreItem;
         }
 
-        private void reorderPositions()
-        {
-            var orderedByScore = this.OrderByDescending(i => i.TotalScore).ToList();
-            var orderedPositions = this.Select(i => this.Any(item => item.InitialPosition.HasValue) ? i.InitialPosition : i.ScorePosition).OrderByDescending(p => p.HasValue).ThenBy(p => p).ToList();
-
-            for (int i = 0; i < Count; i++)
-            {
-                int newPosition = orderedPositions[i] ?? maxPosition + 1;
-
-                SetLayoutPosition(orderedByScore[i], newPosition);
-                orderedByScore[i].ScorePosition = DeclareNewPosition ? newPosition : orderedPositions[i];
-            }
-        }
-
         private void updateScores()
         {
             var orderedByScore = this.OrderByDescending(i => i.TotalScore).ToList();
-            var orderedPositions = this.Select(i => this.Any(item => item.InitialPosition.HasValue) ? i.InitialPosition : i.ScorePosition).OrderByDescending(p => p.HasValue).ThenBy(p => p).ToList();
 
             for (int i = 0; i < Count; i++)
             {
-                int newPosition = orderedPositions[i] ?? maxPosition + 1;
-
-                SetLayoutPosition(orderedByScore[i], newPosition);
-                orderedByScore[i].ScorePosition = DeclareNewPosition ? newPosition : orderedPositions[i];
+                SetLayoutPosition(orderedByScore[i], i);
+                orderedByScore[i].ScorePosition = i + 1;
             }
         }
     }
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 3af7345ae1..4c75f422c9 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -22,7 +22,6 @@ namespace osu.Game.Screens.Play.HUD
         public Action OnScoreChange;
 
         private int? scorePosition;
-        public int? InitialPosition;
 
         public int? ScorePosition
         {
@@ -65,7 +64,7 @@ namespace osu.Game.Screens.Play.HUD
             }
         }
 
-        public GameplayLeaderboardScore(int? initialPosition)
+        public GameplayLeaderboardScore()
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
@@ -125,8 +124,6 @@ namespace osu.Game.Screens.Play.HUD
                     },
                 },
             };
-
-            InitialPosition = ScorePosition = initialPosition;
         }
 
         [BackgroundDependencyLoader]

From ea6c196f81e72ac967da65218c69f8bf37ce2f9a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Dec 2020 16:03:18 +0900
Subject: [PATCH 0268/3722] Remove unused using statement

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

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index 6ee654fb9e..e53c56b390 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.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 JetBrains.Annotations;
 using osu.Framework.Bindables;

From d0668192aad1d44fea6516ce0d108146177a7737 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 15 Dec 2020 21:25:53 +0100
Subject: [PATCH 0269/3722] Ensure stream disposal & move entire operation
 inside task

---
 osu.Android/OsuGameActivity.cs | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index cf0179e2ac..e801c2ca6e 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.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.IO;
 using System.Threading.Tasks;
 using Android.App;
@@ -62,7 +61,7 @@ namespace osu.Android
             }
         }
 
-        private void handleImportFromUri(Uri uri)
+        private void handleImportFromUri(Uri uri) => Task.Factory.StartNew(async () =>
         {
             // there are more performant overloads of this method, but this one is the most backwards-compatible
             // (dates back to API 1).
@@ -74,23 +73,16 @@ namespace osu.Android
             cursor.MoveToFirst();
 
             var filenameColumn = cursor.GetColumnIndex(OpenableColumns.DisplayName);
-
-            var stream = ContentResolver.OpenInputStream(uri);
             string filename = cursor.GetString(filenameColumn);
 
-            if (stream != null)
-                Task.Factory.StartNew(() => runImport(stream, filename), TaskCreationOptions.LongRunning);
-        }
-
-        private Task runImport(Stream stream, string filename)
-        {
             // SharpCompress requires archive streams to be seekable, which the stream opened by
             // OpenInputStream() seems to not necessarily be.
             // copy to an arbitrary-access memory stream to be able to proceed with the import.
             var copy = new MemoryStream();
-            stream.CopyTo(copy);
+            using (var stream = ContentResolver.OpenInputStream(uri))
+                await stream.CopyToAsync(copy);
 
-            return game.Import(copy, filename);
-        }
+            await game.Import(copy, filename);
+        }, TaskCreationOptions.LongRunning);
     }
 }

From 4cd290af11eb9918848929b717e38d681bac7a3d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 16 Dec 2020 12:31:05 +0900
Subject: [PATCH 0270/3722] Split server interfaces

---
 .../IMultiplayerLoungeServer.cs               | 20 ++++++++
 .../IMultiplayerRoomServer.cs                 | 51 +++++++++++++++++++
 .../RealtimeMultiplayer/IMultiplayerServer.cs | 50 +-----------------
 3 files changed, 73 insertions(+), 48 deletions(-)
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/IMultiplayerLoungeServer.cs
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/IMultiplayerRoomServer.cs

diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerLoungeServer.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerLoungeServer.cs
new file mode 100644
index 0000000000..eecb61bcb0
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerLoungeServer.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 System.Threading.Tasks;
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    /// <summary>
+    /// Interface for an out-of-room multiplayer server.
+    /// </summary>
+    public interface IMultiplayerLoungeServer
+    {
+        /// <summary>
+        /// Request to join a multiplayer room.
+        /// </summary>
+        /// <param name="roomId">The databased room ID.</param>
+        /// <exception cref="InvalidStateException">If the user is already in the requested (or another) room.</exception>
+        Task<MultiplayerRoom> JoinRoom(long roomId);
+    }
+}
diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerRoomServer.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerRoomServer.cs
new file mode 100644
index 0000000000..f1b3daf7d3
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerRoomServer.cs
@@ -0,0 +1,51 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Threading.Tasks;
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    /// <summary>
+    /// Interface for an in-room multiplayer server.
+    /// </summary>
+    public interface IMultiplayerRoomServer
+    {
+        /// <summary>
+        /// Request to leave the currently joined room.
+        /// </summary>
+        /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
+        Task LeaveRoom();
+
+        /// <summary>
+        /// Transfer the host of the currently joined room to another user in the room.
+        /// </summary>
+        /// <param name="userId">The new user which is to become host.</param>
+        /// <exception cref="NotHostException">A user other than the current host is attempting to transfer host.</exception>
+        /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
+        Task TransferHost(long userId);
+
+        /// <summary>
+        /// As the host, update the settings of the currently joined room.
+        /// </summary>
+        /// <param name="settings">The new settings to apply.</param>
+        /// <exception cref="NotHostException">A user other than the current host is attempting to transfer host.</exception>
+        /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
+        Task ChangeSettings(MultiplayerRoomSettings settings);
+
+        /// <summary>
+        /// Change the local user state in the currently joined room.
+        /// </summary>
+        /// <param name="newState">The proposed new state.</param>
+        /// <exception cref="InvalidStateChangeException">If the state change requested is not valid, given the previous state or room state.</exception>
+        /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
+        Task ChangeState(MultiplayerUserState newState);
+
+        /// <summary>
+        /// As the host of a room, start the match.
+        /// </summary>
+        /// <exception cref="NotHostException">A user other than the current host is attempting to start the game.</exception>
+        /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
+        /// <exception cref="InvalidStateException">If an attempt to start the game occurs when the game's (or users') state disallows it.</exception>
+        Task StartMatch();
+    }
+}
diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
index e2e7b6b991..1d093af743 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
@@ -1,58 +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.Threading.Tasks;
-
 namespace osu.Game.Online.RealtimeMultiplayer
 {
     /// <summary>
-    /// An interface defining the spectator server instance.
+    /// An interface defining the multiplayer server instance.
     /// </summary>
-    public interface IMultiplayerServer
+    public interface IMultiplayerServer : IMultiplayerRoomServer, IMultiplayerLoungeServer
     {
-        /// <summary>
-        /// Request to join a multiplayer room.
-        /// </summary>
-        /// <param name="roomId">The databased room ID.</param>
-        /// <exception cref="InvalidStateException">If the user is already in the requested (or another) room.</exception>
-        Task<MultiplayerRoom> JoinRoom(long roomId);
-
-        /// <summary>
-        /// Request to leave the currently joined room.
-        /// </summary>
-        /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
-        Task LeaveRoom();
-
-        /// <summary>
-        /// Transfer the host of the currently joined room to another user in the room.
-        /// </summary>
-        /// <param name="userId">The new user which is to become host.</param>
-        /// <exception cref="NotHostException">A user other than the current host is attempting to transfer host.</exception>
-        /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
-        Task TransferHost(long userId);
-
-        /// <summary>
-        /// As the host, update the settings of the currently joined room.
-        /// </summary>
-        /// <param name="settings">The new settings to apply.</param>
-        /// <exception cref="NotHostException">A user other than the current host is attempting to transfer host.</exception>
-        /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
-        Task ChangeSettings(MultiplayerRoomSettings settings);
-
-        /// <summary>
-        /// Change the local user state in the currently joined room.
-        /// </summary>
-        /// <param name="newState">The proposed new state.</param>
-        /// <exception cref="InvalidStateChangeException">If the state change requested is not valid, given the previous state or room state.</exception>
-        /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
-        Task ChangeState(MultiplayerUserState newState);
-
-        /// <summary>
-        /// As the host of a room, start the match.
-        /// </summary>
-        /// <exception cref="NotHostException">A user other than the current host is attempting to start the game.</exception>
-        /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
-        /// <exception cref="InvalidStateException">If an attempt to start the game occurs when the game's (or users') state disallows it.</exception>
-        Task StartMatch();
     }
 }

From 31fe28b8b326f70180c31c94c5e46a36a95b99b2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 16 Dec 2020 12:32:53 +0900
Subject: [PATCH 0271/3722] Remove IStatefulMultiplayerClient

---
 .../IStatefulMultiplayerClient.cs               | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 osu.Game/Online/RealtimeMultiplayer/IStatefulMultiplayerClient.cs

diff --git a/osu.Game/Online/RealtimeMultiplayer/IStatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/IStatefulMultiplayerClient.cs
deleted file mode 100644
index 578092662a..0000000000
--- a/osu.Game/Online/RealtimeMultiplayer/IStatefulMultiplayerClient.cs
+++ /dev/null
@@ -1,17 +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 enable
-
-namespace osu.Game.Online.RealtimeMultiplayer
-{
-    /// <summary>
-    /// A multiplayer client which maintains local room and user state. Also provides a proxy to access the <see cref="IMultiplayerServer"/>.
-    /// </summary>
-    public interface IStatefulMultiplayerClient : IMultiplayerClient, IMultiplayerServer
-    {
-        MultiplayerUserState State { get; }
-
-        MultiplayerRoom? Room { get; }
-    }
-}

From 84a077078967aeb6bf8a5f526bdb7cd1288c876d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Dec 2020 15:35:07 +0900
Subject: [PATCH 0272/3722] Change frame header to use dictionary for
 compatibility

---
 osu.Game/Online/Spectator/FrameHeader.cs   | 10 ++++++----
 osu.Game/Online/Spectator/StatisticPair.cs | 23 ----------------------
 2 files changed, 6 insertions(+), 27 deletions(-)
 delete mode 100644 osu.Game/Online/Spectator/StatisticPair.cs

diff --git a/osu.Game/Online/Spectator/FrameHeader.cs b/osu.Game/Online/Spectator/FrameHeader.cs
index 9b6cc615a4..f2dd30a002 100644
--- a/osu.Game/Online/Spectator/FrameHeader.cs
+++ b/osu.Game/Online/Spectator/FrameHeader.cs
@@ -4,8 +4,9 @@
 #nullable enable
 
 using System;
-using System.Linq;
+using System.Collections.Generic;
 using Newtonsoft.Json;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 
 namespace osu.Game.Online.Spectator
@@ -17,7 +18,7 @@ namespace osu.Game.Online.Spectator
 
         public int MaxCombo { get; set; }
 
-        public StatisticPair[] Statistics { get; set; }
+        public Dictionary<HitResult, int> Statistics { get; set; }
 
         /// <summary>
         /// Construct header summary information from a point-in-time reference to a score which is actively being played.
@@ -28,11 +29,12 @@ namespace osu.Game.Online.Spectator
             Combo = score.Combo;
             MaxCombo = score.MaxCombo;
 
-            Statistics = score.Statistics.Select(kvp => new StatisticPair(kvp.Key, kvp.Value)).ToArray();
+            // copy for safety
+            Statistics = new Dictionary<HitResult, int>(score.Statistics);
         }
 
         [JsonConstructor]
-        public FrameHeader(int combo, int maxCombo, StatisticPair[] statistics)
+        public FrameHeader(int combo, int maxCombo, Dictionary<HitResult, int> statistics)
         {
             Combo = combo;
             MaxCombo = maxCombo;
diff --git a/osu.Game/Online/Spectator/StatisticPair.cs b/osu.Game/Online/Spectator/StatisticPair.cs
deleted file mode 100644
index 793143a64c..0000000000
--- a/osu.Game/Online/Spectator/StatisticPair.cs
+++ /dev/null
@@ -1,23 +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.Game.Rulesets.Scoring;
-
-namespace osu.Game.Online.Spectator
-{
-    [Serializable]
-    public struct StatisticPair
-    {
-        public HitResult Result;
-        public int Count;
-
-        public StatisticPair(HitResult result, int count)
-        {
-            Result = result;
-            Count = count;
-        }
-
-        public override string ToString() => $"{Result}=>{Count}";
-    }
-}

From 72d296f4128066787bf0c098d52422aefe363622 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Dec 2020 16:19:53 +0900
Subject: [PATCH 0273/3722] Add received timestamp and basic xmldoc for header
 class

---
 osu.Game/Online/Spectator/FrameHeader.cs | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/Spectator/FrameHeader.cs b/osu.Game/Online/Spectator/FrameHeader.cs
index f2dd30a002..b4988fecf9 100644
--- a/osu.Game/Online/Spectator/FrameHeader.cs
+++ b/osu.Game/Online/Spectator/FrameHeader.cs
@@ -14,12 +14,26 @@ namespace osu.Game.Online.Spectator
     [Serializable]
     public class FrameHeader
     {
+        /// <summary>
+        /// The current combo of the score.
+        /// </summary>
         public int Combo { get; set; }
 
+        /// <summary>
+        /// The maximum combo achieved up to the current point in time.
+        /// </summary>
         public int MaxCombo { get; set; }
 
+        /// <summary>
+        /// Cumulative hit statistics.
+        /// </summary>
         public Dictionary<HitResult, int> Statistics { get; set; }
 
+        /// <summary>
+        /// The time at which this frame was received by the server.
+        /// </summary>
+        public DateTimeOffset ReceivedTime { get; set; }
+
         /// <summary>
         /// Construct header summary information from a point-in-time reference to a score which is actively being played.
         /// </summary>
@@ -34,11 +48,12 @@ namespace osu.Game.Online.Spectator
         }
 
         [JsonConstructor]
-        public FrameHeader(int combo, int maxCombo, Dictionary<HitResult, int> statistics)
+        public FrameHeader(int combo, int maxCombo, Dictionary<HitResult, int> statistics, DateTimeOffset receivedTime)
         {
             Combo = combo;
             MaxCombo = maxCombo;
             Statistics = statistics;
+            ReceivedTime = receivedTime;
         }
     }
 }

From fb795f6bfdbb0638c21ae33e2f02e025ca38d780 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Dec 2020 13:00:19 +0900
Subject: [PATCH 0274/3722] Add initial hook-up to spectator backend

---
 .../Visual/Gameplay/TestSceneSpectator.cs     |  2 +-
 .../TestSceneSpectatorDrivenLeaderboard.cs    | 74 +++++++++++++++++++
 2 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 3e5b561a6f..1fdff99da6 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -232,7 +232,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         public class TestSpectatorStreamingClient : SpectatorStreamingClient
         {
-            public readonly User StreamingUser = new User { Id = 1234, Username = "Test user" };
+            public readonly User StreamingUser = new User { Id = 55, Username = "Test user" };
 
             public new BindableList<int> PlayingUsers => (BindableList<int>)base.PlayingUsers;
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs
new file mode 100644
index 0000000000..7211755ba6
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs
@@ -0,0 +1,74 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Database;
+using osu.Game.Online.API;
+using osu.Game.Online.Spectator;
+using osu.Game.Rulesets.Osu.Scoring;
+using osu.Game.Screens.Play.HUD;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public class TestSceneSpectatorDrivenLeaderboard : OsuTestScene
+    {
+        [Cached(typeof(SpectatorStreamingClient))]
+        private TestSceneSpectator.TestSpectatorStreamingClient testSpectatorStreamingClient = new TestSceneSpectator.TestSpectatorStreamingClient();
+
+        // used just to show beatmap card for the time being.
+        protected override bool UseOnlineAPI => true;
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            OsuScoreProcessor scoreProcessor;
+
+            testSpectatorStreamingClient.StartPlay(55);
+
+            Children = new Drawable[]
+            {
+                scoreProcessor = new OsuScoreProcessor(),
+                new MultiplayerGameplayLeaderboard(scoreProcessor)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                }
+            };
+        });
+    }
+
+    public class MultiplayerGameplayLeaderboard : GameplayLeaderboard
+    {
+        private readonly OsuScoreProcessor scoreProcessor;
+
+        public MultiplayerGameplayLeaderboard(OsuScoreProcessor scoreProcessor)
+        {
+            this.scoreProcessor = scoreProcessor;
+
+            AddPlayer(new BindableDouble(), new GuestUser());
+        }
+
+        [Resolved]
+        private SpectatorStreamingClient streamingClient { get; set; }
+
+        [Resolved]
+        private UserLookupCache userLookupCache { get; set; }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Console.WriteLine("got here");
+
+            foreach (var user in streamingClient.PlayingUsers)
+            {
+                streamingClient.WatchUser(user);
+                var resolvedUser = userLookupCache.GetUserAsync(user).Result;
+                AddPlayer(new BindableDouble(), resolvedUser);
+            }
+        }
+    }
+}

From 2954218897e90eb54a692063c0e4af5cf882d28c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Dec 2020 15:25:20 +0900
Subject: [PATCH 0275/3722] Add method to ScoreProcessor to calculate score and
 accuracy from statistics

---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 39 +++++++++++++++++++--
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 499673619f..b4f29d7a6e 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -68,7 +68,12 @@ namespace osu.Game.Rulesets.Scoring
         private readonly double comboPortion;
 
         private int maxAchievableCombo;
-        private double maxBaseScore;
+
+        /// <summary>
+        /// The maximum achievable base score.
+        /// </summary>
+        public double MaxBaseScore { get; private set; }
+
         private double rollingMaxBaseScore;
         private double baseScore;
 
@@ -196,7 +201,7 @@ namespace osu.Game.Rulesets.Scoring
         private double getScore(ScoringMode mode)
         {
             return GetScore(mode, maxAchievableCombo,
-                maxBaseScore > 0 ? baseScore / maxBaseScore : 0,
+                MaxBaseScore > 0 ? baseScore / MaxBaseScore : 0,
                 maxAchievableCombo > 0 ? (double)HighestCombo.Value / maxAchievableCombo : 1,
                 scoreResultCounts);
         }
@@ -227,6 +232,34 @@ namespace osu.Game.Rulesets.Scoring
             }
         }
 
+        /// <summary>
+        /// Given a minimal set of inputs, return the computed score and accuracy for the tracked beatmap / mods combination.
+        /// </summary>
+        /// <param name="mode">The <see cref="ScoringMode"/> to compute the total score in.</param>
+        /// <param name="maxCombo">The maximum combo achievable in the beatmap.</param>
+        /// <param name="statistics">Statistics to be used for calculating accuracy, bonus score, etc.</param>
+        /// <returns>The computed score and accuracy for provided inputs.</returns>
+        public (double score, double accuracy) GetScoreAndAccuracy(ScoringMode mode, int maxCombo, Dictionary<HitResult, int> statistics)
+        {
+            // calculate base score from statistics pairs
+            int computedBaseScore = 0;
+
+            foreach (var pair in statistics)
+            {
+                if (!pair.Key.AffectsAccuracy())
+                    continue;
+
+                computedBaseScore += Judgement.ToNumericResult(pair.Key) * pair.Value;
+            }
+
+            double accuracy = MaxBaseScore > 0 ? computedBaseScore / MaxBaseScore : 0;
+            double comboRatio = maxAchievableCombo > 0 ? (double)HighestCombo.Value / maxAchievableCombo : 1;
+
+            double score = GetScore(mode, maxAchievableCombo, accuracy, comboRatio, scoreResultCounts);
+
+            return (score, accuracy);
+        }
+
         private double getBonusScore(Dictionary<HitResult, int> statistics)
             => statistics.GetOrDefault(HitResult.SmallBonus) * Judgement.SMALL_BONUS_SCORE
                + statistics.GetOrDefault(HitResult.LargeBonus) * Judgement.LARGE_BONUS_SCORE;
@@ -266,7 +299,7 @@ namespace osu.Game.Rulesets.Scoring
             if (storeResults)
             {
                 maxAchievableCombo = HighestCombo.Value;
-                maxBaseScore = baseScore;
+                MaxBaseScore = baseScore;
             }
 
             baseScore = 0;

From d009a0be51defe7890002ca501d666c40e29fbd9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Dec 2020 15:25:27 +0900
Subject: [PATCH 0276/3722] Move class to final location

---
 .../HUD/MultiplayerGameplayLeaderboard.cs     | 98 +++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs

diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
new file mode 100644
index 0000000000..1d9fdd9ded
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.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.Collections.Generic;
+using System.Linq;
+using JetBrains.Annotations;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Game.Configuration;
+using osu.Game.Database;
+using osu.Game.Online.API;
+using osu.Game.Online.Spectator;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public class MultiplayerGameplayLeaderboard : GameplayLeaderboard
+    {
+        private readonly ScoreProcessor scoreProcessor;
+
+        /// <summary>
+        /// Construct a new leaderboard.
+        /// </summary>
+        /// <param name="scoreProcessor">A score processor instance to handle score calculation for scores of users in the match.</param>
+        public MultiplayerGameplayLeaderboard(ScoreProcessor scoreProcessor)
+        {
+            this.scoreProcessor = scoreProcessor;
+
+            AddPlayer(new BindableDouble(), new GuestUser());
+        }
+
+        [Resolved]
+        private SpectatorStreamingClient streamingClient { get; set; }
+
+        [Resolved]
+        private UserLookupCache userLookupCache { get; set; }
+
+        private readonly Dictionary<int, TrackedUserData> userScores = new Dictionary<int, TrackedUserData>();
+
+        private Bindable<ScoringMode> scoringMode;
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            streamingClient.OnNewFrames += handleIncomingFrames;
+
+            foreach (var user in streamingClient.PlayingUsers)
+            {
+                streamingClient.WatchUser(user);
+                var resolvedUser = userLookupCache.GetUserAsync(user).Result;
+
+                var trackedUser = new TrackedUserData();
+
+                userScores[user] = trackedUser;
+                AddPlayer(trackedUser.Score, resolvedUser);
+            }
+
+            scoringMode = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode);
+            scoringMode.BindValueChanged(updateAllScores, true);
+        }
+
+        private void updateAllScores(ValueChangedEvent<ScoringMode> mode)
+        {
+            foreach (var trackedData in userScores.Values)
+                trackedData.UpdateScore(scoreProcessor, mode.NewValue);
+        }
+
+        private void handleIncomingFrames(int userId, FrameDataBundle bundle)
+        {
+            if (userScores.TryGetValue(userId, out var trackedData))
+            {
+                trackedData.LastHeader = bundle.Header;
+                trackedData.UpdateScore(scoreProcessor, scoringMode.Value);
+            }
+        }
+
+        private class TrackedUserData
+        {
+            public readonly BindableDouble Score = new BindableDouble();
+
+            public readonly BindableDouble Accuracy = new BindableDouble();
+
+            public readonly BindableInt CurrentCombo = new BindableInt();
+
+            [CanBeNull]
+            public FrameHeader LastHeader;
+
+            public void UpdateScore(ScoreProcessor processor, ScoringMode mode)
+            {
+                if (LastHeader == null)
+                    return;
+
+                (Score.Value, Accuracy.Value) = processor.GetScoreAndAccuracy(mode, LastHeader.MaxCombo, LastHeader.Statistics.ToDictionary(s => s.Result, s => s.Count));
+                CurrentCombo.Value = LastHeader.Combo;
+            }
+        }
+    }
+}

From 09d0ceb7668e115170437c1d2063ed883897ed02 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Dec 2020 15:26:03 +0900
Subject: [PATCH 0277/3722] Add testing setup to get a better visual idea of
 how scoreboard will work

fixup! Add method to ScoreProcessor to calculate score and accuracy from statistics
---
 .../TestSceneSpectatorDrivenLeaderboard.cs    | 109 +++++++++++++-----
 .../HUD/MultiplayerGameplayLeaderboard.cs     |   4 +-
 2 files changed, 85 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs
index 7211755ba6..e7ebf6e92c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs
@@ -2,14 +2,18 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Game.Database;
-using osu.Game.Online.API;
+using osu.Framework.Utils;
 using osu.Game.Online.Spectator;
+using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets.Osu.Scoring;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
 using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -17,7 +21,7 @@ namespace osu.Game.Tests.Visual.Gameplay
     public class TestSceneSpectatorDrivenLeaderboard : OsuTestScene
     {
         [Cached(typeof(SpectatorStreamingClient))]
-        private TestSceneSpectator.TestSpectatorStreamingClient testSpectatorStreamingClient = new TestSceneSpectator.TestSpectatorStreamingClient();
+        private TestMultiplayerStreaming streamingClient = new TestMultiplayerStreaming(16);
 
         // used just to show beatmap card for the time being.
         protected override bool UseOnlineAPI => true;
@@ -27,7 +31,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             OsuScoreProcessor scoreProcessor;
 
-            testSpectatorStreamingClient.StartPlay(55);
+            streamingClient.Start(Beatmap.Value.BeatmapInfo.OnlineBeatmapID ?? 0);
 
             Children = new Drawable[]
             {
@@ -38,37 +42,90 @@ namespace osu.Game.Tests.Visual.Gameplay
                     Origin = Anchor.Centre,
                 }
             };
+
+            Beatmap.Value = CreateWorkingBeatmap(Ruleset.Value);
+
+            var playable = Beatmap.Value.GetPlayableBeatmap(Ruleset.Value);
+
+            scoreProcessor.ApplyBeatmap(playable);
         });
-    }
 
-    public class MultiplayerGameplayLeaderboard : GameplayLeaderboard
-    {
-        private readonly OsuScoreProcessor scoreProcessor;
-
-        public MultiplayerGameplayLeaderboard(OsuScoreProcessor scoreProcessor)
+        [Test]
+        public void TestScoreUpdates()
         {
-            this.scoreProcessor = scoreProcessor;
-
-            AddPlayer(new BindableDouble(), new GuestUser());
+            AddRepeatStep("update state", () => streamingClient.RandomlyUpdateState(), 100);
         }
 
-        [Resolved]
-        private SpectatorStreamingClient streamingClient { get; set; }
-
-        [Resolved]
-        private UserLookupCache userLookupCache { get; set; }
-
-        [BackgroundDependencyLoader]
-        private void load()
+        public class TestMultiplayerStreaming : SpectatorStreamingClient
         {
-            Console.WriteLine("got here");
+            public new BindableList<int> PlayingUsers => (BindableList<int>)base.PlayingUsers;
 
-            foreach (var user in streamingClient.PlayingUsers)
+            private readonly int totalUsers;
+
+            public TestMultiplayerStreaming(int totalUsers)
             {
-                streamingClient.WatchUser(user);
-                var resolvedUser = userLookupCache.GetUserAsync(user).Result;
-                AddPlayer(new BindableDouble(), resolvedUser);
+                this.totalUsers = totalUsers;
             }
+
+            public void Start(int beatmapId)
+            {
+                for (int i = 0; i < totalUsers; i++)
+                {
+                    ((ISpectatorClient)this).UserBeganPlaying(i, new SpectatorState
+                    {
+                        BeatmapID = beatmapId,
+                        RulesetID = 0,
+                    });
+                }
+            }
+
+            private readonly Dictionary<int, FrameHeader> lastHeaders = new Dictionary<int, FrameHeader>();
+
+            public void RandomlyUpdateState()
+            {
+                foreach (var userId in PlayingUsers)
+                {
+                    if (RNG.Next(0, 1) == 1)
+                        continue;
+
+                    if (!lastHeaders.TryGetValue(userId, out var header))
+                    {
+                        lastHeaders[userId] = header = new FrameHeader(new ScoreInfo
+                        {
+                            Statistics = new Dictionary<HitResult, int>(new[]
+                            {
+                                new KeyValuePair<HitResult, int>(HitResult.Miss, 0),
+                                new KeyValuePair<HitResult, int>(HitResult.Meh, 0),
+                                new KeyValuePair<HitResult, int>(HitResult.Great, 0)
+                            })
+                        });
+                    }
+
+                    switch (RNG.Next(0, 3))
+                    {
+                        case 0:
+                            header.Combo = 0;
+                            header.Statistics[HitResult.Miss]++;
+                            break;
+
+                        case 1:
+                            header.Combo++;
+                            header.MaxCombo = Math.Max(header.MaxCombo, header.Combo);
+                            header.Statistics[HitResult.Meh]++;
+                            break;
+
+                        default:
+                            header.Combo++;
+                            header.MaxCombo = Math.Max(header.MaxCombo, header.Combo);
+                            header.Statistics[HitResult.Great]++;
+                            break;
+                    }
+
+                    ((ISpectatorClient)this).UserSentFrames(userId, new FrameDataBundle(header, Array.Empty<LegacyReplayFrame>()));
+                }
+            }
+
+            protected override Task Connect() => Task.CompletedTask;
         }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index 1d9fdd9ded..b3621f42c2 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.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 JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -90,7 +89,8 @@ namespace osu.Game.Screens.Play.HUD
                 if (LastHeader == null)
                     return;
 
-                (Score.Value, Accuracy.Value) = processor.GetScoreAndAccuracy(mode, LastHeader.MaxCombo, LastHeader.Statistics.ToDictionary(s => s.Result, s => s.Count));
+                (Score.Value, Accuracy.Value) = processor.GetScoreAndAccuracy(mode, LastHeader.MaxCombo, LastHeader.Statistics);
+
                 CurrentCombo.Value = LastHeader.Combo;
             }
         }

From c1ba0f46425e756177e6c383d7f2e42b9d176c80 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Dec 2020 15:53:05 +0900
Subject: [PATCH 0278/3722] Use a local lookup cache for better usernames

---
 .../TestSceneSpectatorDrivenLeaderboard.cs    |  7 +++++
 .../TestSceneCurrentlyPlayingDisplay.cs       | 28 ++++++++++++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs
index e7ebf6e92c..647d57b5fe 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs
@@ -9,12 +9,14 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Utils;
+using osu.Game.Database;
 using osu.Game.Online.Spectator;
 using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play.HUD;
+using osu.Game.Tests.Visual.Online;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -23,6 +25,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached(typeof(SpectatorStreamingClient))]
         private TestMultiplayerStreaming streamingClient = new TestMultiplayerStreaming(16);
 
+        [Cached(typeof(UserLookupCache))]
+        private UserLookupCache lookupCache = new TestSceneCurrentlyPlayingDisplay.TestUserLookupCache();
+
         // used just to show beatmap card for the time being.
         protected override bool UseOnlineAPI => true;
 
@@ -35,6 +40,8 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             Children = new Drawable[]
             {
+                streamingClient,
+                lookupCache,
                 scoreProcessor = new OsuScoreProcessor(),
                 new MultiplayerGameplayLeaderboard(scoreProcessor)
                 {
diff --git a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
index 7eba64f418..4f0ca67e64 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
@@ -69,8 +69,34 @@ namespace osu.Game.Tests.Visual.Online
 
         internal class TestUserLookupCache : UserLookupCache
         {
+            private static readonly string[] usernames =
+            {
+                "fieryrage",
+                "Kerensa",
+                "MillhioreF",
+                "Player01",
+                "smoogipoo",
+                "Ephemeral",
+                "BTMC",
+                "Cilvery",
+                "m980",
+                "HappyStick",
+                "LittleEndu",
+                "frenzibyte",
+                "Zallius",
+                "BanchoBot",
+                "rocketminer210",
+                "pishifat"
+            };
+
+            private int id;
+
             protected override Task<User> ComputeValueAsync(int lookup, CancellationToken token = default)
-                => Task.FromResult(new User { Username = "peppy", Id = 2 });
+                => Task.FromResult(new User
+                {
+                    Id = id++,
+                    Username = usernames[id % usernames.Length],
+                });
         }
     }
 }

From 6e2131c164ad2a2d45ec7bab53d58deae3279de7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Dec 2020 15:53:15 +0900
Subject: [PATCH 0279/3722] Don't track local user score in any special way

---
 osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index b3621f42c2..f8fce0825f 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -7,7 +7,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Configuration;
 using osu.Game.Database;
-using osu.Game.Online.API;
 using osu.Game.Online.Spectator;
 using osu.Game.Rulesets.Scoring;
 
@@ -24,8 +23,6 @@ namespace osu.Game.Screens.Play.HUD
         public MultiplayerGameplayLeaderboard(ScoreProcessor scoreProcessor)
         {
             this.scoreProcessor = scoreProcessor;
-
-            AddPlayer(new BindableDouble(), new GuestUser());
         }
 
         [Resolved]

From 6bce587b599c04194589c8f3bd2716a44f886ea3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Dec 2020 16:05:46 +0900
Subject: [PATCH 0280/3722] Pass users in via constructor and correctly unbind
 on disposal

---
 .../TestSceneSpectatorDrivenLeaderboard.cs    |  3 +-
 .../HUD/MultiplayerGameplayLeaderboard.cs     | 32 ++++++++++++++++---
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs
index 647d57b5fe..ffd02d247a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Allocation;
@@ -43,7 +44,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 streamingClient,
                 lookupCache,
                 scoreProcessor = new OsuScoreProcessor(),
-                new MultiplayerGameplayLeaderboard(scoreProcessor)
+                new MultiplayerGameplayLeaderboard(scoreProcessor, streamingClient.PlayingUsers.ToArray())
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index f8fce0825f..93f258c507 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -16,13 +16,22 @@ namespace osu.Game.Screens.Play.HUD
     {
         private readonly ScoreProcessor scoreProcessor;
 
+        private readonly int[] userIds;
+
+        private readonly Dictionary<int, TrackedUserData> userScores = new Dictionary<int, TrackedUserData>();
+
         /// <summary>
         /// Construct a new leaderboard.
         /// </summary>
         /// <param name="scoreProcessor">A score processor instance to handle score calculation for scores of users in the match.</param>
-        public MultiplayerGameplayLeaderboard(ScoreProcessor scoreProcessor)
+        /// <param name="userIds">IDs of all users in this match.</param>
+        public MultiplayerGameplayLeaderboard(ScoreProcessor scoreProcessor, int[] userIds)
         {
+            // todo: this will eventually need to be created per user to support different mod combinations.
             this.scoreProcessor = scoreProcessor;
+
+            // todo: this will likely be passed in as User instances.
+            this.userIds = userIds;
         }
 
         [Resolved]
@@ -31,8 +40,6 @@ namespace osu.Game.Screens.Play.HUD
         [Resolved]
         private UserLookupCache userLookupCache { get; set; }
 
-        private readonly Dictionary<int, TrackedUserData> userScores = new Dictionary<int, TrackedUserData>();
-
         private Bindable<ScoringMode> scoringMode;
 
         [BackgroundDependencyLoader]
@@ -40,9 +47,11 @@ namespace osu.Game.Screens.Play.HUD
         {
             streamingClient.OnNewFrames += handleIncomingFrames;
 
-            foreach (var user in streamingClient.PlayingUsers)
+            foreach (var user in userIds)
             {
                 streamingClient.WatchUser(user);
+
+                // probably won't be required in the final implementation.
                 var resolvedUser = userLookupCache.GetUserAsync(user).Result;
 
                 var trackedUser = new TrackedUserData();
@@ -70,6 +79,21 @@ namespace osu.Game.Screens.Play.HUD
             }
         }
 
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (streamingClient != null)
+            {
+                foreach (var user in userIds)
+                {
+                    streamingClient.StopWatchingUser(user);
+                }
+
+                streamingClient.OnNewFrames -= handleIncomingFrames;
+            }
+        }
+
         private class TrackedUserData
         {
             public readonly BindableDouble Score = new BindableDouble();

From a01bb3d5a3a7ee33650de9b305addf61a1daa16f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Dec 2020 16:08:44 +0900
Subject: [PATCH 0281/3722] Better limit bindable exposure of data class

---
 osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs |  2 +-
 .../Play/HUD/MultiplayerGameplayLeaderboard.cs   | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index e53c56b390..3934a99221 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Screens.Play.HUD
         /// </summary>
         /// <param name="currentScore">The bindable current score of the player.</param>
         /// <param name="user">The player.</param>
-        public void AddPlayer([NotNull] BindableDouble currentScore, [NotNull] User user)
+        public void AddPlayer([NotNull] IBindableNumber<double> currentScore, [NotNull] User user)
         {
             var scoreItem = addScore(currentScore.Value, user);
             currentScore.ValueChanged += s => scoreItem.TotalScore = s.NewValue;
diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index 93f258c507..33bcf06aa7 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -96,11 +96,17 @@ namespace osu.Game.Screens.Play.HUD
 
         private class TrackedUserData
         {
-            public readonly BindableDouble Score = new BindableDouble();
+            public IBindableNumber<double> Score => score;
 
-            public readonly BindableDouble Accuracy = new BindableDouble();
+            private readonly BindableDouble score = new BindableDouble();
 
-            public readonly BindableInt CurrentCombo = new BindableInt();
+            public IBindableNumber<double> Accuracy => accuracy;
+
+            private readonly BindableDouble accuracy = new BindableDouble();
+
+            public IBindableNumber<int> CurrentCombo => currentCombo;
+
+            private readonly BindableInt currentCombo = new BindableInt();
 
             [CanBeNull]
             public FrameHeader LastHeader;
@@ -110,9 +116,9 @@ namespace osu.Game.Screens.Play.HUD
                 if (LastHeader == null)
                     return;
 
-                (Score.Value, Accuracy.Value) = processor.GetScoreAndAccuracy(mode, LastHeader.MaxCombo, LastHeader.Statistics);
+                (score.Value, accuracy.Value) = processor.GetScoreAndAccuracy(mode, LastHeader.MaxCombo, LastHeader.Statistics);
 
-                CurrentCombo.Value = LastHeader.Combo;
+                currentCombo.Value = LastHeader.Combo;
             }
         }
     }

From cda3bd2017180391786a46ef771c4b3e04dc4cb1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Dec 2020 16:22:47 +0900
Subject: [PATCH 0282/3722] Rename test scene to match tested class name

---
 ...erboard.cs => TestSceneMultiplayerGameplayLeaderboard.cs} | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
 rename osu.Game.Tests/Visual/Gameplay/{TestSceneSpectatorDrivenLeaderboard.cs => TestSceneMultiplayerGameplayLeaderboard.cs} (96%)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
similarity index 96%
rename from osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs
rename to osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
index ffd02d247a..78f9db57be 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorDrivenLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -21,7 +21,7 @@ using osu.Game.Tests.Visual.Online;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestSceneSpectatorDrivenLeaderboard : OsuTestScene
+    public class TestSceneMultiplayerGameplayLeaderboard : OsuTestScene
     {
         [Cached(typeof(SpectatorStreamingClient))]
         private TestMultiplayerStreaming streamingClient = new TestMultiplayerStreaming(16);
@@ -29,9 +29,6 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached(typeof(UserLookupCache))]
         private UserLookupCache lookupCache = new TestSceneCurrentlyPlayingDisplay.TestUserLookupCache();
 
-        // used just to show beatmap card for the time being.
-        protected override bool UseOnlineAPI => true;
-
         [SetUp]
         public void SetUp() => Schedule(() =>
         {

From c0021847686aa1c3022abef0dabaa858b2cc8464 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Dec 2020 18:08:16 +0900
Subject: [PATCH 0283/3722] Clamp osu!mania's HitPosition offset to match
 osu-stable implementation

Closes #11184.
---
 osu.Game/Skinning/LegacyManiaSkinDecoder.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
index 6a04a95040..0a1de461ea 100644
--- a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Skinning
                         break;
 
                     case "HitPosition":
-                        currentConfig.HitPosition = (480 - float.Parse(pair.Value, CultureInfo.InvariantCulture)) * LegacyManiaSkinConfiguration.POSITION_SCALE_FACTOR;
+                        currentConfig.HitPosition = (480 - Math.Clamp(float.Parse(pair.Value, CultureInfo.InvariantCulture), 240, 480)) * LegacyManiaSkinConfiguration.POSITION_SCALE_FACTOR;
                         break;
 
                     case "LightPosition":

From 95711578415c95d6fcc52498e88c55da0712d40f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 16 Dec 2020 20:04:28 +0900
Subject: [PATCH 0284/3722] Use ints for userid parameters

---
 osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs     | 4 ++--
 osu.Game/Online/RealtimeMultiplayer/IMultiplayerRoomServer.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
index c162f066d4..9af0047137 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// Signal that the host of the room has changed.
         /// </summary>
         /// <param name="userId">The user ID of the new host.</param>
-        Task HostChanged(long userId);
+        Task HostChanged(int userId);
 
         /// <summary>
         /// Signals that the settings for this room have changed.
@@ -45,7 +45,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// </summary>
         /// <param name="userId">The ID of the user performing a state change.</param>
         /// <param name="state">The new state of the user.</param>
-        Task UserStateChanged(long userId, MultiplayerUserState state);
+        Task UserStateChanged(int userId, MultiplayerUserState state);
 
         /// <summary>
         /// Signals that a match is to be started. This will *only* be sent to clients which are to begin loading at this point.
diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerRoomServer.cs b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerRoomServer.cs
index f1b3daf7d3..12dfe481c4 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerRoomServer.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/IMultiplayerRoomServer.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// <param name="userId">The new user which is to become host.</param>
         /// <exception cref="NotHostException">A user other than the current host is attempting to transfer host.</exception>
         /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
-        Task TransferHost(long userId);
+        Task TransferHost(int userId);
 
         /// <summary>
         /// As the host, update the settings of the currently joined room.

From 5d7294451f1a5a24a7eabdf7a738e6fc07278b17 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 16 Dec 2020 14:28:16 +0100
Subject: [PATCH 0285/3722] Refactor Import() overload to take a list of import
 tasks instead.

---
 osu.Android/OsuGameActivity.cs                  | 3 ++-
 osu.Game/Database/ArchiveModelManager.cs        | 4 ++--
 osu.Game/Database/ICanAcceptFiles.cs            | 7 ++-----
 osu.Game/OsuGame.cs                             | 6 +++---
 osu.Game/OsuGameBase.cs                         | 6 +++---
 osu.Game/Screens/Edit/Setup/ResourcesSection.cs | 2 +-
 6 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index e801c2ca6e..bd5523f0e2 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -11,6 +11,7 @@ using Android.OS;
 using Android.Provider;
 using Android.Views;
 using osu.Framework.Android;
+using osu.Game.Database;
 
 namespace osu.Android
 {
@@ -82,7 +83,7 @@ namespace osu.Android
             using (var stream = ContentResolver.OpenInputStream(uri))
                 await stream.CopyToAsync(copy);
 
-            await game.Import(copy, filename);
+            await game.Import(new ImportTask(copy, filename));
         }, TaskCreationOptions.LongRunning);
     }
 }
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 36cc4cce39..9f69ad035f 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -115,13 +115,13 @@ namespace osu.Game.Database
             return Import(notification, paths.Select(p => new ImportTask(p)).ToArray());
         }
 
-        public Task Import(Stream stream, string filename)
+        public Task Import(params ImportTask[] tasks)
         {
             var notification = new ProgressNotification { State = ProgressNotificationState.Active };
 
             PostNotification?.Invoke(notification);
 
-            return Import(notification, new ImportTask(stream, filename));
+            return Import(notification, tasks);
         }
 
         protected async Task<IEnumerable<TModel>> Import(ProgressNotification notification, params ImportTask[] tasks)
diff --git a/osu.Game/Database/ICanAcceptFiles.cs b/osu.Game/Database/ICanAcceptFiles.cs
index 276c284c9f..5ec187975a 100644
--- a/osu.Game/Database/ICanAcceptFiles.cs
+++ b/osu.Game/Database/ICanAcceptFiles.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using System.IO;
 using System.Threading.Tasks;
 
 namespace osu.Game.Database
@@ -19,11 +18,9 @@ namespace osu.Game.Database
         Task Import(params string[] paths);
 
         /// <summary>
-        /// Import the provided stream as a simple item.
+        /// Import the specified files from the given import tasks.
         /// </summary>
-        /// <param name="stream">The stream to import files from. Should be in a supported archive format.</param>
-        /// <param name="filename">The filename of the archive being imported.</param>
-        Task Import(Stream stream, string filename);
+        Task Import(params ImportTask[] tasks);
 
         /// <summary>
         /// An array of accepted file extensions (in the standard format of ".abc").
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index d67d790ce2..1f5b991758 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -52,7 +52,7 @@ using osu.Game.Updater;
 using osu.Game.Utils;
 using LogLevel = osu.Framework.Logging.LogLevel;
 using osu.Game.Users;
-using System.IO;
+using osu.Game.Database;
 
 namespace osu.Game
 {
@@ -427,10 +427,10 @@ namespace osu.Game
             }, validScreens: new[] { typeof(PlaySongSelect) });
         }
 
-        public override Task Import(Stream stream, string filename)
+        public override Task Import(params ImportTask[] imports)
         {
             // encapsulate task as we don't want to begin the import process until in a ready state.
-            var importTask = new Task(async () => await base.Import(stream, filename));
+            var importTask = new Task(async () => await base.Import(imports));
 
             waitForReady(() => this, _ => importTask.Start());
 
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 150569f1dd..0a579cc347 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -395,14 +395,14 @@ namespace osu.Game
             }
         }
 
-        public virtual async Task Import(Stream stream, string filename)
+        public virtual async Task Import(params ImportTask[] tasks)
         {
-            var extension = Path.GetExtension(filename)?.ToLowerInvariant();
+            var extension = Path.GetExtension(tasks.First().Path)?.ToLowerInvariant();
 
             foreach (var importer in fileImporters)
             {
                 if (importer.HandledExtensions.Contains(extension))
-                    await importer.Import(stream, Path.GetFileNameWithoutExtension(filename));
+                    await importer.Import(tasks);
             }
         }
 
diff --git a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
index 0c957b80af..fe9b10667a 100644
--- a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
+++ b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
@@ -100,7 +100,7 @@ namespace osu.Game.Screens.Edit.Setup
             return Task.CompletedTask;
         }
 
-        Task ICanAcceptFiles.Import(Stream stream, string filename) => throw new NotImplementedException();
+        Task ICanAcceptFiles.Import(params ImportTask[] tasks) => throw new NotImplementedException();
 
         protected override void LoadComplete()
         {

From 9d8906924580cc3886759de27dbbb05fb5460b00 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 16 Dec 2020 20:33:29 +0100
Subject: [PATCH 0286/3722] Add ability to import multiple files at once on
 android.

---
 osu.Android/OsuGameActivity.cs | 63 ++++++++++++++++++++++++----------
 1 file changed, 44 insertions(+), 19 deletions(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index bd5523f0e2..bf73f33b74 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -1,7 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 using Android.App;
 using Android.Content;
@@ -16,7 +18,7 @@ using osu.Game.Database;
 namespace osu.Android
 {
     [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false)]
-    [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataPathPatterns = new[] { ".*\\.osz", ".*\\.osk" }, DataMimeType = "application/*")]
+    [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend, Intent.ActionSendMultiple }, Categories = new[] { Intent.CategoryDefault }, DataPathPatterns = new[] { ".*\\.osz", ".*\\.osk" }, DataMimeType = "application/*")]
     public class OsuGameActivity : AndroidGameActivity
     {
         private OsuGameAndroid game;
@@ -49,41 +51,64 @@ namespace osu.Android
             {
                 case Intent.ActionDefault:
                     if (intent.Scheme == ContentResolver.SchemeContent)
-                        handleImportFromUri(intent.Data);
+                        handleImportFromUris(intent.Data);
                     break;
 
                 case Intent.ActionSend:
                 {
                     var content = intent.ClipData?.GetItemAt(0);
                     if (content != null)
-                        handleImportFromUri(content.Uri);
+                        handleImportFromUris(content.Uri);
+                    break;
+                }
+
+                case Intent.ActionSendMultiple:
+                {
+                    var uris = new List<Uri>();
+                    for (int i = 0; i < intent.ClipData?.ItemCount; i++)
+                    {
+                        var content = intent.ClipData?.GetItemAt(i);
+                        if (content != null)
+                            uris.Add(content.Uri);
+                    }
+                    handleImportFromUris(uris.ToArray());
                     break;
                 }
             }
         }
 
-        private void handleImportFromUri(Uri uri) => Task.Factory.StartNew(async () =>
+        private void handleImportFromUris(params Uri[] uris) => Task.Factory.StartNew(async () =>
         {
-            // there are more performant overloads of this method, but this one is the most backwards-compatible
-            // (dates back to API 1).
-            var cursor = ContentResolver?.Query(uri, null, null, null, null);
+            var tasks = new List<ImportTask>();
 
-            if (cursor == null)
-                return;
+            await Task.WhenAll(uris.Select(async uri =>
+            {
+                // there are more performant overloads of this method, but this one is the most backwards-compatible
+                // (dates back to API 1).
+                var cursor = ContentResolver?.Query(uri, null, null, null, null);
 
-            cursor.MoveToFirst();
+                if (cursor == null)
+                    return;
 
-            var filenameColumn = cursor.GetColumnIndex(OpenableColumns.DisplayName);
-            string filename = cursor.GetString(filenameColumn);
+                cursor.MoveToFirst();
 
-            // SharpCompress requires archive streams to be seekable, which the stream opened by
-            // OpenInputStream() seems to not necessarily be.
-            // copy to an arbitrary-access memory stream to be able to proceed with the import.
-            var copy = new MemoryStream();
-            using (var stream = ContentResolver.OpenInputStream(uri))
-                await stream.CopyToAsync(copy);
+                var filenameColumn = cursor.GetColumnIndex(OpenableColumns.DisplayName);
+                string filename = cursor.GetString(filenameColumn);
 
-            await game.Import(new ImportTask(copy, filename));
+                // SharpCompress requires archive streams to be seekable, which the stream opened by
+                // OpenInputStream() seems to not necessarily be.
+                // copy to an arbitrary-access memory stream to be able to proceed with the import.
+                var copy = new MemoryStream();
+                using (var stream = ContentResolver.OpenInputStream(uri))
+                    await stream.CopyToAsync(copy);
+
+                lock (tasks)
+                {
+                    tasks.Add(new ImportTask(copy, filename));
+                }
+            }));
+
+            await game.Import(tasks.ToArray());
         }, TaskCreationOptions.LongRunning);
     }
 }

From cc0442a9a17880bd6f427638f831f97f6f50cb50 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 16 Dec 2020 20:42:30 +0100
Subject: [PATCH 0287/3722] Fix CI inspections.

---
 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 0a579cc347..521778a9cd 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -397,7 +397,7 @@ namespace osu.Game
 
         public virtual async Task Import(params ImportTask[] tasks)
         {
-            var extension = Path.GetExtension(tasks.First().Path)?.ToLowerInvariant();
+            var extension = Path.GetExtension(tasks.First().Path).ToLowerInvariant();
 
             foreach (var importer in fileImporters)
             {

From 41d8b84bd7c7aff099593a034c8dd71ee1d0ae13 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 17 Dec 2020 15:47:20 +0900
Subject: [PATCH 0288/3722] Revert MaxBaseScore to being a private field (no
 longe required to be public)

---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index b4f29d7a6e..f4850d3325 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Rulesets.Scoring
         /// <summary>
         /// The maximum achievable base score.
         /// </summary>
-        public double MaxBaseScore { get; private set; }
+        private double maxBaseScore;
 
         private double rollingMaxBaseScore;
         private double baseScore;
@@ -201,7 +201,7 @@ namespace osu.Game.Rulesets.Scoring
         private double getScore(ScoringMode mode)
         {
             return GetScore(mode, maxAchievableCombo,
-                MaxBaseScore > 0 ? baseScore / MaxBaseScore : 0,
+                maxBaseScore > 0 ? baseScore / maxBaseScore : 0,
                 maxAchievableCombo > 0 ? (double)HighestCombo.Value / maxAchievableCombo : 1,
                 scoreResultCounts);
         }
@@ -252,7 +252,7 @@ namespace osu.Game.Rulesets.Scoring
                 computedBaseScore += Judgement.ToNumericResult(pair.Key) * pair.Value;
             }
 
-            double accuracy = MaxBaseScore > 0 ? computedBaseScore / MaxBaseScore : 0;
+            double accuracy = maxBaseScore > 0 ? computedBaseScore / maxBaseScore : 0;
             double comboRatio = maxAchievableCombo > 0 ? (double)HighestCombo.Value / maxAchievableCombo : 1;
 
             double score = GetScore(mode, maxAchievableCombo, accuracy, comboRatio, scoreResultCounts);
@@ -299,7 +299,7 @@ namespace osu.Game.Rulesets.Scoring
             if (storeResults)
             {
                 maxAchievableCombo = HighestCombo.Value;
-                MaxBaseScore = baseScore;
+                maxBaseScore = baseScore;
             }
 
             baseScore = 0;

From de9c21e7d19e265fbf776430d2708f860ed16bbf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 17 Dec 2020 15:48:53 +0900
Subject: [PATCH 0289/3722] Tenatively mark leaderboard class as
 LongRunningLoad until final integration

---
 osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index 33bcf06aa7..b2dc47ce61 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -12,6 +12,7 @@ using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Screens.Play.HUD
 {
+    [LongRunningLoad]
     public class MultiplayerGameplayLeaderboard : GameplayLeaderboard
     {
         private readonly ScoreProcessor scoreProcessor;

From cc3dddf59fa432bad0fc2d36fe8810853223f48f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 17 Dec 2020 16:02:06 +0900
Subject: [PATCH 0290/3722] Fix test scene crashing on second run of SetUp

Also correctly support LongRunningLoad
---
 ...TestSceneMultiplayerGameplayLeaderboard.cs | 53 +++++++++++++------
 1 file changed, 36 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
index 78f9db57be..0c8d8ca165 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -9,6 +9,8 @@ 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.Framework.Utils;
 using osu.Game.Database;
 using osu.Game.Online.Spectator;
@@ -29,31 +31,48 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached(typeof(UserLookupCache))]
         private UserLookupCache lookupCache = new TestSceneCurrentlyPlayingDisplay.TestUserLookupCache();
 
-        [SetUp]
-        public void SetUp() => Schedule(() =>
+        private MultiplayerGameplayLeaderboard leaderboard;
+
+        protected override Container<Drawable> Content { get; } = new Container { RelativeSizeAxes = Axes.Both };
+
+        public TestSceneMultiplayerGameplayLeaderboard()
         {
-            OsuScoreProcessor scoreProcessor;
-
-            streamingClient.Start(Beatmap.Value.BeatmapInfo.OnlineBeatmapID ?? 0);
-
-            Children = new Drawable[]
+            base.Content.Children = new Drawable[]
             {
                 streamingClient,
                 lookupCache,
-                scoreProcessor = new OsuScoreProcessor(),
-                new MultiplayerGameplayLeaderboard(scoreProcessor, streamingClient.PlayingUsers.ToArray())
+                Content
+            };
+        }
+
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("create leaderboard", () =>
+            {
+                OsuScoreProcessor scoreProcessor;
+                Beatmap.Value = CreateWorkingBeatmap(Ruleset.Value);
+
+                var playable = Beatmap.Value.GetPlayableBeatmap(Ruleset.Value);
+
+                streamingClient.Start(Beatmap.Value.BeatmapInfo.OnlineBeatmapID ?? 0);
+
+                Children = new Drawable[]
+                {
+                    scoreProcessor = new OsuScoreProcessor(),
+                };
+
+                scoreProcessor.ApplyBeatmap(playable);
+
+                LoadComponentAsync(leaderboard = new MultiplayerGameplayLeaderboard(scoreProcessor, streamingClient.PlayingUsers.ToArray())
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                }
-            };
+                }, Add);
+            });
 
-            Beatmap.Value = CreateWorkingBeatmap(Ruleset.Value);
-
-            var playable = Beatmap.Value.GetPlayableBeatmap(Ruleset.Value);
-
-            scoreProcessor.ApplyBeatmap(playable);
-        });
+            AddUntilStep("wait for load", () => leaderboard.IsLoaded);
+        }
 
         [Test]
         public void TestScoreUpdates()

From f13683dc908e2f42b19d2a1fb6b05f808eb01b36 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 17 Dec 2020 16:05:41 +0900
Subject: [PATCH 0291/3722] Correctly account for max combo of the input,
 rather than the global

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

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index f4850d3325..f5fb918ba3 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -253,7 +253,7 @@ namespace osu.Game.Rulesets.Scoring
             }
 
             double accuracy = maxBaseScore > 0 ? computedBaseScore / maxBaseScore : 0;
-            double comboRatio = maxAchievableCombo > 0 ? (double)HighestCombo.Value / maxAchievableCombo : 1;
+            double comboRatio = maxAchievableCombo > 0 ? (double)maxCombo / maxAchievableCombo : 1;
 
             double score = GetScore(mode, maxAchievableCombo, accuracy, comboRatio, scoreResultCounts);
 

From 81b0db040179821af0928ae8389a85f5666f3f4a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 17 Dec 2020 16:14:41 +0900
Subject: [PATCH 0292/3722] Remove double construction of empty replay object

---
 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 f40a7ccda8..18950a9d0a 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -21,7 +21,6 @@ using osu.Game.Graphics.Containers;
 using osu.Game.IO.Archives;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
-using osu.Game.Replays;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
@@ -164,7 +163,7 @@ namespace osu.Game.Screens.Play
         /// </summary>
         protected virtual void PrepareReplay()
         {
-            DrawableRuleset.SetRecordTarget(recordingScore = new Score { Replay = new Replay() });
+            DrawableRuleset.SetRecordTarget(recordingScore = new Score());
 
             ScoreProcessor.NewJudgement += result => ScoreProcessor.PopulateScore(recordingScore.ScoreInfo);
         }

From 3ff70d331adf2e87451b3bcb8306c39140d9a7e3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 17 Dec 2020 16:17:13 +0900
Subject: [PATCH 0293/3722] Mark recordingScore as nullable

---
 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 18950a9d0a..a54f9fc047 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
@@ -156,6 +157,7 @@ namespace osu.Game.Screens.Play
                 PrepareReplay();
         }
 
+        [CanBeNull]
         private Score recordingScore;
 
         /// <summary>

From 78ce6f1cd21e81858f7f923dab907e52dde020e9 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 17 Dec 2020 13:30:55 +0300
Subject: [PATCH 0294/3722] Add friends list to API providers

---
 osu.Game/Online/API/APIAccess.cs      | 14 ++++++++++++--
 osu.Game/Online/API/DummyAPIAccess.cs |  7 +++++++
 osu.Game/Online/API/IAPIProvider.cs   |  6 ++++++
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index b916339a53..f084f6f2c7 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -41,6 +41,8 @@ namespace osu.Game.Online.API
 
         public Bindable<User> LocalUser { get; } = new Bindable<User>(createGuestUser());
 
+        public BindableList<User> Friends { get; } = new BindableList<User>();
+
         public Bindable<UserActivity> Activity { get; } = new Bindable<UserActivity>();
 
         protected bool HasLogin => authentication.Token.Value != null || (!string.IsNullOrEmpty(ProvidedUsername) && !string.IsNullOrEmpty(password));
@@ -143,6 +145,10 @@ namespace osu.Game.Online.API
 
                             failureCount = 0;
 
+                            var friendsReq = new GetFriendsRequest();
+                            friendsReq.Success += f => Friends.AddRange(f);
+                            handleRequest(friendsReq);
+
                             //we're connected!
                             state.Value = APIState.Online;
                         };
@@ -352,8 +358,12 @@ namespace osu.Game.Online.API
             password = null;
             authentication.Clear();
 
-            // Scheduled prior to state change such that the state changed event is invoked with the correct user present
-            Schedule(() => LocalUser.Value = createGuestUser());
+            // Scheduled prior to state change such that the state changed event is invoked with the correct user and their friends present
+            Schedule(() =>
+            {
+                LocalUser.Value = createGuestUser();
+                Friends.Clear();
+            });
 
             state.Value = APIState.Offline;
         }
diff --git a/osu.Game/Online/API/DummyAPIAccess.cs b/osu.Game/Online/API/DummyAPIAccess.cs
index e275676cea..7e5a6378ec 100644
--- a/osu.Game/Online/API/DummyAPIAccess.cs
+++ b/osu.Game/Online/API/DummyAPIAccess.cs
@@ -5,6 +5,7 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Game.Users;
 
@@ -18,6 +19,12 @@ namespace osu.Game.Online.API
             Id = 1001,
         });
 
+        public BindableList<User> Friends { get; } = new BindableList<User>(new User
+        {
+            Username = @"Dummy's friend",
+            Id = 2002,
+        }.Yield());
+
         public Bindable<UserActivity> Activity { get; } = new Bindable<UserActivity>();
 
         public string AccessToken => "token";
diff --git a/osu.Game/Online/API/IAPIProvider.cs b/osu.Game/Online/API/IAPIProvider.cs
index cadc806f4f..3f62b37a48 100644
--- a/osu.Game/Online/API/IAPIProvider.cs
+++ b/osu.Game/Online/API/IAPIProvider.cs
@@ -15,6 +15,12 @@ namespace osu.Game.Online.API
         /// </summary>
         Bindable<User> LocalUser { get; }
 
+        /// <summary>
+        /// The user's friends.
+        /// This is not thread-safe and should be scheduled locally if consumed from a drawable component.
+        /// </summary>
+        BindableList<User> Friends { get; }
+
         /// <summary>
         /// The current user's activity.
         /// This is not thread-safe and should be scheduled locally if consumed from a drawable component.

From 449b9a21aefe912280728fd621fe11c782fbdb28 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 17 Dec 2020 13:31:57 +0300
Subject: [PATCH 0295/3722] Allow OverlayView fetching with no API requests
 required

---
 osu.Game/Overlays/OverlayView.cs | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/OverlayView.cs b/osu.Game/Overlays/OverlayView.cs
index c254cdf290..f5ef183bd5 100644
--- a/osu.Game/Overlays/OverlayView.cs
+++ b/osu.Game/Overlays/OverlayView.cs
@@ -42,25 +42,29 @@ namespace osu.Game.Overlays
         /// <summary>
         /// Create the API request for fetching data.
         /// </summary>
-        protected abstract APIRequest<T> CreateRequest();
+        protected virtual APIRequest<T> CreateRequest() => null;
 
         /// <summary>
         /// Fired when results arrive from the main API request.
         /// </summary>
         /// <param name="response"></param>
-        protected abstract void OnSuccess(T response);
+        protected virtual void OnSuccess(T response)
+        {
+        }
 
         /// <summary>
         /// Force a re-request for data from the API.
         /// </summary>
-        protected void PerformFetch()
+        protected virtual void PerformFetch()
         {
             request?.Cancel();
-
             request = CreateRequest();
-            request.Success += response => Schedule(() => OnSuccess(response));
 
-            API.Queue(request);
+            if (request != null)
+            {
+                request.Success += response => Schedule(() => OnSuccess(response));
+                API.Queue(request);
+            }
         }
 
         private void onlineStateChanged(ValueChangedEvent<APIState> state) => Schedule(() =>

From 94175d053289d944765c24d3e486f402929692e0 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 17 Dec 2020 13:33:17 +0300
Subject: [PATCH 0296/3722] Use global friends list instead of always fetching

---
 osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs b/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
index 41b25ee1a5..8a8ac36e14 100644
--- a/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
@@ -9,8 +9,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.API;
-using osu.Game.Online.API.Requests;
 using osu.Game.Users;
 using osuTK;
 
@@ -143,11 +141,11 @@ namespace osu.Game.Overlays.Dashboard.Friends
             userListToolbar.SortCriteria.BindValueChanged(_ => recreatePanels());
         }
 
-        protected override APIRequest<List<User>> CreateRequest() => new GetFriendsRequest();
-
-        protected override void OnSuccess(List<User> response)
+        protected override void PerformFetch()
         {
-            Users = response;
+            base.PerformFetch();
+
+            Users = API.Friends.ToList();
         }
 
         private void recreatePanels()

From 904a4daa985b8f5e37573520a9147ad9adb80167 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 17 Dec 2020 13:33:49 +0300
Subject: [PATCH 0297/3722] Add todo comment reminding of updating friends list
 along

---
 osu.Game/Overlays/Profile/Header/Components/AddFriendButton.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Overlays/Profile/Header/Components/AddFriendButton.cs b/osu.Game/Overlays/Profile/Header/Components/AddFriendButton.cs
index 6e1b6e2c7d..6c2b2dc16a 100644
--- a/osu.Game/Overlays/Profile/Header/Components/AddFriendButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/AddFriendButton.cs
@@ -50,6 +50,8 @@ namespace osu.Game.Overlays.Profile.Header.Components
                 }
             };
 
+            // todo: when friending/unfriending is implemented, the APIAccess.Friends list should be updated accordingly.
+
             User.BindValueChanged(user => updateFollowers(user.NewValue), true);
         }
 

From 5d180753fa3cbc40971c867e5d1b36cdf1484306 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 17 Dec 2020 13:44:30 +0300
Subject: [PATCH 0298/3722] Complete connection once friends list is
 succesfully fetched

---
 osu.Game/Online/API/APIAccess.cs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index f084f6f2c7..806a42a38b 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -146,11 +146,15 @@ namespace osu.Game.Online.API
                             failureCount = 0;
 
                             var friendsReq = new GetFriendsRequest();
-                            friendsReq.Success += f => Friends.AddRange(f);
-                            handleRequest(friendsReq);
+                            friendsReq.Success += f =>
+                            {
+                                Friends.AddRange(f);
 
-                            //we're connected!
-                            state.Value = APIState.Online;
+                                //we're connected!
+                                state.Value = APIState.Online;
+                            };
+
+                            handleRequest(friendsReq);
                         };
 
                         if (!handleRequest(userReq))

From 0faf3fdfd3fc4f96d137d1e8824398383e441ace Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 17 Dec 2020 15:12:32 +0300
Subject: [PATCH 0299/3722] Update gameplay leaderboard scores with the new
 design

---
 .../Gameplay/TestSceneGameplayLeaderboard.cs  |  11 +-
 .../Screens/Play/HUD/GameplayLeaderboard.cs   |  47 +--
 .../Play/HUD/GameplayLeaderboardScore.cs      | 268 ++++++++++++------
 3 files changed, 215 insertions(+), 111 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
index df970c1c46..d0fdb3dd9c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
@@ -24,9 +24,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             Add(leaderboard = new TestGameplayLeaderboard
             {
                 Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
+                Origin = Anchor.TopCentre,
                 Scale = new Vector2(2),
-                RelativeSizeAxes = Axes.X,
             });
         }
 
@@ -39,7 +38,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 playerScore.Value = 1222333;
             });
 
-            AddStep("add player user", () => leaderboard.AddPlayer(playerScore, new User { Username = "You" }));
+            AddStep("add player user", () => leaderboard.AddLocalUser(playerScore, new User { Username = "You" }));
             AddSliderStep("set player score", 50, 5000000, 1222333, v => playerScore.Value = v);
         }
 
@@ -75,6 +74,12 @@ namespace osu.Game.Tests.Visual.Gameplay
 
                 return scoreItem != null && scoreItem.ScorePosition == expectedPosition;
             }
+
+            public void AddPlayer(BindableDouble totalScore, User user) =>
+                base.AddPlayer(totalScore, new BindableDouble(1f), new BindableInt(1), user, false);
+
+            public void AddLocalUser(BindableDouble totalScore, User user) =>
+                base.AddPlayer(totalScore, new BindableDouble(1f), new BindableInt(1), user, true);
         }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index e53c56b390..a2673e3097 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -15,8 +15,7 @@ namespace osu.Game.Screens.Play.HUD
     {
         public GameplayLeaderboard()
         {
-            RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Axes.Y;
+            AutoSizeAxes = Axes.Both;
 
             Direction = FillDirection.Vertical;
 
@@ -29,32 +28,44 @@ namespace osu.Game.Screens.Play.HUD
         /// <summary>
         /// Adds a player to the leaderboard.
         /// </summary>
-        /// <param name="currentScore">The bindable current score of the player.</param>
+        /// <param name="totalScore">A bindable of the player's total score.</param>
+        /// <param name="accuracy">A bindable of the player's accuracy.</param>
+        /// <param name="combo">A bindable of the player's current combo.</param>
         /// <param name="user">The player.</param>
-        public void AddPlayer([NotNull] BindableDouble currentScore, [NotNull] User user)
+        public void AddPlayer([NotNull] IBindableNumber<double> totalScore,
+                              [NotNull] IBindableNumber<double> accuracy,
+                              [NotNull] IBindableNumber<int> combo,
+                              [NotNull] User user)
         {
-            var scoreItem = addScore(currentScore.Value, user);
-            currentScore.ValueChanged += s => scoreItem.TotalScore = s.NewValue;
+            AddPlayer(totalScore, accuracy, combo, user, false);
         }
 
-        private GameplayLeaderboardScore addScore(double totalScore, User user)
+        /// <summary>
+        /// Adds a player to the leaderboard.
+        /// </summary>
+        /// <param name="totalScore">A bindable of the player's total score.</param>
+        /// <param name="accuracy">A bindable of the player's accuracy.</param>
+        /// <param name="combo">A bindable of the player's current combo.</param>
+        /// <param name="user">The player.</param>
+        /// <param name="localUser">Whether the provided <paramref name="user"/> is the local user.</param>
+        protected void AddPlayer([NotNull] IBindableNumber<double> totalScore,
+                                 [NotNull] IBindableNumber<double> accuracy,
+                                 [NotNull] IBindableNumber<int> combo,
+                                 [NotNull] User user, bool localUser) => Schedule(() =>
         {
-            var scoreItem = new GameplayLeaderboardScore
+            Add(new GameplayLeaderboardScore(user, localUser)
             {
-                User = user,
-                TotalScore = totalScore,
-                OnScoreChange = updateScores,
-            };
+                TotalScore = { BindTarget = totalScore },
+                Accuracy = { BindTarget = accuracy },
+                Combo = { BindTarget = combo },
+            });
 
-            Add(scoreItem);
-            updateScores();
-
-            return scoreItem;
-        }
+            totalScore.BindValueChanged(_ => updateScores(), true);
+        });
 
         private void updateScores()
         {
-            var orderedByScore = this.OrderByDescending(i => i.TotalScore).ToList();
+            var orderedByScore = this.OrderByDescending(i => i.TotalScore.Value).ToList();
 
             for (int i = 0; i < Count; i++)
             {
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 4c75f422c9..62ea5782e8 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -1,25 +1,35 @@
 // Copyright (c) ppy 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 Humanizer;
 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.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Online.API;
 using osu.Game.Users;
+using osu.Game.Utils;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Screens.Play.HUD
 {
     public class GameplayLeaderboardScore : CompositeDrawable
     {
-        private readonly OsuSpriteText positionText, positionSymbol, userString;
-        private readonly GlowingSpriteText scoreText;
+        private const float regular_width = 215f;
+        private const float extended_width = 235f;
 
-        public Action OnScoreChange;
+        private const float panel_height = 35f;
+
+        private OsuSpriteText positionText, scoreText, accuracyText, comboText;
+        public readonly BindableDouble TotalScore = new BindableDouble();
+        public readonly BindableDouble Accuracy = new BindableDouble();
+        public readonly BindableInt Combo = new BindableInt();
 
         private int? scorePosition;
 
@@ -34,103 +44,181 @@ namespace osu.Game.Screens.Play.HUD
                     positionText.Text = $"#{scorePosition.Value.ToMetric(decimals: scorePosition < 100000 ? 1 : 0)}";
 
                 positionText.FadeTo(scorePosition.HasValue ? 1 : 0);
-                positionSymbol.FadeTo(scorePosition.HasValue ? 1 : 0);
             }
         }
 
-        private double totalScore;
+        public User User { get; }
 
-        public double TotalScore
+        private readonly bool localUser;
+
+        public GameplayLeaderboardScore(User user, bool localUser)
         {
-            get => totalScore;
-            set
-            {
-                totalScore = value;
-                scoreText.Text = totalScore.ToString("N0");
+            User = user;
+            this.localUser = localUser;
 
-                OnScoreChange?.Invoke();
-            }
-        }
+            AutoSizeAxes = Axes.Both;
 
-        private User user;
-
-        public User User
-        {
-            get => user;
-            set
-            {
-                user = value;
-                userString.Text = user?.Username;
-            }
-        }
-
-        public GameplayLeaderboardScore()
-        {
-            RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Axes.Y;
-
-            InternalChild = new Container
-            {
-                Masking = true,
-                Anchor = Anchor.TopCentre,
-                Origin = Anchor.TopCentre,
-                AutoSizeAxes = Axes.Both,
-                Children = new Drawable[]
-                {
-                    new FillFlowContainer
-                    {
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.TopRight,
-                        AutoSizeAxes = Axes.Both,
-                        Direction = FillDirection.Horizontal,
-                        Margin = new MarginPadding { Right = 2.5f },
-                        Spacing = new Vector2(2.5f),
-                        Children = new[]
-                        {
-                            positionText = new OsuSpriteText
-                            {
-                                Alpha = 0,
-                                Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold),
-                            },
-                            positionSymbol = new OsuSpriteText
-                            {
-                                Alpha = 0,
-                                Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold),
-                                Text = ">",
-                            },
-                        }
-                    },
-                    new FillFlowContainer
-                    {
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.TopLeft,
-                        AutoSizeAxes = Axes.Both,
-                        Direction = FillDirection.Horizontal,
-                        Margin = new MarginPadding { Left = 2.5f },
-                        Spacing = new Vector2(2.5f),
-                        Children = new Drawable[]
-                        {
-                            userString = new OsuSpriteText
-                            {
-                                Size = new Vector2(80, 16),
-                                Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold, italics: true),
-                            },
-                            scoreText = new GlowingSpriteText
-                            {
-                                GlowColour = Color4Extensions.FromHex(@"83ccfa"),
-                                Font = OsuFont.Numeric.With(size: 14),
-                            }
-                        }
-                    },
-                },
-            };
+            Anchor = Anchor.TopRight;
+            Origin = Anchor.TopRight;
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(IAPIProvider api)
         {
-            positionText.Colour = colours.YellowLight;
-            positionSymbol.Colour = colours.Yellow;
+            const float panel_shear = 0.15f;
+            const float shear_width = panel_height * panel_shear;
+
+            Color4 panelColour, textColour;
+            float panelWidth;
+
+            if (localUser)
+            {
+                panelWidth = extended_width;
+                panelColour = Color4Extensions.FromHex("7fcc33");
+                textColour = Color4.White;
+            }
+            else if (api.Friends.Any(f => User.Equals(f)))
+            {
+                panelWidth = extended_width;
+                panelColour = Color4Extensions.FromHex("ffd966");
+                textColour = Color4Extensions.FromHex("2e576b");
+            }
+            else
+            {
+                panelWidth = regular_width;
+                panelColour = Color4Extensions.FromHex("3399cc");
+                textColour = Color4.White;
+            }
+
+            InternalChildren = new Drawable[]
+            {
+                new Container
+                {
+                    Anchor = Anchor.TopRight,
+                    Origin = Anchor.TopRight,
+                    Masking = true,
+                    CornerRadius = 5f,
+                    Shear = new Vector2(panel_shear, 0f),
+                    Size = new Vector2(panelWidth, panel_height),
+                    Child = new Box
+                    {
+                        Alpha = 0.5f,
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = panelColour,
+                    }
+                },
+                new GridContainer
+                {
+                    Anchor = Anchor.TopRight,
+                    Origin = Anchor.TopRight,
+                    Size = new Vector2(regular_width, panel_height),
+                    ColumnDimensions = new[]
+                    {
+                        new Dimension(GridSizeMode.Absolute, 35f),
+                        new Dimension(),
+                        new Dimension(GridSizeMode.Absolute, 85f),
+                    },
+                    Content = new[]
+                    {
+                        new Drawable[]
+                        {
+                            positionText = new OsuSpriteText
+                            {
+                                Padding = new MarginPadding { Right = shear_width / 2 },
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Colour = textColour,
+                                Font = OsuFont.Torus.With(size: 14, weight: FontWeight.Bold),
+                                Shadow = false,
+                            },
+                            new Container
+                            {
+                                Padding = new MarginPadding { Horizontal = shear_width / 3 },
+                                RelativeSizeAxes = Axes.Both,
+                                Children = new Drawable[]
+                                {
+                                    new Container
+                                    {
+                                        Masking = true,
+                                        CornerRadius = 5f,
+                                        Shear = new Vector2(panel_shear, 0f),
+                                        RelativeSizeAxes = Axes.Both,
+                                        Children = new[]
+                                        {
+                                            new Box
+                                            {
+                                                Alpha = 0.5f,
+                                                RelativeSizeAxes = Axes.Both,
+                                                Colour = panelColour,
+                                            },
+                                        }
+                                    },
+                                    new OsuSpriteText
+                                    {
+                                        Padding = new MarginPadding { Left = shear_width },
+                                        RelativeSizeAxes = Axes.X,
+                                        Width = 0.8f,
+                                        Anchor = Anchor.CentreLeft,
+                                        Origin = Anchor.CentreLeft,
+                                        Colour = textColour,
+                                        Font = OsuFont.Torus.With(size: 14, weight: FontWeight.SemiBold),
+                                        Text = User.Username,
+                                        Truncate = true,
+                                        Shadow = false,
+                                    }
+                                }
+                            },
+                            new Container
+                            {
+                                Padding = new MarginPadding { Top = 2f, Right = 17.5f, Bottom = 5f },
+                                RelativeSizeAxes = Axes.Both,
+                                Anchor = Anchor.CentreLeft,
+                                Origin = Anchor.CentreLeft,
+                                Colour = textColour,
+                                Children = new Drawable[]
+                                {
+                                    scoreText = new OsuSpriteText
+                                    {
+                                        Anchor = Anchor.TopLeft,
+                                        Origin = Anchor.TopLeft,
+                                        Spacing = new Vector2(0.5f, 0f),
+                                        Font = OsuFont.Torus.With(size: 16, weight: FontWeight.SemiBold),
+                                        Shadow = false,
+                                    },
+                                    new Container
+                                    {
+                                        RelativeSizeAxes = Axes.X,
+                                        AutoSizeAxes = Axes.Y,
+                                        Anchor = Anchor.BottomLeft,
+                                        Origin = Anchor.BottomLeft,
+                                        Children = new Drawable[]
+                                        {
+                                            accuracyText = new OsuSpriteText
+                                            {
+                                                Anchor = Anchor.CentreLeft,
+                                                Origin = Anchor.CentreLeft,
+                                                Font = OsuFont.Torus.With(size: 12, weight: FontWeight.SemiBold),
+                                                Shadow = false,
+                                            },
+                                            comboText = new OsuSpriteText
+                                            {
+                                                Anchor = Anchor.CentreRight,
+                                                Origin = Anchor.CentreRight,
+                                                Font = OsuFont.Torus.With(size: 12, weight: FontWeight.SemiBold),
+                                                Shadow = false,
+                                            },
+                                        }
+                                    }
+                                },
+                            }
+                        }
+                    }
+                }
+            };
+
+            TotalScore.BindValueChanged(v => scoreText.Text = v.NewValue.ToString("N0"), true);
+            Accuracy.BindValueChanged(v => accuracyText.Text = v.NewValue.FormatAccuracy(), true);
+            Combo.BindValueChanged(v => comboText.Text = $"{v.NewValue}x", true);
         }
     }
 }

From c15bb6b928a4130d1515e8db07dd2e9f071dccfb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 17 Dec 2020 21:47:57 +0900
Subject: [PATCH 0300/3722] Add beatmap hash to MultiplayerRoomSettings

---
 .../RealtimeMultiplayer/MultiplayerRoomSettings.cs    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
index d2f64235c3..60e0d1292e 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
@@ -18,13 +18,20 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
         public int RulesetID { get; set; }
 
+        public string BeatmapChecksum { get; set; } = string.Empty;
+
         public string Name { get; set; } = "Unnamed room";
 
         [NotNull]
         public IEnumerable<APIMod> Mods { get; set; } = Enumerable.Empty<APIMod>();
 
-        public bool Equals(MultiplayerRoomSettings other) => BeatmapID == other.BeatmapID && Mods.SequenceEqual(other.Mods) && RulesetID == other.RulesetID && Name.Equals(other.Name, StringComparison.Ordinal);
+        public bool Equals(MultiplayerRoomSettings other)
+            => BeatmapID == other.BeatmapID
+               && BeatmapChecksum == other.BeatmapChecksum
+               && Mods.SequenceEqual(other.Mods)
+               && RulesetID == other.RulesetID
+               && Name.Equals(other.Name, StringComparison.Ordinal);
 
-        public override string ToString() => $"Name:{Name} Beatmap:{BeatmapID} Mods:{string.Join(',', Mods)} Ruleset:{RulesetID}";
+        public override string ToString() => $"Name:{Name} Beatmap:{BeatmapID} ({BeatmapChecksum}) Mods:{string.Join(',', Mods)} Ruleset:{RulesetID}";
     }
 }

From 5e4f667cffac3ce6f4bfb108b29697e8fea9ba40 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 18 Dec 2020 01:27:58 +0300
Subject: [PATCH 0301/3722] Revert "Allow OverlayView fetching with no API
 requests required"

This reverts commit 449b9a21aefe912280728fd621fe11c782fbdb28.
---
 osu.Game/Overlays/OverlayView.cs | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/OverlayView.cs b/osu.Game/Overlays/OverlayView.cs
index f5ef183bd5..c254cdf290 100644
--- a/osu.Game/Overlays/OverlayView.cs
+++ b/osu.Game/Overlays/OverlayView.cs
@@ -42,29 +42,25 @@ namespace osu.Game.Overlays
         /// <summary>
         /// Create the API request for fetching data.
         /// </summary>
-        protected virtual APIRequest<T> CreateRequest() => null;
+        protected abstract APIRequest<T> CreateRequest();
 
         /// <summary>
         /// Fired when results arrive from the main API request.
         /// </summary>
         /// <param name="response"></param>
-        protected virtual void OnSuccess(T response)
-        {
-        }
+        protected abstract void OnSuccess(T response);
 
         /// <summary>
         /// Force a re-request for data from the API.
         /// </summary>
-        protected virtual void PerformFetch()
+        protected void PerformFetch()
         {
             request?.Cancel();
-            request = CreateRequest();
 
-            if (request != null)
-            {
-                request.Success += response => Schedule(() => OnSuccess(response));
-                API.Queue(request);
-            }
+            request = CreateRequest();
+            request.Success += response => Schedule(() => OnSuccess(response));
+
+            API.Queue(request);
         }
 
         private void onlineStateChanged(ValueChangedEvent<APIState> state) => Schedule(() =>

From 9c22753f3fb23f94a19b3870d7cc1e46638e616e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 18 Dec 2020 02:51:19 +0300
Subject: [PATCH 0302/3722] Remove unnecessary inheritance to OverlayView

---
 .../Visual/Online/TestSceneFriendDisplay.cs   | 11 +++-----
 .../Dashboard/Friends/FriendDisplay.cs        | 26 ++++++++++++-------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs
index 0cc6e9f358..9bece39ca0 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Tests.Visual.Online
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
 
-        private TestFriendDisplay display;
+        private FriendDisplay display;
 
         [SetUp]
         public void Setup() => Schedule(() =>
@@ -28,7 +28,7 @@ namespace osu.Game.Tests.Visual.Online
             Child = new BasicScrollContainer
             {
                 RelativeSizeAxes = Axes.Both,
-                Child = display = new TestFriendDisplay()
+                Child = display = new FriendDisplay()
             };
         });
 
@@ -41,7 +41,7 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestOnline()
         {
-            AddStep("Fetch online", () => display?.Fetch());
+            // No need to do anything, fetch is performed automatically.
         }
 
         private List<User> getUsers() => new List<User>
@@ -76,10 +76,5 @@ namespace osu.Game.Tests.Visual.Online
                 LastVisit = DateTimeOffset.Now
             }
         };
-
-        private class TestFriendDisplay : FriendDisplay
-        {
-            public void Fetch() => PerformFetch();
-        }
     }
 }
diff --git a/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs b/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
index 8a8ac36e14..cc26a11da1 100644
--- a/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
@@ -5,16 +5,18 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 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.UserInterface;
+using osu.Game.Online.API;
 using osu.Game.Users;
 using osuTK;
 
 namespace osu.Game.Overlays.Dashboard.Friends
 {
-    public class FriendDisplay : OverlayView<List<User>>
+    public class FriendDisplay : CompositeDrawable
     {
         private List<User> users = new List<User>();
 
@@ -39,8 +41,16 @@ namespace osu.Game.Overlays.Dashboard.Friends
         private Container itemsPlaceholder;
         private LoadingLayer loading;
 
-        [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
+        private readonly IBindableList<User> apiFriends = new BindableList<User>();
+
+        public FriendDisplay()
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+        }
+
+        [BackgroundDependencyLoader(true)]
+        private void load(OverlayColourProvider colourProvider, IAPIProvider api)
         {
             InternalChild = new FillFlowContainer
             {
@@ -130,6 +140,9 @@ namespace osu.Game.Overlays.Dashboard.Friends
 
             background.Colour = colourProvider.Background4;
             controlBackground.Colour = colourProvider.Background5;
+
+            apiFriends.BindTo(api.Friends);
+            apiFriends.BindCollectionChanged((_, __) => Schedule(() => Users = apiFriends.ToList()), true);
         }
 
         protected override void LoadComplete()
@@ -141,13 +154,6 @@ namespace osu.Game.Overlays.Dashboard.Friends
             userListToolbar.SortCriteria.BindValueChanged(_ => recreatePanels());
         }
 
-        protected override void PerformFetch()
-        {
-            base.PerformFetch();
-
-            Users = API.Friends.ToList();
-        }
-
         private void recreatePanels()
         {
             if (!users.Any())

From 8a01e567a146d71405b8feeb7bfd7d532569b000 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 18 Dec 2020 03:06:28 +0300
Subject: [PATCH 0303/3722] Fix API potentially getting stuck in connecting
 state

---
 osu.Game/Online/API/APIAccess.cs | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index 806a42a38b..b42c78e9cd 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -145,16 +145,14 @@ namespace osu.Game.Online.API
 
                             failureCount = 0;
 
-                            var friendsReq = new GetFriendsRequest();
-                            friendsReq.Success += f =>
+                            fetchFriends(() =>
                             {
-                                Friends.AddRange(f);
-
                                 //we're connected!
                                 state.Value = APIState.Online;
-                            };
-
-                            handleRequest(friendsReq);
+                            }, () =>
+                            {
+                                state.Value = APIState.Failing;
+                            });
                         };
 
                         if (!handleRequest(userReq))
@@ -255,6 +253,19 @@ namespace osu.Game.Online.API
             return null;
         }
 
+        private void fetchFriends(Action onSuccess, Action onFail)
+        {
+            var friendsReq = new GetFriendsRequest();
+            friendsReq.Success += res =>
+            {
+                Friends.AddRange(res);
+                onSuccess?.Invoke();
+            };
+
+            if (!handleRequest(friendsReq))
+                onFail?.Invoke();
+        }
+
         /// <summary>
         /// Handle a single API request.
         /// Ensures all exceptions are caught and dealt with correctly.

From a01ed1827a481fb8ac87aef1a1fda89ed5b33f4e Mon Sep 17 00:00:00 2001
From: Graham Johnson <johnson.graham.ib@gmail.com>
Date: Thu, 17 Dec 2020 19:34:16 -0500
Subject: [PATCH 0304/3722] Align the drag circles on the selction box in the
 editor to be on the center of the border

---
 .../Edit/Compose/Components/SelectionBox.cs   | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index 347d9e3ba7..e4feceb987 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -235,6 +235,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
         private void addDragHandle(Anchor anchor) => AddInternal(new SelectionBoxDragHandle
         {
             Anchor = anchor,
+            Y = getAdjustmentToCenterCircleOnBorder(anchor).Y,
+            X = getAdjustmentToCenterCircleOnBorder(anchor).X,
             HandleDrag = e => OnScale?.Invoke(e.Delta, anchor),
             OperationStarted = operationStarted,
             OperationEnded = operationEnded
@@ -251,6 +253,45 @@ namespace osu.Game.Screens.Edit.Compose.Components
             return (endAngle - startAngle) * 180 / MathF.PI;
         }
 
+        /// <summary>
+        /// Adjust Drag circle to be centered on the center of the border instead of on the edge.
+        /// </summary>
+        /// <param name="anchor">The part of the rectangle to be adjusted.</param>
+        private Vector2 getAdjustmentToCenterCircleOnBorder(Anchor anchor)
+        {
+            Vector2 adjustment = Vector2.Zero;
+
+            switch (anchor)
+            {
+                case Anchor.TopLeft:
+                case Anchor.CentreLeft:
+                case Anchor.BottomLeft:
+                    adjustment.X = BORDER_RADIUS / 2;
+                    break;
+                case Anchor.TopRight:
+                case Anchor.CentreRight:
+                case Anchor.BottomRight:
+                    adjustment.X = -BORDER_RADIUS / 2;
+                    break;
+            }
+
+            switch (anchor)
+            {
+                case Anchor.TopLeft:
+                case Anchor.TopCentre:
+                case Anchor.TopRight:
+                    adjustment.Y = BORDER_RADIUS / 2;
+                    break;
+                case Anchor.BottomLeft:
+                case Anchor.BottomCentre:
+                case Anchor.BottomRight:
+                    adjustment.Y = -BORDER_RADIUS / 2;
+                    break;
+            }
+
+            return adjustment;
+        }
+
         private void operationEnded()
         {
             if (--activeOperations == 0)

From a8abefcd665adf869b97e45d89c0d85a6d979a7b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 18 Dec 2020 03:34:33 +0300
Subject: [PATCH 0305/3722] Make GameplayLeaderboardScore a model class

---
 .../Gameplay/TestSceneGameplayLeaderboard.cs  | 20 +++++----
 .../Screens/Play/HUD/GameplayLeaderboard.cs   | 41 ++-----------------
 .../Play/HUD/GameplayLeaderboardScore.cs      |  5 ++-
 3 files changed, 17 insertions(+), 49 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
index d0fdb3dd9c..12bc918d45 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 playerScore.Value = 1222333;
             });
 
-            AddStep("add player user", () => leaderboard.AddLocalUser(playerScore, new User { Username = "You" }));
+            AddStep("add local player", () => leaderboard.Add(createLeaderboardScore(playerScore, "You", true)));
             AddSliderStep("set player score", 50, 5000000, 1222333, v => playerScore.Value = v);
         }
 
@@ -48,8 +48,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             var player2Score = new BindableDouble(1234567);
             var player3Score = new BindableDouble(1111111);
 
-            AddStep("add player 2", () => leaderboard.AddPlayer(player2Score, new User { Username = "Player 2" }));
-            AddStep("add player 3", () => leaderboard.AddPlayer(player3Score, new User { Username = "Player 3" }));
+            AddStep("add player 2", () => leaderboard.Add(createLeaderboardScore(player2Score, "Player 2")));
+            AddStep("add player 3", () => leaderboard.Add(createLeaderboardScore(player3Score, "Player 3")));
 
             AddAssert("is player 2 position #1", () => leaderboard.CheckPositionByUsername("Player 2", 1));
             AddAssert("is player position #2", () => leaderboard.CheckPositionByUsername("You", 2));
@@ -66,6 +66,14 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("is player 2 position #3", () => leaderboard.CheckPositionByUsername("Player 2", 3));
         }
 
+        private static GameplayLeaderboardScore createLeaderboardScore(BindableDouble score, string username, bool localOrReplayPlayer = false)
+        {
+            return new GameplayLeaderboardScore(new User { Username = username }, localOrReplayPlayer)
+            {
+                TotalScore = { BindTarget = score },
+            };
+        }
+
         private class TestGameplayLeaderboard : GameplayLeaderboard
         {
             public bool CheckPositionByUsername(string username, int? expectedPosition)
@@ -74,12 +82,6 @@ namespace osu.Game.Tests.Visual.Gameplay
 
                 return scoreItem != null && scoreItem.ScorePosition == expectedPosition;
             }
-
-            public void AddPlayer(BindableDouble totalScore, User user) =>
-                base.AddPlayer(totalScore, new BindableDouble(1f), new BindableInt(1), user, false);
-
-            public void AddLocalUser(BindableDouble totalScore, User user) =>
-                base.AddPlayer(totalScore, new BindableDouble(1f), new BindableInt(1), user, true);
         }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index a2673e3097..573bf54b14 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -2,11 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
-using JetBrains.Annotations;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Users;
 using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
@@ -25,44 +22,12 @@ namespace osu.Game.Screens.Play.HUD
             LayoutEasing = Easing.OutQuint;
         }
 
-        /// <summary>
-        /// Adds a player to the leaderboard.
-        /// </summary>
-        /// <param name="totalScore">A bindable of the player's total score.</param>
-        /// <param name="accuracy">A bindable of the player's accuracy.</param>
-        /// <param name="combo">A bindable of the player's current combo.</param>
-        /// <param name="user">The player.</param>
-        public void AddPlayer([NotNull] IBindableNumber<double> totalScore,
-                              [NotNull] IBindableNumber<double> accuracy,
-                              [NotNull] IBindableNumber<int> combo,
-                              [NotNull] User user)
+        public override void Add(GameplayLeaderboardScore drawable)
         {
-            AddPlayer(totalScore, accuracy, combo, user, false);
+            base.Add(drawable);
+            drawable?.TotalScore.BindValueChanged(_ => updateScores(), true);
         }
 
-        /// <summary>
-        /// Adds a player to the leaderboard.
-        /// </summary>
-        /// <param name="totalScore">A bindable of the player's total score.</param>
-        /// <param name="accuracy">A bindable of the player's accuracy.</param>
-        /// <param name="combo">A bindable of the player's current combo.</param>
-        /// <param name="user">The player.</param>
-        /// <param name="localUser">Whether the provided <paramref name="user"/> is the local user.</param>
-        protected void AddPlayer([NotNull] IBindableNumber<double> totalScore,
-                                 [NotNull] IBindableNumber<double> accuracy,
-                                 [NotNull] IBindableNumber<int> combo,
-                                 [NotNull] User user, bool localUser) => Schedule(() =>
-        {
-            Add(new GameplayLeaderboardScore(user, localUser)
-            {
-                TotalScore = { BindTarget = totalScore },
-                Accuracy = { BindTarget = accuracy },
-                Combo = { BindTarget = combo },
-            });
-
-            totalScore.BindValueChanged(_ => updateScores(), true);
-        });
-
         private void updateScores()
         {
             var orderedByScore = this.OrderByDescending(i => i.TotalScore.Value).ToList();
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 62ea5782e8..f94d6bd01f 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -27,8 +27,9 @@ namespace osu.Game.Screens.Play.HUD
         private const float panel_height = 35f;
 
         private OsuSpriteText positionText, scoreText, accuracyText, comboText;
-        public readonly BindableDouble TotalScore = new BindableDouble();
-        public readonly BindableDouble Accuracy = new BindableDouble();
+
+        public readonly BindableDouble TotalScore = new BindableDouble(1000000);
+        public readonly BindableDouble Accuracy = new BindableDouble(1);
         public readonly BindableInt Combo = new BindableInt();
 
         private int? scorePosition;

From 92bf74ba29b3bc6c8ec645fe54d9c218d76ff6cf Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 18 Dec 2020 03:37:24 +0300
Subject: [PATCH 0306/3722] localUser -> localOrReplayPlayer

---
 .../Screens/Play/HUD/GameplayLeaderboardScore.cs    | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index f94d6bd01f..285ed93341 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -50,12 +50,17 @@ namespace osu.Game.Screens.Play.HUD
 
         public User User { get; }
 
-        private readonly bool localUser;
+        private readonly bool localOrReplayPlayer;
 
-        public GameplayLeaderboardScore(User user, bool localUser)
+        /// <summary>
+        /// Creates a new <see cref="GameplayLeaderboardScore"/>.
+        /// </summary>
+        /// <param name="user">The score's player.</param>
+        /// <param name="localOrReplayPlayer">Whether the player is the local user or a replay player.</param>
+        public GameplayLeaderboardScore(User user, bool localOrReplayPlayer)
         {
             User = user;
-            this.localUser = localUser;
+            this.localOrReplayPlayer = localOrReplayPlayer;
 
             AutoSizeAxes = Axes.Both;
 
@@ -72,7 +77,7 @@ namespace osu.Game.Screens.Play.HUD
             Color4 panelColour, textColour;
             float panelWidth;
 
-            if (localUser)
+            if (localOrReplayPlayer)
             {
                 panelWidth = extended_width;
                 panelColour = Color4Extensions.FromHex("7fcc33");

From a0235a06e642319ce5108c21a3643e09bdc2031f Mon Sep 17 00:00:00 2001
From: Graham Johnson <johnson.graham.ib@gmail.com>
Date: Thu, 17 Dec 2020 19:40:21 -0500
Subject: [PATCH 0307/3722] update comment

---
 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 e4feceb987..4a0a925962 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -257,6 +257,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// Adjust Drag circle to be centered on the center of the border instead of on the edge.
         /// </summary>
         /// <param name="anchor">The part of the rectangle to be adjusted.</param>
+        /// <returns>A 2d vector on how much to adjust the drag circle</returns>
         private Vector2 getAdjustmentToCenterCircleOnBorder(Anchor anchor)
         {
             Vector2 adjustment = Vector2.Zero;

From 44f4ed4fd3001587378bae5ff90d4e4edfd5011a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 11:19:40 +0900
Subject: [PATCH 0308/3722] Fix spacing

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

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index 4a0a925962..f50e599457 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -269,6 +269,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 case Anchor.BottomLeft:
                     adjustment.X = BORDER_RADIUS / 2;
                     break;
+
                 case Anchor.TopRight:
                 case Anchor.CentreRight:
                 case Anchor.BottomRight:
@@ -283,6 +284,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 case Anchor.TopRight:
                     adjustment.Y = BORDER_RADIUS / 2;
                     break;
+
                 case Anchor.BottomLeft:
                 case Anchor.BottomCentre:
                 case Anchor.BottomRight:

From 9079d33412207d9f3e18940d3d61c8d8f1a86137 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 11:20:21 +0900
Subject: [PATCH 0309/3722] X before Y for sanity

---
 osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index f50e599457..8ccd4f71e9 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -235,8 +235,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
         private void addDragHandle(Anchor anchor) => AddInternal(new SelectionBoxDragHandle
         {
             Anchor = anchor,
-            Y = getAdjustmentToCenterCircleOnBorder(anchor).Y,
             X = getAdjustmentToCenterCircleOnBorder(anchor).X,
+            Y = getAdjustmentToCenterCircleOnBorder(anchor).Y,
             HandleDrag = e => OnScale?.Invoke(e.Delta, anchor),
             OperationStarted = operationStarted,
             OperationEnded = operationEnded

From 208a9e596ed91f212f37745f493c3416601c3ada Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 18 Dec 2020 14:58:58 +0900
Subject: [PATCH 0310/3722] Set new room for each test iteration

---
 .../Multiplayer/TestSceneLoungeRoomInfo.cs    |  5 +---
 .../TestSceneMatchBeatmapDetailArea.cs        |  4 +---
 .../Multiplayer/TestSceneMatchHeader.cs       | 12 ++++++----
 .../Multiplayer/TestSceneMatchLeaderboard.cs  | 10 +++++---
 .../TestSceneMatchSettingsOverlay.cs          |  4 +---
 .../Multiplayer/TestSceneMatchSongSelect.cs   |  7 ------
 .../Multiplayer/TestSceneMatchSubScreen.cs    |  6 -----
 .../TestSceneOverlinedParticipants.cs         |  5 ++--
 .../Multiplayer/TestSceneOverlinedPlaylist.cs | 23 +++++++++++--------
 .../Multiplayer/TestSceneParticipantsList.cs  | 13 +++++------
 osu.Game/Tests/Visual/MultiplayerTestScene.cs | 15 +++++++-----
 11 files changed, 49 insertions(+), 55 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
index cdad37a9ad..9baaa42c83 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
@@ -4,7 +4,6 @@
 using System;
 using NUnit.Framework;
 using osu.Framework.Graphics;
-using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Multiplayer.RoomStatuses;
 using osu.Game.Screens.Multi.Lounge.Components;
 using osu.Game.Users;
@@ -14,10 +13,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
     public class TestSceneLoungeRoomInfo : MultiplayerTestScene
     {
         [SetUp]
-        public void Setup() => Schedule(() =>
+        public new void Setup() => Schedule(() =>
         {
-            Room = new Room();
-
             Child = new RoomInfo
             {
                 Anchor = Anchor.Centre,
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
index 01cd26fbe5..6b1d90e06e 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
@@ -24,10 +24,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
         private RulesetStore rulesetStore { get; set; }
 
         [SetUp]
-        public void Setup() => Schedule(() =>
+        public new void Setup() => Schedule(() =>
         {
-            Room = new Room();
-
             Child = new MatchBeatmapDetailArea
             {
                 Anchor = Anchor.Centre,
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
index e5943105b7..ec5292e51e 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.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 NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Rulesets.Osu;
@@ -14,7 +15,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
     {
         public TestSceneMatchHeader()
         {
-            Room = new Room();
+            Child = new Header();
+        }
+
+        [SetUp]
+        public new void Setup() => Schedule(() =>
+        {
             Room.Playlist.Add(new PlaylistItem
             {
                 Beatmap =
@@ -41,8 +47,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             Room.Name.Value = "A very awesome room";
             Room.Host.Value = new User { Id = 2, Username = "peppy" };
-
-            Child = new Header();
-        }
+        });
     }
 }
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs
index c24c6c4ba3..a72f71d79c 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs
@@ -3,10 +3,10 @@
 
 using System.Collections.Generic;
 using Newtonsoft.Json;
+using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Online.API;
-using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Match.Components;
 using osu.Game.Users;
 using osuTK;
@@ -19,8 +19,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         public TestSceneMatchLeaderboard()
         {
-            Room = new Room { RoomID = { Value = 3 } };
-
             Add(new MatchLeaderboard
             {
                 Origin = Anchor.Centre,
@@ -40,6 +38,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
             api.Queue(req);
         }
 
+        [SetUp]
+        public new void Setup() => Schedule(() =>
+        {
+            Room.RoomID.Value = 3;
+        });
+
         private class GetRoomScoresRequest : APIRequest<List<RoomScore>>
         {
             protected override string Target => "rooms/3/leaderboard";
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
index 07ff56b5c3..cbe8cc6137 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
@@ -23,10 +23,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
         private TestRoomSettings settings;
 
         [SetUp]
-        public void Setup() => Schedule(() =>
+        public new void Setup() => Schedule(() =>
         {
-            Room = new Room();
-
             settings = new TestRoomSettings
             {
                 RelativeSizeAxes = Axes.Both,
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
index 55b8902d7b..4742fd0d84 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
@@ -14,7 +14,6 @@ using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
-using osu.Game.Online.Multiplayer;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
@@ -94,12 +93,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddUntilStep("wait for present", () => songSelect.IsCurrentScreen());
         }
 
-        [SetUp]
-        public void Setup() => Schedule(() =>
-        {
-            Room = new Room();
-        });
-
         [Test]
         public void TestItemAddedIfEmptyOnStart()
         {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
index 2e22317539..65e9893851 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
@@ -45,12 +45,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
             manager.Import(new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo.BeatmapSet).Wait();
         }
 
-        [SetUp]
-        public void Setup() => Schedule(() =>
-        {
-            Room = new Room();
-        });
-
         [SetUpSteps]
         public void SetupSteps()
         {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
index b6bfa7c93a..481541a1af 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
@@ -3,7 +3,6 @@
 
 using NUnit.Framework;
 using osu.Framework.Graphics;
-using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Components;
 using osuTK;
 
@@ -14,9 +13,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
         protected override bool UseOnlineAPI => true;
 
         [SetUp]
-        public void Setup() => Schedule(() =>
+        public new void Setup() => Schedule(() =>
         {
-            Room = new Room { RoomID = { Value = 7 } };
+            Room.RoomID.Value = 7;
         });
 
         [Test]
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs
index 14984988cb..3dbc990f7a 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.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 NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Rulesets.Osu;
@@ -16,7 +17,18 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         public TestSceneOverlinedPlaylist()
         {
-            Room = new Room { RoomID = { Value = 7 } };
+            Add(new DrawableRoomPlaylist(false, false)
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Size = new Vector2(500),
+            });
+        }
+
+        [SetUp]
+        public new void Setup() => Schedule(() =>
+        {
+            Room.RoomID.Value = 7;
 
             for (int i = 0; i < 10; i++)
             {
@@ -27,13 +39,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     Ruleset = { Value = new OsuRuleset().RulesetInfo }
                 });
             }
-
-            Add(new DrawableRoomPlaylist(false, false)
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Size = new Vector2(500),
-            });
-        }
+        });
     }
 }
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs
index f71c5fc5d2..1e5647f7f4 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs
@@ -3,7 +3,6 @@
 
 using NUnit.Framework;
 using osu.Framework.Graphics;
-using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Components;
 
 namespace osu.Game.Tests.Visual.Multiplayer
@@ -12,15 +11,15 @@ namespace osu.Game.Tests.Visual.Multiplayer
     {
         protected override bool UseOnlineAPI => true;
 
-        [SetUp]
-        public void Setup() => Schedule(() =>
-        {
-            Room = new Room { RoomID = { Value = 7 } };
-        });
-
         public TestSceneParticipantsList()
         {
             Add(new ParticipantsList { RelativeSizeAxes = Axes.Both });
         }
+
+        [SetUp]
+        public new void Setup() => Schedule(() =>
+        {
+            Room.RoomID.Value = 7;
+        });
     }
 }
diff --git a/osu.Game/Tests/Visual/MultiplayerTestScene.cs b/osu.Game/Tests/Visual/MultiplayerTestScene.cs
index 4d073f16f4..dc614896c5 100644
--- a/osu.Game/Tests/Visual/MultiplayerTestScene.cs
+++ b/osu.Game/Tests/Visual/MultiplayerTestScene.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 NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Online.Multiplayer;
@@ -10,13 +11,9 @@ namespace osu.Game.Tests.Visual
     public abstract class MultiplayerTestScene : ScreenTestScene
     {
         [Cached]
-        private readonly Bindable<Room> currentRoom = new Bindable<Room>();
+        private readonly Bindable<Room> currentRoom = new Bindable<Room>(new Room());
 
-        protected Room Room
-        {
-            get => currentRoom.Value;
-            set => currentRoom.Value = value;
-        }
+        protected Room Room => currentRoom.Value;
 
         private CachedModelDependencyContainer<Room> dependencies;
 
@@ -26,5 +23,11 @@ namespace osu.Game.Tests.Visual
             dependencies.Model.BindTo(currentRoom);
             return dependencies;
         }
+
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            Room.CopyFrom(new Room());
+        });
     }
 }

From a4f7eb83c7baa4b847600fcca112b219abe71287 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 18 Dec 2020 15:07:39 +0900
Subject: [PATCH 0311/3722] Fix overlined participants test scene not working

---
 .../TestSceneOverlinedParticipants.cs          | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
index 481541a1af..88ecdb0aad 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
@@ -4,18 +4,25 @@
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Screens.Multi.Components;
-using osuTK;
+using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneOverlinedParticipants : MultiplayerTestScene
     {
-        protected override bool UseOnlineAPI => true;
-
         [SetUp]
         public new void Setup() => Schedule(() =>
         {
             Room.RoomID.Value = 7;
+
+            for (int i = 0; i < 50; i++)
+            {
+                Room.RecentParticipants.Add(new User
+                {
+                    Username = "peppy",
+                    Id = 2
+                });
+            }
         });
 
         [Test]
@@ -27,7 +34,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Width = 500,
+                    Width = 0.2f,
                 };
             });
         }
@@ -41,7 +48,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Size = new Vector2(500)
+                    Width = 0.2f,
+                    Height = 0.2f,
                 };
             });
         }

From f0e91ba43188c7cc3f7a0e660c13477551082f71 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 18 Dec 2020 15:09:11 +0900
Subject: [PATCH 0312/3722] Fix overlined playlist test scene not working

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

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs
index 3dbc990f7a..f8af67aa7f 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs
@@ -22,6 +22,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 Size = new Vector2(500),
+                Items = { BindTarget = Room.Playlist }
             });
         }
 

From 8c5e25b990af1ea231617428af012ba516db95ee Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 18 Dec 2020 15:11:11 +0900
Subject: [PATCH 0313/3722] Remove overlined test scenes

---
 .../TestSceneOverlinedParticipants.cs         | 57 -------------------
 .../Multiplayer/TestSceneOverlinedPlaylist.cs | 45 ---------------
 .../Multiplayer/TestSceneParticipantsList.cs  | 46 ++++++++++++---
 3 files changed, 39 insertions(+), 109 deletions(-)
 delete mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
 delete mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
deleted file mode 100644
index 88ecdb0aad..0000000000
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using NUnit.Framework;
-using osu.Framework.Graphics;
-using osu.Game.Screens.Multi.Components;
-using osu.Game.Users;
-
-namespace osu.Game.Tests.Visual.Multiplayer
-{
-    public class TestSceneOverlinedParticipants : MultiplayerTestScene
-    {
-        [SetUp]
-        public new void Setup() => Schedule(() =>
-        {
-            Room.RoomID.Value = 7;
-
-            for (int i = 0; i < 50; i++)
-            {
-                Room.RecentParticipants.Add(new User
-                {
-                    Username = "peppy",
-                    Id = 2
-                });
-            }
-        });
-
-        [Test]
-        public void TestHorizontalLayout()
-        {
-            AddStep("create component", () =>
-            {
-                Child = new ParticipantsDisplay(Direction.Horizontal)
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Width = 0.2f,
-                };
-            });
-        }
-
-        [Test]
-        public void TestVerticalLayout()
-        {
-            AddStep("create component", () =>
-            {
-                Child = new ParticipantsDisplay(Direction.Vertical)
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Width = 0.2f,
-                    Height = 0.2f,
-                };
-            });
-        }
-    }
-}
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs
deleted file mode 100644
index f8af67aa7f..0000000000
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs
+++ /dev/null
@@ -1,45 +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.Online.Multiplayer;
-using osu.Game.Rulesets.Osu;
-using osu.Game.Screens.Multi;
-using osu.Game.Tests.Beatmaps;
-using osuTK;
-
-namespace osu.Game.Tests.Visual.Multiplayer
-{
-    public class TestSceneOverlinedPlaylist : MultiplayerTestScene
-    {
-        protected override bool UseOnlineAPI => true;
-
-        public TestSceneOverlinedPlaylist()
-        {
-            Add(new DrawableRoomPlaylist(false, false)
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Size = new Vector2(500),
-                Items = { BindTarget = Room.Playlist }
-            });
-        }
-
-        [SetUp]
-        public new void Setup() => Schedule(() =>
-        {
-            Room.RoomID.Value = 7;
-
-            for (int i = 0; i < 10; i++)
-            {
-                Room.Playlist.Add(new PlaylistItem
-                {
-                    ID = i,
-                    Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
-                    Ruleset = { Value = new OsuRuleset().RulesetInfo }
-                });
-            }
-        });
-    }
-}
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs
index 1e5647f7f4..7bbec7d30e 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs
@@ -4,22 +4,54 @@
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Screens.Multi.Components;
+using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneParticipantsList : MultiplayerTestScene
     {
-        protected override bool UseOnlineAPI => true;
-
-        public TestSceneParticipantsList()
-        {
-            Add(new ParticipantsList { RelativeSizeAxes = Axes.Both });
-        }
-
         [SetUp]
         public new void Setup() => Schedule(() =>
         {
             Room.RoomID.Value = 7;
+
+            for (int i = 0; i < 50; i++)
+            {
+                Room.RecentParticipants.Add(new User
+                {
+                    Username = "peppy",
+                    Id = 2
+                });
+            }
         });
+
+        [Test]
+        public void TestHorizontalLayout()
+        {
+            AddStep("create component", () =>
+            {
+                Child = new ParticipantsDisplay(Direction.Horizontal)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Width = 0.2f,
+                };
+            });
+        }
+
+        [Test]
+        public void TestVerticalLayout()
+        {
+            AddStep("create component", () =>
+            {
+                Child = new ParticipantsDisplay(Direction.Vertical)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Width = 0.2f,
+                    Height = 0.2f,
+                };
+            });
+        }
     }
 }

From 206bf3713ed2af58b97b55489783848728934dde Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 15:16:36 +0900
Subject: [PATCH 0314/3722] Make IAPIProvider read-only bindables into
 IBindables

---
 osu.Desktop/DiscordRichPresence.cs            |  2 +-
 .../Visual/Menus/TestSceneDisclaimer.cs       |  3 ++-
 .../Online/TestSceneAccountCreationOverlay.cs |  2 +-
 .../Online/TestSceneNowPlayingCommand.cs      | 11 +++++---
 osu.Game/Online/API/APIAccess.cs              | 26 +++++++++++--------
 osu.Game/Online/API/DummyAPIAccess.cs         |  4 +++
 osu.Game/Online/API/IAPIProvider.cs           |  6 ++---
 osu.Game/OsuGame.cs                           |  3 +--
 .../BeatmapSet/Buttons/FavouriteButton.cs     |  2 +-
 .../BeatmapSet/Scores/ScoresContainer.cs      |  2 +-
 .../Overlays/Comments/CommentsContainer.cs    |  2 +-
 .../Backgrounds/BackgroundScreenDefault.cs    |  2 +-
 osu.Game/Screens/Menu/Disclaimer.cs           |  2 +-
 .../Screens/Menu/MenuLogoVisualisation.cs     |  2 +-
 osu.Game/Screens/Menu/MenuSideFlashes.cs      |  2 +-
 15 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/osu.Desktop/DiscordRichPresence.cs b/osu.Desktop/DiscordRichPresence.cs
index 26d7402a5b..f1878d967d 100644
--- a/osu.Desktop/DiscordRichPresence.cs
+++ b/osu.Desktop/DiscordRichPresence.cs
@@ -26,7 +26,7 @@ namespace osu.Desktop
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; }
 
-        private Bindable<User> user;
+        private IBindable<User> user;
 
         private readonly IBindable<UserStatus> status = new Bindable<UserStatus>();
         private readonly IBindable<UserActivity> activity = new Bindable<UserActivity>();
diff --git a/osu.Game.Tests/Visual/Menus/TestSceneDisclaimer.cs b/osu.Game.Tests/Visual/Menus/TestSceneDisclaimer.cs
index 49fab08ded..9cbdee3632 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneDisclaimer.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneDisclaimer.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Game.Online.API;
 using osu.Game.Screens.Menu;
 using osu.Game.Users;
 
@@ -16,7 +17,7 @@ namespace osu.Game.Tests.Visual.Menus
 
             AddStep("toggle support", () =>
             {
-                API.LocalUser.Value = new User
+                ((DummyAPIAccess)API).LocalUser.Value = new User
                 {
                     Username = API.LocalUser.Value.Username,
                     Id = API.LocalUser.Value.Id + 1,
diff --git a/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs
index 6c8ec917ba..dcfe0432a8 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Tests.Visual.Online
     {
         private readonly Container userPanelArea;
 
-        private Bindable<User> localUser;
+        private IBindable<User> localUser;
 
         public TestSceneAccountCreationOverlay()
         {
diff --git a/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs b/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs
index 8e151a987a..0324da6cf5 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs
@@ -6,6 +6,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
+using osu.Game.Online.API;
 using osu.Game.Online.Chat;
 using osu.Game.Rulesets;
 using osu.Game.Users;
@@ -18,6 +19,8 @@ namespace osu.Game.Tests.Visual.Online
         [Cached(typeof(IChannelPostTarget))]
         private PostTarget postTarget { get; set; }
 
+        private DummyAPIAccess api => (DummyAPIAccess)API;
+
         public TestSceneNowPlayingCommand()
         {
             Add(postTarget = new PostTarget());
@@ -26,7 +29,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(null));
 
             AddStep("Run command", () => Add(new NowPlayingCommand()));
 
@@ -36,7 +39,7 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestEditActivity()
         {
-            AddStep("Set activity", () => API.Activity.Value = new UserActivity.Editing(new BeatmapInfo()));
+            AddStep("Set activity", () => api.Activity.Value = new UserActivity.Editing(new BeatmapInfo()));
 
             AddStep("Run command", () => Add(new NowPlayingCommand()));
 
@@ -46,7 +49,7 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestPlayActivity()
         {
-            AddStep("Set activity", () => API.Activity.Value = new UserActivity.SoloGame(new BeatmapInfo(), new RulesetInfo()));
+            AddStep("Set activity", () => api.Activity.Value = new UserActivity.SoloGame(new BeatmapInfo(), new RulesetInfo()));
 
             AddStep("Run command", () => Add(new NowPlayingCommand()));
 
@@ -57,7 +60,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(null));
 
             AddStep("Set beatmap", () => Beatmap.Value = new DummyWorkingBeatmap(Audio, null)
             {
diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index b42c78e9cd..b96475d5bf 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -39,11 +39,15 @@ namespace osu.Game.Online.API
 
         private string password;
 
-        public Bindable<User> LocalUser { get; } = new Bindable<User>(createGuestUser());
+        public IBindable<User> LocalUser => localUser;
+        public IBindableList<User> Friends => friends;
+        public IBindable<UserActivity> Activity => activity;
 
-        public BindableList<User> Friends { get; } = new BindableList<User>();
+        private Bindable<User> localUser { get; } = new Bindable<User>(createGuestUser());
 
-        public Bindable<UserActivity> Activity { get; } = new Bindable<UserActivity>();
+        private BindableList<User> friends { get; } = new BindableList<User>();
+
+        private Bindable<UserActivity> activity { get; } = new Bindable<UserActivity>();
 
         protected bool HasLogin => authentication.Token.Value != null || (!string.IsNullOrEmpty(ProvidedUsername) && !string.IsNullOrEmpty(password));
 
@@ -63,10 +67,10 @@ namespace osu.Game.Online.API
             authentication.TokenString = config.Get<string>(OsuSetting.Token);
             authentication.Token.ValueChanged += onTokenChanged;
 
-            LocalUser.BindValueChanged(u =>
+            localUser.BindValueChanged(u =>
             {
-                u.OldValue?.Activity.UnbindFrom(Activity);
-                u.NewValue.Activity.BindTo(Activity);
+                u.OldValue?.Activity.UnbindFrom(activity);
+                u.NewValue.Activity.BindTo(activity);
             }, true);
 
             var thread = new Thread(run)
@@ -138,10 +142,10 @@ namespace osu.Game.Online.API
                         var userReq = new GetUserRequest();
                         userReq.Success += u =>
                         {
-                            LocalUser.Value = u;
+                            localUser.Value = u;
 
                             // todo: save/pull from settings
-                            LocalUser.Value.Status.Value = new UserStatusOnline();
+                            localUser.Value.Status.Value = new UserStatusOnline();
 
                             failureCount = 0;
 
@@ -343,7 +347,7 @@ namespace osu.Game.Online.API
             return true;
         }
 
-        public bool IsLoggedIn => LocalUser.Value.Id > 1;
+        public bool IsLoggedIn => localUser.Value.Id > 1;
 
         public void Queue(APIRequest request)
         {
@@ -376,8 +380,8 @@ namespace osu.Game.Online.API
             // Scheduled prior to state change such that the state changed event is invoked with the correct user and their friends present
             Schedule(() =>
             {
-                LocalUser.Value = createGuestUser();
-                Friends.Clear();
+                localUser.Value = createGuestUser();
+                friends.Clear();
             });
 
             state.Value = APIState.Offline;
diff --git a/osu.Game/Online/API/DummyAPIAccess.cs b/osu.Game/Online/API/DummyAPIAccess.cs
index 7e5a6378ec..a0bc8dd9d6 100644
--- a/osu.Game/Online/API/DummyAPIAccess.cs
+++ b/osu.Game/Online/API/DummyAPIAccess.cs
@@ -93,5 +93,9 @@ namespace osu.Game.Online.API
         }
 
         public void SetState(APIState newState) => state.Value = newState;
+
+        IBindable<User> IAPIProvider.LocalUser => LocalUser;
+        IBindableList<User> IAPIProvider.Friends => Friends;
+        IBindable<UserActivity> IAPIProvider.Activity => Activity;
     }
 }
diff --git a/osu.Game/Online/API/IAPIProvider.cs b/osu.Game/Online/API/IAPIProvider.cs
index 3f62b37a48..3a444460f2 100644
--- a/osu.Game/Online/API/IAPIProvider.cs
+++ b/osu.Game/Online/API/IAPIProvider.cs
@@ -13,19 +13,19 @@ namespace osu.Game.Online.API
         /// The local user.
         /// This is not thread-safe and should be scheduled locally if consumed from a drawable component.
         /// </summary>
-        Bindable<User> LocalUser { get; }
+        IBindable<User> LocalUser { get; }
 
         /// <summary>
         /// The user's friends.
         /// This is not thread-safe and should be scheduled locally if consumed from a drawable component.
         /// </summary>
-        BindableList<User> Friends { get; }
+        IBindableList<User> Friends { get; }
 
         /// <summary>
         /// The current user's activity.
         /// This is not thread-safe and should be scheduled locally if consumed from a drawable component.
         /// </summary>
-        Bindable<UserActivity> Activity { get; }
+        IBindable<UserActivity> Activity { get; }
 
         /// <summary>
         /// Retrieve the OAuth access token.
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index d67d790ce2..1e342fa464 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -51,7 +51,6 @@ using osu.Game.Screens.Select;
 using osu.Game.Updater;
 using osu.Game.Utils;
 using LogLevel = osu.Framework.Logging.LogLevel;
-using osu.Game.Users;
 using System.IO;
 
 namespace osu.Game
@@ -976,7 +975,7 @@ namespace osu.Game
             if (newScreen is IOsuScreen newOsuScreen)
             {
                 OverlayActivationMode.BindTo(newOsuScreen.OverlayActivationMode);
-                ((IBindable<UserActivity>)API.Activity).BindTo(newOsuScreen.Activity);
+                API.Activity.BindTo(newOsuScreen.Activity);
 
                 MusicController.AllowRateAdjustments = newOsuScreen.AllowRateAdjustments;
 
diff --git a/osu.Game/Overlays/BeatmapSet/Buttons/FavouriteButton.cs b/osu.Game/Overlays/BeatmapSet/Buttons/FavouriteButton.cs
index 742b1055b2..c983b337b5 100644
--- a/osu.Game/Overlays/BeatmapSet/Buttons/FavouriteButton.cs
+++ b/osu.Game/Overlays/BeatmapSet/Buttons/FavouriteButton.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
         private PostBeatmapFavouriteRequest request;
         private LoadingLayer loading;
 
-        private readonly Bindable<User> localUser = new Bindable<User>();
+        private readonly IBindable<User> localUser = new Bindable<User>();
 
         public string TooltipText
         {
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
index a58d662de7..9a2dcd014a 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
         public readonly Bindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>();
         private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
         private readonly Bindable<BeatmapLeaderboardScope> scope = new Bindable<BeatmapLeaderboardScope>(BeatmapLeaderboardScope.Global);
-        private readonly Bindable<User> user = new Bindable<User>();
+        private readonly IBindable<User> user = new Bindable<User>();
 
         private readonly Box background;
         private readonly ScoreTable scoreTable;
diff --git a/osu.Game/Overlays/Comments/CommentsContainer.cs b/osu.Game/Overlays/Comments/CommentsContainer.cs
index 2a78748be6..513fabf52a 100644
--- a/osu.Game/Overlays/Comments/CommentsContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentsContainer.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Overlays.Comments
         public readonly Bindable<CommentsSortCriteria> Sort = new Bindable<CommentsSortCriteria>();
         public readonly BindableBool ShowDeleted = new BindableBool();
 
-        protected readonly Bindable<User> User = new Bindable<User>();
+        protected readonly IBindable<User> User = new Bindable<User>();
 
         [Resolved]
         private IAPIProvider api { get; set; }
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
index 8beb955824..bd4577fd57 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Screens.Backgrounds
 
         private int currentDisplay;
         private const int background_count = 7;
-        private Bindable<User> user;
+        private IBindable<User> user;
         private Bindable<Skin> skin;
         private Bindable<BackgroundSource> mode;
         private Bindable<IntroSequence> introSequence;
diff --git a/osu.Game/Screens/Menu/Disclaimer.cs b/osu.Game/Screens/Menu/Disclaimer.cs
index 8368047d5a..ceec12c967 100644
--- a/osu.Game/Screens/Menu/Disclaimer.cs
+++ b/osu.Game/Screens/Menu/Disclaimer.cs
@@ -147,7 +147,7 @@ namespace osu.Game.Screens.Menu
             if (nextScreen != null)
                 LoadComponentAsync(nextScreen);
 
-            currentUser.BindTo(api.LocalUser);
+            ((IBindable<User>)currentUser).BindTo(api.LocalUser);
         }
 
         public override void OnEntering(IScreen last)
diff --git a/osu.Game/Screens/Menu/MenuLogoVisualisation.cs b/osu.Game/Screens/Menu/MenuLogoVisualisation.cs
index 92add458f9..c44beeffa5 100644
--- a/osu.Game/Screens/Menu/MenuLogoVisualisation.cs
+++ b/osu.Game/Screens/Menu/MenuLogoVisualisation.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Screens.Menu
 {
     internal class MenuLogoVisualisation : LogoVisualisation
     {
-        private Bindable<User> user;
+        private IBindable<User> user;
         private Bindable<Skin> skin;
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Screens/Menu/MenuSideFlashes.cs b/osu.Game/Screens/Menu/MenuSideFlashes.cs
index 2ff8132d47..a1ae4555ed 100644
--- a/osu.Game/Screens/Menu/MenuSideFlashes.cs
+++ b/osu.Game/Screens/Menu/MenuSideFlashes.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Screens.Menu
         private const double box_fade_in_time = 65;
         private const int box_width = 200;
 
-        private Bindable<User> user;
+        private IBindable<User> user;
         private Bindable<Skin> skin;
 
         [Resolved]

From d36169f697ce53809bbec26b44411b28c66f6b0a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 15:16:48 +0900
Subject: [PATCH 0315/3722] Move friend request to a more understandable place
 in connection flow

---
 osu.Game/Online/API/APIAccess.cs | 36 +++++++++++++-------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index b96475d5bf..93d913dfad 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -140,6 +140,7 @@ namespace osu.Game.Online.API
                         }
 
                         var userReq = new GetUserRequest();
+
                         userReq.Success += u =>
                         {
                             localUser.Value = u;
@@ -148,15 +149,6 @@ namespace osu.Game.Online.API
                             localUser.Value.Status.Value = new UserStatusOnline();
 
                             failureCount = 0;
-
-                            fetchFriends(() =>
-                            {
-                                //we're connected!
-                                state.Value = APIState.Online;
-                            }, () =>
-                            {
-                                state.Value = APIState.Failing;
-                            });
                         };
 
                         if (!handleRequest(userReq))
@@ -166,6 +158,19 @@ namespace osu.Game.Online.API
                             continue;
                         }
 
+                        // getting user's friends is considered part of the connection process.
+                        var friendsReq = new GetFriendsRequest();
+
+                        friendsReq.Success += res =>
+                        {
+                            friends.AddRange(res);
+
+                            //we're connected!
+                            state.Value = APIState.Online;
+                        };
+
+                        if (!handleRequest(friendsReq))
+                            state.Value = APIState.Failing;
                         // The Success callback event is fired on the main thread, so we should wait for that to run before proceeding.
                         // Without this, we will end up circulating this Connecting loop multiple times and queueing up many web requests
                         // before actually going online.
@@ -257,19 +262,6 @@ namespace osu.Game.Online.API
             return null;
         }
 
-        private void fetchFriends(Action onSuccess, Action onFail)
-        {
-            var friendsReq = new GetFriendsRequest();
-            friendsReq.Success += res =>
-            {
-                Friends.AddRange(res);
-                onSuccess?.Invoke();
-            };
-
-            if (!handleRequest(friendsReq))
-                onFail?.Invoke();
-        }
-
         /// <summary>
         /// Handle a single API request.
         /// Ensures all exceptions are caught and dealt with correctly.

From bdfeb55dec5614b535737fb22df80c59627973a4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 18 Dec 2020 15:18:06 +0900
Subject: [PATCH 0316/3722] Fix room status test scene not working

---
 .../Visual/Multiplayer/TestSceneRoomStatus.cs    | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs
index 1925e0ef4f..c1dfb94464 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.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.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Online.Multiplayer;
@@ -22,18 +23,21 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     new DrawableRoom(new Room
                     {
                         Name = { Value = "Room 1" },
-                        Status = { Value = new RoomStatusOpen() }
-                    }),
+                        Status = { Value = new RoomStatusOpen() },
+                        EndDate = { Value = DateTimeOffset.Now.AddDays(1) }
+                    }) { MatchingFilter = true },
                     new DrawableRoom(new Room
                     {
                         Name = { Value = "Room 2" },
-                        Status = { Value = new RoomStatusPlaying() }
-                    }),
+                        Status = { Value = new RoomStatusPlaying() },
+                        EndDate = { Value = DateTimeOffset.Now.AddDays(1) }
+                    }) { MatchingFilter = true },
                     new DrawableRoom(new Room
                     {
                         Name = { Value = "Room 3" },
-                        Status = { Value = new RoomStatusEnded() }
-                    }),
+                        Status = { Value = new RoomStatusEnded() },
+                        EndDate = { Value = DateTimeOffset.Now }
+                    }) { MatchingFilter = true },
                 }
             };
         }

From 57c5d45c022844e729e11c4236d7fa0b8cc93ed9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 15:19:38 +0900
Subject: [PATCH 0317/3722] Standardise and extract common connection failure
 handling logic

---
 osu.Game/Online/API/APIAccess.cs | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index 93d913dfad..fe500b9548 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -153,8 +153,7 @@ namespace osu.Game.Online.API
 
                         if (!handleRequest(userReq))
                         {
-                            if (State.Value == APIState.Connecting)
-                                state.Value = APIState.Failing;
+                            failConnectionProcess();
                             continue;
                         }
 
@@ -170,7 +169,11 @@ namespace osu.Game.Online.API
                         };
 
                         if (!handleRequest(friendsReq))
-                            state.Value = APIState.Failing;
+                        {
+                            failConnectionProcess();
+                            continue;
+                        }
+
                         // The Success callback event is fired on the main thread, so we should wait for that to run before proceeding.
                         // Without this, we will end up circulating this Connecting loop multiple times and queueing up many web requests
                         // before actually going online.
@@ -203,6 +206,13 @@ namespace osu.Game.Online.API
 
                 Thread.Sleep(50);
             }
+
+            void failConnectionProcess()
+            {
+                // if something went wrong during the connection process, we want to reset the state (but only if still connecting).
+                if (State.Value == APIState.Connecting)
+                    state.Value = APIState.Failing;
+            }
         }
 
         public void Perform(APIRequest request)

From 99b670627a847e42ca245923b6e89f70f3a1ea04 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 15:25:12 +0900
Subject: [PATCH 0318/3722] Remove unused placeholder friend in DummyAPI
 implementation

---
 osu.Game/Online/API/DummyAPIAccess.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game/Online/API/DummyAPIAccess.cs b/osu.Game/Online/API/DummyAPIAccess.cs
index a0bc8dd9d6..4e1bc21df3 100644
--- a/osu.Game/Online/API/DummyAPIAccess.cs
+++ b/osu.Game/Online/API/DummyAPIAccess.cs
@@ -19,11 +19,7 @@ namespace osu.Game.Online.API
             Id = 1001,
         });
 
-        public BindableList<User> Friends { get; } = new BindableList<User>(new User
-        {
-            Username = @"Dummy's friend",
-            Id = 2002,
-        }.Yield());
+        public BindableList<User> Friends { get; } = new BindableList<User>();
 
         public Bindable<UserActivity> Activity { get; } = new Bindable<UserActivity>();
 

From 4af508235ee855cd0ac9be9d5aed56d416651f95 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 15:35:18 +0900
Subject: [PATCH 0319/3722] Rename long variable

---
 osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 285ed93341..1d548e8809 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -50,17 +50,17 @@ namespace osu.Game.Screens.Play.HUD
 
         public User User { get; }
 
-        private readonly bool localOrReplayPlayer;
+        private readonly bool trackedPlayer;
 
         /// <summary>
         /// Creates a new <see cref="GameplayLeaderboardScore"/>.
         /// </summary>
         /// <param name="user">The score's player.</param>
-        /// <param name="localOrReplayPlayer">Whether the player is the local user or a replay player.</param>
-        public GameplayLeaderboardScore(User user, bool localOrReplayPlayer)
+        /// <param name="trackedPlayer">Whether the player is the local user or a replay player.</param>
+        public GameplayLeaderboardScore(User user, bool trackedPlayer)
         {
             User = user;
-            this.localOrReplayPlayer = localOrReplayPlayer;
+            this.trackedPlayer = trackedPlayer;
 
             AutoSizeAxes = Axes.Both;
 
@@ -77,7 +77,7 @@ namespace osu.Game.Screens.Play.HUD
             Color4 panelColour, textColour;
             float panelWidth;
 
-            if (localOrReplayPlayer)
+            if (trackedPlayer)
             {
                 panelWidth = extended_width;
                 panelColour = Color4Extensions.FromHex("7fcc33");

From c80ecec0b418eedfa54931ef34d496984655cec1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 18 Dec 2020 15:36:24 +0900
Subject: [PATCH 0320/3722] Reorder methods

---
 osu.Game/Screens/Play/Player.cs | 42 ++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index a54f9fc047..92c76ec2d2 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -531,29 +531,8 @@ namespace osu.Game.Screens.Play
                 completionProgressDelegate = Schedule(GotoRanking);
         }
 
-        protected virtual ScoreInfo CreateScore()
-        {
-            var score = new ScoreInfo
-            {
-                Beatmap = Beatmap.Value.BeatmapInfo,
-                Ruleset = rulesetInfo,
-                Mods = Mods.Value.ToArray(),
-            };
-
-            if (DrawableRuleset.ReplayScore != null)
-                score.User = DrawableRuleset.ReplayScore.ScoreInfo?.User ?? new GuestUser();
-            else
-                score.User = api.LocalUser.Value;
-
-            ScoreProcessor.PopulateScore(score);
-
-            return score;
-        }
-
         protected override bool OnScroll(ScrollEvent e) => mouseWheelDisabled.Value && !GameplayClockContainer.IsPaused.Value;
 
-        protected virtual ResultsScreen CreateResults(ScoreInfo score) => new SoloResultsScreen(score, true);
-
         #region Fail Logic
 
         protected FailOverlay FailOverlay { get; private set; }
@@ -748,6 +727,25 @@ namespace osu.Game.Screens.Play
             return base.OnExiting(next);
         }
 
+        protected virtual ScoreInfo CreateScore()
+        {
+            var score = new ScoreInfo
+            {
+                Beatmap = Beatmap.Value.BeatmapInfo,
+                Ruleset = rulesetInfo,
+                Mods = Mods.Value.ToArray(),
+            };
+
+            if (DrawableRuleset.ReplayScore != null)
+                score.User = DrawableRuleset.ReplayScore.ScoreInfo?.User ?? new GuestUser();
+            else
+                score.User = api.LocalUser.Value;
+
+            ScoreProcessor.PopulateScore(score);
+
+            return score;
+        }
+
         protected virtual void GotoRanking()
         {
             if (DrawableRuleset.ReplayScore != null)
@@ -781,6 +779,8 @@ namespace osu.Game.Screens.Play
                         }));
         }
 
+        protected virtual ResultsScreen CreateResults(ScoreInfo score) => new SoloResultsScreen(score, true);
+
         private void fadeOut(bool instant = false)
         {
             float fadeOutDuration = instant ? 0 : 250;

From a749dca20b14a247cb8828cc0171b99be5e6f141 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 15:43:15 +0900
Subject: [PATCH 0321/3722] Remove left over using statement

---
 osu.Game/Online/API/DummyAPIAccess.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Online/API/DummyAPIAccess.cs b/osu.Game/Online/API/DummyAPIAccess.cs
index 4e1bc21df3..265298270c 100644
--- a/osu.Game/Online/API/DummyAPIAccess.cs
+++ b/osu.Game/Online/API/DummyAPIAccess.cs
@@ -5,7 +5,6 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Game.Users;
 

From ceb2e4762d7c63efc3f9e044ae326447543c8528 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 16:20:42 +0900
Subject: [PATCH 0322/3722] Add test covering a more consistent spread of
 player scores

---
 .../Visual/Gameplay/TestSceneGameplayLeaderboard.cs       | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
index 12bc918d45..d596def98a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
@@ -6,6 +6,7 @@ using NUnit.Framework;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
+using osu.Framework.Utils;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Users;
 using osuTK;
@@ -66,6 +67,13 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("is player 2 position #3", () => leaderboard.CheckPositionByUsername("Player 2", 3));
         }
 
+        [Test]
+        public void TestRandomScores()
+        {
+            int playerNumber = 1;
+            AddRepeatStep("add player with random score", () => leaderboard.Add(createLeaderboardScore(new BindableDouble(RNG.Next(0, 5_000_000)), $"Player {playerNumber++}")), 10);
+        }
+
         private static GameplayLeaderboardScore createLeaderboardScore(BindableDouble score, string username, bool localOrReplayPlayer = false)
         {
             return new GameplayLeaderboardScore(new User { Username = username }, localOrReplayPlayer)

From c84807ed5c0f09e47993666920d5374d561c5f9b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 16:20:54 +0900
Subject: [PATCH 0323/3722] Refactor implementation

---
 .../Play/HUD/GameplayLeaderboardScore.cs      | 123 +++++++++++-------
 1 file changed, 73 insertions(+), 50 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 1d548e8809..439210c944 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.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 Humanizer;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -11,7 +10,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Online.API;
 using osu.Game.Users;
 using osu.Game.Utils;
 using osuTK;
@@ -26,7 +24,7 @@ namespace osu.Game.Screens.Play.HUD
 
         private const float panel_height = 35f;
 
-        private OsuSpriteText positionText, scoreText, accuracyText, comboText;
+        private OsuSpriteText positionText, scoreText, accuracyText, comboText, usernameText;
 
         public readonly BindableDouble TotalScore = new BindableDouble(1000000);
         public readonly BindableDouble Accuracy = new BindableDouble(1);
@@ -45,6 +43,7 @@ namespace osu.Game.Screens.Play.HUD
                     positionText.Text = $"#{scorePosition.Value.ToMetric(decimals: scorePosition < 100000 ? 1 : 0)}";
 
                 positionText.FadeTo(scorePosition.HasValue ? 1 : 0);
+                updateColour();
             }
         }
 
@@ -52,6 +51,9 @@ namespace osu.Game.Screens.Play.HUD
 
         private readonly bool trackedPlayer;
 
+        private Container mainFillContainer;
+        private Box centralFill;
+
         /// <summary>
         /// Creates a new <see cref="GameplayLeaderboardScore"/>.
         /// </summary>
@@ -62,62 +64,93 @@ namespace osu.Game.Screens.Play.HUD
             User = user;
             this.trackedPlayer = trackedPlayer;
 
-            AutoSizeAxes = Axes.Both;
+            AutoSizeAxes = Axes.X;
+            Height = panel_height;
 
             Anchor = Anchor.TopRight;
             Origin = Anchor.TopRight;
         }
 
-        [BackgroundDependencyLoader]
-        private void load(IAPIProvider api)
+        protected override void LoadComplete()
         {
-            const float panel_shear = 0.15f;
-            const float shear_width = panel_height * panel_shear;
+            base.LoadComplete();
 
-            Color4 panelColour, textColour;
-            float panelWidth;
+            updateColour();
+            FinishTransforms(true);
+        }
 
-            if (trackedPlayer)
+        private void updateColour()
+        {
+            if (scorePosition == 1)
             {
-                panelWidth = extended_width;
+                mainFillContainer.ResizeWidthTo(extended_width, 200, Easing.OutQuint);
                 panelColour = Color4Extensions.FromHex("7fcc33");
                 textColour = Color4.White;
             }
-            else if (api.Friends.Any(f => User.Equals(f)))
+            else if (trackedPlayer)
             {
-                panelWidth = extended_width;
+                mainFillContainer.ResizeWidthTo(extended_width, 200, Easing.OutQuint);
                 panelColour = Color4Extensions.FromHex("ffd966");
                 textColour = Color4Extensions.FromHex("2e576b");
             }
             else
             {
-                panelWidth = regular_width;
+                mainFillContainer.ResizeWidthTo(regular_width, 200, Easing.OutQuint);
                 panelColour = Color4Extensions.FromHex("3399cc");
                 textColour = Color4.White;
             }
+        }
+
+        private Color4 panelColour
+        {
+            set
+            {
+                mainFillContainer.FadeColour(value, 200, Easing.OutQuint);
+                centralFill.FadeColour(value, 200, Easing.OutQuint);
+            }
+        }
+
+        private Color4 textColour
+        {
+            set
+            {
+                scoreText.FadeColour(value, 200, Easing.OutQuint);
+                accuracyText.FadeColour(value, 200, Easing.OutQuint);
+                comboText.FadeColour(value, 200, Easing.OutQuint);
+                usernameText.FadeColour(value, 200, Easing.OutQuint);
+                positionText.FadeColour(value, 200, Easing.OutQuint);
+            }
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            const float panel_shear = 0.15f;
+            const float shear_width = panel_height * panel_shear;
 
             InternalChildren = new Drawable[]
             {
-                new Container
+                mainFillContainer = new Container
                 {
+                    Width = regular_width,
+                    RelativeSizeAxes = Axes.Y,
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
                     Masking = true,
                     CornerRadius = 5f,
                     Shear = new Vector2(panel_shear, 0f),
-                    Size = new Vector2(panelWidth, panel_height),
                     Child = new Box
                     {
                         Alpha = 0.5f,
                         RelativeSizeAxes = Axes.Both,
-                        Colour = panelColour,
                     }
                 },
                 new GridContainer
                 {
+                    Width = regular_width,
+                    RelativeSizeAxes = Axes.Y,
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
-                    Size = new Vector2(regular_width, panel_height),
                     ColumnDimensions = new[]
                     {
                         new Dimension(GridSizeMode.Absolute, 35f),
@@ -133,7 +166,7 @@ namespace osu.Game.Screens.Play.HUD
                                 Padding = new MarginPadding { Right = shear_width / 2 },
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
-                                Colour = textColour,
+                                Colour = Color4.White,
                                 Font = OsuFont.Torus.With(size: 14, weight: FontWeight.Bold),
                                 Shadow = false,
                             },
@@ -151,22 +184,22 @@ namespace osu.Game.Screens.Play.HUD
                                         RelativeSizeAxes = Axes.Both,
                                         Children = new[]
                                         {
-                                            new Box
+                                            centralFill = new Box
                                             {
                                                 Alpha = 0.5f,
                                                 RelativeSizeAxes = Axes.Both,
-                                                Colour = panelColour,
+                                                Colour = Color4Extensions.FromHex("3399cc"),
                                             },
                                         }
                                     },
-                                    new OsuSpriteText
+                                    usernameText = new OsuSpriteText
                                     {
                                         Padding = new MarginPadding { Left = shear_width },
                                         RelativeSizeAxes = Axes.X,
                                         Width = 0.8f,
                                         Anchor = Anchor.CentreLeft,
                                         Origin = Anchor.CentreLeft,
-                                        Colour = textColour,
+                                        Colour = Color4.White,
                                         Font = OsuFont.Torus.With(size: 14, weight: FontWeight.SemiBold),
                                         Text = User.Username,
                                         Truncate = true,
@@ -180,41 +213,31 @@ namespace osu.Game.Screens.Play.HUD
                                 RelativeSizeAxes = Axes.Both,
                                 Anchor = Anchor.CentreLeft,
                                 Origin = Anchor.CentreLeft,
-                                Colour = textColour,
+                                Colour = Color4.White,
                                 Children = new Drawable[]
                                 {
                                     scoreText = new OsuSpriteText
                                     {
-                                        Anchor = Anchor.TopLeft,
-                                        Origin = Anchor.TopLeft,
-                                        Spacing = new Vector2(0.5f, 0f),
-                                        Font = OsuFont.Torus.With(size: 16, weight: FontWeight.SemiBold),
+                                        Spacing = new Vector2(-1f, 0f),
+                                        Font = OsuFont.Torus.With(size: 16, weight: FontWeight.SemiBold, fixedWidth: true),
                                         Shadow = false,
                                     },
-                                    new Container
+                                    accuracyText = new OsuSpriteText
                                     {
-                                        RelativeSizeAxes = Axes.X,
-                                        AutoSizeAxes = Axes.Y,
                                         Anchor = Anchor.BottomLeft,
                                         Origin = Anchor.BottomLeft,
-                                        Children = new Drawable[]
-                                        {
-                                            accuracyText = new OsuSpriteText
-                                            {
-                                                Anchor = Anchor.CentreLeft,
-                                                Origin = Anchor.CentreLeft,
-                                                Font = OsuFont.Torus.With(size: 12, weight: FontWeight.SemiBold),
-                                                Shadow = false,
-                                            },
-                                            comboText = new OsuSpriteText
-                                            {
-                                                Anchor = Anchor.CentreRight,
-                                                Origin = Anchor.CentreRight,
-                                                Font = OsuFont.Torus.With(size: 12, weight: FontWeight.SemiBold),
-                                                Shadow = false,
-                                            },
-                                        }
-                                    }
+                                        Font = OsuFont.Torus.With(size: 12, weight: FontWeight.SemiBold, fixedWidth: true),
+                                        Spacing = new Vector2(-1f, 0f),
+                                        Shadow = false,
+                                    },
+                                    comboText = new OsuSpriteText
+                                    {
+                                        Anchor = Anchor.BottomRight,
+                                        Origin = Anchor.BottomRight,
+                                        Spacing = new Vector2(-1f, 0f),
+                                        Font = OsuFont.Torus.With(size: 12, weight: FontWeight.SemiBold, fixedWidth: true),
+                                        Shadow = false,
+                                    },
                                 },
                             }
                         }

From e6a38ffbce738d3c464647349b8e5b81b55b373f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 16:33:55 +0900
Subject: [PATCH 0324/3722] Fix test failure due to polluted bindable value
 from previous test

---
 osu.Game/Tests/Visual/MultiplayerTestScene.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Tests/Visual/MultiplayerTestScene.cs b/osu.Game/Tests/Visual/MultiplayerTestScene.cs
index dc614896c5..6f24e00a92 100644
--- a/osu.Game/Tests/Visual/MultiplayerTestScene.cs
+++ b/osu.Game/Tests/Visual/MultiplayerTestScene.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Tests.Visual
     public abstract class MultiplayerTestScene : ScreenTestScene
     {
         [Cached]
-        private readonly Bindable<Room> currentRoom = new Bindable<Room>(new Room());
+        private readonly Bindable<Room> currentRoom = new Bindable<Room>();
 
         protected Room Room => currentRoom.Value;
 
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Visual
         [SetUp]
         public void Setup() => Schedule(() =>
         {
-            Room.CopyFrom(new Room());
+            currentRoom.Value = new Room();
         });
     }
 }

From 07a8ffa4aaefeeaa2da30aea60a94381826f7c13 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 16:50:25 +0900
Subject: [PATCH 0325/3722] Fix failing tests due to ignoring the lookup ID

---
 .../Visual/Online/TestSceneCurrentlyPlayingDisplay.cs       | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
index 4f0ca67e64..eaa881b02c 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
@@ -89,13 +89,11 @@ namespace osu.Game.Tests.Visual.Online
                 "pishifat"
             };
 
-            private int id;
-
             protected override Task<User> ComputeValueAsync(int lookup, CancellationToken token = default)
                 => Task.FromResult(new User
                 {
-                    Id = id++,
-                    Username = usernames[id % usernames.Length],
+                    Id = lookup++,
+                    Username = usernames[lookup % usernames.Length],
                 });
         }
     }

From 2db7433c0b11f5a90be103621af529a2c35f50e7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 18 Dec 2020 16:51:59 +0900
Subject: [PATCH 0326/3722] Refactor player score creation and submission
 process

---
 .../TestSceneCompletionCancellation.cs        |  3 +-
 .../Screens/Multi/Play/TimeshiftPlayer.cs     | 17 ++--
 osu.Game/Screens/Play/Player.cs               | 79 ++++++++++---------
 osu.Game/Screens/Play/ReplayPlayer.cs         | 13 +--
 4 files changed, 65 insertions(+), 47 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs
index 6fd5511e5a..6e3b394057 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs
@@ -10,6 +10,7 @@ using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Scoring;
 using osu.Game.Storyboards;
 using osuTK;
 
@@ -117,7 +118,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
             }
 
-            protected override void GotoRanking()
+            protected override void GotoRanking(ScoreInfo score)
             {
                 GotoRankingInvoked = true;
             }
diff --git a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
index 0efa9c5196..76e4a328e0 100644
--- a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
+++ b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
@@ -5,6 +5,7 @@ using System;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;
+using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Logging;
@@ -95,19 +96,25 @@ namespace osu.Game.Screens.Multi.Play
             return new TimeshiftResultsScreen(score, roomId.Value.Value, playlistItem, true);
         }
 
-        protected override ScoreInfo CreateScore()
+        protected override Score CreateScore()
         {
             var score = base.CreateScore();
-            score.TotalScore = (int)Math.Round(ScoreProcessor.GetStandardisedScore());
+            score.ScoreInfo.TotalScore = (int)Math.Round(ScoreProcessor.GetStandardisedScore());
+            return score;
+        }
+
+        protected override async Task<ScoreInfo> SubmitScore(Score score)
+        {
+            await base.SubmitScore(score);
 
             Debug.Assert(token != null);
 
-            var request = new SubmitRoomScoreRequest(token.Value, roomId.Value ?? 0, playlistItem.ID, score);
-            request.Success += s => score.OnlineScoreID = s.ID;
+            var request = new SubmitRoomScoreRequest(token.Value, roomId.Value ?? 0, playlistItem.ID, score.ScoreInfo);
+            request.Success += s => score.ScoreInfo.OnlineScoreID = s.ID;
             request.Failure += e => Logger.Error(e, "Failed to submit score");
             api.Queue(request);
 
-            return score;
+            return score.ScoreInfo;
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 92c76ec2d2..3fb680b9c9 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading.Tasks;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
@@ -527,8 +528,18 @@ namespace osu.Game.Screens.Play
 
             if (!showResults) return;
 
-            using (BeginDelayedSequence(RESULTS_DISPLAY_DELAY))
-                completionProgressDelegate = Schedule(GotoRanking);
+            SubmitScore(CreateScore()).ContinueWith(t => Schedule(() =>
+            {
+                using (BeginDelayedSequence(RESULTS_DISPLAY_DELAY))
+                {
+                    completionProgressDelegate = Schedule(() =>
+                    {
+                        // screen may be in the exiting transition phase.
+                        if (this.IsCurrentScreen())
+                            GotoRanking(t.Result);
+                    });
+                }
+            }));
         }
 
         protected override bool OnScroll(ScrollEvent e) => mouseWheelDisabled.Value && !GameplayClockContainer.IsPaused.Value;
@@ -727,60 +738,56 @@ namespace osu.Game.Screens.Play
             return base.OnExiting(next);
         }
 
-        protected virtual ScoreInfo CreateScore()
+        protected virtual Score CreateScore()
         {
-            var score = new ScoreInfo
+            var score = new Score
             {
-                Beatmap = Beatmap.Value.BeatmapInfo,
-                Ruleset = rulesetInfo,
-                Mods = Mods.Value.ToArray(),
+                ScoreInfo = new ScoreInfo
+                {
+                    Beatmap = Beatmap.Value.BeatmapInfo,
+                    Ruleset = rulesetInfo,
+                    Mods = Mods.Value.ToArray(),
+                }
             };
 
             if (DrawableRuleset.ReplayScore != null)
-                score.User = DrawableRuleset.ReplayScore.ScoreInfo?.User ?? new GuestUser();
+            {
+                score.ScoreInfo.User = DrawableRuleset.ReplayScore.ScoreInfo?.User ?? new GuestUser();
+                score.Replay = DrawableRuleset.ReplayScore.Replay;
+            }
             else
-                score.User = api.LocalUser.Value;
+            {
+                score.ScoreInfo.User = api.LocalUser.Value;
+                if (recordingScore?.Replay.Frames.Count > 0)
+                    score.Replay = recordingScore.Replay;
+            }
 
-            ScoreProcessor.PopulateScore(score);
+            ScoreProcessor.PopulateScore(score.ScoreInfo);
 
             return score;
         }
 
-        protected virtual void GotoRanking()
+        protected virtual async Task<ScoreInfo> SubmitScore(Score score)
         {
+            // Replays are already populated and present in the game's database, so should not be re-imported.
             if (DrawableRuleset.ReplayScore != null)
+                return score.ScoreInfo;
+
+            LegacyByteArrayReader replayReader;
+
+            using (var stream = new MemoryStream())
             {
-                // if a replay is present, we likely don't want to import into the local database.
-                this.Push(CreateResults(CreateScore()));
-                return;
+                new LegacyScoreEncoder(score, gameplayBeatmap.PlayableBeatmap).Encode(stream);
+                replayReader = new LegacyByteArrayReader(stream.ToArray(), "replay.osr");
             }
 
-            LegacyByteArrayReader replayReader = null;
-
-            var score = new Score { ScoreInfo = CreateScore() };
-
-            if (recordingScore?.Replay.Frames.Count > 0)
-            {
-                score.Replay = recordingScore.Replay;
-
-                using (var stream = new MemoryStream())
-                {
-                    new LegacyScoreEncoder(score, gameplayBeatmap.PlayableBeatmap).Encode(stream);
-                    replayReader = new LegacyByteArrayReader(stream.ToArray(), "replay.osr");
-                }
-            }
-
-            scoreManager.Import(score.ScoreInfo, replayReader)
-                        .ContinueWith(imported => Schedule(() =>
-                        {
-                            // screen may be in the exiting transition phase.
-                            if (this.IsCurrentScreen())
-                                this.Push(CreateResults(imported.Result));
-                        }));
+            return await scoreManager.Import(score.ScoreInfo, replayReader);
         }
 
         protected virtual ResultsScreen CreateResults(ScoreInfo score) => new SoloResultsScreen(score, true);
 
+        protected virtual void GotoRanking(ScoreInfo score) => this.Push(CreateResults(score));
+
         private void fadeOut(bool instant = false)
         {
             float fadeOutDuration = instant ? 0 : 250;
diff --git a/osu.Game/Screens/Play/ReplayPlayer.cs b/osu.Game/Screens/Play/ReplayPlayer.cs
index 294d116f51..390d1d1959 100644
--- a/osu.Game/Screens/Play/ReplayPlayer.cs
+++ b/osu.Game/Screens/Play/ReplayPlayer.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.Tasks;
 using osu.Framework.Input.Bindings;
 using osu.Game.Input.Bindings;
 using osu.Game.Scoring;
@@ -26,18 +27,20 @@ namespace osu.Game.Screens.Play
             DrawableRuleset?.SetReplayScore(Score);
         }
 
-        protected override ResultsScreen CreateResults(ScoreInfo score) => new SoloResultsScreen(score, false);
-
-        protected override ScoreInfo CreateScore()
+        protected override Score CreateScore()
         {
             var baseScore = base.CreateScore();
 
             // Since the replay score doesn't contain statistics, we'll pass them through here.
-            Score.ScoreInfo.HitEvents = baseScore.HitEvents;
+            Score.ScoreInfo.HitEvents = baseScore.ScoreInfo.HitEvents;
 
-            return Score.ScoreInfo;
+            return Score;
         }
 
+        protected override Task<ScoreInfo> SubmitScore(Score score) => Task.FromResult(score.ScoreInfo);
+
+        protected override ResultsScreen CreateResults(ScoreInfo score) => new SoloResultsScreen(score, false);
+
         public bool OnPressed(GlobalAction action)
         {
             switch (action)

From 70cda680c0e868f41f27bd902cd2d0712d7ee4b6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 16:55:55 +0900
Subject: [PATCH 0327/3722] Update to match new implementation

---
 osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index b2dc47ce61..4d39d1a6b3 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -7,6 +7,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Configuration;
 using osu.Game.Database;
+using osu.Game.Online.API;
 using osu.Game.Online.Spectator;
 using osu.Game.Rulesets.Scoring;
 
@@ -44,7 +45,7 @@ namespace osu.Game.Screens.Play.HUD
         private Bindable<ScoringMode> scoringMode;
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
+        private void load(OsuConfigManager config, IAPIProvider api)
         {
             streamingClient.OnNewFrames += handleIncomingFrames;
 
@@ -58,7 +59,7 @@ namespace osu.Game.Screens.Play.HUD
                 var trackedUser = new TrackedUserData();
 
                 userScores[user] = trackedUser;
-                AddPlayer(trackedUser.Score, resolvedUser);
+                Add(new GameplayLeaderboardScore(resolvedUser, resolvedUser.Id == api.LocalUser.Value.Id)); //trackedUser.Score, resolvedUser);
             }
 
             scoringMode = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode);

From 97ff500b0daa28063188e699411b99017e2241bb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 18 Dec 2020 16:56:22 +0900
Subject: [PATCH 0328/3722] Make timeshift wait on score submission

---
 .../Screens/Multi/Play/TimeshiftPlayer.cs     | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
index 76e4a328e0..e106dc3a1c 100644
--- a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
+++ b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
@@ -105,16 +105,29 @@ namespace osu.Game.Screens.Multi.Play
 
         protected override async Task<ScoreInfo> SubmitScore(Score score)
         {
-            await base.SubmitScore(score);
-
             Debug.Assert(token != null);
 
+            bool completed = false;
             var request = new SubmitRoomScoreRequest(token.Value, roomId.Value ?? 0, playlistItem.ID, score.ScoreInfo);
-            request.Success += s => score.ScoreInfo.OnlineScoreID = s.ID;
-            request.Failure += e => Logger.Error(e, "Failed to submit score");
+
+            request.Success += s =>
+            {
+                score.ScoreInfo.OnlineScoreID = s.ID;
+                completed = true;
+            };
+
+            request.Failure += e =>
+            {
+                Logger.Error(e, "Failed to submit score");
+                completed = true;
+            };
+
             api.Queue(request);
 
-            return score.ScoreInfo;
+            while (!completed)
+                await Task.Delay(100);
+
+            return await base.SubmitScore(score);
         }
 
         protected override void Dispose(bool isDisposing)

From 157a72ec5deb0f5176fd171c57b9e61d30daa958 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 17:07:38 +0900
Subject: [PATCH 0329/3722] Revert previous player add flow via interface

---
 .../Gameplay/TestSceneGameplayLeaderboard.cs     | 16 +++++++---------
 osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs | 16 +++++++++++++---
 .../Screens/Play/HUD/GameplayLeaderboardScore.cs |  8 ++++----
 osu.Game/Screens/Play/HUD/ILeaderboardScore.cs   | 14 ++++++++++++++
 4 files changed, 38 insertions(+), 16 deletions(-)
 create mode 100644 osu.Game/Screens/Play/HUD/ILeaderboardScore.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
index d596def98a..6e9375f69c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 playerScore.Value = 1222333;
             });
 
-            AddStep("add local player", () => leaderboard.Add(createLeaderboardScore(playerScore, "You", true)));
+            AddStep("add local player", () => createLeaderboardScore(playerScore, "You", true));
             AddSliderStep("set player score", 50, 5000000, 1222333, v => playerScore.Value = v);
         }
 
@@ -49,8 +49,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             var player2Score = new BindableDouble(1234567);
             var player3Score = new BindableDouble(1111111);
 
-            AddStep("add player 2", () => leaderboard.Add(createLeaderboardScore(player2Score, "Player 2")));
-            AddStep("add player 3", () => leaderboard.Add(createLeaderboardScore(player3Score, "Player 3")));
+            AddStep("add player 2", () => createLeaderboardScore(player2Score, "Player 2"));
+            AddStep("add player 3", () => createLeaderboardScore(player3Score, "Player 3"));
 
             AddAssert("is player 2 position #1", () => leaderboard.CheckPositionByUsername("Player 2", 1));
             AddAssert("is player position #2", () => leaderboard.CheckPositionByUsername("You", 2));
@@ -71,15 +71,13 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestRandomScores()
         {
             int playerNumber = 1;
-            AddRepeatStep("add player with random score", () => leaderboard.Add(createLeaderboardScore(new BindableDouble(RNG.Next(0, 5_000_000)), $"Player {playerNumber++}")), 10);
+            AddRepeatStep("add player with random score", () => createLeaderboardScore(new BindableDouble(RNG.Next(0, 5_000_000)), $"Player {playerNumber++}"), 10);
         }
 
-        private static GameplayLeaderboardScore createLeaderboardScore(BindableDouble score, string username, bool localOrReplayPlayer = false)
+        private void createLeaderboardScore(BindableDouble score, string username, bool isTracked = false)
         {
-            return new GameplayLeaderboardScore(new User { Username = username }, localOrReplayPlayer)
-            {
-                TotalScore = { BindTarget = score },
-            };
+            var leaderboardScore = leaderboard.AddPlayer(new User { Username = username }, isTracked);
+            leaderboardScore.TotalScore.BindTo(score);
         }
 
         private class TestGameplayLeaderboard : GameplayLeaderboard
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index 573bf54b14..e738477a80 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.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 System;
 using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Users;
 using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
@@ -22,13 +24,21 @@ namespace osu.Game.Screens.Play.HUD
             LayoutEasing = Easing.OutQuint;
         }
 
-        public override void Add(GameplayLeaderboardScore drawable)
+        public ILeaderboardScore AddPlayer(User user, bool isTracked)
         {
+            var drawable = new GameplayLeaderboardScore(user, isTracked);
             base.Add(drawable);
-            drawable?.TotalScore.BindValueChanged(_ => updateScores(), true);
+            drawable.TotalScore.BindValueChanged(_ => Scheduler.AddOnce(sort), true);
+
+            return drawable;
         }
 
-        private void updateScores()
+        public override void Add(GameplayLeaderboardScore drawable)
+        {
+            throw new InvalidOperationException($"Use {nameof(AddPlayer)} instead.");
+        }
+
+        private void sort()
         {
             var orderedByScore = this.OrderByDescending(i => i.TotalScore.Value).ToList();
 
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 439210c944..d4d7c69f6b 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -17,7 +17,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class GameplayLeaderboardScore : CompositeDrawable
+    public class GameplayLeaderboardScore : CompositeDrawable, ILeaderboardScore
     {
         private const float regular_width = 215f;
         private const float extended_width = 235f;
@@ -26,9 +26,9 @@ namespace osu.Game.Screens.Play.HUD
 
         private OsuSpriteText positionText, scoreText, accuracyText, comboText, usernameText;
 
-        public readonly BindableDouble TotalScore = new BindableDouble(1000000);
-        public readonly BindableDouble Accuracy = new BindableDouble(1);
-        public readonly BindableInt Combo = new BindableInt();
+        public BindableDouble TotalScore { get; } = new BindableDouble();
+        public BindableDouble Accuracy { get; } = new BindableDouble(1);
+        public BindableInt Combo { get; } = new BindableInt();
 
         private int? scorePosition;
 
diff --git a/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs b/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs
new file mode 100644
index 0000000000..bc1a03c5aa
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs
@@ -0,0 +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.Framework.Bindables;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public interface ILeaderboardScore
+    {
+        BindableDouble TotalScore { get; }
+        BindableDouble Accuracy { get; }
+        BindableInt Combo { get; }
+    }
+}

From cb3f89d0a5c73baa360413c9ef9cf08c8ea39617 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 17:13:51 +0900
Subject: [PATCH 0330/3722] Hook up with new leaderboard design

---
 osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index 4d39d1a6b3..c96f496cd0 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -59,7 +59,11 @@ namespace osu.Game.Screens.Play.HUD
                 var trackedUser = new TrackedUserData();
 
                 userScores[user] = trackedUser;
-                Add(new GameplayLeaderboardScore(resolvedUser, resolvedUser.Id == api.LocalUser.Value.Id)); //trackedUser.Score, resolvedUser);
+                var leaderboardScore = AddPlayer(resolvedUser, resolvedUser.Id == api.LocalUser.Value.Id);
+
+                ((IBindable<double>)leaderboardScore.Accuracy).BindTo(trackedUser.Accuracy);
+                ((IBindable<double>)leaderboardScore.TotalScore).BindTo(trackedUser.Score);
+                ((IBindable<int>)leaderboardScore.Combo).BindTo(trackedUser.CurrentCombo);
             }
 
             scoringMode = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode);

From bca4d83af794a587eb02eba41357ce6e841381c1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 17:07:38 +0900
Subject: [PATCH 0331/3722] Revert previous player add flow via interface

---
 .../Gameplay/TestSceneGameplayLeaderboard.cs     | 16 +++++++---------
 osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs | 16 +++++++++++++---
 .../Screens/Play/HUD/GameplayLeaderboardScore.cs |  8 ++++----
 osu.Game/Screens/Play/HUD/ILeaderboardScore.cs   | 14 ++++++++++++++
 4 files changed, 38 insertions(+), 16 deletions(-)
 create mode 100644 osu.Game/Screens/Play/HUD/ILeaderboardScore.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
index d596def98a..6e9375f69c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 playerScore.Value = 1222333;
             });
 
-            AddStep("add local player", () => leaderboard.Add(createLeaderboardScore(playerScore, "You", true)));
+            AddStep("add local player", () => createLeaderboardScore(playerScore, "You", true));
             AddSliderStep("set player score", 50, 5000000, 1222333, v => playerScore.Value = v);
         }
 
@@ -49,8 +49,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             var player2Score = new BindableDouble(1234567);
             var player3Score = new BindableDouble(1111111);
 
-            AddStep("add player 2", () => leaderboard.Add(createLeaderboardScore(player2Score, "Player 2")));
-            AddStep("add player 3", () => leaderboard.Add(createLeaderboardScore(player3Score, "Player 3")));
+            AddStep("add player 2", () => createLeaderboardScore(player2Score, "Player 2"));
+            AddStep("add player 3", () => createLeaderboardScore(player3Score, "Player 3"));
 
             AddAssert("is player 2 position #1", () => leaderboard.CheckPositionByUsername("Player 2", 1));
             AddAssert("is player position #2", () => leaderboard.CheckPositionByUsername("You", 2));
@@ -71,15 +71,13 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestRandomScores()
         {
             int playerNumber = 1;
-            AddRepeatStep("add player with random score", () => leaderboard.Add(createLeaderboardScore(new BindableDouble(RNG.Next(0, 5_000_000)), $"Player {playerNumber++}")), 10);
+            AddRepeatStep("add player with random score", () => createLeaderboardScore(new BindableDouble(RNG.Next(0, 5_000_000)), $"Player {playerNumber++}"), 10);
         }
 
-        private static GameplayLeaderboardScore createLeaderboardScore(BindableDouble score, string username, bool localOrReplayPlayer = false)
+        private void createLeaderboardScore(BindableDouble score, string username, bool isTracked = false)
         {
-            return new GameplayLeaderboardScore(new User { Username = username }, localOrReplayPlayer)
-            {
-                TotalScore = { BindTarget = score },
-            };
+            var leaderboardScore = leaderboard.AddPlayer(new User { Username = username }, isTracked);
+            leaderboardScore.TotalScore.BindTo(score);
         }
 
         private class TestGameplayLeaderboard : GameplayLeaderboard
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index 573bf54b14..e738477a80 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.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 System;
 using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Users;
 using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
@@ -22,13 +24,21 @@ namespace osu.Game.Screens.Play.HUD
             LayoutEasing = Easing.OutQuint;
         }
 
-        public override void Add(GameplayLeaderboardScore drawable)
+        public ILeaderboardScore AddPlayer(User user, bool isTracked)
         {
+            var drawable = new GameplayLeaderboardScore(user, isTracked);
             base.Add(drawable);
-            drawable?.TotalScore.BindValueChanged(_ => updateScores(), true);
+            drawable.TotalScore.BindValueChanged(_ => Scheduler.AddOnce(sort), true);
+
+            return drawable;
         }
 
-        private void updateScores()
+        public override void Add(GameplayLeaderboardScore drawable)
+        {
+            throw new InvalidOperationException($"Use {nameof(AddPlayer)} instead.");
+        }
+
+        private void sort()
         {
             var orderedByScore = this.OrderByDescending(i => i.TotalScore.Value).ToList();
 
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 439210c944..d4d7c69f6b 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -17,7 +17,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class GameplayLeaderboardScore : CompositeDrawable
+    public class GameplayLeaderboardScore : CompositeDrawable, ILeaderboardScore
     {
         private const float regular_width = 215f;
         private const float extended_width = 235f;
@@ -26,9 +26,9 @@ namespace osu.Game.Screens.Play.HUD
 
         private OsuSpriteText positionText, scoreText, accuracyText, comboText, usernameText;
 
-        public readonly BindableDouble TotalScore = new BindableDouble(1000000);
-        public readonly BindableDouble Accuracy = new BindableDouble(1);
-        public readonly BindableInt Combo = new BindableInt();
+        public BindableDouble TotalScore { get; } = new BindableDouble();
+        public BindableDouble Accuracy { get; } = new BindableDouble(1);
+        public BindableInt Combo { get; } = new BindableInt();
 
         private int? scorePosition;
 
diff --git a/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs b/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs
new file mode 100644
index 0000000000..bc1a03c5aa
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs
@@ -0,0 +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.Framework.Bindables;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public interface ILeaderboardScore
+    {
+        BindableDouble TotalScore { get; }
+        BindableDouble Accuracy { get; }
+        BindableInt Combo { get; }
+    }
+}

From 4cf013c0058555776eea78a956203cfbbfe8d70a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 17:19:00 +0900
Subject: [PATCH 0332/3722] Fix animation replacing itself even when score
 position hasn't changed

---
 osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index d4d7c69f6b..086ac956e8 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -37,6 +37,9 @@ namespace osu.Game.Screens.Play.HUD
             get => scorePosition;
             set
             {
+                if (value == scorePosition)
+                    return;
+
                 scorePosition = value;
 
                 if (scorePosition.HasValue)

From e82986b76328983a9c648ba274df7689115941af Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 17:19:36 +0900
Subject: [PATCH 0333/3722] Fix panel x positions getting weird duration
 relayouts

Also adjust the transitions a bit to feel better.
---
 .../Play/HUD/GameplayLeaderboardScore.cs       | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 086ac956e8..77e6d320ae 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -67,11 +67,7 @@ namespace osu.Game.Screens.Play.HUD
             User = user;
             this.trackedPlayer = trackedPlayer;
 
-            AutoSizeAxes = Axes.X;
-            Height = panel_height;
-
-            Anchor = Anchor.TopRight;
-            Origin = Anchor.TopRight;
+            Size = new Vector2(extended_width, panel_height);
         }
 
         protected override void LoadComplete()
@@ -82,23 +78,25 @@ namespace osu.Game.Screens.Play.HUD
             FinishTransforms(true);
         }
 
+        private const double transition_duration = 500;
+
         private void updateColour()
         {
             if (scorePosition == 1)
             {
-                mainFillContainer.ResizeWidthTo(extended_width, 200, Easing.OutQuint);
+                mainFillContainer.ResizeWidthTo(extended_width, transition_duration, Easing.OutElastic);
                 panelColour = Color4Extensions.FromHex("7fcc33");
                 textColour = Color4.White;
             }
             else if (trackedPlayer)
             {
-                mainFillContainer.ResizeWidthTo(extended_width, 200, Easing.OutQuint);
+                mainFillContainer.ResizeWidthTo(extended_width, transition_duration, Easing.OutElastic);
                 panelColour = Color4Extensions.FromHex("ffd966");
                 textColour = Color4Extensions.FromHex("2e576b");
             }
             else
             {
-                mainFillContainer.ResizeWidthTo(regular_width, 200, Easing.OutQuint);
+                mainFillContainer.ResizeWidthTo(regular_width, transition_duration, Easing.OutElastic);
                 panelColour = Color4Extensions.FromHex("3399cc");
                 textColour = Color4.White;
             }
@@ -108,8 +106,8 @@ namespace osu.Game.Screens.Play.HUD
         {
             set
             {
-                mainFillContainer.FadeColour(value, 200, Easing.OutQuint);
-                centralFill.FadeColour(value, 200, Easing.OutQuint);
+                mainFillContainer.FadeColour(value, transition_duration, Easing.OutQuint);
+                centralFill.FadeColour(value, transition_duration, Easing.OutQuint);
             }
         }
 

From 668536ce562eb30088b66602f294672b5be58d58 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 17:25:48 +0900
Subject: [PATCH 0334/3722] Fix vertical size potentially changing during
 relayout

---
 .../Gameplay/TestSceneGameplayLeaderboard.cs      |  2 +-
 osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs  |  4 +++-
 .../Screens/Play/HUD/GameplayLeaderboardScore.cs  | 15 ++++++++-------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
index 6e9375f69c..ff15e1d2dc 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             Add(leaderboard = new TestGameplayLeaderboard
             {
                 Anchor = Anchor.Centre,
-                Origin = Anchor.TopCentre,
+                Origin = Anchor.Centre,
                 Scale = new Vector2(2),
             });
         }
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index e738477a80..99319c0008 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Screens.Play.HUD
     {
         public GameplayLeaderboard()
         {
-            AutoSizeAxes = Axes.Both;
+            Width = GameplayLeaderboardScore.EXTENDED_WIDTH;
 
             Direction = FillDirection.Vertical;
 
@@ -30,6 +30,8 @@ namespace osu.Game.Screens.Play.HUD
             base.Add(drawable);
             drawable.TotalScore.BindValueChanged(_ => Scheduler.AddOnce(sort), true);
 
+            Height = Count * (GameplayLeaderboardScore.PANEL_HEIGHT + Spacing.Y);
+
             return drawable;
         }
 
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 77e6d320ae..242e7ff6b9 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -19,10 +19,11 @@ namespace osu.Game.Screens.Play.HUD
 {
     public class GameplayLeaderboardScore : CompositeDrawable, ILeaderboardScore
     {
-        private const float regular_width = 215f;
-        private const float extended_width = 235f;
+        public const float EXTENDED_WIDTH = 235f;
 
-        private const float panel_height = 35f;
+        private const float regular_width = 215f;
+
+        public const float PANEL_HEIGHT = 35f;
 
         private OsuSpriteText positionText, scoreText, accuracyText, comboText, usernameText;
 
@@ -67,7 +68,7 @@ namespace osu.Game.Screens.Play.HUD
             User = user;
             this.trackedPlayer = trackedPlayer;
 
-            Size = new Vector2(extended_width, panel_height);
+            Size = new Vector2(EXTENDED_WIDTH, PANEL_HEIGHT);
         }
 
         protected override void LoadComplete()
@@ -84,13 +85,13 @@ namespace osu.Game.Screens.Play.HUD
         {
             if (scorePosition == 1)
             {
-                mainFillContainer.ResizeWidthTo(extended_width, transition_duration, Easing.OutElastic);
+                mainFillContainer.ResizeWidthTo(EXTENDED_WIDTH, transition_duration, Easing.OutElastic);
                 panelColour = Color4Extensions.FromHex("7fcc33");
                 textColour = Color4.White;
             }
             else if (trackedPlayer)
             {
-                mainFillContainer.ResizeWidthTo(extended_width, transition_duration, Easing.OutElastic);
+                mainFillContainer.ResizeWidthTo(EXTENDED_WIDTH, transition_duration, Easing.OutElastic);
                 panelColour = Color4Extensions.FromHex("ffd966");
                 textColour = Color4Extensions.FromHex("2e576b");
             }
@@ -127,7 +128,7 @@ namespace osu.Game.Screens.Play.HUD
         private void load()
         {
             const float panel_shear = 0.15f;
-            const float shear_width = panel_height * panel_shear;
+            const float shear_width = PANEL_HEIGHT * panel_shear;
 
             InternalChildren = new Drawable[]
             {

From 615352c1e41a13c9dc189003aeb4ee2b8a3f95df Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 17:30:11 +0900
Subject: [PATCH 0335/3722] Fix shear offset not being included in
 GameplayLeaderboard's own size

---
 osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs   |  9 +++++++--
 .../Screens/Play/HUD/GameplayLeaderboardScore.cs   | 14 ++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index 99319c0008..aa668cc4c8 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Screens.Play.HUD
     {
         public GameplayLeaderboard()
         {
-            Width = GameplayLeaderboardScore.EXTENDED_WIDTH;
+            Width = GameplayLeaderboardScore.EXTENDED_WIDTH + GameplayLeaderboardScore.SHEAR_WIDTH;
 
             Direction = FillDirection.Vertical;
 
@@ -26,7 +26,12 @@ namespace osu.Game.Screens.Play.HUD
 
         public ILeaderboardScore AddPlayer(User user, bool isTracked)
         {
-            var drawable = new GameplayLeaderboardScore(user, isTracked);
+            var drawable = new GameplayLeaderboardScore(user, isTracked)
+            {
+                Anchor = Anchor.TopRight,
+                Origin = Anchor.TopRight,
+            };
+
             base.Add(drawable);
             drawable.TotalScore.BindValueChanged(_ => Scheduler.AddOnce(sort), true);
 
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 242e7ff6b9..5c4b4406cc 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -16,6 +16,7 @@ using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Screens.Play.HUD
+
 {
     public class GameplayLeaderboardScore : CompositeDrawable, ILeaderboardScore
     {
@@ -25,6 +26,10 @@ namespace osu.Game.Screens.Play.HUD
 
         public const float PANEL_HEIGHT = 35f;
 
+        public const float SHEAR_WIDTH = PANEL_HEIGHT * panel_shear;
+
+        private const float panel_shear = 0.15f;
+
         private OsuSpriteText positionText, scoreText, accuracyText, comboText, usernameText;
 
         public BindableDouble TotalScore { get; } = new BindableDouble();
@@ -127,9 +132,6 @@ namespace osu.Game.Screens.Play.HUD
         [BackgroundDependencyLoader]
         private void load()
         {
-            const float panel_shear = 0.15f;
-            const float shear_width = PANEL_HEIGHT * panel_shear;
-
             InternalChildren = new Drawable[]
             {
                 mainFillContainer = new Container
@@ -165,7 +167,7 @@ namespace osu.Game.Screens.Play.HUD
                         {
                             positionText = new OsuSpriteText
                             {
-                                Padding = new MarginPadding { Right = shear_width / 2 },
+                                Padding = new MarginPadding { Right = SHEAR_WIDTH / 2 },
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
                                 Colour = Color4.White,
@@ -174,7 +176,7 @@ namespace osu.Game.Screens.Play.HUD
                             },
                             new Container
                             {
-                                Padding = new MarginPadding { Horizontal = shear_width / 3 },
+                                Padding = new MarginPadding { Horizontal = SHEAR_WIDTH / 3 },
                                 RelativeSizeAxes = Axes.Both,
                                 Children = new Drawable[]
                                 {
@@ -196,7 +198,7 @@ namespace osu.Game.Screens.Play.HUD
                                     },
                                     usernameText = new OsuSpriteText
                                     {
-                                        Padding = new MarginPadding { Left = shear_width },
+                                        Padding = new MarginPadding { Left = SHEAR_WIDTH },
                                         RelativeSizeAxes = Axes.X,
                                         Width = 0.8f,
                                         Anchor = Anchor.CentreLeft,

From fdad5e86d3baa4adb991717e8408afae2da02bb0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Dec 2020 17:33:18 +0900
Subject: [PATCH 0336/3722] Remove stray newline

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

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 5c4b4406cc..0b58cf76a2 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -16,7 +16,6 @@ using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Screens.Play.HUD
-
 {
     public class GameplayLeaderboardScore : CompositeDrawable, ILeaderboardScore
     {

From 2958cab239027632f0b9b5c61109bbbd90bfa8b4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 18 Dec 2020 17:47:33 +0900
Subject: [PATCH 0337/3722] Remove GotoRanking

---
 .../TestSceneCompletionCancellation.cs         | 13 ++++++++-----
 osu.Game/Screens/Play/Player.cs                | 18 +++++++++++++++---
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs
index 6e3b394057..4ee48fd853 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneCompletionCancellation.cs
@@ -11,6 +11,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Scoring;
+using osu.Game.Screens.Ranking;
 using osu.Game.Storyboards;
 using osuTK;
 
@@ -51,7 +52,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             cancel();
             complete();
 
-            AddUntilStep("attempted to push ranking", () => ((FakeRankingPushPlayer)Player).GotoRankingInvoked);
+            AddUntilStep("attempted to push ranking", () => ((FakeRankingPushPlayer)Player).ResultsCreated);
         }
 
         /// <summary>
@@ -85,7 +86,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             // wait to ensure there was no attempt of pushing the results screen.
             AddWaitStep("wait", resultsDisplayWaitCount);
-            AddAssert("no attempt to push ranking", () => !((FakeRankingPushPlayer)Player).GotoRankingInvoked);
+            AddAssert("no attempt to push ranking", () => !((FakeRankingPushPlayer)Player).ResultsCreated);
         }
 
         protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
@@ -111,16 +112,18 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         public class FakeRankingPushPlayer : TestPlayer
         {
-            public bool GotoRankingInvoked;
+            public bool ResultsCreated { get; private set; }
 
             public FakeRankingPushPlayer()
                 : base(true, true)
             {
             }
 
-            protected override void GotoRanking(ScoreInfo score)
+            protected override ResultsScreen CreateResults(ScoreInfo score)
             {
-                GotoRankingInvoked = true;
+                var results = base.CreateResults(score);
+                ResultsCreated = true;
+                return results;
             }
         }
     }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 3fb680b9c9..cc5f32d300 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -536,7 +536,7 @@ namespace osu.Game.Screens.Play
                     {
                         // screen may be in the exiting transition phase.
                         if (this.IsCurrentScreen())
-                            GotoRanking(t.Result);
+                            this.Push(CreateResults(t.Result));
                     });
                 }
             }));
@@ -738,6 +738,10 @@ namespace osu.Game.Screens.Play
             return base.OnExiting(next);
         }
 
+        /// <summary>
+        /// Creates the player's <see cref="Score"/>.
+        /// </summary>
+        /// <returns>The <see cref="Score"/>.</returns>
         protected virtual Score CreateScore()
         {
             var score = new Score
@@ -767,6 +771,11 @@ namespace osu.Game.Screens.Play
             return score;
         }
 
+        /// <summary>
+        /// Submits the player's <see cref="Score"/>.
+        /// </summary>
+        /// <param name="score">The <see cref="Score"/> to submit.</param>
+        /// <returns>The submitted score.</returns>
         protected virtual async Task<ScoreInfo> SubmitScore(Score score)
         {
             // Replays are already populated and present in the game's database, so should not be re-imported.
@@ -784,10 +793,13 @@ namespace osu.Game.Screens.Play
             return await scoreManager.Import(score.ScoreInfo, replayReader);
         }
 
+        /// <summary>
+        /// Creates the <see cref="ResultsScreen"/> for a <see cref="ScoreInfo"/>.
+        /// </summary>
+        /// <param name="score">The <see cref="ScoreInfo"/> to be displayed in the results screen.</param>
+        /// <returns>The <see cref="ResultsScreen"/>.</returns>
         protected virtual ResultsScreen CreateResults(ScoreInfo score) => new SoloResultsScreen(score, true);
 
-        protected virtual void GotoRanking(ScoreInfo score) => this.Push(CreateResults(score));
-
         private void fadeOut(bool instant = false)
         {
             float fadeOutDuration = instant ? 0 : 250;

From 1369b75a86b93cac21c22c0d4a9305b9864f9258 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 18 Dec 2020 17:48:42 +0900
Subject: [PATCH 0338/3722] Fix potential multiple submission

---
 osu.Game/Screens/Play/Player.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index cc5f32d300..94c595908e 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -502,6 +502,7 @@ namespace osu.Game.Screens.Play
         }
 
         private ScheduledDelegate completionProgressDelegate;
+        private Task<ScoreInfo> scoreSubmissionTask;
 
         private void updateCompletionState(ValueChangedEvent<bool> completionState)
         {
@@ -528,7 +529,8 @@ namespace osu.Game.Screens.Play
 
             if (!showResults) return;
 
-            SubmitScore(CreateScore()).ContinueWith(t => Schedule(() =>
+            scoreSubmissionTask ??= SubmitScore(CreateScore());
+            scoreSubmissionTask.ContinueWith(t => Schedule(() =>
             {
                 using (BeginDelayedSequence(RESULTS_DISPLAY_DELAY))
                 {

From 8826d0155908750dfcc99df83bed41e548bb3391 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 18 Dec 2020 18:20:36 +0900
Subject: [PATCH 0339/3722] Create completion progress delegate immediately

---
 osu.Game/Screens/Play/Player.cs | 37 ++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 94c595908e..b79b8eeae8 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -529,21 +529,38 @@ namespace osu.Game.Screens.Play
 
             if (!showResults) return;
 
-            scoreSubmissionTask ??= SubmitScore(CreateScore());
-            scoreSubmissionTask.ContinueWith(t => Schedule(() =>
+            scoreSubmissionTask ??= Task.Run(async () =>
             {
-                using (BeginDelayedSequence(RESULTS_DISPLAY_DELAY))
+                var score = CreateScore();
+
+                try
                 {
-                    completionProgressDelegate = Schedule(() =>
-                    {
-                        // screen may be in the exiting transition phase.
-                        if (this.IsCurrentScreen())
-                            this.Push(CreateResults(t.Result));
-                    });
+                    return await SubmitScore(score);
                 }
-            }));
+                catch (Exception ex)
+                {
+                    Logger.Error(ex, "Score submission failed!");
+                    return score.ScoreInfo;
+                }
+            });
+
+            using (BeginDelayedSequence(RESULTS_DISPLAY_DELAY))
+                scheduleCompletion();
         }
 
+        private void scheduleCompletion() => completionProgressDelegate = Schedule(() =>
+        {
+            if (!scoreSubmissionTask.IsCompleted)
+            {
+                scheduleCompletion();
+                return;
+            }
+
+            // screen may be in the exiting transition phase.
+            if (this.IsCurrentScreen())
+                this.Push(CreateResults(scoreSubmissionTask.Result));
+        });
+
         protected override bool OnScroll(ScrollEvent e) => mouseWheelDisabled.Value && !GameplayClockContainer.IsPaused.Value;
 
         #region Fail Logic

From eccfc8ccd2b420c99cc2b30f868ad74e1214881a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 18 Dec 2020 18:31:49 +0900
Subject: [PATCH 0340/3722] Fix potential cross-reference access

---
 osu.Game/Screens/Play/Player.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index b79b8eeae8..c8f1980ab1 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -23,8 +23,10 @@ using osu.Game.Graphics.Containers;
 using osu.Game.IO.Archives;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
+using osu.Game.Replays;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
@@ -781,8 +783,7 @@ namespace osu.Game.Screens.Play
             else
             {
                 score.ScoreInfo.User = api.LocalUser.Value;
-                if (recordingScore?.Replay.Frames.Count > 0)
-                    score.Replay = recordingScore.Replay;
+                score.Replay = new Replay { Frames = recordingScore?.Replay.Frames.ToList() ?? new List<ReplayFrame>() };
             }
 
             ScoreProcessor.PopulateScore(score.ScoreInfo);

From c9e75e790830816cd4b90525a71a625319e43bae Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 18 Dec 2020 13:09:05 +0300
Subject: [PATCH 0341/3722] Add user avatar to leaderboard scores

---
 .../Play/HUD/GameplayLeaderboardScore.cs      | 53 +++++++++++++++----
 1 file changed, 43 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 0b58cf76a2..9c444a6f1f 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Users;
+using osu.Game.Users.Drawables;
 using osu.Game.Utils;
 using osuTK;
 using osuTK.Graphics;
@@ -129,7 +130,7 @@ namespace osu.Game.Screens.Play.HUD
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(OsuColour colours)
         {
             InternalChildren = new Drawable[]
             {
@@ -195,19 +196,51 @@ namespace osu.Game.Screens.Play.HUD
                                             },
                                         }
                                     },
-                                    usernameText = new OsuSpriteText
+                                    new FillFlowContainer
                                     {
                                         Padding = new MarginPadding { Left = SHEAR_WIDTH },
-                                        RelativeSizeAxes = Axes.X,
-                                        Width = 0.8f,
                                         Anchor = Anchor.CentreLeft,
                                         Origin = Anchor.CentreLeft,
-                                        Colour = Color4.White,
-                                        Font = OsuFont.Torus.With(size: 14, weight: FontWeight.SemiBold),
-                                        Text = User.Username,
-                                        Truncate = true,
-                                        Shadow = false,
-                                    }
+                                        RelativeSizeAxes = Axes.Both,
+                                        Direction = FillDirection.Horizontal,
+                                        Spacing = new Vector2(4f, 0f),
+                                        Children = new Drawable[]
+                                        {
+                                            new CircularContainer
+                                            {
+                                                Masking = true,
+                                                Anchor = Anchor.CentreLeft,
+                                                Origin = Anchor.CentreLeft,
+                                                Size = new Vector2(25f),
+                                                Children = new Drawable[]
+                                                {
+                                                    new Box
+                                                    {
+                                                        Name = "Placeholder while avatar loads",
+                                                        Alpha = 0.3f,
+                                                        RelativeSizeAxes = Axes.Both,
+                                                        Colour = colours.Gray4,
+                                                    },
+                                                    new UpdateableAvatar(User)
+                                                    {
+                                                        RelativeSizeAxes = Axes.Both,
+                                                    },
+                                                }
+                                            },
+                                            usernameText = new OsuSpriteText
+                                            {
+                                                RelativeSizeAxes = Axes.X,
+                                                Width = 0.8f,
+                                                Anchor = Anchor.CentreLeft,
+                                                Origin = Anchor.CentreLeft,
+                                                Colour = Color4.White,
+                                                Font = OsuFont.Torus.With(size: 14, weight: FontWeight.SemiBold),
+                                                Text = User.Username,
+                                                Truncate = true,
+                                                Shadow = false,
+                                            }
+                                        }
+                                    },
                                 }
                             },
                             new Container

From 030dce55599422cc4017b5b754eab9a66cee623a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 18 Dec 2020 13:09:50 +0300
Subject: [PATCH 0342/3722] Increase leaderboard score width a bit

---
 osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 9c444a6f1f..af3cb640bb 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -20,9 +20,9 @@ namespace osu.Game.Screens.Play.HUD
 {
     public class GameplayLeaderboardScore : CompositeDrawable, ILeaderboardScore
     {
-        public const float EXTENDED_WIDTH = 235f;
+        public const float EXTENDED_WIDTH = 255f;
 
-        private const float regular_width = 215f;
+        private const float regular_width = 235f;
 
         public const float PANEL_HEIGHT = 35f;
 

From 228acf25a7d1b483841f4c6b1bbc4ab46c15aad6 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 18 Dec 2020 13:13:31 +0300
Subject: [PATCH 0343/3722] Add test case creating leaderboard scores with
 existing users

---
 .../Gameplay/TestSceneGameplayLeaderboard.cs  | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
index ff15e1d2dc..ca61672ef9 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 playerScore.Value = 1222333;
             });
 
-            AddStep("add local player", () => createLeaderboardScore(playerScore, "You", true));
+            AddStep("add local player", () => createLeaderboardScore(playerScore, new User { Username = "You", Id = 3 }, true));
             AddSliderStep("set player score", 50, 5000000, 1222333, v => playerScore.Value = v);
         }
 
@@ -49,8 +49,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             var player2Score = new BindableDouble(1234567);
             var player3Score = new BindableDouble(1111111);
 
-            AddStep("add player 2", () => createLeaderboardScore(player2Score, "Player 2"));
-            AddStep("add player 3", () => createLeaderboardScore(player3Score, "Player 3"));
+            AddStep("add player 2", () => createLeaderboardScore(player2Score, new User { Username = "Player 2" }));
+            AddStep("add player 3", () => createLeaderboardScore(player3Score, new User { Username = "Player 3" }));
 
             AddAssert("is player 2 position #1", () => leaderboard.CheckPositionByUsername("Player 2", 1));
             AddAssert("is player position #2", () => leaderboard.CheckPositionByUsername("You", 2));
@@ -71,12 +71,23 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestRandomScores()
         {
             int playerNumber = 1;
-            AddRepeatStep("add player with random score", () => createLeaderboardScore(new BindableDouble(RNG.Next(0, 5_000_000)), $"Player {playerNumber++}"), 10);
+            AddRepeatStep("add player with random score", () => createRandomScore(new User { Username = $"Player {playerNumber++}" }), 10);
         }
 
-        private void createLeaderboardScore(BindableDouble score, string username, bool isTracked = false)
+        [Test]
+        public void TestExistingUsers()
         {
-            var leaderboardScore = leaderboard.AddPlayer(new User { Username = username }, isTracked);
+            AddStep("add peppy", () => createRandomScore(new User { Username = "peppy", Id = 2 }));
+            AddStep("add smoogipoo", () => createRandomScore(new User { Username = "smoogipoo", Id = 1040328 }));
+            AddStep("add flyte", () => createRandomScore(new User { Username = "flyte", Id = 3103765 }));
+            AddStep("add frenzibyte", () => createRandomScore(new User { Username = "frenzibyte", Id = 14210502 }));
+        }
+
+        private void createRandomScore(User user) => createLeaderboardScore(new BindableDouble(RNG.Next(0, 5_000_000)), user);
+
+        private void createLeaderboardScore(BindableDouble score, User user, bool isTracked = false)
+        {
+            var leaderboardScore = leaderboard.AddPlayer(user, isTracked);
             leaderboardScore.TotalScore.BindTo(score);
         }
 

From 122250f454059d9adc231e982bd976e3795e1beb Mon Sep 17 00:00:00 2001
From: Graham Johnson <johnson.graham.ib@gmail.com>
Date: Fri, 18 Dec 2020 10:45:23 -0500
Subject: [PATCH 0344/3722] replace drag cirle function with dictionary

---
 .../Edit/Compose/Components/SelectionBox.cs   | 61 ++++++-------------
 1 file changed, 17 insertions(+), 44 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index 8ccd4f71e9..85e86499be 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.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.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -235,13 +236,27 @@ namespace osu.Game.Screens.Edit.Compose.Components
         private void addDragHandle(Anchor anchor) => AddInternal(new SelectionBoxDragHandle
         {
             Anchor = anchor,
-            X = getAdjustmentToCenterCircleOnBorder(anchor).X,
-            Y = getAdjustmentToCenterCircleOnBorder(anchor).Y,
+            X = dragCircleAdjustments[anchor].X,
+            Y = dragCircleAdjustments[anchor].Y,
             HandleDrag = e => OnScale?.Invoke(e.Delta, anchor),
             OperationStarted = operationStarted,
             OperationEnded = operationEnded
         });
 
+        /// <summary>
+        /// Adjust Drag circle to be centered on the center of the border instead of on the edge.
+        /// </summary>
+        private Dictionary<Anchor, Vector2> dragCircleAdjustments = new Dictionary<Anchor, Vector2>(){
+            {Anchor.TopLeft, new Vector2(BORDER_RADIUS / 2)},
+            {Anchor.CentreLeft, new Vector2(BORDER_RADIUS / 2, 0)},
+            {Anchor.BottomLeft, new Vector2(BORDER_RADIUS / 2, -BORDER_RADIUS / 2)},
+            {Anchor.TopCentre, new Vector2(0, BORDER_RADIUS / 2)},
+            {Anchor.BottomCentre, new Vector2(0, -BORDER_RADIUS / 2)},
+            {Anchor.TopRight, new Vector2(-BORDER_RADIUS / 2, BORDER_RADIUS / 2)},
+            {Anchor.CentreRight, new Vector2(-BORDER_RADIUS / 2, 0)},
+            {Anchor.BottomRight, new Vector2(-BORDER_RADIUS / 2)}
+        };
+
         private int activeOperations;
 
         private float convertDragEventToAngleOfRotation(DragEvent e)
@@ -253,48 +268,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
             return (endAngle - startAngle) * 180 / MathF.PI;
         }
 
-        /// <summary>
-        /// Adjust Drag circle to be centered on the center of the border instead of on the edge.
-        /// </summary>
-        /// <param name="anchor">The part of the rectangle to be adjusted.</param>
-        /// <returns>A 2d vector on how much to adjust the drag circle</returns>
-        private Vector2 getAdjustmentToCenterCircleOnBorder(Anchor anchor)
-        {
-            Vector2 adjustment = Vector2.Zero;
-
-            switch (anchor)
-            {
-                case Anchor.TopLeft:
-                case Anchor.CentreLeft:
-                case Anchor.BottomLeft:
-                    adjustment.X = BORDER_RADIUS / 2;
-                    break;
-
-                case Anchor.TopRight:
-                case Anchor.CentreRight:
-                case Anchor.BottomRight:
-                    adjustment.X = -BORDER_RADIUS / 2;
-                    break;
-            }
-
-            switch (anchor)
-            {
-                case Anchor.TopLeft:
-                case Anchor.TopCentre:
-                case Anchor.TopRight:
-                    adjustment.Y = BORDER_RADIUS / 2;
-                    break;
-
-                case Anchor.BottomLeft:
-                case Anchor.BottomCentre:
-                case Anchor.BottomRight:
-                    adjustment.Y = -BORDER_RADIUS / 2;
-                    break;
-            }
-
-            return adjustment;
-        }
-
         private void operationEnded()
         {
             if (--activeOperations == 0)

From 4494bb1eb5a587157f180f3ae14d078a0604194d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 00:15:41 +0900
Subject: [PATCH 0345/3722] Abstract RoomManager and Multiplayer

---
 .../Multiplayer/TestSceneMultiScreen.cs       |   3 +-
 .../Navigation/TestSceneScreenNavigation.cs   |   5 +-
 osu.Game/Screens/Menu/MainMenu.cs             |   4 +-
 .../Components/ListingPollingComponent.cs     |  68 ++++
 .../Screens/Multi/Components/RoomManager.cs   | 188 ++++++++++
 .../Multi/Components/RoomPollingComponent.cs  |  41 +++
 .../Components/SelectionPollingComponent.cs   |  69 ++++
 osu.Game/Screens/Multi/IRoomManager.cs        |   2 +
 osu.Game/Screens/Multi/Multiplayer.cs         |  60 +---
 osu.Game/Screens/Multi/RoomManager.cs         | 337 ------------------
 .../Multi/Timeshift/TimeshiftMultiplayer.cs   |  48 +++
 .../Multi/Timeshift/TimeshiftRoomManager.cs   |  20 ++
 12 files changed, 460 insertions(+), 385 deletions(-)
 create mode 100644 osu.Game/Screens/Multi/Components/ListingPollingComponent.cs
 create mode 100644 osu.Game/Screens/Multi/Components/RoomManager.cs
 create mode 100644 osu.Game/Screens/Multi/Components/RoomPollingComponent.cs
 create mode 100644 osu.Game/Screens/Multi/Components/SelectionPollingComponent.cs
 delete mode 100644 osu.Game/Screens/Multi/RoomManager.cs
 create mode 100644 osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
 create mode 100644 osu.Game/Screens/Multi/Timeshift/TimeshiftRoomManager.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs
index 3924b0333f..0390b995e1 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs
@@ -4,6 +4,7 @@
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Game.Overlays;
+using osu.Game.Screens.Multi.Timeshift;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
@@ -17,7 +18,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         public TestSceneMultiScreen()
         {
-            Screens.Multi.Multiplayer multi = new Screens.Multi.Multiplayer();
+            var multi = new TimeshiftMultiplayer();
 
             AddStep("show", () => LoadScreen(multi));
             AddUntilStep("wait for loaded", () => multi.IsLoaded);
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index d87854a7ea..43f97d8ace 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -11,6 +11,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
 using osu.Game.Overlays.Toolbar;
+using osu.Game.Screens.Multi.Timeshift;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Options;
@@ -107,14 +108,14 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestExitMultiWithEscape()
         {
-            PushAndConfirm(() => new Screens.Multi.Multiplayer());
+            PushAndConfirm(() => new TimeshiftMultiplayer());
             exitViaEscapeAndConfirm();
         }
 
         [Test]
         public void TestExitMultiWithBackButton()
         {
-            PushAndConfirm(() => new Screens.Multi.Multiplayer());
+            PushAndConfirm(() => new TimeshiftMultiplayer());
             exitViaBackButtonAndConfirm();
         }
 
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index c3ecd75963..b781c347f0 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -17,7 +17,7 @@ using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Edit;
-using osu.Game.Screens.Multi;
+using osu.Game.Screens.Multi.Timeshift;
 using osu.Game.Screens.Select;
 
 namespace osu.Game.Screens.Menu
@@ -104,7 +104,7 @@ namespace osu.Game.Screens.Menu
                                 this.Push(new Editor());
                             },
                             OnSolo = onSolo,
-                            OnMulti = delegate { this.Push(new Multiplayer()); },
+                            OnMulti = delegate { this.Push(new TimeshiftMultiplayer()); },
                             OnExit = confirmAndExit,
                         }
                     }
diff --git a/osu.Game/Screens/Multi/Components/ListingPollingComponent.cs b/osu.Game/Screens/Multi/Components/ListingPollingComponent.cs
new file mode 100644
index 0000000000..e22f09779e
--- /dev/null
+++ b/osu.Game/Screens/Multi/Components/ListingPollingComponent.cs
@@ -0,0 +1,68 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Threading.Tasks;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Screens.Multi.Lounge.Components;
+
+namespace osu.Game.Screens.Multi.Components
+{
+    /// <summary>
+    /// A <see cref="RoomPollingComponent"/> that polls for the lounge listing.
+    /// </summary>
+    public class ListingPollingComponent : RoomPollingComponent
+    {
+        [Resolved]
+        private Bindable<FilterCriteria> currentFilter { get; set; }
+
+        [Resolved]
+        private Bindable<Room> selectedRoom { get; set; }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            currentFilter.BindValueChanged(_ =>
+            {
+                if (IsLoaded)
+                    PollImmediately();
+            });
+        }
+
+        private GetRoomsRequest pollReq;
+
+        protected override Task Poll()
+        {
+            if (!API.IsLoggedIn)
+                return base.Poll();
+
+            var tcs = new TaskCompletionSource<bool>();
+
+            pollReq?.Cancel();
+            pollReq = new GetRoomsRequest(currentFilter.Value.Status, currentFilter.Value.Category);
+
+            pollReq.Success += result =>
+            {
+                for (int i = 0; i < result.Count; i++)
+                {
+                    if (result[i].RoomID.Value == selectedRoom.Value?.RoomID.Value)
+                    {
+                        // The listing request always has less information than the opened room, so don't include it.
+                        result[i] = selectedRoom.Value;
+                        break;
+                    }
+                }
+
+                NotifyRoomsReceived(result);
+                tcs.SetResult(true);
+            };
+
+            pollReq.Failure += _ => tcs.SetResult(false);
+
+            API.Queue(pollReq);
+
+            return tcs.Task;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/Components/RoomManager.cs b/osu.Game/Screens/Multi/Components/RoomManager.cs
new file mode 100644
index 0000000000..46941dc58e
--- /dev/null
+++ b/osu.Game/Screens/Multi/Components/RoomManager.cs
@@ -0,0 +1,188 @@
+// Copyright (c) ppy 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.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Logging;
+using osu.Game.Beatmaps;
+using osu.Game.Online.API;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Rulesets;
+
+namespace osu.Game.Screens.Multi.Components
+{
+    public abstract class RoomManager : CompositeDrawable, IRoomManager
+    {
+        public event Action RoomsUpdated;
+
+        private readonly BindableList<Room> rooms = new BindableList<Room>();
+
+        public Bindable<bool> InitialRoomsReceived { get; } = new Bindable<bool>();
+
+        public IBindableList<Room> Rooms => rooms;
+
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
+
+        [Resolved]
+        private BeatmapManager beatmaps { get; set; }
+
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        private Room joinedRoom;
+
+        protected RoomManager()
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            InternalChildren = CreatePollingComponents().Select(p =>
+            {
+                p.InitialRoomsReceived.BindTo(InitialRoomsReceived);
+                p.RoomsReceived = onRoomsReceived;
+                return p;
+            }).ToList();
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            PartRoom();
+        }
+
+        public virtual void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
+        {
+            room.Host.Value = api.LocalUser.Value;
+
+            var req = new CreateRoomRequest(room);
+
+            req.Success += result =>
+            {
+                joinedRoom = room;
+
+                update(room, result);
+                addRoom(room);
+
+                RoomsUpdated?.Invoke();
+                onSuccess?.Invoke(room);
+            };
+
+            req.Failure += exception =>
+            {
+                if (req.Result != null)
+                    onError?.Invoke(req.Result.Error);
+                else
+                    Logger.Log($"Failed to create the room: {exception}", level: LogLevel.Important);
+            };
+
+            api.Queue(req);
+        }
+
+        private JoinRoomRequest currentJoinRoomRequest;
+
+        public virtual void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
+        {
+            currentJoinRoomRequest?.Cancel();
+            currentJoinRoomRequest = new JoinRoomRequest(room);
+
+            currentJoinRoomRequest.Success += () =>
+            {
+                joinedRoom = room;
+                onSuccess?.Invoke(room);
+            };
+
+            currentJoinRoomRequest.Failure += exception =>
+            {
+                if (!(exception is OperationCanceledException))
+                    Logger.Log($"Failed to join room: {exception}", level: LogLevel.Important);
+                onError?.Invoke(exception.ToString());
+            };
+
+            api.Queue(currentJoinRoomRequest);
+        }
+
+        public void PartRoom()
+        {
+            currentJoinRoomRequest?.Cancel();
+
+            if (joinedRoom == null)
+                return;
+
+            api.Queue(new PartRoomRequest(joinedRoom));
+            joinedRoom = null;
+        }
+
+        private readonly HashSet<int> ignoredRooms = new HashSet<int>();
+
+        private void onRoomsReceived(List<Room> received)
+        {
+            // Remove past matches
+            foreach (var r in rooms.ToList())
+            {
+                if (received.All(e => e.RoomID.Value != r.RoomID.Value))
+                    rooms.Remove(r);
+            }
+
+            for (int i = 0; i < received.Count; i++)
+            {
+                var room = received[i];
+
+                Debug.Assert(room.RoomID.Value != null);
+
+                if (ignoredRooms.Contains(room.RoomID.Value.Value))
+                    continue;
+
+                room.Position.Value = i;
+
+                try
+                {
+                    update(room, room);
+                    addRoom(room);
+                }
+                catch (Exception ex)
+                {
+                    Logger.Error(ex, $"Failed to update room: {room.Name.Value}.");
+
+                    ignoredRooms.Add(room.RoomID.Value.Value);
+                    rooms.Remove(room);
+                }
+            }
+
+            RoomsUpdated?.Invoke();
+        }
+
+        /// <summary>
+        /// Updates a local <see cref="Room"/> with a remote copy.
+        /// </summary>
+        /// <param name="local">The local <see cref="Room"/> to update.</param>
+        /// <param name="remote">The remote <see cref="Room"/> to update with.</param>
+        private void update(Room local, Room remote)
+        {
+            foreach (var pi in remote.Playlist)
+                pi.MapObjects(beatmaps, rulesets);
+
+            local.CopyFrom(remote);
+        }
+
+        /// <summary>
+        /// Adds a <see cref="Room"/> to the list of available rooms.
+        /// </summary>
+        /// <param name="room">The <see cref="Room"/> to add.</param>
+        private void addRoom(Room room)
+        {
+            var existing = rooms.FirstOrDefault(e => e.RoomID.Value == room.RoomID.Value);
+            if (existing == null)
+                rooms.Add(room);
+            else
+                existing.CopyFrom(room);
+        }
+
+        protected abstract RoomPollingComponent[] CreatePollingComponents();
+    }
+}
diff --git a/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs b/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs
new file mode 100644
index 0000000000..5430d54644
--- /dev/null
+++ b/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs
@@ -0,0 +1,41 @@
+// Copyright (c) ppy 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.Allocation;
+using osu.Framework.Bindables;
+using osu.Game.Online;
+using osu.Game.Online.API;
+using osu.Game.Online.Multiplayer;
+
+namespace osu.Game.Screens.Multi.Components
+{
+    public abstract class RoomPollingComponent : PollingComponent
+    {
+        public Action<List<Room>> RoomsReceived;
+
+        /// <summary>
+        /// The time in milliseconds to wait between polls.
+        /// Setting to zero stops all polling.
+        /// </summary>
+        public new readonly Bindable<double> TimeBetweenPolls = new Bindable<double>();
+
+        public IBindable<bool> InitialRoomsReceived => initialRoomsReceived;
+        private readonly Bindable<bool> initialRoomsReceived = new Bindable<bool>();
+
+        [Resolved]
+        protected IAPIProvider API { get; private set; }
+
+        protected RoomPollingComponent()
+        {
+            TimeBetweenPolls.BindValueChanged(time => base.TimeBetweenPolls = time.NewValue);
+        }
+
+        protected void NotifyRoomsReceived(List<Room> rooms)
+        {
+            initialRoomsReceived.Value = true;
+            RoomsReceived?.Invoke(rooms);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/Components/SelectionPollingComponent.cs b/osu.Game/Screens/Multi/Components/SelectionPollingComponent.cs
new file mode 100644
index 0000000000..544d5b2388
--- /dev/null
+++ b/osu.Game/Screens/Multi/Components/SelectionPollingComponent.cs
@@ -0,0 +1,69 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Game.Online.Multiplayer;
+
+namespace osu.Game.Screens.Multi.Components
+{
+    /// <summary>
+    /// A <see cref="RoomPollingComponent"/> that polls for the currently-selected room.
+    /// </summary>
+    public class SelectionPollingComponent : RoomPollingComponent
+    {
+        [Resolved]
+        private Bindable<Room> selectedRoom { get; set; }
+
+        [Resolved]
+        private IRoomManager roomManager { get; set; }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            selectedRoom.BindValueChanged(_ =>
+            {
+                if (IsLoaded)
+                    PollImmediately();
+            });
+        }
+
+        private GetRoomRequest pollReq;
+
+        protected override Task Poll()
+        {
+            if (!API.IsLoggedIn)
+                return base.Poll();
+
+            if (selectedRoom.Value?.RoomID.Value == null)
+                return base.Poll();
+
+            var tcs = new TaskCompletionSource<bool>();
+
+            pollReq?.Cancel();
+            pollReq = new GetRoomRequest(selectedRoom.Value.RoomID.Value.Value);
+
+            pollReq.Success += result =>
+            {
+                var rooms = new List<Room>(roomManager.Rooms);
+
+                int index = rooms.FindIndex(r => r.RoomID == result.RoomID);
+                if (index < 0)
+                    return;
+
+                rooms[index] = result;
+
+                NotifyRoomsReceived(rooms);
+                tcs.SetResult(true);
+            };
+
+            pollReq.Failure += _ => tcs.SetResult(false);
+
+            API.Queue(pollReq);
+
+            return tcs.Task;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/IRoomManager.cs b/osu.Game/Screens/Multi/IRoomManager.cs
index bf75843c3e..3d18edcd71 100644
--- a/osu.Game/Screens/Multi/IRoomManager.cs
+++ b/osu.Game/Screens/Multi/IRoomManager.cs
@@ -2,11 +2,13 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Online.Multiplayer;
 
 namespace osu.Game.Screens.Multi
 {
+    [Cached(typeof(IRoomManager))]
     public interface IRoomManager
     {
         /// <summary>
diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index a323faeea1..5f61c5e635 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
@@ -30,7 +29,7 @@ using osuTK;
 namespace osu.Game.Screens.Multi
 {
     [Cached]
-    public class Multiplayer : OsuScreen
+    public abstract class Multiplayer : OsuScreen
     {
         public override bool CursorVisible => (screenStack.CurrentScreen as IMultiplayerSubScreen)?.CursorVisible ?? true;
 
@@ -46,6 +45,9 @@ namespace osu.Game.Screens.Multi
 
         private readonly IBindable<bool> isIdle = new BindableBool();
 
+        [Cached(Type = typeof(IRoomManager))]
+        protected IRoomManager RoomManager { get; private set; }
+
         [Cached]
         private readonly Bindable<Room> selectedRoom = new Bindable<Room>();
 
@@ -55,9 +57,6 @@ namespace osu.Game.Screens.Multi
         [Resolved(CanBeNull = true)]
         private MusicController music { get; set; }
 
-        [Cached(Type = typeof(IRoomManager))]
-        private RoomManager roomManager;
-
         [Resolved]
         private OsuGameBase game { get; set; }
 
@@ -70,7 +69,7 @@ namespace osu.Game.Screens.Multi
         private readonly Drawable header;
         private readonly Drawable headerBackground;
 
-        public Multiplayer()
+        protected Multiplayer()
         {
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
@@ -82,7 +81,7 @@ namespace osu.Game.Screens.Multi
             InternalChild = waves = new MultiplayerWaveContainer
             {
                 RelativeSizeAxes = Axes.Both,
-                Children = new Drawable[]
+                Children = new[]
                 {
                     new Box
                     {
@@ -137,7 +136,7 @@ namespace osu.Game.Screens.Multi
                         Origin = Anchor.TopRight,
                         Action = () => CreateRoom()
                     },
-                    roomManager = new RoomManager()
+                    (Drawable)(RoomManager = CreateRoomManager())
                 }
             };
 
@@ -168,7 +167,7 @@ namespace osu.Game.Screens.Multi
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            isIdle.BindValueChanged(idle => updatePollingRate(idle.NewValue), true);
+            isIdle.BindValueChanged(idle => UpdatePollingRate(idle.NewValue), true);
         }
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
@@ -178,36 +177,7 @@ namespace osu.Game.Screens.Multi
             return dependencies;
         }
 
-        private void updatePollingRate(bool idle)
-        {
-            if (!this.IsCurrentScreen())
-            {
-                roomManager.TimeBetweenListingPolls = 0;
-                roomManager.TimeBetweenSelectionPolls = 0;
-            }
-            else
-            {
-                switch (screenStack.CurrentScreen)
-                {
-                    case LoungeSubScreen _:
-                        roomManager.TimeBetweenListingPolls = idle ? 120000 : 15000;
-                        roomManager.TimeBetweenSelectionPolls = idle ? 120000 : 15000;
-                        break;
-
-                    case MatchSubScreen _:
-                        roomManager.TimeBetweenListingPolls = 0;
-                        roomManager.TimeBetweenSelectionPolls = idle ? 30000 : 5000;
-                        break;
-
-                    default:
-                        roomManager.TimeBetweenListingPolls = 0;
-                        roomManager.TimeBetweenSelectionPolls = 0;
-                        break;
-                }
-            }
-
-            Logger.Log($"Polling adjusted (listing: {roomManager.TimeBetweenListingPolls}, selection: {roomManager.TimeBetweenSelectionPolls})");
-        }
+        protected abstract void UpdatePollingRate(bool isIdle);
 
         private void forcefullyExit()
         {
@@ -241,7 +211,7 @@ namespace osu.Game.Screens.Multi
 
             beginHandlingTrack();
 
-            updatePollingRate(isIdle.Value);
+            UpdatePollingRate(isIdle.Value);
         }
 
         public override void OnSuspending(IScreen next)
@@ -251,12 +221,12 @@ namespace osu.Game.Screens.Multi
 
             endHandlingTrack();
 
-            updatePollingRate(isIdle.Value);
+            UpdatePollingRate(isIdle.Value);
         }
 
         public override bool OnExiting(IScreen next)
         {
-            roomManager.PartRoom();
+            RoomManager.PartRoom();
 
             waves.Hide();
 
@@ -344,12 +314,14 @@ namespace osu.Game.Screens.Multi
             if (newScreen is IOsuScreen newOsuScreen)
                 ((IBindable<UserActivity>)Activity).BindTo(newOsuScreen.Activity);
 
-            updatePollingRate(isIdle.Value);
+            UpdatePollingRate(isIdle.Value);
             createButton.FadeTo(newScreen is LoungeSubScreen ? 1 : 0, 200);
 
             updateTrack();
         }
 
+        protected IScreen CurrentSubScreen => screenStack.CurrentScreen;
+
         private void updateTrack(ValueChangedEvent<WorkingBeatmap> _ = null)
         {
             if (screenStack.CurrentScreen is MatchSubScreen)
@@ -381,6 +353,8 @@ namespace osu.Game.Screens.Multi
             }
         }
 
+        protected abstract IRoomManager CreateRoomManager();
+
         private class MultiplayerWaveContainer : WaveContainer
         {
             protected override bool StartHidden => true;
diff --git a/osu.Game/Screens/Multi/RoomManager.cs b/osu.Game/Screens/Multi/RoomManager.cs
deleted file mode 100644
index fb0cf73bb9..0000000000
--- a/osu.Game/Screens/Multi/RoomManager.cs
+++ /dev/null
@@ -1,337 +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.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
-using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Logging;
-using osu.Game.Beatmaps;
-using osu.Game.Online;
-using osu.Game.Online.API;
-using osu.Game.Online.Multiplayer;
-using osu.Game.Rulesets;
-using osu.Game.Screens.Multi.Lounge.Components;
-
-namespace osu.Game.Screens.Multi
-{
-    public class RoomManager : CompositeDrawable, IRoomManager
-    {
-        public event Action RoomsUpdated;
-
-        private readonly BindableList<Room> rooms = new BindableList<Room>();
-
-        public Bindable<bool> InitialRoomsReceived { get; } = new Bindable<bool>();
-
-        public IBindableList<Room> Rooms => rooms;
-
-        public double TimeBetweenListingPolls
-        {
-            get => listingPollingComponent.TimeBetweenPolls;
-            set => listingPollingComponent.TimeBetweenPolls = value;
-        }
-
-        public double TimeBetweenSelectionPolls
-        {
-            get => selectionPollingComponent.TimeBetweenPolls;
-            set => selectionPollingComponent.TimeBetweenPolls = value;
-        }
-
-        [Resolved]
-        private RulesetStore rulesets { get; set; }
-
-        [Resolved]
-        private BeatmapManager beatmaps { get; set; }
-
-        [Resolved]
-        private IAPIProvider api { get; set; }
-
-        [Resolved]
-        private Bindable<Room> selectedRoom { get; set; }
-
-        private readonly ListingPollingComponent listingPollingComponent;
-        private readonly SelectionPollingComponent selectionPollingComponent;
-
-        private Room joinedRoom;
-
-        public RoomManager()
-        {
-            RelativeSizeAxes = Axes.Both;
-
-            InternalChildren = new Drawable[]
-            {
-                listingPollingComponent = new ListingPollingComponent
-                {
-                    InitialRoomsReceived = { BindTarget = InitialRoomsReceived },
-                    RoomsReceived = onListingReceived
-                },
-                selectionPollingComponent = new SelectionPollingComponent { RoomReceived = onSelectedRoomReceived }
-            };
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-            PartRoom();
-        }
-
-        public void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
-        {
-            room.Host.Value = api.LocalUser.Value;
-
-            var req = new CreateRoomRequest(room);
-
-            req.Success += result =>
-            {
-                joinedRoom = room;
-
-                update(room, result);
-                addRoom(room);
-
-                RoomsUpdated?.Invoke();
-                onSuccess?.Invoke(room);
-            };
-
-            req.Failure += exception =>
-            {
-                if (req.Result != null)
-                    onError?.Invoke(req.Result.Error);
-                else
-                    Logger.Log($"Failed to create the room: {exception}", level: LogLevel.Important);
-            };
-
-            api.Queue(req);
-        }
-
-        private JoinRoomRequest currentJoinRoomRequest;
-
-        public void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
-        {
-            currentJoinRoomRequest?.Cancel();
-            currentJoinRoomRequest = new JoinRoomRequest(room);
-
-            currentJoinRoomRequest.Success += () =>
-            {
-                joinedRoom = room;
-                onSuccess?.Invoke(room);
-            };
-
-            currentJoinRoomRequest.Failure += exception =>
-            {
-                if (!(exception is OperationCanceledException))
-                    Logger.Log($"Failed to join room: {exception}", level: LogLevel.Important);
-                onError?.Invoke(exception.ToString());
-            };
-
-            api.Queue(currentJoinRoomRequest);
-        }
-
-        public void PartRoom()
-        {
-            currentJoinRoomRequest?.Cancel();
-
-            if (joinedRoom == null)
-                return;
-
-            api.Queue(new PartRoomRequest(joinedRoom));
-            joinedRoom = null;
-        }
-
-        private readonly HashSet<int> ignoredRooms = new HashSet<int>();
-
-        /// <summary>
-        /// Invoked when the listing of all <see cref="Room"/>s is received from the server.
-        /// </summary>
-        /// <param name="listing">The listing.</param>
-        private void onListingReceived(List<Room> listing)
-        {
-            // Remove past matches
-            foreach (var r in rooms.ToList())
-            {
-                if (listing.All(e => e.RoomID.Value != r.RoomID.Value))
-                    rooms.Remove(r);
-            }
-
-            for (int i = 0; i < listing.Count; i++)
-            {
-                if (selectedRoom.Value?.RoomID?.Value == listing[i].RoomID.Value)
-                {
-                    // The listing request contains less data than the selection request, so data from the selection request is always preferred while the room is selected.
-                    continue;
-                }
-
-                var room = listing[i];
-
-                Debug.Assert(room.RoomID.Value != null);
-
-                if (ignoredRooms.Contains(room.RoomID.Value.Value))
-                    continue;
-
-                room.Position.Value = i;
-
-                try
-                {
-                    update(room, room);
-                    addRoom(room);
-                }
-                catch (Exception ex)
-                {
-                    Logger.Error(ex, $"Failed to update room: {room.Name.Value}.");
-
-                    ignoredRooms.Add(room.RoomID.Value.Value);
-                    rooms.Remove(room);
-                }
-            }
-
-            RoomsUpdated?.Invoke();
-        }
-
-        /// <summary>
-        /// Invoked when a <see cref="Room"/> is received from the server.
-        /// </summary>
-        /// <param name="toUpdate">The received <see cref="Room"/>.</param>
-        private void onSelectedRoomReceived(Room toUpdate)
-        {
-            foreach (var room in rooms)
-            {
-                if (room.RoomID.Value == toUpdate.RoomID.Value)
-                {
-                    toUpdate.Position.Value = room.Position.Value;
-                    update(room, toUpdate);
-                    break;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Updates a local <see cref="Room"/> with a remote copy.
-        /// </summary>
-        /// <param name="local">The local <see cref="Room"/> to update.</param>
-        /// <param name="remote">The remote <see cref="Room"/> to update with.</param>
-        private void update(Room local, Room remote)
-        {
-            foreach (var pi in remote.Playlist)
-                pi.MapObjects(beatmaps, rulesets);
-
-            local.CopyFrom(remote);
-        }
-
-        /// <summary>
-        /// Adds a <see cref="Room"/> to the list of available rooms.
-        /// </summary>
-        /// <param name="room">The <see cref="Room"/> to add.</param>
-        private void addRoom(Room room)
-        {
-            var existing = rooms.FirstOrDefault(e => e.RoomID.Value == room.RoomID.Value);
-            if (existing == null)
-                rooms.Add(room);
-            else
-                existing.CopyFrom(room);
-        }
-
-        private class SelectionPollingComponent : PollingComponent
-        {
-            public Action<Room> RoomReceived;
-
-            [Resolved]
-            private IAPIProvider api { get; set; }
-
-            [Resolved]
-            private Bindable<Room> selectedRoom { get; set; }
-
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                selectedRoom.BindValueChanged(_ =>
-                {
-                    if (IsLoaded)
-                        PollImmediately();
-                });
-            }
-
-            private GetRoomRequest pollReq;
-
-            protected override Task Poll()
-            {
-                if (!api.IsLoggedIn)
-                    return base.Poll();
-
-                if (selectedRoom.Value?.RoomID.Value == null)
-                    return base.Poll();
-
-                var tcs = new TaskCompletionSource<bool>();
-
-                pollReq?.Cancel();
-                pollReq = new GetRoomRequest(selectedRoom.Value.RoomID.Value.Value);
-
-                pollReq.Success += result =>
-                {
-                    RoomReceived?.Invoke(result);
-                    tcs.SetResult(true);
-                };
-
-                pollReq.Failure += _ => tcs.SetResult(false);
-
-                api.Queue(pollReq);
-
-                return tcs.Task;
-            }
-        }
-
-        private class ListingPollingComponent : PollingComponent
-        {
-            public Action<List<Room>> RoomsReceived;
-
-            public readonly Bindable<bool> InitialRoomsReceived = new Bindable<bool>();
-
-            [Resolved]
-            private IAPIProvider api { get; set; }
-
-            [Resolved]
-            private Bindable<FilterCriteria> currentFilter { get; set; }
-
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                currentFilter.BindValueChanged(_ =>
-                {
-                    InitialRoomsReceived.Value = false;
-
-                    if (IsLoaded)
-                        PollImmediately();
-                });
-            }
-
-            private GetRoomsRequest pollReq;
-
-            protected override Task Poll()
-            {
-                if (!api.IsLoggedIn)
-                    return base.Poll();
-
-                var tcs = new TaskCompletionSource<bool>();
-
-                pollReq?.Cancel();
-                pollReq = new GetRoomsRequest(currentFilter.Value.Status, currentFilter.Value.Category);
-
-                pollReq.Success += result =>
-                {
-                    InitialRoomsReceived.Value = true;
-                    RoomsReceived?.Invoke(result);
-                    tcs.SetResult(true);
-                };
-
-                pollReq.Failure += _ => tcs.SetResult(false);
-
-                api.Queue(pollReq);
-
-                return tcs.Task;
-            }
-        }
-    }
-}
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
new file mode 100644
index 0000000000..1ff9c670a8
--- /dev/null
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.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 osu.Framework.Logging;
+using osu.Framework.Screens;
+using osu.Game.Screens.Multi.Lounge;
+using osu.Game.Screens.Multi.Match;
+
+namespace osu.Game.Screens.Multi.Timeshift
+{
+    public class TimeshiftMultiplayer : Multiplayer
+    {
+        protected override void UpdatePollingRate(bool isIdle)
+        {
+            var timeshiftManager = (TimeshiftRoomManager)RoomManager;
+
+            if (!this.IsCurrentScreen())
+            {
+                timeshiftManager.TimeBetweenListingPolls.Value = 0;
+                timeshiftManager.TimeBetweenSelectionPolls.Value = 0;
+            }
+            else
+            {
+                switch (CurrentSubScreen)
+                {
+                    case LoungeSubScreen _:
+                        timeshiftManager.TimeBetweenListingPolls.Value = isIdle ? 120000 : 15000;
+                        timeshiftManager.TimeBetweenSelectionPolls.Value = isIdle ? 120000 : 15000;
+                        break;
+
+                    case MatchSubScreen _:
+                        timeshiftManager.TimeBetweenListingPolls.Value = 0;
+                        timeshiftManager.TimeBetweenSelectionPolls.Value = isIdle ? 30000 : 5000;
+                        break;
+
+                    default:
+                        timeshiftManager.TimeBetweenListingPolls.Value = 0;
+                        timeshiftManager.TimeBetweenSelectionPolls.Value = 0;
+                        break;
+                }
+            }
+
+            Logger.Log($"Polling adjusted (listing: {timeshiftManager.TimeBetweenListingPolls.Value}, selection: {timeshiftManager.TimeBetweenSelectionPolls.Value})");
+        }
+
+        protected override IRoomManager CreateRoomManager() => new TimeshiftRoomManager();
+    }
+}
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomManager.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomManager.cs
new file mode 100644
index 0000000000..ba96721afc
--- /dev/null
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomManager.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.Bindables;
+using osu.Game.Screens.Multi.Components;
+
+namespace osu.Game.Screens.Multi.Timeshift
+{
+    public class TimeshiftRoomManager : RoomManager
+    {
+        public readonly Bindable<double> TimeBetweenListingPolls = new Bindable<double>();
+        public readonly Bindable<double> TimeBetweenSelectionPolls = new Bindable<double>();
+
+        protected override RoomPollingComponent[] CreatePollingComponents() => new RoomPollingComponent[]
+        {
+            new ListingPollingComponent { TimeBetweenPolls = { BindTarget = TimeBetweenListingPolls } },
+            new SelectionPollingComponent { TimeBetweenPolls = { BindTarget = TimeBetweenSelectionPolls } }
+        };
+    }
+}

From f4e9703deb20a7abdd303781a17c63e736951136 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 00:52:32 +0900
Subject: [PATCH 0346/3722] Fix incorrect comparison

---
 osu.Game/Screens/Multi/Components/SelectionPollingComponent.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/Components/SelectionPollingComponent.cs b/osu.Game/Screens/Multi/Components/SelectionPollingComponent.cs
index 544d5b2388..37a190b5e0 100644
--- a/osu.Game/Screens/Multi/Components/SelectionPollingComponent.cs
+++ b/osu.Game/Screens/Multi/Components/SelectionPollingComponent.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Screens.Multi.Components
             {
                 var rooms = new List<Room>(roomManager.Rooms);
 
-                int index = rooms.FindIndex(r => r.RoomID == result.RoomID);
+                int index = rooms.FindIndex(r => r.RoomID.Value == result.RoomID.Value);
                 if (index < 0)
                     return;
 

From ab9158c306c5b19c6f314967216ab4fe4915fd23 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 18 Dec 2020 20:50:54 +0900
Subject: [PATCH 0347/3722] Add a stateful multiplayer client

---
 .../StatefulMultiplayerClient.cs              | 389 ++++++++++++++++++
 1 file changed, 389 insertions(+)
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs

diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
new file mode 100644
index 0000000000..3e2f435524
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
@@ -0,0 +1,389 @@
+// Copyright (c) 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
+
+using System;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
+using osu.Game.Database;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Multiplayer.RoomStatuses;
+using osu.Game.Rulesets;
+using osu.Game.Users;
+using osu.Game.Utils;
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    public abstract class StatefulMultiplayerClient : Component, IMultiplayerClient, IMultiplayerRoomServer
+    {
+        /// <summary>
+        /// Invoked when any change occurs to the multiplayer room.
+        /// </summary>
+        public event Action? RoomChanged;
+
+        /// <summary>
+        /// Invoked when the multiplayer server requests the current beatmap to be loaded into play.
+        /// </summary>
+        public event Action? LoadRequested;
+
+        /// <summary>
+        /// Invoked when the multiplayer server requests gameplay to be started.
+        /// </summary>
+        public event Action? MatchStarted;
+
+        /// <summary>
+        /// Invoked when the multiplayer server has finished collating results.
+        /// </summary>
+        public event Action? ResultsReady;
+
+        /// <summary>
+        /// Whether the <see cref="StatefulMultiplayerClient"/> is currently connected.
+        /// </summary>
+        public abstract IBindable<bool> IsConnected { get; }
+
+        /// <summary>
+        /// The joined <see cref="MultiplayerRoom"/>.
+        /// </summary>
+        public MultiplayerRoom? Room { get; private set; }
+
+        /// <summary>
+        /// The users currently in gameplay.
+        /// </summary>
+        public readonly BindableList<int> PlayingUsers = new BindableList<int>();
+
+        [Resolved]
+        private UserLookupCache userLookupCache { get; set; } = null!;
+
+        [Resolved]
+        private IAPIProvider api { get; set; } = null!;
+
+        [Resolved]
+        private RulesetStore rulesets { get; set; } = null!;
+
+        private Room? apiRoom;
+        private int playlistItemId; // Todo: THIS IS SUPER TEMPORARY!!
+
+        /// <summary>
+        /// Joins the <see cref="MultiplayerRoom"/> for a given API <see cref="Room"/>.
+        /// </summary>
+        /// <param name="room">The API <see cref="Room"/>.</param>
+        public async Task JoinRoom(Room room)
+        {
+            Debug.Assert(Room == null);
+            Debug.Assert(room.RoomID.Value != null);
+
+            apiRoom = room;
+            playlistItemId = room.Playlist.SingleOrDefault()?.ID ?? 0;
+
+            Room = await JoinRoom(room.RoomID.Value.Value);
+
+            Debug.Assert(Room != null);
+
+            foreach (var user in Room.Users)
+                await PopulateUser(user);
+
+            updateLocalRoomSettings(Room.Settings);
+        }
+
+        /// <summary>
+        /// Joins the <see cref="MultiplayerRoom"/> with a given ID.
+        /// </summary>
+        /// <param name="roomId">The room ID.</param>
+        /// <returns>The joined <see cref="MultiplayerRoom"/>.</returns>
+        protected abstract Task<MultiplayerRoom> JoinRoom(long roomId);
+
+        public virtual Task LeaveRoom()
+        {
+            if (Room == null)
+                return Task.CompletedTask;
+
+            apiRoom = null;
+            Room = null;
+
+            Schedule(() => RoomChanged?.Invoke());
+
+            return Task.CompletedTask;
+        }
+
+        /// <summary>
+        /// Change the current <see cref="MultiplayerRoom"/> settings.
+        /// </summary>
+        /// <remarks>
+        /// A room must have been joined via <see cref="JoinRoom"/> for this to have any effect.
+        /// </remarks>
+        /// <param name="name">The new room name, if any.</param>
+        /// <param name="item">The new room playlist item, if any.</param>
+        public void ChangeSettings(Optional<string> name = default, Optional<PlaylistItem> item = default)
+        {
+            if (Room == null)
+                return;
+
+            // A dummy playlist item filled with the current room settings (except mods).
+            var existingPlaylistItem = new PlaylistItem
+            {
+                Beatmap =
+                {
+                    Value = new BeatmapInfo
+                    {
+                        OnlineBeatmapID = Room.Settings.BeatmapID,
+                        MD5Hash = Room.Settings.BeatmapChecksum
+                    }
+                },
+                RulesetID = Room.Settings.RulesetID
+            };
+
+            var newSettings = new MultiplayerRoomSettings
+            {
+                Name = name.GetOr(Room.Settings.Name),
+                BeatmapID = item.GetOr(existingPlaylistItem).BeatmapID,
+                BeatmapChecksum = item.GetOr(existingPlaylistItem).Beatmap.Value.MD5Hash,
+                RulesetID = item.GetOr(existingPlaylistItem).RulesetID,
+                Mods = item.HasValue ? item.Value!.RequiredMods.Select(m => new APIMod(m)).ToList() : Room.Settings.Mods
+            };
+
+            // Make sure there would be a meaningful change in settings.
+            if (newSettings.Equals(Room.Settings))
+                return;
+
+            ChangeSettings(newSettings);
+        }
+
+        public abstract Task TransferHost(int userId);
+
+        public abstract Task ChangeSettings(MultiplayerRoomSettings settings);
+
+        public abstract Task ChangeState(MultiplayerUserState newState);
+
+        public abstract Task StartMatch();
+
+        Task IMultiplayerClient.RoomStateChanged(MultiplayerRoomState state)
+        {
+            Schedule(() =>
+            {
+                if (Room == null)
+                    return;
+
+                Debug.Assert(apiRoom != null);
+
+                Room.State = state;
+
+                switch (state)
+                {
+                    case MultiplayerRoomState.Open:
+                        apiRoom.Status.Value = new RoomStatusOpen();
+                        break;
+
+                    case MultiplayerRoomState.Playing:
+                        apiRoom.Status.Value = new RoomStatusPlaying();
+                        break;
+
+                    case MultiplayerRoomState.Closed:
+                        apiRoom.Status.Value = new RoomStatusEnded();
+                        break;
+                }
+
+                RoomChanged?.Invoke();
+            });
+
+            return Task.CompletedTask;
+        }
+
+        async Task IMultiplayerClient.UserJoined(MultiplayerRoomUser user)
+        {
+            await PopulateUser(user);
+
+            Schedule(() =>
+            {
+                if (Room == null)
+                    return;
+
+                Room.Users.Add(user);
+
+                RoomChanged?.Invoke();
+            });
+        }
+
+        Task IMultiplayerClient.UserLeft(MultiplayerRoomUser user)
+        {
+            Schedule(() =>
+            {
+                if (Room == null)
+                    return;
+
+                Room.Users.Remove(user);
+                PlayingUsers.Remove(user.UserID);
+
+                RoomChanged?.Invoke();
+            });
+
+            return Task.CompletedTask;
+        }
+
+        Task IMultiplayerClient.HostChanged(int userId)
+        {
+            Schedule(() =>
+            {
+                if (Room == null)
+                    return;
+
+                Debug.Assert(apiRoom != null);
+
+                var user = Room.Users.FirstOrDefault(u => u.UserID == userId);
+
+                Room.Host = user;
+                apiRoom.Host.Value = user?.User;
+
+                RoomChanged?.Invoke();
+            });
+
+            return Task.CompletedTask;
+        }
+
+        Task IMultiplayerClient.SettingsChanged(MultiplayerRoomSettings newSettings)
+        {
+            updateLocalRoomSettings(newSettings);
+            return Task.CompletedTask;
+        }
+
+        Task IMultiplayerClient.UserStateChanged(int userId, MultiplayerUserState state)
+        {
+            Schedule(() =>
+            {
+                if (Room == null)
+                    return;
+
+                Room.Users.Single(u => u.UserID == userId).State = state;
+
+                if (state != MultiplayerUserState.Playing)
+                    PlayingUsers.Remove(userId);
+
+                RoomChanged?.Invoke();
+            });
+
+            return Task.CompletedTask;
+        }
+
+        Task IMultiplayerClient.LoadRequested()
+        {
+            Schedule(() =>
+            {
+                if (Room == null)
+                    return;
+
+                LoadRequested?.Invoke();
+            });
+
+            return Task.CompletedTask;
+        }
+
+        Task IMultiplayerClient.MatchStarted()
+        {
+            Debug.Assert(Room != null);
+            var players = Room.Users.Where(u => u.State == MultiplayerUserState.Playing).Select(u => u.UserID).ToList();
+
+            Schedule(() =>
+            {
+                if (Room == null)
+                    return;
+
+                PlayingUsers.AddRange(players);
+
+                MatchStarted?.Invoke();
+            });
+
+            return Task.CompletedTask;
+        }
+
+        Task IMultiplayerClient.ResultsReady()
+        {
+            Schedule(() =>
+            {
+                if (Room == null)
+                    return;
+
+                ResultsReady?.Invoke();
+            });
+
+            return Task.CompletedTask;
+        }
+
+        /// <summary>
+        /// Populates the <see cref="User"/> for a given <see cref="MultiplayerRoomUser"/>.
+        /// </summary>
+        /// <param name="multiplayerUser">The <see cref="MultiplayerRoomUser"/> to populate.</param>
+        protected async Task PopulateUser(MultiplayerRoomUser multiplayerUser) => multiplayerUser.User ??= await userLookupCache.GetUserAsync(multiplayerUser.UserID);
+
+        /// <summary>
+        /// Updates the local room settings with the given <see cref="MultiplayerRoomSettings"/>.
+        /// </summary>
+        /// <remarks>
+        /// This updates both the joined <see cref="MultiplayerRoom"/> and the respective API <see cref="Room"/>.
+        /// </remarks>
+        /// <param name="settings">The new <see cref="MultiplayerRoomSettings"/> to update from.</param>
+        private void updateLocalRoomSettings(MultiplayerRoomSettings settings)
+        {
+            if (Room == null)
+                return;
+
+            // Update a few instantaneously properties of the room.
+            Schedule(() =>
+            {
+                if (Room == null)
+                    return;
+
+                Debug.Assert(apiRoom != null);
+
+                Room.Settings = settings;
+                apiRoom.Name.Value = Room.Settings.Name;
+
+                // The playlist update is delayed until an online beatmap lookup (below) succeeds.
+                // In-order for the client to not display an outdated beatmap, the playlist is forcefully cleared here.
+                apiRoom.Playlist.Clear();
+
+                RoomChanged?.Invoke();
+            });
+
+            var req = new GetBeatmapSetRequest(settings.BeatmapID, BeatmapSetLookupType.BeatmapId);
+            req.Success += res =>
+            {
+                var beatmapSet = res.ToBeatmapSet(rulesets);
+
+                var beatmap = beatmapSet.Beatmaps.Single(b => b.OnlineBeatmapID == settings.BeatmapID);
+                beatmap.MD5Hash = settings.BeatmapChecksum;
+
+                var ruleset = rulesets.GetRuleset(settings.RulesetID);
+                var mods = settings.Mods.Select(m => m.ToMod(ruleset.CreateInstance()));
+
+                PlaylistItem playlistItem = new PlaylistItem
+                {
+                    ID = playlistItemId,
+                    Beatmap = { Value = beatmap },
+                    Ruleset = { Value = ruleset },
+                };
+
+                playlistItem.RequiredMods.AddRange(mods);
+
+                Schedule(() =>
+                {
+                    if (Room == null || !Room.Settings.Equals(settings))
+                        return;
+
+                    Debug.Assert(apiRoom != null);
+
+                    apiRoom.Playlist.Clear(); // Clearing should be unnecessary, but here for sanity.
+                    apiRoom.Playlist.Add(playlistItem);
+                });
+            };
+
+            api.Queue(req);
+        }
+    }
+}

From 9ceb090f04d682f583fdc2d06fe1462f12a9c8ec Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 00:17:50 +0900
Subject: [PATCH 0348/3722] Fix ambiguous reference

---
 .../Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
index 3e2f435524..60960f4929 100644
--- a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
@@ -117,7 +117,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// Change the current <see cref="MultiplayerRoom"/> settings.
         /// </summary>
         /// <remarks>
-        /// A room must have been joined via <see cref="JoinRoom"/> for this to have any effect.
+        /// A room must be joined for this to have any effect.
         /// </remarks>
         /// <param name="name">The new room name, if any.</param>
         /// <param name="item">The new room playlist item, if any.</param>

From cf2340cafb8b7ce964935a410f3bd3af49041458 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 00:18:41 +0900
Subject: [PATCH 0349/3722] Add a realtime room manager

---
 .../RealtimeRoomManager.cs                    | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
new file mode 100644
index 0000000000..a86e924c85
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -0,0 +1,45 @@
+// Copyright (c) ppy 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.Threading.Tasks;
+using osu.Framework.Allocation;
+using osu.Framework.Logging;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Screens.Multi.Components;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+{
+    public class RealtimeRoomManager : RoomManager
+    {
+        [Resolved]
+        private StatefulMultiplayerClient multiplayerClient { get; set; }
+
+        public override void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
+            => base.CreateRoom(room, r => joinMultiplayerRoom(r, onSuccess), onError);
+
+        public override void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
+            => base.JoinRoom(room, r => joinMultiplayerRoom(r, onSuccess), onError);
+
+        private void joinMultiplayerRoom(Room room, Action<Room> onSuccess = null)
+        {
+            Debug.Assert(room.RoomID.Value != null);
+
+            var joinTask = multiplayerClient.JoinRoom(room);
+            joinTask.ContinueWith(_ => onSuccess?.Invoke(room));
+            joinTask.ContinueWith(t =>
+            {
+                PartRoom();
+                if (t.Exception != null)
+                    Logger.Error(t.Exception, "Failed to join multiplayer room.");
+            }, TaskContinuationOptions.NotOnRanToCompletion);
+        }
+
+        protected override RoomPollingComponent[] CreatePollingComponents() => new RoomPollingComponent[]
+        {
+            new ListingPollingComponent()
+        };
+    }
+}

From a6520d3d446230cb3c0ef49aa15cdf45ba8b2232 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 01:01:09 +0900
Subject: [PATCH 0350/3722] Clear rooms and poll only when connected to
 multiplayer server

---
 .../Screens/Multi/Components/RoomManager.cs   |  6 ++
 .../RealtimeRoomManager.cs                    | 64 ++++++++++++++++++-
 2 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/Components/RoomManager.cs b/osu.Game/Screens/Multi/Components/RoomManager.cs
index 46941dc58e..d92427680e 100644
--- a/osu.Game/Screens/Multi/Components/RoomManager.cs
+++ b/osu.Game/Screens/Multi/Components/RoomManager.cs
@@ -157,6 +157,12 @@ namespace osu.Game.Screens.Multi.Components
             RoomsUpdated?.Invoke();
         }
 
+        protected void ClearRooms()
+        {
+            rooms.Clear();
+            InitialRoomsReceived.Value = false;
+        }
+
         /// <summary>
         /// Updates a local <see cref="Room"/> with a remote copy.
         /// </summary>
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index a86e924c85..62ea5d5512 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -5,6 +5,7 @@ using System;
 using System.Diagnostics;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Logging;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.RealtimeMultiplayer;
@@ -17,6 +18,22 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         [Resolved]
         private StatefulMultiplayerClient multiplayerClient { get; set; }
 
+        public readonly Bindable<double> TimeBetweenListingPolls = new Bindable<double>();
+        public readonly Bindable<double> TimeBetweenSelectionPolls = new Bindable<double>();
+        private readonly IBindable<bool> isConnected = new Bindable<bool>();
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            isConnected.BindTo(multiplayerClient.IsConnected);
+            isConnected.BindValueChanged(connected => Schedule(() =>
+            {
+                if (!connected.NewValue)
+                    ClearRooms();
+            }));
+        }
+
         public override void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
             => base.CreateRoom(room, r => joinMultiplayerRoom(r, onSuccess), onError);
 
@@ -39,7 +56,52 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
         protected override RoomPollingComponent[] CreatePollingComponents() => new RoomPollingComponent[]
         {
-            new ListingPollingComponent()
+            new RealtimeListingPollingComponent
+            {
+                TimeBetweenPolls = { BindTarget = TimeBetweenListingPolls },
+                AllowPolling = { BindTarget = isConnected }
+            },
+            new RealtimeSelectionPollingComponent
+            {
+                TimeBetweenPolls = { BindTarget = TimeBetweenSelectionPolls },
+                AllowPolling = { BindTarget = isConnected }
+            }
         };
+
+        private class RealtimeListingPollingComponent : ListingPollingComponent
+        {
+            public readonly IBindable<bool> AllowPolling = new Bindable<bool>();
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                AllowPolling.BindValueChanged(_ =>
+                {
+                    if (IsLoaded)
+                        PollImmediately();
+                });
+            }
+
+            protected override Task Poll() => !AllowPolling.Value ? Task.CompletedTask : base.Poll();
+        }
+
+        private class RealtimeSelectionPollingComponent : SelectionPollingComponent
+        {
+            public readonly IBindable<bool> AllowPolling = new Bindable<bool>();
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                AllowPolling.BindValueChanged(_ =>
+                {
+                    if (IsLoaded)
+                        PollImmediately();
+                });
+            }
+
+            protected override Task Poll() => !AllowPolling.Value ? Task.CompletedTask : base.Poll();
+        }
     }
 }

From 1e2163f55e0378604ebe2f083a84b1271a8e7f4d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 01:14:50 +0900
Subject: [PATCH 0351/3722] Add a testable realtime multiplayer client

---
 .../TestRealtimeMultiplayerClient.cs          | 114 ++++++++++++++++++
 1 file changed, 114 insertions(+)
 create mode 100644 osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs

diff --git a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs b/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs
new file mode 100644
index 0000000000..2a90f1e744
--- /dev/null
+++ b/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs
@@ -0,0 +1,114 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+#nullable enable
+
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Game.Online.API;
+using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Users;
+
+namespace osu.Game.Tests.Visual.RealtimeMultiplayer
+{
+    public class TestRealtimeMultiplayerClient : StatefulMultiplayerClient
+    {
+        public override IBindable<bool> IsConnected { get; } = new Bindable<bool>(true);
+
+        [Resolved]
+        private IAPIProvider api { get; set; } = null!;
+
+        public void AddUser(User user) => ((IMultiplayerClient)this).UserJoined(new MultiplayerRoomUser(user.Id) { User = user });
+
+        public void RemoveUser(User user)
+        {
+            Debug.Assert(Room != null);
+            ((IMultiplayerClient)this).UserLeft(Room.Users.Single(u => u.User == user));
+
+            Schedule(() =>
+            {
+                if (Room.Users.Any())
+                    TransferHost(Room.Users.First().UserID);
+            });
+        }
+
+        public void ChangeUserState(int userId, MultiplayerUserState newState)
+        {
+            Debug.Assert(Room != null);
+
+            ((IMultiplayerClient)this).UserStateChanged(userId, newState);
+
+            Schedule(() =>
+            {
+                switch (newState)
+                {
+                    case MultiplayerUserState.Loaded:
+                        if (Room.Users.All(u => u.State != MultiplayerUserState.WaitingForLoad))
+                        {
+                            foreach (var u in Room.Users.Where(u => u.State == MultiplayerUserState.Loaded))
+                                ChangeUserState(u.UserID, MultiplayerUserState.Playing);
+
+                            ((IMultiplayerClient)this).MatchStarted();
+                        }
+
+                        break;
+
+                    case MultiplayerUserState.FinishedPlay:
+                        if (Room.Users.All(u => u.State != MultiplayerUserState.Playing))
+                        {
+                            foreach (var u in Room.Users.Where(u => u.State == MultiplayerUserState.FinishedPlay))
+                                ChangeUserState(u.UserID, MultiplayerUserState.Results);
+
+                            ((IMultiplayerClient)this).ResultsReady();
+                        }
+
+                        break;
+                }
+            });
+        }
+
+        protected override Task<MultiplayerRoom> JoinRoom(long roomId)
+        {
+            var user = new MultiplayerRoomUser(api.LocalUser.Value.Id) { User = api.LocalUser.Value };
+
+            var room = new MultiplayerRoom(roomId);
+            room.Users.Add(user);
+
+            if (room.Users.Count == 1)
+                room.Host = user;
+
+            return Task.FromResult(room);
+        }
+
+        public override Task TransferHost(int userId) => ((IMultiplayerClient)this).HostChanged(userId);
+
+        public override async Task ChangeSettings(MultiplayerRoomSettings settings)
+        {
+            Debug.Assert(Room != null);
+
+            await ((IMultiplayerClient)this).SettingsChanged(settings);
+
+            foreach (var user in Room.Users.Where(u => u.State == MultiplayerUserState.Ready))
+                ChangeUserState(user.UserID, MultiplayerUserState.Idle);
+        }
+
+        public override Task ChangeState(MultiplayerUserState newState)
+        {
+            ChangeUserState(api.LocalUser.Value.Id, newState);
+            return Task.CompletedTask;
+        }
+
+        public override async Task StartMatch()
+        {
+            Debug.Assert(Room != null);
+
+            foreach (var user in Room.Users.Where(u => u.State == MultiplayerUserState.Ready))
+                ChangeUserState(user.UserID, MultiplayerUserState.WaitingForLoad);
+
+            await ((IMultiplayerClient)this).LoadRequested();
+        }
+    }
+}

From 50a35c0f63222f767678d4b661b93f19e04a2b67 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 01:16:00 +0900
Subject: [PATCH 0352/3722] Add connection/disconnection capability

---
 .../RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs b/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs
index 2a90f1e744..bfa8362c7e 100644
--- a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs
@@ -16,11 +16,16 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
 {
     public class TestRealtimeMultiplayerClient : StatefulMultiplayerClient
     {
-        public override IBindable<bool> IsConnected { get; } = new Bindable<bool>(true);
+        public override IBindable<bool> IsConnected => isConnected;
+        private readonly Bindable<bool> isConnected = new Bindable<bool>(true);
 
         [Resolved]
         private IAPIProvider api { get; set; } = null!;
 
+        public void Connect() => isConnected.Value = true;
+
+        public void Disconnect() => isConnected.Value = false;
+
         public void AddUser(User user) => ((IMultiplayerClient)this).UserJoined(new MultiplayerRoomUser(user.Id) { User = user });
 
         public void RemoveUser(User user)

From c6555c53cc315b6df93cab9d7c56dc2c018ad2ed Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 01:17:24 +0900
Subject: [PATCH 0353/3722] Add a testable realtime room manager

---
 .../API/Requests/GetBeatmapSetRequest.cs      | 10 +-
 .../Online/Multiplayer/CreateRoomRequest.cs   |  6 +-
 .../TestRealtimeRoomManager.cs                | 91 +++++++++++++++++++
 3 files changed, 99 insertions(+), 8 deletions(-)
 create mode 100644 osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomManager.cs

diff --git a/osu.Game/Online/API/Requests/GetBeatmapSetRequest.cs b/osu.Game/Online/API/Requests/GetBeatmapSetRequest.cs
index 8e6deeb3c6..158ae03b8d 100644
--- a/osu.Game/Online/API/Requests/GetBeatmapSetRequest.cs
+++ b/osu.Game/Online/API/Requests/GetBeatmapSetRequest.cs
@@ -7,16 +7,16 @@ namespace osu.Game.Online.API.Requests
 {
     public class GetBeatmapSetRequest : APIRequest<APIBeatmapSet>
     {
-        private readonly int id;
-        private readonly BeatmapSetLookupType type;
+        public readonly int ID;
+        public readonly BeatmapSetLookupType Type;
 
         public GetBeatmapSetRequest(int id, BeatmapSetLookupType type = BeatmapSetLookupType.SetId)
         {
-            this.id = id;
-            this.type = type;
+            ID = id;
+            Type = type;
         }
 
-        protected override string Target => type == BeatmapSetLookupType.SetId ? $@"beatmapsets/{id}" : $@"beatmapsets/lookup?beatmap_id={id}";
+        protected override string Target => Type == BeatmapSetLookupType.SetId ? $@"beatmapsets/{ID}" : $@"beatmapsets/lookup?beatmap_id={ID}";
     }
 
     public enum BeatmapSetLookupType
diff --git a/osu.Game/Online/Multiplayer/CreateRoomRequest.cs b/osu.Game/Online/Multiplayer/CreateRoomRequest.cs
index dcb4ed51ea..5be99e9442 100644
--- a/osu.Game/Online/Multiplayer/CreateRoomRequest.cs
+++ b/osu.Game/Online/Multiplayer/CreateRoomRequest.cs
@@ -10,11 +10,11 @@ namespace osu.Game.Online.Multiplayer
 {
     public class CreateRoomRequest : APIRequest<APICreatedRoom>
     {
-        private readonly Room room;
+        public readonly Room Room;
 
         public CreateRoomRequest(Room room)
         {
-            this.room = room;
+            Room = room;
         }
 
         protected override WebRequest CreateWebRequest()
@@ -24,7 +24,7 @@ namespace osu.Game.Online.Multiplayer
             req.ContentType = "application/json";
             req.Method = HttpMethod.Post;
 
-            req.AddRaw(JsonConvert.SerializeObject(room));
+            req.AddRaw(JsonConvert.SerializeObject(Room));
 
             return req;
         }
diff --git a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomManager.cs b/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomManager.cs
new file mode 100644
index 0000000000..773b72da88
--- /dev/null
+++ b/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomManager.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 System.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
+using osu.Game.Screens.Multi.RealtimeMultiplayer;
+
+namespace osu.Game.Tests.Visual.RealtimeMultiplayer
+{
+    public class TestRealtimeRoomManager : RealtimeRoomManager
+    {
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        [Resolved]
+        private OsuGameBase game { get; set; }
+
+        private readonly List<Room> rooms = new List<Room>();
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            int currentScoreId = 0;
+
+            ((DummyAPIAccess)api).HandleRequest = req =>
+            {
+                switch (req)
+                {
+                    case CreateRoomRequest createRoomRequest:
+                        var createdRoom = new APICreatedRoom();
+
+                        createdRoom.CopyFrom(createRoomRequest.Room);
+                        createdRoom.RoomID.Value = 1;
+
+                        rooms.Add(createdRoom);
+                        createRoomRequest.TriggerSuccess(createdRoom);
+                        break;
+
+                    case JoinRoomRequest joinRoomRequest:
+                        joinRoomRequest.TriggerSuccess();
+                        break;
+
+                    case PartRoomRequest partRoomRequest:
+                        partRoomRequest.TriggerSuccess();
+                        break;
+
+                    case GetRoomsRequest getRoomsRequest:
+                        getRoomsRequest.TriggerSuccess(rooms);
+                        break;
+
+                    case GetBeatmapSetRequest getBeatmapSetRequest:
+                        var onlineReq = new GetBeatmapSetRequest(getBeatmapSetRequest.ID, getBeatmapSetRequest.Type);
+                        onlineReq.Success += res => getBeatmapSetRequest.TriggerSuccess(res);
+                        onlineReq.Failure += e => getBeatmapSetRequest.TriggerFailure(e);
+
+                        // Get the online API from the game's dependencies.
+                        game.Dependencies.Get<IAPIProvider>().Queue(onlineReq);
+                        break;
+
+                    case CreateRoomScoreRequest createRoomScoreRequest:
+                        createRoomScoreRequest.TriggerSuccess(new APIScoreToken { ID = 1 });
+                        break;
+
+                    case SubmitRoomScoreRequest submitRoomScoreRequest:
+                        submitRoomScoreRequest.TriggerSuccess(new MultiplayerScore
+                        {
+                            ID = currentScoreId++,
+                            Accuracy = 1,
+                            EndedAt = DateTimeOffset.Now,
+                            Passed = true,
+                            Rank = ScoreRank.S,
+                            MaxCombo = 1000,
+                            TotalScore = 1000000,
+                            User = api.LocalUser.Value,
+                            Statistics = new Dictionary<HitResult, int>()
+                        });
+                        break;
+                }
+            };
+        }
+
+        public new void Schedule(Action action) => base.Schedule(action);
+    }
+}

From c6da680c803a0d9cf055fbedbd57e7992eed823e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 01:19:08 +0900
Subject: [PATCH 0354/3722] Add a container for testing purposes

---
 .../TestRealtimeRoomContainer.cs              | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomContainer.cs

diff --git a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomContainer.cs b/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomContainer.cs
new file mode 100644
index 0000000000..aa75968cca
--- /dev/null
+++ b/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomContainer.cs
@@ -0,0 +1,40 @@
+// Copyright (c) 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.Game.Online.RealtimeMultiplayer;
+using osu.Game.Screens.Multi.Lounge.Components;
+using osu.Game.Screens.Multi.RealtimeMultiplayer;
+
+namespace osu.Game.Tests.Visual.RealtimeMultiplayer
+{
+    public class TestRealtimeRoomContainer : Container
+    {
+        protected override Container<Drawable> Content => content;
+        private readonly Container content;
+
+        [Cached(typeof(StatefulMultiplayerClient))]
+        public readonly TestRealtimeMultiplayerClient Client;
+
+        [Cached(typeof(RealtimeRoomManager))]
+        public readonly TestRealtimeRoomManager RoomManager;
+
+        [Cached]
+        public readonly Bindable<FilterCriteria> Filter = new Bindable<FilterCriteria>(new FilterCriteria());
+
+        public TestRealtimeRoomContainer()
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            AddRangeInternal(new Drawable[]
+            {
+                Client = new TestRealtimeMultiplayerClient(),
+                RoomManager = new TestRealtimeRoomManager(),
+                content = new Container { RelativeSizeAxes = Axes.Both }
+            });
+        }
+    }
+}

From 2fc5561b7ec7a4a5c53235203cd65b1c8d6869b8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 01:22:52 +0900
Subject: [PATCH 0355/3722] Add handling for GetRoomRequest()

---
 osu.Game/Online/Multiplayer/GetRoomRequest.cs |  6 +++---
 .../TestRealtimeRoomManager.cs                | 19 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/GetRoomRequest.cs b/osu.Game/Online/Multiplayer/GetRoomRequest.cs
index 2907b49f1d..449c2c8e31 100644
--- a/osu.Game/Online/Multiplayer/GetRoomRequest.cs
+++ b/osu.Game/Online/Multiplayer/GetRoomRequest.cs
@@ -7,13 +7,13 @@ namespace osu.Game.Online.Multiplayer
 {
     public class GetRoomRequest : APIRequest<Room>
     {
-        private readonly int roomId;
+        public readonly int RoomId;
 
         public GetRoomRequest(int roomId)
         {
-            this.roomId = roomId;
+            RoomId = roomId;
         }
 
-        protected override string Target => $"rooms/{roomId}";
+        protected override string Target => $"rooms/{RoomId}";
     }
 }
diff --git a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomManager.cs b/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomManager.cs
index 773b72da88..cee1c706ae 100644
--- a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomManager.cs
+++ b/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomManager.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
@@ -52,7 +53,23 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
                         break;
 
                     case GetRoomsRequest getRoomsRequest:
-                        getRoomsRequest.TriggerSuccess(rooms);
+                        var roomsWithoutParticipants = new List<Room>();
+
+                        foreach (var r in rooms)
+                        {
+                            var newRoom = new Room();
+
+                            newRoom.CopyFrom(r);
+                            newRoom.RecentParticipants.Clear();
+
+                            roomsWithoutParticipants.Add(newRoom);
+                        }
+
+                        getRoomsRequest.TriggerSuccess(roomsWithoutParticipants);
+                        break;
+
+                    case GetRoomRequest getRoomRequest:
+                        getRoomRequest.TriggerSuccess(rooms.Single(r => r.RoomID.Value == getRoomRequest.RoomId));
                         break;
 
                     case GetBeatmapSetRequest getBeatmapSetRequest:

From 9b0ca8fc3b2b380578202e5e75145d1b88ed9743 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 01:57:30 +0900
Subject: [PATCH 0356/3722] Make real time room manager not poll while inside a
 room

---
 .../Screens/Multi/Components/RoomManager.cs   | 14 ++++++------
 .../RealtimeRoomManager.cs                    | 22 +++++++++++++------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/Multi/Components/RoomManager.cs b/osu.Game/Screens/Multi/Components/RoomManager.cs
index d92427680e..6e27515849 100644
--- a/osu.Game/Screens/Multi/Components/RoomManager.cs
+++ b/osu.Game/Screens/Multi/Components/RoomManager.cs
@@ -27,6 +27,8 @@ namespace osu.Game.Screens.Multi.Components
 
         public IBindableList<Room> Rooms => rooms;
 
+        protected Room JoinedRoom { get; private set; }
+
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
@@ -36,8 +38,6 @@ namespace osu.Game.Screens.Multi.Components
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        private Room joinedRoom;
-
         protected RoomManager()
         {
             RelativeSizeAxes = Axes.Both;
@@ -64,7 +64,7 @@ namespace osu.Game.Screens.Multi.Components
 
             req.Success += result =>
             {
-                joinedRoom = room;
+                JoinedRoom = room;
 
                 update(room, result);
                 addRoom(room);
@@ -93,7 +93,7 @@ namespace osu.Game.Screens.Multi.Components
 
             currentJoinRoomRequest.Success += () =>
             {
-                joinedRoom = room;
+                JoinedRoom = room;
                 onSuccess?.Invoke(room);
             };
 
@@ -111,11 +111,11 @@ namespace osu.Game.Screens.Multi.Components
         {
             currentJoinRoomRequest?.Cancel();
 
-            if (joinedRoom == null)
+            if (JoinedRoom == null)
                 return;
 
-            api.Queue(new PartRoomRequest(joinedRoom));
-            joinedRoom = null;
+            api.Queue(new PartRoomRequest(JoinedRoom));
+            JoinedRoom = null;
         }
 
         private readonly HashSet<int> ignoredRooms = new HashSet<int>();
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index 62ea5d5512..69addde2a6 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -21,17 +21,16 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         public readonly Bindable<double> TimeBetweenListingPolls = new Bindable<double>();
         public readonly Bindable<double> TimeBetweenSelectionPolls = new Bindable<double>();
         private readonly IBindable<bool> isConnected = new Bindable<bool>();
+        private readonly Bindable<bool> allowPolling = new Bindable<bool>();
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
             isConnected.BindTo(multiplayerClient.IsConnected);
-            isConnected.BindValueChanged(connected => Schedule(() =>
-            {
-                if (!connected.NewValue)
-                    ClearRooms();
-            }));
+            isConnected.BindValueChanged(_ => Schedule(updatePolling), true);
+
+            updatePolling();
         }
 
         public override void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
@@ -54,17 +53,26 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             }, TaskContinuationOptions.NotOnRanToCompletion);
         }
 
+        private void updatePolling()
+        {
+            if (!isConnected.Value)
+                ClearRooms();
+
+            // Don't poll when not connected or when a room has been joined.
+            allowPolling.Value = isConnected.Value && JoinedRoom == null;
+        }
+
         protected override RoomPollingComponent[] CreatePollingComponents() => new RoomPollingComponent[]
         {
             new RealtimeListingPollingComponent
             {
                 TimeBetweenPolls = { BindTarget = TimeBetweenListingPolls },
-                AllowPolling = { BindTarget = isConnected }
+                AllowPolling = { BindTarget = allowPolling }
             },
             new RealtimeSelectionPollingComponent
             {
                 TimeBetweenPolls = { BindTarget = TimeBetweenSelectionPolls },
-                AllowPolling = { BindTarget = isConnected }
+                AllowPolling = { BindTarget = allowPolling }
             }
         };
 

From 7d1fe7955e633e332e2d43fafc1dd24f313e4ee5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 01:57:40 +0900
Subject: [PATCH 0357/3722] Small improvements to testable room manager

---
 .../RealtimeMultiplayer/TestRealtimeRoomManager.cs     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomManager.cs b/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomManager.cs
index cee1c706ae..0d1314fb51 100644
--- a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomManager.cs
+++ b/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomManager.cs
@@ -5,11 +5,13 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
+using osu.Game.Screens.Multi.Lounge.Components;
 using osu.Game.Screens.Multi.RealtimeMultiplayer;
 
 namespace osu.Game.Tests.Visual.RealtimeMultiplayer
@@ -22,6 +24,9 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
         [Resolved]
         private OsuGameBase game { get; set; }
 
+        [Cached]
+        public readonly Bindable<FilterCriteria> Filter = new Bindable<FilterCriteria>(new FilterCriteria());
+
         private readonly List<Room> rooms = new List<Room>();
 
         protected override void LoadComplete()
@@ -29,6 +34,7 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
             base.LoadComplete();
 
             int currentScoreId = 0;
+            int currentRoomId = 0;
 
             ((DummyAPIAccess)api).HandleRequest = req =>
             {
@@ -38,7 +44,7 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
                         var createdRoom = new APICreatedRoom();
 
                         createdRoom.CopyFrom(createRoomRequest.Room);
-                        createdRoom.RoomID.Value = 1;
+                        createdRoom.RoomID.Value ??= currentRoomId++;
 
                         rooms.Add(createdRoom);
                         createRoomRequest.TriggerSuccess(createdRoom);
@@ -103,6 +109,8 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
             };
         }
 
+        public new void ClearRooms() => base.ClearRooms();
+
         public new void Schedule(Action action) => base.Schedule(action);
     }
 }

From 0fb8615f95b29dbff7ba1c839c3591a1b72aa5b1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 02:02:04 +0900
Subject: [PATCH 0358/3722] Implement room parting

---
 .../Screens/Multi/Components/RoomManager.cs   |  4 +++-
 .../RealtimeRoomManager.cs                    | 20 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Multi/Components/RoomManager.cs b/osu.Game/Screens/Multi/Components/RoomManager.cs
index 6e27515849..21bff70b8b 100644
--- a/osu.Game/Screens/Multi/Components/RoomManager.cs
+++ b/osu.Game/Screens/Multi/Components/RoomManager.cs
@@ -107,7 +107,7 @@ namespace osu.Game.Screens.Multi.Components
             api.Queue(currentJoinRoomRequest);
         }
 
-        public void PartRoom()
+        public virtual void PartRoom()
         {
             currentJoinRoomRequest?.Cancel();
 
@@ -157,6 +157,8 @@ namespace osu.Game.Screens.Multi.Components
             RoomsUpdated?.Invoke();
         }
 
+        protected void RemoveRoom(Room room) => rooms.Remove(room);
+
         protected void ClearRooms()
         {
             rooms.Clear();
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index 69addde2a6..4f73ee3865 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -23,6 +23,8 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         private readonly IBindable<bool> isConnected = new Bindable<bool>();
         private readonly Bindable<bool> allowPolling = new Bindable<bool>();
 
+        private ListingPollingComponent listingPollingComponent;
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -39,6 +41,22 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         public override void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
             => base.JoinRoom(room, r => joinMultiplayerRoom(r, onSuccess), onError);
 
+        public override void PartRoom()
+        {
+            if (JoinedRoom == null)
+                return;
+
+            var joinedRoom = JoinedRoom;
+
+            base.PartRoom();
+            multiplayerClient.LeaveRoom().Wait();
+
+            // Todo: This is not the way to do this. Basically when we're the only participant and the room closes, there's no way to know if this is actually the case.
+            RemoveRoom(joinedRoom);
+            // This is delayed one frame because upon exiting the match subscreen, multiplayer updates the polling rate and messes with polling.
+            Schedule(() => listingPollingComponent.PollImmediately());
+        }
+
         private void joinMultiplayerRoom(Room room, Action<Room> onSuccess = null)
         {
             Debug.Assert(room.RoomID.Value != null);
@@ -64,7 +82,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
         protected override RoomPollingComponent[] CreatePollingComponents() => new RoomPollingComponent[]
         {
-            new RealtimeListingPollingComponent
+            listingPollingComponent = new RealtimeListingPollingComponent
             {
                 TimeBetweenPolls = { BindTarget = TimeBetweenListingPolls },
                 AllowPolling = { BindTarget = allowPolling }

From a593f588db95a8ac6b8bb2594c1a94909ade9c5f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 02:02:47 +0900
Subject: [PATCH 0359/3722] Add a test for the realtime room manager

---
 .../TestSceneRealtimeRoomManager.cs           | 105 ++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs

diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs
new file mode 100644
index 0000000000..6bd8c410a4
--- /dev/null
+++ b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs
@@ -0,0 +1,105 @@
+// Copyright (c) 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.Online.Multiplayer;
+
+namespace osu.Game.Tests.Visual.RealtimeMultiplayer
+{
+    public class TestSceneRealtimeRoomManager : MultiplayerTestScene
+    {
+        private TestRealtimeRoomContainer roomContainer;
+        private TestRealtimeRoomManager roomManager => roomContainer.RoomManager;
+
+        [Test]
+        public void TestPollsInitially()
+        {
+            AddStep("create room manager with a few rooms", () =>
+            {
+                createRoomManager().With(d => d.OnLoadComplete += _ =>
+                {
+                    roomManager.CreateRoom(new Room { Name = { Value = "1" } });
+                    roomManager.PartRoom();
+                    roomManager.CreateRoom(new Room { Name = { Value = "2" } });
+                    roomManager.PartRoom();
+                    roomManager.ClearRooms();
+                });
+            });
+
+            AddAssert("manager polled for rooms", () => roomManager.Rooms.Count == 2);
+            AddAssert("initial rooms received", () => roomManager.InitialRoomsReceived.Value);
+        }
+
+        [Test]
+        public void TestRoomsClearedOnDisconnection()
+        {
+            AddStep("create room manager with a few rooms", () =>
+            {
+                createRoomManager().With(d => d.OnLoadComplete += _ =>
+                {
+                    roomManager.CreateRoom(new Room());
+                    roomManager.PartRoom();
+                    roomManager.CreateRoom(new Room());
+                    roomManager.PartRoom();
+                });
+            });
+
+            AddStep("disconnect", () => roomContainer.Client.Disconnect());
+
+            AddAssert("rooms cleared", () => roomManager.Rooms.Count == 0);
+            AddAssert("initial rooms not received", () => !roomManager.InitialRoomsReceived.Value);
+        }
+
+        [Test]
+        public void TestRoomsPolledOnReconnect()
+        {
+            AddStep("create room manager with a few rooms", () =>
+            {
+                createRoomManager().With(d => d.OnLoadComplete += _ =>
+                {
+                    roomManager.CreateRoom(new Room());
+                    roomManager.PartRoom();
+                    roomManager.CreateRoom(new Room());
+                    roomManager.PartRoom();
+                });
+            });
+
+            AddStep("disconnect", () => roomContainer.Client.Disconnect());
+            AddStep("connect", () => roomContainer.Client.Connect());
+
+            AddAssert("manager polled for rooms", () => roomManager.Rooms.Count == 2);
+            AddAssert("initial rooms received", () => roomManager.InitialRoomsReceived.Value);
+        }
+
+        [Test]
+        public void TestRoomsNotPolledWhenJoined()
+        {
+            AddStep("create room manager with a room", () =>
+            {
+                createRoomManager().With(d => d.OnLoadComplete += _ =>
+                {
+                    roomManager.CreateRoom(new Room());
+                    roomManager.ClearRooms();
+                });
+            });
+
+            AddAssert("manager not polled for rooms", () => roomManager.Rooms.Count == 0);
+            AddAssert("initial rooms not received", () => !roomManager.InitialRoomsReceived.Value);
+        }
+
+        private TestRealtimeRoomManager createRoomManager()
+        {
+            Child = roomContainer = new TestRealtimeRoomContainer
+            {
+                RoomManager =
+                {
+                    TimeBetweenListingPolls = { Value = 1 },
+                    TimeBetweenSelectionPolls = { Value = 1 }
+                }
+            };
+
+            return roomManager;
+        }
+    }
+}

From e84ce80d6cb0187b67527d5289ee3480e0746484 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 02:17:07 +0900
Subject: [PATCH 0360/3722] Make test headless

---
 .../Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs
index 6bd8c410a4..9a4b748de1 100644
--- a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs
+++ b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs
@@ -3,10 +3,12 @@
 
 using NUnit.Framework;
 using osu.Framework.Graphics;
+using osu.Framework.Testing;
 using osu.Game.Online.Multiplayer;
 
 namespace osu.Game.Tests.Visual.RealtimeMultiplayer
 {
+    [HeadlessTest]
     public class TestSceneRealtimeRoomManager : MultiplayerTestScene
     {
         private TestRealtimeRoomContainer roomContainer;

From 109e6b4283e0a49ac13be9a59572ab1f6f599e0a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 02:20:02 +0900
Subject: [PATCH 0361/3722] Add tests for creating/joining/parting multiplayer
 rooms

---
 .../TestSceneRealtimeRoomManager.cs           | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs
index 9a4b748de1..598641682b 100644
--- a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs
+++ b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs
@@ -90,6 +90,52 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
             AddAssert("initial rooms not received", () => !roomManager.InitialRoomsReceived.Value);
         }
 
+        [Test]
+        public void TestMultiplayerRoomJoinedWhenCreated()
+        {
+            AddStep("create room manager with a room", () =>
+            {
+                createRoomManager().With(d => d.OnLoadComplete += _ =>
+                {
+                    roomManager.CreateRoom(new Room());
+                });
+            });
+
+            AddAssert("multiplayer room joined", () => roomContainer.Client.Room != null);
+        }
+
+        [Test]
+        public void TestMultiplayerRoomPartedWhenAPIRoomParted()
+        {
+            AddStep("create room manager with a room", () =>
+            {
+                createRoomManager().With(d => d.OnLoadComplete += _ =>
+                {
+                    roomManager.CreateRoom(new Room());
+                    roomManager.PartRoom();
+                });
+            });
+
+            AddAssert("multiplayer room parted", () => roomContainer.Client.Room == null);
+        }
+
+        [Test]
+        public void TestMultiplayerRoomPartedWhenAPIRoomJoined()
+        {
+            AddStep("create room manager with a room", () =>
+            {
+                createRoomManager().With(d => d.OnLoadComplete += _ =>
+                {
+                    var r = new Room();
+                    roomManager.CreateRoom(r);
+                    roomManager.PartRoom();
+                    roomManager.JoinRoom(r);
+                });
+            });
+
+            AddAssert("multiplayer room parted", () => roomContainer.Client.Room != null);
+        }
+
         private TestRealtimeRoomManager createRoomManager()
         {
             Child = roomContainer = new TestRealtimeRoomContainer

From 3f4a66c4ae6036b98cb3512ba2440d75596c056e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 02:23:42 +0900
Subject: [PATCH 0362/3722] Add realtime multiplayer test scene abstract class

---
 .../RealtimeMultiplayerTestScene.cs           | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs

diff --git a/osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs b/osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs
new file mode 100644
index 0000000000..e41076a4fd
--- /dev/null
+++ b/osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs
@@ -0,0 +1,53 @@
+// Copyright (c) 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.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Screens.Multi.Lounge.Components;
+using osu.Game.Screens.Multi.RealtimeMultiplayer;
+
+namespace osu.Game.Tests.Visual.RealtimeMultiplayer
+{
+    public class RealtimeMultiplayerTestScene : MultiplayerTestScene
+    {
+        [Cached(typeof(StatefulMultiplayerClient))]
+        public TestRealtimeMultiplayerClient Client { get; }
+
+        [Cached(typeof(RealtimeRoomManager))]
+        public TestRealtimeRoomManager RoomManager { get; }
+
+        [Cached]
+        public Bindable<FilterCriteria> Filter { get; }
+
+        protected override Container<Drawable> Content => content;
+        private readonly TestRealtimeRoomContainer content;
+
+        private readonly bool joinRoom;
+
+        public RealtimeMultiplayerTestScene(bool joinRoom = true)
+        {
+            this.joinRoom = joinRoom;
+            base.Content.Add(content = new TestRealtimeRoomContainer { RelativeSizeAxes = Axes.Both });
+
+            Client = content.Client;
+            RoomManager = content.RoomManager;
+            Filter = content.Filter;
+        }
+
+        [SetUp]
+        public new void Setup() => Schedule(() =>
+        {
+            RoomManager.Schedule(() => RoomManager.PartRoom());
+
+            if (joinRoom)
+            {
+                Room.RoomID.Value = 1;
+                RoomManager.Schedule(() => RoomManager.JoinRoom(Room, null, null));
+            }
+        });
+    }
+}

From 9b08f573baeb360e0f5135f98f5205b7145757e5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 02:41:04 +0900
Subject: [PATCH 0363/3722] Fix room not created before being joined

---
 .../RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs      | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs b/osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs
index e41076a4fd..b52106551e 100644
--- a/osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs
+++ b/osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs
@@ -44,10 +44,7 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
             RoomManager.Schedule(() => RoomManager.PartRoom());
 
             if (joinRoom)
-            {
-                Room.RoomID.Value = 1;
-                RoomManager.Schedule(() => RoomManager.JoinRoom(Room, null, null));
-            }
+                RoomManager.Schedule(() => RoomManager.CreateRoom(Room));
         });
     }
 }

From 4d051818a152573834a0e859994f25c83bda1b7a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 02:30:53 +0900
Subject: [PATCH 0364/3722] Add base class for all realtime multiplayer classes

---
 .../RealtimeRoomComposite.cs                  | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomComposite.cs

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomComposite.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomComposite.cs
new file mode 100644
index 0000000000..e6d1274316
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomComposite.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 JetBrains.Annotations;
+using osu.Framework.Allocation;
+using osu.Game.Online.RealtimeMultiplayer;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+{
+    public abstract class RealtimeRoomComposite : MultiplayerComposite
+    {
+        [CanBeNull]
+        protected MultiplayerRoom Room => Client.Room;
+
+        [Resolved]
+        protected StatefulMultiplayerClient Client { get; private set; }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Client.RoomChanged += OnRoomChanged;
+            OnRoomChanged();
+        }
+
+        protected virtual void OnRoomChanged()
+        {
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            if (Client != null)
+                Client.RoomChanged -= OnRoomChanged;
+
+            base.Dispose(isDisposing);
+        }
+    }
+}

From 1e5c32410ad572883295e0f8e47e90704ef4593e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 02:37:47 +0900
Subject: [PATCH 0365/3722] Add the realtime multiplayer participants list

---
 .../TestSceneParticipantsList.cs              |  96 +++++++++
 .../Participants/ParticipantPanel.cs          | 187 ++++++++++++++++++
 .../Participants/ParticipantsList.cs          |  55 ++++++
 .../Participants/ReadyMark.cs                 |  51 +++++
 4 files changed, 389 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneParticipantsList.cs
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantsList.cs
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ReadyMark.cs

diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneParticipantsList.cs b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneParticipantsList.cs
new file mode 100644
index 0000000000..ee6bbc4ecd
--- /dev/null
+++ b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneParticipantsList.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.Linq;
+using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Testing;
+using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Screens.Multi.RealtimeMultiplayer.Participants;
+using osu.Game.Users;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.RealtimeMultiplayer
+{
+    public class TestSceneParticipantsList : RealtimeMultiplayerTestScene
+    {
+        [SetUp]
+        public new void Setup() => Schedule(() =>
+        {
+            Child = new ParticipantsList
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.Y,
+                Size = new Vector2(380, 0.7f)
+            };
+        });
+
+        [Test]
+        public void TestAddUser()
+        {
+            AddAssert("one unique panel", () => this.ChildrenOfType<ParticipantPanel>().Select(p => p.User).Distinct().Count() == 1);
+
+            AddStep("add user", () => Client.AddUser(new User
+            {
+                Id = 3,
+                Username = "Second",
+                CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
+            }));
+
+            AddAssert("two unique panels", () => this.ChildrenOfType<ParticipantPanel>().Select(p => p.User).Distinct().Count() == 2);
+        }
+
+        [Test]
+        public void TestRemoveUser()
+        {
+            User secondUser = null;
+
+            AddStep("add a user", () =>
+            {
+                Client.AddUser(secondUser = new User
+                {
+                    Id = 3,
+                    Username = "Second",
+                    CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
+                });
+            });
+
+            AddStep("remove host", () => Client.RemoveUser(API.LocalUser.Value));
+
+            AddAssert("single panel is for second user", () => this.ChildrenOfType<ParticipantPanel>().Single().User.User == secondUser);
+        }
+
+        [Test]
+        public void TestToggleReadyState()
+        {
+            AddAssert("ready mark invisible", () => !this.ChildrenOfType<ReadyMark>().Single().IsPresent);
+
+            AddStep("make user ready", () => Client.ChangeState(MultiplayerUserState.Ready));
+            AddUntilStep("ready mark visible", () => this.ChildrenOfType<ReadyMark>().Single().IsPresent);
+
+            AddStep("make user idle", () => Client.ChangeState(MultiplayerUserState.Idle));
+            AddUntilStep("ready mark invisible", () => !this.ChildrenOfType<ReadyMark>().Single().IsPresent);
+        }
+
+        [Test]
+        public void TestCrownChangesStateWhenHostTransferred()
+        {
+            AddStep("add user", () => Client.AddUser(new User
+            {
+                Id = 3,
+                Username = "Second",
+                CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
+            }));
+
+            AddUntilStep("first user crown visible", () => this.ChildrenOfType<ParticipantPanel>().ElementAt(0).ChildrenOfType<SpriteIcon>().First().Alpha == 1);
+            AddUntilStep("second user crown hidden", () => this.ChildrenOfType<ParticipantPanel>().ElementAt(1).ChildrenOfType<SpriteIcon>().First().Alpha == 0);
+
+            AddStep("make second user host", () => Client.TransferHost(3));
+
+            AddUntilStep("first user crown hidden", () => this.ChildrenOfType<ParticipantPanel>().ElementAt(0).ChildrenOfType<SpriteIcon>().First().Alpha == 0);
+            AddUntilStep("second user crown visible", () => this.ChildrenOfType<ParticipantPanel>().ElementAt(1).ChildrenOfType<SpriteIcon>().First().Alpha == 1);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs
new file mode 100644
index 0000000000..306a54bfdc
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.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.
+
+using System.Diagnostics;
+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.Cursor;
+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.Online.API;
+using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Users;
+using osu.Game.Users.Drawables;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Participants
+{
+    public class ParticipantPanel : RealtimeRoomComposite, IHasContextMenu
+    {
+        public readonly MultiplayerRoomUser User;
+
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        private ReadyMark readyMark;
+        private SpriteIcon crown;
+
+        public ParticipantPanel(MultiplayerRoomUser user)
+        {
+            User = user;
+
+            RelativeSizeAxes = Axes.X;
+            Height = 40;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Debug.Assert(User.User != null);
+
+            var backgroundColour = Color4Extensions.FromHex("#33413C");
+
+            InternalChildren = new Drawable[]
+            {
+                crown = new SpriteIcon
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Icon = FontAwesome.Solid.Crown,
+                    Size = new Vector2(14),
+                    Colour = Color4Extensions.FromHex("#F7E65D"),
+                    Alpha = 0
+                },
+                new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Padding = new MarginPadding { Left = 24 },
+                    Child = new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Masking = true,
+                        CornerRadius = 5,
+                        Children = new Drawable[]
+                        {
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Colour = backgroundColour
+                            },
+                            new UserCoverBackground
+                            {
+                                Anchor = Anchor.CentreRight,
+                                Origin = Anchor.CentreRight,
+                                RelativeSizeAxes = Axes.Both,
+                                Width = 0.75f,
+                                User = User.User,
+                                Colour = ColourInfo.GradientHorizontal(Color4.White.Opacity(0), Color4.White.Opacity(0.25f))
+                            },
+                            new FillFlowContainer
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Spacing = new Vector2(10),
+                                Direction = FillDirection.Horizontal,
+                                Children = new Drawable[]
+                                {
+                                    new UpdateableAvatar
+                                    {
+                                        Anchor = Anchor.CentreLeft,
+                                        Origin = Anchor.CentreLeft,
+                                        RelativeSizeAxes = Axes.Both,
+                                        FillMode = FillMode.Fit,
+                                        User = User.User
+                                    },
+                                    new UpdateableFlag
+                                    {
+                                        Anchor = Anchor.CentreLeft,
+                                        Origin = Anchor.CentreLeft,
+                                        Size = new Vector2(30, 20),
+                                        Country = User.User.Country
+                                    },
+                                    new OsuSpriteText
+                                    {
+                                        Anchor = Anchor.CentreLeft,
+                                        Origin = Anchor.CentreLeft,
+                                        Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 18),
+                                        Text = User.User.Username
+                                    },
+                                    new OsuSpriteText
+                                    {
+                                        Anchor = Anchor.CentreLeft,
+                                        Origin = Anchor.CentreLeft,
+                                        Font = OsuFont.GetFont(size: 14),
+                                        Text = User.User.CurrentModeRank != null ? $"#{User.User.CurrentModeRank}" : string.Empty
+                                    }
+                                }
+                            },
+                            readyMark = new ReadyMark
+                            {
+                                Anchor = Anchor.CentreRight,
+                                Origin = Anchor.CentreRight,
+                                Margin = new MarginPadding { Right = 10 },
+                                Alpha = 0
+                            }
+                        }
+                    }
+                }
+            };
+        }
+
+        protected override void OnRoomChanged()
+        {
+            base.OnRoomChanged();
+
+            if (Room == null)
+                return;
+
+            if (User.State == MultiplayerUserState.Ready)
+                readyMark.FadeIn(50);
+            else
+                readyMark.FadeOut(50);
+
+            if (Room.Host?.Equals(User) == true)
+                crown.FadeIn(50);
+            else
+                crown.FadeOut(50);
+        }
+
+        public MenuItem[] ContextMenuItems
+        {
+            get
+            {
+                if (Room == null)
+                    return null;
+
+                // If the local user is targetted.
+                if (User.UserID == api.LocalUser.Value.Id)
+                    return null;
+
+                // If the local user is not the host of the room.
+                if (Room.Host?.UserID != api.LocalUser.Value.Id)
+                    return null;
+
+                int targetUser = User.UserID;
+
+                return new MenuItem[]
+                {
+                    new OsuMenuItem("Give host", MenuItemType.Standard, () =>
+                    {
+                        // Ensure the local user is still host.
+                        if (Room.Host?.UserID != api.LocalUser.Value.Id)
+                            return;
+
+                        Client.TransferHost(targetUser);
+                    })
+                };
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantsList.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantsList.cs
new file mode 100644
index 0000000000..d4c32d9189
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantsList.cs
@@ -0,0 +1,55 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Cursor;
+using osuTK;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Participants
+{
+    public class ParticipantsList : RealtimeRoomComposite
+    {
+        private FillFlowContainer<ParticipantPanel> panels;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChild = new OsuContextMenuContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Child = new OsuScrollContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Child = panels = new FillFlowContainer<ParticipantPanel>
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Direction = FillDirection.Vertical,
+                        Spacing = new Vector2(0, 2)
+                    }
+                }
+            };
+        }
+
+        protected override void OnRoomChanged()
+        {
+            base.OnRoomChanged();
+
+            if (Room == null)
+                panels.Clear();
+            else
+            {
+                // Remove panels for users no longer in the room.
+                panels.RemoveAll(p => !Room.Users.Contains(p.User));
+
+                // Add panels for all users new to the room.
+                foreach (var user in Room.Users.Except(panels.Select(p => p.User)))
+                    panels.Add(new ParticipantPanel(user));
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ReadyMark.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ReadyMark.cs
new file mode 100644
index 0000000000..df49d9342e
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ReadyMark.cs
@@ -0,0 +1,51 @@
+// Copyright (c) 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.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osuTK;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Participants
+{
+    public class ReadyMark : CompositeDrawable
+    {
+        public ReadyMark()
+        {
+            AutoSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChild = new FillFlowContainer
+            {
+                AutoSizeAxes = Axes.Both,
+                Spacing = new Vector2(5),
+                Children = new Drawable[]
+                {
+                    new OsuSpriteText
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Font = OsuFont.GetFont(weight: FontWeight.Regular, size: 12),
+                        Text = "ready",
+                        Colour = Color4Extensions.FromHex("#DDFFFF")
+                    },
+                    new SpriteIcon
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Icon = FontAwesome.Solid.CheckCircle,
+                        Size = new Vector2(12),
+                        Colour = Color4Extensions.FromHex("#AADD00")
+                    }
+                }
+            };
+        }
+    }
+}

From 11a903a206a820191af25de9e4f953223869c44a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 02:46:16 +0900
Subject: [PATCH 0366/3722] Add test for many users and disable scrollbar

---
 .../TestSceneParticipantsList.cs              | 20 +++++++++++++++++++
 .../Participants/ParticipantsList.cs          |  1 +
 2 files changed, 21 insertions(+)

diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneParticipantsList.cs b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneParticipantsList.cs
index ee6bbc4ecd..8c997e9e32 100644
--- a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneParticipantsList.cs
+++ b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneParticipantsList.cs
@@ -92,5 +92,25 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
             AddUntilStep("first user crown hidden", () => this.ChildrenOfType<ParticipantPanel>().ElementAt(0).ChildrenOfType<SpriteIcon>().First().Alpha == 0);
             AddUntilStep("second user crown visible", () => this.ChildrenOfType<ParticipantPanel>().ElementAt(1).ChildrenOfType<SpriteIcon>().First().Alpha == 1);
         }
+
+        [Test]
+        public void TestManyUsers()
+        {
+            AddStep("add many users", () =>
+            {
+                for (int i = 0; i < 20; i++)
+                {
+                    Client.AddUser(new User
+                    {
+                        Id = i,
+                        Username = $"User {i}",
+                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
+                    });
+
+                    if (i % 2 == 0)
+                        Client.ChangeUserState(i, MultiplayerUserState.Ready);
+                }
+            });
+        }
     }
 }
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantsList.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantsList.cs
index d4c32d9189..218c2cabb7 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantsList.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantsList.cs
@@ -24,6 +24,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Participants
                 Child = new OsuScrollContainer
                 {
                     RelativeSizeAxes = Axes.Both,
+                    ScrollbarVisible = false,
                     Child = panels = new FillFlowContainer<ParticipantPanel>
                     {
                         RelativeSizeAxes = Axes.X,

From e4a54dc6cdccdf17b1e950fe1abf0424e9c28485 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 02:52:51 +0900
Subject: [PATCH 0367/3722] Renamespace ready button

---
 osu.Game/Screens/Multi/{Match => }/Components/ReadyButton.cs | 2 +-
 osu.Game/Screens/Multi/Match/Components/Footer.cs            | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename osu.Game/Screens/Multi/{Match => }/Components/ReadyButton.cs (98%)

diff --git a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs b/osu.Game/Screens/Multi/Components/ReadyButton.cs
similarity index 98%
rename from osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
rename to osu.Game/Screens/Multi/Components/ReadyButton.cs
index a64f24dd7e..6d12111d8f 100644
--- a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
+++ b/osu.Game/Screens/Multi/Components/ReadyButton.cs
@@ -11,7 +11,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 
-namespace osu.Game.Screens.Multi.Match.Components
+namespace osu.Game.Screens.Multi.Components
 {
     public class ReadyButton : TriangleButton
     {
diff --git a/osu.Game/Screens/Multi/Match/Components/Footer.cs b/osu.Game/Screens/Multi/Match/Components/Footer.cs
index be4ee873fa..4ec8628d2b 100644
--- a/osu.Game/Screens/Multi/Match/Components/Footer.cs
+++ b/osu.Game/Screens/Multi/Match/Components/Footer.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Screens.Multi.Components;
 using osuTK;
 
 namespace osu.Game.Screens.Multi.Match.Components

From 4e0113afbf51e5d9be43e73b1fee714a21c04ee1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 02:55:48 +0900
Subject: [PATCH 0368/3722] Abstractify ready button and add a timeshift
 implementation

---
 .../Screens/Multi/Components/ReadyButton.cs   | 24 +++---------
 .../Screens/Multi/Match/Components/Footer.cs  |  4 +-
 .../Multi/Timeshift/TimeshiftReadyButton.cs   | 38 +++++++++++++++++++
 3 files changed, 46 insertions(+), 20 deletions(-)
 create mode 100644 osu.Game/Screens/Multi/Timeshift/TimeshiftReadyButton.cs

diff --git a/osu.Game/Screens/Multi/Components/ReadyButton.cs b/osu.Game/Screens/Multi/Components/ReadyButton.cs
index 6d12111d8f..0bb4ed8617 100644
--- a/osu.Game/Screens/Multi/Components/ReadyButton.cs
+++ b/osu.Game/Screens/Multi/Components/ReadyButton.cs
@@ -13,26 +13,20 @@ using osu.Game.Online.Multiplayer;
 
 namespace osu.Game.Screens.Multi.Components
 {
-    public class ReadyButton : TriangleButton
+    public abstract class ReadyButton : TriangleButton
     {
         public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
 
-        [Resolved(typeof(Room), nameof(Room.EndDate))]
-        private Bindable<DateTimeOffset> endDate { get; set; }
+        public new readonly BindableBool Enabled = new BindableBool();
 
         [Resolved]
-        private IBindable<WorkingBeatmap> gameBeatmap { get; set; }
+        protected IBindable<WorkingBeatmap> GameBeatmap { get; private set; }
 
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 
         private bool hasBeatmap;
 
-        public ReadyButton()
-        {
-            Text = "Start";
-        }
-
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
         private IBindable<WeakReference<BeatmapSetInfo>> managerRemoved;
 
@@ -45,10 +39,6 @@ namespace osu.Game.Screens.Multi.Components
             managerRemoved.BindValueChanged(beatmapRemoved);
 
             SelectedItem.BindValueChanged(item => updateSelectedItem(item.NewValue), true);
-
-            BackgroundColour = colours.Green;
-            Triangles.ColourDark = colours.Green;
-            Triangles.ColourLight = colours.GreenLight;
         }
 
         private void updateSelectedItem(PlaylistItem item)
@@ -94,15 +84,13 @@ namespace osu.Game.Screens.Multi.Components
 
         private void updateEnabledState()
         {
-            if (gameBeatmap.Value == null || SelectedItem.Value == null)
+            if (GameBeatmap.Value == null || SelectedItem.Value == null)
             {
-                Enabled.Value = false;
+                base.Enabled.Value = false;
                 return;
             }
 
-            bool hasEnoughTime = DateTimeOffset.UtcNow.AddSeconds(30).AddMilliseconds(gameBeatmap.Value.Track.Length) < endDate.Value;
-
-            Enabled.Value = hasBeatmap && hasEnoughTime;
+            base.Enabled.Value = hasBeatmap && Enabled.Value;
         }
     }
 }
diff --git a/osu.Game/Screens/Multi/Match/Components/Footer.cs b/osu.Game/Screens/Multi/Match/Components/Footer.cs
index 4ec8628d2b..d6a7e380bf 100644
--- a/osu.Game/Screens/Multi/Match/Components/Footer.cs
+++ b/osu.Game/Screens/Multi/Match/Components/Footer.cs
@@ -10,7 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.Multi.Timeshift;
 using osuTK;
 
 namespace osu.Game.Screens.Multi.Match.Components
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Multi.Match.Components
             InternalChildren = new[]
             {
                 background = new Box { RelativeSizeAxes = Axes.Both },
-                new ReadyButton
+                new TimeshiftReadyButton
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftReadyButton.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftReadyButton.cs
new file mode 100644
index 0000000000..b6698b195c
--- /dev/null
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftReadyButton.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;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Game.Graphics;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Screens.Multi.Components;
+
+namespace osu.Game.Screens.Multi.Timeshift
+{
+    public class TimeshiftReadyButton : ReadyButton
+    {
+        [Resolved(typeof(Room), nameof(Room.EndDate))]
+        private Bindable<DateTimeOffset?> endDate { get; set; }
+
+        public TimeshiftReadyButton()
+        {
+            Text = "Start";
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            BackgroundColour = colours.Green;
+            Triangles.ColourDark = colours.Green;
+            Triangles.ColourLight = colours.GreenLight;
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            Enabled.Value = endDate.Value == null || DateTimeOffset.UtcNow.AddSeconds(30).AddMilliseconds(GameBeatmap.Value.Track.Length) < endDate.Value;
+        }
+    }
+}

From 6efe24695b2cf930f554fd72cd9c5c51214abf6f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 02:59:11 +0900
Subject: [PATCH 0369/3722] Add the realtime multiplayer ready button

---
 .../TestSceneRealtimeReadyButton.cs           | 129 ++++++++++++++++++
 .../RealtimeReadyButton.cs                    | 122 +++++++++++++++++
 2 files changed, 251 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeReadyButton.cs

diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs
new file mode 100644
index 0000000000..889c0c0be3
--- /dev/null
+++ b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.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.Linq;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Graphics;
+using osu.Framework.Platform;
+using osu.Game.Beatmaps;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Rulesets;
+using osu.Game.Screens.Multi.RealtimeMultiplayer;
+using osu.Game.Tests.Resources;
+using osu.Game.Users;
+using osuTK;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Visual.RealtimeMultiplayer
+{
+    public class TestSceneRealtimeReadyButton : RealtimeMultiplayerTestScene
+    {
+        private RealtimeReadyButton button;
+
+        private BeatmapManager beatmaps;
+        private RulesetStore rulesets;
+
+        [BackgroundDependencyLoader]
+        private void load(GameHost host, AudioManager audio)
+        {
+            Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
+            Dependencies.Cache(beatmaps = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, host, Beatmap.Default));
+            beatmaps.Import(TestResources.GetTestBeatmapForImport(true)).Wait();
+        }
+
+        [SetUp]
+        public new void Setup() => Schedule(() =>
+        {
+            var beatmap = beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.All).First().Beatmaps.First();
+
+            Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmap);
+
+            Child = button = new RealtimeReadyButton
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Size = new Vector2(200, 50),
+                SelectedItem =
+                {
+                    Value = new PlaylistItem
+                    {
+                        Beatmap = { Value = beatmap },
+                        Ruleset = { Value = beatmap.Ruleset }
+                    }
+                }
+            };
+
+            Client.AddUser(API.LocalUser.Value);
+        });
+
+        [Test]
+        public void TestToggleStateWhenNotHost()
+        {
+            AddStep("add second user as host", () =>
+            {
+                Client.AddUser(new User { Id = 2, Username = "Another user" });
+                Client.TransferHost(2);
+            });
+
+            addClickButtonStep();
+            AddAssert("user is ready", () => Client.Room?.Users[0].State == MultiplayerUserState.Ready);
+
+            addClickButtonStep();
+            AddAssert("user is idle", () => Client.Room?.Users[0].State == MultiplayerUserState.Idle);
+        }
+
+        [TestCase(true)]
+        [TestCase(false)]
+        public void TestToggleStateWhenHost(bool allReady)
+        {
+            AddStep("setup", () =>
+            {
+                Client.TransferHost(Client.Room?.Users[0].UserID ?? 0);
+
+                if (!allReady)
+                    Client.AddUser(new User { Id = 2, Username = "Another user" });
+            });
+
+            addClickButtonStep();
+            AddAssert("user is ready", () => Client.Room?.Users[0].State == MultiplayerUserState.Ready);
+
+            addClickButtonStep();
+            AddAssert("match started", () => Client.Room?.Users[0].State == MultiplayerUserState.WaitingForLoad);
+        }
+
+        [Test]
+        public void TestBecomeHostWhileReady()
+        {
+            addClickButtonStep();
+            AddStep("make user host", () => Client.TransferHost(Client.Room?.Users[0].UserID ?? 0));
+
+            addClickButtonStep();
+            AddAssert("match started", () => Client.Room?.Users[0].State == MultiplayerUserState.WaitingForLoad);
+        }
+
+        [Test]
+        public void TestLoseHostWhileReady()
+        {
+            AddStep("setup", () =>
+            {
+                Client.TransferHost(Client.Room?.Users[0].UserID ?? 0);
+                Client.AddUser(new User { Id = 2, Username = "Another user" });
+            });
+
+            addClickButtonStep();
+            AddStep("transfer host", () => Client.TransferHost(Client.Room?.Users[1].UserID ?? 0));
+
+            addClickButtonStep();
+            AddAssert("match not started", () => Client.Room?.Users[0].State == MultiplayerUserState.Idle);
+        }
+
+        private void addClickButtonStep() => AddStep("click button", () =>
+        {
+            InputManager.MoveMouseTo(button);
+            InputManager.Click(MouseButton.Left);
+        });
+    }
+}
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeReadyButton.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeReadyButton.cs
new file mode 100644
index 0000000000..d52df258ad
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeReadyButton.cs
@@ -0,0 +1,122 @@
+// Copyright (c) ppy 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 JetBrains.Annotations;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Backgrounds;
+using osu.Game.Online.API;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Screens.Multi.Components;
+using osuTK;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+{
+    public class RealtimeReadyButton : RealtimeRoomComposite
+    {
+        public Bindable<PlaylistItem> SelectedItem => button.SelectedItem;
+
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        [CanBeNull]
+        private MultiplayerRoomUser localUser;
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        private readonly ButtonWithTrianglesExposed button;
+
+        public RealtimeReadyButton()
+        {
+            InternalChild = button = new ButtonWithTrianglesExposed
+            {
+                RelativeSizeAxes = Axes.Both,
+                Size = Vector2.One,
+                Enabled = { Value = true },
+                Action = onClick
+            };
+        }
+
+        protected override void OnRoomChanged()
+        {
+            base.OnRoomChanged();
+
+            localUser = Room?.Users.Single(u => u.User?.Id == api.LocalUser.Value.Id);
+            button.Enabled.Value = Client.Room?.State == MultiplayerRoomState.Open;
+            updateState();
+        }
+
+        private void updateState()
+        {
+            if (localUser == null)
+                return;
+
+            Debug.Assert(Room != null);
+
+            switch (localUser.State)
+            {
+                case MultiplayerUserState.Idle:
+                    button.Text = "Ready";
+                    updateButtonColour(true);
+                    break;
+
+                case MultiplayerUserState.Ready:
+                    if (Room?.Host?.Equals(localUser) == true)
+                    {
+                        button.Text = "Let's go!";
+                        updateButtonColour(Room.Users.All(u => u.State == MultiplayerUserState.Ready));
+                    }
+                    else
+                    {
+                        button.Text = "Waiting for host...";
+                        updateButtonColour(false);
+                    }
+
+                    break;
+            }
+        }
+
+        private void updateButtonColour(bool green)
+        {
+            if (green)
+            {
+                button.BackgroundColour = colours.Green;
+                button.Triangles.ColourDark = colours.Green;
+                button.Triangles.ColourLight = colours.GreenLight;
+            }
+            else
+            {
+                button.BackgroundColour = colours.YellowDark;
+                button.Triangles.ColourDark = colours.YellowDark;
+                button.Triangles.ColourLight = colours.Yellow;
+            }
+        }
+
+        private void onClick()
+        {
+            if (localUser == null)
+                return;
+
+            if (localUser.State == MultiplayerUserState.Idle)
+                Client.ChangeState(MultiplayerUserState.Ready);
+            else
+            {
+                if (Room?.Host?.Equals(localUser) == true)
+                    Client.StartMatch();
+                else
+                    Client.ChangeState(MultiplayerUserState.Idle);
+            }
+        }
+
+        private class ButtonWithTrianglesExposed : ReadyButton
+        {
+            public new Triangles Triangles => base.Triangles;
+        }
+    }
+}

From cc22efaa6babc4592a06a34f6affb226caea56cb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 03:17:04 +0900
Subject: [PATCH 0370/3722] Use tcs instead of delay-wait

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

diff --git a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
index e106dc3a1c..2b7ca189ee 100644
--- a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
+++ b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
@@ -107,25 +107,23 @@ namespace osu.Game.Screens.Multi.Play
         {
             Debug.Assert(token != null);
 
-            bool completed = false;
+            var tcs = new TaskCompletionSource<bool>();
             var request = new SubmitRoomScoreRequest(token.Value, roomId.Value ?? 0, playlistItem.ID, score.ScoreInfo);
 
             request.Success += s =>
             {
                 score.ScoreInfo.OnlineScoreID = s.ID;
-                completed = true;
+                tcs.SetResult(true);
             };
 
             request.Failure += e =>
             {
                 Logger.Error(e, "Failed to submit score");
-                completed = true;
+                tcs.SetResult(false);
             };
 
             api.Queue(request);
-
-            while (!completed)
-                await Task.Delay(100);
+            await tcs.Task;
 
             return await base.SubmitScore(score);
         }

From 772dd0287e4932e232d4f6c033b7246f740d3541 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 19 Dec 2020 03:32:05 +0900
Subject: [PATCH 0371/3722] Split submission and import into two methods

---
 .../Screens/Multi/Play/TimeshiftPlayer.cs     |  6 ++--
 osu.Game/Screens/Play/Player.cs               | 33 ++++++++++++++-----
 osu.Game/Screens/Play/ReplayPlayer.cs         |  3 +-
 3 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
index 2b7ca189ee..41dcf61740 100644
--- a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
+++ b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
@@ -103,8 +103,10 @@ namespace osu.Game.Screens.Multi.Play
             return score;
         }
 
-        protected override async Task<ScoreInfo> SubmitScore(Score score)
+        protected override async Task SubmitScore(Score score)
         {
+            await base.SubmitScore(score);
+
             Debug.Assert(token != null);
 
             var tcs = new TaskCompletionSource<bool>();
@@ -124,8 +126,6 @@ namespace osu.Game.Screens.Multi.Play
 
             api.Queue(request);
             await tcs.Task;
-
-            return await base.SubmitScore(score);
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index c8f1980ab1..a83f0e1b33 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -537,13 +537,23 @@ namespace osu.Game.Screens.Play
 
                 try
                 {
-                    return await SubmitScore(score);
+                    await SubmitScore(score);
                 }
                 catch (Exception ex)
                 {
                     Logger.Error(ex, "Score submission failed!");
-                    return score.ScoreInfo;
                 }
+
+                try
+                {
+                    await ImportScore(score);
+                }
+                catch (Exception ex)
+                {
+                    Logger.Error(ex, "Score import failed!");
+                }
+
+                return score.ScoreInfo;
             });
 
             using (BeginDelayedSequence(RESULTS_DISPLAY_DELAY))
@@ -792,15 +802,15 @@ namespace osu.Game.Screens.Play
         }
 
         /// <summary>
-        /// Submits the player's <see cref="Score"/>.
+        /// Imports the player's <see cref="Score"/> to the local database.
         /// </summary>
-        /// <param name="score">The <see cref="Score"/> to submit.</param>
-        /// <returns>The submitted score.</returns>
-        protected virtual async Task<ScoreInfo> SubmitScore(Score score)
+        /// <param name="score">The <see cref="Score"/> to import.</param>
+        /// <returns>The imported score.</returns>
+        protected virtual async Task ImportScore(Score score)
         {
             // Replays are already populated and present in the game's database, so should not be re-imported.
             if (DrawableRuleset.ReplayScore != null)
-                return score.ScoreInfo;
+                return;
 
             LegacyByteArrayReader replayReader;
 
@@ -810,9 +820,16 @@ namespace osu.Game.Screens.Play
                 replayReader = new LegacyByteArrayReader(stream.ToArray(), "replay.osr");
             }
 
-            return await scoreManager.Import(score.ScoreInfo, replayReader);
+            await scoreManager.Import(score.ScoreInfo, replayReader);
         }
 
+        /// <summary>
+        /// Submits the player's <see cref="Score"/>.
+        /// </summary>
+        /// <param name="score">The <see cref="Score"/> to submit.</param>
+        /// <returns>The submitted score.</returns>
+        protected virtual Task SubmitScore(Score score) => Task.CompletedTask;
+
         /// <summary>
         /// Creates the <see cref="ResultsScreen"/> for a <see cref="ScoreInfo"/>.
         /// </summary>
diff --git a/osu.Game/Screens/Play/ReplayPlayer.cs b/osu.Game/Screens/Play/ReplayPlayer.cs
index 390d1d1959..a07213cb33 100644
--- a/osu.Game/Screens/Play/ReplayPlayer.cs
+++ b/osu.Game/Screens/Play/ReplayPlayer.cs
@@ -37,7 +37,8 @@ namespace osu.Game.Screens.Play
             return Score;
         }
 
-        protected override Task<ScoreInfo> SubmitScore(Score score) => Task.FromResult(score.ScoreInfo);
+        // Don't re-import replay scores as they're already present in the database.
+        protected override Task ImportScore(Score score) => Task.CompletedTask;
 
         protected override ResultsScreen CreateResults(ScoreInfo score) => new SoloResultsScreen(score, false);
 

From f1878eff639bce6d336008cc85e4a4b2c8260bf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 18 Dec 2020 23:45:42 +0100
Subject: [PATCH 0372/3722] Use yet another solution leveraging padding

---
 .../Edit/Compose/Components/SelectionBox.cs   | 26 ++++++-------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index 85e86499be..2f4721f63e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.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.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -93,6 +92,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
         }
 
+        private Container dragHandles;
         private FillFlowContainer buttons;
 
         public const float BORDER_RADIUS = 3;
@@ -152,6 +152,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
                         },
                     }
                 },
+                dragHandles = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    // ensures that the centres of all drag handles line up with the middle of the selection box border.
+                    Padding = new MarginPadding(BORDER_RADIUS / 2)
+                },
                 buttons = new FillFlowContainer
                 {
                     Y = 20,
@@ -233,30 +239,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
             });
         }
 
-        private void addDragHandle(Anchor anchor) => AddInternal(new SelectionBoxDragHandle
+        private void addDragHandle(Anchor anchor) => dragHandles.Add(new SelectionBoxDragHandle
         {
             Anchor = anchor,
-            X = dragCircleAdjustments[anchor].X,
-            Y = dragCircleAdjustments[anchor].Y,
             HandleDrag = e => OnScale?.Invoke(e.Delta, anchor),
             OperationStarted = operationStarted,
             OperationEnded = operationEnded
         });
 
-        /// <summary>
-        /// Adjust Drag circle to be centered on the center of the border instead of on the edge.
-        /// </summary>
-        private Dictionary<Anchor, Vector2> dragCircleAdjustments = new Dictionary<Anchor, Vector2>(){
-            {Anchor.TopLeft, new Vector2(BORDER_RADIUS / 2)},
-            {Anchor.CentreLeft, new Vector2(BORDER_RADIUS / 2, 0)},
-            {Anchor.BottomLeft, new Vector2(BORDER_RADIUS / 2, -BORDER_RADIUS / 2)},
-            {Anchor.TopCentre, new Vector2(0, BORDER_RADIUS / 2)},
-            {Anchor.BottomCentre, new Vector2(0, -BORDER_RADIUS / 2)},
-            {Anchor.TopRight, new Vector2(-BORDER_RADIUS / 2, BORDER_RADIUS / 2)},
-            {Anchor.CentreRight, new Vector2(-BORDER_RADIUS / 2, 0)},
-            {Anchor.BottomRight, new Vector2(-BORDER_RADIUS / 2)}
-        };
-
         private int activeOperations;
 
         private float convertDragEventToAngleOfRotation(DragEvent e)

From beaced321153867f0ae9c1d39af5a82848e2ced0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 19 Dec 2020 13:58:56 +0900
Subject: [PATCH 0373/3722] Remove unnecessary async state machine

---
 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 a83f0e1b33..c539dff5d9 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -806,11 +806,11 @@ namespace osu.Game.Screens.Play
         /// </summary>
         /// <param name="score">The <see cref="Score"/> to import.</param>
         /// <returns>The imported score.</returns>
-        protected virtual async Task ImportScore(Score score)
+        protected virtual Task ImportScore(Score score)
         {
             // Replays are already populated and present in the game's database, so should not be re-imported.
             if (DrawableRuleset.ReplayScore != null)
-                return;
+                return Task.CompletedTask;
 
             LegacyByteArrayReader replayReader;
 
@@ -820,7 +820,7 @@ namespace osu.Game.Screens.Play
                 replayReader = new LegacyByteArrayReader(stream.ToArray(), "replay.osr");
             }
 
-            await scoreManager.Import(score.ScoreInfo, replayReader);
+            return scoreManager.Import(score.ScoreInfo, replayReader);
         }
 
         /// <summary>

From 926281831b85353c1ddf878167abfbbad965a56f Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sat, 19 Dec 2020 10:36:27 +0100
Subject: [PATCH 0374/3722] Fix missing  XMLDoc bit.

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

diff --git a/osu.Game/Database/ICanAcceptFiles.cs b/osu.Game/Database/ICanAcceptFiles.cs
index 5ec187975a..74fd6fcc36 100644
--- a/osu.Game/Database/ICanAcceptFiles.cs
+++ b/osu.Game/Database/ICanAcceptFiles.cs
@@ -20,6 +20,7 @@ namespace osu.Game.Database
         /// <summary>
         /// Import the specified files from the given import tasks.
         /// </summary>
+        /// <param name="tasks">The import tasks from which the files should be imported.</param>
         Task Import(params ImportTask[] tasks);
 
         /// <summary>

From 4fba0c8e6a3279216294a5a75fa2f79687d0a0c1 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sat, 19 Dec 2020 10:55:39 +0100
Subject: [PATCH 0375/3722] Remove not used using statement.

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 4ebf7fbe63..e382ff5d48 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -51,7 +51,6 @@ using osu.Game.Screens.Select;
 using osu.Game.Updater;
 using osu.Game.Utils;
 using LogLevel = osu.Framework.Logging.LogLevel;
-using osu.Game.Users;
 using osu.Game.Database;
 
 namespace osu.Game

From 28ca21b432627ffb9d8058475bf969143dd71163 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 19 Dec 2020 14:50:09 +0100
Subject: [PATCH 0376/3722] Seal banned method & throw better exception

---
 osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index aa668cc4c8..d2d5594edd 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -40,9 +40,9 @@ namespace osu.Game.Screens.Play.HUD
             return drawable;
         }
 
-        public override void Add(GameplayLeaderboardScore drawable)
+        public sealed override void Add(GameplayLeaderboardScore drawable)
         {
-            throw new InvalidOperationException($"Use {nameof(AddPlayer)} instead.");
+            throw new NotSupportedException($"Use {nameof(AddPlayer)} instead.");
         }
 
         private void sort()

From 22a2c3efdf2f15944e7714da36ea11962345055d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 19 Dec 2020 14:55:58 +0100
Subject: [PATCH 0377/3722] Add back xmldoc of AddPlayer

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

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index d2d5594edd..cab1cbd3f1 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -24,6 +24,14 @@ namespace osu.Game.Screens.Play.HUD
             LayoutEasing = Easing.OutQuint;
         }
 
+        /// <summary>
+        /// Adds a player to the leaderboard.
+        /// </summary>
+        /// <param name="user">The player.</param>
+        /// <param name="isTracked">
+        /// Whether the player should be tracked on the leaderboard.
+        /// Set to <c>true</c> for the local player or a player whose replay is currently being played.
+        /// </param>
         public ILeaderboardScore AddPlayer(User user, bool isTracked)
         {
             var drawable = new GameplayLeaderboardScore(user, isTracked)

From d392e0f27e2444dfa8a21758a835ddbaef1842e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 19 Dec 2020 15:02:56 +0100
Subject: [PATCH 0378/3722] Extract shared rank-formatting helper

---
 osu.Game/Online/Leaderboards/LeaderboardScore.cs      | 4 ++--
 osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs | 3 +--
 osu.Game/Utils/FormatUtils.cs                         | 8 ++++++++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index dcd0cb435a..d8207aa8f4 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -24,8 +24,8 @@ using osu.Game.Scoring;
 using osu.Game.Users.Drawables;
 using osuTK;
 using osuTK.Graphics;
-using Humanizer;
 using osu.Game.Online.API;
+using osu.Game.Utils;
 
 namespace osu.Game.Online.Leaderboards
 {
@@ -358,7 +358,7 @@ namespace osu.Game.Online.Leaderboards
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     Font = OsuFont.GetFont(size: 20, italics: true),
-                    Text = rank == null ? "-" : rank.Value.ToMetric(decimals: rank < 100000 ? 1 : 0),
+                    Text = rank == null ? "-" : rank.Value.FormatRank()
                 };
             }
 
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index af3cb640bb..9684ae016c 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.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 Humanizer;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -49,7 +48,7 @@ namespace osu.Game.Screens.Play.HUD
                 scorePosition = value;
 
                 if (scorePosition.HasValue)
-                    positionText.Text = $"#{scorePosition.Value.ToMetric(decimals: scorePosition < 100000 ? 1 : 0)}";
+                    positionText.Text = $"#{scorePosition.Value.FormatRank()}";
 
                 positionText.FadeTo(scorePosition.HasValue ? 1 : 0);
                 updateColour();
diff --git a/osu.Game/Utils/FormatUtils.cs b/osu.Game/Utils/FormatUtils.cs
index f2ab99f4b7..2578d8d835 100644
--- a/osu.Game/Utils/FormatUtils.cs
+++ b/osu.Game/Utils/FormatUtils.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 Humanizer;
+
 namespace osu.Game.Utils
 {
     public static class FormatUtils
@@ -18,5 +20,11 @@ namespace osu.Game.Utils
         /// <param name="accuracy">The accuracy to be formatted</param>
         /// <returns>formatted accuracy in percentage</returns>
         public static string FormatAccuracy(this decimal accuracy) => $"{accuracy:0.00}%";
+
+        /// <summary>
+        /// Formats the supplied rank/leaderboard position in a consistent, simplified way.
+        /// </summary>
+        /// <param name="rank">The rank/position to be formatted.</param>
+        public static string FormatRank(this int rank) => rank.ToMetric(decimals: rank < 100_000 ? 1 : 0);
     }
 }

From e2cc401c124b631c8ade6bde8120e71c44c3e2ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 19 Dec 2020 15:05:59 +0100
Subject: [PATCH 0379/3722] Move BDL above LoadComplete()

---
 .../Play/HUD/GameplayLeaderboardScore.cs      | 106 +++++++++---------
 1 file changed, 53 insertions(+), 53 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 9684ae016c..d510ea5f8b 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -75,59 +75,6 @@ namespace osu.Game.Screens.Play.HUD
             Size = new Vector2(EXTENDED_WIDTH, PANEL_HEIGHT);
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            updateColour();
-            FinishTransforms(true);
-        }
-
-        private const double transition_duration = 500;
-
-        private void updateColour()
-        {
-            if (scorePosition == 1)
-            {
-                mainFillContainer.ResizeWidthTo(EXTENDED_WIDTH, transition_duration, Easing.OutElastic);
-                panelColour = Color4Extensions.FromHex("7fcc33");
-                textColour = Color4.White;
-            }
-            else if (trackedPlayer)
-            {
-                mainFillContainer.ResizeWidthTo(EXTENDED_WIDTH, transition_duration, Easing.OutElastic);
-                panelColour = Color4Extensions.FromHex("ffd966");
-                textColour = Color4Extensions.FromHex("2e576b");
-            }
-            else
-            {
-                mainFillContainer.ResizeWidthTo(regular_width, transition_duration, Easing.OutElastic);
-                panelColour = Color4Extensions.FromHex("3399cc");
-                textColour = Color4.White;
-            }
-        }
-
-        private Color4 panelColour
-        {
-            set
-            {
-                mainFillContainer.FadeColour(value, transition_duration, Easing.OutQuint);
-                centralFill.FadeColour(value, transition_duration, Easing.OutQuint);
-            }
-        }
-
-        private Color4 textColour
-        {
-            set
-            {
-                scoreText.FadeColour(value, 200, Easing.OutQuint);
-                accuracyText.FadeColour(value, 200, Easing.OutQuint);
-                comboText.FadeColour(value, 200, Easing.OutQuint);
-                usernameText.FadeColour(value, 200, Easing.OutQuint);
-                positionText.FadeColour(value, 200, Easing.OutQuint);
-            }
-        }
-
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
@@ -284,5 +231,58 @@ namespace osu.Game.Screens.Play.HUD
             Accuracy.BindValueChanged(v => accuracyText.Text = v.NewValue.FormatAccuracy(), true);
             Combo.BindValueChanged(v => comboText.Text = $"{v.NewValue}x", true);
         }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            updateColour();
+            FinishTransforms(true);
+        }
+
+        private const double transition_duration = 500;
+
+        private void updateColour()
+        {
+            if (scorePosition == 1)
+            {
+                mainFillContainer.ResizeWidthTo(EXTENDED_WIDTH, transition_duration, Easing.OutElastic);
+                panelColour = Color4Extensions.FromHex("7fcc33");
+                textColour = Color4.White;
+            }
+            else if (trackedPlayer)
+            {
+                mainFillContainer.ResizeWidthTo(EXTENDED_WIDTH, transition_duration, Easing.OutElastic);
+                panelColour = Color4Extensions.FromHex("ffd966");
+                textColour = Color4Extensions.FromHex("2e576b");
+            }
+            else
+            {
+                mainFillContainer.ResizeWidthTo(regular_width, transition_duration, Easing.OutElastic);
+                panelColour = Color4Extensions.FromHex("3399cc");
+                textColour = Color4.White;
+            }
+        }
+
+        private Color4 panelColour
+        {
+            set
+            {
+                mainFillContainer.FadeColour(value, transition_duration, Easing.OutQuint);
+                centralFill.FadeColour(value, transition_duration, Easing.OutQuint);
+            }
+        }
+
+        private Color4 textColour
+        {
+            set
+            {
+                scoreText.FadeColour(value, 200, Easing.OutQuint);
+                accuracyText.FadeColour(value, 200, Easing.OutQuint);
+                comboText.FadeColour(value, 200, Easing.OutQuint);
+                usernameText.FadeColour(value, 200, Easing.OutQuint);
+                positionText.FadeColour(value, 200, Easing.OutQuint);
+            }
+        }
     }
 }

From 315a957a0ca3ad242671e49ec73a27e05e1432b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 19 Dec 2020 15:17:31 +0100
Subject: [PATCH 0380/3722] Extract constant for text transition duration

---
 .../Screens/Play/HUD/GameplayLeaderboardScore.cs     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index d510ea5f8b..cff3a1fc66 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -273,15 +273,17 @@ namespace osu.Game.Screens.Play.HUD
             }
         }
 
+        private const double text_transition_duration = 200;
+
         private Color4 textColour
         {
             set
             {
-                scoreText.FadeColour(value, 200, Easing.OutQuint);
-                accuracyText.FadeColour(value, 200, Easing.OutQuint);
-                comboText.FadeColour(value, 200, Easing.OutQuint);
-                usernameText.FadeColour(value, 200, Easing.OutQuint);
-                positionText.FadeColour(value, 200, Easing.OutQuint);
+                scoreText.FadeColour(value, text_transition_duration, Easing.OutQuint);
+                accuracyText.FadeColour(value, text_transition_duration, Easing.OutQuint);
+                comboText.FadeColour(value, text_transition_duration, Easing.OutQuint);
+                usernameText.FadeColour(value, text_transition_duration, Easing.OutQuint);
+                positionText.FadeColour(value, text_transition_duration, Easing.OutQuint);
             }
         }
     }

From 06a17a9d8cb9c94dd886e2b1e80992436521f42d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 19 Dec 2020 15:18:05 +0100
Subject: [PATCH 0381/3722] Rename other constant to be distinguishable

---
 .../Screens/Play/HUD/GameplayLeaderboardScore.cs     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index cff3a1fc66..b93db09f71 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -240,25 +240,25 @@ namespace osu.Game.Screens.Play.HUD
             FinishTransforms(true);
         }
 
-        private const double transition_duration = 500;
+        private const double panel_transition_duration = 500;
 
         private void updateColour()
         {
             if (scorePosition == 1)
             {
-                mainFillContainer.ResizeWidthTo(EXTENDED_WIDTH, transition_duration, Easing.OutElastic);
+                mainFillContainer.ResizeWidthTo(EXTENDED_WIDTH, panel_transition_duration, Easing.OutElastic);
                 panelColour = Color4Extensions.FromHex("7fcc33");
                 textColour = Color4.White;
             }
             else if (trackedPlayer)
             {
-                mainFillContainer.ResizeWidthTo(EXTENDED_WIDTH, transition_duration, Easing.OutElastic);
+                mainFillContainer.ResizeWidthTo(EXTENDED_WIDTH, panel_transition_duration, Easing.OutElastic);
                 panelColour = Color4Extensions.FromHex("ffd966");
                 textColour = Color4Extensions.FromHex("2e576b");
             }
             else
             {
-                mainFillContainer.ResizeWidthTo(regular_width, transition_duration, Easing.OutElastic);
+                mainFillContainer.ResizeWidthTo(regular_width, panel_transition_duration, Easing.OutElastic);
                 panelColour = Color4Extensions.FromHex("3399cc");
                 textColour = Color4.White;
             }
@@ -268,8 +268,8 @@ namespace osu.Game.Screens.Play.HUD
         {
             set
             {
-                mainFillContainer.FadeColour(value, transition_duration, Easing.OutQuint);
-                centralFill.FadeColour(value, transition_duration, Easing.OutQuint);
+                mainFillContainer.FadeColour(value, panel_transition_duration, Easing.OutQuint);
+                centralFill.FadeColour(value, panel_transition_duration, Easing.OutQuint);
             }
         }
 

From c738a57b399b5f701fa314fb2dc01de43659c092 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 19 Dec 2020 18:48:17 +0100
Subject: [PATCH 0382/3722] Fix username overflow in new leaderboard design

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

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index b93db09f71..58281debf1 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -176,7 +176,7 @@ namespace osu.Game.Screens.Play.HUD
                                             usernameText = new OsuSpriteText
                                             {
                                                 RelativeSizeAxes = Axes.X,
-                                                Width = 0.8f,
+                                                Width = 0.6f,
                                                 Anchor = Anchor.CentreLeft,
                                                 Origin = Anchor.CentreLeft,
                                                 Colour = Color4.White,

From afa6a869545692f4abed538f7d5e20e70a37a3c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 19 Dec 2020 19:00:05 +0100
Subject: [PATCH 0383/3722] Remove unnecessary lookup incrementing

---
 .../Visual/Online/TestSceneCurrentlyPlayingDisplay.cs           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
index eaa881b02c..1666c9cde4 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Tests.Visual.Online
             protected override Task<User> ComputeValueAsync(int lookup, CancellationToken token = default)
                 => Task.FromResult(new User
                 {
-                    Id = lookup++,
+                    Id = lookup,
                     Username = usernames[lookup % usernames.Length],
                 });
         }

From ee33c0be93c16b61762edc6d85165fb5ec05fd93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 19 Dec 2020 19:08:29 +0100
Subject: [PATCH 0384/3722] Extract combo & accuracy ratio calculation helpers

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

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index f5fb918ba3..10d0cc2865 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -201,8 +201,8 @@ namespace osu.Game.Rulesets.Scoring
         private double getScore(ScoringMode mode)
         {
             return GetScore(mode, maxAchievableCombo,
-                maxBaseScore > 0 ? baseScore / maxBaseScore : 0,
-                maxAchievableCombo > 0 ? (double)HighestCombo.Value / maxAchievableCombo : 1,
+                calculateAccuracyRatio(baseScore),
+                calculateComboRatio(HighestCombo.Value),
                 scoreResultCounts);
         }
 
@@ -252,14 +252,17 @@ namespace osu.Game.Rulesets.Scoring
                 computedBaseScore += Judgement.ToNumericResult(pair.Key) * pair.Value;
             }
 
-            double accuracy = maxBaseScore > 0 ? computedBaseScore / maxBaseScore : 0;
-            double comboRatio = maxAchievableCombo > 0 ? (double)maxCombo / maxAchievableCombo : 1;
+            double accuracy = calculateAccuracyRatio(computedBaseScore);
+            double comboRatio = calculateComboRatio(maxCombo);
 
             double score = GetScore(mode, maxAchievableCombo, accuracy, comboRatio, scoreResultCounts);
 
             return (score, accuracy);
         }
 
+        private double calculateAccuracyRatio(double baseScore) => maxBaseScore > 0 ? baseScore / maxBaseScore : 0;
+        private double calculateComboRatio(int maxCombo) => maxAchievableCombo > 0 ? (double)maxCombo / maxAchievableCombo : 1;
+
         private double getBonusScore(Dictionary<HitResult, int> statistics)
             => statistics.GetOrDefault(HitResult.SmallBonus) * Judgement.SMALL_BONUS_SCORE
                + statistics.GetOrDefault(HitResult.LargeBonus) * Judgement.LARGE_BONUS_SCORE;

From 631a0cea41e7e21b1ab592bc80fa748c733a22d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 19 Dec 2020 21:25:04 +0100
Subject: [PATCH 0385/3722] Fix intended random factor not being random in test

---
 .../Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
index 0c8d8ca165..0ca1d9008b 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -109,7 +109,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 foreach (var userId in PlayingUsers)
                 {
-                    if (RNG.Next(0, 1) == 1)
+                    if (RNG.NextBool())
                         continue;
 
                     if (!lastHeaders.TryGetValue(userId, out var header))

From f827b6c030b3cbde588effdd908b3138eff827fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 19 Dec 2020 21:26:40 +0100
Subject: [PATCH 0386/3722] Use terser dictionary initialiser syntax

---
 .../TestSceneMultiplayerGameplayLeaderboard.cs         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
index 0ca1d9008b..e42ddeb35e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -116,12 +116,12 @@ namespace osu.Game.Tests.Visual.Gameplay
                     {
                         lastHeaders[userId] = header = new FrameHeader(new ScoreInfo
                         {
-                            Statistics = new Dictionary<HitResult, int>(new[]
+                            Statistics = new Dictionary<HitResult, int>
                             {
-                                new KeyValuePair<HitResult, int>(HitResult.Miss, 0),
-                                new KeyValuePair<HitResult, int>(HitResult.Meh, 0),
-                                new KeyValuePair<HitResult, int>(HitResult.Great, 0)
-                            })
+                                [HitResult.Miss] = 0,
+                                [HitResult.Meh] = 0,
+                                [HitResult.Great] = 0
+                            }
                         });
                     }
 

From 4e5064c4f611de5704982e8dbbe670a247814f23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 19 Dec 2020 21:31:17 +0100
Subject: [PATCH 0387/3722] Start accuracy at 1

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

diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index c96f496cd0..12321de442 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -108,7 +108,7 @@ namespace osu.Game.Screens.Play.HUD
 
             public IBindableNumber<double> Accuracy => accuracy;
 
-            private readonly BindableDouble accuracy = new BindableDouble();
+            private readonly BindableDouble accuracy = new BindableDouble(1);
 
             public IBindableNumber<int> CurrentCombo => currentCombo;
 

From b87f89986a5b2bb5fd73a43ba04459df84f92417 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sat, 19 Dec 2020 16:57:25 -0800
Subject: [PATCH 0388/3722] Fix selected item not being highlighted on some
 setting dropdowns

---
 .../Settings/Sections/Graphics/LayoutSettings.cs      |  3 +--
 .../Sections/UserInterface/MainMenuSettings.cs        | 11 +++--------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index 62dc1dc806..3df2a78552 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -59,11 +59,10 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
 
             Children = new Drawable[]
             {
-                windowModeDropdown = new SettingsDropdown<WindowMode>
+                windowModeDropdown = new SettingsEnumDropdown<WindowMode>
                 {
                     LabelText = "Screen mode",
                     Current = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode),
-                    ItemSource = windowModes,
                 },
                 resolutionSettingsContainer = new Container
                 {
diff --git a/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs b/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
index 598b666642..95e2e9da30 100644
--- a/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy 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.Graphics;
 using osu.Game.Configuration;
@@ -28,23 +26,20 @@ namespace osu.Game.Overlays.Settings.Sections.UserInterface
                     LabelText = "osu! music theme",
                     Current = config.GetBindable<bool>(OsuSetting.MenuMusic)
                 },
-                new SettingsDropdown<IntroSequence>
+                new SettingsEnumDropdown<IntroSequence>
                 {
                     LabelText = "Intro sequence",
                     Current = config.GetBindable<IntroSequence>(OsuSetting.IntroSequence),
-                    Items = Enum.GetValues(typeof(IntroSequence)).Cast<IntroSequence>()
                 },
-                new SettingsDropdown<BackgroundSource>
+                new SettingsEnumDropdown<BackgroundSource>
                 {
                     LabelText = "Background source",
                     Current = config.GetBindable<BackgroundSource>(OsuSetting.MenuBackgroundSource),
-                    Items = Enum.GetValues(typeof(BackgroundSource)).Cast<BackgroundSource>()
                 },
-                new SettingsDropdown<SeasonalBackgroundMode>
+                new SettingsEnumDropdown<SeasonalBackgroundMode>
                 {
                     LabelText = "Seasonal backgrounds",
                     Current = config.GetBindable<SeasonalBackgroundMode>(OsuSetting.SeasonalBackgroundMode),
-                    Items = Enum.GetValues(typeof(SeasonalBackgroundMode)).Cast<SeasonalBackgroundMode>()
                 }
             };
         }

From 5b8e35c98cec02b359eb2cf598713638538d349a Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sat, 19 Dec 2020 16:57:42 -0800
Subject: [PATCH 0389/3722] Make settings dropdown abstract

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

diff --git a/osu.Game/Overlays/Settings/SettingsDropdown.cs b/osu.Game/Overlays/Settings/SettingsDropdown.cs
index 1175ddaab8..e1c6333aa0 100644
--- a/osu.Game/Overlays/Settings/SettingsDropdown.cs
+++ b/osu.Game/Overlays/Settings/SettingsDropdown.cs
@@ -9,7 +9,7 @@ using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Settings
 {
-    public class SettingsDropdown<T> : SettingsItem<T>
+    public abstract class SettingsDropdown<T> : SettingsItem<T>
     {
         protected new OsuDropdown<T> Control => (OsuDropdown<T>)base.Control;
 

From d20eb368f5f86a22bf91a9f8f9838ef862effbc5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 17:36:23 +0900
Subject: [PATCH 0390/3722] Make return into IEnumerable

---
 osu.Game/Screens/Multi/Components/RoomManager.cs         | 2 +-
 osu.Game/Screens/Multi/Timeshift/TimeshiftRoomManager.cs | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Multi/Components/RoomManager.cs b/osu.Game/Screens/Multi/Components/RoomManager.cs
index 46941dc58e..ffc5e94106 100644
--- a/osu.Game/Screens/Multi/Components/RoomManager.cs
+++ b/osu.Game/Screens/Multi/Components/RoomManager.cs
@@ -183,6 +183,6 @@ namespace osu.Game.Screens.Multi.Components
                 existing.CopyFrom(room);
         }
 
-        protected abstract RoomPollingComponent[] CreatePollingComponents();
+        protected abstract IEnumerable<RoomPollingComponent> CreatePollingComponents();
     }
 }
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomManager.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomManager.cs
index ba96721afc..d21f844e04 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomManager.cs
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomManager.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.Bindables;
 using osu.Game.Screens.Multi.Components;
 
@@ -11,7 +12,7 @@ namespace osu.Game.Screens.Multi.Timeshift
         public readonly Bindable<double> TimeBetweenListingPolls = new Bindable<double>();
         public readonly Bindable<double> TimeBetweenSelectionPolls = new Bindable<double>();
 
-        protected override RoomPollingComponent[] CreatePollingComponents() => new RoomPollingComponent[]
+        protected override IEnumerable<RoomPollingComponent> CreatePollingComponents() => new RoomPollingComponent[]
         {
             new ListingPollingComponent { TimeBetweenPolls = { BindTarget = TimeBetweenListingPolls } },
             new SelectionPollingComponent { TimeBetweenPolls = { BindTarget = TimeBetweenSelectionPolls } }

From 7c7f15089a6ee06b3e244fc03db8e7114e165cca Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 17:42:23 +0900
Subject: [PATCH 0391/3722] Make CreateRoomManager return the drawable version

---
 osu.Game/Screens/Multi/Multiplayer.cs                    | 8 ++++----
 osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index 5f61c5e635..837ccdf2e9 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Screens.Multi
         private readonly IBindable<bool> isIdle = new BindableBool();
 
         [Cached(Type = typeof(IRoomManager))]
-        protected IRoomManager RoomManager { get; private set; }
+        protected RoomManager RoomManager { get; private set; }
 
         [Cached]
         private readonly Bindable<Room> selectedRoom = new Bindable<Room>();
@@ -81,7 +81,7 @@ namespace osu.Game.Screens.Multi
             InternalChild = waves = new MultiplayerWaveContainer
             {
                 RelativeSizeAxes = Axes.Both,
-                Children = new[]
+                Children = new Drawable[]
                 {
                     new Box
                     {
@@ -136,7 +136,7 @@ namespace osu.Game.Screens.Multi
                         Origin = Anchor.TopRight,
                         Action = () => CreateRoom()
                     },
-                    (Drawable)(RoomManager = CreateRoomManager())
+                    RoomManager = CreateRoomManager()
                 }
             };
 
@@ -353,7 +353,7 @@ namespace osu.Game.Screens.Multi
             }
         }
 
-        protected abstract IRoomManager CreateRoomManager();
+        protected abstract RoomManager CreateRoomManager();
 
         private class MultiplayerWaveContainer : WaveContainer
         {
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
index 1ff9c670a8..d2d6a35a2e 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Logging;
 using osu.Framework.Screens;
+using osu.Game.Screens.Multi.Components;
 using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Match;
 
@@ -43,6 +44,6 @@ namespace osu.Game.Screens.Multi.Timeshift
             Logger.Log($"Polling adjusted (listing: {timeshiftManager.TimeBetweenListingPolls.Value}, selection: {timeshiftManager.TimeBetweenSelectionPolls.Value})");
         }
 
-        protected override IRoomManager CreateRoomManager() => new TimeshiftRoomManager();
+        protected override RoomManager CreateRoomManager() => new TimeshiftRoomManager();
     }
 }

From d74485704ae9c4a424bfb5fc5780b03e14f3f8be Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 17:46:45 +0900
Subject: [PATCH 0392/3722] Reset intial rooms received on filter change

---
 osu.Game/Screens/Multi/Components/ListingPollingComponent.cs | 2 ++
 osu.Game/Screens/Multi/Components/RoomPollingComponent.cs    | 5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Multi/Components/ListingPollingComponent.cs b/osu.Game/Screens/Multi/Components/ListingPollingComponent.cs
index e22f09779e..ebb3403950 100644
--- a/osu.Game/Screens/Multi/Components/ListingPollingComponent.cs
+++ b/osu.Game/Screens/Multi/Components/ListingPollingComponent.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Screens.Multi.Components
         {
             currentFilter.BindValueChanged(_ =>
             {
+                InitialRoomsReceived.Value = false;
+
                 if (IsLoaded)
                     PollImmediately();
             });
diff --git a/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs b/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs
index 5430d54644..a81a9540c3 100644
--- a/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs
+++ b/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs
@@ -21,8 +21,7 @@ namespace osu.Game.Screens.Multi.Components
         /// </summary>
         public new readonly Bindable<double> TimeBetweenPolls = new Bindable<double>();
 
-        public IBindable<bool> InitialRoomsReceived => initialRoomsReceived;
-        private readonly Bindable<bool> initialRoomsReceived = new Bindable<bool>();
+        public readonly Bindable<bool> InitialRoomsReceived = new Bindable<bool>();
 
         [Resolved]
         protected IAPIProvider API { get; private set; }
@@ -34,7 +33,7 @@ namespace osu.Game.Screens.Multi.Components
 
         protected void NotifyRoomsReceived(List<Room> rooms)
         {
-            initialRoomsReceived.Value = true;
+            InitialRoomsReceived.Value = true;
             RoomsReceived?.Invoke(rooms);
         }
     }

From 812a1d2b4f43cfb1eade5f22d9290bbe26d0fb27 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 18:03:30 +0900
Subject: [PATCH 0393/3722] Fix onSuccess callback potentially being called on
 failure

---
 .../Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index 4f73ee3865..1a6e976d15 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             Debug.Assert(room.RoomID.Value != null);
 
             var joinTask = multiplayerClient.JoinRoom(room);
-            joinTask.ContinueWith(_ => onSuccess?.Invoke(room));
+            joinTask.ContinueWith(_ => onSuccess?.Invoke(room), TaskContinuationOptions.OnlyOnRanToCompletion);
             joinTask.ContinueWith(t =>
             {
                 PartRoom();

From fb61cdfd417701b4cacfe1aefd4bb374e344c2e5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 18:05:43 +0900
Subject: [PATCH 0394/3722] Remove unnecessary first-frame polling + address
 concerns

---
 .../Screens/Multi/Components/RoomManager.cs     | 11 ++++++-----
 .../RealtimeMultiplayer/RealtimeRoomManager.cs  | 17 ++++++++++++-----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Multi/Components/RoomManager.cs b/osu.Game/Screens/Multi/Components/RoomManager.cs
index 21bff70b8b..7b419c9efe 100644
--- a/osu.Game/Screens/Multi/Components/RoomManager.cs
+++ b/osu.Game/Screens/Multi/Components/RoomManager.cs
@@ -27,7 +27,8 @@ namespace osu.Game.Screens.Multi.Components
 
         public IBindableList<Room> Rooms => rooms;
 
-        protected Room JoinedRoom { get; private set; }
+        protected IBindable<Room> JoinedRoom => joinedRoom;
+        private readonly Bindable<Room> joinedRoom = new Bindable<Room>();
 
         [Resolved]
         private RulesetStore rulesets { get; set; }
@@ -64,7 +65,7 @@ namespace osu.Game.Screens.Multi.Components
 
             req.Success += result =>
             {
-                JoinedRoom = room;
+                joinedRoom.Value = room;
 
                 update(room, result);
                 addRoom(room);
@@ -93,7 +94,7 @@ namespace osu.Game.Screens.Multi.Components
 
             currentJoinRoomRequest.Success += () =>
             {
-                JoinedRoom = room;
+                joinedRoom.Value = room;
                 onSuccess?.Invoke(room);
             };
 
@@ -114,8 +115,8 @@ namespace osu.Game.Screens.Multi.Components
             if (JoinedRoom == null)
                 return;
 
-            api.Queue(new PartRoomRequest(JoinedRoom));
-            JoinedRoom = null;
+            api.Queue(new PartRoomRequest(joinedRoom.Value));
+            joinedRoom.Value = null;
         }
 
         private readonly HashSet<int> ignoredRooms = new HashSet<int>();
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index 1a6e976d15..9e3c921d9e 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -30,7 +30,8 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             base.LoadComplete();
 
             isConnected.BindTo(multiplayerClient.IsConnected);
-            isConnected.BindValueChanged(_ => Schedule(updatePolling), true);
+            isConnected.BindValueChanged(_ => Schedule(updatePolling));
+            JoinedRoom.BindValueChanged(_ => updatePolling());
 
             updatePolling();
         }
@@ -46,7 +47,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             if (JoinedRoom == null)
                 return;
 
-            var joinedRoom = JoinedRoom;
+            var joinedRoom = JoinedRoom.Value;
 
             base.PartRoom();
             multiplayerClient.LeaveRoom().Wait();
@@ -77,7 +78,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
                 ClearRooms();
 
             // Don't poll when not connected or when a room has been joined.
-            allowPolling.Value = isConnected.Value && JoinedRoom == null;
+            allowPolling.Value = isConnected.Value && JoinedRoom.Value == null;
         }
 
         protected override RoomPollingComponent[] CreatePollingComponents() => new RoomPollingComponent[]
@@ -102,8 +103,11 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             {
                 base.LoadComplete();
 
-                AllowPolling.BindValueChanged(_ =>
+                AllowPolling.BindValueChanged(allowPolling =>
                 {
+                    if (!allowPolling.NewValue)
+                        return;
+
                     if (IsLoaded)
                         PollImmediately();
                 });
@@ -120,8 +124,11 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             {
                 base.LoadComplete();
 
-                AllowPolling.BindValueChanged(_ =>
+                AllowPolling.BindValueChanged(allowPolling =>
                 {
+                    if (!allowPolling.NewValue)
+                        return;
+
                     if (IsLoaded)
                         PollImmediately();
                 });

From 724e4b83fe266896bef4c10f9a51840cc36a24ae Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 18:19:41 +0900
Subject: [PATCH 0395/3722] Fix nullability and remove early check

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

diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
index 60960f4929..fe2f4c88f0 100644
--- a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
@@ -9,6 +9,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
@@ -140,20 +141,14 @@ namespace osu.Game.Online.RealtimeMultiplayer
                 RulesetID = Room.Settings.RulesetID
             };
 
-            var newSettings = new MultiplayerRoomSettings
+            ChangeSettings(new MultiplayerRoomSettings
             {
                 Name = name.GetOr(Room.Settings.Name),
                 BeatmapID = item.GetOr(existingPlaylistItem).BeatmapID,
                 BeatmapChecksum = item.GetOr(existingPlaylistItem).Beatmap.Value.MD5Hash,
                 RulesetID = item.GetOr(existingPlaylistItem).RulesetID,
-                Mods = item.HasValue ? item.Value!.RequiredMods.Select(m => new APIMod(m)).ToList() : Room.Settings.Mods
-            };
-
-            // Make sure there would be a meaningful change in settings.
-            if (newSettings.Equals(Room.Settings))
-                return;
-
-            ChangeSettings(newSettings);
+                Mods = item.HasValue ? item.Value.AsNonNull().RequiredMods.Select(m => new APIMod(m)).ToList() : Room.Settings.Mods
+            });
         }
 
         public abstract Task TransferHost(int userId);

From ba4307a74c9bf82503b2e5dad391e3b28442959a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 18:24:13 +0900
Subject: [PATCH 0396/3722] Directly return task

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

diff --git a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs b/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs
index bfa8362c7e..de52633c88 100644
--- a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs
@@ -106,14 +106,14 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
             return Task.CompletedTask;
         }
 
-        public override async Task StartMatch()
+        public override Task StartMatch()
         {
             Debug.Assert(Room != null);
 
             foreach (var user in Room.Users.Where(u => u.State == MultiplayerUserState.Ready))
                 ChangeUserState(user.UserID, MultiplayerUserState.WaitingForLoad);
 
-            await ((IMultiplayerClient)this).LoadRequested();
+            return ((IMultiplayerClient)this).LoadRequested();
         }
     }
 }

From 1e2b425f3f0b787a747896e485a80a066b1a7429 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 18:24:15 +0900
Subject: [PATCH 0397/3722] Fix incorrect test name + assertion

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

diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs
index 598641682b..925a83a863 100644
--- a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs
+++ b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
         }
 
         [Test]
-        public void TestMultiplayerRoomPartedWhenAPIRoomJoined()
+        public void TestMultiplayerRoomJoinedWhenAPIRoomJoined()
         {
             AddStep("create room manager with a room", () =>
             {
@@ -133,7 +133,7 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
                 });
             });
 
-            AddAssert("multiplayer room parted", () => roomContainer.Client.Room != null);
+            AddAssert("multiplayer room joined", () => roomContainer.Client.Room != null);
         }
 
         private TestRealtimeRoomManager createRoomManager()

From 8b1f5ff4927fa83700a4b22e213fe8ff0914d8d8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 18:25:23 +0900
Subject: [PATCH 0398/3722] Only instantiate ruleset once

---
 .../Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
index fe2f4c88f0..77dbc16786 100644
--- a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
@@ -354,14 +354,14 @@ namespace osu.Game.Online.RealtimeMultiplayer
                 var beatmap = beatmapSet.Beatmaps.Single(b => b.OnlineBeatmapID == settings.BeatmapID);
                 beatmap.MD5Hash = settings.BeatmapChecksum;
 
-                var ruleset = rulesets.GetRuleset(settings.RulesetID);
-                var mods = settings.Mods.Select(m => m.ToMod(ruleset.CreateInstance()));
+                var ruleset = rulesets.GetRuleset(settings.RulesetID).CreateInstance();
+                var mods = settings.Mods.Select(m => m.ToMod(ruleset));
 
                 PlaylistItem playlistItem = new PlaylistItem
                 {
                     ID = playlistItemId,
                     Beatmap = { Value = beatmap },
-                    Ruleset = { Value = ruleset },
+                    Ruleset = { Value = ruleset.RulesetInfo },
                 };
 
                 playlistItem.RequiredMods.AddRange(mods);

From 508f73d94961b8baae97956a3c328b41277ed434 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 18:25:54 +0900
Subject: [PATCH 0399/3722] Fix up comment

---
 .../Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
index 77dbc16786..35c8a3397e 100644
--- a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
@@ -328,7 +328,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
             if (Room == null)
                 return;
 
-            // Update a few instantaneously properties of the room.
+            // Update a few properties of the room instantaneously.
             Schedule(() =>
             {
                 if (Room == null)

From 0cf078562dada06982d9af80136c02e145d42efa Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 18:30:00 +0900
Subject: [PATCH 0400/3722] Split method up and remove nested scheduling

---
 .../StatefulMultiplayerClient.cs              | 59 +++++++++----------
 1 file changed, 29 insertions(+), 30 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
index 35c8a3397e..8d3b161804 100644
--- a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
@@ -15,6 +15,7 @@ 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.Online.Multiplayer;
 using osu.Game.Online.Multiplayer.RoomStatuses;
 using osu.Game.Rulesets;
@@ -347,38 +348,36 @@ namespace osu.Game.Online.RealtimeMultiplayer
             });
 
             var req = new GetBeatmapSetRequest(settings.BeatmapID, BeatmapSetLookupType.BeatmapId);
-            req.Success += res =>
-            {
-                var beatmapSet = res.ToBeatmapSet(rulesets);
-
-                var beatmap = beatmapSet.Beatmaps.Single(b => b.OnlineBeatmapID == settings.BeatmapID);
-                beatmap.MD5Hash = settings.BeatmapChecksum;
-
-                var ruleset = rulesets.GetRuleset(settings.RulesetID).CreateInstance();
-                var mods = settings.Mods.Select(m => m.ToMod(ruleset));
-
-                PlaylistItem playlistItem = new PlaylistItem
-                {
-                    ID = playlistItemId,
-                    Beatmap = { Value = beatmap },
-                    Ruleset = { Value = ruleset.RulesetInfo },
-                };
-
-                playlistItem.RequiredMods.AddRange(mods);
-
-                Schedule(() =>
-                {
-                    if (Room == null || !Room.Settings.Equals(settings))
-                        return;
-
-                    Debug.Assert(apiRoom != null);
-
-                    apiRoom.Playlist.Clear(); // Clearing should be unnecessary, but here for sanity.
-                    apiRoom.Playlist.Add(playlistItem);
-                });
-            };
+            req.Success += res => updatePlaylist(settings, res);
 
             api.Queue(req);
         }
+
+        private void updatePlaylist(MultiplayerRoomSettings settings, APIBeatmapSet onlineSet)
+        {
+            if (Room == null || !Room.Settings.Equals(settings))
+                return;
+
+            Debug.Assert(apiRoom != null);
+
+            var beatmapSet = onlineSet.ToBeatmapSet(rulesets);
+            var beatmap = beatmapSet.Beatmaps.Single(b => b.OnlineBeatmapID == settings.BeatmapID);
+            beatmap.MD5Hash = settings.BeatmapChecksum;
+
+            var ruleset = rulesets.GetRuleset(settings.RulesetID).CreateInstance();
+            var mods = settings.Mods.Select(m => m.ToMod(ruleset));
+
+            PlaylistItem playlistItem = new PlaylistItem
+            {
+                ID = playlistItemId,
+                Beatmap = { Value = beatmap },
+                Ruleset = { Value = ruleset.RulesetInfo },
+            };
+
+            playlistItem.RequiredMods.AddRange(mods);
+
+            apiRoom.Playlist.Clear(); // Clearing should be unnecessary, but here for sanity.
+            apiRoom.Playlist.Add(playlistItem);
+        }
     }
 }

From 45107280a00e310402a368a6f9b15050f1bcfd0a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 18:34:54 +0900
Subject: [PATCH 0401/3722] Make TimeBetweenPolls into a bindable

---
 .../Components/TestScenePollingComponent.cs   | 10 +++----
 osu.Game/Online/Chat/ChannelManager.cs        |  2 +-
 osu.Game/Online/PollingComponent.cs           | 30 ++++++++-----------
 .../Multi/Components/RoomPollingComponent.cs  | 11 -------
 4 files changed, 19 insertions(+), 34 deletions(-)

diff --git a/osu.Game.Tests/Visual/Components/TestScenePollingComponent.cs b/osu.Game.Tests/Visual/Components/TestScenePollingComponent.cs
index fb10015ef4..2236f85b92 100644
--- a/osu.Game.Tests/Visual/Components/TestScenePollingComponent.cs
+++ b/osu.Game.Tests/Visual/Components/TestScenePollingComponent.cs
@@ -61,12 +61,12 @@ namespace osu.Game.Tests.Visual.Components
         {
             createPoller(true);
 
-            AddStep("set poll interval to 1", () => poller.TimeBetweenPolls = TimePerAction * safety_adjust);
+            AddStep("set poll interval to 1", () => poller.TimeBetweenPolls.Value = TimePerAction * safety_adjust);
             checkCount(1);
             checkCount(2);
             checkCount(3);
 
-            AddStep("set poll interval to 5", () => poller.TimeBetweenPolls = TimePerAction * safety_adjust * 5);
+            AddStep("set poll interval to 5", () => poller.TimeBetweenPolls.Value = TimePerAction * safety_adjust * 5);
             checkCount(4);
             checkCount(4);
             checkCount(4);
@@ -76,7 +76,7 @@ namespace osu.Game.Tests.Visual.Components
             checkCount(5);
             checkCount(5);
 
-            AddStep("set poll interval to 1", () => poller.TimeBetweenPolls = TimePerAction * safety_adjust);
+            AddStep("set poll interval to 1", () => poller.TimeBetweenPolls.Value = TimePerAction * safety_adjust);
             checkCount(6);
             checkCount(7);
         }
@@ -87,7 +87,7 @@ namespace osu.Game.Tests.Visual.Components
         {
             createPoller(false);
 
-            AddStep("set poll interval to 1", () => poller.TimeBetweenPolls = TimePerAction * safety_adjust * 5);
+            AddStep("set poll interval to 1", () => poller.TimeBetweenPolls.Value = TimePerAction * safety_adjust * 5);
             checkCount(0);
             skip();
             checkCount(0);
@@ -141,7 +141,7 @@ namespace osu.Game.Tests.Visual.Components
 
         public class TestSlowPoller : TestPoller
         {
-            protected override Task Poll() => Task.Delay((int)(TimeBetweenPolls / 2f / Clock.Rate)).ContinueWith(_ => base.Poll());
+            protected override Task Poll() => Task.Delay((int)(TimeBetweenPolls.Value / 2f / Clock.Rate)).ContinueWith(_ => base.Poll());
         }
     }
 }
diff --git a/osu.Game/Online/Chat/ChannelManager.cs b/osu.Game/Online/Chat/ChannelManager.cs
index 16f46581c5..62ae507419 100644
--- a/osu.Game/Online/Chat/ChannelManager.cs
+++ b/osu.Game/Online/Chat/ChannelManager.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Online.Chat
         {
             CurrentChannel.ValueChanged += currentChannelChanged;
 
-            HighPollRate.BindValueChanged(enabled => TimeBetweenPolls = enabled.NewValue ? 1000 : 6000, true);
+            HighPollRate.BindValueChanged(enabled => TimeBetweenPolls.Value = enabled.NewValue ? 1000 : 6000, true);
         }
 
         /// <summary>
diff --git a/osu.Game/Online/PollingComponent.cs b/osu.Game/Online/PollingComponent.cs
index 228f147835..3d19f2ab09 100644
--- a/osu.Game/Online/PollingComponent.cs
+++ b/osu.Game/Online/PollingComponent.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Threading.Tasks;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Threading;
 
@@ -19,22 +20,11 @@ namespace osu.Game.Online
 
         private bool pollingActive;
 
-        private double timeBetweenPolls;
-
         /// <summary>
         /// The time in milliseconds to wait between polls.
         /// Setting to zero stops all polling.
         /// </summary>
-        public double TimeBetweenPolls
-        {
-            get => timeBetweenPolls;
-            set
-            {
-                timeBetweenPolls = value;
-                scheduledPoll?.Cancel();
-                pollIfNecessary();
-            }
-        }
+        public readonly Bindable<double> TimeBetweenPolls = new Bindable<double>();
 
         /// <summary>
         ///
@@ -42,7 +32,13 @@ namespace osu.Game.Online
         /// <param name="timeBetweenPolls">The initial time in milliseconds to wait between polls. Setting to zero stops all polling.</param>
         protected PollingComponent(double timeBetweenPolls = 0)
         {
-            TimeBetweenPolls = timeBetweenPolls;
+            TimeBetweenPolls.BindValueChanged(_ =>
+            {
+                scheduledPoll?.Cancel();
+                pollIfNecessary();
+            });
+
+            TimeBetweenPolls.Value = timeBetweenPolls;
         }
 
         protected override void LoadComplete()
@@ -60,7 +56,7 @@ namespace osu.Game.Online
             if (pollingActive) return false;
 
             // don't try polling if the time between polls hasn't been set.
-            if (timeBetweenPolls == 0) return false;
+            if (TimeBetweenPolls.Value == 0) return false;
 
             if (!lastTimePolled.HasValue)
             {
@@ -68,7 +64,7 @@ namespace osu.Game.Online
                 return true;
             }
 
-            if (Time.Current - lastTimePolled.Value > timeBetweenPolls)
+            if (Time.Current - lastTimePolled.Value > TimeBetweenPolls.Value)
             {
                 doPoll();
                 return true;
@@ -99,7 +95,7 @@ namespace osu.Game.Online
         /// </summary>
         public void PollImmediately()
         {
-            lastTimePolled = Time.Current - timeBetweenPolls;
+            lastTimePolled = Time.Current - TimeBetweenPolls.Value;
             scheduleNextPoll();
         }
 
@@ -121,7 +117,7 @@ namespace osu.Game.Online
 
             double lastPollDuration = lastTimePolled.HasValue ? Time.Current - lastTimePolled.Value : 0;
 
-            scheduledPoll = Scheduler.AddDelayed(doPoll, Math.Max(0, timeBetweenPolls - lastPollDuration));
+            scheduledPoll = Scheduler.AddDelayed(doPoll, Math.Max(0, TimeBetweenPolls.Value - lastPollDuration));
         }
     }
 }
diff --git a/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs b/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs
index a81a9540c3..ad0720db7b 100644
--- a/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs
+++ b/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs
@@ -15,22 +15,11 @@ namespace osu.Game.Screens.Multi.Components
     {
         public Action<List<Room>> RoomsReceived;
 
-        /// <summary>
-        /// The time in milliseconds to wait between polls.
-        /// Setting to zero stops all polling.
-        /// </summary>
-        public new readonly Bindable<double> TimeBetweenPolls = new Bindable<double>();
-
         public readonly Bindable<bool> InitialRoomsReceived = new Bindable<bool>();
 
         [Resolved]
         protected IAPIProvider API { get; private set; }
 
-        protected RoomPollingComponent()
-        {
-            TimeBetweenPolls.BindValueChanged(time => base.TimeBetweenPolls = time.NewValue);
-        }
-
         protected void NotifyRoomsReceived(List<Room> rooms)
         {
             InitialRoomsReceived.Value = true;

From ce2560b545deea1076c5f6cfd781e9089a360061 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 18:36:31 +0900
Subject: [PATCH 0402/3722] Extract value into const

---
 .../Participants/ParticipantPanel.cs                   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs
index 306a54bfdc..002849a275 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs
@@ -142,15 +142,17 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Participants
             if (Room == null)
                 return;
 
+            const double fade_time = 50;
+
             if (User.State == MultiplayerUserState.Ready)
-                readyMark.FadeIn(50);
+                readyMark.FadeIn(fade_time);
             else
-                readyMark.FadeOut(50);
+                readyMark.FadeOut(fade_time);
 
             if (Room.Host?.Equals(User) == true)
-                crown.FadeIn(50);
+                crown.FadeIn(fade_time);
             else
-                crown.FadeOut(50);
+                crown.FadeOut(fade_time);
         }
 
         public MenuItem[] ContextMenuItems

From 19db35501e156ceaaf45f65bb4360dc4d859a68f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 18:44:36 +0900
Subject: [PATCH 0403/3722] Fix incorrect end date usage in timeshift ready
 button

---
 osu.Game/Screens/Multi/Timeshift/TimeshiftReadyButton.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftReadyButton.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftReadyButton.cs
index b6698b195c..ba639c29f4 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftReadyButton.cs
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftReadyButton.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Screens.Multi.Timeshift
     public class TimeshiftReadyButton : ReadyButton
     {
         [Resolved(typeof(Room), nameof(Room.EndDate))]
-        private Bindable<DateTimeOffset?> endDate { get; set; }
+        private Bindable<DateTimeOffset> endDate { get; set; }
 
         public TimeshiftReadyButton()
         {
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Multi.Timeshift
         {
             base.Update();
 
-            Enabled.Value = endDate.Value == null || DateTimeOffset.UtcNow.AddSeconds(30).AddMilliseconds(GameBeatmap.Value.Track.Length) < endDate.Value;
+            Enabled.Value = DateTimeOffset.UtcNow.AddSeconds(30).AddMilliseconds(GameBeatmap.Value.Track.Length) < endDate.Value;
         }
     }
 }

From a07a36793a5d90781178b0f94743580359c17973 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 18:44:41 +0900
Subject: [PATCH 0404/3722] Fix test not working

---
 .../RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs
index 889c0c0be3..1f863028af 100644
--- a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs
+++ b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs
@@ -97,6 +97,12 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
         [Test]
         public void TestBecomeHostWhileReady()
         {
+            AddStep("add host", () =>
+            {
+                Client.AddUser(new User { Id = 2, Username = "Another user" });
+                Client.TransferHost(2);
+            });
+
             addClickButtonStep();
             AddStep("make user host", () => Client.TransferHost(Client.Room?.Users[0].UserID ?? 0));
 

From b002c466660535e32e036d322e97e68335c6c497 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 18:49:39 +0900
Subject: [PATCH 0405/3722] Add number of ready users to button

---
 .../Screens/Multi/RealtimeMultiplayer/RealtimeReadyButton.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeReadyButton.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeReadyButton.cs
index d52df258ad..ea8fb04994 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeReadyButton.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeReadyButton.cs
@@ -69,8 +69,9 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
                 case MultiplayerUserState.Ready:
                     if (Room?.Host?.Equals(localUser) == true)
                     {
-                        button.Text = "Let's go!";
-                        updateButtonColour(Room.Users.All(u => u.State == MultiplayerUserState.Ready));
+                        int countReady = Room.Users.Count(u => u.State == MultiplayerUserState.Ready);
+                        button.Text = $"Start match ({countReady} / {Room.Users.Count} ready)";
+                        updateButtonColour(true);
                     }
                     else
                     {

From f1aefcdf86a9ef784644614915bd11c1476c9816 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sat, 19 Dec 2020 22:48:39 +0100
Subject: [PATCH 0406/3722] Handle multiple extensions in the import files.

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

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 521778a9cd..ca87772209 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -397,13 +397,18 @@ namespace osu.Game
 
         public virtual async Task Import(params ImportTask[] tasks)
         {
-            var extension = Path.GetExtension(tasks.First().Path).ToLowerInvariant();
+            var importTasks = new List<Task>();
 
-            foreach (var importer in fileImporters)
+            foreach (var extension in tasks.Select(t => Path.GetExtension(t.Path)).Distinct())
             {
-                if (importer.HandledExtensions.Contains(extension))
-                    await importer.Import(tasks);
+                var importList = tasks.Where(t => t.Path.EndsWith(extension, StringComparison.OrdinalIgnoreCase));
+                var importer = fileImporters.FirstOrDefault(i => i.HandledExtensions.Contains(extension));
+
+                if (importer != null)
+                    importTasks.Add(importer.Import(importList.ToArray()));
             }
+
+            await Task.WhenAll(importTasks);
         }
 
         public IEnumerable<string> HandledExtensions => fileImporters.SelectMany(i => i.HandledExtensions);

From f876a329b1b4e8b2cbef4effd6ef242e1be1c233 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 22:51:33 +0900
Subject: [PATCH 0407/3722] Fire-and-forget leave-room request

---
 .../StatefulMultiplayerClient.cs              | 29 +++++++++++++++++--
 .../RealtimeRoomManager.cs                    |  2 +-
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
index 60960f4929..b846d6732f 100644
--- a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
@@ -77,7 +77,9 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// <param name="room">The API <see cref="Room"/>.</param>
         public async Task JoinRoom(Room room)
         {
-            Debug.Assert(Room == null);
+            if (Room != null)
+                throw new InvalidOperationException("Cannot join a multiplayer room while already in one.");
+
             Debug.Assert(room.RoomID.Value != null);
 
             apiRoom = room;
@@ -166,6 +168,9 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
         Task IMultiplayerClient.RoomStateChanged(MultiplayerRoomState state)
         {
+            if (Room == null)
+                return Task.CompletedTask;
+
             Schedule(() =>
             {
                 if (Room == null)
@@ -198,6 +203,9 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
         async Task IMultiplayerClient.UserJoined(MultiplayerRoomUser user)
         {
+            if (Room == null)
+                return;
+
             await PopulateUser(user);
 
             Schedule(() =>
@@ -213,6 +221,9 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
         Task IMultiplayerClient.UserLeft(MultiplayerRoomUser user)
         {
+            if (Room == null)
+                return Task.CompletedTask;
+
             Schedule(() =>
             {
                 if (Room == null)
@@ -229,6 +240,9 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
         Task IMultiplayerClient.HostChanged(int userId)
         {
+            if (Room == null)
+                return Task.CompletedTask;
+
             Schedule(() =>
             {
                 if (Room == null)
@@ -255,6 +269,9 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
         Task IMultiplayerClient.UserStateChanged(int userId, MultiplayerUserState state)
         {
+            if (Room == null)
+                return Task.CompletedTask;
+
             Schedule(() =>
             {
                 if (Room == null)
@@ -273,6 +290,9 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
         Task IMultiplayerClient.LoadRequested()
         {
+            if (Room == null)
+                return Task.CompletedTask;
+
             Schedule(() =>
             {
                 if (Room == null)
@@ -286,7 +306,9 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
         Task IMultiplayerClient.MatchStarted()
         {
-            Debug.Assert(Room != null);
+            if (Room == null)
+                return Task.CompletedTask;
+
             var players = Room.Users.Where(u => u.State == MultiplayerUserState.Playing).Select(u => u.UserID).ToList();
 
             Schedule(() =>
@@ -304,6 +326,9 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
         Task IMultiplayerClient.ResultsReady()
         {
+            if (Room == null)
+                return Task.CompletedTask;
+
             Schedule(() =>
             {
                 if (Room == null)
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index 4f73ee3865..d2a03da714 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             var joinedRoom = JoinedRoom;
 
             base.PartRoom();
-            multiplayerClient.LeaveRoom().Wait();
+            multiplayerClient.LeaveRoom();
 
             // Todo: This is not the way to do this. Basically when we're the only participant and the room closes, there's no way to know if this is actually the case.
             RemoveRoom(joinedRoom);

From 9d13a5b06a9f90e9cd9a8e489594f03b3d3ec4f0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 22:53:07 +0900
Subject: [PATCH 0408/3722] Fix potential cross-thread list access

---
 .../Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
index b846d6732f..bf58849e35 100644
--- a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
@@ -309,14 +309,12 @@ namespace osu.Game.Online.RealtimeMultiplayer
             if (Room == null)
                 return Task.CompletedTask;
 
-            var players = Room.Users.Where(u => u.State == MultiplayerUserState.Playing).Select(u => u.UserID).ToList();
-
             Schedule(() =>
             {
                 if (Room == null)
                     return;
 
-                PlayingUsers.AddRange(players);
+                PlayingUsers.AddRange(Room.Users.Where(u => u.State == MultiplayerUserState.Playing).Select(u => u.UserID));
 
                 MatchStarted?.Invoke();
             });

From c33e693b8e3331af505931950940dc7684b04f41 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 23:05:17 +0900
Subject: [PATCH 0409/3722] Refactor InitialRoomsReceived to avoid extra
 bindables

---
 .../Visual/Multiplayer/TestRoomManager.cs        |  2 +-
 .../Multiplayer/TestSceneMatchSettingsOverlay.cs |  2 +-
 .../Multiplayer/TestSceneMatchSubScreen.cs       |  2 +-
 .../Multi/Components/ListingPollingComponent.cs  |  3 +--
 osu.Game/Screens/Multi/Components/RoomManager.cs | 12 ++++++++++--
 .../Multi/Components/RoomPollingComponent.cs     | 16 ++++++++--------
 osu.Game/Screens/Multi/IRoomManager.cs           |  2 +-
 osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs |  2 +-
 8 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs b/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs
index 67a53307fc..9dd4aea4bd 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         public readonly BindableList<Room> Rooms = new BindableList<Room>();
 
-        public Bindable<bool> InitialRoomsReceived { get; } = new Bindable<bool>(true);
+        public IBindable<bool> InitialRoomsReceived { get; } = new Bindable<bool>(true);
 
         IBindableList<Room> IRoomManager.Rooms => Rooms;
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
index cbe8cc6137..234374ee2b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
@@ -131,7 +131,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 remove { }
             }
 
-            public Bindable<bool> InitialRoomsReceived { get; } = new Bindable<bool>(true);
+            public IBindable<bool> InitialRoomsReceived { get; } = new Bindable<bool>(true);
 
             public IBindableList<Room> Rooms => null;
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
index 65e9893851..bceb6efac1 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
@@ -151,7 +151,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 remove => throw new NotImplementedException();
             }
 
-            public Bindable<bool> InitialRoomsReceived { get; } = new Bindable<bool>(true);
+            public IBindable<bool> InitialRoomsReceived { get; } = new Bindable<bool>(true);
 
             public IBindableList<Room> Rooms { get; } = new BindableList<Room>();
 
diff --git a/osu.Game/Screens/Multi/Components/ListingPollingComponent.cs b/osu.Game/Screens/Multi/Components/ListingPollingComponent.cs
index ebb3403950..dff6c50bf2 100644
--- a/osu.Game/Screens/Multi/Components/ListingPollingComponent.cs
+++ b/osu.Game/Screens/Multi/Components/ListingPollingComponent.cs
@@ -25,8 +25,7 @@ namespace osu.Game.Screens.Multi.Components
         {
             currentFilter.BindValueChanged(_ =>
             {
-                InitialRoomsReceived.Value = false;
-
+                NotifyRoomsReceived(null);
                 if (IsLoaded)
                     PollImmediately();
             });
diff --git a/osu.Game/Screens/Multi/Components/RoomManager.cs b/osu.Game/Screens/Multi/Components/RoomManager.cs
index ffc5e94106..382ce52723 100644
--- a/osu.Game/Screens/Multi/Components/RoomManager.cs
+++ b/osu.Game/Screens/Multi/Components/RoomManager.cs
@@ -23,7 +23,8 @@ namespace osu.Game.Screens.Multi.Components
 
         private readonly BindableList<Room> rooms = new BindableList<Room>();
 
-        public Bindable<bool> InitialRoomsReceived { get; } = new Bindable<bool>();
+        public IBindable<bool> InitialRoomsReceived => initialRoomsReceived;
+        private readonly Bindable<bool> initialRoomsReceived = new Bindable<bool>();
 
         public IBindableList<Room> Rooms => rooms;
 
@@ -44,7 +45,6 @@ namespace osu.Game.Screens.Multi.Components
 
             InternalChildren = CreatePollingComponents().Select(p =>
             {
-                p.InitialRoomsReceived.BindTo(InitialRoomsReceived);
                 p.RoomsReceived = onRoomsReceived;
                 return p;
             }).ToList();
@@ -122,6 +122,13 @@ namespace osu.Game.Screens.Multi.Components
 
         private void onRoomsReceived(List<Room> received)
         {
+            if (received == null)
+            {
+                rooms.Clear();
+                initialRoomsReceived.Value = false;
+                return;
+            }
+
             // Remove past matches
             foreach (var r in rooms.ToList())
             {
@@ -155,6 +162,7 @@ namespace osu.Game.Screens.Multi.Components
             }
 
             RoomsUpdated?.Invoke();
+            initialRoomsReceived.Value = true;
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs b/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs
index ad0720db7b..fbaf9dd930 100644
--- a/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs
+++ b/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Game.Online;
 using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
@@ -13,17 +12,18 @@ namespace osu.Game.Screens.Multi.Components
 {
     public abstract class RoomPollingComponent : PollingComponent
     {
+        /// <summary>
+        /// Invoked when any <see cref="Room"/>s have been received from the API.
+        /// <para>
+        /// Any <see cref="Room"/>s present locally but not returned by this event are to be removed from display.
+        /// If null, the display of local rooms is reset to an initial state.
+        /// </para>
+        /// </summary>
         public Action<List<Room>> RoomsReceived;
 
-        public readonly Bindable<bool> InitialRoomsReceived = new Bindable<bool>();
-
         [Resolved]
         protected IAPIProvider API { get; private set; }
 
-        protected void NotifyRoomsReceived(List<Room> rooms)
-        {
-            InitialRoomsReceived.Value = true;
-            RoomsReceived?.Invoke(rooms);
-        }
+        protected void NotifyRoomsReceived(List<Room> rooms) => RoomsReceived?.Invoke(rooms);
     }
 }
diff --git a/osu.Game/Screens/Multi/IRoomManager.cs b/osu.Game/Screens/Multi/IRoomManager.cs
index 3d18edcd71..630e3af91c 100644
--- a/osu.Game/Screens/Multi/IRoomManager.cs
+++ b/osu.Game/Screens/Multi/IRoomManager.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Screens.Multi
         /// <summary>
         /// Whether an initial listing of rooms has been received.
         /// </summary>
-        Bindable<bool> InitialRoomsReceived { get; }
+        IBindable<bool> InitialRoomsReceived { get; }
 
         /// <summary>
         /// All the active <see cref="Room"/>s.
diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
index a26a64d86d..165a2b201c 100644
--- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Screens.Multi.Lounge
 
         protected override UserActivity InitialActivity => new UserActivity.SearchingForLobby();
 
-        private readonly Bindable<bool> initialRoomsReceived = new Bindable<bool>();
+        private readonly IBindable<bool> initialRoomsReceived = new Bindable<bool>();
 
         private Container content;
         private LoadingLayer loadingLayer;

From 594db76cf3191ae55861633c1efa187794a018c5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 23:10:45 +0900
Subject: [PATCH 0410/3722] Fix compilation errors

---
 osu.Game/Screens/Multi/Components/RoomManager.cs             | 5 ++---
 .../Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Multi/Components/RoomManager.cs b/osu.Game/Screens/Multi/Components/RoomManager.cs
index 0bcf3a90c3..276a5a6148 100644
--- a/osu.Game/Screens/Multi/Components/RoomManager.cs
+++ b/osu.Game/Screens/Multi/Components/RoomManager.cs
@@ -125,8 +125,7 @@ namespace osu.Game.Screens.Multi.Components
         {
             if (received == null)
             {
-                rooms.Clear();
-                initialRoomsReceived.Value = false;
+                ClearRooms();
                 return;
             }
 
@@ -171,7 +170,7 @@ namespace osu.Game.Screens.Multi.Components
         protected void ClearRooms()
         {
             rooms.Clear();
-            InitialRoomsReceived.Value = false;
+            initialRoomsReceived.Value = false;
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index 9e3c921d9e..a50628a5fa 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.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.Diagnostics;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
@@ -81,7 +82,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             allowPolling.Value = isConnected.Value && JoinedRoom.Value == null;
         }
 
-        protected override RoomPollingComponent[] CreatePollingComponents() => new RoomPollingComponent[]
+        protected override IEnumerable<RoomPollingComponent> CreatePollingComponents() => new RoomPollingComponent[]
         {
             listingPollingComponent = new RealtimeListingPollingComponent
             {

From 1d7d8bd6fccba84c32f004caddaf3fb0a3bdfe33 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 23:26:31 +0900
Subject: [PATCH 0411/3722] Hook up a realtime multiplayer client

---
 .../RealtimeMultiplayerClient.cs              | 171 ++++++++++++++++++
 1 file changed, 171 insertions(+)
 create mode 100644 osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs

diff --git a/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
new file mode 100644
index 0000000000..6f18e1c922
--- /dev/null
+++ b/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
@@ -0,0 +1,171 @@
+// Copyright (c) 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
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.SignalR.Client;
+using Microsoft.Extensions.DependencyInjection;
+using Newtonsoft.Json;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Logging;
+using osu.Game.Online.API;
+
+namespace osu.Game.Online.RealtimeMultiplayer
+{
+    public class RealtimeMultiplayerClient : StatefulMultiplayerClient
+    {
+        private const string endpoint = "https://spectator.ppy.sh/multiplayer";
+
+        public override IBindable<bool> IsConnected => isConnected;
+
+        private readonly Bindable<bool> isConnected = new Bindable<bool>();
+        private readonly IBindable<APIState> apiState = new Bindable<APIState>();
+
+        [Resolved]
+        private IAPIProvider api { get; set; } = null!;
+
+        private HubConnection? connection;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            apiState.BindTo(api.State);
+            apiState.BindValueChanged(apiStateChanged, true);
+        }
+
+        private void apiStateChanged(ValueChangedEvent<APIState> state)
+        {
+            switch (state.NewValue)
+            {
+                case APIState.Failing:
+                case APIState.Offline:
+                    connection?.StopAsync();
+                    connection = null;
+                    break;
+
+                case APIState.Online:
+                    Task.Run(Connect);
+                    break;
+            }
+        }
+
+        protected virtual async Task Connect()
+        {
+            if (connection != null)
+                return;
+
+            connection = new HubConnectionBuilder()
+                         .WithUrl(endpoint, options =>
+                         {
+                             options.Headers.Add("Authorization", $"Bearer {api.AccessToken}");
+                         })
+                         .AddNewtonsoftJsonProtocol(options => { options.PayloadSerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; })
+                         .Build();
+
+            // this is kind of SILLY
+            // https://github.com/dotnet/aspnetcore/issues/15198
+            connection.On<MultiplayerRoomState>(nameof(IMultiplayerClient.RoomStateChanged), ((IMultiplayerClient)this).RoomStateChanged);
+            connection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserJoined), ((IMultiplayerClient)this).UserJoined);
+            connection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserLeft), ((IMultiplayerClient)this).UserLeft);
+            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);
+            connection.On(nameof(IMultiplayerClient.LoadRequested), ((IMultiplayerClient)this).LoadRequested);
+            connection.On(nameof(IMultiplayerClient.MatchStarted), ((IMultiplayerClient)this).MatchStarted);
+            connection.On(nameof(IMultiplayerClient.ResultsReady), ((IMultiplayerClient)this).ResultsReady);
+
+            connection.Closed += async ex =>
+            {
+                isConnected.Value = false;
+
+                if (ex != null)
+                {
+                    Logger.Log($"Multiplayer client lost connection: {ex}", LoggingTarget.Network);
+                    await tryUntilConnected();
+                }
+            };
+
+            await tryUntilConnected();
+
+            async Task tryUntilConnected()
+            {
+                Logger.Log("Multiplayer client connecting...", LoggingTarget.Network);
+
+                while (api.State.Value == APIState.Online)
+                {
+                    try
+                    {
+                        // reconnect on any failure
+                        await connection.StartAsync();
+                        Logger.Log("Multiplayer client connected!", LoggingTarget.Network);
+
+                        // Success.
+                        isConnected.Value = true;
+                        break;
+                    }
+                    catch (Exception e)
+                    {
+                        Logger.Log($"Multiplayer client connection error: {e}", LoggingTarget.Network);
+                        await Task.Delay(5000);
+                    }
+                }
+            }
+        }
+
+        protected override Task<MultiplayerRoom> JoinRoom(long roomId)
+        {
+            if (!isConnected.Value)
+                return Task.FromCanceled<MultiplayerRoom>(CancellationToken.None);
+
+            return connection.InvokeAsync<MultiplayerRoom>(nameof(IMultiplayerServer.JoinRoom), roomId);
+        }
+
+        public override async Task LeaveRoom()
+        {
+            if (!isConnected.Value)
+                return;
+
+            if (Room == null)
+                return;
+
+            await base.LeaveRoom();
+            await connection.InvokeAsync(nameof(IMultiplayerServer.LeaveRoom));
+        }
+
+        public override Task TransferHost(int userId)
+        {
+            if (!isConnected.Value)
+                return Task.CompletedTask;
+
+            return connection.InvokeAsync(nameof(IMultiplayerServer.TransferHost), userId);
+        }
+
+        public override Task ChangeSettings(MultiplayerRoomSettings settings)
+        {
+            if (!isConnected.Value)
+                return Task.CompletedTask;
+
+            return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeSettings), settings);
+        }
+
+        public override Task ChangeState(MultiplayerUserState newState)
+        {
+            if (!isConnected.Value)
+                return Task.CompletedTask;
+
+            return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeState), newState);
+        }
+
+        public override Task StartMatch()
+        {
+            if (!isConnected.Value)
+                return Task.CompletedTask;
+
+            return connection.InvokeAsync(nameof(IMultiplayerServer.StartMatch));
+        }
+    }
+}

From 455a84c73fb616e89ec76c8af8cb553ed61d3688 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 23:32:57 +0900
Subject: [PATCH 0412/3722] Add realtime multiplayer screen

---
 .../Multi/Lounge/Components/DrawableRoom.cs   |  2 +-
 osu.Game/Screens/Multi/Multiplayer.cs         | 12 +++-
 .../RealtimeMultiplayer.cs                    | 65 +++++++++++++++++++
 3 files changed, 75 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs

diff --git a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
index 01a85382e4..56116b219a 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
@@ -242,7 +242,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
         {
             new OsuMenuItem("Create copy", MenuItemType.Standard, () =>
             {
-                multiplayer?.CreateRoom(Room.CreateCopy());
+                multiplayer?.OpenNewRoom(Room.CreateCopy());
             })
         };
     }
diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index 837ccdf2e9..027fedaad6 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -134,7 +134,7 @@ namespace osu.Game.Screens.Multi
                     {
                         Anchor = Anchor.TopRight,
                         Origin = Anchor.TopRight,
-                        Action = () => CreateRoom()
+                        Action = () => OpenNewRoom()
                     },
                     RoomManager = CreateRoomManager()
                 }
@@ -264,10 +264,16 @@ namespace osu.Game.Screens.Multi
         }
 
         /// <summary>
-        /// Create a new room.
+        /// Creates and opens the newly-created room.
         /// </summary>
         /// <param name="room">An optional template to use when creating the room.</param>
-        public void CreateRoom(Room room = null) => loungeSubScreen.Open(room ?? new Room { Name = { Value = $"{api.LocalUser}'s awesome room" } });
+        public void OpenNewRoom(Room room = null) => loungeSubScreen.Open(room ?? CreateNewRoom());
+
+        /// <summary>
+        /// Creates a new room.
+        /// </summary>
+        /// <returns>The created <see cref="Room"/>.</returns>
+        protected virtual Room CreateNewRoom() => new Room { Name = { Value = $"{api.LocalUser}'s awesome room" } };
 
         private void beginHandlingTrack()
         {
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
new file mode 100644
index 0000000000..075c552437
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.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 osu.Framework.Allocation;
+using osu.Framework.Logging;
+using osu.Framework.Screens;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.Multi.Lounge;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+{
+    public class RealtimeMultiplayer : Multiplayer
+    {
+        [Resolved]
+        private StatefulMultiplayerClient client { get; set; }
+
+        public override void OnResuming(IScreen last)
+        {
+            base.OnResuming(last);
+
+            if (client.Room != null)
+                client.ChangeState(MultiplayerUserState.Idle);
+        }
+
+        protected override void UpdatePollingRate(bool isIdle)
+        {
+            var timeshiftManager = (RealtimeRoomManager)RoomManager;
+
+            if (!this.IsCurrentScreen())
+            {
+                timeshiftManager.TimeBetweenListingPolls.Value = 0;
+                timeshiftManager.TimeBetweenSelectionPolls.Value = 0;
+            }
+            else
+            {
+                switch (CurrentSubScreen)
+                {
+                    case LoungeSubScreen _:
+                        timeshiftManager.TimeBetweenListingPolls.Value = isIdle ? 120000 : 15000;
+                        timeshiftManager.TimeBetweenSelectionPolls.Value = isIdle ? 120000 : 15000;
+                        break;
+
+                    // Don't poll inside the match or anywhere else.
+                    default:
+                        timeshiftManager.TimeBetweenListingPolls.Value = 0;
+                        timeshiftManager.TimeBetweenSelectionPolls.Value = 0;
+                        break;
+                }
+            }
+
+            Logger.Log($"Polling adjusted (listing: {timeshiftManager.TimeBetweenListingPolls.Value}, selection: {timeshiftManager.TimeBetweenSelectionPolls.Value})");
+        }
+
+        protected override Room CreateNewRoom()
+        {
+            var room = base.CreateNewRoom();
+            room.Category.Value = RoomCategory.Realtime;
+            return room;
+        }
+
+        protected override RoomManager CreateRoomManager() => new RealtimeRoomManager();
+    }
+}

From b9e4a7196e454743a96736c597b6749975e197eb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 23:36:56 +0900
Subject: [PATCH 0413/3722] Add realtime lounge subscreen

---
 ...s => TestSceneTimeshiftLoungeSubScreen.cs} |  5 ++--
 .../Screens/Multi/Lounge/LoungeSubScreen.cs   | 25 ++++++++++---------
 osu.Game/Screens/Multi/Multiplayer.cs         |  4 ++-
 .../RealtimeFilterControl.cs                  | 17 +++++++++++++
 .../RealtimeLoungeSubScreen.cs                | 13 ++++++++++
 .../RealtimeMultiplayer.cs                    |  2 ++
 .../Timeshift/TimeshiftLoungeSubScreen.cs     | 13 ++++++++++
 .../Multi/Timeshift/TimeshiftMultiplayer.cs   |  2 ++
 8 files changed, 66 insertions(+), 15 deletions(-)
 rename osu.Game.Tests/Visual/Multiplayer/{TestSceneLoungeSubScreen.cs => TestSceneTimeshiftLoungeSubScreen.cs} (92%)
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeFilterControl.cs
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.cs
 create mode 100644 osu.Game/Screens/Multi/Timeshift/TimeshiftLoungeSubScreen.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftLoungeSubScreen.cs
similarity index 92%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeSubScreen.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftLoungeSubScreen.cs
index 68987127d2..73afd65d6d 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftLoungeSubScreen.cs
@@ -10,10 +10,11 @@ using osu.Framework.Testing;
 using osu.Game.Graphics.Containers;
 using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Lounge.Components;
+using osu.Game.Screens.Multi.Timeshift;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneLoungeSubScreen : RoomManagerTestScene
+    public class TestSceneTimeshiftLoungeSubScreen : RoomManagerTestScene
     {
         private LoungeSubScreen loungeScreen;
 
@@ -26,7 +27,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             base.SetUpSteps();
 
-            AddStep("push screen", () => LoadScreen(loungeScreen = new LoungeSubScreen
+            AddStep("push screen", () => LoadScreen(loungeScreen = new TimeshiftLoungeSubScreen
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
index 165a2b201c..26e351fc2b 100644
--- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
@@ -19,16 +19,15 @@ using osu.Game.Users;
 namespace osu.Game.Screens.Multi.Lounge
 {
     [Cached]
-    public class LoungeSubScreen : MultiplayerSubScreen
+    public abstract class LoungeSubScreen : MultiplayerSubScreen
     {
         public override string Title => "Lounge";
 
-        protected FilterControl Filter;
-
         protected override UserActivity InitialActivity => new UserActivity.SearchingForLobby();
 
         private readonly IBindable<bool> initialRoomsReceived = new Bindable<bool>();
 
+        private FilterControl filter;
         private Container content;
         private LoadingLayer loadingLayer;
 
@@ -78,11 +77,11 @@ namespace osu.Game.Screens.Multi.Lounge
                         },
                     },
                 },
-                Filter = new TimeshiftFilterControl
+                filter = CreateFilterControl().With(d =>
                 {
-                    RelativeSizeAxes = Axes.X,
-                    Height = 80,
-                },
+                    d.RelativeSizeAxes = Axes.X;
+                    d.Height = 80;
+                })
             };
 
             // scroll selected room into view on selection.
@@ -108,7 +107,7 @@ namespace osu.Game.Screens.Multi.Lounge
 
             content.Padding = new MarginPadding
             {
-                Top = Filter.DrawHeight,
+                Top = filter.DrawHeight,
                 Left = WaveOverlayContainer.WIDTH_PADDING - DrawableRoom.SELECTION_BORDER_WIDTH + HORIZONTAL_OVERFLOW_PADDING,
                 Right = WaveOverlayContainer.WIDTH_PADDING + HORIZONTAL_OVERFLOW_PADDING,
             };
@@ -116,7 +115,7 @@ namespace osu.Game.Screens.Multi.Lounge
 
         protected override void OnFocus(FocusEvent e)
         {
-            Filter.TakeFocus();
+            filter.TakeFocus();
         }
 
         public override void OnEntering(IScreen last)
@@ -140,19 +139,19 @@ namespace osu.Game.Screens.Multi.Lounge
 
         private void onReturning()
         {
-            Filter.HoldFocus = true;
+            filter.HoldFocus = true;
         }
 
         public override bool OnExiting(IScreen next)
         {
-            Filter.HoldFocus = false;
+            filter.HoldFocus = false;
             return base.OnExiting(next);
         }
 
         public override void OnSuspending(IScreen next)
         {
             base.OnSuspending(next);
-            Filter.HoldFocus = false;
+            filter.HoldFocus = false;
         }
 
         private void joinRequested(Room room)
@@ -195,5 +194,7 @@ namespace osu.Game.Screens.Multi.Lounge
 
             this.Push(new MatchSubScreen(room));
         }
+
+        protected abstract FilterControl CreateFilterControl();
     }
 }
diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index 027fedaad6..b37ee45b84 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -143,7 +143,7 @@ namespace osu.Game.Screens.Multi
             screenStack.ScreenPushed += screenPushed;
             screenStack.ScreenExited += screenExited;
 
-            screenStack.Push(loungeSubScreen = new LoungeSubScreen());
+            screenStack.Push(loungeSubScreen = CreateLounge());
         }
 
         private readonly IBindable<APIState> apiState = new Bindable<APIState>();
@@ -361,6 +361,8 @@ namespace osu.Game.Screens.Multi
 
         protected abstract RoomManager CreateRoomManager();
 
+        protected abstract LoungeSubScreen CreateLounge();
+
         private class MultiplayerWaveContainer : WaveContainer
         {
             protected override bool StartHidden => true;
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeFilterControl.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeFilterControl.cs
new file mode 100644
index 0000000000..acd9a057e3
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeFilterControl.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Screens.Multi.Lounge.Components;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+{
+    public class RealtimeFilterControl : FilterControl
+    {
+        protected override FilterCriteria CreateCriteria()
+        {
+            var criteria = base.CreateCriteria();
+            criteria.Category = "realtime";
+            return criteria;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.cs
new file mode 100644
index 0000000000..ed187e436f
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.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.Screens.Multi.Lounge;
+using osu.Game.Screens.Multi.Lounge.Components;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+{
+    public class RealtimeLoungeSubScreen : LoungeSubScreen
+    {
+        protected override FilterControl CreateFilterControl() => new RealtimeFilterControl();
+    }
+}
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
index 075c552437..6455701d31 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
@@ -61,5 +61,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         }
 
         protected override RoomManager CreateRoomManager() => new RealtimeRoomManager();
+
+        protected override LoungeSubScreen CreateLounge() => new RealtimeLoungeSubScreen();
     }
 }
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftLoungeSubScreen.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftLoungeSubScreen.cs
new file mode 100644
index 0000000000..70fb1aef1d
--- /dev/null
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftLoungeSubScreen.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.Screens.Multi.Lounge;
+using osu.Game.Screens.Multi.Lounge.Components;
+
+namespace osu.Game.Screens.Multi.Timeshift
+{
+    public class TimeshiftLoungeSubScreen : LoungeSubScreen
+    {
+        protected override FilterControl CreateFilterControl() => new TimeshiftFilterControl();
+    }
+}
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
index d2d6a35a2e..a38b2a931e 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
@@ -45,5 +45,7 @@ namespace osu.Game.Screens.Multi.Timeshift
         }
 
         protected override RoomManager CreateRoomManager() => new TimeshiftRoomManager();
+
+        protected override LoungeSubScreen CreateLounge() => new TimeshiftLoungeSubScreen();
     }
 }

From a1ba4b6979f0a0029855bfb30b3215499d6905a1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 23:40:19 +0900
Subject: [PATCH 0414/3722] Split MatchSubScreen into abstract component +
 timeshift implementation

---
 ....cs => TestSceneTimeshiftRoomSubScreen.cs} | 12 +--
 .../Screens/Multi/Lounge/LoungeSubScreen.cs   |  4 +-
 osu.Game/Screens/Multi/Match/RoomSubScreen.cs | 74 ++++++++++++++++
 osu.Game/Screens/Multi/Multiplayer.cs         |  4 +-
 .../Multi/Timeshift/TimeshiftMultiplayer.cs   |  2 +-
 .../TimeshiftRoomSubScreen.cs}                | 88 +++----------------
 6 files changed, 97 insertions(+), 87 deletions(-)
 rename osu.Game.Tests/Visual/Multiplayer/{TestSceneMatchSubScreen.cs => TestSceneTimeshiftRoomSubScreen.cs} (94%)
 create mode 100644 osu.Game/Screens/Multi/Match/RoomSubScreen.cs
 rename osu.Game/Screens/Multi/{Match/MatchSubScreen.cs => Timeshift/TimeshiftRoomSubScreen.cs} (78%)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs
similarity index 94%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs
index bceb6efac1..f56f78ce89 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs
@@ -16,15 +16,15 @@ using osu.Game.Online.Multiplayer;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Multi;
-using osu.Game.Screens.Multi.Match;
 using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Screens.Multi.Timeshift;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Users;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneMatchSubScreen : MultiplayerTestScene
+    public class TestSceneTimeshiftRoomSubScreen : MultiplayerTestScene
     {
         protected override bool UseOnlineAPI => true;
 
@@ -34,7 +34,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         private BeatmapManager manager;
         private RulesetStore rulesets;
 
-        private TestMatchSubScreen match;
+        private TestTimeshiftRoomSubScreen match;
 
         [BackgroundDependencyLoader]
         private void load(GameHost host, AudioManager audio)
@@ -48,7 +48,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [SetUpSteps]
         public void SetupSteps()
         {
-            AddStep("load match", () => LoadScreen(match = new TestMatchSubScreen(Room)));
+            AddStep("load match", () => LoadScreen(match = new TestTimeshiftRoomSubScreen(Room)));
             AddUntilStep("wait for load", () => match.IsCurrentScreen());
         }
 
@@ -131,13 +131,13 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("match has original beatmap", () => match.Beatmap.Value.Beatmap.BeatmapInfo.BaseDifficulty.CircleSize != 1);
         }
 
-        private class TestMatchSubScreen : MatchSubScreen
+        private class TestTimeshiftRoomSubScreen : TimeshiftRoomSubScreen
         {
             public new Bindable<PlaylistItem> SelectedItem => base.SelectedItem;
 
             public new Bindable<WorkingBeatmap> Beatmap => base.Beatmap;
 
-            public TestMatchSubScreen(Room room)
+            public TestTimeshiftRoomSubScreen(Room room)
                 : base(room)
             {
             }
diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
index 26e351fc2b..f4591d089e 100644
--- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
@@ -13,7 +13,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Overlays;
 using osu.Game.Screens.Multi.Lounge.Components;
-using osu.Game.Screens.Multi.Match;
+using osu.Game.Screens.Multi.Timeshift;
 using osu.Game.Users;
 
 namespace osu.Game.Screens.Multi.Lounge
@@ -192,7 +192,7 @@ namespace osu.Game.Screens.Multi.Lounge
 
             selectedRoom.Value = room;
 
-            this.Push(new MatchSubScreen(room));
+            this.Push(new TimeshiftRoomSubScreen(room));
         }
 
         protected abstract FilterControl CreateFilterControl();
diff --git a/osu.Game/Screens/Multi/Match/RoomSubScreen.cs b/osu.Game/Screens/Multi/Match/RoomSubScreen.cs
new file mode 100644
index 0000000000..0cc9a4354e
--- /dev/null
+++ b/osu.Game/Screens/Multi/Match/RoomSubScreen.cs
@@ -0,0 +1,74 @@
+// Copyright (c) ppy 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.Screens;
+using osu.Game.Audio;
+using osu.Game.Beatmaps;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Screens.Multi.Match
+{
+    [Cached(typeof(IPreviewTrackOwner))]
+    public abstract class RoomSubScreen : MultiplayerSubScreen, IPreviewTrackOwner
+    {
+        protected readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
+
+        public override bool DisallowExternalBeatmapRulesetChanges => true;
+
+        [Resolved(typeof(Room), nameof(Room.Playlist))]
+        protected BindableList<PlaylistItem> Playlist { get; private set; }
+
+        [Resolved]
+        private BeatmapManager beatmapManager { get; set; }
+
+        private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            SelectedItem.BindValueChanged(_ => Scheduler.AddOnce(selectedItemChanged));
+            SelectedItem.Value = Playlist.FirstOrDefault();
+
+            managerUpdated = beatmapManager.ItemUpdated.GetBoundCopy();
+            managerUpdated.BindValueChanged(beatmapUpdated);
+        }
+
+        private void selectedItemChanged()
+        {
+            updateWorkingBeatmap();
+
+            var item = SelectedItem.Value;
+
+            Mods.Value = item?.RequiredMods?.ToArray() ?? Array.Empty<Mod>();
+
+            if (item?.Ruleset != null)
+                Ruleset.Value = item.Ruleset.Value;
+        }
+
+        private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> weakSet) => Schedule(updateWorkingBeatmap);
+
+        private void updateWorkingBeatmap()
+        {
+            var beatmap = SelectedItem.Value?.Beatmap.Value;
+
+            // 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.OnlineBeatmapID == beatmap.OnlineBeatmapID);
+
+            Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
+        }
+
+        public override bool OnExiting(IScreen next)
+        {
+            RoomManager?.PartRoom();
+            Mods.Value = Array.Empty<Mod>();
+
+            return base.OnExiting(next);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index b37ee45b84..eae779421d 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -308,7 +308,7 @@ namespace osu.Game.Screens.Multi
                     headerBackground.MoveToX(0, MultiplayerSubScreen.X_MOVE_DURATION, Easing.OutQuint);
                     break;
 
-                case MatchSubScreen _:
+                case RoomSubScreen _:
                     header.ResizeHeightTo(135, MultiplayerSubScreen.APPEAR_DURATION, Easing.OutQuint);
                     headerBackground.MoveToX(-MultiplayerSubScreen.X_SHIFT, MultiplayerSubScreen.X_MOVE_DURATION, Easing.OutQuint);
                     break;
@@ -330,7 +330,7 @@ namespace osu.Game.Screens.Multi
 
         private void updateTrack(ValueChangedEvent<WorkingBeatmap> _ = null)
         {
-            if (screenStack.CurrentScreen is MatchSubScreen)
+            if (screenStack.CurrentScreen is RoomSubScreen)
             {
                 var track = Beatmap.Value?.Track;
 
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
index a38b2a931e..2ea4857799 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Screens.Multi.Timeshift
                         timeshiftManager.TimeBetweenSelectionPolls.Value = isIdle ? 120000 : 15000;
                         break;
 
-                    case MatchSubScreen _:
+                    case RoomSubScreen _:
                         timeshiftManager.TimeBetweenListingPolls.Value = 0;
                         timeshiftManager.TimeBetweenSelectionPolls.Value = isIdle ? 30000 : 5000;
                         break;
diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs
similarity index 78%
rename from osu.Game/Screens/Multi/Match/MatchSubScreen.cs
rename to osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs
index 2f8aad4e65..433a980d60 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs
@@ -1,7 +1,6 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy 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 osu.Framework.Allocation;
@@ -9,28 +8,21 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
-using osu.Game.Audio;
-using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Online.Multiplayer.GameTypes;
-using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.Multi.Match;
 using osu.Game.Screens.Multi.Match.Components;
 using osu.Game.Screens.Multi.Play;
 using osu.Game.Screens.Multi.Ranking;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Select;
 using osu.Game.Users;
-using Footer = osu.Game.Screens.Multi.Match.Components.Footer;
 
-namespace osu.Game.Screens.Multi.Match
+namespace osu.Game.Screens.Multi.Timeshift
 {
-    [Cached(typeof(IPreviewTrackOwner))]
-    public class MatchSubScreen : MultiplayerSubScreen, IPreviewTrackOwner
+    public class TimeshiftRoomSubScreen : RoomSubScreen
     {
-        public override bool DisallowExternalBeatmapRulesetChanges => true;
-
         public override string Title { get; }
 
         public override string ShortTitle => "room";
@@ -38,27 +30,15 @@ namespace osu.Game.Screens.Multi.Match
         [Resolved(typeof(Room), nameof(Room.RoomID))]
         private Bindable<int?> roomId { get; set; }
 
-        [Resolved(typeof(Room), nameof(Room.Type))]
-        private Bindable<GameType> type { get; set; }
-
-        [Resolved(typeof(Room), nameof(Room.Playlist))]
-        private BindableList<PlaylistItem> playlist { get; set; }
-
-        [Resolved]
-        private BeatmapManager beatmapManager { get; set; }
-
         [Resolved(canBeNull: true)]
         private Multiplayer multiplayer { get; set; }
 
-        protected readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
-
         private MatchSettingsOverlay settingsOverlay;
         private MatchLeaderboard leaderboard;
 
-        private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
         private OverlinedHeader participantsHeader;
 
-        public MatchSubScreen(Room room)
+        public TimeshiftRoomSubScreen(Room room)
         {
             Title = room.RoomID.Value == null ? "New room" : room.Name.Value;
             Activity.Value = new UserActivity.InLobby(room);
@@ -96,7 +76,7 @@ namespace osu.Game.Screens.Multi.Match
                                     },
                                     Content = new[]
                                     {
-                                        new Drawable[] { new Components.Header() },
+                                        new Drawable[] { new Match.Components.Header() },
                                         new Drawable[]
                                         {
                                             participantsHeader = new OverlinedHeader("Participants")
@@ -141,7 +121,7 @@ namespace osu.Game.Screens.Multi.Match
                                                                         new DrawableRoomPlaylistWithResults
                                                                         {
                                                                             RelativeSizeAxes = Axes.Both,
-                                                                            Items = { BindTarget = playlist },
+                                                                            Items = { BindTarget = Playlist },
                                                                             SelectedItem = { BindTarget = SelectedItem },
                                                                             RequestShowResults = item =>
                                                                             {
@@ -195,7 +175,7 @@ namespace osu.Game.Screens.Multi.Match
                         },
                         new Drawable[]
                         {
-                            new Footer
+                            new Match.Components.Footer
                             {
                                 OnStart = onStart,
                                 SelectedItem = { BindTarget = SelectedItem }
@@ -234,61 +214,17 @@ namespace osu.Game.Screens.Multi.Match
 
                     // Set the first playlist item.
                     // This is scheduled since updating the room and playlist may happen in an arbitrary order (via Room.CopyFrom()).
-                    Schedule(() => SelectedItem.Value = playlist.FirstOrDefault());
+                    Schedule(() => SelectedItem.Value = Playlist.FirstOrDefault());
                 }
             }, true);
-
-            SelectedItem.BindValueChanged(_ => Scheduler.AddOnce(selectedItemChanged));
-            SelectedItem.Value = playlist.FirstOrDefault();
-
-            managerUpdated = beatmapManager.ItemUpdated.GetBoundCopy();
-            managerUpdated.BindValueChanged(beatmapUpdated);
-        }
-
-        public override bool OnExiting(IScreen next)
-        {
-            RoomManager?.PartRoom();
-            Mods.Value = Array.Empty<Mod>();
-
-            return base.OnExiting(next);
-        }
-
-        private void selectedItemChanged()
-        {
-            updateWorkingBeatmap();
-
-            var item = SelectedItem.Value;
-
-            Mods.Value = item?.RequiredMods?.ToArray() ?? Array.Empty<Mod>();
-
-            if (item?.Ruleset != null)
-                Ruleset.Value = item.Ruleset.Value;
-        }
-
-        private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> weakSet) => Schedule(updateWorkingBeatmap);
-
-        private void updateWorkingBeatmap()
-        {
-            var beatmap = SelectedItem.Value?.Beatmap.Value;
-
-            // 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.OnlineBeatmapID == beatmap.OnlineBeatmapID);
-
-            Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
         }
 
         private void onStart()
         {
-            switch (type.Value)
+            multiplayer?.Push(new PlayerLoader(() => new TimeshiftPlayer(SelectedItem.Value)
             {
-                default:
-                case GameTypeTimeshift _:
-                    multiplayer?.Push(new PlayerLoader(() => new TimeshiftPlayer(SelectedItem.Value)
-                    {
-                        Exited = () => leaderboard.RefreshScores()
-                    }));
-                    break;
-            }
+                Exited = () => leaderboard.RefreshScores()
+            }));
         }
     }
 }

From a25cd910f83fe6ed012fdf63e1f2a20245ac625d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 22:20:35 +0100
Subject: [PATCH 0415/3722] Prepare base DHO for HO application

---
 .../Objects/Drawables/DrawableTaikoHitObject.cs    | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
index cf3aa69b6f..6041eccb51 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Allocation;
+using JetBrains.Annotations;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         private readonly Container nonProxiedContent;
 
-        protected DrawableTaikoHitObject(TaikoHitObject hitObject)
+        protected DrawableTaikoHitObject([CanBeNull] TaikoHitObject hitObject)
             : base(hitObject)
         {
             AddRangeInternal(new[]
@@ -113,25 +113,23 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
     {
         public override Vector2 OriginPosition => new Vector2(DrawHeight / 2);
 
-        public new TObject HitObject;
+        public new TObject HitObject => (TObject)base.HitObject;
 
         protected Vector2 BaseSize;
         protected SkinnableDrawable MainPiece;
 
-        protected DrawableTaikoHitObject(TObject hitObject)
+        protected DrawableTaikoHitObject([CanBeNull] TObject hitObject)
             : base(hitObject)
         {
-            HitObject = hitObject;
-
             Anchor = Anchor.CentreLeft;
             Origin = Anchor.Custom;
 
             RelativeSizeAxes = Axes.Both;
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
+        protected override void OnApply()
         {
+            base.OnApply();
             RecreatePieces();
         }
 

From 7b350fc8e5f61644d63700c236fe2c447eb39efd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 22:27:45 +0100
Subject: [PATCH 0416/3722] Prepare strongable DHO for HO application

---
 .../DrawableTaikoStrongableHitObject.cs       | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs
index af3e94d9c6..62f338ca91 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs
@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
-using osu.Framework.Allocation;
+using JetBrains.Annotations;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Audio;
@@ -16,28 +16,38 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         where TObject : TaikoStrongableHitObject
         where TStrongNestedObject : StrongNestedHitObject
     {
-        private readonly Bindable<bool> isStrong;
+        private readonly Bindable<bool> isStrong = new BindableBool();
 
         private readonly Container<DrawableStrongNestedHit> strongHitContainer;
 
-        protected DrawableTaikoStrongableHitObject(TObject hitObject)
+        protected DrawableTaikoStrongableHitObject([CanBeNull] TObject hitObject)
             : base(hitObject)
         {
-            isStrong = HitObject.IsStrongBindable.GetBoundCopy();
-
             AddInternal(strongHitContainer = new Container<DrawableStrongNestedHit>());
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
+        protected override void OnApply()
         {
+            isStrong.BindTo(HitObject.IsStrongBindable);
             isStrong.BindValueChanged(_ =>
             {
-                // will overwrite samples, should only be called on change.
+                // will overwrite samples, should only be called on subsequent changes
+                // after the initial application.
                 updateSamplesFromStrong();
 
                 RecreatePieces();
             });
+
+            base.OnApply();
+        }
+
+        protected override void OnFree()
+        {
+            base.OnFree();
+
+            isStrong.UnbindFrom(HitObject.IsStrongBindable);
+            // ensure the next application does not accidentally overwrite samples.
+            isStrong.UnbindEvents();
         }
 
         private HitSampleInfo[] getStrongSamples() => HitObject.Samples.Where(s => s.Name == HitSampleInfo.HIT_FINISH).ToArray();

From a31e8d137f3c0bf2926e603a9ef294eb0f8f47c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 22:53:00 +0100
Subject: [PATCH 0417/3722] Add guard when clearing samples

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

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 644c67ea59..da6da0ea97 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -303,7 +303,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
             samplesBindable.CollectionChanged -= onSamplesChanged;
 
             // Release the samples for other hitobjects to use.
-            Samples.Samples = null;
+            if (Samples != null)
+                Samples.Samples = null;
 
             if (nestedHitObjects.IsValueCreated)
             {

From 55cdff5be770414190ed13b7d0effea094c848bb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 20 Dec 2020 23:49:06 +0900
Subject: [PATCH 0418/3722] Renamespace ready button

---
 .../Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs  | 2 +-
 .../RealtimeMultiplayer/{ => Match}/RealtimeReadyButton.cs      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename osu.Game/Screens/Multi/RealtimeMultiplayer/{ => Match}/RealtimeReadyButton.cs (98%)

diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs
index 1f863028af..b7cd81fb32 100644
--- a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs
+++ b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs
@@ -11,7 +11,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Rulesets;
-using osu.Game.Screens.Multi.RealtimeMultiplayer;
+using osu.Game.Screens.Multi.RealtimeMultiplayer.Match;
 using osu.Game.Tests.Resources;
 using osu.Game.Users;
 using osuTK;
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeReadyButton.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs
similarity index 98%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeReadyButton.cs
rename to osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs
index ea8fb04994..09487e9831 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeReadyButton.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs
@@ -15,7 +15,7 @@ using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Screens.Multi.Components;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
 {
     public class RealtimeReadyButton : RealtimeRoomComposite
     {

From 232c0205b4d7927c3b84dac00a719ec2fa4be7ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 22:51:35 +0100
Subject: [PATCH 0419/3722] Refactor hit object application scene to work
 reliably

---
 .../HitObjectApplicationTestScene.cs               | 14 ++++++++++----
 .../TestSceneBarLineApplication.cs                 |  7 ++++---
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/HitObjectApplicationTestScene.cs b/osu.Game.Rulesets.Taiko.Tests/HitObjectApplicationTestScene.cs
index 07c7b4d1db..a1d000386f 100644
--- a/osu.Game.Rulesets.Taiko.Tests/HitObjectApplicationTestScene.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/HitObjectApplicationTestScene.cs
@@ -25,16 +25,22 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
         private ScrollingHitObjectContainer hitObjectContainer;
 
-        [SetUpSteps]
-        public void SetUp()
-            => AddStep("create SHOC", () => Child = hitObjectContainer = new ScrollingHitObjectContainer
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Child = hitObjectContainer = new ScrollingHitObjectContainer
             {
                 RelativeSizeAxes = Axes.X,
                 Height = 200,
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 Clock = new FramedClock(new StopwatchClock())
-            });
+            };
+        }
+
+        [SetUpSteps]
+        public void SetUp()
+            => AddStep("clear SHOC", () => hitObjectContainer.Clear(false));
 
         protected void AddHitObject(DrawableHitObject hitObject)
             => AddStep("add to SHOC", () => hitObjectContainer.Add(hitObject));
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneBarLineApplication.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneBarLineApplication.cs
index 65230a07bc..a970965141 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneBarLineApplication.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneBarLineApplication.cs
@@ -12,12 +12,13 @@ namespace osu.Game.Rulesets.Taiko.Tests
         [Test]
         public void TestApplyNewBarLine()
         {
-            DrawableBarLine barLine = new DrawableBarLine(PrepareObject(new BarLine
+            DrawableBarLine barLine = new DrawableBarLine();
+
+            AddStep("apply new bar line", () => barLine.Apply(PrepareObject(new BarLine
             {
                 StartTime = 400,
                 Major = true
-            }));
-
+            }), null));
             AddHitObject(barLine);
             RemoveHitObject(barLine);
 

From 536df074a9a5505a9b14dddd29f616d42e243c93 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 00:02:49 +0900
Subject: [PATCH 0420/3722] Don't attempt to re-map existing beatmap/ruleset
 (for testing)

---
 osu.Game/Online/Multiplayer/PlaylistItem.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/PlaylistItem.cs b/osu.Game/Online/Multiplayer/PlaylistItem.cs
index 416091a1aa..4c4c071fc9 100644
--- a/osu.Game/Online/Multiplayer/PlaylistItem.cs
+++ b/osu.Game/Online/Multiplayer/PlaylistItem.cs
@@ -64,8 +64,8 @@ namespace osu.Game.Online.Multiplayer
 
         public void MapObjects(BeatmapManager beatmaps, RulesetStore rulesets)
         {
-            Beatmap.Value = apiBeatmap.ToBeatmap(rulesets);
-            Ruleset.Value = rulesets.GetRuleset(RulesetID);
+            Beatmap.Value ??= apiBeatmap.ToBeatmap(rulesets);
+            Ruleset.Value ??= rulesets.GetRuleset(RulesetID);
 
             Ruleset rulesetInstance = Ruleset.Value.CreateInstance();
 

From 1fdc19ee0fe9855a44eb95e94a8555be2103b0b7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 00:04:06 +0900
Subject: [PATCH 0421/3722] Add realtime match subscreen and related components

---
 .../TestSceneRealtimeMatchSubScreen.cs        |  77 +++
 .../Match/BeatmapSelectionControl.cs          |  81 ++++
 .../Match/RealtimeMatchFooter.cs              |  48 ++
 .../Match/RealtimeMatchHeader.cs              | 106 +++++
 .../Match/RealtimeMatchSettingsOverlay.cs     | 441 ++++++++++++++++++
 .../Participants/ParticipantsListHeader.cs    |  31 ++
 .../RealtimeMatchSongSelect.cs                |  20 +
 .../RealtimeMatchSubScreen.cs                 | 201 ++++++++
 .../RealtimeMultiplayer/RealtimePlayer.cs     |  16 +
 9 files changed, 1021 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMatchSubScreen.cs
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/Match/BeatmapSelectionControl.cs
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchFooter.cs
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchHeader.cs
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantsListHeader.cs
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs

diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMatchSubScreen.cs b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMatchSubScreen.cs
new file mode 100644
index 0000000000..d31364d62e
--- /dev/null
+++ b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMatchSubScreen.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 System.Linq;
+using NUnit.Framework;
+using osu.Framework.Screens;
+using osu.Framework.Testing;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Screens.Multi.RealtimeMultiplayer;
+using osu.Game.Screens.Multi.RealtimeMultiplayer.Match;
+using osu.Game.Tests.Beatmaps;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Visual.RealtimeMultiplayer
+{
+    public class TestSceneRealtimeMatchSubScreen : RealtimeMultiplayerTestScene
+    {
+        private RealtimeMatchSubScreen screen;
+
+        public TestSceneRealtimeMatchSubScreen()
+            : base(false)
+        {
+        }
+
+        [SetUp]
+        public new void Setup() => Schedule(() =>
+        {
+            Room.Name.Value = "Test Room";
+        });
+
+        [SetUpSteps]
+        public void SetupSteps()
+        {
+            AddStep("load match", () => LoadScreen(screen = new RealtimeMatchSubScreen(Room)));
+            AddUntilStep("wait for load", () => screen.IsCurrentScreen());
+        }
+
+        [Test]
+        public void TestSettingValidity()
+        {
+            AddAssert("create button not enabled", () => !this.ChildrenOfType<RealtimeMatchSettingsOverlay.CreateOrUpdateButton>().Single().Enabled.Value);
+
+            AddStep("set playlist", () =>
+            {
+                Room.Playlist.Add(new PlaylistItem
+                {
+                    Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
+                    Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                });
+            });
+
+            AddAssert("create button enabled", () => this.ChildrenOfType<RealtimeMatchSettingsOverlay.CreateOrUpdateButton>().Single().Enabled.Value);
+        }
+
+        [Test]
+        public void TestCreatedRoom()
+        {
+            AddStep("set playlist", () =>
+            {
+                Room.Playlist.Add(new PlaylistItem
+                {
+                    Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
+                    Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                });
+            });
+
+            AddStep("click create button", () =>
+            {
+                InputManager.MoveMouseTo(this.ChildrenOfType<RealtimeMatchSettingsOverlay.CreateOrUpdateButton>().Single());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddWaitStep("wait", 500);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/BeatmapSelectionControl.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/BeatmapSelectionControl.cs
new file mode 100644
index 0000000000..1939744916
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/BeatmapSelectionControl.cs
@@ -0,0 +1,81 @@
+// Copyright (c) ppy 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.Specialized;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Screens;
+using osu.Game.Online.API;
+using osu.Game.Screens.Multi.Match.Components;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
+{
+    public class BeatmapSelectionControl : MultiplayerComposite
+    {
+        [Resolved]
+        private RealtimeMatchSubScreen matchSubScreen { get; set; }
+
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        private Container beatmapPanelContainer;
+        private Button selectButton;
+
+        public BeatmapSelectionControl()
+        {
+            AutoSizeAxes = Axes.Y;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChild = new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Children = new Drawable[]
+                {
+                    beatmapPanelContainer = new Container
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y
+                    },
+                    selectButton = new PurpleTriangleButton
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Height = 40,
+                        Text = "Select beatmap",
+                        Action = () => matchSubScreen.Push(new RealtimeMatchSongSelect()),
+                        Alpha = 0
+                    }
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Playlist.BindCollectionChanged(onPlaylistChanged, true);
+            Host.BindValueChanged(host =>
+            {
+                if (RoomID.Value == null || host.NewValue?.Equals(api.LocalUser.Value) == true)
+                    selectButton.Show();
+                else
+                    selectButton.Hide();
+            }, true);
+        }
+
+        private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (Playlist.Any())
+                beatmapPanelContainer.Child = new DrawableRoomPlaylistItem(Playlist.Single(), false, false);
+            else
+                beatmapPanelContainer.Clear();
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchFooter.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchFooter.cs
new file mode 100644
index 0000000000..31871729f6
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchFooter.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 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.Graphics;
+using osu.Game.Online.Multiplayer;
+using osuTK;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
+{
+    public class RealtimeMatchFooter : CompositeDrawable
+    {
+        public const float HEIGHT = 50;
+
+        public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
+
+        private readonly Drawable background;
+
+        public RealtimeMatchFooter()
+        {
+            RelativeSizeAxes = Axes.X;
+            Height = HEIGHT;
+
+            InternalChildren = new[]
+            {
+                background = new Box { RelativeSizeAxes = Axes.Both },
+                new RealtimeReadyButton
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(600, 50),
+                    SelectedItem = { BindTarget = SelectedItem }
+                }
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            background.Colour = Color4Extensions.FromHex(@"28242d");
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchHeader.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchHeader.cs
new file mode 100644
index 0000000000..a9a10d1510
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchHeader.cs
@@ -0,0 +1,106 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Online.API;
+using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Users.Drawables;
+using osuTK;
+using FontWeight = osu.Game.Graphics.FontWeight;
+using OsuColour = osu.Game.Graphics.OsuColour;
+using OsuFont = osu.Game.Graphics.OsuFont;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
+{
+    public class RealtimeMatchHeader : MultiplayerComposite
+    {
+        public const float HEIGHT = 50;
+
+        public Action OpenSettings;
+
+        private UpdateableAvatar avatar;
+        private LinkFlowContainer hostText;
+        private Button openSettingsButton;
+
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        public RealtimeMatchHeader()
+        {
+            RelativeSizeAxes = Axes.X;
+            Height = HEIGHT;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            InternalChildren = new Drawable[]
+            {
+                new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Horizontal,
+                    Spacing = new Vector2(10, 0),
+                    Children = new Drawable[]
+                    {
+                        avatar = new UpdateableAvatar
+                        {
+                            Size = new Vector2(50),
+                            Masking = true,
+                            CornerRadius = 10,
+                        },
+                        new FillFlowContainer
+                        {
+                            AutoSizeAxes = Axes.Both,
+                            Direction = FillDirection.Vertical,
+                            Children = new Drawable[]
+                            {
+                                new OsuSpriteText
+                                {
+                                    Font = OsuFont.GetFont(size: 30),
+                                    Current = { BindTarget = RoomName }
+                                },
+                                hostText = new LinkFlowContainer(s => s.Font = OsuFont.GetFont(size: 20))
+                                {
+                                    AutoSizeAxes = Axes.Both,
+                                    Direction = FillDirection.Horizontal,
+                                }
+                            }
+                        }
+                    }
+                },
+                openSettingsButton = new PurpleTriangleButton
+                {
+                    Anchor = Anchor.CentreRight,
+                    Origin = Anchor.CentreRight,
+                    Size = new Vector2(150, HEIGHT),
+                    Text = "Open settings",
+                    Action = () => OpenSettings?.Invoke(),
+                    Alpha = 0
+                }
+            };
+
+            Host.BindValueChanged(host =>
+            {
+                avatar.User = host.NewValue;
+
+                hostText.Clear();
+
+                if (host.NewValue != null)
+                {
+                    hostText.AddText("hosted by ");
+                    hostText.AddUserLink(host.NewValue, s => s.Font = s.Font.With(weight: FontWeight.SemiBold));
+                }
+
+                openSettingsButton.Alpha = host.NewValue?.Equals(api.LocalUser.Value) == true ? 1 : 0;
+            }, true);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs
new file mode 100644
index 0000000000..3b9603e1bd
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs
@@ -0,0 +1,441 @@
+// Copyright (c) ppy 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;
+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.Multiplayer;
+using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Overlays;
+using osu.Game.Rulesets;
+using osu.Game.Screens.Multi.Match.Components;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
+{
+    public class RealtimeMatchSettingsOverlay : FocusedOverlayContainer
+    {
+        private const float transition_duration = 350;
+        private const float field_padding = 45;
+
+        protected MatchSettings Settings { get; private set; }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Masking = true;
+
+            Child = Settings = new MatchSettings
+            {
+                RelativeSizeAxes = Axes.Both,
+                RelativePositionAxes = Axes.Y,
+                SettingsApplied = Hide
+            };
+        }
+
+        protected override void PopIn()
+        {
+            Settings.MoveToY(0, transition_duration, Easing.OutQuint);
+        }
+
+        protected override void PopOut()
+        {
+            Settings.MoveToY(-1, transition_duration, Easing.InSine);
+        }
+
+        protected class MatchSettings : MultiplayerComposite
+        {
+            private const float disabled_alpha = 0.2f;
+
+            public Action SettingsApplied;
+
+            public OsuTextBox NameField, MaxParticipantsField;
+            public RoomAvailabilityPicker AvailabilityPicker;
+            public GameTypePicker TypePicker;
+            public TriangleButton ApplyButton;
+
+            public OsuSpriteText ErrorText;
+
+            private OsuSpriteText typeLabel;
+            private LoadingLayer loadingLayer;
+            private BeatmapSelectionControl initialBeatmapControl;
+
+            [Resolved]
+            private RealtimeRoomManager manager { get; set; }
+
+            [Resolved]
+            private StatefulMultiplayerClient client { get; set; }
+
+            [Resolved]
+            private Bindable<Room> currentRoom { get; set; }
+
+            [Resolved]
+            private Bindable<WorkingBeatmap> beatmap { get; set; }
+
+            [Resolved]
+            private Bindable<RulesetInfo> ruleset { get; set; }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                Container dimContent;
+
+                InternalChildren = new Drawable[]
+                {
+                    dimContent = new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Children = new Drawable[]
+                        {
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Colour = Color4Extensions.FromHex(@"28242d"),
+                            },
+                            new GridContainer
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                RowDimensions = new[]
+                                {
+                                    new Dimension(GridSizeMode.Distributed),
+                                    new Dimension(GridSizeMode.AutoSize),
+                                },
+                                Content = new[]
+                                {
+                                    new Drawable[]
+                                    {
+                                        new OsuScrollContainer
+                                        {
+                                            Padding = new MarginPadding
+                                            {
+                                                Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING,
+                                                Vertical = 10
+                                            },
+                                            RelativeSizeAxes = Axes.Both,
+                                            Children = new[]
+                                            {
+                                                new FillFlowContainer
+                                                {
+                                                    RelativeSizeAxes = Axes.X,
+                                                    AutoSizeAxes = Axes.Y,
+                                                    Direction = FillDirection.Vertical,
+                                                    Spacing = new Vector2(0, 10),
+                                                    Children = new Drawable[]
+                                                    {
+                                                        new Container
+                                                        {
+                                                            Anchor = Anchor.TopCentre,
+                                                            Origin = Anchor.TopCentre,
+                                                            Padding = new MarginPadding { Horizontal = WaveOverlayContainer.WIDTH_PADDING },
+                                                            RelativeSizeAxes = Axes.X,
+                                                            AutoSizeAxes = Axes.Y,
+                                                            Children = new Drawable[]
+                                                            {
+                                                                new SectionContainer
+                                                                {
+                                                                    Padding = new MarginPadding { Right = field_padding / 2 },
+                                                                    Children = new[]
+                                                                    {
+                                                                        new Section("Room name")
+                                                                        {
+                                                                            Child = NameField = new SettingsTextBox
+                                                                            {
+                                                                                RelativeSizeAxes = Axes.X,
+                                                                                TabbableContentContainer = this,
+                                                                            },
+                                                                        },
+                                                                        new Section("Room visibility")
+                                                                        {
+                                                                            Alpha = disabled_alpha,
+                                                                            Child = AvailabilityPicker = new RoomAvailabilityPicker
+                                                                            {
+                                                                                Enabled = { Value = false }
+                                                                            },
+                                                                        },
+                                                                        new Section("Game type")
+                                                                        {
+                                                                            Alpha = disabled_alpha,
+                                                                            Child = new FillFlowContainer
+                                                                            {
+                                                                                AutoSizeAxes = Axes.Y,
+                                                                                RelativeSizeAxes = Axes.X,
+                                                                                Direction = FillDirection.Vertical,
+                                                                                Spacing = new Vector2(7),
+                                                                                Children = new Drawable[]
+                                                                                {
+                                                                                    TypePicker = new GameTypePicker
+                                                                                    {
+                                                                                        RelativeSizeAxes = Axes.X,
+                                                                                        Enabled = { Value = false }
+                                                                                    },
+                                                                                    typeLabel = new OsuSpriteText
+                                                                                    {
+                                                                                        Font = OsuFont.GetFont(size: 14),
+                                                                                        Colour = colours.Yellow
+                                                                                    },
+                                                                                },
+                                                                            },
+                                                                        },
+                                                                    },
+                                                                },
+                                                                new SectionContainer
+                                                                {
+                                                                    Anchor = Anchor.TopRight,
+                                                                    Origin = Anchor.TopRight,
+                                                                    Padding = new MarginPadding { Left = field_padding / 2 },
+                                                                    Children = new[]
+                                                                    {
+                                                                        new Section("Max participants")
+                                                                        {
+                                                                            Alpha = disabled_alpha,
+                                                                            Child = MaxParticipantsField = new SettingsNumberTextBox
+                                                                            {
+                                                                                RelativeSizeAxes = Axes.X,
+                                                                                TabbableContentContainer = this,
+                                                                                ReadOnly = true,
+                                                                            },
+                                                                        },
+                                                                        new Section("Password (optional)")
+                                                                        {
+                                                                            Alpha = disabled_alpha,
+                                                                            Child = new SettingsPasswordTextBox
+                                                                            {
+                                                                                RelativeSizeAxes = Axes.X,
+                                                                                TabbableContentContainer = this,
+                                                                                ReadOnly = true,
+                                                                            },
+                                                                        },
+                                                                    }
+                                                                }
+                                                            },
+                                                        },
+                                                        initialBeatmapControl = new BeatmapSelectionControl
+                                                        {
+                                                            Anchor = Anchor.TopCentre,
+                                                            Origin = Anchor.TopCentre,
+                                                            RelativeSizeAxes = Axes.X,
+                                                            Width = 0.5f
+                                                        }
+                                                    }
+                                                }
+                                            },
+                                        },
+                                    },
+                                    new Drawable[]
+                                    {
+                                        new Container
+                                        {
+                                            Anchor = Anchor.BottomLeft,
+                                            Origin = Anchor.BottomLeft,
+                                            Y = 2,
+                                            RelativeSizeAxes = Axes.X,
+                                            AutoSizeAxes = Axes.Y,
+                                            Children = new Drawable[]
+                                            {
+                                                new Box
+                                                {
+                                                    RelativeSizeAxes = Axes.Both,
+                                                    Colour = Color4Extensions.FromHex(@"28242d").Darken(0.5f).Opacity(1f),
+                                                },
+                                                new FillFlowContainer
+                                                {
+                                                    RelativeSizeAxes = Axes.X,
+                                                    AutoSizeAxes = Axes.Y,
+                                                    Direction = FillDirection.Vertical,
+                                                    Spacing = new Vector2(0, 20),
+                                                    Margin = new MarginPadding { Vertical = 20 },
+                                                    Padding = new MarginPadding { Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING },
+                                                    Children = new Drawable[]
+                                                    {
+                                                        ApplyButton = new CreateOrUpdateButton
+                                                        {
+                                                            Anchor = Anchor.BottomCentre,
+                                                            Origin = Anchor.BottomCentre,
+                                                            Size = new Vector2(230, 55),
+                                                            Enabled = { Value = false },
+                                                            Action = apply,
+                                                        },
+                                                        ErrorText = new OsuSpriteText
+                                                        {
+                                                            Anchor = Anchor.BottomCentre,
+                                                            Origin = Anchor.BottomCentre,
+                                                            Alpha = 0,
+                                                            Depth = 1,
+                                                            Colour = colours.RedDark
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            },
+                        }
+                    },
+                    loadingLayer = new LoadingLayer(dimContent)
+                };
+
+                TypePicker.Current.BindValueChanged(type => typeLabel.Text = type.NewValue?.Name ?? string.Empty, true);
+                RoomName.BindValueChanged(name => NameField.Text = name.NewValue, true);
+                Availability.BindValueChanged(availability => AvailabilityPicker.Current.Value = availability.NewValue, true);
+                Type.BindValueChanged(type => TypePicker.Current.Value = type.NewValue, true);
+                MaxParticipants.BindValueChanged(count => MaxParticipantsField.Text = count.NewValue?.ToString(), true);
+                RoomID.BindValueChanged(roomId => initialBeatmapControl.Alpha = roomId.NewValue == null ? 1 : 0, true);
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+
+                ApplyButton.Enabled.Value = Playlist.Count > 0 && NameField.Text.Length > 0;
+            }
+
+            private void apply()
+            {
+                if (!ApplyButton.Enabled.Value)
+                    return;
+
+                hideError();
+                loadingLayer.Show();
+
+                // If the client is already in a room, update via the client.
+                // Otherwise, update the room directly in preparation for it to be submitted to the API on match creation.
+                if (client.Room != null)
+                {
+                    client.ChangeSettings(name: NameField.Text);
+                    onSuccess(currentRoom.Value);
+                }
+                else
+                {
+                    currentRoom.Value.Name.Value = NameField.Text;
+                    currentRoom.Value.Availability.Value = AvailabilityPicker.Current.Value;
+                    currentRoom.Value.Type.Value = TypePicker.Current.Value;
+
+                    if (int.TryParse(MaxParticipantsField.Text, out int max))
+                        currentRoom.Value.MaxParticipants.Value = max;
+                    else
+                        currentRoom.Value.MaxParticipants.Value = null;
+
+                    manager?.CreateRoom(currentRoom.Value, onSuccess, onError);
+                }
+            }
+
+            private void hideError() => ErrorText.FadeOut(50);
+
+            private void onSuccess(Room room)
+            {
+                loadingLayer.Hide();
+                SettingsApplied?.Invoke();
+            }
+
+            private void onError(string text)
+            {
+                ErrorText.Text = text;
+                ErrorText.FadeIn(50);
+
+                loadingLayer.Hide();
+            }
+        }
+
+        private class SettingsTextBox : OsuTextBox
+        {
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                BackgroundUnfocused = Color4.Black;
+                BackgroundFocused = Color4.Black;
+            }
+        }
+
+        private class SettingsNumberTextBox : SettingsTextBox
+        {
+            protected override bool CanAddCharacter(char character) => char.IsNumber(character);
+        }
+
+        private class SettingsPasswordTextBox : OsuPasswordTextBox
+        {
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                BackgroundUnfocused = Color4.Black;
+                BackgroundFocused = Color4.Black;
+            }
+        }
+
+        private class SectionContainer : FillFlowContainer<Section>
+        {
+            public SectionContainer()
+            {
+                RelativeSizeAxes = Axes.X;
+                AutoSizeAxes = Axes.Y;
+                Width = 0.5f;
+                Direction = FillDirection.Vertical;
+                Spacing = new Vector2(field_padding);
+            }
+        }
+
+        private class Section : Container
+        {
+            private readonly Container content;
+
+            protected override Container<Drawable> Content => content;
+
+            public Section(string title)
+            {
+                AutoSizeAxes = Axes.Y;
+                RelativeSizeAxes = Axes.X;
+
+                InternalChild = new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Y,
+                    RelativeSizeAxes = Axes.X,
+                    Direction = FillDirection.Vertical,
+                    Spacing = new Vector2(5),
+                    Children = new Drawable[]
+                    {
+                        new OsuSpriteText
+                        {
+                            Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 12),
+                            Text = title.ToUpper(),
+                        },
+                        content = new Container
+                        {
+                            AutoSizeAxes = Axes.Y,
+                            RelativeSizeAxes = Axes.X,
+                        },
+                    },
+                };
+            }
+        }
+
+        public class CreateOrUpdateButton : TriangleButton
+        {
+            [Resolved(typeof(Room), nameof(Room.RoomID))]
+            private Bindable<int?> roomId { get; set; }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                roomId.BindValueChanged(id => Text = id.NewValue == null ? "Create" : "Update", true);
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                BackgroundColour = colours.Yellow;
+                Triangles.ColourLight = colours.YellowLight;
+                Triangles.ColourDark = colours.YellowDark;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantsListHeader.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantsListHeader.cs
new file mode 100644
index 0000000000..0ca7d34005
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantsListHeader.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.Allocation;
+using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Screens.Multi.Components;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Participants
+{
+    public class ParticipantsListHeader : OverlinedHeader
+    {
+        [Resolved]
+        private StatefulMultiplayerClient client { get; set; }
+
+        public ParticipantsListHeader()
+            : base("Participants")
+        {
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            var room = client.Room;
+            if (room == null)
+                return;
+
+            Details.Value = room.Users.Count.ToString();
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
new file mode 100644
index 0000000000..9bcc303065
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.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.Screens.Select;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+{
+    public class RealtimeMatchSongSelect : SongSelect
+    {
+        protected override BeatmapDetailArea CreateBeatmapDetailArea()
+        {
+            throw new System.NotImplementedException();
+        }
+
+        protected override bool OnStart()
+        {
+            throw new System.NotImplementedException();
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
new file mode 100644
index 0000000000..d8b42e065b
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
@@ -0,0 +1,201 @@
+// Copyright (c) ppy 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.Specialized;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Screens;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.Multi.Match;
+using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Screens.Multi.RealtimeMultiplayer.Match;
+using osu.Game.Screens.Multi.RealtimeMultiplayer.Participants;
+using osu.Game.Screens.Play;
+using osu.Game.Users;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+{
+    [Cached]
+    public class RealtimeMatchSubScreen : RoomSubScreen
+    {
+        public override string Title { get; }
+
+        public override string ShortTitle => "match";
+
+        [Resolved(canBeNull: true)]
+        private Multiplayer multiplayer { get; set; }
+
+        [Resolved]
+        private StatefulMultiplayerClient client { get; set; }
+
+        private RealtimeMatchSettingsOverlay settingsOverlay;
+
+        public RealtimeMatchSubScreen(Room room)
+        {
+            Title = room.RoomID.Value == null ? "New match" : room.Name.Value;
+            Activity.Value = new UserActivity.InLobby(room);
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChildren = new Drawable[]
+            {
+                new GridContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Content = new[]
+                    {
+                        new Drawable[]
+                        {
+                            new Container
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Padding = new MarginPadding
+                                {
+                                    Horizontal = 105,
+                                    Vertical = 20
+                                },
+                                Child = new GridContainer
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    RowDimensions = new[]
+                                    {
+                                        new Dimension(GridSizeMode.AutoSize),
+                                        new Dimension(),
+                                    },
+                                    Content = new[]
+                                    {
+                                        new Drawable[]
+                                        {
+                                            new RealtimeMatchHeader
+                                            {
+                                                OpenSettings = () => settingsOverlay.Show()
+                                            }
+                                        },
+                                        new Drawable[]
+                                        {
+                                            new GridContainer
+                                            {
+                                                RelativeSizeAxes = Axes.Both,
+                                                Content = new[]
+                                                {
+                                                    new Drawable[]
+                                                    {
+                                                        new Container
+                                                        {
+                                                            RelativeSizeAxes = Axes.Both,
+                                                            Padding = new MarginPadding { Horizontal = 5, Vertical = 10 },
+                                                            Child = new GridContainer
+                                                            {
+                                                                RelativeSizeAxes = Axes.Both,
+                                                                RowDimensions = new[]
+                                                                {
+                                                                    new Dimension(GridSizeMode.AutoSize)
+                                                                },
+                                                                Content = new[]
+                                                                {
+                                                                    new Drawable[] { new ParticipantsListHeader() },
+                                                                    new Drawable[]
+                                                                    {
+                                                                        new Participants.ParticipantsList
+                                                                        {
+                                                                            RelativeSizeAxes = Axes.Both
+                                                                        },
+                                                                    }
+                                                                }
+                                                            }
+                                                        },
+                                                        new FillFlowContainer
+                                                        {
+                                                            Anchor = Anchor.Centre,
+                                                            Origin = Anchor.Centre,
+                                                            RelativeSizeAxes = Axes.X,
+                                                            AutoSizeAxes = Axes.Y,
+                                                            Padding = new MarginPadding { Horizontal = 5 },
+                                                            Children = new Drawable[]
+                                                            {
+                                                                new OverlinedHeader("Beatmap"),
+                                                                new BeatmapSelectionControl { RelativeSizeAxes = Axes.X }
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        },
+                                        new Drawable[]
+                                        {
+                                            new GridContainer
+                                            {
+                                                RelativeSizeAxes = Axes.Both,
+                                                RowDimensions = new[]
+                                                {
+                                                    new Dimension(GridSizeMode.AutoSize)
+                                                },
+                                                Content = new[]
+                                                {
+                                                    new Drawable[] { new OverlinedHeader("Chat") },
+                                                    new Drawable[] { new MatchChatDisplay { RelativeSizeAxes = Axes.Both } }
+                                                }
+                                            }
+                                        }
+                                    },
+                                }
+                            }
+                        },
+                        new Drawable[]
+                        {
+                            new Footer { SelectedItem = { BindTarget = SelectedItem } }
+                        }
+                    },
+                    RowDimensions = new[]
+                    {
+                        new Dimension(),
+                        new Dimension(GridSizeMode.AutoSize),
+                    }
+                },
+                settingsOverlay = new RealtimeMatchSettingsOverlay
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    State = { Value = client.Room == null ? Visibility.Visible : Visibility.Hidden }
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Playlist.BindCollectionChanged(onPlaylistChanged, true);
+
+            client.LoadRequested += onLoadRequested;
+        }
+
+        public override bool OnBackButton()
+        {
+            if (client.Room != null && settingsOverlay.State.Value == Visibility.Visible)
+            {
+                settingsOverlay.Hide();
+                return true;
+            }
+
+            return base.OnBackButton();
+        }
+
+        private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e) => SelectedItem.Value = Playlist.FirstOrDefault();
+
+        private void onLoadRequested() => multiplayer?.Push(new PlayerLoader(() => new RealtimePlayer(SelectedItem.Value)));
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (client != null)
+                client.LoadRequested -= onLoadRequested;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
new file mode 100644
index 0000000000..d629027246
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.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.Game.Online.Multiplayer;
+using osu.Game.Screens.Multi.Play;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+{
+    public class RealtimePlayer : TimeshiftPlayer
+    {
+        public RealtimePlayer(PlaylistItem playlistItem)
+            : base(playlistItem)
+        {
+        }
+    }
+}

From 945ba59c8e3cb9c6df69fdba8ced4fc8322f9085 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 00:06:44 +0900
Subject: [PATCH 0422/3722] Make timeshift player able to not allow pause

---
 osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
index 41dcf61740..f86d8ff267 100644
--- a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
+++ b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
@@ -35,7 +35,8 @@ namespace osu.Game.Screens.Multi.Play
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; }
 
-        public TimeshiftPlayer(PlaylistItem playlistItem)
+        public TimeshiftPlayer(PlaylistItem playlistItem, bool allowPause = true)
+            : base(allowPause)
         {
             this.playlistItem = playlistItem;
         }

From 07077b8f4e52e2aa3902d73a4f936fc2086e7e84 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 00:13:05 +0900
Subject: [PATCH 0423/3722] Add realtime player

---
 .../Screens/Multi/Play/TimeshiftPlayer.cs     | 32 ++++-----
 .../RealtimeMultiplayer/RealtimePlayer.cs     | 67 ++++++++++++++++++-
 .../RealtimeResultsScreen.cs                  | 17 +++++
 3 files changed, 99 insertions(+), 17 deletions(-)
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeResultsScreen.cs

diff --git a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
index f86d8ff267..e8462088f1 100644
--- a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
+++ b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
@@ -25,9 +25,11 @@ namespace osu.Game.Screens.Multi.Play
         public Action Exited;
 
         [Resolved(typeof(Room), nameof(Room.RoomID))]
-        private Bindable<int?> roomId { get; set; }
+        protected Bindable<int?> RoomId { get; private set; }
 
-        private readonly PlaylistItem playlistItem;
+        protected readonly PlaylistItem PlaylistItem;
+
+        protected int? Token { get; private set; }
 
         [Resolved]
         private IAPIProvider api { get; set; }
@@ -38,30 +40,28 @@ namespace osu.Game.Screens.Multi.Play
         public TimeshiftPlayer(PlaylistItem playlistItem, bool allowPause = true)
             : base(allowPause)
         {
-            this.playlistItem = playlistItem;
+            PlaylistItem = playlistItem;
         }
 
-        private int? token;
-
         [BackgroundDependencyLoader]
         private void load()
         {
-            token = null;
+            Token = null;
 
             bool failed = false;
 
             // Sanity checks to ensure that TimeshiftPlayer matches the settings for the current PlaylistItem
-            if (Beatmap.Value.BeatmapInfo.OnlineBeatmapID != playlistItem.Beatmap.Value.OnlineBeatmapID)
+            if (Beatmap.Value.BeatmapInfo.OnlineBeatmapID != PlaylistItem.Beatmap.Value.OnlineBeatmapID)
                 throw new InvalidOperationException("Current Beatmap does not match PlaylistItem's Beatmap");
 
-            if (ruleset.Value.ID != playlistItem.Ruleset.Value.ID)
+            if (ruleset.Value.ID != PlaylistItem.Ruleset.Value.ID)
                 throw new InvalidOperationException("Current Ruleset does not match PlaylistItem's Ruleset");
 
-            if (!playlistItem.RequiredMods.All(m => Mods.Value.Any(m.Equals)))
+            if (!PlaylistItem.RequiredMods.All(m => Mods.Value.Any(m.Equals)))
                 throw new InvalidOperationException("Current Mods do not match PlaylistItem's RequiredMods");
 
-            var req = new CreateRoomScoreRequest(roomId.Value ?? 0, playlistItem.ID, Game.VersionHash);
-            req.Success += r => token = r.ID;
+            var req = new CreateRoomScoreRequest(RoomId.Value ?? 0, PlaylistItem.ID, Game.VersionHash);
+            req.Success += r => Token = r.ID;
             req.Failure += e =>
             {
                 failed = true;
@@ -77,7 +77,7 @@ namespace osu.Game.Screens.Multi.Play
 
             api.Queue(req);
 
-            while (!failed && !token.HasValue)
+            while (!failed && !Token.HasValue)
                 Thread.Sleep(1000);
         }
 
@@ -93,8 +93,8 @@ namespace osu.Game.Screens.Multi.Play
 
         protected override ResultsScreen CreateResults(ScoreInfo score)
         {
-            Debug.Assert(roomId.Value != null);
-            return new TimeshiftResultsScreen(score, roomId.Value.Value, playlistItem, true);
+            Debug.Assert(RoomId.Value != null);
+            return new TimeshiftResultsScreen(score, RoomId.Value.Value, PlaylistItem, true);
         }
 
         protected override Score CreateScore()
@@ -108,10 +108,10 @@ namespace osu.Game.Screens.Multi.Play
         {
             await base.SubmitScore(score);
 
-            Debug.Assert(token != null);
+            Debug.Assert(Token != null);
 
             var tcs = new TaskCompletionSource<bool>();
-            var request = new SubmitRoomScoreRequest(token.Value, roomId.Value ?? 0, playlistItem.ID, score.ScoreInfo);
+            var request = new SubmitRoomScoreRequest(Token.Value, RoomId.Value ?? 0, PlaylistItem.ID, score.ScoreInfo);
 
             request.Success += s =>
             {
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index d629027246..d654496f40 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -1,16 +1,81 @@
 // Copyright (c) ppy 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.Threading;
+using System.Threading.Tasks;
+using osu.Framework.Allocation;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Scoring;
 using osu.Game.Screens.Multi.Play;
+using osu.Game.Screens.Ranking;
 
 namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 {
     public class RealtimePlayer : TimeshiftPlayer
     {
+        protected override bool PauseOnFocusLost => false;
+
+        // Disallow fails in multiplayer for now.
+        protected override bool CheckModsAllowFailure() => false;
+
+        [Resolved]
+        private StatefulMultiplayerClient client { get; set; }
+
+        private readonly TaskCompletionSource<bool> resultsReady = new TaskCompletionSource<bool>();
+        private bool started;
+
         public RealtimePlayer(PlaylistItem playlistItem)
-            : base(playlistItem)
+            : base(playlistItem, false)
         {
         }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            if (Token == null)
+                return; // Todo: Somehow handle token retrieval failure.
+
+            client.MatchStarted += onMatchStarted;
+            client.ResultsReady += onResultsReady;
+            client.ChangeState(MultiplayerUserState.Loaded);
+
+            while (!started)
+                Thread.Sleep(100);
+        }
+
+        private void onMatchStarted() => started = true;
+
+        private void onResultsReady() => resultsReady.SetResult(true);
+
+        protected override async Task SubmitScore(Score score)
+        {
+            await base.SubmitScore(score);
+
+            await client.ChangeState(MultiplayerUserState.FinishedPlay);
+
+            // Await up to 30 seconds for results to become available (3 api request timeouts).
+            // This is arbitrary just to not leave the player in an essentially deadlocked state if any connection issues occur.
+            await Task.WhenAny(resultsReady.Task, Task.Delay(TimeSpan.FromSeconds(30)));
+        }
+
+        protected override ResultsScreen CreateResults(ScoreInfo score)
+        {
+            Debug.Assert(RoomId.Value != null);
+            return new RealtimeResultsScreen(score, RoomId.Value.Value, PlaylistItem);
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (client != null)
+            {
+                client.MatchStarted -= onMatchStarted;
+                client.ResultsReady -= onResultsReady;
+            }
+        }
     }
 }
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeResultsScreen.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeResultsScreen.cs
new file mode 100644
index 0000000000..1598c8fbb5
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeResultsScreen.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Online.Multiplayer;
+using osu.Game.Scoring;
+using osu.Game.Screens.Multi.Ranking;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+{
+    public class RealtimeResultsScreen : TimeshiftResultsScreen
+    {
+        public RealtimeResultsScreen(ScoreInfo score, int roomId, PlaylistItem playlistItem)
+            : base(score, roomId, playlistItem, false)
+        {
+        }
+    }
+}

From 5b4197a9efb7194e955d2d6eb891f8ec67638f91 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 00:14:54 +0900
Subject: [PATCH 0424/3722] Disable watching replays from realtime results
 screen

---
 .../Multi/Ranking/TimeshiftResultsScreen.cs   |  4 ++--
 .../RealtimeResultsScreen.cs                  |  2 +-
 osu.Game/Screens/Ranking/ResultsScreen.cs     | 23 +++++++++++--------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
index 3623208fa7..d3f1c19c7c 100644
--- a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
+++ b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
@@ -32,8 +32,8 @@ namespace osu.Game.Screens.Multi.Ranking
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        public TimeshiftResultsScreen(ScoreInfo score, int roomId, PlaylistItem playlistItem, bool allowRetry)
-            : base(score, allowRetry)
+        public TimeshiftResultsScreen(ScoreInfo score, int roomId, PlaylistItem playlistItem, bool allowRetry, bool allowWatchingReplay = true)
+            : base(score, allowRetry, allowWatchingReplay)
         {
             this.roomId = roomId;
             this.playlistItem = playlistItem;
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeResultsScreen.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeResultsScreen.cs
index 1598c8fbb5..3964a87eb6 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeResultsScreen.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeResultsScreen.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
     public class RealtimeResultsScreen : TimeshiftResultsScreen
     {
         public RealtimeResultsScreen(ScoreInfo score, int roomId, PlaylistItem playlistItem)
-            : base(score, roomId, playlistItem, false)
+            : base(score, roomId, playlistItem, false, false)
         {
         }
     }
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 887e7ec8a9..528a1842af 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -57,11 +57,13 @@ namespace osu.Game.Screens.Ranking
         private APIRequest nextPageRequest;
 
         private readonly bool allowRetry;
+        private readonly bool allowWatchingReplay;
 
-        protected ResultsScreen(ScoreInfo score, bool allowRetry)
+        protected ResultsScreen(ScoreInfo score, bool allowRetry, bool allowWatchingReplay = true)
         {
             Score = score;
             this.allowRetry = allowRetry;
+            this.allowWatchingReplay = allowWatchingReplay;
 
             SelectedScore.Value = score;
         }
@@ -128,15 +130,7 @@ namespace osu.Game.Screens.Ranking
                                     Origin = Anchor.Centre,
                                     AutoSizeAxes = Axes.Both,
                                     Spacing = new Vector2(5),
-                                    Direction = FillDirection.Horizontal,
-                                    Children = new Drawable[]
-                                    {
-                                        new ReplayDownloadButton(null)
-                                        {
-                                            Score = { BindTarget = SelectedScore },
-                                            Width = 300
-                                        },
-                                    }
+                                    Direction = FillDirection.Horizontal
                                 }
                             }
                         }
@@ -157,6 +151,15 @@ namespace osu.Game.Screens.Ranking
                 ScorePanelList.AddScore(Score, shouldFlair);
             }
 
+            if (allowWatchingReplay)
+            {
+                buttons.Add(new ReplayDownloadButton(null)
+                {
+                    Score = { BindTarget = SelectedScore },
+                    Width = 300
+                });
+            }
+
             if (player != null && allowRetry)
             {
                 buttons.Add(new RetryButton { Width = 300 });

From 15480c006b6353620b64dce0affcb935d935e3a7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 00:21:30 +0900
Subject: [PATCH 0425/3722] Create the correct room subscreen

---
 osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs            | 6 ++++--
 .../Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.cs    | 4 ++++
 .../Screens/Multi/Timeshift/TimeshiftLoungeSubScreen.cs     | 4 ++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
index f4591d089e..44c893363b 100644
--- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
@@ -13,7 +13,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Overlays;
 using osu.Game.Screens.Multi.Lounge.Components;
-using osu.Game.Screens.Multi.Timeshift;
+using osu.Game.Screens.Multi.Match;
 using osu.Game.Users;
 
 namespace osu.Game.Screens.Multi.Lounge
@@ -192,9 +192,11 @@ namespace osu.Game.Screens.Multi.Lounge
 
             selectedRoom.Value = room;
 
-            this.Push(new TimeshiftRoomSubScreen(room));
+            this.Push(CreateRoomSubScreen(room));
         }
 
         protected abstract FilterControl CreateFilterControl();
+
+        protected abstract RoomSubScreen CreateRoomSubScreen(Room room);
     }
 }
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.cs
index ed187e436f..9fbf0c4654 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.cs
@@ -1,13 +1,17 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Lounge.Components;
+using osu.Game.Screens.Multi.Match;
 
 namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 {
     public class RealtimeLoungeSubScreen : LoungeSubScreen
     {
         protected override FilterControl CreateFilterControl() => new RealtimeFilterControl();
+
+        protected override RoomSubScreen CreateRoomSubScreen(Room room) => new RealtimeMatchSubScreen(room);
     }
 }
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftLoungeSubScreen.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftLoungeSubScreen.cs
index 70fb1aef1d..8e426ffbcc 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftLoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftLoungeSubScreen.cs
@@ -1,13 +1,17 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Lounge.Components;
+using osu.Game.Screens.Multi.Match;
 
 namespace osu.Game.Screens.Multi.Timeshift
 {
     public class TimeshiftLoungeSubScreen : LoungeSubScreen
     {
         protected override FilterControl CreateFilterControl() => new TimeshiftFilterControl();
+
+        protected override RoomSubScreen CreateRoomSubScreen(Room room) => new TimeshiftRoomSubScreen(room);
     }
 }

From 959959dbedf50b76d470d5f0457c260988e7c15b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 00:21:41 +0900
Subject: [PATCH 0426/3722] Add multiplayer client to OsuGameBase

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

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 150569f1dd..eb27821d82 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -30,6 +30,7 @@ using osu.Game.Database;
 using osu.Game.Input;
 using osu.Game.Input.Bindings;
 using osu.Game.IO;
+using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Online.Spectator;
 using osu.Game.Overlays;
 using osu.Game.Resources;
@@ -78,6 +79,7 @@ namespace osu.Game
         protected IAPIProvider API;
 
         private SpectatorStreamingClient spectatorStreaming;
+        private StatefulMultiplayerClient multiplayerClient;
 
         protected MenuCursorContainer MenuCursorContainer;
 
@@ -211,6 +213,7 @@ namespace osu.Game
             dependencies.CacheAs(API ??= new APIAccess(LocalConfig));
 
             dependencies.CacheAs(spectatorStreaming = new SpectatorStreamingClient());
+            dependencies.CacheAs(multiplayerClient = new RealtimeMultiplayerClient());
 
             var defaultBeatmap = new DummyWorkingBeatmap(Audio, Textures);
 
@@ -277,6 +280,7 @@ namespace osu.Game
             if (API is APIAccess apiAccess)
                 AddInternal(apiAccess);
             AddInternal(spectatorStreaming);
+            AddInternal(multiplayerClient);
 
             AddInternal(RulesetConfigCache);
 

From 275efd12b84bf8d775313bcf93d75840c48ad370 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 00:21:48 +0900
Subject: [PATCH 0427/3722] Fix room manager reference

---
 .../RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs
index 3b9603e1bd..924c736472 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs
@@ -71,7 +71,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
             private BeatmapSelectionControl initialBeatmapControl;
 
             [Resolved]
-            private RealtimeRoomManager manager { get; set; }
+            private IRoomManager manager { get; set; }
 
             [Resolved]
             private StatefulMultiplayerClient client { get; set; }

From e32b1c34cac0436c39a5087896f386af30239d06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 22:53:46 +0100
Subject: [PATCH 0428/3722] Implement hit application

---
 .../TestSceneHitApplication.cs                | 37 ++++++++++++++++
 .../Objects/Drawables/DrawableHit.cs          | 44 ++++++++++++++-----
 2 files changed, 70 insertions(+), 11 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/TestSceneHitApplication.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneHitApplication.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneHitApplication.cs
new file mode 100644
index 0000000000..52fd440857
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneHitApplication.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 NUnit.Framework;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Taiko.Tests
+{
+    public class TestSceneHitApplication : HitObjectApplicationTestScene
+    {
+        [Test]
+        public void TestApplyNewHit()
+        {
+            var hit = new DrawableHit();
+
+            AddStep("apply new hit", () => hit.Apply(PrepareObject(new Hit
+            {
+                Type = HitType.Rim,
+                IsStrong = false,
+                StartTime = 300
+            }), null));
+
+            AddHitObject(hit);
+            RemoveHitObject(hit);
+
+            AddStep("apply new hit", () => hit.Apply(PrepareObject(new Hit
+            {
+                Type = HitType.Centre,
+                IsStrong = true,
+                StartTime = 500
+            }), null));
+
+            AddHitObject(hit);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index 431f2980ec..5a479e1f53 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using osu.Framework.Allocation;
+using JetBrains.Annotations;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Audio;
@@ -36,29 +36,51 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         private bool pressHandledThisFrame;
 
-        private readonly Bindable<HitType> type;
+        private readonly Bindable<HitType> type = new Bindable<HitType>();
 
-        public DrawableHit(Hit hit)
-            : base(hit)
+        public DrawableHit()
+            : this(null)
         {
-            type = HitObject.TypeBindable.GetBoundCopy();
-            FillMode = FillMode.Fit;
-
-            updateActionsFromType();
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
+        public DrawableHit([CanBeNull] Hit hit)
+            : base(hit)
         {
+            FillMode = FillMode.Fit;
+        }
+
+        protected override void OnApply()
+        {
+            type.BindTo(HitObject.TypeBindable);
             type.BindValueChanged(_ =>
             {
                 updateActionsFromType();
 
-                // will overwrite samples, should only be called on change.
+                // will overwrite samples, should only be called on subsequent changes
+                // after the initial application.
                 updateSamplesFromTypeChange();
 
                 RecreatePieces();
             });
+
+            // action update also has to happen immediately on application.
+            updateActionsFromType();
+
+            base.OnApply();
+        }
+
+        protected override void OnFree()
+        {
+            base.OnFree();
+
+            type.UnbindFrom(HitObject.TypeBindable);
+            type.UnbindEvents();
+
+            UnproxyContent();
+
+            HitActions = null;
+            HitAction = null;
+            validActionPressed = pressHandledThisFrame = false;
         }
 
         private HitSampleInfo[] getRimSamples() => HitObject.Samples.Where(s => s.Name == HitSampleInfo.HIT_CLAP || s.Name == HitSampleInfo.HIT_WHISTLE).ToArray();

From 8b6bc09b8f0c0dd48879fe05adb5f614aeb4dc29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 23:02:33 +0100
Subject: [PATCH 0429/3722] Implement drum roll application

---
 .../TestSceneDrumRollApplication.cs           | 39 +++++++++++++++++++
 .../Objects/Drawables/DrawableDrumRoll.cs     | 34 ++++++++++------
 2 files changed, 62 insertions(+), 11 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/TestSceneDrumRollApplication.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumRollApplication.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumRollApplication.cs
new file mode 100644
index 0000000000..54450e27db
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumRollApplication.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 NUnit.Framework;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Taiko.Tests
+{
+    public class TestSceneDrumRollApplication : HitObjectApplicationTestScene
+    {
+        [Test]
+        public void TestApplyNewDrumRoll()
+        {
+            var drumRoll = new DrawableDrumRoll();
+
+            AddStep("apply new drum roll", () => drumRoll.Apply(PrepareObject(new DrumRoll
+            {
+                StartTime = 300,
+                Duration = 500,
+                IsStrong = false,
+                TickRate = 2
+            }), null));
+
+            AddHitObject(drumRoll);
+            RemoveHitObject(drumRoll);
+
+            AddStep("apply new drum roll", () => drumRoll.Apply(PrepareObject(new DrumRoll
+            {
+                StartTime = 150,
+                Duration = 400,
+                IsStrong = true,
+                TickRate = 16
+            }), null));
+
+            AddHitObject(drumRoll);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index 4925b6fdfc..ede7453804 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Utils;
 using osu.Game.Graphics;
@@ -31,15 +32,26 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         /// </summary>
         private int rollingHits;
 
-        private Container tickContainer;
+        private readonly Container tickContainer;
 
         private Color4 colourIdle;
         private Color4 colourEngaged;
 
-        public DrawableDrumRoll(DrumRoll drumRoll)
+        public DrawableDrumRoll()
+            : this(null)
+        {
+        }
+
+        public DrawableDrumRoll([CanBeNull] DrumRoll drumRoll)
             : base(drumRoll)
         {
             RelativeSizeAxes = Axes.Y;
+
+            Content.Add(tickContainer = new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Depth = float.MinValue
+            });
         }
 
         [BackgroundDependencyLoader]
@@ -47,12 +59,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         {
             colourIdle = colours.YellowDark;
             colourEngaged = colours.YellowDarker;
-
-            Content.Add(tickContainer = new Container
-            {
-                RelativeSizeAxes = Axes.Both,
-                Depth = float.MinValue
-            });
         }
 
         protected override void LoadComplete()
@@ -68,6 +74,12 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             updateColour();
         }
 
+        protected override void OnFree()
+        {
+            base.OnFree();
+            rollingHits = 0;
+        }
+
         protected override void AddNestedHitObject(DrawableHitObject hitObject)
         {
             base.AddNestedHitObject(hitObject);
@@ -114,7 +126,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
             rollingHits = Math.Clamp(rollingHits, 0, rolling_hits_for_engaged_colour);
 
-            updateColour();
+            updateColour(100);
         }
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
@@ -156,10 +168,10 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         protected override DrawableStrongNestedHit CreateStrongNestedHit(DrumRoll.StrongNestedHit hitObject) => new StrongNestedHit(hitObject, this);
 
-        private void updateColour()
+        private void updateColour(double fadeDuration = 0)
         {
             Color4 newColour = Interpolation.ValueAt((float)rollingHits / rolling_hits_for_engaged_colour, colourIdle, colourEngaged, 0, 1);
-            (MainPiece.Drawable as IHasAccentColour)?.FadeAccent(newColour, 100);
+            (MainPiece.Drawable as IHasAccentColour)?.FadeAccent(newColour, fadeDuration);
         }
 
         private class StrongNestedHit : DrawableStrongNestedHit

From e3b6eaa39059ba8afc2e71a0d034bc3b227fe49f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 23:06:22 +0100
Subject: [PATCH 0430/3722] Implement swell application

Also removes a weird sizing application that seems to have no effect
(introduced in 27e63eb; compare removals for other taiko DHO types in
9d00e5b and 58bf288).
---
 .../Objects/Drawables/DrawableSwell.cs          | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
index 229d581d0c..9798a79450 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -35,7 +36,12 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         private readonly CircularContainer targetRing;
         private readonly CircularContainer expandingRing;
 
-        public DrawableSwell(Swell swell)
+        public DrawableSwell()
+            : this(null)
+        {
+        }
+
+        public DrawableSwell([CanBeNull] Swell swell)
             : base(swell)
         {
             FillMode = FillMode.Fit;
@@ -123,12 +129,13 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                 Origin = Anchor.Centre,
             });
 
-        protected override void LoadComplete()
+        protected override void OnFree()
         {
-            base.LoadComplete();
+            base.OnFree();
 
-            // We need to set this here because RelativeSizeAxes won't/can't set our size by default with a different RelativeChildSize
-            Width *= Parent.RelativeChildSize.X;
+            UnproxyContent();
+
+            lastWasCentre = null;
         }
 
         protected override void AddNestedHitObject(DrawableHitObject hitObject)

From 3bd42795899eda793b9b0d346abdae7902585ca9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 23:10:19 +0100
Subject: [PATCH 0431/3722] Implement drum roll tick application

---
 .../Objects/Drawables/DrawableDrumRollTick.cs             | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
index c6761de5e3..e7d8ef1e12 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using JetBrains.Annotations;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.Skinning.Default;
@@ -16,7 +17,12 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         /// </summary>
         public HitType JudgementType;
 
-        public DrawableDrumRollTick(DrumRollTick tick)
+        public DrawableDrumRollTick()
+            : this(null)
+        {
+        }
+
+        public DrawableDrumRollTick([CanBeNull] DrumRollTick tick)
             : base(tick)
         {
             FillMode = FillMode.Fit;

From d823c77a63e315207bbe7f282ef07ef3eeb8bf1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 23:11:51 +0100
Subject: [PATCH 0432/3722] Implement swell tick application

---
 .../Objects/Drawables/DrawableSwellTick.cs                | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwellTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwellTick.cs
index 14c86d151f..47fc7e5ab3 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwellTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwellTick.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 JetBrains.Annotations;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Taiko.Skinning.Default;
 using osu.Game.Skinning;
@@ -11,7 +12,12 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
     {
         public override bool DisplayResult => false;
 
-        public DrawableSwellTick(SwellTick hitObject)
+        public DrawableSwellTick()
+            : this(null)
+        {
+        }
+
+        public DrawableSwellTick([CanBeNull] SwellTick hitObject)
             : base(hitObject)
         {
         }

From ae6dedacaf1edb784c9ca7bdfb4a871f6e0821f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 14 Dec 2020 23:21:19 +0100
Subject: [PATCH 0433/3722] Implement nested strong hit application

---
 .../Objects/Drawables/DrawableDrumRoll.cs     | 17 ++++++++----
 .../Objects/Drawables/DrawableDrumRollTick.cs | 17 ++++++++----
 .../Objects/Drawables/DrawableHit.cs          | 27 +++++++++++--------
 .../Drawables/DrawableStrongNestedHit.cs      |  7 +++--
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs  |  2 +-
 5 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index ede7453804..01336ea2e4 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -166,7 +166,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             Content.X = DrawHeight / 2;
         }
 
-        protected override DrawableStrongNestedHit CreateStrongNestedHit(DrumRoll.StrongNestedHit hitObject) => new StrongNestedHit(hitObject, this);
+        protected override DrawableStrongNestedHit CreateStrongNestedHit(DrumRoll.StrongNestedHit hitObject) => new StrongNestedHit(hitObject);
 
         private void updateColour(double fadeDuration = 0)
         {
@@ -176,17 +176,24 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         private class StrongNestedHit : DrawableStrongNestedHit
         {
-            public StrongNestedHit(DrumRoll.StrongNestedHit nestedHit, DrawableDrumRoll drumRoll)
-                : base(nestedHit, drumRoll)
+            public new DrawableDrumRoll ParentHitObject => (DrawableDrumRoll)base.ParentHitObject;
+
+            public StrongNestedHit()
+                : this(null)
+            {
+            }
+
+            public StrongNestedHit([CanBeNull] DrumRoll.StrongNestedHit nestedHit)
+                : base(nestedHit)
             {
             }
 
             protected override void CheckForResult(bool userTriggered, double timeOffset)
             {
-                if (!MainObject.Judged)
+                if (!ParentHitObject.Judged)
                     return;
 
-                ApplyResult(r => r.Type = MainObject.IsHit ? r.Judgement.MaxResult : r.Judgement.MinResult);
+                ApplyResult(r => r.Type = ParentHitObject.IsHit ? r.Judgement.MaxResult : r.Judgement.MinResult);
             }
 
             public override bool OnPressed(TaikoAction action) => false;
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
index e7d8ef1e12..1e625d91d6 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
@@ -67,21 +67,28 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             return UpdateResult(true);
         }
 
-        protected override DrawableStrongNestedHit CreateStrongNestedHit(DrumRollTick.StrongNestedHit hitObject) => new StrongNestedHit(hitObject, this);
+        protected override DrawableStrongNestedHit CreateStrongNestedHit(DrumRollTick.StrongNestedHit hitObject) => new StrongNestedHit(hitObject);
 
         private class StrongNestedHit : DrawableStrongNestedHit
         {
-            public StrongNestedHit(DrumRollTick.StrongNestedHit nestedHit, DrawableDrumRollTick tick)
-                : base(nestedHit, tick)
+            public new DrawableDrumRollTick ParentHitObject => (DrawableDrumRollTick)base.ParentHitObject;
+
+            public StrongNestedHit()
+                : this(null)
+            {
+            }
+
+            public StrongNestedHit([CanBeNull] DrumRollTick.StrongNestedHit nestedHit)
+                : base(nestedHit)
             {
             }
 
             protected override void CheckForResult(bool userTriggered, double timeOffset)
             {
-                if (!MainObject.Judged)
+                if (!ParentHitObject.Judged)
                     return;
 
-                ApplyResult(r => r.Type = MainObject.IsHit ? r.Judgement.MaxResult : r.Judgement.MinResult);
+                ApplyResult(r => r.Type = ParentHitObject.IsHit ? r.Judgement.MaxResult : r.Judgement.MinResult);
             }
 
             public override bool OnPressed(TaikoAction action) => false;
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index 5a479e1f53..73ebd7c117 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -250,32 +250,37 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             }
         }
 
-        protected override DrawableStrongNestedHit CreateStrongNestedHit(Hit.StrongNestedHit hitObject) => new StrongNestedHit(hitObject, this);
+        protected override DrawableStrongNestedHit CreateStrongNestedHit(Hit.StrongNestedHit hitObject) => new StrongNestedHit(hitObject);
 
         private class StrongNestedHit : DrawableStrongNestedHit
         {
+            public new DrawableHit ParentHitObject => (DrawableHit)base.ParentHitObject;
+
             /// <summary>
             /// 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 new DrawableHit MainObject => (DrawableHit)base.MainObject;
+            public StrongNestedHit()
+                : this(null)
+            {
+            }
 
-            public StrongNestedHit(Hit.StrongNestedHit nestedHit, DrawableHit hit)
-                : base(nestedHit, hit)
+            public StrongNestedHit([CanBeNull] Hit.StrongNestedHit nestedHit)
+                : base(nestedHit)
             {
             }
 
             protected override void CheckForResult(bool userTriggered, double timeOffset)
             {
-                if (!MainObject.Result.HasResult)
+                if (!ParentHitObject.Result.HasResult)
                 {
                     base.CheckForResult(userTriggered, timeOffset);
                     return;
                 }
 
-                if (!MainObject.Result.IsHit)
+                if (!ParentHitObject.Result.IsHit)
                 {
                     ApplyResult(r => r.Type = r.Judgement.MinResult);
                     return;
@@ -283,27 +288,27 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
                 if (!userTriggered)
                 {
-                    if (timeOffset - MainObject.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 - MainObject.Result.TimeOffset) <= second_hit_window)
+                if (Math.Abs(timeOffset - ParentHitObject.Result.TimeOffset) <= second_hit_window)
                     ApplyResult(r => r.Type = r.Judgement.MaxResult);
             }
 
             public override bool OnPressed(TaikoAction action)
             {
                 // Don't process actions until the main hitobject is hit
-                if (!MainObject.IsHit)
+                if (!ParentHitObject.IsHit)
                     return false;
 
                 // Don't process actions if the pressed button was released
-                if (MainObject.HitAction == null)
+                if (ParentHitObject.HitAction == null)
                     return false;
 
                 // Don't handle invalid hit action presses
-                if (!MainObject.HitActions.Contains(action))
+                if (!ParentHitObject.HitActions.Contains(action))
                     return false;
 
                 return UpdateResult(true);
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
index d2e8888197..9c22e34387 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableStrongNestedHit.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.Objects.Drawables;
+using JetBrains.Annotations;
 using osu.Game.Rulesets.Taiko.Judgements;
 
 namespace osu.Game.Rulesets.Taiko.Objects.Drawables
@@ -11,12 +11,11 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
     /// </summary>
     public abstract class DrawableStrongNestedHit : DrawableTaikoHitObject
     {
-        public readonly DrawableHitObject MainObject;
+        public new DrawableTaikoHitObject ParentHitObject => (DrawableTaikoHitObject)base.ParentHitObject;
 
-        protected DrawableStrongNestedHit(StrongNestedHitObject nestedHit, DrawableHitObject mainObject)
+        protected DrawableStrongNestedHit([CanBeNull] StrongNestedHitObject nestedHit)
             : base(nestedHit)
         {
-            MainObject = mainObject;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index d20b190c86..8682495b41 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -248,7 +248,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             {
                 case TaikoStrongJudgement _:
                     if (result.IsHit)
-                        hitExplosionContainer.Children.FirstOrDefault(e => e.JudgedObject == ((DrawableStrongNestedHit)judgedObject).MainObject)?.VisualiseSecondHit();
+                        hitExplosionContainer.Children.FirstOrDefault(e => e.JudgedObject == ((DrawableStrongNestedHit)judgedObject).ParentHitObject)?.VisualiseSecondHit();
                     break;
 
                 case TaikoDrumRollTickJudgement _:

From 3af702453f66663cef225445e11f5cfc5d2cf4b4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 00:37:13 +0900
Subject: [PATCH 0434/3722] Implement realtime match song select

---
 .../RealtimeMatchSongSelect.cs                | 45 ++++++++++++++++---
 1 file changed, 39 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
index 9bcc303065..157216e9bb 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
@@ -1,20 +1,53 @@
 // Copyright (c) ppy 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 Humanizer;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Screens;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Screens.Select;
 
 namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 {
-    public class RealtimeMatchSongSelect : SongSelect
+    public class RealtimeMatchSongSelect : SongSelect, IMultiplayerSubScreen
     {
-        protected override BeatmapDetailArea CreateBeatmapDetailArea()
-        {
-            throw new System.NotImplementedException();
-        }
+        public string ShortTitle => "song selection";
+
+        public override string Title => ShortTitle.Humanize();
+
+        [Resolved(typeof(Room), nameof(Room.Playlist))]
+        private BindableList<PlaylistItem> playlist { get; set; }
+
+        [Resolved]
+        private StatefulMultiplayerClient client { get; set; }
 
         protected override bool OnStart()
         {
-            throw new System.NotImplementedException();
+            var item = new PlaylistItem();
+
+            item.Beatmap.Value = Beatmap.Value.BeatmapInfo;
+            item.Ruleset.Value = Ruleset.Value;
+
+            item.RequiredMods.Clear();
+            item.RequiredMods.AddRange(Mods.Value.Select(m => m.CreateCopy()));
+
+            // If the client is already in a room, update via the client.
+            // Otherwise, update the playlist directly in preparation for it to be submitted to the API on match creation.
+            if (client.Room != null)
+                client.ChangeSettings(item: item);
+            else
+            {
+                playlist.Clear();
+                playlist.Add(item);
+            }
+
+            this.Exit();
+            return true;
         }
+
+        protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea();
     }
 }

From d127494c2dedfd133012e574f7fe68d15049073d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 00:39:31 +0900
Subject: [PATCH 0435/3722] Fix thread-unsafe room removal

---
 .../Multi/RealtimeMultiplayer/RealtimeRoomManager.cs       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index a50628a5fa..734d00b9aa 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -54,9 +54,12 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             multiplayerClient.LeaveRoom().Wait();
 
             // Todo: This is not the way to do this. Basically when we're the only participant and the room closes, there's no way to know if this is actually the case.
-            RemoveRoom(joinedRoom);
             // This is delayed one frame because upon exiting the match subscreen, multiplayer updates the polling rate and messes with polling.
-            Schedule(() => listingPollingComponent.PollImmediately());
+            Schedule(() =>
+            {
+                RemoveRoom(joinedRoom);
+                listingPollingComponent.PollImmediately();
+            });
         }
 
         private void joinMultiplayerRoom(Room room, Action<Room> onSuccess = null)

From a893360c0e07d3c2b31206ace178ad33cf85a47f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 00:41:14 +0900
Subject: [PATCH 0436/3722] Reword comment

---
 .../Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
index 8d3b161804..0065b425ec 100644
--- a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
@@ -71,7 +71,9 @@ namespace osu.Game.Online.RealtimeMultiplayer
         private RulesetStore rulesets { get; set; } = null!;
 
         private Room? apiRoom;
-        private int playlistItemId; // Todo: THIS IS SUPER TEMPORARY!!
+
+        // Todo: This is temporary, until the multiplayer server returns the item id on match start or otherwise.
+        private int playlistItemId;
 
         /// <summary>
         /// Joins the <see cref="MultiplayerRoom"/> for a given API <see cref="Room"/>.

From 0c5333bd586dfea1f40e3f6e6d4144bd887713a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 20 Dec 2020 17:57:19 +0100
Subject: [PATCH 0437/3722] Adjust top-level hitobjects to support nested
 pooling

---
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs   | 2 +-
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs      | 2 +-
 .../Objects/Drawables/DrawableTaikoStrongableHitObject.cs       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index 01336ea2e4..d085b95f35 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         protected override void ClearNestedHitObjects()
         {
             base.ClearNestedHitObjects();
-            tickContainer.Clear();
+            tickContainer.Clear(false);
         }
 
         protected override DrawableHitObject CreateNestedHitObject(HitObject hitObject)
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
index 9798a79450..60f9521996 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs
@@ -153,7 +153,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         protected override void ClearNestedHitObjects()
         {
             base.ClearNestedHitObjects();
-            ticks.Clear();
+            ticks.Clear(false);
         }
 
         protected override DrawableHitObject CreateNestedHitObject(HitObject hitObject)
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs
index 62f338ca91..4f1523eb3f 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs
@@ -96,7 +96,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         protected override void ClearNestedHitObjects()
         {
             base.ClearNestedHitObjects();
-            strongHitContainer.Clear();
+            strongHitContainer.Clear(false);
         }
 
         protected override DrawableHitObject CreateNestedHitObject(HitObject hitObject)

From 370f56eadbb97aa1ed05d7bc1952e3b35924430f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 20 Dec 2020 18:02:31 +0100
Subject: [PATCH 0438/3722] Make strong hit DHOs public for pool registration

---
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs   | 2 +-
 .../Objects/Drawables/DrawableDrumRollTick.cs                   | 2 +-
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
index d085b95f35..d066abf767 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
@@ -174,7 +174,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             (MainPiece.Drawable as IHasAccentColour)?.FadeAccent(newColour, fadeDuration);
         }
 
-        private class StrongNestedHit : DrawableStrongNestedHit
+        public class StrongNestedHit : DrawableStrongNestedHit
         {
             public new DrawableDrumRoll ParentHitObject => (DrawableDrumRoll)base.ParentHitObject;
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
index 1e625d91d6..0df45c424d 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRollTick.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         protected override DrawableStrongNestedHit CreateStrongNestedHit(DrumRollTick.StrongNestedHit hitObject) => new StrongNestedHit(hitObject);
 
-        private class StrongNestedHit : DrawableStrongNestedHit
+        public class StrongNestedHit : DrawableStrongNestedHit
         {
             public new DrawableDrumRollTick ParentHitObject => (DrawableDrumRollTick)base.ParentHitObject;
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index 73ebd7c117..38cda69a46 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -252,7 +252,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
 
         protected override DrawableStrongNestedHit CreateStrongNestedHit(Hit.StrongNestedHit hitObject) => new StrongNestedHit(hitObject);
 
-        private class StrongNestedHit : DrawableStrongNestedHit
+        public class StrongNestedHit : DrawableStrongNestedHit
         {
             public new DrawableHit ParentHitObject => (DrawableHit)base.ParentHitObject;
 

From 62da4eff37db8dfc1cfeaeac7d35190eab54356a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 20 Dec 2020 18:07:59 +0100
Subject: [PATCH 0439/3722] Route new result callback via playfield

Follows route taken by osu! and catch (and required for proper pooling
support).
---
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 8682495b41..6b001d6c70 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -149,6 +149,12 @@ namespace osu.Game.Rulesets.Taiko.UI
             };
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            NewResult += OnNewResult;
+        }
+
         protected override void Update()
         {
             base.Update();
@@ -208,7 +214,6 @@ namespace osu.Game.Rulesets.Taiko.UI
                     break;
 
                 case DrawableTaikoHitObject taikoObject:
-                    h.OnNewResult += OnNewResult;
                     topLevelHitContainer.Add(taikoObject.CreateProxiedContent());
                     base.Add(h);
                     break;
@@ -226,7 +231,6 @@ namespace osu.Game.Rulesets.Taiko.UI
                     return barLinePlayfield.Remove(barLine);
 
                 case DrawableTaikoHitObject _:
-                    h.OnNewResult -= OnNewResult;
                     // todo: consider tidying of proxied content if required.
                     return base.Remove(h);
 

From 5d575d2a9b8dd95d8c06e9ef9f1b91214b7794d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 20 Dec 2020 18:11:29 +0100
Subject: [PATCH 0440/3722] Accept proxied content via OnNewDrawableHitObject

In the non-pooled case, `OnNewDrawableHitObject()` will be called
automatically on each new DHO via `Playfield.Add(DrawableHitObject)`.

In the pooled case, it will be called via `Playfield`'s implementation
of `GetPooledDrawableRepresentation(HitObject, DrawableHitObject)`.
---
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 6b001d6c70..b3bf0974c3 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -155,6 +155,14 @@ namespace osu.Game.Rulesets.Taiko.UI
             NewResult += OnNewResult;
         }
 
+        protected override void OnNewDrawableHitObject(DrawableHitObject drawableHitObject)
+        {
+            base.OnNewDrawableHitObject(drawableHitObject);
+
+            var taikoObject = (DrawableTaikoHitObject)drawableHitObject;
+            topLevelHitContainer.Add(taikoObject.CreateProxiedContent());
+        }
+
         protected override void Update()
         {
             base.Update();
@@ -213,8 +221,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                     barLinePlayfield.Add(barLine);
                     break;
 
-                case DrawableTaikoHitObject taikoObject:
-                    topLevelHitContainer.Add(taikoObject.CreateProxiedContent());
+                case DrawableTaikoHitObject _:
                     base.Add(h);
                     break;
 
@@ -231,7 +238,6 @@ namespace osu.Game.Rulesets.Taiko.UI
                     return barLinePlayfield.Remove(barLine);
 
                 case DrawableTaikoHitObject _:
-                    // todo: consider tidying of proxied content if required.
                     return base.Remove(h);
 
                 default:

From b24fc1922e11b103243ef24e361609376c353b51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 20 Dec 2020 18:16:05 +0100
Subject: [PATCH 0441/3722] Enable pooling for taiko DHOs

---
 .../UI/DrawableTaikoRuleset.cs                 | 18 +-----------------
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs   | 12 ++++++++++++
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
index 9cf931ee0a..ed8e6859a2 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
@@ -7,7 +7,6 @@ using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.Objects;
-using osu.Game.Rulesets.Taiko.Objects.Drawables;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.Taiko.Replays;
 using osu.Framework.Input;
@@ -64,22 +63,7 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         protected override Playfield CreatePlayfield() => new TaikoPlayfield(Beatmap.ControlPointInfo);
 
-        public override DrawableHitObject<TaikoHitObject> CreateDrawableRepresentation(TaikoHitObject h)
-        {
-            switch (h)
-            {
-                case Hit hit:
-                    return new DrawableHit(hit);
-
-                case DrumRoll drumRoll:
-                    return new DrawableDrumRoll(drumRoll);
-
-                case Swell swell:
-                    return new DrawableSwell(swell);
-            }
-
-            return null;
-        }
+        public override DrawableHitObject<TaikoHitObject> CreateDrawableRepresentation(TaikoHitObject h) => null;
 
         protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new TaikoFramedReplayInputHandler(replay);
 
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index b3bf0974c3..148ec7755e 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -147,6 +147,18 @@ namespace osu.Game.Rulesets.Taiko.UI
                 },
                 drumRollHitContainer.CreateProxy(),
             };
+
+            RegisterPool<Hit, DrawableHit>(50);
+            RegisterPool<Hit.StrongNestedHit, DrawableHit.StrongNestedHit>(50);
+
+            RegisterPool<DrumRoll, DrawableDrumRoll>(5);
+            RegisterPool<DrumRoll.StrongNestedHit, DrawableDrumRoll.StrongNestedHit>(5);
+
+            RegisterPool<DrumRollTick, DrawableDrumRollTick>(100);
+            RegisterPool<DrumRollTick.StrongNestedHit, DrawableDrumRollTick.StrongNestedHit>(100);
+
+            RegisterPool<Swell, DrawableSwell>(5);
+            RegisterPool<SwellTick, DrawableSwellTick>(100);
         }
 
         protected override void LoadComplete()

From 6e21806873976561322499602e516ee0a6c29d36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 20 Dec 2020 18:25:49 +0100
Subject: [PATCH 0442/3722] Adjust sample test to pass with pooling

---
 .../TestSceneSampleOutput.cs                  | 38 ++++++++++++-------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneSampleOutput.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneSampleOutput.cs
index 4ba9c447fb..296468d98d 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneSampleOutput.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneSampleOutput.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.Testing;
 using osu.Game.Audio;
@@ -18,24 +19,33 @@ namespace osu.Game.Rulesets.Taiko.Tests
         public override void SetUpSteps()
         {
             base.SetUpSteps();
-            AddAssert("has correct samples", () =>
+
+            var expectedSampleNames = new[]
             {
-                var names = Player.DrawableRuleset.Playfield.AllHitObjects.OfType<DrawableHit>().Select(h => string.Join(',', h.GetSamples().Select(s => s.Name)));
+                string.Empty,
+                string.Empty,
+                string.Empty,
+                string.Empty,
+                HitSampleInfo.HIT_FINISH,
+                HitSampleInfo.HIT_WHISTLE,
+                HitSampleInfo.HIT_WHISTLE,
+                HitSampleInfo.HIT_WHISTLE,
+            };
+            var actualSampleNames = new List<string>();
 
-                var expected = new[]
-                {
-                    string.Empty,
-                    string.Empty,
-                    string.Empty,
-                    string.Empty,
-                    HitSampleInfo.HIT_FINISH,
-                    HitSampleInfo.HIT_WHISTLE,
-                    HitSampleInfo.HIT_WHISTLE,
-                    HitSampleInfo.HIT_WHISTLE,
-                };
+            // due to pooling we can't access all samples right away due to object re-use,
+            // so we need to collect as we go.
+            AddStep("collect sample names", () => Player.DrawableRuleset.Playfield.NewResult += (dho, _) =>
+            {
+                if (!(dho is DrawableHit h))
+                    return;
 
-                return names.SequenceEqual(expected);
+                actualSampleNames.Add(string.Join(',', h.GetSamples().Select(s => s.Name)));
             });
+
+            AddUntilStep("all samples collected", () => actualSampleNames.Count == expectedSampleNames.Length);
+
+            AddAssert("samples are correct", () => actualSampleNames.SequenceEqual(expectedSampleNames));
         }
 
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TaikoBeatmapConversionTest().GetBeatmap("sample-to-type-conversions");

From a8569fe15cdf663685d960e69356205b11944f8a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Dec 2020 13:35:46 +0900
Subject: [PATCH 0443/3722] Fix a couple of simple cases of incorrect
 TextureLoaderStore initialisation

---
 osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs  | 3 ++-
 osu.Game/Storyboards/Drawables/DrawableStoryboard.cs | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
index a9b2a15b35..b13b20dae2 100644
--- a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
+++ b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
@@ -13,6 +13,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
+using osu.Framework.Platform;
 using osu.Game.Rulesets.Configuration;
 
 namespace osu.Game.Rulesets.UI
@@ -46,7 +47,7 @@ namespace osu.Game.Rulesets.UI
 
             if (resources != null)
             {
-                TextureStore = new TextureStore(new TextureLoaderStore(new NamespacedResourceStore<byte[]>(resources, @"Textures")));
+                TextureStore = new TextureStore(parent.Get<GameHost>().CreateTextureLoaderStore(new NamespacedResourceStore<byte[]>(resources, @"Textures")));
                 CacheAs(TextureStore = new FallbackTextureStore(TextureStore, parent.Get<TextureStore>()));
 
                 SampleStore = parent.Get<AudioManager>().GetSampleStore(new NamespacedResourceStore<byte[]>(resources, @"Samples"));
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
index 4bc28e6cef..af4615c895 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
@@ -8,6 +8,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Textures;
+using osu.Framework.Platform;
 using osu.Game.IO;
 using osu.Game.Screens.Play;
 
@@ -59,12 +60,12 @@ namespace osu.Game.Storyboards.Drawables
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(FileStore fileStore, GameplayClock clock, CancellationToken? cancellationToken)
+        private void load(FileStore fileStore, GameplayClock clock, CancellationToken? cancellationToken, GameHost host)
         {
             if (clock != null)
                 Clock = clock;
 
-            dependencies.Cache(new TextureStore(new TextureLoaderStore(fileStore.Store), false, scaleAdjust: 1));
+            dependencies.Cache(new TextureStore(host.CreateTextureLoaderStore(fileStore.Store), false, scaleAdjust: 1));
 
             foreach (var layer in Storyboard.Layers)
             {

From 7c804be4d3c0dd28ba9cbe3c8eabb771bcc32670 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Dec 2020 14:06:33 +0900
Subject: [PATCH 0444/3722] Rename textureStore to make its purpose more clear

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

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 33e024fa28..c9d507d068 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Beatmaps
         private readonly RulesetStore rulesets;
         private readonly BeatmapStore beatmaps;
         private readonly AudioManager audioManager;
-        private readonly TextureStore textureStore;
+        private readonly LargeTextureStore largeTextureStore;
         private readonly ITrackStore trackStore;
 
         [CanBeNull]
@@ -92,7 +92,7 @@ namespace osu.Game.Beatmaps
             if (performOnlineLookups)
                 onlineLookupQueue = new BeatmapOnlineLookupQueue(api, storage);
 
-            textureStore = new LargeTextureStore(host?.CreateTextureLoaderStore(Files.Store));
+            largeTextureStore = new LargeTextureStore(host?.CreateTextureLoaderStore(Files.Store));
             trackStore = audioManager.GetTrackStore(Files.Store);
         }
 
@@ -302,7 +302,7 @@ namespace osu.Game.Beatmaps
 
                 beatmapInfo.Metadata ??= beatmapInfo.BeatmapSet.Metadata;
 
-                workingCache.Add(working = new BeatmapManagerWorkingBeatmap(Files.Store, textureStore, trackStore, beatmapInfo, audioManager));
+                workingCache.Add(working = new BeatmapManagerWorkingBeatmap(Files.Store, largeTextureStore, trackStore, beatmapInfo, audioManager));
 
                 return working;
             }

From 0ffbe12fcc2c13af237d71aa06d1e0ccc170651b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Dec 2020 14:06:50 +0900
Subject: [PATCH 0445/3722] Expose resources to beatmaps in a saner way

---
 osu.Game/Beatmaps/BeatmapManager.cs           | 16 ++++++--
 .../Beatmaps/BeatmapManager_WorkingBeatmap.cs | 28 +++++--------
 osu.Game/Beatmaps/IBeatmapResourceProvider.cs | 40 +++++++++++++++++++
 3 files changed, 64 insertions(+), 20 deletions(-)
 create mode 100644 osu.Game/Beatmaps/IBeatmapResourceProvider.cs

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index c9d507d068..4b334952ef 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -16,6 +16,7 @@ using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics.Textures;
+using osu.Framework.IO.Stores;
 using osu.Framework.Lists;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
@@ -28,8 +29,8 @@ using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Users;
 using osu.Game.Skinning;
+using osu.Game.Users;
 using Decoder = osu.Game.Beatmaps.Formats.Decoder;
 
 namespace osu.Game.Beatmaps
@@ -38,7 +39,7 @@ namespace osu.Game.Beatmaps
     /// Handles the storage and retrieval of Beatmaps/WorkingBeatmaps.
     /// </summary>
     [ExcludeFromDynamicCompile]
-    public partial class BeatmapManager : DownloadableArchiveModelManager<BeatmapSetInfo, BeatmapSetFileInfo>, IDisposable
+    public partial class BeatmapManager : DownloadableArchiveModelManager<BeatmapSetInfo, BeatmapSetFileInfo>, IDisposable, IBeatmapResourceProvider
     {
         /// <summary>
         /// Fired when a single difficulty has been hidden.
@@ -71,6 +72,8 @@ namespace osu.Game.Beatmaps
         private readonly LargeTextureStore largeTextureStore;
         private readonly ITrackStore trackStore;
 
+        private readonly GameHost host;
+
         [CanBeNull]
         private readonly BeatmapOnlineLookupQueue onlineLookupQueue;
 
@@ -80,6 +83,7 @@ namespace osu.Game.Beatmaps
         {
             this.rulesets = rulesets;
             this.audioManager = audioManager;
+            this.host = host;
 
             DefaultBeatmap = defaultBeatmap;
 
@@ -302,7 +306,7 @@ namespace osu.Game.Beatmaps
 
                 beatmapInfo.Metadata ??= beatmapInfo.BeatmapSet.Metadata;
 
-                workingCache.Add(working = new BeatmapManagerWorkingBeatmap(Files.Store, largeTextureStore, trackStore, beatmapInfo, audioManager));
+                workingCache.Add(working = new BeatmapManagerWorkingBeatmap(beatmapInfo, this));
 
                 return working;
             }
@@ -492,6 +496,12 @@ namespace osu.Game.Beatmaps
             onlineLookupQueue?.Dispose();
         }
 
+        TextureStore IBeatmapResourceProvider.LargeTextureStore => largeTextureStore;
+        ITrackStore IBeatmapResourceProvider.Tracks => trackStore;
+        AudioManager IBeatmapResourceProvider.AudioManager => audioManager;
+        IResourceStore<byte[]> IBeatmapResourceProvider.Files => Files.Store;
+        IResourceStore<TextureUpload> IBeatmapResourceProvider.CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => host.CreateTextureLoaderStore(underlyingStore);
+
         /// <summary>
         /// A dummy WorkingBeatmap for the purpose of retrieving a beatmap for star difficulty calculation.
         /// </summary>
diff --git a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
index f5c0d97c1f..1d9a496e36 100644
--- a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
@@ -3,10 +3,8 @@
 
 using System;
 using System.Linq;
-using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.IO.Stores;
 using osu.Framework.Logging;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps.Formats;
@@ -21,16 +19,12 @@ namespace osu.Game.Beatmaps
         [ExcludeFromDynamicCompile]
         private class BeatmapManagerWorkingBeatmap : WorkingBeatmap
         {
-            private readonly IResourceStore<byte[]> store;
-            private readonly TextureStore textureStore;
-            private readonly ITrackStore trackStore;
+            private readonly IBeatmapResourceProvider resources;
 
-            public BeatmapManagerWorkingBeatmap(IResourceStore<byte[]> store, TextureStore textureStore, ITrackStore trackStore, BeatmapInfo beatmapInfo, AudioManager audioManager)
-                : base(beatmapInfo, audioManager)
+            public BeatmapManagerWorkingBeatmap(BeatmapInfo beatmapInfo, IBeatmapResourceProvider resources)
+                : base(beatmapInfo, resources?.AudioManager)
             {
-                this.store = store;
-                this.textureStore = textureStore;
-                this.trackStore = trackStore;
+                this.resources = resources;
             }
 
             protected override IBeatmap GetBeatmap()
@@ -40,7 +34,7 @@ namespace osu.Game.Beatmaps
 
                 try
                 {
-                    using (var stream = new LineBufferedReader(store.GetStream(getPathForFile(BeatmapInfo.Path))))
+                    using (var stream = new LineBufferedReader(resources.Files.GetStream(getPathForFile(BeatmapInfo.Path))))
                         return Decoder.GetDecoder<Beatmap>(stream).Decode(stream);
                 }
                 catch (Exception e)
@@ -61,7 +55,7 @@ namespace osu.Game.Beatmaps
 
                 try
                 {
-                    return textureStore.Get(getPathForFile(Metadata.BackgroundFile));
+                    return resources.LargeTextureStore.Get(getPathForFile(Metadata.BackgroundFile));
                 }
                 catch (Exception e)
                 {
@@ -77,7 +71,7 @@ namespace osu.Game.Beatmaps
 
                 try
                 {
-                    return trackStore.Get(getPathForFile(Metadata.AudioFile));
+                    return resources.Tracks.Get(getPathForFile(Metadata.AudioFile));
                 }
                 catch (Exception e)
                 {
@@ -93,7 +87,7 @@ namespace osu.Game.Beatmaps
 
                 try
                 {
-                    var trackData = store.GetStream(getPathForFile(Metadata.AudioFile));
+                    var trackData = resources.Files.GetStream(getPathForFile(Metadata.AudioFile));
                     return trackData == null ? null : new Waveform(trackData);
                 }
                 catch (Exception e)
@@ -109,7 +103,7 @@ namespace osu.Game.Beatmaps
 
                 try
                 {
-                    using (var stream = new LineBufferedReader(store.GetStream(getPathForFile(BeatmapInfo.Path))))
+                    using (var stream = new LineBufferedReader(resources.Files.GetStream(getPathForFile(BeatmapInfo.Path))))
                     {
                         var decoder = Decoder.GetDecoder<Storyboard>(stream);
 
@@ -118,7 +112,7 @@ namespace osu.Game.Beatmaps
                             storyboard = decoder.Decode(stream);
                         else
                         {
-                            using (var secondaryStream = new LineBufferedReader(store.GetStream(getPathForFile(BeatmapSetInfo.StoryboardFile))))
+                            using (var secondaryStream = new LineBufferedReader(resources.Files.GetStream(getPathForFile(BeatmapSetInfo.StoryboardFile))))
                                 storyboard = decoder.Decode(stream, secondaryStream);
                         }
                     }
@@ -138,7 +132,7 @@ namespace osu.Game.Beatmaps
             {
                 try
                 {
-                    return new LegacyBeatmapSkin(BeatmapInfo, store, AudioManager);
+                    return new LegacyBeatmapSkin(BeatmapInfo, resources.Files, AudioManager);
                 }
                 catch (Exception e)
                 {
diff --git a/osu.Game/Beatmaps/IBeatmapResourceProvider.cs b/osu.Game/Beatmaps/IBeatmapResourceProvider.cs
new file mode 100644
index 0000000000..43d1a60784
--- /dev/null
+++ b/osu.Game/Beatmaps/IBeatmapResourceProvider.cs
@@ -0,0 +1,40 @@
+// Copyright (c) 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.Audio.Track;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.IO.Stores;
+
+namespace osu.Game.Beatmaps
+{
+    public interface IBeatmapResourceProvider
+    {
+        /// <summary>
+        /// Retrieve a global large texture store, used for loading beatmap backgrounds.
+        /// </summary>
+        TextureStore LargeTextureStore { get; }
+
+        /// <summary>
+        /// Access a global track store for retrieving beatmap tracks from.
+        /// </summary>
+        ITrackStore Tracks { get; }
+
+        /// <summary>
+        /// Retrieve the game-wide audio manager.
+        /// </summary>
+        AudioManager AudioManager { get; }
+
+        /// <summary>
+        /// Access game-wide user files.
+        /// </summary>
+        IResourceStore<byte[]> Files { get; }
+
+        /// <summary>
+        /// Create a texture loader store based on an underlying data store.
+        /// </summary>
+        /// <param name="underlyingStore">The underlying provider of texture data (in arbitrary image formats).</param>
+        /// <returns>A texture loader store.</returns>
+        IResourceStore<TextureUpload> CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore);
+    }
+}

From a5bcf1dc20b31f6fb318dd3bdc7f7be40ae078f8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Dec 2020 15:14:32 +0900
Subject: [PATCH 0446/3722] Expose resources to skin via interface (and share
 common pieces with beatmap)

---
 .../Gameplay/TestSceneStoryboardSamples.cs    | 28 +++++++++++-------
 osu.Game/Beatmaps/BeatmapManager.cs           |  6 ++--
 .../Beatmaps/BeatmapManager_WorkingBeatmap.cs |  2 +-
 osu.Game/Beatmaps/IBeatmapResourceProvider.cs | 22 ++------------
 osu.Game/IO/IStorageResourceProvider.cs       | 29 +++++++++++++++++++
 osu.Game/Skinning/DefaultLegacySkin.cs        |  6 ++--
 osu.Game/Skinning/LegacyBeatmapSkin.cs        |  6 ++--
 osu.Game/Skinning/LegacySkin.cs               | 11 ++++---
 osu.Game/Skinning/SkinManager.cs              | 19 ++++++++----
 .../Tests/Beatmaps/HitObjectSampleTest.cs     | 20 +++++++++----
 .../Tests/Visual/LegacySkinPlayerTestScene.cs |  5 ++--
 osu.Game/Tests/Visual/SkinnableTestScene.cs   | 23 ++++++++++-----
 12 files changed, 109 insertions(+), 68 deletions(-)
 create mode 100644 osu.Game/IO/IStorageResourceProvider.cs

diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index d46769a7c0..36f99c5599 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -10,9 +10,11 @@ using NUnit.Framework;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Graphics.Audio;
+using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
 using osu.Game.Audio;
+using osu.Game.IO;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
@@ -27,7 +29,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Tests.Gameplay
 {
     [HeadlessTest]
-    public class TestSceneStoryboardSamples : OsuTestScene
+    public class TestSceneStoryboardSamples : OsuTestScene, IStorageResourceProvider
     {
         [Test]
         public void TestRetrieveTopLevelSample()
@@ -35,7 +37,7 @@ namespace osu.Game.Tests.Gameplay
             ISkin skin = null;
             SampleChannel channel = null;
 
-            AddStep("create skin", () => skin = new TestSkin("test-sample", Audio));
+            AddStep("create skin", () => skin = new TestSkin("test-sample", this));
             AddStep("retrieve sample", () => channel = skin.GetSample(new SampleInfo("test-sample")));
 
             AddAssert("sample is non-null", () => channel != null);
@@ -47,7 +49,7 @@ namespace osu.Game.Tests.Gameplay
             ISkin skin = null;
             SampleChannel channel = null;
 
-            AddStep("create skin", () => skin = new TestSkin("folder/test-sample", Audio));
+            AddStep("create skin", () => skin = new TestSkin("folder/test-sample", this));
             AddStep("retrieve sample", () => channel = skin.GetSample(new SampleInfo("folder/test-sample")));
 
             AddAssert("sample is non-null", () => channel != null);
@@ -105,7 +107,7 @@ namespace osu.Game.Tests.Gameplay
 
             AddStep("setup storyboard sample", () =>
             {
-                Beatmap.Value = new TestCustomSkinWorkingBeatmap(new OsuRuleset().RulesetInfo, Audio);
+                Beatmap.Value = new TestCustomSkinWorkingBeatmap(new OsuRuleset().RulesetInfo, this);
                 SelectedMods.Value = new[] { testedMod };
 
                 var beatmapSkinSourceContainer = new BeatmapSkinProvidingContainer(Beatmap.Value.Skin);
@@ -128,8 +130,8 @@ namespace osu.Game.Tests.Gameplay
 
         private class TestSkin : LegacySkin
         {
-            public TestSkin(string resourceName, AudioManager audioManager)
-                : base(DefaultLegacySkin.Info, new TestResourceStore(resourceName), audioManager, "skin.ini")
+            public TestSkin(string resourceName, IStorageResourceProvider resources)
+                : base(DefaultLegacySkin.Info, new TestResourceStore(resourceName), resources, "skin.ini")
             {
             }
         }
@@ -158,15 +160,15 @@ namespace osu.Game.Tests.Gameplay
 
         private class TestCustomSkinWorkingBeatmap : ClockBackedTestWorkingBeatmap
         {
-            private readonly AudioManager audio;
+            private readonly IStorageResourceProvider resources;
 
-            public TestCustomSkinWorkingBeatmap(RulesetInfo ruleset, AudioManager audio)
-                : base(ruleset, null, audio)
+            public TestCustomSkinWorkingBeatmap(RulesetInfo ruleset, IStorageResourceProvider resources)
+                : base(ruleset, null, resources.AudioManager)
             {
-                this.audio = audio;
+                this.resources = resources;
             }
 
-            protected override ISkin GetSkin() => new TestSkin("test-sample", audio);
+            protected override ISkin GetSkin() => new TestSkin("test-sample", resources);
         }
 
         private class TestDrawableStoryboardSample : DrawableStoryboardSample
@@ -176,5 +178,9 @@ namespace osu.Game.Tests.Gameplay
             {
             }
         }
+
+        public AudioManager AudioManager => Audio;
+        public IResourceStore<byte[]> Files => null;
+        public IResourceStore<TextureUpload> CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => null;
     }
 }
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 4b334952ef..3cf691da9a 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -498,9 +498,9 @@ namespace osu.Game.Beatmaps
 
         TextureStore IBeatmapResourceProvider.LargeTextureStore => largeTextureStore;
         ITrackStore IBeatmapResourceProvider.Tracks => trackStore;
-        AudioManager IBeatmapResourceProvider.AudioManager => audioManager;
-        IResourceStore<byte[]> IBeatmapResourceProvider.Files => Files.Store;
-        IResourceStore<TextureUpload> IBeatmapResourceProvider.CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => host.CreateTextureLoaderStore(underlyingStore);
+        AudioManager IStorageResourceProvider.AudioManager => audioManager;
+        IResourceStore<byte[]> IStorageResourceProvider.Files => Files.Store;
+        IResourceStore<TextureUpload> IStorageResourceProvider.CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => host.CreateTextureLoaderStore(underlyingStore);
 
         /// <summary>
         /// A dummy WorkingBeatmap for the purpose of retrieving a beatmap for star difficulty calculation.
diff --git a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
index 1d9a496e36..5d298dbccc 100644
--- a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
@@ -132,7 +132,7 @@ namespace osu.Game.Beatmaps
             {
                 try
                 {
-                    return new LegacyBeatmapSkin(BeatmapInfo, resources.Files, AudioManager);
+                    return new LegacyBeatmapSkin(BeatmapInfo, resources.Files, resources);
                 }
                 catch (Exception e)
                 {
diff --git a/osu.Game/Beatmaps/IBeatmapResourceProvider.cs b/osu.Game/Beatmaps/IBeatmapResourceProvider.cs
index 43d1a60784..dfea0c7a30 100644
--- a/osu.Game/Beatmaps/IBeatmapResourceProvider.cs
+++ b/osu.Game/Beatmaps/IBeatmapResourceProvider.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.
 
-using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.IO.Stores;
+using osu.Game.IO;
 
 namespace osu.Game.Beatmaps
 {
-    public interface IBeatmapResourceProvider
+    public interface IBeatmapResourceProvider : IStorageResourceProvider
     {
         /// <summary>
         /// Retrieve a global large texture store, used for loading beatmap backgrounds.
@@ -19,22 +18,5 @@ namespace osu.Game.Beatmaps
         /// Access a global track store for retrieving beatmap tracks from.
         /// </summary>
         ITrackStore Tracks { get; }
-
-        /// <summary>
-        /// Retrieve the game-wide audio manager.
-        /// </summary>
-        AudioManager AudioManager { get; }
-
-        /// <summary>
-        /// Access game-wide user files.
-        /// </summary>
-        IResourceStore<byte[]> Files { get; }
-
-        /// <summary>
-        /// Create a texture loader store based on an underlying data store.
-        /// </summary>
-        /// <param name="underlyingStore">The underlying provider of texture data (in arbitrary image formats).</param>
-        /// <returns>A texture loader store.</returns>
-        IResourceStore<TextureUpload> CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore);
     }
 }
diff --git a/osu.Game/IO/IStorageResourceProvider.cs b/osu.Game/IO/IStorageResourceProvider.cs
new file mode 100644
index 0000000000..cbd1039807
--- /dev/null
+++ b/osu.Game/IO/IStorageResourceProvider.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.Audio;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.IO.Stores;
+
+namespace osu.Game.IO
+{
+    public interface IStorageResourceProvider
+    {
+        /// <summary>
+        /// Retrieve the game-wide audio manager.
+        /// </summary>
+        AudioManager AudioManager { get; }
+
+        /// <summary>
+        /// Access game-wide user files.
+        /// </summary>
+        IResourceStore<byte[]> Files { get; }
+
+        /// <summary>
+        /// Create a texture loader store based on an underlying data store.
+        /// </summary>
+        /// <param name="underlyingStore">The underlying provider of texture data (in arbitrary image formats).</param>
+        /// <returns>A texture loader store.</returns>
+        IResourceStore<TextureUpload> CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore);
+    }
+}
diff --git a/osu.Game/Skinning/DefaultLegacySkin.cs b/osu.Game/Skinning/DefaultLegacySkin.cs
index 2758a4cbba..4027cc650d 100644
--- a/osu.Game/Skinning/DefaultLegacySkin.cs
+++ b/osu.Game/Skinning/DefaultLegacySkin.cs
@@ -1,16 +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.Audio;
 using osu.Framework.IO.Stores;
+using osu.Game.IO;
 using osuTK.Graphics;
 
 namespace osu.Game.Skinning
 {
     public class DefaultLegacySkin : LegacySkin
     {
-        public DefaultLegacySkin(IResourceStore<byte[]> storage, AudioManager audioManager)
-            : base(Info, storage, audioManager, string.Empty)
+        public DefaultLegacySkin(IResourceStore<byte[]> storage, IStorageResourceProvider resources)
+            : base(Info, storage, resources, string.Empty)
         {
             Configuration.CustomColours["SliderBall"] = new Color4(2, 170, 255, 255);
             Configuration.AddComboColours(
diff --git a/osu.Game/Skinning/LegacyBeatmapSkin.cs b/osu.Game/Skinning/LegacyBeatmapSkin.cs
index d647bc4a2d..fdcb81b574 100644
--- a/osu.Game/Skinning/LegacyBeatmapSkin.cs
+++ b/osu.Game/Skinning/LegacyBeatmapSkin.cs
@@ -1,12 +1,12 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.IO.Stores;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
+using osu.Game.IO;
 using osu.Game.Rulesets.Objects.Legacy;
 
 namespace osu.Game.Skinning
@@ -16,8 +16,8 @@ namespace osu.Game.Skinning
         protected override bool AllowManiaSkin => false;
         protected override bool UseCustomSampleBanks => true;
 
-        public LegacyBeatmapSkin(BeatmapInfo beatmap, IResourceStore<byte[]> storage, AudioManager audioManager)
-            : base(createSkinInfo(beatmap), new LegacySkinResourceStore<BeatmapSetFileInfo>(beatmap.BeatmapSet, storage), audioManager, beatmap.Path)
+        public LegacyBeatmapSkin(BeatmapInfo beatmap, IResourceStore<byte[]> storage, IStorageResourceProvider resources)
+            : base(createSkinInfo(beatmap), new LegacySkinResourceStore<BeatmapSetFileInfo>(beatmap.BeatmapSet, storage), resources, beatmap.Path)
         {
             // Disallow default colours fallback on beatmap skins to allow using parent skin combo colours. (via SkinProvidingContainer)
             Configuration.AllowDefaultComboColoursFallback = false;
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 80b2fef35c..5a7ad095f6 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -7,7 +7,6 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using JetBrains.Annotations;
-using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -54,12 +53,12 @@ namespace osu.Game.Skinning
 
         private readonly Dictionary<int, LegacyManiaSkinConfiguration> maniaConfigurations = new Dictionary<int, LegacyManiaSkinConfiguration>();
 
-        public LegacySkin(SkinInfo skin, IResourceStore<byte[]> storage, AudioManager audioManager)
-            : this(skin, new LegacySkinResourceStore<SkinFileInfo>(skin, storage), audioManager, "skin.ini")
+        public LegacySkin(SkinInfo skin, IStorageResourceProvider resources)
+            : this(skin, new LegacySkinResourceStore<SkinFileInfo>(skin, resources.Files), resources, "skin.ini")
         {
         }
 
-        protected LegacySkin(SkinInfo skin, IResourceStore<byte[]> storage, AudioManager audioManager, string filename)
+        protected LegacySkin(SkinInfo skin, IResourceStore<byte[]> storage, IStorageResourceProvider resources, string filename)
             : base(skin)
         {
             using (var stream = storage?.GetStream(filename))
@@ -85,12 +84,12 @@ namespace osu.Game.Skinning
 
             if (storage != null)
             {
-                var samples = audioManager?.GetSampleStore(storage);
+                var samples = resources?.AudioManager?.GetSampleStore(storage);
                 if (samples != null)
                     samples.PlaybackConcurrency = OsuGameBase.SAMPLE_CONCURRENCY;
 
                 Samples = samples;
-                Textures = new TextureStore(new TextureLoaderStore(storage));
+                Textures = new TextureStore(resources?.CreateTextureLoaderStore(storage));
 
                 (storage as ResourceStore<byte[]>)?.AddExtension("ogg");
             }
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 9b69a1eecd..2ee940c02d 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -22,15 +22,18 @@ using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Audio;
 using osu.Game.Database;
+using osu.Game.IO;
 using osu.Game.IO.Archives;
 
 namespace osu.Game.Skinning
 {
     [ExcludeFromDynamicCompile]
-    public class SkinManager : ArchiveModelManager<SkinInfo, SkinFileInfo>, ISkinSource
+    public class SkinManager : ArchiveModelManager<SkinInfo, SkinFileInfo>, ISkinSource, IStorageResourceProvider
     {
         private readonly AudioManager audio;
 
+        private readonly GameHost host;
+
         private readonly IResourceStore<byte[]> legacyDefaultResources;
 
         public readonly Bindable<Skin> CurrentSkin = new Bindable<Skin>(new DefaultSkin());
@@ -42,10 +45,12 @@ namespace osu.Game.Skinning
 
         protected override string ImportFromStablePath => "Skins";
 
-        public SkinManager(Storage storage, DatabaseContextFactory contextFactory, IIpcHost importHost, AudioManager audio, IResourceStore<byte[]> legacyDefaultResources)
-            : base(storage, contextFactory, new SkinStore(contextFactory, storage), importHost)
+        public SkinManager(Storage storage, DatabaseContextFactory contextFactory, GameHost host, AudioManager audio, IResourceStore<byte[]> legacyDefaultResources)
+            : base(storage, contextFactory, new SkinStore(contextFactory, storage), host)
         {
             this.audio = audio;
+            this.host = host;
+
             this.legacyDefaultResources = legacyDefaultResources;
 
             CurrentSkinInfo.ValueChanged += skin => CurrentSkin.Value = GetSkin(skin.NewValue);
@@ -148,9 +153,9 @@ namespace osu.Game.Skinning
                 return new DefaultSkin();
 
             if (skinInfo == DefaultLegacySkin.Info)
-                return new DefaultLegacySkin(legacyDefaultResources, audio);
+                return new DefaultLegacySkin(legacyDefaultResources, this);
 
-            return new LegacySkin(skinInfo, Files.Store, audio);
+            return new LegacySkin(skinInfo, this);
         }
 
         /// <summary>
@@ -169,5 +174,9 @@ namespace osu.Game.Skinning
         public SampleChannel GetSample(ISampleInfo sampleInfo) => CurrentSkin.Value.GetSample(sampleInfo);
 
         public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => CurrentSkin.Value.GetConfig<TLookup, TValue>(lookup);
+
+        AudioManager IStorageResourceProvider.AudioManager => audio;
+        IResourceStore<byte[]> IStorageResourceProvider.Files => Files.Store;
+        IResourceStore<TextureUpload> IStorageResourceProvider.CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => host.CreateTextureLoaderStore(underlyingStore);
     }
 }
diff --git a/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs b/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
index e3557222d5..dd1979a7e3 100644
--- a/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
+++ b/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
@@ -8,6 +8,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
+using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
 using osu.Framework.Timing;
@@ -25,7 +26,7 @@ using osu.Game.Users;
 namespace osu.Game.Tests.Beatmaps
 {
     [HeadlessTest]
-    public abstract class HitObjectSampleTest : PlayerTestScene
+    public abstract class HitObjectSampleTest : PlayerTestScene, IStorageResourceProvider
     {
         protected abstract IResourceStore<byte[]> Resources { get; }
         protected LegacySkin Skin { get; private set; }
@@ -58,7 +59,7 @@ namespace osu.Game.Tests.Beatmaps
         protected sealed override IBeatmap CreateBeatmap(RulesetInfo ruleset) => currentTestBeatmap;
 
         protected sealed override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
-            => new TestWorkingBeatmap(beatmapInfo, beatmapSkinResourceStore, beatmap, storyboard, Clock, Audio);
+            => new TestWorkingBeatmap(beatmapInfo, beatmapSkinResourceStore, beatmap, storyboard, Clock, this);
 
         protected override TestPlayer CreatePlayer(Ruleset ruleset) => new TestPlayer(false);
 
@@ -109,7 +110,7 @@ namespace osu.Game.Tests.Beatmaps
                 };
 
                 // Need to refresh the cached skin source to refresh the skin resource store.
-                dependencies.SkinSource = new SkinProvidingContainer(Skin = new LegacySkin(userSkinInfo, userSkinResourceStore, Audio));
+                dependencies.SkinSource = new SkinProvidingContainer(Skin = new LegacySkin(userSkinInfo, this));
             });
         }
 
@@ -122,6 +123,10 @@ namespace osu.Game.Tests.Beatmaps
         protected void AssertNoLookup(string name) => AddAssert($"\"{name}\" not looked up",
             () => !beatmapSkinResourceStore.PerformedLookups.Contains(name) && !userSkinResourceStore.PerformedLookups.Contains(name));
 
+        public AudioManager AudioManager => Audio;
+        public IResourceStore<byte[]> Files => userSkinResourceStore;
+        public IResourceStore<TextureUpload> CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => null;
+
         private class SkinSourceDependencyContainer : IReadOnlyDependencyContainer
         {
             public ISkinSource SkinSource;
@@ -191,14 +196,17 @@ namespace osu.Game.Tests.Beatmaps
             private readonly BeatmapInfo skinBeatmapInfo;
             private readonly IResourceStore<byte[]> resourceStore;
 
-            public TestWorkingBeatmap(BeatmapInfo skinBeatmapInfo, IResourceStore<byte[]> resourceStore, IBeatmap beatmap, Storyboard storyboard, IFrameBasedClock referenceClock, AudioManager audio)
-                : base(beatmap, storyboard, referenceClock, audio)
+            private readonly IStorageResourceProvider resources;
+
+            public TestWorkingBeatmap(BeatmapInfo skinBeatmapInfo, IResourceStore<byte[]> resourceStore, IBeatmap beatmap, Storyboard storyboard, IFrameBasedClock referenceClock, IStorageResourceProvider resources)
+                : base(beatmap, storyboard, referenceClock, resources.AudioManager)
             {
                 this.skinBeatmapInfo = skinBeatmapInfo;
                 this.resourceStore = resourceStore;
+                this.resources = resources;
             }
 
-            protected override ISkin GetSkin() => new LegacyBeatmapSkin(skinBeatmapInfo, resourceStore, AudioManager);
+            protected override ISkin GetSkin() => new LegacyBeatmapSkin(skinBeatmapInfo, resourceStore, resources);
         }
     }
 }
diff --git a/osu.Game/Tests/Visual/LegacySkinPlayerTestScene.cs b/osu.Game/Tests/Visual/LegacySkinPlayerTestScene.cs
index 054f72400e..c186525757 100644
--- a/osu.Game/Tests/Visual/LegacySkinPlayerTestScene.cs
+++ b/osu.Game/Tests/Visual/LegacySkinPlayerTestScene.cs
@@ -3,7 +3,6 @@
 
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Audio;
 using osu.Framework.IO.Stores;
 using osu.Game.Rulesets;
 using osu.Game.Skinning;
@@ -18,9 +17,9 @@ namespace osu.Game.Tests.Visual
         protected override TestPlayer CreatePlayer(Ruleset ruleset) => new SkinProvidingPlayer(legacySkinSource);
 
         [BackgroundDependencyLoader]
-        private void load(AudioManager audio, OsuGameBase game)
+        private void load(OsuGameBase game, SkinManager skins)
         {
-            var legacySkin = new DefaultLegacySkin(new NamespacedResourceStore<byte[]>(game.Resources, "Skins/Legacy"), audio);
+            var legacySkin = new DefaultLegacySkin(new NamespacedResourceStore<byte[]>(game.Resources, "Skins/Legacy"), skins);
             legacySkinSource = new SkinProvidingContainer(legacySkin);
         }
 
diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index 68098f9d3b..3a9c33788a 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -13,8 +13,10 @@ using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
+using osu.Framework.Platform;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Sprites;
+using osu.Game.IO;
 using osu.Game.Rulesets;
 using osu.Game.Skinning;
 using osuTK;
@@ -22,13 +24,16 @@ using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual
 {
-    public abstract class SkinnableTestScene : OsuGridTestScene
+    public abstract class SkinnableTestScene : OsuGridTestScene, IStorageResourceProvider
     {
         private Skin metricsSkin;
         private Skin defaultSkin;
         private Skin specialSkin;
         private Skin oldSkin;
 
+        [Resolved]
+        private GameHost host { get; set; }
+
         protected SkinnableTestScene()
             : base(2, 3)
         {
@@ -39,10 +44,10 @@ namespace osu.Game.Tests.Visual
         {
             var dllStore = new DllResourceStore(DynamicCompilationOriginal.GetType().Assembly);
 
-            metricsSkin = new TestLegacySkin(new SkinInfo { Name = "metrics-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/metrics_skin"), audio, true);
-            defaultSkin = new DefaultLegacySkin(new NamespacedResourceStore<byte[]>(game.Resources, "Skins/Legacy"), audio);
-            specialSkin = new TestLegacySkin(new SkinInfo { Name = "special-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/special_skin"), audio, true);
-            oldSkin = new TestLegacySkin(new SkinInfo { Name = "old-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/old_skin"), audio, true);
+            metricsSkin = new TestLegacySkin(new SkinInfo { Name = "metrics-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/metrics_skin"), this, true);
+            defaultSkin = new DefaultLegacySkin(new NamespacedResourceStore<byte[]>(game.Resources, "Skins/Legacy"), this);
+            specialSkin = new TestLegacySkin(new SkinInfo { Name = "special-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/special_skin"), this, true);
+            oldSkin = new TestLegacySkin(new SkinInfo { Name = "old-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/old_skin"), this, true);
         }
 
         private readonly List<Drawable> createdDrawables = new List<Drawable>();
@@ -147,6 +152,10 @@ namespace osu.Game.Tests.Visual
 
         protected virtual IBeatmap CreateBeatmapForSkinProvider() => CreateWorkingBeatmap(Ruleset.Value).GetPlayableBeatmap(Ruleset.Value);
 
+        public AudioManager AudioManager => Audio;
+        public IResourceStore<byte[]> Files => null;
+        public IResourceStore<TextureUpload> CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => host.CreateTextureLoaderStore(underlyingStore);
+
         private class OutlineBox : CompositeDrawable
         {
             public OutlineBox()
@@ -170,8 +179,8 @@ namespace osu.Game.Tests.Visual
         {
             private readonly bool extrapolateAnimations;
 
-            public TestLegacySkin(SkinInfo skin, IResourceStore<byte[]> storage, AudioManager audioManager, bool extrapolateAnimations)
-                : base(skin, storage, audioManager, "skin.ini")
+            public TestLegacySkin(SkinInfo skin, IResourceStore<byte[]> storage, IStorageResourceProvider resources, bool extrapolateAnimations)
+                : base(skin, storage, resources, "skin.ini")
             {
                 this.extrapolateAnimations = extrapolateAnimations;
             }

From 82cf58353ce15e45770bea510181769abeaee846 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 15:38:20 +0900
Subject: [PATCH 0447/3722] Fix incorrect joinedroom null checks

---
 osu.Game/Screens/Multi/Components/RoomManager.cs                | 2 +-
 .../Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Multi/Components/RoomManager.cs b/osu.Game/Screens/Multi/Components/RoomManager.cs
index 276a5a6148..482ee5492c 100644
--- a/osu.Game/Screens/Multi/Components/RoomManager.cs
+++ b/osu.Game/Screens/Multi/Components/RoomManager.cs
@@ -112,7 +112,7 @@ namespace osu.Game.Screens.Multi.Components
         {
             currentJoinRoomRequest?.Cancel();
 
-            if (JoinedRoom == null)
+            if (JoinedRoom.Value == null)
                 return;
 
             api.Queue(new PartRoomRequest(joinedRoom.Value));
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index b81ca7aade..e0fca3ce4c 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
         public override void PartRoom()
         {
-            if (JoinedRoom == null)
+            if (JoinedRoom.Value == null)
                 return;
 
             var joinedRoom = JoinedRoom.Value;

From a59124dd938a8c98a276c85299cbbb144f87b190 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 16:18:39 +0900
Subject: [PATCH 0448/3722] Make room duration/endsat nullable

---
 .../Visual/Multiplayer/TestSceneRoomStatus.cs    | 12 +++++++++---
 osu.Game/Online/Multiplayer/Room.cs              | 16 +++++++++++-----
 .../Screens/Multi/Components/RoomStatusInfo.cs   | 11 +++++++++--
 .../Match/Components/MatchSettingsOverlay.cs     |  2 +-
 osu.Game/Screens/Multi/MultiplayerComposite.cs   |  4 ++--
 .../Multi/Timeshift/TimeshiftReadyButton.cs      |  4 ++--
 6 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs
index c1dfb94464..a6dd1437f7 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs
@@ -22,22 +22,28 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 {
                     new DrawableRoom(new Room
                     {
-                        Name = { Value = "Room 1" },
+                        Name = { Value = "Open - ending in 1 day" },
                         Status = { Value = new RoomStatusOpen() },
                         EndDate = { Value = DateTimeOffset.Now.AddDays(1) }
                     }) { MatchingFilter = true },
                     new DrawableRoom(new Room
                     {
-                        Name = { Value = "Room 2" },
+                        Name = { Value = "Playing - ending in 1 day" },
                         Status = { Value = new RoomStatusPlaying() },
                         EndDate = { Value = DateTimeOffset.Now.AddDays(1) }
                     }) { MatchingFilter = true },
                     new DrawableRoom(new Room
                     {
-                        Name = { Value = "Room 3" },
+                        Name = { Value = "Ended" },
                         Status = { Value = new RoomStatusEnded() },
                         EndDate = { Value = DateTimeOffset.Now }
                     }) { MatchingFilter = true },
+                    new DrawableRoom(new Room
+                    {
+                        Name = { Value = "Open (realtime)" },
+                        Status = { Value = new RoomStatusOpen() },
+                        Category = { Value = RoomCategory.Realtime }
+                    }) { MatchingFilter = true },
                 }
             };
         }
diff --git a/osu.Game/Online/Multiplayer/Room.cs b/osu.Game/Online/Multiplayer/Room.cs
index 9a21543b2e..ee8992e399 100644
--- a/osu.Game/Online/Multiplayer/Room.cs
+++ b/osu.Game/Online/Multiplayer/Room.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Online.Multiplayer
 
         [Cached]
         [JsonIgnore]
-        public readonly Bindable<TimeSpan> Duration = new Bindable<TimeSpan>(TimeSpan.FromMinutes(30));
+        public readonly Bindable<TimeSpan?> Duration = new Bindable<TimeSpan?>();
 
         [Cached]
         [JsonIgnore]
@@ -78,16 +78,22 @@ namespace osu.Game.Online.Multiplayer
         }
 
         [JsonProperty("duration")]
-        private int duration
+        private int? duration
         {
-            get => (int)Duration.Value.TotalMinutes;
-            set => Duration.Value = TimeSpan.FromMinutes(value);
+            get => (int?)Duration.Value?.TotalMinutes;
+            set
+            {
+                if (value == null)
+                    Duration.Value = null;
+                else
+                    Duration.Value = TimeSpan.FromMinutes(value.Value);
+            }
         }
 
         // Only supports retrieval for now
         [Cached]
         [JsonProperty("ends_at")]
-        public readonly Bindable<DateTimeOffset> EndDate = new Bindable<DateTimeOffset>();
+        public readonly Bindable<DateTimeOffset?> EndDate = new Bindable<DateTimeOffset?>();
 
         // Todo: Find a better way to do this (https://github.com/ppy/osu-framework/issues/1930)
         [JsonProperty("max_attempts", DefaultValueHandling = DefaultValueHandling.Ignore)]
diff --git a/osu.Game/Screens/Multi/Components/RoomStatusInfo.cs b/osu.Game/Screens/Multi/Components/RoomStatusInfo.cs
index d799f846c2..b5676692a4 100644
--- a/osu.Game/Screens/Multi/Components/RoomStatusInfo.cs
+++ b/osu.Game/Screens/Multi/Components/RoomStatusInfo.cs
@@ -48,16 +48,23 @@ namespace osu.Game.Screens.Multi.Components
 
         private class EndDatePart : DrawableDate
         {
-            public readonly IBindable<DateTimeOffset> EndDate = new Bindable<DateTimeOffset>();
+            public readonly IBindable<DateTimeOffset?> EndDate = new Bindable<DateTimeOffset?>();
 
             public EndDatePart()
                 : base(DateTimeOffset.UtcNow)
             {
-                EndDate.BindValueChanged(date => Date = date.NewValue);
+                EndDate.BindValueChanged(date =>
+                {
+                    // If null, set a very large future date to prevent unnecessary schedules.
+                    Date = date.NewValue ?? DateTimeOffset.Now.AddYears(1);
+                }, true);
             }
 
             protected override string Format()
             {
+                if (EndDate.Value == null)
+                    return string.Empty;
+
                 var diffToNow = Date.Subtract(DateTimeOffset.Now);
 
                 if (diffToNow.TotalSeconds < -5)
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
index b8003b9774..1859e8db8a 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
@@ -325,7 +325,7 @@ namespace osu.Game.Screens.Multi.Match.Components
                 Availability.BindValueChanged(availability => AvailabilityPicker.Current.Value = availability.NewValue, true);
                 Type.BindValueChanged(type => TypePicker.Current.Value = type.NewValue, true);
                 MaxParticipants.BindValueChanged(count => MaxParticipantsField.Text = count.NewValue?.ToString(), true);
-                Duration.BindValueChanged(duration => DurationField.Current.Value = duration.NewValue, true);
+                Duration.BindValueChanged(duration => DurationField.Current.Value = duration.NewValue ?? TimeSpan.FromMinutes(30), true);
 
                 playlist.Items.BindTo(Playlist);
                 Playlist.BindCollectionChanged(onPlaylistChanged, true);
diff --git a/osu.Game/Screens/Multi/MultiplayerComposite.cs b/osu.Game/Screens/Multi/MultiplayerComposite.cs
index e612e77748..6e0c69d712 100644
--- a/osu.Game/Screens/Multi/MultiplayerComposite.cs
+++ b/osu.Game/Screens/Multi/MultiplayerComposite.cs
@@ -40,12 +40,12 @@ namespace osu.Game.Screens.Multi
         protected Bindable<int?> MaxParticipants { get; private set; }
 
         [Resolved(typeof(Room))]
-        protected Bindable<DateTimeOffset> EndDate { get; private set; }
+        protected Bindable<DateTimeOffset?> EndDate { get; private set; }
 
         [Resolved(typeof(Room))]
         protected Bindable<RoomAvailability> Availability { get; private set; }
 
         [Resolved(typeof(Room))]
-        protected Bindable<TimeSpan> Duration { get; private set; }
+        protected Bindable<TimeSpan?> Duration { get; private set; }
     }
 }
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftReadyButton.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftReadyButton.cs
index ba639c29f4..c878451eee 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftReadyButton.cs
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftReadyButton.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Screens.Multi.Timeshift
     public class TimeshiftReadyButton : ReadyButton
     {
         [Resolved(typeof(Room), nameof(Room.EndDate))]
-        private Bindable<DateTimeOffset> endDate { get; set; }
+        private Bindable<DateTimeOffset?> endDate { get; set; }
 
         public TimeshiftReadyButton()
         {
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Multi.Timeshift
         {
             base.Update();
 
-            Enabled.Value = DateTimeOffset.UtcNow.AddSeconds(30).AddMilliseconds(GameBeatmap.Value.Track.Length) < endDate.Value;
+            Enabled.Value = endDate.Value != null && DateTimeOffset.UtcNow.AddSeconds(30).AddMilliseconds(GameBeatmap.Value.Track.Length) < endDate.Value;
         }
     }
 }

From c3d1eaf36dec71ff703f623b1f274192e6f1275c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 16:21:05 +0900
Subject: [PATCH 0449/3722] Make RealtimeMultiplayerTestScene abstract

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

diff --git a/osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs b/osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs
index b52106551e..aec70d8be4 100644
--- a/osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs
+++ b/osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs
@@ -12,7 +12,7 @@ using osu.Game.Screens.Multi.RealtimeMultiplayer;
 
 namespace osu.Game.Tests.Visual.RealtimeMultiplayer
 {
-    public class RealtimeMultiplayerTestScene : MultiplayerTestScene
+    public abstract class RealtimeMultiplayerTestScene : MultiplayerTestScene
     {
         [Cached(typeof(StatefulMultiplayerClient))]
         public TestRealtimeMultiplayerClient Client { get; }
@@ -28,7 +28,7 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
 
         private readonly bool joinRoom;
 
-        public RealtimeMultiplayerTestScene(bool joinRoom = true)
+        protected RealtimeMultiplayerTestScene(bool joinRoom = true)
         {
             this.joinRoom = joinRoom;
             base.Content.Add(content = new TestRealtimeRoomContainer { RelativeSizeAxes = Axes.Both });

From 64a32723f3b544fec8f02b120f00986ffcd3e65e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 16:23:42 +0900
Subject: [PATCH 0450/3722] One more case

---
 osu.Game/Online/Multiplayer/Room.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/Multiplayer/Room.cs b/osu.Game/Online/Multiplayer/Room.cs
index ee8992e399..e3444d6b7e 100644
--- a/osu.Game/Online/Multiplayer/Room.cs
+++ b/osu.Game/Online/Multiplayer/Room.cs
@@ -139,7 +139,7 @@ namespace osu.Game.Online.Multiplayer
             ParticipantCount.Value = other.ParticipantCount.Value;
             EndDate.Value = other.EndDate.Value;
 
-            if (DateTimeOffset.Now >= EndDate.Value)
+            if (EndDate.Value != null && DateTimeOffset.Now >= EndDate.Value)
                 Status.Value = new RoomStatusEnded();
 
             if (!Playlist.SequenceEqual(other.Playlist))

From 5d73359bd7c0e95a9e18c202319d0ecf77071e18 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 16:35:19 +0900
Subject: [PATCH 0451/3722] Make participant count non-nullable

---
 osu.Game/Online/Multiplayer/Room.cs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/Room.cs b/osu.Game/Online/Multiplayer/Room.cs
index 9a21543b2e..5930a624bc 100644
--- a/osu.Game/Online/Multiplayer/Room.cs
+++ b/osu.Game/Online/Multiplayer/Room.cs
@@ -67,15 +67,8 @@ namespace osu.Game.Online.Multiplayer
         public readonly BindableList<User> RecentParticipants = new BindableList<User>();
 
         [Cached]
-        public readonly Bindable<int> ParticipantCount = new Bindable<int>();
-
-        // todo: TEMPORARY
         [JsonProperty("participant_count")]
-        private int? participantCount
-        {
-            get => ParticipantCount.Value;
-            set => ParticipantCount.Value = value ?? 0;
-        }
+        public readonly Bindable<int> ParticipantCount = new Bindable<int>();
 
         [JsonProperty("duration")]
         private int duration

From d096f2f8f6445eb3524df9612e8d7a891528bebe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Dec 2020 16:39:46 +0900
Subject: [PATCH 0452/3722] Fix potential cross-thread operation during chat
 channel load

The callbacks are scheduled to the API thread, but hooked up in BDL
load. This causes a potential case of cross-thread collection
enumeration.

I've tested and it seems like the schedule logic should be fine for
short term. Longer term, we probably want to re-think how this works so
background operations aren't performed on the `DrawableChannel` in the
first place (chat shouldn't have an overhead like this when not
visible).

Closes #11231.
---
 osu.Game/Overlays/Chat/DrawableChannel.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Chat/DrawableChannel.cs b/osu.Game/Overlays/Chat/DrawableChannel.cs
index d63faebae4..5926d11c03 100644
--- a/osu.Game/Overlays/Chat/DrawableChannel.cs
+++ b/osu.Game/Overlays/Chat/DrawableChannel.cs
@@ -103,7 +103,7 @@ namespace osu.Game.Overlays.Chat
             Colour = colours.ChatBlue.Lighten(0.7f),
         };
 
-        private void newMessagesArrived(IEnumerable<Message> newMessages)
+        private void newMessagesArrived(IEnumerable<Message> newMessages) => Schedule(() =>
         {
             if (newMessages.Min(m => m.Id) < chatLines.Max(c => c.Message.Id))
             {
@@ -155,9 +155,9 @@ namespace osu.Game.Overlays.Chat
 
             if (shouldScrollToEnd)
                 scrollToEnd();
-        }
+        });
 
-        private void pendingMessageResolved(Message existing, Message updated)
+        private void pendingMessageResolved(Message existing, Message updated) => Schedule(() =>
         {
             var found = chatLines.LastOrDefault(c => c.Message == existing);
 
@@ -169,12 +169,12 @@ namespace osu.Game.Overlays.Chat
                 found.Message = updated;
                 ChatLineFlow.Add(found);
             }
-        }
+        });
 
-        private void messageRemoved(Message removed)
+        private void messageRemoved(Message removed) => Schedule(() =>
         {
             chatLines.FirstOrDefault(c => c.Message == removed)?.FadeColour(Color4.Red, 400).FadeOut(600).Expire();
-        }
+        });
 
         private IEnumerable<ChatLine> chatLines => ChatLineFlow.Children.OfType<ChatLine>();
 

From a021aaf54673acf78c5272d077e757b1ded87bc8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 16:42:21 +0900
Subject: [PATCH 0453/3722] Fix room category being serialised as ints

---
 osu.Game/Online/Multiplayer/Room.cs | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/Multiplayer/Room.cs b/osu.Game/Online/Multiplayer/Room.cs
index 9a21543b2e..53ae142ad4 100644
--- a/osu.Game/Online/Multiplayer/Room.cs
+++ b/osu.Game/Online/Multiplayer/Room.cs
@@ -35,9 +35,22 @@ namespace osu.Game.Online.Multiplayer
         public readonly Bindable<int> ChannelId = new Bindable<int>();
 
         [Cached]
-        [JsonProperty("category")]
+        [JsonIgnore]
         public readonly Bindable<RoomCategory> Category = new Bindable<RoomCategory>();
 
+        // Todo: osu-framework bug (https://github.com/ppy/osu-framework/issues/4106)
+        [JsonProperty("category")]
+        private string categoryString
+        {
+            get => Category.Value.ToString().ToLower();
+            set
+            {
+                if (!Enum.TryParse<RoomCategory>(value, true, out var enumValue))
+                    enumValue = RoomCategory.Normal;
+                Category.Value = enumValue;
+            }
+        }
+
         [Cached]
         [JsonIgnore]
         public readonly Bindable<TimeSpan> Duration = new Bindable<TimeSpan>(TimeSpan.FromMinutes(30));

From e23d81bfc64594c80d21ea1043ec085a47161f25 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 16:56:45 +0900
Subject: [PATCH 0454/3722] Use enum property

---
 .../Converters/SnakeCaseStringEnumConverter.cs   | 16 ++++++++++++++++
 osu.Game/Online/Multiplayer/Room.cs              | 13 +++++--------
 2 files changed, 21 insertions(+), 8 deletions(-)
 create mode 100644 osu.Game/IO/Serialization/Converters/SnakeCaseStringEnumConverter.cs

diff --git a/osu.Game/IO/Serialization/Converters/SnakeCaseStringEnumConverter.cs b/osu.Game/IO/Serialization/Converters/SnakeCaseStringEnumConverter.cs
new file mode 100644
index 0000000000..1d82a5bc87
--- /dev/null
+++ b/osu.Game/IO/Serialization/Converters/SnakeCaseStringEnumConverter.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 Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Serialization;
+
+namespace osu.Game.IO.Serialization.Converters
+{
+    public class SnakeCaseStringEnumConverter : StringEnumConverter
+    {
+        public SnakeCaseStringEnumConverter()
+        {
+            NamingStrategy = new SnakeCaseNamingStrategy();
+        }
+    }
+}
diff --git a/osu.Game/Online/Multiplayer/Room.cs b/osu.Game/Online/Multiplayer/Room.cs
index 53ae142ad4..66e3e8975a 100644
--- a/osu.Game/Online/Multiplayer/Room.cs
+++ b/osu.Game/Online/Multiplayer/Room.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using Newtonsoft.Json;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Game.IO.Serialization.Converters;
 using osu.Game.Online.Multiplayer.GameTypes;
 using osu.Game.Online.Multiplayer.RoomStatuses;
 using osu.Game.Users;
@@ -40,15 +41,11 @@ namespace osu.Game.Online.Multiplayer
 
         // Todo: osu-framework bug (https://github.com/ppy/osu-framework/issues/4106)
         [JsonProperty("category")]
-        private string categoryString
+        [JsonConverter(typeof(SnakeCaseStringEnumConverter))]
+        private RoomCategory category
         {
-            get => Category.Value.ToString().ToLower();
-            set
-            {
-                if (!Enum.TryParse<RoomCategory>(value, true, out var enumValue))
-                    enumValue = RoomCategory.Normal;
-                Category.Value = enumValue;
-            }
+            get => Category.Value;
+            set => Category.Value = value;
         }
 
         [Cached]

From eb46c9ce9be47341a18e08fedeeb65408ac5847c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 17:11:30 +0900
Subject: [PATCH 0455/3722] Fix metadata lost in beatmapset deserialisation

---
 .../Online/API/Requests/Responses/APIBeatmapSet.cs  | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs b/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs
index 6d0160fbc4..720d6bfff4 100644
--- a/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs
@@ -80,7 +80,7 @@ namespace osu.Game.Online.API.Requests.Responses
 
         public BeatmapSetInfo ToBeatmapSet(RulesetStore rulesets)
         {
-            return new BeatmapSetInfo
+            var beatmapSet = new BeatmapSetInfo
             {
                 OnlineBeatmapSetID = OnlineBeatmapSetID,
                 Metadata = this,
@@ -104,8 +104,17 @@ namespace osu.Game.Online.API.Requests.Responses
                     Genre = genre,
                     Language = language
                 },
-                Beatmaps = beatmaps?.Select(b => b.ToBeatmap(rulesets)).ToList(),
             };
+
+            beatmapSet.Beatmaps = beatmaps?.Select(b =>
+            {
+                var beatmap = b.ToBeatmap(rulesets);
+                beatmap.BeatmapSet = beatmapSet;
+                beatmap.Metadata = beatmapSet.Metadata;
+                return beatmap;
+            }).ToList();
+
+            return beatmapSet;
         }
     }
 }

From e1b2de27a6395f051e4f9f71aa52dfe6398cc4fc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Dec 2020 17:19:29 +0900
Subject: [PATCH 0456/3722] Update osu!mania legacy skin's judgement animation
 to match stable

---
 .../Legacy/LegacyManiaJudgementPiece.cs       | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs
index 9684cbb167..e275e1c0ca 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs
@@ -5,11 +5,11 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
-using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 {
@@ -56,31 +56,30 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 
             (animation as IFramedAnimation)?.GotoFrame(0);
 
+            this.FadeInFromZero(20, Easing.Out)
+                .Then().Delay(160)
+                .FadeOutFromOne(40, Easing.In);
+
             switch (result)
             {
                 case HitResult.None:
                     break;
 
                 case HitResult.Miss:
-                    animation.ScaleTo(1.6f);
-                    animation.ScaleTo(1, 100, Easing.In);
-
-                    animation.MoveTo(Vector2.Zero);
-                    animation.MoveToOffset(new Vector2(0, 100), 800, Easing.InQuint);
+                    animation.ScaleTo(1.2f).Then().ScaleTo(1, 100, Easing.Out);
 
                     animation.RotateTo(0);
-                    animation.RotateTo(40, 800, Easing.InQuint);
-
-                    this.FadeOutFromOne(800);
+                    animation.RotateTo(RNG.NextSingle(-18, 18), 100, Easing.Out);
                     break;
 
                 default:
-                    animation.ScaleTo(0.8f);
-                    animation.ScaleTo(1, 250, Easing.OutElastic);
-
-                    animation.Delay(50).ScaleTo(0.75f, 250);
-
-                    this.Delay(50).FadeOut(200);
+                    animation.ScaleTo(0.8f)
+                             .Then().ScaleTo(1, 40)
+                             // this is actually correct to match stable; there were overlapping transforms.
+                             .Then().ScaleTo(0.85f)
+                             .Then().ScaleTo(0.7f, 40)
+                             .Then().Delay(100)
+                             .Then().ScaleTo(0.4f, 40, Easing.In);
                     break;
             }
         }

From 9fa1f60b7d2f0fcae3537148374a5e9214ac907b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 17:31:15 +0900
Subject: [PATCH 0457/3722] Fix incorrect footer being used

---
 .../Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
index d8b42e065b..cdab1435c0 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
@@ -149,7 +149,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
                         },
                         new Drawable[]
                         {
-                            new Footer { SelectedItem = { BindTarget = SelectedItem } }
+                            new RealtimeMatchFooter { SelectedItem = { BindTarget = SelectedItem } }
                         }
                     },
                     RowDimensions = new[]

From 83f1350d7d218ba69082bffe0fc7f495b428cf34 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Dec 2020 17:49:10 +0900
Subject: [PATCH 0458/3722] Fix editor background not being correctly cleaned
 up on forced exit

Closes #11214. Should be pretty obvious why.
---
 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 ca7e5fbf20..223c678fba 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -461,7 +461,7 @@ namespace osu.Game.Screens.Edit
                 if (dialogOverlay == null || dialogOverlay.CurrentDialog is PromptForSaveDialog)
                 {
                     confirmExit();
-                    return false;
+                    return base.OnExiting(next);
                 }
 
                 if (isNewBeatmap || HasUnsavedChanges)

From d11d754715220e5e84c991d497e91d561126444a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Dec 2020 18:09:37 +0900
Subject: [PATCH 0459/3722] Increase size of circle display on timeline

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

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 657c5834b2..ae2a82fa10 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
     {
         private const float thickness = 5;
         private const float shadow_radius = 5;
-        private const float circle_size = 24;
+        private const float circle_size = 34;
 
         public Action<DragEvent> OnDragHandled;
 

From d1be7c23d96ec9efe7d4edaaa87fd43c155af259 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Dec 2020 18:09:56 +0900
Subject: [PATCH 0460/3722] Increase height of timeline drag area

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

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index 2f14c607c2..ead1aa5c62 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
-            Height = 0.4f;
+            Height = 0.6f;
 
             AddInternal(new Box
             {

From 423c6158e16bda8c5382de4f99eeabcd776cfb97 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 21 Dec 2020 18:10:11 +0900
Subject: [PATCH 0461/3722] Highlight timeline drag area when hovered for
 better visibility

---
 .../Timeline/TimelineBlueprintContainer.cs    | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index ead1aa5c62..1fc529910b 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Framework.Utils;
+using osu.Game.Graphics;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
@@ -25,10 +26,15 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [Resolved]
         private EditorBeatmap beatmap { get; set; }
 
+        [Resolved]
+        private OsuColour colours { get; set; }
+
         private DragEvent lastDragEvent;
         private Bindable<HitObject> placement;
         private SelectionBlueprint placementBlueprint;
 
+        private readonly Box backgroundBox;
+
         public TimelineBlueprintContainer(HitObjectComposer composer)
             : base(composer)
         {
@@ -38,7 +44,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             Height = 0.6f;
 
-            AddInternal(new Box
+            AddInternal(backgroundBox = new Box
             {
                 Colour = Color4.Black,
                 RelativeSizeAxes = Axes.Both,
@@ -77,6 +83,18 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         protected override Container<SelectionBlueprint> CreateSelectionBlueprintContainer() => new TimelineSelectionBlueprintContainer { RelativeSizeAxes = Axes.Both };
 
+        protected override bool OnHover(HoverEvent e)
+        {
+            backgroundBox.FadeColour(colours.BlueLighter, 120, Easing.OutQuint);
+            return base.OnHover(e);
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            backgroundBox.FadeColour(Color4.Black, 600, Easing.OutQuint);
+            base.OnHoverLost(e);
+        }
+
         protected override void OnDrag(DragEvent e)
         {
             handleScrollViaDrag(e);

From 0566ed1a9b15a105530ab800865077bc68ab5a9e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 18:38:44 +0900
Subject: [PATCH 0462/3722] Add button to main menu

---
 osu.Game/Screens/Menu/ButtonSystem.cs | 11 +++++------
 osu.Game/Screens/Menu/MainMenu.cs     |  5 +++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 4becdd58cd..0014f6768f 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -42,8 +42,7 @@ namespace osu.Game.Screens.Menu
         public Action OnBeatmapListing;
         public Action OnSolo;
         public Action OnSettings;
-        public Action OnMulti;
-        public Action OnChart;
+        public Action<bool> OnMulti;
 
         public const float BUTTON_WIDTH = 140f;
         public const float WEDGE_WIDTH = 20;
@@ -124,8 +123,8 @@ namespace osu.Game.Screens.Menu
         private void load(AudioManager audio, IdleTracker idleTracker, GameHost host)
         {
             buttonsPlay.Add(new Button(@"solo", @"button-solo-select", FontAwesome.Solid.User, new Color4(102, 68, 204, 255), () => OnSolo?.Invoke(), WEDGE_WIDTH, Key.P));
-            buttonsPlay.Add(new Button(@"multi", @"button-generic-select", FontAwesome.Solid.Users, new Color4(94, 63, 186, 255), onMulti, 0, Key.M));
-            buttonsPlay.Add(new Button(@"chart", @"button-generic-select", OsuIcon.Charts, new Color4(80, 53, 160, 255), () => OnChart?.Invoke()));
+            buttonsPlay.Add(new Button(@"multi", @"button-generic-select", OsuIcon.Charts, new Color4(94, 63, 186, 255), () => onMulti(true), 0, Key.M));
+            buttonsPlay.Add(new Button(@"timeshift", @"button-generic-select", FontAwesome.Solid.Users, new Color4(94, 63, 186, 255), () => onMulti(false), 0, Key.L));
             buttonsPlay.ForEach(b => b.VisibleState = ButtonSystemState.Play);
 
             buttonsTopLevel.Add(new Button(@"play", @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));
@@ -154,7 +153,7 @@ namespace osu.Game.Screens.Menu
             sampleBack = audio.Samples.Get(@"Menu/button-back-select");
         }
 
-        private void onMulti()
+        private void onMulti(bool realtime)
         {
             if (!api.IsLoggedIn)
             {
@@ -172,7 +171,7 @@ namespace osu.Game.Screens.Menu
                 return;
             }
 
-            OnMulti?.Invoke();
+            OnMulti?.Invoke(realtime);
         }
 
         private void updateIdleState(bool isIdle)
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index b781c347f0..391bbf8429 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -17,6 +17,8 @@ using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Edit;
+using osu.Game.Screens.Multi;
+using osu.Game.Screens.Multi.RealtimeMultiplayer;
 using osu.Game.Screens.Multi.Timeshift;
 using osu.Game.Screens.Select;
 
@@ -104,7 +106,7 @@ namespace osu.Game.Screens.Menu
                                 this.Push(new Editor());
                             },
                             OnSolo = onSolo,
-                            OnMulti = delegate { this.Push(new TimeshiftMultiplayer()); },
+                            OnMulti = realtime => this.Push(realtime ? (Multiplayer)new RealtimeMultiplayer() : new TimeshiftMultiplayer()),
                             OnExit = confirmAndExit,
                         }
                     }
@@ -136,7 +138,6 @@ namespace osu.Game.Screens.Menu
 
             buttons.OnSettings = () => settings?.ToggleVisibility();
             buttons.OnBeatmapListing = () => beatmapListing?.ToggleVisibility();
-            buttons.OnChart = () => rankings?.ShowSpotlights();
 
             LoadComponentAsync(background = new BackgroundScreenDefault());
             preloadSongSelect();

From 8427ee1b8e6425b2d6e2bc837a737dba2f7e6e85 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 18:42:23 +0900
Subject: [PATCH 0463/3722] Fix incorrect cached type

---
 .../RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs       | 4 ++--
 .../Visual/RealtimeMultiplayer/TestRealtimeRoomContainer.cs   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs b/osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs
index aec70d8be4..30bd3ebc32 100644
--- a/osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs
+++ b/osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs
@@ -7,8 +7,8 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Screens.Multi;
 using osu.Game.Screens.Multi.Lounge.Components;
-using osu.Game.Screens.Multi.RealtimeMultiplayer;
 
 namespace osu.Game.Tests.Visual.RealtimeMultiplayer
 {
@@ -17,7 +17,7 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
         [Cached(typeof(StatefulMultiplayerClient))]
         public TestRealtimeMultiplayerClient Client { get; }
 
-        [Cached(typeof(RealtimeRoomManager))]
+        [Cached(typeof(IRoomManager))]
         public TestRealtimeRoomManager RoomManager { get; }
 
         [Cached]
diff --git a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomContainer.cs b/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomContainer.cs
index aa75968cca..3565d6ac5d 100644
--- a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomContainer.cs
+++ b/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomContainer.cs
@@ -6,8 +6,8 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Screens.Multi;
 using osu.Game.Screens.Multi.Lounge.Components;
-using osu.Game.Screens.Multi.RealtimeMultiplayer;
 
 namespace osu.Game.Tests.Visual.RealtimeMultiplayer
 {
@@ -19,7 +19,7 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
         [Cached(typeof(StatefulMultiplayerClient))]
         public readonly TestRealtimeMultiplayerClient Client;
 
-        [Cached(typeof(RealtimeRoomManager))]
+        [Cached(typeof(IRoomManager))]
         public readonly TestRealtimeRoomManager RoomManager;
 
         [Cached]

From 56bd3d8a82230fd626fad39c23a40a3fd0729e1a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 18:42:31 +0900
Subject: [PATCH 0464/3722] Add realtime multiplayer test scene

---
 .../TestSceneRealtimeMultiplayer.cs           | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayer.cs

diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayer.cs b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayer.cs
new file mode 100644
index 0000000000..80955ca380
--- /dev/null
+++ b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayer.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.
+
+using osu.Game.Screens.Multi.Components;
+
+namespace osu.Game.Tests.Visual.RealtimeMultiplayer
+{
+    public class TestSceneRealtimeMultiplayer : RealtimeMultiplayerTestScene
+    {
+        public TestSceneRealtimeMultiplayer()
+        {
+            var multi = new TestRealtimeMultiplayer();
+
+            AddStep("show", () => LoadScreen(multi));
+            AddUntilStep("wait for loaded", () => multi.IsLoaded);
+        }
+
+        private class TestRealtimeMultiplayer : Screens.Multi.RealtimeMultiplayer.RealtimeMultiplayer
+        {
+            protected override RoomManager CreateRoomManager() => new TestRealtimeRoomManager();
+        }
+    }
+}

From f21b4a269fb7620ef6d612f7709c88f35093c3ed Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 18:42:55 +0900
Subject: [PATCH 0465/3722] Reduce wait length

---
 .../RealtimeMultiplayer/TestSceneRealtimeMatchSubScreen.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMatchSubScreen.cs b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMatchSubScreen.cs
index d31364d62e..a059bb1cc0 100644
--- a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMatchSubScreen.cs
@@ -71,7 +71,7 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddWaitStep("wait", 500);
+            AddWaitStep("wait", 10);
         }
     }
 }

From 10c2745682db8b3be8f35f81b8ef42345a4f3e44 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 12:01:09 +0900
Subject: [PATCH 0466/3722] Add region specifications around implicit interface
 implementations

---
 osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs | 4 ++++
 osu.Game/Beatmaps/BeatmapManager.cs                   | 4 ++++
 osu.Game/Skinning/SkinManager.cs                      | 4 ++++
 osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs        | 4 ++++
 osu.Game/Tests/Visual/SkinnableTestScene.cs           | 4 ++++
 5 files changed, 20 insertions(+)

diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index 36f99c5599..38cb6729c3 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -179,8 +179,12 @@ namespace osu.Game.Tests.Gameplay
             }
         }
 
+        #region IResourceStorageProvider
+
         public AudioManager AudioManager => Audio;
         public IResourceStore<byte[]> Files => null;
         public IResourceStore<TextureUpload> CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => null;
+
+        #endregion
     }
 }
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 3cf691da9a..8a2991af90 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -496,12 +496,16 @@ namespace osu.Game.Beatmaps
             onlineLookupQueue?.Dispose();
         }
 
+        #region IResourceStorageProvider
+
         TextureStore IBeatmapResourceProvider.LargeTextureStore => largeTextureStore;
         ITrackStore IBeatmapResourceProvider.Tracks => trackStore;
         AudioManager IStorageResourceProvider.AudioManager => audioManager;
         IResourceStore<byte[]> IStorageResourceProvider.Files => Files.Store;
         IResourceStore<TextureUpload> IStorageResourceProvider.CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => host.CreateTextureLoaderStore(underlyingStore);
 
+        #endregion
+
         /// <summary>
         /// A dummy WorkingBeatmap for the purpose of retrieving a beatmap for star difficulty calculation.
         /// </summary>
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 2ee940c02d..99c64b13a4 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -175,8 +175,12 @@ namespace osu.Game.Skinning
 
         public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => CurrentSkin.Value.GetConfig<TLookup, TValue>(lookup);
 
+        #region IResourceStorageProvider
+
         AudioManager IStorageResourceProvider.AudioManager => audio;
         IResourceStore<byte[]> IStorageResourceProvider.Files => Files.Store;
         IResourceStore<TextureUpload> IStorageResourceProvider.CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => host.CreateTextureLoaderStore(underlyingStore);
+
+        #endregion
     }
 }
diff --git a/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs b/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
index dd1979a7e3..62814d4ed4 100644
--- a/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
+++ b/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs
@@ -123,10 +123,14 @@ namespace osu.Game.Tests.Beatmaps
         protected void AssertNoLookup(string name) => AddAssert($"\"{name}\" not looked up",
             () => !beatmapSkinResourceStore.PerformedLookups.Contains(name) && !userSkinResourceStore.PerformedLookups.Contains(name));
 
+        #region IResourceStorageProvider
+
         public AudioManager AudioManager => Audio;
         public IResourceStore<byte[]> Files => userSkinResourceStore;
         public IResourceStore<TextureUpload> CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => null;
 
+        #endregion
+
         private class SkinSourceDependencyContainer : IReadOnlyDependencyContainer
         {
             public ISkinSource SkinSource;
diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index 3a9c33788a..3d2c68c2ad 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -152,10 +152,14 @@ namespace osu.Game.Tests.Visual
 
         protected virtual IBeatmap CreateBeatmapForSkinProvider() => CreateWorkingBeatmap(Ruleset.Value).GetPlayableBeatmap(Ruleset.Value);
 
+        #region IResourceStorageProvider
+
         public AudioManager AudioManager => Audio;
         public IResourceStore<byte[]> Files => null;
         public IResourceStore<TextureUpload> CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => host.CreateTextureLoaderStore(underlyingStore);
 
+        #endregion
+
         private class OutlineBox : CompositeDrawable
         {
             public OutlineBox()

From a97a2b2a6637b2ec49ff2430dd7dce1cbd935099 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 12:03:25 +0900
Subject: [PATCH 0467/3722] Add nullability to BeatmapManager's GameHost
 reference

---
 osu.Game/Beatmaps/BeatmapManager.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 8a2991af90..42418e532b 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -72,6 +72,7 @@ namespace osu.Game.Beatmaps
         private readonly LargeTextureStore largeTextureStore;
         private readonly ITrackStore trackStore;
 
+        [CanBeNull]
         private readonly GameHost host;
 
         [CanBeNull]
@@ -502,7 +503,7 @@ namespace osu.Game.Beatmaps
         ITrackStore IBeatmapResourceProvider.Tracks => trackStore;
         AudioManager IStorageResourceProvider.AudioManager => audioManager;
         IResourceStore<byte[]> IStorageResourceProvider.Files => Files.Store;
-        IResourceStore<TextureUpload> IStorageResourceProvider.CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => host.CreateTextureLoaderStore(underlyingStore);
+        IResourceStore<TextureUpload> IStorageResourceProvider.CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => host?.CreateTextureLoaderStore(underlyingStore);
 
         #endregion
 

From 85518b4d9919973a685d2467530064c0518fc605 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 12:06:10 +0900
Subject: [PATCH 0468/3722] Enforce non-null for BeatmapManager WorkingBeatmap
 resources

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

diff --git a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
index 5d298dbccc..62cf29dc03 100644
--- a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.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.Linq;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
@@ -19,10 +20,11 @@ namespace osu.Game.Beatmaps
         [ExcludeFromDynamicCompile]
         private class BeatmapManagerWorkingBeatmap : WorkingBeatmap
         {
+            [NotNull]
             private readonly IBeatmapResourceProvider resources;
 
-            public BeatmapManagerWorkingBeatmap(BeatmapInfo beatmapInfo, IBeatmapResourceProvider resources)
-                : base(beatmapInfo, resources?.AudioManager)
+            public BeatmapManagerWorkingBeatmap(BeatmapInfo beatmapInfo, [NotNull] IBeatmapResourceProvider resources)
+                : base(beatmapInfo, resources.AudioManager)
             {
                 this.resources = resources;
             }

From 13ef097a53933e2e84608911aa6fd5976a73c945 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 12:08:40 +0900
Subject: [PATCH 0469/3722] Annotate potentially null parameters in protected
 ctor of LegacySkin

---
 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 5a7ad095f6..e4e5bf2f75 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Skinning
         {
         }
 
-        protected LegacySkin(SkinInfo skin, IResourceStore<byte[]> storage, IStorageResourceProvider resources, string filename)
+        protected LegacySkin(SkinInfo skin, [CanBeNull] IResourceStore<byte[]> storage, [CanBeNull] IStorageResourceProvider resources, string filename)
             : base(skin)
         {
             using (var stream = storage?.GetStream(filename))

From bf39aa5980819bc4c0171251173111e47573fb4e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 12:18:42 +0900
Subject: [PATCH 0470/3722] Fix incorrectly converted rotation values

---
 .../Skinning/Legacy/LegacyManiaJudgementPiece.cs                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs
index e275e1c0ca..5d662c18d3 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
                     animation.ScaleTo(1.2f).Then().ScaleTo(1, 100, Easing.Out);
 
                     animation.RotateTo(0);
-                    animation.RotateTo(RNG.NextSingle(-18, 18), 100, Easing.Out);
+                    animation.RotateTo(RNG.NextSingle(-5.73f, 5.73f), 100, Easing.Out);
                     break;
 
                 default:

From 87176edca142a2fbbfe4aea1076902449fda1c79 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 12:52:30 +0900
Subject: [PATCH 0471/3722] Fix crash when attempting to scale two hitobjects
 on the same axis

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

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index ec8c68005f..660e1844aa 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -157,10 +157,16 @@ namespace osu.Game.Rulesets.Osu.Edit
 
                 foreach (var h in hitObjects)
                 {
-                    h.Position = new Vector2(
-                        quad.TopLeft.X + (h.X - quad.TopLeft.X) / quad.Width * (quad.Width + scale.X),
-                        quad.TopLeft.Y + (h.Y - quad.TopLeft.Y) / quad.Height * (quad.Height + scale.Y)
-                    );
+                    var newPosition = h.Position;
+
+                    // guard against no-ops and NaN.
+                    if (scale.X != 0 && quad.Width > 0)
+                        newPosition.X = quad.TopLeft.X + (h.X - quad.TopLeft.X) / quad.Width * (quad.Width + scale.X);
+
+                    if (scale.Y != 0 && quad.Height > 0)
+                        newPosition.Y = quad.TopLeft.Y + (h.Y - quad.TopLeft.Y) / quad.Height * (quad.Height + scale.Y);
+
+                    h.Position = newPosition;
                 }
             }
 

From 7c5964fad8471635aa98a4fa1f81ef43ee9d5351 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 13:04:39 +0900
Subject: [PATCH 0472/3722] Revert window modes to previous code to correctly
 apply framework restrictions

---
 osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs | 3 ++-
 osu.Game/Overlays/Settings/SettingsDropdown.cs                 | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index 3df2a78552..3ef60c8fcd 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -59,9 +59,10 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
 
             Children = new Drawable[]
             {
-                windowModeDropdown = new SettingsEnumDropdown<WindowMode>
+                windowModeDropdown = new SettingsDropdown<WindowMode>
                 {
                     LabelText = "Screen mode",
+                    ItemSource = windowModes,
                     Current = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode),
                 },
                 resolutionSettingsContainer = new Container
diff --git a/osu.Game/Overlays/Settings/SettingsDropdown.cs b/osu.Game/Overlays/Settings/SettingsDropdown.cs
index e1c6333aa0..1175ddaab8 100644
--- a/osu.Game/Overlays/Settings/SettingsDropdown.cs
+++ b/osu.Game/Overlays/Settings/SettingsDropdown.cs
@@ -9,7 +9,7 @@ using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Settings
 {
-    public abstract class SettingsDropdown<T> : SettingsItem<T>
+    public class SettingsDropdown<T> : SettingsItem<T>
     {
         protected new OsuDropdown<T> Control => (OsuDropdown<T>)base.Control;
 

From dab5924a63c869dc0ce74b3c22e8c797a6485169 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 22 Dec 2020 08:02:15 +0300
Subject: [PATCH 0473/3722] Fix resolution dropdown not respecting current
 display changes

---
 .../Sections/Graphics/LayoutSettings.cs       | 103 ++++++++----------
 1 file changed, 45 insertions(+), 58 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index 62dc1dc806..ff3b580c7e 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -25,9 +24,13 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
 
         private FillFlowContainer<SettingsSlider<float>> scalingSettings;
 
+        private readonly IBindable<Display> currentDisplay = new Bindable<Display>();
+        private readonly IBindableList<WindowMode> windowModes = new BindableList<WindowMode>();
+
         private Bindable<ScalingMode> scalingMode;
         private Bindable<Size> sizeFullscreen;
-        private readonly IBindableList<WindowMode> windowModes = new BindableList<WindowMode>();
+
+        private readonly BindableList<Size> resolutions = new BindableList<Size>(new[] { new Size(9999, 9999) });
 
         [Resolved]
         private OsuGameBase game { get; set; }
@@ -53,9 +56,10 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
             scalingPositionY = osuConfig.GetBindable<float>(OsuSetting.ScalingPositionY);
 
             if (host.Window != null)
+            {
+                currentDisplay.BindTo(host.Window.CurrentDisplayBindable);
                 windowModes.BindTo(host.Window.SupportedWindowModes);
-
-            Container resolutionSettingsContainer;
+            }
 
             Children = new Drawable[]
             {
@@ -65,10 +69,12 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                     Current = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode),
                     ItemSource = windowModes,
                 },
-                resolutionSettingsContainer = new Container
+                resolutionDropdown = new ResolutionSettingsDropdown
                 {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y
+                    LabelText = "Resolution",
+                    ShowsDefaultIndicator = false,
+                    ItemSource = resolutions,
+                    Current = sizeFullscreen
                 },
                 new SettingsSlider<float, UIScaleSlider>
                 {
@@ -126,31 +132,34 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 },
             };
 
-            scalingSettings.ForEach(s => bindPreviewEvent(s.Current));
-
-            var resolutions = getResolutions();
-
-            if (resolutions.Count > 1)
+            windowModes.BindCollectionChanged((sender, args) =>
             {
-                resolutionSettingsContainer.Child = resolutionDropdown = new ResolutionSettingsDropdown
-                {
-                    LabelText = "Resolution",
-                    ShowsDefaultIndicator = false,
-                    Items = resolutions,
-                    Current = sizeFullscreen
-                };
+                if (windowModes.Count > 1)
+                    windowModeDropdown.Show();
+                else
+                    windowModeDropdown.Hide();
+            }, true);
 
-                windowModeDropdown.Current.BindValueChanged(mode =>
+            windowModeDropdown.Current.ValueChanged += v => updateResolutionDropdown();
+
+            currentDisplay.BindValueChanged(v => Schedule(() =>
+            {
+                resolutions.RemoveRange(1, resolutions.Count - 1);
+
+                if (v.NewValue != null)
                 {
-                    if (mode.NewValue == WindowMode.Fullscreen)
-                    {
-                        resolutionDropdown.Show();
-                        sizeFullscreen.TriggerChange();
-                    }
-                    else
-                        resolutionDropdown.Hide();
-                }, true);
-            }
+                    resolutions.AddRange(v.NewValue.DisplayModes
+                                          .Where(m => m.Size.Width >= 800 && m.Size.Height >= 600)
+                                          .OrderByDescending(m => m.Size.Width)
+                                          .ThenByDescending(m => m.Size.Height)
+                                          .Select(m => m.Size)
+                                          .Distinct());
+                }
+
+                updateResolutionDropdown();
+            }), true);
+
+            scalingSettings.ForEach(s => bindPreviewEvent(s.Current));
 
             scalingMode.BindValueChanged(mode =>
             {
@@ -163,17 +172,13 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 scalingSettings.ForEach(s => s.TransferValueOnCommit = mode.NewValue == ScalingMode.Everything);
             }, true);
 
-            windowModes.CollectionChanged += (sender, args) => windowModesChanged();
-
-            windowModesChanged();
-        }
-
-        private void windowModesChanged()
-        {
-            if (windowModes.Count > 1)
-                windowModeDropdown.Show();
-            else
-                windowModeDropdown.Hide();
+            void updateResolutionDropdown()
+            {
+                if (resolutions.Count > 1 && windowModeDropdown.Current.Value == WindowMode.Fullscreen)
+                    resolutionDropdown.Show();
+                else
+                    resolutionDropdown.Hide();
+            }
         }
 
         /// <summary>
@@ -205,24 +210,6 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
             preview.Expire();
         }
 
-        private IReadOnlyList<Size> getResolutions()
-        {
-            var resolutions = new List<Size> { new Size(9999, 9999) };
-            var currentDisplay = game.Window?.CurrentDisplayBindable.Value;
-
-            if (currentDisplay != null)
-            {
-                resolutions.AddRange(currentDisplay.DisplayModes
-                                                   .Where(m => m.Size.Width >= 800 && m.Size.Height >= 600)
-                                                   .OrderByDescending(m => m.Size.Width)
-                                                   .ThenByDescending(m => m.Size.Height)
-                                                   .Select(m => m.Size)
-                                                   .Distinct());
-            }
-
-            return resolutions;
-        }
-
         private class ScalingPreview : ScalingContainer
         {
             public ScalingPreview()

From dff865f335c8c4c70ed8b4ec7bf1975fc2f52440 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 14:12:02 +0900
Subject: [PATCH 0474/3722] Tidy up comments, code, and multiple linq
 enumeration

---
 osu.Game/OsuGame.cs                            | 18 ++++++------------
 .../Screens/Select/DifficultyRecommender.cs    |  2 ++
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index d2c27b766c..d76bd163e1 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -364,25 +364,19 @@ namespace osu.Game
 
                 // we might even already be at the song
                 if (Beatmap.Value.BeatmapSetInfo.Hash == databasedSet.Hash && (difficultyCriteria?.Invoke(Beatmap.Value.BeatmapInfo) ?? true))
-                {
                     return;
-                }
 
                 // Find beatmaps that match our predicate.
-                var beatmaps = databasedSet.Beatmaps.Where(b => difficultyCriteria?.Invoke(b) ?? true);
+                var beatmaps = databasedSet.Beatmaps.Where(b => difficultyCriteria?.Invoke(b) ?? true).ToList();
 
                 // Use all beatmaps if predicate matched nothing
-                if (!beatmaps.Any())
+                if (beatmaps.Count == 0)
                     beatmaps = databasedSet.Beatmaps;
 
-                // Try to select recommended beatmap
-                // This should give us a beatmap from current ruleset if there are any in our matched beatmaps
-                var selection = DifficultyRecommender.GetRecommendedBeatmap(beatmaps);
-                // Fallback if a difficulty can't be recommended, maybe we are offline
-                // First try to find a beatmap in current ruleset
-                selection ??= beatmaps.FirstOrDefault(b => b.Ruleset.Equals(Ruleset.Value));
-                // Otherwise use first beatmap
-                selection ??= beatmaps.First();
+                // Prefer recommended beatmap if recommendations are available, else fallback to a sane selection.
+                var selection = DifficultyRecommender.GetRecommendedBeatmap(beatmaps)
+                                ?? beatmaps.FirstOrDefault(b => b.Ruleset.Equals(Ruleset.Value))
+                                ?? beatmaps.First();
 
                 Ruleset.Value = selection.Ruleset;
                 Beatmap.Value = BeatmapManager.GetWorkingBeatmap(selection);
diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index fa48316e9d..3b3fc812e6 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
@@ -47,6 +48,7 @@ namespace osu.Game.Screens.Select
         /// </remarks>
         /// <param name="beatmaps">A collection of beatmaps to select a difficulty from.</param>
         /// <returns>The recommended difficulty, or null if a recommendation could not be provided.</returns>
+        [CanBeNull]
         public BeatmapInfo GetRecommendedBeatmap(IEnumerable<BeatmapInfo> beatmaps)
         {
             if (!recommendedStarDifficulty.Any())

From 626b7615ad86ca6b93b68cf0dd32e5f23b30b03d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 14:23:33 +0900
Subject: [PATCH 0475/3722] Move and rename some fields for better readability

---
 osu.Game/OsuGameBase.cs                          |  6 +++---
 osu.Game/Screens/Select/DifficultyRecommender.cs | 13 ++++++++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 5fcd6882a6..f6ec541bcb 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -99,6 +99,9 @@ namespace osu.Game
         [Cached(typeof(IBindable<IReadOnlyList<Mod>>))]
         protected readonly Bindable<IReadOnlyList<Mod>> SelectedMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
 
+        [Cached]
+        protected readonly DifficultyRecommender DifficultyRecommender = new DifficultyRecommender();
+
         /// <summary>
         /// Mods available for the current <see cref="Ruleset"/>.
         /// </summary>
@@ -117,9 +120,6 @@ namespace osu.Game
 
         public bool IsDeployedBuild => AssemblyVersion.Major > 0;
 
-        [Cached]
-        protected readonly DifficultyRecommender DifficultyRecommender = new DifficultyRecommender();
-
         public virtual string Version
         {
             get
diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index 3b3fc812e6..5c031b5d6e 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -27,7 +27,10 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private Bindable<RulesetInfo> ruleset { get; set; }
 
-        private int storedUserId;
+        /// <summary>
+        /// The user for which the last requests were run.
+        /// </summary>
+        private int? requestedUserId;
 
         private readonly Dictionary<RulesetInfo, double> recommendedStarDifficulty = new Dictionary<RulesetInfo, double>();
 
@@ -73,12 +76,12 @@ namespace osu.Game.Screens.Select
             return beatmap;
         }
 
-        private void calculateRecommendedDifficulties()
+        private void fetchRecommendedValues()
         {
-            if (recommendedStarDifficulty.Any() && api.LocalUser.Value.Id == storedUserId)
+            if (recommendedStarDifficulty.Count > 0 && api.LocalUser.Value.Id == requestedUserId)
                 return;
 
-            storedUserId = api.LocalUser.Value.Id;
+            requestedUserId = api.LocalUser.Value.Id;
 
             // only query API for built-in rulesets
             rulesets.AvailableRulesets.Where(ruleset => ruleset.ID <= ILegacyRuleset.MAX_LEGACY_RULESET_ID).ForEach(rulesetInfo =>
@@ -125,7 +128,7 @@ namespace osu.Game.Screens.Select
             switch (state.NewValue)
             {
                 case APIState.Online:
-                    calculateRecommendedDifficulties();
+                    fetchRecommendedValues();
                     break;
             }
         });

From 8cc2ed3faeb362e8c78c8a924b4f8c5889690660 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 14:28:26 +0900
Subject: [PATCH 0476/3722] Move from OsuGameBase to OsuGame

Also moves to a more suitable namespace.
---
 .../{Screens/Select => Beatmaps}/DifficultyRecommender.cs  | 7 +++++--
 osu.Game/OsuGame.cs                                        | 7 ++++++-
 osu.Game/OsuGameBase.cs                                    | 6 ------
 3 files changed, 11 insertions(+), 9 deletions(-)
 rename osu.Game/{Screens/Select => Beatmaps}/DifficultyRecommender.cs (94%)

diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Beatmaps/DifficultyRecommender.cs
similarity index 94%
rename from osu.Game/Screens/Select/DifficultyRecommender.cs
rename to osu.Game/Beatmaps/DifficultyRecommender.cs
index 5c031b5d6e..f870e8f89f 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Beatmaps/DifficultyRecommender.cs
@@ -9,13 +9,16 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
-using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Rulesets;
 
-namespace osu.Game.Screens.Select
+namespace osu.Game.Beatmaps
 {
+    /// <summary>
+    /// A class which will recommend the most suitable difficulty for the local user from a beatmap set.
+    /// This requires the user to be logged in, as it sources from the user's online profile.
+    /// </summary>
     public class DifficultyRecommender : Component
     {
         [Resolved]
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index d76bd163e1..bb51c55551 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -80,6 +80,9 @@ namespace osu.Game
 
         private BeatmapSetOverlay beatmapSetOverlay;
 
+        [Cached]
+        private readonly DifficultyRecommender difficultyRecommender = new DifficultyRecommender();
+
         [Cached]
         private readonly ScreenshotManager screenshotManager = new ScreenshotManager();
 
@@ -374,7 +377,7 @@ namespace osu.Game
                     beatmaps = databasedSet.Beatmaps;
 
                 // Prefer recommended beatmap if recommendations are available, else fallback to a sane selection.
-                var selection = DifficultyRecommender.GetRecommendedBeatmap(beatmaps)
+                var selection = difficultyRecommender.GetRecommendedBeatmap(beatmaps)
                                 ?? beatmaps.FirstOrDefault(b => b.Ruleset.Equals(Ruleset.Value))
                                 ?? beatmaps.First();
 
@@ -639,6 +642,8 @@ namespace osu.Game
                 GetStableStorage = GetStorageForStableInstall
             }, Add, true);
 
+            loadComponentSingleFile(difficultyRecommender, Add);
+
             loadComponentSingleFile(screenshotManager, Add);
 
             // dependency on notification overlay, dependent by settings overlay
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index f6ec541bcb..150569f1dd 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -36,7 +36,6 @@ using osu.Game.Resources;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
-using osu.Game.Screens.Select;
 using osu.Game.Skinning;
 using osuTK.Input;
 using RuntimeInfo = osu.Framework.RuntimeInfo;
@@ -99,9 +98,6 @@ namespace osu.Game
         [Cached(typeof(IBindable<IReadOnlyList<Mod>>))]
         protected readonly Bindable<IReadOnlyList<Mod>> SelectedMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
 
-        [Cached]
-        protected readonly DifficultyRecommender DifficultyRecommender = new DifficultyRecommender();
-
         /// <summary>
         /// Mods available for the current <see cref="Ruleset"/>.
         /// </summary>
@@ -306,8 +302,6 @@ namespace osu.Game
             AddInternal(MusicController = new MusicController());
             dependencies.CacheAs(MusicController);
 
-            Add(DifficultyRecommender);
-
             Ruleset.BindValueChanged(onRulesetChanged);
         }
 

From df5e1d83bd24fb0311868aa93034f790e7b47758 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 14:36:52 +0900
Subject: [PATCH 0477/3722] Allow recommender to potentially be null

---
 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 2847b31e98..a5252fdc96 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -118,7 +118,7 @@ namespace osu.Game.Screens.Select
                 BleedBottom = Footer.HEIGHT,
                 SelectionChanged = updateSelectedBeatmap,
                 BeatmapSetsChanged = carouselBeatmapsLoaded,
-                GetRecommendedBeatmap = recommender.GetRecommendedBeatmap,
+                GetRecommendedBeatmap = s => recommender?.GetRecommendedBeatmap(s),
             }, c => carouselContainer.Child = c);
 
             AddRangeInternal(new Drawable[]

From c6be969e336e153d7e59fd5e23a5d3eeb8547f5a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 14:42:12 +0900
Subject: [PATCH 0478/3722] Remove unnecessary resolved recommender in test

---
 .../Visual/SongSelect/TestSceneBeatmapRecommendations.cs     | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
index 75a33af247..53a956c77c 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
-using osu.Framework.Allocation;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
@@ -15,7 +14,6 @@ using osu.Game.Rulesets.Catch;
 using osu.Game.Rulesets.Mania;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Taiko;
-using osu.Game.Screens.Select;
 using osu.Game.Tests.Visual.Navigation;
 using osu.Game.Users;
 
@@ -23,9 +21,6 @@ namespace osu.Game.Tests.Visual.SongSelect
 {
     public class TestSceneBeatmapRecommendations : OsuGameTestScene
     {
-        [Resolved]
-        private DifficultyRecommender recommender { get; set; }
-
         [SetUpSteps]
         public override void SetUpSteps()
         {

From 3bf670510ad61874b516255562c940da0f10c8b4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 22 Dec 2020 14:55:25 +0900
Subject: [PATCH 0479/3722] Split into two actions

---
 osu.Game/Screens/Menu/ButtonSystem.cs | 32 ++++++++++++++++++++++-----
 osu.Game/Screens/Menu/MainMenu.cs     |  4 ++--
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 0014f6768f..b52ab2cb2f 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -42,7 +42,8 @@ namespace osu.Game.Screens.Menu
         public Action OnBeatmapListing;
         public Action OnSolo;
         public Action OnSettings;
-        public Action<bool> OnMulti;
+        public Action OnMultiplayer;
+        public Action OnTimeshift;
 
         public const float BUTTON_WIDTH = 140f;
         public const float WEDGE_WIDTH = 20;
@@ -123,8 +124,8 @@ namespace osu.Game.Screens.Menu
         private void load(AudioManager audio, IdleTracker idleTracker, GameHost host)
         {
             buttonsPlay.Add(new Button(@"solo", @"button-solo-select", FontAwesome.Solid.User, new Color4(102, 68, 204, 255), () => OnSolo?.Invoke(), WEDGE_WIDTH, Key.P));
-            buttonsPlay.Add(new Button(@"multi", @"button-generic-select", OsuIcon.Charts, new Color4(94, 63, 186, 255), () => onMulti(true), 0, Key.M));
-            buttonsPlay.Add(new Button(@"timeshift", @"button-generic-select", FontAwesome.Solid.Users, new Color4(94, 63, 186, 255), () => onMulti(false), 0, Key.L));
+            buttonsPlay.Add(new Button(@"multi", @"button-generic-select", OsuIcon.Charts, new Color4(94, 63, 186, 255), onMultiplayer, 0, Key.M));
+            buttonsPlay.Add(new Button(@"timeshift", @"button-generic-select", FontAwesome.Solid.Users, new Color4(94, 63, 186, 255), onTimeshift, 0, Key.L));
             buttonsPlay.ForEach(b => b.VisibleState = ButtonSystemState.Play);
 
             buttonsTopLevel.Add(new Button(@"play", @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));
@@ -153,7 +154,7 @@ namespace osu.Game.Screens.Menu
             sampleBack = audio.Samples.Get(@"Menu/button-back-select");
         }
 
-        private void onMulti(bool realtime)
+        private void onMultiplayer()
         {
             if (!api.IsLoggedIn)
             {
@@ -171,7 +172,28 @@ namespace osu.Game.Screens.Menu
                 return;
             }
 
-            OnMulti?.Invoke(realtime);
+            OnMultiplayer?.Invoke();
+        }
+
+        private void onTimeshift()
+        {
+            if (!api.IsLoggedIn)
+            {
+                notifications?.Post(new SimpleNotification
+                {
+                    Text = "You gotta be logged in to multi 'yo!",
+                    Icon = FontAwesome.Solid.Globe,
+                    Activated = () =>
+                    {
+                        loginOverlay?.Show();
+                        return true;
+                    }
+                });
+
+                return;
+            }
+
+            OnTimeshift?.Invoke();
         }
 
         private void updateIdleState(bool isIdle)
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 391bbf8429..fa96ac9c51 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -17,7 +17,6 @@ using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Edit;
-using osu.Game.Screens.Multi;
 using osu.Game.Screens.Multi.RealtimeMultiplayer;
 using osu.Game.Screens.Multi.Timeshift;
 using osu.Game.Screens.Select;
@@ -106,7 +105,8 @@ namespace osu.Game.Screens.Menu
                                 this.Push(new Editor());
                             },
                             OnSolo = onSolo,
-                            OnMulti = realtime => this.Push(realtime ? (Multiplayer)new RealtimeMultiplayer() : new TimeshiftMultiplayer()),
+                            OnMultiplayer = () => this.Push(new RealtimeMultiplayer()),
+                            OnTimeshift = () => this.Push(new TimeshiftMultiplayer()),
                             OnExit = confirmAndExit,
                         }
                     }

From 807c1ecd1f47386554d4adc160d426e675413711 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 14:57:32 +0900
Subject: [PATCH 0480/3722] Refactor recommendation iteration code to read
 better

---
 osu.Game/Beatmaps/DifficultyRecommender.cs | 52 +++++++---------------
 1 file changed, 16 insertions(+), 36 deletions(-)

diff --git a/osu.Game/Beatmaps/DifficultyRecommender.cs b/osu.Game/Beatmaps/DifficultyRecommender.cs
index f870e8f89f..340c47d89b 100644
--- a/osu.Game/Beatmaps/DifficultyRecommender.cs
+++ b/osu.Game/Beatmaps/DifficultyRecommender.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Beatmaps
         /// </summary>
         private int? requestedUserId;
 
-        private readonly Dictionary<RulesetInfo, double> recommendedStarDifficulty = new Dictionary<RulesetInfo, double>();
+        private readonly Dictionary<RulesetInfo, double> recommendedDifficultyMapping = new Dictionary<RulesetInfo, double>();
 
         private readonly IBindable<APIState> apiState = new Bindable<APIState>();
 
@@ -57,31 +57,27 @@ namespace osu.Game.Beatmaps
         [CanBeNull]
         public BeatmapInfo GetRecommendedBeatmap(IEnumerable<BeatmapInfo> beatmaps)
         {
-            if (!recommendedStarDifficulty.Any())
-                return null;
-
-            BeatmapInfo beatmap = null;
-
-            foreach (var r in getBestRulesetOrder())
+            foreach (var r in orderedRulesets)
             {
-                recommendedStarDifficulty.TryGetValue(r, out var stars);
+                if (!recommendedDifficultyMapping.TryGetValue(r, out var recommendation))
+                    continue;
 
-                beatmap = beatmaps.Where(b => b.Ruleset.Equals(r)).OrderBy(b =>
+                BeatmapInfo beatmap = beatmaps.Where(b => b.Ruleset.Equals(r)).OrderBy(b =>
                 {
-                    var difference = b.StarDifficulty - stars;
+                    var difference = b.StarDifficulty - recommendation;
                     return difference >= 0 ? difference * 2 : difference * -1; // prefer easier over harder
                 }).FirstOrDefault();
 
                 if (beatmap != null)
-                    break;
+                    return beatmap;
             }
 
-            return beatmap;
+            return null;
         }
 
         private void fetchRecommendedValues()
         {
-            if (recommendedStarDifficulty.Count > 0 && api.LocalUser.Value.Id == requestedUserId)
+            if (recommendedDifficultyMapping.Count > 0 && api.LocalUser.Value.Id == requestedUserId)
                 return;
 
             requestedUserId = api.LocalUser.Value.Id;
@@ -94,7 +90,7 @@ namespace osu.Game.Beatmaps
                 req.Success += result =>
                 {
                     // algorithm taken from https://github.com/ppy/osu-web/blob/e6e2825516449e3d0f3f5e1852c6bdd3428c3437/app/Models/User.php#L1505
-                    recommendedStarDifficulty[rulesetInfo] = Math.Pow((double)(result.Statistics.PP ?? 0), 0.4) * 0.195;
+                    recommendedDifficultyMapping[rulesetInfo] = Math.Pow((double)(result.Statistics.PP ?? 0), 0.4) * 0.195;
                 };
 
                 api.Queue(req);
@@ -102,29 +98,13 @@ namespace osu.Game.Beatmaps
         }
 
         /// <returns>
-        /// Rulesets ordered by highest recommended star difficulty, except currently selected ruleset first
+        /// Rulesets ordered descending by their respective recommended difficulties.
+        /// The currently selected ruleset will always be first.
         /// </returns>
-        private IEnumerable<RulesetInfo> getBestRulesetOrder()
-        {
-            IEnumerable<RulesetInfo> bestRulesetOrder = recommendedStarDifficulty.OrderByDescending(pair => pair.Value)
-                                                                                 .Select(pair => pair.Key);
-
-            List<RulesetInfo> orderedRulesets;
-
-            if (bestRulesetOrder.Contains(ruleset.Value))
-            {
-                orderedRulesets = bestRulesetOrder.ToList();
-                orderedRulesets.Remove(ruleset.Value);
-                orderedRulesets.Insert(0, ruleset.Value);
-            }
-            else
-            {
-                orderedRulesets = new List<RulesetInfo> { ruleset.Value };
-                orderedRulesets.AddRange(bestRulesetOrder);
-            }
-
-            return orderedRulesets;
-        }
+        private IEnumerable<RulesetInfo> orderedRulesets =>
+            recommendedDifficultyMapping
+                .OrderByDescending(pair => pair.Value).Select(pair => pair.Key).Where(r => !r.Equals(ruleset.Value))
+                .Prepend(ruleset.Value);
 
         private void onlineStateChanged(ValueChangedEvent<APIState> state) => Schedule(() =>
         {

From dece41d050d2f063ed3002269475167484b2270c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 22 Dec 2020 14:58:47 +0900
Subject: [PATCH 0481/3722] Add todo

---
 osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index d654496f40..f4e84510bf 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -14,6 +14,7 @@ using osu.Game.Screens.Ranking;
 
 namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 {
+    // Todo: The "room" part of TimeshiftPlayer should be split out into an abstract player class to be inherited instead.
     public class RealtimePlayer : TimeshiftPlayer
     {
         protected override bool PauseOnFocusLost => false;

From 81e2edc73ff95d47d272c711d1c7034829a68870 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 22 Dec 2020 14:59:11 +0900
Subject: [PATCH 0482/3722] Use MRE with timeout to wait on match start

---
 .../RealtimeMultiplayer/RealtimePlayer.cs      | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index f4e84510bf..c6d44686b5 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -6,6 +6,8 @@ using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
+using osu.Framework.Logging;
+using osu.Framework.Screens;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Scoring;
@@ -26,7 +28,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         private StatefulMultiplayerClient client { get; set; }
 
         private readonly TaskCompletionSource<bool> resultsReady = new TaskCompletionSource<bool>();
-        private bool started;
+        private readonly ManualResetEventSlim startedEvent = new ManualResetEventSlim();
 
         public RealtimePlayer(PlaylistItem playlistItem)
             : base(playlistItem, false)
@@ -43,11 +45,19 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             client.ResultsReady += onResultsReady;
             client.ChangeState(MultiplayerUserState.Loaded);
 
-            while (!started)
-                Thread.Sleep(100);
+            if (!startedEvent.Wait(TimeSpan.FromSeconds(30)))
+            {
+                Logger.Log("Failed to start the multiplayer match in time.", LoggingTarget.Runtime, LogLevel.Important);
+
+                Schedule(() =>
+                {
+                    ValidForResume = false;
+                    this.Exit();
+                });
+            }
         }
 
-        private void onMatchStarted() => started = true;
+        private void onMatchStarted() => startedEvent.Set();
 
         private void onResultsReady() => resultsReady.SetResult(true);
 

From 3f966386ed563bd43c241068cf3bdd8ec10f8541 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 15:15:32 +0900
Subject: [PATCH 0483/3722] Fix compile time failure due to potentially null
 connection

---
 .../Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
index 6f18e1c922..75bb578a29 100644
--- a/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
@@ -4,6 +4,7 @@
 #nullable enable
 
 using System;
+using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.SignalR.Client;
@@ -99,6 +100,8 @@ namespace osu.Game.Online.RealtimeMultiplayer
                 {
                     try
                     {
+                        Debug.Assert(connection != null);
+
                         // reconnect on any failure
                         await connection.StartAsync();
                         Logger.Log("Multiplayer client connected!", LoggingTarget.Network);

From 85e93c5ddec913aa48515814867e89688c92e518 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 15:22:27 +0900
Subject: [PATCH 0484/3722] Fix main menu multiplayer icons being back to front

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

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index b52ab2cb2f..badfa3f693 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -124,8 +124,8 @@ namespace osu.Game.Screens.Menu
         private void load(AudioManager audio, IdleTracker idleTracker, GameHost host)
         {
             buttonsPlay.Add(new Button(@"solo", @"button-solo-select", FontAwesome.Solid.User, new Color4(102, 68, 204, 255), () => OnSolo?.Invoke(), WEDGE_WIDTH, Key.P));
-            buttonsPlay.Add(new Button(@"multi", @"button-generic-select", OsuIcon.Charts, new Color4(94, 63, 186, 255), onMultiplayer, 0, Key.M));
-            buttonsPlay.Add(new Button(@"timeshift", @"button-generic-select", FontAwesome.Solid.Users, new Color4(94, 63, 186, 255), onTimeshift, 0, Key.L));
+            buttonsPlay.Add(new Button(@"multi", @"button-generic-select", FontAwesome.Solid.Users, new Color4(94, 63, 186, 255), onMultiplayer, 0, Key.M));
+            buttonsPlay.Add(new Button(@"timeshift", @"button-generic-select", OsuIcon.Charts, new Color4(94, 63, 186, 255), onTimeshift, 0, Key.L));
             buttonsPlay.ForEach(b => b.VisibleState = ButtonSystemState.Play);
 
             buttonsTopLevel.Add(new Button(@"play", @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));

From ab90db7c8df2ab778d3b84d964eae62823e41443 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 22 Dec 2020 15:27:49 +0900
Subject: [PATCH 0485/3722] Fix stuck lounge on join failure

---
 .../Multi/RealtimeMultiplayer/RealtimeRoomManager.cs       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index e0fca3ce4c..0c9b58a0c4 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -38,10 +38,10 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         }
 
         public override void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
-            => base.CreateRoom(room, r => joinMultiplayerRoom(r, onSuccess), onError);
+            => base.CreateRoom(room, r => joinMultiplayerRoom(r, onSuccess, onError), onError);
 
         public override void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
-            => base.JoinRoom(room, r => joinMultiplayerRoom(r, onSuccess), onError);
+            => base.JoinRoom(room, r => joinMultiplayerRoom(r, onSuccess, onError), onError);
 
         public override void PartRoom()
         {
@@ -62,7 +62,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             });
         }
 
-        private void joinMultiplayerRoom(Room room, Action<Room> onSuccess = null)
+        private void joinMultiplayerRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
         {
             Debug.Assert(room.RoomID.Value != null);
 
@@ -73,6 +73,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
                 PartRoom();
                 if (t.Exception != null)
                     Logger.Error(t.Exception, "Failed to join multiplayer room.");
+                onError?.Invoke(t.Exception?.ToString() ?? string.Empty);
             }, TaskContinuationOptions.NotOnRanToCompletion);
         }
 

From 27e64bdb342aa33aa74da56fa155960662fc3a1e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 22 Dec 2020 15:31:07 +0900
Subject: [PATCH 0486/3722] Schedule callback continuations

---
 .../Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index 0c9b58a0c4..7ce031e0e9 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -67,13 +67,13 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             Debug.Assert(room.RoomID.Value != null);
 
             var joinTask = multiplayerClient.JoinRoom(room);
-            joinTask.ContinueWith(_ => onSuccess?.Invoke(room), TaskContinuationOptions.OnlyOnRanToCompletion);
+            joinTask.ContinueWith(_ => Schedule(() => onSuccess?.Invoke(room)), TaskContinuationOptions.OnlyOnRanToCompletion);
             joinTask.ContinueWith(t =>
             {
                 PartRoom();
                 if (t.Exception != null)
                     Logger.Error(t.Exception, "Failed to join multiplayer room.");
-                onError?.Invoke(t.Exception?.ToString() ?? string.Empty);
+                Schedule(() => onError?.Invoke(t.Exception?.ToString() ?? string.Empty));
             }, TaskContinuationOptions.NotOnRanToCompletion);
         }
 

From 8201fa8e3463024ab3155738df934bc1cf967822 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 15:51:24 +0900
Subject: [PATCH 0487/3722] Split out common implementation and private classes
 in MatchSettingsOverlay

---
 .../TestSceneMatchSettingsOverlay.cs          |  10 +-
 .../TestSceneTimeshiftRoomSubScreen.cs        |   2 +-
 .../Match/Components/MatchSettingsOverlay.cs  | 185 +++++++++---------
 .../Match/RealtimeMatchSettingsOverlay.cs     |  95 +--------
 .../Multi/Timeshift/TimeshiftRoomSubScreen.cs |   5 +-
 5 files changed, 108 insertions(+), 189 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
index 234374ee2b..90eef26b20 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
@@ -109,14 +109,14 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddUntilStep("error not displayed", () => !settings.ErrorText.IsPresent);
         }
 
-        private class TestRoomSettings : MatchSettingsOverlay
+        private class TestRoomSettings : TimeshiftMatchSettingsOverlay
         {
-            public TriangleButton ApplyButton => Settings.ApplyButton;
+            public TriangleButton ApplyButton => ((MatchSettings)Settings).ApplyButton;
 
-            public OsuTextBox NameField => Settings.NameField;
-            public OsuDropdown<TimeSpan> DurationField => Settings.DurationField;
+            public OsuTextBox NameField => ((MatchSettings)Settings).NameField;
+            public OsuDropdown<TimeSpan> DurationField => ((MatchSettings)Settings).DurationField;
 
-            public OsuSpriteText ErrorText => Settings.ErrorText;
+            public OsuSpriteText ErrorText => ((MatchSettings)Settings).ErrorText;
         }
 
         private class TestRoomManager : IRoomManager
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs
index f56f78ce89..bbd7d84081 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             AddStep("create room", () =>
             {
-                InputManager.MoveMouseTo(match.ChildrenOfType<MatchSettingsOverlay.CreateRoomButton>().Single());
+                InputManager.MoveMouseTo(match.ChildrenOfType<TimeshiftMatchSettingsOverlay.CreateRoomButton>().Single());
                 InputManager.Click(MouseButton.Left);
             });
 
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
index 1859e8db8a..d837ceaccf 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
@@ -21,20 +21,108 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.Multi.Match.Components
 {
-    public class MatchSettingsOverlay : FocusedOverlayContainer
+    public abstract class MatchSettingsOverlay : FocusedOverlayContainer
     {
-        private const float transition_duration = 350;
-        private const float field_padding = 45;
+        protected const float TRANSITION_DURATION = 350;
+        protected const float FIELD_PADDING = 45;
 
-        public Action EditPlaylist;
-
-        protected MatchSettings Settings { get; private set; }
+        protected MultiplayerComposite Settings { get; set; }
 
         [BackgroundDependencyLoader]
         private void load()
         {
             Masking = true;
+        }
 
+        protected override void PopIn()
+        {
+            Settings.MoveToY(0, TRANSITION_DURATION, Easing.OutQuint);
+        }
+
+        protected override void PopOut()
+        {
+            Settings.MoveToY(-1, TRANSITION_DURATION, Easing.InSine);
+        }
+
+        protected class SettingsTextBox : OsuTextBox
+        {
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                BackgroundUnfocused = Color4.Black;
+                BackgroundFocused = Color4.Black;
+            }
+        }
+
+        protected class SettingsNumberTextBox : SettingsTextBox
+        {
+            protected override bool CanAddCharacter(char character) => char.IsNumber(character);
+        }
+
+        protected class SettingsPasswordTextBox : OsuPasswordTextBox
+        {
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                BackgroundUnfocused = Color4.Black;
+                BackgroundFocused = Color4.Black;
+            }
+        }
+
+        protected class SectionContainer : FillFlowContainer<Section>
+        {
+            public SectionContainer()
+            {
+                RelativeSizeAxes = Axes.X;
+                AutoSizeAxes = Axes.Y;
+                Width = 0.5f;
+                Direction = FillDirection.Vertical;
+                Spacing = new Vector2(FIELD_PADDING);
+            }
+        }
+
+        protected class Section : Container
+        {
+            private readonly Container content;
+
+            protected override Container<Drawable> Content => content;
+
+            public Section(string title)
+            {
+                AutoSizeAxes = Axes.Y;
+                RelativeSizeAxes = Axes.X;
+
+                InternalChild = new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Y,
+                    RelativeSizeAxes = Axes.X,
+                    Direction = FillDirection.Vertical,
+                    Spacing = new Vector2(5),
+                    Children = new Drawable[]
+                    {
+                        new OsuSpriteText
+                        {
+                            Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 12),
+                            Text = title.ToUpper(),
+                        },
+                        content = new Container
+                        {
+                            AutoSizeAxes = Axes.Y,
+                            RelativeSizeAxes = Axes.X,
+                        },
+                    },
+                };
+            }
+        }
+    }
+
+    public class TimeshiftMatchSettingsOverlay : MatchSettingsOverlay
+    {
+        public Action EditPlaylist;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
             Child = Settings = new MatchSettings
             {
                 RelativeSizeAxes = Axes.Both,
@@ -43,16 +131,6 @@ namespace osu.Game.Screens.Multi.Match.Components
             };
         }
 
-        protected override void PopIn()
-        {
-            Settings.MoveToY(0, transition_duration, Easing.OutQuint);
-        }
-
-        protected override void PopOut()
-        {
-            Settings.MoveToY(-1, transition_duration, Easing.InSine);
-        }
-
         protected class MatchSettings : MultiplayerComposite
         {
             private const float disabled_alpha = 0.2f;
@@ -126,7 +204,7 @@ namespace osu.Game.Screens.Multi.Match.Components
                                                     {
                                                         new SectionContainer
                                                         {
-                                                            Padding = new MarginPadding { Right = field_padding / 2 },
+                                                            Padding = new MarginPadding { Right = FIELD_PADDING / 2 },
                                                             Children = new[]
                                                             {
                                                                 new Section("Room name")
@@ -216,7 +294,7 @@ namespace osu.Game.Screens.Multi.Match.Components
                                                         {
                                                             Anchor = Anchor.TopRight,
                                                             Origin = Anchor.TopRight,
-                                                            Padding = new MarginPadding { Left = field_padding / 2 },
+                                                            Padding = new MarginPadding { Left = FIELD_PADDING / 2 },
                                                             Children = new[]
                                                             {
                                                                 new Section("Playlist")
@@ -379,77 +457,6 @@ namespace osu.Game.Screens.Multi.Match.Components
             }
         }
 
-        private class SettingsTextBox : OsuTextBox
-        {
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                BackgroundUnfocused = Color4.Black;
-                BackgroundFocused = Color4.Black;
-            }
-        }
-
-        private class SettingsNumberTextBox : SettingsTextBox
-        {
-            protected override bool CanAddCharacter(char character) => char.IsNumber(character);
-        }
-
-        private class SettingsPasswordTextBox : OsuPasswordTextBox
-        {
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                BackgroundUnfocused = Color4.Black;
-                BackgroundFocused = Color4.Black;
-            }
-        }
-
-        private class SectionContainer : FillFlowContainer<Section>
-        {
-            public SectionContainer()
-            {
-                RelativeSizeAxes = Axes.X;
-                AutoSizeAxes = Axes.Y;
-                Width = 0.5f;
-                Direction = FillDirection.Vertical;
-                Spacing = new Vector2(field_padding);
-            }
-        }
-
-        private class Section : Container
-        {
-            private readonly Container content;
-
-            protected override Container<Drawable> Content => content;
-
-            public Section(string title)
-            {
-                AutoSizeAxes = Axes.Y;
-                RelativeSizeAxes = Axes.X;
-
-                InternalChild = new FillFlowContainer
-                {
-                    AutoSizeAxes = Axes.Y,
-                    RelativeSizeAxes = Axes.X,
-                    Direction = FillDirection.Vertical,
-                    Spacing = new Vector2(5),
-                    Children = new Drawable[]
-                    {
-                        new OsuSpriteText
-                        {
-                            Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 12),
-                            Text = title.ToUpper(),
-                        },
-                        content = new Container
-                        {
-                            AutoSizeAxes = Axes.Y,
-                            RelativeSizeAxes = Axes.X,
-                        },
-                    },
-                };
-            }
-        }
-
         public class CreateRoomButton : TriangleButton
         {
             public CreateRoomButton()
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs
index 924c736472..5bd388cceb 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs
@@ -19,22 +19,14 @@ using osu.Game.Overlays;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Multi.Match.Components;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
 {
-    public class RealtimeMatchSettingsOverlay : FocusedOverlayContainer
+    public class RealtimeMatchSettingsOverlay : MatchSettingsOverlay
     {
-        private const float transition_duration = 350;
-        private const float field_padding = 45;
-
-        protected MatchSettings Settings { get; private set; }
-
         [BackgroundDependencyLoader]
         private void load()
         {
-            Masking = true;
-
             Child = Settings = new MatchSettings
             {
                 RelativeSizeAxes = Axes.Both,
@@ -43,16 +35,6 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
             };
         }
 
-        protected override void PopIn()
-        {
-            Settings.MoveToY(0, transition_duration, Easing.OutQuint);
-        }
-
-        protected override void PopOut()
-        {
-            Settings.MoveToY(-1, transition_duration, Easing.InSine);
-        }
-
         protected class MatchSettings : MultiplayerComposite
         {
             private const float disabled_alpha = 0.2f;
@@ -143,7 +125,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
                                                             {
                                                                 new SectionContainer
                                                                 {
-                                                                    Padding = new MarginPadding { Right = field_padding / 2 },
+                                                                    Padding = new MarginPadding { Right = FIELD_PADDING / 2 },
                                                                     Children = new[]
                                                                     {
                                                                         new Section("Room name")
@@ -192,7 +174,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
                                                                 {
                                                                     Anchor = Anchor.TopRight,
                                                                     Origin = Anchor.TopRight,
-                                                                    Padding = new MarginPadding { Left = field_padding / 2 },
+                                                                    Padding = new MarginPadding { Left = FIELD_PADDING / 2 },
                                                                     Children = new[]
                                                                     {
                                                                         new Section("Max participants")
@@ -347,77 +329,6 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
             }
         }
 
-        private class SettingsTextBox : OsuTextBox
-        {
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                BackgroundUnfocused = Color4.Black;
-                BackgroundFocused = Color4.Black;
-            }
-        }
-
-        private class SettingsNumberTextBox : SettingsTextBox
-        {
-            protected override bool CanAddCharacter(char character) => char.IsNumber(character);
-        }
-
-        private class SettingsPasswordTextBox : OsuPasswordTextBox
-        {
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                BackgroundUnfocused = Color4.Black;
-                BackgroundFocused = Color4.Black;
-            }
-        }
-
-        private class SectionContainer : FillFlowContainer<Section>
-        {
-            public SectionContainer()
-            {
-                RelativeSizeAxes = Axes.X;
-                AutoSizeAxes = Axes.Y;
-                Width = 0.5f;
-                Direction = FillDirection.Vertical;
-                Spacing = new Vector2(field_padding);
-            }
-        }
-
-        private class Section : Container
-        {
-            private readonly Container content;
-
-            protected override Container<Drawable> Content => content;
-
-            public Section(string title)
-            {
-                AutoSizeAxes = Axes.Y;
-                RelativeSizeAxes = Axes.X;
-
-                InternalChild = new FillFlowContainer
-                {
-                    AutoSizeAxes = Axes.Y,
-                    RelativeSizeAxes = Axes.X,
-                    Direction = FillDirection.Vertical,
-                    Spacing = new Vector2(5),
-                    Children = new Drawable[]
-                    {
-                        new OsuSpriteText
-                        {
-                            Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 12),
-                            Text = title.ToUpper(),
-                        },
-                        content = new Container
-                        {
-                            AutoSizeAxes = Axes.Y,
-                            RelativeSizeAxes = Axes.X,
-                        },
-                    },
-                };
-            }
-        }
-
         public class CreateOrUpdateButton : TriangleButton
         {
             [Resolved(typeof(Room), nameof(Room.RoomID))]
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs
index 433a980d60..fa901179e9 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs
@@ -18,6 +18,7 @@ using osu.Game.Screens.Multi.Ranking;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Select;
 using osu.Game.Users;
+using Footer = osu.Game.Screens.Multi.Match.Components.Footer;
 
 namespace osu.Game.Screens.Multi.Timeshift
 {
@@ -175,7 +176,7 @@ namespace osu.Game.Screens.Multi.Timeshift
                         },
                         new Drawable[]
                         {
-                            new Match.Components.Footer
+                            new Footer
                             {
                                 OnStart = onStart,
                                 SelectedItem = { BindTarget = SelectedItem }
@@ -188,7 +189,7 @@ namespace osu.Game.Screens.Multi.Timeshift
                         new Dimension(GridSizeMode.AutoSize),
                     }
                 },
-                settingsOverlay = new MatchSettingsOverlay
+                settingsOverlay = new TimeshiftMatchSettingsOverlay
                 {
                     RelativeSizeAxes = Axes.Both,
                     EditPlaylist = () => this.Push(new MatchSongSelect()),

From 17d924c7554d561d028ed761681c6e4703286267 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 15:52:47 +0900
Subject: [PATCH 0488/3722] Move timeshift settings overlay to correct
 namespace

---
 .../TestSceneMatchSettingsOverlay.cs          |   2 +-
 .../Match/Components/MatchSettingsOverlay.cs  | 377 -----------------
 .../TimeshiftMatchSettingsOverlay.cs          | 391 ++++++++++++++++++
 3 files changed, 392 insertions(+), 378 deletions(-)
 create mode 100644 osu.Game/Screens/Multi/Timeshift/TimeshiftMatchSettingsOverlay.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
index 90eef26b20..1fcae9c709 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
@@ -11,7 +11,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi;
-using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Screens.Multi.Timeshift;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
index d837ceaccf..0bb56d0cdf 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
@@ -1,21 +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;
-using System.Collections.Specialized;
-using Humanizer;
 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.Graphics;
-using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.Multiplayer;
-using osu.Game.Overlays;
 using osuTK;
 using osuTK.Graphics;
 
@@ -115,372 +106,4 @@ namespace osu.Game.Screens.Multi.Match.Components
             }
         }
     }
-
-    public class TimeshiftMatchSettingsOverlay : MatchSettingsOverlay
-    {
-        public Action EditPlaylist;
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            Child = Settings = new MatchSettings
-            {
-                RelativeSizeAxes = Axes.Both,
-                RelativePositionAxes = Axes.Y,
-                EditPlaylist = () => EditPlaylist?.Invoke()
-            };
-        }
-
-        protected class MatchSettings : MultiplayerComposite
-        {
-            private const float disabled_alpha = 0.2f;
-
-            public Action EditPlaylist;
-
-            public OsuTextBox NameField, MaxParticipantsField;
-            public OsuDropdown<TimeSpan> DurationField;
-            public RoomAvailabilityPicker AvailabilityPicker;
-            public GameTypePicker TypePicker;
-            public TriangleButton ApplyButton;
-
-            public OsuSpriteText ErrorText;
-
-            private OsuSpriteText typeLabel;
-            private LoadingLayer loadingLayer;
-            private DrawableRoomPlaylist playlist;
-            private OsuSpriteText playlistLength;
-
-            [Resolved(CanBeNull = true)]
-            private IRoomManager manager { get; set; }
-
-            [Resolved]
-            private Bindable<Room> currentRoom { get; set; }
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                Container dimContent;
-
-                InternalChildren = new Drawable[]
-                {
-                    dimContent = new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Children = new Drawable[]
-                        {
-                            new Box
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Colour = Color4Extensions.FromHex(@"28242d"),
-                            },
-                            new GridContainer
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                RowDimensions = new[]
-                                {
-                                    new Dimension(GridSizeMode.Distributed),
-                                    new Dimension(GridSizeMode.AutoSize),
-                                },
-                                Content = new[]
-                                {
-                                    new Drawable[]
-                                    {
-                                        new OsuScrollContainer
-                                        {
-                                            Padding = new MarginPadding
-                                            {
-                                                Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING,
-                                                Vertical = 10
-                                            },
-                                            RelativeSizeAxes = Axes.Both,
-                                            Children = new[]
-                                            {
-                                                new Container
-                                                {
-                                                    Padding = new MarginPadding { Horizontal = WaveOverlayContainer.WIDTH_PADDING },
-                                                    RelativeSizeAxes = Axes.X,
-                                                    AutoSizeAxes = Axes.Y,
-                                                    Children = new Drawable[]
-                                                    {
-                                                        new SectionContainer
-                                                        {
-                                                            Padding = new MarginPadding { Right = FIELD_PADDING / 2 },
-                                                            Children = new[]
-                                                            {
-                                                                new Section("Room name")
-                                                                {
-                                                                    Child = NameField = new SettingsTextBox
-                                                                    {
-                                                                        RelativeSizeAxes = Axes.X,
-                                                                        TabbableContentContainer = this,
-                                                                        LengthLimit = 100
-                                                                    },
-                                                                },
-                                                                new Section("Duration")
-                                                                {
-                                                                    Child = DurationField = new DurationDropdown
-                                                                    {
-                                                                        RelativeSizeAxes = Axes.X,
-                                                                        Items = new[]
-                                                                        {
-                                                                            TimeSpan.FromMinutes(30),
-                                                                            TimeSpan.FromHours(1),
-                                                                            TimeSpan.FromHours(2),
-                                                                            TimeSpan.FromHours(4),
-                                                                            TimeSpan.FromHours(8),
-                                                                            TimeSpan.FromHours(12),
-                                                                            //TimeSpan.FromHours(16),
-                                                                            TimeSpan.FromHours(24),
-                                                                            TimeSpan.FromDays(3),
-                                                                            TimeSpan.FromDays(7)
-                                                                        }
-                                                                    }
-                                                                },
-                                                                new Section("Room visibility")
-                                                                {
-                                                                    Alpha = disabled_alpha,
-                                                                    Child = AvailabilityPicker = new RoomAvailabilityPicker
-                                                                    {
-                                                                        Enabled = { Value = false }
-                                                                    },
-                                                                },
-                                                                new Section("Game type")
-                                                                {
-                                                                    Alpha = disabled_alpha,
-                                                                    Child = new FillFlowContainer
-                                                                    {
-                                                                        AutoSizeAxes = Axes.Y,
-                                                                        RelativeSizeAxes = Axes.X,
-                                                                        Direction = FillDirection.Vertical,
-                                                                        Spacing = new Vector2(7),
-                                                                        Children = new Drawable[]
-                                                                        {
-                                                                            TypePicker = new GameTypePicker
-                                                                            {
-                                                                                RelativeSizeAxes = Axes.X,
-                                                                                Enabled = { Value = false }
-                                                                            },
-                                                                            typeLabel = new OsuSpriteText
-                                                                            {
-                                                                                Font = OsuFont.GetFont(size: 14),
-                                                                                Colour = colours.Yellow
-                                                                            },
-                                                                        },
-                                                                    },
-                                                                },
-                                                                new Section("Max participants")
-                                                                {
-                                                                    Alpha = disabled_alpha,
-                                                                    Child = MaxParticipantsField = new SettingsNumberTextBox
-                                                                    {
-                                                                        RelativeSizeAxes = Axes.X,
-                                                                        TabbableContentContainer = this,
-                                                                        ReadOnly = true,
-                                                                    },
-                                                                },
-                                                                new Section("Password (optional)")
-                                                                {
-                                                                    Alpha = disabled_alpha,
-                                                                    Child = new SettingsPasswordTextBox
-                                                                    {
-                                                                        RelativeSizeAxes = Axes.X,
-                                                                        TabbableContentContainer = this,
-                                                                        ReadOnly = true,
-                                                                    },
-                                                                },
-                                                            },
-                                                        },
-                                                        new SectionContainer
-                                                        {
-                                                            Anchor = Anchor.TopRight,
-                                                            Origin = Anchor.TopRight,
-                                                            Padding = new MarginPadding { Left = FIELD_PADDING / 2 },
-                                                            Children = new[]
-                                                            {
-                                                                new Section("Playlist")
-                                                                {
-                                                                    Child = new GridContainer
-                                                                    {
-                                                                        RelativeSizeAxes = Axes.X,
-                                                                        Height = 300,
-                                                                        Content = new[]
-                                                                        {
-                                                                            new Drawable[]
-                                                                            {
-                                                                                playlist = new DrawableRoomPlaylist(true, true) { RelativeSizeAxes = Axes.Both }
-                                                                            },
-                                                                            new Drawable[]
-                                                                            {
-                                                                                playlistLength = new OsuSpriteText
-                                                                                {
-                                                                                    Margin = new MarginPadding { Vertical = 5 },
-                                                                                    Colour = colours.Yellow,
-                                                                                    Font = OsuFont.GetFont(size: 12),
-                                                                                }
-                                                                            },
-                                                                            new Drawable[]
-                                                                            {
-                                                                                new PurpleTriangleButton
-                                                                                {
-                                                                                    RelativeSizeAxes = Axes.X,
-                                                                                    Height = 40,
-                                                                                    Text = "Edit playlist",
-                                                                                    Action = () => EditPlaylist?.Invoke()
-                                                                                }
-                                                                            }
-                                                                        },
-                                                                        RowDimensions = new[]
-                                                                        {
-                                                                            new Dimension(),
-                                                                            new Dimension(GridSizeMode.AutoSize),
-                                                                            new Dimension(GridSizeMode.AutoSize),
-                                                                        }
-                                                                    }
-                                                                },
-                                                            },
-                                                        },
-                                                    },
-                                                }
-                                            },
-                                        },
-                                    },
-                                    new Drawable[]
-                                    {
-                                        new Container
-                                        {
-                                            Anchor = Anchor.BottomLeft,
-                                            Origin = Anchor.BottomLeft,
-                                            Y = 2,
-                                            RelativeSizeAxes = Axes.X,
-                                            AutoSizeAxes = Axes.Y,
-                                            Children = new Drawable[]
-                                            {
-                                                new Box
-                                                {
-                                                    RelativeSizeAxes = Axes.Both,
-                                                    Colour = Color4Extensions.FromHex(@"28242d").Darken(0.5f).Opacity(1f),
-                                                },
-                                                new FillFlowContainer
-                                                {
-                                                    RelativeSizeAxes = Axes.X,
-                                                    AutoSizeAxes = Axes.Y,
-                                                    Direction = FillDirection.Vertical,
-                                                    Spacing = new Vector2(0, 20),
-                                                    Margin = new MarginPadding { Vertical = 20 },
-                                                    Padding = new MarginPadding { Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING },
-                                                    Children = new Drawable[]
-                                                    {
-                                                        ApplyButton = new CreateRoomButton
-                                                        {
-                                                            Anchor = Anchor.BottomCentre,
-                                                            Origin = Anchor.BottomCentre,
-                                                            Size = new Vector2(230, 55),
-                                                            Enabled = { Value = false },
-                                                            Action = apply,
-                                                        },
-                                                        ErrorText = new OsuSpriteText
-                                                        {
-                                                            Anchor = Anchor.BottomCentre,
-                                                            Origin = Anchor.BottomCentre,
-                                                            Alpha = 0,
-                                                            Depth = 1,
-                                                            Colour = colours.RedDark
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            },
-                        }
-                    },
-                    loadingLayer = new LoadingLayer(dimContent)
-                };
-
-                TypePicker.Current.BindValueChanged(type => typeLabel.Text = type.NewValue?.Name ?? string.Empty, true);
-                RoomName.BindValueChanged(name => NameField.Text = name.NewValue, true);
-                Availability.BindValueChanged(availability => AvailabilityPicker.Current.Value = availability.NewValue, true);
-                Type.BindValueChanged(type => TypePicker.Current.Value = type.NewValue, true);
-                MaxParticipants.BindValueChanged(count => MaxParticipantsField.Text = count.NewValue?.ToString(), true);
-                Duration.BindValueChanged(duration => DurationField.Current.Value = duration.NewValue ?? TimeSpan.FromMinutes(30), true);
-
-                playlist.Items.BindTo(Playlist);
-                Playlist.BindCollectionChanged(onPlaylistChanged, true);
-            }
-
-            protected override void Update()
-            {
-                base.Update();
-
-                ApplyButton.Enabled.Value = hasValidSettings;
-            }
-
-            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 void apply()
-            {
-                if (!ApplyButton.Enabled.Value)
-                    return;
-
-                hideError();
-
-                RoomName.Value = NameField.Text;
-                Availability.Value = AvailabilityPicker.Current.Value;
-                Type.Value = TypePicker.Current.Value;
-
-                if (int.TryParse(MaxParticipantsField.Text, out int max))
-                    MaxParticipants.Value = max;
-                else
-                    MaxParticipants.Value = null;
-
-                Duration.Value = DurationField.Current.Value;
-
-                manager?.CreateRoom(currentRoom.Value, onSuccess, onError);
-
-                loadingLayer.Show();
-            }
-
-            private void hideError() => ErrorText.FadeOut(50);
-
-            private void onSuccess(Room room) => loadingLayer.Hide();
-
-            private void onError(string text)
-            {
-                ErrorText.Text = text;
-                ErrorText.FadeIn(50);
-
-                loadingLayer.Hide();
-            }
-        }
-
-        public class CreateRoomButton : TriangleButton
-        {
-            public CreateRoomButton()
-            {
-                Text = "Create";
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                BackgroundColour = colours.Yellow;
-                Triangles.ColourLight = colours.YellowLight;
-                Triangles.ColourDark = colours.YellowDark;
-            }
-        }
-
-        private class DurationDropdown : OsuDropdown<TimeSpan>
-        {
-            public DurationDropdown()
-            {
-                Menu.MaxHeight = 100;
-            }
-
-            protected override string GenerateItemText(TimeSpan item) => item.Humanize();
-        }
-    }
 }
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftMatchSettingsOverlay.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftMatchSettingsOverlay.cs
new file mode 100644
index 0000000000..7e1e9894d8
--- /dev/null
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftMatchSettingsOverlay.cs
@@ -0,0 +1,391 @@
+// Copyright (c) ppy 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.Specialized;
+using Humanizer;
+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.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Overlays;
+using osu.Game.Screens.Multi.Match.Components;
+using osuTK;
+
+namespace osu.Game.Screens.Multi.Timeshift
+{
+    public class TimeshiftMatchSettingsOverlay : MatchSettingsOverlay
+    {
+        public Action EditPlaylist;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Child = Settings = new MatchSettings
+            {
+                RelativeSizeAxes = Axes.Both,
+                RelativePositionAxes = Axes.Y,
+                EditPlaylist = () => EditPlaylist?.Invoke()
+            };
+        }
+
+        protected class MatchSettings : MultiplayerComposite
+        {
+            private const float disabled_alpha = 0.2f;
+
+            public Action EditPlaylist;
+
+            public OsuTextBox NameField, MaxParticipantsField;
+            public OsuDropdown<TimeSpan> DurationField;
+            public RoomAvailabilityPicker AvailabilityPicker;
+            public GameTypePicker TypePicker;
+            public TriangleButton ApplyButton;
+
+            public OsuSpriteText ErrorText;
+
+            private OsuSpriteText typeLabel;
+            private LoadingLayer loadingLayer;
+            private DrawableRoomPlaylist playlist;
+            private OsuSpriteText playlistLength;
+
+            [Resolved(CanBeNull = true)]
+            private IRoomManager manager { get; set; }
+
+            [Resolved]
+            private Bindable<Room> currentRoom { get; set; }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                Container dimContent;
+
+                InternalChildren = new Drawable[]
+                {
+                    dimContent = new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Children = new Drawable[]
+                        {
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Colour = Color4Extensions.FromHex(@"28242d"),
+                            },
+                            new GridContainer
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                RowDimensions = new[]
+                                {
+                                    new Dimension(GridSizeMode.Distributed),
+                                    new Dimension(GridSizeMode.AutoSize),
+                                },
+                                Content = new[]
+                                {
+                                    new Drawable[]
+                                    {
+                                        new OsuScrollContainer
+                                        {
+                                            Padding = new MarginPadding
+                                            {
+                                                Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING,
+                                                Vertical = 10
+                                            },
+                                            RelativeSizeAxes = Axes.Both,
+                                            Children = new[]
+                                            {
+                                                new Container
+                                                {
+                                                    Padding = new MarginPadding { Horizontal = WaveOverlayContainer.WIDTH_PADDING },
+                                                    RelativeSizeAxes = Axes.X,
+                                                    AutoSizeAxes = Axes.Y,
+                                                    Children = new Drawable[]
+                                                    {
+                                                        new SectionContainer
+                                                        {
+                                                            Padding = new MarginPadding { Right = FIELD_PADDING / 2 },
+                                                            Children = new[]
+                                                            {
+                                                                new Section("Room name")
+                                                                {
+                                                                    Child = NameField = new SettingsTextBox
+                                                                    {
+                                                                        RelativeSizeAxes = Axes.X,
+                                                                        TabbableContentContainer = this,
+                                                                        LengthLimit = 100
+                                                                    },
+                                                                },
+                                                                new Section("Duration")
+                                                                {
+                                                                    Child = DurationField = new DurationDropdown
+                                                                    {
+                                                                        RelativeSizeAxes = Axes.X,
+                                                                        Items = new[]
+                                                                        {
+                                                                            TimeSpan.FromMinutes(30),
+                                                                            TimeSpan.FromHours(1),
+                                                                            TimeSpan.FromHours(2),
+                                                                            TimeSpan.FromHours(4),
+                                                                            TimeSpan.FromHours(8),
+                                                                            TimeSpan.FromHours(12),
+                                                                            //TimeSpan.FromHours(16),
+                                                                            TimeSpan.FromHours(24),
+                                                                            TimeSpan.FromDays(3),
+                                                                            TimeSpan.FromDays(7)
+                                                                        }
+                                                                    }
+                                                                },
+                                                                new Section("Room visibility")
+                                                                {
+                                                                    Alpha = disabled_alpha,
+                                                                    Child = AvailabilityPicker = new RoomAvailabilityPicker
+                                                                    {
+                                                                        Enabled = { Value = false }
+                                                                    },
+                                                                },
+                                                                new Section("Game type")
+                                                                {
+                                                                    Alpha = disabled_alpha,
+                                                                    Child = new FillFlowContainer
+                                                                    {
+                                                                        AutoSizeAxes = Axes.Y,
+                                                                        RelativeSizeAxes = Axes.X,
+                                                                        Direction = FillDirection.Vertical,
+                                                                        Spacing = new Vector2(7),
+                                                                        Children = new Drawable[]
+                                                                        {
+                                                                            TypePicker = new GameTypePicker
+                                                                            {
+                                                                                RelativeSizeAxes = Axes.X,
+                                                                                Enabled = { Value = false }
+                                                                            },
+                                                                            typeLabel = new OsuSpriteText
+                                                                            {
+                                                                                Font = OsuFont.GetFont(size: 14),
+                                                                                Colour = colours.Yellow
+                                                                            },
+                                                                        },
+                                                                    },
+                                                                },
+                                                                new Section("Max participants")
+                                                                {
+                                                                    Alpha = disabled_alpha,
+                                                                    Child = MaxParticipantsField = new SettingsNumberTextBox
+                                                                    {
+                                                                        RelativeSizeAxes = Axes.X,
+                                                                        TabbableContentContainer = this,
+                                                                        ReadOnly = true,
+                                                                    },
+                                                                },
+                                                                new Section("Password (optional)")
+                                                                {
+                                                                    Alpha = disabled_alpha,
+                                                                    Child = new SettingsPasswordTextBox
+                                                                    {
+                                                                        RelativeSizeAxes = Axes.X,
+                                                                        TabbableContentContainer = this,
+                                                                        ReadOnly = true,
+                                                                    },
+                                                                },
+                                                            },
+                                                        },
+                                                        new SectionContainer
+                                                        {
+                                                            Anchor = Anchor.TopRight,
+                                                            Origin = Anchor.TopRight,
+                                                            Padding = new MarginPadding { Left = FIELD_PADDING / 2 },
+                                                            Children = new[]
+                                                            {
+                                                                new Section("Playlist")
+                                                                {
+                                                                    Child = new GridContainer
+                                                                    {
+                                                                        RelativeSizeAxes = Axes.X,
+                                                                        Height = 300,
+                                                                        Content = new[]
+                                                                        {
+                                                                            new Drawable[]
+                                                                            {
+                                                                                playlist = new DrawableRoomPlaylist(true, true) { RelativeSizeAxes = Axes.Both }
+                                                                            },
+                                                                            new Drawable[]
+                                                                            {
+                                                                                playlistLength = new OsuSpriteText
+                                                                                {
+                                                                                    Margin = new MarginPadding { Vertical = 5 },
+                                                                                    Colour = colours.Yellow,
+                                                                                    Font = OsuFont.GetFont(size: 12),
+                                                                                }
+                                                                            },
+                                                                            new Drawable[]
+                                                                            {
+                                                                                new PurpleTriangleButton
+                                                                                {
+                                                                                    RelativeSizeAxes = Axes.X,
+                                                                                    Height = 40,
+                                                                                    Text = "Edit playlist",
+                                                                                    Action = () => EditPlaylist?.Invoke()
+                                                                                }
+                                                                            }
+                                                                        },
+                                                                        RowDimensions = new[]
+                                                                        {
+                                                                            new Dimension(),
+                                                                            new Dimension(GridSizeMode.AutoSize),
+                                                                            new Dimension(GridSizeMode.AutoSize),
+                                                                        }
+                                                                    }
+                                                                },
+                                                            },
+                                                        },
+                                                    },
+                                                }
+                                            },
+                                        },
+                                    },
+                                    new Drawable[]
+                                    {
+                                        new Container
+                                        {
+                                            Anchor = Anchor.BottomLeft,
+                                            Origin = Anchor.BottomLeft,
+                                            Y = 2,
+                                            RelativeSizeAxes = Axes.X,
+                                            AutoSizeAxes = Axes.Y,
+                                            Children = new Drawable[]
+                                            {
+                                                new Box
+                                                {
+                                                    RelativeSizeAxes = Axes.Both,
+                                                    Colour = Color4Extensions.FromHex(@"28242d").Darken(0.5f).Opacity(1f),
+                                                },
+                                                new FillFlowContainer
+                                                {
+                                                    RelativeSizeAxes = Axes.X,
+                                                    AutoSizeAxes = Axes.Y,
+                                                    Direction = FillDirection.Vertical,
+                                                    Spacing = new Vector2(0, 20),
+                                                    Margin = new MarginPadding { Vertical = 20 },
+                                                    Padding = new MarginPadding { Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING },
+                                                    Children = new Drawable[]
+                                                    {
+                                                        ApplyButton = new CreateRoomButton
+                                                        {
+                                                            Anchor = Anchor.BottomCentre,
+                                                            Origin = Anchor.BottomCentre,
+                                                            Size = new Vector2(230, 55),
+                                                            Enabled = { Value = false },
+                                                            Action = apply,
+                                                        },
+                                                        ErrorText = new OsuSpriteText
+                                                        {
+                                                            Anchor = Anchor.BottomCentre,
+                                                            Origin = Anchor.BottomCentre,
+                                                            Alpha = 0,
+                                                            Depth = 1,
+                                                            Colour = colours.RedDark
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            },
+                        }
+                    },
+                    loadingLayer = new LoadingLayer(dimContent)
+                };
+
+                TypePicker.Current.BindValueChanged(type => typeLabel.Text = type.NewValue?.Name ?? string.Empty, true);
+                RoomName.BindValueChanged(name => NameField.Text = name.NewValue, true);
+                Availability.BindValueChanged(availability => AvailabilityPicker.Current.Value = availability.NewValue, true);
+                Type.BindValueChanged(type => TypePicker.Current.Value = type.NewValue, true);
+                MaxParticipants.BindValueChanged(count => MaxParticipantsField.Text = count.NewValue?.ToString(), true);
+                Duration.BindValueChanged(duration => DurationField.Current.Value = duration.NewValue ?? TimeSpan.FromMinutes(30), true);
+
+                playlist.Items.BindTo(Playlist);
+                Playlist.BindCollectionChanged(onPlaylistChanged, true);
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+
+                ApplyButton.Enabled.Value = hasValidSettings;
+            }
+
+            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 void apply()
+            {
+                if (!ApplyButton.Enabled.Value)
+                    return;
+
+                hideError();
+
+                RoomName.Value = NameField.Text;
+                Availability.Value = AvailabilityPicker.Current.Value;
+                Type.Value = TypePicker.Current.Value;
+
+                if (int.TryParse(MaxParticipantsField.Text, out int max))
+                    MaxParticipants.Value = max;
+                else
+                    MaxParticipants.Value = null;
+
+                Duration.Value = DurationField.Current.Value;
+
+                manager?.CreateRoom(currentRoom.Value, onSuccess, onError);
+
+                loadingLayer.Show();
+            }
+
+            private void hideError() => ErrorText.FadeOut(50);
+
+            private void onSuccess(Room room) => loadingLayer.Hide();
+
+            private void onError(string text)
+            {
+                ErrorText.Text = text;
+                ErrorText.FadeIn(50);
+
+                loadingLayer.Hide();
+            }
+        }
+
+        public class CreateRoomButton : TriangleButton
+        {
+            public CreateRoomButton()
+            {
+                Text = "Create";
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                BackgroundColour = colours.Yellow;
+                Triangles.ColourLight = colours.YellowLight;
+                Triangles.ColourDark = colours.YellowDark;
+            }
+        }
+
+        private class DurationDropdown : OsuDropdown<TimeSpan>
+        {
+            public DurationDropdown()
+            {
+                Menu.MaxHeight = 100;
+            }
+
+            protected override string GenerateItemText(TimeSpan item) => item.Humanize();
+        }
+    }
+}

From 34421c92327c00fb3574141271f6d6094f5f94da Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 15:58:57 +0900
Subject: [PATCH 0489/3722] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 2a08cb7867..fc01f9bf1d 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1214.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1222.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 960959f367..cbf9f6f1bd 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.1214.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1222.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
     <PackageReference Include="Sentry" Version="2.1.8" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index a5bcb91c74..adbcc0ef1c 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1214.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1222.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -88,7 +88,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.1214.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1222.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 3cf889b7c5c4d8f4e8382ab5245c30a551b1f7e1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 16:19:19 +0900
Subject: [PATCH 0490/3722] Fix some errors being completely ignored

---
 osu.Game/Screens/Multi/Components/RoomManager.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Multi/Components/RoomManager.cs b/osu.Game/Screens/Multi/Components/RoomManager.cs
index 482ee5492c..f78d0d979e 100644
--- a/osu.Game/Screens/Multi/Components/RoomManager.cs
+++ b/osu.Game/Screens/Multi/Components/RoomManager.cs
@@ -76,10 +76,7 @@ namespace osu.Game.Screens.Multi.Components
 
             req.Failure += exception =>
             {
-                if (req.Result != null)
-                    onError?.Invoke(req.Result.Error);
-                else
-                    Logger.Log($"Failed to create the room: {exception}", level: LogLevel.Important);
+                onError?.Invoke(req.Result?.Error ?? exception.Message);
             };
 
             api.Queue(req);

From 2d7174d99cc6e24b30f3266a32cd86fe9c735c34 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 22 Dec 2020 16:23:06 +0900
Subject: [PATCH 0491/3722] Add padding to song select

---
 .../Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
index 157216e9bb..b2ae5402a1 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using Humanizer;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
 using osu.Framework.Screens;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.RealtimeMultiplayer;
@@ -24,6 +25,11 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         [Resolved]
         private StatefulMultiplayerClient client { get; set; }
 
+        public RealtimeMatchSongSelect()
+        {
+            Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING };
+        }
+
         protected override bool OnStart()
         {
             var item = new PlaylistItem();

From 12876d7fb642500d7c5db31827a718a0af7b1798 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 16:50:30 +0900
Subject: [PATCH 0492/3722] Add very basic error handling on ChangeSettings
 calls

---
 .../StatefulMultiplayerClient.cs                    |  6 +++---
 .../Match/RealtimeMatchSettingsOverlay.cs           |  9 +++++++--
 .../RealtimeMultiplayer/RealtimeMatchSongSelect.cs  | 13 +++++++++++--
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
index f56499f040..4ebd648689 100644
--- a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
@@ -127,10 +127,10 @@ namespace osu.Game.Online.RealtimeMultiplayer
         /// </remarks>
         /// <param name="name">The new room name, if any.</param>
         /// <param name="item">The new room playlist item, if any.</param>
-        public void ChangeSettings(Optional<string> name = default, Optional<PlaylistItem> item = default)
+        public Task ChangeSettings(Optional<string> name = default, Optional<PlaylistItem> item = default)
         {
             if (Room == null)
-                return;
+                throw new InvalidOperationException("Must be joined to a match to change settings.");
 
             // A dummy playlist item filled with the current room settings (except mods).
             var existingPlaylistItem = new PlaylistItem
@@ -146,7 +146,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
                 RulesetID = Room.Settings.RulesetID
             };
 
-            ChangeSettings(new MultiplayerRoomSettings
+            return ChangeSettings(new MultiplayerRoomSettings
             {
                 Name = name.GetOr(Room.Settings.Name),
                 BeatmapID = item.GetOr(existingPlaylistItem).BeatmapID,
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs
index 5bd388cceb..3e495b490f 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs
@@ -294,8 +294,13 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
                 // Otherwise, update the room directly in preparation for it to be submitted to the API on match creation.
                 if (client.Room != null)
                 {
-                    client.ChangeSettings(name: NameField.Text);
-                    onSuccess(currentRoom.Value);
+                    client.ChangeSettings(name: NameField.Text).ContinueWith(t => Schedule(() =>
+                    {
+                        if (t.IsCompletedSuccessfully)
+                            onSuccess(currentRoom.Value);
+                        else
+                            onError(t.Exception?.Message ?? "Error changing settings.");
+                    }));
                 }
                 else
                 {
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
index b2ae5402a1..0feeed6fe5 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
@@ -6,6 +6,7 @@ using Humanizer;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.RealtimeMultiplayer;
@@ -43,14 +44,22 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             // If the client is already in a room, update via the client.
             // Otherwise, update the playlist directly in preparation for it to be submitted to the API on match creation.
             if (client.Room != null)
-                client.ChangeSettings(item: item);
+            {
+                client.ChangeSettings(item: item).ContinueWith(t => Schedule(() =>
+                {
+                    if (t.IsCompletedSuccessfully)
+                        this.Exit();
+                    else
+                        Logger.Log($"Could not use current beatmap ({t.Exception?.Message})", level: LogLevel.Important);
+                }));
+            }
             else
             {
                 playlist.Clear();
                 playlist.Add(item);
+                this.Exit();
             }
 
-            this.Exit();
             return true;
         }
 

From 30357a9447a077e09b7e0a11006fd48a156890a5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 17:08:02 +0900
Subject: [PATCH 0493/3722] Add loading layer to multi song select to show
 during settings confirmation

---
 .../RealtimeMatchSongSelect.cs                | 29 +++++++++++++++----
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
index 0feeed6fe5..d4308d361c 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
@@ -2,12 +2,14 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
+using System.Threading;
 using Humanizer;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Screens.Select;
@@ -26,11 +28,19 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         [Resolved]
         private StatefulMultiplayerClient client { get; set; }
 
+        private LoadingLayer loadingLayer;
+
         public RealtimeMatchSongSelect()
         {
             Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING };
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AddInternal(loadingLayer = new LoadingLayer(Carousel));
+        }
+
         protected override bool OnStart()
         {
             var item = new PlaylistItem();
@@ -45,13 +55,20 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             // Otherwise, update the playlist directly in preparation for it to be submitted to the API on match creation.
             if (client.Room != null)
             {
-                client.ChangeSettings(item: item).ContinueWith(t => Schedule(() =>
+                loadingLayer.Show();
+
+                client.ChangeSettings(item: item).ContinueWith(t =>
                 {
-                    if (t.IsCompletedSuccessfully)
-                        this.Exit();
-                    else
-                        Logger.Log($"Could not use current beatmap ({t.Exception?.Message})", level: LogLevel.Important);
-                }));
+                    return Schedule(() =>
+                    {
+                        loadingLayer.Hide();
+
+                        if (t.IsCompletedSuccessfully)
+                            this.Exit();
+                        else
+                            Logger.Log($"Could not use current beatmap ({t.Exception?.Message})", level: LogLevel.Important);
+                    });
+                });
             }
             else
             {

From 59734229ff94bd907fd640374ce081c62581cb61 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 17:21:53 +0900
Subject: [PATCH 0494/3722] Remove unused using

---
 .../Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
index d4308d361c..f3dab93089 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
-using System.Threading;
 using Humanizer;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;

From 3d5783a0eab3e1360dad85f9b6b5183c56467be9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 17:34:51 +0900
Subject: [PATCH 0495/3722] Improve variable names

---
 .../Sections/Graphics/LayoutSettings.cs        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index 6ec5d1f03a..b722fd4137 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -140,20 +140,20 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                     windowModeDropdown.Hide();
             }, true);
 
-            windowModeDropdown.Current.ValueChanged += v => updateResolutionDropdown();
+            windowModeDropdown.Current.ValueChanged += _ => updateResolutionDropdown();
 
-            currentDisplay.BindValueChanged(v => Schedule(() =>
+            currentDisplay.BindValueChanged(display => Schedule(() =>
             {
                 resolutions.RemoveRange(1, resolutions.Count - 1);
 
-                if (v.NewValue != null)
+                if (display.NewValue != null)
                 {
-                    resolutions.AddRange(v.NewValue.DisplayModes
-                                          .Where(m => m.Size.Width >= 800 && m.Size.Height >= 600)
-                                          .OrderByDescending(m => m.Size.Width)
-                                          .ThenByDescending(m => m.Size.Height)
-                                          .Select(m => m.Size)
-                                          .Distinct());
+                    resolutions.AddRange(display.NewValue.DisplayModes
+                                                .Where(m => m.Size.Width >= 800 && m.Size.Height >= 600)
+                                                .OrderByDescending(m => m.Size.Width)
+                                                .ThenByDescending(m => m.Size.Height)
+                                                .Select(m => m.Size)
+                                                .Distinct());
                 }
 
                 updateResolutionDropdown();

From 4f02928601b75ed162b6527b728cce8d971182cb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 17:36:56 +0900
Subject: [PATCH 0496/3722] Change sorting to better handle portrait screens

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

diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index b722fd4137..3d3b543d70 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.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.Drawing;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -150,8 +151,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 {
                     resolutions.AddRange(display.NewValue.DisplayModes
                                                 .Where(m => m.Size.Width >= 800 && m.Size.Height >= 600)
-                                                .OrderByDescending(m => m.Size.Width)
-                                                .ThenByDescending(m => m.Size.Height)
+                                                .OrderByDescending(m => Math.Max(m.Size.Height, m.Size.Width))
                                                 .Select(m => m.Size)
                                                 .Distinct());
                 }

From ce806dd880f58b03e18fdf80d76ce9f5c67c86e1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 18:25:45 +0900
Subject: [PATCH 0497/3722] Replace the ready mark display with a state
 display, showing all participant states

---
 .../Multiplayer/TestSceneParticipantsList.cs  |   1 +
 .../TestSceneParticipantsList.cs              |  11 +-
 .../Participants/ParticipantPanel.cs          |  10 +-
 .../Participants/ReadyMark.cs                 |  51 -------
 .../Participants/StateDisplay.cs              | 128 ++++++++++++++++++
 5 files changed, 138 insertions(+), 63 deletions(-)
 delete mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ReadyMark.cs
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/StateDisplay.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs
index 7bbec7d30e..360aa22af9 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs
@@ -20,6 +20,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 Room.RecentParticipants.Add(new User
                 {
                     Username = "peppy",
+                    CurrentModeRank = 1234,
                     Id = 2
                 });
             }
diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneParticipantsList.cs b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneParticipantsList.cs
index 8c997e9e32..35ea0d3813 100644
--- a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneParticipantsList.cs
+++ b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneParticipantsList.cs
@@ -6,6 +6,7 @@ using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
+using osu.Framework.Utils;
 using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Screens.Multi.RealtimeMultiplayer.Participants;
 using osu.Game.Users;
@@ -65,13 +66,13 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
         [Test]
         public void TestToggleReadyState()
         {
-            AddAssert("ready mark invisible", () => !this.ChildrenOfType<ReadyMark>().Single().IsPresent);
+            AddAssert("ready mark invisible", () => !this.ChildrenOfType<StateDisplay>().Single().IsPresent);
 
             AddStep("make user ready", () => Client.ChangeState(MultiplayerUserState.Ready));
-            AddUntilStep("ready mark visible", () => this.ChildrenOfType<ReadyMark>().Single().IsPresent);
+            AddUntilStep("ready mark visible", () => this.ChildrenOfType<StateDisplay>().Single().IsPresent);
 
             AddStep("make user idle", () => Client.ChangeState(MultiplayerUserState.Idle));
-            AddUntilStep("ready mark invisible", () => !this.ChildrenOfType<ReadyMark>().Single().IsPresent);
+            AddUntilStep("ready mark invisible", () => !this.ChildrenOfType<StateDisplay>().Single().IsPresent);
         }
 
         [Test]
@@ -104,11 +105,11 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
                     {
                         Id = i,
                         Username = $"User {i}",
+                        CurrentModeRank = RNG.Next(1, 100000),
                         CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
                     });
 
-                    if (i % 2 == 0)
-                        Client.ChangeUserState(i, MultiplayerUserState.Ready);
+                    Client.ChangeUserState(i, (MultiplayerUserState)RNG.Next(0, (int)MultiplayerUserState.Results));
                 }
             });
         }
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs
index 002849a275..a4ff2ce346 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Participants
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        private ReadyMark readyMark;
+        private StateDisplay userStateDisplay;
         private SpriteIcon crown;
 
         public ParticipantPanel(MultiplayerRoomUser user)
@@ -122,12 +122,11 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Participants
                                     }
                                 }
                             },
-                            readyMark = new ReadyMark
+                            userStateDisplay = new StateDisplay
                             {
                                 Anchor = Anchor.CentreRight,
                                 Origin = Anchor.CentreRight,
                                 Margin = new MarginPadding { Right = 10 },
-                                Alpha = 0
                             }
                         }
                     }
@@ -144,10 +143,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Participants
 
             const double fade_time = 50;
 
-            if (User.State == MultiplayerUserState.Ready)
-                readyMark.FadeIn(fade_time);
-            else
-                readyMark.FadeOut(fade_time);
+            userStateDisplay.Status = User.State;
 
             if (Room.Host?.Equals(User) == true)
                 crown.FadeIn(fade_time);
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ReadyMark.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ReadyMark.cs
deleted file mode 100644
index df49d9342e..0000000000
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ReadyMark.cs
+++ /dev/null
@@ -1,51 +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.Extensions.Color4Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osuTK;
-
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Participants
-{
-    public class ReadyMark : CompositeDrawable
-    {
-        public ReadyMark()
-        {
-            AutoSizeAxes = Axes.Both;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            InternalChild = new FillFlowContainer
-            {
-                AutoSizeAxes = Axes.Both,
-                Spacing = new Vector2(5),
-                Children = new Drawable[]
-                {
-                    new OsuSpriteText
-                    {
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                        Font = OsuFont.GetFont(weight: FontWeight.Regular, size: 12),
-                        Text = "ready",
-                        Colour = Color4Extensions.FromHex("#DDFFFF")
-                    },
-                    new SpriteIcon
-                    {
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                        Icon = FontAwesome.Solid.CheckCircle,
-                        Size = new Vector2(12),
-                        Colour = Color4Extensions.FromHex("#AADD00")
-                    }
-                }
-            };
-        }
-    }
-}
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/StateDisplay.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/StateDisplay.cs
new file mode 100644
index 0000000000..db93525217
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/StateDisplay.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 osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Online.RealtimeMultiplayer;
+using osuTK;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Participants
+{
+    public class StateDisplay : CompositeDrawable
+    {
+        public StateDisplay()
+        {
+            AutoSizeAxes = Axes.Both;
+        }
+
+        private MultiplayerUserState status;
+
+        private OsuSpriteText text;
+        private SpriteIcon icon;
+
+        private const double fade_time = 50;
+
+        public MultiplayerUserState Status
+        {
+            set
+            {
+                if (value == status)
+                    return;
+
+                status = value;
+
+                if (IsLoaded)
+                    updateStatus();
+            }
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChild = new FillFlowContainer
+            {
+                AutoSizeAxes = Axes.Both,
+                Spacing = new Vector2(5),
+                Children = new Drawable[]
+                {
+                    text = new OsuSpriteText
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Font = OsuFont.GetFont(weight: FontWeight.Regular, size: 12),
+                        Colour = Color4Extensions.FromHex("#DDFFFF")
+                    },
+                    icon = new SpriteIcon
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Icon = FontAwesome.Solid.CheckCircle,
+                        Size = new Vector2(12),
+                    }
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            updateStatus();
+        }
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        private void updateStatus()
+        {
+            switch (status)
+            {
+                default:
+                    this.FadeOut(fade_time);
+                    return;
+
+                case MultiplayerUserState.Ready:
+                    text.Text = "ready";
+                    icon.Icon = FontAwesome.Solid.CheckCircle;
+                    icon.Colour = Color4Extensions.FromHex("#AADD00");
+                    break;
+
+                case MultiplayerUserState.WaitingForLoad:
+                    text.Text = "loading";
+                    icon.Icon = FontAwesome.Solid.PauseCircle;
+                    icon.Colour = colours.Yellow;
+                    break;
+
+                case MultiplayerUserState.Loaded:
+                    text.Text = "loaded";
+                    icon.Icon = FontAwesome.Solid.DotCircle;
+                    icon.Colour = colours.YellowLight;
+                    break;
+
+                case MultiplayerUserState.Playing:
+                    text.Text = "playing";
+                    icon.Icon = FontAwesome.Solid.PlayCircle;
+                    icon.Colour = colours.BlueLight;
+                    break;
+
+                case MultiplayerUserState.FinishedPlay:
+                    text.Text = "results pending";
+                    icon.Icon = FontAwesome.Solid.ArrowAltCircleUp;
+                    icon.Colour = colours.BlueLighter;
+                    break;
+
+                case MultiplayerUserState.Results:
+                    text.Text = "results";
+                    icon.Icon = FontAwesome.Solid.ArrowAltCircleUp;
+                    icon.Colour = colours.BlueLighter;
+                    break;
+            }
+
+            this.FadeIn(fade_time);
+        }
+    }
+}

From 23bf9c372c71d15049595955c22bda7df3939dfd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 18:26:39 +0900
Subject: [PATCH 0498/3722] Fix naming conflict with test scenes

---
 ...articipantsList.cs => TestSceneTimeshiftParticipantsList.cs} | 2 +-
 ...sList.cs => TestSceneRealtimeMultiplayerParticipantsList.cs} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename osu.Game.Tests/Visual/Multiplayer/{TestSceneParticipantsList.cs => TestSceneTimeshiftParticipantsList.cs} (95%)
 rename osu.Game.Tests/Visual/RealtimeMultiplayer/{TestSceneParticipantsList.cs => TestSceneRealtimeMultiplayerParticipantsList.cs} (97%)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftParticipantsList.cs
similarity index 95%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftParticipantsList.cs
index 360aa22af9..efc3be032c 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftParticipantsList.cs
@@ -8,7 +8,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneParticipantsList : MultiplayerTestScene
+    public class TestSceneTimeshiftParticipantsList : MultiplayerTestScene
     {
         [SetUp]
         public new void Setup() => Schedule(() =>
diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneParticipantsList.cs b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayerParticipantsList.cs
similarity index 97%
rename from osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneParticipantsList.cs
rename to osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayerParticipantsList.cs
index 35ea0d3813..7fd31906f7 100644
--- a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneParticipantsList.cs
+++ b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayerParticipantsList.cs
@@ -14,7 +14,7 @@ using osuTK;
 
 namespace osu.Game.Tests.Visual.RealtimeMultiplayer
 {
-    public class TestSceneParticipantsList : RealtimeMultiplayerTestScene
+    public class TestSceneRealtimeMultiplayerParticipantsList : RealtimeMultiplayerTestScene
     {
         [SetUp]
         public new void Setup() => Schedule(() =>

From 6517acc510885301d7bc0c3cf82d7638f7fc63cf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 Dec 2020 19:09:59 +0900
Subject: [PATCH 0499/3722] Add leaderboard display to realtime player

---
 .../RealtimeMultiplayer/RealtimePlayer.cs     | 23 +++++++++++++++++++
 osu.Game/Screens/Play/HUDOverlay.cs           |  7 +++++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index c6d44686b5..453e7e6140 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Diagnostics;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
@@ -12,7 +13,9 @@ using osu.Game.Online.Multiplayer;
 using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Scoring;
 using osu.Game.Screens.Multi.Play;
+using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Ranking;
+using osuTK;
 
 namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 {
@@ -30,6 +33,8 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         private readonly TaskCompletionSource<bool> resultsReady = new TaskCompletionSource<bool>();
         private readonly ManualResetEventSlim startedEvent = new ManualResetEventSlim();
 
+        private MultiplayerGameplayLeaderboard leaderboard;
+
         public RealtimePlayer(PlaylistItem playlistItem)
             : base(playlistItem, false)
         {
@@ -55,6 +60,24 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
                     this.Exit();
                 });
             }
+
+            Debug.Assert(client.Room != null);
+
+            int[] userIds = client.Room.Users.Where(u => u.State >= MultiplayerUserState.WaitingForLoad).Select(u => u.UserID).ToArray();
+
+            // todo: this should be implemented via a custom HUD implementation, and correctly masked to the main content area.
+            LoadComponentAsync(leaderboard = new MultiplayerGameplayLeaderboard(ScoreProcessor, userIds), HUDOverlay.Add);
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            const float padding = 44; // enough margin to avoid the hit error display.
+
+            leaderboard.Position = new Vector2(
+                padding,
+                padding + HUDOverlay.TopScoringElementsHeight);
         }
 
         private void onMatchStarted() => startedEvent.Set();
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 50195d571c..3dffab8102 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -28,6 +28,11 @@ namespace osu.Game.Screens.Play
 
         public const Easing FADE_EASING = Easing.Out;
 
+        /// <summary>
+        /// The total height of all the top of screen scoring elements.
+        /// </summary>
+        public float TopScoringElementsHeight { get; private set; }
+
         public readonly KeyCounterDisplay KeyCounter;
         public readonly SkinnableComboCounter ComboCounter;
         public readonly SkinnableScoreCounter ScoreCounter;
@@ -209,7 +214,7 @@ namespace osu.Game.Screens.Play
             // HACK: for now align with the accuracy counter.
             // this is done for the sake of hacky legacy skins which extend the health bar to take up the full screen area.
             // it only works with the default skin due to padding offsetting it *just enough* to coexist.
-            topRightElements.Y = ToLocalSpace(AccuracyCounter.Drawable.ScreenSpaceDrawQuad.BottomRight).Y;
+            topRightElements.Y = TopScoringElementsHeight = ToLocalSpace(AccuracyCounter.Drawable.ScreenSpaceDrawQuad.BottomRight).Y;
 
             bottomRightElements.Y = -Progress.Height;
         }

From e3483147e2f682000121bd1534f494efbd42e6c8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 22 Dec 2020 13:53:01 +0300
Subject: [PATCH 0500/3722] Move track looping logic into subscreens

---
 osu.Game/Screens/Multi/Match/RoomSubScreen.cs | 52 ++++++++++++++++++
 osu.Game/Screens/Multi/Multiplayer.cs         | 53 -------------------
 2 files changed, 52 insertions(+), 53 deletions(-)

diff --git a/osu.Game/Screens/Multi/Match/RoomSubScreen.cs b/osu.Game/Screens/Multi/Match/RoomSubScreen.cs
index 0cc9a4354e..21316a98ce 100644
--- a/osu.Game/Screens/Multi/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/RoomSubScreen.cs
@@ -9,6 +9,7 @@ using osu.Framework.Screens;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Overlays;
 using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Screens.Multi.Match
@@ -23,6 +24,9 @@ namespace osu.Game.Screens.Multi.Match
         [Resolved(typeof(Room), nameof(Room.Playlist))]
         protected BindableList<PlaylistItem> Playlist { get; private set; }
 
+        [Resolved]
+        private MusicController music { get; set; }
+
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
 
@@ -61,6 +65,30 @@ namespace osu.Game.Screens.Multi.Match
             var localBeatmap = beatmap == null ? null : beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == beatmap.OnlineBeatmapID);
 
             Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
+            if (this.IsCurrentScreen())
+                applyTrackLooping();
+        }
+
+        public override void OnEntering(IScreen last)
+        {
+            base.OnEntering(last);
+
+            music?.EnsurePlayingSomething();
+            applyTrackLooping();
+        }
+
+        public override void OnSuspending(IScreen next)
+        {
+            cancelTrackLooping();
+            base.OnSuspending(next);
+        }
+
+        public override void OnResuming(IScreen last)
+        {
+            base.OnResuming(last);
+
+            music?.EnsurePlayingSomething();
+            applyTrackLooping();
         }
 
         public override bool OnExiting(IScreen next)
@@ -68,7 +96,31 @@ namespace osu.Game.Screens.Multi.Match
             RoomManager?.PartRoom();
             Mods.Value = Array.Empty<Mod>();
 
+            cancelTrackLooping();
+
             return base.OnExiting(next);
         }
+
+        private void applyTrackLooping()
+        {
+            var track = Beatmap.Value?.Track;
+
+            if (track != null)
+            {
+                track.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
+                track.Looping = true;
+            }
+        }
+
+        private void cancelTrackLooping()
+        {
+            var track = Beatmap?.Value?.Track;
+
+            if (track != null)
+            {
+                track.Looping = false;
+                track.RestartPoint = 0;
+            }
+        }
     }
 }
diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index eae779421d..de2e0d58c9 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Screens;
-using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
@@ -198,8 +197,6 @@ namespace osu.Game.Screens.Multi
         {
             this.FadeIn();
             waves.Show();
-
-            beginHandlingTrack();
         }
 
         public override void OnResuming(IScreen last)
@@ -209,8 +206,6 @@ namespace osu.Game.Screens.Multi
 
             base.OnResuming(last);
 
-            beginHandlingTrack();
-
             UpdatePollingRate(isIdle.Value);
         }
 
@@ -219,8 +214,6 @@ namespace osu.Game.Screens.Multi
             this.ScaleTo(1.1f, 250, Easing.InSine);
             this.FadeOut(250);
 
-            endHandlingTrack();
-
             UpdatePollingRate(isIdle.Value);
         }
 
@@ -235,8 +228,6 @@ namespace osu.Game.Screens.Multi
             if (screenStack.CurrentScreen != null)
                 loungeSubScreen.MakeCurrent();
 
-            endHandlingTrack();
-
             base.OnExiting(next);
             return false;
         }
@@ -275,17 +266,6 @@ namespace osu.Game.Screens.Multi
         /// <returns>The created <see cref="Room"/>.</returns>
         protected virtual Room CreateNewRoom() => new Room { Name = { Value = $"{api.LocalUser}'s awesome room" } };
 
-        private void beginHandlingTrack()
-        {
-            Beatmap.BindValueChanged(updateTrack, true);
-        }
-
-        private void endHandlingTrack()
-        {
-            cancelLooping();
-            Beatmap.ValueChanged -= updateTrack;
-        }
-
         private void screenPushed(IScreen lastScreen, IScreen newScreen)
         {
             subScreenChanged(lastScreen, newScreen);
@@ -322,43 +302,10 @@ namespace osu.Game.Screens.Multi
 
             UpdatePollingRate(isIdle.Value);
             createButton.FadeTo(newScreen is LoungeSubScreen ? 1 : 0, 200);
-
-            updateTrack();
         }
 
         protected IScreen CurrentSubScreen => screenStack.CurrentScreen;
 
-        private void updateTrack(ValueChangedEvent<WorkingBeatmap> _ = null)
-        {
-            if (screenStack.CurrentScreen is RoomSubScreen)
-            {
-                var track = Beatmap.Value?.Track;
-
-                if (track != null)
-                {
-                    track.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
-                    track.Looping = true;
-
-                    music?.EnsurePlayingSomething();
-                }
-            }
-            else
-            {
-                cancelLooping();
-            }
-        }
-
-        private void cancelLooping()
-        {
-            var track = Beatmap?.Value?.Track;
-
-            if (track != null)
-            {
-                track.Looping = false;
-                track.RestartPoint = 0;
-            }
-        }
-
         protected abstract RoomManager CreateRoomManager();
 
         protected abstract LoungeSubScreen CreateLounge();

From 91d5c53643a7489066a23b36e6865d67c621ddf2 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 22 Dec 2020 16:36:17 +0300
Subject: [PATCH 0501/3722] Add method for checking room joinability

---
 osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs        | 2 ++
 .../Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs     | 2 ++
 .../Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs   | 2 ++
 osu.Game/Screens/Multi/Components/RoomManager.cs            | 2 ++
 osu.Game/Screens/Multi/IRoomManager.cs                      | 6 ++++++
 .../Multi/RealtimeMultiplayer/RealtimeRoomManager.cs        | 3 +++
 6 files changed, 17 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs b/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs
index 9dd4aea4bd..ea8fb4ef49 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs
@@ -24,6 +24,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         public void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null) => Rooms.Add(room);
 
+        public bool CanJoinRoom(Room room) => true;
+
         public void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
         {
         }
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
index 1fcae9c709..55dbd1a7c6 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
@@ -146,6 +146,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     onSuccess?.Invoke(room);
             }
 
+            public bool CanJoinRoom(Room room) => true;
+
             public void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null) => throw new NotImplementedException();
 
             public void PartRoom() => throw new NotImplementedException();
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs
index bbd7d84081..8fdb5d4093 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs
@@ -161,6 +161,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 onSuccess?.Invoke(room);
             }
 
+            public bool CanJoinRoom(Room room) => true;
+
             public void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null) => onSuccess?.Invoke(room);
 
             public void PartRoom()
diff --git a/osu.Game/Screens/Multi/Components/RoomManager.cs b/osu.Game/Screens/Multi/Components/RoomManager.cs
index f78d0d979e..3fcfe1df25 100644
--- a/osu.Game/Screens/Multi/Components/RoomManager.cs
+++ b/osu.Game/Screens/Multi/Components/RoomManager.cs
@@ -82,6 +82,8 @@ namespace osu.Game.Screens.Multi.Components
             api.Queue(req);
         }
 
+        public virtual bool CanJoinRoom(Room room) => true;
+
         private JoinRoomRequest currentJoinRoomRequest;
 
         public virtual void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
diff --git a/osu.Game/Screens/Multi/IRoomManager.cs b/osu.Game/Screens/Multi/IRoomManager.cs
index 630e3af91c..a1cff129a9 100644
--- a/osu.Game/Screens/Multi/IRoomManager.cs
+++ b/osu.Game/Screens/Multi/IRoomManager.cs
@@ -34,6 +34,12 @@ namespace osu.Game.Screens.Multi
         /// <param name="onError">An action to be invoked if an error occurred.</param>
         void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null);
 
+        /// <summary>
+        /// Whether the provided <paramref name="room"/> can be joined.
+        /// </summary>
+        /// <param name="room">The <see cref="Room"/> to check for.</param>
+        bool CanJoinRoom(Room room);
+
         /// <summary>
         /// Joins a <see cref="Room"/>.
         /// </summary>
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index 7ce031e0e9..d8dc5f127a 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -9,6 +9,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Logging;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Multiplayer.RoomStatuses;
 using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Screens.Multi.Components;
 
@@ -40,6 +41,8 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         public override void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
             => base.CreateRoom(room, r => joinMultiplayerRoom(r, onSuccess, onError), onError);
 
+        public override bool CanJoinRoom(Room room) => !(room.Status.Value is RoomStatusEnded);
+
         public override void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
             => base.JoinRoom(room, r => joinMultiplayerRoom(r, onSuccess, onError), onError);
 

From a64ffcd2949ca3f47c0bc3019de9596dc28e79d5 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 22 Dec 2020 16:38:10 +0300
Subject: [PATCH 0502/3722] Refrain from joining room if not allowed

---
 osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
index c7c37cbc0d..c1f69b779c 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
@@ -115,7 +115,9 @@ namespace osu.Game.Screens.Multi.Lounge.Components
                     {
                         if (room == selectedRoom.Value)
                         {
-                            joinSelected();
+                            if (roomManager.CanJoinRoom(room))
+                                joinSelected();
+
                             return;
                         }
 

From 668f89d8b230103d8daee7fd639fde069baa4d99 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Tue, 22 Dec 2020 17:33:11 +0200
Subject: [PATCH 0503/3722] Copy test from #11019

---
 .../TestSceneSectionsContainer.cs             | 122 ++++++++++++++++++
 1 file changed, 122 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneSectionsContainer.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneSectionsContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneSectionsContainer.cs
new file mode 100644
index 0000000000..5c2e6e457d
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneSectionsContainer.cs
@@ -0,0 +1,122 @@
+// Copyright (c) ppy 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.Colour;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics.Containers;
+using osuTK.Graphics;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneSectionsContainer : OsuManualInputManagerTestScene
+    {
+        private readonly SectionsContainer<TestSection> container;
+        private float custom;
+        private const float header_height = 100;
+
+        public TestSceneSectionsContainer()
+        {
+            container = new SectionsContainer<TestSection>
+            {
+                RelativeSizeAxes = Axes.Y,
+                Width = 300,
+                Origin = Anchor.Centre,
+                Anchor = Anchor.Centre,
+                FixedHeader = new Box
+                {
+                    Alpha = 0.5f,
+                    Width = 300,
+                    Height = header_height,
+                    Colour = Color4.Red
+                }
+            };
+            container.SelectedSection.ValueChanged += section =>
+            {
+                if (section.OldValue != null)
+                    section.OldValue.Selected = false;
+                if (section.NewValue != null)
+                    section.NewValue.Selected = true;
+            };
+            Add(container);
+        }
+
+        [Test]
+        public void TestSelection()
+        {
+            AddStep("clear", () => container.Clear());
+            AddStep("add 1/8th", () => append(1 / 8.0f));
+            AddStep("add third", () => append(1 / 3.0f));
+            AddStep("add half", () => append(1 / 2.0f));
+            AddStep("add full", () => append(1));
+            AddSliderStep("set custom", 0.1f, 1.1f, 0.5f, i => custom = i);
+            AddStep("add custom", () => append(custom));
+            AddStep("scroll to previous", () => container.ScrollTo(
+                container.Children.Reverse().SkipWhile(s => s != container.SelectedSection.Value).Skip(1).FirstOrDefault() ?? container.Children.First()
+            ));
+            AddStep("scroll to next", () => container.ScrollTo(
+                container.Children.SkipWhile(s => s != container.SelectedSection.Value).Skip(1).FirstOrDefault() ?? container.Children.Last()
+            ));
+            AddStep("scroll up", () => triggerUserScroll(1));
+            AddStep("scroll down", () => triggerUserScroll(-1));
+        }
+
+        [Test]
+        public void TestCorrectSectionSelected()
+        {
+            const int sections_count = 11;
+            float[] alternating = { 0.07f, 0.33f, 0.16f, 0.33f };
+            AddStep("clear", () => container.Clear());
+            AddStep("fill with sections", () =>
+            {
+                for (int i = 0; i < sections_count; i++)
+                    append(alternating[i % alternating.Length]);
+            });
+
+            void step(int scrollIndex)
+            {
+                AddStep($"scroll to section {scrollIndex + 1}", () => container.ScrollTo(container.Children[scrollIndex]));
+                AddUntilStep("correct section selected", () => container.SelectedSection.Value == container.Children[scrollIndex]);
+            }
+
+            for (int i = 1; i < sections_count; i++)
+                step(i);
+            for (int i = sections_count - 2; i >= 0; i--)
+                step(i);
+
+            AddStep("scroll almost to end", () => container.ScrollTo(container.Children[sections_count - 2]));
+            AddUntilStep("correct section selected", () => container.SelectedSection.Value == container.Children[sections_count - 2]);
+            AddStep("scroll down", () => triggerUserScroll(-1));
+            AddUntilStep("correct section selected", () => container.SelectedSection.Value == container.Children[sections_count - 1]);
+        }
+
+        private static readonly ColourInfo selected_colour = ColourInfo.GradientVertical(Color4.Yellow, Color4.Gold);
+        private static readonly ColourInfo default_colour = ColourInfo.GradientVertical(Color4.White, Color4.DarkGray);
+
+        private void append(float multiplier)
+        {
+            container.Add(new TestSection
+            {
+                Width = 300,
+                Height = (container.ChildSize.Y - header_height) * multiplier,
+                Colour = default_colour
+            });
+        }
+
+        private void triggerUserScroll(float direction)
+        {
+            InputManager.MoveMouseTo(container);
+            InputManager.ScrollVerticalBy(direction);
+        }
+
+        private class TestSection : Box
+        {
+            public bool Selected
+            {
+                set => Colour = value ? selected_colour : default_colour;
+            }
+        }
+    }
+}

From 78c14fd69693f688f40595699eba849486f49463 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Tue, 22 Dec 2020 17:36:44 +0200
Subject: [PATCH 0504/3722] Refactor code into UserTrackingScrollContainer

---
 .../Graphics/Containers/SectionsContainer.cs  |  4 +-
 .../Containers/UserTrackingScrollContainer.cs | 49 +++++++++++++++++++
 osu.Game/Overlays/OverlayScrollContainer.cs   |  4 +-
 osu.Game/Overlays/UserProfileOverlay.cs       |  2 +-
 osu.Game/Screens/Select/BeatmapCarousel.cs    | 20 +-------
 5 files changed, 55 insertions(+), 24 deletions(-)
 create mode 100644 osu.Game/Graphics/Containers/UserTrackingScrollContainer.cs

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index 81968de304..6e9520ef8f 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Graphics.Containers
 
         protected override Container<T> Content => scrollContentContainer;
 
-        private readonly OsuScrollContainer scrollContainer;
+        private readonly UserTrackingScrollContainer scrollContainer;
         private readonly Container headerBackgroundContainer;
         private readonly MarginPadding originalSectionsMargin;
         private Drawable expandableHeader, fixedHeader, footer, headerBackground;
@@ -139,7 +139,7 @@ namespace osu.Game.Graphics.Containers
         public void ScrollToTop() => scrollContainer.ScrollTo(0);
 
         [NotNull]
-        protected virtual OsuScrollContainer CreateScrollContainer() => new OsuScrollContainer();
+        protected virtual UserTrackingScrollContainer CreateScrollContainer() => new UserTrackingScrollContainer();
 
         [NotNull]
         protected virtual FlowContainer<T> CreateScrollContentContainer() =>
diff --git a/osu.Game/Graphics/Containers/UserTrackingScrollContainer.cs b/osu.Game/Graphics/Containers/UserTrackingScrollContainer.cs
new file mode 100644
index 0000000000..b8ce34b204
--- /dev/null
+++ b/osu.Game/Graphics/Containers/UserTrackingScrollContainer.cs
@@ -0,0 +1,49 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+
+namespace osu.Game.Graphics.Containers
+{
+    public class UserTrackingScrollContainer : UserTrackingScrollContainer<Drawable>
+    {
+        public UserTrackingScrollContainer()
+        {
+        }
+
+        public UserTrackingScrollContainer(Direction direction)
+            : base(direction)
+        {
+        }
+    }
+
+    public class UserTrackingScrollContainer<T> : OsuScrollContainer<T>
+        where T : Drawable
+    {
+        /// <summary>
+        /// Whether the last scroll event was user triggered, directly on the scroll container.
+        /// </summary>
+        public bool UserScrolling { get; private set; }
+
+        public UserTrackingScrollContainer()
+        {
+        }
+
+        public UserTrackingScrollContainer(Direction direction)
+            : base(direction)
+        {
+        }
+
+        protected override void OnUserScroll(float value, bool animated = true, double? distanceDecay = default)
+        {
+            UserScrolling = true;
+            base.OnUserScroll(value, animated, distanceDecay);
+        }
+
+        public new void ScrollTo(float value, bool animated = true, double? distanceDecay = null)
+        {
+            UserScrolling = false;
+            base.ScrollTo(value, animated, distanceDecay);
+        }
+    }
+}
diff --git a/osu.Game/Overlays/OverlayScrollContainer.cs b/osu.Game/Overlays/OverlayScrollContainer.cs
index b67d5db1a4..0004719b87 100644
--- a/osu.Game/Overlays/OverlayScrollContainer.cs
+++ b/osu.Game/Overlays/OverlayScrollContainer.cs
@@ -17,9 +17,9 @@ using osuTK.Graphics;
 namespace osu.Game.Overlays
 {
     /// <summary>
-    /// <see cref="OsuScrollContainer"/> which provides <see cref="ScrollToTopButton"/>. Mostly used in <see cref="FullscreenOverlay{T}"/>.
+    /// <see cref="UserTrackingScrollContainer"/> which provides <see cref="ScrollToTopButton"/>. Mostly used in <see cref="FullscreenOverlay{T}"/>.
     /// </summary>
-    public class OverlayScrollContainer : OsuScrollContainer
+    public class OverlayScrollContainer : UserTrackingScrollContainer
     {
         /// <summary>
         /// Scroll position at which the <see cref="ScrollToTopButton"/> will be shown.
diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs
index 81027667fa..7f29545c2e 100644
--- a/osu.Game/Overlays/UserProfileOverlay.cs
+++ b/osu.Game/Overlays/UserProfileOverlay.cs
@@ -202,7 +202,7 @@ namespace osu.Game.Overlays
                 RelativeSizeAxes = Axes.Both;
             }
 
-            protected override OsuScrollContainer CreateScrollContainer() => new OverlayScrollContainer();
+            protected override UserTrackingScrollContainer CreateScrollContainer() => new OverlayScrollContainer();
 
             protected override FlowContainer<ProfileSection> CreateScrollContentContainer() => new FillFlowContainer<ProfileSection>
             {
diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index d76f0abb9e..e9a8d28316 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -901,15 +901,10 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        protected class CarouselScrollContainer : OsuScrollContainer<DrawableCarouselItem>
+        protected class CarouselScrollContainer : UserTrackingScrollContainer<DrawableCarouselItem>
         {
             private bool rightMouseScrollBlocked;
 
-            /// <summary>
-            /// Whether the last scroll event was user triggered, directly on the scroll container.
-            /// </summary>
-            public bool UserScrolling { get; private set; }
-
             public CarouselScrollContainer()
             {
                 // size is determined by the carousel itself, due to not all content necessarily being loaded.
@@ -919,19 +914,6 @@ namespace osu.Game.Screens.Select
                 Masking = false;
             }
 
-            // ReSharper disable once OptionalParameterHierarchyMismatch 2020.3 EAP4 bug. (https://youtrack.jetbrains.com/issue/RSRP-481535?p=RIDER-51910)
-            protected override void OnUserScroll(float value, bool animated = true, double? distanceDecay = default)
-            {
-                UserScrolling = true;
-                base.OnUserScroll(value, animated, distanceDecay);
-            }
-
-            public new void ScrollTo(float value, bool animated = true, double? distanceDecay = null)
-            {
-                UserScrolling = false;
-                base.ScrollTo(value, animated, distanceDecay);
-            }
-
             protected override bool OnMouseDown(MouseDownEvent e)
             {
                 if (e.Button == MouseButton.Right)

From 2cf76ebc75c6e0dc4bfbe428a9ee099c21a5eeb9 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <littleendu@gmail.com>
Date: Tue, 22 Dec 2020 17:51:12 +0200
Subject: [PATCH 0505/3722] Scroll to 20% and select section intersecting below
 there

---
 .../Graphics/Containers/SectionsContainer.cs  | 43 +++++++++++++++----
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index 6e9520ef8f..b5f81c516a 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -9,6 +9,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Layout;
+using osu.Framework.Utils;
 
 namespace osu.Game.Graphics.Containers
 {
@@ -20,6 +21,8 @@ namespace osu.Game.Graphics.Containers
         where T : Drawable
     {
         public Bindable<T> SelectedSection { get; } = new Bindable<T>();
+        private Drawable lastClickedSection;
+        private T smallestSection;
 
         public Drawable ExpandableHeader
         {
@@ -131,10 +134,21 @@ namespace osu.Game.Graphics.Containers
             lastKnownScroll = float.NaN;
             headerHeight = float.NaN;
             footerHeight = float.NaN;
+
+            if (drawable == null)
+                return;
+
+            if (smallestSection == null || smallestSection.Height > drawable.Height)
+                smallestSection = drawable;
         }
 
-        public void ScrollTo(Drawable section) =>
-            scrollContainer.ScrollTo(scrollContainer.GetChildPosInContent(section) - (FixedHeader?.BoundingBox.Height ?? 0));
+        private const float scroll_target_multiplier = 0.2f;
+
+        public void ScrollTo(Drawable section)
+        {
+            lastClickedSection = section;
+            scrollContainer.ScrollTo(scrollContainer.GetChildPosInContent(section) - scrollContainer.DisplayableContent * scroll_target_multiplier - (FixedHeader?.BoundingBox.Height ?? 0));
+        }
 
         public void ScrollToTop() => scrollContainer.ScrollTo(0);
 
@@ -183,6 +197,10 @@ namespace osu.Game.Graphics.Containers
             {
                 lastKnownScroll = currentScroll;
 
+                // reset last clicked section because user started scrolling themselves
+                if (scrollContainer.UserScrolling)
+                    lastClickedSection = null;
+
                 if (ExpandableHeader != null && FixedHeader != null)
                 {
                     float offset = Math.Min(ExpandableHeader.LayoutSize.Y, currentScroll);
@@ -194,18 +212,27 @@ namespace osu.Game.Graphics.Containers
                 headerBackgroundContainer.Height = (ExpandableHeader?.LayoutSize.Y ?? 0) + (FixedHeader?.LayoutSize.Y ?? 0);
                 headerBackgroundContainer.Y = ExpandableHeader?.Y ?? 0;
 
-                float scrollOffset = FixedHeader?.LayoutSize.Y ?? 0;
+                // scroll offset is our fixed header height if we have it plus 20% of content height
+                // plus 5% to fix floating point errors and to not have a section instantly unselect when scrolling upwards
+                // but the 5% can't be bigger than our smallest section height, otherwise it won't get selected correctly
+                float sectionOrContent = Math.Min(smallestSection?.Height / 2.0f ?? 0, scrollContainer.DisplayableContent * 0.05f);
+                float scrollOffset = (FixedHeader?.LayoutSize.Y ?? 0) + scrollContainer.DisplayableContent * scroll_target_multiplier + sectionOrContent;
                 Func<T, float> diff = section => scrollContainer.GetChildPosInContent(section) - currentScroll - scrollOffset;
 
-                if (scrollContainer.IsScrolledToEnd())
+                if (Precision.AlmostBigger(0, scrollContainer.Current))
                 {
-                    SelectedSection.Value = Children.LastOrDefault();
+                    SelectedSection.Value = lastClickedSection as T ?? Children.FirstOrDefault();
+                    return;
                 }
-                else
+
+                if (Precision.AlmostBigger(scrollContainer.Current, scrollContainer.ScrollableExtent))
                 {
-                    SelectedSection.Value = Children.TakeWhile(section => diff(section) <= 0).LastOrDefault()
-                                            ?? Children.FirstOrDefault();
+                    SelectedSection.Value = lastClickedSection as T ?? Children.LastOrDefault();
+                    return;
                 }
+
+                SelectedSection.Value = Children.TakeWhile(section => diff(section) <= 0).LastOrDefault()
+                                        ?? Children.FirstOrDefault();
             }
         }
 

From 5efc3b94961cf918fa96b54818382e89b2cd9faf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 22 Dec 2020 21:12:28 +0100
Subject: [PATCH 0506/3722] Start state display as hidden

Would otherwise flicker for a few frames when a new user was added to
the list of participants.
---
 .../Multi/RealtimeMultiplayer/Participants/StateDisplay.cs       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/StateDisplay.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/StateDisplay.cs
index db93525217..844f239363 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/StateDisplay.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/StateDisplay.cs
@@ -18,6 +18,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Participants
         public StateDisplay()
         {
             AutoSizeAxes = Axes.Both;
+            Alpha = 0;
         }
 
         private MultiplayerUserState status;

From 4a677ecc190f0ec7b354db5f2436349353cd9f2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 22 Dec 2020 21:16:45 +0100
Subject: [PATCH 0507/3722] Make random state choice in test more robust

`RNG.Next(int, int)` is max-exclusive, so the random state choice would
actually never pick `MultiplayerUserState.Results` on its own. The only
reason why that state ever did show up was by a freak accident of sorts
(the logic in `TestRealtimeMultiplayerClient` would automatically
convert every `FinishedPlay` state to `Results`, up until seeing the
first player that was in the `Playing` state).
---
 .../TestSceneRealtimeMultiplayerParticipantsList.cs             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayerParticipantsList.cs
index 7fd31906f7..4221821496 100644
--- a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayerParticipantsList.cs
@@ -109,7 +109,7 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
                         CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
                     });
 
-                    Client.ChangeUserState(i, (MultiplayerUserState)RNG.Next(0, (int)MultiplayerUserState.Results));
+                    Client.ChangeUserState(i, (MultiplayerUserState)RNG.Next(0, (int)MultiplayerUserState.Results + 1));
                 }
             });
         }

From 32728047044a426d2c076cc143d836412d53b7a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 22 Dec 2020 22:31:40 +0100
Subject: [PATCH 0508/3722] Fix potential crash when no submission token

Can happen because `TimeshiftPlayer` will schedule a screen exit on
token retrieval failure, and `RealtimePlayer`'s BDL won't even attempt
to create a leaderboard in that case.
---
 .../Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index 453e7e6140..7824b414f2 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -6,6 +6,7 @@ using System.Diagnostics;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
@@ -33,6 +34,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         private readonly TaskCompletionSource<bool> resultsReady = new TaskCompletionSource<bool>();
         private readonly ManualResetEventSlim startedEvent = new ManualResetEventSlim();
 
+        [CanBeNull]
         private MultiplayerGameplayLeaderboard leaderboard;
 
         public RealtimePlayer(PlaylistItem playlistItem)
@@ -72,6 +74,13 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         protected override void Update()
         {
             base.Update();
+            adjustLeaderboardPosition();
+        }
+
+        private void adjustLeaderboardPosition()
+        {
+            if (leaderboard == null)
+                return;
 
             const float padding = 44; // enough margin to avoid the hit error display.
 

From 7751ef4f3eadf4fa4583e3815bc6f3a95c5c354b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 23 Dec 2020 05:49:18 +0300
Subject: [PATCH 0509/3722] Revert previous logic of join guarding

---
 osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs        | 2 --
 .../Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs     | 2 --
 .../Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs   | 2 --
 osu.Game/Screens/Multi/Components/RoomManager.cs            | 2 --
 osu.Game/Screens/Multi/IRoomManager.cs                      | 6 ------
 osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs  | 4 +---
 .../Multi/RealtimeMultiplayer/RealtimeRoomManager.cs        | 3 ---
 7 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs b/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs
index ea8fb4ef49..9dd4aea4bd 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs
@@ -24,8 +24,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         public void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null) => Rooms.Add(room);
 
-        public bool CanJoinRoom(Room room) => true;
-
         public void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
         {
         }
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
index 55dbd1a7c6..1fcae9c709 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
@@ -146,8 +146,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     onSuccess?.Invoke(room);
             }
 
-            public bool CanJoinRoom(Room room) => true;
-
             public void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null) => throw new NotImplementedException();
 
             public void PartRoom() => throw new NotImplementedException();
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs
index 8fdb5d4093..bbd7d84081 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs
@@ -161,8 +161,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 onSuccess?.Invoke(room);
             }
 
-            public bool CanJoinRoom(Room room) => true;
-
             public void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null) => onSuccess?.Invoke(room);
 
             public void PartRoom()
diff --git a/osu.Game/Screens/Multi/Components/RoomManager.cs b/osu.Game/Screens/Multi/Components/RoomManager.cs
index 3fcfe1df25..f78d0d979e 100644
--- a/osu.Game/Screens/Multi/Components/RoomManager.cs
+++ b/osu.Game/Screens/Multi/Components/RoomManager.cs
@@ -82,8 +82,6 @@ namespace osu.Game.Screens.Multi.Components
             api.Queue(req);
         }
 
-        public virtual bool CanJoinRoom(Room room) => true;
-
         private JoinRoomRequest currentJoinRoomRequest;
 
         public virtual void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
diff --git a/osu.Game/Screens/Multi/IRoomManager.cs b/osu.Game/Screens/Multi/IRoomManager.cs
index a1cff129a9..630e3af91c 100644
--- a/osu.Game/Screens/Multi/IRoomManager.cs
+++ b/osu.Game/Screens/Multi/IRoomManager.cs
@@ -34,12 +34,6 @@ namespace osu.Game.Screens.Multi
         /// <param name="onError">An action to be invoked if an error occurred.</param>
         void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null);
 
-        /// <summary>
-        /// Whether the provided <paramref name="room"/> can be joined.
-        /// </summary>
-        /// <param name="room">The <see cref="Room"/> to check for.</param>
-        bool CanJoinRoom(Room room);
-
         /// <summary>
         /// Joins a <see cref="Room"/>.
         /// </summary>
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
index c1f69b779c..c7c37cbc0d 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
@@ -115,9 +115,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
                     {
                         if (room == selectedRoom.Value)
                         {
-                            if (roomManager.CanJoinRoom(room))
-                                joinSelected();
-
+                            joinSelected();
                             return;
                         }
 
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index d8dc5f127a..7ce031e0e9 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -9,7 +9,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Logging;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Online.Multiplayer.RoomStatuses;
 using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Screens.Multi.Components;
 
@@ -41,8 +40,6 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         public override void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
             => base.CreateRoom(room, r => joinMultiplayerRoom(r, onSuccess, onError), onError);
 
-        public override bool CanJoinRoom(Room room) => !(room.Status.Value is RoomStatusEnded);
-
         public override void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
             => base.JoinRoom(room, r => joinMultiplayerRoom(r, onSuccess, onError), onError);
 

From 3aa2b228380ccc8a2ce3e9043c5dcd43a80a6b97 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 23 Dec 2020 05:52:10 +0300
Subject: [PATCH 0510/3722] Add early check for room status before joining

---
 .../Multi/RealtimeMultiplayer/RealtimeRoomManager.cs  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index 7ce031e0e9..484d5cce0b 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -9,6 +9,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Logging;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Multiplayer.RoomStatuses;
 using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Screens.Multi.Components;
 
@@ -41,7 +42,15 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             => base.CreateRoom(room, r => joinMultiplayerRoom(r, onSuccess, onError), onError);
 
         public override void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
-            => base.JoinRoom(room, r => joinMultiplayerRoom(r, onSuccess, onError), onError);
+        {
+            if (room.Status.Value is RoomStatusEnded)
+            {
+                onError?.Invoke("Cannot join an ended room.");
+                return;
+            }
+
+            base.JoinRoom(room, r => joinMultiplayerRoom(r, onSuccess, onError), onError);
+        }
 
         public override void PartRoom()
         {

From 45dcd3242db7cc84753577d4de75ba571e75deb0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Dec 2020 13:57:48 +0900
Subject: [PATCH 0511/3722] Add comment explaining why things are done where
 they are

---
 .../Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index 484d5cce0b..f982574eb3 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -43,6 +43,8 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
         public override void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
         {
+            // this is done here as a pre-check to avoid clicking on already closed rooms in the lounge from triggering a server join.
+            // should probably be done at a higher level, but due to the current structure of things this is the easiest place for now.
             if (room.Status.Value is RoomStatusEnded)
             {
                 onError?.Invoke("Cannot join an ended room.");

From be427a4ec0fd7f30189f3b37941844483ad95d62 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Dec 2020 14:20:35 +0900
Subject: [PATCH 0512/3722] Fix realtime leaderboard showing accuracy based on
 final base score, not rolling

---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs | 23 ++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 10d0cc2865..4b2e2bf715 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -233,7 +233,7 @@ namespace osu.Game.Rulesets.Scoring
         }
 
         /// <summary>
-        /// Given a minimal set of inputs, return the computed score and accuracy for the tracked beatmap / mods combination.
+        /// Given a minimal set of inputs, return the computed score and accuracy for the tracked beatmap / mods combination, at the current point in time.
         /// </summary>
         /// <param name="mode">The <see cref="ScoringMode"/> to compute the total score in.</param>
         /// <param name="maxCombo">The maximum combo achievable in the beatmap.</param>
@@ -252,15 +252,28 @@ namespace osu.Game.Rulesets.Scoring
                 computedBaseScore += Judgement.ToNumericResult(pair.Key) * pair.Value;
             }
 
-            double accuracy = calculateAccuracyRatio(computedBaseScore);
+            double pointInTimeAccuracy = calculateAccuracyRatio(computedBaseScore, true);
             double comboRatio = calculateComboRatio(maxCombo);
 
-            double score = GetScore(mode, maxAchievableCombo, accuracy, comboRatio, scoreResultCounts);
+            double score = GetScore(mode, maxAchievableCombo, calculateAccuracyRatio(computedBaseScore), comboRatio, scoreResultCounts);
 
-            return (score, accuracy);
+            return (score, pointInTimeAccuracy);
+        }
+
+        /// <summary>
+        /// Get the accuracy fraction for the provided base score.
+        /// </summary>
+        /// <param name="baseScore">The score to be used for accuracy calculation.</param>
+        /// <param name="preferRolling">Whether the rolling base score should be used (ie. for the current point in time based on Apply/Reverted results).</param>
+        /// <returns>The computed accuracy.</returns>
+        private double calculateAccuracyRatio(double baseScore, bool preferRolling = false)
+        {
+            if (preferRolling && rollingMaxBaseScore != 0)
+                return baseScore / rollingMaxBaseScore;
+
+            return maxBaseScore > 0 ? baseScore / maxBaseScore : 0;
         }
 
-        private double calculateAccuracyRatio(double baseScore) => maxBaseScore > 0 ? baseScore / maxBaseScore : 0;
         private double calculateComboRatio(int maxCombo) => maxAchievableCombo > 0 ? (double)maxCombo / maxAchievableCombo : 1;
 
         private double getBonusScore(Dictionary<HitResult, int> statistics)

From dec997c0f49687800b9c90641299d38b4c9e060d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Dec 2020 14:44:20 +0900
Subject: [PATCH 0513/3722] Fix flashlight not updating its position during
 replay rewinding

Closes #11260
---
 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 ac20407ed2..3f770cfb5e 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                 var destination = e.MousePosition;
 
                 FlashlightPosition = Interpolation.ValueAt(
-                    Math.Clamp(Clock.ElapsedFrameTime, 0, follow_delay), position, destination, 0, follow_delay, Easing.Out);
+                    Math.Clamp(Math.Abs(Clock.ElapsedFrameTime), 0, follow_delay), position, destination, 0, follow_delay, Easing.Out);
 
                 return base.OnMouseMove(e);
             }

From 286884421d74d8cd565533bdd723448b88416dc3 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 23 Dec 2020 08:47:34 +0300
Subject: [PATCH 0514/3722] Apply track looping and play on track change

---
 osu.Game/Screens/Multi/Match/RoomSubScreen.cs | 72 ++++++++++---------
 1 file changed, 37 insertions(+), 35 deletions(-)

diff --git a/osu.Game/Screens/Multi/Match/RoomSubScreen.cs b/osu.Game/Screens/Multi/Match/RoomSubScreen.cs
index 21316a98ce..4f5d2a5b3e 100644
--- a/osu.Game/Screens/Multi/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/RoomSubScreen.cs
@@ -41,6 +41,37 @@ namespace osu.Game.Screens.Multi.Match
 
             managerUpdated = beatmapManager.ItemUpdated.GetBoundCopy();
             managerUpdated.BindValueChanged(beatmapUpdated);
+
+            if (music != null)
+                music.TrackChanged += applyToTrack;
+        }
+
+        public override void OnEntering(IScreen last)
+        {
+            base.OnEntering(last);
+            applyToTrack();
+        }
+
+        public override void OnSuspending(IScreen next)
+        {
+            resetTrack();
+            base.OnSuspending(next);
+        }
+
+        public override void OnResuming(IScreen last)
+        {
+            base.OnResuming(last);
+            applyToTrack();
+        }
+
+        public override bool OnExiting(IScreen next)
+        {
+            RoomManager?.PartRoom();
+            Mods.Value = Array.Empty<Mod>();
+
+            resetTrack();
+
+            return base.OnExiting(next);
         }
 
         private void selectedItemChanged()
@@ -65,54 +96,25 @@ namespace osu.Game.Screens.Multi.Match
             var localBeatmap = beatmap == null ? null : beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == beatmap.OnlineBeatmapID);
 
             Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
-            if (this.IsCurrentScreen())
-                applyTrackLooping();
         }
 
-        public override void OnEntering(IScreen last)
+        private void applyToTrack(WorkingBeatmap _ = default, TrackChangeDirection __ = default)
         {
-            base.OnEntering(last);
+            if (!this.IsCurrentScreen())
+                return;
 
-            music?.EnsurePlayingSomething();
-            applyTrackLooping();
-        }
-
-        public override void OnSuspending(IScreen next)
-        {
-            cancelTrackLooping();
-            base.OnSuspending(next);
-        }
-
-        public override void OnResuming(IScreen last)
-        {
-            base.OnResuming(last);
-
-            music?.EnsurePlayingSomething();
-            applyTrackLooping();
-        }
-
-        public override bool OnExiting(IScreen next)
-        {
-            RoomManager?.PartRoom();
-            Mods.Value = Array.Empty<Mod>();
-
-            cancelTrackLooping();
-
-            return base.OnExiting(next);
-        }
-
-        private void applyTrackLooping()
-        {
             var track = Beatmap.Value?.Track;
 
             if (track != null)
             {
                 track.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
                 track.Looping = true;
+
+                music?.EnsurePlayingSomething();
             }
         }
 
-        private void cancelTrackLooping()
+        private void resetTrack()
         {
             var track = Beatmap?.Value?.Track;
 

From 00d50150de6e39cbdff44e7f5a98c41a3c57b6a6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Dec 2020 15:49:22 +0900
Subject: [PATCH 0515/3722] Ensure the current room is left at a mutliplayer
 client level on client disconnection

---
 .../RealtimeMultiplayer/RealtimeMultiplayerClient.cs   |  4 ++++
 .../RealtimeMultiplayer/StatefulMultiplayerClient.cs   | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
index 75bb578a29..5cbf3be8ca 100644
--- a/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
@@ -130,7 +130,11 @@ namespace osu.Game.Online.RealtimeMultiplayer
         public override async Task LeaveRoom()
         {
             if (!isConnected.Value)
+            {
+                // even if not connected, make sure the local room state can be cleaned up.
+                await base.LeaveRoom();
                 return;
+            }
 
             if (Room == null)
                 return;
diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
index 4ebd648689..9680387fcc 100644
--- a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
@@ -75,6 +75,16 @@ namespace osu.Game.Online.RealtimeMultiplayer
         // Todo: This is temporary, until the multiplayer server returns the item id on match start or otherwise.
         private int playlistItemId;
 
+        protected StatefulMultiplayerClient()
+        {
+            IsConnected.BindValueChanged(connected =>
+            {
+                // clean up local room state on server disconnect.
+                if (!connected.NewValue)
+                    LeaveRoom();
+            });
+        }
+
         /// <summary>
         /// Joins the <see cref="MultiplayerRoom"/> for a given API <see cref="Room"/>.
         /// </summary>

From 12df3056e6d27d2da5d29a172708e849162eaa3c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Dec 2020 15:58:50 +0900
Subject: [PATCH 0516/3722] Ensure appropriate screens handle exiting when the
 server gets disconnected

I would have liked for this to be handled via the `OnRoomChanged` event
flow, but this isn't present in RealtimeMatchSubScreen due to
inheritence woes.
---
 .../RealtimeMultiplayer/RealtimeMatchSubScreen.cs  | 14 ++++++++++++++
 .../Multi/RealtimeMultiplayer/RealtimePlayer.cs    | 12 ++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
index cdab1435c0..8405fc196b 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
@@ -4,8 +4,10 @@
 using System.Collections.Specialized;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.RealtimeMultiplayer;
@@ -34,6 +36,8 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
         private RealtimeMatchSettingsOverlay settingsOverlay;
 
+        private IBindable<bool> isConnected;
+
         public RealtimeMatchSubScreen(Room room)
         {
             Title = room.RoomID.Value == null ? "New match" : room.Name.Value;
@@ -173,6 +177,16 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             Playlist.BindCollectionChanged(onPlaylistChanged, true);
 
             client.LoadRequested += onLoadRequested;
+
+            isConnected = client.IsConnected.GetBoundCopy();
+            isConnected.BindValueChanged(connected =>
+            {
+                if (!connected.NewValue)
+                {
+                    Logger.Log("Connection to multiplayer server was lost.", LoggingTarget.Runtime, LogLevel.Important);
+                    Schedule(this.Exit);
+                }
+            }, true);
         }
 
         public override bool OnBackButton()
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index c6d44686b5..d74ccdd32f 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -6,6 +6,7 @@ using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Online.Multiplayer;
@@ -30,6 +31,8 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         private readonly TaskCompletionSource<bool> resultsReady = new TaskCompletionSource<bool>();
         private readonly ManualResetEventSlim startedEvent = new ManualResetEventSlim();
 
+        private IBindable<bool> isConnected;
+
         public RealtimePlayer(PlaylistItem playlistItem)
             : base(playlistItem, false)
         {
@@ -43,6 +46,15 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
             client.MatchStarted += onMatchStarted;
             client.ResultsReady += onResultsReady;
+
+            isConnected = client.IsConnected.GetBoundCopy();
+            isConnected.BindValueChanged(connected =>
+            {
+                if (!connected.NewValue)
+                    // messaging to the user about this disconnect will be provided by the RealtimeMatchSubScreen.
+                    Schedule(this.Exit);
+            }, true);
+
             client.ChangeState(MultiplayerUserState.Loaded);
 
             if (!startedEvent.Wait(TimeSpan.FromSeconds(30)))

From a1d42dc4a061a8fb2f50064c485cbd3cf07186be Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Dec 2020 16:17:55 +0900
Subject: [PATCH 0517/3722] Don't allow creating or joining a room when not
 connected to server

---
 .../Screens/Multi/Lounge/LoungeSubScreen.cs     |  2 +-
 .../RealtimeLoungeSubScreen.cs                  | 17 +++++++++++++++++
 .../RealtimeMultiplayer/RealtimeRoomManager.cs  |  6 ++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
index 44c893363b..6b08745dd7 100644
--- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
@@ -184,7 +184,7 @@ namespace osu.Game.Screens.Multi.Lounge
         /// <summary>
         /// Push a room as a new subscreen.
         /// </summary>
-        public void Open(Room room)
+        public virtual void Open(Room room)
         {
             // Handles the case where a room is clicked 3 times in quick succession
             if (!this.IsCurrentScreen())
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.cs
index 9fbf0c4654..b53ec94519 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.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 osu.Framework.Allocation;
+using osu.Framework.Logging;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Lounge.Components;
 using osu.Game.Screens.Multi.Match;
@@ -13,5 +16,19 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         protected override FilterControl CreateFilterControl() => new RealtimeFilterControl();
 
         protected override RoomSubScreen CreateRoomSubScreen(Room room) => new RealtimeMatchSubScreen(room);
+
+        [Resolved]
+        private StatefulMultiplayerClient client { get; set; }
+
+        public override void Open(Room room)
+        {
+            if (!client.IsConnected.Value)
+            {
+                Logger.Log("Not currently connected to the multiplayer server.", LoggingTarget.Runtime, LogLevel.Important);
+                return;
+            }
+
+            base.Open(room);
+        }
     }
 }
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index f982574eb3..2f60f504de 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -43,6 +43,12 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
         public override void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
         {
+            if (!multiplayerClient.IsConnected.Value)
+            {
+                onError?.Invoke("Not currently connected to the multiplayer server.");
+                return;
+            }
+
             // this is done here as a pre-check to avoid clicking on already closed rooms in the lounge from triggering a server join.
             // should probably be done at a higher level, but due to the current structure of things this is the easiest place for now.
             if (room.Status.Value is RoomStatusEnded)

From 569c4092efe42a55caabc5a08c7f7bc227f3b1e3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Dec 2020 16:19:03 +0900
Subject: [PATCH 0518/3722] Move notification to stateful client so it is only
 shown to the user from one location

---
 .../RealtimeMultiplayer/StatefulMultiplayerClient.cs       | 4 ++++
 .../Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs    | 7 ++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
index 9680387fcc..79d82a8d02 100644
--- a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
@@ -11,6 +11,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
+using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
 using osu.Game.Online.API;
@@ -81,7 +82,10 @@ namespace osu.Game.Online.RealtimeMultiplayer
             {
                 // clean up local room state on server disconnect.
                 if (!connected.NewValue)
+                {
+                    Logger.Log("Connection to multiplayer server was lost.", LoggingTarget.Runtime, LogLevel.Important);
                     LeaveRoom();
+                }
             });
         }
 
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
index 8405fc196b..807ea74404 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
@@ -7,7 +7,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.RealtimeMultiplayer;
@@ -18,6 +17,7 @@ using osu.Game.Screens.Multi.RealtimeMultiplayer.Match;
 using osu.Game.Screens.Multi.RealtimeMultiplayer.Participants;
 using osu.Game.Screens.Play;
 using osu.Game.Users;
+using ParticipantsList = osu.Game.Screens.Multi.RealtimeMultiplayer.Participants.ParticipantsList;
 
 namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 {
@@ -106,7 +106,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
                                                                     new Drawable[] { new ParticipantsListHeader() },
                                                                     new Drawable[]
                                                                     {
-                                                                        new Participants.ParticipantsList
+                                                                        new ParticipantsList
                                                                         {
                                                                             RelativeSizeAxes = Axes.Both
                                                                         },
@@ -182,10 +182,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             isConnected.BindValueChanged(connected =>
             {
                 if (!connected.NewValue)
-                {
-                    Logger.Log("Connection to multiplayer server was lost.", LoggingTarget.Runtime, LogLevel.Important);
                     Schedule(this.Exit);
-                }
             }, true);
         }
 

From f5d27b40a8f5c9dd8b3e849360425ed540b79c39 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Dec 2020 16:32:58 +0900
Subject: [PATCH 0519/3722] Standardise flow for aborting realtime player exit
 to avoid double-exit call

---
 .../Multi/RealtimeMultiplayer/RealtimePlayer.cs      | 12 ++++++------
 osu.Game/Screens/Play/Player.cs                      |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index d74ccdd32f..edec40890e 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -51,8 +51,12 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             isConnected.BindValueChanged(connected =>
             {
                 if (!connected.NewValue)
+                {
+                    startedEvent.Set();
+
                     // messaging to the user about this disconnect will be provided by the RealtimeMatchSubScreen.
-                    Schedule(this.Exit);
+                    Schedule(PerformImmediateExit);
+                }
             }, true);
 
             client.ChangeState(MultiplayerUserState.Loaded);
@@ -61,11 +65,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             {
                 Logger.Log("Failed to start the multiplayer match in time.", LoggingTarget.Runtime, LogLevel.Important);
 
-                Schedule(() =>
-                {
-                    ValidForResume = false;
-                    this.Exit();
-                });
+                Schedule(PerformImmediateExit);
             }
         }
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index c539dff5d9..c6265c48d2 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -386,7 +386,7 @@ namespace osu.Game.Screens.Play
                         if (!this.IsCurrentScreen()) return;
 
                         fadeOut(true);
-                        performImmediateExit();
+                        PerformImmediateExit();
                     },
                 },
                 failAnimation = new FailAnimation(DrawableRuleset) { OnComplete = onFailComplete, },
@@ -458,7 +458,7 @@ namespace osu.Game.Screens.Play
             return playable;
         }
 
-        private void performImmediateExit()
+        protected void PerformImmediateExit()
         {
             // if a restart has been requested, cancel any pending completion (user has shown intent to restart).
             completionProgressDelegate?.Cancel();
@@ -498,7 +498,7 @@ namespace osu.Game.Screens.Play
             RestartRequested?.Invoke();
 
             if (this.IsCurrentScreen())
-                performImmediateExit();
+                PerformImmediateExit();
             else
                 this.MakeCurrent();
         }

From 91021eb8c45b0826bf0503cc9d5d4fac822fe005 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Dec 2020 16:49:17 +0900
Subject: [PATCH 0520/3722] Remove unused using

---
 osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index edec40890e..9e2ba9b04a 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -8,7 +8,6 @@ using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Logging;
-using osu.Framework.Screens;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Scoring;

From d27b83d678bb4c9f0525b685880a5e9dd136ee90 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Dec 2020 16:51:11 +0900
Subject: [PATCH 0521/3722] More correctly handle fire-and-forget async call

---
 .../RealtimeMultiplayer/RealtimePlayer.cs     | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index 9e2ba9b04a..0f8c0f247c 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -51,21 +51,25 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             {
                 if (!connected.NewValue)
                 {
-                    startedEvent.Set();
-
                     // messaging to the user about this disconnect will be provided by the RealtimeMatchSubScreen.
-                    Schedule(PerformImmediateExit);
+                    failAndBail();
                 }
             }, true);
 
-            client.ChangeState(MultiplayerUserState.Loaded);
+            client.ChangeState(MultiplayerUserState.Loaded).ContinueWith(task =>
+                failAndBail(task.Exception?.Message ?? "Server error"), TaskContinuationOptions.NotOnRanToCompletion);
 
             if (!startedEvent.Wait(TimeSpan.FromSeconds(30)))
-            {
-                Logger.Log("Failed to start the multiplayer match in time.", LoggingTarget.Runtime, LogLevel.Important);
+                failAndBail("Failed to start the multiplayer match in time.");
+        }
 
-                Schedule(PerformImmediateExit);
-            }
+        private void failAndBail(string message = null)
+        {
+            if (!string.IsNullOrEmpty(message))
+                Logger.Log(message, LoggingTarget.Runtime, LogLevel.Important);
+
+            startedEvent.Set();
+            Schedule(PerformImmediateExit);
         }
 
         private void onMatchStarted() => startedEvent.Set();

From c3c3364d399b915f9d0d3044dc3cd045830bd3dd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Dec 2020 16:56:51 +0900
Subject: [PATCH 0522/3722] Simplify error handling of JoinRoom call

---
 .../RealtimeRoomManager.cs                    | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index 2f60f504de..8bdf2bdc1a 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -83,15 +83,19 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         {
             Debug.Assert(room.RoomID.Value != null);
 
-            var joinTask = multiplayerClient.JoinRoom(room);
-            joinTask.ContinueWith(_ => Schedule(() => onSuccess?.Invoke(room)), TaskContinuationOptions.OnlyOnRanToCompletion);
-            joinTask.ContinueWith(t =>
+            multiplayerClient.JoinRoom(room).ContinueWith(t =>
             {
-                PartRoom();
-                if (t.Exception != null)
-                    Logger.Error(t.Exception, "Failed to join multiplayer room.");
-                Schedule(() => onError?.Invoke(t.Exception?.ToString() ?? string.Empty));
-            }, TaskContinuationOptions.NotOnRanToCompletion);
+                if (t.IsCompletedSuccessfully)
+                    Schedule(() => onSuccess?.Invoke(room));
+                else
+                {
+                    if (t.Exception != null)
+                        Logger.Error(t.Exception, "Failed to join multiplayer room.");
+
+                    PartRoom();
+                    Schedule(() => onError?.Invoke(t.Exception?.ToString() ?? string.Empty));
+                }
+            });
         }
 
         private void updatePolling()

From 1864da00e69806eefb389fd0a5742c0477eb419d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Dec 2020 17:10:02 +0900
Subject: [PATCH 0523/3722] Add extension method to handle cases of
 fire-and-forget async usage

---
 osu.Game/Extensions/TaskExtensions.cs | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 osu.Game/Extensions/TaskExtensions.cs

diff --git a/osu.Game/Extensions/TaskExtensions.cs b/osu.Game/Extensions/TaskExtensions.cs
new file mode 100644
index 0000000000..913a622d9b
--- /dev/null
+++ b/osu.Game/Extensions/TaskExtensions.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.Threading.Tasks;
+using osu.Framework.Logging;
+
+namespace osu.Game.Extensions
+{
+    public static class TaskExtensions
+    {
+        /// <summary>
+        /// Denote a task which is to be run without local error handling logic, where failure is not catastrophic.
+        /// Avoids unobserved exceptions from being fired.
+        /// </summary>
+        /// <param name="task">The task.</param>
+        /// <param name="logOnError">Whether errors should be logged as important, or silently ignored.</param>
+        public static void FireAndForget(this Task task, bool logOnError = false)
+        {
+            task.ContinueWith(t =>
+            {
+                if (logOnError)
+                    Logger.Log($"Error running task: {t.Exception?.Message ?? "unknown"}", LoggingTarget.Runtime, LogLevel.Important);
+            }, TaskContinuationOptions.NotOnRanToCompletion);
+        }
+    }
+}

From 7cc38f03d10a44c30c5edb59e28f2bdc46e377dd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Dec 2020 17:10:34 +0900
Subject: [PATCH 0524/3722] Use extension method in all call sites of
 fire-and-forget async usage

---
 .../RealtimeMultiplayer/StatefulMultiplayerClient.cs       | 5 +++--
 .../Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs | 7 ++++---
 .../RealtimeMultiplayer/Participants/ParticipantPanel.cs   | 3 ++-
 .../Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs   | 2 +-
 .../Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs       | 3 ++-
 .../Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs    | 4 ++--
 .../Multi/RealtimeMultiplayer/RealtimeRoomManager.cs       | 4 +++-
 7 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
index 79d82a8d02..3196f10f6f 100644
--- a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 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
@@ -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.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
@@ -84,7 +85,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
                 if (!connected.NewValue)
                 {
                     Logger.Log("Connection to multiplayer server was lost.", LoggingTarget.Runtime, LogLevel.Important);
-                    LeaveRoom();
+                    LeaveRoom().FireAndForget();
                 }
             });
         }
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs
index 09487e9831..59f9d5e1ec 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs
@@ -7,6 +7,7 @@ using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Game.Extensions;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
 using osu.Game.Online.API;
@@ -105,13 +106,13 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
                 return;
 
             if (localUser.State == MultiplayerUserState.Idle)
-                Client.ChangeState(MultiplayerUserState.Ready);
+                Client.ChangeState(MultiplayerUserState.Ready).FireAndForget(true);
             else
             {
                 if (Room?.Host?.Equals(localUser) == true)
-                    Client.StartMatch();
+                    Client.StartMatch().FireAndForget(true);
                 else
-                    Client.ChangeState(MultiplayerUserState.Idle);
+                    Client.ChangeState(MultiplayerUserState.Idle).FireAndForget(true);
             }
         }
 
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs
index a4ff2ce346..fd16754045 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
+using osu.Game.Extensions;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
@@ -176,7 +177,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Participants
                         if (Room.Host?.UserID != api.LocalUser.Value.Id)
                             return;
 
-                        Client.TransferHost(targetUser);
+                        Client.TransferHost(targetUser).FireAndForget(true);
                     })
                 };
             }
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
index f3dab93089..4a8e398008 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
                 client.ChangeSettings(item: item).ContinueWith(t =>
                 {
-                    return Schedule(() =>
+                    Schedule(() =>
                     {
                         loadingLayer.Hide();
 
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
index 6455701d31..d5b891f2cc 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
+using osu.Game.Extensions;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Screens.Multi.Components;
@@ -21,7 +22,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             base.OnResuming(last);
 
             if (client.Room != null)
-                client.ChangeState(MultiplayerUserState.Idle);
+                client.ChangeState(MultiplayerUserState.Idle).FireAndForget(true);
         }
 
         protected override void UpdatePollingRate(bool isIdle)
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index 0f8c0f247c..7c6b33cddd 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -56,8 +56,8 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
                 }
             }, true);
 
-            client.ChangeState(MultiplayerUserState.Loaded).ContinueWith(task =>
-                failAndBail(task.Exception?.Message ?? "Server error"), TaskContinuationOptions.NotOnRanToCompletion);
+            client.ChangeState(MultiplayerUserState.Loaded)
+                  .ContinueWith(task => failAndBail(task.Exception?.Message ?? "Server error"), TaskContinuationOptions.NotOnRanToCompletion);
 
             if (!startedEvent.Wait(TimeSpan.FromSeconds(30)))
                 failAndBail("Failed to start the multiplayer match in time.");
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index 8bdf2bdc1a..98a0e5b694 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -8,6 +8,7 @@ using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Logging;
+using osu.Game.Extensions;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Multiplayer.RoomStatuses;
 using osu.Game.Online.RealtimeMultiplayer;
@@ -68,7 +69,8 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             var joinedRoom = JoinedRoom.Value;
 
             base.PartRoom();
-            multiplayerClient.LeaveRoom();
+
+            multiplayerClient.LeaveRoom().FireAndForget();
 
             // Todo: This is not the way to do this. Basically when we're the only participant and the room closes, there's no way to know if this is actually the case.
             // This is delayed one frame because upon exiting the match subscreen, multiplayer updates the polling rate and messes with polling.

From 0ddcab574f05416953361e920a1af22856a16828 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Dec 2020 17:14:58 +0900
Subject: [PATCH 0525/3722] Rename method to avoid weird code analysis rule

---
 osu.Game/Extensions/TaskExtensions.cs                       | 2 +-
 .../Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs | 2 +-
 .../Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs  | 6 +++---
 .../RealtimeMultiplayer/Participants/ParticipantPanel.cs    | 2 +-
 .../Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs        | 2 +-
 .../Multi/RealtimeMultiplayer/RealtimeRoomManager.cs        | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Extensions/TaskExtensions.cs b/osu.Game/Extensions/TaskExtensions.cs
index 913a622d9b..a1215d786b 100644
--- a/osu.Game/Extensions/TaskExtensions.cs
+++ b/osu.Game/Extensions/TaskExtensions.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Extensions
         /// </summary>
         /// <param name="task">The task.</param>
         /// <param name="logOnError">Whether errors should be logged as important, or silently ignored.</param>
-        public static void FireAndForget(this Task task, bool logOnError = false)
+        public static void CatchUnobservedExceptions(this Task task, bool logOnError = false)
         {
             task.ContinueWith(t =>
             {
diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
index 3196f10f6f..7b375ca475 100644
--- a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
                 if (!connected.NewValue)
                 {
                     Logger.Log("Connection to multiplayer server was lost.", LoggingTarget.Runtime, LogLevel.Important);
-                    LeaveRoom().FireAndForget();
+                    LeaveRoom().CatchUnobservedExceptions();
                 }
             });
         }
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs
index 59f9d5e1ec..5bead2b271 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs
@@ -106,13 +106,13 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
                 return;
 
             if (localUser.State == MultiplayerUserState.Idle)
-                Client.ChangeState(MultiplayerUserState.Ready).FireAndForget(true);
+                Client.ChangeState(MultiplayerUserState.Ready).CatchUnobservedExceptions(true);
             else
             {
                 if (Room?.Host?.Equals(localUser) == true)
-                    Client.StartMatch().FireAndForget(true);
+                    Client.StartMatch().CatchUnobservedExceptions(true);
                 else
-                    Client.ChangeState(MultiplayerUserState.Idle).FireAndForget(true);
+                    Client.ChangeState(MultiplayerUserState.Idle).CatchUnobservedExceptions(true);
             }
         }
 
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs
index fd16754045..85393d1bae 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs
@@ -177,7 +177,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Participants
                         if (Room.Host?.UserID != api.LocalUser.Value.Id)
                             return;
 
-                        Client.TransferHost(targetUser).FireAndForget(true);
+                        Client.TransferHost(targetUser).CatchUnobservedExceptions(true);
                     })
                 };
             }
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
index d5b891f2cc..6685cf52d6 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             base.OnResuming(last);
 
             if (client.Room != null)
-                client.ChangeState(MultiplayerUserState.Idle).FireAndForget(true);
+                client.ChangeState(MultiplayerUserState.Idle).CatchUnobservedExceptions(true);
         }
 
         protected override void UpdatePollingRate(bool isIdle)
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index 98a0e5b694..cd337bbb55 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
             base.PartRoom();
 
-            multiplayerClient.LeaveRoom().FireAndForget();
+            multiplayerClient.LeaveRoom().CatchUnobservedExceptions();
 
             // Todo: This is not the way to do this. Basically when we're the only participant and the room closes, there's no way to know if this is actually the case.
             // This is delayed one frame because upon exiting the match subscreen, multiplayer updates the polling rate and messes with polling.

From 3c8f871b2815ca8f4618dbf2e51870e31324cae8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Dec 2020 17:39:08 +0900
Subject: [PATCH 0526/3722] Move player constructor configuration to dedicated
 class; add AllowRestart parameter

---
 .../TestSceneHoldNoteInput.cs                 |   6 +-
 .../TestSceneOutOfOrderHits.cs                |   6 +-
 .../TestSceneLegacyBeatmapSkin.cs             |   6 +-
 .../TestSceneOutOfOrderHits.cs                |   6 +-
 .../TestSceneSliderInput.cs                   |   6 +-
 .../Screens/Multi/Play/TimeshiftPlayer.cs     |   4 +-
 .../RealtimeMultiplayer/RealtimePlayer.cs     |   7 +-
 osu.Game/Screens/Play/Player.cs               | 140 +++++++++---------
 osu.Game/Screens/Play/PlayerConfiguration.cs  |  23 +++
 osu.Game/Screens/Play/ReplayPlayer.cs         |   4 +-
 osu.Game/Screens/Ranking/ResultsScreen.cs     |  15 +-
 osu.Game/Tests/Visual/TestPlayer.cs           |   6 +-
 12 files changed, 146 insertions(+), 83 deletions(-)
 create mode 100644 osu.Game/Screens/Play/PlayerConfiguration.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index 5cb1519196..596430f9e5 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -355,7 +355,11 @@ namespace osu.Game.Rulesets.Mania.Tests
             protected override bool PauseOnFocusLost => false;
 
             public ScoreAccessibleReplayPlayer(Score score)
-                : base(score, false, false)
+                : base(score, new PlayerConfiguration
+                {
+                    AllowPause = false,
+                    ShowResults = false,
+                })
             {
             }
         }
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
index cecac38f70..18891f8c58 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
@@ -176,7 +176,11 @@ namespace osu.Game.Rulesets.Mania.Tests
             protected override bool PauseOnFocusLost => false;
 
             public ScoreAccessibleReplayPlayer(Score score)
-                : base(score, false, false)
+                : base(score, new PlayerConfiguration
+                {
+                    AllowPause = false,
+                    ShowResults = false,
+                })
             {
             }
         }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
index 3ff37c4147..a768626005 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
@@ -74,7 +74,11 @@ namespace osu.Game.Rulesets.Osu.Tests
             private readonly bool userHasCustomColours;
 
             public ExposedPlayer(bool userHasCustomColours)
-                : base(false, false)
+                : base(new PlayerConfiguration
+                {
+                    AllowPause = false,
+                    ShowResults = false,
+                })
             {
                 this.userHasCustomColours = userHasCustomColours;
             }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
index 32a36ab317..296b421a11 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
@@ -439,7 +439,11 @@ namespace osu.Game.Rulesets.Osu.Tests
             protected override bool PauseOnFocusLost => false;
 
             public ScoreAccessibleReplayPlayer(Score score)
-                : base(score, false, false)
+                : base(score, new PlayerConfiguration
+                {
+                    AllowPause = false,
+                    ShowResults = false,
+                })
             {
             }
         }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index 0164fb8bf4..2cc031405e 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -378,7 +378,11 @@ namespace osu.Game.Rulesets.Osu.Tests
             protected override bool PauseOnFocusLost => false;
 
             public ScoreAccessibleReplayPlayer(Score score)
-                : base(score, false, false)
+                : base(score, new PlayerConfiguration
+                {
+                    AllowPause = false,
+                    ShowResults = false,
+                })
             {
             }
         }
diff --git a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
index e8462088f1..f07f1c2fb0 100644
--- a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
+++ b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
@@ -37,8 +37,8 @@ namespace osu.Game.Screens.Multi.Play
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; }
 
-        public TimeshiftPlayer(PlaylistItem playlistItem, bool allowPause = true)
-            : base(allowPause)
+        public TimeshiftPlayer(PlaylistItem playlistItem, PlayerConfiguration configuration = null)
+            : base(configuration)
         {
             PlaylistItem = playlistItem;
         }
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index c6d44686b5..4b878f43d0 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -12,6 +12,7 @@ using osu.Game.Online.Multiplayer;
 using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Scoring;
 using osu.Game.Screens.Multi.Play;
+using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
 
 namespace osu.Game.Screens.Multi.RealtimeMultiplayer
@@ -31,7 +32,11 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         private readonly ManualResetEventSlim startedEvent = new ManualResetEventSlim();
 
         public RealtimePlayer(PlaylistItem playlistItem)
-            : base(playlistItem, false)
+            : base(playlistItem, new PlayerConfiguration
+            {
+                AllowPause = false,
+                AllowRestart = false,
+            })
         {
         }
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index c539dff5d9..a1c91ab26b 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -128,18 +128,14 @@ namespace osu.Game.Screens.Play
         /// </summary>
         protected virtual bool CheckModsAllowFailure() => Mods.Value.OfType<IApplicableFailOverride>().All(m => m.PerformFail());
 
-        private readonly bool allowPause;
-        private readonly bool showResults;
+        public readonly PlayerConfiguration Configuration;
 
         /// <summary>
         /// Create a new player instance.
         /// </summary>
-        /// <param name="allowPause">Whether pausing should be allowed. If not allowed, attempting to pause will quit.</param>
-        /// <param name="showResults">Whether results screen should be pushed on completion.</param>
-        public Player(bool allowPause = true, bool showResults = true)
+        public Player(PlayerConfiguration configuration = null)
         {
-            this.allowPause = allowPause;
-            this.showResults = showResults;
+            this.Configuration = configuration ??= new PlayerConfiguration();
         }
 
         private GameplayBeatmap gameplayBeatmap;
@@ -317,59 +313,77 @@ namespace osu.Game.Screens.Play
             }
         };
 
-        private Drawable createOverlayComponents(WorkingBeatmap working) => new Container
+        private Drawable createOverlayComponents(WorkingBeatmap working)
         {
-            RelativeSizeAxes = Axes.Both,
-            Children = new[]
+            var container = new Container
             {
-                DimmableStoryboard.OverlayLayerContainer.CreateProxy(),
-                BreakOverlay = new BreakOverlay(working.Beatmap.BeatmapInfo.LetterboxInBreaks, ScoreProcessor)
+                RelativeSizeAxes = Axes.Both,
+                Children = new[]
                 {
-                    Clock = DrawableRuleset.FrameStableClock,
-                    ProcessCustomClock = false,
-                    Breaks = working.Beatmap.Breaks
-                },
-                // display the cursor above some HUD elements.
-                DrawableRuleset.Cursor?.CreateProxy() ?? new Container(),
-                DrawableRuleset.ResumeOverlay?.CreateProxy() ?? new Container(),
-                HUDOverlay = new HUDOverlay(ScoreProcessor, HealthProcessor, DrawableRuleset, Mods.Value)
-                {
-                    HoldToQuit =
+                    DimmableStoryboard.OverlayLayerContainer.CreateProxy(),
+                    BreakOverlay = new BreakOverlay(working.Beatmap.BeatmapInfo.LetterboxInBreaks, ScoreProcessor)
                     {
-                        Action = performUserRequestedExit,
-                        IsPaused = { BindTarget = GameplayClockContainer.IsPaused }
+                        Clock = DrawableRuleset.FrameStableClock,
+                        ProcessCustomClock = false,
+                        Breaks = working.Beatmap.Breaks
                     },
-                    PlayerSettingsOverlay = { PlaybackSettings = { UserPlaybackRate = { BindTarget = GameplayClockContainer.UserPlaybackRate } } },
-                    KeyCounter =
+                    // display the cursor above some HUD elements.
+                    DrawableRuleset.Cursor?.CreateProxy() ?? new Container(),
+                    DrawableRuleset.ResumeOverlay?.CreateProxy() ?? new Container(),
+                    HUDOverlay = new HUDOverlay(ScoreProcessor, HealthProcessor, DrawableRuleset, Mods.Value)
                     {
-                        AlwaysVisible = { BindTarget = DrawableRuleset.HasReplayLoaded },
-                        IsCounting = false
+                        HoldToQuit =
+                        {
+                            Action = performUserRequestedExit,
+                            IsPaused = { BindTarget = GameplayClockContainer.IsPaused }
+                        },
+                        PlayerSettingsOverlay = { PlaybackSettings = { UserPlaybackRate = { BindTarget = GameplayClockContainer.UserPlaybackRate } } },
+                        KeyCounter =
+                        {
+                            AlwaysVisible = { BindTarget = DrawableRuleset.HasReplayLoaded },
+                            IsCounting = false
+                        },
+                        RequestSeek = time =>
+                        {
+                            GameplayClockContainer.Seek(time);
+                            GameplayClockContainer.Start();
+                        },
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre
                     },
-                    RequestSeek = time =>
+                    skipOverlay = new SkipOverlay(DrawableRuleset.GameplayStartTime)
                     {
-                        GameplayClockContainer.Seek(time);
-                        GameplayClockContainer.Start();
+                        RequestSkip = GameplayClockContainer.Skip
                     },
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre
-                },
-                skipOverlay = new SkipOverlay(DrawableRuleset.GameplayStartTime)
-                {
-                    RequestSkip = GameplayClockContainer.Skip
-                },
-                FailOverlay = new FailOverlay
-                {
-                    OnRetry = Restart,
-                    OnQuit = performUserRequestedExit,
-                },
-                PauseOverlay = new PauseOverlay
-                {
-                    OnResume = Resume,
-                    Retries = RestartCount,
-                    OnRetry = Restart,
-                    OnQuit = performUserRequestedExit,
-                },
-                new HotkeyRetryOverlay
+                    FailOverlay = new FailOverlay
+                    {
+                        OnRetry = Restart,
+                        OnQuit = performUserRequestedExit,
+                    },
+                    PauseOverlay = new PauseOverlay
+                    {
+                        OnResume = Resume,
+                        Retries = RestartCount,
+                        OnRetry = Restart,
+                        OnQuit = performUserRequestedExit,
+                    },
+                    new HotkeyExitOverlay
+                    {
+                        Action = () =>
+                        {
+                            if (!this.IsCurrentScreen()) return;
+
+                            fadeOut(true);
+                            performImmediateExit();
+                        },
+                    },
+                    failAnimation = new FailAnimation(DrawableRuleset) { OnComplete = onFailComplete, },
+                }
+            };
+
+            if (Configuration.AllowRestart)
+            {
+                container.Add(new HotkeyRetryOverlay
                 {
                     Action = () =>
                     {
@@ -378,20 +392,11 @@ namespace osu.Game.Screens.Play
                         fadeOut(true);
                         Restart();
                     },
-                },
-                new HotkeyExitOverlay
-                {
-                    Action = () =>
-                    {
-                        if (!this.IsCurrentScreen()) return;
-
-                        fadeOut(true);
-                        performImmediateExit();
-                    },
-                },
-                failAnimation = new FailAnimation(DrawableRuleset) { OnComplete = onFailComplete, },
+                });
             }
-        };
+
+            return container;
+        }
 
         private void onBreakTimeChanged(ValueChangedEvent<bool> isBreakTime)
         {
@@ -490,6 +495,9 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public void Restart()
         {
+            if (!Configuration.AllowRestart)
+                return;
+
             // at the point of restarting the track should either already be paused or the volume should be zero.
             // stopping here is to ensure music doesn't become audible after exiting back to PlayerLoader.
             musicController.Stop();
@@ -529,7 +537,7 @@ namespace osu.Game.Screens.Play
 
             ValidForResume = false;
 
-            if (!showResults) return;
+            if (!Configuration.ShowResults) return;
 
             scoreSubmissionTask ??= Task.Run(async () =>
             {
@@ -628,7 +636,7 @@ namespace osu.Game.Screens.Play
 
         private bool canPause =>
             // must pass basic screen conditions (beatmap loaded, instance allows pause)
-            LoadedBeatmapSuccessfully && allowPause && ValidForResume
+            LoadedBeatmapSuccessfully && Configuration.AllowPause && ValidForResume
             // replays cannot be paused and exit immediately
             && !DrawableRuleset.HasReplayLoaded.Value
             // cannot pause if we are already in a fail state
diff --git a/osu.Game/Screens/Play/PlayerConfiguration.cs b/osu.Game/Screens/Play/PlayerConfiguration.cs
new file mode 100644
index 0000000000..475a234679
--- /dev/null
+++ b/osu.Game/Screens/Play/PlayerConfiguration.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.Screens.Play
+{
+    public class PlayerConfiguration
+    {
+        /// <summary>
+        /// Whether pausing should be allowed. If not allowed, attempting to pause will quit.
+        /// </summary>
+        public bool AllowPause { get; set; } = true;
+
+        /// <summary>
+        /// Whether results screen should be pushed on completion.
+        /// </summary>
+        public bool ShowResults { get; set; } = true;
+
+        /// <summary>
+        /// Whether the player should be allowed to trigger a restart.
+        /// </summary>
+        public bool AllowRestart { get; set; } = true;
+    }
+}
diff --git a/osu.Game/Screens/Play/ReplayPlayer.cs b/osu.Game/Screens/Play/ReplayPlayer.cs
index a07213cb33..e23cc22929 100644
--- a/osu.Game/Screens/Play/ReplayPlayer.cs
+++ b/osu.Game/Screens/Play/ReplayPlayer.cs
@@ -16,8 +16,8 @@ namespace osu.Game.Screens.Play
         // Disallow replays from failing. (see https://github.com/ppy/osu/issues/6108)
         protected override bool CheckModsAllowFailure() => false;
 
-        public ReplayPlayer(Score score, bool allowPause = true, bool showResults = true)
-            : base(allowPause, showResults)
+        public ReplayPlayer(Score score, PlayerConfiguration configuration = null)
+            : base(configuration)
         {
             Score = score;
         }
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 528a1842af..8a12427798 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -164,15 +164,18 @@ namespace osu.Game.Screens.Ranking
             {
                 buttons.Add(new RetryButton { Width = 300 });
 
-                AddInternal(new HotkeyRetryOverlay
+                if (player?.Configuration.AllowRestart == true)
                 {
-                    Action = () =>
+                    AddInternal(new HotkeyRetryOverlay
                     {
-                        if (!this.IsCurrentScreen()) return;
+                        Action = () =>
+                        {
+                            if (!this.IsCurrentScreen()) return;
 
-                        player?.Restart();
-                    },
-                });
+                            player?.Restart();
+                        },
+                    });
+                }
             }
         }
 
diff --git a/osu.Game/Tests/Visual/TestPlayer.cs b/osu.Game/Tests/Visual/TestPlayer.cs
index f016d29f38..f47391ce6a 100644
--- a/osu.Game/Tests/Visual/TestPlayer.cs
+++ b/osu.Game/Tests/Visual/TestPlayer.cs
@@ -37,7 +37,11 @@ namespace osu.Game.Tests.Visual
         public readonly List<JudgementResult> Results = new List<JudgementResult>();
 
         public TestPlayer(bool allowPause = true, bool showResults = true, bool pauseOnFocusLost = false)
-            : base(allowPause, showResults)
+            : base(new PlayerConfiguration
+            {
+                AllowPause = allowPause,
+                ShowResults = showResults
+            })
         {
             PauseOnFocusLost = pauseOnFocusLost;
         }

From f9fd909187c3839101e3c52aa476e2460b3e0778 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Dec 2020 18:07:38 +0900
Subject: [PATCH 0527/3722] Fix missed inspections

---
 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 a1c91ab26b..f1fb27e154 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -135,7 +135,7 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public Player(PlayerConfiguration configuration = null)
         {
-            this.Configuration = configuration ??= new PlayerConfiguration();
+            Configuration = configuration ?? new PlayerConfiguration();
         }
 
         private GameplayBeatmap gameplayBeatmap;

From 94e4928c4b5feb2bb404173e27fadedbb5d5468d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 23 Dec 2020 11:27:15 +0100
Subject: [PATCH 0528/3722] Bring back accidentally-removed license header

---
 .../Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
index 7b375ca475..6331d324a6 100644
--- a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
@@ -1,4 +1,4 @@
-
+// Copyright (c) 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

From 6a80e1303d540187093c794302f5982fa171ae0e Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 23 Dec 2020 12:56:04 +0100
Subject: [PATCH 0529/3722] LINQ-ify Import() logic and ignore case of file
 extensions.

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

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index ca87772209..7def93255b 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -397,18 +397,13 @@ namespace osu.Game
 
         public virtual async Task Import(params ImportTask[] tasks)
         {
-            var importTasks = new List<Task>();
-
-            foreach (var extension in tasks.Select(t => Path.GetExtension(t.Path)).Distinct())
+            var extensions = tasks.Select(t => Path.GetExtension(t.Path).ToLowerInvariant()).Distinct();
+            await Task.WhenAll(extensions.Select(ext =>
             {
-                var importList = tasks.Where(t => t.Path.EndsWith(extension, StringComparison.OrdinalIgnoreCase));
-                var importer = fileImporters.FirstOrDefault(i => i.HandledExtensions.Contains(extension));
+                var imports = tasks.Where(t => t.Path.EndsWith(ext, StringComparison.OrdinalIgnoreCase));
 
-                if (importer != null)
-                    importTasks.Add(importer.Import(importList.ToArray()));
-            }
-
-            await Task.WhenAll(importTasks);
+                return fileImporters.FirstOrDefault(i => i.HandledExtensions.Contains(ext))?.Import(imports.ToArray()) ?? Task.CompletedTask;
+            }));
         }
 
         public IEnumerable<string> HandledExtensions => fileImporters.SelectMany(i => i.HandledExtensions);

From ea5da53597e2d1a57b76b6f4d80429645ccc6657 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 23 Dec 2020 13:31:27 +0100
Subject: [PATCH 0530/3722] Handle URL links with the osu scheme.

---
 osu.Android/OsuGameActivity.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index e801c2ca6e..55484c439a 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -16,8 +16,11 @@ namespace osu.Android
 {
     [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false)]
     [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataPathPatterns = new[] { ".*\\.osz", ".*\\.osk" }, DataMimeType = "application/*")]
+    [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryBrowsable, Intent.CategoryDefault }, DataScheme = osu_url_scheme)]
     public class OsuGameActivity : AndroidGameActivity
     {
+        private const string osu_url_scheme = "osu";
+
         private OsuGameAndroid game;
 
         protected override Framework.Game CreateGame() => game = new OsuGameAndroid(this);
@@ -49,6 +52,8 @@ namespace osu.Android
                 case Intent.ActionDefault:
                     if (intent.Scheme == ContentResolver.SchemeContent)
                         handleImportFromUri(intent.Data);
+                    else if (intent.Scheme == osu_url_scheme)
+                        Task.Run(() => game.HandleLink(intent.DataString));
                     break;
 
                 case Intent.ActionSend:

From 78b8c60f1949aef5c5a63febcf46968038dd9287 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 23 Dec 2020 13:38:33 +0100
Subject: [PATCH 0531/3722] Opt for SingleInstance launch mode

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

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index 55484c439a..dfdecdca2e 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -14,7 +14,7 @@ using osu.Framework.Android;
 
 namespace osu.Android
 {
-    [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false)]
+    [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false, LaunchMode = LaunchMode.SingleInstance)]
     [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataPathPatterns = new[] { ".*\\.osz", ".*\\.osk" }, DataMimeType = "application/*")]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryBrowsable, Intent.CategoryDefault }, DataScheme = osu_url_scheme)]
     public class OsuGameActivity : AndroidGameActivity

From 582b0d2a7467f54f4ae125f79fe6c5611fb88f66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 23 Dec 2020 13:47:28 +0100
Subject: [PATCH 0532/3722] Revert logic to be closer to original

Note the reversal of the order of operations in `endHandlingTrack()`
(done for extra safety, to ensure no more value changed events can be
fired at the point of cancelling looping).
---
 osu.Game/Screens/Multi/Match/RoomSubScreen.cs | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Multi/Match/RoomSubScreen.cs b/osu.Game/Screens/Multi/Match/RoomSubScreen.cs
index 4f5d2a5b3e..b9d7408946 100644
--- a/osu.Game/Screens/Multi/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/RoomSubScreen.cs
@@ -41,27 +41,24 @@ namespace osu.Game.Screens.Multi.Match
 
             managerUpdated = beatmapManager.ItemUpdated.GetBoundCopy();
             managerUpdated.BindValueChanged(beatmapUpdated);
-
-            if (music != null)
-                music.TrackChanged += applyToTrack;
         }
 
         public override void OnEntering(IScreen last)
         {
             base.OnEntering(last);
-            applyToTrack();
+            beginHandlingTrack();
         }
 
         public override void OnSuspending(IScreen next)
         {
-            resetTrack();
+            endHandlingTrack();
             base.OnSuspending(next);
         }
 
         public override void OnResuming(IScreen last)
         {
             base.OnResuming(last);
-            applyToTrack();
+            beginHandlingTrack();
         }
 
         public override bool OnExiting(IScreen next)
@@ -69,7 +66,7 @@ namespace osu.Game.Screens.Multi.Match
             RoomManager?.PartRoom();
             Mods.Value = Array.Empty<Mod>();
 
-            resetTrack();
+            endHandlingTrack();
 
             return base.OnExiting(next);
         }
@@ -98,7 +95,18 @@ namespace osu.Game.Screens.Multi.Match
             Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
         }
 
-        private void applyToTrack(WorkingBeatmap _ = default, TrackChangeDirection __ = default)
+        private void beginHandlingTrack()
+        {
+            Beatmap.BindValueChanged(applyLoopingToTrack, true);
+        }
+
+        private void endHandlingTrack()
+        {
+            Beatmap.ValueChanged -= applyLoopingToTrack;
+            cancelTrackLooping();
+        }
+
+        private void applyLoopingToTrack(ValueChangedEvent<WorkingBeatmap> _ = null)
         {
             if (!this.IsCurrentScreen())
                 return;
@@ -114,7 +122,7 @@ namespace osu.Game.Screens.Multi.Match
             }
         }
 
-        private void resetTrack()
+        private void cancelTrackLooping()
         {
             var track = Beatmap?.Value?.Track;
 

From c5692a5d6aa51c51513e8a34c5ac023cb9326847 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 23 Dec 2020 14:18:24 +0100
Subject: [PATCH 0533/3722] Re-enable carousel selection after error

---
 .../Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
index 4a8e398008..8f317800e3 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
@@ -65,7 +65,10 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
                         if (t.IsCompletedSuccessfully)
                             this.Exit();
                         else
+                        {
                             Logger.Log($"Could not use current beatmap ({t.Exception?.Message})", level: LogLevel.Important);
+                            Carousel.AllowSelection = true;
+                        }
                     });
                 });
             }

From 4296f61d6cbe0a8d25a94a9ae22274139c8b1b1a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 23 Dec 2020 22:39:14 +0900
Subject: [PATCH 0534/3722] Tidy up event flow of change settings call

---
 .../RealtimeMultiplayer/StatefulMultiplayerClient.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
index 6331d324a6..dc999ee2be 100644
--- a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
@@ -369,7 +369,6 @@ namespace osu.Game.Online.RealtimeMultiplayer
             if (Room == null)
                 return;
 
-            // Update a few properties of the room instantaneously.
             Schedule(() =>
             {
                 if (Room == null)
@@ -377,6 +376,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
                 Debug.Assert(apiRoom != null);
 
+                // Update a few properties of the room instantaneously.
                 Room.Settings = settings;
                 apiRoom.Name.Value = Room.Settings.Name;
 
@@ -385,12 +385,12 @@ namespace osu.Game.Online.RealtimeMultiplayer
                 apiRoom.Playlist.Clear();
 
                 RoomChanged?.Invoke();
+
+                var req = new GetBeatmapSetRequest(settings.BeatmapID, BeatmapSetLookupType.BeatmapId);
+                req.Success += res => updatePlaylist(settings, res);
+
+                api.Queue(req);
             });
-
-            var req = new GetBeatmapSetRequest(settings.BeatmapID, BeatmapSetLookupType.BeatmapId);
-            req.Success += res => updatePlaylist(settings, res);
-
-            api.Queue(req);
         }
 
         private void updatePlaylist(MultiplayerRoomSettings settings, APIBeatmapSet onlineSet)

From 980e85ce25f087f28306c530e15b3d7916b2b5bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 23 Dec 2020 15:51:26 +0100
Subject: [PATCH 0535/3722] Refactor player exit logic to convey intention
 better

---
 .../RealtimeMultiplayer/RealtimePlayer.cs     |  4 ++--
 osu.Game/Screens/Play/Player.cs               | 22 ++++++++++++++-----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index 0d8e636450..e467e5fcf8 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
                     startedEvent.Set();
 
                     // messaging to the user about this disconnect will be provided by the RealtimeMatchSubScreen.
-                    Schedule(PerformImmediateExit);
+                    Schedule(() => PerformExit(false));
                 }
             }, true);
 
@@ -71,7 +71,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             {
                 Logger.Log("Failed to start the multiplayer match in time.", LoggingTarget.Runtime, LogLevel.Important);
 
-                Schedule(PerformImmediateExit);
+                Schedule(() => PerformExit(false));
             }
 
             Debug.Assert(client.Room != null);
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index c6265c48d2..2bc84ce5d5 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -386,7 +386,7 @@ namespace osu.Game.Screens.Play
                         if (!this.IsCurrentScreen()) return;
 
                         fadeOut(true);
-                        PerformImmediateExit();
+                        PerformExit(true);
                     },
                 },
                 failAnimation = new FailAnimation(DrawableRuleset) { OnComplete = onFailComplete, },
@@ -458,20 +458,30 @@ namespace osu.Game.Screens.Play
             return playable;
         }
 
-        protected void PerformImmediateExit()
+        /// <summary>
+        /// Exits the <see cref="Player"/>.
+        /// </summary>
+        /// <param name="userRequested">
+        /// Whether the exit is requested by the user, or a higher-level game component.
+        /// Pausing is allowed only in the former case.
+        /// </param>
+        protected void PerformExit(bool userRequested)
         {
             // if a restart has been requested, cancel any pending completion (user has shown intent to restart).
             completionProgressDelegate?.Cancel();
 
             ValidForResume = false;
 
-            performUserRequestedExit();
+            if (!this.IsCurrentScreen()) return;
+
+            if (userRequested)
+                performUserRequestedExit();
+            else
+                this.Exit();
         }
 
         private void performUserRequestedExit()
         {
-            if (!this.IsCurrentScreen()) return;
-
             if (ValidForResume && HasFailed && !FailOverlay.IsPresent)
             {
                 failAnimation.FinishTransforms(true);
@@ -498,7 +508,7 @@ namespace osu.Game.Screens.Play
             RestartRequested?.Invoke();
 
             if (this.IsCurrentScreen())
-                PerformImmediateExit();
+                PerformExit(true);
             else
                 this.MakeCurrent();
         }

From 3b0bf1136642c40fd189cbbd1940d3121f286e0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 23 Dec 2020 17:01:01 +0100
Subject: [PATCH 0536/3722] Fix JoinRoom failing to return canceled token

As it turns out, `Task.FromCanceled` expects to receive an already
cancelled `CancellationToken`, which `CancellationToken.None` is not.
---
 .../Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
index 5cbf3be8ca..026b7176d1 100644
--- a/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
@@ -122,7 +122,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
         protected override Task<MultiplayerRoom> JoinRoom(long roomId)
         {
             if (!isConnected.Value)
-                return Task.FromCanceled<MultiplayerRoom>(CancellationToken.None);
+                return Task.FromCanceled<MultiplayerRoom>(new CancellationToken(true));
 
             return connection.InvokeAsync<MultiplayerRoom>(nameof(IMultiplayerServer.JoinRoom), roomId);
         }

From e4959489b70d61f76c6f25e0c7125fd24d96becc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 23 Dec 2020 17:08:28 +0100
Subject: [PATCH 0537/3722] Improve user-facing error messages in room settings

---
 .../Match/RealtimeMatchSettingsOverlay.cs                  | 3 ++-
 .../Multi/RealtimeMultiplayer/RealtimeRoomManager.cs       | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs
index 3e495b490f..a93b1b09d1 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs
@@ -5,6 +5,7 @@ using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Extensions.ExceptionExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -299,7 +300,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
                         if (t.IsCompletedSuccessfully)
                             onSuccess(currentRoom.Value);
                         else
-                            onError(t.Exception?.Message ?? "Error changing settings.");
+                            onError(t.Exception?.AsSingular().Message ?? "Error changing settings.");
                     }));
                 }
                 else
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
index cd337bbb55..eb6e5fad07 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
@@ -7,6 +7,7 @@ using System.Diagnostics;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.ExceptionExtensions;
 using osu.Framework.Logging;
 using osu.Game.Extensions;
 using osu.Game.Online.Multiplayer;
@@ -91,11 +92,13 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
                     Schedule(() => onSuccess?.Invoke(room));
                 else
                 {
+                    const string message = "Failed to join multiplayer room.";
+
                     if (t.Exception != null)
-                        Logger.Error(t.Exception, "Failed to join multiplayer room.");
+                        Logger.Error(t.Exception, message);
 
                     PartRoom();
-                    Schedule(() => onError?.Invoke(t.Exception?.ToString() ?? string.Empty));
+                    Schedule(() => onError?.Invoke(t.Exception?.AsSingular().Message ?? message));
                 }
             });
         }

From e89583d732e5c9996534bdb89a8ee42470cbe530 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Dec 2020 01:33:19 +0900
Subject: [PATCH 0538/3722] Prefer connecting to dev server when running in
 DEBUG

---
 osu.Game/Online/API/APIAccess.cs                          | 8 +++++++-
 .../RealtimeMultiplayer/RealtimeMultiplayerClient.cs      | 4 ++++
 osu.Game/Online/Spectator/SpectatorStreamingClient.cs     | 4 ++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index fe500b9548..ca457ccf71 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -26,9 +26,15 @@ namespace osu.Game.Online.API
 
         private readonly OAuth authentication;
 
+#if DEBUG
+        public string Endpoint => @"https://dev.ppy.sh";
+        private const string client_secret = @"3LP2mhUrV89xxzD1YKNndXHEhWWCRLPNKioZ9ymT";
+#else
         public string Endpoint => @"https://osu.ppy.sh";
-        private const string client_id = @"5";
         private const string client_secret = @"FGc9GAtyHzeQDshWP5Ah7dega8hJACAJpQtw6OXk";
+#endif
+
+        private const string client_id = @"5";
 
         private readonly Queue<APIRequest> queue = new Queue<APIRequest>();
 
diff --git a/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
index 75bb578a29..4ec5b9af40 100644
--- a/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
@@ -19,7 +19,11 @@ namespace osu.Game.Online.RealtimeMultiplayer
 {
     public class RealtimeMultiplayerClient : StatefulMultiplayerClient
     {
+#if DEBUG
+        private const string endpoint = "https://dev.ppy.sh/multiplayer";
+#else
         private const string endpoint = "https://spectator.ppy.sh/multiplayer";
+#endif
 
         public override IBindable<bool> IsConnected => isConnected;
 
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 0167a5d025..c9203b595e 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -104,7 +104,11 @@ namespace osu.Game.Online.Spectator
             }
         }
 
+#if DEBUG
+        private const string endpoint = "https://dev.ppy.sh/spectator";
+#else
         private const string endpoint = "https://spectator.ppy.sh/spectator";
+#endif
 
         protected virtual async Task Connect()
         {

From 9843da59f4866918391902de30125577b60c1464 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 23 Dec 2020 20:29:17 +0100
Subject: [PATCH 0539/3722] Fix intermittent test fail due to duplicate user

`TestSceneRealtimeReadyButton` was manually adding `API.LocalUser`,
which wasn't actually needed. The base `RealtimeMultiplayerTestScene` by
default creates a new room as `API.LocalUser`, therefore automatically
adding that user to the room - and as such there is no need to add them
manually unless the `joinRoom` ctor param is specified as `false`.
---
 .../Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs
index b7cd81fb32..e9d3ddb32d 100644
--- a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs
+++ b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs
@@ -55,8 +55,6 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
                     }
                 }
             };
-
-            Client.AddUser(API.LocalUser.Value);
         });
 
         [Test]

From 47020c888731c2370d6f81fbfe9f11d6e7fcfdc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 23 Dec 2020 21:00:47 +0100
Subject: [PATCH 0540/3722] Add failing test cases

---
 .../TestSceneRealtimeMultiplayer.cs           | 24 +++++++++++++++++++
 .../TestRealtimeMultiplayerClient.cs          |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayer.cs b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayer.cs
index 80955ca380..5cf80df6aa 100644
--- a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayer.cs
+++ b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayer.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 NUnit.Framework;
 using osu.Game.Screens.Multi.Components;
+using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.RealtimeMultiplayer
 {
@@ -15,6 +17,28 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
             AddUntilStep("wait for loaded", () => multi.IsLoaded);
         }
 
+        [Test]
+        public void TestOneUserJoinedMultipleTimes()
+        {
+            var user = new User { Id = 33 };
+
+            AddRepeatStep("add user multiple times", () => Client.AddUser(user), 3);
+
+            AddAssert("room has 2 users", () => Client.Room?.Users.Count == 2);
+        }
+
+        [Test]
+        public void TestOneUserLeftMultipleTimes()
+        {
+            var user = new User { Id = 44 };
+
+            AddStep("add user", () => Client.AddUser(user));
+            AddAssert("room has 2 users", () => Client.Room?.Users.Count == 2);
+
+            AddRepeatStep("remove user multiple times", () => Client.RemoveUser(user), 3);
+            AddAssert("room has 1 user", () => Client.Room?.Users.Count == 1);
+        }
+
         private class TestRealtimeMultiplayer : Screens.Multi.RealtimeMultiplayer.RealtimeMultiplayer
         {
             protected override RoomManager CreateRoomManager() => new TestRealtimeRoomManager();
diff --git a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs b/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs
index de52633c88..52047016e2 100644
--- a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
         public void RemoveUser(User user)
         {
             Debug.Assert(Room != null);
-            ((IMultiplayerClient)this).UserLeft(Room.Users.Single(u => u.User == user));
+            ((IMultiplayerClient)this).UserLeft(new MultiplayerRoomUser(user.Id));
 
             Schedule(() =>
             {

From a71496bc4e9f0386d13b295eb92496f33144e5b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 23 Dec 2020 20:34:19 +0100
Subject: [PATCH 0541/3722] Sanity check received user joined messages

While test failures fixed in 9843da5 were a shortcoming of the test,
they exposed a potential vulnerable point of the multiplayer client
logic. In case of unreliable message delivery it is not unreasonable
that duplicate messages might arrive, in which case the same scenario
that failed in the tests could crash the game.

To ensure that is not the case, explicitly screen each new joined user
against the room user list, to ensure that duplicates do not show up.
`UserLeft` is already tolerant in that respect (if a user is requested
to be removed twice by the server, the second removal just won't do
anything).
---
 .../Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
index 6331d324a6..e8dbeda9cb 100644
--- a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
@@ -226,6 +226,10 @@ namespace osu.Game.Online.RealtimeMultiplayer
                 if (Room == null)
                     return;
 
+                // for sanity, ensure that there can be no duplicate users in the room user list.
+                if (Room.Users.Any(existing => existing.UserID == user.UserID))
+                    return;
+
                 Room.Users.Add(user);
 
                 RoomChanged?.Invoke();

From 05d9f2376224b42d9ee56f8ee094374a15dc2801 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 23 Dec 2020 16:38:18 +0100
Subject: [PATCH 0542/3722] Move out create room button to separate class

---
 osu.Game/Screens/Multi/CreateRoomButton.cs | 31 ++++++++++++++++++++++
 osu.Game/Screens/Multi/Multiplayer.cs      | 23 ----------------
 2 files changed, 31 insertions(+), 23 deletions(-)
 create mode 100644 osu.Game/Screens/Multi/CreateRoomButton.cs

diff --git a/osu.Game/Screens/Multi/CreateRoomButton.cs b/osu.Game/Screens/Multi/CreateRoomButton.cs
new file mode 100644
index 0000000000..b501de46ef
--- /dev/null
+++ b/osu.Game/Screens/Multi/CreateRoomButton.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.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Screens.Multi.Match.Components;
+using osuTK;
+
+namespace osu.Game.Screens.Multi
+{
+    public class CreateRoomButton : PurpleTriangleButton
+    {
+        public CreateRoomButton()
+        {
+            Size = new Vector2(150, Header.HEIGHT - 20);
+            Margin = new MarginPadding
+            {
+                Top = 10,
+                Right = 10 + OsuScreen.HORIZONTAL_OVERFLOW_PADDING,
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Triangles.TriangleScale = 1.5f;
+
+            Text = "Create room";
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index de2e0d58c9..a957eb6824 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -21,9 +21,7 @@ using osu.Game.Screens.Multi.Components;
 using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Lounge.Components;
 using osu.Game.Screens.Multi.Match;
-using osu.Game.Screens.Multi.Match.Components;
 using osu.Game.Users;
-using osuTK;
 
 namespace osu.Game.Screens.Multi
 {
@@ -332,26 +330,5 @@ namespace osu.Game.Screens.Multi
                 protected override double TransformDuration => 200;
             }
         }
-
-        public class CreateRoomButton : PurpleTriangleButton
-        {
-            public CreateRoomButton()
-            {
-                Size = new Vector2(150, Header.HEIGHT - 20);
-                Margin = new MarginPadding
-                {
-                    Top = 10,
-                    Right = 10 + HORIZONTAL_OVERFLOW_PADDING,
-                };
-            }
-
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                Triangles.TriangleScale = 1.5f;
-
-                Text = "Create room";
-            }
-        }
     }
 }

From c13acb609aed79df56e883586697be71b72e74c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 23 Dec 2020 21:50:29 +0100
Subject: [PATCH 0543/3722] Move out sizing logic to multiplayer screen

---
 osu.Game/Screens/Multi/CreateRoomButton.cs | 12 ------------
 osu.Game/Screens/Multi/Multiplayer.cs      |  7 +++++++
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Multi/CreateRoomButton.cs b/osu.Game/Screens/Multi/CreateRoomButton.cs
index b501de46ef..9e53904510 100644
--- a/osu.Game/Screens/Multi/CreateRoomButton.cs
+++ b/osu.Game/Screens/Multi/CreateRoomButton.cs
@@ -2,24 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Framework.Graphics;
 using osu.Game.Screens.Multi.Match.Components;
-using osuTK;
 
 namespace osu.Game.Screens.Multi
 {
     public class CreateRoomButton : PurpleTriangleButton
     {
-        public CreateRoomButton()
-        {
-            Size = new Vector2(150, Header.HEIGHT - 20);
-            Margin = new MarginPadding
-            {
-                Top = 10,
-                Right = 10 + OsuScreen.HORIZONTAL_OVERFLOW_PADDING,
-            };
-        }
-
         [BackgroundDependencyLoader]
         private void load()
         {
diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index a957eb6824..c820eae51f 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -22,6 +22,7 @@ using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Lounge.Components;
 using osu.Game.Screens.Multi.Match;
 using osu.Game.Users;
+using osuTK;
 
 namespace osu.Game.Screens.Multi
 {
@@ -131,6 +132,12 @@ namespace osu.Game.Screens.Multi
                     {
                         Anchor = Anchor.TopRight,
                         Origin = Anchor.TopRight,
+                        Size = new Vector2(150, Header.HEIGHT - 20),
+                        Margin = new MarginPadding
+                        {
+                            Top = 10,
+                            Right = 10 + HORIZONTAL_OVERFLOW_PADDING,
+                        },
                         Action = () => OpenNewRoom()
                     },
                     RoomManager = CreateRoomManager()

From 414f886b02d21c24ddaddc273ac747dc1d347b63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 23 Dec 2020 22:02:37 +0100
Subject: [PATCH 0544/3722] Split timeshift & multiplayer "create" buttons

Multiplayer button gets new, different "Create match" text, and disable
logic in case of a dropped connection to the multiplayer server.
---
 osu.Game/Screens/Multi/Multiplayer.cs         | 18 ++++++++-------
 .../CreateRealtimeMatchButton.cs              | 23 +++++++++++++++++++
 .../RealtimeMultiplayer.cs                    |  3 +++
 .../CreateTimeshiftRoomButton.cs}             |  4 ++--
 .../Multi/Timeshift/TimeshiftMultiplayer.cs   |  3 +++
 5 files changed, 41 insertions(+), 10 deletions(-)
 create mode 100644 osu.Game/Screens/Multi/RealtimeMultiplayer/CreateRealtimeMatchButton.cs
 rename osu.Game/Screens/Multi/{CreateRoomButton.cs => Timeshift/CreateTimeshiftRoomButton.cs} (78%)

diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index c820eae51f..a7d40a89d3 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -128,18 +128,18 @@ namespace osu.Game.Screens.Multi
                         }
                     },
                     new Header(screenStack),
-                    createButton = new CreateRoomButton
+                    createButton = CreateNewMultiplayerGameButton().With(button =>
                     {
-                        Anchor = Anchor.TopRight,
-                        Origin = Anchor.TopRight,
-                        Size = new Vector2(150, Header.HEIGHT - 20),
-                        Margin = new MarginPadding
+                        button.Anchor = Anchor.TopRight;
+                        button.Origin = Anchor.TopRight;
+                        button.Size = new Vector2(150, Header.HEIGHT - 20);
+                        button.Margin = new MarginPadding
                         {
                             Top = 10,
                             Right = 10 + HORIZONTAL_OVERFLOW_PADDING,
-                        },
-                        Action = () => OpenNewRoom()
-                    },
+                        };
+                        button.Action = () => OpenNewRoom();
+                    }),
                     RoomManager = CreateRoomManager()
                 }
             };
@@ -315,6 +315,8 @@ namespace osu.Game.Screens.Multi
 
         protected abstract LoungeSubScreen CreateLounge();
 
+        protected abstract OsuButton CreateNewMultiplayerGameButton();
+
         private class MultiplayerWaveContainer : WaveContainer
         {
             protected override bool StartHidden => true;
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/CreateRealtimeMatchButton.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/CreateRealtimeMatchButton.cs
new file mode 100644
index 0000000000..eda907f8cb
--- /dev/null
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/CreateRealtimeMatchButton.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.
+
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Screens.Multi.Match.Components;
+
+namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+{
+    public class CreateRealtimeMatchButton : PurpleTriangleButton
+    {
+        [BackgroundDependencyLoader]
+        private void load(StatefulMultiplayerClient multiplayerClient)
+        {
+            Triangles.TriangleScale = 1.5f;
+
+            Text = "Create match";
+
+            ((IBindable<bool>)Enabled).BindTo(multiplayerClient.IsConnected);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
index 6685cf52d6..6739a51fe8 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
@@ -5,6 +5,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Extensions;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Screens.Multi.Components;
@@ -64,5 +65,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         protected override RoomManager CreateRoomManager() => new RealtimeRoomManager();
 
         protected override LoungeSubScreen CreateLounge() => new RealtimeLoungeSubScreen();
+
+        protected override OsuButton CreateNewMultiplayerGameButton() => new CreateRealtimeMatchButton();
     }
 }
diff --git a/osu.Game/Screens/Multi/CreateRoomButton.cs b/osu.Game/Screens/Multi/Timeshift/CreateTimeshiftRoomButton.cs
similarity index 78%
rename from osu.Game/Screens/Multi/CreateRoomButton.cs
rename to osu.Game/Screens/Multi/Timeshift/CreateTimeshiftRoomButton.cs
index 9e53904510..bd9d667630 100644
--- a/osu.Game/Screens/Multi/CreateRoomButton.cs
+++ b/osu.Game/Screens/Multi/Timeshift/CreateTimeshiftRoomButton.cs
@@ -4,9 +4,9 @@
 using osu.Framework.Allocation;
 using osu.Game.Screens.Multi.Match.Components;
 
-namespace osu.Game.Screens.Multi
+namespace osu.Game.Screens.Multi.Timeshift
 {
-    public class CreateRoomButton : PurpleTriangleButton
+    public class CreateTimeshiftRoomButton : PurpleTriangleButton
     {
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
index 2ea4857799..d525a3800d 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Logging;
 using osu.Framework.Screens;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Multi.Components;
 using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Match;
@@ -47,5 +48,7 @@ namespace osu.Game.Screens.Multi.Timeshift
         protected override RoomManager CreateRoomManager() => new TimeshiftRoomManager();
 
         protected override LoungeSubScreen CreateLounge() => new TimeshiftLoungeSubScreen();
+
+        protected override OsuButton CreateNewMultiplayerGameButton() => new CreateTimeshiftRoomButton();
     }
 }

From 06bc3cd54d448d5597a193d7024c036f25b9e081 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Thu, 24 Dec 2020 00:17:26 +0100
Subject: [PATCH 0545/3722] Apply review suggestions.

---
 osu.Android/OsuGameActivity.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index dfdecdca2e..953c06f4e2 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 using Android.App;
 using Android.Content;
@@ -16,10 +17,10 @@ namespace osu.Android
 {
     [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false, LaunchMode = LaunchMode.SingleInstance)]
     [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataPathPatterns = new[] { ".*\\.osz", ".*\\.osk" }, DataMimeType = "application/*")]
-    [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryBrowsable, Intent.CategoryDefault }, DataScheme = osu_url_scheme)]
+    [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryBrowsable, Intent.CategoryDefault }, DataSchemes = new[] { "osu", "osump" })]
     public class OsuGameActivity : AndroidGameActivity
     {
-        private const string osu_url_scheme = "osu";
+        private static readonly string[] osu_url_schemes = { "osu", "osump" };
 
         private OsuGameAndroid game;
 
@@ -52,8 +53,8 @@ namespace osu.Android
                 case Intent.ActionDefault:
                     if (intent.Scheme == ContentResolver.SchemeContent)
                         handleImportFromUri(intent.Data);
-                    else if (intent.Scheme == osu_url_scheme)
-                        Task.Run(() => game.HandleLink(intent.DataString));
+                    else if (osu_url_schemes.Contains(intent.Scheme))
+                        game.HandleLink(intent.DataString);
                     break;
 
                 case Intent.ActionSend:

From d6dadd12faa7c277befcdcefd0eecdc25196cf0c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Dec 2020 10:38:53 +0900
Subject: [PATCH 0546/3722] Send multiplayer user IDs via ctor for better
 thread safety

---
 .../RealtimeMultiplayer/RealtimeMatchSubScreen.cs   | 10 +++++++++-
 .../Multi/RealtimeMultiplayer/RealtimePlayer.cs     | 13 +++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
index cdab1435c0..468908f83d 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Specialized;
+using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -188,7 +189,14 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
         private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e) => SelectedItem.Value = Playlist.FirstOrDefault();
 
-        private void onLoadRequested() => multiplayer?.Push(new PlayerLoader(() => new RealtimePlayer(SelectedItem.Value)));
+        private void onLoadRequested()
+        {
+            Debug.Assert(client.Room != null);
+
+            int[] userIds = client.Room.Users.Where(u => u.State >= MultiplayerUserState.WaitingForLoad).Select(u => u.UserID).ToArray();
+
+            multiplayer?.Push(new PlayerLoader(() => new RealtimePlayer(SelectedItem.Value, userIds)));
+        }
 
         protected override void Dispose(bool isDisposing)
         {
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index 7824b414f2..25543d3d6d 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Diagnostics;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
@@ -37,9 +36,17 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         [CanBeNull]
         private MultiplayerGameplayLeaderboard leaderboard;
 
-        public RealtimePlayer(PlaylistItem playlistItem)
+        private readonly int[] userIds;
+
+        /// <summary>
+        /// Construct a multiplayer player.
+        /// </summary>
+        /// <param name="playlistItem">The playlist item to be played.</param>
+        /// <param name="userIds">The users which are participating in this game.</param>
+        public RealtimePlayer(PlaylistItem playlistItem, int[] userIds)
             : base(playlistItem, false)
         {
+            this.userIds = userIds;
         }
 
         [BackgroundDependencyLoader]
@@ -65,8 +72,6 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
             Debug.Assert(client.Room != null);
 
-            int[] userIds = client.Room.Users.Where(u => u.State >= MultiplayerUserState.WaitingForLoad).Select(u => u.UserID).ToArray();
-
             // todo: this should be implemented via a custom HUD implementation, and correctly masked to the main content area.
             LoadComponentAsync(leaderboard = new MultiplayerGameplayLeaderboard(ScoreProcessor, userIds), HUDOverlay.Add);
         }

From a411b26a09530bed75c404afe49d5b447bd5a863 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Dec 2020 10:51:24 +0900
Subject: [PATCH 0547/3722] Remove unnecessary clamp

Co-authored-by: Joseph Madamba <madamba.joehu@outlook.com>
---
 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 3f770cfb5e..20c0818d03 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                 var destination = e.MousePosition;
 
                 FlashlightPosition = Interpolation.ValueAt(
-                    Math.Clamp(Math.Abs(Clock.ElapsedFrameTime), 0, follow_delay), position, destination, 0, follow_delay, Easing.Out);
+                    Math.Min(Math.Abs(Clock.ElapsedFrameTime), follow_delay), position, destination, 0, follow_delay, Easing.Out);
 
                 return base.OnMouseMove(e);
             }

From 61a5d3ef4ae8d7724eb02686a01a33e85cbc4e0c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Dec 2020 13:32:35 +0900
Subject: [PATCH 0548/3722] Remove double handling of restart allowance on
 results screen (already handled locally)

---
 osu.Game/Screens/Ranking/ResultsScreen.cs | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 8a12427798..528a1842af 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -164,18 +164,15 @@ namespace osu.Game.Screens.Ranking
             {
                 buttons.Add(new RetryButton { Width = 300 });
 
-                if (player?.Configuration.AllowRestart == true)
+                AddInternal(new HotkeyRetryOverlay
                 {
-                    AddInternal(new HotkeyRetryOverlay
+                    Action = () =>
                     {
-                        Action = () =>
-                        {
-                            if (!this.IsCurrentScreen()) return;
+                        if (!this.IsCurrentScreen()) return;
 
-                            player?.Restart();
-                        },
-                    });
-                }
+                        player?.Restart();
+                    },
+                });
             }
         }
 

From 1f80f01b53f4861a26ee8564bb7b81684cfad488 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Dec 2020 14:46:52 +0900
Subject: [PATCH 0549/3722] Add accuracy to frame bundle header

---
 osu.Game/Online/Spectator/FrameHeader.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/Spectator/FrameHeader.cs b/osu.Game/Online/Spectator/FrameHeader.cs
index b4988fecf9..135b356eda 100644
--- a/osu.Game/Online/Spectator/FrameHeader.cs
+++ b/osu.Game/Online/Spectator/FrameHeader.cs
@@ -14,6 +14,11 @@ namespace osu.Game.Online.Spectator
     [Serializable]
     public class FrameHeader
     {
+        /// <summary>
+        /// The current accuracy of the score.
+        /// </summary>
+        public double Accuracy { get; set; }
+
         /// <summary>
         /// The current combo of the score.
         /// </summary>
@@ -42,16 +47,18 @@ namespace osu.Game.Online.Spectator
         {
             Combo = score.Combo;
             MaxCombo = score.MaxCombo;
+            Accuracy = score.Accuracy;
 
             // copy for safety
             Statistics = new Dictionary<HitResult, int>(score.Statistics);
         }
 
         [JsonConstructor]
-        public FrameHeader(int combo, int maxCombo, Dictionary<HitResult, int> statistics, DateTimeOffset receivedTime)
+        public FrameHeader(int combo, int maxCombo, double accuracy, Dictionary<HitResult, int> statistics, DateTimeOffset receivedTime)
         {
             Combo = combo;
             MaxCombo = maxCombo;
+            Accuracy = accuracy;
             Statistics = statistics;
             ReceivedTime = receivedTime;
         }

From d66e2183185bbedc26b2d7350499e71d3aebc0fb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Dec 2020 14:57:23 +0900
Subject: [PATCH 0550/3722] Source display accuracy from header and remove from
 ScoreProcessor function

---
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs       | 15 +++++----------
 .../Play/HUD/MultiplayerGameplayLeaderboard.cs    |  4 ++--
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 4b2e2bf715..2024290460 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -193,7 +193,7 @@ namespace osu.Game.Rulesets.Scoring
         private void updateScore()
         {
             if (rollingMaxBaseScore != 0)
-                Accuracy.Value = baseScore / rollingMaxBaseScore;
+                Accuracy.Value = calculateAccuracyRatio(baseScore, true);
 
             TotalScore.Value = getScore(Mode.Value);
         }
@@ -233,13 +233,13 @@ namespace osu.Game.Rulesets.Scoring
         }
 
         /// <summary>
-        /// Given a minimal set of inputs, return the computed score and accuracy for the tracked beatmap / mods combination, at the current point in time.
+        /// Given a minimal set of inputs, return the computed score for the tracked beatmap / mods combination, at the current point in time.
         /// </summary>
         /// <param name="mode">The <see cref="ScoringMode"/> to compute the total score in.</param>
         /// <param name="maxCombo">The maximum combo achievable in the beatmap.</param>
         /// <param name="statistics">Statistics to be used for calculating accuracy, bonus score, etc.</param>
-        /// <returns>The computed score and accuracy for provided inputs.</returns>
-        public (double score, double accuracy) GetScoreAndAccuracy(ScoringMode mode, int maxCombo, Dictionary<HitResult, int> statistics)
+        /// <returns>The computed score for provided inputs.</returns>
+        public double GetImmediateScore(ScoringMode mode, int maxCombo, Dictionary<HitResult, int> statistics)
         {
             // calculate base score from statistics pairs
             int computedBaseScore = 0;
@@ -252,12 +252,7 @@ namespace osu.Game.Rulesets.Scoring
                 computedBaseScore += Judgement.ToNumericResult(pair.Key) * pair.Value;
             }
 
-            double pointInTimeAccuracy = calculateAccuracyRatio(computedBaseScore, true);
-            double comboRatio = calculateComboRatio(maxCombo);
-
-            double score = GetScore(mode, maxAchievableCombo, calculateAccuracyRatio(computedBaseScore), comboRatio, scoreResultCounts);
-
-            return (score, pointInTimeAccuracy);
+            return GetScore(mode, maxAchievableCombo, calculateAccuracyRatio(computedBaseScore), calculateComboRatio(maxCombo), scoreResultCounts);
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index 12321de442..c10ec9e004 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -122,8 +122,8 @@ namespace osu.Game.Screens.Play.HUD
                 if (LastHeader == null)
                     return;
 
-                (score.Value, accuracy.Value) = processor.GetScoreAndAccuracy(mode, LastHeader.MaxCombo, LastHeader.Statistics);
-
+                score.Value = processor.GetImmediateScore(mode, LastHeader.MaxCombo, LastHeader.Statistics);
+                accuracy.Value = LastHeader.Accuracy;
                 currentCombo.Value = LastHeader.Combo;
             }
         }

From e86e9bfae625351e5323c9393e011190dd58c7b8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Dec 2020 15:32:55 +0900
Subject: [PATCH 0551/3722] Don't begin gameplay until all users are in a
 completely prepared state

---
 .../RealtimeMultiplayer/RealtimePlayer.cs     | 39 ++++++++++++-------
 osu.Game/Screens/Play/Player.cs               | 18 +++++++--
 2 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index 085c52cb85..20b184bed3 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -3,12 +3,12 @@
 
 using System;
 using System.Diagnostics;
-using System.Threading;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Logging;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Scoring;
@@ -33,13 +33,14 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         private IBindable<bool> isConnected;
 
         private readonly TaskCompletionSource<bool> resultsReady = new TaskCompletionSource<bool>();
-        private readonly ManualResetEventSlim startedEvent = new ManualResetEventSlim();
 
         [CanBeNull]
         private MultiplayerGameplayLeaderboard leaderboard;
 
         private readonly int[] userIds;
 
+        private LoadingLayer loadingDisplay;
+
         /// <summary>
         /// Construct a multiplayer player.
         /// </summary>
@@ -60,6 +61,12 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             client.MatchStarted += onMatchStarted;
             client.ResultsReady += onResultsReady;
 
+            ScoreProcessor.HasCompleted.BindValueChanged(completed =>
+            {
+                // wait for server to tell us that results are ready (see SubmitScore implementation)
+                loadingDisplay.Show();
+            });
+
             isConnected = client.IsConnected.GetBoundCopy();
             isConnected.BindValueChanged(connected =>
             {
@@ -70,19 +77,20 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
                 }
             }, true);
 
-            client.ChangeState(MultiplayerUserState.Loaded)
-                  .ContinueWith(task => failAndBail(task.Exception?.Message ?? "Server error"), TaskContinuationOptions.NotOnRanToCompletion);
-
-            if (!startedEvent.Wait(TimeSpan.FromSeconds(30)))
-            {
-                failAndBail("Failed to start the multiplayer match in time.");
-                return;
-            }
-
             Debug.Assert(client.Room != null);
 
             // todo: this should be implemented via a custom HUD implementation, and correctly masked to the main content area.
             LoadComponentAsync(leaderboard = new MultiplayerGameplayLeaderboard(ScoreProcessor, userIds), HUDOverlay.Add);
+
+            HUDOverlay.Add(loadingDisplay = new LoadingLayer(DrawableRuleset) { Depth = float.MaxValue });
+        }
+
+        protected override void StartGameplay()
+        {
+            // block base call, but let the server know we are ready to start.
+            loadingDisplay.Show();
+
+            client.ChangeState(MultiplayerUserState.Loaded).ContinueWith(task => failAndBail(task.Exception?.Message ?? "Server error"), TaskContinuationOptions.NotOnRanToCompletion);
         }
 
         private void failAndBail(string message = null)
@@ -90,7 +98,6 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             if (!string.IsNullOrEmpty(message))
                 Logger.Log(message, LoggingTarget.Runtime, LogLevel.Important);
 
-            startedEvent.Set();
             Schedule(() => PerformExit(false));
         }
 
@@ -112,7 +119,11 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
                 padding + HUDOverlay.TopScoringElementsHeight);
         }
 
-        private void onMatchStarted() => startedEvent.Set();
+        private void onMatchStarted() => Scheduler.Add(() =>
+        {
+            loadingDisplay.Hide();
+            base.StartGameplay();
+        });
 
         private void onResultsReady() => resultsReady.SetResult(true);
 
@@ -124,7 +135,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
             // Await up to 30 seconds for results to become available (3 api request timeouts).
             // This is arbitrary just to not leave the player in an essentially deadlocked state if any connection issues occur.
-            await Task.WhenAny(resultsReady.Task, Task.Delay(TimeSpan.FromSeconds(30)));
+            await Task.WhenAny(resultsReady.Task, Task.Delay(TimeSpan.FromSeconds(60)));
         }
 
         protected override ResultsScreen CreateResults(ScoreInfo score)
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 2bc84ce5d5..3f761d9e11 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -723,9 +723,6 @@ namespace osu.Game.Screens.Play
 
             storyboardReplacesBackground.Value = Beatmap.Value.Storyboard.ReplacesBackground && Beatmap.Value.Storyboard.HasDrawable;
 
-            GameplayClockContainer.Restart();
-            GameplayClockContainer.FadeInFromZero(750, Easing.OutQuint);
-
             foreach (var mod in Mods.Value.OfType<IApplicableToPlayer>())
                 mod.ApplyToPlayer(this);
 
@@ -740,6 +737,21 @@ namespace osu.Game.Screens.Play
                 mod.ApplyToTrack(musicController.CurrentTrack);
 
             updateGameplayState();
+
+            GameplayClockContainer.FadeInFromZero(750, Easing.OutQuint);
+            StartGameplay();
+        }
+
+        /// <summary>
+        /// Called to trigger the starting of the gameplay clock and underlying gameplay.
+        /// This will be called on entering the player screen once. A derived class may block the first call to this to delay the start of gameplay.
+        /// </summary>
+        protected virtual void StartGameplay()
+        {
+            if (GameplayClockContainer.GameplayClock.IsRunning)
+                throw new InvalidOperationException($"{nameof(StartGameplay)} should not be called when the gameplay clock is already running");
+
+            GameplayClockContainer.Restart();
         }
 
         public override void OnSuspending(IScreen next)

From 5457e4598b1a21405a183790cdd299218f789849 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Dec 2020 16:20:38 +0900
Subject: [PATCH 0552/3722] Schedule UpdateFilter calls to avoid operations
 occuring while at a sub screen

---
 osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
index 896c215c42..3712cbe33e 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
@@ -98,7 +98,9 @@ namespace osu.Game.Screens.Multi.Lounge.Components
             scheduledFilterUpdate = Scheduler.AddDelayed(UpdateFilter, 200);
         }
 
-        protected void UpdateFilter()
+        protected void UpdateFilter() => Scheduler.AddOnce(updateFilter);
+
+        private void updateFilter()
         {
             scheduledFilterUpdate?.Cancel();
 

From 6bd6888a938667f2050ef55c24ff4f9872a418ec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Dec 2020 16:29:51 +0900
Subject: [PATCH 0553/3722] Disallow skipping in multiplayer for now

---
 osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs | 1 +
 osu.Game/Screens/Play/Player.cs                              | 3 +++
 osu.Game/Screens/Play/PlayerConfiguration.cs                 | 5 +++++
 3 files changed, 9 insertions(+)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index b1615cc7f6..5da712bfcc 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -51,6 +51,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             {
                 AllowPause = false,
                 AllowRestart = false,
+                AllowSkippingIntro = false,
             })
         {
             this.userIds = userIds;
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 4bd6340751..90600b0cf1 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -381,6 +381,9 @@ namespace osu.Game.Screens.Play
                 }
             };
 
+            if (!Configuration.AllowSkippingIntro)
+                skipOverlay.Expire();
+
             if (Configuration.AllowRestart)
             {
                 container.Add(new HotkeyRetryOverlay
diff --git a/osu.Game/Screens/Play/PlayerConfiguration.cs b/osu.Game/Screens/Play/PlayerConfiguration.cs
index 475a234679..cd30ead638 100644
--- a/osu.Game/Screens/Play/PlayerConfiguration.cs
+++ b/osu.Game/Screens/Play/PlayerConfiguration.cs
@@ -19,5 +19,10 @@ namespace osu.Game.Screens.Play
         /// Whether the player should be allowed to trigger a restart.
         /// </summary>
         public bool AllowRestart { get; set; } = true;
+
+        /// <summary>
+        /// Whether the player should be allowed to skip the intro, advancing to the start of gameplay.
+        /// </summary>
+        public bool AllowSkippingIntro { get; set; } = true;
     }
 }

From 3148c04fb89493c65159d177e208fc2f03b6187e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Dec 2020 16:53:25 +0900
Subject: [PATCH 0554/3722] Play a sound when starting a timeshift or
 multiplayer room

---
 osu.Game/Screens/Multi/Match/RoomSubScreen.cs | 20 +++++++++++++++++++
 .../RealtimeMatchSubScreen.cs                 |  6 +-----
 .../Multi/Timeshift/TimeshiftRoomSubScreen.cs | 10 +++-------
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Multi/Match/RoomSubScreen.cs b/osu.Game/Screens/Multi/Match/RoomSubScreen.cs
index b9d7408946..0598524e81 100644
--- a/osu.Game/Screens/Multi/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/RoomSubScreen.cs
@@ -4,6 +4,8 @@
 using System;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Screens;
 using osu.Game.Audio;
@@ -11,6 +13,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Overlays;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Screens.Multi.Match
 {
@@ -21,6 +24,8 @@ namespace osu.Game.Screens.Multi.Match
 
         public override bool DisallowExternalBeatmapRulesetChanges => true;
 
+        private SampleChannel sampleStart;
+
         [Resolved(typeof(Room), nameof(Room.Playlist))]
         protected BindableList<PlaylistItem> Playlist { get; private set; }
 
@@ -30,8 +35,17 @@ namespace osu.Game.Screens.Multi.Match
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
 
+        [Resolved(canBeNull: true)]
+        protected Multiplayer Multiplayer { get; private set; }
+
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
 
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio)
+        {
+            sampleStart = audio.Samples.Get(@"SongSelect/confirm-selection");
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -71,6 +85,12 @@ namespace osu.Game.Screens.Multi.Match
             return base.OnExiting(next);
         }
 
+        protected void StartPlay(Func<Player> player)
+        {
+            sampleStart?.Play();
+            Multiplayer?.Push(new PlayerLoader(player));
+        }
+
         private void selectedItemChanged()
         {
             updateWorkingBeatmap();
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
index 45ac7e25d3..15d997605c 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
@@ -16,7 +16,6 @@ using osu.Game.Screens.Multi.Match;
 using osu.Game.Screens.Multi.Match.Components;
 using osu.Game.Screens.Multi.RealtimeMultiplayer.Match;
 using osu.Game.Screens.Multi.RealtimeMultiplayer.Participants;
-using osu.Game.Screens.Play;
 using osu.Game.Users;
 using ParticipantsList = osu.Game.Screens.Multi.RealtimeMultiplayer.Participants.ParticipantsList;
 
@@ -29,9 +28,6 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
         public override string ShortTitle => "match";
 
-        [Resolved(canBeNull: true)]
-        private Multiplayer multiplayer { get; set; }
-
         [Resolved]
         private StatefulMultiplayerClient client { get; set; }
 
@@ -206,7 +202,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
             int[] userIds = client.Room.Users.Where(u => u.State >= MultiplayerUserState.WaitingForLoad).Select(u => u.UserID).ToArray();
 
-            multiplayer?.Push(new PlayerLoader(() => new RealtimePlayer(SelectedItem.Value, userIds)));
+            StartPlay(() => new RealtimePlayer(SelectedItem.Value, userIds));
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs
index fa901179e9..730ad795b2 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs
@@ -15,7 +15,6 @@ using osu.Game.Screens.Multi.Match;
 using osu.Game.Screens.Multi.Match.Components;
 using osu.Game.Screens.Multi.Play;
 using osu.Game.Screens.Multi.Ranking;
-using osu.Game.Screens.Play;
 using osu.Game.Screens.Select;
 using osu.Game.Users;
 using Footer = osu.Game.Screens.Multi.Match.Components.Footer;
@@ -220,12 +219,9 @@ namespace osu.Game.Screens.Multi.Timeshift
             }, true);
         }
 
-        private void onStart()
+        private void onStart() => StartPlay(() => new TimeshiftPlayer(SelectedItem.Value)
         {
-            multiplayer?.Push(new PlayerLoader(() => new TimeshiftPlayer(SelectedItem.Value)
-            {
-                Exited = () => leaderboard.RefreshScores()
-            }));
-        }
+            Exited = () => leaderboard.RefreshScores()
+        });
     }
 }

From c35454081c931b2d1e836698d4f11186d1c7f56e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Dec 2020 17:17:45 +0900
Subject: [PATCH 0555/3722] Add sound when players change ready state

---
 .../TestSceneRealtimeReadyButton.cs           | 31 ++++++++++++++++
 .../Match/RealtimeReadyButton.cs              | 36 +++++++++++++++++--
 2 files changed, 64 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs
index e9d3ddb32d..825470846c 100644
--- a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs
+++ b/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs
@@ -7,6 +7,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Graphics;
 using osu.Framework.Platform;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.RealtimeMultiplayer;
@@ -124,6 +125,36 @@ namespace osu.Game.Tests.Visual.RealtimeMultiplayer
             AddAssert("match not started", () => Client.Room?.Users[0].State == MultiplayerUserState.Idle);
         }
 
+        [TestCase(true)]
+        [TestCase(false)]
+        public void TestManyUsersChangingState(bool isHost)
+        {
+            const int users = 10;
+            AddStep("setup", () =>
+            {
+                Client.TransferHost(Client.Room?.Users[0].UserID ?? 0);
+                for (int i = 0; i < users; i++)
+                    Client.AddUser(new User { Id = i, Username = "Another user" });
+            });
+
+            if (!isHost)
+                AddStep("transfer host", () => Client.TransferHost(2));
+
+            addClickButtonStep();
+
+            AddRepeatStep("change user ready state", () =>
+            {
+                Client.ChangeUserState(RNG.Next(0, users), RNG.NextBool() ? MultiplayerUserState.Ready : MultiplayerUserState.Idle);
+            }, 20);
+
+            AddRepeatStep("ready all users", () =>
+            {
+                var nextUnready = Client.Room?.Users.FirstOrDefault(c => c.State == MultiplayerUserState.Idle);
+                if (nextUnready != null)
+                    Client.ChangeUserState(nextUnready.UserID, MultiplayerUserState.Ready);
+            }, users);
+        }
+
         private void addClickButtonStep() => AddStep("click button", () =>
         {
             InputManager.MoveMouseTo(button);
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs
index 5bead2b271..962c6bbead 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs
@@ -5,6 +5,8 @@ using System.Diagnostics;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Extensions;
@@ -31,8 +33,12 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
         [Resolved]
         private OsuColour colours { get; set; }
 
+        private SampleChannel sampleReadyCount;
+
         private readonly ButtonWithTrianglesExposed button;
 
+        private int countReady;
+
         public RealtimeReadyButton()
         {
             InternalChild = button = new ButtonWithTrianglesExposed
@@ -44,6 +50,12 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
             };
         }
 
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio)
+        {
+            sampleReadyCount = audio.Samples.Get(@"SongSelect/select-difficulty");
+        }
+
         protected override void OnRoomChanged()
         {
             base.OnRoomChanged();
@@ -60,6 +72,10 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
 
             Debug.Assert(Room != null);
 
+            int newCountReady = Room.Users.Count(u => u.State == MultiplayerUserState.Ready);
+
+            string countText = $"({newCountReady} / {Room.Users.Count} ready)";
+
             switch (localUser.State)
             {
                 case MultiplayerUserState.Idle:
@@ -70,18 +86,32 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
                 case MultiplayerUserState.Ready:
                     if (Room?.Host?.Equals(localUser) == true)
                     {
-                        int countReady = Room.Users.Count(u => u.State == MultiplayerUserState.Ready);
-                        button.Text = $"Start match ({countReady} / {Room.Users.Count} ready)";
+                        button.Text = $"Start match {countText}";
                         updateButtonColour(true);
                     }
                     else
                     {
-                        button.Text = "Waiting for host...";
+                        button.Text = $"Waiting for host... {countText}";
                         updateButtonColour(false);
                     }
 
                     break;
             }
+
+            if (newCountReady != countReady)
+            {
+                countReady = newCountReady;
+                Scheduler.AddOnce(playSound);
+            }
+        }
+
+        private void playSound()
+        {
+            if (sampleReadyCount != null)
+            {
+                sampleReadyCount.Frequency.Value = 0.77f + countReady * 0.06f;
+                sampleReadyCount.Play();
+            }
         }
 
         private void updateButtonColour(bool green)

From eb795a212730b87f947f35eb25586a802563b543 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Dec 2020 17:58:38 +0900
Subject: [PATCH 0556/3722] Move all endpoint information to a configuration
 class

---
 ...TestSceneMultiplayerGameplayLeaderboard.cs |  2 ++
 .../Visual/Gameplay/TestSceneSpectator.cs     |  6 ++++
 .../DevelopmentOsuConfigManager.cs            | 19 ++++++++++++
 osu.Game/Online/API/APIAccess.cs              | 18 ++++-------
 .../DevelopmentEndpointConfiguration.cs       | 17 +++++++++++
 osu.Game/Online/EndpointConfiguration.cs      | 30 +++++++++++++++++++
 .../Online/ProductionEndpointConfiguration.cs | 17 +++++++++++
 .../RealtimeMultiplayerClient.cs              | 13 ++++----
 .../Spectator/SpectatorStreamingClient.cs     | 13 ++++----
 osu.Game/OsuGameBase.cs                       | 18 +++++++----
 10 files changed, 124 insertions(+), 29 deletions(-)
 create mode 100644 osu.Game/Configuration/DevelopmentOsuConfigManager.cs
 create mode 100644 osu.Game/Online/DevelopmentEndpointConfiguration.cs
 create mode 100644 osu.Game/Online/EndpointConfiguration.cs
 create mode 100644 osu.Game/Online/ProductionEndpointConfiguration.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
index e42ddeb35e..8078c7b994 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Database;
+using osu.Game.Online;
 using osu.Game.Online.Spectator;
 using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets.Osu.Scoring;
@@ -87,6 +88,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             private readonly int totalUsers;
 
             public TestMultiplayerStreaming(int totalUsers)
+                : base(new DevelopmentEndpointConfiguration())
             {
                 this.totalUsers = totalUsers;
             }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 1fdff99da6..26524f07da 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -12,6 +12,7 @@ using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Online;
 using osu.Game.Online.Spectator;
 using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets.Osu;
@@ -238,6 +239,11 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             private int beatmapId;
 
+            public TestSpectatorStreamingClient()
+                : base(new DevelopmentEndpointConfiguration())
+            {
+            }
+
             protected override Task Connect()
             {
                 return Task.CompletedTask;
diff --git a/osu.Game/Configuration/DevelopmentOsuConfigManager.cs b/osu.Game/Configuration/DevelopmentOsuConfigManager.cs
new file mode 100644
index 0000000000..ff19dd874c
--- /dev/null
+++ b/osu.Game/Configuration/DevelopmentOsuConfigManager.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.Platform;
+using osu.Framework.Testing;
+
+namespace osu.Game.Configuration
+{
+    [ExcludeFromDynamicCompile]
+    public class DevelopmentOsuConfigManager : OsuConfigManager
+    {
+        protected override string Filename => base.Filename.Replace(".ini", ".dev.ini");
+
+        public DevelopmentOsuConfigManager(Storage storage)
+            : base(storage)
+        {
+        }
+    }
+}
diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index ca457ccf71..49c815b2d3 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -26,18 +26,10 @@ namespace osu.Game.Online.API
 
         private readonly OAuth authentication;
 
-#if DEBUG
-        public string Endpoint => @"https://dev.ppy.sh";
-        private const string client_secret = @"3LP2mhUrV89xxzD1YKNndXHEhWWCRLPNKioZ9ymT";
-#else
-        public string Endpoint => @"https://osu.ppy.sh";
-        private const string client_secret = @"FGc9GAtyHzeQDshWP5Ah7dega8hJACAJpQtw6OXk";
-#endif
-
-        private const string client_id = @"5";
-
         private readonly Queue<APIRequest> queue = new Queue<APIRequest>();
 
+        public string Endpoint { get; }
+
         /// <summary>
         /// The username/email provided by the user when initiating a login.
         /// </summary>
@@ -61,11 +53,13 @@ namespace osu.Game.Online.API
 
         private readonly Logger log;
 
-        public APIAccess(OsuConfigManager config)
+        public APIAccess(OsuConfigManager config, EndpointConfiguration endpointConfiguration)
         {
             this.config = config;
 
-            authentication = new OAuth(client_id, client_secret, Endpoint);
+            Endpoint = endpointConfiguration.APIEndpoint;
+
+            authentication = new OAuth(endpointConfiguration.APIClientID, endpointConfiguration.APIClientSecret, Endpoint);
             log = Logger.GetLogger(LoggingTarget.Network);
 
             ProvidedUsername = config.Get<string>(OsuSetting.Username);
diff --git a/osu.Game/Online/DevelopmentEndpointConfiguration.cs b/osu.Game/Online/DevelopmentEndpointConfiguration.cs
new file mode 100644
index 0000000000..5e4105f5fd
--- /dev/null
+++ b/osu.Game/Online/DevelopmentEndpointConfiguration.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace osu.Game.Online
+{
+    public class DevelopmentEndpointConfiguration : EndpointConfiguration
+    {
+        public DevelopmentEndpointConfiguration()
+        {
+            APIEndpoint = @"https://dev.ppy.sh";
+            APIClientSecret = @"3LP2mhUrV89xxzD1YKNndXHEhWWCRLPNKioZ9ymT";
+            APIClientID = "5";
+            SpectatorEndpoint = $"{APIEndpoint}/spectator";
+            MultiplayerEndpoint = $"{APIEndpoint}/multiplayer";
+        }
+    }
+}
diff --git a/osu.Game/Online/EndpointConfiguration.cs b/osu.Game/Online/EndpointConfiguration.cs
new file mode 100644
index 0000000000..a8b1a84e62
--- /dev/null
+++ b/osu.Game/Online/EndpointConfiguration.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.
+
+namespace osu.Game.Online
+{
+    /// <summary>
+    /// Holds configuration for API endpoints.
+    /// </summary>
+    public class EndpointConfiguration
+    {
+        /// <summary>
+        /// The endpoint for the main (osu-web) API.
+        /// </summary>
+        public string APIEndpoint { get; set; }
+
+        /// <summary>
+        /// The OAuth client secret.
+        /// </summary>
+        public string APIClientSecret { get; set; }
+
+        /// <summary>
+        /// The OAuth client ID.
+        /// </summary>
+        public string APIClientID { get; set; }
+
+        public string SpectatorEndpoint { get; set; }
+
+        public string MultiplayerEndpoint { get; set; }
+    }
+}
diff --git a/osu.Game/Online/ProductionEndpointConfiguration.cs b/osu.Game/Online/ProductionEndpointConfiguration.cs
new file mode 100644
index 0000000000..f5c71ef737
--- /dev/null
+++ b/osu.Game/Online/ProductionEndpointConfiguration.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace osu.Game.Online
+{
+    public class ProductionEndpointConfiguration : EndpointConfiguration
+    {
+        public ProductionEndpointConfiguration()
+        {
+            APIEndpoint = @"https://osu.ppy.sh";
+            APIClientSecret = @"FGc9GAtyHzeQDshWP5Ah7dega8hJACAJpQtw6OXk";
+            APIClientID = "5";
+            SpectatorEndpoint = "https://spectator.ppy.sh/spectator";
+            MultiplayerEndpoint = "https://spectator.ppy.sh/multiplayer";
+        }
+    }
+}
diff --git a/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
index 4ec5b9af40..0e2b4855da 100644
--- a/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
@@ -19,12 +19,6 @@ namespace osu.Game.Online.RealtimeMultiplayer
 {
     public class RealtimeMultiplayerClient : StatefulMultiplayerClient
     {
-#if DEBUG
-        private const string endpoint = "https://dev.ppy.sh/multiplayer";
-#else
-        private const string endpoint = "https://spectator.ppy.sh/multiplayer";
-#endif
-
         public override IBindable<bool> IsConnected => isConnected;
 
         private readonly Bindable<bool> isConnected = new Bindable<bool>();
@@ -35,6 +29,13 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
         private HubConnection? connection;
 
+        private readonly string endpoint;
+
+        public RealtimeMultiplayerClient(EndpointConfiguration endpoints)
+        {
+            endpoint = endpoints.MultiplayerEndpoint;
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index c9203b595e..1432fd1c98 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -81,6 +81,13 @@ namespace osu.Game.Online.Spectator
         /// </summary>
         public event Action<int, SpectatorState> OnUserFinishedPlaying;
 
+        private readonly string endpoint;
+
+        public SpectatorStreamingClient(EndpointConfiguration endpoints)
+        {
+            endpoint = endpoints.SpectatorEndpoint;
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -104,12 +111,6 @@ namespace osu.Game.Online.Spectator
             }
         }
 
-#if DEBUG
-        private const string endpoint = "https://dev.ppy.sh/spectator";
-#else
-        private const string endpoint = "https://spectator.ppy.sh/spectator";
-#endif
-
         protected virtual async Task Connect()
         {
             if (connection != null)
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index eb27821d82..bdc9e5eb7b 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -30,6 +30,7 @@ using osu.Game.Database;
 using osu.Game.Input;
 using osu.Game.Input.Bindings;
 using osu.Game.IO;
+using osu.Game.Online;
 using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Online.Spectator;
 using osu.Game.Overlays;
@@ -54,6 +55,8 @@ namespace osu.Game
 
         public const int SAMPLE_CONCURRENCY = 6;
 
+        public bool UseDevelopmentServer { get; }
+
         protected OsuConfigManager LocalConfig;
 
         protected BeatmapManager BeatmapManager;
@@ -132,6 +135,7 @@ namespace osu.Game
 
         public OsuGameBase()
         {
+            UseDevelopmentServer = DebugUtils.IsDebugBuild;
             Name = @"osu!lazer";
         }
 
@@ -170,7 +174,7 @@ namespace osu.Game
             dependencies.Cache(largeStore);
 
             dependencies.CacheAs(this);
-            dependencies.Cache(LocalConfig);
+            dependencies.CacheAs(LocalConfig);
 
             AddFont(Resources, @"Fonts/osuFont");
 
@@ -210,10 +214,12 @@ namespace osu.Game
                 }
             });
 
-            dependencies.CacheAs(API ??= new APIAccess(LocalConfig));
+            EndpointConfiguration endpoints = UseDevelopmentServer ? (EndpointConfiguration)new DevelopmentEndpointConfiguration() : new ProductionEndpointConfiguration();
 
-            dependencies.CacheAs(spectatorStreaming = new SpectatorStreamingClient());
-            dependencies.CacheAs(multiplayerClient = new RealtimeMultiplayerClient());
+            dependencies.CacheAs(API ??= new APIAccess(LocalConfig, endpoints));
+
+            dependencies.CacheAs(spectatorStreaming = new SpectatorStreamingClient(endpoints));
+            dependencies.CacheAs(multiplayerClient = new RealtimeMultiplayerClient(endpoints));
 
             var defaultBeatmap = new DummyWorkingBeatmap(Audio, Textures);
 
@@ -369,7 +375,9 @@ namespace osu.Game
             // may be non-null for certain tests
             Storage ??= host.Storage;
 
-            LocalConfig ??= new OsuConfigManager(Storage);
+            LocalConfig ??= UseDevelopmentServer
+                ? new DevelopmentOsuConfigManager(Storage)
+                : new OsuConfigManager(Storage);
         }
 
         protected override Storage CreateStorage(GameHost host, Storage defaultStorage) => new OsuStorage(host, defaultStorage);

From 323da82477304456af0c9a4bd04e089061c6ea3e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Dec 2020 18:11:40 +0900
Subject: [PATCH 0557/3722] Add website root URL and update most links to use
 it

For what it's worth, I intentionally didn't include news / changelog /
supporter, because these should never change.
---
 osu.Game/Online/API/APIAccess.cs                | 11 +++++++----
 osu.Game/Online/API/APIRequest.cs               |  2 +-
 osu.Game/Online/API/DummyAPIAccess.cs           |  4 +++-
 osu.Game/Online/API/IAPIProvider.cs             |  7 ++++++-
 osu.Game/Online/Chat/NowPlayingCommand.cs       |  2 +-
 .../Online/DevelopmentEndpointConfiguration.cs  |  6 +++---
 osu.Game/Online/EndpointConfiguration.cs        | 17 ++++++++++++++---
 .../Online/ProductionEndpointConfiguration.cs   |  6 +++---
 .../RealtimeMultiplayerClient.cs                |  2 +-
 .../Spectator/SpectatorStreamingClient.cs       |  2 +-
 osu.Game/OsuGame.cs                             |  2 +-
 osu.Game/Overlays/BeatmapSet/Header.cs          |  6 +++++-
 .../Profile/Header/BottomHeaderContainer.cs     |  6 +++++-
 .../Profile/Header/TopHeaderContainer.cs        |  6 +++++-
 .../Sections/Recent/DrawableRecentActivity.cs   |  2 +-
 15 files changed, 57 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index 49c815b2d3..133ba22406 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -28,7 +28,9 @@ namespace osu.Game.Online.API
 
         private readonly Queue<APIRequest> queue = new Queue<APIRequest>();
 
-        public string Endpoint { get; }
+        public string APIEndpointUrl { get; }
+
+        public string WebsiteRootUrl { get; }
 
         /// <summary>
         /// The username/email provided by the user when initiating a login.
@@ -57,9 +59,10 @@ namespace osu.Game.Online.API
         {
             this.config = config;
 
-            Endpoint = endpointConfiguration.APIEndpoint;
+            APIEndpointUrl = endpointConfiguration.APIEndpointUrl;
+            WebsiteRootUrl = endpointConfiguration.WebsiteRootUrl;
 
-            authentication = new OAuth(endpointConfiguration.APIClientID, endpointConfiguration.APIClientSecret, Endpoint);
+            authentication = new OAuth(endpointConfiguration.APIClientID, endpointConfiguration.APIClientSecret, APIEndpointUrl);
             log = Logger.GetLogger(LoggingTarget.Network);
 
             ProvidedUsername = config.Get<string>(OsuSetting.Username);
@@ -245,7 +248,7 @@ namespace osu.Game.Online.API
 
             var req = new RegistrationRequest
             {
-                Url = $@"{Endpoint}/users",
+                Url = $@"{APIEndpointUrl}/users",
                 Method = HttpMethod.Post,
                 Username = username,
                 Email = email,
diff --git a/osu.Game/Online/API/APIRequest.cs b/osu.Game/Online/API/APIRequest.cs
index 6912d9b629..a7174324d8 100644
--- a/osu.Game/Online/API/APIRequest.cs
+++ b/osu.Game/Online/API/APIRequest.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Online.API
 
         protected virtual WebRequest CreateWebRequest() => new OsuWebRequest(Uri);
 
-        protected virtual string Uri => $@"{API.Endpoint}/api/v2/{Target}";
+        protected virtual string Uri => $@"{API.APIEndpointUrl}/api/v2/{Target}";
 
         protected APIAccess API;
         protected WebRequest WebRequest;
diff --git a/osu.Game/Online/API/DummyAPIAccess.cs b/osu.Game/Online/API/DummyAPIAccess.cs
index 265298270c..3e996ac97f 100644
--- a/osu.Game/Online/API/DummyAPIAccess.cs
+++ b/osu.Game/Online/API/DummyAPIAccess.cs
@@ -28,7 +28,9 @@ namespace osu.Game.Online.API
 
         public string ProvidedUsername => LocalUser.Value.Username;
 
-        public string Endpoint => "http://localhost";
+        public string APIEndpointUrl => "http://localhost";
+
+        public string WebsiteRootUrl => "http://localhost";
 
         /// <summary>
         /// Provide handling logic for an arbitrary API request.
diff --git a/osu.Game/Online/API/IAPIProvider.cs b/osu.Game/Online/API/IAPIProvider.cs
index 3a444460f2..4407f1f55e 100644
--- a/osu.Game/Online/API/IAPIProvider.cs
+++ b/osu.Game/Online/API/IAPIProvider.cs
@@ -46,7 +46,12 @@ namespace osu.Game.Online.API
         /// <summary>
         /// The URL endpoint for this API. Does not include a trailing slash.
         /// </summary>
-        string Endpoint { get; }
+        string APIEndpointUrl { get; }
+
+        /// <summary>
+        /// The root URL of of the website, excluding the trailing slash.
+        /// </summary>
+        public string WebsiteRootUrl { get; }
 
         /// <summary>
         /// The current connection state of the API.
diff --git a/osu.Game/Online/Chat/NowPlayingCommand.cs b/osu.Game/Online/Chat/NowPlayingCommand.cs
index c0b54812b6..926709694b 100644
--- a/osu.Game/Online/Chat/NowPlayingCommand.cs
+++ b/osu.Game/Online/Chat/NowPlayingCommand.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Online.Chat
                     break;
             }
 
-            var beatmapString = beatmap.OnlineBeatmapID.HasValue ? $"[https://osu.ppy.sh/b/{beatmap.OnlineBeatmapID} {beatmap}]" : beatmap.ToString();
+            var beatmapString = beatmap.OnlineBeatmapID.HasValue ? $"[{api.WebsiteRootUrl}/b/{beatmap.OnlineBeatmapID} {beatmap}]" : beatmap.ToString();
 
             channelManager.PostMessage($"is {verb} {beatmapString}", true);
             Expire();
diff --git a/osu.Game/Online/DevelopmentEndpointConfiguration.cs b/osu.Game/Online/DevelopmentEndpointConfiguration.cs
index 5e4105f5fd..69531dbe1b 100644
--- a/osu.Game/Online/DevelopmentEndpointConfiguration.cs
+++ b/osu.Game/Online/DevelopmentEndpointConfiguration.cs
@@ -7,11 +7,11 @@ namespace osu.Game.Online
     {
         public DevelopmentEndpointConfiguration()
         {
-            APIEndpoint = @"https://dev.ppy.sh";
+            WebsiteRootUrl = APIEndpointUrl = @"https://dev.ppy.sh";
             APIClientSecret = @"3LP2mhUrV89xxzD1YKNndXHEhWWCRLPNKioZ9ymT";
             APIClientID = "5";
-            SpectatorEndpoint = $"{APIEndpoint}/spectator";
-            MultiplayerEndpoint = $"{APIEndpoint}/multiplayer";
+            SpectatorEndpointUrl = $"{APIEndpointUrl}/spectator";
+            MultiplayerEndpointUrl = $"{APIEndpointUrl}/multiplayer";
         }
     }
 }
diff --git a/osu.Game/Online/EndpointConfiguration.cs b/osu.Game/Online/EndpointConfiguration.cs
index a8b1a84e62..e347d3c653 100644
--- a/osu.Game/Online/EndpointConfiguration.cs
+++ b/osu.Game/Online/EndpointConfiguration.cs
@@ -8,10 +8,15 @@ namespace osu.Game.Online
     /// </summary>
     public class EndpointConfiguration
     {
+        /// <summary>
+        /// The base URL for the website.
+        /// </summary>
+        public string WebsiteRootUrl { get; set; }
+
         /// <summary>
         /// The endpoint for the main (osu-web) API.
         /// </summary>
-        public string APIEndpoint { get; set; }
+        public string APIEndpointUrl { get; set; }
 
         /// <summary>
         /// The OAuth client secret.
@@ -23,8 +28,14 @@ namespace osu.Game.Online
         /// </summary>
         public string APIClientID { get; set; }
 
-        public string SpectatorEndpoint { get; set; }
+        /// <summary>
+        /// The endpoint for the SignalR spectator server.
+        /// </summary>
+        public string SpectatorEndpointUrl { get; set; }
 
-        public string MultiplayerEndpoint { get; set; }
+        /// <summary>
+        /// The endpoint for the SignalR multiplayer server.
+        /// </summary>
+        public string MultiplayerEndpointUrl { get; set; }
     }
 }
diff --git a/osu.Game/Online/ProductionEndpointConfiguration.cs b/osu.Game/Online/ProductionEndpointConfiguration.cs
index f5c71ef737..c6ddc03564 100644
--- a/osu.Game/Online/ProductionEndpointConfiguration.cs
+++ b/osu.Game/Online/ProductionEndpointConfiguration.cs
@@ -7,11 +7,11 @@ namespace osu.Game.Online
     {
         public ProductionEndpointConfiguration()
         {
-            APIEndpoint = @"https://osu.ppy.sh";
+            WebsiteRootUrl = APIEndpointUrl = @"https://osu.ppy.sh";
             APIClientSecret = @"FGc9GAtyHzeQDshWP5Ah7dega8hJACAJpQtw6OXk";
             APIClientID = "5";
-            SpectatorEndpoint = "https://spectator.ppy.sh/spectator";
-            MultiplayerEndpoint = "https://spectator.ppy.sh/multiplayer";
+            SpectatorEndpointUrl = "https://spectator.ppy.sh/spectator";
+            MultiplayerEndpointUrl = "https://spectator.ppy.sh/multiplayer";
         }
     }
 }
diff --git a/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs b/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
index 0e2b4855da..bfc89df483 100644
--- a/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
+++ b/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
         public RealtimeMultiplayerClient(EndpointConfiguration endpoints)
         {
-            endpoint = endpoints.MultiplayerEndpoint;
+            endpoint = endpoints.MultiplayerEndpointUrl;
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 1432fd1c98..344b73f3d9 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Online.Spectator
 
         public SpectatorStreamingClient(EndpointConfiguration endpoints)
         {
-            endpoint = endpoints.SpectatorEndpoint;
+            endpoint = endpoints.SpectatorEndpointUrl;
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index bb51c55551..17831ed26b 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -294,7 +294,7 @@ namespace osu.Game
         public void OpenUrlExternally(string url) => waitForReady(() => externalLinkOpener, _ =>
         {
             if (url.StartsWith('/'))
-                url = $"{API.Endpoint}{url}";
+                url = $"{API.APIEndpointUrl}{url}";
 
             externalLinkOpener.OpenUrlExternally(url);
         });
diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs
index 06e31277dd..321e496511 100644
--- a/osu.Game/Overlays/BeatmapSet/Header.cs
+++ b/osu.Game/Overlays/BeatmapSet/Header.cs
@@ -15,6 +15,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online;
+using osu.Game.Online.API;
 using osu.Game.Overlays.BeatmapListing.Panels;
 using osu.Game.Overlays.BeatmapSet.Buttons;
 using osu.Game.Rulesets;
@@ -40,6 +41,9 @@ namespace osu.Game.Overlays.BeatmapSet
 
         public bool DownloadButtonsVisible => downloadButtonsContainer.Any();
 
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
         public BeatmapRulesetSelector RulesetSelector => beatmapSetHeader.RulesetSelector;
         public readonly BeatmapPicker Picker;
 
@@ -213,7 +217,7 @@ namespace osu.Game.Overlays.BeatmapSet
             Picker.Beatmap.ValueChanged += b =>
             {
                 Details.Beatmap = b.NewValue;
-                externalLink.Link = $@"https://osu.ppy.sh/beatmapsets/{BeatmapSet.Value?.OnlineBeatmapSetID}#{b.NewValue?.Ruleset.ShortName}/{b.NewValue?.OnlineBeatmapID}";
+                externalLink.Link = $@"{api.WebsiteRootUrl}/beatmapsets/{BeatmapSet.Value?.OnlineBeatmapSetID}#{b.NewValue?.Ruleset.ShortName}/{b.NewValue?.OnlineBeatmapID}";
             };
         }
 
diff --git a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
index ebee377a51..2925107766 100644
--- a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
@@ -12,6 +12,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
+using osu.Game.Online.API;
 using osu.Game.Users;
 using osuTK;
 using osuTK.Graphics;
@@ -27,6 +28,9 @@ namespace osu.Game.Overlays.Profile.Header
 
         private Color4 iconColour;
 
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
         public BottomHeaderContainer()
         {
             AutoSizeAxes = Axes.Y;
@@ -109,7 +113,7 @@ namespace osu.Game.Overlays.Profile.Header
             }
 
             topLinkContainer.AddText("Contributed ");
-            topLinkContainer.AddLink($@"{user.PostCount:#,##0} forum posts", $"https://osu.ppy.sh/users/{user.Id}/posts", creationParameters: embolden);
+            topLinkContainer.AddLink($@"{user.PostCount:#,##0} forum posts", $"{api.WebsiteRootUrl}/users/{user.Id}/posts", creationParameters: embolden);
 
             string websiteWithoutProtocol = user.Website;
 
diff --git a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
index 2cc1f6533f..e0642d650c 100644
--- a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.API;
 using osu.Game.Overlays.Profile.Header.Components;
 using osu.Game.Users;
 using osu.Game.Users.Drawables;
@@ -23,6 +24,9 @@ namespace osu.Game.Overlays.Profile.Header
 
         public readonly Bindable<User> User = new Bindable<User>();
 
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
         private SupporterIcon supporterTag;
         private UpdateableAvatar avatar;
         private OsuSpriteText usernameText;
@@ -166,7 +170,7 @@ namespace osu.Game.Overlays.Profile.Header
         {
             avatar.User = user;
             usernameText.Text = user?.Username ?? string.Empty;
-            openUserExternally.Link = $@"https://osu.ppy.sh/users/{user?.Id ?? 0}";
+            openUserExternally.Link = $@"{api.WebsiteRootUrl}/users/{user?.Id ?? 0}";
             userFlag.Country = user?.Country;
             userCountryText.Text = user?.Country?.FullName ?? "Alien";
             supporterTag.SupportLevel = user?.SupportLevel ?? 0;
diff --git a/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs b/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
index 8782e82642..49b46f7e7a 100644
--- a/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
+++ b/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
@@ -216,7 +216,7 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
         private void addBeatmapsetLink()
             => content.AddLink(activity.Beatmapset?.Title, LinkAction.OpenBeatmapSet, getLinkArgument(activity.Beatmapset?.Url), creationParameters: t => t.Font = getLinkFont());
 
-        private string getLinkArgument(string url) => MessageFormatter.GetLinkDetails($"{api.Endpoint}{url}").Argument;
+        private string getLinkArgument(string url) => MessageFormatter.GetLinkDetails($"{api.APIEndpointUrl}{url}").Argument;
 
         private FontUsage getLinkFont(FontWeight fontWeight = FontWeight.Regular)
             => OsuFont.GetFont(size: font_size, weight: fontWeight, italics: true);

From 261c250b46dae0db37151601a2d789c0e789b5f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 24 Dec 2020 11:33:49 +0100
Subject: [PATCH 0558/3722] Update outdated comment

---
 osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index 20b184bed3..b1179ea7cd 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -133,7 +133,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
             await client.ChangeState(MultiplayerUserState.FinishedPlay);
 
-            // Await up to 30 seconds for results to become available (3 api request timeouts).
+            // Await up to 60 seconds for results to become available (6 api request timeouts).
             // This is arbitrary just to not leave the player in an essentially deadlocked state if any connection issues occur.
             await Task.WhenAny(resultsReady.Task, Task.Delay(TimeSpan.FromSeconds(60)));
         }

From 40b9d1bc5ef7b3f0c63766a7478f278aaa565cc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 24 Dec 2020 12:45:01 +0100
Subject: [PATCH 0559/3722] Invert if & early-return to reduce nesting

---
 .../RealtimeMultiplayer/Match/RealtimeReadyButton.cs   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs
index 962c6bbead..be405feef1 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs
@@ -107,11 +107,11 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
 
         private void playSound()
         {
-            if (sampleReadyCount != null)
-            {
-                sampleReadyCount.Frequency.Value = 0.77f + countReady * 0.06f;
-                sampleReadyCount.Play();
-            }
+            if (sampleReadyCount == null)
+                return;
+
+            sampleReadyCount.Frequency.Value = 0.77f + countReady * 0.06f;
+            sampleReadyCount.Play();
         }
 
         private void updateButtonColour(bool green)

From 66a23c22e5580f6866db87aebfe503d195a2a8dd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Dec 2020 21:28:21 +0900
Subject: [PATCH 0560/3722] Fix various tests failing due to dependence on
 specific online data

---
 .../Online/TestSceneChangelogOverlay.cs       |  5 +-
 .../Online/TestSceneNowPlayingCommand.cs      |  2 +-
 .../Requests/Responses/APIChangelogEntry.cs   |  3 +-
 osu.Game/Overlays/Changelog/ChangelogBuild.cs | 49 ++++++++++---------
 osu.Game/Overlays/ChangelogOverlay.cs         |  1 +
 5 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
index 02f6de2269..998e42b478 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
@@ -41,6 +41,7 @@ namespace osu.Game.Tests.Visual.Online
         }
 
         [Test]
+        [Ignore("needs to be updated to not be so server dependent")]
         public void ShowWithBuild()
         {
             AddStep(@"Show with Lazer 2018.712.0", () =>
@@ -49,7 +50,7 @@ namespace osu.Game.Tests.Visual.Online
                 {
                     Version = "2018.712.0",
                     DisplayVersion = "2018.712.0",
-                    UpdateStream = new APIUpdateStream { Id = 7, Name = OsuGameBase.CLIENT_STREAM_NAME },
+                    UpdateStream = new APIUpdateStream { Id = 5, Name = OsuGameBase.CLIENT_STREAM_NAME },
                     ChangelogEntries = new List<APIChangelogEntry>
                     {
                         new APIChangelogEntry
@@ -64,7 +65,7 @@ namespace osu.Game.Tests.Visual.Online
 
             AddUntilStep(@"wait for streams", () => changelog.Streams?.Count > 0);
             AddAssert(@"correct build displayed", () => changelog.Current.Value.Version == "2018.712.0");
-            AddAssert(@"correct stream selected", () => changelog.Header.Streams.Current.Value.Id == 7);
+            AddAssert(@"correct stream selected", () => changelog.Header.Streams.Current.Value.Id == 5);
         }
 
         [Test]
diff --git a/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs b/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs
index 0324da6cf5..64e80e9f02 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNowPlayingCommand.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("Run command", () => Add(new NowPlayingCommand()));
 
             if (hasOnlineId)
-                AddAssert("Check link presence", () => postTarget.LastMessage.Contains("https://osu.ppy.sh/b/1234"));
+                AddAssert("Check link presence", () => postTarget.LastMessage.Contains("/b/1234"));
             else
                 AddAssert("Check link not present", () => !postTarget.LastMessage.Contains("https://"));
         }
diff --git a/osu.Game/Online/API/Requests/Responses/APIChangelogEntry.cs b/osu.Game/Online/API/Requests/Responses/APIChangelogEntry.cs
index f949ab5da5..1ff7523ba6 100644
--- a/osu.Game/Online/API/Requests/Responses/APIChangelogEntry.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIChangelogEntry.cs
@@ -48,6 +48,7 @@ namespace osu.Game.Online.API.Requests.Responses
     public enum ChangelogEntryType
     {
         Add,
-        Fix
+        Fix,
+        Misc
     }
 }
diff --git a/osu.Game/Overlays/Changelog/ChangelogBuild.cs b/osu.Game/Overlays/Changelog/ChangelogBuild.cs
index 48bf6c2ddd..65ff0fef92 100644
--- a/osu.Game/Overlays/Changelog/ChangelogBuild.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogBuild.cs
@@ -131,33 +131,36 @@ namespace osu.Game.Overlays.Changelog
                         t.Padding = new MarginPadding { Left = 10 };
                     });
 
-                    if (entry.GithubUser.UserId != null)
+                    if (entry.GithubUser != null)
                     {
-                        title.AddUserLink(new User
+                        if (entry.GithubUser.UserId != null)
                         {
-                            Username = entry.GithubUser.OsuUsername,
-                            Id = entry.GithubUser.UserId.Value
-                        }, t =>
+                            title.AddUserLink(new User
+                            {
+                                Username = entry.GithubUser.OsuUsername,
+                                Id = entry.GithubUser.UserId.Value
+                            }, t =>
+                            {
+                                t.Font = fontMedium;
+                                t.Colour = entryColour;
+                            });
+                        }
+                        else if (entry.GithubUser.GithubUrl != null)
                         {
-                            t.Font = fontMedium;
-                            t.Colour = entryColour;
-                        });
-                    }
-                    else if (entry.GithubUser.GithubUrl != null)
-                    {
-                        title.AddLink(entry.GithubUser.DisplayName, entry.GithubUser.GithubUrl, t =>
+                            title.AddLink(entry.GithubUser.DisplayName, entry.GithubUser.GithubUrl, t =>
+                            {
+                                t.Font = fontMedium;
+                                t.Colour = entryColour;
+                            });
+                        }
+                        else
                         {
-                            t.Font = fontMedium;
-                            t.Colour = entryColour;
-                        });
-                    }
-                    else
-                    {
-                        title.AddText(entry.GithubUser.DisplayName, t =>
-                        {
-                            t.Font = fontMedium;
-                            t.Colour = entryColour;
-                        });
+                            title.AddText(entry.GithubUser.DisplayName, t =>
+                            {
+                                t.Font = fontMedium;
+                                t.Colour = entryColour;
+                            });
+                        }
                     }
 
                     ChangelogEntries.Add(titleContainer);
diff --git a/osu.Game/Overlays/ChangelogOverlay.cs b/osu.Game/Overlays/ChangelogOverlay.cs
index c7e9a86fa4..f591b1d427 100644
--- a/osu.Game/Overlays/ChangelogOverlay.cs
+++ b/osu.Game/Overlays/ChangelogOverlay.cs
@@ -86,6 +86,7 @@ namespace osu.Game.Overlays
         }
 
         public void ShowListing()
+
         {
             Current.Value = null;
             Show();

From 4270c29f6083cea4abc28f9d82aef3bc6c5c222a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 24 Dec 2020 13:42:08 +0100
Subject: [PATCH 0561/3722] Trim stray newline

---
 osu.Game/Overlays/ChangelogOverlay.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/ChangelogOverlay.cs b/osu.Game/Overlays/ChangelogOverlay.cs
index f591b1d427..c7e9a86fa4 100644
--- a/osu.Game/Overlays/ChangelogOverlay.cs
+++ b/osu.Game/Overlays/ChangelogOverlay.cs
@@ -86,7 +86,6 @@ namespace osu.Game.Overlays
         }
 
         public void ShowListing()
-
         {
             Current.Value = null;
             Show();

From d5c348b568096b1a10fc2d2a04a0b2dd922c20e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 24 Dec 2020 13:44:46 +0100
Subject: [PATCH 0562/3722] Remove explicit public access modifier from
 interface

---
 osu.Game/Online/API/IAPIProvider.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/IAPIProvider.cs b/osu.Game/Online/API/IAPIProvider.cs
index 4407f1f55e..1951dfaf40 100644
--- a/osu.Game/Online/API/IAPIProvider.cs
+++ b/osu.Game/Online/API/IAPIProvider.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Online.API
         /// <summary>
         /// The root URL of of the website, excluding the trailing slash.
         /// </summary>
-        public string WebsiteRootUrl { get; }
+        string WebsiteRootUrl { get; }
 
         /// <summary>
         /// The current connection state of the API.

From f991448a3e6f359efa277f4491c472421c311ca9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Dec 2020 21:49:38 +0900
Subject: [PATCH 0563/3722] Re-sort the leaderboard order a maximum of once a
 second

---
 .../Screens/Play/HUD/GameplayLeaderboard.cs     | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index cab1cbd3f1..e33cc05e64 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Linq;
+using osu.Framework.Caching;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Users;
@@ -12,6 +13,8 @@ namespace osu.Game.Screens.Play.HUD
 {
     public class GameplayLeaderboard : FillFlowContainer<GameplayLeaderboardScore>
     {
+        private readonly Cached sorting = new Cached();
+
         public GameplayLeaderboard()
         {
             Width = GameplayLeaderboardScore.EXTENDED_WIDTH + GameplayLeaderboardScore.SHEAR_WIDTH;
@@ -24,6 +27,13 @@ namespace osu.Game.Screens.Play.HUD
             LayoutEasing = Easing.OutQuint;
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Scheduler.AddDelayed(sort, 1000, true);
+        }
+
         /// <summary>
         /// Adds a player to the leaderboard.
         /// </summary>
@@ -41,7 +51,7 @@ namespace osu.Game.Screens.Play.HUD
             };
 
             base.Add(drawable);
-            drawable.TotalScore.BindValueChanged(_ => Scheduler.AddOnce(sort), true);
+            drawable.TotalScore.BindValueChanged(_ => sorting.Invalidate(), true);
 
             Height = Count * (GameplayLeaderboardScore.PANEL_HEIGHT + Spacing.Y);
 
@@ -55,6 +65,9 @@ namespace osu.Game.Screens.Play.HUD
 
         private void sort()
         {
+            if (sorting.IsValid)
+                return;
+
             var orderedByScore = this.OrderByDescending(i => i.TotalScore.Value).ToList();
 
             for (int i = 0; i < Count; i++)
@@ -62,6 +75,8 @@ namespace osu.Game.Screens.Play.HUD
                 SetLayoutPosition(orderedByScore[i], i);
                 orderedByScore[i].ScorePosition = i + 1;
             }
+
+            sorting.Validate();
         }
     }
 }

From aec25e2d73079043d810fbc97da19441c1b1c581 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Dec 2020 21:53:18 +0900
Subject: [PATCH 0564/3722] Rename "timeshift" to "playlists"

This only covers the user-facing instances. Code and class name changes
will happen once things have calmed down.
---
 osu.Game/Screens/Menu/ButtonSystem.cs | 2 +-
 osu.Game/Screens/Menu/Disclaimer.cs   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index badfa3f693..5af6517f49 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -125,7 +125,7 @@ namespace osu.Game.Screens.Menu
         {
             buttonsPlay.Add(new Button(@"solo", @"button-solo-select", FontAwesome.Solid.User, new Color4(102, 68, 204, 255), () => OnSolo?.Invoke(), WEDGE_WIDTH, Key.P));
             buttonsPlay.Add(new Button(@"multi", @"button-generic-select", FontAwesome.Solid.Users, new Color4(94, 63, 186, 255), onMultiplayer, 0, Key.M));
-            buttonsPlay.Add(new Button(@"timeshift", @"button-generic-select", OsuIcon.Charts, new Color4(94, 63, 186, 255), onTimeshift, 0, Key.L));
+            buttonsPlay.Add(new Button(@"playlists", @"button-generic-select", OsuIcon.Charts, new Color4(94, 63, 186, 255), onTimeshift, 0, Key.L));
             buttonsPlay.ForEach(b => b.VisibleState = ButtonSystemState.Play);
 
             buttonsTopLevel.Add(new Button(@"play", @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));
diff --git a/osu.Game/Screens/Menu/Disclaimer.cs b/osu.Game/Screens/Menu/Disclaimer.cs
index ceec12c967..9c7206d259 100644
--- a/osu.Game/Screens/Menu/Disclaimer.cs
+++ b/osu.Game/Screens/Menu/Disclaimer.cs
@@ -208,7 +208,7 @@ namespace osu.Game.Screens.Menu
                 "Most of the web content (profiles, rankings, etc.) are available natively in-game from the icons on the toolbar!",
                 "Get more details, hide or delete a beatmap by right-clicking on its panel at song select!",
                 "All delete operations are temporary until exiting. Restore accidentally deleted content from the maintenance settings!",
-                "Check out the \"timeshift\" multiplayer system, which has local permanent leaderboards and playlist support!",
+                "Check out the \"playlist\" system, which lets users create their own custom and permanent leaderboards!",
                 "Toggle advanced frame / thread statistics with Ctrl-F11!",
                 "Take a look under the hood at performance counters and enable verbose performance logging with Ctrl-F2!",
             };

From 3a46e210d48d903bc631021979518f1fcab59293 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Dec 2020 21:59:10 +0900
Subject: [PATCH 0565/3722] Change low-hanging references of "room" to
 "playlist"

---
 osu.Game/Screens/Multi/Multiplayer.cs                       | 6 +++---
 .../Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs        | 2 +-
 .../Screens/Multi/Timeshift/CreateTimeshiftRoomButton.cs    | 2 +-
 osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs    | 6 ++++++
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index a7d40a89d3..585ac71189 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Screens.Multi
         private OsuGameBase game { get; set; }
 
         [Resolved]
-        private IAPIProvider api { get; set; }
+        protected IAPIProvider API { get; private set; }
 
         [Resolved(CanBeNull = true)]
         private OsuLogo logo { get; set; }
@@ -155,7 +155,7 @@ namespace osu.Game.Screens.Multi
         [BackgroundDependencyLoader(true)]
         private void load(IdleTracker idleTracker)
         {
-            apiState.BindTo(api.State);
+            apiState.BindTo(API.State);
             apiState.BindValueChanged(onlineStateChanged, true);
 
             if (idleTracker != null)
@@ -269,7 +269,7 @@ namespace osu.Game.Screens.Multi
         /// Creates a new room.
         /// </summary>
         /// <returns>The created <see cref="Room"/>.</returns>
-        protected virtual Room CreateNewRoom() => new Room { Name = { Value = $"{api.LocalUser}'s awesome room" } };
+        protected abstract Room CreateNewRoom();
 
         private void screenPushed(IScreen lastScreen, IScreen newScreen)
         {
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
index 6739a51fe8..e15a6bd408 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
         protected override Room CreateNewRoom()
         {
-            var room = base.CreateNewRoom();
+            var room = new Room { Name = { Value = $"{API.LocalUser}'s awesome room" } };
             room.Category.Value = RoomCategory.Realtime;
             return room;
         }
diff --git a/osu.Game/Screens/Multi/Timeshift/CreateTimeshiftRoomButton.cs b/osu.Game/Screens/Multi/Timeshift/CreateTimeshiftRoomButton.cs
index bd9d667630..0424493472 100644
--- a/osu.Game/Screens/Multi/Timeshift/CreateTimeshiftRoomButton.cs
+++ b/osu.Game/Screens/Multi/Timeshift/CreateTimeshiftRoomButton.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Screens.Multi.Timeshift
         {
             Triangles.TriangleScale = 1.5f;
 
-            Text = "Create room";
+            Text = "Create playlist";
         }
     }
 }
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
index d525a3800d..e1b94f8455 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Components;
 using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Match;
@@ -45,6 +46,11 @@ namespace osu.Game.Screens.Multi.Timeshift
             Logger.Log($"Polling adjusted (listing: {timeshiftManager.TimeBetweenListingPolls.Value}, selection: {timeshiftManager.TimeBetweenSelectionPolls.Value})");
         }
 
+        protected override Room CreateNewRoom()
+        {
+            return new Room { Name = { Value = $"{API.LocalUser}'s awesome playlist" } };
+        }
+
         protected override RoomManager CreateRoomManager() => new TimeshiftRoomManager();
 
         protected override LoungeSubScreen CreateLounge() => new TimeshiftLoungeSubScreen();

From d0e834796818beedbfbb9ecb3ab70dfd8bb18b5a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 24 Dec 2020 22:28:25 +0900
Subject: [PATCH 0566/3722] Change asserts into until steps

---
 .../Gameplay/TestSceneGameplayLeaderboard.cs   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
index ca61672ef9..c0a021436e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
@@ -52,19 +52,19 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("add player 2", () => createLeaderboardScore(player2Score, new User { Username = "Player 2" }));
             AddStep("add player 3", () => createLeaderboardScore(player3Score, new User { Username = "Player 3" }));
 
-            AddAssert("is player 2 position #1", () => leaderboard.CheckPositionByUsername("Player 2", 1));
-            AddAssert("is player position #2", () => leaderboard.CheckPositionByUsername("You", 2));
-            AddAssert("is player 3 position #3", () => leaderboard.CheckPositionByUsername("Player 3", 3));
+            AddUntilStep("is player 2 position #1", () => leaderboard.CheckPositionByUsername("Player 2", 1));
+            AddUntilStep("is player position #2", () => leaderboard.CheckPositionByUsername("You", 2));
+            AddUntilStep("is player 3 position #3", () => leaderboard.CheckPositionByUsername("Player 3", 3));
 
             AddStep("set score above player 3", () => player2Score.Value = playerScore.Value - 500);
-            AddAssert("is player position #1", () => leaderboard.CheckPositionByUsername("You", 1));
-            AddAssert("is player 2 position #2", () => leaderboard.CheckPositionByUsername("Player 2", 2));
-            AddAssert("is player 3 position #3", () => leaderboard.CheckPositionByUsername("Player 3", 3));
+            AddUntilStep("is player position #1", () => leaderboard.CheckPositionByUsername("You", 1));
+            AddUntilStep("is player 2 position #2", () => leaderboard.CheckPositionByUsername("Player 2", 2));
+            AddUntilStep("is player 3 position #3", () => leaderboard.CheckPositionByUsername("Player 3", 3));
 
             AddStep("set score below players", () => player2Score.Value = playerScore.Value - 123456);
-            AddAssert("is player position #1", () => leaderboard.CheckPositionByUsername("You", 1));
-            AddAssert("is player 3 position #2", () => leaderboard.CheckPositionByUsername("Player 3", 2));
-            AddAssert("is player 2 position #3", () => leaderboard.CheckPositionByUsername("Player 2", 3));
+            AddUntilStep("is player position #1", () => leaderboard.CheckPositionByUsername("You", 1));
+            AddUntilStep("is player 3 position #2", () => leaderboard.CheckPositionByUsername("Player 3", 2));
+            AddUntilStep("is player 2 position #3", () => leaderboard.CheckPositionByUsername("Player 2", 3));
         }
 
         [Test]

From 76a7aabfe86b73d5619ff4b3e0d6d23e74907f00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 24 Dec 2020 14:32:30 +0100
Subject: [PATCH 0567/3722] Always create realtime-specific player elements
 regardless of token

---
 .../Multi/RealtimeMultiplayer/RealtimePlayer.cs   | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index 07d21995ce..8eb6a11228 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Diagnostics;
 using System.Threading.Tasks;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Logging;
@@ -35,7 +34,6 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
         private readonly TaskCompletionSource<bool> resultsReady = new TaskCompletionSource<bool>();
 
-        [CanBeNull]
         private MultiplayerGameplayLeaderboard leaderboard;
 
         private readonly int[] userIds;
@@ -61,6 +59,11 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         [BackgroundDependencyLoader]
         private void load()
         {
+            // todo: this should be implemented via a custom HUD implementation, and correctly masked to the main content area.
+            LoadComponentAsync(leaderboard = new MultiplayerGameplayLeaderboard(ScoreProcessor, userIds), HUDOverlay.Add);
+
+            HUDOverlay.Add(loadingDisplay = new LoadingLayer(DrawableRuleset) { Depth = float.MaxValue });
+
             if (Token == null)
                 return; // Todo: Somehow handle token retrieval failure.
 
@@ -84,11 +87,6 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             }, true);
 
             Debug.Assert(client.Room != null);
-
-            // todo: this should be implemented via a custom HUD implementation, and correctly masked to the main content area.
-            LoadComponentAsync(leaderboard = new MultiplayerGameplayLeaderboard(ScoreProcessor, userIds), HUDOverlay.Add);
-
-            HUDOverlay.Add(loadingDisplay = new LoadingLayer(DrawableRuleset) { Depth = float.MaxValue });
         }
 
         protected override void StartGameplay()
@@ -115,9 +113,6 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
         private void adjustLeaderboardPosition()
         {
-            if (leaderboard == null)
-                return;
-
             const float padding = 44; // enough margin to avoid the hit error display.
 
             leaderboard.Position = new Vector2(

From a97681a5daa18b6e4374a901b65e836a1bef82eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 24 Dec 2020 15:07:03 +0100
Subject: [PATCH 0568/3722] Proxy screen transition events to subscreens in
 multiplayer

---
 osu.Game/Screens/Multi/Multiplayer.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index a7d40a89d3..c4259400fa 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -202,6 +202,11 @@ namespace osu.Game.Screens.Multi
         {
             this.FadeIn();
             waves.Show();
+
+            if (loungeSubScreen.IsCurrentScreen())
+                loungeSubScreen.OnEntering(last);
+            else
+                loungeSubScreen.MakeCurrent();
         }
 
         public override void OnResuming(IScreen last)
@@ -209,6 +214,7 @@ namespace osu.Game.Screens.Multi
             this.FadeIn(250);
             this.ScaleTo(1, 250, Easing.OutSine);
 
+            screenStack.CurrentScreen?.OnResuming(last);
             base.OnResuming(last);
 
             UpdatePollingRate(isIdle.Value);
@@ -219,6 +225,8 @@ namespace osu.Game.Screens.Multi
             this.ScaleTo(1.1f, 250, Easing.InSine);
             this.FadeOut(250);
 
+            screenStack.CurrentScreen?.OnSuspending(next);
+
             UpdatePollingRate(isIdle.Value);
         }
 
@@ -230,9 +238,7 @@ namespace osu.Game.Screens.Multi
 
             this.Delay(WaveContainer.DISAPPEAR_DURATION).FadeOut();
 
-            if (screenStack.CurrentScreen != null)
-                loungeSubScreen.MakeCurrent();
-
+            screenStack.CurrentScreen?.OnExiting(next);
             base.OnExiting(next);
             return false;
         }

From 7f0f6d86b0f931401e4fb8b347485ff6656ee354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 24 Dec 2020 16:08:45 +0100
Subject: [PATCH 0569/3722] Rename {room -> playlist} on playlist room screen

---
 osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs
index 730ad795b2..4a66f09a22 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Screens.Multi.Timeshift
     {
         public override string Title { get; }
 
-        public override string ShortTitle => "room";
+        public override string ShortTitle => "playlist";
 
         [Resolved(typeof(Room), nameof(Room.RoomID))]
         private Bindable<int?> roomId { get; set; }
@@ -40,7 +40,7 @@ namespace osu.Game.Screens.Multi.Timeshift
 
         public TimeshiftRoomSubScreen(Room room)
         {
-            Title = room.RoomID.Value == null ? "New room" : room.Name.Value;
+            Title = room.RoomID.Value == null ? "New playlist" : room.Name.Value;
             Activity.Value = new UserActivity.InLobby(room);
         }
 

From db1c11073f430edd13aa8a480b0e30233de4697e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 24 Dec 2020 16:10:29 +0100
Subject: [PATCH 0570/3722] Rename back to "room" for "realtime" multiplayer

---
 .../Multi/RealtimeMultiplayer/CreateRealtimeMatchButton.cs    | 2 +-
 .../Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/CreateRealtimeMatchButton.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/CreateRealtimeMatchButton.cs
index eda907f8cb..cdaeb6faec 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/CreateRealtimeMatchButton.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/CreateRealtimeMatchButton.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         {
             Triangles.TriangleScale = 1.5f;
 
-            Text = "Create match";
+            Text = "Create room";
 
             ((IBindable<bool>)Enabled).BindTo(multiplayerClient.IsConnected);
         }
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
index 15d997605c..1778bc272c 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
     {
         public override string Title { get; }
 
-        public override string ShortTitle => "match";
+        public override string ShortTitle => "room";
 
         [Resolved]
         private StatefulMultiplayerClient client { get; set; }
@@ -37,7 +37,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
         public RealtimeMatchSubScreen(Room room)
         {
-            Title = room.RoomID.Value == null ? "New match" : room.Name.Value;
+            Title = room.RoomID.Value == null ? "New room" : room.Name.Value;
             Activity.Value = new UserActivity.InLobby(room);
         }
 

From 6ec045f2353e80534efc1961990ac3d04adf58f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 24 Dec 2020 16:18:35 +0100
Subject: [PATCH 0571/3722] Distinguish primary multi screen titles in header

---
 osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs | 2 +-
 osu.Game/Screens/Multi/Header.cs                          | 8 ++++----
 osu.Game/Screens/Multi/Multiplayer.cs                     | 4 +++-
 .../Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs      | 2 ++
 osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs  | 2 ++
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs
index 76ab402b72..0ccd882d95 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             Children = new Drawable[]
             {
                 screenStack,
-                new Header(screenStack)
+                new Header("Multiplayer", screenStack)
             };
 
             AddStep("push multi screen", () => screenStack.CurrentScreen.Push(new TestMultiplayerSubScreen(++index)));
diff --git a/osu.Game/Screens/Multi/Header.cs b/osu.Game/Screens/Multi/Header.cs
index cd8695286b..637d8bb52b 100644
--- a/osu.Game/Screens/Multi/Header.cs
+++ b/osu.Game/Screens/Multi/Header.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Screens.Multi
     {
         public const float HEIGHT = 80;
 
-        public Header(ScreenStack stack)
+        public Header(string mainTitle, ScreenStack stack)
         {
             RelativeSizeAxes = Axes.X;
             Height = HEIGHT;
@@ -45,7 +45,7 @@ namespace osu.Game.Screens.Multi
                     Padding = new MarginPadding { Left = WaveOverlayContainer.WIDTH_PADDING + OsuScreen.HORIZONTAL_OVERFLOW_PADDING },
                     Children = new Drawable[]
                     {
-                        title = new MultiHeaderTitle
+                        title = new MultiHeaderTitle(mainTitle)
                         {
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.BottomLeft,
@@ -80,7 +80,7 @@ namespace osu.Game.Screens.Multi
                 set => pageTitle.Text = value.ShortTitle.Titleize();
             }
 
-            public MultiHeaderTitle()
+            public MultiHeaderTitle(string mainTitle)
             {
                 AutoSizeAxes = Axes.Both;
 
@@ -98,7 +98,7 @@ namespace osu.Game.Screens.Multi
                                 Anchor = Anchor.CentreLeft,
                                 Origin = Anchor.CentreLeft,
                                 Font = OsuFont.GetFont(size: 24),
-                                Text = "Multiplayer"
+                                Text = mainTitle
                             },
                             dot = new OsuSpriteText
                             {
diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index 585ac71189..56c1c6cb37 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -127,7 +127,7 @@ namespace osu.Game.Screens.Multi
                             screenStack = new MultiplayerSubScreenStack { RelativeSizeAxes = Axes.Both }
                         }
                     },
-                    new Header(screenStack),
+                    new Header(ScreenTitle, screenStack),
                     createButton = CreateNewMultiplayerGameButton().With(button =>
                     {
                         button.Anchor = Anchor.TopRight;
@@ -311,6 +311,8 @@ namespace osu.Game.Screens.Multi
 
         protected IScreen CurrentSubScreen => screenStack.CurrentScreen;
 
+        protected abstract string ScreenTitle { get; }
+
         protected abstract RoomManager CreateRoomManager();
 
         protected abstract LoungeSubScreen CreateLounge();
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
index e15a6bd408..70308844b0 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
@@ -62,6 +62,8 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             return room;
         }
 
+        protected override string ScreenTitle => "Multiplayer";
+
         protected override RoomManager CreateRoomManager() => new RealtimeRoomManager();
 
         protected override LoungeSubScreen CreateLounge() => new RealtimeLoungeSubScreen();
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs b/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
index e1b94f8455..60b01ee431 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
+++ b/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
@@ -51,6 +51,8 @@ namespace osu.Game.Screens.Multi.Timeshift
             return new Room { Name = { Value = $"{API.LocalUser}'s awesome playlist" } };
         }
 
+        protected override string ScreenTitle => "Playlists";
+
         protected override RoomManager CreateRoomManager() => new TimeshiftRoomManager();
 
         protected override LoungeSubScreen CreateLounge() => new TimeshiftLoungeSubScreen();

From 60c7c8b63badedf7c0bef7ec7b5c365d1877e486 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Dec 2020 00:44:42 +0900
Subject: [PATCH 0572/3722] Pluralise playlists in tip

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

diff --git a/osu.Game/Screens/Menu/Disclaimer.cs b/osu.Game/Screens/Menu/Disclaimer.cs
index 9c7206d259..46fddabb26 100644
--- a/osu.Game/Screens/Menu/Disclaimer.cs
+++ b/osu.Game/Screens/Menu/Disclaimer.cs
@@ -208,7 +208,7 @@ namespace osu.Game.Screens.Menu
                 "Most of the web content (profiles, rankings, etc.) are available natively in-game from the icons on the toolbar!",
                 "Get more details, hide or delete a beatmap by right-clicking on its panel at song select!",
                 "All delete operations are temporary until exiting. Restore accidentally deleted content from the maintenance settings!",
-                "Check out the \"playlist\" system, which lets users create their own custom and permanent leaderboards!",
+                "Check out the \"playlists\" system, which lets users create their own custom and permanent leaderboards!",
                 "Toggle advanced frame / thread statistics with Ctrl-F11!",
                 "Take a look under the hood at performance counters and enable verbose performance logging with Ctrl-F2!",
             };

From a1384942b1e6b2720988cb4618f9eab7bf8058cb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Dec 2020 13:11:21 +0900
Subject: [PATCH 0573/3722] Timeshift -> Playlists at a code level

---
 .../TestSceneMatchSettingsOverlay.cs          |  4 +--
 .../Multiplayer/TestSceneMultiScreen.cs       |  4 +--
 ....cs => TestScenePlaylistsFilterControl.cs} |  6 ++--
 ...s => TestScenePlaylistsLoungeSubScreen.cs} |  6 ++--
 ... => TestScenePlaylistsParticipantsList.cs} |  2 +-
 ....cs => TestScenePlaylistsResultsScreen.cs} |  4 +--
 ....cs => TestScenePlaylistsRoomSubScreen.cs} | 14 ++++-----
 .../Navigation/TestSceneScreenNavigation.cs   |  6 ++--
 .../GameTypes/GameTypeTimeshift.cs            |  4 +--
 osu.Game/Online/Multiplayer/Room.cs           |  2 +-
 osu.Game/Screens/Menu/ButtonSystem.cs         |  8 ++---
 osu.Game/Screens/Menu/MainMenu.cs             |  4 +--
 .../Components/TimeshiftFilterControl.cs      | 14 ++++-----
 .../Screens/Multi/Match/Components/Footer.cs  |  4 +--
 .../Multi/Match/Components/GameTypePicker.cs  |  2 +-
 .../Screens/Multi/Play/TimeshiftPlayer.cs     |  8 ++---
 .../CreatePlaylistsRoomButton.cs}             |  4 +--
 .../PlaylistsLoungeSubScreen.cs}              |  8 ++---
 .../PlaylistsMatchSettingsOverlay.cs}         |  4 +--
 .../PlaylistsMultiplayer.cs}                  | 30 +++++++++----------
 .../PlaylistsReadyButton.cs}                  |  6 ++--
 .../PlaylistsRoomManager.cs}                  |  4 +--
 .../PlaylistsRoomSubScreen.cs}                | 12 ++++----
 .../Multi/Ranking/TimeshiftResultsScreen.cs   |  4 +--
 .../RealtimeMultiplayer.cs                    | 16 +++++-----
 .../RealtimeMultiplayer/RealtimePlayer.cs     |  4 +--
 .../RealtimeResultsScreen.cs                  |  2 +-
 27 files changed, 93 insertions(+), 93 deletions(-)
 rename osu.Game.Tests/Visual/Multiplayer/{TestSceneTimeshiftFilterControl.cs => TestScenePlaylistsFilterControl.cs} (76%)
 rename osu.Game.Tests/Visual/Multiplayer/{TestSceneTimeshiftLoungeSubScreen.cs => TestScenePlaylistsLoungeSubScreen.cs} (93%)
 rename osu.Game.Tests/Visual/Multiplayer/{TestSceneTimeshiftParticipantsList.cs => TestScenePlaylistsParticipantsList.cs} (95%)
 rename osu.Game.Tests/Visual/Multiplayer/{TestSceneTimeshiftResultsScreen.cs => TestScenePlaylistsResultsScreen.cs} (99%)
 rename osu.Game.Tests/Visual/Multiplayer/{TestSceneTimeshiftRoomSubScreen.cs => TestScenePlaylistsRoomSubScreen.cs} (93%)
 rename osu.Game/Screens/Multi/{Timeshift/CreateTimeshiftRoomButton.cs => Playlists/CreatePlaylistsRoomButton.cs} (79%)
 rename osu.Game/Screens/Multi/{Timeshift/TimeshiftLoungeSubScreen.cs => Playlists/PlaylistsLoungeSubScreen.cs} (71%)
 rename osu.Game/Screens/Multi/{Timeshift/TimeshiftMatchSettingsOverlay.cs => Playlists/PlaylistsMatchSettingsOverlay.cs} (99%)
 rename osu.Game/Screens/Multi/{Timeshift/TimeshiftMultiplayer.cs => Playlists/PlaylistsMultiplayer.cs} (62%)
 rename osu.Game/Screens/Multi/{Timeshift/TimeshiftReadyButton.cs => Playlists/PlaylistsReadyButton.cs} (88%)
 rename osu.Game/Screens/Multi/{Timeshift/TimeshiftRoomManager.cs => Playlists/PlaylistsRoomManager.cs} (89%)
 rename osu.Game/Screens/Multi/{Timeshift/TimeshiftRoomSubScreen.cs => Playlists/PlaylistsRoomSubScreen.cs} (97%)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
index 1fcae9c709..90abecd26d 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
@@ -11,7 +11,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi;
-using osu.Game.Screens.Multi.Timeshift;
+using osu.Game.Screens.Multi.Playlists;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
@@ -109,7 +109,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddUntilStep("error not displayed", () => !settings.ErrorText.IsPresent);
         }
 
-        private class TestRoomSettings : TimeshiftMatchSettingsOverlay
+        private class TestRoomSettings : PlaylistsMatchSettingsOverlay
         {
             public TriangleButton ApplyButton => ((MatchSettings)Settings).ApplyButton;
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs
index 0390b995e1..9ac1eb8013 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs
@@ -4,7 +4,7 @@
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Game.Overlays;
-using osu.Game.Screens.Multi.Timeshift;
+using osu.Game.Screens.Multi.Playlists;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
@@ -18,7 +18,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         public TestSceneMultiScreen()
         {
-            var multi = new TimeshiftMultiplayer();
+            var multi = new PlaylistsMultiplayer();
 
             AddStep("show", () => LoadScreen(multi));
             AddUntilStep("wait for loaded", () => multi.IsLoaded);
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftFilterControl.cs b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsFilterControl.cs
similarity index 76%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftFilterControl.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsFilterControl.cs
index f635a28b5c..427a69552d 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftFilterControl.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsFilterControl.cs
@@ -6,11 +6,11 @@ using osu.Game.Screens.Multi.Lounge.Components;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneTimeshiftFilterControl : OsuTestScene
+    public class TestScenePlaylistsFilterControl : OsuTestScene
     {
-        public TestSceneTimeshiftFilterControl()
+        public TestScenePlaylistsFilterControl()
         {
-            Child = new TimeshiftFilterControl
+            Child = new PlaylistsFilterControl
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftLoungeSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsLoungeSubScreen.cs
similarity index 93%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftLoungeSubScreen.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsLoungeSubScreen.cs
index 73afd65d6d..f8788f0c36 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftLoungeSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsLoungeSubScreen.cs
@@ -10,11 +10,11 @@ using osu.Framework.Testing;
 using osu.Game.Graphics.Containers;
 using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Lounge.Components;
-using osu.Game.Screens.Multi.Timeshift;
+using osu.Game.Screens.Multi.Playlists;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneTimeshiftLoungeSubScreen : RoomManagerTestScene
+    public class TestScenePlaylistsLoungeSubScreen : RoomManagerTestScene
     {
         private LoungeSubScreen loungeScreen;
 
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             base.SetUpSteps();
 
-            AddStep("push screen", () => LoadScreen(loungeScreen = new TimeshiftLoungeSubScreen
+            AddStep("push screen", () => LoadScreen(loungeScreen = new PlaylistsLoungeSubScreen
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsParticipantsList.cs
similarity index 95%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftParticipantsList.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsParticipantsList.cs
index efc3be032c..d71fdc42e3 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsParticipantsList.cs
@@ -8,7 +8,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneTimeshiftParticipantsList : MultiplayerTestScene
+    public class TestScenePlaylistsParticipantsList : MultiplayerTestScene
     {
         [SetUp]
         public new void Setup() => Schedule(() =>
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsResultsScreen.cs
similarity index 99%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsResultsScreen.cs
index 03fd2b968c..99fc6597ee 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsResultsScreen.cs
@@ -26,7 +26,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneTimeshiftResultsScreen : ScreenTestScene
+    public class TestScenePlaylistsResultsScreen : ScreenTestScene
     {
         private const int scores_per_result = 10;
 
@@ -360,7 +360,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             };
         }
 
-        private class TestResultsScreen : TimeshiftResultsScreen
+        private class TestResultsScreen : PlaylistsResultsScreen
         {
             public new LoadingSpinner LeftSpinner => base.LeftSpinner;
             public new LoadingSpinner CentreSpinner => base.CentreSpinner;
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsRoomSubScreen.cs
similarity index 93%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsRoomSubScreen.cs
index bbd7d84081..02cc03eca4 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneTimeshiftRoomSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsRoomSubScreen.cs
@@ -17,14 +17,14 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Multi;
 using osu.Game.Screens.Multi.Match.Components;
-using osu.Game.Screens.Multi.Timeshift;
+using osu.Game.Screens.Multi.Playlists;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Users;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneTimeshiftRoomSubScreen : MultiplayerTestScene
+    public class TestScenePlaylistsRoomSubScreen : MultiplayerTestScene
     {
         protected override bool UseOnlineAPI => true;
 
@@ -34,7 +34,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         private BeatmapManager manager;
         private RulesetStore rulesets;
 
-        private TestTimeshiftRoomSubScreen match;
+        private TestPlaylistsRoomSubScreen match;
 
         [BackgroundDependencyLoader]
         private void load(GameHost host, AudioManager audio)
@@ -48,7 +48,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [SetUpSteps]
         public void SetupSteps()
         {
-            AddStep("load match", () => LoadScreen(match = new TestTimeshiftRoomSubScreen(Room)));
+            AddStep("load match", () => LoadScreen(match = new TestPlaylistsRoomSubScreen(Room)));
             AddUntilStep("wait for load", () => match.IsCurrentScreen());
         }
 
@@ -120,7 +120,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             AddStep("create room", () =>
             {
-                InputManager.MoveMouseTo(match.ChildrenOfType<TimeshiftMatchSettingsOverlay.CreateRoomButton>().Single());
+                InputManager.MoveMouseTo(match.ChildrenOfType<PlaylistsMatchSettingsOverlay.CreateRoomButton>().Single());
                 InputManager.Click(MouseButton.Left);
             });
 
@@ -131,13 +131,13 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("match has original beatmap", () => match.Beatmap.Value.Beatmap.BeatmapInfo.BaseDifficulty.CircleSize != 1);
         }
 
-        private class TestTimeshiftRoomSubScreen : TimeshiftRoomSubScreen
+        private class TestPlaylistsRoomSubScreen : PlaylistsRoomSubScreen
         {
             public new Bindable<PlaylistItem> SelectedItem => base.SelectedItem;
 
             public new Bindable<WorkingBeatmap> Beatmap => base.Beatmap;
 
-            public TestTimeshiftRoomSubScreen(Room room)
+            public TestPlaylistsRoomSubScreen(Room room)
                 : base(room)
             {
             }
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index 43f97d8ace..381bbca74f 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -11,7 +11,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
 using osu.Game.Overlays.Toolbar;
-using osu.Game.Screens.Multi.Timeshift;
+using osu.Game.Screens.Multi.Playlists;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Options;
@@ -108,14 +108,14 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestExitMultiWithEscape()
         {
-            PushAndConfirm(() => new TimeshiftMultiplayer());
+            PushAndConfirm(() => new PlaylistsMultiplayer());
             exitViaEscapeAndConfirm();
         }
 
         [Test]
         public void TestExitMultiWithBackButton()
         {
-            PushAndConfirm(() => new TimeshiftMultiplayer());
+            PushAndConfirm(() => new PlaylistsMultiplayer());
             exitViaBackButtonAndConfirm();
         }
 
diff --git a/osu.Game/Online/Multiplayer/GameTypes/GameTypeTimeshift.cs b/osu.Game/Online/Multiplayer/GameTypes/GameTypeTimeshift.cs
index 1a3d2837ce..5840ccb803 100644
--- a/osu.Game/Online/Multiplayer/GameTypes/GameTypeTimeshift.cs
+++ b/osu.Game/Online/Multiplayer/GameTypes/GameTypeTimeshift.cs
@@ -8,9 +8,9 @@ using osuTK;
 
 namespace osu.Game.Online.Multiplayer.GameTypes
 {
-    public class GameTypeTimeshift : GameType
+    public class GameTypePlaylists : GameType
     {
-        public override string Name => "Timeshift";
+        public override string Name => "Playlists";
 
         public override Drawable GetIcon(OsuColour colours, float size) => new SpriteIcon
         {
diff --git a/osu.Game/Online/Multiplayer/Room.cs b/osu.Game/Online/Multiplayer/Room.cs
index 11efe281d1..d13d7dc774 100644
--- a/osu.Game/Online/Multiplayer/Room.cs
+++ b/osu.Game/Online/Multiplayer/Room.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Online.Multiplayer
 
         [Cached]
         [JsonIgnore]
-        public readonly Bindable<GameType> Type = new Bindable<GameType>(new GameTypeTimeshift());
+        public readonly Bindable<GameType> Type = new Bindable<GameType>(new GameTypePlaylists());
 
         [Cached]
         [JsonIgnore]
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 5af6517f49..474cbde192 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Screens.Menu
         public Action OnSolo;
         public Action OnSettings;
         public Action OnMultiplayer;
-        public Action OnTimeshift;
+        public Action OnPlaylists;
 
         public const float BUTTON_WIDTH = 140f;
         public const float WEDGE_WIDTH = 20;
@@ -125,7 +125,7 @@ namespace osu.Game.Screens.Menu
         {
             buttonsPlay.Add(new Button(@"solo", @"button-solo-select", FontAwesome.Solid.User, new Color4(102, 68, 204, 255), () => OnSolo?.Invoke(), WEDGE_WIDTH, Key.P));
             buttonsPlay.Add(new Button(@"multi", @"button-generic-select", FontAwesome.Solid.Users, new Color4(94, 63, 186, 255), onMultiplayer, 0, Key.M));
-            buttonsPlay.Add(new Button(@"playlists", @"button-generic-select", OsuIcon.Charts, new Color4(94, 63, 186, 255), onTimeshift, 0, Key.L));
+            buttonsPlay.Add(new Button(@"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 Button(@"play", @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));
@@ -175,7 +175,7 @@ namespace osu.Game.Screens.Menu
             OnMultiplayer?.Invoke();
         }
 
-        private void onTimeshift()
+        private void onPlaylists()
         {
             if (!api.IsLoggedIn)
             {
@@ -193,7 +193,7 @@ namespace osu.Game.Screens.Menu
                 return;
             }
 
-            OnTimeshift?.Invoke();
+            OnPlaylists?.Invoke();
         }
 
         private void updateIdleState(bool isIdle)
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index fa96ac9c51..5650b22f25 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -18,7 +18,7 @@ using osu.Game.Overlays;
 using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Multi.RealtimeMultiplayer;
-using osu.Game.Screens.Multi.Timeshift;
+using osu.Game.Screens.Multi.Playlists;
 using osu.Game.Screens.Select;
 
 namespace osu.Game.Screens.Menu
@@ -106,7 +106,7 @@ namespace osu.Game.Screens.Menu
                             },
                             OnSolo = onSolo,
                             OnMultiplayer = () => this.Push(new RealtimeMultiplayer()),
-                            OnTimeshift = () => this.Push(new TimeshiftMultiplayer()),
+                            OnPlaylists = () => this.Push(new PlaylistsMultiplayer()),
                             OnExit = confirmAndExit,
                         }
                     }
diff --git a/osu.Game/Screens/Multi/Lounge/Components/TimeshiftFilterControl.cs b/osu.Game/Screens/Multi/Lounge/Components/TimeshiftFilterControl.cs
index 68cab283a0..3c55c3c43f 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/TimeshiftFilterControl.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/TimeshiftFilterControl.cs
@@ -7,13 +7,13 @@ using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Screens.Multi.Lounge.Components
 {
-    public class TimeshiftFilterControl : FilterControl
+    public class PlaylistsFilterControl : FilterControl
     {
-        private readonly Dropdown<TimeshiftCategory> dropdown;
+        private readonly Dropdown<PlaylistsCategory> dropdown;
 
-        public TimeshiftFilterControl()
+        public PlaylistsFilterControl()
         {
-            AddInternal(dropdown = new SlimEnumDropdown<TimeshiftCategory>
+            AddInternal(dropdown = new SlimEnumDropdown<PlaylistsCategory>
             {
                 Anchor = Anchor.BottomRight,
                 Origin = Anchor.TopRight,
@@ -37,11 +37,11 @@ namespace osu.Game.Screens.Multi.Lounge.Components
 
             switch (dropdown.Current.Value)
             {
-                case TimeshiftCategory.Normal:
+                case PlaylistsCategory.Normal:
                     criteria.Category = "normal";
                     break;
 
-                case TimeshiftCategory.Spotlight:
+                case PlaylistsCategory.Spotlight:
                     criteria.Category = "spotlight";
                     break;
             }
@@ -49,7 +49,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
             return criteria;
         }
 
-        private enum TimeshiftCategory
+        private enum PlaylistsCategory
         {
             Any,
             Normal,
diff --git a/osu.Game/Screens/Multi/Match/Components/Footer.cs b/osu.Game/Screens/Multi/Match/Components/Footer.cs
index d6a7e380bf..fdf1d0dbeb 100644
--- a/osu.Game/Screens/Multi/Match/Components/Footer.cs
+++ b/osu.Game/Screens/Multi/Match/Components/Footer.cs
@@ -10,7 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Screens.Multi.Timeshift;
+using osu.Game.Screens.Multi.Playlists;
 using osuTK;
 
 namespace osu.Game.Screens.Multi.Match.Components
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Multi.Match.Components
             InternalChildren = new[]
             {
                 background = new Box { RelativeSizeAxes = Axes.Both },
-                new TimeshiftReadyButton
+                new PlaylistsReadyButton
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game/Screens/Multi/Match/Components/GameTypePicker.cs b/osu.Game/Screens/Multi/Match/Components/GameTypePicker.cs
index b69cb9705d..c7fc329a1a 100644
--- a/osu.Game/Screens/Multi/Match/Components/GameTypePicker.cs
+++ b/osu.Game/Screens/Multi/Match/Components/GameTypePicker.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Screens.Multi.Match.Components
             AddItem(new GameTypeVersus());
             AddItem(new GameTypeTagTeam());
             AddItem(new GameTypeTeamVersus());
-            AddItem(new GameTypeTimeshift());
+            AddItem(new GameTypePlaylists());
         }
 
         private class GameTypePickerItem : DisableableTabItem
diff --git a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
index f07f1c2fb0..65b0091505 100644
--- a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
+++ b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
@@ -20,7 +20,7 @@ using osu.Game.Screens.Ranking;
 
 namespace osu.Game.Screens.Multi.Play
 {
-    public class TimeshiftPlayer : Player
+    public class PlaylistsPlayer : Player
     {
         public Action Exited;
 
@@ -37,7 +37,7 @@ namespace osu.Game.Screens.Multi.Play
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; }
 
-        public TimeshiftPlayer(PlaylistItem playlistItem, PlayerConfiguration configuration = null)
+        public PlaylistsPlayer(PlaylistItem playlistItem, PlayerConfiguration configuration = null)
             : base(configuration)
         {
             PlaylistItem = playlistItem;
@@ -50,7 +50,7 @@ namespace osu.Game.Screens.Multi.Play
 
             bool failed = false;
 
-            // Sanity checks to ensure that TimeshiftPlayer matches the settings for the current PlaylistItem
+            // Sanity checks to ensure that PlaylistsPlayer matches the settings for the current PlaylistItem
             if (Beatmap.Value.BeatmapInfo.OnlineBeatmapID != PlaylistItem.Beatmap.Value.OnlineBeatmapID)
                 throw new InvalidOperationException("Current Beatmap does not match PlaylistItem's Beatmap");
 
@@ -94,7 +94,7 @@ namespace osu.Game.Screens.Multi.Play
         protected override ResultsScreen CreateResults(ScoreInfo score)
         {
             Debug.Assert(RoomId.Value != null);
-            return new TimeshiftResultsScreen(score, RoomId.Value.Value, PlaylistItem, true);
+            return new PlaylistsResultsScreen(score, RoomId.Value.Value, PlaylistItem, true);
         }
 
         protected override Score CreateScore()
diff --git a/osu.Game/Screens/Multi/Timeshift/CreateTimeshiftRoomButton.cs b/osu.Game/Screens/Multi/Playlists/CreatePlaylistsRoomButton.cs
similarity index 79%
rename from osu.Game/Screens/Multi/Timeshift/CreateTimeshiftRoomButton.cs
rename to osu.Game/Screens/Multi/Playlists/CreatePlaylistsRoomButton.cs
index 0424493472..acee063115 100644
--- a/osu.Game/Screens/Multi/Timeshift/CreateTimeshiftRoomButton.cs
+++ b/osu.Game/Screens/Multi/Playlists/CreatePlaylistsRoomButton.cs
@@ -4,9 +4,9 @@
 using osu.Framework.Allocation;
 using osu.Game.Screens.Multi.Match.Components;
 
-namespace osu.Game.Screens.Multi.Timeshift
+namespace osu.Game.Screens.Multi.Playlists
 {
-    public class CreateTimeshiftRoomButton : PurpleTriangleButton
+    public class CreatePlaylistsRoomButton : PurpleTriangleButton
     {
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftLoungeSubScreen.cs b/osu.Game/Screens/Multi/Playlists/PlaylistsLoungeSubScreen.cs
similarity index 71%
rename from osu.Game/Screens/Multi/Timeshift/TimeshiftLoungeSubScreen.cs
rename to osu.Game/Screens/Multi/Playlists/PlaylistsLoungeSubScreen.cs
index 8e426ffbcc..b40c543b68 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftLoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Playlists/PlaylistsLoungeSubScreen.cs
@@ -6,12 +6,12 @@ using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Lounge.Components;
 using osu.Game.Screens.Multi.Match;
 
-namespace osu.Game.Screens.Multi.Timeshift
+namespace osu.Game.Screens.Multi.Playlists
 {
-    public class TimeshiftLoungeSubScreen : LoungeSubScreen
+    public class PlaylistsLoungeSubScreen : LoungeSubScreen
     {
-        protected override FilterControl CreateFilterControl() => new TimeshiftFilterControl();
+        protected override FilterControl CreateFilterControl() => new PlaylistsFilterControl();
 
-        protected override RoomSubScreen CreateRoomSubScreen(Room room) => new TimeshiftRoomSubScreen(room);
+        protected override RoomSubScreen CreateRoomSubScreen(Room room) => new PlaylistsRoomSubScreen(room);
     }
 }
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftMatchSettingsOverlay.cs b/osu.Game/Screens/Multi/Playlists/PlaylistsMatchSettingsOverlay.cs
similarity index 99%
rename from osu.Game/Screens/Multi/Timeshift/TimeshiftMatchSettingsOverlay.cs
rename to osu.Game/Screens/Multi/Playlists/PlaylistsMatchSettingsOverlay.cs
index 7e1e9894d8..af29e8d34d 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/Playlists/PlaylistsMatchSettingsOverlay.cs
@@ -19,9 +19,9 @@ using osu.Game.Overlays;
 using osu.Game.Screens.Multi.Match.Components;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Timeshift
+namespace osu.Game.Screens.Multi.Playlists
 {
-    public class TimeshiftMatchSettingsOverlay : MatchSettingsOverlay
+    public class PlaylistsMatchSettingsOverlay : MatchSettingsOverlay
     {
         public Action EditPlaylist;
 
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs b/osu.Game/Screens/Multi/Playlists/PlaylistsMultiplayer.cs
similarity index 62%
rename from osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
rename to osu.Game/Screens/Multi/Playlists/PlaylistsMultiplayer.cs
index 60b01ee431..fce24da966 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftMultiplayer.cs
+++ b/osu.Game/Screens/Multi/Playlists/PlaylistsMultiplayer.cs
@@ -9,41 +9,41 @@ using osu.Game.Screens.Multi.Components;
 using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Match;
 
-namespace osu.Game.Screens.Multi.Timeshift
+namespace osu.Game.Screens.Multi.Playlists
 {
-    public class TimeshiftMultiplayer : Multiplayer
+    public class PlaylistsMultiplayer : Multiplayer
     {
         protected override void UpdatePollingRate(bool isIdle)
         {
-            var timeshiftManager = (TimeshiftRoomManager)RoomManager;
+            var playlistsManager = (PlaylistsRoomManager)RoomManager;
 
             if (!this.IsCurrentScreen())
             {
-                timeshiftManager.TimeBetweenListingPolls.Value = 0;
-                timeshiftManager.TimeBetweenSelectionPolls.Value = 0;
+                playlistsManager.TimeBetweenListingPolls.Value = 0;
+                playlistsManager.TimeBetweenSelectionPolls.Value = 0;
             }
             else
             {
                 switch (CurrentSubScreen)
                 {
                     case LoungeSubScreen _:
-                        timeshiftManager.TimeBetweenListingPolls.Value = isIdle ? 120000 : 15000;
-                        timeshiftManager.TimeBetweenSelectionPolls.Value = isIdle ? 120000 : 15000;
+                        playlistsManager.TimeBetweenListingPolls.Value = isIdle ? 120000 : 15000;
+                        playlistsManager.TimeBetweenSelectionPolls.Value = isIdle ? 120000 : 15000;
                         break;
 
                     case RoomSubScreen _:
-                        timeshiftManager.TimeBetweenListingPolls.Value = 0;
-                        timeshiftManager.TimeBetweenSelectionPolls.Value = isIdle ? 30000 : 5000;
+                        playlistsManager.TimeBetweenListingPolls.Value = 0;
+                        playlistsManager.TimeBetweenSelectionPolls.Value = isIdle ? 30000 : 5000;
                         break;
 
                     default:
-                        timeshiftManager.TimeBetweenListingPolls.Value = 0;
-                        timeshiftManager.TimeBetweenSelectionPolls.Value = 0;
+                        playlistsManager.TimeBetweenListingPolls.Value = 0;
+                        playlistsManager.TimeBetweenSelectionPolls.Value = 0;
                         break;
                 }
             }
 
-            Logger.Log($"Polling adjusted (listing: {timeshiftManager.TimeBetweenListingPolls.Value}, selection: {timeshiftManager.TimeBetweenSelectionPolls.Value})");
+            Logger.Log($"Polling adjusted (listing: {playlistsManager.TimeBetweenListingPolls.Value}, selection: {playlistsManager.TimeBetweenSelectionPolls.Value})");
         }
 
         protected override Room CreateNewRoom()
@@ -53,10 +53,10 @@ namespace osu.Game.Screens.Multi.Timeshift
 
         protected override string ScreenTitle => "Playlists";
 
-        protected override RoomManager CreateRoomManager() => new TimeshiftRoomManager();
+        protected override RoomManager CreateRoomManager() => new PlaylistsRoomManager();
 
-        protected override LoungeSubScreen CreateLounge() => new TimeshiftLoungeSubScreen();
+        protected override LoungeSubScreen CreateLounge() => new PlaylistsLoungeSubScreen();
 
-        protected override OsuButton CreateNewMultiplayerGameButton() => new CreateTimeshiftRoomButton();
+        protected override OsuButton CreateNewMultiplayerGameButton() => new CreatePlaylistsRoomButton();
     }
 }
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftReadyButton.cs b/osu.Game/Screens/Multi/Playlists/PlaylistsReadyButton.cs
similarity index 88%
rename from osu.Game/Screens/Multi/Timeshift/TimeshiftReadyButton.cs
rename to osu.Game/Screens/Multi/Playlists/PlaylistsReadyButton.cs
index c878451eee..f5adf899e3 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftReadyButton.cs
+++ b/osu.Game/Screens/Multi/Playlists/PlaylistsReadyButton.cs
@@ -8,14 +8,14 @@ using osu.Game.Graphics;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Components;
 
-namespace osu.Game.Screens.Multi.Timeshift
+namespace osu.Game.Screens.Multi.Playlists
 {
-    public class TimeshiftReadyButton : ReadyButton
+    public class PlaylistsReadyButton : ReadyButton
     {
         [Resolved(typeof(Room), nameof(Room.EndDate))]
         private Bindable<DateTimeOffset?> endDate { get; set; }
 
-        public TimeshiftReadyButton()
+        public PlaylistsReadyButton()
         {
             Text = "Start";
         }
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomManager.cs b/osu.Game/Screens/Multi/Playlists/PlaylistsRoomManager.cs
similarity index 89%
rename from osu.Game/Screens/Multi/Timeshift/TimeshiftRoomManager.cs
rename to osu.Game/Screens/Multi/Playlists/PlaylistsRoomManager.cs
index d21f844e04..ae57eeddcc 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomManager.cs
+++ b/osu.Game/Screens/Multi/Playlists/PlaylistsRoomManager.cs
@@ -5,9 +5,9 @@ using System.Collections.Generic;
 using osu.Framework.Bindables;
 using osu.Game.Screens.Multi.Components;
 
-namespace osu.Game.Screens.Multi.Timeshift
+namespace osu.Game.Screens.Multi.Playlists
 {
-    public class TimeshiftRoomManager : RoomManager
+    public class PlaylistsRoomManager : RoomManager
     {
         public readonly Bindable<double> TimeBetweenListingPolls = new Bindable<double>();
         public readonly Bindable<double> TimeBetweenSelectionPolls = new Bindable<double>();
diff --git a/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs b/osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs
similarity index 97%
rename from osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs
rename to osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs
index 4a66f09a22..b2bcba1724 100644
--- a/osu.Game/Screens/Multi/Timeshift/TimeshiftRoomSubScreen.cs
+++ b/osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs
@@ -19,9 +19,9 @@ using osu.Game.Screens.Select;
 using osu.Game.Users;
 using Footer = osu.Game.Screens.Multi.Match.Components.Footer;
 
-namespace osu.Game.Screens.Multi.Timeshift
+namespace osu.Game.Screens.Multi.Playlists
 {
-    public class TimeshiftRoomSubScreen : RoomSubScreen
+    public class PlaylistsRoomSubScreen : RoomSubScreen
     {
         public override string Title { get; }
 
@@ -38,7 +38,7 @@ namespace osu.Game.Screens.Multi.Timeshift
 
         private OverlinedHeader participantsHeader;
 
-        public TimeshiftRoomSubScreen(Room room)
+        public PlaylistsRoomSubScreen(Room room)
         {
             Title = room.RoomID.Value == null ? "New playlist" : room.Name.Value;
             Activity.Value = new UserActivity.InLobby(room);
@@ -126,7 +126,7 @@ namespace osu.Game.Screens.Multi.Timeshift
                                                                             RequestShowResults = item =>
                                                                             {
                                                                                 Debug.Assert(roomId.Value != null);
-                                                                                multiplayer?.Push(new TimeshiftResultsScreen(null, roomId.Value.Value, item, false));
+                                                                                multiplayer?.Push(new PlaylistsResultsScreen(null, roomId.Value.Value, item, false));
                                                                             }
                                                                         }
                                                                     },
@@ -188,7 +188,7 @@ namespace osu.Game.Screens.Multi.Timeshift
                         new Dimension(GridSizeMode.AutoSize),
                     }
                 },
-                settingsOverlay = new TimeshiftMatchSettingsOverlay
+                settingsOverlay = new PlaylistsMatchSettingsOverlay
                 {
                     RelativeSizeAxes = Axes.Both,
                     EditPlaylist = () => this.Push(new MatchSongSelect()),
@@ -219,7 +219,7 @@ namespace osu.Game.Screens.Multi.Timeshift
             }, true);
         }
 
-        private void onStart() => StartPlay(() => new TimeshiftPlayer(SelectedItem.Value)
+        private void onStart() => StartPlay(() => new PlaylistsPlayer(SelectedItem.Value)
         {
             Exited = () => leaderboard.RefreshScores()
         });
diff --git a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
index d3f1c19c7c..c757433e2f 100644
--- a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
+++ b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
@@ -17,7 +17,7 @@ using osu.Game.Screens.Ranking;
 
 namespace osu.Game.Screens.Multi.Ranking
 {
-    public class TimeshiftResultsScreen : ResultsScreen
+    public class PlaylistsResultsScreen : ResultsScreen
     {
         private readonly int roomId;
         private readonly PlaylistItem playlistItem;
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Multi.Ranking
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        public TimeshiftResultsScreen(ScoreInfo score, int roomId, PlaylistItem playlistItem, bool allowRetry, bool allowWatchingReplay = true)
+        public PlaylistsResultsScreen(ScoreInfo score, int roomId, PlaylistItem playlistItem, bool allowRetry, bool allowWatchingReplay = true)
             : base(score, allowRetry, allowWatchingReplay)
         {
             this.roomId = roomId;
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
index 70308844b0..87c838f29f 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
@@ -28,31 +28,31 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
         protected override void UpdatePollingRate(bool isIdle)
         {
-            var timeshiftManager = (RealtimeRoomManager)RoomManager;
+            var playlistsManager = (RealtimeRoomManager)RoomManager;
 
             if (!this.IsCurrentScreen())
             {
-                timeshiftManager.TimeBetweenListingPolls.Value = 0;
-                timeshiftManager.TimeBetweenSelectionPolls.Value = 0;
+                playlistsManager.TimeBetweenListingPolls.Value = 0;
+                playlistsManager.TimeBetweenSelectionPolls.Value = 0;
             }
             else
             {
                 switch (CurrentSubScreen)
                 {
                     case LoungeSubScreen _:
-                        timeshiftManager.TimeBetweenListingPolls.Value = isIdle ? 120000 : 15000;
-                        timeshiftManager.TimeBetweenSelectionPolls.Value = isIdle ? 120000 : 15000;
+                        playlistsManager.TimeBetweenListingPolls.Value = isIdle ? 120000 : 15000;
+                        playlistsManager.TimeBetweenSelectionPolls.Value = isIdle ? 120000 : 15000;
                         break;
 
                     // Don't poll inside the match or anywhere else.
                     default:
-                        timeshiftManager.TimeBetweenListingPolls.Value = 0;
-                        timeshiftManager.TimeBetweenSelectionPolls.Value = 0;
+                        playlistsManager.TimeBetweenListingPolls.Value = 0;
+                        playlistsManager.TimeBetweenSelectionPolls.Value = 0;
                         break;
                 }
             }
 
-            Logger.Log($"Polling adjusted (listing: {timeshiftManager.TimeBetweenListingPolls.Value}, selection: {timeshiftManager.TimeBetweenSelectionPolls.Value})");
+            Logger.Log($"Polling adjusted (listing: {playlistsManager.TimeBetweenListingPolls.Value}, selection: {playlistsManager.TimeBetweenSelectionPolls.Value})");
         }
 
         protected override Room CreateNewRoom()
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
index 8eb6a11228..033e4756eb 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
@@ -19,8 +19,8 @@ using osuTK;
 
 namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 {
-    // Todo: The "room" part of TimeshiftPlayer should be split out into an abstract player class to be inherited instead.
-    public class RealtimePlayer : TimeshiftPlayer
+    // Todo: The "room" part of PlaylistsPlayer should be split out into an abstract player class to be inherited instead.
+    public class RealtimePlayer : PlaylistsPlayer
     {
         protected override bool PauseOnFocusLost => false;
 
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeResultsScreen.cs b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeResultsScreen.cs
index 3964a87eb6..6bec06cbba 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeResultsScreen.cs
+++ b/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeResultsScreen.cs
@@ -7,7 +7,7 @@ using osu.Game.Screens.Multi.Ranking;
 
 namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 {
-    public class RealtimeResultsScreen : TimeshiftResultsScreen
+    public class RealtimeResultsScreen : PlaylistsResultsScreen
     {
         public RealtimeResultsScreen(ScoreInfo score, int roomId, PlaylistItem playlistItem)
             : base(score, roomId, playlistItem, false, false)

From 12e4bbdc5b00de3a1c81da809fad4c69787269a1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Dec 2020 13:20:37 +0900
Subject: [PATCH 0574/3722] Reorganise test scenes into playlists specific
 namespace

---
 .../TestSceneRealtimeMatchSubScreen.cs                      | 3 ++-
 .../TestSceneRealtimeMultiplayer.cs                         | 3 ++-
 .../TestSceneRealtimeMultiplayerParticipantsList.cs         | 3 ++-
 .../TestSceneRealtimeReadyButton.cs                         | 3 ++-
 .../TestSceneRealtimeRoomManager.cs                         | 3 ++-
 .../TestScenePlaylistsFilterControl.cs                      | 2 +-
 .../TestScenePlaylistsLoungeSubScreen.cs                    | 3 ++-
 .../TestScenePlaylistsMatchSettingsOverlay.cs}              | 4 ++--
 .../TestScenePlaylistsParticipantsList.cs                   | 2 +-
 .../TestScenePlaylistsResultsScreen.cs                      | 2 +-
 .../TestScenePlaylistsRoomSubScreen.cs                      | 2 +-
 .../TestScenePlaylistsScreen.cs}                            | 6 +++---
 12 files changed, 21 insertions(+), 15 deletions(-)
 rename osu.Game.Tests/Visual/{RealtimeMultiplayer => Multiplayer}/TestSceneRealtimeMatchSubScreen.cs (96%)
 rename osu.Game.Tests/Visual/{RealtimeMultiplayer => Multiplayer}/TestSceneRealtimeMultiplayer.cs (94%)
 rename osu.Game.Tests/Visual/{RealtimeMultiplayer => Multiplayer}/TestSceneRealtimeMultiplayerParticipantsList.cs (97%)
 rename osu.Game.Tests/Visual/{RealtimeMultiplayer => Multiplayer}/TestSceneRealtimeReadyButton.cs (98%)
 rename osu.Game.Tests/Visual/{RealtimeMultiplayer => Multiplayer}/TestSceneRealtimeRoomManager.cs (98%)
 rename osu.Game.Tests/Visual/{Multiplayer => Playlists}/TestScenePlaylistsFilterControl.cs (93%)
 rename osu.Game.Tests/Visual/{Multiplayer => Playlists}/TestScenePlaylistsLoungeSubScreen.cs (95%)
 rename osu.Game.Tests/Visual/{Multiplayer/TestSceneMatchSettingsOverlay.cs => Playlists/TestScenePlaylistsMatchSettingsOverlay.cs} (97%)
 rename osu.Game.Tests/Visual/{Multiplayer => Playlists}/TestScenePlaylistsParticipantsList.cs (97%)
 rename osu.Game.Tests/Visual/{Multiplayer => Playlists}/TestScenePlaylistsResultsScreen.cs (99%)
 rename osu.Game.Tests/Visual/{Multiplayer => Playlists}/TestScenePlaylistsRoomSubScreen.cs (99%)
 rename osu.Game.Tests/Visual/{Multiplayer/TestSceneMultiScreen.cs => Playlists/TestScenePlaylistsScreen.cs} (82%)

diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeMatchSubScreen.cs
similarity index 96%
rename from osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMatchSubScreen.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeMatchSubScreen.cs
index a059bb1cc0..dff375d1bb 100644
--- a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeMatchSubScreen.cs
@@ -10,9 +10,10 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Multi.RealtimeMultiplayer;
 using osu.Game.Screens.Multi.RealtimeMultiplayer.Match;
 using osu.Game.Tests.Beatmaps;
+using osu.Game.Tests.Visual.RealtimeMultiplayer;
 using osuTK.Input;
 
-namespace osu.Game.Tests.Visual.RealtimeMultiplayer
+namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneRealtimeMatchSubScreen : RealtimeMultiplayerTestScene
     {
diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeMultiplayer.cs
similarity index 94%
rename from osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayer.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeMultiplayer.cs
index 5cf80df6aa..cc07bb8e79 100644
--- a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeMultiplayer.cs
@@ -3,9 +3,10 @@
 
 using NUnit.Framework;
 using osu.Game.Screens.Multi.Components;
+using osu.Game.Tests.Visual.RealtimeMultiplayer;
 using osu.Game.Users;
 
-namespace osu.Game.Tests.Visual.RealtimeMultiplayer
+namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneRealtimeMultiplayer : RealtimeMultiplayerTestScene
     {
diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeMultiplayerParticipantsList.cs
similarity index 97%
rename from osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayerParticipantsList.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeMultiplayerParticipantsList.cs
index 4221821496..7c26918927 100644
--- a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeMultiplayerParticipantsList.cs
@@ -9,10 +9,11 @@ using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Screens.Multi.RealtimeMultiplayer.Participants;
+using osu.Game.Tests.Visual.RealtimeMultiplayer;
 using osu.Game.Users;
 using osuTK;
 
-namespace osu.Game.Tests.Visual.RealtimeMultiplayer
+namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneRealtimeMultiplayerParticipantsList : RealtimeMultiplayerTestScene
     {
diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeReadyButton.cs
similarity index 98%
rename from osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeReadyButton.cs
index 825470846c..3c92276629 100644
--- a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeReadyButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeReadyButton.cs
@@ -14,11 +14,12 @@ using osu.Game.Online.RealtimeMultiplayer;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Multi.RealtimeMultiplayer.Match;
 using osu.Game.Tests.Resources;
+using osu.Game.Tests.Visual.RealtimeMultiplayer;
 using osu.Game.Users;
 using osuTK;
 using osuTK.Input;
 
-namespace osu.Game.Tests.Visual.RealtimeMultiplayer
+namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneRealtimeReadyButton : RealtimeMultiplayerTestScene
     {
diff --git a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeRoomManager.cs
similarity index 98%
rename from osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeRoomManager.cs
index 925a83a863..ba90e0840b 100644
--- a/osu.Game.Tests/Visual/RealtimeMultiplayer/TestSceneRealtimeRoomManager.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeRoomManager.cs
@@ -5,8 +5,9 @@ using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Tests.Visual.RealtimeMultiplayer;
 
-namespace osu.Game.Tests.Visual.RealtimeMultiplayer
+namespace osu.Game.Tests.Visual.Multiplayer
 {
     [HeadlessTest]
     public class TestSceneRealtimeRoomManager : MultiplayerTestScene
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsFilterControl.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsFilterControl.cs
similarity index 93%
rename from osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsFilterControl.cs
rename to osu.Game.Tests/Visual/Playlists/TestScenePlaylistsFilterControl.cs
index 427a69552d..66992b27a2 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsFilterControl.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsFilterControl.cs
@@ -4,7 +4,7 @@
 using osu.Framework.Graphics;
 using osu.Game.Screens.Multi.Lounge.Components;
 
-namespace osu.Game.Tests.Visual.Multiplayer
+namespace osu.Game.Tests.Visual.Playlists
 {
     public class TestScenePlaylistsFilterControl : OsuTestScene
     {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsLoungeSubScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsLoungeSubScreen.cs
similarity index 95%
rename from osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsLoungeSubScreen.cs
rename to osu.Game.Tests/Visual/Playlists/TestScenePlaylistsLoungeSubScreen.cs
index f8788f0c36..04555857f5 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsLoungeSubScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsLoungeSubScreen.cs
@@ -11,8 +11,9 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Lounge.Components;
 using osu.Game.Screens.Multi.Playlists;
+using osu.Game.Tests.Visual.Multiplayer;
 
-namespace osu.Game.Tests.Visual.Multiplayer
+namespace osu.Game.Tests.Visual.Playlists
 {
     public class TestScenePlaylistsLoungeSubScreen : RoomManagerTestScene
     {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsMatchSettingsOverlay.cs
similarity index 97%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
rename to osu.Game.Tests/Visual/Playlists/TestScenePlaylistsMatchSettingsOverlay.cs
index 90abecd26d..2a110c0386 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsMatchSettingsOverlay.cs
@@ -13,9 +13,9 @@ using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi;
 using osu.Game.Screens.Multi.Playlists;
 
-namespace osu.Game.Tests.Visual.Multiplayer
+namespace osu.Game.Tests.Visual.Playlists
 {
-    public class TestSceneMatchSettingsOverlay : MultiplayerTestScene
+    public class TestScenePlaylistsMatchSettingsOverlay : MultiplayerTestScene
     {
         [Cached(Type = typeof(IRoomManager))]
         private TestRoomManager roomManager = new TestRoomManager();
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsParticipantsList.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsParticipantsList.cs
similarity index 97%
rename from osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsParticipantsList.cs
rename to osu.Game.Tests/Visual/Playlists/TestScenePlaylistsParticipantsList.cs
index d71fdc42e3..d5553e4527 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsParticipantsList.cs
@@ -6,7 +6,7 @@ using osu.Framework.Graphics;
 using osu.Game.Screens.Multi.Components;
 using osu.Game.Users;
 
-namespace osu.Game.Tests.Visual.Multiplayer
+namespace osu.Game.Tests.Visual.Playlists
 {
     public class TestScenePlaylistsParticipantsList : MultiplayerTestScene
     {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsResultsScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
similarity index 99%
rename from osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsResultsScreen.cs
rename to osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
index 99fc6597ee..10ae44351b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
@@ -24,7 +24,7 @@ using osu.Game.Screens.Ranking;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Users;
 
-namespace osu.Game.Tests.Visual.Multiplayer
+namespace osu.Game.Tests.Visual.Playlists
 {
     public class TestScenePlaylistsResultsScreen : ScreenTestScene
     {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsRoomSubScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs
similarity index 99%
rename from osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsRoomSubScreen.cs
rename to osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs
index 02cc03eca4..aebff14c80 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsRoomSubScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs
@@ -22,7 +22,7 @@ using osu.Game.Tests.Beatmaps;
 using osu.Game.Users;
 using osuTK.Input;
 
-namespace osu.Game.Tests.Visual.Multiplayer
+namespace osu.Game.Tests.Visual.Playlists
 {
     public class TestScenePlaylistsRoomSubScreen : MultiplayerTestScene
     {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsScreen.cs
similarity index 82%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs
rename to osu.Game.Tests/Visual/Playlists/TestScenePlaylistsScreen.cs
index 9ac1eb8013..8203ca4845 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsScreen.cs
@@ -6,17 +6,17 @@ using osu.Framework.Allocation;
 using osu.Game.Overlays;
 using osu.Game.Screens.Multi.Playlists;
 
-namespace osu.Game.Tests.Visual.Multiplayer
+namespace osu.Game.Tests.Visual.Playlists
 {
     [TestFixture]
-    public class TestSceneMultiScreen : ScreenTestScene
+    public class TestScenePlaylistsScreen : ScreenTestScene
     {
         protected override bool UseOnlineAPI => true;
 
         [Cached]
         private MusicController musicController { get; set; } = new MusicController();
 
-        public TestSceneMultiScreen()
+        public TestScenePlaylistsScreen()
         {
             var multi = new PlaylistsMultiplayer();
 

From 5d4b73baa5f655c1c7f77a69228c06e895c40b6d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Dec 2020 13:38:11 +0900
Subject: [PATCH 0575/3722] RealtimeMultiplayer -> Multiplayer

---
 .../Multiplayer/RoomManagerTestScene.cs       |  4 ++--
 .../Visual/Multiplayer/TestRoomManager.cs     |  2 +-
 .../TestSceneDrawableRoomPlaylist.cs          |  2 +-
 .../Multiplayer/TestSceneLoungeRoomInfo.cs    |  2 +-
 .../TestSceneLoungeRoomsContainer.cs          |  2 +-
 .../TestSceneMatchBeatmapDetailArea.cs        |  2 +-
 .../Multiplayer/TestSceneMatchHeader.cs       |  2 +-
 ...Multiplayer.cs => TestSceneMultiplayer.cs} | 11 ++++-----
 ... => TestSceneMultiplayerMatchSubScreen.cs} | 21 ++++++++--------
 ...> TestSceneMultiplayerParticipantsList.cs} |  7 +++---
 ....cs => TestSceneMultiplayerReadyButton.cs} | 11 ++++-----
 ....cs => TestSceneMultiplayerRoomManager.cs} | 13 +++++-----
 .../Visual/Multiplayer/TestSceneRoomStatus.cs |  8 +++----
 .../TestScenePlaylistsMatchSettingsOverlay.cs |  4 ++--
 .../TestScenePlaylistsParticipantsList.cs     |  2 +-
 .../TestScenePlaylistsResultsScreen.cs        |  2 +-
 .../TestScenePlaylistsRoomSubScreen.cs        |  4 ++--
 .../IMultiplayerClient.cs                     |  2 +-
 .../IMultiplayerLoungeServer.cs               |  2 +-
 .../IMultiplayerRoomServer.cs                 |  2 +-
 .../IMultiplayerServer.cs                     |  2 +-
 .../InvalidStateChangeException.cs            |  2 +-
 .../InvalidStateException.cs                  |  2 +-
 .../MultiplayerClient.cs}                     |  6 ++---
 .../MultiplayerRoom.cs                        |  2 +-
 .../MultiplayerRoomSettings.cs                |  2 +-
 .../MultiplayerRoomState.cs                   |  4 ++--
 .../MultiplayerRoomUser.cs                    |  2 +-
 .../MultiplayerUserState.cs                   |  2 +-
 .../NotHostException.cs                       |  2 +-
 .../NotJoinedRoomException.cs                 |  2 +-
 .../StatefulMultiplayerClient.cs              |  6 ++---
 .../{Multiplayer => Rooms}/APICreatedRoom.cs  |  2 +-
 .../{Multiplayer => Rooms}/APILeaderboard.cs  |  2 +-
 .../APIPlaylistBeatmap.cs                     |  2 +-
 .../{Multiplayer => Rooms}/APIScoreToken.cs   |  2 +-
 .../CreateRoomRequest.cs                      |  2 +-
 .../CreateRoomScoreRequest.cs                 |  2 +-
 .../Online/{Multiplayer => Rooms}/GameType.cs |  2 +-
 .../GameTypes/GameTypeTag.cs                  |  2 +-
 .../GameTypes/GameTypeTagTeam.cs              |  2 +-
 .../GameTypes/GameTypeTeamVersus.cs           |  2 +-
 .../GameTypes/GameTypeTimeshift.cs            |  2 +-
 .../GameTypes/GameTypeVersus.cs               |  2 +-
 .../GameTypes/VersusRow.cs                    |  2 +-
 .../GetRoomLeaderboardRequest.cs              |  2 +-
 .../{Multiplayer => Rooms}/GetRoomRequest.cs  |  2 +-
 .../{Multiplayer => Rooms}/GetRoomsRequest.cs |  2 +-
 .../IndexPlaylistScoresRequest.cs             |  2 +-
 .../IndexScoresParams.cs                      |  2 +-
 .../IndexedMultiplayerScores.cs               |  2 +-
 .../{Multiplayer => Rooms}/JoinRoomRequest.cs |  2 +-
 .../MultiplayerScore.cs                       |  2 +-
 .../MultiplayerScores.cs                      |  2 +-
 .../MultiplayerScoresAround.cs                |  2 +-
 .../{Multiplayer => Rooms}/PartRoomRequest.cs |  2 +-
 .../PlaylistExtensions.cs                     |  2 +-
 .../{Multiplayer => Rooms}/PlaylistItem.cs    |  2 +-
 .../Online/{Multiplayer => Rooms}/Room.cs     |  6 ++---
 .../RoomAvailability.cs                       |  2 +-
 .../{Multiplayer => Rooms}/RoomCategory.cs    |  4 ++--
 .../{Multiplayer => Rooms}/RoomStatus.cs      |  4 ++--
 .../RoomStatuses/RoomStatusEnded.cs           |  2 +-
 .../RoomStatuses/RoomStatusOpen.cs            |  2 +-
 .../RoomStatuses/RoomStatusPlaying.cs         |  2 +-
 .../ShowPlaylistUserScoreRequest.cs           |  2 +-
 .../SubmitRoomScoreRequest.cs                 |  2 +-
 osu.Game/OsuGameBase.cs                       |  4 ++--
 osu.Game/Screens/Menu/MainMenu.cs             |  4 ++--
 .../Multi/Components/DrawableGameType.cs      |  2 +-
 .../Components/ListingPollingComponent.cs     |  2 +-
 .../Components/MatchBeatmapDetailArea.cs      |  2 +-
 .../Components/OverlinedPlaylistHeader.cs     |  2 +-
 .../Screens/Multi/Components/ReadyButton.cs   |  2 +-
 .../Screens/Multi/Components/RoomManager.cs   |  2 +-
 .../Multi/Components/RoomPollingComponent.cs  |  2 +-
 .../Multi/Components/RoomStatusInfo.cs        |  4 ++--
 .../Components/SelectionPollingComponent.cs   |  2 +-
 .../Components/StatusColouredContainer.cs     |  2 +-
 .../Screens/Multi/DrawableRoomPlaylist.cs     |  2 +-
 .../Screens/Multi/DrawableRoomPlaylistItem.cs |  2 +-
 .../Multi/DrawableRoomPlaylistWithResults.cs  |  2 +-
 osu.Game/Screens/Multi/IRoomManager.cs        |  2 +-
 .../Multi/Lounge/Components/DrawableRoom.cs   |  6 ++---
 .../Multi/Lounge/Components/RoomsContainer.cs |  2 +-
 .../Screens/Multi/Lounge/LoungeSubScreen.cs   |  2 +-
 .../Screens/Multi/Match/Components/Footer.cs  |  2 +-
 .../Multi/Match/Components/GameTypePicker.cs  |  4 ++--
 .../Match/Components/MatchChatDisplay.cs      |  2 +-
 .../Match/Components/MatchLeaderboard.cs      |  2 +-
 .../Components/RoomAvailabilityPicker.cs      |  2 +-
 osu.Game/Screens/Multi/Match/RoomSubScreen.cs |  4 ++--
 .../CreateMultiplayerMatchButton.cs}          |  6 ++---
 .../Match/BeatmapSelectionControl.cs          |  6 ++---
 .../Match/MultiplayerMatchFooter.cs}          | 10 ++++----
 .../Match/MultiplayerMatchHeader.cs}          |  6 ++---
 .../Match/MultiplayerMatchSettingsOverlay.cs} |  6 ++---
 .../Match/MultiplayerReadyButton.cs}          |  8 +++----
 .../Multiplayer.cs}                           | 16 ++++++-------
 .../MultiplayerFilterControl.cs}              |  4 ++--
 .../MultiplayerLoungeSubScreen.cs}            | 10 ++++----
 .../MultiplayerMatchSongSelect.cs}            |  8 +++----
 .../MultiplayerMatchSubScreen.cs}             | 24 +++++++++----------
 .../MultiplayerPlayer.cs}                     | 12 +++++-----
 .../MultiplayerResultsScreen.cs}              |  8 +++----
 .../MultiplayerRoomComposite.cs}              |  6 ++---
 .../MultiplayerRoomManager.cs}                | 16 ++++++-------
 .../Participants/ParticipantPanel.cs          |  6 ++---
 .../Participants/ParticipantsList.cs          |  4 ++--
 .../Participants/ParticipantsListHeader.cs    |  4 ++--
 .../Participants/StateDisplay.cs              |  4 ++--
 .../Screens/Multi/MultiplayerComposite.cs     |  2 +-
 .../{Multiplayer.cs => MultiplayerScreen.cs}  |  6 ++---
 .../Screens/Multi/Play/TimeshiftPlayer.cs     |  2 +-
 .../Playlists/PlaylistsLoungeSubScreen.cs     |  2 +-
 .../PlaylistsMatchSettingsOverlay.cs          |  2 +-
 .../Multi/Playlists/PlaylistsMultiplayer.cs   |  4 ++--
 .../Multi/Playlists/PlaylistsReadyButton.cs   |  2 +-
 .../Multi/Playlists/PlaylistsRoomSubScreen.cs |  4 ++--
 .../Multi/Ranking/TimeshiftResultsScreen.cs   |  2 +-
 osu.Game/Screens/Select/MatchSongSelect.cs    |  2 +-
 .../MultiplayerTestScene.cs}                  | 16 ++++++-------
 .../TestMultiplayerClient.cs}                 |  6 ++---
 .../TestMultiplayerRoomContainer.cs}          | 16 ++++++-------
 .../TestMultiplayerRoomManager.cs}            |  8 +++----
 ...ltiplayerTestScene.cs => RoomTestScene.cs} |  4 ++--
 osu.Game/Users/UserActivity.cs                |  2 +-
 127 files changed, 260 insertions(+), 265 deletions(-)
 rename osu.Game.Tests/Visual/Multiplayer/{TestSceneRealtimeMultiplayer.cs => TestSceneMultiplayer.cs} (77%)
 rename osu.Game.Tests/Visual/Multiplayer/{TestSceneRealtimeMatchSubScreen.cs => TestSceneMultiplayerMatchSubScreen.cs} (73%)
 rename osu.Game.Tests/Visual/Multiplayer/{TestSceneRealtimeMultiplayerParticipantsList.cs => TestSceneMultiplayerParticipantsList.cs} (94%)
 rename osu.Game.Tests/Visual/Multiplayer/{TestSceneRealtimeReadyButton.cs => TestSceneMultiplayerReadyButton.cs} (94%)
 rename osu.Game.Tests/Visual/Multiplayer/{TestSceneRealtimeRoomManager.cs => TestSceneMultiplayerRoomManager.cs} (92%)
 rename osu.Game/Online/{RealtimeMultiplayer => Multiplayer}/IMultiplayerClient.cs (98%)
 rename osu.Game/Online/{RealtimeMultiplayer => Multiplayer}/IMultiplayerLoungeServer.cs (93%)
 rename osu.Game/Online/{RealtimeMultiplayer => Multiplayer}/IMultiplayerRoomServer.cs (98%)
 rename osu.Game/Online/{RealtimeMultiplayer => Multiplayer}/IMultiplayerServer.cs (88%)
 rename osu.Game/Online/{RealtimeMultiplayer => Multiplayer}/InvalidStateChangeException.cs (93%)
 rename osu.Game/Online/{RealtimeMultiplayer => Multiplayer}/InvalidStateException.cs (92%)
 rename osu.Game/Online/{RealtimeMultiplayer/RealtimeMultiplayerClient.cs => Multiplayer/MultiplayerClient.cs} (97%)
 rename osu.Game/Online/{RealtimeMultiplayer => Multiplayer}/MultiplayerRoom.cs (98%)
 rename osu.Game/Online/{RealtimeMultiplayer => Multiplayer}/MultiplayerRoomSettings.cs (96%)
 rename osu.Game/Online/{RealtimeMultiplayer => Multiplayer}/MultiplayerRoomState.cs (86%)
 rename osu.Game/Online/{RealtimeMultiplayer => Multiplayer}/MultiplayerRoomUser.cs (96%)
 rename osu.Game/Online/{RealtimeMultiplayer => Multiplayer}/MultiplayerUserState.cs (98%)
 rename osu.Game/Online/{RealtimeMultiplayer => Multiplayer}/NotHostException.cs (92%)
 rename osu.Game/Online/{RealtimeMultiplayer => Multiplayer}/NotJoinedRoomException.cs (92%)
 rename osu.Game/Online/{RealtimeMultiplayer => Multiplayer}/StatefulMultiplayerClient.cs (99%)
 rename osu.Game/Online/{Multiplayer => Rooms}/APICreatedRoom.cs (88%)
 rename osu.Game/Online/{Multiplayer => Rooms}/APILeaderboard.cs (92%)
 rename osu.Game/Online/{Multiplayer => Rooms}/APIPlaylistBeatmap.cs (94%)
 rename osu.Game/Online/{Multiplayer => Rooms}/APIScoreToken.cs (88%)
 rename osu.Game/Online/{Multiplayer => Rooms}/CreateRoomRequest.cs (95%)
 rename osu.Game/Online/{Multiplayer => Rooms}/CreateRoomScoreRequest.cs (96%)
 rename osu.Game/Online/{Multiplayer => Rooms}/GameType.cs (93%)
 rename osu.Game/Online/{Multiplayer => Rooms}/GameTypes/GameTypeTag.cs (94%)
 rename osu.Game/Online/{Multiplayer => Rooms}/GameTypes/GameTypeTagTeam.cs (96%)
 rename osu.Game/Online/{Multiplayer => Rooms}/GameTypes/GameTypeTeamVersus.cs (95%)
 rename osu.Game/Online/{Multiplayer => Rooms}/GameTypes/GameTypeTimeshift.cs (93%)
 rename osu.Game/Online/{Multiplayer => Rooms}/GameTypes/GameTypeVersus.cs (92%)
 rename osu.Game/Online/{Multiplayer => Rooms}/GameTypes/VersusRow.cs (97%)
 rename osu.Game/Online/{Multiplayer => Rooms}/GetRoomLeaderboardRequest.cs (92%)
 rename osu.Game/Online/{Multiplayer => Rooms}/GetRoomRequest.cs (92%)
 rename osu.Game/Online/{Multiplayer => Rooms}/GetRoomsRequest.cs (96%)
 rename osu.Game/Online/{Multiplayer => Rooms}/IndexPlaylistScoresRequest.cs (97%)
 rename osu.Game/Online/{Multiplayer => Rooms}/IndexScoresParams.cs (94%)
 rename osu.Game/Online/{Multiplayer => Rooms}/IndexedMultiplayerScores.cs (95%)
 rename osu.Game/Online/{Multiplayer => Rooms}/JoinRoomRequest.cs (94%)
 rename osu.Game/Online/{Multiplayer => Rooms}/MultiplayerScore.cs (98%)
 rename osu.Game/Online/{Multiplayer => Rooms}/MultiplayerScores.cs (95%)
 rename osu.Game/Online/{Multiplayer => Rooms}/MultiplayerScoresAround.cs (95%)
 rename osu.Game/Online/{Multiplayer => Rooms}/PartRoomRequest.cs (94%)
 rename osu.Game/Online/{Multiplayer => Rooms}/PlaylistExtensions.cs (93%)
 rename osu.Game/Online/{Multiplayer => Rooms}/PlaylistItem.cs (98%)
 rename osu.Game/Online/{Multiplayer => Rooms}/Room.cs (97%)
 rename osu.Game/Online/{Multiplayer => Rooms}/RoomAvailability.cs (90%)
 rename osu.Game/Online/{Multiplayer => Rooms}/RoomCategory.cs (80%)
 rename osu.Game/Online/{Multiplayer => Rooms}/RoomStatus.cs (93%)
 rename osu.Game/Online/{Multiplayer => Rooms}/RoomStatuses/RoomStatusEnded.cs (88%)
 rename osu.Game/Online/{Multiplayer => Rooms}/RoomStatuses/RoomStatusOpen.cs (89%)
 rename osu.Game/Online/{Multiplayer => Rooms}/RoomStatuses/RoomStatusPlaying.cs (88%)
 rename osu.Game/Online/{Multiplayer => Rooms}/ShowPlaylistUserScoreRequest.cs (95%)
 rename osu.Game/Online/{Multiplayer => Rooms}/SubmitRoomScoreRequest.cs (97%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer/CreateRealtimeMatchButton.cs => Multiplayer/CreateMultiplayerMatchButton.cs} (77%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer => Multiplayer}/Match/BeatmapSelectionControl.cs (91%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer/Match/RealtimeMatchFooter.cs => Multiplayer/Match/MultiplayerMatchFooter.cs} (84%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer/Match/RealtimeMatchHeader.cs => Multiplayer/Match/MultiplayerMatchHeader.cs} (95%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs => Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs} (99%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer/Match/RealtimeReadyButton.cs => Multiplayer/Match/MultiplayerReadyButton.cs} (95%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer/RealtimeMultiplayer.cs => Multiplayer/Multiplayer.cs} (86%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer/RealtimeFilterControl.cs => Multiplayer/MultiplayerFilterControl.cs} (79%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer/RealtimeLoungeSubScreen.cs => Multiplayer/MultiplayerLoungeSubScreen.cs} (79%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer/RealtimeMatchSongSelect.cs => Multiplayer/MultiplayerMatchSongSelect.cs} (92%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer/RealtimeMatchSubScreen.cs => Multiplayer/MultiplayerMatchSubScreen.cs} (92%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer/RealtimePlayer.cs => Multiplayer/MultiplayerPlayer.cs} (93%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer/RealtimeResultsScreen.cs => Multiplayer/MultiplayerResultsScreen.cs} (55%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer/RealtimeRoomComposite.cs => Multiplayer/MultiplayerRoomComposite.cs} (83%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer/RealtimeRoomManager.cs => Multiplayer/MultiplayerRoomManager.cs} (92%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer => Multiplayer}/Participants/ParticipantPanel.cs (97%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer => Multiplayer}/Participants/ParticipantsList.cs (93%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer => Multiplayer}/Participants/ParticipantsListHeader.cs (86%)
 rename osu.Game/Screens/Multi/{RealtimeMultiplayer => Multiplayer}/Participants/StateDisplay.cs (97%)
 rename osu.Game/Screens/Multi/{Multiplayer.cs => MultiplayerScreen.cs} (99%)
 rename osu.Game/Tests/Visual/{RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs => Multiplayer/MultiplayerTestScene.cs} (67%)
 rename osu.Game/Tests/Visual/{RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs => Multiplayer/TestMultiplayerClient.cs} (95%)
 rename osu.Game/Tests/Visual/{RealtimeMultiplayer/TestRealtimeRoomContainer.cs => Multiplayer/TestMultiplayerRoomContainer.cs} (67%)
 rename osu.Game/Tests/Visual/{RealtimeMultiplayer/TestRealtimeRoomManager.cs => Multiplayer/TestMultiplayerRoomManager.cs} (95%)
 rename osu.Game/Tests/Visual/{MultiplayerTestScene.cs => RoomTestScene.cs} (90%)

diff --git a/osu.Game.Tests/Visual/Multiplayer/RoomManagerTestScene.cs b/osu.Game.Tests/Visual/Multiplayer/RoomManagerTestScene.cs
index 8b7e0fd9da..a2c496a504 100644
--- a/osu.Game.Tests/Visual/Multiplayer/RoomManagerTestScene.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/RoomManagerTestScene.cs
@@ -4,14 +4,14 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Game.Beatmaps;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Multi;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public abstract class RoomManagerTestScene : MultiplayerTestScene
+    public abstract class RoomManagerTestScene : RoomTestScene
     {
         [Cached(Type = typeof(IRoomManager))]
         protected TestRoomManager RoomManager { get; } = new TestRoomManager();
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs b/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs
index 9dd4aea4bd..7d9d4a6542 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs
@@ -3,7 +3,7 @@
 
 using System;
 using osu.Framework.Bindables;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.Multi;
 
 namespace osu.Game.Tests.Visual.Multiplayer
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
index 55b026eff6..722e1a50ef 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
@@ -13,7 +13,7 @@ using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
index 9baaa42c83..1359274512 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
@@ -4,7 +4,7 @@
 using System;
 using NUnit.Framework;
 using osu.Framework.Graphics;
-using osu.Game.Online.Multiplayer.RoomStatuses;
+using osu.Game.Online.Rooms.RoomStatuses;
 using osu.Game.Screens.Multi.Lounge.Components;
 using osu.Game.Users;
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
index e33d15cfff..9b6a6de7c2 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
@@ -6,7 +6,7 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Rulesets.Catch;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Multi.Lounge.Components;
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
index 6b1d90e06e..f4e0cc415c 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
@@ -5,7 +5,7 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
index ec5292e51e..e162009771 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
@@ -3,7 +3,7 @@
 
 using NUnit.Framework;
 using osu.Game.Beatmaps;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Screens.Multi.Match.Components;
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeMultiplayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
similarity index 77%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeMultiplayer.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
index cc07bb8e79..5c07b9d0ea 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeMultiplayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
@@ -3,16 +3,15 @@
 
 using NUnit.Framework;
 using osu.Game.Screens.Multi.Components;
-using osu.Game.Tests.Visual.RealtimeMultiplayer;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneRealtimeMultiplayer : RealtimeMultiplayerTestScene
+    public class TestSceneMultiplayer : MultiplayerTestScene
     {
-        public TestSceneRealtimeMultiplayer()
+        public TestSceneMultiplayer()
         {
-            var multi = new TestRealtimeMultiplayer();
+            var multi = new TestMultiplayer();
 
             AddStep("show", () => LoadScreen(multi));
             AddUntilStep("wait for loaded", () => multi.IsLoaded);
@@ -40,9 +39,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("room has 1 user", () => Client.Room?.Users.Count == 1);
         }
 
-        private class TestRealtimeMultiplayer : Screens.Multi.RealtimeMultiplayer.RealtimeMultiplayer
+        private class TestMultiplayer : Screens.Multi.Multiplayer.Multiplayer
         {
-            protected override RoomManager CreateRoomManager() => new TestRealtimeRoomManager();
+            protected override RoomManager CreateRoomManager() => new TestMultiplayerRoomManager();
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
similarity index 73%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeMatchSubScreen.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
index dff375d1bb..6dc26dae57 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
@@ -5,21 +5,20 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Rulesets.Osu;
-using osu.Game.Screens.Multi.RealtimeMultiplayer;
-using osu.Game.Screens.Multi.RealtimeMultiplayer.Match;
+using osu.Game.Screens.Multi.Multiplayer;
+using osu.Game.Screens.Multi.Multiplayer.Match;
 using osu.Game.Tests.Beatmaps;
-using osu.Game.Tests.Visual.RealtimeMultiplayer;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneRealtimeMatchSubScreen : RealtimeMultiplayerTestScene
+    public class TestSceneMultiplayerMatchSubScreen : MultiplayerTestScene
     {
-        private RealtimeMatchSubScreen screen;
+        private MultiplayerMatchSubScreen screen;
 
-        public TestSceneRealtimeMatchSubScreen()
+        public TestSceneMultiplayerMatchSubScreen()
             : base(false)
         {
         }
@@ -33,14 +32,14 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [SetUpSteps]
         public void SetupSteps()
         {
-            AddStep("load match", () => LoadScreen(screen = new RealtimeMatchSubScreen(Room)));
+            AddStep("load match", () => LoadScreen(screen = new MultiplayerMatchSubScreen(Room)));
             AddUntilStep("wait for load", () => screen.IsCurrentScreen());
         }
 
         [Test]
         public void TestSettingValidity()
         {
-            AddAssert("create button not enabled", () => !this.ChildrenOfType<RealtimeMatchSettingsOverlay.CreateOrUpdateButton>().Single().Enabled.Value);
+            AddAssert("create button not enabled", () => !this.ChildrenOfType<MultiplayerMatchSettingsOverlay.CreateOrUpdateButton>().Single().Enabled.Value);
 
             AddStep("set playlist", () =>
             {
@@ -51,7 +50,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 });
             });
 
-            AddAssert("create button enabled", () => this.ChildrenOfType<RealtimeMatchSettingsOverlay.CreateOrUpdateButton>().Single().Enabled.Value);
+            AddAssert("create button enabled", () => this.ChildrenOfType<MultiplayerMatchSettingsOverlay.CreateOrUpdateButton>().Single().Enabled.Value);
         }
 
         [Test]
@@ -68,7 +67,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             AddStep("click create button", () =>
             {
-                InputManager.MoveMouseTo(this.ChildrenOfType<RealtimeMatchSettingsOverlay.CreateOrUpdateButton>().Single());
+                InputManager.MoveMouseTo(this.ChildrenOfType<MultiplayerMatchSettingsOverlay.CreateOrUpdateButton>().Single());
                 InputManager.Click(MouseButton.Left);
             });
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
similarity index 94%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeMultiplayerParticipantsList.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index 7c26918927..ee2fa4ef5a 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
@@ -7,15 +7,14 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
-using osu.Game.Online.RealtimeMultiplayer;
-using osu.Game.Screens.Multi.RealtimeMultiplayer.Participants;
-using osu.Game.Tests.Visual.RealtimeMultiplayer;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Screens.Multi.Multiplayer.Participants;
 using osu.Game.Users;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneRealtimeMultiplayerParticipantsList : RealtimeMultiplayerTestScene
+    public class TestSceneMultiplayerParticipantsList : MultiplayerTestScene
     {
         [SetUp]
         public new void Setup() => Schedule(() =>
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeReadyButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
similarity index 94%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeReadyButton.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
index 3c92276629..c8ebdb1b76 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeReadyButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
@@ -10,20 +10,19 @@ using osu.Framework.Platform;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
-using osu.Game.Screens.Multi.RealtimeMultiplayer.Match;
+using osu.Game.Screens.Multi.Multiplayer.Match;
 using osu.Game.Tests.Resources;
-using osu.Game.Tests.Visual.RealtimeMultiplayer;
 using osu.Game.Users;
 using osuTK;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneRealtimeReadyButton : RealtimeMultiplayerTestScene
+    public class TestSceneMultiplayerReadyButton : MultiplayerTestScene
     {
-        private RealtimeReadyButton button;
+        private MultiplayerReadyButton button;
 
         private BeatmapManager beatmaps;
         private RulesetStore rulesets;
@@ -43,7 +42,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmap);
 
-            Child = button = new RealtimeReadyButton
+            Child = button = new MultiplayerReadyButton
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeRoomManager.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
similarity index 92%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeRoomManager.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
index ba90e0840b..292c4846ab 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneRealtimeRoomManager.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
@@ -4,16 +4,15 @@
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
-using osu.Game.Online.Multiplayer;
-using osu.Game.Tests.Visual.RealtimeMultiplayer;
+using osu.Game.Online.Rooms;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
     [HeadlessTest]
-    public class TestSceneRealtimeRoomManager : MultiplayerTestScene
+    public class TestSceneMultiplayerRoomManager : MultiplayerTestScene
     {
-        private TestRealtimeRoomContainer roomContainer;
-        private TestRealtimeRoomManager roomManager => roomContainer.RoomManager;
+        private TestMultiplayerRoomContainer roomContainer;
+        private TestMultiplayerRoomManager roomManager => roomContainer.RoomManager;
 
         [Test]
         public void TestPollsInitially()
@@ -137,9 +136,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("multiplayer room joined", () => roomContainer.Client.Room != null);
         }
 
-        private TestRealtimeRoomManager createRoomManager()
+        private TestMultiplayerRoomManager createRoomManager()
         {
-            Child = roomContainer = new TestRealtimeRoomContainer
+            Child = roomContainer = new TestMultiplayerRoomContainer
             {
                 RoomManager =
                 {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs
index a6dd1437f7..788255501b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs
@@ -4,8 +4,8 @@
 using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Online.Multiplayer;
-using osu.Game.Online.Multiplayer.RoomStatuses;
+using osu.Game.Online.Rooms;
+using osu.Game.Online.Rooms.RoomStatuses;
 using osu.Game.Screens.Multi.Lounge.Components;
 
 namespace osu.Game.Tests.Visual.Multiplayer
@@ -40,9 +40,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     }) { MatchingFilter = true },
                     new DrawableRoom(new Room
                     {
-                        Name = { Value = "Open (realtime)" },
+                        Name = { Value = "Open" },
                         Status = { Value = new RoomStatusOpen() },
-                        Category = { Value = RoomCategory.Realtime }
+                        Category = { Value = RoomCategory.Multiplayer }
                     }) { MatchingFilter = true },
                 }
             };
diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsMatchSettingsOverlay.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsMatchSettingsOverlay.cs
index 2a110c0386..4e75619f13 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsMatchSettingsOverlay.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsMatchSettingsOverlay.cs
@@ -9,13 +9,13 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.Multi;
 using osu.Game.Screens.Multi.Playlists;
 
 namespace osu.Game.Tests.Visual.Playlists
 {
-    public class TestScenePlaylistsMatchSettingsOverlay : MultiplayerTestScene
+    public class TestScenePlaylistsMatchSettingsOverlay : RoomTestScene
     {
         [Cached(Type = typeof(IRoomManager))]
         private TestRoomManager roomManager = new TestRoomManager();
diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsParticipantsList.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsParticipantsList.cs
index d5553e4527..5a0f196df9 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsParticipantsList.cs
@@ -8,7 +8,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Playlists
 {
-    public class TestScenePlaylistsParticipantsList : MultiplayerTestScene
+    public class TestScenePlaylistsParticipantsList : RoomTestScene
     {
         [SetUp]
         public new void Setup() => Schedule(() =>
diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
index 10ae44351b..b42f2e1d2d 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
@@ -15,7 +15,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs
index aebff14c80..96ff93a145 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs
@@ -12,7 +12,7 @@ using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Multi;
@@ -24,7 +24,7 @@ using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Playlists
 {
-    public class TestScenePlaylistsRoomSubScreen : MultiplayerTestScene
+    public class TestScenePlaylistsRoomSubScreen : RoomTestScene
     {
         protected override bool UseOnlineAPI => true;
 
diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
similarity index 98%
rename from osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
rename to osu.Game/Online/Multiplayer/IMultiplayerClient.cs
index 9af0047137..b97fcc9ae7 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
@@ -3,7 +3,7 @@
 
 using System.Threading.Tasks;
 
-namespace osu.Game.Online.RealtimeMultiplayer
+namespace osu.Game.Online.Multiplayer
 {
     /// <summary>
     /// An interface defining a multiplayer client instance.
diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerLoungeServer.cs b/osu.Game/Online/Multiplayer/IMultiplayerLoungeServer.cs
similarity index 93%
rename from osu.Game/Online/RealtimeMultiplayer/IMultiplayerLoungeServer.cs
rename to osu.Game/Online/Multiplayer/IMultiplayerLoungeServer.cs
index eecb61bcb0..4640640c5f 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerLoungeServer.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerLoungeServer.cs
@@ -3,7 +3,7 @@
 
 using System.Threading.Tasks;
 
-namespace osu.Game.Online.RealtimeMultiplayer
+namespace osu.Game.Online.Multiplayer
 {
     /// <summary>
     /// Interface for an out-of-room multiplayer server.
diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerRoomServer.cs b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
similarity index 98%
rename from osu.Game/Online/RealtimeMultiplayer/IMultiplayerRoomServer.cs
rename to osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
index 12dfe481c4..481e3fb1de 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerRoomServer.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
@@ -3,7 +3,7 @@
 
 using System.Threading.Tasks;
 
-namespace osu.Game.Online.RealtimeMultiplayer
+namespace osu.Game.Online.Multiplayer
 {
     /// <summary>
     /// Interface for an in-room multiplayer server.
diff --git a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs b/osu.Game/Online/Multiplayer/IMultiplayerServer.cs
similarity index 88%
rename from osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
rename to osu.Game/Online/Multiplayer/IMultiplayerServer.cs
index 1d093af743..d3a070af6d 100644
--- a/osu.Game/Online/RealtimeMultiplayer/IMultiplayerServer.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerServer.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.
 
-namespace osu.Game.Online.RealtimeMultiplayer
+namespace osu.Game.Online.Multiplayer
 {
     /// <summary>
     /// An interface defining the multiplayer server instance.
diff --git a/osu.Game/Online/RealtimeMultiplayer/InvalidStateChangeException.cs b/osu.Game/Online/Multiplayer/InvalidStateChangeException.cs
similarity index 93%
rename from osu.Game/Online/RealtimeMultiplayer/InvalidStateChangeException.cs
rename to osu.Game/Online/Multiplayer/InvalidStateChangeException.cs
index d9a276fc19..69b6d4bc13 100644
--- a/osu.Game/Online/RealtimeMultiplayer/InvalidStateChangeException.cs
+++ b/osu.Game/Online/Multiplayer/InvalidStateChangeException.cs
@@ -5,7 +5,7 @@ using System;
 using System.Runtime.Serialization;
 using Microsoft.AspNetCore.SignalR;
 
-namespace osu.Game.Online.RealtimeMultiplayer
+namespace osu.Game.Online.Multiplayer
 {
     [Serializable]
     public class InvalidStateChangeException : HubException
diff --git a/osu.Game/Online/RealtimeMultiplayer/InvalidStateException.cs b/osu.Game/Online/Multiplayer/InvalidStateException.cs
similarity index 92%
rename from osu.Game/Online/RealtimeMultiplayer/InvalidStateException.cs
rename to osu.Game/Online/Multiplayer/InvalidStateException.cs
index 7791bfc69f..77a3533dd3 100644
--- a/osu.Game/Online/RealtimeMultiplayer/InvalidStateException.cs
+++ b/osu.Game/Online/Multiplayer/InvalidStateException.cs
@@ -5,7 +5,7 @@ using System;
 using System.Runtime.Serialization;
 using Microsoft.AspNetCore.SignalR;
 
-namespace osu.Game.Online.RealtimeMultiplayer
+namespace osu.Game.Online.Multiplayer
 {
     [Serializable]
     public class InvalidStateException : HubException
diff --git a/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
similarity index 97%
rename from osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
rename to osu.Game/Online/Multiplayer/MultiplayerClient.cs
index cb5c21a8c9..24ea6abc4a 100644
--- a/osu.Game/Online/RealtimeMultiplayer/RealtimeMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -15,9 +15,9 @@ using osu.Framework.Bindables;
 using osu.Framework.Logging;
 using osu.Game.Online.API;
 
-namespace osu.Game.Online.RealtimeMultiplayer
+namespace osu.Game.Online.Multiplayer
 {
-    public class RealtimeMultiplayerClient : StatefulMultiplayerClient
+    public class MultiplayerClient : StatefulMultiplayerClient
     {
         public override IBindable<bool> IsConnected => isConnected;
 
@@ -31,7 +31,7 @@ namespace osu.Game.Online.RealtimeMultiplayer
 
         private readonly string endpoint;
 
-        public RealtimeMultiplayerClient(EndpointConfiguration endpoints)
+        public MultiplayerClient(EndpointConfiguration endpoints)
         {
             endpoint = endpoints.MultiplayerEndpointUrl;
         }
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs b/osu.Game/Online/Multiplayer/MultiplayerRoom.cs
similarity index 98%
rename from osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
rename to osu.Game/Online/Multiplayer/MultiplayerRoom.cs
index e009a34707..2134e50d72 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoom.cs
@@ -9,7 +9,7 @@ using System.Threading;
 using Newtonsoft.Json;
 using osu.Framework.Allocation;
 
-namespace osu.Game.Online.RealtimeMultiplayer
+namespace osu.Game.Online.Multiplayer
 {
     /// <summary>
     /// A multiplayer room.
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
similarity index 96%
rename from osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
rename to osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
index 60e0d1292e..857b38ea60 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomSettings.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
@@ -9,7 +9,7 @@ using System.Linq;
 using JetBrains.Annotations;
 using osu.Game.Online.API;
 
-namespace osu.Game.Online.RealtimeMultiplayer
+namespace osu.Game.Online.Multiplayer
 {
     [Serializable]
     public class MultiplayerRoomSettings : IEquatable<MultiplayerRoomSettings>
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomState.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomState.cs
similarity index 86%
rename from osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomState.cs
rename to osu.Game/Online/Multiplayer/MultiplayerRoomState.cs
index 69c04b09a8..48f25d7ca2 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomState.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomState.cs
@@ -3,10 +3,10 @@
 
 #nullable enable
 
-namespace osu.Game.Online.RealtimeMultiplayer
+namespace osu.Game.Online.Multiplayer
 {
     /// <summary>
-    /// The current overall state of a realtime multiplayer room.
+    /// The current overall state of a multiplayer room.
     /// </summary>
     public enum MultiplayerRoomState
     {
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
similarity index 96%
rename from osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs
rename to osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
index caf1a70197..99624dc3e7 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerRoomUser.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
@@ -7,7 +7,7 @@ using System;
 using Newtonsoft.Json;
 using osu.Game.Users;
 
-namespace osu.Game.Online.RealtimeMultiplayer
+namespace osu.Game.Online.Multiplayer
 {
     [Serializable]
     public class MultiplayerRoomUser : IEquatable<MultiplayerRoomUser>
diff --git a/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs b/osu.Game/Online/Multiplayer/MultiplayerUserState.cs
similarity index 98%
rename from osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs
rename to osu.Game/Online/Multiplayer/MultiplayerUserState.cs
index ed9acd146e..e54c71cd85 100644
--- a/osu.Game/Online/RealtimeMultiplayer/MultiplayerUserState.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerUserState.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.
 
-namespace osu.Game.Online.RealtimeMultiplayer
+namespace osu.Game.Online.Multiplayer
 {
     public enum MultiplayerUserState
     {
diff --git a/osu.Game/Online/RealtimeMultiplayer/NotHostException.cs b/osu.Game/Online/Multiplayer/NotHostException.cs
similarity index 92%
rename from osu.Game/Online/RealtimeMultiplayer/NotHostException.cs
rename to osu.Game/Online/Multiplayer/NotHostException.cs
index 56095043f0..051cde45a0 100644
--- a/osu.Game/Online/RealtimeMultiplayer/NotHostException.cs
+++ b/osu.Game/Online/Multiplayer/NotHostException.cs
@@ -5,7 +5,7 @@ using System;
 using System.Runtime.Serialization;
 using Microsoft.AspNetCore.SignalR;
 
-namespace osu.Game.Online.RealtimeMultiplayer
+namespace osu.Game.Online.Multiplayer
 {
     [Serializable]
     public class NotHostException : HubException
diff --git a/osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs b/osu.Game/Online/Multiplayer/NotJoinedRoomException.cs
similarity index 92%
rename from osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs
rename to osu.Game/Online/Multiplayer/NotJoinedRoomException.cs
index 7a6e089d0b..0e9902f002 100644
--- a/osu.Game/Online/RealtimeMultiplayer/NotJoinedRoomException.cs
+++ b/osu.Game/Online/Multiplayer/NotJoinedRoomException.cs
@@ -5,7 +5,7 @@ using System;
 using System.Runtime.Serialization;
 using Microsoft.AspNetCore.SignalR;
 
-namespace osu.Game.Online.RealtimeMultiplayer
+namespace osu.Game.Online.Multiplayer
 {
     [Serializable]
     public class NotJoinedRoomException : HubException
diff --git a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
similarity index 99%
rename from osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
rename to osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 9149bdcba3..e422e982ae 100644
--- a/osu.Game/Online/RealtimeMultiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -18,13 +18,13 @@ using osu.Game.Extensions;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Online.Multiplayer;
-using osu.Game.Online.Multiplayer.RoomStatuses;
+using osu.Game.Online.Rooms;
+using osu.Game.Online.Rooms.RoomStatuses;
 using osu.Game.Rulesets;
 using osu.Game.Users;
 using osu.Game.Utils;
 
-namespace osu.Game.Online.RealtimeMultiplayer
+namespace osu.Game.Online.Multiplayer
 {
     public abstract class StatefulMultiplayerClient : Component, IMultiplayerClient, IMultiplayerRoomServer
     {
diff --git a/osu.Game/Online/Multiplayer/APICreatedRoom.cs b/osu.Game/Online/Rooms/APICreatedRoom.cs
similarity index 88%
rename from osu.Game/Online/Multiplayer/APICreatedRoom.cs
rename to osu.Game/Online/Rooms/APICreatedRoom.cs
index 2a3bb39647..d1062b2306 100644
--- a/osu.Game/Online/Multiplayer/APICreatedRoom.cs
+++ b/osu.Game/Online/Rooms/APICreatedRoom.cs
@@ -3,7 +3,7 @@
 
 using Newtonsoft.Json;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public class APICreatedRoom : Room
     {
diff --git a/osu.Game/Online/Multiplayer/APILeaderboard.cs b/osu.Game/Online/Rooms/APILeaderboard.cs
similarity index 92%
rename from osu.Game/Online/Multiplayer/APILeaderboard.cs
rename to osu.Game/Online/Rooms/APILeaderboard.cs
index 65863d6e0e..c487123906 100644
--- a/osu.Game/Online/Multiplayer/APILeaderboard.cs
+++ b/osu.Game/Online/Rooms/APILeaderboard.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Newtonsoft.Json;
 using osu.Game.Online.API.Requests.Responses;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public class APILeaderboard
     {
diff --git a/osu.Game/Online/Multiplayer/APIPlaylistBeatmap.cs b/osu.Game/Online/Rooms/APIPlaylistBeatmap.cs
similarity index 94%
rename from osu.Game/Online/Multiplayer/APIPlaylistBeatmap.cs
rename to osu.Game/Online/Rooms/APIPlaylistBeatmap.cs
index 98972ef36d..973dccd528 100644
--- a/osu.Game/Online/Multiplayer/APIPlaylistBeatmap.cs
+++ b/osu.Game/Online/Rooms/APIPlaylistBeatmap.cs
@@ -6,7 +6,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public class APIPlaylistBeatmap : APIBeatmap
     {
diff --git a/osu.Game/Online/Multiplayer/APIScoreToken.cs b/osu.Game/Online/Rooms/APIScoreToken.cs
similarity index 88%
rename from osu.Game/Online/Multiplayer/APIScoreToken.cs
rename to osu.Game/Online/Rooms/APIScoreToken.cs
index 1f0063d94e..f652c1720d 100644
--- a/osu.Game/Online/Multiplayer/APIScoreToken.cs
+++ b/osu.Game/Online/Rooms/APIScoreToken.cs
@@ -3,7 +3,7 @@
 
 using Newtonsoft.Json;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public class APIScoreToken
     {
diff --git a/osu.Game/Online/Multiplayer/CreateRoomRequest.cs b/osu.Game/Online/Rooms/CreateRoomRequest.cs
similarity index 95%
rename from osu.Game/Online/Multiplayer/CreateRoomRequest.cs
rename to osu.Game/Online/Rooms/CreateRoomRequest.cs
index 5be99e9442..f058eb9ba8 100644
--- a/osu.Game/Online/Multiplayer/CreateRoomRequest.cs
+++ b/osu.Game/Online/Rooms/CreateRoomRequest.cs
@@ -6,7 +6,7 @@ using Newtonsoft.Json;
 using osu.Framework.IO.Network;
 using osu.Game.Online.API;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public class CreateRoomRequest : APIRequest<APICreatedRoom>
     {
diff --git a/osu.Game/Online/Multiplayer/CreateRoomScoreRequest.cs b/osu.Game/Online/Rooms/CreateRoomScoreRequest.cs
similarity index 96%
rename from osu.Game/Online/Multiplayer/CreateRoomScoreRequest.cs
rename to osu.Game/Online/Rooms/CreateRoomScoreRequest.cs
index 2d99b12519..afd0dadc7e 100644
--- a/osu.Game/Online/Multiplayer/CreateRoomScoreRequest.cs
+++ b/osu.Game/Online/Rooms/CreateRoomScoreRequest.cs
@@ -5,7 +5,7 @@ using System.Net.Http;
 using osu.Framework.IO.Network;
 using osu.Game.Online.API;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public class CreateRoomScoreRequest : APIRequest<APIScoreToken>
     {
diff --git a/osu.Game/Online/Multiplayer/GameType.cs b/osu.Game/Online/Rooms/GameType.cs
similarity index 93%
rename from osu.Game/Online/Multiplayer/GameType.cs
rename to osu.Game/Online/Rooms/GameType.cs
index 10381d93bb..caa352d812 100644
--- a/osu.Game/Online/Multiplayer/GameType.cs
+++ b/osu.Game/Online/Rooms/GameType.cs
@@ -4,7 +4,7 @@
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public abstract class GameType
     {
diff --git a/osu.Game/Online/Multiplayer/GameTypes/GameTypeTag.cs b/osu.Game/Online/Rooms/GameTypes/GameTypeTag.cs
similarity index 94%
rename from osu.Game/Online/Multiplayer/GameTypes/GameTypeTag.cs
rename to osu.Game/Online/Rooms/GameTypes/GameTypeTag.cs
index 5ba5f1a415..e468612738 100644
--- a/osu.Game/Online/Multiplayer/GameTypes/GameTypeTag.cs
+++ b/osu.Game/Online/Rooms/GameTypes/GameTypeTag.cs
@@ -6,7 +6,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osuTK;
 
-namespace osu.Game.Online.Multiplayer.GameTypes
+namespace osu.Game.Online.Rooms.GameTypes
 {
     public class GameTypeTag : GameType
     {
diff --git a/osu.Game/Online/Multiplayer/GameTypes/GameTypeTagTeam.cs b/osu.Game/Online/Rooms/GameTypes/GameTypeTagTeam.cs
similarity index 96%
rename from osu.Game/Online/Multiplayer/GameTypes/GameTypeTagTeam.cs
rename to osu.Game/Online/Rooms/GameTypes/GameTypeTagTeam.cs
index ef0a00a9f0..b82f203fac 100644
--- a/osu.Game/Online/Multiplayer/GameTypes/GameTypeTagTeam.cs
+++ b/osu.Game/Online/Rooms/GameTypes/GameTypeTagTeam.cs
@@ -7,7 +7,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osuTK;
 
-namespace osu.Game.Online.Multiplayer.GameTypes
+namespace osu.Game.Online.Rooms.GameTypes
 {
     public class GameTypeTagTeam : GameType
     {
diff --git a/osu.Game/Online/Multiplayer/GameTypes/GameTypeTeamVersus.cs b/osu.Game/Online/Rooms/GameTypes/GameTypeTeamVersus.cs
similarity index 95%
rename from osu.Game/Online/Multiplayer/GameTypes/GameTypeTeamVersus.cs
rename to osu.Game/Online/Rooms/GameTypes/GameTypeTeamVersus.cs
index c25bce1c71..5ad4033dc9 100644
--- a/osu.Game/Online/Multiplayer/GameTypes/GameTypeTeamVersus.cs
+++ b/osu.Game/Online/Rooms/GameTypes/GameTypeTeamVersus.cs
@@ -6,7 +6,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osuTK;
 
-namespace osu.Game.Online.Multiplayer.GameTypes
+namespace osu.Game.Online.Rooms.GameTypes
 {
     public class GameTypeTeamVersus : GameType
     {
diff --git a/osu.Game/Online/Multiplayer/GameTypes/GameTypeTimeshift.cs b/osu.Game/Online/Rooms/GameTypes/GameTypeTimeshift.cs
similarity index 93%
rename from osu.Game/Online/Multiplayer/GameTypes/GameTypeTimeshift.cs
rename to osu.Game/Online/Rooms/GameTypes/GameTypeTimeshift.cs
index 5840ccb803..3425c6c5cd 100644
--- a/osu.Game/Online/Multiplayer/GameTypes/GameTypeTimeshift.cs
+++ b/osu.Game/Online/Rooms/GameTypes/GameTypeTimeshift.cs
@@ -6,7 +6,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osuTK;
 
-namespace osu.Game.Online.Multiplayer.GameTypes
+namespace osu.Game.Online.Rooms.GameTypes
 {
     public class GameTypePlaylists : GameType
     {
diff --git a/osu.Game/Online/Multiplayer/GameTypes/GameTypeVersus.cs b/osu.Game/Online/Rooms/GameTypes/GameTypeVersus.cs
similarity index 92%
rename from osu.Game/Online/Multiplayer/GameTypes/GameTypeVersus.cs
rename to osu.Game/Online/Rooms/GameTypes/GameTypeVersus.cs
index 4640c7b361..3783cc67b0 100644
--- a/osu.Game/Online/Multiplayer/GameTypes/GameTypeVersus.cs
+++ b/osu.Game/Online/Rooms/GameTypes/GameTypeVersus.cs
@@ -4,7 +4,7 @@
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
 
-namespace osu.Game.Online.Multiplayer.GameTypes
+namespace osu.Game.Online.Rooms.GameTypes
 {
     public class GameTypeVersus : GameType
     {
diff --git a/osu.Game/Online/Multiplayer/GameTypes/VersusRow.cs b/osu.Game/Online/Rooms/GameTypes/VersusRow.cs
similarity index 97%
rename from osu.Game/Online/Multiplayer/GameTypes/VersusRow.cs
rename to osu.Game/Online/Rooms/GameTypes/VersusRow.cs
index b6e8e4458f..0bd09a23ac 100644
--- a/osu.Game/Online/Multiplayer/GameTypes/VersusRow.cs
+++ b/osu.Game/Online/Rooms/GameTypes/VersusRow.cs
@@ -7,7 +7,7 @@ using osu.Framework.Graphics.Shapes;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Online.Multiplayer.GameTypes
+namespace osu.Game.Online.Rooms.GameTypes
 {
     public class VersusRow : FillFlowContainer
     {
diff --git a/osu.Game/Online/Multiplayer/GetRoomLeaderboardRequest.cs b/osu.Game/Online/Rooms/GetRoomLeaderboardRequest.cs
similarity index 92%
rename from osu.Game/Online/Multiplayer/GetRoomLeaderboardRequest.cs
rename to osu.Game/Online/Rooms/GetRoomLeaderboardRequest.cs
index 37c21457bc..15f1221a00 100644
--- a/osu.Game/Online/Multiplayer/GetRoomLeaderboardRequest.cs
+++ b/osu.Game/Online/Rooms/GetRoomLeaderboardRequest.cs
@@ -3,7 +3,7 @@
 
 using osu.Game.Online.API;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public class GetRoomLeaderboardRequest : APIRequest<APILeaderboard>
     {
diff --git a/osu.Game/Online/Multiplayer/GetRoomRequest.cs b/osu.Game/Online/Rooms/GetRoomRequest.cs
similarity index 92%
rename from osu.Game/Online/Multiplayer/GetRoomRequest.cs
rename to osu.Game/Online/Rooms/GetRoomRequest.cs
index 449c2c8e31..ce117075c7 100644
--- a/osu.Game/Online/Multiplayer/GetRoomRequest.cs
+++ b/osu.Game/Online/Rooms/GetRoomRequest.cs
@@ -3,7 +3,7 @@
 
 using osu.Game.Online.API;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public class GetRoomRequest : APIRequest<Room>
     {
diff --git a/osu.Game/Online/Multiplayer/GetRoomsRequest.cs b/osu.Game/Online/Rooms/GetRoomsRequest.cs
similarity index 96%
rename from osu.Game/Online/Multiplayer/GetRoomsRequest.cs
rename to osu.Game/Online/Rooms/GetRoomsRequest.cs
index a0609f77dd..5084b8627f 100644
--- a/osu.Game/Online/Multiplayer/GetRoomsRequest.cs
+++ b/osu.Game/Online/Rooms/GetRoomsRequest.cs
@@ -7,7 +7,7 @@ using osu.Framework.IO.Network;
 using osu.Game.Online.API;
 using osu.Game.Screens.Multi.Lounge.Components;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public class GetRoomsRequest : APIRequest<List<Room>>
     {
diff --git a/osu.Game/Online/Multiplayer/IndexPlaylistScoresRequest.cs b/osu.Game/Online/Rooms/IndexPlaylistScoresRequest.cs
similarity index 97%
rename from osu.Game/Online/Multiplayer/IndexPlaylistScoresRequest.cs
rename to osu.Game/Online/Rooms/IndexPlaylistScoresRequest.cs
index 684d0aecd8..43f80a2dc4 100644
--- a/osu.Game/Online/Multiplayer/IndexPlaylistScoresRequest.cs
+++ b/osu.Game/Online/Rooms/IndexPlaylistScoresRequest.cs
@@ -8,7 +8,7 @@ using osu.Game.Extensions;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     /// <summary>
     /// Returns a list of scores for the specified playlist item.
diff --git a/osu.Game/Online/Multiplayer/IndexScoresParams.cs b/osu.Game/Online/Rooms/IndexScoresParams.cs
similarity index 94%
rename from osu.Game/Online/Multiplayer/IndexScoresParams.cs
rename to osu.Game/Online/Rooms/IndexScoresParams.cs
index a511e9a780..3df8c8e753 100644
--- a/osu.Game/Online/Multiplayer/IndexScoresParams.cs
+++ b/osu.Game/Online/Rooms/IndexScoresParams.cs
@@ -6,7 +6,7 @@ using JetBrains.Annotations;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     /// <summary>
     /// A collection of parameters which should be passed to the index endpoint to fetch the next page.
diff --git a/osu.Game/Online/Multiplayer/IndexedMultiplayerScores.cs b/osu.Game/Online/Rooms/IndexedMultiplayerScores.cs
similarity index 95%
rename from osu.Game/Online/Multiplayer/IndexedMultiplayerScores.cs
rename to osu.Game/Online/Rooms/IndexedMultiplayerScores.cs
index e237b7e3fb..2008d1aa52 100644
--- a/osu.Game/Online/Multiplayer/IndexedMultiplayerScores.cs
+++ b/osu.Game/Online/Rooms/IndexedMultiplayerScores.cs
@@ -4,7 +4,7 @@
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     /// <summary>
     /// A <see cref="MultiplayerScores"/> object returned via a <see cref="IndexPlaylistScoresRequest"/>.
diff --git a/osu.Game/Online/Multiplayer/JoinRoomRequest.cs b/osu.Game/Online/Rooms/JoinRoomRequest.cs
similarity index 94%
rename from osu.Game/Online/Multiplayer/JoinRoomRequest.cs
rename to osu.Game/Online/Rooms/JoinRoomRequest.cs
index 74375af856..faa20a3e6c 100644
--- a/osu.Game/Online/Multiplayer/JoinRoomRequest.cs
+++ b/osu.Game/Online/Rooms/JoinRoomRequest.cs
@@ -5,7 +5,7 @@ using System.Net.Http;
 using osu.Framework.IO.Network;
 using osu.Game.Online.API;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public class JoinRoomRequest : APIRequest
     {
diff --git a/osu.Game/Online/Multiplayer/MultiplayerScore.cs b/osu.Game/Online/Rooms/MultiplayerScore.cs
similarity index 98%
rename from osu.Game/Online/Multiplayer/MultiplayerScore.cs
rename to osu.Game/Online/Rooms/MultiplayerScore.cs
index 8191003aad..677a3d3026 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerScore.cs
+++ b/osu.Game/Online/Rooms/MultiplayerScore.cs
@@ -13,7 +13,7 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Users;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public class MultiplayerScore
     {
diff --git a/osu.Game/Online/Multiplayer/MultiplayerScores.cs b/osu.Game/Online/Rooms/MultiplayerScores.cs
similarity index 95%
rename from osu.Game/Online/Multiplayer/MultiplayerScores.cs
rename to osu.Game/Online/Rooms/MultiplayerScores.cs
index 7b9dcff828..3f970b2f8e 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerScores.cs
+++ b/osu.Game/Online/Rooms/MultiplayerScores.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Newtonsoft.Json;
 using osu.Game.Online.API.Requests;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     /// <summary>
     /// An object which contains scores and related data for fetching next pages.
diff --git a/osu.Game/Online/Multiplayer/MultiplayerScoresAround.cs b/osu.Game/Online/Rooms/MultiplayerScoresAround.cs
similarity index 95%
rename from osu.Game/Online/Multiplayer/MultiplayerScoresAround.cs
rename to osu.Game/Online/Rooms/MultiplayerScoresAround.cs
index 2ac62d0300..a99439312a 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerScoresAround.cs
+++ b/osu.Game/Online/Rooms/MultiplayerScoresAround.cs
@@ -4,7 +4,7 @@
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     /// <summary>
     /// An object which stores scores higher and lower than the user's score.
diff --git a/osu.Game/Online/Multiplayer/PartRoomRequest.cs b/osu.Game/Online/Rooms/PartRoomRequest.cs
similarity index 94%
rename from osu.Game/Online/Multiplayer/PartRoomRequest.cs
rename to osu.Game/Online/Rooms/PartRoomRequest.cs
index 54bb005d96..2f036abc8c 100644
--- a/osu.Game/Online/Multiplayer/PartRoomRequest.cs
+++ b/osu.Game/Online/Rooms/PartRoomRequest.cs
@@ -5,7 +5,7 @@ using System.Net.Http;
 using osu.Framework.IO.Network;
 using osu.Game.Online.API;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public class PartRoomRequest : APIRequest
     {
diff --git a/osu.Game/Online/Multiplayer/PlaylistExtensions.cs b/osu.Game/Online/Rooms/PlaylistExtensions.cs
similarity index 93%
rename from osu.Game/Online/Multiplayer/PlaylistExtensions.cs
rename to osu.Game/Online/Rooms/PlaylistExtensions.cs
index fe3d96e295..992011da3c 100644
--- a/osu.Game/Online/Multiplayer/PlaylistExtensions.cs
+++ b/osu.Game/Online/Rooms/PlaylistExtensions.cs
@@ -6,7 +6,7 @@ using Humanizer;
 using Humanizer.Localisation;
 using osu.Framework.Bindables;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public static class PlaylistExtensions
     {
diff --git a/osu.Game/Online/Multiplayer/PlaylistItem.cs b/osu.Game/Online/Rooms/PlaylistItem.cs
similarity index 98%
rename from osu.Game/Online/Multiplayer/PlaylistItem.cs
rename to osu.Game/Online/Rooms/PlaylistItem.cs
index 4c4c071fc9..ada2140ca6 100644
--- a/osu.Game/Online/Multiplayer/PlaylistItem.cs
+++ b/osu.Game/Online/Rooms/PlaylistItem.cs
@@ -10,7 +10,7 @@ using osu.Game.Online.API;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public class PlaylistItem : IEquatable<PlaylistItem>
     {
diff --git a/osu.Game/Online/Multiplayer/Room.cs b/osu.Game/Online/Rooms/Room.cs
similarity index 97%
rename from osu.Game/Online/Multiplayer/Room.cs
rename to osu.Game/Online/Rooms/Room.cs
index d13d7dc774..67f874cdc4 100644
--- a/osu.Game/Online/Multiplayer/Room.cs
+++ b/osu.Game/Online/Rooms/Room.cs
@@ -7,11 +7,11 @@ using Newtonsoft.Json;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.IO.Serialization.Converters;
-using osu.Game.Online.Multiplayer.GameTypes;
-using osu.Game.Online.Multiplayer.RoomStatuses;
+using osu.Game.Online.Rooms.GameTypes;
+using osu.Game.Online.Rooms.RoomStatuses;
 using osu.Game.Users;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public class Room
     {
diff --git a/osu.Game/Online/Multiplayer/RoomAvailability.cs b/osu.Game/Online/Rooms/RoomAvailability.cs
similarity index 90%
rename from osu.Game/Online/Multiplayer/RoomAvailability.cs
rename to osu.Game/Online/Rooms/RoomAvailability.cs
index 08fa853562..3aea0e5948 100644
--- a/osu.Game/Online/Multiplayer/RoomAvailability.cs
+++ b/osu.Game/Online/Rooms/RoomAvailability.cs
@@ -3,7 +3,7 @@
 
 using System.ComponentModel;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public enum RoomAvailability
     {
diff --git a/osu.Game/Online/Multiplayer/RoomCategory.cs b/osu.Game/Online/Rooms/RoomCategory.cs
similarity index 80%
rename from osu.Game/Online/Multiplayer/RoomCategory.cs
rename to osu.Game/Online/Rooms/RoomCategory.cs
index d6786a72fe..f485e65ba9 100644
--- a/osu.Game/Online/Multiplayer/RoomCategory.cs
+++ b/osu.Game/Online/Rooms/RoomCategory.cs
@@ -1,12 +1,12 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public enum RoomCategory
     {
         Normal,
         Spotlight,
-        Realtime,
+        Multiplayer,
     }
 }
diff --git a/osu.Game/Online/Multiplayer/RoomStatus.cs b/osu.Game/Online/Rooms/RoomStatus.cs
similarity index 93%
rename from osu.Game/Online/Multiplayer/RoomStatus.cs
rename to osu.Game/Online/Rooms/RoomStatus.cs
index 3ff2770ab4..87c5aa3fda 100644
--- a/osu.Game/Online/Multiplayer/RoomStatus.cs
+++ b/osu.Game/Online/Rooms/RoomStatus.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 osuTK.Graphics;
 using osu.Game.Graphics;
+using osuTK.Graphics;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public abstract class RoomStatus
     {
diff --git a/osu.Game/Online/Multiplayer/RoomStatuses/RoomStatusEnded.cs b/osu.Game/Online/Rooms/RoomStatuses/RoomStatusEnded.cs
similarity index 88%
rename from osu.Game/Online/Multiplayer/RoomStatuses/RoomStatusEnded.cs
rename to osu.Game/Online/Rooms/RoomStatuses/RoomStatusEnded.cs
index 4177d28a99..c852f86f6b 100644
--- a/osu.Game/Online/Multiplayer/RoomStatuses/RoomStatusEnded.cs
+++ b/osu.Game/Online/Rooms/RoomStatuses/RoomStatusEnded.cs
@@ -4,7 +4,7 @@
 using osu.Game.Graphics;
 using osuTK.Graphics;
 
-namespace osu.Game.Online.Multiplayer.RoomStatuses
+namespace osu.Game.Online.Rooms.RoomStatuses
 {
     public class RoomStatusEnded : RoomStatus
     {
diff --git a/osu.Game/Online/Multiplayer/RoomStatuses/RoomStatusOpen.cs b/osu.Game/Online/Rooms/RoomStatuses/RoomStatusOpen.cs
similarity index 89%
rename from osu.Game/Online/Multiplayer/RoomStatuses/RoomStatusOpen.cs
rename to osu.Game/Online/Rooms/RoomStatuses/RoomStatusOpen.cs
index 45a1cb1909..4f7f0d6f5d 100644
--- a/osu.Game/Online/Multiplayer/RoomStatuses/RoomStatusOpen.cs
+++ b/osu.Game/Online/Rooms/RoomStatuses/RoomStatusOpen.cs
@@ -4,7 +4,7 @@
 using osu.Game.Graphics;
 using osuTK.Graphics;
 
-namespace osu.Game.Online.Multiplayer.RoomStatuses
+namespace osu.Game.Online.Rooms.RoomStatuses
 {
     public class RoomStatusOpen : RoomStatus
     {
diff --git a/osu.Game/Online/Multiplayer/RoomStatuses/RoomStatusPlaying.cs b/osu.Game/Online/Rooms/RoomStatuses/RoomStatusPlaying.cs
similarity index 88%
rename from osu.Game/Online/Multiplayer/RoomStatuses/RoomStatusPlaying.cs
rename to osu.Game/Online/Rooms/RoomStatuses/RoomStatusPlaying.cs
index b2cb5c4510..f04f1b23af 100644
--- a/osu.Game/Online/Multiplayer/RoomStatuses/RoomStatusPlaying.cs
+++ b/osu.Game/Online/Rooms/RoomStatuses/RoomStatusPlaying.cs
@@ -4,7 +4,7 @@
 using osu.Game.Graphics;
 using osuTK.Graphics;
 
-namespace osu.Game.Online.Multiplayer.RoomStatuses
+namespace osu.Game.Online.Rooms.RoomStatuses
 {
     public class RoomStatusPlaying : RoomStatus
     {
diff --git a/osu.Game/Online/Multiplayer/ShowPlaylistUserScoreRequest.cs b/osu.Game/Online/Rooms/ShowPlaylistUserScoreRequest.cs
similarity index 95%
rename from osu.Game/Online/Multiplayer/ShowPlaylistUserScoreRequest.cs
rename to osu.Game/Online/Rooms/ShowPlaylistUserScoreRequest.cs
index 936b8bbe89..3f728a5417 100644
--- a/osu.Game/Online/Multiplayer/ShowPlaylistUserScoreRequest.cs
+++ b/osu.Game/Online/Rooms/ShowPlaylistUserScoreRequest.cs
@@ -3,7 +3,7 @@
 
 using osu.Game.Online.API;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public class ShowPlaylistUserScoreRequest : APIRequest<MultiplayerScore>
     {
diff --git a/osu.Game/Online/Multiplayer/SubmitRoomScoreRequest.cs b/osu.Game/Online/Rooms/SubmitRoomScoreRequest.cs
similarity index 97%
rename from osu.Game/Online/Multiplayer/SubmitRoomScoreRequest.cs
rename to osu.Game/Online/Rooms/SubmitRoomScoreRequest.cs
index d31aef2ea5..5a78b9fabd 100644
--- a/osu.Game/Online/Multiplayer/SubmitRoomScoreRequest.cs
+++ b/osu.Game/Online/Rooms/SubmitRoomScoreRequest.cs
@@ -7,7 +7,7 @@ using osu.Framework.IO.Network;
 using osu.Game.Online.API;
 using osu.Game.Scoring;
 
-namespace osu.Game.Online.Multiplayer
+namespace osu.Game.Online.Rooms
 {
     public class SubmitRoomScoreRequest : APIRequest<MultiplayerScore>
     {
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index bdc9e5eb7b..0b5abc4e31 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -31,7 +31,7 @@ using osu.Game.Input;
 using osu.Game.Input.Bindings;
 using osu.Game.IO;
 using osu.Game.Online;
-using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Spectator;
 using osu.Game.Overlays;
 using osu.Game.Resources;
@@ -219,7 +219,7 @@ namespace osu.Game
             dependencies.CacheAs(API ??= new APIAccess(LocalConfig, endpoints));
 
             dependencies.CacheAs(spectatorStreaming = new SpectatorStreamingClient(endpoints));
-            dependencies.CacheAs(multiplayerClient = new RealtimeMultiplayerClient(endpoints));
+            dependencies.CacheAs(multiplayerClient = new MultiplayerClient(endpoints));
 
             var defaultBeatmap = new DummyWorkingBeatmap(Audio, Textures);
 
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 5650b22f25..15ac2237d3 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -17,7 +17,7 @@ using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Edit;
-using osu.Game.Screens.Multi.RealtimeMultiplayer;
+using osu.Game.Screens.Multi.Multiplayer;
 using osu.Game.Screens.Multi.Playlists;
 using osu.Game.Screens.Select;
 
@@ -105,7 +105,7 @@ namespace osu.Game.Screens.Menu
                                 this.Push(new Editor());
                             },
                             OnSolo = onSolo,
-                            OnMultiplayer = () => this.Push(new RealtimeMultiplayer()),
+                            OnMultiplayer = () => this.Push(new Multiplayer()),
                             OnPlaylists = () => this.Push(new PlaylistsMultiplayer()),
                             OnExit = confirmAndExit,
                         }
diff --git a/osu.Game/Screens/Multi/Components/DrawableGameType.cs b/osu.Game/Screens/Multi/Components/DrawableGameType.cs
index 28240f0796..38af6d065e 100644
--- a/osu.Game/Screens/Multi/Components/DrawableGameType.cs
+++ b/osu.Game/Screens/Multi/Components/DrawableGameType.cs
@@ -8,7 +8,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.Multi.Components
 {
diff --git a/osu.Game/Screens/Multi/Components/ListingPollingComponent.cs b/osu.Game/Screens/Multi/Components/ListingPollingComponent.cs
index dff6c50bf2..edce5400d1 100644
--- a/osu.Game/Screens/Multi/Components/ListingPollingComponent.cs
+++ b/osu.Game/Screens/Multi/Components/ListingPollingComponent.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.Multi.Lounge.Components;
 
 namespace osu.Game.Screens.Multi.Components
diff --git a/osu.Game/Screens/Multi/Components/MatchBeatmapDetailArea.cs b/osu.Game/Screens/Multi/Components/MatchBeatmapDetailArea.cs
index 2c5fd2d397..6997840c92 100644
--- a/osu.Game/Screens/Multi/Components/MatchBeatmapDetailArea.cs
+++ b/osu.Game/Screens/Multi/Components/MatchBeatmapDetailArea.cs
@@ -8,7 +8,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.Select;
 using osuTK;
 
diff --git a/osu.Game/Screens/Multi/Components/OverlinedPlaylistHeader.cs b/osu.Game/Screens/Multi/Components/OverlinedPlaylistHeader.cs
index 5552c1cb72..ebebe8b660 100644
--- a/osu.Game/Screens/Multi/Components/OverlinedPlaylistHeader.cs
+++ b/osu.Game/Screens/Multi/Components/OverlinedPlaylistHeader.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.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.Multi.Components
 {
diff --git a/osu.Game/Screens/Multi/Components/ReadyButton.cs b/osu.Game/Screens/Multi/Components/ReadyButton.cs
index 0bb4ed8617..68df30965d 100644
--- a/osu.Game/Screens/Multi/Components/ReadyButton.cs
+++ b/osu.Game/Screens/Multi/Components/ReadyButton.cs
@@ -9,7 +9,7 @@ using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.Multi.Components
 {
diff --git a/osu.Game/Screens/Multi/Components/RoomManager.cs b/osu.Game/Screens/Multi/Components/RoomManager.cs
index f78d0d979e..7e0c8c4ec5 100644
--- a/osu.Game/Screens/Multi/Components/RoomManager.cs
+++ b/osu.Game/Screens/Multi/Components/RoomManager.cs
@@ -12,7 +12,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 
 namespace osu.Game.Screens.Multi.Components
diff --git a/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs b/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs
index fbaf9dd930..1d10277d1c 100644
--- a/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs
+++ b/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Game.Online;
 using osu.Game.Online.API;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.Multi.Components
 {
diff --git a/osu.Game/Screens/Multi/Components/RoomStatusInfo.cs b/osu.Game/Screens/Multi/Components/RoomStatusInfo.cs
index b5676692a4..89021691f3 100644
--- a/osu.Game/Screens/Multi/Components/RoomStatusInfo.cs
+++ b/osu.Game/Screens/Multi/Components/RoomStatusInfo.cs
@@ -8,8 +8,8 @@ using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
-using osu.Game.Online.Multiplayer;
-using osu.Game.Online.Multiplayer.RoomStatuses;
+using osu.Game.Online.Rooms;
+using osu.Game.Online.Rooms.RoomStatuses;
 
 namespace osu.Game.Screens.Multi.Components
 {
diff --git a/osu.Game/Screens/Multi/Components/SelectionPollingComponent.cs b/osu.Game/Screens/Multi/Components/SelectionPollingComponent.cs
index 37a190b5e0..3050765931 100644
--- a/osu.Game/Screens/Multi/Components/SelectionPollingComponent.cs
+++ b/osu.Game/Screens/Multi/Components/SelectionPollingComponent.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.Multi.Components
 {
diff --git a/osu.Game/Screens/Multi/Components/StatusColouredContainer.cs b/osu.Game/Screens/Multi/Components/StatusColouredContainer.cs
index a115f06e7b..68c14eeb15 100644
--- a/osu.Game/Screens/Multi/Components/StatusColouredContainer.cs
+++ b/osu.Game/Screens/Multi/Components/StatusColouredContainer.cs
@@ -6,7 +6,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.Multi.Components
 {
diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs b/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs
index 89c335183b..956d38a90e 100644
--- a/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs
+++ b/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs
@@ -7,7 +7,7 @@ using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.Containers;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osuTK;
 
 namespace osu.Game.Screens.Multi
diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
index bda00b65b5..a2aeae154a 100644
--- a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
@@ -21,7 +21,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online;
 using osu.Game.Online.Chat;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Overlays.BeatmapListing.Panels;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylistWithResults.cs b/osu.Game/Screens/Multi/DrawableRoomPlaylistWithResults.cs
index 439aaaa275..fa241a3c42 100644
--- a/osu.Game/Screens/Multi/DrawableRoomPlaylistWithResults.cs
+++ b/osu.Game/Screens/Multi/DrawableRoomPlaylistWithResults.cs
@@ -11,7 +11,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.Multi
 {
diff --git a/osu.Game/Screens/Multi/IRoomManager.cs b/osu.Game/Screens/Multi/IRoomManager.cs
index 630e3af91c..eee2a223a1 100644
--- a/osu.Game/Screens/Multi/IRoomManager.cs
+++ b/osu.Game/Screens/Multi/IRoomManager.cs
@@ -4,7 +4,7 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.Multi
 {
diff --git a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
index 56116b219a..6e4d8b46ed 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
@@ -17,12 +17,12 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Components;
 using osuTK;
 using osuTK.Graphics;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.UserInterface;
+using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.Multi.Lounge.Components
 {
@@ -42,7 +42,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
         private CachedModelDependencyContainer<Room> dependencies;
 
         [Resolved(canBeNull: true)]
-        private Multiplayer multiplayer { get; set; }
+        private MultiplayerScreen multiplayer { get; set; }
 
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
@@ -228,7 +228,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
 
         private class RoomName : OsuSpriteText
         {
-            [Resolved(typeof(Room), nameof(Online.Multiplayer.Room.Name))]
+            [Resolved(typeof(Room), nameof(Online.Rooms.Room.Name))]
             private Bindable<string> name { get; set; }
 
             [BackgroundDependencyLoader]
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
index c7c37cbc0d..fbd5f44a30 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
@@ -15,9 +15,9 @@ using osu.Framework.Threading;
 using osu.Game.Extensions;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
-using osu.Game.Online.Multiplayer;
 using osuTK;
 using osu.Game.Graphics.Cursor;
+using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.Multi.Lounge.Components
 {
diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
index 6b08745dd7..cbab79e2ab 100644
--- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
@@ -10,7 +10,7 @@ using osu.Framework.Input.Events;
 using osu.Framework.Screens;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
 using osu.Game.Screens.Multi.Lounge.Components;
 using osu.Game.Screens.Multi.Match;
diff --git a/osu.Game/Screens/Multi/Match/Components/Footer.cs b/osu.Game/Screens/Multi/Match/Components/Footer.cs
index fdf1d0dbeb..7074ceca38 100644
--- a/osu.Game/Screens/Multi/Match/Components/Footer.cs
+++ b/osu.Game/Screens/Multi/Match/Components/Footer.cs
@@ -9,7 +9,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.Multi.Playlists;
 using osuTK;
 
diff --git a/osu.Game/Screens/Multi/Match/Components/GameTypePicker.cs b/osu.Game/Screens/Multi/Match/Components/GameTypePicker.cs
index c7fc329a1a..23a3da6e38 100644
--- a/osu.Game/Screens/Multi/Match/Components/GameTypePicker.cs
+++ b/osu.Game/Screens/Multi/Match/Components/GameTypePicker.cs
@@ -8,8 +8,8 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
-using osu.Game.Online.Multiplayer;
-using osu.Game.Online.Multiplayer.GameTypes;
+using osu.Game.Online.Rooms;
+using osu.Game.Online.Rooms.GameTypes;
 using osu.Game.Screens.Multi.Components;
 using osuTK;
 
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchChatDisplay.cs b/osu.Game/Screens/Multi/Match/Components/MatchChatDisplay.cs
index f8b64a54ef..b790ad9be5 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchChatDisplay.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchChatDisplay.cs
@@ -4,7 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Online.Chat;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.Multi.Match.Components
 {
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
index f2409d64e7..8cc7b62f98 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
@@ -8,7 +8,7 @@ using osu.Framework.Bindables;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Leaderboards;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.Multi.Match.Components
 {
diff --git a/osu.Game/Screens/Multi/Match/Components/RoomAvailabilityPicker.cs b/osu.Game/Screens/Multi/Match/Components/RoomAvailabilityPicker.cs
index 7ef39c2a74..2292826d55 100644
--- a/osu.Game/Screens/Multi/Match/Components/RoomAvailabilityPicker.cs
+++ b/osu.Game/Screens/Multi/Match/Components/RoomAvailabilityPicker.cs
@@ -10,7 +10,7 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.Multi.Components;
 using osuTK;
 using osuTK.Graphics;
diff --git a/osu.Game/Screens/Multi/Match/RoomSubScreen.cs b/osu.Game/Screens/Multi/Match/RoomSubScreen.cs
index 0598524e81..b626156852 100644
--- a/osu.Game/Screens/Multi/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/RoomSubScreen.cs
@@ -10,7 +10,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Screens;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Play;
@@ -36,7 +36,7 @@ namespace osu.Game.Screens.Multi.Match
         private BeatmapManager beatmapManager { get; set; }
 
         [Resolved(canBeNull: true)]
-        protected Multiplayer Multiplayer { get; private set; }
+        protected MultiplayerScreen Multiplayer { get; private set; }
 
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
 
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/CreateRealtimeMatchButton.cs b/osu.Game/Screens/Multi/Multiplayer/CreateMultiplayerMatchButton.cs
similarity index 77%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/CreateRealtimeMatchButton.cs
rename to osu.Game/Screens/Multi/Multiplayer/CreateMultiplayerMatchButton.cs
index cdaeb6faec..b8b3f15fca 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/CreateRealtimeMatchButton.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/CreateMultiplayerMatchButton.cs
@@ -3,12 +3,12 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Match.Components;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+namespace osu.Game.Screens.Multi.Multiplayer
 {
-    public class CreateRealtimeMatchButton : PurpleTriangleButton
+    public class CreateMultiplayerMatchButton : PurpleTriangleButton
     {
         [BackgroundDependencyLoader]
         private void load(StatefulMultiplayerClient multiplayerClient)
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/BeatmapSelectionControl.cs b/osu.Game/Screens/Multi/Multiplayer/Match/BeatmapSelectionControl.cs
similarity index 91%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/Match/BeatmapSelectionControl.cs
rename to osu.Game/Screens/Multi/Multiplayer/Match/BeatmapSelectionControl.cs
index 1939744916..dfb6feeaf9 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/BeatmapSelectionControl.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/Match/BeatmapSelectionControl.cs
@@ -11,12 +11,12 @@ using osu.Framework.Screens;
 using osu.Game.Online.API;
 using osu.Game.Screens.Multi.Match.Components;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
+namespace osu.Game.Screens.Multi.Multiplayer.Match
 {
     public class BeatmapSelectionControl : MultiplayerComposite
     {
         [Resolved]
-        private RealtimeMatchSubScreen matchSubScreen { get; set; }
+        private MultiplayerMatchSubScreen matchSubScreen { get; set; }
 
         [Resolved]
         private IAPIProvider api { get; set; }
@@ -49,7 +49,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
                         RelativeSizeAxes = Axes.X,
                         Height = 40,
                         Text = "Select beatmap",
-                        Action = () => matchSubScreen.Push(new RealtimeMatchSongSelect()),
+                        Action = () => matchSubScreen.Push(new MultiplayerMatchSongSelect()),
                         Alpha = 0
                     }
                 }
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchFooter.cs b/osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerMatchFooter.cs
similarity index 84%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchFooter.cs
rename to osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerMatchFooter.cs
index 31871729f6..145ae18817 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchFooter.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerMatchFooter.cs
@@ -8,12 +8,12 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
+namespace osu.Game.Screens.Multi.Multiplayer.Match
 {
-    public class RealtimeMatchFooter : CompositeDrawable
+    public class MultiplayerMatchFooter : CompositeDrawable
     {
         public const float HEIGHT = 50;
 
@@ -21,7 +21,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
 
         private readonly Drawable background;
 
-        public RealtimeMatchFooter()
+        public MultiplayerMatchFooter()
         {
             RelativeSizeAxes = Axes.X;
             Height = HEIGHT;
@@ -29,7 +29,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
             InternalChildren = new[]
             {
                 background = new Box { RelativeSizeAxes = Axes.Both },
-                new RealtimeReadyButton
+                new MultiplayerReadyButton
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchHeader.cs b/osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerMatchHeader.cs
similarity index 95%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchHeader.cs
rename to osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerMatchHeader.cs
index a9a10d1510..0c0e580a3e 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchHeader.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerMatchHeader.cs
@@ -17,9 +17,9 @@ using FontWeight = osu.Game.Graphics.FontWeight;
 using OsuColour = osu.Game.Graphics.OsuColour;
 using OsuFont = osu.Game.Graphics.OsuFont;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
+namespace osu.Game.Screens.Multi.Multiplayer.Match
 {
-    public class RealtimeMatchHeader : MultiplayerComposite
+    public class MultiplayerMatchHeader : MultiplayerComposite
     {
         public const float HEIGHT = 50;
 
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        public RealtimeMatchHeader()
+        public MultiplayerMatchHeader()
         {
             RelativeSizeAxes = Axes.X;
             Height = HEIGHT;
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs b/osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
similarity index 99%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs
rename to osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
index a93b1b09d1..4a5b5fd181 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
@@ -15,15 +15,15 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Multi.Match.Components;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
+namespace osu.Game.Screens.Multi.Multiplayer.Match
 {
-    public class RealtimeMatchSettingsOverlay : MatchSettingsOverlay
+    public class MultiplayerMatchSettingsOverlay : MatchSettingsOverlay
     {
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs b/osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerReadyButton.cs
similarity index 95%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs
rename to osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerReadyButton.cs
index be405feef1..cea1eeecbb 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Match/RealtimeReadyButton.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -14,13 +14,13 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
 using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.Multi.Components;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
+namespace osu.Game.Screens.Multi.Multiplayer.Match
 {
-    public class RealtimeReadyButton : RealtimeRoomComposite
+    public class MultiplayerReadyButton : MultiplayerRoomComposite
     {
         public Bindable<PlaylistItem> SelectedItem => button.SelectedItem;
 
@@ -39,7 +39,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Match
 
         private int countReady;
 
-        public RealtimeReadyButton()
+        public MultiplayerReadyButton()
         {
             InternalChild = button = new ButtonWithTrianglesExposed
             {
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs b/osu.Game/Screens/Multi/Multiplayer/Multiplayer.cs
similarity index 86%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
rename to osu.Game/Screens/Multi/Multiplayer/Multiplayer.cs
index 87c838f29f..97fa4cfa6e 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMultiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/Multiplayer.cs
@@ -7,13 +7,13 @@ using osu.Framework.Screens;
 using osu.Game.Extensions;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.Multi.Components;
 using osu.Game.Screens.Multi.Lounge;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+namespace osu.Game.Screens.Multi.Multiplayer
 {
-    public class RealtimeMultiplayer : Multiplayer
+    public class Multiplayer : MultiplayerScreen
     {
         [Resolved]
         private StatefulMultiplayerClient client { get; set; }
@@ -28,7 +28,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
         protected override void UpdatePollingRate(bool isIdle)
         {
-            var playlistsManager = (RealtimeRoomManager)RoomManager;
+            var playlistsManager = (MultiplayerRoomManager)RoomManager;
 
             if (!this.IsCurrentScreen())
             {
@@ -58,16 +58,16 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         protected override Room CreateNewRoom()
         {
             var room = new Room { Name = { Value = $"{API.LocalUser}'s awesome room" } };
-            room.Category.Value = RoomCategory.Realtime;
+            room.Category.Value = RoomCategory.Multiplayer;
             return room;
         }
 
         protected override string ScreenTitle => "Multiplayer";
 
-        protected override RoomManager CreateRoomManager() => new RealtimeRoomManager();
+        protected override RoomManager CreateRoomManager() => new MultiplayerRoomManager();
 
-        protected override LoungeSubScreen CreateLounge() => new RealtimeLoungeSubScreen();
+        protected override LoungeSubScreen CreateLounge() => new MultiplayerLoungeSubScreen();
 
-        protected override OsuButton CreateNewMultiplayerGameButton() => new CreateRealtimeMatchButton();
+        protected override OsuButton CreateNewMultiplayerGameButton() => new CreateMultiplayerMatchButton();
     }
 }
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeFilterControl.cs b/osu.Game/Screens/Multi/Multiplayer/MultiplayerFilterControl.cs
similarity index 79%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeFilterControl.cs
rename to osu.Game/Screens/Multi/Multiplayer/MultiplayerFilterControl.cs
index acd9a057e3..bebad1944e 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeFilterControl.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/MultiplayerFilterControl.cs
@@ -3,9 +3,9 @@
 
 using osu.Game.Screens.Multi.Lounge.Components;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+namespace osu.Game.Screens.Multi.Multiplayer
 {
-    public class RealtimeFilterControl : FilterControl
+    public class MultiplayerFilterControl : FilterControl
     {
         protected override FilterCriteria CreateCriteria()
         {
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.cs b/osu.Game/Screens/Multi/Multiplayer/MultiplayerLoungeSubScreen.cs
similarity index 79%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.cs
rename to osu.Game/Screens/Multi/Multiplayer/MultiplayerLoungeSubScreen.cs
index b53ec94519..ffc81efe3c 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeLoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/MultiplayerLoungeSubScreen.cs
@@ -4,18 +4,18 @@
 using osu.Framework.Allocation;
 using osu.Framework.Logging;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Lounge.Components;
 using osu.Game.Screens.Multi.Match;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+namespace osu.Game.Screens.Multi.Multiplayer
 {
-    public class RealtimeLoungeSubScreen : LoungeSubScreen
+    public class MultiplayerLoungeSubScreen : LoungeSubScreen
     {
-        protected override FilterControl CreateFilterControl() => new RealtimeFilterControl();
+        protected override FilterControl CreateFilterControl() => new MultiplayerFilterControl();
 
-        protected override RoomSubScreen CreateRoomSubScreen(Room room) => new RealtimeMatchSubScreen(room);
+        protected override RoomSubScreen CreateRoomSubScreen(Room room) => new MultiplayerMatchSubScreen(room);
 
         [Resolved]
         private StatefulMultiplayerClient client { get; set; }
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs b/osu.Game/Screens/Multi/Multiplayer/MultiplayerMatchSongSelect.cs
similarity index 92%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
rename to osu.Game/Screens/Multi/Multiplayer/MultiplayerMatchSongSelect.cs
index 8f317800e3..ed1321d4e2 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSongSelect.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -10,12 +10,12 @@ using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.Select;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+namespace osu.Game.Screens.Multi.Multiplayer
 {
-    public class RealtimeMatchSongSelect : SongSelect, IMultiplayerSubScreen
+    public class MultiplayerMatchSongSelect : SongSelect, IMultiplayerSubScreen
     {
         public string ShortTitle => "song selection";
 
@@ -29,7 +29,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
         private LoadingLayer loadingLayer;
 
-        public RealtimeMatchSongSelect()
+        public MultiplayerMatchSongSelect()
         {
             Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING };
         }
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs b/osu.Game/Screens/Multi/Multiplayer/MultiplayerMatchSubScreen.cs
similarity index 92%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
rename to osu.Game/Screens/Multi/Multiplayer/MultiplayerMatchSubScreen.cs
index 1778bc272c..4e371d4ed4 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeMatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -10,19 +10,19 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.Multi.Components;
 using osu.Game.Screens.Multi.Match;
 using osu.Game.Screens.Multi.Match.Components;
-using osu.Game.Screens.Multi.RealtimeMultiplayer.Match;
-using osu.Game.Screens.Multi.RealtimeMultiplayer.Participants;
+using osu.Game.Screens.Multi.Multiplayer.Match;
+using osu.Game.Screens.Multi.Multiplayer.Participants;
 using osu.Game.Users;
-using ParticipantsList = osu.Game.Screens.Multi.RealtimeMultiplayer.Participants.ParticipantsList;
+using ParticipantsList = osu.Game.Screens.Multi.Multiplayer.Participants.ParticipantsList;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+namespace osu.Game.Screens.Multi.Multiplayer
 {
     [Cached]
-    public class RealtimeMatchSubScreen : RoomSubScreen
+    public class MultiplayerMatchSubScreen : RoomSubScreen
     {
         public override string Title { get; }
 
@@ -31,11 +31,11 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         [Resolved]
         private StatefulMultiplayerClient client { get; set; }
 
-        private RealtimeMatchSettingsOverlay settingsOverlay;
+        private MultiplayerMatchSettingsOverlay settingsOverlay;
 
         private IBindable<bool> isConnected;
 
-        public RealtimeMatchSubScreen(Room room)
+        public MultiplayerMatchSubScreen(Room room)
         {
             Title = room.RoomID.Value == null ? "New room" : room.Name.Value;
             Activity.Value = new UserActivity.InLobby(room);
@@ -73,7 +73,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
                                     {
                                         new Drawable[]
                                         {
-                                            new RealtimeMatchHeader
+                                            new MultiplayerMatchHeader
                                             {
                                                 OpenSettings = () => settingsOverlay.Show()
                                             }
@@ -150,7 +150,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
                         },
                         new Drawable[]
                         {
-                            new RealtimeMatchFooter { SelectedItem = { BindTarget = SelectedItem } }
+                            new MultiplayerMatchFooter { SelectedItem = { BindTarget = SelectedItem } }
                         }
                     },
                     RowDimensions = new[]
@@ -159,7 +159,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
                         new Dimension(GridSizeMode.AutoSize),
                     }
                 },
-                settingsOverlay = new RealtimeMatchSettingsOverlay
+                settingsOverlay = new MultiplayerMatchSettingsOverlay
                 {
                     RelativeSizeAxes = Axes.Both,
                     State = { Value = client.Room == null ? Visibility.Visible : Visibility.Hidden }
@@ -202,7 +202,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
             int[] userIds = client.Room.Users.Where(u => u.State >= MultiplayerUserState.WaitingForLoad).Select(u => u.UserID).ToArray();
 
-            StartPlay(() => new RealtimePlayer(SelectedItem.Value, userIds));
+            StartPlay(() => new MultiplayerPlayer(SelectedItem.Value, userIds));
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs b/osu.Game/Screens/Multi/Multiplayer/MultiplayerPlayer.cs
similarity index 93%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
rename to osu.Game/Screens/Multi/Multiplayer/MultiplayerPlayer.cs
index 033e4756eb..3255bcc642 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimePlayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/MultiplayerPlayer.cs
@@ -9,7 +9,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Logging;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Scoring;
 using osu.Game.Screens.Multi.Play;
 using osu.Game.Screens.Play;
@@ -17,10 +17,10 @@ using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Ranking;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+namespace osu.Game.Screens.Multi.Multiplayer
 {
     // Todo: The "room" part of PlaylistsPlayer should be split out into an abstract player class to be inherited instead.
-    public class RealtimePlayer : PlaylistsPlayer
+    public class MultiplayerPlayer : PlaylistsPlayer
     {
         protected override bool PauseOnFocusLost => false;
 
@@ -45,7 +45,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         /// </summary>
         /// <param name="playlistItem">The playlist item to be played.</param>
         /// <param name="userIds">The users which are participating in this game.</param>
-        public RealtimePlayer(PlaylistItem playlistItem, int[] userIds)
+        public MultiplayerPlayer(PlaylistItem playlistItem, int[] userIds)
             : base(playlistItem, new PlayerConfiguration
             {
                 AllowPause = false,
@@ -81,7 +81,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             {
                 if (!connected.NewValue)
                 {
-                    // messaging to the user about this disconnect will be provided by the RealtimeMatchSubScreen.
+                    // messaging to the user about this disconnect will be provided by the MultiplayerMatchSubScreen.
                     failAndBail();
                 }
             }, true);
@@ -142,7 +142,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
         protected override ResultsScreen CreateResults(ScoreInfo score)
         {
             Debug.Assert(RoomId.Value != null);
-            return new RealtimeResultsScreen(score, RoomId.Value.Value, PlaylistItem);
+            return new MultiplayerResultsScreen(score, RoomId.Value.Value, PlaylistItem);
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeResultsScreen.cs b/osu.Game/Screens/Multi/Multiplayer/MultiplayerResultsScreen.cs
similarity index 55%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeResultsScreen.cs
rename to osu.Game/Screens/Multi/Multiplayer/MultiplayerResultsScreen.cs
index 6bec06cbba..a01930c5ef 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeResultsScreen.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/MultiplayerResultsScreen.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.
 
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Scoring;
 using osu.Game.Screens.Multi.Ranking;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+namespace osu.Game.Screens.Multi.Multiplayer
 {
-    public class RealtimeResultsScreen : PlaylistsResultsScreen
+    public class MultiplayerResultsScreen : PlaylistsResultsScreen
     {
-        public RealtimeResultsScreen(ScoreInfo score, int roomId, PlaylistItem playlistItem)
+        public MultiplayerResultsScreen(ScoreInfo score, int roomId, PlaylistItem playlistItem)
             : base(score, roomId, playlistItem, false, false)
         {
         }
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomComposite.cs b/osu.Game/Screens/Multi/Multiplayer/MultiplayerRoomComposite.cs
similarity index 83%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomComposite.cs
rename to osu.Game/Screens/Multi/Multiplayer/MultiplayerRoomComposite.cs
index e6d1274316..6fe7c10bfb 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomComposite.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/MultiplayerRoomComposite.cs
@@ -3,11 +3,11 @@
 
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
-using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Online.Multiplayer;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+namespace osu.Game.Screens.Multi.Multiplayer
 {
-    public abstract class RealtimeRoomComposite : MultiplayerComposite
+    public abstract class MultiplayerRoomComposite : MultiplayerComposite
     {
         [CanBeNull]
         protected MultiplayerRoom Room => Client.Room;
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs b/osu.Game/Screens/Multi/Multiplayer/MultiplayerRoomManager.cs
similarity index 92%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
rename to osu.Game/Screens/Multi/Multiplayer/MultiplayerRoomManager.cs
index eb6e5fad07..fdd46cdc2a 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/RealtimeRoomManager.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/MultiplayerRoomManager.cs
@@ -11,13 +11,13 @@ using osu.Framework.Extensions.ExceptionExtensions;
 using osu.Framework.Logging;
 using osu.Game.Extensions;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Online.Multiplayer.RoomStatuses;
-using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Online.Rooms;
+using osu.Game.Online.Rooms.RoomStatuses;
 using osu.Game.Screens.Multi.Components;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer
+namespace osu.Game.Screens.Multi.Multiplayer
 {
-    public class RealtimeRoomManager : RoomManager
+    public class MultiplayerRoomManager : RoomManager
     {
         [Resolved]
         private StatefulMultiplayerClient multiplayerClient { get; set; }
@@ -114,19 +114,19 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
 
         protected override IEnumerable<RoomPollingComponent> CreatePollingComponents() => new RoomPollingComponent[]
         {
-            listingPollingComponent = new RealtimeListingPollingComponent
+            listingPollingComponent = new MultiplayerListingPollingComponent
             {
                 TimeBetweenPolls = { BindTarget = TimeBetweenListingPolls },
                 AllowPolling = { BindTarget = allowPolling }
             },
-            new RealtimeSelectionPollingComponent
+            new MultiplayerSelectionPollingComponent
             {
                 TimeBetweenPolls = { BindTarget = TimeBetweenSelectionPolls },
                 AllowPolling = { BindTarget = allowPolling }
             }
         };
 
-        private class RealtimeListingPollingComponent : ListingPollingComponent
+        private class MultiplayerListingPollingComponent : ListingPollingComponent
         {
             public readonly IBindable<bool> AllowPolling = new Bindable<bool>();
 
@@ -147,7 +147,7 @@ namespace osu.Game.Screens.Multi.RealtimeMultiplayer
             protected override Task Poll() => !AllowPolling.Value ? Task.CompletedTask : base.Poll();
         }
 
-        private class RealtimeSelectionPollingComponent : SelectionPollingComponent
+        private class MultiplayerSelectionPollingComponent : SelectionPollingComponent
         {
             public readonly IBindable<bool> AllowPolling = new Bindable<bool>();
 
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/Multi/Multiplayer/Participants/ParticipantPanel.cs
similarity index 97%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs
rename to osu.Game/Screens/Multi/Multiplayer/Participants/ParticipantPanel.cs
index 85393d1bae..93f8a9de8b 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/Participants/ParticipantPanel.cs
@@ -16,15 +16,15 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
-using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Users;
 using osu.Game.Users.Drawables;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Participants
+namespace osu.Game.Screens.Multi.Multiplayer.Participants
 {
-    public class ParticipantPanel : RealtimeRoomComposite, IHasContextMenu
+    public class ParticipantPanel : MultiplayerRoomComposite, IHasContextMenu
     {
         public readonly MultiplayerRoomUser User;
 
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantsList.cs b/osu.Game/Screens/Multi/Multiplayer/Participants/ParticipantsList.cs
similarity index 93%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantsList.cs
rename to osu.Game/Screens/Multi/Multiplayer/Participants/ParticipantsList.cs
index 218c2cabb7..3f37274d4c 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantsList.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/Participants/ParticipantsList.cs
@@ -9,9 +9,9 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Participants
+namespace osu.Game.Screens.Multi.Multiplayer.Participants
 {
-    public class ParticipantsList : RealtimeRoomComposite
+    public class ParticipantsList : MultiplayerRoomComposite
     {
         private FillFlowContainer<ParticipantPanel> panels;
 
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantsListHeader.cs b/osu.Game/Screens/Multi/Multiplayer/Participants/ParticipantsListHeader.cs
similarity index 86%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantsListHeader.cs
rename to osu.Game/Screens/Multi/Multiplayer/Participants/ParticipantsListHeader.cs
index 0ca7d34005..dc3ceedfd7 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/ParticipantsListHeader.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/Participants/ParticipantsListHeader.cs
@@ -2,10 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Components;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Participants
+namespace osu.Game.Screens.Multi.Multiplayer.Participants
 {
     public class ParticipantsListHeader : OverlinedHeader
     {
diff --git a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/StateDisplay.cs b/osu.Game/Screens/Multi/Multiplayer/Participants/StateDisplay.cs
similarity index 97%
rename from osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/StateDisplay.cs
rename to osu.Game/Screens/Multi/Multiplayer/Participants/StateDisplay.cs
index 844f239363..61faa0d85d 100644
--- a/osu.Game/Screens/Multi/RealtimeMultiplayer/Participants/StateDisplay.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/Participants/StateDisplay.cs
@@ -8,10 +8,10 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Online.Multiplayer;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.RealtimeMultiplayer.Participants
+namespace osu.Game.Screens.Multi.Multiplayer.Participants
 {
     public class StateDisplay : CompositeDrawable
     {
diff --git a/osu.Game/Screens/Multi/MultiplayerComposite.cs b/osu.Game/Screens/Multi/MultiplayerComposite.cs
index 6e0c69d712..fe4ca759b0 100644
--- a/osu.Game/Screens/Multi/MultiplayerComposite.cs
+++ b/osu.Game/Screens/Multi/MultiplayerComposite.cs
@@ -5,7 +5,7 @@ using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Users;
 
 namespace osu.Game.Screens.Multi
diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/MultiplayerScreen.cs
similarity index 99%
rename from osu.Game/Screens/Multi/Multiplayer.cs
rename to osu.Game/Screens/Multi/MultiplayerScreen.cs
index 34b7139f2d..983c7aeac9 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/MultiplayerScreen.cs
@@ -14,7 +14,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input;
 using osu.Game.Online.API;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.Multi.Components;
@@ -27,7 +27,7 @@ using osuTK;
 namespace osu.Game.Screens.Multi
 {
     [Cached]
-    public abstract class Multiplayer : OsuScreen
+    public abstract class MultiplayerScreen : OsuScreen
     {
         public override bool CursorVisible => (screenStack.CurrentScreen as IMultiplayerSubScreen)?.CursorVisible ?? true;
 
@@ -67,7 +67,7 @@ namespace osu.Game.Screens.Multi
         private readonly Drawable header;
         private readonly Drawable headerBackground;
 
-        protected Multiplayer()
+        protected MultiplayerScreen()
         {
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
diff --git a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
index 65b0091505..f05f732494 100644
--- a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
+++ b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
@@ -11,7 +11,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Online.API;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osu.Game.Scoring;
 using osu.Game.Screens.Multi.Ranking;
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsLoungeSubScreen.cs b/osu.Game/Screens/Multi/Playlists/PlaylistsLoungeSubScreen.cs
index b40c543b68..513854515b 100644
--- a/osu.Game/Screens/Multi/Playlists/PlaylistsLoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Playlists/PlaylistsLoungeSubScreen.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.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Lounge.Components;
 using osu.Game.Screens.Multi.Match;
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsMatchSettingsOverlay.cs b/osu.Game/Screens/Multi/Playlists/PlaylistsMatchSettingsOverlay.cs
index af29e8d34d..f3109a33e4 100644
--- a/osu.Game/Screens/Multi/Playlists/PlaylistsMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/Playlists/PlaylistsMatchSettingsOverlay.cs
@@ -14,7 +14,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
 using osu.Game.Screens.Multi.Match.Components;
 using osuTK;
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsMultiplayer.cs b/osu.Game/Screens/Multi/Playlists/PlaylistsMultiplayer.cs
index fce24da966..92b0160247 100644
--- a/osu.Game/Screens/Multi/Playlists/PlaylistsMultiplayer.cs
+++ b/osu.Game/Screens/Multi/Playlists/PlaylistsMultiplayer.cs
@@ -4,14 +4,14 @@
 using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.Multi.Components;
 using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Match;
 
 namespace osu.Game.Screens.Multi.Playlists
 {
-    public class PlaylistsMultiplayer : Multiplayer
+    public class PlaylistsMultiplayer : MultiplayerScreen
     {
         protected override void UpdatePollingRate(bool isIdle)
         {
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsReadyButton.cs b/osu.Game/Screens/Multi/Playlists/PlaylistsReadyButton.cs
index f5adf899e3..3c35e2a6f3 100644
--- a/osu.Game/Screens/Multi/Playlists/PlaylistsReadyButton.cs
+++ b/osu.Game/Screens/Multi/Playlists/PlaylistsReadyButton.cs
@@ -5,7 +5,7 @@ using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Graphics;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.Multi.Components;
 
 namespace osu.Game.Screens.Multi.Playlists
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs
index b2bcba1724..67242003e6 100644
--- a/osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs
@@ -9,7 +9,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
 using osu.Game.Online.API;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.Multi.Components;
 using osu.Game.Screens.Multi.Match;
 using osu.Game.Screens.Multi.Match.Components;
@@ -31,7 +31,7 @@ namespace osu.Game.Screens.Multi.Playlists
         private Bindable<int?> roomId { get; set; }
 
         [Resolved(canBeNull: true)]
-        private Multiplayer multiplayer { get; set; }
+        private MultiplayerScreen multiplayer { get; set; }
 
         private MatchSettingsOverlay settingsOverlay;
         private MatchLeaderboard leaderboard;
diff --git a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
index c757433e2f..7b1ab2c5b7 100644
--- a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
+++ b/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
@@ -11,7 +11,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Scoring;
 using osu.Game.Screens.Ranking;
 
diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index 8692833a21..80fd5c2067 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -9,7 +9,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.Multi;
 using osu.Game.Screens.Multi.Components;
 
diff --git a/osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
similarity index 67%
rename from osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs
rename to osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
index 30bd3ebc32..0e23f4d8c6 100644
--- a/osu.Game/Tests/Visual/RealtimeMultiplayer/RealtimeMultiplayerTestScene.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
@@ -6,32 +6,32 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi;
 using osu.Game.Screens.Multi.Lounge.Components;
 
-namespace osu.Game.Tests.Visual.RealtimeMultiplayer
+namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public abstract class RealtimeMultiplayerTestScene : MultiplayerTestScene
+    public abstract class MultiplayerTestScene : RoomTestScene
     {
         [Cached(typeof(StatefulMultiplayerClient))]
-        public TestRealtimeMultiplayerClient Client { get; }
+        public TestMultiplayerClient Client { get; }
 
         [Cached(typeof(IRoomManager))]
-        public TestRealtimeRoomManager RoomManager { get; }
+        public TestMultiplayerRoomManager RoomManager { get; }
 
         [Cached]
         public Bindable<FilterCriteria> Filter { get; }
 
         protected override Container<Drawable> Content => content;
-        private readonly TestRealtimeRoomContainer content;
+        private readonly TestMultiplayerRoomContainer content;
 
         private readonly bool joinRoom;
 
-        protected RealtimeMultiplayerTestScene(bool joinRoom = true)
+        protected MultiplayerTestScene(bool joinRoom = true)
         {
             this.joinRoom = joinRoom;
-            base.Content.Add(content = new TestRealtimeRoomContainer { RelativeSizeAxes = Axes.Both });
+            base.Content.Add(content = new TestMultiplayerRoomContainer { RelativeSizeAxes = Axes.Both });
 
             Client = content.Client;
             RoomManager = content.RoomManager;
diff --git a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
similarity index 95%
rename from osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs
rename to osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index 52047016e2..9a839c8d22 100644
--- a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -9,12 +9,12 @@ using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Online.API;
-using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Users;
 
-namespace osu.Game.Tests.Visual.RealtimeMultiplayer
+namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestRealtimeMultiplayerClient : StatefulMultiplayerClient
+    public class TestMultiplayerClient : StatefulMultiplayerClient
     {
         public override IBindable<bool> IsConnected => isConnected;
         private readonly Bindable<bool> isConnected = new Bindable<bool>(true);
diff --git a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomContainer.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs
similarity index 67%
rename from osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomContainer.cs
rename to osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs
index 3565d6ac5d..0df397d98e 100644
--- a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomContainer.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs
@@ -5,34 +5,34 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Online.RealtimeMultiplayer;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi;
 using osu.Game.Screens.Multi.Lounge.Components;
 
-namespace osu.Game.Tests.Visual.RealtimeMultiplayer
+namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestRealtimeRoomContainer : Container
+    public class TestMultiplayerRoomContainer : Container
     {
         protected override Container<Drawable> Content => content;
         private readonly Container content;
 
         [Cached(typeof(StatefulMultiplayerClient))]
-        public readonly TestRealtimeMultiplayerClient Client;
+        public readonly TestMultiplayerClient Client;
 
         [Cached(typeof(IRoomManager))]
-        public readonly TestRealtimeRoomManager RoomManager;
+        public readonly TestMultiplayerRoomManager RoomManager;
 
         [Cached]
         public readonly Bindable<FilterCriteria> Filter = new Bindable<FilterCriteria>(new FilterCriteria());
 
-        public TestRealtimeRoomContainer()
+        public TestMultiplayerRoomContainer()
         {
             RelativeSizeAxes = Axes.Both;
 
             AddRangeInternal(new Drawable[]
             {
-                Client = new TestRealtimeMultiplayerClient(),
-                RoomManager = new TestRealtimeRoomManager(),
+                Client = new TestMultiplayerClient(),
+                RoomManager = new TestMultiplayerRoomManager(),
                 content = new Container { RelativeSizeAxes = Axes.Both }
             });
         }
diff --git a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomManager.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs
similarity index 95%
rename from osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomManager.cs
rename to osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs
index 0d1314fb51..abfefd363a 100644
--- a/osu.Game/Tests/Visual/RealtimeMultiplayer/TestRealtimeRoomManager.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs
@@ -8,15 +8,15 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Multi.Lounge.Components;
-using osu.Game.Screens.Multi.RealtimeMultiplayer;
+using osu.Game.Screens.Multi.Multiplayer;
 
-namespace osu.Game.Tests.Visual.RealtimeMultiplayer
+namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestRealtimeRoomManager : RealtimeRoomManager
+    public class TestMultiplayerRoomManager : MultiplayerRoomManager
     {
         [Resolved]
         private IAPIProvider api { get; set; }
diff --git a/osu.Game/Tests/Visual/MultiplayerTestScene.cs b/osu.Game/Tests/Visual/RoomTestScene.cs
similarity index 90%
rename from osu.Game/Tests/Visual/MultiplayerTestScene.cs
rename to osu.Game/Tests/Visual/RoomTestScene.cs
index 6f24e00a92..aaf5c7624f 100644
--- a/osu.Game/Tests/Visual/MultiplayerTestScene.cs
+++ b/osu.Game/Tests/Visual/RoomTestScene.cs
@@ -4,11 +4,11 @@
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 
 namespace osu.Game.Tests.Visual
 {
-    public abstract class MultiplayerTestScene : ScreenTestScene
+    public abstract class RoomTestScene : ScreenTestScene
     {
         [Cached]
         private readonly Bindable<Room> currentRoom = new Bindable<Room>();
diff --git a/osu.Game/Users/UserActivity.cs b/osu.Game/Users/UserActivity.cs
index 0b4fa94942..f633773d11 100644
--- a/osu.Game/Users/UserActivity.cs
+++ b/osu.Game/Users/UserActivity.cs
@@ -3,7 +3,7 @@
 
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
-using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osuTK.Graphics;
 

From e49dce2c866f804b2e1a93fa49b025c112fc8f06 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Dec 2020 15:34:13 +0900
Subject: [PATCH 0576/3722] Fix some missed renames

---
 .../GameTypes/{GameTypeTimeshift.cs => GameTypePlaylists.cs}      | 0
 .../{TimeshiftFilterControl.cs => PlaylistsFilterControl.cs}      | 0
 .../Screens/Multi/Play/{TimeshiftPlayer.cs => PlaylistsPlayer.cs} | 0
 .../{TimeshiftResultsScreen.cs => PlaylistsResultsScreen.cs}      | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename osu.Game/Online/Rooms/GameTypes/{GameTypeTimeshift.cs => GameTypePlaylists.cs} (100%)
 rename osu.Game/Screens/Multi/Lounge/Components/{TimeshiftFilterControl.cs => PlaylistsFilterControl.cs} (100%)
 rename osu.Game/Screens/Multi/Play/{TimeshiftPlayer.cs => PlaylistsPlayer.cs} (100%)
 rename osu.Game/Screens/Multi/Ranking/{TimeshiftResultsScreen.cs => PlaylistsResultsScreen.cs} (100%)

diff --git a/osu.Game/Online/Rooms/GameTypes/GameTypeTimeshift.cs b/osu.Game/Online/Rooms/GameTypes/GameTypePlaylists.cs
similarity index 100%
rename from osu.Game/Online/Rooms/GameTypes/GameTypeTimeshift.cs
rename to osu.Game/Online/Rooms/GameTypes/GameTypePlaylists.cs
diff --git a/osu.Game/Screens/Multi/Lounge/Components/TimeshiftFilterControl.cs b/osu.Game/Screens/Multi/Lounge/Components/PlaylistsFilterControl.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Lounge/Components/TimeshiftFilterControl.cs
rename to osu.Game/Screens/Multi/Lounge/Components/PlaylistsFilterControl.cs
diff --git a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs b/osu.Game/Screens/Multi/Play/PlaylistsPlayer.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
rename to osu.Game/Screens/Multi/Play/PlaylistsPlayer.cs
diff --git a/osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs b/osu.Game/Screens/Multi/Ranking/PlaylistsResultsScreen.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Ranking/TimeshiftResultsScreen.cs
rename to osu.Game/Screens/Multi/Ranking/PlaylistsResultsScreen.cs

From 13c38c9b5556d988ab343beb70fbe2659a5237db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 14:18:21 +0100
Subject: [PATCH 0577/3722] Fix tests failing due to wrong inheritance

---
 osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs  | 2 +-
 .../Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs
index a72f71d79c..71b8ad05ee 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs
@@ -13,7 +13,7 @@ using osuTK;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneMatchLeaderboard : MultiplayerTestScene
+    public class TestSceneMatchLeaderboard : RoomTestScene
     {
         protected override bool UseOnlineAPI => true;
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
index 292c4846ab..7a3845cbf3 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
@@ -9,7 +9,7 @@ using osu.Game.Online.Rooms;
 namespace osu.Game.Tests.Visual.Multiplayer
 {
     [HeadlessTest]
-    public class TestSceneMultiplayerRoomManager : MultiplayerTestScene
+    public class TestSceneMultiplayerRoomManager : RoomTestScene
     {
         private TestMultiplayerRoomContainer roomContainer;
         private TestMultiplayerRoomManager roomManager => roomContainer.RoomManager;

From da8365f9d0047301b63a10103f0e7630fc8b3a07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 14:34:47 +0100
Subject: [PATCH 0578/3722] Fix other missed cases of changing inheritance

---
 osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs    | 2 +-
 .../Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs       | 2 +-
 osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs       | 2 +-
 osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
index 1359274512..f58e1114b8 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
@@ -10,7 +10,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneLoungeRoomInfo : MultiplayerTestScene
+    public class TestSceneLoungeRoomInfo : RoomTestScene
     {
         [SetUp]
         public new void Setup() => Schedule(() =>
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
index f4e0cc415c..571330f50e 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
@@ -15,7 +15,7 @@ using osuTK;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneMatchBeatmapDetailArea : MultiplayerTestScene
+    public class TestSceneMatchBeatmapDetailArea : RoomTestScene
     {
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
index e162009771..61968dce46 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
@@ -11,7 +11,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneMatchHeader : MultiplayerTestScene
+    public class TestSceneMatchHeader : RoomTestScene
     {
         public TestSceneMatchHeader()
         {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
index 4742fd0d84..157597e800 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
@@ -23,7 +23,7 @@ using osu.Game.Screens.Select;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneMatchSongSelect : MultiplayerTestScene
+    public class TestSceneMatchSongSelect : RoomTestScene
     {
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }

From 3a6a3a067b4816b81bf1851b75640a8e73349221 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 14:54:21 +0100
Subject: [PATCH 0579/3722] Rewrite test to cover failure case

---
 .../Online/TestSceneAccountCreationOverlay.cs | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs
index dcfe0432a8..3d65e7e4ba 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.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 NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -13,13 +14,12 @@ namespace osu.Game.Tests.Visual.Online
     public class TestSceneAccountCreationOverlay : OsuTestScene
     {
         private readonly Container userPanelArea;
+        private readonly AccountCreationOverlay accountCreation;
 
         private IBindable<User> localUser;
 
         public TestSceneAccountCreationOverlay()
         {
-            AccountCreationOverlay accountCreation;
-
             Children = new Drawable[]
             {
                 accountCreation = new AccountCreationOverlay(),
@@ -31,8 +31,6 @@ namespace osu.Game.Tests.Visual.Online
                     Origin = Anchor.TopRight,
                 },
             };
-
-            AddStep("show", () => accountCreation.Show());
         }
 
         [BackgroundDependencyLoader]
@@ -42,8 +40,19 @@ namespace osu.Game.Tests.Visual.Online
 
             localUser = API.LocalUser.GetBoundCopy();
             localUser.BindValueChanged(user => { userPanelArea.Child = new UserGridPanel(user.NewValue) { Width = 200 }; }, true);
+        }
 
-            AddStep("logout", API.Logout);
+        [Test]
+        public void TestOverlayVisibility()
+        {
+            AddStep("start hidden", () => accountCreation.Hide());
+            AddStep("log out", API.Logout);
+
+            AddStep("show manually", () => accountCreation.Show());
+            AddUntilStep("overlay is visible", () => accountCreation.State.Value == Visibility.Visible);
+
+            AddStep("log back in", () => API.Login("dummy", "password"));
+            AddUntilStep("overlay is hidden", () => accountCreation.State.Value == Visibility.Hidden);
         }
     }
 }

From 2d7f9bf29045e9096ad8cb9dc672a05ad6ab7c97 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Dec 2020 23:34:29 +0900
Subject: [PATCH 0580/3722] Revert RoomCategory naming change to avoid json
 deserialization failures

---
 osu.Game/Online/Rooms/RoomCategory.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/Rooms/RoomCategory.cs b/osu.Game/Online/Rooms/RoomCategory.cs
index f485e65ba9..bb9f1298d3 100644
--- a/osu.Game/Online/Rooms/RoomCategory.cs
+++ b/osu.Game/Online/Rooms/RoomCategory.cs
@@ -5,8 +5,9 @@ namespace osu.Game.Online.Rooms
 {
     public enum RoomCategory
     {
+        // used for osu-web deserialization so names shouldn't be changed.
         Normal,
         Spotlight,
-        Multiplayer,
+        Realtime,
     }
 }

From e421b6d34e50642cae45794fdb28e64805c6efd5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Dec 2020 23:36:09 +0900
Subject: [PATCH 0581/3722] Update some missed variables

---
 .../Visual/Multiplayer/TestSceneRoomStatus.cs  |  2 +-
 .../Screens/Multi/Multiplayer/Multiplayer.cs   | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs
index 788255501b..7140050bd5 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     {
                         Name = { Value = "Open" },
                         Status = { Value = new RoomStatusOpen() },
-                        Category = { Value = RoomCategory.Multiplayer }
+                        Category = { Value = RoomCategory.Realtime }
                     }) { MatchingFilter = true },
                 }
             };
diff --git a/osu.Game/Screens/Multi/Multiplayer/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer/Multiplayer.cs
index 97fa4cfa6e..76aa6b9f8f 100644
--- a/osu.Game/Screens/Multi/Multiplayer/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/Multiplayer.cs
@@ -28,37 +28,37 @@ namespace osu.Game.Screens.Multi.Multiplayer
 
         protected override void UpdatePollingRate(bool isIdle)
         {
-            var playlistsManager = (MultiplayerRoomManager)RoomManager;
+            var multiplayerRoomManager = (MultiplayerRoomManager)RoomManager;
 
             if (!this.IsCurrentScreen())
             {
-                playlistsManager.TimeBetweenListingPolls.Value = 0;
-                playlistsManager.TimeBetweenSelectionPolls.Value = 0;
+                multiplayerRoomManager.TimeBetweenListingPolls.Value = 0;
+                multiplayerRoomManager.TimeBetweenSelectionPolls.Value = 0;
             }
             else
             {
                 switch (CurrentSubScreen)
                 {
                     case LoungeSubScreen _:
-                        playlistsManager.TimeBetweenListingPolls.Value = isIdle ? 120000 : 15000;
-                        playlistsManager.TimeBetweenSelectionPolls.Value = isIdle ? 120000 : 15000;
+                        multiplayerRoomManager.TimeBetweenListingPolls.Value = isIdle ? 120000 : 15000;
+                        multiplayerRoomManager.TimeBetweenSelectionPolls.Value = isIdle ? 120000 : 15000;
                         break;
 
                     // Don't poll inside the match or anywhere else.
                     default:
-                        playlistsManager.TimeBetweenListingPolls.Value = 0;
-                        playlistsManager.TimeBetweenSelectionPolls.Value = 0;
+                        multiplayerRoomManager.TimeBetweenListingPolls.Value = 0;
+                        multiplayerRoomManager.TimeBetweenSelectionPolls.Value = 0;
                         break;
                 }
             }
 
-            Logger.Log($"Polling adjusted (listing: {playlistsManager.TimeBetweenListingPolls.Value}, selection: {playlistsManager.TimeBetweenSelectionPolls.Value})");
+            Logger.Log($"Polling adjusted (listing: {multiplayerRoomManager.TimeBetweenListingPolls.Value}, selection: {multiplayerRoomManager.TimeBetweenSelectionPolls.Value})");
         }
 
         protected override Room CreateNewRoom()
         {
             var room = new Room { Name = { Value = $"{API.LocalUser}'s awesome room" } };
-            room.Category.Value = RoomCategory.Multiplayer;
+            room.Category.Value = RoomCategory.Realtime;
             return room;
         }
 

From 0d8fb83d0a0a56359947ac8e52ff9e10a953db66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 15:37:14 +0100
Subject: [PATCH 0582/3722] Ensure account creation overlay is shown after
 logout

Scheduling the entire API state change callback caused the scheduled
hide to fire the first time the user attempted to display the account
creation overlay after a logout, because the drawable wasn't present
before that (so its scheduler wasn't running).

It is not theoretically safe to run `Hide()` unscheduled at its present
call site (as the value change callbacks are fired on the background
API thread). This could also be fixed by setting `AlwaysPresent = true`,
but that's a pretty ugly and unperformant change to make in general.
---
 osu.Game/Overlays/AccountCreationOverlay.cs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/AccountCreationOverlay.cs b/osu.Game/Overlays/AccountCreationOverlay.cs
index 58ede5502a..3084c7475a 100644
--- a/osu.Game/Overlays/AccountCreationOverlay.cs
+++ b/osu.Game/Overlays/AccountCreationOverlay.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Screens;
+using osu.Framework.Threading;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Online.API;
@@ -93,6 +94,11 @@ namespace osu.Game.Overlays
 
             if (welcomeScreen.GetChildScreen() != null)
                 welcomeScreen.MakeCurrent();
+
+            // there might be a stale scheduled hide from a previous API state change.
+            // cancel it here so that the overlay is not hidden again after one frame.
+            scheduledHide?.Cancel();
+            scheduledHide = null;
         }
 
         protected override void PopOut()
@@ -101,7 +107,9 @@ namespace osu.Game.Overlays
             this.FadeOut(100);
         }
 
-        private void apiStateChanged(ValueChangedEvent<APIState> state) => Schedule(() =>
+        private ScheduledDelegate scheduledHide;
+
+        private void apiStateChanged(ValueChangedEvent<APIState> state)
         {
             switch (state.NewValue)
             {
@@ -113,9 +121,10 @@ namespace osu.Game.Overlays
                     break;
 
                 case APIState.Online:
-                    Hide();
+                    scheduledHide?.Cancel();
+                    scheduledHide = Schedule(Hide);
                     break;
             }
-        });
+        }
     }
 }

From 8a36eab060264b8b903142000657caf5c7d3056c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Dec 2020 23:42:02 +0900
Subject: [PATCH 0583/3722] Move missed file from Play namespace

---
 osu.Game/Screens/Multi/Multiplayer/MultiplayerPlayer.cs       | 2 +-
 osu.Game/Screens/Multi/{Play => Playlists}/PlaylistsPlayer.cs | 2 +-
 osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs    | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)
 rename osu.Game/Screens/Multi/{Play => Playlists}/PlaylistsPlayer.cs (99%)

diff --git a/osu.Game/Screens/Multi/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/Multi/Multiplayer/MultiplayerPlayer.cs
index 3255bcc642..32d95aa11f 100644
--- a/osu.Game/Screens/Multi/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/MultiplayerPlayer.cs
@@ -11,7 +11,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Scoring;
-using osu.Game.Screens.Multi.Play;
+using osu.Game.Screens.Multi.Playlists;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Ranking;
diff --git a/osu.Game/Screens/Multi/Play/PlaylistsPlayer.cs b/osu.Game/Screens/Multi/Playlists/PlaylistsPlayer.cs
similarity index 99%
rename from osu.Game/Screens/Multi/Play/PlaylistsPlayer.cs
rename to osu.Game/Screens/Multi/Playlists/PlaylistsPlayer.cs
index f05f732494..40198d82cd 100644
--- a/osu.Game/Screens/Multi/Play/PlaylistsPlayer.cs
+++ b/osu.Game/Screens/Multi/Playlists/PlaylistsPlayer.cs
@@ -18,7 +18,7 @@ using osu.Game.Screens.Multi.Ranking;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
 
-namespace osu.Game.Screens.Multi.Play
+namespace osu.Game.Screens.Multi.Playlists
 {
     public class PlaylistsPlayer : Player
     {
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs
index 67242003e6..f6d084b112 100644
--- a/osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs
@@ -13,7 +13,6 @@ using osu.Game.Online.Rooms;
 using osu.Game.Screens.Multi.Components;
 using osu.Game.Screens.Multi.Match;
 using osu.Game.Screens.Multi.Match.Components;
-using osu.Game.Screens.Multi.Play;
 using osu.Game.Screens.Multi.Ranking;
 using osu.Game.Screens.Select;
 using osu.Game.Users;

From 836d1491d0d1576ee444179953eb863bb8c1d740 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Dec 2020 23:45:44 +0900
Subject: [PATCH 0584/3722] PlaylistsMultiplayer -> Playlists

---
 .../Visual/Navigation/TestSceneScreenNavigation.cs           | 5 ++---
 osu.Game.Tests/Visual/Playlists/TestScenePlaylistsScreen.cs  | 3 +--
 osu.Game/Screens/Menu/MainMenu.cs                            | 2 +-
 .../Playlists/{PlaylistsMultiplayer.cs => Playlists.cs}      | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)
 rename osu.Game/Screens/Multi/Playlists/{PlaylistsMultiplayer.cs => Playlists.cs} (97%)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index 381bbca74f..ac63c89183 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -11,7 +11,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
 using osu.Game.Overlays.Toolbar;
-using osu.Game.Screens.Multi.Playlists;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Options;
@@ -108,14 +107,14 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestExitMultiWithEscape()
         {
-            PushAndConfirm(() => new PlaylistsMultiplayer());
+            PushAndConfirm(() => new Screens.Multi.Playlists.Playlists());
             exitViaEscapeAndConfirm();
         }
 
         [Test]
         public void TestExitMultiWithBackButton()
         {
-            PushAndConfirm(() => new PlaylistsMultiplayer());
+            PushAndConfirm(() => new Screens.Multi.Playlists.Playlists());
             exitViaBackButtonAndConfirm();
         }
 
diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsScreen.cs
index 8203ca4845..b780eb5347 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsScreen.cs
@@ -4,7 +4,6 @@
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Game.Overlays;
-using osu.Game.Screens.Multi.Playlists;
 
 namespace osu.Game.Tests.Visual.Playlists
 {
@@ -18,7 +17,7 @@ namespace osu.Game.Tests.Visual.Playlists
 
         public TestScenePlaylistsScreen()
         {
-            var multi = new PlaylistsMultiplayer();
+            var multi = new Screens.Multi.Playlists.Playlists();
 
             AddStep("show", () => LoadScreen(multi));
             AddUntilStep("wait for loaded", () => multi.IsLoaded);
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 15ac2237d3..aeb58a75fc 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -106,7 +106,7 @@ namespace osu.Game.Screens.Menu
                             },
                             OnSolo = onSolo,
                             OnMultiplayer = () => this.Push(new Multiplayer()),
-                            OnPlaylists = () => this.Push(new PlaylistsMultiplayer()),
+                            OnPlaylists = () => this.Push(new Playlists()),
                             OnExit = confirmAndExit,
                         }
                     }
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsMultiplayer.cs b/osu.Game/Screens/Multi/Playlists/Playlists.cs
similarity index 97%
rename from osu.Game/Screens/Multi/Playlists/PlaylistsMultiplayer.cs
rename to osu.Game/Screens/Multi/Playlists/Playlists.cs
index 92b0160247..da6aade942 100644
--- a/osu.Game/Screens/Multi/Playlists/PlaylistsMultiplayer.cs
+++ b/osu.Game/Screens/Multi/Playlists/Playlists.cs
@@ -11,7 +11,7 @@ using osu.Game.Screens.Multi.Match;
 
 namespace osu.Game.Screens.Multi.Playlists
 {
-    public class PlaylistsMultiplayer : MultiplayerScreen
+    public class Playlists : MultiplayerScreen
     {
         protected override void UpdatePollingRate(bool isIdle)
         {

From 9de1a67e0389017d5a233fa7b38478f26287b305 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 25 Dec 2020 23:47:32 +0900
Subject: [PATCH 0585/3722] Move PlaylistsResultsScreen to correct namespace

---
 .../Visual/Playlists/TestScenePlaylistsResultsScreen.cs         | 2 +-
 osu.Game/Screens/Multi/Multiplayer/MultiplayerResultsScreen.cs  | 2 +-
 osu.Game/Screens/Multi/Playlists/PlaylistsPlayer.cs             | 1 -
 .../Multi/{Ranking => Playlists}/PlaylistsResultsScreen.cs      | 2 +-
 osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs      | 1 -
 5 files changed, 3 insertions(+), 5 deletions(-)
 rename osu.Game/Screens/Multi/{Ranking => Playlists}/PlaylistsResultsScreen.cs (99%)

diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
index b42f2e1d2d..97bb48c7b5 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
@@ -19,7 +19,7 @@ using osu.Game.Online.Rooms;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
-using osu.Game.Screens.Multi.Ranking;
+using osu.Game.Screens.Multi.Playlists;
 using osu.Game.Screens.Ranking;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Users;
diff --git a/osu.Game/Screens/Multi/Multiplayer/MultiplayerResultsScreen.cs b/osu.Game/Screens/Multi/Multiplayer/MultiplayerResultsScreen.cs
index a01930c5ef..3e39473954 100644
--- a/osu.Game/Screens/Multi/Multiplayer/MultiplayerResultsScreen.cs
+++ b/osu.Game/Screens/Multi/Multiplayer/MultiplayerResultsScreen.cs
@@ -3,7 +3,7 @@
 
 using osu.Game.Online.Rooms;
 using osu.Game.Scoring;
-using osu.Game.Screens.Multi.Ranking;
+using osu.Game.Screens.Multi.Playlists;
 
 namespace osu.Game.Screens.Multi.Multiplayer
 {
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsPlayer.cs b/osu.Game/Screens/Multi/Playlists/PlaylistsPlayer.cs
index 40198d82cd..25a3340ead 100644
--- a/osu.Game/Screens/Multi/Playlists/PlaylistsPlayer.cs
+++ b/osu.Game/Screens/Multi/Playlists/PlaylistsPlayer.cs
@@ -14,7 +14,6 @@ using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osu.Game.Scoring;
-using osu.Game.Screens.Multi.Ranking;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
 
diff --git a/osu.Game/Screens/Multi/Ranking/PlaylistsResultsScreen.cs b/osu.Game/Screens/Multi/Playlists/PlaylistsResultsScreen.cs
similarity index 99%
rename from osu.Game/Screens/Multi/Ranking/PlaylistsResultsScreen.cs
rename to osu.Game/Screens/Multi/Playlists/PlaylistsResultsScreen.cs
index 7b1ab2c5b7..5d1d3a2724 100644
--- a/osu.Game/Screens/Multi/Ranking/PlaylistsResultsScreen.cs
+++ b/osu.Game/Screens/Multi/Playlists/PlaylistsResultsScreen.cs
@@ -15,7 +15,7 @@ using osu.Game.Online.Rooms;
 using osu.Game.Scoring;
 using osu.Game.Screens.Ranking;
 
-namespace osu.Game.Screens.Multi.Ranking
+namespace osu.Game.Screens.Multi.Playlists
 {
     public class PlaylistsResultsScreen : ResultsScreen
     {
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs
index f6d084b112..4867268fe1 100644
--- a/osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs
@@ -13,7 +13,6 @@ using osu.Game.Online.Rooms;
 using osu.Game.Screens.Multi.Components;
 using osu.Game.Screens.Multi.Match;
 using osu.Game.Screens.Multi.Match.Components;
-using osu.Game.Screens.Multi.Ranking;
 using osu.Game.Screens.Select;
 using osu.Game.Users;
 using Footer = osu.Game.Screens.Multi.Match.Components.Footer;

From e797e5ce7a73441cc2c65e4fd5909c789b3fc3fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 16:48:03 +0100
Subject: [PATCH 0586/3722] Rename Multi directory to OnlinePlay

---
 .../Components/BeatmapDetailAreaPlaylistTabItem.cs                | 0
 osu.Game/Screens/{Multi => OnlinePlay}/Components/BeatmapTitle.cs | 0
 .../Screens/{Multi => OnlinePlay}/Components/BeatmapTypeInfo.cs   | 0
 .../{Multi => OnlinePlay}/Components/DisableableTabControl.cs     | 0
 .../Screens/{Multi => OnlinePlay}/Components/DrawableGameType.cs  | 0
 .../{Multi => OnlinePlay}/Components/ListingPollingComponent.cs   | 0
 .../{Multi => OnlinePlay}/Components/MatchBeatmapDetailArea.cs    | 0
 osu.Game/Screens/{Multi => OnlinePlay}/Components/ModeTypeInfo.cs | 0
 .../Components/MultiplayerBackgroundSprite.cs                     | 0
 .../Screens/{Multi => OnlinePlay}/Components/OverlinedHeader.cs   | 0
 .../{Multi => OnlinePlay}/Components/OverlinedPlaylistHeader.cs   | 0
 .../{Multi => OnlinePlay}/Components/ParticipantCountDisplay.cs   | 0
 .../{Multi => OnlinePlay}/Components/ParticipantsDisplay.cs       | 0
 .../Screens/{Multi => OnlinePlay}/Components/ParticipantsList.cs  | 0
 osu.Game/Screens/{Multi => OnlinePlay}/Components/ReadyButton.cs  | 0
 osu.Game/Screens/{Multi => OnlinePlay}/Components/RoomManager.cs  | 0
 .../{Multi => OnlinePlay}/Components/RoomPollingComponent.cs      | 0
 .../Screens/{Multi => OnlinePlay}/Components/RoomStatusInfo.cs    | 0
 .../{Multi => OnlinePlay}/Components/SelectionPollingComponent.cs | 0
 .../{Multi => OnlinePlay}/Components/StatusColouredContainer.cs   | 0
 osu.Game/Screens/{Multi => OnlinePlay}/DrawableRoomPlaylist.cs    | 0
 .../Screens/{Multi => OnlinePlay}/DrawableRoomPlaylistItem.cs     | 0
 .../{Multi => OnlinePlay}/DrawableRoomPlaylistWithResults.cs      | 0
 osu.Game/Screens/{Multi => OnlinePlay}/Header.cs                  | 0
 osu.Game/Screens/{Multi => OnlinePlay}/IMultiplayerSubScreen.cs   | 0
 osu.Game/Screens/{Multi => OnlinePlay}/IRoomManager.cs            | 0
 .../{Multi => OnlinePlay}/Lounge/Components/DrawableRoom.cs       | 0
 .../{Multi => OnlinePlay}/Lounge/Components/FilterControl.cs      | 0
 .../{Multi => OnlinePlay}/Lounge/Components/FilterCriteria.cs     | 0
 .../{Multi => OnlinePlay}/Lounge/Components/ParticipantInfo.cs    | 0
 .../Lounge/Components/PlaylistsFilterControl.cs                   | 0
 .../Screens/{Multi => OnlinePlay}/Lounge/Components/RoomInfo.cs   | 0
 .../{Multi => OnlinePlay}/Lounge/Components/RoomInspector.cs      | 0
 .../{Multi => OnlinePlay}/Lounge/Components/RoomStatusFilter.cs   | 0
 .../{Multi => OnlinePlay}/Lounge/Components/RoomsContainer.cs     | 0
 osu.Game/Screens/{Multi => OnlinePlay}/Lounge/LoungeSubScreen.cs  | 0
 osu.Game/Screens/{Multi => OnlinePlay}/Match/Components/Footer.cs | 0
 .../{Multi => OnlinePlay}/Match/Components/GameTypePicker.cs      | 0
 osu.Game/Screens/{Multi => OnlinePlay}/Match/Components/Header.cs | 0
 .../{Multi => OnlinePlay}/Match/Components/MatchChatDisplay.cs    | 0
 .../{Multi => OnlinePlay}/Match/Components/MatchLeaderboard.cs    | 0
 .../Match/Components/MatchLeaderboardScore.cs                     | 0
 .../Match/Components/MatchSettingsOverlay.cs                      | 0
 .../Match/Components/PurpleTriangleButton.cs                      | 0
 .../Match/Components/RoomAvailabilityPicker.cs                    | 0
 osu.Game/Screens/{Multi => OnlinePlay}/Match/RoomSubScreen.cs     | 0
 .../Multiplayer/CreateMultiplayerMatchButton.cs                   | 0
 .../Multiplayer/Match/BeatmapSelectionControl.cs                  | 0
 .../Multiplayer/Match/MultiplayerMatchFooter.cs                   | 0
 .../Multiplayer/Match/MultiplayerMatchHeader.cs                   | 0
 .../Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs          | 0
 .../Multiplayer/Match/MultiplayerReadyButton.cs                   | 0
 osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/Multiplayer.cs | 0
 .../{Multi => OnlinePlay}/Multiplayer/MultiplayerFilterControl.cs | 0
 .../Multiplayer/MultiplayerLoungeSubScreen.cs                     | 0
 .../Multiplayer/MultiplayerMatchSongSelect.cs                     | 0
 .../Multiplayer/MultiplayerMatchSubScreen.cs                      | 0
 .../{Multi => OnlinePlay}/Multiplayer/MultiplayerPlayer.cs        | 0
 .../{Multi => OnlinePlay}/Multiplayer/MultiplayerResultsScreen.cs | 0
 .../{Multi => OnlinePlay}/Multiplayer/MultiplayerRoomComposite.cs | 0
 .../{Multi => OnlinePlay}/Multiplayer/MultiplayerRoomManager.cs   | 0
 .../Multiplayer/Participants/ParticipantPanel.cs                  | 0
 .../Multiplayer/Participants/ParticipantsList.cs                  | 0
 .../Multiplayer/Participants/ParticipantsListHeader.cs            | 0
 .../Multiplayer/Participants/StateDisplay.cs                      | 0
 osu.Game/Screens/{Multi => OnlinePlay}/MultiplayerComposite.cs    | 0
 osu.Game/Screens/{Multi => OnlinePlay}/MultiplayerScreen.cs       | 0
 osu.Game/Screens/{Multi => OnlinePlay}/MultiplayerSubScreen.cs    | 0
 .../Screens/{Multi => OnlinePlay}/MultiplayerSubScreenStack.cs    | 0
 .../{Multi => OnlinePlay}/Playlists/CreatePlaylistsRoomButton.cs  | 0
 osu.Game/Screens/{Multi => OnlinePlay}/Playlists/Playlists.cs     | 0
 .../{Multi => OnlinePlay}/Playlists/PlaylistsLoungeSubScreen.cs   | 0
 .../Playlists/PlaylistsMatchSettingsOverlay.cs                    | 0
 .../Screens/{Multi => OnlinePlay}/Playlists/PlaylistsPlayer.cs    | 0
 .../{Multi => OnlinePlay}/Playlists/PlaylistsReadyButton.cs       | 0
 .../{Multi => OnlinePlay}/Playlists/PlaylistsResultsScreen.cs     | 0
 .../{Multi => OnlinePlay}/Playlists/PlaylistsRoomManager.cs       | 0
 .../{Multi => OnlinePlay}/Playlists/PlaylistsRoomSubScreen.cs     | 0
 78 files changed, 0 insertions(+), 0 deletions(-)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/BeatmapDetailAreaPlaylistTabItem.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/BeatmapTitle.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/BeatmapTypeInfo.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/DisableableTabControl.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/DrawableGameType.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/ListingPollingComponent.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/MatchBeatmapDetailArea.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/ModeTypeInfo.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/MultiplayerBackgroundSprite.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/OverlinedHeader.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/OverlinedPlaylistHeader.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/ParticipantCountDisplay.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/ParticipantsDisplay.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/ParticipantsList.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/ReadyButton.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/RoomManager.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/RoomPollingComponent.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/RoomStatusInfo.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/SelectionPollingComponent.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Components/StatusColouredContainer.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/DrawableRoomPlaylist.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/DrawableRoomPlaylistItem.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/DrawableRoomPlaylistWithResults.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Header.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/IMultiplayerSubScreen.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/IRoomManager.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Lounge/Components/DrawableRoom.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Lounge/Components/FilterControl.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Lounge/Components/FilterCriteria.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Lounge/Components/ParticipantInfo.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Lounge/Components/PlaylistsFilterControl.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Lounge/Components/RoomInfo.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Lounge/Components/RoomInspector.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Lounge/Components/RoomStatusFilter.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Lounge/Components/RoomsContainer.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Lounge/LoungeSubScreen.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Match/Components/Footer.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Match/Components/GameTypePicker.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Match/Components/Header.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Match/Components/MatchChatDisplay.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Match/Components/MatchLeaderboard.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Match/Components/MatchLeaderboardScore.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Match/Components/MatchSettingsOverlay.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Match/Components/PurpleTriangleButton.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Match/Components/RoomAvailabilityPicker.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Match/RoomSubScreen.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/CreateMultiplayerMatchButton.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/Match/BeatmapSelectionControl.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/Match/MultiplayerMatchFooter.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/Match/MultiplayerMatchHeader.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/Match/MultiplayerReadyButton.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/Multiplayer.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/MultiplayerFilterControl.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/MultiplayerLoungeSubScreen.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/MultiplayerMatchSongSelect.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/MultiplayerMatchSubScreen.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/MultiplayerPlayer.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/MultiplayerResultsScreen.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/MultiplayerRoomComposite.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/MultiplayerRoomManager.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/Participants/ParticipantPanel.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/Participants/ParticipantsList.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/Participants/ParticipantsListHeader.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Multiplayer/Participants/StateDisplay.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/MultiplayerComposite.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/MultiplayerScreen.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/MultiplayerSubScreen.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/MultiplayerSubScreenStack.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Playlists/CreatePlaylistsRoomButton.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Playlists/Playlists.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Playlists/PlaylistsLoungeSubScreen.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Playlists/PlaylistsMatchSettingsOverlay.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Playlists/PlaylistsPlayer.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Playlists/PlaylistsReadyButton.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Playlists/PlaylistsResultsScreen.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Playlists/PlaylistsRoomManager.cs (100%)
 rename osu.Game/Screens/{Multi => OnlinePlay}/Playlists/PlaylistsRoomSubScreen.cs (100%)

diff --git a/osu.Game/Screens/Multi/Components/BeatmapDetailAreaPlaylistTabItem.cs b/osu.Game/Screens/OnlinePlay/Components/BeatmapDetailAreaPlaylistTabItem.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/BeatmapDetailAreaPlaylistTabItem.cs
rename to osu.Game/Screens/OnlinePlay/Components/BeatmapDetailAreaPlaylistTabItem.cs
diff --git a/osu.Game/Screens/Multi/Components/BeatmapTitle.cs b/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/BeatmapTitle.cs
rename to osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
diff --git a/osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs b/osu.Game/Screens/OnlinePlay/Components/BeatmapTypeInfo.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs
rename to osu.Game/Screens/OnlinePlay/Components/BeatmapTypeInfo.cs
diff --git a/osu.Game/Screens/Multi/Components/DisableableTabControl.cs b/osu.Game/Screens/OnlinePlay/Components/DisableableTabControl.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/DisableableTabControl.cs
rename to osu.Game/Screens/OnlinePlay/Components/DisableableTabControl.cs
diff --git a/osu.Game/Screens/Multi/Components/DrawableGameType.cs b/osu.Game/Screens/OnlinePlay/Components/DrawableGameType.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/DrawableGameType.cs
rename to osu.Game/Screens/OnlinePlay/Components/DrawableGameType.cs
diff --git a/osu.Game/Screens/Multi/Components/ListingPollingComponent.cs b/osu.Game/Screens/OnlinePlay/Components/ListingPollingComponent.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/ListingPollingComponent.cs
rename to osu.Game/Screens/OnlinePlay/Components/ListingPollingComponent.cs
diff --git a/osu.Game/Screens/Multi/Components/MatchBeatmapDetailArea.cs b/osu.Game/Screens/OnlinePlay/Components/MatchBeatmapDetailArea.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/MatchBeatmapDetailArea.cs
rename to osu.Game/Screens/OnlinePlay/Components/MatchBeatmapDetailArea.cs
diff --git a/osu.Game/Screens/Multi/Components/ModeTypeInfo.cs b/osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/ModeTypeInfo.cs
rename to osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs
diff --git a/osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs b/osu.Game/Screens/OnlinePlay/Components/MultiplayerBackgroundSprite.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs
rename to osu.Game/Screens/OnlinePlay/Components/MultiplayerBackgroundSprite.cs
diff --git a/osu.Game/Screens/Multi/Components/OverlinedHeader.cs b/osu.Game/Screens/OnlinePlay/Components/OverlinedHeader.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/OverlinedHeader.cs
rename to osu.Game/Screens/OnlinePlay/Components/OverlinedHeader.cs
diff --git a/osu.Game/Screens/Multi/Components/OverlinedPlaylistHeader.cs b/osu.Game/Screens/OnlinePlay/Components/OverlinedPlaylistHeader.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/OverlinedPlaylistHeader.cs
rename to osu.Game/Screens/OnlinePlay/Components/OverlinedPlaylistHeader.cs
diff --git a/osu.Game/Screens/Multi/Components/ParticipantCountDisplay.cs b/osu.Game/Screens/OnlinePlay/Components/ParticipantCountDisplay.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/ParticipantCountDisplay.cs
rename to osu.Game/Screens/OnlinePlay/Components/ParticipantCountDisplay.cs
diff --git a/osu.Game/Screens/Multi/Components/ParticipantsDisplay.cs b/osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/ParticipantsDisplay.cs
rename to osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs
diff --git a/osu.Game/Screens/Multi/Components/ParticipantsList.cs b/osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/ParticipantsList.cs
rename to osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs
diff --git a/osu.Game/Screens/Multi/Components/ReadyButton.cs b/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/ReadyButton.cs
rename to osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
diff --git a/osu.Game/Screens/Multi/Components/RoomManager.cs b/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/RoomManager.cs
rename to osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
diff --git a/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs b/osu.Game/Screens/OnlinePlay/Components/RoomPollingComponent.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/RoomPollingComponent.cs
rename to osu.Game/Screens/OnlinePlay/Components/RoomPollingComponent.cs
diff --git a/osu.Game/Screens/Multi/Components/RoomStatusInfo.cs b/osu.Game/Screens/OnlinePlay/Components/RoomStatusInfo.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/RoomStatusInfo.cs
rename to osu.Game/Screens/OnlinePlay/Components/RoomStatusInfo.cs
diff --git a/osu.Game/Screens/Multi/Components/SelectionPollingComponent.cs b/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/SelectionPollingComponent.cs
rename to osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs
diff --git a/osu.Game/Screens/Multi/Components/StatusColouredContainer.cs b/osu.Game/Screens/OnlinePlay/Components/StatusColouredContainer.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/StatusColouredContainer.cs
rename to osu.Game/Screens/OnlinePlay/Components/StatusColouredContainer.cs
diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylist.cs
similarity index 100%
rename from osu.Game/Screens/Multi/DrawableRoomPlaylist.cs
rename to osu.Game/Screens/OnlinePlay/DrawableRoomPlaylist.cs
diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
similarity index 100%
rename from osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
rename to osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylistWithResults.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistWithResults.cs
similarity index 100%
rename from osu.Game/Screens/Multi/DrawableRoomPlaylistWithResults.cs
rename to osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistWithResults.cs
diff --git a/osu.Game/Screens/Multi/Header.cs b/osu.Game/Screens/OnlinePlay/Header.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Header.cs
rename to osu.Game/Screens/OnlinePlay/Header.cs
diff --git a/osu.Game/Screens/Multi/IMultiplayerSubScreen.cs b/osu.Game/Screens/OnlinePlay/IMultiplayerSubScreen.cs
similarity index 100%
rename from osu.Game/Screens/Multi/IMultiplayerSubScreen.cs
rename to osu.Game/Screens/OnlinePlay/IMultiplayerSubScreen.cs
diff --git a/osu.Game/Screens/Multi/IRoomManager.cs b/osu.Game/Screens/OnlinePlay/IRoomManager.cs
similarity index 100%
rename from osu.Game/Screens/Multi/IRoomManager.cs
rename to osu.Game/Screens/OnlinePlay/IRoomManager.cs
diff --git a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
rename to osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
diff --git a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/FilterControl.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
rename to osu.Game/Screens/OnlinePlay/Lounge/Components/FilterControl.cs
diff --git a/osu.Game/Screens/Multi/Lounge/Components/FilterCriteria.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/FilterCriteria.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Lounge/Components/FilterCriteria.cs
rename to osu.Game/Screens/OnlinePlay/Lounge/Components/FilterCriteria.cs
diff --git a/osu.Game/Screens/Multi/Lounge/Components/ParticipantInfo.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/ParticipantInfo.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Lounge/Components/ParticipantInfo.cs
rename to osu.Game/Screens/OnlinePlay/Lounge/Components/ParticipantInfo.cs
diff --git a/osu.Game/Screens/Multi/Lounge/Components/PlaylistsFilterControl.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/PlaylistsFilterControl.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Lounge/Components/PlaylistsFilterControl.cs
rename to osu.Game/Screens/OnlinePlay/Lounge/Components/PlaylistsFilterControl.cs
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomInfo.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInfo.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Lounge/Components/RoomInfo.cs
rename to osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInfo.cs
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInspector.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs
rename to osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInspector.cs
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomStatusFilter.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusFilter.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Lounge/Components/RoomStatusFilter.cs
rename to osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusFilter.cs
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
rename to osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
rename to osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
diff --git a/osu.Game/Screens/Multi/Match/Components/Footer.cs b/osu.Game/Screens/OnlinePlay/Match/Components/Footer.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Match/Components/Footer.cs
rename to osu.Game/Screens/OnlinePlay/Match/Components/Footer.cs
diff --git a/osu.Game/Screens/Multi/Match/Components/GameTypePicker.cs b/osu.Game/Screens/OnlinePlay/Match/Components/GameTypePicker.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Match/Components/GameTypePicker.cs
rename to osu.Game/Screens/OnlinePlay/Match/Components/GameTypePicker.cs
diff --git a/osu.Game/Screens/Multi/Match/Components/Header.cs b/osu.Game/Screens/OnlinePlay/Match/Components/Header.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Match/Components/Header.cs
rename to osu.Game/Screens/OnlinePlay/Match/Components/Header.cs
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchChatDisplay.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Match/Components/MatchChatDisplay.cs
rename to osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboard.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
rename to osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboard.cs
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboardScore.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboardScore.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Match/Components/MatchLeaderboardScore.cs
rename to osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboardScore.cs
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
rename to osu.Game/Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs
diff --git a/osu.Game/Screens/Multi/Match/Components/PurpleTriangleButton.cs b/osu.Game/Screens/OnlinePlay/Match/Components/PurpleTriangleButton.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Match/Components/PurpleTriangleButton.cs
rename to osu.Game/Screens/OnlinePlay/Match/Components/PurpleTriangleButton.cs
diff --git a/osu.Game/Screens/Multi/Match/Components/RoomAvailabilityPicker.cs b/osu.Game/Screens/OnlinePlay/Match/Components/RoomAvailabilityPicker.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Match/Components/RoomAvailabilityPicker.cs
rename to osu.Game/Screens/OnlinePlay/Match/Components/RoomAvailabilityPicker.cs
diff --git a/osu.Game/Screens/Multi/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Match/RoomSubScreen.cs
rename to osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/CreateMultiplayerMatchButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/CreateMultiplayerMatchButton.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/Match/BeatmapSelectionControl.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/Match/BeatmapSelectionControl.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerMatchFooter.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerMatchFooter.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerMatchHeader.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchHeader.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerMatchHeader.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchHeader.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerReadyButton.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/Multiplayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/Multiplayer.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/MultiplayerFilterControl.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerFilterControl.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/MultiplayerFilterControl.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerFilterControl.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/MultiplayerLoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/MultiplayerLoungeSubScreen.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/MultiplayerMatchSongSelect.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/MultiplayerMatchSubScreen.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/MultiplayerPlayer.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/MultiplayerResultsScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/MultiplayerResultsScreen.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/MultiplayerRoomComposite.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/MultiplayerRoomComposite.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/MultiplayerRoomManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/MultiplayerRoomManager.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/Participants/ParticipantPanel.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/Participants/ParticipantsList.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsList.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/Participants/ParticipantsList.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsList.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/Participants/ParticipantsListHeader.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsListHeader.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/Participants/ParticipantsListHeader.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsListHeader.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/Participants/StateDisplay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/Participants/StateDisplay.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
diff --git a/osu.Game/Screens/Multi/MultiplayerComposite.cs b/osu.Game/Screens/OnlinePlay/MultiplayerComposite.cs
similarity index 100%
rename from osu.Game/Screens/Multi/MultiplayerComposite.cs
rename to osu.Game/Screens/OnlinePlay/MultiplayerComposite.cs
diff --git a/osu.Game/Screens/Multi/MultiplayerScreen.cs b/osu.Game/Screens/OnlinePlay/MultiplayerScreen.cs
similarity index 100%
rename from osu.Game/Screens/Multi/MultiplayerScreen.cs
rename to osu.Game/Screens/OnlinePlay/MultiplayerScreen.cs
diff --git a/osu.Game/Screens/Multi/MultiplayerSubScreen.cs b/osu.Game/Screens/OnlinePlay/MultiplayerSubScreen.cs
similarity index 100%
rename from osu.Game/Screens/Multi/MultiplayerSubScreen.cs
rename to osu.Game/Screens/OnlinePlay/MultiplayerSubScreen.cs
diff --git a/osu.Game/Screens/Multi/MultiplayerSubScreenStack.cs b/osu.Game/Screens/OnlinePlay/MultiplayerSubScreenStack.cs
similarity index 100%
rename from osu.Game/Screens/Multi/MultiplayerSubScreenStack.cs
rename to osu.Game/Screens/OnlinePlay/MultiplayerSubScreenStack.cs
diff --git a/osu.Game/Screens/Multi/Playlists/CreatePlaylistsRoomButton.cs b/osu.Game/Screens/OnlinePlay/Playlists/CreatePlaylistsRoomButton.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Playlists/CreatePlaylistsRoomButton.cs
rename to osu.Game/Screens/OnlinePlay/Playlists/CreatePlaylistsRoomButton.cs
diff --git a/osu.Game/Screens/Multi/Playlists/Playlists.cs b/osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Playlists/Playlists.cs
rename to osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsLoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsLoungeSubScreen.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Playlists/PlaylistsLoungeSubScreen.cs
rename to osu.Game/Screens/OnlinePlay/Playlists/PlaylistsLoungeSubScreen.cs
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Playlists/PlaylistsMatchSettingsOverlay.cs
rename to osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsPlayer.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Playlists/PlaylistsPlayer.cs
rename to osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsReadyButton.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsReadyButton.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Playlists/PlaylistsReadyButton.cs
rename to osu.Game/Screens/OnlinePlay/Playlists/PlaylistsReadyButton.cs
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsResultsScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsResultsScreen.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Playlists/PlaylistsResultsScreen.cs
rename to osu.Game/Screens/OnlinePlay/Playlists/PlaylistsResultsScreen.cs
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsRoomManager.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomManager.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Playlists/PlaylistsRoomManager.cs
rename to osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomManager.cs
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs
rename to osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs

From 83fb7c7a1ae3a0aac1e42ec8160c90d1aef5009e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 16:50:00 +0100
Subject: [PATCH 0587/3722] Re-namespace all files in OnlinePlay directory

---
 .../Visual/Multiplayer/RoomManagerTestScene.cs     |  2 +-
 .../Visual/Multiplayer/TestRoomManager.cs          |  2 +-
 .../Multiplayer/TestSceneDrawableRoomPlaylist.cs   |  2 +-
 .../Visual/Multiplayer/TestSceneLoungeRoomInfo.cs  |  2 +-
 .../Multiplayer/TestSceneLoungeRoomsContainer.cs   |  2 +-
 .../Multiplayer/TestSceneMatchBeatmapDetailArea.cs |  2 +-
 .../Visual/Multiplayer/TestSceneMatchHeader.cs     |  2 +-
 .../Multiplayer/TestSceneMatchLeaderboard.cs       |  2 +-
 .../Visual/Multiplayer/TestSceneMatchSongSelect.cs |  2 +-
 .../Visual/Multiplayer/TestSceneMultiHeader.cs     |  2 +-
 .../Visual/Multiplayer/TestSceneMultiplayer.cs     |  4 ++--
 .../TestSceneMultiplayerMatchSubScreen.cs          |  4 ++--
 .../TestSceneMultiplayerParticipantsList.cs        |  2 +-
 .../Multiplayer/TestSceneMultiplayerReadyButton.cs |  2 +-
 .../Visual/Multiplayer/TestSceneRoomStatus.cs      |  2 +-
 .../Visual/Navigation/TestSceneScreenNavigation.cs |  4 ++--
 .../Playlists/TestScenePlaylistsFilterControl.cs   |  2 +-
 .../Playlists/TestScenePlaylistsLoungeSubScreen.cs |  6 +++---
 .../TestScenePlaylistsMatchSettingsOverlay.cs      |  4 ++--
 .../TestScenePlaylistsParticipantsList.cs          |  2 +-
 .../Playlists/TestScenePlaylistsResultsScreen.cs   |  2 +-
 .../Playlists/TestScenePlaylistsRoomSubScreen.cs   |  6 +++---
 .../Visual/Playlists/TestScenePlaylistsScreen.cs   |  2 +-
 osu.Game/Online/Rooms/GetRoomsRequest.cs           |  2 +-
 .../Overlays/Dashboard/CurrentlyPlayingDisplay.cs  |  2 +-
 osu.Game/Screens/Menu/MainMenu.cs                  |  4 ++--
 .../Components/BeatmapDetailAreaPlaylistTabItem.cs |  2 +-
 .../Screens/OnlinePlay/Components/BeatmapTitle.cs  |  2 +-
 .../OnlinePlay/Components/BeatmapTypeInfo.cs       |  2 +-
 .../OnlinePlay/Components/DisableableTabControl.cs |  2 +-
 .../OnlinePlay/Components/DrawableGameType.cs      |  2 +-
 .../Components/ListingPollingComponent.cs          |  4 ++--
 .../Components/MatchBeatmapDetailArea.cs           |  2 +-
 .../Screens/OnlinePlay/Components/ModeTypeInfo.cs  |  2 +-
 .../Components/MultiplayerBackgroundSprite.cs      |  2 +-
 .../OnlinePlay/Components/OverlinedHeader.cs       |  2 +-
 .../Components/OverlinedPlaylistHeader.cs          |  2 +-
 .../Components/ParticipantCountDisplay.cs          |  2 +-
 .../OnlinePlay/Components/ParticipantsDisplay.cs   |  2 +-
 .../OnlinePlay/Components/ParticipantsList.cs      |  2 +-
 .../Screens/OnlinePlay/Components/ReadyButton.cs   |  2 +-
 .../Screens/OnlinePlay/Components/RoomManager.cs   |  2 +-
 .../OnlinePlay/Components/RoomPollingComponent.cs  |  2 +-
 .../OnlinePlay/Components/RoomStatusInfo.cs        |  2 +-
 .../Components/SelectionPollingComponent.cs        |  2 +-
 .../Components/StatusColouredContainer.cs          |  2 +-
 .../Screens/OnlinePlay/DrawableRoomPlaylist.cs     |  2 +-
 .../Screens/OnlinePlay/DrawableRoomPlaylistItem.cs |  2 +-
 .../OnlinePlay/DrawableRoomPlaylistWithResults.cs  |  2 +-
 osu.Game/Screens/OnlinePlay/Header.cs              |  4 ++--
 .../Screens/OnlinePlay/IMultiplayerSubScreen.cs    |  2 +-
 osu.Game/Screens/OnlinePlay/IRoomManager.cs        |  2 +-
 .../OnlinePlay/Lounge/Components/DrawableRoom.cs   | 10 +++++-----
 .../OnlinePlay/Lounge/Components/FilterControl.cs  |  2 +-
 .../OnlinePlay/Lounge/Components/FilterCriteria.cs |  2 +-
 .../Lounge/Components/ParticipantInfo.cs           |  2 +-
 .../Lounge/Components/PlaylistsFilterControl.cs    |  2 +-
 .../OnlinePlay/Lounge/Components/RoomInfo.cs       |  4 ++--
 .../OnlinePlay/Lounge/Components/RoomInspector.cs  |  4 ++--
 .../Lounge/Components/RoomStatusFilter.cs          |  2 +-
 .../OnlinePlay/Lounge/Components/RoomsContainer.cs |  6 +++---
 .../Screens/OnlinePlay/Lounge/LoungeSubScreen.cs   |  6 +++---
 .../Screens/OnlinePlay/Match/Components/Footer.cs  |  4 ++--
 .../OnlinePlay/Match/Components/GameTypePicker.cs  |  4 ++--
 .../Screens/OnlinePlay/Match/Components/Header.cs  |  2 +-
 .../Match/Components/MatchChatDisplay.cs           |  2 +-
 .../Match/Components/MatchLeaderboard.cs           |  2 +-
 .../Match/Components/MatchLeaderboardScore.cs      |  2 +-
 .../Match/Components/MatchSettingsOverlay.cs       |  2 +-
 .../Match/Components/PurpleTriangleButton.cs       |  2 +-
 .../Match/Components/RoomAvailabilityPicker.cs     |  4 ++--
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs |  2 +-
 .../Multiplayer/CreateMultiplayerMatchButton.cs    |  4 ++--
 .../Multiplayer/Match/BeatmapSelectionControl.cs   |  4 ++--
 .../Multiplayer/Match/MultiplayerMatchFooter.cs    |  2 +-
 .../Multiplayer/Match/MultiplayerMatchHeader.cs    |  4 ++--
 .../Match/MultiplayerMatchSettingsOverlay.cs       |  4 ++--
 .../Multiplayer/Match/MultiplayerReadyButton.cs    |  4 ++--
 .../Screens/OnlinePlay/Multiplayer/Multiplayer.cs  |  6 +++---
 .../Multiplayer/MultiplayerFilterControl.cs        |  4 ++--
 .../Multiplayer/MultiplayerLoungeSubScreen.cs      |  8 ++++----
 .../Multiplayer/MultiplayerMatchSongSelect.cs      |  2 +-
 .../Multiplayer/MultiplayerMatchSubScreen.cs       | 14 +++++++-------
 .../OnlinePlay/Multiplayer/MultiplayerPlayer.cs    |  4 ++--
 .../Multiplayer/MultiplayerResultsScreen.cs        |  4 ++--
 .../Multiplayer/MultiplayerRoomComposite.cs        |  2 +-
 .../Multiplayer/MultiplayerRoomManager.cs          |  4 ++--
 .../Multiplayer/Participants/ParticipantPanel.cs   |  2 +-
 .../Multiplayer/Participants/ParticipantsList.cs   |  2 +-
 .../Participants/ParticipantsListHeader.cs         |  4 ++--
 .../Multiplayer/Participants/StateDisplay.cs       |  2 +-
 .../Screens/OnlinePlay/MultiplayerComposite.cs     |  2 +-
 osu.Game/Screens/OnlinePlay/MultiplayerScreen.cs   | 10 +++++-----
 .../Screens/OnlinePlay/MultiplayerSubScreen.cs     |  2 +-
 .../OnlinePlay/MultiplayerSubScreenStack.cs        |  2 +-
 .../Playlists/CreatePlaylistsRoomButton.cs         |  4 ++--
 osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs |  8 ++++----
 .../Playlists/PlaylistsLoungeSubScreen.cs          |  8 ++++----
 .../Playlists/PlaylistsMatchSettingsOverlay.cs     |  4 ++--
 .../OnlinePlay/Playlists/PlaylistsPlayer.cs        |  2 +-
 .../OnlinePlay/Playlists/PlaylistsReadyButton.cs   |  4 ++--
 .../OnlinePlay/Playlists/PlaylistsResultsScreen.cs |  2 +-
 .../OnlinePlay/Playlists/PlaylistsRoomManager.cs   |  4 ++--
 .../OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs | 10 +++++-----
 osu.Game/Screens/Play/Spectator.cs                 |  2 +-
 osu.Game/Screens/Select/MatchSongSelect.cs         |  4 ++--
 .../Visual/Multiplayer/MultiplayerTestScene.cs     |  4 ++--
 .../Multiplayer/TestMultiplayerRoomContainer.cs    |  4 ++--
 .../Multiplayer/TestMultiplayerRoomManager.cs      |  4 ++--
 109 files changed, 176 insertions(+), 176 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/RoomManagerTestScene.cs b/osu.Game.Tests/Visual/Multiplayer/RoomManagerTestScene.cs
index a2c496a504..c665a57452 100644
--- a/osu.Game.Tests/Visual/Multiplayer/RoomManagerTestScene.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/RoomManagerTestScene.cs
@@ -6,7 +6,7 @@ using osu.Framework.Allocation;
 using osu.Game.Beatmaps;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
-using osu.Game.Screens.Multi;
+using osu.Game.Screens.OnlinePlay;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs b/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs
index 7d9d4a6542..1785c99784 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestRoomManager.cs
@@ -4,7 +4,7 @@
 using System;
 using osu.Framework.Bindables;
 using osu.Game.Online.Rooms;
-using osu.Game.Screens.Multi;
+using osu.Game.Screens.OnlinePlay;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
index 722e1a50ef..65c0cfd328 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
@@ -18,7 +18,7 @@ using osu.Game.Overlays;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
-using osu.Game.Screens.Multi;
+using osu.Game.Screens.OnlinePlay;
 using osu.Game.Tests.Beatmaps;
 using osuTK;
 using osuTK.Input;
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
index f58e1114b8..9f24347ae9 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
@@ -5,7 +5,7 @@ using System;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Online.Rooms.RoomStatuses;
-using osu.Game.Screens.Multi.Lounge.Components;
+using osu.Game.Screens.OnlinePlay.Lounge.Components;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
index 9b6a6de7c2..279dcfa584 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
@@ -9,7 +9,7 @@ using osu.Game.Graphics;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets.Catch;
 using osu.Game.Rulesets.Osu;
-using osu.Game.Screens.Multi.Lounge.Components;
+using osu.Game.Screens.OnlinePlay.Lounge.Components;
 using osuTK.Graphics;
 using osuTK.Input;
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
index 571330f50e..9ad9f2c883 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
@@ -9,7 +9,7 @@ using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
-using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Tests.Beatmaps;
 using osuTK;
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
index 61968dce46..7cdc6b1a7d 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
@@ -6,7 +6,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
-using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Screens.OnlinePlay.Match.Components;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs
index 71b8ad05ee..64eaf0556b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs
@@ -7,7 +7,7 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Online.API;
-using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Screens.OnlinePlay.Match.Components;
 using osu.Game.Users;
 using osuTK;
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
index 157597e800..e0fd7d9874 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
@@ -18,7 +18,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
-using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Screens.Select;
 
 namespace osu.Game.Tests.Visual.Multiplayer
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs
index 0ccd882d95..089de223fc 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs
@@ -5,7 +5,7 @@ using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Screens;
 using osu.Game.Screens;
-using osu.Game.Screens.Multi;
+using osu.Game.Screens.OnlinePlay;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
index 5c07b9d0ea..2e39471dc0 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
-using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
@@ -39,7 +39,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("room has 1 user", () => Client.Room?.Users.Count == 1);
         }
 
-        private class TestMultiplayer : Screens.Multi.Multiplayer.Multiplayer
+        private class TestMultiplayer : Screens.OnlinePlay.Multiplayer.Multiplayer
         {
             protected override RoomManager CreateRoomManager() => new TestMultiplayerRoomManager();
         }
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
index 6dc26dae57..8869718fd1 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
@@ -7,8 +7,8 @@ using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets.Osu;
-using osu.Game.Screens.Multi.Multiplayer;
-using osu.Game.Screens.Multi.Multiplayer.Match;
+using osu.Game.Screens.OnlinePlay.Multiplayer;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
 using osu.Game.Tests.Beatmaps;
 using osuTK.Input;
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index ee2fa4ef5a..9181170bee 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
@@ -8,7 +8,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Screens.Multi.Multiplayer.Participants;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Participants;
 using osu.Game.Users;
 using osuTK;
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
index c8ebdb1b76..6b11613f1c 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
@@ -12,7 +12,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
-using osu.Game.Screens.Multi.Multiplayer.Match;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
 using osu.Game.Tests.Resources;
 using osu.Game.Users;
 using osuTK;
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs
index 7140050bd5..cec40635f3 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs
@@ -6,7 +6,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Online.Rooms;
 using osu.Game.Online.Rooms.RoomStatuses;
-using osu.Game.Screens.Multi.Lounge.Components;
+using osu.Game.Screens.OnlinePlay.Lounge.Components;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index ac63c89183..8480e6eaaa 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -107,14 +107,14 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestExitMultiWithEscape()
         {
-            PushAndConfirm(() => new Screens.Multi.Playlists.Playlists());
+            PushAndConfirm(() => new Screens.OnlinePlay.Playlists.Playlists());
             exitViaEscapeAndConfirm();
         }
 
         [Test]
         public void TestExitMultiWithBackButton()
         {
-            PushAndConfirm(() => new Screens.Multi.Playlists.Playlists());
+            PushAndConfirm(() => new Screens.OnlinePlay.Playlists.Playlists());
             exitViaBackButtonAndConfirm();
         }
 
diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsFilterControl.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsFilterControl.cs
index 66992b27a2..40e191dd7e 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsFilterControl.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsFilterControl.cs
@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
-using osu.Game.Screens.Multi.Lounge.Components;
+using osu.Game.Screens.OnlinePlay.Lounge.Components;
 
 namespace osu.Game.Tests.Visual.Playlists
 {
diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsLoungeSubScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsLoungeSubScreen.cs
index 04555857f5..008c862cc3 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsLoungeSubScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsLoungeSubScreen.cs
@@ -8,9 +8,9 @@ using osu.Framework.Graphics;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Graphics.Containers;
-using osu.Game.Screens.Multi.Lounge;
-using osu.Game.Screens.Multi.Lounge.Components;
-using osu.Game.Screens.Multi.Playlists;
+using osu.Game.Screens.OnlinePlay.Lounge;
+using osu.Game.Screens.OnlinePlay.Lounge.Components;
+using osu.Game.Screens.OnlinePlay.Playlists;
 using osu.Game.Tests.Visual.Multiplayer;
 
 namespace osu.Game.Tests.Visual.Playlists
diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsMatchSettingsOverlay.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsMatchSettingsOverlay.cs
index 4e75619f13..44a79b6598 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsMatchSettingsOverlay.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsMatchSettingsOverlay.cs
@@ -10,8 +10,8 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Rooms;
-using osu.Game.Screens.Multi;
-using osu.Game.Screens.Multi.Playlists;
+using osu.Game.Screens.OnlinePlay;
+using osu.Game.Screens.OnlinePlay.Playlists;
 
 namespace osu.Game.Tests.Visual.Playlists
 {
diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsParticipantsList.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsParticipantsList.cs
index 5a0f196df9..8dd81e02e2 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsParticipantsList.cs
@@ -3,7 +3,7 @@
 
 using NUnit.Framework;
 using osu.Framework.Graphics;
-using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Playlists
diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
index 97bb48c7b5..cdcded8f61 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
@@ -19,7 +19,7 @@ using osu.Game.Online.Rooms;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
-using osu.Game.Screens.Multi.Playlists;
+using osu.Game.Screens.OnlinePlay.Playlists;
 using osu.Game.Screens.Ranking;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Users;
diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs
index 96ff93a145..a4c87d3ace 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs
@@ -15,9 +15,9 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
-using osu.Game.Screens.Multi;
-using osu.Game.Screens.Multi.Match.Components;
-using osu.Game.Screens.Multi.Playlists;
+using osu.Game.Screens.OnlinePlay;
+using osu.Game.Screens.OnlinePlay.Match.Components;
+using osu.Game.Screens.OnlinePlay.Playlists;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Users;
 using osuTK.Input;
diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsScreen.cs
index b780eb5347..e52f823f0b 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsScreen.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Tests.Visual.Playlists
 
         public TestScenePlaylistsScreen()
         {
-            var multi = new Screens.Multi.Playlists.Playlists();
+            var multi = new Screens.OnlinePlay.Playlists.Playlists();
 
             AddStep("show", () => LoadScreen(multi));
             AddUntilStep("wait for loaded", () => multi.IsLoaded);
diff --git a/osu.Game/Online/Rooms/GetRoomsRequest.cs b/osu.Game/Online/Rooms/GetRoomsRequest.cs
index 5084b8627f..e45365797a 100644
--- a/osu.Game/Online/Rooms/GetRoomsRequest.cs
+++ b/osu.Game/Online/Rooms/GetRoomsRequest.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Humanizer;
 using osu.Framework.IO.Network;
 using osu.Game.Online.API;
-using osu.Game.Screens.Multi.Lounge.Components;
+using osu.Game.Screens.OnlinePlay.Lounge.Components;
 
 namespace osu.Game.Online.Rooms
 {
diff --git a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
index d39a81f5e8..c89699f2ee 100644
--- a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
@@ -11,7 +11,7 @@ using osu.Framework.Screens;
 using osu.Game.Database;
 using osu.Game.Online.API;
 using osu.Game.Online.Spectator;
-using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Screens.OnlinePlay.Match.Components;
 using osu.Game.Screens.Play;
 using osu.Game.Users;
 using osuTK;
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index aeb58a75fc..9d5720ff34 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -17,8 +17,8 @@ using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Edit;
-using osu.Game.Screens.Multi.Multiplayer;
-using osu.Game.Screens.Multi.Playlists;
+using osu.Game.Screens.OnlinePlay.Multiplayer;
+using osu.Game.Screens.OnlinePlay.Playlists;
 using osu.Game.Screens.Select;
 
 namespace osu.Game.Screens.Menu
diff --git a/osu.Game/Screens/OnlinePlay/Components/BeatmapDetailAreaPlaylistTabItem.cs b/osu.Game/Screens/OnlinePlay/Components/BeatmapDetailAreaPlaylistTabItem.cs
index 3f2ab28f1a..fb927411e6 100644
--- a/osu.Game/Screens/OnlinePlay/Components/BeatmapDetailAreaPlaylistTabItem.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/BeatmapDetailAreaPlaylistTabItem.cs
@@ -3,7 +3,7 @@
 
 using osu.Game.Screens.Select;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     public class BeatmapDetailAreaPlaylistTabItem : BeatmapDetailAreaTabItem
     {
diff --git a/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs b/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
index 9e7a59d7d2..bc355d18a9 100644
--- a/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
@@ -10,7 +10,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.Chat;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     public class BeatmapTitle : MultiplayerComposite
     {
diff --git a/osu.Game/Screens/OnlinePlay/Components/BeatmapTypeInfo.cs b/osu.Game/Screens/OnlinePlay/Components/BeatmapTypeInfo.cs
index ce3b612262..434d7b75ed 100644
--- a/osu.Game/Screens/OnlinePlay/Components/BeatmapTypeInfo.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/BeatmapTypeInfo.cs
@@ -9,7 +9,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     public class BeatmapTypeInfo : MultiplayerComposite
     {
diff --git a/osu.Game/Screens/OnlinePlay/Components/DisableableTabControl.cs b/osu.Game/Screens/OnlinePlay/Components/DisableableTabControl.cs
index 27b5aec4d3..bbc407e926 100644
--- a/osu.Game/Screens/OnlinePlay/Components/DisableableTabControl.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/DisableableTabControl.cs
@@ -5,7 +5,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     public abstract class DisableableTabControl<T> : TabControl<T>
     {
diff --git a/osu.Game/Screens/OnlinePlay/Components/DrawableGameType.cs b/osu.Game/Screens/OnlinePlay/Components/DrawableGameType.cs
index 38af6d065e..c4dc2a2b8f 100644
--- a/osu.Game/Screens/OnlinePlay/Components/DrawableGameType.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/DrawableGameType.cs
@@ -10,7 +10,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Online.Rooms;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     public class DrawableGameType : CircularContainer, IHasTooltip
     {
diff --git a/osu.Game/Screens/OnlinePlay/Components/ListingPollingComponent.cs b/osu.Game/Screens/OnlinePlay/Components/ListingPollingComponent.cs
index edce5400d1..e50784fcbe 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ListingPollingComponent.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ListingPollingComponent.cs
@@ -5,9 +5,9 @@ using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Online.Rooms;
-using osu.Game.Screens.Multi.Lounge.Components;
+using osu.Game.Screens.OnlinePlay.Lounge.Components;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     /// <summary>
     /// A <see cref="RoomPollingComponent"/> that polls for the lounge listing.
diff --git a/osu.Game/Screens/OnlinePlay/Components/MatchBeatmapDetailArea.cs b/osu.Game/Screens/OnlinePlay/Components/MatchBeatmapDetailArea.cs
index 6997840c92..b013cbafd8 100644
--- a/osu.Game/Screens/OnlinePlay/Components/MatchBeatmapDetailArea.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/MatchBeatmapDetailArea.cs
@@ -12,7 +12,7 @@ using osu.Game.Online.Rooms;
 using osu.Game.Screens.Select;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     public class MatchBeatmapDetailArea : BeatmapDetailArea
     {
diff --git a/osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs b/osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs
index f07bd8c3b2..719afcdd33 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs
@@ -8,7 +8,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps.Drawables;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     public class ModeTypeInfo : MultiplayerComposite
     {
diff --git a/osu.Game/Screens/OnlinePlay/Components/MultiplayerBackgroundSprite.cs b/osu.Game/Screens/OnlinePlay/Components/MultiplayerBackgroundSprite.cs
index 2240e55e2f..45e2c553e7 100644
--- a/osu.Game/Screens/OnlinePlay/Components/MultiplayerBackgroundSprite.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/MultiplayerBackgroundSprite.cs
@@ -6,7 +6,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps.Drawables;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     public class MultiplayerBackgroundSprite : MultiplayerComposite
     {
diff --git a/osu.Game/Screens/OnlinePlay/Components/OverlinedHeader.cs b/osu.Game/Screens/OnlinePlay/Components/OverlinedHeader.cs
index 7ec20c8cae..c78dfef592 100644
--- a/osu.Game/Screens/OnlinePlay/Components/OverlinedHeader.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/OverlinedHeader.cs
@@ -10,7 +10,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     /// <summary>
     /// A header used in the multiplayer interface which shows text / details beneath a line.
diff --git a/osu.Game/Screens/OnlinePlay/Components/OverlinedPlaylistHeader.cs b/osu.Game/Screens/OnlinePlay/Components/OverlinedPlaylistHeader.cs
index ebebe8b660..45b822d20a 100644
--- a/osu.Game/Screens/OnlinePlay/Components/OverlinedPlaylistHeader.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/OverlinedPlaylistHeader.cs
@@ -3,7 +3,7 @@
 
 using osu.Game.Online.Rooms;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     public class OverlinedPlaylistHeader : OverlinedHeader
     {
diff --git a/osu.Game/Screens/OnlinePlay/Components/ParticipantCountDisplay.cs b/osu.Game/Screens/OnlinePlay/Components/ParticipantCountDisplay.cs
index 498eeb09b3..357974adfc 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ParticipantCountDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ParticipantCountDisplay.cs
@@ -7,7 +7,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     public class ParticipantCountDisplay : MultiplayerComposite
     {
diff --git a/osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs b/osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs
index 6ea4283379..5184f873f3 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs
@@ -6,7 +6,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Containers;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     public class ParticipantsDisplay : MultiplayerComposite
     {
diff --git a/osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs b/osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs
index 7978b4eaab..b5019b4cdc 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs
@@ -12,7 +12,7 @@ using osu.Game.Users;
 using osu.Game.Users.Drawables;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     public class ParticipantsList : MultiplayerComposite
     {
diff --git a/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs b/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
index 68df30965d..08f89d8ed8 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
@@ -11,7 +11,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Rooms;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     public abstract class ReadyButton : TriangleButton
     {
diff --git a/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs b/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
index 7e0c8c4ec5..2ed259e2b8 100644
--- a/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
@@ -15,7 +15,7 @@ using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     public abstract class RoomManager : CompositeDrawable, IRoomManager
     {
diff --git a/osu.Game/Screens/OnlinePlay/Components/RoomPollingComponent.cs b/osu.Game/Screens/OnlinePlay/Components/RoomPollingComponent.cs
index 1d10277d1c..b2ea3a05d6 100644
--- a/osu.Game/Screens/OnlinePlay/Components/RoomPollingComponent.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/RoomPollingComponent.cs
@@ -8,7 +8,7 @@ using osu.Game.Online;
 using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     public abstract class RoomPollingComponent : PollingComponent
     {
diff --git a/osu.Game/Screens/OnlinePlay/Components/RoomStatusInfo.cs b/osu.Game/Screens/OnlinePlay/Components/RoomStatusInfo.cs
index 89021691f3..58cb25f30e 100644
--- a/osu.Game/Screens/OnlinePlay/Components/RoomStatusInfo.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/RoomStatusInfo.cs
@@ -11,7 +11,7 @@ using osu.Game.Graphics;
 using osu.Game.Online.Rooms;
 using osu.Game.Online.Rooms.RoomStatuses;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     public class RoomStatusInfo : MultiplayerComposite
     {
diff --git a/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs b/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs
index 3050765931..0eec155060 100644
--- a/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs
@@ -7,7 +7,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Online.Rooms;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     /// <summary>
     /// A <see cref="RoomPollingComponent"/> that polls for the currently-selected room.
diff --git a/osu.Game/Screens/OnlinePlay/Components/StatusColouredContainer.cs b/osu.Game/Screens/OnlinePlay/Components/StatusColouredContainer.cs
index 68c14eeb15..760de354dc 100644
--- a/osu.Game/Screens/OnlinePlay/Components/StatusColouredContainer.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/StatusColouredContainer.cs
@@ -8,7 +8,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Online.Rooms;
 
-namespace osu.Game.Screens.Multi.Components
+namespace osu.Game.Screens.OnlinePlay.Components
 {
     public class StatusColouredContainer : Container
     {
diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylist.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylist.cs
index 956d38a90e..a08d9edb34 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylist.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylist.cs
@@ -10,7 +10,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Online.Rooms;
 using osuTK;
 
-namespace osu.Game.Screens.Multi
+namespace osu.Game.Screens.OnlinePlay
 {
     public class DrawableRoomPlaylist : OsuRearrangeableListContainer<PlaylistItem>
     {
diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index a2aeae154a..e3bce4029f 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -29,7 +29,7 @@ using osu.Game.Screens.Play.HUD;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.Multi
+namespace osu.Game.Screens.OnlinePlay
 {
     public class DrawableRoomPlaylistItem : OsuRearrangeableListItem<PlaylistItem>
     {
diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistWithResults.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistWithResults.cs
index fa241a3c42..575f336e58 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistWithResults.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistWithResults.cs
@@ -13,7 +13,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Rooms;
 
-namespace osu.Game.Screens.Multi
+namespace osu.Game.Screens.OnlinePlay
 {
     public class DrawableRoomPlaylistWithResults : DrawableRoomPlaylist
     {
diff --git a/osu.Game/Screens/OnlinePlay/Header.cs b/osu.Game/Screens/OnlinePlay/Header.cs
index 637d8bb52b..bffd744fdc 100644
--- a/osu.Game/Screens/OnlinePlay/Header.cs
+++ b/osu.Game/Screens/OnlinePlay/Header.cs
@@ -10,13 +10,13 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Screens;
 using osu.Game.Graphics;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.Multi
+namespace osu.Game.Screens.OnlinePlay
 {
     public class Header : Container
     {
diff --git a/osu.Game/Screens/OnlinePlay/IMultiplayerSubScreen.cs b/osu.Game/Screens/OnlinePlay/IMultiplayerSubScreen.cs
index 31ee123f83..fc149cd2b2 100644
--- a/osu.Game/Screens/OnlinePlay/IMultiplayerSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/IMultiplayerSubScreen.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.
 
-namespace osu.Game.Screens.Multi
+namespace osu.Game.Screens.OnlinePlay
 {
     public interface IMultiplayerSubScreen : IOsuScreen
     {
diff --git a/osu.Game/Screens/OnlinePlay/IRoomManager.cs b/osu.Game/Screens/OnlinePlay/IRoomManager.cs
index eee2a223a1..8ff02536f3 100644
--- a/osu.Game/Screens/OnlinePlay/IRoomManager.cs
+++ b/osu.Game/Screens/OnlinePlay/IRoomManager.cs
@@ -6,7 +6,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Online.Rooms;
 
-namespace osu.Game.Screens.Multi
+namespace osu.Game.Screens.OnlinePlay
 {
     [Cached(typeof(IRoomManager))]
     public interface IRoomManager
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
index 6e4d8b46ed..6d37a483a9 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
@@ -9,22 +9,22 @@ 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.Effects;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.UserInterface;
 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.Screens.Multi.Components;
+using osu.Game.Online.Rooms;
+using osu.Game.Screens.OnlinePlay.Components;
 using osuTK;
 using osuTK.Graphics;
-using osu.Framework.Graphics.Cursor;
-using osu.Framework.Graphics.UserInterface;
-using osu.Game.Online.Rooms;
 
-namespace osu.Game.Screens.Multi.Lounge.Components
+namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
     public class DrawableRoom : OsuClickableContainer, IStateful<SelectionState>, IFilterable, IHasContextMenu
     {
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/FilterControl.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/FilterControl.cs
index 3712cbe33e..7fc1c670ca 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/FilterControl.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/FilterControl.cs
@@ -12,7 +12,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.Multi.Lounge.Components
+namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
     public abstract class FilterControl : CompositeDrawable
     {
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/FilterCriteria.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/FilterCriteria.cs
index 7b04be86b1..488af5d4de 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/FilterCriteria.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/FilterCriteria.cs
@@ -3,7 +3,7 @@
 
 using osu.Game.Rulesets;
 
-namespace osu.Game.Screens.Multi.Lounge.Components
+namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
     public class FilterCriteria
     {
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/ParticipantInfo.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/ParticipantInfo.cs
index 4152a9a3b2..895c0e3eda 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/ParticipantInfo.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/ParticipantInfo.cs
@@ -11,7 +11,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Users.Drawables;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Lounge.Components
+namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
     public class ParticipantInfo : MultiplayerComposite
     {
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/PlaylistsFilterControl.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/PlaylistsFilterControl.cs
index 3c55c3c43f..a463742097 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/PlaylistsFilterControl.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/PlaylistsFilterControl.cs
@@ -5,7 +5,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterface;
 
-namespace osu.Game.Screens.Multi.Lounge.Components
+namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
     public class PlaylistsFilterControl : FilterControl
     {
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInfo.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInfo.cs
index e6f6ce5ed2..8552d425aa 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInfo.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInfo.cs
@@ -6,10 +6,10 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
-using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.OnlinePlay.Components;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Lounge.Components
+namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
     public class RoomInfo : MultiplayerComposite
     {
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInspector.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInspector.cs
index dfee278e87..4b1ec9ae89 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInspector.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInspector.cs
@@ -7,10 +7,10 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
-using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.OnlinePlay.Components;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.Multi.Lounge.Components
+namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
     public class RoomInspector : MultiplayerComposite
     {
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusFilter.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusFilter.cs
index 9da938ac8b..0c8dc8832b 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusFilter.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusFilter.cs
@@ -3,7 +3,7 @@
 
 using System.ComponentModel;
 
-namespace osu.Game.Screens.Multi.Lounge.Components
+namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
     public enum RoomStatusFilter
     {
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
index fbd5f44a30..f70c33babe 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
@@ -13,13 +13,13 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Threading;
 using osu.Game.Extensions;
+using osu.Game.Graphics.Cursor;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
-using osuTK;
-using osu.Game.Graphics.Cursor;
 using osu.Game.Online.Rooms;
+using osuTK;
 
-namespace osu.Game.Screens.Multi.Lounge.Components
+namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
     public class RoomsContainer : CompositeDrawable, IKeyBindingHandler<GlobalAction>
     {
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
index cbab79e2ab..cc56c11d32 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
@@ -12,11 +12,11 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
-using osu.Game.Screens.Multi.Lounge.Components;
-using osu.Game.Screens.Multi.Match;
+using osu.Game.Screens.OnlinePlay.Lounge.Components;
+using osu.Game.Screens.OnlinePlay.Match;
 using osu.Game.Users;
 
-namespace osu.Game.Screens.Multi.Lounge
+namespace osu.Game.Screens.OnlinePlay.Lounge
 {
     [Cached]
     public abstract class LoungeSubScreen : MultiplayerSubScreen
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/Footer.cs b/osu.Game/Screens/OnlinePlay/Match/Components/Footer.cs
index 7074ceca38..5c27d78d50 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/Footer.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/Footer.cs
@@ -10,10 +10,10 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Online.Rooms;
-using osu.Game.Screens.Multi.Playlists;
+using osu.Game.Screens.OnlinePlay.Playlists;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Match.Components
+namespace osu.Game.Screens.OnlinePlay.Match.Components
 {
     public class Footer : CompositeDrawable
     {
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/GameTypePicker.cs b/osu.Game/Screens/OnlinePlay/Match/Components/GameTypePicker.cs
index 23a3da6e38..cca1f84bbb 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/GameTypePicker.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/GameTypePicker.cs
@@ -10,10 +10,10 @@ using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Online.Rooms;
 using osu.Game.Online.Rooms.GameTypes;
-using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.OnlinePlay.Components;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Match.Components
+namespace osu.Game.Screens.OnlinePlay.Match.Components
 {
     public class GameTypePicker : DisableableTabControl<GameType>
     {
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/Header.cs b/osu.Game/Screens/OnlinePlay/Match/Components/Header.cs
index 134a0b3f2e..df0dfc6ec1 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/Header.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/Header.cs
@@ -10,7 +10,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Users.Drawables;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Match.Components
+namespace osu.Game.Screens.OnlinePlay.Match.Components
 {
     public class Header : MultiplayerComposite
     {
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
index b790ad9be5..8800215c2e 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
@@ -6,7 +6,7 @@ using osu.Framework.Bindables;
 using osu.Game.Online.Chat;
 using osu.Game.Online.Rooms;
 
-namespace osu.Game.Screens.Multi.Match.Components
+namespace osu.Game.Screens.OnlinePlay.Match.Components
 {
     public class MatchChatDisplay : StandAloneChatDisplay
     {
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboard.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboard.cs
index 8cc7b62f98..50869f42ff 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboard.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboard.cs
@@ -10,7 +10,7 @@ using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Leaderboards;
 using osu.Game.Online.Rooms;
 
-namespace osu.Game.Screens.Multi.Match.Components
+namespace osu.Game.Screens.OnlinePlay.Match.Components
 {
     public class MatchLeaderboard : Leaderboard<MatchLeaderboardScope, APIUserScoreAggregate>
     {
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboardScore.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboardScore.cs
index 1fabdbb86a..e8f5b1e826 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboardScore.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboardScore.cs
@@ -8,7 +8,7 @@ using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Leaderboards;
 using osu.Game.Scoring;
 
-namespace osu.Game.Screens.Multi.Match.Components
+namespace osu.Game.Screens.OnlinePlay.Match.Components
 {
     public class MatchLeaderboardScore : LeaderboardScore
     {
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs
index 0bb56d0cdf..998ab889d6 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs
@@ -10,7 +10,7 @@ using osu.Game.Graphics.UserInterface;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.Multi.Match.Components
+namespace osu.Game.Screens.OnlinePlay.Match.Components
 {
     public abstract class MatchSettingsOverlay : FocusedOverlayContainer
     {
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/PurpleTriangleButton.cs b/osu.Game/Screens/OnlinePlay/Match/Components/PurpleTriangleButton.cs
index 1d93116d07..28e8961a9a 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/PurpleTriangleButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/PurpleTriangleButton.cs
@@ -5,7 +5,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Game.Graphics.UserInterface;
 
-namespace osu.Game.Screens.Multi.Match.Components
+namespace osu.Game.Screens.OnlinePlay.Match.Components
 {
     public class PurpleTriangleButton : TriangleButton
     {
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/RoomAvailabilityPicker.cs b/osu.Game/Screens/OnlinePlay/Match/Components/RoomAvailabilityPicker.cs
index 2292826d55..677a5be0d9 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/RoomAvailabilityPicker.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/RoomAvailabilityPicker.cs
@@ -11,11 +11,11 @@ using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.Rooms;
-using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.OnlinePlay.Components;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.Multi.Match.Components
+namespace osu.Game.Screens.OnlinePlay.Match.Components
 {
     public class RoomAvailabilityPicker : DisableableTabControl<RoomAvailability>
     {
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index b626156852..2b0035c8bc 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -15,7 +15,7 @@ using osu.Game.Overlays;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Play;
 
-namespace osu.Game.Screens.Multi.Match
+namespace osu.Game.Screens.OnlinePlay.Match
 {
     [Cached(typeof(IPreviewTrackOwner))]
     public abstract class RoomSubScreen : MultiplayerSubScreen, IPreviewTrackOwner
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
index b8b3f15fca..163efd9c20 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
@@ -4,9 +4,9 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Screens.OnlinePlay.Match.Components;
 
-namespace osu.Game.Screens.Multi.Multiplayer
+namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
     public class CreateMultiplayerMatchButton : PurpleTriangleButton
     {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
index dfb6feeaf9..1718ebd83a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
@@ -9,9 +9,9 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Screens;
 using osu.Game.Online.API;
-using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Screens.OnlinePlay.Match.Components;
 
-namespace osu.Game.Screens.Multi.Multiplayer.Match
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 {
     public class BeatmapSelectionControl : MultiplayerComposite
     {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
index 145ae18817..a52f62fe00 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
@@ -11,7 +11,7 @@ using osu.Game.Graphics;
 using osu.Game.Online.Rooms;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Multiplayer.Match
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 {
     public class MultiplayerMatchFooter : CompositeDrawable
     {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchHeader.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchHeader.cs
index 0c0e580a3e..42e34c4be3 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchHeader.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchHeader.cs
@@ -10,14 +10,14 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.API;
-using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Screens.OnlinePlay.Match.Components;
 using osu.Game.Users.Drawables;
 using osuTK;
 using FontWeight = osu.Game.Graphics.FontWeight;
 using OsuColour = osu.Game.Graphics.OsuColour;
 using OsuFont = osu.Game.Graphics.OsuFont;
 
-namespace osu.Game.Screens.Multi.Multiplayer.Match
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 {
     public class MultiplayerMatchHeader : MultiplayerComposite
     {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
index 4a5b5fd181..8741b0323d 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
@@ -18,10 +18,10 @@ using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
 using osu.Game.Rulesets;
-using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Screens.OnlinePlay.Match.Components;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Multiplayer.Match
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 {
     public class MultiplayerMatchSettingsOverlay : MatchSettingsOverlay
     {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
index cea1eeecbb..15d6ef8aff 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -15,10 +15,10 @@ using osu.Game.Graphics.Backgrounds;
 using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
-using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.OnlinePlay.Components;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Multiplayer.Match
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 {
     public class MultiplayerReadyButton : MultiplayerRoomComposite
     {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
index 76aa6b9f8f..ce4918dae1 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
@@ -8,10 +8,10 @@ using osu.Game.Extensions;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
-using osu.Game.Screens.Multi.Components;
-using osu.Game.Screens.Multi.Lounge;
+using osu.Game.Screens.OnlinePlay.Components;
+using osu.Game.Screens.OnlinePlay.Lounge;
 
-namespace osu.Game.Screens.Multi.Multiplayer
+namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
     public class Multiplayer : MultiplayerScreen
     {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerFilterControl.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerFilterControl.cs
index bebad1944e..37e0fd109a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerFilterControl.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerFilterControl.cs
@@ -1,9 +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.Screens.Multi.Lounge.Components;
+using osu.Game.Screens.OnlinePlay.Lounge.Components;
 
-namespace osu.Game.Screens.Multi.Multiplayer
+namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
     public class MultiplayerFilterControl : FilterControl
     {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs
index ffc81efe3c..0a9a3f680f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs
@@ -5,11 +5,11 @@ using osu.Framework.Allocation;
 using osu.Framework.Logging;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
-using osu.Game.Screens.Multi.Lounge;
-using osu.Game.Screens.Multi.Lounge.Components;
-using osu.Game.Screens.Multi.Match;
+using osu.Game.Screens.OnlinePlay.Lounge;
+using osu.Game.Screens.OnlinePlay.Lounge.Components;
+using osu.Game.Screens.OnlinePlay.Match;
 
-namespace osu.Game.Screens.Multi.Multiplayer
+namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
     public class MultiplayerLoungeSubScreen : LoungeSubScreen
     {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index ed1321d4e2..76869300e8 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -13,7 +13,7 @@ using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Screens.Select;
 
-namespace osu.Game.Screens.Multi.Multiplayer
+namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
     public class MultiplayerMatchSongSelect : SongSelect, IMultiplayerSubScreen
     {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 4e371d4ed4..58314c3774 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -11,15 +11,15 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
-using osu.Game.Screens.Multi.Components;
-using osu.Game.Screens.Multi.Match;
-using osu.Game.Screens.Multi.Match.Components;
-using osu.Game.Screens.Multi.Multiplayer.Match;
-using osu.Game.Screens.Multi.Multiplayer.Participants;
+using osu.Game.Screens.OnlinePlay.Components;
+using osu.Game.Screens.OnlinePlay.Match;
+using osu.Game.Screens.OnlinePlay.Match.Components;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Participants;
 using osu.Game.Users;
-using ParticipantsList = osu.Game.Screens.Multi.Multiplayer.Participants.ParticipantsList;
+using ParticipantsList = osu.Game.Screens.OnlinePlay.Multiplayer.Participants.ParticipantsList;
 
-namespace osu.Game.Screens.Multi.Multiplayer
+namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
     [Cached]
     public class MultiplayerMatchSubScreen : RoomSubScreen
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index 32d95aa11f..4247e954bd 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -11,13 +11,13 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Scoring;
-using osu.Game.Screens.Multi.Playlists;
+using osu.Game.Screens.OnlinePlay.Playlists;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Ranking;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Multiplayer
+namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
     // Todo: The "room" part of PlaylistsPlayer should be split out into an abstract player class to be inherited instead.
     public class MultiplayerPlayer : PlaylistsPlayer
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs
index 3e39473954..e3b47b3254 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs
@@ -3,9 +3,9 @@
 
 using osu.Game.Online.Rooms;
 using osu.Game.Scoring;
-using osu.Game.Screens.Multi.Playlists;
+using osu.Game.Screens.OnlinePlay.Playlists;
 
-namespace osu.Game.Screens.Multi.Multiplayer
+namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
     public class MultiplayerResultsScreen : PlaylistsResultsScreen
     {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs
index 6fe7c10bfb..654dafe9aa 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs
@@ -5,7 +5,7 @@ using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Game.Online.Multiplayer;
 
-namespace osu.Game.Screens.Multi.Multiplayer
+namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
     public abstract class MultiplayerRoomComposite : MultiplayerComposite
     {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
index fdd46cdc2a..3cb263298f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
@@ -13,9 +13,9 @@ using osu.Game.Extensions;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Online.Rooms.RoomStatuses;
-using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.OnlinePlay.Components;
 
-namespace osu.Game.Screens.Multi.Multiplayer
+namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
     public class MultiplayerRoomManager : RoomManager
     {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index 93f8a9de8b..044afa7445 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -22,7 +22,7 @@ using osu.Game.Users.Drawables;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.Multi.Multiplayer.Participants
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 {
     public class ParticipantPanel : MultiplayerRoomComposite, IHasContextMenu
     {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsList.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsList.cs
index 3f37274d4c..b9ac096c4a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsList.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsList.cs
@@ -9,7 +9,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Multiplayer.Participants
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 {
     public class ParticipantsList : MultiplayerRoomComposite
     {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsListHeader.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsListHeader.cs
index dc3ceedfd7..6c1a55a0eb 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsListHeader.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsListHeader.cs
@@ -3,9 +3,9 @@
 
 using osu.Framework.Allocation;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.OnlinePlay.Components;
 
-namespace osu.Game.Screens.Multi.Multiplayer.Participants
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 {
     public class ParticipantsListHeader : OverlinedHeader
     {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
index 61faa0d85d..8d2879fc93 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
@@ -11,7 +11,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Online.Multiplayer;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Multiplayer.Participants
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 {
     public class StateDisplay : CompositeDrawable
     {
diff --git a/osu.Game/Screens/OnlinePlay/MultiplayerComposite.cs b/osu.Game/Screens/OnlinePlay/MultiplayerComposite.cs
index fe4ca759b0..ab54178ab4 100644
--- a/osu.Game/Screens/OnlinePlay/MultiplayerComposite.cs
+++ b/osu.Game/Screens/OnlinePlay/MultiplayerComposite.cs
@@ -8,7 +8,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Online.Rooms;
 using osu.Game.Users;
 
-namespace osu.Game.Screens.Multi
+namespace osu.Game.Screens.OnlinePlay
 {
     public class MultiplayerComposite : CompositeDrawable
     {
diff --git a/osu.Game/Screens/OnlinePlay/MultiplayerScreen.cs b/osu.Game/Screens/OnlinePlay/MultiplayerScreen.cs
index 983c7aeac9..3693e897ae 100644
--- a/osu.Game/Screens/OnlinePlay/MultiplayerScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/MultiplayerScreen.cs
@@ -17,14 +17,14 @@ using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
 using osu.Game.Screens.Menu;
-using osu.Game.Screens.Multi.Components;
-using osu.Game.Screens.Multi.Lounge;
-using osu.Game.Screens.Multi.Lounge.Components;
-using osu.Game.Screens.Multi.Match;
+using osu.Game.Screens.OnlinePlay.Components;
+using osu.Game.Screens.OnlinePlay.Lounge;
+using osu.Game.Screens.OnlinePlay.Lounge.Components;
+using osu.Game.Screens.OnlinePlay.Match;
 using osu.Game.Users;
 using osuTK;
 
-namespace osu.Game.Screens.Multi
+namespace osu.Game.Screens.OnlinePlay
 {
     [Cached]
     public abstract class MultiplayerScreen : OsuScreen
diff --git a/osu.Game/Screens/OnlinePlay/MultiplayerSubScreen.cs b/osu.Game/Screens/OnlinePlay/MultiplayerSubScreen.cs
index 8e46de1a95..d7fca98ebe 100644
--- a/osu.Game/Screens/OnlinePlay/MultiplayerSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/MultiplayerSubScreen.cs
@@ -5,7 +5,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Screens;
 
-namespace osu.Game.Screens.Multi
+namespace osu.Game.Screens.OnlinePlay
 {
     public abstract class MultiplayerSubScreen : OsuScreen, IMultiplayerSubScreen
     {
diff --git a/osu.Game/Screens/OnlinePlay/MultiplayerSubScreenStack.cs b/osu.Game/Screens/OnlinePlay/MultiplayerSubScreenStack.cs
index 3b0ed0dba1..335da86a65 100644
--- a/osu.Game/Screens/OnlinePlay/MultiplayerSubScreenStack.cs
+++ b/osu.Game/Screens/OnlinePlay/MultiplayerSubScreenStack.cs
@@ -3,7 +3,7 @@
 
 using osu.Framework.Screens;
 
-namespace osu.Game.Screens.Multi
+namespace osu.Game.Screens.OnlinePlay
 {
     public class MultiplayerSubScreenStack : OsuScreenStack
     {
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/CreatePlaylistsRoomButton.cs b/osu.Game/Screens/OnlinePlay/Playlists/CreatePlaylistsRoomButton.cs
index acee063115..fcb773f8be 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/CreatePlaylistsRoomButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/CreatePlaylistsRoomButton.cs
@@ -2,9 +2,9 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Screens.OnlinePlay.Match.Components;
 
-namespace osu.Game.Screens.Multi.Playlists
+namespace osu.Game.Screens.OnlinePlay.Playlists
 {
     public class CreatePlaylistsRoomButton : PurpleTriangleButton
     {
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs b/osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs
index da6aade942..a7fb391fbc 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs
@@ -5,11 +5,11 @@ using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Rooms;
-using osu.Game.Screens.Multi.Components;
-using osu.Game.Screens.Multi.Lounge;
-using osu.Game.Screens.Multi.Match;
+using osu.Game.Screens.OnlinePlay.Components;
+using osu.Game.Screens.OnlinePlay.Lounge;
+using osu.Game.Screens.OnlinePlay.Match;
 
-namespace osu.Game.Screens.Multi.Playlists
+namespace osu.Game.Screens.OnlinePlay.Playlists
 {
     public class Playlists : MultiplayerScreen
     {
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsLoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsLoungeSubScreen.cs
index 513854515b..bfbff4240c 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsLoungeSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsLoungeSubScreen.cs
@@ -2,11 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Online.Rooms;
-using osu.Game.Screens.Multi.Lounge;
-using osu.Game.Screens.Multi.Lounge.Components;
-using osu.Game.Screens.Multi.Match;
+using osu.Game.Screens.OnlinePlay.Lounge;
+using osu.Game.Screens.OnlinePlay.Lounge.Components;
+using osu.Game.Screens.OnlinePlay.Match;
 
-namespace osu.Game.Screens.Multi.Playlists
+namespace osu.Game.Screens.OnlinePlay.Playlists
 {
     public class PlaylistsLoungeSubScreen : LoungeSubScreen
     {
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
index f3109a33e4..557f1df657 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
@@ -16,10 +16,10 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
-using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Screens.OnlinePlay.Match.Components;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Playlists
+namespace osu.Game.Screens.OnlinePlay.Playlists
 {
     public class PlaylistsMatchSettingsOverlay : MatchSettingsOverlay
     {
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
index 25a3340ead..2c3e7a12e2 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
@@ -17,7 +17,7 @@ using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
 
-namespace osu.Game.Screens.Multi.Playlists
+namespace osu.Game.Screens.OnlinePlay.Playlists
 {
     public class PlaylistsPlayer : Player
     {
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsReadyButton.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsReadyButton.cs
index 3c35e2a6f3..edee8e571a 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsReadyButton.cs
@@ -6,9 +6,9 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Graphics;
 using osu.Game.Online.Rooms;
-using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.OnlinePlay.Components;
 
-namespace osu.Game.Screens.Multi.Playlists
+namespace osu.Game.Screens.OnlinePlay.Playlists
 {
     public class PlaylistsReadyButton : ReadyButton
     {
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsResultsScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsResultsScreen.cs
index 5d1d3a2724..e13c8a9f82 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsResultsScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsResultsScreen.cs
@@ -15,7 +15,7 @@ using osu.Game.Online.Rooms;
 using osu.Game.Scoring;
 using osu.Game.Screens.Ranking;
 
-namespace osu.Game.Screens.Multi.Playlists
+namespace osu.Game.Screens.OnlinePlay.Playlists
 {
     public class PlaylistsResultsScreen : ResultsScreen
     {
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomManager.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomManager.cs
index ae57eeddcc..c55d1c3e94 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomManager.cs
@@ -3,9 +3,9 @@
 
 using System.Collections.Generic;
 using osu.Framework.Bindables;
-using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.OnlinePlay.Components;
 
-namespace osu.Game.Screens.Multi.Playlists
+namespace osu.Game.Screens.OnlinePlay.Playlists
 {
     public class PlaylistsRoomManager : RoomManager
     {
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
index 4867268fe1..51a9ae569e 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
@@ -10,14 +10,14 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
 using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
-using osu.Game.Screens.Multi.Components;
-using osu.Game.Screens.Multi.Match;
-using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Screens.OnlinePlay.Components;
+using osu.Game.Screens.OnlinePlay.Match;
+using osu.Game.Screens.OnlinePlay.Match.Components;
 using osu.Game.Screens.Select;
 using osu.Game.Users;
-using Footer = osu.Game.Screens.Multi.Match.Components.Footer;
+using Footer = osu.Game.Screens.OnlinePlay.Match.Components.Footer;
 
-namespace osu.Game.Screens.Multi.Playlists
+namespace osu.Game.Screens.OnlinePlay.Playlists
 {
     public class PlaylistsRoomSubScreen : RoomSubScreen
     {
diff --git a/osu.Game/Screens/Play/Spectator.cs b/osu.Game/Screens/Play/Spectator.cs
index 71ce157296..28311f5113 100644
--- a/osu.Game/Screens/Play/Spectator.cs
+++ b/osu.Game/Screens/Play/Spectator.cs
@@ -30,7 +30,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Replays.Types;
 using osu.Game.Scoring;
-using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Screens.OnlinePlay.Match.Components;
 using osu.Game.Users;
 using osuTK;
 
diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index 80fd5c2067..1b89a58b40 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -10,8 +10,8 @@ using osu.Framework.Graphics;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Online.Rooms;
-using osu.Game.Screens.Multi;
-using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.OnlinePlay;
+using osu.Game.Screens.OnlinePlay.Components;
 
 namespace osu.Game.Screens.Select
 {
diff --git a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
index 0e23f4d8c6..da0e39d965 100644
--- a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
@@ -7,8 +7,8 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Screens.Multi;
-using osu.Game.Screens.Multi.Lounge.Components;
+using osu.Game.Screens.OnlinePlay;
+using osu.Game.Screens.OnlinePlay.Lounge.Components;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs
index 0df397d98e..ad3e2f7105 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs
@@ -6,8 +6,8 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Screens.Multi;
-using osu.Game.Screens.Multi.Lounge.Components;
+using osu.Game.Screens.OnlinePlay;
+using osu.Game.Screens.OnlinePlay.Lounge.Components;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs
index abfefd363a..5e12156f3c 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs
@@ -11,8 +11,8 @@ using osu.Game.Online.API.Requests;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
-using osu.Game.Screens.Multi.Lounge.Components;
-using osu.Game.Screens.Multi.Multiplayer;
+using osu.Game.Screens.OnlinePlay.Lounge.Components;
+using osu.Game.Screens.OnlinePlay.Multiplayer;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {

From 4caf75850b4faf18d62827fcb4e9b1b50f4f1b31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 17:00:00 +0100
Subject: [PATCH 0588/3722] Rename {Multiplayer -> OnlinePlay}Screen

---
 .../Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs     | 4 ++--
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs           | 4 ++--
 osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs       | 2 +-
 .../OnlinePlay/{MultiplayerScreen.cs => OnlinePlayScreen.cs} | 4 ++--
 osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs           | 2 +-
 .../Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs   | 5 +----
 6 files changed, 9 insertions(+), 12 deletions(-)
 rename osu.Game/Screens/OnlinePlay/{MultiplayerScreen.cs => OnlinePlayScreen.cs} (99%)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
index 6d37a483a9..f4d167a193 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
         private CachedModelDependencyContainer<Room> dependencies;
 
         [Resolved(canBeNull: true)]
-        private MultiplayerScreen multiplayer { get; set; }
+        private OnlinePlayScreen parentScreen { get; set; }
 
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
@@ -242,7 +242,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
         {
             new OsuMenuItem("Create copy", MenuItemType.Standard, () =>
             {
-                multiplayer?.OpenNewRoom(Room.CreateCopy());
+                parentScreen?.OpenNewRoom(Room.CreateCopy());
             })
         };
     }
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 2b0035c8bc..3a5af90824 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
         private BeatmapManager beatmapManager { get; set; }
 
         [Resolved(canBeNull: true)]
-        protected MultiplayerScreen Multiplayer { get; private set; }
+        protected OnlinePlayScreen ParentScreen { get; private set; }
 
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
 
@@ -88,7 +88,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
         protected void StartPlay(Func<Player> player)
         {
             sampleStart?.Play();
-            Multiplayer?.Push(new PlayerLoader(player));
+            ParentScreen?.Push(new PlayerLoader(player));
         }
 
         private void selectedItemChanged()
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
index ce4918dae1..76f5c74433 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
@@ -13,7 +13,7 @@ using osu.Game.Screens.OnlinePlay.Lounge;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
-    public class Multiplayer : MultiplayerScreen
+    public class Multiplayer : OnlinePlayScreen
     {
         [Resolved]
         private StatefulMultiplayerClient client { get; set; }
diff --git a/osu.Game/Screens/OnlinePlay/MultiplayerScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
similarity index 99%
rename from osu.Game/Screens/OnlinePlay/MultiplayerScreen.cs
rename to osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index 3693e897ae..08741ef4fe 100644
--- a/osu.Game/Screens/OnlinePlay/MultiplayerScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -27,7 +27,7 @@ using osuTK;
 namespace osu.Game.Screens.OnlinePlay
 {
     [Cached]
-    public abstract class MultiplayerScreen : OsuScreen
+    public abstract class OnlinePlayScreen : OsuScreen
     {
         public override bool CursorVisible => (screenStack.CurrentScreen as IMultiplayerSubScreen)?.CursorVisible ?? true;
 
@@ -67,7 +67,7 @@ namespace osu.Game.Screens.OnlinePlay
         private readonly Drawable header;
         private readonly Drawable headerBackground;
 
-        protected MultiplayerScreen()
+        protected OnlinePlayScreen()
         {
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs b/osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs
index a7fb391fbc..5b132c97fd 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs
@@ -11,7 +11,7 @@ using osu.Game.Screens.OnlinePlay.Match;
 
 namespace osu.Game.Screens.OnlinePlay.Playlists
 {
-    public class Playlists : MultiplayerScreen
+    public class Playlists : OnlinePlayScreen
     {
         protected override void UpdatePollingRate(bool isIdle)
         {
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
index 51a9ae569e..e76ca995bf 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
@@ -28,9 +28,6 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         [Resolved(typeof(Room), nameof(Room.RoomID))]
         private Bindable<int?> roomId { get; set; }
 
-        [Resolved(canBeNull: true)]
-        private MultiplayerScreen multiplayer { get; set; }
-
         private MatchSettingsOverlay settingsOverlay;
         private MatchLeaderboard leaderboard;
 
@@ -124,7 +121,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                                                                             RequestShowResults = item =>
                                                                             {
                                                                                 Debug.Assert(roomId.Value != null);
-                                                                                multiplayer?.Push(new PlaylistsResultsScreen(null, roomId.Value.Value, item, false));
+                                                                                ParentScreen?.Push(new PlaylistsResultsScreen(null, roomId.Value.Value, item, false));
                                                                             }
                                                                         }
                                                                     },

From eb0f125fefb5691e82c31a1730db1da323a0a095 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 17:00:31 +0100
Subject: [PATCH 0589/3722] Rename {Multiplayer -> OnlinePlay}SubScreenStack

---
 osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs                 | 2 +-
 ...MultiplayerSubScreenStack.cs => OnlinePlaySubScreenStack.cs} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename osu.Game/Screens/OnlinePlay/{MultiplayerSubScreenStack.cs => OnlinePlaySubScreenStack.cs} (93%)

diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index 08741ef4fe..66309bd47e 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -124,7 +124,7 @@ namespace osu.Game.Screens.OnlinePlay
                                     }
                                 }
                             },
-                            screenStack = new MultiplayerSubScreenStack { RelativeSizeAxes = Axes.Both }
+                            screenStack = new OnlinePlaySubScreenStack { RelativeSizeAxes = Axes.Both }
                         }
                     },
                     new Header(ScreenTitle, screenStack),
diff --git a/osu.Game/Screens/OnlinePlay/MultiplayerSubScreenStack.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySubScreenStack.cs
similarity index 93%
rename from osu.Game/Screens/OnlinePlay/MultiplayerSubScreenStack.cs
rename to osu.Game/Screens/OnlinePlay/OnlinePlaySubScreenStack.cs
index 335da86a65..7f2a0980c1 100644
--- a/osu.Game/Screens/OnlinePlay/MultiplayerSubScreenStack.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySubScreenStack.cs
@@ -5,7 +5,7 @@ using osu.Framework.Screens;
 
 namespace osu.Game.Screens.OnlinePlay
 {
-    public class MultiplayerSubScreenStack : OsuScreenStack
+    public class OnlinePlaySubScreenStack : OsuScreenStack
     {
         protected override void ScreenChanged(IScreen prev, IScreen next)
         {

From e5064ee930c58a01fcf79807c14aaf83a7e420d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 17:02:35 +0100
Subject: [PATCH 0590/3722] Rename {Multiplayer -> OnlinePlay}SubScreen

---
 osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs     | 2 +-
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs        | 2 +-
 osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs           | 8 ++++----
 .../{MultiplayerSubScreen.cs => OnlinePlaySubScreen.cs}   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename osu.Game/Screens/OnlinePlay/{MultiplayerSubScreen.cs => OnlinePlaySubScreen.cs} (94%)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
index cc56c11d32..79f5dfdee1 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
@@ -19,7 +19,7 @@ using osu.Game.Users;
 namespace osu.Game.Screens.OnlinePlay.Lounge
 {
     [Cached]
-    public abstract class LoungeSubScreen : MultiplayerSubScreen
+    public abstract class LoungeSubScreen : OnlinePlaySubScreen
     {
         public override string Title => "Lounge";
 
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 3a5af90824..2449563c73 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -18,7 +18,7 @@ using osu.Game.Screens.Play;
 namespace osu.Game.Screens.OnlinePlay.Match
 {
     [Cached(typeof(IPreviewTrackOwner))]
-    public abstract class RoomSubScreen : MultiplayerSubScreen, IPreviewTrackOwner
+    public abstract class RoomSubScreen : OnlinePlaySubScreen, IPreviewTrackOwner
     {
         protected readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
 
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index 66309bd47e..60897e8b4c 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -295,13 +295,13 @@ namespace osu.Game.Screens.OnlinePlay
             switch (newScreen)
             {
                 case LoungeSubScreen _:
-                    header.Delay(MultiplayerSubScreen.RESUME_TRANSITION_DELAY).ResizeHeightTo(400, MultiplayerSubScreen.APPEAR_DURATION, Easing.OutQuint);
-                    headerBackground.MoveToX(0, MultiplayerSubScreen.X_MOVE_DURATION, Easing.OutQuint);
+                    header.Delay(OnlinePlaySubScreen.RESUME_TRANSITION_DELAY).ResizeHeightTo(400, OnlinePlaySubScreen.APPEAR_DURATION, Easing.OutQuint);
+                    headerBackground.MoveToX(0, OnlinePlaySubScreen.X_MOVE_DURATION, Easing.OutQuint);
                     break;
 
                 case RoomSubScreen _:
-                    header.ResizeHeightTo(135, MultiplayerSubScreen.APPEAR_DURATION, Easing.OutQuint);
-                    headerBackground.MoveToX(-MultiplayerSubScreen.X_SHIFT, MultiplayerSubScreen.X_MOVE_DURATION, Easing.OutQuint);
+                    header.ResizeHeightTo(135, OnlinePlaySubScreen.APPEAR_DURATION, Easing.OutQuint);
+                    headerBackground.MoveToX(-OnlinePlaySubScreen.X_SHIFT, OnlinePlaySubScreen.X_MOVE_DURATION, Easing.OutQuint);
                     break;
             }
 
diff --git a/osu.Game/Screens/OnlinePlay/MultiplayerSubScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySubScreen.cs
similarity index 94%
rename from osu.Game/Screens/OnlinePlay/MultiplayerSubScreen.cs
rename to osu.Game/Screens/OnlinePlay/OnlinePlaySubScreen.cs
index d7fca98ebe..b6dcfe6dab 100644
--- a/osu.Game/Screens/OnlinePlay/MultiplayerSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySubScreen.cs
@@ -7,7 +7,7 @@ using osu.Framework.Screens;
 
 namespace osu.Game.Screens.OnlinePlay
 {
-    public abstract class MultiplayerSubScreen : OsuScreen, IMultiplayerSubScreen
+    public abstract class OnlinePlaySubScreen : OsuScreen, IMultiplayerSubScreen
     {
         public override bool DisallowExternalBeatmapRulesetChanges => false;
 
@@ -16,7 +16,7 @@ namespace osu.Game.Screens.OnlinePlay
         [Resolved(CanBeNull = true)]
         protected IRoomManager RoomManager { get; private set; }
 
-        protected MultiplayerSubScreen()
+        protected OnlinePlaySubScreen()
         {
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;

From 4c43a67b68a9b0d1c574f33a4aa4e739e80397e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 17:05:29 +0100
Subject: [PATCH 0591/3722] Rename I{Multiplayer -> OnlinePlay}SubScreen

---
 osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs | 8 ++++----
 osu.Game/Screens/OnlinePlay/Header.cs                     | 6 +++---
 .../{IMultiplayerSubScreen.cs => IOnlinePlaySubScreen.cs} | 2 +-
 .../OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs  | 2 +-
 osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs           | 4 ++--
 osu.Game/Screens/OnlinePlay/OnlinePlaySubScreen.cs        | 2 +-
 osu.Game/Screens/Select/MatchSongSelect.cs                | 2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)
 rename osu.Game/Screens/OnlinePlay/{IMultiplayerSubScreen.cs => IOnlinePlaySubScreen.cs} (82%)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs
index 089de223fc..2244dcfc56 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             OsuScreenStack screenStack = new OsuScreenStack { RelativeSizeAxes = Axes.Both };
 
-            screenStack.Push(new TestMultiplayerSubScreen(index));
+            screenStack.Push(new TestOnlinePlaySubScreen(index));
 
             Children = new Drawable[]
             {
@@ -26,16 +26,16 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 new Header("Multiplayer", screenStack)
             };
 
-            AddStep("push multi screen", () => screenStack.CurrentScreen.Push(new TestMultiplayerSubScreen(++index)));
+            AddStep("push multi screen", () => screenStack.CurrentScreen.Push(new TestOnlinePlaySubScreen(++index)));
         }
 
-        private class TestMultiplayerSubScreen : OsuScreen, IMultiplayerSubScreen
+        private class TestOnlinePlaySubScreen : OsuScreen, IOnlinePlaySubScreen
         {
             private readonly int index;
 
             public string ShortTitle => $"Screen {index}";
 
-            public TestMultiplayerSubScreen(int index)
+            public TestOnlinePlaySubScreen(int index)
             {
                 this.index = index;
             }
diff --git a/osu.Game/Screens/OnlinePlay/Header.cs b/osu.Game/Screens/OnlinePlay/Header.cs
index bffd744fdc..bf0a53cbb6 100644
--- a/osu.Game/Screens/OnlinePlay/Header.cs
+++ b/osu.Game/Screens/OnlinePlay/Header.cs
@@ -61,8 +61,8 @@ namespace osu.Game.Screens.OnlinePlay
 
             breadcrumbs.Current.ValueChanged += screen =>
             {
-                if (screen.NewValue is IMultiplayerSubScreen multiScreen)
-                    title.Screen = multiScreen;
+                if (screen.NewValue is IOnlinePlaySubScreen onlineSubScreen)
+                    title.Screen = onlineSubScreen;
             };
 
             breadcrumbs.Current.TriggerChange();
@@ -75,7 +75,7 @@ namespace osu.Game.Screens.OnlinePlay
             private readonly OsuSpriteText dot;
             private readonly OsuSpriteText pageTitle;
 
-            public IMultiplayerSubScreen Screen
+            public IOnlinePlaySubScreen Screen
             {
                 set => pageTitle.Text = value.ShortTitle.Titleize();
             }
diff --git a/osu.Game/Screens/OnlinePlay/IMultiplayerSubScreen.cs b/osu.Game/Screens/OnlinePlay/IOnlinePlaySubScreen.cs
similarity index 82%
rename from osu.Game/Screens/OnlinePlay/IMultiplayerSubScreen.cs
rename to osu.Game/Screens/OnlinePlay/IOnlinePlaySubScreen.cs
index fc149cd2b2..a4762292a9 100644
--- a/osu.Game/Screens/OnlinePlay/IMultiplayerSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/IOnlinePlaySubScreen.cs
@@ -3,7 +3,7 @@
 
 namespace osu.Game.Screens.OnlinePlay
 {
-    public interface IMultiplayerSubScreen : IOsuScreen
+    public interface IOnlinePlaySubScreen : IOsuScreen
     {
         string Title { get; }
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index 76869300e8..0842574f54 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -15,7 +15,7 @@ using osu.Game.Screens.Select;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
-    public class MultiplayerMatchSongSelect : SongSelect, IMultiplayerSubScreen
+    public class MultiplayerMatchSongSelect : SongSelect, IOnlinePlaySubScreen
     {
         public string ShortTitle => "song selection";
 
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index 60897e8b4c..9ba2e41d12 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Screens.OnlinePlay
     [Cached]
     public abstract class OnlinePlayScreen : OsuScreen
     {
-        public override bool CursorVisible => (screenStack.CurrentScreen as IMultiplayerSubScreen)?.CursorVisible ?? true;
+        public override bool CursorVisible => (screenStack.CurrentScreen as IOnlinePlaySubScreen)?.CursorVisible ?? true;
 
         // this is required due to PlayerLoader eventually being pushed to the main stack
         // while leases may be taken out by a subscreen.
@@ -245,7 +245,7 @@ namespace osu.Game.Screens.OnlinePlay
 
         public override bool OnBackButton()
         {
-            if ((screenStack.CurrentScreen as IMultiplayerSubScreen)?.OnBackButton() == true)
+            if ((screenStack.CurrentScreen as IOnlinePlaySubScreen)?.OnBackButton() == true)
                 return true;
 
             if (screenStack.CurrentScreen != null && !(screenStack.CurrentScreen is LoungeSubScreen))
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlaySubScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySubScreen.cs
index b6dcfe6dab..e1bd889088 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlaySubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySubScreen.cs
@@ -7,7 +7,7 @@ using osu.Framework.Screens;
 
 namespace osu.Game.Screens.OnlinePlay
 {
-    public abstract class OnlinePlaySubScreen : OsuScreen, IMultiplayerSubScreen
+    public abstract class OnlinePlaySubScreen : OsuScreen, IOnlinePlaySubScreen
     {
         public override bool DisallowExternalBeatmapRulesetChanges => false;
 
diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index 1b89a58b40..0948a4d19a 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -15,7 +15,7 @@ using osu.Game.Screens.OnlinePlay.Components;
 
 namespace osu.Game.Screens.Select
 {
-    public class MatchSongSelect : SongSelect, IMultiplayerSubScreen
+    public class MatchSongSelect : SongSelect, IOnlinePlaySubScreen
     {
         public Action<PlaylistItem> Selected;
 

From ed4b8482b60d1133753296aebf78afd4fec95c58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 17:12:33 +0100
Subject: [PATCH 0592/3722] Rename {Multiplayer -> OnlinePlay}Composite

---
 osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs          | 2 +-
 osu.Game/Screens/OnlinePlay/Components/BeatmapTypeInfo.cs       | 2 +-
 osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs          | 2 +-
 osu.Game/Screens/OnlinePlay/Components/OverlinedHeader.cs       | 2 +-
 .../Screens/OnlinePlay/Components/ParticipantCountDisplay.cs    | 2 +-
 osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs   | 2 +-
 osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs      | 2 +-
 osu.Game/Screens/OnlinePlay/Components/RoomStatusInfo.cs        | 2 +-
 osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs   | 2 +-
 .../Screens/OnlinePlay/Lounge/Components/ParticipantInfo.cs     | 2 +-
 osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInfo.cs       | 2 +-
 osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInspector.cs  | 2 +-
 osu.Game/Screens/OnlinePlay/Match/Components/Header.cs          | 2 +-
 .../Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs | 2 +-
 .../OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs     | 2 +-
 .../OnlinePlay/Multiplayer/Match/MultiplayerMatchHeader.cs      | 2 +-
 .../Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs        | 2 +-
 .../Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs  | 2 +-
 .../{MultiplayerComposite.cs => OnlinePlayComposite.cs}         | 2 +-
 osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs                 | 2 +-
 .../OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs       | 2 +-
 21 files changed, 21 insertions(+), 21 deletions(-)
 rename osu.Game/Screens/OnlinePlay/{MultiplayerComposite.cs => OnlinePlayComposite.cs} (96%)

diff --git a/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs b/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
index bc355d18a9..acb82360b3 100644
--- a/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
@@ -12,7 +12,7 @@ using osu.Game.Online.Chat;
 
 namespace osu.Game.Screens.OnlinePlay.Components
 {
-    public class BeatmapTitle : MultiplayerComposite
+    public class BeatmapTitle : OnlinePlayComposite
     {
         private readonly LinkFlowContainer textFlow;
 
diff --git a/osu.Game/Screens/OnlinePlay/Components/BeatmapTypeInfo.cs b/osu.Game/Screens/OnlinePlay/Components/BeatmapTypeInfo.cs
index 434d7b75ed..3aa13458a4 100644
--- a/osu.Game/Screens/OnlinePlay/Components/BeatmapTypeInfo.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/BeatmapTypeInfo.cs
@@ -11,7 +11,7 @@ using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Components
 {
-    public class BeatmapTypeInfo : MultiplayerComposite
+    public class BeatmapTypeInfo : OnlinePlayComposite
     {
         private LinkFlowContainer beatmapAuthor;
 
diff --git a/osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs b/osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs
index 719afcdd33..03b27b605c 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs
@@ -10,7 +10,7 @@ using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Components
 {
-    public class ModeTypeInfo : MultiplayerComposite
+    public class ModeTypeInfo : OnlinePlayComposite
     {
         private const float height = 30;
         private const float transition_duration = 100;
diff --git a/osu.Game/Screens/OnlinePlay/Components/OverlinedHeader.cs b/osu.Game/Screens/OnlinePlay/Components/OverlinedHeader.cs
index c78dfef592..08a0a3405e 100644
--- a/osu.Game/Screens/OnlinePlay/Components/OverlinedHeader.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/OverlinedHeader.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
     /// <summary>
     /// A header used in the multiplayer interface which shows text / details beneath a line.
     /// </summary>
-    public class OverlinedHeader : MultiplayerComposite
+    public class OverlinedHeader : OnlinePlayComposite
     {
         private bool showLine = true;
 
diff --git a/osu.Game/Screens/OnlinePlay/Components/ParticipantCountDisplay.cs b/osu.Game/Screens/OnlinePlay/Components/ParticipantCountDisplay.cs
index 357974adfc..53821da8fd 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ParticipantCountDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ParticipantCountDisplay.cs
@@ -9,7 +9,7 @@ using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Screens.OnlinePlay.Components
 {
-    public class ParticipantCountDisplay : MultiplayerComposite
+    public class ParticipantCountDisplay : OnlinePlayComposite
     {
         private const float text_size = 30;
         private const float transition_duration = 100;
diff --git a/osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs b/osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs
index 5184f873f3..c36d1a2e76 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs
@@ -8,7 +8,7 @@ using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Screens.OnlinePlay.Components
 {
-    public class ParticipantsDisplay : MultiplayerComposite
+    public class ParticipantsDisplay : OnlinePlayComposite
     {
         public Bindable<string> Details = new Bindable<string>();
 
diff --git a/osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs b/osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs
index b5019b4cdc..9aceb39a27 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs
@@ -14,7 +14,7 @@ using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Components
 {
-    public class ParticipantsList : MultiplayerComposite
+    public class ParticipantsList : OnlinePlayComposite
     {
         public const float TILE_SIZE = 35;
 
diff --git a/osu.Game/Screens/OnlinePlay/Components/RoomStatusInfo.cs b/osu.Game/Screens/OnlinePlay/Components/RoomStatusInfo.cs
index 58cb25f30e..bcc256bcff 100644
--- a/osu.Game/Screens/OnlinePlay/Components/RoomStatusInfo.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/RoomStatusInfo.cs
@@ -13,7 +13,7 @@ using osu.Game.Online.Rooms.RoomStatuses;
 
 namespace osu.Game.Screens.OnlinePlay.Components
 {
-    public class RoomStatusInfo : MultiplayerComposite
+    public class RoomStatusInfo : OnlinePlayComposite
     {
         public RoomStatusInfo()
         {
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
index f4d167a193..0a7198a7fa 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
@@ -155,7 +155,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
                                 Width = cover_width,
                                 Masking = true,
                                 Margin = new MarginPadding { Left = stripWidth },
-                                Child = new MultiplayerBackgroundSprite(BeatmapSetCoverType.List) { RelativeSizeAxes = Axes.Both }
+                                Child = new OnlinePlayBackgroundSprite(BeatmapSetCoverType.List) { RelativeSizeAxes = Axes.Both }
                             },
                             new Container
                             {
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/ParticipantInfo.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/ParticipantInfo.cs
index 895c0e3eda..0d5ce65d5a 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/ParticipantInfo.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/ParticipantInfo.cs
@@ -13,7 +13,7 @@ using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
-    public class ParticipantInfo : MultiplayerComposite
+    public class ParticipantInfo : OnlinePlayComposite
     {
         public ParticipantInfo()
         {
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInfo.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInfo.cs
index 8552d425aa..0a17702f2a 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInfo.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInfo.cs
@@ -11,7 +11,7 @@ using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
-    public class RoomInfo : MultiplayerComposite
+    public class RoomInfo : OnlinePlayComposite
     {
         private readonly List<Drawable> statusElements = new List<Drawable>();
         private readonly OsuTextFlowContainer roomName;
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInspector.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInspector.cs
index 4b1ec9ae89..c28354c753 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInspector.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInspector.cs
@@ -12,7 +12,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
-    public class RoomInspector : MultiplayerComposite
+    public class RoomInspector : OnlinePlayComposite
     {
         private const float transition_duration = 100;
 
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/Header.cs b/osu.Game/Screens/OnlinePlay/Match/Components/Header.cs
index df0dfc6ec1..a2d11c54c1 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/Header.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/Header.cs
@@ -12,7 +12,7 @@ using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Match.Components
 {
-    public class Header : MultiplayerComposite
+    public class Header : OnlinePlayComposite
     {
         public const float HEIGHT = 50;
 
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs
index 998ab889d6..ea3951fc3b 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
         protected const float TRANSITION_DURATION = 350;
         protected const float FIELD_PADDING = 45;
 
-        protected MultiplayerComposite Settings { get; set; }
+        protected OnlinePlayComposite Settings { get; set; }
 
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
index 1718ebd83a..f17e04d4d4 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
@@ -13,7 +13,7 @@ using osu.Game.Screens.OnlinePlay.Match.Components;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 {
-    public class BeatmapSelectionControl : MultiplayerComposite
+    public class BeatmapSelectionControl : OnlinePlayComposite
     {
         [Resolved]
         private MultiplayerMatchSubScreen matchSubScreen { get; set; }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchHeader.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchHeader.cs
index 42e34c4be3..bb351d06d3 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchHeader.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchHeader.cs
@@ -19,7 +19,7 @@ using OsuFont = osu.Game.Graphics.OsuFont;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 {
-    public class MultiplayerMatchHeader : MultiplayerComposite
+    public class MultiplayerMatchHeader : OnlinePlayComposite
     {
         public const float HEIGHT = 50;
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
index 8741b0323d..ae03d384f6 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             };
         }
 
-        protected class MatchSettings : MultiplayerComposite
+        protected class MatchSettings : OnlinePlayComposite
         {
             private const float disabled_alpha = 0.2f;
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs
index 654dafe9aa..ac608a13d4 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs
@@ -7,7 +7,7 @@ using osu.Game.Online.Multiplayer;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
-    public abstract class MultiplayerRoomComposite : MultiplayerComposite
+    public abstract class MultiplayerRoomComposite : OnlinePlayComposite
     {
         [CanBeNull]
         protected MultiplayerRoom Room => Client.Room;
diff --git a/osu.Game/Screens/OnlinePlay/MultiplayerComposite.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
similarity index 96%
rename from osu.Game/Screens/OnlinePlay/MultiplayerComposite.cs
rename to osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
index ab54178ab4..64792a32f3 100644
--- a/osu.Game/Screens/OnlinePlay/MultiplayerComposite.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
@@ -10,7 +10,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Screens.OnlinePlay
 {
-    public class MultiplayerComposite : CompositeDrawable
+    public class OnlinePlayComposite : CompositeDrawable
     {
         [Resolved(typeof(Room))]
         protected Bindable<int?> RoomID { get; private set; }
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index 9ba2e41d12..4074dd1573 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -338,7 +338,7 @@ namespace osu.Game.Screens.OnlinePlay
             }
         }
 
-        private class HeaderBackgroundSprite : MultiplayerBackgroundSprite
+        private class HeaderBackgroundSprite : OnlinePlayBackgroundSprite
         {
             protected override UpdateableBeatmapBackgroundSprite CreateBackgroundSprite() => new BackgroundSprite { RelativeSizeAxes = Axes.Both };
 
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
index 557f1df657..6b92526f35 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
             };
         }
 
-        protected class MatchSettings : MultiplayerComposite
+        protected class MatchSettings : OnlinePlayComposite
         {
             private const float disabled_alpha = 0.2f;
 

From 2e4b1b95c283418818bd72f40a0885778112728f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 17:12:46 +0100
Subject: [PATCH 0593/3722] Rename {Multiplayer -> OnlinePlay}BackgroundSprite

---
 ...layerBackgroundSprite.cs => OnlinePlayBackgroundSprite.cs} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename osu.Game/Screens/OnlinePlay/Components/{MultiplayerBackgroundSprite.cs => OnlinePlayBackgroundSprite.cs} (85%)

diff --git a/osu.Game/Screens/OnlinePlay/Components/MultiplayerBackgroundSprite.cs b/osu.Game/Screens/OnlinePlay/Components/OnlinePlayBackgroundSprite.cs
similarity index 85%
rename from osu.Game/Screens/OnlinePlay/Components/MultiplayerBackgroundSprite.cs
rename to osu.Game/Screens/OnlinePlay/Components/OnlinePlayBackgroundSprite.cs
index 45e2c553e7..d8dfac496d 100644
--- a/osu.Game/Screens/OnlinePlay/Components/MultiplayerBackgroundSprite.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/OnlinePlayBackgroundSprite.cs
@@ -8,12 +8,12 @@ using osu.Game.Beatmaps.Drawables;
 
 namespace osu.Game.Screens.OnlinePlay.Components
 {
-    public class MultiplayerBackgroundSprite : MultiplayerComposite
+    public class OnlinePlayBackgroundSprite : OnlinePlayComposite
     {
         private readonly BeatmapSetCoverType beatmapSetCoverType;
         private UpdateableBeatmapBackgroundSprite sprite;
 
-        public MultiplayerBackgroundSprite(BeatmapSetCoverType beatmapSetCoverType = BeatmapSetCoverType.Cover)
+        public OnlinePlayBackgroundSprite(BeatmapSetCoverType beatmapSetCoverType = BeatmapSetCoverType.Cover)
         {
             this.beatmapSetCoverType = beatmapSetCoverType;
         }

From 0bd9f68cbd6758faa79fbb8a3feac064edb2bdda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 18:39:55 +0100
Subject: [PATCH 0594/3722] Refactor update stream colour mapping code

---
 .../API/Requests/Responses/APIUpdateStream.cs | 37 +++++--------------
 1 file changed, 10 insertions(+), 27 deletions(-)

diff --git a/osu.Game/Online/API/Requests/Responses/APIUpdateStream.cs b/osu.Game/Online/API/Requests/Responses/APIUpdateStream.cs
index d9e48373bb..5af7d6a01c 100644
--- a/osu.Game/Online/API/Requests/Responses/APIUpdateStream.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIUpdateStream.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using Newtonsoft.Json;
 using osu.Framework.Graphics.Colour;
 using osuTK.Graphics;
@@ -27,34 +28,16 @@ namespace osu.Game.Online.API.Requests.Responses
 
         public bool Equals(APIUpdateStream other) => Id == other?.Id;
 
-        public ColourInfo Colour
+        internal static readonly Dictionary<string, Color4> KNOWN_STREAMS = new Dictionary<string, Color4>
         {
-            get
-            {
-                switch (Name)
-                {
-                    case "stable40":
-                        return new Color4(102, 204, 255, 255);
+            ["stable40"] = new Color4(102, 204, 255, 255),
+            ["stable"] = new Color4(34, 153, 187, 255),
+            ["beta40"] = new Color4(255, 221, 85, 255),
+            ["cuttingedge"] = new Color4(238, 170, 0, 255),
+            [OsuGameBase.CLIENT_STREAM_NAME] = new Color4(237, 18, 33, 255),
+            ["web"] = new Color4(136, 102, 238, 255)
+        };
 
-                    case "stable":
-                        return new Color4(34, 153, 187, 255);
-
-                    case "beta40":
-                        return new Color4(255, 221, 85, 255);
-
-                    case "cuttingedge":
-                        return new Color4(238, 170, 0, 255);
-
-                    case OsuGameBase.CLIENT_STREAM_NAME:
-                        return new Color4(237, 18, 33, 255);
-
-                    case "web":
-                        return new Color4(136, 102, 238, 255);
-
-                    default:
-                        return new Color4(0, 0, 0, 255);
-                }
-            }
-        }
+        public ColourInfo Colour => KNOWN_STREAMS.TryGetValue(Name, out var colour) ? colour : new Color4(0, 0, 0, 255);
     }
 }

From dacf6d5a34134b2d10070a0fc74232492e37e237 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 19:28:33 +0100
Subject: [PATCH 0595/3722] Decouple changelog test scene from web

---
 .../Online/TestSceneChangelogOverlay.cs       | 132 ++++++++++++------
 1 file changed, 92 insertions(+), 40 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
index 998e42b478..9f617d49da 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.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;
 using System.Collections.Generic;
+using System.Linq;
+using Humanizer;
 using NUnit.Framework;
+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.Changelog;
@@ -12,15 +17,63 @@ namespace osu.Game.Tests.Visual.Online
     [TestFixture]
     public class TestSceneChangelogOverlay : OsuTestScene
     {
+        private DummyAPIAccess dummyAPI => (DummyAPIAccess)API;
+
+        private readonly Dictionary<string, APIUpdateStream> streams;
+        private readonly Dictionary<string, APIChangelogBuild> builds;
+
+        private APIChangelogBuild requestedBuild;
         private TestChangelogOverlay changelog;
 
-        protected override bool UseOnlineAPI => true;
+        public TestSceneChangelogOverlay()
+        {
+            streams = APIUpdateStream.KNOWN_STREAMS.Keys.Select((stream, id) => new APIUpdateStream
+            {
+                Id = id + 1,
+                Name = stream,
+                DisplayName = stream.Humanize(), // not quite there, but good enough.
+            }).ToDictionary(stream => stream.Name);
+
+            string version = DateTimeOffset.Now.ToString("yyyy.Mdd.0");
+            builds = APIUpdateStream.KNOWN_STREAMS.Keys.Select(stream => new APIChangelogBuild
+            {
+                Version = version,
+                DisplayVersion = version,
+                UpdateStream = streams[stream],
+                ChangelogEntries = new List<APIChangelogEntry>()
+            }).ToDictionary(build => build.UpdateStream.Name);
+
+            foreach (var stream in streams.Values)
+                stream.LatestBuild = builds[stream.Name];
+        }
 
         [SetUp]
-        public void SetUp() => Schedule(() =>
+        public void SetUp()
         {
-            Child = changelog = new TestChangelogOverlay();
-        });
+            requestedBuild = null;
+
+            dummyAPI.HandleRequest = request =>
+            {
+                switch (request)
+                {
+                    case GetChangelogRequest changelogRequest:
+                        var changelogResponse = new APIChangelogIndex
+                        {
+                            Streams = streams.Values.ToList(),
+                            Builds = builds.Values.ToList()
+                        };
+                        changelogRequest.TriggerSuccess(changelogResponse);
+                        break;
+
+                    case GetChangelogBuildRequest buildRequest:
+                        if (requestedBuild != null)
+                            buildRequest.TriggerSuccess(requestedBuild);
+                        break;
+                }
+            };
+
+            Schedule(() => Child = changelog = new TestChangelogOverlay());
+        }
 
         [Test]
         public void ShowWithNoFetch()
@@ -41,26 +94,22 @@ namespace osu.Game.Tests.Visual.Online
         }
 
         [Test]
-        [Ignore("needs to be updated to not be so server dependent")]
         public void ShowWithBuild()
         {
-            AddStep(@"Show with Lazer 2018.712.0", () =>
+            showBuild(() => new APIChangelogBuild
             {
-                changelog.ShowBuild(new APIChangelogBuild
+                Version = "2018.712.0",
+                DisplayVersion = "2018.712.0",
+                UpdateStream = streams[OsuGameBase.CLIENT_STREAM_NAME],
+                ChangelogEntries = new List<APIChangelogEntry>
                 {
-                    Version = "2018.712.0",
-                    DisplayVersion = "2018.712.0",
-                    UpdateStream = new APIUpdateStream { Id = 5, Name = OsuGameBase.CLIENT_STREAM_NAME },
-                    ChangelogEntries = new List<APIChangelogEntry>
+                    new APIChangelogEntry
                     {
-                        new APIChangelogEntry
-                        {
-                            Category = "Test",
-                            Title = "Title",
-                            MessageHtml = "Message",
-                        }
+                        Category = "Test",
+                        Title = "Title",
+                        MessageHtml = "Message",
                     }
-                });
+                }
             });
 
             AddUntilStep(@"wait for streams", () => changelog.Streams?.Count > 0);
@@ -71,35 +120,38 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestHTMLUnescaping()
         {
-            AddStep(@"Ensure HTML string unescaping", () =>
+            showBuild(() => new APIChangelogBuild
             {
-                changelog.ShowBuild(new APIChangelogBuild
+                Version = "2019.920.0",
+                DisplayVersion = "2019.920.0",
+                UpdateStream = new APIUpdateStream
                 {
-                    Version = "2019.920.0",
-                    DisplayVersion = "2019.920.0",
-                    UpdateStream = new APIUpdateStream
+                    Name = "Test",
+                    DisplayName = "Test"
+                },
+                ChangelogEntries = new List<APIChangelogEntry>
+                {
+                    new APIChangelogEntry
                     {
-                        Name = "Test",
-                        DisplayName = "Test"
-                    },
-                    ChangelogEntries = new List<APIChangelogEntry>
-                    {
-                        new APIChangelogEntry
+                        Category = "Testing HTML strings unescaping",
+                        Title = "Ensuring HTML strings are being unescaped",
+                        MessageHtml = "&quot;&quot;&quot;This text should appear triple-quoted&quot;&quot;&quot;    &gt;_&lt;",
+                        GithubUser = new APIChangelogUser
                         {
-                            Category = "Testing HTML strings unescaping",
-                            Title = "Ensuring HTML strings are being unescaped",
-                            MessageHtml = "&quot;&quot;&quot;This text should appear triple-quoted&quot;&quot;&quot;    &gt;_&lt;",
-                            GithubUser = new APIChangelogUser
-                            {
-                                DisplayName = "Dummy",
-                                OsuUsername = "Dummy",
-                            }
-                        },
-                    }
-                });
+                            DisplayName = "Dummy",
+                            OsuUsername = "Dummy",
+                        }
+                    },
+                }
             });
         }
 
+        private void showBuild(Func<APIChangelogBuild> build)
+        {
+            AddStep("set up build", () => requestedBuild = build.Invoke());
+            AddStep("show build", () => changelog.ShowBuild(requestedBuild));
+        }
+
         private class TestChangelogOverlay : ChangelogOverlay
         {
             public new List<APIUpdateStream> Streams => base.Streams;

From 5f43299d3779ffbde32d3bd2f735592f30fad820 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 19:49:41 +0100
Subject: [PATCH 0596/3722] Fix tests failing due to base logic firing

It turns out that the changelog code was semi-intentionally relying on
the request to get release streams to be slow to initially show the
listing of all streams.

Locally suppress the base tab control logic to fix this.
---
 osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs
index 509a6dabae..6bbff045b5 100644
--- a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs
@@ -8,5 +8,11 @@ namespace osu.Game.Overlays.Changelog
     public class ChangelogUpdateStreamControl : OverlayStreamControl<APIUpdateStream>
     {
         protected override OverlayStreamItem<APIUpdateStream> CreateStreamItem(APIUpdateStream value) => new ChangelogUpdateStreamItem(value);
+
+        protected override void LoadComplete()
+        {
+            // suppress base logic of immediately selecting first item if one exists
+            // (we always want to start with no stream selected).
+        }
     }
 }

From 3ac618778f11010de62bedec719141319b37cc40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 20:08:57 +0100
Subject: [PATCH 0597/3722] Handle all changelog entry types correctly

---
 .../Online/TestSceneChangelogOverlay.cs       | 20 +++++++++++++++---
 osu.Game/Overlays/Changelog/ChangelogBuild.cs | 21 ++++++++++++++++++-
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
index 9f617d49da..42f822664f 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
@@ -105,9 +105,23 @@ namespace osu.Game.Tests.Visual.Online
                 {
                     new APIChangelogEntry
                     {
-                        Category = "Test",
-                        Title = "Title",
-                        MessageHtml = "Message",
+                        Type = ChangelogEntryType.Fix,
+                        Category = "osu!",
+                        Title = "Fix thing",
+                        MessageHtml = "Additional info goes here.",
+                    },
+                    new APIChangelogEntry
+                    {
+                        Type = ChangelogEntryType.Add,
+                        Category = "osu!",
+                        Title = "Add thing",
+                        Major = true
+                    },
+                    new APIChangelogEntry
+                    {
+                        Type = ChangelogEntryType.Misc,
+                        Category = "Code quality",
+                        Title = "Clean up thing"
                     }
                 }
             });
diff --git a/osu.Game/Overlays/Changelog/ChangelogBuild.cs b/osu.Game/Overlays/Changelog/ChangelogBuild.cs
index 65ff0fef92..6ec3f08a2b 100644
--- a/osu.Game/Overlays/Changelog/ChangelogBuild.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogBuild.cs
@@ -84,7 +84,7 @@ namespace osu.Game.Overlays.Changelog
                                 Anchor = Anchor.CentreLeft,
                                 Origin = Anchor.CentreRight,
                                 Size = new Vector2(10),
-                                Icon = entry.Type == ChangelogEntryType.Fix ? FontAwesome.Solid.Check : FontAwesome.Solid.Plus,
+                                Icon = getIconForChangelogEntry(entry.Type),
                                 Colour = entryColour.Opacity(0.5f),
                                 Margin = new MarginPadding { Right = 5 },
                             },
@@ -186,6 +186,25 @@ namespace osu.Game.Overlays.Changelog
             }
         }
 
+        private static IconUsage getIconForChangelogEntry(ChangelogEntryType entryType)
+        {
+            // compare: https://github.com/ppy/osu-web/blob/master/resources/assets/coffee/react/_components/changelog-entry.coffee#L8-L11
+            switch (entryType)
+            {
+                case ChangelogEntryType.Add:
+                    return FontAwesome.Solid.Plus;
+
+                case ChangelogEntryType.Fix:
+                    return FontAwesome.Solid.Check;
+
+                case ChangelogEntryType.Misc:
+                    return FontAwesome.Regular.Circle;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(entryType), $"Unrecognised entry type {entryType}");
+            }
+        }
+
         protected virtual FillFlowContainer CreateHeader() => new FillFlowContainer
         {
             Anchor = Anchor.TopCentre,

From 0aedc720f2c61a9f0d8d4223d3896259181ad071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 20:31:12 +0100
Subject: [PATCH 0598/3722] Extract changelog entry component

---
 osu.Game/Overlays/Changelog/ChangelogBuild.cs | 146 +------------
 osu.Game/Overlays/Changelog/ChangelogEntry.cs | 202 ++++++++++++++++++
 2 files changed, 203 insertions(+), 145 deletions(-)
 create mode 100644 osu.Game/Overlays/Changelog/ChangelogEntry.cs

diff --git a/osu.Game/Overlays/Changelog/ChangelogBuild.cs b/osu.Game/Overlays/Changelog/ChangelogBuild.cs
index 6ec3f08a2b..2d071b7345 100644
--- a/osu.Game/Overlays/Changelog/ChangelogBuild.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogBuild.cs
@@ -9,14 +9,8 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Online.API.Requests.Responses;
 using System;
 using System.Linq;
-using System.Text.RegularExpressions;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Users;
-using osuTK.Graphics;
 using osu.Framework.Allocation;
-using System.Net;
-using osuTK;
-using osu.Framework.Extensions.Color4Extensions;
 
 namespace osu.Game.Overlays.Changelog
 {
@@ -63,145 +57,7 @@ namespace osu.Game.Overlays.Changelog
                     Margin = new MarginPadding { Top = 35, Bottom = 15 },
                 });
 
-                var fontLarge = OsuFont.GetFont(size: 16);
-                var fontMedium = OsuFont.GetFont(size: 12);
-
-                foreach (var entry in categoryEntries)
-                {
-                    var entryColour = entry.Major ? colours.YellowLight : Color4.White;
-
-                    LinkFlowContainer title;
-
-                    var titleContainer = new Container
-                    {
-                        AutoSizeAxes = Axes.Y,
-                        RelativeSizeAxes = Axes.X,
-                        Margin = new MarginPadding { Vertical = 5 },
-                        Children = new Drawable[]
-                        {
-                            new SpriteIcon
-                            {
-                                Anchor = Anchor.CentreLeft,
-                                Origin = Anchor.CentreRight,
-                                Size = new Vector2(10),
-                                Icon = getIconForChangelogEntry(entry.Type),
-                                Colour = entryColour.Opacity(0.5f),
-                                Margin = new MarginPadding { Right = 5 },
-                            },
-                            title = new LinkFlowContainer
-                            {
-                                Direction = FillDirection.Full,
-                                RelativeSizeAxes = Axes.X,
-                                AutoSizeAxes = Axes.Y,
-                                TextAnchor = Anchor.BottomLeft,
-                            }
-                        }
-                    };
-
-                    title.AddText(entry.Title, t =>
-                    {
-                        t.Font = fontLarge;
-                        t.Colour = entryColour;
-                    });
-
-                    if (!string.IsNullOrEmpty(entry.Repository))
-                    {
-                        title.AddText(" (", t =>
-                        {
-                            t.Font = fontLarge;
-                            t.Colour = entryColour;
-                        });
-                        title.AddLink($"{entry.Repository.Replace("ppy/", "")}#{entry.GithubPullRequestId}", entry.GithubUrl,
-                            creationParameters: t =>
-                            {
-                                t.Font = fontLarge;
-                                t.Colour = entryColour;
-                            });
-                        title.AddText(")", t =>
-                        {
-                            t.Font = fontLarge;
-                            t.Colour = entryColour;
-                        });
-                    }
-
-                    title.AddText("by ", t =>
-                    {
-                        t.Font = fontMedium;
-                        t.Colour = entryColour;
-                        t.Padding = new MarginPadding { Left = 10 };
-                    });
-
-                    if (entry.GithubUser != null)
-                    {
-                        if (entry.GithubUser.UserId != null)
-                        {
-                            title.AddUserLink(new User
-                            {
-                                Username = entry.GithubUser.OsuUsername,
-                                Id = entry.GithubUser.UserId.Value
-                            }, t =>
-                            {
-                                t.Font = fontMedium;
-                                t.Colour = entryColour;
-                            });
-                        }
-                        else if (entry.GithubUser.GithubUrl != null)
-                        {
-                            title.AddLink(entry.GithubUser.DisplayName, entry.GithubUser.GithubUrl, t =>
-                            {
-                                t.Font = fontMedium;
-                                t.Colour = entryColour;
-                            });
-                        }
-                        else
-                        {
-                            title.AddText(entry.GithubUser.DisplayName, t =>
-                            {
-                                t.Font = fontMedium;
-                                t.Colour = entryColour;
-                            });
-                        }
-                    }
-
-                    ChangelogEntries.Add(titleContainer);
-
-                    if (!string.IsNullOrEmpty(entry.MessageHtml))
-                    {
-                        var message = new TextFlowContainer
-                        {
-                            AutoSizeAxes = Axes.Y,
-                            RelativeSizeAxes = Axes.X,
-                        };
-
-                        // todo: use markdown parsing once API returns markdown
-                        message.AddText(WebUtility.HtmlDecode(Regex.Replace(entry.MessageHtml, @"<(.|\n)*?>", string.Empty)), t =>
-                        {
-                            t.Font = fontMedium;
-                            t.Colour = colourProvider.Foreground1;
-                        });
-
-                        ChangelogEntries.Add(message);
-                    }
-                }
-            }
-        }
-
-        private static IconUsage getIconForChangelogEntry(ChangelogEntryType entryType)
-        {
-            // compare: https://github.com/ppy/osu-web/blob/master/resources/assets/coffee/react/_components/changelog-entry.coffee#L8-L11
-            switch (entryType)
-            {
-                case ChangelogEntryType.Add:
-                    return FontAwesome.Solid.Plus;
-
-                case ChangelogEntryType.Fix:
-                    return FontAwesome.Solid.Check;
-
-                case ChangelogEntryType.Misc:
-                    return FontAwesome.Regular.Circle;
-
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(entryType), $"Unrecognised entry type {entryType}");
+                ChangelogEntries.AddRange(categoryEntries.Select(entry => new ChangelogEntry(entry)));
             }
         }
 
diff --git a/osu.Game/Overlays/Changelog/ChangelogEntry.cs b/osu.Game/Overlays/Changelog/ChangelogEntry.cs
new file mode 100644
index 0000000000..55edb40283
--- /dev/null
+++ b/osu.Game/Overlays/Changelog/ChangelogEntry.cs
@@ -0,0 +1,202 @@
+// Copyright (c) ppy 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.Net;
+using System.Text.RegularExpressions;
+using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Users;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays.Changelog
+{
+    public class ChangelogEntry : FillFlowContainer
+    {
+        private readonly APIChangelogEntry entry;
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; }
+
+        private FontUsage fontLarge;
+        private FontUsage fontMedium;
+
+        public ChangelogEntry(APIChangelogEntry entry)
+        {
+            this.entry = entry;
+
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+            Direction = FillDirection.Vertical;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            fontLarge = OsuFont.GetFont(size: 16);
+            fontMedium = OsuFont.GetFont(size: 12);
+
+            Children = new[]
+            {
+                createTitle(),
+                createMessage()
+            };
+        }
+
+        private Drawable createTitle()
+        {
+            var entryColour = entry.Major ? colours.YellowLight : Color4.White;
+
+            LinkFlowContainer title;
+
+            var titleContainer = new Container
+            {
+                AutoSizeAxes = Axes.Y,
+                RelativeSizeAxes = Axes.X,
+                Margin = new MarginPadding { Vertical = 5 },
+                Children = new Drawable[]
+                {
+                    new SpriteIcon
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreRight,
+                        Size = new Vector2(10),
+                        Icon = getIconForChangelogEntry(entry.Type),
+                        Colour = entryColour.Opacity(0.5f),
+                        Margin = new MarginPadding { Right = 5 },
+                    },
+                    title = new LinkFlowContainer
+                    {
+                        Direction = FillDirection.Full,
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        TextAnchor = Anchor.BottomLeft,
+                    }
+                }
+            };
+
+            title.AddText(entry.Title, t =>
+            {
+                t.Font = fontLarge;
+                t.Colour = entryColour;
+            });
+
+            if (!string.IsNullOrEmpty(entry.Repository))
+                addRepositoryReference(title, entryColour);
+
+            if (entry.GithubUser != null)
+                addGithubAuthorReference(title, entryColour);
+
+            return titleContainer;
+        }
+
+        private void addRepositoryReference(LinkFlowContainer title, Color4 entryColour)
+        {
+            title.AddText(" (", t =>
+            {
+                t.Font = fontLarge;
+                t.Colour = entryColour;
+            });
+            title.AddLink($"{entry.Repository.Replace("ppy/", "")}#{entry.GithubPullRequestId}", entry.GithubUrl,
+                t =>
+                {
+                    t.Font = fontLarge;
+                    t.Colour = entryColour;
+                });
+            title.AddText(")", t =>
+            {
+                t.Font = fontLarge;
+                t.Colour = entryColour;
+            });
+        }
+
+        private void addGithubAuthorReference(LinkFlowContainer title, Color4 entryColour)
+        {
+            title.AddText("by ", t =>
+            {
+                t.Font = fontMedium;
+                t.Colour = entryColour;
+                t.Padding = new MarginPadding { Left = 10 };
+            });
+
+            if (entry.GithubUser.UserId != null)
+            {
+                title.AddUserLink(new User
+                {
+                    Username = entry.GithubUser.OsuUsername,
+                    Id = entry.GithubUser.UserId.Value
+                }, t =>
+                {
+                    t.Font = fontMedium;
+                    t.Colour = entryColour;
+                });
+            }
+            else if (entry.GithubUser.GithubUrl != null)
+            {
+                title.AddLink(entry.GithubUser.DisplayName, entry.GithubUser.GithubUrl, t =>
+                {
+                    t.Font = fontMedium;
+                    t.Colour = entryColour;
+                });
+            }
+            else
+            {
+                title.AddText(entry.GithubUser.DisplayName, t =>
+                {
+                    t.Font = fontMedium;
+                    t.Colour = entryColour;
+                });
+            }
+        }
+
+        private Drawable createMessage()
+        {
+            if (string.IsNullOrEmpty(entry.MessageHtml))
+                return Empty();
+
+            var message = new TextFlowContainer
+            {
+                AutoSizeAxes = Axes.Y,
+                RelativeSizeAxes = Axes.X,
+            };
+
+            // todo: use markdown parsing once API returns markdown
+            message.AddText(WebUtility.HtmlDecode(Regex.Replace(entry.MessageHtml, @"<(.|\n)*?>", string.Empty)), t =>
+            {
+                t.Font = fontMedium;
+                t.Colour = colourProvider.Foreground1;
+            });
+
+            return message;
+        }
+
+        private static IconUsage getIconForChangelogEntry(ChangelogEntryType entryType)
+        {
+            // compare: https://github.com/ppy/osu-web/blob/master/resources/assets/coffee/react/_components/changelog-entry.coffee#L8-L11
+            switch (entryType)
+            {
+                case ChangelogEntryType.Add:
+                    return FontAwesome.Solid.Plus;
+
+                case ChangelogEntryType.Fix:
+                    return FontAwesome.Solid.Check;
+
+                case ChangelogEntryType.Misc:
+                    return FontAwesome.Regular.Circle;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(entryType), $"Unrecognised entry type {entryType}");
+            }
+        }
+    }
+}

From c32fc05f69435a8b5adc6b7c715ce57b75cb404e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 20:41:35 +0100
Subject: [PATCH 0599/3722] Improve test scene coverage of corner cases

---
 .../Online/TestSceneChangelogOverlay.cs       | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
index 42f822664f..eef2892290 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
@@ -109,19 +109,43 @@ namespace osu.Game.Tests.Visual.Online
                         Category = "osu!",
                         Title = "Fix thing",
                         MessageHtml = "Additional info goes here.",
+                        Repository = "osu",
+                        GithubPullRequestId = 11100,
+                        GithubUser = new APIChangelogUser
+                        {
+                            OsuUsername = "smoogipoo",
+                            UserId = 1040328
+                        }
                     },
                     new APIChangelogEntry
                     {
                         Type = ChangelogEntryType.Add,
                         Category = "osu!",
                         Title = "Add thing",
-                        Major = true
+                        Major = true,
+                        Repository = "ppy/osu-framework",
+                        GithubPullRequestId = 4444,
+                        GithubUser = new APIChangelogUser
+                        {
+                            DisplayName = "frenzibyte",
+                            GithubUrl = "https://github.com/frenzibyte"
+                        }
                     },
                     new APIChangelogEntry
                     {
                         Type = ChangelogEntryType.Misc,
                         Category = "Code quality",
-                        Title = "Clean up thing"
+                        Title = "Clean up thing",
+                        GithubUser = new APIChangelogUser
+                        {
+                            DisplayName = "some dude"
+                        }
+                    },
+                    new APIChangelogEntry
+                    {
+                        Type = ChangelogEntryType.Misc,
+                        Category = "Code quality",
+                        Title = "Clean up another thing"
                     }
                 }
             });

From 09b0a57290fe224f9a45bd759ae4c85856c3f518 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 25 Dec 2020 20:44:19 +0100
Subject: [PATCH 0600/3722] Schedule all of setup to avoid headless test fail

---
 osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
index eef2892290..cd2c4e9346 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Tests.Visual.Online
         }
 
         [SetUp]
-        public void SetUp()
+        public void SetUp() => Schedule(() =>
         {
             requestedBuild = null;
 
@@ -72,8 +72,8 @@ namespace osu.Game.Tests.Visual.Online
                 }
             };
 
-            Schedule(() => Child = changelog = new TestChangelogOverlay());
-        }
+            Child = changelog = new TestChangelogOverlay();
+        });
 
         [Test]
         public void ShowWithNoFetch()

From e0198c36aeebfddea645a9386a66a7439568d3d4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 26 Dec 2020 09:48:13 +0900
Subject: [PATCH 0601/3722] Fix user population happening in single file

---
 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index e422e982ae..6d253d5992 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -108,8 +108,7 @@ namespace osu.Game.Online.Multiplayer
 
             Debug.Assert(Room != null);
 
-            foreach (var user in Room.Users)
-                await PopulateUser(user);
+            await Task.WhenAll(Room.Users.Select(PopulateUser));
 
             updateLocalRoomSettings(Room.Settings);
         }

From 5ce5b6cec06403b2bbbeea6864f97cf0ebca0bc0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 26 Dec 2020 10:25:16 +0900
Subject: [PATCH 0602/3722] Fix non-safe thread access to room users on room
 join

---
 .../Multiplayer/StatefulMultiplayerClient.cs  | 44 ++++++++++++++++---
 1 file changed, 38 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 6d253d5992..ec0967df75 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -4,8 +4,10 @@
 #nullable enable
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -108,7 +110,9 @@ namespace osu.Game.Online.Multiplayer
 
             Debug.Assert(Room != null);
 
-            await Task.WhenAll(Room.Users.Select(PopulateUser));
+            var users = getRoomUsers();
+
+            await Task.WhenAll(users.Select(PopulateUser));
 
             updateLocalRoomSettings(Room.Settings);
         }
@@ -122,13 +126,16 @@ namespace osu.Game.Online.Multiplayer
 
         public virtual Task LeaveRoom()
         {
-            if (Room == null)
-                return Task.CompletedTask;
+            Schedule(() =>
+            {
+                if (Room == null)
+                    return;
 
-            apiRoom = null;
-            Room = null;
+                apiRoom = null;
+                Room = null;
 
-            Schedule(() => RoomChanged?.Invoke());
+                RoomChanged?.Invoke();
+            });
 
             return Task.CompletedTask;
         }
@@ -360,6 +367,31 @@ namespace osu.Game.Online.Multiplayer
         /// <param name="multiplayerUser">The <see cref="MultiplayerRoomUser"/> to populate.</param>
         protected async Task PopulateUser(MultiplayerRoomUser multiplayerUser) => multiplayerUser.User ??= await userLookupCache.GetUserAsync(multiplayerUser.UserID);
 
+        /// <summary>
+        /// Retrieve a copy of users currently in the joined <see cref="Room"/> in a thread-safe manner.
+        /// This should be used whenever accessing users from outside of an Update thread context (ie. when not calling <see cref="Drawable.Schedule"/>).
+        /// </summary>
+        /// <returns>A copy of users in the current room, or null if unavailable.</returns>
+        private List<MultiplayerRoomUser>? getRoomUsers()
+        {
+            List<MultiplayerRoomUser>? users = null;
+
+            ManualResetEventSlim resetEvent = new ManualResetEventSlim();
+
+            // at some point we probably want to replace all these schedule calls with Room.LockForUpdate.
+            // for now, as this would require quite some consideration due to the number of accesses to the room instance,
+            // let's just to a schedule for the non-scheduled usages instead.
+            Schedule(() =>
+            {
+                users = Room?.Users.ToList();
+                resetEvent.Set();
+            });
+
+            resetEvent.Wait(100);
+
+            return users;
+        }
+
         /// <summary>
         /// Updates the local room settings with the given <see cref="MultiplayerRoomSettings"/>.
         /// </summary>

From f9900720d58e9b5e61f48f3a83643b8f2c11b88c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 26 Dec 2020 10:48:55 +0900
Subject: [PATCH 0603/3722] Rename OnRoomChanged to OnRoomUpdated to avoid
 confusion

---
 .../Multiplayer/StatefulMultiplayerClient.cs     | 16 ++++++++--------
 .../Multiplayer/Match/MultiplayerReadyButton.cs  |  4 ++--
 .../Multiplayer/MultiplayerRoomComposite.cs      | 11 +++++++----
 .../Multiplayer/Participants/ParticipantPanel.cs |  4 ++--
 .../Multiplayer/Participants/ParticipantsList.cs |  4 ++--
 5 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index ec0967df75..8839b79c13 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Online.Multiplayer
         /// <summary>
         /// Invoked when any change occurs to the multiplayer room.
         /// </summary>
-        public event Action? RoomChanged;
+        public event Action? RoomUpdated;
 
         /// <summary>
         /// Invoked when the multiplayer server requests the current beatmap to be loaded into play.
@@ -134,7 +134,7 @@ namespace osu.Game.Online.Multiplayer
                 apiRoom = null;
                 Room = null;
 
-                RoomChanged?.Invoke();
+                RoomUpdated?.Invoke();
             });
 
             return Task.CompletedTask;
@@ -214,7 +214,7 @@ namespace osu.Game.Online.Multiplayer
                         break;
                 }
 
-                RoomChanged?.Invoke();
+                RoomUpdated?.Invoke();
             });
 
             return Task.CompletedTask;
@@ -238,7 +238,7 @@ namespace osu.Game.Online.Multiplayer
 
                 Room.Users.Add(user);
 
-                RoomChanged?.Invoke();
+                RoomUpdated?.Invoke();
             });
         }
 
@@ -255,7 +255,7 @@ namespace osu.Game.Online.Multiplayer
                 Room.Users.Remove(user);
                 PlayingUsers.Remove(user.UserID);
 
-                RoomChanged?.Invoke();
+                RoomUpdated?.Invoke();
             });
 
             return Task.CompletedTask;
@@ -278,7 +278,7 @@ namespace osu.Game.Online.Multiplayer
                 Room.Host = user;
                 apiRoom.Host.Value = user?.User;
 
-                RoomChanged?.Invoke();
+                RoomUpdated?.Invoke();
             });
 
             return Task.CompletedTask;
@@ -305,7 +305,7 @@ namespace osu.Game.Online.Multiplayer
                 if (state != MultiplayerUserState.Playing)
                     PlayingUsers.Remove(userId);
 
-                RoomChanged?.Invoke();
+                RoomUpdated?.Invoke();
             });
 
             return Task.CompletedTask;
@@ -419,7 +419,7 @@ namespace osu.Game.Online.Multiplayer
                 // In-order for the client to not display an outdated beatmap, the playlist is forcefully cleared here.
                 apiRoom.Playlist.Clear();
 
-                RoomChanged?.Invoke();
+                RoomUpdated?.Invoke();
 
                 var req = new GetBeatmapSetRequest(settings.BeatmapID, BeatmapSetLookupType.BeatmapId);
                 req.Success += res => updatePlaylist(settings, res);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
index 15d6ef8aff..975a2cf023 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -56,9 +56,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             sampleReadyCount = audio.Samples.Get(@"SongSelect/select-difficulty");
         }
 
-        protected override void OnRoomChanged()
+        protected override void OnRoomUpdated()
         {
-            base.OnRoomChanged();
+            base.OnRoomUpdated();
 
             localUser = Room?.Users.Single(u => u.User?.Id == api.LocalUser.Value.Id);
             button.Enabled.Value = Client.Room?.State == MultiplayerRoomState.Open;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs
index ac608a13d4..8030107ad8 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs
@@ -19,18 +19,21 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             base.LoadComplete();
 
-            Client.RoomChanged += OnRoomChanged;
-            OnRoomChanged();
+            Client.RoomUpdated += OnRoomUpdated;
+            OnRoomUpdated();
         }
 
-        protected virtual void OnRoomChanged()
+        /// <summary>
+        /// Invoked when any change occurs to the multiplayer room.
+        /// </summary>
+        protected virtual void OnRoomUpdated()
         {
         }
 
         protected override void Dispose(bool isDisposing)
         {
             if (Client != null)
-                Client.RoomChanged -= OnRoomChanged;
+                Client.RoomUpdated -= OnRoomUpdated;
 
             base.Dispose(isDisposing);
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index 044afa7445..de3069b2f6 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -135,9 +135,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
             };
         }
 
-        protected override void OnRoomChanged()
+        protected override void OnRoomUpdated()
         {
-            base.OnRoomChanged();
+            base.OnRoomUpdated();
 
             if (Room == null)
                 return;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsList.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsList.cs
index b9ac096c4a..3759e45f18 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsList.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsList.cs
@@ -36,9 +36,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
             };
         }
 
-        protected override void OnRoomChanged()
+        protected override void OnRoomUpdated()
         {
-            base.OnRoomChanged();
+            base.OnRoomUpdated();
 
             if (Room == null)
                 panels.Clear();

From fe1bbb1cac671b65dca154784955314db434adbc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 26 Dec 2020 10:49:22 +0900
Subject: [PATCH 0604/3722] Don't fail if the local user is not present in room
 users when updating ready button state

---
 .../OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
index 975a2cf023..281e92404c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -60,7 +60,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
         {
             base.OnRoomUpdated();
 
-            localUser = Room?.Users.Single(u => u.User?.Id == api.LocalUser.Value.Id);
+            // this method is called on leaving the room, so the local user may not exist in the room any more.
+            localUser = Room?.Users.SingleOrDefault(u => u.User?.Id == api.LocalUser.Value.Id);
+
             button.Enabled.Value = Client.Room?.State == MultiplayerRoomState.Open;
             updateState();
         }

From e7339d6959ba8c94fd76ec2e5f2d0e9da0f5074d Mon Sep 17 00:00:00 2001
From: Neuheit <38368299+Neuheit@users.noreply.github.com>
Date: Fri, 25 Dec 2020 21:07:33 -0500
Subject: [PATCH 0605/3722] fix(osu.Game): Ensure Category property is copied
 in Room.

---
 osu.Game/Online/Rooms/Room.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Online/Rooms/Room.cs b/osu.Game/Online/Rooms/Room.cs
index 67f874cdc4..bb21971afa 100644
--- a/osu.Game/Online/Rooms/Room.cs
+++ b/osu.Game/Online/Rooms/Room.cs
@@ -130,6 +130,7 @@ namespace osu.Game.Online.Rooms
         {
             RoomID.Value = other.RoomID.Value;
             Name.Value = other.Name.Value;
+            Category.Value = other.Category.Value;
 
             if (other.Host.Value != null && Host.Value?.Id != other.Host.Value.Id)
                 Host.Value = other.Host.Value;

From ff57562956515a4895c6f50c0ec49746a2ad4963 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 26 Dec 2020 11:34:05 +0900
Subject: [PATCH 0606/3722] Fix multiplayer leaderboard not unsubscribing from
 quit users

---
 ...TestSceneMultiplayerGameplayLeaderboard.cs |  5 +-
 .../HUD/MultiplayerGameplayLeaderboard.cs     | 61 ++++++++++++++-----
 2 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
index 8078c7b994..98a3ce9b47 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -20,11 +20,12 @@ using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play.HUD;
+using osu.Game.Tests.Visual.Multiplayer;
 using osu.Game.Tests.Visual.Online;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestSceneMultiplayerGameplayLeaderboard : OsuTestScene
+    public class TestSceneMultiplayerGameplayLeaderboard : MultiplayerTestScene
     {
         [Cached(typeof(SpectatorStreamingClient))]
         private TestMultiplayerStreaming streamingClient = new TestMultiplayerStreaming(16);
@@ -47,7 +48,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         [SetUpSteps]
-        public void SetUpSteps()
+        public override void SetUpSteps()
         {
             AddStep("create leaderboard", () =>
             {
diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index c10ec9e004..ce6e19aea0 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -2,12 +2,16 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Diagnostics;
+using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Configuration;
 using osu.Game.Database;
 using osu.Game.Online.API;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Spectator;
 using osu.Game.Rulesets.Scoring;
 
@@ -18,10 +22,21 @@ namespace osu.Game.Screens.Play.HUD
     {
         private readonly ScoreProcessor scoreProcessor;
 
-        private readonly int[] userIds;
-
         private readonly Dictionary<int, TrackedUserData> userScores = new Dictionary<int, TrackedUserData>();
 
+        [Resolved]
+        private SpectatorStreamingClient streamingClient { get; set; }
+
+        [Resolved]
+        private StatefulMultiplayerClient multiplayerClient { get; set; }
+
+        [Resolved]
+        private UserLookupCache userLookupCache { get; set; }
+
+        private Bindable<ScoringMode> scoringMode;
+
+        private readonly BindableList<int> playingUsers;
+
         /// <summary>
         /// Construct a new leaderboard.
         /// </summary>
@@ -33,32 +48,24 @@ namespace osu.Game.Screens.Play.HUD
             this.scoreProcessor = scoreProcessor;
 
             // todo: this will likely be passed in as User instances.
-            this.userIds = userIds;
+            playingUsers = new BindableList<int>(userIds);
         }
 
-        [Resolved]
-        private SpectatorStreamingClient streamingClient { get; set; }
-
-        [Resolved]
-        private UserLookupCache userLookupCache { get; set; }
-
-        private Bindable<ScoringMode> scoringMode;
-
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config, IAPIProvider api)
         {
             streamingClient.OnNewFrames += handleIncomingFrames;
 
-            foreach (var user in userIds)
+            foreach (var userId in playingUsers)
             {
-                streamingClient.WatchUser(user);
+                streamingClient.WatchUser(userId);
 
                 // probably won't be required in the final implementation.
-                var resolvedUser = userLookupCache.GetUserAsync(user).Result;
+                var resolvedUser = userLookupCache.GetUserAsync(userId).Result;
 
                 var trackedUser = new TrackedUserData();
 
-                userScores[user] = trackedUser;
+                userScores[userId] = trackedUser;
                 var leaderboardScore = AddPlayer(resolvedUser, resolvedUser.Id == api.LocalUser.Value.Id);
 
                 ((IBindable<double>)leaderboardScore.Accuracy).BindTo(trackedUser.Accuracy);
@@ -70,6 +77,28 @@ namespace osu.Game.Screens.Play.HUD
             scoringMode.BindValueChanged(updateAllScores, true);
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            playingUsers.BindCollectionChanged(usersChanged);
+            playingUsers.BindTo(multiplayerClient.PlayingUsers);
+        }
+
+        private void usersChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Remove:
+                    foreach (var userId in e.OldItems.OfType<int>())
+                    {
+                        streamingClient.StopWatchingUser(userId);
+                    }
+
+                    break;
+            }
+        }
+
         private void updateAllScores(ValueChangedEvent<ScoringMode> mode)
         {
             foreach (var trackedData in userScores.Values)
@@ -91,7 +120,7 @@ namespace osu.Game.Screens.Play.HUD
 
             if (streamingClient != null)
             {
-                foreach (var user in userIds)
+                foreach (var user in playingUsers)
                 {
                     streamingClient.StopWatchingUser(user);
                 }

From 116acc2b5e073dc6578ad1169ce109a09bc76d24 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 26 Dec 2020 11:35:51 +0900
Subject: [PATCH 0607/3722] Add flow for marking user as quit for further
 handling

---
 .../Play/HUD/MultiplayerGameplayLeaderboard.cs        | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index ce6e19aea0..a71c4685d9 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -93,6 +93,9 @@ namespace osu.Game.Screens.Play.HUD
                     foreach (var userId in e.OldItems.OfType<int>())
                     {
                         streamingClient.StopWatchingUser(userId);
+
+                        if (userScores.TryGetValue(userId, out var trackedData))
+                            trackedData.MarkUserQuit();
                     }
 
                     break;
@@ -143,11 +146,19 @@ namespace osu.Game.Screens.Play.HUD
 
             private readonly BindableInt currentCombo = new BindableInt();
 
+            public IBindable<bool> UserQuit => userQuit;
+
+            private readonly BindableBool userQuit = new BindableBool();
+
             [CanBeNull]
             public FrameHeader LastHeader;
 
+            public void MarkUserQuit() => userQuit.Value = true;
+
             public void UpdateScore(ScoreProcessor processor, ScoringMode mode)
             {
+                Debug.Assert(UserQuit.Value);
+
                 if (LastHeader == null)
                     return;
 

From 71dcbeaf7ce57eb0aae0cd72be4f3a74a2e505bd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 26 Dec 2020 11:43:10 +0900
Subject: [PATCH 0608/3722] Mark user as quit visually on the leaderboard

---
 .../Screens/Play/HUD/GameplayLeaderboardScore.cs    | 13 +++++++++++++
 osu.Game/Screens/Play/HUD/ILeaderboardScore.cs      |  2 ++
 .../Play/HUD/MultiplayerGameplayLeaderboard.cs      | 12 ++++++++++--
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 58281debf1..ed86f3241d 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -34,6 +34,7 @@ namespace osu.Game.Screens.Play.HUD
         public BindableDouble TotalScore { get; } = new BindableDouble();
         public BindableDouble Accuracy { get; } = new BindableDouble(1);
         public BindableInt Combo { get; } = new BindableInt();
+        public BindableBool HasQuit { get; } = new BindableBool();
 
         private int? scorePosition;
 
@@ -230,6 +231,15 @@ namespace osu.Game.Screens.Play.HUD
             TotalScore.BindValueChanged(v => scoreText.Text = v.NewValue.ToString("N0"), true);
             Accuracy.BindValueChanged(v => accuracyText.Text = v.NewValue.FormatAccuracy(), true);
             Combo.BindValueChanged(v => comboText.Text = $"{v.NewValue}x", true);
+            HasQuit.BindValueChanged(v =>
+            {
+                if (v.NewValue)
+                {
+                    // we will probably want to display this in a better way once we have a design.
+                    // and also show states other than quit.
+                    panelColour = Color4.Gray;
+                }
+            }, true);
         }
 
         protected override void LoadComplete()
@@ -244,6 +254,9 @@ namespace osu.Game.Screens.Play.HUD
 
         private void updateColour()
         {
+            if (HasQuit.Value)
+                return;
+
             if (scorePosition == 1)
             {
                 mainFillContainer.ResizeWidthTo(EXTENDED_WIDTH, panel_transition_duration, Easing.OutElastic);
diff --git a/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs b/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs
index bc1a03c5aa..83b6f6621b 100644
--- a/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs
@@ -10,5 +10,7 @@ namespace osu.Game.Screens.Play.HUD
         BindableDouble TotalScore { get; }
         BindableDouble Accuracy { get; }
         BindableInt Combo { get; }
+
+        BindableBool HasQuit { get; }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index a71c4685d9..6b0ca4d74c 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -71,6 +71,7 @@ namespace osu.Game.Screens.Play.HUD
                 ((IBindable<double>)leaderboardScore.Accuracy).BindTo(trackedUser.Accuracy);
                 ((IBindable<double>)leaderboardScore.TotalScore).BindTo(trackedUser.Score);
                 ((IBindable<int>)leaderboardScore.Combo).BindTo(trackedUser.CurrentCombo);
+                ((IBindable<bool>)leaderboardScore.HasQuit).BindTo(trackedUser.UserQuit);
             }
 
             scoringMode = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode);
@@ -81,8 +82,15 @@ namespace osu.Game.Screens.Play.HUD
         {
             base.LoadComplete();
 
-            playingUsers.BindCollectionChanged(usersChanged);
+            // BindableList handles binding in a really bad way (Clear then AddRange) so we need to do this manually..
+            foreach (int userId in playingUsers)
+            {
+                if (!multiplayerClient.PlayingUsers.Contains(userId))
+                    usersChanged(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, new[] { userId }));
+            }
+
             playingUsers.BindTo(multiplayerClient.PlayingUsers);
+            playingUsers.BindCollectionChanged(usersChanged);
         }
 
         private void usersChanged(object sender, NotifyCollectionChangedEventArgs e)
@@ -157,7 +165,7 @@ namespace osu.Game.Screens.Play.HUD
 
             public void UpdateScore(ScoreProcessor processor, ScoringMode mode)
             {
-                Debug.Assert(UserQuit.Value);
+                Debug.Assert(!UserQuit.Value);
 
                 if (LastHeader == null)
                     return;

From 2599e95335a95ac8ae6b4a9685ac074432089a60 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 26 Dec 2020 12:11:19 +0900
Subject: [PATCH 0609/3722] Add test coverage

---
 .../TestSceneMultiplayerGameplayLeaderboard.cs      | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
index 98a3ce9b47..c214a34fe3 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -27,8 +27,10 @@ namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneMultiplayerGameplayLeaderboard : MultiplayerTestScene
     {
+        private const int users = 16;
+
         [Cached(typeof(SpectatorStreamingClient))]
-        private TestMultiplayerStreaming streamingClient = new TestMultiplayerStreaming(16);
+        private TestMultiplayerStreaming streamingClient = new TestMultiplayerStreaming(users);
 
         [Cached(typeof(UserLookupCache))]
         private UserLookupCache lookupCache = new TestSceneCurrentlyPlayingDisplay.TestUserLookupCache();
@@ -59,6 +61,9 @@ namespace osu.Game.Tests.Visual.Gameplay
 
                 streamingClient.Start(Beatmap.Value.BeatmapInfo.OnlineBeatmapID ?? 0);
 
+                Client.PlayingUsers.Clear();
+                Client.PlayingUsers.AddRange(streamingClient.PlayingUsers);
+
                 Children = new Drawable[]
                 {
                     scoreProcessor = new OsuScoreProcessor(),
@@ -82,6 +87,12 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddRepeatStep("update state", () => streamingClient.RandomlyUpdateState(), 100);
         }
 
+        [Test]
+        public void TestUserQuit()
+        {
+            AddRepeatStep("mark user quit", () => Client.PlayingUsers.RemoveAt(0), users);
+        }
+
         public class TestMultiplayerStreaming : SpectatorStreamingClient
         {
             public new BindableList<int> PlayingUsers => (BindableList<int>)base.PlayingUsers;

From 966a2151e3c2af58e9cdb506ffe8637dc5ce9fe3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 26 Dec 2020 17:55:24 +0900
Subject: [PATCH 0610/3722] Ensure the previous leaderboard is removed

---
 .../Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
index c214a34fe3..975c54c3f6 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -54,6 +54,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("create leaderboard", () =>
             {
+                leaderboard?.Expire();
+
                 OsuScoreProcessor scoreProcessor;
                 Beatmap.Value = CreateWorkingBeatmap(Ruleset.Value);
 

From dae27fefe433cefe70b1eb69be65e62b6c1f689b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 26 Dec 2020 10:59:14 +0100
Subject: [PATCH 0611/3722] Run user list copy inline if possible

`getRoomUsers()` was not safe to call from the update thread, as
evidenced by the test failures. This was due to the fact that the added
reset event could never actually be set from within the method, as the
wait was blocking the scheduled set from ever proceeding.

Resolve by allowing the scheduled copy & set to run inline if on the
update thread already.
---
 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index ec0967df75..06ed4b4a6c 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -380,12 +380,12 @@ namespace osu.Game.Online.Multiplayer
 
             // at some point we probably want to replace all these schedule calls with Room.LockForUpdate.
             // for now, as this would require quite some consideration due to the number of accesses to the room instance,
-            // let's just to a schedule for the non-scheduled usages instead.
-            Schedule(() =>
+            // let's just add a manual schedule for the non-scheduled usages instead.
+            Scheduler.Add(() =>
             {
                 users = Room?.Users.ToList();
                 resetEvent.Set();
-            });
+            }, false);
 
             resetEvent.Wait(100);
 

From 04d54c40dbdc65f08975f1ca065ddd4ca1b67d9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 26 Dec 2020 11:58:25 +0100
Subject: [PATCH 0612/3722] Allow all StatefulMultiplayerClient schedules to
 run inline

Fixes test failures due to not allowing to do so, therefore inverting
execution order in some cases - for example, calling

        JoinRoom(room);
        LeaveRoom();

on the update thread would invert execution order due to the first being
unscheduled but the second being scheduled.
---
 .../Multiplayer/StatefulMultiplayerClient.cs  | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 06ed4b4a6c..98b53e723c 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Online.Multiplayer
 
         public virtual Task LeaveRoom()
         {
-            Schedule(() =>
+            Scheduler.Add(() =>
             {
                 if (Room == null)
                     return;
@@ -135,7 +135,7 @@ namespace osu.Game.Online.Multiplayer
                 Room = null;
 
                 RoomChanged?.Invoke();
-            });
+            }, false);
 
             return Task.CompletedTask;
         }
@@ -190,7 +190,7 @@ namespace osu.Game.Online.Multiplayer
             if (Room == null)
                 return Task.CompletedTask;
 
-            Schedule(() =>
+            Scheduler.Add(() =>
             {
                 if (Room == null)
                     return;
@@ -215,7 +215,7 @@ namespace osu.Game.Online.Multiplayer
                 }
 
                 RoomChanged?.Invoke();
-            });
+            }, false);
 
             return Task.CompletedTask;
         }
@@ -227,7 +227,7 @@ namespace osu.Game.Online.Multiplayer
 
             await PopulateUser(user);
 
-            Schedule(() =>
+            Scheduler.Add(() =>
             {
                 if (Room == null)
                     return;
@@ -239,7 +239,7 @@ namespace osu.Game.Online.Multiplayer
                 Room.Users.Add(user);
 
                 RoomChanged?.Invoke();
-            });
+            }, false);
         }
 
         Task IMultiplayerClient.UserLeft(MultiplayerRoomUser user)
@@ -247,7 +247,7 @@ namespace osu.Game.Online.Multiplayer
             if (Room == null)
                 return Task.CompletedTask;
 
-            Schedule(() =>
+            Scheduler.Add(() =>
             {
                 if (Room == null)
                     return;
@@ -256,7 +256,7 @@ namespace osu.Game.Online.Multiplayer
                 PlayingUsers.Remove(user.UserID);
 
                 RoomChanged?.Invoke();
-            });
+            }, false);
 
             return Task.CompletedTask;
         }
@@ -266,7 +266,7 @@ namespace osu.Game.Online.Multiplayer
             if (Room == null)
                 return Task.CompletedTask;
 
-            Schedule(() =>
+            Scheduler.Add(() =>
             {
                 if (Room == null)
                     return;
@@ -279,7 +279,7 @@ namespace osu.Game.Online.Multiplayer
                 apiRoom.Host.Value = user?.User;
 
                 RoomChanged?.Invoke();
-            });
+            }, false);
 
             return Task.CompletedTask;
         }
@@ -295,7 +295,7 @@ namespace osu.Game.Online.Multiplayer
             if (Room == null)
                 return Task.CompletedTask;
 
-            Schedule(() =>
+            Scheduler.Add(() =>
             {
                 if (Room == null)
                     return;
@@ -306,7 +306,7 @@ namespace osu.Game.Online.Multiplayer
                     PlayingUsers.Remove(userId);
 
                 RoomChanged?.Invoke();
-            });
+            }, false);
 
             return Task.CompletedTask;
         }
@@ -316,13 +316,13 @@ namespace osu.Game.Online.Multiplayer
             if (Room == null)
                 return Task.CompletedTask;
 
-            Schedule(() =>
+            Scheduler.Add(() =>
             {
                 if (Room == null)
                     return;
 
                 LoadRequested?.Invoke();
-            });
+            }, false);
 
             return Task.CompletedTask;
         }
@@ -332,7 +332,7 @@ namespace osu.Game.Online.Multiplayer
             if (Room == null)
                 return Task.CompletedTask;
 
-            Schedule(() =>
+            Scheduler.Add(() =>
             {
                 if (Room == null)
                     return;
@@ -340,7 +340,7 @@ namespace osu.Game.Online.Multiplayer
                 PlayingUsers.AddRange(Room.Users.Where(u => u.State == MultiplayerUserState.Playing).Select(u => u.UserID));
 
                 MatchStarted?.Invoke();
-            });
+            }, false);
 
             return Task.CompletedTask;
         }
@@ -350,13 +350,13 @@ namespace osu.Game.Online.Multiplayer
             if (Room == null)
                 return Task.CompletedTask;
 
-            Schedule(() =>
+            Scheduler.Add(() =>
             {
                 if (Room == null)
                     return;
 
                 ResultsReady?.Invoke();
-            });
+            }, false);
 
             return Task.CompletedTask;
         }
@@ -404,7 +404,7 @@ namespace osu.Game.Online.Multiplayer
             if (Room == null)
                 return;
 
-            Schedule(() =>
+            Scheduler.Add(() =>
             {
                 if (Room == null)
                     return;
@@ -425,7 +425,7 @@ namespace osu.Game.Online.Multiplayer
                 req.Success += res => updatePlaylist(settings, res);
 
                 api.Queue(req);
-            });
+            }, false);
         }
 
         private void updatePlaylist(MultiplayerRoomSettings settings, APIBeatmapSet onlineSet)

From b9d725ab4928c0385b63da2d5ed5496b0faee21a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 26 Dec 2020 20:13:28 +0900
Subject: [PATCH 0613/3722] Don't copy spotlight category

---
 osu.Game/Online/Rooms/Room.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/Rooms/Room.cs b/osu.Game/Online/Rooms/Room.cs
index bb21971afa..763ba25d52 100644
--- a/osu.Game/Online/Rooms/Room.cs
+++ b/osu.Game/Online/Rooms/Room.cs
@@ -130,7 +130,9 @@ namespace osu.Game.Online.Rooms
         {
             RoomID.Value = other.RoomID.Value;
             Name.Value = other.Name.Value;
-            Category.Value = other.Category.Value;
+
+            if (other.Category.Value != RoomCategory.Spotlight)
+                Category.Value = other.Category.Value;
 
             if (other.Host.Value != null && Host.Value?.Id != other.Host.Value.Id)
                 Host.Value = other.Host.Value;

From 0b42b4b95598dcb067a4d06b4b734a0e468204c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 26 Dec 2020 13:54:10 +0100
Subject: [PATCH 0614/3722] Rename {Drawable -> Clickable}Avatar

---
 osu.Game/Online/Leaderboards/LeaderboardScore.cs           | 4 ++--
 osu.Game/Overlays/Chat/Tabs/PrivateChannelTabItem.cs       | 4 ++--
 .../Drawables/{DrawableAvatar.cs => ClickableAvatar.cs}    | 7 ++++---
 osu.Game/Users/Drawables/UpdateableAvatar.cs               | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)
 rename osu.Game/Users/Drawables/{DrawableAvatar.cs => ClickableAvatar.cs} (90%)

diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index d8207aa8f4..5608002513 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Online.Leaderboards
 
             statisticsLabels = GetStatistics(score).Select(s => new ScoreComponentLabel(s)).ToList();
 
-            DrawableAvatar innerAvatar;
+            ClickableAvatar innerAvatar;
 
             Children = new Drawable[]
             {
@@ -115,7 +115,7 @@ namespace osu.Game.Online.Leaderboards
                             Children = new[]
                             {
                                 avatar = new DelayedLoadWrapper(
-                                    innerAvatar = new DrawableAvatar(user)
+                                    innerAvatar = new ClickableAvatar(user)
                                     {
                                         RelativeSizeAxes = Axes.Both,
                                         CornerRadius = corner_radius,
diff --git a/osu.Game/Overlays/Chat/Tabs/PrivateChannelTabItem.cs b/osu.Game/Overlays/Chat/Tabs/PrivateChannelTabItem.cs
index 5b428a3825..00f46b0035 100644
--- a/osu.Game/Overlays/Chat/Tabs/PrivateChannelTabItem.cs
+++ b/osu.Game/Overlays/Chat/Tabs/PrivateChannelTabItem.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Overlays.Chat.Tabs
             if (value.Type != ChannelType.PM)
                 throw new ArgumentException("Argument value needs to have the targettype user!");
 
-            DrawableAvatar avatar;
+            ClickableAvatar avatar;
 
             AddRange(new Drawable[]
             {
@@ -48,7 +48,7 @@ namespace osu.Game.Overlays.Chat.Tabs
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
                             Masking = true,
-                            Child = new DelayedLoadWrapper(avatar = new DrawableAvatar(value.Users.First())
+                            Child = new DelayedLoadWrapper(avatar = new ClickableAvatar(value.Users.First())
                             {
                                 RelativeSizeAxes = Axes.Both,
                                 OpenOnClick = { Value = false },
diff --git a/osu.Game/Users/Drawables/DrawableAvatar.cs b/osu.Game/Users/Drawables/ClickableAvatar.cs
similarity index 90%
rename from osu.Game/Users/Drawables/DrawableAvatar.cs
rename to osu.Game/Users/Drawables/ClickableAvatar.cs
index 42d2dbb1c6..61af2d8e27 100644
--- a/osu.Game/Users/Drawables/DrawableAvatar.cs
+++ b/osu.Game/Users/Drawables/ClickableAvatar.cs
@@ -14,7 +14,7 @@ using osu.Game.Graphics.Containers;
 namespace osu.Game.Users.Drawables
 {
     [LongRunningLoad]
-    public class DrawableAvatar : Container
+    public class ClickableAvatar : Container
     {
         /// <summary>
         /// Whether to open the user's profile when clicked.
@@ -27,10 +27,11 @@ namespace osu.Game.Users.Drawables
         private OsuGame game { get; set; }
 
         /// <summary>
-        /// An avatar for specified user.
+        /// A clickable avatar for specified user, with UI sounds included.
+        /// If <see cref="OpenOnClick"/> is <c>true</c>, clicking will open the user's profile.
         /// </summary>
         /// <param name="user">The user. A null value will get a placeholder avatar.</param>
-        public DrawableAvatar(User user = null)
+        public ClickableAvatar(User user = null)
         {
             this.user = user;
         }
diff --git a/osu.Game/Users/Drawables/UpdateableAvatar.cs b/osu.Game/Users/Drawables/UpdateableAvatar.cs
index 171462f3fc..4772207edf 100644
--- a/osu.Game/Users/Drawables/UpdateableAvatar.cs
+++ b/osu.Game/Users/Drawables/UpdateableAvatar.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Users.Drawables
             if (user == null && !ShowGuestOnNull)
                 return null;
 
-            var avatar = new DrawableAvatar(user)
+            var avatar = new ClickableAvatar(user)
             {
                 RelativeSizeAxes = Axes.Both,
             };

From e8f96b24013827b5c173159b960a0443d18ee87c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 26 Dec 2020 14:02:53 +0100
Subject: [PATCH 0615/3722] Bring back DrawableAvatar as a simple sprite

---
 osu.Game/Users/Drawables/ClickableAvatar.cs | 22 ++----------
 osu.Game/Users/Drawables/DrawableAvatar.cs  | 39 +++++++++++++++++++++
 2 files changed, 42 insertions(+), 19 deletions(-)
 create mode 100644 osu.Game/Users/Drawables/DrawableAvatar.cs

diff --git a/osu.Game/Users/Drawables/ClickableAvatar.cs b/osu.Game/Users/Drawables/ClickableAvatar.cs
index 61af2d8e27..0fca9c7c9b 100644
--- a/osu.Game/Users/Drawables/ClickableAvatar.cs
+++ b/osu.Game/Users/Drawables/ClickableAvatar.cs
@@ -1,19 +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 osu.Framework.Allocation;
 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.Input.Events;
 using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Users.Drawables
 {
-    [LongRunningLoad]
     public class ClickableAvatar : Container
     {
         /// <summary>
@@ -27,7 +24,7 @@ namespace osu.Game.Users.Drawables
         private OsuGame game { get; set; }
 
         /// <summary>
-        /// A clickable avatar for specified user, with UI sounds included.
+        /// A clickable avatar for the specified user, with UI sounds included.
         /// If <see cref="OpenOnClick"/> is <c>true</c>, clicking will open the user's profile.
         /// </summary>
         /// <param name="user">The user. A null value will get a placeholder avatar.</param>
@@ -39,28 +36,15 @@ namespace osu.Game.Users.Drawables
         [BackgroundDependencyLoader]
         private void load(LargeTextureStore textures)
         {
-            if (textures == null)
-                throw new ArgumentNullException(nameof(textures));
-
-            Texture texture = null;
-            if (user != null && user.Id > 1) texture = textures.Get($@"https://a.ppy.sh/{user.Id}");
-            texture ??= textures.Get(@"Online/avatar-guest");
-
             ClickableArea clickableArea;
             Add(clickableArea = new ClickableArea
             {
                 RelativeSizeAxes = Axes.Both,
-                Child = new Sprite
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Texture = texture,
-                    FillMode = FillMode.Fit,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre
-                },
                 Action = openProfile
             });
 
+            LoadComponentAsync(new DrawableAvatar(user), clickableArea.Add);
+
             clickableArea.Enabled.BindTo(OpenOnClick);
         }
 
diff --git a/osu.Game/Users/Drawables/DrawableAvatar.cs b/osu.Game/Users/Drawables/DrawableAvatar.cs
new file mode 100644
index 0000000000..81f6ad52d9
--- /dev/null
+++ b/osu.Game/Users/Drawables/DrawableAvatar.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.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+
+namespace osu.Game.Users.Drawables
+{
+    [LongRunningLoad]
+    public class DrawableAvatar : Sprite
+    {
+        private readonly User user;
+
+        /// <summary>
+        /// A simple, non-interactable avatar sprite for the specified user.
+        /// </summary>
+        /// <param name="user">The user. A null value will get a placeholder avatar.</param>
+        public DrawableAvatar(User user = null)
+        {
+            this.user = user;
+
+            RelativeSizeAxes = Axes.Both;
+            FillMode = FillMode.Fit;
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(LargeTextureStore textures)
+        {
+            if (user != null && user.Id > 1)
+                Texture = textures.Get($@"https://a.ppy.sh/{user.Id}");
+
+            Texture ??= textures.Get(@"Online/avatar-guest");
+        }
+    }
+}

From 8ec7970b6ab10a028d4066571255587e95baf29f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 26 Dec 2020 14:06:09 +0100
Subject: [PATCH 0616/3722] Move load-complete fade specification inside

---
 osu.Game/Users/Drawables/DrawableAvatar.cs   | 6 ++++++
 osu.Game/Users/Drawables/UpdateableAvatar.cs | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Users/Drawables/DrawableAvatar.cs b/osu.Game/Users/Drawables/DrawableAvatar.cs
index 81f6ad52d9..3dae3afe3f 100644
--- a/osu.Game/Users/Drawables/DrawableAvatar.cs
+++ b/osu.Game/Users/Drawables/DrawableAvatar.cs
@@ -35,5 +35,11 @@ namespace osu.Game.Users.Drawables
 
             Texture ??= textures.Get(@"Online/avatar-guest");
         }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            this.FadeInFromZero(300, Easing.OutQuint);
+        }
     }
 }
diff --git a/osu.Game/Users/Drawables/UpdateableAvatar.cs b/osu.Game/Users/Drawables/UpdateableAvatar.cs
index 4772207edf..927e48cb56 100644
--- a/osu.Game/Users/Drawables/UpdateableAvatar.cs
+++ b/osu.Game/Users/Drawables/UpdateableAvatar.cs
@@ -70,7 +70,6 @@ namespace osu.Game.Users.Drawables
                 RelativeSizeAxes = Axes.Both,
             };
 
-            avatar.OnLoadComplete += d => d.FadeInFromZero(300, Easing.OutQuint);
             avatar.OpenOnClick.BindTo(OpenOnClick);
 
             return avatar;

From 15948de2f0cbe1c64abf0b6a4a9fba813c047a2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 26 Dec 2020 14:06:23 +0100
Subject: [PATCH 0617/3722] Fix gameplay leaderboard avatars being clickable

---
 .../Screens/Play/HUD/GameplayLeaderboardScore.cs     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 58281debf1..51b19a8d45 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -78,6 +78,8 @@ namespace osu.Game.Screens.Play.HUD
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
+            Container avatarContainer;
+
             InternalChildren = new Drawable[]
             {
                 mainFillContainer = new Container
@@ -152,7 +154,7 @@ namespace osu.Game.Screens.Play.HUD
                                         Spacing = new Vector2(4f, 0f),
                                         Children = new Drawable[]
                                         {
-                                            new CircularContainer
+                                            avatarContainer = new CircularContainer
                                             {
                                                 Masking = true,
                                                 Anchor = Anchor.CentreLeft,
@@ -166,11 +168,7 @@ namespace osu.Game.Screens.Play.HUD
                                                         Alpha = 0.3f,
                                                         RelativeSizeAxes = Axes.Both,
                                                         Colour = colours.Gray4,
-                                                    },
-                                                    new UpdateableAvatar(User)
-                                                    {
-                                                        RelativeSizeAxes = Axes.Both,
-                                                    },
+                                                    }
                                                 }
                                             },
                                             usernameText = new OsuSpriteText
@@ -227,6 +225,8 @@ namespace osu.Game.Screens.Play.HUD
                 }
             };
 
+            LoadComponentAsync(new DrawableAvatar(User), avatarContainer.Add);
+
             TotalScore.BindValueChanged(v => scoreText.Text = v.NewValue.ToString("N0"), true);
             Accuracy.BindValueChanged(v => accuracyText.Text = v.NewValue.FormatAccuracy(), true);
             Combo.BindValueChanged(v => comboText.Text = $"{v.NewValue}x", true);

From 9e15dccc56bfcdde0f36a6c15db413faff07b06b Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sat, 26 Dec 2020 15:36:21 +0100
Subject: [PATCH 0618/3722] Move graceful exit to OsuGameBase

---
 osu.Game/OsuGame.cs     | 12 ------------
 osu.Game/OsuGameBase.cs | 12 ++++++++++++
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index bb638bcf3a..710dfd7031 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -918,18 +918,6 @@ namespace osu.Game
             return base.OnExiting();
         }
 
-        /// <summary>
-        /// Use to programatically exit the game as if the user was triggering via alt-f4.
-        /// Will keep persisting until an exit occurs (exit may be blocked multiple times).
-        /// </summary>
-        public void GracefullyExit()
-        {
-            if (!OnExiting())
-                Exit();
-            else
-                Scheduler.AddDelayed(GracefullyExit, 2000);
-        }
-
         protected override void UpdateAfterChildren()
         {
             base.UpdateAfterChildren();
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index e7b5d3304d..91ab2bdc1e 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -368,6 +368,18 @@ namespace osu.Game
             LocalConfig ??= new OsuConfigManager(Storage);
         }
 
+        /// <summary>
+        /// Use to programatically exit the game as if the user was triggering via alt-f4.
+        /// Will keep persisting until an exit occurs (exit may be blocked multiple times).
+        /// </summary>
+        public void GracefullyExit()
+        {
+            if (!OnExiting())
+                Exit();
+            else
+                Scheduler.AddDelayed(GracefullyExit, 2000);
+        }
+
         protected override Storage CreateStorage(GameHost host, Storage defaultStorage) => new OsuStorage(host, defaultStorage);
 
         private readonly List<ICanAcceptFiles> fileImporters = new List<ICanAcceptFiles>();

From 8e428353ee0ae94e7efd7995ddbd01317842b7f7 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sat, 26 Dec 2020 15:44:59 +0100
Subject: [PATCH 0619/3722] Revise TournamentSwitcher to include a close button

---
 osu.Game.Tournament/Screens/SetupScreen.cs | 44 ++++++++++++++++++----
 1 file changed, 37 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index 3c9d3c949b..de3321397e 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -42,6 +42,9 @@ namespace osu.Game.Tournament.Screens
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
+        [Resolved]
+        private TournamentGameBase game { get; set; }
+
         [Resolved(canBeNull: true)]
         private TournamentSceneManager sceneManager { get; set; }
 
@@ -68,9 +71,6 @@ namespace osu.Game.Tournament.Screens
             reload();
         }
 
-        [Resolved]
-        private Framework.Game game { get; set; }
-
         private void reload()
         {
             var fileBasedIpc = ipc as FileBasedIPC;
@@ -115,12 +115,14 @@ namespace osu.Game.Tournament.Screens
                     Items = rulesets.AvailableRulesets,
                     Current = LadderInfo.Ruleset,
                 },
-                new LabelledDropdown<string>
+                new TournamentSwitcher
                 {
                     Label = "Current tournament",
                     Description = "Changes the background videos and bracket to match the selected tournament. This requires a restart to apply changes.",
                     Items = storage.ListTournaments(),
                     Current = storage.CurrentTournament,
+                    ButtonText = "Close osu!",
+                    Action = () => game.GracefullyExit()
                 },
                 resolution = new ResolutionSelector
                 {
@@ -165,7 +167,7 @@ namespace osu.Game.Tournament.Screens
 
         private class ActionableInfo : LabelledDrawable<Drawable>
         {
-            private OsuButton button;
+            protected OsuButton Button;
 
             public ActionableInfo()
                 : base(true)
@@ -174,7 +176,7 @@ namespace osu.Game.Tournament.Screens
 
             public string ButtonText
             {
-                set => button.Text = value;
+                set => Button.Text = value;
             }
 
             public string Value
@@ -211,7 +213,7 @@ namespace osu.Game.Tournament.Screens
                         Spacing = new Vector2(10, 0),
                         Children = new Drawable[]
                         {
-                            button = new TriangleButton
+                            Button = new TriangleButton
                             {
                                 Size = new Vector2(100, 40),
                                 Action = () => Action?.Invoke()
@@ -222,6 +224,34 @@ namespace osu.Game.Tournament.Screens
             };
         }
 
+        private class TournamentSwitcher : ActionableInfo
+        {
+            private OsuDropdown<string> dropdown;
+
+            public IEnumerable<string> Items
+            {
+                get => dropdown.Items;
+                set => dropdown.Items = value;
+            }
+
+            public Bindable<string> Current
+            {
+                get => dropdown.Current;
+                set => dropdown.Current = value;
+            }
+
+            protected override Drawable CreateComponent()
+            {
+                var drawable = base.CreateComponent();
+                FlowContainer.Insert(-1, dropdown = new OsuDropdown<string>
+                {
+                    Width = 510
+                });
+
+                return drawable;
+            }
+        }
+
         private class ResolutionSelector : ActionableInfo
         {
             private const int minimum_window_height = 480;

From 43f8f3638a9550a0d2d14d827ef3ee53f552f4e3 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 27 Dec 2020 02:42:13 +0300
Subject: [PATCH 0620/3722] Fix mod using reference equality unless casted to
 `IMod`

---
 osu.Game/Online/API/APIMod.cs  | 4 ++--
 osu.Game/Rulesets/Mods/IMod.cs | 3 +--
 osu.Game/Rulesets/Mods/Mod.cs  | 4 ++--
 osu.Game/Scoring/ScoreInfo.cs  | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Online/API/APIMod.cs b/osu.Game/Online/API/APIMod.cs
index 780e5daa16..f4e0e1b11f 100644
--- a/osu.Game/Online/API/APIMod.cs
+++ b/osu.Game/Online/API/APIMod.cs
@@ -13,7 +13,7 @@ using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Online.API
 {
-    public class APIMod : IMod
+    public class APIMod : IMod, IEquatable<APIMod>
     {
         [JsonProperty("acronym")]
         public string Acronym { get; set; }
@@ -52,7 +52,7 @@ namespace osu.Game.Online.API
             return resultMod;
         }
 
-        public bool Equals(IMod other) => Acronym == other?.Acronym;
+        public bool Equals(APIMod other) => Acronym == other?.Acronym;
 
         public override string ToString()
         {
diff --git a/osu.Game/Rulesets/Mods/IMod.cs b/osu.Game/Rulesets/Mods/IMod.cs
index a5e19f293c..448ad0eb30 100644
--- a/osu.Game/Rulesets/Mods/IMod.cs
+++ b/osu.Game/Rulesets/Mods/IMod.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.
 
-using System;
 using Newtonsoft.Json;
 
 namespace osu.Game.Rulesets.Mods
 {
-    public interface IMod : IEquatable<IMod>
+    public interface IMod
     {
         /// <summary>
         /// The shortened name of this mod.
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index b8dc7a2661..33550e070b 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Mods
     /// The base class for gameplay modifiers.
     /// </summary>
     [ExcludeFromDynamicCompile]
-    public abstract class Mod : IMod, IJsonSerializable
+    public abstract class Mod : IMod, IEquatable<Mod>, IJsonSerializable
     {
         /// <summary>
         /// The name of this mod.
@@ -149,6 +149,6 @@ namespace osu.Game.Rulesets.Mods
             return copy;
         }
 
-        public bool Equals(IMod other) => GetType() == other?.GetType();
+        public bool Equals(Mod other) => GetType() == other?.GetType();
     }
 }
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index f5192f3a40..59eaa994c2 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -252,11 +252,11 @@ namespace osu.Game.Scoring
         }
 
         [Serializable]
-        protected class DeserializedMod : IMod
+        protected class DeserializedMod : IMod, IEquatable<DeserializedMod>
         {
             public string Acronym { get; set; }
 
-            public bool Equals(IMod other) => Acronym == other?.Acronym;
+            public bool Equals(DeserializedMod other) => Acronym == other?.Acronym;
         }
 
         public override string ToString() => $"{User} playing {Beatmap}";

From fa0576f47f05faa4631e7a00a5a50b4c50d38eb1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 27 Dec 2020 13:40:02 +0900
Subject: [PATCH 0621/3722] Move quit colour change implementation to
 updateColour for better coverage

---
 .../Play/HUD/GameplayLeaderboardScore.cs        | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index ed86f3241d..4aeb65bb01 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -231,15 +231,7 @@ namespace osu.Game.Screens.Play.HUD
             TotalScore.BindValueChanged(v => scoreText.Text = v.NewValue.ToString("N0"), true);
             Accuracy.BindValueChanged(v => accuracyText.Text = v.NewValue.FormatAccuracy(), true);
             Combo.BindValueChanged(v => comboText.Text = $"{v.NewValue}x", true);
-            HasQuit.BindValueChanged(v =>
-            {
-                if (v.NewValue)
-                {
-                    // we will probably want to display this in a better way once we have a design.
-                    // and also show states other than quit.
-                    panelColour = Color4.Gray;
-                }
-            }, true);
+            HasQuit.BindValueChanged(v => updateColour());
         }
 
         protected override void LoadComplete()
@@ -255,7 +247,14 @@ namespace osu.Game.Screens.Play.HUD
         private void updateColour()
         {
             if (HasQuit.Value)
+            {
+                // we will probably want to display this in a better way once we have a design.
+                // and also show states other than quit.
+                mainFillContainer.ResizeWidthTo(regular_width, panel_transition_duration, Easing.OutElastic);
+                panelColour = Color4.Gray;
+                textColour = Color4.White;
                 return;
+            }
 
             if (scorePosition == 1)
             {

From d14a8d24b5c3cb7669a3b7537ba69820aa1e0fa4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 27 Dec 2020 16:42:20 +0900
Subject: [PATCH 0622/3722] Remove assert for now

---
 osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index 6b0ca4d74c..42df0cfe8c 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -165,8 +165,6 @@ namespace osu.Game.Screens.Play.HUD
 
             public void UpdateScore(ScoreProcessor processor, ScoringMode mode)
             {
-                Debug.Assert(!UserQuit.Value);
-
                 if (LastHeader == null)
                     return;
 

From 1b34f2115f6ef323aa66bf07d3e0b7ac05e76606 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 27 Dec 2020 16:57:23 +0900
Subject: [PATCH 0623/3722] Remove dignostics using

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

diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index 42df0cfe8c..00e2b8bfa7 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.Diagnostics;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;

From 6b6b1514e2b7b2249db579297cfe94aa44a8b52d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 27 Dec 2020 12:58:37 +0100
Subject: [PATCH 0624/3722] Rename method to be less misleading

As it doesn't only change colour, but also width.
---
 osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 4aeb65bb01..1bd279922c 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Screens.Play.HUD
                     positionText.Text = $"#{scorePosition.Value.FormatRank()}";
 
                 positionText.FadeTo(scorePosition.HasValue ? 1 : 0);
-                updateColour();
+                updateState();
             }
         }
 
@@ -231,20 +231,20 @@ namespace osu.Game.Screens.Play.HUD
             TotalScore.BindValueChanged(v => scoreText.Text = v.NewValue.ToString("N0"), true);
             Accuracy.BindValueChanged(v => accuracyText.Text = v.NewValue.FormatAccuracy(), true);
             Combo.BindValueChanged(v => comboText.Text = $"{v.NewValue}x", true);
-            HasQuit.BindValueChanged(v => updateColour());
+            HasQuit.BindValueChanged(v => updateState());
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            updateColour();
+            updateState();
             FinishTransforms(true);
         }
 
         private const double panel_transition_duration = 500;
 
-        private void updateColour()
+        private void updateState()
         {
             if (HasQuit.Value)
             {

From f75dccc9e4872477c66a484ddc13ef943511e43f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 27 Dec 2020 13:00:27 +0100
Subject: [PATCH 0625/3722] Explicitly use discard in value changed callback

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

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 1bd279922c..43e259695e 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -231,7 +231,7 @@ namespace osu.Game.Screens.Play.HUD
             TotalScore.BindValueChanged(v => scoreText.Text = v.NewValue.ToString("N0"), true);
             Accuracy.BindValueChanged(v => accuracyText.Text = v.NewValue.FormatAccuracy(), true);
             Combo.BindValueChanged(v => comboText.Text = $"{v.NewValue}x", true);
-            HasQuit.BindValueChanged(v => updateState());
+            HasQuit.BindValueChanged(_ => updateState());
         }
 
         protected override void LoadComplete()

From e9e0e18dc53a83c18c6aff7a2aac27b92445c1cb Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 27 Dec 2020 14:11:30 +0100
Subject: [PATCH 0626/3722] Fix missed change in merge conflict...

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

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index c397608bc6..7f2ef82d12 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -54,7 +54,7 @@ namespace osu.Android
             {
                 case Intent.ActionDefault:
                     if (intent.Scheme == ContentResolver.SchemeContent)
-                        handleImportFromUri(intent.Data);
+                        handleImportFromUris(intent.Data);
                     else if (osu_url_schemes.Contains(intent.Scheme))
                         game.HandleLink(intent.DataString);
                     break;

From 4d61c143db058bcc47bac98490dbaa246e873872 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Dec 2020 14:56:29 +0900
Subject: [PATCH 0627/3722] Fix lookup cache throwing a null reference if no
 matches were successful

---
 osu.Game/Database/UserLookupCache.cs | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Database/UserLookupCache.cs b/osu.Game/Database/UserLookupCache.cs
index 05d6930992..e7ddf4c567 100644
--- a/osu.Game/Database/UserLookupCache.cs
+++ b/osu.Game/Database/UserLookupCache.cs
@@ -72,6 +72,7 @@ namespace osu.Game.Database
             var request = new GetUsersRequest(userTasks.Keys.ToArray());
 
             // rather than queueing, we maintain our own single-threaded request stream.
+            // todo: we probably want retry logic here.
             api.Perform(request);
 
             // Create a new request task if there's still more users to query.
@@ -82,14 +83,19 @@ namespace osu.Game.Database
                     createNewTask();
             }
 
-            foreach (var user in request.Result.Users)
-            {
-                if (userTasks.TryGetValue(user.Id, out var tasks))
-                {
-                    foreach (var task in tasks)
-                        task.SetResult(user);
+            List<User> foundUsers = request.Result?.Users;
 
-                    userTasks.Remove(user.Id);
+            if (foundUsers != null)
+            {
+                foreach (var user in foundUsers)
+                {
+                    if (userTasks.TryGetValue(user.Id, out var tasks))
+                    {
+                        foreach (var task in tasks)
+                            task.SetResult(user);
+
+                        userTasks.Remove(user.Id);
+                    }
                 }
             }
 

From 046a76cb1d1597414ae08e9e47a2dfa1dcac8e09 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Dec 2020 14:56:53 +0900
Subject: [PATCH 0628/3722] Allow null users to still be displayed in the
 participant list

The fix here is correcting the access of `user.Country`. The deicision
to have null users display is because this is the best we can do (if
osu-web could not resolve the user). We still want the users in the
lobby to be aware of this user's presence, rather than hiding them from
view.

osu-stable does a similar thing, showing these users as `[Loading]`. I
decided to go with blank names instead because having *any* text there
causes confusion. We can iterate on this in future design updates.
---
 .../TestSceneMultiplayerParticipantsList.cs         | 10 ++++++++++
 .../Multiplayer/Participants/ParticipantPanel.cs    | 13 ++++++-------
 .../Visual/Multiplayer/TestMultiplayerClient.cs     |  2 ++
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index 9181170bee..968a869532 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
@@ -43,6 +43,16 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("two unique panels", () => this.ChildrenOfType<ParticipantPanel>().Select(p => p.User).Distinct().Count() == 2);
         }
 
+        [Test]
+        public void TestAddNullUser()
+        {
+            AddAssert("one unique panel", () => this.ChildrenOfType<ParticipantPanel>().Select(p => p.User).Distinct().Count() == 1);
+
+            AddStep("add non-resolvable user", () => Client.AddNullUser(-3));
+
+            AddUntilStep("two unique panels", () => this.ChildrenOfType<ParticipantPanel>().Select(p => p.User).Distinct().Count() == 2);
+        }
+
         [Test]
         public void TestRemoveUser()
         {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index de3069b2f6..f99655e305 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.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 osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -45,7 +44,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
         [BackgroundDependencyLoader]
         private void load()
         {
-            Debug.Assert(User.User != null);
+            var user = User.User;
 
             var backgroundColour = Color4Extensions.FromHex("#33413C");
 
@@ -82,7 +81,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
                                 Origin = Anchor.CentreRight,
                                 RelativeSizeAxes = Axes.Both,
                                 Width = 0.75f,
-                                User = User.User,
+                                User = user,
                                 Colour = ColourInfo.GradientHorizontal(Color4.White.Opacity(0), Color4.White.Opacity(0.25f))
                             },
                             new FillFlowContainer
@@ -98,28 +97,28 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
                                         Origin = Anchor.CentreLeft,
                                         RelativeSizeAxes = Axes.Both,
                                         FillMode = FillMode.Fit,
-                                        User = User.User
+                                        User = user
                                     },
                                     new UpdateableFlag
                                     {
                                         Anchor = Anchor.CentreLeft,
                                         Origin = Anchor.CentreLeft,
                                         Size = new Vector2(30, 20),
-                                        Country = User.User.Country
+                                        Country = user?.Country
                                     },
                                     new OsuSpriteText
                                     {
                                         Anchor = Anchor.CentreLeft,
                                         Origin = Anchor.CentreLeft,
                                         Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 18),
-                                        Text = User.User.Username
+                                        Text = user?.Username
                                     },
                                     new OsuSpriteText
                                     {
                                         Anchor = Anchor.CentreLeft,
                                         Origin = Anchor.CentreLeft,
                                         Font = OsuFont.GetFont(size: 14),
-                                        Text = User.User.CurrentModeRank != null ? $"#{User.User.CurrentModeRank}" : string.Empty
+                                        Text = user?.CurrentModeRank != null ? $"#{user.CurrentModeRank}" : string.Empty
                                     }
                                 }
                             },
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index 9a839c8d22..2ce5211757 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -28,6 +28,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         public void AddUser(User user) => ((IMultiplayerClient)this).UserJoined(new MultiplayerRoomUser(user.Id) { User = user });
 
+        public void AddNullUser(int userId) => ((IMultiplayerClient)this).UserJoined(new MultiplayerRoomUser(userId));
+
         public void RemoveUser(User user)
         {
             Debug.Assert(Room != null);

From bdbc210f6d6cbea01a5d8106b31c34be5c43955c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Dec 2020 16:51:45 +0900
Subject: [PATCH 0629/3722] Update fastlane and dependencies

---
 Gemfile.lock | 56 +++++++++++++++++++++++++++-------------------------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a4b49af7e4..8ac863c9a8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,27 +1,27 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.2)
+    CFPropertyList (3.0.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     atomos (0.1.3)
     aws-eventstream (1.1.0)
-    aws-partitions (1.354.0)
-    aws-sdk-core (3.104.3)
+    aws-partitions (1.413.0)
+    aws-sdk-core (3.110.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.36.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-kms (1.40.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.78.0)
-      aws-sdk-core (~> 3, >= 3.104.3)
+    aws-sdk-s3 (1.87.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.1)
+    aws-sigv4 (1.2.2)
       aws-eventstream (~> 1, >= 1.0.2)
-    babosa (1.0.3)
+    babosa (1.0.4)
     claide (1.0.3)
     colored (1.2)
     colored2 (3.1.2)
@@ -29,22 +29,23 @@ GEM
       highline (~> 1.7.2)
     declarative (0.0.20)
     declarative-option (0.1.0)
-    digest-crc (0.6.1)
-      rake (~> 13.0)
+    digest-crc (0.6.3)
+      rake (>= 12.0.0, < 14.0.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.6)
-    emoji_regex (3.0.0)
-    excon (0.76.0)
-    faraday (1.0.1)
+    emoji_regex (3.2.1)
+    excon (0.78.1)
+    faraday (1.2.0)
       multipart-post (>= 1.2, < 3)
-    faraday-cookie_jar (0.0.6)
-      faraday (>= 0.7.4)
+      ruby2_keywords
+    faraday-cookie_jar (0.0.7)
+      faraday (>= 0.8.0)
       http-cookie (~> 1.0.0)
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
-    fastimage (2.2.0)
-    fastlane (2.156.0)
+    fastimage (2.2.1)
+    fastlane (2.170.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
       aws-sdk-s3 (~> 1.0)
@@ -96,17 +97,17 @@ GEM
     google-cloud-core (1.5.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.3.3)
+    google-cloud-env (1.4.0)
       faraday (>= 0.17.3, < 2.0)
     google-cloud-errors (1.0.1)
-    google-cloud-storage (1.27.0)
+    google-cloud-storage (1.29.2)
       addressable (~> 2.5)
       digest-crc (~> 0.4)
       google-api-client (~> 0.33)
       google-cloud-core (~> 1.2)
       googleauth (~> 0.9)
       mini_mime (~> 1.0)
-    googleauth (0.13.1)
+    googleauth (0.14.0)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -118,10 +119,10 @@ GEM
       domain_name (~> 0.5)
     httpclient (2.8.3)
     jmespath (1.4.0)
-    json (2.3.1)
-    jwt (2.2.1)
+    json (2.5.1)
+    jwt (2.2.2)
     memoist (0.16.2)
-    mini_magick (4.10.1)
+    mini_magick (4.11.0)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     multi_json (1.15.0)
@@ -132,14 +133,15 @@ GEM
       mini_portile2 (~> 2.4.0)
     os (1.1.1)
     plist (3.5.0)
-    public_suffix (4.0.5)
-    rake (13.0.1)
+    public_suffix (4.0.6)
+    rake (13.0.3)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
     rouge (2.0.7)
+    ruby2_keywords (0.0.2)
     rubyzip (2.3.0)
     security (0.1.3)
     signet (0.14.0)
@@ -168,7 +170,7 @@ GEM
     unf_ext (0.0.7.7)
     unicode-display_width (1.7.0)
     word_wrap (1.0.0)
-    xcodeproj (1.18.0)
+    xcodeproj (1.19.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)

From 2e3537e9664d24dbb6f5fec80e0c9a3e42cb1664 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Dec 2020 16:52:54 +0900
Subject: [PATCH 0630/3722] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index fc01f9bf1d..cd2ce58c55 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1222.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1228.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index cbf9f6f1bd..3e1b56c29c 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.1222.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1228.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
     <PackageReference Include="Sentry" Version="2.1.8" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index adbcc0ef1c..85ba0590ea 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1222.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1228.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -88,7 +88,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.1222.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1228.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 5ca9a6a98018544d67f61ef1912596084a70999a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Dec 2020 20:05:48 +0900
Subject: [PATCH 0631/3722] Add xmldoc on UserLookupCache's lookup method

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

diff --git a/osu.Game/Database/UserLookupCache.cs b/osu.Game/Database/UserLookupCache.cs
index 05d6930992..8a99e27708 100644
--- a/osu.Game/Database/UserLookupCache.cs
+++ b/osu.Game/Database/UserLookupCache.cs
@@ -17,6 +17,12 @@ namespace osu.Game.Database
         [Resolved]
         private IAPIProvider api { get; set; }
 
+        /// <summary>
+        /// Perform an API lookup on the specified user, populating a <see cref="User"/> model.
+        /// </summary>
+        /// <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>
         public Task<User> GetUserAsync(int userId, CancellationToken token = default) => GetAsync(userId, token);
 
         protected override async Task<User> ComputeValueAsync(int lookup, CancellationToken token = default)

From 545dcac4ec0950f2ade486c55a88f9f39b1802ff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Dec 2020 20:13:24 +0900
Subject: [PATCH 0632/3722] Add null hinting on UserLookupCache query method

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

diff --git a/osu.Game/Database/UserLookupCache.cs b/osu.Game/Database/UserLookupCache.cs
index 8a99e27708..49ea82a4fe 100644
--- a/osu.Game/Database/UserLookupCache.cs
+++ b/osu.Game/Database/UserLookupCache.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
@@ -23,6 +24,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<User> GetUserAsync(int userId, CancellationToken token = default) => GetAsync(userId, token);
 
         protected override async Task<User> ComputeValueAsync(int lookup, CancellationToken token = default)

From 447a55ce11cf144eddc85dea8e37d99c2dbb46e2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Dec 2020 20:16:53 +0900
Subject: [PATCH 0633/3722] Fix incorrect null handling in GameplayLeaderboard

---
 osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs       | 6 ++++--
 osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 83b70911c6..cb20deb272 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.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 JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -56,6 +57,7 @@ namespace osu.Game.Screens.Play.HUD
             }
         }
 
+        [CanBeNull]
         public User User { get; }
 
         private readonly bool trackedPlayer;
@@ -68,7 +70,7 @@ namespace osu.Game.Screens.Play.HUD
         /// </summary>
         /// <param name="user">The score's player.</param>
         /// <param name="trackedPlayer">Whether the player is the local user or a replay player.</param>
-        public GameplayLeaderboardScore(User user, bool trackedPlayer)
+        public GameplayLeaderboardScore([CanBeNull] User user, bool trackedPlayer)
         {
             User = user;
             this.trackedPlayer = trackedPlayer;
@@ -180,7 +182,7 @@ namespace osu.Game.Screens.Play.HUD
                                                 Origin = Anchor.CentreLeft,
                                                 Colour = Color4.White,
                                                 Font = OsuFont.Torus.With(size: 14, weight: FontWeight.SemiBold),
-                                                Text = User.Username,
+                                                Text = User?.Username,
                                                 Truncate = true,
                                                 Shadow = false,
                                             }
diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index 00e2b8bfa7..e7e5459f76 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Screens.Play.HUD
                 var trackedUser = new TrackedUserData();
 
                 userScores[userId] = trackedUser;
-                var leaderboardScore = AddPlayer(resolvedUser, resolvedUser.Id == api.LocalUser.Value.Id);
+                var leaderboardScore = AddPlayer(resolvedUser, resolvedUser?.Id == api.LocalUser.Value.Id);
 
                 ((IBindable<double>)leaderboardScore.Accuracy).BindTo(trackedUser.Accuracy);
                 ((IBindable<double>)leaderboardScore.TotalScore).BindTo(trackedUser.Score);

From 8f0413472cfd57b480d0feedd365a5ce22aae3ea Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Dec 2020 20:30:08 +0900
Subject: [PATCH 0634/3722] Add test coverage of null users in scoreboard

---
 .../Visual/Online/TestSceneCurrentlyPlayingDisplay.cs     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
index 1666c9cde4..1baa07f208 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
@@ -90,11 +90,17 @@ namespace osu.Game.Tests.Visual.Online
             };
 
             protected override Task<User> ComputeValueAsync(int lookup, CancellationToken token = default)
-                => Task.FromResult(new User
+            {
+                // tests against failed lookups
+                if (lookup == 13)
+                    return Task.FromResult<User>(null);
+
+                return Task.FromResult(new User
                 {
                     Id = lookup,
                     Username = usernames[lookup % usernames.Length],
                 });
+            }
         }
     }
 }

From 6254907ef984032f158bb0a3164862cc13a5d435 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Dec 2020 20:31:08 +0900
Subject: [PATCH 0635/3722] Move multiplayer leaderboard test to correct
 namespace

---
 .../TestSceneMultiplayerGameplayLeaderboard.cs                 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename osu.Game.Tests/Visual/{Gameplay => Multiplayer}/TestSceneMultiplayerGameplayLeaderboard.cs (98%)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
similarity index 98%
rename from osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
index 975c54c3f6..d0b1e77549 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -20,10 +20,9 @@ using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play.HUD;
-using osu.Game.Tests.Visual.Multiplayer;
 using osu.Game.Tests.Visual.Online;
 
-namespace osu.Game.Tests.Visual.Gameplay
+namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneMultiplayerGameplayLeaderboard : MultiplayerTestScene
     {

From fb21b7c0167bed184df6c71dcfcd7a1f29c3ecfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Dec 2020 12:09:32 +0100
Subject: [PATCH 0636/3722] Add failing test cases

---
 .../TestSceneMultiplayerMatchSongSelect.cs    | 145 ++++++++++++++++++
 1 file changed, 145 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
new file mode 100644
index 0000000000..95c333e9f4
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
@@ -0,0 +1,145 @@
+// Copyright (c) ppy 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.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Extensions;
+using osu.Framework.Platform;
+using osu.Framework.Screens;
+using osu.Framework.Utils;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Catch;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Rulesets.Taiko;
+using osu.Game.Rulesets.Taiko.Mods;
+using osu.Game.Screens.OnlinePlay.Multiplayer;
+using osu.Game.Screens.Select;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public class TestSceneMultiplayerMatchSongSelect : RoomTestScene
+    {
+        private BeatmapManager manager;
+        private RulesetStore rulesets;
+
+        private List<BeatmapInfo> beatmaps;
+
+        private TestMultiplayerMatchSongSelect songSelect;
+
+        [BackgroundDependencyLoader]
+        private void load(GameHost host, AudioManager audio)
+        {
+            Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
+            Dependencies.Cache(manager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, host, Beatmap.Default));
+
+            beatmaps = new List<BeatmapInfo>();
+
+            for (int i = 0; i < 8; ++i)
+            {
+                int beatmapId = 10 * 10 + i;
+
+                int length = RNG.Next(30000, 200000);
+                double bpm = RNG.NextSingle(80, 200);
+
+                beatmaps.Add(new BeatmapInfo
+                {
+                    Ruleset = rulesets.GetRuleset(i % 4),
+                    OnlineBeatmapID = beatmapId,
+                    Length = length,
+                    BPM = bpm,
+                    BaseDifficulty = new BeatmapDifficulty()
+                });
+            }
+
+            manager.Import(new BeatmapSetInfo
+            {
+                OnlineBeatmapSetID = 10,
+                Hash = Guid.NewGuid().ToString().ComputeMD5Hash(),
+                Metadata = new BeatmapMetadata
+                {
+                    Artist = "Some Artist",
+                    Title = "Some Beatmap",
+                    AuthorString = "Some Author"
+                },
+                Beatmaps = beatmaps,
+                DateAdded = DateTimeOffset.UtcNow
+            }).Wait();
+        }
+
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
+
+            AddStep("reset", () =>
+            {
+                Ruleset.Value = new OsuRuleset().RulesetInfo;
+                Beatmap.SetDefault();
+                SelectedMods.SetDefault();
+            });
+
+            AddStep("create song select", () => LoadScreen(songSelect = new TestMultiplayerMatchSongSelect()));
+            AddUntilStep("wait for present", () => songSelect.IsCurrentScreen());
+        }
+
+        [Test]
+        public void TestBeatmapRevertedOnExitIfNoSelection()
+        {
+            BeatmapInfo selectedBeatmap = null;
+
+            AddStep("select beatmap",
+                () => songSelect.Carousel.SelectBeatmap(selectedBeatmap = beatmaps.Where(beatmap => beatmap.RulesetID == new OsuRuleset().LegacyID).ElementAt(1)));
+            AddUntilStep("wait for selection", () => Beatmap.Value.BeatmapInfo.Equals(selectedBeatmap));
+
+            AddStep("exit song select", () => songSelect.Exit());
+            AddAssert("beatmap reverted", () => Beatmap.IsDefault);
+        }
+
+        [Test]
+        public void TestModsRevertedOnExitIfNoSelection()
+        {
+            AddStep("change mods", () => SelectedMods.Value = new[] { new OsuModDoubleTime() });
+
+            AddStep("exit song select", () => songSelect.Exit());
+            AddAssert("mods reverted", () => SelectedMods.Value.Count == 0);
+        }
+
+        [Test]
+        public void TestRulesetRevertedOnExitIfNoSelection()
+        {
+            AddStep("change ruleset", () => Ruleset.Value = new CatchRuleset().RulesetInfo);
+
+            AddStep("exit song select", () => songSelect.Exit());
+            AddAssert("ruleset reverted", () => Ruleset.Value.Equals(new OsuRuleset().RulesetInfo));
+        }
+
+        [Test]
+        public void TestBeatmapConfirmed()
+        {
+            BeatmapInfo selectedBeatmap = null;
+
+            AddStep("change ruleset", () => Ruleset.Value = new TaikoRuleset().RulesetInfo);
+            AddStep("select beatmap",
+                () => songSelect.Carousel.SelectBeatmap(selectedBeatmap = beatmaps.First(beatmap => beatmap.RulesetID == new TaikoRuleset().LegacyID)));
+            AddUntilStep("wait for selection", () => Beatmap.Value.BeatmapInfo.Equals(selectedBeatmap));
+            AddStep("set mods", () => SelectedMods.Value = new[] { new TaikoModDoubleTime() });
+
+            AddStep("confirm selection", () => songSelect.FinaliseSelection());
+            AddStep("exit song select", () => songSelect.Exit());
+
+            AddAssert("beatmap not changed", () => Beatmap.Value.BeatmapInfo.Equals(selectedBeatmap));
+            AddAssert("ruleset not changed", () => Ruleset.Value.Equals(new TaikoRuleset().RulesetInfo));
+            AddAssert("mods not changed", () => SelectedMods.Value.Single() is TaikoModDoubleTime);
+        }
+
+        private class TestMultiplayerMatchSongSelect : MultiplayerMatchSongSelect
+        {
+            public new BeatmapCarousel Carousel => base.Carousel;
+        }
+    }
+}

From f16b516e5880d8d27a439ab0a6615535879eee34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Dec 2020 12:32:06 +0100
Subject: [PATCH 0637/3722] Revert user changes if no selection was made

---
 .../Multiplayer/MultiplayerMatchSongSelect.cs | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index 0842574f54..72539a2e3a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.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 Humanizer;
 using osu.Framework.Allocation;
@@ -8,9 +9,12 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Select;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer
@@ -29,6 +33,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private LoadingLayer loadingLayer;
 
+        private WorkingBeatmap initialBeatmap;
+        private RulesetInfo initialRuleset;
+        private IReadOnlyList<Mod> initialMods;
+
+        private bool itemSelected;
+
         public MultiplayerMatchSongSelect()
         {
             Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING };
@@ -38,10 +48,14 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         private void load()
         {
             AddInternal(loadingLayer = new LoadingLayer(Carousel));
+            initialBeatmap = Beatmap.Value;
+            initialRuleset = Ruleset.Value;
+            initialMods = Mods.Value.ToList();
         }
 
         protected override bool OnStart()
         {
+            itemSelected = true;
             var item = new PlaylistItem();
 
             item.Beatmap.Value = Beatmap.Value.BeatmapInfo;
@@ -82,6 +96,18 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             return true;
         }
 
+        public override bool OnExiting(IScreen next)
+        {
+            if (!itemSelected)
+            {
+                Beatmap.Value = initialBeatmap;
+                Ruleset.Value = initialRuleset;
+                Mods.Value = initialMods;
+            }
+
+            return base.OnExiting(next);
+        }
+
         protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea();
     }
 }

From 92d74a9343df3fd7378205fe26ff1753ebf52134 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 28 Dec 2020 20:48:14 +0900
Subject: [PATCH 0638/3722] Fix potential nullref in test scene

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
index c0a021436e..17fe09f2c6 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayLeaderboard.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             public bool CheckPositionByUsername(string username, int? expectedPosition)
             {
-                var scoreItem = this.FirstOrDefault(i => i.User.Username == username);
+                var scoreItem = this.FirstOrDefault(i => i.User?.Username == username);
 
                 return scoreItem != null && scoreItem.ScorePosition == expectedPosition;
             }

From a9822800fc368986a152723b883d9842b920f54c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Dec 2020 13:00:05 +0100
Subject: [PATCH 0639/3722] Add more null hinting in GameplayLeaderboard

---
 osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index e33cc05e64..7b94bf19ec 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Caching;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -42,7 +43,7 @@ namespace osu.Game.Screens.Play.HUD
         /// Whether the player should be tracked on the leaderboard.
         /// Set to <c>true</c> for the local player or a player whose replay is currently being played.
         /// </param>
-        public ILeaderboardScore AddPlayer(User user, bool isTracked)
+        public ILeaderboardScore AddPlayer([CanBeNull] User user, bool isTracked)
         {
             var drawable = new GameplayLeaderboardScore(user, isTracked)
             {

From 5efcdbd431153a902fd510d727f9b02400afcb66 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 28 Dec 2020 15:19:28 +0300
Subject: [PATCH 0640/3722] Fix IMod now using reference equality as well

---
 osu.Game/Online/API/APIMod.cs  | 3 ++-
 osu.Game/Rulesets/Mods/IMod.cs | 3 ++-
 osu.Game/Rulesets/Mods/Mod.cs  | 3 ++-
 osu.Game/Scoring/ScoreInfo.cs  | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/API/APIMod.cs b/osu.Game/Online/API/APIMod.cs
index f4e0e1b11f..c1b243c743 100644
--- a/osu.Game/Online/API/APIMod.cs
+++ b/osu.Game/Online/API/APIMod.cs
@@ -52,7 +52,8 @@ namespace osu.Game.Online.API
             return resultMod;
         }
 
-        public bool Equals(APIMod other) => Acronym == other?.Acronym;
+        public bool Equals(IMod other) => other is APIMod them && Equals(them);
+        public bool Equals(APIMod other) => ((IMod)this).Equals(other);
 
         public override string ToString()
         {
diff --git a/osu.Game/Rulesets/Mods/IMod.cs b/osu.Game/Rulesets/Mods/IMod.cs
index 448ad0eb30..a5e19f293c 100644
--- a/osu.Game/Rulesets/Mods/IMod.cs
+++ b/osu.Game/Rulesets/Mods/IMod.cs
@@ -1,11 +1,12 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using Newtonsoft.Json;
 
 namespace osu.Game.Rulesets.Mods
 {
-    public interface IMod
+    public interface IMod : IEquatable<IMod>
     {
         /// <summary>
         /// The shortened name of this mod.
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 33550e070b..3ccebe4174 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -149,6 +149,7 @@ namespace osu.Game.Rulesets.Mods
             return copy;
         }
 
-        public bool Equals(Mod other) => GetType() == other?.GetType();
+        public bool Equals(IMod other) => other is Mod them && Equals(them);
+        public bool Equals(Mod other) => Acronym == other?.Acronym;
     }
 }
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 59eaa994c2..335671ea4e 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -256,7 +256,8 @@ namespace osu.Game.Scoring
         {
             public string Acronym { get; set; }
 
-            public bool Equals(DeserializedMod other) => Acronym == other?.Acronym;
+            bool IEquatable<IMod>.Equals(IMod other) => other is DeserializedMod them && Equals(them);
+            public bool Equals(DeserializedMod other) => ((IMod)this).Equals(other);
         }
 
         public override string ToString() => $"{User} playing {Beatmap}";

From 41b79d938b401d7101440e4ee21f6f28a7590b4a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 28 Dec 2020 15:30:52 +0300
Subject: [PATCH 0641/3722] Fix wrong checks..

---
 osu.Game/Online/API/APIMod.cs | 2 +-
 osu.Game/Rulesets/Mods/Mod.cs | 2 +-
 osu.Game/Scoring/ScoreInfo.cs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/API/APIMod.cs b/osu.Game/Online/API/APIMod.cs
index c1b243c743..f4fed4e5c5 100644
--- a/osu.Game/Online/API/APIMod.cs
+++ b/osu.Game/Online/API/APIMod.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Online.API
         }
 
         public bool Equals(IMod other) => other is APIMod them && Equals(them);
-        public bool Equals(APIMod other) => ((IMod)this).Equals(other);
+        public bool Equals(APIMod other) => Acronym == other?.Acronym;
 
         public override string ToString()
         {
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 3ccebe4174..dbb2a0fdc1 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -150,6 +150,6 @@ namespace osu.Game.Rulesets.Mods
         }
 
         public bool Equals(IMod other) => other is Mod them && Equals(them);
-        public bool Equals(Mod other) => Acronym == other?.Acronym;
+        public bool Equals(Mod other) => GetType() == other?.GetType();
     }
 }
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 335671ea4e..1e5742c358 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -257,7 +257,7 @@ namespace osu.Game.Scoring
             public string Acronym { get; set; }
 
             bool IEquatable<IMod>.Equals(IMod other) => other is DeserializedMod them && Equals(them);
-            public bool Equals(DeserializedMod other) => ((IMod)this).Equals(other);
+            public bool Equals(DeserializedMod other) => Acronym == other?.Acronym;
         }
 
         public override string ToString() => $"{User} playing {Beatmap}";

From b352c1503ff2eff470dd573d08ad8e2015c07906 Mon Sep 17 00:00:00 2001
From: Susko3 <16479013+Susko3@users.noreply.github.com>
Date: Mon, 28 Dec 2020 15:13:33 +0100
Subject: [PATCH 0642/3722] Fix IntentFilter capturing all file types

Removed string arrays and split the IntentFilter into multiple. Also added DataHost and DataMimeType
---
 osu.Android/OsuGameActivity.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index 953c06f4e2..7abaff3cdb 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -16,7 +16,10 @@ using osu.Framework.Android;
 namespace osu.Android
 {
     [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false, LaunchMode = LaunchMode.SingleInstance)]
-    [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataPathPatterns = new[] { ".*\\.osz", ".*\\.osk" }, DataMimeType = "application/*")]
+    [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPattern = ".*\\\\.osz", DataHost = "*", DataMimeType = "*/*")]
+    [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPattern = ".*\\\\.osk", DataHost = "*", DataMimeType = "*/*")]
+    [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "file", DataPathPattern = ".*\\\\.osz", DataHost = "*", DataMimeType = "*/*")]
+    [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "file", DataPathPattern = ".*\\\\.osk", DataHost = "*", DataMimeType = "*/*")]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryBrowsable, Intent.CategoryDefault }, DataSchemes = new[] { "osu", "osump" })]
     public class OsuGameActivity : AndroidGameActivity
     {

From d971aa5295b7d20a471d8be62fdc4c6e263dd139 Mon Sep 17 00:00:00 2001
From: Susko3 <16479013+Susko3@users.noreply.github.com>
Date: Mon, 28 Dec 2020 15:54:21 +0100
Subject: [PATCH 0643/3722] Remove file intents and add Send intent

Removed IntentFilters with DataScheme = "file"
Added Intent.ActionSend with application/octet-stream and application/zip
---
 osu.Android/OsuGameActivity.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index 7abaff3cdb..cdf033e685 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -16,10 +16,10 @@ using osu.Framework.Android;
 namespace osu.Android
 {
     [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false, LaunchMode = LaunchMode.SingleInstance)]
-    [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPattern = ".*\\\\.osz", DataHost = "*", DataMimeType = "*/*")]
-    [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPattern = ".*\\\\.osk", DataHost = "*", DataMimeType = "*/*")]
-    [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "file", DataPathPattern = ".*\\\\.osz", DataHost = "*", DataMimeType = "*/*")]
-    [IntentFilter(new[] { Intent.ActionDefault, Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "file", DataPathPattern = ".*\\\\.osk", DataHost = "*", DataMimeType = "*/*")]
+    [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPattern = ".*\\\\.osz", DataHost = "*", DataMimeType = "*/*")]
+    [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPattern = ".*\\\\.osk", DataHost = "*", DataMimeType = "*/*")]
+    [IntentFilter(new[] { Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataMimeType = "application/octet-stream")]
+    [IntentFilter(new[] { Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataMimeType = "application/zip")]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryBrowsable, Intent.CategoryDefault }, DataSchemes = new[] { "osu", "osump" })]
     public class OsuGameActivity : AndroidGameActivity
     {

From d2301068b6c2a04961986570075ef5075c2cf168 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Dec 2020 16:35:33 +0100
Subject: [PATCH 0644/3722] Fix changelog header staying dimmed after build
 show

---
 .../Overlays/Changelog/ChangelogUpdateStreamControl.cs   | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs
index 6bbff045b5..aa36a5c8fd 100644
--- a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs
@@ -7,12 +7,11 @@ namespace osu.Game.Overlays.Changelog
 {
     public class ChangelogUpdateStreamControl : OverlayStreamControl<APIUpdateStream>
     {
-        protected override OverlayStreamItem<APIUpdateStream> CreateStreamItem(APIUpdateStream value) => new ChangelogUpdateStreamItem(value);
-
-        protected override void LoadComplete()
+        public ChangelogUpdateStreamControl()
         {
-            // suppress base logic of immediately selecting first item if one exists
-            // (we always want to start with no stream selected).
+            SelectFirstTabByDefault = false;
         }
+
+        protected override OverlayStreamItem<APIUpdateStream> CreateStreamItem(APIUpdateStream value) => new ChangelogUpdateStreamItem(value);
     }
 }

From 1d311a66805aad4c784ff0a51bc523e69019ccde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Dec 2020 19:11:44 +0100
Subject: [PATCH 0645/3722] Change PlayingUsers population logic to match
 expectations

---
 .../Multiplayer/StatefulMultiplayerClient.cs   | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index fcb0977f53..c15401e99d 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -133,6 +133,7 @@ namespace osu.Game.Online.Multiplayer
 
                 apiRoom = null;
                 Room = null;
+                PlayingUsers.Clear();
 
                 RoomUpdated?.Invoke();
             }, false);
@@ -302,8 +303,7 @@ namespace osu.Game.Online.Multiplayer
 
                 Room.Users.Single(u => u.UserID == userId).State = state;
 
-                if (state != MultiplayerUserState.Playing)
-                    PlayingUsers.Remove(userId);
+                updatePlayingUsers(userId, state);
 
                 RoomUpdated?.Invoke();
             }, false);
@@ -337,8 +337,6 @@ namespace osu.Game.Online.Multiplayer
                 if (Room == null)
                     return;
 
-                PlayingUsers.AddRange(Room.Users.Where(u => u.State == MultiplayerUserState.Playing).Select(u => u.UserID));
-
                 MatchStarted?.Invoke();
             }, false);
 
@@ -454,5 +452,17 @@ namespace osu.Game.Online.Multiplayer
             apiRoom.Playlist.Clear(); // Clearing should be unnecessary, but here for sanity.
             apiRoom.Playlist.Add(playlistItem);
         }
+
+        private void updatePlayingUsers(int userId, MultiplayerUserState state)
+        {
+            bool isPlaying = state >= MultiplayerUserState.WaitingForLoad && state <= MultiplayerUserState.FinishedPlay;
+            bool wasPlaying = PlayingUsers.Contains(userId);
+
+            if (!wasPlaying && isPlaying)
+                PlayingUsers.Add(userId);
+
+            if (wasPlaying && !isPlaying)
+                PlayingUsers.Remove(userId);
+        }
     }
 }

From a014d0ec18953854650c33263489273171d828f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Dec 2020 19:12:58 +0100
Subject: [PATCH 0646/3722] Use PlayingUsers when constructing player directly

---
 .../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 58314c3774..ba0ed16cf4 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -200,7 +200,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             Debug.Assert(client.Room != null);
 
-            int[] userIds = client.Room.Users.Where(u => u.State >= MultiplayerUserState.WaitingForLoad).Select(u => u.UserID).ToArray();
+            int[] userIds = client.PlayingUsers.ToArray();
 
             StartPlay(() => new MultiplayerPlayer(SelectedItem.Value, userIds));
         }

From f7407347f78445a141c196fbcda5282f1ba14250 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Dec 2020 20:01:17 +0100
Subject: [PATCH 0647/3722] Add test coverage of PlayingUsers tracking

---
 .../StatefulMultiplayerClientTest.cs          | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs

diff --git a/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs b/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs
new file mode 100644
index 0000000000..8d543e7485
--- /dev/null
+++ b/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs
@@ -0,0 +1,57 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Linq;
+using Humanizer;
+using NUnit.Framework;
+using osu.Framework.Testing;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Tests.Visual.Multiplayer;
+using osu.Game.Users;
+
+namespace osu.Game.Tests.NonVisual.Multiplayer
+{
+    [HeadlessTest]
+    public class StatefulMultiplayerClientTest : MultiplayerTestScene
+    {
+        [Test]
+        public void TestPlayingUserTracking()
+        {
+            int id = 2000;
+
+            AddRepeatStep("add some users", () => Client.AddUser(new User { Id = id++ }), 5);
+            checkPlayingUserCount(0);
+
+            changeState(3, MultiplayerUserState.WaitingForLoad);
+            checkPlayingUserCount(3);
+
+            changeState(3, MultiplayerUserState.Playing);
+            checkPlayingUserCount(3);
+
+            changeState(3, MultiplayerUserState.Results);
+            checkPlayingUserCount(0);
+
+            changeState(6, MultiplayerUserState.WaitingForLoad);
+            checkPlayingUserCount(6);
+
+            AddStep("another user left", () => Client.RemoveUser(Client.Room?.Users.Last().User));
+            checkPlayingUserCount(5);
+
+            AddStep("leave room", () => Client.LeaveRoom());
+            checkPlayingUserCount(0);
+        }
+
+        private void checkPlayingUserCount(int expectedCount)
+            => AddAssert($"{"user".ToQuantity(expectedCount)} playing", () => Client.PlayingUsers.Count == expectedCount);
+
+        private void changeState(int userCount, MultiplayerUserState state)
+            => AddStep($"{"user".ToQuantity(userCount)} in {state}", () =>
+            {
+                for (int i = 0; i < userCount; ++i)
+                {
+                    var userId = Client.Room?.Users[i].UserID ?? throw new AssertionException("Room cannot be null!");
+                    Client.ChangeUserState(userId, state);
+                }
+            });
+    }
+}

From 770a5a85dff5cff621287732639eb33534ea95ad Mon Sep 17 00:00:00 2001
From: Susko3 <16479013+Susko3@users.noreply.github.com>
Date: Mon, 28 Dec 2020 20:57:08 +0100
Subject: [PATCH 0648/3722] Merge Intent.ActionSend into one IntentFilter

Co-authored-by: Lucas A. <game4allyt@gmail.com>
---
 osu.Android/OsuGameActivity.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index cdf033e685..da69b516dd 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -19,7 +19,7 @@ namespace osu.Android
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPattern = ".*\\\\.osz", DataHost = "*", DataMimeType = "*/*")]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPattern = ".*\\\\.osk", DataHost = "*", DataMimeType = "*/*")]
     [IntentFilter(new[] { Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataMimeType = "application/octet-stream")]
-    [IntentFilter(new[] { Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataMimeType = "application/zip")]
+    [IntentFilter(new[] { Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataMimeTypes = new[] { "application/zip", "application/octet-stream" })]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryBrowsable, Intent.CategoryDefault }, DataSchemes = new[] { "osu", "osump" })]
     public class OsuGameActivity : AndroidGameActivity
     {

From 9e6994166c0eef43cb63b6d1d34e70e0cb324634 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Dec 2020 20:59:12 +0100
Subject: [PATCH 0649/3722] Add helper to track ongoing operations in UI

---
 .../OnlinePlay/OngoingOperationTracker.cs     | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs

diff --git a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
new file mode 100644
index 0000000000..f2d943e14f
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.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 System;
+using osu.Framework.Bindables;
+
+namespace osu.Game.Screens.OnlinePlay
+{
+    /// <summary>
+    /// Utility class to track ongoing online operations' progress.
+    /// Can be used to disable interactivity while waiting for a response from online sources.
+    /// </summary>
+    public class OngoingOperationTracker
+    {
+        /// <summary>
+        /// Whether there is an online operation in progress.
+        /// </summary>
+        public IBindable<bool> InProgress => inProgress;
+
+        private readonly Bindable<bool> inProgress = new BindableBool();
+
+        private LeasedBindable<bool> leasedInProgress;
+
+        /// <summary>
+        /// Begins tracking a new online operation.
+        /// </summary>
+        /// <exception cref="InvalidOperationException">An operation has already been started.</exception>
+        public void BeginOperation()
+        {
+            if (leasedInProgress != null)
+                throw new InvalidOperationException("Cannot begin operation while another is in progress.");
+
+            leasedInProgress = inProgress.BeginLease(true);
+            leasedInProgress.Value = true;
+        }
+
+        /// <summary>
+        /// Ends tracking an online operation.
+        /// Does nothing if an operation has not been begun yet.
+        /// </summary>
+        public void EndOperation()
+        {
+            leasedInProgress?.Return();
+            leasedInProgress = null;
+        }
+    }
+}

From 47ab7c9fd67270079d39e8ad9f45fb3e986c76df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Dec 2020 20:59:38 +0100
Subject: [PATCH 0650/3722] Disable ready button after host click

---
 .../TestSceneMultiplayerReadyButton.cs        | 22 +++++++++++++++----
 .../Match/MultiplayerReadyButton.cs           | 13 ++++++++++-
 .../Multiplayer/MultiplayerMatchSubScreen.cs  |  4 ++++
 3 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
index 6b11613f1c..958c6d218b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
@@ -7,11 +7,14 @@ using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Graphics;
 using osu.Framework.Platform;
+using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
+using osu.Game.Screens.OnlinePlay;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
 using osu.Game.Tests.Resources;
 using osu.Game.Users;
@@ -27,6 +30,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
         private BeatmapManager beatmaps;
         private RulesetStore rulesets;
 
+        [Cached]
+        private OngoingOperationTracker gameplayStartTracker = new OngoingOperationTracker();
+
         [BackgroundDependencyLoader]
         private void load(GameHost host, AudioManager audio)
         {
@@ -89,8 +95,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             addClickButtonStep();
             AddAssert("user is ready", () => Client.Room?.Users[0].State == MultiplayerUserState.Ready);
 
-            addClickButtonStep();
-            AddAssert("match started", () => Client.Room?.Users[0].State == MultiplayerUserState.WaitingForLoad);
+            verifyGameplayStartFlow();
         }
 
         [Test]
@@ -105,8 +110,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             addClickButtonStep();
             AddStep("make user host", () => Client.TransferHost(Client.Room?.Users[0].UserID ?? 0));
 
-            addClickButtonStep();
-            AddAssert("match started", () => Client.Room?.Users[0].State == MultiplayerUserState.WaitingForLoad);
+            verifyGameplayStartFlow();
         }
 
         [Test]
@@ -160,5 +164,15 @@ namespace osu.Game.Tests.Visual.Multiplayer
             InputManager.MoveMouseTo(button);
             InputManager.Click(MouseButton.Left);
         });
+
+        private void verifyGameplayStartFlow()
+        {
+            addClickButtonStep();
+            AddAssert("user waiting for load", () => Client.Room?.Users[0].State == MultiplayerUserState.WaitingForLoad);
+            AddAssert("ready button disabled", () => !button.ChildrenOfType<OsuButton>().Single().Enabled.Value);
+
+            AddStep("transitioned to gameplay", () => gameplayStartTracker.EndOperation());
+            AddAssert("ready button enabled", () => button.ChildrenOfType<OsuButton>().Single().Enabled.Value);
+        }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
index 281e92404c..5009b435f4 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -33,11 +33,15 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
         [Resolved]
         private OsuColour colours { get; set; }
 
+        [Resolved]
+        private OngoingOperationTracker gameplayStartTracker { get; set; }
+
         private SampleChannel sampleReadyCount;
 
         private readonly ButtonWithTrianglesExposed button;
 
         private int countReady;
+        private IBindable<bool> gameplayStartInProgress;
 
         public MultiplayerReadyButton()
         {
@@ -54,6 +58,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
         private void load(AudioManager audio)
         {
             sampleReadyCount = audio.Samples.Get(@"SongSelect/select-difficulty");
+
+            gameplayStartInProgress = gameplayStartTracker.InProgress.GetBoundCopy();
+            gameplayStartInProgress.BindValueChanged(_ => updateState());
         }
 
         protected override void OnRoomUpdated()
@@ -63,7 +70,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             // this method is called on leaving the room, so the local user may not exist in the room any more.
             localUser = Room?.Users.SingleOrDefault(u => u.User?.Id == api.LocalUser.Value.Id);
 
-            button.Enabled.Value = Client.Room?.State == MultiplayerRoomState.Open;
             updateState();
         }
 
@@ -100,6 +106,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                     break;
             }
 
+            button.Enabled.Value = Client.Room?.State == MultiplayerRoomState.Open && !gameplayStartInProgress.Value;
+
             if (newCountReady != countReady)
             {
                 countReady = newCountReady;
@@ -142,7 +150,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             else
             {
                 if (Room?.Host?.Equals(localUser) == true)
+                {
+                    gameplayStartTracker.BeginOperation();
                     Client.StartMatch().CatchUnobservedExceptions(true);
+                }
                 else
                     Client.ChangeState(MultiplayerUserState.Idle).CatchUnobservedExceptions(true);
             }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 58314c3774..93db913ce0 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -31,6 +31,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         [Resolved]
         private StatefulMultiplayerClient client { get; set; }
 
+        [Cached]
+        private OngoingOperationTracker gameplayStartTracker = new OngoingOperationTracker();
+
         private MultiplayerMatchSettingsOverlay settingsOverlay;
 
         private IBindable<bool> isConnected;
@@ -203,6 +206,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             int[] userIds = client.Room.Users.Where(u => u.State >= MultiplayerUserState.WaitingForLoad).Select(u => u.UserID).ToArray();
 
             StartPlay(() => new MultiplayerPlayer(SelectedItem.Value, userIds));
+            gameplayStartTracker.EndOperation();
         }
 
         protected override void Dispose(bool isDisposing)

From af66e4531196853215e8625cf858d4a0d221aaec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Dec 2020 21:39:11 +0100
Subject: [PATCH 0651/3722] Disable create room button after triggering join

---
 .../TestSceneCreateMultiplayerMatchButton.cs  | 52 +++++++++++++++++++
 .../OnlinePlay/Lounge/LoungeSubScreen.cs      | 22 ++++----
 .../CreateMultiplayerMatchButton.cs           | 19 ++++++-
 .../Screens/OnlinePlay/OnlinePlayScreen.cs    |  3 ++
 4 files changed, 83 insertions(+), 13 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneCreateMultiplayerMatchButton.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneCreateMultiplayerMatchButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneCreateMultiplayerMatchButton.cs
new file mode 100644
index 0000000000..2a549e5262
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneCreateMultiplayerMatchButton.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 NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Screens.OnlinePlay;
+using osu.Game.Screens.OnlinePlay.Multiplayer;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public class TestSceneCreateMultiplayerMatchButton : MultiplayerTestScene
+    {
+        [Cached]
+        private OngoingOperationTracker joiningRoomTracker = new OngoingOperationTracker();
+
+        private CreateMultiplayerMatchButton button;
+
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
+            AddStep("create button", () => Child = button = new CreateMultiplayerMatchButton
+            {
+                Width = 200,
+                Height = 100,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre
+            });
+        }
+
+        [Test]
+        public void TestButtonEnableStateChanges()
+        {
+            assertButtonEnableState(true);
+
+            AddStep("begin joining room", () => joiningRoomTracker.BeginOperation());
+            assertButtonEnableState(false);
+
+            AddStep("end joining room", () => joiningRoomTracker.EndOperation());
+            assertButtonEnableState(true);
+
+            AddStep("disconnect client", () => Client.Disconnect());
+            assertButtonEnableState(false);
+
+            AddStep("re-connect client", () => Client.Connect());
+            assertButtonEnableState(true);
+        }
+
+        private void assertButtonEnableState(bool enabled)
+            => AddAssert($"button {(enabled ? "enabled" : "disabled")}", () => button.Enabled.Value == enabled);
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
index 79f5dfdee1..2730693f73 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
@@ -26,6 +26,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
         protected override UserActivity InitialActivity => new UserActivity.SearchingForLobby();
 
         private readonly IBindable<bool> initialRoomsReceived = new Bindable<bool>();
+        private readonly IBindable<bool> joiningRoom = new Bindable<bool>();
 
         private FilterControl filter;
         private Container content;
@@ -37,7 +38,8 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
         [Resolved]
         private MusicController music { get; set; }
 
-        private bool joiningRoom;
+        [Resolved]
+        private OngoingOperationTracker joiningRoomTracker { get; set; }
 
         [BackgroundDependencyLoader]
         private void load()
@@ -98,7 +100,10 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
             base.LoadComplete();
 
             initialRoomsReceived.BindTo(RoomManager.InitialRoomsReceived);
-            initialRoomsReceived.BindValueChanged(onInitialRoomsReceivedChanged, true);
+            initialRoomsReceived.BindValueChanged(_ => updateLoadingLayer());
+
+            joiningRoom.BindTo(joiningRoomTracker.InProgress);
+            joiningRoom.BindValueChanged(_ => updateLoadingLayer(), true);
         }
 
         protected override void UpdateAfterChildren()
@@ -156,26 +161,21 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
 
         private void joinRequested(Room room)
         {
-            joiningRoom = true;
-            updateLoadingLayer();
+            joiningRoomTracker.BeginOperation();
 
             RoomManager?.JoinRoom(room, r =>
             {
                 Open(room);
-                joiningRoom = false;
-                updateLoadingLayer();
+                joiningRoomTracker.EndOperation();
             }, _ =>
             {
-                joiningRoom = false;
-                updateLoadingLayer();
+                joiningRoomTracker.EndOperation();
             });
         }
 
-        private void onInitialRoomsReceivedChanged(ValueChangedEvent<bool> received) => updateLoadingLayer();
-
         private void updateLoadingLayer()
         {
-            if (joiningRoom || !initialRoomsReceived.Value)
+            if (joiningRoom.Value || !initialRoomsReceived.Value)
                 loadingLayer.Show();
             else
                 loadingLayer.Hide();
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
index 163efd9c20..7518a4e71b 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
@@ -10,14 +10,29 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
     public class CreateMultiplayerMatchButton : PurpleTriangleButton
     {
+        private IBindable<bool> isConnected;
+        private IBindable<bool> joiningRoom;
+
+        [Resolved]
+        private StatefulMultiplayerClient multiplayerClient { get; set; }
+
+        [Resolved]
+        private OngoingOperationTracker joiningRoomTracker { get; set; }
+
         [BackgroundDependencyLoader]
-        private void load(StatefulMultiplayerClient multiplayerClient)
+        private void load()
         {
             Triangles.TriangleScale = 1.5f;
 
             Text = "Create room";
 
-            ((IBindable<bool>)Enabled).BindTo(multiplayerClient.IsConnected);
+            isConnected = multiplayerClient.IsConnected.GetBoundCopy();
+            isConnected.BindValueChanged(_ => updateState());
+
+            joiningRoom = joiningRoomTracker.InProgress.GetBoundCopy();
+            joiningRoom.BindValueChanged(_ => updateState(), true);
         }
+
+        private void updateState() => Enabled.Value = isConnected.Value && !joiningRoom.Value;
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index 4074dd1573..92665c498b 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -52,6 +52,9 @@ namespace osu.Game.Screens.OnlinePlay
         [Cached]
         private readonly Bindable<FilterCriteria> currentFilter = new Bindable<FilterCriteria>(new FilterCriteria());
 
+        [Cached]
+        private readonly OngoingOperationTracker joiningRoomTracker = new OngoingOperationTracker();
+
         [Resolved(CanBeNull = true)]
         private MusicController music { get; set; }
 

From 6dc0f6af50a3befd707a7f9d4a5fe10cd0862413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Dec 2020 21:44:58 +0100
Subject: [PATCH 0652/3722] Disable setting apply button for duration of
 operation

---
 .../Match/MultiplayerMatchSettingsOverlay.cs  | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
index ae03d384f6..de25cff546 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
@@ -68,6 +68,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             [Resolved]
             private Bindable<RulesetInfo> ruleset { get; set; }
 
+            private readonly OngoingOperationTracker applyingSettingsTracker = new OngoingOperationTracker();
+
             [BackgroundDependencyLoader]
             private void load(OsuColour colours)
             {
@@ -274,13 +276,21 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                 Type.BindValueChanged(type => TypePicker.Current.Value = type.NewValue, true);
                 MaxParticipants.BindValueChanged(count => MaxParticipantsField.Text = count.NewValue?.ToString(), true);
                 RoomID.BindValueChanged(roomId => initialBeatmapControl.Alpha = roomId.NewValue == null ? 1 : 0, true);
+
+                applyingSettingsTracker.InProgress.BindValueChanged(v =>
+                {
+                    if (v.NewValue)
+                        loadingLayer.Show();
+                    else
+                        loadingLayer.Hide();
+                });
             }
 
             protected override void Update()
             {
                 base.Update();
 
-                ApplyButton.Enabled.Value = Playlist.Count > 0 && NameField.Text.Length > 0;
+                ApplyButton.Enabled.Value = Playlist.Count > 0 && NameField.Text.Length > 0 && !applyingSettingsTracker.InProgress.Value;
             }
 
             private void apply()
@@ -289,7 +299,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                     return;
 
                 hideError();
-                loadingLayer.Show();
+                applyingSettingsTracker.BeginOperation();
 
                 // If the client is already in a room, update via the client.
                 // Otherwise, update the room directly in preparation for it to be submitted to the API on match creation.
@@ -322,7 +332,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
             private void onSuccess(Room room)
             {
-                loadingLayer.Hide();
+                applyingSettingsTracker.EndOperation();
                 SettingsApplied?.Invoke();
             }
 
@@ -330,8 +340,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             {
                 ErrorText.Text = text;
                 ErrorText.FadeIn(50);
-
-                loadingLayer.Hide();
+                applyingSettingsTracker.EndOperation();
             }
         }
 

From 540dec2e7ccbb96342683545d744ffa74b4011d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 28 Dec 2020 22:54:52 +0100
Subject: [PATCH 0653/3722] Allow null tracker in lounge screen for tests

---
 .../Screens/OnlinePlay/Lounge/LoungeSubScreen.cs  | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
index 2730693f73..f25835f56a 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
         [Resolved]
         private MusicController music { get; set; }
 
-        [Resolved]
+        [Resolved(CanBeNull = true)]
         private OngoingOperationTracker joiningRoomTracker { get; set; }
 
         [BackgroundDependencyLoader]
@@ -102,8 +102,11 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
             initialRoomsReceived.BindTo(RoomManager.InitialRoomsReceived);
             initialRoomsReceived.BindValueChanged(_ => updateLoadingLayer());
 
-            joiningRoom.BindTo(joiningRoomTracker.InProgress);
-            joiningRoom.BindValueChanged(_ => updateLoadingLayer(), true);
+            if (joiningRoomTracker != null)
+            {
+                joiningRoom.BindTo(joiningRoomTracker.InProgress);
+                joiningRoom.BindValueChanged(_ => updateLoadingLayer(), true);
+            }
         }
 
         protected override void UpdateAfterChildren()
@@ -161,15 +164,15 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
 
         private void joinRequested(Room room)
         {
-            joiningRoomTracker.BeginOperation();
+            joiningRoomTracker?.BeginOperation();
 
             RoomManager?.JoinRoom(room, r =>
             {
                 Open(room);
-                joiningRoomTracker.EndOperation();
+                joiningRoomTracker?.EndOperation();
             }, _ =>
             {
-                joiningRoomTracker.EndOperation();
+                joiningRoomTracker?.EndOperation();
             });
         }
 

From 355ecc4499bf1357612c6c6607b65a46e84ea432 Mon Sep 17 00:00:00 2001
From: TheOmyNomy <theomynomy@gmail.com>
Date: Tue, 29 Dec 2020 12:37:57 +1100
Subject: [PATCH 0654/3722] Change cursor trail blending mode to match stable

---
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursorTrail.cs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursorTrail.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursorTrail.cs
index f18d3191ca..af9ea99232 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursorTrail.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursorTrail.cs
@@ -20,17 +20,14 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         private double lastTrailTime;
         private IBindable<float> cursorSize;
 
-        public LegacyCursorTrail()
-        {
-            Blending = BlendingParameters.Additive;
-        }
-
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin, OsuConfigManager config)
         {
             Texture = skin.GetTexture("cursortrail");
             disjointTrail = skin.GetTexture("cursormiddle") == null;
 
+            Blending = !disjointTrail ? BlendingParameters.Additive : BlendingParameters.Inherit;
+
             if (Texture != null)
             {
                 // stable "magic ratio". see OsuPlayfieldAdjustmentContainer for full explanation.

From 6aeb7ece660ef5600f8b8da00ac38fd05a5def41 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Dec 2020 14:25:08 +0900
Subject: [PATCH 0655/3722] Tidy up update state code, naming, xmldoc

---
 .../Multiplayer/StatefulMultiplayerClient.cs  | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index c15401e99d..bf62c450c9 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -303,7 +303,7 @@ namespace osu.Game.Online.Multiplayer
 
                 Room.Users.Single(u => u.UserID == userId).State = state;
 
-                updatePlayingUsers(userId, state);
+                updateUserPlayingState(userId, state);
 
                 RoomUpdated?.Invoke();
             }, false);
@@ -453,15 +453,22 @@ namespace osu.Game.Online.Multiplayer
             apiRoom.Playlist.Add(playlistItem);
         }
 
-        private void updatePlayingUsers(int userId, MultiplayerUserState state)
+        /// <summary>
+        /// For the provided user ID, update whether the user is included in <see cref="PlayingUsers"/>.
+        /// </summary>
+        /// <param name="userId">The user's ID.</param>
+        /// <param name="state">The new state of the user.</param>
+        private void updateUserPlayingState(int userId, MultiplayerUserState state)
         {
-            bool isPlaying = state >= MultiplayerUserState.WaitingForLoad && state <= MultiplayerUserState.FinishedPlay;
             bool wasPlaying = PlayingUsers.Contains(userId);
+            bool isPlaying = state >= MultiplayerUserState.WaitingForLoad && state <= MultiplayerUserState.FinishedPlay;
 
-            if (!wasPlaying && isPlaying)
+            if (isPlaying == wasPlaying)
+                return;
+
+            if (isPlaying)
                 PlayingUsers.Add(userId);
-
-            if (wasPlaying && !isPlaying)
+            else
                 PlayingUsers.Remove(userId);
         }
     }

From e3a41f61186525d18d01bd8306e1d2a6f7a2baa3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Dec 2020 14:27:33 +0900
Subject: [PATCH 0656/3722] Rename variable to make more sense

It needs to be explicitly stated that the users in this list are related
to the *joined* room. Especially since it's sharing its variable name
with `SpectatorStreamingClient` where it has the opposite meaning (is a
list of *globally* playing players).
---
 .../Multiplayer/StatefulMultiplayerClientTest.cs |  2 +-
 .../TestSceneMultiplayerGameplayLeaderboard.cs   |  6 +++---
 .../Multiplayer/StatefulMultiplayerClient.cs     | 16 ++++++++--------
 .../Multiplayer/MultiplayerMatchSubScreen.cs     |  2 +-
 .../Play/HUD/MultiplayerGameplayLeaderboard.cs   |  4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs b/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs
index 8d543e7485..a2ad37cf4a 100644
--- a/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs
+++ b/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Tests.NonVisual.Multiplayer
         }
 
         private void checkPlayingUserCount(int expectedCount)
-            => AddAssert($"{"user".ToQuantity(expectedCount)} playing", () => Client.PlayingUsers.Count == expectedCount);
+            => AddAssert($"{"user".ToQuantity(expectedCount)} playing", () => Client.CurrentMatchPlayingUserIds.Count == expectedCount);
 
         private void changeState(int userCount, MultiplayerUserState state)
             => AddStep($"{"user".ToQuantity(userCount)} in {state}", () =>
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
index d0b1e77549..d016accc25 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -62,8 +62,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
                 streamingClient.Start(Beatmap.Value.BeatmapInfo.OnlineBeatmapID ?? 0);
 
-                Client.PlayingUsers.Clear();
-                Client.PlayingUsers.AddRange(streamingClient.PlayingUsers);
+                Client.CurrentMatchPlayingUserIds.Clear();
+                Client.CurrentMatchPlayingUserIds.AddRange(streamingClient.PlayingUsers);
 
                 Children = new Drawable[]
                 {
@@ -91,7 +91,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Test]
         public void TestUserQuit()
         {
-            AddRepeatStep("mark user quit", () => Client.PlayingUsers.RemoveAt(0), users);
+            AddRepeatStep("mark user quit", () => Client.CurrentMatchPlayingUserIds.RemoveAt(0), users);
         }
 
         public class TestMultiplayerStreaming : SpectatorStreamingClient
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index bf62c450c9..bb690d786a 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -61,9 +61,9 @@ namespace osu.Game.Online.Multiplayer
         public MultiplayerRoom? Room { get; private set; }
 
         /// <summary>
-        /// The users currently in gameplay.
+        /// The users in the joined <see cref="Room"/> which are currently in gameplay.
         /// </summary>
-        public readonly BindableList<int> PlayingUsers = new BindableList<int>();
+        public readonly BindableList<int> CurrentMatchPlayingUserIds = new BindableList<int>();
 
         [Resolved]
         private UserLookupCache userLookupCache { get; set; } = null!;
@@ -133,7 +133,7 @@ namespace osu.Game.Online.Multiplayer
 
                 apiRoom = null;
                 Room = null;
-                PlayingUsers.Clear();
+                CurrentMatchPlayingUserIds.Clear();
 
                 RoomUpdated?.Invoke();
             }, false);
@@ -254,7 +254,7 @@ namespace osu.Game.Online.Multiplayer
                     return;
 
                 Room.Users.Remove(user);
-                PlayingUsers.Remove(user.UserID);
+                CurrentMatchPlayingUserIds.Remove(user.UserID);
 
                 RoomUpdated?.Invoke();
             }, false);
@@ -454,22 +454,22 @@ namespace osu.Game.Online.Multiplayer
         }
 
         /// <summary>
-        /// For the provided user ID, update whether the user is included in <see cref="PlayingUsers"/>.
+        /// For the provided user ID, update whether the user is included in <see cref="CurrentMatchPlayingUserIds"/>.
         /// </summary>
         /// <param name="userId">The user's ID.</param>
         /// <param name="state">The new state of the user.</param>
         private void updateUserPlayingState(int userId, MultiplayerUserState state)
         {
-            bool wasPlaying = PlayingUsers.Contains(userId);
+            bool wasPlaying = CurrentMatchPlayingUserIds.Contains(userId);
             bool isPlaying = state >= MultiplayerUserState.WaitingForLoad && state <= MultiplayerUserState.FinishedPlay;
 
             if (isPlaying == wasPlaying)
                 return;
 
             if (isPlaying)
-                PlayingUsers.Add(userId);
+                CurrentMatchPlayingUserIds.Add(userId);
             else
-                PlayingUsers.Remove(userId);
+                CurrentMatchPlayingUserIds.Remove(userId);
         }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index ba0ed16cf4..ffa36ecfdb 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -200,7 +200,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             Debug.Assert(client.Room != null);
 
-            int[] userIds = client.PlayingUsers.ToArray();
+            int[] userIds = client.CurrentMatchPlayingUserIds.ToArray();
 
             StartPlay(() => new MultiplayerPlayer(SelectedItem.Value, userIds));
         }
diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index e7e5459f76..d4ce542a67 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -84,11 +84,11 @@ namespace osu.Game.Screens.Play.HUD
             // BindableList handles binding in a really bad way (Clear then AddRange) so we need to do this manually..
             foreach (int userId in playingUsers)
             {
-                if (!multiplayerClient.PlayingUsers.Contains(userId))
+                if (!multiplayerClient.CurrentMatchPlayingUserIds.Contains(userId))
                     usersChanged(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, new[] { userId }));
             }
 
-            playingUsers.BindTo(multiplayerClient.PlayingUsers);
+            playingUsers.BindTo(multiplayerClient.CurrentMatchPlayingUserIds);
             playingUsers.BindCollectionChanged(usersChanged);
         }
 

From f31a0e455a7834e839643a711df9dcd96409c315 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Dec 2020 14:29:40 +0900
Subject: [PATCH 0657/3722] Minor xmldoc rewording

---
 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index bb690d786a..39d119b2a4 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Online.Multiplayer
         public MultiplayerRoom? Room { get; private set; }
 
         /// <summary>
-        /// The users in the joined <see cref="Room"/> which are currently in gameplay.
+        /// The users in the joined <see cref="Room"/> which are participating in the current gameplay loop.
         /// </summary>
         public readonly BindableList<int> CurrentMatchPlayingUserIds = new BindableList<int>();
 

From 45c578b85780f81051035dee3094efeef995fff9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Dec 2020 15:10:08 +0900
Subject: [PATCH 0658/3722] Remove selection polling from multiplayer

Looks like this was just copy-paste without any thought into whether it
should exist. It really shouldn't exist.

This is a thing for the playlists system because the *whole system*
there relies on polling the web API to get updated information. In the
case of mutliplayer, we hand off all communications to the realtime
server at the point of joining the rooms.

The argument that this was there to do faster polling on the selection
isn't valid since the polling times were the same for both cases.

Closes #11348.
---
 .../OnlinePlay/Multiplayer/Multiplayer.cs     |  5 +---
 .../Multiplayer/MultiplayerRoomManager.cs     | 28 +------------------
 2 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
index 76f5c74433..310617a0bc 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
@@ -33,7 +33,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             if (!this.IsCurrentScreen())
             {
                 multiplayerRoomManager.TimeBetweenListingPolls.Value = 0;
-                multiplayerRoomManager.TimeBetweenSelectionPolls.Value = 0;
             }
             else
             {
@@ -41,18 +40,16 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 {
                     case LoungeSubScreen _:
                         multiplayerRoomManager.TimeBetweenListingPolls.Value = isIdle ? 120000 : 15000;
-                        multiplayerRoomManager.TimeBetweenSelectionPolls.Value = isIdle ? 120000 : 15000;
                         break;
 
                     // Don't poll inside the match or anywhere else.
                     default:
                         multiplayerRoomManager.TimeBetweenListingPolls.Value = 0;
-                        multiplayerRoomManager.TimeBetweenSelectionPolls.Value = 0;
                         break;
                 }
             }
 
-            Logger.Log($"Polling adjusted (listing: {multiplayerRoomManager.TimeBetweenListingPolls.Value}, selection: {multiplayerRoomManager.TimeBetweenSelectionPolls.Value})");
+            Logger.Log($"Polling adjusted (listing: {multiplayerRoomManager.TimeBetweenListingPolls.Value})");
         }
 
         protected override Room CreateNewRoom()
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
index 3cb263298f..5c327266a3 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         private StatefulMultiplayerClient multiplayerClient { get; set; }
 
         public readonly Bindable<double> TimeBetweenListingPolls = new Bindable<double>();
-        public readonly Bindable<double> TimeBetweenSelectionPolls = new Bindable<double>();
+
         private readonly IBindable<bool> isConnected = new Bindable<bool>();
         private readonly Bindable<bool> allowPolling = new Bindable<bool>();
 
@@ -119,11 +119,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 TimeBetweenPolls = { BindTarget = TimeBetweenListingPolls },
                 AllowPolling = { BindTarget = allowPolling }
             },
-            new MultiplayerSelectionPollingComponent
-            {
-                TimeBetweenPolls = { BindTarget = TimeBetweenSelectionPolls },
-                AllowPolling = { BindTarget = allowPolling }
-            }
         };
 
         private class MultiplayerListingPollingComponent : ListingPollingComponent
@@ -146,26 +141,5 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             protected override Task Poll() => !AllowPolling.Value ? Task.CompletedTask : base.Poll();
         }
-
-        private class MultiplayerSelectionPollingComponent : SelectionPollingComponent
-        {
-            public readonly IBindable<bool> AllowPolling = new Bindable<bool>();
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-
-                AllowPolling.BindValueChanged(allowPolling =>
-                {
-                    if (!allowPolling.NewValue)
-                        return;
-
-                    if (IsLoaded)
-                        PollImmediately();
-                });
-            }
-
-            protected override Task Poll() => !AllowPolling.Value ? Task.CompletedTask : base.Poll();
-        }
     }
 }

From 2cb84c5111b9e244d98492e4b7fe43e3ef553492 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Dec 2020 15:19:52 +0900
Subject: [PATCH 0659/3722] Fix error message being shown to user on
 multiplayer disconnection when not in room

---
 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 39d119b2a4..dc80488d39 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -84,7 +84,7 @@ namespace osu.Game.Online.Multiplayer
             IsConnected.BindValueChanged(connected =>
             {
                 // clean up local room state on server disconnect.
-                if (!connected.NewValue)
+                if (!connected.NewValue && Room != null)
                 {
                     Logger.Log("Connection to multiplayer server was lost.", LoggingTarget.Runtime, LogLevel.Important);
                     LeaveRoom().CatchUnobservedExceptions();

From 903dca875e7aa364277dc336e52c9c350a6f363a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 29 Dec 2020 07:46:22 +0100
Subject: [PATCH 0660/3722] Make localUser a client property

---
 .../Online/Multiplayer/StatefulMultiplayerClient.cs    |  5 +++++
 .../Multiplayer/Match/MultiplayerReadyButton.cs        | 10 ++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 39d119b2a4..0f44085134 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -65,6 +65,11 @@ namespace osu.Game.Online.Multiplayer
         /// </summary>
         public readonly BindableList<int> CurrentMatchPlayingUserIds = new BindableList<int>();
 
+        /// <summary>
+        /// The <see cref="MultiplayerRoomUser"/> corresponding to the local player, if available.
+        /// </summary>
+        public MultiplayerRoomUser? LocalUser => Room?.Users.SingleOrDefault(u => u.User?.Id == api.LocalUser.Value.Id);
+
         [Resolved]
         private UserLookupCache userLookupCache { get; set; } = null!;
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
index 5009b435f4..9b406ff52c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -27,9 +27,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        [CanBeNull]
-        private MultiplayerRoomUser localUser;
-
         [Resolved]
         private OsuColour colours { get; set; }
 
@@ -67,14 +64,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
         {
             base.OnRoomUpdated();
 
-            // this method is called on leaving the room, so the local user may not exist in the room any more.
-            localUser = Room?.Users.SingleOrDefault(u => u.User?.Id == api.LocalUser.Value.Id);
-
             updateState();
         }
 
         private void updateState()
         {
+            var localUser = Client.LocalUser;
+
             if (localUser == null)
                 return;
 
@@ -142,6 +138,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
         private void onClick()
         {
+            var localUser = Client.LocalUser;
+
             if (localUser == null)
                 return;
 

From 9ff214023297f4300a439e5c2427281a0cb37bcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 29 Dec 2020 07:51:46 +0100
Subject: [PATCH 0661/3722] Move ready-up logic to match sub-screen

---
 .../Match/MultiplayerMatchFooter.cs           |  9 +++++-
 .../Match/MultiplayerReadyButton.cs           | 30 ++++---------------
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 28 ++++++++++++++++-
 3 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
index a52f62fe00..bd1ca1377e 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.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;
@@ -19,7 +20,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
         public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
 
+        public Action OnReady
+        {
+            set => readyButton.OnReady = value;
+        }
+
         private readonly Drawable background;
+        private readonly MultiplayerReadyButton readyButton;
 
         public MultiplayerMatchFooter()
         {
@@ -29,7 +36,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             InternalChildren = new[]
             {
                 background = new Box { RelativeSizeAxes = Axes.Both },
-                new MultiplayerReadyButton
+                readyButton = new MultiplayerReadyButton
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
index 9b406ff52c..96470cf070 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -1,15 +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 System.Diagnostics;
 using System.Linq;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Game.Extensions;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
 using osu.Game.Online.API;
@@ -24,6 +23,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
     {
         public Bindable<PlaylistItem> SelectedItem => button.SelectedItem;
 
+        public Action OnReady
+        {
+            set => button.Action = value;
+        }
+
         [Resolved]
         private IAPIProvider api { get; set; }
 
@@ -47,7 +51,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                 RelativeSizeAxes = Axes.Both,
                 Size = Vector2.One,
                 Enabled = { Value = true },
-                Action = onClick
             };
         }
 
@@ -136,27 +139,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             }
         }
 
-        private void onClick()
-        {
-            var localUser = Client.LocalUser;
-
-            if (localUser == null)
-                return;
-
-            if (localUser.State == MultiplayerUserState.Idle)
-                Client.ChangeState(MultiplayerUserState.Ready).CatchUnobservedExceptions(true);
-            else
-            {
-                if (Room?.Host?.Equals(localUser) == true)
-                {
-                    gameplayStartTracker.BeginOperation();
-                    Client.StartMatch().CatchUnobservedExceptions(true);
-                }
-                else
-                    Client.ChangeState(MultiplayerUserState.Idle).CatchUnobservedExceptions(true);
-            }
-        }
-
         private class ButtonWithTrianglesExposed : ReadyButton
         {
             public new Triangles Triangles => base.Triangles;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 8eafd7c7df..a87471c8af 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -9,6 +9,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
+using osu.Game.Extensions;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Components;
@@ -153,7 +154,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                         },
                         new Drawable[]
                         {
-                            new MultiplayerMatchFooter { SelectedItem = { BindTarget = SelectedItem } }
+                            new MultiplayerMatchFooter
+                            {
+                                SelectedItem = { BindTarget = SelectedItem },
+                                OnReady = onReady
+                            }
                         }
                     },
                     RowDimensions = new[]
@@ -199,6 +204,27 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e) => SelectedItem.Value = Playlist.FirstOrDefault();
 
+        private void onReady()
+        {
+            var localUser = client.LocalUser;
+
+            if (localUser == null)
+                return;
+
+            if (localUser.State == MultiplayerUserState.Idle)
+                client.ChangeState(MultiplayerUserState.Ready).CatchUnobservedExceptions(true);
+            else
+            {
+                if (client.Room?.Host?.Equals(localUser) == true)
+                {
+                    gameplayStartTracker.BeginOperation();
+                    client.StartMatch().CatchUnobservedExceptions(true);
+                }
+                else
+                    client.ChangeState(MultiplayerUserState.Idle).CatchUnobservedExceptions(true);
+            }
+        }
+
         private void onLoadRequested()
         {
             Debug.Assert(client.Room != null);

From f59ba799d30390f030fcac0e12ac99a1893f78f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 29 Dec 2020 07:54:27 +0100
Subject: [PATCH 0662/3722] Adjust operation tracker implementation

---
 osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
index f2d943e14f..6a340d7954 100644
--- a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
+++ b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 
 namespace osu.Game.Screens.OnlinePlay
@@ -24,21 +25,26 @@ namespace osu.Game.Screens.OnlinePlay
         /// <summary>
         /// Begins tracking a new online operation.
         /// </summary>
+        /// <returns>
+        /// An <see cref="IDisposable"/> that will automatically mark the operation as ended on disposal.
+        /// </returns>
         /// <exception cref="InvalidOperationException">An operation has already been started.</exception>
-        public void BeginOperation()
+        public IDisposable BeginOperation()
         {
             if (leasedInProgress != null)
                 throw new InvalidOperationException("Cannot begin operation while another is in progress.");
 
             leasedInProgress = inProgress.BeginLease(true);
             leasedInProgress.Value = true;
+
+            return new InvokeOnDisposal(endOperation);
         }
 
         /// <summary>
         /// Ends tracking an online operation.
         /// Does nothing if an operation has not been begun yet.
         /// </summary>
-        public void EndOperation()
+        private void endOperation()
         {
             leasedInProgress?.Return();
             leasedInProgress = null;

From db52255bbec7a284b07baac967280e2cf5b3d9a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 29 Dec 2020 08:20:43 +0100
Subject: [PATCH 0663/3722] Adjust tracker usages to match new API

---
 .../TestSceneCreateMultiplayerMatchButton.cs  |  9 ++++--
 .../TestSceneMultiplayerReadyButton.cs        |  9 ++++--
 .../OnlinePlay/Lounge/LoungeSubScreen.cs      | 21 +++++++++----
 .../CreateMultiplayerMatchButton.cs           | 10 +++---
 .../Match/MultiplayerMatchSettingsOverlay.cs  | 31 +++++++++++++++----
 .../Match/MultiplayerReadyButton.cs           | 10 +++---
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 19 +++++++++---
 .../Screens/OnlinePlay/OnlinePlayScreen.cs    |  2 +-
 8 files changed, 79 insertions(+), 32 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneCreateMultiplayerMatchButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneCreateMultiplayerMatchButton.cs
index 2a549e5262..381270c5aa 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneCreateMultiplayerMatchButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneCreateMultiplayerMatchButton.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.Graphics;
@@ -12,7 +13,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
     public class TestSceneCreateMultiplayerMatchButton : MultiplayerTestScene
     {
         [Cached]
-        private OngoingOperationTracker joiningRoomTracker = new OngoingOperationTracker();
+        private OngoingOperationTracker ongoingOperationTracker = new OngoingOperationTracker();
 
         private CreateMultiplayerMatchButton button;
 
@@ -31,12 +32,14 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Test]
         public void TestButtonEnableStateChanges()
         {
+            IDisposable joiningRoomOperation = null;
+
             assertButtonEnableState(true);
 
-            AddStep("begin joining room", () => joiningRoomTracker.BeginOperation());
+            AddStep("begin joining room", () => joiningRoomOperation = ongoingOperationTracker.BeginOperation());
             assertButtonEnableState(false);
 
-            AddStep("end joining room", () => joiningRoomTracker.EndOperation());
+            AddStep("end joining room", () => joiningRoomOperation.Dispose());
             assertButtonEnableState(true);
 
             AddStep("disconnect client", () => Client.Disconnect());
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
index 958c6d218b..de02c6c844 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.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.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
@@ -31,7 +32,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         private RulesetStore rulesets;
 
         [Cached]
-        private OngoingOperationTracker gameplayStartTracker = new OngoingOperationTracker();
+        private OngoingOperationTracker ongoingOperationTracker = new OngoingOperationTracker();
 
         [BackgroundDependencyLoader]
         private void load(GameHost host, AudioManager audio)
@@ -167,11 +168,15 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         private void verifyGameplayStartFlow()
         {
+            IDisposable gameplayStartOperation = null;
+
+            AddStep("hook up tracker", () => button.OnReady = () => gameplayStartOperation = ongoingOperationTracker.BeginOperation());
+
             addClickButtonStep();
             AddAssert("user waiting for load", () => Client.Room?.Users[0].State == MultiplayerUserState.WaitingForLoad);
             AddAssert("ready button disabled", () => !button.ChildrenOfType<OsuButton>().Single().Enabled.Value);
 
-            AddStep("transitioned to gameplay", () => gameplayStartTracker.EndOperation());
+            AddStep("transitioned to gameplay", () => gameplayStartOperation.Dispose());
             AddAssert("ready button enabled", () => button.ChildrenOfType<OsuButton>().Single().Enabled.Value);
         }
     }
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
index f25835f56a..2a16a62714 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.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.Diagnostics;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -39,7 +42,10 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
         private MusicController music { get; set; }
 
         [Resolved(CanBeNull = true)]
-        private OngoingOperationTracker joiningRoomTracker { get; set; }
+        private OngoingOperationTracker ongoingOperationTracker { get; set; }
+
+        [CanBeNull]
+        private IDisposable joiningRoomOperation { get; set; }
 
         [BackgroundDependencyLoader]
         private void load()
@@ -102,9 +108,9 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
             initialRoomsReceived.BindTo(RoomManager.InitialRoomsReceived);
             initialRoomsReceived.BindValueChanged(_ => updateLoadingLayer());
 
-            if (joiningRoomTracker != null)
+            if (ongoingOperationTracker != null)
             {
-                joiningRoom.BindTo(joiningRoomTracker.InProgress);
+                joiningRoom.BindTo(ongoingOperationTracker.InProgress);
                 joiningRoom.BindValueChanged(_ => updateLoadingLayer(), true);
             }
         }
@@ -164,15 +170,18 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
 
         private void joinRequested(Room room)
         {
-            joiningRoomTracker?.BeginOperation();
+            Debug.Assert(joiningRoomOperation == null);
+            joiningRoomOperation = ongoingOperationTracker?.BeginOperation();
 
             RoomManager?.JoinRoom(room, r =>
             {
                 Open(room);
-                joiningRoomTracker?.EndOperation();
+                joiningRoomOperation?.Dispose();
+                joiningRoomOperation = null;
             }, _ =>
             {
-                joiningRoomTracker?.EndOperation();
+                joiningRoomOperation?.Dispose();
+                joiningRoomOperation = null;
             });
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
index 7518a4e71b..3785dfc29f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
@@ -11,13 +11,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
     public class CreateMultiplayerMatchButton : PurpleTriangleButton
     {
         private IBindable<bool> isConnected;
-        private IBindable<bool> joiningRoom;
+        private IBindable<bool> operationInProgress;
 
         [Resolved]
         private StatefulMultiplayerClient multiplayerClient { get; set; }
 
         [Resolved]
-        private OngoingOperationTracker joiningRoomTracker { get; set; }
+        private OngoingOperationTracker ongoingOperationTracker { get; set; }
 
         [BackgroundDependencyLoader]
         private void load()
@@ -29,10 +29,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             isConnected = multiplayerClient.IsConnected.GetBoundCopy();
             isConnected.BindValueChanged(_ => updateState());
 
-            joiningRoom = joiningRoomTracker.InProgress.GetBoundCopy();
-            joiningRoom.BindValueChanged(_ => updateState(), true);
+            operationInProgress = ongoingOperationTracker.InProgress.GetBoundCopy();
+            operationInProgress.BindValueChanged(_ => updateState(), true);
         }
 
-        private void updateState() => Enabled.Value = isConnected.Value && !joiningRoom.Value;
+        private void updateState() => Enabled.Value = isConnected.Value && !operationInProgress.Value;
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
index de25cff546..59b138123d 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
@@ -2,6 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -68,7 +70,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             [Resolved]
             private Bindable<RulesetInfo> ruleset { get; set; }
 
-            private readonly OngoingOperationTracker applyingSettingsTracker = new OngoingOperationTracker();
+            [Resolved]
+            private OngoingOperationTracker ongoingOperationTracker { get; set; }
+
+            private readonly IBindable<bool> operationInProgress = new BindableBool();
+
+            [CanBeNull]
+            private IDisposable applyingSettingsOperation;
 
             [BackgroundDependencyLoader]
             private void load(OsuColour colours)
@@ -277,7 +285,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                 MaxParticipants.BindValueChanged(count => MaxParticipantsField.Text = count.NewValue?.ToString(), true);
                 RoomID.BindValueChanged(roomId => initialBeatmapControl.Alpha = roomId.NewValue == null ? 1 : 0, true);
 
-                applyingSettingsTracker.InProgress.BindValueChanged(v =>
+                operationInProgress.BindTo(ongoingOperationTracker.InProgress);
+                operationInProgress.BindValueChanged(v =>
                 {
                     if (v.NewValue)
                         loadingLayer.Show();
@@ -290,7 +299,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             {
                 base.Update();
 
-                ApplyButton.Enabled.Value = Playlist.Count > 0 && NameField.Text.Length > 0 && !applyingSettingsTracker.InProgress.Value;
+                ApplyButton.Enabled.Value = Playlist.Count > 0 && NameField.Text.Length > 0 && !operationInProgress.Value;
             }
 
             private void apply()
@@ -299,7 +308,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                     return;
 
                 hideError();
-                applyingSettingsTracker.BeginOperation();
+
+                Debug.Assert(applyingSettingsOperation == null);
+                applyingSettingsOperation = ongoingOperationTracker.BeginOperation();
 
                 // If the client is already in a room, update via the client.
                 // Otherwise, update the room directly in preparation for it to be submitted to the API on match creation.
@@ -332,15 +343,23 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
             private void onSuccess(Room room)
             {
-                applyingSettingsTracker.EndOperation();
+                Debug.Assert(applyingSettingsOperation != null);
+
                 SettingsApplied?.Invoke();
+
+                applyingSettingsOperation.Dispose();
+                applyingSettingsOperation = null;
             }
 
             private void onError(string text)
             {
+                Debug.Assert(applyingSettingsOperation != null);
+
                 ErrorText.Text = text;
                 ErrorText.FadeIn(50);
-                applyingSettingsTracker.EndOperation();
+
+                applyingSettingsOperation.Dispose();
+                applyingSettingsOperation = null;
             }
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
index 96470cf070..b145cd46c1 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -35,14 +35,14 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
         private OsuColour colours { get; set; }
 
         [Resolved]
-        private OngoingOperationTracker gameplayStartTracker { get; set; }
+        private OngoingOperationTracker ongoingOperationTracker { get; set; }
 
         private SampleChannel sampleReadyCount;
 
         private readonly ButtonWithTrianglesExposed button;
 
         private int countReady;
-        private IBindable<bool> gameplayStartInProgress;
+        private IBindable<bool> operationInProgress;
 
         public MultiplayerReadyButton()
         {
@@ -59,8 +59,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
         {
             sampleReadyCount = audio.Samples.Get(@"SongSelect/select-difficulty");
 
-            gameplayStartInProgress = gameplayStartTracker.InProgress.GetBoundCopy();
-            gameplayStartInProgress.BindValueChanged(_ => updateState());
+            operationInProgress = ongoingOperationTracker.InProgress.GetBoundCopy();
+            operationInProgress.BindValueChanged(_ => updateState());
         }
 
         protected override void OnRoomUpdated()
@@ -105,7 +105,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                     break;
             }
 
-            button.Enabled.Value = Client.Room?.State == MultiplayerRoomState.Open && !gameplayStartInProgress.Value;
+            button.Enabled.Value = Client.Room?.State == MultiplayerRoomState.Open && !operationInProgress.Value;
 
             if (newCountReady != countReady)
             {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index a87471c8af..b82bf508ce 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.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 System;
 using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -32,13 +34,16 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         [Resolved]
         private StatefulMultiplayerClient client { get; set; }
 
-        [Cached]
-        private OngoingOperationTracker gameplayStartTracker = new OngoingOperationTracker();
+        [Resolved]
+        private OngoingOperationTracker ongoingOperationTracker { get; set; }
 
         private MultiplayerMatchSettingsOverlay settingsOverlay;
 
         private IBindable<bool> isConnected;
 
+        [CanBeNull]
+        private IDisposable gameplayStartOperation;
+
         public MultiplayerMatchSubScreen(Room room)
         {
             Title = room.RoomID.Value == null ? "New room" : room.Name.Value;
@@ -217,7 +222,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             {
                 if (client.Room?.Host?.Equals(localUser) == true)
                 {
-                    gameplayStartTracker.BeginOperation();
+                    Debug.Assert(gameplayStartOperation == null);
+                    gameplayStartOperation = ongoingOperationTracker.BeginOperation();
+
                     client.StartMatch().CatchUnobservedExceptions(true);
                 }
                 else
@@ -232,7 +239,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             int[] userIds = client.CurrentMatchPlayingUserIds.ToArray();
 
             StartPlay(() => new MultiplayerPlayer(SelectedItem.Value, userIds));
-            gameplayStartTracker.EndOperation();
+
+            Debug.Assert(gameplayStartOperation != null);
+
+            gameplayStartOperation.Dispose();
+            gameplayStartOperation = null;
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index 92665c498b..13ebc1912e 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Screens.OnlinePlay
         private readonly Bindable<FilterCriteria> currentFilter = new Bindable<FilterCriteria>(new FilterCriteria());
 
         [Cached]
-        private readonly OngoingOperationTracker joiningRoomTracker = new OngoingOperationTracker();
+        private readonly OngoingOperationTracker ongoingOperationTracker = new OngoingOperationTracker();
 
         [Resolved(CanBeNull = true)]
         private MusicController music { get; set; }

From 03b78d1c4b2de871626068a454b163448f216e09 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Dec 2020 15:27:22 +0900
Subject: [PATCH 0664/3722] Handle SocketExceptions and HttpRequestExceptions
 more silently

These can occur when a network connection is completely unavailable (ie.
host resolution failures are occurring). Currently these would appear as
important errors which spammed the notification overlay every retry
forever, while no network connection is available.

I also took this opportunity to remove a lot of `bool` passing which was
no longer in use (previously the fail count / retry process was
different to what we have today).
---
 osu.Game/Online/API/APIAccess.cs | 46 ++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index 133ba22406..2aaea22155 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Net;
 using System.Net.Http;
+using System.Net.Sockets;
 using System.Threading;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
@@ -293,8 +294,21 @@ namespace osu.Game.Online.API
                 failureCount = 0;
                 return true;
             }
+            catch (HttpRequestException re)
+            {
+                log.Add($"{nameof(HttpRequestException)} while performing request {req}: {re.Message}");
+                handleFailure();
+                return false;
+            }
+            catch (SocketException se)
+            {
+                log.Add($"{nameof(SocketException)} while performing request {req}: {se.Message}");
+                handleFailure();
+                return false;
+            }
             catch (WebException we)
             {
+                log.Add($"{nameof(WebException)} while performing request {req}: {we.Message}");
                 handleWebException(we);
                 return false;
             }
@@ -312,7 +326,7 @@ namespace osu.Game.Online.API
         /// </summary>
         public IBindable<APIState> State => state;
 
-        private bool handleWebException(WebException we)
+        private void handleWebException(WebException we)
         {
             HttpStatusCode statusCode = (we.Response as HttpWebResponse)?.StatusCode
                                         ?? (we.Status == WebExceptionStatus.UnknownError ? HttpStatusCode.NotAcceptable : HttpStatusCode.RequestTimeout);
@@ -330,26 +344,24 @@ namespace osu.Game.Online.API
             {
                 case HttpStatusCode.Unauthorized:
                     Logout();
-                    return true;
+                    break;
 
                 case HttpStatusCode.RequestTimeout:
-                    failureCount++;
-                    log.Add($@"API failure count is now {failureCount}");
-
-                    if (failureCount < 3)
-                        // we might try again at an api level.
-                        return false;
-
-                    if (State.Value == APIState.Online)
-                    {
-                        state.Value = APIState.Failing;
-                        flushQueue();
-                    }
-
-                    return true;
+                    handleFailure();
+                    break;
             }
+        }
 
-            return true;
+        private void handleFailure()
+        {
+            failureCount++;
+            log.Add($@"API failure count is now {failureCount}");
+
+            if (failureCount >= 3 && State.Value == APIState.Online)
+            {
+                state.Value = APIState.Failing;
+                flushQueue();
+            }
         }
 
         public bool IsLoggedIn => localUser.Value.Id > 1;

From 4d04e0dee7c73eaab08ecb4a47cee7822221972a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Dec 2020 16:25:51 +0900
Subject: [PATCH 0665/3722] Disallow entering the playlists/multiplayer screens
 if API is failing

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

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 474cbde192..65a16f2fcb 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -156,7 +156,7 @@ namespace osu.Game.Screens.Menu
 
         private void onMultiplayer()
         {
-            if (!api.IsLoggedIn)
+            if (!api.IsLoggedIn || api.State.Value != APIState.Online)
             {
                 notifications?.Post(new SimpleNotification
                 {
@@ -177,11 +177,11 @@ namespace osu.Game.Screens.Menu
 
         private void onPlaylists()
         {
-            if (!api.IsLoggedIn)
+            if (!api.IsLoggedIn || api.State.Value != APIState.Online)
             {
                 notifications?.Post(new SimpleNotification
                 {
-                    Text = "You gotta be logged in to multi 'yo!",
+                    Text = "You gotta be logged in to view playlists 'yo!",
                     Icon = FontAwesome.Solid.Globe,
                     Activated = () =>
                     {

From 906a9b79b5b62a6d25c304549a6308451127079b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Dec 2020 16:47:36 +0900
Subject: [PATCH 0666/3722] Show an error when forcefully exiting online play
 due to API failure

---
 osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index 4074dd1573..75612516a9 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics.Containers;
@@ -165,7 +166,10 @@ namespace osu.Game.Screens.OnlinePlay
         private void onlineStateChanged(ValueChangedEvent<APIState> state) => Schedule(() =>
         {
             if (state.NewValue != APIState.Online)
+            {
+                Logger.Log("API connection was lost, can't continue with online play", LoggingTarget.Network, LogLevel.Important);
                 Schedule(forcefullyExit);
+            }
         });
 
         protected override void LoadComplete()

From e9b0652359e9bcffed8c4e84f95a35f3397eef45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 29 Dec 2020 09:09:47 +0100
Subject: [PATCH 0667/3722] Move ready-up operation logic again to client

To salvage ready up button tests.
---
 .../TestSceneMultiplayerReadyButton.cs        | 16 ++++++---
 .../Multiplayer/StatefulMultiplayerClient.cs  | 33 +++++++++++++++++++
 .../Match/MultiplayerMatchFooter.cs           |  4 +--
 .../Match/MultiplayerReadyButton.cs           |  2 +-
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 33 ++++++++-----------
 5 files changed, 61 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
index de02c6c844..86398b205d 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
@@ -34,6 +34,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Cached]
         private OngoingOperationTracker ongoingOperationTracker = new OngoingOperationTracker();
 
+        private IDisposable toggleReadyOperation;
+
         [BackgroundDependencyLoader]
         private void load(GameHost host, AudioManager audio)
         {
@@ -61,6 +63,14 @@ namespace osu.Game.Tests.Visual.Multiplayer
                         Beatmap = { Value = beatmap },
                         Ruleset = { Value = beatmap.Ruleset }
                     }
+                },
+                OnToggleReady = async () =>
+                {
+                    toggleReadyOperation = ongoingOperationTracker.BeginOperation();
+
+                    bool gameplayStarted = await Client.ToggleReady();
+                    if (!gameplayStarted)
+                        toggleReadyOperation.Dispose();
                 }
             };
         });
@@ -168,15 +178,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         private void verifyGameplayStartFlow()
         {
-            IDisposable gameplayStartOperation = null;
-
-            AddStep("hook up tracker", () => button.OnReady = () => gameplayStartOperation = ongoingOperationTracker.BeginOperation());
-
             addClickButtonStep();
             AddAssert("user waiting for load", () => Client.Room?.Users[0].State == MultiplayerUserState.WaitingForLoad);
             AddAssert("ready button disabled", () => !button.ChildrenOfType<OsuButton>().Single().Enabled.Value);
 
-            AddStep("transitioned to gameplay", () => gameplayStartOperation.Dispose());
+            AddStep("transitioned to gameplay", () => toggleReadyOperation.Dispose());
             AddAssert("ready button enabled", () => button.ChildrenOfType<OsuButton>().Single().Enabled.Value);
         }
     }
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 0f44085134..ee42e56d75 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -183,6 +183,39 @@ namespace osu.Game.Online.Multiplayer
             });
         }
 
+        /// <summary>
+        /// Toggles the <see cref="LocalUser"/>'s ready state.
+        /// </summary>
+        /// <returns><c>true</c> if this toggle triggered a gameplay start; <c>false</c> otherwise.</returns>
+        /// <exception cref="InvalidOperationException">If a toggle of ready state is not valid at this time.</exception>
+        public async Task<bool> ToggleReady()
+        {
+            var localUser = LocalUser;
+
+            if (localUser == null)
+                return false;
+
+            switch (localUser.State)
+            {
+                case MultiplayerUserState.Idle:
+                    await ChangeState(MultiplayerUserState.Ready);
+                    return false;
+
+                case MultiplayerUserState.Ready:
+                    if (Room?.Host?.Equals(localUser) == true)
+                    {
+                        await StartMatch();
+                        return true;
+                    }
+
+                    await ChangeState(MultiplayerUserState.Idle);
+                    return false;
+
+                default:
+                    throw new InvalidOperationException($"Cannot toggle ready when in {localUser.State}");
+            }
+        }
+
         public abstract Task TransferHost(int userId);
 
         public abstract Task ChangeSettings(MultiplayerRoomSettings settings);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
index bd1ca1377e..a5e7650e31 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
@@ -20,9 +20,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
         public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
 
-        public Action OnReady
+        public Action OnToggleReady
         {
-            set => readyButton.OnReady = value;
+            set => readyButton.OnToggleReady = value;
         }
 
         private readonly Drawable background;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
index b145cd46c1..251b5b30ae 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
     {
         public Bindable<PlaylistItem> SelectedItem => button.SelectedItem;
 
-        public Action OnReady
+        public Action OnToggleReady
         {
             set => button.Action = value;
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index b82bf508ce..88b4c8a1bf 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -162,7 +162,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                             new MultiplayerMatchFooter
                             {
                                 SelectedItem = { BindTarget = SelectedItem },
-                                OnReady = onReady
+                                OnToggleReady = onToggleReady
                             }
                         }
                     },
@@ -209,27 +209,22 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e) => SelectedItem.Value = Playlist.FirstOrDefault();
 
-        private void onReady()
+        private void onToggleReady()
         {
-            var localUser = client.LocalUser;
+            Debug.Assert(gameplayStartOperation == null);
+            gameplayStartOperation = ongoingOperationTracker.BeginOperation();
 
-            if (localUser == null)
-                return;
+            client.ToggleReady()
+                  .ContinueWith(t =>
+                  {
+                      // if gameplay was started, the button will be unblocked on load requested.
+                      if (t.Result) return;
 
-            if (localUser.State == MultiplayerUserState.Idle)
-                client.ChangeState(MultiplayerUserState.Ready).CatchUnobservedExceptions(true);
-            else
-            {
-                if (client.Room?.Host?.Equals(localUser) == true)
-                {
-                    Debug.Assert(gameplayStartOperation == null);
-                    gameplayStartOperation = ongoingOperationTracker.BeginOperation();
-
-                    client.StartMatch().CatchUnobservedExceptions(true);
-                }
-                else
-                    client.ChangeState(MultiplayerUserState.Idle).CatchUnobservedExceptions(true);
-            }
+                      // gameplay was not started; unblock button.
+                      gameplayStartOperation?.Dispose();
+                      gameplayStartOperation = null;
+                  })
+                  .CatchUnobservedExceptions();
         }
 
         private void onLoadRequested()

From 274730de34336b646ca57027c6820922cd9fc0ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 29 Dec 2020 09:15:33 +0100
Subject: [PATCH 0668/3722] Cache tracker in test scene to resolve test fails

---
 .../Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
index 8869718fd1..2344ebea0e 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
@@ -3,10 +3,12 @@
 
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Screens.OnlinePlay;
 using osu.Game.Screens.OnlinePlay.Multiplayer;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
 using osu.Game.Tests.Beatmaps;
@@ -18,6 +20,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
     {
         private MultiplayerMatchSubScreen screen;
 
+        [Cached]
+        private OngoingOperationTracker ongoingOperationTracker = new OngoingOperationTracker();
+
         public TestSceneMultiplayerMatchSubScreen()
             : base(false)
         {

From 6bbd0ecfac9fc77ae680064ec61b29f2409380e8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 29 Dec 2020 17:39:00 +0900
Subject: [PATCH 0669/3722] Remove unused lock object

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

diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoom.cs b/osu.Game/Online/Multiplayer/MultiplayerRoom.cs
index 2134e50d72..99f0eae2b3 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoom.cs
@@ -42,8 +42,6 @@ namespace osu.Game.Online.Multiplayer
         /// </summary>
         public MultiplayerRoomUser? Host { get; set; }
 
-        private object writeLock = new object();
-
         [JsonConstructor]
         public MultiplayerRoom(in long roomId)
         {

From cafa241ef3e7d73952956fda2ec83b04ef519da4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 29 Dec 2020 09:41:32 +0100
Subject: [PATCH 0670/3722] Fix ready-up button getting stuck if server
 operation fails

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 88b4c8a1bf..5676bb22b4 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -11,7 +11,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
-using osu.Game.Extensions;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Components;
@@ -218,13 +217,14 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                   .ContinueWith(t =>
                   {
                       // if gameplay was started, the button will be unblocked on load requested.
-                      if (t.Result) return;
+                      // accessing Exception here also silences any potential errors from the antecedent task
+                      // (we still want to unblock the button if the ready-up fails).
+                      if (t.Exception == null && t.Result) return;
 
                       // gameplay was not started; unblock button.
                       gameplayStartOperation?.Dispose();
                       gameplayStartOperation = null;
-                  })
-                  .CatchUnobservedExceptions();
+                  });
         }
 
         private void onLoadRequested()

From 5d2319923324b48fa749474c11686db3f82b41d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 29 Dec 2020 10:56:29 +0100
Subject: [PATCH 0671/3722] Trim redundant IsLoggedIn checks

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

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 65a16f2fcb..3ac9bb6c24 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -156,7 +156,7 @@ namespace osu.Game.Screens.Menu
 
         private void onMultiplayer()
         {
-            if (!api.IsLoggedIn || api.State.Value != APIState.Online)
+            if (api.State.Value != APIState.Online)
             {
                 notifications?.Post(new SimpleNotification
                 {
@@ -177,7 +177,7 @@ namespace osu.Game.Screens.Menu
 
         private void onPlaylists()
         {
-            if (!api.IsLoggedIn || api.State.Value != APIState.Online)
+            if (api.State.Value != APIState.Online)
             {
                 notifications?.Post(new SimpleNotification
                 {

From 361d215ab4def9965856c4e998a6373c504bfc0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 29 Dec 2020 10:56:59 +0100
Subject: [PATCH 0672/3722] Reword notification messages to match new logic

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

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 3ac9bb6c24..fd4d74dc6b 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -160,7 +160,7 @@ namespace osu.Game.Screens.Menu
             {
                 notifications?.Post(new SimpleNotification
                 {
-                    Text = "You gotta be logged in to multi 'yo!",
+                    Text = "You gotta be online to multi 'yo!",
                     Icon = FontAwesome.Solid.Globe,
                     Activated = () =>
                     {
@@ -181,7 +181,7 @@ namespace osu.Game.Screens.Menu
             {
                 notifications?.Post(new SimpleNotification
                 {
-                    Text = "You gotta be logged in to view playlists 'yo!",
+                    Text = "You gotta be online to view playlists 'yo!",
                     Icon = FontAwesome.Solid.Globe,
                     Activated = () =>
                     {

From f2163a471a83eee0c0d41486f256a9b607113e27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 29 Dec 2020 11:53:42 +0100
Subject: [PATCH 0673/3722] Trim missed reference to deleted member

---
 .../Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
index 7a3845cbf3..80d1acd145 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
@@ -143,7 +143,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 RoomManager =
                 {
                     TimeBetweenListingPolls = { Value = 1 },
-                    TimeBetweenSelectionPolls = { Value = 1 }
                 }
             };
 

From 013b9b62a1ff7dfd22db139d0571259bcd89de43 Mon Sep 17 00:00:00 2001
From: Firmatorenio <smeshmunya@gmail.com>
Date: Tue, 29 Dec 2020 20:22:56 +0600
Subject: [PATCH 0674/3722] add SV multipliers to taiko difficulty mods

---
 osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs     | 9 +++++++++
 osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs | 9 +++++++++
 osu.Game/Rulesets/Mods/ModHardRock.cs            | 2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs
index d1ad4c9d8d..5ff91eec9f 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.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.Beatmaps;
 using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Taiko.Mods
@@ -8,5 +9,13 @@ namespace osu.Game.Rulesets.Taiko.Mods
     public class TaikoModEasy : ModEasy
     {
         public override string Description => @"Beats move slower, and less accuracy required!";
+
+        private const double slider_multiplier = 0.8;
+
+        public override void ApplyToDifficulty(BeatmapDifficulty difficulty)
+        {
+            base.ApplyToDifficulty(difficulty);
+            difficulty.SliderMultiplier *= slider_multiplier;
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs
index 49d225cdb5..37c8dab2de 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 osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Taiko.Mods
@@ -9,5 +10,13 @@ namespace osu.Game.Rulesets.Taiko.Mods
     {
         public override double ScoreMultiplier => 1.06;
         public override bool Ranked => true;
+
+        private const double slider_multiplier = 1.87;
+
+        public override void ApplyToDifficulty(BeatmapDifficulty difficulty)
+        {
+            base.ApplyToDifficulty(difficulty);
+            difficulty.SliderMultiplier *= slider_multiplier;
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModHardRock.cs b/osu.Game/Rulesets/Mods/ModHardRock.cs
index 0e589735c1..4edcb0b074 100644
--- a/osu.Game/Rulesets/Mods/ModHardRock.cs
+++ b/osu.Game/Rulesets/Mods/ModHardRock.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Mods
         {
         }
 
-        public void ApplyToDifficulty(BeatmapDifficulty 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.

From 3552034ffe0044dc5edff9195e6e609504336c84 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 30 Dec 2020 00:55:27 +0900
Subject: [PATCH 0675/3722] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index cd2ce58c55..611f0d05f4 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1228.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1229.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 3e1b56c29c..93aa2bc701 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.1228.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1229.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
     <PackageReference Include="Sentry" Version="2.1.8" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 85ba0590ea..5445adb3fb 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1228.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1229.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -88,7 +88,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.1228.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.1229.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 9d9c0df64c9213757c51f379ee6be56cce68b87b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 29 Dec 2020 17:17:44 +0100
Subject: [PATCH 0676/3722] Make DeserializedMod equality members match other
 IMods

---
 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 1e5742c358..3084afb833 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -256,7 +256,7 @@ namespace osu.Game.Scoring
         {
             public string Acronym { get; set; }
 
-            bool IEquatable<IMod>.Equals(IMod other) => other is DeserializedMod them && Equals(them);
+            public bool Equals(IMod other) => other is DeserializedMod them && Equals(them);
             public bool Equals(DeserializedMod other) => Acronym == other?.Acronym;
         }
 

From 497d644a19f04ad19d990bbe7a042f1a556265f1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 30 Dec 2020 20:24:50 +0900
Subject: [PATCH 0677/3722] Move thread safety / locking logic from
 MultiplayerRoom

---
 .../Online/Multiplayer/MultiplayerRoom.cs     | 23 -------------------
 1 file changed, 23 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoom.cs b/osu.Game/Online/Multiplayer/MultiplayerRoom.cs
index 99f0eae2b3..12fcf25ace 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoom.cs
@@ -5,9 +5,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Threading;
 using Newtonsoft.Json;
-using osu.Framework.Allocation;
 
 namespace osu.Game.Online.Multiplayer
 {
@@ -48,27 +46,6 @@ namespace osu.Game.Online.Multiplayer
             RoomID = roomId;
         }
 
-        private object updateLock = new object();
-
-        private ManualResetEventSlim freeForWrite = new ManualResetEventSlim(true);
-
-        /// <summary>
-        /// Request a lock on this room to perform a thread-safe update.
-        /// </summary>
-        public IDisposable LockForUpdate()
-        {
-            // ReSharper disable once InconsistentlySynchronizedField
-            freeForWrite.Wait();
-
-            lock (updateLock)
-            {
-                freeForWrite.Wait();
-                freeForWrite.Reset();
-
-                return new ValueInvokeOnDisposal<MultiplayerRoom>(this, r => freeForWrite.Set());
-            }
-        }
-
         public override string ToString() => $"RoomID:{RoomID} Host:{Host?.UserID} Users:{Users.Count} State:{State} Settings: [{Settings}]";
     }
 }

From 669c42a38d7f3ac2d015754166b7af7aacbd13c9 Mon Sep 17 00:00:00 2001
From: Firmatorenio <smeshmunya@gmail.com>
Date: Wed, 30 Dec 2020 20:57:41 +0600
Subject: [PATCH 0678/3722] add remarks explaining HR SV multiplier

---
 osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs     |  3 +++
 osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs | 10 +++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs
index 5ff91eec9f..ad6fdf59e2 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModEasy.cs
@@ -10,6 +10,9 @@ namespace osu.Game.Rulesets.Taiko.Mods
     {
         public override string Description => @"Beats move slower, and less accuracy required!";
 
+        /// <summary>
+        /// Multiplier factor added to the scrolling speed.
+        /// </summary>
         private const double slider_multiplier = 0.8;
 
         public override void ApplyToDifficulty(BeatmapDifficulty difficulty)
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs
index 37c8dab2de..a5a8b75f80 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModHardRock.cs
@@ -11,7 +11,15 @@ namespace osu.Game.Rulesets.Taiko.Mods
         public override double ScoreMultiplier => 1.06;
         public override bool Ranked => true;
 
-        private const double slider_multiplier = 1.87;
+        /// <summary>
+        /// Multiplier factor added to the scrolling speed.
+        /// </summary>
+        /// <remarks>
+        /// This factor is made up of two parts: the base part (1.4) and the aspect ratio adjustment (4/3).
+        /// Stable applies the latter by dividing the width of the user's display by the width of a display with the same height, but 4:3 aspect ratio.
+        /// TODO: Revisit if taiko playfield ever changes away from a hard-coded 16:9 (see https://github.com/ppy/osu/issues/5685).
+        /// </remarks>
+        private const double slider_multiplier = 1.4 * 4 / 3;
 
         public override void ApplyToDifficulty(BeatmapDifficulty difficulty)
         {

From 59f2017a13672be09b527873470d528717d4ae70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 30 Dec 2020 16:22:11 +0100
Subject: [PATCH 0679/3722] Move BindValueChanged subscriptions to LoadComplete

---
 .../Multiplayer/CreateMultiplayerMatchButton.cs          | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
index 3785dfc29f..87b0e49b5b 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
@@ -27,9 +27,14 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             Text = "Create room";
 
             isConnected = multiplayerClient.IsConnected.GetBoundCopy();
-            isConnected.BindValueChanged(_ => updateState());
-
             operationInProgress = ongoingOperationTracker.InProgress.GetBoundCopy();
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            isConnected.BindValueChanged(_ => updateState());
             operationInProgress.BindValueChanged(_ => updateState(), true);
         }
 

From dd87478690096232e4833dc69116006b1bf1e57e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 30 Dec 2020 16:29:19 +0100
Subject: [PATCH 0680/3722] Add helper IsHost property to Client

---
 .../Online/Multiplayer/StatefulMultiplayerClient.cs  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index ee42e56d75..290765dc35 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -70,6 +70,18 @@ namespace osu.Game.Online.Multiplayer
         /// </summary>
         public MultiplayerRoomUser? LocalUser => Room?.Users.SingleOrDefault(u => u.User?.Id == api.LocalUser.Value.Id);
 
+        /// <summary>
+        /// Whether the <see cref="LocalUser"/> is the host in <see cref="Room"/>.
+        /// </summary>
+        public bool IsHost
+        {
+            get
+            {
+                var localUser = LocalUser;
+                return localUser != null && Room?.Host != null && localUser.Equals(Room.Host);
+            }
+        }
+
         [Resolved]
         private UserLookupCache userLookupCache { get; set; } = null!;
 

From d34609b98ed925ccb181f2fc6d47101e3c1623a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 30 Dec 2020 16:29:36 +0100
Subject: [PATCH 0681/3722] Rename On{ToggleReady -> ReadyClick}

---
 .../Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs     | 2 +-
 .../OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs    | 4 ++--
 .../OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs    | 2 +-
 .../OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
index 86398b205d..1d82b29a91 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                         Ruleset = { Value = beatmap.Ruleset }
                     }
                 },
-                OnToggleReady = async () =>
+                OnReadyClick = async () =>
                 {
                     toggleReadyOperation = ongoingOperationTracker.BeginOperation();
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
index a5e7650e31..bbf861fac3 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
@@ -20,9 +20,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
         public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
 
-        public Action OnToggleReady
+        public Action OnReadyClick
         {
-            set => readyButton.OnToggleReady = value;
+            set => readyButton.OnReadyClick = value;
         }
 
         private readonly Drawable background;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
index 251b5b30ae..c6018a79e9 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
     {
         public Bindable<PlaylistItem> SelectedItem => button.SelectedItem;
 
-        public Action OnToggleReady
+        public Action OnReadyClick
         {
             set => button.Action = value;
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 5676bb22b4..b00ab065fb 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -161,7 +161,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                             new MultiplayerMatchFooter
                             {
                                 SelectedItem = { BindTarget = SelectedItem },
-                                OnToggleReady = onToggleReady
+                                OnReadyClick = onToggleReady
                             }
                         }
                     },

From f800448c87f163346a2ce4284ace782646816823 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 30 Dec 2020 18:00:57 +0100
Subject: [PATCH 0682/3722] Move game start logic to a higher level

---
 .../TestSceneMultiplayerReadyButton.cs        | 17 ++++---
 .../Multiplayer/StatefulMultiplayerClient.cs  | 15 ++----
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 51 ++++++++++++-------
 3 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
index 1d82b29a91..a6037dcbf2 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Cached]
         private OngoingOperationTracker ongoingOperationTracker = new OngoingOperationTracker();
 
-        private IDisposable toggleReadyOperation;
+        private IDisposable readyClickOperation;
 
         [BackgroundDependencyLoader]
         private void load(GameHost host, AudioManager audio)
@@ -66,11 +66,16 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 },
                 OnReadyClick = async () =>
                 {
-                    toggleReadyOperation = ongoingOperationTracker.BeginOperation();
+                    readyClickOperation = ongoingOperationTracker.BeginOperation();
 
-                    bool gameplayStarted = await Client.ToggleReady();
-                    if (!gameplayStarted)
-                        toggleReadyOperation.Dispose();
+                    if (Client.IsHost && Client.LocalUser?.State == MultiplayerUserState.Ready)
+                    {
+                        await Client.StartMatch();
+                        return;
+                    }
+
+                    await Client.ToggleReady();
+                    readyClickOperation.Dispose();
                 }
             };
         });
@@ -182,7 +187,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("user waiting for load", () => Client.Room?.Users[0].State == MultiplayerUserState.WaitingForLoad);
             AddAssert("ready button disabled", () => !button.ChildrenOfType<OsuButton>().Single().Enabled.Value);
 
-            AddStep("transitioned to gameplay", () => toggleReadyOperation.Dispose());
+            AddStep("transitioned to gameplay", () => readyClickOperation.Dispose());
             AddAssert("ready button enabled", () => button.ChildrenOfType<OsuButton>().Single().Enabled.Value);
         }
     }
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 290765dc35..5c6baa4fea 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -198,30 +198,23 @@ namespace osu.Game.Online.Multiplayer
         /// <summary>
         /// Toggles the <see cref="LocalUser"/>'s ready state.
         /// </summary>
-        /// <returns><c>true</c> if this toggle triggered a gameplay start; <c>false</c> otherwise.</returns>
         /// <exception cref="InvalidOperationException">If a toggle of ready state is not valid at this time.</exception>
-        public async Task<bool> ToggleReady()
+        public async Task ToggleReady()
         {
             var localUser = LocalUser;
 
             if (localUser == null)
-                return false;
+                return;
 
             switch (localUser.State)
             {
                 case MultiplayerUserState.Idle:
                     await ChangeState(MultiplayerUserState.Ready);
-                    return false;
+                    return;
 
                 case MultiplayerUserState.Ready:
-                    if (Room?.Host?.Equals(localUser) == true)
-                    {
-                        await StartMatch();
-                        return true;
-                    }
-
                     await ChangeState(MultiplayerUserState.Idle);
-                    return false;
+                    return;
 
                 default:
                     throw new InvalidOperationException($"Cannot toggle ready when in {localUser.State}");
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index b00ab065fb..1bef8841f5 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -11,6 +11,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
+using osu.Game.Extensions;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Components;
@@ -41,7 +42,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         private IBindable<bool> isConnected;
 
         [CanBeNull]
-        private IDisposable gameplayStartOperation;
+        private IDisposable readyClickOperation;
 
         public MultiplayerMatchSubScreen(Room room)
         {
@@ -161,7 +162,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                             new MultiplayerMatchFooter
                             {
                                 SelectedItem = { BindTarget = SelectedItem },
-                                OnReadyClick = onToggleReady
+                                OnReadyClick = onReadyClick
                             }
                         }
                     },
@@ -208,23 +209,37 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e) => SelectedItem.Value = Playlist.FirstOrDefault();
 
-        private void onToggleReady()
+        private void onReadyClick()
         {
-            Debug.Assert(gameplayStartOperation == null);
-            gameplayStartOperation = ongoingOperationTracker.BeginOperation();
+            Debug.Assert(readyClickOperation == null);
+            readyClickOperation = ongoingOperationTracker.BeginOperation();
+
+            if (client.IsHost && client.LocalUser?.State == MultiplayerUserState.Ready)
+            {
+                client.StartMatch()
+                      .ContinueWith(t =>
+                      {
+                          // accessing Exception here silences any potential errors from the antecedent task
+                          if (t.Exception != null)
+                          {
+                              // gameplay was not started due to an exception; unblock button.
+                              endOperation();
+                          }
+
+                          // gameplay is starting, the button will be unblocked on load requested.
+                      });
+                return;
+            }
 
             client.ToggleReady()
-                  .ContinueWith(t =>
-                  {
-                      // if gameplay was started, the button will be unblocked on load requested.
-                      // accessing Exception here also silences any potential errors from the antecedent task
-                      // (we still want to unblock the button if the ready-up fails).
-                      if (t.Exception == null && t.Result) return;
+                  .ContinueWith(_ => endOperation())
+                  .CatchUnobservedExceptions();
 
-                      // gameplay was not started; unblock button.
-                      gameplayStartOperation?.Dispose();
-                      gameplayStartOperation = null;
-                  });
+            void endOperation()
+            {
+                readyClickOperation?.Dispose();
+                readyClickOperation = null;
+            }
         }
 
         private void onLoadRequested()
@@ -235,10 +250,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             StartPlay(() => new MultiplayerPlayer(SelectedItem.Value, userIds));
 
-            Debug.Assert(gameplayStartOperation != null);
+            Debug.Assert(readyClickOperation != null);
 
-            gameplayStartOperation.Dispose();
-            gameplayStartOperation = null;
+            readyClickOperation.Dispose();
+            readyClickOperation = null;
         }
 
         protected override void Dispose(bool isDisposing)

From eb64e6bf4da427df3b3b0f1bfab8dbab42f4819f Mon Sep 17 00:00:00 2001
From: Susko3 <16479013+Susko3@users.noreply.github.com>
Date: Wed, 30 Dec 2020 23:35:07 +0100
Subject: [PATCH 0683/3722] Remove duplicate application/octet-stream

---
 osu.Android/OsuGameActivity.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index da69b516dd..9d28ad7c5b 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -18,7 +18,6 @@ namespace osu.Android
     [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false, LaunchMode = LaunchMode.SingleInstance)]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPattern = ".*\\\\.osz", DataHost = "*", DataMimeType = "*/*")]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPattern = ".*\\\\.osk", DataHost = "*", DataMimeType = "*/*")]
-    [IntentFilter(new[] { Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataMimeType = "application/octet-stream")]
     [IntentFilter(new[] { Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault }, DataMimeTypes = new[] { "application/zip", "application/octet-stream" })]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryBrowsable, Intent.CategoryDefault }, DataSchemes = new[] { "osu", "osump" })]
     public class OsuGameActivity : AndroidGameActivity

From f9196ae9767653c75dc2d9ff6a0a273671a4466c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 31 Dec 2020 16:36:20 +0900
Subject: [PATCH 0684/3722] Fix PerformFromMenuRunner failing if CurrentScreen
 is null

---
 osu.Game/PerformFromMenuRunner.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/PerformFromMenuRunner.cs b/osu.Game/PerformFromMenuRunner.cs
index e2d4fc6051..9222a64023 100644
--- a/osu.Game/PerformFromMenuRunner.cs
+++ b/osu.Game/PerformFromMenuRunner.cs
@@ -73,13 +73,16 @@ namespace osu.Game
             // find closest valid target
             IScreen current = getCurrentScreen();
 
+            if (current == null)
+                return;
+
             // a dialog may be blocking the execution for now.
             if (checkForDialog(current)) return;
 
             game?.CloseAllOverlays(false);
 
             // we may already be at the target screen type.
-            if (validScreens.Contains(getCurrentScreen().GetType()) && !beatmap.Disabled)
+            if (validScreens.Contains(current.GetType()) && !beatmap.Disabled)
             {
                 complete();
                 return;

From 00c6703c51df3cd05788d1c41d84b64d88de1ff6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 31 Dec 2020 10:27:42 +0100
Subject: [PATCH 0685/3722] Inline complete method as well

For better guarantees that `finalAction` is actually called on the same
screen that `checkCanComplete()` was (uses result of one
`getCurrentScreen()` call throughout instead of calling multiple times).
---
 osu.Game/PerformFromMenuRunner.cs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/osu.Game/PerformFromMenuRunner.cs b/osu.Game/PerformFromMenuRunner.cs
index 9222a64023..7999023998 100644
--- a/osu.Game/PerformFromMenuRunner.cs
+++ b/osu.Game/PerformFromMenuRunner.cs
@@ -84,7 +84,8 @@ namespace osu.Game
             // we may already be at the target screen type.
             if (validScreens.Contains(current.GetType()) && !beatmap.Disabled)
             {
-                complete();
+                finalAction(current);
+                Cancel();
                 return;
             }
 
@@ -138,11 +139,5 @@ namespace osu.Game
             lastEncounteredDialogScreen = current;
             return true;
         }
-
-        private void complete()
-        {
-            finalAction(getCurrentScreen());
-            Cancel();
-        }
     }
 }

From 2d279350ad5f6a4e544601c7be7bca768bef1cbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 31 Dec 2020 11:29:02 +0100
Subject: [PATCH 0686/3722] Catch multiplayer client-related unobserved
 exceptions better

Silencing an exception from a task continuation requires accessing
`task.Exception` in any way, which was not done previously if
`logOnError` was false.

To resolve without having to worry whether the compiler will optimise
away a useless access or now, just always log, but switch the logging
level. The unimportant errors will be logged as debug and therefore
essentially silenced on release builds (but could still be potentially
useful in debugging).
---
 osu.Game/Extensions/TaskExtensions.cs | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Extensions/TaskExtensions.cs b/osu.Game/Extensions/TaskExtensions.cs
index a1215d786b..4138c2757a 100644
--- a/osu.Game/Extensions/TaskExtensions.cs
+++ b/osu.Game/Extensions/TaskExtensions.cs
@@ -1,7 +1,11 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+#nullable enable
+
+using System;
 using System.Threading.Tasks;
+using osu.Framework.Extensions.ExceptionExtensions;
 using osu.Framework.Logging;
 
 namespace osu.Game.Extensions
@@ -13,13 +17,19 @@ namespace osu.Game.Extensions
         /// Avoids unobserved exceptions from being fired.
         /// </summary>
         /// <param name="task">The task.</param>
-        /// <param name="logOnError">Whether errors should be logged as important, or silently ignored.</param>
-        public static void CatchUnobservedExceptions(this Task task, bool logOnError = false)
+        /// <param name="logAsError">
+        /// Whether errors should be logged as errors visible to users, or as debug messages.
+        /// Logging as debug will essentially silence the errors on non-release builds.
+        /// </param>
+        public static void CatchUnobservedExceptions(this Task task, bool logAsError = false)
         {
             task.ContinueWith(t =>
             {
-                if (logOnError)
-                    Logger.Log($"Error running task: {t.Exception?.Message ?? "unknown"}", LoggingTarget.Runtime, LogLevel.Important);
+                Exception? exception = t.Exception?.AsSingular();
+                if (logAsError)
+                    Logger.Error(exception, $"Error running task: {exception?.Message ?? "(unknown)"}", LoggingTarget.Runtime, true);
+                else
+                    Logger.Log($"Error running task: {exception}", LoggingTarget.Runtime, LogLevel.Debug);
             }, TaskContinuationOptions.NotOnRanToCompletion);
         }
     }

From 7d9a61fbc1b7afad59df89d3cf13cea4cce8be8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 31 Dec 2020 11:50:59 +0100
Subject: [PATCH 0687/3722] Handle unobserved exceptions from ready button
 properly

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 1bef8841f5..39323d9db9 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -222,6 +222,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                           // accessing Exception here silences any potential errors from the antecedent task
                           if (t.Exception != null)
                           {
+                              t.CatchUnobservedExceptions(true); // will run immediately.
                               // gameplay was not started due to an exception; unblock button.
                               endOperation();
                           }
@@ -232,8 +233,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             }
 
             client.ToggleReady()
-                  .ContinueWith(_ => endOperation())
-                  .CatchUnobservedExceptions();
+                  .ContinueWith(t =>
+                  {
+                      t.CatchUnobservedExceptions(true); // will run immediately.
+                      endOperation();
+                  });
 
             void endOperation()
             {

From 17abe90c27ff837d39e97ec3678dad33bad3e6c9 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Thu, 31 Dec 2020 20:23:13 +0800
Subject: [PATCH 0688/3722] move SkinnableHealthDisplay

Similar components are in osu.Game.Screens.Play.HUD while this is not
---
 .../Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs         | 2 +-
 osu.Game/Screens/Play/{ => HUD}/SkinnableHealthDisplay.cs      | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)
 rename osu.Game/Screens/Play/{ => HUD}/SkinnableHealthDisplay.cs (95%)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
index e1b0820662..5bac8582d7 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
@@ -9,7 +9,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Judgements;
-using osu.Game.Screens.Play;
+using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
diff --git a/osu.Game/Screens/Play/SkinnableHealthDisplay.cs b/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
similarity index 95%
rename from osu.Game/Screens/Play/SkinnableHealthDisplay.cs
rename to osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
index d35d15d665..1f91f5e50f 100644
--- a/osu.Game/Screens/Play/SkinnableHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
@@ -5,10 +5,9 @@ using System;
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Screens.Play.HUD;
 using osu.Game.Skinning;
 
-namespace osu.Game.Screens.Play
+namespace osu.Game.Screens.Play.HUD
 {
     public class SkinnableHealthDisplay : SkinnableDrawable, IHealthDisplay
     {

From b4df2d6d43f96659c6687badc4c739770957ebfa Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 1 Jan 2021 03:46:09 +0300
Subject: [PATCH 0689/3722] Add method for copying properties from another mod

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

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index b8dc7a2661..236bf9ff00 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -131,22 +131,31 @@ namespace osu.Game.Rulesets.Mods
         /// </summary>
         public virtual Mod CreateCopy()
         {
-            var copy = (Mod)Activator.CreateInstance(GetType());
+            var result = (Mod)Activator.CreateInstance(GetType(), true);
+            result.CopyFrom(this);
+            return result;
+        }
+
+        /// <summary>
+        /// Copies properties of given mod into here, through changing value.
+        /// </summary>
+        /// <param name="them">The mod to copy properties from.</param>
+        public void CopyFrom(Mod them)
+        {
+            if (them.GetType() != GetType())
+                throw new ArgumentException($"Expected mod of type {GetType()}, got {them.GetType()}.", nameof(them));
 
-            // Copy bindable values across
             foreach (var (_, prop) in this.GetSettingsSourceProperties())
             {
-                var origBindable = prop.GetValue(this);
-                var copyBindable = prop.GetValue(copy);
+                var ourBindable = prop.GetValue(this);
+                var theirBindable = prop.GetValue(them);
 
                 // The bindables themselves are readonly, so the value must be transferred through the Bindable<T>.Value property.
-                var valueProperty = origBindable.GetType().GetProperty(nameof(Bindable<object>.Value), BindingFlags.Public | BindingFlags.Instance);
+                var valueProperty = theirBindable.GetType().GetProperty(nameof(Bindable<object>.Value), BindingFlags.Public | BindingFlags.Instance);
                 Debug.Assert(valueProperty != null);
 
-                valueProperty.SetValue(copyBindable, valueProperty.GetValue(origBindable));
+                valueProperty.SetValue(ourBindable, valueProperty.GetValue(theirBindable));
             }
-
-            return copy;
         }
 
         public bool Equals(IMod other) => GetType() == other?.GetType();

From 2ce9599957d50f5c9b8220cf7d3105372191a6d4 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 1 Jan 2021 03:47:13 +0300
Subject: [PATCH 0690/3722] Copy selected mods properties into overlay's
 buttons

---
 osu.Game/Overlays/Mods/ModSection.cs       | 24 +++++++++++++++-------
 osu.Game/Overlays/Mods/ModSelectOverlay.cs |  2 +-
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 0107f94dcf..86da179064 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -127,18 +127,28 @@ namespace osu.Game.Overlays.Mods
         }
 
         /// <summary>
-        /// Select one or more mods in this section and deselects all other ones.
+        /// Updates all buttons with the given list of selected mods.
         /// </summary>
-        /// <param name="modTypes">The types of <see cref="Mod"/>s which should be selected.</param>
-        public void SelectTypes(IEnumerable<Type> modTypes)
+        /// <param name="newSelectedMods">The types of <see cref="Mod"/>s to select.</param>
+        public void UpdateSelectedMods(IReadOnlyList<Mod> newSelectedMods)
         {
             foreach (var button in buttons)
             {
-                int i = Array.FindIndex(button.Mods, m => modTypes.Any(t => t == m.GetType()));
+                int index = -1;
 
-                if (i >= 0)
-                    button.SelectAt(i);
-                else
+                foreach (var mod in newSelectedMods)
+                {
+                    index = Array.FindIndex(button.Mods, m1 => mod.GetType() == m1.GetType());
+                    if (index < 0)
+                        continue;
+
+                    var buttonMod = button.Mods[index];
+                    buttonMod.CopyFrom(mod);
+                    button.SelectAt(index);
+                    break;
+                }
+
+                if (index < 0)
                     button.Deselect();
             }
         }
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 34f5c70adb..c1622548f5 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -409,7 +409,7 @@ namespace osu.Game.Overlays.Mods
         private void selectedModsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
         {
             foreach (var section in ModSectionsContainer.Children)
-                section.SelectTypes(mods.NewValue.Select(m => m.GetType()).ToList());
+                section.UpdateSelectedMods(mods.NewValue);
 
             updateMods();
         }

From ee664ad57117fbdd01dd38a3025a621e69bf7eca Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 1 Jan 2021 03:47:18 +0300
Subject: [PATCH 0691/3722] Add test coverage

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

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 6f083f4ab6..0d0acbb8f4 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -131,6 +131,18 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("ensure mods not selected", () => modDisplay.Current.Value.Count == 0);
         }
 
+        [Test]
+        public void TestExternallySetCustomizedMod()
+        {
+            AddStep("set customized mod externally", () => SelectedMods.Value = new[] { new OsuModDoubleTime { SpeedChange = { Value = 1.01 } } });
+
+            AddAssert("ensure button is selected and customized accordingly", () =>
+            {
+                var button = modSelect.GetModButton(SelectedMods.Value.Single());
+                return ((OsuModDoubleTime)button.SelectedMod).SpeedChange.Value == 1.01;
+            });
+        }
+
         private void testSingleMod(Mod mod)
         {
             selectNext(mod);

From a031c8e0b62f3933e23e049dc75633f6c4603aef Mon Sep 17 00:00:00 2001
From: Salman Ahmed <slmanarendo1950@gmail.com>
Date: Fri, 1 Jan 2021 15:34:09 +0300
Subject: [PATCH 0692/3722] Apply documentation suggestions
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/Mods/ModSection.cs | 2 +-
 osu.Game/Rulesets/Mods/Mod.cs        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 86da179064..e29ed4f5c4 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -129,7 +129,7 @@ namespace osu.Game.Overlays.Mods
         /// <summary>
         /// Updates all buttons with the given list of selected mods.
         /// </summary>
-        /// <param name="newSelectedMods">The types of <see cref="Mod"/>s to select.</param>
+        /// <param name="newSelectedMods">The new list of selected mods to select.</param>
         public void UpdateSelectedMods(IReadOnlyList<Mod> newSelectedMods)
         {
             foreach (var button in buttons)
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 236bf9ff00..6e83299d63 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -137,7 +137,7 @@ namespace osu.Game.Rulesets.Mods
         }
 
         /// <summary>
-        /// Copies properties of given mod into here, through changing value.
+        /// Copies mod setting values from <paramref name="them"/> into this instance.
         /// </summary>
         /// <param name="them">The mod to copy properties from.</param>
         public void CopyFrom(Mod them)

From c1a1e3acc5aa199442ce7a96058e1eaae2bc7dd9 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 1 Jan 2021 15:40:40 +0300
Subject: [PATCH 0693/3722] Revert drive-by changes

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

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 6e83299d63..3f1f16e561 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -131,7 +131,7 @@ namespace osu.Game.Rulesets.Mods
         /// </summary>
         public virtual Mod CreateCopy()
         {
-            var result = (Mod)Activator.CreateInstance(GetType(), true);
+            var result = (Mod)Activator.CreateInstance(GetType());
             result.CopyFrom(this);
             return result;
         }
@@ -151,7 +151,7 @@ namespace osu.Game.Rulesets.Mods
                 var theirBindable = prop.GetValue(them);
 
                 // The bindables themselves are readonly, so the value must be transferred through the Bindable<T>.Value property.
-                var valueProperty = theirBindable.GetType().GetProperty(nameof(Bindable<object>.Value), BindingFlags.Public | BindingFlags.Instance);
+                var valueProperty = ourBindable.GetType().GetProperty(nameof(Bindable<object>.Value), BindingFlags.Public | BindingFlags.Instance);
                 Debug.Assert(valueProperty != null);
 
                 valueProperty.SetValue(ourBindable, valueProperty.GetValue(theirBindable));

From 988f9b98a153d95b5f6de42dc3782d08912c125f Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 1 Jan 2021 16:16:00 +0300
Subject: [PATCH 0694/3722] Split button mods updating to private method

---
 osu.Game/Overlays/Mods/ModSection.cs | 30 ++++++++++++++--------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index e29ed4f5c4..573d1e5355 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -133,24 +133,24 @@ namespace osu.Game.Overlays.Mods
         public void UpdateSelectedMods(IReadOnlyList<Mod> newSelectedMods)
         {
             foreach (var button in buttons)
+                updateButtonMods(button, newSelectedMods);
+        }
+
+        private void updateButtonMods(ModButton button, IReadOnlyList<Mod> newSelectedMods)
+        {
+            foreach (var mod in newSelectedMods)
             {
-                int index = -1;
-
-                foreach (var mod in newSelectedMods)
-                {
-                    index = Array.FindIndex(button.Mods, m1 => mod.GetType() == m1.GetType());
-                    if (index < 0)
-                        continue;
-
-                    var buttonMod = button.Mods[index];
-                    buttonMod.CopyFrom(mod);
-                    button.SelectAt(index);
-                    break;
-                }
-
+                var index = Array.FindIndex(button.Mods, m1 => mod.GetType() == m1.GetType());
                 if (index < 0)
-                    button.Deselect();
+                    continue;
+
+                var buttonMod = button.Mods[index];
+                buttonMod.CopyFrom(mod);
+                button.SelectAt(index);
+                return;
             }
+
+            button.Deselect();
         }
 
         protected ModSection()

From 7441cfd94ee93e764102eead7839bb2c862ce541 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 1 Jan 2021 17:53:29 +0000
Subject: [PATCH 0695/3722] Bump
 Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson

Bumps [Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson](https://github.com/aspnet/AspNetCore) from 3.1.9 to 3.1.10.
- [Release notes](https://github.com/aspnet/AspNetCore/releases)
- [Commits](https://github.com/aspnet/AspNetCore/compare/v3.1.9...v3.1.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 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 93aa2bc701..4c57eb6d00 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -22,7 +22,7 @@
     <PackageReference Include="DiffPlex" Version="1.6.3" />
     <PackageReference Include="Humanizer" Version="2.8.26" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.9" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.9" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.10" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />

From 0fd2e368c1c73e0d2e4932a620f2f4c6021633c7 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 1 Jan 2021 17:53:41 +0000
Subject: [PATCH 0696/3722] Bump Microsoft.NET.Test.Sdk from 16.8.0 to 16.8.3

Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.8.0 to 16.8.3.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.8.0...v16.8.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 .../osu.Game.Rulesets.Catch.Tests.csproj                        | 2 +-
 .../osu.Game.Rulesets.Mania.Tests.csproj                        | 2 +-
 osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj  | 2 +-
 .../osu.Game.Rulesets.Taiko.Tests.csproj                        | 2 +-
 osu.Game.Tests/osu.Game.Tests.csproj                            | 2 +-
 osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

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 61ecd79e3d..51d2032795 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
@@ -2,7 +2,7 @@
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
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 fa7bfd7169..3261f632f2 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
@@ -2,7 +2,7 @@
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
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 d6a03da807..32243e0bc3 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
@@ -2,7 +2,7 @@
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
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 a89645d881..210f81d111 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
@@ -2,7 +2,7 @@
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index 83d7b4135a..9049b67f90 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -3,7 +3,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="DeepEqual" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
diff --git a/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj b/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
index bc6b994988..dc4f22788d 100644
--- a/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
+++ b/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
   </ItemGroup>

From 652b0ccd8fe5c47dbde90e41f15d8d11baea76f7 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 1 Jan 2021 17:54:11 +0000
Subject: [PATCH 0697/3722] Bump Microsoft.AspNetCore.SignalR.Client from 3.1.9
 to 3.1.10

Bumps [Microsoft.AspNetCore.SignalR.Client](https://github.com/aspnet/AspNetCore) from 3.1.9 to 3.1.10.
- [Release notes](https://github.com/aspnet/AspNetCore/releases)
- [Commits](https://github.com/aspnet/AspNetCore/compare/v3.1.9...v3.1.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 93aa2bc701..3c8df17ee5 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -21,7 +21,7 @@
     <PackageReference Include="Dapper" Version="2.0.78" />
     <PackageReference Include="DiffPlex" Version="1.6.3" />
     <PackageReference Include="Humanizer" Version="2.8.26" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.9" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.10" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.9" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 5445adb3fb..f5c133263b 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -78,7 +78,7 @@
     <NoWarn>$(NoWarn);NU1605</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.10" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.3" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->

From 6cd838fd4b8e510739891e64019c192122e08f2f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 1 Jan 2021 17:55:04 +0000
Subject: [PATCH 0698/3722] Bump Microsoft.CodeAnalysis.BannedApiAnalyzers from
 3.3.1 to 3.3.2

Bumps [Microsoft.CodeAnalysis.BannedApiAnalyzers](https://github.com/dotnet/roslyn-analyzers) from 3.3.1 to 3.3.2.
- [Release notes](https://github.com/dotnet/roslyn-analyzers/releases)
- [Changelog](https://github.com/dotnet/roslyn-analyzers/blob/master/PostReleaseActivities.md)
- [Commits](https://github.com/dotnet/roslyn-analyzers/compare/v3.3.1...v3.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 551cb75077..9ec442aafa 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -16,7 +16,7 @@
     <EmbeddedResource Include="Resources\**\*.*" />
   </ItemGroup>
   <ItemGroup Label="Code Analysis">
-    <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.2" PrivateAssets="All" />
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)CodeAnalysis\BannedSymbols.txt" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.1" PrivateAssets="All" />
   </ItemGroup>

From fa73d0172e01492f6f22c8c457751c0ea37fb659 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 2 Jan 2021 00:11:21 +0100
Subject: [PATCH 0699/3722] Keep SignalR at last working version on iOS

---
 osu.iOS.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.iOS.props b/osu.iOS.props
index f5c133263b..5445adb3fb 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -78,7 +78,7 @@
     <NoWarn>$(NoWarn);NU1605</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.10" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.0.3" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.3" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->

From 72a6ca77559c409bc0a5671663510d1fbcbaffb6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 2 Jan 2021 16:47:00 +0900
Subject: [PATCH 0700/3722] Allow signalr to retry connecting when connection
 is closed without an exception

---
 osu.Game/Online/Multiplayer/MultiplayerClient.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 24ea6abc4a..7cd1ef78f7 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -88,11 +88,12 @@ namespace osu.Game.Online.Multiplayer
             {
                 isConnected.Value = false;
 
-                if (ex != null)
-                {
-                    Logger.Log($"Multiplayer client lost connection: {ex}", LoggingTarget.Network);
+                Logger.Log(ex != null
+                    ? $"Multiplayer client lost connection: {ex}"
+                    : "Multiplayer client disconnected", LoggingTarget.Network);
+
+                if (connection != null)
                     await tryUntilConnected();
-                }
             };
 
             await tryUntilConnected();

From 66bd847b4507cb575549c01496dbabf819c6164b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 2 Jan 2021 11:53:06 +0100
Subject: [PATCH 0701/3722] Bump InspectCode tool to 2020.3.2

---
 .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 dd53eefd23..58c24181d3 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
       ]
     },
     "jetbrains.resharper.globaltools": {
-      "version": "2020.2.4",
+      "version": "2020.3.2",
       "commands": [
         "jb"
       ]

From 18ac97ca563e9a02d56c469e5c084ccfa4b1e978 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 2 Jan 2021 12:21:53 +0100
Subject: [PATCH 0702/3722] Disable "merge sequential patterns" suggestions

As they were considered to be detrimental to code readability.
---
 osu.sln.DotSettings | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index 22ea73858e..aa8f8739c1 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -106,6 +106,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeCastWithTypeCheck/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeConditionalExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeSequentialChecks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeSequentialPatterns/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodHasAsyncOverload/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodHasAsyncOverloadWithCancellation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodSupportsCancellation/@EntryIndexedValue">WARNING</s:String>

From 924af58f5b1ba2b5fcdaa00a79db21ce6c19bceb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 2 Jan 2021 12:25:16 +0100
Subject: [PATCH 0703/3722] Replace using static with explicit nested reference

This seems to be an inspectcode bug, as the code is correct and
compiles, but let's just work around it for now.
---
 .../Visual/Components/TestScenePreviewTrackManager.cs      | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Components/TestScenePreviewTrackManager.cs b/osu.Game.Tests/Visual/Components/TestScenePreviewTrackManager.cs
index a3db20ce83..9a999a4931 100644
--- a/osu.Game.Tests/Visual/Components/TestScenePreviewTrackManager.cs
+++ b/osu.Game.Tests/Visual/Components/TestScenePreviewTrackManager.cs
@@ -8,7 +8,6 @@ using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
-using static osu.Game.Tests.Visual.Components.TestScenePreviewTrackManager.TestPreviewTrackManager;
 
 namespace osu.Game.Tests.Visual.Components
 {
@@ -100,7 +99,7 @@ namespace osu.Game.Tests.Visual.Components
         [Test]
         public void TestNonPresentTrack()
         {
-            TestPreviewTrack track = null;
+            TestPreviewTrackManager.TestPreviewTrack track = null;
 
             AddStep("get non-present track", () =>
             {
@@ -182,9 +181,9 @@ namespace osu.Game.Tests.Visual.Components
             AddAssert("track stopped", () => !track.IsRunning);
         }
 
-        private TestPreviewTrack getTrack() => (TestPreviewTrack)trackManager.Get(null);
+        private TestPreviewTrackManager.TestPreviewTrack getTrack() => (TestPreviewTrackManager.TestPreviewTrack)trackManager.Get(null);
 
-        private TestPreviewTrack getOwnedTrack()
+        private TestPreviewTrackManager.TestPreviewTrack getOwnedTrack()
         {
             var track = getTrack();
 

From 6c3ccaddbfec4a148ad6080e2ab6e958d54cd2e0 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 2 Jan 2021 12:51:41 +0000
Subject: [PATCH 0704/3722] Bump Microsoft.CodeAnalysis.FxCopAnalyzers from
 3.3.1 to 3.3.2

Bumps [Microsoft.CodeAnalysis.FxCopAnalyzers](https://github.com/dotnet/roslyn-analyzers) from 3.3.1 to 3.3.2.
- [Release notes](https://github.com/dotnet/roslyn-analyzers/releases)
- [Changelog](https://github.com/dotnet/roslyn-analyzers/blob/master/PostReleaseActivities.md)
- [Commits](https://github.com/dotnet/roslyn-analyzers/compare/v3.3.1...v3.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 9ec442aafa..a74b204436 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -18,7 +18,7 @@
   <ItemGroup Label="Code Analysis">
     <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.2" PrivateAssets="All" />
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)CodeAnalysis\BannedSymbols.txt" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.2" PrivateAssets="All" />
   </ItemGroup>
   <PropertyGroup Label="Code Analysis">
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodeAnalysis\osu.ruleset</CodeAnalysisRuleSet>

From e2de5bb8f940e71fcf9cfefa8fe504966c5e00bf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 2 Jan 2021 22:05:41 +0900
Subject: [PATCH 0705/3722] Fix the beatmap carousel not returning to centre
 correctly after resizing window

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

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index d76f0abb9e..c83c89bb7f 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Pooling;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Framework.Layout;
 using osu.Framework.Threading;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
@@ -567,6 +568,15 @@ namespace osu.Game.Screens.Select
 
         #endregion
 
+        protected override bool OnInvalidate(Invalidation invalidation, InvalidationSource source)
+        {
+            // handles the vertical size of the carousel changing (ie. on window resize when aspect ratio has changed).
+            if ((invalidation & Invalidation.Layout) > 0)
+                itemsCache.Invalidate();
+
+            return base.OnInvalidate(invalidation, source);
+        }
+
         protected override void Update()
         {
             base.Update();

From 26b2a065bc365fc75e04315dfe9cbc71a3b0bb57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 2 Jan 2021 14:25:15 +0100
Subject: [PATCH 0706/3722] Add deprecation warning ignore with explanation

---
 Directory.Build.props | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index a74b204436..b55eff9df9 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -28,9 +28,17 @@
     <NoWarn>$(NoWarn);CS1591</NoWarn>
   </PropertyGroup>
   <PropertyGroup Label="Project">
-    <!-- DeepEqual is not netstandard-compatible. This is fine since we run tests with .NET Framework anyway.
-    This is required due to https://github.com/NuGet/Home/issues/5740 -->
-    <NoWarn>$(NoWarn);NU1701</NoWarn>
+    <!--
+    NU1701:
+      DeepEqual is not netstandard-compatible. This is fine since we run tests with .NET Framework anyway.
+      This is required due to https://github.com/NuGet/Home/issues/5740
+
+    CA9998:
+      Microsoft.CodeAnalysis.FxCopAnalyzers has been deprecated.
+      The entire package will be able to be removed after migrating to .NET 5,
+      as analysers are shipped as part of the .NET 5 SDK anyway.
+    -->
+    <NoWarn>$(NoWarn);NU1701;CA9998</NoWarn>
   </PropertyGroup>
   <PropertyGroup Label="Nuget">
     <IsPackable>false</IsPackable>
@@ -43,4 +51,4 @@
     <Copyright>Copyright (c) 2020 ppy Pty Ltd</Copyright>
     <PackageTags>osu game</PackageTags>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

From 4266c67bb66dc58fcdbc4406afe38a7d47c392d9 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sat, 2 Jan 2021 19:19:55 +0100
Subject: [PATCH 0707/3722] Remove duplicated code path in switch.

---
 osu.Android/OsuGameActivity.cs | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index 42d9ad33ab..788e5f82be 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -62,13 +62,6 @@ namespace osu.Android
                     break;
 
                 case Intent.ActionSend:
-                {
-                    var content = intent.ClipData?.GetItemAt(0);
-                    if (content != null)
-                        handleImportFromUris(content.Uri);
-                    break;
-                }
-
                 case Intent.ActionSendMultiple:
                 {
                     var uris = new List<Uri>();

From 0e0cb94ed5804fc9ef1b2316ec3e2663a5341fe8 Mon Sep 17 00:00:00 2001
From: Susko3 <16479013+Susko3@users.noreply.github.com>
Date: Sun, 3 Jan 2021 03:20:25 +0100
Subject: [PATCH 0708/3722] testing (#2)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Catch multiplayer client-related unobserved exceptions better

Silencing an exception from a task continuation requires accessing
`task.Exception` in any way, which was not done previously if
`logOnError` was false.

To resolve without having to worry whether the compiler will optimise
away a useless access or now, just always log, but switch the logging
level. The unimportant errors will be logged as debug and therefore
essentially silenced on release builds (but could still be potentially
useful in debugging).

* move SkinnableHealthDisplay

Similar components are in osu.Game.Screens.Play.HUD while this is not

* Bump Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson

Bumps [Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson](https://github.com/aspnet/AspNetCore) from 3.1.9 to 3.1.10.
- [Release notes](https://github.com/aspnet/AspNetCore/releases)
- [Commits](https://github.com/aspnet/AspNetCore/compare/v3.1.9...v3.1.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump Microsoft.NET.Test.Sdk from 16.8.0 to 16.8.3

Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.8.0 to 16.8.3.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.8.0...v16.8.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump Microsoft.AspNetCore.SignalR.Client from 3.1.9 to 3.1.10

Bumps [Microsoft.AspNetCore.SignalR.Client](https://github.com/aspnet/AspNetCore) from 3.1.9 to 3.1.10.
- [Release notes](https://github.com/aspnet/AspNetCore/releases)
- [Commits](https://github.com/aspnet/AspNetCore/compare/v3.1.9...v3.1.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump Microsoft.CodeAnalysis.BannedApiAnalyzers from 3.3.1 to 3.3.2

Bumps [Microsoft.CodeAnalysis.BannedApiAnalyzers](https://github.com/dotnet/roslyn-analyzers) from 3.3.1 to 3.3.2.
- [Release notes](https://github.com/dotnet/roslyn-analyzers/releases)
- [Changelog](https://github.com/dotnet/roslyn-analyzers/blob/master/PostReleaseActivities.md)
- [Commits](https://github.com/dotnet/roslyn-analyzers/compare/v3.3.1...v3.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Keep SignalR at last working version on iOS

* Allow signalr to retry connecting when connection is closed without an exception

* Bump InspectCode tool to 2020.3.2

* Disable "merge sequential patterns" suggestions

As they were considered to be detrimental to code readability.

* Replace using static with explicit nested reference

This seems to be an inspectcode bug, as the code is correct and
compiles, but let's just work around it for now.

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
Co-authored-by: mcendu <nathandu@outlook.com>
Co-authored-by: Dean Herbert <pe@ppy.sh>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 .config/dotnet-tools.json                      |  2 +-
 Directory.Build.props                          |  2 +-
 .../osu.Game.Rulesets.Catch.Tests.csproj       |  2 +-
 .../osu.Game.Rulesets.Mania.Tests.csproj       |  2 +-
 .../osu.Game.Rulesets.Osu.Tests.csproj         |  2 +-
 .../osu.Game.Rulesets.Taiko.Tests.csproj       |  2 +-
 .../Components/TestScenePreviewTrackManager.cs |  7 +++----
 .../TestSceneSkinnableHealthDisplay.cs         |  2 +-
 osu.Game.Tests/osu.Game.Tests.csproj           |  2 +-
 .../osu.Game.Tournament.Tests.csproj           |  2 +-
 osu.Game/Extensions/TaskExtensions.cs          | 18 ++++++++++++++----
 .../Online/Multiplayer/MultiplayerClient.cs    |  9 +++++----
 .../Play/{ => HUD}/SkinnableHealthDisplay.cs   |  3 +--
 osu.Game/osu.Game.csproj                       |  4 ++--
 osu.sln.DotSettings                            |  1 +
 15 files changed, 35 insertions(+), 25 deletions(-)
 rename osu.Game/Screens/Play/{ => HUD}/SkinnableHealthDisplay.cs (95%)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index dd53eefd23..58c24181d3 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
       ]
     },
     "jetbrains.resharper.globaltools": {
-      "version": "2020.2.4",
+      "version": "2020.3.2",
       "commands": [
         "jb"
       ]
diff --git a/Directory.Build.props b/Directory.Build.props
index 551cb75077..9ec442aafa 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -16,7 +16,7 @@
     <EmbeddedResource Include="Resources\**\*.*" />
   </ItemGroup>
   <ItemGroup Label="Code Analysis">
-    <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.2" PrivateAssets="All" />
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)CodeAnalysis\BannedSymbols.txt" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.1" PrivateAssets="All" />
   </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 61ecd79e3d..51d2032795 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
@@ -2,7 +2,7 @@
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
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 fa7bfd7169..3261f632f2 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
@@ -2,7 +2,7 @@
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
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 d6a03da807..32243e0bc3 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
@@ -2,7 +2,7 @@
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
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 a89645d881..210f81d111 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
@@ -2,7 +2,7 @@
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
diff --git a/osu.Game.Tests/Visual/Components/TestScenePreviewTrackManager.cs b/osu.Game.Tests/Visual/Components/TestScenePreviewTrackManager.cs
index a3db20ce83..9a999a4931 100644
--- a/osu.Game.Tests/Visual/Components/TestScenePreviewTrackManager.cs
+++ b/osu.Game.Tests/Visual/Components/TestScenePreviewTrackManager.cs
@@ -8,7 +8,6 @@ using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
-using static osu.Game.Tests.Visual.Components.TestScenePreviewTrackManager.TestPreviewTrackManager;
 
 namespace osu.Game.Tests.Visual.Components
 {
@@ -100,7 +99,7 @@ namespace osu.Game.Tests.Visual.Components
         [Test]
         public void TestNonPresentTrack()
         {
-            TestPreviewTrack track = null;
+            TestPreviewTrackManager.TestPreviewTrack track = null;
 
             AddStep("get non-present track", () =>
             {
@@ -182,9 +181,9 @@ namespace osu.Game.Tests.Visual.Components
             AddAssert("track stopped", () => !track.IsRunning);
         }
 
-        private TestPreviewTrack getTrack() => (TestPreviewTrack)trackManager.Get(null);
+        private TestPreviewTrackManager.TestPreviewTrack getTrack() => (TestPreviewTrackManager.TestPreviewTrack)trackManager.Get(null);
 
-        private TestPreviewTrack getOwnedTrack()
+        private TestPreviewTrackManager.TestPreviewTrack getOwnedTrack()
         {
             var track = getTrack();
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
index e1b0820662..5bac8582d7 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
@@ -9,7 +9,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Judgements;
-using osu.Game.Screens.Play;
+using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index 83d7b4135a..9049b67f90 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -3,7 +3,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="DeepEqual" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
diff --git a/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj b/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
index bc6b994988..dc4f22788d 100644
--- a/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
+++ b/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
   </ItemGroup>
diff --git a/osu.Game/Extensions/TaskExtensions.cs b/osu.Game/Extensions/TaskExtensions.cs
index a1215d786b..4138c2757a 100644
--- a/osu.Game/Extensions/TaskExtensions.cs
+++ b/osu.Game/Extensions/TaskExtensions.cs
@@ -1,7 +1,11 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+#nullable enable
+
+using System;
 using System.Threading.Tasks;
+using osu.Framework.Extensions.ExceptionExtensions;
 using osu.Framework.Logging;
 
 namespace osu.Game.Extensions
@@ -13,13 +17,19 @@ namespace osu.Game.Extensions
         /// Avoids unobserved exceptions from being fired.
         /// </summary>
         /// <param name="task">The task.</param>
-        /// <param name="logOnError">Whether errors should be logged as important, or silently ignored.</param>
-        public static void CatchUnobservedExceptions(this Task task, bool logOnError = false)
+        /// <param name="logAsError">
+        /// Whether errors should be logged as errors visible to users, or as debug messages.
+        /// Logging as debug will essentially silence the errors on non-release builds.
+        /// </param>
+        public static void CatchUnobservedExceptions(this Task task, bool logAsError = false)
         {
             task.ContinueWith(t =>
             {
-                if (logOnError)
-                    Logger.Log($"Error running task: {t.Exception?.Message ?? "unknown"}", LoggingTarget.Runtime, LogLevel.Important);
+                Exception? exception = t.Exception?.AsSingular();
+                if (logAsError)
+                    Logger.Error(exception, $"Error running task: {exception?.Message ?? "(unknown)"}", LoggingTarget.Runtime, true);
+                else
+                    Logger.Log($"Error running task: {exception}", LoggingTarget.Runtime, LogLevel.Debug);
             }, TaskContinuationOptions.NotOnRanToCompletion);
         }
     }
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 24ea6abc4a..7cd1ef78f7 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -88,11 +88,12 @@ namespace osu.Game.Online.Multiplayer
             {
                 isConnected.Value = false;
 
-                if (ex != null)
-                {
-                    Logger.Log($"Multiplayer client lost connection: {ex}", LoggingTarget.Network);
+                Logger.Log(ex != null
+                    ? $"Multiplayer client lost connection: {ex}"
+                    : "Multiplayer client disconnected", LoggingTarget.Network);
+
+                if (connection != null)
                     await tryUntilConnected();
-                }
             };
 
             await tryUntilConnected();
diff --git a/osu.Game/Screens/Play/SkinnableHealthDisplay.cs b/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
similarity index 95%
rename from osu.Game/Screens/Play/SkinnableHealthDisplay.cs
rename to osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
index d35d15d665..1f91f5e50f 100644
--- a/osu.Game/Screens/Play/SkinnableHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
@@ -5,10 +5,9 @@ using System;
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Screens.Play.HUD;
 using osu.Game.Skinning;
 
-namespace osu.Game.Screens.Play
+namespace osu.Game.Screens.Play.HUD
 {
     public class SkinnableHealthDisplay : SkinnableDrawable, IHealthDisplay
     {
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 93aa2bc701..6c220a5c21 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -21,8 +21,8 @@
     <PackageReference Include="Dapper" Version="2.0.78" />
     <PackageReference Include="DiffPlex" Version="1.6.3" />
     <PackageReference Include="Humanizer" Version="2.8.26" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.9" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.9" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.10" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.10" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index 22ea73858e..aa8f8739c1 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -106,6 +106,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeCastWithTypeCheck/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeConditionalExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeSequentialChecks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeSequentialPatterns/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodHasAsyncOverload/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodHasAsyncOverloadWithCancellation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodSupportsCancellation/@EntryIndexedValue">WARNING</s:String>

From 8bb84570df904c9c55cc781e18cc13bfb13e834e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 3 Jan 2021 04:21:50 +0300
Subject: [PATCH 0709/3722] Introduce beatmap availability structure

---
 osu.Game/Online/Rooms/BeatmapAvailability.cs | 56 ++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 osu.Game/Online/Rooms/BeatmapAvailability.cs

diff --git a/osu.Game/Online/Rooms/BeatmapAvailability.cs b/osu.Game/Online/Rooms/BeatmapAvailability.cs
new file mode 100644
index 0000000000..ca53cb2295
--- /dev/null
+++ b/osu.Game/Online/Rooms/BeatmapAvailability.cs
@@ -0,0 +1,56 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+
+namespace osu.Game.Online.Rooms
+{
+    /// <summary>
+    /// The local availability information about a certain beatmap for the client.
+    /// </summary>
+    public readonly struct BeatmapAvailability : IEquatable<BeatmapAvailability>
+    {
+        /// <summary>
+        /// The beatmap's availability state.
+        /// </summary>
+        public readonly DownloadState State;
+
+        /// <summary>
+        /// The beatmap's downloading progress, null when not in <see cref="DownloadState.Downloading"/> state.
+        /// </summary>
+        public readonly double? DownloadProgress;
+
+        /// <summary>
+        /// Constructs a new non-<see cref="DownloadState.Downloading"/> beatmap availability state.
+        /// </summary>
+        /// <param name="state">The beatmap availability state.</param>
+        /// <exception cref="ArgumentException">Throws if <see cref="DownloadState.Downloading"/> was specified in this constructor, as it has its own constructor (see <see cref="BeatmapAvailability(DownloadState, double)"/>.</exception>
+        public BeatmapAvailability(DownloadState state)
+        {
+            if (state == DownloadState.Downloading)
+                throw new ArgumentException($"{nameof(DownloadState.Downloading)} state has its own constructor, use it instead.");
+
+            State = state;
+            DownloadProgress = null;
+        }
+
+        /// <summary>
+        /// Constructs a new <see cref="DownloadState.Downloading"/>-specific beatmap availability state.
+        /// </summary>
+        /// <param name="state">The beatmap availability state (always <see cref="DownloadState.Downloading"/>).</param>
+        /// <param name="downloadProgress">The beatmap's downloading current progress.</param>
+        /// <exception cref="ArgumentException">Throws if non-<see cref="DownloadState.Downloading"/> was specified in this constructor, as they have their own constructor (see <see cref="BeatmapAvailability(DownloadState)"/>.</exception>
+        public BeatmapAvailability(DownloadState state, double downloadProgress)
+        {
+            if (state != DownloadState.Downloading)
+                throw new ArgumentException($"This is a constructor specific for {DownloadState.Downloading} state, use the regular one instead.");
+
+            State = DownloadState.Downloading;
+            DownloadProgress = downloadProgress;
+        }
+
+        public bool Equals(BeatmapAvailability other) => State == other.State && DownloadProgress == other.DownloadProgress;
+
+        public override string ToString() => $"{string.Join(", ", State, $"{DownloadProgress:0.00%}")}";
+    }
+}

From 09e5e2629ab2ffa0ad052683bcb91000e18a87fe Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 3 Jan 2021 04:25:06 +0300
Subject: [PATCH 0710/3722] Add user beatmap availability property

---
 osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
index 99624dc3e7..92c92f438d 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
@@ -5,6 +5,7 @@
 
 using System;
 using Newtonsoft.Json;
+using osu.Game.Online.Rooms;
 using osu.Game.Users;
 
 namespace osu.Game.Online.Multiplayer
@@ -16,6 +17,11 @@ namespace osu.Game.Online.Multiplayer
 
         public MultiplayerUserState State { get; set; } = MultiplayerUserState.Idle;
 
+        /// <summary>
+        /// The availability state of the beatmap, set to <see cref="DownloadState.LocallyAvailable"/> by default.
+        /// </summary>
+        public BeatmapAvailability BeatmapAvailability { get; set; } = new BeatmapAvailability(DownloadState.LocallyAvailable);
+
         public User? User { get; set; }
 
         [JsonConstructor]

From dfa8be9173839c3f5dd7aaabb14f0a60692580f1 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 3 Jan 2021 04:32:50 +0300
Subject: [PATCH 0711/3722] Add beatmap availability change state & event
 methods

---
 .../Online/Multiplayer/IMultiplayerClient.cs  |  8 ++++++++
 .../Multiplayer/IMultiplayerRoomServer.cs     |  8 ++++++++
 .../Online/Multiplayer/MultiplayerClient.cs   |  9 +++++++++
 .../Multiplayer/StatefulMultiplayerClient.cs  | 20 +++++++++++++++++++
 .../Multiplayer/TestMultiplayerClient.cs      | 15 ++++++++++++++
 5 files changed, 60 insertions(+)

diff --git a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
index b97fcc9ae7..5410fbc030 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Threading.Tasks;
+using osu.Game.Online.Rooms;
 
 namespace osu.Game.Online.Multiplayer
 {
@@ -47,6 +48,13 @@ namespace osu.Game.Online.Multiplayer
         /// <param name="state">The new state of the user.</param>
         Task UserStateChanged(int userId, MultiplayerUserState state);
 
+        /// <summary>
+        /// Signals that a user in this room has their beatmap availability state changed.
+        /// </summary>
+        /// <param name="userId">The ID of the user whose beatmap availability state has changed.</param>
+        /// <param name="beatmapAvailability">The new beatmap availability state of the user.</param>
+        Task UserBeatmapAvailabilityChanged(int userId, BeatmapAvailability beatmapAvailability);
+
         /// <summary>
         /// Signals that a match is to be started. This will *only* be sent to clients which are to begin loading at this point.
         /// </summary>
diff --git a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
index 481e3fb1de..7fda526faf 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Threading.Tasks;
+using osu.Game.Online.Rooms;
 
 namespace osu.Game.Online.Multiplayer
 {
@@ -40,6 +41,13 @@ namespace osu.Game.Online.Multiplayer
         /// <exception cref="NotJoinedRoomException">If the user is not in a room.</exception>
         Task ChangeState(MultiplayerUserState newState);
 
+        /// <summary>
+        /// Change the user's local availability state of the beatmap set in joined room.
+        /// This will also force user state back to <see cref="MultiplayerUserState.Idle"/>.
+        /// </summary>
+        /// <param name="newBeatmapAvailability">The proposed new beatmap availability state.</param>
+        Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability);
+
         /// <summary>
         /// As the host of a room, start the match.
         /// </summary>
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 7cd1ef78f7..50dc8f661c 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -14,6 +14,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Logging;
 using osu.Game.Online.API;
+using osu.Game.Online.Rooms;
 
 namespace osu.Game.Online.Multiplayer
 {
@@ -173,6 +174,14 @@ namespace osu.Game.Online.Multiplayer
             return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeState), newState);
         }
 
+        public override Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability)
+        {
+            if (!isConnected.Value)
+                return Task.CompletedTask;
+
+            return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeBeatmapAvailability), newBeatmapAvailability);
+        }
+
         public override Task StartMatch()
         {
             if (!isConnected.Value)
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index dc80488d39..c1818de87a 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -184,6 +184,8 @@ namespace osu.Game.Online.Multiplayer
 
         public abstract Task ChangeState(MultiplayerUserState newState);
 
+        public abstract Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability);
+
         public abstract Task StartMatch();
 
         Task IMultiplayerClient.RoomStateChanged(MultiplayerRoomState state)
@@ -311,6 +313,24 @@ namespace osu.Game.Online.Multiplayer
             return Task.CompletedTask;
         }
 
+        Task IMultiplayerClient.UserBeatmapAvailabilityChanged(int userId, BeatmapAvailability beatmapAvailability)
+        {
+            if (Room == null)
+                return Task.CompletedTask;
+
+            Scheduler.Add(() =>
+            {
+                if (Room == null)
+                    return;
+
+                Room.Users.Single(u => u.UserID == userId).BeatmapAvailability = beatmapAvailability;
+
+                RoomUpdated?.Invoke();
+            }, false);
+
+            return Task.CompletedTask;
+        }
+
         Task IMultiplayerClient.LoadRequested()
         {
             if (Room == null)
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index 2ce5211757..c155447f8c 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -10,6 +10,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
@@ -77,6 +78,14 @@ namespace osu.Game.Tests.Visual.Multiplayer
             });
         }
 
+        public void ChangeUserBeatmapAvailability(int userId, BeatmapAvailability newBeatmapAvailability)
+        {
+            Debug.Assert(Room != null);
+
+            ((IMultiplayerClient)this).UserBeatmapAvailabilityChanged(userId, newBeatmapAvailability);
+            ChangeUserState(userId, MultiplayerUserState.Idle);
+        }
+
         protected override Task<MultiplayerRoom> JoinRoom(long roomId)
         {
             var user = new MultiplayerRoomUser(api.LocalUser.Value.Id) { User = api.LocalUser.Value };
@@ -108,6 +117,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
             return Task.CompletedTask;
         }
 
+        public override Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability)
+        {
+            ChangeUserBeatmapAvailability(api.LocalUser.Value.Id, newBeatmapAvailability);
+            return Task.CompletedTask;
+        }
+
         public override Task StartMatch()
         {
             Debug.Assert(Room != null);

From caa5109e3a0e1e526c789024d2ecbc9d57767e76 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 3 Jan 2021 12:18:35 +0900
Subject: [PATCH 0712/3722] Add precautionary null checks to update methods in
 SongSelect

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

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index a5252fdc96..8ad1ace36a 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -428,7 +428,7 @@ namespace osu.Game.Screens.Select
 
         private void updateSelectedBeatmap(BeatmapInfo beatmap)
         {
-            if (beatmap?.Equals(beatmapNoDebounce) == true)
+            if (beatmap == null || beatmap.Equals(beatmapNoDebounce))
                 return;
 
             beatmapNoDebounce = beatmap;
@@ -438,7 +438,7 @@ namespace osu.Game.Screens.Select
 
         private void updateSelectedRuleset(RulesetInfo ruleset)
         {
-            if (ruleset?.Equals(rulesetNoDebounce) == true)
+            if (ruleset == null || ruleset.Equals(rulesetNoDebounce))
                 return;
 
             rulesetNoDebounce = ruleset;

From 2e5c67be3f415bc0841c4ae2cd122237ff49c380 Mon Sep 17 00:00:00 2001
From: LavaDesu <me@lava.moe>
Date: Wed, 30 Dec 2020 12:29:51 +0700
Subject: [PATCH 0713/3722] Add ability to toggle discord rich presence

There are 3 modes: enabled, limited, and disabled.

The limited mode hides identifiable information such as username, rank, and
(if participating in one) multiplayer lobby name.
---
 osu.Desktop/DiscordRichPresence.cs            | 15 ++++++++---
 .../Configuration/DiscordRichPresenceMode.cs  | 17 ++++++++++++
 osu.Game/Configuration/OsuConfigManager.cs    |  5 +++-
 .../Sections/Online/IntegrationSettings.cs    | 27 +++++++++++++++++++
 .../Settings/Sections/OnlineSection.cs        |  3 ++-
 5 files changed, 61 insertions(+), 6 deletions(-)
 create mode 100644 osu.Game/Configuration/DiscordRichPresenceMode.cs
 create mode 100644 osu.Game/Overlays/Settings/Sections/Online/IntegrationSettings.cs

diff --git a/osu.Desktop/DiscordRichPresence.cs b/osu.Desktop/DiscordRichPresence.cs
index f1878d967d..6b331d4952 100644
--- a/osu.Desktop/DiscordRichPresence.cs
+++ b/osu.Desktop/DiscordRichPresence.cs
@@ -9,6 +9,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Logging;
+using osu.Game.Configuration;
 using osu.Game.Online.API;
 using osu.Game.Rulesets;
 using osu.Game.Users;
@@ -30,6 +31,7 @@ namespace osu.Desktop
 
         private readonly IBindable<UserStatus> status = new Bindable<UserStatus>();
         private readonly IBindable<UserActivity> activity = new Bindable<UserActivity>();
+        private readonly Bindable<DiscordRichPresenceMode> mode = new Bindable<DiscordRichPresenceMode>();
 
         private readonly RichPresence presence = new RichPresence
         {
@@ -37,7 +39,7 @@ namespace osu.Desktop
         };
 
         [BackgroundDependencyLoader]
-        private void load(IAPIProvider provider)
+        private void load(IAPIProvider provider, OsuConfigManager config)
         {
             client = new DiscordRpcClient(client_id)
             {
@@ -51,6 +53,7 @@ namespace osu.Desktop
 
             client.OnError += (_, e) => Logger.Log($"An error occurred with Discord RPC Client: {e.Code} {e.Message}", LoggingTarget.Network);
 
+            config.BindWith(OsuSetting.DiscordRichPresence, mode);
             (user = provider.LocalUser.GetBoundCopy()).BindValueChanged(u =>
             {
                 status.UnbindBindings();
@@ -63,6 +66,7 @@ namespace osu.Desktop
             ruleset.BindValueChanged(_ => updateStatus());
             status.BindValueChanged(_ => updateStatus());
             activity.BindValueChanged(_ => updateStatus());
+            mode.BindValueChanged(_ => updateStatus());
 
             client.Initialize();
         }
@@ -78,7 +82,7 @@ namespace osu.Desktop
             if (!client.IsInitialized)
                 return;
 
-            if (status.Value is UserStatusOffline)
+            if (status.Value is UserStatusOffline || mode.Value == DiscordRichPresenceMode.Disabled)
             {
                 client.ClearPresence();
                 return;
@@ -96,7 +100,10 @@ namespace osu.Desktop
             }
 
             // update user information
-            presence.Assets.LargeImageText = $"{user.Value.Username}" + (user.Value.Statistics?.Ranks.Global > 0 ? $" (rank #{user.Value.Statistics.Ranks.Global:N0})" : string.Empty);
+            if (mode.Value == DiscordRichPresenceMode.Limited)
+                presence.Assets.LargeImageText = string.Empty;
+            else
+                presence.Assets.LargeImageText = $"{user.Value.Username}" + (user.Value.Statistics?.Ranks.Global > 0 ? $" (rank #{user.Value.Statistics.Ranks.Global:N0})" : string.Empty);
 
             // update ruleset
             presence.Assets.SmallImageKey = ruleset.Value.ID <= 3 ? $"mode_{ruleset.Value.ID}" : "mode_custom";
@@ -137,7 +144,7 @@ namespace osu.Desktop
                     return edit.Beatmap.ToString();
 
                 case UserActivity.InLobby lobby:
-                    return lobby.Room.Name.Value;
+                    return mode.Value == DiscordRichPresenceMode.Limited ? string.Empty : lobby.Room.Name.Value;
             }
 
             return string.Empty;
diff --git a/osu.Game/Configuration/DiscordRichPresenceMode.cs b/osu.Game/Configuration/DiscordRichPresenceMode.cs
new file mode 100644
index 0000000000..bd39faff4d
--- /dev/null
+++ b/osu.Game/Configuration/DiscordRichPresenceMode.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.ComponentModel;
+
+namespace osu.Game.Configuration
+{
+    public enum DiscordRichPresenceMode
+    {
+        Disabled,
+
+        [Description("Hide identifiable information")]
+        Limited,
+
+        Enabled
+    }
+}
diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index a07e446d2e..c733fe2fb4 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.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;
@@ -138,6 +138,8 @@ namespace osu.Game.Configuration
             Set(OsuSetting.MenuBackgroundSource, BackgroundSource.Skin);
             Set(OsuSetting.SeasonalBackgroundMode, SeasonalBackgroundMode.Sometimes);
 
+            Set(OsuSetting.DiscordRichPresence, DiscordRichPresenceMode.Enabled);
+
             Set(OsuSetting.EditorWaveformOpacity, 1f);
         }
 
@@ -266,6 +268,7 @@ namespace osu.Game.Configuration
         GameplayDisableWinKey,
         SeasonalBackgroundMode,
         EditorWaveformOpacity,
+        DiscordRichPresence,
         AutomaticallyDownloadWhenSpectating,
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Online/IntegrationSettings.cs b/osu.Game/Overlays/Settings/Sections/Online/IntegrationSettings.cs
new file mode 100644
index 0000000000..d2867962c0
--- /dev/null
+++ b/osu.Game/Overlays/Settings/Sections/Online/IntegrationSettings.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.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Configuration;
+
+namespace osu.Game.Overlays.Settings.Sections.Online
+{
+    public class IntegrationSettings : SettingsSubsection
+    {
+        protected override string Header => "Integrations";
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            Children = new Drawable[]
+            {
+                new SettingsEnumDropdown<DiscordRichPresenceMode>
+                {
+                    LabelText = "Discord Rich Presence",
+                    Current = config.GetBindable<DiscordRichPresenceMode>(OsuSetting.DiscordRichPresence)
+                }
+            };
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Settings/Sections/OnlineSection.cs b/osu.Game/Overlays/Settings/Sections/OnlineSection.cs
index 150cddb388..7aa4eff29a 100644
--- a/osu.Game/Overlays/Settings/Sections/OnlineSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/OnlineSection.cs
@@ -20,7 +20,8 @@ namespace osu.Game.Overlays.Settings.Sections
         {
             Children = new Drawable[]
             {
-                new WebSettings()
+                new WebSettings(),
+                new IntegrationSettings()
             };
         }
     }

From a6d49929978a2617ef2f180d3e3e868513e8737e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 3 Jan 2021 12:53:25 +0900
Subject: [PATCH 0714/3722] Ensure SelectionChanged events are only sent once
 when selection is null

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 31 ++++++++++++++++------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index c83c89bb7f..37213c6003 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -125,6 +125,8 @@ namespace osu.Game.Screens.Select
             {
                 BeatmapSetsChanged?.Invoke();
                 BeatmapSetsLoaded = true;
+
+                itemsCache.Invalidate();
             });
         }
 
@@ -731,6 +733,12 @@ namespace osu.Game.Screens.Select
 
         private const float panel_padding = 5;
 
+        /// <summary>
+        /// After loading, we want to invoke a selection changed event at least once.
+        /// This handles the case where this event is potentially sending a null selection.
+        /// </summary>
+        private bool sentInitialSelectionEvent;
+
         /// <summary>
         /// Computes the target Y positions for every item in the carousel.
         /// </summary>
@@ -787,13 +795,21 @@ namespace osu.Game.Screens.Select
 
             Scroll.ScrollContent.Height = currentY;
 
-            if (BeatmapSetsLoaded && (selectedBeatmapSet == null || selectedBeatmap == null || selectedBeatmapSet.State.Value != CarouselItemState.Selected))
-            {
-                selectedBeatmapSet = null;
-                SelectionChanged?.Invoke(null);
-            }
-
             itemsCache.Validate();
+
+            // update and let external consumers know about selection loss.
+            if (BeatmapSetsLoaded)
+            {
+                bool selectionLost = selectedBeatmapSet != null && selectedBeatmapSet.State.Value != CarouselItemState.Selected;
+
+                if (selectionLost || !sentInitialSelectionEvent)
+                {
+                    selectedBeatmapSet = null;
+                    SelectionChanged?.Invoke(null);
+
+                    sentInitialSelectionEvent = true;
+                }
+            }
         }
 
         private bool firstScroll = true;
@@ -816,14 +832,13 @@ namespace osu.Game.Screens.Select
                         break;
 
                     case PendingScrollOperation.Immediate:
+
                         // in order to simplify animation logic, rather than using the animated version of ScrollTo,
                         // we take the difference in scroll height and apply to all visible panels.
                         // this avoids edge cases like when the visible panels is reduced suddenly, causing ScrollContainer
                         // to enter clamp-special-case mode where it animates completely differently to normal.
                         float scrollChange = scrollTarget.Value - Scroll.Current;
-
                         Scroll.ScrollTo(scrollTarget.Value, false);
-
                         foreach (var i in Scroll.Children)
                             i.Y += scrollChange;
                         break;

From 1a443381247492b9233ae9c01ebf1a44510359ef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 3 Jan 2021 15:38:28 +0900
Subject: [PATCH 0715/3722] Use SingleOrDefault for added safety when looking
 up mod acronyms

---
 osu.Game/Online/API/APIMod.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/APIMod.cs b/osu.Game/Online/API/APIMod.cs
index 780e5daa16..6c988e2e00 100644
--- a/osu.Game/Online/API/APIMod.cs
+++ b/osu.Game/Online/API/APIMod.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Online.API
 
         public Mod ToMod(Ruleset ruleset)
         {
-            Mod resultMod = ruleset.GetAllMods().FirstOrDefault(m => m.Acronym == Acronym);
+            Mod resultMod = ruleset.GetAllMods().SingleOrDefault(m => m.Acronym == Acronym);
 
             if (resultMod == null)
                 throw new InvalidOperationException($"There is no mod in the ruleset ({ruleset.ShortName}) matching the acronym {Acronym}.");

From 23e216fa0b374e23751c97124dc069877004a60d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 3 Jan 2021 15:47:15 +0900
Subject: [PATCH 0716/3722] Simplify some default value checks (we are sure the
 return is an IBindable)

---
 osu.Game/Online/API/APIMod.cs | 7 ++++++-
 osu.Game/Rulesets/Mods/Mod.cs | 8 +++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Online/API/APIMod.cs b/osu.Game/Online/API/APIMod.cs
index 6c988e2e00..a7e5f0d6f9 100644
--- a/osu.Game/Online/API/APIMod.cs
+++ b/osu.Game/Online/API/APIMod.cs
@@ -31,7 +31,12 @@ namespace osu.Game.Online.API
             Acronym = mod.Acronym;
 
             foreach (var (_, property) in mod.GetSettingsSourceProperties())
-                Settings.Add(property.Name.Underscore(), property.GetValue(mod));
+            {
+                var bindable = (IBindable)property.GetValue(mod);
+
+                if (!bindable.IsDefault)
+                    Settings.Add(property.Name.Underscore(), property.GetValue(mod));
+            }
         }
 
         public Mod ToMod(Ruleset ruleset)
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index b8dc7a2661..92b548a9cc 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -84,12 +84,10 @@ namespace osu.Game.Rulesets.Mods
 
                 foreach ((SettingSourceAttribute attr, PropertyInfo property) in this.GetOrderedSettingsSourceProperties())
                 {
-                    object bindableObj = property.GetValue(this);
+                    var bindable = (IBindable)property.GetValue(this);
 
-                    if ((bindableObj as IHasDefaultValue)?.IsDefault == true)
-                        continue;
-
-                    tooltipTexts.Add($"{attr.Label} {bindableObj}");
+                    if (!bindable.IsDefault)
+                        tooltipTexts.Add($"{attr.Label} {bindable}");
                 }
 
                 return string.Join(", ", tooltipTexts.Where(s => !string.IsNullOrEmpty(s)));

From 29dbb1cc0d94d26b3fb077e924bd2eb6d6b16dfd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 3 Jan 2021 15:48:28 +0900
Subject: [PATCH 0717/3722] Add internal pathway for ensuring correct
 application of bindable mods

---
 osu.Game/Online/API/APIMod.cs                 |  2 +-
 osu.Game/Rulesets/Mods/Mod.cs                 | 21 ++++++++++++-------
 osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs |  6 ++++++
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Online/API/APIMod.cs b/osu.Game/Online/API/APIMod.cs
index a7e5f0d6f9..6e3bdac61a 100644
--- a/osu.Game/Online/API/APIMod.cs
+++ b/osu.Game/Online/API/APIMod.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Online.API
                 if (!Settings.TryGetValue(property.Name.Underscore(), out object settingValue))
                     continue;
 
-                ((IBindable)property.GetValue(resultMod)).Parse(settingValue);
+                resultMod.CopyAdjustedSetting((IBindable)property.GetValue(resultMod), settingValue);
             }
 
             return resultMod;
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 92b548a9cc..487cdedd13 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 using Newtonsoft.Json;
@@ -134,19 +133,25 @@ namespace osu.Game.Rulesets.Mods
             // Copy bindable values across
             foreach (var (_, prop) in this.GetSettingsSourceProperties())
             {
-                var origBindable = prop.GetValue(this);
-                var copyBindable = prop.GetValue(copy);
+                var origBindable = (IBindable)prop.GetValue(this);
+                var copyBindable = (IBindable)prop.GetValue(copy);
 
-                // The bindables themselves are readonly, so the value must be transferred through the Bindable<T>.Value property.
-                var valueProperty = origBindable.GetType().GetProperty(nameof(Bindable<object>.Value), BindingFlags.Public | BindingFlags.Instance);
-                Debug.Assert(valueProperty != null);
-
-                valueProperty.SetValue(copyBindable, valueProperty.GetValue(origBindable));
+                // we only care about changes that have been made away from defaults.
+                if (!origBindable.IsDefault)
+                    copy.CopyAdjustedSetting(copyBindable, origBindable);
             }
 
             return copy;
         }
 
+        /// <summary>
+        /// When creating copies or clones of a Mod, this method will be called to copy explicitly adjusted user settings.
+        /// The base implementation will transfer the value via <see cref="Bindable{T}.Parse"/> and should be called unless replaced with custom logic.
+        /// </summary>
+        /// <param name="bindable">The target bindable to apply the adjustment.</param>
+        /// <param name="value">The adjustment to apply.</param>
+        internal virtual void CopyAdjustedSetting(IBindable bindable, object value) => bindable.Parse(value);
+
         public bool Equals(IMod other) => GetType() == other?.GetType();
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
index 165644edbe..58af96a8df 100644
--- a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
@@ -114,6 +114,12 @@ namespace osu.Game.Rulesets.Mods
             bindable.ValueChanged += _ => userChangedSettings[bindable] = !bindable.IsDefault;
         }
 
+        internal override void CopyAdjustedSetting(IBindable bindable, object value)
+        {
+            userChangedSettings[bindable] = true;
+            base.CopyAdjustedSetting(bindable, value);
+        }
+
         /// <summary>
         /// Apply all custom settings to the provided beatmap.
         /// </summary>

From 99fa0e25dcb542e98e6bdf3c71de45a891634806 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 3 Jan 2021 16:46:24 +0900
Subject: [PATCH 0718/3722] Switch back to FirstOrDefault to allow for weird
 testing logic to pass

---
 osu.Game/Online/API/APIMod.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/APIMod.cs b/osu.Game/Online/API/APIMod.cs
index 6e3bdac61a..3ceafc5160 100644
--- a/osu.Game/Online/API/APIMod.cs
+++ b/osu.Game/Online/API/APIMod.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Online.API
 
         public Mod ToMod(Ruleset ruleset)
         {
-            Mod resultMod = ruleset.GetAllMods().SingleOrDefault(m => m.Acronym == Acronym);
+            Mod resultMod = ruleset.GetAllMods().FirstOrDefault(m => m.Acronym == Acronym);
 
             if (resultMod == null)
                 throw new InvalidOperationException($"There is no mod in the ruleset ({ruleset.ShortName}) matching the acronym {Acronym}.");

From 6ad1b7767e6ded5cd992838a7395c7205378b90c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 3 Jan 2021 17:04:16 +0900
Subject: [PATCH 0719/3722] Update osu.Game/Online/API/APIMod.cs

Co-authored-by: Salman Ahmed <slmanarendo1950@gmail.com>
---
 osu.Game/Online/API/APIMod.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/APIMod.cs b/osu.Game/Online/API/APIMod.cs
index 3ceafc5160..c8b76b9685 100644
--- a/osu.Game/Online/API/APIMod.cs
+++ b/osu.Game/Online/API/APIMod.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Online.API
                 var bindable = (IBindable)property.GetValue(mod);
 
                 if (!bindable.IsDefault)
-                    Settings.Add(property.Name.Underscore(), property.GetValue(mod));
+                    Settings.Add(property.Name.Underscore(), bindable);
             }
         }
 

From 7c9f345cd27ff36ea5e638a53fb1c12f74712361 Mon Sep 17 00:00:00 2001
From: LavaDesu <me@lava.moe>
Date: Sun, 3 Jan 2021 16:46:25 +0700
Subject: [PATCH 0720/3722] Use better naming for DiscordRichPresenceMode

---
 osu.Desktop/DiscordRichPresence.cs                | 2 +-
 osu.Game/Configuration/DiscordRichPresenceMode.cs | 4 ++--
 osu.Game/Configuration/OsuConfigManager.cs        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Desktop/DiscordRichPresence.cs b/osu.Desktop/DiscordRichPresence.cs
index 6b331d4952..172db324cb 100644
--- a/osu.Desktop/DiscordRichPresence.cs
+++ b/osu.Desktop/DiscordRichPresence.cs
@@ -82,7 +82,7 @@ namespace osu.Desktop
             if (!client.IsInitialized)
                 return;
 
-            if (status.Value is UserStatusOffline || mode.Value == DiscordRichPresenceMode.Disabled)
+            if (status.Value is UserStatusOffline || mode.Value == DiscordRichPresenceMode.Off)
             {
                 client.ClearPresence();
                 return;
diff --git a/osu.Game/Configuration/DiscordRichPresenceMode.cs b/osu.Game/Configuration/DiscordRichPresenceMode.cs
index bd39faff4d..2e58e3554b 100644
--- a/osu.Game/Configuration/DiscordRichPresenceMode.cs
+++ b/osu.Game/Configuration/DiscordRichPresenceMode.cs
@@ -7,11 +7,11 @@ namespace osu.Game.Configuration
 {
     public enum DiscordRichPresenceMode
     {
-        Disabled,
+        Off,
 
         [Description("Hide identifiable information")]
         Limited,
 
-        Enabled
+        Full
     }
 }
diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index c733fe2fb4..eb34a0885d 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -138,7 +138,7 @@ namespace osu.Game.Configuration
             Set(OsuSetting.MenuBackgroundSource, BackgroundSource.Skin);
             Set(OsuSetting.SeasonalBackgroundMode, SeasonalBackgroundMode.Sometimes);
 
-            Set(OsuSetting.DiscordRichPresence, DiscordRichPresenceMode.Enabled);
+            Set(OsuSetting.DiscordRichPresence, DiscordRichPresenceMode.Full);
 
             Set(OsuSetting.EditorWaveformOpacity, 1f);
         }

From 2501707d7d86c9927fda5f3ece0d75c14e769bb0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 3 Jan 2021 20:44:57 +0900
Subject: [PATCH 0721/3722] Copy values using Bind to also copy defaults

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

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 487cdedd13..d2747d98c7 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -150,7 +150,17 @@ namespace osu.Game.Rulesets.Mods
         /// </summary>
         /// <param name="bindable">The target bindable to apply the adjustment.</param>
         /// <param name="value">The adjustment to apply.</param>
-        internal virtual void CopyAdjustedSetting(IBindable bindable, object value) => bindable.Parse(value);
+        internal virtual void CopyAdjustedSetting(IBindable bindable, object value)
+        {
+            if (value is IBindable incoming)
+            {
+                //copy including transfer of default values.
+                bindable.BindTo(incoming);
+                bindable.UnbindFrom(incoming);
+            }
+            else
+                bindable.Parse(value);
+        }
 
         public bool Equals(IMod other) => GetType() == other?.GetType();
     }

From a3e29b9154c996efbe051da95e9c8bbaac8c2096 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 3 Jan 2021 13:25:44 +0100
Subject: [PATCH 0722/3722] Rename parameters for readability

---
 osu.Game/Rulesets/Mods/Mod.cs                 | 14 +++++++-------
 osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index d2747d98c7..b7432ec966 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -148,18 +148,18 @@ namespace osu.Game.Rulesets.Mods
         /// When creating copies or clones of a Mod, this method will be called to copy explicitly adjusted user settings.
         /// The base implementation will transfer the value via <see cref="Bindable{T}.Parse"/> and should be called unless replaced with custom logic.
         /// </summary>
-        /// <param name="bindable">The target bindable to apply the adjustment.</param>
-        /// <param name="value">The adjustment to apply.</param>
-        internal virtual void CopyAdjustedSetting(IBindable bindable, object value)
+        /// <param name="target">The target bindable to apply the adjustment.</param>
+        /// <param name="source">The adjustment to apply.</param>
+        internal virtual void CopyAdjustedSetting(IBindable target, object source)
         {
-            if (value is IBindable incoming)
+            if (source is IBindable sourceBindable)
             {
                 //copy including transfer of default values.
-                bindable.BindTo(incoming);
-                bindable.UnbindFrom(incoming);
+                target.BindTo(sourceBindable);
+                target.UnbindFrom(sourceBindable);
             }
             else
-                bindable.Parse(value);
+                target.Parse(source);
         }
 
         public bool Equals(IMod other) => GetType() == other?.GetType();
diff --git a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
index 58af96a8df..72a4bb297f 100644
--- a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
@@ -114,10 +114,10 @@ namespace osu.Game.Rulesets.Mods
             bindable.ValueChanged += _ => userChangedSettings[bindable] = !bindable.IsDefault;
         }
 
-        internal override void CopyAdjustedSetting(IBindable bindable, object value)
+        internal override void CopyAdjustedSetting(IBindable target, object source)
         {
-            userChangedSettings[bindable] = true;
-            base.CopyAdjustedSetting(bindable, value);
+            userChangedSettings[target] = true;
+            base.CopyAdjustedSetting(target, source);
         }
 
         /// <summary>

From 9e4a925ab1f071fced203cc081f2c6f0b7c2ca96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 3 Jan 2021 13:30:21 +0100
Subject: [PATCH 0723/3722] Clarify & cleanup comments some

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

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index b7432ec966..24d184e531 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -145,16 +145,19 @@ namespace osu.Game.Rulesets.Mods
         }
 
         /// <summary>
-        /// When creating copies or clones of a Mod, this method will be called to copy explicitly adjusted user settings.
-        /// The base implementation will transfer the value via <see cref="Bindable{T}.Parse"/> and should be called unless replaced with custom logic.
+        /// When creating copies or clones of a Mod, this method will be called
+        /// to copy explicitly adjusted user settings from <paramref name="target"/>.
+        /// The base implementation will transfer the value via <see cref="Bindable{T}.Parse"/>
+        /// or by binding and unbinding (if <paramref name="source"/> is an <see cref="IBindable"/>)
+        /// and should be called unless replaced with custom logic.
         /// </summary>
-        /// <param name="target">The target bindable to apply the adjustment.</param>
+        /// <param name="target">The target bindable to apply the adjustment to.</param>
         /// <param name="source">The adjustment to apply.</param>
         internal virtual void CopyAdjustedSetting(IBindable target, object source)
         {
             if (source is IBindable sourceBindable)
             {
-                //copy including transfer of default values.
+                // copy including transfer of default values.
                 target.BindTo(sourceBindable);
                 target.UnbindFrom(sourceBindable);
             }

From efb71713efdde039ab6a3d0fce58476e6ef6d575 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 3 Jan 2021 22:43:02 +0900
Subject: [PATCH 0724/3722] Fix null condition inhibiting deselection events

---
 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 8ad1ace36a..e3036c662b 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -428,7 +428,10 @@ namespace osu.Game.Screens.Select
 
         private void updateSelectedBeatmap(BeatmapInfo beatmap)
         {
-            if (beatmap == null || beatmap.Equals(beatmapNoDebounce))
+            if (beatmap == null && beatmapNoDebounce == null)
+                return;
+
+            if (beatmap?.Equals(beatmapNoDebounce) == true)
                 return;
 
             beatmapNoDebounce = beatmap;

From 53e6a349bbed8492c62b66ff8b47333da8101230 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 3 Jan 2021 22:44:30 +0900
Subject: [PATCH 0725/3722] Fix incorrect initial conditional

Turns out this wasn't actually required.
---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 37213c6003..36f8fbedb3 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -733,12 +733,6 @@ namespace osu.Game.Screens.Select
 
         private const float panel_padding = 5;
 
-        /// <summary>
-        /// After loading, we want to invoke a selection changed event at least once.
-        /// This handles the case where this event is potentially sending a null selection.
-        /// </summary>
-        private bool sentInitialSelectionEvent;
-
         /// <summary>
         /// Computes the target Y positions for every item in the carousel.
         /// </summary>
@@ -802,12 +796,10 @@ namespace osu.Game.Screens.Select
             {
                 bool selectionLost = selectedBeatmapSet != null && selectedBeatmapSet.State.Value != CarouselItemState.Selected;
 
-                if (selectionLost || !sentInitialSelectionEvent)
+                if (selectionLost)
                 {
                     selectedBeatmapSet = null;
                     SelectionChanged?.Invoke(null);
-
-                    sentInitialSelectionEvent = true;
                 }
             }
         }

From 152e9ecccf0f6150236d70a0d90f6d3a721e87aa Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 3 Jan 2021 18:34:11 +0300
Subject: [PATCH 0726/3722] Make `BeatmapAvailability` class in-line with other
 online data structures

---
 osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs | 2 +-
 osu.Game/Online/Rooms/BeatmapAvailability.cs       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
index 92c92f438d..f515b574df 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Online.Multiplayer
         /// <summary>
         /// The availability state of the beatmap, set to <see cref="DownloadState.LocallyAvailable"/> by default.
         /// </summary>
-        public BeatmapAvailability BeatmapAvailability { get; set; } = new BeatmapAvailability(DownloadState.LocallyAvailable);
+        public BeatmapAvailability BeatmapAvailability { get; set; } = BeatmapAvailability.LocallyAvailable();
 
         public User? User { get; set; }
 
diff --git a/osu.Game/Online/Rooms/BeatmapAvailability.cs b/osu.Game/Online/Rooms/BeatmapAvailability.cs
index ca53cb2295..04dcd2a84a 100644
--- a/osu.Game/Online/Rooms/BeatmapAvailability.cs
+++ b/osu.Game/Online/Rooms/BeatmapAvailability.cs
@@ -8,7 +8,7 @@ namespace osu.Game.Online.Rooms
     /// <summary>
     /// The local availability information about a certain beatmap for the client.
     /// </summary>
-    public readonly struct BeatmapAvailability : IEquatable<BeatmapAvailability>
+    public class BeatmapAvailability : IEquatable<BeatmapAvailability>
     {
         /// <summary>
         /// The beatmap's availability state.
@@ -49,7 +49,7 @@ namespace osu.Game.Online.Rooms
             DownloadProgress = downloadProgress;
         }
 
-        public bool Equals(BeatmapAvailability other) => State == other.State && DownloadProgress == other.DownloadProgress;
+        public bool Equals(BeatmapAvailability other) => other != null && State == other.State && DownloadProgress == other.DownloadProgress;
 
         public override string ToString() => $"{string.Join(", ", State, $"{DownloadProgress:0.00%}")}";
     }

From c8423d1c4600d89bf4979715e7da540ca118633c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 3 Jan 2021 18:34:58 +0300
Subject: [PATCH 0727/3722] Make constructors design more pleasent to eyes

---
 osu.Game/Online/Rooms/BeatmapAvailability.cs | 30 ++++----------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Online/Rooms/BeatmapAvailability.cs b/osu.Game/Online/Rooms/BeatmapAvailability.cs
index 04dcd2a84a..1fd099fcc7 100644
--- a/osu.Game/Online/Rooms/BeatmapAvailability.cs
+++ b/osu.Game/Online/Rooms/BeatmapAvailability.cs
@@ -20,35 +20,17 @@ namespace osu.Game.Online.Rooms
         /// </summary>
         public readonly double? DownloadProgress;
 
-        /// <summary>
-        /// Constructs a new non-<see cref="DownloadState.Downloading"/> beatmap availability state.
-        /// </summary>
-        /// <param name="state">The beatmap availability state.</param>
-        /// <exception cref="ArgumentException">Throws if <see cref="DownloadState.Downloading"/> was specified in this constructor, as it has its own constructor (see <see cref="BeatmapAvailability(DownloadState, double)"/>.</exception>
-        public BeatmapAvailability(DownloadState state)
+        private BeatmapAvailability(DownloadState state, double? downloadProgress = null)
         {
-            if (state == DownloadState.Downloading)
-                throw new ArgumentException($"{nameof(DownloadState.Downloading)} state has its own constructor, use it instead.");
-
             State = state;
-            DownloadProgress = null;
-        }
-
-        /// <summary>
-        /// Constructs a new <see cref="DownloadState.Downloading"/>-specific beatmap availability state.
-        /// </summary>
-        /// <param name="state">The beatmap availability state (always <see cref="DownloadState.Downloading"/>).</param>
-        /// <param name="downloadProgress">The beatmap's downloading current progress.</param>
-        /// <exception cref="ArgumentException">Throws if non-<see cref="DownloadState.Downloading"/> was specified in this constructor, as they have their own constructor (see <see cref="BeatmapAvailability(DownloadState)"/>.</exception>
-        public BeatmapAvailability(DownloadState state, double downloadProgress)
-        {
-            if (state != DownloadState.Downloading)
-                throw new ArgumentException($"This is a constructor specific for {DownloadState.Downloading} state, use the regular one instead.");
-
-            State = DownloadState.Downloading;
             DownloadProgress = downloadProgress;
         }
 
+        public static BeatmapAvailability NotDownload() => new BeatmapAvailability(DownloadState.NotDownloaded);
+        public static BeatmapAvailability Downloading(double progress) => new BeatmapAvailability(DownloadState.Downloading, progress);
+        public static BeatmapAvailability Downloaded() => new BeatmapAvailability(DownloadState.Downloaded);
+        public static BeatmapAvailability LocallyAvailable() => new BeatmapAvailability(DownloadState.LocallyAvailable);
+
         public bool Equals(BeatmapAvailability other) => other != null && State == other.State && DownloadProgress == other.DownloadProgress;
 
         public override string ToString() => $"{string.Join(", ", State, $"{DownloadProgress:0.00%}")}";

From 839f5a75705f92cb77dfb75392ecf748a7f955d9 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 3 Jan 2021 18:36:37 +0300
Subject: [PATCH 0728/3722] Ensure clients don't blow up when given user isn't
 in room

---
 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index c1818de87a..799b66020c 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -320,10 +320,13 @@ namespace osu.Game.Online.Multiplayer
 
             Scheduler.Add(() =>
             {
-                if (Room == null)
+                var user = Room?.Users.SingleOrDefault(u => u.UserID == userId);
+
+                // we don't care whether the room doesn't exist or user isn't in joined room, just return in that point.
+                if (user == null)
                     return;
 
-                Room.Users.Single(u => u.UserID == userId).BeatmapAvailability = beatmapAvailability;
+                user.BeatmapAvailability = beatmapAvailability;
 
                 RoomUpdated?.Invoke();
             }, false);

From df04dd21de6a16da70031ee4fac020ae0f923211 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 4 Jan 2021 07:45:29 +0300
Subject: [PATCH 0729/3722] Add failing test case

---
 .../Beatmaps/IO/ImportBeatmapTest.cs          | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
index c32e359de6..041df3e6ff 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -852,6 +852,39 @@ namespace osu.Game.Tests.Beatmaps.IO
             }
         }
 
+        [Test]
+        public async Task TestItemRemovedShouldPassConsumableBeatmapSet()
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(ImportBeatmapTest)))
+            {
+                try
+                {
+                    var osu = LoadOsuIntoHost(host);
+                    var manager = osu.Dependencies.Get<BeatmapManager>();
+
+                    var removedQueue = new Queue<BeatmapSetInfo>();
+                    manager.ItemRemoved.BindValueChanged(evt =>
+                    {
+                        if (evt.NewValue.TryGetTarget(out var target))
+                            removedQueue.Enqueue(target);
+                    });
+
+                    var imported = await LoadOszIntoOsu(osu);
+                    deleteBeatmapSet(imported, osu);
+
+                    Assert.That(removedQueue.Count, Is.EqualTo(1));
+
+                    var removedItem = removedQueue.Single();
+                    Assert.That(removedItem.Metadata, Is.EqualTo(imported.Metadata));
+                    Assert.That(removedItem.Beatmaps, Is.EquivalentTo(imported.Beatmaps));
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
         public static async Task<BeatmapSetInfo> LoadOszIntoOsu(OsuGameBase osu, string path = null, bool virtualTrack = false)
         {
             var temp = path ?? TestResources.GetTestBeatmapForImport(virtualTrack);

From 738c94d1938f99ff5fb638528cff02bf80f297df Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 4 Jan 2021 07:46:51 +0300
Subject: [PATCH 0730/3722] Update soft-deletion logic to use model store's
 consumable items instead

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

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 36cc4cce39..61b2f7668e 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -76,7 +76,7 @@ namespace osu.Game.Database
 
         protected readonly IDatabaseContextFactory ContextFactory;
 
-        protected readonly MutableDatabaseBackedStore<TModel> ModelStore;
+        protected readonly MutableDatabaseBackedStoreWithFileIncludes<TModel, TFileModel> ModelStore;
 
         // ReSharper disable once NotAccessedField.Local (we should keep a reference to this so it is not finalised)
         private ArchiveImportIPCChannel ipc;
@@ -492,7 +492,7 @@ namespace osu.Game.Database
             using (ContextFactory.GetForWrite())
             {
                 // re-fetch the model on the import context.
-                var foundModel = queryModel().Include(s => s.Files).ThenInclude(f => f.FileInfo).FirstOrDefault(s => s.ID == item.ID);
+                var foundModel = ModelStore.ConsumableItems.SingleOrDefault(i => i.ID == item.ID);
 
                 if (foundModel == null || foundModel.DeletePending) return false;
 
@@ -731,8 +731,6 @@ namespace osu.Game.Database
                 yield return f.Filename;
         }
 
-        private DbSet<TModel> queryModel() => ContextFactory.Get().Set<TModel>();
-
         protected virtual string HumanisedModelName => $"{typeof(TModel).Name.Replace("Info", "").ToLower()}";
 
         #region Event handling / delaying

From 1463ff288629232333880a0f18888c4f1a65e5d6 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 4 Jan 2021 08:12:31 +0300
Subject: [PATCH 0731/3722] Remove unnecessary using directive

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

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 61b2f7668e..b9f805ae31 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -9,7 +9,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using Humanizer;
 using JetBrains.Annotations;
-using Microsoft.EntityFrameworkCore;
 using osu.Framework;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;

From ca5f2bcd4ca8395698a5267d6a8fb2a6cb214e45 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 4 Jan 2021 08:49:03 +0300
Subject: [PATCH 0732/3722] Revert database-side changes

---
 .../Beatmaps/IO/ImportBeatmapTest.cs          | 33 -------------------
 osu.Game/Database/ArchiveModelManager.cs      |  6 ++--
 2 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
index 041df3e6ff..c32e359de6 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -852,39 +852,6 @@ namespace osu.Game.Tests.Beatmaps.IO
             }
         }
 
-        [Test]
-        public async Task TestItemRemovedShouldPassConsumableBeatmapSet()
-        {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(ImportBeatmapTest)))
-            {
-                try
-                {
-                    var osu = LoadOsuIntoHost(host);
-                    var manager = osu.Dependencies.Get<BeatmapManager>();
-
-                    var removedQueue = new Queue<BeatmapSetInfo>();
-                    manager.ItemRemoved.BindValueChanged(evt =>
-                    {
-                        if (evt.NewValue.TryGetTarget(out var target))
-                            removedQueue.Enqueue(target);
-                    });
-
-                    var imported = await LoadOszIntoOsu(osu);
-                    deleteBeatmapSet(imported, osu);
-
-                    Assert.That(removedQueue.Count, Is.EqualTo(1));
-
-                    var removedItem = removedQueue.Single();
-                    Assert.That(removedItem.Metadata, Is.EqualTo(imported.Metadata));
-                    Assert.That(removedItem.Beatmaps, Is.EquivalentTo(imported.Beatmaps));
-                }
-                finally
-                {
-                    host.Exit();
-                }
-            }
-        }
-
         public static async Task<BeatmapSetInfo> LoadOszIntoOsu(OsuGameBase osu, string path = null, bool virtualTrack = false)
         {
             var temp = path ?? TestResources.GetTestBeatmapForImport(virtualTrack);
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index b9f805ae31..81d8668196 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Database
 
         protected readonly IDatabaseContextFactory ContextFactory;
 
-        protected readonly MutableDatabaseBackedStoreWithFileIncludes<TModel, TFileModel> ModelStore;
+        protected readonly MutableDatabaseBackedStore<TModel> ModelStore;
 
         // ReSharper disable once NotAccessedField.Local (we should keep a reference to this so it is not finalised)
         private ArchiveImportIPCChannel ipc;
@@ -491,7 +491,7 @@ namespace osu.Game.Database
             using (ContextFactory.GetForWrite())
             {
                 // re-fetch the model on the import context.
-                var foundModel = ModelStore.ConsumableItems.SingleOrDefault(i => i.ID == item.ID);
+                var foundModel = queryModel().Include(s => s.Files).ThenInclude(f => f.FileInfo).FirstOrDefault(s => s.ID == item.ID);
 
                 if (foundModel == null || foundModel.DeletePending) return false;
 
@@ -730,6 +730,8 @@ namespace osu.Game.Database
                 yield return f.Filename;
         }
 
+        private DbSet<TModel> queryModel() => ContextFactory.Get().Set<TModel>();
+
         protected virtual string HumanisedModelName => $"{typeof(TModel).Name.Replace("Info", "").ToLower()}";
 
         #region Event handling / delaying

From 445a4bd01c70428f33bc36b603a52e80e92d0aeb Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 4 Jan 2021 08:51:37 +0300
Subject: [PATCH 0733/3722] Re-query beatmap info on database changes

---
 osu.Game/Database/ArchiveModelManager.cs      |  1 +
 .../OnlinePlay/Components/ReadyButton.cs      | 34 ++++---------------
 2 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 81d8668196..36cc4cce39 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -9,6 +9,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Humanizer;
 using JetBrains.Annotations;
+using Microsoft.EntityFrameworkCore;
 using osu.Framework;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
diff --git a/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs b/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
index 08f89d8ed8..144535ed4c 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
@@ -2,8 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Linq;
-using System.Linq.Expressions;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
@@ -41,38 +39,20 @@ namespace osu.Game.Screens.OnlinePlay.Components
             SelectedItem.BindValueChanged(item => updateSelectedItem(item.NewValue), true);
         }
 
-        private void updateSelectedItem(PlaylistItem item)
-        {
-            hasBeatmap = findBeatmap(expr => beatmaps.QueryBeatmap(expr));
-        }
+        private void updateSelectedItem(PlaylistItem _) => updateBeatmapState();
+        private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> _) => updateBeatmapState();
+        private void beatmapRemoved(ValueChangedEvent<WeakReference<BeatmapSetInfo>> _) => updateBeatmapState();
 
-        private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> weakSet)
-        {
-            if (weakSet.NewValue.TryGetTarget(out var set))
-            {
-                if (findBeatmap(expr => set.Beatmaps.AsQueryable().FirstOrDefault(expr)))
-                    Schedule(() => hasBeatmap = true);
-            }
-        }
-
-        private void beatmapRemoved(ValueChangedEvent<WeakReference<BeatmapSetInfo>> weakSet)
-        {
-            if (weakSet.NewValue.TryGetTarget(out var set))
-            {
-                if (findBeatmap(expr => set.Beatmaps.AsQueryable().FirstOrDefault(expr)))
-                    Schedule(() => hasBeatmap = false);
-            }
-        }
-
-        private bool findBeatmap(Func<Expression<Func<BeatmapInfo, bool>>, BeatmapInfo> expression)
+        private void updateBeatmapState()
         {
             int? beatmapId = SelectedItem.Value?.Beatmap.Value?.OnlineBeatmapID;
             string checksum = SelectedItem.Value?.Beatmap.Value?.MD5Hash;
 
             if (beatmapId == null || checksum == null)
-                return false;
+                return;
 
-            return expression(b => b.OnlineBeatmapID == beatmapId && b.MD5Hash == checksum) != null;
+            var databasedBeatmap = beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == beatmapId && b.MD5Hash == checksum);
+            hasBeatmap = databasedBeatmap != null && !databasedBeatmap.BeatmapSet.DeletePending;
         }
 
         protected override void Update()

From cb7df0fe1172935581909b938cab6fe987fcc5ff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 Jan 2021 15:14:39 +0900
Subject: [PATCH 0734/3722] Add failing test for storyboard start time ordering

---
 .../Formats/LegacyStoryboardDecoderTest.cs    | 20 +++++++++++++++++++
 .../Resources/out-of-order-starttimes.osb     |  6 ++++++
 2 files changed, 26 insertions(+)
 create mode 100644 osu.Game.Tests/Resources/out-of-order-starttimes.osb

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
index 9ebedb3c80..b36597a949 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
@@ -95,6 +95,26 @@ namespace osu.Game.Tests.Beatmaps.Formats
             }
         }
 
+        [Test]
+        public void TestOutOfOrderStartTimes()
+        {
+            var decoder = new LegacyStoryboardDecoder();
+
+            using (var resStream = TestResources.OpenResource("out-of-order-starttimes.osb"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                var storyboard = decoder.Decode(stream);
+
+                StoryboardLayer background = storyboard.Layers.Single(l => l.Depth == 3);
+                Assert.AreEqual(2, background.Elements.Count);
+
+                Assert.AreEqual(1500, background.Elements[0].StartTime);
+                Assert.AreEqual(1000, background.Elements[1].StartTime);
+
+                Assert.AreEqual(1000, storyboard.FirstEventTime);
+            }
+        }
+
         [Test]
         public void TestDecodeVariableWithSuffix()
         {
diff --git a/osu.Game.Tests/Resources/out-of-order-starttimes.osb b/osu.Game.Tests/Resources/out-of-order-starttimes.osb
new file mode 100644
index 0000000000..09988ff64e
--- /dev/null
+++ b/osu.Game.Tests/Resources/out-of-order-starttimes.osb
@@ -0,0 +1,6 @@
+[Events]
+//Storyboard Layer 0 (Background)
+Sprite,Background,TopCentre,"img.jpg",320,240
+ F,0,1500,1600,0,1
+Sprite,Background,TopCentre,"img.jpg",320,240
+ F,0,1000,1100,0,1

From 20d04d69332f18b7f14eedc44fed5bdf0ae9e9a9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 Jan 2021 15:16:01 +0900
Subject: [PATCH 0735/3722] Fix Storyboard's FirstEventTime not finding the
 true earliest event

---
 .../Beatmaps/Formats/LegacyStoryboardDecoderTest.cs    |  2 +-
 osu.Game/Screens/Play/GameplayClockContainer.cs        |  4 +++-
 osu.Game/Storyboards/Storyboard.cs                     | 10 +++++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
index b36597a949..7bee580863 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.AreEqual(1500, background.Elements[0].StartTime);
                 Assert.AreEqual(1000, background.Elements[1].StartTime);
 
-                Assert.AreEqual(1000, storyboard.FirstEventTime);
+                Assert.AreEqual(1000, storyboard.EarliestEventTime);
             }
         }
 
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 0248432917..ddbb087962 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -131,7 +131,9 @@ namespace osu.Game.Screens.Play
 
                 // if a storyboard is present, it may dictate the appropriate start time by having events in negative time space.
                 // this is commonly used to display an intro before the audio track start.
-                startTime = Math.Min(startTime, beatmap.Storyboard.FirstEventTime);
+                double? firstStoryboardEvent = beatmap.Storyboard.EarliestEventTime;
+                if (firstStoryboardEvent != null)
+                    startTime = Math.Min(startTime, firstStoryboardEvent.Value);
 
                 // some beatmaps specify a current lead-in time which should be used instead of the ruleset-provided value when available.
                 // this is not available as an option in the live editor but can still be applied via .osu editing.
diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index e0d18eab00..d4ba18d394 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.EntityFrameworkCore.Internal;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
@@ -27,7 +28,14 @@ namespace osu.Game.Storyboards
 
         public bool HasDrawable => Layers.Any(l => l.Elements.Any(e => e.IsDrawable));
 
-        public double FirstEventTime => Layers.Min(l => l.Elements.FirstOrDefault()?.StartTime ?? 0);
+        /// <summary>
+        /// Across all layers, find the earliest point in time that a storyboard element exists at.
+        /// Will return null if there are no elements.
+        /// </summary>
+        /// <remarks>
+        /// This iterates all elements and as such should be used sparingly or stored locally.
+        /// </remarks>
+        public double? EarliestEventTime => Layers.SelectMany(l => l.Elements).OrderBy(e => e.StartTime).FirstOrDefault()?.StartTime;
 
         /// <summary>
         /// Depth of the currently front-most storyboard layer, excluding the overlay layer.

From 9e0c490141e4e85ecde7c96d7a6b3f37f0b3b4fa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 Jan 2021 15:40:22 +0900
Subject: [PATCH 0736/3722] Remove unused using

---
 osu.Game/Storyboards/Storyboard.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index d4ba18d394..1ba25cc11e 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.EntityFrameworkCore.Internal;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;

From ea38b00b29adabf0ec91b0b085f2af0b11829b23 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 4 Jan 2021 10:27:08 +0300
Subject: [PATCH 0737/3722] Schedule all calls to `updateBeatmapState()`

---
 osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs b/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
index 144535ed4c..6f86f2b879 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
@@ -39,9 +39,9 @@ namespace osu.Game.Screens.OnlinePlay.Components
             SelectedItem.BindValueChanged(item => updateSelectedItem(item.NewValue), true);
         }
 
-        private void updateSelectedItem(PlaylistItem _) => updateBeatmapState();
-        private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> _) => updateBeatmapState();
-        private void beatmapRemoved(ValueChangedEvent<WeakReference<BeatmapSetInfo>> _) => updateBeatmapState();
+        private void updateSelectedItem(PlaylistItem _) => Scheduler.AddOnce(updateBeatmapState);
+        private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> _) => Scheduler.AddOnce(updateBeatmapState);
+        private void beatmapRemoved(ValueChangedEvent<WeakReference<BeatmapSetInfo>> _) => Scheduler.AddOnce(updateBeatmapState);
 
         private void updateBeatmapState()
         {

From 485a57776b205581528925011a1d2ec77d8fc26d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 4 Jan 2021 10:28:41 +0300
Subject: [PATCH 0738/3722] Fix `hasBeatmap` potentially checking on outdated
 `DeletePending` value

---
 osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs b/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
index 6f86f2b879..b782df75df 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
@@ -52,7 +52,15 @@ namespace osu.Game.Screens.OnlinePlay.Components
                 return;
 
             var databasedBeatmap = beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == beatmapId && b.MD5Hash == checksum);
-            hasBeatmap = databasedBeatmap != null && !databasedBeatmap.BeatmapSet.DeletePending;
+
+            if (databasedBeatmap == null)
+                hasBeatmap = false;
+            else
+            {
+                // DeletePending isn't updated in the beatmap info query above, need to directly query the beatmap set from database as well.
+                var databasedSet = beatmaps.QueryBeatmapSet(s => s.Equals(databasedBeatmap.BeatmapSet));
+                hasBeatmap = databasedSet?.DeletePending == false;
+            }
         }
 
         protected override void Update()

From ba4e41142262d683e25185af98e13a07157214ce Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 Jan 2021 16:37:07 +0900
Subject: [PATCH 0739/3722] Clone and copy ControlPointInfo when retrieving a
 playable beatmap

---
 osu.Game/Beatmaps/ControlPoints/ControlPoint.cs | 17 +++++++++++++++++
 .../Beatmaps/ControlPoints/ControlPointInfo.cs  | 12 +++++++++++-
 .../ControlPoints/DifficultyControlPoint.cs     |  7 +++++++
 .../ControlPoints/EffectControlPoint.cs         |  8 ++++++++
 .../ControlPoints/SampleControlPoint.cs         |  8 ++++++++
 .../ControlPoints/TimingControlPoint.cs         |  8 ++++++++
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs      | 15 +++++++++++++--
 osu.Game/Beatmaps/IBeatmap.cs                   |  2 +-
 osu.Game/Beatmaps/WorkingBeatmap.cs             |  3 +++
 osu.Game/Screens/Edit/EditorBeatmap.cs          |  6 +++++-
 osu.Game/Screens/Play/GameplayBeatmap.cs        |  6 +++++-
 11 files changed, 86 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
index c6649f6af1..090675473d 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
@@ -28,5 +28,22 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// <param name="existing">An existing control point to compare with.</param>
         /// <returns>Whether this <see cref="ControlPoint"/> is redundant when placed alongside <paramref name="existing"/>.</returns>
         public abstract bool IsRedundant(ControlPoint existing);
+
+        /// <summary>
+        /// Create a copy of this room without online information.
+        /// Should be used to create a local copy of a room for submitting in the future.
+        /// </summary>
+        public ControlPoint CreateCopy()
+        {
+            var copy = (ControlPoint)Activator.CreateInstance(GetType());
+
+            copy.CopyFrom(this);
+
+            return copy;
+        }
+
+        public virtual void CopyFrom(ControlPoint other)
+        {
+        }
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
index b843aad950..b56f9a106b 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
@@ -11,7 +11,7 @@ using osu.Framework.Lists;
 namespace osu.Game.Beatmaps.ControlPoints
 {
     [Serializable]
-    public class ControlPointInfo
+    public class ControlPointInfo : ICloneable
     {
         /// <summary>
         /// All control points grouped by time.
@@ -297,5 +297,15 @@ namespace osu.Game.Beatmaps.ControlPoints
                     break;
             }
         }
+
+        public object Clone()
+        {
+            var controlPointInfo = new ControlPointInfo();
+
+            foreach (var point in AllControlPoints)
+                controlPointInfo.Add(point.Time, point.CreateCopy());
+
+            return controlPointInfo;
+        }
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
index 283bf76572..0bc5605051 100644
--- a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
@@ -39,5 +39,12 @@ namespace osu.Game.Beatmaps.ControlPoints
         public override bool IsRedundant(ControlPoint existing)
             => existing is DifficultyControlPoint existingDifficulty
                && SpeedMultiplier == existingDifficulty.SpeedMultiplier;
+
+        public override void CopyFrom(ControlPoint other)
+        {
+            SpeedMultiplier = ((DifficultyControlPoint)other).SpeedMultiplier;
+
+            base.CopyFrom(other);
+        }
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
index ea28fca170..79bc88e773 100644
--- a/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
@@ -50,5 +50,13 @@ namespace osu.Game.Beatmaps.ControlPoints
                && existing is EffectControlPoint existingEffect
                && KiaiMode == existingEffect.KiaiMode
                && OmitFirstBarLine == existingEffect.OmitFirstBarLine;
+
+        public override void CopyFrom(ControlPoint other)
+        {
+            KiaiMode = ((EffectControlPoint)other).KiaiMode;
+            OmitFirstBarLine = ((EffectControlPoint)other).OmitFirstBarLine;
+
+            base.CopyFrom(other);
+        }
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
index fd0b496335..4aa6a3d6e9 100644
--- a/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/SampleControlPoint.cs
@@ -72,5 +72,13 @@ namespace osu.Game.Beatmaps.ControlPoints
             => existing is SampleControlPoint existingSample
                && SampleBank == existingSample.SampleBank
                && SampleVolume == existingSample.SampleVolume;
+
+        public override void CopyFrom(ControlPoint other)
+        {
+            SampleVolume = ((SampleControlPoint)other).SampleVolume;
+            SampleBank = ((SampleControlPoint)other).SampleBank;
+
+            base.CopyFrom(other);
+        }
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
index d9378bca4a..580642f593 100644
--- a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
@@ -69,5 +69,13 @@ namespace osu.Game.Beatmaps.ControlPoints
 
         // Timing points are never redundant as they can change the time signature.
         public override bool IsRedundant(ControlPoint existing) => false;
+
+        public override void CopyFrom(ControlPoint other)
+        {
+            TimeSignature = ((TimingControlPoint)other).TimeSignature;
+            BeatLength = ((TimingControlPoint)other).BeatLength;
+
+            base.CopyFrom(other);
+        }
     }
 }
diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index c9d139bdd0..06ff677aed 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -164,13 +164,24 @@ namespace osu.Game.Beatmaps.Formats
             /// Legacy BPM multiplier that introduces floating-point errors for rulesets that depend on it.
             /// DO NOT USE THIS UNLESS 100% SURE.
             /// </summary>
-            public readonly float BpmMultiplier;
+            public float BpmMultiplier { get; set; }
 
             public LegacyDifficultyControlPoint(double beatLength)
+                : this()
+            {
+                BpmMultiplier = beatLength < 0 ? Math.Clamp((float)-beatLength, 10, 10000) / 100f : 1;
+            }
+
+            public LegacyDifficultyControlPoint()
             {
                 SpeedMultiplierBindable.Precision = double.Epsilon;
+            }
 
-                BpmMultiplier = beatLength < 0 ? Math.Clamp((float)-beatLength, 10, 10000) / 100f : 1;
+            public override void CopyFrom(ControlPoint other)
+            {
+                base.CopyFrom(other);
+
+                BpmMultiplier = ((LegacyDifficultyControlPoint)other).BpmMultiplier;
             }
         }
 
diff --git a/osu.Game/Beatmaps/IBeatmap.cs b/osu.Game/Beatmaps/IBeatmap.cs
index 8f27e0b0e9..7dd85e1232 100644
--- a/osu.Game/Beatmaps/IBeatmap.cs
+++ b/osu.Game/Beatmaps/IBeatmap.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Beatmaps
         /// <summary>
         /// The control points in this beatmap.
         /// </summary>
-        ControlPointInfo ControlPointInfo { get; }
+        ControlPointInfo ControlPointInfo { get; set; }
 
         /// <summary>
         /// The breaks in this beatmap.
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 30382c444f..06b5913b18 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -14,6 +14,7 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.Logging;
 using osu.Framework.Statistics;
 using osu.Framework.Testing;
+using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Types;
@@ -111,6 +112,8 @@ namespace osu.Game.Beatmaps
                 // Convert
                 IBeatmap converted = converter.Convert(cancellationSource.Token);
 
+                converted.ControlPointInfo = (ControlPointInfo)converted.ControlPointInfo.Clone();
+
                 // Apply conversion mods to the result
                 foreach (var mod in mods.OfType<IApplicableAfterBeatmapConversion>())
                 {
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 165d2ba278..a54a95f59d 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -74,7 +74,11 @@ namespace osu.Game.Screens.Edit
 
         public BeatmapMetadata Metadata => PlayableBeatmap.Metadata;
 
-        public ControlPointInfo ControlPointInfo => PlayableBeatmap.ControlPointInfo;
+        public ControlPointInfo ControlPointInfo
+        {
+            get => PlayableBeatmap.ControlPointInfo;
+            set => PlayableBeatmap.ControlPointInfo = value;
+        }
 
         public List<BreakPeriod> Breaks => PlayableBeatmap.Breaks;
 
diff --git a/osu.Game/Screens/Play/GameplayBeatmap.cs b/osu.Game/Screens/Play/GameplayBeatmap.cs
index 64894544f4..565595656f 100644
--- a/osu.Game/Screens/Play/GameplayBeatmap.cs
+++ b/osu.Game/Screens/Play/GameplayBeatmap.cs
@@ -29,7 +29,11 @@ namespace osu.Game.Screens.Play
 
         public BeatmapMetadata Metadata => PlayableBeatmap.Metadata;
 
-        public ControlPointInfo ControlPointInfo => PlayableBeatmap.ControlPointInfo;
+        public ControlPointInfo ControlPointInfo
+        {
+            get => PlayableBeatmap.ControlPointInfo;
+            set => PlayableBeatmap.ControlPointInfo = value;
+        }
 
         public List<BreakPeriod> Breaks => PlayableBeatmap.Breaks;
 

From b4a779108e7c87994198690cba57ca05e1a0e503 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 Jan 2021 16:37:49 +0900
Subject: [PATCH 0740/3722] Ensure working beatmap is reloaded on exiting the
 editor

---
 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 223c678fba..a9fe7ba38d 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -483,6 +483,8 @@ namespace osu.Game.Screens.Edit
             Background.FadeColour(Color4.White, 500);
             resetTrack();
 
+            Beatmap.Value = beatmapManager.GetWorkingBeatmap(Beatmap.Value.BeatmapInfo);
+
             return base.OnExiting(next);
         }
 

From 7fdf876b4c8fb19020033d080fca3ee08dd44adc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 Jan 2021 16:38:15 +0900
Subject: [PATCH 0741/3722] Fix editor timing screen mutating the
 WorkingBeatmap instead of EditorBeatmap

---
 osu.Game/Screens/Edit/Timing/DifficultySection.cs |  2 +-
 osu.Game/Screens/Edit/Timing/EffectSection.cs     |  2 +-
 osu.Game/Screens/Edit/Timing/GroupSection.cs      |  9 ++++-----
 osu.Game/Screens/Edit/Timing/SampleSection.cs     |  2 +-
 osu.Game/Screens/Edit/Timing/Section.cs           |  3 +--
 osu.Game/Screens/Edit/Timing/TimingScreen.cs      | 11 +++++------
 osu.Game/Screens/Edit/Timing/TimingSection.cs     |  2 +-
 7 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Screens/Edit/Timing/DifficultySection.cs b/osu.Game/Screens/Edit/Timing/DifficultySection.cs
index b55d74e3b4..b87b8961f8 100644
--- a/osu.Game/Screens/Edit/Timing/DifficultySection.cs
+++ b/osu.Game/Screens/Edit/Timing/DifficultySection.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Screens.Edit.Timing
 
         protected override DifficultyControlPoint CreatePoint()
         {
-            var reference = Beatmap.Value.Beatmap.ControlPointInfo.DifficultyPointAt(SelectedGroup.Value.Time);
+            var reference = Beatmap.ControlPointInfo.DifficultyPointAt(SelectedGroup.Value.Time);
 
             return new DifficultyControlPoint
             {
diff --git a/osu.Game/Screens/Edit/Timing/EffectSection.cs b/osu.Game/Screens/Edit/Timing/EffectSection.cs
index 2f143108a9..6d23b52c05 100644
--- a/osu.Game/Screens/Edit/Timing/EffectSection.cs
+++ b/osu.Game/Screens/Edit/Timing/EffectSection.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Screens.Edit.Timing
 
         protected override EffectControlPoint CreatePoint()
         {
-            var reference = Beatmap.Value.Beatmap.ControlPointInfo.EffectPointAt(SelectedGroup.Value.Time);
+            var reference = Beatmap.ControlPointInfo.EffectPointAt(SelectedGroup.Value.Time);
 
             return new EffectControlPoint
             {
diff --git a/osu.Game/Screens/Edit/Timing/GroupSection.cs b/osu.Game/Screens/Edit/Timing/GroupSection.cs
index 2605ea8b75..2e2c380d4a 100644
--- a/osu.Game/Screens/Edit/Timing/GroupSection.cs
+++ b/osu.Game/Screens/Edit/Timing/GroupSection.cs
@@ -6,7 +6,6 @@ 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.ControlPoints;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
@@ -24,7 +23,7 @@ namespace osu.Game.Screens.Edit.Timing
         protected Bindable<ControlPointGroup> SelectedGroup { get; private set; }
 
         [Resolved]
-        protected IBindable<WorkingBeatmap> Beatmap { get; private set; }
+        protected EditorBeatmap Beatmap { get; private set; }
 
         [Resolved]
         private EditorClock clock { get; set; }
@@ -107,13 +106,13 @@ namespace osu.Game.Screens.Edit.Timing
 
             var currentGroupItems = SelectedGroup.Value.ControlPoints.ToArray();
 
-            Beatmap.Value.Beatmap.ControlPointInfo.RemoveGroup(SelectedGroup.Value);
+            Beatmap.ControlPointInfo.RemoveGroup(SelectedGroup.Value);
 
             foreach (var cp in currentGroupItems)
-                Beatmap.Value.Beatmap.ControlPointInfo.Add(time, cp);
+                Beatmap.ControlPointInfo.Add(time, cp);
 
             // the control point might not necessarily exist yet, if currentGroupItems was empty.
-            SelectedGroup.Value = Beatmap.Value.Beatmap.ControlPointInfo.GroupAt(time, true);
+            SelectedGroup.Value = Beatmap.ControlPointInfo.GroupAt(time, true);
 
             changeHandler?.EndChange();
         }
diff --git a/osu.Game/Screens/Edit/Timing/SampleSection.cs b/osu.Game/Screens/Edit/Timing/SampleSection.cs
index 280e19c99a..cc73af6349 100644
--- a/osu.Game/Screens/Edit/Timing/SampleSection.cs
+++ b/osu.Game/Screens/Edit/Timing/SampleSection.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Screens.Edit.Timing
 
         protected override SampleControlPoint CreatePoint()
         {
-            var reference = Beatmap.Value.Beatmap.ControlPointInfo.SamplePointAt(SelectedGroup.Value.Time);
+            var reference = Beatmap.ControlPointInfo.SamplePointAt(SelectedGroup.Value.Time);
 
             return new SampleControlPoint
             {
diff --git a/osu.Game/Screens/Edit/Timing/Section.cs b/osu.Game/Screens/Edit/Timing/Section.cs
index 7a81eeb1a4..5269fa9774 100644
--- a/osu.Game/Screens/Edit/Timing/Section.cs
+++ b/osu.Game/Screens/Edit/Timing/Section.cs
@@ -7,7 +7,6 @@ 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.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
@@ -27,7 +26,7 @@ namespace osu.Game.Screens.Edit.Timing
         private const float header_height = 20;
 
         [Resolved]
-        protected IBindable<WorkingBeatmap> Beatmap { get; private set; }
+        protected EditorBeatmap Beatmap { get; private set; }
 
         [Resolved]
         protected Bindable<ControlPointGroup> SelectedGroup { get; private set; }
diff --git a/osu.Game/Screens/Edit/Timing/TimingScreen.cs b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
index eab909b798..c5d2dd756a 100644
--- a/osu.Game/Screens/Edit/Timing/TimingScreen.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
@@ -7,7 +7,6 @@ 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.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -62,7 +61,7 @@ namespace osu.Game.Screens.Edit.Timing
             private EditorClock clock { get; set; }
 
             [Resolved]
-            protected IBindable<WorkingBeatmap> Beatmap { get; private set; }
+            protected EditorBeatmap Beatmap { get; private set; }
 
             [Resolved]
             private Bindable<ControlPointGroup> selectedGroup { get; set; }
@@ -124,7 +123,7 @@ namespace osu.Game.Screens.Edit.Timing
 
                 selectedGroup.BindValueChanged(selected => { deleteButton.Enabled.Value = selected.NewValue != null; }, true);
 
-                controlPointGroups.BindTo(Beatmap.Value.Beatmap.ControlPointInfo.Groups);
+                controlPointGroups.BindTo(Beatmap.ControlPointInfo.Groups);
                 controlPointGroups.BindCollectionChanged((sender, args) =>
                 {
                     table.ControlGroups = controlPointGroups;
@@ -137,14 +136,14 @@ namespace osu.Game.Screens.Edit.Timing
                 if (selectedGroup.Value == null)
                     return;
 
-                Beatmap.Value.Beatmap.ControlPointInfo.RemoveGroup(selectedGroup.Value);
+                Beatmap.ControlPointInfo.RemoveGroup(selectedGroup.Value);
 
-                selectedGroup.Value = Beatmap.Value.Beatmap.ControlPointInfo.Groups.FirstOrDefault(g => g.Time >= clock.CurrentTime);
+                selectedGroup.Value = Beatmap.ControlPointInfo.Groups.FirstOrDefault(g => g.Time >= clock.CurrentTime);
             }
 
             private void addNew()
             {
-                selectedGroup.Value = Beatmap.Value.Beatmap.ControlPointInfo.GroupAt(clock.CurrentTime, true);
+                selectedGroup.Value = Beatmap.ControlPointInfo.GroupAt(clock.CurrentTime, true);
             }
         }
     }
diff --git a/osu.Game/Screens/Edit/Timing/TimingSection.cs b/osu.Game/Screens/Edit/Timing/TimingSection.cs
index 1ae2a86885..a0bb9ac506 100644
--- a/osu.Game/Screens/Edit/Timing/TimingSection.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingSection.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Screens.Edit.Timing
 
         protected override TimingControlPoint CreatePoint()
         {
-            var reference = Beatmap.Value.Beatmap.ControlPointInfo.TimingPointAt(SelectedGroup.Value.Time);
+            var reference = Beatmap.ControlPointInfo.TimingPointAt(SelectedGroup.Value.Time);
 
             return new TimingControlPoint
             {

From b7dd54847fc97e98ac5d0eef7d06b5b4d12b509b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 Jan 2021 16:47:08 +0900
Subject: [PATCH 0742/3722] Move resolved usage of WorkingBeatmap in editor
 components as local as possible to avoid misuse

---
 .../Screens/Edit/Compose/ComposeScreen.cs     |  5 ++++-
 osu.Game/Screens/Edit/EditorScreen.cs         |  5 -----
 .../Screens/Edit/Setup/DifficultySection.cs   | 16 ++++++++--------
 .../Screens/Edit/Setup/MetadataSection.cs     | 16 ++++++++--------
 .../Screens/Edit/Setup/ResourcesSection.cs    | 19 +++++++++++--------
 osu.Game/Screens/Edit/Setup/SetupSection.cs   |  4 +---
 6 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
index c297a03dbf..81b1195a40 100644
--- a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
+++ b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
@@ -16,6 +16,9 @@ namespace osu.Game.Screens.Edit.Compose
 {
     public class ComposeScreen : EditorScreenWithTimeline
     {
+        [Resolved]
+        private IBindable<WorkingBeatmap> beatmap { get; set; }
+
         private HitObjectComposer composer;
 
         public ComposeScreen()
@@ -59,7 +62,7 @@ namespace osu.Game.Screens.Edit.Compose
         {
             Debug.Assert(ruleset != null);
 
-            var beatmapSkinProvider = new BeatmapSkinProvidingContainer(Beatmap.Value.Skin);
+            var beatmapSkinProvider = new BeatmapSkinProvidingContainer(beatmap.Value.Skin);
 
             // the beatmapSkinProvider is used as the fallback source here to allow the ruleset-specific skin implementation
             // full access to all skin sources.
diff --git a/osu.Game/Screens/Edit/EditorScreen.cs b/osu.Game/Screens/Edit/EditorScreen.cs
index 4d62a7d3cd..7fbb6a8ca0 100644
--- a/osu.Game/Screens/Edit/EditorScreen.cs
+++ b/osu.Game/Screens/Edit/EditorScreen.cs
@@ -2,10 +2,8 @@
 // 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.Beatmaps;
 
 namespace osu.Game.Screens.Edit
 {
@@ -14,9 +12,6 @@ namespace osu.Game.Screens.Edit
     /// </summary>
     public abstract class EditorScreen : Container
     {
-        [Resolved]
-        protected IBindable<WorkingBeatmap> Beatmap { get; private set; }
-
         [Resolved]
         protected EditorBeatmap EditorBeatmap { get; private set; }
 
diff --git a/osu.Game/Screens/Edit/Setup/DifficultySection.cs b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
index 897ddc6955..f180d7e63e 100644
--- a/osu.Game/Screens/Edit/Setup/DifficultySection.cs
+++ b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Screens.Edit.Setup
                 {
                     Label = "Object Size",
                     Description = "The size of all hit objects",
-                    Current = new BindableFloat(Beatmap.Value.BeatmapInfo.BaseDifficulty.CircleSize)
+                    Current = new BindableFloat(Beatmap.BeatmapInfo.BaseDifficulty.CircleSize)
                     {
                         Default = BeatmapDifficulty.DEFAULT_DIFFICULTY,
                         MinValue = 0,
@@ -46,7 +46,7 @@ namespace osu.Game.Screens.Edit.Setup
                 {
                     Label = "Health Drain",
                     Description = "The rate of passive health drain throughout playable time",
-                    Current = new BindableFloat(Beatmap.Value.BeatmapInfo.BaseDifficulty.DrainRate)
+                    Current = new BindableFloat(Beatmap.BeatmapInfo.BaseDifficulty.DrainRate)
                     {
                         Default = BeatmapDifficulty.DEFAULT_DIFFICULTY,
                         MinValue = 0,
@@ -58,7 +58,7 @@ namespace osu.Game.Screens.Edit.Setup
                 {
                     Label = "Approach Rate",
                     Description = "The speed at which objects are presented to the player",
-                    Current = new BindableFloat(Beatmap.Value.BeatmapInfo.BaseDifficulty.ApproachRate)
+                    Current = new BindableFloat(Beatmap.BeatmapInfo.BaseDifficulty.ApproachRate)
                     {
                         Default = BeatmapDifficulty.DEFAULT_DIFFICULTY,
                         MinValue = 0,
@@ -70,7 +70,7 @@ namespace osu.Game.Screens.Edit.Setup
                 {
                     Label = "Overall Difficulty",
                     Description = "The harshness of hit windows and difficulty of special objects (ie. spinners)",
-                    Current = new BindableFloat(Beatmap.Value.BeatmapInfo.BaseDifficulty.OverallDifficulty)
+                    Current = new BindableFloat(Beatmap.BeatmapInfo.BaseDifficulty.OverallDifficulty)
                     {
                         Default = BeatmapDifficulty.DEFAULT_DIFFICULTY,
                         MinValue = 0,
@@ -88,10 +88,10 @@ 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.Value.BeatmapInfo.BaseDifficulty.CircleSize = circleSizeSlider.Current.Value;
-            Beatmap.Value.BeatmapInfo.BaseDifficulty.DrainRate = healthDrainSlider.Current.Value;
-            Beatmap.Value.BeatmapInfo.BaseDifficulty.ApproachRate = approachRateSlider.Current.Value;
-            Beatmap.Value.BeatmapInfo.BaseDifficulty.OverallDifficulty = overallDifficultySlider.Current.Value;
+            Beatmap.BeatmapInfo.BaseDifficulty.CircleSize = circleSizeSlider.Current.Value;
+            Beatmap.BeatmapInfo.BaseDifficulty.DrainRate = healthDrainSlider.Current.Value;
+            Beatmap.BeatmapInfo.BaseDifficulty.ApproachRate = approachRateSlider.Current.Value;
+            Beatmap.BeatmapInfo.BaseDifficulty.OverallDifficulty = overallDifficultySlider.Current.Value;
 
             editorBeatmap.UpdateAllHitObjects();
         }
diff --git a/osu.Game/Screens/Edit/Setup/MetadataSection.cs b/osu.Game/Screens/Edit/Setup/MetadataSection.cs
index 4ddee2acc6..e812c042fb 100644
--- a/osu.Game/Screens/Edit/Setup/MetadataSection.cs
+++ b/osu.Game/Screens/Edit/Setup/MetadataSection.cs
@@ -29,25 +29,25 @@ namespace osu.Game.Screens.Edit.Setup
                 artistTextBox = new LabelledTextBox
                 {
                     Label = "Artist",
-                    Current = { Value = Beatmap.Value.Metadata.Artist },
+                    Current = { Value = Beatmap.Metadata.Artist },
                     TabbableContentContainer = this
                 },
                 titleTextBox = new LabelledTextBox
                 {
                     Label = "Title",
-                    Current = { Value = Beatmap.Value.Metadata.Title },
+                    Current = { Value = Beatmap.Metadata.Title },
                     TabbableContentContainer = this
                 },
                 creatorTextBox = new LabelledTextBox
                 {
                     Label = "Creator",
-                    Current = { Value = Beatmap.Value.Metadata.AuthorString },
+                    Current = { Value = Beatmap.Metadata.AuthorString },
                     TabbableContentContainer = this
                 },
                 difficultyTextBox = new LabelledTextBox
                 {
                     Label = "Difficulty Name",
-                    Current = { Value = Beatmap.Value.BeatmapInfo.Version },
+                    Current = { Value = Beatmap.BeatmapInfo.Version },
                     TabbableContentContainer = this
                 },
             };
@@ -62,10 +62,10 @@ 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.Value.Metadata.Artist = artistTextBox.Current.Value;
-            Beatmap.Value.Metadata.Title = titleTextBox.Current.Value;
-            Beatmap.Value.Metadata.AuthorString = creatorTextBox.Current.Value;
-            Beatmap.Value.BeatmapInfo.Version = difficultyTextBox.Current.Value;
+            Beatmap.Metadata.Artist = artistTextBox.Current.Value;
+            Beatmap.Metadata.Title = titleTextBox.Current.Value;
+            Beatmap.Metadata.AuthorString = creatorTextBox.Current.Value;
+            Beatmap.BeatmapInfo.Version = difficultyTextBox.Current.Value;
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
index 0c957b80af..b3bceceea3 100644
--- a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
+++ b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
@@ -42,6 +42,9 @@ namespace osu.Game.Screens.Edit.Setup
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 
+        [Resolved]
+        private IBindable<WorkingBeatmap> working { get; set; }
+
         [Resolved(canBeNull: true)]
         private Editor editor { get; set; }
 
@@ -70,7 +73,7 @@ namespace osu.Game.Screens.Edit.Setup
                 audioTrackTextBox = new FileChooserLabelledTextBox
                 {
                     Label = "Audio Track",
-                    Current = { Value = Beatmap.Value.Metadata.AudioFile ?? "Click to select a track" },
+                    Current = { Value = Beatmap.Metadata.AudioFile ?? "Click to select a track" },
                     Target = audioTrackFileChooserContainer,
                     TabbableContentContainer = this
                 },
@@ -115,11 +118,11 @@ namespace osu.Game.Screens.Edit.Setup
             if (!info.Exists)
                 return false;
 
-            var set = Beatmap.Value.BeatmapSetInfo;
+            var set = working.Value.BeatmapSetInfo;
 
             // remove the previous background for now.
             // in the future we probably want to check if this is being used elsewhere (other difficulties?)
-            var oldFile = set.Files.FirstOrDefault(f => f.Filename == Beatmap.Value.Metadata.BackgroundFile);
+            var oldFile = set.Files.FirstOrDefault(f => f.Filename == working.Value.Metadata.BackgroundFile);
 
             using (var stream = info.OpenRead())
             {
@@ -129,7 +132,7 @@ namespace osu.Game.Screens.Edit.Setup
                     beatmaps.AddFile(set, stream, info.Name);
             }
 
-            Beatmap.Value.Metadata.BackgroundFile = info.Name;
+            working.Value.Metadata.BackgroundFile = info.Name;
             updateBackgroundSprite();
 
             return true;
@@ -148,11 +151,11 @@ namespace osu.Game.Screens.Edit.Setup
             if (!info.Exists)
                 return false;
 
-            var set = Beatmap.Value.BeatmapSetInfo;
+            var set = working.Value.BeatmapSetInfo;
 
             // remove the previous audio track for now.
             // in the future we probably want to check if this is being used elsewhere (other difficulties?)
-            var oldFile = set.Files.FirstOrDefault(f => f.Filename == Beatmap.Value.Metadata.AudioFile);
+            var oldFile = set.Files.FirstOrDefault(f => f.Filename == working.Value.Metadata.AudioFile);
 
             using (var stream = info.OpenRead())
             {
@@ -162,7 +165,7 @@ namespace osu.Game.Screens.Edit.Setup
                     beatmaps.AddFile(set, stream, info.Name);
             }
 
-            Beatmap.Value.Metadata.AudioFile = info.Name;
+            working.Value.Metadata.AudioFile = info.Name;
 
             music.ReloadCurrentTrack();
 
@@ -178,7 +181,7 @@ namespace osu.Game.Screens.Edit.Setup
 
         private void updateBackgroundSprite()
         {
-            LoadComponentAsync(new BeatmapBackgroundSprite(Beatmap.Value)
+            LoadComponentAsync(new BeatmapBackgroundSprite(working.Value)
             {
                 RelativeSizeAxes = Axes.Both,
                 Anchor = Anchor.Centre,
diff --git a/osu.Game/Screens/Edit/Setup/SetupSection.cs b/osu.Game/Screens/Edit/Setup/SetupSection.cs
index cdf17d355e..88521a8fb0 100644
--- a/osu.Game/Screens/Edit/Setup/SetupSection.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupSection.cs
@@ -2,10 +2,8 @@
 // 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.Beatmaps;
 using osu.Game.Graphics;
 using osuTK;
 
@@ -19,7 +17,7 @@ namespace osu.Game.Screens.Edit.Setup
         protected OsuColour Colours { get; private set; }
 
         [Resolved]
-        protected IBindable<WorkingBeatmap> Beatmap { get; private set; }
+        protected EditorBeatmap Beatmap { get; private set; }
 
         protected override Container<Drawable> Content => flow;
 

From 3b08faa0ea134d99f6cd9dcd02096df1ffac115a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 Jan 2021 17:49:11 +0900
Subject: [PATCH 0743/3722] Fix RemoveBlockingOverlay causing transform
 mutation from disposal threads

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 17831ed26b..36e3078653 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -151,11 +151,11 @@ namespace osu.Game
             updateBlockingOverlayFade();
         }
 
-        public void RemoveBlockingOverlay(OverlayContainer overlay)
+        public void RemoveBlockingOverlay(OverlayContainer overlay) => Schedule(() =>
         {
             visibleBlockingOverlays.Remove(overlay);
             updateBlockingOverlayFade();
-        }
+        });
 
         /// <summary>
         /// Close all game-wide overlays.

From 2d1b52be0d8e02ffc4c4fbbd6a9f8f621d54f211 Mon Sep 17 00:00:00 2001
From: KyeKiller <kye021@hotmail.co.uk>
Date: Mon, 4 Jan 2021 17:21:31 +0000
Subject: [PATCH 0744/3722] Moved "ToolbarSocialButton"

This will remove it from coming off the screen.
---
 osu.Game/Overlays/Toolbar/Toolbar.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index 393e349bd0..88a2518f84 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -69,12 +69,13 @@ namespace osu.Game.Overlays.Toolbar
                     AutoSizeAxes = Axes.X,
                     Children = new Drawable[]
                     {
+                        
+                        new ToolbarSocialButton(),
                         new ToolbarNewsButton(),
                         new ToolbarChangelogButton(),
                         new ToolbarRankingsButton(),
                         new ToolbarBeatmapListingButton(),
                         new ToolbarChatButton(),
-                        new ToolbarSocialButton(),
                         new ToolbarMusicButton(),
                         //new ToolbarButton
                         //{

From 2e2b3ab5d4f66cd0295cd939a209c51485d59b41 Mon Sep 17 00:00:00 2001
From: KyeKiller <kye021@hotmail.co.uk>
Date: Mon, 4 Jan 2021 17:26:42 +0000
Subject: [PATCH 0745/3722] Should remove codeFactor error

---
 osu.Game/Overlays/Toolbar/Toolbar.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index 88a2518f84..c95d02cea4 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -69,7 +69,6 @@ namespace osu.Game.Overlays.Toolbar
                     AutoSizeAxes = Axes.X,
                     Children = new Drawable[]
                     {
-                        
                         new ToolbarSocialButton(),
                         new ToolbarNewsButton(),
                         new ToolbarChangelogButton(),

From 73f5e5aaf9fb94726b6906f98b6493202fedb680 Mon Sep 17 00:00:00 2001
From: KyeKiller <kye021@hotmail.co.uk>
Date: Mon, 4 Jan 2021 21:03:51 +0000
Subject: [PATCH 0746/3722] Moved "ToolbarSocialButton" back

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

diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index c95d02cea4..393e349bd0 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -69,12 +69,12 @@ namespace osu.Game.Overlays.Toolbar
                     AutoSizeAxes = Axes.X,
                     Children = new Drawable[]
                     {
-                        new ToolbarSocialButton(),
                         new ToolbarNewsButton(),
                         new ToolbarChangelogButton(),
                         new ToolbarRankingsButton(),
                         new ToolbarBeatmapListingButton(),
                         new ToolbarChatButton(),
+                        new ToolbarSocialButton(),
                         new ToolbarMusicButton(),
                         //new ToolbarButton
                         //{

From 3468df840b37291dfdae94af3fb0d29a8e7493fa Mon Sep 17 00:00:00 2001
From: KyeKiller <kye021@hotmail.co.uk>
Date: Mon, 4 Jan 2021 21:04:30 +0000
Subject: [PATCH 0747/3722] Moved tooltip to the left to stop the overflow

---
 osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs b/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs
index e62c7bc807..ca334702ce 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs
@@ -2,12 +2,16 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 using osu.Game.Input.Bindings;
 
 namespace osu.Game.Overlays.Toolbar
 {
     public class ToolbarSocialButton : ToolbarOverlayToggleButton
     {
+
+        protected override Anchor TooltipAnchor => Anchor.TopRight;
+
         public ToolbarSocialButton()
         {
             Hotkey = GlobalAction.ToggleSocial;

From 0e42d415c18888192358e4f7e2a41074ebd0530f Mon Sep 17 00:00:00 2001
From: KyeKiller <kye021@hotmail.co.uk>
Date: Mon, 4 Jan 2021 21:05:28 +0000
Subject: [PATCH 0748/3722] Hit another oopie

---
 osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs b/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs
index ca334702ce..1e00afc5fd 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarSocialButton.cs
@@ -9,7 +9,6 @@ namespace osu.Game.Overlays.Toolbar
 {
     public class ToolbarSocialButton : ToolbarOverlayToggleButton
     {
-
         protected override Anchor TooltipAnchor => Anchor.TopRight;
 
         public ToolbarSocialButton()

From 1234d0fa0409c786c4e4ec4e2a63b5a5da406292 Mon Sep 17 00:00:00 2001
From: KyeKiller <kye021@hotmail.co.uk>
Date: Mon, 4 Jan 2021 22:01:12 +0000
Subject: [PATCH 0749/3722] Applied all tooltips to the right

---
 osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs | 3 +++
 osu.Game/Overlays/Toolbar/ToolbarChangelogButton.cs      | 5 ++++-
 osu.Game/Overlays/Toolbar/ToolbarChatButton.cs           | 3 +++
 osu.Game/Overlays/Toolbar/ToolbarNewsButton.cs           | 3 +++
 osu.Game/Overlays/Toolbar/ToolbarRankingsButton.cs       | 3 +++
 5 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs b/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs
index 0363873326..c495d673ce 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs
@@ -2,12 +2,15 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 using osu.Game.Input.Bindings;
 
 namespace osu.Game.Overlays.Toolbar
 {
     public class ToolbarBeatmapListingButton : ToolbarOverlayToggleButton
     {
+        protected override Anchor TooltipAnchor => Anchor.TopRight;
+
         public ToolbarBeatmapListingButton()
         {
             Hotkey = GlobalAction.ToggleDirect;
diff --git a/osu.Game/Overlays/Toolbar/ToolbarChangelogButton.cs b/osu.Game/Overlays/Toolbar/ToolbarChangelogButton.cs
index 23f8b141b2..28112d178f 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarChangelogButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarChangelogButton.cs
@@ -2,11 +2,14 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 
 namespace osu.Game.Overlays.Toolbar
 {
     public class ToolbarChangelogButton : ToolbarOverlayToggleButton
-    {
+    {       
+        protected override Anchor TooltipAnchor => Anchor.TopRight;
+
         [BackgroundDependencyLoader(true)]
         private void load(ChangelogOverlay changelog)
         {
diff --git a/osu.Game/Overlays/Toolbar/ToolbarChatButton.cs b/osu.Game/Overlays/Toolbar/ToolbarChatButton.cs
index f9a66ae7bb..2d3b33e9bc 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarChatButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarChatButton.cs
@@ -2,12 +2,15 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 using osu.Game.Input.Bindings;
 
 namespace osu.Game.Overlays.Toolbar
 {
     public class ToolbarChatButton : ToolbarOverlayToggleButton
     {
+        protected override Anchor TooltipAnchor => Anchor.TopRight;
+
         public ToolbarChatButton()
         {
             Hotkey = GlobalAction.ToggleChat;
diff --git a/osu.Game/Overlays/Toolbar/ToolbarNewsButton.cs b/osu.Game/Overlays/Toolbar/ToolbarNewsButton.cs
index 0ba2935c80..9b2573ad07 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarNewsButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarNewsButton.cs
@@ -2,11 +2,14 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 
 namespace osu.Game.Overlays.Toolbar
 {
     public class ToolbarNewsButton : ToolbarOverlayToggleButton
     {
+        protected override Anchor TooltipAnchor => Anchor.TopRight;
+
         [BackgroundDependencyLoader(true)]
         private void load(NewsOverlay news)
         {
diff --git a/osu.Game/Overlays/Toolbar/ToolbarRankingsButton.cs b/osu.Game/Overlays/Toolbar/ToolbarRankingsButton.cs
index 22a01bcdb5..312fc41aab 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarRankingsButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarRankingsButton.cs
@@ -2,11 +2,14 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 
 namespace osu.Game.Overlays.Toolbar
 {
     public class ToolbarRankingsButton : ToolbarOverlayToggleButton
     {
+        protected override Anchor TooltipAnchor => Anchor.TopRight;
+
         [BackgroundDependencyLoader(true)]
         private void load(RankingsOverlay rankings)
         {

From 77e660e42677eee4d2407b3b59a649f836b35f34 Mon Sep 17 00:00:00 2001
From: KyeKiller <kye021@hotmail.co.uk>
Date: Mon, 4 Jan 2021 22:11:52 +0000
Subject: [PATCH 0750/3722] Should pass all checks again now.

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

diff --git a/osu.Game/Overlays/Toolbar/ToolbarChangelogButton.cs b/osu.Game/Overlays/Toolbar/ToolbarChangelogButton.cs
index 28112d178f..86bc73361a 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarChangelogButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarChangelogButton.cs
@@ -7,7 +7,7 @@ using osu.Framework.Graphics;
 namespace osu.Game.Overlays.Toolbar
 {
     public class ToolbarChangelogButton : ToolbarOverlayToggleButton
-    {       
+    {
         protected override Anchor TooltipAnchor => Anchor.TopRight;
 
         [BackgroundDependencyLoader(true)]

From 81355652fa8601d4537cb6998afe6208da1b925d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 5 Jan 2021 06:00:15 +0300
Subject: [PATCH 0751/3722] Add simple test coverage

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

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
index 6b11613f1c..03ba73d35b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
@@ -7,8 +7,10 @@ using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Graphics;
 using osu.Framework.Platform;
+using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
@@ -23,6 +25,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
     public class TestSceneMultiplayerReadyButton : MultiplayerTestScene
     {
         private MultiplayerReadyButton button;
+        private BeatmapSetInfo importedSet;
 
         private BeatmapManager beatmaps;
         private RulesetStore rulesets;
@@ -38,9 +41,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [SetUp]
         public new void Setup() => Schedule(() =>
         {
-            var beatmap = beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.All).First().Beatmaps.First();
-
-            Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmap);
+            importedSet = beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.All).First();
+            Beatmap.Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First());
 
             Child = button = new MultiplayerReadyButton
             {
@@ -51,13 +53,30 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 {
                     Value = new PlaylistItem
                     {
-                        Beatmap = { Value = beatmap },
-                        Ruleset = { Value = beatmap.Ruleset }
+                        Beatmap = { Value = Beatmap.Value.BeatmapInfo },
+                        Ruleset = { Value = Beatmap.Value.BeatmapInfo.Ruleset }
                     }
                 }
             };
         });
 
+        [Test]
+        public void TestDeletedBeatmapDisableReady()
+        {
+            OsuButton readyButton = null;
+
+            AddAssert("ensure ready button enabled", () =>
+            {
+                readyButton = button.ChildrenOfType<OsuButton>().Single();
+                return readyButton.Enabled.Value;
+            });
+
+            AddStep("delete beatmap", () => beatmaps.Delete(importedSet));
+            AddAssert("ready button disabled", () => !readyButton.Enabled.Value);
+            AddStep("undelete beatmap", () => beatmaps.Undelete(importedSet));
+            AddAssert("ready button enabled back", () => readyButton.Enabled.Value);
+        }
+
         [Test]
         public void TestToggleStateWhenNotHost()
         {

From caa88c6100cb17d3307336ab43e00f16fbe98b01 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Jan 2021 13:13:51 +0900
Subject: [PATCH 0752/3722] Use CreateCopy instead of Clone interface

I was going for conformity by using the IClonable interface, but it
doesn't look like we use it anywhere else in the project.
---
 osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs | 4 ++--
 osu.Game/Beatmaps/WorkingBeatmap.cs                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
index b56f9a106b..e8a91e4001 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
@@ -11,7 +11,7 @@ using osu.Framework.Lists;
 namespace osu.Game.Beatmaps.ControlPoints
 {
     [Serializable]
-    public class ControlPointInfo : ICloneable
+    public class ControlPointInfo
     {
         /// <summary>
         /// All control points grouped by time.
@@ -298,7 +298,7 @@ namespace osu.Game.Beatmaps.ControlPoints
             }
         }
 
-        public object Clone()
+        public ControlPointInfo CreateCopy()
         {
             var controlPointInfo = new ControlPointInfo();
 
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 06b5913b18..8688017887 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -112,7 +112,7 @@ namespace osu.Game.Beatmaps
                 // Convert
                 IBeatmap converted = converter.Convert(cancellationSource.Token);
 
-                converted.ControlPointInfo = (ControlPointInfo)converted.ControlPointInfo.Clone();
+                converted.ControlPointInfo = converted.ControlPointInfo.CreateCopy();
 
                 // Apply conversion mods to the result
                 foreach (var mod in mods.OfType<IApplicableAfterBeatmapConversion>())

From 385c9cd2e23e9f66b3b316b11b594c5377d27b77 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Jan 2021 13:14:16 +0900
Subject: [PATCH 0753/3722] Add test coverage

---
 .../NonVisual/ControlPointInfoTest.cs         | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/osu.Game.Tests/NonVisual/ControlPointInfoTest.cs b/osu.Game.Tests/NonVisual/ControlPointInfoTest.cs
index 90a487c0ac..b27c257795 100644
--- a/osu.Game.Tests/NonVisual/ControlPointInfoTest.cs
+++ b/osu.Game.Tests/NonVisual/ControlPointInfoTest.cs
@@ -246,5 +246,32 @@ namespace osu.Game.Tests.NonVisual
             Assert.That(cpi.DifficultyPoints.Count, Is.EqualTo(0));
             Assert.That(cpi.AllControlPoints.Count, Is.EqualTo(0));
         }
+
+        [Test]
+        public void TestCreateCopyIsDeepClone()
+        {
+            var cpi = new ControlPointInfo();
+
+            cpi.Add(1000, new TimingControlPoint { BeatLength = 500 });
+
+            var cpiCopy = cpi.CreateCopy();
+
+            cpiCopy.Add(2000, new TimingControlPoint { BeatLength = 500 });
+
+            Assert.That(cpi.Groups.Count, Is.EqualTo(1));
+            Assert.That(cpiCopy.Groups.Count, Is.EqualTo(2));
+
+            Assert.That(cpi.TimingPoints.Count, Is.EqualTo(1));
+            Assert.That(cpiCopy.TimingPoints.Count, Is.EqualTo(2));
+
+            Assert.That(cpi.TimingPoints[0], Is.Not.SameAs(cpiCopy.TimingPoints[0]));
+            Assert.That(cpi.TimingPoints[0].BeatLengthBindable, Is.Not.SameAs(cpiCopy.TimingPoints[0].BeatLengthBindable));
+
+            Assert.That(cpi.TimingPoints[0].BeatLength, Is.EqualTo(cpiCopy.TimingPoints[0].BeatLength));
+
+            cpi.TimingPoints[0].BeatLength = 800;
+
+            Assert.That(cpi.TimingPoints[0].BeatLength, Is.Not.EqualTo(cpiCopy.TimingPoints[0].BeatLength));
+        }
     }
 }

From 6b8e1913eee030038ed4af72be5168d0c2ba7fab Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Jan 2021 13:27:45 +0900
Subject: [PATCH 0754/3722] Fix dependency not always available due to nested
 LoadComponentAsync call

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

diff --git a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
index b9457f422a..2d623a200c 100644
--- a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
+++ b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
@@ -30,16 +30,16 @@ namespace osu.Game.Screens.Edit
         {
         }
 
+        private Container mainContent;
+
+        private LoadingSpinner spinner;
+
         [BackgroundDependencyLoader(true)]
         private void load([CanBeNull] BindableBeatDivisor beatDivisor)
         {
             if (beatDivisor != null)
                 this.beatDivisor.BindTo(beatDivisor);
 
-            Container mainContent;
-
-            LoadingSpinner spinner;
-
             Children = new Drawable[]
             {
                 mainContent = new Container
@@ -99,6 +99,11 @@ namespace osu.Game.Screens.Edit
                     }
                 },
             };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
 
             LoadComponentAsync(CreateMainContent(), content =>
             {

From afab35a31ad71e8f25e0d9084dc4edbb8e0183b4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Jan 2021 13:41:31 +0900
Subject: [PATCH 0755/3722] Fix missing copy implementation in
 LegacySampleControlPiont

---
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index 06ff677aed..a06ad35b89 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -203,6 +203,13 @@ namespace osu.Game.Beatmaps.Formats
                 => base.IsRedundant(existing)
                    && existing is LegacySampleControlPoint existingSample
                    && CustomSampleBank == existingSample.CustomSampleBank;
+
+            public override void CopyFrom(ControlPoint other)
+            {
+                base.CopyFrom(other);
+
+                CustomSampleBank = ((LegacySampleControlPoint)other).CustomSampleBank;
+            }
         }
     }
 }

From 31a6e9b860ceb9ee1ece9441beb41b8aca042f5d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Jan 2021 14:24:49 +0900
Subject: [PATCH 0756/3722] Remove unused using

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

diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 8688017887..d25adca92b 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -14,7 +14,6 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.Logging;
 using osu.Framework.Statistics;
 using osu.Framework.Testing;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Types;

From ed6ffe2ef1b55d957851391d4635d0e93585dcf2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Jan 2021 14:54:59 +0900
Subject: [PATCH 0757/3722] Remove hacky code

---
 osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs b/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
index b782df75df..64ddba669d 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
@@ -53,14 +53,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
 
             var databasedBeatmap = beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == beatmapId && b.MD5Hash == checksum);
 
-            if (databasedBeatmap == null)
-                hasBeatmap = false;
-            else
-            {
-                // DeletePending isn't updated in the beatmap info query above, need to directly query the beatmap set from database as well.
-                var databasedSet = beatmaps.QueryBeatmapSet(s => s.Equals(databasedBeatmap.BeatmapSet));
-                hasBeatmap = databasedSet?.DeletePending == false;
-            }
+            hasBeatmap = databasedBeatmap?.BeatmapSet?.DeletePending == false;
         }
 
         protected override void Update()

From 962c95dc0158bfddf43ad8128dc4e1db2a131cb6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 Jan 2021 19:06:00 +0900
Subject: [PATCH 0758/3722] Fix ModSelection making unsafe advances of
 ModSection

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

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 0107f94dcf..d00a365dde 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -130,7 +130,7 @@ namespace osu.Game.Overlays.Mods
         /// Select one or more mods in this section and deselects all other ones.
         /// </summary>
         /// <param name="modTypes">The types of <see cref="Mod"/>s which should be selected.</param>
-        public void SelectTypes(IEnumerable<Type> modTypes)
+        public void SelectTypes(IEnumerable<Type> modTypes) => Schedule(() =>
         {
             foreach (var button in buttons)
             {
@@ -141,7 +141,7 @@ namespace osu.Game.Overlays.Mods
                 else
                     button.Deselect();
             }
-        }
+        });
 
         protected ModSection()
         {

From a3e4e2f6c394544efae9df90228690fbdd3660c4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 Jan 2021 18:24:21 +0900
Subject: [PATCH 0759/3722] Switch ResultsScreen and SongSelect inheritance and
 remove local implementation

---
 osu.Game/Screens/Ranking/ResultsScreen.cs | 4 +---
 osu.Game/Screens/Select/SongSelect.cs     | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 528a1842af..98794627fe 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -25,7 +25,7 @@ using osuTK;
 
 namespace osu.Game.Screens.Ranking
 {
-    public abstract class ResultsScreen : OsuScreen, IKeyBindingHandler<GlobalAction>
+    public abstract class ResultsScreen : ScreenWithBeatmapBackground, IKeyBindingHandler<GlobalAction>
     {
         protected const float BACKGROUND_BLUR = 20;
         private static readonly float screen_height = 768 - TwoLayerButton.SIZE_EXTENDED.Y;
@@ -35,8 +35,6 @@ namespace osu.Game.Screens.Ranking
         // 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;
 
-        protected override BackgroundScreen CreateBackground() => new BackgroundScreenBeatmap(Beatmap.Value);
-
         public readonly Bindable<ScoreInfo> SelectedScore = new Bindable<ScoreInfo>();
 
         public readonly ScoreInfo Score;
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index a5252fdc96..50a1dd6edf 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -41,7 +41,7 @@ using System.Diagnostics;
 
 namespace osu.Game.Screens.Select
 {
-    public abstract class SongSelect : OsuScreen, IKeyBindingHandler<GlobalAction>
+    public abstract class SongSelect : ScreenWithBeatmapBackground, IKeyBindingHandler<GlobalAction>
     {
         public static readonly float WEDGE_HEIGHT = 245;
 
@@ -76,8 +76,6 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private Bindable<IReadOnlyList<Mod>> selectedMods { get; set; }
 
-        protected override BackgroundScreen CreateBackground() => new BackgroundScreenBeatmap(Beatmap.Value);
-
         protected BeatmapCarousel Carousel { get; private set; }
 
         private BeatmapInfoWedge beatmapInfoWedge;

From b3f08b29ca60b99f6c3aa2f3a5d3dec679452a06 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 Jan 2021 18:32:23 +0900
Subject: [PATCH 0760/3722] Ensure that all changes to screen backgrounds are
 on the correct thread

---
 .../Background/TestSceneUserDimBackgrounds.cs | 55 ++++++++++++-------
 osu.Game/Rulesets/Mods/ModCinema.cs           |  2 +-
 osu.Game/Screens/BackgroundScreen.cs          |  2 +
 osu.Game/Screens/Edit/Editor.cs               | 13 +++--
 osu.Game/Screens/Menu/MainMenu.cs             |  6 +-
 osu.Game/Screens/OsuScreen.cs                 | 21 +++++--
 osu.Game/Screens/Play/EpilepsyWarning.cs      | 21 ++++++-
 osu.Game/Screens/Play/Player.cs               | 17 ++++--
 osu.Game/Screens/Play/PlayerLoader.cs         | 32 +++++++----
 .../Play/ScreenWithBeatmapBackground.cs       |  3 +-
 osu.Game/Screens/Ranking/ResultsScreen.cs     | 14 +++--
 osu.Game/Screens/Select/SongSelect.cs         |  6 +-
 12 files changed, 132 insertions(+), 60 deletions(-)

diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
index 5323f58a66..b5df3285f0 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Tests.Visual.Background
             });
             AddUntilStep("Screen is dimmed and blur applied", () => songSelect.IsBackgroundDimmed() && songSelect.IsUserBlurApplied());
             AddStep("Stop background preview", () => InputManager.MoveMouseTo(playerLoader.ScreenPos));
-            AddUntilStep("Screen is undimmed and user blur removed", () => songSelect.IsBackgroundUndimmed() && playerLoader.IsBlurCorrect());
+            AddUntilStep("Screen is undimmed and user blur removed", () => songSelect.IsBackgroundUndimmed() && songSelect.CheckBackgroundBlur(playerLoader.ExpectedBackgroundBlur));
         }
 
         /// <summary>
@@ -106,6 +106,7 @@ namespace osu.Game.Tests.Visual.Background
         public void TestStoryboardBackgroundVisibility()
         {
             performFullSetup();
+            AddAssert("Background retained from song select", () => songSelect.IsBackgroundCurrent());
             createFakeStoryboard();
             AddStep("Enable Storyboard", () =>
             {
@@ -198,8 +199,9 @@ namespace osu.Game.Tests.Visual.Background
             })));
 
             AddUntilStep("Wait for results is current", () => results.IsCurrentScreen());
+
             AddUntilStep("Screen is undimmed, original background retained", () =>
-                songSelect.IsBackgroundUndimmed() && songSelect.IsBackgroundCurrent() && results.IsBlurCorrect());
+                songSelect.IsBackgroundUndimmed() && songSelect.IsBackgroundCurrent() && songSelect.CheckBackgroundBlur(results.ExpectedBackgroundBlur));
         }
 
         /// <summary>
@@ -224,7 +226,7 @@ namespace osu.Game.Tests.Visual.Background
             AddStep("Resume PlayerLoader", () => player.Restart());
             AddUntilStep("Screen is dimmed and blur applied", () => songSelect.IsBackgroundDimmed() && songSelect.IsUserBlurApplied());
             AddStep("Move mouse to center of screen", () => InputManager.MoveMouseTo(playerLoader.ScreenPos));
-            AddUntilStep("Screen is undimmed and user blur removed", () => songSelect.IsBackgroundUndimmed() && playerLoader.IsBlurCorrect());
+            AddUntilStep("Screen is undimmed and user blur removed", () => songSelect.IsBackgroundUndimmed() && songSelect.CheckBackgroundBlur(playerLoader.ExpectedBackgroundBlur));
         }
 
         private void createFakeStoryboard() => AddStep("Create storyboard", () =>
@@ -274,9 +276,11 @@ namespace osu.Game.Tests.Visual.Background
 
         private class DummySongSelect : PlaySongSelect
         {
+            private FadeAccessibleBackground background;
+
             protected override BackgroundScreen CreateBackground()
             {
-                FadeAccessibleBackground background = new FadeAccessibleBackground(Beatmap.Value);
+                background = new FadeAccessibleBackground(Beatmap.Value);
                 DimEnabled.BindTo(background.EnableUserDim);
                 return background;
             }
@@ -294,42 +298,54 @@ namespace osu.Game.Tests.Visual.Background
                 config.BindWith(OsuSetting.BlurLevel, BlurLevel);
             }
 
-            public bool IsBackgroundDimmed() => ((FadeAccessibleBackground)Background).CurrentColour == OsuColour.Gray(1f - ((FadeAccessibleBackground)Background).CurrentDim);
+            public bool IsBackgroundDimmed() => background.CurrentColour == OsuColour.Gray(1f - background.CurrentDim);
 
-            public bool IsBackgroundUndimmed() => ((FadeAccessibleBackground)Background).CurrentColour == Color4.White;
+            public bool IsBackgroundUndimmed() => background.CurrentColour == Color4.White;
 
-            public bool IsUserBlurApplied() => ((FadeAccessibleBackground)Background).CurrentBlur == new Vector2((float)BlurLevel.Value * BackgroundScreenBeatmap.USER_BLUR_FACTOR);
+            public bool IsUserBlurApplied() => background.CurrentBlur == new Vector2((float)BlurLevel.Value * BackgroundScreenBeatmap.USER_BLUR_FACTOR);
 
-            public bool IsUserBlurDisabled() => ((FadeAccessibleBackground)Background).CurrentBlur == new Vector2(0);
+            public bool IsUserBlurDisabled() => background.CurrentBlur == new Vector2(0);
 
-            public bool IsBackgroundInvisible() => ((FadeAccessibleBackground)Background).CurrentAlpha == 0;
+            public bool IsBackgroundInvisible() => background.CurrentAlpha == 0;
 
-            public bool IsBackgroundVisible() => ((FadeAccessibleBackground)Background).CurrentAlpha == 1;
+            public bool IsBackgroundVisible() => background.CurrentAlpha == 1;
 
-            public bool IsBlurCorrect() => ((FadeAccessibleBackground)Background).CurrentBlur == new Vector2(BACKGROUND_BLUR);
+            public bool IsBlurCorrect() => background.CurrentBlur == new Vector2(BACKGROUND_BLUR);
+
+            public bool CheckBackgroundBlur(Vector2 expected) => background.CurrentBlur == expected;
 
             /// <summary>
             /// Make sure every time a screen gets pushed, the background doesn't get replaced
             /// </summary>
             /// <returns>Whether or not the original background (The one created in DummySongSelect) is still the current background</returns>
-            public bool IsBackgroundCurrent() => ((FadeAccessibleBackground)Background).IsCurrentScreen();
+            public bool IsBackgroundCurrent() => background?.IsCurrentScreen() == true;
         }
 
         private class FadeAccessibleResults : ResultsScreen
         {
+            private FadeAccessibleBackground background;
+
             public FadeAccessibleResults(ScoreInfo score)
                 : base(score, true)
             {
             }
 
-            protected override BackgroundScreen CreateBackground() => new FadeAccessibleBackground(Beatmap.Value);
+            protected override BackgroundScreen CreateBackground() => background = new FadeAccessibleBackground(Beatmap.Value);
 
-            public bool IsBlurCorrect() => ((FadeAccessibleBackground)Background).CurrentBlur == new Vector2(BACKGROUND_BLUR);
+            public Vector2 ExpectedBackgroundBlur => new Vector2(BACKGROUND_BLUR);
         }
 
         private class LoadBlockingTestPlayer : TestPlayer
         {
-            protected override BackgroundScreen CreateBackground() => new FadeAccessibleBackground(Beatmap.Value);
+            protected override BackgroundScreen CreateBackground() =>
+                new FadeAccessibleBackground(Beatmap.Value);
+
+            public override void OnEntering(IScreen last)
+            {
+                base.OnEntering(last);
+
+                ApplyToBackground(b => ReplacesBackground.BindTo(b.StoryboardReplacesBackground));
+            }
 
             public new DimmableStoryboard DimmableStoryboard => base.DimmableStoryboard;
 
@@ -354,15 +370,16 @@ namespace osu.Game.Tests.Visual.Background
                     Thread.Sleep(1);
 
                 StoryboardEnabled = config.GetBindable<bool>(OsuSetting.ShowStoryboard);
-                ReplacesBackground.BindTo(Background.StoryboardReplacesBackground);
                 DrawableRuleset.IsPaused.BindTo(IsPaused);
             }
         }
 
         private class TestPlayerLoader : PlayerLoader
         {
+            private FadeAccessibleBackground background;
+
             public VisualSettings VisualSettingsPos => VisualSettings;
-            public BackgroundScreen ScreenPos => Background;
+            public BackgroundScreen ScreenPos => background;
 
             public TestPlayerLoader(Player player)
                 : base(() => player)
@@ -371,9 +388,9 @@ namespace osu.Game.Tests.Visual.Background
 
             public void TriggerOnHover() => OnHover(new HoverEvent(new InputState()));
 
-            public bool IsBlurCorrect() => ((FadeAccessibleBackground)Background).CurrentBlur == new Vector2(BACKGROUND_BLUR);
+            public Vector2 ExpectedBackgroundBlur => new Vector2(BACKGROUND_BLUR);
 
-            protected override BackgroundScreen CreateBackground() => new FadeAccessibleBackground(Beatmap.Value);
+            protected override BackgroundScreen CreateBackground() => background = new FadeAccessibleBackground(Beatmap.Value);
         }
 
         private class FadeAccessibleBackground : BackgroundScreenBeatmap
diff --git a/osu.Game/Rulesets/Mods/ModCinema.cs b/osu.Game/Rulesets/Mods/ModCinema.cs
index cf8128301c..bee9e56edd 100644
--- a/osu.Game/Rulesets/Mods/ModCinema.cs
+++ b/osu.Game/Rulesets/Mods/ModCinema.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Mods
 
         public void ApplyToPlayer(Player player)
         {
-            player.Background.EnableUserDim.Value = false;
+            player.ApplyToBackground(b => b.EnableUserDim.Value = false);
 
             player.DimmableStoryboard.IgnoreUserSettings.Value = true;
 
diff --git a/osu.Game/Screens/BackgroundScreen.cs b/osu.Game/Screens/BackgroundScreen.cs
index 0f3615b7a9..ea220c2f82 100644
--- a/osu.Game/Screens/BackgroundScreen.cs
+++ b/osu.Game/Screens/BackgroundScreen.cs
@@ -34,6 +34,8 @@ namespace osu.Game.Screens
             return false;
         }
 
+        public void ApplyToBackground(Action<BackgroundScreen> action) => Schedule(() => action.Invoke(this));
+
         protected override void Update()
         {
             base.Update();
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 223c678fba..8c34cb2e08 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -444,11 +444,14 @@ namespace osu.Game.Screens.Edit
         {
             base.OnEntering(last);
 
-            // todo: temporary. we want to be applying dim using the UserDimContainer eventually.
-            Background.FadeColour(Color4.DarkGray, 500);
+            ApplyToBackground(b =>
+            {
+                // todo: temporary. we want to be applying dim using the UserDimContainer eventually.
+                b.FadeColour(Color4.DarkGray, 500);
 
-            Background.EnableUserDim.Value = false;
-            Background.BlurAmount.Value = 0;
+                b.EnableUserDim.Value = false;
+                b.BlurAmount.Value = 0;
+            });
 
             resetTrack(true);
         }
@@ -480,7 +483,7 @@ namespace osu.Game.Screens.Edit
                 }
             }
 
-            Background.FadeColour(Color4.White, 500);
+            ApplyToBackground(b => b.FadeColour(Color4.White, 500));
             resetTrack();
 
             return base.OnExiting(next);
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 9d5720ff34..97fd58318b 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -127,11 +127,11 @@ namespace osu.Game.Screens.Menu
                 {
                     case ButtonSystemState.Initial:
                     case ButtonSystemState.Exit:
-                        Background.FadeColour(Color4.White, 500, Easing.OutSine);
+                        ApplyToBackground(b => b.FadeColour(Color4.White, 500, Easing.OutSine));
                         break;
 
                     default:
-                        Background.FadeColour(OsuColour.Gray(0.8f), 500, Easing.OutSine);
+                        ApplyToBackground(b => b.FadeColour(OsuColour.Gray(0.8f), 500, Easing.OutSine));
                         break;
                 }
             };
@@ -256,7 +256,7 @@ namespace osu.Game.Screens.Menu
         {
             base.OnResuming(last);
 
-            (Background as BackgroundScreenDefault)?.Next();
+            ApplyToBackground(b => (b as BackgroundScreenDefault)?.Next());
 
             // we may have consumed our preloaded instance, so let's make another.
             preloadSongSelect();
diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index 851aedd84f..c97c0aef2b 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -114,9 +114,14 @@ namespace osu.Game.Screens
             Mods = screenDependencies.Mods;
         }
 
-        protected BackgroundScreen Background => backgroundStack?.CurrentScreen as BackgroundScreen;
+        public void ApplyToBackground(Action<BackgroundScreen> action) => background.ApplyToBackground(action);
 
-        private BackgroundScreen localBackground;
+        /// <summary>
+        /// The background created and owned by this screen. May be null if the background didn't change.
+        /// </summary>
+        private BackgroundScreen ownedBackground;
+
+        private BackgroundScreen background;
 
         [Resolved(canBeNull: true)]
         private BackgroundScreenStack backgroundStack { get; set; }
@@ -160,7 +165,15 @@ namespace osu.Game.Screens
         {
             applyArrivingDefaults(false);
 
-            backgroundStack?.Push(localBackground = CreateBackground());
+            backgroundStack?.Push(ownedBackground = CreateBackground());
+
+            background = backgroundStack?.CurrentScreen as BackgroundScreen;
+
+            if (background != ownedBackground)
+            {
+                // background may have not been replaced, at which point we don't want to track the background lifetime.
+                ownedBackground = null;
+            }
 
             base.OnEntering(last);
         }
@@ -173,7 +186,7 @@ namespace osu.Game.Screens
             if (base.OnExiting(next))
                 return true;
 
-            if (localBackground != null && backgroundStack?.CurrentScreen == localBackground)
+            if (ownedBackground != null && backgroundStack?.CurrentScreen == ownedBackground)
                 backgroundStack?.Exit();
 
             return false;
diff --git a/osu.Game/Screens/Play/EpilepsyWarning.cs b/osu.Game/Screens/Play/EpilepsyWarning.cs
index dc42427fbf..89e25d849f 100644
--- a/osu.Game/Screens/Play/EpilepsyWarning.cs
+++ b/osu.Game/Screens/Play/EpilepsyWarning.cs
@@ -24,7 +24,19 @@ namespace osu.Game.Screens.Play
             Alpha = 0f;
         }
 
-        public BackgroundScreenBeatmap DimmableBackground { get; set; }
+        private BackgroundScreenBeatmap dimmableBackground;
+
+        public BackgroundScreenBeatmap DimmableBackground
+        {
+            get => dimmableBackground;
+            set
+            {
+                dimmableBackground = value;
+
+                if (IsLoaded)
+                    updateBackgroundFade();
+            }
+        }
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours, IBindable<WorkingBeatmap> beatmap)
@@ -75,11 +87,16 @@ namespace osu.Game.Screens.Play
 
         protected override void PopIn()
         {
-            DimmableBackground?.FadeColour(OsuColour.Gray(0.5f), FADE_DURATION, Easing.OutQuint);
+            updateBackgroundFade();
 
             this.FadeIn(FADE_DURATION, Easing.OutQuint);
         }
 
+        private void updateBackgroundFade()
+        {
+            DimmableBackground?.FadeColour(OsuColour.Gray(0.5f), FADE_DURATION, Easing.OutQuint);
+        }
+
         protected override void PopOut() => this.FadeOut(FADE_DURATION);
     }
 }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index bf2e6f5379..1fcbed7ef7 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -721,15 +721,20 @@ namespace osu.Game.Screens.Play
                 .Delay(250)
                 .FadeIn(250);
 
-            Background.EnableUserDim.Value = true;
-            Background.BlurAmount.Value = 0;
+            ApplyToBackground(b =>
+            {
+                b.EnableUserDim.Value = true;
+                b.BlurAmount.Value = 0;
+
+                // bind component bindables.
+                b.IsBreakTime.BindTo(breakTracker.IsBreakTime);
+
+                b.StoryboardReplacesBackground.BindTo(storyboardReplacesBackground);
+            });
 
-            // bind component bindables.
-            Background.IsBreakTime.BindTo(breakTracker.IsBreakTime);
             HUDOverlay.IsBreakTime.BindTo(breakTracker.IsBreakTime);
             DimmableStoryboard.IsBreakTime.BindTo(breakTracker.IsBreakTime);
 
-            Background.StoryboardReplacesBackground.BindTo(storyboardReplacesBackground);
             DimmableStoryboard.StoryboardReplacesBackground.BindTo(storyboardReplacesBackground);
 
             storyboardReplacesBackground.Value = Beatmap.Value.Storyboard.ReplacesBackground && Beatmap.Value.Storyboard.HasDrawable;
@@ -875,7 +880,7 @@ namespace osu.Game.Screens.Play
             float fadeOutDuration = instant ? 0 : 250;
             this.FadeOut(fadeOutDuration);
 
-            Background.EnableUserDim.Value = false;
+            ApplyToBackground(b => b.EnableUserDim.Value = false);
             storyboardReplacesBackground.Value = false;
         }
 
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index f59b36bc42..5b4bd11216 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Screens.Play
 
                 backgroundBrightnessReduction = value;
 
-                Background.FadeColour(OsuColour.Gray(backgroundBrightnessReduction ? 0.8f : 1), 200);
+                ApplyToBackground(b => b.FadeColour(OsuColour.Gray(backgroundBrightnessReduction ? 0.8f : 1), 200));
             }
         }
 
@@ -176,12 +176,17 @@ namespace osu.Game.Screens.Play
         {
             base.OnEntering(last);
 
-            if (epilepsyWarning != null)
-                epilepsyWarning.DimmableBackground = Background;
+            ApplyToBackground(b =>
+            {
+                if (epilepsyWarning != null)
+                    epilepsyWarning.DimmableBackground = b;
+
+                b?.FadeColour(Color4.White, 800, Easing.OutQuint);
+            });
+
             Beatmap.Value.Track.AddAdjustment(AdjustableProperty.Volume, volumeAdjustment);
 
             content.ScaleTo(0.7f);
-            Background?.FadeColour(Color4.White, 800, Easing.OutQuint);
 
             contentIn();
 
@@ -225,7 +230,8 @@ namespace osu.Game.Screens.Play
             content.ScaleTo(0.7f, 150, Easing.InQuint);
             this.FadeOut(150);
 
-            Background.EnableUserDim.Value = false;
+            ApplyToBackground(b => b.EnableUserDim.Value = false);
+
             BackgroundBrightnessReduction = false;
             Beatmap.Value.Track.RemoveAdjustment(AdjustableProperty.Volume, volumeAdjustment);
 
@@ -270,16 +276,22 @@ namespace osu.Game.Screens.Play
             if (inputManager.HoveredDrawables.Contains(VisualSettings))
             {
                 // Preview user-defined background dim and blur when hovered on the visual settings panel.
-                Background.EnableUserDim.Value = true;
-                Background.BlurAmount.Value = 0;
+                ApplyToBackground(b =>
+                {
+                    b.EnableUserDim.Value = true;
+                    b.BlurAmount.Value = 0;
+                });
 
                 BackgroundBrightnessReduction = false;
             }
             else
             {
-                // Returns background dim and blur to the values specified by PlayerLoader.
-                Background.EnableUserDim.Value = false;
-                Background.BlurAmount.Value = BACKGROUND_BLUR;
+                ApplyToBackground(b =>
+                {
+                    // Returns background dim and blur to the values specified by PlayerLoader.
+                    b.EnableUserDim.Value = false;
+                    b.BlurAmount.Value = BACKGROUND_BLUR;
+                });
 
                 BackgroundBrightnessReduction = true;
             }
diff --git a/osu.Game/Screens/Play/ScreenWithBeatmapBackground.cs b/osu.Game/Screens/Play/ScreenWithBeatmapBackground.cs
index 8eb253608b..88dab88d42 100644
--- a/osu.Game/Screens/Play/ScreenWithBeatmapBackground.cs
+++ b/osu.Game/Screens/Play/ScreenWithBeatmapBackground.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.Screens.Backgrounds;
 
 namespace osu.Game.Screens.Play
@@ -9,6 +10,6 @@ namespace osu.Game.Screens.Play
     {
         protected override BackgroundScreen CreateBackground() => new BackgroundScreenBeatmap(Beatmap.Value);
 
-        public new BackgroundScreenBeatmap Background => (BackgroundScreenBeatmap)base.Background;
+        public void ApplyToBackground(Action<BackgroundScreenBeatmap> action) => base.ApplyToBackground(b => action.Invoke((BackgroundScreenBeatmap)b));
     }
 }
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 98794627fe..c1f5d92d17 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -18,7 +18,6 @@ using osu.Game.Input.Bindings;
 using osu.Game.Online.API;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
-using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking.Statistics;
 using osuTK;
@@ -235,15 +234,18 @@ namespace osu.Game.Screens.Ranking
         {
             base.OnEntering(last);
 
-            ((BackgroundScreenBeatmap)Background).BlurAmount.Value = BACKGROUND_BLUR;
+            ApplyToBackground(b =>
+            {
+                b.BlurAmount.Value = BACKGROUND_BLUR;
+                b.FadeTo(0.5f, 250);
+            });
 
-            Background.FadeTo(0.5f, 250);
             bottomPanel.FadeTo(1, 250);
         }
 
         public override bool OnExiting(IScreen next)
         {
-            Background.FadeTo(1, 250);
+            ApplyToBackground(b => b.FadeTo(1, 250));
 
             return base.OnExiting(next);
         }
@@ -293,7 +295,7 @@ namespace osu.Game.Screens.Ranking
                 ScorePanelList.HandleInput = false;
 
                 // Dim background.
-                Background.FadeTo(0.1f, 150);
+                ApplyToBackground(b => b.FadeTo(0.1f, 150));
 
                 detachedPanel = expandedPanel;
             }
@@ -317,7 +319,7 @@ namespace osu.Game.Screens.Ranking
                 ScorePanelList.HandleInput = true;
 
                 // Un-dim background.
-                Background.FadeTo(0.5f, 150);
+                ApplyToBackground(b => b.FadeTo(0.5f, 150));
 
                 detachedPanel = null;
             }
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 50a1dd6edf..3c255011c9 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -19,7 +19,6 @@ using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.Select.Options;
@@ -38,6 +37,7 @@ using osu.Game.Collections;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Scoring;
 using System.Diagnostics;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Screens.Select
 {
@@ -682,12 +682,12 @@ namespace osu.Game.Screens.Select
         /// <param name="beatmap">The working beatmap.</param>
         private void updateComponentFromBeatmap(WorkingBeatmap beatmap)
         {
-            if (Background is BackgroundScreenBeatmap backgroundModeBeatmap)
+            ApplyToBackground(backgroundModeBeatmap =>
             {
                 backgroundModeBeatmap.Beatmap = beatmap;
                 backgroundModeBeatmap.BlurAmount.Value = BACKGROUND_BLUR;
                 backgroundModeBeatmap.FadeColour(Color4.White, 250);
-            }
+            });
 
             beatmapInfoWedge.Beatmap = beatmap;
 

From 5904e426ebf666ce8191ec5902389adc9f25b1b7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Jan 2021 16:00:25 +0900
Subject: [PATCH 0761/3722] Remove unused variable

---
 .../Visual/Background/TestSceneUserDimBackgrounds.cs          | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
index b5df3285f0..7ade7725d9 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
@@ -323,14 +323,12 @@ namespace osu.Game.Tests.Visual.Background
 
         private class FadeAccessibleResults : ResultsScreen
         {
-            private FadeAccessibleBackground background;
-
             public FadeAccessibleResults(ScoreInfo score)
                 : base(score, true)
             {
             }
 
-            protected override BackgroundScreen CreateBackground() => background = new FadeAccessibleBackground(Beatmap.Value);
+            protected override BackgroundScreen CreateBackground() => new FadeAccessibleBackground(Beatmap.Value);
 
             public Vector2 ExpectedBackgroundBlur => new Vector2(BACKGROUND_BLUR);
         }

From 57a8cd74615765e54d60a425f904a4034045b1a0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Jan 2021 16:17:55 +0900
Subject: [PATCH 0762/3722] Schedule deselection operations for safety

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

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index d00a365dde..47b101c2b0 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -104,7 +104,7 @@ namespace osu.Game.Overlays.Mods
         /// </summary>
         /// <param name="modTypes">The types of <see cref="Mod"/>s which should be deselected.</param>
         /// <param name="immediate">Set to true to bypass animations and update selections immediately.</param>
-        public void DeselectTypes(IEnumerable<Type> modTypes, bool immediate = false)
+        public void DeselectTypes(IEnumerable<Type> modTypes, bool immediate = false) => Schedule(() =>
         {
             int delay = 0;
 
@@ -124,7 +124,7 @@ namespace osu.Game.Overlays.Mods
                     }
                 }
             }
-        }
+        });
 
         /// <summary>
         /// Select one or more mods in this section and deselects all other ones.

From 9bac791a576a0b16860f3addb3ef3a451d166d1c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Jan 2021 16:17:42 +0900
Subject: [PATCH 0763/3722] Fix deselection of autoplay mod failing

---
 osu.Game/Screens/Select/PlaySongSelect.cs | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index 50a61ed4c2..e61d5cce85 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -9,6 +9,7 @@ using osu.Framework.Screens;
 using osu.Game.Graphics;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
@@ -42,6 +43,8 @@ namespace osu.Game.Screens.Select
 
         protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea();
 
+        private ModAutoplay getAutoplayMod() => Ruleset.Value.CreateInstance().GetAutoplayMod();
+
         public override void OnResuming(IScreen last)
         {
             base.OnResuming(last);
@@ -50,10 +53,10 @@ namespace osu.Game.Screens.Select
 
             if (removeAutoModOnResume)
             {
-                var autoType = Ruleset.Value.CreateInstance().GetAutoplayMod()?.GetType();
+                var autoType = getAutoplayMod()?.GetType();
 
                 if (autoType != null)
-                    ModSelect.DeselectTypes(new[] { autoType }, true);
+                    Mods.Value = Mods.Value.Where(m => m.GetType() != autoType).ToArray();
 
                 removeAutoModOnResume = false;
             }
@@ -81,12 +84,9 @@ namespace osu.Game.Screens.Select
             // Ctrl+Enter should start map with autoplay enabled.
             if (GetContainingInputManager().CurrentState?.Keyboard.ControlPressed == true)
             {
-                var auto = Ruleset.Value.CreateInstance().GetAutoplayMod();
-                var autoType = auto?.GetType();
+                var autoplayMod = getAutoplayMod();
 
-                var mods = Mods.Value;
-
-                if (autoType == null)
+                if (autoplayMod == null)
                 {
                     notifications?.Post(new SimpleNotification
                     {
@@ -95,9 +95,11 @@ namespace osu.Game.Screens.Select
                     return false;
                 }
 
-                if (mods.All(m => m.GetType() != autoType))
+                var mods = Mods.Value;
+
+                if (mods.All(m => m.GetType() != autoplayMod.GetType()))
                 {
-                    Mods.Value = mods.Append(auto).ToArray();
+                    Mods.Value = mods.Append(autoplayMod).ToArray();
                     removeAutoModOnResume = true;
                 }
             }

From 4d6c13f169cc7c09c4db61bbfdfd780c5b44fef5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Jan 2021 16:18:13 +0900
Subject: [PATCH 0764/3722] Privatise ModSelectOverlay methods that may be
 unsafe to be called externally

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 34f5c70adb..491052fa2c 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -249,7 +249,7 @@ namespace osu.Game.Overlays.Mods
                                             {
                                                 Width = 180,
                                                 Text = "Deselect All",
-                                                Action = DeselectAll,
+                                                Action = deselectAll,
                                                 Origin = Anchor.CentreLeft,
                                                 Anchor = Anchor.CentreLeft,
                                             },
@@ -318,7 +318,7 @@ namespace osu.Game.Overlays.Mods
             sampleOff = audio.Samples.Get(@"UI/check-off");
         }
 
-        public void DeselectAll()
+        private void deselectAll()
         {
             foreach (var section in ModSectionsContainer.Children)
                 section.DeselectAll();
@@ -331,7 +331,7 @@ namespace osu.Game.Overlays.Mods
         /// </summary>
         /// <param name="modTypes">The types of <see cref="Mod"/>s which should be deselected.</param>
         /// <param name="immediate">Set to true to bypass animations and update selections immediately.</param>
-        public void DeselectTypes(Type[] modTypes, bool immediate = false)
+        private void deselectTypes(Type[] modTypes, bool immediate = false)
         {
             if (modTypes.Length == 0) return;
 
@@ -438,7 +438,7 @@ namespace osu.Game.Overlays.Mods
             {
                 if (State.Value == Visibility.Visible) sampleOn?.Play();
 
-                DeselectTypes(selectedMod.IncompatibleMods, true);
+                deselectTypes(selectedMod.IncompatibleMods, true);
 
                 if (selectedMod.RequiresConfiguration) ModSettingsContainer.Show();
             }

From 5d8c153c1e21949156a0dbf54b9cf8d71bca4c4d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Jan 2021 16:41:03 +0900
Subject: [PATCH 0765/3722] Move schedule logic to buttons rather than section

It turns out there's some quite convoluted scheduling / order of
execution requirements of ModSelectOverlay and ModSection. Applying
scheduling causes a runaway condition ending in zero frames after many
mod button changes.

I wanted to avoid rewriting the whole component, so have just moved the
schedule to guard against the part where drawables are actually changed.
---
 osu.Game/Overlays/Mods/ModButton.cs  | 62 +++++++++++++++-------------
 osu.Game/Overlays/Mods/ModSection.cs |  8 ++--
 2 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index e574828cd2..51c8bcf9a9 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -64,41 +64,45 @@ namespace osu.Game.Overlays.Mods
             if (newIndex >= 0 && !Mods[newIndex].HasImplementation)
                 return false;
 
-            selectedIndex = newIndex;
-            Mod modAfter = SelectedMod ?? Mods[0];
-
-            if (beforeSelected != Selected)
+            Schedule(() =>
             {
-                iconsContainer.RotateTo(Selected ? 5f : 0f, 300, Easing.OutElastic);
-                iconsContainer.ScaleTo(Selected ? 1.1f : 1f, 300, Easing.OutElastic);
-            }
+                selectedIndex = newIndex;
+                Mod modAfter = SelectedMod ?? Mods[0];
 
-            if (modBefore != modAfter)
-            {
-                const float rotate_angle = 16;
-
-                foregroundIcon.RotateTo(rotate_angle * direction, mod_switch_duration, mod_switch_easing);
-                backgroundIcon.RotateTo(-rotate_angle * direction, mod_switch_duration, mod_switch_easing);
-
-                backgroundIcon.Mod = modAfter;
-
-                using (BeginDelayedSequence(mod_switch_duration, true))
+                if (beforeSelected != Selected)
                 {
-                    foregroundIcon
-                        .RotateTo(-rotate_angle * direction)
-                        .RotateTo(0f, mod_switch_duration, mod_switch_easing);
-
-                    backgroundIcon
-                        .RotateTo(rotate_angle * direction)
-                        .RotateTo(0f, mod_switch_duration, mod_switch_easing);
-
-                    Schedule(() => displayMod(modAfter));
+                    iconsContainer.RotateTo(Selected ? 5f : 0f, 300, Easing.OutElastic);
+                    iconsContainer.ScaleTo(Selected ? 1.1f : 1f, 300, Easing.OutElastic);
                 }
-            }
 
-            foregroundIcon.Selected.Value = Selected;
+                if (modBefore != modAfter)
+                {
+                    const float rotate_angle = 16;
+
+                    foregroundIcon.RotateTo(rotate_angle * direction, mod_switch_duration, mod_switch_easing);
+                    backgroundIcon.RotateTo(-rotate_angle * direction, mod_switch_duration, mod_switch_easing);
+
+                    backgroundIcon.Mod = modAfter;
+
+                    using (BeginDelayedSequence(mod_switch_duration, true))
+                    {
+                        foregroundIcon
+                            .RotateTo(-rotate_angle * direction)
+                            .RotateTo(0f, mod_switch_duration, mod_switch_easing);
+
+                        backgroundIcon
+                            .RotateTo(rotate_angle * direction)
+                            .RotateTo(0f, mod_switch_duration, mod_switch_easing);
+
+                        Schedule(() => displayMod(modAfter));
+                    }
+                }
+
+                foregroundIcon.Selected.Value = Selected;
+
+                SelectionChanged?.Invoke(SelectedMod);
+            });
 
-            SelectionChanged?.Invoke(SelectedMod);
             return true;
         }
 
diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 47b101c2b0..0107f94dcf 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -104,7 +104,7 @@ namespace osu.Game.Overlays.Mods
         /// </summary>
         /// <param name="modTypes">The types of <see cref="Mod"/>s which should be deselected.</param>
         /// <param name="immediate">Set to true to bypass animations and update selections immediately.</param>
-        public void DeselectTypes(IEnumerable<Type> modTypes, bool immediate = false) => Schedule(() =>
+        public void DeselectTypes(IEnumerable<Type> modTypes, bool immediate = false)
         {
             int delay = 0;
 
@@ -124,13 +124,13 @@ namespace osu.Game.Overlays.Mods
                     }
                 }
             }
-        });
+        }
 
         /// <summary>
         /// Select one or more mods in this section and deselects all other ones.
         /// </summary>
         /// <param name="modTypes">The types of <see cref="Mod"/>s which should be selected.</param>
-        public void SelectTypes(IEnumerable<Type> modTypes) => Schedule(() =>
+        public void SelectTypes(IEnumerable<Type> modTypes)
         {
             foreach (var button in buttons)
             {
@@ -141,7 +141,7 @@ namespace osu.Game.Overlays.Mods
                 else
                     button.Deselect();
             }
-        });
+        }
 
         protected ModSection()
         {

From 54982dcdd7e46ee8081f176ebc07b9037e0bfd5c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 4 Jan 2021 22:42:39 +0900
Subject: [PATCH 0766/3722] Refactor LoadingLayer to avoid applying effects to
 external drawables

In theory this seemed like a good idea (and an optimisation in some
cases, due to lower fill rate), but in practice this leads to weird edge
cases.

This aims to do away with the operations on external drawables by
applying a dim to the area behind the `LoadingLayer` when required.
I went over each usage and ensured they look as good or better than
previously.

The specific bad usage here was the restoration of the colour on dispose
(if the `LoadingLayer` was disposed in a still-visible state).

I'm aware that the `BeatmapListingOverlay` will now dim completely during
load. I think this is fine for the time being.
---
 .../UserInterface/TestSceneLoadingLayer.cs    |  10 +-
 .../Graphics/UserInterface/LoadingLayer.cs    |  29 +-
 .../Overlays/AccountCreation/ScreenEntry.cs   |   2 +-
 osu.Game/Overlays/BeatmapListingOverlay.cs    |   8 +-
 .../BeatmapSet/Buttons/FavouriteButton.cs     |   2 +-
 .../BeatmapSet/Scores/ScoresContainer.cs      |  10 +-
 .../Dashboard/Friends/FriendDisplay.cs        |   2 +-
 osu.Game/Overlays/DashboardOverlay.cs         |   2 +-
 osu.Game/Overlays/NewsOverlay.cs              |   2 +-
 .../Overlays/Rankings/SpotlightsLayout.cs     |   3 +-
 osu.Game/Overlays/RankingsOverlay.cs          |   6 +-
 .../OnlinePlay/Lounge/LoungeSubScreen.cs      |   2 +-
 .../Match/MultiplayerMatchSettingsOverlay.cs  | 279 ++++++------
 .../Multiplayer/MultiplayerMatchSongSelect.cs |   2 +-
 .../Multiplayer/MultiplayerPlayer.cs          |   2 +-
 .../PlaylistsMatchSettingsOverlay.cs          | 409 +++++++++---------
 .../Screens/Play/BeatmapMetadataDisplay.cs    |   2 +-
 osu.Game/Screens/Select/BeatmapDetails.cs     |   6 +-
 18 files changed, 389 insertions(+), 389 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingLayer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingLayer.cs
index 1be191fc29..a694595115 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingLayer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingLayer.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 NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -14,11 +15,12 @@ namespace osu.Game.Tests.Visual.UserInterface
 {
     public class TestSceneLoadingLayer : OsuTestScene
     {
-        private Drawable dimContent;
         private LoadingLayer overlay;
 
         private Container content;
 
+        private Drawable dimContent => overlay.Children.OfType<Box>().First();
+
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
@@ -29,14 +31,14 @@ namespace osu.Game.Tests.Visual.UserInterface
                     Size = new Vector2(300),
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Children = new[]
+                    Children = new Drawable[]
                     {
                         new Box
                         {
                             Colour = Color4.SlateGray,
                             RelativeSizeAxes = Axes.Both,
                         },
-                        dimContent = new FillFlowContainer
+                        new FillFlowContainer
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
@@ -51,7 +53,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                                 new TriangleButton { Text = "puush me", Width = 200, Action = () => { } },
                             }
                         },
-                        overlay = new LoadingLayer(dimContent),
+                        overlay = new LoadingLayer(true),
                     }
                 },
             };
diff --git a/osu.Game/Graphics/UserInterface/LoadingLayer.cs b/osu.Game/Graphics/UserInterface/LoadingLayer.cs
index c8c4424bee..6aca30328a 100644
--- a/osu.Game/Graphics/UserInterface/LoadingLayer.cs
+++ b/osu.Game/Graphics/UserInterface/LoadingLayer.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osuTK;
 using osuTK.Graphics;
@@ -17,22 +18,31 @@ namespace osu.Game.Graphics.UserInterface
     /// </summary>
     public class LoadingLayer : LoadingSpinner
     {
-        private readonly Drawable dimTarget;
+        private readonly Box backgroundDimLayer;
 
         /// <summary>
-        /// Constuct a new loading spinner.
+        /// Construct a new loading spinner.
         /// </summary>
-        /// <param name="dimTarget">An optional target to dim when displayed.</param>
+        /// <param name="dimBackground">Whether the full background area should be dimmed while loading.</param>
         /// <param name="withBox">Whether the spinner should have a surrounding black box for visibility.</param>
-        public LoadingLayer(Drawable dimTarget = null, bool withBox = true)
+        public LoadingLayer(bool dimBackground = false, bool withBox = true)
             : base(withBox)
         {
             RelativeSizeAxes = Axes.Both;
             Size = new Vector2(1);
 
-            this.dimTarget = dimTarget;
-
             MainContents.RelativeSizeAxes = Axes.None;
+
+            if (dimBackground)
+            {
+                AddInternal(backgroundDimLayer = new Box
+                {
+                    Depth = float.MaxValue,
+                    Colour = Color4.Black,
+                    Alpha = 0,
+                    RelativeSizeAxes = Axes.Both,
+                });
+            }
         }
 
         public override bool HandleNonPositionalInput => false;
@@ -56,19 +66,20 @@ namespace osu.Game.Graphics.UserInterface
 
         protected override void PopIn()
         {
-            dimTarget?.FadeColour(OsuColour.Gray(0.5f), TRANSITION_DURATION, Easing.OutQuint);
+            backgroundDimLayer?.FadeTo(0.5f, TRANSITION_DURATION * 2, Easing.OutQuint);
             base.PopIn();
         }
 
         protected override void PopOut()
         {
-            dimTarget?.FadeColour(Color4.White, TRANSITION_DURATION, Easing.OutQuint);
+            backgroundDimLayer?.FadeOut(TRANSITION_DURATION, Easing.OutQuint);
             base.PopOut();
         }
 
         protected override void Update()
         {
             base.Update();
+
             MainContents.Size = new Vector2(Math.Clamp(Math.Min(DrawWidth, DrawHeight) * 0.25f, 30, 100));
         }
 
@@ -79,7 +90,7 @@ namespace osu.Game.Graphics.UserInterface
             if (State.Value == Visibility.Visible)
             {
                 // ensure we don't leave the target in a bad state.
-                dimTarget?.FadeColour(Color4.White, TRANSITION_DURATION, Easing.OutQuint);
+                // dimTarget?.FadeColour(Color4.White, TRANSITION_DURATION, Easing.OutQuint);
             }
         }
     }
diff --git a/osu.Game/Overlays/AccountCreation/ScreenEntry.cs b/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
index a0b1b27ebf..0d5538155a 100644
--- a/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
+++ b/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
@@ -124,7 +124,7 @@ namespace osu.Game.Overlays.AccountCreation
                         },
                     },
                 },
-                loadingLayer = new LoadingLayer(mainContent)
+                loadingLayer = new LoadingLayer(true)
             };
 
             textboxes = new[] { usernameTextBox, emailTextBox, passwordTextBox };
diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index 1e29e713af..0c9c995dd6 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -92,14 +92,14 @@ namespace osu.Game.Overlays
                                         {
                                             foundContent = new FillFlowContainer<BeatmapPanel>(),
                                             notFoundContent = new NotFoundDrawable(),
-                                            loadingLayer = new LoadingLayer(panelTarget)
                                         }
                                     }
-                                }
+                                },
                             },
                         }
-                    }
-                }
+                    },
+                },
+                loadingLayer = new LoadingLayer(true)
             };
         }
 
diff --git a/osu.Game/Overlays/BeatmapSet/Buttons/FavouriteButton.cs b/osu.Game/Overlays/BeatmapSet/Buttons/FavouriteButton.cs
index c983b337b5..7ad6906cea 100644
--- a/osu.Game/Overlays/BeatmapSet/Buttons/FavouriteButton.cs
+++ b/osu.Game/Overlays/BeatmapSet/Buttons/FavouriteButton.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
                     Size = new Vector2(18),
                     Shadow = false,
                 },
-                loading = new LoadingLayer(icon, false),
+                loading = new LoadingLayer(true, false),
             });
 
             Action = () =>
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
index 9a2dcd014a..b598b7d97f 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
@@ -157,11 +157,11 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                                         }
                                     }
                                 },
-                                loading = new LoadingLayer()
                             }
                         }
-                    }
-                }
+                    },
+                },
+                loading = new LoadingLayer()
             });
         }
 
@@ -228,7 +228,9 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             {
                 Scores = null;
                 notSupporterPlaceholder.Show();
+
                 loading.Hide();
+                loading.FinishTransforms();
                 return;
             }
 
@@ -241,6 +243,8 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             getScoresRequest.Success += scores =>
             {
                 loading.Hide();
+                loading.FinishTransforms();
+
                 Scores = scores;
 
                 if (!scores.Scores.Any())
diff --git a/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs b/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
index cc26a11da1..e6fe6ac749 100644
--- a/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
@@ -128,7 +128,7 @@ namespace osu.Game.Overlays.Dashboard.Friends
                                                 AutoSizeAxes = Axes.Y,
                                                 Padding = new MarginPadding { Horizontal = 50 }
                                             },
-                                            loading = new LoadingLayer(itemsPlaceholder)
+                                            loading = new LoadingLayer(true)
                                         }
                                     }
                                 }
diff --git a/osu.Game/Overlays/DashboardOverlay.cs b/osu.Game/Overlays/DashboardOverlay.cs
index 04defce636..03c320debe 100644
--- a/osu.Game/Overlays/DashboardOverlay.cs
+++ b/osu.Game/Overlays/DashboardOverlay.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Overlays
                         }
                     }
                 },
-                loading = new LoadingLayer(content),
+                loading = new LoadingLayer(true),
             };
         }
 
diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index c8c1db012f..5820d405d4 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Overlays
                         },
                     },
                 },
-                loading = new LoadingLayer(content),
+                loading = new LoadingLayer(true),
             };
         }
 
diff --git a/osu.Game/Overlays/Rankings/SpotlightsLayout.cs b/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
index 61339df76f..b16e0a4908 100644
--- a/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
+++ b/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
@@ -45,6 +45,7 @@ namespace osu.Game.Overlays.Rankings
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
+
             InternalChild = new ReverseChildIDFillFlowContainer<Drawable>
             {
                 RelativeSizeAxes = Axes.X,
@@ -68,7 +69,7 @@ namespace osu.Game.Overlays.Rankings
                                 AutoSizeAxes = Axes.Y,
                                 Margin = new MarginPadding { Vertical = 10 }
                             },
-                            loading = new LoadingLayer(content)
+                            loading = new LoadingLayer(true)
                         }
                     }
                 }
diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index ae6d49960a..25350e310a 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -42,6 +42,8 @@ namespace osu.Game.Overlays
                 Depth = -float.MaxValue
             })
         {
+            loading = new LoadingLayer(true);
+
             Children = new Drawable[]
             {
                 background = new Box
@@ -74,12 +76,12 @@ namespace osu.Game.Overlays
                                         RelativeSizeAxes = Axes.X,
                                         Margin = new MarginPadding { Bottom = 10 }
                                     },
-                                    loading = new LoadingLayer(contentContainer),
                                 }
                             }
                         }
                     }
-                }
+                },
+                loading
             };
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
index 79f5dfdee1..0f06188dc2 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
                                     Padding = new MarginPadding(10),
                                     Child = roomsContainer = new RoomsContainer { JoinRequested = joinRequested }
                                 },
-                                loadingLayer = new LoadingLayer(roomsContainer),
+                                loadingLayer = new LoadingLayer(true),
                             }
                         },
                         new RoomInspector
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
index ae03d384f6..67c6aa7add 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
@@ -71,201 +71,192 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             [BackgroundDependencyLoader]
             private void load(OsuColour colours)
             {
-                Container dimContent;
-
                 InternalChildren = new Drawable[]
                 {
-                    dimContent = new Container
+                    new Box
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Children = new Drawable[]
+                        Colour = Color4Extensions.FromHex(@"28242d"),
+                    },
+                    new GridContainer
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        RowDimensions = new[]
                         {
-                            new Box
+                            new Dimension(GridSizeMode.Distributed),
+                            new Dimension(GridSizeMode.AutoSize),
+                        },
+                        Content = new[]
+                        {
+                            new Drawable[]
                             {
-                                RelativeSizeAxes = Axes.Both,
-                                Colour = Color4Extensions.FromHex(@"28242d"),
-                            },
-                            new GridContainer
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                RowDimensions = new[]
+                                new OsuScrollContainer
                                 {
-                                    new Dimension(GridSizeMode.Distributed),
-                                    new Dimension(GridSizeMode.AutoSize),
-                                },
-                                Content = new[]
-                                {
-                                    new Drawable[]
+                                    Padding = new MarginPadding
                                     {
-                                        new OsuScrollContainer
+                                        Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING,
+                                        Vertical = 10
+                                    },
+                                    RelativeSizeAxes = Axes.Both,
+                                    Children = new[]
+                                    {
+                                        new FillFlowContainer
                                         {
-                                            Padding = new MarginPadding
+                                            RelativeSizeAxes = Axes.X,
+                                            AutoSizeAxes = Axes.Y,
+                                            Direction = FillDirection.Vertical,
+                                            Spacing = new Vector2(0, 10),
+                                            Children = new Drawable[]
                                             {
-                                                Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING,
-                                                Vertical = 10
-                                            },
-                                            RelativeSizeAxes = Axes.Both,
-                                            Children = new[]
-                                            {
-                                                new FillFlowContainer
+                                                new Container
                                                 {
+                                                    Anchor = Anchor.TopCentre,
+                                                    Origin = Anchor.TopCentre,
+                                                    Padding = new MarginPadding { Horizontal = WaveOverlayContainer.WIDTH_PADDING },
                                                     RelativeSizeAxes = Axes.X,
                                                     AutoSizeAxes = Axes.Y,
-                                                    Direction = FillDirection.Vertical,
-                                                    Spacing = new Vector2(0, 10),
                                                     Children = new Drawable[]
                                                     {
-                                                        new Container
+                                                        new SectionContainer
                                                         {
-                                                            Anchor = Anchor.TopCentre,
-                                                            Origin = Anchor.TopCentre,
-                                                            Padding = new MarginPadding { Horizontal = WaveOverlayContainer.WIDTH_PADDING },
-                                                            RelativeSizeAxes = Axes.X,
-                                                            AutoSizeAxes = Axes.Y,
-                                                            Children = new Drawable[]
+                                                            Padding = new MarginPadding { Right = FIELD_PADDING / 2 },
+                                                            Children = new[]
                                                             {
-                                                                new SectionContainer
+                                                                new Section("Room name")
                                                                 {
-                                                                    Padding = new MarginPadding { Right = FIELD_PADDING / 2 },
-                                                                    Children = new[]
+                                                                    Child = NameField = new SettingsTextBox
                                                                     {
-                                                                        new Section("Room name")
+                                                                        RelativeSizeAxes = Axes.X,
+                                                                        TabbableContentContainer = this,
+                                                                    },
+                                                                },
+                                                                new Section("Room visibility")
+                                                                {
+                                                                    Alpha = disabled_alpha,
+                                                                    Child = AvailabilityPicker = new RoomAvailabilityPicker
+                                                                    {
+                                                                        Enabled = { Value = false }
+                                                                    },
+                                                                },
+                                                                new Section("Game type")
+                                                                {
+                                                                    Alpha = disabled_alpha,
+                                                                    Child = new FillFlowContainer
+                                                                    {
+                                                                        AutoSizeAxes = Axes.Y,
+                                                                        RelativeSizeAxes = Axes.X,
+                                                                        Direction = FillDirection.Vertical,
+                                                                        Spacing = new Vector2(7),
+                                                                        Children = new Drawable[]
                                                                         {
-                                                                            Child = NameField = new SettingsTextBox
+                                                                            TypePicker = new GameTypePicker
                                                                             {
                                                                                 RelativeSizeAxes = Axes.X,
-                                                                                TabbableContentContainer = this,
-                                                                            },
-                                                                        },
-                                                                        new Section("Room visibility")
-                                                                        {
-                                                                            Alpha = disabled_alpha,
-                                                                            Child = AvailabilityPicker = new RoomAvailabilityPicker
-                                                                            {
                                                                                 Enabled = { Value = false }
                                                                             },
-                                                                        },
-                                                                        new Section("Game type")
-                                                                        {
-                                                                            Alpha = disabled_alpha,
-                                                                            Child = new FillFlowContainer
+                                                                            typeLabel = new OsuSpriteText
                                                                             {
-                                                                                AutoSizeAxes = Axes.Y,
-                                                                                RelativeSizeAxes = Axes.X,
-                                                                                Direction = FillDirection.Vertical,
-                                                                                Spacing = new Vector2(7),
-                                                                                Children = new Drawable[]
-                                                                                {
-                                                                                    TypePicker = new GameTypePicker
-                                                                                    {
-                                                                                        RelativeSizeAxes = Axes.X,
-                                                                                        Enabled = { Value = false }
-                                                                                    },
-                                                                                    typeLabel = new OsuSpriteText
-                                                                                    {
-                                                                                        Font = OsuFont.GetFont(size: 14),
-                                                                                        Colour = colours.Yellow
-                                                                                    },
-                                                                                },
+                                                                                Font = OsuFont.GetFont(size: 14),
+                                                                                Colour = colours.Yellow
                                                                             },
                                                                         },
                                                                     },
                                                                 },
-                                                                new SectionContainer
-                                                                {
-                                                                    Anchor = Anchor.TopRight,
-                                                                    Origin = Anchor.TopRight,
-                                                                    Padding = new MarginPadding { Left = FIELD_PADDING / 2 },
-                                                                    Children = new[]
-                                                                    {
-                                                                        new Section("Max participants")
-                                                                        {
-                                                                            Alpha = disabled_alpha,
-                                                                            Child = MaxParticipantsField = new SettingsNumberTextBox
-                                                                            {
-                                                                                RelativeSizeAxes = Axes.X,
-                                                                                TabbableContentContainer = this,
-                                                                                ReadOnly = true,
-                                                                            },
-                                                                        },
-                                                                        new Section("Password (optional)")
-                                                                        {
-                                                                            Alpha = disabled_alpha,
-                                                                            Child = new SettingsPasswordTextBox
-                                                                            {
-                                                                                RelativeSizeAxes = Axes.X,
-                                                                                TabbableContentContainer = this,
-                                                                                ReadOnly = true,
-                                                                            },
-                                                                        },
-                                                                    }
-                                                                }
                                                             },
                                                         },
-                                                        initialBeatmapControl = new BeatmapSelectionControl
+                                                        new SectionContainer
                                                         {
-                                                            Anchor = Anchor.TopCentre,
-                                                            Origin = Anchor.TopCentre,
-                                                            RelativeSizeAxes = Axes.X,
-                                                            Width = 0.5f
+                                                            Anchor = Anchor.TopRight,
+                                                            Origin = Anchor.TopRight,
+                                                            Padding = new MarginPadding { Left = FIELD_PADDING / 2 },
+                                                            Children = new[]
+                                                            {
+                                                                new Section("Max participants")
+                                                                {
+                                                                    Alpha = disabled_alpha,
+                                                                    Child = MaxParticipantsField = new SettingsNumberTextBox
+                                                                    {
+                                                                        RelativeSizeAxes = Axes.X,
+                                                                        TabbableContentContainer = this,
+                                                                        ReadOnly = true,
+                                                                    },
+                                                                },
+                                                                new Section("Password (optional)")
+                                                                {
+                                                                    Alpha = disabled_alpha,
+                                                                    Child = new SettingsPasswordTextBox
+                                                                    {
+                                                                        RelativeSizeAxes = Axes.X,
+                                                                        TabbableContentContainer = this,
+                                                                        ReadOnly = true,
+                                                                    },
+                                                                },
+                                                            }
                                                         }
-                                                    }
+                                                    },
+                                                },
+                                                initialBeatmapControl = new BeatmapSelectionControl
+                                                {
+                                                    Anchor = Anchor.TopCentre,
+                                                    Origin = Anchor.TopCentre,
+                                                    RelativeSizeAxes = Axes.X,
+                                                    Width = 0.5f
                                                 }
-                                            },
-                                        },
+                                            }
+                                        }
                                     },
-                                    new Drawable[]
+                                },
+                            },
+                            new Drawable[]
+                            {
+                                new Container
+                                {
+                                    Anchor = Anchor.BottomLeft,
+                                    Origin = Anchor.BottomLeft,
+                                    Y = 2,
+                                    RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
+                                    Children = new Drawable[]
                                     {
-                                        new Container
+                                        new Box
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                            Colour = Color4Extensions.FromHex(@"28242d").Darken(0.5f).Opacity(1f),
+                                        },
+                                        new FillFlowContainer
                                         {
-                                            Anchor = Anchor.BottomLeft,
-                                            Origin = Anchor.BottomLeft,
-                                            Y = 2,
                                             RelativeSizeAxes = Axes.X,
                                             AutoSizeAxes = Axes.Y,
+                                            Direction = FillDirection.Vertical,
+                                            Spacing = new Vector2(0, 20),
+                                            Margin = new MarginPadding { Vertical = 20 },
+                                            Padding = new MarginPadding { Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING },
                                             Children = new Drawable[]
                                             {
-                                                new Box
+                                                ApplyButton = new CreateOrUpdateButton
                                                 {
-                                                    RelativeSizeAxes = Axes.Both,
-                                                    Colour = Color4Extensions.FromHex(@"28242d").Darken(0.5f).Opacity(1f),
+                                                    Anchor = Anchor.BottomCentre,
+                                                    Origin = Anchor.BottomCentre,
+                                                    Size = new Vector2(230, 55),
+                                                    Enabled = { Value = false },
+                                                    Action = apply,
                                                 },
-                                                new FillFlowContainer
+                                                ErrorText = new OsuSpriteText
                                                 {
-                                                    RelativeSizeAxes = Axes.X,
-                                                    AutoSizeAxes = Axes.Y,
-                                                    Direction = FillDirection.Vertical,
-                                                    Spacing = new Vector2(0, 20),
-                                                    Margin = new MarginPadding { Vertical = 20 },
-                                                    Padding = new MarginPadding { Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING },
-                                                    Children = new Drawable[]
-                                                    {
-                                                        ApplyButton = new CreateOrUpdateButton
-                                                        {
-                                                            Anchor = Anchor.BottomCentre,
-                                                            Origin = Anchor.BottomCentre,
-                                                            Size = new Vector2(230, 55),
-                                                            Enabled = { Value = false },
-                                                            Action = apply,
-                                                        },
-                                                        ErrorText = new OsuSpriteText
-                                                        {
-                                                            Anchor = Anchor.BottomCentre,
-                                                            Origin = Anchor.BottomCentre,
-                                                            Alpha = 0,
-                                                            Depth = 1,
-                                                            Colour = colours.RedDark
-                                                        }
-                                                    }
+                                                    Anchor = Anchor.BottomCentre,
+                                                    Origin = Anchor.BottomCentre,
+                                                    Alpha = 0,
+                                                    Depth = 1,
+                                                    Colour = colours.RedDark
                                                 }
                                             }
                                         }
                                     }
                                 }
-                            },
+                            }
                         }
                     },
-                    loadingLayer = new LoadingLayer(dimContent)
+                    loadingLayer = new LoadingLayer(true)
                 };
 
                 TypePicker.Current.BindValueChanged(type => typeLabel.Text = type.NewValue?.Name ?? string.Empty, true);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index 72539a2e3a..36dbb9e792 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         [BackgroundDependencyLoader]
         private void load()
         {
-            AddInternal(loadingLayer = new LoadingLayer(Carousel));
+            AddInternal(loadingLayer = new LoadingLayer(true));
             initialBeatmap = Beatmap.Value;
             initialRuleset = Ruleset.Value;
             initialMods = Mods.Value.ToList();
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index 4247e954bd..4bee502e2e 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             // todo: this should be implemented via a custom HUD implementation, and correctly masked to the main content area.
             LoadComponentAsync(leaderboard = new MultiplayerGameplayLeaderboard(ScoreProcessor, userIds), HUDOverlay.Add);
 
-            HUDOverlay.Add(loadingDisplay = new LoadingLayer(DrawableRuleset) { Depth = float.MaxValue });
+            HUDOverlay.Add(loadingDisplay = new LoadingLayer(true) { Depth = float.MaxValue });
 
             if (Token == null)
                 return; // Todo: Somehow handle token retrieval failure.
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
index 6b92526f35..01f9920609 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
@@ -64,243 +64,234 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
             [BackgroundDependencyLoader]
             private void load(OsuColour colours)
             {
-                Container dimContent;
-
                 InternalChildren = new Drawable[]
                 {
-                    dimContent = new Container
+                    new Box
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Children = new Drawable[]
+                        Colour = Color4Extensions.FromHex(@"28242d"),
+                    },
+                    new GridContainer
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        RowDimensions = new[]
                         {
-                            new Box
+                            new Dimension(GridSizeMode.Distributed),
+                            new Dimension(GridSizeMode.AutoSize),
+                        },
+                        Content = new[]
+                        {
+                            new Drawable[]
                             {
-                                RelativeSizeAxes = Axes.Both,
-                                Colour = Color4Extensions.FromHex(@"28242d"),
-                            },
-                            new GridContainer
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                RowDimensions = new[]
+                                new OsuScrollContainer
                                 {
-                                    new Dimension(GridSizeMode.Distributed),
-                                    new Dimension(GridSizeMode.AutoSize),
-                                },
-                                Content = new[]
-                                {
-                                    new Drawable[]
+                                    Padding = new MarginPadding
                                     {
-                                        new OsuScrollContainer
-                                        {
-                                            Padding = new MarginPadding
-                                            {
-                                                Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING,
-                                                Vertical = 10
-                                            },
-                                            RelativeSizeAxes = Axes.Both,
-                                            Children = new[]
-                                            {
-                                                new Container
-                                                {
-                                                    Padding = new MarginPadding { Horizontal = WaveOverlayContainer.WIDTH_PADDING },
-                                                    RelativeSizeAxes = Axes.X,
-                                                    AutoSizeAxes = Axes.Y,
-                                                    Children = new Drawable[]
-                                                    {
-                                                        new SectionContainer
-                                                        {
-                                                            Padding = new MarginPadding { Right = FIELD_PADDING / 2 },
-                                                            Children = new[]
-                                                            {
-                                                                new Section("Room name")
-                                                                {
-                                                                    Child = NameField = new SettingsTextBox
-                                                                    {
-                                                                        RelativeSizeAxes = Axes.X,
-                                                                        TabbableContentContainer = this,
-                                                                        LengthLimit = 100
-                                                                    },
-                                                                },
-                                                                new Section("Duration")
-                                                                {
-                                                                    Child = DurationField = new DurationDropdown
-                                                                    {
-                                                                        RelativeSizeAxes = Axes.X,
-                                                                        Items = new[]
-                                                                        {
-                                                                            TimeSpan.FromMinutes(30),
-                                                                            TimeSpan.FromHours(1),
-                                                                            TimeSpan.FromHours(2),
-                                                                            TimeSpan.FromHours(4),
-                                                                            TimeSpan.FromHours(8),
-                                                                            TimeSpan.FromHours(12),
-                                                                            //TimeSpan.FromHours(16),
-                                                                            TimeSpan.FromHours(24),
-                                                                            TimeSpan.FromDays(3),
-                                                                            TimeSpan.FromDays(7)
-                                                                        }
-                                                                    }
-                                                                },
-                                                                new Section("Room visibility")
-                                                                {
-                                                                    Alpha = disabled_alpha,
-                                                                    Child = AvailabilityPicker = new RoomAvailabilityPicker
-                                                                    {
-                                                                        Enabled = { Value = false }
-                                                                    },
-                                                                },
-                                                                new Section("Game type")
-                                                                {
-                                                                    Alpha = disabled_alpha,
-                                                                    Child = new FillFlowContainer
-                                                                    {
-                                                                        AutoSizeAxes = Axes.Y,
-                                                                        RelativeSizeAxes = Axes.X,
-                                                                        Direction = FillDirection.Vertical,
-                                                                        Spacing = new Vector2(7),
-                                                                        Children = new Drawable[]
-                                                                        {
-                                                                            TypePicker = new GameTypePicker
-                                                                            {
-                                                                                RelativeSizeAxes = Axes.X,
-                                                                                Enabled = { Value = false }
-                                                                            },
-                                                                            typeLabel = new OsuSpriteText
-                                                                            {
-                                                                                Font = OsuFont.GetFont(size: 14),
-                                                                                Colour = colours.Yellow
-                                                                            },
-                                                                        },
-                                                                    },
-                                                                },
-                                                                new Section("Max participants")
-                                                                {
-                                                                    Alpha = disabled_alpha,
-                                                                    Child = MaxParticipantsField = new SettingsNumberTextBox
-                                                                    {
-                                                                        RelativeSizeAxes = Axes.X,
-                                                                        TabbableContentContainer = this,
-                                                                        ReadOnly = true,
-                                                                    },
-                                                                },
-                                                                new Section("Password (optional)")
-                                                                {
-                                                                    Alpha = disabled_alpha,
-                                                                    Child = new SettingsPasswordTextBox
-                                                                    {
-                                                                        RelativeSizeAxes = Axes.X,
-                                                                        TabbableContentContainer = this,
-                                                                        ReadOnly = true,
-                                                                    },
-                                                                },
-                                                            },
-                                                        },
-                                                        new SectionContainer
-                                                        {
-                                                            Anchor = Anchor.TopRight,
-                                                            Origin = Anchor.TopRight,
-                                                            Padding = new MarginPadding { Left = FIELD_PADDING / 2 },
-                                                            Children = new[]
-                                                            {
-                                                                new Section("Playlist")
-                                                                {
-                                                                    Child = new GridContainer
-                                                                    {
-                                                                        RelativeSizeAxes = Axes.X,
-                                                                        Height = 300,
-                                                                        Content = new[]
-                                                                        {
-                                                                            new Drawable[]
-                                                                            {
-                                                                                playlist = new DrawableRoomPlaylist(true, true) { RelativeSizeAxes = Axes.Both }
-                                                                            },
-                                                                            new Drawable[]
-                                                                            {
-                                                                                playlistLength = new OsuSpriteText
-                                                                                {
-                                                                                    Margin = new MarginPadding { Vertical = 5 },
-                                                                                    Colour = colours.Yellow,
-                                                                                    Font = OsuFont.GetFont(size: 12),
-                                                                                }
-                                                                            },
-                                                                            new Drawable[]
-                                                                            {
-                                                                                new PurpleTriangleButton
-                                                                                {
-                                                                                    RelativeSizeAxes = Axes.X,
-                                                                                    Height = 40,
-                                                                                    Text = "Edit playlist",
-                                                                                    Action = () => EditPlaylist?.Invoke()
-                                                                                }
-                                                                            }
-                                                                        },
-                                                                        RowDimensions = new[]
-                                                                        {
-                                                                            new Dimension(),
-                                                                            new Dimension(GridSizeMode.AutoSize),
-                                                                            new Dimension(GridSizeMode.AutoSize),
-                                                                        }
-                                                                    }
-                                                                },
-                                                            },
-                                                        },
-                                                    },
-                                                }
-                                            },
-                                        },
+                                        Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING,
+                                        Vertical = 10
                                     },
-                                    new Drawable[]
+                                    RelativeSizeAxes = Axes.Both,
+                                    Children = new[]
                                     {
                                         new Container
                                         {
-                                            Anchor = Anchor.BottomLeft,
-                                            Origin = Anchor.BottomLeft,
-                                            Y = 2,
+                                            Padding = new MarginPadding { Horizontal = WaveOverlayContainer.WIDTH_PADDING },
                                             RelativeSizeAxes = Axes.X,
                                             AutoSizeAxes = Axes.Y,
                                             Children = new Drawable[]
                                             {
-                                                new Box
+                                                new SectionContainer
                                                 {
-                                                    RelativeSizeAxes = Axes.Both,
-                                                    Colour = Color4Extensions.FromHex(@"28242d").Darken(0.5f).Opacity(1f),
-                                                },
-                                                new FillFlowContainer
-                                                {
-                                                    RelativeSizeAxes = Axes.X,
-                                                    AutoSizeAxes = Axes.Y,
-                                                    Direction = FillDirection.Vertical,
-                                                    Spacing = new Vector2(0, 20),
-                                                    Margin = new MarginPadding { Vertical = 20 },
-                                                    Padding = new MarginPadding { Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING },
-                                                    Children = new Drawable[]
+                                                    Padding = new MarginPadding { Right = FIELD_PADDING / 2 },
+                                                    Children = new[]
                                                     {
-                                                        ApplyButton = new CreateRoomButton
+                                                        new Section("Room name")
                                                         {
-                                                            Anchor = Anchor.BottomCentre,
-                                                            Origin = Anchor.BottomCentre,
-                                                            Size = new Vector2(230, 55),
-                                                            Enabled = { Value = false },
-                                                            Action = apply,
+                                                            Child = NameField = new SettingsTextBox
+                                                            {
+                                                                RelativeSizeAxes = Axes.X,
+                                                                TabbableContentContainer = this,
+                                                                LengthLimit = 100
+                                                            },
                                                         },
-                                                        ErrorText = new OsuSpriteText
+                                                        new Section("Duration")
                                                         {
-                                                            Anchor = Anchor.BottomCentre,
-                                                            Origin = Anchor.BottomCentre,
-                                                            Alpha = 0,
-                                                            Depth = 1,
-                                                            Colour = colours.RedDark
-                                                        }
-                                                    }
+                                                            Child = DurationField = new DurationDropdown
+                                                            {
+                                                                RelativeSizeAxes = Axes.X,
+                                                                Items = new[]
+                                                                {
+                                                                    TimeSpan.FromMinutes(30),
+                                                                    TimeSpan.FromHours(1),
+                                                                    TimeSpan.FromHours(2),
+                                                                    TimeSpan.FromHours(4),
+                                                                    TimeSpan.FromHours(8),
+                                                                    TimeSpan.FromHours(12),
+                                                                    //TimeSpan.FromHours(16),
+                                                                    TimeSpan.FromHours(24),
+                                                                    TimeSpan.FromDays(3),
+                                                                    TimeSpan.FromDays(7)
+                                                                }
+                                                            }
+                                                        },
+                                                        new Section("Room visibility")
+                                                        {
+                                                            Alpha = disabled_alpha,
+                                                            Child = AvailabilityPicker = new RoomAvailabilityPicker
+                                                            {
+                                                                Enabled = { Value = false }
+                                                            },
+                                                        },
+                                                        new Section("Game type")
+                                                        {
+                                                            Alpha = disabled_alpha,
+                                                            Child = new FillFlowContainer
+                                                            {
+                                                                AutoSizeAxes = Axes.Y,
+                                                                RelativeSizeAxes = Axes.X,
+                                                                Direction = FillDirection.Vertical,
+                                                                Spacing = new Vector2(7),
+                                                                Children = new Drawable[]
+                                                                {
+                                                                    TypePicker = new GameTypePicker
+                                                                    {
+                                                                        RelativeSizeAxes = Axes.X,
+                                                                        Enabled = { Value = false }
+                                                                    },
+                                                                    typeLabel = new OsuSpriteText
+                                                                    {
+                                                                        Font = OsuFont.GetFont(size: 14),
+                                                                        Colour = colours.Yellow
+                                                                    },
+                                                                },
+                                                            },
+                                                        },
+                                                        new Section("Max participants")
+                                                        {
+                                                            Alpha = disabled_alpha,
+                                                            Child = MaxParticipantsField = new SettingsNumberTextBox
+                                                            {
+                                                                RelativeSizeAxes = Axes.X,
+                                                                TabbableContentContainer = this,
+                                                                ReadOnly = true,
+                                                            },
+                                                        },
+                                                        new Section("Password (optional)")
+                                                        {
+                                                            Alpha = disabled_alpha,
+                                                            Child = new SettingsPasswordTextBox
+                                                            {
+                                                                RelativeSizeAxes = Axes.X,
+                                                                TabbableContentContainer = this,
+                                                                ReadOnly = true,
+                                                            },
+                                                        },
+                                                    },
+                                                },
+                                                new SectionContainer
+                                                {
+                                                    Anchor = Anchor.TopRight,
+                                                    Origin = Anchor.TopRight,
+                                                    Padding = new MarginPadding { Left = FIELD_PADDING / 2 },
+                                                    Children = new[]
+                                                    {
+                                                        new Section("Playlist")
+                                                        {
+                                                            Child = new GridContainer
+                                                            {
+                                                                RelativeSizeAxes = Axes.X,
+                                                                Height = 300,
+                                                                Content = new[]
+                                                                {
+                                                                    new Drawable[]
+                                                                    {
+                                                                        playlist = new DrawableRoomPlaylist(true, true) { RelativeSizeAxes = Axes.Both }
+                                                                    },
+                                                                    new Drawable[]
+                                                                    {
+                                                                        playlistLength = new OsuSpriteText
+                                                                        {
+                                                                            Margin = new MarginPadding { Vertical = 5 },
+                                                                            Colour = colours.Yellow,
+                                                                            Font = OsuFont.GetFont(size: 12),
+                                                                        }
+                                                                    },
+                                                                    new Drawable[]
+                                                                    {
+                                                                        new PurpleTriangleButton
+                                                                        {
+                                                                            RelativeSizeAxes = Axes.X,
+                                                                            Height = 40,
+                                                                            Text = "Edit playlist",
+                                                                            Action = () => EditPlaylist?.Invoke()
+                                                                        }
+                                                                    }
+                                                                },
+                                                                RowDimensions = new[]
+                                                                {
+                                                                    new Dimension(),
+                                                                    new Dimension(GridSizeMode.AutoSize),
+                                                                    new Dimension(GridSizeMode.AutoSize),
+                                                                }
+                                                            }
+                                                        },
+                                                    },
+                                                },
+                                            },
+                                        }
+                                    },
+                                },
+                            },
+                            new Drawable[]
+                            {
+                                new Container
+                                {
+                                    Anchor = Anchor.BottomLeft,
+                                    Origin = Anchor.BottomLeft,
+                                    Y = 2,
+                                    RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
+                                    Children = new Drawable[]
+                                    {
+                                        new Box
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                            Colour = Color4Extensions.FromHex(@"28242d").Darken(0.5f).Opacity(1f),
+                                        },
+                                        new FillFlowContainer
+                                        {
+                                            RelativeSizeAxes = Axes.X,
+                                            AutoSizeAxes = Axes.Y,
+                                            Direction = FillDirection.Vertical,
+                                            Spacing = new Vector2(0, 20),
+                                            Margin = new MarginPadding { Vertical = 20 },
+                                            Padding = new MarginPadding { Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING },
+                                            Children = new Drawable[]
+                                            {
+                                                ApplyButton = new CreateRoomButton
+                                                {
+                                                    Anchor = Anchor.BottomCentre,
+                                                    Origin = Anchor.BottomCentre,
+                                                    Size = new Vector2(230, 55),
+                                                    Enabled = { Value = false },
+                                                    Action = apply,
+                                                },
+                                                ErrorText = new OsuSpriteText
+                                                {
+                                                    Anchor = Anchor.BottomCentre,
+                                                    Origin = Anchor.BottomCentre,
+                                                    Alpha = 0,
+                                                    Depth = 1,
+                                                    Colour = colours.RedDark
                                                 }
                                             }
                                         }
                                     }
                                 }
-                            },
+                            }
                         }
                     },
-                    loadingLayer = new LoadingLayer(dimContent)
+                    loadingLayer = new LoadingLayer(true)
                 };
 
                 TypePicker.Current.BindValueChanged(type => typeLabel.Text = type.NewValue?.Name ?? string.Empty, true);
diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index 5530b4beac..00176e9127 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -131,7 +131,7 @@ namespace osu.Game.Screens.Play
                                     Anchor = Anchor.Centre,
                                     FillMode = FillMode.Fill,
                                 },
-                                loading = new LoadingLayer(backgroundSprite)
+                                loading = new LoadingLayer(true)
                             }
                         },
                         new OsuSpriteText
diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index 71f78c5c95..8a1c291fca 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -63,8 +63,6 @@ namespace osu.Game.Screens.Select
 
         public BeatmapDetails()
         {
-            Container content;
-
             Children = new Drawable[]
             {
                 new Box
@@ -72,7 +70,7 @@ namespace osu.Game.Screens.Select
                     RelativeSizeAxes = Axes.Both,
                     Colour = Color4.Black.Opacity(0.5f),
                 },
-                content = new Container
+                new Container
                 {
                     RelativeSizeAxes = Axes.Both,
                     Padding = new MarginPadding { Horizontal = spacing },
@@ -159,7 +157,7 @@ namespace osu.Game.Screens.Select
                         },
                     },
                 },
-                loading = new LoadingLayer(content),
+                loading = new LoadingLayer(true),
             };
         }
 

From 0b1ee2e267f3daea22a437d445edf4336bd048f2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Jan 2021 17:42:19 +0900
Subject: [PATCH 0767/3722] Remove unused dispose logic

---
 osu.Game/Graphics/UserInterface/LoadingLayer.cs | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/LoadingLayer.cs b/osu.Game/Graphics/UserInterface/LoadingLayer.cs
index 6aca30328a..a4905156a9 100644
--- a/osu.Game/Graphics/UserInterface/LoadingLayer.cs
+++ b/osu.Game/Graphics/UserInterface/LoadingLayer.cs
@@ -3,7 +3,6 @@
 
 using System;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osuTK;
@@ -82,16 +81,5 @@ namespace osu.Game.Graphics.UserInterface
 
             MainContents.Size = new Vector2(Math.Clamp(Math.Min(DrawWidth, DrawHeight) * 0.25f, 30, 100));
         }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-
-            if (State.Value == Visibility.Visible)
-            {
-                // ensure we don't leave the target in a bad state.
-                // dimTarget?.FadeColour(Color4.White, TRANSITION_DURATION, Easing.OutQuint);
-            }
-        }
     }
 }

From 0639429a23bb706d84b56dea98b7f23d3f4563b3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Jan 2021 18:10:39 +0900
Subject: [PATCH 0768/3722] Fix test (and remove no longer valid test)

---
 .../UserInterface/TestSceneLoadingLayer.cs    | 36 ++++++++-----------
 .../Graphics/UserInterface/LoadingLayer.cs    |  8 ++---
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingLayer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingLayer.cs
index a694595115..d426723f0b 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingLayer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingLayer.cs
@@ -1,11 +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.Graphics.Shapes;
+using osu.Framework.Utils;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osuTK;
@@ -15,12 +15,10 @@ namespace osu.Game.Tests.Visual.UserInterface
 {
     public class TestSceneLoadingLayer : OsuTestScene
     {
-        private LoadingLayer overlay;
+        private TestLoadingLayer overlay;
 
         private Container content;
 
-        private Drawable dimContent => overlay.Children.OfType<Box>().First();
-
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
@@ -53,7 +51,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                                 new TriangleButton { Text = "puush me", Width = 200, Action = () => { } },
                             }
                         },
-                        overlay = new LoadingLayer(true),
+                        overlay = new TestLoadingLayer(true),
                     }
                 },
             };
@@ -66,25 +64,11 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             AddStep("show", () => overlay.Show());
 
-            AddUntilStep("wait for content dim", () => dimContent.Colour != Color4.White);
+            AddUntilStep("wait for content dim", () => overlay.BackgroundDimLayer.Alpha > 0);
 
             AddStep("hide", () => overlay.Hide());
 
-            AddUntilStep("wait for content restore", () => dimContent.Colour == Color4.White);
-        }
-
-        [Test]
-        public void TestContentRestoreOnDispose()
-        {
-            AddAssert("not visible", () => !overlay.IsPresent);
-
-            AddStep("show", () => overlay.Show());
-
-            AddUntilStep("wait for content dim", () => dimContent.Colour != Color4.White);
-
-            AddStep("expire", () => overlay.Expire());
-
-            AddUntilStep("wait for content restore", () => dimContent.Colour == Color4.White);
+            AddUntilStep("wait for content restore", () => Precision.AlmostEquals(overlay.BackgroundDimLayer.Alpha, 0));
         }
 
         [Test]
@@ -100,5 +84,15 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             AddStep("hide", () => overlay.Hide());
         }
+
+        private class TestLoadingLayer : LoadingLayer
+        {
+            public new Box BackgroundDimLayer => base.BackgroundDimLayer;
+
+            public TestLoadingLayer(bool dimBackground = false, bool withBox = true)
+                : base(dimBackground, withBox)
+            {
+            }
+        }
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/LoadingLayer.cs b/osu.Game/Graphics/UserInterface/LoadingLayer.cs
index a4905156a9..3e3fd32d65 100644
--- a/osu.Game/Graphics/UserInterface/LoadingLayer.cs
+++ b/osu.Game/Graphics/UserInterface/LoadingLayer.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Graphics.UserInterface
     /// </summary>
     public class LoadingLayer : LoadingSpinner
     {
-        private readonly Box backgroundDimLayer;
+        protected Box BackgroundDimLayer { get; private set; }
 
         /// <summary>
         /// Construct a new loading spinner.
@@ -34,7 +34,7 @@ namespace osu.Game.Graphics.UserInterface
 
             if (dimBackground)
             {
-                AddInternal(backgroundDimLayer = new Box
+                AddInternal(BackgroundDimLayer = new Box
                 {
                     Depth = float.MaxValue,
                     Colour = Color4.Black,
@@ -65,13 +65,13 @@ namespace osu.Game.Graphics.UserInterface
 
         protected override void PopIn()
         {
-            backgroundDimLayer?.FadeTo(0.5f, TRANSITION_DURATION * 2, Easing.OutQuint);
+            BackgroundDimLayer?.FadeTo(0.5f, TRANSITION_DURATION * 2, Easing.OutQuint);
             base.PopIn();
         }
 
         protected override void PopOut()
         {
-            backgroundDimLayer?.FadeOut(TRANSITION_DURATION, Easing.OutQuint);
+            BackgroundDimLayer?.FadeOut(TRANSITION_DURATION, Easing.OutQuint);
             base.PopOut();
         }
 

From d0d2e41b28df281507e16d5de19f4ec0c5e8a8b7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Jan 2021 18:19:28 +0900
Subject: [PATCH 0769/3722] Fix display settings binding to configuration
 bindables in async load

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

diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index 3d3b543d70..e815e2f68b 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -133,6 +133,15 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 },
             };
 
+            scalingSettings.ForEach(s => bindPreviewEvent(s.Current));
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            windowModeDropdown.Current.ValueChanged += _ => updateResolutionDropdown();
+
             windowModes.BindCollectionChanged((sender, args) =>
             {
                 if (windowModes.Count > 1)
@@ -141,8 +150,6 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                     windowModeDropdown.Hide();
             }, true);
 
-            windowModeDropdown.Current.ValueChanged += _ => updateResolutionDropdown();
-
             currentDisplay.BindValueChanged(display => Schedule(() =>
             {
                 resolutions.RemoveRange(1, resolutions.Count - 1);
@@ -159,8 +166,6 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 updateResolutionDropdown();
             }), true);
 
-            scalingSettings.ForEach(s => bindPreviewEvent(s.Current));
-
             scalingMode.BindValueChanged(mode =>
             {
                 scalingSettings.ClearTransforms();

From 83dbba3cbfb3a02297ae8bc801a11bf2028f3cb6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Jan 2021 18:41:45 +0900
Subject: [PATCH 0770/3722] Fix carousel beatmap set panels applying transforms
 to difficulties while they are loading

---
 .../Carousel/DrawableCarouselBeatmapSet.cs    | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index b3c5d458d6..17fa66447d 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -40,6 +41,8 @@ namespace osu.Game.Screens.Select.Carousel
 
         private BeatmapSetInfo beatmapSet;
 
+        private Task beatmapsLoadTask;
+
         [Resolved]
         private BeatmapManager manager { get; set; }
 
@@ -85,7 +88,9 @@ namespace osu.Game.Screens.Select.Carousel
             base.UpdateItem();
 
             Content.Clear();
+
             beatmapContainer = null;
+            beatmapsLoadTask = null;
 
             if (Item == null)
                 return;
@@ -122,11 +127,7 @@ namespace osu.Game.Screens.Select.Carousel
 
             MovementContainer.MoveToX(0, 500, Easing.OutExpo);
 
-            if (beatmapContainer != null)
-            {
-                foreach (var beatmap in beatmapContainer)
-                    beatmap.MoveToY(0, 800, Easing.OutQuint);
-            }
+            updateBeatmapYPositions();
         }
 
         protected override void Selected()
@@ -163,7 +164,7 @@ namespace osu.Game.Screens.Select.Carousel
                     ChildrenEnumerable = visibleBeatmaps.Select(c => c.CreateDrawableRepresentation())
                 };
 
-                LoadComponentAsync(beatmapContainer, loaded =>
+                beatmapsLoadTask = LoadComponentAsync(beatmapContainer, loaded =>
                 {
                     // make sure the pooled target hasn't changed.
                     if (beatmapContainer != loaded)
@@ -173,16 +174,26 @@ namespace osu.Game.Screens.Select.Carousel
                     updateBeatmapYPositions();
                 });
             }
+        }
 
-            void updateBeatmapYPositions()
+        private void updateBeatmapYPositions()
+        {
+            if (beatmapsLoadTask == null || !beatmapsLoadTask.IsCompleted)
+                return;
+
+            float yPos = DrawableCarouselBeatmap.CAROUSEL_BEATMAP_SPACING;
+
+            bool isSelected = Item.State.Value == CarouselItemState.Selected;
+
+            foreach (var panel in beatmapContainer.Children)
             {
-                float yPos = DrawableCarouselBeatmap.CAROUSEL_BEATMAP_SPACING;
-
-                foreach (var panel in beatmapContainer.Children)
+                if (isSelected)
                 {
                     panel.MoveToY(yPos, 800, Easing.OutQuint);
                     yPos += panel.Item.TotalHeight;
                 }
+                else
+                    panel.MoveToY(0, 800, Easing.OutQuint);
             }
         }
 

From 4b539b01c1862bfb0a29ad69dc6b400f3719e99b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 5 Jan 2021 20:38:58 +0900
Subject: [PATCH 0771/3722] Match code between updateSelectedBeatmap/Ruleset

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

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index e3036c662b..7e217ca7a4 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -435,13 +435,15 @@ namespace osu.Game.Screens.Select
                 return;
 
             beatmapNoDebounce = beatmap;
-
             performUpdateSelected();
         }
 
         private void updateSelectedRuleset(RulesetInfo ruleset)
         {
-            if (ruleset == null || ruleset.Equals(rulesetNoDebounce))
+            if (ruleset == null && rulesetNoDebounce == null)
+                return;
+
+            if (ruleset?.Equals(rulesetNoDebounce) == true)
                 return;
 
             rulesetNoDebounce = ruleset;

From 2b253f6d01426901994e95b03ead4233f7cb67dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 5 Jan 2021 22:39:59 +0100
Subject: [PATCH 0772/3722] Remove now-unused fields & locals

---
 osu.Game/Overlays/AccountCreation/ScreenEntry.cs | 4 +---
 osu.Game/Screens/Play/BeatmapMetadataDisplay.cs  | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/AccountCreation/ScreenEntry.cs b/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
index 0d5538155a..bcb3d4b635 100644
--- a/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
+++ b/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
@@ -48,11 +48,9 @@ namespace osu.Game.Overlays.AccountCreation
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            FillFlowContainer mainContent;
-
             InternalChildren = new Drawable[]
             {
-                mainContent = new FillFlowContainer
+                new FillFlowContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     Direction = FillDirection.Vertical,
diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index 00176e9127..b53141e8fb 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -53,7 +53,6 @@ namespace osu.Game.Screens.Play
         private readonly Bindable<IReadOnlyList<Mod>> mods;
         private readonly Drawable facade;
         private LoadingSpinner loading;
-        private Sprite backgroundSprite;
 
         public IBindable<IReadOnlyList<Mod>> Mods => mods;
 
@@ -123,7 +122,7 @@ namespace osu.Game.Screens.Play
                             Masking = true,
                             Children = new Drawable[]
                             {
-                                backgroundSprite = new Sprite
+                                new Sprite
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                     Texture = beatmap?.Background,

From ac1d6d444430296d2ab08ac3f5e89f5a965655ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 5 Jan 2021 22:40:16 +0100
Subject: [PATCH 0773/3722] Make auto-property get-only

---
 osu.Game/Graphics/UserInterface/LoadingLayer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/UserInterface/LoadingLayer.cs b/osu.Game/Graphics/UserInterface/LoadingLayer.cs
index 3e3fd32d65..d86ea9e4ea 100644
--- a/osu.Game/Graphics/UserInterface/LoadingLayer.cs
+++ b/osu.Game/Graphics/UserInterface/LoadingLayer.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Graphics.UserInterface
     /// </summary>
     public class LoadingLayer : LoadingSpinner
     {
-        protected Box BackgroundDimLayer { get; private set; }
+        protected Box BackgroundDimLayer { get; }
 
         /// <summary>
         /// Construct a new loading spinner.

From 0880e76da8d58d02ffe4ad95c173d9373e3d50b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 5 Jan 2021 22:47:57 +0100
Subject: [PATCH 0774/3722] Mark background dim layer as possibly-null

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

diff --git a/osu.Game/Graphics/UserInterface/LoadingLayer.cs b/osu.Game/Graphics/UserInterface/LoadingLayer.cs
index d86ea9e4ea..47ba5fce4d 100644
--- a/osu.Game/Graphics/UserInterface/LoadingLayer.cs
+++ b/osu.Game/Graphics/UserInterface/LoadingLayer.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using JetBrains.Annotations;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
@@ -17,6 +18,7 @@ namespace osu.Game.Graphics.UserInterface
     /// </summary>
     public class LoadingLayer : LoadingSpinner
     {
+        [CanBeNull]
         protected Box BackgroundDimLayer { get; }
 
         /// <summary>

From 15dd7a87a62d73d0ba6e85fea034f1d7cb9656c1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Jan 2021 15:19:12 +0900
Subject: [PATCH 0775/3722] Move gameplay preview event binding to LoadComplete

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

diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index e815e2f68b..7acbf038d8 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -132,14 +132,14 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                     }
                 },
             };
-
-            scalingSettings.ForEach(s => bindPreviewEvent(s.Current));
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
+            scalingSettings.ForEach(s => bindPreviewEvent(s.Current));
+
             windowModeDropdown.Current.ValueChanged += _ => updateResolutionDropdown();
 
             windowModes.BindCollectionChanged((sender, args) =>
@@ -186,11 +186,6 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
             }
         }
 
-        /// <summary>
-        /// Create a delayed bindable which only updates when a condition is met.
-        /// </summary>
-        /// <param name="bindable">The config bindable.</param>
-        /// <returns>A bindable which will propagate updates with a delay.</returns>
         private void bindPreviewEvent(Bindable<float> bindable)
         {
             bindable.ValueChanged += _ =>

From 11a0c637bc07812e01125df31251791cf9a24694 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Jan 2021 15:25:53 +0900
Subject: [PATCH 0776/3722] Mark background properties as nullable

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

diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index c97c0aef2b..d1cdb9f1de 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
@@ -119,8 +120,10 @@ namespace osu.Game.Screens
         /// <summary>
         /// The background created and owned by this screen. May be null if the background didn't change.
         /// </summary>
+        [CanBeNull]
         private BackgroundScreen ownedBackground;
 
+        [CanBeNull]
         private BackgroundScreen background;
 
         [Resolved(canBeNull: true)]

From e9d4e4d1d5bb5c6df13474c867c81b4d516cd61d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Jan 2021 15:26:13 +0900
Subject: [PATCH 0777/3722] Add xmldoc and throw a local exception on null
 background

---
 osu.Game/Screens/BackgroundScreen.cs |  4 ++++
 osu.Game/Screens/OsuScreen.cs        | 14 ++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/BackgroundScreen.cs b/osu.Game/Screens/BackgroundScreen.cs
index ea220c2f82..c81362eebe 100644
--- a/osu.Game/Screens/BackgroundScreen.cs
+++ b/osu.Game/Screens/BackgroundScreen.cs
@@ -34,6 +34,10 @@ namespace osu.Game.Screens
             return false;
         }
 
+        /// <summary>
+        /// Apply arbitrary changes to this background in a thread safe manner.
+        /// </summary>
+        /// <param name="action">The operation to perform.</param>
         public void ApplyToBackground(Action<BackgroundScreen> action) => Schedule(() => action.Invoke(this));
 
         protected override void Update()
diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index d1cdb9f1de..11467db6c8 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -115,8 +115,6 @@ namespace osu.Game.Screens
             Mods = screenDependencies.Mods;
         }
 
-        public void ApplyToBackground(Action<BackgroundScreen> action) => background.ApplyToBackground(action);
-
         /// <summary>
         /// The background created and owned by this screen. May be null if the background didn't change.
         /// </summary>
@@ -148,6 +146,18 @@ namespace osu.Game.Screens
             Activity.Value ??= InitialActivity;
         }
 
+        /// <summary>
+        /// Apply arbitrary changes to the current background screen in a thread safe manner.
+        /// </summary>
+        /// <param name="action">The operation to perform.</param>
+        public void ApplyToBackground(Action<BackgroundScreen> action)
+        {
+            if (background == null)
+                throw new InvalidOperationException("Attempted to apply to background before screen is pushed");
+
+            background.ApplyToBackground(action);
+        }
+
         public override void OnResuming(IScreen last)
         {
             if (PlayResumeSound)

From 550ef3f13307f3d8592a0bc1ecd103f67af046e1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Jan 2021 15:28:01 +0900
Subject: [PATCH 0778/3722] Aggressively dispose ownedBackground if it was not
 used, because we can

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

diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index 11467db6c8..fb26739a44 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -185,6 +185,7 @@ namespace osu.Game.Screens
             if (background != ownedBackground)
             {
                 // background may have not been replaced, at which point we don't want to track the background lifetime.
+                ownedBackground?.Dispose();
                 ownedBackground = null;
             }
 

From 07cff7038728545a5ce399c3b727b1d03c68813c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Jan 2021 18:19:03 +0900
Subject: [PATCH 0779/3722] Add specific messaging for when there's no
 background stack available

---
 osu.Game/Screens/OsuScreen.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index fb26739a44..e1a29946f4 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -125,6 +125,7 @@ namespace osu.Game.Screens
         private BackgroundScreen background;
 
         [Resolved(canBeNull: true)]
+        [CanBeNull]
         private BackgroundScreenStack backgroundStack { get; set; }
 
         [Resolved(canBeNull: true)]
@@ -152,8 +153,11 @@ namespace osu.Game.Screens
         /// <param name="action">The operation to perform.</param>
         public void ApplyToBackground(Action<BackgroundScreen> action)
         {
+            if (backgroundStack == null)
+                throw new InvalidOperationException("Attempted to apply to background without a background stack being available.");
+
             if (background == null)
-                throw new InvalidOperationException("Attempted to apply to background before screen is pushed");
+                throw new InvalidOperationException("Attempted to apply to background before screen is pushed.");
 
             background.ApplyToBackground(action);
         }

From 99701a6d9b22e2fbc4864556a14f9f44311b5236 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Jan 2021 21:06:33 +0900
Subject: [PATCH 0780/3722] Add null check on beatmapContainer for safety

---
 osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 17fa66447d..c0415384c8 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -178,6 +178,9 @@ namespace osu.Game.Screens.Select.Carousel
 
         private void updateBeatmapYPositions()
         {
+            if (beatmapContainer == null)
+                return;
+
             if (beatmapsLoadTask == null || !beatmapsLoadTask.IsCompleted)
                 return;
 

From 43b9fde45731fdbd5da77f119eaedc5e0afa0f24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 Jan 2021 13:15:15 +0100
Subject: [PATCH 0781/3722] Add some nullability annotations for good measure

---
 osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index c0415384c8..d7e901b71e 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -37,10 +38,12 @@ namespace osu.Game.Screens.Select.Carousel
 
         public IEnumerable<DrawableCarouselItem> DrawableBeatmaps => beatmapContainer?.Children ?? Enumerable.Empty<DrawableCarouselItem>();
 
+        [CanBeNull]
         private Container<DrawableCarouselItem> beatmapContainer;
 
         private BeatmapSetInfo beatmapSet;
 
+        [CanBeNull]
         private Task beatmapsLoadTask;
 
         [Resolved]

From 32accc8eab227aebcc40cc026897324119c0e589 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Jan 2021 22:56:10 +0900
Subject: [PATCH 0782/3722] Remove "osu!direct" button

---
 osu.Game/Input/Bindings/GlobalActionContainer.cs | 2 +-
 osu.Game/Screens/Menu/ButtonSystem.cs            | 1 -
 osu.Game/Screens/Menu/Disclaimer.cs              | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 1270df5374..fa3f70735a 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -112,7 +112,7 @@ namespace osu.Game.Input.Bindings
         [Description("Toggle settings")]
         ToggleSettings,
 
-        [Description("Toggle osu!direct")]
+        [Description("Toggle beatmap listing")]
         ToggleDirect,
 
         [Description("Increase volume")]
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index fd4d74dc6b..0c47ef3b1e 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -130,7 +130,6 @@ namespace osu.Game.Screens.Menu
 
             buttonsTopLevel.Add(new Button(@"play", @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));
             buttonsTopLevel.Add(new Button(@"osu!editor", @"button-generic-select", OsuIcon.EditCircle, new Color4(238, 170, 0, 255), () => OnEdit?.Invoke(), 0, Key.E));
-            buttonsTopLevel.Add(new Button(@"osu!direct", @"button-direct-select", OsuIcon.ChevronDownCircle, new Color4(165, 204, 0, 255), () => OnBeatmapListing?.Invoke(), 0, Key.D));
 
             if (host.CanExit)
                 buttonsTopLevel.Add(new Button(@"exit", string.Empty, OsuIcon.CrossCircle, new Color4(238, 51, 153, 255), () => OnExit?.Invoke(), 0, Key.Q));
diff --git a/osu.Game/Screens/Menu/Disclaimer.cs b/osu.Game/Screens/Menu/Disclaimer.cs
index 46fddabb26..72eb9c7c0c 100644
--- a/osu.Game/Screens/Menu/Disclaimer.cs
+++ b/osu.Game/Screens/Menu/Disclaimer.cs
@@ -201,7 +201,7 @@ namespace osu.Game.Screens.Menu
                 "New features are coming online every update. Make sure to stay up-to-date!",
                 "If you find the UI too large or small, try adjusting UI scale in settings!",
                 "Try adjusting the \"Screen Scaling\" mode to change your gameplay or UI area, even in fullscreen!",
-                "For now, osu!direct is available to all users on lazer. You can access it anywhere using Ctrl-D!",
+                "For now, what used to be \"osu!direct\" is available to all users on lazer. You can access it anywhere using Ctrl-D!",
                 "Seeking in replays is available by dragging on the difficulty bar at the bottom of the screen!",
                 "Multithreading support means that even with low \"FPS\" your input and judgements will be accurate!",
                 "Try scrolling down in the mod select panel to find a bunch of new fun mods!",

From 59025e9d50a6866b71f2571919460c94a155222c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Jan 2021 23:09:58 +0900
Subject: [PATCH 0783/3722] Remove related events

---
 osu.Game/Screens/Menu/ButtonSystem.cs | 1 -
 osu.Game/Screens/Menu/MainMenu.cs     | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 0c47ef3b1e..8417858878 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -39,7 +39,6 @@ namespace osu.Game.Screens.Menu
 
         public Action OnEdit;
         public Action OnExit;
-        public Action OnBeatmapListing;
         public Action OnSolo;
         public Action OnSettings;
         public Action OnMultiplayer;
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 97fd58318b..ef45a656fa 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -71,7 +71,7 @@ namespace osu.Game.Screens.Menu
         private SongTicker songTicker;
 
         [BackgroundDependencyLoader(true)]
-        private void load(BeatmapListingOverlay beatmapListing, SettingsOverlay settings, RankingsOverlay rankings, OsuConfigManager config, SessionStatics statics)
+        private void load(SettingsOverlay settings, OsuConfigManager config, SessionStatics statics)
         {
             holdDelay = config.GetBindable<float>(OsuSetting.UIHoldActivationDelay);
             loginDisplayed = statics.GetBindable<bool>(Static.LoginOverlayDisplayed);
@@ -137,7 +137,6 @@ namespace osu.Game.Screens.Menu
             };
 
             buttons.OnSettings = () => settings?.ToggleVisibility();
-            buttons.OnBeatmapListing = () => beatmapListing?.ToggleVisibility();
 
             LoadComponentAsync(background = new BackgroundScreenDefault());
             preloadSongSelect();

From 283c69a68f3f4a1a29ea6d676fdaabdad67000aa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Jan 2021 23:12:56 +0900
Subject: [PATCH 0784/3722] Update enum name in line with changes

---
 osu.Game/Input/Bindings/GlobalActionContainer.cs         | 4 ++--
 osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index fa3f70735a..b8c2fa201f 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.Control, InputKey.Alt, InputKey.R }, GlobalAction.ResetInputSettings),
             new KeyBinding(new[] { InputKey.Control, InputKey.T }, GlobalAction.ToggleToolbar),
             new KeyBinding(new[] { InputKey.Control, InputKey.O }, GlobalAction.ToggleSettings),
-            new KeyBinding(new[] { InputKey.Control, InputKey.D }, GlobalAction.ToggleDirect),
+            new KeyBinding(new[] { InputKey.Control, InputKey.D }, GlobalAction.ToggleBeatmapListing),
             new KeyBinding(new[] { InputKey.Control, InputKey.N }, GlobalAction.ToggleNotifications),
 
             new KeyBinding(InputKey.Escape, GlobalAction.Back),
@@ -113,7 +113,7 @@ namespace osu.Game.Input.Bindings
         ToggleSettings,
 
         [Description("Toggle beatmap listing")]
-        ToggleDirect,
+        ToggleBeatmapListing,
 
         [Description("Increase volume")]
         IncreaseVolume,
diff --git a/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs b/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs
index c495d673ce..bfe36a6a0f 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarBeatmapListingButton.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Overlays.Toolbar
 
         public ToolbarBeatmapListingButton()
         {
-            Hotkey = GlobalAction.ToggleDirect;
+            Hotkey = GlobalAction.ToggleBeatmapListing;
         }
 
         [BackgroundDependencyLoader(true)]

From cf3043fc08fa723dde4f6c4a7ea4a060a4e72c50 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Jan 2021 23:20:26 +0900
Subject: [PATCH 0785/3722] Only show "development build" footer on debug
 releases

---
 osu.Desktop/Overlays/VersionManager.cs | 39 ++++++++++++++++----------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/osu.Desktop/Overlays/VersionManager.cs b/osu.Desktop/Overlays/VersionManager.cs
index 8c759f8487..59d0f9635d 100644
--- a/osu.Desktop/Overlays/VersionManager.cs
+++ b/osu.Desktop/Overlays/VersionManager.cs
@@ -26,9 +26,11 @@ namespace osu.Desktop.Overlays
 
             Alpha = 0;
 
+            FillFlowContainer mainFill;
+
             Children = new Drawable[]
             {
-                new FillFlowContainer
+                mainFill = new FillFlowContainer
                 {
                     AutoSizeAxes = Axes.Both,
                     Direction = FillDirection.Vertical,
@@ -55,23 +57,30 @@ namespace osu.Desktop.Overlays
                                 },
                             }
                         },
-                        new OsuSpriteText
-                        {
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopCentre,
-                            Font = OsuFont.Numeric.With(size: 12),
-                            Colour = colours.Yellow,
-                            Text = @"Development Build"
-                        },
-                        new Sprite
-                        {
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopCentre,
-                            Texture = textures.Get(@"Menu/dev-build-footer"),
-                        },
                     }
                 }
             };
+
+            if (DebugUtils.IsDebugBuild)
+            {
+                mainFill.AddRange(new Drawable[]
+                {
+                    new OsuSpriteText
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        Font = OsuFont.Numeric.With(size: 12),
+                        Colour = colours.Yellow,
+                        Text = @"Development Build"
+                    },
+                    new Sprite
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        Texture = textures.Get(@"Menu/dev-build-footer"),
+                    },
+                });
+            }
         }
 
         protected override void PopIn()

From cfbfb8d58bd2768bf83be25c2e2da1cd26a1d4ce Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Jan 2021 23:21:46 +0900
Subject: [PATCH 0786/3722] Revert "Remove related events"

This reverts commit 59025e9d50a6866b71f2571919460c94a155222c.
---
 osu.Game/Screens/Menu/ButtonSystem.cs | 1 +
 osu.Game/Screens/Menu/MainMenu.cs     | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 8417858878..0c47ef3b1e 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -39,6 +39,7 @@ namespace osu.Game.Screens.Menu
 
         public Action OnEdit;
         public Action OnExit;
+        public Action OnBeatmapListing;
         public Action OnSolo;
         public Action OnSettings;
         public Action OnMultiplayer;
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index ef45a656fa..97fd58318b 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -71,7 +71,7 @@ namespace osu.Game.Screens.Menu
         private SongTicker songTicker;
 
         [BackgroundDependencyLoader(true)]
-        private void load(SettingsOverlay settings, OsuConfigManager config, SessionStatics statics)
+        private void load(BeatmapListingOverlay beatmapListing, SettingsOverlay settings, RankingsOverlay rankings, OsuConfigManager config, SessionStatics statics)
         {
             holdDelay = config.GetBindable<float>(OsuSetting.UIHoldActivationDelay);
             loginDisplayed = statics.GetBindable<bool>(Static.LoginOverlayDisplayed);
@@ -137,6 +137,7 @@ namespace osu.Game.Screens.Menu
             };
 
             buttons.OnSettings = () => settings?.ToggleVisibility();
+            buttons.OnBeatmapListing = () => beatmapListing?.ToggleVisibility();
 
             LoadComponentAsync(background = new BackgroundScreenDefault());
             preloadSongSelect();

From 35be7ec0e1477c9d904538c4dd726e50b6f2e827 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Jan 2021 23:28:14 +0900
Subject: [PATCH 0787/3722] Add back button but rename to "browse"

---
 osu.Game/Screens/Menu/ButtonSystem.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 0c47ef3b1e..f400b2114b 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -129,7 +129,8 @@ namespace osu.Game.Screens.Menu
             buttonsPlay.ForEach(b => b.VisibleState = ButtonSystemState.Play);
 
             buttonsTopLevel.Add(new Button(@"play", @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));
-            buttonsTopLevel.Add(new Button(@"osu!editor", @"button-generic-select", OsuIcon.EditCircle, new Color4(238, 170, 0, 255), () => OnEdit?.Invoke(), 0, Key.E));
+            buttonsTopLevel.Add(new Button(@"edit", @"button-generic-select", OsuIcon.EditCircle, new Color4(238, 170, 0, 255), () => OnEdit?.Invoke(), 0, Key.E));
+            buttonsTopLevel.Add(new Button(@"browse", @"button-direct-select", OsuIcon.ChevronDownCircle, new Color4(165, 204, 0, 255), () => OnBeatmapListing?.Invoke(), 0, Key.D));
 
             if (host.CanExit)
                 buttonsTopLevel.Add(new Button(@"exit", string.Empty, OsuIcon.CrossCircle, new Color4(238, 51, 153, 255), () => OnExit?.Invoke(), 0, Key.Q));

From d056e6575e1cd711890ffee0592b173b6eccb960 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 6 Jan 2021 23:30:54 +0900
Subject: [PATCH 0788/3722] Use IsDeployedBuild instead of IsDebugBuild for
 footer display conditional

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

diff --git a/osu.Desktop/Overlays/VersionManager.cs b/osu.Desktop/Overlays/VersionManager.cs
index 59d0f9635d..e4a3451651 100644
--- a/osu.Desktop/Overlays/VersionManager.cs
+++ b/osu.Desktop/Overlays/VersionManager.cs
@@ -61,7 +61,7 @@ namespace osu.Desktop.Overlays
                 }
             };
 
-            if (DebugUtils.IsDebugBuild)
+            if (!game.IsDeployedBuild)
             {
                 mainFill.AddRange(new Drawable[]
                 {

From a8530fde9d3dea6f4a0064e8371c2debbcdd2471 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Jan 2021 00:05:12 +0900
Subject: [PATCH 0789/3722] Tidy up variables and spacing

---
 osu.Desktop/DiscordRichPresence.cs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/osu.Desktop/DiscordRichPresence.cs b/osu.Desktop/DiscordRichPresence.cs
index 172db324cb..63b12fb84b 100644
--- a/osu.Desktop/DiscordRichPresence.cs
+++ b/osu.Desktop/DiscordRichPresence.cs
@@ -31,7 +31,8 @@ namespace osu.Desktop
 
         private readonly IBindable<UserStatus> status = new Bindable<UserStatus>();
         private readonly IBindable<UserActivity> activity = new Bindable<UserActivity>();
-        private readonly Bindable<DiscordRichPresenceMode> mode = new Bindable<DiscordRichPresenceMode>();
+
+        private readonly Bindable<DiscordRichPresenceMode> privacyMode = new Bindable<DiscordRichPresenceMode>();
 
         private readonly RichPresence presence = new RichPresence
         {
@@ -53,7 +54,8 @@ namespace osu.Desktop
 
             client.OnError += (_, e) => Logger.Log($"An error occurred with Discord RPC Client: {e.Code} {e.Message}", LoggingTarget.Network);
 
-            config.BindWith(OsuSetting.DiscordRichPresence, mode);
+            config.BindWith(OsuSetting.DiscordRichPresence, privacyMode);
+
             (user = provider.LocalUser.GetBoundCopy()).BindValueChanged(u =>
             {
                 status.UnbindBindings();
@@ -66,7 +68,7 @@ namespace osu.Desktop
             ruleset.BindValueChanged(_ => updateStatus());
             status.BindValueChanged(_ => updateStatus());
             activity.BindValueChanged(_ => updateStatus());
-            mode.BindValueChanged(_ => updateStatus());
+            privacyMode.BindValueChanged(_ => updateStatus());
 
             client.Initialize();
         }
@@ -82,7 +84,7 @@ namespace osu.Desktop
             if (!client.IsInitialized)
                 return;
 
-            if (status.Value is UserStatusOffline || mode.Value == DiscordRichPresenceMode.Off)
+            if (status.Value is UserStatusOffline || privacyMode.Value == DiscordRichPresenceMode.Off)
             {
                 client.ClearPresence();
                 return;
@@ -100,7 +102,7 @@ namespace osu.Desktop
             }
 
             // update user information
-            if (mode.Value == DiscordRichPresenceMode.Limited)
+            if (privacyMode.Value == DiscordRichPresenceMode.Limited)
                 presence.Assets.LargeImageText = string.Empty;
             else
                 presence.Assets.LargeImageText = $"{user.Value.Username}" + (user.Value.Statistics?.Ranks.Global > 0 ? $" (rank #{user.Value.Statistics.Ranks.Global:N0})" : string.Empty);
@@ -144,7 +146,7 @@ namespace osu.Desktop
                     return edit.Beatmap.ToString();
 
                 case UserActivity.InLobby lobby:
-                    return mode.Value == DiscordRichPresenceMode.Limited ? string.Empty : lobby.Room.Name.Value;
+                    return privacyMode.Value == DiscordRichPresenceMode.Limited ? string.Empty : lobby.Room.Name.Value;
             }
 
             return string.Empty;

From fb057857e707349ead9bf7aa539d5e61c3a42cbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 Jan 2021 17:40:29 +0100
Subject: [PATCH 0790/3722] Update references to current year

---
 Directory.Build.props  | 4 ++--
 LICENCE                | 2 +-
 osu.Desktop/osu.nuspec | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 9ec442aafa..049db816a8 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -40,7 +40,7 @@
     <RepositoryUrl>https://github.com/ppy/osu</RepositoryUrl>
     <PackageReleaseNotes>Automated release.</PackageReleaseNotes>
     <Company>ppy Pty Ltd</Company>
-    <Copyright>Copyright (c) 2020 ppy Pty Ltd</Copyright>
+    <Copyright>Copyright (c) 2021 ppy Pty Ltd</Copyright>
     <PackageTags>osu game</PackageTags>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/LICENCE b/LICENCE
index 2435c23545..b5962ad3b2 100644
--- a/LICENCE
+++ b/LICENCE
@@ -1,4 +1,4 @@
-Copyright (c) 2020 ppy Pty Ltd <contact@ppy.sh>.
+Copyright (c) 2021 ppy Pty Ltd <contact@ppy.sh>.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/osu.Desktop/osu.nuspec b/osu.Desktop/osu.nuspec
index 2fc6009183..fa182f8e70 100644
--- a/osu.Desktop/osu.nuspec
+++ b/osu.Desktop/osu.nuspec
@@ -11,7 +11,7 @@
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>A free-to-win rhythm game. Rhythm is just a *click* away!</description>
         <releaseNotes>testing</releaseNotes>
-        <copyright>Copyright (c) 2020 ppy Pty Ltd</copyright>
+        <copyright>Copyright (c) 2021 ppy Pty Ltd</copyright>
         <language>en-AU</language>
     </metadata>
     <files>

From 09742998cdeaeaae7fda4c77309e45cd14b69b18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 Jan 2021 17:40:46 +0100
Subject: [PATCH 0791/3722] Fix mistaken obsoletion notice

It was added in c9f38f7bb6af116fa7ec813ceb3f100dcad30adb, which
specified 2021 in another place (and was committed in October of 2020
anyway). Update the year so that it doesn't get culled prematurely.
---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index da6da0ea97..e5eaf5db88 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -750,7 +750,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
                 if (Result.Type != originalType)
                 {
                     Logger.Log($"{GetType().ReadableName()} applied an invalid hit result ({originalType}) when {nameof(HitResult.IgnoreMiss)} or {nameof(HitResult.IgnoreHit)} is expected.\n"
-                               + $"This has been automatically adjusted to {Result.Type}, and support will be removed from 2020-03-28 onwards.", level: LogLevel.Important);
+                               + $"This has been automatically adjusted to {Result.Type}, and support will be removed from 2021-03-28 onwards.", level: LogLevel.Important);
                 }
             }
 

From 539785e422accca0ccd360b4b02969ccf7a70a24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 Jan 2021 17:46:44 +0100
Subject: [PATCH 0792/3722] Remove obsoleted IHasCurve

---
 .../Rulesets/Objects/Legacy/ConvertSlider.cs  |  5 +-
 osu.Game/Rulesets/Objects/Types/IHasCurve.cs  | 55 -------------------
 2 files changed, 1 insertion(+), 59 deletions(-)
 delete mode 100644 osu.Game/Rulesets/Objects/Types/IHasCurve.cs

diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
index 36b421586e..df569b91c1 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
@@ -10,10 +10,7 @@ using osu.Game.Beatmaps.ControlPoints;
 
 namespace osu.Game.Rulesets.Objects.Legacy
 {
-    internal abstract class ConvertSlider : ConvertHitObject, IHasPathWithRepeats, IHasLegacyLastTickOffset,
-#pragma warning disable 618
-                                            IHasCurve
-#pragma warning restore 618
+    internal abstract class ConvertSlider : ConvertHitObject, IHasPathWithRepeats, IHasLegacyLastTickOffset
     {
         /// <summary>
         /// Scoring distance with a speed-adjusted beat length of 1 second.
diff --git a/osu.Game/Rulesets/Objects/Types/IHasCurve.cs b/osu.Game/Rulesets/Objects/Types/IHasCurve.cs
deleted file mode 100644
index 26f50ffa31..0000000000
--- a/osu.Game/Rulesets/Objects/Types/IHasCurve.cs
+++ /dev/null
@@ -1,55 +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 osuTK;
-
-namespace osu.Game.Rulesets.Objects.Types
-{
-    [Obsolete("Use IHasPathWithRepeats instead.")] // can be removed 20201126
-    public interface IHasCurve : IHasDistance, IHasRepeats
-    {
-        /// <summary>
-        /// The curve.
-        /// </summary>
-        SliderPath Path { get; }
-    }
-
-#pragma warning disable 618
-    [Obsolete("Use IHasPathWithRepeats instead.")] // can be removed 20201126
-    public static class HasCurveExtensions
-    {
-        /// <summary>
-        /// Computes the position on the curve relative to how much of the <see cref="HitObject"/> has been completed.
-        /// </summary>
-        /// <param name="obj">The curve.</param>
-        /// <param name="progress">[0, 1] where 0 is the start time of the <see cref="HitObject"/> and 1 is the end time of the <see cref="HitObject"/>.</param>
-        /// <returns>The position on the curve.</returns>
-        public static Vector2 CurvePositionAt(this IHasCurve obj, double progress)
-            => obj.Path.PositionAt(obj.ProgressAt(progress));
-
-        /// <summary>
-        /// Computes the progress along the curve relative to how much of the <see cref="HitObject"/> has been completed.
-        /// </summary>
-        /// <param name="obj">The curve.</param>
-        /// <param name="progress">[0, 1] where 0 is the start time of the <see cref="HitObject"/> and 1 is the end time of the <see cref="HitObject"/>.</param>
-        /// <returns>[0, 1] where 0 is the beginning of the curve and 1 is the end of the curve.</returns>
-        public static double ProgressAt(this IHasCurve obj, double progress)
-        {
-            double p = progress * obj.SpanCount() % 1;
-            if (obj.SpanAt(progress) % 2 == 1)
-                p = 1 - p;
-            return p;
-        }
-
-        /// <summary>
-        /// Determines which span of the curve the progress point is on.
-        /// </summary>
-        /// <param name="obj">The curve.</param>
-        /// <param name="progress">[0, 1] where 0 is the beginning of the curve and 1 is the end of the curve.</param>
-        /// <returns>[0, SpanCount) where 0 is the first run.</returns>
-        public static int SpanAt(this IHasCurve obj, double progress)
-            => (int)(progress * obj.SpanCount());
-    }
-#pragma warning restore 618
-}

From 9cc63e8dce8e65feba008ffb02195928f8ea8a46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 Jan 2021 17:48:46 +0100
Subject: [PATCH 0793/3722] Remove obsoleted IHasEndTime

---
 .../Rulesets/Objects/Types/IHasDuration.cs    | 16 +++---------
 .../Rulesets/Objects/Types/IHasEndTime.cs     | 26 -------------------
 2 files changed, 3 insertions(+), 39 deletions(-)
 delete mode 100644 osu.Game/Rulesets/Objects/Types/IHasEndTime.cs

diff --git a/osu.Game/Rulesets/Objects/Types/IHasDuration.cs b/osu.Game/Rulesets/Objects/Types/IHasDuration.cs
index b558273650..ca734da5ad 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasDuration.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasDuration.cs
@@ -6,26 +6,16 @@ namespace osu.Game.Rulesets.Objects.Types
     /// <summary>
     /// A HitObject that ends at a different time than its start time.
     /// </summary>
-#pragma warning disable 618
-    public interface IHasDuration : IHasEndTime
-#pragma warning restore 618
+    public interface IHasDuration
     {
-        double IHasEndTime.EndTime
-        {
-            get => EndTime;
-            set => Duration = (Duration - EndTime) + value;
-        }
-
-        double IHasEndTime.Duration => Duration;
-
         /// <summary>
         /// The time at which the HitObject ends.
         /// </summary>
-        new double EndTime { get; }
+        double EndTime { get; }
 
         /// <summary>
         /// The duration of the HitObject.
         /// </summary>
-        new double Duration { get; set; }
+        double Duration { get; set; }
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Types/IHasEndTime.cs b/osu.Game/Rulesets/Objects/Types/IHasEndTime.cs
deleted file mode 100644
index c3769c5909..0000000000
--- a/osu.Game/Rulesets/Objects/Types/IHasEndTime.cs
+++ /dev/null
@@ -1,26 +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 Newtonsoft.Json;
-
-namespace osu.Game.Rulesets.Objects.Types
-{
-    /// <summary>
-    /// A HitObject that ends at a different time than its start time.
-    /// </summary>
-    [Obsolete("Use IHasDuration instead.")] // can be removed 20201126
-    public interface IHasEndTime
-    {
-        /// <summary>
-        /// The time at which the HitObject ends.
-        /// </summary>
-        [JsonIgnore]
-        double EndTime { get; set; }
-
-        /// <summary>
-        /// The duration of the HitObject.
-        /// </summary>
-        double Duration { get; }
-    }
-}

From 68352782db59f2db881ba5f443bf352cf8a9c03b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 Jan 2021 18:11:47 +0100
Subject: [PATCH 0794/3722] Change .StartsWith() to .Equals()

In line with planned-but-delayed breaking change.
---
 osu.Game/Rulesets/RulesetStore.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/RulesetStore.cs b/osu.Game/Rulesets/RulesetStore.cs
index d422bca087..deabea57ef 100644
--- a/osu.Game/Rulesets/RulesetStore.cs
+++ b/osu.Game/Rulesets/RulesetStore.cs
@@ -100,9 +100,7 @@ namespace osu.Game.Rulesets
 
                 foreach (var r in instances.Where(r => !(r is ILegacyRuleset)))
                 {
-                    // todo: StartsWith can be changed to Equals on 2020-11-08
-                    // This is to give users enough time to have their database use new abbreviated info).
-                    if (existingRulesets.FirstOrDefault(ri => ri.InstantiationInfo.StartsWith(r.RulesetInfo.InstantiationInfo, StringComparison.Ordinal)) == null)
+                    if (existingRulesets.FirstOrDefault(ri => ri.InstantiationInfo.Equals(r.RulesetInfo.InstantiationInfo, StringComparison.Ordinal)) == null)
                         context.RulesetInfo.Add(r.RulesetInfo);
                 }
 

From 4998aaaa987b75de4d017f09067f44dd05caeec9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 Jan 2021 18:13:30 +0100
Subject: [PATCH 0795/3722] Remove outdated warning disable

Does not trigger any more on Rider 2020.3.2.
---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 36f8fbedb3..7ba6e400bf 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -936,7 +936,6 @@ namespace osu.Game.Screens.Select
                 Masking = false;
             }
 
-            // ReSharper disable once OptionalParameterHierarchyMismatch 2020.3 EAP4 bug. (https://youtrack.jetbrains.com/issue/RSRP-481535?p=RIDER-51910)
             protected override void OnUserScroll(float value, bool animated = true, double? distanceDecay = default)
             {
                 UserScrolling = true;

From 9984c80c87c428316d622523f805a4d7a4a4f196 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 Jan 2021 20:40:47 +0100
Subject: [PATCH 0796/3722] Make useless existing test actually fail

---
 .../Mods/TestSceneOsuModDifficultyAdjust.cs   | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
index 49c1fe8540..db8546c71b 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
@@ -1,13 +1,17 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics.Containers;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Osu.Tests.Mods
@@ -18,8 +22,23 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         public void TestNoAdjustment() => CreateModTest(new ModTestData
         {
             Mod = new OsuModDifficultyAdjust(),
+            Beatmap = new Beatmap
+            {
+                BeatmapInfo = new BeatmapInfo
+                {
+                    BaseDifficulty = new BeatmapDifficulty
+                    {
+                        CircleSize = 8
+                    }
+                },
+                HitObjects = new List<HitObject>
+                {
+                    new HitCircle { StartTime = 1000 },
+                    new HitCircle { StartTime = 2000 }
+                }
+            },
             Autoplay = true,
-            PassCondition = checkSomeHit
+            PassCondition = () => checkSomeHit() && checkObjectsScale(0.29f)
         });
 
         [Test]

From 303cc62ee7c8eec32cb9cd4522202bb3cbdf512d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 6 Jan 2021 21:57:54 +0100
Subject: [PATCH 0797/3722] Transfer flags indicating if settings were changed

---
 .../Mods/CatchModDifficultyAdjust.cs           |  4 ++--
 .../Mods/OsuModDifficultyAdjust.cs             |  4 ++--
 osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs  | 18 +++++++++++++++---
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
index acdd0a420c..438d17dbc5 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
@@ -59,8 +59,8 @@ namespace osu.Game.Rulesets.Catch.Mods
         {
             base.ApplySettings(difficulty);
 
-            difficulty.CircleSize = CircleSize.Value;
-            difficulty.ApproachRate = ApproachRate.Value;
+            ApplySetting(CircleSize, cs => difficulty.CircleSize = cs);
+            ApplySetting(ApproachRate, ar => difficulty.ApproachRate = ar);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
index ff995e38ce..a638234dbd 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
@@ -59,8 +59,8 @@ namespace osu.Game.Rulesets.Osu.Mods
         {
             base.ApplySettings(difficulty);
 
-            difficulty.CircleSize = CircleSize.Value;
-            difficulty.ApproachRate = ApproachRate.Value;
+            ApplySetting(CircleSize, cs => difficulty.CircleSize = cs);
+            ApplySetting(ApproachRate, ar => difficulty.ApproachRate = ar);
         }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
index 72a4bb297f..a531e885db 100644
--- a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
@@ -116,18 +116,30 @@ namespace osu.Game.Rulesets.Mods
 
         internal override void CopyAdjustedSetting(IBindable target, object source)
         {
-            userChangedSettings[target] = true;
+            // if the value is non-bindable, it's presumably coming from an external source (like the API) - therefore presume it is not default.
+            // if the value is bindable, defer to the source's IsDefault to be able to tell.
+            userChangedSettings[target] = !(source is IBindable bindableSource) || !bindableSource.IsDefault;
             base.CopyAdjustedSetting(target, source);
         }
 
+        /// <summary>
+        /// Applies a setting from a configuration bindable using <paramref name="applyFunc"/>, if it has been changed by the user.
+        /// </summary>
+        protected void ApplySetting<T>(BindableNumber<T> setting, Action<T> applyFunc)
+            where T : struct, IComparable<T>, IConvertible, IEquatable<T>
+        {
+            if (userChangedSettings.TryGetValue(setting, out bool userChangedSetting) && userChangedSetting)
+                applyFunc.Invoke(setting.Value);
+        }
+
         /// <summary>
         /// Apply all custom settings to the provided beatmap.
         /// </summary>
         /// <param name="difficulty">The beatmap to have settings applied.</param>
         protected virtual void ApplySettings(BeatmapDifficulty difficulty)
         {
-            difficulty.DrainRate = DrainRate.Value;
-            difficulty.OverallDifficulty = OverallDifficulty.Value;
+            ApplySetting(DrainRate, dr => difficulty.DrainRate = dr);
+            ApplySetting(OverallDifficulty, od => difficulty.OverallDifficulty = od);
         }
     }
 }

From 6620eadec3f1c7fe5fac7b98d52683d1a05aba4a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Jan 2021 18:47:03 +0900
Subject: [PATCH 0798/3722] Reduce default hover sound debounce interval

---
 osu.Game/Graphics/UserInterface/HoverSounds.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/UserInterface/HoverSounds.cs b/osu.Game/Graphics/UserInterface/HoverSounds.cs
index 40899e7e95..22d59e70f7 100644
--- a/osu.Game/Graphics/UserInterface/HoverSounds.cs
+++ b/osu.Game/Graphics/UserInterface/HoverSounds.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Graphics.UserInterface
         /// <summary>
         /// Length of debounce for hover sound playback, in milliseconds. Default is 50ms.
         /// </summary>
-        public double HoverDebounceTime { get; } = 50;
+        public double HoverDebounceTime { get; } = 20;
 
         protected readonly HoverSampleSet SampleSet;
 

From 8f52a83b297d277bf07bbda9e9e2efd2d0684092 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Jan 2021 18:47:20 +0900
Subject: [PATCH 0799/3722] Share hover sound debounce across all instances via
 SessionStatics

---
 osu.Game/Configuration/SessionStatics.cs      |  9 ++++++
 .../Graphics/UserInterface/HoverSounds.cs     | 29 +++++++++++--------
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index 03bc434aac..f28ee707b9 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.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 osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Overlays;
 
 namespace osu.Game.Configuration
 {
@@ -14,6 +16,7 @@ namespace osu.Game.Configuration
         {
             Set(Static.LoginOverlayDisplayed, false);
             Set(Static.MutedAudioNotificationShownOnce, false);
+            Set(Static.LastHoverSoundPlaybackTime, 0.0);
             Set<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null);
         }
     }
@@ -28,5 +31,11 @@ namespace osu.Game.Configuration
         /// Value under this lookup can be <c>null</c> if there are no backgrounds available (or API is not reachable).
         /// </summary>
         SeasonalBackgrounds,
+
+        /// <summary>
+        /// The last playback time in milliseconds of a hover sample (from <see cref="HoverSounds"/>).
+        /// 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
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/HoverSounds.cs b/osu.Game/Graphics/UserInterface/HoverSounds.cs
index 22d59e70f7..efd55c892c 100644
--- a/osu.Game/Graphics/UserInterface/HoverSounds.cs
+++ b/osu.Game/Graphics/UserInterface/HoverSounds.cs
@@ -5,11 +5,12 @@ using System.ComponentModel;
 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;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
-using osu.Framework.Threading;
+using osu.Game.Configuration;
 
 namespace osu.Game.Graphics.UserInterface
 {
@@ -28,31 +29,35 @@ namespace osu.Game.Graphics.UserInterface
 
         protected readonly HoverSampleSet SampleSet;
 
+        private Bindable<double> lastPlaybackTime;
+
         public HoverSounds(HoverSampleSet sampleSet = HoverSampleSet.Normal)
         {
             SampleSet = sampleSet;
             RelativeSizeAxes = Axes.Both;
         }
 
-        private ScheduledDelegate playDelegate;
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio, SessionStatics statics)
+        {
+            lastPlaybackTime = statics.GetBindable<double>(Static.LastHoverSoundPlaybackTime);
+
+            sampleHover = audio.Samples.Get($@"UI/generic-hover{SampleSet.GetDescription()}");
+        }
 
         protected override bool OnHover(HoverEvent e)
         {
-            playDelegate?.Cancel();
+            bool requiresDebounce = HoverDebounceTime <= 0;
+            bool enoughTimePassedSinceLastPlayback = lastPlaybackTime.Value == 0 || Time.Current - lastPlaybackTime.Value > HoverDebounceTime;
 
-            if (HoverDebounceTime <= 0)
+            if (!requiresDebounce || enoughTimePassedSinceLastPlayback)
+            {
                 sampleHover?.Play();
-            else
-                playDelegate = Scheduler.AddDelayed(() => sampleHover?.Play(), HoverDebounceTime);
+                lastPlaybackTime.Value = Time.Current;
+            }
 
             return base.OnHover(e);
         }
-
-        [BackgroundDependencyLoader]
-        private void load(AudioManager audio)
-        {
-            sampleHover = audio.Samples.Get($@"UI/generic-hover{SampleSet.GetDescription()}");
-        }
     }
 
     public enum HoverSampleSet

From 69ac22dd7fdd477943ce041cb42072de318c15e3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Jan 2021 19:06:10 +0900
Subject: [PATCH 0800/3722] Fix incorrectly copy pasted xmldoc

---
 osu.Game/Beatmaps/ControlPoints/ControlPoint.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
index 090675473d..e8dc623ddb 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPoint.cs
@@ -30,8 +30,7 @@ namespace osu.Game.Beatmaps.ControlPoints
         public abstract bool IsRedundant(ControlPoint existing);
 
         /// <summary>
-        /// Create a copy of this room without online information.
-        /// Should be used to create a local copy of a room for submitting in the future.
+        /// Create an unbound copy of this control point.
         /// </summary>
         public ControlPoint CreateCopy()
         {

From 00dc98e3ab0fef1b568969a5086d9ede48ec8003 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Jan 2021 19:06:52 +0900
Subject: [PATCH 0801/3722] Make legacy control point's BpmMultiplier setter
 private again

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

diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index a06ad35b89..069a25b83d 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -164,7 +164,7 @@ namespace osu.Game.Beatmaps.Formats
             /// Legacy BPM multiplier that introduces floating-point errors for rulesets that depend on it.
             /// DO NOT USE THIS UNLESS 100% SURE.
             /// </summary>
-            public float BpmMultiplier { get; set; }
+            public float BpmMultiplier { get; private set; }
 
             public LegacyDifficultyControlPoint(double beatLength)
                 : this()

From 42643fbaf69e321f8ae1d52e70ddbc17ac985a42 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Jan 2021 19:10:19 +0900
Subject: [PATCH 0802/3722] Use already resolved EditorBeatmap rather than
 resolving a second time locally

---
 osu.Game/Screens/Edit/Setup/DifficultySection.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Setup/DifficultySection.cs b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
index f180d7e63e..36fb0191b0 100644
--- a/osu.Game/Screens/Edit/Setup/DifficultySection.cs
+++ b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
@@ -13,9 +13,6 @@ namespace osu.Game.Screens.Edit.Setup
 {
     internal class DifficultySection : SetupSection
     {
-        [Resolved]
-        private EditorBeatmap editorBeatmap { get; set; }
-
         private LabelledSliderBar<float> circleSizeSlider;
         private LabelledSliderBar<float> healthDrainSlider;
         private LabelledSliderBar<float> approachRateSlider;
@@ -93,7 +90,7 @@ namespace osu.Game.Screens.Edit.Setup
             Beatmap.BeatmapInfo.BaseDifficulty.ApproachRate = approachRateSlider.Current.Value;
             Beatmap.BeatmapInfo.BaseDifficulty.OverallDifficulty = overallDifficultySlider.Current.Value;
 
-            editorBeatmap.UpdateAllHitObjects();
+            Beatmap.UpdateAllHitObjects();
         }
     }
 }

From 77b55212a3c9870a0e42cd90e77e3ae4a552e273 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Jan 2021 19:11:51 +0900
Subject: [PATCH 0803/3722] Change access of beatmap to use working for
 consistency in file

---
 osu.Game/Screens/Edit/Setup/ResourcesSection.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
index b3bceceea3..010d7c2797 100644
--- a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
+++ b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Screens.Edit.Setup
                 audioTrackTextBox = new FileChooserLabelledTextBox
                 {
                     Label = "Audio Track",
-                    Current = { Value = Beatmap.Metadata.AudioFile ?? "Click to select a track" },
+                    Current = { Value = working.Value.Metadata.AudioFile ?? "Click to select a track" },
                     Target = audioTrackFileChooserContainer,
                     TabbableContentContainer = this
                 },

From 3c3e860dbc34d37855b79786a1abb754af1667e8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 7 Jan 2021 23:52:04 +0900
Subject: [PATCH 0804/3722] Move ControlPointInfo copying to base Beatmap.Clone
 method (and remove setter)

---
 osu.Game/Beatmaps/Beatmap.cs             | 10 +++++++++-
 osu.Game/Beatmaps/IBeatmap.cs            |  2 +-
 osu.Game/Beatmaps/WorkingBeatmap.cs      |  2 --
 osu.Game/Screens/Edit/EditorBeatmap.cs   |  6 +-----
 osu.Game/Screens/Play/GameplayBeatmap.cs |  6 +-----
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Beatmaps/Beatmap.cs b/osu.Game/Beatmaps/Beatmap.cs
index 5435e86dfd..be2006e67a 100644
--- a/osu.Game/Beatmaps/Beatmap.cs
+++ b/osu.Game/Beatmaps/Beatmap.cs
@@ -50,7 +50,15 @@ namespace osu.Game.Beatmaps
 
         IBeatmap IBeatmap.Clone() => Clone();
 
-        public Beatmap<T> Clone() => (Beatmap<T>)MemberwiseClone();
+        public Beatmap<T> Clone()
+        {
+            var clone = (Beatmap<T>)MemberwiseClone();
+
+            clone.ControlPointInfo = ControlPointInfo.CreateCopy();
+            // todo: deep clone other elements as required.
+
+            return clone;
+        }
     }
 
     public class Beatmap : Beatmap<HitObject>
diff --git a/osu.Game/Beatmaps/IBeatmap.cs b/osu.Game/Beatmaps/IBeatmap.cs
index 7dd85e1232..8f27e0b0e9 100644
--- a/osu.Game/Beatmaps/IBeatmap.cs
+++ b/osu.Game/Beatmaps/IBeatmap.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Beatmaps
         /// <summary>
         /// The control points in this beatmap.
         /// </summary>
-        ControlPointInfo ControlPointInfo { get; set; }
+        ControlPointInfo ControlPointInfo { get; }
 
         /// <summary>
         /// The breaks in this beatmap.
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index d25adca92b..30382c444f 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -111,8 +111,6 @@ namespace osu.Game.Beatmaps
                 // Convert
                 IBeatmap converted = converter.Convert(cancellationSource.Token);
 
-                converted.ControlPointInfo = converted.ControlPointInfo.CreateCopy();
-
                 // Apply conversion mods to the result
                 foreach (var mod in mods.OfType<IApplicableAfterBeatmapConversion>())
                 {
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index a54a95f59d..165d2ba278 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -74,11 +74,7 @@ namespace osu.Game.Screens.Edit
 
         public BeatmapMetadata Metadata => PlayableBeatmap.Metadata;
 
-        public ControlPointInfo ControlPointInfo
-        {
-            get => PlayableBeatmap.ControlPointInfo;
-            set => PlayableBeatmap.ControlPointInfo = value;
-        }
+        public ControlPointInfo ControlPointInfo => PlayableBeatmap.ControlPointInfo;
 
         public List<BreakPeriod> Breaks => PlayableBeatmap.Breaks;
 
diff --git a/osu.Game/Screens/Play/GameplayBeatmap.cs b/osu.Game/Screens/Play/GameplayBeatmap.cs
index 565595656f..64894544f4 100644
--- a/osu.Game/Screens/Play/GameplayBeatmap.cs
+++ b/osu.Game/Screens/Play/GameplayBeatmap.cs
@@ -29,11 +29,7 @@ namespace osu.Game.Screens.Play
 
         public BeatmapMetadata Metadata => PlayableBeatmap.Metadata;
 
-        public ControlPointInfo ControlPointInfo
-        {
-            get => PlayableBeatmap.ControlPointInfo;
-            set => PlayableBeatmap.ControlPointInfo = value;
-        }
+        public ControlPointInfo ControlPointInfo => PlayableBeatmap.ControlPointInfo;
 
         public List<BreakPeriod> Breaks => PlayableBeatmap.Breaks;
 

From 11801d61c1b3701356b253c9feb3a23eaa0d1dcf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 8 Jan 2021 14:05:22 +0900
Subject: [PATCH 0805/3722] Use nullable doubule to better represent initial
 playback case

---
 osu.Game/Configuration/SessionStatics.cs       | 2 +-
 osu.Game/Graphics/UserInterface/HoverSounds.cs | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index f28ee707b9..382eab751b 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Configuration
         {
             Set(Static.LoginOverlayDisplayed, false);
             Set(Static.MutedAudioNotificationShownOnce, false);
-            Set(Static.LastHoverSoundPlaybackTime, 0.0);
+            Set(Static.LastHoverSoundPlaybackTime, (double?)0.0);
             Set<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null);
         }
     }
diff --git a/osu.Game/Graphics/UserInterface/HoverSounds.cs b/osu.Game/Graphics/UserInterface/HoverSounds.cs
index efd55c892c..29b4bf5704 100644
--- a/osu.Game/Graphics/UserInterface/HoverSounds.cs
+++ b/osu.Game/Graphics/UserInterface/HoverSounds.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Graphics.UserInterface
 
         protected readonly HoverSampleSet SampleSet;
 
-        private Bindable<double> lastPlaybackTime;
+        private Bindable<double?> lastPlaybackTime;
 
         public HoverSounds(HoverSampleSet sampleSet = HoverSampleSet.Normal)
         {
@@ -40,7 +40,7 @@ namespace osu.Game.Graphics.UserInterface
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, SessionStatics statics)
         {
-            lastPlaybackTime = statics.GetBindable<double>(Static.LastHoverSoundPlaybackTime);
+            lastPlaybackTime = statics.GetBindable<double?>(Static.LastHoverSoundPlaybackTime);
 
             sampleHover = audio.Samples.Get($@"UI/generic-hover{SampleSet.GetDescription()}");
         }
@@ -48,7 +48,7 @@ namespace osu.Game.Graphics.UserInterface
         protected override bool OnHover(HoverEvent e)
         {
             bool requiresDebounce = HoverDebounceTime <= 0;
-            bool enoughTimePassedSinceLastPlayback = lastPlaybackTime.Value == 0 || Time.Current - lastPlaybackTime.Value > HoverDebounceTime;
+            bool enoughTimePassedSinceLastPlayback = !lastPlaybackTime.Value.HasValue || Time.Current - lastPlaybackTime.Value >= HoverDebounceTime;
 
             if (!requiresDebounce || enoughTimePassedSinceLastPlayback)
             {

From e156bcdcae175f46a5c78fb9eb7c4ed5d0dbf5d0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 8 Jan 2021 14:05:34 +0900
Subject: [PATCH 0806/3722] Remove unnecessary (and broken) requiresDebounce
 check

---
 osu.Game/Graphics/UserInterface/HoverSounds.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/HoverSounds.cs b/osu.Game/Graphics/UserInterface/HoverSounds.cs
index 29b4bf5704..4d30d61ff0 100644
--- a/osu.Game/Graphics/UserInterface/HoverSounds.cs
+++ b/osu.Game/Graphics/UserInterface/HoverSounds.cs
@@ -47,10 +47,9 @@ namespace osu.Game.Graphics.UserInterface
 
         protected override bool OnHover(HoverEvent e)
         {
-            bool requiresDebounce = HoverDebounceTime <= 0;
             bool enoughTimePassedSinceLastPlayback = !lastPlaybackTime.Value.HasValue || Time.Current - lastPlaybackTime.Value >= HoverDebounceTime;
 
-            if (!requiresDebounce || enoughTimePassedSinceLastPlayback)
+            if (enoughTimePassedSinceLastPlayback)
             {
                 sampleHover?.Play();
                 lastPlaybackTime.Value = Time.Current;

From c208800150494eceb06472e45310eecc8859b29b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 8 Jan 2021 14:17:14 +0900
Subject: [PATCH 0807/3722] Fix auto selection scenario regressing due to
 scheduling too much

---
 osu.Game/Overlays/Mods/ModButton.cs | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index 51c8bcf9a9..b58e70cae6 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -52,9 +52,10 @@ namespace osu.Game.Overlays.Mods
             if (newIndex == selectedIndex) return false;
 
             int direction = newIndex < selectedIndex ? -1 : 1;
+
             bool beforeSelected = Selected;
 
-            Mod modBefore = SelectedMod ?? Mods[0];
+            Mod previousSelection = SelectedMod ?? Mods[0];
 
             if (newIndex >= Mods.Length)
                 newIndex = -1;
@@ -64,25 +65,26 @@ namespace osu.Game.Overlays.Mods
             if (newIndex >= 0 && !Mods[newIndex].HasImplementation)
                 return false;
 
+            selectedIndex = newIndex;
+
+            Mod newSelection = SelectedMod ?? Mods[0];
+
             Schedule(() =>
             {
-                selectedIndex = newIndex;
-                Mod modAfter = SelectedMod ?? Mods[0];
-
                 if (beforeSelected != Selected)
                 {
                     iconsContainer.RotateTo(Selected ? 5f : 0f, 300, Easing.OutElastic);
                     iconsContainer.ScaleTo(Selected ? 1.1f : 1f, 300, Easing.OutElastic);
                 }
 
-                if (modBefore != modAfter)
+                if (previousSelection != newSelection)
                 {
                     const float rotate_angle = 16;
 
                     foregroundIcon.RotateTo(rotate_angle * direction, mod_switch_duration, mod_switch_easing);
                     backgroundIcon.RotateTo(-rotate_angle * direction, mod_switch_duration, mod_switch_easing);
 
-                    backgroundIcon.Mod = modAfter;
+                    backgroundIcon.Mod = newSelection;
 
                     using (BeginDelayedSequence(mod_switch_duration, true))
                     {
@@ -94,15 +96,15 @@ namespace osu.Game.Overlays.Mods
                             .RotateTo(rotate_angle * direction)
                             .RotateTo(0f, mod_switch_duration, mod_switch_easing);
 
-                        Schedule(() => displayMod(modAfter));
+                        Schedule(() => displayMod(newSelection));
                     }
                 }
 
                 foregroundIcon.Selected.Value = Selected;
-
-                SelectionChanged?.Invoke(SelectedMod);
             });
 
+            SelectionChanged?.Invoke(newSelection);
+
             return true;
         }
 

From a6766e64de95cdd23dfa17e029275be3e7ea3c15 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 8 Jan 2021 17:08:01 +0900
Subject: [PATCH 0808/3722] Add custom handling of Point serialization to fix
 startup crashes of tournament client

SixLabors moved their data types around in a recent update (see
https://github.com/ppy/osu-framework/pull/4025) and it was deemed that
we should prefer `System.Drawing` primitives where possible.

This was applied to the tournament client via
https://github.com/ppy/osu/pull/11072 without correct consideration
given to the fact that we serialize these types.

`System.Drawing.Point` serializes into a comma separated string, which
seems to be less correct than what we had, so I've switched back to the
old format for the time being. We can reasses this in the future; the
main goal here is to restore usability to the tournament client.

Closes #11443.
---
 osu.Game.Tournament/JsonPointConverter.cs | 67 +++++++++++++++++++++++
 osu.Game.Tournament/TournamentGameBase.cs |  7 ++-
 2 files changed, 71 insertions(+), 3 deletions(-)
 create mode 100644 osu.Game.Tournament/JsonPointConverter.cs

diff --git a/osu.Game.Tournament/JsonPointConverter.cs b/osu.Game.Tournament/JsonPointConverter.cs
new file mode 100644
index 0000000000..57b91958d8
--- /dev/null
+++ b/osu.Game.Tournament/JsonPointConverter.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.Diagnostics;
+using System.Drawing;
+using Newtonsoft.Json;
+
+namespace osu.Game.Tournament
+{
+    /// <summary>
+    /// We made a change from using SixLabors.ImageSharp.Point to System.Drawing.Point at some stage.
+    /// This handles converting to a standardised format on json serialize/deserialize operations.
+    /// </summary>
+    internal class JsonPointConverter : JsonConverter<Point>
+    {
+        public override void WriteJson(JsonWriter writer, Point value, JsonSerializer serializer)
+        {
+            // use the format of LaborSharp's Point since it is nicer.
+            serializer.Serialize(writer, new SixLabors.ImageSharp.Point(value.X, value.Y));
+        }
+
+        public override Point ReadJson(JsonReader reader, Type objectType, Point existingValue, bool hasExistingValue, JsonSerializer serializer)
+        {
+            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;
+
+                Debug.Assert(str != null);
+
+                var split = str.Split(',');
+
+                return new Point(int.Parse(split[0]), int.Parse(split[1]));
+            }
+
+            var point = new Point();
+
+            while (reader.Read())
+            {
+                if (reader.TokenType == JsonToken.EndObject) break;
+
+                if (reader.TokenType == JsonToken.PropertyName)
+                {
+                    var name = reader.Value?.ToString();
+                    int? val = reader.ReadAsInt32();
+
+                    if (val == null)
+                        continue;
+
+                    switch (name)
+                    {
+                        case "X":
+                            point.X = val.Value;
+                            break;
+
+                        case "Y":
+                            point.Y = val.Value;
+                            break;
+                    }
+                }
+            }
+
+            return point;
+        }
+    }
+}
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index dbda6aa023..bc36f27e5b 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -8,12 +8,12 @@ using Newtonsoft.Json;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input;
-using osu.Framework.Platform;
 using osu.Framework.IO.Stores;
+using osu.Framework.Platform;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API.Requests;
-using osu.Game.Tournament.IPC;
 using osu.Game.Tournament.IO;
+using osu.Game.Tournament.IPC;
 using osu.Game.Tournament.Models;
 using osu.Game.Users;
 using osuTK.Input;
@@ -60,7 +60,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());
+                    ladder = JsonConvert.DeserializeObject<LadderInfo>(sr.ReadToEnd(), new JsonPointConverter());
             }
 
             ladder ??= new LadderInfo();
@@ -251,6 +251,7 @@ namespace osu.Game.Tournament
                         Formatting = Formatting.Indented,
                         NullValueHandling = NullValueHandling.Ignore,
                         DefaultValueHandling = DefaultValueHandling.Ignore,
+                        Converters = new JsonConverter[] { new JsonPointConverter() }
                     }));
             }
         }

From edd328c8fecdb2566c8f68f087f2c8089219bb77 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 8 Jan 2021 17:24:55 +0900
Subject: [PATCH 0809/3722] Move bindable closer to source class

---
 .../OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
index c6018a79e9..04030cdbfd 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -37,12 +37,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
         [Resolved]
         private OngoingOperationTracker ongoingOperationTracker { get; set; }
 
+        private IBindable<bool> operationInProgress;
+
         private SampleChannel sampleReadyCount;
 
         private readonly ButtonWithTrianglesExposed button;
 
         private int countReady;
-        private IBindable<bool> operationInProgress;
 
         public MultiplayerReadyButton()
         {

From 924f91ed9b91445d4cba0bd819441a0959021faa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 8 Jan 2021 15:56:35 +0100
Subject: [PATCH 0810/3722] Fix song select test doing the completely wrong
 thing

---
 .../Visual/SongSelect/TestSceneAdvancedStats.cs   | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneAdvancedStats.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneAdvancedStats.cs
index 3d3517ada4..40b2f66d74 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneAdvancedStats.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneAdvancedStats.cs
@@ -11,6 +11,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Screens.Select.Details;
 using osuTK.Graphics;
 
@@ -141,16 +142,12 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddStep("select changed Difficulty Adjust mod", () =>
             {
                 var ruleset = advancedStats.Beatmap.Ruleset.CreateInstance();
-                var difficultyAdjustMod = ruleset.GetAllMods().OfType<ModDifficultyAdjust>().Single();
+                var difficultyAdjustMod = ruleset.GetAllMods().OfType<OsuModDifficultyAdjust>().Single();
                 var originalDifficulty = advancedStats.Beatmap.BaseDifficulty;
-                var adjustedDifficulty = new BeatmapDifficulty
-                {
-                    CircleSize = originalDifficulty.CircleSize,
-                    DrainRate = originalDifficulty.DrainRate - 0.5f,
-                    OverallDifficulty = originalDifficulty.OverallDifficulty,
-                    ApproachRate = originalDifficulty.ApproachRate + 2.2f,
-                };
-                difficultyAdjustMod.ReadFromDifficulty(adjustedDifficulty);
+
+                difficultyAdjustMod.ReadFromDifficulty(originalDifficulty);
+                difficultyAdjustMod.DrainRate.Value = originalDifficulty.DrainRate - 0.5f;
+                difficultyAdjustMod.ApproachRate.Value = originalDifficulty.ApproachRate + 2.2f;
                 SelectedMods.Value = new[] { difficultyAdjustMod };
             });
 

From 9182f5dafb224baf6e6534edc7c727026231a1b2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 9 Jan 2021 00:38:38 +0900
Subject: [PATCH 0811/3722] Switch to using an anonymous type for serialisation
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.Tournament/JsonPointConverter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/JsonPointConverter.cs b/osu.Game.Tournament/JsonPointConverter.cs
index 57b91958d8..7ad972f3e7 100644
--- a/osu.Game.Tournament/JsonPointConverter.cs
+++ b/osu.Game.Tournament/JsonPointConverter.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Tournament
         public override void WriteJson(JsonWriter writer, Point value, JsonSerializer serializer)
         {
             // use the format of LaborSharp's Point since it is nicer.
-            serializer.Serialize(writer, new SixLabors.ImageSharp.Point(value.X, value.Y));
+            serializer.Serialize(writer, new { value.X, value.Y });
         }
 
         public override Point ReadJson(JsonReader reader, Type objectType, Point existingValue, bool hasExistingValue, JsonSerializer serializer)

From 82725b59c030d27abd3159ee3397a4b77e834b1a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 9 Jan 2021 00:56:54 +0900
Subject: [PATCH 0812/3722] Use PointConverter

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

diff --git a/osu.Game.Tournament/JsonPointConverter.cs b/osu.Game.Tournament/JsonPointConverter.cs
index 7ad972f3e7..9c82f8ac06 100644
--- a/osu.Game.Tournament/JsonPointConverter.cs
+++ b/osu.Game.Tournament/JsonPointConverter.cs
@@ -29,9 +29,7 @@ namespace osu.Game.Tournament
 
                 Debug.Assert(str != null);
 
-                var split = str.Split(',');
-
-                return new Point(int.Parse(split[0]), int.Parse(split[1]));
+                return new PointConverter().ConvertFromString(str) as Point? ?? new Point();
             }
 
             var point = new Point();

From 0cf5be3ef432a718d23bab4fc951f04182375ebb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 8 Jan 2021 17:02:57 +0100
Subject: [PATCH 0813/3722] Fix selection change event being invoked with wrong
 mod

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

diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index b58e70cae6..ab8efdabcc 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -103,7 +103,7 @@ namespace osu.Game.Overlays.Mods
                 foregroundIcon.Selected.Value = Selected;
             });
 
-            SelectionChanged?.Invoke(newSelection);
+            SelectionChanged?.Invoke(SelectedMod);
 
             return true;
         }

From 8feaf3fb6ad084885f8b69b997caea7faf92bb50 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 9 Jan 2021 01:24:18 +0900
Subject: [PATCH 0814/3722] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 611f0d05f4..492c88c7e4 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.1229.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.106.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 6c220a5c21..f28a55e016 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.1229.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.106.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
     <PackageReference Include="Sentry" Version="2.1.8" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 5445adb3fb..93be3645ee 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1229.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.106.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -88,7 +88,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.1229.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.106.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From d507a08951b33618a00fcce8e3c61ab289ee9172 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 8 Jan 2021 18:16:03 +0100
Subject: [PATCH 0815/3722] Start with null last hover playback time

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

diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index 382eab751b..fd401119ff 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Configuration
         {
             Set(Static.LoginOverlayDisplayed, false);
             Set(Static.MutedAudioNotificationShownOnce, false);
-            Set(Static.LastHoverSoundPlaybackTime, (double?)0.0);
+            Set(Static.LastHoverSoundPlaybackTime, (double?)null);
             Set<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null);
         }
     }

From 49c6abcb5c1a8eaa3baa8d0c3b94b2799b3e82cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 8 Jan 2021 18:25:51 +0100
Subject: [PATCH 0816/3722] Remove mention of default value in xmldoc

Just bound to get outdated with every change anyway. Look at the actual
default value declaration to see what the default is.
---
 osu.Game/Graphics/UserInterface/HoverSounds.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/UserInterface/HoverSounds.cs b/osu.Game/Graphics/UserInterface/HoverSounds.cs
index 4d30d61ff0..a1d06711db 100644
--- a/osu.Game/Graphics/UserInterface/HoverSounds.cs
+++ b/osu.Game/Graphics/UserInterface/HoverSounds.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Graphics.UserInterface
         private SampleChannel sampleHover;
 
         /// <summary>
-        /// Length of debounce for hover sound playback, in milliseconds. Default is 50ms.
+        /// Length of debounce for hover sound playback, in milliseconds.
         /// </summary>
         public double HoverDebounceTime { get; } = 20;
 

From 52789118a363bf0f648936d9d629d2afa554c76b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 8 Jan 2021 19:59:13 +0100
Subject: [PATCH 0817/3722] Schedule play button state update

Revealed by the framework-side transform thread safety checks. `Stopped`
is even annotated as not being thread-safe (but was annotated as such
long after the class's nascence).
---
 osu.Game/Overlays/BeatmapListing/Panels/PlayButton.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapListing/Panels/PlayButton.cs b/osu.Game/Overlays/BeatmapListing/Panels/PlayButton.cs
index e95fdeecf4..04df27ce52 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/PlayButton.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/PlayButton.cs
@@ -142,7 +142,9 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
 
                     AddInternal(preview);
                     loading = false;
-                    preview.Stopped += () => Playing.Value = false;
+                    // make sure that the update of value of Playing (and the ensuing value change callbacks)
+                    // are marshaled back to the update thread.
+                    preview.Stopped += () => Schedule(() => Playing.Value = false);
 
                     // user may have changed their mind.
                     if (Playing.Value)

From 274a045d8dbd03640280b422674bd5c7b0eebf44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 8 Jan 2021 20:01:47 +0100
Subject: [PATCH 0818/3722] Remove Dispose() override

Culls another non-thread-safe mutation of the `Playing` bindable.
It seems to be a weird vestige from an earlier revision of the old
"direct" panel, which relied on `DisposeOnDeathRemoval` to finish track
playback (and then was removed in
6c150c9ed793799fd6672cc2107c97c2e3844a09). The play button is no longer
responsible for managing preview track lifetime anyway;
`PreviewTrackManager`'s method are intended for that.
---
 osu.Game/Overlays/BeatmapListing/Panels/PlayButton.cs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListing/Panels/PlayButton.cs b/osu.Game/Overlays/BeatmapListing/Panels/PlayButton.cs
index 04df27ce52..eb409785e0 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/PlayButton.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/PlayButton.cs
@@ -163,11 +163,5 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
             if (Preview?.Start() != true)
                 Playing.Value = false;
         }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-            Playing.Value = false;
-        }
     }
 }

From 284d30d336d0d7b851481a084c3067c45ff3cfdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 8 Jan 2021 21:13:36 +0100
Subject: [PATCH 0819/3722] Move screen activity update to LoadComplete()

Fixes a potential crash when moving from main menu to editor after
having previously opened the login settings overlay. Setting the
activity in BDL as done before is unsafe, as that set can trigger value
change callbacks, which in turn can trigger adding transforms, which
should always be done on the update thread.

Semantically it also makes sense, as the user activity should change
once the screen they're moving to has actually loaded and displayed to
the user.
---
 osu.Game/Screens/OsuScreen.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index e1a29946f4..9b716b323d 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -143,7 +143,11 @@ namespace osu.Game.Screens
         private void load(OsuGame osu, AudioManager audio)
         {
             sampleExit = audio.Samples.Get(@"UI/screen-back");
+        }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
             Activity.Value ??= InitialActivity;
         }
 

From dad5dd36676de0c965c645b2564e496adb334908 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 8 Jan 2021 22:17:37 +0100
Subject: [PATCH 0820/3722] Remove unnecessary permissiveness wrt null

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs  | 3 ++-
 osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs   | 9 ++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 39323d9db9..e539b315e4 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -241,7 +241,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             void endOperation()
             {
-                readyClickOperation?.Dispose();
+                Debug.Assert(readyClickOperation != null);
+                readyClickOperation.Dispose();
                 readyClickOperation = null;
             }
         }
diff --git a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
index 6a340d7954..c34d39136e 100644
--- a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
+++ b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
@@ -40,13 +40,12 @@ namespace osu.Game.Screens.OnlinePlay
             return new InvokeOnDisposal(endOperation);
         }
 
-        /// <summary>
-        /// Ends tracking an online operation.
-        /// Does nothing if an operation has not been begun yet.
-        /// </summary>
         private void endOperation()
         {
-            leasedInProgress?.Return();
+            if (leasedInProgress == null)
+                throw new InvalidOperationException("Cannot end operation multiple times.");
+
+            leasedInProgress.Return();
             leasedInProgress = null;
         }
     }

From c2eeb822b84d007beec6190cda094ca3ea1ba062 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 8 Jan 2021 22:23:38 +0100
Subject: [PATCH 0821/3722] Rename {joiningRoom -> operationInProgress}

---
 osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
index 2a16a62714..9b4e78543c 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
         protected override UserActivity InitialActivity => new UserActivity.SearchingForLobby();
 
         private readonly IBindable<bool> initialRoomsReceived = new Bindable<bool>();
-        private readonly IBindable<bool> joiningRoom = new Bindable<bool>();
+        private readonly IBindable<bool> operationInProgress = new Bindable<bool>();
 
         private FilterControl filter;
         private Container content;
@@ -110,8 +110,8 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
 
             if (ongoingOperationTracker != null)
             {
-                joiningRoom.BindTo(ongoingOperationTracker.InProgress);
-                joiningRoom.BindValueChanged(_ => updateLoadingLayer(), true);
+                operationInProgress.BindTo(ongoingOperationTracker.InProgress);
+                operationInProgress.BindValueChanged(_ => updateLoadingLayer(), true);
             }
         }
 
@@ -187,7 +187,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
 
         private void updateLoadingLayer()
         {
-            if (joiningRoom.Value || !initialRoomsReceived.Value)
+            if (operationInProgress.Value || !initialRoomsReceived.Value)
                 loadingLayer.Show();
             else
                 loadingLayer.Hide();

From ff60d652ed6094054125990375dc9edc8ea05313 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 8 Jan 2021 22:28:21 +0100
Subject: [PATCH 0822/3722] Move out test ongoing operation tracker to higher
 level

---
 .../Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs   | 6 +-----
 osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs   | 3 +++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
index a6037dcbf2..8b9bffcee1 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
@@ -15,7 +15,6 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
-using osu.Game.Screens.OnlinePlay;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
 using osu.Game.Tests.Resources;
 using osu.Game.Users;
@@ -31,9 +30,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
         private BeatmapManager beatmaps;
         private RulesetStore rulesets;
 
-        [Cached]
-        private OngoingOperationTracker ongoingOperationTracker = new OngoingOperationTracker();
-
         private IDisposable readyClickOperation;
 
         [BackgroundDependencyLoader]
@@ -66,7 +62,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 },
                 OnReadyClick = async () =>
                 {
-                    readyClickOperation = ongoingOperationTracker.BeginOperation();
+                    readyClickOperation = OngoingOperationTracker.BeginOperation();
 
                     if (Client.IsHost && Client.LocalUser?.State == MultiplayerUserState.Ready)
                     {
diff --git a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
index da0e39d965..75ddb34685 100644
--- a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
@@ -23,6 +23,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Cached]
         public Bindable<FilterCriteria> Filter { get; }
 
+        [Cached]
+        public OngoingOperationTracker OngoingOperationTracker { get; } = new OngoingOperationTracker();
+
         protected override Container<Drawable> Content => content;
         private readonly TestMultiplayerRoomContainer content;
 

From 0aad0c7c6c5dd363bd5bb75d2eb4cc5c35a3804f Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 9 Jan 2021 00:30:12 +0300
Subject: [PATCH 0823/3722] Target logic at `this` and adjust variables

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

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 7fe9a06597..e72e9a004f 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -144,12 +144,12 @@ namespace osu.Game.Rulesets.Mods
 
             foreach (var (_, prop) in this.GetSettingsSourceProperties())
             {
-                var origBindable = (IBindable)prop.GetValue(this);
-                var copyBindable = (IBindable)prop.GetValue(copy);
+                var targetBindable = (IBindable)prop.GetValue(this);
+                var sourceBindable = (IBindable)prop.GetValue(them);
 
                 // we only care about changes that have been made away from defaults.
-                if (!origBindable.IsDefault)
-                    copy.CopyAdjustedSetting(copyBindable, origBindable);
+                if (!sourceBindable.IsDefault)
+                    CopyAdjustedSetting(targetBindable, sourceBindable);
             }
         }
 

From 8c3955d34136026b2387864223b065c7f57b185e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 9 Jan 2021 21:38:20 +0100
Subject: [PATCH 0824/3722] Improve safety of ongoing operation tracker

Finishing an operation started via
`OngoingOperationTracker.BeginOperation()` was risky in cases where the
operation ended at a callback on another thread (which, in the case of
multiplayer, is *most* cases). In particular, if any consumer registered
a callback that mutates transforms when the operation ends, it would
result in crashes after the framework-side safety checks.

Rework `OngoingOperationTracker` into an always-present component
residing in the drawable hierarchy, and ensure that the
`operationInProgress` bindable is always updated on the update thread.
This way consumers don't have to add local schedules in multiple places.
---
 .../TestSceneCreateMultiplayerMatchButton.cs          |  7 +------
 .../Screens/OnlinePlay/OngoingOperationTracker.cs     | 11 +++++++++--
 osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs       |  5 +++--
 .../Tests/Visual/Multiplayer/MultiplayerTestScene.cs  |  3 ++-
 .../Multiplayer/TestMultiplayerRoomContainer.cs       |  4 ++++
 5 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneCreateMultiplayerMatchButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneCreateMultiplayerMatchButton.cs
index 381270c5aa..2f0398c6ef 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneCreateMultiplayerMatchButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneCreateMultiplayerMatchButton.cs
@@ -3,18 +3,13 @@
 
 using System;
 using NUnit.Framework;
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Game.Screens.OnlinePlay;
 using osu.Game.Screens.OnlinePlay.Multiplayer;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneCreateMultiplayerMatchButton : MultiplayerTestScene
     {
-        [Cached]
-        private OngoingOperationTracker ongoingOperationTracker = new OngoingOperationTracker();
-
         private CreateMultiplayerMatchButton button;
 
         public override void SetUpSteps()
@@ -36,7 +31,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             assertButtonEnableState(true);
 
-            AddStep("begin joining room", () => joiningRoomOperation = ongoingOperationTracker.BeginOperation());
+            AddStep("begin joining room", () => joiningRoomOperation = OngoingOperationTracker.BeginOperation());
             assertButtonEnableState(false);
 
             AddStep("end joining room", () => joiningRoomOperation.Dispose());
diff --git a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
index c34d39136e..5c9e9ce90b 100644
--- a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
+++ b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
 
 namespace osu.Game.Screens.OnlinePlay
 {
@@ -11,7 +12,7 @@ namespace osu.Game.Screens.OnlinePlay
     /// Utility class to track ongoing online operations' progress.
     /// Can be used to disable interactivity while waiting for a response from online sources.
     /// </summary>
-    public class OngoingOperationTracker
+    public class OngoingOperationTracker : Component
     {
         /// <summary>
         /// Whether there is an online operation in progress.
@@ -22,6 +23,11 @@ namespace osu.Game.Screens.OnlinePlay
 
         private LeasedBindable<bool> leasedInProgress;
 
+        public OngoingOperationTracker()
+        {
+            AlwaysPresent = true;
+        }
+
         /// <summary>
         /// Begins tracking a new online operation.
         /// </summary>
@@ -37,7 +43,8 @@ namespace osu.Game.Screens.OnlinePlay
             leasedInProgress = inProgress.BeginLease(true);
             leasedInProgress.Value = true;
 
-            return new InvokeOnDisposal(endOperation);
+            // for extra safety, marshal the end of operation back to the update thread if necessary.
+            return new InvokeOnDisposal(() => Scheduler.Add(endOperation, false));
         }
 
         private void endOperation()
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index b73e0a7c52..71fd0d5c76 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Screens.OnlinePlay
         private readonly Bindable<FilterCriteria> currentFilter = new Bindable<FilterCriteria>(new FilterCriteria());
 
         [Cached]
-        private readonly OngoingOperationTracker ongoingOperationTracker = new OngoingOperationTracker();
+        private OngoingOperationTracker ongoingOperationTracker { get; set; }
 
         [Resolved(CanBeNull = true)]
         private MusicController music { get; set; }
@@ -144,7 +144,8 @@ namespace osu.Game.Screens.OnlinePlay
                         };
                         button.Action = () => OpenNewRoom();
                     }),
-                    RoomManager = CreateRoomManager()
+                    RoomManager = CreateRoomManager(),
+                    ongoingOperationTracker = new OngoingOperationTracker()
                 }
             };
 
diff --git a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
index 75ddb34685..a87b22affe 100644
--- a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         public Bindable<FilterCriteria> Filter { get; }
 
         [Cached]
-        public OngoingOperationTracker OngoingOperationTracker { get; } = new OngoingOperationTracker();
+        public OngoingOperationTracker OngoingOperationTracker { get; }
 
         protected override Container<Drawable> Content => content;
         private readonly TestMultiplayerRoomContainer content;
@@ -39,6 +39,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             Client = content.Client;
             RoomManager = content.RoomManager;
             Filter = content.Filter;
+            OngoingOperationTracker = content.OngoingOperationTracker;
         }
 
         [SetUp]
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs
index ad3e2f7105..860caef071 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs
@@ -25,6 +25,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Cached]
         public readonly Bindable<FilterCriteria> Filter = new Bindable<FilterCriteria>(new FilterCriteria());
 
+        [Cached]
+        public readonly OngoingOperationTracker OngoingOperationTracker;
+
         public TestMultiplayerRoomContainer()
         {
             RelativeSizeAxes = Axes.Both;
@@ -33,6 +36,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             {
                 Client = new TestMultiplayerClient(),
                 RoomManager = new TestMultiplayerRoomManager(),
+                OngoingOperationTracker = new OngoingOperationTracker(),
                 content = new Container { RelativeSizeAxes = Axes.Both }
             });
         }

From 4b4adc927cb49a166f9f13c093c318afbbe18f2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 10 Jan 2021 15:35:53 +0100
Subject: [PATCH 0825/3722] Rename param to match method body

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

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index e72e9a004f..3a8717e678 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -134,18 +134,18 @@ namespace osu.Game.Rulesets.Mods
         }
 
         /// <summary>
-        /// Copies mod setting values from <paramref name="them"/> into this instance.
+        /// Copies mod setting values from <paramref name="source"/> into this instance.
         /// </summary>
-        /// <param name="them">The mod to copy properties from.</param>
-        public void CopyFrom(Mod them)
+        /// <param name="source">The mod to copy properties from.</param>
+        public void CopyFrom(Mod source)
         {
-            if (them.GetType() != GetType())
-                throw new ArgumentException($"Expected mod of type {GetType()}, got {them.GetType()}.", nameof(them));
+            if (source.GetType() != GetType())
+                throw new ArgumentException($"Expected mod of type {GetType()}, got {source.GetType()}.", nameof(source));
 
             foreach (var (_, prop) in this.GetSettingsSourceProperties())
             {
                 var targetBindable = (IBindable)prop.GetValue(this);
-                var sourceBindable = (IBindable)prop.GetValue(them);
+                var sourceBindable = (IBindable)prop.GetValue(source);
 
                 // we only care about changes that have been made away from defaults.
                 if (!sourceBindable.IsDefault)

From f466791b69d3341b05625157ae52301a4a035be6 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sun, 10 Jan 2021 17:34:20 +0100
Subject: [PATCH 0826/3722] Move assignments to the TournamentSwitcher
 component

This also adds conditional checks for displaying the "Close osu!" button
---
 osu.Game.Tournament/Screens/SetupScreen.cs | 41 ++++++++++++++++------
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index de3321397e..7ae0375b9a 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -42,17 +42,13 @@ namespace osu.Game.Tournament.Screens
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
-        [Resolved]
-        private TournamentGameBase game { get; set; }
-
         [Resolved(canBeNull: true)]
         private TournamentSceneManager sceneManager { get; set; }
 
         private Bindable<Size> windowSize;
-        private TournamentStorage storage;
 
         [BackgroundDependencyLoader]
-        private void load(FrameworkConfigManager frameworkConfig, Storage storage)
+        private void load(FrameworkConfigManager frameworkConfig)
         {
             windowSize = frameworkConfig.GetBindable<Size>(FrameworkSetting.WindowedSize);
 
@@ -67,7 +63,6 @@ namespace osu.Game.Tournament.Screens
 
             api.LocalUser.BindValueChanged(_ => Schedule(reload));
             stableInfo.OnStableInfoSaved += () => Schedule(reload);
-            this.storage = (TournamentStorage)storage;
             reload();
         }
 
@@ -119,10 +114,6 @@ namespace osu.Game.Tournament.Screens
                 {
                     Label = "Current tournament",
                     Description = "Changes the background videos and bracket to match the selected tournament. This requires a restart to apply changes.",
-                    Items = storage.ListTournaments(),
-                    Current = storage.CurrentTournament,
-                    ButtonText = "Close osu!",
-                    Action = () => game.GracefullyExit()
                 },
                 resolution = new ResolutionSelector
                 {
@@ -240,14 +231,44 @@ namespace osu.Game.Tournament.Screens
                 set => dropdown.Current = value;
             }
 
+            private string originalTournament;
+
+            private TournamentStorage storage;
+
+            [Resolved]
+            private TournamentGameBase game { get; set; }
+
+            [BackgroundDependencyLoader]
+            private void load(Storage storage)
+            {
+                this.storage = (TournamentStorage)storage;
+                Current = this.storage.CurrentTournament;
+                originalTournament = this.storage.CurrentTournament.Value;
+                Items = this.storage.ListTournaments();
+                Action = () => game.GracefullyExit();
+                ButtonText = "Close osu!";
+            }
+
             protected override Drawable CreateComponent()
             {
                 var drawable = base.CreateComponent();
+
                 FlowContainer.Insert(-1, dropdown = new OsuDropdown<string>
                 {
                     Width = 510
                 });
 
+                Current.BindValueChanged(v =>
+                {
+                    if (v.NewValue == originalTournament)
+                    {
+                        Button.Hide();
+                        return;
+                    }
+
+                    Button.Show();
+                });
+
                 return drawable;
             }
         }

From bd377237884c071617df95c797650fd1af2774bd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 11 Jan 2021 01:47:04 +0900
Subject: [PATCH 0827/3722] Expose as IBindable for added safety

---
 .../BeatmapListing/Panels/BeatmapPanel.cs     |  2 +-
 .../BeatmapListing/Panels/PlayButton.cs       | 21 +++++++++++--------
 .../BeatmapSet/Buttons/PreviewButton.cs       |  3 ++-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanel.cs b/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanel.cs
index 1567e18caa..afb5eeda36 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanel.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanel.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
         private Container content;
 
         public PreviewTrack Preview => PlayButton.Preview;
-        public Bindable<bool> PreviewPlaying => PlayButton?.Playing;
+        public IBindable<bool> PreviewPlaying => PlayButton?.Playing;
 
         protected abstract PlayButton PlayButton { get; }
         protected abstract Box PreviewBar { get; }
diff --git a/osu.Game/Overlays/BeatmapListing/Panels/PlayButton.cs b/osu.Game/Overlays/BeatmapListing/Panels/PlayButton.cs
index eb409785e0..4bbc3569fe 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/PlayButton.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/PlayButton.cs
@@ -18,7 +18,10 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
 {
     public class PlayButton : Container
     {
-        public readonly BindableBool Playing = new BindableBool();
+        public IBindable<bool> Playing => playing;
+
+        private readonly BindableBool playing = new BindableBool();
+
         public PreviewTrack Preview { get; private set; }
 
         private BeatmapSetInfo beatmapSet;
@@ -36,7 +39,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                 Preview?.Expire();
                 Preview = null;
 
-                Playing.Value = false;
+                playing.Value = false;
             }
         }
 
@@ -82,7 +85,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                 },
             });
 
-            Playing.ValueChanged += playingStateChanged;
+            playing.ValueChanged += playingStateChanged;
         }
 
         [Resolved]
@@ -96,7 +99,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
 
         protected override bool OnClick(ClickEvent e)
         {
-            Playing.Toggle();
+            playing.Toggle();
             return true;
         }
 
@@ -108,7 +111,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
-            if (!Playing.Value)
+            if (!playing.Value)
                 icon.FadeColour(Color4.White, 120, Easing.InOutQuint);
             base.OnHoverLost(e);
         }
@@ -122,7 +125,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
             {
                 if (BeatmapSet == null)
                 {
-                    Playing.Value = false;
+                    playing.Value = false;
                     return;
                 }
 
@@ -144,10 +147,10 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                     loading = false;
                     // make sure that the update of value of Playing (and the ensuing value change callbacks)
                     // are marshaled back to the update thread.
-                    preview.Stopped += () => Schedule(() => Playing.Value = false);
+                    preview.Stopped += () => Schedule(() => playing.Value = false);
 
                     // user may have changed their mind.
-                    if (Playing.Value)
+                    if (playing.Value)
                         attemptStart();
                 });
             }
@@ -161,7 +164,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
         private void attemptStart()
         {
             if (Preview?.Start() != true)
-                Playing.Value = false;
+                playing.Value = false;
         }
     }
 }
diff --git a/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs b/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs
index 6accce7d77..56d60a97b2 100644
--- a/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs
+++ b/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs
@@ -24,7 +24,8 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
         private readonly PlayButton playButton;
 
         private PreviewTrack preview => playButton.Preview;
-        public Bindable<bool> Playing => playButton.Playing;
+
+        public IBindable<bool> Playing => playButton.Playing;
 
         public BeatmapSetInfo BeatmapSet
         {

From d2ca6da0fdae2f14b7430aa0d183e31087f5c3f0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 11 Jan 2021 01:56:09 +0900
Subject: [PATCH 0828/3722] Remove unused constant

---
 osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs b/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs
index 56d60a97b2..a5e5f664c9 100644
--- a/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs
+++ b/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs
@@ -18,8 +18,6 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
 {
     public class PreviewButton : OsuClickableContainer
     {
-        private const float transition_duration = 500;
-
         private readonly Box background, progress;
         private readonly PlayButton playButton;
 

From e99310b59cfddbad40882e187a79668cdd865bb4 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 11 Jan 2021 08:02:57 +0300
Subject: [PATCH 0829/3722] Add JsonConstructor attribute

---
 osu.Game/Online/Rooms/BeatmapAvailability.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Online/Rooms/BeatmapAvailability.cs b/osu.Game/Online/Rooms/BeatmapAvailability.cs
index 1fd099fcc7..4796e26d14 100644
--- a/osu.Game/Online/Rooms/BeatmapAvailability.cs
+++ b/osu.Game/Online/Rooms/BeatmapAvailability.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using Newtonsoft.Json;
 
 namespace osu.Game.Online.Rooms
 {
@@ -20,6 +21,7 @@ namespace osu.Game.Online.Rooms
         /// </summary>
         public readonly double? DownloadProgress;
 
+        [JsonConstructor]
         private BeatmapAvailability(DownloadState state, double? downloadProgress = null)
         {
             State = state;

From a8dfa5e2a9b09e07893c83fb410b0c669e6868a5 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 11 Jan 2021 08:04:00 +0300
Subject: [PATCH 0830/3722] Rename typo'd method

---
 osu.Game/Online/Rooms/BeatmapAvailability.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/Rooms/BeatmapAvailability.cs b/osu.Game/Online/Rooms/BeatmapAvailability.cs
index 4796e26d14..794e79ce55 100644
--- a/osu.Game/Online/Rooms/BeatmapAvailability.cs
+++ b/osu.Game/Online/Rooms/BeatmapAvailability.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Online.Rooms
             DownloadProgress = downloadProgress;
         }
 
-        public static BeatmapAvailability NotDownload() => new BeatmapAvailability(DownloadState.NotDownloaded);
+        public static BeatmapAvailability NotDownloaded() => new BeatmapAvailability(DownloadState.NotDownloaded);
         public static BeatmapAvailability Downloading(double progress) => new BeatmapAvailability(DownloadState.Downloading, progress);
         public static BeatmapAvailability Downloaded() => new BeatmapAvailability(DownloadState.Downloaded);
         public static BeatmapAvailability LocallyAvailable() => new BeatmapAvailability(DownloadState.LocallyAvailable);

From 2286e3679f75adb10b9ba7f32316db4e116cea71 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 11 Jan 2021 08:21:07 +0300
Subject: [PATCH 0831/3722] Downloaded -> Importing

---
 osu.Game/Online/Rooms/BeatmapAvailability.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/Rooms/BeatmapAvailability.cs b/osu.Game/Online/Rooms/BeatmapAvailability.cs
index 794e79ce55..b6b9c632fe 100644
--- a/osu.Game/Online/Rooms/BeatmapAvailability.cs
+++ b/osu.Game/Online/Rooms/BeatmapAvailability.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Online.Rooms
 
         public static BeatmapAvailability NotDownloaded() => new BeatmapAvailability(DownloadState.NotDownloaded);
         public static BeatmapAvailability Downloading(double progress) => new BeatmapAvailability(DownloadState.Downloading, progress);
-        public static BeatmapAvailability Downloaded() => new BeatmapAvailability(DownloadState.Downloaded);
+        public static BeatmapAvailability Importing() => new BeatmapAvailability(DownloadState.Downloaded);
         public static BeatmapAvailability LocallyAvailable() => new BeatmapAvailability(DownloadState.LocallyAvailable);
 
         public bool Equals(BeatmapAvailability other) => other != null && State == other.State && DownloadProgress == other.DownloadProgress;

From 49057e8cbcca3921affcefca625365c5d9ccf23c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 11 Jan 2021 14:35:42 +0900
Subject: [PATCH 0832/3722] Cache TournamentStorage explicitly for better
 safety

---
 osu.Game.Tournament/TournamentGameBase.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index bc36f27e5b..97c950261b 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -40,6 +40,8 @@ namespace osu.Game.Tournament
             Resources.AddStore(new DllResourceStore(typeof(TournamentGameBase).Assembly));
 
             dependencies.CacheAs<Storage>(storage = new TournamentStorage(baseStorage));
+            dependencies.CacheAs(storage);
+
             dependencies.Cache(new TournamentVideoResourceStore(storage));
 
             Textures.AddStore(new TextureLoaderStore(new StorageBackedResourceStore(storage)));

From ba3a7a0501aad64940217bd104d4d74f96ed5e1d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 11 Jan 2021 14:35:47 +0900
Subject: [PATCH 0833/3722] Clean up code

---
 osu.Game.Tournament/Screens/SetupScreen.cs | 40 +++++-----------------
 1 file changed, 9 insertions(+), 31 deletions(-)

diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index 7ae0375b9a..cefad148a0 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -219,33 +219,22 @@ namespace osu.Game.Tournament.Screens
         {
             private OsuDropdown<string> dropdown;
 
-            public IEnumerable<string> Items
-            {
-                get => dropdown.Items;
-                set => dropdown.Items = value;
-            }
-
-            public Bindable<string> Current
-            {
-                get => dropdown.Current;
-                set => dropdown.Current = value;
-            }
-
-            private string originalTournament;
-
-            private TournamentStorage storage;
+            private string startupTournament;
 
             [Resolved]
             private TournamentGameBase game { get; set; }
 
             [BackgroundDependencyLoader]
-            private void load(Storage storage)
+            private void load(TournamentStorage storage)
             {
-                this.storage = (TournamentStorage)storage;
-                Current = this.storage.CurrentTournament;
-                originalTournament = this.storage.CurrentTournament.Value;
-                Items = this.storage.ListTournaments();
+                dropdown.Current = storage.CurrentTournament;
+                dropdown.Items = storage.ListTournaments();
+                dropdown.Current.BindValueChanged(v => Button.FadeTo(v.NewValue == startupTournament ? 0 : 1));
+
+                startupTournament = storage.CurrentTournament.Value;
+
                 Action = () => game.GracefullyExit();
+
                 ButtonText = "Close osu!";
             }
 
@@ -258,17 +247,6 @@ namespace osu.Game.Tournament.Screens
                     Width = 510
                 });
 
-                Current.BindValueChanged(v =>
-                {
-                    if (v.NewValue == originalTournament)
-                    {
-                        Button.Hide();
-                        return;
-                    }
-
-                    Button.Show();
-                });
-
                 return drawable;
             }
         }

From bd627534b76edaf9bb71329eb50597ac3b17f9cf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 11 Jan 2021 14:38:51 +0900
Subject: [PATCH 0834/3722] Use disabled state instead of hiding button

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

diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index cefad148a0..c7b299e07f 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -227,11 +227,11 @@ namespace osu.Game.Tournament.Screens
             [BackgroundDependencyLoader]
             private void load(TournamentStorage storage)
             {
+                startupTournament = storage.CurrentTournament.Value;
+
                 dropdown.Current = storage.CurrentTournament;
                 dropdown.Items = storage.ListTournaments();
-                dropdown.Current.BindValueChanged(v => Button.FadeTo(v.NewValue == startupTournament ? 0 : 1));
-
-                startupTournament = storage.CurrentTournament.Value;
+                dropdown.Current.BindValueChanged(v => Button.Enabled.Value = v.NewValue != startupTournament, true);
 
                 Action = () => game.GracefullyExit();
 

From 7a7c583ded7de7e6a354f49d83f131b7471c89f9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 11 Jan 2021 14:44:07 +0900
Subject: [PATCH 0835/3722] Move setup screen classes out of single file and
 into their own namespace

---
 .../Screens/TestSceneSetupScreen.cs           |   2 +-
 .../TestSceneStablePathSelectScreen.cs        |   2 +-
 .../Screens/Setup/ActionableInfo.cs           |  69 +++++++++
 .../Screens/Setup/ResolutionSelector.cs       |  50 ++++++
 .../Screens/{ => Setup}/SetupScreen.cs        | 145 +-----------------
 .../{ => Setup}/StablePathSelectScreen.cs     |   4 +-
 .../Screens/Setup/TournamentSwitcher.cs       |  43 ++++++
 osu.Game.Tournament/TournamentSceneManager.cs |   1 +
 8 files changed, 168 insertions(+), 148 deletions(-)
 create mode 100644 osu.Game.Tournament/Screens/Setup/ActionableInfo.cs
 create mode 100644 osu.Game.Tournament/Screens/Setup/ResolutionSelector.cs
 rename osu.Game.Tournament/Screens/{ => Setup}/SetupScreen.cs (54%)
 rename osu.Game.Tournament/Screens/{ => Setup}/StablePathSelectScreen.cs (99%)
 create mode 100644 osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneSetupScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneSetupScreen.cs
index 650b4c5412..70b260c84c 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneSetupScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneSetupScreen.cs
@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Game.Tournament.Screens;
+using osu.Game.Tournament.Screens.Setup;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreen.cs
index 6e63b2d799..b422227788 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneStablePathSelectScreen.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.Tournament.Screens;
+using osu.Game.Tournament.Screens.Setup;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
diff --git a/osu.Game.Tournament/Screens/Setup/ActionableInfo.cs b/osu.Game.Tournament/Screens/Setup/ActionableInfo.cs
new file mode 100644
index 0000000000..f7d52a294e
--- /dev/null
+++ b/osu.Game.Tournament/Screens/Setup/ActionableInfo.cs
@@ -0,0 +1,69 @@
+using System;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Graphics.UserInterfaceV2;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Tournament.Screens.Setup
+{
+    internal class ActionableInfo : LabelledDrawable<Drawable>
+    {
+        protected OsuButton Button;
+
+        public ActionableInfo()
+            : base(true)
+        {
+        }
+
+        public string ButtonText
+        {
+            set => Button.Text = value;
+        }
+
+        public string Value
+        {
+            set => valueText.Text = value;
+        }
+
+        public bool Failing
+        {
+            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,
+            RelativeSizeAxes = Axes.X,
+            Children = new Drawable[]
+            {
+                valueText = new TournamentSpriteText
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                },
+                FlowContainer = new FillFlowContainer
+                {
+                    Anchor = Anchor.CentreRight,
+                    Origin = Anchor.CentreRight,
+                    AutoSizeAxes = Axes.Both,
+                    Spacing = new Vector2(10, 0),
+                    Children = new Drawable[]
+                    {
+                        Button = new TriangleButton
+                        {
+                            Size = new Vector2(100, 40),
+                            Action = () => Action?.Invoke()
+                        }
+                    }
+                }
+            }
+        };
+    }
+}
diff --git a/osu.Game.Tournament/Screens/Setup/ResolutionSelector.cs b/osu.Game.Tournament/Screens/Setup/ResolutionSelector.cs
new file mode 100644
index 0000000000..47472c386c
--- /dev/null
+++ b/osu.Game.Tournament/Screens/Setup/ResolutionSelector.cs
@@ -0,0 +1,50 @@
+using System;
+using osu.Framework.Graphics;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Tournament.Screens.Setup
+{
+    internal class ResolutionSelector : ActionableInfo
+    {
+        private const int minimum_window_height = 480;
+        private const int maximum_window_height = 2160;
+
+        public new Action<int> Action;
+
+        private OsuNumberBox numberBox;
+
+        protected override Drawable CreateComponent()
+        {
+            var drawable = base.CreateComponent();
+            FlowContainer.Insert(-1, numberBox = new OsuNumberBox
+            {
+                Text = "1080",
+                Width = 100
+            });
+
+            base.Action = () =>
+            {
+                if (string.IsNullOrEmpty(numberBox.Text))
+                    return;
+
+                // box contains text
+                if (!int.TryParse(numberBox.Text, out var number))
+                {
+                    // at this point, the only reason we can arrive here is if the input number was too big to parse into an int
+                    // so clamp to max allowed value
+                    number = maximum_window_height;
+                }
+                else
+                {
+                    number = Math.Clamp(number, minimum_window_height, maximum_window_height);
+                }
+
+                // in case number got clamped, reset number in numberBox
+                numberBox.Text = number.ToString();
+
+                Action?.Invoke(number);
+            };
+            return drawable;
+        }
+    }
+}
diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/Setup/SetupScreen.cs
similarity index 54%
rename from osu.Game.Tournament/Screens/SetupScreen.cs
rename to osu.Game.Tournament/Screens/Setup/SetupScreen.cs
index c7b299e07f..5d8f0405ca 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/Setup/SetupScreen.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.Drawing;
 using osu.Framework.Allocation;
@@ -9,19 +8,16 @@ using osu.Framework.Bindables;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Platform;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
-using osu.Game.Tournament.IO;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Rulesets;
 using osu.Game.Tournament.IPC;
 using osu.Game.Tournament.Models;
 using osuTK;
-using osuTK.Graphics;
 
-namespace osu.Game.Tournament.Screens
+namespace osu.Game.Tournament.Screens.Setup
 {
     public class SetupScreen : TournamentScreen, IProvideVideo
     {
@@ -155,144 +151,5 @@ namespace osu.Game.Tournament.Screens
                 Width = 0.5f,
             };
         }
-
-        private class ActionableInfo : LabelledDrawable<Drawable>
-        {
-            protected OsuButton Button;
-
-            public ActionableInfo()
-                : base(true)
-            {
-            }
-
-            public string ButtonText
-            {
-                set => Button.Text = value;
-            }
-
-            public string Value
-            {
-                set => valueText.Text = value;
-            }
-
-            public bool Failing
-            {
-                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,
-                RelativeSizeAxes = Axes.X,
-                Children = new Drawable[]
-                {
-                    valueText = new TournamentSpriteText
-                    {
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                    },
-                    FlowContainer = new FillFlowContainer
-                    {
-                        Anchor = Anchor.CentreRight,
-                        Origin = Anchor.CentreRight,
-                        AutoSizeAxes = Axes.Both,
-                        Spacing = new Vector2(10, 0),
-                        Children = new Drawable[]
-                        {
-                            Button = new TriangleButton
-                            {
-                                Size = new Vector2(100, 40),
-                                Action = () => Action?.Invoke()
-                            }
-                        }
-                    }
-                }
-            };
-        }
-
-        private class TournamentSwitcher : ActionableInfo
-        {
-            private OsuDropdown<string> dropdown;
-
-            private string startupTournament;
-
-            [Resolved]
-            private TournamentGameBase game { get; set; }
-
-            [BackgroundDependencyLoader]
-            private void load(TournamentStorage storage)
-            {
-                startupTournament = storage.CurrentTournament.Value;
-
-                dropdown.Current = storage.CurrentTournament;
-                dropdown.Items = storage.ListTournaments();
-                dropdown.Current.BindValueChanged(v => Button.Enabled.Value = v.NewValue != startupTournament, true);
-
-                Action = () => game.GracefullyExit();
-
-                ButtonText = "Close osu!";
-            }
-
-            protected override Drawable CreateComponent()
-            {
-                var drawable = base.CreateComponent();
-
-                FlowContainer.Insert(-1, dropdown = new OsuDropdown<string>
-                {
-                    Width = 510
-                });
-
-                return drawable;
-            }
-        }
-
-        private class ResolutionSelector : ActionableInfo
-        {
-            private const int minimum_window_height = 480;
-            private const int maximum_window_height = 2160;
-
-            public new Action<int> Action;
-
-            private OsuNumberBox numberBox;
-
-            protected override Drawable CreateComponent()
-            {
-                var drawable = base.CreateComponent();
-                FlowContainer.Insert(-1, numberBox = new OsuNumberBox
-                {
-                    Text = "1080",
-                    Width = 100
-                });
-
-                base.Action = () =>
-                {
-                    if (string.IsNullOrEmpty(numberBox.Text))
-                        return;
-
-                    // box contains text
-                    if (!int.TryParse(numberBox.Text, out var number))
-                    {
-                        // at this point, the only reason we can arrive here is if the input number was too big to parse into an int
-                        // so clamp to max allowed value
-                        number = maximum_window_height;
-                    }
-                    else
-                    {
-                        number = Math.Clamp(number, minimum_window_height, maximum_window_height);
-                    }
-
-                    // in case number got clamped, reset number in numberBox
-                    numberBox.Text = number.ToString();
-
-                    Action?.Invoke(number);
-                };
-                return drawable;
-            }
-        }
     }
 }
diff --git a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs b/osu.Game.Tournament/Screens/Setup/StablePathSelectScreen.cs
similarity index 99%
rename from osu.Game.Tournament/Screens/StablePathSelectScreen.cs
rename to osu.Game.Tournament/Screens/Setup/StablePathSelectScreen.cs
index 717b43f704..03f79b644f 100644
--- a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
+++ b/osu.Game.Tournament/Screens/Setup/StablePathSelectScreen.cs
@@ -13,11 +13,11 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Overlays;
-using osu.Game.Tournament.IPC;
 using osu.Game.Tournament.Components;
+using osu.Game.Tournament.IPC;
 using osuTK;
 
-namespace osu.Game.Tournament.Screens
+namespace osu.Game.Tournament.Screens.Setup
 {
     public class StablePathSelectScreen : TournamentScreen
     {
diff --git a/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs b/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
new file mode 100644
index 0000000000..a993a0594a
--- /dev/null
+++ b/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
@@ -0,0 +1,43 @@
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Tournament.IO;
+
+namespace osu.Game.Tournament.Screens.Setup
+{
+    internal class TournamentSwitcher : ActionableInfo
+    {
+        private OsuDropdown<string> dropdown;
+
+        private string startupTournament;
+
+        [Resolved]
+        private TournamentGameBase game { get; set; }
+
+        [BackgroundDependencyLoader]
+        private void load(TournamentStorage storage)
+        {
+            startupTournament = storage.CurrentTournament.Value;
+
+            dropdown.Current = storage.CurrentTournament;
+            dropdown.Items = storage.ListTournaments();
+            dropdown.Current.BindValueChanged(v => Button.Enabled.Value = v.NewValue != startupTournament, true);
+
+            Action = () => game.GracefullyExit();
+
+            ButtonText = "Close osu!";
+        }
+
+        protected override Drawable CreateComponent()
+        {
+            var drawable = base.CreateComponent();
+
+            FlowContainer.Insert(-1, dropdown = new OsuDropdown<string>
+            {
+                Width = 510
+            });
+
+            return drawable;
+        }
+    }
+}
\ No newline at end of file
diff --git a/osu.Game.Tournament/TournamentSceneManager.cs b/osu.Game.Tournament/TournamentSceneManager.cs
index 870ea466cc..ced1a8ec72 100644
--- a/osu.Game.Tournament/TournamentSceneManager.cs
+++ b/osu.Game.Tournament/TournamentSceneManager.cs
@@ -19,6 +19,7 @@ using osu.Game.Tournament.Screens.Gameplay;
 using osu.Game.Tournament.Screens.Ladder;
 using osu.Game.Tournament.Screens.MapPool;
 using osu.Game.Tournament.Screens.Schedule;
+using osu.Game.Tournament.Screens.Setup;
 using osu.Game.Tournament.Screens.Showcase;
 using osu.Game.Tournament.Screens.TeamIntro;
 using osu.Game.Tournament.Screens.TeamWin;

From c9466426b743471e36e4126f3637d44c00fc819c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 11 Jan 2021 14:45:01 +0900
Subject: [PATCH 0836/3722] Change field to local variable

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

diff --git a/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs b/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
index a993a0594a..e38a374e1c 100644
--- a/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
+++ b/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
@@ -9,15 +9,13 @@ namespace osu.Game.Tournament.Screens.Setup
     {
         private OsuDropdown<string> dropdown;
 
-        private string startupTournament;
-
         [Resolved]
         private TournamentGameBase game { get; set; }
 
         [BackgroundDependencyLoader]
         private void load(TournamentStorage storage)
         {
-            startupTournament = storage.CurrentTournament.Value;
+            string startupTournament = storage.CurrentTournament.Value;
 
             dropdown.Current = storage.CurrentTournament;
             dropdown.Items = storage.ListTournaments();
@@ -40,4 +38,4 @@ namespace osu.Game.Tournament.Screens.Setup
             return drawable;
         }
     }
-}
\ No newline at end of file
+}

From f65042cf4452997589ba678b8c4670a16eafdd65 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 11 Jan 2021 15:47:27 +0900
Subject: [PATCH 0837/3722] Add missing licence headers

---
 osu.Game.Tournament/Screens/Setup/ActionableInfo.cs     | 3 +++
 osu.Game.Tournament/Screens/Setup/ResolutionSelector.cs | 3 +++
 osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/osu.Game.Tournament/Screens/Setup/ActionableInfo.cs b/osu.Game.Tournament/Screens/Setup/ActionableInfo.cs
index f7d52a294e..cfdf9c99ae 100644
--- a/osu.Game.Tournament/Screens/Setup/ActionableInfo.cs
+++ b/osu.Game.Tournament/Screens/Setup/ActionableInfo.cs
@@ -1,3 +1,6 @@
+// Copyright (c) ppy 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.Graphics.Containers;
diff --git a/osu.Game.Tournament/Screens/Setup/ResolutionSelector.cs b/osu.Game.Tournament/Screens/Setup/ResolutionSelector.cs
index 47472c386c..4b518ea7c7 100644
--- a/osu.Game.Tournament/Screens/Setup/ResolutionSelector.cs
+++ b/osu.Game.Tournament/Screens/Setup/ResolutionSelector.cs
@@ -1,3 +1,6 @@
+// Copyright (c) ppy 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.Game.Graphics.UserInterface;
diff --git a/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs b/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
index e38a374e1c..74c872646c 100644
--- a/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
+++ b/osu.Game.Tournament/Screens/Setup/TournamentSwitcher.cs
@@ -1,3 +1,6 @@
+// Copyright (c) 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.Game.Graphics.UserInterface;

From 90fb67b377e2022f3bfa60dfca4f31a7d3670228 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 11 Jan 2021 20:52:02 +0300
Subject: [PATCH 0838/3722] Update code in-line with decided direction

---
 osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs      | 1 -
 osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs | 1 -
 2 files changed, 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
index 7fda526faf..f324a1a216 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
@@ -43,7 +43,6 @@ namespace osu.Game.Online.Multiplayer
 
         /// <summary>
         /// Change the user's local availability state of the beatmap set in joined room.
-        /// This will also force user state back to <see cref="MultiplayerUserState.Idle"/>.
         /// </summary>
         /// <param name="newBeatmapAvailability">The proposed new beatmap availability state.</param>
         Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability);
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index c155447f8c..7fbc770351 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -83,7 +83,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
             Debug.Assert(Room != null);
 
             ((IMultiplayerClient)this).UserBeatmapAvailabilityChanged(userId, newBeatmapAvailability);
-            ChangeUserState(userId, MultiplayerUserState.Idle);
         }
 
         protected override Task<MultiplayerRoom> JoinRoom(long roomId)

From 0d5fbb15ac06c321a0f43d9a2e6ff5d9a61e8cc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 11 Jan 2021 20:28:24 +0100
Subject: [PATCH 0839/3722] Fix up code comments

Default value restated in xmldoc was snipped because it's made redundant
by the initialiser and possibly bound to be outdated at some point.
---
 osu.Game/Online/Multiplayer/IMultiplayerClient.cs        | 2 +-
 osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs    | 2 +-
 osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs       | 2 +-
 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
index 5410fbc030..19dd473230 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Online.Multiplayer
         Task UserStateChanged(int userId, MultiplayerUserState state);
 
         /// <summary>
-        /// Signals that a user in this room has their beatmap availability state changed.
+        /// Signals that a user in this room changed their beatmap availability state.
         /// </summary>
         /// <param name="userId">The ID of the user whose beatmap availability state has changed.</param>
         /// <param name="beatmapAvailability">The new beatmap availability state of the user.</param>
diff --git a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
index f324a1a216..09816974a7 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Online.Multiplayer
         Task ChangeState(MultiplayerUserState newState);
 
         /// <summary>
-        /// Change the user's local availability state of the beatmap set in joined room.
+        /// Change the local user's availability state of the current beatmap set in joined room.
         /// </summary>
         /// <param name="newBeatmapAvailability">The proposed new beatmap availability state.</param>
         Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability);
diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
index f515b574df..2590acbc81 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Online.Multiplayer
         public MultiplayerUserState State { get; set; } = MultiplayerUserState.Idle;
 
         /// <summary>
-        /// The availability state of the beatmap, set to <see cref="DownloadState.LocallyAvailable"/> by default.
+        /// The availability state of the current beatmap.
         /// </summary>
         public BeatmapAvailability BeatmapAvailability { get; set; } = BeatmapAvailability.LocallyAvailable();
 
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 799b66020c..99aa8fe015 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -322,7 +322,7 @@ namespace osu.Game.Online.Multiplayer
             {
                 var user = Room?.Users.SingleOrDefault(u => u.UserID == userId);
 
-                // we don't care whether the room doesn't exist or user isn't in joined room, just return in that point.
+                // errors here are not critical - beatmap availability state is mostly for display.
                 if (user == null)
                     return;
 

From 249be461d511b10f541ef331b3b1aebe666d74be Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 12 Jan 2021 11:09:55 +0300
Subject: [PATCH 0840/3722] Add "explicit maps" search filter control

---
 .../Online/API/Requests/SearchBeatmapSetsRequest.cs   |  8 +++++++-
 .../BeatmapListing/BeatmapListingFilterControl.cs     |  4 +++-
 .../BeatmapListing/BeatmapListingSearchControl.cs     |  6 +++++-
 osu.Game/Overlays/BeatmapListing/SearchExplicit.cs    | 11 +++++++++++
 4 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 osu.Game/Overlays/BeatmapListing/SearchExplicit.cs

diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index bbaa7e745f..939d3c6cb4 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Online.API.Requests
 
         public SearchPlayed Played { get; }
 
+        public SearchExplicit Explicit { get; }
+
         [CanBeNull]
         public IReadOnlyCollection<ScoreRank> Ranks { get; }
 
@@ -50,7 +52,8 @@ namespace osu.Game.Online.API.Requests
             SearchLanguage language = SearchLanguage.Any,
             IReadOnlyCollection<SearchExtra> extra = null,
             IReadOnlyCollection<ScoreRank> ranks = null,
-            SearchPlayed played = SearchPlayed.Any)
+            SearchPlayed played = SearchPlayed.Any,
+            SearchExplicit explicitMaps = SearchExplicit.Hide)
         {
             this.query = string.IsNullOrEmpty(query) ? string.Empty : System.Uri.EscapeDataString(query);
             this.ruleset = ruleset;
@@ -64,6 +67,7 @@ namespace osu.Game.Online.API.Requests
             Extra = extra;
             Ranks = ranks;
             Played = played;
+            Explicit = explicitMaps;
         }
 
         protected override WebRequest CreateWebRequest()
@@ -93,6 +97,8 @@ namespace osu.Game.Online.API.Requests
             if (Played != SearchPlayed.Any)
                 req.AddParameter("played", Played.ToString().ToLowerInvariant());
 
+            req.AddParameter("nsfw", Explicit == SearchExplicit.Show ? "true" : "false");
+
             req.AddCursor(cursor);
 
             return req;
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
index d991dcfcfb..650adcb4a9 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
@@ -141,6 +141,7 @@ namespace osu.Game.Overlays.BeatmapListing
             searchControl.Extra.CollectionChanged += (_, __) => queueUpdateSearch();
             searchControl.Ranks.CollectionChanged += (_, __) => queueUpdateSearch();
             searchControl.Played.BindValueChanged(_ => queueUpdateSearch());
+            searchControl.Explicit.BindValueChanged(_ => queueUpdateSearch());
 
             sortCriteria.BindValueChanged(_ => queueUpdateSearch());
             sortDirection.BindValueChanged(_ => queueUpdateSearch());
@@ -193,7 +194,8 @@ namespace osu.Game.Overlays.BeatmapListing
                 searchControl.Language.Value,
                 searchControl.Extra,
                 searchControl.Ranks,
-                searchControl.Played.Value);
+                searchControl.Played.Value,
+                searchControl.Explicit.Value);
 
             getSetsRequest.Success += response =>
             {
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
index e232bf045f..c14d693f7d 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
@@ -42,6 +42,8 @@ namespace osu.Game.Overlays.BeatmapListing
 
         public Bindable<SearchPlayed> Played => playedFilter.Current;
 
+        public Bindable<SearchExplicit> Explicit => explicitFilter.Current;
+
         public BeatmapSetInfo BeatmapSet
         {
             set
@@ -65,6 +67,7 @@ namespace osu.Game.Overlays.BeatmapListing
         private readonly BeatmapSearchMultipleSelectionFilterRow<SearchExtra> extraFilter;
         private readonly BeatmapSearchScoreFilterRow ranksFilter;
         private readonly BeatmapSearchFilterRow<SearchPlayed> playedFilter;
+        private readonly BeatmapSearchFilterRow<SearchExplicit> explicitFilter;
 
         private readonly Box background;
         private readonly UpdateableBeatmapSetCover beatmapCover;
@@ -125,7 +128,8 @@ namespace osu.Game.Overlays.BeatmapListing
                                     languageFilter = new BeatmapSearchFilterRow<SearchLanguage>(@"Language"),
                                     extraFilter = new BeatmapSearchMultipleSelectionFilterRow<SearchExtra>(@"Extra"),
                                     ranksFilter = new BeatmapSearchScoreFilterRow(),
-                                    playedFilter = new BeatmapSearchFilterRow<SearchPlayed>(@"Played")
+                                    playedFilter = new BeatmapSearchFilterRow<SearchPlayed>(@"Played"),
+                                    explicitFilter = new BeatmapSearchFilterRow<SearchExplicit>(@"Explicit Maps"),
                                 }
                             }
                         }
diff --git a/osu.Game/Overlays/BeatmapListing/SearchExplicit.cs b/osu.Game/Overlays/BeatmapListing/SearchExplicit.cs
new file mode 100644
index 0000000000..3e57cdd48c
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListing/SearchExplicit.cs
@@ -0,0 +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.
+
+namespace osu.Game.Overlays.BeatmapListing
+{
+    public enum SearchExplicit
+    {
+        Hide,
+        Show
+    }
+}

From 24c18397397648894f0b943ec98e2f63735c71cf Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 12 Jan 2021 11:10:25 +0300
Subject: [PATCH 0841/3722] Add global web setting for allowing explicit
 content

---
 osu.Game/Configuration/OsuConfigManager.cs           |  3 +++
 .../BeatmapListing/BeatmapListingSearchControl.cs    | 12 +++++++++++-
 .../Overlays/Settings/Sections/Online/WebSettings.cs |  6 ++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index eb34a0885d..5e7a843baf 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -60,6 +60,8 @@ namespace osu.Game.Configuration
             Set(OsuSetting.ExternalLinkWarning, true);
             Set(OsuSetting.PreferNoVideo, false);
 
+            Set(OsuSetting.AllowExplicitContent, false);
+
             // Audio
             Set(OsuSetting.VolumeInactive, 0.25, 0, 1, 0.01);
 
@@ -270,5 +272,6 @@ namespace osu.Game.Configuration
         EditorWaveformOpacity,
         DiscordRichPresence,
         AutomaticallyDownloadWhenSpectating,
+        AllowExplicitContent,
     }
 }
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
index c14d693f7d..3761aee312 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
@@ -11,6 +11,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osuTK.Graphics;
@@ -140,10 +141,19 @@ namespace osu.Game.Overlays.BeatmapListing
             categoryFilter.Current.Value = SearchCategory.Leaderboard;
         }
 
+        private IBindable<bool> allowExplicitContent;
+
         [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
+        private void load(OverlayColourProvider colourProvider, OsuConfigManager config)
         {
             background.Colour = colourProvider.Dark6;
+
+            allowExplicitContent = config.GetBindable<bool>(OsuSetting.AllowExplicitContent);
+            allowExplicitContent.BindValueChanged(allow =>
+            {
+                // Update search control if global "explicit allowed" setting changed.
+                Explicit.Value = allow.NewValue ? SearchExplicit.Show : SearchExplicit.Hide;
+            }, true);
         }
 
         public void TakeFocus() => textBox.TakeFocus();
diff --git a/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs b/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
index 8134c350a6..da7ef46f65 100644
--- a/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
@@ -33,6 +33,12 @@ namespace osu.Game.Overlays.Settings.Sections.Online
                     Keywords = new[] { "spectator" },
                     Current = config.GetBindable<bool>(OsuSetting.AutomaticallyDownloadWhenSpectating),
                 },
+                new SettingsCheckbox
+                {
+                    LabelText = "Hide warnings for explicit content in beatmaps",
+                    Keywords = new[] { "nsfw", "18+", "offensive" },
+                    Current = config.GetBindable<bool>(OsuSetting.AllowExplicitContent),
+                }
             };
         }
     }

From 80fa2cf69330ff805c1de0f4464682a8f79b5156 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 12 Jan 2021 11:14:05 +0300
Subject: [PATCH 0842/3722] Add test coverage

---
 .../TestSceneBeatmapListingSearchControl.cs   | 71 +++++++++++++------
 1 file changed, 48 insertions(+), 23 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
index 3f757031f8..cb86047dea 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
@@ -7,6 +7,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osu.Game.Overlays.BeatmapListing;
@@ -19,9 +20,18 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
 
-        private readonly BeatmapListingSearchControl control;
+        private BeatmapListingSearchControl control;
 
-        public TestSceneBeatmapListingSearchControl()
+        private OsuConfigManager localConfig;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Dependencies.Cache(localConfig = new OsuConfigManager(LocalStorage));
+        }
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
         {
             OsuSpriteText query;
             OsuSpriteText ruleset;
@@ -31,30 +41,34 @@ namespace osu.Game.Tests.Visual.UserInterface
             OsuSpriteText extra;
             OsuSpriteText ranks;
             OsuSpriteText played;
+            OsuSpriteText explicitMap;
 
-            Add(control = new BeatmapListingSearchControl
+            Children = new Drawable[]
             {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-            });
-
-            Add(new FillFlowContainer
-            {
-                AutoSizeAxes = Axes.Both,
-                Direction = FillDirection.Vertical,
-                Spacing = new Vector2(0, 5),
-                Children = new Drawable[]
+                control = new BeatmapListingSearchControl
                 {
-                    query = new OsuSpriteText(),
-                    ruleset = new OsuSpriteText(),
-                    category = new OsuSpriteText(),
-                    genre = new OsuSpriteText(),
-                    language = new OsuSpriteText(),
-                    extra = new OsuSpriteText(),
-                    ranks = new OsuSpriteText(),
-                    played = new OsuSpriteText()
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+                new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Vertical,
+                    Spacing = new Vector2(0, 5),
+                    Children = new Drawable[]
+                    {
+                        query = new OsuSpriteText(),
+                        ruleset = new OsuSpriteText(),
+                        category = new OsuSpriteText(),
+                        genre = new OsuSpriteText(),
+                        language = new OsuSpriteText(),
+                        extra = new OsuSpriteText(),
+                        ranks = new OsuSpriteText(),
+                        played = new OsuSpriteText(),
+                        explicitMap = new OsuSpriteText(),
+                    }
                 }
-            });
+            };
 
             control.Query.BindValueChanged(q => query.Text = $"Query: {q.NewValue}", true);
             control.Ruleset.BindValueChanged(r => ruleset.Text = $"Ruleset: {r.NewValue}", true);
@@ -64,7 +78,8 @@ namespace osu.Game.Tests.Visual.UserInterface
             control.Extra.BindCollectionChanged((u, v) => extra.Text = $"Extra: {(control.Extra.Any() ? string.Join('.', control.Extra.Select(i => i.ToString().ToLowerInvariant())) : "")}", true);
             control.Ranks.BindCollectionChanged((u, v) => ranks.Text = $"Ranks: {(control.Ranks.Any() ? string.Join('.', control.Ranks.Select(i => i.ToString())) : "")}", true);
             control.Played.BindValueChanged(p => played.Text = $"Played: {p.NewValue}", true);
-        }
+            control.Explicit.BindValueChanged(e => explicitMap.Text = $"Explicit Maps: {e.NewValue}", true);
+        });
 
         [Test]
         public void TestCovers()
@@ -74,6 +89,16 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("Set null beatmap", () => control.BeatmapSet = null);
         }
 
+        [Test]
+        public void TestExplicitConfig()
+        {
+            AddStep("configure explicit content to allowed", () => localConfig.Set(OsuSetting.AllowExplicitContent, true));
+            AddAssert("explicit control set to show", () => control.Explicit.Value == SearchExplicit.Show);
+
+            AddStep("configure explicit content to disallowed", () => localConfig.Set(OsuSetting.AllowExplicitContent, false));
+            AddAssert("explicit control set to hide", () => control.Explicit.Value == SearchExplicit.Hide);
+        }
+
         private static readonly BeatmapSetInfo beatmap_set = new BeatmapSetInfo
         {
             OnlineInfo = new BeatmapSetOnlineInfo

From 422260797b68cc6e3710d327c4e3accc66d4797c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 Jan 2021 16:03:12 +0900
Subject: [PATCH 0843/3722] Revert polling changes to fix participant list
 display

It turns out this polling was necessary to get extra data that isn't
included in the main listing request. It was removed deemed useless, and
in order to fix the order of rooms changing when selecting a room.
Weirdly, I can't reproduce this happening any more, and on close
inspection of the code can't see how it could happen in the first place.

For now, let's revert this change and iterate from there, if/when the
same issue arises again.

I've discussed avoiding this second poll by potentially including more
data (just `user_id`s?) in the main listing request, but not 100% sure
on this - even if the returned data is minimal it's an extra join
server-side, which could cause performance issues for large numbers of
rooms.
---
 .../TestSceneMultiplayerRoomManager.cs        |  1 +
 .../OnlinePlay/Multiplayer/Multiplayer.cs     |  5 +++-
 .../Multiplayer/MultiplayerRoomManager.cs     | 28 ++++++++++++++++++-
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
index 80d1acd145..7a3845cbf3 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
@@ -143,6 +143,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 RoomManager =
                 {
                     TimeBetweenListingPolls = { Value = 1 },
+                    TimeBetweenSelectionPolls = { Value = 1 }
                 }
             };
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
index 310617a0bc..76f5c74433 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
@@ -33,6 +33,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             if (!this.IsCurrentScreen())
             {
                 multiplayerRoomManager.TimeBetweenListingPolls.Value = 0;
+                multiplayerRoomManager.TimeBetweenSelectionPolls.Value = 0;
             }
             else
             {
@@ -40,16 +41,18 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 {
                     case LoungeSubScreen _:
                         multiplayerRoomManager.TimeBetweenListingPolls.Value = isIdle ? 120000 : 15000;
+                        multiplayerRoomManager.TimeBetweenSelectionPolls.Value = isIdle ? 120000 : 15000;
                         break;
 
                     // Don't poll inside the match or anywhere else.
                     default:
                         multiplayerRoomManager.TimeBetweenListingPolls.Value = 0;
+                        multiplayerRoomManager.TimeBetweenSelectionPolls.Value = 0;
                         break;
                 }
             }
 
-            Logger.Log($"Polling adjusted (listing: {multiplayerRoomManager.TimeBetweenListingPolls.Value})");
+            Logger.Log($"Polling adjusted (listing: {multiplayerRoomManager.TimeBetweenListingPolls.Value}, selection: {multiplayerRoomManager.TimeBetweenSelectionPolls.Value})");
         }
 
         protected override Room CreateNewRoom()
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
index 5c327266a3..3cb263298f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         private StatefulMultiplayerClient multiplayerClient { get; set; }
 
         public readonly Bindable<double> TimeBetweenListingPolls = new Bindable<double>();
-
+        public readonly Bindable<double> TimeBetweenSelectionPolls = new Bindable<double>();
         private readonly IBindable<bool> isConnected = new Bindable<bool>();
         private readonly Bindable<bool> allowPolling = new Bindable<bool>();
 
@@ -119,6 +119,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 TimeBetweenPolls = { BindTarget = TimeBetweenListingPolls },
                 AllowPolling = { BindTarget = allowPolling }
             },
+            new MultiplayerSelectionPollingComponent
+            {
+                TimeBetweenPolls = { BindTarget = TimeBetweenSelectionPolls },
+                AllowPolling = { BindTarget = allowPolling }
+            }
         };
 
         private class MultiplayerListingPollingComponent : ListingPollingComponent
@@ -141,5 +146,26 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             protected override Task Poll() => !AllowPolling.Value ? Task.CompletedTask : base.Poll();
         }
+
+        private class MultiplayerSelectionPollingComponent : SelectionPollingComponent
+        {
+            public readonly IBindable<bool> AllowPolling = new Bindable<bool>();
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                AllowPolling.BindValueChanged(allowPolling =>
+                {
+                    if (!allowPolling.NewValue)
+                        return;
+
+                    if (IsLoaded)
+                        PollImmediately();
+                });
+            }
+
+            protected override Task Poll() => !AllowPolling.Value ? Task.CompletedTask : base.Poll();
+        }
     }
 }

From 22a0f99f35496d22b5b610626b057c36d1bea82d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 12 Jan 2021 17:49:18 +0900
Subject: [PATCH 0844/3722] Add failing test

---
 .../TaikoBeatmapConversionTest.cs             |  1 +
 ...rating-drumroll-2-expected-conversion.json | 18 ++++++++++++++++++
 .../Beatmaps/slider-generating-drumroll-2.osu | 19 +++++++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-generating-drumroll-2-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-generating-drumroll-2.osu

diff --git a/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs b/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
index 3d77fb05db..b6db333dc9 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
@@ -23,6 +23,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
         [TestCase("sample-to-type-conversions")]
         [TestCase("slider-conversion-v6")]
         [TestCase("slider-conversion-v14")]
+        [TestCase("slider-generating-drumroll-2")]
         public void Test(string name) => base.Test(name);
 
         protected override IEnumerable<ConvertValue> CreateConvertValue(HitObject hitObject)
diff --git a/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-generating-drumroll-2-expected-conversion.json b/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-generating-drumroll-2-expected-conversion.json
new file mode 100644
index 0000000000..b4ee98c86a
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-generating-drumroll-2-expected-conversion.json
@@ -0,0 +1,18 @@
+{
+  "Mappings": [
+    {
+      "StartTime": 51532,
+      "Objects": [
+        {
+          "StartTime": 51532,
+          "EndTime": 52301,
+          "IsRim": false,
+          "IsCentre": false,
+          "IsDrumRoll": true,
+          "IsSwell": false,
+          "IsStrong": false
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-generating-drumroll-2.osu b/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-generating-drumroll-2.osu
new file mode 100644
index 0000000000..d81b09ee26
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-generating-drumroll-2.osu
@@ -0,0 +1,19 @@
+osu file format v14
+
+[General]
+Mode: 0
+
+[Difficulty]
+HPDrainRate:2
+CircleSize:3.2
+OverallDifficulty:2
+ApproachRate:3
+SliderMultiplier:0.999999999999999
+SliderTickRate:1
+
+[TimingPoints]
+763,384.615384615385,4,2,0,70,1,0
+49993,-90.9090909090909,4,2,0,75,0,1
+
+[HitObjects]
+51,245,51532,2,0,P|18:150|17:122,2,110.000003356934,0|8|0,0:0|0:0|0:0,0:0:0:0:

From 9a22df2b88029de3f22b51938ad6b163322d95ec Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 12 Jan 2021 17:50:22 +0900
Subject: [PATCH 0845/3722] Fix BPM multiplier not working in all cases

---
 .../Beatmaps/TaikoBeatmapConverter.cs         |   6 +-
 ...er-conversion-v14-expected-conversion.json | 307 +-----------------
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs    |   5 +-
 3 files changed, 18 insertions(+), 300 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
index 1214c594aa..b51f096d7d 100644
--- a/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs
@@ -160,7 +160,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
             }
         }
 
-        private bool shouldConvertSliderToHits(HitObject obj, IBeatmap beatmap, IHasDistance distanceData, out double taikoDuration, out double tickSpacing)
+        private bool shouldConvertSliderToHits(HitObject obj, IBeatmap beatmap, IHasDistance distanceData, out int taikoDuration, out double tickSpacing)
         {
             // DO NOT CHANGE OR REFACTOR ANYTHING IN HERE WITHOUT TESTING AGAINST _ALL_ BEATMAPS.
             // Some of these calculations look redundant, but they are not - extremely small floating point errors are introduced to maintain 1:1 compatibility with stable.
@@ -185,7 +185,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
 
             // The velocity and duration of the taiko hit object - calculated as the velocity of a drum roll.
             double taikoVelocity = sliderScoringPointDistance * beatmap.BeatmapInfo.BaseDifficulty.SliderTickRate;
-            taikoDuration = distance / taikoVelocity * beatLength;
+            taikoDuration = (int)(distance / taikoVelocity * beatLength);
 
             if (isForCurrentRuleset)
             {
@@ -200,7 +200,7 @@ namespace osu.Game.Rulesets.Taiko.Beatmaps
                 beatLength = timingPoint.BeatLength;
 
             // If the drum roll is to be split into hit circles, assume the ticks are 1/8 spaced within the duration of one beat
-            tickSpacing = Math.Min(beatLength / beatmap.BeatmapInfo.BaseDifficulty.SliderTickRate, taikoDuration / spans);
+            tickSpacing = Math.Min(beatLength / beatmap.BeatmapInfo.BaseDifficulty.SliderTickRate, (double)taikoDuration / spans);
 
             return tickSpacing > 0
                    && distance / osuVelocity * 1000 < 2 * beatLength;
diff --git a/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-conversion-v14-expected-conversion.json b/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-conversion-v14-expected-conversion.json
index 6a6063cb74..b7ad128cab 100644
--- a/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-conversion-v14-expected-conversion.json
+++ b/osu.Game.Rulesets.Taiko/Resources/Testing/Beatmaps/slider-conversion-v14-expected-conversion.json
@@ -1,7 +1,9 @@
 {
-    "Mappings": [{
+    "Mappings": [
+        {
             "StartTime": 2000,
-            "Objects": [{
+            "Objects": [
+                {
                     "StartTime": 2000,
                     "EndTime": 2000,
                     "IsRim": false,
@@ -23,7 +25,8 @@
         },
         {
             "StartTime": 4000,
-            "Objects": [{
+            "Objects": [
+                {
                     "StartTime": 4000,
                     "EndTime": 4000,
                     "IsRim": false,
@@ -45,7 +48,8 @@
         },
         {
             "StartTime": 6000,
-            "Objects": [{
+            "Objects": [
+                {
                     "StartTime": 6000,
                     "EndTime": 6000,
                     "IsRim": true,
@@ -76,300 +80,13 @@
         },
         {
             "StartTime": 8000,
-            "Objects": [{
+            "Objects": [
+                {
                     "StartTime": 8000,
-                    "EndTime": 8000,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8026,
-                    "EndTime": 8026,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8053,
-                    "EndTime": 8053,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8080,
-                    "EndTime": 8080,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8107,
-                    "EndTime": 8107,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8133,
-                    "EndTime": 8133,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8160,
-                    "EndTime": 8160,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8187,
-                    "EndTime": 8187,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8214,
-                    "EndTime": 8214,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8241,
-                    "EndTime": 8241,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8267,
-                    "EndTime": 8267,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8294,
-                    "EndTime": 8294,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8321,
-                    "EndTime": 8321,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8348,
-                    "EndTime": 8348,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8374,
-                    "EndTime": 8374,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8401,
-                    "EndTime": 8401,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8428,
-                    "EndTime": 8428,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8455,
-                    "EndTime": 8455,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8482,
-                    "EndTime": 8482,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8508,
-                    "EndTime": 8508,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8535,
-                    "EndTime": 8535,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8562,
-                    "EndTime": 8562,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8589,
-                    "EndTime": 8589,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8615,
-                    "EndTime": 8615,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8642,
-                    "EndTime": 8642,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8669,
-                    "EndTime": 8669,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8696,
-                    "EndTime": 8696,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8723,
-                    "EndTime": 8723,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8749,
-                    "EndTime": 8749,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8776,
-                    "EndTime": 8776,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8803,
-                    "EndTime": 8803,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8830,
-                    "EndTime": 8830,
-                    "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
-                    "IsSwell": false,
-                    "IsStrong": false
-                },
-                {
-                    "StartTime": 8857,
                     "EndTime": 8857,
                     "IsRim": false,
-                    "IsCentre": true,
-                    "IsDrumRoll": false,
+                    "IsCentre": false,
+                    "IsDrumRoll": true,
                     "IsSwell": false,
                     "IsStrong": false
                 }
diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index 069a25b83d..2fb24c24e0 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -164,12 +164,13 @@ namespace osu.Game.Beatmaps.Formats
             /// Legacy BPM multiplier that introduces floating-point errors for rulesets that depend on it.
             /// DO NOT USE THIS UNLESS 100% SURE.
             /// </summary>
-            public float BpmMultiplier { get; private set; }
+            public double BpmMultiplier { get; private set; }
 
             public LegacyDifficultyControlPoint(double beatLength)
                 : this()
             {
-                BpmMultiplier = beatLength < 0 ? Math.Clamp((float)-beatLength, 10, 10000) / 100f : 1;
+                // 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?).
+                BpmMultiplier = beatLength < 0 ? Math.Clamp((float)-beatLength, 10, 10000) / 100.0 : 1;
             }
 
             public LegacyDifficultyControlPoint()

From b51b07c3a90c0dc1635984f9346175746c5e3da7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 Jan 2021 18:05:29 +0900
Subject: [PATCH 0846/3722] Fix unstable multiplayer room ordering when
 selection is made

---
 .../OnlinePlay/Components/SelectionPollingComponent.cs       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs b/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs
index 0eec155060..dcf3c94b76 100644
--- a/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.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 System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -47,9 +48,11 @@ namespace osu.Game.Screens.OnlinePlay.Components
 
             pollReq.Success += result =>
             {
-                var rooms = new List<Room>(roomManager.Rooms);
+                // existing rooms need to be ordered by their position because the received of NotifyRoomsReceives expects to be able to sort them based on this order.
+                var rooms = new List<Room>(roomManager.Rooms.OrderBy(r => r.Position.Value));
 
                 int index = rooms.FindIndex(r => r.RoomID.Value == result.RoomID.Value);
+
                 if (index < 0)
                     return;
 

From 7298adc9d9b8ef878f4be5b8799be222aa0dd90b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 Jan 2021 19:04:16 +0900
Subject: [PATCH 0847/3722] Fix non-threadsafe usage of
 MultiplayerClient.IsConnected

---
 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs    | 1 +
 .../OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs  | 4 ++--
 .../Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs     | 4 ++--
 .../OnlinePlay/Multiplayer/MultiplayerRoomManager.cs        | 6 ++----
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 34cba09e8c..770039d79d 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -52,6 +52,7 @@ namespace osu.Game.Online.Multiplayer
 
         /// <summary>
         /// Whether the <see cref="StatefulMultiplayerClient"/> is currently connected.
+        /// This is NOT thread safe and usage should be scheduled.
         /// </summary>
         public abstract IBindable<bool> IsConnected { get; }
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
index 87b0e49b5b..a13d2cf540 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
@@ -34,8 +34,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             base.LoadComplete();
 
-            isConnected.BindValueChanged(_ => updateState());
-            operationInProgress.BindValueChanged(_ => updateState(), true);
+            isConnected.BindValueChanged(_ => Scheduler.AddOnce(updateState));
+            operationInProgress.BindValueChanged(_ => Scheduler.AddOnce(updateState), true);
         }
 
         private void updateState() => Enabled.Value = isConnected.Value && !operationInProgress.Value;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index 4bee502e2e..04d9e0a72a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -77,14 +77,14 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             });
 
             isConnected = client.IsConnected.GetBoundCopy();
-            isConnected.BindValueChanged(connected =>
+            isConnected.BindValueChanged(connected => Schedule(() =>
             {
                 if (!connected.NewValue)
                 {
                     // messaging to the user about this disconnect will be provided by the MultiplayerMatchSubScreen.
                     failAndBail();
                 }
-            }, true);
+            }), true);
 
             Debug.Assert(client.Room != null);
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
index 5c327266a3..bcae2e5cbb 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
@@ -34,10 +34,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             base.LoadComplete();
 
             isConnected.BindTo(multiplayerClient.IsConnected);
-            isConnected.BindValueChanged(_ => Schedule(updatePolling));
-            JoinedRoom.BindValueChanged(_ => updatePolling());
-
-            updatePolling();
+            isConnected.BindValueChanged(_ => Scheduler.AddOnce(updatePolling));
+            JoinedRoom.BindValueChanged(_ => Scheduler.AddOnce(updatePolling), true);
         }
 
         public override void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)

From 2d3cacca11bc1d8de6c78cf8b6f1154f1e058050 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 13 Jan 2021 00:58:53 +0100
Subject: [PATCH 0848/3722] Fix non-hosts crashing on load requested

`onLoadRequested()` always released the `readyClickOperation` ongoing
operation, without checking whether it actually needs to/should (it
should only do so if the action initiating the operation was starting
the game by the host). This would crash all other consumers, who already
released the operation when their ready-up operation completed server
side.

To resolve, relax the constraint such that the operation can be ended
multiple times in any order. At the end of the day the thing that
matters is that the operation is done and the ready button is unblocked.
---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs    | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index e539b315e4..80991569dc 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -241,8 +241,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             void endOperation()
             {
-                Debug.Assert(readyClickOperation != null);
-                readyClickOperation.Dispose();
+                readyClickOperation?.Dispose();
                 readyClickOperation = null;
             }
         }
@@ -255,9 +254,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             StartPlay(() => new MultiplayerPlayer(SelectedItem.Value, userIds));
 
-            Debug.Assert(readyClickOperation != null);
-
-            readyClickOperation.Dispose();
+            readyClickOperation?.Dispose();
             readyClickOperation = null;
         }
 

From 5f10bcce02411a22f783ba3a5bbb9d7ab66f43af Mon Sep 17 00:00:00 2001
From: Mysfit <jdawg678@gmail.com>
Date: Wed, 13 Jan 2021 00:09:22 -0500
Subject: [PATCH 0849/3722] Added beatmap colour settings checkbox and
 associated tests.

---
 .../TestSceneLegacyBeatmapSkin.cs             | 78 +++++++++++++++++--
 .../TestSceneSkinFallbacks.cs                 | 25 ++++++
 osu.Game/Configuration/OsuConfigManager.cs    |  2 +
 .../Overlays/Settings/Sections/SkinSection.cs |  5 ++
 .../Play/PlayerSettings/VisualSettings.cs     |  3 +
 .../Skinning/BeatmapSkinProvidingContainer.cs |  7 +-
 6 files changed, 110 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
index a768626005..83b1e28476 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
@@ -7,9 +7,12 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
+using osu.Framework.Bindables;
 using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
+using osu.Game.Configuration;
+using osu.Game.Rulesets.Osu.Configuration;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Play;
 using osu.Game.Skinning;
@@ -24,34 +27,81 @@ namespace osu.Game.Rulesets.Osu.Tests
         [Resolved]
         private AudioManager audio { get; set; }
 
-        [TestCase(true)]
-        [TestCase(false)]
-        public void TestBeatmapComboColours(bool customSkinColoursPresent)
+        private readonly Bindable<bool> beatmapSkins = new Bindable<bool>();
+        private readonly Bindable<bool> beatmapColours = new Bindable<bool>();
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            config.BindWith(OsuSetting.BeatmapSkins, beatmapSkins);
+            config.BindWith(OsuSetting.BeatmapColours, beatmapColours);
+        }
+
+        [TestCase(true, true, true)]
+        [TestCase(true, false, true)]
+        [TestCase(false, true, true)]
+        [TestCase(false, false, true)]
+        public void TestBeatmapComboColours(bool userHasCustomColours, bool useBeatmapSkin, bool useBeatmapColour)
         {
             ExposedPlayer player = null;
 
-            AddStep("load coloured beatmap", () => player = loadBeatmap(customSkinColoursPresent, true));
+            configureSettings(useBeatmapSkin, useBeatmapColour);
+            AddStep("load coloured beatmap", () => player = loadBeatmap(userHasCustomColours, true));
             AddUntilStep("wait for player", () => player.IsLoaded);
 
             AddAssert("is beatmap skin colours", () => player.UsableComboColours.SequenceEqual(TestBeatmapSkin.Colours));
         }
 
-        [Test]
-        public void TestBeatmapNoComboColours()
+        [TestCase(true, false)]
+        [TestCase(false, false)]
+        public void TestBeatmapComboColoursOverride(bool useBeatmapSkin, bool useBeatmapColour)
         {
             ExposedPlayer player = null;
 
+            configureSettings(useBeatmapSkin, useBeatmapColour);
+            AddStep("load coloured beatmap", () => player = loadBeatmap(true, true));
+            AddUntilStep("wait for player", () => player.IsLoaded);
+
+            AddAssert("is user custom skin colours", () => player.UsableComboColours.SequenceEqual(TestSkin.Colours));
+        }
+
+        [TestCase(true, false)]
+        [TestCase(false, false)]
+        public void TestBeatmapComboColoursOverrideWithDefaultColours(bool useBeatmapSkin, bool useBeatmapColour)
+        {
+            ExposedPlayer player = null;
+
+            configureSettings(useBeatmapSkin, useBeatmapColour);
+            AddStep("load coloured beatmap", () => player = loadBeatmap(false, true));
+            AddUntilStep("wait for player", () => player.IsLoaded);
+
+            AddAssert("is default user skin colours", () => player.UsableComboColours.SequenceEqual(SkinConfiguration.DefaultComboColours));
+        }
+
+        [TestCase(true, true)]
+        [TestCase(false, true)]
+        [TestCase(true, false)]
+        [TestCase(false, false)]
+        public void TestBeatmapNoComboColours(bool useBeatmapSkin, bool useBeatmapColour)
+        {
+            ExposedPlayer player = null;
+
+            configureSettings(useBeatmapSkin, useBeatmapColour);
             AddStep("load no-colour beatmap", () => player = loadBeatmap(false, false));
             AddUntilStep("wait for player", () => player.IsLoaded);
 
             AddAssert("is default user skin colours", () => player.UsableComboColours.SequenceEqual(SkinConfiguration.DefaultComboColours));
         }
 
-        [Test]
-        public void TestBeatmapNoComboColoursSkinOverride()
+        [TestCase(true, true)]
+        [TestCase(false, true)]
+        [TestCase(true, false)]
+        [TestCase(false, false)]
+        public void TestBeatmapNoComboColoursSkinOverride(bool useBeatmapSkin, bool useBeatmapColour)
         {
             ExposedPlayer player = null;
 
+            configureSettings(useBeatmapSkin, useBeatmapColour);
             AddStep("load custom-skin colour", () => player = loadBeatmap(true, false));
             AddUntilStep("wait for player", () => player.IsLoaded);
 
@@ -69,6 +119,18 @@ namespace osu.Game.Rulesets.Osu.Tests
             return player;
         }
 
+        private void configureSettings(bool beatmapSkins, bool beatmapColours)
+        {
+            AddStep($"{(beatmapSkins ? "enable" : "disable")} beatmap skins", () =>
+            {
+                this.beatmapSkins.Value = beatmapSkins;
+            });
+            AddStep($"{(beatmapColours ? "enable" : "disable")} beatmap colours", () =>
+            {
+                this.beatmapColours.Value = beatmapColours;
+            });
+        }
+
         private class ExposedPlayer : Player
         {
             private readonly bool userHasCustomColours;
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
index 856bfd7e80..10baca438d 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
@@ -52,6 +52,31 @@ namespace osu.Game.Rulesets.Osu.Tests
             checkNextHitObject(null);
         }
 
+        [Test]
+        public void TestBeatmapColourDefault()
+        {
+            AddStep("enable user provider", () => testUserSkin.Enabled = true);
+
+            AddStep("enable beatmap skin", () => LocalConfig.Set<bool>(OsuSetting.BeatmapSkins, true));
+            AddStep("enable beatmap colours", () => LocalConfig.Set<bool>(OsuSetting.BeatmapColours, true));
+            checkNextHitObject("beatmap");
+
+            AddStep("enable beatmap skin", () => LocalConfig.Set<bool>(OsuSetting.BeatmapSkins, true));
+            AddStep("disable beatmap colours", () => LocalConfig.Set<bool>(OsuSetting.BeatmapColours, false));
+            checkNextHitObject("beatmap");
+
+            AddStep("disable beatmap skin", () => LocalConfig.Set<bool>(OsuSetting.BeatmapSkins, false));
+            AddStep("enable beatmap colours", () => LocalConfig.Set<bool>(OsuSetting.BeatmapColours, true));
+            checkNextHitObject("user");
+
+            AddStep("disable beatmap skin", () => LocalConfig.Set<bool>(OsuSetting.BeatmapSkins, false));
+            AddStep("disable beatmap colours", () => LocalConfig.Set<bool>(OsuSetting.BeatmapColours, false));
+            checkNextHitObject("user");
+
+            AddStep("disable user provider", () => testUserSkin.Enabled = false);
+            checkNextHitObject(null);
+        }
+
         private void checkNextHitObject(string skin) =>
             AddUntilStep($"check skin from {skin}", () =>
             {
diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index eb34a0885d..5a8f7b4477 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -82,6 +82,7 @@ namespace osu.Game.Configuration
 
             Set(OsuSetting.ShowStoryboard, true);
             Set(OsuSetting.BeatmapSkins, true);
+            Set(OsuSetting.BeatmapColours, true);
             Set(OsuSetting.BeatmapHitsounds, true);
 
             Set(OsuSetting.CursorRotation, true);
@@ -250,6 +251,7 @@ namespace osu.Game.Configuration
         ScreenshotCaptureMenuCursor,
         SongSelectRightMouseScroll,
         BeatmapSkins,
+        BeatmapColours,
         BeatmapHitsounds,
         IncreaseFirstObjectVisibility,
         ScoreDisplayMode,
diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 5898482e4a..e29f97c33e 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -70,6 +70,11 @@ namespace osu.Game.Overlays.Settings.Sections
                     Current = config.GetBindable<bool>(OsuSetting.BeatmapSkins)
                 },
                 new SettingsCheckbox
+                {
+                    LabelText = "Beatmap colours",
+                    Current = config.GetBindable<bool>(OsuSetting.BeatmapColours)
+                },
+                new SettingsCheckbox
                 {
                     LabelText = "Beatmap hitsounds",
                     Current = config.GetBindable<bool>(OsuSetting.BeatmapHitsounds)
diff --git a/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs b/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
index 8f29fe7893..a97078c461 100644
--- a/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
@@ -14,6 +14,7 @@ namespace osu.Game.Screens.Play.PlayerSettings
         private readonly PlayerSliderBar<double> blurSliderBar;
         private readonly PlayerCheckbox showStoryboardToggle;
         private readonly PlayerCheckbox beatmapSkinsToggle;
+        private readonly PlayerCheckbox beatmapColorsToggle;
         private readonly PlayerCheckbox beatmapHitsoundsToggle;
 
         public VisualSettings()
@@ -43,6 +44,7 @@ namespace osu.Game.Screens.Play.PlayerSettings
                 },
                 showStoryboardToggle = new PlayerCheckbox { LabelText = "Storyboard / Video" },
                 beatmapSkinsToggle = new PlayerCheckbox { LabelText = "Beatmap skins" },
+                beatmapColorsToggle = new PlayerCheckbox { LabelText = "Beatmap colours" },
                 beatmapHitsoundsToggle = new PlayerCheckbox { LabelText = "Beatmap hitsounds" }
             };
         }
@@ -54,6 +56,7 @@ namespace osu.Game.Screens.Play.PlayerSettings
             blurSliderBar.Current = config.GetBindable<double>(OsuSetting.BlurLevel);
             showStoryboardToggle.Current = config.GetBindable<bool>(OsuSetting.ShowStoryboard);
             beatmapSkinsToggle.Current = config.GetBindable<bool>(OsuSetting.BeatmapSkins);
+            beatmapColorsToggle.Current = config.GetBindable<bool>(OsuSetting.BeatmapColours);
             beatmapHitsoundsToggle.Current = config.GetBindable<bool>(OsuSetting.BeatmapHitsounds);
         }
     }
diff --git a/osu.Game/Skinning/BeatmapSkinProvidingContainer.cs b/osu.Game/Skinning/BeatmapSkinProvidingContainer.cs
index fc01f0bd31..ffc35b3ab6 100644
--- a/osu.Game/Skinning/BeatmapSkinProvidingContainer.cs
+++ b/osu.Game/Skinning/BeatmapSkinProvidingContainer.cs
@@ -15,6 +15,7 @@ namespace osu.Game.Skinning
     public class BeatmapSkinProvidingContainer : SkinProvidingContainer
     {
         private Bindable<bool> beatmapSkins;
+        private Bindable<bool> beatmapColours;
         private Bindable<bool> beatmapHitsounds;
 
         protected override bool AllowConfigurationLookup
@@ -24,10 +25,10 @@ namespace osu.Game.Skinning
                 if (beatmapSkins == null)
                     throw new InvalidOperationException($"{nameof(BeatmapSkinProvidingContainer)} needs to be loaded before being consumed.");
 
-                return beatmapSkins.Value;
+                return beatmapColours.Value;
             }
         }
-
+        
         protected override bool AllowDrawableLookup(ISkinComponent component)
         {
             if (beatmapSkins == null)
@@ -62,6 +63,7 @@ namespace osu.Game.Skinning
             var config = parent.Get<OsuConfigManager>();
 
             beatmapSkins = config.GetBindable<bool>(OsuSetting.BeatmapSkins);
+            beatmapColours = config.GetBindable<bool>(OsuSetting.BeatmapColours);
             beatmapHitsounds = config.GetBindable<bool>(OsuSetting.BeatmapHitsounds);
 
             return base.CreateChildDependencies(parent);
@@ -71,6 +73,7 @@ namespace osu.Game.Skinning
         private void load()
         {
             beatmapSkins.BindValueChanged(_ => TriggerSourceChanged());
+            beatmapColours.BindValueChanged(_ => TriggerSourceChanged());
             beatmapHitsounds.BindValueChanged(_ => TriggerSourceChanged());
         }
     }

From 7bfb5954a8e7553dbd429f5901865525045d809a Mon Sep 17 00:00:00 2001
From: Mysfit <jdawg678@gmail.com>
Date: Wed, 13 Jan 2021 00:25:54 -0500
Subject: [PATCH 0850/3722] Fix whitespace formatting.

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

diff --git a/osu.Game/Skinning/BeatmapSkinProvidingContainer.cs b/osu.Game/Skinning/BeatmapSkinProvidingContainer.cs
index ffc35b3ab6..c16547589d 100644
--- a/osu.Game/Skinning/BeatmapSkinProvidingContainer.cs
+++ b/osu.Game/Skinning/BeatmapSkinProvidingContainer.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Skinning
                 return beatmapColours.Value;
             }
         }
-        
+
         protected override bool AllowDrawableLookup(ISkinComponent component)
         {
             if (beatmapSkins == null)

From 80bcd78a4802131d02576bebcf87c16f8297f2af Mon Sep 17 00:00:00 2001
From: Mysfit <jdawg678@gmail.com>
Date: Wed, 13 Jan 2021 02:04:59 -0500
Subject: [PATCH 0851/3722] Removed unnecessary using.

---
 osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
index 83b1e28476..138182c7c4 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
@@ -12,7 +12,6 @@ using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
-using osu.Game.Rulesets.Osu.Configuration;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Play;
 using osu.Game.Skinning;

From e8daea91d22e87e95d2deaf8caf70817c6277ebc Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 12 Jan 2021 18:13:05 +0300
Subject: [PATCH 0852/3722] Add online beatmap "explicit content" property

---
 osu.Game/Beatmaps/BeatmapSetOnlineInfo.cs               | 5 +++++
 osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/osu.Game/Beatmaps/BeatmapSetOnlineInfo.cs b/osu.Game/Beatmaps/BeatmapSetOnlineInfo.cs
index 06dee4d3f5..48f1f0ce68 100644
--- a/osu.Game/Beatmaps/BeatmapSetOnlineInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapSetOnlineInfo.cs
@@ -31,6 +31,11 @@ namespace osu.Game.Beatmaps
         /// </summary>
         public BeatmapSetOnlineStatus Status { get; set; }
 
+        /// <summary>
+        /// Whether or not this beatmap set has explicit content.
+        /// </summary>
+        public bool HasExplicitContent { get; set; }
+
         /// <summary>
         /// Whether or not this beatmap set has a background video.
         /// </summary>
diff --git a/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs b/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs
index 720d6bfff4..bd1800e9f7 100644
--- a/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs
@@ -42,6 +42,9 @@ namespace osu.Game.Online.API.Requests.Responses
         [JsonProperty(@"bpm")]
         private double bpm { get; set; }
 
+        [JsonProperty(@"nsfw")]
+        private bool hasExplicitContent { get; set; }
+
         [JsonProperty(@"video")]
         private bool hasVideo { get; set; }
 
@@ -94,6 +97,7 @@ namespace osu.Game.Online.API.Requests.Responses
                     FavouriteCount = favouriteCount,
                     BPM = bpm,
                     Status = Status,
+                    HasExplicitContent = hasExplicitContent,
                     HasVideo = hasVideo,
                     HasStoryboard = hasStoryboard,
                     Submitted = submitted,

From ee6baeb57e0d51e8d65a3c8c70e25701cc58ada8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 12 Jan 2021 18:15:00 +0300
Subject: [PATCH 0853/3722] Add "explicit" marker pill

---
 .../BeatmapSet/ExplicitBeatmapPill.cs         | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 osu.Game/Overlays/BeatmapSet/ExplicitBeatmapPill.cs

diff --git a/osu.Game/Overlays/BeatmapSet/ExplicitBeatmapPill.cs b/osu.Game/Overlays/BeatmapSet/ExplicitBeatmapPill.cs
new file mode 100644
index 0000000000..77528c65c3
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapSet/ExplicitBeatmapPill.cs
@@ -0,0 +1,49 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays.BeatmapSet
+{
+    public class ExplicitBeatmapPill : CompositeDrawable
+    {
+        public ExplicitBeatmapPill()
+        {
+            AutoSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader(true)]
+        private void load(OsuColour colours, OverlayColourProvider colourProvider)
+        {
+            InternalChild = new CircularContainer
+            {
+                Masking = true,
+                AutoSizeAxes = Axes.Both,
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = colourProvider?.Background5 ?? colours.Gray2,
+                    },
+                    new OsuSpriteText
+                    {
+                        Margin = new MarginPadding { Horizontal = 10f, Vertical = 2f },
+                        Text = "EXPLICIT",
+                        Font = OsuFont.GetFont(size: 10, weight: FontWeight.Bold),
+                        // todo: this is --hsl-orange-2 from the new palette in https://github.com/ppy/osu-web/blob/8ceb46f/resources/assets/less/colors.less#L128-L151,
+                        // should probably take the whole palette from there onto OsuColour for a nicer look in code.
+                        Colour = Color4.FromHsl(new Vector4(45f / 360, 0.8f, 0.6f, 1f)),
+                    }
+                }
+            };
+        }
+    }
+}

From f6637eec36a460c5551e81d5b8776c12fad0caa9 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 13 Jan 2021 11:29:30 +0300
Subject: [PATCH 0854/3722] Add explicit pill to beatmap panels

---
 .../BeatmapListing/Panels/GridBeatmapPanel.cs | 29 +++++++++++++++----
 .../BeatmapListing/Panels/ListBeatmapPanel.cs | 27 ++++++++++++++---
 2 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs b/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
index 28c36e6c56..b7002a96e5 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
@@ -14,6 +14,7 @@ using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Overlays.BeatmapSet;
 using osuTK;
 using osuTK.Graphics;
 
@@ -24,7 +25,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
         private const float horizontal_padding = 10;
         private const float vertical_padding = 5;
 
-        private FillFlowContainer bottomPanel, statusContainer;
+        private FillFlowContainer bottomPanel, statusContainer, titleContainer;
         private PlayButton playButton;
         private Box progressBar;
 
@@ -73,12 +74,20 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                             AutoSizeAxes = Axes.Both,
                             Padding = new MarginPadding { Left = horizontal_padding, Right = horizontal_padding },
                             Direction = FillDirection.Vertical,
-                            Children = new[]
+                            Children = new Drawable[]
                             {
-                                new OsuSpriteText
+                                titleContainer = new FillFlowContainer
                                 {
-                                    Text = new LocalisedString((SetInfo.Metadata.TitleUnicode, SetInfo.Metadata.Title)),
-                                    Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold, italics: true)
+                                    AutoSizeAxes = Axes.Both,
+                                    Direction = FillDirection.Horizontal,
+                                    Children = new Drawable[]
+                                    {
+                                        new OsuSpriteText
+                                        {
+                                            Text = new LocalisedString((SetInfo.Metadata.TitleUnicode, SetInfo.Metadata.Title)),
+                                            Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold, italics: true)
+                                        },
+                                    }
                                 },
                                 new OsuSpriteText
                                 {
@@ -194,6 +203,16 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                 },
             });
 
+            if (SetInfo.OnlineInfo?.HasExplicitContent ?? false)
+            {
+                titleContainer.Add(new ExplicitBeatmapPill
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Margin = new MarginPadding { Left = 10f, Top = 2f },
+                });
+            }
+
             if (SetInfo.OnlineInfo?.HasVideo ?? false)
             {
                 statusContainer.Add(new IconPill(FontAwesome.Solid.Film));
diff --git a/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs b/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
index 433ea37f06..69671ab75b 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
@@ -14,6 +14,7 @@ using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Overlays.BeatmapSet;
 using osuTK;
 using osuTK.Graphics;
 
@@ -26,7 +27,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
         private const float vertical_padding = 5;
         private const float height = 70;
 
-        private FillFlowContainer statusContainer;
+        private FillFlowContainer statusContainer, titleContainer;
         protected BeatmapPanelDownloadButton DownloadButton;
         private PlayButton playButton;
         private Box progressBar;
@@ -98,10 +99,18 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                                                     Direction = FillDirection.Vertical,
                                                     Children = new Drawable[]
                                                     {
-                                                        new OsuSpriteText
+                                                        titleContainer = new FillFlowContainer
                                                         {
-                                                            Text = new LocalisedString((SetInfo.Metadata.TitleUnicode, SetInfo.Metadata.Title)),
-                                                            Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold, italics: true)
+                                                            AutoSizeAxes = Axes.Both,
+                                                            Direction = FillDirection.Horizontal,
+                                                            Children = new[]
+                                                            {
+                                                                new OsuSpriteText
+                                                                {
+                                                                    Text = new LocalisedString((SetInfo.Metadata.TitleUnicode, SetInfo.Metadata.Title)),
+                                                                    Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold, italics: true)
+                                                                },
+                                                            }
                                                         },
                                                         new OsuSpriteText
                                                         {
@@ -208,6 +217,16 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                 },
             });
 
+            if (SetInfo.OnlineInfo?.HasExplicitContent ?? false)
+            {
+                titleContainer.Add(new ExplicitBeatmapPill
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Margin = new MarginPadding { Left = 10f, Top = 2f },
+                });
+            }
+
             if (SetInfo.OnlineInfo?.HasVideo ?? false)
             {
                 statusContainer.Add(new IconPill(FontAwesome.Solid.Film) { IconSize = new Vector2(20) });

From 78631323ba35174543cbb09d2c8fd4f545888077 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 13 Jan 2021 11:32:36 +0300
Subject: [PATCH 0855/3722] Add explicit pill to beatmap overlay

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

diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs
index 321e496511..fbdee91d42 100644
--- a/osu.Game/Overlays/BeatmapSet/Header.cs
+++ b/osu.Game/Overlays/BeatmapSet/Header.cs
@@ -34,6 +34,7 @@ namespace osu.Game.Overlays.BeatmapSet
         private readonly Box coverGradient;
         private readonly OsuSpriteText title, artist;
         private readonly AuthorInfo author;
+        private readonly ExplicitBeatmapPill explicitPill;
         private readonly FillFlowContainer downloadButtonsContainer;
         private readonly BeatmapAvailability beatmapAvailability;
         private readonly BeatmapSetOnlineStatusPill onlineStatusPill;
@@ -146,6 +147,13 @@ namespace osu.Game.Overlays.BeatmapSet
                                                         Origin = Anchor.BottomLeft,
                                                         Margin = new MarginPadding { Left = 3, Bottom = 4 }, // To better lineup with the font
                                                     },
+                                                    explicitPill = new ExplicitBeatmapPill
+                                                    {
+                                                        Alpha = 0f,
+                                                        Anchor = Anchor.CentreLeft,
+                                                        Origin = Anchor.CentreLeft,
+                                                        Margin = new MarginPadding { Left = 10f, Top = 4 },
+                                                    }
                                                 }
                                             },
                                             artist = new OsuSpriteText
@@ -253,6 +261,8 @@ namespace osu.Game.Overlays.BeatmapSet
                     title.Text = setInfo.NewValue.Metadata.Title ?? string.Empty;
                     artist.Text = setInfo.NewValue.Metadata.Artist ?? string.Empty;
 
+                    explicitPill.Alpha = setInfo.NewValue.OnlineInfo.HasExplicitContent ? 1 : 0;
+
                     onlineStatusPill.FadeIn(500, Easing.OutQuint);
                     onlineStatusPill.Status = setInfo.NewValue.OnlineInfo.Status;
 

From 1502b07ea86d7673dbbffa2fc2ec83612ca8d81c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 13 Jan 2021 11:33:00 +0300
Subject: [PATCH 0856/3722] Add explicit pill to playlist items

---
 .../OnlinePlay/DrawableRoomPlaylistItem.cs    | 36 +++++++++++++++----
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index e3bce4029f..7987d715e3 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -23,6 +23,7 @@ using osu.Game.Online;
 using osu.Game.Online.Chat;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays.BeatmapListing.Panels;
+using osu.Game.Overlays.BeatmapSet;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Play.HUD;
@@ -41,6 +42,7 @@ namespace osu.Game.Screens.OnlinePlay
         private Container difficultyIconContainer;
         private LinkFlowContainer beatmapText;
         private LinkFlowContainer authorText;
+        private ExplicitBeatmapPill explicitPill;
         private ModDisplay modDisplay;
 
         private readonly Bindable<BeatmapInfo> beatmap = new Bindable<BeatmapInfo>();
@@ -116,6 +118,9 @@ namespace osu.Game.Screens.OnlinePlay
                 authorText.AddUserLink(Item.Beatmap.Value?.Metadata.Author);
             }
 
+            bool hasExplicitContent = Item.Beatmap.Value.BeatmapSet.OnlineInfo?.HasExplicitContent == true;
+            explicitPill.Alpha = hasExplicitContent ? 1 : 0;
+
             modDisplay.Current.Value = requiredMods.ToArray();
         }
 
@@ -165,18 +170,37 @@ namespace osu.Game.Screens.OnlinePlay
                                 {
                                     AutoSizeAxes = Axes.Both,
                                     Direction = FillDirection.Horizontal,
-                                    Spacing = new Vector2(15, 0),
+                                    Spacing = new Vector2(10f, 0),
                                     Children = new Drawable[]
                                     {
-                                        authorText = new LinkFlowContainer { AutoSizeAxes = Axes.Both },
-                                        modDisplay = new ModDisplay
+                                        new FillFlowContainer
+                                        {
+                                            AutoSizeAxes = Axes.Both,
+                                            Direction = FillDirection.Horizontal,
+                                            Spacing = new Vector2(10f, 0),
+                                            Children = new Drawable[]
+                                            {
+                                                authorText = new LinkFlowContainer { AutoSizeAxes = Axes.Both },
+                                                explicitPill = new ExplicitBeatmapPill
+                                                {
+                                                    Alpha = 0f,
+                                                    Anchor = Anchor.CentreLeft,
+                                                    Origin = Anchor.CentreLeft,
+                                                    Margin = new MarginPadding { Top = 3f },
+                                                }
+                                            },
+                                        },
+                                        new Container
                                         {
                                             Anchor = Anchor.CentreLeft,
                                             Origin = Anchor.CentreLeft,
                                             AutoSizeAxes = Axes.Both,
-                                            Scale = new Vector2(0.4f),
-                                            DisplayUnrankedText = false,
-                                            ExpansionMode = ExpansionMode.AlwaysExpanded
+                                            Child = modDisplay = new ModDisplay
+                                            {
+                                                Scale = new Vector2(0.4f),
+                                                DisplayUnrankedText = false,
+                                                ExpansionMode = ExpansionMode.AlwaysExpanded
+                                            }
                                         }
                                     }
                                 }

From 7fd55efc434fb5522de44429cc27e27c32cd6969 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 13 Jan 2021 11:57:29 +0300
Subject: [PATCH 0857/3722] Add test cases for displaying explicit beatmaps

---
 .../Multiplayer/TestSceneDrawableRoomPlaylist.cs      |  9 +++++++++
 .../Visual/Online/TestSceneBeatmapSetOverlay.cs       | 11 +++++++++++
 osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs  |  7 ++++++-
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
index 65c0cfd328..17d85d1120 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
@@ -222,6 +222,15 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("download buttons shown", () => playlist.ChildrenOfType<BeatmapDownloadTrackingComposite>().All(d => d.IsPresent));
         }
 
+        [Test]
+        public void TestExplicitBeatmapItem()
+        {
+            var beatmap = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo;
+            beatmap.BeatmapSet.OnlineInfo.HasExplicitContent = true;
+
+            createPlaylist(beatmap);
+        }
+
         private void moveToItem(int index, Vector2? offset = null)
             => AddStep($"move mouse to item {index}", () => InputManager.MoveMouseTo(playlist.ChildrenOfType<OsuRearrangeableListItem<PlaylistItem>>().ElementAt(index), offset));
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
index c5d1fd6887..689321698a 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
@@ -235,6 +235,17 @@ namespace osu.Game.Tests.Visual.Online
             AddAssert("left-most beatmap selected", () => overlay.Header.Picker.Difficulties.First().State == BeatmapPicker.DifficultySelectorState.Selected);
         }
 
+        [Test]
+        public void TestExplicitBeatmap()
+        {
+            AddStep("show explicit map", () =>
+            {
+                var beatmapSet = CreateBeatmap(Ruleset.Value).BeatmapInfo.BeatmapSet;
+                beatmapSet.OnlineInfo.HasExplicitContent = true;
+                overlay.ShowBeatmapSet(beatmapSet);
+            });
+        }
+
         [Test]
         public void TestHide()
         {
diff --git a/osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs
index 74ece5da05..fd5f306e07 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs
@@ -99,13 +99,16 @@ namespace osu.Game.Tests.Visual.Online
         [BackgroundDependencyLoader]
         private void load(RulesetStore rulesets)
         {
-            var normal = CreateWorkingBeatmap(Ruleset.Value).BeatmapSetInfo;
+            var normal = CreateBeatmap(Ruleset.Value).BeatmapInfo.BeatmapSet;
             normal.OnlineInfo.HasVideo = true;
             normal.OnlineInfo.HasStoryboard = true;
 
             var undownloadable = getUndownloadableBeatmapSet();
             var manyDifficulties = getManyDifficultiesBeatmapSet(rulesets);
 
+            var explicitMap = CreateBeatmap(Ruleset.Value).BeatmapInfo.BeatmapSet;
+            explicitMap.OnlineInfo.HasExplicitContent = true;
+
             Child = new BasicScrollContainer
             {
                 RelativeSizeAxes = Axes.Both,
@@ -121,9 +124,11 @@ namespace osu.Game.Tests.Visual.Online
                         new GridBeatmapPanel(normal),
                         new GridBeatmapPanel(undownloadable),
                         new GridBeatmapPanel(manyDifficulties),
+                        new GridBeatmapPanel(explicitMap),
                         new ListBeatmapPanel(normal),
                         new ListBeatmapPanel(undownloadable),
                         new ListBeatmapPanel(manyDifficulties),
+                        new ListBeatmapPanel(explicitMap)
                     },
                 },
             };

From f827c620813468f2c670f393c424b84e8b11f634 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 13 Jan 2021 11:58:55 +0300
Subject: [PATCH 0858/3722] Add empty online info to test beatmap

This is for `BeatmapSetOverlay` to not eat a null reference trying to access `Beatmap.OnlineInfo`.
---
 osu.Game/Tests/Beatmaps/TestBeatmap.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Tests/Beatmaps/TestBeatmap.cs b/osu.Game/Tests/Beatmaps/TestBeatmap.cs
index 035cb64099..fa6dc5647d 100644
--- a/osu.Game/Tests/Beatmaps/TestBeatmap.cs
+++ b/osu.Game/Tests/Beatmaps/TestBeatmap.cs
@@ -32,6 +32,7 @@ namespace osu.Game.Tests.Beatmaps
             BeatmapInfo.BeatmapSet.Files = new List<BeatmapSetFileInfo>();
             BeatmapInfo.BeatmapSet.Beatmaps = new List<BeatmapInfo> { BeatmapInfo };
             BeatmapInfo.Length = 75000;
+            BeatmapInfo.OnlineInfo = new BeatmapOnlineInfo();
             BeatmapInfo.BeatmapSet.OnlineInfo = new BeatmapSetOnlineInfo
             {
                 Status = BeatmapSetOnlineStatus.Ranked,

From 268f9d661f16c55aa1c8ebadb4f44e05baa7373a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 13 Jan 2021 13:00:14 +0300
Subject: [PATCH 0859/3722] Dispose of local config on disposal

---
 .../UserInterface/TestSceneBeatmapListingSearchControl.cs   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
index cb86047dea..dc46da6293 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
@@ -99,6 +99,12 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("explicit control set to hide", () => control.Explicit.Value == SearchExplicit.Hide);
         }
 
+        protected override void Dispose(bool isDisposing)
+        {
+            localConfig?.Dispose();
+            base.Dispose(isDisposing);
+        }
+
         private static readonly BeatmapSetInfo beatmap_set = new BeatmapSetInfo
         {
             OnlineInfo = new BeatmapSetOnlineInfo

From 9d59d784f8674b1319a175c1edb74d079de76dfe Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 13 Jan 2021 17:06:44 +0300
Subject: [PATCH 0860/3722] Add Colour{1-4} properties to
 `OverlayColourProvider`

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

diff --git a/osu.Game/Overlays/OverlayColourProvider.cs b/osu.Game/Overlays/OverlayColourProvider.cs
index 9816f313ad..f33223d7aa 100644
--- a/osu.Game/Overlays/OverlayColourProvider.cs
+++ b/osu.Game/Overlays/OverlayColourProvider.cs
@@ -16,6 +16,11 @@ namespace osu.Game.Overlays
             this.colourScheme = colourScheme;
         }
 
+        public Color4 Colour1 => getColour(1, 0.7f);
+        public Color4 Colour2 => getColour(0.8f, 0.6f);
+        public Color4 Colour3 => getColour(0.6f, 0.5f);
+        public Color4 Colour4 => getColour(0.4f, 0.3f);
+
         public Color4 Highlight1 => getColour(1, 0.7f);
         public Color4 Content1 => getColour(0.4f, 1);
         public Color4 Content2 => getColour(0.4f, 0.9f);

From e275dd02e08ab8d9e890d2d0a2b1f822e1c53f6c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 13 Jan 2021 17:07:11 +0300
Subject: [PATCH 0861/3722] Create static colour properties for now

---
 osu.Game/Overlays/OverlayColourProvider.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Overlays/OverlayColourProvider.cs b/osu.Game/Overlays/OverlayColourProvider.cs
index f33223d7aa..abd1e43f25 100644
--- a/osu.Game/Overlays/OverlayColourProvider.cs
+++ b/osu.Game/Overlays/OverlayColourProvider.cs
@@ -11,6 +11,13 @@ namespace osu.Game.Overlays
     {
         private readonly OverlayColourScheme colourScheme;
 
+        public static OverlayColourProvider Red { get; } = new OverlayColourProvider(OverlayColourScheme.Red);
+        public static OverlayColourProvider Pink { get; } = new OverlayColourProvider(OverlayColourScheme.Pink);
+        public static OverlayColourProvider Orange { get; } = new OverlayColourProvider(OverlayColourScheme.Orange);
+        public static OverlayColourProvider Green { get; } = new OverlayColourProvider(OverlayColourScheme.Green);
+        public static OverlayColourProvider Purple { get; } = new OverlayColourProvider(OverlayColourScheme.Purple);
+        public static OverlayColourProvider Blue { get; } = new OverlayColourProvider(OverlayColourScheme.Blue);
+
         public OverlayColourProvider(OverlayColourScheme colourScheme)
         {
             this.colourScheme = colourScheme;

From 43daa7c7c09463acac11095bc93f304e1c20ae83 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 13 Jan 2021 17:07:42 +0300
Subject: [PATCH 0862/3722] Use `Colour2` of orange theme for explicit pill

---
 osu.Game/Overlays/BeatmapSet/ExplicitBeatmapPill.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/ExplicitBeatmapPill.cs b/osu.Game/Overlays/BeatmapSet/ExplicitBeatmapPill.cs
index 77528c65c3..ad19dffccb 100644
--- a/osu.Game/Overlays/BeatmapSet/ExplicitBeatmapPill.cs
+++ b/osu.Game/Overlays/BeatmapSet/ExplicitBeatmapPill.cs
@@ -7,8 +7,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Overlays.BeatmapSet
 {
@@ -38,9 +36,7 @@ namespace osu.Game.Overlays.BeatmapSet
                         Margin = new MarginPadding { Horizontal = 10f, Vertical = 2f },
                         Text = "EXPLICIT",
                         Font = OsuFont.GetFont(size: 10, weight: FontWeight.Bold),
-                        // todo: this is --hsl-orange-2 from the new palette in https://github.com/ppy/osu-web/blob/8ceb46f/resources/assets/less/colors.less#L128-L151,
-                        // should probably take the whole palette from there onto OsuColour for a nicer look in code.
-                        Colour = Color4.FromHsl(new Vector4(45f / 360, 0.8f, 0.6f, 1f)),
+                        Colour = OverlayColourProvider.Orange.Colour2,
                     }
                 }
             };

From 1f12b2bd091e7968c60e6c100cc9369edd5c3973 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 13 Jan 2021 18:04:29 +0300
Subject: [PATCH 0863/3722] Rename download state `Downloaded` to `Importing`

---
 osu.Game/Graphics/UserInterface/DownloadButton.cs             | 2 +-
 osu.Game/Online/DownloadState.cs                              | 2 +-
 osu.Game/Online/DownloadTrackingComposite.cs                  | 4 ++--
 .../BeatmapListing/Panels/BeatmapPanelDownloadButton.cs       | 2 +-
 .../Overlays/BeatmapListing/Panels/DownloadProgressBar.cs     | 2 +-
 osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs  | 2 +-
 osu.Game/Overlays/BeatmapSet/Header.cs                        | 2 +-
 osu.Game/Screens/Ranking/ReplayDownloadButton.cs              | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/DownloadButton.cs b/osu.Game/Graphics/UserInterface/DownloadButton.cs
index da6c95299e..5168ff646b 100644
--- a/osu.Game/Graphics/UserInterface/DownloadButton.cs
+++ b/osu.Game/Graphics/UserInterface/DownloadButton.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Graphics.UserInterface
                     TooltipText = "Downloading...";
                     break;
 
-                case DownloadState.Downloaded:
+                case DownloadState.Importing:
                     background.FadeColour(colours.Yellow, 500, Easing.InOutExpo);
                     TooltipText = "Importing";
                     break;
diff --git a/osu.Game/Online/DownloadState.cs b/osu.Game/Online/DownloadState.cs
index 72efbc286e..a58c40d16a 100644
--- a/osu.Game/Online/DownloadState.cs
+++ b/osu.Game/Online/DownloadState.cs
@@ -7,7 +7,7 @@ namespace osu.Game.Online
     {
         NotDownloaded,
         Downloading,
-        Downloaded,
+        Importing,
         LocallyAvailable
     }
 }
diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index bed95344c6..7a64c9002d 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -106,7 +106,7 @@ namespace osu.Game.Online
             {
                 if (attachedRequest.Progress == 1)
                 {
-                    State.Value = DownloadState.Downloaded;
+                    State.Value = DownloadState.Importing;
                     Progress.Value = 1;
                 }
                 else
@@ -125,7 +125,7 @@ namespace osu.Game.Online
             }
         }
 
-        private void onRequestSuccess(string _) => Schedule(() => State.Value = DownloadState.Downloaded);
+        private void onRequestSuccess(string _) => Schedule(() => State.Value = DownloadState.Importing);
 
         private void onRequestProgress(float progress) => Schedule(() => Progress.Value = progress);
 
diff --git a/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelDownloadButton.cs b/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelDownloadButton.cs
index 001ca801d9..cec1a5ac12 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelDownloadButton.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelDownloadButton.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                 switch (State.Value)
                 {
                     case DownloadState.Downloading:
-                    case DownloadState.Downloaded:
+                    case DownloadState.Importing:
                         shakeContainer.Shake();
                         break;
 
diff --git a/osu.Game/Overlays/BeatmapListing/Panels/DownloadProgressBar.cs b/osu.Game/Overlays/BeatmapListing/Panels/DownloadProgressBar.cs
index 93cf8799b5..6a2f2e4569 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/DownloadProgressBar.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/DownloadProgressBar.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                         progressBar.ResizeHeightTo(4, 400, Easing.OutQuint);
                         break;
 
-                    case DownloadState.Downloaded:
+                    case DownloadState.Importing:
                         progressBar.FadeIn(400, Easing.OutQuint);
                         progressBar.ResizeHeightTo(4, 400, Easing.OutQuint);
 
diff --git a/osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs b/osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs
index 56c0052bfe..cffff86a64 100644
--- a/osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs
+++ b/osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
                         };
                         break;
 
-                    case DownloadState.Downloaded:
+                    case DownloadState.Importing:
                         textSprites.Children = new Drawable[]
                         {
                             new OsuSpriteText
diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs
index 321e496511..c17901bb3f 100644
--- a/osu.Game/Overlays/BeatmapSet/Header.cs
+++ b/osu.Game/Overlays/BeatmapSet/Header.cs
@@ -287,7 +287,7 @@ namespace osu.Game.Overlays.BeatmapSet
                     break;
 
                 case DownloadState.Downloading:
-                case DownloadState.Downloaded:
+                case DownloadState.Importing:
                     // temporary to avoid showing two buttons for maps with novideo. will be fixed in new beatmap overlay design.
                     downloadButtonsContainer.Child = new HeaderDownloadButton(BeatmapSet.Value);
                     break;
diff --git a/osu.Game/Screens/Ranking/ReplayDownloadButton.cs b/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
index b76842f405..18b8649a59 100644
--- a/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
+++ b/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Screens.Ranking
                         scores.Download(Model.Value);
                         break;
 
-                    case DownloadState.Downloaded:
+                    case DownloadState.Importing:
                     case DownloadState.Downloading:
                         shakeContainer.Shake();
                         break;

From 1ba586a683b3321cf7806d9dabf068983d0bd27b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 13 Jan 2021 17:53:01 +0100
Subject: [PATCH 0864/3722] Revert overlooked AR<8 speed buff

Pull request #11107 introduced changes in osu! performance calculation,
related to a scaling coefficient applied to the speed and aim skills.
The coefficient in question was dependent on the approach rate of
a map. During a post-merge review of that PR, it was spotted that
the scaling coefficient for speed also had a 10x buff applied for AR<8,
which could reach magnitudes as large as 80% on AR0, which seems quite
exorbitant. This change was not discussed or mentioned anywhere in the
review process.

Revert back to the old multiplier of 0.01 rather than 0.1 for AR<8. The
negative slope through AR0 to 8 is retained in its previous form.
---
 osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index a44c97c3cf..44a9dd2f1f 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -104,7 +104,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             if (Attributes.ApproachRate > 10.33)
                 approachRateFactor += 0.4 * (Attributes.ApproachRate - 10.33);
             else if (Attributes.ApproachRate < 8.0)
-                approachRateFactor += 0.1 * (8.0 - Attributes.ApproachRate);
+                approachRateFactor += 0.01 * (8.0 - Attributes.ApproachRate);
 
             aimValue *= 1.0 + Math.Min(approachRateFactor, approachRateFactor * (totalHits / 1000.0));
 

From 1248d39d7e5fa6a7a30271a1346059594e0e021d Mon Sep 17 00:00:00 2001
From: Mysfit <jdawg678@gmail.com>
Date: Wed, 13 Jan 2021 13:07:07 -0500
Subject: [PATCH 0865/3722] Reverted change to AllowConfigurationLookup and
 added a separate AllowColourLookup bool with config case based on lookup type
 in SkinProvidingContainer GetConfig call.

---
 .../Skinning/BeatmapSkinProvidingContainer.cs | 11 ++++++
 osu.Game/Skinning/SkinProvidingContainer.cs   | 34 ++++++++++++++++---
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Skinning/BeatmapSkinProvidingContainer.cs b/osu.Game/Skinning/BeatmapSkinProvidingContainer.cs
index c16547589d..57c08a903f 100644
--- a/osu.Game/Skinning/BeatmapSkinProvidingContainer.cs
+++ b/osu.Game/Skinning/BeatmapSkinProvidingContainer.cs
@@ -25,6 +25,17 @@ namespace osu.Game.Skinning
                 if (beatmapSkins == null)
                     throw new InvalidOperationException($"{nameof(BeatmapSkinProvidingContainer)} needs to be loaded before being consumed.");
 
+                return beatmapSkins.Value;
+            }
+        }
+
+        protected override bool AllowColourLookup
+        {
+            get
+            {
+                if (beatmapColours == null)
+                    throw new InvalidOperationException($"{nameof(BeatmapSkinProvidingContainer)} needs to be loaded before being consumed.");
+
                 return beatmapColours.Value;
             }
         }
diff --git a/osu.Game/Skinning/SkinProvidingContainer.cs b/osu.Game/Skinning/SkinProvidingContainer.cs
index adf62ed452..3232a30110 100644
--- a/osu.Game/Skinning/SkinProvidingContainer.cs
+++ b/osu.Game/Skinning/SkinProvidingContainer.cs
@@ -32,6 +32,8 @@ namespace osu.Game.Skinning
 
         protected virtual bool AllowConfigurationLookup => true;
 
+        protected virtual bool AllowColourLookup => true;
+
         public SkinProvidingContainer(ISkin skin)
         {
             this.skin = skin;
@@ -68,11 +70,35 @@ namespace osu.Game.Skinning
 
         public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
         {
-            if (AllowConfigurationLookup && skin != null)
+            if (skin != null)
             {
-                var bindable = skin.GetConfig<TLookup, TValue>(lookup);
-                if (bindable != null)
-                    return bindable;
+                switch (lookup)
+                {
+                    // todo: the GlobalSkinColours switch is pulled from LegacySkin and should not exist.
+                    // will likely change based on how databased storage of skin configuration goes.
+                    case GlobalSkinColours global:
+                        switch (global)
+                        {
+                            case GlobalSkinColours.ComboColours:
+                                var bindable = skin.GetConfig<TLookup, TValue>(lookup);
+                                if (bindable != null && AllowColourLookup)
+                                    return bindable;
+                                else
+                                    return fallbackSource?.GetConfig<TLookup, TValue>(lookup);
+                        }
+
+                        break;
+
+                    default:
+                        if (AllowConfigurationLookup)
+                        {
+                            var bindable = skin.GetConfig<TLookup, TValue>(lookup);
+                            if (bindable != null)
+                                return bindable;
+                        }
+
+                        break;
+                }
             }
 
             return fallbackSource?.GetConfig<TLookup, TValue>(lookup);

From 95acc457aad5f08df2b7a7a4bc37af4a241ffc2d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 13 Jan 2021 22:34:48 +0300
Subject: [PATCH 0866/3722] Fix stupid mistake

fuck.
---
 osu.Game/Online/Rooms/BeatmapAvailability.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/Rooms/BeatmapAvailability.cs b/osu.Game/Online/Rooms/BeatmapAvailability.cs
index b6b9c632fe..e7dbc5f436 100644
--- a/osu.Game/Online/Rooms/BeatmapAvailability.cs
+++ b/osu.Game/Online/Rooms/BeatmapAvailability.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Online.Rooms
 
         public static BeatmapAvailability NotDownloaded() => new BeatmapAvailability(DownloadState.NotDownloaded);
         public static BeatmapAvailability Downloading(double progress) => new BeatmapAvailability(DownloadState.Downloading, progress);
-        public static BeatmapAvailability Importing() => new BeatmapAvailability(DownloadState.Downloaded);
+        public static BeatmapAvailability Importing() => new BeatmapAvailability(DownloadState.Importing);
         public static BeatmapAvailability LocallyAvailable() => new BeatmapAvailability(DownloadState.LocallyAvailable);
 
         public bool Equals(BeatmapAvailability other) => other != null && State == other.State && DownloadProgress == other.DownloadProgress;

From 8b95817f7abf8f5674ffa11d37c1eb37ce259806 Mon Sep 17 00:00:00 2001
From: Mysfit <jdawg678@gmail.com>
Date: Wed, 13 Jan 2021 16:05:46 -0500
Subject: [PATCH 0867/3722] Moved SkinProvidingContainer bindable fetching to
 common method. Replaced redundant test boolean declarations with inline
 values.

---
 .../TestSceneLegacyBeatmapSkin.cs             | 28 +++++++++----------
 osu.Game/Skinning/SkinProvidingContainer.cs   | 24 ++++++++--------
 2 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
index 138182c7c4..22b028906f 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
@@ -36,41 +36,41 @@ namespace osu.Game.Rulesets.Osu.Tests
             config.BindWith(OsuSetting.BeatmapColours, beatmapColours);
         }
 
-        [TestCase(true, true, true)]
-        [TestCase(true, false, true)]
-        [TestCase(false, true, true)]
-        [TestCase(false, false, true)]
-        public void TestBeatmapComboColours(bool userHasCustomColours, bool useBeatmapSkin, bool useBeatmapColour)
+        [TestCase(true, true)]
+        [TestCase(true, false)]
+        [TestCase(false, true)]
+        [TestCase(false, false)]
+        public void TestBeatmapComboColours(bool userHasCustomColours, bool useBeatmapSkin)
         {
             ExposedPlayer player = null;
 
-            configureSettings(useBeatmapSkin, useBeatmapColour);
+            configureSettings(useBeatmapSkin, true);
             AddStep("load coloured beatmap", () => player = loadBeatmap(userHasCustomColours, true));
             AddUntilStep("wait for player", () => player.IsLoaded);
 
             AddAssert("is beatmap skin colours", () => player.UsableComboColours.SequenceEqual(TestBeatmapSkin.Colours));
         }
 
-        [TestCase(true, false)]
-        [TestCase(false, false)]
-        public void TestBeatmapComboColoursOverride(bool useBeatmapSkin, bool useBeatmapColour)
+        [TestCase(true)]
+        [TestCase(false)]
+        public void TestBeatmapComboColoursOverride(bool useBeatmapSkin)
         {
             ExposedPlayer player = null;
 
-            configureSettings(useBeatmapSkin, useBeatmapColour);
+            configureSettings(useBeatmapSkin, false);
             AddStep("load coloured beatmap", () => player = loadBeatmap(true, true));
             AddUntilStep("wait for player", () => player.IsLoaded);
 
             AddAssert("is user custom skin colours", () => player.UsableComboColours.SequenceEqual(TestSkin.Colours));
         }
 
-        [TestCase(true, false)]
-        [TestCase(false, false)]
-        public void TestBeatmapComboColoursOverrideWithDefaultColours(bool useBeatmapSkin, bool useBeatmapColour)
+        [TestCase(true)]
+        [TestCase(false)]
+        public void TestBeatmapComboColoursOverrideWithDefaultColours(bool useBeatmapSkin)
         {
             ExposedPlayer player = null;
 
-            configureSettings(useBeatmapSkin, useBeatmapColour);
+            configureSettings(useBeatmapSkin, false);
             AddStep("load coloured beatmap", () => player = loadBeatmap(false, true));
             AddUntilStep("wait for player", () => player.IsLoaded);
 
diff --git a/osu.Game/Skinning/SkinProvidingContainer.cs b/osu.Game/Skinning/SkinProvidingContainer.cs
index 3232a30110..ae9a84932a 100644
--- a/osu.Game/Skinning/SkinProvidingContainer.cs
+++ b/osu.Game/Skinning/SkinProvidingContainer.cs
@@ -80,30 +80,28 @@ namespace osu.Game.Skinning
                         switch (global)
                         {
                             case GlobalSkinColours.ComboColours:
-                                var bindable = skin.GetConfig<TLookup, TValue>(lookup);
-                                if (bindable != null && AllowColourLookup)
-                                    return bindable;
-                                else
-                                    return fallbackSource?.GetConfig<TLookup, TValue>(lookup);
+                                return getBindable<TLookup, TValue>(lookup, AllowColourLookup);
                         }
 
                         break;
 
                     default:
-                        if (AllowConfigurationLookup)
-                        {
-                            var bindable = skin.GetConfig<TLookup, TValue>(lookup);
-                            if (bindable != null)
-                                return bindable;
-                        }
-
-                        break;
+                        return getBindable<TLookup, TValue>(lookup, AllowConfigurationLookup);
                 }
             }
 
             return fallbackSource?.GetConfig<TLookup, TValue>(lookup);
         }
 
+        private IBindable<TValue> getBindable<TLookup, TValue>(TLookup lookup, bool bindableReturnCheck)
+        {
+            var bindable = skin.GetConfig<TLookup, TValue>(lookup);
+            if (bindable != null && bindableReturnCheck)
+                return bindable;
+            else
+                return fallbackSource?.GetConfig<TLookup, TValue>(lookup);
+        }
+
         protected virtual void TriggerSourceChanged() => SourceChanged?.Invoke();
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)

From 562634dfd2de90736dfb812c9d8834c0c97bcb4c Mon Sep 17 00:00:00 2001
From: Jesse Myers <jdawg678@gmail.com>
Date: Wed, 13 Jan 2021 16:49:14 -0500
Subject: [PATCH 0868/3722] Improve naming around the config lookup with
 fallback private method.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 osu.Game/Skinning/SkinProvidingContainer.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/SkinProvidingContainer.cs b/osu.Game/Skinning/SkinProvidingContainer.cs
index ae9a84932a..2dc19667e4 100644
--- a/osu.Game/Skinning/SkinProvidingContainer.cs
+++ b/osu.Game/Skinning/SkinProvidingContainer.cs
@@ -93,10 +93,10 @@ namespace osu.Game.Skinning
             return fallbackSource?.GetConfig<TLookup, TValue>(lookup);
         }
 
-        private IBindable<TValue> getBindable<TLookup, TValue>(TLookup lookup, bool bindableReturnCheck)
+        private IBindable<TValue> lookupWithFallback<TLookup, TValue>(TLookup lookup, bool canUseSkinLookup)
         {
             var bindable = skin.GetConfig<TLookup, TValue>(lookup);
-            if (bindable != null && bindableReturnCheck)
+            if (bindable != null && canUseSkinLookup)
                 return bindable;
             else
                 return fallbackSource?.GetConfig<TLookup, TValue>(lookup);

From abf718242b11519825228a2f6098dff745231608 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 14 Jan 2021 05:40:43 +0300
Subject: [PATCH 0869/3722] Make explicit marker font semi-bold

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

diff --git a/osu.Game/Overlays/BeatmapSet/ExplicitBeatmapPill.cs b/osu.Game/Overlays/BeatmapSet/ExplicitBeatmapPill.cs
index ad19dffccb..aefb3299a5 100644
--- a/osu.Game/Overlays/BeatmapSet/ExplicitBeatmapPill.cs
+++ b/osu.Game/Overlays/BeatmapSet/ExplicitBeatmapPill.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Overlays.BeatmapSet
                     {
                         Margin = new MarginPadding { Horizontal = 10f, Vertical = 2f },
                         Text = "EXPLICIT",
-                        Font = OsuFont.GetFont(size: 10, weight: FontWeight.Bold),
+                        Font = OsuFont.GetFont(size: 10, weight: FontWeight.SemiBold),
                         Colour = OverlayColourProvider.Orange.Colour2,
                     }
                 }

From 6281c1086ac377503c89a5648608e47ab6b71e89 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 14 Jan 2021 05:41:09 +0300
Subject: [PATCH 0870/3722] Space out explicit marker in beatmap overlay

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

diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs
index fbdee91d42..9f2b40dfa4 100644
--- a/osu.Game/Overlays/BeatmapSet/Header.cs
+++ b/osu.Game/Overlays/BeatmapSet/Header.cs
@@ -152,7 +152,7 @@ namespace osu.Game.Overlays.BeatmapSet
                                                         Alpha = 0f,
                                                         Anchor = Anchor.CentreLeft,
                                                         Origin = Anchor.CentreLeft,
-                                                        Margin = new MarginPadding { Left = 10f, Top = 4 },
+                                                        Margin = new MarginPadding { Left = 15f, Top = 4 },
                                                     }
                                                 }
                                             },

From d5878db615ef55e87b9e39e22b480610f12cdf6c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 14 Jan 2021 12:33:33 +0900
Subject: [PATCH 0871/3722] Fix default judgement text mispositioned for one
 frame

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

diff --git a/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs b/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
index d94346cb72..21ac017685 100644
--- a/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
+++ b/osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
@@ -37,6 +37,8 @@ namespace osu.Game.Rulesets.Judgements
             {
                 JudgementText = new OsuSpriteText
                 {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
                     Text = Result.GetDescription().ToUpperInvariant(),
                     Colour = colours.ForHitResult(Result),
                     Font = OsuFont.Numeric.With(size: 20),

From 8a0b975d71d08f6a845b10b46aec50d714d00c68 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 Jan 2021 18:25:32 +0900
Subject: [PATCH 0872/3722] Fix deadlock scenario when calculating fallback
 difficulty

The previous code would run a calcaulation for the beatmap's own ruleset
if the current one failed. While this does make sense, with the current
way we use this component (and the implementation flow) it is quite unsafe.

The to the call on `.Result` in the `catch` block, this would 100%
deadlock due to the thread concurrency of the `ThreadedTaskScheduler`
being 1. Even if the nested run could be run inline (it should be), the
task scheduler won't even get to the point of checking whether this is
feasible due to it being saturated by the already running task.

I'm not sure if we still need this fallback lookup logic. After removing
it, it's feasible that 0 stars will be returned during the scenario that
previously caused a deadlock, but I don't necessarily think this is
incorrect. There may be another reason for this needing to exist which
I'm not aware of (diffcalc?) but if that's the case we may want to move
the try-catch handling to the point of usage.

To reproduce the deadlock scenario with 100% success (the repro
instructions in the linked issue aren't that simple and require some
patience and good timing), the main portion of the lookup can be changed
to randomly trigger a nested lookup:

```
if (RNG.NextSingle() > 0.5f)
    return GetAsync(new
DifficultyCacheLookup(key.Beatmap, key.Beatmap.Ruleset,
key.OrderedMods)).Result;
else
    return new StarDifficulty(attributes);
```

After switching beatmap once or twice, pausing debug and viewing the
state of threads should show exactly what is going on.
---
 osu.Game/Beatmaps/BeatmapDifficultyCache.cs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
index 3b58062add..37d262abe5 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
@@ -260,17 +260,10 @@ namespace osu.Game.Beatmaps
             }
             catch (BeatmapInvalidForRulesetException e)
             {
-                // Conversion has failed for the given ruleset, so return the difficulty in the beatmap's default ruleset.
-
-                // Ensure the beatmap's default ruleset isn't the one already being converted to.
-                // This shouldn't happen as it means something went seriously wrong, but if it does an endless loop should be avoided.
                 if (rulesetInfo.Equals(beatmapInfo.Ruleset))
-                {
                     Logger.Error(e, $"Failed to convert {beatmapInfo.OnlineBeatmapID} to the beatmap's default ruleset ({beatmapInfo.Ruleset}).");
-                    return new StarDifficulty();
-                }
 
-                return GetAsync(new DifficultyCacheLookup(key.Beatmap, key.Beatmap.Ruleset, key.OrderedMods)).Result;
+                return new StarDifficulty();
             }
             catch
             {

From 99e43c77c23709c90100cea34210c5a2d054a206 Mon Sep 17 00:00:00 2001
From: Mysfit <jdawg678@gmail.com>
Date: Thu, 14 Jan 2021 16:53:55 -0500
Subject: [PATCH 0873/3722] Simplified colour config checks in
 SkinProvidingContainer.cs

---
 osu.Game/Skinning/SkinProvidingContainer.cs | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Skinning/SkinProvidingContainer.cs b/osu.Game/Skinning/SkinProvidingContainer.cs
index 2dc19667e4..d2645eff68 100644
--- a/osu.Game/Skinning/SkinProvidingContainer.cs
+++ b/osu.Game/Skinning/SkinProvidingContainer.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
+using osuTK.Graphics;
 
 namespace osu.Game.Skinning
 {
@@ -72,22 +73,12 @@ namespace osu.Game.Skinning
         {
             if (skin != null)
             {
-                switch (lookup)
-                {
-                    // todo: the GlobalSkinColours switch is pulled from LegacySkin and should not exist.
-                    // will likely change based on how databased storage of skin configuration goes.
-                    case GlobalSkinColours global:
-                        switch (global)
-                        {
-                            case GlobalSkinColours.ComboColours:
-                                return getBindable<TLookup, TValue>(lookup, AllowColourLookup);
-                        }
+                TValue tValueTypeCheck = default;
 
-                        break;
-
-                    default:
-                        return getBindable<TLookup, TValue>(lookup, AllowConfigurationLookup);
-                }
+                if (lookup is GlobalSkinColours || tValueTypeCheck is Color4)
+                    return lookupWithFallback<TLookup, TValue>(lookup, AllowColourLookup);
+                else
+                    return lookupWithFallback<TLookup, TValue>(lookup, AllowConfigurationLookup);
             }
 
             return fallbackSource?.GetConfig<TLookup, TValue>(lookup);

From dc8e38cf4d8dfcdb0a33a6d4c73147ce43fe4c05 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 15 Jan 2021 07:20:13 +0300
Subject: [PATCH 0874/3722] Remove pointless inline comment

---
 osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
index 3761aee312..5c6267b726 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
@@ -151,7 +151,6 @@ namespace osu.Game.Overlays.BeatmapListing
             allowExplicitContent = config.GetBindable<bool>(OsuSetting.AllowExplicitContent);
             allowExplicitContent.BindValueChanged(allow =>
             {
-                // Update search control if global "explicit allowed" setting changed.
                 Explicit.Value = allow.NewValue ? SearchExplicit.Show : SearchExplicit.Hide;
             }, true);
         }

From 4cccde9007cdb1646f041da71d77184c51f490d2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 13:20:46 +0900
Subject: [PATCH 0875/3722] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 492c88c7e4..919d83f8db 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.106.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.115.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index ff016199d3..ac014f2964 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -28,7 +28,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.106.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.115.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
     <PackageReference Include="Sentry" Version="2.1.8" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 93be3645ee..799042626b 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.106.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.115.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -88,7 +88,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.106.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.115.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 0c01a3a685c9ba1ca5c29f5e124043780c9f1d61 Mon Sep 17 00:00:00 2001
From: Mysfit <jdawg678@gmail.com>
Date: Thu, 14 Jan 2021 23:30:24 -0500
Subject: [PATCH 0876/3722] Found a better solution than TValue type checking
 for additional beatmap colour settings. Added unit tests for Catch Beatmap
 Skin settings.

---
 .../TestSceneLegacyBeatmapSkin.cs             | 360 ++++++++++++++++++
 osu.Game/Skinning/SkinProvidingContainer.cs   |   5 +-
 2 files changed, 361 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch.Tests/TestSceneLegacyBeatmapSkin.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneLegacyBeatmapSkin.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneLegacyBeatmapSkin.cs
new file mode 100644
index 0000000000..12ceaaa6fa
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneLegacyBeatmapSkin.cs
@@ -0,0 +1,360 @@
+// Copyright (c) ppy 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.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Bindables;
+using osu.Framework.IO.Stores;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Configuration;
+using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Rulesets.Catch.Skinning;
+using osu.Game.Rulesets.Catch.UI;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Screens.Play;
+using osu.Game.Skinning;
+using osu.Game.Tests.Visual;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Catch.Tests
+{
+    public class TestSceneLegacyBeatmapSkin : ScreenTestScene
+    {
+        [Resolved]
+        private AudioManager audio { get; set; }
+
+        private readonly Bindable<bool> beatmapSkins = new Bindable<bool>();
+        private readonly Bindable<bool> beatmapColours = new Bindable<bool>();
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            config.BindWith(OsuSetting.BeatmapSkins, beatmapSkins);
+            config.BindWith(OsuSetting.BeatmapColours, beatmapColours);
+        }
+
+        [TestCase(true, true)]
+        [TestCase(true, false)]
+        [TestCase(false, true)]
+        [TestCase(false, false)]
+        public void TestBeatmapComboColours(bool userHasCustomColours, bool useBeatmapSkin)
+        {
+            ExposedPlayer player = null;
+
+            configureSettings(useBeatmapSkin, true);
+            AddStep("load coloured beatmap", () => player = loadBeatmap(userHasCustomColours, true));
+            AddUntilStep("wait for player", () => player.IsLoaded);
+
+            AddAssert("is beatmap skin colours", () => player.UsableComboColours.SequenceEqual(TestBeatmapSkin.Colours));
+        }
+
+        [TestCase(true)]
+        [TestCase(false)]
+        public void TestBeatmapComboColoursOverride(bool useBeatmapSkin)
+        {
+            ExposedPlayer player = null;
+
+            configureSettings(useBeatmapSkin, false);
+            AddStep("load coloured beatmap", () => player = loadBeatmap(true, true));
+            AddUntilStep("wait for player", () => player.IsLoaded);
+
+            AddAssert("is user custom skin colours", () => player.UsableComboColours.SequenceEqual(TestSkin.Colours));
+        }
+
+        [TestCase(true)]
+        [TestCase(false)]
+        public void TestBeatmapComboColoursOverrideWithDefaultColours(bool useBeatmapSkin)
+        {
+            ExposedPlayer player = null;
+
+            configureSettings(useBeatmapSkin, false);
+            AddStep("load coloured beatmap", () => player = loadBeatmap(false, true));
+            AddUntilStep("wait for player", () => player.IsLoaded);
+
+            AddAssert("is default user skin colours", () => player.UsableComboColours.SequenceEqual(SkinConfiguration.DefaultComboColours));
+        }
+
+        [TestCase(true, true)]
+        [TestCase(false, true)]
+        [TestCase(true, false)]
+        [TestCase(false, false)]
+        public void TestBeatmapNoComboColours(bool useBeatmapSkin, bool useBeatmapColour)
+        {
+            ExposedPlayer player = null;
+
+            configureSettings(useBeatmapSkin, useBeatmapColour);
+            AddStep("load no-colour beatmap", () => player = loadBeatmap(false, false));
+            AddUntilStep("wait for player", () => player.IsLoaded);
+
+            AddAssert("is default user skin colours", () => player.UsableComboColours.SequenceEqual(SkinConfiguration.DefaultComboColours));
+        }
+
+        [TestCase(true, true)]
+        [TestCase(false, true)]
+        [TestCase(true, false)]
+        [TestCase(false, false)]
+        public void TestBeatmapNoComboColoursSkinOverride(bool useBeatmapSkin, bool useBeatmapColour)
+        {
+            ExposedPlayer player = null;
+
+            configureSettings(useBeatmapSkin, useBeatmapColour);
+            AddStep("load custom-skin colour", () => player = loadBeatmap(true, false));
+            AddUntilStep("wait for player", () => player.IsLoaded);
+
+            AddAssert("is custom user skin colours", () => player.UsableComboColours.SequenceEqual(TestSkin.Colours));
+        }
+
+        [TestCase(true)]
+        [TestCase(false)]
+        public void TestBeatmapHyperDashColours(bool useBeatmapSkin)
+        {
+            ExposedPlayer player = null;
+
+            configureSettings(useBeatmapSkin, true);
+            AddStep("load custom-skin colour", () => player = loadBeatmap(true, true));
+            AddUntilStep("wait for player", () => player.IsLoaded);
+
+            AddAssert("is custom hyper dash colours", () => player.UsableHyperDashColour == TestBeatmapSkin.HYPER_DASH_COLOUR);
+            AddAssert("is custom hyper dash after image colours", () => player.UsableHyperDashAfterImageColour == TestBeatmapSkin.HYPER_DASH_AFTER_IMAGE_COLOUR);
+            AddAssert("is custom hyper dash fruit colours", () => player.UsableHyperDashFruitColour == TestBeatmapSkin.HYPER_DASH_FRUIT_COLOUR);
+        }
+
+        [TestCase(true)]
+        [TestCase(false)]
+        public void TestBeatmapHyperDashColoursOverride(bool useBeatmapSkin)
+        {
+            ExposedPlayer player = null;
+
+            configureSettings(useBeatmapSkin, false);
+            AddStep("load custom-skin colour", () => player = loadBeatmap(true, true));
+            AddUntilStep("wait for player", () => player.IsLoaded);
+
+            AddAssert("is custom hyper dash colours", () => player.UsableHyperDashColour == TestSkin.HYPER_DASH_COLOUR);
+            AddAssert("is custom hyper dash after image colours", () => player.UsableHyperDashAfterImageColour == TestSkin.HYPER_DASH_AFTER_IMAGE_COLOUR);
+            AddAssert("is custom hyper dash fruit colours", () => player.UsableHyperDashFruitColour == TestSkin.HYPER_DASH_FRUIT_COLOUR);
+        }
+
+        private ExposedPlayer loadBeatmap(bool userHasCustomColours, bool beatmapHasColours)
+        {
+            ExposedPlayer player;
+
+            Beatmap.Value = new CustomSkinWorkingBeatmap(audio, beatmapHasColours);
+
+            LoadScreen(player = new ExposedPlayer(userHasCustomColours));
+
+            return player;
+        }
+
+        private void configureSettings(bool beatmapSkins, bool beatmapColours)
+        {
+            AddStep($"{(beatmapSkins ? "enable" : "disable")} beatmap skins", () =>
+            {
+                this.beatmapSkins.Value = beatmapSkins;
+            });
+            AddStep($"{(beatmapColours ? "enable" : "disable")} beatmap colours", () =>
+            {
+                this.beatmapColours.Value = beatmapColours;
+            });
+        }
+
+        private class ExposedPlayer : Player
+        {
+            private readonly bool userHasCustomColours;
+
+            public ExposedPlayer(bool userHasCustomColours)
+                : base(new PlayerConfiguration
+                {
+                    AllowPause = false,
+                    ShowResults = false,
+                })
+            {
+                this.userHasCustomColours = userHasCustomColours;
+            }
+
+            protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
+            {
+                var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+                dependencies.CacheAs<ISkinSource>(new TestSkin(userHasCustomColours));
+                return dependencies;
+            }
+
+            public IReadOnlyList<Color4> UsableComboColours =>
+                GameplayClockContainer.ChildrenOfType<BeatmapSkinProvidingContainer>()
+                                      .First()
+                                      .GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value;
+
+            public Color4 UsableHyperDashColour =>
+                GameplayClockContainer.ChildrenOfType<BeatmapSkinProvidingContainer>()
+                                      .First()
+                                      .GetConfig<SkinCustomColourLookup, Color4>(new SkinCustomColourLookup(CatchSkinColour.HyperDash))?
+                                      .Value ?? Color4.Red;
+
+            public Color4 UsableHyperDashAfterImageColour =>
+                GameplayClockContainer.ChildrenOfType<BeatmapSkinProvidingContainer>()
+                                      .First()
+                                      .GetConfig<SkinCustomColourLookup, Color4>(new SkinCustomColourLookup(CatchSkinColour.HyperDashAfterImage))?
+                                      .Value ?? Color4.Red;
+
+            public Color4 UsableHyperDashFruitColour =>
+                GameplayClockContainer.ChildrenOfType<BeatmapSkinProvidingContainer>()
+                                      .First()
+                                      .GetConfig<SkinCustomColourLookup, Color4>(new SkinCustomColourLookup(CatchSkinColour.HyperDashFruit))?
+                                      .Value ?? Color4.Red;
+        }
+
+        private class TestJuiceStream : JuiceStream
+        {
+            public TestJuiceStream(float x)
+            {
+                X = x;
+
+                Path = new SliderPath(new[]
+                {
+                    new PathControlPoint(Vector2.Zero),
+                    new PathControlPoint(new Vector2(30, 0)),
+                });
+            }
+        }
+
+        private class CustomSkinWorkingBeatmap : ClockBackedTestWorkingBeatmap
+        {
+            private readonly bool hasColours;
+
+            public CustomSkinWorkingBeatmap(AudioManager audio, bool hasColours)
+                : base(createBeatmap(new CatchRuleset().RulesetInfo), null, null, audio)
+            {
+                this.hasColours = hasColours;
+            }
+
+            protected override ISkin GetSkin() => new TestBeatmapSkin(BeatmapInfo, hasColours);
+
+            private static IBeatmap createBeatmap(RulesetInfo ruleset)
+            {
+                var beatmap = new Beatmap
+                {
+                    BeatmapInfo =
+                    {
+                        Ruleset = ruleset,
+                        BaseDifficulty = new BeatmapDifficulty { CircleSize = 3.6f }
+                    }
+                };
+
+                beatmap.ControlPointInfo.Add(0, new TimingControlPoint());
+
+                // Should produce a hyper-dash (edge case test)
+                beatmap.HitObjects.Add(new Fruit { StartTime = 1816, X = 56, NewCombo = true });
+                beatmap.HitObjects.Add(new Fruit { StartTime = 2008, X = 308, NewCombo = true });
+
+                double startTime = 3000;
+
+                const float left_x = 0.02f * CatchPlayfield.WIDTH;
+                const float right_x = 0.98f * CatchPlayfield.WIDTH;
+
+                createObjects(() => new Fruit { X = left_x });
+                createObjects(() => new TestJuiceStream(right_x), 1);
+                createObjects(() => new TestJuiceStream(left_x), 1);
+                createObjects(() => new Fruit { X = right_x });
+                createObjects(() => new Fruit { X = left_x });
+                createObjects(() => new Fruit { X = right_x });
+                createObjects(() => new TestJuiceStream(left_x), 1);
+
+                beatmap.ControlPointInfo.Add(startTime, new TimingControlPoint
+                {
+                    BeatLength = 50
+                });
+
+                createObjects(() => new TestJuiceStream(left_x)
+                {
+                    Path = new SliderPath(new[]
+                    {
+                        new PathControlPoint(Vector2.Zero),
+                        new PathControlPoint(new Vector2(512, 0))
+                    })
+                }, 1);
+
+                return beatmap;
+
+                void createObjects(Func<CatchHitObject> createObject, int count = 3)
+                {
+                    const float spacing = 140;
+
+                    for (int i = 0; i < count; i++)
+                    {
+                        var hitObject = createObject();
+                        hitObject.StartTime = startTime + i * spacing;
+                        beatmap.HitObjects.Add(hitObject);
+                    }
+
+                    startTime += 700;
+                }
+            }
+        }
+
+        private class TestBeatmapSkin : LegacyBeatmapSkin
+        {
+            public static Color4[] Colours { get; } =
+            {
+                new Color4(50, 100, 150, 255),
+                new Color4(40, 80, 120, 255),
+            };
+
+            public static readonly Color4 HYPER_DASH_COLOUR = Color4.DarkBlue;
+
+            public static readonly Color4 HYPER_DASH_AFTER_IMAGE_COLOUR = Color4.DarkCyan;
+
+            public static readonly Color4 HYPER_DASH_FRUIT_COLOUR = Color4.DarkGoldenrod;
+
+            public TestBeatmapSkin(BeatmapInfo beatmap, bool hasColours)
+                : base(beatmap, new ResourceStore<byte[]>(), null)
+            {
+                if (hasColours)
+                {
+                    Configuration.AddComboColours(Colours);
+                    Configuration.CustomColours.Add(CatchSkinColour.HyperDash.ToString(), HYPER_DASH_COLOUR);
+                    Configuration.CustomColours.Add(CatchSkinColour.HyperDashAfterImage.ToString(), HYPER_DASH_AFTER_IMAGE_COLOUR);
+                    Configuration.CustomColours.Add(CatchSkinColour.HyperDashFruit.ToString(), HYPER_DASH_FRUIT_COLOUR);
+                }
+            }
+        }
+
+        private class TestSkin : LegacySkin, ISkinSource
+        {
+            public static Color4[] Colours { get; } =
+            {
+                new Color4(150, 100, 50, 255),
+                new Color4(20, 20, 20, 255),
+            };
+
+            public static readonly Color4 HYPER_DASH_COLOUR = Color4.LightBlue;
+
+            public static readonly Color4 HYPER_DASH_AFTER_IMAGE_COLOUR = Color4.LightCoral;
+
+            public static readonly Color4 HYPER_DASH_FRUIT_COLOUR = Color4.LightCyan;
+
+            public TestSkin(bool hasCustomColours)
+                : base(new SkinInfo(), new ResourceStore<byte[]>(), null, string.Empty)
+            {
+                if (hasCustomColours)
+                {
+                    Configuration.AddComboColours(Colours);
+                    Configuration.CustomColours.Add(CatchSkinColour.HyperDash.ToString(), HYPER_DASH_COLOUR);
+                    Configuration.CustomColours.Add(CatchSkinColour.HyperDashAfterImage.ToString(), HYPER_DASH_AFTER_IMAGE_COLOUR);
+                    Configuration.CustomColours.Add(CatchSkinColour.HyperDashFruit.ToString(), HYPER_DASH_FRUIT_COLOUR);
+                }
+            }
+
+            public event Action SourceChanged
+            {
+                add { }
+                remove { }
+            }
+        }
+    }
+}
diff --git a/osu.Game/Skinning/SkinProvidingContainer.cs b/osu.Game/Skinning/SkinProvidingContainer.cs
index d2645eff68..e97822b86e 100644
--- a/osu.Game/Skinning/SkinProvidingContainer.cs
+++ b/osu.Game/Skinning/SkinProvidingContainer.cs
@@ -10,7 +10,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
-using osuTK.Graphics;
 
 namespace osu.Game.Skinning
 {
@@ -73,9 +72,7 @@ namespace osu.Game.Skinning
         {
             if (skin != null)
             {
-                TValue tValueTypeCheck = default;
-
-                if (lookup is GlobalSkinColours || tValueTypeCheck is Color4)
+                if (lookup is GlobalSkinColours || lookup is SkinCustomColourLookup)
                     return lookupWithFallback<TLookup, TValue>(lookup, AllowColourLookup);
                 else
                     return lookupWithFallback<TLookup, TValue>(lookup, AllowConfigurationLookup);

From 0a65ae8f1ef72f883e9f1e324bf3cd622bd321d0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 14:07:24 +0900
Subject: [PATCH 0877/3722] Fix the beatmap carousel playing the difficulty
 change sample on beatmap change

---
 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 40db04ae71..6c0bd3a228 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -500,7 +500,7 @@ namespace osu.Game.Screens.Select
 
                     if (beatmap != null)
                     {
-                        if (beatmap.BeatmapSetInfoID == beatmapNoDebounce?.BeatmapSetInfoID)
+                        if (beatmap.BeatmapSetInfoID == previous?.BeatmapInfo.BeatmapSetInfoID)
                             sampleChangeDifficulty.Play();
                         else
                             sampleChangeBeatmap.Play();

From c6e9a6cd5a3d990b2c72fab3f82148cd65dfb6fe Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 15 Jan 2021 14:28:49 +0900
Subject: [PATCH 0878/3722] Make most common BPM more accurate

---
 osu.Game/Beatmaps/Beatmap.cs                  | 38 +++++++++++++++++++
 osu.Game/Beatmaps/BeatmapManager.cs           |  2 +-
 .../ControlPoints/ControlPointInfo.cs         |  7 ----
 osu.Game/Beatmaps/IBeatmap.cs                 |  5 +++
 osu.Game/Screens/Edit/EditorBeatmap.cs        |  2 +
 osu.Game/Screens/Play/GameplayBeatmap.cs      |  2 +
 osu.Game/Screens/Select/BeatmapInfoWedge.cs   |  2 +-
 7 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Beatmaps/Beatmap.cs b/osu.Game/Beatmaps/Beatmap.cs
index be2006e67a..410fd5e92e 100644
--- a/osu.Game/Beatmaps/Beatmap.cs
+++ b/osu.Game/Beatmaps/Beatmap.cs
@@ -48,6 +48,44 @@ namespace osu.Game.Beatmaps
 
         public virtual IEnumerable<BeatmapStatistic> GetStatistics() => Enumerable.Empty<BeatmapStatistic>();
 
+        public double GetMostCommonBeatLength()
+        {
+            // The last playable time in the beatmap - the last timing point extends to this time.
+            // Note: This is more accurate and may present different results because osu-stable didn't have the ability to calculate slider durations in this context.
+            double lastTime = HitObjects.LastOrDefault()?.GetEndTime() ?? ControlPointInfo.TimingPoints.LastOrDefault()?.Time ?? 0;
+
+            var beatLengthsAndDurations =
+                // Construct a set of (beatLength, duration) tuples for each individual timing point.
+                ControlPointInfo.TimingPoints.Select((t, i) =>
+                                {
+                                    if (t.Time > lastTime)
+                                        return (beatLength: t.BeatLength, 0);
+
+                                    var nextTime = i == ControlPointInfo.TimingPoints.Count - 1 ? lastTime : ControlPointInfo.TimingPoints[i + 1].Time;
+                                    return (beatLength: t.BeatLength, duration: nextTime - t.Time);
+                                })
+                                // Aggregate durations into a set of (beatLength, duration) tuples for each beat length
+                                .GroupBy(t => t.beatLength)
+                                .Select(g => (beatLength: g.Key, duration: g.Sum(t => t.duration)))
+                                // And if there are no timing points, use a default.
+                                .DefaultIfEmpty((TimingControlPoint.DEFAULT_BEAT_LENGTH, 0));
+
+            // Find the single beat length with the maximum aggregate duration.
+            double maxDurationBeatLength = double.NegativeInfinity;
+            double maxDuration = double.NegativeInfinity;
+
+            foreach (var (beatLength, duration) in beatLengthsAndDurations)
+            {
+                if (duration > maxDuration)
+                {
+                    maxDuration = duration;
+                    maxDurationBeatLength = beatLength;
+                }
+            }
+
+            return 60000 / maxDurationBeatLength;
+        }
+
         IBeatmap IBeatmap.Clone() => Clone();
 
         public Beatmap<T> Clone()
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 42418e532b..0d4cc38ac3 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -451,7 +451,7 @@ namespace osu.Game.Beatmaps
                     // TODO: this should be done in a better place once we actually need to dynamically update it.
                     beatmap.BeatmapInfo.StarDifficulty = ruleset?.CreateInstance().CreateDifficultyCalculator(new DummyConversionBeatmap(beatmap)).Calculate().StarRating ?? 0;
                     beatmap.BeatmapInfo.Length = calculateLength(beatmap);
-                    beatmap.BeatmapInfo.BPM = beatmap.ControlPointInfo.BPMMode;
+                    beatmap.BeatmapInfo.BPM = beatmap.GetMostCommonBeatLength();
 
                     beatmapInfos.Add(beatmap.BeatmapInfo);
                 }
diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
index e8a91e4001..5cc60a5758 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
@@ -101,13 +101,6 @@ namespace osu.Game.Beatmaps.ControlPoints
         public double BPMMinimum =>
             60000 / (TimingPoints.OrderByDescending(c => c.BeatLength).FirstOrDefault() ?? TimingControlPoint.DEFAULT).BeatLength;
 
-        /// <summary>
-        /// Finds the mode BPM (most common BPM) represented by the control points.
-        /// </summary>
-        [JsonIgnore]
-        public double BPMMode =>
-            60000 / (TimingPoints.GroupBy(c => c.BeatLength).OrderByDescending(grp => grp.Count()).FirstOrDefault()?.FirstOrDefault() ?? TimingControlPoint.DEFAULT).BeatLength;
-
         /// <summary>
         /// Remove all <see cref="ControlPointGroup"/>s and return to a pristine state.
         /// </summary>
diff --git a/osu.Game/Beatmaps/IBeatmap.cs b/osu.Game/Beatmaps/IBeatmap.cs
index 8f27e0b0e9..aaca8f7658 100644
--- a/osu.Game/Beatmaps/IBeatmap.cs
+++ b/osu.Game/Beatmaps/IBeatmap.cs
@@ -47,6 +47,11 @@ namespace osu.Game.Beatmaps
         /// <returns></returns>
         IEnumerable<BeatmapStatistic> GetStatistics();
 
+        /// <summary>
+        /// Finds the most common beat length represented by the control points in this beatmap.
+        /// </summary>
+        double GetMostCommonBeatLength();
+
         /// <summary>
         /// Creates a shallow-clone of this beatmap and returns it.
         /// </summary>
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 165d2ba278..0e9008ba68 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -84,6 +84,8 @@ namespace osu.Game.Screens.Edit
 
         public IEnumerable<BeatmapStatistic> GetStatistics() => PlayableBeatmap.GetStatistics();
 
+        public double GetMostCommonBeatLength() => PlayableBeatmap.GetMostCommonBeatLength();
+
         public IBeatmap Clone() => (EditorBeatmap)MemberwiseClone();
 
         private IList mutableHitObjects => (IList)PlayableBeatmap.HitObjects;
diff --git a/osu.Game/Screens/Play/GameplayBeatmap.cs b/osu.Game/Screens/Play/GameplayBeatmap.cs
index 64894544f4..53c1360bfa 100644
--- a/osu.Game/Screens/Play/GameplayBeatmap.cs
+++ b/osu.Game/Screens/Play/GameplayBeatmap.cs
@@ -39,6 +39,8 @@ namespace osu.Game.Screens.Play
 
         public IEnumerable<BeatmapStatistic> GetStatistics() => PlayableBeatmap.GetStatistics();
 
+        public double GetMostCommonBeatLength() => PlayableBeatmap.GetMostCommonBeatLength();
+
         public IBeatmap Clone() => PlayableBeatmap.Clone();
 
         private readonly Bindable<JudgementResult> lastJudgementResult = new Bindable<JudgementResult>();
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 04c1f6efe4..abcd697d85 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -391,7 +391,7 @@ namespace osu.Game.Screens.Select
                 if (Precision.AlmostEquals(bpmMin, bpmMax))
                     return $"{bpmMin:0}";
 
-                return $"{bpmMin:0}-{bpmMax:0} (mostly {beatmap.ControlPointInfo.BPMMode:0})";
+                return $"{bpmMin:0}-{bpmMax:0} (mostly {beatmap.GetMostCommonBeatLength():0})";
             }
 
             private OsuSpriteText[] getMapper(BeatmapMetadata metadata)

From 24e991a5ef9c1797e4bebddf1d0a2f623845a40f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 15 Jan 2021 14:32:06 +0900
Subject: [PATCH 0879/3722] Actually return beat length and not BPM

---
 osu.Game/Beatmaps/Beatmap.cs                | 2 +-
 osu.Game/Beatmaps/BeatmapManager.cs         | 2 +-
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Beatmaps/Beatmap.cs b/osu.Game/Beatmaps/Beatmap.cs
index 410fd5e92e..4e2e9eb96d 100644
--- a/osu.Game/Beatmaps/Beatmap.cs
+++ b/osu.Game/Beatmaps/Beatmap.cs
@@ -83,7 +83,7 @@ namespace osu.Game.Beatmaps
                 }
             }
 
-            return 60000 / maxDurationBeatLength;
+            return maxDurationBeatLength;
         }
 
         IBeatmap IBeatmap.Clone() => Clone();
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 0d4cc38ac3..b934ac556d 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -451,7 +451,7 @@ namespace osu.Game.Beatmaps
                     // TODO: this should be done in a better place once we actually need to dynamically update it.
                     beatmap.BeatmapInfo.StarDifficulty = ruleset?.CreateInstance().CreateDifficultyCalculator(new DummyConversionBeatmap(beatmap)).Calculate().StarRating ?? 0;
                     beatmap.BeatmapInfo.Length = calculateLength(beatmap);
-                    beatmap.BeatmapInfo.BPM = beatmap.GetMostCommonBeatLength();
+                    beatmap.BeatmapInfo.BPM = 60000 / beatmap.GetMostCommonBeatLength();
 
                     beatmapInfos.Add(beatmap.BeatmapInfo);
                 }
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index abcd697d85..86cb561bc7 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -391,7 +391,7 @@ namespace osu.Game.Screens.Select
                 if (Precision.AlmostEquals(bpmMin, bpmMax))
                     return $"{bpmMin:0}";
 
-                return $"{bpmMin:0}-{bpmMax:0} (mostly {beatmap.GetMostCommonBeatLength():0})";
+                return $"{bpmMin:0}-{bpmMax:0} (mostly {60000 / beatmap.GetMostCommonBeatLength():0})";
             }
 
             private OsuSpriteText[] getMapper(BeatmapMetadata metadata)

From ebbc32adfa9c4652cadff32dc5c429af9867ff09 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 14:51:26 +0900
Subject: [PATCH 0880/3722] Change conditional used to decide legacy judgement
 animation to match stable

In stable, the type of legacy judgement to show is based on the presence
of particle textures in the skin. We were using the skin version
instead, which turns out to be incorrect and not what some user skins
expect.

Closes #11078.
---
 osu.Game/Skinning/LegacySkin.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index e4e5bf2f75..7397e3d08b 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -378,8 +378,12 @@ namespace osu.Game.Skinning
                     // kind of wasteful that we throw this away, but should do for now.
                     if (createDrawable() != null)
                     {
-                        if (Configuration.LegacyVersion > 1)
-                            return new LegacyJudgementPieceNew(resultComponent.Component, createDrawable, getParticleTexture(resultComponent.Component));
+                        var particle = getParticleTexture(resultComponent.Component);
+
+                        if (particle != null)
+                        {
+                            return new LegacyJudgementPieceNew(resultComponent.Component, createDrawable, particle);
+                        }
                         else
                             return new LegacyJudgementPieceOld(resultComponent.Component, createDrawable);
                     }

From 86f66727de47175b8045523c56f719a8051041a3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 13:29:37 +0900
Subject: [PATCH 0881/3722] Update KeyBinding usages in line with interface
 changes

---
 osu.Game/Database/OsuDbContext.cs                       | 2 ++
 osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs | 2 +-
 osu.Game/Input/Bindings/GlobalActionContainer.cs        | 2 +-
 osu.Game/Input/KeyBindingStore.cs                       | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Database/OsuDbContext.cs b/osu.Game/Database/OsuDbContext.cs
index 2ae07b3cf8..2aae62edea 100644
--- a/osu.Game/Database/OsuDbContext.cs
+++ b/osu.Game/Database/OsuDbContext.cs
@@ -135,6 +135,8 @@ namespace osu.Game.Database
 
             modelBuilder.Entity<DatabasedKeyBinding>().HasIndex(b => new { b.RulesetID, b.Variant });
             modelBuilder.Entity<DatabasedKeyBinding>().HasIndex(b => b.IntAction);
+            modelBuilder.Entity<DatabasedKeyBinding>().Ignore(b => b.KeyCombination);
+            modelBuilder.Entity<DatabasedKeyBinding>().Ignore(b => b.Action);
 
             modelBuilder.Entity<DatabasedSetting>().HasIndex(b => new { b.RulesetID, b.Variant });
 
diff --git a/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs b/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
index 94edc33099..d12eaa10f6 100644
--- a/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
+++ b/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Input.Bindings
 
         private KeyBindingStore store;
 
-        public override IEnumerable<KeyBinding> DefaultKeyBindings => ruleset.CreateInstance().GetDefaultKeyBindings(variant ?? 0);
+        public override IEnumerable<IKeyBinding> DefaultKeyBindings => ruleset.CreateInstance().GetDefaultKeyBindings(variant ?? 0);
 
         /// <summary>
         /// Create a new instance.
diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index b8c2fa201f..8ccdb9249e 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Input.Bindings
                 handler = game;
         }
 
-        public override IEnumerable<KeyBinding> DefaultKeyBindings => GlobalKeyBindings.Concat(InGameKeyBindings).Concat(AudioControlKeyBindings).Concat(EditorKeyBindings);
+        public override IEnumerable<IKeyBinding> DefaultKeyBindings => GlobalKeyBindings.Concat(InGameKeyBindings).Concat(AudioControlKeyBindings).Concat(EditorKeyBindings);
 
         public IEnumerable<KeyBinding> GlobalKeyBindings => new[]
         {
diff --git a/osu.Game/Input/KeyBindingStore.cs b/osu.Game/Input/KeyBindingStore.cs
index bc73d74d74..b25b00eb84 100644
--- a/osu.Game/Input/KeyBindingStore.cs
+++ b/osu.Game/Input/KeyBindingStore.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Input
             }
         }
 
-        private void insertDefaults(IEnumerable<KeyBinding> defaults, int? rulesetId = null, int? variant = null)
+        private void insertDefaults(IEnumerable<IKeyBinding> defaults, int? rulesetId = null, int? variant = null)
         {
             using (var usage = ContextFactory.GetForWrite())
             {

From 51255033e24c2afbbac85573ef5e7edf610eb920 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 13:41:35 +0900
Subject: [PATCH 0882/3722] Update some missed usages of KeyBindingContainer in
 tests

---
 osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs    | 2 +-
 osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecording.cs   | 2 +-
 osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
index b2ad7ca5b4..802dbf2021 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
@@ -244,7 +244,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             internal class TestKeyBindingContainer : KeyBindingContainer<TestAction>
             {
-                public override IEnumerable<KeyBinding> DefaultKeyBindings => new[]
+                public override IEnumerable<IKeyBinding> DefaultKeyBindings => new[]
                 {
                     new KeyBinding(InputKey.MouseLeft, TestAction.Down),
                 };
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecording.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecording.cs
index 40c4214749..6e338b7202 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecording.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecording.cs
@@ -179,7 +179,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         internal class TestKeyBindingContainer : KeyBindingContainer<TestAction>
         {
-            public override IEnumerable<KeyBinding> DefaultKeyBindings => new[]
+            public override IEnumerable<IKeyBinding> DefaultKeyBindings => new[]
             {
                 new KeyBinding(InputKey.MouseLeft, TestAction.Down),
             };
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
index b9ff95cb29..8278ff9adf 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
@@ -303,7 +303,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             internal class TestKeyBindingContainer : KeyBindingContainer<TestAction>
             {
-                public override IEnumerable<KeyBinding> DefaultKeyBindings => new[]
+                public override IEnumerable<IKeyBinding> DefaultKeyBindings => new[]
                 {
                     new KeyBinding(InputKey.MouseLeft, TestAction.Down),
                 };

From f42a6270bbd750e2539ddad3ff97c0adb29ee521 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 14:53:55 +0900
Subject: [PATCH 0883/3722] Update framework (again) for native libs fix

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 919d83f8db..db5c933c41 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.115.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.115.1" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index ac014f2964..5e9e90c78f 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -28,7 +28,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.115.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.115.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
     <PackageReference Include="Sentry" Version="2.1.8" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 799042626b..225cf981f2 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.115.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.115.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -88,7 +88,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.115.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.115.1" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From e0a4a666c8e5fa8224fae065d3597b49fa747103 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 15:01:16 +0900
Subject: [PATCH 0884/3722] Remove unnecessary workaround (mentioned package is
 pinned by SignalR to a working version)

---
 osu.Game/osu.Game.csproj | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 5e9e90c78f..301ee39a61 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -18,8 +18,6 @@
     </None>
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <!-- WorkaroundWorkaround for a System.IO.FileNotFoundException on startup. Required because of old EF Core version. -->
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
     <PackageReference Include="Dapper" Version="2.0.78" />
     <PackageReference Include="DiffPlex" Version="1.6.3" />
     <PackageReference Include="Humanizer" Version="2.8.26" />

From 7c612ec5561225b2a618bf11915aa693e20e7cf6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 15:11:03 +0900
Subject: [PATCH 0885/3722] Remove global.json

---
 global.json | 10 ----------
 osu.sln     |  1 -
 2 files changed, 11 deletions(-)
 delete mode 100644 global.json

diff --git a/global.json b/global.json
deleted file mode 100644
index f5aaffcd3d..0000000000
--- a/global.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "sdk": {
-    "allowPrerelease": false,
-    "rollForward": "minor",
-    "version": "5.0.100"
-  },
-  "msbuild-sdks": {
-    "Microsoft.Build.Traversal": "3.0.2"
-  }
-}
\ No newline at end of file
diff --git a/osu.sln b/osu.sln
index 1d64f6ff10..c9453359b1 100644
--- a/osu.sln
+++ b/osu.sln
@@ -57,7 +57,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		Directory.Build.props = Directory.Build.props
-		global.json = global.json
 		osu.Android.props = osu.Android.props
 		osu.iOS.props = osu.iOS.props
 		CodeAnalysis\osu.ruleset = CodeAnalysis\osu.ruleset

From 3f8834030416aeb80f5746a37999a83c16064d86 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 15:17:38 +0900
Subject: [PATCH 0886/3722] Restore previous exception handling flow for stable
 path lookup

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

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index 55e42b160e..d1515acafa 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -59,10 +59,14 @@ namespace osu.Desktop
 
             if (OperatingSystem.IsWindows())
             {
-                stableInstallPath = getStableInstallPathFromRegistry();
+                try
+                {
+                    stableInstallPath = getStableInstallPathFromRegistry();
 
-                if (checkExists(stableInstallPath))
-                    return stableInstallPath;
+                    if (!string.IsNullOrEmpty(stableInstallPath) && checkExists(stableInstallPath))
+                        return stableInstallPath;
+                }
+                catch { }
             }
 
             stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"osu!");

From d023ad8ad1a03b500f13b90ca5d1d24a75e182ea Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 15:18:29 +0900
Subject: [PATCH 0887/3722] Remove assert messages

---
 osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
index 8278ff9adf..35b3bfc1f8 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 switch (args.Action)
                 {
                     case NotifyCollectionChangedAction.Add:
-                        Debug.Assert(args.NewItems != null, "args.NewItems != null");
+                        Debug.Assert(args.NewItems != null);
 
                         foreach (int user in args.NewItems)
                         {
@@ -86,7 +86,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                         break;
 
                     case NotifyCollectionChangedAction.Remove:
-                        Debug.Assert(args.OldItems != null, "args.OldItems != null");
+                        Debug.Assert(args.OldItems != null);
 
                         foreach (int user in args.OldItems)
                         {

From b8c85ef017184b8672adb80401375bd3c8c8e224 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 Jan 2021 16:03:12 +0900
Subject: [PATCH 0888/3722] Revert polling changes to fix participant list
 display

It turns out this polling was necessary to get extra data that isn't
included in the main listing request. It was removed deemed useless, and
in order to fix the order of rooms changing when selecting a room.
Weirdly, I can't reproduce this happening any more, and on close
inspection of the code can't see how it could happen in the first place.

For now, let's revert this change and iterate from there, if/when the
same issue arises again.

I've discussed avoiding this second poll by potentially including more
data (just `user_id`s?) in the main listing request, but not 100% sure
on this - even if the returned data is minimal it's an extra join
server-side, which could cause performance issues for large numbers of
rooms.
---
 .../TestSceneMultiplayerRoomManager.cs        |  1 +
 .../OnlinePlay/Multiplayer/Multiplayer.cs     |  5 +++-
 .../Multiplayer/MultiplayerRoomManager.cs     | 28 ++++++++++++++++++-
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
index 80d1acd145..7a3845cbf3 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
@@ -143,6 +143,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 RoomManager =
                 {
                     TimeBetweenListingPolls = { Value = 1 },
+                    TimeBetweenSelectionPolls = { Value = 1 }
                 }
             };
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
index 310617a0bc..76f5c74433 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
@@ -33,6 +33,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             if (!this.IsCurrentScreen())
             {
                 multiplayerRoomManager.TimeBetweenListingPolls.Value = 0;
+                multiplayerRoomManager.TimeBetweenSelectionPolls.Value = 0;
             }
             else
             {
@@ -40,16 +41,18 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 {
                     case LoungeSubScreen _:
                         multiplayerRoomManager.TimeBetweenListingPolls.Value = isIdle ? 120000 : 15000;
+                        multiplayerRoomManager.TimeBetweenSelectionPolls.Value = isIdle ? 120000 : 15000;
                         break;
 
                     // Don't poll inside the match or anywhere else.
                     default:
                         multiplayerRoomManager.TimeBetweenListingPolls.Value = 0;
+                        multiplayerRoomManager.TimeBetweenSelectionPolls.Value = 0;
                         break;
                 }
             }
 
-            Logger.Log($"Polling adjusted (listing: {multiplayerRoomManager.TimeBetweenListingPolls.Value})");
+            Logger.Log($"Polling adjusted (listing: {multiplayerRoomManager.TimeBetweenListingPolls.Value}, selection: {multiplayerRoomManager.TimeBetweenSelectionPolls.Value})");
         }
 
         protected override Room CreateNewRoom()
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
index 5c327266a3..3cb263298f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         private StatefulMultiplayerClient multiplayerClient { get; set; }
 
         public readonly Bindable<double> TimeBetweenListingPolls = new Bindable<double>();
-
+        public readonly Bindable<double> TimeBetweenSelectionPolls = new Bindable<double>();
         private readonly IBindable<bool> isConnected = new Bindable<bool>();
         private readonly Bindable<bool> allowPolling = new Bindable<bool>();
 
@@ -119,6 +119,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 TimeBetweenPolls = { BindTarget = TimeBetweenListingPolls },
                 AllowPolling = { BindTarget = allowPolling }
             },
+            new MultiplayerSelectionPollingComponent
+            {
+                TimeBetweenPolls = { BindTarget = TimeBetweenSelectionPolls },
+                AllowPolling = { BindTarget = allowPolling }
+            }
         };
 
         private class MultiplayerListingPollingComponent : ListingPollingComponent
@@ -141,5 +146,26 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             protected override Task Poll() => !AllowPolling.Value ? Task.CompletedTask : base.Poll();
         }
+
+        private class MultiplayerSelectionPollingComponent : SelectionPollingComponent
+        {
+            public readonly IBindable<bool> AllowPolling = new Bindable<bool>();
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                AllowPolling.BindValueChanged(allowPolling =>
+                {
+                    if (!allowPolling.NewValue)
+                        return;
+
+                    if (IsLoaded)
+                        PollImmediately();
+                });
+            }
+
+            protected override Task Poll() => !AllowPolling.Value ? Task.CompletedTask : base.Poll();
+        }
     }
 }

From ede5abdba4eb0f88806c38790c7a622546f70af9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 Jan 2021 18:05:29 +0900
Subject: [PATCH 0889/3722] Fix unstable multiplayer room ordering when
 selection is made

---
 .../OnlinePlay/Components/SelectionPollingComponent.cs       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs b/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs
index 0eec155060..dcf3c94b76 100644
--- a/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.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 System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -47,9 +48,11 @@ namespace osu.Game.Screens.OnlinePlay.Components
 
             pollReq.Success += result =>
             {
-                var rooms = new List<Room>(roomManager.Rooms);
+                // existing rooms need to be ordered by their position because the received of NotifyRoomsReceives expects to be able to sort them based on this order.
+                var rooms = new List<Room>(roomManager.Rooms.OrderBy(r => r.Position.Value));
 
                 int index = rooms.FindIndex(r => r.RoomID.Value == result.RoomID.Value);
+
                 if (index < 0)
                     return;
 

From 2b578e97e532fc0bb215566b8bd34df25d1d4625 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 14 Jan 2021 18:25:32 +0900
Subject: [PATCH 0890/3722] Fix deadlock scenario when calculating fallback
 difficulty

The previous code would run a calcaulation for the beatmap's own ruleset
if the current one failed. While this does make sense, with the current
way we use this component (and the implementation flow) it is quite unsafe.

The to the call on `.Result` in the `catch` block, this would 100%
deadlock due to the thread concurrency of the `ThreadedTaskScheduler`
being 1. Even if the nested run could be run inline (it should be), the
task scheduler won't even get to the point of checking whether this is
feasible due to it being saturated by the already running task.

I'm not sure if we still need this fallback lookup logic. After removing
it, it's feasible that 0 stars will be returned during the scenario that
previously caused a deadlock, but I don't necessarily think this is
incorrect. There may be another reason for this needing to exist which
I'm not aware of (diffcalc?) but if that's the case we may want to move
the try-catch handling to the point of usage.

To reproduce the deadlock scenario with 100% success (the repro
instructions in the linked issue aren't that simple and require some
patience and good timing), the main portion of the lookup can be changed
to randomly trigger a nested lookup:

```
if (RNG.NextSingle() > 0.5f)
    return GetAsync(new
DifficultyCacheLookup(key.Beatmap, key.Beatmap.Ruleset,
key.OrderedMods)).Result;
else
    return new StarDifficulty(attributes);
```

After switching beatmap once or twice, pausing debug and viewing the
state of threads should show exactly what is going on.
---
 osu.Game/Beatmaps/BeatmapDifficultyCache.cs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
index 3b58062add..37d262abe5 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
@@ -260,17 +260,10 @@ namespace osu.Game.Beatmaps
             }
             catch (BeatmapInvalidForRulesetException e)
             {
-                // Conversion has failed for the given ruleset, so return the difficulty in the beatmap's default ruleset.
-
-                // Ensure the beatmap's default ruleset isn't the one already being converted to.
-                // This shouldn't happen as it means something went seriously wrong, but if it does an endless loop should be avoided.
                 if (rulesetInfo.Equals(beatmapInfo.Ruleset))
-                {
                     Logger.Error(e, $"Failed to convert {beatmapInfo.OnlineBeatmapID} to the beatmap's default ruleset ({beatmapInfo.Ruleset}).");
-                    return new StarDifficulty();
-                }
 
-                return GetAsync(new DifficultyCacheLookup(key.Beatmap, key.Beatmap.Ruleset, key.OrderedMods)).Result;
+                return new StarDifficulty();
             }
             catch
             {

From ed78be825f9a988df3920fdbda730120bebfe125 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 15:47:41 +0900
Subject: [PATCH 0891/3722] Fix editor timeline not snapping on non-precise
 wheel scroll

For wheel input with precision, we still prefer exact tracking for now.
May change this in the future based on feedback from mappers, but it
makes little sense to do non-snapped scrolling when input is coming from
a non-precise source.
---
 .../Screens/Edit/Compose/Components/Timeline/Timeline.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 20836c0e68..12f7625bf9 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -138,6 +138,15 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 scrollToTrackTime();
         }
 
+        protected override bool OnScroll(ScrollEvent e)
+        {
+            // if this is not a precision scroll event, let the editor handle the seek itself (for snapping support)
+            if (!e.AltPressed && !e.IsPrecise)
+                return false;
+
+            return base.OnScroll(e);
+        }
+
         protected override void UpdateAfterChildren()
         {
             base.UpdateAfterChildren();

From 04fa32bc34852ba79a249529f627b9a6f8aa6dd5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 16:14:21 +0900
Subject: [PATCH 0892/3722] Rename and add xmldoc for smooth seeking method

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   |  2 +-
 .../Timelines/Summary/Parts/MarkerPart.cs     |  2 +-
 .../Compose/Components/BlueprintContainer.cs  |  2 +-
 osu.Game/Screens/Edit/EditorClock.cs          | 33 +++++++++++--------
 .../Screens/Edit/Timing/ControlPointTable.cs  |  2 +-
 5 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 35852f60ea..e927951d0a 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -332,7 +332,7 @@ namespace osu.Game.Rulesets.Edit
                 EditorBeatmap.Add(hitObject);
 
                 if (EditorClock.CurrentTime < hitObject.StartTime)
-                    EditorClock.SeekTo(hitObject.StartTime);
+                    EditorClock.SeekSmoothlyTo(hitObject.StartTime);
             }
         }
 
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 9e9ac93d23..5a2214509c 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
                     return;
 
                 float markerPos = Math.Clamp(ToLocalSpace(screenPosition).X, 0, DrawWidth);
-                editorClock.SeekTo(markerPos / DrawWidth * editorClock.TrackLength);
+                editorClock.SeekSmoothlyTo(markerPos / DrawWidth * editorClock.TrackLength);
             });
         }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 0b45bd5597..5371beac60 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -170,7 +170,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (clickedBlueprint == null || SelectionHandler.SelectedBlueprints.FirstOrDefault(b => b.IsHovered) != clickedBlueprint)
                 return false;
 
-            EditorClock?.SeekTo(clickedBlueprint.HitObject.StartTime);
+            EditorClock?.SeekSmoothlyTo(clickedBlueprint.HitObject.StartTime);
             return true;
         }
 
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index 148eef6c93..c651d6a7c4 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Screens.Edit
 
             if (!snapped || ControlPointInfo.TimingPoints.Count == 0)
             {
-                SeekTo(seekTime);
+                SeekSmoothlyTo(seekTime);
                 return;
             }
 
@@ -145,11 +145,11 @@ namespace osu.Game.Screens.Edit
 
             // Ensure the sought point is within the boundaries
             seekTime = Math.Clamp(seekTime, 0, TrackLength);
-            SeekTo(seekTime);
+            SeekSmoothlyTo(seekTime);
         }
 
         /// <summary>
-        /// The current time of this clock, include any active transform seeks performed via <see cref="SeekTo"/>.
+        /// The current time of this clock, include any active transform seeks performed via <see cref="SeekSmoothlyTo"/>.
         /// </summary>
         public double CurrentTimeAccurate =>
             Transforms.OfType<TransformSeek>().FirstOrDefault()?.EndValue ?? CurrentTime;
@@ -182,6 +182,23 @@ namespace osu.Game.Screens.Edit
             return underlyingClock.Seek(position);
         }
 
+        /// <summary>
+        /// Seek smoothly to the provided destination.
+        /// Use <see cref="Seek"/> to perform an immediate seek.
+        /// </summary>
+        /// <param name="seekDestination"></param>
+        public void SeekSmoothlyTo(double seekDestination)
+        {
+            seekingOrStopped.Value = true;
+
+            if (IsRunning)
+                Seek(seekDestination);
+            else
+            {
+                transformSeekTo(seekDestination, transform_time, Easing.OutQuint);
+            }
+        }
+
         public void ResetSpeedAdjustments() => underlyingClock.ResetSpeedAdjustments();
 
         double IAdjustableClock.Rate
@@ -243,16 +260,6 @@ namespace osu.Game.Screens.Edit
             }
         }
 
-        public void SeekTo(double seekDestination)
-        {
-            seekingOrStopped.Value = true;
-
-            if (IsRunning)
-                Seek(seekDestination);
-            else
-                transformSeekTo(seekDestination, transform_time, Easing.OutQuint);
-        }
-
         private void transformSeekTo(double seek, double duration = 0, Easing easing = Easing.None)
             => this.TransformTo(this.PopulateTransform(new TransformSeek(), seek, duration, easing));
 
diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index 89d3c36250..e4b9150df1 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -206,7 +206,7 @@ namespace osu.Game.Screens.Edit.Timing
                 Action = () =>
                 {
                     selectedGroup.Value = controlGroup;
-                    clock.SeekTo(controlGroup.Time);
+                    clock.SeekSmoothlyTo(controlGroup.Time);
                 };
             }
 

From 831c06a3c7c02549fe9bab75ff83afaaf30fa1ec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 16:14:38 +0900
Subject: [PATCH 0893/3722] Expose and consume boolean covering whether an
 ongoing smooth seek is running

---
 .../Edit/Compose/Components/Timeline/Timeline.cs      | 10 ++++++----
 osu.Game/Screens/Edit/EditorClock.cs                  | 11 +++++++++--
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 20836c0e68..7df4f1ae7d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -146,12 +146,14 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 seekTrackToCurrent();
             else if (!editorClock.IsRunning)
             {
-                // The track isn't running. There are two cases we have to be wary of:
-                // 1) The user flick-drags on this timeline: We want the track to follow us
-                // 2) The user changes the track time through some other means (scrolling in the editor or overview timeline): We want to follow the track time
+                // The track isn't running. There are three cases we have to be wary of:
+                // 1) The user flick-drags on this timeline and we are applying an interpolated seek on the clock, until interrupted by 2 or 3.
+                // 2) The user changes the track time through some other means (scrolling in the editor or overview timeline; clicking a hitobject etc.). We want the timeline to track the clock's time.
+                // 3) An ongoing seek transform is running from an external seek. We want the timeline to track the clock's time.
 
                 // The simplest way to cover both cases is by checking whether the scroll position has changed and the audio hasn't been changed externally
-                if (Current != lastScrollPosition && editorClock.CurrentTime == lastTrackTime)
+                // Checking IsSeeking covers the third case, where the transform may not have been applied yet.
+                if (Current != lastScrollPosition && editorClock.CurrentTime == lastTrackTime && !editorClock.IsSeeking)
                     seekTrackToCurrent();
                 else
                     scrollToTrackTime();
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index c651d6a7c4..ec0f5d7154 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -35,6 +35,11 @@ namespace osu.Game.Screens.Edit
 
         private readonly Bindable<bool> seekingOrStopped = new Bindable<bool>(true);
 
+        /// <summary>
+        /// Whether a seek is currently in progress. True for the duration of a seek performed via <see cref="SeekSmoothlyTo"/>.
+        /// </summary>
+        public bool IsSeeking { get; private set; }
+
         public EditorClock(WorkingBeatmap beatmap, BindableBeatDivisor beatDivisor)
             : this(beatmap.Beatmap.ControlPointInfo, beatmap.Track.Length, beatDivisor)
         {
@@ -176,7 +181,7 @@ namespace osu.Game.Screens.Edit
 
         public bool Seek(double position)
         {
-            seekingOrStopped.Value = true;
+            seekingOrStopped.Value = IsSeeking = true;
 
             ClearTransforms();
             return underlyingClock.Seek(position);
@@ -246,6 +251,8 @@ namespace osu.Game.Screens.Edit
         {
             if (seekingOrStopped.Value)
             {
+                IsSeeking &= Transforms.Any();
+
                 if (track.Value?.IsRunning != true)
                 {
                     // seeking in the editor can happen while the track isn't running.
@@ -256,7 +263,7 @@ namespace osu.Game.Screens.Edit
                 // we are either running a seek tween or doing an immediate seek.
                 // in the case of an immediate seek the seeking bool will be set to false after one update.
                 // this allows for silencing hit sounds and the likes.
-                seekingOrStopped.Value = Transforms.Any();
+                seekingOrStopped.Value = IsSeeking;
             }
         }
 

From b5e784ed427a47c93eae96a2a459b6a4b9dc224c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 16:34:28 +0900
Subject: [PATCH 0894/3722] Fix possibility of crash when selecting a random
 skin during skin import

---
 osu.Game/Overlays/Settings/Sections/SkinSection.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 5898482e4a..123cecb0cd 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Overlays.Settings.Sections
             if (skinDropdown.Items.All(s => s.ID != configBindable.Value))
                 configBindable.Value = 0;
 
-            configBindable.BindValueChanged(id => dropdownBindable.Value = skinDropdown.Items.Single(s => s.ID == id.NewValue), true);
+            configBindable.BindValueChanged(id => Scheduler.AddOnce(updateSelectedSkinFromConfig), true);
             dropdownBindable.BindValueChanged(skin =>
             {
                 if (skin.NewValue == random_skin_info)
@@ -104,6 +104,8 @@ namespace osu.Game.Overlays.Settings.Sections
             });
         }
 
+        private void updateSelectedSkinFromConfig() => dropdownBindable.Value = skinDropdown.Items.Single(s => s.ID == configBindable.Value);
+
         private void updateItems()
         {
             skinItems = skins.GetAllUsableSkins();

From 88a27124c095f5a3cff7eaddaaab92cfe1832d55 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 17:13:27 +0900
Subject: [PATCH 0895/3722] Make long spinner test longer and fix step name

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
index 496b1b3559..c22b1dc407 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [TestCase(true)]
         public void TestLongSpinner(bool autoplay)
         {
-            AddStep("Very short spinner", () => SetContents(() => testSingle(5, autoplay, 2000)));
+            AddStep("Very long spinner", () => SetContents(() => testSingle(5, autoplay, 4000)));
             AddUntilStep("Wait for completion", () => drawableSpinner.Result.HasResult);
             AddUntilStep("Check correct progress", () => drawableSpinner.Progress == (autoplay ? 1 : 0));
         }

From 6adb6b6700b4b19336955b397d5939679919d70b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 17:13:52 +0900
Subject: [PATCH 0896/3722] Fix spinner tests not playing spinning sound due to
 empty hitsamples

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
index c22b1dc407..f697a77d94 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.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 System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
+using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Mods;
@@ -55,7 +57,11 @@ namespace osu.Game.Rulesets.Osu.Tests
             var spinner = new Spinner
             {
                 StartTime = Time.Current + delay,
-                EndTime = Time.Current + delay + length
+                EndTime = Time.Current + delay + length,
+                Samples = new List<HitSampleInfo>
+                {
+                    new HitSampleInfo("hitnormal")
+                }
             };
 
             spinner.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { CircleSize = circleSize });

From 8a6857f151373dc2bb6edeb5239efef9932e447f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 17:16:12 +0900
Subject: [PATCH 0897/3722] Add support for playing a SkinnableSample without
 restarting it

---
 osu.Game/Skinning/PausableSkinnableSound.cs | 4 ++--
 osu.Game/Skinning/SkinnableSound.cs         | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Skinning/PausableSkinnableSound.cs b/osu.Game/Skinning/PausableSkinnableSound.cs
index 4b6099e85f..cb5234c847 100644
--- a/osu.Game/Skinning/PausableSkinnableSound.cs
+++ b/osu.Game/Skinning/PausableSkinnableSound.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Skinning
             }
         }
 
-        public override void Play()
+        public override void Play(bool restart = true)
         {
             cancelPendingStart();
             RequestedPlaying = true;
@@ -75,7 +75,7 @@ namespace osu.Game.Skinning
             if (samplePlaybackDisabled.Value)
                 return;
 
-            base.Play();
+            base.Play(restart);
         }
 
         public override void Stop()
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index 645c08cd00..b841f99598 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -119,12 +119,13 @@ namespace osu.Game.Skinning
         /// <summary>
         /// Plays the samples.
         /// </summary>
-        public virtual void Play()
+        /// <param name="restart">Whether to play the sample from the beginning.</param>
+        public virtual void Play(bool restart = true)
         {
             samplesContainer.ForEach(c =>
             {
                 if (PlayWhenZeroVolume || c.AggregateVolume.Value > 0)
-                    c.Play();
+                    c.Play(restart);
             });
         }
 

From 767c76921faa69b9f648e14fec3ab95f466abce1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 17:17:10 +0900
Subject: [PATCH 0898/3722] Adjust transition time of spinner sound

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

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 1f3bcece0c..4f61ab4a9a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -131,11 +131,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (tracking.NewValue)
             {
                 spinningSample?.Play();
-                spinningSample?.VolumeTo(1, 200);
+                spinningSample?.VolumeTo(1, 300);
             }
             else
             {
-                spinningSample?.VolumeTo(0, 200).Finally(_ => spinningSample.Stop());
+                spinningSample?.VolumeTo(0, 300).Finally(_ => spinningSample.Stop());
             }
         }
 

From 311f8b70178cb5ebf0fdc23824fdae53b8336a7f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 17:17:51 +0900
Subject: [PATCH 0899/3722] Only restart spinning sample if it was not already
 playing

---
 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 4f61ab4a9a..c5ae195274 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -130,7 +130,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             if (tracking.NewValue)
             {
-                spinningSample?.Play();
+                spinningSample?.Play(!spinningSample.IsPlaying);
                 spinningSample?.VolumeTo(1, 300);
             }
             else

From 14b33236828438a72b5c6b4acc4edbba9e26d985 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 17:18:15 +0900
Subject: [PATCH 0900/3722] Use OnComplete instead of Finally to avoid
 potentially stopping on aborted transforms

---
 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 c5ae195274..56aedebed3 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -135,7 +135,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
             else
             {
-                spinningSample?.VolumeTo(0, 300).Finally(_ => spinningSample.Stop());
+                spinningSample?.VolumeTo(0, 300).OnComplete(_ => spinningSample.Stop());
             }
         }
 

From d6e6b4bbeea9ec532b7d927fa3d38c7e1efbf49f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 15 Jan 2021 17:34:01 +0900
Subject: [PATCH 0901/3722] Revert forced cloning of ControlPointInfo

This reverts commit 3c3e860dbc34d37855b79786a1abb754af1667e8.

Closes https://github.com/ppy/osu/issues/11491.
---
 osu.Game/Beatmaps/Beatmap.cs             | 10 +---------
 osu.Game/Beatmaps/IBeatmap.cs            |  2 +-
 osu.Game/Beatmaps/WorkingBeatmap.cs      |  2 ++
 osu.Game/Screens/Edit/EditorBeatmap.cs   |  6 +++++-
 osu.Game/Screens/Play/GameplayBeatmap.cs |  6 +++++-
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Beatmaps/Beatmap.cs b/osu.Game/Beatmaps/Beatmap.cs
index be2006e67a..5435e86dfd 100644
--- a/osu.Game/Beatmaps/Beatmap.cs
+++ b/osu.Game/Beatmaps/Beatmap.cs
@@ -50,15 +50,7 @@ namespace osu.Game.Beatmaps
 
         IBeatmap IBeatmap.Clone() => Clone();
 
-        public Beatmap<T> Clone()
-        {
-            var clone = (Beatmap<T>)MemberwiseClone();
-
-            clone.ControlPointInfo = ControlPointInfo.CreateCopy();
-            // todo: deep clone other elements as required.
-
-            return clone;
-        }
+        public Beatmap<T> Clone() => (Beatmap<T>)MemberwiseClone();
     }
 
     public class Beatmap : Beatmap<HitObject>
diff --git a/osu.Game/Beatmaps/IBeatmap.cs b/osu.Game/Beatmaps/IBeatmap.cs
index 8f27e0b0e9..7dd85e1232 100644
--- a/osu.Game/Beatmaps/IBeatmap.cs
+++ b/osu.Game/Beatmaps/IBeatmap.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Beatmaps
         /// <summary>
         /// The control points in this beatmap.
         /// </summary>
-        ControlPointInfo ControlPointInfo { get; }
+        ControlPointInfo ControlPointInfo { get; set; }
 
         /// <summary>
         /// The breaks in this beatmap.
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 30382c444f..d25adca92b 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -111,6 +111,8 @@ namespace osu.Game.Beatmaps
                 // Convert
                 IBeatmap converted = converter.Convert(cancellationSource.Token);
 
+                converted.ControlPointInfo = converted.ControlPointInfo.CreateCopy();
+
                 // Apply conversion mods to the result
                 foreach (var mod in mods.OfType<IApplicableAfterBeatmapConversion>())
                 {
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 165d2ba278..a54a95f59d 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -74,7 +74,11 @@ namespace osu.Game.Screens.Edit
 
         public BeatmapMetadata Metadata => PlayableBeatmap.Metadata;
 
-        public ControlPointInfo ControlPointInfo => PlayableBeatmap.ControlPointInfo;
+        public ControlPointInfo ControlPointInfo
+        {
+            get => PlayableBeatmap.ControlPointInfo;
+            set => PlayableBeatmap.ControlPointInfo = value;
+        }
 
         public List<BreakPeriod> Breaks => PlayableBeatmap.Breaks;
 
diff --git a/osu.Game/Screens/Play/GameplayBeatmap.cs b/osu.Game/Screens/Play/GameplayBeatmap.cs
index 64894544f4..565595656f 100644
--- a/osu.Game/Screens/Play/GameplayBeatmap.cs
+++ b/osu.Game/Screens/Play/GameplayBeatmap.cs
@@ -29,7 +29,11 @@ namespace osu.Game.Screens.Play
 
         public BeatmapMetadata Metadata => PlayableBeatmap.Metadata;
 
-        public ControlPointInfo ControlPointInfo => PlayableBeatmap.ControlPointInfo;
+        public ControlPointInfo ControlPointInfo
+        {
+            get => PlayableBeatmap.ControlPointInfo;
+            set => PlayableBeatmap.ControlPointInfo = value;
+        }
 
         public List<BreakPeriod> Breaks => PlayableBeatmap.Breaks;
 

From 3c1a86d11deefc694a00ebad3369c563a07168de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 15 Jan 2021 22:04:45 +0100
Subject: [PATCH 0902/3722] Trim braces for consistency

---
 osu.Game/Skinning/LegacySkin.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 7397e3d08b..090ffaebd7 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -381,9 +381,7 @@ namespace osu.Game.Skinning
                         var particle = getParticleTexture(resultComponent.Component);
 
                         if (particle != null)
-                        {
                             return new LegacyJudgementPieceNew(resultComponent.Component, createDrawable, particle);
-                        }
                         else
                             return new LegacyJudgementPieceOld(resultComponent.Component, createDrawable);
                     }

From 112967c1e8d0fd75c24aed6276afd95140687e79 Mon Sep 17 00:00:00 2001
From: Mysfit <jdawg678@gmail.com>
Date: Fri, 15 Jan 2021 23:46:46 -0500
Subject: [PATCH 0903/3722] Created base class for testing beatmap colours.

---
 .../TestSceneLegacyBeatmapSkin.cs             | 191 +++++-------------
 .../TestSceneLegacyBeatmapSkin.cs             | 178 +++++-----------
 .../Beatmaps/LegacyBeatmapSkinColourTest.cs   | 147 ++++++++++++++
 3 files changed, 245 insertions(+), 271 deletions(-)
 create mode 100644 osu.Game/Tests/Beatmaps/LegacyBeatmapSkinColourTest.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneLegacyBeatmapSkin.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneLegacyBeatmapSkin.cs
index 12ceaaa6fa..89298242e5 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneLegacyBeatmapSkin.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneLegacyBeatmapSkin.cs
@@ -2,13 +2,10 @@
 // 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.Allocation;
 using osu.Framework.Audio;
-using osu.Framework.Bindables;
-using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
@@ -17,179 +14,114 @@ using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Skinning;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Screens.Play;
 using osu.Game.Skinning;
-using osu.Game.Tests.Visual;
+using osu.Game.Tests.Beatmaps;
 using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
-    public class TestSceneLegacyBeatmapSkin : ScreenTestScene
+    public class TestSceneLegacyBeatmapSkin : LegacyBeatmapSkinColourTest
     {
         [Resolved]
         private AudioManager audio { get; set; }
 
-        private readonly Bindable<bool> beatmapSkins = new Bindable<bool>();
-        private readonly Bindable<bool> beatmapColours = new Bindable<bool>();
-
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
-            config.BindWith(OsuSetting.BeatmapSkins, beatmapSkins);
-            config.BindWith(OsuSetting.BeatmapColours, beatmapColours);
+            config.BindWith(OsuSetting.BeatmapSkins, BeatmapSkins);
+            config.BindWith(OsuSetting.BeatmapColours, BeatmapColours);
         }
 
         [TestCase(true, true)]
         [TestCase(true, false)]
         [TestCase(false, true)]
         [TestCase(false, false)]
-        public void TestBeatmapComboColours(bool userHasCustomColours, bool useBeatmapSkin)
+        public override void TestBeatmapComboColours(bool userHasCustomColours, bool useBeatmapSkin)
         {
-            ExposedPlayer player = null;
-
-            configureSettings(useBeatmapSkin, true);
-            AddStep("load coloured beatmap", () => player = loadBeatmap(userHasCustomColours, true));
-            AddUntilStep("wait for player", () => player.IsLoaded);
-
-            AddAssert("is beatmap skin colours", () => player.UsableComboColours.SequenceEqual(TestBeatmapSkin.Colours));
+            TestBeatmap = new CatchCustomSkinWorkingBeatmap(audio, true);
+            base.TestBeatmapComboColours(userHasCustomColours, useBeatmapSkin);
+            AddAssert("is beatmap skin colours", () => TestPlayer.UsableComboColours.SequenceEqual(TestBeatmapSkin.Colours));
         }
 
         [TestCase(true)]
         [TestCase(false)]
-        public void TestBeatmapComboColoursOverride(bool useBeatmapSkin)
+        public override void TestBeatmapComboColoursOverride(bool useBeatmapSkin)
         {
-            ExposedPlayer player = null;
-
-            configureSettings(useBeatmapSkin, false);
-            AddStep("load coloured beatmap", () => player = loadBeatmap(true, true));
-            AddUntilStep("wait for player", () => player.IsLoaded);
-
-            AddAssert("is user custom skin colours", () => player.UsableComboColours.SequenceEqual(TestSkin.Colours));
+            TestBeatmap = new CatchCustomSkinWorkingBeatmap(audio, true);
+            base.TestBeatmapComboColoursOverride(useBeatmapSkin);
+            AddAssert("is user custom skin colours", () => TestPlayer.UsableComboColours.SequenceEqual(TestSkin.Colours));
         }
 
         [TestCase(true)]
         [TestCase(false)]
-        public void TestBeatmapComboColoursOverrideWithDefaultColours(bool useBeatmapSkin)
+        public override void TestBeatmapComboColoursOverrideWithDefaultColours(bool useBeatmapSkin)
         {
-            ExposedPlayer player = null;
-
-            configureSettings(useBeatmapSkin, false);
-            AddStep("load coloured beatmap", () => player = loadBeatmap(false, true));
-            AddUntilStep("wait for player", () => player.IsLoaded);
-
-            AddAssert("is default user skin colours", () => player.UsableComboColours.SequenceEqual(SkinConfiguration.DefaultComboColours));
+            TestBeatmap = new CatchCustomSkinWorkingBeatmap(audio, true);
+            base.TestBeatmapComboColoursOverrideWithDefaultColours(useBeatmapSkin);
+            AddAssert("is default user skin colours", () => TestPlayer.UsableComboColours.SequenceEqual(SkinConfiguration.DefaultComboColours));
         }
 
         [TestCase(true, true)]
         [TestCase(false, true)]
         [TestCase(true, false)]
         [TestCase(false, false)]
-        public void TestBeatmapNoComboColours(bool useBeatmapSkin, bool useBeatmapColour)
+        public override void TestBeatmapNoComboColours(bool useBeatmapSkin, bool useBeatmapColour)
         {
-            ExposedPlayer player = null;
-
-            configureSettings(useBeatmapSkin, useBeatmapColour);
-            AddStep("load no-colour beatmap", () => player = loadBeatmap(false, false));
-            AddUntilStep("wait for player", () => player.IsLoaded);
-
-            AddAssert("is default user skin colours", () => player.UsableComboColours.SequenceEqual(SkinConfiguration.DefaultComboColours));
+            TestBeatmap = new CatchCustomSkinWorkingBeatmap(audio, false);
+            base.TestBeatmapNoComboColours(useBeatmapSkin, useBeatmapColour);
+            AddAssert("is default user skin colours", () => TestPlayer.UsableComboColours.SequenceEqual(SkinConfiguration.DefaultComboColours));
         }
 
         [TestCase(true, true)]
         [TestCase(false, true)]
         [TestCase(true, false)]
         [TestCase(false, false)]
-        public void TestBeatmapNoComboColoursSkinOverride(bool useBeatmapSkin, bool useBeatmapColour)
+        public override void TestBeatmapNoComboColoursSkinOverride(bool useBeatmapSkin, bool useBeatmapColour)
         {
-            ExposedPlayer player = null;
-
-            configureSettings(useBeatmapSkin, useBeatmapColour);
-            AddStep("load custom-skin colour", () => player = loadBeatmap(true, false));
-            AddUntilStep("wait for player", () => player.IsLoaded);
-
-            AddAssert("is custom user skin colours", () => player.UsableComboColours.SequenceEqual(TestSkin.Colours));
+            TestBeatmap = new CatchCustomSkinWorkingBeatmap(audio, false);
+            base.TestBeatmapNoComboColoursSkinOverride(useBeatmapSkin, useBeatmapColour);
+            AddAssert("is custom user skin colours", () => TestPlayer.UsableComboColours.SequenceEqual(TestSkin.Colours));
         }
 
         [TestCase(true)]
         [TestCase(false)]
         public void TestBeatmapHyperDashColours(bool useBeatmapSkin)
         {
-            ExposedPlayer player = null;
-
-            configureSettings(useBeatmapSkin, true);
-            AddStep("load custom-skin colour", () => player = loadBeatmap(true, true));
-            AddUntilStep("wait for player", () => player.IsLoaded);
-
-            AddAssert("is custom hyper dash colours", () => player.UsableHyperDashColour == TestBeatmapSkin.HYPER_DASH_COLOUR);
-            AddAssert("is custom hyper dash after image colours", () => player.UsableHyperDashAfterImageColour == TestBeatmapSkin.HYPER_DASH_AFTER_IMAGE_COLOUR);
-            AddAssert("is custom hyper dash fruit colours", () => player.UsableHyperDashFruitColour == TestBeatmapSkin.HYPER_DASH_FRUIT_COLOUR);
+            TestBeatmap = new CatchCustomSkinWorkingBeatmap(audio, true);
+            ConfigureTest(useBeatmapSkin, true, true);
+            AddAssert("is custom hyper dash colours", () => ((CatchExposedPlayer)TestPlayer).UsableHyperDashColour == CatchTestBeatmapSkin.HYPER_DASH_COLOUR);
+            AddAssert("is custom hyper dash after image colours", () => ((CatchExposedPlayer)TestPlayer).UsableHyperDashAfterImageColour == CatchTestBeatmapSkin.HYPER_DASH_AFTER_IMAGE_COLOUR);
+            AddAssert("is custom hyper dash fruit colours", () => ((CatchExposedPlayer)TestPlayer).UsableHyperDashFruitColour == CatchTestBeatmapSkin.HYPER_DASH_FRUIT_COLOUR);
         }
 
         [TestCase(true)]
         [TestCase(false)]
         public void TestBeatmapHyperDashColoursOverride(bool useBeatmapSkin)
         {
-            ExposedPlayer player = null;
-
-            configureSettings(useBeatmapSkin, false);
-            AddStep("load custom-skin colour", () => player = loadBeatmap(true, true));
-            AddUntilStep("wait for player", () => player.IsLoaded);
-
-            AddAssert("is custom hyper dash colours", () => player.UsableHyperDashColour == TestSkin.HYPER_DASH_COLOUR);
-            AddAssert("is custom hyper dash after image colours", () => player.UsableHyperDashAfterImageColour == TestSkin.HYPER_DASH_AFTER_IMAGE_COLOUR);
-            AddAssert("is custom hyper dash fruit colours", () => player.UsableHyperDashFruitColour == TestSkin.HYPER_DASH_FRUIT_COLOUR);
+            TestBeatmap = new CatchCustomSkinWorkingBeatmap(audio, true);
+            ConfigureTest(useBeatmapSkin, false, true);
+            AddAssert("is custom hyper dash colours", () => ((CatchExposedPlayer)TestPlayer).UsableHyperDashColour == CatchTestSkin.HYPER_DASH_COLOUR);
+            AddAssert("is custom hyper dash after image colours", () => ((CatchExposedPlayer)TestPlayer).UsableHyperDashAfterImageColour == CatchTestSkin.HYPER_DASH_AFTER_IMAGE_COLOUR);
+            AddAssert("is custom hyper dash fruit colours", () => ((CatchExposedPlayer)TestPlayer).UsableHyperDashFruitColour == CatchTestSkin.HYPER_DASH_FRUIT_COLOUR);
         }
 
-        private ExposedPlayer loadBeatmap(bool userHasCustomColours, bool beatmapHasColours)
+        protected override ExposedPlayer CreateTestPlayer(bool userHasCustomColours) => new CatchExposedPlayer(userHasCustomColours);
+
+        private class CatchExposedPlayer : ExposedPlayer
         {
-            ExposedPlayer player;
-
-            Beatmap.Value = new CustomSkinWorkingBeatmap(audio, beatmapHasColours);
-
-            LoadScreen(player = new ExposedPlayer(userHasCustomColours));
-
-            return player;
-        }
-
-        private void configureSettings(bool beatmapSkins, bool beatmapColours)
-        {
-            AddStep($"{(beatmapSkins ? "enable" : "disable")} beatmap skins", () =>
+            public CatchExposedPlayer(bool userHasCustomColours)
+                : base(userHasCustomColours)
             {
-                this.beatmapSkins.Value = beatmapSkins;
-            });
-            AddStep($"{(beatmapColours ? "enable" : "disable")} beatmap colours", () =>
-            {
-                this.beatmapColours.Value = beatmapColours;
-            });
-        }
-
-        private class ExposedPlayer : Player
-        {
-            private readonly bool userHasCustomColours;
-
-            public ExposedPlayer(bool userHasCustomColours)
-                : base(new PlayerConfiguration
-                {
-                    AllowPause = false,
-                    ShowResults = false,
-                })
-            {
-                this.userHasCustomColours = userHasCustomColours;
             }
 
             protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
             {
                 var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
-                dependencies.CacheAs<ISkinSource>(new TestSkin(userHasCustomColours));
+                dependencies.CacheAs<ISkinSource>(new CatchTestSkin(UserHasCustomColours));
                 return dependencies;
             }
 
-            public IReadOnlyList<Color4> UsableComboColours =>
-                GameplayClockContainer.ChildrenOfType<BeatmapSkinProvidingContainer>()
-                                      .First()
-                                      .GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value;
-
             public Color4 UsableHyperDashColour =>
                 GameplayClockContainer.ChildrenOfType<BeatmapSkinProvidingContainer>()
                                       .First()
@@ -223,17 +155,14 @@ namespace osu.Game.Rulesets.Catch.Tests
             }
         }
 
-        private class CustomSkinWorkingBeatmap : ClockBackedTestWorkingBeatmap
+        private class CatchCustomSkinWorkingBeatmap : CustomSkinWorkingBeatmap
         {
-            private readonly bool hasColours;
-
-            public CustomSkinWorkingBeatmap(AudioManager audio, bool hasColours)
-                : base(createBeatmap(new CatchRuleset().RulesetInfo), null, null, audio)
+            public CatchCustomSkinWorkingBeatmap(AudioManager audio, bool hasColours)
+                : base(createBeatmap(new CatchRuleset().RulesetInfo), audio, hasColours)
             {
-                this.hasColours = hasColours;
             }
 
-            protected override ISkin GetSkin() => new TestBeatmapSkin(BeatmapInfo, hasColours);
+            protected override ISkin GetSkin() => new CatchTestBeatmapSkin(BeatmapInfo, HasColours);
 
             private static IBeatmap createBeatmap(RulesetInfo ruleset)
             {
@@ -297,26 +226,19 @@ namespace osu.Game.Rulesets.Catch.Tests
             }
         }
 
-        private class TestBeatmapSkin : LegacyBeatmapSkin
+        private class CatchTestBeatmapSkin : TestBeatmapSkin
         {
-            public static Color4[] Colours { get; } =
-            {
-                new Color4(50, 100, 150, 255),
-                new Color4(40, 80, 120, 255),
-            };
-
             public static readonly Color4 HYPER_DASH_COLOUR = Color4.DarkBlue;
 
             public static readonly Color4 HYPER_DASH_AFTER_IMAGE_COLOUR = Color4.DarkCyan;
 
             public static readonly Color4 HYPER_DASH_FRUIT_COLOUR = Color4.DarkGoldenrod;
 
-            public TestBeatmapSkin(BeatmapInfo beatmap, bool hasColours)
-                : base(beatmap, new ResourceStore<byte[]>(), null)
+            public CatchTestBeatmapSkin(BeatmapInfo beatmap, bool hasColours)
+                : base(beatmap, hasColours)
             {
                 if (hasColours)
                 {
-                    Configuration.AddComboColours(Colours);
                     Configuration.CustomColours.Add(CatchSkinColour.HyperDash.ToString(), HYPER_DASH_COLOUR);
                     Configuration.CustomColours.Add(CatchSkinColour.HyperDashAfterImage.ToString(), HYPER_DASH_AFTER_IMAGE_COLOUR);
                     Configuration.CustomColours.Add(CatchSkinColour.HyperDashFruit.ToString(), HYPER_DASH_FRUIT_COLOUR);
@@ -324,37 +246,24 @@ namespace osu.Game.Rulesets.Catch.Tests
             }
         }
 
-        private class TestSkin : LegacySkin, ISkinSource
+        private class CatchTestSkin : TestSkin
         {
-            public static Color4[] Colours { get; } =
-            {
-                new Color4(150, 100, 50, 255),
-                new Color4(20, 20, 20, 255),
-            };
-
             public static readonly Color4 HYPER_DASH_COLOUR = Color4.LightBlue;
 
             public static readonly Color4 HYPER_DASH_AFTER_IMAGE_COLOUR = Color4.LightCoral;
 
             public static readonly Color4 HYPER_DASH_FRUIT_COLOUR = Color4.LightCyan;
 
-            public TestSkin(bool hasCustomColours)
-                : base(new SkinInfo(), new ResourceStore<byte[]>(), null, string.Empty)
+            public CatchTestSkin(bool hasCustomColours)
+                : base(hasCustomColours)
             {
                 if (hasCustomColours)
                 {
-                    Configuration.AddComboColours(Colours);
                     Configuration.CustomColours.Add(CatchSkinColour.HyperDash.ToString(), HYPER_DASH_COLOUR);
                     Configuration.CustomColours.Add(CatchSkinColour.HyperDashAfterImage.ToString(), HYPER_DASH_AFTER_IMAGE_COLOUR);
                     Configuration.CustomColours.Add(CatchSkinColour.HyperDashFruit.ToString(), HYPER_DASH_FRUIT_COLOUR);
                 }
             }
-
-            public event Action SourceChanged
-            {
-                add { }
-                remove { }
-            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
index 22b028906f..095ce63ec5 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
@@ -1,168 +1,113 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
-using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
-using osu.Framework.Bindables;
-using osu.Framework.IO.Stores;
-using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Screens.Play;
 using osu.Game.Skinning;
-using osu.Game.Tests.Visual;
+using osu.Game.Tests.Beatmaps;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
-    public class TestSceneLegacyBeatmapSkin : ScreenTestScene
+    public class TestSceneLegacyBeatmapSkin : LegacyBeatmapSkinColourTest
     {
         [Resolved]
         private AudioManager audio { get; set; }
 
-        private readonly Bindable<bool> beatmapSkins = new Bindable<bool>();
-        private readonly Bindable<bool> beatmapColours = new Bindable<bool>();
-
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
-            config.BindWith(OsuSetting.BeatmapSkins, beatmapSkins);
-            config.BindWith(OsuSetting.BeatmapColours, beatmapColours);
+            config.BindWith(OsuSetting.BeatmapSkins, BeatmapSkins);
+            config.BindWith(OsuSetting.BeatmapColours, BeatmapColours);
         }
 
         [TestCase(true, true)]
         [TestCase(true, false)]
         [TestCase(false, true)]
         [TestCase(false, false)]
-        public void TestBeatmapComboColours(bool userHasCustomColours, bool useBeatmapSkin)
+        public override void TestBeatmapComboColours(bool userHasCustomColours, bool useBeatmapSkin)
         {
-            ExposedPlayer player = null;
-
-            configureSettings(useBeatmapSkin, true);
-            AddStep("load coloured beatmap", () => player = loadBeatmap(userHasCustomColours, true));
-            AddUntilStep("wait for player", () => player.IsLoaded);
-
-            AddAssert("is beatmap skin colours", () => player.UsableComboColours.SequenceEqual(TestBeatmapSkin.Colours));
+            TestBeatmap = new OsuCustomSkinWorkingBeatmap(audio, true);
+            base.TestBeatmapComboColours(userHasCustomColours, useBeatmapSkin);
+            AddAssert("is beatmap skin colours", () => TestPlayer.UsableComboColours.SequenceEqual(TestBeatmapSkin.Colours));
         }
 
         [TestCase(true)]
         [TestCase(false)]
-        public void TestBeatmapComboColoursOverride(bool useBeatmapSkin)
+        public override void TestBeatmapComboColoursOverride(bool useBeatmapSkin)
         {
-            ExposedPlayer player = null;
-
-            configureSettings(useBeatmapSkin, false);
-            AddStep("load coloured beatmap", () => player = loadBeatmap(true, true));
-            AddUntilStep("wait for player", () => player.IsLoaded);
-
-            AddAssert("is user custom skin colours", () => player.UsableComboColours.SequenceEqual(TestSkin.Colours));
+            TestBeatmap = new OsuCustomSkinWorkingBeatmap(audio, true);
+            base.TestBeatmapComboColoursOverride(useBeatmapSkin);
+            AddAssert("is user custom skin colours", () => TestPlayer.UsableComboColours.SequenceEqual(TestSkin.Colours));
         }
 
         [TestCase(true)]
         [TestCase(false)]
-        public void TestBeatmapComboColoursOverrideWithDefaultColours(bool useBeatmapSkin)
+        public override void TestBeatmapComboColoursOverrideWithDefaultColours(bool useBeatmapSkin)
         {
-            ExposedPlayer player = null;
-
-            configureSettings(useBeatmapSkin, false);
-            AddStep("load coloured beatmap", () => player = loadBeatmap(false, true));
-            AddUntilStep("wait for player", () => player.IsLoaded);
-
-            AddAssert("is default user skin colours", () => player.UsableComboColours.SequenceEqual(SkinConfiguration.DefaultComboColours));
+            TestBeatmap = new OsuCustomSkinWorkingBeatmap(audio, true);
+            base.TestBeatmapComboColoursOverrideWithDefaultColours(useBeatmapSkin);
+            AddAssert("is default user skin colours", () => TestPlayer.UsableComboColours.SequenceEqual(SkinConfiguration.DefaultComboColours));
         }
 
         [TestCase(true, true)]
         [TestCase(false, true)]
         [TestCase(true, false)]
         [TestCase(false, false)]
-        public void TestBeatmapNoComboColours(bool useBeatmapSkin, bool useBeatmapColour)
+        public override void TestBeatmapNoComboColours(bool useBeatmapSkin, bool useBeatmapColour)
         {
-            ExposedPlayer player = null;
-
-            configureSettings(useBeatmapSkin, useBeatmapColour);
-            AddStep("load no-colour beatmap", () => player = loadBeatmap(false, false));
-            AddUntilStep("wait for player", () => player.IsLoaded);
-
-            AddAssert("is default user skin colours", () => player.UsableComboColours.SequenceEqual(SkinConfiguration.DefaultComboColours));
+            TestBeatmap = new OsuCustomSkinWorkingBeatmap(audio, false);
+            base.TestBeatmapNoComboColours(useBeatmapSkin, useBeatmapColour);
+            AddAssert("is default user skin colours", () => TestPlayer.UsableComboColours.SequenceEqual(SkinConfiguration.DefaultComboColours));
         }
 
         [TestCase(true, true)]
         [TestCase(false, true)]
         [TestCase(true, false)]
         [TestCase(false, false)]
-        public void TestBeatmapNoComboColoursSkinOverride(bool useBeatmapSkin, bool useBeatmapColour)
+        public override void TestBeatmapNoComboColoursSkinOverride(bool useBeatmapSkin, bool useBeatmapColour)
         {
-            ExposedPlayer player = null;
-
-            configureSettings(useBeatmapSkin, useBeatmapColour);
-            AddStep("load custom-skin colour", () => player = loadBeatmap(true, false));
-            AddUntilStep("wait for player", () => player.IsLoaded);
-
-            AddAssert("is custom user skin colours", () => player.UsableComboColours.SequenceEqual(TestSkin.Colours));
+            TestBeatmap = new OsuCustomSkinWorkingBeatmap(audio, false);
+            base.TestBeatmapNoComboColoursSkinOverride(useBeatmapSkin, useBeatmapColour);
+            AddAssert("is custom user skin colours", () => TestPlayer.UsableComboColours.SequenceEqual(TestSkin.Colours));
         }
 
-        private ExposedPlayer loadBeatmap(bool userHasCustomColours, bool beatmapHasColours)
+        protected override ExposedPlayer CreateTestPlayer(bool userHasCustomColours) => new OsuExposedPlayer(userHasCustomColours);
+
+        private class OsuExposedPlayer : ExposedPlayer
         {
-            ExposedPlayer player;
-
-            Beatmap.Value = new CustomSkinWorkingBeatmap(audio, beatmapHasColours);
-
-            LoadScreen(player = new ExposedPlayer(userHasCustomColours));
-
-            return player;
-        }
-
-        private void configureSettings(bool beatmapSkins, bool beatmapColours)
-        {
-            AddStep($"{(beatmapSkins ? "enable" : "disable")} beatmap skins", () =>
+            public OsuExposedPlayer(bool userHasCustomColours)
+                : base(userHasCustomColours)
             {
-                this.beatmapSkins.Value = beatmapSkins;
-            });
-            AddStep($"{(beatmapColours ? "enable" : "disable")} beatmap colours", () =>
-            {
-                this.beatmapColours.Value = beatmapColours;
-            });
-        }
-
-        private class ExposedPlayer : Player
-        {
-            private readonly bool userHasCustomColours;
-
-            public ExposedPlayer(bool userHasCustomColours)
-                : base(new PlayerConfiguration
-                {
-                    AllowPause = false,
-                    ShowResults = false,
-                })
-            {
-                this.userHasCustomColours = userHasCustomColours;
             }
 
             protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
             {
                 var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
-                dependencies.CacheAs<ISkinSource>(new TestSkin(userHasCustomColours));
+                dependencies.CacheAs<ISkinSource>(new OsuTestSkin(UserHasCustomColours));
                 return dependencies;
             }
-
-            public IReadOnlyList<Color4> UsableComboColours =>
-                GameplayClockContainer.ChildrenOfType<BeatmapSkinProvidingContainer>()
-                                      .First()
-                                      .GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value;
         }
 
-        private class CustomSkinWorkingBeatmap : ClockBackedTestWorkingBeatmap
+        private class OsuCustomSkinWorkingBeatmap : CustomSkinWorkingBeatmap
         {
             private readonly bool hasColours;
 
-            public CustomSkinWorkingBeatmap(AudioManager audio, bool hasColours)
-                : base(new Beatmap
+            public OsuCustomSkinWorkingBeatmap(AudioManager audio, bool hasColours)
+                : base(createBeatmap(), audio, hasColours)
+            {
+                this.hasColours = hasColours;
+            }
+
+            protected override ISkin GetSkin() => new OsuTestBeatmapSkin(BeatmapInfo, hasColours);
+
+            private static IBeatmap createBeatmap() =>
+                new Beatmap
                 {
                     BeatmapInfo =
                     {
@@ -170,49 +115,22 @@ namespace osu.Game.Rulesets.Osu.Tests
                         Ruleset = new OsuRuleset().RulesetInfo,
                     },
                     HitObjects = { new HitCircle { Position = new Vector2(256, 192) } }
-                }, null, null, audio)
-            {
-                this.hasColours = hasColours;
-            }
-
-            protected override ISkin GetSkin() => new TestBeatmapSkin(BeatmapInfo, hasColours);
+                };
         }
 
-        private class TestBeatmapSkin : LegacyBeatmapSkin
+        private class OsuTestBeatmapSkin : TestBeatmapSkin
         {
-            public static Color4[] Colours { get; } =
+            public OsuTestBeatmapSkin(BeatmapInfo beatmap, bool hasColours)
+                : base(beatmap, hasColours)
             {
-                new Color4(50, 100, 150, 255),
-                new Color4(40, 80, 120, 255),
-            };
-
-            public TestBeatmapSkin(BeatmapInfo beatmap, bool hasColours)
-                : base(beatmap, new ResourceStore<byte[]>(), null)
-            {
-                if (hasColours)
-                    Configuration.AddComboColours(Colours);
             }
         }
 
-        private class TestSkin : LegacySkin, ISkinSource
+        private class OsuTestSkin : TestSkin
         {
-            public static Color4[] Colours { get; } =
+            public OsuTestSkin(bool hasCustomColours)
+                : base(hasCustomColours)
             {
-                new Color4(150, 100, 50, 255),
-                new Color4(20, 20, 20, 255),
-            };
-
-            public TestSkin(bool hasCustomColours)
-                : base(new SkinInfo(), null, null, string.Empty)
-            {
-                if (hasCustomColours)
-                    Configuration.AddComboColours(Colours);
-            }
-
-            public event Action SourceChanged
-            {
-                add { }
-                remove { }
             }
         }
     }
diff --git a/osu.Game/Tests/Beatmaps/LegacyBeatmapSkinColourTest.cs b/osu.Game/Tests/Beatmaps/LegacyBeatmapSkinColourTest.cs
new file mode 100644
index 0000000000..b42c3ea70d
--- /dev/null
+++ b/osu.Game/Tests/Beatmaps/LegacyBeatmapSkinColourTest.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 osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Bindables;
+using osu.Framework.IO.Stores;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Screens.Play;
+using osu.Game.Skinning;
+using osu.Game.Tests.Visual;
+using osuTK.Graphics;
+
+namespace osu.Game.Tests.Beatmaps
+{
+    public class LegacyBeatmapSkinColourTest : ScreenTestScene
+    {
+        protected readonly Bindable<bool> BeatmapSkins = new Bindable<bool>();
+        protected readonly Bindable<bool> BeatmapColours = new Bindable<bool>();
+        protected ExposedPlayer TestPlayer;
+        protected WorkingBeatmap TestBeatmap;
+
+        public virtual void TestBeatmapComboColours(bool userHasCustomColours, bool useBeatmapSkin) => ConfigureTest(useBeatmapSkin, true, userHasCustomColours);
+
+        public virtual void TestBeatmapComboColoursOverride(bool useBeatmapSkin) => ConfigureTest(useBeatmapSkin, false, true);
+
+        public virtual void TestBeatmapComboColoursOverrideWithDefaultColours(bool useBeatmapSkin) => ConfigureTest(useBeatmapSkin, false, false);
+
+        public virtual void TestBeatmapNoComboColours(bool useBeatmapSkin, bool useBeatmapColour) => ConfigureTest(useBeatmapSkin, useBeatmapColour, false);
+
+        public virtual void TestBeatmapNoComboColoursSkinOverride(bool useBeatmapSkin, bool useBeatmapColour) => ConfigureTest(useBeatmapSkin, useBeatmapColour, true);
+
+        protected virtual void ConfigureTest(bool useBeatmapSkin, bool useBeatmapColours, bool userHasCustomColours)
+        {
+            configureSettings(useBeatmapSkin, useBeatmapColours);
+            AddStep($"load {(((CustomSkinWorkingBeatmap)TestBeatmap).HasColours ? "coloured " : "")} beatmap", () => TestPlayer = LoadBeatmap(userHasCustomColours));
+            AddUntilStep("wait for player load", () => TestPlayer.IsLoaded);
+        }
+
+        private void configureSettings(bool beatmapSkins, bool beatmapColours)
+        {
+            AddStep($"{(beatmapSkins ? "enable" : "disable")} beatmap skins", () =>
+            {
+                BeatmapSkins.Value = beatmapSkins;
+            });
+            AddStep($"{(beatmapColours ? "enable" : "disable")} beatmap colours", () =>
+            {
+                BeatmapColours.Value = beatmapColours;
+            });
+        }
+
+        protected virtual ExposedPlayer LoadBeatmap(bool userHasCustomColours)
+        {
+            ExposedPlayer player;
+
+            Beatmap.Value = TestBeatmap;
+
+            LoadScreen(player = CreateTestPlayer(userHasCustomColours));
+
+            return player;
+        }
+
+        protected virtual ExposedPlayer CreateTestPlayer(bool userHasCustomColours) => new ExposedPlayer(userHasCustomColours);
+
+        protected class ExposedPlayer : Player
+        {
+            protected readonly bool UserHasCustomColours;
+
+            public ExposedPlayer(bool userHasCustomColours)
+                : base(new PlayerConfiguration
+                {
+                    AllowPause = false,
+                    ShowResults = false,
+                })
+            {
+                UserHasCustomColours = userHasCustomColours;
+            }
+
+            protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
+            {
+                var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+                dependencies.CacheAs<ISkinSource>(new TestSkin(UserHasCustomColours));
+                return dependencies;
+            }
+
+            public IReadOnlyList<Color4> UsableComboColours =>
+                GameplayClockContainer.ChildrenOfType<BeatmapSkinProvidingContainer>()
+                                      .First()
+                                      .GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value;
+        }
+
+        protected class CustomSkinWorkingBeatmap : ClockBackedTestWorkingBeatmap
+        {
+            public readonly bool HasColours;
+
+            public CustomSkinWorkingBeatmap(IBeatmap beatmap, AudioManager audio, bool hasColours)
+                : base(beatmap, null, null, audio)
+            {
+                HasColours = hasColours;
+            }
+
+            protected override ISkin GetSkin() => new TestBeatmapSkin(BeatmapInfo, HasColours);
+        }
+
+        protected class TestBeatmapSkin : LegacyBeatmapSkin
+        {
+            public static Color4[] Colours { get; } =
+            {
+                new Color4(50, 100, 150, 255),
+                new Color4(40, 80, 120, 255),
+            };
+
+            public TestBeatmapSkin(BeatmapInfo beatmap, bool hasColours)
+                : base(beatmap, new ResourceStore<byte[]>(), null)
+            {
+                if (hasColours)
+                    Configuration.AddComboColours(Colours);
+            }
+        }
+
+        protected class TestSkin : LegacySkin, ISkinSource
+        {
+            public static Color4[] Colours { get; } =
+            {
+                new Color4(150, 100, 50, 255),
+                new Color4(20, 20, 20, 255),
+            };
+
+            public TestSkin(bool hasCustomColours)
+                : base(new SkinInfo(), new ResourceStore<byte[]>(), null, string.Empty)
+            {
+                if (hasCustomColours)
+                    Configuration.AddComboColours(Colours);
+            }
+
+            public event Action SourceChanged
+            {
+                add { }
+                remove { }
+            }
+        }
+    }
+}

From a3535f4b79a3634e31fe9fd935545b653558787f Mon Sep 17 00:00:00 2001
From: Mysfit <jdawg678@gmail.com>
Date: Sat, 16 Jan 2021 02:09:35 -0500
Subject: [PATCH 0904/3722] Further simplified beatmap colouring tests.

---
 .../TestSceneLegacyBeatmapSkin.cs             | 144 ++----------------
 .../TestSceneLegacyBeatmapSkin.cs             |  38 -----
 .../Beatmaps/LegacyBeatmapSkinColourTest.cs   |  22 +++
 3 files changed, 35 insertions(+), 169 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneLegacyBeatmapSkin.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneLegacyBeatmapSkin.cs
index 89298242e5..eea83ef7c1 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneLegacyBeatmapSkin.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneLegacyBeatmapSkin.cs
@@ -1,22 +1,17 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Skinning;
-using osu.Game.Rulesets.Catch.UI;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Skinning;
 using osu.Game.Tests.Beatmaps;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Tests
@@ -90,9 +85,9 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             TestBeatmap = new CatchCustomSkinWorkingBeatmap(audio, true);
             ConfigureTest(useBeatmapSkin, true, true);
-            AddAssert("is custom hyper dash colours", () => ((CatchExposedPlayer)TestPlayer).UsableHyperDashColour == CatchTestBeatmapSkin.HYPER_DASH_COLOUR);
-            AddAssert("is custom hyper dash after image colours", () => ((CatchExposedPlayer)TestPlayer).UsableHyperDashAfterImageColour == CatchTestBeatmapSkin.HYPER_DASH_AFTER_IMAGE_COLOUR);
-            AddAssert("is custom hyper dash fruit colours", () => ((CatchExposedPlayer)TestPlayer).UsableHyperDashFruitColour == CatchTestBeatmapSkin.HYPER_DASH_FRUIT_COLOUR);
+            AddAssert("is custom hyper dash colours", () => ((CatchExposedPlayer)TestPlayer).UsableHyperDashColour == TestBeatmapSkin.HYPER_DASH_COLOUR);
+            AddAssert("is custom hyper dash after image colours", () => ((CatchExposedPlayer)TestPlayer).UsableHyperDashAfterImageColour == TestBeatmapSkin.HYPER_DASH_AFTER_IMAGE_COLOUR);
+            AddAssert("is custom hyper dash fruit colours", () => ((CatchExposedPlayer)TestPlayer).UsableHyperDashFruitColour == TestBeatmapSkin.HYPER_DASH_FRUIT_COLOUR);
         }
 
         [TestCase(true)]
@@ -101,9 +96,9 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             TestBeatmap = new CatchCustomSkinWorkingBeatmap(audio, true);
             ConfigureTest(useBeatmapSkin, false, true);
-            AddAssert("is custom hyper dash colours", () => ((CatchExposedPlayer)TestPlayer).UsableHyperDashColour == CatchTestSkin.HYPER_DASH_COLOUR);
-            AddAssert("is custom hyper dash after image colours", () => ((CatchExposedPlayer)TestPlayer).UsableHyperDashAfterImageColour == CatchTestSkin.HYPER_DASH_AFTER_IMAGE_COLOUR);
-            AddAssert("is custom hyper dash fruit colours", () => ((CatchExposedPlayer)TestPlayer).UsableHyperDashFruitColour == CatchTestSkin.HYPER_DASH_FRUIT_COLOUR);
+            AddAssert("is custom hyper dash colours", () => ((CatchExposedPlayer)TestPlayer).UsableHyperDashColour == TestSkin.HYPER_DASH_COLOUR);
+            AddAssert("is custom hyper dash after image colours", () => ((CatchExposedPlayer)TestPlayer).UsableHyperDashAfterImageColour == TestSkin.HYPER_DASH_AFTER_IMAGE_COLOUR);
+            AddAssert("is custom hyper dash fruit colours", () => ((CatchExposedPlayer)TestPlayer).UsableHyperDashFruitColour == TestSkin.HYPER_DASH_FRUIT_COLOUR);
         }
 
         protected override ExposedPlayer CreateTestPlayer(bool userHasCustomColours) => new CatchExposedPlayer(userHasCustomColours);
@@ -115,13 +110,6 @@ namespace osu.Game.Rulesets.Catch.Tests
             {
             }
 
-            protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
-            {
-                var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
-                dependencies.CacheAs<ISkinSource>(new CatchTestSkin(UserHasCustomColours));
-                return dependencies;
-            }
-
             public Color4 UsableHyperDashColour =>
                 GameplayClockContainer.ChildrenOfType<BeatmapSkinProvidingContainer>()
                                       .First()
@@ -141,129 +129,23 @@ namespace osu.Game.Rulesets.Catch.Tests
                                       .Value ?? Color4.Red;
         }
 
-        private class TestJuiceStream : JuiceStream
-        {
-            public TestJuiceStream(float x)
-            {
-                X = x;
-
-                Path = new SliderPath(new[]
-                {
-                    new PathControlPoint(Vector2.Zero),
-                    new PathControlPoint(new Vector2(30, 0)),
-                });
-            }
-        }
-
         private class CatchCustomSkinWorkingBeatmap : CustomSkinWorkingBeatmap
         {
             public CatchCustomSkinWorkingBeatmap(AudioManager audio, bool hasColours)
-                : base(createBeatmap(new CatchRuleset().RulesetInfo), audio, hasColours)
+                : base(createBeatmap(), audio, hasColours)
             {
             }
 
-            protected override ISkin GetSkin() => new CatchTestBeatmapSkin(BeatmapInfo, HasColours);
-
-            private static IBeatmap createBeatmap(RulesetInfo ruleset)
-            {
-                var beatmap = new Beatmap
+            private static IBeatmap createBeatmap() =>
+                new Beatmap
                 {
                     BeatmapInfo =
                     {
-                        Ruleset = ruleset,
-                        BaseDifficulty = new BeatmapDifficulty { CircleSize = 3.6f }
-                    }
+                        BeatmapSet = new BeatmapSetInfo(),
+                        Ruleset = new CatchRuleset().RulesetInfo
+                    },
+                    HitObjects = { new Fruit { StartTime = 1816, X = 56, NewCombo = true } }
                 };
-
-                beatmap.ControlPointInfo.Add(0, new TimingControlPoint());
-
-                // Should produce a hyper-dash (edge case test)
-                beatmap.HitObjects.Add(new Fruit { StartTime = 1816, X = 56, NewCombo = true });
-                beatmap.HitObjects.Add(new Fruit { StartTime = 2008, X = 308, NewCombo = true });
-
-                double startTime = 3000;
-
-                const float left_x = 0.02f * CatchPlayfield.WIDTH;
-                const float right_x = 0.98f * CatchPlayfield.WIDTH;
-
-                createObjects(() => new Fruit { X = left_x });
-                createObjects(() => new TestJuiceStream(right_x), 1);
-                createObjects(() => new TestJuiceStream(left_x), 1);
-                createObjects(() => new Fruit { X = right_x });
-                createObjects(() => new Fruit { X = left_x });
-                createObjects(() => new Fruit { X = right_x });
-                createObjects(() => new TestJuiceStream(left_x), 1);
-
-                beatmap.ControlPointInfo.Add(startTime, new TimingControlPoint
-                {
-                    BeatLength = 50
-                });
-
-                createObjects(() => new TestJuiceStream(left_x)
-                {
-                    Path = new SliderPath(new[]
-                    {
-                        new PathControlPoint(Vector2.Zero),
-                        new PathControlPoint(new Vector2(512, 0))
-                    })
-                }, 1);
-
-                return beatmap;
-
-                void createObjects(Func<CatchHitObject> createObject, int count = 3)
-                {
-                    const float spacing = 140;
-
-                    for (int i = 0; i < count; i++)
-                    {
-                        var hitObject = createObject();
-                        hitObject.StartTime = startTime + i * spacing;
-                        beatmap.HitObjects.Add(hitObject);
-                    }
-
-                    startTime += 700;
-                }
-            }
-        }
-
-        private class CatchTestBeatmapSkin : TestBeatmapSkin
-        {
-            public static readonly Color4 HYPER_DASH_COLOUR = Color4.DarkBlue;
-
-            public static readonly Color4 HYPER_DASH_AFTER_IMAGE_COLOUR = Color4.DarkCyan;
-
-            public static readonly Color4 HYPER_DASH_FRUIT_COLOUR = Color4.DarkGoldenrod;
-
-            public CatchTestBeatmapSkin(BeatmapInfo beatmap, bool hasColours)
-                : base(beatmap, hasColours)
-            {
-                if (hasColours)
-                {
-                    Configuration.CustomColours.Add(CatchSkinColour.HyperDash.ToString(), HYPER_DASH_COLOUR);
-                    Configuration.CustomColours.Add(CatchSkinColour.HyperDashAfterImage.ToString(), HYPER_DASH_AFTER_IMAGE_COLOUR);
-                    Configuration.CustomColours.Add(CatchSkinColour.HyperDashFruit.ToString(), HYPER_DASH_FRUIT_COLOUR);
-                }
-            }
-        }
-
-        private class CatchTestSkin : TestSkin
-        {
-            public static readonly Color4 HYPER_DASH_COLOUR = Color4.LightBlue;
-
-            public static readonly Color4 HYPER_DASH_AFTER_IMAGE_COLOUR = Color4.LightCoral;
-
-            public static readonly Color4 HYPER_DASH_FRUIT_COLOUR = Color4.LightCyan;
-
-            public CatchTestSkin(bool hasCustomColours)
-                : base(hasCustomColours)
-            {
-                if (hasCustomColours)
-                {
-                    Configuration.CustomColours.Add(CatchSkinColour.HyperDash.ToString(), HYPER_DASH_COLOUR);
-                    Configuration.CustomColours.Add(CatchSkinColour.HyperDashAfterImage.ToString(), HYPER_DASH_AFTER_IMAGE_COLOUR);
-                    Configuration.CustomColours.Add(CatchSkinColour.HyperDashFruit.ToString(), HYPER_DASH_FRUIT_COLOUR);
-                }
-            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
index 095ce63ec5..c26419b0e8 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
@@ -77,35 +77,13 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddAssert("is custom user skin colours", () => TestPlayer.UsableComboColours.SequenceEqual(TestSkin.Colours));
         }
 
-        protected override ExposedPlayer CreateTestPlayer(bool userHasCustomColours) => new OsuExposedPlayer(userHasCustomColours);
-
-        private class OsuExposedPlayer : ExposedPlayer
-        {
-            public OsuExposedPlayer(bool userHasCustomColours)
-                : base(userHasCustomColours)
-            {
-            }
-
-            protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
-            {
-                var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
-                dependencies.CacheAs<ISkinSource>(new OsuTestSkin(UserHasCustomColours));
-                return dependencies;
-            }
-        }
-
         private class OsuCustomSkinWorkingBeatmap : CustomSkinWorkingBeatmap
         {
-            private readonly bool hasColours;
-
             public OsuCustomSkinWorkingBeatmap(AudioManager audio, bool hasColours)
                 : base(createBeatmap(), audio, hasColours)
             {
-                this.hasColours = hasColours;
             }
 
-            protected override ISkin GetSkin() => new OsuTestBeatmapSkin(BeatmapInfo, hasColours);
-
             private static IBeatmap createBeatmap() =>
                 new Beatmap
                 {
@@ -117,21 +95,5 @@ namespace osu.Game.Rulesets.Osu.Tests
                     HitObjects = { new HitCircle { Position = new Vector2(256, 192) } }
                 };
         }
-
-        private class OsuTestBeatmapSkin : TestBeatmapSkin
-        {
-            public OsuTestBeatmapSkin(BeatmapInfo beatmap, bool hasColours)
-                : base(beatmap, hasColours)
-            {
-            }
-        }
-
-        private class OsuTestSkin : TestSkin
-        {
-            public OsuTestSkin(bool hasCustomColours)
-                : base(hasCustomColours)
-            {
-            }
-        }
     }
 }
diff --git a/osu.Game/Tests/Beatmaps/LegacyBeatmapSkinColourTest.cs b/osu.Game/Tests/Beatmaps/LegacyBeatmapSkinColourTest.cs
index b42c3ea70d..fb3432fbae 100644
--- a/osu.Game/Tests/Beatmaps/LegacyBeatmapSkinColourTest.cs
+++ b/osu.Game/Tests/Beatmaps/LegacyBeatmapSkinColourTest.cs
@@ -114,11 +114,22 @@ namespace osu.Game.Tests.Beatmaps
                 new Color4(40, 80, 120, 255),
             };
 
+            public static readonly Color4 HYPER_DASH_COLOUR = Color4.DarkBlue;
+
+            public static readonly Color4 HYPER_DASH_AFTER_IMAGE_COLOUR = Color4.DarkCyan;
+
+            public static readonly Color4 HYPER_DASH_FRUIT_COLOUR = Color4.DarkGoldenrod;
+
             public TestBeatmapSkin(BeatmapInfo beatmap, bool hasColours)
                 : base(beatmap, new ResourceStore<byte[]>(), null)
             {
                 if (hasColours)
+                {
                     Configuration.AddComboColours(Colours);
+                    Configuration.CustomColours.Add("HyperDash", HYPER_DASH_COLOUR);
+                    Configuration.CustomColours.Add("HyperDashAfterImage", HYPER_DASH_AFTER_IMAGE_COLOUR);
+                    Configuration.CustomColours.Add("HyperDashFruit", HYPER_DASH_FRUIT_COLOUR);
+                }
             }
         }
 
@@ -130,11 +141,22 @@ namespace osu.Game.Tests.Beatmaps
                 new Color4(20, 20, 20, 255),
             };
 
+            public static readonly Color4 HYPER_DASH_COLOUR = Color4.LightBlue;
+
+            public static readonly Color4 HYPER_DASH_AFTER_IMAGE_COLOUR = Color4.LightCoral;
+
+            public static readonly Color4 HYPER_DASH_FRUIT_COLOUR = Color4.LightCyan;
+
             public TestSkin(bool hasCustomColours)
                 : base(new SkinInfo(), new ResourceStore<byte[]>(), null, string.Empty)
             {
                 if (hasCustomColours)
+                {
                     Configuration.AddComboColours(Colours);
+                    Configuration.CustomColours.Add("HyperDash", HYPER_DASH_COLOUR);
+                    Configuration.CustomColours.Add("HyperDashAfterImage", HYPER_DASH_AFTER_IMAGE_COLOUR);
+                    Configuration.CustomColours.Add("HyperDashFruit", HYPER_DASH_FRUIT_COLOUR);
+                }
             }
 
             public event Action SourceChanged

From d9034eab26e8abe8698a4de5feacd1be0ae8ecff Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 22:54:54 +0300
Subject: [PATCH 0905/3722] Make model manager in `DownloadTrackingComposite`
 protected

---
 osu.Game/Online/DownloadTrackingComposite.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index 7a64c9002d..4e52761813 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Online
         protected readonly Bindable<TModel> Model = new Bindable<TModel>();
 
         [Resolved(CanBeNull = true)]
-        private TModelManager manager { get; set; }
+        protected TModelManager Manager { get; private set; }
 
         /// <summary>
         /// Holds the current download state of the <typeparamref name="TModel"/>, whether is has already been downloaded, is in progress, or is not downloaded.
@@ -49,19 +49,19 @@ namespace osu.Game.Online
                 else if (manager?.IsAvailableLocally(modelInfo.NewValue) == true)
                     State.Value = DownloadState.LocallyAvailable;
                 else
-                    attachDownload(manager?.GetExistingDownload(modelInfo.NewValue));
+                    attachDownload(Manager?.GetExistingDownload(modelInfo.NewValue));
             }, true);
 
-            if (manager == null)
+            if (Manager == null)
                 return;
 
-            managerDownloadBegan = manager.DownloadBegan.GetBoundCopy();
+            managerDownloadBegan = Manager.DownloadBegan.GetBoundCopy();
             managerDownloadBegan.BindValueChanged(downloadBegan);
-            managerDownloadFailed = manager.DownloadFailed.GetBoundCopy();
+            managerDownloadFailed = Manager.DownloadFailed.GetBoundCopy();
             managerDownloadFailed.BindValueChanged(downloadFailed);
-            managedUpdated = manager.ItemUpdated.GetBoundCopy();
+            managedUpdated = Manager.ItemUpdated.GetBoundCopy();
             managedUpdated.BindValueChanged(itemUpdated);
-            managerRemoved = manager.ItemRemoved.GetBoundCopy();
+            managerRemoved = Manager.ItemRemoved.GetBoundCopy();
             managerRemoved.BindValueChanged(itemRemoved);
         }
 

From 04d17aadfa4685f54e670b934e17fc3be3cf2b3e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 22:57:55 +0300
Subject: [PATCH 0906/3722] Add overridable method for verifying models in
 database

---
 osu.Game/Online/DownloadTrackingComposite.cs | 42 +++++++++++++++-----
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index 4e52761813..9dd8258e78 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
@@ -65,6 +66,15 @@ namespace osu.Game.Online
             managerRemoved.BindValueChanged(itemRemoved);
         }
 
+        /// <summary>
+        /// Verifies that the given databased model is in a correct state to be considered available.
+        /// </summary>
+        /// <example>
+        /// In the case of multiplayer/playlists, this has to verify that the databased beatmap set with the selected beatmap matches what's online.
+        /// </example>
+        /// <param name="databasedModel">The model in database.</param>
+        protected virtual bool VerifyDatabasedModel([NotNull] TModel databasedModel) => true;
+
         private void downloadBegan(ValueChangedEvent<WeakReference<ArchiveDownloadRequest<TModel>>> weakRequest)
         {
             if (weakRequest.NewValue.TryGetTarget(out var request))
@@ -134,23 +144,35 @@ namespace osu.Game.Online
         private void itemUpdated(ValueChangedEvent<WeakReference<TModel>> weakItem)
         {
             if (weakItem.NewValue.TryGetTarget(out var item))
-                setDownloadStateFromManager(item, DownloadState.LocallyAvailable);
+            {
+                Schedule(() =>
+                {
+                    if (!item.Equals(Model.Value))
+                        return;
+
+                    if (!VerifyDatabasedModel(item))
+                    {
+                        State.Value = DownloadState.NotDownloaded;
+                        return;
+                    }
+
+                    State.Value = DownloadState.LocallyAvailable;
+                });
+            }
         }
 
         private void itemRemoved(ValueChangedEvent<WeakReference<TModel>> weakItem)
         {
             if (weakItem.NewValue.TryGetTarget(out var item))
-                setDownloadStateFromManager(item, DownloadState.NotDownloaded);
+            {
+                Schedule(() =>
+                {
+                    if (item.Equals(Model.Value))
+                        State.Value = DownloadState.NotDownloaded;
+                });
+            }
         }
 
-        private void setDownloadStateFromManager(TModel s, DownloadState state) => Schedule(() =>
-        {
-            if (!s.Equals(Model.Value))
-                return;
-
-            State.Value = state;
-        });
-
         #region Disposal
 
         protected override void Dispose(bool isDisposing)

From 7ad8b167ccb2f73247f2506cace66b22ec333665 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 22:58:29 +0300
Subject: [PATCH 0907/3722] Add overridable method for checking local
 availability of current model

---
 osu.Game/Online/DownloadTrackingComposite.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index 9dd8258e78..1631d9790b 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Online
             {
                 if (modelInfo.NewValue == null)
                     attachDownload(null);
-                else if (manager?.IsAvailableLocally(modelInfo.NewValue) == true)
+                else if (IsModelAvailableLocally())
                     State.Value = DownloadState.LocallyAvailable;
                 else
                     attachDownload(Manager?.GetExistingDownload(modelInfo.NewValue));
@@ -75,6 +75,13 @@ namespace osu.Game.Online
         /// <param name="databasedModel">The model in database.</param>
         protected virtual bool VerifyDatabasedModel([NotNull] TModel databasedModel) => true;
 
+        /// <summary>
+        /// Whether the given model is available in the database.
+        /// By default, this calls <see cref="IModelDownloader{TModel}.IsAvailableLocally"/>,
+        /// but can be overriden to add additional checks for verifying the model in database.
+        /// </summary>
+        protected virtual bool IsModelAvailableLocally() => Manager.IsAvailableLocally(Model.Value);
+
         private void downloadBegan(ValueChangedEvent<WeakReference<ArchiveDownloadRequest<TModel>>> weakRequest)
         {
             if (weakRequest.NewValue.TryGetTarget(out var request))

From da9c23f3478356b9183fecbe82d0d416c039a26d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 23:00:56 +0300
Subject: [PATCH 0908/3722] Add beatmap availability tracker component for
 multiplayer

---
 .../Online/Rooms/MultiplayerBeatmapTracker.cs | 89 +++++++++++++++++++
 1 file changed, 89 insertions(+)
 create mode 100644 osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs

diff --git a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
new file mode 100644
index 0000000000..b22d17f3ef
--- /dev/null
+++ b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.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;
+using System.Linq;
+using osu.Framework.Bindables;
+using osu.Game.Beatmaps;
+
+namespace osu.Game.Online.Rooms
+{
+    public class MultiplayerBeatmapTracker : DownloadTrackingComposite<BeatmapSetInfo, BeatmapManager>
+    {
+        public readonly IBindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
+
+        /// <summary>
+        /// The availability state of the currently selected playlist item.
+        /// </summary>
+        public IBindable<BeatmapAvailability> Availability => availability;
+
+        private readonly Bindable<BeatmapAvailability> availability = new Bindable<BeatmapAvailability>();
+
+        public MultiplayerBeatmapTracker()
+        {
+            State.BindValueChanged(_ => updateAvailability());
+            Progress.BindValueChanged(_ => updateAvailability());
+            updateAvailability();
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            SelectedItem.BindValueChanged(item => Model.Value = item.NewValue?.Beatmap.Value.BeatmapSet, true);
+        }
+
+        protected override bool VerifyDatabasedModel(BeatmapSetInfo databasedSet)
+        {
+            int? beatmapId = SelectedItem.Value.Beatmap.Value.OnlineBeatmapID;
+            string checksum = SelectedItem.Value.Beatmap.Value.MD5Hash;
+
+            BeatmapInfo matchingBeatmap;
+
+            if (databasedSet.Beatmaps == null)
+            {
+                // The given databased beatmap set is not passed in a usable state to check with.
+                // Perform a full query instead, as per https://github.com/ppy/osu/pull/11415.
+                matchingBeatmap = Manager.QueryBeatmap(b => b.OnlineBeatmapID == beatmapId && b.MD5Hash == checksum);
+                return matchingBeatmap != null;
+            }
+
+            matchingBeatmap = databasedSet.Beatmaps.FirstOrDefault(b => b.OnlineBeatmapID == beatmapId && b.MD5Hash == checksum);
+            return matchingBeatmap != null;
+        }
+
+        protected override bool IsModelAvailableLocally()
+        {
+            int? beatmapId = SelectedItem.Value.Beatmap.Value.OnlineBeatmapID;
+            string checksum = SelectedItem.Value.Beatmap.Value.MD5Hash;
+
+            var beatmap = Manager.QueryBeatmap(b => b.OnlineBeatmapID == beatmapId && b.MD5Hash == checksum);
+            return beatmap?.BeatmapSet.DeletePending == false;
+        }
+
+        private void updateAvailability()
+        {
+            switch (State.Value)
+            {
+                case DownloadState.NotDownloaded:
+                    availability.Value = BeatmapAvailability.NotDownloaded();
+                    break;
+
+                case DownloadState.Downloading:
+                    availability.Value = BeatmapAvailability.Downloading(Progress.Value);
+                    break;
+
+                case DownloadState.Importing:
+                    availability.Value = BeatmapAvailability.Importing();
+                    break;
+
+                case DownloadState.LocallyAvailable:
+                    availability.Value = BeatmapAvailability.LocallyAvailable();
+                    break;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(State));
+            }
+        }
+    }
+}

From cf2378103656863879a08b9e2e2704bdffdebd03 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 23:02:30 +0300
Subject: [PATCH 0909/3722] Cache beatmap tracker and bind to selected item in
 `RoomSubScreen`

---
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 2449563c73..c049d4be20 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -40,6 +40,17 @@ namespace osu.Game.Screens.OnlinePlay.Match
 
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
 
+        [Cached]
+        protected readonly MultiplayerBeatmapTracker BeatmapTracker;
+
+        protected RoomSubScreen()
+        {
+            InternalChild = BeatmapTracker = new MultiplayerBeatmapTracker
+            {
+                SelectedItem = { BindTarget = SelectedItem },
+            };
+        }
+
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {

From 96feaa027ded707f31ef18482aa0b632dad5627c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 23:06:54 +0300
Subject: [PATCH 0910/3722] Make `ArchiveModelManager` import method
 overridable (for testing purposes)

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

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 36cc4cce39..8502ab5965 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -308,7 +308,7 @@ namespace osu.Game.Database
         /// <param name="item">The model to be imported.</param>
         /// <param name="archive">An optional archive to use for model population.</param>
         /// <param name="cancellationToken">An optional cancellation token.</param>
-        public async Task<TModel> Import(TModel item, ArchiveReader archive = null, CancellationToken cancellationToken = default) => await Task.Factory.StartNew(async () =>
+        public virtual async Task<TModel> Import(TModel item, ArchiveReader archive = null, CancellationToken cancellationToken = default) => await Task.Factory.StartNew(async () =>
         {
             cancellationToken.ThrowIfCancellationRequested();
 

From 4778686dc4b712e7c93a30661718fd383674fee2 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 23:07:46 +0300
Subject: [PATCH 0911/3722] Expose method for triggering filename-backed
 success in `APIDownloadRequest`

Exactly like in `APIRequest<T>`
---
 osu.Game/Online/API/APIDownloadRequest.cs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/API/APIDownloadRequest.cs b/osu.Game/Online/API/APIDownloadRequest.cs
index 940b9b4803..02c589403c 100644
--- a/osu.Game/Online/API/APIDownloadRequest.cs
+++ b/osu.Game/Online/API/APIDownloadRequest.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 osu.Framework.IO.Network;
 
@@ -28,13 +29,19 @@ namespace osu.Game.Online.API
 
         private void request_Progress(long current, long total) => API.Schedule(() => Progressed?.Invoke(current, total));
 
-        protected APIDownloadRequest()
+        internal void TriggerSuccess(string filename)
         {
-            base.Success += onSuccess;
+            if (this.filename != null)
+                throw new InvalidOperationException("Attempted to trigger success more than once");
+
+            this.filename = filename;
+
+            TriggerSuccess();
         }
 
-        private void onSuccess()
+        internal override void TriggerSuccess()
         {
+            base.TriggerSuccess();
             Success?.Invoke(filename);
         }
 

From 23c7afa573b6d9b8b0f4af49283224e2231394b7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 23:17:05 +0300
Subject: [PATCH 0912/3722] Expose method for setting progress of archive
 download request

---
 osu.Game/Online/API/ArchiveDownloadRequest.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/ArchiveDownloadRequest.cs b/osu.Game/Online/API/ArchiveDownloadRequest.cs
index f1966aeb2b..bb57a7a5f8 100644
--- a/osu.Game/Online/API/ArchiveDownloadRequest.cs
+++ b/osu.Game/Online/API/ArchiveDownloadRequest.cs
@@ -18,7 +18,13 @@ namespace osu.Game.Online.API
         {
             Model = model;
 
-            Progressed += (current, total) => DownloadProgressed?.Invoke(Progress = (float)current / total);
+            Progressed += (current, total) => SetProgress((float)current / total);
+        }
+
+        protected void SetProgress(float progress)
+        {
+            Progress = progress;
+            DownloadProgressed?.Invoke(progress);
         }
     }
 }

From adb2605d5d7ddb30fea80a5f289e28e3c357a8db Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 23:17:47 +0300
Subject: [PATCH 0913/3722] Enforce `double` type in the download progress path

Wasn't sure where to exactly put this, or whether to split it, but it's very small change to worry about, so I guess it's fine being here
---
 osu.Game/Online/API/ArchiveDownloadRequest.cs          |  8 ++++----
 osu.Game/Online/DownloadTrackingComposite.cs           |  2 +-
 .../Overlays/Notifications/ProgressNotification.cs     | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Online/API/ArchiveDownloadRequest.cs b/osu.Game/Online/API/ArchiveDownloadRequest.cs
index bb57a7a5f8..fdb2a984dc 100644
--- a/osu.Game/Online/API/ArchiveDownloadRequest.cs
+++ b/osu.Game/Online/API/ArchiveDownloadRequest.cs
@@ -10,18 +10,18 @@ namespace osu.Game.Online.API
     {
         public readonly TModel Model;
 
-        public float Progress;
+        public double Progress { get; private set; }
 
-        public event Action<float> DownloadProgressed;
+        public event Action<double> DownloadProgressed;
 
         protected ArchiveDownloadRequest(TModel model)
         {
             Model = model;
 
-            Progressed += (current, total) => SetProgress((float)current / total);
+            Progressed += (current, total) => SetProgress((double)current / total);
         }
 
-        protected void SetProgress(float progress)
+        protected void SetProgress(double progress)
         {
             Progress = progress;
             DownloadProgressed?.Invoke(progress);
diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index 1631d9790b..b72cf38369 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -144,7 +144,7 @@ namespace osu.Game.Online
 
         private void onRequestSuccess(string _) => Schedule(() => State.Value = DownloadState.Importing);
 
-        private void onRequestProgress(float progress) => Schedule(() => Progress.Value = progress);
+        private void onRequestProgress(double progress) => Schedule(() => Progress.Value = progress);
 
         private void onRequestFailure(Exception e) => Schedule(() => attachDownload(null));
 
diff --git a/osu.Game/Overlays/Notifications/ProgressNotification.cs b/osu.Game/Overlays/Notifications/ProgressNotification.cs
index 3105ecd742..e18bab8e83 100644
--- a/osu.Game/Overlays/Notifications/ProgressNotification.cs
+++ b/osu.Game/Overlays/Notifications/ProgressNotification.cs
@@ -23,9 +23,9 @@ namespace osu.Game.Overlays.Notifications
 
         public string CompletionText { get; set; } = "Task has completed!";
 
-        private float progress;
+        private double progress;
 
-        public float Progress
+        public double Progress
         {
             get => progress;
             set
@@ -185,9 +185,9 @@ namespace osu.Game.Overlays.Notifications
             private Color4 colourActive;
             private Color4 colourInactive;
 
-            private float progress;
+            private double progress;
 
-            public float Progress
+            public double Progress
             {
                 get => progress;
                 set
@@ -195,7 +195,7 @@ namespace osu.Game.Overlays.Notifications
                     if (progress == value) return;
 
                     progress = value;
-                    box.ResizeTo(new Vector2(progress, 1), 100, Easing.OutQuad);
+                    box.ResizeTo(new Vector2((float)progress, 1), 100, Easing.OutQuad);
                 }
             }
 

From f0602243bfa792f3880e9d083f1ddc67431a29cf Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 23:30:01 +0300
Subject: [PATCH 0914/3722] Add beatmapset file containing the eaxct beatmap in
 `TestBeatmap` solely

---
 .../Resources/Archives/test-beatmap.osz          | Bin 0 -> 7286 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 osu.Game.Tests/Resources/Archives/test-beatmap.osz

diff --git a/osu.Game.Tests/Resources/Archives/test-beatmap.osz b/osu.Game.Tests/Resources/Archives/test-beatmap.osz
new file mode 100644
index 0000000000000000000000000000000000000000..f98fd2f8ffef0968270a1f2c7d75162de80417c9
GIT binary patch
literal 7286
zcma)BRa6vEy9JRFrMo+%k?uwux?|{W36WAjVu%48V(9MfMi2(1bCB+C7(hBM|GH22
z;a}^X?_r<)?fvbCv(DS60YG_8h=hcMf%K5attHDLX3|4}gk)-mgv9pJ1$?ozpjCJA
zq~)Yl^`%vD^R}U7)u*+mb)fa4wPB+*{%GN0ZNlZ|`6UME6i3;d^vEUsoGWD;yuxeN
zrxX}n;Y@i%il;aKu13ZjT<E=YI0@z<7dcdTzLD6C*X^sKFINiIPO+>%i0_E=9A`R2
z49_mB7vFE56!#aae;sc(YxI9S_*dTbh`9M2(ANHZf2iN}e22L7@$b05DF(q@HD1)O
z>iuTw{ee&0m-`W7Gle&If1BgXXtJavp9s3TxmQ-d-30``l;qKh)YB!HV*D%3_f`qX
zj946+?=W@Oo<sdrsqf-L)oyX)<Nd`nG|$)SIBr?7U%LVz?ST^C#J}I3d5KGQ1bz>=
zJMQmqFOCCc67N5qAwvCePmcG8FP34T&HI;7HJoSZ`xxKHgHgoE?eYFBJh{IZhP`>a
z3E$tmhd)zo<3xQ6^b>x%-rOuk_^#4qpGvMstUhLrj$ik~uDgz1X#ypnQqLFbm%%-1
zUjv^n!6Y<KkB4zz+ob~U_*O^*g;t-5H-ig6T_@jHGQG#eE+4Bm;mPn#*t!@Po#5i;
z-#!d+cHg}Et8e(^39)_lxCy%$e+d?jQ2&}OWo6Lr=6-s!?RyQn-vsRzD|Mh9et8}~
zx!BxYmI}PN1;KH~r6@02Cb!kya0F2~M!eA3gVPs`D`Vc?9PbxrtI>3>NIi$s1zw*V
z!<YBhrB1TqK*)UAS(4@mVKbke?7%|mrEw~3YS`n$?LOiJHa>+4xP79I{&y*nrk;JO
z-d`Nj>F(O`m<$J*ZGmq82HyO;IeS2@e%zrjJYH^pc_st{^YGEPD4FB@cQOcd3DTIZ
zf4JL!gjPq=YTAF@AKx@+x3B&Rwtd{hJh(=frAbY;uRbm=?{_ZSdw2PNz1{}2Pv-4z
z!fPMTt~*+Xqn;Gd(E56ee))@UuSf2U^{4Y3Ew3CQ(8KHcg)=;0PiBo;+nu^MQY*77
z)7K`gQjGaVUDre5GpBMNM|VL5>Er5>B|DF}+*wkI_eMC$D4(@Mx+uG+VWRMWu%-}~
zE-RkW$Jp-uE3qH0ICAK4G9|4{cgAIEkY=d_cD}AZ<)6?iVX*SCJ882)tOmI=sW|zF
zqlpXu%FH{MkCgAK*6Vg40zqW(c2TdpPy_Pra~3SerGnyN+B`gW9#+1VF43XZG|#~5
zk}mP1$)%KMzipo3Jx#g<{gZ${W8uQ)$CNAYxUIC!wcqKRXYc>)2#f2qiC|afyT-!g
zh|)ICm>Xtci@Cq3SMIL-e1u+z*s3WG4rr3PpXY^GksiC>yr|S=i_}V=Gye^E!}su9
z>?F*ej@=m-4db#(`?6At3scA6ZG4)!%J%cl^5dRuv)ePe=Abg|vO2KepA&s0+dnrs
zRqI{pzY`0M{gq#6b@n1tb5bR|I4|t?NhOR#^{Q3Jk6ujvE`H&0(AaG!_=j%|Ue0Fe
zS%??^<HF?#4JXz8Y|$>##1sN);Sz{sBq}MLo<$%H=*O~$d!pFy-ypmA#UgQ1sRt3)
zR?L5AN%!pAsrXg<w~Odpnfor4+r0du-r~+sFYrST9Fy1=y;3?FTWAF}Yyv}o*WqFQ
z5-Hh5=8(eVv7ANzyC8k*I@(1A2sZ%>39xMkhlhtHsdT<csoN}nz&}^@JeC_L4%nOj
z5hr1MR%?eP`Og_Sw#y1j<^?^MYf*(eV>w?h*N2(=HQ}m^6WdE3BVI4ohpoL(;5f0Y
z5H!@419RB`zpa+h%Sw6gPy9p-Q!WMI{|Mez%13|VOSFsts`rr?S5BB7!?-5J>UD>R
zkJ0;vR!53Ob1^El6seX%e0{FgQOg5_?GQF^2JQbUXh}G!l-b27Usv$%X9;LET=~Sm
z<nX<8o9to+uPS(3vjmuD>;G)|&7?pX`*@mp%x5@l9c7?ilN&|QFc+Nfj)rqrxWzBm
zaV`Jf=h0B*A2#Cu5?%*klW5)VOMG8v>v_luE5^9+CngmfIW;t&<B6H(?f|4PN`K}*
z*0s+=%5{HLQMJE{4|Fb8Z*Z-2o2n~_-jN&(o!*C^i}f(F<)?R&aLx#R<E}sl%$|f8
zEc&Vwpl(5-s}SOH6;E+{_hW+}(CJtvMNUNb5-32seSB@<Fa$bhN|T><L)-lJI7tp*
zUria`1XUX1%x(4nZ1G$xw>5hVUg}jv;&=dt8EnWs_9`-5H&7fV0f9Wt9GpIm4u9^J
zrfNlAej9dYmzAfzLoSkoVcp&Z9N14jIaRNyM=pA5xDnDCcWTHG4<1W9V16^eDdF@w
z=&;h^$T0tRjIMP&l$ynQ<PGXu?cpA^<)ykBcp1(}EnA}|7FLsXHd9fF5izm&#i5@?
zx3?pkeST(k+WsV}UqhfE{2v;Ug<0XSF5n7XJ37^v_(@uw+k{x&wiIwK(KzyhYx2)S
zmW_P&YCX8y@1P!>Rycg9A9#O-ctRW!I2o);e!oL#o??qp(SjBk;O~WEmKywfVEl>c
z#6rF(Yk+zU4k44))TQsFTeqv3S<erf&y-RhQ%A_LCr|rwanU-&HpfFEPu?DVHBVS^
z+Pyk?dy9Ple)dUv#{60bB0K6k+<R0=i1J6Nte<#Kw%+~$xZKSc819Acbh~BFLvlkU
zPpqF1Xh&)4JVxwc&(O6{zH>N<5^K-h8PT(vmHP$Vr8!J+@N+Eivpe0z+^bnL`Pw0>
z2F;d@R!L$=YTy~SyV^EraI^2~h`(ycRrz=#50Ons%yyMtk9B~w<?byfEbX@I1O}os
z+=uA8dm8*iB8X&};x>&PCU0&|vGd^Aq}&{wA+Kl>sS&|>JEoRJ_kC&rY)Ms$ZH$7?
z**%RZS2eHN0Ti&T;!V~HSn?Yy4Kos-kp)@madT#s4xljQr5K+Jr>+87iAGbh_b!kc
zeTu^vfoAU;ZqmXSYd)7HwIp(2WN_QMYGX&lUT>c}3346gC>huvW`KJJC>~q=exK9j
z>$raOW8+mFuaQWb^x+`HMG5*BLFDqDUeVhA^~OR}5V9aS7{k8MIt!Jb^AKbY#d?oj
zGuHy&a~qc_U|m+N7dw%&Y22br-t6g(2*hRaZ4Ju69E;!qN6+Vky9?%-I^f$tn)`-E
z<wrDnRl4mou$pb(d^f6)kN*jXEK##gYWxYog5@XtPS7@TNQ~xt<CU2i5yETfH6IzO
z8YwIl;8YcP?<-C2q+rK{@_y*=lq!U@yhthgr@+DumUi<nlO5|uRN9c-#I7p<pwJ_}
z<q?3GhSaX1qR~<z6bG${%N-egZJ3jE2gWY)DL>o*$F38G^SOn*{yN0s6@lS1@L^s{
z1bFLXbP~!+P!g}JT5b%xU84xj8FWf-$5QX14@)@mmMMh7MIAnjV+!P2{s#@}>^(Nu
z(^TO=_ap{lS~c$;eW?NzGJwFQ?%syI$VO*D$slLtq<qB6$IiyH9IFJ*yDPNK!ZyH&
zplcfsPfYX&fM2cfgeFF0ipr^<h&P&YRUEm=LOQSaxIO`QkgES<uF8Y@+@ej!+P4--
zi8hHjq(Z%f{e}W4>PMYS+9;0d%pR;0bo)?KF_^RP+qDmha-?EwPh=MRxXnbUC}H7q
zXtD_tq1S2{$5$$QN=x3l{&YBR$JGX+XOeQLvE7xZsz{Sz4Vp!0uRJda!HooHD8fCo
z0x}a`g^4F^iLu<>I4&^_{O`U9FS4oyc8aowsbgeE1iBj!R|X-AHzPNKu~H^Oo8CAX
zDqNzyqamfJ#=@q1UAQHoG;g-R#{64C!%Dd7+ln<mFd~RXb2K!PI#_5%k%crvlBYG^
z&I{Q18auq5-*0S@QbQ5vbiv>^FV93TCSu5`l88fwb9Aqf6l4lwxKrtvFP$vz6oHMM
zHzbu8daGH)(2~YUY#Iiv2z$!;#)j*WFr@#*uD5)(V4Hl1p<nZWL3@UoOTEr_>E2iB
zt(IejY^<SxfigML-9P9cLPl3m&KOe4<C5h3g)W)k;J4}=zR{aAv}9v06fY0Oj>`S|
zJ+hzt>K`v+<VA$r5gVIyHwamM>LwN~iuG(>sl1KGj^2r>$$90zz9c2o{?{MsY@Mjd
zY9#!}Q<BUldp~S?dKhnJm~uuWkv$*D#YoFFK|<RJ4P`|-f(hcK?nUXB-q1Fi?v^xo
z<$S-otlN@XAg2pvrC_?}o_O!E(Y(sE^$V*$dH0;b#1_AVWVn!ccw097oXc9OYsUW)
zT%XUPlUU&-hgx#f%jfev1m!;(z%~ftS3=s5e$57qEC*GR;cpGH(x&)k%&nV`5HZmA
zD*dJi?KDe+5Ht&NAPG?7dL5e!*=0*-8kmeiUYS1O#^<2D&h*GdrW*zwp?A6t2jv(U
zB+A?;A#39Cr`zt0vTkkeprqRRK<m)DfHAB-)+rML7b+3^W0G`{7wPQluLq9M=lwLm
z^KdsMARboc3jfCq)`#TgDr^$m09Pxp5h-Ibil*ad+d8~(Q;8jm+SKm`!COayFh4-n
z8=iPcgG0cU%!gJVPA_yfQt}e&marSI6zRuGBy6!!Q)oXI-@}8r)CB=9lN_Jy*$0vd
zj@^+ce^RcWQtrUm`pIMN?*47u1{j}(W;ojUH3~gpmN?z>*Im*zF`y!nXMj_Tf;q{O
z{K~I%|6*3dcOt>;R^)|g_@JW;u(53E@T7qx1imsrTEXOx5j;g{R}n5B@+!Q4im_3E
zT4`xSg>E$X&pSQ(7*AVlfnz+wDio1=(F9W1w^s5x;c|JGT2qyh$PLB>(swGFx=coY
zFiBb!r)Xtjv<6He5b7kKpz@#L^}Y*9orn0>0qoU0pCW|Jc8QSCJ`#lz@n@vDo6~2!
zb)lpEg-_s9N@r5E7SG|aMbPLEaMWMw31`L>Lx&tL^~m_U5DE&qq=UMR<ctFtn$6z_
zt$hE)=?eJN;;<noeVw>`A9<u8q_~B*-2htO8y)<k)~bYH(Vy=7T$a<?IY#rbTlB_?
z>*l>s>k-X|$~9QcPz+{FE2Raq#U7v4;C0K8cBuUxgd>Wu>C+HaHP6lAH`Uyu01tL5
zYi0$M!TW}POj+9TO(#~W>!cPXy@Lnrk<|lWA6$wtY6yB|E&XS6$m=)qh}n9xS61d%
zL&0!{iE3$?Y91^vK*rGA+3JrCT(Fhua>T_qnI`s!0vqJ~ymZwnb_}+THyqJV-4O@9
zQ1+|^+pBP$rlhwanp&g!ayveM+*P?kOHk^H(83r>C2WOtV`uj$H~ZOtSi=xpD>A=A
z`<h8Jz@u6UYvxy69u<uvy;*Os-`#~v(&yS7TSva%L($&0#?(36kd*+!iMe%r9M6RC
z*LWbM^q<e}Lu!WfzX;n-q&NyWaXbzi;#hT@V(GEoO`p|YM&fen5@IV2z2-Li!QB|g
z&ey}cW>;$IW*~B@j1gvCgf+!j2?A$LH^mS88)iH52uZ7_M0sg4eux(!kau|ep={G@
zmFVEJ+WHQ=Ws#UUiKOjscjduvTmh3WSrXm2JM<w=jCqW}Qo4802<b_3aPvmw$nOSZ
zJdOPjU55mgIzQYZCS7qz;j2{4q(&e5XhWz6v@C+2VnE#{dTuP<fjc#)%qNeoTB{Su
zl(OolygV(NK7)Rw3+_!&(R?$yDkoOT_j+aA$x=)|O(MC1LR@I_@ImUVt4(u;b8u!^
zH~u6FyF<A>ef*eXM+pF}tuM<S$+1K8uQ;A;2+^!j6~_bQ3%fr1b#;wv#k!W|-<;^9
zpLCMs?3CPdf44>VY6eL}O4~m@zZt;7+8mD!;w!Dx96xn~D1xug&xoDmCAJrJ6)5oP
zo!XTtCKJO3HHh38qs#>j@c;|DLt6r#)=L8CghkqSf44LfH<*zVR(4{AWyx$p#D0iO
zB$TF!@*&omTXBW}mxbgbkeEvf`|=cqqO+AZ6>8}tX&QPuB)WJ?X+<Ky51dQ^Av5oG
zB1CC3RQf0*Thr=kYE=TyO>74z+M~1~e}pkiApwpZQzd9I5qV_?es=hPR7{ASDxLDa
zDUz!Ky>f7YrL>W{&9MRj+W}e}KP%f|j*D$PFan)%X>2|uX7<K?{);BBGBh%sUMOVZ
z=%^|6&Y8bWhDkT(9akhhLDgQAN}AJ}37>NEQX6GkhO!DVCR4{9;BCW@vjJ4CZqho_
zQbQFpbyE1lr@A9Jhag$ueyTumVt`B(g_i<?s%`932JHxN+9=7DL<J1mc8~O8=XH+=
zSnA1PcO0zED1-nR6(3byBd0VMz4|ysj`@U)55gXERpb9|;Zt?BD<*9_2G3Ob@&D=0
z(AGbSSL6Q*oL)B*Qbw-!_&7z>%+DD4QDzjm6!tkq#c~7FGyKDPs0Y(z2bUH%6r65k
zKU}l{Wo$Q3O5cv*4=!bH-BOZq^d1EC3R9Hs>G)WVa?SHfrs?gVFxjT?eAz+apkox>
zuTHK3Y*e;H6?Jp-(hb9^F_`Ch?F3stF=zSCeL0aETf7}<EO620<t4#K1pT3wof*GH
z(nhF=xGnPsjFN$UDoZ1nUCPLHLH0ws%3kS_MI|#Fy_OjGmt=3syp#mRjJW-O&qPjd
zqqG#N6Bj`aTEttOGfJ8J71X)cqOJA8;<@zcq0T(q=4JB5jYreQaMk$7N!JSt^LbwJ
zYwO&&cAP|$ZdxrJ0}1wfT<-L}avMGXUoKbs;KCeRdJ9txX{#5rW&|FTosMFf&kCpG
z7>(mwif2t;1L5);ZyGL!HC8{A@16vq16+H)leRi|-wiH!j#3J<o6uK2$sFeq=FEht
zDAJQn^Y}B_otFeX9cadgDdAmQ=yhRTtDeXSmhuOcW|D6@KU{tzV<(_)gwOPFA%83Z
zT)EcxURd!q^C6!{5e^-gzbXpd_CQjbSgnbN*shTysl~bcQxv76Yc3G7@lT+vD`}3A
z=?kUqG%uWe?4!G=^!Ulz^`&fXILKad!)w`|PPeW%MpuVSXzN?Ym;9})#Fclx3~tK<
zlYG$Mn4uPf7e$Ct$<tYr_}{msbZ&FMe70|<e+nJVxKyC+2Ak*UO`l&5MX`^H<yx&=
zXMJTZ^U1#%=bey4U7k<UXtafvu)WFv8o5m;CG(QDWAY?YNyNW?%hlD-ngUi}b%l$B
zQf{<>qCD|_(;i+=72m|m-9`qlbDh@m)cbu>B4G0&^zdY!jBzF!nX_6bZ^-Bo`C1|?
zlAP+f#lmeQfR7L0EcM8b9q~3^yQ*<vbvikG6f0cWwq#Z(cZ#LNrB8pG^;6fhfJvU#
zi+Sas<*i_zwHi75+>kJHO(UBiFVv(`kJwo4Z)~|hys})&{=dsUr1NXWsJaw9D&KEb
zH-0_|=4-2>ICy-fJJigAVEb^w2<hQu$-bf9li^v`D2@UbRGS+gD}pBls<m#HT{;ax
z^7iVMl+-%6ueD^9r^ChXqw14geruMTN3l9H`KVnLYoAQytQP+frg3*)`cb*$^VtgP
zOhmV-;NDTaO?4@}1TS(g=^ybK0Sy!2gF>B<?ATAsS-BMk-$ET$=2JL%AGD5Z!4{Vy
zK(kFUypJ*cw{Xt;w_=e~G*M&dz7uX}wRPzdz`-B`SW$+IklL>SW_uAu4GUoQ1v?*s
zq6<r<N^xbz-&8ApYM-<8{Y*wAN&rz_stTS#y@#8i(w22Tv7bI(n!g_VP;Jsst8i8{
z?vLJ)LYN<DQ8a9`>H`}a`fSNq+eWvn!cQKT=9M9sgV}6C%OC(vL_A=BNtNw$(rGkd
z()vlm@!efXjzyl>%GTYD0n2VuX@w_T_rTbiuZiCgzey$pLj;B%8ifXNA?1)#?&&Di
zWFnhOj>|}VnyG6GeS!seROA~~?5>f}={<bg(mPXukCWItOe~_PvV}xy%zA+sKO|v^
zTqMmS+EzLTI&`X}P>3oLFhv+Yvd5K0A!!O9kT^@>F6jGJN4Ik9)Rey8;p_Lfu+sfE
z2e4$5OPO1sl7r!bwcX+%X&BTn!z?won6_&2Hg0s<+qB58lEz3SXAujcKnve1n9BtT
z+i6Z;##pSG7U`7aW)e8$EBx>0-GtSdZx6QIU6Guo`Ofwb?ePoSxz{<(6TXc|JY4=M
z1_<)dId^!cVFR6I1T3JFZ3jXoqcQu4%@8#$N#8T%ah^cwF`tYBBfN`ax$_dqJ`kEU
z$LH2j@g=-s1Rhnop2ye4BxE$EH-|=YZe5fw7G#dzUrf^J7MO?^0Gm~H8!cUw!I7_?
ztU{=Bwee&*i-uNrLyYWL66&UJi@Io5Av!>|UlTuYd3BXUAvaVH%+fzAjRP!op#mJp
z?^#e=*?DAYSlZJY)$OL=#`li<yIKp~1CyLfzi^Bwm#Kw1syq`F<YPrAl)X7ZawD4Z
zfvCtUQ}q<MNW{Cy=zzA~lZ?eG+EKSqs{UkOPsGvPXh4?TOT2*mX=JCt@OBU_6%{<t
zlGKB79(q?12#}GU%gLtee9Ve=0J*nVy>qh|uPEX19n6Nc_Tq`hCR`JOe8uEm$p))r
zOiZ%s<X`GEEhVYX6YAqgjp#tzdAL3~j`GmM9BOoY<Cqr8?n=+FxGnfD2A96wo{#zr
zIf@VOe0noe-49X7b5ql<OeCz<iC^R45n41yv0x*ZXB*vJH=N@~0We~)h?>OJYLyVW
z8B*zN3yP>!Wq6v5RGCQ94qQU3PdPqHi-?UiwPL)#lTxi-pp7z-Oek~AaJ@hV>LFLD
zR3Ft1`OEG4vBcks{~80Pn>xj-R0k|u-7N+E<@>d?^N_dy&Uaj}V{ET>72^)mwj*&=
z&-hKo)^CGb>WOpfU}(R-7!&%5juJl49LWiVO^L3qE?+jYoY3&EeQ#}$>WU;trIOyI
zfg@I4%xa3+9BT3bSioc+hg_={&C*c?Q%f?e`rJHhT(DbiqJH@)+2(M*Ga%01#DCn=
zgott7Nn|ky^RL(S7b7hTk?G1Zf=8p>ee9D3FTlE1Ct6-l06C+B-jt_}^V09B)DzO-
zS$VG_Ms8vAEbg45!@7|3jS9_4f^Y5vy0K2}(VUH(kE4X+odFN_wIV^Fl$$lj1jfu=
zfcWPbATyV4?$7)40_kDS#$-Es{l(LWlb|3l?oR$ynlxO}805uGOtL8kFJ;W<YrCV5
zbiYiUFzu7@M4&EEC>56EGyrTokh8*F&{bI2>klcg4X*6#E1#mI10X0+_3?otJyOxY
zU-a3NU4rck(D|6ZlT5d-Wq+L9_<D;CIjW{EmyX@oa;WZxATNy1_Jwcm$PX6Tj_IUj
z^1|@OFNb5ZyH)f>9M+p2>$tLA*vx{AZm?Lk^lqoLEoi>1)b(qd!LTmV{}ISOMd=HL
zNP^L=?uscIm7MtqAlMqPEv1~iuR<~dK-8M!FV`I!YSqJ_%&48u2(ox3qxR})tL4go
zA!SKXZOJnJ=e=iS4FK{hLZtt`3VhiH{_hF?5B$FugBk!-wEqkszm)z9Vp9Hx{SV^2
BJ!=2}

literal 0
HcmV?d00001


From 80f7db8db364dc4903bf2ec4888b1269e82cde3a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 23:31:15 +0300
Subject: [PATCH 0915/3722] Add test coverage for the new multiplayer beatmap
 tracker

---
 .../TestSceneMultiplayerBeatmapTracker.cs     | 178 ++++++++++++++++++
 1 file changed, 178 insertions(+)
 create mode 100644 osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs

diff --git a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
new file mode 100644
index 0000000000..839d47afc2
--- /dev/null
+++ b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
@@ -0,0 +1,178 @@
+// Copyright (c) ppy 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.Threading;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Bindables;
+using osu.Framework.Platform;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Database;
+using osu.Game.IO.Archives;
+using osu.Game.Online.API;
+using osu.Game.Online.Rooms;
+using osu.Game.Rulesets;
+using osu.Game.Tests.Beatmaps;
+using osu.Game.Tests.Resources;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Tests.Online
+{
+    [HeadlessTest]
+    public class TestSceneMultiplayerBeatmapTracker : OsuTestScene
+    {
+        private RulesetStore rulesets;
+        private TestBeatmapManager beatmaps;
+
+        private string testBeatmapFile;
+        private BeatmapInfo testBeatmapInfo;
+        private BeatmapSetInfo testBeatmapSet;
+
+        private readonly Bindable<PlaylistItem> selectedItem = new Bindable<PlaylistItem>();
+        private MultiplayerBeatmapTracker tracker;
+
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio, GameHost host)
+        {
+            Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
+            Dependencies.CacheAs<BeatmapManager>(beatmaps = new TestBeatmapManager(LocalStorage, ContextFactory, rulesets, API, audio, host, Beatmap.Default));
+        }
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            testBeatmapFile = getTestBeatmapOsz();
+
+            testBeatmapInfo = new TestBeatmap(Ruleset.Value).BeatmapInfo;
+            testBeatmapSet = testBeatmapInfo.BeatmapSet;
+
+            var existing = beatmaps.QueryBeatmapSet(s => s.OnlineBeatmapSetID == testBeatmapSet.OnlineBeatmapSetID);
+            if (existing != null)
+                beatmaps.Delete(existing);
+
+            selectedItem.Value = new PlaylistItem
+            {
+                Beatmap = { Value = testBeatmapInfo },
+                Ruleset = { Value = testBeatmapInfo.Ruleset },
+            };
+
+            Child = tracker = new MultiplayerBeatmapTracker
+            {
+                SelectedItem = { BindTarget = selectedItem, }
+            };
+        });
+
+        [Test]
+        public void TestBeatmapDownloadingFlow()
+        {
+            AddAssert("ensure beatmap unavailable", () => !beatmaps.IsAvailableLocally(testBeatmapSet));
+            addAvailabilityCheckStep("state not downloaded", BeatmapAvailability.NotDownloaded);
+
+            AddStep("start downloading", () => beatmaps.Download(testBeatmapSet));
+            addAvailabilityCheckStep("state downloading 0%", () => BeatmapAvailability.Downloading(0.0));
+
+            AddStep("set progress 40%", () => ((TestDownloadRequest)beatmaps.GetExistingDownload(testBeatmapSet)).SetProgress(0.4));
+            addAvailabilityCheckStep("state downloading 40%", () => BeatmapAvailability.Downloading(0.4));
+
+            AddStep("finish download", () => ((TestDownloadRequest)beatmaps.GetExistingDownload(testBeatmapSet)).TriggerSuccess(testBeatmapFile));
+            addAvailabilityCheckStep("state importing", BeatmapAvailability.Importing);
+
+            AddStep("allow importing", () => beatmaps.AllowImport.Set());
+            AddUntilStep("wait for import", () => beatmaps.IsAvailableLocally(testBeatmapSet));
+            addAvailabilityCheckStep("state locally available", BeatmapAvailability.LocallyAvailable);
+        }
+
+        [Test]
+        public void TestTrackerRespectsSoftDeleting()
+        {
+            AddStep("allow importing", () => beatmaps.AllowImport.Set());
+            AddStep("import beatmap", () => beatmaps.Import(testBeatmapSet).Wait());
+            addAvailabilityCheckStep("state locally available", BeatmapAvailability.LocallyAvailable);
+
+            AddStep("delete beatmap", () => beatmaps.Delete(testBeatmapSet));
+            addAvailabilityCheckStep("state not downloaded", BeatmapAvailability.NotDownloaded);
+
+            AddStep("undelete beatmap", () => beatmaps.Undelete(testBeatmapSet));
+            addAvailabilityCheckStep("state locally available", BeatmapAvailability.LocallyAvailable);
+        }
+
+        [Test]
+        public void TestTrackerRespectsChecksum()
+        {
+            AddStep("allow importing", () => beatmaps.AllowImport.Set());
+
+            BeatmapInfo wrongBeatmap = null;
+
+            AddStep("import wrong checksum beatmap", () =>
+            {
+                wrongBeatmap = new TestBeatmap(Ruleset.Value).BeatmapInfo;
+                wrongBeatmap.MD5Hash = "1337";
+
+                beatmaps.Import(wrongBeatmap.BeatmapSet).Wait();
+            });
+            AddAssert("wrong beatmap available", () => beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == wrongBeatmap.OnlineBeatmapID) != null);
+            addAvailabilityCheckStep("state still not downloaded", BeatmapAvailability.NotDownloaded);
+
+            AddStep("recreate tracker", () => Child = tracker = new MultiplayerBeatmapTracker
+            {
+                SelectedItem = { BindTarget = selectedItem }
+            });
+            addAvailabilityCheckStep("state not downloaded as well", BeatmapAvailability.NotDownloaded);
+        }
+
+        private void addAvailabilityCheckStep(string description, Func<BeatmapAvailability> expected)
+        {
+            AddAssert(description, () => tracker.Availability.Value.Equals(expected.Invoke()));
+        }
+
+        private string getTestBeatmapOsz()
+        {
+            var filename = Path.GetTempFileName() + ".osz";
+
+            using (var stream = TestResources.OpenResource("Archives/test-beatmap.osz"))
+            using (var file = File.Create(filename))
+                stream.CopyTo(file);
+
+            return filename;
+        }
+
+        private class TestBeatmapManager : BeatmapManager
+        {
+            public readonly ManualResetEventSlim AllowImport = new ManualResetEventSlim();
+
+            protected override ArchiveDownloadRequest<BeatmapSetInfo> CreateDownloadRequest(BeatmapSetInfo set, bool minimiseDownloadSize)
+                => new TestDownloadRequest(set);
+
+            public TestBeatmapManager(Storage storage, IDatabaseContextFactory contextFactory, RulesetStore rulesets, IAPIProvider api, [NotNull] AudioManager audioManager, GameHost host = null, WorkingBeatmap defaultBeatmap = null, bool performOnlineLookups = false)
+                : base(storage, contextFactory, rulesets, api, audioManager, host, defaultBeatmap, performOnlineLookups)
+            {
+            }
+
+            public override async Task<BeatmapSetInfo> Import(BeatmapSetInfo item, ArchiveReader archive = null, CancellationToken cancellationToken = default)
+            {
+                while (!AllowImport.IsSet)
+                    await Task.Delay(10, cancellationToken);
+
+                return await base.Import(item, archive, cancellationToken);
+            }
+        }
+
+        private class TestDownloadRequest : ArchiveDownloadRequest<BeatmapSetInfo>
+        {
+            public new void SetProgress(double progress) => base.SetProgress(progress);
+
+            public TestDownloadRequest(BeatmapSetInfo model)
+                : base(model)
+            {
+            }
+
+            protected override string Target => null;
+        }
+    }
+}

From 59ae50b0e58d1ff813498093b39c60c73b3e790f Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 23:02:30 +0300
Subject: [PATCH 0916/3722] Clean up ready button logic into using
 `MultiplayerBeatmapTracker`

---
 .../OnlinePlay/Components/ReadyButton.cs      | 62 +++----------------
 .../OnlinePlay/Match/Components/Footer.cs     |  4 --
 .../Match/MultiplayerMatchFooter.cs           |  5 --
 .../Match/MultiplayerReadyButton.cs           |  3 -
 .../Multiplayer/MultiplayerMatchSubScreen.cs  |  5 +-
 .../Playlists/PlaylistsReadyButton.cs         |  6 +-
 .../Playlists/PlaylistsRoomSubScreen.cs       |  5 +-
 7 files changed, 16 insertions(+), 74 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs b/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
index 64ddba669d..d4e34b5331 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
@@ -1,77 +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;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Game.Beatmaps;
-using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Online;
 using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.OnlinePlay.Components
 {
     public abstract class ReadyButton : TriangleButton
     {
-        public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
-
         public new readonly BindableBool Enabled = new BindableBool();
 
-        [Resolved]
-        protected IBindable<WorkingBeatmap> GameBeatmap { get; private set; }
-
-        [Resolved]
-        private BeatmapManager beatmaps { get; set; }
-
-        private bool hasBeatmap;
-
-        private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
-        private IBindable<WeakReference<BeatmapSetInfo>> managerRemoved;
+        private IBindable<BeatmapAvailability> availability;
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(MultiplayerBeatmapTracker beatmapTracker)
         {
-            managerUpdated = beatmaps.ItemUpdated.GetBoundCopy();
-            managerUpdated.BindValueChanged(beatmapUpdated);
-            managerRemoved = beatmaps.ItemRemoved.GetBoundCopy();
-            managerRemoved.BindValueChanged(beatmapRemoved);
+            availability = beatmapTracker.Availability.GetBoundCopy();
 
-            SelectedItem.BindValueChanged(item => updateSelectedItem(item.NewValue), true);
+            availability.BindValueChanged(_ => updateState());
+            Enabled.BindValueChanged(_ => updateState(), true);
         }
 
-        private void updateSelectedItem(PlaylistItem _) => Scheduler.AddOnce(updateBeatmapState);
-        private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> _) => Scheduler.AddOnce(updateBeatmapState);
-        private void beatmapRemoved(ValueChangedEvent<WeakReference<BeatmapSetInfo>> _) => Scheduler.AddOnce(updateBeatmapState);
-
-        private void updateBeatmapState()
-        {
-            int? beatmapId = SelectedItem.Value?.Beatmap.Value?.OnlineBeatmapID;
-            string checksum = SelectedItem.Value?.Beatmap.Value?.MD5Hash;
-
-            if (beatmapId == null || checksum == null)
-                return;
-
-            var databasedBeatmap = beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == beatmapId && b.MD5Hash == checksum);
-
-            hasBeatmap = databasedBeatmap?.BeatmapSet?.DeletePending == false;
-        }
-
-        protected override void Update()
-        {
-            base.Update();
-
-            updateEnabledState();
-        }
-
-        private void updateEnabledState()
-        {
-            if (GameBeatmap.Value == null || SelectedItem.Value == null)
-            {
-                base.Enabled.Value = false;
-                return;
-            }
-
-            base.Enabled.Value = hasBeatmap && Enabled.Value;
-        }
+        private void updateState() => base.Enabled.Value = availability.Value.State == DownloadState.LocallyAvailable && Enabled.Value;
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/Footer.cs b/osu.Game/Screens/OnlinePlay/Match/Components/Footer.cs
index 5c27d78d50..e91c46beed 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/Footer.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/Footer.cs
@@ -3,13 +3,11 @@
 
 using System;
 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.Graphics;
-using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Playlists;
 using osuTK;
 
@@ -20,7 +18,6 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
         public const float HEIGHT = 50;
 
         public Action OnStart;
-        public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
 
         private readonly Drawable background;
 
@@ -37,7 +34,6 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     Size = new Vector2(600, 50),
-                    SelectedItem = { BindTarget = SelectedItem },
                     Action = () => OnStart?.Invoke()
                 }
             };
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
index bbf861fac3..fdc1ae9d3c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
@@ -3,13 +3,11 @@
 
 using System;
 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.Graphics;
-using osu.Game.Online.Rooms;
 using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
@@ -18,8 +16,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
     {
         public const float HEIGHT = 50;
 
-        public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
-
         public Action OnReadyClick
         {
             set => readyButton.OnReadyClick = value;
@@ -41,7 +37,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     Size = new Vector2(600, 50),
-                    SelectedItem = { BindTarget = SelectedItem }
                 }
             };
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
index 04030cdbfd..389a2380fa 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -13,7 +13,6 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
 using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Components;
 using osuTK;
 
@@ -21,8 +20,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 {
     public class MultiplayerReadyButton : MultiplayerRoomComposite
     {
-        public Bindable<PlaylistItem> SelectedItem => button.SelectedItem;
-
         public Action OnReadyClick
         {
             set => button.Action = value;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 80991569dc..a641935b9a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         [BackgroundDependencyLoader]
         private void load()
         {
-            InternalChildren = new Drawable[]
+            AddRangeInternal(new Drawable[]
             {
                 new GridContainer
                 {
@@ -161,7 +161,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                         {
                             new MultiplayerMatchFooter
                             {
-                                SelectedItem = { BindTarget = SelectedItem },
                                 OnReadyClick = onReadyClick
                             }
                         }
@@ -177,7 +176,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                     RelativeSizeAxes = Axes.Both,
                     State = { Value = client.Room == null ? Visibility.Visible : Visibility.Hidden }
                 }
-            };
+            });
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsReadyButton.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsReadyButton.cs
index edee8e571a..9ac1fe1722 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsReadyButton.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Components;
@@ -15,6 +16,9 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         [Resolved(typeof(Room), nameof(Room.EndDate))]
         private Bindable<DateTimeOffset?> endDate { get; set; }
 
+        [Resolved]
+        private IBindable<WorkingBeatmap> gameBeatmap { get; set; }
+
         public PlaylistsReadyButton()
         {
             Text = "Start";
@@ -32,7 +36,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         {
             base.Update();
 
-            Enabled.Value = endDate.Value != null && DateTimeOffset.UtcNow.AddSeconds(30).AddMilliseconds(GameBeatmap.Value.Track.Length) < endDate.Value;
+            Enabled.Value = endDate.Value != null && DateTimeOffset.UtcNow.AddSeconds(30).AddMilliseconds(gameBeatmap.Value.Track.Length) < endDate.Value;
         }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
index e76ca995bf..7b3cdf16db 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         [BackgroundDependencyLoader]
         private void load()
         {
-            InternalChildren = new Drawable[]
+            AddRangeInternal(new Drawable[]
             {
                 new GridContainer
                 {
@@ -173,7 +173,6 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                             new Footer
                             {
                                 OnStart = onStart,
-                                SelectedItem = { BindTarget = SelectedItem }
                             }
                         }
                     },
@@ -189,7 +188,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                     EditPlaylist = () => this.Push(new MatchSongSelect()),
                     State = { Value = roomId.Value == null ? Visibility.Visible : Visibility.Hidden }
                 }
-            };
+            });
         }
 
         [Resolved]

From 63c0dc9bd9cf9d7c7f7251aa91d778c23a021071 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 16 Jan 2021 23:04:28 +0300
Subject: [PATCH 0917/3722] Update ready button test scene with new logic

---
 .../TestSceneMultiplayerReadyButton.cs        | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
index 878776bf51..1357adb39a 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Platform;
 using osu.Framework.Testing;
@@ -26,8 +27,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
     public class TestSceneMultiplayerReadyButton : MultiplayerTestScene
     {
         private MultiplayerReadyButton button;
+        private MultiplayerBeatmapTracker beatmapTracker;
         private BeatmapSetInfo importedSet;
 
+        private readonly Bindable<PlaylistItem> selectedItem = new Bindable<PlaylistItem>();
+
         private BeatmapManager beatmaps;
         private RulesetStore rulesets;
 
@@ -39,6 +43,13 @@ namespace osu.Game.Tests.Visual.Multiplayer
             Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
             Dependencies.Cache(beatmaps = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, host, Beatmap.Default));
             beatmaps.Import(TestResources.GetTestBeatmapForImport(true)).Wait();
+
+            Add(beatmapTracker = new MultiplayerBeatmapTracker
+            {
+                SelectedItem = { BindTarget = selectedItem }
+            });
+
+            Dependencies.Cache(beatmapTracker);
         }
 
         [SetUp]
@@ -46,20 +57,20 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             importedSet = beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.All).First();
             Beatmap.Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First());
+            selectedItem.Value = new PlaylistItem
+            {
+                Beatmap = { Value = Beatmap.Value.BeatmapInfo },
+                Ruleset = { Value = Beatmap.Value.BeatmapInfo.Ruleset },
+            };
 
-            Child = button = new MultiplayerReadyButton
+            if (button != null)
+                Remove(button);
+
+            Add(button = new MultiplayerReadyButton
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 Size = new Vector2(200, 50),
-                SelectedItem =
-                {
-                    Value = new PlaylistItem
-                    {
-                        Beatmap = { Value = Beatmap.Value.BeatmapInfo },
-                        Ruleset = { Value = Beatmap.Value.BeatmapInfo.Ruleset }
-                    }
-                },
                 OnReadyClick = async () =>
                 {
                     readyClickOperation = OngoingOperationTracker.BeginOperation();
@@ -73,7 +84,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     await Client.ToggleReady();
                     readyClickOperation.Dispose();
                 }
-            };
+            });
         });
 
         [Test]

From bb0d2899931bbefedf3229d2b963a5d368fc6177 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 16 Jan 2021 23:24:28 +0100
Subject: [PATCH 0918/3722] Split variable for readability

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

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index d3273ba170..716796a585 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -426,7 +426,8 @@ namespace osu.Game
             {
                 var imports = tasks.Where(t => t.Path.EndsWith(ext, StringComparison.OrdinalIgnoreCase));
 
-                return fileImporters.FirstOrDefault(i => i.HandledExtensions.Contains(ext))?.Import(imports.ToArray()) ?? Task.CompletedTask;
+                var importer = fileImporters.FirstOrDefault(i => i.HandledExtensions.Contains(ext));
+                return importer?.Import(imports.ToArray()) ?? Task.CompletedTask;
             }));
         }
 

From dee46d7ba201e70c463f68f5b4cf38c43a87d085 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 16 Jan 2021 23:42:28 +0100
Subject: [PATCH 0919/3722] Use GroupBy() instead

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

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 716796a585..1f8ae54e55 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -421,13 +421,11 @@ namespace osu.Game
 
         public virtual async Task Import(params ImportTask[] tasks)
         {
-            var extensions = tasks.Select(t => Path.GetExtension(t.Path).ToLowerInvariant()).Distinct();
-            await Task.WhenAll(extensions.Select(ext =>
+            var tasksPerExtension = tasks.GroupBy(t => Path.GetExtension(t.Path).ToLowerInvariant());
+            await Task.WhenAll(tasksPerExtension.Select(taskGroup =>
             {
-                var imports = tasks.Where(t => t.Path.EndsWith(ext, StringComparison.OrdinalIgnoreCase));
-
-                var importer = fileImporters.FirstOrDefault(i => i.HandledExtensions.Contains(ext));
-                return importer?.Import(imports.ToArray()) ?? Task.CompletedTask;
+                var importer = fileImporters.FirstOrDefault(i => i.HandledExtensions.Contains(taskGroup.Key));
+                return importer?.Import(taskGroup.ToArray()) ?? Task.CompletedTask;
             }));
         }
 

From 816cc7a59b146cff51773d9f3ec862e0d61af7ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 17 Jan 2021 00:35:23 +0100
Subject: [PATCH 0920/3722] Adjust explicit label spacing on beatmap set
 overlay

---
 osu.Game/Overlays/BeatmapSet/Header.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs
index 9f2b40dfa4..a84ed5ac29 100644
--- a/osu.Game/Overlays/BeatmapSet/Header.cs
+++ b/osu.Game/Overlays/BeatmapSet/Header.cs
@@ -145,14 +145,14 @@ namespace osu.Game.Overlays.BeatmapSet
                                                     {
                                                         Anchor = Anchor.BottomLeft,
                                                         Origin = Anchor.BottomLeft,
-                                                        Margin = new MarginPadding { Left = 3, Bottom = 4 }, // To better lineup with the font
+                                                        Margin = new MarginPadding { Left = 5, Bottom = 4 }, // To better lineup with the font
                                                     },
                                                     explicitPill = new ExplicitBeatmapPill
                                                     {
                                                         Alpha = 0f,
-                                                        Anchor = Anchor.CentreLeft,
-                                                        Origin = Anchor.CentreLeft,
-                                                        Margin = new MarginPadding { Left = 15f, Top = 4 },
+                                                        Anchor = Anchor.BottomLeft,
+                                                        Origin = Anchor.BottomLeft,
+                                                        Margin = new MarginPadding { Left = 10, Bottom = 4 },
                                                     }
                                                 }
                                             },

From eb53e32792dcb36c1aac9d612dc24f09733487dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 17 Jan 2021 14:40:22 +0100
Subject: [PATCH 0921/3722] Use task completion source for room join flow

On Android, users were unable to join or create multiplayer rooms. The
root cause of that was that the both the wait and set of the
`ManualResetEvent` in `getRoomUsers` occurred on the same thread, which
created a chicken-and-egg situation - the set could not proceed until
the wait had actually completed.

Resolve by substituting the `ManualResetEvent` for a
`TaskCompletionSource` to achieve a promise-style task, which the
previous code was a crude approximation of anyway.

Closes #11385.
---
 .../Multiplayer/StatefulMultiplayerClient.cs   | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index fbdfb6a8c5..f0e11b2b8b 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -7,7 +7,6 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -128,7 +127,8 @@ namespace osu.Game.Online.Multiplayer
 
             Debug.Assert(Room != null);
 
-            var users = getRoomUsers();
+            var users = await getRoomUsers();
+            Debug.Assert(users != null);
 
             await Task.WhenAll(users.Select(PopulateUser));
 
@@ -437,24 +437,20 @@ namespace osu.Game.Online.Multiplayer
         /// This should be used whenever accessing users from outside of an Update thread context (ie. when not calling <see cref="Drawable.Schedule"/>).
         /// </summary>
         /// <returns>A copy of users in the current room, or null if unavailable.</returns>
-        private List<MultiplayerRoomUser>? getRoomUsers()
+        private Task<List<MultiplayerRoomUser>?> getRoomUsers()
         {
-            List<MultiplayerRoomUser>? users = null;
-
-            ManualResetEventSlim resetEvent = new ManualResetEventSlim();
+            var tcs = new TaskCompletionSource<List<MultiplayerRoomUser>?>();
 
             // at some point we probably want to replace all these schedule calls with Room.LockForUpdate.
             // for now, as this would require quite some consideration due to the number of accesses to the room instance,
             // let's just add a manual schedule for the non-scheduled usages instead.
             Scheduler.Add(() =>
             {
-                users = Room?.Users.ToList();
-                resetEvent.Set();
+                var users = Room?.Users.ToList();
+                tcs.SetResult(users);
             }, false);
 
-            resetEvent.Wait(100);
-
-            return users;
+            return tcs.Task;
         }
 
         /// <summary>

From 5fd644fc576de33cab2f4b0daeb323b262b3b98e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 17 Jan 2021 22:40:24 +0900
Subject: [PATCH 0922/3722] Unify variable names

---
 .../TestSceneBeatmapListingSearchControl.cs            | 10 +++++-----
 osu.Game/Configuration/OsuConfigManager.cs             |  4 ++--
 .../Online/API/Requests/SearchBeatmapSetsRequest.cs    |  8 ++++----
 .../BeatmapListing/BeatmapListingFilterControl.cs      |  4 ++--
 .../BeatmapListing/BeatmapListingSearchControl.cs      | 10 +++++-----
 .../Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs |  2 +-
 .../Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs |  2 +-
 ...citBeatmapPill.cs => ExplicitContentBeatmapPill.cs} |  4 ++--
 osu.Game/Overlays/BeatmapSet/Header.cs                 |  6 +++---
 .../Overlays/Settings/Sections/Online/WebSettings.cs   |  2 +-
 .../Screens/OnlinePlay/DrawableRoomPlaylistItem.cs     |  6 +++---
 11 files changed, 29 insertions(+), 29 deletions(-)
 rename osu.Game/Overlays/BeatmapSet/{ExplicitBeatmapPill.cs => ExplicitContentBeatmapPill.cs} (92%)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
index dc46da6293..a9747e73f9 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             control.Extra.BindCollectionChanged((u, v) => extra.Text = $"Extra: {(control.Extra.Any() ? string.Join('.', control.Extra.Select(i => i.ToString().ToLowerInvariant())) : "")}", true);
             control.Ranks.BindCollectionChanged((u, v) => ranks.Text = $"Ranks: {(control.Ranks.Any() ? string.Join('.', control.Ranks.Select(i => i.ToString())) : "")}", true);
             control.Played.BindValueChanged(p => played.Text = $"Played: {p.NewValue}", true);
-            control.Explicit.BindValueChanged(e => explicitMap.Text = $"Explicit Maps: {e.NewValue}", true);
+            control.ExplicitContent.BindValueChanged(e => explicitMap.Text = $"Explicit Maps: {e.NewValue}", true);
         });
 
         [Test]
@@ -92,11 +92,11 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Test]
         public void TestExplicitConfig()
         {
-            AddStep("configure explicit content to allowed", () => localConfig.Set(OsuSetting.AllowExplicitContent, true));
-            AddAssert("explicit control set to show", () => control.Explicit.Value == SearchExplicit.Show);
+            AddStep("configure explicit content to allowed", () => localConfig.Set(OsuSetting.ShowOnlineExplicitContent, true));
+            AddAssert("explicit control set to show", () => control.ExplicitContent.Value == SearchExplicit.Show);
 
-            AddStep("configure explicit content to disallowed", () => localConfig.Set(OsuSetting.AllowExplicitContent, false));
-            AddAssert("explicit control set to hide", () => control.Explicit.Value == SearchExplicit.Hide);
+            AddStep("configure explicit content to disallowed", () => localConfig.Set(OsuSetting.ShowOnlineExplicitContent, false));
+            AddAssert("explicit control set to hide", () => control.ExplicitContent.Value == SearchExplicit.Hide);
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 5e7a843baf..6b48501dac 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Configuration
             Set(OsuSetting.ExternalLinkWarning, true);
             Set(OsuSetting.PreferNoVideo, false);
 
-            Set(OsuSetting.AllowExplicitContent, false);
+            Set(OsuSetting.ShowOnlineExplicitContent, false);
 
             // Audio
             Set(OsuSetting.VolumeInactive, 0.25, 0, 1, 0.01);
@@ -272,6 +272,6 @@ namespace osu.Game.Configuration
         EditorWaveformOpacity,
         DiscordRichPresence,
         AutomaticallyDownloadWhenSpectating,
-        AllowExplicitContent,
+        ShowOnlineExplicitContent,
     }
 }
diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index 939d3c6cb4..5360d36f3d 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Online.API.Requests
 
         public SearchPlayed Played { get; }
 
-        public SearchExplicit Explicit { get; }
+        public SearchExplicit ExplicitContent { get; }
 
         [CanBeNull]
         public IReadOnlyCollection<ScoreRank> Ranks { get; }
@@ -53,7 +53,7 @@ namespace osu.Game.Online.API.Requests
             IReadOnlyCollection<SearchExtra> extra = null,
             IReadOnlyCollection<ScoreRank> ranks = null,
             SearchPlayed played = SearchPlayed.Any,
-            SearchExplicit explicitMaps = SearchExplicit.Hide)
+            SearchExplicit explicitContent = SearchExplicit.Hide)
         {
             this.query = string.IsNullOrEmpty(query) ? string.Empty : System.Uri.EscapeDataString(query);
             this.ruleset = ruleset;
@@ -67,7 +67,7 @@ namespace osu.Game.Online.API.Requests
             Extra = extra;
             Ranks = ranks;
             Played = played;
-            Explicit = explicitMaps;
+            ExplicitContent = explicitContent;
         }
 
         protected override WebRequest CreateWebRequest()
@@ -97,7 +97,7 @@ namespace osu.Game.Online.API.Requests
             if (Played != SearchPlayed.Any)
                 req.AddParameter("played", Played.ToString().ToLowerInvariant());
 
-            req.AddParameter("nsfw", Explicit == SearchExplicit.Show ? "true" : "false");
+            req.AddParameter("nsfw", ExplicitContent == SearchExplicit.Show ? "true" : "false");
 
             req.AddCursor(cursor);
 
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
index 650adcb4a9..bcc5a91677 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
@@ -141,7 +141,7 @@ namespace osu.Game.Overlays.BeatmapListing
             searchControl.Extra.CollectionChanged += (_, __) => queueUpdateSearch();
             searchControl.Ranks.CollectionChanged += (_, __) => queueUpdateSearch();
             searchControl.Played.BindValueChanged(_ => queueUpdateSearch());
-            searchControl.Explicit.BindValueChanged(_ => queueUpdateSearch());
+            searchControl.ExplicitContent.BindValueChanged(_ => queueUpdateSearch());
 
             sortCriteria.BindValueChanged(_ => queueUpdateSearch());
             sortDirection.BindValueChanged(_ => queueUpdateSearch());
@@ -195,7 +195,7 @@ namespace osu.Game.Overlays.BeatmapListing
                 searchControl.Extra,
                 searchControl.Ranks,
                 searchControl.Played.Value,
-                searchControl.Explicit.Value);
+                searchControl.ExplicitContent.Value);
 
             getSetsRequest.Success += response =>
             {
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
index 5c6267b726..b138a5ac52 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Overlays.BeatmapListing
 
         public Bindable<SearchPlayed> Played => playedFilter.Current;
 
-        public Bindable<SearchExplicit> Explicit => explicitFilter.Current;
+        public Bindable<SearchExplicit> ExplicitContent => explicitContentFilter.Current;
 
         public BeatmapSetInfo BeatmapSet
         {
@@ -68,7 +68,7 @@ namespace osu.Game.Overlays.BeatmapListing
         private readonly BeatmapSearchMultipleSelectionFilterRow<SearchExtra> extraFilter;
         private readonly BeatmapSearchScoreFilterRow ranksFilter;
         private readonly BeatmapSearchFilterRow<SearchPlayed> playedFilter;
-        private readonly BeatmapSearchFilterRow<SearchExplicit> explicitFilter;
+        private readonly BeatmapSearchFilterRow<SearchExplicit> explicitContentFilter;
 
         private readonly Box background;
         private readonly UpdateableBeatmapSetCover beatmapCover;
@@ -130,7 +130,7 @@ namespace osu.Game.Overlays.BeatmapListing
                                     extraFilter = new BeatmapSearchMultipleSelectionFilterRow<SearchExtra>(@"Extra"),
                                     ranksFilter = new BeatmapSearchScoreFilterRow(),
                                     playedFilter = new BeatmapSearchFilterRow<SearchPlayed>(@"Played"),
-                                    explicitFilter = new BeatmapSearchFilterRow<SearchExplicit>(@"Explicit Maps"),
+                                    explicitContentFilter = new BeatmapSearchFilterRow<SearchExplicit>(@"Explicit Content"),
                                 }
                             }
                         }
@@ -148,10 +148,10 @@ namespace osu.Game.Overlays.BeatmapListing
         {
             background.Colour = colourProvider.Dark6;
 
-            allowExplicitContent = config.GetBindable<bool>(OsuSetting.AllowExplicitContent);
+            allowExplicitContent = config.GetBindable<bool>(OsuSetting.ShowOnlineExplicitContent);
             allowExplicitContent.BindValueChanged(allow =>
             {
-                Explicit.Value = allow.NewValue ? SearchExplicit.Show : SearchExplicit.Hide;
+                ExplicitContent.Value = allow.NewValue ? SearchExplicit.Show : SearchExplicit.Hide;
             }, true);
         }
 
diff --git a/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs b/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
index b7002a96e5..c1d366bb82 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
@@ -205,7 +205,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
 
             if (SetInfo.OnlineInfo?.HasExplicitContent ?? false)
             {
-                titleContainer.Add(new ExplicitBeatmapPill
+                titleContainer.Add(new ExplicitContentBeatmapPill
                 {
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreLeft,
diff --git a/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs b/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
index 69671ab75b..76a30d1c11 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
@@ -219,7 +219,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
 
             if (SetInfo.OnlineInfo?.HasExplicitContent ?? false)
             {
-                titleContainer.Add(new ExplicitBeatmapPill
+                titleContainer.Add(new ExplicitContentBeatmapPill
                 {
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreLeft,
diff --git a/osu.Game/Overlays/BeatmapSet/ExplicitBeatmapPill.cs b/osu.Game/Overlays/BeatmapSet/ExplicitContentBeatmapPill.cs
similarity index 92%
rename from osu.Game/Overlays/BeatmapSet/ExplicitBeatmapPill.cs
rename to osu.Game/Overlays/BeatmapSet/ExplicitContentBeatmapPill.cs
index aefb3299a5..329f8ee0a2 100644
--- a/osu.Game/Overlays/BeatmapSet/ExplicitBeatmapPill.cs
+++ b/osu.Game/Overlays/BeatmapSet/ExplicitContentBeatmapPill.cs
@@ -10,9 +10,9 @@ using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Overlays.BeatmapSet
 {
-    public class ExplicitBeatmapPill : CompositeDrawable
+    public class ExplicitContentBeatmapPill : CompositeDrawable
     {
-        public ExplicitBeatmapPill()
+        public ExplicitContentBeatmapPill()
         {
             AutoSizeAxes = Axes.Both;
         }
diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs
index 876a7e8917..916c21c010 100644
--- a/osu.Game/Overlays/BeatmapSet/Header.cs
+++ b/osu.Game/Overlays/BeatmapSet/Header.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Overlays.BeatmapSet
         private readonly Box coverGradient;
         private readonly OsuSpriteText title, artist;
         private readonly AuthorInfo author;
-        private readonly ExplicitBeatmapPill explicitPill;
+        private readonly ExplicitContentBeatmapPill explicitContentPill;
         private readonly FillFlowContainer downloadButtonsContainer;
         private readonly BeatmapAvailability beatmapAvailability;
         private readonly BeatmapSetOnlineStatusPill onlineStatusPill;
@@ -147,7 +147,7 @@ namespace osu.Game.Overlays.BeatmapSet
                                                         Origin = Anchor.BottomLeft,
                                                         Margin = new MarginPadding { Left = 5, Bottom = 4 }, // To better lineup with the font
                                                     },
-                                                    explicitPill = new ExplicitBeatmapPill
+                                                    explicitContentPill = new ExplicitContentBeatmapPill
                                                     {
                                                         Alpha = 0f,
                                                         Anchor = Anchor.BottomLeft,
@@ -261,7 +261,7 @@ namespace osu.Game.Overlays.BeatmapSet
                     title.Text = setInfo.NewValue.Metadata.Title ?? string.Empty;
                     artist.Text = setInfo.NewValue.Metadata.Artist ?? string.Empty;
 
-                    explicitPill.Alpha = setInfo.NewValue.OnlineInfo.HasExplicitContent ? 1 : 0;
+                    explicitContentPill.Alpha = setInfo.NewValue.OnlineInfo.HasExplicitContent ? 1 : 0;
 
                     onlineStatusPill.FadeIn(500, Easing.OutQuint);
                     onlineStatusPill.Status = setInfo.NewValue.OnlineInfo.Status;
diff --git a/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs b/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
index da7ef46f65..3e1cc1d91e 100644
--- a/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Overlays.Settings.Sections.Online
                 {
                     LabelText = "Hide warnings for explicit content in beatmaps",
                     Keywords = new[] { "nsfw", "18+", "offensive" },
-                    Current = config.GetBindable<bool>(OsuSetting.AllowExplicitContent),
+                    Current = config.GetBindable<bool>(OsuSetting.ShowOnlineExplicitContent),
                 }
             };
         }
diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index 7987d715e3..b16f82fce9 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Screens.OnlinePlay
         private Container difficultyIconContainer;
         private LinkFlowContainer beatmapText;
         private LinkFlowContainer authorText;
-        private ExplicitBeatmapPill explicitPill;
+        private ExplicitContentBeatmapPill explicitContentPill;
         private ModDisplay modDisplay;
 
         private readonly Bindable<BeatmapInfo> beatmap = new Bindable<BeatmapInfo>();
@@ -119,7 +119,7 @@ namespace osu.Game.Screens.OnlinePlay
             }
 
             bool hasExplicitContent = Item.Beatmap.Value.BeatmapSet.OnlineInfo?.HasExplicitContent == true;
-            explicitPill.Alpha = hasExplicitContent ? 1 : 0;
+            explicitContentPill.Alpha = hasExplicitContent ? 1 : 0;
 
             modDisplay.Current.Value = requiredMods.ToArray();
         }
@@ -181,7 +181,7 @@ namespace osu.Game.Screens.OnlinePlay
                                             Children = new Drawable[]
                                             {
                                                 authorText = new LinkFlowContainer { AutoSizeAxes = Axes.Both },
-                                                explicitPill = new ExplicitBeatmapPill
+                                                explicitContentPill = new ExplicitContentBeatmapPill
                                                 {
                                                     Alpha = 0f,
                                                     Anchor = Anchor.CentreLeft,

From 5278cad393aeb1d76f7603cda445fb67b2d46234 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 17 Jan 2021 22:40:58 +0900
Subject: [PATCH 0923/3722] Reword setting to make more sense

---
 osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs b/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
index 3e1cc1d91e..59bcbe4d89 100644
--- a/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Online/WebSettings.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Overlays.Settings.Sections.Online
                 },
                 new SettingsCheckbox
                 {
-                    LabelText = "Hide warnings for explicit content in beatmaps",
+                    LabelText = "Show explicit content in search results",
                     Keywords = new[] { "nsfw", "18+", "offensive" },
                     Current = config.GetBindable<bool>(OsuSetting.ShowOnlineExplicitContent),
                 }

From 39746cb3de8ad11221ff1766822f720918d49858 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Jan 2021 00:11:35 +0900
Subject: [PATCH 0924/3722] Test removing nuget restore from iOS/Android build
 scripts

---
 fastlane/Fastfile | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 8c278604aa..18b5907e82 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -48,10 +48,6 @@ desc 'Deploy to play store'
 
   desc 'Compile the project'
   lane :build do |options|
-    nuget_restore(
-      project_path: 'osu.sln'
-    )
-
     souyuz(
       build_configuration: 'Release',
       solution_path: 'osu.sln',
@@ -107,10 +103,6 @@ platform :ios do
 
   desc 'Compile the project'
   lane :build do
-    nuget_restore(
-      project_path: 'osu.sln'
-    )
-
     souyuz(
       platform: "ios",
       plist_path: "osu.iOS/Info.plist"

From 585aa87c5389b16dc9c8d4c17c38365cb0100174 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 17 Jan 2021 19:17:14 +0300
Subject: [PATCH 0925/3722] Fix playlist item download button never shown back
 after hiding

---
 .../Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs   | 8 +++++++-
 osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs   | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
index 17d85d1120..c6cfd3c64a 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
@@ -201,11 +201,17 @@ namespace osu.Game.Tests.Visual.Multiplayer
         }
 
         [Test]
-        public void TestDownloadButtonHiddenInitiallyWhenBeatmapExists()
+        public void TestDownloadButtonHiddenWhenBeatmapExists()
         {
             createPlaylist(new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo);
 
             AddAssert("download button hidden", () => !playlist.ChildrenOfType<BeatmapDownloadTrackingComposite>().Single().IsPresent);
+
+            AddStep("delete beatmap set", () => manager.Delete(manager.QueryBeatmapSets(_ => true).Single()));
+            AddUntilStep("download button shown", () => playlist.ChildrenOfType<BeatmapDownloadTrackingComposite>().Single().IsPresent);
+
+            AddStep("undelete beatmap set", () => manager.Undelete(manager.QueryBeatmapSets(_ => true).Single()));
+            AddUntilStep("download button hidden", () => !playlist.ChildrenOfType<BeatmapDownloadTrackingComposite>().Single().IsPresent);
         }
 
         [Test]
diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index b16f82fce9..f8982582d5 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -249,6 +249,8 @@ namespace osu.Game.Screens.OnlinePlay
             [Resolved]
             private BeatmapManager beatmapManager { get; set; }
 
+            public override bool IsPresent => base.IsPresent || Scheduler.HasPendingTasks;
+
             public PlaylistDownloadButton(PlaylistItem playlistItem)
                 : base(playlistItem.Beatmap.Value.BeatmapSet)
             {

From 2b23c8eabd02a1c3743d7538bbecb9ae3d224333 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 17 Jan 2021 18:08:58 +0100
Subject: [PATCH 0926/3722] Use alpha directly for checking visibility in test

`IsPresent` is no longer synonymous with being visible, after applying
the fix to the issue in question.
---
 .../Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
index c6cfd3c64a..874c1694eb 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
@@ -205,13 +205,16 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             createPlaylist(new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo);
 
-            AddAssert("download button hidden", () => !playlist.ChildrenOfType<BeatmapDownloadTrackingComposite>().Single().IsPresent);
+            assertDownloadButtonVisible(false);
 
             AddStep("delete beatmap set", () => manager.Delete(manager.QueryBeatmapSets(_ => true).Single()));
-            AddUntilStep("download button shown", () => playlist.ChildrenOfType<BeatmapDownloadTrackingComposite>().Single().IsPresent);
+            assertDownloadButtonVisible(true);
 
             AddStep("undelete beatmap set", () => manager.Undelete(manager.QueryBeatmapSets(_ => true).Single()));
-            AddUntilStep("download button hidden", () => !playlist.ChildrenOfType<BeatmapDownloadTrackingComposite>().Single().IsPresent);
+            assertDownloadButtonVisible(false);
+
+            void assertDownloadButtonVisible(bool visible) => AddUntilStep($"download button {(visible ? "shown" : "hidden")}",
+                () => playlist.ChildrenOfType<BeatmapDownloadTrackingComposite>().Single().Alpha == (visible ? 1 : 0));
         }
 
         [Test]

From 172552d55173791a5a5293bcab1d2240b8b02783 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 17 Jan 2021 21:02:33 +0300
Subject: [PATCH 0927/3722] Use `TaskCompletionSource` for better awaiting

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

diff --git a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
index 839d47afc2..05e8f8b2e4 100644
--- a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
+++ b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
@@ -47,6 +47,8 @@ namespace osu.Game.Tests.Online
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
+            beatmaps.AllowImport = new TaskCompletionSource<bool>();
+
             testBeatmapFile = getTestBeatmapOsz();
 
             testBeatmapInfo = new TestBeatmap(Ruleset.Value).BeatmapInfo;
@@ -83,7 +85,7 @@ namespace osu.Game.Tests.Online
             AddStep("finish download", () => ((TestDownloadRequest)beatmaps.GetExistingDownload(testBeatmapSet)).TriggerSuccess(testBeatmapFile));
             addAvailabilityCheckStep("state importing", BeatmapAvailability.Importing);
 
-            AddStep("allow importing", () => beatmaps.AllowImport.Set());
+            AddStep("allow importing", () => beatmaps.AllowImport.SetResult(true));
             AddUntilStep("wait for import", () => beatmaps.IsAvailableLocally(testBeatmapSet));
             addAvailabilityCheckStep("state locally available", BeatmapAvailability.LocallyAvailable);
         }
@@ -91,7 +93,7 @@ namespace osu.Game.Tests.Online
         [Test]
         public void TestTrackerRespectsSoftDeleting()
         {
-            AddStep("allow importing", () => beatmaps.AllowImport.Set());
+            AddStep("allow importing", () => beatmaps.AllowImport.SetResult(true));
             AddStep("import beatmap", () => beatmaps.Import(testBeatmapSet).Wait());
             addAvailabilityCheckStep("state locally available", BeatmapAvailability.LocallyAvailable);
 
@@ -105,7 +107,7 @@ namespace osu.Game.Tests.Online
         [Test]
         public void TestTrackerRespectsChecksum()
         {
-            AddStep("allow importing", () => beatmaps.AllowImport.Set());
+            AddStep("allow importing", () => beatmaps.AllowImport.SetResult(true));
 
             BeatmapInfo wrongBeatmap = null;
 
@@ -144,7 +146,7 @@ namespace osu.Game.Tests.Online
 
         private class TestBeatmapManager : BeatmapManager
         {
-            public readonly ManualResetEventSlim AllowImport = new ManualResetEventSlim();
+            public TaskCompletionSource<bool> AllowImport = new TaskCompletionSource<bool>();
 
             protected override ArchiveDownloadRequest<BeatmapSetInfo> CreateDownloadRequest(BeatmapSetInfo set, bool minimiseDownloadSize)
                 => new TestDownloadRequest(set);
@@ -156,9 +158,7 @@ namespace osu.Game.Tests.Online
 
             public override async Task<BeatmapSetInfo> Import(BeatmapSetInfo item, ArchiveReader archive = null, CancellationToken cancellationToken = default)
             {
-                while (!AllowImport.IsSet)
-                    await Task.Delay(10, cancellationToken);
-
+                await AllowImport.Task;
                 return await base.Import(item, archive, cancellationToken);
             }
         }

From d93a853dfd531e9d8d83473b04e3c22b5d290023 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 17 Jan 2021 21:16:45 +0300
Subject: [PATCH 0928/3722] Enforce `float` type in the download progress path
 instead

---
 .../Online/TestSceneMultiplayerBeatmapTracker.cs       |  8 ++++----
 osu.Game/Online/API/ArchiveDownloadRequest.cs          |  6 +++---
 osu.Game/Online/DownloadTrackingComposite.cs           |  2 +-
 osu.Game/Online/Rooms/BeatmapAvailability.cs           |  6 +++---
 osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs     |  2 +-
 .../Overlays/Notifications/ProgressNotification.cs     | 10 +++++-----
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
index 05e8f8b2e4..60a4508b3d 100644
--- a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
+++ b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
@@ -77,10 +77,10 @@ namespace osu.Game.Tests.Online
             addAvailabilityCheckStep("state not downloaded", BeatmapAvailability.NotDownloaded);
 
             AddStep("start downloading", () => beatmaps.Download(testBeatmapSet));
-            addAvailabilityCheckStep("state downloading 0%", () => BeatmapAvailability.Downloading(0.0));
+            addAvailabilityCheckStep("state downloading 0%", () => BeatmapAvailability.Downloading(0.0f));
 
-            AddStep("set progress 40%", () => ((TestDownloadRequest)beatmaps.GetExistingDownload(testBeatmapSet)).SetProgress(0.4));
-            addAvailabilityCheckStep("state downloading 40%", () => BeatmapAvailability.Downloading(0.4));
+            AddStep("set progress 40%", () => ((TestDownloadRequest)beatmaps.GetExistingDownload(testBeatmapSet)).SetProgress(0.4f));
+            addAvailabilityCheckStep("state downloading 40%", () => BeatmapAvailability.Downloading(0.4f));
 
             AddStep("finish download", () => ((TestDownloadRequest)beatmaps.GetExistingDownload(testBeatmapSet)).TriggerSuccess(testBeatmapFile));
             addAvailabilityCheckStep("state importing", BeatmapAvailability.Importing);
@@ -165,7 +165,7 @@ namespace osu.Game.Tests.Online
 
         private class TestDownloadRequest : ArchiveDownloadRequest<BeatmapSetInfo>
         {
-            public new void SetProgress(double progress) => base.SetProgress(progress);
+            public new void SetProgress(float progress) => base.SetProgress(progress);
 
             public TestDownloadRequest(BeatmapSetInfo model)
                 : base(model)
diff --git a/osu.Game/Online/API/ArchiveDownloadRequest.cs b/osu.Game/Online/API/ArchiveDownloadRequest.cs
index fdb2a984dc..ccb4e9c119 100644
--- a/osu.Game/Online/API/ArchiveDownloadRequest.cs
+++ b/osu.Game/Online/API/ArchiveDownloadRequest.cs
@@ -12,16 +12,16 @@ namespace osu.Game.Online.API
 
         public double Progress { get; private set; }
 
-        public event Action<double> DownloadProgressed;
+        public event Action<float> DownloadProgressed;
 
         protected ArchiveDownloadRequest(TModel model)
         {
             Model = model;
 
-            Progressed += (current, total) => SetProgress((double)current / total);
+            Progressed += (current, total) => SetProgress((float)current / total);
         }
 
-        protected void SetProgress(double progress)
+        protected void SetProgress(float progress)
         {
             Progress = progress;
             DownloadProgressed?.Invoke(progress);
diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index b72cf38369..1631d9790b 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -144,7 +144,7 @@ namespace osu.Game.Online
 
         private void onRequestSuccess(string _) => Schedule(() => State.Value = DownloadState.Importing);
 
-        private void onRequestProgress(double progress) => Schedule(() => Progress.Value = progress);
+        private void onRequestProgress(float progress) => Schedule(() => Progress.Value = progress);
 
         private void onRequestFailure(Exception e) => Schedule(() => attachDownload(null));
 
diff --git a/osu.Game/Online/Rooms/BeatmapAvailability.cs b/osu.Game/Online/Rooms/BeatmapAvailability.cs
index e7dbc5f436..170009a85b 100644
--- a/osu.Game/Online/Rooms/BeatmapAvailability.cs
+++ b/osu.Game/Online/Rooms/BeatmapAvailability.cs
@@ -19,17 +19,17 @@ namespace osu.Game.Online.Rooms
         /// <summary>
         /// The beatmap's downloading progress, null when not in <see cref="DownloadState.Downloading"/> state.
         /// </summary>
-        public readonly double? DownloadProgress;
+        public readonly float? DownloadProgress;
 
         [JsonConstructor]
-        private BeatmapAvailability(DownloadState state, double? downloadProgress = null)
+        private BeatmapAvailability(DownloadState state, float? downloadProgress = null)
         {
             State = state;
             DownloadProgress = downloadProgress;
         }
 
         public static BeatmapAvailability NotDownloaded() => new BeatmapAvailability(DownloadState.NotDownloaded);
-        public static BeatmapAvailability Downloading(double progress) => new BeatmapAvailability(DownloadState.Downloading, progress);
+        public static BeatmapAvailability Downloading(float progress) => new BeatmapAvailability(DownloadState.Downloading, progress);
         public static BeatmapAvailability Importing() => new BeatmapAvailability(DownloadState.Importing);
         public static BeatmapAvailability LocallyAvailable() => new BeatmapAvailability(DownloadState.LocallyAvailable);
 
diff --git a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
index b22d17f3ef..b15399ad62 100644
--- a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
+++ b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Online.Rooms
                     break;
 
                 case DownloadState.Downloading:
-                    availability.Value = BeatmapAvailability.Downloading(Progress.Value);
+                    availability.Value = BeatmapAvailability.Downloading((float)Progress.Value);
                     break;
 
                 case DownloadState.Importing:
diff --git a/osu.Game/Overlays/Notifications/ProgressNotification.cs b/osu.Game/Overlays/Notifications/ProgressNotification.cs
index e18bab8e83..3105ecd742 100644
--- a/osu.Game/Overlays/Notifications/ProgressNotification.cs
+++ b/osu.Game/Overlays/Notifications/ProgressNotification.cs
@@ -23,9 +23,9 @@ namespace osu.Game.Overlays.Notifications
 
         public string CompletionText { get; set; } = "Task has completed!";
 
-        private double progress;
+        private float progress;
 
-        public double Progress
+        public float Progress
         {
             get => progress;
             set
@@ -185,9 +185,9 @@ namespace osu.Game.Overlays.Notifications
             private Color4 colourActive;
             private Color4 colourInactive;
 
-            private double progress;
+            private float progress;
 
-            public double Progress
+            public float Progress
             {
                 get => progress;
                 set
@@ -195,7 +195,7 @@ namespace osu.Game.Overlays.Notifications
                     if (progress == value) return;
 
                     progress = value;
-                    box.ResizeTo(new Vector2((float)progress, 1), 100, Easing.OutQuad);
+                    box.ResizeTo(new Vector2(progress, 1), 100, Easing.OutQuad);
                 }
             }
 

From 0425a659a8c0bae3117e77dd512e899ca6a5c3da Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 17 Jan 2021 21:19:55 +0300
Subject: [PATCH 0929/3722] Add null-permissive operator to manager back

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

diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index 1631d9790b..188cb9be7a 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -80,7 +80,7 @@ namespace osu.Game.Online
         /// By default, this calls <see cref="IModelDownloader{TModel}.IsAvailableLocally"/>,
         /// but can be overriden to add additional checks for verifying the model in database.
         /// </summary>
-        protected virtual bool IsModelAvailableLocally() => Manager.IsAvailableLocally(Model.Value);
+        protected virtual bool IsModelAvailableLocally() => Manager?.IsAvailableLocally(Model.Value) == true;
 
         private void downloadBegan(ValueChangedEvent<WeakReference<ArchiveDownloadRequest<TModel>>> weakRequest)
         {

From ccef50e2a2e16767565c75bdc70c52faba7c57e4 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 17 Jan 2021 22:04:12 +0300
Subject: [PATCH 0930/3722] Log important message if user imported bad-checksum
 beatmap

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

diff --git a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
index b15399ad62..659f52f00f 100644
--- a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
+++ b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Linq;
 using osu.Framework.Bindables;
+using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 
 namespace osu.Game.Online.Rooms
@@ -34,6 +35,15 @@ namespace osu.Game.Online.Rooms
         }
 
         protected override bool VerifyDatabasedModel(BeatmapSetInfo databasedSet)
+        {
+            var verified = verifyDatabasedModel(databasedSet);
+            if (!verified)
+                Logger.Log("The imported beatmapset does not match the online version.", LoggingTarget.Runtime, LogLevel.Important);
+
+            return verified;
+        }
+
+        private bool verifyDatabasedModel(BeatmapSetInfo databasedSet)
         {
             int? beatmapId = SelectedItem.Value.Beatmap.Value.OnlineBeatmapID;
             string checksum = SelectedItem.Value.Beatmap.Value.MD5Hash;

From b6a37c1c15fe2a95b7efb94b61e37de132d9864e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 17 Jan 2021 22:08:28 +0300
Subject: [PATCH 0931/3722] Make `TriggerSuccess(filename)` protected and
 expose in test instead

---
 osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs | 1 +
 osu.Game/Online/API/APIDownloadRequest.cs                   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
index 60a4508b3d..4b8992052e 100644
--- a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
+++ b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
@@ -166,6 +166,7 @@ namespace osu.Game.Tests.Online
         private class TestDownloadRequest : ArchiveDownloadRequest<BeatmapSetInfo>
         {
             public new void SetProgress(float progress) => base.SetProgress(progress);
+            public new void TriggerSuccess(string filename) => base.TriggerSuccess(filename);
 
             public TestDownloadRequest(BeatmapSetInfo model)
                 : base(model)
diff --git a/osu.Game/Online/API/APIDownloadRequest.cs b/osu.Game/Online/API/APIDownloadRequest.cs
index 02c589403c..62e22d8f88 100644
--- a/osu.Game/Online/API/APIDownloadRequest.cs
+++ b/osu.Game/Online/API/APIDownloadRequest.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Online.API
 
         private void request_Progress(long current, long total) => API.Schedule(() => Progressed?.Invoke(current, total));
 
-        internal void TriggerSuccess(string filename)
+        protected void TriggerSuccess(string filename)
         {
             if (this.filename != null)
                 throw new InvalidOperationException("Attempted to trigger success more than once");

From ec00aaef90a9bfe8d768f01148f99a78d043401e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 15 Jan 2021 19:13:55 +0900
Subject: [PATCH 0932/3722] Add nuget deploys for all rulesets

---
 appveyor_deploy.yml                           | 73 +++++++++++++++----
 .../osu.Game.Rulesets.Catch.csproj            |  7 ++
 .../osu.Game.Rulesets.Mania.csproj            |  7 ++
 .../osu.Game.Rulesets.Osu.csproj              |  7 ++
 .../osu.Game.Rulesets.Taiko.csproj            |  7 ++
 5 files changed, 88 insertions(+), 13 deletions(-)

diff --git a/appveyor_deploy.yml b/appveyor_deploy.yml
index bb4482f501..737e5c43ab 100644
--- a/appveyor_deploy.yml
+++ b/appveyor_deploy.yml
@@ -1,21 +1,68 @@
 clone_depth: 1
 version: '{build}'
 image: Visual Studio 2019
-dotnet_csproj:
-  patch: true
-  file: 'osu.Game\osu.Game.csproj' # Use wildcard when it's able to exclude Xamarin projects
-  version: $(APPVEYOR_REPO_TAG_NAME)
-before_build:
-  - ps: dotnet --info # Useful when version mismatch between CI and local
-  - ps: nuget restore -verbosity quiet # Only nuget.exe knows both new (.NET Core) and old (Xamarin) projects
 test: off
 skip_non_tags: true
 configuration: Release
-build:
-  project: build\Desktop.proj # Skipping Xamarin Release that's slow and covered by fastlane
-  parallel: true
-  verbosity: minimal
-  publish_nuget: true
+
+environment:
+  matrix:
+    - job_name: osu-game
+    - job_name: osu-ruleset
+      job_depends_on: osu-game
+    - job_name: taiko-ruleset
+      job_depends_on: osu-game
+    - job_name: catch-ruleset
+      job_depends_on: osu-game
+    - job_name: mania-ruleset
+      job_depends_on: osu-game
+
+nuget:
+  project_feed: true
+
+for:
+  -
+    matrix:
+      only:
+        - job_name: osu-game
+    build_script:
+      - cmd: dotnet pack osu.Game\osu.Game.csproj /p:Version=%APPVEYOR_REPO_TAG_NAME%
+  -
+    matrix:
+      only:
+        - job_name: osu-ruleset
+    build_script:
+      - cmd: dotnet remove osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj reference osu.Game\osu.Game.csproj
+      - cmd: dotnet add osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME%
+      - cmd: dotnet pack osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj /p:Version=%APPVEYOR_REPO_TAG_NAME%
+  -
+    matrix:
+      only:
+        - job_name: taiko-ruleset
+    build_script:
+      - cmd: dotnet remove osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj reference osu.Game\osu.Game.csproj
+      - cmd: dotnet add osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME%
+      - cmd: dotnet pack osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj /p:Version=%APPVEYOR_REPO_TAG_NAME%
+  -
+    matrix:
+      only:
+        - job_name: catch-ruleset
+    build_script:
+      - cmd: dotnet remove osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj reference osu.Game\osu.Game.csproj
+      - cmd: dotnet add osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME%
+      - cmd: dotnet pack osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj /p:Version=%APPVEYOR_REPO_TAG_NAME%
+  -
+    matrix:
+      only:
+        - job_name: mania-ruleset
+    build_script:
+      - cmd: dotnet remove osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj reference osu.Game\osu.Game.csproj
+      - cmd: dotnet add osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME%
+      - cmd: dotnet pack osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj /p:Version=%APPVEYOR_REPO_TAG_NAME%
+
+artifacts:
+  - path: '**\*.nupkg'
+
 deploy:
   - provider: Environment
-    name: nuget
+    name: nuget
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj b/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj
index b19affbf9f..5bdf39824c 100644
--- a/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj
+++ b/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj
@@ -5,6 +5,13 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Description>catch the fruit. to the beat.</Description>
   </PropertyGroup>
+
+  <PropertyGroup Label="Nuget">
+    <Title>osu!catch</Title>
+    <PackageId>ppy.osu.Game.Rulesets.Catch</PackageId>
+    <IsPackable>true</IsPackable>
+  </PropertyGroup>
+
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game\osu.Game.csproj" />
   </ItemGroup>
diff --git a/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj b/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj
index 07ef1022ae..c30fe8494f 100644
--- a/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj
+++ b/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj
@@ -5,6 +5,13 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Description>smash the keys. to the beat.</Description>
   </PropertyGroup>
+
+  <PropertyGroup Label="Nuget">
+    <Title>osu!mania</Title>
+    <PackageId>ppy.osu.Game.Rulesets.Mania</PackageId>
+    <IsPackable>true</IsPackable>
+  </PropertyGroup>
+
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game\osu.Game.csproj" />
   </ItemGroup>
diff --git a/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj b/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj
index bffeaabb55..36ee804259 100644
--- a/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj
+++ b/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj
@@ -5,6 +5,13 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Description>click the circles. to the beat.</Description>
   </PropertyGroup>
+
+  <PropertyGroup Label="Nuget">
+    <Title>osu!standard</Title>
+    <PackageId>ppy.osu.Game.Rulesets.Osu</PackageId>
+    <IsPackable>true</IsPackable>
+  </PropertyGroup>
+
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game\osu.Game.csproj" />
   </ItemGroup>
diff --git a/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj b/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj
index ebed8c6d7c..00deb719e1 100644
--- a/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj
+++ b/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj
@@ -5,6 +5,13 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Description>bash the drum. to the beat.</Description>
   </PropertyGroup>
+
+  <PropertyGroup Label="Nuget">
+    <Title>osu!taiko</Title>
+    <PackageId>ppy.osu.Game.Rulesets.Taiko</PackageId>
+    <IsPackable>true</IsPackable>
+  </PropertyGroup>
+
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game\osu.Game.csproj" />
   </ItemGroup>

From 1b166d809eb5bb5f04bdbcfabfba3916cd66a114 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 18 Jan 2021 11:07:54 +0900
Subject: [PATCH 0933/3722] Adjust package titles

---
 osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj | 2 +-
 osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj | 2 +-
 osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj     | 2 +-
 osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj b/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj
index 5bdf39824c..e2f95ca177 100644
--- a/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj
+++ b/osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <PropertyGroup Label="Nuget">
-    <Title>osu!catch</Title>
+    <Title>osu!catch (ruleset)</Title>
     <PackageId>ppy.osu.Game.Rulesets.Catch</PackageId>
     <IsPackable>true</IsPackable>
   </PropertyGroup>
diff --git a/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj b/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj
index c30fe8494f..4f6840f9ca 100644
--- a/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj
+++ b/osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <PropertyGroup Label="Nuget">
-    <Title>osu!mania</Title>
+    <Title>osu!mania (ruleset)</Title>
     <PackageId>ppy.osu.Game.Rulesets.Mania</PackageId>
     <IsPackable>true</IsPackable>
   </PropertyGroup>
diff --git a/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj b/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj
index 36ee804259..98f1e69bd1 100644
--- a/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj
+++ b/osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <PropertyGroup Label="Nuget">
-    <Title>osu!standard</Title>
+    <Title>osu! (ruleset)</Title>
     <PackageId>ppy.osu.Game.Rulesets.Osu</PackageId>
     <IsPackable>true</IsPackable>
   </PropertyGroup>
diff --git a/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj b/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj
index 00deb719e1..b752c13d18 100644
--- a/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj
+++ b/osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <PropertyGroup Label="Nuget">
-    <Title>osu!taiko</Title>
+    <Title>osu!taiko (ruleset)</Title>
     <PackageId>ppy.osu.Game.Rulesets.Taiko</PackageId>
     <IsPackable>true</IsPackable>
   </PropertyGroup>

From 94fee8c31d123b940ddf636cf6982152479cc7ed Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Jan 2021 16:13:58 +0900
Subject: [PATCH 0934/3722] Avoid doing a config lookup if initial conditional
 fails

---
 osu.Game/Skinning/SkinProvidingContainer.cs | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Skinning/SkinProvidingContainer.cs b/osu.Game/Skinning/SkinProvidingContainer.cs
index e97822b86e..27cf0c697a 100644
--- a/osu.Game/Skinning/SkinProvidingContainer.cs
+++ b/osu.Game/Skinning/SkinProvidingContainer.cs
@@ -74,8 +74,8 @@ namespace osu.Game.Skinning
             {
                 if (lookup is GlobalSkinColours || lookup is SkinCustomColourLookup)
                     return lookupWithFallback<TLookup, TValue>(lookup, AllowColourLookup);
-                else
-                    return lookupWithFallback<TLookup, TValue>(lookup, AllowConfigurationLookup);
+
+                return lookupWithFallback<TLookup, TValue>(lookup, AllowConfigurationLookup);
             }
 
             return fallbackSource?.GetConfig<TLookup, TValue>(lookup);
@@ -83,11 +83,14 @@ namespace osu.Game.Skinning
 
         private IBindable<TValue> lookupWithFallback<TLookup, TValue>(TLookup lookup, bool canUseSkinLookup)
         {
-            var bindable = skin.GetConfig<TLookup, TValue>(lookup);
-            if (bindable != null && canUseSkinLookup)
-                return bindable;
-            else
-                return fallbackSource?.GetConfig<TLookup, TValue>(lookup);
+            if (canUseSkinLookup)
+            {
+                var bindable = skin.GetConfig<TLookup, TValue>(lookup);
+                if (bindable != null)
+                    return bindable;
+            }
+
+            return fallbackSource?.GetConfig<TLookup, TValue>(lookup);
         }
 
         protected virtual void TriggerSourceChanged() => SourceChanged?.Invoke();

From 27ffc9844520036e81a652d9d8d7b45b7b5845be Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 18 Jan 2021 10:48:12 +0300
Subject: [PATCH 0935/3722] Implement WebOverlay component

---
 .../Online/TestSceneFullscreenOverlay.cs      |  4 +-
 osu.Game/Overlays/BeatmapListingOverlay.cs    | 86 ++++++++-----------
 osu.Game/Overlays/BeatmapSetOverlay.cs        | 74 ++++++----------
 osu.Game/Overlays/ChangelogOverlay.cs         | 56 +++---------
 osu.Game/Overlays/DashboardOverlay.cs         | 56 ++----------
 osu.Game/Overlays/FullscreenOverlay.cs        | 26 +++++-
 osu.Game/Overlays/NewsOverlay.cs              | 62 +++----------
 osu.Game/Overlays/RankingsOverlay.cs          | 81 +++--------------
 osu.Game/Overlays/UserProfileOverlay.cs       | 13 ++-
 osu.Game/Overlays/WebOverlay.cs               | 50 +++++++++++
 10 files changed, 193 insertions(+), 315 deletions(-)
 create mode 100644 osu.Game/Overlays/WebOverlay.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneFullscreenOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneFullscreenOverlay.cs
index 8f20bcdcc1..f8b059e471 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneFullscreenOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneFullscreenOverlay.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Tests.Visual.Online
         private class TestFullscreenOverlay : FullscreenOverlay<OverlayHeader>
         {
             public TestFullscreenOverlay()
-                : base(OverlayColourScheme.Pink, null)
+                : base(OverlayColourScheme.Pink)
             {
                 Children = new Drawable[]
                 {
@@ -52,6 +52,8 @@ namespace osu.Game.Tests.Visual.Online
                     },
                 };
             }
+
+            protected override OverlayHeader CreateHeader() => null;
         }
     }
 }
diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index 0c9c995dd6..ae1667d403 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -15,98 +15,82 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.Input.Events;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
-using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.BeatmapListing;
 using osu.Game.Overlays.BeatmapListing.Panels;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Overlays
 {
-    public class BeatmapListingOverlay : FullscreenOverlay<BeatmapListingHeader>
+    public class BeatmapListingOverlay : WebOverlay<BeatmapListingHeader>
     {
         [Resolved]
         private PreviewTrackManager previewTrackManager { get; set; }
 
         private Drawable currentContent;
-        private LoadingLayer loadingLayer;
         private Container panelTarget;
         private FillFlowContainer<BeatmapPanel> foundContent;
         private NotFoundDrawable notFoundContent;
-
-        private OverlayScrollContainer resultScrollContainer;
+        private BeatmapListingFilterControl filterControl;
 
         public BeatmapListingOverlay()
-            : base(OverlayColourScheme.Blue, new BeatmapListingHeader())
+            : base(OverlayColourScheme.Blue)
         {
         }
 
-        private BeatmapListingFilterControl filterControl;
-
         [BackgroundDependencyLoader]
         private void load()
         {
-            Children = new Drawable[]
+            Child = new FillFlowContainer
             {
-                new Box
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Children = new Drawable[]
                 {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = ColourProvider.Background6
-                },
-                resultScrollContainer = new OverlayScrollContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    ScrollbarVisible = false,
-                    Child = new ReverseChildIDFillFlowContainer<Drawable>
+                    filterControl = new BeatmapListingFilterControl
+                    {
+                        TypingStarted = onTypingStarted,
+                        SearchStarted = onSearchStarted,
+                        SearchFinished = onSearchFinished,
+                    },
+                    new Container
                     {
                         AutoSizeAxes = Axes.Y,
                         RelativeSizeAxes = Axes.X,
-                        Direction = FillDirection.Vertical,
                         Children = new Drawable[]
                         {
-                            Header,
-                            filterControl = new BeatmapListingFilterControl
+                            new Box
                             {
-                                TypingStarted = onTypingStarted,
-                                SearchStarted = onSearchStarted,
-                                SearchFinished = onSearchFinished,
+                                RelativeSizeAxes = Axes.Both,
+                                Colour = ColourProvider.Background4,
                             },
-                            new Container
+                            panelTarget = new Container
                             {
                                 AutoSizeAxes = Axes.Y,
                                 RelativeSizeAxes = Axes.X,
+                                Padding = new MarginPadding { Horizontal = 20 },
                                 Children = new Drawable[]
                                 {
-                                    new Box
-                                    {
-                                        RelativeSizeAxes = Axes.Both,
-                                        Colour = ColourProvider.Background4,
-                                    },
-                                    panelTarget = new Container
-                                    {
-                                        AutoSizeAxes = Axes.Y,
-                                        RelativeSizeAxes = Axes.X,
-                                        Padding = new MarginPadding { Horizontal = 20 },
-                                        Children = new Drawable[]
-                                        {
-                                            foundContent = new FillFlowContainer<BeatmapPanel>(),
-                                            notFoundContent = new NotFoundDrawable(),
-                                        }
-                                    }
-                                },
-                            },
-                        }
+                                    foundContent = new FillFlowContainer<BeatmapPanel>(),
+                                    notFoundContent = new NotFoundDrawable(),
+                                }
+                            }
+                        },
                     },
-                },
-                loadingLayer = new LoadingLayer(true)
+                }
             };
         }
 
+        protected override BeatmapListingHeader CreateHeader() => new BeatmapListingHeader();
+
+        protected override Color4 GetBackgroundColour() => ColourProvider.Background6;
+
         private void onTypingStarted()
         {
             // temporary until the textbox/header is updated to always stay on screen.
-            resultScrollContainer.ScrollToStart();
+            ScrollFlow.ScrollToStart();
         }
 
         protected override void OnFocus(FocusEvent e)
@@ -125,7 +109,7 @@ namespace osu.Game.Overlays
             previewTrackManager.StopAnyPlaying(this);
 
             if (panelTarget.Any())
-                loadingLayer.Show();
+                Loading.Show();
         }
 
         private Task panelLoadDelegate;
@@ -173,7 +157,7 @@ namespace osu.Game.Overlays
 
         private void addContentToPlaceholder(Drawable content)
         {
-            loadingLayer.Hide();
+            Loading.Hide();
             lastFetchDisplayedTime = Time.Current;
 
             var lastContent = currentContent;
@@ -256,7 +240,7 @@ namespace osu.Game.Overlays
 
             bool shouldShowMore = panelLoadDelegate?.IsCompleted != false
                                   && Time.Current - lastFetchDisplayedTime > time_between_fetches
-                                  && (resultScrollContainer.ScrollableExtent > 0 && resultScrollContainer.IsScrolledToEnd(pagination_scroll_distance));
+                                  && (ScrollFlow.ScrollableExtent > 0 && ScrollFlow.IsScrolledToEnd(pagination_scroll_distance));
 
             if (shouldShowMore)
                 filterControl.FetchNextPage();
diff --git a/osu.Game/Overlays/BeatmapSetOverlay.cs b/osu.Game/Overlays/BeatmapSetOverlay.cs
index bbec62a85a..10953415ed 100644
--- a/osu.Game/Overlays/BeatmapSetOverlay.cs
+++ b/osu.Game/Overlays/BeatmapSetOverlay.cs
@@ -6,7 +6,6 @@ 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.Graphics.Containers;
@@ -16,10 +15,11 @@ using osu.Game.Overlays.BeatmapSet.Scores;
 using osu.Game.Overlays.Comments;
 using osu.Game.Rulesets;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Overlays
 {
-    public class BeatmapSetOverlay : FullscreenOverlay<OverlayHeader> // we don't provide a standard header for now.
+    public class BeatmapSetOverlay : WebOverlay<OverlayHeader> // we don't provide a standard header for now.
     {
         public const float X_PADDING = 40;
         public const float Y_PADDING = 25;
@@ -36,55 +36,40 @@ namespace osu.Game.Overlays
         // receive input outside our bounds so we can trigger a close event on ourselves.
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
 
-        private readonly Box background;
-
         public BeatmapSetOverlay()
-            : base(OverlayColourScheme.Blue, null)
+            : base(OverlayColourScheme.Blue)
         {
-            OverlayScrollContainer scroll;
             Info info;
             CommentsSection comments;
 
-            Children = new Drawable[]
+            Child = new FillFlowContainer
             {
-                background = new Box
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(0, 20),
+                Children = new Drawable[]
                 {
-                    RelativeSizeAxes = Axes.Both
-                },
-                scroll = new OverlayScrollContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    ScrollbarVisible = false,
-                    Child = new ReverseChildIDFillFlowContainer<BeatmapSetLayoutSection>
+                    new BeatmapSetLayoutSection
                     {
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Direction = FillDirection.Vertical,
-                        Spacing = new Vector2(0, 20),
-                        Children = new[]
+                        Child = new ReverseChildIDFillFlowContainer<Drawable>
                         {
-                            new BeatmapSetLayoutSection
+                            AutoSizeAxes = Axes.Y,
+                            RelativeSizeAxes = Axes.X,
+                            Direction = FillDirection.Vertical,
+                            Children = new Drawable[]
                             {
-                                Child = new ReverseChildIDFillFlowContainer<Drawable>
-                                {
-                                    AutoSizeAxes = Axes.Y,
-                                    RelativeSizeAxes = Axes.X,
-                                    Direction = FillDirection.Vertical,
-                                    Children = new Drawable[]
-                                    {
-                                        Header = new Header(),
-                                        info = new Info()
-                                    }
-                                },
-                            },
-                            new ScoresContainer
-                            {
-                                Beatmap = { BindTarget = Header.Picker.Beatmap }
-                            },
-                            comments = new CommentsSection()
+                                Header = new Header(),
+                                info = new Info()
+                            }
                         },
                     },
-                },
+                    new ScoresContainer
+                    {
+                        Beatmap = { BindTarget = Header.Picker.Beatmap }
+                    },
+                    comments = new CommentsSection()
+                }
             };
 
             Header.BeatmapSet.BindTo(beatmapSet);
@@ -94,16 +79,13 @@ namespace osu.Game.Overlays
             Header.Picker.Beatmap.ValueChanged += b =>
             {
                 info.Beatmap = b.NewValue;
-
-                scroll.ScrollToStart();
+                ScrollFlow.ScrollToStart();
             };
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            background.Colour = ColourProvider.Background6;
-        }
+        protected override OverlayHeader CreateHeader() => null;
+
+        protected override Color4 GetBackgroundColour() => ColourProvider.Background6;
 
         protected override void PopOutComplete()
         {
diff --git a/osu.Game/Overlays/ChangelogOverlay.cs b/osu.Game/Overlays/ChangelogOverlay.cs
index c7e9a86fa4..5d99887053 100644
--- a/osu.Game/Overlays/ChangelogOverlay.cs
+++ b/osu.Game/Overlays/ChangelogOverlay.cs
@@ -11,22 +11,18 @@ using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics.Containers;
 using osu.Game.Input.Bindings;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays.Changelog;
+using osuTK.Graphics;
 
 namespace osu.Game.Overlays
 {
-    public class ChangelogOverlay : FullscreenOverlay<ChangelogHeader>
+    public class ChangelogOverlay : WebOverlay<ChangelogHeader>
     {
         public readonly Bindable<APIChangelogBuild> Current = new Bindable<APIChangelogBuild>();
 
-        private Container<ChangelogContent> content;
-
         private SampleChannel sampleBack;
 
         private List<APIChangelogBuild> builds;
@@ -34,45 +30,14 @@ namespace osu.Game.Overlays
         protected List<APIUpdateStream> Streams;
 
         public ChangelogOverlay()
-            : base(OverlayColourScheme.Purple, new ChangelogHeader())
+            : base(OverlayColourScheme.Purple)
         {
         }
 
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
-            Children = new Drawable[]
-            {
-                new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = ColourProvider.Background4,
-                },
-                new OverlayScrollContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    ScrollbarVisible = false,
-                    Child = new ReverseChildIDFillFlowContainer<Drawable>
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Direction = FillDirection.Vertical,
-                        Children = new Drawable[]
-                        {
-                            Header.With(h =>
-                            {
-                                h.ListingSelected = ShowListing;
-                                h.Build.BindTarget = Current;
-                            }),
-                            content = new Container<ChangelogContent>
-                            {
-                                RelativeSizeAxes = Axes.X,
-                                AutoSizeAxes = Axes.Y,
-                            }
-                        },
-                    },
-                },
-            };
+            Header.Build.BindTarget = Current;
 
             sampleBack = audio.Samples.Get(@"UI/generic-select-soft");
 
@@ -85,6 +50,13 @@ namespace osu.Game.Overlays
             });
         }
 
+        protected override ChangelogHeader CreateHeader() => new ChangelogHeader
+        {
+            ListingSelected = ShowListing,
+        };
+
+        protected override Color4 GetBackgroundColour() => ColourProvider.Background4;
+
         public void ShowListing()
         {
             Current.Value = null;
@@ -198,16 +170,16 @@ namespace osu.Game.Overlays
 
         private void loadContent(ChangelogContent newContent)
         {
-            content.FadeTo(0.2f, 300, Easing.OutQuint);
+            Content.FadeTo(0.2f, 300, Easing.OutQuint);
 
             loadContentCancellation?.Cancel();
 
             LoadComponentAsync(newContent, c =>
             {
-                content.FadeIn(300, Easing.OutQuint);
+                Content.FadeIn(300, Easing.OutQuint);
 
                 c.BuildSelected = ShowBuild;
-                content.Child = c;
+                Child = c;
             }, (loadContentCancellation = new CancellationTokenSource()).Token);
         }
     }
diff --git a/osu.Game/Overlays/DashboardOverlay.cs b/osu.Game/Overlays/DashboardOverlay.cs
index 03c320debe..3722d36388 100644
--- a/osu.Game/Overlays/DashboardOverlay.cs
+++ b/osu.Game/Overlays/DashboardOverlay.cs
@@ -7,29 +7,18 @@ 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.UserInterface;
 using osu.Game.Online.API;
 using osu.Game.Overlays.Dashboard;
 using osu.Game.Overlays.Dashboard.Friends;
 
 namespace osu.Game.Overlays
 {
-    public class DashboardOverlay : FullscreenOverlay<DashboardOverlayHeader>
+    public class DashboardOverlay : WebOverlay<DashboardOverlayHeader>
     {
         private CancellationTokenSource cancellationToken;
 
-        private Container content;
-        private LoadingLayer loading;
-        private OverlayScrollContainer scrollFlow;
-
         public DashboardOverlay()
-            : base(OverlayColourScheme.Purple, new DashboardOverlayHeader
-            {
-                Anchor = Anchor.TopCentre,
-                Origin = Anchor.TopCentre,
-                Depth = -float.MaxValue
-            })
+            : base(OverlayColourScheme.Purple)
         {
         }
 
@@ -40,45 +29,16 @@ namespace osu.Game.Overlays
         {
             apiState.BindTo(api.State);
             apiState.BindValueChanged(onlineStateChanged, true);
-
-            Children = new Drawable[]
-            {
-                new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = ColourProvider.Background5
-                },
-                scrollFlow = new OverlayScrollContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    ScrollbarVisible = false,
-                    Child = new FillFlowContainer
-                    {
-                        AutoSizeAxes = Axes.Y,
-                        RelativeSizeAxes = Axes.X,
-                        Direction = FillDirection.Vertical,
-                        Children = new Drawable[]
-                        {
-                            Header,
-                            content = new Container
-                            {
-                                RelativeSizeAxes = Axes.X,
-                                AutoSizeAxes = Axes.Y
-                            }
-                        }
-                    }
-                },
-                loading = new LoadingLayer(true),
-            };
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
-
             Header.Current.BindValueChanged(onTabChanged);
         }
 
+        protected override DashboardOverlayHeader CreateHeader() => new DashboardOverlayHeader();
+
         private bool displayUpdateRequired = true;
 
         protected override void PopIn()
@@ -102,21 +62,21 @@ namespace osu.Game.Overlays
 
         private void loadDisplay(Drawable display)
         {
-            scrollFlow.ScrollToStart();
+            ScrollFlow.ScrollToStart();
 
             LoadComponentAsync(display, loaded =>
             {
                 if (API.IsLoggedIn)
-                    loading.Hide();
+                    Loading.Hide();
 
-                content.Child = loaded;
+                Child = loaded;
             }, (cancellationToken = new CancellationTokenSource()).Token);
         }
 
         private void onTabChanged(ValueChangedEvent<DashboardOverlayTabs> tab)
         {
             cancellationToken?.Cancel();
-            loading.Show();
+            Loading.Show();
 
             if (!API.IsLoggedIn)
             {
diff --git a/osu.Game/Overlays/FullscreenOverlay.cs b/osu.Game/Overlays/FullscreenOverlay.cs
index 6f56d95929..d65213f573 100644
--- a/osu.Game/Overlays/FullscreenOverlay.cs
+++ b/osu.Game/Overlays/FullscreenOverlay.cs
@@ -6,6 +6,7 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
+using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics.Containers;
 using osu.Game.Online.API;
 using osuTK.Graphics;
@@ -27,9 +28,13 @@ namespace osu.Game.Overlays
         [Cached]
         protected readonly OverlayColourProvider ColourProvider;
 
-        protected FullscreenOverlay(OverlayColourScheme colourScheme, T header)
+        protected override Container<Drawable> Content => content;
+
+        private readonly Container content;
+
+        protected FullscreenOverlay(OverlayColourScheme colourScheme)
         {
-            Header = header;
+            Header = CreateHeader();
 
             ColourProvider = new OverlayColourProvider(colourScheme);
 
@@ -47,6 +52,19 @@ namespace osu.Game.Overlays
                 Type = EdgeEffectType.Shadow,
                 Radius = 10
             };
+
+            base.Content.AddRange(new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = GetBackgroundColour()
+                },
+                content = new Container
+                {
+                    RelativeSizeAxes = Axes.Both
+                }
+            });
         }
 
         [BackgroundDependencyLoader]
@@ -58,6 +76,10 @@ namespace osu.Game.Overlays
             Waves.FourthWaveColour = ColourProvider.Dark3;
         }
 
+        protected abstract T CreateHeader();
+
+        protected virtual Color4 GetBackgroundColour() => ColourProvider.Background5;
+
         public override void Show()
         {
             if (State.Value == Visibility.Visible)
diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index 5820d405d4..268d2bb6a2 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -2,67 +2,22 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Threading;
-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.UserInterface;
 using osu.Game.Overlays.News;
 using osu.Game.Overlays.News.Displays;
 
 namespace osu.Game.Overlays
 {
-    public class NewsOverlay : FullscreenOverlay<NewsHeader>
+    public class NewsOverlay : WebOverlay<NewsHeader>
     {
         private readonly Bindable<string> article = new Bindable<string>(null);
 
-        private Container content;
-        private LoadingLayer loading;
-        private OverlayScrollContainer scrollFlow;
-
         public NewsOverlay()
-            : base(OverlayColourScheme.Purple, new NewsHeader())
+            : base(OverlayColourScheme.Purple)
         {
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            Children = new Drawable[]
-            {
-                new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = ColourProvider.Background5,
-                },
-                scrollFlow = new OverlayScrollContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    ScrollbarVisible = false,
-                    Child = new FillFlowContainer
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Direction = FillDirection.Vertical,
-                        Children = new Drawable[]
-                        {
-                            Header.With(h =>
-                            {
-                                h.ShowFrontPage = ShowFrontPage;
-                            }),
-                            content = new Container
-                            {
-                                RelativeSizeAxes = Axes.X,
-                                AutoSizeAxes = Axes.Y,
-                            }
-                        },
-                    },
-                },
-                loading = new LoadingLayer(true),
-            };
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -71,6 +26,11 @@ namespace osu.Game.Overlays
             article.BindValueChanged(onArticleChanged);
         }
 
+        protected override NewsHeader CreateHeader() => new NewsHeader
+        {
+            ShowFrontPage = ShowFrontPage
+        };
+
         private bool displayUpdateRequired = true;
 
         protected override void PopIn()
@@ -107,7 +67,7 @@ namespace osu.Game.Overlays
         private void onArticleChanged(ValueChangedEvent<string> e)
         {
             cancellationToken?.Cancel();
-            loading.Show();
+            Loading.Show();
 
             if (e.NewValue == null)
             {
@@ -122,11 +82,11 @@ namespace osu.Game.Overlays
 
         protected void LoadDisplay(Drawable display)
         {
-            scrollFlow.ScrollToStart();
+            ScrollFlow.ScrollToStart();
             LoadComponentAsync(display, loaded =>
             {
-                content.Child = loaded;
-                loading.Hide();
+                Child = loaded;
+                Loading.Hide();
             }, (cancellationToken = new CancellationTokenSource()).Token);
         }
 
diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index 25350e310a..89853e9044 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -4,96 +4,41 @@
 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.Overlays.Rankings;
 using osu.Game.Users;
 using osu.Game.Rulesets;
 using osu.Game.Online.API;
 using System.Threading;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API.Requests;
 using osu.Game.Overlays.Rankings.Tables;
 
 namespace osu.Game.Overlays
 {
-    public class RankingsOverlay : FullscreenOverlay<RankingsOverlayHeader>
+    public class RankingsOverlay : WebOverlay<RankingsOverlayHeader>
     {
         protected Bindable<Country> Country => Header.Country;
 
         protected Bindable<RankingsScope> Scope => Header.Current;
 
-        private readonly OverlayScrollContainer scrollFlow;
-        private readonly Container contentContainer;
-        private readonly LoadingLayer loading;
-        private readonly Box background;
-
         private APIRequest lastRequest;
         private CancellationTokenSource cancellationToken;
 
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        public RankingsOverlay()
-            : base(OverlayColourScheme.Green, new RankingsOverlayHeader
-            {
-                Anchor = Anchor.TopCentre,
-                Origin = Anchor.TopCentre,
-                Depth = -float.MaxValue
-            })
-        {
-            loading = new LoadingLayer(true);
+        [Resolved]
+        private Bindable<RulesetInfo> ruleset { get; set; }
 
-            Children = new Drawable[]
-            {
-                background = new Box
-                {
-                    RelativeSizeAxes = Axes.Both
-                },
-                scrollFlow = new OverlayScrollContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    ScrollbarVisible = false,
-                    Child = new FillFlowContainer
-                    {
-                        AutoSizeAxes = Axes.Y,
-                        RelativeSizeAxes = Axes.X,
-                        Direction = FillDirection.Vertical,
-                        Children = new Drawable[]
-                        {
-                            Header,
-                            new Container
-                            {
-                                RelativeSizeAxes = Axes.X,
-                                AutoSizeAxes = Axes.Y,
-                                Children = new Drawable[]
-                                {
-                                    contentContainer = new Container
-                                    {
-                                        Anchor = Anchor.TopCentre,
-                                        Origin = Anchor.TopCentre,
-                                        AutoSizeAxes = Axes.Y,
-                                        RelativeSizeAxes = Axes.X,
-                                        Margin = new MarginPadding { Bottom = 10 }
-                                    },
-                                }
-                            }
-                        }
-                    }
-                },
-                loading
-            };
+        public RankingsOverlay()
+            : base(OverlayColourScheme.Green)
+        {
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            background.Colour = ColourProvider.Background5;
         }
 
-        [Resolved]
-        private Bindable<RulesetInfo> ruleset { get; set; }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -129,6 +74,8 @@ namespace osu.Game.Overlays
             Scheduler.AddOnce(loadNewContent);
         }
 
+        protected override RankingsOverlayHeader CreateHeader() => new RankingsOverlayHeader();
+
         public void ShowCountry(Country requested)
         {
             if (requested == null)
@@ -147,7 +94,7 @@ namespace osu.Game.Overlays
 
         private void loadNewContent()
         {
-            loading.Show();
+            Loading.Show();
 
             cancellationToken?.Cancel();
             lastRequest?.Cancel();
@@ -218,19 +165,19 @@ namespace osu.Game.Overlays
 
         private void loadContent(Drawable content)
         {
-            scrollFlow.ScrollToStart();
+            ScrollFlow.ScrollToStart();
 
             if (content == null)
             {
-                contentContainer.Clear();
-                loading.Hide();
+                Clear();
+                Loading.Hide();
                 return;
             }
 
             LoadComponentAsync(content, loaded =>
             {
-                loading.Hide();
-                contentContainer.Child = loaded;
+                Loading.Hide();
+                Child = loaded;
             }, (cancellationToken = new CancellationTokenSource()).Token);
         }
 
diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs
index 81027667fa..c29df72501 100644
--- a/osu.Game/Overlays/UserProfileOverlay.cs
+++ b/osu.Game/Overlays/UserProfileOverlay.cs
@@ -15,6 +15,7 @@ using osu.Game.Overlays.Profile;
 using osu.Game.Overlays.Profile.Sections;
 using osu.Game.Users;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Overlays
 {
@@ -29,10 +30,14 @@ namespace osu.Game.Overlays
         public const float CONTENT_X_MARGIN = 70;
 
         public UserProfileOverlay()
-            : base(OverlayColourScheme.Pink, new ProfileHeader())
+            : base(OverlayColourScheme.Pink)
         {
         }
 
+        protected override ProfileHeader CreateHeader() => new ProfileHeader();
+
+        protected override Color4 GetBackgroundColour() => ColourProvider.Background6;
+
         public void ShowUser(int userId) => ShowUser(new User { Id = userId });
 
         public void ShowUser(User user, bool fetchOnline = true)
@@ -72,12 +77,6 @@ namespace osu.Game.Overlays
                 Origin = Anchor.TopCentre,
             };
 
-            Add(new Box
-            {
-                RelativeSizeAxes = Axes.Both,
-                Colour = ColourProvider.Background6
-            });
-
             Add(sectionsContainer = new ProfileSectionsContainer
             {
                 ExpandableHeader = Header,
diff --git a/osu.Game/Overlays/WebOverlay.cs b/osu.Game/Overlays/WebOverlay.cs
new file mode 100644
index 0000000000..aca767e32f
--- /dev/null
+++ b/osu.Game/Overlays/WebOverlay.cs
@@ -0,0 +1,50 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Overlays
+{
+    public abstract class WebOverlay<T> : FullscreenOverlay<T>
+        where T : OverlayHeader
+    {
+        protected override Container<Drawable> Content => content;
+
+        protected readonly OverlayScrollContainer ScrollFlow;
+        protected readonly LoadingLayer Loading;
+        private readonly Container content;
+
+        protected WebOverlay(OverlayColourScheme colourScheme)
+            : base(colourScheme)
+        {
+            FillFlowContainer flow = new FillFlowContainer
+            {
+                AutoSizeAxes = Axes.Y,
+                RelativeSizeAxes = Axes.X,
+                Direction = FillDirection.Vertical
+            };
+
+            if (Header != null)
+                flow.Add(Header.With(h => h.Depth = -float.MaxValue));
+
+            flow.Add(content = new Container
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y
+            });
+
+            base.Content.AddRange(new Drawable[]
+            {
+                ScrollFlow = new OverlayScrollContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    ScrollbarVisible = false,
+                    Child = flow
+                },
+                Loading = new LoadingLayer(true)
+            });
+        }
+    }
+}

From 88abee705b37d0a6c9db00aa7b8a3f5323703590 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 18 Jan 2021 10:48:53 +0300
Subject: [PATCH 0936/3722] Add missing event mapping for user beatmap
 availability change

---
 osu.Game/Online/Multiplayer/MultiplayerClient.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 50dc8f661c..6f789b1ef5 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -81,6 +81,7 @@ namespace osu.Game.Online.Multiplayer
             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);
+            connection.On<int, BeatmapAvailability>(nameof(IMultiplayerClient.UserBeatmapAvailabilityChanged), ((IMultiplayerClient)this).UserBeatmapAvailabilityChanged);
             connection.On(nameof(IMultiplayerClient.LoadRequested), ((IMultiplayerClient)this).LoadRequested);
             connection.On(nameof(IMultiplayerClient.MatchStarted), ((IMultiplayerClient)this).MatchStarted);
             connection.On(nameof(IMultiplayerClient.ResultsReady), ((IMultiplayerClient)this).ResultsReady);

From 4e6c1a3906ed40be5752b13994499f73b4c10142 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 18 Jan 2021 10:49:38 +0300
Subject: [PATCH 0937/3722] Update client beatmap availability in-line with
 tracker

---
 .../Screens/OnlinePlay/Match/RoomSubScreen.cs |  2 ++
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 20 +++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index c049d4be20..7569da00f2 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -43,6 +43,8 @@ namespace osu.Game.Screens.OnlinePlay.Match
         [Cached]
         protected readonly MultiplayerBeatmapTracker BeatmapTracker;
 
+        protected IBindable<BeatmapAvailability> BeatmapAvailability => BeatmapTracker.Availability;
+
         protected RoomSubScreen()
         {
             InternalChild = BeatmapTracker = new MultiplayerBeatmapTracker
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index a641935b9a..94288673fb 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -184,7 +184,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             base.LoadComplete();
 
             Playlist.BindCollectionChanged(onPlaylistChanged, true);
+            BeatmapAvailability.BindValueChanged(updateClientAvailability, true);
 
+            client.RoomUpdated += onRoomUpdated;
             client.LoadRequested += onLoadRequested;
 
             isConnected = client.IsConnected.GetBoundCopy();
@@ -208,6 +210,21 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e) => SelectedItem.Value = Playlist.FirstOrDefault();
 
+        private void updateClientAvailability(ValueChangedEvent<BeatmapAvailability> _ = null)
+        {
+            if (client.Room != null)
+                client.ChangeBeatmapAvailability(BeatmapAvailability.Value).CatchUnobservedExceptions(true);
+        }
+
+        private void onRoomUpdated()
+        {
+            if (client.Room == null)
+                return;
+
+            if (client.LocalUser?.BeatmapAvailability.Equals(BeatmapAvailability.Value) == false)
+                updateClientAvailability();
+        }
+
         private void onReadyClick()
         {
             Debug.Assert(readyClickOperation == null);
@@ -262,7 +279,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             base.Dispose(isDisposing);
 
             if (client != null)
+            {
                 client.LoadRequested -= onLoadRequested;
+                client.RoomUpdated -= onRoomUpdated;
+            }
         }
     }
 }

From bd44bf8c0b9348f9443df2dfc95470d86bd80ecf Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 18 Jan 2021 10:46:48 +0300
Subject: [PATCH 0938/3722] Extract disabling progress bar user-interactivity

---
 osu.Game/Graphics/UserInterface/ProgressBar.cs            | 8 +++++++-
 .../Overlays/BeatmapListing/Panels/DownloadProgressBar.cs | 8 +-------
 osu.Game/Overlays/NowPlayingOverlay.cs                    | 5 +++++
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/ProgressBar.cs b/osu.Game/Graphics/UserInterface/ProgressBar.cs
index d271cd121c..4ee1c73bf5 100644
--- a/osu.Game/Graphics/UserInterface/ProgressBar.cs
+++ b/osu.Game/Graphics/UserInterface/ProgressBar.cs
@@ -40,8 +40,14 @@ namespace osu.Game.Graphics.UserInterface
             set => CurrentNumber.Value = value;
         }
 
-        public ProgressBar()
+        private readonly bool userInteractive;
+        public override bool HandlePositionalInput => userInteractive;
+        public override bool HandleNonPositionalInput => userInteractive;
+
+        public ProgressBar(bool userInteractive)
         {
+            this.userInteractive = userInteractive;
+
             CurrentNumber.MinValue = 0;
             CurrentNumber.MaxValue = 1;
             RelativeSizeAxes = Axes.X;
diff --git a/osu.Game/Overlays/BeatmapListing/Panels/DownloadProgressBar.cs b/osu.Game/Overlays/BeatmapListing/Panels/DownloadProgressBar.cs
index 6a2f2e4569..ca94078401 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/DownloadProgressBar.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/DownloadProgressBar.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
         public DownloadProgressBar(BeatmapSetInfo beatmapSet)
             : base(beatmapSet)
         {
-            AddInternal(progressBar = new InteractionDisabledProgressBar
+            AddInternal(progressBar = new ProgressBar(false)
             {
                 Height = 0,
                 Alpha = 0,
@@ -64,11 +64,5 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                 }
             }, true);
         }
-
-        private class InteractionDisabledProgressBar : ProgressBar
-        {
-            public override bool HandlePositionalInput => false;
-            public override bool HandleNonPositionalInput => false;
-        }
     }
 }
diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 9beb859f28..d64c61044d 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -411,6 +411,11 @@ namespace osu.Game.Overlays
 
         private class HoverableProgressBar : ProgressBar
         {
+            public HoverableProgressBar()
+                : base(true)
+            {
+            }
+
             protected override bool OnHover(HoverEvent e)
             {
                 this.ResizeHeightTo(progress_height, 500, Easing.OutQuint);

From 02d2b2742b66d1bf6b9899430d90580f69872db1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Jan 2021 16:57:36 +0900
Subject: [PATCH 0939/3722] Fix selection box not updating with
 hitcircles/sliders far in the future or past

---
 .../Edit/Blueprints/HitCircles/HitCircleSelectionBlueprint.cs   | 2 +-
 .../Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs         | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCircleSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCircleSelectionBlueprint.cs
index 093bae854e..abbb54e3c1 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCircleSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCircleSelectionBlueprint.cs
@@ -30,6 +30,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => DrawableObject.HitArea.ReceivePositionalInputAt(screenSpacePos);
 
-        public override Quad SelectionQuad => DrawableObject.HitArea.ScreenSpaceDrawQuad;
+        public override Quad SelectionQuad => CirclePiece.ScreenSpaceDrawQuad;
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index d592e129d9..3d3dff653a 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -44,6 +44,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         [Resolved(CanBeNull = true)]
         private IEditorChangeHandler changeHandler { get; set; }
 
+        public override Quad SelectionQuad => BodyPiece.ScreenSpaceDrawQuad;
+
         private readonly BindableList<PathControlPoint> controlPoints = new BindableList<PathControlPoint>();
         private readonly IBindable<int> pathVersion = new Bindable<int>();
 

From c79ab63743e14b4205e40f33d5ae4519dfbeb58e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Jan 2021 16:56:10 +0900
Subject: [PATCH 0940/3722] Fix sliders with an even number of repeats not
 allowing rotation/scale transforms

---
 osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 660e1844aa..91bb665ee2 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -236,7 +236,18 @@ namespace osu.Game.Rulesets.Osu.Edit
         /// </summary>
         /// <param name="hitObjects">The hit objects to calculate a quad for.</param>
         private Quad getSurroundingQuad(OsuHitObject[] hitObjects) =>
-            getSurroundingQuad(hitObjects.SelectMany(h => new[] { h.Position, h.EndPosition }));
+            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>
         /// Returns a gamefield-space quad surrounding the provided points.

From 6deb10e0750423c60175975edf62e383535dc346 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 18 Jan 2021 11:09:45 +0300
Subject: [PATCH 0941/3722] Add UI state display for each client's beatmap
 availability

---
 .../Participants/ParticipantPanel.cs          |   2 +-
 .../Multiplayer/Participants/StateDisplay.cs  | 193 +++++++++++-------
 2 files changed, 119 insertions(+), 76 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index f99655e305..17bf3a58ec 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -143,7 +143,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 
             const double fade_time = 50;
 
-            userStateDisplay.Status = User.State;
+            userStateDisplay.UpdateStatus(User.State, User.BeatmapAvailability);
 
             if (Room.Host?.Equals(User) == true)
                 crown.FadeIn(fade_time);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
index 8d2879fc93..4245628a59 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.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.Diagnostics;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -8,119 +9,161 @@ 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.Online;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 {
     public class StateDisplay : CompositeDrawable
     {
+        private const double fade_time = 50;
+
+        private SpriteIcon icon;
+        private OsuSpriteText text;
+        private ProgressBar progressBar;
+
         public StateDisplay()
         {
             AutoSizeAxes = Axes.Both;
             Alpha = 0;
         }
 
-        private MultiplayerUserState status;
-
-        private OsuSpriteText text;
-        private SpriteIcon icon;
-
-        private const double fade_time = 50;
-
-        public MultiplayerUserState Status
-        {
-            set
-            {
-                if (value == status)
-                    return;
-
-                status = value;
-
-                if (IsLoaded)
-                    updateStatus();
-            }
-        }
-
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(OsuColour colours)
         {
+            this.colours = colours;
+
             InternalChild = new FillFlowContainer
             {
                 AutoSizeAxes = Axes.Both,
+                Anchor = Anchor.CentreRight,
+                Origin = Anchor.CentreRight,
                 Spacing = new Vector2(5),
                 Children = new Drawable[]
                 {
-                    text = new OsuSpriteText
-                    {
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                        Font = OsuFont.GetFont(weight: FontWeight.Regular, size: 12),
-                        Colour = Color4Extensions.FromHex("#DDFFFF")
-                    },
                     icon = new SpriteIcon
                     {
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.CentreRight,
                         Icon = FontAwesome.Solid.CheckCircle,
                         Size = new Vector2(12),
-                    }
+                    },
+                    new CircularContainer
+                    {
+                        Masking = true,
+                        AutoSizeAxes = Axes.Both,
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.CentreRight,
+                        Children = new Drawable[]
+                        {
+                            progressBar = new ProgressBar(false)
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                BackgroundColour = Color4.Black.Opacity(0.4f),
+                                FillColour = colours.Blue,
+                                Alpha = 0f,
+                            },
+                            text = new OsuSpriteText
+                            {
+                                Padding = new MarginPadding { Horizontal = 5f, Vertical = 1f },
+                                Anchor = Anchor.CentreRight,
+                                Origin = Anchor.CentreRight,
+                                Font = OsuFont.GetFont(weight: FontWeight.Regular, size: 12),
+                                Colour = Color4Extensions.FromHex("#DDFFFF")
+                            },
+                        }
+                    },
                 }
             };
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            updateStatus();
-        }
+        private OsuColour colours;
 
-        [Resolved]
-        private OsuColour colours { get; set; }
-
-        private void updateStatus()
+        public void UpdateStatus(MultiplayerUserState state, BeatmapAvailability availability)
         {
-            switch (status)
+            if (availability.State != DownloadState.LocallyAvailable)
             {
-                default:
-                    this.FadeOut(fade_time);
-                    return;
+                switch (availability.State)
+                {
+                    case DownloadState.NotDownloaded:
+                        progressBar.FadeOut(fade_time);
+                        text.Text = "no map";
+                        icon.Icon = FontAwesome.Solid.MinusCircle;
+                        icon.Colour = colours.RedLight;
+                        break;
 
-                case MultiplayerUserState.Ready:
-                    text.Text = "ready";
-                    icon.Icon = FontAwesome.Solid.CheckCircle;
-                    icon.Colour = Color4Extensions.FromHex("#AADD00");
-                    break;
+                    case DownloadState.Downloading:
+                        Debug.Assert(availability.DownloadProgress != null);
 
-                case MultiplayerUserState.WaitingForLoad:
-                    text.Text = "loading";
-                    icon.Icon = FontAwesome.Solid.PauseCircle;
-                    icon.Colour = colours.Yellow;
-                    break;
+                        var progress = availability.DownloadProgress.Value;
+                        progressBar.FadeIn(fade_time);
+                        progressBar.CurrentTime = progress;
 
-                case MultiplayerUserState.Loaded:
-                    text.Text = "loaded";
-                    icon.Icon = FontAwesome.Solid.DotCircle;
-                    icon.Colour = colours.YellowLight;
-                    break;
+                        text.Text = "downloading map";
+                        icon.Icon = FontAwesome.Solid.ArrowAltCircleDown;
+                        icon.Colour = colours.Blue;
+                        break;
 
-                case MultiplayerUserState.Playing:
-                    text.Text = "playing";
-                    icon.Icon = FontAwesome.Solid.PlayCircle;
-                    icon.Colour = colours.BlueLight;
-                    break;
+                    case DownloadState.Importing:
+                        progressBar.FadeOut(fade_time);
+                        text.Text = "importing map";
+                        icon.Icon = FontAwesome.Solid.ArrowAltCircleDown;
+                        icon.Colour = colours.Yellow;
+                        break;
+                }
+            }
+            else
+            {
+                progressBar.FadeOut(fade_time);
 
-                case MultiplayerUserState.FinishedPlay:
-                    text.Text = "results pending";
-                    icon.Icon = FontAwesome.Solid.ArrowAltCircleUp;
-                    icon.Colour = colours.BlueLighter;
-                    break;
+                switch (state)
+                {
+                    default:
+                        this.FadeOut(fade_time);
+                        return;
 
-                case MultiplayerUserState.Results:
-                    text.Text = "results";
-                    icon.Icon = FontAwesome.Solid.ArrowAltCircleUp;
-                    icon.Colour = colours.BlueLighter;
-                    break;
+                    case MultiplayerUserState.Ready:
+                        text.Text = "ready";
+                        icon.Icon = FontAwesome.Solid.CheckCircle;
+                        icon.Colour = Color4Extensions.FromHex("#AADD00");
+                        break;
+
+                    case MultiplayerUserState.WaitingForLoad:
+                        text.Text = "loading";
+                        icon.Icon = FontAwesome.Solid.PauseCircle;
+                        icon.Colour = colours.Yellow;
+                        break;
+
+                    case MultiplayerUserState.Loaded:
+                        text.Text = "loaded";
+                        icon.Icon = FontAwesome.Solid.DotCircle;
+                        icon.Colour = colours.YellowLight;
+                        break;
+
+                    case MultiplayerUserState.Playing:
+                        text.Text = "playing";
+                        icon.Icon = FontAwesome.Solid.PlayCircle;
+                        icon.Colour = colours.BlueLight;
+                        break;
+
+                    case MultiplayerUserState.FinishedPlay:
+                        text.Text = "results pending";
+                        icon.Icon = FontAwesome.Solid.ArrowAltCircleUp;
+                        icon.Colour = colours.BlueLighter;
+                        break;
+
+                    case MultiplayerUserState.Results:
+                        text.Text = "results";
+                        icon.Icon = FontAwesome.Solid.ArrowAltCircleUp;
+                        icon.Colour = colours.BlueLighter;
+                        break;
+                }
             }
 
             this.FadeIn(fade_time);

From 6e34ab5d152f37d19702ff305c2a53323e89ef75 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 18 Jan 2021 11:13:38 +0300
Subject: [PATCH 0942/3722] Rename WebOverlay to OnlineOverlay

---
 osu.Game/Overlays/BeatmapListingOverlay.cs            | 2 +-
 osu.Game/Overlays/BeatmapSetOverlay.cs                | 2 +-
 osu.Game/Overlays/ChangelogOverlay.cs                 | 2 +-
 osu.Game/Overlays/DashboardOverlay.cs                 | 2 +-
 osu.Game/Overlays/NewsOverlay.cs                      | 2 +-
 osu.Game/Overlays/{WebOverlay.cs => OnlineOverlay.cs} | 4 ++--
 osu.Game/Overlays/RankingsOverlay.cs                  | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)
 rename osu.Game/Overlays/{WebOverlay.cs => OnlineOverlay.cs} (91%)

diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index ae1667d403..eafb7e95d5 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -23,7 +23,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays
 {
-    public class BeatmapListingOverlay : WebOverlay<BeatmapListingHeader>
+    public class BeatmapListingOverlay : OnlineOverlay<BeatmapListingHeader>
     {
         [Resolved]
         private PreviewTrackManager previewTrackManager { get; set; }
diff --git a/osu.Game/Overlays/BeatmapSetOverlay.cs b/osu.Game/Overlays/BeatmapSetOverlay.cs
index 10953415ed..872621801a 100644
--- a/osu.Game/Overlays/BeatmapSetOverlay.cs
+++ b/osu.Game/Overlays/BeatmapSetOverlay.cs
@@ -19,7 +19,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays
 {
-    public class BeatmapSetOverlay : WebOverlay<OverlayHeader> // we don't provide a standard header for now.
+    public class BeatmapSetOverlay : OnlineOverlay<OverlayHeader> // we don't provide a standard header for now.
     {
         public const float X_PADDING = 40;
         public const float Y_PADDING = 25;
diff --git a/osu.Game/Overlays/ChangelogOverlay.cs b/osu.Game/Overlays/ChangelogOverlay.cs
index 5d99887053..5200b567ff 100644
--- a/osu.Game/Overlays/ChangelogOverlay.cs
+++ b/osu.Game/Overlays/ChangelogOverlay.cs
@@ -19,7 +19,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays
 {
-    public class ChangelogOverlay : WebOverlay<ChangelogHeader>
+    public class ChangelogOverlay : OnlineOverlay<ChangelogHeader>
     {
         public readonly Bindable<APIChangelogBuild> Current = new Bindable<APIChangelogBuild>();
 
diff --git a/osu.Game/Overlays/DashboardOverlay.cs b/osu.Game/Overlays/DashboardOverlay.cs
index 3722d36388..39a23fe3d4 100644
--- a/osu.Game/Overlays/DashboardOverlay.cs
+++ b/osu.Game/Overlays/DashboardOverlay.cs
@@ -13,7 +13,7 @@ using osu.Game.Overlays.Dashboard.Friends;
 
 namespace osu.Game.Overlays
 {
-    public class DashboardOverlay : WebOverlay<DashboardOverlayHeader>
+    public class DashboardOverlay : OnlineOverlay<DashboardOverlayHeader>
     {
         private CancellationTokenSource cancellationToken;
 
diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index 268d2bb6a2..08e8331dd3 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -9,7 +9,7 @@ using osu.Game.Overlays.News.Displays;
 
 namespace osu.Game.Overlays
 {
-    public class NewsOverlay : WebOverlay<NewsHeader>
+    public class NewsOverlay : OnlineOverlay<NewsHeader>
     {
         private readonly Bindable<string> article = new Bindable<string>(null);
 
diff --git a/osu.Game/Overlays/WebOverlay.cs b/osu.Game/Overlays/OnlineOverlay.cs
similarity index 91%
rename from osu.Game/Overlays/WebOverlay.cs
rename to osu.Game/Overlays/OnlineOverlay.cs
index aca767e32f..b44ccc32c9 100644
--- a/osu.Game/Overlays/WebOverlay.cs
+++ b/osu.Game/Overlays/OnlineOverlay.cs
@@ -7,7 +7,7 @@ using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays
 {
-    public abstract class WebOverlay<T> : FullscreenOverlay<T>
+    public abstract class OnlineOverlay<T> : FullscreenOverlay<T>
         where T : OverlayHeader
     {
         protected override Container<Drawable> Content => content;
@@ -16,7 +16,7 @@ namespace osu.Game.Overlays
         protected readonly LoadingLayer Loading;
         private readonly Container content;
 
-        protected WebOverlay(OverlayColourScheme colourScheme)
+        protected OnlineOverlay(OverlayColourScheme colourScheme)
             : base(colourScheme)
         {
             FillFlowContainer flow = new FillFlowContainer
diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index 89853e9044..f6bbac4407 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -14,7 +14,7 @@ using osu.Game.Overlays.Rankings.Tables;
 
 namespace osu.Game.Overlays
 {
-    public class RankingsOverlay : WebOverlay<RankingsOverlayHeader>
+    public class RankingsOverlay : OnlineOverlay<RankingsOverlayHeader>
     {
         protected Bindable<Country> Country => Header.Country;
 

From 2f1d4bf51b0964aded4fa5d31be592c7da3eb482 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Jan 2021 17:13:47 +0900
Subject: [PATCH 0943/3722] Add missing braces

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

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 91bb665ee2..871339ae7b 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -239,12 +239,14 @@ namespace osu.Game.Rulesets.Osu.Edit
             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 5f2e9c5485d854c3a5a85dee64613226fd77cd38 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 18 Jan 2021 11:10:38 +0300
Subject: [PATCH 0944/3722] Add visual test case for displaying beatmap
 availability states

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

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index 968a869532..e2f1a13593 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
@@ -7,7 +7,9 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
+using osu.Game.Online;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Participants;
 using osu.Game.Users;
 using osuTK;
@@ -73,6 +75,20 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("single panel is for second user", () => this.ChildrenOfType<ParticipantPanel>().Single().User.User == secondUser);
         }
 
+        [Test]
+        public void TestBeatmapDownloadingStates()
+        {
+            AddStep("set to no map", () => Client.ChangeBeatmapAvailability(BeatmapAvailability.NotDownloaded()));
+            AddStep("set to downloading map", () => Client.ChangeBeatmapAvailability(BeatmapAvailability.Downloading(0)));
+            AddRepeatStep("increment progress", () =>
+            {
+                var progress = this.ChildrenOfType<ParticipantPanel>().Single().User.BeatmapAvailability.DownloadProgress ?? 0;
+                Client.ChangeBeatmapAvailability(BeatmapAvailability.Downloading(progress + RNG.NextSingle(0.1f)));
+            }, 25);
+            AddStep("set to importing map", () => Client.ChangeBeatmapAvailability(BeatmapAvailability.Importing()));
+            AddStep("set to available", () => Client.ChangeBeatmapAvailability(BeatmapAvailability.LocallyAvailable()));
+        }
+
         [Test]
         public void TestToggleReadyState()
         {
@@ -120,6 +136,26 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     });
 
                     Client.ChangeUserState(i, (MultiplayerUserState)RNG.Next(0, (int)MultiplayerUserState.Results + 1));
+
+                    if (RNG.NextBool())
+                    {
+                        var beatmapState = (DownloadState)RNG.Next(0, (int)DownloadState.LocallyAvailable + 1);
+
+                        switch (beatmapState)
+                        {
+                            case DownloadState.NotDownloaded:
+                                Client.ChangeUserBeatmapAvailability(i, BeatmapAvailability.NotDownloaded());
+                                break;
+
+                            case DownloadState.Downloading:
+                                Client.ChangeUserBeatmapAvailability(i, BeatmapAvailability.Downloading(RNG.NextSingle()));
+                                break;
+
+                            case DownloadState.Importing:
+                                Client.ChangeUserBeatmapAvailability(i, BeatmapAvailability.Importing());
+                                break;
+                        }
+                    }
                 }
             });
         }

From 0b165dce4bbbb0647ccbdae48b8d2621173655f6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Jan 2021 17:50:32 +0900
Subject: [PATCH 0945/3722] Fix multiplayer mod select showing autoplay as a
 choice

---
 osu.Game/OsuGameBase.cs                                   | 1 +
 osu.Game/Overlays/Mods/ModSelectOverlay.cs                | 7 +++++--
 .../OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs  | 5 +++++
 osu.Game/Screens/Select/SongSelect.cs                     | 8 +++-----
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 1f8ae54e55..20d88d33f2 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -327,6 +327,7 @@ namespace osu.Game
 
             if (!SelectedMods.Disabled)
                 SelectedMods.Value = Array.Empty<Mod>();
+
             AvailableMods.Value = dict;
         }
 
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 0c8245bebe..b93602116b 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -30,6 +30,7 @@ namespace osu.Game.Overlays.Mods
 {
     public class ModSelectOverlay : WaveOverlayContainer
     {
+        private readonly Func<Mod, bool> isValidMod;
         public const float HEIGHT = 510;
 
         protected readonly TriangleButton DeselectAllButton;
@@ -60,8 +61,10 @@ namespace osu.Game.Overlays.Mods
 
         private SampleChannel sampleOn, sampleOff;
 
-        public ModSelectOverlay()
+        public ModSelectOverlay(Func<Mod, bool> isValidMod = null)
         {
+            this.isValidMod = isValidMod ?? (m => true);
+
             Waves.FirstWaveColour = Color4Extensions.FromHex(@"19b0e2");
             Waves.SecondWaveColour = Color4Extensions.FromHex(@"2280a2");
             Waves.ThirdWaveColour = Color4Extensions.FromHex(@"005774");
@@ -403,7 +406,7 @@ namespace osu.Game.Overlays.Mods
             if (mods.NewValue == null) return;
 
             foreach (var section in ModSectionsContainer.Children)
-                section.Mods = mods.NewValue[section.ModType];
+                section.Mods = mods.NewValue[section.ModType].Where(isValidMod);
         }
 
         private void selectedModsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index 36dbb9e792..ebc06d2445 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -13,6 +13,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
+using osu.Game.Overlays.Mods;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Select;
@@ -109,5 +110,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         }
 
         protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea();
+
+        protected override ModSelectOverlay CreateModSelectOverlay() => new ModSelectOverlay(isValidMod);
+
+        private bool isValidMod(Mod mod) => !(mod is ModAutoplay) && (mod as MultiMod)?.Mods.Any(mm => mm is ModAutoplay) != true;
     }
 }
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 6c0bd3a228..4fca77a176 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -251,11 +251,7 @@ namespace osu.Game.Screens.Select
                                     Children = new Drawable[]
                                     {
                                         BeatmapOptions = new BeatmapOptionsOverlay(),
-                                        ModSelect = new ModSelectOverlay
-                                        {
-                                            Origin = Anchor.BottomCentre,
-                                            Anchor = Anchor.BottomCentre,
-                                        }
+                                        ModSelect = CreateModSelectOverlay()
                                     }
                                 }
                             }
@@ -305,6 +301,8 @@ namespace osu.Game.Screens.Select
             }
         }
 
+        protected virtual ModSelectOverlay CreateModSelectOverlay() => new ModSelectOverlay();
+
         protected virtual void ApplyFilterToCarousel(FilterCriteria criteria)
         {
             // if not the current screen, we want to get carousel in a good presentation state before displaying (resume or enter).

From 1359153382232fc303dd1ded30048545c4aa0638 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Jan 2021 17:54:22 +0900
Subject: [PATCH 0946/3722] Revert "Test removing nuget restore from
 iOS/Android build scripts"

This reverts commit 39746cb3de8ad11221ff1766822f720918d49858.
---
 fastlane/Fastfile | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 18b5907e82..8c278604aa 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -48,6 +48,10 @@ desc 'Deploy to play store'
 
   desc 'Compile the project'
   lane :build do |options|
+    nuget_restore(
+      project_path: 'osu.sln'
+    )
+
     souyuz(
       build_configuration: 'Release',
       solution_path: 'osu.sln',
@@ -103,6 +107,10 @@ platform :ios do
 
   desc 'Compile the project'
   lane :build do
+    nuget_restore(
+      project_path: 'osu.sln'
+    )
+
     souyuz(
       platform: "ios",
       plist_path: "osu.iOS/Info.plist"

From 46681322d0489d0829114fc87071b7e5c8f0c525 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Jan 2021 17:56:00 +0900
Subject: [PATCH 0947/3722] Restore nuget packages per project to avoid
 toolchain incompatibilities with net50

---
 fastlane/Fastfile | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 8c278604aa..1823b9e924 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -48,9 +48,8 @@ desc 'Deploy to play store'
 
   desc 'Compile the project'
   lane :build do |options|
-    nuget_restore(
-      project_path: 'osu.sln'
-    )
+    nuget_restore(project_path: 'osu.Android/osu.Android.csproj')
+    nuget_restore(project_path: 'osu.Game/osu.Game.csproj')
 
     souyuz(
       build_configuration: 'Release',
@@ -107,9 +106,8 @@ platform :ios do
 
   desc 'Compile the project'
   lane :build do
-    nuget_restore(
-      project_path: 'osu.sln'
-    )
+    nuget_restore(project_path: 'osu.iOS/osu.iOS.csproj')
+    nuget_restore(project_path: 'osu.Game/osu.Game.csproj')
 
     souyuz(
       platform: "ios",

From 0560eb41201d0094d8321927bc3498502065c994 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Jan 2021 18:22:21 +0900
Subject: [PATCH 0948/3722] Reduce final fill alpha of main menu
 confirm-to-exit

---
 osu.Game/Overlays/HoldToConfirmOverlay.cs   | 13 +++++++++++--
 osu.Game/Screens/Menu/ExitConfirmOverlay.cs |  5 +++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/HoldToConfirmOverlay.cs b/osu.Game/Overlays/HoldToConfirmOverlay.cs
index eb325d8dd3..0542f66b5b 100644
--- a/osu.Game/Overlays/HoldToConfirmOverlay.cs
+++ b/osu.Game/Overlays/HoldToConfirmOverlay.cs
@@ -24,6 +24,13 @@ namespace osu.Game.Overlays
         [Resolved]
         private AudioManager audio { get; set; }
 
+        private readonly float finalFillAlpha;
+
+        protected HoldToConfirmOverlay(float finalFillAlpha = 1)
+        {
+            this.finalFillAlpha = finalFillAlpha;
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -42,8 +49,10 @@ namespace osu.Game.Overlays
 
             Progress.ValueChanged += p =>
             {
-                audioVolume.Value = 1 - p.NewValue;
-                overlay.Alpha = (float)p.NewValue;
+                var target = p.NewValue * finalFillAlpha;
+
+                audioVolume.Value = 1 - target;
+                overlay.Alpha = (float)target;
             };
 
             audio.Tracks.AddAdjustment(AdjustableProperty.Volume, audioVolume);
diff --git a/osu.Game/Screens/Menu/ExitConfirmOverlay.cs b/osu.Game/Screens/Menu/ExitConfirmOverlay.cs
index db2faeb60a..a491283e5f 100644
--- a/osu.Game/Screens/Menu/ExitConfirmOverlay.cs
+++ b/osu.Game/Screens/Menu/ExitConfirmOverlay.cs
@@ -13,6 +13,11 @@ namespace osu.Game.Screens.Menu
 
         public void Abort() => AbortConfirm();
 
+        public ExitConfirmOverlay()
+            : base(0.7f)
+        {
+        }
+
         public bool OnPressed(GlobalAction action)
         {
             if (action == GlobalAction.Back)

From 12443e39ae70060657f1b097bc7b9c6e35345e08 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Jan 2021 19:16:32 +0900
Subject: [PATCH 0949/3722] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index db5c933c41..9ad5946311 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.115.1" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.118.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 301ee39a61..2b8f81532d 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.115.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.118.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
     <PackageReference Include="Sentry" Version="2.1.8" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 225cf981f2..4732620085 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.115.1" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.118.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -88,7 +88,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.115.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.118.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From ced7a36788d7f61ce1163f043d872eb97ad44a02 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Jan 2021 21:24:10 +0900
Subject: [PATCH 0950/3722] Update namespaces

---
 osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs | 1 -
 osu.Game.Tests/Testing/TestSceneRulesetDependencies.cs          | 2 +-
 osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs             | 1 -
 osu.Game/Rulesets/UI/Playfield.cs                               | 2 +-
 osu.Game/Skinning/PoolableSkinnableSample.cs                    | 2 +-
 osu.Game/Skinning/SkinnableSound.cs                             | 2 +-
 6 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs b/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
index 33e3c7cb8c..987a5812db 100644
--- a/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
+++ b/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
@@ -9,7 +9,6 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
-using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
diff --git a/osu.Game.Tests/Testing/TestSceneRulesetDependencies.cs b/osu.Game.Tests/Testing/TestSceneRulesetDependencies.cs
index 80f1b02794..97087e31ab 100644
--- a/osu.Game.Tests/Testing/TestSceneRulesetDependencies.cs
+++ b/osu.Game.Tests/Testing/TestSceneRulesetDependencies.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Audio.Track;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Configuration.Tracking;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
diff --git a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
index b13b20dae2..81ec73a6c5 100644
--- a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
+++ b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
@@ -8,7 +8,6 @@ using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
-using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index b4e0025351..c40ab4bd94 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -8,7 +8,6 @@ using JetBrains.Annotations;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Framework.Allocation;
-using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics.Containers;
@@ -20,6 +19,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Skinning;
 using osuTK;
 using System.Diagnostics;
+using osu.Framework.Audio.Sample;
 
 namespace osu.Game.Rulesets.UI
 {
diff --git a/osu.Game/Skinning/PoolableSkinnableSample.cs b/osu.Game/Skinning/PoolableSkinnableSample.cs
index cc6b85a13e..2a0f480b48 100644
--- a/osu.Game/Skinning/PoolableSkinnableSample.cs
+++ b/osu.Game/Skinning/PoolableSkinnableSample.cs
@@ -5,7 +5,7 @@ using System;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
-using osu.Framework.Audio.Track;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Audio;
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index b841f99598..a874e9a0db 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
-using osu.Framework.Audio.Track;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;

From e6ceaad73233c8322f93554ebcbf136da5c47285 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 18 Jan 2021 17:23:51 +0300
Subject: [PATCH 0951/3722] Revert user state back to idle upon availability
 change

---
 .../Multiplayer/MultiplayerMatchSubScreen.cs      | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 94288673fb..826859c598 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -184,7 +184,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             base.LoadComplete();
 
             Playlist.BindCollectionChanged(onPlaylistChanged, true);
-            BeatmapAvailability.BindValueChanged(updateClientAvailability, true);
+            BeatmapAvailability.BindValueChanged(updateBeatmapAvailability, true);
 
             client.RoomUpdated += onRoomUpdated;
             client.LoadRequested += onLoadRequested;
@@ -210,10 +210,15 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e) => SelectedItem.Value = Playlist.FirstOrDefault();
 
-        private void updateClientAvailability(ValueChangedEvent<BeatmapAvailability> _ = null)
+        private void updateBeatmapAvailability(ValueChangedEvent<BeatmapAvailability> _ = null)
         {
-            if (client.Room != null)
-                client.ChangeBeatmapAvailability(BeatmapAvailability.Value).CatchUnobservedExceptions(true);
+            if (client.Room == null)
+                return;
+
+            client.ChangeBeatmapAvailability(BeatmapAvailability.Value).CatchUnobservedExceptions(true);
+
+            if (client.LocalUser?.State == MultiplayerUserState.Ready)
+                client.ChangeState(MultiplayerUserState.Idle).CatchUnobservedExceptions(true);
         }
 
         private void onRoomUpdated()
@@ -222,7 +227,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 return;
 
             if (client.LocalUser?.BeatmapAvailability.Equals(BeatmapAvailability.Value) == false)
-                updateClientAvailability();
+                updateBeatmapAvailability();
         }
 
         private void onReadyClick()

From e74ecebfd61440a47c7423b0802491ccc1930b7e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Jan 2021 23:45:57 +0900
Subject: [PATCH 0952/3722] nuget restore other rulesets

---
 fastlane/Fastfile | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 1823b9e924..cc5abf5b03 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -50,6 +50,10 @@ desc 'Deploy to play store'
   lane :build do |options|
     nuget_restore(project_path: 'osu.Android/osu.Android.csproj')
     nuget_restore(project_path: 'osu.Game/osu.Game.csproj')
+    nuget_restore(project_path: 'osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj')
+    nuget_restore(project_path: 'osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj')
+    nuget_restore(project_path: 'osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj')
+    nuget_restore(project_path: 'osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj')
 
     souyuz(
       build_configuration: 'Release',
@@ -108,6 +112,10 @@ platform :ios do
   lane :build do
     nuget_restore(project_path: 'osu.iOS/osu.iOS.csproj')
     nuget_restore(project_path: 'osu.Game/osu.Game.csproj')
+    nuget_restore(project_path: 'osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj')
+    nuget_restore(project_path: 'osu.Game.Rulesets.Taiko/osu.Game.Rulesets.Taiko.csproj')
+    nuget_restore(project_path: 'osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj')
+    nuget_restore(project_path: 'osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj')
 
     souyuz(
       platform: "ios",

From ddcfd854bd1c66b673d73e5459526ded76ebcb41 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 18 Jan 2021 19:20:19 +0300
Subject: [PATCH 0953/3722] Wait for scheduled state changes before asserting

---
 osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
index 4b8992052e..d692e6f9a3 100644
--- a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
+++ b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
@@ -130,6 +130,8 @@ namespace osu.Game.Tests.Online
 
         private void addAvailabilityCheckStep(string description, Func<BeatmapAvailability> expected)
         {
+            // In DownloadTrackingComposite, state changes are scheduled one frame later, wait one step.
+            AddWaitStep("wait for potential change", 1);
             AddAssert(description, () => tracker.Availability.Value.Equals(expected.Invoke()));
         }
 

From c6b0f3c247aa54a64d9e61c47643a09ea91ec177 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 18 Jan 2021 21:22:50 +0300
Subject: [PATCH 0954/3722] Implement TabbableOnlineOverlay component

---
 osu.Game/Overlays/DashboardOverlay.cs      |  92 ++-----------------
 osu.Game/Overlays/RankingsOverlay.cs       |  46 ++--------
 osu.Game/Overlays/TabbableOnlineOverlay.cs | 101 +++++++++++++++++++++
 3 files changed, 116 insertions(+), 123 deletions(-)
 create mode 100644 osu.Game/Overlays/TabbableOnlineOverlay.cs

diff --git a/osu.Game/Overlays/DashboardOverlay.cs b/osu.Game/Overlays/DashboardOverlay.cs
index 39a23fe3d4..83ad8faf1c 100644
--- a/osu.Game/Overlays/DashboardOverlay.cs
+++ b/osu.Game/Overlays/DashboardOverlay.cs
@@ -2,115 +2,35 @@
 // 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.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Online.API;
 using osu.Game.Overlays.Dashboard;
 using osu.Game.Overlays.Dashboard.Friends;
 
 namespace osu.Game.Overlays
 {
-    public class DashboardOverlay : OnlineOverlay<DashboardOverlayHeader>
+    public class DashboardOverlay : TabbableOnlineOverlay<DashboardOverlayHeader, DashboardOverlayTabs>
     {
-        private CancellationTokenSource cancellationToken;
-
         public DashboardOverlay()
             : base(OverlayColourScheme.Purple)
         {
         }
 
-        private readonly IBindable<APIState> apiState = new Bindable<APIState>();
-
-        [BackgroundDependencyLoader]
-        private void load(IAPIProvider api)
-        {
-            apiState.BindTo(api.State);
-            apiState.BindValueChanged(onlineStateChanged, true);
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            Header.Current.BindValueChanged(onTabChanged);
-        }
-
         protected override DashboardOverlayHeader CreateHeader() => new DashboardOverlayHeader();
 
-        private bool displayUpdateRequired = true;
-
-        protected override void PopIn()
+        protected override void CreateDisplayToLoad(DashboardOverlayTabs tab)
         {
-            base.PopIn();
-
-            // We don't want to create a new display on every call, only when exiting from fully closed state.
-            if (displayUpdateRequired)
-            {
-                Header.Current.TriggerChange();
-                displayUpdateRequired = false;
-            }
-        }
-
-        protected override void PopOutComplete()
-        {
-            base.PopOutComplete();
-            loadDisplay(Empty());
-            displayUpdateRequired = true;
-        }
-
-        private void loadDisplay(Drawable display)
-        {
-            ScrollFlow.ScrollToStart();
-
-            LoadComponentAsync(display, loaded =>
-            {
-                if (API.IsLoggedIn)
-                    Loading.Hide();
-
-                Child = loaded;
-            }, (cancellationToken = new CancellationTokenSource()).Token);
-        }
-
-        private void onTabChanged(ValueChangedEvent<DashboardOverlayTabs> tab)
-        {
-            cancellationToken?.Cancel();
-            Loading.Show();
-
-            if (!API.IsLoggedIn)
-            {
-                loadDisplay(Empty());
-                return;
-            }
-
-            switch (tab.NewValue)
+            switch (tab)
             {
                 case DashboardOverlayTabs.Friends:
-                    loadDisplay(new FriendDisplay());
+                    LoadDisplay(new FriendDisplay());
                     break;
 
                 case DashboardOverlayTabs.CurrentlyPlaying:
-                    loadDisplay(new CurrentlyPlayingDisplay());
+                    LoadDisplay(new CurrentlyPlayingDisplay());
                     break;
 
                 default:
-                    throw new NotImplementedException($"Display for {tab.NewValue} tab is not implemented");
+                    throw new NotImplementedException($"Display for {tab} tab is not implemented");
             }
         }
-
-        private void onlineStateChanged(ValueChangedEvent<APIState> state) => Schedule(() =>
-        {
-            if (State.Value == Visibility.Hidden)
-                return;
-
-            Header.Current.TriggerChange();
-        });
-
-        protected override void Dispose(bool isDisposing)
-        {
-            cancellationToken?.Cancel();
-            base.Dispose(isDisposing);
-        }
     }
 }
diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index f6bbac4407..6cd72d6e2c 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -8,20 +8,18 @@ using osu.Game.Overlays.Rankings;
 using osu.Game.Users;
 using osu.Game.Rulesets;
 using osu.Game.Online.API;
-using System.Threading;
 using osu.Game.Online.API.Requests;
 using osu.Game.Overlays.Rankings.Tables;
 
 namespace osu.Game.Overlays
 {
-    public class RankingsOverlay : OnlineOverlay<RankingsOverlayHeader>
+    public class RankingsOverlay : TabbableOnlineOverlay<RankingsOverlayHeader, RankingsScope>
     {
         protected Bindable<Country> Country => Header.Country;
 
         protected Bindable<RankingsScope> Scope => Header.Current;
 
         private APIRequest lastRequest;
-        private CancellationTokenSource cancellationToken;
 
         [Resolved]
         private IAPIProvider api { get; set; }
@@ -34,11 +32,6 @@ namespace osu.Game.Overlays
         {
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -54,6 +47,8 @@ namespace osu.Game.Overlays
                 Scheduler.AddOnce(loadNewContent);
             });
 
+            // Unbind events from scope so base class event will not be called
+            Scope.UnbindEvents();
             Scope.BindValueChanged(_ =>
             {
                 // country filtering is only valid for performance scope.
@@ -70,8 +65,6 @@ namespace osu.Game.Overlays
 
                 Scheduler.AddOnce(loadNewContent);
             });
-
-            Scheduler.AddOnce(loadNewContent);
         }
 
         protected override RankingsOverlayHeader CreateHeader() => new RankingsOverlayHeader();
@@ -92,16 +85,13 @@ namespace osu.Game.Overlays
             Show();
         }
 
-        private void loadNewContent()
+        protected override void CreateDisplayToLoad(RankingsScope tab)
         {
-            Loading.Show();
-
-            cancellationToken?.Cancel();
             lastRequest?.Cancel();
 
             if (Scope.Value == RankingsScope.Spotlights)
             {
-                loadContent(new SpotlightsLayout
+                LoadDisplay(new SpotlightsLayout
                 {
                     Ruleset = { BindTarget = ruleset }
                 });
@@ -113,12 +103,12 @@ namespace osu.Game.Overlays
 
             if (request == null)
             {
-                loadContent(null);
+                LoadDisplay(Empty());
                 return;
             }
 
-            request.Success += () => Schedule(() => loadContent(createTableFromResponse(request)));
-            request.Failure += _ => Schedule(() => loadContent(null));
+            request.Success += () => Schedule(() => LoadDisplay(createTableFromResponse(request)));
+            request.Failure += _ => Schedule(() => LoadDisplay(Empty()));
 
             api.Queue(request);
         }
@@ -163,29 +153,11 @@ namespace osu.Game.Overlays
             return null;
         }
 
-        private void loadContent(Drawable content)
-        {
-            ScrollFlow.ScrollToStart();
-
-            if (content == null)
-            {
-                Clear();
-                Loading.Hide();
-                return;
-            }
-
-            LoadComponentAsync(content, loaded =>
-            {
-                Loading.Hide();
-                Child = loaded;
-            }, (cancellationToken = new CancellationTokenSource()).Token);
-        }
+        private void loadNewContent() => OnTabChanged(Scope.Value);
 
         protected override void Dispose(bool isDisposing)
         {
             lastRequest?.Cancel();
-            cancellationToken?.Cancel();
-
             base.Dispose(isDisposing);
         }
     }
diff --git a/osu.Game/Overlays/TabbableOnlineOverlay.cs b/osu.Game/Overlays/TabbableOnlineOverlay.cs
new file mode 100644
index 0000000000..cbcf3cd96e
--- /dev/null
+++ b/osu.Game/Overlays/TabbableOnlineOverlay.cs
@@ -0,0 +1,101 @@
+// Copyright (c) ppy 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.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Online.API;
+
+namespace osu.Game.Overlays
+{
+    public abstract class TabbableOnlineOverlay<THeader, TEnum> : OnlineOverlay<THeader>
+        where THeader : TabControlOverlayHeader<TEnum>
+    {
+        private readonly IBindable<APIState> apiState = new Bindable<APIState>();
+
+        private CancellationTokenSource cancellationToken;
+        private bool displayUpdateRequired = true;
+
+        protected TabbableOnlineOverlay(OverlayColourScheme colourScheme)
+            : base(colourScheme)
+        {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(IAPIProvider api)
+        {
+            apiState.BindTo(api.State);
+            apiState.BindValueChanged(onlineStateChanged, true);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            Header.Current.BindValueChanged(tab => OnTabChanged(tab.NewValue));
+        }
+
+        protected override void PopIn()
+        {
+            base.PopIn();
+
+            // We don't want to create a new display on every call, only when exiting from fully closed state.
+            if (displayUpdateRequired)
+            {
+                Header.Current.TriggerChange();
+                displayUpdateRequired = false;
+            }
+        }
+
+        protected override void PopOutComplete()
+        {
+            base.PopOutComplete();
+            LoadDisplay(Empty());
+            displayUpdateRequired = true;
+        }
+
+        protected void LoadDisplay(Drawable display)
+        {
+            ScrollFlow.ScrollToStart();
+
+            LoadComponentAsync(display, loaded =>
+            {
+                if (API.IsLoggedIn)
+                    Loading.Hide();
+
+                Child = loaded;
+            }, (cancellationToken = new CancellationTokenSource()).Token);
+        }
+
+        protected void OnTabChanged(TEnum tab)
+        {
+            cancellationToken?.Cancel();
+            Loading.Show();
+
+            if (!API.IsLoggedIn)
+            {
+                LoadDisplay(Empty());
+                return;
+            }
+
+            CreateDisplayToLoad(tab);
+        }
+
+        protected abstract void CreateDisplayToLoad(TEnum tab);
+
+        private void onlineStateChanged(ValueChangedEvent<APIState> state) => Schedule(() =>
+        {
+            if (State.Value == Visibility.Hidden)
+                return;
+
+            Header.Current.TriggerChange();
+        });
+
+        protected override void Dispose(bool isDisposing)
+        {
+            cancellationToken?.Cancel();
+            base.Dispose(isDisposing);
+        }
+    }
+}

From 25f511fd5b2b6b2bfbd9e1787182a8a87f086de0 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 18 Jan 2021 21:34:24 +0300
Subject: [PATCH 0955/3722] Remove unnecessary full querying

---
 osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
index 659f52f00f..c2c800badc 100644
--- a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
+++ b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
@@ -48,17 +48,7 @@ namespace osu.Game.Online.Rooms
             int? beatmapId = SelectedItem.Value.Beatmap.Value.OnlineBeatmapID;
             string checksum = SelectedItem.Value.Beatmap.Value.MD5Hash;
 
-            BeatmapInfo matchingBeatmap;
-
-            if (databasedSet.Beatmaps == null)
-            {
-                // The given databased beatmap set is not passed in a usable state to check with.
-                // Perform a full query instead, as per https://github.com/ppy/osu/pull/11415.
-                matchingBeatmap = Manager.QueryBeatmap(b => b.OnlineBeatmapID == beatmapId && b.MD5Hash == checksum);
-                return matchingBeatmap != null;
-            }
-
-            matchingBeatmap = databasedSet.Beatmaps.FirstOrDefault(b => b.OnlineBeatmapID == beatmapId && b.MD5Hash == checksum);
+            var matchingBeatmap = databasedSet.Beatmaps.FirstOrDefault(b => b.OnlineBeatmapID == beatmapId && b.MD5Hash == checksum);
             return matchingBeatmap != null;
         }
 

From 5e476fa189d7637db79c228721a601a005f2d355 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 18 Jan 2021 22:07:25 +0300
Subject: [PATCH 0956/3722] Enforce one missed property back to single-floating
 type

---
 osu.Game/Online/API/ArchiveDownloadRequest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/ArchiveDownloadRequest.cs b/osu.Game/Online/API/ArchiveDownloadRequest.cs
index ccb4e9c119..0bf238109e 100644
--- a/osu.Game/Online/API/ArchiveDownloadRequest.cs
+++ b/osu.Game/Online/API/ArchiveDownloadRequest.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Online.API
     {
         public readonly TModel Model;
 
-        public double Progress { get; private set; }
+        public float Progress { get; private set; }
 
         public event Action<float> DownloadProgressed;
 

From 7476cb3047b400489d39af6494c782de531313ed Mon Sep 17 00:00:00 2001
From: rednir <davran.dilshat@gmail.com>
Date: Mon, 18 Jan 2021 19:51:42 +0000
Subject: [PATCH 0957/3722] Sort SkinSection in alphabetical order

---
 .../Overlays/Settings/Sections/SkinSection.cs | 35 ++++++++++++++-----
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 5898482e4a..0bfa0ba4f0 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -107,21 +107,20 @@ namespace osu.Game.Overlays.Settings.Sections
         private void updateItems()
         {
             skinItems = skins.GetAllUsableSkins();
-
-            // insert after lazer built-in skins
-            int firstNonDefault = skinItems.FindIndex(s => s.ID > 0);
-            if (firstNonDefault < 0)
-                firstNonDefault = skinItems.Count;
-
-            skinItems.Insert(firstNonDefault, random_skin_info);
-
+            skinItems = sortList(skinItems);
+            
             skinDropdown.Items = skinItems;
         }
 
         private void itemUpdated(ValueChangedEvent<WeakReference<SkinInfo>> weakItem)
         {
             if (weakItem.NewValue.TryGetTarget(out var item))
-                Schedule(() => skinDropdown.Items = skinDropdown.Items.Where(i => !i.Equals(item)).Append(item).ToArray());
+            {
+                List<SkinInfo> newDropdownItems = skinDropdown.Items.ToList();
+                newDropdownItems.Add(item);
+                newDropdownItems = sortList(newDropdownItems);
+                Schedule(() => skinDropdown.Items = newDropdownItems.ToArray());
+            }
         }
 
         private void itemRemoved(ValueChangedEvent<WeakReference<SkinInfo>> weakItem)
@@ -130,6 +129,24 @@ namespace osu.Game.Overlays.Settings.Sections
                 Schedule(() => skinDropdown.Items = skinDropdown.Items.Where(i => i.ID != item.ID).ToArray());
         }
 
+        private List<SkinInfo> sortList(List<SkinInfo> skinsList)
+        {
+            skinsList.Sort((a, b) => String.Compare(a.Name, b.Name, StringComparison.Ordinal));
+            for (int i = 0; i < skinsList.Count; i++)
+            {
+                // insert lazer built-in skins before user skins
+                if (skinsList[i].ID <= 0) {
+                    var itemToMove = skinsList[i];
+                    skinsList.RemoveAt(i);
+                    skinsList.Insert(0, itemToMove);
+                }
+            }
+            skinsList.RemoveAll(s => s.ID == SkinInfo.RANDOM_SKIN);
+            skinsList.Insert(0, random_skin_info);
+
+            return skinsList;
+        }
+
         private class SkinSettingsDropdown : SettingsDropdown<SkinInfo>
         {
             protected override OsuDropdown<SkinInfo> CreateDropdown() => new SkinDropdownControl();

From 63ca9de7e4a85990bd162d25cd9be01f8c91c239 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 18 Jan 2021 23:00:07 +0300
Subject: [PATCH 0958/3722] Rewerite beatmap term properly
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/Online/Rooms/MultiplayerBeatmapTracker.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
index c2c800badc..32a6c39ea8 100644
--- a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
+++ b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Online.Rooms
         {
             var verified = verifyDatabasedModel(databasedSet);
             if (!verified)
-                Logger.Log("The imported beatmapset does not match the online version.", LoggingTarget.Runtime, LogLevel.Important);
+                Logger.Log("The imported beatmap set does not match the online version.", LoggingTarget.Runtime, LogLevel.Important);
 
             return verified;
         }

From 0b65c0cd25a727fbfa121395e515fe9e8bd295b1 Mon Sep 17 00:00:00 2001
From: rednir <davran.dilshat@gmail.com>
Date: Mon, 18 Jan 2021 20:17:42 +0000
Subject: [PATCH 0959/3722] Remove whitespace

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

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 8e78940ac2..20953b7a9b 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -113,7 +113,6 @@ namespace osu.Game.Overlays.Settings.Sections
         {
             skinItems = skins.GetAllUsableSkins();
             skinItems = sortList(skinItems);
-            
             skinDropdown.Items = skinItems;
         }
 

From 5233a0449a63b3db599d11535b3484c8ebc50f47 Mon Sep 17 00:00:00 2001
From: Mysfit <jdawg678@gmail.com>
Date: Mon, 18 Jan 2021 16:08:06 -0500
Subject: [PATCH 0960/3722] Hide main room subscreen on initial mp room
 creation. Toggle mp room subscreen visibility based on settings overlay
 visibility before room is created.

---
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 80991569dc..df61a0ad21 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -39,6 +39,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private MultiplayerMatchSettingsOverlay settingsOverlay;
 
+        private readonly Bindable<Visibility> settingsOverlayVisibility = new Bindable<Visibility>();
+
+        private GridContainer subScreenContainer;
+
         private IBindable<bool> isConnected;
 
         [CanBeNull]
@@ -55,7 +59,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             InternalChildren = new Drawable[]
             {
-                new GridContainer
+                subScreenContainer = new GridContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     Content = new[]
@@ -178,6 +182,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                     State = { Value = client.Room == null ? Visibility.Visible : Visibility.Hidden }
                 }
             };
+
+            subScreenContainer.Hide();
+            settingsOverlayVisibility.BindTo(settingsOverlay.State);
+            settingsOverlayVisibility.ValueChanged += settingsOverlayVisibilityChanged;
         }
 
         protected override void LoadComplete()
@@ -258,6 +266,22 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             readyClickOperation = null;
         }
 
+        private void settingsOverlayVisibilityChanged(ValueChangedEvent<Visibility> settingsOverlayVisibilityChangedEvent)
+        {
+            if (client.Room != null)
+            {
+                subScreenContainer.Show();
+                settingsOverlayVisibility.ValueChanged -= settingsOverlayVisibilityChanged;
+            }
+            else
+            {
+                if (settingsOverlayVisibilityChangedEvent.NewValue == Visibility.Visible)
+                    subScreenContainer.Hide();
+                else
+                    subScreenContainer.Show();
+            }
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);

From cbfb999c2845074d799d1126296584898d9be52b Mon Sep 17 00:00:00 2001
From: Mysfit <jdawg678@gmail.com>
Date: Mon, 18 Jan 2021 17:13:24 -0500
Subject: [PATCH 0961/3722] Use the client.RoomUpdated action instead of
 binding the value of the settings overlay visibility and creating an event
 from it based on its ValueChanged action.

---
 .../Multiplayer/MultiplayerMatchSubScreen.cs    | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index df61a0ad21..38c2ca7e0c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -39,8 +39,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private MultiplayerMatchSettingsOverlay settingsOverlay;
 
-        private readonly Bindable<Visibility> settingsOverlayVisibility = new Bindable<Visibility>();
-
         private GridContainer subScreenContainer;
 
         private IBindable<bool> isConnected;
@@ -184,8 +182,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             };
 
             subScreenContainer.Hide();
-            settingsOverlayVisibility.BindTo(settingsOverlay.State);
-            settingsOverlayVisibility.ValueChanged += settingsOverlayVisibilityChanged;
+            client.RoomUpdated += roomUpdated;
         }
 
         protected override void LoadComplete()
@@ -266,19 +263,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             readyClickOperation = null;
         }
 
-        private void settingsOverlayVisibilityChanged(ValueChangedEvent<Visibility> settingsOverlayVisibilityChangedEvent)
+        private void roomUpdated()
         {
             if (client.Room != null)
             {
+                // If the room is updated and is not null, show the room sub screen container and unsubscribe.
                 subScreenContainer.Show();
-                settingsOverlayVisibility.ValueChanged -= settingsOverlayVisibilityChanged;
-            }
-            else
-            {
-                if (settingsOverlayVisibilityChangedEvent.NewValue == Visibility.Visible)
-                    subScreenContainer.Hide();
-                else
-                    subScreenContainer.Show();
+                client.RoomUpdated -= roomUpdated;
             }
         }
 

From f0add0a7cff7b6fe63ca0ccbf0de4caa130fd30d Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 19 Jan 2021 01:34:37 +0300
Subject: [PATCH 0962/3722] Make BeatmapSetOverlay use OverlayHeader

---
 .../Online/TestSceneBeatmapSetOverlay.cs      |   2 +-
 .../Overlays/BeatmapSet/BeatmapSetHeader.cs   | 300 ++++++++++++++++-
 osu.Game/Overlays/BeatmapSet/Header.cs        | 313 ------------------
 osu.Game/Overlays/BeatmapSetOverlay.cs        |   9 +-
 4 files changed, 302 insertions(+), 322 deletions(-)
 delete mode 100644 osu.Game/Overlays/BeatmapSet/Header.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
index 689321698a..7ff978c7ca 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
@@ -315,7 +315,7 @@ namespace osu.Game.Tests.Visual.Online
 
         private class TestBeatmapSetOverlay : BeatmapSetOverlay
         {
-            public new Header Header => base.Header;
+            public new BeatmapSetHeader Header => base.Header;
         }
     }
 }
diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs
index 6511b15fc8..bc9008d1f5 100644
--- a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs
+++ b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs
@@ -1,23 +1,319 @@
 // Copyright (c) ppy 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.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Effects;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Drawables;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online;
+using osu.Game.Online.API;
+using osu.Game.Overlays.BeatmapListing.Panels;
+using osu.Game.Overlays.BeatmapSet.Buttons;
 using osu.Game.Rulesets;
+using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Overlays.BeatmapSet
 {
     public class BeatmapSetHeader : OverlayHeader
     {
-        public readonly Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
+        private const float transition_duration = 200;
+        private const float buttons_height = 45;
+        private const float buttons_spacing = 5;
+
+        public readonly Bindable<BeatmapSetInfo> BeatmapSet = new Bindable<BeatmapSetInfo>();
+
+        public bool DownloadButtonsVisible => downloadButtonsContainer.Any();
+
+        public BeatmapPicker Picker { get; private set; }
 
         public BeatmapRulesetSelector RulesetSelector { get; private set; }
 
+        private IBindable<DownloadState> state => downloadTracker.State;
+
+        [Cached(typeof(IBindable<RulesetInfo>))]
+        private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
+
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        private readonly DownloadTracker downloadTracker;
+        private OsuSpriteText title, artist;
+        private AuthorInfo author;
+        private ExplicitContentBeatmapPill explicitContentPill;
+        private FillFlowContainer downloadButtonsContainer;
+        private BeatmapAvailability beatmapAvailability;
+        private BeatmapSetOnlineStatusPill onlineStatusPill;
+        private ExternalLinkButton externalLink;
+        private UpdateableBeatmapSetCover cover;
+        private Box coverGradient;
+        private FillFlowContainer fadeContent;
+        private FavouriteButton favouriteButton;
+        private LoadingSpinner loading;
+        private Details details;
+
+        public BeatmapSetHeader()
+        {
+            Masking = true;
+
+            EdgeEffect = new EdgeEffectParameters
+            {
+                Colour = Color4.Black.Opacity(0.25f),
+                Type = EdgeEffectType.Shadow,
+                Radius = 3,
+                Offset = new Vector2(0f, 1f),
+            };
+
+            AddInternal(downloadTracker = new DownloadTracker
+            {
+                BeatmapSet = { BindTarget = BeatmapSet }
+            });
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            Picker.Beatmap.ValueChanged += b =>
+            {
+                details.Beatmap = b.NewValue;
+                externalLink.Link = $@"{api.WebsiteRootUrl}/beatmapsets/{BeatmapSet.Value?.OnlineBeatmapSetID}#{b.NewValue?.Ruleset.ShortName}/{b.NewValue?.OnlineBeatmapID}";
+            };
+
+            coverGradient.Colour = ColourInfo.GradientVertical(colourProvider.Background6.Opacity(0.3f), colourProvider.Background6.Opacity(0.8f));
+            onlineStatusPill.BackgroundColour = colourProvider.Background6;
+
+            state.BindValueChanged(_ => updateDownloadButtons());
+
+            BeatmapSet.BindValueChanged(setInfo =>
+            {
+                Picker.BeatmapSet = RulesetSelector.BeatmapSet = author.BeatmapSet = beatmapAvailability.BeatmapSet = details.BeatmapSet = setInfo.NewValue;
+                cover.BeatmapSet = setInfo.NewValue;
+
+                if (setInfo.NewValue == null)
+                {
+                    onlineStatusPill.FadeTo(0.5f, 500, Easing.OutQuint);
+                    fadeContent.Hide();
+
+                    loading.Show();
+
+                    downloadButtonsContainer.FadeOut(transition_duration);
+                    favouriteButton.FadeOut(transition_duration);
+                }
+                else
+                {
+                    fadeContent.FadeIn(500, Easing.OutQuint);
+
+                    loading.Hide();
+
+                    title.Text = setInfo.NewValue.Metadata.Title ?? string.Empty;
+                    artist.Text = setInfo.NewValue.Metadata.Artist ?? string.Empty;
+
+                    explicitContentPill.Alpha = setInfo.NewValue.OnlineInfo.HasExplicitContent ? 1 : 0;
+
+                    onlineStatusPill.FadeIn(500, Easing.OutQuint);
+                    onlineStatusPill.Status = setInfo.NewValue.OnlineInfo.Status;
+
+                    downloadButtonsContainer.FadeIn(transition_duration);
+                    favouriteButton.FadeIn(transition_duration);
+
+                    updateDownloadButtons();
+                }
+            }, true);
+        }
+
+        protected override Drawable CreateContent() => new Container
+        {
+            RelativeSizeAxes = Axes.X,
+            AutoSizeAxes = Axes.Y,
+            Children = new Drawable[]
+            {
+                new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        cover = new UpdateableBeatmapSetCover
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Masking = true,
+                        },
+                        coverGradient = new Box
+                        {
+                            RelativeSizeAxes = Axes.Both
+                        },
+                    },
+                },
+                new Container
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Padding = new MarginPadding
+                    {
+                        Vertical = BeatmapSetOverlay.Y_PADDING,
+                        Left = BeatmapSetOverlay.X_PADDING,
+                        Right = BeatmapSetOverlay.X_PADDING + BeatmapSetOverlay.RIGHT_WIDTH,
+                    },
+                    Children = new Drawable[]
+                    {
+                        fadeContent = new FillFlowContainer
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Direction = FillDirection.Vertical,
+                            Children = new Drawable[]
+                            {
+                                new Container
+                                {
+                                    RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
+                                    Child = Picker = new BeatmapPicker(),
+                                },
+                                new FillFlowContainer
+                                {
+                                    Direction = FillDirection.Horizontal,
+                                    AutoSizeAxes = Axes.Both,
+                                    Margin = new MarginPadding { Top = 15 },
+                                    Children = new Drawable[]
+                                    {
+                                        title = new OsuSpriteText
+                                        {
+                                            Font = OsuFont.GetFont(size: 30, weight: FontWeight.SemiBold, italics: true)
+                                        },
+                                        externalLink = new ExternalLinkButton
+                                        {
+                                            Anchor = Anchor.BottomLeft,
+                                            Origin = Anchor.BottomLeft,
+                                            Margin = new MarginPadding { Left = 5, Bottom = 4 }, // To better lineup with the font
+                                        },
+                                        explicitContentPill = new ExplicitContentBeatmapPill
+                                        {
+                                            Alpha = 0f,
+                                            Anchor = Anchor.BottomLeft,
+                                            Origin = Anchor.BottomLeft,
+                                            Margin = new MarginPadding { Left = 10, Bottom = 4 },
+                                        }
+                                    }
+                                },
+                                artist = new OsuSpriteText
+                                {
+                                    Font = OsuFont.GetFont(size: 20, weight: FontWeight.Medium, italics: true),
+                                    Margin = new MarginPadding { Bottom = 20 }
+                                },
+                                new Container
+                                {
+                                    RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
+                                    Child = author = new AuthorInfo(),
+                                },
+                                beatmapAvailability = new BeatmapAvailability(),
+                                new Container
+                                {
+                                    RelativeSizeAxes = Axes.X,
+                                    Height = buttons_height,
+                                    Margin = new MarginPadding { Top = 10 },
+                                    Children = new Drawable[]
+                                    {
+                                        favouriteButton = new FavouriteButton
+                                        {
+                                            BeatmapSet = { BindTarget = BeatmapSet }
+                                        },
+                                        downloadButtonsContainer = new FillFlowContainer
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                            Padding = new MarginPadding { Left = buttons_height + buttons_spacing },
+                                            Spacing = new Vector2(buttons_spacing),
+                                        },
+                                    },
+                                },
+                            },
+                        },
+                    }
+                },
+                loading = new LoadingSpinner
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Scale = new Vector2(1.5f),
+                },
+                new FillFlowContainer
+                {
+                    Anchor = Anchor.BottomRight,
+                    Origin = Anchor.BottomRight,
+                    AutoSizeAxes = Axes.Both,
+                    Margin = new MarginPadding { Top = BeatmapSetOverlay.Y_PADDING, Right = BeatmapSetOverlay.X_PADDING },
+                    Direction = FillDirection.Vertical,
+                    Spacing = new Vector2(10),
+                    Children = new Drawable[]
+                    {
+                        onlineStatusPill = new BeatmapSetOnlineStatusPill
+                        {
+                            Anchor = Anchor.TopRight,
+                            Origin = Anchor.TopRight,
+                            TextSize = 14,
+                            TextPadding = new MarginPadding { Horizontal = 35, Vertical = 10 }
+                        },
+                        details = new Details(),
+                    },
+                },
+            }
+        };
+
+        private void updateDownloadButtons()
+        {
+            if (BeatmapSet.Value == null) return;
+
+            if ((BeatmapSet.Value.OnlineInfo.Availability?.DownloadDisabled ?? false) && state.Value != DownloadState.LocallyAvailable)
+            {
+                downloadButtonsContainer.Clear();
+                return;
+            }
+
+            switch (state.Value)
+            {
+                case DownloadState.LocallyAvailable:
+                    // temporary for UX until new design is implemented.
+                    downloadButtonsContainer.Child = new BeatmapPanelDownloadButton(BeatmapSet.Value)
+                    {
+                        Width = 50,
+                        RelativeSizeAxes = Axes.Y,
+                        SelectedBeatmap = { BindTarget = Picker.Beatmap }
+                    };
+                    break;
+
+                case DownloadState.Downloading:
+                case DownloadState.Importing:
+                    // temporary to avoid showing two buttons for maps with novideo. will be fixed in new beatmap overlay design.
+                    downloadButtonsContainer.Child = new HeaderDownloadButton(BeatmapSet.Value);
+                    break;
+
+                default:
+                    downloadButtonsContainer.Child = new HeaderDownloadButton(BeatmapSet.Value);
+                    if (BeatmapSet.Value.OnlineInfo.HasVideo)
+                        downloadButtonsContainer.Add(new HeaderDownloadButton(BeatmapSet.Value, true));
+                    break;
+            }
+        }
+
+        private class DownloadTracker : BeatmapDownloadTrackingComposite
+        {
+            public new Bindable<DownloadState> State => base.State;
+        }
+
         protected override OverlayTitle CreateTitle() => new BeatmapHeaderTitle();
 
         protected override Drawable CreateTitleContent() => RulesetSelector = new BeatmapRulesetSelector
         {
-            Current = Ruleset
+            Current = ruleset
         };
 
         private class BeatmapHeaderTitle : OverlayTitle
diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs
deleted file mode 100644
index 916c21c010..0000000000
--- a/osu.Game/Overlays/BeatmapSet/Header.cs
+++ /dev/null
@@ -1,313 +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 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.Effects;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Beatmaps.Drawables;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Online;
-using osu.Game.Online.API;
-using osu.Game.Overlays.BeatmapListing.Panels;
-using osu.Game.Overlays.BeatmapSet.Buttons;
-using osu.Game.Rulesets;
-using osuTK;
-using osuTK.Graphics;
-
-namespace osu.Game.Overlays.BeatmapSet
-{
-    public class Header : BeatmapDownloadTrackingComposite
-    {
-        private const float transition_duration = 200;
-        private const float buttons_height = 45;
-        private const float buttons_spacing = 5;
-
-        private readonly UpdateableBeatmapSetCover cover;
-        private readonly Box coverGradient;
-        private readonly OsuSpriteText title, artist;
-        private readonly AuthorInfo author;
-        private readonly ExplicitContentBeatmapPill explicitContentPill;
-        private readonly FillFlowContainer downloadButtonsContainer;
-        private readonly BeatmapAvailability beatmapAvailability;
-        private readonly BeatmapSetOnlineStatusPill onlineStatusPill;
-        public Details Details;
-
-        public bool DownloadButtonsVisible => downloadButtonsContainer.Any();
-
-        [Resolved]
-        private IAPIProvider api { get; set; }
-
-        public BeatmapRulesetSelector RulesetSelector => beatmapSetHeader.RulesetSelector;
-        public readonly BeatmapPicker Picker;
-
-        private readonly FavouriteButton favouriteButton;
-        private readonly FillFlowContainer fadeContent;
-        private readonly LoadingSpinner loading;
-        private readonly BeatmapSetHeader beatmapSetHeader;
-
-        [Cached(typeof(IBindable<RulesetInfo>))]
-        private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
-
-        public Header()
-        {
-            ExternalLinkButton externalLink;
-
-            RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Axes.Y;
-            Masking = true;
-
-            EdgeEffect = new EdgeEffectParameters
-            {
-                Colour = Color4.Black.Opacity(0.25f),
-                Type = EdgeEffectType.Shadow,
-                Radius = 3,
-                Offset = new Vector2(0f, 1f),
-            };
-
-            InternalChild = new FillFlowContainer
-            {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
-                Direction = FillDirection.Vertical,
-                Children = new Drawable[]
-                {
-                    beatmapSetHeader = new BeatmapSetHeader
-                    {
-                        Ruleset = { BindTarget = ruleset },
-                    },
-                    new Container
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Children = new Drawable[]
-                        {
-                            new Container
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Children = new Drawable[]
-                                {
-                                    cover = new UpdateableBeatmapSetCover
-                                    {
-                                        RelativeSizeAxes = Axes.Both,
-                                        Masking = true,
-                                    },
-                                    coverGradient = new Box
-                                    {
-                                        RelativeSizeAxes = Axes.Both
-                                    },
-                                },
-                            },
-                            new Container
-                            {
-                                RelativeSizeAxes = Axes.X,
-                                AutoSizeAxes = Axes.Y,
-                                Padding = new MarginPadding
-                                {
-                                    Vertical = BeatmapSetOverlay.Y_PADDING,
-                                    Left = BeatmapSetOverlay.X_PADDING,
-                                    Right = BeatmapSetOverlay.X_PADDING + BeatmapSetOverlay.RIGHT_WIDTH,
-                                },
-                                Children = new Drawable[]
-                                {
-                                    fadeContent = new FillFlowContainer
-                                    {
-                                        RelativeSizeAxes = Axes.X,
-                                        AutoSizeAxes = Axes.Y,
-                                        Direction = FillDirection.Vertical,
-                                        Children = new Drawable[]
-                                        {
-                                            new Container
-                                            {
-                                                RelativeSizeAxes = Axes.X,
-                                                AutoSizeAxes = Axes.Y,
-                                                Child = Picker = new BeatmapPicker(),
-                                            },
-                                            new FillFlowContainer
-                                            {
-                                                Direction = FillDirection.Horizontal,
-                                                AutoSizeAxes = Axes.Both,
-                                                Margin = new MarginPadding { Top = 15 },
-                                                Children = new Drawable[]
-                                                {
-                                                    title = new OsuSpriteText
-                                                    {
-                                                        Font = OsuFont.GetFont(size: 30, weight: FontWeight.SemiBold, italics: true)
-                                                    },
-                                                    externalLink = new ExternalLinkButton
-                                                    {
-                                                        Anchor = Anchor.BottomLeft,
-                                                        Origin = Anchor.BottomLeft,
-                                                        Margin = new MarginPadding { Left = 5, Bottom = 4 }, // To better lineup with the font
-                                                    },
-                                                    explicitContentPill = new ExplicitContentBeatmapPill
-                                                    {
-                                                        Alpha = 0f,
-                                                        Anchor = Anchor.BottomLeft,
-                                                        Origin = Anchor.BottomLeft,
-                                                        Margin = new MarginPadding { Left = 10, Bottom = 4 },
-                                                    }
-                                                }
-                                            },
-                                            artist = new OsuSpriteText
-                                            {
-                                                Font = OsuFont.GetFont(size: 20, weight: FontWeight.Medium, italics: true),
-                                                Margin = new MarginPadding { Bottom = 20 }
-                                            },
-                                            new Container
-                                            {
-                                                RelativeSizeAxes = Axes.X,
-                                                AutoSizeAxes = Axes.Y,
-                                                Child = author = new AuthorInfo(),
-                                            },
-                                            beatmapAvailability = new BeatmapAvailability(),
-                                            new Container
-                                            {
-                                                RelativeSizeAxes = Axes.X,
-                                                Height = buttons_height,
-                                                Margin = new MarginPadding { Top = 10 },
-                                                Children = new Drawable[]
-                                                {
-                                                    favouriteButton = new FavouriteButton
-                                                    {
-                                                        BeatmapSet = { BindTarget = BeatmapSet }
-                                                    },
-                                                    downloadButtonsContainer = new FillFlowContainer
-                                                    {
-                                                        RelativeSizeAxes = Axes.Both,
-                                                        Padding = new MarginPadding { Left = buttons_height + buttons_spacing },
-                                                        Spacing = new Vector2(buttons_spacing),
-                                                    },
-                                                },
-                                            },
-                                        },
-                                    },
-                                }
-                            },
-                            loading = new LoadingSpinner
-                            {
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
-                                Scale = new Vector2(1.5f),
-                            },
-                            new FillFlowContainer
-                            {
-                                Anchor = Anchor.BottomRight,
-                                Origin = Anchor.BottomRight,
-                                AutoSizeAxes = Axes.Both,
-                                Margin = new MarginPadding { Top = BeatmapSetOverlay.Y_PADDING, Right = BeatmapSetOverlay.X_PADDING },
-                                Direction = FillDirection.Vertical,
-                                Spacing = new Vector2(10),
-                                Children = new Drawable[]
-                                {
-                                    onlineStatusPill = new BeatmapSetOnlineStatusPill
-                                    {
-                                        Anchor = Anchor.TopRight,
-                                        Origin = Anchor.TopRight,
-                                        TextSize = 14,
-                                        TextPadding = new MarginPadding { Horizontal = 35, Vertical = 10 }
-                                    },
-                                    Details = new Details(),
-                                },
-                            },
-                        },
-                    },
-                }
-            };
-
-            Picker.Beatmap.ValueChanged += b =>
-            {
-                Details.Beatmap = b.NewValue;
-                externalLink.Link = $@"{api.WebsiteRootUrl}/beatmapsets/{BeatmapSet.Value?.OnlineBeatmapSetID}#{b.NewValue?.Ruleset.ShortName}/{b.NewValue?.OnlineBeatmapID}";
-            };
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
-        {
-            coverGradient.Colour = ColourInfo.GradientVertical(colourProvider.Background6.Opacity(0.3f), colourProvider.Background6.Opacity(0.8f));
-            onlineStatusPill.BackgroundColour = colourProvider.Background6;
-
-            State.BindValueChanged(_ => updateDownloadButtons());
-
-            BeatmapSet.BindValueChanged(setInfo =>
-            {
-                Picker.BeatmapSet = RulesetSelector.BeatmapSet = author.BeatmapSet = beatmapAvailability.BeatmapSet = Details.BeatmapSet = setInfo.NewValue;
-                cover.BeatmapSet = setInfo.NewValue;
-
-                if (setInfo.NewValue == null)
-                {
-                    onlineStatusPill.FadeTo(0.5f, 500, Easing.OutQuint);
-                    fadeContent.Hide();
-
-                    loading.Show();
-
-                    downloadButtonsContainer.FadeOut(transition_duration);
-                    favouriteButton.FadeOut(transition_duration);
-                }
-                else
-                {
-                    fadeContent.FadeIn(500, Easing.OutQuint);
-
-                    loading.Hide();
-
-                    title.Text = setInfo.NewValue.Metadata.Title ?? string.Empty;
-                    artist.Text = setInfo.NewValue.Metadata.Artist ?? string.Empty;
-
-                    explicitContentPill.Alpha = setInfo.NewValue.OnlineInfo.HasExplicitContent ? 1 : 0;
-
-                    onlineStatusPill.FadeIn(500, Easing.OutQuint);
-                    onlineStatusPill.Status = setInfo.NewValue.OnlineInfo.Status;
-
-                    downloadButtonsContainer.FadeIn(transition_duration);
-                    favouriteButton.FadeIn(transition_duration);
-
-                    updateDownloadButtons();
-                }
-            }, true);
-        }
-
-        private void updateDownloadButtons()
-        {
-            if (BeatmapSet.Value == null) return;
-
-            if ((BeatmapSet.Value.OnlineInfo.Availability?.DownloadDisabled ?? false) && State.Value != DownloadState.LocallyAvailable)
-            {
-                downloadButtonsContainer.Clear();
-                return;
-            }
-
-            switch (State.Value)
-            {
-                case DownloadState.LocallyAvailable:
-                    // temporary for UX until new design is implemented.
-                    downloadButtonsContainer.Child = new BeatmapPanelDownloadButton(BeatmapSet.Value)
-                    {
-                        Width = 50,
-                        RelativeSizeAxes = Axes.Y,
-                        SelectedBeatmap = { BindTarget = Picker.Beatmap }
-                    };
-                    break;
-
-                case DownloadState.Downloading:
-                case DownloadState.Importing:
-                    // temporary to avoid showing two buttons for maps with novideo. will be fixed in new beatmap overlay design.
-                    downloadButtonsContainer.Child = new HeaderDownloadButton(BeatmapSet.Value);
-                    break;
-
-                default:
-                    downloadButtonsContainer.Child = new HeaderDownloadButton(BeatmapSet.Value);
-                    if (BeatmapSet.Value.OnlineInfo.HasVideo)
-                        downloadButtonsContainer.Add(new HeaderDownloadButton(BeatmapSet.Value, true));
-                    break;
-            }
-        }
-    }
-}
diff --git a/osu.Game/Overlays/BeatmapSetOverlay.cs b/osu.Game/Overlays/BeatmapSetOverlay.cs
index bbec62a85a..86f0f4f614 100644
--- a/osu.Game/Overlays/BeatmapSetOverlay.cs
+++ b/osu.Game/Overlays/BeatmapSetOverlay.cs
@@ -19,15 +19,12 @@ using osuTK;
 
 namespace osu.Game.Overlays
 {
-    public class BeatmapSetOverlay : FullscreenOverlay<OverlayHeader> // we don't provide a standard header for now.
+    public class BeatmapSetOverlay : FullscreenOverlay<BeatmapSetHeader>
     {
         public const float X_PADDING = 40;
         public const float Y_PADDING = 25;
         public const float RIGHT_WIDTH = 275;
 
-        //todo: should be an OverlayHeader? or maybe not?
-        protected new readonly Header Header;
-
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
@@ -39,7 +36,7 @@ namespace osu.Game.Overlays
         private readonly Box background;
 
         public BeatmapSetOverlay()
-            : base(OverlayColourScheme.Blue, null)
+            : base(OverlayColourScheme.Blue, new BeatmapSetHeader())
         {
             OverlayScrollContainer scroll;
             Info info;
@@ -72,7 +69,7 @@ namespace osu.Game.Overlays
                                     Direction = FillDirection.Vertical,
                                     Children = new Drawable[]
                                     {
-                                        Header = new Header(),
+                                        Header,
                                         info = new Info()
                                     }
                                 },

From 1e99357a9790884a7a84e4c052a6ab65921586a7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Jan 2021 12:13:27 +0900
Subject: [PATCH 0963/3722] Update build configurations to net5.0 paths

---
 .../.idea/runConfigurations/Benchmarks.xml     |  6 +++---
 .../runConfigurations/CatchRuleset__Tests_.xml |  6 +++---
 .../runConfigurations/ManiaRuleset__Tests_.xml |  6 +++---
 .../runConfigurations/OsuRuleset__Tests_.xml   |  6 +++---
 .../runConfigurations/TaikoRuleset__Tests_.xml |  6 +++---
 .../.idea/runConfigurations/Tournament.xml     |  6 +++---
 .../runConfigurations/Tournament__Tests_.xml   |  6 +++---
 .../.idea/runConfigurations/osu_.xml           |  6 +++---
 .../.idea/runConfigurations/osu___Tests_.xml   |  6 +++---
 .../runConfigurations/osu___legacy_osuTK_.xml  |  6 +++---
 .vscode/launch.json                            | 18 +++++++++---------
 .../.vscode/launch.json                        |  4 ++--
 .../.vscode/launch.json                        |  4 ++--
 .../.vscode/launch.json                        |  4 ++--
 .../.vscode/launch.json                        |  4 ++--
 osu.Game.Tournament.Tests/.vscode/launch.json  |  4 ++--
 16 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/Benchmarks.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/Benchmarks.xml
index 1815c271b4..8fa7608b8e 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/Benchmarks.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/Benchmarks.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Benchmarks" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Benchmarks/bin/Release/netcoreapp3.1/osu.Game.Benchmarks.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Benchmarks/bin/Release/net5.0/osu.Game.Benchmarks.dll" />
     <option name="PROGRAM_PARAMETERS" value="--filter *" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Benchmarks/bin/Release/netcoreapp3.1" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Benchmarks/bin/Release/net5.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.1" />
+    <option name="PROJECT_TFM" value="net5.0" />
     <method v="2">
       <option name="Build" enabled="true" />
     </method>
diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/CatchRuleset__Tests_.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/CatchRuleset__Tests_.xml
index 512ac4393a..657b885df1 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/CatchRuleset__Tests_.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/CatchRuleset__Tests_.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="CatchRuleset (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="Ruleset" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests/bin/Debug/netcoreapp3.1/osu.Game.Rulesets.Catch.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests/bin/Debug/net5.0/osu.Game.Rulesets.Catch.Tests.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests/bin/Debug/netcoreapp3.1" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Catch.Tests/bin/Debug/net5.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.1" />
+    <option name="PROJECT_TFM" value="net5.0" />
     <browser url="http://localhost:5000" />
     <method v="2">
       <option name="Build" />
diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/ManiaRuleset__Tests_.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/ManiaRuleset__Tests_.xml
index dec1ef717f..847dcf822c 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/ManiaRuleset__Tests_.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/ManiaRuleset__Tests_.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="ManiaRuleset (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="Ruleset" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests/bin/Debug/netcoreapp3.1/osu.Game.Rulesets.Mania.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests/bin/Debug/net5.0/osu.Game.Rulesets.Mania.Tests.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests/bin/Debug/netcoreapp3.1" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Mania.Tests/bin/Debug/net5.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.1" />
+    <option name="PROJECT_TFM" value="net5.0" />
     <browser url="http://localhost:5000" />
     <method v="2">
       <option name="Build" />
diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/OsuRuleset__Tests_.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/OsuRuleset__Tests_.xml
index d9370d5440..5dc1168e35 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/OsuRuleset__Tests_.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/OsuRuleset__Tests_.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="OsuRuleset (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="Ruleset" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests/bin/Debug/netcoreapp3.1/osu.Game.Rulesets.Osu.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests/bin/Debug/net5.0/osu.Game.Rulesets.Osu.Tests.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests/bin/Debug/netcoreapp3.1" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Osu.Tests/bin/Debug/net5.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.1" />
+    <option name="PROJECT_TFM" value="net5.0" />
     <browser url="http://localhost:5000" />
     <method v="2">
       <option name="Build" />
diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/TaikoRuleset__Tests_.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/TaikoRuleset__Tests_.xml
index def4940bb1..ab4ce5a9cc 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/TaikoRuleset__Tests_.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/TaikoRuleset__Tests_.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="TaikoRuleset (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="Ruleset" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests/bin/Debug/netcoreapp3.1/osu.Game.Rulesets.Taiko.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests/bin/Debug/net5.0/osu.Game.Rulesets.Taiko.Tests.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests/bin/Debug/netcoreapp3.1" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Rulesets.Taiko.Tests/bin/Debug/net5.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.1" />
+    <option name="PROJECT_TFM" value="net5.0" />
     <browser url="http://localhost:5000" />
     <method v="2">
       <option name="Build" />
diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/Tournament.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/Tournament.xml
index 1ffa73c257..61331944a8 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/Tournament.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/Tournament.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Tournament" type="DotNetProject" factoryName=".NET Project" folderName="Tournament" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/netcoreapp3.1/osu!.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net5.0/osu!.dll" />
     <option name="PROGRAM_PARAMETERS" value="--tournament" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/netcoreapp3.1" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net5.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.1" />
+    <option name="PROJECT_TFM" value="net5.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/Tournament__Tests_.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/Tournament__Tests_.xml
index e64da796b7..9a00f58c3b 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/Tournament__Tests_.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/Tournament__Tests_.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Tournament (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="Tournament" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Tournament.Tests/bin/Debug/netcoreapp3.1/osu.Game.Tournament.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Tournament.Tests/bin/Debug/net5.0/osu.Game.Tournament.Tests.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Tournament.Tests/bin/Debug/netcoreapp3.1" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Tournament.Tests/bin/Debug/net5.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.1" />
+    <option name="PROJECT_TFM" value="net5.0" />
     <browser url="http://localhost:5000" />
     <method v="2">
       <option name="Build" />
diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu_.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu_.xml
index 22105e1de2..4ae656b6d8 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu_.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu_.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="osu!" type="DotNetProject" factoryName=".NET Project" folderName="osu!" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/netcoreapp3.1/osu!.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net5.0/osu!.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/netcoreapp3.1" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net5.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.1" />
+    <option name="PROJECT_TFM" value="net5.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu___Tests_.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu___Tests_.xml
index cc243f6901..e58c602962 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu___Tests_.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu___Tests_.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="osu! (Tests)" type="DotNetProject" factoryName=".NET Project" folderName="osu!" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Tests/bin/Debug/netcoreapp3.1/osu.Game.Tests.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Tests/bin/Debug/net5.0/osu.Game.Tests.dll" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Tests/bin/Debug/netcoreapp3.1" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Tests/bin/Debug/net5.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.1" />
+    <option name="PROJECT_TFM" value="net5.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu___legacy_osuTK_.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu___legacy_osuTK_.xml
index 811fd9cc6d..9ece926b34 100644
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu___legacy_osuTK_.xml
+++ b/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu___legacy_osuTK_.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="osu! (legacy osuTK)" type="DotNetProject" factoryName=".NET Project" folderName="osu!" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/netcoreapp3.1/osu!.dll" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net5.0/osu!.dll" />
     <option name="PROGRAM_PARAMETERS" value="--tk" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/netcoreapp3.1" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net5.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.1" />
+    <option name="PROJECT_TFM" value="net5.0" />
     <method v="2">
       <option name="Build" />
     </method>
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 4e8af405a2..afd997f91d 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -7,7 +7,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Desktop/bin/Debug/netcoreapp3.1/osu!.dll"
+                "${workspaceRoot}/osu.Desktop/bin/Debug/net5.0/osu!.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build osu! (Debug)",
@@ -19,7 +19,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Desktop/bin/Release/netcoreapp3.1/osu!.dll"
+                "${workspaceRoot}/osu.Desktop/bin/Release/net5.0/osu!.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build osu! (Release)",
@@ -31,7 +31,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Game.Tests/bin/Debug/netcoreapp3.1/osu.Game.Tests.dll"
+                "${workspaceRoot}/osu.Game.Tests/bin/Debug/net5.0/osu.Game.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build tests (Debug)",
@@ -43,7 +43,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Game.Tests/bin/Release/netcoreapp3.1/osu.Game.Tests.dll"
+                "${workspaceRoot}/osu.Game.Tests/bin/Release/net5.0/osu.Game.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build tests (Release)",
@@ -55,7 +55,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Desktop/bin/Debug/netcoreapp3.1/osu!.dll",
+                "${workspaceRoot}/osu.Desktop/bin/Debug/net5.0/osu!.dll",
                 "--tournament"
             ],
             "cwd": "${workspaceRoot}",
@@ -68,7 +68,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Desktop/bin/Release/netcoreapp3.1/osu!.dll",
+                "${workspaceRoot}/osu.Desktop/bin/Release/net5.0/osu!.dll",
                 "--tournament"
             ],
             "cwd": "${workspaceRoot}",
@@ -81,7 +81,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Game.Tournament.Tests/bin/Debug/netcoreapp3.1/osu.Game.Tournament.Tests.dll",
+                "${workspaceRoot}/osu.Game.Tournament.Tests/bin/Debug/net5.0/osu.Game.Tournament.Tests.dll",
                 "--tournament"
             ],
             "cwd": "${workspaceRoot}",
@@ -94,7 +94,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Game.Tournament.Tests/bin/Debug/netcoreapp3.1/osu.Game.Tournament.Tests.dll",
+                "${workspaceRoot}/osu.Game.Tournament.Tests/bin/Debug/net5.0/osu.Game.Tournament.Tests.dll",
                 "--tournament"
             ],
             "cwd": "${workspaceRoot}",
@@ -105,7 +105,7 @@
             "name": "Benchmark",
             "type": "coreclr",
             "request": "launch",
-            "program": "${workspaceRoot}/osu.Game.Benchmarks/bin/Release/netcoreapp3.1/osu.Game.Benchmarks.dll",
+            "program": "${workspaceRoot}/osu.Game.Benchmarks/bin/Release/net5.0/osu.Game.Benchmarks.dll",
             "args": [
                 "--filter",
                 "*"
diff --git a/osu.Game.Rulesets.Catch.Tests/.vscode/launch.json b/osu.Game.Rulesets.Catch.Tests/.vscode/launch.json
index 67d27c33eb..9aaaf418c2 100644
--- a/osu.Game.Rulesets.Catch.Tests/.vscode/launch.json
+++ b/osu.Game.Rulesets.Catch.Tests/.vscode/launch.json
@@ -7,7 +7,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Debug/netcoreapp3.1/osu.Game.Rulesets.Catch.Tests.dll"
+                "${workspaceRoot}/bin/Debug/net5.0/osu.Game.Rulesets.Catch.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Debug)",
@@ -20,7 +20,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Release/netcoreapp3.1/osu.Game.Rulesets.Catch.Tests.dll"
+                "${workspaceRoot}/bin/Release/net5.0/osu.Game.Rulesets.Catch.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Release)",
diff --git a/osu.Game.Rulesets.Mania.Tests/.vscode/launch.json b/osu.Game.Rulesets.Mania.Tests/.vscode/launch.json
index 0811c2724c..e3d7956e85 100644
--- a/osu.Game.Rulesets.Mania.Tests/.vscode/launch.json
+++ b/osu.Game.Rulesets.Mania.Tests/.vscode/launch.json
@@ -7,7 +7,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Debug/netcoreapp3.1/osu.Game.Rulesets.Mania.Tests.dll"
+                "${workspaceRoot}/bin/Debug/net5.0/osu.Game.Rulesets.Mania.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Debug)",
@@ -20,7 +20,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Release/netcoreapp3.1/osu.Game.Rulesets.Mania.Tests.dll"
+                "${workspaceRoot}/bin/Release/net5.0/osu.Game.Rulesets.Mania.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Release)",
diff --git a/osu.Game.Rulesets.Osu.Tests/.vscode/launch.json b/osu.Game.Rulesets.Osu.Tests/.vscode/launch.json
index 94568e3852..01a5985464 100644
--- a/osu.Game.Rulesets.Osu.Tests/.vscode/launch.json
+++ b/osu.Game.Rulesets.Osu.Tests/.vscode/launch.json
@@ -7,7 +7,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Debug/netcoreapp3.1/osu.Game.Rulesets.Osu.Tests.dll"
+                "${workspaceRoot}/bin/Debug/net5.0/osu.Game.Rulesets.Osu.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Debug)",
@@ -20,7 +20,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Release/netcoreapp3.1/osu.Game.Rulesets.Osu.Tests.dll"
+                "${workspaceRoot}/bin/Release/net5.0/osu.Game.Rulesets.Osu.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Release)",
diff --git a/osu.Game.Rulesets.Taiko.Tests/.vscode/launch.json b/osu.Game.Rulesets.Taiko.Tests/.vscode/launch.json
index 5b02ecfc91..779ebba9ae 100644
--- a/osu.Game.Rulesets.Taiko.Tests/.vscode/launch.json
+++ b/osu.Game.Rulesets.Taiko.Tests/.vscode/launch.json
@@ -7,7 +7,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Debug/netcoreapp3.1/osu.Game.Rulesets.Taiko.Tests.dll"
+                "${workspaceRoot}/bin/Debug/net5.0/osu.Game.Rulesets.Taiko.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Debug)",
@@ -20,7 +20,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Release/netcoreapp3.1/osu.Game.Rulesets.Taiko.Tests.dll"
+                "${workspaceRoot}/bin/Release/net5.0/osu.Game.Rulesets.Taiko.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Release)",
diff --git a/osu.Game.Tournament.Tests/.vscode/launch.json b/osu.Game.Tournament.Tests/.vscode/launch.json
index 0204158347..28532d3ed3 100644
--- a/osu.Game.Tournament.Tests/.vscode/launch.json
+++ b/osu.Game.Tournament.Tests/.vscode/launch.json
@@ -7,7 +7,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Debug/netcoreapp2.1/osu.Game.Tournament.Tests.dll"
+                "${workspaceRoot}/bin/Debug/net5.0/osu.Game.Tournament.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Debug)",
@@ -20,7 +20,7 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/bin/Release/netcoreapp2.1/osu.Game.Tournament.Tests.dll"
+                "${workspaceRoot}/bin/Release/net5.0/osu.Game.Tournament.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build (Release)",

From 35be91fc513ce624290024215cad049d10843cef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 19 Jan 2021 12:15:18 +0900
Subject: [PATCH 0964/3722] Update readme

---
 README.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index c9443ba063..efca075042 100644
--- a/README.md
+++ b/README.md
@@ -36,8 +36,7 @@ If you are looking to install or test osu! without setting up a development envi
 
 - 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.
 
-- When running on Windows 7 or 8.1, **[additional prerequisites](https://docs.microsoft.com/en-us/dotnet/core/install/dependencies?tabs=netcore31&pivots=os-windows)** may be required to correctly run .NET Core applications if your operating system is not up-to-date with the latest service packs.
-
+- When running on Windows 7 or 8.1, *[additional prerequisites](https://docs.microsoft.com/en-us/dotnet/core/install/windows?tabs=net50&pivots=os-windows#dependencies)** may be required to correctly run .NET 5 applications if your operating system is not up-to-date with the latest service packs.
 If your platform is not listed above, there is still a chance you can manually build it by following the instructions below.
 
 ## Developing a custom ruleset
@@ -50,7 +49,7 @@ You can see some examples of custom rulesets by visiting the [custom ruleset dir
 
 Please make sure you have the following prerequisites:
 
-- A desktop platform with the [.NET Core 3.1 SDK](https://dotnet.microsoft.com/download) or higher installed.
+- A desktop platform with the [.NET 5.0 SDK](https://dotnet.microsoft.com/download) or higher installed.
 - When developing with mobile, [Xamarin](https://docs.microsoft.com/en-us/xamarin/) is required, which is shipped together with Visual Studio or [Visual Studio for Mac](https://visualstudio.microsoft.com/vs/mac/).
 - When working with the codebase, we recommend using an IDE with intelligent code completion and syntax highlighting, such as [Visual Studio 2019+](https://visualstudio.microsoft.com/vs/), [JetBrains Rider](https://www.jetbrains.com/rider/) or [Visual Studio Code](https://code.visualstudio.com/).
 - When running on Linux, please have a system-wide FFmpeg installation available to support video decoding.

From 3a7608275d5b0188c3ab70df2ae9482fad252392 Mon Sep 17 00:00:00 2001
From: Mysfit <jdawg678@gmail.com>
Date: Tue, 19 Jan 2021 00:35:56 -0500
Subject: [PATCH 0965/3722] Use fades instead of event listening. Fixed same
 issue in the playlist room creation.

---
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 45 ++++++++++++++-----
 .../Playlists/PlaylistsRoomSubScreen.cs       | 38 +++++++++++++++-
 2 files changed, 70 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 38c2ca7e0c..03a76c66f2 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -180,9 +180,40 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                     State = { Value = client.Room == null ? Visibility.Visible : Visibility.Hidden }
                 }
             };
+        }
 
-            subScreenContainer.Hide();
-            client.RoomUpdated += roomUpdated;
+        public override void OnEntering(IScreen last)
+        {
+            base.OnEntering(last);
+
+            subScreenContainer.FadeOut().Delay(1000).FadeIn(500);
+        }
+
+        public override bool OnExiting(IScreen next)
+        {
+            if (base.OnExiting(next))
+                return true;
+
+            subScreenContainer.FadeOut();
+
+            return false;
+        }
+
+        public override void OnResuming(IScreen last)
+        {
+            base.OnResuming(last);
+
+            if (client.Room == null)
+                subScreenContainer.FadeOut().Delay(1000).FadeIn(500);
+            else
+                subScreenContainer.FadeInFromZero();
+        }
+
+        public override void OnSuspending(IScreen next)
+        {
+            subScreenContainer.FadeOut();
+
+            base.OnSuspending(next);
         }
 
         protected override void LoadComplete()
@@ -263,16 +294,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             readyClickOperation = null;
         }
 
-        private void roomUpdated()
-        {
-            if (client.Room != null)
-            {
-                // If the room is updated and is not null, show the room sub screen container and unsubscribe.
-                subScreenContainer.Show();
-                client.RoomUpdated -= roomUpdated;
-            }
-        }
-
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
index e76ca995bf..583956b3f1 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
@@ -33,6 +33,8 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
 
         private OverlinedHeader participantsHeader;
 
+        private GridContainer subScreenContainer;
+
         public PlaylistsRoomSubScreen(Room room)
         {
             Title = room.RoomID.Value == null ? "New playlist" : room.Name.Value;
@@ -44,7 +46,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         {
             InternalChildren = new Drawable[]
             {
-                new GridContainer
+                subScreenContainer = new GridContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     Content = new[]
@@ -195,6 +197,40 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         [Resolved]
         private IAPIProvider api { get; set; }
 
+        public override void OnEntering(IScreen last)
+        {
+            base.OnEntering(last);
+
+            subScreenContainer.FadeOut().Delay(1000).FadeIn(500);
+        }
+
+        public override bool OnExiting(IScreen next)
+        {
+            if (base.OnExiting(next))
+                return true;
+
+            subScreenContainer.FadeOut();
+
+            return false;
+        }
+
+        public override void OnResuming(IScreen last)
+        {
+            base.OnResuming(last);
+
+            if (roomId.Value == null)
+                subScreenContainer.FadeOut().Delay(1000).FadeIn(500);
+            else
+                subScreenContainer.FadeInFromZero();
+        }
+
+        public override void OnSuspending(IScreen next)
+        {
+            subScreenContainer.FadeOut();
+
+            base.OnSuspending(next);
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();

From de9d075f941fe840e14e9a576e3329956884ee4c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 19 Jan 2021 17:11:40 +0900
Subject: [PATCH 0966/3722] Initial sample + samplechannel rework

---
 .../Legacy/ManiaLegacySkinTransformer.cs      |  4 +-
 .../TestSceneCursorTrail.cs                   |  2 +-
 .../TestSceneSkinFallbacks.cs                 |  2 +-
 .../Objects/Drawables/DrawableSpinner.cs      |  3 +-
 .../Legacy/TaikoLegacySkinTransformer.cs      |  2 +-
 .../TestSceneHitObjectAccentColour.cs         |  2 +-
 .../Gameplay/TestSceneStoryboardSamples.cs    |  4 +-
 .../Skinning/LegacySkinAnimationTest.cs       |  2 +-
 .../TestSceneDrawableRulesetDependencies.cs   |  4 +-
 .../Skins/TestSceneSkinConfigurationLookup.cs |  2 +-
 .../Editing/TestSceneEditorSamplePlayback.cs  | 16 +++---
 .../TestSceneGameplaySamplePlayback.cs        |  7 +--
 .../Gameplay/TestSceneSkinnableDrawable.cs    |  6 +-
 .../Gameplay/TestSceneSkinnableSound.cs       | 56 +++++++------------
 .../Containers/OsuFocusedOverlayContainer.cs  |  4 +-
 osu.Game/Graphics/ScreenshotManager.cs        |  2 +-
 .../UserInterface/DrawableOsuMenuItem.cs      |  4 +-
 .../UserInterface/HoverClickSounds.cs         |  2 +-
 .../Graphics/UserInterface/HoverSounds.cs     |  2 +-
 .../Graphics/UserInterface/OsuCheckbox.cs     |  4 +-
 .../Graphics/UserInterface/OsuSliderBar.cs    | 12 ++--
 osu.Game/Graphics/UserInterface/OsuTextBox.cs | 10 ++--
 osu.Game/Overlays/ChangelogOverlay.cs         |  2 +-
 osu.Game/Overlays/MedalOverlay.cs             |  2 +-
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    |  2 +-
 .../UI/DrawableRulesetDependencies.cs         |  4 +-
 osu.Game/Screens/Menu/Button.cs               |  4 +-
 osu.Game/Screens/Menu/ButtonSystem.cs         |  2 +-
 osu.Game/Screens/Menu/IntroCircles.cs         |  2 +-
 osu.Game/Screens/Menu/IntroScreen.cs          |  2 +-
 osu.Game/Screens/Menu/IntroTriangles.cs       |  2 +-
 osu.Game/Screens/Menu/IntroWelcome.cs         | 11 ++--
 osu.Game/Screens/Menu/OsuLogo.cs              |  4 +-
 .../Screens/OnlinePlay/Match/RoomSubScreen.cs |  2 +-
 .../Match/MultiplayerReadyButton.cs           |  6 +-
 osu.Game/Screens/OsuScreen.cs                 |  2 +-
 osu.Game/Screens/Play/FailAnimation.cs        |  2 +-
 osu.Game/Screens/Play/Player.cs               |  2 +-
 osu.Game/Screens/Play/SkipOverlay.cs          |  2 +-
 .../Screens/Select/Carousel/CarouselHeader.cs |  2 +-
 osu.Game/Screens/Select/SongSelect.cs         |  6 +-
 osu.Game/Skinning/DefaultSkin.cs              |  2 +-
 osu.Game/Skinning/ISkin.cs                    |  2 +-
 osu.Game/Skinning/LegacyBeatmapSkin.cs        |  2 +-
 osu.Game/Skinning/LegacySkin.cs               |  4 +-
 osu.Game/Skinning/LegacySkinTransformer.cs    |  4 +-
 osu.Game/Skinning/PausableSkinnableSound.cs   |  4 +-
 osu.Game/Skinning/PoolableSkinnableSample.cs  | 23 +++++---
 osu.Game/Skinning/Skin.cs                     |  2 +-
 osu.Game/Skinning/SkinManager.cs              |  2 +-
 osu.Game/Skinning/SkinProvidingContainer.cs   |  4 +-
 osu.Game/Skinning/SkinnableSound.cs           |  7 ++-
 52 files changed, 131 insertions(+), 138 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
index 7e2a8823b6..cbbbacfe19 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
@@ -140,11 +140,11 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
             return animation == null ? null : new LegacyManiaJudgementPiece(result, animation);
         }
 
-        public override SampleChannel GetSample(ISampleInfo sampleInfo)
+        public override Sample GetSample(ISampleInfo sampleInfo)
         {
             // layered hit sounds never play in mania
             if (sampleInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacySample && legacySample.IsLayered)
-                return new SampleChannelVirtual();
+                return new SampleVirtual();
 
             return Source.GetSample(sampleInfo);
         }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
index fefe983f97..e2d9f144c0 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
                 return null;
             }
 
-            public SampleChannel GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
+            public Sample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotImplementedException();
 
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
index 10baca438d..8dbb48c048 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
@@ -162,7 +162,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => null;
 
-            public SampleChannel GetSample(ISampleInfo sampleInfo) => null;
+            public Sample GetSample(ISampleInfo sampleInfo) => null;
 
             public TValue GetValue<TConfiguration, TValue>(Func<TConfiguration, TValue> query) where TConfiguration : SkinConfiguration => default;
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => null;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 56aedebed3..b9c5b6e83a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -130,7 +130,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             if (tracking.NewValue)
             {
-                spinningSample?.Play(!spinningSample.IsPlaying);
+                if (!spinningSample.IsPlaying)
+                    spinningSample?.Play();
                 spinningSample?.VolumeTo(1, 300);
             }
             else
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
index d8e3100048..9f29675230 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
@@ -152,7 +152,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
             throw new ArgumentOutOfRangeException(nameof(component), $"Invalid component type: {component}");
         }
 
-        public override SampleChannel GetSample(ISampleInfo sampleInfo) => Source.GetSample(new LegacyTaikoSampleInfo(sampleInfo));
+        public override Sample GetSample(ISampleInfo sampleInfo) => Source.GetSample(new LegacyTaikoSampleInfo(sampleInfo));
 
         public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => Source.GetConfig<TLookup, TValue>(lookup);
 
diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
index de46f9d1cf..3ded3009bd 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
@@ -121,7 +121,7 @@ namespace osu.Game.Tests.Gameplay
 
             public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
 
-            public SampleChannel GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
+            public Sample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
             {
diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index 38cb6729c3..7a0dd5b719 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Tests.Gameplay
         public void TestRetrieveTopLevelSample()
         {
             ISkin skin = null;
-            SampleChannel channel = null;
+            Sample channel = null;
 
             AddStep("create skin", () => skin = new TestSkin("test-sample", this));
             AddStep("retrieve sample", () => channel = skin.GetSample(new SampleInfo("test-sample")));
@@ -47,7 +47,7 @@ namespace osu.Game.Tests.Gameplay
         public void TestRetrieveSampleInSubFolder()
         {
             ISkin skin = null;
-            SampleChannel channel = null;
+            Sample channel = null;
 
             AddStep("create skin", () => skin = new TestSkin("folder/test-sample", this));
             AddStep("retrieve sample", () => channel = skin.GetSample(new SampleInfo("folder/test-sample")));
diff --git a/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs b/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs
index a5c937119e..da004b9088 100644
--- a/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs
+++ b/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Tests.NonVisual.Skinning
             }
 
             public Drawable GetDrawableComponent(ISkinComponent component) => throw new NotSupportedException();
-            public SampleChannel GetSample(ISampleInfo sampleInfo) => throw new NotSupportedException();
+            public Sample GetSample(ISampleInfo sampleInfo) => throw new NotSupportedException();
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotSupportedException();
         }
 
diff --git a/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs b/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
index 987a5812db..787f72ba79 100644
--- a/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
+++ b/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
@@ -105,9 +105,9 @@ namespace osu.Game.Tests.Rulesets
                 IsDisposed = true;
             }
 
-            public SampleChannel Get(string name) => null;
+            public Sample Get(string name) => null;
 
-            public Task<SampleChannel> GetAsync(string name) => null;
+            public Task<Sample> GetAsync(string name) => null;
 
             public Stream GetStream(string name) => null;
 
diff --git a/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs b/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
index ad5b3ec0f6..414f7d3f88 100644
--- a/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
+++ b/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
@@ -219,7 +219,7 @@ namespace osu.Game.Tests.Skins
 
             public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => skin.GetTexture(componentName, wrapModeS, wrapModeT);
 
-            public SampleChannel GetSample(ISampleInfo sampleInfo) => skin.GetSample(sampleInfo);
+            public Sample GetSample(ISampleInfo sampleInfo) => skin.GetSample(sampleInfo);
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => skin.GetConfig<TLookup, TValue>(lookup);
         }
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSamplePlayback.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSamplePlayback.cs
index f182023c0e..876c1308b4 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSamplePlayback.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSamplePlayback.cs
@@ -3,11 +3,11 @@
 
 using System.Linq;
 using NUnit.Framework;
-using osu.Framework.Graphics.Audio;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Skinning;
 
 namespace osu.Game.Tests.Visual.Editing
 {
@@ -19,14 +19,14 @@ namespace osu.Game.Tests.Visual.Editing
         public void TestSlidingSampleStopsOnSeek()
         {
             DrawableSlider slider = null;
-            DrawableSample[] loopingSamples = null;
-            DrawableSample[] onceOffSamples = null;
+            SkinnableSound[] loopingSamples = null;
+            SkinnableSound[] onceOffSamples = null;
 
             AddStep("get first slider", () =>
             {
                 slider = Editor.ChildrenOfType<DrawableSlider>().OrderBy(s => s.HitObject.StartTime).First();
-                onceOffSamples = slider.ChildrenOfType<DrawableSample>().Where(s => !s.Looping).ToArray();
-                loopingSamples = slider.ChildrenOfType<DrawableSample>().Where(s => s.Looping).ToArray();
+                onceOffSamples = slider.ChildrenOfType<SkinnableSound>().Where(s => !s.Looping).ToArray();
+                loopingSamples = slider.ChildrenOfType<SkinnableSound>().Where(s => s.Looping).ToArray();
             });
 
             AddStep("start playback", () => EditorClock.Start());
@@ -36,15 +36,15 @@ namespace osu.Game.Tests.Visual.Editing
                 if (!slider.Tracking.Value)
                     return false;
 
-                if (!loopingSamples.Any(s => s.Playing))
+                if (!loopingSamples.Any(s => s.IsPlaying))
                     return false;
 
                 EditorClock.Seek(20000);
                 return true;
             });
 
-            AddAssert("non-looping samples are playing", () => onceOffSamples.Length == 4 && loopingSamples.All(s => s.Played || s.Playing));
-            AddAssert("looping samples are not playing", () => loopingSamples.Length == 1 && loopingSamples.All(s => s.Played && !s.Playing));
+            AddAssert("non-looping samples are playing", () => onceOffSamples.Length == 4 && loopingSamples.All(s => s.IsPlayed || s.IsPlaying));
+            AddAssert("looping samples are not playing", () => loopingSamples.Length == 1 && loopingSamples.All(s => s.IsPlayed && !s.IsPlaying));
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs
index 7c6a213fe2..b13acdcb95 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
-using osu.Framework.Graphics.Audio;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
@@ -20,14 +19,14 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestAllSamplesStopDuringSeek()
         {
             DrawableSlider slider = null;
-            DrawableSample[] samples = null;
+            SkinnableSound[] samples = null;
             ISamplePlaybackDisabler sampleDisabler = null;
 
             AddUntilStep("get variables", () =>
             {
                 sampleDisabler = Player;
                 slider = Player.ChildrenOfType<DrawableSlider>().OrderBy(s => s.HitObject.StartTime).FirstOrDefault();
-                samples = slider?.ChildrenOfType<DrawableSample>().ToArray();
+                samples = slider?.ChildrenOfType<SkinnableSound>().ToArray();
 
                 return slider != null;
             });
@@ -37,7 +36,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 if (!slider.Tracking.Value)
                     return false;
 
-                if (!samples.Any(s => s.Playing))
+                if (!samples.Any(s => s.IsPlaying))
                     return false;
 
                 Player.ChildrenOfType<GameplayClockContainer>().First().Seek(40000);
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
index bed48f3d86..44142b69d7 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
@@ -298,7 +298,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
 
-            public SampleChannel GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
+            public Sample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotImplementedException();
         }
@@ -309,7 +309,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
 
-            public SampleChannel GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
+            public Sample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotImplementedException();
         }
@@ -321,7 +321,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
 
-            public SampleChannel GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
+            public Sample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotImplementedException();
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
index fc0cda2c1f..28c266f7d8 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
@@ -43,70 +43,52 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestStoppedSoundDoesntResumeAfterPause()
         {
-            DrawableSample sample = null;
-            AddStep("start sample with looping", () =>
-            {
-                sample = skinnableSound.ChildrenOfType<DrawableSample>().First();
+            AddStep("start sample with looping", () => skinnableSound.Looping = true);
 
-                skinnableSound.Looping = true;
-                skinnableSound.Play();
-            });
-
-            AddUntilStep("wait for sample to start playing", () => sample.Playing);
+            AddUntilStep("wait for sample to start playing", () => skinnableSound.IsPlaying);
 
             AddStep("stop sample", () => skinnableSound.Stop());
 
-            AddUntilStep("wait for sample to stop playing", () => !sample.Playing);
+            AddUntilStep("wait for sample to stop playing", () => !skinnableSound.IsPlaying);
 
             AddStep("disable sample playback", () => skinSource.SamplePlaybackDisabled.Value = true);
 
             AddStep("enable sample playback", () => skinSource.SamplePlaybackDisabled.Value = false);
 
             AddWaitStep("wait a bit", 5);
-            AddAssert("sample not playing", () => !sample.Playing);
+            AddAssert("sample not playing", () => !skinnableSound.IsPlaying);
         }
 
         [Test]
         public void TestLoopingSoundResumesAfterPause()
         {
-            DrawableSample sample = null;
-            AddStep("start sample with looping", () =>
-            {
-                skinnableSound.Looping = true;
-                skinnableSound.Play();
-                sample = skinnableSound.ChildrenOfType<DrawableSample>().First();
-            });
+            AddStep("start sample with looping", () => skinnableSound.Looping = true);
 
-            AddUntilStep("wait for sample to start playing", () => sample.Playing);
+            AddUntilStep("wait for sample to start playing", () => skinnableSound.IsPlaying);
 
             AddStep("disable sample playback", () => skinSource.SamplePlaybackDisabled.Value = true);
-            AddUntilStep("wait for sample to stop playing", () => !sample.Playing);
+            AddUntilStep("wait for sample to stop playing", () => !skinnableSound.IsPlaying);
 
             AddStep("enable sample playback", () => skinSource.SamplePlaybackDisabled.Value = false);
-            AddUntilStep("wait for sample to start playing", () => sample.Playing);
+            AddUntilStep("wait for sample to start playing", () => skinnableSound.IsPlaying);
         }
 
         [Test]
         public void TestNonLoopingStopsWithPause()
         {
-            DrawableSample sample = null;
-            AddStep("start sample", () =>
-            {
-                skinnableSound.Play();
-                sample = skinnableSound.ChildrenOfType<DrawableSample>().First();
-            });
+            AddStep("start sample", () => skinnableSound.Play());
 
-            AddAssert("sample playing", () => sample.Playing);
+            AddAssert("sample playing", () => skinnableSound.IsPlaying);
 
             AddStep("disable sample playback", () => skinSource.SamplePlaybackDisabled.Value = true);
 
-            AddUntilStep("sample not playing", () => !sample.Playing);
+            AddUntilStep("sample not playing", () => !skinnableSound.IsPlaying);
 
             AddStep("enable sample playback", () => skinSource.SamplePlaybackDisabled.Value = false);
 
-            AddAssert("sample not playing", () => !sample.Playing);
-            AddAssert("sample not playing", () => !sample.Playing);
-            AddAssert("sample not playing", () => !sample.Playing);
+            AddAssert("sample not playing", () => !skinnableSound.IsPlaying);
+            AddAssert("sample not playing", () => !skinnableSound.IsPlaying);
+            AddAssert("sample not playing", () => !skinnableSound.IsPlaying);
         }
 
         [Test]
@@ -119,10 +101,10 @@ namespace osu.Game.Tests.Visual.Gameplay
                 sample = skinnableSound.ChildrenOfType<DrawableSample>().Single();
             });
 
-            AddAssert("sample playing", () => sample.Playing);
+            AddAssert("sample playing", () => skinnableSound.IsPlaying);
 
             AddStep("disable sample playback", () => skinSource.SamplePlaybackDisabled.Value = true);
-            AddUntilStep("wait for sample to stop playing", () => !sample.Playing);
+            AddUntilStep("wait for sample to stop playing", () => !skinnableSound.IsPlaying);
 
             AddStep("trigger skin change", () => skinSource.TriggerSourceChanged());
 
@@ -133,11 +115,11 @@ namespace osu.Game.Tests.Visual.Gameplay
                 return sample != oldSample;
             });
 
-            AddAssert("new sample stopped", () => !sample.Playing);
+            AddAssert("new sample stopped", () => !skinnableSound.IsPlaying);
             AddStep("enable sample playback", () => skinSource.SamplePlaybackDisabled.Value = false);
 
             AddWaitStep("wait a bit", 5);
-            AddAssert("new sample not played", () => !sample.Playing);
+            AddAssert("new sample not played", () => !skinnableSound.IsPlaying);
         }
 
         [Cached(typeof(ISkinSource))]
@@ -155,7 +137,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public Drawable GetDrawableComponent(ISkinComponent component) => source?.GetDrawableComponent(component);
             public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => source?.GetTexture(componentName, wrapModeS, wrapModeT);
-            public SampleChannel GetSample(ISampleInfo sampleInfo) => source?.GetSample(sampleInfo);
+            public Sample GetSample(ISampleInfo sampleInfo) => source?.GetSample(sampleInfo);
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => source?.GetConfig<TLookup, TValue>(lookup);
 
             public void TriggerSourceChanged()
diff --git a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
index 41fd37a0d7..d623622434 100644
--- a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
+++ b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
@@ -18,8 +18,8 @@ namespace osu.Game.Graphics.Containers
     [Cached(typeof(IPreviewTrackOwner))]
     public abstract class OsuFocusedOverlayContainer : FocusedOverlayContainer, IPreviewTrackOwner, IKeyBindingHandler<GlobalAction>
     {
-        private SampleChannel samplePopIn;
-        private SampleChannel samplePopOut;
+        private Sample samplePopIn;
+        private Sample samplePopOut;
 
         protected override bool BlockNonPositionalInput => true;
 
diff --git a/osu.Game/Graphics/ScreenshotManager.cs b/osu.Game/Graphics/ScreenshotManager.cs
index 53ee711626..f7914cbbca 100644
--- a/osu.Game/Graphics/ScreenshotManager.cs
+++ b/osu.Game/Graphics/ScreenshotManager.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Graphics
         [Resolved]
         private NotificationOverlay notificationOverlay { get; set; }
 
-        private SampleChannel shutter;
+        private Sample shutter;
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config, Storage storage, AudioManager audio)
diff --git a/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs b/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs
index abaae7b43c..b499b26f38 100644
--- a/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs
+++ b/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs
@@ -22,8 +22,8 @@ namespace osu.Game.Graphics.UserInterface
         private const int text_size = 17;
         private const int transition_length = 80;
 
-        private SampleChannel sampleClick;
-        private SampleChannel sampleHover;
+        private Sample sampleClick;
+        private Sample sampleHover;
 
         private TextContainer text;
 
diff --git a/osu.Game/Graphics/UserInterface/HoverClickSounds.cs b/osu.Game/Graphics/UserInterface/HoverClickSounds.cs
index 803facae04..c1963ce62d 100644
--- a/osu.Game/Graphics/UserInterface/HoverClickSounds.cs
+++ b/osu.Game/Graphics/UserInterface/HoverClickSounds.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Graphics.UserInterface
     /// </summary>
     public class HoverClickSounds : HoverSounds
     {
-        private SampleChannel sampleClick;
+        private Sample sampleClick;
         private readonly MouseButton[] buttons;
 
         /// <summary>
diff --git a/osu.Game/Graphics/UserInterface/HoverSounds.cs b/osu.Game/Graphics/UserInterface/HoverSounds.cs
index a1d06711db..a91e2ffcab 100644
--- a/osu.Game/Graphics/UserInterface/HoverSounds.cs
+++ b/osu.Game/Graphics/UserInterface/HoverSounds.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Graphics.UserInterface
     /// </summary>
     public class HoverSounds : CompositeDrawable
     {
-        private SampleChannel sampleHover;
+        private Sample sampleHover;
 
         /// <summary>
         /// Length of debounce for hover sound playback, in milliseconds.
diff --git a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
index 6593531099..c075fbb328 100644
--- a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
@@ -40,8 +40,8 @@ namespace osu.Game.Graphics.UserInterface
         protected readonly Nub Nub;
 
         private readonly OsuTextFlowContainer labelText;
-        private SampleChannel sampleChecked;
-        private SampleChannel sampleUnchecked;
+        private Sample sampleChecked;
+        private Sample sampleUnchecked;
 
         public OsuCheckbox()
         {
diff --git a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
index d0356e77c7..bcf5220380 100644
--- a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Graphics.UserInterface
         /// </summary>
         private const int max_decimal_digits = 5;
 
-        private SampleChannel sample;
+        private Sample sample;
         private double lastSampleTime;
         private T lastSampleValue;
 
@@ -157,14 +157,14 @@ namespace osu.Game.Graphics.UserInterface
             lastSampleValue = value;
 
             lastSampleTime = Clock.CurrentTime;
-            sample.Frequency.Value = 1 + NormalizedValue * 0.2f;
 
+            var channel = sample.Play();
+
+            channel.Frequency.Value = 1 + NormalizedValue * 0.2f;
             if (NormalizedValue == 0)
-                sample.Frequency.Value -= 0.4f;
+                channel.Frequency.Value -= 0.4f;
             else if (NormalizedValue == 1)
-                sample.Frequency.Value += 0.4f;
-
-            sample.Play();
+                channel.Frequency.Value += 0.4f;
         }
 
         private void updateTooltipText(T value)
diff --git a/osu.Game/Graphics/UserInterface/OsuTextBox.cs b/osu.Game/Graphics/UserInterface/OsuTextBox.cs
index 1ec4dfc91a..75af9efc38 100644
--- a/osu.Game/Graphics/UserInterface/OsuTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTextBox.cs
@@ -23,11 +23,11 @@ namespace osu.Game.Graphics.UserInterface
 {
     public class OsuTextBox : BasicTextBox
     {
-        private readonly SampleChannel[] textAddedSamples = new SampleChannel[4];
-        private SampleChannel capsTextAddedSample;
-        private SampleChannel textRemovedSample;
-        private SampleChannel textCommittedSample;
-        private SampleChannel caretMovedSample;
+        private readonly Sample[] textAddedSamples = new Sample[4];
+        private Sample capsTextAddedSample;
+        private Sample textRemovedSample;
+        private Sample textCommittedSample;
+        private Sample caretMovedSample;
 
         /// <summary>
         /// Whether to allow playing a different samples based on the type of character.
diff --git a/osu.Game/Overlays/ChangelogOverlay.cs b/osu.Game/Overlays/ChangelogOverlay.cs
index c7e9a86fa4..a4f46517d5 100644
--- a/osu.Game/Overlays/ChangelogOverlay.cs
+++ b/osu.Game/Overlays/ChangelogOverlay.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Overlays
 
         private Container<ChangelogContent> content;
 
-        private SampleChannel sampleBack;
+        private Sample sampleBack;
 
         private List<APIChangelogBuild> builds;
 
diff --git a/osu.Game/Overlays/MedalOverlay.cs b/osu.Game/Overlays/MedalOverlay.cs
index 4425c2f168..0feae16b68 100644
--- a/osu.Game/Overlays/MedalOverlay.cs
+++ b/osu.Game/Overlays/MedalOverlay.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Overlays
         private readonly Sprite innerSpin, outerSpin;
         private DrawableMedal drawableMedal;
 
-        private SampleChannel getSample;
+        private Sample getSample;
 
         private readonly Container content;
 
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 0c8245bebe..7bbffc6172 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Overlays.Mods
 
         private readonly FillFlowContainer footerContainer;
 
-        private SampleChannel sampleOn, sampleOff;
+        private Sample sampleOn, sampleOff;
 
         public ModSelectOverlay()
         {
diff --git a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
index 81ec73a6c5..deec948d14 100644
--- a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
+++ b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
@@ -102,9 +102,9 @@ namespace osu.Game.Rulesets.UI
                 this.fallback = fallback;
             }
 
-            public SampleChannel Get(string name) => primary.Get(name) ?? fallback.Get(name);
+            public Sample Get(string name) => primary.Get(name) ?? fallback.Get(name);
 
-            public Task<SampleChannel> GetAsync(string name) => primary.GetAsync(name) ?? fallback.GetAsync(name);
+            public Task<Sample> GetAsync(string name) => primary.GetAsync(name) ?? fallback.GetAsync(name);
 
             public Stream GetStream(string name) => primary.GetStream(name) ?? fallback.GetStream(name);
 
diff --git a/osu.Game/Screens/Menu/Button.cs b/osu.Game/Screens/Menu/Button.cs
index be6ed9700c..d956394ebb 100644
--- a/osu.Game/Screens/Menu/Button.cs
+++ b/osu.Game/Screens/Menu/Button.cs
@@ -45,8 +45,8 @@ namespace osu.Game.Screens.Menu
         public ButtonSystemState VisibleState = ButtonSystemState.TopLevel;
 
         private readonly Action clickAction;
-        private SampleChannel sampleClick;
-        private SampleChannel sampleHover;
+        private Sample sampleClick;
+        private Sample sampleHover;
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => box.ReceivePositionalInputAt(screenSpacePos);
 
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index f400b2114b..00061d6ea6 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Screens.Menu
         private readonly List<Button> buttonsTopLevel = new List<Button>();
         private readonly List<Button> buttonsPlay = new List<Button>();
 
-        private SampleChannel sampleBack;
+        private Sample sampleBack;
 
         private readonly LogoTrackingContainer logoTrackingContainer;
 
diff --git a/osu.Game/Screens/Menu/IntroCircles.cs b/osu.Game/Screens/Menu/IntroCircles.cs
index d4cd073b7a..a1b8c3a203 100644
--- a/osu.Game/Screens/Menu/IntroCircles.cs
+++ b/osu.Game/Screens/Menu/IntroCircles.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Screens.Menu
         private const double delay_step_one = 2300;
         private const double delay_step_two = 600;
 
-        private SampleChannel welcome;
+        private Sample welcome;
 
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index 1df5c503d6..b8b962be6c 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Screens.Menu
 
         private const int exit_delay = 3000;
 
-        private SampleChannel seeya;
+        private Sample seeya;
 
         protected virtual string SeeyaSampleName => "Intro/seeya";
 
diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index a96fddb5ad..ffe6882a72 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Screens.Menu
 
         private BackgroundScreenDefault background;
 
-        private SampleChannel welcome;
+        private Sample welcome;
 
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game/Screens/Menu/IntroWelcome.cs b/osu.Game/Screens/Menu/IntroWelcome.cs
index abb83f894a..f8021a151e 100644
--- a/osu.Game/Screens/Menu/IntroWelcome.cs
+++ b/osu.Game/Screens/Menu/IntroWelcome.cs
@@ -21,8 +21,8 @@ namespace osu.Game.Screens.Menu
         protected override string BeatmapHash => "64e00d7022195959bfa3109d09c2e2276c8f12f486b91fcf6175583e973b48f2";
         protected override string BeatmapFile => "welcome.osz";
         private const double delay_step_two = 2142;
-        private SampleChannel welcome;
-        private SampleChannel pianoReverb;
+        private Sample welcome;
+        private Sample pianoReverb;
         protected override string SeeyaSampleName => "Intro/Welcome/seeya";
 
         protected override BackgroundScreen CreateBackground() => background = new BackgroundScreenDefault(false)
@@ -56,12 +56,13 @@ namespace osu.Game.Screens.Menu
                 {
                     PrepareMenuLoad();
 
-                    intro.LogoVisualisation.AddAmplitudeSource(pianoReverb);
-
                     AddInternal(intro);
 
                     welcome?.Play();
-                    pianoReverb?.Play();
+
+                    var reverbChannel = pianoReverb?.Play();
+                    if (reverbChannel != null)
+                        intro.LogoVisualisation.AddAmplitudeSource(reverbChannel);
 
                     Scheduler.AddDelayed(() =>
                     {
diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs
index 68d23e1a32..ffd7df97c4 100644
--- a/osu.Game/Screens/Menu/OsuLogo.cs
+++ b/osu.Game/Screens/Menu/OsuLogo.cs
@@ -43,8 +43,8 @@ namespace osu.Game.Screens.Menu
 
         private readonly IntroSequence intro;
 
-        private SampleChannel sampleClick;
-        private SampleChannel sampleBeat;
+        private Sample sampleClick;
+        private Sample sampleBeat;
 
         private readonly Container colourAndTriangles;
         private readonly Triangles triangles;
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 2449563c73..a79119057d 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
 
         public override bool DisallowExternalBeatmapRulesetChanges => true;
 
-        private SampleChannel sampleStart;
+        private Sample sampleStart;
 
         [Resolved(typeof(Room), nameof(Room.Playlist))]
         protected BindableList<PlaylistItem> Playlist { get; private set; }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
index 04030cdbfd..d17d3295c4 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
         private IBindable<bool> operationInProgress;
 
-        private SampleChannel sampleReadyCount;
+        private Sample sampleReadyCount;
 
         private readonly ButtonWithTrianglesExposed button;
 
@@ -120,8 +120,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             if (sampleReadyCount == null)
                 return;
 
-            sampleReadyCount.Frequency.Value = 0.77f + countReady * 0.06f;
-            sampleReadyCount.Play();
+            var channel = sampleReadyCount.Play();
+            channel.Frequency.Value = 0.77f + countReady * 0.06f;
         }
 
         private void updateButtonColour(bool green)
diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index 9b716b323d..aeb51813e4 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Screens
         /// </summary>
         public virtual bool DisallowExternalBeatmapRulesetChanges => false;
 
-        private SampleChannel sampleExit;
+        private Sample sampleExit;
 
         protected virtual bool PlayResumeSound => true;
 
diff --git a/osu.Game/Screens/Play/FailAnimation.cs b/osu.Game/Screens/Play/FailAnimation.cs
index 608f20affd..71bea2a145 100644
--- a/osu.Game/Screens/Play/FailAnimation.cs
+++ b/osu.Game/Screens/Play/FailAnimation.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Screens.Play
 
         private const float duration = 2500;
 
-        private SampleChannel failSample;
+        private Sample failSample;
 
         public FailAnimation(DrawableRuleset drawableRuleset)
         {
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 1fcbed7ef7..7dda5973a0 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Screens.Play
         [Resolved]
         private MusicController musicController { get; set; }
 
-        private SampleChannel sampleRestart;
+        private Sample sampleRestart;
 
         public BreakOverlay BreakOverlay;
 
diff --git a/osu.Game/Screens/Play/SkipOverlay.cs b/osu.Game/Screens/Play/SkipOverlay.cs
index 92b304de91..3f214e49d9 100644
--- a/osu.Game/Screens/Play/SkipOverlay.cs
+++ b/osu.Game/Screens/Play/SkipOverlay.cs
@@ -230,7 +230,7 @@ namespace osu.Game.Screens.Play
             private Box background;
             private AspectContainer aspect;
 
-            private SampleChannel sampleConfirm;
+            private Sample sampleConfirm;
 
             public Button()
             {
diff --git a/osu.Game/Screens/Select/Carousel/CarouselHeader.cs b/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
index f1120f55a6..c5c1e2eac7 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Screens.Select.Carousel
 {
     public class CarouselHeader : Container
     {
-        private SampleChannel sampleHover;
+        private Sample sampleHover;
 
         private readonly Box hoverLayer;
 
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 6c0bd3a228..a91dc49069 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -86,10 +86,10 @@ namespace osu.Game.Screens.Select
 
         protected ModSelectOverlay ModSelect { get; private set; }
 
-        protected SampleChannel SampleConfirm { get; private set; }
+        protected Sample SampleConfirm { get; private set; }
 
-        private SampleChannel sampleChangeDifficulty;
-        private SampleChannel sampleChangeBeatmap;
+        private Sample sampleChangeDifficulty;
+        private Sample sampleChangeBeatmap;
 
         private Container carouselContainer;
 
diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index 61d0112c89..346c7b3c65 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Skinning
 
         public override Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => null;
 
-        public override SampleChannel GetSample(ISampleInfo sampleInfo) => null;
+        public override Sample GetSample(ISampleInfo sampleInfo) => null;
 
         public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
         {
diff --git a/osu.Game/Skinning/ISkin.cs b/osu.Game/Skinning/ISkin.cs
index 5abd963773..ef8de01042 100644
--- a/osu.Game/Skinning/ISkin.cs
+++ b/osu.Game/Skinning/ISkin.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Skinning
         /// <param name="sampleInfo">The requested sample.</param>
         /// <returns>A matching sample channel, or null if unavailable.</returns>
         [CanBeNull]
-        SampleChannel GetSample(ISampleInfo sampleInfo);
+        Sample GetSample(ISampleInfo sampleInfo);
 
         /// <summary>
         /// Retrieve a configuration value.
diff --git a/osu.Game/Skinning/LegacyBeatmapSkin.cs b/osu.Game/Skinning/LegacyBeatmapSkin.cs
index fdcb81b574..fb4207b647 100644
--- a/osu.Game/Skinning/LegacyBeatmapSkin.cs
+++ b/osu.Game/Skinning/LegacyBeatmapSkin.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Skinning
             return base.GetConfig<TLookup, TValue>(lookup);
         }
 
-        public override SampleChannel GetSample(ISampleInfo sampleInfo)
+        public override Sample GetSample(ISampleInfo sampleInfo)
         {
             if (sampleInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacy && legacy.CustomSampleBank == 0)
             {
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 090ffaebd7..e5d0217671 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Skinning
         protected TextureStore Textures;
 
         [CanBeNull]
-        protected IResourceStore<SampleChannel> Samples;
+        protected ISampleStore Samples;
 
         /// <summary>
         /// Whether texture for the keys exists.
@@ -452,7 +452,7 @@ namespace osu.Game.Skinning
             return null;
         }
 
-        public override SampleChannel GetSample(ISampleInfo sampleInfo)
+        public override Sample GetSample(ISampleInfo sampleInfo)
         {
             IEnumerable<string> lookupNames;
 
diff --git a/osu.Game/Skinning/LegacySkinTransformer.cs b/osu.Game/Skinning/LegacySkinTransformer.cs
index ebc4757e75..e2f4a82a54 100644
--- a/osu.Game/Skinning/LegacySkinTransformer.cs
+++ b/osu.Game/Skinning/LegacySkinTransformer.cs
@@ -34,14 +34,14 @@ namespace osu.Game.Skinning
         public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
             => Source.GetTexture(componentName, wrapModeS, wrapModeT);
 
-        public virtual SampleChannel GetSample(ISampleInfo sampleInfo)
+        public virtual Sample GetSample(ISampleInfo sampleInfo)
         {
             if (!(sampleInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacySample))
                 return Source.GetSample(sampleInfo);
 
             var playLayeredHitSounds = GetConfig<LegacySetting, bool>(LegacySetting.LayeredHitSounds);
             if (legacySample.IsLayered && playLayeredHitSounds?.Value == false)
-                return new SampleChannelVirtual();
+                return new SampleVirtual();
 
             return Source.GetSample(sampleInfo);
         }
diff --git a/osu.Game/Skinning/PausableSkinnableSound.cs b/osu.Game/Skinning/PausableSkinnableSound.cs
index cb5234c847..4b6099e85f 100644
--- a/osu.Game/Skinning/PausableSkinnableSound.cs
+++ b/osu.Game/Skinning/PausableSkinnableSound.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Skinning
             }
         }
 
-        public override void Play(bool restart = true)
+        public override void Play()
         {
             cancelPendingStart();
             RequestedPlaying = true;
@@ -75,7 +75,7 @@ namespace osu.Game.Skinning
             if (samplePlaybackDisabled.Value)
                 return;
 
-            base.Play(restart);
+            base.Play();
         }
 
         public override void Stop()
diff --git a/osu.Game/Skinning/PoolableSkinnableSample.cs b/osu.Game/Skinning/PoolableSkinnableSample.cs
index 2a0f480b48..2c83023fdc 100644
--- a/osu.Game/Skinning/PoolableSkinnableSample.cs
+++ b/osu.Game/Skinning/PoolableSkinnableSample.cs
@@ -27,6 +27,7 @@ namespace osu.Game.Skinning
 
         private readonly AudioContainer<DrawableSample> sampleContainer;
         private ISampleInfo sampleInfo;
+        private SampleChannel activeChannel;
 
         [Resolved]
         private ISampleStore sampleStore { get; set; }
@@ -99,7 +100,7 @@ namespace osu.Game.Skinning
             if (ch == null)
                 return;
 
-            sampleContainer.Add(Sample = new DrawableSample(ch) { Looping = Looping });
+            sampleContainer.Add(Sample = new DrawableSample(ch));
 
             // Start playback internally for the new sample if the previous one was playing beforehand.
             if (wasPlaying && Looping)
@@ -109,18 +110,26 @@ namespace osu.Game.Skinning
         /// <summary>
         /// Plays the sample.
         /// </summary>
-        /// <param name="restart">Whether to play the sample from the beginning.</param>
-        public void Play(bool restart = true) => Sample?.Play(restart);
+        public void Play()
+        {
+            if (Sample == null)
+                return;
+
+            activeChannel = Sample.Play();
+            activeChannel.Looping = Looping;
+        }
 
         /// <summary>
         /// Stops the sample.
         /// </summary>
-        public void Stop() => Sample?.Stop();
+        public void Stop() => activeChannel?.Stop();
 
         /// <summary>
         /// Whether the sample is currently playing.
         /// </summary>
-        public bool Playing => Sample?.Playing ?? false;
+        public bool Playing => activeChannel?.Playing ?? false;
+
+        public bool Played => activeChannel?.Played ?? false;
 
         private bool looping;
 
@@ -134,8 +143,8 @@ namespace osu.Game.Skinning
             {
                 looping = value;
 
-                if (Sample != null)
-                    Sample.Looping = value;
+                if (activeChannel != null)
+                    activeChannel.Looping = value;
             }
         }
 
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index 4b0cf02c0a..e8d84b49f9 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Skinning
 
         public abstract Drawable GetDrawableComponent(ISkinComponent componentName);
 
-        public abstract SampleChannel GetSample(ISampleInfo sampleInfo);
+        public abstract Sample GetSample(ISampleInfo sampleInfo);
 
         public Texture GetTexture(string componentName) => GetTexture(componentName, default, default);
 
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 99c64b13a4..2826c826a5 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -171,7 +171,7 @@ namespace osu.Game.Skinning
 
         public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => CurrentSkin.Value.GetTexture(componentName, wrapModeS, wrapModeT);
 
-        public SampleChannel GetSample(ISampleInfo sampleInfo) => CurrentSkin.Value.GetSample(sampleInfo);
+        public Sample GetSample(ISampleInfo sampleInfo) => CurrentSkin.Value.GetSample(sampleInfo);
 
         public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => CurrentSkin.Value.GetConfig<TLookup, TValue>(lookup);
 
diff --git a/osu.Game/Skinning/SkinProvidingContainer.cs b/osu.Game/Skinning/SkinProvidingContainer.cs
index 27cf0c697a..ba67d0a678 100644
--- a/osu.Game/Skinning/SkinProvidingContainer.cs
+++ b/osu.Game/Skinning/SkinProvidingContainer.cs
@@ -59,9 +59,9 @@ namespace osu.Game.Skinning
             return fallbackSource?.GetTexture(componentName, wrapModeS, wrapModeT);
         }
 
-        public SampleChannel GetSample(ISampleInfo sampleInfo)
+        public Sample GetSample(ISampleInfo sampleInfo)
         {
-            SampleChannel sourceChannel;
+            Sample sourceChannel;
             if (AllowSampleLookup(sampleInfo) && (sourceChannel = skin?.GetSample(sampleInfo)) != null)
                 return sourceChannel;
 
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index a874e9a0db..06c694dc7a 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -119,13 +119,12 @@ namespace osu.Game.Skinning
         /// <summary>
         /// Plays the samples.
         /// </summary>
-        /// <param name="restart">Whether to play the sample from the beginning.</param>
-        public virtual void Play(bool restart = true)
+        public virtual void Play()
         {
             samplesContainer.ForEach(c =>
             {
                 if (PlayWhenZeroVolume || c.AggregateVolume.Value > 0)
-                    c.Play(restart);
+                    c.Play();
             });
         }
 
@@ -188,6 +187,8 @@ namespace osu.Game.Skinning
         /// </summary>
         public bool IsPlaying => samplesContainer.Any(s => s.Playing);
 
+        public bool IsPlayed => samplesContainer.Any(s => s.Played);
+
         #endregion
     }
 }

From 5a64abee648f7c49f92305f6ba988c19199e9f64 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 19 Jan 2021 11:51:31 +0300
Subject: [PATCH 0967/3722] Inline with above method

---
 .../Online/Rooms/MultiplayerBeatmapTracker.cs  | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
index 32a6c39ea8..59dfdcf464 100644
--- a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
+++ b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
@@ -35,21 +35,19 @@ namespace osu.Game.Online.Rooms
         }
 
         protected override bool VerifyDatabasedModel(BeatmapSetInfo databasedSet)
-        {
-            var verified = verifyDatabasedModel(databasedSet);
-            if (!verified)
-                Logger.Log("The imported beatmap set does not match the online version.", LoggingTarget.Runtime, LogLevel.Important);
-
-            return verified;
-        }
-
-        private bool verifyDatabasedModel(BeatmapSetInfo databasedSet)
         {
             int? beatmapId = SelectedItem.Value.Beatmap.Value.OnlineBeatmapID;
             string checksum = SelectedItem.Value.Beatmap.Value.MD5Hash;
 
             var matchingBeatmap = databasedSet.Beatmaps.FirstOrDefault(b => b.OnlineBeatmapID == beatmapId && b.MD5Hash == checksum);
-            return matchingBeatmap != null;
+
+            if (matchingBeatmap == null)
+            {
+                Logger.Log("The imported beatmap set does not match the online version.", LoggingTarget.Runtime, LogLevel.Important);
+                return false;
+            }
+
+            return true;
         }
 
         protected override bool IsModelAvailableLocally()

From 63b4c529a6fe1f3a996f6074bfb736144e2e9c76 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 19 Jan 2021 11:57:40 +0300
Subject: [PATCH 0968/3722] Add xmldoc explaining what the multiplayer beatmap
 tracker is for

---
 osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
index 59dfdcf464..28e4872ad3 100644
--- a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
+++ b/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
@@ -9,6 +9,12 @@ using osu.Game.Beatmaps;
 
 namespace osu.Game.Online.Rooms
 {
+    /// <summary>
+    /// Represent a checksum-verifying beatmap availability tracker usable for online play screens.
+    ///
+    /// This differs from a regular download tracking composite as this accounts for the
+    /// databased beatmap set's checksum, to disallow from playing with an altered version of the beatmap.
+    /// </summary>
     public class MultiplayerBeatmapTracker : DownloadTrackingComposite<BeatmapSetInfo, BeatmapManager>
     {
         public readonly IBindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();

From f1894a8bacb83c8e35c62422447d2d7cd78a3aa9 Mon Sep 17 00:00:00 2001
From: rednir <davran.dilshat@gmail.com>
Date: Tue, 19 Jan 2021 12:17:56 +0000
Subject: [PATCH 0969/3722] fixed itemUpdated()

---
 osu.Game/Overlays/Settings/Sections/SkinSection.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 0bfa0ba4f0..ba92ed5b04 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -116,8 +116,7 @@ namespace osu.Game.Overlays.Settings.Sections
         {
             if (weakItem.NewValue.TryGetTarget(out var item))
             {
-                List<SkinInfo> newDropdownItems = skinDropdown.Items.ToList();
-                newDropdownItems.Add(item);
+                List<SkinInfo> newDropdownItems = skinDropdown.Items.Where(i => !i.Equals(item)).Append(item).ToList();
                 newDropdownItems = sortList(newDropdownItems);
                 Schedule(() => skinDropdown.Items = newDropdownItems.ToArray());
             }

From 9b7187e3c855fa50dfc8331f43730a113ed95059 Mon Sep 17 00:00:00 2001
From: Mysfit <jdawg678@gmail.com>
Date: Tue, 19 Jan 2021 08:23:31 -0500
Subject: [PATCH 0970/3722] Revert "Use fades instead of event listening. Fixed
 same issue in the playlist room creation."

This reverts commit 3a7608275d5b0188c3ab70df2ae9482fad252392.
---
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 45 +++++--------------
 .../Playlists/PlaylistsRoomSubScreen.cs       | 38 +---------------
 2 files changed, 13 insertions(+), 70 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 03a76c66f2..38c2ca7e0c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -180,40 +180,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                     State = { Value = client.Room == null ? Visibility.Visible : Visibility.Hidden }
                 }
             };
-        }
 
-        public override void OnEntering(IScreen last)
-        {
-            base.OnEntering(last);
-
-            subScreenContainer.FadeOut().Delay(1000).FadeIn(500);
-        }
-
-        public override bool OnExiting(IScreen next)
-        {
-            if (base.OnExiting(next))
-                return true;
-
-            subScreenContainer.FadeOut();
-
-            return false;
-        }
-
-        public override void OnResuming(IScreen last)
-        {
-            base.OnResuming(last);
-
-            if (client.Room == null)
-                subScreenContainer.FadeOut().Delay(1000).FadeIn(500);
-            else
-                subScreenContainer.FadeInFromZero();
-        }
-
-        public override void OnSuspending(IScreen next)
-        {
-            subScreenContainer.FadeOut();
-
-            base.OnSuspending(next);
+            subScreenContainer.Hide();
+            client.RoomUpdated += roomUpdated;
         }
 
         protected override void LoadComplete()
@@ -294,6 +263,16 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             readyClickOperation = null;
         }
 
+        private void roomUpdated()
+        {
+            if (client.Room != null)
+            {
+                // If the room is updated and is not null, show the room sub screen container and unsubscribe.
+                subScreenContainer.Show();
+                client.RoomUpdated -= roomUpdated;
+            }
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
index 583956b3f1..e76ca995bf 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
@@ -33,8 +33,6 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
 
         private OverlinedHeader participantsHeader;
 
-        private GridContainer subScreenContainer;
-
         public PlaylistsRoomSubScreen(Room room)
         {
             Title = room.RoomID.Value == null ? "New playlist" : room.Name.Value;
@@ -46,7 +44,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         {
             InternalChildren = new Drawable[]
             {
-                subScreenContainer = new GridContainer
+                new GridContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     Content = new[]
@@ -197,40 +195,6 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        public override void OnEntering(IScreen last)
-        {
-            base.OnEntering(last);
-
-            subScreenContainer.FadeOut().Delay(1000).FadeIn(500);
-        }
-
-        public override bool OnExiting(IScreen next)
-        {
-            if (base.OnExiting(next))
-                return true;
-
-            subScreenContainer.FadeOut();
-
-            return false;
-        }
-
-        public override void OnResuming(IScreen last)
-        {
-            base.OnResuming(last);
-
-            if (roomId.Value == null)
-                subScreenContainer.FadeOut().Delay(1000).FadeIn(500);
-            else
-                subScreenContainer.FadeInFromZero();
-        }
-
-        public override void OnSuspending(IScreen next)
-        {
-            subScreenContainer.FadeOut();
-
-            base.OnSuspending(next);
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();

From 6d1d488831f1992957b6817eaa590114e6db60b5 Mon Sep 17 00:00:00 2001
From: Mysfit <jdawg678@gmail.com>
Date: Tue, 19 Jan 2021 08:24:14 -0500
Subject: [PATCH 0971/3722] Revert "Use the client.RoomUpdated action instead
 of binding the value of the settings overlay visibility and creating an event
 from it based on its ValueChanged action."

This reverts commit cbfb999c2845074d799d1126296584898d9be52b.
---
 .../Multiplayer/MultiplayerMatchSubScreen.cs    | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 38c2ca7e0c..df61a0ad21 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -39,6 +39,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private MultiplayerMatchSettingsOverlay settingsOverlay;
 
+        private readonly Bindable<Visibility> settingsOverlayVisibility = new Bindable<Visibility>();
+
         private GridContainer subScreenContainer;
 
         private IBindable<bool> isConnected;
@@ -182,7 +184,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             };
 
             subScreenContainer.Hide();
-            client.RoomUpdated += roomUpdated;
+            settingsOverlayVisibility.BindTo(settingsOverlay.State);
+            settingsOverlayVisibility.ValueChanged += settingsOverlayVisibilityChanged;
         }
 
         protected override void LoadComplete()
@@ -263,13 +266,19 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             readyClickOperation = null;
         }
 
-        private void roomUpdated()
+        private void settingsOverlayVisibilityChanged(ValueChangedEvent<Visibility> settingsOverlayVisibilityChangedEvent)
         {
             if (client.Room != null)
             {
-                // If the room is updated and is not null, show the room sub screen container and unsubscribe.
                 subScreenContainer.Show();
-                client.RoomUpdated -= roomUpdated;
+                settingsOverlayVisibility.ValueChanged -= settingsOverlayVisibilityChanged;
+            }
+            else
+            {
+                if (settingsOverlayVisibilityChangedEvent.NewValue == Visibility.Visible)
+                    subScreenContainer.Hide();
+                else
+                    subScreenContainer.Show();
             }
         }
 

From 33677f57702f2b17dd6dd9e385a4553aa66bdd9a Mon Sep 17 00:00:00 2001
From: Mysfit <jdawg678@gmail.com>
Date: Tue, 19 Jan 2021 08:52:43 -0500
Subject: [PATCH 0972/3722] Use BindValueChanged to show main content for new
 multiplayer and playlist rooms when the settings overlay is hidden.

---
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 37 +++++++------------
 .../Playlists/PlaylistsRoomSubScreen.cs       | 15 +++++++-
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index df61a0ad21..0ec43c2b10 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -39,15 +39,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private MultiplayerMatchSettingsOverlay settingsOverlay;
 
-        private readonly Bindable<Visibility> settingsOverlayVisibility = new Bindable<Visibility>();
-
-        private GridContainer subScreenContainer;
-
         private IBindable<bool> isConnected;
 
         [CanBeNull]
         private IDisposable readyClickOperation;
 
+        private GridContainer mainContent;
+
         public MultiplayerMatchSubScreen(Room room)
         {
             Title = room.RoomID.Value == null ? "New room" : room.Name.Value;
@@ -59,7 +57,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             InternalChildren = new Drawable[]
             {
-                subScreenContainer = new GridContainer
+                mainContent = new GridContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     Content = new[]
@@ -183,9 +181,16 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 }
             };
 
-            subScreenContainer.Hide();
-            settingsOverlayVisibility.BindTo(settingsOverlay.State);
-            settingsOverlayVisibility.ValueChanged += settingsOverlayVisibilityChanged;
+            if (client.Room == null)
+            {
+                mainContent.Hide();
+
+                settingsOverlay.State.BindValueChanged(visibility =>
+                {
+                    if (visibility.NewValue == Visibility.Hidden)
+                        mainContent.Show();
+                }, true);
+            }
         }
 
         protected override void LoadComplete()
@@ -266,22 +271,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             readyClickOperation = null;
         }
 
-        private void settingsOverlayVisibilityChanged(ValueChangedEvent<Visibility> settingsOverlayVisibilityChangedEvent)
-        {
-            if (client.Room != null)
-            {
-                subScreenContainer.Show();
-                settingsOverlayVisibility.ValueChanged -= settingsOverlayVisibilityChanged;
-            }
-            else
-            {
-                if (settingsOverlayVisibilityChangedEvent.NewValue == Visibility.Visible)
-                    subScreenContainer.Hide();
-                else
-                    subScreenContainer.Show();
-            }
-        }
-
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
index e76ca995bf..b8d9d258f5 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
@@ -33,6 +33,8 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
 
         private OverlinedHeader participantsHeader;
 
+        private GridContainer mainContent;
+
         public PlaylistsRoomSubScreen(Room room)
         {
             Title = room.RoomID.Value == null ? "New playlist" : room.Name.Value;
@@ -44,7 +46,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         {
             InternalChildren = new Drawable[]
             {
-                new GridContainer
+                mainContent = new GridContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     Content = new[]
@@ -190,6 +192,17 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                     State = { Value = roomId.Value == null ? Visibility.Visible : Visibility.Hidden }
                 }
             };
+
+            if (roomId.Value == null)
+            {
+                mainContent.Hide();
+
+                settingsOverlay.State.BindValueChanged(visibility =>
+                {
+                    if (visibility.NewValue == Visibility.Hidden)
+                        mainContent.Show();
+                }, true);
+            }
         }
 
         [Resolved]

From 31e61326e1ea4d4f3b3e1e8450c8fdc385939d0d Mon Sep 17 00:00:00 2001
From: rednir <davran.dilshat@gmail.com>
Date: Tue, 19 Jan 2021 14:00:17 +0000
Subject: [PATCH 0973/3722] Only user skins are sorted

---
 .../Overlays/Settings/Sections/SkinSection.cs | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index ba92ed5b04..1dcc5d824d 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -38,6 +38,8 @@ namespace osu.Game.Overlays.Settings.Sections
 
         private List<SkinInfo> skinItems;
 
+        private int firstNonDefault;
+
         [Resolved]
         private SkinManager skins { get; set; }
 
@@ -107,8 +109,10 @@ namespace osu.Game.Overlays.Settings.Sections
         private void updateItems()
         {
             skinItems = skins.GetAllUsableSkins();
+            firstNonDefault = skinItems.FindIndex(s => s.ID > 0);
+
+            skinItems.Insert(firstNonDefault, random_skin_info);
             skinItems = sortList(skinItems);
-            
             skinDropdown.Items = skinItems;
         }
 
@@ -130,19 +134,12 @@ namespace osu.Game.Overlays.Settings.Sections
 
         private List<SkinInfo> sortList(List<SkinInfo> skinsList)
         {
-            skinsList.Sort((a, b) => String.Compare(a.Name, b.Name, StringComparison.Ordinal));
-            for (int i = 0; i < skinsList.Count; i++)
-            {
-                // insert lazer built-in skins before user skins
-                if (skinsList[i].ID <= 0) {
-                    var itemToMove = skinsList[i];
-                    skinsList.RemoveAt(i);
-                    skinsList.Insert(0, itemToMove);
-                }
-            }
-            skinsList.RemoveAll(s => s.ID == SkinInfo.RANDOM_SKIN);
-            skinsList.Insert(0, random_skin_info);
-
+            // Sort user skins seperate from built-in skins
+            List<SkinInfo> userSkinsList = skinsList.GetRange(firstNonDefault + 1, skinsList.Count - (firstNonDefault + 1));
+            skinsList.RemoveRange(firstNonDefault + 1, skinsList.Count - (firstNonDefault + 1));
+            userSkinsList.Sort((a, b) => String.Compare(a.Name, b.Name, StringComparison.OrdinalIgnoreCase));
+            
+            skinsList.AddRange(userSkinsList);
             return skinsList;
         }
 

From c5c5fdca454cd9f1a036eba686d33673d074c038 Mon Sep 17 00:00:00 2001
From: rednir <davran.dilshat@gmail.com>
Date: Tue, 19 Jan 2021 14:10:08 +0000
Subject: [PATCH 0974/3722] Remove another whitespace

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

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index b42091ce30..9ca8ec9051 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -143,7 +143,6 @@ namespace osu.Game.Overlays.Settings.Sections
             List<SkinInfo> userSkinsList = skinsList.GetRange(firstNonDefault + 1, skinsList.Count - (firstNonDefault + 1));
             skinsList.RemoveRange(firstNonDefault + 1, skinsList.Count - (firstNonDefault + 1));
             userSkinsList.Sort((a, b) => String.Compare(a.Name, b.Name, StringComparison.OrdinalIgnoreCase));
-            
             skinsList.AddRange(userSkinsList);
             return skinsList;
         }

From b265d2dab499f4cdf75fadbc1acc20acb2f21ad3 Mon Sep 17 00:00:00 2001
From: rednir <davran.dilshat@gmail.com>
Date: Tue, 19 Jan 2021 14:16:22 +0000
Subject: [PATCH 0975/3722] Remove another whitespace

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

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index b42091ce30..9ca8ec9051 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -143,7 +143,6 @@ namespace osu.Game.Overlays.Settings.Sections
             List<SkinInfo> userSkinsList = skinsList.GetRange(firstNonDefault + 1, skinsList.Count - (firstNonDefault + 1));
             skinsList.RemoveRange(firstNonDefault + 1, skinsList.Count - (firstNonDefault + 1));
             userSkinsList.Sort((a, b) => String.Compare(a.Name, b.Name, StringComparison.OrdinalIgnoreCase));
-            
             skinsList.AddRange(userSkinsList);
             return skinsList;
         }

From 052e9eef02661abf004152ac29c015a329ad20d3 Mon Sep 17 00:00:00 2001
From: Mysfit <jdawg678@gmail.com>
Date: Tue, 19 Jan 2021 09:16:39 -0500
Subject: [PATCH 0976/3722] Added inline comments

---
 .../Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs | 2 ++
 osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 0ec43c2b10..7c4b6d18ec 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -183,6 +183,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             if (client.Room == null)
             {
+                // A new room is being created.
+                // The main content should be hidden until the settings overlay is hidden, signaling the room is ready to be displayed.
                 mainContent.Hide();
 
                 settingsOverlay.State.BindValueChanged(visibility =>
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
index b8d9d258f5..22580f0537 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
@@ -195,6 +195,8 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
 
             if (roomId.Value == null)
             {
+                // A new room is being created.
+                // The main content should be hidden until the settings overlay is hidden, signaling the room is ready to be displayed.
                 mainContent.Hide();
 
                 settingsOverlay.State.BindValueChanged(visibility =>

From ed3dece9f8f7c0c0e0d35ac3fa330f2359b84cbc Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 19 Jan 2021 18:36:05 +0300
Subject: [PATCH 0977/3722] Fix wrong importing of test beatmaps

Importing via `testBeatmapSet` causes the beatmapset hash to not be calculated due to no files existing in the importing process, which leads into not reusing existing test beatmaps due to no hash.
---
 osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
index d692e6f9a3..a6275f14e6 100644
--- a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
+++ b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
@@ -94,13 +94,13 @@ namespace osu.Game.Tests.Online
         public void TestTrackerRespectsSoftDeleting()
         {
             AddStep("allow importing", () => beatmaps.AllowImport.SetResult(true));
-            AddStep("import beatmap", () => beatmaps.Import(testBeatmapSet).Wait());
+            AddStep("import beatmap", () => beatmaps.Import(testBeatmapFile).Wait());
             addAvailabilityCheckStep("state locally available", BeatmapAvailability.LocallyAvailable);
 
-            AddStep("delete beatmap", () => beatmaps.Delete(testBeatmapSet));
+            AddStep("delete beatmap", () => beatmaps.Delete(beatmaps.QueryBeatmapSet(b => b.OnlineBeatmapSetID == testBeatmapSet.OnlineBeatmapSetID)));
             addAvailabilityCheckStep("state not downloaded", BeatmapAvailability.NotDownloaded);
 
-            AddStep("undelete beatmap", () => beatmaps.Undelete(testBeatmapSet));
+            AddStep("undelete beatmap", () => beatmaps.Undelete(beatmaps.QueryBeatmapSet(b => b.OnlineBeatmapSetID == testBeatmapSet.OnlineBeatmapSetID)));
             addAvailabilityCheckStep("state locally available", BeatmapAvailability.LocallyAvailable);
         }
 

From 14ff2af00ef868bd1ff65dd22f7eed242d7c2e8b Mon Sep 17 00:00:00 2001
From: rednir <davran.dilshat@gmail.com>
Date: Tue, 19 Jan 2021 15:37:59 +0000
Subject: [PATCH 0978/3722] Satisfy AppVeyor

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

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 9ca8ec9051..7023702d0e 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -142,7 +142,7 @@ namespace osu.Game.Overlays.Settings.Sections
             // Sort user skins seperate from built-in skins
             List<SkinInfo> userSkinsList = skinsList.GetRange(firstNonDefault + 1, skinsList.Count - (firstNonDefault + 1));
             skinsList.RemoveRange(firstNonDefault + 1, skinsList.Count - (firstNonDefault + 1));
-            userSkinsList.Sort((a, b) => String.Compare(a.Name, b.Name, StringComparison.OrdinalIgnoreCase));
+            userSkinsList.Sort((a, b) => System.String.Compare(a.Name, b.Name, StringComparison.OrdinalIgnoreCase));
             skinsList.AddRange(userSkinsList);
             return skinsList;
         }

From dba01cf2b1ea7cf3445f14e30855ce9e95e6bd76 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 19 Jan 2021 18:43:16 +0300
Subject: [PATCH 0979/3722] Use beatmap "soleily" and remove no longer needed
 archive

---
 .../TestSceneMultiplayerBeatmapTracker.cs     |  41 ++++++++++--------
 .../Resources/Archives/test-beatmap.osz       | Bin 7286 -> 0 bytes
 2 files changed, 24 insertions(+), 17 deletions(-)
 delete mode 100644 osu.Game.Tests/Resources/Archives/test-beatmap.osz

diff --git a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
index a6275f14e6..9caecc198a 100644
--- a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
+++ b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -10,15 +11,17 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions;
 using osu.Framework.Platform;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Formats;
 using osu.Game.Database;
+using osu.Game.IO;
 using osu.Game.IO.Archives;
 using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
-using osu.Game.Tests.Beatmaps;
 using osu.Game.Tests.Resources;
 using osu.Game.Tests.Visual;
 
@@ -49,9 +52,9 @@ namespace osu.Game.Tests.Online
         {
             beatmaps.AllowImport = new TaskCompletionSource<bool>();
 
-            testBeatmapFile = getTestBeatmapOsz();
+            testBeatmapFile = TestResources.GetTestBeatmapForImport();
 
-            testBeatmapInfo = new TestBeatmap(Ruleset.Value).BeatmapInfo;
+            testBeatmapInfo = getTestBeatmapInfo(testBeatmapFile);
             testBeatmapSet = testBeatmapInfo.BeatmapSet;
 
             var existing = beatmaps.QueryBeatmapSet(s => s.OnlineBeatmapSetID == testBeatmapSet.OnlineBeatmapSetID);
@@ -109,16 +112,10 @@ namespace osu.Game.Tests.Online
         {
             AddStep("allow importing", () => beatmaps.AllowImport.SetResult(true));
 
-            BeatmapInfo wrongBeatmap = null;
-
-            AddStep("import wrong checksum beatmap", () =>
+            AddStep("import altered beatmap", () =>
             {
-                wrongBeatmap = new TestBeatmap(Ruleset.Value).BeatmapInfo;
-                wrongBeatmap.MD5Hash = "1337";
-
-                beatmaps.Import(wrongBeatmap.BeatmapSet).Wait();
+                beatmaps.Import(TestResources.GetTestBeatmapForImport(true)).Wait();
             });
-            AddAssert("wrong beatmap available", () => beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == wrongBeatmap.OnlineBeatmapID) != null);
             addAvailabilityCheckStep("state still not downloaded", BeatmapAvailability.NotDownloaded);
 
             AddStep("recreate tracker", () => Child = tracker = new MultiplayerBeatmapTracker
@@ -135,15 +132,25 @@ namespace osu.Game.Tests.Online
             AddAssert(description, () => tracker.Availability.Value.Equals(expected.Invoke()));
         }
 
-        private string getTestBeatmapOsz()
+        private static BeatmapInfo getTestBeatmapInfo(string archiveFile)
         {
-            var filename = Path.GetTempFileName() + ".osz";
+            BeatmapInfo info;
 
-            using (var stream = TestResources.OpenResource("Archives/test-beatmap.osz"))
-            using (var file = File.Create(filename))
-                stream.CopyTo(file);
+            using (var archive = new ZipArchiveReader(File.OpenRead(archiveFile)))
+            using (var stream = archive.GetStream("Soleily - Renatus (Gamu) [Insane].osu"))
+            using (var reader = new LineBufferedReader(stream))
+            {
+                var decoder = Decoder.GetDecoder<Beatmap>(reader);
+                var beatmap = decoder.Decode(reader);
 
-            return filename;
+                info = beatmap.BeatmapInfo;
+                info.BeatmapSet.Beatmaps = new List<BeatmapInfo> { info };
+                info.BeatmapSet.Metadata = info.Metadata;
+                info.MD5Hash = stream.ComputeMD5Hash();
+                info.Hash = stream.ComputeSHA2Hash();
+            }
+
+            return info;
         }
 
         private class TestBeatmapManager : BeatmapManager
diff --git a/osu.Game.Tests/Resources/Archives/test-beatmap.osz b/osu.Game.Tests/Resources/Archives/test-beatmap.osz
deleted file mode 100644
index f98fd2f8ffef0968270a1f2c7d75162de80417c9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7286
zcma)BRa6vEy9JRFrMo+%k?uwux?|{W36WAjVu%48V(9MfMi2(1bCB+C7(hBM|GH22
z;a}^X?_r<)?fvbCv(DS60YG_8h=hcMf%K5attHDLX3|4}gk)-mgv9pJ1$?ozpjCJA
zq~)Yl^`%vD^R}U7)u*+mb)fa4wPB+*{%GN0ZNlZ|`6UME6i3;d^vEUsoGWD;yuxeN
zrxX}n;Y@i%il;aKu13ZjT<E=YI0@z<7dcdTzLD6C*X^sKFINiIPO+>%i0_E=9A`R2
z49_mB7vFE56!#aae;sc(YxI9S_*dTbh`9M2(ANHZf2iN}e22L7@$b05DF(q@HD1)O
z>iuTw{ee&0m-`W7Gle&If1BgXXtJavp9s3TxmQ-d-30``l;qKh)YB!HV*D%3_f`qX
zj946+?=W@Oo<sdrsqf-L)oyX)<Nd`nG|$)SIBr?7U%LVz?ST^C#J}I3d5KGQ1bz>=
zJMQmqFOCCc67N5qAwvCePmcG8FP34T&HI;7HJoSZ`xxKHgHgoE?eYFBJh{IZhP`>a
z3E$tmhd)zo<3xQ6^b>x%-rOuk_^#4qpGvMstUhLrj$ik~uDgz1X#ypnQqLFbm%%-1
zUjv^n!6Y<KkB4zz+ob~U_*O^*g;t-5H-ig6T_@jHGQG#eE+4Bm;mPn#*t!@Po#5i;
z-#!d+cHg}Et8e(^39)_lxCy%$e+d?jQ2&}OWo6Lr=6-s!?RyQn-vsRzD|Mh9et8}~
zx!BxYmI}PN1;KH~r6@02Cb!kya0F2~M!eA3gVPs`D`Vc?9PbxrtI>3>NIi$s1zw*V
z!<YBhrB1TqK*)UAS(4@mVKbke?7%|mrEw~3YS`n$?LOiJHa>+4xP79I{&y*nrk;JO
z-d`Nj>F(O`m<$J*ZGmq82HyO;IeS2@e%zrjJYH^pc_st{^YGEPD4FB@cQOcd3DTIZ
zf4JL!gjPq=YTAF@AKx@+x3B&Rwtd{hJh(=frAbY;uRbm=?{_ZSdw2PNz1{}2Pv-4z
z!fPMTt~*+Xqn;Gd(E56ee))@UuSf2U^{4Y3Ew3CQ(8KHcg)=;0PiBo;+nu^MQY*77
z)7K`gQjGaVUDre5GpBMNM|VL5>Er5>B|DF}+*wkI_eMC$D4(@Mx+uG+VWRMWu%-}~
zE-RkW$Jp-uE3qH0ICAK4G9|4{cgAIEkY=d_cD}AZ<)6?iVX*SCJ882)tOmI=sW|zF
zqlpXu%FH{MkCgAK*6Vg40zqW(c2TdpPy_Pra~3SerGnyN+B`gW9#+1VF43XZG|#~5
zk}mP1$)%KMzipo3Jx#g<{gZ${W8uQ)$CNAYxUIC!wcqKRXYc>)2#f2qiC|afyT-!g
zh|)ICm>Xtci@Cq3SMIL-e1u+z*s3WG4rr3PpXY^GksiC>yr|S=i_}V=Gye^E!}su9
z>?F*ej@=m-4db#(`?6At3scA6ZG4)!%J%cl^5dRuv)ePe=Abg|vO2KepA&s0+dnrs
zRqI{pzY`0M{gq#6b@n1tb5bR|I4|t?NhOR#^{Q3Jk6ujvE`H&0(AaG!_=j%|Ue0Fe
zS%??^<HF?#4JXz8Y|$>##1sN);Sz{sBq}MLo<$%H=*O~$d!pFy-ypmA#UgQ1sRt3)
zR?L5AN%!pAsrXg<w~Odpnfor4+r0du-r~+sFYrST9Fy1=y;3?FTWAF}Yyv}o*WqFQ
z5-Hh5=8(eVv7ANzyC8k*I@(1A2sZ%>39xMkhlhtHsdT<csoN}nz&}^@JeC_L4%nOj
z5hr1MR%?eP`Og_Sw#y1j<^?^MYf*(eV>w?h*N2(=HQ}m^6WdE3BVI4ohpoL(;5f0Y
z5H!@419RB`zpa+h%Sw6gPy9p-Q!WMI{|Mez%13|VOSFsts`rr?S5BB7!?-5J>UD>R
zkJ0;vR!53Ob1^El6seX%e0{FgQOg5_?GQF^2JQbUXh}G!l-b27Usv$%X9;LET=~Sm
z<nX<8o9to+uPS(3vjmuD>;G)|&7?pX`*@mp%x5@l9c7?ilN&|QFc+Nfj)rqrxWzBm
zaV`Jf=h0B*A2#Cu5?%*klW5)VOMG8v>v_luE5^9+CngmfIW;t&<B6H(?f|4PN`K}*
z*0s+=%5{HLQMJE{4|Fb8Z*Z-2o2n~_-jN&(o!*C^i}f(F<)?R&aLx#R<E}sl%$|f8
zEc&Vwpl(5-s}SOH6;E+{_hW+}(CJtvMNUNb5-32seSB@<Fa$bhN|T><L)-lJI7tp*
zUria`1XUX1%x(4nZ1G$xw>5hVUg}jv;&=dt8EnWs_9`-5H&7fV0f9Wt9GpIm4u9^J
zrfNlAej9dYmzAfzLoSkoVcp&Z9N14jIaRNyM=pA5xDnDCcWTHG4<1W9V16^eDdF@w
z=&;h^$T0tRjIMP&l$ynQ<PGXu?cpA^<)ykBcp1(}EnA}|7FLsXHd9fF5izm&#i5@?
zx3?pkeST(k+WsV}UqhfE{2v;Ug<0XSF5n7XJ37^v_(@uw+k{x&wiIwK(KzyhYx2)S
zmW_P&YCX8y@1P!>Rycg9A9#O-ctRW!I2o);e!oL#o??qp(SjBk;O~WEmKywfVEl>c
z#6rF(Yk+zU4k44))TQsFTeqv3S<erf&y-RhQ%A_LCr|rwanU-&HpfFEPu?DVHBVS^
z+Pyk?dy9Ple)dUv#{60bB0K6k+<R0=i1J6Nte<#Kw%+~$xZKSc819Acbh~BFLvlkU
zPpqF1Xh&)4JVxwc&(O6{zH>N<5^K-h8PT(vmHP$Vr8!J+@N+Eivpe0z+^bnL`Pw0>
z2F;d@R!L$=YTy~SyV^EraI^2~h`(ycRrz=#50Ons%yyMtk9B~w<?byfEbX@I1O}os
z+=uA8dm8*iB8X&};x>&PCU0&|vGd^Aq}&{wA+Kl>sS&|>JEoRJ_kC&rY)Ms$ZH$7?
z**%RZS2eHN0Ti&T;!V~HSn?Yy4Kos-kp)@madT#s4xljQr5K+Jr>+87iAGbh_b!kc
zeTu^vfoAU;ZqmXSYd)7HwIp(2WN_QMYGX&lUT>c}3346gC>huvW`KJJC>~q=exK9j
z>$raOW8+mFuaQWb^x+`HMG5*BLFDqDUeVhA^~OR}5V9aS7{k8MIt!Jb^AKbY#d?oj
zGuHy&a~qc_U|m+N7dw%&Y22br-t6g(2*hRaZ4Ju69E;!qN6+Vky9?%-I^f$tn)`-E
z<wrDnRl4mou$pb(d^f6)kN*jXEK##gYWxYog5@XtPS7@TNQ~xt<CU2i5yETfH6IzO
z8YwIl;8YcP?<-C2q+rK{@_y*=lq!U@yhthgr@+DumUi<nlO5|uRN9c-#I7p<pwJ_}
z<q?3GhSaX1qR~<z6bG${%N-egZJ3jE2gWY)DL>o*$F38G^SOn*{yN0s6@lS1@L^s{
z1bFLXbP~!+P!g}JT5b%xU84xj8FWf-$5QX14@)@mmMMh7MIAnjV+!P2{s#@}>^(Nu
z(^TO=_ap{lS~c$;eW?NzGJwFQ?%syI$VO*D$slLtq<qB6$IiyH9IFJ*yDPNK!ZyH&
zplcfsPfYX&fM2cfgeFF0ipr^<h&P&YRUEm=LOQSaxIO`QkgES<uF8Y@+@ej!+P4--
zi8hHjq(Z%f{e}W4>PMYS+9;0d%pR;0bo)?KF_^RP+qDmha-?EwPh=MRxXnbUC}H7q
zXtD_tq1S2{$5$$QN=x3l{&YBR$JGX+XOeQLvE7xZsz{Sz4Vp!0uRJda!HooHD8fCo
z0x}a`g^4F^iLu<>I4&^_{O`U9FS4oyc8aowsbgeE1iBj!R|X-AHzPNKu~H^Oo8CAX
zDqNzyqamfJ#=@q1UAQHoG;g-R#{64C!%Dd7+ln<mFd~RXb2K!PI#_5%k%crvlBYG^
z&I{Q18auq5-*0S@QbQ5vbiv>^FV93TCSu5`l88fwb9Aqf6l4lwxKrtvFP$vz6oHMM
zHzbu8daGH)(2~YUY#Iiv2z$!;#)j*WFr@#*uD5)(V4Hl1p<nZWL3@UoOTEr_>E2iB
zt(IejY^<SxfigML-9P9cLPl3m&KOe4<C5h3g)W)k;J4}=zR{aAv}9v06fY0Oj>`S|
zJ+hzt>K`v+<VA$r5gVIyHwamM>LwN~iuG(>sl1KGj^2r>$$90zz9c2o{?{MsY@Mjd
zY9#!}Q<BUldp~S?dKhnJm~uuWkv$*D#YoFFK|<RJ4P`|-f(hcK?nUXB-q1Fi?v^xo
z<$S-otlN@XAg2pvrC_?}o_O!E(Y(sE^$V*$dH0;b#1_AVWVn!ccw097oXc9OYsUW)
zT%XUPlUU&-hgx#f%jfev1m!;(z%~ftS3=s5e$57qEC*GR;cpGH(x&)k%&nV`5HZmA
zD*dJi?KDe+5Ht&NAPG?7dL5e!*=0*-8kmeiUYS1O#^<2D&h*GdrW*zwp?A6t2jv(U
zB+A?;A#39Cr`zt0vTkkeprqRRK<m)DfHAB-)+rML7b+3^W0G`{7wPQluLq9M=lwLm
z^KdsMARboc3jfCq)`#TgDr^$m09Pxp5h-Ibil*ad+d8~(Q;8jm+SKm`!COayFh4-n
z8=iPcgG0cU%!gJVPA_yfQt}e&marSI6zRuGBy6!!Q)oXI-@}8r)CB=9lN_Jy*$0vd
zj@^+ce^RcWQtrUm`pIMN?*47u1{j}(W;ojUH3~gpmN?z>*Im*zF`y!nXMj_Tf;q{O
z{K~I%|6*3dcOt>;R^)|g_@JW;u(53E@T7qx1imsrTEXOx5j;g{R}n5B@+!Q4im_3E
zT4`xSg>E$X&pSQ(7*AVlfnz+wDio1=(F9W1w^s5x;c|JGT2qyh$PLB>(swGFx=coY
zFiBb!r)Xtjv<6He5b7kKpz@#L^}Y*9orn0>0qoU0pCW|Jc8QSCJ`#lz@n@vDo6~2!
zb)lpEg-_s9N@r5E7SG|aMbPLEaMWMw31`L>Lx&tL^~m_U5DE&qq=UMR<ctFtn$6z_
zt$hE)=?eJN;;<noeVw>`A9<u8q_~B*-2htO8y)<k)~bYH(Vy=7T$a<?IY#rbTlB_?
z>*l>s>k-X|$~9QcPz+{FE2Raq#U7v4;C0K8cBuUxgd>Wu>C+HaHP6lAH`Uyu01tL5
zYi0$M!TW}POj+9TO(#~W>!cPXy@Lnrk<|lWA6$wtY6yB|E&XS6$m=)qh}n9xS61d%
zL&0!{iE3$?Y91^vK*rGA+3JrCT(Fhua>T_qnI`s!0vqJ~ymZwnb_}+THyqJV-4O@9
zQ1+|^+pBP$rlhwanp&g!ayveM+*P?kOHk^H(83r>C2WOtV`uj$H~ZOtSi=xpD>A=A
z`<h8Jz@u6UYvxy69u<uvy;*Os-`#~v(&yS7TSva%L($&0#?(36kd*+!iMe%r9M6RC
z*LWbM^q<e}Lu!WfzX;n-q&NyWaXbzi;#hT@V(GEoO`p|YM&fen5@IV2z2-Li!QB|g
z&ey}cW>;$IW*~B@j1gvCgf+!j2?A$LH^mS88)iH52uZ7_M0sg4eux(!kau|ep={G@
zmFVEJ+WHQ=Ws#UUiKOjscjduvTmh3WSrXm2JM<w=jCqW}Qo4802<b_3aPvmw$nOSZ
zJdOPjU55mgIzQYZCS7qz;j2{4q(&e5XhWz6v@C+2VnE#{dTuP<fjc#)%qNeoTB{Su
zl(OolygV(NK7)Rw3+_!&(R?$yDkoOT_j+aA$x=)|O(MC1LR@I_@ImUVt4(u;b8u!^
zH~u6FyF<A>ef*eXM+pF}tuM<S$+1K8uQ;A;2+^!j6~_bQ3%fr1b#;wv#k!W|-<;^9
zpLCMs?3CPdf44>VY6eL}O4~m@zZt;7+8mD!;w!Dx96xn~D1xug&xoDmCAJrJ6)5oP
zo!XTtCKJO3HHh38qs#>j@c;|DLt6r#)=L8CghkqSf44LfH<*zVR(4{AWyx$p#D0iO
zB$TF!@*&omTXBW}mxbgbkeEvf`|=cqqO+AZ6>8}tX&QPuB)WJ?X+<Ky51dQ^Av5oG
zB1CC3RQf0*Thr=kYE=TyO>74z+M~1~e}pkiApwpZQzd9I5qV_?es=hPR7{ASDxLDa
zDUz!Ky>f7YrL>W{&9MRj+W}e}KP%f|j*D$PFan)%X>2|uX7<K?{);BBGBh%sUMOVZ
z=%^|6&Y8bWhDkT(9akhhLDgQAN}AJ}37>NEQX6GkhO!DVCR4{9;BCW@vjJ4CZqho_
zQbQFpbyE1lr@A9Jhag$ueyTumVt`B(g_i<?s%`932JHxN+9=7DL<J1mc8~O8=XH+=
zSnA1PcO0zED1-nR6(3byBd0VMz4|ysj`@U)55gXERpb9|;Zt?BD<*9_2G3Ob@&D=0
z(AGbSSL6Q*oL)B*Qbw-!_&7z>%+DD4QDzjm6!tkq#c~7FGyKDPs0Y(z2bUH%6r65k
zKU}l{Wo$Q3O5cv*4=!bH-BOZq^d1EC3R9Hs>G)WVa?SHfrs?gVFxjT?eAz+apkox>
zuTHK3Y*e;H6?Jp-(hb9^F_`Ch?F3stF=zSCeL0aETf7}<EO620<t4#K1pT3wof*GH
z(nhF=xGnPsjFN$UDoZ1nUCPLHLH0ws%3kS_MI|#Fy_OjGmt=3syp#mRjJW-O&qPjd
zqqG#N6Bj`aTEttOGfJ8J71X)cqOJA8;<@zcq0T(q=4JB5jYreQaMk$7N!JSt^LbwJ
zYwO&&cAP|$ZdxrJ0}1wfT<-L}avMGXUoKbs;KCeRdJ9txX{#5rW&|FTosMFf&kCpG
z7>(mwif2t;1L5);ZyGL!HC8{A@16vq16+H)leRi|-wiH!j#3J<o6uK2$sFeq=FEht
zDAJQn^Y}B_otFeX9cadgDdAmQ=yhRTtDeXSmhuOcW|D6@KU{tzV<(_)gwOPFA%83Z
zT)EcxURd!q^C6!{5e^-gzbXpd_CQjbSgnbN*shTysl~bcQxv76Yc3G7@lT+vD`}3A
z=?kUqG%uWe?4!G=^!Ulz^`&fXILKad!)w`|PPeW%MpuVSXzN?Ym;9})#Fclx3~tK<
zlYG$Mn4uPf7e$Ct$<tYr_}{msbZ&FMe70|<e+nJVxKyC+2Ak*UO`l&5MX`^H<yx&=
zXMJTZ^U1#%=bey4U7k<UXtafvu)WFv8o5m;CG(QDWAY?YNyNW?%hlD-ngUi}b%l$B
zQf{<>qCD|_(;i+=72m|m-9`qlbDh@m)cbu>B4G0&^zdY!jBzF!nX_6bZ^-Bo`C1|?
zlAP+f#lmeQfR7L0EcM8b9q~3^yQ*<vbvikG6f0cWwq#Z(cZ#LNrB8pG^;6fhfJvU#
zi+Sas<*i_zwHi75+>kJHO(UBiFVv(`kJwo4Z)~|hys})&{=dsUr1NXWsJaw9D&KEb
zH-0_|=4-2>ICy-fJJigAVEb^w2<hQu$-bf9li^v`D2@UbRGS+gD}pBls<m#HT{;ax
z^7iVMl+-%6ueD^9r^ChXqw14geruMTN3l9H`KVnLYoAQytQP+frg3*)`cb*$^VtgP
zOhmV-;NDTaO?4@}1TS(g=^ybK0Sy!2gF>B<?ATAsS-BMk-$ET$=2JL%AGD5Z!4{Vy
zK(kFUypJ*cw{Xt;w_=e~G*M&dz7uX}wRPzdz`-B`SW$+IklL>SW_uAu4GUoQ1v?*s
zq6<r<N^xbz-&8ApYM-<8{Y*wAN&rz_stTS#y@#8i(w22Tv7bI(n!g_VP;Jsst8i8{
z?vLJ)LYN<DQ8a9`>H`}a`fSNq+eWvn!cQKT=9M9sgV}6C%OC(vL_A=BNtNw$(rGkd
z()vlm@!efXjzyl>%GTYD0n2VuX@w_T_rTbiuZiCgzey$pLj;B%8ifXNA?1)#?&&Di
zWFnhOj>|}VnyG6GeS!seROA~~?5>f}={<bg(mPXukCWItOe~_PvV}xy%zA+sKO|v^
zTqMmS+EzLTI&`X}P>3oLFhv+Yvd5K0A!!O9kT^@>F6jGJN4Ik9)Rey8;p_Lfu+sfE
z2e4$5OPO1sl7r!bwcX+%X&BTn!z?won6_&2Hg0s<+qB58lEz3SXAujcKnve1n9BtT
z+i6Z;##pSG7U`7aW)e8$EBx>0-GtSdZx6QIU6Guo`Ofwb?ePoSxz{<(6TXc|JY4=M
z1_<)dId^!cVFR6I1T3JFZ3jXoqcQu4%@8#$N#8T%ah^cwF`tYBBfN`ax$_dqJ`kEU
z$LH2j@g=-s1Rhnop2ye4BxE$EH-|=YZe5fw7G#dzUrf^J7MO?^0Gm~H8!cUw!I7_?
ztU{=Bwee&*i-uNrLyYWL66&UJi@Io5Av!>|UlTuYd3BXUAvaVH%+fzAjRP!op#mJp
z?^#e=*?DAYSlZJY)$OL=#`li<yIKp~1CyLfzi^Bwm#Kw1syq`F<YPrAl)X7ZawD4Z
zfvCtUQ}q<MNW{Cy=zzA~lZ?eG+EKSqs{UkOPsGvPXh4?TOT2*mX=JCt@OBU_6%{<t
zlGKB79(q?12#}GU%gLtee9Ve=0J*nVy>qh|uPEX19n6Nc_Tq`hCR`JOe8uEm$p))r
zOiZ%s<X`GEEhVYX6YAqgjp#tzdAL3~j`GmM9BOoY<Cqr8?n=+FxGnfD2A96wo{#zr
zIf@VOe0noe-49X7b5ql<OeCz<iC^R45n41yv0x*ZXB*vJH=N@~0We~)h?>OJYLyVW
z8B*zN3yP>!Wq6v5RGCQ94qQU3PdPqHi-?UiwPL)#lTxi-pp7z-Oek~AaJ@hV>LFLD
zR3Ft1`OEG4vBcks{~80Pn>xj-R0k|u-7N+E<@>d?^N_dy&Uaj}V{ET>72^)mwj*&=
z&-hKo)^CGb>WOpfU}(R-7!&%5juJl49LWiVO^L3qE?+jYoY3&EeQ#}$>WU;trIOyI
zfg@I4%xa3+9BT3bSioc+hg_={&C*c?Q%f?e`rJHhT(DbiqJH@)+2(M*Ga%01#DCn=
zgott7Nn|ky^RL(S7b7hTk?G1Zf=8p>ee9D3FTlE1Ct6-l06C+B-jt_}^V09B)DzO-
zS$VG_Ms8vAEbg45!@7|3jS9_4f^Y5vy0K2}(VUH(kE4X+odFN_wIV^Fl$$lj1jfu=
zfcWPbATyV4?$7)40_kDS#$-Es{l(LWlb|3l?oR$ynlxO}805uGOtL8kFJ;W<YrCV5
zbiYiUFzu7@M4&EEC>56EGyrTokh8*F&{bI2>klcg4X*6#E1#mI10X0+_3?otJyOxY
zU-a3NU4rck(D|6ZlT5d-Wq+L9_<D;CIjW{EmyX@oa;WZxATNy1_Jwcm$PX6Tj_IUj
z^1|@OFNb5ZyH)f>9M+p2>$tLA*vx{AZm?Lk^lqoLEoi>1)b(qd!LTmV{}ISOMd=HL
zNP^L=?uscIm7MtqAlMqPEv1~iuR<~dK-8M!FV`I!YSqJ_%&48u2(ox3qxR})tL4go
zA!SKXZOJnJ=e=iS4FK{hLZtt`3VhiH{_hF?5B$FugBk!-wEqkszm)z9Vp9Hx{SV^2
BJ!=2}


From a880b8d21dae103d8e3340678384356b9218b4f2 Mon Sep 17 00:00:00 2001
From: rednir <davran.dilshat@gmail.com>
Date: Tue, 19 Jan 2021 16:11:16 +0000
Subject: [PATCH 0980/3722] Satisfy AppVeyor

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

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 9ca8ec9051..c39f95d93a 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -142,7 +142,7 @@ namespace osu.Game.Overlays.Settings.Sections
             // Sort user skins seperate from built-in skins
             List<SkinInfo> userSkinsList = skinsList.GetRange(firstNonDefault + 1, skinsList.Count - (firstNonDefault + 1));
             skinsList.RemoveRange(firstNonDefault + 1, skinsList.Count - (firstNonDefault + 1));
-            userSkinsList.Sort((a, b) => String.Compare(a.Name, b.Name, StringComparison.OrdinalIgnoreCase));
+            userSkinsList.Sort((a, b) => string.Compare(a.Name, b.Name, StringComparison.OrdinalIgnoreCase));
             skinsList.AddRange(userSkinsList);
             return skinsList;
         }

From 206a0b8bace7733f6ac6f12909adcaecb6472d08 Mon Sep 17 00:00:00 2001
From: rednir <davran.dilshat@gmail.com>
Date: Tue, 19 Jan 2021 16:55:50 +0000
Subject: [PATCH 0981/3722] Fix firstNonDefault staying as -1

---
 osu.Game/Overlays/Settings/Sections/SkinSection.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index c39f95d93a..a3e472a9f9 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -115,7 +115,8 @@ namespace osu.Game.Overlays.Settings.Sections
         {
             skinItems = skins.GetAllUsableSkins();
             firstNonDefault = skinItems.FindIndex(s => s.ID > 0);
-
+            if (firstNonDefault < 0)
+                firstNonDefault = skinItems.Count;
             skinItems.Insert(firstNonDefault, random_skin_info);
             skinItems = sortList(skinItems);
             skinDropdown.Items = skinItems;

From 34612ae233fbf664c7db40567b09505be918d3f2 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 19 Jan 2021 19:03:29 +0300
Subject: [PATCH 0982/3722] Forward internal management to a container
 alongside tracker

---
 .../Screens/OnlinePlay/Match/RoomSubScreen.cs   | 17 ++++++++++++++---
 .../Multiplayer/MultiplayerMatchSubScreen.cs    |  4 ++--
 .../Playlists/PlaylistsRoomSubScreen.cs         |  4 ++--
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index c049d4be20..4b89a0c278 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -7,6 +7,8 @@ using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
@@ -43,14 +45,23 @@ namespace osu.Game.Screens.OnlinePlay.Match
         [Cached]
         protected readonly MultiplayerBeatmapTracker BeatmapTracker;
 
+        private readonly Container content = new Container { RelativeSizeAxes = Axes.Both };
+
         protected RoomSubScreen()
         {
-            InternalChild = BeatmapTracker = new MultiplayerBeatmapTracker
+            base.AddInternal(BeatmapTracker = new MultiplayerBeatmapTracker
             {
-                SelectedItem = { BindTarget = SelectedItem },
-            };
+                SelectedItem = { BindTarget = SelectedItem }
+            });
+
+            base.AddInternal(content);
         }
 
+        // This is a bit ugly but we don't have the concept of InternalContent so it'll have to do for now. (https://github.com/ppy/osu-framework/issues/1690)
+        protected override void AddInternal(Drawable drawable) => content.Add(drawable);
+        protected override bool RemoveInternal(Drawable drawable) => content.Remove(drawable);
+        protected override void ClearInternal(bool disposeChildren = true) => content.Clear(disposeChildren);
+
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index a641935b9a..fa4b972f98 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         [BackgroundDependencyLoader]
         private void load()
         {
-            AddRangeInternal(new Drawable[]
+            InternalChildren = new Drawable[]
             {
                 new GridContainer
                 {
@@ -176,7 +176,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                     RelativeSizeAxes = Axes.Both,
                     State = { Value = client.Room == null ? Visibility.Visible : Visibility.Hidden }
                 }
-            });
+            };
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
index 7b3cdf16db..781c455eb4 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         [BackgroundDependencyLoader]
         private void load()
         {
-            AddRangeInternal(new Drawable[]
+            InternalChildren = new Drawable[]
             {
                 new GridContainer
                 {
@@ -188,7 +188,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                     EditPlaylist = () => this.Push(new MatchSongSelect()),
                     State = { Value = roomId.Value == null ? Visibility.Visible : Visibility.Hidden }
                 }
-            });
+            };
         }
 
         [Resolved]

From b00c6a1d60723622101512b13168214ff61696aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 19 Jan 2021 18:29:55 +0100
Subject: [PATCH 0983/3722] Make first non-default skin index a property

The previous code was very brittle - it was not always updating
properly, and seems to have worked either by a carefully crafted set of
circumstances, or just plain coincidence.

Having this be a get-only property avoids potential error in the future
caused by not updating the index properly, at the expense of an added
linear lookup.
---
 .../Overlays/Settings/Sections/SkinSection.cs | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index a3e472a9f9..bbb4c50f6b 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -38,7 +38,17 @@ namespace osu.Game.Overlays.Settings.Sections
 
         private List<SkinInfo> skinItems;
 
-        private int firstNonDefault;
+        private int firstNonDefaultSkinIndex
+        {
+            get
+            {
+                var index = skinItems.FindIndex(s => s.ID > 0);
+                if (index < 0)
+                    index = skinItems.Count;
+
+                return index;
+            }
+        }
 
         [Resolved]
         private SkinManager skins { get; set; }
@@ -114,10 +124,7 @@ namespace osu.Game.Overlays.Settings.Sections
         private void updateItems()
         {
             skinItems = skins.GetAllUsableSkins();
-            firstNonDefault = skinItems.FindIndex(s => s.ID > 0);
-            if (firstNonDefault < 0)
-                firstNonDefault = skinItems.Count;
-            skinItems.Insert(firstNonDefault, random_skin_info);
+            skinItems.Insert(firstNonDefaultSkinIndex, random_skin_info);
             skinItems = sortList(skinItems);
             skinDropdown.Items = skinItems;
         }
@@ -141,8 +148,8 @@ namespace osu.Game.Overlays.Settings.Sections
         private List<SkinInfo> sortList(List<SkinInfo> skinsList)
         {
             // Sort user skins seperate from built-in skins
-            List<SkinInfo> userSkinsList = skinsList.GetRange(firstNonDefault + 1, skinsList.Count - (firstNonDefault + 1));
-            skinsList.RemoveRange(firstNonDefault + 1, skinsList.Count - (firstNonDefault + 1));
+            List<SkinInfo> userSkinsList = skinsList.GetRange(firstNonDefaultSkinIndex, skinsList.Count - firstNonDefaultSkinIndex);
+            skinsList.RemoveRange(firstNonDefaultSkinIndex, skinsList.Count - firstNonDefaultSkinIndex);
             userSkinsList.Sort((a, b) => string.Compare(a.Name, b.Name, StringComparison.OrdinalIgnoreCase));
             skinsList.AddRange(userSkinsList);
             return skinsList;

From 78e590d25da4b570447d8fb3b8462f56fa52f50c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 19 Jan 2021 18:36:42 +0100
Subject: [PATCH 0984/3722] Refactor skin sorting method

* Rename to `sortUserSkins` to convey meaning better.
* Sort in-place instead of slicing the list.
* Change to `void` to avoid misleading users that the method returns
  a new list instance.
* Fix typo in comment.
---
 .../Overlays/Settings/Sections/SkinSection.cs     | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index bbb4c50f6b..75c0324408 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -125,7 +125,7 @@ namespace osu.Game.Overlays.Settings.Sections
         {
             skinItems = skins.GetAllUsableSkins();
             skinItems.Insert(firstNonDefaultSkinIndex, random_skin_info);
-            skinItems = sortList(skinItems);
+            sortUserSkins(skinItems);
             skinDropdown.Items = skinItems;
         }
 
@@ -134,7 +134,7 @@ namespace osu.Game.Overlays.Settings.Sections
             if (weakItem.NewValue.TryGetTarget(out var item))
             {
                 List<SkinInfo> newDropdownItems = skinDropdown.Items.Where(i => !i.Equals(item)).Append(item).ToList();
-                newDropdownItems = sortList(newDropdownItems);
+                sortUserSkins(newDropdownItems);
                 Schedule(() => skinDropdown.Items = newDropdownItems.ToArray());
             }
         }
@@ -145,14 +145,11 @@ namespace osu.Game.Overlays.Settings.Sections
                 Schedule(() => skinDropdown.Items = skinDropdown.Items.Where(i => i.ID != item.ID).ToArray());
         }
 
-        private List<SkinInfo> sortList(List<SkinInfo> skinsList)
+        private void sortUserSkins(List<SkinInfo> skinsList)
         {
-            // Sort user skins seperate from built-in skins
-            List<SkinInfo> userSkinsList = skinsList.GetRange(firstNonDefaultSkinIndex, skinsList.Count - firstNonDefaultSkinIndex);
-            skinsList.RemoveRange(firstNonDefaultSkinIndex, skinsList.Count - firstNonDefaultSkinIndex);
-            userSkinsList.Sort((a, b) => string.Compare(a.Name, b.Name, StringComparison.OrdinalIgnoreCase));
-            skinsList.AddRange(userSkinsList);
-            return skinsList;
+            // Sort user skins separately from built-in skins
+            skinsList.Sort(firstNonDefaultSkinIndex, skinsList.Count - firstNonDefaultSkinIndex,
+                Comparer<SkinInfo>.Create((a, b) => string.Compare(a.Name, b.Name, StringComparison.OrdinalIgnoreCase)));
         }
 
         private class SkinSettingsDropdown : SettingsDropdown<SkinInfo>

From 3b49b7461ef628031ba3440ea795cf5a42073a2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 19 Jan 2021 18:46:21 +0100
Subject: [PATCH 0985/3722] Schedule entire operation for safety

Also removes a redundant list copy.
---
 osu.Game/Overlays/Settings/Sections/SkinSection.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 75c0324408..4cfd801caf 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -133,9 +133,12 @@ namespace osu.Game.Overlays.Settings.Sections
         {
             if (weakItem.NewValue.TryGetTarget(out var item))
             {
-                List<SkinInfo> newDropdownItems = skinDropdown.Items.Where(i => !i.Equals(item)).Append(item).ToList();
-                sortUserSkins(newDropdownItems);
-                Schedule(() => skinDropdown.Items = newDropdownItems.ToArray());
+                Schedule(() =>
+                {
+                    List<SkinInfo> newDropdownItems = skinDropdown.Items.Where(i => !i.Equals(item)).Append(item).ToList();
+                    sortUserSkins(newDropdownItems);
+                    skinDropdown.Items = newDropdownItems;
+                });
             }
         }
 

From 82e5a5bf6fbcc997e692e2af269a69f990343ddc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 19 Jan 2021 23:10:15 +0100
Subject: [PATCH 0986/3722] Mark legacy beatmap skin colour test as abstract

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

diff --git a/osu.Game/Tests/Beatmaps/LegacyBeatmapSkinColourTest.cs b/osu.Game/Tests/Beatmaps/LegacyBeatmapSkinColourTest.cs
index fb3432fbae..051ede30b7 100644
--- a/osu.Game/Tests/Beatmaps/LegacyBeatmapSkinColourTest.cs
+++ b/osu.Game/Tests/Beatmaps/LegacyBeatmapSkinColourTest.cs
@@ -17,7 +17,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Tests.Beatmaps
 {
-    public class LegacyBeatmapSkinColourTest : ScreenTestScene
+    public abstract class LegacyBeatmapSkinColourTest : ScreenTestScene
     {
         protected readonly Bindable<bool> BeatmapSkins = new Bindable<bool>();
         protected readonly Bindable<bool> BeatmapColours = new Bindable<bool>();

From 2ca3ccad0647c28f20b9aedaf0d560baf98b9de9 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 20 Jan 2021 04:56:46 +0300
Subject: [PATCH 0987/3722] Move all the content to BeatmapSetHeaderContent
 drawable

---
 .../Online/TestSceneBeatmapSetOverlay.cs      |   6 +-
 .../Overlays/BeatmapSet/BeatmapSetHeader.cs   | 278 +----------------
 .../BeatmapSet/BeatmapSetHeaderContent.cs     | 283 ++++++++++++++++++
 osu.Game/Overlays/BeatmapSetOverlay.cs        |   6 +-
 4 files changed, 295 insertions(+), 278 deletions(-)
 create mode 100644 osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
index 7ff978c7ca..edc1696456 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
@@ -231,8 +231,8 @@ namespace osu.Game.Tests.Visual.Online
                 });
             });
 
-            AddAssert("shown beatmaps of current ruleset", () => overlay.Header.Picker.Difficulties.All(b => b.Beatmap.Ruleset.Equals(overlay.Header.RulesetSelector.Current.Value)));
-            AddAssert("left-most beatmap selected", () => overlay.Header.Picker.Difficulties.First().State == BeatmapPicker.DifficultySelectorState.Selected);
+            AddAssert("shown beatmaps of current ruleset", () => overlay.Header.HeaderContent.Picker.Difficulties.All(b => b.Beatmap.Ruleset.Equals(overlay.Header.RulesetSelector.Current.Value)));
+            AddAssert("left-most beatmap selected", () => overlay.Header.HeaderContent.Picker.Difficulties.First().State == BeatmapPicker.DifficultySelectorState.Selected);
         }
 
         [Test]
@@ -310,7 +310,7 @@ namespace osu.Game.Tests.Visual.Online
 
         private void downloadAssert(bool shown)
         {
-            AddAssert($"is download button {(shown ? "shown" : "hidden")}", () => overlay.Header.DownloadButtonsVisible == shown);
+            AddAssert($"is download button {(shown ? "shown" : "hidden")}", () => overlay.Header.HeaderContent.DownloadButtonsVisible == shown);
         }
 
         private class TestBeatmapSetOverlay : BeatmapSetOverlay
diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs
index bc9008d1f5..4b26b02a8e 100644
--- a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs
+++ b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs
@@ -1,24 +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.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.Effects;
-using osu.Framework.Graphics.Shapes;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.Drawables;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Online;
-using osu.Game.Online.API;
-using osu.Game.Overlays.BeatmapListing.Panels;
-using osu.Game.Overlays.BeatmapSet.Buttons;
 using osu.Game.Rulesets;
 using osuTK;
 using osuTK.Graphics;
@@ -27,41 +15,16 @@ namespace osu.Game.Overlays.BeatmapSet
 {
     public class BeatmapSetHeader : OverlayHeader
     {
-        private const float transition_duration = 200;
-        private const float buttons_height = 45;
-        private const float buttons_spacing = 5;
-
         public readonly Bindable<BeatmapSetInfo> BeatmapSet = new Bindable<BeatmapSetInfo>();
 
-        public bool DownloadButtonsVisible => downloadButtonsContainer.Any();
-
-        public BeatmapPicker Picker { get; private set; }
+        public BeatmapSetHeaderContent HeaderContent { get; private set; }
 
+        [Cached]
         public BeatmapRulesetSelector RulesetSelector { get; private set; }
 
-        private IBindable<DownloadState> state => downloadTracker.State;
-
         [Cached(typeof(IBindable<RulesetInfo>))]
         private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
 
-        [Resolved]
-        private IAPIProvider api { get; set; }
-
-        private readonly DownloadTracker downloadTracker;
-        private OsuSpriteText title, artist;
-        private AuthorInfo author;
-        private ExplicitContentBeatmapPill explicitContentPill;
-        private FillFlowContainer downloadButtonsContainer;
-        private BeatmapAvailability beatmapAvailability;
-        private BeatmapSetOnlineStatusPill onlineStatusPill;
-        private ExternalLinkButton externalLink;
-        private UpdateableBeatmapSetCover cover;
-        private Box coverGradient;
-        private FillFlowContainer fadeContent;
-        private FavouriteButton favouriteButton;
-        private LoadingSpinner loading;
-        private Details details;
-
         public BeatmapSetHeader()
         {
             Masking = true;
@@ -73,249 +36,20 @@ namespace osu.Game.Overlays.BeatmapSet
                 Radius = 3,
                 Offset = new Vector2(0f, 1f),
             };
-
-            AddInternal(downloadTracker = new DownloadTracker
-            {
-                BeatmapSet = { BindTarget = BeatmapSet }
-            });
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
+        protected override Drawable CreateContent() => HeaderContent = new BeatmapSetHeaderContent
         {
-            Picker.Beatmap.ValueChanged += b =>
-            {
-                details.Beatmap = b.NewValue;
-                externalLink.Link = $@"{api.WebsiteRootUrl}/beatmapsets/{BeatmapSet.Value?.OnlineBeatmapSetID}#{b.NewValue?.Ruleset.ShortName}/{b.NewValue?.OnlineBeatmapID}";
-            };
-
-            coverGradient.Colour = ColourInfo.GradientVertical(colourProvider.Background6.Opacity(0.3f), colourProvider.Background6.Opacity(0.8f));
-            onlineStatusPill.BackgroundColour = colourProvider.Background6;
-
-            state.BindValueChanged(_ => updateDownloadButtons());
-
-            BeatmapSet.BindValueChanged(setInfo =>
-            {
-                Picker.BeatmapSet = RulesetSelector.BeatmapSet = author.BeatmapSet = beatmapAvailability.BeatmapSet = details.BeatmapSet = setInfo.NewValue;
-                cover.BeatmapSet = setInfo.NewValue;
-
-                if (setInfo.NewValue == null)
-                {
-                    onlineStatusPill.FadeTo(0.5f, 500, Easing.OutQuint);
-                    fadeContent.Hide();
-
-                    loading.Show();
-
-                    downloadButtonsContainer.FadeOut(transition_duration);
-                    favouriteButton.FadeOut(transition_duration);
-                }
-                else
-                {
-                    fadeContent.FadeIn(500, Easing.OutQuint);
-
-                    loading.Hide();
-
-                    title.Text = setInfo.NewValue.Metadata.Title ?? string.Empty;
-                    artist.Text = setInfo.NewValue.Metadata.Artist ?? string.Empty;
-
-                    explicitContentPill.Alpha = setInfo.NewValue.OnlineInfo.HasExplicitContent ? 1 : 0;
-
-                    onlineStatusPill.FadeIn(500, Easing.OutQuint);
-                    onlineStatusPill.Status = setInfo.NewValue.OnlineInfo.Status;
-
-                    downloadButtonsContainer.FadeIn(transition_duration);
-                    favouriteButton.FadeIn(transition_duration);
-
-                    updateDownloadButtons();
-                }
-            }, true);
-        }
-
-        protected override Drawable CreateContent() => new Container
-        {
-            RelativeSizeAxes = Axes.X,
-            AutoSizeAxes = Axes.Y,
-            Children = new Drawable[]
-            {
-                new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Children = new Drawable[]
-                    {
-                        cover = new UpdateableBeatmapSetCover
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Masking = true,
-                        },
-                        coverGradient = new Box
-                        {
-                            RelativeSizeAxes = Axes.Both
-                        },
-                    },
-                },
-                new Container
-                {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Padding = new MarginPadding
-                    {
-                        Vertical = BeatmapSetOverlay.Y_PADDING,
-                        Left = BeatmapSetOverlay.X_PADDING,
-                        Right = BeatmapSetOverlay.X_PADDING + BeatmapSetOverlay.RIGHT_WIDTH,
-                    },
-                    Children = new Drawable[]
-                    {
-                        fadeContent = new FillFlowContainer
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                            Direction = FillDirection.Vertical,
-                            Children = new Drawable[]
-                            {
-                                new Container
-                                {
-                                    RelativeSizeAxes = Axes.X,
-                                    AutoSizeAxes = Axes.Y,
-                                    Child = Picker = new BeatmapPicker(),
-                                },
-                                new FillFlowContainer
-                                {
-                                    Direction = FillDirection.Horizontal,
-                                    AutoSizeAxes = Axes.Both,
-                                    Margin = new MarginPadding { Top = 15 },
-                                    Children = new Drawable[]
-                                    {
-                                        title = new OsuSpriteText
-                                        {
-                                            Font = OsuFont.GetFont(size: 30, weight: FontWeight.SemiBold, italics: true)
-                                        },
-                                        externalLink = new ExternalLinkButton
-                                        {
-                                            Anchor = Anchor.BottomLeft,
-                                            Origin = Anchor.BottomLeft,
-                                            Margin = new MarginPadding { Left = 5, Bottom = 4 }, // To better lineup with the font
-                                        },
-                                        explicitContentPill = new ExplicitContentBeatmapPill
-                                        {
-                                            Alpha = 0f,
-                                            Anchor = Anchor.BottomLeft,
-                                            Origin = Anchor.BottomLeft,
-                                            Margin = new MarginPadding { Left = 10, Bottom = 4 },
-                                        }
-                                    }
-                                },
-                                artist = new OsuSpriteText
-                                {
-                                    Font = OsuFont.GetFont(size: 20, weight: FontWeight.Medium, italics: true),
-                                    Margin = new MarginPadding { Bottom = 20 }
-                                },
-                                new Container
-                                {
-                                    RelativeSizeAxes = Axes.X,
-                                    AutoSizeAxes = Axes.Y,
-                                    Child = author = new AuthorInfo(),
-                                },
-                                beatmapAvailability = new BeatmapAvailability(),
-                                new Container
-                                {
-                                    RelativeSizeAxes = Axes.X,
-                                    Height = buttons_height,
-                                    Margin = new MarginPadding { Top = 10 },
-                                    Children = new Drawable[]
-                                    {
-                                        favouriteButton = new FavouriteButton
-                                        {
-                                            BeatmapSet = { BindTarget = BeatmapSet }
-                                        },
-                                        downloadButtonsContainer = new FillFlowContainer
-                                        {
-                                            RelativeSizeAxes = Axes.Both,
-                                            Padding = new MarginPadding { Left = buttons_height + buttons_spacing },
-                                            Spacing = new Vector2(buttons_spacing),
-                                        },
-                                    },
-                                },
-                            },
-                        },
-                    }
-                },
-                loading = new LoadingSpinner
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Scale = new Vector2(1.5f),
-                },
-                new FillFlowContainer
-                {
-                    Anchor = Anchor.BottomRight,
-                    Origin = Anchor.BottomRight,
-                    AutoSizeAxes = Axes.Both,
-                    Margin = new MarginPadding { Top = BeatmapSetOverlay.Y_PADDING, Right = BeatmapSetOverlay.X_PADDING },
-                    Direction = FillDirection.Vertical,
-                    Spacing = new Vector2(10),
-                    Children = new Drawable[]
-                    {
-                        onlineStatusPill = new BeatmapSetOnlineStatusPill
-                        {
-                            Anchor = Anchor.TopRight,
-                            Origin = Anchor.TopRight,
-                            TextSize = 14,
-                            TextPadding = new MarginPadding { Horizontal = 35, Vertical = 10 }
-                        },
-                        details = new Details(),
-                    },
-                },
-            }
+            BeatmapSet = { BindTarget = BeatmapSet }
         };
 
-        private void updateDownloadButtons()
-        {
-            if (BeatmapSet.Value == null) return;
-
-            if ((BeatmapSet.Value.OnlineInfo.Availability?.DownloadDisabled ?? false) && state.Value != DownloadState.LocallyAvailable)
-            {
-                downloadButtonsContainer.Clear();
-                return;
-            }
-
-            switch (state.Value)
-            {
-                case DownloadState.LocallyAvailable:
-                    // temporary for UX until new design is implemented.
-                    downloadButtonsContainer.Child = new BeatmapPanelDownloadButton(BeatmapSet.Value)
-                    {
-                        Width = 50,
-                        RelativeSizeAxes = Axes.Y,
-                        SelectedBeatmap = { BindTarget = Picker.Beatmap }
-                    };
-                    break;
-
-                case DownloadState.Downloading:
-                case DownloadState.Importing:
-                    // temporary to avoid showing two buttons for maps with novideo. will be fixed in new beatmap overlay design.
-                    downloadButtonsContainer.Child = new HeaderDownloadButton(BeatmapSet.Value);
-                    break;
-
-                default:
-                    downloadButtonsContainer.Child = new HeaderDownloadButton(BeatmapSet.Value);
-                    if (BeatmapSet.Value.OnlineInfo.HasVideo)
-                        downloadButtonsContainer.Add(new HeaderDownloadButton(BeatmapSet.Value, true));
-                    break;
-            }
-        }
-
-        private class DownloadTracker : BeatmapDownloadTrackingComposite
-        {
-            public new Bindable<DownloadState> State => base.State;
-        }
-
-        protected override OverlayTitle CreateTitle() => new BeatmapHeaderTitle();
-
         protected override Drawable CreateTitleContent() => RulesetSelector = new BeatmapRulesetSelector
         {
             Current = ruleset
         };
 
+        protected override OverlayTitle CreateTitle() => new BeatmapHeaderTitle();
+
         private class BeatmapHeaderTitle : OverlayTitle
         {
             public BeatmapHeaderTitle()
diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs
new file mode 100644
index 0000000000..153aa41582
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs
@@ -0,0 +1,283 @@
+// Copyright (c) ppy 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.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Beatmaps.Drawables;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online;
+using osu.Game.Online.API;
+using osu.Game.Overlays.BeatmapListing.Panels;
+using osu.Game.Overlays.BeatmapSet.Buttons;
+using osuTK;
+
+namespace osu.Game.Overlays.BeatmapSet
+{
+    public class BeatmapSetHeaderContent : BeatmapDownloadTrackingComposite
+    {
+        private const float transition_duration = 200;
+        private const float buttons_height = 45;
+        private const float buttons_spacing = 5;
+
+        public bool DownloadButtonsVisible => downloadButtonsContainer.Any();
+
+        public readonly Details Details;
+        public readonly BeatmapPicker Picker;
+
+        private readonly UpdateableBeatmapSetCover cover;
+        private readonly Box coverGradient;
+        private readonly OsuSpriteText title, artist;
+        private readonly AuthorInfo author;
+        private readonly ExplicitContentBeatmapPill explicitContentPill;
+        private readonly FillFlowContainer downloadButtonsContainer;
+        private readonly BeatmapAvailability beatmapAvailability;
+        private readonly BeatmapSetOnlineStatusPill onlineStatusPill;
+        private readonly FavouriteButton favouriteButton;
+        private readonly FillFlowContainer fadeContent;
+        private readonly LoadingSpinner loading;
+
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        [Resolved]
+        private BeatmapRulesetSelector rulesetSelector { get; set; }
+
+        public BeatmapSetHeaderContent()
+        {
+            ExternalLinkButton externalLink;
+
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+            InternalChild = new Container
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Children = new Drawable[]
+                {
+                    new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Children = new Drawable[]
+                        {
+                            cover = new UpdateableBeatmapSetCover
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Masking = true,
+                            },
+                            coverGradient = new Box
+                            {
+                                RelativeSizeAxes = Axes.Both
+                            },
+                        },
+                    },
+                    new Container
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Padding = new MarginPadding
+                        {
+                            Vertical = BeatmapSetOverlay.Y_PADDING,
+                            Left = BeatmapSetOverlay.X_PADDING,
+                            Right = BeatmapSetOverlay.X_PADDING + BeatmapSetOverlay.RIGHT_WIDTH,
+                        },
+                        Children = new Drawable[]
+                        {
+                            fadeContent = new FillFlowContainer
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y,
+                                Direction = FillDirection.Vertical,
+                                Children = new Drawable[]
+                                {
+                                    new Container
+                                    {
+                                        RelativeSizeAxes = Axes.X,
+                                        AutoSizeAxes = Axes.Y,
+                                        Child = Picker = new BeatmapPicker(),
+                                    },
+                                    new FillFlowContainer
+                                    {
+                                        Direction = FillDirection.Horizontal,
+                                        AutoSizeAxes = Axes.Both,
+                                        Margin = new MarginPadding { Top = 15 },
+                                        Children = new Drawable[]
+                                        {
+                                            title = new OsuSpriteText
+                                            {
+                                                Font = OsuFont.GetFont(size: 30, weight: FontWeight.SemiBold, italics: true)
+                                            },
+                                            externalLink = new ExternalLinkButton
+                                            {
+                                                Anchor = Anchor.BottomLeft,
+                                                Origin = Anchor.BottomLeft,
+                                                Margin = new MarginPadding { Left = 5, Bottom = 4 }, // To better lineup with the font
+                                            },
+                                            explicitContentPill = new ExplicitContentBeatmapPill
+                                            {
+                                                Alpha = 0f,
+                                                Anchor = Anchor.BottomLeft,
+                                                Origin = Anchor.BottomLeft,
+                                                Margin = new MarginPadding { Left = 10, Bottom = 4 },
+                                            }
+                                        }
+                                    },
+                                    artist = new OsuSpriteText
+                                    {
+                                        Font = OsuFont.GetFont(size: 20, weight: FontWeight.Medium, italics: true),
+                                        Margin = new MarginPadding { Bottom = 20 }
+                                    },
+                                    new Container
+                                    {
+                                        RelativeSizeAxes = Axes.X,
+                                        AutoSizeAxes = Axes.Y,
+                                        Child = author = new AuthorInfo(),
+                                    },
+                                    beatmapAvailability = new BeatmapAvailability(),
+                                    new Container
+                                    {
+                                        RelativeSizeAxes = Axes.X,
+                                        Height = buttons_height,
+                                        Margin = new MarginPadding { Top = 10 },
+                                        Children = new Drawable[]
+                                        {
+                                            favouriteButton = new FavouriteButton
+                                            {
+                                                BeatmapSet = { BindTarget = BeatmapSet }
+                                            },
+                                            downloadButtonsContainer = new FillFlowContainer
+                                            {
+                                                RelativeSizeAxes = Axes.Both,
+                                                Padding = new MarginPadding { Left = buttons_height + buttons_spacing },
+                                                Spacing = new Vector2(buttons_spacing),
+                                            },
+                                        },
+                                    },
+                                },
+                            },
+                        }
+                    },
+                    loading = new LoadingSpinner
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Scale = new Vector2(1.5f),
+                    },
+                    new FillFlowContainer
+                    {
+                        Anchor = Anchor.BottomRight,
+                        Origin = Anchor.BottomRight,
+                        AutoSizeAxes = Axes.Both,
+                        Margin = new MarginPadding { Top = BeatmapSetOverlay.Y_PADDING, Right = BeatmapSetOverlay.X_PADDING },
+                        Direction = FillDirection.Vertical,
+                        Spacing = new Vector2(10),
+                        Children = new Drawable[]
+                        {
+                            onlineStatusPill = new BeatmapSetOnlineStatusPill
+                            {
+                                Anchor = Anchor.TopRight,
+                                Origin = Anchor.TopRight,
+                                TextSize = 14,
+                                TextPadding = new MarginPadding { Horizontal = 35, Vertical = 10 }
+                            },
+                            Details = new Details(),
+                        },
+                    },
+                }
+            };
+
+            Picker.Beatmap.ValueChanged += b =>
+            {
+                Details.Beatmap = b.NewValue;
+                externalLink.Link = $@"{api.WebsiteRootUrl}/beatmapsets/{BeatmapSet.Value?.OnlineBeatmapSetID}#{b.NewValue?.Ruleset.ShortName}/{b.NewValue?.OnlineBeatmapID}";
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            coverGradient.Colour = ColourInfo.GradientVertical(colourProvider.Background6.Opacity(0.3f), colourProvider.Background6.Opacity(0.8f));
+            onlineStatusPill.BackgroundColour = colourProvider.Background6;
+
+            State.BindValueChanged(_ => updateDownloadButtons());
+
+            BeatmapSet.BindValueChanged(setInfo =>
+            {
+                Picker.BeatmapSet = rulesetSelector.BeatmapSet = author.BeatmapSet = beatmapAvailability.BeatmapSet = Details.BeatmapSet = setInfo.NewValue;
+                cover.BeatmapSet = setInfo.NewValue;
+
+                if (setInfo.NewValue == null)
+                {
+                    onlineStatusPill.FadeTo(0.5f, 500, Easing.OutQuint);
+                    fadeContent.Hide();
+
+                    loading.Show();
+
+                    downloadButtonsContainer.FadeOut(transition_duration);
+                    favouriteButton.FadeOut(transition_duration);
+                }
+                else
+                {
+                    fadeContent.FadeIn(500, Easing.OutQuint);
+
+                    loading.Hide();
+
+                    title.Text = setInfo.NewValue.Metadata.Title ?? string.Empty;
+                    artist.Text = setInfo.NewValue.Metadata.Artist ?? string.Empty;
+
+                    explicitContentPill.Alpha = setInfo.NewValue.OnlineInfo.HasExplicitContent ? 1 : 0;
+
+                    onlineStatusPill.FadeIn(500, Easing.OutQuint);
+                    onlineStatusPill.Status = setInfo.NewValue.OnlineInfo.Status;
+
+                    downloadButtonsContainer.FadeIn(transition_duration);
+                    favouriteButton.FadeIn(transition_duration);
+
+                    updateDownloadButtons();
+                }
+            }, true);
+        }
+
+        private void updateDownloadButtons()
+        {
+            if (BeatmapSet.Value == null) return;
+
+            if ((BeatmapSet.Value.OnlineInfo.Availability?.DownloadDisabled ?? false) && State.Value != DownloadState.LocallyAvailable)
+            {
+                downloadButtonsContainer.Clear();
+                return;
+            }
+
+            switch (State.Value)
+            {
+                case DownloadState.LocallyAvailable:
+                    // temporary for UX until new design is implemented.
+                    downloadButtonsContainer.Child = new BeatmapPanelDownloadButton(BeatmapSet.Value)
+                    {
+                        Width = 50,
+                        RelativeSizeAxes = Axes.Y,
+                        SelectedBeatmap = { BindTarget = Picker.Beatmap }
+                    };
+                    break;
+
+                case DownloadState.Downloading:
+                case DownloadState.Importing:
+                    // temporary to avoid showing two buttons for maps with novideo. will be fixed in new beatmap overlay design.
+                    downloadButtonsContainer.Child = new HeaderDownloadButton(BeatmapSet.Value);
+                    break;
+
+                default:
+                    downloadButtonsContainer.Child = new HeaderDownloadButton(BeatmapSet.Value);
+                    if (BeatmapSet.Value.OnlineInfo.HasVideo)
+                        downloadButtonsContainer.Add(new HeaderDownloadButton(BeatmapSet.Value, true));
+                    break;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Overlays/BeatmapSetOverlay.cs b/osu.Game/Overlays/BeatmapSetOverlay.cs
index 86f0f4f614..c16ec339bb 100644
--- a/osu.Game/Overlays/BeatmapSetOverlay.cs
+++ b/osu.Game/Overlays/BeatmapSetOverlay.cs
@@ -76,7 +76,7 @@ namespace osu.Game.Overlays
                             },
                             new ScoresContainer
                             {
-                                Beatmap = { BindTarget = Header.Picker.Beatmap }
+                                Beatmap = { BindTarget = Header.HeaderContent.Picker.Beatmap }
                             },
                             comments = new CommentsSection()
                         },
@@ -88,7 +88,7 @@ namespace osu.Game.Overlays
             info.BeatmapSet.BindTo(beatmapSet);
             comments.BeatmapSet.BindTo(beatmapSet);
 
-            Header.Picker.Beatmap.ValueChanged += b =>
+            Header.HeaderContent.Picker.Beatmap.ValueChanged += b =>
             {
                 info.Beatmap = b.NewValue;
 
@@ -122,7 +122,7 @@ namespace osu.Game.Overlays
             req.Success += res =>
             {
                 beatmapSet.Value = res.ToBeatmapSet(rulesets);
-                Header.Picker.Beatmap.Value = Header.BeatmapSet.Value.Beatmaps.First(b => b.OnlineBeatmapID == beatmapId);
+                Header.HeaderContent.Picker.Beatmap.Value = Header.BeatmapSet.Value.Beatmaps.First(b => b.OnlineBeatmapID == beatmapId);
             };
             API.Queue(req);
 

From 58269f931491a2e2b6367a68b9c3a178415aa3c1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 20 Jan 2021 13:35:43 +0900
Subject: [PATCH 0988/3722] Update with framework changes

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

diff --git a/osu.Game/Skinning/PoolableSkinnableSample.cs b/osu.Game/Skinning/PoolableSkinnableSample.cs
index 2c83023fdc..0157af002e 100644
--- a/osu.Game/Skinning/PoolableSkinnableSample.cs
+++ b/osu.Game/Skinning/PoolableSkinnableSample.cs
@@ -129,7 +129,7 @@ namespace osu.Game.Skinning
         /// </summary>
         public bool Playing => activeChannel?.Playing ?? false;
 
-        public bool Played => activeChannel?.Played ?? false;
+        public bool Played => !activeChannel?.Playing ?? false;
 
         private bool looping;
 

From bdb9d4f7d0ac8c0b20adffeb85823e60ee0d5ceb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 20 Jan 2021 13:59:30 +0900
Subject: [PATCH 0989/3722] Restart sound on play

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

diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index 06c694dc7a..b3db2d6558 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -124,7 +124,10 @@ namespace osu.Game.Skinning
             samplesContainer.ForEach(c =>
             {
                 if (PlayWhenZeroVolume || c.AggregateVolume.Value > 0)
+                {
+                    c.Stop();
                     c.Play();
+                }
             });
         }
 

From 8ffbcc9860e48e1940774540281511f32387f2e6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 20 Jan 2021 14:05:35 +0900
Subject: [PATCH 0990/3722] Fix test failures and general discrepancies

---
 .../Editing/TestSceneEditorSamplePlayback.cs       | 14 +++++++-------
 .../Gameplay/TestSceneGameplaySamplePlayback.cs    |  6 +++---
 .../Visual/Gameplay/TestSceneSkinnableSound.cs     | 12 ++++++++++--
 osu.Game/Graphics/UserInterface/OsuSliderBar.cs    |  1 -
 osu.Game/Skinning/PoolableSkinnableSample.cs       | 10 ++++++++--
 5 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSamplePlayback.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSamplePlayback.cs
index 876c1308b4..2abc8a8dec 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSamplePlayback.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSamplePlayback.cs
@@ -19,14 +19,14 @@ namespace osu.Game.Tests.Visual.Editing
         public void TestSlidingSampleStopsOnSeek()
         {
             DrawableSlider slider = null;
-            SkinnableSound[] loopingSamples = null;
-            SkinnableSound[] onceOffSamples = null;
+            PoolableSkinnableSample[] loopingSamples = null;
+            PoolableSkinnableSample[] onceOffSamples = null;
 
             AddStep("get first slider", () =>
             {
                 slider = Editor.ChildrenOfType<DrawableSlider>().OrderBy(s => s.HitObject.StartTime).First();
-                onceOffSamples = slider.ChildrenOfType<SkinnableSound>().Where(s => !s.Looping).ToArray();
-                loopingSamples = slider.ChildrenOfType<SkinnableSound>().Where(s => s.Looping).ToArray();
+                onceOffSamples = slider.ChildrenOfType<PoolableSkinnableSample>().Where(s => !s.Looping).ToArray();
+                loopingSamples = slider.ChildrenOfType<PoolableSkinnableSample>().Where(s => s.Looping).ToArray();
             });
 
             AddStep("start playback", () => EditorClock.Start());
@@ -36,15 +36,15 @@ namespace osu.Game.Tests.Visual.Editing
                 if (!slider.Tracking.Value)
                     return false;
 
-                if (!loopingSamples.Any(s => s.IsPlaying))
+                if (!loopingSamples.Any(s => s.Playing))
                     return false;
 
                 EditorClock.Seek(20000);
                 return true;
             });
 
-            AddAssert("non-looping samples are playing", () => onceOffSamples.Length == 4 && loopingSamples.All(s => s.IsPlayed || s.IsPlaying));
-            AddAssert("looping samples are not playing", () => loopingSamples.Length == 1 && loopingSamples.All(s => s.IsPlayed && !s.IsPlaying));
+            AddAssert("non-looping samples are playing", () => onceOffSamples.Length == 4 && loopingSamples.All(s => s.Played || s.Playing));
+            AddAssert("looping samples are not playing", () => loopingSamples.Length == 1 && loopingSamples.All(s => s.Played && !s.Playing));
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs
index b13acdcb95..6b3fc304e0 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs
@@ -19,14 +19,14 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestAllSamplesStopDuringSeek()
         {
             DrawableSlider slider = null;
-            SkinnableSound[] samples = null;
+            PoolableSkinnableSample[] samples = null;
             ISamplePlaybackDisabler sampleDisabler = null;
 
             AddUntilStep("get variables", () =>
             {
                 sampleDisabler = Player;
                 slider = Player.ChildrenOfType<DrawableSlider>().OrderBy(s => s.HitObject.StartTime).FirstOrDefault();
-                samples = slider?.ChildrenOfType<SkinnableSound>().ToArray();
+                samples = slider?.ChildrenOfType<PoolableSkinnableSample>().ToArray();
 
                 return slider != null;
             });
@@ -36,7 +36,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 if (!slider.Tracking.Value)
                     return false;
 
-                if (!samples.Any(s => s.IsPlaying))
+                if (!samples.Any(s => s.Playing))
                     return false;
 
                 Player.ChildrenOfType<GameplayClockContainer>().First().Seek(40000);
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
index 28c266f7d8..d688e9cb21 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
@@ -43,7 +43,11 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestStoppedSoundDoesntResumeAfterPause()
         {
-            AddStep("start sample with looping", () => skinnableSound.Looping = true);
+            AddStep("start sample with looping", () =>
+            {
+                skinnableSound.Looping = true;
+                skinnableSound.Play();
+            });
 
             AddUntilStep("wait for sample to start playing", () => skinnableSound.IsPlaying);
 
@@ -62,7 +66,11 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestLoopingSoundResumesAfterPause()
         {
-            AddStep("start sample with looping", () => skinnableSound.Looping = true);
+            AddStep("start sample with looping", () =>
+            {
+                skinnableSound.Looping = true;
+                skinnableSound.Play();
+            });
 
             AddUntilStep("wait for sample to start playing", () => skinnableSound.IsPlaying);
 
diff --git a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
index bcf5220380..f58962f8e1 100644
--- a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
@@ -155,7 +155,6 @@ namespace osu.Game.Graphics.UserInterface
                 return;
 
             lastSampleValue = value;
-
             lastSampleTime = Clock.CurrentTime;
 
             var channel = sample.Play();
diff --git a/osu.Game/Skinning/PoolableSkinnableSample.cs b/osu.Game/Skinning/PoolableSkinnableSample.cs
index 0157af002e..cff793e8d4 100644
--- a/osu.Game/Skinning/PoolableSkinnableSample.cs
+++ b/osu.Game/Skinning/PoolableSkinnableSample.cs
@@ -117,19 +117,25 @@ namespace osu.Game.Skinning
 
             activeChannel = Sample.Play();
             activeChannel.Looping = Looping;
+
+            Played = true;
         }
 
         /// <summary>
         /// Stops the sample.
         /// </summary>
-        public void Stop() => activeChannel?.Stop();
+        public void Stop()
+        {
+            activeChannel?.Stop();
+            activeChannel = null;
+        }
 
         /// <summary>
         /// Whether the sample is currently playing.
         /// </summary>
         public bool Playing => activeChannel?.Playing ?? false;
 
-        public bool Played => !activeChannel?.Playing ?? false;
+        public bool Played { get; private set; }
 
         private bool looping;
 

From 5261c0184919c79973c08a7bc43466adf4f0d3ba Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 20 Jan 2021 19:43:42 +0900
Subject: [PATCH 0991/3722] Tie JoinRoom() and PartRoom() together

---
 .../Multiplayer/StatefulMultiplayerClient.cs  | 154 +++++++++++-------
 1 file changed, 92 insertions(+), 62 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index f0e11b2b8b..18a63171c4 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -4,7 +4,6 @@
 #nullable enable
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
@@ -109,30 +108,54 @@ namespace osu.Game.Online.Multiplayer
             });
         }
 
+        private readonly object joinOrLeaveTaskLock = new object();
+        private Task? joinOrLeaveTask;
+
         /// <summary>
         /// Joins the <see cref="MultiplayerRoom"/> for a given API <see cref="Room"/>.
         /// </summary>
         /// <param name="room">The API <see cref="Room"/>.</param>
         public async Task JoinRoom(Room room)
         {
-            if (Room != null)
-                throw new InvalidOperationException("Cannot join a multiplayer room while already in one.");
+            Task? lastTask;
+            Task newTask;
 
-            Debug.Assert(room.RoomID.Value != null);
+            lock (joinOrLeaveTaskLock)
+            {
+                lastTask = joinOrLeaveTask;
+                joinOrLeaveTask = newTask = Task.Run(async () =>
+                {
+                    if (lastTask != null)
+                        await lastTask;
 
-            apiRoom = room;
-            playlistItemId = room.Playlist.SingleOrDefault()?.ID ?? 0;
+                    // Should be thread-safe since joinOrLeaveTask is locked on in both JoinRoom() and LeaveRoom().
+                    if (Room != null)
+                        throw new InvalidOperationException("Cannot join a multiplayer room while already in one.");
 
-            Room = await JoinRoom(room.RoomID.Value.Value);
+                    Debug.Assert(room.RoomID.Value != null);
 
-            Debug.Assert(Room != null);
+                    // Join the server-side room.
+                    var joinedRoom = await JoinRoom(room.RoomID.Value.Value);
+                    Debug.Assert(joinedRoom != null);
 
-            var users = await getRoomUsers();
-            Debug.Assert(users != null);
+                    // Populate users.
+                    Debug.Assert(joinedRoom.Users != null);
+                    await Task.WhenAll(joinedRoom.Users.Select(PopulateUser));
 
-            await Task.WhenAll(users.Select(PopulateUser));
+                    // Update the stored room (must be done on update thread for thread-safety).
+                    await scheduleAsync(() =>
+                    {
+                        Room = joinedRoom;
+                        apiRoom = room;
+                        playlistItemId = room.Playlist.SingleOrDefault()?.ID ?? 0;
+                    });
 
-            updateLocalRoomSettings(Room.Settings);
+                    // Update room settings.
+                    await updateLocalRoomSettings(joinedRoom.Settings);
+                });
+            }
+
+            await newTask;
         }
 
         /// <summary>
@@ -142,21 +165,35 @@ namespace osu.Game.Online.Multiplayer
         /// <returns>The joined <see cref="MultiplayerRoom"/>.</returns>
         protected abstract Task<MultiplayerRoom> JoinRoom(long roomId);
 
-        public virtual Task LeaveRoom()
+        public virtual async Task LeaveRoom()
         {
-            Scheduler.Add(() =>
+            Task? lastTask;
+            Task newTask;
+
+            lock (joinOrLeaveTaskLock)
             {
-                if (Room == null)
-                    return;
+                lastTask = joinOrLeaveTask;
+                joinOrLeaveTask = newTask = Task.Run(async () =>
+                {
+                    if (lastTask != null)
+                        await lastTask;
 
-                apiRoom = null;
-                Room = null;
-                CurrentMatchPlayingUserIds.Clear();
+                    // Should be thread-safe since joinOrLeaveTask is locked on in both JoinRoom() and LeaveRoom().
+                    if (Room == null)
+                        return;
 
-                RoomUpdated?.Invoke();
-            }, false);
+                    await scheduleAsync(() =>
+                    {
+                        apiRoom = null;
+                        Room = null;
+                        CurrentMatchPlayingUserIds.Clear();
 
-            return Task.CompletedTask;
+                        RoomUpdated?.Invoke();
+                    });
+                });
+            }
+
+            await newTask;
         }
 
         /// <summary>
@@ -432,27 +469,6 @@ namespace osu.Game.Online.Multiplayer
         /// <param name="multiplayerUser">The <see cref="MultiplayerRoomUser"/> to populate.</param>
         protected async Task PopulateUser(MultiplayerRoomUser multiplayerUser) => multiplayerUser.User ??= await userLookupCache.GetUserAsync(multiplayerUser.UserID);
 
-        /// <summary>
-        /// Retrieve a copy of users currently in the joined <see cref="Room"/> in a thread-safe manner.
-        /// This should be used whenever accessing users from outside of an Update thread context (ie. when not calling <see cref="Drawable.Schedule"/>).
-        /// </summary>
-        /// <returns>A copy of users in the current room, or null if unavailable.</returns>
-        private Task<List<MultiplayerRoomUser>?> getRoomUsers()
-        {
-            var tcs = new TaskCompletionSource<List<MultiplayerRoomUser>?>();
-
-            // at some point we probably want to replace all these schedule calls with Room.LockForUpdate.
-            // for now, as this would require quite some consideration due to the number of accesses to the room instance,
-            // let's just add a manual schedule for the non-scheduled usages instead.
-            Scheduler.Add(() =>
-            {
-                var users = Room?.Users.ToList();
-                tcs.SetResult(users);
-            }, false);
-
-            return tcs.Task;
-        }
-
         /// <summary>
         /// Updates the local room settings with the given <see cref="MultiplayerRoomSettings"/>.
         /// </summary>
@@ -460,34 +476,28 @@ namespace osu.Game.Online.Multiplayer
         /// This updates both the joined <see cref="MultiplayerRoom"/> and the respective API <see cref="Room"/>.
         /// </remarks>
         /// <param name="settings">The new <see cref="MultiplayerRoomSettings"/> to update from.</param>
-        private void updateLocalRoomSettings(MultiplayerRoomSettings settings)
+        private Task updateLocalRoomSettings(MultiplayerRoomSettings settings) => scheduleAsync(() =>
         {
             if (Room == null)
                 return;
 
-            Scheduler.Add(() =>
-            {
-                if (Room == null)
-                    return;
+            Debug.Assert(apiRoom != null);
 
-                Debug.Assert(apiRoom != null);
+            // Update a few properties of the room instantaneously.
+            Room.Settings = settings;
+            apiRoom.Name.Value = Room.Settings.Name;
 
-                // Update a few properties of the room instantaneously.
-                Room.Settings = settings;
-                apiRoom.Name.Value = Room.Settings.Name;
+            // The playlist update is delayed until an online beatmap lookup (below) succeeds.
+            // In-order for the client to not display an outdated beatmap, the playlist is forcefully cleared here.
+            apiRoom.Playlist.Clear();
 
-                // The playlist update is delayed until an online beatmap lookup (below) succeeds.
-                // In-order for the client to not display an outdated beatmap, the playlist is forcefully cleared here.
-                apiRoom.Playlist.Clear();
+            RoomUpdated?.Invoke();
 
-                RoomUpdated?.Invoke();
+            var req = new GetBeatmapSetRequest(settings.BeatmapID, BeatmapSetLookupType.BeatmapId);
+            req.Success += res => updatePlaylist(settings, res);
 
-                var req = new GetBeatmapSetRequest(settings.BeatmapID, BeatmapSetLookupType.BeatmapId);
-                req.Success += res => updatePlaylist(settings, res);
-
-                api.Queue(req);
-            }, false);
-        }
+            api.Queue(req);
+        });
 
         private void updatePlaylist(MultiplayerRoomSettings settings, APIBeatmapSet onlineSet)
         {
@@ -534,5 +544,25 @@ namespace osu.Game.Online.Multiplayer
             else
                 CurrentMatchPlayingUserIds.Remove(userId);
         }
+
+        private Task scheduleAsync(Action action)
+        {
+            var tcs = new TaskCompletionSource<bool>();
+
+            Scheduler.Add(() =>
+            {
+                try
+                {
+                    action();
+                    tcs.SetResult(true);
+                }
+                catch (Exception ex)
+                {
+                    tcs.SetException(ex);
+                }
+            });
+
+            return tcs.Task;
+        }
     }
 }

From 5ff76be052a73b95e4aa2b562dfb88055939018b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 20 Jan 2021 19:43:51 +0900
Subject: [PATCH 0992/3722] Fix potential test failures due to timing

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

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
index 7a3845cbf3..6de5704410 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
@@ -101,7 +101,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 });
             });
 
-            AddAssert("multiplayer room joined", () => roomContainer.Client.Room != null);
+            AddUntilStep("multiplayer room joined", () => roomContainer.Client.Room != null);
         }
 
         [Test]
@@ -133,7 +133,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 });
             });
 
-            AddAssert("multiplayer room joined", () => roomContainer.Client.Room != null);
+            AddUntilStep("multiplayer room joined", () => roomContainer.Client.Room != null);
         }
 
         private TestMultiplayerRoomManager createRoomManager()

From e005a1cc9fc72413fe5a6c4592eb867cde860c14 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 20 Jan 2021 20:16:34 +0900
Subject: [PATCH 0993/3722] Remove unnecessary condition blocking the part

---
 osu.Game/Online/Multiplayer/MultiplayerClient.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 50dc8f661c..5d18521eac 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -143,9 +143,6 @@ namespace osu.Game.Online.Multiplayer
                 return;
             }
 
-            if (Room == null)
-                return;
-
             await base.LeaveRoom();
             await connection.InvokeAsync(nameof(IMultiplayerServer.LeaveRoom));
         }

From 6b139d4cf312cb75970a1555dab546d65f8ba898 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 20 Jan 2021 20:21:07 +0900
Subject: [PATCH 0994/3722] Reset task post-execution

---
 .../Multiplayer/StatefulMultiplayerClient.cs  | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 18a63171c4..80162eae59 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -155,7 +155,19 @@ namespace osu.Game.Online.Multiplayer
                 });
             }
 
-            await newTask;
+            try
+            {
+                await newTask;
+            }
+            finally
+            {
+                // The task will be awaited in the future, so reset it so that the user doesn't get into a permanently faulted state if anything fails.
+                lock (joinOrLeaveTask)
+                {
+                    if (joinOrLeaveTask == newTask)
+                        joinOrLeaveTask = null;
+                }
+            }
         }
 
         /// <summary>
@@ -193,7 +205,19 @@ namespace osu.Game.Online.Multiplayer
                 });
             }
 
-            await newTask;
+            try
+            {
+                await newTask;
+            }
+            finally
+            {
+                // The task will be awaited in the future, so reset it so that the user doesn't get into a permanently faulted state if anything fails.
+                lock (joinOrLeaveTask)
+                {
+                    if (joinOrLeaveTask == newTask)
+                        joinOrLeaveTask = null;
+                }
+            }
         }
 
         /// <summary>

From eb85efcea2d79eb8b1750b9d703692e6fb305280 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 20 Jan 2021 20:59:28 +0900
Subject: [PATCH 0995/3722] Add check to playlists too

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

diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index 0948a4d19a..ed47b5d5ac 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -10,6 +10,8 @@ using osu.Framework.Graphics;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Online.Rooms;
+using osu.Game.Overlays.Mods;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.OnlinePlay;
 using osu.Game.Screens.OnlinePlay.Components;
 
@@ -78,5 +80,9 @@ namespace osu.Game.Screens.Select
             item.RequiredMods.Clear();
             item.RequiredMods.AddRange(Mods.Value.Select(m => m.CreateCopy()));
         }
+
+        protected override ModSelectOverlay CreateModSelectOverlay() => new ModSelectOverlay(isValidMod);
+
+        private bool isValidMod(Mod mod) => !(mod is ModAutoplay) && (mod as MultiMod)?.Mods.Any(mm => mm is ModAutoplay) != true;
     }
 }

From bba182a02d10f283d85a876c89530c55247359b6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 20 Jan 2021 21:27:16 +0900
Subject: [PATCH 0996/3722] Fix test failure

---
 .../Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs      | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs
index a4c87d3ace..319c2bc6fd 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs
@@ -11,12 +11,10 @@ using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.OnlinePlay;
-using osu.Game.Screens.OnlinePlay.Match.Components;
 using osu.Game.Screens.OnlinePlay.Playlists;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Users;
@@ -85,8 +83,7 @@ namespace osu.Game.Tests.Visual.Playlists
 
             AddStep("move mouse to create button", () =>
             {
-                var footer = match.ChildrenOfType<Footer>().Single();
-                InputManager.MoveMouseTo(footer.ChildrenOfType<OsuButton>().Single());
+                InputManager.MoveMouseTo(this.ChildrenOfType<PlaylistsMatchSettingsOverlay.CreateRoomButton>().Single());
             });
 
             AddStep("click", () => InputManager.Click(MouseButton.Left));

From ce3c2f07dc8f36d6cfea1af94943cc74093833d7 Mon Sep 17 00:00:00 2001
From: vmaggioli <vinmags16@gmail.com>
Date: Tue, 19 Jan 2021 20:13:21 -0500
Subject: [PATCH 0997/3722] Fix zero length spinners and sliders

---
 .../TestSceneSliderSelectionBlueprint.cs      | 21 +++++++++++++++++++
 .../Sliders/SliderSelectionBlueprint.cs       |  5 ++++-
 .../Timeline/TimelineHitObjectBlueprint.cs    |  2 +-
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
index f6e1be693b..55b3707c38 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
@@ -161,6 +161,27 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             checkControlPointSelected(1, false);
         }
 
+        [Test]
+        public void TestZeroLengthSliderNotAllowed()
+        {
+            moveMouseToControlPoint(1);
+            AddStep("drag control point 1 to control point 0", () =>
+            {
+                InputManager.PressButton(MouseButton.Left);
+                moveMouseToControlPoint(0);
+                InputManager.ReleaseButton(MouseButton.Left);
+            });
+            moveMouseToControlPoint(2);
+            AddStep("drag control point 2 to control point 0", () =>
+            {
+                InputManager.PressButton(MouseButton.Left);
+                moveMouseToControlPoint(0);
+                InputManager.ReleaseButton(MouseButton.Left);
+            });
+            checkPositions();
+
+        }
+
         private void moveHitObject()
         {
             AddStep("move hitobject", () =>
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 3d3dff653a..99edcd2149 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -226,7 +226,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
         private void updatePath()
         {
-            HitObject.Path.ExpectedDistance.Value = composer?.GetSnappedDistanceFromDistance(HitObject.StartTime, (float)HitObject.Path.CalculatedDistance) ?? (float)HitObject.Path.CalculatedDistance;
+            float expectedDistance = composer?.GetSnappedDistanceFromDistance(HitObject.StartTime, (float)HitObject.Path.CalculatedDistance) ?? (float)HitObject.Path.CalculatedDistance;
+            if (expectedDistance < 1)
+                return;
+            HitObject.Path.ExpectedDistance.Value = expectedDistance;
             editorBeatmap?.Update(HitObject);
         }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index ae2a82fa10..1dc37510ad 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -387,7 +387,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         case IHasDuration endTimeHitObject:
                             var snappedTime = Math.Max(hitObject.StartTime, beatSnapProvider.SnapTime(time));
 
-                            if (endTimeHitObject.EndTime == snappedTime)
+                            if (endTimeHitObject.EndTime == snappedTime || (snappedTime - hitObject.StartTime) < 1)
                                 return;
 
                             endTimeHitObject.Duration = snappedTime - hitObject.StartTime;

From d42773ebb2b731e93b03feab519fa951cbc60421 Mon Sep 17 00:00:00 2001
From: vmaggioli <Vince.Maggioli@philips.com>
Date: Wed, 20 Jan 2021 12:36:31 -0500
Subject: [PATCH 0998/3722] Fix preceeding space

---
 .../Editor/TestSceneSliderSelectionBlueprint.cs                  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
index 55b3707c38..ce1c13dac5 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
@@ -179,7 +179,6 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                 InputManager.ReleaseButton(MouseButton.Left);
             });
             checkPositions();
-
         }
 
         private void moveHitObject()

From 5ee3a5f230435a166c85fdb8d542f4dc34be1f91 Mon Sep 17 00:00:00 2001
From: vmaggioli <Vince.Maggioli@philips.com>
Date: Wed, 20 Jan 2021 13:00:25 -0500
Subject: [PATCH 0999/3722] Use AlmostEquals

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

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 1dc37510ad..301543b3c1 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
+using osu.Framework.Utils;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
@@ -387,7 +388,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         case IHasDuration endTimeHitObject:
                             var snappedTime = Math.Max(hitObject.StartTime, beatSnapProvider.SnapTime(time));
 
-                            if (endTimeHitObject.EndTime == snappedTime || (snappedTime - hitObject.StartTime) < 1)
+                            if (endTimeHitObject.EndTime == snappedTime || Precision.AlmostEquals(snappedTime, hitObject.StartTime, 1))
                                 return;
 
                             endTimeHitObject.Duration = snappedTime - hitObject.StartTime;

From 7abe33ad0e2df62efe586788e8963b0fe10f869d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 20 Jan 2021 23:23:12 +0100
Subject: [PATCH 1000/3722] Add failing test case

---
 .../Gameplay/TestScenePoolingRuleset.cs       | 75 +++++++++++++++++--
 1 file changed, 69 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs
index cd7d692b0a..17a009a2ce 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePoolingRuleset.cs
@@ -17,10 +17,12 @@ using osu.Framework.Utils;
 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.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Legacy;
+using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.UI;
 using osuTK;
 using osuTK.Graphics;
@@ -129,6 +131,31 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("no DHOs shown", () => !this.ChildrenOfType<DrawableTestHitObject>().Any());
         }
 
+        [Test]
+        public void TestApplyHitResultOnKilled()
+        {
+            ManualClock clock = null;
+            bool anyJudged = false;
+
+            void onNewResult(JudgementResult _) => anyJudged = true;
+
+            var beatmap = new Beatmap();
+            beatmap.HitObjects.Add(new TestKilledHitObject { Duration = 20 });
+
+            createTest(beatmap, 10, () => new FramedClock(clock = new ManualClock()));
+
+            AddStep("subscribe to new result", () =>
+            {
+                anyJudged = false;
+                drawableRuleset.NewResult += onNewResult;
+            });
+            AddStep("skip past object", () => clock.CurrentTime = beatmap.HitObjects[0].GetEndTime() + 1000);
+
+            AddAssert("object judged", () => anyJudged);
+
+            AddStep("clean up", () => drawableRuleset.NewResult -= onNewResult);
+        }
+
         private void createTest(IBeatmap beatmap, int poolSize, Func<IFrameBasedClock> createClock = null) => AddStep("create test", () =>
         {
             var ruleset = new TestPoolingRuleset();
@@ -192,6 +219,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             private void load()
             {
                 RegisterPool<TestHitObject, DrawableTestHitObject>(poolSize);
+                RegisterPool<TestKilledHitObject, DrawableTestKilledHitObject>(poolSize);
             }
 
             protected override HitObjectLifetimeEntry CreateLifetimeEntry(HitObject hitObject) => new TestHitObjectLifetimeEntry(hitObject);
@@ -220,19 +248,30 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             protected override IEnumerable<TestHitObject> ConvertHitObject(HitObject original, IBeatmap beatmap, CancellationToken cancellationToken)
             {
-                yield return new TestHitObject
+                switch (original)
                 {
-                    StartTime = original.StartTime,
-                    Duration = 250
-                };
+                    case TestKilledHitObject h:
+                        yield return h;
+
+                        break;
+
+                    default:
+                        yield return new TestHitObject
+                        {
+                            StartTime = original.StartTime,
+                            Duration = 250
+                        };
+
+                        break;
+                }
             }
         }
 
         #endregion
 
-        #region HitObject
+        #region HitObjects
 
-        private class TestHitObject : ConvertHitObject
+        private class TestHitObject : ConvertHitObject, IHasDuration
         {
             public double EndTime => StartTime + Duration;
 
@@ -287,6 +326,30 @@ namespace osu.Game.Tests.Visual.Gameplay
             }
         }
 
+        private class TestKilledHitObject : TestHitObject
+        {
+        }
+
+        private class DrawableTestKilledHitObject : DrawableHitObject<TestKilledHitObject>
+        {
+            public DrawableTestKilledHitObject()
+                : base(null)
+            {
+            }
+
+            protected override void UpdateHitStateTransforms(ArmedState state)
+            {
+                base.UpdateHitStateTransforms(state);
+                Expire();
+            }
+
+            public override void OnKilled()
+            {
+                base.OnKilled();
+                ApplyResult(r => r.Type = r.Judgement.MinResult);
+            }
+        }
+
         #endregion
     }
 }

From 1d9aaac2c221a4e507df4019076f080e74f1a0b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 20 Jan 2021 23:55:54 +0100
Subject: [PATCH 1001/3722] Fix HOC not propagating DHO results applied on kill

`DrawableHitObject.OnKilled()` calls `UpdateResult()` to clean up a
hitobject's state definitively with regards to the judgement result
before returning the DHO back to the pool.

As it turns out, if a consumer was relying on this code path (as taiko
was in the case of nested strong hit objects), it would not work
properly with pooling, due to `HitObjectContainer` unsubscribing from
`On{New,Revert}Result` *before* calling the DHO's `OnKilled()`.

This in turn would lead to users potentially getting stuck in gameplay,
due to `ScoreProcessor` not receiving all results via that event path.

To resolve, change the call ordering to allow hit result changes applied
in `OnKilled()` to propagate normally.
---
 osu.Game/Rulesets/UI/HitObjectContainer.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 12e39d4fbf..1972043ccb 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -124,9 +124,11 @@ namespace osu.Game.Rulesets.UI
             Debug.Assert(drawableMap.ContainsKey(entry));
 
             var drawable = drawableMap[entry];
+
+            // OnKilled can potentially change the hitobject's result, so it needs to run first before unbinding.
+            drawable.OnKilled();
             drawable.OnNewResult -= onNewResult;
             drawable.OnRevertResult -= onRevertResult;
-            drawable.OnKilled();
 
             drawableMap.Remove(entry);
 

From 76e1f6e57bbd27297a320b64cbb27dcbdad6c85a Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 21 Jan 2021 12:45:44 +0900
Subject: [PATCH 1002/3722] Fix locking on incorrect object
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/Online/Multiplayer/StatefulMultiplayerClient.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 80162eae59..f2b5a44fcf 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -162,7 +162,7 @@ namespace osu.Game.Online.Multiplayer
             finally
             {
                 // The task will be awaited in the future, so reset it so that the user doesn't get into a permanently faulted state if anything fails.
-                lock (joinOrLeaveTask)
+                lock (joinOrLeaveTaskLock)
                 {
                     if (joinOrLeaveTask == newTask)
                         joinOrLeaveTask = null;
@@ -212,7 +212,7 @@ namespace osu.Game.Online.Multiplayer
             finally
             {
                 // The task will be awaited in the future, so reset it so that the user doesn't get into a permanently faulted state if anything fails.
-                lock (joinOrLeaveTask)
+                lock (joinOrLeaveTaskLock)
                 {
                     if (joinOrLeaveTask == newTask)
                         joinOrLeaveTask = null;

From 163a937e415b21b4f92d84675aae2a27f57e70c9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 21 Jan 2021 13:30:53 +0900
Subject: [PATCH 1003/3722] Fix mod test failing intermittently

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

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 0d0acbb8f4..bb72226750 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -134,6 +134,8 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Test]
         public void TestExternallySetCustomizedMod()
         {
+            changeRuleset(0);
+
             AddStep("set customized mod externally", () => SelectedMods.Value = new[] { new OsuModDoubleTime { SpeedChange = { Value = 1.01 } } });
 
             AddAssert("ensure button is selected and customized accordingly", () =>

From 65ece1aa722b74e6590b4b3d208a10141238164d Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 21 Jan 2021 07:50:41 +0300
Subject: [PATCH 1004/3722] Mark OverlayHeader as NotNull in FullscreenOverlay

---
 osu.Game/Overlays/FullscreenOverlay.cs |  8 ++++---
 osu.Game/Overlays/OnlineOverlay.cs     | 32 ++++++++++++--------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Overlays/FullscreenOverlay.cs b/osu.Game/Overlays/FullscreenOverlay.cs
index d65213f573..d0a0c994aa 100644
--- a/osu.Game/Overlays/FullscreenOverlay.cs
+++ b/osu.Game/Overlays/FullscreenOverlay.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 JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -16,9 +17,9 @@ namespace osu.Game.Overlays
     public abstract class FullscreenOverlay<T> : WaveOverlayContainer, INamedOverlayComponent
         where T : OverlayHeader
     {
-        public virtual string IconTexture => Header?.Title.IconTexture ?? string.Empty;
-        public virtual string Title => Header?.Title.Title ?? string.Empty;
-        public virtual string Description => Header?.Title.Description ?? string.Empty;
+        public virtual string IconTexture => Header.Title.IconTexture ?? string.Empty;
+        public virtual string Title => Header.Title.Title ?? string.Empty;
+        public virtual string Description => Header.Title.Description ?? string.Empty;
 
         public T Header { get; }
 
@@ -76,6 +77,7 @@ namespace osu.Game.Overlays
             Waves.FourthWaveColour = ColourProvider.Dark3;
         }
 
+        [NotNull]
         protected abstract T CreateHeader();
 
         protected virtual Color4 GetBackgroundColour() => ColourProvider.Background5;
diff --git a/osu.Game/Overlays/OnlineOverlay.cs b/osu.Game/Overlays/OnlineOverlay.cs
index b44ccc32c9..4a7318d065 100644
--- a/osu.Game/Overlays/OnlineOverlay.cs
+++ b/osu.Game/Overlays/OnlineOverlay.cs
@@ -19,29 +19,27 @@ namespace osu.Game.Overlays
         protected OnlineOverlay(OverlayColourScheme colourScheme)
             : base(colourScheme)
         {
-            FillFlowContainer flow = new FillFlowContainer
-            {
-                AutoSizeAxes = Axes.Y,
-                RelativeSizeAxes = Axes.X,
-                Direction = FillDirection.Vertical
-            };
-
-            if (Header != null)
-                flow.Add(Header.With(h => h.Depth = -float.MaxValue));
-
-            flow.Add(content = new Container
-            {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y
-            });
-
             base.Content.AddRange(new Drawable[]
             {
                 ScrollFlow = new OverlayScrollContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     ScrollbarVisible = false,
-                    Child = flow
+                    Child = new FillFlowContainer
+                    {
+                        AutoSizeAxes = Axes.Y,
+                        RelativeSizeAxes = Axes.X,
+                        Direction = FillDirection.Vertical,
+                        Children = new Drawable[]
+                        {
+                            Header.With(h => h.Depth = -float.MaxValue),
+                            content = new Container
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y
+                            }
+                        }
+                    }
                 },
                 Loading = new LoadingLayer(true)
             });

From 54dbb43f79a758e73e4782c1364e2405384a82c4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 21 Jan 2021 14:03:35 +0900
Subject: [PATCH 1005/3722] Fix more potential failures

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

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index bb72226750..bd4010a7f3 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -40,6 +40,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
+            SelectedMods.Value = Array.Empty<Mod>();
             Children = new Drawable[]
             {
                 modSelect = new TestModSelectOverlay

From 0fcf61d352197ef5f4d8e10d8bf1d19d55c266b0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Jan 2021 14:07:02 +0900
Subject: [PATCH 1006/3722] Replace null check with assert

---
 osu.Game/Graphics/Containers/SectionsContainer.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index b5f81c516a..d378b67acf 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
@@ -131,13 +132,13 @@ namespace osu.Game.Graphics.Containers
         public override void Add(T drawable)
         {
             base.Add(drawable);
+
+            Debug.Assert(drawable != null);
+
             lastKnownScroll = float.NaN;
             headerHeight = float.NaN;
             footerHeight = float.NaN;
 
-            if (drawable == null)
-                return;
-
             if (smallestSection == null || smallestSection.Height > drawable.Height)
                 smallestSection = drawable;
         }

From 8f9089d1aefa26c90a883e226dcce91b9cabfd8e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Jan 2021 14:30:22 +0900
Subject: [PATCH 1007/3722] Move constant to a better place

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

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index d378b67acf..fd8b98e767 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -109,6 +109,8 @@ namespace osu.Game.Graphics.Containers
 
         private float lastKnownScroll;
 
+        private const float scroll_target_multiplier = 0.2f;
+
         public SectionsContainer()
         {
             AddRangeInternal(new Drawable[]
@@ -143,8 +145,6 @@ namespace osu.Game.Graphics.Containers
                 smallestSection = drawable;
         }
 
-        private const float scroll_target_multiplier = 0.2f;
-
         public void ScrollTo(Drawable section)
         {
             lastClickedSection = section;

From 555abcdc3695c437efe3277fc738e54b637fe235 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Jan 2021 14:31:31 +0900
Subject: [PATCH 1008/3722] Replace nan usage with nullable float

---
 .../Graphics/Containers/SectionsContainer.cs  | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index fd8b98e767..2140e251f8 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Graphics.Containers
                 if (value == null) return;
 
                 AddInternal(expandableHeader);
-                lastKnownScroll = float.NaN;
+                lastKnownScroll = null;
             }
         }
 
@@ -56,7 +56,7 @@ namespace osu.Game.Graphics.Containers
                 if (value == null) return;
 
                 AddInternal(fixedHeader);
-                lastKnownScroll = float.NaN;
+                lastKnownScroll = null;
             }
         }
 
@@ -75,7 +75,7 @@ namespace osu.Game.Graphics.Containers
                 footer.Anchor |= Anchor.y2;
                 footer.Origin |= Anchor.y2;
                 scrollContainer.Add(footer);
-                lastKnownScroll = float.NaN;
+                lastKnownScroll = null;
             }
         }
 
@@ -93,7 +93,7 @@ namespace osu.Game.Graphics.Containers
 
                 headerBackgroundContainer.Add(headerBackground);
 
-                lastKnownScroll = float.NaN;
+                lastKnownScroll = null;
             }
         }
 
@@ -105,9 +105,9 @@ namespace osu.Game.Graphics.Containers
         private Drawable expandableHeader, fixedHeader, footer, headerBackground;
         private FlowContainer<T> scrollContentContainer;
 
-        private float headerHeight, footerHeight;
+        private float? headerHeight, footerHeight;
 
-        private float lastKnownScroll;
+        private float? lastKnownScroll;
 
         private const float scroll_target_multiplier = 0.2f;
 
@@ -137,9 +137,9 @@ namespace osu.Game.Graphics.Containers
 
             Debug.Assert(drawable != null);
 
-            lastKnownScroll = float.NaN;
-            headerHeight = float.NaN;
-            footerHeight = float.NaN;
+            lastKnownScroll = null;
+            headerHeight = null;
+            footerHeight = null;
 
             if (smallestSection == null || smallestSection.Height > drawable.Height)
                 smallestSection = drawable;
@@ -171,7 +171,7 @@ namespace osu.Game.Graphics.Containers
 
             if (source == InvalidationSource.Child && (invalidation & Invalidation.DrawSize) != 0)
             {
-                lastKnownScroll = -1;
+                lastKnownScroll = null;
                 result = true;
             }
 
@@ -242,8 +242,9 @@ namespace osu.Game.Graphics.Containers
             if (!Children.Any()) return;
 
             var newMargin = originalSectionsMargin;
-            newMargin.Top += headerHeight;
-            newMargin.Bottom += footerHeight;
+
+            newMargin.Top += (headerHeight ?? 0);
+            newMargin.Bottom += (footerHeight ?? 0);
 
             scrollContentContainer.Margin = newMargin;
         }

From 6d167b7865688b4f73cb94106fbbe233e739ce40 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Jan 2021 14:40:55 +0900
Subject: [PATCH 1009/3722] Remove the need to store the smallest section

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

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index 2140e251f8..6607193cc6 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -23,7 +23,6 @@ namespace osu.Game.Graphics.Containers
     {
         public Bindable<T> SelectedSection { get; } = new Bindable<T>();
         private Drawable lastClickedSection;
-        private T smallestSection;
 
         public Drawable ExpandableHeader
         {
@@ -140,9 +139,6 @@ namespace osu.Game.Graphics.Containers
             lastKnownScroll = null;
             headerHeight = null;
             footerHeight = null;
-
-            if (smallestSection == null || smallestSection.Height > drawable.Height)
-                smallestSection = drawable;
         }
 
         public void ScrollTo(Drawable section)
@@ -213,10 +209,12 @@ namespace osu.Game.Graphics.Containers
                 headerBackgroundContainer.Height = (ExpandableHeader?.LayoutSize.Y ?? 0) + (FixedHeader?.LayoutSize.Y ?? 0);
                 headerBackgroundContainer.Y = ExpandableHeader?.Y ?? 0;
 
+                var smallestSectionHeight = Children.Count > 0 ? Children.Min(d => d.Height) : 0;
+
                 // scroll offset is our fixed header height if we have it plus 20% of content height
                 // plus 5% to fix floating point errors and to not have a section instantly unselect when scrolling upwards
                 // but the 5% can't be bigger than our smallest section height, otherwise it won't get selected correctly
-                float sectionOrContent = Math.Min(smallestSection?.Height / 2.0f ?? 0, scrollContainer.DisplayableContent * 0.05f);
+                float sectionOrContent = Math.Min(smallestSectionHeight / 2.0f, scrollContainer.DisplayableContent * 0.05f);
                 float scrollOffset = (FixedHeader?.LayoutSize.Y ?? 0) + scrollContainer.DisplayableContent * scroll_target_multiplier + sectionOrContent;
                 Func<T, float> diff = section => scrollContainer.GetChildPosInContent(section) - currentScroll - scrollOffset;
 

From e5eec27e9574037e13287b11438c044d8cc1c0da Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Jan 2021 14:44:47 +0900
Subject: [PATCH 1010/3722] Simplify selected section resolution

---
 osu.Game/Graphics/Containers/SectionsContainer.cs | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index 6607193cc6..cae2dd7e37 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -215,23 +215,16 @@ namespace osu.Game.Graphics.Containers
                 // plus 5% to fix floating point errors and to not have a section instantly unselect when scrolling upwards
                 // but the 5% can't be bigger than our smallest section height, otherwise it won't get selected correctly
                 float sectionOrContent = Math.Min(smallestSectionHeight / 2.0f, scrollContainer.DisplayableContent * 0.05f);
+
                 float scrollOffset = (FixedHeader?.LayoutSize.Y ?? 0) + scrollContainer.DisplayableContent * scroll_target_multiplier + sectionOrContent;
                 Func<T, float> diff = section => scrollContainer.GetChildPosInContent(section) - currentScroll - scrollOffset;
 
                 if (Precision.AlmostBigger(0, scrollContainer.Current))
-                {
                     SelectedSection.Value = lastClickedSection as T ?? Children.FirstOrDefault();
-                    return;
-                }
-
-                if (Precision.AlmostBigger(scrollContainer.Current, scrollContainer.ScrollableExtent))
-                {
+                else if (Precision.AlmostBigger(scrollContainer.Current, scrollContainer.ScrollableExtent))
                     SelectedSection.Value = lastClickedSection as T ?? Children.LastOrDefault();
-                    return;
-                }
-
-                SelectedSection.Value = Children.TakeWhile(section => diff(section) <= 0).LastOrDefault()
-                                        ?? Children.FirstOrDefault();
+                else
+                    SelectedSection.Value = Children.TakeWhile(section => diff(section) <= 0).LastOrDefault() ?? Children.FirstOrDefault();
             }
         }
 

From a85f952a381ca32869e06a16a23c149955a88dbc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Jan 2021 14:46:35 +0900
Subject: [PATCH 1011/3722] Inline single use function

---
 osu.Game/Graphics/Containers/SectionsContainer.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index cae2dd7e37..cf361abadc 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -217,14 +217,17 @@ namespace osu.Game.Graphics.Containers
                 float sectionOrContent = Math.Min(smallestSectionHeight / 2.0f, scrollContainer.DisplayableContent * 0.05f);
 
                 float scrollOffset = (FixedHeader?.LayoutSize.Y ?? 0) + scrollContainer.DisplayableContent * scroll_target_multiplier + sectionOrContent;
-                Func<T, float> diff = section => scrollContainer.GetChildPosInContent(section) - currentScroll - scrollOffset;
 
                 if (Precision.AlmostBigger(0, scrollContainer.Current))
                     SelectedSection.Value = lastClickedSection as T ?? Children.FirstOrDefault();
                 else if (Precision.AlmostBigger(scrollContainer.Current, scrollContainer.ScrollableExtent))
                     SelectedSection.Value = lastClickedSection as T ?? Children.LastOrDefault();
                 else
-                    SelectedSection.Value = Children.TakeWhile(section => diff(section) <= 0).LastOrDefault() ?? Children.FirstOrDefault();
+                {
+                    SelectedSection.Value = Children
+                                            .TakeWhile(section => scrollContainer.GetChildPosInContent(section) - currentScroll - scrollOffset <= 0)
+                                            .LastOrDefault() ?? Children.FirstOrDefault();
+                }
             }
         }
 

From 9daf29fedcb0b4e74a7a3d17579557c68fd4723a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Jan 2021 14:52:41 +0900
Subject: [PATCH 1012/3722] Extract out commonly used variables

---
 osu.Game/Graphics/Containers/SectionsContainer.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index cf361abadc..5afe74db18 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -178,7 +178,10 @@ namespace osu.Game.Graphics.Containers
         {
             base.UpdateAfterChildren();
 
-            float headerH = (ExpandableHeader?.LayoutSize.Y ?? 0) + (FixedHeader?.LayoutSize.Y ?? 0);
+            float fixedHeaderSize = (FixedHeader?.LayoutSize.Y ?? 0);
+            float expandableHeaderSize = ExpandableHeader?.LayoutSize.Y ?? 0;
+
+            float headerH = expandableHeaderSize + fixedHeaderSize;
             float footerH = Footer?.LayoutSize.Y ?? 0;
 
             if (headerH != headerHeight || footerH != footerHeight)
@@ -200,13 +203,13 @@ namespace osu.Game.Graphics.Containers
 
                 if (ExpandableHeader != null && FixedHeader != null)
                 {
-                    float offset = Math.Min(ExpandableHeader.LayoutSize.Y, currentScroll);
+                    float offset = Math.Min(expandableHeaderSize, currentScroll);
 
                     ExpandableHeader.Y = -offset;
-                    FixedHeader.Y = -offset + ExpandableHeader.LayoutSize.Y;
+                    FixedHeader.Y = -offset + expandableHeaderSize;
                 }
 
-                headerBackgroundContainer.Height = (ExpandableHeader?.LayoutSize.Y ?? 0) + (FixedHeader?.LayoutSize.Y ?? 0);
+                headerBackgroundContainer.Height = expandableHeaderSize + fixedHeaderSize;
                 headerBackgroundContainer.Y = ExpandableHeader?.Y ?? 0;
 
                 var smallestSectionHeight = Children.Count > 0 ? Children.Min(d => d.Height) : 0;
@@ -216,7 +219,7 @@ namespace osu.Game.Graphics.Containers
                 // but the 5% can't be bigger than our smallest section height, otherwise it won't get selected correctly
                 float sectionOrContent = Math.Min(smallestSectionHeight / 2.0f, scrollContainer.DisplayableContent * 0.05f);
 
-                float scrollOffset = (FixedHeader?.LayoutSize.Y ?? 0) + scrollContainer.DisplayableContent * scroll_target_multiplier + sectionOrContent;
+                float scrollOffset = fixedHeaderSize + scrollContainer.DisplayableContent * scroll_target_multiplier + sectionOrContent;
 
                 if (Precision.AlmostBigger(0, scrollContainer.Current))
                     SelectedSection.Value = lastClickedSection as T ?? Children.FirstOrDefault();

From c650cbd2a70f1f333d2fc3b159a1ca10ace61fca Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Jan 2021 14:56:10 +0900
Subject: [PATCH 1013/3722] Rename variable to something slightly better

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

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index 5afe74db18..87c3007ca4 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -217,9 +217,9 @@ namespace osu.Game.Graphics.Containers
                 // scroll offset is our fixed header height if we have it plus 20% of content height
                 // plus 5% to fix floating point errors and to not have a section instantly unselect when scrolling upwards
                 // but the 5% can't be bigger than our smallest section height, otherwise it won't get selected correctly
-                float sectionOrContent = Math.Min(smallestSectionHeight / 2.0f, scrollContainer.DisplayableContent * 0.05f);
+                float scrollIntoSectionAmount = Math.Min(smallestSectionHeight / 2.0f, scrollContainer.DisplayableContent * 0.05f);
 
-                float scrollOffset = fixedHeaderSize + scrollContainer.DisplayableContent * scroll_target_multiplier + sectionOrContent;
+                float scrollOffset = fixedHeaderSize + scrollContainer.DisplayableContent * scroll_target_multiplier + scrollIntoSectionAmount;
 
                 if (Precision.AlmostBigger(0, scrollContainer.Current))
                     SelectedSection.Value = lastClickedSection as T ?? Children.FirstOrDefault();

From 8853ac04d97e2419da6b4f2db2a464d680173d3b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Jan 2021 15:08:36 +0900
Subject: [PATCH 1014/3722] Rename some variable and add xmldoc for scroll
 centre position

---
 osu.Game/Graphics/Containers/SectionsContainer.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index 87c3007ca4..6ed161fa77 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -108,7 +108,10 @@ namespace osu.Game.Graphics.Containers
 
         private float? lastKnownScroll;
 
-        private const float scroll_target_multiplier = 0.2f;
+        /// <summary>
+        /// The percentage of the container to consider the centre-point for deciding the active section (and scrolling to a requested section).
+        /// </summary>
+        private const float scroll_y_centre = 0.2f;
 
         public SectionsContainer()
         {
@@ -144,7 +147,7 @@ namespace osu.Game.Graphics.Containers
         public void ScrollTo(Drawable section)
         {
             lastClickedSection = section;
-            scrollContainer.ScrollTo(scrollContainer.GetChildPosInContent(section) - scrollContainer.DisplayableContent * scroll_target_multiplier - (FixedHeader?.BoundingBox.Height ?? 0));
+            scrollContainer.ScrollTo(scrollContainer.GetChildPosInContent(section) - scrollContainer.DisplayableContent * scroll_y_centre - (FixedHeader?.BoundingBox.Height ?? 0));
         }
 
         public void ScrollToTop() => scrollContainer.ScrollTo(0);
@@ -217,9 +220,9 @@ namespace osu.Game.Graphics.Containers
                 // scroll offset is our fixed header height if we have it plus 20% of content height
                 // plus 5% to fix floating point errors and to not have a section instantly unselect when scrolling upwards
                 // but the 5% can't be bigger than our smallest section height, otherwise it won't get selected correctly
-                float scrollIntoSectionAmount = Math.Min(smallestSectionHeight / 2.0f, scrollContainer.DisplayableContent * 0.05f);
+                float selectionLenienceAboveSection = Math.Min(smallestSectionHeight / 2.0f, scrollContainer.DisplayableContent * 0.05f);
 
-                float scrollOffset = fixedHeaderSize + scrollContainer.DisplayableContent * scroll_target_multiplier + scrollIntoSectionAmount;
+                float scrollCentre = fixedHeaderSize + scrollContainer.DisplayableContent * scroll_y_centre + selectionLenienceAboveSection;
 
                 if (Precision.AlmostBigger(0, scrollContainer.Current))
                     SelectedSection.Value = lastClickedSection as T ?? Children.FirstOrDefault();
@@ -228,7 +231,7 @@ namespace osu.Game.Graphics.Containers
                 else
                 {
                     SelectedSection.Value = Children
-                                            .TakeWhile(section => scrollContainer.GetChildPosInContent(section) - currentScroll - scrollOffset <= 0)
+                                            .TakeWhile(section => scrollContainer.GetChildPosInContent(section) - currentScroll - scrollCentre <= 0)
                                             .LastOrDefault() ?? Children.FirstOrDefault();
                 }
             }

From e6980688f60fd9d6b9e6489f2879eb397a50218f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 21 Jan 2021 15:42:23 +0900
Subject: [PATCH 1015/3722] Leave the multiplayer channel when leaving
 multiplayer

---
 osu.Game/Online/Chat/ChannelManager.cs                 | 10 +++++++---
 .../OnlinePlay/Match/Components/MatchChatDisplay.cs    |  6 ++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/Chat/ChannelManager.cs b/osu.Game/Online/Chat/ChannelManager.cs
index 62ae507419..036ec4d0f3 100644
--- a/osu.Game/Online/Chat/ChannelManager.cs
+++ b/osu.Game/Online/Chat/ChannelManager.cs
@@ -339,7 +339,7 @@ namespace osu.Game.Online.Chat
         }
 
         /// <summary>
-        /// Joins a channel if it has not already been joined.
+        /// Joins a channel if it has not already been joined. Must be called from the update thread.
         /// </summary>
         /// <param name="channel">The channel to join.</param>
         /// <returns>The joined channel. Note that this may not match the parameter channel as it is a backed object.</returns>
@@ -399,7 +399,11 @@ namespace osu.Game.Online.Chat
             return channel;
         }
 
-        public void LeaveChannel(Channel channel)
+        /// <summary>
+        /// Leave the specified channel. Can be called from any thread.
+        /// </summary>
+        /// <param name="channel">The channel to leave.</param>
+        public void LeaveChannel(Channel channel) => Schedule(() =>
         {
             if (channel == null) return;
 
@@ -413,7 +417,7 @@ namespace osu.Game.Online.Chat
                 api.Queue(new LeaveChannelRequest(channel));
                 channel.Joined.Value = false;
             }
-        }
+        });
 
         private long lastMessageId;
 
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
index 8800215c2e..6da2866236 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
@@ -38,5 +38,11 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
 
             Channel.Value = channelManager?.JoinChannel(new Channel { Id = channelId.Value, Type = ChannelType.Multiplayer, Name = $"#lazermp_{roomId.Value}" });
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            channelManager?.LeaveChannel(Channel.Value);
+        }
     }
 }

From 9eb74e86edacd10d0f8fa8facf4f7f0045c4ca5c Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 21 Jan 2021 17:40:15 +0900
Subject: [PATCH 1016/3722] Apply comment suggestion
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/Edit/Compose/Components/Timeline/Timeline.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 7df4f1ae7d..e215ecc17a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -151,7 +151,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 // 2) The user changes the track time through some other means (scrolling in the editor or overview timeline; clicking a hitobject etc.). We want the timeline to track the clock's time.
                 // 3) An ongoing seek transform is running from an external seek. We want the timeline to track the clock's time.
 
-                // The simplest way to cover both cases is by checking whether the scroll position has changed and the audio hasn't been changed externally
+                // The simplest way to cover the first two cases is by checking whether the scroll position has changed and the audio hasn't been changed externally
                 // Checking IsSeeking covers the third case, where the transform may not have been applied yet.
                 if (Current != lastScrollPosition && editorClock.CurrentTime == lastTrackTime && !editorClock.IsSeeking)
                     seekTrackToCurrent();

From 153149554bdb5c7ba44b57d6bc75acda7cfc1763 Mon Sep 17 00:00:00 2001
From: Susko3 <16479013+Susko3@users.noreply.github.com>
Date: Thu, 21 Jan 2021 16:25:16 +0100
Subject: [PATCH 1017/3722] add more mime types

---
 osu.Android/OsuGameActivity.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index 788e5f82be..48b059b482 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -20,7 +20,8 @@ namespace osu.Android
     [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false, LaunchMode = LaunchMode.SingleInstance)]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPattern = ".*\\\\.osz", DataHost = "*", DataMimeType = "*/*")]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPattern = ".*\\\\.osk", DataHost = "*", DataMimeType = "*/*")]
-    [IntentFilter(new[] { Intent.ActionSend, Intent.ActionSendMultiple }, Categories = new[] { Intent.CategoryDefault }, DataMimeTypes = new[] { "application/zip", "application/octet-stream" })]
+    [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataMimeTypes = new[] { "application/x-osu-beatmap", "application/x-osu-skin" })]
+    [IntentFilter(new[] { Intent.ActionSend, Intent.ActionSendMultiple }, Categories = new[] { Intent.CategoryDefault }, DataMimeTypes = new[] { "application/x-osu-beatmap", "application/x-osu-skin", "application/zip", "application/octet-stream", "application/x-zip", "application/x-zip-compressed" })]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryBrowsable, Intent.CategoryDefault }, DataSchemes = new[] { "osu", "osump" })]
     public class OsuGameActivity : AndroidGameActivity
     {

From e4b59c7317b7788f03b184ccc900aee717153658 Mon Sep 17 00:00:00 2001
From: vmaggioli <Vince.Maggioli@philips.com>
Date: Thu, 21 Jan 2021 11:54:26 -0500
Subject: [PATCH 1018/3722] Test setup

---
 .../TestSceneTimelineHitObjectBlueprint.cs    | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
new file mode 100644
index 0000000000..ed427c2020
--- /dev/null
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Screens.Edit.Compose.Components.Timeline;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Editing
+{
+    public class TestSceneTimelineHitObjectBlueprint : TimelineTestScene
+    {
+        private Spinner spinner;
+        private TimelineHitObjectBlueprint blueprint;
+
+        public TestSceneTimelineHitObjectBlueprint()
+        {
+            var spinner = new Spinner
+            {
+                Position = new Vector2(256, 256),
+                StartTime = -1000,
+                EndTime = 2000
+            };
+
+            spinner.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { CircleSize = 2 });
+            Add(new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Size = new Vector2(0.5f),
+                Child = _ = new DrawableSpinner(spinner)
+            });
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            Clock.Seek(10000);
+        }
+
+        public override Drawable CreateTestComponent() => blueprint = new TimelineHitObjectBlueprint(spinner);
+
+        [Test]
+        public void TestDisallowZeroLengthSpinners()
+        {
+
+        }
+    }
+}

From 05d3914fee2d9365577a2bf2fb8cd25fc0e11a17 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 21 Jan 2021 21:26:33 +0300
Subject: [PATCH 1019/3722] Rename friends tooltip to followers

---
 osu.Game/Overlays/Profile/Header/Components/AddFriendButton.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Profile/Header/Components/AddFriendButton.cs b/osu.Game/Overlays/Profile/Header/Components/AddFriendButton.cs
index 6c2b2dc16a..7080a578d0 100644
--- a/osu.Game/Overlays/Profile/Header/Components/AddFriendButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/AddFriendButton.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
     {
         public readonly Bindable<User> User = new Bindable<User>();
 
-        public override string TooltipText => "friends";
+        public override string TooltipText => "followers";
 
         private OsuSpriteText followerText;
 

From 2aa1df9ea4b5d95bdaa44b956d55f8de2eecf9ea Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 21 Jan 2021 21:38:52 +0300
Subject: [PATCH 1020/3722] Implement ProfileHeaderStatisticsButton component

---
 .../Header/Components/AddFriendButton.cs      | 38 ++------------
 .../ProfileHeaderStatisticsButton.cs          | 52 +++++++++++++++++++
 2 files changed, 55 insertions(+), 35 deletions(-)
 create mode 100644 osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs

diff --git a/osu.Game/Overlays/Profile/Header/Components/AddFriendButton.cs b/osu.Game/Overlays/Profile/Header/Components/AddFriendButton.cs
index 7080a578d0..ac05511132 100644
--- a/osu.Game/Overlays/Profile/Header/Components/AddFriendButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/AddFriendButton.cs
@@ -3,58 +3,26 @@
 
 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;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Users;
-using osuTK;
 
 namespace osu.Game.Overlays.Profile.Header.Components
 {
-    public class AddFriendButton : ProfileHeaderButton
+    public class AddFriendButton : ProfileHeaderStatisticsButton
     {
         public readonly Bindable<User> User = new Bindable<User>();
 
         public override string TooltipText => "followers";
 
-        private OsuSpriteText followerText;
+        protected override IconUsage CreateIcon() => FontAwesome.Solid.User;
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            Child = new FillFlowContainer
-            {
-                AutoSizeAxes = Axes.Both,
-                Anchor = Anchor.CentreLeft,
-                Origin = Anchor.CentreLeft,
-                Direction = FillDirection.Horizontal,
-                Padding = new MarginPadding { Right = 10 },
-                Children = new Drawable[]
-                {
-                    new SpriteIcon
-                    {
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                        Icon = FontAwesome.Solid.User,
-                        FillMode = FillMode.Fit,
-                        Size = new Vector2(50, 14)
-                    },
-                    followerText = new OsuSpriteText
-                    {
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                        Font = OsuFont.GetFont(weight: FontWeight.Bold)
-                    }
-                }
-            };
-
             // todo: when friending/unfriending is implemented, the APIAccess.Friends list should be updated accordingly.
-
             User.BindValueChanged(user => updateFollowers(user.NewValue), true);
         }
 
-        private void updateFollowers(User user) => followerText.Text = user?.FollowerCount.ToString("#,##0");
+        private void updateFollowers(User user) => SetValue(user?.FollowerCount.ToString("#,##0"));
     }
 }
diff --git a/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs b/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs
new file mode 100644
index 0000000000..7c1da503d1
--- /dev/null
+++ b/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.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 JetBrains.Annotations;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osuTK;
+
+namespace osu.Game.Overlays.Profile.Header.Components
+{
+    public abstract class ProfileHeaderStatisticsButton : ProfileHeaderButton
+    {
+        private readonly OsuSpriteText drawableText;
+
+        protected ProfileHeaderStatisticsButton()
+        {
+            Child = new FillFlowContainer
+            {
+                AutoSizeAxes = Axes.Both,
+                Anchor = Anchor.CentreLeft,
+                Origin = Anchor.CentreLeft,
+                Direction = FillDirection.Horizontal,
+                Padding = new MarginPadding { Right = 10 },
+                Children = new Drawable[]
+                {
+                    new SpriteIcon
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Icon = CreateIcon(),
+                        FillMode = FillMode.Fit,
+                        Size = new Vector2(50, 14)
+                    },
+                    drawableText = new OsuSpriteText
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Font = OsuFont.GetFont(weight: FontWeight.Bold)
+                    }
+                }
+            };
+        }
+
+        [NotNull]
+        protected abstract IconUsage CreateIcon();
+
+        protected void SetValue(string value) => drawableText.Text = value;
+    }
+}

From 966440f109a452b46fa99b3fd2d3845650e02467 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 21 Jan 2021 22:02:19 +0300
Subject: [PATCH 1021/3722] Add MappingFollowerCount field to User

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

diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index d7e78d5b35..518236755d 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -126,6 +126,9 @@ namespace osu.Game.Users
         [JsonProperty(@"follower_count")]
         public int FollowerCount;
 
+        [JsonProperty(@"mapping_follower_count")]
+        public int MappingFollowerCount;
+
         [JsonProperty(@"favourite_beatmapset_count")]
         public int FavouriteBeatmapsetCount;
 

From a7c22ebe88812ba1cf33bb931eceabcb11e83105 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 21 Jan 2021 22:02:54 +0300
Subject: [PATCH 1022/3722] Implement MappingSubscribersButton component

---
 .../Profile/Header/CentreHeaderContainer.cs   |  7 ++++--
 .../{AddFriendButton.cs => FriendsButton.cs}  |  6 ++---
 .../Components/MappingSubscribersButton.cs    | 25 +++++++++++++++++++
 .../ProfileHeaderStatisticsButton.cs          | 14 +++++------
 4 files changed, 39 insertions(+), 13 deletions(-)
 rename osu.Game/Overlays/Profile/Header/Components/{AddFriendButton.cs => FriendsButton.cs} (75%)
 create mode 100644 osu.Game/Overlays/Profile/Header/Components/MappingSubscribersButton.cs

diff --git a/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
index 658cdb8ce3..1849b6d88a 100644
--- a/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
@@ -49,9 +49,12 @@ namespace osu.Game.Overlays.Profile.Header
                     Spacing = new Vector2(10, 0),
                     Children = new Drawable[]
                     {
-                        new AddFriendButton
+                        new FriendsButton
+                        {
+                            User = { BindTarget = User }
+                        },
+                        new MappingSubscribersButton
                         {
-                            RelativeSizeAxes = Axes.Y,
                             User = { BindTarget = User }
                         },
                         new MessageUserButton
diff --git a/osu.Game/Overlays/Profile/Header/Components/AddFriendButton.cs b/osu.Game/Overlays/Profile/Header/Components/FriendsButton.cs
similarity index 75%
rename from osu.Game/Overlays/Profile/Header/Components/AddFriendButton.cs
rename to osu.Game/Overlays/Profile/Header/Components/FriendsButton.cs
index ac05511132..f369874586 100644
--- a/osu.Game/Overlays/Profile/Header/Components/AddFriendButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/FriendsButton.cs
@@ -8,7 +8,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Overlays.Profile.Header.Components
 {
-    public class AddFriendButton : ProfileHeaderStatisticsButton
+    public class FriendsButton : ProfileHeaderStatisticsButton
     {
         public readonly Bindable<User> User = new Bindable<User>();
 
@@ -20,9 +20,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
         private void load()
         {
             // todo: when friending/unfriending is implemented, the APIAccess.Friends list should be updated accordingly.
-            User.BindValueChanged(user => updateFollowers(user.NewValue), true);
+            User.BindValueChanged(user => SetValue(user.NewValue?.FollowerCount ?? 0), true);
         }
-
-        private void updateFollowers(User user) => SetValue(user?.FollowerCount.ToString("#,##0"));
     }
 }
diff --git a/osu.Game/Overlays/Profile/Header/Components/MappingSubscribersButton.cs b/osu.Game/Overlays/Profile/Header/Components/MappingSubscribersButton.cs
new file mode 100644
index 0000000000..2fb53a0b9a
--- /dev/null
+++ b/osu.Game/Overlays/Profile/Header/Components/MappingSubscribersButton.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.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Users;
+
+namespace osu.Game.Overlays.Profile.Header.Components
+{
+    public class MappingSubscribersButton : ProfileHeaderStatisticsButton
+    {
+        public readonly Bindable<User> User = new Bindable<User>();
+
+        public override string TooltipText => "mapping subscribers";
+
+        protected override IconUsage CreateIcon() => FontAwesome.Solid.Bell;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            User.BindValueChanged(user => SetValue(user.NewValue?.MappingFollowerCount ?? 0), true);
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs b/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs
index 7c1da503d1..84a6e351ea 100644
--- a/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.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.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
@@ -17,13 +16,14 @@ namespace osu.Game.Overlays.Profile.Header.Components
 
         protected ProfileHeaderStatisticsButton()
         {
+            RelativeSizeAxes = Axes.Y;
             Child = new FillFlowContainer
             {
-                AutoSizeAxes = Axes.Both,
-                Anchor = Anchor.CentreLeft,
-                Origin = Anchor.CentreLeft,
+                AutoSizeAxes = Axes.X,
+                RelativeSizeAxes = Axes.Y,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
                 Direction = FillDirection.Horizontal,
-                Padding = new MarginPadding { Right = 10 },
                 Children = new Drawable[]
                 {
                     new SpriteIcon
@@ -38,15 +38,15 @@ namespace osu.Game.Overlays.Profile.Header.Components
                     {
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
+                        Margin = new MarginPadding { Right = 10 },
                         Font = OsuFont.GetFont(weight: FontWeight.Bold)
                     }
                 }
             };
         }
 
-        [NotNull]
         protected abstract IconUsage CreateIcon();
 
-        protected void SetValue(string value) => drawableText.Text = value;
+        protected void SetValue(int value) => drawableText.Text = value.ToString("#,##0");
     }
 }

From 343166f158d09e74a9fee1df901989a80252c7be Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 21 Jan 2021 22:47:44 +0300
Subject: [PATCH 1023/3722] Make CreateIcon a property

---
 osu.Game/Overlays/Profile/Header/Components/FriendsButton.cs  | 2 +-
 .../Profile/Header/Components/MappingSubscribersButton.cs     | 2 +-
 .../Header/Components/ProfileHeaderStatisticsButton.cs        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/Components/FriendsButton.cs b/osu.Game/Overlays/Profile/Header/Components/FriendsButton.cs
index f369874586..e0930b6a65 100644
--- a/osu.Game/Overlays/Profile/Header/Components/FriendsButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/FriendsButton.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
 
         public override string TooltipText => "followers";
 
-        protected override IconUsage CreateIcon() => FontAwesome.Solid.User;
+        protected override IconUsage CreateIcon => FontAwesome.Solid.User;
 
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game/Overlays/Profile/Header/Components/MappingSubscribersButton.cs b/osu.Game/Overlays/Profile/Header/Components/MappingSubscribersButton.cs
index 2fb53a0b9a..ef290676d9 100644
--- a/osu.Game/Overlays/Profile/Header/Components/MappingSubscribersButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/MappingSubscribersButton.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
 
         public override string TooltipText => "mapping subscribers";
 
-        protected override IconUsage CreateIcon() => FontAwesome.Solid.Bell;
+        protected override IconUsage CreateIcon => FontAwesome.Solid.Bell;
 
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs b/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs
index 84a6e351ea..ff315727fa 100644
--- a/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
                     {
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
-                        Icon = CreateIcon(),
+                        Icon = CreateIcon,
                         FillMode = FillMode.Fit,
                         Size = new Vector2(50, 14)
                     },
@@ -45,7 +45,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
             };
         }
 
-        protected abstract IconUsage CreateIcon();
+        protected abstract IconUsage CreateIcon { get; }
 
         protected void SetValue(int value) => drawableText.Text = value.ToString("#,##0");
     }

From e87197c7fc80b9d40e85829b2120cfbbf8cca87d Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 21 Jan 2021 22:48:31 +0300
Subject: [PATCH 1024/3722] Adjust text size

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

diff --git a/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs b/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs
index ff315727fa..118ea4c6aa 100644
--- a/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
                         Margin = new MarginPadding { Right = 10 },
-                        Font = OsuFont.GetFont(weight: FontWeight.Bold)
+                        Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold)
                     }
                 }
             };

From 4555b9ff704bad005b094d0e5997ed1b29e9606c Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 21 Jan 2021 22:56:12 +0300
Subject: [PATCH 1025/3722] Make ProfileHeaderButton height defined

---
 osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs        | 1 -
 osu.Game/Overlays/Profile/Header/Components/MessageUserButton.cs | 1 -
 .../Overlays/Profile/Header/Components/ProfileHeaderButton.cs    | 1 +
 .../Profile/Header/Components/ProfileHeaderStatisticsButton.cs   | 1 -
 4 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
index 1849b6d88a..8f940cd0cc 100644
--- a/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
@@ -72,7 +72,6 @@ namespace osu.Game.Overlays.Profile.Header
                     Width = UserProfileOverlay.CONTENT_X_MARGIN,
                     Child = new ExpandDetailsButton
                     {
-                        RelativeSizeAxes = Axes.Y,
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                         DetailsVisible = { BindTarget = DetailsVisible }
diff --git a/osu.Game/Overlays/Profile/Header/Components/MessageUserButton.cs b/osu.Game/Overlays/Profile/Header/Components/MessageUserButton.cs
index cc6edcdd6a..228765ee1a 100644
--- a/osu.Game/Overlays/Profile/Header/Components/MessageUserButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/MessageUserButton.cs
@@ -33,7 +33,6 @@ namespace osu.Game.Overlays.Profile.Header.Components
         public MessageUserButton()
         {
             Content.Alpha = 0;
-            RelativeSizeAxes = Axes.Y;
 
             Child = new SpriteIcon
             {
diff --git a/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderButton.cs b/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderButton.cs
index e14d73dd98..cea63574cf 100644
--- a/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderButton.cs
@@ -22,6 +22,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
         protected ProfileHeaderButton()
         {
             AutoSizeAxes = Axes.X;
+            Height = 40;
 
             base.Content.Add(new CircularContainer
             {
diff --git a/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs b/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs
index 118ea4c6aa..0b8f0b4d25 100644
--- a/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs
@@ -16,7 +16,6 @@ namespace osu.Game.Overlays.Profile.Header.Components
 
         protected ProfileHeaderStatisticsButton()
         {
-            RelativeSizeAxes = Axes.Y;
             Child = new FillFlowContainer
             {
                 AutoSizeAxes = Axes.X,

From a5f866d95ce0a6e97c8620b22266b5bf3f470173 Mon Sep 17 00:00:00 2001
From: vmaggioli <vinmags16@gmail.com>
Date: Thu, 21 Jan 2021 15:14:24 -0500
Subject: [PATCH 1026/3722] Test updates

---
 .../TestSceneTimelineHitObjectBlueprint.cs    | 37 ++++++++-----------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
index ed427c2020..1fa37470cb 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
@@ -1,28 +1,27 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Screens.Edit.Compose.Components.Timeline;
 using osuTK;
+using osuTK.Input;
+using static osu.Game.Screens.Edit.Compose.Components.Timeline.TimelineHitObjectBlueprint;
 
 namespace osu.Game.Tests.Visual.Editing
 {
     public class TestSceneTimelineHitObjectBlueprint : TimelineTestScene
     {
         private Spinner spinner;
-        private TimelineHitObjectBlueprint blueprint;
 
         public TestSceneTimelineHitObjectBlueprint()
         {
-            var spinner = new Spinner
+            spinner = new Spinner
             {
                 Position = new Vector2(256, 256),
                 StartTime = -1000,
@@ -30,26 +29,22 @@ namespace osu.Game.Tests.Visual.Editing
             };
 
             spinner.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { CircleSize = 2 });
-            Add(new Container
-            {
-                RelativeSizeAxes = Axes.Both,
-                Size = new Vector2(0.5f),
-                Child = _ = new DrawableSpinner(spinner)
-            });
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            Clock.Seek(10000);
-        }
-
-        public override Drawable CreateTestComponent() => blueprint = new TimelineHitObjectBlueprint(spinner);
+        public override Drawable CreateTestComponent() => new TimelineHitObjectBlueprint(spinner);
 
         [Test]
         public void TestDisallowZeroLengthSpinners()
         {
-
+            DragBar dragBar = this.ChildrenOfType<DragBar>().First();
+            Circle circle = this.ChildrenOfType<Circle>().First();
+            InputManager.MoveMouseTo(dragBar.ScreenSpaceDrawQuad.TopRight);
+            AddStep("drag dragbar to hit object", () =>
+            {
+                InputManager.PressButton(MouseButton.Left);
+                InputManager.MoveMouseTo(circle.ScreenSpaceDrawQuad.TopLeft);
+                InputManager.ReleaseButton(MouseButton.Left);
+            });
         }
     }
 }

From c631354b57d39f165332f6482cce23fb1702c576 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 21 Jan 2021 23:39:19 +0300
Subject: [PATCH 1027/3722] Rename property

---
 osu.Game/Overlays/Profile/Header/Components/FriendsButton.cs  | 2 +-
 .../Profile/Header/Components/MappingSubscribersButton.cs     | 2 +-
 .../Header/Components/ProfileHeaderStatisticsButton.cs        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/Components/FriendsButton.cs b/osu.Game/Overlays/Profile/Header/Components/FriendsButton.cs
index e0930b6a65..09916997a4 100644
--- a/osu.Game/Overlays/Profile/Header/Components/FriendsButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/FriendsButton.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
 
         public override string TooltipText => "followers";
 
-        protected override IconUsage CreateIcon => FontAwesome.Solid.User;
+        protected override IconUsage Icon => FontAwesome.Solid.User;
 
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game/Overlays/Profile/Header/Components/MappingSubscribersButton.cs b/osu.Game/Overlays/Profile/Header/Components/MappingSubscribersButton.cs
index ef290676d9..b4d7c9a05c 100644
--- a/osu.Game/Overlays/Profile/Header/Components/MappingSubscribersButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/MappingSubscribersButton.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
 
         public override string TooltipText => "mapping subscribers";
 
-        protected override IconUsage CreateIcon => FontAwesome.Solid.Bell;
+        protected override IconUsage Icon => FontAwesome.Solid.Bell;
 
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs b/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs
index 0b8f0b4d25..b65d5e2329 100644
--- a/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderStatisticsButton.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
                     {
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
-                        Icon = CreateIcon,
+                        Icon = Icon,
                         FillMode = FillMode.Fit,
                         Size = new Vector2(50, 14)
                     },
@@ -44,7 +44,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
             };
         }
 
-        protected abstract IconUsage CreateIcon { get; }
+        protected abstract IconUsage Icon { get; }
 
         protected void SetValue(int value) => drawableText.Text = value.ToString("#,##0");
     }

From 2eba2a9abf2b56f2637843846fab1988ea10aeb3 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 21 Jan 2021 23:40:23 +0300
Subject: [PATCH 1028/3722] Rename FriendsButton to FollowersButton

---
 osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs       | 2 +-
 .../Header/Components/{FriendsButton.cs => FollowersButton.cs}  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename osu.Game/Overlays/Profile/Header/Components/{FriendsButton.cs => FollowersButton.cs} (92%)

diff --git a/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
index 8f940cd0cc..04a1040e06 100644
--- a/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Overlays.Profile.Header
                     Spacing = new Vector2(10, 0),
                     Children = new Drawable[]
                     {
-                        new FriendsButton
+                        new FollowersButton
                         {
                             User = { BindTarget = User }
                         },
diff --git a/osu.Game/Overlays/Profile/Header/Components/FriendsButton.cs b/osu.Game/Overlays/Profile/Header/Components/FollowersButton.cs
similarity index 92%
rename from osu.Game/Overlays/Profile/Header/Components/FriendsButton.cs
rename to osu.Game/Overlays/Profile/Header/Components/FollowersButton.cs
index 09916997a4..bd8aa7b3bd 100644
--- a/osu.Game/Overlays/Profile/Header/Components/FriendsButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/FollowersButton.cs
@@ -8,7 +8,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Overlays.Profile.Header.Components
 {
-    public class FriendsButton : ProfileHeaderStatisticsButton
+    public class FollowersButton : ProfileHeaderStatisticsButton
     {
         public readonly Bindable<User> User = new Bindable<User>();
 

From 7046f64e7f7eaec8d9aa65cdac54aca13d01bc06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 21 Jan 2021 22:07:08 +0100
Subject: [PATCH 1029/3722] Rewrite test scene

---
 .../TestSceneTimelineHitObjectBlueprint.cs    | 54 ++++++++++---------
 .../Visual/Editing/TimelineTestScene.cs       | 10 ++--
 2 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
index 1fa37470cb..15fa1d995b 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
@@ -1,13 +1,9 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Testing;
-using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Screens.Edit.Compose.Components.Timeline;
 using osuTK;
 using osuTK.Input;
@@ -17,34 +13,40 @@ namespace osu.Game.Tests.Visual.Editing
 {
     public class TestSceneTimelineHitObjectBlueprint : TimelineTestScene
     {
-        private Spinner spinner;
-
-        public TestSceneTimelineHitObjectBlueprint()
-        {
-            spinner = new Spinner
-            {
-                Position = new Vector2(256, 256),
-                StartTime = -1000,
-                EndTime = 2000
-            };
-
-            spinner.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { CircleSize = 2 });
-        }
-
-        public override Drawable CreateTestComponent() => new TimelineHitObjectBlueprint(spinner);
+        public override Drawable CreateTestComponent() => new TimelineBlueprintContainer(Composer);
 
         [Test]
-        public void TestDisallowZeroLengthSpinners()
+        public void TestDisallowZeroDurationObjects()
         {
-            DragBar dragBar = this.ChildrenOfType<DragBar>().First();
-            Circle circle = this.ChildrenOfType<Circle>().First();
-            InputManager.MoveMouseTo(dragBar.ScreenSpaceDrawQuad.TopRight);
-            AddStep("drag dragbar to hit object", () =>
+            DragBar dragBar;
+
+            AddStep("add spinner", () =>
             {
+                EditorBeatmap.Clear();
+                EditorBeatmap.Add(new Spinner
+                {
+                    Position = new Vector2(256, 256),
+                    StartTime = 150,
+                    Duration = 500
+                });
+            });
+
+            AddStep("hold down drag bar", () =>
+            {
+                // distinguishes between the actual drag bar and its "underlay shadow".
+                dragBar = this.ChildrenOfType<DragBar>().Single(bar => bar.HandlePositionalInput);
+                InputManager.MoveMouseTo(dragBar);
                 InputManager.PressButton(MouseButton.Left);
-                InputManager.MoveMouseTo(circle.ScreenSpaceDrawQuad.TopLeft);
+            });
+
+            AddStep("try to drag bar past start", () =>
+            {
+                var blueprint = this.ChildrenOfType<TimelineHitObjectBlueprint>().Single();
+                InputManager.MoveMouseTo(blueprint.SelectionQuad.TopLeft - new Vector2(100, 0));
                 InputManager.ReleaseButton(MouseButton.Left);
             });
+
+            AddAssert("object has non-zero duration", () => EditorBeatmap.HitObjects.OfType<IHasDuration>().Single().Duration > 0);
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
index 63bb018d6e..d6db171cf0 100644
--- a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
+++ b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
@@ -23,22 +23,24 @@ namespace osu.Game.Tests.Visual.Editing
 
         protected HitObjectComposer Composer { get; private set; }
 
+        protected EditorBeatmap EditorBeatmap { get; private set; }
+
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
             Beatmap.Value = new WaveformTestBeatmap(audio);
 
             var playable = Beatmap.Value.GetPlayableBeatmap(Beatmap.Value.BeatmapInfo.Ruleset);
-            var editorBeatmap = new EditorBeatmap(playable);
+            EditorBeatmap = new EditorBeatmap(playable);
 
-            Dependencies.Cache(editorBeatmap);
-            Dependencies.CacheAs<IBeatSnapProvider>(editorBeatmap);
+            Dependencies.Cache(EditorBeatmap);
+            Dependencies.CacheAs<IBeatSnapProvider>(EditorBeatmap);
 
             Composer = playable.BeatmapInfo.Ruleset.CreateInstance().CreateHitObjectComposer().With(d => d.Alpha = 0);
 
             AddRange(new Drawable[]
             {
-                editorBeatmap,
+                EditorBeatmap,
                 Composer,
                 new FillFlowContainer
                 {

From a71f769cce26eb9a010e2dd67d2ee637f74cd932 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 21 Jan 2021 22:09:42 +0100
Subject: [PATCH 1030/3722] Add missing license header

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

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
index 15fa1d995b..35f394fe1d 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
@@ -1,4 +1,7 @@
-using System.Linq;
+// Copyright (c) ppy 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;

From e4c5e5ba17ae1b7359d26b628fc92a9565f4bcfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 21 Jan 2021 22:11:51 +0100
Subject: [PATCH 1031/3722] Separate return statement with blank line

---
 .../Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 99edcd2149..508783a499 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -229,6 +229,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             float expectedDistance = composer?.GetSnappedDistanceFromDistance(HitObject.StartTime, (float)HitObject.Path.CalculatedDistance) ?? (float)HitObject.Path.CalculatedDistance;
             if (expectedDistance < 1)
                 return;
+
             HitObject.Path.ExpectedDistance.Value = expectedDistance;
             editorBeatmap?.Update(HitObject);
         }

From d0fd2ae432700dc8a7d125b827e6931ab69940c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 21 Jan 2021 22:20:07 +0100
Subject: [PATCH 1032/3722] Fix added zero-length slider test not working
 properly

---
 .../TestSceneSliderSelectionBlueprint.cs      | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
index ce1c13dac5..4edf778bfd 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
@@ -165,20 +165,12 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         public void TestZeroLengthSliderNotAllowed()
         {
             moveMouseToControlPoint(1);
-            AddStep("drag control point 1 to control point 0", () =>
-            {
-                InputManager.PressButton(MouseButton.Left);
-                moveMouseToControlPoint(0);
-                InputManager.ReleaseButton(MouseButton.Left);
-            });
+            dragMouseToControlPoint(0);
+
             moveMouseToControlPoint(2);
-            AddStep("drag control point 2 to control point 0", () =>
-            {
-                InputManager.PressButton(MouseButton.Left);
-                moveMouseToControlPoint(0);
-                InputManager.ReleaseButton(MouseButton.Left);
-            });
-            checkPositions();
+            dragMouseToControlPoint(0);
+
+            AddAssert("slider has non-zero duration", () => slider.Duration > 0);
         }
 
         private void moveHitObject()
@@ -209,6 +201,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             });
         }
 
+        private void dragMouseToControlPoint(int index)
+        {
+            AddStep("hold down mouse button", () => InputManager.PressButton(MouseButton.Left));
+            moveMouseToControlPoint(index);
+            AddStep("release mouse button", () => InputManager.ReleaseButton(MouseButton.Left));
+        }
+
         private void checkControlPointSelected(int index, bool selected)
             => AddAssert($"control point {index} {(selected ? "selected" : "not selected")}", () => blueprint.ControlPointVisualiser.Pieces[index].IsSelected.Value == selected);
 

From b220939650672b6e2056464f32082a31b8f0c531 Mon Sep 17 00:00:00 2001
From: Mysfit <8022806+Mysfit@users.noreply.github.com>
Date: Thu, 21 Jan 2021 17:10:11 -0500
Subject: [PATCH 1033/3722] Fix storyboard samples continuing to play when the
 beatmap is paused or the intro is skipped.

---
 osu.Game/Screens/Play/Player.cs                     | 13 ++++++++++++-
 osu.Game/Skinning/PausableSkinnableSound.cs         |  8 ++++----
 .../Drawables/DrawableStoryboardSample.cs           | 10 ++++++++++
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 1fcbed7ef7..b622f11775 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -353,7 +353,7 @@ namespace osu.Game.Screens.Play
                     },
                     skipOverlay = new SkipOverlay(DrawableRuleset.GameplayStartTime)
                     {
-                        RequestSkip = GameplayClockContainer.Skip
+                        RequestSkip = performUserRequestedSkip
                     },
                     FailOverlay = new FailOverlay
                     {
@@ -488,6 +488,17 @@ namespace osu.Game.Screens.Play
                 this.Exit();
         }
 
+        private void performUserRequestedSkip()
+        {
+            // user requested skip
+            // disable sample playback to stop currently playing samples and perform skip
+            samplePlaybackDisabled.Value = true;
+            GameplayClockContainer.Skip();
+
+            // return samplePlaybackDisabled.Value to what is defined by the beatmap's current state
+            updateSampleDisabledState();
+        }
+
         private void performUserRequestedExit()
         {
             if (ValidForResume && HasFailed && !FailOverlay.IsPresent)
diff --git a/osu.Game/Skinning/PausableSkinnableSound.cs b/osu.Game/Skinning/PausableSkinnableSound.cs
index cb5234c847..e0891fbda2 100644
--- a/osu.Game/Skinning/PausableSkinnableSound.cs
+++ b/osu.Game/Skinning/PausableSkinnableSound.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Skinning
         {
         }
 
-        private readonly IBindable<bool> samplePlaybackDisabled = new Bindable<bool>();
+        protected readonly IBindable<bool> SamplePlaybackDisabled = new Bindable<bool>();
 
         private ScheduledDelegate scheduledStart;
 
@@ -42,8 +42,8 @@ namespace osu.Game.Skinning
             // if in a gameplay context, pause sample playback when gameplay is paused.
             if (samplePlaybackDisabler != null)
             {
-                samplePlaybackDisabled.BindTo(samplePlaybackDisabler.SamplePlaybackDisabled);
-                samplePlaybackDisabled.BindValueChanged(disabled =>
+                SamplePlaybackDisabled.BindTo(samplePlaybackDisabler.SamplePlaybackDisabled);
+                SamplePlaybackDisabled.BindValueChanged(disabled =>
                 {
                     if (!RequestedPlaying) return;
 
@@ -72,7 +72,7 @@ namespace osu.Game.Skinning
             cancelPendingStart();
             RequestedPlaying = true;
 
-            if (samplePlaybackDisabled.Value)
+            if (SamplePlaybackDisabled.Value)
                 return;
 
             base.Play(restart);
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
index 218f051bf0..5b49e71daa 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
@@ -40,6 +40,16 @@ namespace osu.Game.Storyboards.Drawables
                 foreach (var sample in DrawableSamples)
                     mod.ApplyToSample(sample);
             }
+
+            SamplePlaybackDisabled.BindValueChanged(disabled =>
+            {
+                if (!RequestedPlaying) return;
+
+                // Since storyboard samples can be very long we want to stop the playback regardless of
+                // whether or not the sample is looping or not
+                if (disabled.NewValue)
+                    Stop();
+            });
         }
 
         protected override void Update()

From 07ec0c0e0bbe7047442033bde8f23ea7c8533e4b Mon Sep 17 00:00:00 2001
From: Mysfit <8022806+Mysfit@users.noreply.github.com>
Date: Thu, 21 Jan 2021 17:46:47 -0500
Subject: [PATCH 1034/3722] Updated DrawableStoryboardSample to use
 GetBoundCopy()

---
 osu.Game/Skinning/PausableSkinnableSound.cs   |  6 ++--
 .../Drawables/DrawableStoryboardSample.cs     | 28 ++++++++++++-------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Skinning/PausableSkinnableSound.cs b/osu.Game/Skinning/PausableSkinnableSound.cs
index e0891fbda2..361360035d 100644
--- a/osu.Game/Skinning/PausableSkinnableSound.cs
+++ b/osu.Game/Skinning/PausableSkinnableSound.cs
@@ -18,6 +18,10 @@ namespace osu.Game.Skinning
 
         protected bool RequestedPlaying { get; private set; }
 
+        protected IBindable<bool> SamplePlaybackDisabled => samplePlaybackDisabled;
+
+        private readonly Bindable<bool> samplePlaybackDisabled = new Bindable<bool>();
+
         public PausableSkinnableSound()
         {
         }
@@ -32,8 +36,6 @@ namespace osu.Game.Skinning
         {
         }
 
-        protected readonly IBindable<bool> SamplePlaybackDisabled = new Bindable<bool>();
-
         private ScheduledDelegate scheduledStart;
 
         [BackgroundDependencyLoader(true)]
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
index 5b49e71daa..b924b0551f 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
@@ -21,11 +21,29 @@ namespace osu.Game.Storyboards.Drawables
 
         public override bool RemoveWhenNotAlive => false;
 
+        private readonly IBindable<bool> samplePlaybackDisabled;
+
         public DrawableStoryboardSample(StoryboardSampleInfo sampleInfo)
             : base(sampleInfo)
         {
             this.sampleInfo = sampleInfo;
             LifetimeStart = sampleInfo.StartTime;
+
+            samplePlaybackDisabled = SamplePlaybackDisabled.GetBoundCopy();
+        }
+
+        [BackgroundDependencyLoader(true)]
+        private void load()
+        {
+            samplePlaybackDisabled.BindValueChanged(disabled =>
+            {
+                if (!RequestedPlaying) return;
+
+                // Since storyboard samples can be very long we want to stop the playback regardless of
+                // whether or not the sample is looping or not
+                if (disabled.NewValue)
+                    Stop();
+            });
         }
 
         [Resolved]
@@ -40,16 +58,6 @@ namespace osu.Game.Storyboards.Drawables
                 foreach (var sample in DrawableSamples)
                     mod.ApplyToSample(sample);
             }
-
-            SamplePlaybackDisabled.BindValueChanged(disabled =>
-            {
-                if (!RequestedPlaying) return;
-
-                // Since storyboard samples can be very long we want to stop the playback regardless of
-                // whether or not the sample is looping or not
-                if (disabled.NewValue)
-                    Stop();
-            });
         }
 
         protected override void Update()

From b53ad50cd48461b564fafe30c3c6885b3a6b11dd Mon Sep 17 00:00:00 2001
From: Mysfit <8022806+Mysfit@users.noreply.github.com>
Date: Thu, 21 Jan 2021 18:00:37 -0500
Subject: [PATCH 1035/3722] Remove redundant variable

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

diff --git a/osu.Game/Skinning/PausableSkinnableSound.cs b/osu.Game/Skinning/PausableSkinnableSound.cs
index 361360035d..0f97307372 100644
--- a/osu.Game/Skinning/PausableSkinnableSound.cs
+++ b/osu.Game/Skinning/PausableSkinnableSound.cs
@@ -18,9 +18,7 @@ namespace osu.Game.Skinning
 
         protected bool RequestedPlaying { get; private set; }
 
-        protected IBindable<bool> SamplePlaybackDisabled => samplePlaybackDisabled;
-
-        private readonly Bindable<bool> samplePlaybackDisabled = new Bindable<bool>();
+        protected readonly IBindable<bool> SamplePlaybackDisabled = new Bindable<bool>();
 
         public PausableSkinnableSound()
         {

From 5b1bdfbdc502a0500bb0cfdeb3b3075c8d530324 Mon Sep 17 00:00:00 2001
From: Mysfit <8022806+Mysfit@users.noreply.github.com>
Date: Thu, 21 Jan 2021 20:06:24 -0500
Subject: [PATCH 1036/3722] Use callback method override

---
 osu.Game/Skinning/PausableSkinnableSound.cs   | 59 ++++++++++---------
 .../Drawables/DrawableStoryboardSample.cs     | 31 ++++------
 2 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/osu.Game/Skinning/PausableSkinnableSound.cs b/osu.Game/Skinning/PausableSkinnableSound.cs
index 0f97307372..b48cf5d448 100644
--- a/osu.Game/Skinning/PausableSkinnableSound.cs
+++ b/osu.Game/Skinning/PausableSkinnableSound.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Skinning
 
         protected bool RequestedPlaying { get; private set; }
 
-        protected readonly IBindable<bool> SamplePlaybackDisabled = new Bindable<bool>();
+        private readonly IBindable<bool> samplePlaybackDisabled = new Bindable<bool>();
 
         public PausableSkinnableSound()
         {
@@ -42,37 +42,32 @@ namespace osu.Game.Skinning
             // if in a gameplay context, pause sample playback when gameplay is paused.
             if (samplePlaybackDisabler != null)
             {
-                SamplePlaybackDisabled.BindTo(samplePlaybackDisabler.SamplePlaybackDisabled);
-                SamplePlaybackDisabled.BindValueChanged(disabled =>
-                {
-                    if (!RequestedPlaying) return;
-
-                    // let non-looping samples that have already been started play out to completion (sounds better than abruptly cutting off).
-                    if (!Looping) return;
-
-                    cancelPendingStart();
-
-                    if (disabled.NewValue)
-                        base.Stop();
-                    else
-                    {
-                        // schedule so we don't start playing a sample which is no longer alive.
-                        scheduledStart = Schedule(() =>
-                        {
-                            if (RequestedPlaying)
-                                base.Play();
-                        });
-                    }
-                });
+                samplePlaybackDisabled.BindTo(samplePlaybackDisabler.SamplePlaybackDisabled);
+                samplePlaybackDisabled.BindValueChanged(SamplePlaybackDisabledChanged);
             }
         }
 
+        protected virtual void SamplePlaybackDisabledChanged(ValueChangedEvent<bool> disabled)
+        {
+            if (!RequestedPlaying) return;
+
+            // let non-looping samples that have already been started play out to completion (sounds better than abruptly cutting off).
+            if (!Looping) return;
+
+            CancelPendingStart();
+
+            if (disabled.NewValue)
+                base.Stop();
+            else
+                ScheduleStart();
+        }
+
         public override void Play(bool restart = true)
         {
-            cancelPendingStart();
+            CancelPendingStart();
             RequestedPlaying = true;
 
-            if (SamplePlaybackDisabled.Value)
+            if (samplePlaybackDisabled.Value)
                 return;
 
             base.Play(restart);
@@ -80,15 +75,25 @@ namespace osu.Game.Skinning
 
         public override void Stop()
         {
-            cancelPendingStart();
+            CancelPendingStart();
             RequestedPlaying = false;
             base.Stop();
         }
 
-        private void cancelPendingStart()
+        protected void CancelPendingStart()
         {
             scheduledStart?.Cancel();
             scheduledStart = null;
         }
+
+        protected void ScheduleStart()
+        {
+            // schedule so we don't start playing a sample which is no longer alive.
+            scheduledStart = Schedule(() =>
+            {
+                if (RequestedPlaying)
+                    base.Play();
+            });
+        }
     }
 }
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
index b924b0551f..d5e1e19666 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
@@ -21,34 +21,29 @@ namespace osu.Game.Storyboards.Drawables
 
         public override bool RemoveWhenNotAlive => false;
 
-        private readonly IBindable<bool> samplePlaybackDisabled;
-
         public DrawableStoryboardSample(StoryboardSampleInfo sampleInfo)
             : base(sampleInfo)
         {
             this.sampleInfo = sampleInfo;
             LifetimeStart = sampleInfo.StartTime;
-
-            samplePlaybackDisabled = SamplePlaybackDisabled.GetBoundCopy();
-        }
-
-        [BackgroundDependencyLoader(true)]
-        private void load()
-        {
-            samplePlaybackDisabled.BindValueChanged(disabled =>
-            {
-                if (!RequestedPlaying) return;
-
-                // Since storyboard samples can be very long we want to stop the playback regardless of
-                // whether or not the sample is looping or not
-                if (disabled.NewValue)
-                    Stop();
-            });
         }
 
         [Resolved]
         private IBindable<IReadOnlyList<Mod>> mods { get; set; }
 
+        protected override void SamplePlaybackDisabledChanged(ValueChangedEvent<bool> disabled)
+        {
+            if (!RequestedPlaying) return;
+
+            if (disabled.NewValue)
+                Stop();
+            else
+            {
+                CancelPendingStart();
+                ScheduleStart();
+            }
+        }
+
         protected override void SkinChanged(ISkinSource skin, bool allowFallback)
         {
             base.SkinChanged(skin, allowFallback);

From 9f89b4e6d79822f7e7eb382767818add29bda6db Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Jan 2021 14:25:21 +0900
Subject: [PATCH 1037/3722] Rewrite connection logic to better handle failure
 cases

The main goal here is to ensure the connection is built each connection
attempt. Previously, the access token would never be updated, leading to
outdated tokens failing repeatedly (in the connection retry loop) and
never being able to establish a new connection as a result.

Due to threading considerations, this isn't as simple as I would hope it
to be. I'm open to proposals as to a better way of handling this.

Also, keep in mind that this logic will need to be abstracted and
(re)used in `SpectatorClient` as well. I've intentionally not done that
yet until we agree that this is a good direction forward.
---
 .../Online/Multiplayer/MultiplayerClient.cs   | 141 ++++++++++++------
 1 file changed, 93 insertions(+), 48 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 50dc8f661c..34616a45a5 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -4,7 +4,6 @@
 #nullable enable
 
 using System;
-using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.SignalR.Client;
@@ -30,6 +29,8 @@ namespace osu.Game.Online.Multiplayer
 
         private HubConnection? connection;
 
+        private CancellationTokenSource connectCancelSource = new CancellationTokenSource();
+
         private readonly string endpoint;
 
         public MultiplayerClient(EndpointConfiguration endpoints)
@@ -50,8 +51,7 @@ namespace osu.Game.Online.Multiplayer
             {
                 case APIState.Failing:
                 case APIState.Offline:
-                    connection?.StopAsync();
-                    connection = null;
+                    Task.Run(Disconnect);
                     break;
 
                 case APIState.Online:
@@ -60,70 +60,57 @@ namespace osu.Game.Online.Multiplayer
             }
         }
 
-        protected virtual async Task Connect()
+        private readonly SemaphoreSlim connectionLock = new SemaphoreSlim(1);
+
+        public Task Disconnect() => disconnect(true);
+
+        protected async Task Connect()
         {
-            if (connection != null)
-                return;
+            cancelExistingConnect();
 
-            connection = new HubConnectionBuilder()
-                         .WithUrl(endpoint, options =>
-                         {
-                             options.Headers.Add("Authorization", $"Bearer {api.AccessToken}");
-                         })
-                         .AddNewtonsoftJsonProtocol(options => { options.PayloadSerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; })
-                         .Build();
+            await connectionLock.WaitAsync();
 
-            // this is kind of SILLY
-            // https://github.com/dotnet/aspnetcore/issues/15198
-            connection.On<MultiplayerRoomState>(nameof(IMultiplayerClient.RoomStateChanged), ((IMultiplayerClient)this).RoomStateChanged);
-            connection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserJoined), ((IMultiplayerClient)this).UserJoined);
-            connection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserLeft), ((IMultiplayerClient)this).UserLeft);
-            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);
-            connection.On(nameof(IMultiplayerClient.LoadRequested), ((IMultiplayerClient)this).LoadRequested);
-            connection.On(nameof(IMultiplayerClient.MatchStarted), ((IMultiplayerClient)this).MatchStarted);
-            connection.On(nameof(IMultiplayerClient.ResultsReady), ((IMultiplayerClient)this).ResultsReady);
-
-            connection.Closed += async ex =>
+            try
             {
-                isConnected.Value = false;
+                await disconnect(false);
 
-                Logger.Log(ex != null
-                    ? $"Multiplayer client lost connection: {ex}"
-                    : "Multiplayer client disconnected", LoggingTarget.Network);
+                // this token will be valid for the scope of this connection.
+                // if cancelled, we can be sure that a disconnect or reconnect is handled elsewhere.
+                var cancellationToken = connectCancelSource.Token;
 
-                if (connection != null)
-                    await tryUntilConnected();
-            };
-
-            await tryUntilConnected();
-
-            async Task tryUntilConnected()
-            {
-                Logger.Log("Multiplayer client connecting...", LoggingTarget.Network);
-
-                while (api.State.Value == APIState.Online)
+                while (api.State.Value == APIState.Online && !cancellationToken.IsCancellationRequested)
                 {
+                    Logger.Log("Multiplayer client connecting...", LoggingTarget.Network);
+
                     try
                     {
-                        Debug.Assert(connection != null);
+                        // importantly, rebuild the connection each attempt to get an updated access token.
+                        connection = createConnection(cancellationToken);
+
+                        await connection.StartAsync(cancellationToken);
 
-                        // reconnect on any failure
-                        await connection.StartAsync();
                         Logger.Log("Multiplayer client connected!", LoggingTarget.Network);
-
-                        // Success.
                         isConnected.Value = true;
-                        break;
+                        return;
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        //connection process was cancelled.
+                        return;
                     }
                     catch (Exception e)
                     {
                         Logger.Log($"Multiplayer client connection error: {e}", LoggingTarget.Network);
-                        await Task.Delay(5000);
+
+                        // retry on any failure.
+                        await Task.Delay(5000, cancellationToken);
                     }
                 }
             }
+            finally
+            {
+                connectionLock.Release();
+            }
         }
 
         protected override Task<MultiplayerRoom> JoinRoom(long roomId)
@@ -189,5 +176,63 @@ namespace osu.Game.Online.Multiplayer
 
             return connection.InvokeAsync(nameof(IMultiplayerServer.StartMatch));
         }
+
+        private async Task disconnect(bool takeLock)
+        {
+            cancelExistingConnect();
+
+            if (takeLock)
+                await connectionLock.WaitAsync();
+
+            try
+            {
+                if (connection != null)
+                    await connection.StopAsync();
+            }
+            finally
+            {
+                connection = null;
+                if (takeLock)
+                    connectionLock.Release();
+            }
+        }
+
+        private void cancelExistingConnect()
+        {
+            connectCancelSource.Cancel();
+            connectCancelSource = new CancellationTokenSource();
+        }
+
+        private HubConnection createConnection(CancellationToken cancellationToken)
+        {
+            var newConnection = new HubConnectionBuilder()
+                                .WithUrl(endpoint, options => { options.Headers.Add("Authorization", $"Bearer {api.AccessToken}"); })
+                                .AddNewtonsoftJsonProtocol(options => { options.PayloadSerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; })
+                                .Build();
+
+            // this is kind of SILLY
+            // https://github.com/dotnet/aspnetcore/issues/15198
+            newConnection.On<MultiplayerRoomState>(nameof(IMultiplayerClient.RoomStateChanged), ((IMultiplayerClient)this).RoomStateChanged);
+            newConnection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserJoined), ((IMultiplayerClient)this).UserJoined);
+            newConnection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserLeft), ((IMultiplayerClient)this).UserLeft);
+            newConnection.On<int>(nameof(IMultiplayerClient.HostChanged), ((IMultiplayerClient)this).HostChanged);
+            newConnection.On<MultiplayerRoomSettings>(nameof(IMultiplayerClient.SettingsChanged), ((IMultiplayerClient)this).SettingsChanged);
+            newConnection.On<int, MultiplayerUserState>(nameof(IMultiplayerClient.UserStateChanged), ((IMultiplayerClient)this).UserStateChanged);
+            newConnection.On(nameof(IMultiplayerClient.LoadRequested), ((IMultiplayerClient)this).LoadRequested);
+            newConnection.On(nameof(IMultiplayerClient.MatchStarted), ((IMultiplayerClient)this).MatchStarted);
+            newConnection.On(nameof(IMultiplayerClient.ResultsReady), ((IMultiplayerClient)this).ResultsReady);
+
+            newConnection.Closed += async ex =>
+            {
+                isConnected.Value = false;
+
+                Logger.Log(ex != null ? $"Multiplayer client lost connection: {ex}" : "Multiplayer client disconnected", LoggingTarget.Network);
+
+                // make sure a disconnect wasn't triggered (and this is still the active connection).
+                if (!cancellationToken.IsCancellationRequested)
+                    await Connect();
+            };
+            return newConnection;
+        }
     }
 }

From d24d23646875b0bca4755c9d5b8a0caa24f30cae Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Jan 2021 14:34:58 +0900
Subject: [PATCH 1038/3722] Make OperationCanceledException throwing behaviour
 consistent

---
 .../Online/Multiplayer/MultiplayerClient.cs     | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 34616a45a5..aa2305c991 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -12,6 +12,7 @@ using Newtonsoft.Json;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Logging;
+using osu.Game.Extensions;
 using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 
@@ -51,11 +52,11 @@ namespace osu.Game.Online.Multiplayer
             {
                 case APIState.Failing:
                 case APIState.Offline:
-                    Task.Run(Disconnect);
+                    Task.Run(Disconnect).CatchUnobservedExceptions();
                     break;
 
                 case APIState.Online:
-                    Task.Run(Connect);
+                    Task.Run(Connect).CatchUnobservedExceptions();
                     break;
             }
         }
@@ -78,8 +79,10 @@ namespace osu.Game.Online.Multiplayer
                 // if cancelled, we can be sure that a disconnect or reconnect is handled elsewhere.
                 var cancellationToken = connectCancelSource.Token;
 
-                while (api.State.Value == APIState.Online && !cancellationToken.IsCancellationRequested)
+                while (api.State.Value == APIState.Online)
                 {
+                    cancellationToken.ThrowIfCancellationRequested();
+
                     Logger.Log("Multiplayer client connecting...", LoggingTarget.Network);
 
                     try
@@ -96,7 +99,7 @@ namespace osu.Game.Online.Multiplayer
                     catch (OperationCanceledException)
                     {
                         //connection process was cancelled.
-                        return;
+                        throw;
                     }
                     catch (Exception e)
                     {
@@ -222,7 +225,7 @@ namespace osu.Game.Online.Multiplayer
             newConnection.On(nameof(IMultiplayerClient.MatchStarted), ((IMultiplayerClient)this).MatchStarted);
             newConnection.On(nameof(IMultiplayerClient.ResultsReady), ((IMultiplayerClient)this).ResultsReady);
 
-            newConnection.Closed += async ex =>
+            newConnection.Closed += ex =>
             {
                 isConnected.Value = false;
 
@@ -230,7 +233,9 @@ namespace osu.Game.Online.Multiplayer
 
                 // make sure a disconnect wasn't triggered (and this is still the active connection).
                 if (!cancellationToken.IsCancellationRequested)
-                    await Connect();
+                    Task.Run(Connect, default).CatchUnobservedExceptions();
+
+                return Task.CompletedTask;
             };
             return newConnection;
         }

From 65b70759844c37ee4cdf723c615781934da9059e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Jan 2021 15:37:50 +0900
Subject: [PATCH 1039/3722] Limit the effect of parallax when outside the
 bounds of the ParallaxContainer

This fixes the visual issues that still remain when mouse confining
fails. I think it also feels more correct in general.
---
 .../Graphics/Containers/ParallaxContainer.cs  | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/Containers/ParallaxContainer.cs b/osu.Game/Graphics/Containers/ParallaxContainer.cs
index 4cd3934cde..b501e68ba1 100644
--- a/osu.Game/Graphics/Containers/ParallaxContainer.cs
+++ b/osu.Game/Graphics/Containers/ParallaxContainer.cs
@@ -24,6 +24,10 @@ namespace osu.Game.Graphics.Containers
 
         private Bindable<bool> parallaxEnabled;
 
+        private const float parallax_duration = 100;
+
+        private bool firstUpdate = true;
+
         public ParallaxContainer()
         {
             RelativeSizeAxes = Axes.Both;
@@ -60,17 +64,27 @@ namespace osu.Game.Graphics.Containers
             input = GetContainingInputManager();
         }
 
-        private bool firstUpdate = true;
-
         protected override void Update()
         {
             base.Update();
 
             if (parallaxEnabled.Value)
             {
-                Vector2 offset = (input.CurrentState.Mouse == null ? Vector2.Zero : ToLocalSpace(input.CurrentState.Mouse.Position) - DrawSize / 2) * ParallaxAmount;
+                Vector2 offset = Vector2.Zero;
 
-                const float parallax_duration = 100;
+                if (input.CurrentState.Mouse != null)
+                {
+                    var sizeDiv2 = DrawSize / 2;
+
+                    Vector2 relativeAmount = ToLocalSpace(input.CurrentState.Mouse.Position) - sizeDiv2;
+
+                    const float base_factor = 0.999f;
+
+                    relativeAmount.X = (float)(Math.Sign(relativeAmount.X) * Interpolation.Damp(0, 1, base_factor, Math.Abs(relativeAmount.X)));
+                    relativeAmount.Y = (float)(Math.Sign(relativeAmount.Y) * Interpolation.Damp(0, 1, base_factor, Math.Abs(relativeAmount.Y)));
+
+                    offset = relativeAmount * sizeDiv2 * ParallaxAmount;
+                }
 
                 double elapsed = Math.Clamp(Clock.ElapsedFrameTime, 0, parallax_duration);
 

From fca6b15d2fa3fcfeec85cd3336aa181be6e1ffbb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Jan 2021 16:05:45 +0900
Subject: [PATCH 1040/3722] Fix local echo messages remaining permanently
 dimmed when chatting via multiplayer

---
 osu.Game/Overlays/Chat/ChatLine.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Chat/ChatLine.cs b/osu.Game/Overlays/Chat/ChatLine.cs
index 4eb348ae33..f43420e35e 100644
--- a/osu.Game/Overlays/Chat/ChatLine.cs
+++ b/osu.Game/Overlays/Chat/ChatLine.cs
@@ -190,13 +190,13 @@ namespace osu.Game.Overlays.Chat
                     }
                 }
             };
-
-            updateMessageContent();
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
+
+            updateMessageContent();
             FinishTransforms(true);
         }
 

From bfabb1fdea25412c24088185fc0ed2c3e8a7f40c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Jan 2021 16:50:22 +0900
Subject: [PATCH 1041/3722] Change offset value to 10%

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

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index 6ed161fa77..16bc6e4fc5 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -110,8 +110,8 @@ namespace osu.Game.Graphics.Containers
 
         /// <summary>
         /// The percentage of the container to consider the centre-point for deciding the active section (and scrolling to a requested section).
-        /// </summary>
-        private const float scroll_y_centre = 0.2f;
+        /// </summar>
+        private const float scroll_y_centre = 0.1f;
 
         public SectionsContainer()
         {

From a5f7ca485bfeeb38d88f113c6afe1bba6c49ba3c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Jan 2021 16:53:31 +0900
Subject: [PATCH 1042/3722] Fix unintended xmldoc tag edit

---
 osu.Game/Graphics/Containers/SectionsContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index 16bc6e4fc5..741fc17695 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -110,7 +110,7 @@ namespace osu.Game.Graphics.Containers
 
         /// <summary>
         /// The percentage of the container to consider the centre-point for deciding the active section (and scrolling to a requested section).
-        /// </summar>
+        /// </summary>
         private const float scroll_y_centre = 0.1f;
 
         public SectionsContainer()

From a9c8f9bd4aebe9929007a89bdb5a938aa1541077 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Jan 2021 17:47:38 +0900
Subject: [PATCH 1043/3722] Fix a potential crash when exiting the editor
 before a new beatmap is added to the database

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

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index b7ebf0c0a4..66fe1a9507 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Threading;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -109,7 +110,16 @@ namespace osu.Game.Screens.Edit
             if (Beatmap.Value is DummyWorkingBeatmap)
             {
                 isNewBeatmap = true;
-                Beatmap.Value = beatmapManager.CreateNew(Ruleset.Value, api.LocalUser.Value);
+
+                var newBeatmap = beatmapManager.CreateNew(Ruleset.Value, api.LocalUser.Value);
+
+                // this is a bit haphazard, but guards against setting the lease Beatmap bindable if
+                // the editor has already been exited.
+                if (!ValidForPush)
+                    return;
+
+                // this probably shouldn't be set in the asynchronous load method, but everything following relies on it.
+                Beatmap.Value = newBeatmap;
             }
 
             beatDivisor.Value = Beatmap.Value.BeatmapInfo.BeatDivisor;

From b44bd8c4eea20cb3338c3f85e639a7472b6f5262 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 22 Jan 2021 18:03:33 +0900
Subject: [PATCH 1044/3722] Remove unused using statement

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

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 66fe1a9507..a49de3b887 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Threading;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;

From e0f8f6a23f64b584e5592a39e81e21e5e555195a Mon Sep 17 00:00:00 2001
From: Mysfit <mysfit@mysfit.dev>
Date: Fri, 22 Jan 2021 12:09:40 -0500
Subject: [PATCH 1045/3722] introduce overrideable bool instead of copying
 event logic entirely

---
 osu.Game/Skinning/PausableSkinnableSound.cs   | 58 +++++++++----------
 .../Drawables/DrawableStoryboardSample.cs     | 15 +----
 2 files changed, 30 insertions(+), 43 deletions(-)

diff --git a/osu.Game/Skinning/PausableSkinnableSound.cs b/osu.Game/Skinning/PausableSkinnableSound.cs
index b48cf5d448..6245bcae02 100644
--- a/osu.Game/Skinning/PausableSkinnableSound.cs
+++ b/osu.Game/Skinning/PausableSkinnableSound.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Skinning
 
         protected bool RequestedPlaying { get; private set; }
 
-        private readonly IBindable<bool> samplePlaybackDisabled = new Bindable<bool>();
+        protected virtual bool AllowNonLoopingCutOff => false;
 
         public PausableSkinnableSound()
         {
@@ -34,6 +34,8 @@ namespace osu.Game.Skinning
         {
         }
 
+        private readonly IBindable<bool> samplePlaybackDisabled = new Bindable<bool>();
+
         private ScheduledDelegate scheduledStart;
 
         [BackgroundDependencyLoader(true)]
@@ -43,28 +45,34 @@ namespace osu.Game.Skinning
             if (samplePlaybackDisabler != null)
             {
                 samplePlaybackDisabled.BindTo(samplePlaybackDisabler.SamplePlaybackDisabled);
-                samplePlaybackDisabled.BindValueChanged(SamplePlaybackDisabledChanged);
+                samplePlaybackDisabled.BindValueChanged(disabled =>
+                {
+                    if (!RequestedPlaying) return;
+
+                    // if the sample is non-looping, and non-looping cut off is not allowed,
+                    // let the sample play out to completion (sounds better than abruptly cutting off).
+                    if (!Looping && !AllowNonLoopingCutOff) return;
+
+                    cancelPendingStart();
+
+                    if (disabled.NewValue)
+                        base.Stop();
+                    else
+                    {
+                        // schedule so we don't start playing a sample which is no longer alive.
+                        scheduledStart = Schedule(() =>
+                        {
+                            if (RequestedPlaying)
+                                base.Play();
+                        });
+                    }
+                });
             }
         }
 
-        protected virtual void SamplePlaybackDisabledChanged(ValueChangedEvent<bool> disabled)
-        {
-            if (!RequestedPlaying) return;
-
-            // let non-looping samples that have already been started play out to completion (sounds better than abruptly cutting off).
-            if (!Looping) return;
-
-            CancelPendingStart();
-
-            if (disabled.NewValue)
-                base.Stop();
-            else
-                ScheduleStart();
-        }
-
         public override void Play(bool restart = true)
         {
-            CancelPendingStart();
+            cancelPendingStart();
             RequestedPlaying = true;
 
             if (samplePlaybackDisabled.Value)
@@ -75,25 +83,15 @@ namespace osu.Game.Skinning
 
         public override void Stop()
         {
-            CancelPendingStart();
+            cancelPendingStart();
             RequestedPlaying = false;
             base.Stop();
         }
 
-        protected void CancelPendingStart()
+        private void cancelPendingStart()
         {
             scheduledStart?.Cancel();
             scheduledStart = null;
         }
-
-        protected void ScheduleStart()
-        {
-            // schedule so we don't start playing a sample which is no longer alive.
-            scheduledStart = Schedule(() =>
-            {
-                if (RequestedPlaying)
-                    base.Play();
-            });
-        }
     }
 }
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
index d5e1e19666..ebdf64e7ba 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
@@ -21,6 +21,8 @@ namespace osu.Game.Storyboards.Drawables
 
         public override bool RemoveWhenNotAlive => false;
 
+        protected override bool AllowNonLoopingCutOff => true;
+
         public DrawableStoryboardSample(StoryboardSampleInfo sampleInfo)
             : base(sampleInfo)
         {
@@ -31,19 +33,6 @@ namespace osu.Game.Storyboards.Drawables
         [Resolved]
         private IBindable<IReadOnlyList<Mod>> mods { get; set; }
 
-        protected override void SamplePlaybackDisabledChanged(ValueChangedEvent<bool> disabled)
-        {
-            if (!RequestedPlaying) return;
-
-            if (disabled.NewValue)
-                Stop();
-            else
-            {
-                CancelPendingStart();
-                ScheduleStart();
-            }
-        }
-
         protected override void SkinChanged(ISkinSource skin, bool allowFallback)
         {
             base.SkinChanged(skin, allowFallback);

From 6379381f957c9194050f9ae5f47d15edba39f802 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 22 Jan 2021 20:46:20 +0300
Subject: [PATCH 1046/3722] Make VotePill background transparent for own
 comments

---
 .../Visual/Online/TestSceneVotePill.cs          | 17 +++++++++++++++--
 osu.Game/Overlays/Comments/VotePill.cs          | 14 ++++++++++----
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs b/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs
index 9bb29541ec..420f6b1ab6 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs
@@ -7,6 +7,7 @@ using osu.Game.Overlays.Comments;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Framework.Allocation;
 using osu.Game.Overlays;
+using osu.Framework.Graphics.Shapes;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -16,13 +17,14 @@ namespace osu.Game.Tests.Visual.Online
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
 
-        private VotePill votePill;
+        private TestPill votePill;
 
         [Test]
         public void TestUserCommentPill()
         {
             AddStep("Log in", logIn);
             AddStep("User comment", () => addVotePill(getUserComment()));
+            AddAssert("Background is transparent", () => votePill.Background.Alpha == 0);
             AddStep("Click", () => votePill.Click());
             AddAssert("Not loading", () => !votePill.IsLoading);
         }
@@ -32,6 +34,7 @@ namespace osu.Game.Tests.Visual.Online
         {
             AddStep("Log in", logIn);
             AddStep("Random comment", () => addVotePill(getRandomComment()));
+            AddAssert("Background is not transparent", () => votePill.Background.Alpha == 1);
             AddStep("Click", () => votePill.Click());
             AddAssert("Loading", () => votePill.IsLoading);
         }
@@ -64,11 +67,21 @@ namespace osu.Game.Tests.Visual.Online
         private void addVotePill(Comment comment)
         {
             Clear();
-            Add(votePill = new VotePill(comment)
+            Add(votePill = new TestPill(comment)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
             });
         }
+
+        private class TestPill : VotePill
+        {
+            public new Box Background => base.Background;
+
+            public TestPill(Comment comment)
+                : base(comment)
+            {
+            }
+        }
     }
 }
diff --git a/osu.Game/Overlays/Comments/VotePill.cs b/osu.Game/Overlays/Comments/VotePill.cs
index aa9723ea85..b6e6aa82c7 100644
--- a/osu.Game/Overlays/Comments/VotePill.cs
+++ b/osu.Game/Overlays/Comments/VotePill.cs
@@ -36,8 +36,10 @@ namespace osu.Game.Overlays.Comments
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; }
 
+        protected Box Background { get; private set; }
+
         private readonly Comment comment;
-        private Box background;
+
         private Box hoverLayer;
         private CircularContainer borderContainer;
         private SpriteText sideNumber;
@@ -62,8 +64,12 @@ namespace osu.Game.Overlays.Comments
             AccentColour = borderContainer.BorderColour = sideNumber.Colour = colours.GreenLight;
             hoverLayer.Colour = Color4.Black.Opacity(0.5f);
 
-            if (api.IsLoggedIn && api.LocalUser.Value.Id != comment.UserId)
+            var ownComment = api.LocalUser.Value.Id == comment.UserId;
+
+            if (api.IsLoggedIn && !ownComment)
                 Action = onAction;
+
+            Background.Alpha = ownComment ? 0 : 1;
         }
 
         protected override void LoadComplete()
@@ -71,7 +77,7 @@ namespace osu.Game.Overlays.Comments
             base.LoadComplete();
             isVoted.Value = comment.IsVoted;
             votesCount.Value = comment.VotesCount;
-            isVoted.BindValueChanged(voted => background.Colour = voted.NewValue ? AccentColour : colourProvider.Background6, true);
+            isVoted.BindValueChanged(voted => Background.Colour = voted.NewValue ? AccentColour : colourProvider.Background6, true);
             votesCount.BindValueChanged(count => votesCounter.Text = $"+{count.NewValue}", true);
         }
 
@@ -102,7 +108,7 @@ namespace osu.Game.Overlays.Comments
                     Masking = true,
                     Children = new Drawable[]
                     {
-                        background = new Box
+                        Background = new Box
                         {
                             RelativeSizeAxes = Axes.Both
                         },

From 61fcb486a8c7aea90c40b2c9f881fcc295f7b8de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 22 Jan 2021 19:47:38 +0100
Subject: [PATCH 1047/3722] Trim unnecessary parentheses

---
 osu.Game/Graphics/Containers/SectionsContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index 741fc17695..624ec70cb6 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -181,7 +181,7 @@ namespace osu.Game.Graphics.Containers
         {
             base.UpdateAfterChildren();
 
-            float fixedHeaderSize = (FixedHeader?.LayoutSize.Y ?? 0);
+            float fixedHeaderSize = FixedHeader?.LayoutSize.Y ?? 0;
             float expandableHeaderSize = ExpandableHeader?.LayoutSize.Y ?? 0;
 
             float headerH = expandableHeaderSize + fixedHeaderSize;

From 20161aea6a472320f34ff0e8057d08a0cdea527d Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 22 Jan 2021 21:47:53 +0300
Subject: [PATCH 1048/3722] Show LoginOverlay if not logged-in when clicking on
 a pill

---
 .../Visual/Online/TestSceneVotePill.cs        | 32 ++++++++++++++++---
 osu.Game/Overlays/Comments/VotePill.cs        | 11 ++++++-
 2 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs b/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs
index 420f6b1ab6..e9e826e62f 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs
@@ -8,6 +8,7 @@ using osu.Game.Online.API.Requests.Responses;
 using osu.Framework.Allocation;
 using osu.Game.Overlays;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Containers;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -17,11 +18,30 @@ namespace osu.Game.Tests.Visual.Online
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
 
+        [Cached]
+        private LoginOverlay login;
+
         private TestPill votePill;
+        private readonly Container pillContainer;
+
+        public TestSceneVotePill()
+        {
+            AddRange(new Drawable[]
+            {
+                pillContainer = new Container
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    AutoSizeAxes = Axes.Both
+                },
+                login = new LoginOverlay()
+            });
+        }
 
         [Test]
         public void TestUserCommentPill()
         {
+            AddStep("Hide login overlay", () => login.Hide());
             AddStep("Log in", logIn);
             AddStep("User comment", () => addVotePill(getUserComment()));
             AddAssert("Background is transparent", () => votePill.Background.Alpha == 0);
@@ -32,9 +52,10 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestRandomCommentPill()
         {
+            AddStep("Hide login overlay", () => login.Hide());
             AddStep("Log in", logIn);
             AddStep("Random comment", () => addVotePill(getRandomComment()));
-            AddAssert("Background is not transparent", () => votePill.Background.Alpha == 1);
+            AddAssert("Background is visible", () => votePill.Background.Alpha == 1);
             AddStep("Click", () => votePill.Click());
             AddAssert("Loading", () => votePill.IsLoading);
         }
@@ -42,10 +63,11 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestOfflineRandomCommentPill()
         {
+            AddStep("Hide login overlay", () => login.Hide());
             AddStep("Log out", API.Logout);
             AddStep("Random comment", () => addVotePill(getRandomComment()));
             AddStep("Click", () => votePill.Click());
-            AddAssert("Not loading", () => !votePill.IsLoading);
+            AddAssert("Login overlay is visible", () => login.State.Value == Visibility.Visible);
         }
 
         private void logIn() => API.Login("localUser", "password");
@@ -66,12 +88,12 @@ namespace osu.Game.Tests.Visual.Online
 
         private void addVotePill(Comment comment)
         {
-            Clear();
-            Add(votePill = new TestPill(comment)
+            pillContainer.Clear();
+            pillContainer.Child = votePill = new TestPill(comment)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-            });
+            };
         }
 
         private class TestPill : VotePill
diff --git a/osu.Game/Overlays/Comments/VotePill.cs b/osu.Game/Overlays/Comments/VotePill.cs
index b6e6aa82c7..cf3c470f96 100644
--- a/osu.Game/Overlays/Comments/VotePill.cs
+++ b/osu.Game/Overlays/Comments/VotePill.cs
@@ -33,6 +33,9 @@ namespace osu.Game.Overlays.Comments
         [Resolved]
         private IAPIProvider api { get; set; }
 
+        [Resolved(canBeNull: true)]
+        private LoginOverlay login { get; set; }
+
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; }
 
@@ -66,7 +69,7 @@ namespace osu.Game.Overlays.Comments
 
             var ownComment = api.LocalUser.Value.Id == comment.UserId;
 
-            if (api.IsLoggedIn && !ownComment)
+            if (!ownComment)
                 Action = onAction;
 
             Background.Alpha = ownComment ? 0 : 1;
@@ -83,6 +86,12 @@ namespace osu.Game.Overlays.Comments
 
         private void onAction()
         {
+            if (!api.IsLoggedIn)
+            {
+                login?.Show();
+                return;
+            }
+
             request = new CommentVoteRequest(comment.Id, isVoted.Value ? CommentVoteAction.UnVote : CommentVoteAction.Vote);
             request.Success += onSuccess;
             api.Queue(request);

From f3192877fee57db6f29d84faa208d10d1bdf41b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 22 Jan 2021 19:48:33 +0100
Subject: [PATCH 1049/3722] Update outdated comment

---
 osu.Game/Graphics/Containers/SectionsContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index 624ec70cb6..8ab146efe7 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -217,7 +217,7 @@ namespace osu.Game.Graphics.Containers
 
                 var smallestSectionHeight = Children.Count > 0 ? Children.Min(d => d.Height) : 0;
 
-                // scroll offset is our fixed header height if we have it plus 20% of content height
+                // scroll offset is our fixed header height if we have it plus 10% of content height
                 // plus 5% to fix floating point errors and to not have a section instantly unselect when scrolling upwards
                 // but the 5% can't be bigger than our smallest section height, otherwise it won't get selected correctly
                 float selectionLenienceAboveSection = Math.Min(smallestSectionHeight / 2.0f, scrollContainer.DisplayableContent * 0.05f);

From 3d42cc1f9199715990aa25c234a15885a87ec09a Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 22 Jan 2021 22:27:26 +0300
Subject: [PATCH 1050/3722] Minor refactoring

---
 .../Visual/Online/TestSceneVotePill.cs        | 19 ++-----
 osu.Game/Overlays/Comments/VotePill.cs        | 53 ++++++++-----------
 2 files changed, 26 insertions(+), 46 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs b/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs
index e9e826e62f..6334c014c8 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs
@@ -7,7 +7,6 @@ using osu.Game.Overlays.Comments;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Framework.Allocation;
 using osu.Game.Overlays;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Containers;
 
 namespace osu.Game.Tests.Visual.Online
@@ -21,7 +20,7 @@ namespace osu.Game.Tests.Visual.Online
         [Cached]
         private LoginOverlay login;
 
-        private TestPill votePill;
+        private VotePill votePill;
         private readonly Container pillContainer;
 
         public TestSceneVotePill()
@@ -44,7 +43,7 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("Hide login overlay", () => login.Hide());
             AddStep("Log in", logIn);
             AddStep("User comment", () => addVotePill(getUserComment()));
-            AddAssert("Background is transparent", () => votePill.Background.Alpha == 0);
+            AddAssert("Is disabled", () => !votePill.Enabled.Value);
             AddStep("Click", () => votePill.Click());
             AddAssert("Not loading", () => !votePill.IsLoading);
         }
@@ -55,7 +54,7 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("Hide login overlay", () => login.Hide());
             AddStep("Log in", logIn);
             AddStep("Random comment", () => addVotePill(getRandomComment()));
-            AddAssert("Background is visible", () => votePill.Background.Alpha == 1);
+            AddAssert("Is enabled", () => votePill.Enabled.Value);
             AddStep("Click", () => votePill.Click());
             AddAssert("Loading", () => votePill.IsLoading);
         }
@@ -89,21 +88,11 @@ namespace osu.Game.Tests.Visual.Online
         private void addVotePill(Comment comment)
         {
             pillContainer.Clear();
-            pillContainer.Child = votePill = new TestPill(comment)
+            pillContainer.Child = votePill = new VotePill(comment)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
             };
         }
-
-        private class TestPill : VotePill
-        {
-            public new Box Background => base.Background;
-
-            public TestPill(Comment comment)
-                : base(comment)
-            {
-            }
-        }
     }
 }
diff --git a/osu.Game/Overlays/Comments/VotePill.cs b/osu.Game/Overlays/Comments/VotePill.cs
index cf3c470f96..04a0508f3d 100644
--- a/osu.Game/Overlays/Comments/VotePill.cs
+++ b/osu.Game/Overlays/Comments/VotePill.cs
@@ -39,10 +39,9 @@ namespace osu.Game.Overlays.Comments
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; }
 
-        protected Box Background { get; private set; }
-
+        private bool isOwnComment;
         private readonly Comment comment;
-
+        private Box background;
         private Box hoverLayer;
         private CircularContainer borderContainer;
         private SpriteText sideNumber;
@@ -64,15 +63,14 @@ namespace osu.Game.Overlays.Comments
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
+            isOwnComment = api.LocalUser.Value.Id == comment.UserId;
+            Action = onAction;
+
             AccentColour = borderContainer.BorderColour = sideNumber.Colour = colours.GreenLight;
             hoverLayer.Colour = Color4.Black.Opacity(0.5f);
+            background.Alpha = isOwnComment ? 0 : 1;
 
-            var ownComment = api.LocalUser.Value.Id == comment.UserId;
-
-            if (!ownComment)
-                Action = onAction;
-
-            Background.Alpha = ownComment ? 0 : 1;
+            Enabled.Value = !isOwnComment;
         }
 
         protected override void LoadComplete()
@@ -80,7 +78,7 @@ namespace osu.Game.Overlays.Comments
             base.LoadComplete();
             isVoted.Value = comment.IsVoted;
             votesCount.Value = comment.VotesCount;
-            isVoted.BindValueChanged(voted => Background.Colour = voted.NewValue ? AccentColour : colourProvider.Background6, true);
+            isVoted.BindValueChanged(voted => background.Colour = voted.NewValue ? AccentColour : colourProvider.Background6, true);
             votesCount.BindValueChanged(count => votesCounter.Text = $"+{count.NewValue}", true);
         }
 
@@ -117,7 +115,7 @@ namespace osu.Game.Overlays.Comments
                     Masking = true,
                     Children = new Drawable[]
                     {
-                        Background = new Box
+                        background = new Box
                         {
                             RelativeSizeAxes = Axes.Both
                         },
@@ -151,55 +149,48 @@ namespace osu.Game.Overlays.Comments
         protected override void OnLoadStarted()
         {
             votesCounter.FadeOut(duration, Easing.OutQuint);
-            updateDisplay();
+            updateDisplay(false);
         }
 
         protected override void OnLoadFinished()
         {
             votesCounter.FadeIn(duration, Easing.OutQuint);
-
-            if (IsHovered)
-                onHoverAction();
+            updateDisplay(IsHovered);
         }
 
         protected override bool OnHover(HoverEvent e)
         {
-            onHoverAction();
+            if (!isOwnComment && !IsLoading)
+                updateDisplay(true);
+
             return base.OnHover(e);
         }
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
-            updateDisplay();
+            if (!isOwnComment && !IsLoading)
+                updateDisplay(false);
+
             base.OnHoverLost(e);
         }
 
-        private void updateDisplay()
+        private void updateDisplay(bool isHovered)
         {
-            if (Action == null)
-                return;
-
             if (isVoted.Value)
             {
-                hoverLayer.FadeTo(IsHovered ? 1 : 0);
+                hoverLayer.FadeTo(isHovered ? 1 : 0);
                 sideNumber.Hide();
             }
             else
-                sideNumber.FadeTo(IsHovered ? 1 : 0);
+                sideNumber.FadeTo(isHovered ? 1 : 0);
 
-            borderContainer.BorderThickness = IsHovered ? 3 : 0;
-        }
-
-        private void onHoverAction()
-        {
-            if (!IsLoading)
-                updateDisplay();
+            borderContainer.BorderThickness = isHovered ? 3 : 0;
         }
 
         protected override void Dispose(bool isDisposing)
         {
-            base.Dispose(isDisposing);
             request?.Cancel();
+            base.Dispose(isDisposing);
         }
     }
 }

From b692abd3c2574cacd5d41033e979f431069187e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 22 Jan 2021 20:17:21 +0100
Subject: [PATCH 1051/3722] Simplify condition from two to one operand

---
 osu.Game/Skinning/PausableSkinnableSound.cs         | 13 ++++++++-----
 .../Drawables/DrawableStoryboardSample.cs           |  6 +++++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Skinning/PausableSkinnableSound.cs b/osu.Game/Skinning/PausableSkinnableSound.cs
index 6245bcae02..d8149e76c0 100644
--- a/osu.Game/Skinning/PausableSkinnableSound.cs
+++ b/osu.Game/Skinning/PausableSkinnableSound.cs
@@ -18,7 +18,13 @@ namespace osu.Game.Skinning
 
         protected bool RequestedPlaying { get; private set; }
 
-        protected virtual bool AllowNonLoopingCutOff => false;
+        /// <summary>
+        /// Whether this <see cref="PausableSkinnableSound"/> is affected by
+        /// a higher-level <see cref="ISamplePlaybackDisabler"/>'s state changes.
+        /// By default only looping samples are started/stopped on sample disable
+        /// to prevent one-time samples from cutting off abruptly.
+        /// </summary>
+        protected virtual bool AffectedBySamplePlaybackDisable => Looping;
 
         public PausableSkinnableSound()
         {
@@ -48,10 +54,7 @@ namespace osu.Game.Skinning
                 samplePlaybackDisabled.BindValueChanged(disabled =>
                 {
                     if (!RequestedPlaying) return;
-
-                    // if the sample is non-looping, and non-looping cut off is not allowed,
-                    // let the sample play out to completion (sounds better than abruptly cutting off).
-                    if (!Looping && !AllowNonLoopingCutOff) return;
+                    if (!AffectedBySamplePlaybackDisable) return;
 
                     cancelPendingStart();
 
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
index ebdf64e7ba..5a800a71fd 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
@@ -21,7 +21,11 @@ namespace osu.Game.Storyboards.Drawables
 
         public override bool RemoveWhenNotAlive => false;
 
-        protected override bool AllowNonLoopingCutOff => true;
+        /// <remarks>
+        /// Contrary to <see cref="PausableSkinnableSound"/>, all <see cref="DrawableStoryboardSample"/>s are affected
+        /// by sample disables, as they are oftentimes longer-running sound effects. This also matches stable behaviour.
+        /// </remarks>
+        protected override bool AffectedBySamplePlaybackDisable => true;
 
         public DrawableStoryboardSample(StoryboardSampleInfo sampleInfo)
             : base(sampleInfo)

From e9d10bb6e7bf9d9e48d25263cdc7c8f696b9a27a Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 22 Jan 2021 22:49:49 +0300
Subject: [PATCH 1052/3722] Revert "Minor refactoring"

This reverts commit 3d42cc1f9199715990aa25c234a15885a87ec09a.
---
 .../Visual/Online/TestSceneVotePill.cs        | 19 +++++--
 osu.Game/Overlays/Comments/VotePill.cs        | 53 +++++++++++--------
 2 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs b/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs
index 6334c014c8..e9e826e62f 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs
@@ -7,6 +7,7 @@ using osu.Game.Overlays.Comments;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Framework.Allocation;
 using osu.Game.Overlays;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Containers;
 
 namespace osu.Game.Tests.Visual.Online
@@ -20,7 +21,7 @@ namespace osu.Game.Tests.Visual.Online
         [Cached]
         private LoginOverlay login;
 
-        private VotePill votePill;
+        private TestPill votePill;
         private readonly Container pillContainer;
 
         public TestSceneVotePill()
@@ -43,7 +44,7 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("Hide login overlay", () => login.Hide());
             AddStep("Log in", logIn);
             AddStep("User comment", () => addVotePill(getUserComment()));
-            AddAssert("Is disabled", () => !votePill.Enabled.Value);
+            AddAssert("Background is transparent", () => votePill.Background.Alpha == 0);
             AddStep("Click", () => votePill.Click());
             AddAssert("Not loading", () => !votePill.IsLoading);
         }
@@ -54,7 +55,7 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("Hide login overlay", () => login.Hide());
             AddStep("Log in", logIn);
             AddStep("Random comment", () => addVotePill(getRandomComment()));
-            AddAssert("Is enabled", () => votePill.Enabled.Value);
+            AddAssert("Background is visible", () => votePill.Background.Alpha == 1);
             AddStep("Click", () => votePill.Click());
             AddAssert("Loading", () => votePill.IsLoading);
         }
@@ -88,11 +89,21 @@ namespace osu.Game.Tests.Visual.Online
         private void addVotePill(Comment comment)
         {
             pillContainer.Clear();
-            pillContainer.Child = votePill = new VotePill(comment)
+            pillContainer.Child = votePill = new TestPill(comment)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
             };
         }
+
+        private class TestPill : VotePill
+        {
+            public new Box Background => base.Background;
+
+            public TestPill(Comment comment)
+                : base(comment)
+            {
+            }
+        }
     }
 }
diff --git a/osu.Game/Overlays/Comments/VotePill.cs b/osu.Game/Overlays/Comments/VotePill.cs
index 04a0508f3d..cf3c470f96 100644
--- a/osu.Game/Overlays/Comments/VotePill.cs
+++ b/osu.Game/Overlays/Comments/VotePill.cs
@@ -39,9 +39,10 @@ namespace osu.Game.Overlays.Comments
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; }
 
-        private bool isOwnComment;
+        protected Box Background { get; private set; }
+
         private readonly Comment comment;
-        private Box background;
+
         private Box hoverLayer;
         private CircularContainer borderContainer;
         private SpriteText sideNumber;
@@ -63,14 +64,15 @@ namespace osu.Game.Overlays.Comments
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            isOwnComment = api.LocalUser.Value.Id == comment.UserId;
-            Action = onAction;
-
             AccentColour = borderContainer.BorderColour = sideNumber.Colour = colours.GreenLight;
             hoverLayer.Colour = Color4.Black.Opacity(0.5f);
-            background.Alpha = isOwnComment ? 0 : 1;
 
-            Enabled.Value = !isOwnComment;
+            var ownComment = api.LocalUser.Value.Id == comment.UserId;
+
+            if (!ownComment)
+                Action = onAction;
+
+            Background.Alpha = ownComment ? 0 : 1;
         }
 
         protected override void LoadComplete()
@@ -78,7 +80,7 @@ namespace osu.Game.Overlays.Comments
             base.LoadComplete();
             isVoted.Value = comment.IsVoted;
             votesCount.Value = comment.VotesCount;
-            isVoted.BindValueChanged(voted => background.Colour = voted.NewValue ? AccentColour : colourProvider.Background6, true);
+            isVoted.BindValueChanged(voted => Background.Colour = voted.NewValue ? AccentColour : colourProvider.Background6, true);
             votesCount.BindValueChanged(count => votesCounter.Text = $"+{count.NewValue}", true);
         }
 
@@ -115,7 +117,7 @@ namespace osu.Game.Overlays.Comments
                     Masking = true,
                     Children = new Drawable[]
                     {
-                        background = new Box
+                        Background = new Box
                         {
                             RelativeSizeAxes = Axes.Both
                         },
@@ -149,48 +151,55 @@ namespace osu.Game.Overlays.Comments
         protected override void OnLoadStarted()
         {
             votesCounter.FadeOut(duration, Easing.OutQuint);
-            updateDisplay(false);
+            updateDisplay();
         }
 
         protected override void OnLoadFinished()
         {
             votesCounter.FadeIn(duration, Easing.OutQuint);
-            updateDisplay(IsHovered);
+
+            if (IsHovered)
+                onHoverAction();
         }
 
         protected override bool OnHover(HoverEvent e)
         {
-            if (!isOwnComment && !IsLoading)
-                updateDisplay(true);
-
+            onHoverAction();
             return base.OnHover(e);
         }
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
-            if (!isOwnComment && !IsLoading)
-                updateDisplay(false);
-
+            updateDisplay();
             base.OnHoverLost(e);
         }
 
-        private void updateDisplay(bool isHovered)
+        private void updateDisplay()
         {
+            if (Action == null)
+                return;
+
             if (isVoted.Value)
             {
-                hoverLayer.FadeTo(isHovered ? 1 : 0);
+                hoverLayer.FadeTo(IsHovered ? 1 : 0);
                 sideNumber.Hide();
             }
             else
-                sideNumber.FadeTo(isHovered ? 1 : 0);
+                sideNumber.FadeTo(IsHovered ? 1 : 0);
 
-            borderContainer.BorderThickness = isHovered ? 3 : 0;
+            borderContainer.BorderThickness = IsHovered ? 3 : 0;
+        }
+
+        private void onHoverAction()
+        {
+            if (!IsLoading)
+                updateDisplay();
         }
 
         protected override void Dispose(bool isDisposing)
         {
-            request?.Cancel();
             base.Dispose(isDisposing);
+            request?.Cancel();
         }
     }
 }

From adcef19ab25953f003bc150654798f82e739a7d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 23 Jan 2021 15:44:30 +0100
Subject: [PATCH 1053/3722] Add coverage for operation tracker with failing
 tests

---
 .../NonVisual/OngoingOperationTrackerTest.cs  | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 osu.Game.Tests/NonVisual/OngoingOperationTrackerTest.cs

diff --git a/osu.Game.Tests/NonVisual/OngoingOperationTrackerTest.cs b/osu.Game.Tests/NonVisual/OngoingOperationTrackerTest.cs
new file mode 100644
index 0000000000..b2be83d1f9
--- /dev/null
+++ b/osu.Game.Tests/NonVisual/OngoingOperationTrackerTest.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 System;
+using NUnit.Framework;
+using osu.Framework.Bindables;
+using osu.Framework.Testing;
+using osu.Game.Screens.OnlinePlay;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Tests.NonVisual
+{
+    [HeadlessTest]
+    public class OngoingOperationTrackerTest : OsuTestScene
+    {
+        private OngoingOperationTracker tracker;
+        private IBindable<bool> operationInProgress;
+
+        [SetUpSteps]
+        public void SetUp()
+        {
+            AddStep("create tracker", () => Child = tracker = new OngoingOperationTracker());
+            AddStep("bind to operation status", () => operationInProgress = tracker.InProgress.GetBoundCopy());
+        }
+
+        [Test]
+        public void TestOperationTracking()
+        {
+            IDisposable firstOperation = null;
+            IDisposable secondOperation = null;
+
+            AddStep("begin first operation", () => firstOperation = tracker.BeginOperation());
+            AddAssert("operation in progress", () => operationInProgress.Value);
+
+            AddStep("cannot start another operation",
+                () => Assert.Throws<InvalidOperationException>(() => tracker.BeginOperation()));
+
+            AddStep("end first operation", () => firstOperation.Dispose());
+            AddAssert("operation is ended", () => !operationInProgress.Value);
+
+            AddStep("start second operation", () => secondOperation = tracker.BeginOperation());
+            AddAssert("operation in progress", () => operationInProgress.Value);
+
+            AddStep("dispose first operation again", () => firstOperation.Dispose());
+            AddAssert("operation in progress", () => operationInProgress.Value);
+
+            AddStep("dispose second operation", () => secondOperation.Dispose());
+            AddAssert("operation is ended", () => !operationInProgress.Value);
+        }
+
+        [Test]
+        public void TestOperationDisposalAfterTracker()
+        {
+            IDisposable operation = null;
+
+            AddStep("begin operation", () => operation = tracker.BeginOperation());
+            AddStep("dispose tracker", () => tracker.Expire());
+            AddStep("end operation", () => operation.Dispose());
+            AddAssert("operation is ended", () => !operationInProgress.Value);
+        }
+    }
+}

From 18b309a195e9aea1890a726dc1c77ed1f2e7afdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 23 Jan 2021 16:02:51 +0100
Subject: [PATCH 1054/3722] Make disposal of tracker operation idempotent

---
 osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
index 5c9e9ce90b..b834d4fa25 100644
--- a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
+++ b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
@@ -49,10 +49,7 @@ namespace osu.Game.Screens.OnlinePlay
 
         private void endOperation()
         {
-            if (leasedInProgress == null)
-                throw new InvalidOperationException("Cannot end operation multiple times.");
-
-            leasedInProgress.Return();
+            leasedInProgress?.Return();
             leasedInProgress = null;
         }
     }

From 7f89d9117d98f593209bc90271dd099a2febbcfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 23 Jan 2021 16:04:12 +0100
Subject: [PATCH 1055/3722] Make disposal of tracker idempotent for operations

---
 osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
index b834d4fa25..5d171e6e43 100644
--- a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
+++ b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
@@ -52,5 +52,13 @@ namespace osu.Game.Screens.OnlinePlay
             leasedInProgress?.Return();
             leasedInProgress = null;
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            // base call does an UnbindAllBindables().
+            // clean up the leased reference here so that it doesn't get returned twice.
+            leasedInProgress = null;
+        }
     }
 }

From d22f557a3bd074ff4ee29128f7d8a3375dece37d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 23 Jan 2021 16:14:58 +0100
Subject: [PATCH 1056/3722] Remove possibility of double-disposal interference

---
 .../OnlinePlay/OngoingOperationTracker.cs     | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
index 5d171e6e43..060f1d7b91 100644
--- a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
+++ b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Screens.OnlinePlay
             leasedInProgress.Value = true;
 
             // for extra safety, marshal the end of operation back to the update thread if necessary.
-            return new InvokeOnDisposal(() => Scheduler.Add(endOperation, false));
+            return new OngoingOperation(() => Scheduler.Add(endOperation, false));
         }
 
         private void endOperation()
@@ -60,5 +60,26 @@ namespace osu.Game.Screens.OnlinePlay
             // clean up the leased reference here so that it doesn't get returned twice.
             leasedInProgress = null;
         }
+
+        private class OngoingOperation : InvokeOnDisposal
+        {
+            private bool isDisposed;
+
+            public OngoingOperation(Action action)
+                : base(action)
+            {
+            }
+
+            public override void Dispose()
+            {
+                // base class does not check disposal state for performance reasons which aren't relevant here.
+                // track locally, to avoid interfering with other operations in case of a potential double-disposal.
+                if (isDisposed)
+                    return;
+
+                base.Dispose();
+                isDisposed = true;
+            }
+        }
     }
 }

From c30b700b3a320d070ceebac14e3f43cdd770661c Mon Sep 17 00:00:00 2001
From: yhsphd <yhsphd05@gmail.com>
Date: Sun, 24 Jan 2021 00:26:52 +0900
Subject: [PATCH 1057/3722] "started" for past matches

fixes grammar error at 'coming up next' section in schedule screen which displays schedule like "starting an hour ago" for past matches
---
 osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
index 88289ad6bd..b3fa9dc91c 100644
--- a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
+++ b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
@@ -194,7 +194,7 @@ namespace osu.Game.Tournament.Screens.Schedule
                                         {
                                             new TournamentSpriteText
                                             {
-                                                Text = "Starting ",
+                                                Text = match.NewValue.Date.Value.CompareTo(DateTimeOffset.Now) > 0 ? "Starting " : "Started ",
                                                 Font = OsuFont.Torus.With(size: 24, weight: FontWeight.Regular)
                                             },
                                             new DrawableDate(match.NewValue.Date.Value)

From 899942611fcb085fc09226c84a7bbbd47500450f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 23 Jan 2021 17:01:47 +0100
Subject: [PATCH 1058/3722] Add tests for time display

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

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs
index b240ef3ae5..0da8d1eb4a 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.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 System;
+using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Tournament.Components;
@@ -16,5 +18,23 @@ namespace osu.Game.Tournament.Tests.Screens
             Add(new TourneyVideo("main") { RelativeSizeAxes = Axes.Both });
             Add(new ScheduleScreen());
         }
+
+        [Test]
+        public void TestCurrentMatchTime()
+        {
+            setMatchDate(TimeSpan.FromDays(-1));
+            setMatchDate(TimeSpan.FromSeconds(5));
+            setMatchDate(TimeSpan.FromMinutes(4));
+            setMatchDate(TimeSpan.FromHours(3));
+        }
+
+        private void setMatchDate(TimeSpan relativeTime)
+            // Humanizer cannot handle negative timespans.
+            => AddStep($"start time is {relativeTime}", () =>
+            {
+                var match = CreateSampleMatch();
+                match.Date.Value = DateTimeOffset.Now + relativeTime;
+                Ladder.CurrentMatch.Value = match;
+            });
     }
 }

From a8fa09103cc0573dff3c0a3f2681293f40f45ab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 23 Jan 2021 17:16:13 +0100
Subject: [PATCH 1059/3722] Update match start text prefix in real time

---
 .../Screens/Schedule/ScheduleScreen.cs        | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
index b3fa9dc91c..c1d8c8ddd3 100644
--- a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
+++ b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
@@ -192,12 +192,7 @@ namespace osu.Game.Tournament.Screens.Schedule
                                         Origin = Anchor.CentreLeft,
                                         Children = new Drawable[]
                                         {
-                                            new TournamentSpriteText
-                                            {
-                                                Text = match.NewValue.Date.Value.CompareTo(DateTimeOffset.Now) > 0 ? "Starting " : "Started ",
-                                                Font = OsuFont.Torus.With(size: 24, weight: FontWeight.Regular)
-                                            },
-                                            new DrawableDate(match.NewValue.Date.Value)
+                                            new ScheduleMatchDate(match.NewValue.Date.Value)
                                             {
                                                 Font = OsuFont.Torus.With(size: 24, weight: FontWeight.Regular)
                                             }
@@ -251,6 +246,18 @@ namespace osu.Game.Tournament.Screens.Schedule
             }
         }
 
+        public class ScheduleMatchDate : DrawableDate
+        {
+            public ScheduleMatchDate(DateTimeOffset date, float textSize = OsuFont.DEFAULT_FONT_SIZE, bool italic = true)
+                : base(date, textSize, italic)
+            {
+            }
+
+            protected override string Format() => Date < DateTimeOffset.Now
+                ? $"Started {base.Format()}"
+                : $"Starting {base.Format()}";
+        }
+
         public class ScheduleContainer : Container
         {
             protected override Container<Drawable> Content => content;

From d83abfa7d2cbcfcdb2922f1756a3b2b8fac18ff5 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 23 Jan 2021 23:29:32 +0300
Subject: [PATCH 1060/3722] Add test scene with failing test case

---
 .../TestSceneUpdateableBeatmapSetCover.cs     | 130 ++++++++++++++++++
 .../Drawables/UpdateableBeatmapSetCover.cs    |  14 +-
 2 files changed, 137 insertions(+), 7 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
new file mode 100644
index 0000000000..7daaae45a4
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
@@ -0,0 +1,130 @@
+// Copyright (c) ppy 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;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Drawables;
+using osu.Game.Graphics.Containers;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneUpdateableBeatmapSetCover : OsuTestScene
+    {
+        [Test]
+        public void TestLocal([Values] BeatmapSetCoverType coverType)
+        {
+            AddStep("setup cover", () => Child = new UpdateableBeatmapSetCover
+            {
+                CoverType = coverType,
+                BeatmapSet = CreateBeatmap(Ruleset.Value).BeatmapInfo.BeatmapSet,
+                RelativeSizeAxes = Axes.Both,
+                Masking = true,
+            });
+
+            AddUntilStep("wait for load", () => this.ChildrenOfType<BeatmapSetCover>().SingleOrDefault()?.IsLoaded ?? false);
+        }
+
+        [Test]
+        public void TestUnloadAndReload()
+        {
+            OsuScrollContainer scroll = null;
+            List<UpdateableBeatmapSetCover> covers = new List<UpdateableBeatmapSetCover>();
+
+            AddStep("setup covers", () =>
+            {
+                BeatmapSetInfo setInfo = CreateBeatmap(Ruleset.Value).BeatmapInfo.BeatmapSet;
+
+                FillFlowContainer fillFlow;
+
+                Child = scroll = new OsuScrollContainer
+                {
+                    Size = new Vector2(500f),
+                    Child = fillFlow = new FillFlowContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Direction = FillDirection.Vertical,
+                        Spacing = new Vector2(10),
+                        Padding = new MarginPadding { Bottom = 550 }
+                    }
+                };
+
+                var coverTypes = Enum.GetValues<BeatmapSetCoverType>();
+
+                for (int i = 0; i < 25; i++)
+                {
+                    var coverType = coverTypes[i % coverTypes.Length];
+
+                    var cover = new UpdateableBeatmapSetCover
+                    {
+                        CoverType = coverType,
+                        BeatmapSet = setInfo,
+                        Height = 100,
+                        Masking = true,
+                    };
+
+                    if (coverType == BeatmapSetCoverType.Cover)
+                        cover.Width = 500;
+                    else if (coverType == BeatmapSetCoverType.Card)
+                        cover.Width = 400;
+                    else if (coverType == BeatmapSetCoverType.List)
+                        cover.Size = new Vector2(100, 50);
+
+                    fillFlow.Add(cover);
+                    covers.Add(cover);
+                }
+            });
+
+            var loadedCovers = covers.Where(c => c.ChildrenOfType<BeatmapSetCover>().SingleOrDefault()?.IsLoaded ?? false);
+
+            AddUntilStep("some loaded", () => loadedCovers.Any());
+            AddStep("scroll to end", () => scroll.ScrollToEnd());
+            AddUntilStep("all unloaded", () => !loadedCovers.Any());
+        }
+
+        [Test]
+        public void TestSetNullBeatmapWhileLoading()
+        {
+            TestUpdateableBeatmapSetCover updateableCover = null;
+
+            AddStep("setup cover", () => Child = updateableCover = new TestUpdateableBeatmapSetCover
+            {
+                BeatmapSet = CreateBeatmap(Ruleset.Value).BeatmapInfo.BeatmapSet,
+                RelativeSizeAxes = Axes.Both,
+                Masking = true,
+            });
+
+            AddStep("change model", () => updateableCover.BeatmapSet = null);
+            AddWaitStep("wait some", 5);
+            AddAssert("no cover added", () => !updateableCover.ChildrenOfType<DelayedLoadUnloadWrapper>().Any());
+        }
+
+        private class TestUpdateableBeatmapSetCover : UpdateableBeatmapSetCover
+        {
+            protected override BeatmapSetCover CreateBeatmapSetCover(BeatmapSetInfo beatmapSet, BeatmapSetCoverType coverType) => new TestBeatmapSetCover(beatmapSet, coverType);
+        }
+
+        private class TestBeatmapSetCover : BeatmapSetCover
+        {
+            public TestBeatmapSetCover(BeatmapSetInfo set, BeatmapSetCoverType type = BeatmapSetCoverType.Cover)
+                : base(set, type)
+            {
+            }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                Thread.Sleep(10000);
+            }
+        }
+    }
+}
diff --git a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
index 6c229755e7..4b0430381b 100644
--- a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
+++ b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
@@ -59,6 +59,8 @@ namespace osu.Game.Beatmaps.Drawables
             updateCover();
         }
 
+        protected virtual BeatmapSetCover CreateBeatmapSetCover(BeatmapSetInfo beatmapSet, BeatmapSetCoverType coverType) => new BeatmapSetCover(beatmapSet, coverType);
+
         private void updateCover()
         {
             displayedCover?.FadeOut(400);
@@ -69,13 +71,11 @@ namespace osu.Game.Beatmaps.Drawables
             {
                 Add(displayedCover = new DelayedLoadUnloadWrapper(() =>
                 {
-                    var cover = new BeatmapSetCover(beatmapSet, coverType)
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        RelativeSizeAxes = Axes.Both,
-                        FillMode = FillMode.Fill,
-                    };
+                    var cover = CreateBeatmapSetCover(beatmapSet, coverType);
+                    cover.Anchor = Anchor.Centre;
+                    cover.Origin = Anchor.Centre;
+                    cover.RelativeSizeAxes = Axes.Both;
+                    cover.FillMode = FillMode.Fill;
                     cover.OnLoadComplete += d => d.FadeInFromZero(400, Easing.Out);
                     return cover;
                 }));

From acfb2d2980a99d7f88657db43712a3ed88caaac6 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 23 Jan 2021 23:28:46 +0300
Subject: [PATCH 1061/3722] Refactor beatmap set covers into using
 `ModelBackedDrawable<T>`

---
 .../TestSceneUpdateableBeatmapSetCover.cs     | 24 ++++--
 .../Drawables/UpdateableBeatmapSetCover.cs    | 79 ++++++-------------
 .../Historical/DrawableMostPlayedBeatmap.cs   |  3 +-
 3 files changed, 44 insertions(+), 62 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
index 7daaae45a4..2ffa7e2668 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
@@ -22,9 +22,8 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Test]
         public void TestLocal([Values] BeatmapSetCoverType coverType)
         {
-            AddStep("setup cover", () => Child = new UpdateableBeatmapSetCover
+            AddStep("setup cover", () => Child = new UpdateableBeatmapSetCover(coverType)
             {
-                CoverType = coverType,
                 BeatmapSet = CreateBeatmap(Ruleset.Value).BeatmapInfo.BeatmapSet,
                 RelativeSizeAxes = Axes.Both,
                 Masking = true,
@@ -64,9 +63,8 @@ namespace osu.Game.Tests.Visual.UserInterface
                 {
                     var coverType = coverTypes[i % coverTypes.Length];
 
-                    var cover = new UpdateableBeatmapSetCover
+                    var cover = new UpdateableBeatmapSetCover(coverType)
                     {
-                        CoverType = coverType,
                         BeatmapSet = setInfo,
                         Height = 100,
                         Masking = true,
@@ -110,13 +108,25 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private class TestUpdateableBeatmapSetCover : UpdateableBeatmapSetCover
         {
-            protected override BeatmapSetCover CreateBeatmapSetCover(BeatmapSetInfo beatmapSet, BeatmapSetCoverType coverType) => new TestBeatmapSetCover(beatmapSet, coverType);
+            protected override Drawable CreateDrawable(BeatmapSetInfo model)
+            {
+                if (model == null)
+                    return null;
+
+                return new TestBeatmapSetCover(model)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    FillMode = FillMode.Fill,
+                };
+            }
         }
 
         private class TestBeatmapSetCover : BeatmapSetCover
         {
-            public TestBeatmapSetCover(BeatmapSetInfo set, BeatmapSetCoverType type = BeatmapSetCoverType.Cover)
-                : base(set, type)
+            public TestBeatmapSetCover(BeatmapSetInfo set)
+                : base(set)
             {
             }
 
diff --git a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
index 4b0430381b..3a4423e42e 100644
--- a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
+++ b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.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.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -8,78 +9,50 @@ using osu.Game.Graphics;
 
 namespace osu.Game.Beatmaps.Drawables
 {
-    public class UpdateableBeatmapSetCover : Container
+    public class UpdateableBeatmapSetCover : ModelBackedDrawable<BeatmapSetInfo>
     {
-        private Drawable displayedCover;
-
-        private BeatmapSetInfo beatmapSet;
+        private readonly BeatmapSetCoverType coverType;
 
         public BeatmapSetInfo BeatmapSet
         {
-            get => beatmapSet;
-            set
-            {
-                if (value == beatmapSet) return;
-
-                beatmapSet = value;
-
-                if (IsLoaded)
-                    updateCover();
-            }
+            get => Model;
+            set => Model = value;
         }
 
-        private BeatmapSetCoverType coverType = BeatmapSetCoverType.Cover;
-
-        public BeatmapSetCoverType CoverType
+        public new bool Masking
         {
-            get => coverType;
-            set
-            {
-                if (value == coverType) return;
-
-                coverType = value;
-
-                if (IsLoaded)
-                    updateCover();
-            }
+            get => base.Masking;
+            set => base.Masking = value;
         }
 
-        public UpdateableBeatmapSetCover()
+        public UpdateableBeatmapSetCover(BeatmapSetCoverType coverType = BeatmapSetCoverType.Cover)
         {
-            Child = new Box
+            this.coverType = coverType;
+
+            InternalChild = new Box
             {
                 RelativeSizeAxes = Axes.Both,
                 Colour = OsuColour.Gray(0.2f),
             };
         }
 
-        protected override void LoadComplete()
+        protected override double TransformDuration => 400.0;
+
+        protected override DelayedLoadWrapper CreateDelayedLoadWrapper(Func<Drawable> createContentFunc, double timeBeforeLoad)
+            => new DelayedLoadUnloadWrapper(createContentFunc, timeBeforeLoad);
+
+        protected override Drawable CreateDrawable(BeatmapSetInfo model)
         {
-            base.LoadComplete();
-            updateCover();
-        }
+            if (model == null)
+                return null;
 
-        protected virtual BeatmapSetCover CreateBeatmapSetCover(BeatmapSetInfo beatmapSet, BeatmapSetCoverType coverType) => new BeatmapSetCover(beatmapSet, coverType);
-
-        private void updateCover()
-        {
-            displayedCover?.FadeOut(400);
-            displayedCover?.Expire();
-            displayedCover = null;
-
-            if (beatmapSet != null)
+            return new BeatmapSetCover(model, coverType)
             {
-                Add(displayedCover = new DelayedLoadUnloadWrapper(() =>
-                {
-                    var cover = CreateBeatmapSetCover(beatmapSet, coverType);
-                    cover.Anchor = Anchor.Centre;
-                    cover.Origin = Anchor.Centre;
-                    cover.RelativeSizeAxes = Axes.Both;
-                    cover.FillMode = FillMode.Fill;
-                    cover.OnLoadComplete += d => d.FadeInFromZero(400, Easing.Out);
-                    return cover;
-                }));
-            }
+                RelativeSizeAxes = Axes.Both,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                FillMode = FillMode.Fill,
+            };
         }
     }
 }
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs b/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
index 5b7c5efbe2..f409411953 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
@@ -41,12 +41,11 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
         {
             AddRangeInternal(new Drawable[]
             {
-                new UpdateableBeatmapSetCover
+                new UpdateableBeatmapSetCover(BeatmapSetCoverType.List)
                 {
                     RelativeSizeAxes = Axes.Y,
                     Width = cover_width,
                     BeatmapSet = beatmap.BeatmapSet,
-                    CoverType = BeatmapSetCoverType.List,
                 },
                 new Container
                 {

From faa221027444b36fd3089888119c39964bbdbe4a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 24 Jan 2021 00:55:45 +0300
Subject: [PATCH 1062/3722] Use old-style Enum.GetValues method for older than
 .NET 5

---
 .../UserInterface/TestSceneUpdateableBeatmapSetCover.cs     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
index 2ffa7e2668..2f60fbcda8 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
@@ -57,11 +57,15 @@ namespace osu.Game.Tests.Visual.UserInterface
                     }
                 };
 
+#if NET5_0
                 var coverTypes = Enum.GetValues<BeatmapSetCoverType>();
+#else
+                var coverTypes = Enum.GetValues(typeof(BeatmapSetCoverType)).Cast<BeatmapSetCoverType>();
+#endif
 
                 for (int i = 0; i < 25; i++)
                 {
-                    var coverType = coverTypes[i % coverTypes.Length];
+                    var coverType = coverTypes.ElementAt(i);
 
                     var cover = new UpdateableBeatmapSetCover(coverType)
                     {

From 85b8b00b8c10ff23ca10169d5ca9940ea67eb1bb Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 24 Jan 2021 00:59:16 +0300
Subject: [PATCH 1063/3722] Fix forgotten modulo

---
 .../Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
index 2f60fbcda8..0b9bcad9fe 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
                 for (int i = 0; i < 25; i++)
                 {
-                    var coverType = coverTypes.ElementAt(i);
+                    var coverType = coverTypes.ElementAt(i % coverTypes.Count());
 
                     var cover = new UpdateableBeatmapSetCover(coverType)
                     {

From d034728443f395cccc3b0764158ed679a738fb93 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 24 Jan 2021 01:05:45 +0300
Subject: [PATCH 1064/3722] Remove conditional compilation symbols for such
 case

---
 .../UserInterface/TestSceneUpdateableBeatmapSetCover.cs       | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
index 0b9bcad9fe..ecb076d356 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
@@ -57,11 +57,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                     }
                 };
 
-#if NET5_0
-                var coverTypes = Enum.GetValues<BeatmapSetCoverType>();
-#else
                 var coverTypes = Enum.GetValues(typeof(BeatmapSetCoverType)).Cast<BeatmapSetCoverType>();
-#endif
 
                 for (int i = 0; i < 25; i++)
                 {

From eaa1519710577df734eb51e003777980fa434c81 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sun, 24 Jan 2021 18:41:45 +0100
Subject: [PATCH 1065/3722] Implement native osu!lazer mod icons for tournament

---
 .../Components/TournamentBeatmapPanel.cs      | 98 ++++++++++++++++---
 1 file changed, 86 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index 477bf4bd63..7fac2bac71 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -16,6 +16,9 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
 using osu.Game.Tournament.Models;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Screens.Play.HUD;
 using osuTK.Graphics;
 
 namespace osu.Game.Tournament.Components
@@ -124,21 +127,11 @@ namespace osu.Game.Tournament.Components
 
             if (!string.IsNullOrEmpty(mods))
             {
-                AddInternal(new Container
+                AddInternal(new ModSprite
                 {
-                    RelativeSizeAxes = Axes.Y,
-                    Width = 60,
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreRight,
-                    Margin = new MarginPadding(10),
-                    Child = new Sprite
-                    {
-                        FillMode = FillMode.Fit,
-                        RelativeSizeAxes = Axes.Both,
-                        Anchor = Anchor.CentreRight,
-                        Origin = Anchor.CentreRight,
-                        Texture = textures.Get($"mods/{mods}"),
-                    }
+                    Mod = mods
                 });
             }
         }
@@ -192,5 +185,86 @@ namespace osu.Game.Tournament.Components
                 Alpha = 1;
             }
         }
+
+        private class ModSprite : Container
+        {
+            public string Mod;
+
+            public ModSprite()
+            {
+                Margin = new MarginPadding(10);
+                Width = 60;
+                RelativeSizeAxes = Axes.Y;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(TextureStore textures)
+            {
+                var texture = textures.Get($"mods/{Mod}");
+
+                if (texture != null)
+                {
+                    Child = new Sprite
+                    {
+                        FillMode = FillMode.Fit,
+                        RelativeSizeAxes = Axes.Both,
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.CentreRight,
+                        Texture = texture
+                    };
+                }
+                else
+                {
+                    Mod selectedMod = null;
+
+                    switch (Mod)
+                    {
+                        case "DT":
+                            selectedMod = new OsuModDoubleTime();
+                            break;
+
+                        case "FL":
+                            selectedMod = new OsuModFlashlight();
+                            break;
+
+                        case "HT":
+                            selectedMod = new OsuModHalfTime();
+                            break;
+
+                        case "HD":
+                            selectedMod = new OsuModHidden();
+                            break;
+
+                        case "HR":
+                            selectedMod = new OsuModHardRock();
+                            break;
+
+                        case "NF":
+                            selectedMod = new OsuModNoFail();
+                            break;
+
+                        case "EZ":
+                            selectedMod = new OsuModEasy();
+                            break;
+                    }
+
+                    if (selectedMod != null)
+                    {
+                        Child = new ModDisplay
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Current =
+                            {
+                                Value = new[]
+                                {
+                                    selectedMod
+                                }
+                            }
+                        };
+                    }
+                }
+            }
+        }
     }
 }

From 9a5790cd31dbd9a60932fb16790fea3390db7ca8 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 24 Jan 2021 19:18:16 +0100
Subject: [PATCH 1066/3722] Implement StableStorage class.

---
 osu.Desktop/OsuGameDesktop.cs |  3 +-
 osu.Game/IO/StableStorage.cs  | 64 +++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/IO/StableStorage.cs

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index d1515acafa..0dc659b120 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -18,6 +18,7 @@ using osu.Framework.Screens;
 using osu.Game.Screens.Menu;
 using osu.Game.Updater;
 using osu.Desktop.Windows;
+using osu.Game.IO;
 
 namespace osu.Desktop
 {
@@ -40,7 +41,7 @@ namespace osu.Desktop
                 {
                     string stablePath = getStableInstallPath();
                     if (!string.IsNullOrEmpty(stablePath))
-                        return new DesktopStorage(stablePath, desktopHost);
+                        return new StableStorage(stablePath, desktopHost);
                 }
             }
             catch (Exception)
diff --git a/osu.Game/IO/StableStorage.cs b/osu.Game/IO/StableStorage.cs
new file mode 100644
index 0000000000..a8665b5267
--- /dev/null
+++ b/osu.Game/IO/StableStorage.cs
@@ -0,0 +1,64 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.IO;
+using System.Linq;
+using osu.Framework.Platform;
+
+namespace osu.Game.IO
+{
+    /// <summary>
+    /// A storage pointing to an osu-stable installation.
+    /// Provides methods for handling installations with a custom Song folder location.
+    /// </summary>
+    public class StableStorage : DesktopStorage
+    {
+        private const string stable_songs_path = "Songs";
+
+        private readonly DesktopGameHost host;
+        private string songs_path;
+
+        public StableStorage(string path, DesktopGameHost host)
+            : base(path, host)
+        {
+            this.host = host;
+            songs_path = locateSongsDirectory();
+        }
+
+        /// <summary>
+        /// Returns a <see cref="Storage"/> pointing to the osu-stable Songs directory.
+        /// </summary>
+        public Storage GetSongStorage()
+        {
+            if (songs_path.Equals(stable_songs_path, StringComparison.OrdinalIgnoreCase))
+                return GetStorageForDirectory(stable_songs_path);
+            else
+                return new DesktopStorage(songs_path, host);
+        }
+
+        private string locateSongsDirectory()
+        {
+            var configFile = GetStream(GetFiles(".", "osu!.*.cfg").First());
+            var textReader = new StreamReader(configFile);
+
+            var songs_directory_path = stable_songs_path;
+
+            while (!textReader.EndOfStream)
+            {
+                var line = textReader.ReadLine();
+
+                if (line?.StartsWith("BeatmapDirectory", StringComparison.OrdinalIgnoreCase) == true)
+                {
+                    var directory = line.Split('=')[1].TrimStart();
+                    if (Path.IsPathFullyQualified(directory) && !directory.Equals(stable_songs_path, StringComparison.OrdinalIgnoreCase))
+                        songs_directory_path = directory;
+
+                    break;
+                }
+            }
+
+            return songs_directory_path;
+        }
+    }
+}

From d71ac834280c0873422a974dbc78bf73baa5ce71 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 24 Jan 2021 19:46:10 +0100
Subject: [PATCH 1067/3722] Use StableStorage in ArchiveModelManager.

---
 osu.Desktop/OsuGameDesktop.cs            | 2 +-
 osu.Game/Database/ArchiveModelManager.cs | 4 ++--
 osu.Game/OsuGame.cs                      | 3 ++-
 osu.Game/Scoring/ScoreManager.cs         | 3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index 0dc659b120..5909b82c8f 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -33,7 +33,7 @@ namespace osu.Desktop
             noVersionOverlay = args?.Any(a => a == "--no-version-overlay") ?? false;
         }
 
-        public override Storage GetStorageForStableInstall()
+        public override StableStorage GetStorageForStableInstall()
         {
             try
             {
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 9f69ad035f..7d22c51d0f 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -625,7 +625,7 @@ namespace osu.Game.Database
         /// <summary>
         /// Set a storage with access to an osu-stable install for import purposes.
         /// </summary>
-        public Func<Storage> GetStableStorage { private get; set; }
+        public Func<StableStorage> GetStableStorage { private get; set; }
 
         /// <summary>
         /// Denotes whether an osu-stable installation is present to perform automated imports from.
@@ -640,7 +640,7 @@ namespace osu.Game.Database
         /// <summary>
         /// Select paths to import from stable. Default implementation iterates all directories in <see cref="ImportFromStablePath"/>.
         /// </summary>
-        protected virtual IEnumerable<string> GetStableImportPaths(Storage stableStoage) => stableStoage.GetDirectories(ImportFromStablePath);
+        protected virtual IEnumerable<string> GetStableImportPaths(StableStorage stableStoage) => stableStoage.GetDirectories(ImportFromStablePath);
 
         /// <summary>
         /// Whether this specified path should be removed after successful import.
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 5acd6bc73d..399bdda491 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -52,6 +52,7 @@ using osu.Game.Updater;
 using osu.Game.Utils;
 using LogLevel = osu.Framework.Logging.LogLevel;
 using osu.Game.Database;
+using osu.Game.IO;
 
 namespace osu.Game
 {
@@ -88,7 +89,7 @@ namespace osu.Game
 
         protected SentryLogger SentryLogger;
 
-        public virtual Storage GetStorageForStableInstall() => null;
+        public virtual StableStorage GetStorageForStableInstall() => null;
 
         public float ToolbarOffset => (Toolbar?.Position.Y ?? 0) + (Toolbar?.DrawHeight ?? 0);
 
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index cf1d123c06..11f31f7d59 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -16,6 +16,7 @@ using osu.Framework.Platform;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Database;
+using osu.Game.IO;
 using osu.Game.IO.Archives;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
@@ -71,7 +72,7 @@ namespace osu.Game.Scoring
             }
         }
 
-        protected override IEnumerable<string> GetStableImportPaths(Storage stableStorage)
+        protected override IEnumerable<string> GetStableImportPaths(StableStorage stableStorage)
             => stableStorage.GetFiles(ImportFromStablePath).Where(p => HandledExtensions.Any(ext => Path.GetExtension(p)?.Equals(ext, StringComparison.OrdinalIgnoreCase) ?? false));
 
         public Score GetScore(ScoreInfo score) => new LegacyDatabasedScore(score, rulesets, beatmaps(), Files.Store);

From f0fdad2f838ec4ab18a82841f4483cba66f715f0 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 24 Jan 2021 22:04:46 +0100
Subject: [PATCH 1068/3722] Construct a DesktopStorage pointing to the absolute
 path of the song directory.

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

diff --git a/osu.Game/IO/StableStorage.cs b/osu.Game/IO/StableStorage.cs
index a8665b5267..c7ca37a163 100644
--- a/osu.Game/IO/StableStorage.cs
+++ b/osu.Game/IO/StableStorage.cs
@@ -29,20 +29,14 @@ namespace osu.Game.IO
         /// <summary>
         /// Returns a <see cref="Storage"/> pointing to the osu-stable Songs directory.
         /// </summary>
-        public Storage GetSongStorage()
-        {
-            if (songs_path.Equals(stable_songs_path, StringComparison.OrdinalIgnoreCase))
-                return GetStorageForDirectory(stable_songs_path);
-            else
-                return new DesktopStorage(songs_path, host);
-        }
+        public Storage GetSongStorage() => new DesktopStorage(songs_path, host);
 
         private string locateSongsDirectory()
         {
             var configFile = GetStream(GetFiles(".", "osu!.*.cfg").First());
             var textReader = new StreamReader(configFile);
 
-            var songs_directory_path = stable_songs_path;
+            var songs_directory_path = Path.Combine(BasePath, stable_songs_path);
 
             while (!textReader.EndOfStream)
             {
@@ -51,7 +45,7 @@ namespace osu.Game.IO
                 if (line?.StartsWith("BeatmapDirectory", StringComparison.OrdinalIgnoreCase) == true)
                 {
                     var directory = line.Split('=')[1].TrimStart();
-                    if (Path.IsPathFullyQualified(directory) && !directory.Equals(stable_songs_path, StringComparison.OrdinalIgnoreCase))
+                    if (Path.IsPathFullyQualified(directory))
                         songs_directory_path = directory;
 
                     break;

From 51d4da565c87192549f62fa94cf624818809a3d8 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 24 Jan 2021 22:25:49 +0100
Subject: [PATCH 1069/3722] Fix ArchiveModelManagers lookup paths.

---
 osu.Game/Beatmaps/BeatmapManager.cs      |  8 +++++++-
 osu.Game/Database/ArchiveModelManager.cs | 12 +++++++++---
 osu.Game/Scoring/ScoreManager.cs         |  3 ++-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 42418e532b..a455f676b3 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -64,7 +64,13 @@ namespace osu.Game.Beatmaps
 
         protected override string[] HashableFileTypes => new[] { ".osu" };
 
-        protected override string ImportFromStablePath => "Songs";
+        protected override bool CheckStableDirectoryExists(StableStorage stableStorage) => stableStorage.GetSongStorage().ExistsDirectory(".");
+
+        protected override IEnumerable<string> GetStableImportPaths(StableStorage stableStoage)
+        {
+            var songStorage = stableStoage.GetSongStorage();
+            return songStorage.GetDirectories(".").Select(path => songStorage.GetFullPath(path));
+        }
 
         private readonly RulesetStore rulesets;
         private readonly BeatmapStore beatmaps;
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 7d22c51d0f..516f70c700 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -637,10 +637,16 @@ namespace osu.Game.Database
         /// </summary>
         protected virtual string ImportFromStablePath => null;
 
+        /// <summary>
+        /// Checks for the existence of an osu-stable directory.
+        /// </summary>
+        protected virtual bool CheckStableDirectoryExists(StableStorage stableStorage) => stableStorage.ExistsDirectory(ImportFromStablePath);
+
         /// <summary>
         /// Select paths to import from stable. Default implementation iterates all directories in <see cref="ImportFromStablePath"/>.
         /// </summary>
-        protected virtual IEnumerable<string> GetStableImportPaths(StableStorage stableStoage) => stableStoage.GetDirectories(ImportFromStablePath);
+        protected virtual IEnumerable<string> GetStableImportPaths(StableStorage stableStoage) => stableStoage.GetDirectories(ImportFromStablePath)
+                                                                                                              .Select(path => stableStoage.GetFullPath(path));
 
         /// <summary>
         /// Whether this specified path should be removed after successful import.
@@ -662,14 +668,14 @@ namespace osu.Game.Database
                 return Task.CompletedTask;
             }
 
-            if (!stable.ExistsDirectory(ImportFromStablePath))
+            if (!CheckStableDirectoryExists(stable))
             {
                 // This handles situations like when the user does not have a Skins folder
                 Logger.Log($"No {ImportFromStablePath} folder available in osu!stable installation", LoggingTarget.Information, LogLevel.Error);
                 return Task.CompletedTask;
             }
 
-            return Task.Run(async () => await Import(GetStableImportPaths(GetStableStorage()).Select(f => stable.GetFullPath(f)).ToArray()));
+            return Task.Run(async () => await Import(GetStableImportPaths(stable).ToArray()));
         }
 
         #endregion
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 11f31f7d59..6aa0a30a75 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -73,7 +73,8 @@ namespace osu.Game.Scoring
         }
 
         protected override IEnumerable<string> GetStableImportPaths(StableStorage stableStorage)
-            => stableStorage.GetFiles(ImportFromStablePath).Where(p => HandledExtensions.Any(ext => Path.GetExtension(p)?.Equals(ext, StringComparison.OrdinalIgnoreCase) ?? false));
+            => stableStorage.GetFiles(ImportFromStablePath).Where(p => HandledExtensions.Any(ext => Path.GetExtension(p)?.Equals(ext, StringComparison.OrdinalIgnoreCase) ?? false))
+                            .Select(path => stableStorage.GetFullPath(path));
 
         public Score GetScore(ScoreInfo score) => new LegacyDatabasedScore(score, rulesets, beatmaps(), Files.Store);
 

From d38db6eace2c6b00f5a3b92fe0f603302184f993 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sun, 24 Jan 2021 23:29:05 +0100
Subject: [PATCH 1070/3722] Change ModSprite to use ruleset's mods directly.

---
 .../Components/TournamentBeatmapPanel.cs      | 66 +++++--------------
 1 file changed, 16 insertions(+), 50 deletions(-)

diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index 7fac2bac71..8fc52f8b4b 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -15,10 +15,9 @@ using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
-using osu.Game.Tournament.Models;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Rulesets;
 using osu.Game.Screens.Play.HUD;
+using osu.Game.Tournament.Models;
 using osuTK.Graphics;
 
 namespace osu.Game.Tournament.Components
@@ -190,6 +189,12 @@ namespace osu.Game.Tournament.Components
         {
             public string Mod;
 
+            [Resolved]
+            private LadderInfo ladderInfo { get; set; }
+
+            [Resolved]
+            private RulesetStore rulesets { get; set; }
+
             public ModSprite()
             {
                 Margin = new MarginPadding(10);
@@ -198,7 +203,7 @@ namespace osu.Game.Tournament.Components
             }
 
             [BackgroundDependencyLoader]
-            private void load(TextureStore textures)
+            private void load(TextureStore textures, IBindable<RulesetInfo> ruleset)
             {
                 var texture = textures.Get($"mods/{Mod}");
 
@@ -215,54 +220,15 @@ namespace osu.Game.Tournament.Components
                 }
                 else
                 {
-                    Mod selectedMod = null;
-
-                    switch (Mod)
+                    Child = new ModDisplay
                     {
-                        case "DT":
-                            selectedMod = new OsuModDoubleTime();
-                            break;
-
-                        case "FL":
-                            selectedMod = new OsuModFlashlight();
-                            break;
-
-                        case "HT":
-                            selectedMod = new OsuModHalfTime();
-                            break;
-
-                        case "HD":
-                            selectedMod = new OsuModHidden();
-                            break;
-
-                        case "HR":
-                            selectedMod = new OsuModHardRock();
-                            break;
-
-                        case "NF":
-                            selectedMod = new OsuModNoFail();
-                            break;
-
-                        case "EZ":
-                            selectedMod = new OsuModEasy();
-                            break;
-                    }
-
-                    if (selectedMod != null)
-                    {
-                        Child = new ModDisplay
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Current =
                         {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Current =
-                            {
-                                Value = new[]
-                                {
-                                    selectedMod
-                                }
-                            }
-                        };
-                    }
+                            Value = rulesets.GetRuleset(ladderInfo.Ruleset.Value.ID ?? 0).CreateInstance().GetAllMods().Where(mod => mod.Acronym == Mod).ToArray()
+                        }
+                    };
                 }
             }
         }

From c6d46129ad25567e2a3c9736de085e3669c78557 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sun, 24 Jan 2021 23:33:02 +0100
Subject: [PATCH 1071/3722] Remove unneccessary ruleset parameter

---
 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 8fc52f8b4b..92ac123097 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -203,7 +203,7 @@ namespace osu.Game.Tournament.Components
             }
 
             [BackgroundDependencyLoader]
-            private void load(TextureStore textures, IBindable<RulesetInfo> ruleset)
+            private void load(TextureStore textures)
             {
                 var texture = textures.Get($"mods/{Mod}");
 

From 304264046b0feba5236722652a81bd70ffe46628 Mon Sep 17 00:00:00 2001
From: Mysfit <mysfit@mysfit.dev>
Date: Sun, 24 Jan 2021 17:46:54 -0500
Subject: [PATCH 1072/3722] Added tests.

---
 .../TestSceneStoryboardSamplePlayback.cs      | 74 +++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardSamplePlayback.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardSamplePlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardSamplePlayback.cs
new file mode 100644
index 0000000000..1544f8fd35
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardSamplePlayback.cs
@@ -0,0 +1,74 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Configuration;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Storyboards;
+using osu.Game.Storyboards.Drawables;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public class TestSceneStoryboardSamplePlayback : PlayerTestScene
+    {
+        private Storyboard storyboard;
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            config.Set(OsuSetting.ShowStoryboard, true);
+
+            storyboard = new Storyboard();
+            var backgroundLayer = storyboard.GetLayer("Background");
+            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));
+        }
+
+        [Test]
+        public void TestStoryboardSamplesStopDuringPause()
+        {
+            checkForFirstSamplePlayback();
+
+            AddStep("player paused", () => Player.Pause());
+            AddAssert("player is currently paused", () => Player.GameplayClockContainer.IsPaused.Value);
+            AddAssert("all storyboard samples stopped immediately", () => allStoryboardSamples.All(sound => !sound.IsPlaying));
+
+            AddStep("player resume", () => Player.Resume());
+            AddUntilStep("any storyboard samples playing after resume", () => allStoryboardSamples.Any(sound => sound.IsPlaying));
+        }
+
+        [Test]
+        public void TestStoryboardSamplesStopOnSkip()
+        {
+            checkForFirstSamplePlayback();
+
+            AddStep("skip intro", () => InputManager.Key(osuTK.Input.Key.Space));
+            AddAssert("all storyboard samples stopped immediately", () => allStoryboardSamples.All(sound => !sound.IsPlaying));
+
+            AddUntilStep("any storyboard samples playing after skip", () => allStoryboardSamples.Any(sound => sound.IsPlaying));
+        }
+
+        private void checkForFirstSamplePlayback()
+        {
+            AddUntilStep("storyboard loaded", () => Player.Beatmap.Value.StoryboardLoaded);
+            AddUntilStep("any storyboard samples playing", () => allStoryboardSamples.Any(sound => sound.IsPlaying));
+        }
+
+        private IEnumerable<DrawableStoryboardSample> allStoryboardSamples => Player.ChildrenOfType<DrawableStoryboardSample>();
+
+        protected override bool AllowFail => false;
+
+        protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
+        protected override TestPlayer CreatePlayer(Ruleset ruleset) => new TestPlayer(true, false);
+
+        protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null) =>
+            new ClockBackedTestWorkingBeatmap(beatmap, storyboard ?? this.storyboard, Clock, Audio);
+    }
+}

From bb8113fb5136b1c235693899ea11b58c649f289c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 Jan 2021 14:47:47 +0900
Subject: [PATCH 1073/3722] Fix mod select footer not animating correctly on
 first reveal

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

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index b93602116b..1258ba719d 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -216,9 +216,9 @@ namespace osu.Game.Overlays.Mods
                         },
                         new Drawable[]
                         {
-                            // Footer
                             new Container
                             {
+                                Name = "Footer content",
                                 RelativeSizeAxes = Axes.X,
                                 AutoSizeAxes = Axes.Y,
                                 Origin = Anchor.TopCentre,
@@ -237,10 +237,9 @@ namespace osu.Game.Overlays.Mods
                                         Anchor = Anchor.BottomCentre,
                                         AutoSizeAxes = Axes.Y,
                                         RelativeSizeAxes = Axes.X,
+                                        RelativePositionAxes = Axes.X,
                                         Width = content_width,
                                         Spacing = new Vector2(footer_button_spacing, footer_button_spacing / 2),
-                                        LayoutDuration = 100,
-                                        LayoutEasing = Easing.OutQuint,
                                         Padding = new MarginPadding
                                         {
                                             Vertical = 15,
@@ -354,7 +353,7 @@ namespace osu.Game.Overlays.Mods
         {
             base.PopOut();
 
-            footerContainer.MoveToX(footerContainer.DrawSize.X, WaveContainer.DISAPPEAR_DURATION, Easing.InSine);
+            footerContainer.MoveToX(content_width, WaveContainer.DISAPPEAR_DURATION, Easing.InSine);
             footerContainer.FadeOut(WaveContainer.DISAPPEAR_DURATION, Easing.InSine);
 
             foreach (var section in ModSectionsContainer.Children)

From 366f074f86eab5f0a665fe70843720b03fc9fb5b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 Jan 2021 16:53:38 +0900
Subject: [PATCH 1074/3722] Better describe test steps to discern on failures

---
 .../NonVisual/OngoingOperationTrackerTest.cs           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/OngoingOperationTrackerTest.cs b/osu.Game.Tests/NonVisual/OngoingOperationTrackerTest.cs
index b2be83d1f9..eef9582af9 100644
--- a/osu.Game.Tests/NonVisual/OngoingOperationTrackerTest.cs
+++ b/osu.Game.Tests/NonVisual/OngoingOperationTrackerTest.cs
@@ -30,22 +30,22 @@ namespace osu.Game.Tests.NonVisual
             IDisposable secondOperation = null;
 
             AddStep("begin first operation", () => firstOperation = tracker.BeginOperation());
-            AddAssert("operation in progress", () => operationInProgress.Value);
+            AddAssert("first operation in progress", () => operationInProgress.Value);
 
             AddStep("cannot start another operation",
                 () => Assert.Throws<InvalidOperationException>(() => tracker.BeginOperation()));
 
             AddStep("end first operation", () => firstOperation.Dispose());
-            AddAssert("operation is ended", () => !operationInProgress.Value);
+            AddAssert("first operation is ended", () => !operationInProgress.Value);
 
             AddStep("start second operation", () => secondOperation = tracker.BeginOperation());
-            AddAssert("operation in progress", () => operationInProgress.Value);
+            AddAssert("second operation in progress", () => operationInProgress.Value);
 
             AddStep("dispose first operation again", () => firstOperation.Dispose());
-            AddAssert("operation in progress", () => operationInProgress.Value);
+            AddAssert("second operation still in progress", () => operationInProgress.Value);
 
             AddStep("dispose second operation", () => secondOperation.Dispose());
-            AddAssert("operation is ended", () => !operationInProgress.Value);
+            AddAssert("second operation is ended", () => !operationInProgress.Value);
         }
 
         [Test]

From 10e8b7082e5affb83670333a6115af16c34ee9c8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 Jan 2021 16:53:58 +0900
Subject: [PATCH 1075/3722] Rework logic to avoid custom disposal early return
 handling

---
 .../OnlinePlay/OngoingOperationTracker.cs     | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
index 060f1d7b91..b7ee84eb9e 100644
--- a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
+++ b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
@@ -2,7 +2,6 @@
 // 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;
 
@@ -43,42 +42,45 @@ namespace osu.Game.Screens.OnlinePlay
             leasedInProgress = inProgress.BeginLease(true);
             leasedInProgress.Value = true;
 
-            // for extra safety, marshal the end of operation back to the update thread if necessary.
-            return new OngoingOperation(() => Scheduler.Add(endOperation, false));
+            return new OngoingOperation(this, leasedInProgress);
         }
 
-        private void endOperation()
+        private void endOperationWithKnownLease(LeasedBindable<bool> lease)
         {
-            leasedInProgress?.Return();
-            leasedInProgress = null;
+            if (lease != leasedInProgress)
+                return;
+
+            // for extra safety, marshal the end of operation back to the update thread if necessary.
+            Scheduler.Add(() =>
+            {
+                leasedInProgress?.Return();
+                leasedInProgress = null;
+            }, false);
         }
 
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
+
             // base call does an UnbindAllBindables().
             // clean up the leased reference here so that it doesn't get returned twice.
             leasedInProgress = null;
         }
 
-        private class OngoingOperation : InvokeOnDisposal
+        private class OngoingOperation : IDisposable
         {
-            private bool isDisposed;
+            private readonly OngoingOperationTracker tracker;
+            private readonly LeasedBindable<bool> lease;
 
-            public OngoingOperation(Action action)
-                : base(action)
+            public OngoingOperation(OngoingOperationTracker tracker, LeasedBindable<bool> lease)
             {
+                this.tracker = tracker;
+                this.lease = lease;
             }
 
-            public override void Dispose()
+            public void Dispose()
             {
-                // base class does not check disposal state for performance reasons which aren't relevant here.
-                // track locally, to avoid interfering with other operations in case of a potential double-disposal.
-                if (isDisposed)
-                    return;
-
-                base.Dispose();
-                isDisposed = true;
+                tracker.endOperationWithKnownLease(lease);
             }
         }
     }

From c05ae3497afa8c5a7dc551496e189620ccbd11ad Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 Jan 2021 17:02:24 +0900
Subject: [PATCH 1076/3722] Make connect/disconnect private

---
 osu.Game/Online/Multiplayer/MultiplayerClient.cs | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index aa2305c991..7dc4919d23 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Online.Multiplayer
         private readonly Bindable<bool> isConnected = new Bindable<bool>();
         private readonly IBindable<APIState> apiState = new Bindable<APIState>();
 
+        private readonly SemaphoreSlim connectionLock = new SemaphoreSlim(1);
+
         [Resolved]
         private IAPIProvider api { get; set; } = null!;
 
@@ -52,20 +54,16 @@ namespace osu.Game.Online.Multiplayer
             {
                 case APIState.Failing:
                 case APIState.Offline:
-                    Task.Run(Disconnect).CatchUnobservedExceptions();
+                    Task.Run(() => disconnect(true)).CatchUnobservedExceptions();
                     break;
 
                 case APIState.Online:
-                    Task.Run(Connect).CatchUnobservedExceptions();
+                    Task.Run(connect).CatchUnobservedExceptions();
                     break;
             }
         }
 
-        private readonly SemaphoreSlim connectionLock = new SemaphoreSlim(1);
-
-        public Task Disconnect() => disconnect(true);
-
-        protected async Task Connect()
+        private async Task connect()
         {
             cancelExistingConnect();
 
@@ -233,7 +231,7 @@ namespace osu.Game.Online.Multiplayer
 
                 // make sure a disconnect wasn't triggered (and this is still the active connection).
                 if (!cancellationToken.IsCancellationRequested)
-                    Task.Run(Connect, default).CatchUnobservedExceptions();
+                    Task.Run(connect, default).CatchUnobservedExceptions();
 
                 return Task.CompletedTask;
             };

From 994fb2667dc22d06d0fc7aca26387ef03ec04859 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 Jan 2021 17:11:04 +0900
Subject: [PATCH 1077/3722] Call DisposeAsync instead of StopAsync

---
 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 7dc4919d23..ffed2b57fe 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -188,7 +188,7 @@ namespace osu.Game.Online.Multiplayer
             try
             {
                 if (connection != null)
-                    await connection.StopAsync();
+                    await connection.DisposeAsync();
             }
             finally
             {

From 0f09a7feb9ee12c05c1d53464db9e6194e8818d0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 Jan 2021 17:17:04 +0900
Subject: [PATCH 1078/3722] Avoid semaphore potentially getting held forever

---
 osu.Game/Online/Multiplayer/MultiplayerClient.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index ffed2b57fe..391658f0d0 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Online.Multiplayer
         {
             cancelExistingConnect();
 
-            await connectionLock.WaitAsync();
+            await connectionLock.WaitAsync(10000);
 
             try
             {
@@ -183,7 +183,7 @@ namespace osu.Game.Online.Multiplayer
             cancelExistingConnect();
 
             if (takeLock)
-                await connectionLock.WaitAsync();
+                await connectionLock.WaitAsync(10000);
 
             try
             {
@@ -237,5 +237,12 @@ namespace osu.Game.Online.Multiplayer
             };
             return newConnection;
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            cancelExistingConnect();
+        }
     }
 }

From 91ce3df3a944244d73e18630f3dd26e3709df282 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 Jan 2021 17:44:01 +0900
Subject: [PATCH 1079/3722] Bind MultiplayerGameplayLeaderboard to player
 updates later in load process

---
 osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index d4ce542a67..a3d27c4e71 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -53,8 +53,6 @@ namespace osu.Game.Screens.Play.HUD
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config, IAPIProvider api)
         {
-            streamingClient.OnNewFrames += handleIncomingFrames;
-
             foreach (var userId in playingUsers)
             {
                 streamingClient.WatchUser(userId);
@@ -90,6 +88,9 @@ namespace osu.Game.Screens.Play.HUD
 
             playingUsers.BindTo(multiplayerClient.CurrentMatchPlayingUserIds);
             playingUsers.BindCollectionChanged(usersChanged);
+
+            // this leaderboard should be guaranteed to be completely loaded before the gameplay starts (is a prerequisite in MultiplayerPlayer).
+            streamingClient.OnNewFrames += handleIncomingFrames;
         }
 
         private void usersChanged(object sender, NotifyCollectionChangedEventArgs e)

From 4ac362ee1acc899e1593ef548b981962e00916ec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 Jan 2021 18:29:00 +0900
Subject: [PATCH 1080/3722] Move cloning local to editor

---
 osu.Game/Beatmaps/WorkingBeatmap.cs | 2 --
 osu.Game/Screens/Edit/Editor.cs     | 4 ++++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index d25adca92b..30382c444f 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -111,8 +111,6 @@ namespace osu.Game.Beatmaps
                 // Convert
                 IBeatmap converted = converter.Convert(cancellationSource.Token);
 
-                converted.ControlPointInfo = converted.ControlPointInfo.CreateCopy();
-
                 // Apply conversion mods to the result
                 foreach (var mod in mods.OfType<IApplicableAfterBeatmapConversion>())
                 {
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index b7ebf0c0a4..0e04d1ea12 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -131,6 +131,10 @@ namespace osu.Game.Screens.Edit
             try
             {
                 playableBeatmap = Beatmap.Value.GetPlayableBeatmap(Beatmap.Value.BeatmapInfo.Ruleset);
+
+                // clone these locally for now to avoid incurring overhead on GetPlayableBeatmap usages.
+                // eventually we will want to improve how/where this is done as there are issues with *not* cloning it in all cases.
+                playableBeatmap.ControlPointInfo = playableBeatmap.ControlPointInfo.CreateCopy();
             }
             catch (Exception e)
             {

From b489e92c9e1042e0d9254158f7da75a339142436 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 Jan 2021 18:43:36 +0900
Subject: [PATCH 1081/3722] Fix TimelineParts not using correct beatmap

---
 .../Timelines/Summary/Parts/BookmarkPart.cs    |  3 +--
 .../Timelines/Summary/Parts/BreakPart.cs       |  5 ++---
 .../Summary/Parts/ControlPointPart.cs          |  5 ++---
 .../Timelines/Summary/Parts/MarkerPart.cs      |  8 ++------
 .../Timelines/Summary/Parts/TimelinePart.cs    | 18 +++++++++++-------
 .../Timeline/TimelineControlPointDisplay.cs    |  5 ++---
 6 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/BookmarkPart.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/BookmarkPart.cs
index 103e39e78a..8298cf4773 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/BookmarkPart.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/BookmarkPart.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations;
 
@@ -13,7 +12,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
     /// </summary>
     public class BookmarkPart : TimelinePart
     {
-        protected override void LoadBeatmap(WorkingBeatmap beatmap)
+        protected override void LoadBeatmap(EditorBeatmap beatmap)
         {
             base.LoadBeatmap(beatmap);
             foreach (int bookmark in beatmap.BeatmapInfo.Bookmarks)
diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/BreakPart.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/BreakPart.cs
index ceccbffc9c..e8a4b5c8c7 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/BreakPart.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/BreakPart.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Timing;
 using osu.Game.Graphics;
 using osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations;
@@ -14,10 +13,10 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
     /// </summary>
     public class BreakPart : TimelinePart
     {
-        protected override void LoadBeatmap(WorkingBeatmap beatmap)
+        protected override void LoadBeatmap(EditorBeatmap beatmap)
         {
             base.LoadBeatmap(beatmap);
-            foreach (var breakPeriod in beatmap.Beatmap.Breaks)
+            foreach (var breakPeriod in beatmap.Breaks)
                 Add(new BreakVisualisation(breakPeriod));
         }
 
diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/ControlPointPart.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/ControlPointPart.cs
index e76ab71e54..70afc1e308 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/ControlPointPart.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/ControlPointPart.cs
@@ -4,7 +4,6 @@
 using System.Collections.Specialized;
 using System.Linq;
 using osu.Framework.Bindables;
-using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 
 namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
@@ -16,12 +15,12 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
     {
         private readonly IBindableList<ControlPointGroup> controlPointGroups = new BindableList<ControlPointGroup>();
 
-        protected override void LoadBeatmap(WorkingBeatmap beatmap)
+        protected override void LoadBeatmap(EditorBeatmap beatmap)
         {
             base.LoadBeatmap(beatmap);
 
             controlPointGroups.UnbindAll();
-            controlPointGroups.BindTo(beatmap.Beatmap.ControlPointInfo.Groups);
+            controlPointGroups.BindTo(beatmap.ControlPointInfo.Groups);
             controlPointGroups.BindCollectionChanged((sender, args) =>
             {
                 switch (args.Action)
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 5a2214509c..d551333616 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs
@@ -2,15 +2,14 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osuTK;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Framework.Threading;
-using osu.Game.Beatmaps;
 using osu.Game.Graphics;
+using osuTK;
 
 namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
 {
@@ -54,9 +53,6 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
             scheduledSeek?.Cancel();
             scheduledSeek = Schedule(() =>
             {
-                if (Beatmap.Value == null)
-                    return;
-
                 float markerPos = Math.Clamp(ToLocalSpace(screenPosition).X, 0, DrawWidth);
                 editorClock.SeekSmoothlyTo(markerPos / DrawWidth * editorClock.TrackLength);
             });
@@ -68,7 +64,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
             marker.X = (float)editorClock.CurrentTime;
         }
 
-        protected override void LoadBeatmap(WorkingBeatmap beatmap)
+        protected override void LoadBeatmap(EditorBeatmap beatmap)
         {
             // block base call so we don't clear our marker (can be reused on beatmap change).
         }
diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
index 5b8f7c747b..5aba81aa7d 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/TimelinePart.cs
@@ -21,7 +21,10 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
     /// </summary>
     public class TimelinePart<T> : Container<T> where T : Drawable
     {
-        protected readonly IBindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
+        private readonly IBindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
+
+        [Resolved]
+        protected EditorBeatmap EditorBeatmap { get; private set; }
 
         protected readonly IBindable<Track> Track = new Bindable<Track>();
 
@@ -33,10 +36,9 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
         {
             AddInternal(this.content = content ?? new Container<T> { RelativeSizeAxes = Axes.Both });
 
-            Beatmap.ValueChanged += b =>
+            beatmap.ValueChanged += b =>
             {
                 updateRelativeChildSize();
-                LoadBeatmap(b.NewValue);
             };
 
             Track.ValueChanged += _ => updateRelativeChildSize();
@@ -45,24 +47,26 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
         [BackgroundDependencyLoader]
         private void load(IBindable<WorkingBeatmap> beatmap, EditorClock clock)
         {
-            Beatmap.BindTo(beatmap);
+            this.beatmap.BindTo(beatmap);
+            LoadBeatmap(EditorBeatmap);
+
             Track.BindTo(clock.Track);
         }
 
         private void updateRelativeChildSize()
         {
             // the track may not be loaded completely (only has a length once it is).
-            if (!Beatmap.Value.Track.IsLoaded)
+            if (!beatmap.Value.Track.IsLoaded)
             {
                 content.RelativeChildSize = Vector2.One;
                 Schedule(updateRelativeChildSize);
                 return;
             }
 
-            content.RelativeChildSize = new Vector2((float)Math.Max(1, Beatmap.Value.Track.Length), 1);
+            content.RelativeChildSize = new Vector2((float)Math.Max(1, beatmap.Value.Track.Length), 1);
         }
 
-        protected virtual void LoadBeatmap(WorkingBeatmap beatmap)
+        protected virtual void LoadBeatmap(EditorBeatmap beatmap)
         {
             content.Clear();
         }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs
index 13191df13c..18600bcdee 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs
@@ -5,7 +5,6 @@ using System.Collections.Specialized;
 using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
 
@@ -23,12 +22,12 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             RelativeSizeAxes = Axes.Both;
         }
 
-        protected override void LoadBeatmap(WorkingBeatmap beatmap)
+        protected override void LoadBeatmap(EditorBeatmap beatmap)
         {
             base.LoadBeatmap(beatmap);
 
             controlPointGroups.UnbindAll();
-            controlPointGroups.BindTo(beatmap.Beatmap.ControlPointInfo.Groups);
+            controlPointGroups.BindTo(beatmap.ControlPointInfo.Groups);
             controlPointGroups.BindCollectionChanged((sender, args) =>
             {
                 switch (args.Action)

From f3061a8e837e4a59522d9a4faeac1b0e9f98aa00 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 Jan 2021 18:47:41 +0900
Subject: [PATCH 1082/3722] Update squirrel to fix incorrect desktop icon
 creation on install

---
 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 4554f8b83a..e201b250d4 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -25,7 +25,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="System.IO.Packaging" Version="5.0.0" />
-    <PackageReference Include="ppy.squirrel.windows" Version="1.9.0.4" />
+    <PackageReference Include="ppy.squirrel.windows" Version="1.9.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.6" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />

From 439f03e3b3d78dbdbc8ba3d6db559c13043f1e86 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 25 Jan 2021 19:25:38 +0900
Subject: [PATCH 1083/3722] Fix failing test due to missing dependency

---
 .../Visual/Editing/TestSceneEditorSummaryTimeline.cs         | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs
index 3adc1bd425..94a9fd7b35 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs
@@ -5,6 +5,8 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Beatmaps;
+using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Components.Timelines.Summary;
 using osuTK;
 
@@ -13,6 +15,9 @@ namespace osu.Game.Tests.Visual.Editing
     [TestFixture]
     public class TestSceneEditorSummaryTimeline : EditorClockTestScene
     {
+        [Cached(typeof(EditorBeatmap))]
+        private readonly EditorBeatmap editorBeatmap = new EditorBeatmap(new OsuBeatmap());
+
         [BackgroundDependencyLoader]
         private void load()
         {

From 964976f604e9071e929f90cdd934ab104cf20bdb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 25 Jan 2021 20:41:51 +0900
Subject: [PATCH 1084/3722] Use a task chain and fix potential misordering of
 events

---
 .../Online/Multiplayer/MultiplayerClient.cs   |  11 +-
 .../Multiplayer/StatefulMultiplayerClient.cs  | 123 +++++-------------
 .../Multiplayer/TestMultiplayerClient.cs      |   2 +
 osu.Game/Utils/TaskChain.cs                   |  30 +++++
 4 files changed, 70 insertions(+), 96 deletions(-)
 create mode 100644 osu.Game/Utils/TaskChain.cs

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 5d18521eac..8573adc94a 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -134,17 +134,12 @@ namespace osu.Game.Online.Multiplayer
             return connection.InvokeAsync<MultiplayerRoom>(nameof(IMultiplayerServer.JoinRoom), roomId);
         }
 
-        public override async Task LeaveRoom()
+        protected override Task LeaveRoomInternal()
         {
             if (!isConnected.Value)
-            {
-                // even if not connected, make sure the local room state can be cleaned up.
-                await base.LeaveRoom();
-                return;
-            }
+                return Task.FromCanceled(new CancellationToken(true));
 
-            await base.LeaveRoom();
-            await connection.InvokeAsync(nameof(IMultiplayerServer.LeaveRoom));
+            return connection.InvokeAsync(nameof(IMultiplayerServer.LeaveRoom));
         }
 
         public override Task TransferHost(int userId)
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index f2b5a44fcf..94122aeff5 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -108,67 +108,38 @@ namespace osu.Game.Online.Multiplayer
             });
         }
 
-        private readonly object joinOrLeaveTaskLock = new object();
-        private Task? joinOrLeaveTask;
+        private readonly TaskChain joinOrLeaveTaskChain = new TaskChain();
 
         /// <summary>
         /// Joins the <see cref="MultiplayerRoom"/> for a given API <see cref="Room"/>.
         /// </summary>
         /// <param name="room">The API <see cref="Room"/>.</param>
-        public async Task JoinRoom(Room room)
+        public async Task JoinRoom(Room room) => await joinOrLeaveTaskChain.Add(async () =>
         {
-            Task? lastTask;
-            Task newTask;
+            if (Room != null)
+                throw new InvalidOperationException("Cannot join a multiplayer room while already in one.");
 
-            lock (joinOrLeaveTaskLock)
+            Debug.Assert(room.RoomID.Value != null);
+
+            // Join the server-side room.
+            var joinedRoom = await JoinRoom(room.RoomID.Value.Value);
+            Debug.Assert(joinedRoom != null);
+
+            // Populate users.
+            Debug.Assert(joinedRoom.Users != null);
+            await Task.WhenAll(joinedRoom.Users.Select(PopulateUser));
+
+            // Update the stored room (must be done on update thread for thread-safety).
+            await scheduleAsync(() =>
             {
-                lastTask = joinOrLeaveTask;
-                joinOrLeaveTask = newTask = Task.Run(async () =>
-                {
-                    if (lastTask != null)
-                        await lastTask;
+                Room = joinedRoom;
+                apiRoom = room;
+                playlistItemId = room.Playlist.SingleOrDefault()?.ID ?? 0;
+            });
 
-                    // Should be thread-safe since joinOrLeaveTask is locked on in both JoinRoom() and LeaveRoom().
-                    if (Room != null)
-                        throw new InvalidOperationException("Cannot join a multiplayer room while already in one.");
-
-                    Debug.Assert(room.RoomID.Value != null);
-
-                    // Join the server-side room.
-                    var joinedRoom = await JoinRoom(room.RoomID.Value.Value);
-                    Debug.Assert(joinedRoom != null);
-
-                    // Populate users.
-                    Debug.Assert(joinedRoom.Users != null);
-                    await Task.WhenAll(joinedRoom.Users.Select(PopulateUser));
-
-                    // Update the stored room (must be done on update thread for thread-safety).
-                    await scheduleAsync(() =>
-                    {
-                        Room = joinedRoom;
-                        apiRoom = room;
-                        playlistItemId = room.Playlist.SingleOrDefault()?.ID ?? 0;
-                    });
-
-                    // Update room settings.
-                    await updateLocalRoomSettings(joinedRoom.Settings);
-                });
-            }
-
-            try
-            {
-                await newTask;
-            }
-            finally
-            {
-                // The task will be awaited in the future, so reset it so that the user doesn't get into a permanently faulted state if anything fails.
-                lock (joinOrLeaveTaskLock)
-                {
-                    if (joinOrLeaveTask == newTask)
-                        joinOrLeaveTask = null;
-                }
-            }
-        }
+            // Update room settings.
+            await updateLocalRoomSettings(joinedRoom.Settings);
+        });
 
         /// <summary>
         /// Joins the <see cref="MultiplayerRoom"/> with a given ID.
@@ -177,48 +148,24 @@ namespace osu.Game.Online.Multiplayer
         /// <returns>The joined <see cref="MultiplayerRoom"/>.</returns>
         protected abstract Task<MultiplayerRoom> JoinRoom(long roomId);
 
-        public virtual async Task LeaveRoom()
+        public async Task LeaveRoom() => await joinOrLeaveTaskChain.Add(async () =>
         {
-            Task? lastTask;
-            Task newTask;
+            if (Room == null)
+                return;
 
-            lock (joinOrLeaveTaskLock)
+            await scheduleAsync(() =>
             {
-                lastTask = joinOrLeaveTask;
-                joinOrLeaveTask = newTask = Task.Run(async () =>
-                {
-                    if (lastTask != null)
-                        await lastTask;
+                apiRoom = null;
+                Room = null;
+                CurrentMatchPlayingUserIds.Clear();
 
-                    // Should be thread-safe since joinOrLeaveTask is locked on in both JoinRoom() and LeaveRoom().
-                    if (Room == null)
-                        return;
+                RoomUpdated?.Invoke();
+            });
 
-                    await scheduleAsync(() =>
-                    {
-                        apiRoom = null;
-                        Room = null;
-                        CurrentMatchPlayingUserIds.Clear();
+            await LeaveRoomInternal();
+        });
 
-                        RoomUpdated?.Invoke();
-                    });
-                });
-            }
-
-            try
-            {
-                await newTask;
-            }
-            finally
-            {
-                // The task will be awaited in the future, so reset it so that the user doesn't get into a permanently faulted state if anything fails.
-                lock (joinOrLeaveTaskLock)
-                {
-                    if (joinOrLeaveTask == newTask)
-                        joinOrLeaveTask = null;
-                }
-            }
-        }
+        protected abstract Task LeaveRoomInternal();
 
         /// <summary>
         /// Change the current <see cref="MultiplayerRoom"/> settings.
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index 7fbc770351..a79183fdab 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -98,6 +98,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
             return Task.FromResult(room);
         }
 
+        protected override Task LeaveRoomInternal() => Task.CompletedTask;
+
         public override Task TransferHost(int userId) => ((IMultiplayerClient)this).HostChanged(userId);
 
         public override async Task ChangeSettings(MultiplayerRoomSettings settings)
diff --git a/osu.Game/Utils/TaskChain.cs b/osu.Game/Utils/TaskChain.cs
new file mode 100644
index 0000000000..b397b0c45b
--- /dev/null
+++ b/osu.Game/Utils/TaskChain.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 enable
+
+using System;
+using System.Threading.Tasks;
+
+namespace osu.Game.Utils
+{
+    /// <summary>
+    /// A chain of <see cref="Task"/>s that run sequentially.
+    /// </summary>
+    public class TaskChain
+    {
+        private readonly object currentTaskLock = new object();
+        private Task? currentTask;
+
+        public Task Add(Func<Task> taskFunc)
+        {
+            lock (currentTaskLock)
+            {
+                currentTask = currentTask == null
+                    ? taskFunc()
+                    : currentTask.ContinueWith(_ => taskFunc()).Unwrap();
+                return currentTask;
+            }
+        }
+    }
+}

From bb44fcfe31c78f77321714c466724847d27492ce Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 25 Jan 2021 20:58:02 +0900
Subject: [PATCH 1085/3722] Prevent some data races

---
 .../Multiplayer/StatefulMultiplayerClient.cs   | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 94122aeff5..0e736ed7c6 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Diagnostics;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -148,12 +149,15 @@ namespace osu.Game.Online.Multiplayer
         /// <returns>The joined <see cref="MultiplayerRoom"/>.</returns>
         protected abstract Task<MultiplayerRoom> JoinRoom(long roomId);
 
-        public async Task LeaveRoom() => await joinOrLeaveTaskChain.Add(async () =>
+        public Task LeaveRoom()
         {
             if (Room == null)
-                return;
+                return Task.FromCanceled(new CancellationToken(true));
 
-            await scheduleAsync(() =>
+            // Leaving rooms is expected to occur instantaneously whilst the operation is finalised in the background.
+            // However a few members need to be reset immediately to prevent other components from entering invalid states whilst the operation hasn't yet completed.
+            // For example, if a room was left and the user immediately pressed the "create room" button, then the user could be taken into the lobby if the value of Room is not reset in time.
+            var scheduledReset = scheduleAsync(() =>
             {
                 apiRoom = null;
                 Room = null;
@@ -162,8 +166,12 @@ namespace osu.Game.Online.Multiplayer
                 RoomUpdated?.Invoke();
             });
 
-            await LeaveRoomInternal();
-        });
+            return joinOrLeaveTaskChain.Add(async () =>
+            {
+                await scheduledReset;
+                await LeaveRoomInternal();
+            });
+        }
 
         protected abstract Task LeaveRoomInternal();
 

From c17774e23c6b770d07cd2d9ea059ca1bcc4dff1a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 25 Jan 2021 20:58:05 +0900
Subject: [PATCH 1086/3722] Add xmldoc

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

diff --git a/osu.Game/Utils/TaskChain.cs b/osu.Game/Utils/TaskChain.cs
index b397b0c45b..64d523bd3d 100644
--- a/osu.Game/Utils/TaskChain.cs
+++ b/osu.Game/Utils/TaskChain.cs
@@ -16,6 +16,11 @@ namespace osu.Game.Utils
         private readonly object currentTaskLock = new object();
         private Task? currentTask;
 
+        /// <summary>
+        /// Adds a new task to the end of this <see cref="TaskChain"/>.
+        /// </summary>
+        /// <param name="taskFunc">The task creation function.</param>
+        /// <returns>The awaitable <see cref="Task"/>.</returns>
         public Task Add(Func<Task> taskFunc)
         {
             lock (currentTaskLock)

From f89eb7d75db7982d3cdc6200b4737c630094eb87 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 25 Jan 2021 13:22:37 +0100
Subject: [PATCH 1087/3722] Split and rename TournamentModDisplay component

---
 .../Components/TournamentBeatmapPanel.cs      | 64 +++----------------
 .../Components/TournamentModDisplay.cs        | 56 ++++++++++++++++
 2 files changed, 64 insertions(+), 56 deletions(-)
 create mode 100644 osu.Game.Tournament/Components/TournamentModDisplay.cs

diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index 92ac123097..2ed99d2fb5 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -9,14 +9,11 @@ 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.Graphics.Textures;
 using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
-using osu.Game.Rulesets;
-using osu.Game.Screens.Play.HUD;
 using osu.Game.Tournament.Models;
 using osuTK.Graphics;
 
@@ -25,7 +22,7 @@ namespace osu.Game.Tournament.Components
     public class TournamentBeatmapPanel : CompositeDrawable
     {
         public readonly BeatmapInfo Beatmap;
-        private readonly string mods;
+        private readonly string mod;
 
         private const float horizontal_padding = 10;
         private const float vertical_padding = 10;
@@ -40,7 +37,7 @@ namespace osu.Game.Tournament.Components
             if (beatmap == null) throw new ArgumentNullException(nameof(beatmap));
 
             Beatmap = beatmap;
-            this.mods = mods;
+            this.mod = mods;
             Width = 400;
             Height = HEIGHT;
         }
@@ -124,13 +121,16 @@ namespace osu.Game.Tournament.Components
                 },
             });
 
-            if (!string.IsNullOrEmpty(mods))
+            if (!string.IsNullOrEmpty(mod))
             {
-                AddInternal(new ModSprite
+                AddInternal(new TournamentModDisplay
                 {
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreRight,
-                    Mod = mods
+                    Margin = new MarginPadding(10),
+                    Width = 60,
+                    RelativeSizeAxes = Axes.Y,
+                    ModAcronym = mod
                 });
             }
         }
@@ -184,53 +184,5 @@ namespace osu.Game.Tournament.Components
                 Alpha = 1;
             }
         }
-
-        private class ModSprite : Container
-        {
-            public string Mod;
-
-            [Resolved]
-            private LadderInfo ladderInfo { get; set; }
-
-            [Resolved]
-            private RulesetStore rulesets { get; set; }
-
-            public ModSprite()
-            {
-                Margin = new MarginPadding(10);
-                Width = 60;
-                RelativeSizeAxes = Axes.Y;
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(TextureStore textures)
-            {
-                var texture = textures.Get($"mods/{Mod}");
-
-                if (texture != null)
-                {
-                    Child = new Sprite
-                    {
-                        FillMode = FillMode.Fit,
-                        RelativeSizeAxes = Axes.Both,
-                        Anchor = Anchor.CentreRight,
-                        Origin = Anchor.CentreRight,
-                        Texture = texture
-                    };
-                }
-                else
-                {
-                    Child = new ModDisplay
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        Current =
-                        {
-                            Value = rulesets.GetRuleset(ladderInfo.Ruleset.Value.ID ?? 0).CreateInstance().GetAllMods().Where(mod => mod.Acronym == Mod).ToArray()
-                        }
-                    };
-                }
-            }
-        }
     }
 }
diff --git a/osu.Game.Tournament/Components/TournamentModDisplay.cs b/osu.Game.Tournament/Components/TournamentModDisplay.cs
new file mode 100644
index 0000000000..a22969c20d
--- /dev/null
+++ b/osu.Game.Tournament/Components/TournamentModDisplay.cs
@@ -0,0 +1,56 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.UI;
+using osu.Game.Tournament.Models;
+using osuTK;
+
+namespace osu.Game.Tournament.Components
+{
+    public class TournamentModDisplay : CompositeDrawable
+    {
+        public string ModAcronym;
+
+        [Resolved]
+        private LadderInfo ladderInfo { get; set; }
+
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
+
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures)
+        {
+            var texture = textures.Get($"mods/{ModAcronym}");
+
+            if (texture != null)
+            {
+                AddInternal(new Sprite
+                {
+                    FillMode = FillMode.Fit,
+                    RelativeSizeAxes = Axes.Both,
+                    Anchor = Anchor.CentreRight,
+                    Origin = Anchor.CentreRight,
+                    Texture = texture
+                });
+            }
+            else
+            {
+                var mod = rulesets.GetRuleset(ladderInfo.Ruleset.Value.ID ?? 0).CreateInstance().GetAllMods().FirstOrDefault(mod => mod.Acronym == ModAcronym);
+
+                AddInternal(new ModIcon(mod)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Scale = new Vector2(0.5f)
+                });
+            }
+        }
+    }
+}

From 74310da7cf550af33367a4dd0e3d49eebacf32a5 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 25 Jan 2021 13:24:43 +0100
Subject: [PATCH 1088/3722] Change parameter to be singular mod instead of
 plural

---
 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 2ed99d2fb5..e02709a045 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -32,12 +32,12 @@ namespace osu.Game.Tournament.Components
         private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>();
         private Box flash;
 
-        public TournamentBeatmapPanel(BeatmapInfo beatmap, string mods = null)
+        public TournamentBeatmapPanel(BeatmapInfo beatmap, string mod = null)
         {
             if (beatmap == null) throw new ArgumentNullException(nameof(beatmap));
 
             Beatmap = beatmap;
-            this.mod = mods;
+            this.mod = mod;
             Width = 400;
             Height = HEIGHT;
         }

From ca08a19c409e4a454a0d6a66d7ce57d2ea845228 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 25 Jan 2021 13:28:46 +0100
Subject: [PATCH 1089/3722] Rename mod to modIcon

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

diff --git a/osu.Game.Tournament/Components/TournamentModDisplay.cs b/osu.Game.Tournament/Components/TournamentModDisplay.cs
index a22969c20d..827b3d6a69 100644
--- a/osu.Game.Tournament/Components/TournamentModDisplay.cs
+++ b/osu.Game.Tournament/Components/TournamentModDisplay.cs
@@ -42,9 +42,9 @@ namespace osu.Game.Tournament.Components
             }
             else
             {
-                var mod = rulesets.GetRuleset(ladderInfo.Ruleset.Value.ID ?? 0).CreateInstance().GetAllMods().FirstOrDefault(mod => mod.Acronym == ModAcronym);
+                var modIcon = rulesets.GetRuleset(ladderInfo.Ruleset.Value.ID ?? 0).CreateInstance().GetAllMods().FirstOrDefault(mod => mod.Acronym == ModAcronym);
 
-                AddInternal(new ModIcon(mod)
+                AddInternal(new ModIcon(modIcon)
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,

From 07bd9013585ebae924cf44c501b079bb9d9b01b0 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 25 Jan 2021 14:20:58 +0100
Subject: [PATCH 1090/3722] Add visual test for Tournament Mod Display

---
 .../TestSceneTournamentModDisplay.cs          | 66 +++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.cs

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.cs b/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.cs
new file mode 100644
index 0000000000..9689ecd4ae
--- /dev/null
+++ b/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.cs
@@ -0,0 +1,66 @@
+// Copyright (c) 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.Containers;
+using osu.Game.Beatmaps;
+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.Tournament.Components;
+
+namespace osu.Game.Tournament.Tests.Components
+{
+    public class TestSceneTournamentModDisplay : TournamentTestScene
+    {
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
+
+        private FillFlowContainer<TournamentBeatmapPanel> fillFlow;
+
+        private BeatmapInfo beatmap;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            var req = new GetBeatmapRequest(new BeatmapInfo { OnlineBeatmapID = 490154 });
+            req.Success += success;
+            api.Queue(req);
+
+            Add(fillFlow = new FillFlowContainer<TournamentBeatmapPanel>
+            {
+                RelativeSizeAxes = Axes.Both,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Direction = FillDirection.Full,
+                Spacing = new osuTK.Vector2(10)
+            });
+        }
+
+        [Test]
+        public void TestModDisplay()
+        {
+            AddUntilStep("beatmap is available", () => beatmap != null);
+            AddStep("add maps with available mods for ruleset", () => displayForRuleset(Ladder.Ruleset.Value.ID ?? 0));
+        }
+
+        private void displayForRuleset(int rulesetId)
+        {
+            fillFlow.Clear();
+            var mods = rulesets.GetRuleset(rulesetId).CreateInstance().GetAllMods();
+
+            foreach (var mod in mods)
+            {
+                fillFlow.Add(new TournamentBeatmapPanel(beatmap, mod.Acronym));
+            }
+        }
+
+        private void success(APIBeatmap apiBeatmap) => beatmap = apiBeatmap.ToBeatmap(rulesets);
+    }
+}

From 5e0ccb6c91d3e1d55968882b80d3ba0eca1971a0 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 25 Jan 2021 14:21:22 +0100
Subject: [PATCH 1091/3722] Remove unncessary test step

---
 .../TestSceneTournamentModDisplay.cs          | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.cs b/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.cs
index 9689ecd4ae..b4d9fa4222 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneTournamentModDisplay.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 NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -43,24 +42,19 @@ namespace osu.Game.Tournament.Tests.Components
             });
         }
 
-        [Test]
-        public void TestModDisplay()
+        private void success(APIBeatmap apiBeatmap)
         {
-            AddUntilStep("beatmap is available", () => beatmap != null);
-            AddStep("add maps with available mods for ruleset", () => displayForRuleset(Ladder.Ruleset.Value.ID ?? 0));
-        }
-
-        private void displayForRuleset(int rulesetId)
-        {
-            fillFlow.Clear();
-            var mods = rulesets.GetRuleset(rulesetId).CreateInstance().GetAllMods();
+            beatmap = apiBeatmap.ToBeatmap(rulesets);
+            var mods = rulesets.GetRuleset(Ladder.Ruleset.Value.ID ?? 0).CreateInstance().GetAllMods();
 
             foreach (var mod in mods)
             {
-                fillFlow.Add(new TournamentBeatmapPanel(beatmap, mod.Acronym));
+                fillFlow.Add(new TournamentBeatmapPanel(beatmap, mod.Acronym)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre
+                });
             }
         }
-
-        private void success(APIBeatmap apiBeatmap) => beatmap = apiBeatmap.ToBeatmap(rulesets);
     }
 }

From 6a85f5ca8bf2a9506ed55d9a60f870b820326e2b Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 25 Jan 2021 14:21:53 +0100
Subject: [PATCH 1092/3722] Add null checks to prevent nullrefexception in
 automated test

---
 osu.Game.Tournament/Components/TournamentModDisplay.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Components/TournamentModDisplay.cs b/osu.Game.Tournament/Components/TournamentModDisplay.cs
index 827b3d6a69..e91c27345e 100644
--- a/osu.Game.Tournament/Components/TournamentModDisplay.cs
+++ b/osu.Game.Tournament/Components/TournamentModDisplay.cs
@@ -42,7 +42,15 @@ namespace osu.Game.Tournament.Components
             }
             else
             {
-                var modIcon = rulesets.GetRuleset(ladderInfo.Ruleset.Value.ID ?? 0).CreateInstance().GetAllMods().FirstOrDefault(mod => mod.Acronym == ModAcronym);
+                var ruleset = rulesets.AvailableRulesets.FirstOrDefault(r => r == ladderInfo.Ruleset.Value);
+
+                if (ruleset == null)
+                    return;
+
+                var modIcon = ruleset.CreateInstance().GetAllMods().FirstOrDefault(mod => mod.Acronym == ModAcronym);
+
+                if (modIcon == null)
+                    return;
 
                 AddInternal(new ModIcon(modIcon)
                 {

From a741d91aed91f338ffecd3a4596b551c8804b52e Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 25 Jan 2021 14:57:35 +0100
Subject: [PATCH 1093/3722] use null propragtor for Ruleset.Value and rulset
 instead of null checks

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

diff --git a/osu.Game.Tournament/Components/TournamentModDisplay.cs b/osu.Game.Tournament/Components/TournamentModDisplay.cs
index e91c27345e..369a58858e 100644
--- a/osu.Game.Tournament/Components/TournamentModDisplay.cs
+++ b/osu.Game.Tournament/Components/TournamentModDisplay.cs
@@ -18,14 +18,11 @@ namespace osu.Game.Tournament.Components
     {
         public string ModAcronym;
 
-        [Resolved]
-        private LadderInfo ladderInfo { get; set; }
-
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
         [BackgroundDependencyLoader]
-        private void load(TextureStore textures)
+        private void load(TextureStore textures, LadderInfo ladderInfo)
         {
             var texture = textures.Get($"mods/{ModAcronym}");
 
@@ -42,12 +39,8 @@ namespace osu.Game.Tournament.Components
             }
             else
             {
-                var ruleset = rulesets.AvailableRulesets.FirstOrDefault(r => r == ladderInfo.Ruleset.Value);
-
-                if (ruleset == null)
-                    return;
-
-                var modIcon = ruleset.CreateInstance().GetAllMods().FirstOrDefault(mod => mod.Acronym == ModAcronym);
+                var ruleset = rulesets.GetRuleset(ladderInfo.Ruleset.Value?.ID ?? 0);
+                var modIcon = ruleset?.CreateInstance().GetAllMods().FirstOrDefault(mod => mod.Acronym == ModAcronym);
 
                 if (modIcon == null)
                     return;

From b036f0165a077bc49cb0fd9d7e8713fb6a18fd89 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 25 Jan 2021 15:47:31 +0100
Subject: [PATCH 1094/3722] move value set to constructor and make private
 readonly

---
 .../Components/TournamentBeatmapPanel.cs              |  3 +--
 .../Components/TournamentModDisplay.cs                | 11 ++++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index e02709a045..8cc4566c08 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -123,14 +123,13 @@ namespace osu.Game.Tournament.Components
 
             if (!string.IsNullOrEmpty(mod))
             {
-                AddInternal(new TournamentModDisplay
+                AddInternal(new TournamentModDisplay(mod)
                 {
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreRight,
                     Margin = new MarginPadding(10),
                     Width = 60,
                     RelativeSizeAxes = Axes.Y,
-                    ModAcronym = mod
                 });
             }
         }
diff --git a/osu.Game.Tournament/Components/TournamentModDisplay.cs b/osu.Game.Tournament/Components/TournamentModDisplay.cs
index 369a58858e..3df8550667 100644
--- a/osu.Game.Tournament/Components/TournamentModDisplay.cs
+++ b/osu.Game.Tournament/Components/TournamentModDisplay.cs
@@ -16,15 +16,20 @@ namespace osu.Game.Tournament.Components
 {
     public class TournamentModDisplay : CompositeDrawable
     {
-        public string ModAcronym;
+        private readonly string modAcronym;
 
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
+        public TournamentModDisplay(string mod)
+        {
+            modAcronym = mod;
+        }
+
         [BackgroundDependencyLoader]
         private void load(TextureStore textures, LadderInfo ladderInfo)
         {
-            var texture = textures.Get($"mods/{ModAcronym}");
+            var texture = textures.Get($"mods/{modAcronym}");
 
             if (texture != null)
             {
@@ -40,7 +45,7 @@ namespace osu.Game.Tournament.Components
             else
             {
                 var ruleset = rulesets.GetRuleset(ladderInfo.Ruleset.Value?.ID ?? 0);
-                var modIcon = ruleset?.CreateInstance().GetAllMods().FirstOrDefault(mod => mod.Acronym == ModAcronym);
+                var modIcon = ruleset?.CreateInstance().GetAllMods().FirstOrDefault(mod => mod.Acronym == modAcronym);
 
                 if (modIcon == null)
                     return;

From a4a7f0c5787a1fd0a5470a8af72c1ac5211e7d1b Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 25 Jan 2021 19:05:16 +0100
Subject: [PATCH 1095/3722] Address CI inspections.

---
 osu.Game/IO/StableStorage.cs | 12 ++++++------
 osu.Game/OsuGame.cs          |  1 -
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/osu.Game/IO/StableStorage.cs b/osu.Game/IO/StableStorage.cs
index c7ca37a163..85af92621b 100644
--- a/osu.Game/IO/StableStorage.cs
+++ b/osu.Game/IO/StableStorage.cs
@@ -17,26 +17,26 @@ namespace osu.Game.IO
         private const string stable_songs_path = "Songs";
 
         private readonly DesktopGameHost host;
-        private string songs_path;
+        private readonly string songsPath;
 
         public StableStorage(string path, DesktopGameHost host)
             : base(path, host)
         {
             this.host = host;
-            songs_path = locateSongsDirectory();
+            songsPath = locateSongsDirectory();
         }
 
         /// <summary>
         /// Returns a <see cref="Storage"/> pointing to the osu-stable Songs directory.
         /// </summary>
-        public Storage GetSongStorage() => new DesktopStorage(songs_path, host);
+        public Storage GetSongStorage() => new DesktopStorage(songsPath, host);
 
         private string locateSongsDirectory()
         {
             var configFile = GetStream(GetFiles(".", "osu!.*.cfg").First());
             var textReader = new StreamReader(configFile);
 
-            var songs_directory_path = Path.Combine(BasePath, stable_songs_path);
+            var songsDirectoryPath = Path.Combine(BasePath, stable_songs_path);
 
             while (!textReader.EndOfStream)
             {
@@ -46,13 +46,13 @@ namespace osu.Game.IO
                 {
                     var directory = line.Split('=')[1].TrimStart();
                     if (Path.IsPathFullyQualified(directory))
-                        songs_directory_path = directory;
+                        songsDirectoryPath = directory;
 
                     break;
                 }
             }
 
-            return songs_directory_path;
+            return songsDirectoryPath;
         }
     }
 }
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 399bdda491..78c4d4ccad 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -28,7 +28,6 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
-using osu.Framework.Platform;
 using osu.Framework.Threading;
 using osu.Game.Beatmaps;
 using osu.Game.Collections;

From 9efce5717f40e2ade16c4dee2cb89501d6c27c0d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 25 Jan 2021 22:11:50 +0300
Subject: [PATCH 1096/3722] Fix beatmap listing placeholder disappearing on
 second time display

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

diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index 2f7f21e403..b65eaad0a2 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -176,6 +176,9 @@ namespace osu.Game.Overlays
             loadingLayer.Hide();
             lastFetchDisplayedTime = Time.Current;
 
+            if (content == currentContent)
+                return;
+
             var lastContent = currentContent;
 
             if (lastContent != null)

From 9312de7c2387f4534090304550f3910c54b98e39 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 25 Jan 2021 23:40:26 +0300
Subject: [PATCH 1097/3722] Move online beatmap listing overlay to separate
 test scene

---
 ...ingOverlay.cs => TestSceneOnlineBeatmapListingOverlay.cs} | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename osu.Game.Tests/Visual/Online/{TestSceneBeatmapListingOverlay.cs => TestSceneOnlineBeatmapListingOverlay.cs} (80%)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneOnlineBeatmapListingOverlay.cs
similarity index 80%
rename from osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
rename to osu.Game.Tests/Visual/Online/TestSceneOnlineBeatmapListingOverlay.cs
index 6cb1687d1f..fe1701a554 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneOnlineBeatmapListingOverlay.cs
@@ -6,13 +6,14 @@ using NUnit.Framework;
 
 namespace osu.Game.Tests.Visual.Online
 {
-    public class TestSceneBeatmapListingOverlay : OsuTestScene
+    [Description("uses online API")]
+    public class TestSceneOnlineBeatmapListingOverlay : OsuTestScene
     {
         protected override bool UseOnlineAPI => true;
 
         private readonly BeatmapListingOverlay overlay;
 
-        public TestSceneBeatmapListingOverlay()
+        public TestSceneOnlineBeatmapListingOverlay()
         {
             Add(overlay = new BeatmapListingOverlay());
         }

From 75d6dbdbb7290c215505e408f15781b96128d929 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 25 Jan 2021 22:18:23 +0300
Subject: [PATCH 1098/3722] Fix beatmap listing placeholder potentially getting
 disposed

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

diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index 0c9c995dd6..2f7f21e403 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -180,18 +180,24 @@ namespace osu.Game.Overlays
 
             if (lastContent != null)
             {
-                lastContent.FadeOut(100, Easing.OutQuint).Expire();
+                lastContent.FadeOut(100, Easing.OutQuint);
 
                 // Consider the case when the new content is smaller than the last content.
                 // If the auto-size computation is delayed until fade out completes, the background remain high for too long making the resulting transition to the smaller height look weird.
                 // At the same time, if the last content's height is bypassed immediately, there is a period where the new content is at Alpha = 0 when the auto-sized height will be 0.
                 // To resolve both of these issues, the bypass is delayed until a point when the content transitions (fade-in and fade-out) overlap and it looks good to do so.
-                lastContent.Delay(25).Schedule(() => lastContent.BypassAutoSizeAxes = Axes.Y).Then().Schedule(() => panelTarget.Remove(lastContent));
+                lastContent.Delay(25).Schedule(() => lastContent.BypassAutoSizeAxes = Axes.Y).Then().Schedule(() =>
+                {
+                    panelTarget.Remove(lastContent);
+
+                    // the content may be reused again (e.g. notFoundContent), clear Y-axis bypass for displaying back properly.
+                    lastContent.BypassAutoSizeAxes = Axes.None;
+                });
             }
 
             if (!content.IsAlive)
                 panelTarget.Add(content);
-            content.FadeIn(200, Easing.OutQuint);
+            content.FadeInFromZero(200, Easing.OutQuint);
 
             currentContent = content;
         }

From c317d6016967a321c70d02ee81d012129e8b5767 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 25 Jan 2021 23:41:05 +0300
Subject: [PATCH 1099/3722] Add offline test scene for beatmap listing overlay

---
 .../Online/TestSceneBeatmapListingOverlay.cs  | 81 +++++++++++++++++++
 .../API/Requests/Responses/APIBeatmapSet.cs   |  2 +-
 osu.Game/Overlays/BeatmapListingOverlay.cs    |  2 +-
 3 files changed, 83 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
new file mode 100644
index 0000000000..1349264bf9
--- /dev/null
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
@@ -0,0 +1,81 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+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.BeatmapListing;
+using osu.Game.Rulesets;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public class TestSceneBeatmapListingOverlay : OsuTestScene
+    {
+        private readonly List<APIBeatmapSet> setsForResponse = new List<APIBeatmapSet>();
+
+        private BeatmapListingOverlay overlay;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Child = overlay = new BeatmapListingOverlay { State = { Value = Visibility.Visible } };
+
+            ((DummyAPIAccess)API).HandleRequest = req =>
+            {
+                if (req is SearchBeatmapSetsRequest searchBeatmapSetsRequest)
+                {
+                    searchBeatmapSetsRequest.TriggerSuccess(new SearchBeatmapSetsResponse
+                    {
+                        BeatmapSets = setsForResponse,
+                    });
+                }
+            };
+        }
+
+        [Test]
+        public void TestNoBeatmapsPlaceholder()
+        {
+            AddStep("fetch for 0 beatmaps", () => fetchFor());
+            AddUntilStep("placeholder shown", () => overlay.ChildrenOfType<BeatmapListingOverlay.NotFoundDrawable>().SingleOrDefault()?.IsPresent == true);
+
+            AddStep("fetch for 1 beatmap", () => fetchFor(CreateBeatmap(Ruleset.Value).BeatmapInfo.BeatmapSet));
+            AddUntilStep("placeholder hidden", () => !overlay.ChildrenOfType<BeatmapListingOverlay.NotFoundDrawable>().Any());
+
+            AddStep("fetch for 0 beatmaps", () => fetchFor());
+            AddUntilStep("placeholder shown", () => overlay.ChildrenOfType<BeatmapListingOverlay.NotFoundDrawable>().SingleOrDefault()?.IsPresent == true);
+
+            // fetch once more to ensure nothing happens in displaying placeholder again when it already is present.
+            AddStep("fetch for 0 beatmaps again", () => fetchFor());
+            AddUntilStep("placeholder shown", () => overlay.ChildrenOfType<BeatmapListingOverlay.NotFoundDrawable>().SingleOrDefault()?.IsPresent == true);
+        }
+
+        private void fetchFor(params BeatmapSetInfo[] beatmaps)
+        {
+            setsForResponse.Clear();
+            setsForResponse.AddRange(beatmaps.Select(b => new TestAPIBeatmapSet(b)));
+
+            // trigger arbitrary change for fetching.
+            overlay.ChildrenOfType<BeatmapListingSearchControl>().Single().Query.TriggerChange();
+        }
+
+        private class TestAPIBeatmapSet : APIBeatmapSet
+        {
+            private readonly BeatmapSetInfo beatmapSet;
+
+            public TestAPIBeatmapSet(BeatmapSetInfo beatmapSet)
+            {
+                this.beatmapSet = beatmapSet;
+            }
+
+            public override BeatmapSetInfo ToBeatmapSet(RulesetStore rulesets) => beatmapSet;
+        }
+    }
+}
diff --git a/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs b/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs
index bd1800e9f7..45d9c9405f 100644
--- a/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Online.API.Requests.Responses
         [JsonProperty(@"beatmaps")]
         private IEnumerable<APIBeatmap> beatmaps { get; set; }
 
-        public BeatmapSetInfo ToBeatmapSet(RulesetStore rulesets)
+        public virtual BeatmapSetInfo ToBeatmapSet(RulesetStore rulesets)
         {
             var beatmapSet = new BeatmapSetInfo
             {
diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index b65eaad0a2..c5cc0a9c85 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -211,7 +211,7 @@ namespace osu.Game.Overlays
             base.Dispose(isDisposing);
         }
 
-        private class NotFoundDrawable : CompositeDrawable
+        public class NotFoundDrawable : CompositeDrawable
         {
             public NotFoundDrawable()
             {

From 0d8d0d685219e162e385f0bb506735d7fedcb2e0 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 26 Jan 2021 01:03:29 +0300
Subject: [PATCH 1100/3722] Apply alternative way of fixing

---
 osu.Game/Overlays/BeatmapListingOverlay.cs | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index 2f7f21e403..fc90968ec4 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -178,21 +178,18 @@ namespace osu.Game.Overlays
 
             var lastContent = currentContent;
 
-            if (lastContent != null)
+            // "not found" placeholder is reused, only remove without disposing through expire.
+            if (lastContent == notFoundContent)
+                lastContent.FadeOut(100, Easing.OutQuint).Schedule(() => panelTarget.Remove(lastContent));
+            else if (lastContent != null)
             {
-                lastContent.FadeOut(100, Easing.OutQuint);
+                lastContent.FadeOut(100, Easing.OutQuint).Expire();
 
                 // Consider the case when the new content is smaller than the last content.
                 // If the auto-size computation is delayed until fade out completes, the background remain high for too long making the resulting transition to the smaller height look weird.
                 // At the same time, if the last content's height is bypassed immediately, there is a period where the new content is at Alpha = 0 when the auto-sized height will be 0.
                 // To resolve both of these issues, the bypass is delayed until a point when the content transitions (fade-in and fade-out) overlap and it looks good to do so.
-                lastContent.Delay(25).Schedule(() => lastContent.BypassAutoSizeAxes = Axes.Y).Then().Schedule(() =>
-                {
-                    panelTarget.Remove(lastContent);
-
-                    // the content may be reused again (e.g. notFoundContent), clear Y-axis bypass for displaying back properly.
-                    lastContent.BypassAutoSizeAxes = Axes.None;
-                });
+                lastContent.Delay(25).Schedule(() => lastContent.BypassAutoSizeAxes = Axes.Y).Then().Schedule(() => panelTarget.Remove(lastContent));
             }
 
             if (!content.IsAlive)

From 3307e8357ff6f919ff649c6e8036b12c5d4ffb77 Mon Sep 17 00:00:00 2001
From: Mysfit <mysfit@mysfit.dev>
Date: Tue, 26 Jan 2021 00:36:32 -0500
Subject: [PATCH 1101/3722] DrawableStoryboardSample event method override for
 SamplePlaybackDisabledChanged

---
 osu.Game/Skinning/PausableSkinnableSound.cs   | 46 +++++++++----------
 .../Drawables/DrawableStoryboardSample.cs     | 14 +++---
 2 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/osu.Game/Skinning/PausableSkinnableSound.cs b/osu.Game/Skinning/PausableSkinnableSound.cs
index d8149e76c0..e2794938ad 100644
--- a/osu.Game/Skinning/PausableSkinnableSound.cs
+++ b/osu.Game/Skinning/PausableSkinnableSound.cs
@@ -18,14 +18,6 @@ namespace osu.Game.Skinning
 
         protected bool RequestedPlaying { get; private set; }
 
-        /// <summary>
-        /// Whether this <see cref="PausableSkinnableSound"/> is affected by
-        /// a higher-level <see cref="ISamplePlaybackDisabler"/>'s state changes.
-        /// By default only looping samples are started/stopped on sample disable
-        /// to prevent one-time samples from cutting off abruptly.
-        /// </summary>
-        protected virtual bool AffectedBySamplePlaybackDisable => Looping;
-
         public PausableSkinnableSound()
         {
         }
@@ -51,24 +43,28 @@ namespace osu.Game.Skinning
             if (samplePlaybackDisabler != null)
             {
                 samplePlaybackDisabled.BindTo(samplePlaybackDisabler.SamplePlaybackDisabled);
-                samplePlaybackDisabled.BindValueChanged(disabled =>
+                samplePlaybackDisabled.BindValueChanged(SamplePlaybackDisabledChanged);
+            }
+        }
+
+        protected virtual void SamplePlaybackDisabledChanged(ValueChangedEvent<bool> disabled)
+        {
+            if (!RequestedPlaying) return;
+
+            // let non-looping samples that have already been started play out to completion (sounds better than abruptly cutting off).
+            if (!Looping) return;
+
+            cancelPendingStart();
+
+            if (disabled.NewValue)
+                base.Stop();
+            else
+            {
+                // schedule so we don't start playing a sample which is no longer alive.
+                scheduledStart = Schedule(() =>
                 {
-                    if (!RequestedPlaying) return;
-                    if (!AffectedBySamplePlaybackDisable) return;
-
-                    cancelPendingStart();
-
-                    if (disabled.NewValue)
-                        base.Stop();
-                    else
-                    {
-                        // schedule so we don't start playing a sample which is no longer alive.
-                        scheduledStart = Schedule(() =>
-                        {
-                            if (RequestedPlaying)
-                                base.Play();
-                        });
-                    }
+                    if (RequestedPlaying)
+                        base.Play();
                 });
             }
         }
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
index 5a800a71fd..db8428f062 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
@@ -21,12 +21,6 @@ namespace osu.Game.Storyboards.Drawables
 
         public override bool RemoveWhenNotAlive => false;
 
-        /// <remarks>
-        /// Contrary to <see cref="PausableSkinnableSound"/>, all <see cref="DrawableStoryboardSample"/>s are affected
-        /// by sample disables, as they are oftentimes longer-running sound effects. This also matches stable behaviour.
-        /// </remarks>
-        protected override bool AffectedBySamplePlaybackDisable => true;
-
         public DrawableStoryboardSample(StoryboardSampleInfo sampleInfo)
             : base(sampleInfo)
         {
@@ -48,6 +42,14 @@ namespace osu.Game.Storyboards.Drawables
             }
         }
 
+        protected override void SamplePlaybackDisabledChanged(ValueChangedEvent<bool> disabled)
+        {
+            if (!RequestedPlaying) return;
+
+            if (disabled.NewValue)
+                Stop();
+        }
+
         protected override void Update()
         {
             base.Update();

From ca0242debef0c77bde87d7f4fecdc84f3b65a8b5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Jan 2021 15:42:48 +0900
Subject: [PATCH 1102/3722] Tidy up logic to correctly expire in cases where
 expiry is expected

---
 osu.Game/Overlays/BeatmapListingOverlay.cs | 27 +++++++++++++---------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index fc90968ec4..de566c92cb 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -178,24 +178,29 @@ namespace osu.Game.Overlays
 
             var lastContent = currentContent;
 
-            // "not found" placeholder is reused, only remove without disposing through expire.
-            if (lastContent == notFoundContent)
-                lastContent.FadeOut(100, Easing.OutQuint).Schedule(() => panelTarget.Remove(lastContent));
-            else if (lastContent != null)
+            if (lastContent != null)
             {
-                lastContent.FadeOut(100, Easing.OutQuint).Expire();
+                var transform = lastContent.FadeOut(100, Easing.OutQuint);
 
-                // Consider the case when the new content is smaller than the last content.
-                // If the auto-size computation is delayed until fade out completes, the background remain high for too long making the resulting transition to the smaller height look weird.
-                // At the same time, if the last content's height is bypassed immediately, there is a period where the new content is at Alpha = 0 when the auto-sized height will be 0.
-                // To resolve both of these issues, the bypass is delayed until a point when the content transitions (fade-in and fade-out) overlap and it looks good to do so.
-                lastContent.Delay(25).Schedule(() => lastContent.BypassAutoSizeAxes = Axes.Y).Then().Schedule(() => panelTarget.Remove(lastContent));
+                if (lastContent == notFoundContent)
+                {
+                    // not found display may be used multiple times, so don't expire/dispose it.
+                    transform.Schedule(() => panelTarget.Remove(lastContent));
+                }
+                else
+                {
+                    // Consider the case when the new content is smaller than the last content.
+                    // If the auto-size computation is delayed until fade out completes, the background remain high for too long making the resulting transition to the smaller height look weird.
+                    // At the same time, if the last content's height is bypassed immediately, there is a period where the new content is at Alpha = 0 when the auto-sized height will be 0.
+                    // To resolve both of these issues, the bypass is delayed until a point when the content transitions (fade-in and fade-out) overlap and it looks good to do so.
+                    lastContent.Delay(25).Schedule(() => lastContent.BypassAutoSizeAxes = Axes.Y).Then().Schedule(() => lastContent.Expire());
+                }
             }
 
             if (!content.IsAlive)
                 panelTarget.Add(content);
-            content.FadeInFromZero(200, Easing.OutQuint);
 
+            content.FadeInFromZero(200, Easing.OutQuint);
             currentContent = content;
         }
 

From 60ae87ec383645e61194bf51f19e94d55a342023 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Jan 2021 16:25:49 +0900
Subject: [PATCH 1103/3722] Add MessagePack package

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

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 2b8f81532d..3e971d9d4f 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -22,6 +22,7 @@
     <PackageReference Include="DiffPlex" Version="1.6.3" />
     <PackageReference Include="Humanizer" Version="2.8.26" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.10" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.11" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.10" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />

From e4fc6041635c4aebfbb791c6e671324ad9156abf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Jan 2021 16:26:03 +0900
Subject: [PATCH 1104/3722] Setup all multiplayer model classes for MessagePack
 support

---
 osu.Game/Online/API/APIMod.cs                          |  7 ++++++-
 osu.Game/Online/Multiplayer/MultiplayerRoom.cs         | 10 +++++++++-
 osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs |  7 +++++++
 osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs     |  8 +++++++-
 osu.Game/Online/Rooms/BeatmapAvailability.cs           |  6 +++++-
 5 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/API/APIMod.cs b/osu.Game/Online/API/APIMod.cs
index c8b76b9685..69ce3825ee 100644
--- a/osu.Game/Online/API/APIMod.cs
+++ b/osu.Game/Online/API/APIMod.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Humanizer;
+using MessagePack;
 using Newtonsoft.Json;
 using osu.Framework.Bindables;
 using osu.Game.Configuration;
@@ -13,16 +14,20 @@ using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Online.API
 {
+    [MessagePackObject]
     public class APIMod : IMod
     {
         [JsonProperty("acronym")]
+        [Key(0)]
         public string Acronym { get; set; }
 
         [JsonProperty("settings")]
+        [Key(1)]
         public Dictionary<string, object> Settings { get; set; } = new Dictionary<string, object>();
 
         [JsonConstructor]
-        private APIMod()
+        [SerializationConstructor]
+        public APIMod()
         {
         }
 
diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoom.cs b/osu.Game/Online/Multiplayer/MultiplayerRoom.cs
index 12fcf25ace..c5fa6253ed 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoom.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoom.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Collections.Generic;
+using MessagePack;
 using Newtonsoft.Json;
 
 namespace osu.Game.Online.Multiplayer
@@ -13,35 +14,42 @@ namespace osu.Game.Online.Multiplayer
     /// A multiplayer room.
     /// </summary>
     [Serializable]
+    [MessagePackObject]
     public class MultiplayerRoom
     {
         /// <summary>
         /// The ID of the room, used for database persistence.
         /// </summary>
+        [Key(0)]
         public readonly long RoomID;
 
         /// <summary>
         /// The current state of the room (ie. whether it is in progress or otherwise).
         /// </summary>
+        [Key(1)]
         public MultiplayerRoomState State { get; set; }
 
         /// <summary>
         /// All currently enforced game settings for this room.
         /// </summary>
+        [Key(2)]
         public MultiplayerRoomSettings Settings { get; set; } = new MultiplayerRoomSettings();
 
         /// <summary>
         /// All users currently in this room.
         /// </summary>
+        [Key(3)]
         public List<MultiplayerRoomUser> Users { get; set; } = new List<MultiplayerRoomUser>();
 
         /// <summary>
         /// The host of this room, in control of changing room settings.
         /// </summary>
+        [Key(4)]
         public MultiplayerRoomUser? Host { get; set; }
 
         [JsonConstructor]
-        public MultiplayerRoom(in long roomId)
+        [SerializationConstructor]
+        public MultiplayerRoom(long roomId)
         {
             RoomID = roomId;
         }
diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
index 857b38ea60..0ead5db84c 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
@@ -7,22 +7,29 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
+using MessagePack;
 using osu.Game.Online.API;
 
 namespace osu.Game.Online.Multiplayer
 {
     [Serializable]
+    [MessagePackObject]
     public class MultiplayerRoomSettings : IEquatable<MultiplayerRoomSettings>
     {
+        [Key(0)]
         public int BeatmapID { get; set; }
 
+        [Key(1)]
         public int RulesetID { get; set; }
 
+        [Key(2)]
         public string BeatmapChecksum { get; set; } = string.Empty;
 
+        [Key(3)]
         public string Name { get; set; } = "Unnamed room";
 
         [NotNull]
+        [Key(4)]
         public IEnumerable<APIMod> Mods { get; set; } = Enumerable.Empty<APIMod>();
 
         public bool Equals(MultiplayerRoomSettings other)
diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
index 2590acbc81..b300be9f60 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
@@ -4,6 +4,7 @@
 #nullable enable
 
 using System;
+using MessagePack;
 using Newtonsoft.Json;
 using osu.Game.Online.Rooms;
 using osu.Game.Users;
@@ -11,21 +12,26 @@ using osu.Game.Users;
 namespace osu.Game.Online.Multiplayer
 {
     [Serializable]
+    [MessagePackObject]
     public class MultiplayerRoomUser : IEquatable<MultiplayerRoomUser>
     {
+        [Key(0)]
         public readonly int UserID;
 
+        [Key(1)]
         public MultiplayerUserState State { get; set; } = MultiplayerUserState.Idle;
 
         /// <summary>
         /// The availability state of the current beatmap.
         /// </summary>
+        [Key(2)]
         public BeatmapAvailability BeatmapAvailability { get; set; } = BeatmapAvailability.LocallyAvailable();
 
+        [IgnoreMember]
         public User? User { get; set; }
 
         [JsonConstructor]
-        public MultiplayerRoomUser(in int userId)
+        public MultiplayerRoomUser(int userId)
         {
             UserID = userId;
         }
diff --git a/osu.Game/Online/Rooms/BeatmapAvailability.cs b/osu.Game/Online/Rooms/BeatmapAvailability.cs
index e7dbc5f436..38bd236718 100644
--- a/osu.Game/Online/Rooms/BeatmapAvailability.cs
+++ b/osu.Game/Online/Rooms/BeatmapAvailability.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using MessagePack;
 using Newtonsoft.Json;
 
 namespace osu.Game.Online.Rooms
@@ -9,20 +10,23 @@ namespace osu.Game.Online.Rooms
     /// <summary>
     /// The local availability information about a certain beatmap for the client.
     /// </summary>
+    [MessagePackObject]
     public class BeatmapAvailability : IEquatable<BeatmapAvailability>
     {
         /// <summary>
         /// The beatmap's availability state.
         /// </summary>
+        [Key(0)]
         public readonly DownloadState State;
 
         /// <summary>
         /// The beatmap's downloading progress, null when not in <see cref="DownloadState.Downloading"/> state.
         /// </summary>
+        [Key(1)]
         public readonly double? DownloadProgress;
 
         [JsonConstructor]
-        private BeatmapAvailability(DownloadState state, double? downloadProgress = null)
+        public BeatmapAvailability(DownloadState state, double? downloadProgress = null)
         {
             State = state;
             DownloadProgress = downloadProgress;

From 9537090d28bb29994e5a2902c4091e69bc15856b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Jan 2021 16:39:35 +0900
Subject: [PATCH 1105/3722] Setup all spectator model classes for MessagePack

---
 osu.Game/Online/Spectator/FrameDataBundle.cs |  4 ++++
 osu.Game/Online/Spectator/FrameHeader.cs     | 10 +++++++++-
 osu.Game/Online/Spectator/SpectatorState.cs  |  5 +++++
 osu.Game/Replays/Legacy/LegacyReplayFrame.cs | 13 +++++++++++++
 osu.Game/Rulesets/Replays/ReplayFrame.cs     |  4 ++++
 5 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/Spectator/FrameDataBundle.cs b/osu.Game/Online/Spectator/FrameDataBundle.cs
index a8d0434324..0e59cdf4ce 100644
--- a/osu.Game/Online/Spectator/FrameDataBundle.cs
+++ b/osu.Game/Online/Spectator/FrameDataBundle.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Collections.Generic;
+using MessagePack;
 using Newtonsoft.Json;
 using osu.Game.Replays.Legacy;
 using osu.Game.Scoring;
@@ -12,10 +13,13 @@ using osu.Game.Scoring;
 namespace osu.Game.Online.Spectator
 {
     [Serializable]
+    [MessagePackObject]
     public class FrameDataBundle
     {
+        [Key(0)]
         public FrameHeader Header { get; set; }
 
+        [Key(1)]
         public IEnumerable<LegacyReplayFrame> Frames { get; set; }
 
         public FrameDataBundle(ScoreInfo score, IEnumerable<LegacyReplayFrame> frames)
diff --git a/osu.Game/Online/Spectator/FrameHeader.cs b/osu.Game/Online/Spectator/FrameHeader.cs
index 135b356eda..adfcbcd95a 100644
--- a/osu.Game/Online/Spectator/FrameHeader.cs
+++ b/osu.Game/Online/Spectator/FrameHeader.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Collections.Generic;
+using MessagePack;
 using Newtonsoft.Json;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
@@ -12,31 +13,37 @@ using osu.Game.Scoring;
 namespace osu.Game.Online.Spectator
 {
     [Serializable]
+    [MessagePackObject]
     public class FrameHeader
     {
         /// <summary>
         /// The current accuracy of the score.
         /// </summary>
+        [Key(0)]
         public double Accuracy { get; set; }
 
         /// <summary>
         /// The current combo of the score.
         /// </summary>
+        [Key(1)]
         public int Combo { get; set; }
 
         /// <summary>
         /// The maximum combo achieved up to the current point in time.
         /// </summary>
+        [Key(2)]
         public int MaxCombo { get; set; }
 
         /// <summary>
         /// Cumulative hit statistics.
         /// </summary>
+        [Key(3)]
         public Dictionary<HitResult, int> Statistics { get; set; }
 
         /// <summary>
         /// The time at which this frame was received by the server.
         /// </summary>
+        [Key(4)]
         public DateTimeOffset ReceivedTime { get; set; }
 
         /// <summary>
@@ -54,7 +61,8 @@ namespace osu.Game.Online.Spectator
         }
 
         [JsonConstructor]
-        public FrameHeader(int combo, int maxCombo, double accuracy, Dictionary<HitResult, int> statistics, DateTimeOffset receivedTime)
+        [SerializationConstructor]
+        public FrameHeader(double accuracy, int combo, int maxCombo, Dictionary<HitResult, int> statistics, DateTimeOffset receivedTime)
         {
             Combo = combo;
             MaxCombo = maxCombo;
diff --git a/osu.Game/Online/Spectator/SpectatorState.cs b/osu.Game/Online/Spectator/SpectatorState.cs
index 101ce3d5d5..96a875bc14 100644
--- a/osu.Game/Online/Spectator/SpectatorState.cs
+++ b/osu.Game/Online/Spectator/SpectatorState.cs
@@ -5,18 +5,23 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using MessagePack;
 using osu.Game.Online.API;
 
 namespace osu.Game.Online.Spectator
 {
     [Serializable]
+    [MessagePackObject]
     public class SpectatorState : IEquatable<SpectatorState>
     {
+        [Key(0)]
         public int? BeatmapID { get; set; }
 
+        [Key(1)]
         public int? RulesetID { get; set; }
 
         [NotNull]
+        [Key(2)]
         public IEnumerable<APIMod> Mods { get; set; } = Enumerable.Empty<APIMod>();
 
         public bool Equals(SpectatorState other) => BeatmapID == other?.BeatmapID && Mods.SequenceEqual(other?.Mods) && RulesetID == other?.RulesetID;
diff --git a/osu.Game/Replays/Legacy/LegacyReplayFrame.cs b/osu.Game/Replays/Legacy/LegacyReplayFrame.cs
index 74bacae9e1..ab9ccda9b9 100644
--- a/osu.Game/Replays/Legacy/LegacyReplayFrame.cs
+++ b/osu.Game/Replays/Legacy/LegacyReplayFrame.cs
@@ -1,38 +1,51 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using MessagePack;
 using Newtonsoft.Json;
 using osu.Game.Rulesets.Replays;
 using osuTK;
 
 namespace osu.Game.Replays.Legacy
 {
+    [MessagePackObject]
     public class LegacyReplayFrame : ReplayFrame
     {
         [JsonIgnore]
+        [IgnoreMember]
         public Vector2 Position => new Vector2(MouseX ?? 0, MouseY ?? 0);
 
+        [Key(1)]
         public float? MouseX;
+
+        [Key(2)]
         public float? MouseY;
 
         [JsonIgnore]
+        [IgnoreMember]
         public bool MouseLeft => MouseLeft1 || MouseLeft2;
 
         [JsonIgnore]
+        [IgnoreMember]
         public bool MouseRight => MouseRight1 || MouseRight2;
 
         [JsonIgnore]
+        [IgnoreMember]
         public bool MouseLeft1 => ButtonState.HasFlag(ReplayButtonState.Left1);
 
         [JsonIgnore]
+        [IgnoreMember]
         public bool MouseRight1 => ButtonState.HasFlag(ReplayButtonState.Right1);
 
         [JsonIgnore]
+        [IgnoreMember]
         public bool MouseLeft2 => ButtonState.HasFlag(ReplayButtonState.Left2);
 
         [JsonIgnore]
+        [IgnoreMember]
         public bool MouseRight2 => ButtonState.HasFlag(ReplayButtonState.Right2);
 
+        [Key(3)]
         public ReplayButtonState ButtonState;
 
         public LegacyReplayFrame(double time, float? mouseX, float? mouseY, ReplayButtonState buttonState)
diff --git a/osu.Game/Rulesets/Replays/ReplayFrame.cs b/osu.Game/Rulesets/Replays/ReplayFrame.cs
index 85e068ae79..7de53211a2 100644
--- a/osu.Game/Rulesets/Replays/ReplayFrame.cs
+++ b/osu.Game/Rulesets/Replays/ReplayFrame.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 MessagePack;
+
 namespace osu.Game.Rulesets.Replays
 {
+    [MessagePackObject]
     public class ReplayFrame
     {
+        [Key(0)]
         public double Time;
 
         public ReplayFrame()

From 20cfa991bffbe1cb4255b6cc45cda39b16cc28f9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Jan 2021 17:41:21 +0900
Subject: [PATCH 1106/3722] Switch clients to MessagePack mode

---
 osu.Game/Online/Multiplayer/MultiplayerClient.cs      | 2 +-
 osu.Game/Online/Spectator/SpectatorStreamingClient.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 50dc8f661c..3221456e75 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Online.Multiplayer
                          {
                              options.Headers.Add("Authorization", $"Bearer {api.AccessToken}");
                          })
-                         .AddNewtonsoftJsonProtocol(options => { options.PayloadSerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; })
+                         .AddMessagePackProtocol()
                          .Build();
 
             // this is kind of SILLY
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 344b73f3d9..cc866b7ad9 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -121,7 +121,7 @@ namespace osu.Game.Online.Spectator
                          {
                              options.Headers.Add("Authorization", $"Bearer {api.AccessToken}");
                          })
-                         .AddNewtonsoftJsonProtocol(options => { options.PayloadSerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; })
+                         .AddMessagePackProtocol()
                          .Build();
 
             // until strong typed client support is added, each method must be manually bound (see https://github.com/dotnet/aspnetcore/issues/15198)

From 15885c17af58234c63ea154178f2156854e95bd5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Jan 2021 18:07:43 +0900
Subject: [PATCH 1107/3722] Remove unused usings

---
 osu.Game/Online/Multiplayer/MultiplayerClient.cs      | 1 -
 osu.Game/Online/Spectator/SpectatorStreamingClient.cs | 1 -
 2 files changed, 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 3221456e75..0d779232d0 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -9,7 +9,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.SignalR.Client;
 using Microsoft.Extensions.DependencyInjection;
-using Newtonsoft.Json;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Logging;
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index cc866b7ad9..dac2131035 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -9,7 +9,6 @@ using System.Threading.Tasks;
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.SignalR.Client;
 using Microsoft.Extensions.DependencyInjection;
-using Newtonsoft.Json;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;

From b573c96c079f9065ee4690131f4677eeeb2998be Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Jan 2021 18:59:42 +0900
Subject: [PATCH 1108/3722] Move disconnect logic inside connection loop to
 ensure previous connection is disposed

---
 osu.Game/Online/Multiplayer/MultiplayerClient.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 391658f0d0..cbb91c0832 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -71,14 +71,15 @@ namespace osu.Game.Online.Multiplayer
 
             try
             {
-                await disconnect(false);
-
                 // this token will be valid for the scope of this connection.
                 // if cancelled, we can be sure that a disconnect or reconnect is handled elsewhere.
                 var cancellationToken = connectCancelSource.Token;
 
                 while (api.State.Value == APIState.Online)
                 {
+                    // ensure any previous connection was disposed.
+                    await disconnect(false);
+
                     cancellationToken.ThrowIfCancellationRequested();
 
                     Logger.Log("Multiplayer client connecting...", LoggingTarget.Network);

From a5f3418e561efcf05800d4d2d61f9182091467a9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Jan 2021 19:11:19 +0900
Subject: [PATCH 1109/3722] Avoid tooltip display

---
 .../Components/TournamentModDisplay.cs           |  2 +-
 osu.Game/Overlays/Mods/ModButton.cs              | 16 +++-------------
 osu.Game/Rulesets/UI/ModIcon.cs                  | 14 ++++++++++++--
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tournament/Components/TournamentModDisplay.cs b/osu.Game.Tournament/Components/TournamentModDisplay.cs
index 3df8550667..fa9ee7edff 100644
--- a/osu.Game.Tournament/Components/TournamentModDisplay.cs
+++ b/osu.Game.Tournament/Components/TournamentModDisplay.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Tournament.Components
                 if (modIcon == null)
                     return;
 
-                AddInternal(new ModIcon(modIcon)
+                AddInternal(new ModIcon(modIcon, false)
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index ab8efdabcc..8e0d1f5bbd 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -236,13 +236,13 @@ namespace osu.Game.Overlays.Mods
             {
                 iconsContainer.AddRange(new[]
                 {
-                    backgroundIcon = new PassThroughTooltipModIcon(Mods[1])
+                    backgroundIcon = new ModIcon(Mods[1], false)
                     {
                         Origin = Anchor.BottomRight,
                         Anchor = Anchor.BottomRight,
                         Position = new Vector2(1.5f),
                     },
-                    foregroundIcon = new PassThroughTooltipModIcon(Mods[0])
+                    foregroundIcon = new ModIcon(Mods[0], false)
                     {
                         Origin = Anchor.BottomRight,
                         Anchor = Anchor.BottomRight,
@@ -252,7 +252,7 @@ namespace osu.Game.Overlays.Mods
             }
             else
             {
-                iconsContainer.Add(foregroundIcon = new PassThroughTooltipModIcon(Mod)
+                iconsContainer.Add(foregroundIcon = new ModIcon(Mod, false)
                 {
                     Origin = Anchor.Centre,
                     Anchor = Anchor.Centre,
@@ -297,15 +297,5 @@ namespace osu.Game.Overlays.Mods
 
             Mod = mod;
         }
-
-        private class PassThroughTooltipModIcon : ModIcon
-        {
-            public override string TooltipText => null;
-
-            public PassThroughTooltipModIcon(Mod mod)
-                : base(mod)
-            {
-            }
-        }
     }
 }
diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index 8ea6c74349..04a2e052fa 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -16,6 +16,9 @@ using osu.Framework.Bindables;
 
 namespace osu.Game.Rulesets.UI
 {
+    /// <summary>
+    /// Display the specified mod at a fixed size.
+    /// </summary>
     public class ModIcon : Container, IHasTooltip
     {
         public readonly BindableBool Selected = new BindableBool();
@@ -28,9 +31,10 @@ namespace osu.Game.Rulesets.UI
 
         private readonly ModType type;
 
-        public virtual string TooltipText => mod.IconTooltip;
+        public virtual string TooltipText => showTooltip ? mod.IconTooltip : null;
 
         private Mod mod;
+        private readonly bool showTooltip;
 
         public Mod Mod
         {
@@ -42,9 +46,15 @@ namespace osu.Game.Rulesets.UI
             }
         }
 
-        public ModIcon(Mod mod)
+        /// <summary>
+        /// Construct a new instance.
+        /// </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(Mod mod, bool showTooltip = true)
         {
             this.mod = mod ?? throw new ArgumentNullException(nameof(mod));
+            this.showTooltip = showTooltip;
 
             type = mod.Type;
 

From 64a3c712aa8be74bb2d32fddeb55fc364a3cb0fb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Jan 2021 19:15:19 +0900
Subject: [PATCH 1110/3722] Rename class and add xmldoc

---
 osu.Game.Tournament/Components/TournamentBeatmapPanel.cs | 2 +-
 .../{TournamentModDisplay.cs => TournamentModIcon.cs}    | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)
 rename osu.Game.Tournament/Components/{TournamentModDisplay.cs => TournamentModIcon.cs} (86%)

diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index 8cc4566c08..d1197b1a61 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -123,7 +123,7 @@ namespace osu.Game.Tournament.Components
 
             if (!string.IsNullOrEmpty(mod))
             {
-                AddInternal(new TournamentModDisplay(mod)
+                AddInternal(new TournamentModIcon(mod)
                 {
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreRight,
diff --git a/osu.Game.Tournament/Components/TournamentModDisplay.cs b/osu.Game.Tournament/Components/TournamentModIcon.cs
similarity index 86%
rename from osu.Game.Tournament/Components/TournamentModDisplay.cs
rename to osu.Game.Tournament/Components/TournamentModIcon.cs
index fa9ee7edff..b53ecc02f8 100644
--- a/osu.Game.Tournament/Components/TournamentModDisplay.cs
+++ b/osu.Game.Tournament/Components/TournamentModIcon.cs
@@ -14,16 +14,19 @@ using osuTK;
 
 namespace osu.Game.Tournament.Components
 {
-    public class TournamentModDisplay : CompositeDrawable
+    /// <summary>
+    /// Mod icon displayed in tournament usages, allowing user overridden graphics.
+    /// </summary>
+    public class TournamentModIcon : CompositeDrawable
     {
         private readonly string modAcronym;
 
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
-        public TournamentModDisplay(string mod)
+        public TournamentModIcon(string modAcronym)
         {
-            modAcronym = mod;
+            this.modAcronym = modAcronym;
         }
 
         [BackgroundDependencyLoader]

From 81ab82fafe13df7aa513c5d64f3bb205feac6102 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Jan 2021 19:16:38 +0900
Subject: [PATCH 1111/3722] Tidy up nesting

---
 .../Components/TournamentModIcon.cs           | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tournament/Components/TournamentModIcon.cs b/osu.Game.Tournament/Components/TournamentModIcon.cs
index b53ecc02f8..43ac92d285 100644
--- a/osu.Game.Tournament/Components/TournamentModIcon.cs
+++ b/osu.Game.Tournament/Components/TournamentModIcon.cs
@@ -32,9 +32,9 @@ namespace osu.Game.Tournament.Components
         [BackgroundDependencyLoader]
         private void load(TextureStore textures, LadderInfo ladderInfo)
         {
-            var texture = textures.Get($"mods/{modAcronym}");
+            var customTexture = textures.Get($"mods/{modAcronym}");
 
-            if (texture != null)
+            if (customTexture != null)
             {
                 AddInternal(new Sprite
                 {
@@ -42,24 +42,24 @@ namespace osu.Game.Tournament.Components
                     RelativeSizeAxes = Axes.Both,
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreRight,
-                    Texture = texture
+                    Texture = customTexture
                 });
+
+                return;
             }
-            else
+
+            var ruleset = rulesets.GetRuleset(ladderInfo.Ruleset.Value?.ID ?? 0);
+            var modIcon = ruleset?.CreateInstance().GetAllMods().FirstOrDefault(mod => mod.Acronym == modAcronym);
+
+            if (modIcon == null)
+                return;
+
+            AddInternal(new ModIcon(modIcon, false)
             {
-                var ruleset = rulesets.GetRuleset(ladderInfo.Ruleset.Value?.ID ?? 0);
-                var modIcon = ruleset?.CreateInstance().GetAllMods().FirstOrDefault(mod => mod.Acronym == modAcronym);
-
-                if (modIcon == null)
-                    return;
-
-                AddInternal(new ModIcon(modIcon, false)
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Scale = new Vector2(0.5f)
-                });
-            }
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Scale = new Vector2(0.5f)
+            });
         }
     }
 }

From 8c3b0a316737eb359c4d00e03001ab7167ed0633 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 26 Jan 2021 22:47:37 +0900
Subject: [PATCH 1112/3722] Fix TaskChain performing the action in-line, add
 test

---
 osu.Game.Tests/NonVisual/TaskChainTest.cs | 83 +++++++++++++++++++++++
 osu.Game/Utils/TaskChain.cs               | 28 ++++++--
 2 files changed, 106 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game.Tests/NonVisual/TaskChainTest.cs

diff --git a/osu.Game.Tests/NonVisual/TaskChainTest.cs b/osu.Game.Tests/NonVisual/TaskChainTest.cs
new file mode 100644
index 0000000000..d561fb4c1b
--- /dev/null
+++ b/osu.Game.Tests/NonVisual/TaskChainTest.cs
@@ -0,0 +1,83 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Threading;
+using System.Threading.Tasks;
+using NUnit.Framework;
+using osu.Game.Utils;
+
+namespace osu.Game.Tests.NonVisual
+{
+    [TestFixture]
+    public class TaskChainTest
+    {
+        private TaskChain taskChain;
+        private int currentTask;
+
+        [SetUp]
+        public void Setup()
+        {
+            taskChain = new TaskChain();
+            currentTask = 0;
+        }
+
+        [Test]
+        public async Task TestChainedTasksRunSequentially()
+        {
+            var task1 = addTask();
+            var task2 = addTask();
+            var task3 = addTask();
+
+            task3.mutex.Set();
+            task2.mutex.Set();
+            task1.mutex.Set();
+
+            await Task.WhenAll(task1.task, task2.task, task3.task);
+
+            Assert.That(task1.task.Result, Is.EqualTo(1));
+            Assert.That(task2.task.Result, Is.EqualTo(2));
+            Assert.That(task3.task.Result, Is.EqualTo(3));
+        }
+
+        [Test]
+        public async Task TestChainedTaskWithIntermediateCancelRunsInSequence()
+        {
+            var task1 = addTask();
+            var task2 = addTask();
+            var task3 = addTask();
+
+            // Cancel task2, allow task3 to complete.
+            task2.cancellation.Cancel();
+            task2.mutex.Set();
+            task3.mutex.Set();
+
+            // Allow task3 to potentially complete.
+            Thread.Sleep(1000);
+
+            // Allow task1 to complete.
+            task1.mutex.Set();
+
+            // Wait on both tasks.
+            await Task.WhenAll(task1.task, task3.task);
+
+            Assert.That(task1.task.Result, Is.EqualTo(1));
+            Assert.That(task2.task.IsCompleted, Is.False);
+            Assert.That(task3.task.Result, Is.EqualTo(2));
+        }
+
+        private (Task<int> task, ManualResetEventSlim mutex, CancellationTokenSource cancellation) addTask()
+        {
+            var mutex = new ManualResetEventSlim(false);
+            var cancellationSource = new CancellationTokenSource();
+            var completionSource = new TaskCompletionSource<int>();
+
+            taskChain.Add(() =>
+            {
+                mutex.Wait(CancellationToken.None);
+                completionSource.SetResult(Interlocked.Increment(ref currentTask));
+            }, cancellationSource.Token);
+
+            return (completionSource.Task, mutex, cancellationSource);
+        }
+    }
+}
diff --git a/osu.Game/Utils/TaskChain.cs b/osu.Game/Utils/TaskChain.cs
index 64d523bd3d..2bc2c00e28 100644
--- a/osu.Game/Utils/TaskChain.cs
+++ b/osu.Game/Utils/TaskChain.cs
@@ -4,6 +4,7 @@
 #nullable enable
 
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace osu.Game.Utils
@@ -19,15 +20,32 @@ namespace osu.Game.Utils
         /// <summary>
         /// Adds a new task to the end of this <see cref="TaskChain"/>.
         /// </summary>
-        /// <param name="taskFunc">The task creation function.</param>
+        /// <param name="action">The action to be executed.</param>
+        /// <param name="cancellationToken">The <see cref="CancellationToken"/> for this task. Does not affect further tasks in the chain.</param>
         /// <returns>The awaitable <see cref="Task"/>.</returns>
-        public Task Add(Func<Task> taskFunc)
+        public Task Add(Action action, CancellationToken cancellationToken = default)
         {
             lock (currentTaskLock)
             {
-                currentTask = currentTask == null
-                    ? taskFunc()
-                    : currentTask.ContinueWith(_ => taskFunc()).Unwrap();
+                // Note: Attaching the cancellation token to the continuation could lead to re-ordering of tasks in the chain.
+                // Therefore, the cancellation token is not used to cancel the continuation but only the run of each task.
+                if (currentTask == null)
+                {
+                    currentTask = Task.Run(() =>
+                    {
+                        cancellationToken.ThrowIfCancellationRequested();
+                        action();
+                    }, CancellationToken.None);
+                }
+                else
+                {
+                    currentTask = currentTask.ContinueWith(_ =>
+                    {
+                        cancellationToken.ThrowIfCancellationRequested();
+                        action();
+                    }, CancellationToken.None);
+                }
+
                 return currentTask;
             }
         }

From 085115cba538483ed2bbbfdac848a70a6ffdabb8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 26 Jan 2021 22:49:01 +0900
Subject: [PATCH 1113/3722] Make threading even more thread safe

---
 osu.Game/Extensions/TaskExtensions.cs         |  4 +-
 .../Multiplayer/StatefulMultiplayerClient.cs  | 82 ++++++++++++-------
 2 files changed, 55 insertions(+), 31 deletions(-)

diff --git a/osu.Game/Extensions/TaskExtensions.cs b/osu.Game/Extensions/TaskExtensions.cs
index 4138c2757a..24f0188cf0 100644
--- a/osu.Game/Extensions/TaskExtensions.cs
+++ b/osu.Game/Extensions/TaskExtensions.cs
@@ -21,9 +21,9 @@ namespace osu.Game.Extensions
         /// Whether errors should be logged as errors visible to users, or as debug messages.
         /// Logging as debug will essentially silence the errors on non-release builds.
         /// </param>
-        public static void CatchUnobservedExceptions(this Task task, bool logAsError = false)
+        public static Task CatchUnobservedExceptions(this Task task, bool logAsError = false)
         {
-            task.ContinueWith(t =>
+            return task.ContinueWith(t =>
             {
                 Exception? exception = t.Exception?.AsSingular();
                 if (logAsError)
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 0e736ed7c6..3d8ab4b4c7 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -110,37 +110,49 @@ namespace osu.Game.Online.Multiplayer
         }
 
         private readonly TaskChain joinOrLeaveTaskChain = new TaskChain();
+        private CancellationTokenSource? joinCancellationSource;
 
         /// <summary>
         /// Joins the <see cref="MultiplayerRoom"/> for a given API <see cref="Room"/>.
         /// </summary>
         /// <param name="room">The API <see cref="Room"/>.</param>
-        public async Task JoinRoom(Room room) => await joinOrLeaveTaskChain.Add(async () =>
+        public async Task JoinRoom(Room room)
         {
-            if (Room != null)
-                throw new InvalidOperationException("Cannot join a multiplayer room while already in one.");
+            var cancellationSource = new CancellationTokenSource();
 
-            Debug.Assert(room.RoomID.Value != null);
-
-            // Join the server-side room.
-            var joinedRoom = await JoinRoom(room.RoomID.Value.Value);
-            Debug.Assert(joinedRoom != null);
-
-            // Populate users.
-            Debug.Assert(joinedRoom.Users != null);
-            await Task.WhenAll(joinedRoom.Users.Select(PopulateUser));
-
-            // Update the stored room (must be done on update thread for thread-safety).
             await scheduleAsync(() =>
             {
-                Room = joinedRoom;
-                apiRoom = room;
-                playlistItemId = room.Playlist.SingleOrDefault()?.ID ?? 0;
-            });
+                joinCancellationSource?.Cancel();
+                joinCancellationSource = cancellationSource;
+            }, CancellationToken.None);
 
-            // Update room settings.
-            await updateLocalRoomSettings(joinedRoom.Settings);
-        });
+            await joinOrLeaveTaskChain.Add(async () =>
+            {
+                if (Room != null)
+                    throw new InvalidOperationException("Cannot join a multiplayer room while already in one.");
+
+                Debug.Assert(room.RoomID.Value != null);
+
+                // Join the server-side room.
+                var joinedRoom = await JoinRoom(room.RoomID.Value.Value);
+                Debug.Assert(joinedRoom != null);
+
+                // Populate users.
+                Debug.Assert(joinedRoom.Users != null);
+                await Task.WhenAll(joinedRoom.Users.Select(PopulateUser));
+
+                // Update the stored room (must be done on update thread for thread-safety).
+                await scheduleAsync(() =>
+                {
+                    Room = joinedRoom;
+                    apiRoom = room;
+                    playlistItemId = room.Playlist.SingleOrDefault()?.ID ?? 0;
+                }, cancellationSource.Token);
+
+                // Update room settings.
+                await updateLocalRoomSettings(joinedRoom.Settings, cancellationSource.Token);
+            }, cancellationSource.Token);
+        }
 
         /// <summary>
         /// Joins the <see cref="MultiplayerRoom"/> with a given ID.
@@ -151,14 +163,15 @@ namespace osu.Game.Online.Multiplayer
 
         public Task LeaveRoom()
         {
-            if (Room == null)
-                return Task.FromCanceled(new CancellationToken(true));
-
             // Leaving rooms is expected to occur instantaneously whilst the operation is finalised in the background.
             // However a few members need to be reset immediately to prevent other components from entering invalid states whilst the operation hasn't yet completed.
             // For example, if a room was left and the user immediately pressed the "create room" button, then the user could be taken into the lobby if the value of Room is not reset in time.
             var scheduledReset = scheduleAsync(() =>
             {
+                // The join may have not completed yet, so certain tasks that either update the room or reference the room should be cancelled.
+                // This includes the setting of Room itself along with the initial update of the room settings on join.
+                joinCancellationSource?.Cancel();
+
                 apiRoom = null;
                 Room = null;
                 CurrentMatchPlayingUserIds.Clear();
@@ -169,7 +182,7 @@ namespace osu.Game.Online.Multiplayer
             return joinOrLeaveTaskChain.Add(async () =>
             {
                 await scheduledReset;
-                await LeaveRoomInternal();
+                await LeaveRoomInternal().CatchUnobservedExceptions();
             });
         }
 
@@ -455,7 +468,8 @@ namespace osu.Game.Online.Multiplayer
         /// This updates both the joined <see cref="MultiplayerRoom"/> and the respective API <see cref="Room"/>.
         /// </remarks>
         /// <param name="settings">The new <see cref="MultiplayerRoomSettings"/> to update from.</param>
-        private Task updateLocalRoomSettings(MultiplayerRoomSettings settings) => scheduleAsync(() =>
+        /// <param name="cancellationToken">The <see cref="CancellationToken"/> to cancel the update.</param>
+        private Task updateLocalRoomSettings(MultiplayerRoomSettings settings, CancellationToken cancellationToken = default) => scheduleAsync(() =>
         {
             if (Room == null)
                 return;
@@ -473,10 +487,17 @@ namespace osu.Game.Online.Multiplayer
             RoomUpdated?.Invoke();
 
             var req = new GetBeatmapSetRequest(settings.BeatmapID, BeatmapSetLookupType.BeatmapId);
-            req.Success += res => updatePlaylist(settings, res);
+
+            req.Success += res =>
+            {
+                if (cancellationToken.IsCancellationRequested)
+                    return;
+
+                updatePlaylist(settings, res);
+            };
 
             api.Queue(req);
-        });
+        }, cancellationToken);
 
         private void updatePlaylist(MultiplayerRoomSettings settings, APIBeatmapSet onlineSet)
         {
@@ -524,12 +545,15 @@ namespace osu.Game.Online.Multiplayer
                 CurrentMatchPlayingUserIds.Remove(userId);
         }
 
-        private Task scheduleAsync(Action action)
+        private Task scheduleAsync(Action action, CancellationToken cancellationToken = default)
         {
             var tcs = new TaskCompletionSource<bool>();
 
             Scheduler.Add(() =>
             {
+                if (cancellationToken.IsCancellationRequested)
+                    return;
+
                 try
                 {
                     action();

From 248989b3ebe9de5a1b24341774670be6533825d3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 27 Jan 2021 01:20:50 +0900
Subject: [PATCH 1114/3722] wip

---
 osu.Game.Tests/NonVisual/TaskChainTest.cs     | 38 ++++++++++++++++--
 .../Multiplayer/StatefulMultiplayerClient.cs  |  2 +-
 osu.Game/Utils/TaskChain.cs                   | 39 +++++++------------
 3 files changed, 51 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/TaskChainTest.cs b/osu.Game.Tests/NonVisual/TaskChainTest.cs
index d561fb4c1b..0a56468818 100644
--- a/osu.Game.Tests/NonVisual/TaskChainTest.cs
+++ b/osu.Game.Tests/NonVisual/TaskChainTest.cs
@@ -4,6 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using NUnit.Framework;
+using osu.Game.Extensions;
 using osu.Game.Utils;
 
 namespace osu.Game.Tests.NonVisual
@@ -13,14 +14,22 @@ namespace osu.Game.Tests.NonVisual
     {
         private TaskChain taskChain;
         private int currentTask;
+        private CancellationTokenSource globalCancellationToken;
 
         [SetUp]
         public void Setup()
         {
+            globalCancellationToken = new CancellationTokenSource();
             taskChain = new TaskChain();
             currentTask = 0;
         }
 
+        [TearDown]
+        public void TearDown()
+        {
+            globalCancellationToken?.Cancel();
+        }
+
         [Test]
         public async Task TestChainedTasksRunSequentially()
         {
@@ -65,17 +74,40 @@ namespace osu.Game.Tests.NonVisual
             Assert.That(task3.task.Result, Is.EqualTo(2));
         }
 
+        [Test]
+        public async Task TestChainedTaskDoesNotCompleteBeforeChildTasks()
+        {
+            var mutex = new ManualResetEventSlim(false);
+
+            var task = taskChain.Add(async () =>
+            {
+                await Task.Run(() => mutex.Wait(globalCancellationToken.Token)).CatchUnobservedExceptions();
+            });
+
+            // Allow task to potentially complete
+            Thread.Sleep(1000);
+
+            Assert.That(task.IsCompleted, Is.False);
+
+            // Allow the task to complete.
+            mutex.Set();
+
+            await task;
+        }
+
         private (Task<int> task, ManualResetEventSlim mutex, CancellationTokenSource cancellation) addTask()
         {
             var mutex = new ManualResetEventSlim(false);
-            var cancellationSource = new CancellationTokenSource();
             var completionSource = new TaskCompletionSource<int>();
 
+            var cancellationSource = new CancellationTokenSource();
+            var token = CancellationTokenSource.CreateLinkedTokenSource(cancellationSource.Token, globalCancellationToken.Token);
+
             taskChain.Add(() =>
             {
-                mutex.Wait(CancellationToken.None);
+                mutex.Wait(globalCancellationToken.Token);
                 completionSource.SetResult(Interlocked.Increment(ref currentTask));
-            }, cancellationSource.Token);
+            }, token.Token);
 
             return (completionSource.Task, mutex, cancellationSource);
         }
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 3d8ab4b4c7..5c6a0d34e0 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -182,7 +182,7 @@ namespace osu.Game.Online.Multiplayer
             return joinOrLeaveTaskChain.Add(async () =>
             {
                 await scheduledReset;
-                await LeaveRoomInternal().CatchUnobservedExceptions();
+                await LeaveRoomInternal();
             });
         }
 
diff --git a/osu.Game/Utils/TaskChain.cs b/osu.Game/Utils/TaskChain.cs
index 2bc2c00e28..30aea7578f 100644
--- a/osu.Game/Utils/TaskChain.cs
+++ b/osu.Game/Utils/TaskChain.cs
@@ -14,8 +14,8 @@ namespace osu.Game.Utils
     /// </summary>
     public class TaskChain
     {
-        private readonly object currentTaskLock = new object();
-        private Task? currentTask;
+        private readonly object finalTaskLock = new object();
+        private Task? finalTask;
 
         /// <summary>
         /// Adds a new task to the end of this <see cref="TaskChain"/>.
@@ -23,31 +23,22 @@ namespace osu.Game.Utils
         /// <param name="action">The action to be executed.</param>
         /// <param name="cancellationToken">The <see cref="CancellationToken"/> for this task. Does not affect further tasks in the chain.</param>
         /// <returns>The awaitable <see cref="Task"/>.</returns>
-        public Task Add(Action action, CancellationToken cancellationToken = default)
+        public async Task Add(Action action, CancellationToken cancellationToken = default)
         {
-            lock (currentTaskLock)
-            {
-                // Note: Attaching the cancellation token to the continuation could lead to re-ordering of tasks in the chain.
-                // Therefore, the cancellation token is not used to cancel the continuation but only the run of each task.
-                if (currentTask == null)
-                {
-                    currentTask = Task.Run(() =>
-                    {
-                        cancellationToken.ThrowIfCancellationRequested();
-                        action();
-                    }, CancellationToken.None);
-                }
-                else
-                {
-                    currentTask = currentTask.ContinueWith(_ =>
-                    {
-                        cancellationToken.ThrowIfCancellationRequested();
-                        action();
-                    }, CancellationToken.None);
-                }
+            Task? previousTask;
+            Task currentTask;
 
-                return currentTask;
+            lock (finalTaskLock)
+            {
+                previousTask = finalTask;
+                finalTask = currentTask = new Task(action, cancellationToken);
             }
+
+            if (previousTask != null)
+                await previousTask;
+
+            currentTask.Start();
+            await currentTask;
         }
     }
 }

From 9f9206726a0cd9cbae347ed26264434f37a86738 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 26 Jan 2021 18:11:54 +0100
Subject: [PATCH 1115/3722] Fix typos.

---
 osu.Game/Beatmaps/BeatmapManager.cs      | 4 ++--
 osu.Game/Database/ArchiveModelManager.cs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index a455f676b3..43b2486ac5 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -66,9 +66,9 @@ namespace osu.Game.Beatmaps
 
         protected override bool CheckStableDirectoryExists(StableStorage stableStorage) => stableStorage.GetSongStorage().ExistsDirectory(".");
 
-        protected override IEnumerable<string> GetStableImportPaths(StableStorage stableStoage)
+        protected override IEnumerable<string> GetStableImportPaths(StableStorage stableStorage)
         {
-            var songStorage = stableStoage.GetSongStorage();
+            var songStorage = stableStorage.GetSongStorage();
             return songStorage.GetDirectories(".").Select(path => songStorage.GetFullPath(path));
         }
 
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 516f70c700..99301b6c68 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -645,8 +645,8 @@ namespace osu.Game.Database
         /// <summary>
         /// Select paths to import from stable. Default implementation iterates all directories in <see cref="ImportFromStablePath"/>.
         /// </summary>
-        protected virtual IEnumerable<string> GetStableImportPaths(StableStorage stableStoage) => stableStoage.GetDirectories(ImportFromStablePath)
-                                                                                                              .Select(path => stableStoage.GetFullPath(path));
+        protected virtual IEnumerable<string> GetStableImportPaths(StableStorage stableStorage) => stableStorage.GetDirectories(ImportFromStablePath)
+                                                                                                              .Select(path => stableStorage.GetFullPath(path));
 
         /// <summary>
         /// Whether this specified path should be removed after successful import.

From 043385f91928204cba2a292469eecfd65fd086a9 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 26 Jan 2021 18:26:01 +0100
Subject: [PATCH 1116/3722] Rename const and fix unintended tabbing.

---
 osu.Game/Database/ArchiveModelManager.cs | 2 +-
 osu.Game/IO/StableStorage.cs             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 99301b6c68..ae1608d801 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -646,7 +646,7 @@ namespace osu.Game.Database
         /// Select paths to import from stable. Default implementation iterates all directories in <see cref="ImportFromStablePath"/>.
         /// </summary>
         protected virtual IEnumerable<string> GetStableImportPaths(StableStorage stableStorage) => stableStorage.GetDirectories(ImportFromStablePath)
-                                                                                                              .Select(path => stableStorage.GetFullPath(path));
+                                                                                                                .Select(path => stableStorage.GetFullPath(path));
 
         /// <summary>
         /// Whether this specified path should be removed after successful import.
diff --git a/osu.Game/IO/StableStorage.cs b/osu.Game/IO/StableStorage.cs
index 85af92621b..88a087087e 100644
--- a/osu.Game/IO/StableStorage.cs
+++ b/osu.Game/IO/StableStorage.cs
@@ -14,7 +14,7 @@ namespace osu.Game.IO
     /// </summary>
     public class StableStorage : DesktopStorage
     {
-        private const string stable_songs_path = "Songs";
+        private const string stable_default_songs_path = "Songs";
 
         private readonly DesktopGameHost host;
         private readonly string songsPath;
@@ -36,7 +36,7 @@ namespace osu.Game.IO
             var configFile = GetStream(GetFiles(".", "osu!.*.cfg").First());
             var textReader = new StreamReader(configFile);
 
-            var songsDirectoryPath = Path.Combine(BasePath, stable_songs_path);
+            var songsDirectoryPath = Path.Combine(BasePath, stable_default_songs_path);
 
             while (!textReader.EndOfStream)
             {

From 2a2b6f347e7e8af533e3a9053497fe7ee77898eb Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 26 Jan 2021 19:07:05 +0100
Subject: [PATCH 1117/3722] Use a lazy for delegating Songs directory locating
 until it is actually used.

---
 osu.Game/IO/StableStorage.cs | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/osu.Game/IO/StableStorage.cs b/osu.Game/IO/StableStorage.cs
index 88a087087e..ebceba6ce0 100644
--- a/osu.Game/IO/StableStorage.cs
+++ b/osu.Game/IO/StableStorage.cs
@@ -17,38 +17,43 @@ namespace osu.Game.IO
         private const string stable_default_songs_path = "Songs";
 
         private readonly DesktopGameHost host;
-        private readonly string songsPath;
+        private readonly Lazy<string> songsPath;
 
         public StableStorage(string path, DesktopGameHost host)
             : base(path, host)
         {
             this.host = host;
-            songsPath = locateSongsDirectory();
+            songsPath = new Lazy<string>(locateSongsDirectory);
         }
 
         /// <summary>
         /// Returns a <see cref="Storage"/> pointing to the osu-stable Songs directory.
         /// </summary>
-        public Storage GetSongStorage() => new DesktopStorage(songsPath, host);
+        public Storage GetSongStorage() => new DesktopStorage(songsPath.Value, host);
 
         private string locateSongsDirectory()
         {
-            var configFile = GetStream(GetFiles(".", "osu!.*.cfg").First());
-            var textReader = new StreamReader(configFile);
-
             var songsDirectoryPath = Path.Combine(BasePath, stable_default_songs_path);
 
-            while (!textReader.EndOfStream)
+            var configFile = GetFiles(".", "osu!.*.cfg").FirstOrDefault();
+
+            if (configFile == null)
+                return songsDirectoryPath;
+
+            using (var textReader = new StreamReader(GetStream(configFile)))
             {
-                var line = textReader.ReadLine();
+                string line;
 
-                if (line?.StartsWith("BeatmapDirectory", StringComparison.OrdinalIgnoreCase) == true)
+                while ((line = textReader.ReadLine()) != null)
                 {
-                    var directory = line.Split('=')[1].TrimStart();
-                    if (Path.IsPathFullyQualified(directory))
-                        songsDirectoryPath = directory;
+                    if (line.StartsWith("BeatmapDirectory", StringComparison.OrdinalIgnoreCase))
+                    {
+                        var directory = line.Split('=')[1].TrimStart();
+                        if (Path.IsPathFullyQualified(directory))
+                            songsDirectoryPath = directory;
 
-                    break;
+                        break;
+                    }
                 }
             }
 

From 383c40b99268b350e35d955b638781c75e09e682 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 26 Jan 2021 20:35:42 +0100
Subject: [PATCH 1118/3722] Address remaining reviews suggestions.

---
 osu.Game/Beatmaps/BeatmapManager.cs      | 2 +-
 osu.Game/Database/ArchiveModelManager.cs | 6 +++---
 osu.Game/IO/StableStorage.cs             | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 43b2486ac5..4825569ee4 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Beatmaps
 
         protected override string[] HashableFileTypes => new[] { ".osu" };
 
-        protected override bool CheckStableDirectoryExists(StableStorage stableStorage) => stableStorage.GetSongStorage().ExistsDirectory(".");
+        protected override bool StableDirectoryExists(StableStorage stableStorage) => stableStorage.GetSongStorage().ExistsDirectory(".");
 
         protected override IEnumerable<string> GetStableImportPaths(StableStorage stableStorage)
         {
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index ae1608d801..fd94660a4b 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -640,10 +640,10 @@ namespace osu.Game.Database
         /// <summary>
         /// Checks for the existence of an osu-stable directory.
         /// </summary>
-        protected virtual bool CheckStableDirectoryExists(StableStorage stableStorage) => stableStorage.ExistsDirectory(ImportFromStablePath);
+        protected virtual bool StableDirectoryExists(StableStorage stableStorage) => stableStorage.ExistsDirectory(ImportFromStablePath);
 
         /// <summary>
-        /// Select paths to import from stable. Default implementation iterates all directories in <see cref="ImportFromStablePath"/>.
+        /// Select paths to import from stable where all paths should be absolute. Default implementation iterates all directories in <see cref="ImportFromStablePath"/>.
         /// </summary>
         protected virtual IEnumerable<string> GetStableImportPaths(StableStorage stableStorage) => stableStorage.GetDirectories(ImportFromStablePath)
                                                                                                                 .Select(path => stableStorage.GetFullPath(path));
@@ -668,7 +668,7 @@ namespace osu.Game.Database
                 return Task.CompletedTask;
             }
 
-            if (!CheckStableDirectoryExists(stable))
+            if (!StableDirectoryExists(stable))
             {
                 // This handles situations like when the user does not have a Skins folder
                 Logger.Log($"No {ImportFromStablePath} folder available in osu!stable installation", LoggingTarget.Information, LogLevel.Error);
diff --git a/osu.Game/IO/StableStorage.cs b/osu.Game/IO/StableStorage.cs
index ebceba6ce0..f86b18c724 100644
--- a/osu.Game/IO/StableStorage.cs
+++ b/osu.Game/IO/StableStorage.cs
@@ -35,12 +35,13 @@ namespace osu.Game.IO
         {
             var songsDirectoryPath = Path.Combine(BasePath, stable_default_songs_path);
 
-            var configFile = GetFiles(".", "osu!.*.cfg").FirstOrDefault();
+            var configFile = GetFiles(".", "osu!.*.cfg").SingleOrDefault();
 
             if (configFile == null)
                 return songsDirectoryPath;
 
-            using (var textReader = new StreamReader(GetStream(configFile)))
+            using (var stream = GetStream(configFile))
+            using (var textReader = new StreamReader(stream))
             {
                 string line;
 

From 4d4d97661e7a8bbe924bdf4d2d5a414f017edb3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 26 Jan 2021 21:26:50 +0100
Subject: [PATCH 1119/3722] Fix connection loop always getting a cancelled
 token

---
 osu.Game/Online/Multiplayer/MultiplayerClient.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index cbb91c0832..319a8f7170 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -71,15 +71,16 @@ namespace osu.Game.Online.Multiplayer
 
             try
             {
-                // this token will be valid for the scope of this connection.
-                // if cancelled, we can be sure that a disconnect or reconnect is handled elsewhere.
-                var cancellationToken = connectCancelSource.Token;
-
                 while (api.State.Value == APIState.Online)
                 {
                     // ensure any previous connection was disposed.
+                    // this will also create a new cancellation token source.
                     await disconnect(false);
 
+                    // this token will be valid for the scope of this connection.
+                    // if cancelled, we can be sure that a disconnect or reconnect is handled elsewhere.
+                    var cancellationToken = connectCancelSource.Token;
+
                     cancellationToken.ThrowIfCancellationRequested();
 
                     Logger.Log("Multiplayer client connecting...", LoggingTarget.Network);

From 690feb1c1e60aa563cdabad181344fda1dc5d62d Mon Sep 17 00:00:00 2001
From: Mysfit <mysfit@mysfit.dev>
Date: Tue, 26 Jan 2021 23:08:51 -0500
Subject: [PATCH 1120/3722] Allow looping storyboard samples to follow the base
 samplePlaybackDisabled event logic.

---
 .../Storyboards/Drawables/DrawableStoryboardSample.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
index db8428f062..9041c10640 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
@@ -46,8 +46,15 @@ namespace osu.Game.Storyboards.Drawables
         {
             if (!RequestedPlaying) return;
 
-            if (disabled.NewValue)
-                Stop();
+            // non-looping storyboard samples should be stopped immediately when sample playback is disabled
+            if (!Looping)
+            {
+                if (disabled.NewValue)
+                    Stop();
+            }
+            else
+                base.SamplePlaybackDisabledChanged(disabled);
+
         }
 
         protected override void Update()

From ee89aa159cdc905c1c279080ac3d0333b105cfa4 Mon Sep 17 00:00:00 2001
From: Mysfit <mysfit@mysfit.dev>
Date: Tue, 26 Jan 2021 23:12:26 -0500
Subject: [PATCH 1121/3722] Removed blank line

---
 osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
index 9041c10640..fcbffda227 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
@@ -54,7 +54,6 @@ namespace osu.Game.Storyboards.Drawables
             }
             else
                 base.SamplePlaybackDisabledChanged(disabled);
-
         }
 
         protected override void Update()

From a800955bb1c9519732f1bf2d72ab3bd0d5840bfb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 27 Jan 2021 19:46:25 +0900
Subject: [PATCH 1122/3722] Add mod validation utilities

---
 osu.Game.Tests/Mods/ModValidationTest.cs |  64 +++++++++++++
 osu.Game.Tests/osu.Game.Tests.csproj     |   1 +
 osu.Game/Utils/ModValidation.cs          | 116 +++++++++++++++++++++++
 3 files changed, 181 insertions(+)
 create mode 100644 osu.Game.Tests/Mods/ModValidationTest.cs
 create mode 100644 osu.Game/Utils/ModValidation.cs

diff --git a/osu.Game.Tests/Mods/ModValidationTest.cs b/osu.Game.Tests/Mods/ModValidationTest.cs
new file mode 100644
index 0000000000..c7a7e242e9
--- /dev/null
+++ b/osu.Game.Tests/Mods/ModValidationTest.cs
@@ -0,0 +1,64 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using Moq;
+using NUnit.Framework;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Utils;
+
+namespace osu.Game.Tests.Mods
+{
+    [TestFixture]
+    public class ModValidationTest
+    {
+        [Test]
+        public void TestModIsCompatibleByItself()
+        {
+            var mod = new Mock<Mod>();
+            Assert.That(ModValidation.CheckCompatible(new[] { mod.Object }));
+        }
+
+        [Test]
+        public void TestIncompatibleThroughTopLevel()
+        {
+            var mod1 = new Mock<Mod>();
+            var mod2 = new Mock<Mod>();
+
+            mod1.Setup(m => m.IncompatibleMods).Returns(new[] { mod2.Object.GetType() });
+
+            // Test both orderings.
+            Assert.That(ModValidation.CheckCompatible(new[] { mod1.Object, mod2.Object }), Is.False);
+            Assert.That(ModValidation.CheckCompatible(new[] { mod2.Object, mod1.Object }), Is.False);
+        }
+
+        [Test]
+        public void TestIncompatibleThroughMultiMod()
+        {
+            var mod1 = new Mock<Mod>();
+
+            // The nested mod.
+            var mod2 = new Mock<Mod>();
+            mod2.Setup(m => m.IncompatibleMods).Returns(new[] { mod1.Object.GetType() });
+
+            var multiMod = new MultiMod(new MultiMod(mod2.Object));
+
+            // Test both orderings.
+            Assert.That(ModValidation.CheckCompatible(new[] { multiMod, mod1.Object }), Is.False);
+            Assert.That(ModValidation.CheckCompatible(new[] { mod1.Object, multiMod }), Is.False);
+        }
+
+        [Test]
+        public void TestAllowedThroughMostDerivedType()
+        {
+            var mod = new Mock<Mod>();
+            Assert.That(ModValidation.CheckAllowed(new[] { mod.Object }, new[] { mod.Object.GetType() }));
+        }
+
+        [Test]
+        public void TestNotAllowedThroughBaseType()
+        {
+            var mod = new Mock<Mod>();
+            Assert.That(ModValidation.CheckAllowed(new[] { mod.Object }, new[] { typeof(Mod) }), Is.False);
+        }
+    }
+}
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index c0c0578391..d29ed94b5f 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -7,6 +7,7 @@
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
+    <PackageReference Include="Moq" Version="4.16.0" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
diff --git a/osu.Game/Utils/ModValidation.cs b/osu.Game/Utils/ModValidation.cs
new file mode 100644
index 0000000000..0c4d58ab2e
--- /dev/null
+++ b/osu.Game/Utils/ModValidation.cs
@@ -0,0 +1,116 @@
+// Copyright (c) ppy 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.TypeExtensions;
+using osu.Game.Rulesets.Mods;
+
+#nullable enable
+
+namespace osu.Game.Utils
+{
+    /// <summary>
+    /// A set of utilities to validate <see cref="Mod"/> combinations.
+    /// </summary>
+    public static class ModValidation
+    {
+        /// <summary>
+        /// Checks that all <see cref="Mod"/>s are compatible with each-other, and that all appear within a set of allowed types.
+        /// </summary>
+        /// <remarks>
+        /// The allowed types must contain exact <see cref="Mod"/> types for the respective <see cref="Mod"/>s to be allowed.
+        /// </remarks>
+        /// <param name="combination">The <see cref="Mod"/>s to check.</param>
+        /// <param name="allowedTypes">The set of allowed <see cref="Mod"/> types.</param>
+        /// <returns>Whether all <see cref="Mod"/>s are compatible with each-other and appear in the set of allowed types.</returns>
+        public static bool CheckCompatibleAndAllowed(IEnumerable<Mod> combination, IEnumerable<Type> allowedTypes)
+        {
+            // Prevent multiple-enumeration.
+            var combinationList = combination as ICollection<Mod> ?? combination.ToArray();
+            return CheckCompatible(combinationList) && CheckAllowed(combinationList, allowedTypes);
+        }
+
+        /// <summary>
+        /// Checks that all <see cref="Mod"/>s in a combination are compatible with each-other.
+        /// </summary>
+        /// <param name="combination">The <see cref="Mod"/> combination to check.</param>
+        /// <returns>Whether all <see cref="Mod"/>s in the combination are compatible with each-other.</returns>
+        public static bool CheckCompatible(IEnumerable<Mod> combination)
+        {
+            var incompatibleTypes = new HashSet<Type>();
+            var incomingTypes = new HashSet<Type>();
+
+            foreach (var mod in combination.SelectMany(flattenMod))
+            {
+                // Add the new mod incompatibilities, checking whether any match the existing mod types.
+                foreach (var t in mod.IncompatibleMods)
+                {
+                    if (incomingTypes.Contains(t))
+                        return false;
+
+                    incompatibleTypes.Add(t);
+                }
+
+                // Add the new mod types, checking whether any match the incompatible types.
+                foreach (var t in mod.GetType().EnumerateBaseTypes())
+                {
+                    if (incomingTypes.Contains(t))
+                        return false;
+
+                    incomingTypes.Add(t);
+                }
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Checks that all <see cref="Mod"/>s in a combination appear within a set of allowed types.
+        /// </summary>
+        /// <remarks>
+        /// The set of allowed types must contain exact <see cref="Mod"/> types for the respective <see cref="Mod"/>s to be allowed.
+        /// </remarks>
+        /// <param name="combination">The <see cref="Mod"/> combination to check.</param>
+        /// <param name="allowedTypes">The set of allowed <see cref="Mod"/> types.</param>
+        /// <returns>Whether all <see cref="Mod"/>s in the combination are allowed.</returns>
+        public static bool CheckAllowed(IEnumerable<Mod> combination, IEnumerable<Type> allowedTypes)
+        {
+            var allowedSet = new HashSet<Type>(allowedTypes);
+
+            return combination.SelectMany(flattenMod)
+                              .All(m => allowedSet.Contains(m.GetType()));
+        }
+
+        /// <summary>
+        /// Determines whether a <see cref="Mod"/> is in a set of incompatible types.
+        /// </summary>
+        /// <remarks>
+        /// A <see cref="Mod"/> can be incompatible through its most-declared type or any of its base types.
+        /// </remarks>
+        /// <param name="mod">The <see cref="Mod"/> to test.</param>
+        /// <param name="incompatibleTypes">The set of incompatible <see cref="Mod"/> types.</param>
+        /// <returns>Whether the given <see cref="Mod"/> is incompatible.</returns>
+        private static bool isModIncompatible(Mod mod, ICollection<Type> incompatibleTypes)
+            => flattenMod(mod)
+               .SelectMany(m => m.GetType().EnumerateBaseTypes())
+               .Any(incompatibleTypes.Contains);
+
+        /// <summary>
+        /// Flattens a <see cref="Mod"/>, returning a set of <see cref="Mod"/>s in-place of any <see cref="MultiMod"/>s.
+        /// </summary>
+        /// <param name="mod">The <see cref="Mod"/> to flatten.</param>
+        /// <returns>A set of singular "flattened" <see cref="Mod"/>s</returns>
+        private static IEnumerable<Mod> flattenMod(Mod mod)
+        {
+            if (mod is MultiMod multi)
+            {
+                foreach (var m in multi.Mods.SelectMany(flattenMod))
+                    yield return m;
+            }
+            else
+                yield return mod;
+        }
+    }
+}

From fcfb0d52c2d1d605ac3b8510cdffa01a3714e928 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Jan 2021 19:50:16 +0900
Subject: [PATCH 1123/3722] Proposal to use extension method instead of
 TaskChain class

---
 osu.Game.Tests/NonVisual/TaskChainTest.cs | 19 ++++++++---
 osu.Game/Extensions/TaskExtensions.cs     | 39 +++++++++++++++++++++++
 2 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/TaskChainTest.cs b/osu.Game.Tests/NonVisual/TaskChainTest.cs
index 0a56468818..bd4f15a6eb 100644
--- a/osu.Game.Tests/NonVisual/TaskChainTest.cs
+++ b/osu.Game.Tests/NonVisual/TaskChainTest.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;
 using System.Threading.Tasks;
 using NUnit.Framework;
@@ -12,15 +13,17 @@ namespace osu.Game.Tests.NonVisual
     [TestFixture]
     public class TaskChainTest
     {
-        private TaskChain taskChain;
+        private Task taskChain;
+
         private int currentTask;
         private CancellationTokenSource globalCancellationToken;
 
         [SetUp]
         public void Setup()
         {
+            taskChain = Task.CompletedTask;
+
             globalCancellationToken = new CancellationTokenSource();
-            taskChain = new TaskChain();
             currentTask = 0;
         }
 
@@ -79,9 +82,15 @@ namespace osu.Game.Tests.NonVisual
         {
             var mutex = new ManualResetEventSlim(false);
 
-            var task = taskChain.Add(async () =>
+            var task = taskChain.ContinueWithSequential(async () =>
             {
-                await Task.Run(() => mutex.Wait(globalCancellationToken.Token)).CatchUnobservedExceptions();
+                try
+                {
+                    await Task.Run(() => mutex.Wait(globalCancellationToken.Token));
+                }
+                catch (OperationCanceledException)
+                {
+                }
             });
 
             // Allow task to potentially complete
@@ -103,7 +112,7 @@ namespace osu.Game.Tests.NonVisual
             var cancellationSource = new CancellationTokenSource();
             var token = CancellationTokenSource.CreateLinkedTokenSource(cancellationSource.Token, globalCancellationToken.Token);
 
-            taskChain.Add(() =>
+            taskChain = taskChain.ContinueWithSequential(() =>
             {
                 mutex.Wait(globalCancellationToken.Token);
                 completionSource.SetResult(Interlocked.Increment(ref currentTask));
diff --git a/osu.Game/Extensions/TaskExtensions.cs b/osu.Game/Extensions/TaskExtensions.cs
index 24f0188cf0..fd0274f39e 100644
--- a/osu.Game/Extensions/TaskExtensions.cs
+++ b/osu.Game/Extensions/TaskExtensions.cs
@@ -4,6 +4,7 @@
 #nullable enable
 
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Extensions.ExceptionExtensions;
 using osu.Framework.Logging;
@@ -32,5 +33,43 @@ namespace osu.Game.Extensions
                     Logger.Log($"Error running task: {exception}", LoggingTarget.Runtime, LogLevel.Debug);
             }, TaskContinuationOptions.NotOnRanToCompletion);
         }
+
+        public static Task ContinueWithSequential(this Task task, Action continuationFunction, CancellationToken cancellationToken = default)
+        {
+            return task.ContinueWithSequential(() => Task.Run(continuationFunction, cancellationToken), cancellationToken);
+        }
+
+        public static Task ContinueWithSequential(this Task task, Func<Task> continuationFunction, CancellationToken cancellationToken = default)
+        {
+            var tcs = new TaskCompletionSource<bool>();
+
+            task.ContinueWith(t =>
+            {
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    tcs.SetCanceled();
+                }
+                else
+                {
+                    continuationFunction().ContinueWith(t2 =>
+                    {
+                        if (cancellationToken.IsCancellationRequested || t2.IsCanceled)
+                        {
+                            tcs.TrySetCanceled();
+                        }
+                        else if (t2.IsFaulted)
+                        {
+                            tcs.TrySetException(t2.Exception);
+                        }
+                        else
+                        {
+                            tcs.TrySetResult(true);
+                        }
+                    }, cancellationToken: default);
+                }
+            }, cancellationToken: default);
+
+            return tcs.Task;
+        }
     }
 }

From f2fa51bf5e31e79c799fcf8fd17cd785280cde94 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 27 Jan 2021 19:59:28 +0900
Subject: [PATCH 1124/3722] Make ModSections overrideable

---
 osu.Game/Overlays/Mods/ModSection.cs          | 18 +++++-----
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    | 33 +++++++++++++++----
 .../Mods/Sections/AutomationSection.cs        | 19 -----------
 .../Mods/Sections/ConversionSection.cs        | 19 -----------
 .../Sections/DifficultyIncreaseSection.cs     | 19 -----------
 .../Sections/DifficultyReductionSection.cs    | 19 -----------
 osu.Game/Overlays/Mods/Sections/FunSection.cs | 19 -----------
 7 files changed, 34 insertions(+), 112 deletions(-)
 delete mode 100644 osu.Game/Overlays/Mods/Sections/AutomationSection.cs
 delete mode 100644 osu.Game/Overlays/Mods/Sections/ConversionSection.cs
 delete mode 100644 osu.Game/Overlays/Mods/Sections/DifficultyIncreaseSection.cs
 delete mode 100644 osu.Game/Overlays/Mods/Sections/DifficultyReductionSection.cs
 delete mode 100644 osu.Game/Overlays/Mods/Sections/FunSection.cs

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 573d1e5355..d70013602e 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -11,26 +11,23 @@ using System;
 using System.Linq;
 using System.Collections.Generic;
 using System.Threading;
+using Humanizer;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 
 namespace osu.Game.Overlays.Mods
 {
-    public abstract class ModSection : Container
+    public class ModSection : Container
     {
         private readonly OsuSpriteText headerLabel;
 
         public FillFlowContainer<ModButtonEmpty> ButtonsContainer { get; }
 
         public Action<Mod> Action;
-        protected abstract Key[] ToggleKeys { get; }
-        public abstract ModType ModType { get; }
 
-        public string Header
-        {
-            get => headerLabel.Text;
-            set => headerLabel.Text = value;
-        }
+        public Key[] ToggleKeys;
+
+        public readonly ModType ModType;
 
         public IEnumerable<Mod> SelectedMods => buttons.Select(b => b.SelectedMod).Where(m => m != null);
 
@@ -153,7 +150,7 @@ namespace osu.Game.Overlays.Mods
             button.Deselect();
         }
 
-        protected ModSection()
+        public ModSection(ModType type)
         {
             AutoSizeAxes = Axes.Y;
             RelativeSizeAxes = Axes.X;
@@ -168,7 +165,8 @@ namespace osu.Game.Overlays.Mods
                     Origin = Anchor.TopLeft,
                     Anchor = Anchor.TopLeft,
                     Position = new Vector2(0f, 0f),
-                    Font = OsuFont.GetFont(weight: FontWeight.Bold)
+                    Font = OsuFont.GetFont(weight: FontWeight.Bold),
+                    Text = type.Humanize(LetterCasing.Title)
                 },
                 ButtonsContainer = new FillFlowContainer<ModButtonEmpty>
                 {
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index b93602116b..5775b08ae7 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -19,7 +19,6 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
-using osu.Game.Overlays.Mods.Sections;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens;
 using osuTK;
@@ -190,13 +189,31 @@ namespace osu.Game.Overlays.Mods
                                                 Width = content_width,
                                                 LayoutDuration = 200,
                                                 LayoutEasing = Easing.OutQuint,
-                                                Children = new ModSection[]
+                                                Children = new[]
                                                 {
-                                                    new DifficultyReductionSection { Action = modButtonPressed },
-                                                    new DifficultyIncreaseSection { Action = modButtonPressed },
-                                                    new AutomationSection { Action = modButtonPressed },
-                                                    new ConversionSection { Action = modButtonPressed },
-                                                    new FunSection { Action = modButtonPressed },
+                                                    CreateModSection(ModType.DifficultyReduction).With(s =>
+                                                    {
+                                                        s.ToggleKeys = new[] { Key.Q, Key.W, Key.E, Key.R, Key.T, Key.Y, Key.U, Key.I, Key.O, Key.P };
+                                                        s.Action = modButtonPressed;
+                                                    }),
+                                                    CreateModSection(ModType.DifficultyIncrease).With(s =>
+                                                    {
+                                                        s.ToggleKeys = new[] { Key.A, Key.S, Key.D, Key.F, Key.G, Key.H, Key.J, Key.K, Key.L };
+                                                        s.Action = modButtonPressed;
+                                                    }),
+                                                    CreateModSection(ModType.Automation).With(s =>
+                                                    {
+                                                        s.ToggleKeys = new[] { Key.Z, Key.X, Key.C, Key.V, Key.B, Key.N, Key.M };
+                                                        s.Action = modButtonPressed;
+                                                    }),
+                                                    CreateModSection(ModType.Conversion).With(s =>
+                                                    {
+                                                        s.Action = modButtonPressed;
+                                                    }),
+                                                    CreateModSection(ModType.Fun).With(s =>
+                                                    {
+                                                        s.Action = modButtonPressed;
+                                                    }),
                                                 }
                                             },
                                         }
@@ -455,6 +472,8 @@ namespace osu.Game.Overlays.Mods
 
         private void refreshSelectedMods() => SelectedMods.Value = ModSectionsContainer.Children.SelectMany(s => s.SelectedMods).ToArray();
 
+        protected virtual ModSection CreateModSection(ModType type) => new ModSection(type);
+
         #region Disposal
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Overlays/Mods/Sections/AutomationSection.cs b/osu.Game/Overlays/Mods/Sections/AutomationSection.cs
deleted file mode 100644
index a2d7fec15f..0000000000
--- a/osu.Game/Overlays/Mods/Sections/AutomationSection.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.Mods;
-using osuTK.Input;
-
-namespace osu.Game.Overlays.Mods.Sections
-{
-    public class AutomationSection : ModSection
-    {
-        protected override Key[] ToggleKeys => new[] { Key.Z, Key.X, Key.C, Key.V, Key.B, Key.N, Key.M };
-        public override ModType ModType => ModType.Automation;
-
-        public AutomationSection()
-        {
-            Header = @"Automation";
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Mods/Sections/ConversionSection.cs b/osu.Game/Overlays/Mods/Sections/ConversionSection.cs
deleted file mode 100644
index 24fd8c30dd..0000000000
--- a/osu.Game/Overlays/Mods/Sections/ConversionSection.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.Mods;
-using osuTK.Input;
-
-namespace osu.Game.Overlays.Mods.Sections
-{
-    public class ConversionSection : ModSection
-    {
-        protected override Key[] ToggleKeys => null;
-        public override ModType ModType => ModType.Conversion;
-
-        public ConversionSection()
-        {
-            Header = @"Conversion";
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Mods/Sections/DifficultyIncreaseSection.cs b/osu.Game/Overlays/Mods/Sections/DifficultyIncreaseSection.cs
deleted file mode 100644
index 0b7ccd1f25..0000000000
--- a/osu.Game/Overlays/Mods/Sections/DifficultyIncreaseSection.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.Mods;
-using osuTK.Input;
-
-namespace osu.Game.Overlays.Mods.Sections
-{
-    public class DifficultyIncreaseSection : ModSection
-    {
-        protected override Key[] ToggleKeys => new[] { Key.A, Key.S, Key.D, Key.F, Key.G, Key.H, Key.J, Key.K, Key.L };
-        public override ModType ModType => ModType.DifficultyIncrease;
-
-        public DifficultyIncreaseSection()
-        {
-            Header = @"Difficulty Increase";
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Mods/Sections/DifficultyReductionSection.cs b/osu.Game/Overlays/Mods/Sections/DifficultyReductionSection.cs
deleted file mode 100644
index 508e92508b..0000000000
--- a/osu.Game/Overlays/Mods/Sections/DifficultyReductionSection.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.Mods;
-using osuTK.Input;
-
-namespace osu.Game.Overlays.Mods.Sections
-{
-    public class DifficultyReductionSection : ModSection
-    {
-        protected override Key[] ToggleKeys => new[] { Key.Q, Key.W, Key.E, Key.R, Key.T, Key.Y, Key.U, Key.I, Key.O, Key.P };
-        public override ModType ModType => ModType.DifficultyReduction;
-
-        public DifficultyReductionSection()
-        {
-            Header = @"Difficulty Reduction";
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Mods/Sections/FunSection.cs b/osu.Game/Overlays/Mods/Sections/FunSection.cs
deleted file mode 100644
index af1f5836b1..0000000000
--- a/osu.Game/Overlays/Mods/Sections/FunSection.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.Mods;
-using osuTK.Input;
-
-namespace osu.Game.Overlays.Mods.Sections
-{
-    public class FunSection : ModSection
-    {
-        protected override Key[] ToggleKeys => null;
-        public override ModType ModType => ModType.Fun;
-
-        public FunSection()
-        {
-            Header = @"Fun";
-        }
-    }
-}

From a30aecbafeb7d45f87f1061a2ccc71ee757c91cd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Jan 2021 20:01:21 +0900
Subject: [PATCH 1125/3722] Comment and add xmldoc

---
 osu.Game.Tests/NonVisual/TaskChainTest.cs |  1 -
 osu.Game/Extensions/TaskExtensions.cs     | 32 +++++++++++++++++------
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/TaskChainTest.cs b/osu.Game.Tests/NonVisual/TaskChainTest.cs
index bd4f15a6eb..342f137dfd 100644
--- a/osu.Game.Tests/NonVisual/TaskChainTest.cs
+++ b/osu.Game.Tests/NonVisual/TaskChainTest.cs
@@ -6,7 +6,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Game.Extensions;
-using osu.Game.Utils;
 
 namespace osu.Game.Tests.NonVisual
 {
diff --git a/osu.Game/Extensions/TaskExtensions.cs b/osu.Game/Extensions/TaskExtensions.cs
index fd0274f39e..62b249b869 100644
--- a/osu.Game/Extensions/TaskExtensions.cs
+++ b/osu.Game/Extensions/TaskExtensions.cs
@@ -34,32 +34,46 @@ namespace osu.Game.Extensions
             }, TaskContinuationOptions.NotOnRanToCompletion);
         }
 
-        public static Task ContinueWithSequential(this Task task, Action continuationFunction, CancellationToken cancellationToken = default)
-        {
-            return task.ContinueWithSequential(() => Task.Run(continuationFunction, cancellationToken), cancellationToken);
-        }
+        /// <summary>
+        /// Add a continuation to be performed only after the attached task has completed.
+        /// </summary>
+        /// <param name="task">The previous task to be awaited on.</param>
+        /// <param name="action">The action to run.</param>
+        /// <param name="cancellationToken">An optional cancellation token. Will only cancel the provided action, not the sequence.</param>
+        /// <returns>A task representing the provided action.</returns>
+        public static Task ContinueWithSequential(this Task task, Action action, CancellationToken cancellationToken = default) =>
+            task.ContinueWithSequential(() => Task.Run(action, cancellationToken), cancellationToken);
 
+        /// <summary>
+        /// Add a continuation to be performed only after the attached task has completed.
+        /// </summary>
+        /// <param name="task">The previous task to be awaited on.</param>
+        /// <param name="continuationFunction">The continuation to run. Generally should be an async function.</param>
+        /// <param name="cancellationToken">An optional cancellation token. Will only cancel the provided action, not the sequence.</param>
+        /// <returns>A task representing the provided action.</returns>
         public static Task ContinueWithSequential(this Task task, Func<Task> continuationFunction, CancellationToken cancellationToken = default)
         {
             var tcs = new TaskCompletionSource<bool>();
 
             task.ContinueWith(t =>
             {
+                // the previous task has finished execution or been cancelled, so we can run the provided continuation.
+
                 if (cancellationToken.IsCancellationRequested)
                 {
                     tcs.SetCanceled();
                 }
                 else
                 {
-                    continuationFunction().ContinueWith(t2 =>
+                    continuationFunction().ContinueWith(continuationTask =>
                     {
-                        if (cancellationToken.IsCancellationRequested || t2.IsCanceled)
+                        if (cancellationToken.IsCancellationRequested || continuationTask.IsCanceled)
                         {
                             tcs.TrySetCanceled();
                         }
-                        else if (t2.IsFaulted)
+                        else if (continuationTask.IsFaulted)
                         {
-                            tcs.TrySetException(t2.Exception);
+                            tcs.TrySetException(continuationTask.Exception);
                         }
                         else
                         {
@@ -69,6 +83,8 @@ namespace osu.Game.Extensions
                 }
             }, cancellationToken: default);
 
+            // importantly, we are not returning the continuation itself but rather a task which represents its status in sequential execution order.
+            // this will not be cancelled or completed until the previous task has also.
             return tcs.Task;
         }
     }

From 0ff300628eff78d2d4c983d029137425b3209628 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 27 Jan 2021 20:07:22 +0900
Subject: [PATCH 1126/3722] Fix type not being set

---
 osu.Game/Overlays/Mods/ModSection.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index d70013602e..df4d05daad 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -152,6 +152,8 @@ namespace osu.Game.Overlays.Mods
 
         public ModSection(ModType type)
         {
+            ModType = type;
+
             AutoSizeAxes = Axes.Y;
             RelativeSizeAxes = Axes.X;
 

From 91d34d86f74ba1466323c3ee5f29c6b9541f1640 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 27 Jan 2021 22:02:23 +0900
Subject: [PATCH 1127/3722] Abstractify ModSelectOverlay

---
 .../TestSceneModSelectOverlay.cs              |  2 +-
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    | 23 ++++++------------
 .../Overlays/Mods/SoloModSelectOverlay.cs     | 24 +++++++++++++++++++
 osu.Game/Screens/Select/MatchSongSelect.cs    |  2 +-
 osu.Game/Screens/Select/SongSelect.cs         |  2 +-
 5 files changed, 34 insertions(+), 19 deletions(-)
 create mode 100644 osu.Game/Overlays/Mods/SoloModSelectOverlay.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index bd4010a7f3..b03512ffde 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -265,7 +265,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private void checkLabelColor(Func<Color4> getColour) => AddAssert("check label has expected colour", () => modSelect.MultiplierLabel.Colour.AverageColour == getColour());
 
-        private class TestModSelectOverlay : ModSelectOverlay
+        private class TestModSelectOverlay : SoloModSelectOverlay
         {
             public new Bindable<IReadOnlyList<Mod>> SelectedMods => base.SelectedMods;
 
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 5775b08ae7..5709ca3b8d 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -27,7 +27,7 @@ using osuTK.Input;
 
 namespace osu.Game.Overlays.Mods
 {
-    public class ModSelectOverlay : WaveOverlayContainer
+    public abstract class ModSelectOverlay : WaveOverlayContainer
     {
         private readonly Func<Mod, bool> isValidMod;
         public const float HEIGHT = 510;
@@ -60,7 +60,7 @@ namespace osu.Game.Overlays.Mods
 
         private SampleChannel sampleOn, sampleOff;
 
-        public ModSelectOverlay(Func<Mod, bool> isValidMod = null)
+        protected ModSelectOverlay(Func<Mod, bool> isValidMod = null)
         {
             this.isValidMod = isValidMod ?? (m => true);
 
@@ -346,19 +346,6 @@ namespace osu.Game.Overlays.Mods
             refreshSelectedMods();
         }
 
-        /// <summary>
-        /// Deselect one or more mods.
-        /// </summary>
-        /// <param name="modTypes">The types of <see cref="Mod"/>s which should be deselected.</param>
-        /// <param name="immediate">Set to true to bypass animations and update selections immediately.</param>
-        private void deselectTypes(Type[] modTypes, bool immediate = false)
-        {
-            if (modTypes.Length == 0) return;
-
-            foreach (var section in ModSectionsContainer.Children)
-                section.DeselectTypes(modTypes, immediate);
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -458,7 +445,7 @@ namespace osu.Game.Overlays.Mods
             {
                 if (State.Value == Visibility.Visible) sampleOn?.Play();
 
-                deselectTypes(selectedMod.IncompatibleMods, true);
+                OnModSelected(selectedMod);
 
                 if (selectedMod.RequiresConfiguration) ModSettingsContainer.Show();
             }
@@ -470,6 +457,10 @@ namespace osu.Game.Overlays.Mods
             refreshSelectedMods();
         }
 
+        protected virtual void OnModSelected(Mod mod)
+        {
+        }
+
         private void refreshSelectedMods() => SelectedMods.Value = ModSectionsContainer.Children.SelectMany(s => s.SelectedMods).ToArray();
 
         protected virtual ModSection CreateModSection(ModType type) => new ModSection(type);
diff --git a/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs b/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
new file mode 100644
index 0000000000..53d0c9fce9
--- /dev/null
+++ b/osu.Game/Overlays/Mods/SoloModSelectOverlay.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;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Overlays.Mods
+{
+    public class SoloModSelectOverlay : ModSelectOverlay
+    {
+        public SoloModSelectOverlay(Func<Mod, bool> isValidMod = null)
+            : base(isValidMod)
+        {
+        }
+
+        protected override void OnModSelected(Mod mod)
+        {
+            base.OnModSelected(mod);
+
+            foreach (var section in ModSectionsContainer.Children)
+                section.DeselectTypes(mod.IncompatibleMods, true);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index ed47b5d5ac..280f46f9ab 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Screens.Select
             item.RequiredMods.AddRange(Mods.Value.Select(m => m.CreateCopy()));
         }
 
-        protected override ModSelectOverlay CreateModSelectOverlay() => new ModSelectOverlay(isValidMod);
+        protected override ModSelectOverlay CreateModSelectOverlay() => new SoloModSelectOverlay(isValidMod);
 
         private bool isValidMod(Mod mod) => !(mod is ModAutoplay) && (mod as MultiMod)?.Mods.Any(mm => mm is ModAutoplay) != true;
     }
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 4fca77a176..ff49dd9f7e 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -301,7 +301,7 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        protected virtual ModSelectOverlay CreateModSelectOverlay() => new ModSelectOverlay();
+        protected virtual ModSelectOverlay CreateModSelectOverlay() => new SoloModSelectOverlay();
 
         protected virtual void ApplyFilterToCarousel(FilterCriteria criteria)
         {

From 4019cc38e5e34e8c900bed0e61176fdfa35dbb42 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 27 Jan 2021 22:03:51 +0900
Subject: [PATCH 1128/3722] Allow footer buttons to be customised

---
 osu.Game/Screens/Select/SongSelect.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index ff49dd9f7e..4af96b7a29 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -263,9 +263,8 @@ namespace osu.Game.Screens.Select
 
             if (Footer != null)
             {
-                Footer.AddButton(new FooterButtonMods { Current = Mods }, ModSelect);
-                Footer.AddButton(new FooterButtonRandom { Action = triggerRandom });
-                Footer.AddButton(new FooterButtonOptions(), BeatmapOptions);
+                foreach (var (button, overlay) in CreateFooterButtons())
+                    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));
@@ -301,6 +300,13 @@ namespace osu.Game.Screens.Select
             }
         }
 
+        protected virtual IEnumerable<(FooterButton, OverlayContainer)> CreateFooterButtons() => new (FooterButton, OverlayContainer)[]
+        {
+            (new FooterButtonMods { Current = Mods }, ModSelect),
+            (new FooterButtonRandom { Action = triggerRandom }, null),
+            (new FooterButtonOptions(), BeatmapOptions)
+        };
+
         protected virtual ModSelectOverlay CreateModSelectOverlay() => new SoloModSelectOverlay();
 
         protected virtual void ApplyFilterToCarousel(FilterCriteria criteria)

From 45e41aaeacf930ce4b5e3b62f85acbc618ce73da Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 27 Jan 2021 22:15:53 +0900
Subject: [PATCH 1129/3722] Initial implementation of freemod selection overlay

---
 .../TestSceneFreeModSelectOverlay.cs          |  24 +++++
 osu.Game/Overlays/Mods/ModButton.cs           |   8 +-
 osu.Game/Overlays/Mods/ModSection.cs          |  30 +++---
 .../Multiplayer/FreeModSelectOverlay.cs       | 101 ++++++++++++++++++
 .../Multiplayer/MultiplayerMatchSongSelect.cs |  66 +++++++++++-
 osu.Game/Screens/Select/Footer.cs             |  15 ++-
 6 files changed, 216 insertions(+), 28 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs
 create mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs
new file mode 100644
index 0000000000..960402df88
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.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 NUnit.Framework;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Overlays.Mods;
+using osu.Game.Screens.OnlinePlay.Multiplayer;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public class TestSceneFreeModSelectOverlay : MultiplayerTestScene
+    {
+        private ModSelectOverlay overlay;
+
+        [SetUp]
+        public new void Setup() => Schedule(() =>
+        {
+            Child = overlay = new FreeModSelectOverlay
+            {
+                State = { Value = Visibility.Visible }
+            };
+        });
+    }
+}
diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index ab8efdabcc..9ea4f65eb2 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -174,7 +174,7 @@ namespace osu.Game.Overlays.Mods
                 switch (e.Button)
                 {
                     case MouseButton.Right:
-                        SelectNext(-1);
+                        OnRightClick(e);
                         break;
                 }
             }
@@ -183,10 +183,14 @@ namespace osu.Game.Overlays.Mods
         protected override bool OnClick(ClickEvent e)
         {
             SelectNext(1);
-
             return true;
         }
 
+        protected virtual void OnRightClick(MouseUpEvent e)
+        {
+            SelectNext(-1);
+        }
+
         /// <summary>
         /// Select the next available mod in a specified direction.
         /// </summary>
diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index df4d05daad..5de629424b 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Mods
 {
     public class ModSection : Container
     {
-        private readonly OsuSpriteText headerLabel;
+        private readonly Drawable header;
 
         public FillFlowContainer<ModButtonEmpty> ButtonsContainer { get; }
 
@@ -47,10 +47,7 @@ namespace osu.Game.Overlays.Mods
                     if (m == null)
                         return new ModButtonEmpty();
 
-                    return new ModButton(m)
-                    {
-                        SelectionChanged = Action,
-                    };
+                    return CreateModButton(m).With(b => b.SelectionChanged = Action);
                 }).ToArray();
 
                 modsLoadCts?.Cancel();
@@ -58,7 +55,7 @@ namespace osu.Game.Overlays.Mods
                 if (modContainers.Length == 0)
                 {
                     ModIconsLoaded = true;
-                    headerLabel.Hide();
+                    header.Hide();
                     Hide();
                     return;
                 }
@@ -73,7 +70,7 @@ namespace osu.Game.Overlays.Mods
 
                 buttons = modContainers.OfType<ModButton>().ToArray();
 
-                headerLabel.FadeIn(200);
+                header.FadeIn(200);
                 this.FadeIn(200);
             }
         }
@@ -160,16 +157,9 @@ namespace osu.Game.Overlays.Mods
             Origin = Anchor.TopCentre;
             Anchor = Anchor.TopCentre;
 
-            Children = new Drawable[]
+            Children = new[]
             {
-                headerLabel = new OsuSpriteText
-                {
-                    Origin = Anchor.TopLeft,
-                    Anchor = Anchor.TopLeft,
-                    Position = new Vector2(0f, 0f),
-                    Font = OsuFont.GetFont(weight: FontWeight.Bold),
-                    Text = type.Humanize(LetterCasing.Title)
-                },
+                header = CreateHeader(type.Humanize(LetterCasing.Title)),
                 ButtonsContainer = new FillFlowContainer<ModButtonEmpty>
                 {
                     AutoSizeAxes = Axes.Y,
@@ -185,5 +175,13 @@ namespace osu.Game.Overlays.Mods
                 },
             };
         }
+
+        protected virtual ModButton CreateModButton(Mod mod) => new ModButton(mod);
+
+        protected virtual Drawable CreateHeader(string text) => new OsuSpriteText
+        {
+            Font = OsuFont.GetFont(weight: FontWeight.Bold),
+            Text = text
+        };
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs
new file mode 100644
index 0000000000..56e74a8460
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs
@@ -0,0 +1,101 @@
+// Copyright (c) ppy 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.Graphics.Containers;
+using osu.Framework.Input.Events;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays.Mods;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Screens.OnlinePlay.Multiplayer
+{
+    public class FreeModSelectOverlay : ModSelectOverlay
+    {
+        protected override ModSection CreateModSection(ModType type) => new FreeModSection(type);
+
+        private class FreeModSection : ModSection
+        {
+            private HeaderCheckbox checkbox;
+
+            public FreeModSection(ModType type)
+                : base(type)
+            {
+            }
+
+            protected override ModButton CreateModButton(Mod mod) => new FreeModButton(mod);
+
+            protected override Drawable CreateHeader(string text) => new Container
+            {
+                AutoSizeAxes = Axes.Y,
+                Width = 175,
+                Child = checkbox = new HeaderCheckbox
+                {
+                    LabelText = text,
+                    Changed = onCheckboxChanged
+                }
+            };
+
+            private void onCheckboxChanged(bool value)
+            {
+                foreach (var button in ButtonsContainer.OfType<ModButton>())
+                {
+                    if (value)
+                        // Note: Buttons where only part of the group has an implementation are not fully supported.
+                        button.SelectAt(0);
+                    else
+                        button.Deselect();
+                }
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+
+                // If any of the buttons aren't selected, deselect the checkbox.
+                foreach (var button in ButtonsContainer.OfType<ModButton>())
+                {
+                    if (button.Mods.Any(m => m.HasImplementation) && !button.Selected)
+                        checkbox.Current.Value = false;
+                }
+            }
+        }
+
+        private class HeaderCheckbox : OsuCheckbox
+        {
+            public Action<bool> Changed;
+
+            protected override void OnUserChange(bool value)
+            {
+                base.OnUserChange(value);
+                Changed?.Invoke(value);
+            }
+        }
+
+        private class FreeModButton : ModButton
+        {
+            public FreeModButton(Mod mod)
+                : base(mod)
+            {
+            }
+
+            protected override bool OnClick(ClickEvent e)
+            {
+                onClick();
+                return true;
+            }
+
+            protected override void OnRightClick(MouseUpEvent e) => onClick();
+
+            private void onClick()
+            {
+                if (Selected)
+                    Deselect();
+                else
+                    SelectNext(1);
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index ebc06d2445..5917ed3f49 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -6,17 +6,23 @@ using System.Linq;
 using Humanizer;
 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.UserInterface;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays.Mods;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Select;
+using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
@@ -33,6 +39,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         private StatefulMultiplayerClient client { get; set; }
 
         private LoadingLayer loadingLayer;
+        private FreeModSelectOverlay freeModSelectOverlay;
 
         private WorkingBeatmap initialBeatmap;
         private RulesetInfo initialRuleset;
@@ -43,6 +50,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         public MultiplayerMatchSongSelect()
         {
             Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING };
+
+            freeModSelectOverlay = new FreeModSelectOverlay();
         }
 
         [BackgroundDependencyLoader]
@@ -52,6 +61,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             initialBeatmap = Beatmap.Value;
             initialRuleset = Ruleset.Value;
             initialMods = Mods.Value.ToList();
+
+            FooterPanels.Add(freeModSelectOverlay);
         }
 
         protected override bool OnStart()
@@ -111,8 +122,61 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea();
 
-        protected override ModSelectOverlay CreateModSelectOverlay() => new ModSelectOverlay(isValidMod);
+        protected override ModSelectOverlay CreateModSelectOverlay() => new SoloModSelectOverlay(isValidMod);
+
+        protected override IEnumerable<(FooterButton, OverlayContainer)> CreateFooterButtons()
+        {
+            var buttons = base.CreateFooterButtons().ToList();
+            buttons.Insert(buttons.FindIndex(b => b.Item1 is FooterButtonMods) + 1, (new FooterButtonFreeMods(), freeModSelectOverlay));
+            return buttons;
+        }
 
         private bool isValidMod(Mod mod) => !(mod is ModAutoplay) && (mod as MultiMod)?.Mods.Any(mm => mm is ModAutoplay) != true;
     }
+
+    public class FooterButtonFreeMods : FooterButton, IHasCurrentValue<IReadOnlyList<Mod>>
+    {
+        public Bindable<IReadOnlyList<Mod>> Current
+        {
+            get => modDisplay.Current;
+            set => modDisplay.Current = value;
+        }
+
+        private readonly ModDisplay modDisplay;
+
+        public FooterButtonFreeMods()
+        {
+            ButtonContentContainer.Add(modDisplay = new ModDisplay
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                DisplayUnrankedText = false,
+                Scale = new Vector2(0.8f),
+                ExpansionMode = ExpansionMode.AlwaysContracted,
+            });
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            SelectedColour = colours.Yellow;
+            DeselectedColour = SelectedColour.Opacity(0.5f);
+            Text = @"freemods";
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Current.BindValueChanged(_ => updateModDisplay(), true);
+        }
+
+        private void updateModDisplay()
+        {
+            if (Current.Value?.Count > 0)
+                modDisplay.FadeIn();
+            else
+                modDisplay.FadeOut();
+        }
+    }
 }
diff --git a/osu.Game/Screens/Select/Footer.cs b/osu.Game/Screens/Select/Footer.cs
index 689a11166a..ee13ebda44 100644
--- a/osu.Game/Screens/Select/Footer.cs
+++ b/osu.Game/Screens/Select/Footer.cs
@@ -28,19 +28,16 @@ namespace osu.Game.Screens.Select
 
         private readonly List<OverlayContainer> overlays = new List<OverlayContainer>();
 
-        /// <param name="button">THe button to be added.</param>
+        /// <param name="button">The button to be added.</param>
         /// <param name="overlay">The <see cref="OverlayContainer"/> to be toggled by this button.</param>
         public void AddButton(FooterButton button, OverlayContainer overlay)
         {
-            overlays.Add(overlay);
-            button.Action = () => showOverlay(overlay);
+            if (overlay != null)
+            {
+                overlays.Add(overlay);
+                button.Action = () => showOverlay(overlay);
+            }
 
-            AddButton(button);
-        }
-
-        /// <param name="button">Button to be added.</param>
-        public void AddButton(FooterButton button)
-        {
             button.Hovered = updateModeLight;
             button.HoverLost = updateModeLight;
 

From 4c256f1fb361f4a64d7cf3fa7a919467c56969b0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 27 Jan 2021 22:23:38 +0900
Subject: [PATCH 1130/3722] Actually populate the playlist item

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index 5917ed3f49..4054d84540 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -62,6 +62,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             initialRuleset = Ruleset.Value;
             initialMods = Mods.Value.ToList();
 
+            freeModSelectOverlay.SelectedMods.Value = playlist.FirstOrDefault()?.AllowedMods.Select(m => m.CreateCopy()).ToList();
             FooterPanels.Add(freeModSelectOverlay);
         }
 
@@ -76,6 +77,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             item.RequiredMods.Clear();
             item.RequiredMods.AddRange(Mods.Value.Select(m => m.CreateCopy()));
 
+            item.AllowedMods.Clear();
+            item.AllowedMods.AddRange(freeModSelectOverlay.SelectedMods.Value.Select(m => m.CreateCopy()));
+
             // If the client is already in a room, update via the client.
             // Otherwise, update the playlist directly in preparation for it to be submitted to the API on match creation.
             if (client.Room != null)

From c408b46a2158e251d82ce99997d65d2c58c7203f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 27 Jan 2021 22:25:14 +0900
Subject: [PATCH 1131/3722] Add AllowedMods to MultiplayerRoomSettings model

---
 osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
index 857b38ea60..ad624f18ed 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
@@ -25,13 +25,21 @@ namespace osu.Game.Online.Multiplayer
         [NotNull]
         public IEnumerable<APIMod> Mods { get; set; } = Enumerable.Empty<APIMod>();
 
+        [NotNull]
+        public IEnumerable<APIMod> AllowedMods { get; set; } = Enumerable.Empty<APIMod>();
+
         public bool Equals(MultiplayerRoomSettings other)
             => BeatmapID == other.BeatmapID
                && BeatmapChecksum == other.BeatmapChecksum
                && Mods.SequenceEqual(other.Mods)
+               && AllowedMods.SequenceEqual(other.AllowedMods)
                && RulesetID == other.RulesetID
                && Name.Equals(other.Name, StringComparison.Ordinal);
 
-        public override string ToString() => $"Name:{Name} Beatmap:{BeatmapID} ({BeatmapChecksum}) Mods:{string.Join(',', Mods)} Ruleset:{RulesetID}";
+        public override string ToString() => $"Name:{Name}"
+                                             + $" Beatmap:{BeatmapID} ({BeatmapChecksum})"
+                                             + $" Mods:{string.Join(',', Mods)}"
+                                             + $" AllowedMods:{string.Join(',', AllowedMods)}"
+                                             + $" Ruleset:{RulesetID}";
     }
 }

From ff8ee379fb9c1684cdd064a32361f27d8fb6105e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 27 Jan 2021 22:27:31 +0900
Subject: [PATCH 1132/3722] Fix possible nullref

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index 4054d84540..70d3d128dd 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.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 Humanizer;
@@ -38,8 +39,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         [Resolved]
         private StatefulMultiplayerClient client { get; set; }
 
+        private readonly FreeModSelectOverlay freeModSelectOverlay;
         private LoadingLayer loadingLayer;
-        private FreeModSelectOverlay freeModSelectOverlay;
 
         private WorkingBeatmap initialBeatmap;
         private RulesetInfo initialRuleset;
@@ -62,7 +63,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             initialRuleset = Ruleset.Value;
             initialMods = Mods.Value.ToList();
 
-            freeModSelectOverlay.SelectedMods.Value = playlist.FirstOrDefault()?.AllowedMods.Select(m => m.CreateCopy()).ToList();
+            freeModSelectOverlay.SelectedMods.Value = playlist.FirstOrDefault()?.AllowedMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
             FooterPanels.Add(freeModSelectOverlay);
         }
 

From b79d1c7b81ef900087608be126f96b6e49e6bdf0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 27 Jan 2021 22:33:03 +0900
Subject: [PATCH 1133/3722] Add mods to footer

---
 .../OnlinePlay/Multiplayer/FreeModSelectOverlay.cs    |  5 +++++
 .../Multiplayer/MultiplayerMatchSongSelect.cs         | 11 +++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs
index 56e74a8460..10b68ec5a6 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs
@@ -14,6 +14,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
     public class FreeModSelectOverlay : ModSelectOverlay
     {
+        public FreeModSelectOverlay(Func<Mod, bool> isValidMod = null)
+            : base(isValidMod)
+        {
+        }
+
         protected override ModSection CreateModSection(ModType type) => new FreeModSection(type);
 
         private class FreeModSection : ModSection
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index 70d3d128dd..86b8f22d34 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -39,6 +39,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         [Resolved]
         private StatefulMultiplayerClient client { get; set; }
 
+        private readonly Bindable<IReadOnlyList<Mod>> freeMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
+
         private readonly FreeModSelectOverlay freeModSelectOverlay;
         private LoadingLayer loadingLayer;
 
@@ -52,7 +54,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING };
 
-            freeModSelectOverlay = new FreeModSelectOverlay();
+            freeModSelectOverlay = new FreeModSelectOverlay(isValidMod) { SelectedMods = { BindTarget = freeMods } };
         }
 
         [BackgroundDependencyLoader]
@@ -63,7 +65,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             initialRuleset = Ruleset.Value;
             initialMods = Mods.Value.ToList();
 
-            freeModSelectOverlay.SelectedMods.Value = playlist.FirstOrDefault()?.AllowedMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
+            freeMods.Value = playlist.FirstOrDefault()?.AllowedMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
+
             FooterPanels.Add(freeModSelectOverlay);
         }
 
@@ -79,7 +82,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             item.RequiredMods.AddRange(Mods.Value.Select(m => m.CreateCopy()));
 
             item.AllowedMods.Clear();
-            item.AllowedMods.AddRange(freeModSelectOverlay.SelectedMods.Value.Select(m => m.CreateCopy()));
+            item.AllowedMods.AddRange(freeMods.Value.Select(m => m.CreateCopy()));
 
             // If the client is already in a room, update via the client.
             // Otherwise, update the playlist directly in preparation for it to be submitted to the API on match creation.
@@ -132,7 +135,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         protected override IEnumerable<(FooterButton, OverlayContainer)> CreateFooterButtons()
         {
             var buttons = base.CreateFooterButtons().ToList();
-            buttons.Insert(buttons.FindIndex(b => b.Item1 is FooterButtonMods) + 1, (new FooterButtonFreeMods(), freeModSelectOverlay));
+            buttons.Insert(buttons.FindIndex(b => b.Item1 is FooterButtonMods) + 1, (new FooterButtonFreeMods { Current = freeMods }, freeModSelectOverlay));
             return buttons;
         }
 

From 45395cb5e8fcf22d495908f7c77a3b5d90624d98 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 27 Jan 2021 23:00:14 +0900
Subject: [PATCH 1134/3722] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 9ad5946311..f8ce6befd4 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.118.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.127.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 3e971d9d4f..97f4320c95 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -27,7 +27,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.118.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.127.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
     <PackageReference Include="Sentry" Version="2.1.8" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 4732620085..301e7378a6 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.118.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.127.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -88,7 +88,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.118.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.127.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 63f057a525e01e3c58ede431293b124c8b14d70d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 27 Jan 2021 20:45:48 +0300
Subject: [PATCH 1135/3722] Fix dotnet run/publish with runtime specified not
 working again

---
 osu.Desktop/osu.Desktop.csproj | 5 +----
 osu.Game/osu.Game.csproj       | 1 +
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index e201b250d4..cce7907c6c 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -24,16 +24,13 @@
     <ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj" />
   </ItemGroup>
   <ItemGroup Label="Package References">
+    <PackageReference Include="Microsoft.NETCore.Targets" Version="5.0.0" />
     <PackageReference Include="System.IO.Packaging" Version="5.0.0" />
     <PackageReference Include="ppy.squirrel.windows" Version="1.9.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.6" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
     <PackageReference Include="DiscordRichPresence" Version="1.0.169" />
-    <!-- .NET 3.1 SDK seems to cause issues with a runtime specification. This will likely be resolved in .NET 5. -->
-    <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
-    <PackageReference Include="System.Runtime.Handles" Version="4.3.0" />
-    <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
   </ItemGroup>
   <ItemGroup Label="Resources">
     <EmbeddedResource Include="lazer.ico" />
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 97f4320c95..eb541c9de5 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,6 +26,7 @@
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.10" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
+    <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.127.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />

From 2c08ce05fa18828248c1fe45aea502059917c0bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 27 Jan 2021 22:01:56 +0100
Subject: [PATCH 1136/3722] Remove game-local enum [Order] attribute

In favour of the newly-added framework one.
---
 .../BeatmapListing/BeatmapSearchFilterRow.cs  |  4 +-
 .../Overlays/BeatmapListing/SearchLanguage.cs |  2 +-
 .../Overlays/BeatmapSet/Scores/ScoreTable.cs  |  4 +-
 osu.Game/Rulesets/Ruleset.cs                  |  6 +--
 osu.Game/Rulesets/Scoring/HitResult.cs        |  2 +-
 osu.Game/Utils/OrderAttribute.cs              | 52 -------------------
 6 files changed, 9 insertions(+), 61 deletions(-)
 delete mode 100644 osu.Game/Utils/OrderAttribute.cs

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
index b429a5277b..01bcbd3244 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
@@ -12,7 +12,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osuTK;
 using Humanizer;
-using osu.Game.Utils;
+using osu.Framework.Extensions.EnumExtensions;
 
 namespace osu.Game.Overlays.BeatmapListing
 {
@@ -80,7 +80,7 @@ namespace osu.Game.Overlays.BeatmapListing
 
                 if (typeof(T).IsEnum)
                 {
-                    foreach (var val in OrderAttributeUtils.GetValuesInOrder<T>())
+                    foreach (var val in EnumExtensions.GetValuesInOrder<T>())
                         AddItem(val);
                 }
             }
diff --git a/osu.Game/Overlays/BeatmapListing/SearchLanguage.cs b/osu.Game/Overlays/BeatmapListing/SearchLanguage.cs
index eee5d8f7e1..015cee8ce3 100644
--- a/osu.Game/Overlays/BeatmapListing/SearchLanguage.cs
+++ b/osu.Game/Overlays/BeatmapListing/SearchLanguage.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.Utils;
+using osu.Framework.Utils;
 
 namespace osu.Game.Overlays.BeatmapListing
 {
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index 324299ccba..ddd1dfa6cd 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
@@ -15,7 +16,6 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
 using osu.Game.Users.Drawables;
-using osu.Game.Utils;
 using osuTK;
 using osuTK.Graphics;
 
@@ -105,7 +105,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
 
             var ruleset = scores.First().Ruleset.CreateInstance();
 
-            foreach (var result in OrderAttributeUtils.GetValuesInOrder<HitResult>())
+            foreach (var result in EnumExtensions.GetValuesInOrder<HitResult>())
             {
                 if (!allScoreStatistics.Contains(result))
                     continue;
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index b3b3d11ab3..dbc2bd4d01 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -24,9 +24,9 @@ using osu.Game.Skinning;
 using osu.Game.Users;
 using JetBrains.Annotations;
 using osu.Framework.Extensions;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Testing;
 using osu.Game.Screens.Ranking.Statistics;
-using osu.Game.Utils;
 
 namespace osu.Game.Rulesets
 {
@@ -272,7 +272,7 @@ namespace osu.Game.Rulesets
             var validResults = GetValidHitResults();
 
             // enumerate over ordered list to guarantee return order is stable.
-            foreach (var result in OrderAttributeUtils.GetValuesInOrder<HitResult>())
+            foreach (var result in EnumExtensions.GetValuesInOrder<HitResult>())
             {
                 switch (result)
                 {
@@ -298,7 +298,7 @@ namespace osu.Game.Rulesets
         /// <remarks>
         /// <see cref="HitResult.Miss"/> is implicitly included. Special types like <see cref="HitResult.IgnoreHit"/> are ignored even when specified.
         /// </remarks>
-        protected virtual IEnumerable<HitResult> GetValidHitResults() => OrderAttributeUtils.GetValuesInOrder<HitResult>();
+        protected virtual IEnumerable<HitResult> GetValidHitResults() => EnumExtensions.GetValuesInOrder<HitResult>();
 
         /// <summary>
         /// Get a display friendly name for the specified result type.
diff --git a/osu.Game/Rulesets/Scoring/HitResult.cs b/osu.Game/Rulesets/Scoring/HitResult.cs
index 6a3a034fc1..eaa1f95744 100644
--- a/osu.Game/Rulesets/Scoring/HitResult.cs
+++ b/osu.Game/Rulesets/Scoring/HitResult.cs
@@ -3,7 +3,7 @@
 
 using System.ComponentModel;
 using System.Diagnostics;
-using osu.Game.Utils;
+using osu.Framework.Utils;
 
 namespace osu.Game.Rulesets.Scoring
 {
diff --git a/osu.Game/Utils/OrderAttribute.cs b/osu.Game/Utils/OrderAttribute.cs
deleted file mode 100644
index aded7f9814..0000000000
--- a/osu.Game/Utils/OrderAttribute.cs
+++ /dev/null
@@ -1,52 +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.Linq;
-
-namespace osu.Game.Utils
-{
-    public static class OrderAttributeUtils
-    {
-        /// <summary>
-        /// Get values of an enum in order. Supports custom ordering via <see cref="OrderAttribute"/>.
-        /// </summary>
-        public static IEnumerable<T> GetValuesInOrder<T>()
-        {
-            var type = typeof(T);
-
-            if (!type.IsEnum)
-                throw new InvalidOperationException("T must be an enum");
-
-            IEnumerable<T> items = (T[])Enum.GetValues(type);
-
-            if (Attribute.GetCustomAttribute(type, typeof(HasOrderedElementsAttribute)) == null)
-                return items;
-
-            return items.OrderBy(i =>
-            {
-                if (type.GetField(i.ToString()).GetCustomAttributes(typeof(OrderAttribute), false).FirstOrDefault() is OrderAttribute attr)
-                    return attr.Order;
-
-                throw new ArgumentException($"Not all values of {nameof(T)} have {nameof(OrderAttribute)} specified.");
-            });
-        }
-    }
-
-    [AttributeUsage(AttributeTargets.Field)]
-    public class OrderAttribute : Attribute
-    {
-        public readonly int Order;
-
-        public OrderAttribute(int order)
-        {
-            Order = order;
-        }
-    }
-
-    [AttributeUsage(AttributeTargets.Enum)]
-    public class HasOrderedElementsAttribute : Attribute
-    {
-    }
-}

From 90a82f986bcd2ba59f0ebc3ccc95e942a3e5665a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Jan 2021 16:20:16 +0900
Subject: [PATCH 1137/3722] Fallback to using json for signalr communication if
 JIT is unavailable

---
 .../Online/Multiplayer/MultiplayerClient.cs   | 22 +++++++++++++------
 .../Spectator/SpectatorStreamingClient.cs     | 21 ++++++++++++------
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 0d779232d0..c10c4dd1b0 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -9,6 +9,8 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.SignalR.Client;
 using Microsoft.Extensions.DependencyInjection;
+using Newtonsoft.Json;
+using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Logging;
@@ -64,13 +66,19 @@ namespace osu.Game.Online.Multiplayer
             if (connection != null)
                 return;
 
-            connection = new HubConnectionBuilder()
-                         .WithUrl(endpoint, options =>
-                         {
-                             options.Headers.Add("Authorization", $"Bearer {api.AccessToken}");
-                         })
-                         .AddMessagePackProtocol()
-                         .Build();
+            var builder = new HubConnectionBuilder()
+                .WithUrl(endpoint, options => { options.Headers.Add("Authorization", $"Bearer {api.AccessToken}"); });
+
+            if (RuntimeInfo.SupportsJIT)
+                builder.AddMessagePackProtocol();
+            else
+            {
+                // eventuall we will precompile resolvers for messagepack, but this isn't working currently
+                // see https://github.com/neuecc/MessagePack-CSharp/issues/780#issuecomment-768794308.
+                builder.AddNewtonsoftJsonProtocol(options => { options.PayloadSerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; });
+            }
+
+            connection = builder.Build();
 
             // this is kind of SILLY
             // https://github.com/dotnet/aspnetcore/issues/15198
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index dac2131035..7a28c179a8 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -9,6 +9,8 @@ using System.Threading.Tasks;
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.SignalR.Client;
 using Microsoft.Extensions.DependencyInjection;
+using Newtonsoft.Json;
+using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -115,14 +117,19 @@ namespace osu.Game.Online.Spectator
             if (connection != null)
                 return;
 
-            connection = new HubConnectionBuilder()
-                         .WithUrl(endpoint, options =>
-                         {
-                             options.Headers.Add("Authorization", $"Bearer {api.AccessToken}");
-                         })
-                         .AddMessagePackProtocol()
-                         .Build();
+            var builder = new HubConnectionBuilder()
+                .WithUrl(endpoint, options => { options.Headers.Add("Authorization", $"Bearer {api.AccessToken}"); });
 
+            if (RuntimeInfo.SupportsJIT)
+                builder.AddMessagePackProtocol();
+            else
+            {
+                // eventuall we will precompile resolvers for messagepack, but this isn't working currently
+                // see https://github.com/neuecc/MessagePack-CSharp/issues/780#issuecomment-768794308.
+                builder.AddNewtonsoftJsonProtocol(options => { options.PayloadSerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; });
+            }
+
+            connection = builder.Build();
             // until strong typed client support is added, each method must be manually bound (see https://github.com/dotnet/aspnetcore/issues/15198)
             connection.On<int, SpectatorState>(nameof(ISpectatorClient.UserBeganPlaying), ((ISpectatorClient)this).UserBeganPlaying);
             connection.On<int, FrameDataBundle>(nameof(ISpectatorClient.UserSentFrames), ((ISpectatorClient)this).UserSentFrames);

From c3d40440170e98e026bfceaf3dbd25901704e7ca Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Jan 2021 16:53:56 +0900
Subject: [PATCH 1138/3722] Avoid using Dapper to fix iOS compatibility of
 beatmap lookup cache

---
 ...BeatmapManager_BeatmapOnlineLookupQueue.cs | 32 ++++++++++++-------
 osu.Game/osu.Game.csproj                      |  1 -
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs b/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
index e90ccbb805..ea91f2d2e0 100644
--- a/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
@@ -7,7 +7,6 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Dapper;
 using Microsoft.Data.Sqlite;
 using osu.Framework.Development;
 using osu.Framework.IO.Network;
@@ -154,20 +153,31 @@ namespace osu.Game.Beatmaps
                 {
                     using (var db = new SqliteConnection(storage.GetDatabaseConnectionString("online")))
                     {
-                        var found = db.QuerySingleOrDefault<CachedOnlineBeatmapLookup>(
-                            "SELECT * FROM osu_beatmaps WHERE checksum = @MD5Hash OR beatmap_id = @OnlineBeatmapID OR filename = @Path", beatmap);
+                        db.Open();
 
-                        if (found != null)
+                        using (var cmd = db.CreateCommand())
                         {
-                            var status = (BeatmapSetOnlineStatus)found.approved;
+                            cmd.CommandText = "SELECT beatmapset_id, beatmap_id, approved FROM osu_beatmaps WHERE checksum = @MD5Hash OR beatmap_id = @OnlineBeatmapID OR filename = @Path";
 
-                            beatmap.Status = status;
-                            beatmap.BeatmapSet.Status = status;
-                            beatmap.BeatmapSet.OnlineBeatmapSetID = found.beatmapset_id;
-                            beatmap.OnlineBeatmapID = found.beatmap_id;
+                            cmd.Parameters.Add(new SqliteParameter("@MD5Hash", beatmap.MD5Hash));
+                            cmd.Parameters.Add(new SqliteParameter("@OnlineBeatmapID", beatmap.OnlineBeatmapID));
+                            cmd.Parameters.Add(new SqliteParameter("@Path", beatmap.Path));
 
-                            LogForModel(set, $"Cached local retrieval for {beatmap}.");
-                            return true;
+                            using (var reader = cmd.ExecuteReader())
+                            {
+                                if (reader.Read())
+                                {
+                                    var status = (BeatmapSetOnlineStatus)reader.GetByte(2);
+
+                                    beatmap.Status = status;
+                                    beatmap.BeatmapSet.Status = status;
+                                    beatmap.BeatmapSet.OnlineBeatmapSetID = reader.GetInt32(0);
+                                    beatmap.OnlineBeatmapID = reader.GetInt32(1);
+
+                                    LogForModel(set, $"Cached local retrieval for {beatmap}.");
+                                    return true;
+                                }
+                            }
                         }
                     }
                 }
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 97f4320c95..bfc5ff302e 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -18,7 +18,6 @@
     </None>
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="Dapper" Version="2.0.78" />
     <PackageReference Include="DiffPlex" Version="1.6.3" />
     <PackageReference Include="Humanizer" Version="2.8.26" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.10" />

From a616688a47a1d2d1c952eb8fe173cd88f8a64c37 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Jan 2021 23:55:03 +0900
Subject: [PATCH 1139/3722] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index f8ce6befd4..7060e88026 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.127.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.128.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 97f4320c95..a18eef15fc 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -27,7 +27,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.127.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.128.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
     <PackageReference Include="Sentry" Version="2.1.8" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 301e7378a6..48dc01f5de 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.127.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.128.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -88,7 +88,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.127.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.128.0" />
     <PackageReference Include="SharpCompress" Version="0.26.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 386f9f78423f205490c817cab468d09a32d12339 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 28 Jan 2021 22:36:07 +0100
Subject: [PATCH 1140/3722] Fix typos in comments

---
 osu.Game/Online/Multiplayer/MultiplayerClient.cs      | 2 +-
 osu.Game/Online/Spectator/SpectatorStreamingClient.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index c10c4dd1b0..b13d4fa899 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Online.Multiplayer
                 builder.AddMessagePackProtocol();
             else
             {
-                // eventuall we will precompile resolvers for messagepack, but this isn't working currently
+                // eventually we will precompile resolvers for messagepack, but this isn't working currently
                 // see https://github.com/neuecc/MessagePack-CSharp/issues/780#issuecomment-768794308.
                 builder.AddNewtonsoftJsonProtocol(options => { options.PayloadSerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; });
             }
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 7a28c179a8..b95e3f1297 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -124,7 +124,7 @@ namespace osu.Game.Online.Spectator
                 builder.AddMessagePackProtocol();
             else
             {
-                // eventuall we will precompile resolvers for messagepack, but this isn't working currently
+                // eventually we will precompile resolvers for messagepack, but this isn't working currently
                 // see https://github.com/neuecc/MessagePack-CSharp/issues/780#issuecomment-768794308.
                 builder.AddNewtonsoftJsonProtocol(options => { options.PayloadSerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; });
             }

From da4c207a73b4beb25a59237a2e43ce674ed9ec99 Mon Sep 17 00:00:00 2001
From: Corentin PALLARD <corentin.pallard@azeo.com>
Date: Fri, 29 Jan 2021 02:53:26 +0100
Subject: [PATCH 1141/3722] Fix the ctb auto mod speedup in some occasions

---
 osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs b/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
index 32e8ab5da7..ae6868aea5 100644
--- a/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
+++ b/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
@@ -45,6 +45,9 @@ namespace osu.Game.Rulesets.Catch.Replays
                 float positionChange = Math.Abs(lastPosition - h.EffectiveX);
                 double timeAvailable = h.StartTime - lastTime;
 
+                if (timeAvailable < 0)
+                    return;
+
                 // So we can either make it there without a dash or not.
                 // If positionChange is 0, we don't need to move, so speedRequired should also be 0 (could be NaN if timeAvailable is 0 too)
                 // The case where positionChange > 0 and timeAvailable == 0 results in PositiveInfinity which provides expected beheaviour.

From d168de0ae32f0877d225efc13942b96a57a9bba2 Mon Sep 17 00:00:00 2001
From: Corentin PALLARD <corentin.pallard@azeo.com>
Date: Fri, 29 Jan 2021 03:03:23 +0100
Subject: [PATCH 1142/3722] Formatting

---
 osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs b/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
index ae6868aea5..64ded8e94f 100644
--- a/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
+++ b/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
@@ -46,7 +46,9 @@ namespace osu.Game.Rulesets.Catch.Replays
                 double timeAvailable = h.StartTime - lastTime;
 
                 if (timeAvailable < 0)
+                {
                     return;
+                }
 
                 // So we can either make it there without a dash or not.
                 // If positionChange is 0, we don't need to move, so speedRequired should also be 0 (could be NaN if timeAvailable is 0 too)

From 449f883be15956273c5271eef5236dbd95776792 Mon Sep 17 00:00:00 2001
From: Firmatorenio <smeshmunya@gmail.com>
Date: Fri, 29 Jan 2021 11:48:51 +0600
Subject: [PATCH 1143/3722] add SV multiplier adjustment to
 TaikoModDifficultyAdjust

---
 .../Mods/TaikoModDifficultyAdjust.cs          | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModDifficultyAdjust.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModDifficultyAdjust.cs
index 56a73ad7df..1d1773fcbb 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModDifficultyAdjust.cs
@@ -1,11 +1,45 @@
 // Copyright (c) ppy 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.Bindables;
+using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Taiko.Mods
 {
     public class TaikoModDifficultyAdjust : ModDifficultyAdjust
     {
+        [SettingSource("Slider Velocity", "Adjust a beatmap's set SV", LAST_SETTING_ORDER + 1)]
+        public BindableNumber<float> SliderVelocity { get; } = new BindableFloat
+        {
+            Precision = 0.05f,
+            MinValue = 0.25f,
+            MaxValue = 4,
+            Default = 1,
+            Value = 1,
+        };
+
+        public override string SettingDescription
+        {
+            get
+            {
+                string sliderVelocity = SliderVelocity.IsDefault ? string.Empty : $"SV {SliderVelocity.Value:N1}";
+
+                return string.Join(", ", new[]
+                {
+                    base.SettingDescription,
+                    sliderVelocity
+                }.Where(s => !string.IsNullOrEmpty(s)));
+            }
+        }
+
+        protected override void ApplySettings(BeatmapDifficulty difficulty)
+        {
+            base.ApplySettings(difficulty);
+
+            ApplySetting(SliderVelocity, sv => difficulty.SliderMultiplier *= sv);
+        }
     }
 }

From 1ec305e10d4ba70ee06a9f21bb3087e0d2e245e9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Jan 2021 16:06:57 +0900
Subject: [PATCH 1144/3722] Update TaskChain to use ContinueWithSequential
 internally

It turns out we may still want to use TaskChain for its locking
behaviour, so I've made it internally use the refactored version I
implemented, while keeping the general structure.
---
 osu.Game/Utils/TaskChain.cs | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Utils/TaskChain.cs b/osu.Game/Utils/TaskChain.cs
index 30aea7578f..df28faf9fb 100644
--- a/osu.Game/Utils/TaskChain.cs
+++ b/osu.Game/Utils/TaskChain.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using osu.Game.Extensions;
 
 namespace osu.Game.Utils
 {
@@ -14,8 +15,9 @@ namespace osu.Game.Utils
     /// </summary>
     public class TaskChain
     {
-        private readonly object finalTaskLock = new object();
-        private Task? finalTask;
+        private readonly object taskLock = new object();
+
+        private Task lastTaskInChain = Task.CompletedTask;
 
         /// <summary>
         /// Adds a new task to the end of this <see cref="TaskChain"/>.
@@ -23,22 +25,22 @@ namespace osu.Game.Utils
         /// <param name="action">The action to be executed.</param>
         /// <param name="cancellationToken">The <see cref="CancellationToken"/> for this task. Does not affect further tasks in the chain.</param>
         /// <returns>The awaitable <see cref="Task"/>.</returns>
-        public async Task Add(Action action, CancellationToken cancellationToken = default)
+        public Task Add(Action action, CancellationToken cancellationToken = default)
         {
-            Task? previousTask;
-            Task currentTask;
+            lock (taskLock)
+                return lastTaskInChain = lastTaskInChain.ContinueWithSequential(action, cancellationToken);
+        }
 
-            lock (finalTaskLock)
-            {
-                previousTask = finalTask;
-                finalTask = currentTask = new Task(action, cancellationToken);
-            }
-
-            if (previousTask != null)
-                await previousTask;
-
-            currentTask.Start();
-            await currentTask;
+        /// <summary>
+        /// Adds a new task to the end of this <see cref="TaskChain"/>.
+        /// </summary>
+        /// <param name="task">The task to be executed.</param>
+        /// <param name="cancellationToken">The <see cref="CancellationToken"/> for this task. Does not affect further tasks in the chain.</param>
+        /// <returns>The awaitable <see cref="Task"/>.</returns>
+        public Task Add(Func<Task> task, CancellationToken cancellationToken = default)
+        {
+            lock (taskLock)
+                return lastTaskInChain = lastTaskInChain.ContinueWithSequential(task, cancellationToken);
         }
     }
 }

From c3aec3bfe43da7c71c243f2188b39bf24c8233cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Jan 2021 16:20:25 +0900
Subject: [PATCH 1145/3722] Revert test changes to test original class/scope

Importantly, this removes the call to CatchUnobservedExceptions(), which was
outright incorrect (awaiting on the wrong task as a result) in the
original test code.
---
 osu.Game.Tests/NonVisual/TaskChainTest.cs | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/TaskChainTest.cs b/osu.Game.Tests/NonVisual/TaskChainTest.cs
index 342f137dfd..d83eaafe20 100644
--- a/osu.Game.Tests/NonVisual/TaskChainTest.cs
+++ b/osu.Game.Tests/NonVisual/TaskChainTest.cs
@@ -1,28 +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.Threading;
 using System.Threading.Tasks;
 using NUnit.Framework;
-using osu.Game.Extensions;
+using osu.Game.Utils;
 
 namespace osu.Game.Tests.NonVisual
 {
     [TestFixture]
     public class TaskChainTest
     {
-        private Task taskChain;
-
+        private TaskChain taskChain;
         private int currentTask;
         private CancellationTokenSource globalCancellationToken;
 
         [SetUp]
         public void Setup()
         {
-            taskChain = Task.CompletedTask;
-
             globalCancellationToken = new CancellationTokenSource();
+            taskChain = new TaskChain();
             currentTask = 0;
         }
 
@@ -81,16 +78,7 @@ namespace osu.Game.Tests.NonVisual
         {
             var mutex = new ManualResetEventSlim(false);
 
-            var task = taskChain.ContinueWithSequential(async () =>
-            {
-                try
-                {
-                    await Task.Run(() => mutex.Wait(globalCancellationToken.Token));
-                }
-                catch (OperationCanceledException)
-                {
-                }
-            });
+            var task = taskChain.Add(async () => await Task.Run(() => mutex.Wait(globalCancellationToken.Token)));
 
             // Allow task to potentially complete
             Thread.Sleep(1000);
@@ -111,7 +99,7 @@ namespace osu.Game.Tests.NonVisual
             var cancellationSource = new CancellationTokenSource();
             var token = CancellationTokenSource.CreateLinkedTokenSource(cancellationSource.Token, globalCancellationToken.Token);
 
-            taskChain = taskChain.ContinueWithSequential(() =>
+            taskChain.Add(() =>
             {
                 mutex.Wait(globalCancellationToken.Token);
                 completionSource.SetResult(Interlocked.Increment(ref currentTask));

From a61444690ea8324719e4f04f1cb6e02b3706bb19 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Jan 2021 16:32:28 +0900
Subject: [PATCH 1146/3722] Remove all usage of CatchUnobservedExceptions

This should no longer be required with the recent framework side change
that stops a game from crashing on unobserved exceptions
(https://github.com/ppy/osu-framework/pull/4171).
---
 osu.Game/Extensions/TaskExtensions.cs         | 36 -------------------
 .../Multiplayer/StatefulMultiplayerClient.cs  |  3 +-
 .../OnlinePlay/Multiplayer/Multiplayer.cs     |  3 +-
 .../Multiplayer/MultiplayerMatchSubScreen.cs  |  8 +----
 .../Multiplayer/MultiplayerRoomManager.cs     |  3 +-
 .../Participants/ParticipantPanel.cs          |  3 +-
 6 files changed, 5 insertions(+), 51 deletions(-)
 delete mode 100644 osu.Game/Extensions/TaskExtensions.cs

diff --git a/osu.Game/Extensions/TaskExtensions.cs b/osu.Game/Extensions/TaskExtensions.cs
deleted file mode 100644
index 4138c2757a..0000000000
--- a/osu.Game/Extensions/TaskExtensions.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.
-
-#nullable enable
-
-using System;
-using System.Threading.Tasks;
-using osu.Framework.Extensions.ExceptionExtensions;
-using osu.Framework.Logging;
-
-namespace osu.Game.Extensions
-{
-    public static class TaskExtensions
-    {
-        /// <summary>
-        /// Denote a task which is to be run without local error handling logic, where failure is not catastrophic.
-        /// Avoids unobserved exceptions from being fired.
-        /// </summary>
-        /// <param name="task">The task.</param>
-        /// <param name="logAsError">
-        /// Whether errors should be logged as errors visible to users, or as debug messages.
-        /// Logging as debug will essentially silence the errors on non-release builds.
-        /// </param>
-        public static void CatchUnobservedExceptions(this Task task, bool logAsError = false)
-        {
-            task.ContinueWith(t =>
-            {
-                Exception? exception = t.Exception?.AsSingular();
-                if (logAsError)
-                    Logger.Error(exception, $"Error running task: {exception?.Message ?? "(unknown)"}", LoggingTarget.Runtime, true);
-                else
-                    Logger.Log($"Error running task: {exception}", LoggingTarget.Runtime, LogLevel.Debug);
-            }, TaskContinuationOptions.NotOnRanToCompletion);
-        }
-    }
-}
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index f0e11b2b8b..48194d1f0f 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -15,7 +15,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
-using osu.Game.Extensions;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
@@ -104,7 +103,7 @@ namespace osu.Game.Online.Multiplayer
                 if (!connected.NewValue && Room != null)
                 {
                     Logger.Log("Connection to multiplayer server was lost.", LoggingTarget.Runtime, LogLevel.Important);
-                    LeaveRoom().CatchUnobservedExceptions();
+                    LeaveRoom();
                 }
             });
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
index 76f5c74433..ae22e1fcec 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
@@ -4,7 +4,6 @@
 using osu.Framework.Allocation;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
-using osu.Game.Extensions;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
@@ -23,7 +22,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             base.OnResuming(last);
 
             if (client.Room != null)
-                client.ChangeState(MultiplayerUserState.Idle).CatchUnobservedExceptions(true);
+                client.ChangeState(MultiplayerUserState.Idle);
         }
 
         protected override void UpdatePollingRate(bool isIdle)
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 7c4b6d18ec..c071637b9b 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -11,7 +11,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
-using osu.Game.Extensions;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Components;
@@ -237,7 +236,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                           // accessing Exception here silences any potential errors from the antecedent task
                           if (t.Exception != null)
                           {
-                              t.CatchUnobservedExceptions(true); // will run immediately.
                               // gameplay was not started due to an exception; unblock button.
                               endOperation();
                           }
@@ -248,11 +246,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             }
 
             client.ToggleReady()
-                  .ContinueWith(t =>
-                  {
-                      t.CatchUnobservedExceptions(true); // will run immediately.
-                      endOperation();
-                  });
+                  .ContinueWith(t => endOperation());
 
             void endOperation()
             {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
index 61d8896732..65d112a032 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
@@ -9,7 +9,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.ExceptionExtensions;
 using osu.Framework.Logging;
-using osu.Game.Extensions;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Online.Rooms.RoomStatuses;
@@ -69,7 +68,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             base.PartRoom();
 
-            multiplayerClient.LeaveRoom().CatchUnobservedExceptions();
+            multiplayerClient.LeaveRoom();
 
             // Todo: This is not the way to do this. Basically when we're the only participant and the room closes, there's no way to know if this is actually the case.
             // This is delayed one frame because upon exiting the match subscreen, multiplayer updates the polling rate and messes with polling.
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index f99655e305..b5533f49cc 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -10,7 +10,6 @@ using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
-using osu.Game.Extensions;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
@@ -176,7 +175,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
                         if (Room.Host?.UserID != api.LocalUser.Value.Id)
                             return;
 
-                        Client.TransferHost(targetUser).CatchUnobservedExceptions(true);
+                        Client.TransferHost(targetUser);
                     })
                 };
             }

From 37ef5c70729c6f99cf51cc6841eb4833a728e51c Mon Sep 17 00:00:00 2001
From: Firmatorenio <smeshmunya@gmail.com>
Date: Fri, 29 Jan 2021 15:04:55 +0600
Subject: [PATCH 1147/3722] rename SliderVelocity to ScrollSpeed

---
 .../Mods/TaikoModDifficultyAdjust.cs                   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModDifficultyAdjust.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModDifficultyAdjust.cs
index 1d1773fcbb..4006652bd5 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModDifficultyAdjust.cs
@@ -11,8 +11,8 @@ namespace osu.Game.Rulesets.Taiko.Mods
 {
     public class TaikoModDifficultyAdjust : ModDifficultyAdjust
     {
-        [SettingSource("Slider Velocity", "Adjust a beatmap's set SV", LAST_SETTING_ORDER + 1)]
-        public BindableNumber<float> SliderVelocity { get; } = new BindableFloat
+        [SettingSource("Scroll Speed", "Adjust a beatmap's set scroll speed", LAST_SETTING_ORDER + 1)]
+        public BindableNumber<float> ScrollSpeed { get; } = new BindableFloat
         {
             Precision = 0.05f,
             MinValue = 0.25f,
@@ -25,12 +25,12 @@ namespace osu.Game.Rulesets.Taiko.Mods
         {
             get
             {
-                string sliderVelocity = SliderVelocity.IsDefault ? string.Empty : $"SV {SliderVelocity.Value:N1}";
+                string scrollSpeed = ScrollSpeed.IsDefault ? string.Empty : $"Scroll x{ScrollSpeed.Value:N1}";
 
                 return string.Join(", ", new[]
                 {
                     base.SettingDescription,
-                    sliderVelocity
+                    scrollSpeed
                 }.Where(s => !string.IsNullOrEmpty(s)));
             }
         }
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
         {
             base.ApplySettings(difficulty);
 
-            ApplySetting(SliderVelocity, sv => difficulty.SliderMultiplier *= sv);
+            ApplySetting(ScrollSpeed, scroll => difficulty.SliderMultiplier *= scroll);
         }
     }
 }

From ab9a3e6dd05bd4a85ab5d1be0e7acc726148e029 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 29 Jan 2021 18:21:22 +0900
Subject: [PATCH 1148/3722] Pass allowed mods and consume on server callback

---
 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index f0e11b2b8b..e5b07ddfb4 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -192,7 +192,8 @@ namespace osu.Game.Online.Multiplayer
                 BeatmapID = item.GetOr(existingPlaylistItem).BeatmapID,
                 BeatmapChecksum = item.GetOr(existingPlaylistItem).Beatmap.Value.MD5Hash,
                 RulesetID = item.GetOr(existingPlaylistItem).RulesetID,
-                Mods = item.HasValue ? item.Value.AsNonNull().RequiredMods.Select(m => new APIMod(m)).ToList() : Room.Settings.Mods
+                Mods = item.HasValue ? item.Value.AsNonNull().RequiredMods.Select(m => new APIMod(m)).ToList() : Room.Settings.Mods,
+                AllowedMods = item.HasValue ? item.Value.AsNonNull().AllowedMods.Select(m => new APIMod(m)).ToList() : Room.Settings.AllowedMods
             });
         }
 
@@ -502,6 +503,7 @@ namespace osu.Game.Online.Multiplayer
 
             var ruleset = rulesets.GetRuleset(settings.RulesetID).CreateInstance();
             var mods = settings.Mods.Select(m => m.ToMod(ruleset));
+            var allowedMods = settings.AllowedMods.Select(m => m.ToMod(ruleset));
 
             PlaylistItem playlistItem = new PlaylistItem
             {
@@ -511,6 +513,7 @@ namespace osu.Game.Online.Multiplayer
             };
 
             playlistItem.RequiredMods.AddRange(mods);
+            playlistItem.AllowedMods.AddRange(allowedMods);
 
             apiRoom.Playlist.Clear(); // Clearing should be unnecessary, but here for sanity.
             apiRoom.Playlist.Add(playlistItem);

From 18e6afbec06a2111275ba6415eb7d132f52f9ce2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Jan 2021 19:16:10 +0900
Subject: [PATCH 1149/3722] Ensure the item is present before trying to select
 it

---
 .../Overlays/Settings/Sections/SkinSection.cs | 33 ++++++++++++++-----
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 56c677d5b5..7c8309fd56 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -121,7 +121,22 @@ namespace osu.Game.Overlays.Settings.Sections
             });
         }
 
-        private void updateSelectedSkinFromConfig() => dropdownBindable.Value = skinDropdown.Items.Single(s => s.ID == configBindable.Value);
+        private void updateSelectedSkinFromConfig()
+        {
+            int id = configBindable.Value;
+
+            var skin = skinDropdown.Items.FirstOrDefault(s => s.ID == id);
+
+            if (skin == null)
+            {
+                // there may be a thread race condition where an item is selected that hasn't yet been added to the dropdown.
+                // to avoid adding complexity, let's just ensure the item is added so we can perform the selection.
+                skin = skins.Query(s => s.ID == id);
+                addItem(skin);
+            }
+
+            dropdownBindable.Value = skin;
+        }
 
         private void updateItems()
         {
@@ -134,14 +149,14 @@ namespace osu.Game.Overlays.Settings.Sections
         private void itemUpdated(ValueChangedEvent<WeakReference<SkinInfo>> weakItem)
         {
             if (weakItem.NewValue.TryGetTarget(out var item))
-            {
-                Schedule(() =>
-                {
-                    List<SkinInfo> newDropdownItems = skinDropdown.Items.Where(i => !i.Equals(item)).Append(item).ToList();
-                    sortUserSkins(newDropdownItems);
-                    skinDropdown.Items = newDropdownItems;
-                });
-            }
+                Schedule(() => addItem(item));
+        }
+
+        private void addItem(SkinInfo item)
+        {
+            List<SkinInfo> newDropdownItems = skinDropdown.Items.Where(i => !i.Equals(item)).Append(item).ToList();
+            sortUserSkins(newDropdownItems);
+            skinDropdown.Items = newDropdownItems;
         }
 
         private void itemRemoved(ValueChangedEvent<WeakReference<SkinInfo>> weakItem)

From 16f3d1815f27a344ca2e9a662f960f97ef4db666 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Jan 2021 19:53:56 +0900
Subject: [PATCH 1150/3722] Fix SQLite exception thrown is a beatmap lookup is
 attempted without an OnlineBeatmapID present
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It turns out the SQLite API isn't smart enough to handle nullables
directly, so we need to help it out a bit.

Stops the following from being thrown:

```
System.InvalidOperationException: Value must be set.
   at Microsoft.Data.Sqlite.SqliteParameter.Bind(sqlite3_stmt stmt) = 3
at
   at Microsoft.Data.Sqlite.SqliteParameterCollection.Bind(sqlite3_stmt
stmt) = 3 at
   at Microsoft.Data.Sqlite.SqliteCommand.ExecuteReader(CommandBehavior
behavior)
   at Microsoft.Data.Sqlite.SqliteCommand.ExecuteReader()
   at
osu.Game.Beatmaps.BeatmapManager.BeatmapOnlineLookupQueue.checkLocalCache(BeatmapSetInfo
set, BeatmapInfo beatmap) in
/Users/dean/Projects/osu/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs:line
166 = 166
```
---
 osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs b/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
index ea91f2d2e0..7c4b344c9e 100644
--- a/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
@@ -160,7 +160,7 @@ namespace osu.Game.Beatmaps
                             cmd.CommandText = "SELECT beatmapset_id, beatmap_id, approved FROM osu_beatmaps WHERE checksum = @MD5Hash OR beatmap_id = @OnlineBeatmapID OR filename = @Path";
 
                             cmd.Parameters.Add(new SqliteParameter("@MD5Hash", beatmap.MD5Hash));
-                            cmd.Parameters.Add(new SqliteParameter("@OnlineBeatmapID", beatmap.OnlineBeatmapID));
+                            cmd.Parameters.Add(new SqliteParameter("@OnlineBeatmapID", beatmap.OnlineBeatmapID ?? (object)DBNull.Value));
                             cmd.Parameters.Add(new SqliteParameter("@Path", beatmap.Path));
 
                             using (var reader = cmd.ExecuteReader())

From f25809d35f9fd084f7486bab8066dc0da6b59347 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Jan 2021 19:55:51 +0900
Subject: [PATCH 1151/3722] Ensure spinners only handle input during their
 hittable time

While this was already being enforced inside of `CheckForResult`, the
internal tracking values of rotation were still being incremented as
long as the `DrawableSpinner` was present. This resulted in incorrect
SPM values being displayed if a user was to start spinning before the
object's `StartTime`.

Kind of annoying to write a test for (there's no setup for spinners yet)
but am willing to do so if that is deemed necessary.

Closes https://github.com/ppy/osu/issues/11600.
---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 56aedebed3..43012563ae 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -18,6 +18,7 @@ using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Skinning;
 using osu.Game.Rulesets.Osu.Skinning.Default;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Screens.Edit.Compose.Components;
 using osu.Game.Screens.Ranking;
 using osu.Game.Skinning;
 
@@ -242,6 +243,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.Update();
 
+            HandleUserInput = Time.Current >= HitObject.StartTime && Time.Current <= HitObject.EndTime;
+
             if (HandleUserInput)
                 RotationTracker.Tracking = !Result.HasResult && (OsuActionInputManager?.PressedActions.Any(x => x == OsuAction.LeftButton || x == OsuAction.RightButton) ?? false);
 
@@ -255,6 +258,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             if (!SpmCounter.IsPresent && RotationTracker.Tracking)
                 SpmCounter.FadeIn(HitObject.TimeFadeIn);
+
             SpmCounter.SetRotation(Result.RateAdjustedRotation);
 
             updateBonusScore();

From 5a306dfc2b261e5926817eb03352a11ec846c1ee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Jan 2021 20:22:25 +0900
Subject: [PATCH 1152/3722] Fix unused using

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 43012563ae..ab8156f4f2 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -18,7 +18,6 @@ using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Skinning;
 using osu.Game.Rulesets.Osu.Skinning.Default;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Screens.Edit.Compose.Components;
 using osu.Game.Screens.Ranking;
 using osu.Game.Skinning;
 

From d521bfc251195a4eb5560d9685181bf079602d46 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 30 Jan 2021 02:35:11 +0900
Subject: [PATCH 1153/3722] Don't directly update HandleUserInput (as it is
 used by mods)

---
 .../Objects/Drawables/DrawableSpinner.cs              | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index ab8156f4f2..c58f703bef 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -242,10 +242,15 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.Update();
 
-            HandleUserInput = Time.Current >= HitObject.StartTime && Time.Current <= HitObject.EndTime;
-
             if (HandleUserInput)
-                RotationTracker.Tracking = !Result.HasResult && (OsuActionInputManager?.PressedActions.Any(x => x == OsuAction.LeftButton || x == OsuAction.RightButton) ?? false);
+            {
+                bool isValidSpinningTime = Time.Current >= HitObject.StartTime && Time.Current <= HitObject.EndTime;
+                bool correctButtonPressed = (OsuActionInputManager?.PressedActions.Any(x => x == OsuAction.LeftButton || x == OsuAction.RightButton) ?? false);
+
+                RotationTracker.Tracking = !Result.HasResult
+                                           && correctButtonPressed
+                                           && isValidSpinningTime;
+            }
 
             if (spinningSample != null && spinnerFrequencyModulate)
                 spinningSample.Frequency.Value = spinning_sample_modulated_base_frequency + Progress;

From ae08ef25437efd3e6aa6661a8d1d627cff338a19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 29 Jan 2021 20:32:45 +0100
Subject: [PATCH 1154/3722] Reset SPM counter state on DHO application

---
 .../Skinning/Default/SpinnerSpmCounter.cs     | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs
index e5952ecf97..69355f624b 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs
@@ -4,16 +4,21 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Utils;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
     public class SpinnerSpmCounter : Container
     {
+        [Resolved]
+        private DrawableHitObject drawableSpinner { get; set; }
+
         private readonly OsuSpriteText spmText;
 
         public SpinnerSpmCounter()
@@ -38,6 +43,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             };
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            drawableSpinner.HitObjectApplied += resetState;
+        }
+
         private double spm;
 
         public double SpinsPerMinute
@@ -82,5 +93,19 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
             records.Enqueue(new RotationRecord { Rotation = currentRotation, Time = Time.Current });
         }
+
+        private void resetState(DrawableHitObject hitObject)
+        {
+            SpinsPerMinute = 0;
+            records.Clear();
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (drawableSpinner != null)
+                drawableSpinner.HitObjectApplied -= resetState;
+        }
     }
 }

From c3ba92f057349d56c79906bd96ab0de8b67e0fa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 30 Jan 2021 16:13:50 +0100
Subject: [PATCH 1155/3722] Set canceled result in scheduleAsync

Was holding up the task completion source, and in consequence,
potentially the entire task chain.
---
 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 4bec327884..de51a4b117 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -551,7 +551,10 @@ namespace osu.Game.Online.Multiplayer
             Scheduler.Add(() =>
             {
                 if (cancellationToken.IsCancellationRequested)
+                {
+                    tcs.SetCanceled();
                     return;
+                }
 
                 try
                 {

From 0aaa62efc2d9f2d1e8f6d46632661b0e6ef8db03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 30 Jan 2021 20:55:56 +0100
Subject: [PATCH 1156/3722] Add failing test case

---
 .../NonVisual/OngoingOperationTrackerTest.cs  | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/osu.Game.Tests/NonVisual/OngoingOperationTrackerTest.cs b/osu.Game.Tests/NonVisual/OngoingOperationTrackerTest.cs
index eef9582af9..10216c3339 100644
--- a/osu.Game.Tests/NonVisual/OngoingOperationTrackerTest.cs
+++ b/osu.Game.Tests/NonVisual/OngoingOperationTrackerTest.cs
@@ -3,8 +3,12 @@
 
 using System;
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Screens;
 using osu.Framework.Testing;
+using osu.Game.Screens;
 using osu.Game.Screens.OnlinePlay;
 using osu.Game.Tests.Visual;
 
@@ -58,5 +62,45 @@ namespace osu.Game.Tests.NonVisual
             AddStep("end operation", () => operation.Dispose());
             AddAssert("operation is ended", () => !operationInProgress.Value);
         }
+
+        [Test]
+        public void TestOperationDisposalAfterScreenExit()
+        {
+            TestScreenWithTracker screen = null;
+            OsuScreenStack stack;
+            IDisposable operation = null;
+
+            AddStep("create screen with tracker", () =>
+            {
+                Child = stack = new OsuScreenStack
+                {
+                    RelativeSizeAxes = Axes.Both
+                };
+
+                stack.Push(screen = new TestScreenWithTracker());
+            });
+            AddUntilStep("wait for loaded", () => screen.IsLoaded);
+
+            AddStep("begin operation", () => operation = screen.OngoingOperationTracker.BeginOperation());
+            AddAssert("operation in progress", () => screen.OngoingOperationTracker.InProgress.Value);
+
+            AddStep("dispose after screen exit", () =>
+            {
+                screen.Exit();
+                operation.Dispose();
+            });
+            AddAssert("operation ended", () => !screen.OngoingOperationTracker.InProgress.Value);
+        }
+
+        private class TestScreenWithTracker : OsuScreen
+        {
+            public OngoingOperationTracker OngoingOperationTracker { get; private set; }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                InternalChild = OngoingOperationTracker = new OngoingOperationTracker();
+            }
+        }
     }
 }

From 96f56d1c942505797f20cf1c166b5452c60ea592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 30 Jan 2021 21:00:13 +0100
Subject: [PATCH 1157/3722] Return tracker lease via UnbindAll()

Improves reliability by being fail-safe in case of multiple returns,
which can happen if the operation tracker is part of a screen being
exited (as is the case with its current primary usage in multiplayer).
---
 .../Screens/OnlinePlay/OngoingOperationTracker.cs | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
index b7ee84eb9e..9e88fabb3d 100644
--- a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
+++ b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
@@ -53,20 +53,15 @@ namespace osu.Game.Screens.OnlinePlay
             // for extra safety, marshal the end of operation back to the update thread if necessary.
             Scheduler.Add(() =>
             {
-                leasedInProgress?.Return();
+                // UnbindAll() is purposefully used instead of Return() - the two do roughly the same thing, with one difference:
+                // the former won't throw if the lease has already been returned before.
+                // this matters because framework can unbind the lease via the internal UnbindAllBindables(), which is not always detectable
+                // (it is in the case of disposal, but not in the case of screen exit - at least not cleanly).
+                leasedInProgress?.UnbindAll();
                 leasedInProgress = null;
             }, false);
         }
 
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-
-            // base call does an UnbindAllBindables().
-            // clean up the leased reference here so that it doesn't get returned twice.
-            leasedInProgress = null;
-        }
-
         private class OngoingOperation : IDisposable
         {
             private readonly OngoingOperationTracker tracker;

From 5f320cd4264ad444fe5cb3f7aa7bef74d530e932 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 30 Jan 2021 21:03:09 +0100
Subject: [PATCH 1158/3722] Move lease check inside schedule

Theoretically safer due to avoiding a potential data race (change in
`leasedInProgress` between the time of the check and start of schedule
execution).
---
 osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
index 9e88fabb3d..aabeafe460 100644
--- a/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
+++ b/osu.Game/Screens/OnlinePlay/OngoingOperationTracker.cs
@@ -47,12 +47,12 @@ namespace osu.Game.Screens.OnlinePlay
 
         private void endOperationWithKnownLease(LeasedBindable<bool> lease)
         {
-            if (lease != leasedInProgress)
-                return;
-
             // for extra safety, marshal the end of operation back to the update thread if necessary.
             Scheduler.Add(() =>
             {
+                if (lease != leasedInProgress)
+                    return;
+
                 // UnbindAll() is purposefully used instead of Return() - the two do roughly the same thing, with one difference:
                 // the former won't throw if the lease has already been returned before.
                 // this matters because framework can unbind the lease via the internal UnbindAllBindables(), which is not always detectable

From 90ba8ae234bbec60aab5b42f9cd625eb8e2d2f02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 30 Jan 2021 23:39:01 +0100
Subject: [PATCH 1159/3722] Don't part room if join task was cancelled

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

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
index 65d112a032..1e57847f04 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             {
                 if (t.IsCompletedSuccessfully)
                     Schedule(() => onSuccess?.Invoke(room));
-                else
+                else if (t.IsFaulted)
                 {
                     const string message = "Failed to join multiplayer room.";
 

From d7e5a212134e371838ee342ecb476bdcc0347c6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 31 Jan 2021 15:23:53 +0100
Subject: [PATCH 1160/3722] Add failing test case

---
 .../Formats/LegacyStoryboardDecoderTest.cs    | 20 +++++++++++++++++++
 osu.Game.Tests/Resources/animation-types.osb  |  9 +++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 osu.Game.Tests/Resources/animation-types.osb

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
index 7bee580863..bcde899789 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
@@ -129,5 +129,25 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.AreEqual(3456, ((StoryboardSprite)background.Elements.Single()).InitialPosition.X);
             }
         }
+
+        [Test]
+        public void TestDecodeOutOfRangeLoopAnimationType()
+        {
+            var decoder = new LegacyStoryboardDecoder();
+
+            using (var resStream = TestResources.OpenResource("animation-types.osb"))
+            using (var stream = new LineBufferedReader(resStream))
+            {
+                var storyboard = decoder.Decode(stream);
+
+                StoryboardLayer foreground = storyboard.Layers.Single(l => l.Depth == 0);
+                Assert.AreEqual(AnimationLoopType.LoopForever, ((StoryboardAnimation)foreground.Elements[0]).LoopType);
+                Assert.AreEqual(AnimationLoopType.LoopOnce, ((StoryboardAnimation)foreground.Elements[1]).LoopType);
+                Assert.AreEqual(AnimationLoopType.LoopForever, ((StoryboardAnimation)foreground.Elements[2]).LoopType);
+                Assert.AreEqual(AnimationLoopType.LoopOnce, ((StoryboardAnimation)foreground.Elements[3]).LoopType);
+                Assert.AreEqual(AnimationLoopType.LoopForever, ((StoryboardAnimation)foreground.Elements[4]).LoopType);
+                Assert.AreEqual(AnimationLoopType.LoopForever, ((StoryboardAnimation)foreground.Elements[5]).LoopType);
+            }
+        }
     }
 }
diff --git a/osu.Game.Tests/Resources/animation-types.osb b/osu.Game.Tests/Resources/animation-types.osb
new file mode 100644
index 0000000000..82233b7d30
--- /dev/null
+++ b/osu.Game.Tests/Resources/animation-types.osb
@@ -0,0 +1,9 @@
+osu file format v14
+
+[Events]
+Animation,Foreground,Centre,"forever-string.png",330,240,10,108,LoopForever
+Animation,Foreground,Centre,"once-string.png",330,240,10,108,LoopOnce
+Animation,Foreground,Centre,"forever-number.png",330,240,10,108,0
+Animation,Foreground,Centre,"once-number.png",330,240,10,108,1
+Animation,Foreground,Centre,"undefined-number.png",330,240,10,108,16
+Animation,Foreground,Centre,"omitted.png",330,240,10,108

From b9a49d5589dfd91e651ad84c0872401e27ab192e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 31 Jan 2021 15:33:07 +0100
Subject: [PATCH 1161/3722] Coerce undefined animation loop types to Forever

---
 osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
index 9a244c8bb2..b9bf6823b5 100644
--- a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
@@ -139,7 +139,7 @@ namespace osu.Game.Beatmaps.Formats
                             // this is random as hell but taken straight from osu-stable.
                             frameDelay = Math.Round(0.015 * frameDelay) * 1.186 * (1000 / 60f);
 
-                        var loopType = split.Length > 8 ? (AnimationLoopType)Enum.Parse(typeof(AnimationLoopType), split[8]) : AnimationLoopType.LoopForever;
+                        var loopType = split.Length > 8 ? parseAnimationLoopType(split[8]) : AnimationLoopType.LoopForever;
                         storyboardSprite = new StoryboardAnimation(path, origin, new Vector2(x, y), frameCount, frameDelay, loopType);
                         storyboard.GetLayer(layer).Add(storyboardSprite);
                         break;
@@ -341,6 +341,12 @@ namespace osu.Game.Beatmaps.Formats
             }
         }
 
+        private AnimationLoopType parseAnimationLoopType(string value)
+        {
+            var parsed = (AnimationLoopType)Enum.Parse(typeof(AnimationLoopType), value);
+            return Enum.IsDefined(typeof(AnimationLoopType), parsed) ? parsed : AnimationLoopType.LoopForever;
+        }
+
         private void handleVariables(string line)
         {
             var pair = SplitKeyVal(line, '=');

From 81b052b866af6422434f96638dabace022618f95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 31 Jan 2021 20:18:12 +0100
Subject: [PATCH 1162/3722] Add failing test cases

---
 .../Rulesets/Mods/ModTimeRampTest.cs          | 82 +++++++++++++++++++
 osu.Game/Rulesets/Mods/ModTimeRamp.cs         |  4 +-
 2 files changed, 84 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Tests/Rulesets/Mods/ModTimeRampTest.cs

diff --git a/osu.Game.Tests/Rulesets/Mods/ModTimeRampTest.cs b/osu.Game.Tests/Rulesets/Mods/ModTimeRampTest.cs
new file mode 100644
index 0000000000..894648b8b3
--- /dev/null
+++ b/osu.Game.Tests/Rulesets/Mods/ModTimeRampTest.cs
@@ -0,0 +1,82 @@
+// Copyright (c) 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.Audio.Track;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu.Objects;
+
+namespace osu.Game.Tests.Rulesets.Mods
+{
+    [TestFixture]
+    public class ModTimeRampTest
+    {
+        private const double start_time = 1000;
+        private const double duration = 9000;
+
+        private TrackVirtual track;
+        private IBeatmap beatmap;
+
+        [SetUp]
+        public void SetUp()
+        {
+            track = new TrackVirtual(20_000);
+            beatmap = new Beatmap
+            {
+                HitObjects =
+                {
+                    new Spinner
+                    {
+                        StartTime = start_time,
+                        Duration = duration
+                    }
+                }
+            };
+        }
+
+        [TestCase(0, 1)]
+        [TestCase(start_time, 1)]
+        [TestCase(start_time + duration * ModTimeRamp.FINAL_RATE_PROGRESS / 2, 1.25)]
+        [TestCase(start_time + duration * ModTimeRamp.FINAL_RATE_PROGRESS, 1.5)]
+        [TestCase(start_time + duration, 1.5)]
+        [TestCase(15000, 1.5)]
+        public void TestModWindUp(double time, double expectedRate)
+        {
+            var mod = new ModWindUp();
+            mod.ApplyToBeatmap(beatmap);
+            mod.ApplyToTrack(track);
+
+            seekTrackAndUpdateMod(mod, time);
+
+            Assert.That(mod.SpeedChange.Value, Is.EqualTo(expectedRate));
+        }
+
+        [TestCase(0, 1)]
+        [TestCase(start_time, 1)]
+        [TestCase(start_time + duration * ModTimeRamp.FINAL_RATE_PROGRESS / 2, 0.75)]
+        [TestCase(start_time + duration * ModTimeRamp.FINAL_RATE_PROGRESS, 0.5)]
+        [TestCase(start_time + duration, 0.5)]
+        [TestCase(15000, 0.5)]
+        public void TestModWindDown(double time, double expectedRate)
+        {
+            var mod = new ModWindDown
+            {
+                FinalRate = { Value = 0.5 }
+            };
+            mod.ApplyToBeatmap(beatmap);
+            mod.ApplyToTrack(track);
+
+            seekTrackAndUpdateMod(mod, time);
+
+            Assert.That(mod.SpeedChange.Value, Is.EqualTo(expectedRate));
+        }
+
+        private void seekTrackAndUpdateMod(ModTimeRamp mod, double time)
+        {
+            track.Seek(time);
+            // update the mod via a fake playfield to re-calculate the current rate.
+            mod.Update(null);
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index 4d43ae73d3..c691339a81 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Mods
         /// <summary>
         /// The point in the beatmap at which the final ramping rate should be reached.
         /// </summary>
-        private const double final_rate_progress = 0.75f;
+        public const double FINAL_RATE_PROGRESS = 0.75f;
 
         [SettingSource("Initial rate", "The starting speed of the track")]
         public abstract BindableNumber<double> InitialRate { get; }
@@ -71,7 +71,7 @@ namespace osu.Game.Rulesets.Mods
             SpeedChange.SetDefault();
 
             beginRampTime = beatmap.HitObjects.FirstOrDefault()?.StartTime ?? 0;
-            finalRateTime = final_rate_progress * (lastObject?.GetEndTime() ?? 0);
+            finalRateTime = FINAL_RATE_PROGRESS * (lastObject?.GetEndTime() ?? 0);
         }
 
         public virtual void Update(Playfield playfield)

From 547b3d8bed86d1398da54ea3d6ffcca8f883763b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 31 Jan 2021 20:34:56 +0100
Subject: [PATCH 1163/3722] Fix speed change calculation in time ramp mods

---
 osu.Game/Rulesets/Mods/ModTimeRamp.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index c691339a81..a28a0351a6 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -66,17 +66,18 @@ namespace osu.Game.Rulesets.Mods
 
         public virtual void ApplyToBeatmap(IBeatmap beatmap)
         {
-            HitObject lastObject = beatmap.HitObjects.LastOrDefault();
-
             SpeedChange.SetDefault();
 
-            beginRampTime = beatmap.HitObjects.FirstOrDefault()?.StartTime ?? 0;
-            finalRateTime = FINAL_RATE_PROGRESS * (lastObject?.GetEndTime() ?? 0);
+            double firstObjectStart = beatmap.HitObjects.FirstOrDefault()?.StartTime ?? 0;
+            double lastObjectEnd = beatmap.HitObjects.LastOrDefault()?.GetEndTime() ?? 0;
+
+            beginRampTime = firstObjectStart;
+            finalRateTime = firstObjectStart + FINAL_RATE_PROGRESS * (lastObjectEnd - firstObjectStart);
         }
 
         public virtual void Update(Playfield playfield)
         {
-            applyRateAdjustment((track.CurrentTime - beginRampTime) / finalRateTime);
+            applyRateAdjustment((track.CurrentTime - beginRampTime) / (finalRateTime - beginRampTime));
         }
 
         /// <summary>

From a0de1cbfd07447789c4093d67c10e782e6463725 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 31 Jan 2021 21:09:41 +0100
Subject: [PATCH 1164/3722] Handle no-duration single-object edge case

---
 .../Rulesets/Mods/ModTimeRampTest.cs          | 55 +++++++++++++++----
 osu.Game/Rulesets/Mods/ModTimeRamp.cs         |  2 +-
 2 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Rulesets/Mods/ModTimeRampTest.cs b/osu.Game.Tests/Rulesets/Mods/ModTimeRampTest.cs
index 894648b8b3..4b9f2181dc 100644
--- a/osu.Game.Tests/Rulesets/Mods/ModTimeRampTest.cs
+++ b/osu.Game.Tests/Rulesets/Mods/ModTimeRampTest.cs
@@ -16,23 +16,11 @@ namespace osu.Game.Tests.Rulesets.Mods
         private const double duration = 9000;
 
         private TrackVirtual track;
-        private IBeatmap beatmap;
 
         [SetUp]
         public void SetUp()
         {
             track = new TrackVirtual(20_000);
-            beatmap = new Beatmap
-            {
-                HitObjects =
-                {
-                    new Spinner
-                    {
-                        StartTime = start_time,
-                        Duration = duration
-                    }
-                }
-            };
         }
 
         [TestCase(0, 1)]
@@ -43,6 +31,7 @@ namespace osu.Game.Tests.Rulesets.Mods
         [TestCase(15000, 1.5)]
         public void TestModWindUp(double time, double expectedRate)
         {
+            var beatmap = createSingleSpinnerBeatmap();
             var mod = new ModWindUp();
             mod.ApplyToBeatmap(beatmap);
             mod.ApplyToTrack(track);
@@ -60,6 +49,7 @@ namespace osu.Game.Tests.Rulesets.Mods
         [TestCase(15000, 0.5)]
         public void TestModWindDown(double time, double expectedRate)
         {
+            var beatmap = createSingleSpinnerBeatmap();
             var mod = new ModWindDown
             {
                 FinalRate = { Value = 0.5 }
@@ -72,11 +62,52 @@ namespace osu.Game.Tests.Rulesets.Mods
             Assert.That(mod.SpeedChange.Value, Is.EqualTo(expectedRate));
         }
 
+        [TestCase(0, 1)]
+        [TestCase(start_time, 1)]
+        [TestCase(2 * start_time, 1.5)]
+        public void TestZeroDurationMap(double time, double expectedRate)
+        {
+            var beatmap = createSingleObjectBeatmap();
+            var mod = new ModWindUp();
+            mod.ApplyToBeatmap(beatmap);
+            mod.ApplyToTrack(track);
+
+            seekTrackAndUpdateMod(mod, time);
+
+            Assert.That(mod.SpeedChange.Value, Is.EqualTo(expectedRate));
+        }
+
         private void seekTrackAndUpdateMod(ModTimeRamp mod, double time)
         {
             track.Seek(time);
             // update the mod via a fake playfield to re-calculate the current rate.
             mod.Update(null);
         }
+
+        private static Beatmap createSingleSpinnerBeatmap()
+        {
+            return new Beatmap
+            {
+                HitObjects =
+                {
+                    new Spinner
+                    {
+                        StartTime = start_time,
+                        Duration = duration
+                    }
+                }
+            };
+        }
+
+        private static Beatmap createSingleObjectBeatmap()
+        {
+            return new Beatmap
+            {
+                HitObjects =
+                {
+                    new HitCircle { StartTime = start_time }
+                }
+            };
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index a28a0351a6..b6916c838e 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -77,7 +77,7 @@ namespace osu.Game.Rulesets.Mods
 
         public virtual void Update(Playfield playfield)
         {
-            applyRateAdjustment((track.CurrentTime - beginRampTime) / (finalRateTime - beginRampTime));
+            applyRateAdjustment((track.CurrentTime - beginRampTime) / Math.Max(1, finalRateTime - beginRampTime));
         }
 
         /// <summary>

From 39d46d21e6e2453121e513a2025cd6c5a2bd9ba9 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 31 Jan 2021 23:44:27 +0300
Subject: [PATCH 1165/3722] Add failing test case

---
 .../Online/TestSceneStandAloneChatDisplay.cs  | 116 ++++++++++++------
 1 file changed, 80 insertions(+), 36 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
index 492abdd88d..02ef024128 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
@@ -8,6 +8,7 @@ using osu.Game.Users;
 using osuTK;
 using System;
 using System.Linq;
+using NUnit.Framework;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.Containers;
 using osu.Game.Overlays.Chat;
@@ -16,8 +17,6 @@ namespace osu.Game.Tests.Visual.Online
 {
     public class TestSceneStandAloneChatDisplay : OsuTestScene
     {
-        private readonly Channel testChannel = new Channel();
-
         private readonly User admin = new User
         {
             Username = "HappyStick",
@@ -46,78 +45,84 @@ namespace osu.Game.Tests.Visual.Online
         [Cached]
         private ChannelManager channelManager = new ChannelManager();
 
-        private readonly TestStandAloneChatDisplay chatDisplay;
-        private readonly TestStandAloneChatDisplay chatDisplay2;
+        private TestStandAloneChatDisplay chatDisplay;
+        private TestStandAloneChatDisplay chatDisplay2;
+        private int messageIdSequence;
+
+        private Channel testChannel;
 
         public TestSceneStandAloneChatDisplay()
         {
             Add(channelManager);
-
-            Add(chatDisplay = new TestStandAloneChatDisplay
-            {
-                Anchor = Anchor.CentreLeft,
-                Origin = Anchor.CentreLeft,
-                Margin = new MarginPadding(20),
-                Size = new Vector2(400, 80)
-            });
-
-            Add(chatDisplay2 = new TestStandAloneChatDisplay(true)
-            {
-                Anchor = Anchor.CentreRight,
-                Origin = Anchor.CentreRight,
-                Margin = new MarginPadding(20),
-                Size = new Vector2(400, 150)
-            });
         }
 
-        protected override void LoadComplete()
+        [SetUp]
+        public void SetUp() => Schedule(() =>
         {
-            base.LoadComplete();
+            messageIdSequence = 0;
+            channelManager.CurrentChannel.Value = testChannel = new Channel();
 
-            channelManager.CurrentChannel.Value = testChannel;
+            Children = new[]
+            {
+                chatDisplay = new TestStandAloneChatDisplay
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Margin = new MarginPadding(20),
+                    Size = new Vector2(400, 80),
+                    Channel = { Value = testChannel },
+                },
+                chatDisplay2 = new TestStandAloneChatDisplay(true)
+                {
+                    Anchor = Anchor.CentreRight,
+                    Origin = Anchor.CentreRight,
+                    Margin = new MarginPadding(20),
+                    Size = new Vector2(400, 150),
+                    Channel = { Value = testChannel },
+                }
+            };
+        });
 
-            chatDisplay.Channel.Value = testChannel;
-            chatDisplay2.Channel.Value = testChannel;
-
-            int sequence = 0;
-
-            AddStep("message from admin", () => testChannel.AddNewMessages(new Message(sequence++)
+        [Test]
+        public void TestManyMessages()
+        {
+            AddStep("message from admin", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
             {
                 Sender = admin,
                 Content = "I am a wang!"
             }));
 
-            AddStep("message from team red", () => testChannel.AddNewMessages(new Message(sequence++)
+            AddStep("message from team red", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
             {
                 Sender = redUser,
                 Content = "I am team red."
             }));
 
-            AddStep("message from team red", () => testChannel.AddNewMessages(new Message(sequence++)
+            AddStep("message from team red", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
             {
                 Sender = redUser,
                 Content = "I plan to win!"
             }));
 
-            AddStep("message from team blue", () => testChannel.AddNewMessages(new Message(sequence++)
+            AddStep("message from team blue", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
             {
                 Sender = blueUser,
                 Content = "Not on my watch. Prepare to eat saaaaaaaaaand. Lots and lots of saaaaaaand."
             }));
 
-            AddStep("message from admin", () => testChannel.AddNewMessages(new Message(sequence++)
+            AddStep("message from admin", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
             {
                 Sender = admin,
                 Content = "Okay okay, calm down guys. Let's do this!"
             }));
 
-            AddStep("message from long username", () => testChannel.AddNewMessages(new Message(sequence++)
+            AddStep("message from long username", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
             {
                 Sender = longUsernameUser,
                 Content = "Hi guys, my new username is lit!"
             }));
 
-            AddStep("message with new date", () => testChannel.AddNewMessages(new Message(sequence++)
+            AddStep("message with new date", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
             {
                 Sender = longUsernameUser,
                 Content = "Message from the future!",
@@ -131,7 +136,7 @@ namespace osu.Game.Tests.Visual.Online
             {
                 for (int i = 0; i < messages_per_call; i++)
                 {
-                    testChannel.AddNewMessages(new Message(sequence++)
+                    testChannel.AddNewMessages(new Message(messageIdSequence++)
                     {
                         Sender = longUsernameUser,
                         Content = "Many messages! " + Guid.NewGuid(),
@@ -156,6 +161,45 @@ namespace osu.Game.Tests.Visual.Online
             AddUntilStep("ensure still scrolled to bottom", () => chatDisplay.ScrolledToBottom);
         }
 
+        /// <summary>
+        /// Tests that when a message gets wrapped by the chat display getting contracted while scrolled to bottom, the chat will still keep scrolling down.
+        /// </summary>
+        [Test]
+        public void TestMessageWrappingKeepsAutoScrolling()
+        {
+            AddStep("fill chat", () =>
+            {
+                for (int i = 0; i < 10; i++)
+                {
+                    testChannel.AddNewMessages(new Message(messageIdSequence++)
+                    {
+                        Sender = longUsernameUser,
+                        Content = $"some stuff {Guid.NewGuid()}",
+                    });
+                }
+            });
+
+            AddAssert("ensure scrolled to bottom", () => chatDisplay.ScrolledToBottom);
+
+            // send message with short words for text wrapping to occur when contracting chat.
+            AddStep("send lorem ipsum", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
+            {
+                Sender = longUsernameUser,
+                Content = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce et bibendum velit.",
+            }));
+
+            AddStep("contract chat", () => chatDisplay.Width -= 100);
+            AddUntilStep("ensure still scrolled to bottom", () => chatDisplay.ScrolledToBottom);
+
+            AddStep("send another message", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
+            {
+                Sender = admin,
+                Content = "As we were saying...",
+            }));
+
+            AddUntilStep("ensure still scrolled to bottom", () => chatDisplay.ScrolledToBottom);
+        }
+
         private class TestStandAloneChatDisplay : StandAloneChatDisplay
         {
             public TestStandAloneChatDisplay(bool textbox = false)

From e806e5bcd1580f1c85026e53d289d7cf933e4767 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 31 Jan 2021 23:37:52 +0300
Subject: [PATCH 1166/3722] Improve robustness of chat auto-scrolling logic

Fix auto-scrolling state changing by old messages removal logic
---
 osu.Game/Overlays/Chat/DrawableChannel.cs | 47 ++++++++++++++++-------
 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Overlays/Chat/DrawableChannel.cs b/osu.Game/Overlays/Chat/DrawableChannel.cs
index 5926d11c03..f1aa387c17 100644
--- a/osu.Game/Overlays/Chat/DrawableChannel.cs
+++ b/osu.Game/Overlays/Chat/DrawableChannel.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Overlays.Chat
     {
         public readonly Channel Channel;
         protected FillFlowContainer ChatLineFlow;
-        private OsuScrollContainer scroll;
+        private ChannelScrollContainer scroll;
 
         private bool scrollbarVisible = true;
 
@@ -56,7 +56,7 @@ namespace osu.Game.Overlays.Chat
             {
                 RelativeSizeAxes = Axes.Both,
                 Masking = true,
-                Child = scroll = new OsuScrollContainer
+                Child = scroll = new ChannelScrollContainer
                 {
                     ScrollbarVisible = scrollbarVisible,
                     RelativeSizeAxes = Axes.Both,
@@ -80,12 +80,6 @@ namespace osu.Game.Overlays.Chat
             Channel.PendingMessageResolved += pendingMessageResolved;
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            scrollToEnd();
-        }
-
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
@@ -113,8 +107,6 @@ namespace osu.Game.Overlays.Chat
                 ChatLineFlow.Clear();
             }
 
-            bool shouldScrollToEnd = scroll.IsScrolledToEnd(10) || !chatLines.Any() || newMessages.Any(m => m is LocalMessage);
-
             // Add up to last Channel.MAX_HISTORY messages
             var displayMessages = newMessages.Skip(Math.Max(0, newMessages.Count() - Channel.MAX_HISTORY));
 
@@ -153,8 +145,10 @@ namespace osu.Game.Overlays.Chat
                 }
             }
 
-            if (shouldScrollToEnd)
-                scrollToEnd();
+            // due to the scroll adjusts from old messages removal above, a scroll-to-end must be enforced,
+            // to avoid making the container think the user has scrolled back up and unwantedly disable auto-scrolling.
+            if (scroll.ShouldAutoScroll || newMessages.Any(m => m is LocalMessage))
+                ScheduleAfterChildren(() => scroll.ScrollToEnd());
         });
 
         private void pendingMessageResolved(Message existing, Message updated) => Schedule(() =>
@@ -178,8 +172,6 @@ namespace osu.Game.Overlays.Chat
 
         private IEnumerable<ChatLine> chatLines => ChatLineFlow.Children.OfType<ChatLine>();
 
-        private void scrollToEnd() => ScheduleAfterChildren(() => scroll.ScrollToEnd());
-
         public class DaySeparator : Container
         {
             public float TextSize
@@ -243,5 +235,32 @@ namespace osu.Game.Overlays.Chat
                 };
             }
         }
+
+        /// <summary>
+        /// An <see cref="OsuScrollContainer"/> with functionality to automatically scrolls whenever the maximum scrollable distance increases.
+        /// </summary>
+        private class ChannelScrollContainer : OsuScrollContainer
+        {
+            private const float auto_scroll_leniency = 10f;
+
+            private float? lastExtent;
+
+            /// <summary>
+            /// Whether this should automatically scroll to end on the next call to <see cref="UpdateAfterChildren"/>.
+            /// </summary>
+            public bool ShouldAutoScroll { get; private set; } = true;
+
+            protected override void UpdateAfterChildren()
+            {
+                base.UpdateAfterChildren();
+
+                if ((lastExtent == null || ScrollableExtent > lastExtent) && ShouldAutoScroll)
+                    ScrollToEnd();
+                else
+                    ShouldAutoScroll = IsScrolledToEnd(auto_scroll_leniency);
+
+                lastExtent = ScrollableExtent;
+            }
+        }
     }
 }

From 230b347c1efbfc7baa7da6af8676356e47d7a4d2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 12:18:11 +0900
Subject: [PATCH 1167/3722] Move ModSelectOverlay.IsValidMod to a property

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    | 29 ++++++++++++++-----
 .../Overlays/Mods/SoloModSelectOverlay.cs     |  6 ----
 .../Multiplayer/FreeModSelectOverlay.cs       |  5 ----
 .../Multiplayer/MultiplayerMatchSongSelect.cs | 11 +++++--
 osu.Game/Screens/Select/MatchSongSelect.cs    |  5 +++-
 5 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 5709ca3b8d..c21b9ba409 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
@@ -29,7 +30,6 @@ namespace osu.Game.Overlays.Mods
 {
     public abstract class ModSelectOverlay : WaveOverlayContainer
     {
-        private readonly Func<Mod, bool> isValidMod;
         public const float HEIGHT = 510;
 
         protected readonly TriangleButton DeselectAllButton;
@@ -46,6 +46,20 @@ namespace osu.Game.Overlays.Mods
 
         protected readonly ModSettingsContainer ModSettingsContainer;
 
+        [NotNull]
+        private Func<Mod, bool> isValidMod = m => true;
+
+        [NotNull]
+        public Func<Mod, bool> IsValidMod
+        {
+            get => isValidMod;
+            set
+            {
+                isValidMod = value ?? throw new ArgumentNullException(nameof(value));
+                updateAvailableMods();
+            }
+        }
+
         public readonly Bindable<IReadOnlyList<Mod>> SelectedMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
 
         private Bindable<Dictionary<ModType, IReadOnlyList<Mod>>> availableMods;
@@ -60,10 +74,8 @@ namespace osu.Game.Overlays.Mods
 
         private SampleChannel sampleOn, sampleOff;
 
-        protected ModSelectOverlay(Func<Mod, bool> isValidMod = null)
+        protected ModSelectOverlay()
         {
-            this.isValidMod = isValidMod ?? (m => true);
-
             Waves.FirstWaveColour = Color4Extensions.FromHex(@"19b0e2");
             Waves.SecondWaveColour = Color4Extensions.FromHex(@"2280a2");
             Waves.ThirdWaveColour = Color4Extensions.FromHex(@"005774");
@@ -350,7 +362,7 @@ namespace osu.Game.Overlays.Mods
         {
             base.LoadComplete();
 
-            availableMods.BindValueChanged(availableModsChanged, true);
+            availableMods.BindValueChanged(_ => updateAvailableMods(), true);
             SelectedMods.BindValueChanged(selectedModsChanged, true);
         }
 
@@ -405,12 +417,13 @@ namespace osu.Game.Overlays.Mods
 
         public override bool OnPressed(GlobalAction action) => false; // handled by back button
 
-        private void availableModsChanged(ValueChangedEvent<Dictionary<ModType, IReadOnlyList<Mod>>> mods)
+        private void updateAvailableMods()
         {
-            if (mods.NewValue == null) return;
+            if (availableMods.Value == null)
+                return;
 
             foreach (var section in ModSectionsContainer.Children)
-                section.Mods = mods.NewValue[section.ModType].Where(isValidMod);
+                section.Mods = availableMods.Value[section.ModType].Where(IsValidMod);
         }
 
         private void selectedModsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
diff --git a/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs b/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
index 53d0c9fce9..d039ad1f98 100644
--- a/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
@@ -1,18 +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;
 using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Overlays.Mods
 {
     public class SoloModSelectOverlay : ModSelectOverlay
     {
-        public SoloModSelectOverlay(Func<Mod, bool> isValidMod = null)
-            : base(isValidMod)
-        {
-        }
-
         protected override void OnModSelected(Mod mod)
         {
             base.OnModSelected(mod);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs
index 10b68ec5a6..56e74a8460 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs
@@ -14,11 +14,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
     public class FreeModSelectOverlay : ModSelectOverlay
     {
-        public FreeModSelectOverlay(Func<Mod, bool> isValidMod = null)
-            : base(isValidMod)
-        {
-        }
-
         protected override ModSection CreateModSection(ModType type) => new FreeModSection(type);
 
         private class FreeModSection : ModSection
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index 86b8f22d34..d36ebeec0f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -54,7 +54,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING };
 
-            freeModSelectOverlay = new FreeModSelectOverlay(isValidMod) { SelectedMods = { BindTarget = freeMods } };
+            freeModSelectOverlay = new FreeModSelectOverlay
+            {
+                SelectedMods = { BindTarget = freeMods },
+                IsValidMod = isValidMod,
+            };
         }
 
         [BackgroundDependencyLoader]
@@ -130,7 +134,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea();
 
-        protected override ModSelectOverlay CreateModSelectOverlay() => new SoloModSelectOverlay(isValidMod);
+        protected override ModSelectOverlay CreateModSelectOverlay() => new SoloModSelectOverlay
+        {
+            IsValidMod = isValidMod
+        };
 
         protected override IEnumerable<(FooterButton, OverlayContainer)> CreateFooterButtons()
         {
diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index 280f46f9ab..98e02a9294 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -81,7 +81,10 @@ namespace osu.Game.Screens.Select
             item.RequiredMods.AddRange(Mods.Value.Select(m => m.CreateCopy()));
         }
 
-        protected override ModSelectOverlay CreateModSelectOverlay() => new SoloModSelectOverlay(isValidMod);
+        protected override ModSelectOverlay CreateModSelectOverlay() => new SoloModSelectOverlay
+        {
+            IsValidMod = isValidMod
+        };
 
         private bool isValidMod(Mod mod) => !(mod is ModAutoplay) && (mod as MultiMod)?.Mods.Any(mm => mm is ModAutoplay) != true;
     }

From 797a8102876808174924486af644de927d7123f4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 13:24:56 +0900
Subject: [PATCH 1168/3722] Allow unstacking mods

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    | 30 +++++++++++++++++--
 .../Multiplayer/FreeModSelectOverlay.cs       |  5 ++++
 osu.Game/Utils/ModValidation.cs               | 17 +++++++----
 3 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index c21b9ba409..db9460c494 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -22,6 +22,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens;
+using osu.Game.Utils;
 using osuTK;
 using osuTK.Graphics;
 using osuTK.Input;
@@ -46,9 +47,27 @@ namespace osu.Game.Overlays.Mods
 
         protected readonly ModSettingsContainer ModSettingsContainer;
 
+        private bool stacked = true;
+
+        /// <summary>
+        /// Whether mod icons should be stacked, or appear as individual buttons.
+        /// </summary>
+        public bool Stacked
+        {
+            get => stacked;
+            set
+            {
+                stacked = value;
+                updateAvailableMods();
+            }
+        }
+
         [NotNull]
         private Func<Mod, bool> isValidMod = m => true;
 
+        /// <summary>
+        /// A function that checks whether a given mod is valid.
+        /// </summary>
         [NotNull]
         public Func<Mod, bool> IsValidMod
         {
@@ -419,11 +438,18 @@ namespace osu.Game.Overlays.Mods
 
         private void updateAvailableMods()
         {
-            if (availableMods.Value == null)
+            if (availableMods?.Value == null)
                 return;
 
             foreach (var section in ModSectionsContainer.Children)
-                section.Mods = availableMods.Value[section.ModType].Where(IsValidMod);
+            {
+                IEnumerable<Mod> modEnumeration = availableMods.Value[section.ModType];
+
+                if (!stacked)
+                    modEnumeration = ModValidation.FlattenMods(modEnumeration);
+
+                section.Mods = modEnumeration.Where(IsValidMod);
+            }
         }
 
         private void selectedModsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs
index 56e74a8460..8334df1e44 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs
@@ -14,6 +14,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
     public class FreeModSelectOverlay : ModSelectOverlay
     {
+        public FreeModSelectOverlay()
+        {
+            Stacked = false;
+        }
+
         protected override ModSection CreateModSection(ModType type) => new FreeModSection(type);
 
         private class FreeModSection : ModSection
diff --git a/osu.Game/Utils/ModValidation.cs b/osu.Game/Utils/ModValidation.cs
index 0c4d58ab2e..3597396ec4 100644
--- a/osu.Game/Utils/ModValidation.cs
+++ b/osu.Game/Utils/ModValidation.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Utils
             var incompatibleTypes = new HashSet<Type>();
             var incomingTypes = new HashSet<Type>();
 
-            foreach (var mod in combination.SelectMany(flattenMod))
+            foreach (var mod in combination.SelectMany(FlattenMod))
             {
                 // Add the new mod incompatibilities, checking whether any match the existing mod types.
                 foreach (var t in mod.IncompatibleMods)
@@ -79,7 +79,7 @@ namespace osu.Game.Utils
         {
             var allowedSet = new HashSet<Type>(allowedTypes);
 
-            return combination.SelectMany(flattenMod)
+            return combination.SelectMany(FlattenMod)
                               .All(m => allowedSet.Contains(m.GetType()));
         }
 
@@ -93,20 +93,27 @@ namespace osu.Game.Utils
         /// <param name="incompatibleTypes">The set of incompatible <see cref="Mod"/> types.</param>
         /// <returns>Whether the given <see cref="Mod"/> is incompatible.</returns>
         private static bool isModIncompatible(Mod mod, ICollection<Type> incompatibleTypes)
-            => flattenMod(mod)
+            => FlattenMod(mod)
                .SelectMany(m => m.GetType().EnumerateBaseTypes())
                .Any(incompatibleTypes.Contains);
 
+        /// <summary>
+        /// Flattens a set of <see cref="Mod"/>s, returning a new set with all <see cref="MultiMod"/>s removed.
+        /// </summary>
+        /// <param name="mods">The set of <see cref="Mod"/>s to flatten.</param>
+        /// <returns>The new set, containing all <see cref="Mod"/>s in <paramref name="mods"/> recursively with all <see cref="MultiMod"/>s removed.</returns>
+        public static IEnumerable<Mod> FlattenMods(IEnumerable<Mod> mods) => mods.SelectMany(FlattenMod);
+
         /// <summary>
         /// Flattens a <see cref="Mod"/>, returning a set of <see cref="Mod"/>s in-place of any <see cref="MultiMod"/>s.
         /// </summary>
         /// <param name="mod">The <see cref="Mod"/> to flatten.</param>
         /// <returns>A set of singular "flattened" <see cref="Mod"/>s</returns>
-        private static IEnumerable<Mod> flattenMod(Mod mod)
+        public static IEnumerable<Mod> FlattenMod(Mod mod)
         {
             if (mod is MultiMod multi)
             {
-                foreach (var m in multi.Mods.SelectMany(flattenMod))
+                foreach (var m in multi.Mods.SelectMany(FlattenMod))
                     yield return m;
             }
             else

From e02e3cf19a9ad9ace7d21e949ec30e6c9269771e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 13:35:48 +0900
Subject: [PATCH 1169/3722] Disallow selecting DT/HT/WU/WD as allowable
 freemods

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index d36ebeec0f..98e3ca3358 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             freeModSelectOverlay = new FreeModSelectOverlay
             {
                 SelectedMods = { BindTarget = freeMods },
-                IsValidMod = isValidMod,
+                IsValidMod = isValidFreeMod,
             };
         }
 
@@ -147,6 +147,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         }
 
         private bool isValidMod(Mod mod) => !(mod is ModAutoplay) && (mod as MultiMod)?.Mods.Any(mm => mm is ModAutoplay) != true;
+
+        private bool isValidFreeMod(Mod mod) => isValidMod(mod) && !(mod is ModRateAdjust) && !(mod is ModTimeRamp);
     }
 
     public class FooterButtonFreeMods : FooterButton, IHasCurrentValue<IReadOnlyList<Mod>>

From 4ae10b1e1c88f4d6b6a3fe5ec136abf1e3ead32b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 13:40:59 +0900
Subject: [PATCH 1170/3722] Add initial UI for selecting extra mods

---
 .../Screens/OnlinePlay/Match/RoomSubScreen.cs | 29 ++++++--
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 69 +++++++++++++++++--
 2 files changed, 90 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 2449563c73..231fb58836 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.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.Audio;
@@ -29,6 +30,11 @@ namespace osu.Game.Screens.OnlinePlay.Match
         [Resolved(typeof(Room), nameof(Room.Playlist))]
         protected BindableList<PlaylistItem> Playlist { get; private set; }
 
+        /// <summary>
+        /// Any mods applied by/to the local user.
+        /// </summary>
+        protected readonly Bindable<IReadOnlyList<Mod>> ExtraMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
+
         [Resolved]
         private MusicController music { get; set; }
 
@@ -55,6 +61,8 @@ namespace osu.Game.Screens.OnlinePlay.Match
 
             managerUpdated = beatmapManager.ItemUpdated.GetBoundCopy();
             managerUpdated.BindValueChanged(beatmapUpdated);
+
+            ExtraMods.BindValueChanged(_ => updateMods());
         }
 
         public override void OnEntering(IScreen last)
@@ -95,12 +103,17 @@ namespace osu.Game.Screens.OnlinePlay.Match
         {
             updateWorkingBeatmap();
 
-            var item = SelectedItem.Value;
+            if (SelectedItem.Value == null)
+                return;
 
-            Mods.Value = item?.RequiredMods?.ToArray() ?? Array.Empty<Mod>();
+            // Remove any extra mods that are no longer allowed.
+            ExtraMods.Value = ExtraMods.Value
+                                       .Where(m => SelectedItem.Value.AllowedMods.Any(a => m.GetType() == a.GetType()))
+                                       .ToList();
 
-            if (item?.Ruleset != null)
-                Ruleset.Value = item.Ruleset.Value;
+            updateMods();
+
+            Ruleset.Value = SelectedItem.Value.Ruleset.Value;
         }
 
         private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> weakSet) => Schedule(updateWorkingBeatmap);
@@ -115,6 +128,14 @@ namespace osu.Game.Screens.OnlinePlay.Match
             Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
         }
 
+        private void updateMods()
+        {
+            if (SelectedItem.Value == null)
+                return;
+
+            Mods.Value = ExtraMods.Value.Concat(SelectedItem.Value.RequiredMods).ToList();
+        }
+
         private void beginHandlingTrack()
         {
             Beatmap.BindValueChanged(applyLoopingToTrack, true);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 7c4b6d18ec..95dda1a051 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -14,12 +14,15 @@ using osu.Framework.Screens;
 using osu.Game.Extensions;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
+using osu.Game.Overlays.Mods;
 using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Screens.OnlinePlay.Match;
 using osu.Game.Screens.OnlinePlay.Match.Components;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Participants;
+using osu.Game.Screens.Play.HUD;
 using osu.Game.Users;
+using osuTK;
 using ParticipantsList = osu.Game.Screens.OnlinePlay.Multiplayer.Participants.ParticipantsList;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer
@@ -37,7 +40,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         [Resolved]
         private OngoingOperationTracker ongoingOperationTracker { get; set; }
 
+        private ModSelectOverlay extraModSelectOverlay;
         private MultiplayerMatchSettingsOverlay settingsOverlay;
+        private Drawable extraModsSection;
 
         private IBindable<bool> isConnected;
 
@@ -129,10 +134,39 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                                                             RelativeSizeAxes = Axes.X,
                                                             AutoSizeAxes = Axes.Y,
                                                             Padding = new MarginPadding { Horizontal = 5 },
-                                                            Children = new Drawable[]
+                                                            Spacing = new Vector2(0, 10),
+                                                            Children = new[]
                                                             {
-                                                                new OverlinedHeader("Beatmap"),
-                                                                new BeatmapSelectionControl { RelativeSizeAxes = Axes.X }
+                                                                new FillFlowContainer
+                                                                {
+                                                                    RelativeSizeAxes = Axes.X,
+                                                                    AutoSizeAxes = Axes.Y,
+                                                                    Children = new Drawable[]
+                                                                    {
+                                                                        new OverlinedHeader("Beatmap"),
+                                                                        new BeatmapSelectionControl { RelativeSizeAxes = Axes.X }
+                                                                    }
+                                                                },
+                                                                extraModsSection = new FillFlowContainer
+                                                                {
+                                                                    RelativeSizeAxes = Axes.X,
+                                                                    AutoSizeAxes = Axes.Y,
+                                                                    Children = new Drawable[]
+                                                                    {
+                                                                        new OverlinedHeader("Extra mods"),
+                                                                        new ModDisplay
+                                                                        {
+                                                                            DisplayUnrankedText = false,
+                                                                            Current = ExtraMods
+                                                                        },
+                                                                        new PurpleTriangleButton
+                                                                        {
+                                                                            RelativeSizeAxes = Axes.X,
+                                                                            Text = "Select",
+                                                                            Action = () => extraModSelectOverlay.Show()
+                                                                        }
+                                                                    }
+                                                                }
                                                             }
                                                         }
                                                     }
@@ -174,6 +208,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                         new Dimension(GridSizeMode.AutoSize),
                     }
                 },
+                extraModSelectOverlay = new SoloModSelectOverlay
+                {
+                    SelectedMods = { BindTarget = ExtraMods },
+                    Stacked = false,
+                    IsValidMod = _ => false
+                },
                 settingsOverlay = new MultiplayerMatchSettingsOverlay
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -219,10 +259,31 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 return true;
             }
 
+            if (extraModSelectOverlay.State.Value == Visibility.Visible)
+            {
+                extraModSelectOverlay.Hide();
+                return true;
+            }
+
             return base.OnBackButton();
         }
 
-        private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e) => SelectedItem.Value = Playlist.FirstOrDefault();
+        private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            SelectedItem.Value = Playlist.FirstOrDefault();
+
+            if (SelectedItem.Value?.AllowedMods.Any() != true)
+            {
+                extraModsSection.Hide();
+                extraModSelectOverlay.Hide();
+                extraModSelectOverlay.IsValidMod = _ => false;
+            }
+            else
+            {
+                extraModsSection.Show();
+                extraModSelectOverlay.IsValidMod = m => SelectedItem.Value.AllowedMods.Any(a => a.GetType() == m.GetType());
+            }
+        }
 
         private void onReadyClick()
         {

From b846146f163a0dfe87d8d5e02f00730387b8de04 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 13:58:44 +0900
Subject: [PATCH 1171/3722] Update mods when resuming room subscreen

---
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 231fb58836..3c4c6ce040 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -81,6 +81,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
         {
             base.OnResuming(last);
             beginHandlingTrack();
+            updateMods();
         }
 
         public override bool OnExiting(IScreen next)

From 426569c2a93244a7a31688a0d96529d752858ebc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 14:57:39 +0900
Subject: [PATCH 1172/3722] Move common song select implementation for online
 play

---
 .../Multiplayer/MultiplayerMatchSongSelect.cs |  91 +------------
 .../OnlinePlay/OnlinePlaySongSelect.cs        | 124 ++++++++++++++++++
 osu.Game/Screens/Select/MatchSongSelect.cs    |  34 +----
 3 files changed, 130 insertions(+), 119 deletions(-)
 create mode 100644 osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index 98e3ca3358..e892570066 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -1,25 +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.Collections.Generic;
-using System.Linq;
-using Humanizer;
 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.UserInterface;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
-using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
-using osu.Game.Overlays.Mods;
-using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Select;
@@ -27,67 +20,21 @@ using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
-    public class MultiplayerMatchSongSelect : SongSelect, IOnlinePlaySubScreen
+    public class MultiplayerMatchSongSelect : OnlinePlaySongSelect
     {
-        public string ShortTitle => "song selection";
-
-        public override string Title => ShortTitle.Humanize();
-
-        [Resolved(typeof(Room), nameof(Room.Playlist))]
-        private BindableList<PlaylistItem> playlist { get; set; }
-
         [Resolved]
         private StatefulMultiplayerClient client { get; set; }
 
-        private readonly Bindable<IReadOnlyList<Mod>> freeMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
-
-        private readonly FreeModSelectOverlay freeModSelectOverlay;
         private LoadingLayer loadingLayer;
 
-        private WorkingBeatmap initialBeatmap;
-        private RulesetInfo initialRuleset;
-        private IReadOnlyList<Mod> initialMods;
-
-        private bool itemSelected;
-
-        public MultiplayerMatchSongSelect()
-        {
-            Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING };
-
-            freeModSelectOverlay = new FreeModSelectOverlay
-            {
-                SelectedMods = { BindTarget = freeMods },
-                IsValidMod = isValidFreeMod,
-            };
-        }
-
         [BackgroundDependencyLoader]
         private void load()
         {
             AddInternal(loadingLayer = new LoadingLayer(true));
-            initialBeatmap = Beatmap.Value;
-            initialRuleset = Ruleset.Value;
-            initialMods = Mods.Value.ToList();
-
-            freeMods.Value = playlist.FirstOrDefault()?.AllowedMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
-
-            FooterPanels.Add(freeModSelectOverlay);
         }
 
-        protected override bool OnStart()
+        protected override void OnSetItem(PlaylistItem item)
         {
-            itemSelected = true;
-            var item = new PlaylistItem();
-
-            item.Beatmap.Value = Beatmap.Value.BeatmapInfo;
-            item.Ruleset.Value = Ruleset.Value;
-
-            item.RequiredMods.Clear();
-            item.RequiredMods.AddRange(Mods.Value.Select(m => m.CreateCopy()));
-
-            item.AllowedMods.Clear();
-            item.AllowedMods.AddRange(freeMods.Value.Select(m => m.CreateCopy()));
-
             // If the client is already in a room, update via the client.
             // Otherwise, update the playlist directly in preparation for it to be submitted to the API on match creation.
             if (client.Room != null)
@@ -112,43 +59,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             }
             else
             {
-                playlist.Clear();
-                playlist.Add(item);
+                Playlist.Clear();
+                Playlist.Add(item);
                 this.Exit();
             }
-
-            return true;
-        }
-
-        public override bool OnExiting(IScreen next)
-        {
-            if (!itemSelected)
-            {
-                Beatmap.Value = initialBeatmap;
-                Ruleset.Value = initialRuleset;
-                Mods.Value = initialMods;
-            }
-
-            return base.OnExiting(next);
         }
 
         protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea();
-
-        protected override ModSelectOverlay CreateModSelectOverlay() => new SoloModSelectOverlay
-        {
-            IsValidMod = isValidMod
-        };
-
-        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;
-        }
-
-        private bool isValidMod(Mod mod) => !(mod is ModAutoplay) && (mod as MultiMod)?.Mods.Any(mm => mm is ModAutoplay) != true;
-
-        private bool isValidFreeMod(Mod mod) => isValidMod(mod) && !(mod is ModRateAdjust) && !(mod is ModTimeRamp);
     }
 
     public class FooterButtonFreeMods : FooterButton, IHasCurrentValue<IReadOnlyList<Mod>>
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
new file mode 100644
index 0000000000..7c64e00dc4
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
@@ -0,0 +1,124 @@
+// Copyright (c) ppy 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 Humanizer;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Screens;
+using osu.Game.Beatmaps;
+using osu.Game.Online.Rooms;
+using osu.Game.Overlays.Mods;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Screens.OnlinePlay.Multiplayer;
+using osu.Game.Screens.Select;
+
+namespace osu.Game.Screens.OnlinePlay
+{
+    public abstract class OnlinePlaySongSelect : SongSelect, IOnlinePlaySubScreen
+    {
+        public string ShortTitle => "song selection";
+
+        public override string Title => ShortTitle.Humanize();
+
+        public override bool AllowEditing => false;
+
+        [Resolved(typeof(Room), nameof(Room.Playlist))]
+        protected BindableList<PlaylistItem> Playlist { get; private set; }
+
+        private readonly Bindable<IReadOnlyList<Mod>> freeMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
+        private readonly FreeModSelectOverlay freeModSelectOverlay;
+
+        private WorkingBeatmap initialBeatmap;
+        private RulesetInfo initialRuleset;
+        private IReadOnlyList<Mod> initialMods;
+        private bool itemSelected;
+
+        protected OnlinePlaySongSelect()
+        {
+            Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING };
+
+            freeModSelectOverlay = new FreeModSelectOverlay
+            {
+                SelectedMods = { BindTarget = freeMods },
+                IsValidMod = IsValidFreeMod,
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            initialBeatmap = Beatmap.Value;
+            initialRuleset = Ruleset.Value;
+            initialMods = Mods.Value.ToList();
+
+            freeMods.Value = Playlist.FirstOrDefault()?.AllowedMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
+            FooterPanels.Add(freeModSelectOverlay);
+        }
+
+        protected sealed override bool OnStart()
+        {
+            itemSelected = true;
+
+            var item = new PlaylistItem();
+
+            item.Beatmap.Value = Beatmap.Value.BeatmapInfo;
+            item.Ruleset.Value = Ruleset.Value;
+
+            item.RequiredMods.Clear();
+            item.RequiredMods.AddRange(Mods.Value.Select(m => m.CreateCopy()));
+
+            item.AllowedMods.Clear();
+            item.AllowedMods.AddRange(freeMods.Value.Select(m => m.CreateCopy()));
+
+            OnSetItem(item);
+            return true;
+        }
+
+        protected abstract void OnSetItem(PlaylistItem item);
+
+        public override bool OnBackButton()
+        {
+            if (freeModSelectOverlay.State.Value == Visibility.Visible)
+            {
+                freeModSelectOverlay.Hide();
+                return true;
+            }
+
+            return base.OnBackButton();
+        }
+
+        public override bool OnExiting(IScreen next)
+        {
+            if (!itemSelected)
+            {
+                Beatmap.Value = initialBeatmap;
+                Ruleset.Value = initialRuleset;
+                Mods.Value = initialMods;
+            }
+
+            return base.OnExiting(next);
+        }
+
+        protected override ModSelectOverlay CreateModSelectOverlay() => new SoloModSelectOverlay
+        {
+            IsValidMod = IsValidMod
+        };
+
+        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;
+        }
+
+        protected virtual bool IsValidMod(Mod mod) => !(mod is ModAutoplay) && (mod as MultiMod)?.Mods.Any(mm => mm is ModAutoplay) != true;
+
+        protected virtual bool IsValidFreeMod(Mod mod) => IsValidMod(mod);
+    }
+}
diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index 98e02a9294..23fe9620fe 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -1,48 +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 System;
 using System.Linq;
-using Humanizer;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Framework.Graphics;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Online.Rooms;
-using osu.Game.Overlays.Mods;
-using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.OnlinePlay;
 using osu.Game.Screens.OnlinePlay.Components;
 
 namespace osu.Game.Screens.Select
 {
-    public class MatchSongSelect : SongSelect, IOnlinePlaySubScreen
+    public class MatchSongSelect : OnlinePlaySongSelect
     {
-        public Action<PlaylistItem> Selected;
-
-        public string ShortTitle => "song selection";
-        public override string Title => ShortTitle.Humanize();
-
-        public override bool AllowEditing => false;
-
-        [Resolved(typeof(Room), nameof(Room.Playlist))]
-        protected BindableList<PlaylistItem> Playlist { get; private set; }
-
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 
-        public MatchSongSelect()
-        {
-            Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING };
-        }
-
         protected override BeatmapDetailArea CreateBeatmapDetailArea() => new MatchBeatmapDetailArea
         {
             CreateNewItem = createNewItem
         };
 
-        protected override bool OnStart()
+        protected override void OnSetItem(PlaylistItem item)
         {
             switch (Playlist.Count)
             {
@@ -56,8 +35,6 @@ namespace osu.Game.Screens.Select
             }
 
             this.Exit();
-
-            return true;
         }
 
         private void createNewItem()
@@ -80,12 +57,5 @@ namespace osu.Game.Screens.Select
             item.RequiredMods.Clear();
             item.RequiredMods.AddRange(Mods.Value.Select(m => m.CreateCopy()));
         }
-
-        protected override ModSelectOverlay CreateModSelectOverlay() => new SoloModSelectOverlay
-        {
-            IsValidMod = isValidMod
-        };
-
-        private bool isValidMod(Mod mod) => !(mod is ModAutoplay) && (mod as MultiMod)?.Mods.Any(mm => mm is ModAutoplay) != true;
     }
 }

From b43e529964b31ac40d5230aa41e68876985579d7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 15:06:50 +0900
Subject: [PATCH 1173/3722] Fix allowed mods being copied into required mods

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index e892570066..0c22813e56 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.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.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -33,6 +35,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             AddInternal(loadingLayer = new LoadingLayer(true));
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Mods.Value = Playlist.FirstOrDefault()?.RequiredMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
+        }
+
         protected override void OnSetItem(PlaylistItem item)
         {
             // If the client is already in a room, update via the client.

From 0909c73ead3d4c45495c8bb5d55dfac16386038a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 15:07:56 +0900
Subject: [PATCH 1174/3722] Once again disallow DT/etc as allowable mods

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index 0c22813e56..80bb7c7ac2 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -75,6 +75,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         }
 
         protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea();
+
+        protected override bool IsValidFreeMod(Mod mod) => base.IsValidFreeMod(mod) && !(mod is ModTimeRamp) && !(mod is ModRateAdjust);
     }
 
     public class FooterButtonFreeMods : FooterButton, IHasCurrentValue<IReadOnlyList<Mod>>

From 05982f42ab8a991d9056a7ad38f947c0edc4c4cd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 1 Feb 2021 16:43:53 +0900
Subject: [PATCH 1175/3722] Add more comprehensive commenting and simplify base
 call logic

We can call the base method regardless for better safety. Worst case
it's just going to run `Stop()` twice anyway.
---
 .../Drawables/DrawableStoryboardSample.cs           | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
index fcbffda227..7b16009859 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
@@ -46,14 +46,15 @@ namespace osu.Game.Storyboards.Drawables
         {
             if (!RequestedPlaying) return;
 
-            // non-looping storyboard samples should be stopped immediately when sample playback is disabled
-            if (!Looping)
+            if (!Looping && disabled.NewValue)
             {
-                if (disabled.NewValue)
-                    Stop();
+                // the default behaviour for sample disabling is to allow one-shot samples to play out.
+                // storyboards regularly have long running samples that can cause this behaviour to lead to unintended results.
+                // for this reason, we immediately stop such samples.
+                Stop();
             }
-            else
-                base.SamplePlaybackDisabledChanged(disabled);
+
+            base.SamplePlaybackDisabledChanged(disabled);
         }
 
         protected override void Update()

From 49e62c3a4b7118c1f3c81c6af357534bd541d8ee Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 1 Feb 2021 11:02:08 +0300
Subject: [PATCH 1176/3722] Apply documentation changes

Co-authored-by: Dean Herbert <pe@ppy.sh>
---
 osu.Game/Overlays/Chat/DrawableChannel.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Chat/DrawableChannel.cs b/osu.Game/Overlays/Chat/DrawableChannel.cs
index f1aa387c17..4c8513b1d5 100644
--- a/osu.Game/Overlays/Chat/DrawableChannel.cs
+++ b/osu.Game/Overlays/Chat/DrawableChannel.cs
@@ -237,7 +237,7 @@ namespace osu.Game.Overlays.Chat
         }
 
         /// <summary>
-        /// An <see cref="OsuScrollContainer"/> with functionality to automatically scrolls whenever the maximum scrollable distance increases.
+        /// An <see cref="OsuScrollContainer"/> with functionality to automatically scroll whenever the maximum scrollable distance increases.
         /// </summary>
         private class ChannelScrollContainer : OsuScrollContainer
         {
@@ -246,7 +246,7 @@ namespace osu.Game.Overlays.Chat
             private float? lastExtent;
 
             /// <summary>
-            /// Whether this should automatically scroll to end on the next call to <see cref="UpdateAfterChildren"/>.
+            /// Whether this container should automatically scroll to end on the next call to <see cref="UpdateAfterChildren"/>.
             /// </summary>
             public bool ShouldAutoScroll { get; private set; } = true;
 

From fabb0eeb29a35c7e0d212d9c7be9f1aad8e90c35 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 1 Feb 2021 17:27:14 +0900
Subject: [PATCH 1177/3722] Add signalr messagepack key attribute

---
 osu.Game/Online/Rooms/BeatmapAvailability.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Online/Rooms/BeatmapAvailability.cs b/osu.Game/Online/Rooms/BeatmapAvailability.cs
index 4ce797e583..2adeb9b959 100644
--- a/osu.Game/Online/Rooms/BeatmapAvailability.cs
+++ b/osu.Game/Online/Rooms/BeatmapAvailability.cs
@@ -22,6 +22,7 @@ namespace osu.Game.Online.Rooms
         /// <summary>
         /// The beatmap's downloading progress, null when not in <see cref="DownloadState.Downloading"/> state.
         /// </summary>
+        [Key(1)]
         public readonly float? DownloadProgress;
 
         [JsonConstructor]

From 1d8de2f718916b907b24bf1b411ebb627258cbd7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 1 Feb 2021 17:32:54 +0900
Subject: [PATCH 1178/3722] Rename class to better match purpose

---
 ... TestSceneMultiplayerBeatmapAvailabilityTracker.cs} | 10 +++++-----
 ...er.cs => MultiplayerBeatmapAvailablilityTracker.cs} |  7 +++----
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs     |  4 ++--
 3 files changed, 10 insertions(+), 11 deletions(-)
 rename osu.Game.Tests/Online/{TestSceneMultiplayerBeatmapTracker.cs => TestSceneMultiplayerBeatmapAvailabilityTracker.cs} (94%)
 rename osu.Game/Online/Rooms/{MultiplayerBeatmapTracker.cs => MultiplayerBeatmapAvailablilityTracker.cs} (93%)

diff --git a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapAvailabilityTracker.cs
similarity index 94%
rename from osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
rename to osu.Game.Tests/Online/TestSceneMultiplayerBeatmapAvailabilityTracker.cs
index 9caecc198a..3c3793670a 100644
--- a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapTracker.cs
+++ b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapAvailabilityTracker.cs
@@ -28,7 +28,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Tests.Online
 {
     [HeadlessTest]
-    public class TestSceneMultiplayerBeatmapTracker : OsuTestScene
+    public class TestSceneMultiplayerBeatmapAvailabilityTracker : OsuTestScene
     {
         private RulesetStore rulesets;
         private TestBeatmapManager beatmaps;
@@ -38,7 +38,7 @@ namespace osu.Game.Tests.Online
         private BeatmapSetInfo testBeatmapSet;
 
         private readonly Bindable<PlaylistItem> selectedItem = new Bindable<PlaylistItem>();
-        private MultiplayerBeatmapTracker tracker;
+        private MultiplayerBeatmapAvailablilityTracker availablilityTracker;
 
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, GameHost host)
@@ -67,7 +67,7 @@ namespace osu.Game.Tests.Online
                 Ruleset = { Value = testBeatmapInfo.Ruleset },
             };
 
-            Child = tracker = new MultiplayerBeatmapTracker
+            Child = availablilityTracker = new MultiplayerBeatmapAvailablilityTracker
             {
                 SelectedItem = { BindTarget = selectedItem, }
             };
@@ -118,7 +118,7 @@ namespace osu.Game.Tests.Online
             });
             addAvailabilityCheckStep("state still not downloaded", BeatmapAvailability.NotDownloaded);
 
-            AddStep("recreate tracker", () => Child = tracker = new MultiplayerBeatmapTracker
+            AddStep("recreate tracker", () => Child = availablilityTracker = new MultiplayerBeatmapAvailablilityTracker
             {
                 SelectedItem = { BindTarget = selectedItem }
             });
@@ -129,7 +129,7 @@ namespace osu.Game.Tests.Online
         {
             // In DownloadTrackingComposite, state changes are scheduled one frame later, wait one step.
             AddWaitStep("wait for potential change", 1);
-            AddAssert(description, () => tracker.Availability.Value.Equals(expected.Invoke()));
+            AddAssert(description, () => availablilityTracker.Availability.Value.Equals(expected.Invoke()));
         }
 
         private static BeatmapInfo getTestBeatmapInfo(string archiveFile)
diff --git a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs b/osu.Game/Online/Rooms/MultiplayerBeatmapAvailablilityTracker.cs
similarity index 93%
rename from osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
rename to osu.Game/Online/Rooms/MultiplayerBeatmapAvailablilityTracker.cs
index 28e4872ad3..578c4db2f8 100644
--- a/osu.Game/Online/Rooms/MultiplayerBeatmapTracker.cs
+++ b/osu.Game/Online/Rooms/MultiplayerBeatmapAvailablilityTracker.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Online.Rooms
     /// This differs from a regular download tracking composite as this accounts for the
     /// databased beatmap set's checksum, to disallow from playing with an altered version of the beatmap.
     /// </summary>
-    public class MultiplayerBeatmapTracker : DownloadTrackingComposite<BeatmapSetInfo, BeatmapManager>
+    public class MultiplayerBeatmapAvailablilityTracker : DownloadTrackingComposite<BeatmapSetInfo, BeatmapManager>
     {
         public readonly IBindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
 
@@ -26,11 +26,10 @@ namespace osu.Game.Online.Rooms
 
         private readonly Bindable<BeatmapAvailability> availability = new Bindable<BeatmapAvailability>();
 
-        public MultiplayerBeatmapTracker()
+        public MultiplayerBeatmapAvailablilityTracker()
         {
             State.BindValueChanged(_ => updateAvailability());
-            Progress.BindValueChanged(_ => updateAvailability());
-            updateAvailability();
+            Progress.BindValueChanged(_ => updateAvailability(), true);
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index c049d4be20..f2cb1120cb 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -41,11 +41,11 @@ namespace osu.Game.Screens.OnlinePlay.Match
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
 
         [Cached]
-        protected readonly MultiplayerBeatmapTracker BeatmapTracker;
+        protected readonly MultiplayerBeatmapAvailablilityTracker BeatmapAvailablilityTracker;
 
         protected RoomSubScreen()
         {
-            InternalChild = BeatmapTracker = new MultiplayerBeatmapTracker
+            InternalChild = BeatmapAvailablilityTracker = new MultiplayerBeatmapAvailablilityTracker
             {
                 SelectedItem = { BindTarget = SelectedItem },
             };

From ac2a995041590370e31b2b5ef9fb440dcb20d43c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 17:54:56 +0900
Subject: [PATCH 1179/3722] Add user and panel states

---
 .../TestSceneMultiplayerParticipantsList.cs   | 25 ++++++++++++++
 .../Online/Multiplayer/IMultiplayerClient.cs  |  4 +++
 .../Multiplayer/IMultiplayerRoomServer.cs     |  4 +++
 .../Online/Multiplayer/MultiplayerRoomUser.cs |  7 ++++
 .../Multiplayer/StatefulMultiplayerClient.cs  | 26 +++++++++++++++
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 11 +++++++
 .../Participants/ParticipantPanel.cs          | 33 ++++++++++++++++++-
 osu.Game/Screens/Play/HUD/ModDisplay.cs       | 14 +++++---
 .../Multiplayer/TestMultiplayerClient.cs      | 17 ++++++++++
 9 files changed, 136 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index 968a869532..9aa1f2cf99 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
@@ -8,6 +8,8 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Participants;
 using osu.Game.Users;
 using osuTK;
@@ -123,5 +125,28 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 }
             });
         }
+
+        [Test]
+        public void TestUserWithMods()
+        {
+            AddStep("add user", () =>
+            {
+                Client.AddUser(new User
+                {
+                    Id = 0,
+                    Username = $"User 0",
+                    CurrentModeRank = RNG.Next(1, 100000),
+                    CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
+                });
+
+                Client.ChangeUserExtraMods(0, new Mod[]
+                {
+                    new OsuModHardRock(),
+                    new OsuModDifficultyAdjust { ApproachRate = { Value = 1 } }
+                });
+            });
+
+            AddToggleStep("toggle ready state", v => Client.ChangeUserState(0, v ? MultiplayerUserState.Ready : MultiplayerUserState.Idle));
+        }
     }
 }
diff --git a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
index 19dd473230..37f60ab036 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
@@ -1,7 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
 using System.Threading.Tasks;
+using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 
 namespace osu.Game.Online.Multiplayer
@@ -55,6 +57,8 @@ namespace osu.Game.Online.Multiplayer
         /// <param name="beatmapAvailability">The new beatmap availability state of the user.</param>
         Task UserBeatmapAvailabilityChanged(int userId, BeatmapAvailability beatmapAvailability);
 
+        Task UserExtraModsChanged(int userId, IEnumerable<APIMod> mods);
+
         /// <summary>
         /// Signals that a match is to be started. This will *only* be sent to clients which are to begin loading at this point.
         /// </summary>
diff --git a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
index 09816974a7..484acfe957 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
@@ -1,7 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
 using System.Threading.Tasks;
+using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 
 namespace osu.Game.Online.Multiplayer
@@ -47,6 +49,8 @@ namespace osu.Game.Online.Multiplayer
         /// <param name="newBeatmapAvailability">The proposed new beatmap availability state.</param>
         Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability);
 
+        Task ChangeExtraMods(IEnumerable<APIMod> newMods);
+
         /// <summary>
         /// As the host of a room, start the match.
         /// </summary>
diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
index 2590acbc81..d7f7f9135e 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
@@ -4,7 +4,11 @@
 #nullable enable
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using JetBrains.Annotations;
 using Newtonsoft.Json;
+using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 using osu.Game.Users;
 
@@ -22,6 +26,9 @@ namespace osu.Game.Online.Multiplayer
         /// </summary>
         public BeatmapAvailability BeatmapAvailability { get; set; } = BeatmapAvailability.LocallyAvailable();
 
+        [NotNull]
+        public IEnumerable<APIMod> ExtraMods { get; set; } = Enumerable.Empty<APIMod>();
+
         public User? User { get; set; }
 
         [JsonConstructor]
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index e5b07ddfb4..33dcf1e8b4 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -22,6 +22,7 @@ using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Rooms;
 using osu.Game.Online.Rooms.RoomStatuses;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Users;
 using osu.Game.Utils;
 
@@ -231,6 +232,10 @@ namespace osu.Game.Online.Multiplayer
 
         public abstract Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability);
 
+        public Task ChangeExtraMods(IEnumerable<Mod> newMods) => ChangeExtraMods(newMods.Select(m => new APIMod(m)).ToList());
+
+        public abstract Task ChangeExtraMods(IEnumerable<APIMod> newMods);
+
         public abstract Task StartMatch();
 
         Task IMultiplayerClient.RoomStateChanged(MultiplayerRoomState state)
@@ -379,6 +384,27 @@ namespace osu.Game.Online.Multiplayer
             return Task.CompletedTask;
         }
 
+        public Task UserExtraModsChanged(int userId, IEnumerable<APIMod> mods)
+        {
+            if (Room == null)
+                return Task.CompletedTask;
+
+            Scheduler.Add(() =>
+            {
+                var user = Room?.Users.SingleOrDefault(u => u.UserID == userId);
+
+                // errors here are not critical - user mods is mostly for display.
+                if (user == null)
+                    return;
+
+                user.ExtraMods = mods;
+
+                RoomUpdated?.Invoke();
+            }, false);
+
+            return Task.CompletedTask;
+        }
+
         Task IMultiplayerClient.LoadRequested()
         {
             if (Room == null)
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 95dda1a051..c1025e73f8 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.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.Collections.Specialized;
 using System.Diagnostics;
 using System.Linq;
@@ -15,6 +16,7 @@ using osu.Game.Extensions;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays.Mods;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Screens.OnlinePlay.Match;
 using osu.Game.Screens.OnlinePlay.Match.Components;
@@ -240,6 +242,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             base.LoadComplete();
 
             Playlist.BindCollectionChanged(onPlaylistChanged, true);
+            ExtraMods.BindValueChanged(onExtraModsChanged);
 
             client.LoadRequested += onLoadRequested;
 
@@ -285,6 +288,14 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             }
         }
 
+        private void onExtraModsChanged(ValueChangedEvent<IReadOnlyList<Mod>> extraMods)
+        {
+            if (client.Room == null)
+                return;
+
+            client.ChangeExtraMods(extraMods.NewValue).CatchUnobservedExceptions();
+        }
+
         private void onReadyClick()
         {
             Debug.Assert(readyClickOperation == null);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index f99655e305..059e9e518d 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.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.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -16,6 +17,8 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Rulesets;
+using osu.Game.Screens.Play.HUD;
 using osu.Game.Users;
 using osu.Game.Users.Drawables;
 using osuTK;
@@ -30,6 +33,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
         [Resolved]
         private IAPIProvider api { get; set; }
 
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
+
+        private ModDisplay extraModsDisplay;
         private StateDisplay userStateDisplay;
         private SpriteIcon crown;
 
@@ -122,11 +129,32 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
                                     }
                                 }
                             },
-                            userStateDisplay = new StateDisplay
+                            new FillFlowContainer
                             {
                                 Anchor = Anchor.CentreRight,
                                 Origin = Anchor.CentreRight,
+                                AutoSizeAxes = Axes.Both,
+                                Direction = FillDirection.Horizontal,
                                 Margin = new MarginPadding { Right = 10 },
+                                Spacing = new Vector2(10),
+                                Children = new Drawable[]
+                                {
+                                    extraModsDisplay = new ModDisplay
+                                    {
+                                        Anchor = Anchor.Centre,
+                                        Origin = Anchor.Centre,
+                                        Scale = new Vector2(0.5f),
+                                        ExpansionMode = ExpansionMode.AlwaysContracted,
+                                        DisplayUnrankedText = false,
+                                        ExpandOnAppear = false
+                                    },
+                                    userStateDisplay = new StateDisplay
+                                    {
+                                        Anchor = Anchor.Centre,
+                                        Origin = Anchor.Centre,
+                                        AlwaysPresent = true
+                                    }
+                                }
                             }
                         }
                     }
@@ -143,7 +171,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 
             const double fade_time = 50;
 
+            var ruleset = rulesets.GetRuleset(Room.Settings.RulesetID).CreateInstance();
+
             userStateDisplay.Status = User.State;
+            extraModsDisplay.Current.Value = User.ExtraMods.Select(m => m.ToMod(ruleset)).ToList();
 
             if (Room.Host?.Equals(User) == true)
                 crown.FadeIn(fade_time);
diff --git a/osu.Game/Screens/Play/HUD/ModDisplay.cs b/osu.Game/Screens/Play/HUD/ModDisplay.cs
index 68d019bf71..2d5b07f056 100644
--- a/osu.Game/Screens/Play/HUD/ModDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ModDisplay.cs
@@ -26,6 +26,8 @@ namespace osu.Game.Screens.Play.HUD
 
         public ExpansionMode ExpansionMode = ExpansionMode.ExpandOnHover;
 
+        public bool ExpandOnAppear = true;
+
         private readonly Bindable<IReadOnlyList<Mod>> current = new Bindable<IReadOnlyList<Mod>>();
 
         public Bindable<IReadOnlyList<Mod>> Current
@@ -108,10 +110,14 @@ namespace osu.Game.Screens.Play.HUD
             else
                 unrankedText.Hide();
 
-            expand();
-
-            using (iconsContainer.BeginDelayedSequence(1200))
-                contract();
+            if (ExpandOnAppear)
+            {
+                expand();
+                using (iconsContainer.BeginDelayedSequence(1200))
+                    contract();
+            }
+            else
+                iconsContainer.TransformSpacingTo(new Vector2(-25, 0));
         }
 
         private void expand()
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index 7fbc770351..e699e7fb34 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -3,6 +3,7 @@
 
 #nullable enable
 
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
@@ -11,6 +12,7 @@ using osu.Framework.Bindables;
 using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
@@ -122,6 +124,21 @@ namespace osu.Game.Tests.Visual.Multiplayer
             return Task.CompletedTask;
         }
 
+        public void ChangeUserExtraMods(int userId, IEnumerable<Mod> newMods)
+            => ChangeUserExtraMods(userId, newMods.Select(m => new APIMod(m)).ToList());
+
+        public void ChangeUserExtraMods(int userId, IEnumerable<APIMod> newMods)
+        {
+            Debug.Assert(Room != null);
+            ((IMultiplayerClient)this).UserExtraModsChanged(userId, newMods.ToList());
+        }
+
+        public override Task ChangeExtraMods(IEnumerable<APIMod> newMods)
+        {
+            ChangeUserExtraMods(api.LocalUser.Value.Id, newMods);
+            return Task.CompletedTask;
+        }
+
         public override Task StartMatch()
         {
             Debug.Assert(Room != null);

From f53896360715341641dfc7971cb04f66d19fd91d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 17:57:32 +0900
Subject: [PATCH 1180/3722] Extra mods -> user mods

---
 .../TestSceneMultiplayerParticipantsList.cs   |  2 +-
 .../Online/Multiplayer/IMultiplayerClient.cs  |  2 +-
 .../Multiplayer/IMultiplayerRoomServer.cs     |  2 +-
 .../Online/Multiplayer/MultiplayerClient.cs   | 10 ++++++
 .../Online/Multiplayer/MultiplayerRoomUser.cs |  2 +-
 .../Multiplayer/StatefulMultiplayerClient.cs  |  8 ++---
 .../Screens/OnlinePlay/Match/RoomSubScreen.cs | 12 +++----
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 34 +++++++++----------
 .../Participants/ParticipantPanel.cs          |  6 ++--
 .../Multiplayer/TestMultiplayerClient.cs      | 12 +++----
 10 files changed, 50 insertions(+), 40 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index 9aa1f2cf99..8caba5d9c8 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
@@ -139,7 +139,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
                 });
 
-                Client.ChangeUserExtraMods(0, new Mod[]
+                Client.ChangeUserMods(0, new Mod[]
                 {
                     new OsuModHardRock(),
                     new OsuModDifficultyAdjust { ApproachRate = { Value = 1 } }
diff --git a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
index 37f60ab036..f22b0e4e28 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Online.Multiplayer
         /// <param name="beatmapAvailability">The new beatmap availability state of the user.</param>
         Task UserBeatmapAvailabilityChanged(int userId, BeatmapAvailability beatmapAvailability);
 
-        Task UserExtraModsChanged(int userId, IEnumerable<APIMod> mods);
+        Task UserModsChanged(int userId, IEnumerable<APIMod> mods);
 
         /// <summary>
         /// Signals that a match is to be started. This will *only* be sent to clients which are to begin loading at this point.
diff --git a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
index 484acfe957..71555ae23d 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Online.Multiplayer
         /// <param name="newBeatmapAvailability">The proposed new beatmap availability state.</param>
         Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability);
 
-        Task ChangeExtraMods(IEnumerable<APIMod> newMods);
+        Task ChangeUserMods(IEnumerable<APIMod> newMods);
 
         /// <summary>
         /// As the host of a room, start the match.
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 50dc8f661c..ecf314c1e5 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -4,6 +4,7 @@
 #nullable enable
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
@@ -84,6 +85,7 @@ namespace osu.Game.Online.Multiplayer
             connection.On(nameof(IMultiplayerClient.LoadRequested), ((IMultiplayerClient)this).LoadRequested);
             connection.On(nameof(IMultiplayerClient.MatchStarted), ((IMultiplayerClient)this).MatchStarted);
             connection.On(nameof(IMultiplayerClient.ResultsReady), ((IMultiplayerClient)this).ResultsReady);
+            connection.On<int, IEnumerable<APIMod>>(nameof(IMultiplayerClient.UserModsChanged), ((IMultiplayerClient)this).UserModsChanged);
 
             connection.Closed += async ex =>
             {
@@ -182,6 +184,14 @@ namespace osu.Game.Online.Multiplayer
             return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeBeatmapAvailability), newBeatmapAvailability);
         }
 
+        public override Task ChangeUserMods(IEnumerable<APIMod> newMods)
+        {
+            if (!isConnected.Value)
+                return Task.CompletedTask;
+
+            return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeUserMods), newMods);
+        }
+
         public override Task StartMatch()
         {
             if (!isConnected.Value)
diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
index d7f7f9135e..4c9643bfce 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Online.Multiplayer
         public BeatmapAvailability BeatmapAvailability { get; set; } = BeatmapAvailability.LocallyAvailable();
 
         [NotNull]
-        public IEnumerable<APIMod> ExtraMods { get; set; } = Enumerable.Empty<APIMod>();
+        public IEnumerable<APIMod> UserMods { get; set; } = Enumerable.Empty<APIMod>();
 
         public User? User { get; set; }
 
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 33dcf1e8b4..a0e903e89a 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -232,9 +232,9 @@ namespace osu.Game.Online.Multiplayer
 
         public abstract Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability);
 
-        public Task ChangeExtraMods(IEnumerable<Mod> newMods) => ChangeExtraMods(newMods.Select(m => new APIMod(m)).ToList());
+        public Task ChangeUserMods(IEnumerable<Mod> newMods) => ChangeUserMods(newMods.Select(m => new APIMod(m)).ToList());
 
-        public abstract Task ChangeExtraMods(IEnumerable<APIMod> newMods);
+        public abstract Task ChangeUserMods(IEnumerable<APIMod> newMods);
 
         public abstract Task StartMatch();
 
@@ -384,7 +384,7 @@ namespace osu.Game.Online.Multiplayer
             return Task.CompletedTask;
         }
 
-        public Task UserExtraModsChanged(int userId, IEnumerable<APIMod> mods)
+        public Task UserModsChanged(int userId, IEnumerable<APIMod> mods)
         {
             if (Room == null)
                 return Task.CompletedTask;
@@ -397,7 +397,7 @@ namespace osu.Game.Online.Multiplayer
                 if (user == null)
                     return;
 
-                user.ExtraMods = mods;
+                user.UserMods = mods;
 
                 RoomUpdated?.Invoke();
             }, false);
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 3c4c6ce040..6367aa54a7 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
         /// <summary>
         /// Any mods applied by/to the local user.
         /// </summary>
-        protected readonly Bindable<IReadOnlyList<Mod>> ExtraMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
+        protected readonly Bindable<IReadOnlyList<Mod>> UserMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
 
         [Resolved]
         private MusicController music { get; set; }
@@ -62,7 +62,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
             managerUpdated = beatmapManager.ItemUpdated.GetBoundCopy();
             managerUpdated.BindValueChanged(beatmapUpdated);
 
-            ExtraMods.BindValueChanged(_ => updateMods());
+            UserMods.BindValueChanged(_ => updateMods());
         }
 
         public override void OnEntering(IScreen last)
@@ -108,9 +108,9 @@ namespace osu.Game.Screens.OnlinePlay.Match
                 return;
 
             // Remove any extra mods that are no longer allowed.
-            ExtraMods.Value = ExtraMods.Value
-                                       .Where(m => SelectedItem.Value.AllowedMods.Any(a => m.GetType() == a.GetType()))
-                                       .ToList();
+            UserMods.Value = UserMods.Value
+                                     .Where(m => SelectedItem.Value.AllowedMods.Any(a => m.GetType() == a.GetType()))
+                                     .ToList();
 
             updateMods();
 
@@ -134,7 +134,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
             if (SelectedItem.Value == null)
                 return;
 
-            Mods.Value = ExtraMods.Value.Concat(SelectedItem.Value.RequiredMods).ToList();
+            Mods.Value = UserMods.Value.Concat(SelectedItem.Value.RequiredMods).ToList();
         }
 
         private void beginHandlingTrack()
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index c1025e73f8..a31a3e51ee 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -42,9 +42,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         [Resolved]
         private OngoingOperationTracker ongoingOperationTracker { get; set; }
 
-        private ModSelectOverlay extraModSelectOverlay;
+        private ModSelectOverlay userModsSelectOverlay;
         private MultiplayerMatchSettingsOverlay settingsOverlay;
-        private Drawable extraModsSection;
+        private Drawable userModsSection;
 
         private IBindable<bool> isConnected;
 
@@ -149,7 +149,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                                                                         new BeatmapSelectionControl { RelativeSizeAxes = Axes.X }
                                                                     }
                                                                 },
-                                                                extraModsSection = new FillFlowContainer
+                                                                userModsSection = new FillFlowContainer
                                                                 {
                                                                     RelativeSizeAxes = Axes.X,
                                                                     AutoSizeAxes = Axes.Y,
@@ -159,13 +159,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                                                                         new ModDisplay
                                                                         {
                                                                             DisplayUnrankedText = false,
-                                                                            Current = ExtraMods
+                                                                            Current = UserMods
                                                                         },
                                                                         new PurpleTriangleButton
                                                                         {
                                                                             RelativeSizeAxes = Axes.X,
                                                                             Text = "Select",
-                                                                            Action = () => extraModSelectOverlay.Show()
+                                                                            Action = () => userModsSelectOverlay.Show()
                                                                         }
                                                                     }
                                                                 }
@@ -210,9 +210,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                         new Dimension(GridSizeMode.AutoSize),
                     }
                 },
-                extraModSelectOverlay = new SoloModSelectOverlay
+                userModsSelectOverlay = new SoloModSelectOverlay
                 {
-                    SelectedMods = { BindTarget = ExtraMods },
+                    SelectedMods = { BindTarget = UserMods },
                     Stacked = false,
                     IsValidMod = _ => false
                 },
@@ -242,7 +242,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             base.LoadComplete();
 
             Playlist.BindCollectionChanged(onPlaylistChanged, true);
-            ExtraMods.BindValueChanged(onExtraModsChanged);
+            UserMods.BindValueChanged(onUserModsChanged);
 
             client.LoadRequested += onLoadRequested;
 
@@ -262,9 +262,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 return true;
             }
 
-            if (extraModSelectOverlay.State.Value == Visibility.Visible)
+            if (userModsSelectOverlay.State.Value == Visibility.Visible)
             {
-                extraModSelectOverlay.Hide();
+                userModsSelectOverlay.Hide();
                 return true;
             }
 
@@ -277,23 +277,23 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             if (SelectedItem.Value?.AllowedMods.Any() != true)
             {
-                extraModsSection.Hide();
-                extraModSelectOverlay.Hide();
-                extraModSelectOverlay.IsValidMod = _ => false;
+                userModsSection.Hide();
+                userModsSelectOverlay.Hide();
+                userModsSelectOverlay.IsValidMod = _ => false;
             }
             else
             {
-                extraModsSection.Show();
-                extraModSelectOverlay.IsValidMod = m => SelectedItem.Value.AllowedMods.Any(a => a.GetType() == m.GetType());
+                userModsSection.Show();
+                userModsSelectOverlay.IsValidMod = m => SelectedItem.Value.AllowedMods.Any(a => a.GetType() == m.GetType());
             }
         }
 
-        private void onExtraModsChanged(ValueChangedEvent<IReadOnlyList<Mod>> extraMods)
+        private void onUserModsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
         {
             if (client.Room == null)
                 return;
 
-            client.ChangeExtraMods(extraMods.NewValue).CatchUnobservedExceptions();
+            client.ChangeUserMods(mods.NewValue).CatchUnobservedExceptions();
         }
 
         private void onReadyClick()
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index 059e9e518d..a782da4c39 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
-        private ModDisplay extraModsDisplay;
+        private ModDisplay userModsDisplay;
         private StateDisplay userStateDisplay;
         private SpriteIcon crown;
 
@@ -139,7 +139,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
                                 Spacing = new Vector2(10),
                                 Children = new Drawable[]
                                 {
-                                    extraModsDisplay = new ModDisplay
+                                    userModsDisplay = new ModDisplay
                                     {
                                         Anchor = Anchor.Centre,
                                         Origin = Anchor.Centre,
@@ -174,7 +174,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
             var ruleset = rulesets.GetRuleset(Room.Settings.RulesetID).CreateInstance();
 
             userStateDisplay.Status = User.State;
-            extraModsDisplay.Current.Value = User.ExtraMods.Select(m => m.ToMod(ruleset)).ToList();
+            userModsDisplay.Current.Value = User.UserMods.Select(m => m.ToMod(ruleset)).ToList();
 
             if (Room.Host?.Equals(User) == true)
                 crown.FadeIn(fade_time);
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index e699e7fb34..d0d41e56c3 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -124,18 +124,18 @@ namespace osu.Game.Tests.Visual.Multiplayer
             return Task.CompletedTask;
         }
 
-        public void ChangeUserExtraMods(int userId, IEnumerable<Mod> newMods)
-            => ChangeUserExtraMods(userId, newMods.Select(m => new APIMod(m)).ToList());
+        public void ChangeUserMods(int userId, IEnumerable<Mod> newMods)
+            => ChangeUserMods(userId, newMods.Select(m => new APIMod(m)).ToList());
 
-        public void ChangeUserExtraMods(int userId, IEnumerable<APIMod> newMods)
+        public void ChangeUserMods(int userId, IEnumerable<APIMod> newMods)
         {
             Debug.Assert(Room != null);
-            ((IMultiplayerClient)this).UserExtraModsChanged(userId, newMods.ToList());
+            ((IMultiplayerClient)this).UserModsChanged(userId, newMods.ToList());
         }
 
-        public override Task ChangeExtraMods(IEnumerable<APIMod> newMods)
+        public override Task ChangeUserMods(IEnumerable<APIMod> newMods)
         {
-            ChangeUserExtraMods(api.LocalUser.Value.Id, newMods);
+            ChangeUserMods(api.LocalUser.Value.Id, newMods);
             return Task.CompletedTask;
         }
 

From 3cd30d284eb01689fab740342244ad33e37d66f7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 18:08:49 +0900
Subject: [PATCH 1181/3722] Renamespace

---
 .../TestSceneFreeModSelectOverlay.cs          |  2 +-
 .../OnlinePlay/Match/FooterButtonFreeMods.cs  | 63 +++++++++++++++++++
 .../FreeModSelectOverlay.cs                   |  2 +-
 .../Multiplayer/MultiplayerMatchSongSelect.cs | 54 ----------------
 .../OnlinePlay/OnlinePlaySongSelect.cs        |  2 +-
 5 files changed, 66 insertions(+), 57 deletions(-)
 create mode 100644 osu.Game/Screens/OnlinePlay/Match/FooterButtonFreeMods.cs
 rename osu.Game/Screens/OnlinePlay/{Multiplayer => Match}/FreeModSelectOverlay.cs (98%)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs
index 960402df88..b1700d5b6e 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs
@@ -4,7 +4,7 @@
 using NUnit.Framework;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Overlays.Mods;
-using osu.Game.Screens.OnlinePlay.Multiplayer;
+using osu.Game.Screens.OnlinePlay.Match;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
diff --git a/osu.Game/Screens/OnlinePlay/Match/FooterButtonFreeMods.cs b/osu.Game/Screens/OnlinePlay/Match/FooterButtonFreeMods.cs
new file mode 100644
index 0000000000..ca2db877c3
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Match/FooterButtonFreeMods.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.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Screens.Play.HUD;
+using osu.Game.Screens.Select;
+using osuTK;
+
+namespace osu.Game.Screens.OnlinePlay.Match
+{
+    public class FooterButtonFreeMods : FooterButton, IHasCurrentValue<IReadOnlyList<Mod>>
+    {
+        public Bindable<IReadOnlyList<Mod>> Current
+        {
+            get => modDisplay.Current;
+            set => modDisplay.Current = value;
+        }
+
+        private readonly ModDisplay modDisplay;
+
+        public FooterButtonFreeMods()
+        {
+            ButtonContentContainer.Add(modDisplay = new ModDisplay
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                DisplayUnrankedText = false,
+                Scale = new Vector2(0.8f),
+                ExpansionMode = ExpansionMode.AlwaysContracted,
+            });
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            SelectedColour = colours.Yellow;
+            DeselectedColour = SelectedColour.Opacity(0.5f);
+            Text = @"freemods";
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Current.BindValueChanged(_ => updateModDisplay(), true);
+        }
+
+        private void updateModDisplay()
+        {
+            if (Current.Value?.Count > 0)
+                modDisplay.FadeIn();
+            else
+                modDisplay.FadeOut();
+        }
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs
similarity index 98%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs
rename to osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs
index 8334df1e44..aba86a3d72 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/FreeModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs
@@ -10,7 +10,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.Mods;
 using osu.Game.Rulesets.Mods;
 
-namespace osu.Game.Screens.OnlinePlay.Multiplayer
+namespace osu.Game.Screens.OnlinePlay.Match
 {
     public class FreeModSelectOverlay : ModSelectOverlay
     {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index 80bb7c7ac2..e6b7656986 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -2,23 +2,15 @@
 // 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.UserInterface;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
-using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Select;
-using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
@@ -78,50 +70,4 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         protected override bool IsValidFreeMod(Mod mod) => base.IsValidFreeMod(mod) && !(mod is ModTimeRamp) && !(mod is ModRateAdjust);
     }
-
-    public class FooterButtonFreeMods : FooterButton, IHasCurrentValue<IReadOnlyList<Mod>>
-    {
-        public Bindable<IReadOnlyList<Mod>> Current
-        {
-            get => modDisplay.Current;
-            set => modDisplay.Current = value;
-        }
-
-        private readonly ModDisplay modDisplay;
-
-        public FooterButtonFreeMods()
-        {
-            ButtonContentContainer.Add(modDisplay = new ModDisplay
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                DisplayUnrankedText = false,
-                Scale = new Vector2(0.8f),
-                ExpansionMode = ExpansionMode.AlwaysContracted,
-            });
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            SelectedColour = colours.Yellow;
-            DeselectedColour = SelectedColour.Opacity(0.5f);
-            Text = @"freemods";
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            Current.BindValueChanged(_ => updateModDisplay(), true);
-        }
-
-        private void updateModDisplay()
-        {
-            if (Current.Value?.Count > 0)
-                modDisplay.FadeIn();
-            else
-                modDisplay.FadeOut();
-        }
-    }
 }
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
index 7c64e00dc4..b75bf93204 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
@@ -15,7 +15,7 @@ using osu.Game.Online.Rooms;
 using osu.Game.Overlays.Mods;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Screens.OnlinePlay.Multiplayer;
+using osu.Game.Screens.OnlinePlay.Match;
 using osu.Game.Screens.Select;
 
 namespace osu.Game.Screens.OnlinePlay

From 3e74f8fd9e260c48b4240a98bd7bfd2eef2c0598 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 18:11:20 +0900
Subject: [PATCH 1182/3722] Disable customisation of freemods, move stacking to
 property

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    | 28 ++++++++-----------
 .../OnlinePlay/Match/FreeModSelectOverlay.cs  |  7 ++---
 .../Multiplayer/MultiplayerMatchSubScreen.cs  |  8 ++++--
 3 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index db9460c494..56246a031d 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -39,6 +39,16 @@ namespace osu.Game.Overlays.Mods
 
         protected readonly OsuSpriteText MultiplierLabel;
 
+        /// <summary>
+        /// Whether to allow customisation of mod settings.
+        /// </summary>
+        protected virtual bool AllowCustomisation => true;
+
+        /// <summary>
+        /// Whether mod icons should be stacked, or appear as individual buttons.
+        /// </summary>
+        protected virtual bool Stacked => true;
+
         protected override bool BlockNonPositionalInput => false;
 
         protected override bool DimMainContent => false;
@@ -47,21 +57,6 @@ namespace osu.Game.Overlays.Mods
 
         protected readonly ModSettingsContainer ModSettingsContainer;
 
-        private bool stacked = true;
-
-        /// <summary>
-        /// Whether mod icons should be stacked, or appear as individual buttons.
-        /// </summary>
-        public bool Stacked
-        {
-            get => stacked;
-            set
-            {
-                stacked = value;
-                updateAvailableMods();
-            }
-        }
-
         [NotNull]
         private Func<Mod, bool> isValidMod = m => true;
 
@@ -307,6 +302,7 @@ namespace osu.Game.Overlays.Mods
                                             CustomiseButton = new TriangleButton
                                             {
                                                 Width = 180,
+                                                Alpha = AllowCustomisation ? 1 : 0,
                                                 Text = "Customisation",
                                                 Action = () => ModSettingsContainer.ToggleVisibility(),
                                                 Enabled = { Value = false },
@@ -445,7 +441,7 @@ namespace osu.Game.Overlays.Mods
             {
                 IEnumerable<Mod> modEnumeration = availableMods.Value[section.ModType];
 
-                if (!stacked)
+                if (!Stacked)
                     modEnumeration = ModValidation.FlattenMods(modEnumeration);
 
                 section.Mods = modEnumeration.Where(IsValidMod);
diff --git a/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs
index aba86a3d72..0d62cc3d37 100644
--- a/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs
@@ -14,10 +14,9 @@ namespace osu.Game.Screens.OnlinePlay.Match
 {
     public class FreeModSelectOverlay : ModSelectOverlay
     {
-        public FreeModSelectOverlay()
-        {
-            Stacked = false;
-        }
+        protected override bool AllowCustomisation => false;
+
+        protected override bool Stacked => false;
 
         protected override ModSection CreateModSection(ModType type) => new FreeModSection(type);
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index a31a3e51ee..22a58add70 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -210,10 +210,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                         new Dimension(GridSizeMode.AutoSize),
                     }
                 },
-                userModsSelectOverlay = new SoloModSelectOverlay
+                userModsSelectOverlay = new UserModSelectOverlay
                 {
                     SelectedMods = { BindTarget = UserMods },
-                    Stacked = false,
                     IsValidMod = _ => false
                 },
                 settingsOverlay = new MultiplayerMatchSettingsOverlay
@@ -352,5 +351,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             if (client != null)
                 client.LoadRequested -= onLoadRequested;
         }
+
+        private class UserModSelectOverlay : SoloModSelectOverlay
+        {
+            protected override bool Stacked => false;
+        }
     }
 }

From e134af82f52373cd3b360ab31139271c5d91007a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 18:16:38 +0900
Subject: [PATCH 1183/3722] Stack freemods for the local user

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs           | 12 +++++++++++-
 .../Multiplayer/MultiplayerMatchSubScreen.cs         |  7 +------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 56246a031d..2e69f15ff5 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -444,10 +444,20 @@ namespace osu.Game.Overlays.Mods
                 if (!Stacked)
                     modEnumeration = ModValidation.FlattenMods(modEnumeration);
 
-                section.Mods = modEnumeration.Where(IsValidMod);
+                section.Mods = modEnumeration.Select(validModOrNull).Where(m => m != null);
             }
         }
 
+        [CanBeNull]
+        private Mod validModOrNull([NotNull] Mod mod)
+        {
+            if (!(mod is MultiMod multi))
+                return IsValidMod(mod) ? mod : null;
+
+            var validSubset = multi.Mods.Select(validModOrNull).Where(m => m != null).ToArray();
+            return validSubset.Length == 0 ? null : new MultiMod(validSubset);
+        }
+
         private void selectedModsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
         {
             foreach (var section in ModSectionsContainer.Children)
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 22a58add70..659551abfd 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -210,7 +210,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                         new Dimension(GridSizeMode.AutoSize),
                     }
                 },
-                userModsSelectOverlay = new UserModSelectOverlay
+                userModsSelectOverlay = new SoloModSelectOverlay
                 {
                     SelectedMods = { BindTarget = UserMods },
                     IsValidMod = _ => false
@@ -351,10 +351,5 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             if (client != null)
                 client.LoadRequested -= onLoadRequested;
         }
-
-        private class UserModSelectOverlay : SoloModSelectOverlay
-        {
-            protected override bool Stacked => false;
-        }
     }
 }

From 51cb2887172fb330a8b5ff40961e458c08ef7024 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 18:18:59 +0900
Subject: [PATCH 1184/3722] Reduce mod selection height

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

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 659551abfd..87ae723c63 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -210,10 +210,17 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                         new Dimension(GridSizeMode.AutoSize),
                     }
                 },
-                userModsSelectOverlay = new SoloModSelectOverlay
+                new Container
                 {
-                    SelectedMods = { BindTarget = UserMods },
-                    IsValidMod = _ => false
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomLeft,
+                    RelativeSizeAxes = Axes.Both,
+                    Height = 0.5f,
+                    Child = userModsSelectOverlay = new SoloModSelectOverlay
+                    {
+                        SelectedMods = { BindTarget = UserMods },
+                        IsValidMod = _ => false
+                    }
                 },
                 settingsOverlay = new MultiplayerMatchSettingsOverlay
                 {

From 3a906a89fce84a1dd7195af89aa7808276c1c70a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 18:25:09 +0900
Subject: [PATCH 1185/3722] Pin mod position in participant panels

---
 .../TestSceneMultiplayerParticipantsList.cs   |  6 +++-
 .../Participants/ParticipantPanel.cs          | 33 ++++++++-----------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index 8caba5d9c8..768dc6512c 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
@@ -146,7 +146,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 });
             });
 
-            AddToggleStep("toggle ready state", v => Client.ChangeUserState(0, v ? MultiplayerUserState.Ready : MultiplayerUserState.Idle));
+            for (var i = MultiplayerUserState.Idle; i < MultiplayerUserState.Results; i++)
+            {
+                var state = i;
+                AddStep($"set state: {state}", () => Client.ChangeUserState(0, state));
+            }
         }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index a782da4c39..f6a60c8f57 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -129,32 +129,25 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
                                     }
                                 }
                             },
-                            new FillFlowContainer
+                            new Container
                             {
                                 Anchor = Anchor.CentreRight,
                                 Origin = Anchor.CentreRight,
                                 AutoSizeAxes = Axes.Both,
-                                Direction = FillDirection.Horizontal,
-                                Margin = new MarginPadding { Right = 10 },
-                                Spacing = new Vector2(10),
-                                Children = new Drawable[]
+                                Margin = new MarginPadding { Right = 70 },
+                                Child = userModsDisplay = new ModDisplay
                                 {
-                                    userModsDisplay = new ModDisplay
-                                    {
-                                        Anchor = Anchor.Centre,
-                                        Origin = Anchor.Centre,
-                                        Scale = new Vector2(0.5f),
-                                        ExpansionMode = ExpansionMode.AlwaysContracted,
-                                        DisplayUnrankedText = false,
-                                        ExpandOnAppear = false
-                                    },
-                                    userStateDisplay = new StateDisplay
-                                    {
-                                        Anchor = Anchor.Centre,
-                                        Origin = Anchor.Centre,
-                                        AlwaysPresent = true
-                                    }
+                                    Scale = new Vector2(0.5f),
+                                    ExpansionMode = ExpansionMode.AlwaysContracted,
+                                    DisplayUnrankedText = false,
+                                    ExpandOnAppear = false
                                 }
+                            },
+                            userStateDisplay = new StateDisplay
+                            {
+                                Anchor = Anchor.CentreRight,
+                                Origin = Anchor.CentreRight,
+                                Margin = new MarginPadding { Right = 10 },
                             }
                         }
                     }

From 89a42d60fbc8f33c6cd28d2baa617b33c57b1312 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 18:50:32 +0900
Subject: [PATCH 1186/3722] General cleanup

---
 osu.Game.Tests/Mods/ModValidationTest.cs      | 14 ++++-----
 .../TestSceneFreeModSelectOverlay.cs          |  5 +--
 .../Online/Multiplayer/IMultiplayerClient.cs  |  5 +++
 .../Multiplayer/IMultiplayerRoomServer.cs     |  4 +++
 .../Online/Multiplayer/MultiplayerRoomUser.cs |  3 ++
 .../Multiplayer/StatefulMultiplayerClient.cs  |  6 +++-
 osu.Game/Overlays/Mods/ModButton.cs           |  8 ++---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    | 12 +++++--
 .../OnlinePlay/Match/FreeModSelectOverlay.cs  | 31 ++-----------------
 .../Screens/OnlinePlay/Match/RoomSubScreen.cs |  2 +-
 .../Multiplayer/MultiplayerMatchSongSelect.cs |  2 +-
 .../OnlinePlay/OnlinePlaySongSelect.cs        | 18 +++++++++--
 osu.Game/Screens/Play/HUD/ModDisplay.cs       |  3 ++
 osu.Game/Screens/Select/MatchSongSelect.cs    |  2 +-
 osu.Game/Screens/Select/SongSelect.cs         |  4 +++
 .../Utils/{ModValidation.cs => ModUtils.cs}   | 24 +++-----------
 16 files changed, 71 insertions(+), 72 deletions(-)
 rename osu.Game/Utils/{ModValidation.cs => ModUtils.cs} (79%)

diff --git a/osu.Game.Tests/Mods/ModValidationTest.cs b/osu.Game.Tests/Mods/ModValidationTest.cs
index c7a7e242e9..991adc221e 100644
--- a/osu.Game.Tests/Mods/ModValidationTest.cs
+++ b/osu.Game.Tests/Mods/ModValidationTest.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Tests.Mods
         public void TestModIsCompatibleByItself()
         {
             var mod = new Mock<Mod>();
-            Assert.That(ModValidation.CheckCompatible(new[] { mod.Object }));
+            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod.Object }));
         }
 
         [Test]
@@ -27,8 +27,8 @@ namespace osu.Game.Tests.Mods
             mod1.Setup(m => m.IncompatibleMods).Returns(new[] { mod2.Object.GetType() });
 
             // Test both orderings.
-            Assert.That(ModValidation.CheckCompatible(new[] { mod1.Object, mod2.Object }), Is.False);
-            Assert.That(ModValidation.CheckCompatible(new[] { mod2.Object, mod1.Object }), Is.False);
+            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod1.Object, mod2.Object }), Is.False);
+            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod2.Object, mod1.Object }), Is.False);
         }
 
         [Test]
@@ -43,22 +43,22 @@ namespace osu.Game.Tests.Mods
             var multiMod = new MultiMod(new MultiMod(mod2.Object));
 
             // Test both orderings.
-            Assert.That(ModValidation.CheckCompatible(new[] { multiMod, mod1.Object }), Is.False);
-            Assert.That(ModValidation.CheckCompatible(new[] { mod1.Object, multiMod }), Is.False);
+            Assert.That(ModUtils.CheckCompatibleSet(new[] { multiMod, mod1.Object }), Is.False);
+            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod1.Object, multiMod }), Is.False);
         }
 
         [Test]
         public void TestAllowedThroughMostDerivedType()
         {
             var mod = new Mock<Mod>();
-            Assert.That(ModValidation.CheckAllowed(new[] { mod.Object }, new[] { mod.Object.GetType() }));
+            Assert.That(ModUtils.CheckAllowed(new[] { mod.Object }, new[] { mod.Object.GetType() }));
         }
 
         [Test]
         public void TestNotAllowedThroughBaseType()
         {
             var mod = new Mock<Mod>();
-            Assert.That(ModValidation.CheckAllowed(new[] { mod.Object }, new[] { typeof(Mod) }), Is.False);
+            Assert.That(ModUtils.CheckAllowed(new[] { mod.Object }, new[] { typeof(Mod) }), Is.False);
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs
index b1700d5b6e..e3342eb6a0 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs
@@ -3,19 +3,16 @@
 
 using NUnit.Framework;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Overlays.Mods;
 using osu.Game.Screens.OnlinePlay.Match;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneFreeModSelectOverlay : MultiplayerTestScene
     {
-        private ModSelectOverlay overlay;
-
         [SetUp]
         public new void Setup() => Schedule(() =>
         {
-            Child = overlay = new FreeModSelectOverlay
+            Child = new FreeModSelectOverlay
             {
                 State = { Value = Visibility.Visible }
             };
diff --git a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
index f22b0e4e28..6d7b9d24d6 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerClient.cs
@@ -57,6 +57,11 @@ namespace osu.Game.Online.Multiplayer
         /// <param name="beatmapAvailability">The new beatmap availability state of the user.</param>
         Task UserBeatmapAvailabilityChanged(int userId, BeatmapAvailability beatmapAvailability);
 
+        /// <summary>
+        /// Signals that a user in this room changed their local mods.
+        /// </summary>
+        /// <param name="userId">The ID of the user whose mods have changed.</param>
+        /// <param name="mods">The user's new local mods.</param>
         Task UserModsChanged(int userId, IEnumerable<APIMod> mods);
 
         /// <summary>
diff --git a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
index 71555ae23d..3527ce6314 100644
--- a/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
+++ b/osu.Game/Online/Multiplayer/IMultiplayerRoomServer.cs
@@ -49,6 +49,10 @@ namespace osu.Game.Online.Multiplayer
         /// <param name="newBeatmapAvailability">The proposed new beatmap availability state.</param>
         Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability);
 
+        /// <summary>
+        /// Change the local user's mods in the currently joined room.
+        /// </summary>
+        /// <param name="newMods">The proposed new mods, excluding any required by the room itself.</param>
         Task ChangeUserMods(IEnumerable<APIMod> newMods);
 
         /// <summary>
diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
index 4c9643bfce..7de24826dd 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
@@ -26,6 +26,9 @@ namespace osu.Game.Online.Multiplayer
         /// </summary>
         public BeatmapAvailability BeatmapAvailability { get; set; } = BeatmapAvailability.LocallyAvailable();
 
+        /// <summary>
+        /// Any mods applicable only to the local user.
+        /// </summary>
         [NotNull]
         public IEnumerable<APIMod> UserMods { get; set; } = Enumerable.Empty<APIMod>();
 
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index a0e903e89a..597bee2764 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -232,6 +232,10 @@ namespace osu.Game.Online.Multiplayer
 
         public abstract Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability);
 
+        /// <summary>
+        /// Change the local user's mods in the currently joined room.
+        /// </summary>
+        /// <param name="newMods">The proposed new mods, excluding any required by the room itself.</param>
         public Task ChangeUserMods(IEnumerable<Mod> newMods) => ChangeUserMods(newMods.Select(m => new APIMod(m)).ToList());
 
         public abstract Task ChangeUserMods(IEnumerable<APIMod> newMods);
@@ -393,7 +397,7 @@ namespace osu.Game.Online.Multiplayer
             {
                 var user = Room?.Users.SingleOrDefault(u => u.UserID == userId);
 
-                // errors here are not critical - user mods is mostly for display.
+                // errors here are not critical - user mods are mostly for display.
                 if (user == null)
                     return;
 
diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index 9ea4f65eb2..ab8efdabcc 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -174,7 +174,7 @@ namespace osu.Game.Overlays.Mods
                 switch (e.Button)
                 {
                     case MouseButton.Right:
-                        OnRightClick(e);
+                        SelectNext(-1);
                         break;
                 }
             }
@@ -183,12 +183,8 @@ namespace osu.Game.Overlays.Mods
         protected override bool OnClick(ClickEvent e)
         {
             SelectNext(1);
-            return true;
-        }
 
-        protected virtual void OnRightClick(MouseUpEvent e)
-        {
-            SelectNext(-1);
+            return true;
         }
 
         /// <summary>
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 2e69f15ff5..2950dc7489 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Overlays.Mods
         private Func<Mod, bool> isValidMod = m => true;
 
         /// <summary>
-        /// A function that checks whether a given mod is valid.
+        /// A function that checks whether a given mod is selectable.
         /// </summary>
         [NotNull]
         public Func<Mod, bool> IsValidMod
@@ -442,12 +442,20 @@ namespace osu.Game.Overlays.Mods
                 IEnumerable<Mod> modEnumeration = availableMods.Value[section.ModType];
 
                 if (!Stacked)
-                    modEnumeration = ModValidation.FlattenMods(modEnumeration);
+                    modEnumeration = ModUtils.FlattenMods(modEnumeration);
 
                 section.Mods = modEnumeration.Select(validModOrNull).Where(m => m != null);
             }
         }
 
+        /// <summary>
+        /// Returns a valid form of a given <see cref="Mod"/> if possible, or null otherwise.
+        /// </summary>
+        /// <remarks>
+        /// This is a recursive process during which any invalid mods are culled while preserving <see cref="MultiMod"/> structures where possible.
+        /// </remarks>
+        /// <param name="mod">The <see cref="Mod"/> to check.</param>
+        /// <returns>A valid form of <paramref name="mod"/> if exists, or null otherwise.</returns>
         [CanBeNull]
         private Mod validModOrNull([NotNull] Mod mod)
         {
diff --git a/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs
index 0d62cc3d37..3cdf25fad0 100644
--- a/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs
@@ -5,13 +5,15 @@ using System;
 using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Input.Events;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.Mods;
 using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Screens.OnlinePlay.Match
 {
+    /// <summary>
+    /// A <see cref="ModSelectOverlay"/> used for free-mod selection in online play.
+    /// </summary>
     public class FreeModSelectOverlay : ModSelectOverlay
     {
         protected override bool AllowCustomisation => false;
@@ -29,8 +31,6 @@ namespace osu.Game.Screens.OnlinePlay.Match
             {
             }
 
-            protected override ModButton CreateModButton(Mod mod) => new FreeModButton(mod);
-
             protected override Drawable CreateHeader(string text) => new Container
             {
                 AutoSizeAxes = Axes.Y,
@@ -47,7 +47,6 @@ namespace osu.Game.Screens.OnlinePlay.Match
                 foreach (var button in ButtonsContainer.OfType<ModButton>())
                 {
                     if (value)
-                        // Note: Buttons where only part of the group has an implementation are not fully supported.
                         button.SelectAt(0);
                     else
                         button.Deselect();
@@ -77,29 +76,5 @@ namespace osu.Game.Screens.OnlinePlay.Match
                 Changed?.Invoke(value);
             }
         }
-
-        private class FreeModButton : ModButton
-        {
-            public FreeModButton(Mod mod)
-                : base(mod)
-            {
-            }
-
-            protected override bool OnClick(ClickEvent e)
-            {
-                onClick();
-                return true;
-            }
-
-            protected override void OnRightClick(MouseUpEvent e) => onClick();
-
-            private void onClick()
-            {
-                if (Selected)
-                    Deselect();
-                else
-                    SelectNext(1);
-            }
-        }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 6367aa54a7..f4136c895f 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -107,7 +107,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
             if (SelectedItem.Value == null)
                 return;
 
-            // Remove any extra mods that are no longer allowed.
+            // Remove any user mods that are no longer allowed.
             UserMods.Value = UserMods.Value
                                      .Where(m => SelectedItem.Value.AllowedMods.Any(a => m.GetType() == a.GetType()))
                                      .ToList();
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index e6b7656986..08c00e8372 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             Mods.Value = Playlist.FirstOrDefault()?.RequiredMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
         }
 
-        protected override void OnSetItem(PlaylistItem item)
+        protected override void SelectItem(PlaylistItem item)
         {
             // If the client is already in a room, update via the client.
             // Otherwise, update the playlist directly in preparation for it to be submitted to the API on match creation.
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
index b75bf93204..46be5591a8 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
@@ -76,11 +76,15 @@ namespace osu.Game.Screens.OnlinePlay
             item.AllowedMods.Clear();
             item.AllowedMods.AddRange(freeMods.Value.Select(m => m.CreateCopy()));
 
-            OnSetItem(item);
+            SelectItem(item);
             return true;
         }
 
-        protected abstract void OnSetItem(PlaylistItem item);
+        /// <summary>
+        /// Invoked when the user has requested a selection of a beatmap.
+        /// </summary>
+        /// <param name="item">The resultant <see cref="PlaylistItem"/>. This item has not yet been added to the <see cref="Room"/>'s.</param>
+        protected abstract void SelectItem(PlaylistItem item);
 
         public override bool OnBackButton()
         {
@@ -117,8 +121,18 @@ namespace osu.Game.Screens.OnlinePlay
             return buttons;
         }
 
+        /// <summary>
+        /// Checks whether a given <see cref="Mod"/> is valid for global selection.
+        /// </summary>
+        /// <param name="mod">The <see cref="Mod"/> to check.</param>
+        /// <returns>Whether <paramref name="mod"/> is a valid mod for online play.</returns>
         protected virtual bool IsValidMod(Mod mod) => !(mod is ModAutoplay) && (mod as MultiMod)?.Mods.Any(mm => mm is ModAutoplay) != true;
 
+        /// <summary>
+        /// Checks whether a given <see cref="Mod"/> is valid for per-player free-mod selection.
+        /// </summary>
+        /// <param name="mod">The <see cref="Mod"/> to check.</param>
+        /// <returns>Whether <paramref name="mod"/> is a selectable free-mod.</returns>
         protected virtual bool IsValidFreeMod(Mod mod) => IsValidMod(mod);
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/ModDisplay.cs b/osu.Game/Screens/Play/HUD/ModDisplay.cs
index 2d5b07f056..ce1a8a3205 100644
--- a/osu.Game/Screens/Play/HUD/ModDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ModDisplay.cs
@@ -26,6 +26,9 @@ namespace osu.Game.Screens.Play.HUD
 
         public ExpansionMode ExpansionMode = ExpansionMode.ExpandOnHover;
 
+        /// <summary>
+        /// Whether the mods should initially appear expanded, before potentially contracting into their final expansion state (depending on <see cref="ExpansionMode"/>).
+        /// </summary>
         public bool ExpandOnAppear = true;
 
         private readonly Bindable<IReadOnlyList<Mod>> current = new Bindable<IReadOnlyList<Mod>>();
diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index 23fe9620fe..1de3e0e989 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Screens.Select
             CreateNewItem = createNewItem
         };
 
-        protected override void OnSetItem(PlaylistItem item)
+        protected override void SelectItem(PlaylistItem item)
         {
             switch (Playlist.Count)
             {
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 4af96b7a29..ed6e0a1028 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -300,6 +300,10 @@ namespace osu.Game.Screens.Select
             }
         }
 
+        /// <summary>
+        /// Creates the buttons to be displayed in the footer.
+        /// </summary>
+        /// <returns>A set of <see cref="FooterButton"/> and an optional <see cref="OverlayContainer"/> which the button opens when pressed.</returns>
         protected virtual IEnumerable<(FooterButton, OverlayContainer)> CreateFooterButtons() => new (FooterButton, OverlayContainer)[]
         {
             (new FooterButtonMods { Current = Mods }, ModSelect),
diff --git a/osu.Game/Utils/ModValidation.cs b/osu.Game/Utils/ModUtils.cs
similarity index 79%
rename from osu.Game/Utils/ModValidation.cs
rename to osu.Game/Utils/ModUtils.cs
index 3597396ec4..808dba2900 100644
--- a/osu.Game/Utils/ModValidation.cs
+++ b/osu.Game/Utils/ModUtils.cs
@@ -12,9 +12,9 @@ using osu.Game.Rulesets.Mods;
 namespace osu.Game.Utils
 {
     /// <summary>
-    /// A set of utilities to validate <see cref="Mod"/> combinations.
+    /// A set of utilities to handle <see cref="Mod"/> combinations.
     /// </summary>
-    public static class ModValidation
+    public static class ModUtils
     {
         /// <summary>
         /// Checks that all <see cref="Mod"/>s are compatible with each-other, and that all appear within a set of allowed types.
@@ -25,11 +25,11 @@ namespace osu.Game.Utils
         /// <param name="combination">The <see cref="Mod"/>s to check.</param>
         /// <param name="allowedTypes">The set of allowed <see cref="Mod"/> types.</param>
         /// <returns>Whether all <see cref="Mod"/>s are compatible with each-other and appear in the set of allowed types.</returns>
-        public static bool CheckCompatibleAndAllowed(IEnumerable<Mod> combination, IEnumerable<Type> allowedTypes)
+        public static bool CheckCompatibleSetAndAllowed(IEnumerable<Mod> combination, IEnumerable<Type> allowedTypes)
         {
             // Prevent multiple-enumeration.
             var combinationList = combination as ICollection<Mod> ?? combination.ToArray();
-            return CheckCompatible(combinationList) && CheckAllowed(combinationList, allowedTypes);
+            return CheckCompatibleSet(combinationList) && CheckAllowed(combinationList, allowedTypes);
         }
 
         /// <summary>
@@ -37,7 +37,7 @@ namespace osu.Game.Utils
         /// </summary>
         /// <param name="combination">The <see cref="Mod"/> combination to check.</param>
         /// <returns>Whether all <see cref="Mod"/>s in the combination are compatible with each-other.</returns>
-        public static bool CheckCompatible(IEnumerable<Mod> combination)
+        public static bool CheckCompatibleSet(IEnumerable<Mod> combination)
         {
             var incompatibleTypes = new HashSet<Type>();
             var incomingTypes = new HashSet<Type>();
@@ -83,20 +83,6 @@ namespace osu.Game.Utils
                               .All(m => allowedSet.Contains(m.GetType()));
         }
 
-        /// <summary>
-        /// Determines whether a <see cref="Mod"/> is in a set of incompatible types.
-        /// </summary>
-        /// <remarks>
-        /// A <see cref="Mod"/> can be incompatible through its most-declared type or any of its base types.
-        /// </remarks>
-        /// <param name="mod">The <see cref="Mod"/> to test.</param>
-        /// <param name="incompatibleTypes">The set of incompatible <see cref="Mod"/> types.</param>
-        /// <returns>Whether the given <see cref="Mod"/> is incompatible.</returns>
-        private static bool isModIncompatible(Mod mod, ICollection<Type> incompatibleTypes)
-            => FlattenMod(mod)
-               .SelectMany(m => m.GetType().EnumerateBaseTypes())
-               .Any(incompatibleTypes.Contains);
-
         /// <summary>
         /// Flattens a set of <see cref="Mod"/>s, returning a new set with all <see cref="MultiMod"/>s removed.
         /// </summary>

From ee92ec0a5c2e6120f45b36f14b9a678ecab78e8a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 18:54:47 +0900
Subject: [PATCH 1187/3722] Disallow local user mod customisation

---
 .../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 87ae723c63..f09c7168b3 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -216,7 +216,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                     Origin = Anchor.BottomLeft,
                     RelativeSizeAxes = Axes.Both,
                     Height = 0.5f,
-                    Child = userModsSelectOverlay = new SoloModSelectOverlay
+                    Child = userModsSelectOverlay = new UserModSelectOverlay
                     {
                         SelectedMods = { BindTarget = UserMods },
                         IsValidMod = _ => false
@@ -358,5 +358,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             if (client != null)
                 client.LoadRequested -= onLoadRequested;
         }
+
+        private class UserModSelectOverlay : ModSelectOverlay
+        {
+            protected override bool AllowCustomisation => false;
+        }
     }
 }

From 76ebb3811a03ea45fb5279fab26c9951fe199ba9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 19:05:02 +0900
Subject: [PATCH 1188/3722] Fix mod icons potentially having incorrect colours

---
 osu.Game/Rulesets/UI/ModIcon.cs | 49 +++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index 8ea6c74349..76fcb8e080 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -26,8 +26,6 @@ namespace osu.Game.Rulesets.UI
 
         private const float size = 80;
 
-        private readonly ModType type;
-
         public virtual string TooltipText => mod.IconTooltip;
 
         private Mod mod;
@@ -38,16 +36,22 @@ namespace osu.Game.Rulesets.UI
             set
             {
                 mod = value;
-                updateMod(value);
+
+                if (LoadState >= LoadState.Ready)
+                    updateMod(value);
             }
         }
 
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        private Color4 backgroundColour;
+        private Color4 highlightedColour;
+
         public ModIcon(Mod mod)
         {
             this.mod = mod ?? throw new ArgumentNullException(nameof(mod));
 
-            type = mod.Type;
-
             Size = new Vector2(size);
 
             Children = new Drawable[]
@@ -79,10 +83,20 @@ namespace osu.Game.Rulesets.UI
                     Icon = FontAwesome.Solid.Question
                 },
             };
+        }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
             updateMod(mod);
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            Selected.BindValueChanged(_ => updateColour(), true);
+        }
+
         private void updateMod(Mod value)
         {
             modAcronym.Text = value.Acronym;
@@ -92,20 +106,14 @@ namespace osu.Game.Rulesets.UI
             {
                 modIcon.FadeOut();
                 modAcronym.FadeIn();
-                return;
+            }
+            else
+            {
+                modIcon.FadeIn();
+                modAcronym.FadeOut();
             }
 
-            modIcon.FadeIn();
-            modAcronym.FadeOut();
-        }
-
-        private Color4 backgroundColour;
-        private Color4 highlightedColour;
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            switch (type)
+            switch (value.Type)
             {
                 default:
                 case ModType.DifficultyIncrease:
@@ -139,12 +147,13 @@ namespace osu.Game.Rulesets.UI
                     modIcon.Colour = colours.Yellow;
                     break;
             }
+
+            updateColour();
         }
 
-        protected override void LoadComplete()
+        private void updateColour()
         {
-            base.LoadComplete();
-            Selected.BindValueChanged(selected => background.Colour = selected.NewValue ? highlightedColour : backgroundColour, true);
+            background.Colour = Selected.Value ? highlightedColour : backgroundColour;
         }
     }
 }

From e5ca9b1e500c06e1cc084bcf4f8d1cc8994a3474 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 19:28:33 +0900
Subject: [PATCH 1189/3722] Remove usage of removed method

---
 .../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 3322c8ede1..9e1e9f3d69 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -298,7 +298,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             if (client.Room == null)
                 return;
 
-            client.ChangeUserMods(mods.NewValue).CatchUnobservedExceptions();
+            client.ChangeUserMods(mods.NewValue);
         }
 
         private void onReadyClick()

From b9832c1b2d2e55b06170e67c64c05e2f0cf016fc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 19:37:19 +0900
Subject: [PATCH 1190/3722] Add ModUtils class for validating mod usages

---
 .../osu.Game.Tests.Android.csproj             |   4 +
 osu.Game.Tests.iOS/osu.Game.Tests.iOS.csproj  |   1 +
 osu.Game.Tests/Mods/ModUtilsTest.cs           |  64 ++++++++++
 osu.Game.Tests/osu.Game.Tests.csproj          |   1 +
 osu.Game/Utils/ModUtils.cs                    | 109 ++++++++++++++++++
 5 files changed, 179 insertions(+)
 create mode 100644 osu.Game.Tests/Mods/ModUtilsTest.cs
 create mode 100644 osu.Game/Utils/ModUtils.cs

diff --git a/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj b/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj
index c44ed69c4d..19e36a63f1 100644
--- a/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj
+++ b/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj
@@ -69,5 +69,9 @@
       <Name>osu.Game</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup Label="Package References">
+    <PackageReference Include="DeepEqual" Version="2.0.0" />
+    <PackageReference Include="Moq" Version="4.16.0" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/osu.Game.Tests.iOS/osu.Game.Tests.iOS.csproj b/osu.Game.Tests.iOS/osu.Game.Tests.iOS.csproj
index ca68369ebb..67b2298f4c 100644
--- a/osu.Game.Tests.iOS/osu.Game.Tests.iOS.csproj
+++ b/osu.Game.Tests.iOS/osu.Game.Tests.iOS.csproj
@@ -45,6 +45,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="DeepEqual" Version="2.0.0" />
+    <PackageReference Include="Moq" Version="4.16.0" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/osu.Game.Tests/Mods/ModUtilsTest.cs b/osu.Game.Tests/Mods/ModUtilsTest.cs
new file mode 100644
index 0000000000..fdb441343a
--- /dev/null
+++ b/osu.Game.Tests/Mods/ModUtilsTest.cs
@@ -0,0 +1,64 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using Moq;
+using NUnit.Framework;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Utils;
+
+namespace osu.Game.Tests.Mods
+{
+    [TestFixture]
+    public class ModUtilsTest
+    {
+        [Test]
+        public void TestModIsCompatibleByItself()
+        {
+            var mod = new Mock<Mod>();
+            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod.Object }));
+        }
+
+        [Test]
+        public void TestIncompatibleThroughTopLevel()
+        {
+            var mod1 = new Mock<Mod>();
+            var mod2 = new Mock<Mod>();
+
+            mod1.Setup(m => m.IncompatibleMods).Returns(new[] { mod2.Object.GetType() });
+
+            // Test both orderings.
+            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod1.Object, mod2.Object }), Is.False);
+            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod2.Object, mod1.Object }), Is.False);
+        }
+
+        [Test]
+        public void TestIncompatibleThroughMultiMod()
+        {
+            var mod1 = new Mock<Mod>();
+
+            // The nested mod.
+            var mod2 = new Mock<Mod>();
+            mod2.Setup(m => m.IncompatibleMods).Returns(new[] { mod1.Object.GetType() });
+
+            var multiMod = new MultiMod(new MultiMod(mod2.Object));
+
+            // Test both orderings.
+            Assert.That(ModUtils.CheckCompatibleSet(new[] { multiMod, mod1.Object }), Is.False);
+            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod1.Object, multiMod }), Is.False);
+        }
+
+        [Test]
+        public void TestAllowedThroughMostDerivedType()
+        {
+            var mod = new Mock<Mod>();
+            Assert.That(ModUtils.CheckAllowed(new[] { mod.Object }, new[] { mod.Object.GetType() }));
+        }
+
+        [Test]
+        public void TestNotAllowedThroughBaseType()
+        {
+            var mod = new Mock<Mod>();
+            Assert.That(ModUtils.CheckAllowed(new[] { mod.Object }, new[] { typeof(Mod) }), Is.False);
+        }
+    }
+}
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index c0c0578391..d29ed94b5f 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -7,6 +7,7 @@
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
+    <PackageReference Include="Moq" Version="4.16.0" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
diff --git a/osu.Game/Utils/ModUtils.cs b/osu.Game/Utils/ModUtils.cs
new file mode 100644
index 0000000000..808dba2900
--- /dev/null
+++ b/osu.Game/Utils/ModUtils.cs
@@ -0,0 +1,109 @@
+// Copyright (c) ppy 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.TypeExtensions;
+using osu.Game.Rulesets.Mods;
+
+#nullable enable
+
+namespace osu.Game.Utils
+{
+    /// <summary>
+    /// A set of utilities to handle <see cref="Mod"/> combinations.
+    /// </summary>
+    public static class ModUtils
+    {
+        /// <summary>
+        /// Checks that all <see cref="Mod"/>s are compatible with each-other, and that all appear within a set of allowed types.
+        /// </summary>
+        /// <remarks>
+        /// The allowed types must contain exact <see cref="Mod"/> types for the respective <see cref="Mod"/>s to be allowed.
+        /// </remarks>
+        /// <param name="combination">The <see cref="Mod"/>s to check.</param>
+        /// <param name="allowedTypes">The set of allowed <see cref="Mod"/> types.</param>
+        /// <returns>Whether all <see cref="Mod"/>s are compatible with each-other and appear in the set of allowed types.</returns>
+        public static bool CheckCompatibleSetAndAllowed(IEnumerable<Mod> combination, IEnumerable<Type> allowedTypes)
+        {
+            // Prevent multiple-enumeration.
+            var combinationList = combination as ICollection<Mod> ?? combination.ToArray();
+            return CheckCompatibleSet(combinationList) && CheckAllowed(combinationList, allowedTypes);
+        }
+
+        /// <summary>
+        /// Checks that all <see cref="Mod"/>s in a combination are compatible with each-other.
+        /// </summary>
+        /// <param name="combination">The <see cref="Mod"/> combination to check.</param>
+        /// <returns>Whether all <see cref="Mod"/>s in the combination are compatible with each-other.</returns>
+        public static bool CheckCompatibleSet(IEnumerable<Mod> combination)
+        {
+            var incompatibleTypes = new HashSet<Type>();
+            var incomingTypes = new HashSet<Type>();
+
+            foreach (var mod in combination.SelectMany(FlattenMod))
+            {
+                // Add the new mod incompatibilities, checking whether any match the existing mod types.
+                foreach (var t in mod.IncompatibleMods)
+                {
+                    if (incomingTypes.Contains(t))
+                        return false;
+
+                    incompatibleTypes.Add(t);
+                }
+
+                // Add the new mod types, checking whether any match the incompatible types.
+                foreach (var t in mod.GetType().EnumerateBaseTypes())
+                {
+                    if (incomingTypes.Contains(t))
+                        return false;
+
+                    incomingTypes.Add(t);
+                }
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Checks that all <see cref="Mod"/>s in a combination appear within a set of allowed types.
+        /// </summary>
+        /// <remarks>
+        /// The set of allowed types must contain exact <see cref="Mod"/> types for the respective <see cref="Mod"/>s to be allowed.
+        /// </remarks>
+        /// <param name="combination">The <see cref="Mod"/> combination to check.</param>
+        /// <param name="allowedTypes">The set of allowed <see cref="Mod"/> types.</param>
+        /// <returns>Whether all <see cref="Mod"/>s in the combination are allowed.</returns>
+        public static bool CheckAllowed(IEnumerable<Mod> combination, IEnumerable<Type> allowedTypes)
+        {
+            var allowedSet = new HashSet<Type>(allowedTypes);
+
+            return combination.SelectMany(FlattenMod)
+                              .All(m => allowedSet.Contains(m.GetType()));
+        }
+
+        /// <summary>
+        /// Flattens a set of <see cref="Mod"/>s, returning a new set with all <see cref="MultiMod"/>s removed.
+        /// </summary>
+        /// <param name="mods">The set of <see cref="Mod"/>s to flatten.</param>
+        /// <returns>The new set, containing all <see cref="Mod"/>s in <paramref name="mods"/> recursively with all <see cref="MultiMod"/>s removed.</returns>
+        public static IEnumerable<Mod> FlattenMods(IEnumerable<Mod> mods) => mods.SelectMany(FlattenMod);
+
+        /// <summary>
+        /// Flattens a <see cref="Mod"/>, returning a set of <see cref="Mod"/>s in-place of any <see cref="MultiMod"/>s.
+        /// </summary>
+        /// <param name="mod">The <see cref="Mod"/> to flatten.</param>
+        /// <returns>A set of singular "flattened" <see cref="Mod"/>s</returns>
+        public static IEnumerable<Mod> FlattenMod(Mod mod)
+        {
+            if (mod is MultiMod multi)
+            {
+                foreach (var m in multi.Mods.SelectMany(FlattenMod))
+                    yield return m;
+            }
+            else
+                yield return mod;
+        }
+    }
+}

From 97247b7a673fa552b9f8f5b66aa87e9dfe2293c0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 19:59:18 +0900
Subject: [PATCH 1191/3722] Fix unset key

---
 osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
index a25c332b47..d0e19d9f37 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
@@ -33,6 +33,7 @@ namespace osu.Game.Online.Multiplayer
         public IEnumerable<APIMod> Mods { get; set; } = Enumerable.Empty<APIMod>();
 
         [NotNull]
+        [Key(5)]
         public IEnumerable<APIMod> AllowedMods { get; set; } = Enumerable.Empty<APIMod>();
 
         public bool Equals(MultiplayerRoomSettings other)

From 97e3023df9cb680feedadd089b2eb326078a2e39 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Feb 2021 20:16:58 +0900
Subject: [PATCH 1192/3722] Renamespace/rename MatchSongSelect ->
 PlaylistsSongSelect

---
 .../Visual/Multiplayer/TestSceneMatchSongSelect.cs        | 8 ++++----
 .../OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs        | 3 +--
 .../Playlists/PlaylistsSongSelect.cs}                     | 6 +++---
 3 files changed, 8 insertions(+), 9 deletions(-)
 rename osu.Game/Screens/{Select/MatchSongSelect.cs => OnlinePlay/Playlists/PlaylistsSongSelect.cs} (91%)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
index e0fd7d9874..86429ac50e 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
@@ -19,7 +19,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Screens.OnlinePlay.Components;
-using osu.Game.Screens.Select;
+using osu.Game.Screens.OnlinePlay.Playlists;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         private RulesetStore rulesets;
 
-        private TestMatchSongSelect songSelect;
+        private TestPlaylistsSongSelect songSelect;
 
         [BackgroundDependencyLoader]
         private void load(GameHost host, AudioManager audio)
@@ -89,7 +89,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 Beatmap.SetDefault();
             });
 
-            AddStep("create song select", () => LoadScreen(songSelect = new TestMatchSongSelect()));
+            AddStep("create song select", () => LoadScreen(songSelect = new TestPlaylistsSongSelect()));
             AddUntilStep("wait for present", () => songSelect.IsCurrentScreen());
         }
 
@@ -176,7 +176,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("item has rate 1.5", () => Precision.AlmostEquals(1.5, ((OsuModDoubleTime)Room.Playlist.First().RequiredMods[0]).SpeedChange.Value));
         }
 
-        private class TestMatchSongSelect : MatchSongSelect
+        private class TestPlaylistsSongSelect : PlaylistsSongSelect
         {
             public new MatchBeatmapDetailArea BeatmapDetails => (MatchBeatmapDetailArea)base.BeatmapDetails;
         }
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
index 22580f0537..cedde373b3 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
@@ -13,7 +13,6 @@ using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Screens.OnlinePlay.Match;
 using osu.Game.Screens.OnlinePlay.Match.Components;
-using osu.Game.Screens.Select;
 using osu.Game.Users;
 using Footer = osu.Game.Screens.OnlinePlay.Match.Components.Footer;
 
@@ -188,7 +187,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                 settingsOverlay = new PlaylistsMatchSettingsOverlay
                 {
                     RelativeSizeAxes = Axes.Both,
-                    EditPlaylist = () => this.Push(new MatchSongSelect()),
+                    EditPlaylist = () => this.Push(new PlaylistsSongSelect()),
                     State = { Value = roomId.Value == null ? Visibility.Visible : Visibility.Hidden }
                 }
             };
diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.cs
similarity index 91%
rename from osu.Game/Screens/Select/MatchSongSelect.cs
rename to osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.cs
index 1de3e0e989..0e8db6dfe5 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.cs
@@ -6,12 +6,12 @@ using osu.Framework.Allocation;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Online.Rooms;
-using osu.Game.Screens.OnlinePlay;
 using osu.Game.Screens.OnlinePlay.Components;
+using osu.Game.Screens.Select;
 
-namespace osu.Game.Screens.Select
+namespace osu.Game.Screens.OnlinePlay.Playlists
 {
-    public class MatchSongSelect : OnlinePlaySongSelect
+    public class PlaylistsSongSelect : OnlinePlaySongSelect
     {
         [Resolved]
         private BeatmapManager beatmaps { get; set; }

From ead8262257ed0749b9b81670aa76b534aa73874f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 1 Feb 2021 20:20:10 +0900
Subject: [PATCH 1193/3722] Add function to check for (and return) invalid mods

---
 osu.Game/Utils/ModUtils.cs | 42 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/osu.Game/Utils/ModUtils.cs b/osu.Game/Utils/ModUtils.cs
index 808dba2900..9e638d4f2f 100644
--- a/osu.Game/Utils/ModUtils.cs
+++ b/osu.Game/Utils/ModUtils.cs
@@ -83,6 +83,48 @@ namespace osu.Game.Utils
                               .All(m => allowedSet.Contains(m.GetType()));
         }
 
+        /// <summary>
+        /// Check the provided combination of mods are valid for a local gameplay session.
+        /// </summary>
+        /// <param name="mods">The mods to check.</param>
+        /// <param name="invalidMods">Invalid mods, if any where found. Can be null if all mods were valid.</param>
+        /// <returns>Whether the input mods were all valid. If false, <paramref name="invalidMods"/> will contain all invalid entries.</returns>
+        public static bool CheckValidForGameplay(IEnumerable<Mod> mods, out Mod[]? invalidMods)
+        {
+            mods = mods.ToArray();
+
+            List<Mod>? foundInvalid = null;
+
+            void addInvalid(Mod mod)
+            {
+                foundInvalid ??= new List<Mod>();
+                foundInvalid.Add(mod);
+            }
+
+            foreach (var mod in mods)
+            {
+                bool valid = mod.Type != ModType.System
+                             && mod.HasImplementation
+                             && !(mod is MultiMod);
+
+                if (!valid)
+                {
+                    // if this mod was found as invalid, we can exclude it before potentially excluding more incompatible types.
+                    addInvalid(mod);
+                    continue;
+                }
+
+                foreach (var type in mod.IncompatibleMods)
+                {
+                    foreach (var invalid in mods.Where(m => type.IsInstanceOfType(m)))
+                        addInvalid(invalid);
+                }
+            }
+
+            invalidMods = foundInvalid?.ToArray();
+            return foundInvalid == null;
+        }
+
         /// <summary>
         /// Flattens a set of <see cref="Mod"/>s, returning a new set with all <see cref="MultiMod"/>s removed.
         /// </summary>

From 425dc8a210d69c853c58f4d2a10ce0347914261f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 1 Feb 2021 20:20:19 +0900
Subject: [PATCH 1194/3722] Ensure mods are always in a valid state at a game
 level

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 5acd6bc73d..a00cd5e6a0 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -468,6 +468,12 @@ namespace osu.Game
         private void modsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
         {
             updateModDefaults();
+
+            if (!ModUtils.CheckValidForGameplay(mods.NewValue, out var invalid))
+            {
+                // ensure we always have a valid set of mods.
+                SelectedMods.Value = mods.NewValue.Except(invalid).ToArray();
+            }
         }
 
         private void updateModDefaults()

From 286726feb0cb93c4f3d54e60d690979bba35c005 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 1 Feb 2021 17:44:30 +0000
Subject: [PATCH 1195/3722] Bump SharpCompress from 0.26.0 to 0.27.1

Bumps [SharpCompress](https://github.com/adamhathcock/sharpcompress) from 0.26.0 to 0.27.1.
- [Release notes](https://github.com/adamhathcock/sharpcompress/releases)
- [Commits](https://github.com/adamhathcock/sharpcompress/compare/0.26...0.27.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 1552dff17d..d0aeb10c9c 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -30,7 +30,7 @@
     <PackageReference Include="ppy.osu.Framework" Version="2021.128.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
     <PackageReference Include="Sentry" Version="2.1.8" />
-    <PackageReference Include="SharpCompress" Version="0.26.0" />
+    <PackageReference Include="SharpCompress" Version="0.27.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
diff --git a/osu.iOS.props b/osu.iOS.props
index 48dc01f5de..b40e6a3346 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -89,7 +89,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.128.0" />
-    <PackageReference Include="SharpCompress" Version="0.26.0" />
+    <PackageReference Include="SharpCompress" Version="0.27.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

From 0560676236e2b73eb25726b10a07927912b2b201 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 1 Feb 2021 18:09:05 +0000
Subject: [PATCH 1196/3722] Bump ppy.osu.Framework.NativeLibs from 2020.923.0
 to 2021.115.0

Bumps [ppy.osu.Framework.NativeLibs](https://github.com/ppy/osu-framework) from 2020.923.0 to 2021.115.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2020.923.0...2021.115.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 osu.iOS.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.iOS.props b/osu.iOS.props
index b40e6a3346..dc3527c687 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -93,6 +93,6 @@
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
-    <PackageReference Include="ppy.osu.Framework.NativeLibs" Version="2020.923.0" ExcludeAssets="all" />
+    <PackageReference Include="ppy.osu.Framework.NativeLibs" Version="2021.115.0" ExcludeAssets="all" />
   </ItemGroup>
 </Project>

From 57213e630806a6e25973fa19588009217a0ad9ea Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 1 Feb 2021 18:09:07 +0000
Subject: [PATCH 1197/3722] Bump DiscordRichPresence from 1.0.169 to 1.0.175

Bumps [DiscordRichPresence](https://github.com/Lachee/discord-rpc-csharp) from 1.0.169 to 1.0.175.
- [Release notes](https://github.com/Lachee/discord-rpc-csharp/releases)
- [Commits](https://github.com/Lachee/discord-rpc-csharp/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 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 cce7907c6c..3e0f0cb7f6 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -30,7 +30,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.6" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
-    <PackageReference Include="DiscordRichPresence" Version="1.0.169" />
+    <PackageReference Include="DiscordRichPresence" Version="1.0.175" />
   </ItemGroup>
   <ItemGroup Label="Resources">
     <EmbeddedResource Include="lazer.ico" />

From 15fcabb1282c8c36c4f005e6acba36a7d239fb11 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 1 Feb 2021 22:04:44 +0300
Subject: [PATCH 1198/3722] Add documentation to auto-scroll leniency
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/Chat/DrawableChannel.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Overlays/Chat/DrawableChannel.cs b/osu.Game/Overlays/Chat/DrawableChannel.cs
index 4c8513b1d5..0cd5ecc05a 100644
--- a/osu.Game/Overlays/Chat/DrawableChannel.cs
+++ b/osu.Game/Overlays/Chat/DrawableChannel.cs
@@ -241,6 +241,11 @@ namespace osu.Game.Overlays.Chat
         /// </summary>
         private class ChannelScrollContainer : OsuScrollContainer
         {
+            /// <summary>
+            /// The chat will be automatically scrolled to end if and only if
+            /// the distance between the current scroll position and the end of the scroll
+            /// is less than this value.
+            /// </summary>
             private const float auto_scroll_leniency = 10f;
 
             private float? lastExtent;

From 5c28c030c86a270cd6435955ac82de4daa8a196e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 1 Feb 2021 22:08:55 +0300
Subject: [PATCH 1199/3722] Unconditionally set "autoscroll" state

---
 osu.Game/Overlays/Chat/DrawableChannel.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Chat/DrawableChannel.cs b/osu.Game/Overlays/Chat/DrawableChannel.cs
index 0cd5ecc05a..db6a27bf8c 100644
--- a/osu.Game/Overlays/Chat/DrawableChannel.cs
+++ b/osu.Game/Overlays/Chat/DrawableChannel.cs
@@ -261,8 +261,8 @@ namespace osu.Game.Overlays.Chat
 
                 if ((lastExtent == null || ScrollableExtent > lastExtent) && ShouldAutoScroll)
                     ScrollToEnd();
-                else
-                    ShouldAutoScroll = IsScrolledToEnd(auto_scroll_leniency);
+
+                ShouldAutoScroll = IsScrolledToEnd(auto_scroll_leniency);
 
                 lastExtent = ScrollableExtent;
             }

From 216b0d89a729cff6ad311ebb440f32dcb1e174e6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 1 Feb 2021 19:16:51 +0000
Subject: [PATCH 1200/3722] Bump Sentry from 2.1.8 to 3.0.1

Bumps [Sentry](https://github.com/getsentry/sentry-dotnet) from 2.1.8 to 3.0.1.
- [Release notes](https://github.com/getsentry/sentry-dotnet/releases)
- [Changelog](https://github.com/getsentry/sentry-dotnet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-dotnet/compare/2.1.8...3.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 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 d0aeb10c9c..e2b506e187 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.128.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
-    <PackageReference Include="Sentry" Version="2.1.8" />
+    <PackageReference Include="Sentry" Version="3.0.1" />
     <PackageReference Include="SharpCompress" Version="0.27.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

From dcb1626e4d66649304d9307cdc63329f523192f9 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 1 Feb 2021 22:38:42 +0300
Subject: [PATCH 1201/3722] Remove no longer necessary field

---
 osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
index 02ef024128..8ea05784e9 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
@@ -46,7 +46,6 @@ namespace osu.Game.Tests.Visual.Online
         private ChannelManager channelManager = new ChannelManager();
 
         private TestStandAloneChatDisplay chatDisplay;
-        private TestStandAloneChatDisplay chatDisplay2;
         private int messageIdSequence;
 
         private Channel testChannel;
@@ -72,7 +71,7 @@ namespace osu.Game.Tests.Visual.Online
                     Size = new Vector2(400, 80),
                     Channel = { Value = testChannel },
                 },
-                chatDisplay2 = new TestStandAloneChatDisplay(true)
+                new TestStandAloneChatDisplay(true)
                 {
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreRight,

From f166c4c4148553e381f694cbdb7cca3fb65d7cf1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 11:04:09 +0900
Subject: [PATCH 1202/3722] Rename test

---
 ...tSceneMatchSongSelect.cs => TestScenePlaylistsSongSelect.cs} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename osu.Game.Tests/Visual/Multiplayer/{TestSceneMatchSongSelect.cs => TestScenePlaylistsSongSelect.cs} (99%)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs
similarity index 99%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs
index 86429ac50e..2f7e59f800 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs
@@ -23,7 +23,7 @@ using osu.Game.Screens.OnlinePlay.Playlists;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneMatchSongSelect : RoomTestScene
+    public class TestScenePlaylistsSongSelect : RoomTestScene
     {
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }

From 4cf52077b6dbb51bfb48f4589ed88f47cab886ca Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 11:11:28 +0900
Subject: [PATCH 1203/3722] Make checkbox also respond to all mods selected

---
 osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs
index 3cdf25fad0..9a3c87f1ff 100644
--- a/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs
@@ -57,12 +57,8 @@ namespace osu.Game.Screens.OnlinePlay.Match
             {
                 base.Update();
 
-                // If any of the buttons aren't selected, deselect the checkbox.
-                foreach (var button in ButtonsContainer.OfType<ModButton>())
-                {
-                    if (button.Mods.Any(m => m.HasImplementation) && !button.Selected)
-                        checkbox.Current.Value = false;
-                }
+                var validButtons = ButtonsContainer.OfType<ModButton>().Where(b => b.Mod.HasImplementation);
+                checkbox.Current.Value = validButtons.All(b => b.Selected);
             }
         }
 

From b54f65c28279ffcc4d53b9eebdac6c1b73ac4d30 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 12:48:15 +0900
Subject: [PATCH 1204/3722] Exclude more mods from multiplayer

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs        | 2 +-
 osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index 08c00e8372..f7f0402555 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -68,6 +68,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea();
 
-        protected override bool IsValidFreeMod(Mod mod) => base.IsValidFreeMod(mod) && !(mod is ModTimeRamp) && !(mod is ModRateAdjust);
+        protected override bool IsValidFreeMod(Mod mod) => base.IsValidFreeMod(mod) && !(mod is ModTimeRamp) && !(mod is ModRateAdjust) && !mod.RequiresConfiguration;
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
index 46be5591a8..755dbdb55e 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Screens.OnlinePlay
         /// </summary>
         /// <param name="mod">The <see cref="Mod"/> to check.</param>
         /// <returns>Whether <paramref name="mod"/> is a valid mod for online play.</returns>
-        protected virtual bool IsValidMod(Mod mod) => !(mod is ModAutoplay) && (mod as MultiMod)?.Mods.Any(mm => mm is ModAutoplay) != true;
+        protected virtual bool IsValidMod(Mod mod) => mod.HasImplementation && !(mod is ModAutoplay) && (mod as MultiMod)?.Mods.Any(mm => mm is ModAutoplay) != true;
 
         /// <summary>
         /// Checks whether a given <see cref="Mod"/> is valid for per-player free-mod selection.

From 7a14e14e67db572f8ec1c8154d6e2e0111a0429b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 12:49:49 +0900
Subject: [PATCH 1205/3722] Refactor condition

This won't make any noticeable difference, but is the more correct way
to handle MultiMod because flattening works through infinite recursion levels.
---
 osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
index 755dbdb55e..b0062720e0 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
@@ -17,6 +17,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.OnlinePlay.Match;
 using osu.Game.Screens.Select;
+using osu.Game.Utils;
 
 namespace osu.Game.Screens.OnlinePlay
 {
@@ -126,7 +127,7 @@ namespace osu.Game.Screens.OnlinePlay
         /// </summary>
         /// <param name="mod">The <see cref="Mod"/> to check.</param>
         /// <returns>Whether <paramref name="mod"/> is a valid mod for online play.</returns>
-        protected virtual bool IsValidMod(Mod mod) => mod.HasImplementation && !(mod is ModAutoplay) && (mod as MultiMod)?.Mods.Any(mm => mm is ModAutoplay) != true;
+        protected virtual bool IsValidMod(Mod mod) => mod.HasImplementation && !ModUtils.FlattenMod(mod).Any(m => m is ModAutoplay);
 
         /// <summary>
         /// Checks whether a given <see cref="Mod"/> is valid for per-player free-mod selection.

From 0d5353008c1d3e9520d7d12bf50d6f23b85d9712 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 13:34:34 +0900
Subject: [PATCH 1206/3722] Update sentry sdk usage

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

diff --git a/osu.Game/Utils/SentryLogger.cs b/osu.Game/Utils/SentryLogger.cs
index e8e41cdbbe..be9d01cde6 100644
--- a/osu.Game/Utils/SentryLogger.cs
+++ b/osu.Game/Utils/SentryLogger.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Utils
 
             var options = new SentryOptions
             {
-                Dsn = new Dsn("https://5e342cd55f294edebdc9ad604d28bbd3@sentry.io/1255255"),
+                Dsn = "https://5e342cd55f294edebdc9ad604d28bbd3@sentry.io/1255255",
                 Release = game.Version
             };
 

From 9c3c0895cf2a63d3a7517d53fecf8a0d64c149eb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 13:03:46 +0900
Subject: [PATCH 1207/3722] Hide customise button + multiplier label

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs                | 3 ++-
 osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 25cb75f73a..a7bfac4088 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -37,6 +37,7 @@ namespace osu.Game.Overlays.Mods
         protected readonly TriangleButton CustomiseButton;
         protected readonly TriangleButton CloseButton;
 
+        protected readonly Drawable MultiplierSection;
         protected readonly OsuSpriteText MultiplierLabel;
 
         /// <summary>
@@ -316,7 +317,7 @@ namespace osu.Game.Overlays.Mods
                                                 Origin = Anchor.CentreLeft,
                                                 Anchor = Anchor.CentreLeft,
                                             },
-                                            new FillFlowContainer
+                                            MultiplierSection = new FillFlowContainer
                                             {
                                                 AutoSizeAxes = Axes.Both,
                                                 Spacing = new Vector2(footer_button_spacing / 2, 0),
diff --git a/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs
index 9a3c87f1ff..f22c6603e5 100644
--- a/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs
@@ -20,6 +20,12 @@ namespace osu.Game.Screens.OnlinePlay.Match
 
         protected override bool Stacked => false;
 
+        public FreeModSelectOverlay()
+        {
+            CustomiseButton.Alpha = 0;
+            MultiplierSection.Alpha = 0;
+        }
+
         protected override ModSection CreateModSection(ModType type) => new FreeModSection(type);
 
         private class FreeModSection : ModSection

From 87f9e46b164c540d9f7a531510521087f3840a0c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 13:37:25 +0900
Subject: [PATCH 1208/3722] Add option to select all

---
 osu.Game/Overlays/Mods/ModSection.cs          |  8 +++-
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    | 13 +++---
 .../OnlinePlay/Match/FreeModSelectOverlay.cs  | 40 +++++++++++++++++++
 3 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 5de629424b..993f4ef9d7 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -91,7 +91,13 @@ namespace osu.Game.Overlays.Mods
             return base.OnKeyDown(e);
         }
 
-        public void DeselectAll() => DeselectTypes(buttons.Select(b => b.SelectedMod?.GetType()).Where(t => t != null));
+        public void SelectAll()
+        {
+            foreach (var button in buttons.Where(b => !b.Selected))
+                button.SelectAt(0);
+        }
+
+        public void DeselectAll(bool immediate = false) => DeselectTypes(buttons.Select(b => b.SelectedMod?.GetType()).Where(t => t != null), immediate);
 
         /// <summary>
         /// Deselect one or more mods in this section.
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index a7bfac4088..087990d3f8 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -33,6 +33,7 @@ namespace osu.Game.Overlays.Mods
     {
         public const float HEIGHT = 510;
 
+        protected readonly FillFlowContainer FooterContainer;
         protected readonly TriangleButton DeselectAllButton;
         protected readonly TriangleButton CustomiseButton;
         protected readonly TriangleButton CloseButton;
@@ -85,8 +86,6 @@ namespace osu.Game.Overlays.Mods
         private const float content_width = 0.8f;
         private const float footer_button_spacing = 20;
 
-        private readonly FillFlowContainer footerContainer;
-
         private SampleChannel sampleOn, sampleOff;
 
         protected ModSelectOverlay()
@@ -275,7 +274,7 @@ namespace osu.Game.Overlays.Mods
                                         Colour = new Color4(172, 20, 116, 255),
                                         Alpha = 0.5f,
                                     },
-                                    footerContainer = new FillFlowContainer
+                                    FooterContainer = new FillFlowContainer
                                     {
                                         Origin = Anchor.BottomCentre,
                                         Anchor = Anchor.BottomCentre,
@@ -385,8 +384,8 @@ namespace osu.Game.Overlays.Mods
         {
             base.PopOut();
 
-            footerContainer.MoveToX(content_width, WaveContainer.DISAPPEAR_DURATION, Easing.InSine);
-            footerContainer.FadeOut(WaveContainer.DISAPPEAR_DURATION, Easing.InSine);
+            FooterContainer.MoveToX(content_width, WaveContainer.DISAPPEAR_DURATION, Easing.InSine);
+            FooterContainer.FadeOut(WaveContainer.DISAPPEAR_DURATION, Easing.InSine);
 
             foreach (var section in ModSectionsContainer.Children)
             {
@@ -400,8 +399,8 @@ namespace osu.Game.Overlays.Mods
         {
             base.PopIn();
 
-            footerContainer.MoveToX(0, WaveContainer.APPEAR_DURATION, Easing.OutQuint);
-            footerContainer.FadeIn(WaveContainer.APPEAR_DURATION, Easing.OutQuint);
+            FooterContainer.MoveToX(0, WaveContainer.APPEAR_DURATION, Easing.OutQuint);
+            FooterContainer.FadeIn(WaveContainer.APPEAR_DURATION, Easing.OutQuint);
 
             foreach (var section in ModSectionsContainer.Children)
             {
diff --git a/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs
index f22c6603e5..9a676930a0 100644
--- a/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/FreeModSelectOverlay.cs
@@ -24,6 +24,46 @@ namespace osu.Game.Screens.OnlinePlay.Match
         {
             CustomiseButton.Alpha = 0;
             MultiplierSection.Alpha = 0;
+            DeselectAllButton.Alpha = 0;
+
+            Drawable selectAllButton;
+            Drawable deselectAllButton;
+
+            FooterContainer.AddRange(new[]
+            {
+                selectAllButton = new TriangleButton
+                {
+                    Origin = Anchor.CentreLeft,
+                    Anchor = Anchor.CentreLeft,
+                    Width = 180,
+                    Text = "Select All",
+                    Action = selectAll,
+                },
+                // Unlike the base mod select overlay, this button deselects mods instantaneously.
+                deselectAllButton = new TriangleButton
+                {
+                    Origin = Anchor.CentreLeft,
+                    Anchor = Anchor.CentreLeft,
+                    Width = 180,
+                    Text = "Deselect All",
+                    Action = deselectAll,
+                },
+            });
+
+            FooterContainer.SetLayoutPosition(selectAllButton, -2);
+            FooterContainer.SetLayoutPosition(deselectAllButton, -1);
+        }
+
+        private void selectAll()
+        {
+            foreach (var section in ModSectionsContainer.Children)
+                section.SelectAll();
+        }
+
+        private void deselectAll()
+        {
+            foreach (var section in ModSectionsContainer.Children)
+                section.DeselectAll(true);
         }
 
         protected override ModSection CreateModSection(ModType type) => new FreeModSection(type);

From 1d3dff8c75988867dce9fd6124fdb08bcb84e344 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 13:41:01 +0900
Subject: [PATCH 1209/3722] Refactor ModDisplay flag usage

---
 osu.Game/Screens/Play/HUD/ModDisplay.cs | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ModDisplay.cs b/osu.Game/Screens/Play/HUD/ModDisplay.cs
index ce1a8a3205..052484afc4 100644
--- a/osu.Game/Screens/Play/HUD/ModDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ModDisplay.cs
@@ -113,14 +113,10 @@ namespace osu.Game.Screens.Play.HUD
             else
                 unrankedText.Hide();
 
-            if (ExpandOnAppear)
-            {
-                expand();
-                using (iconsContainer.BeginDelayedSequence(1200))
-                    contract();
-            }
-            else
-                iconsContainer.TransformSpacingTo(new Vector2(-25, 0));
+            expand();
+
+            using (iconsContainer.BeginDelayedSequence(ExpandOnAppear ? 1200 : 0))
+                contract();
         }
 
         private void expand()

From 53cfc3bc6ea4ddda9b8faf32a97b954e5a09c4f9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 13:42:45 +0900
Subject: [PATCH 1210/3722] Make ModIcon a bit more safe

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

diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index 981fe7f4a6..2ff59f4d1a 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.UI
             {
                 mod = value;
 
-                if (LoadState >= LoadState.Ready)
+                if (IsLoaded)
                     updateMod(value);
             }
         }
@@ -98,13 +98,15 @@ namespace osu.Game.Rulesets.UI
         [BackgroundDependencyLoader]
         private void load()
         {
-            updateMod(mod);
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            Selected.BindValueChanged(_ => updateColour(), true);
+
+            Selected.BindValueChanged(_ => updateColour());
+
+            updateMod(mod);
         }
 
         private void updateMod(Mod value)

From 173e20938cd0b87fc47747cc13b8deba60bb9bea Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 13:49:58 +0900
Subject: [PATCH 1211/3722] Revert changes to ModDisplay

---
 .../Multiplayer/Participants/ParticipantPanel.cs           | 1 -
 osu.Game/Screens/Play/HUD/ModDisplay.cs                    | 7 +------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index 8b907066a8..8036e5f702 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -139,7 +139,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
                                     Scale = new Vector2(0.5f),
                                     ExpansionMode = ExpansionMode.AlwaysContracted,
                                     DisplayUnrankedText = false,
-                                    ExpandOnAppear = false
                                 }
                             },
                             userStateDisplay = new StateDisplay
diff --git a/osu.Game/Screens/Play/HUD/ModDisplay.cs b/osu.Game/Screens/Play/HUD/ModDisplay.cs
index 052484afc4..68d019bf71 100644
--- a/osu.Game/Screens/Play/HUD/ModDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ModDisplay.cs
@@ -26,11 +26,6 @@ namespace osu.Game.Screens.Play.HUD
 
         public ExpansionMode ExpansionMode = ExpansionMode.ExpandOnHover;
 
-        /// <summary>
-        /// Whether the mods should initially appear expanded, before potentially contracting into their final expansion state (depending on <see cref="ExpansionMode"/>).
-        /// </summary>
-        public bool ExpandOnAppear = true;
-
         private readonly Bindable<IReadOnlyList<Mod>> current = new Bindable<IReadOnlyList<Mod>>();
 
         public Bindable<IReadOnlyList<Mod>> Current
@@ -115,7 +110,7 @@ namespace osu.Game.Screens.Play.HUD
 
             expand();
 
-            using (iconsContainer.BeginDelayedSequence(ExpandOnAppear ? 1200 : 0))
+            using (iconsContainer.BeginDelayedSequence(1200))
                 contract();
         }
 

From 4194c9308eedc24e5ad6cc6315eb945e0838a7a8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 13:50:05 +0900
Subject: [PATCH 1212/3722] Add xmldoc

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

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 087990d3f8..b20c2d9d19 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -288,7 +288,7 @@ namespace osu.Game.Overlays.Mods
                                             Vertical = 15,
                                             Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING
                                         },
-                                        Children = new Drawable[]
+                                        Children = new[]
                                         {
                                             DeselectAllButton = new TriangleButton
                                             {
@@ -509,6 +509,10 @@ namespace osu.Game.Overlays.Mods
             refreshSelectedMods();
         }
 
+        /// <summary>
+        /// Invoked when a new <see cref="Mod"/> has been selected.
+        /// </summary>
+        /// <param name="mod">The <see cref="Mod"/> that has been selected.</param>
         protected virtual void OnModSelected(Mod mod)
         {
         }

From 0bce9d68335d78f9c9286af6520e330f3d3f5c59 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 13:54:27 +0900
Subject: [PATCH 1213/3722] Clear freemods when ruleset is changed

---
 osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
index b0062720e0..c58632c500 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
@@ -60,6 +60,13 @@ namespace osu.Game.Screens.OnlinePlay
 
             freeMods.Value = Playlist.FirstOrDefault()?.AllowedMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
             FooterPanels.Add(freeModSelectOverlay);
+
+            Ruleset.BindValueChanged(onRulesetChanged);
+        }
+
+        private void onRulesetChanged(ValueChangedEvent<RulesetInfo> ruleset)
+        {
+            freeMods.Value = Array.Empty<Mod>();
         }
 
         protected sealed override bool OnStart()

From 80d88024d6bbca6db1f9ca2765340bb765f5ae07 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 14:13:50 +0900
Subject: [PATCH 1214/3722] Add basic test coverage of CheckValidForGameplay
 function

---
 osu.Game.Tests/Mods/ModUtilsTest.cs | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/osu.Game.Tests/Mods/ModUtilsTest.cs b/osu.Game.Tests/Mods/ModUtilsTest.cs
index fdb441343a..88eee5449c 100644
--- a/osu.Game.Tests/Mods/ModUtilsTest.cs
+++ b/osu.Game.Tests/Mods/ModUtilsTest.cs
@@ -1,9 +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 Moq;
 using NUnit.Framework;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Utils;
 
 namespace osu.Game.Tests.Mods
@@ -60,5 +64,29 @@ namespace osu.Game.Tests.Mods
             var mod = new Mock<Mod>();
             Assert.That(ModUtils.CheckAllowed(new[] { mod.Object }, new[] { typeof(Mod) }), Is.False);
         }
+
+        // test incompatible pair.
+        [TestCase(new[] { typeof(OsuModDoubleTime), typeof(OsuModHalfTime) }, new[] { typeof(OsuModDoubleTime), typeof(OsuModHalfTime) })]
+        // test incompatible pair with derived class.
+        [TestCase(new[] { typeof(OsuModNightcore), typeof(OsuModHalfTime) }, new[] { typeof(OsuModNightcore), typeof(OsuModHalfTime) })]
+        // test system mod.
+        [TestCase(new[] { typeof(OsuModDoubleTime), typeof(OsuModTouchDevice) }, new[] { typeof(OsuModTouchDevice) })]
+        // test valid.
+        [TestCase(new[] { typeof(OsuModDoubleTime), typeof(OsuModHardRock) }, null)]
+        public void TestInvalidModScenarios(Type[] input, Type[] expectedInvalid)
+        {
+            List<Mod> inputMods = new List<Mod>();
+            foreach (var t in input)
+                inputMods.Add((Mod)Activator.CreateInstance(t));
+
+            bool isValid = ModUtils.CheckValidForGameplay(inputMods, out var invalid);
+
+            Assert.That(isValid, Is.EqualTo(expectedInvalid == null));
+
+            if (isValid)
+                Assert.IsNull(invalid);
+            else
+                Assert.That(invalid?.Select(t => t.GetType()), Is.EquivalentTo(expectedInvalid));
+        }
     }
 }

From 1c645601d41491004c96903231c61ce5a163c7b2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 14:14:31 +0900
Subject: [PATCH 1215/3722] Fix typo in xmldoc

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

diff --git a/osu.Game/Utils/ModUtils.cs b/osu.Game/Utils/ModUtils.cs
index 9e638d4f2f..2146abacb6 100644
--- a/osu.Game/Utils/ModUtils.cs
+++ b/osu.Game/Utils/ModUtils.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Utils
         /// Check the provided combination of mods are valid for a local gameplay session.
         /// </summary>
         /// <param name="mods">The mods to check.</param>
-        /// <param name="invalidMods">Invalid mods, if any where found. Can be null if all mods were valid.</param>
+        /// <param name="invalidMods">Invalid mods, if any were found. Can be null if all mods were valid.</param>
         /// <returns>Whether the input mods were all valid. If false, <paramref name="invalidMods"/> will contain all invalid entries.</returns>
         public static bool CheckValidForGameplay(IEnumerable<Mod> mods, out Mod[]? invalidMods)
         {

From ed63b571d2185d4b3e86d77a08c0f9ce656f819c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 15:16:26 +0900
Subject: [PATCH 1216/3722] Add "new" override for ScrollToEnd To
 UserTrackingScrollContainer

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

diff --git a/osu.Game/Graphics/Containers/UserTrackingScrollContainer.cs b/osu.Game/Graphics/Containers/UserTrackingScrollContainer.cs
index b8ce34b204..be33c231c9 100644
--- a/osu.Game/Graphics/Containers/UserTrackingScrollContainer.cs
+++ b/osu.Game/Graphics/Containers/UserTrackingScrollContainer.cs
@@ -45,5 +45,11 @@ namespace osu.Game.Graphics.Containers
             UserScrolling = false;
             base.ScrollTo(value, animated, distanceDecay);
         }
+
+        public new void ScrollToEnd(bool animated = true, bool allowDuringDrag = false)
+        {
+            UserScrolling = false;
+            base.ScrollToEnd(animated, allowDuringDrag);
+        }
     }
 }

From 398ab9c2c2283a8bad2dd2bf513103a606868e89 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 15:16:10 +0900
Subject: [PATCH 1217/3722] Use UserTrackingScrollContainer instead

---
 .../Online/TestSceneStandAloneChatDisplay.cs  |  2 +-
 osu.Game/Overlays/Chat/DrawableChannel.cs     | 32 ++++++++++++-------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
index 8ea05784e9..e7669262fe 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
@@ -208,7 +208,7 @@ namespace osu.Game.Tests.Visual.Online
 
             protected DrawableChannel DrawableChannel => InternalChildren.OfType<DrawableChannel>().First();
 
-            protected OsuScrollContainer ScrollContainer => (OsuScrollContainer)((Container)DrawableChannel.Child).Child;
+            protected UserTrackingScrollContainer ScrollContainer => (UserTrackingScrollContainer)((Container)DrawableChannel.Child).Child;
 
             public FillFlowContainer FillFlow => (FillFlowContainer)ScrollContainer.Child;
 
diff --git a/osu.Game/Overlays/Chat/DrawableChannel.cs b/osu.Game/Overlays/Chat/DrawableChannel.cs
index db6a27bf8c..1d021b331a 100644
--- a/osu.Game/Overlays/Chat/DrawableChannel.cs
+++ b/osu.Game/Overlays/Chat/DrawableChannel.cs
@@ -16,6 +16,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Utils;
 using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Overlays.Chat
@@ -147,8 +148,8 @@ namespace osu.Game.Overlays.Chat
 
             // due to the scroll adjusts from old messages removal above, a scroll-to-end must be enforced,
             // to avoid making the container think the user has scrolled back up and unwantedly disable auto-scrolling.
-            if (scroll.ShouldAutoScroll || newMessages.Any(m => m is LocalMessage))
-                ScheduleAfterChildren(() => scroll.ScrollToEnd());
+            if (newMessages.Any(m => m is LocalMessage))
+                scroll.ScrollToEnd();
         });
 
         private void pendingMessageResolved(Message existing, Message updated) => Schedule(() =>
@@ -239,7 +240,7 @@ namespace osu.Game.Overlays.Chat
         /// <summary>
         /// An <see cref="OsuScrollContainer"/> with functionality to automatically scroll whenever the maximum scrollable distance increases.
         /// </summary>
-        private class ChannelScrollContainer : OsuScrollContainer
+        private class ChannelScrollContainer : UserTrackingScrollContainer
         {
             /// <summary>
             /// The chat will be automatically scrolled to end if and only if
@@ -250,21 +251,30 @@ namespace osu.Game.Overlays.Chat
 
             private float? lastExtent;
 
-            /// <summary>
-            /// Whether this container should automatically scroll to end on the next call to <see cref="UpdateAfterChildren"/>.
-            /// </summary>
-            public bool ShouldAutoScroll { get; private set; } = true;
+            protected override void OnUserScroll(float value, bool animated = true, double? distanceDecay = default)
+            {
+                base.OnUserScroll(value, animated, distanceDecay);
+                lastExtent = null;
+            }
 
             protected override void UpdateAfterChildren()
             {
                 base.UpdateAfterChildren();
 
-                if ((lastExtent == null || ScrollableExtent > lastExtent) && ShouldAutoScroll)
-                    ScrollToEnd();
+                // If the user has scrolled to the bottom of the container, we should resume tracking new content.
+                bool cancelUserScroll = UserScrolling && IsScrolledToEnd(auto_scroll_leniency);
 
-                ShouldAutoScroll = IsScrolledToEnd(auto_scroll_leniency);
+                // If the user hasn't overridden our behaviour and there has been new content added to the container, we should update our scroll position to track it.
+                bool requiresScrollUpdate = !UserScrolling && (lastExtent == null || Precision.AlmostBigger(ScrollableExtent, lastExtent.Value));
 
-                lastExtent = ScrollableExtent;
+                if (cancelUserScroll || requiresScrollUpdate)
+                {
+                    ScheduleAfterChildren(() =>
+                    {
+                        ScrollToEnd();
+                        lastExtent = ScrollableExtent;
+                    });
+                }
             }
         }
     }

From bb0753f68d79860b0631938dbbea7b9cd9ab2210 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 15:44:03 +0900
Subject: [PATCH 1218/3722] Use a better method of cancelling user scroll

---
 .../Containers/UserTrackingScrollContainer.cs        |  2 ++
 osu.Game/Overlays/Chat/DrawableChannel.cs            | 12 ++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/Containers/UserTrackingScrollContainer.cs b/osu.Game/Graphics/Containers/UserTrackingScrollContainer.cs
index be33c231c9..17506ce0f5 100644
--- a/osu.Game/Graphics/Containers/UserTrackingScrollContainer.cs
+++ b/osu.Game/Graphics/Containers/UserTrackingScrollContainer.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Graphics.Containers
         /// </summary>
         public bool UserScrolling { get; private set; }
 
+        public void CancelUserScroll() => UserScrolling = false;
+
         public UserTrackingScrollContainer()
         {
         }
diff --git a/osu.Game/Overlays/Chat/DrawableChannel.cs b/osu.Game/Overlays/Chat/DrawableChannel.cs
index 1d021b331a..de3057e9dc 100644
--- a/osu.Game/Overlays/Chat/DrawableChannel.cs
+++ b/osu.Game/Overlays/Chat/DrawableChannel.cs
@@ -262,17 +262,21 @@ namespace osu.Game.Overlays.Chat
                 base.UpdateAfterChildren();
 
                 // If the user has scrolled to the bottom of the container, we should resume tracking new content.
-                bool cancelUserScroll = UserScrolling && IsScrolledToEnd(auto_scroll_leniency);
+                if (UserScrolling && IsScrolledToEnd(auto_scroll_leniency))
+                    CancelUserScroll();
 
                 // If the user hasn't overridden our behaviour and there has been new content added to the container, we should update our scroll position to track it.
                 bool requiresScrollUpdate = !UserScrolling && (lastExtent == null || Precision.AlmostBigger(ScrollableExtent, lastExtent.Value));
 
-                if (cancelUserScroll || requiresScrollUpdate)
+                if (requiresScrollUpdate)
                 {
                     ScheduleAfterChildren(() =>
                     {
-                        ScrollToEnd();
-                        lastExtent = ScrollableExtent;
+                        if (!UserScrolling)
+                        {
+                            ScrollToEnd();
+                            lastExtent = ScrollableExtent;
+                        }
                     });
                 }
             }

From 3670bd40c2c8dee50cdbc4ab3a61cf412c603b15 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 15:44:11 +0900
Subject: [PATCH 1219/3722] Add test coverage of user scroll overriding

---
 .../Online/TestSceneStandAloneChatDisplay.cs  | 82 +++++++++++++++----
 1 file changed, 66 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
index e7669262fe..0e1c90f88e 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
@@ -12,10 +12,11 @@ using NUnit.Framework;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.Containers;
 using osu.Game.Overlays.Chat;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Online
 {
-    public class TestSceneStandAloneChatDisplay : OsuTestScene
+    public class TestSceneStandAloneChatDisplay : OsuManualInputManagerTestScene
     {
         private readonly User admin = new User
         {
@@ -128,7 +129,7 @@ namespace osu.Game.Tests.Visual.Online
                 Timestamp = DateTimeOffset.Now
             }));
 
-            AddUntilStep("ensure still scrolled to bottom", () => chatDisplay.ScrolledToBottom);
+            checkScrolledToBottom();
 
             const int messages_per_call = 10;
             AddRepeatStep("add many messages", () =>
@@ -157,7 +158,7 @@ namespace osu.Game.Tests.Visual.Online
                 return true;
             });
 
-            AddUntilStep("ensure still scrolled to bottom", () => chatDisplay.ScrolledToBottom);
+            checkScrolledToBottom();
         }
 
         /// <summary>
@@ -165,6 +166,58 @@ namespace osu.Game.Tests.Visual.Online
         /// </summary>
         [Test]
         public void TestMessageWrappingKeepsAutoScrolling()
+        {
+            fillChat();
+
+            // send message with short words for text wrapping to occur when contracting chat.
+            sendMessage();
+
+            AddStep("contract chat", () => chatDisplay.Width -= 100);
+            checkScrolledToBottom();
+
+            AddStep("send another message", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
+            {
+                Sender = admin,
+                Content = "As we were saying...",
+            }));
+
+            checkScrolledToBottom();
+        }
+
+        [Test]
+        public void TestUserScrollOverride()
+        {
+            fillChat();
+
+            sendMessage();
+            checkScrolledToBottom();
+
+            AddStep("User scroll up", () =>
+            {
+                InputManager.MoveMouseTo(chatDisplay.ScreenSpaceDrawQuad.Centre);
+                InputManager.PressButton(MouseButton.Left);
+                InputManager.MoveMouseTo(chatDisplay.ScreenSpaceDrawQuad.Centre + new Vector2(0, chatDisplay.ScreenSpaceDrawQuad.Height));
+                InputManager.ReleaseButton(MouseButton.Left);
+            });
+
+            checkNotScrolledToBottom();
+            sendMessage();
+            checkNotScrolledToBottom();
+
+            AddRepeatStep("User scroll to bottom", () =>
+            {
+                InputManager.MoveMouseTo(chatDisplay.ScreenSpaceDrawQuad.Centre);
+                InputManager.PressButton(MouseButton.Left);
+                InputManager.MoveMouseTo(chatDisplay.ScreenSpaceDrawQuad.Centre - new Vector2(0, chatDisplay.ScreenSpaceDrawQuad.Height));
+                InputManager.ReleaseButton(MouseButton.Left);
+            }, 5);
+
+            checkScrolledToBottom();
+            sendMessage();
+            checkScrolledToBottom();
+        }
+
+        private void fillChat()
         {
             AddStep("fill chat", () =>
             {
@@ -178,27 +231,24 @@ namespace osu.Game.Tests.Visual.Online
                 }
             });
 
-            AddAssert("ensure scrolled to bottom", () => chatDisplay.ScrolledToBottom);
+            checkScrolledToBottom();
+        }
 
-            // send message with short words for text wrapping to occur when contracting chat.
+        private void sendMessage()
+        {
             AddStep("send lorem ipsum", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
             {
                 Sender = longUsernameUser,
                 Content = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce et bibendum velit.",
             }));
-
-            AddStep("contract chat", () => chatDisplay.Width -= 100);
-            AddUntilStep("ensure still scrolled to bottom", () => chatDisplay.ScrolledToBottom);
-
-            AddStep("send another message", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
-            {
-                Sender = admin,
-                Content = "As we were saying...",
-            }));
-
-            AddUntilStep("ensure still scrolled to bottom", () => chatDisplay.ScrolledToBottom);
         }
 
+        private void checkScrolledToBottom() =>
+            AddUntilStep("is scrolled to bottom", () => chatDisplay.ScrolledToBottom);
+
+        private void checkNotScrolledToBottom() =>
+            AddUntilStep("not scrolled to bottom", () => !chatDisplay.ScrolledToBottom);
+
         private class TestStandAloneChatDisplay : StandAloneChatDisplay
         {
             public TestStandAloneChatDisplay(bool textbox = false)

From b3105fb2920ac3f3c24e144550cbc598bbcf0cf3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 15:46:26 +0900
Subject: [PATCH 1220/3722] Add coverage of local echo messages performing
 automatic scrolling

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

diff --git a/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
index 0e1c90f88e..ee01eb5f3a 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
@@ -217,6 +217,33 @@ namespace osu.Game.Tests.Visual.Online
             checkScrolledToBottom();
         }
 
+        [Test]
+        public void TestLocalEchoMessageResetsScroll()
+        {
+            fillChat();
+
+            sendMessage();
+            checkScrolledToBottom();
+
+            AddStep("User scroll up", () =>
+            {
+                InputManager.MoveMouseTo(chatDisplay.ScreenSpaceDrawQuad.Centre);
+                InputManager.PressButton(MouseButton.Left);
+                InputManager.MoveMouseTo(chatDisplay.ScreenSpaceDrawQuad.Centre + new Vector2(0, chatDisplay.ScreenSpaceDrawQuad.Height));
+                InputManager.ReleaseButton(MouseButton.Left);
+            });
+
+            checkNotScrolledToBottom();
+            sendMessage();
+            checkNotScrolledToBottom();
+
+            sendLocalMessage();
+            checkScrolledToBottom();
+
+            sendMessage();
+            checkScrolledToBottom();
+        }
+
         private void fillChat()
         {
             AddStep("fill chat", () =>
@@ -243,6 +270,15 @@ namespace osu.Game.Tests.Visual.Online
             }));
         }
 
+        private void sendLocalMessage()
+        {
+            AddStep("send local echo", () => testChannel.AddLocalEcho(new LocalEchoMessage()
+            {
+                Sender = longUsernameUser,
+                Content = "This is a local echo message.",
+            }));
+        }
+
         private void checkScrolledToBottom() =>
             AddUntilStep("is scrolled to bottom", () => chatDisplay.ScrolledToBottom);
 

From a76314a8760f98474067decfa23c8ed980def836 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 15:57:17 +0900
Subject: [PATCH 1221/3722] Use Update instead of UpdateAfterChildren (no need
 for the latter)

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

diff --git a/osu.Game/Overlays/Chat/DrawableChannel.cs b/osu.Game/Overlays/Chat/DrawableChannel.cs
index de3057e9dc..86ce724390 100644
--- a/osu.Game/Overlays/Chat/DrawableChannel.cs
+++ b/osu.Game/Overlays/Chat/DrawableChannel.cs
@@ -257,9 +257,9 @@ namespace osu.Game.Overlays.Chat
                 lastExtent = null;
             }
 
-            protected override void UpdateAfterChildren()
+            protected override void Update()
             {
-                base.UpdateAfterChildren();
+                base.Update();
 
                 // If the user has scrolled to the bottom of the container, we should resume tracking new content.
                 if (UserScrolling && IsScrolledToEnd(auto_scroll_leniency))
@@ -270,7 +270,8 @@ namespace osu.Game.Overlays.Chat
 
                 if (requiresScrollUpdate)
                 {
-                    ScheduleAfterChildren(() =>
+                    // Schedule required to allow FillFlow to be the correct size.
+                    Schedule(() =>
                     {
                         if (!UserScrolling)
                         {

From 54c0bdf7d3174ec1b6ee5ba61abf096492d7fa2c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 16:04:42 +0900
Subject: [PATCH 1222/3722] Fix PlaylistLoungeTestScene appearing very narrow

---
 .../Visual/Playlists/TestScenePlaylistsLoungeSubScreen.cs  | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsLoungeSubScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsLoungeSubScreen.cs
index 008c862cc3..730bbbb397 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsLoungeSubScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsLoungeSubScreen.cs
@@ -28,12 +28,7 @@ namespace osu.Game.Tests.Visual.Playlists
         {
             base.SetUpSteps();
 
-            AddStep("push screen", () => LoadScreen(loungeScreen = new PlaylistsLoungeSubScreen
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Width = 0.5f,
-            }));
+            AddStep("push screen", () => LoadScreen(loungeScreen = new PlaylistsLoungeSubScreen()));
 
             AddUntilStep("wait for present", () => loungeScreen.IsCurrentScreen());
         }

From 3002fef05eebf7c7102ff2e07838347b232d4749 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 16:11:13 +0900
Subject: [PATCH 1223/3722] Remove empty parenthesis

---
 osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
index ee01eb5f3a..01e67b1681 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
@@ -272,7 +272,7 @@ namespace osu.Game.Tests.Visual.Online
 
         private void sendLocalMessage()
         {
-            AddStep("send local echo", () => testChannel.AddLocalEcho(new LocalEchoMessage()
+            AddStep("send local echo", () => testChannel.AddLocalEcho(new LocalEchoMessage
             {
                 Sender = longUsernameUser,
                 Content = "This is a local echo message.",

From 43052991f8120b51b6cce28f68f07f9250b09b47 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 16:18:55 +0900
Subject: [PATCH 1224/3722] Remove unused using statement

---
 .../Visual/Playlists/TestScenePlaylistsLoungeSubScreen.cs        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsLoungeSubScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsLoungeSubScreen.cs
index 730bbbb397..618447eae2 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsLoungeSubScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsLoungeSubScreen.cs
@@ -4,7 +4,6 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Graphics;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Graphics.Containers;

From bdc05af4b7d3fcf43d919c594991f679410ae18d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 16:30:45 +0900
Subject: [PATCH 1225/3722] Make playlist settings area taller to better match
 screen aspect ratio

---
 .../OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
index 01f9920609..ced6d1c5db 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
@@ -200,7 +200,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                                                             Child = new GridContainer
                                                             {
                                                                 RelativeSizeAxes = Axes.X,
-                                                                Height = 300,
+                                                                Height = 500,
                                                                 Content = new[]
                                                                 {
                                                                     new Drawable[]

From fb52ac8c69792e0101c7f612904cb562b3d1e8c2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 16:57:08 +0900
Subject: [PATCH 1226/3722] Share remove from playlist button design with
 adjacent download button

---
 .../Graphics/UserInterface/DownloadButton.cs  | 60 +++++++------------
 osu.Game/Graphics/UserInterface/GrayButton.cs | 48 +++++++++++++++
 .../OnlinePlay/DrawableRoomPlaylistItem.cs    | 26 +++++++-
 3 files changed, 93 insertions(+), 41 deletions(-)
 create mode 100644 osu.Game/Graphics/UserInterface/GrayButton.cs

diff --git a/osu.Game/Graphics/UserInterface/DownloadButton.cs b/osu.Game/Graphics/UserInterface/DownloadButton.cs
index 5168ff646b..7a8db158c1 100644
--- a/osu.Game/Graphics/UserInterface/DownloadButton.cs
+++ b/osu.Game/Graphics/UserInterface/DownloadButton.cs
@@ -4,54 +4,38 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Online;
 using osuTK;
 
 namespace osu.Game.Graphics.UserInterface
 {
-    public class DownloadButton : OsuAnimatedButton
+    public class DownloadButton : GrayButton
     {
-        public readonly Bindable<DownloadState> State = new Bindable<DownloadState>();
-
-        private readonly SpriteIcon icon;
-        private readonly SpriteIcon checkmark;
-        private readonly Box background;
-
         [Resolved]
         private OsuColour colours { get; set; }
 
+        public readonly Bindable<DownloadState> State = new Bindable<DownloadState>();
+
+        private SpriteIcon checkmark;
+
         public DownloadButton()
+            : base(FontAwesome.Solid.Download)
         {
-            Children = new Drawable[]
-            {
-                background = new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Depth = float.MaxValue
-                },
-                icon = new SpriteIcon
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Size = new Vector2(13),
-                    Icon = FontAwesome.Solid.Download,
-                },
-                checkmark = new SpriteIcon
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    X = 8,
-                    Size = Vector2.Zero,
-                    Icon = FontAwesome.Solid.Check,
-                }
-            };
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
+            AddInternal(checkmark = new SpriteIcon
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                X = 8,
+                Size = Vector2.Zero,
+                Icon = FontAwesome.Solid.Check,
+            });
+
             State.BindValueChanged(updateState, true);
         }
 
@@ -60,27 +44,27 @@ namespace osu.Game.Graphics.UserInterface
             switch (state.NewValue)
             {
                 case DownloadState.NotDownloaded:
-                    background.FadeColour(colours.Gray4, 500, Easing.InOutExpo);
-                    icon.MoveToX(0, 500, Easing.InOutExpo);
+                    Background.FadeColour(colours.Gray4, 500, Easing.InOutExpo);
+                    Icon.MoveToX(0, 500, Easing.InOutExpo);
                     checkmark.ScaleTo(Vector2.Zero, 500, Easing.InOutExpo);
                     TooltipText = "Download";
                     break;
 
                 case DownloadState.Downloading:
-                    background.FadeColour(colours.Blue, 500, Easing.InOutExpo);
-                    icon.MoveToX(0, 500, Easing.InOutExpo);
+                    Background.FadeColour(colours.Blue, 500, Easing.InOutExpo);
+                    Icon.MoveToX(0, 500, Easing.InOutExpo);
                     checkmark.ScaleTo(Vector2.Zero, 500, Easing.InOutExpo);
                     TooltipText = "Downloading...";
                     break;
 
                 case DownloadState.Importing:
-                    background.FadeColour(colours.Yellow, 500, Easing.InOutExpo);
+                    Background.FadeColour(colours.Yellow, 500, Easing.InOutExpo);
                     TooltipText = "Importing";
                     break;
 
                 case DownloadState.LocallyAvailable:
-                    background.FadeColour(colours.Green, 500, Easing.InOutExpo);
-                    icon.MoveToX(-8, 500, Easing.InOutExpo);
+                    Background.FadeColour(colours.Green, 500, Easing.InOutExpo);
+                    Icon.MoveToX(-8, 500, Easing.InOutExpo);
                     checkmark.ScaleTo(new Vector2(13), 500, Easing.InOutExpo);
                     break;
             }
diff --git a/osu.Game/Graphics/UserInterface/GrayButton.cs b/osu.Game/Graphics/UserInterface/GrayButton.cs
new file mode 100644
index 0000000000..dd05701545
--- /dev/null
+++ b/osu.Game/Graphics/UserInterface/GrayButton.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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osuTK;
+
+namespace osu.Game.Graphics.UserInterface
+{
+    public class GrayButton : OsuAnimatedButton
+    {
+        protected SpriteIcon Icon;
+        protected Box Background;
+
+        private readonly IconUsage icon;
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        public GrayButton(IconUsage icon)
+        {
+            this.icon = icon;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Children = new Drawable[]
+            {
+                Background = new Box
+                {
+                    Colour = colours.Gray4,
+                    RelativeSizeAxes = Axes.Both,
+                    Depth = float.MaxValue
+                },
+                Icon = new SpriteIcon
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(13),
+                    Icon = icon,
+                },
+            };
+        }
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index f8982582d5..4316a9508e 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -214,7 +214,8 @@ namespace osu.Game.Screens.OnlinePlay
                     Origin = Anchor.CentreRight,
                     Direction = FillDirection.Horizontal,
                     AutoSizeAxes = Axes.Both,
-                    X = -18,
+                    Spacing = new Vector2(5),
+                    X = -10,
                     ChildrenEnumerable = CreateButtons()
                 }
             }
@@ -225,16 +226,35 @@ namespace osu.Game.Screens.OnlinePlay
             {
                 new PlaylistDownloadButton(Item)
                 {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
                     Size = new Vector2(50, 30)
                 },
-                new IconButton
+                new PlaylistRemoveButton
                 {
-                    Icon = FontAwesome.Solid.MinusSquare,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(30, 30),
                     Alpha = allowEdit ? 1 : 0,
                     Action = () => RequestDeletion?.Invoke(Model),
                 },
             };
 
+        public class PlaylistRemoveButton : GrayButton
+        {
+            public PlaylistRemoveButton()
+                : base(FontAwesome.Solid.MinusSquare)
+            {
+                TooltipText = "Remove from playlist";
+            }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                Icon.Scale = new Vector2(0.8f);
+            }
+        }
+
         protected override bool OnClick(ClickEvent e)
         {
             if (allowSelection)

From 6d9ac4d0f01bfefccd38b399ca9158bd4415ce23 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 16:57:27 +0900
Subject: [PATCH 1227/3722] Increase darkness of gradient on buttons to make
 text readability (slightly) better

---
 .../TestSceneDrawableRoomPlaylist.cs            | 17 ++++++++++++++++-
 .../OnlinePlay/DrawableRoomPlaylistItem.cs      | 14 ++++----------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
index 874c1694eb..16f6723e2d 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
@@ -20,6 +20,7 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Screens.OnlinePlay;
 using osu.Game.Tests.Beatmaps;
+using osu.Game.Users;
 using osuTK;
 using osuTK.Input;
 
@@ -278,7 +279,21 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     playlist.Items.Add(new PlaylistItem
                     {
                         ID = i,
-                        Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
+                        Beatmap =
+                        {
+                            Value = i % 2 == 1
+                                ? new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo
+                                : new BeatmapInfo
+                                {
+                                    Metadata = new BeatmapMetadata
+                                    {
+                                        Artist = "Artist",
+                                        Author = new User { Username = "Creator name here" },
+                                        Title = "Long title used to check background colour",
+                                    },
+                                    BeatmapSet = new BeatmapSetInfo()
+                                }
+                        },
                         Ruleset = { Value = new OsuRuleset().RulesetInfo },
                         RequiredMods =
                         {
diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index 4316a9508e..844758b262 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -342,20 +342,14 @@ namespace osu.Game.Screens.OnlinePlay
                             new Box
                             {
                                 RelativeSizeAxes = Axes.Both,
-                                Colour = ColourInfo.GradientHorizontal(Color4.Black, new Color4(0f, 0f, 0f, 0.9f)),
-                                Width = 0.05f,
+                                Colour = ColourInfo.GradientHorizontal(Color4.Black, new Color4(0f, 0f, 0f, 0.7f)),
+                                Width = 0.4f,
                             },
                             new Box
                             {
                                 RelativeSizeAxes = Axes.Both,
-                                Colour = ColourInfo.GradientHorizontal(new Color4(0f, 0f, 0f, 0.9f), new Color4(0f, 0f, 0f, 0.1f)),
-                                Width = 0.2f,
-                            },
-                            new Box
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Colour = ColourInfo.GradientHorizontal(new Color4(0f, 0f, 0f, 0.1f), new Color4(0, 0, 0, 0)),
-                                Width = 0.05f,
+                                Colour = ColourInfo.GradientHorizontal(new Color4(0f, 0f, 0f, 0.7f), new Color4(0, 0, 0, 0.4f)),
+                                Width = 0.4f,
                             },
                         }
                     }

From 40233fb47cba94b9b48eafdf28944036c301e347 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 17:09:59 +0900
Subject: [PATCH 1228/3722] Make font bolder

---
 .../OnlinePlay/DrawableRoomPlaylistItem.cs    | 155 +++++++++---------
 1 file changed, 80 insertions(+), 75 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index 844758b262..a7015ba1c4 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -124,102 +124,107 @@ namespace osu.Game.Screens.OnlinePlay
             modDisplay.Current.Value = requiredMods.ToArray();
         }
 
-        protected override Drawable CreateContent() => maskingContainer = new Container
+        protected override Drawable CreateContent()
         {
-            RelativeSizeAxes = Axes.X,
-            Height = 50,
-            Masking = true,
-            CornerRadius = 10,
-            Children = new Drawable[]
+            Action<SpriteText> fontParameters = s => s.Font = OsuFont.Default.With(weight: FontWeight.SemiBold);
+
+            return maskingContainer = new Container
             {
-                new Box // A transparent box that forces the border to be drawn if the panel background is opaque
+                RelativeSizeAxes = Axes.X,
+                Height = 50,
+                Masking = true,
+                CornerRadius = 10,
+                Children = new Drawable[]
                 {
-                    RelativeSizeAxes = Axes.Both,
-                    Alpha = 0,
-                    AlwaysPresent = true
-                },
-                new PanelBackground
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Beatmap = { BindTarget = beatmap }
-                },
-                new FillFlowContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding { Left = 8 },
-                    Spacing = new Vector2(8, 0),
-                    Direction = FillDirection.Horizontal,
-                    Children = new Drawable[]
+                    new Box // A transparent box that forces the border to be drawn if the panel background is opaque
                     {
-                        difficultyIconContainer = new Container
+                        RelativeSizeAxes = Axes.Both,
+                        Alpha = 0,
+                        AlwaysPresent = true
+                    },
+                    new PanelBackground
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Beatmap = { BindTarget = beatmap }
+                    },
+                    new FillFlowContainer
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Padding = new MarginPadding { Left = 8 },
+                        Spacing = new Vector2(8, 0),
+                        Direction = FillDirection.Horizontal,
+                        Children = new Drawable[]
                         {
-                            Anchor = Anchor.CentreLeft,
-                            Origin = Anchor.CentreLeft,
-                            AutoSizeAxes = Axes.Both,
-                        },
-                        new FillFlowContainer
-                        {
-                            Anchor = Anchor.CentreLeft,
-                            Origin = Anchor.CentreLeft,
-                            AutoSizeAxes = Axes.Both,
-                            Direction = FillDirection.Vertical,
-                            Children = new Drawable[]
+                            difficultyIconContainer = new Container
                             {
-                                beatmapText = new LinkFlowContainer { AutoSizeAxes = Axes.Both },
-                                new FillFlowContainer
+                                Anchor = Anchor.CentreLeft,
+                                Origin = Anchor.CentreLeft,
+                                AutoSizeAxes = Axes.Both,
+                            },
+                            new FillFlowContainer
+                            {
+                                Anchor = Anchor.CentreLeft,
+                                Origin = Anchor.CentreLeft,
+                                AutoSizeAxes = Axes.Both,
+                                Direction = FillDirection.Vertical,
+                                Children = new Drawable[]
                                 {
-                                    AutoSizeAxes = Axes.Both,
-                                    Direction = FillDirection.Horizontal,
-                                    Spacing = new Vector2(10f, 0),
-                                    Children = new Drawable[]
+                                    beatmapText = new LinkFlowContainer(fontParameters) { AutoSizeAxes = Axes.Both },
+                                    new FillFlowContainer
                                     {
-                                        new FillFlowContainer
+                                        AutoSizeAxes = Axes.Both,
+                                        Direction = FillDirection.Horizontal,
+                                        Spacing = new Vector2(10f, 0),
+                                        Children = new Drawable[]
                                         {
-                                            AutoSizeAxes = Axes.Both,
-                                            Direction = FillDirection.Horizontal,
-                                            Spacing = new Vector2(10f, 0),
-                                            Children = new Drawable[]
+                                            new FillFlowContainer
                                             {
-                                                authorText = new LinkFlowContainer { AutoSizeAxes = Axes.Both },
-                                                explicitContentPill = new ExplicitContentBeatmapPill
+                                                AutoSizeAxes = Axes.Both,
+                                                Direction = FillDirection.Horizontal,
+                                                Spacing = new Vector2(10f, 0),
+                                                Children = new Drawable[]
                                                 {
-                                                    Alpha = 0f,
-                                                    Anchor = Anchor.CentreLeft,
-                                                    Origin = Anchor.CentreLeft,
-                                                    Margin = new MarginPadding { Top = 3f },
-                                                }
+                                                    authorText = new LinkFlowContainer(fontParameters) { AutoSizeAxes = Axes.Both },
+                                                    explicitContentPill = new ExplicitContentBeatmapPill
+                                                    {
+                                                        Alpha = 0f,
+                                                        Anchor = Anchor.CentreLeft,
+                                                        Origin = Anchor.CentreLeft,
+                                                        Margin = new MarginPadding { Top = 3f },
+                                                    }
+                                                },
                                             },
-                                        },
-                                        new Container
-                                        {
-                                            Anchor = Anchor.CentreLeft,
-                                            Origin = Anchor.CentreLeft,
-                                            AutoSizeAxes = Axes.Both,
-                                            Child = modDisplay = new ModDisplay
+                                            new Container
                                             {
-                                                Scale = new Vector2(0.4f),
-                                                DisplayUnrankedText = false,
-                                                ExpansionMode = ExpansionMode.AlwaysExpanded
+                                                Anchor = Anchor.CentreLeft,
+                                                Origin = Anchor.CentreLeft,
+                                                AutoSizeAxes = Axes.Both,
+                                                Child = modDisplay = new ModDisplay
+                                                {
+                                                    Scale = new Vector2(0.4f),
+                                                    DisplayUnrankedText = false,
+                                                    ExpansionMode = ExpansionMode.AlwaysExpanded
+                                                }
                                             }
                                         }
                                     }
                                 }
                             }
                         }
+                    },
+                    new FillFlowContainer
+                    {
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.CentreRight,
+                        Direction = FillDirection.Horizontal,
+                        AutoSizeAxes = Axes.Both,
+                        Spacing = new Vector2(5),
+                        X = -10,
+                        ChildrenEnumerable = CreateButtons()
                     }
-                },
-                new FillFlowContainer
-                {
-                    Anchor = Anchor.CentreRight,
-                    Origin = Anchor.CentreRight,
-                    Direction = FillDirection.Horizontal,
-                    AutoSizeAxes = Axes.Both,
-                    Spacing = new Vector2(5),
-                    X = -10,
-                    ChildrenEnumerable = CreateButtons()
                 }
-            }
-        };
+            };
+        }
 
         protected virtual IEnumerable<Drawable> CreateButtons() =>
             new Drawable[]

From bc8a4f411159140371596546144fd56e34bc63d2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 17:21:46 +0900
Subject: [PATCH 1229/3722] Update test handling

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

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
index 16f6723e2d..960aad10c6 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
@@ -11,8 +11,8 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Platform;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
 using osu.Game.Rulesets;
@@ -242,7 +242,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         }
 
         private void moveToItem(int index, Vector2? offset = null)
-            => AddStep($"move mouse to item {index}", () => InputManager.MoveMouseTo(playlist.ChildrenOfType<OsuRearrangeableListItem<PlaylistItem>>().ElementAt(index), offset));
+            => AddStep($"move mouse to item {index}", () => InputManager.MoveMouseTo(playlist.ChildrenOfType<DifficultyIcon>().ElementAt(index), offset));
 
         private void moveToDragger(int index, Vector2? offset = null) => AddStep($"move mouse to dragger {index}", () =>
         {
@@ -253,7 +253,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         private void moveToDeleteButton(int index, Vector2? offset = null) => AddStep($"move mouse to delete button {index}", () =>
         {
             var item = playlist.ChildrenOfType<OsuRearrangeableListItem<PlaylistItem>>().ElementAt(index);
-            InputManager.MoveMouseTo(item.ChildrenOfType<IconButton>().ElementAt(0), offset);
+            InputManager.MoveMouseTo(item.ChildrenOfType<DrawableRoomPlaylistItem.PlaylistRemoveButton>().ElementAt(0), offset);
         });
 
         private void assertHandleVisibility(int index, bool visible)
@@ -261,7 +261,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 () => (playlist.ChildrenOfType<OsuRearrangeableListItem<PlaylistItem>.PlaylistItemHandle>().ElementAt(index).Alpha > 0) == visible);
 
         private void assertDeleteButtonVisibility(int index, bool visible)
-            => AddAssert($"delete button {index} {(visible ? "is" : "is not")} visible", () => (playlist.ChildrenOfType<IconButton>().ElementAt(2 + index * 2).Alpha > 0) == visible);
+            => AddAssert($"delete button {index} {(visible ? "is" : "is not")} visible", () => (playlist.ChildrenOfType<DrawableRoomPlaylistItem.PlaylistRemoveButton>().ElementAt(2 + index * 2).Alpha > 0) == visible);
 
         private void createPlaylist(bool allowEdit, bool allowSelection)
         {

From 7c29386717cc7f8c96668dc9fb4d970c7b43a17a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 18:01:33 +0900
Subject: [PATCH 1230/3722] Add failing tests

---
 osu.Game.Tests/Mods/ModUtilsTest.cs | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/osu.Game.Tests/Mods/ModUtilsTest.cs b/osu.Game.Tests/Mods/ModUtilsTest.cs
index fdb441343a..b602c082bf 100644
--- a/osu.Game.Tests/Mods/ModUtilsTest.cs
+++ b/osu.Game.Tests/Mods/ModUtilsTest.cs
@@ -47,6 +47,29 @@ namespace osu.Game.Tests.Mods
             Assert.That(ModUtils.CheckCompatibleSet(new[] { mod1.Object, multiMod }), Is.False);
         }
 
+        [Test]
+        public void TestCompatibleMods()
+        {
+            var mod1 = new Mock<Mod>();
+            var mod2 = new Mock<Mod>();
+
+            // Test both orderings.
+            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod1.Object, mod2.Object }), Is.True);
+            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod2.Object, mod1.Object }), Is.True);
+        }
+
+        [Test]
+        public void TestIncompatibleThroughBaseType()
+        {
+            var mod1 = new Mock<Mod>();
+            var mod2 = new Mock<Mod>();
+            mod2.Setup(m => m.IncompatibleMods).Returns(new[] { mod1.Object.GetType().BaseType });
+
+            // Test both orderings.
+            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod1.Object, mod2.Object }), Is.False);
+            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod2.Object, mod1.Object }), Is.False);
+        }
+
         [Test]
         public void TestAllowedThroughMostDerivedType()
         {

From 8232d9d2fe667a201aded46f4df1dba44b93ae7e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 18:01:38 +0900
Subject: [PATCH 1231/3722] Fix incorrect implementation

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

diff --git a/osu.Game/Utils/ModUtils.cs b/osu.Game/Utils/ModUtils.cs
index 808dba2900..34bc0faca4 100644
--- a/osu.Game/Utils/ModUtils.cs
+++ b/osu.Game/Utils/ModUtils.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Utils
                 // Add the new mod types, checking whether any match the incompatible types.
                 foreach (var t in mod.GetType().EnumerateBaseTypes())
                 {
-                    if (incomingTypes.Contains(t))
+                    if (incompatibleTypes.Contains(t))
                         return false;
 
                     incomingTypes.Add(t);

From d0655c21c6db7e73b006a837b276d2efd0492e27 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 18:18:57 +0900
Subject: [PATCH 1232/3722] Simplify implementation of CheckCompatibleSet

---
 osu.Game/Utils/ModUtils.cs | 40 ++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Utils/ModUtils.cs b/osu.Game/Utils/ModUtils.cs
index 34bc0faca4..a9271db1b5 100644
--- a/osu.Game/Utils/ModUtils.cs
+++ b/osu.Game/Utils/ModUtils.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Extensions.TypeExtensions;
 using osu.Game.Rulesets.Mods;
 
 #nullable enable
@@ -29,7 +28,7 @@ namespace osu.Game.Utils
         {
             // Prevent multiple-enumeration.
             var combinationList = combination as ICollection<Mod> ?? combination.ToArray();
-            return CheckCompatibleSet(combinationList) && CheckAllowed(combinationList, allowedTypes);
+            return CheckCompatibleSet(combinationList, out _) && CheckAllowed(combinationList, allowedTypes);
         }
 
         /// <summary>
@@ -38,32 +37,31 @@ namespace osu.Game.Utils
         /// <param name="combination">The <see cref="Mod"/> combination to check.</param>
         /// <returns>Whether all <see cref="Mod"/>s in the combination are compatible with each-other.</returns>
         public static bool CheckCompatibleSet(IEnumerable<Mod> combination)
+            => CheckCompatibleSet(combination, out _);
+
+        /// <summary>
+        /// Checks that all <see cref="Mod"/>s in a combination are compatible with each-other.
+        /// </summary>
+        /// <param name="combination">The <see cref="Mod"/> combination to check.</param>
+        /// <param name="invalidMods">Any invalid mods in the set.</param>
+        /// <returns>Whether all <see cref="Mod"/>s in the combination are compatible with each-other.</returns>
+        public static bool CheckCompatibleSet(IEnumerable<Mod> combination, out List<Mod>? invalidMods)
         {
-            var incompatibleTypes = new HashSet<Type>();
-            var incomingTypes = new HashSet<Type>();
+            invalidMods = null;
 
-            foreach (var mod in combination.SelectMany(FlattenMod))
+            foreach (var mod in combination)
             {
-                // Add the new mod incompatibilities, checking whether any match the existing mod types.
-                foreach (var t in mod.IncompatibleMods)
+                foreach (var type in mod.IncompatibleMods)
                 {
-                    if (incomingTypes.Contains(t))
-                        return false;
-
-                    incompatibleTypes.Add(t);
-                }
-
-                // Add the new mod types, checking whether any match the incompatible types.
-                foreach (var t in mod.GetType().EnumerateBaseTypes())
-                {
-                    if (incompatibleTypes.Contains(t))
-                        return false;
-
-                    incomingTypes.Add(t);
+                    foreach (var invalid in combination.Where(m => type.IsInstanceOfType(m)))
+                    {
+                        invalidMods ??= new List<Mod>();
+                        invalidMods.Add(invalid);
+                    }
                 }
             }
 
-            return true;
+            return invalidMods == null;
         }
 
         /// <summary>

From 1df412a03cde9c1ef9363fc1759f8942ea73ec94 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 18:31:08 +0900
Subject: [PATCH 1233/3722] Fix incorrect handling of multi-mod
 incompatibilities

---
 osu.Game.Tests/Mods/ModUtilsTest.cs | 25 ++++++++++++++++++++++++-
 osu.Game/Utils/ModUtils.cs          |  1 +
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Mods/ModUtilsTest.cs b/osu.Game.Tests/Mods/ModUtilsTest.cs
index b602c082bf..7d3dea7ed5 100644
--- a/osu.Game.Tests/Mods/ModUtilsTest.cs
+++ b/osu.Game.Tests/Mods/ModUtilsTest.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Mods
         }
 
         [Test]
-        public void TestIncompatibleThroughMultiMod()
+        public void TestMultiModIncompatibleWithTopLevel()
         {
             var mod1 = new Mock<Mod>();
 
@@ -47,6 +47,21 @@ namespace osu.Game.Tests.Mods
             Assert.That(ModUtils.CheckCompatibleSet(new[] { mod1.Object, multiMod }), Is.False);
         }
 
+        [Test]
+        public void TestTopLevelIncompatibleWithMultiMod()
+        {
+            // The nested mod.
+            var mod1 = new Mock<CustomMod1>();
+            var multiMod = new MultiMod(new MultiMod(mod1.Object));
+
+            var mod2 = new Mock<CustomMod2>();
+            mod2.Setup(m => m.IncompatibleMods).Returns(new[] { typeof(CustomMod1) });
+
+            // Test both orderings.
+            Assert.That(ModUtils.CheckCompatibleSet(new Mod[] { multiMod, mod2.Object }), Is.False);
+            Assert.That(ModUtils.CheckCompatibleSet(new Mod[] { mod2.Object, multiMod }), Is.False);
+        }
+
         [Test]
         public void TestCompatibleMods()
         {
@@ -83,5 +98,13 @@ namespace osu.Game.Tests.Mods
             var mod = new Mock<Mod>();
             Assert.That(ModUtils.CheckAllowed(new[] { mod.Object }, new[] { typeof(Mod) }), Is.False);
         }
+
+        public abstract class CustomMod1 : Mod
+        {
+        }
+
+        public abstract class CustomMod2 : Mod
+        {
+        }
     }
 }
diff --git a/osu.Game/Utils/ModUtils.cs b/osu.Game/Utils/ModUtils.cs
index a9271db1b5..41f7b1b45c 100644
--- a/osu.Game/Utils/ModUtils.cs
+++ b/osu.Game/Utils/ModUtils.cs
@@ -47,6 +47,7 @@ namespace osu.Game.Utils
         /// <returns>Whether all <see cref="Mod"/>s in the combination are compatible with each-other.</returns>
         public static bool CheckCompatibleSet(IEnumerable<Mod> combination, out List<Mod>? invalidMods)
         {
+            combination = FlattenMods(combination);
             invalidMods = null;
 
             foreach (var mod in combination)

From 9955e0289869be6a14cb67e762a75e9b49a599b1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 18:33:12 +0900
Subject: [PATCH 1234/3722] Make more tests use the custom mod classes

For safety purposes... In implementing the previous tests, I found that
using mod.Object.GetType() can lead to bad assertions since the same
ModProxy class is used for all mocked classes.
---
 osu.Game.Tests/Mods/ModUtilsTest.cs | 40 ++++++++++++++---------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Tests/Mods/ModUtilsTest.cs b/osu.Game.Tests/Mods/ModUtilsTest.cs
index 7d3dea7ed5..e4ded602aa 100644
--- a/osu.Game.Tests/Mods/ModUtilsTest.cs
+++ b/osu.Game.Tests/Mods/ModUtilsTest.cs
@@ -14,37 +14,37 @@ namespace osu.Game.Tests.Mods
         [Test]
         public void TestModIsCompatibleByItself()
         {
-            var mod = new Mock<Mod>();
+            var mod = new Mock<CustomMod1>();
             Assert.That(ModUtils.CheckCompatibleSet(new[] { mod.Object }));
         }
 
         [Test]
         public void TestIncompatibleThroughTopLevel()
         {
-            var mod1 = new Mock<Mod>();
-            var mod2 = new Mock<Mod>();
+            var mod1 = new Mock<CustomMod1>();
+            var mod2 = new Mock<CustomMod2>();
 
             mod1.Setup(m => m.IncompatibleMods).Returns(new[] { mod2.Object.GetType() });
 
             // Test both orderings.
-            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod1.Object, mod2.Object }), Is.False);
-            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod2.Object, mod1.Object }), Is.False);
+            Assert.That(ModUtils.CheckCompatibleSet(new Mod[] { mod1.Object, mod2.Object }), Is.False);
+            Assert.That(ModUtils.CheckCompatibleSet(new Mod[] { mod2.Object, mod1.Object }), Is.False);
         }
 
         [Test]
         public void TestMultiModIncompatibleWithTopLevel()
         {
-            var mod1 = new Mock<Mod>();
+            var mod1 = new Mock<CustomMod1>();
 
             // The nested mod.
-            var mod2 = new Mock<Mod>();
+            var mod2 = new Mock<CustomMod2>();
             mod2.Setup(m => m.IncompatibleMods).Returns(new[] { mod1.Object.GetType() });
 
             var multiMod = new MultiMod(new MultiMod(mod2.Object));
 
             // Test both orderings.
-            Assert.That(ModUtils.CheckCompatibleSet(new[] { multiMod, mod1.Object }), Is.False);
-            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod1.Object, multiMod }), Is.False);
+            Assert.That(ModUtils.CheckCompatibleSet(new Mod[] { multiMod, mod1.Object }), Is.False);
+            Assert.That(ModUtils.CheckCompatibleSet(new Mod[] { mod1.Object, multiMod }), Is.False);
         }
 
         [Test]
@@ -65,37 +65,37 @@ namespace osu.Game.Tests.Mods
         [Test]
         public void TestCompatibleMods()
         {
-            var mod1 = new Mock<Mod>();
-            var mod2 = new Mock<Mod>();
+            var mod1 = new Mock<CustomMod1>();
+            var mod2 = new Mock<CustomMod2>();
 
             // Test both orderings.
-            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod1.Object, mod2.Object }), Is.True);
-            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod2.Object, mod1.Object }), Is.True);
+            Assert.That(ModUtils.CheckCompatibleSet(new Mod[] { mod1.Object, mod2.Object }), Is.True);
+            Assert.That(ModUtils.CheckCompatibleSet(new Mod[] { mod2.Object, mod1.Object }), Is.True);
         }
 
         [Test]
         public void TestIncompatibleThroughBaseType()
         {
-            var mod1 = new Mock<Mod>();
-            var mod2 = new Mock<Mod>();
-            mod2.Setup(m => m.IncompatibleMods).Returns(new[] { mod1.Object.GetType().BaseType });
+            var mod1 = new Mock<CustomMod1>();
+            var mod2 = new Mock<CustomMod2>();
+            mod2.Setup(m => m.IncompatibleMods).Returns(new[] { typeof(Mod) });
 
             // Test both orderings.
-            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod1.Object, mod2.Object }), Is.False);
-            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod2.Object, mod1.Object }), Is.False);
+            Assert.That(ModUtils.CheckCompatibleSet(new Mod[] { mod1.Object, mod2.Object }), Is.False);
+            Assert.That(ModUtils.CheckCompatibleSet(new Mod[] { mod2.Object, mod1.Object }), Is.False);
         }
 
         [Test]
         public void TestAllowedThroughMostDerivedType()
         {
-            var mod = new Mock<Mod>();
+            var mod = new Mock<CustomMod1>();
             Assert.That(ModUtils.CheckAllowed(new[] { mod.Object }, new[] { mod.Object.GetType() }));
         }
 
         [Test]
         public void TestNotAllowedThroughBaseType()
         {
-            var mod = new Mock<Mod>();
+            var mod = new Mock<CustomMod1>();
             Assert.That(ModUtils.CheckAllowed(new[] { mod.Object }, new[] { typeof(Mod) }), Is.False);
         }
 

From 12f52316cd2f198c0d649f41b46ef2975cfbb16d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 18:37:11 +0900
Subject: [PATCH 1235/3722] Prevent multiple enumeration

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

diff --git a/osu.Game/Utils/ModUtils.cs b/osu.Game/Utils/ModUtils.cs
index 41f7b1b45c..9336add465 100644
--- a/osu.Game/Utils/ModUtils.cs
+++ b/osu.Game/Utils/ModUtils.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Utils
         /// <returns>Whether all <see cref="Mod"/>s in the combination are compatible with each-other.</returns>
         public static bool CheckCompatibleSet(IEnumerable<Mod> combination, out List<Mod>? invalidMods)
         {
-            combination = FlattenMods(combination);
+            combination = FlattenMods(combination).ToArray();
             invalidMods = null;
 
             foreach (var mod in combination)

From 052cf1abaedec23cf44022aedc3324dacd5a8168 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 18:42:02 +0900
Subject: [PATCH 1236/3722] Reuse existing method

---
 osu.Game/Utils/ModUtils.cs | 30 ++++++------------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Utils/ModUtils.cs b/osu.Game/Utils/ModUtils.cs
index 05a07f0459..0eb30cbe36 100644
--- a/osu.Game/Utils/ModUtils.cs
+++ b/osu.Game/Utils/ModUtils.cs
@@ -88,40 +88,22 @@ namespace osu.Game.Utils
         /// <param name="mods">The mods to check.</param>
         /// <param name="invalidMods">Invalid mods, if any were found. Can be null if all mods were valid.</param>
         /// <returns>Whether the input mods were all valid. If false, <paramref name="invalidMods"/> will contain all invalid entries.</returns>
-        public static bool CheckValidForGameplay(IEnumerable<Mod> mods, out Mod[]? invalidMods)
+        public static bool CheckValidForGameplay(IEnumerable<Mod> mods, out List<Mod>? invalidMods)
         {
             mods = mods.ToArray();
 
-            List<Mod>? foundInvalid = null;
-
-            void addInvalid(Mod mod)
-            {
-                foundInvalid ??= new List<Mod>();
-                foundInvalid.Add(mod);
-            }
+            CheckCompatibleSet(mods, out invalidMods);
 
             foreach (var mod in mods)
             {
-                bool valid = mod.Type != ModType.System
-                             && mod.HasImplementation
-                             && !(mod is MultiMod);
-
-                if (!valid)
+                if (mod.Type == ModType.System || !mod.HasImplementation || mod is MultiMod)
                 {
-                    // if this mod was found as invalid, we can exclude it before potentially excluding more incompatible types.
-                    addInvalid(mod);
-                    continue;
-                }
-
-                foreach (var type in mod.IncompatibleMods)
-                {
-                    foreach (var invalid in mods.Where(m => type.IsInstanceOfType(m)))
-                        addInvalid(invalid);
+                    invalidMods ??= new List<Mod>();
+                    invalidMods.Add(mod);
                 }
             }
 
-            invalidMods = foundInvalid?.ToArray();
-            return foundInvalid == null;
+            return invalidMods == null;
         }
 
         /// <summary>

From 6fdaf025182f29e39243240dff05d85ac6820810 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 17:57:23 +0900
Subject: [PATCH 1237/3722] Hook up room-level max attempts to UI

---
 .../Screens/OnlinePlay/OnlinePlayComposite.cs |  3 ++
 .../PlaylistsMatchSettingsOverlay.cs          | 45 +++++++------------
 2 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
index 64792a32f3..b2f3e4a1d9 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
@@ -39,6 +39,9 @@ namespace osu.Game.Screens.OnlinePlay
         [Resolved(typeof(Room))]
         protected Bindable<int?> MaxParticipants { get; private set; }
 
+        [Resolved(typeof(Room))]
+        protected Bindable<int?> MaxAttempts { get; private set; }
+
         [Resolved(typeof(Room))]
         protected Bindable<DateTimeOffset?> EndDate { get; private set; }
 
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
index 01f9920609..bf85ecf13d 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
@@ -42,15 +42,13 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
 
             public Action EditPlaylist;
 
-            public OsuTextBox NameField, MaxParticipantsField;
+            public OsuTextBox NameField, MaxParticipantsField, MaxAttemptsField;
             public OsuDropdown<TimeSpan> DurationField;
             public RoomAvailabilityPicker AvailabilityPicker;
-            public GameTypePicker TypePicker;
             public TriangleButton ApplyButton;
 
             public OsuSpriteText ErrorText;
 
-            private OsuSpriteText typeLabel;
             private LoadingLayer loadingLayer;
             private DrawableRoomPlaylist playlist;
             private OsuSpriteText playlistLength;
@@ -134,6 +132,15 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                                                                 }
                                                             }
                                                         },
+                                                        new Section("Allowed attempts (across all playlist items)")
+                                                        {
+                                                            Child = MaxAttemptsField = new SettingsNumberTextBox
+                                                            {
+                                                                RelativeSizeAxes = Axes.X,
+                                                                TabbableContentContainer = this,
+                                                                PlaceholderText = "Unlimited",
+                                                            },
+                                                        },
                                                         new Section("Room visibility")
                                                         {
                                                             Alpha = disabled_alpha,
@@ -142,30 +149,6 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                                                                 Enabled = { Value = false }
                                                             },
                                                         },
-                                                        new Section("Game type")
-                                                        {
-                                                            Alpha = disabled_alpha,
-                                                            Child = new FillFlowContainer
-                                                            {
-                                                                AutoSizeAxes = Axes.Y,
-                                                                RelativeSizeAxes = Axes.X,
-                                                                Direction = FillDirection.Vertical,
-                                                                Spacing = new Vector2(7),
-                                                                Children = new Drawable[]
-                                                                {
-                                                                    TypePicker = new GameTypePicker
-                                                                    {
-                                                                        RelativeSizeAxes = Axes.X,
-                                                                        Enabled = { Value = false }
-                                                                    },
-                                                                    typeLabel = new OsuSpriteText
-                                                                    {
-                                                                        Font = OsuFont.GetFont(size: 14),
-                                                                        Colour = colours.Yellow
-                                                                    },
-                                                                },
-                                                            },
-                                                        },
                                                         new Section("Max participants")
                                                         {
                                                             Alpha = disabled_alpha,
@@ -294,10 +277,8 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                     loadingLayer = new LoadingLayer(true)
                 };
 
-                TypePicker.Current.BindValueChanged(type => typeLabel.Text = type.NewValue?.Name ?? string.Empty, true);
                 RoomName.BindValueChanged(name => NameField.Text = name.NewValue, true);
                 Availability.BindValueChanged(availability => AvailabilityPicker.Current.Value = availability.NewValue, true);
-                Type.BindValueChanged(type => TypePicker.Current.Value = type.NewValue, true);
                 MaxParticipants.BindValueChanged(count => MaxParticipantsField.Text = count.NewValue?.ToString(), true);
                 Duration.BindValueChanged(duration => DurationField.Current.Value = duration.NewValue ?? TimeSpan.FromMinutes(30), true);
 
@@ -326,13 +307,17 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
 
                 RoomName.Value = NameField.Text;
                 Availability.Value = AvailabilityPicker.Current.Value;
-                Type.Value = TypePicker.Current.Value;
 
                 if (int.TryParse(MaxParticipantsField.Text, out int max))
                     MaxParticipants.Value = max;
                 else
                     MaxParticipants.Value = null;
 
+                if (int.TryParse(MaxAttemptsField.Text, out max))
+                    MaxAttempts.Value = max;
+                else
+                    MaxAttempts.Value = null;
+
                 Duration.Value = DurationField.Current.Value;
 
                 manager?.CreateRoom(currentRoom.Value, onSuccess, onError);

From 90acdd4361550d251ede8fc93db8edda2c5a38d2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 18:06:52 +0900
Subject: [PATCH 1238/3722] Display the correct error message on score
 submission failure

The server will return a valid error message in most cases here. We may
eventually want to add some fallback message for cases an error may
occur that isn't of
[InvariantException](https://github.com/ppy/osu-web/blob/3169b33ccc4c540be5f20136393ad5f00d635ff9/app/Exceptions/InvariantException.php#L9-L10) type, but I'm not 100% sure
how to identify these just yet.
---
 osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
index 2c3e7a12e2..7936ab8ecd 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
             {
                 failed = true;
 
-                Logger.Error(e, "Failed to retrieve a score submission token.\n\nThis may happen if you are running an old or non-official release of osu! (ie. you are self-compiling).");
+                Logger.Log($"You are not able to submit a score: {e.Message}", LoggingTarget.Information, LogLevel.Important);
 
                 Schedule(() =>
                 {

From 96d20bf6072aa181b6fb5662ddc32024be2d61bf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 18:24:51 +0900
Subject: [PATCH 1239/3722] Reduce height of ModeTypeInfo to match adjacent
 text sections

---
 osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs b/osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs
index 03b27b605c..2026106c42 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
 {
     public class ModeTypeInfo : OnlinePlayComposite
     {
-        private const float height = 30;
+        private const float height = 28;
         private const float transition_duration = 100;
 
         private Container drawableRuleset;

From 9b209d67dc83568751994c1af8a0713f19339979 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 18:44:13 +0900
Subject: [PATCH 1240/3722] Match size of participants text with host display

---
 osu.Game/Screens/OnlinePlay/Lounge/Components/ParticipantInfo.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/ParticipantInfo.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/ParticipantInfo.cs
index 0d5ce65d5a..bc4506b78e 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/ParticipantInfo.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/ParticipantInfo.cs
@@ -63,7 +63,6 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
                         summary = new OsuSpriteText
                         {
                             Text = "0 participants",
-                            Font = OsuFont.GetFont(size: 14)
                         }
                     },
                 },

From fc3adaf6123e9f697b85d7c8fa566e111f1eb05b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 18:44:35 +0900
Subject: [PATCH 1241/3722] Show maximum attempt count in room display (when
 not unlimited)

---
 .../Components/RoomLocalUserInfo.cs           | 50 +++++++++++++++++++
 .../OnlinePlay/Lounge/Components/RoomInfo.cs  | 39 ++++++---------
 2 files changed, 66 insertions(+), 23 deletions(-)
 create mode 100644 osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs

diff --git a/osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs b/osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs
new file mode 100644
index 0000000000..f52e59b0c8
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs
@@ -0,0 +1,50 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+
+namespace osu.Game.Screens.OnlinePlay.Components
+{
+    public class RoomLocalUserInfo : OnlinePlayComposite
+    {
+        private OsuSpriteText attemptDisplay;
+
+        public RoomLocalUserInfo()
+        {
+            AutoSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChild = new FillFlowContainer
+            {
+                AutoSizeAxes = Axes.Both,
+                Direction = FillDirection.Vertical,
+                Children = new Drawable[]
+                {
+                    attemptDisplay = new OsuSpriteText
+                    {
+                        Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 14)
+                    },
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            MaxAttempts.BindValueChanged(attempts =>
+            {
+                attemptDisplay.Text = attempts.NewValue == null
+                    ? string.Empty
+                    : $"Maximum attempts: {attempts.NewValue:N0}";
+            }, true);
+        }
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInfo.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInfo.cs
index 0a17702f2a..a0a7f2dc28 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInfo.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInfo.cs
@@ -20,41 +20,34 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
         {
             AutoSizeAxes = Axes.Y;
 
+            RoomLocalUserInfo localUserInfo;
             RoomStatusInfo statusInfo;
             ModeTypeInfo typeInfo;
             ParticipantInfo participantInfo;
 
             InternalChild = new FillFlowContainer
             {
+                Anchor = Anchor.CentreLeft,
+                Origin = Anchor.CentreLeft,
                 RelativeSizeAxes = Axes.X,
+                Spacing = new Vector2(0, 10),
                 AutoSizeAxes = Axes.Y,
                 Direction = FillDirection.Vertical,
-                Spacing = new Vector2(0, 4),
                 Children = new Drawable[]
                 {
+                    roomName = new OsuTextFlowContainer(t => t.Font = OsuFont.GetFont(size: 30))
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                    },
+                    participantInfo = new ParticipantInfo(),
                     new Container
                     {
                         RelativeSizeAxes = Axes.X,
                         AutoSizeAxes = Axes.Y,
                         Children = new Drawable[]
                         {
-                            new FillFlowContainer
-                            {
-                                Anchor = Anchor.CentreLeft,
-                                Origin = Anchor.CentreLeft,
-                                RelativeSizeAxes = Axes.X,
-                                AutoSizeAxes = Axes.Y,
-                                Direction = FillDirection.Vertical,
-                                Children = new Drawable[]
-                                {
-                                    roomName = new OsuTextFlowContainer(t => t.Font = OsuFont.GetFont(size: 30))
-                                    {
-                                        RelativeSizeAxes = Axes.X,
-                                        AutoSizeAxes = Axes.Y,
-                                    },
-                                    statusInfo = new RoomStatusInfo(),
-                                }
-                            },
+                            statusInfo = new RoomStatusInfo(),
                             typeInfo = new ModeTypeInfo
                             {
                                 Anchor = Anchor.BottomRight,
@@ -62,20 +55,21 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
                             }
                         }
                     },
-                    participantInfo = new ParticipantInfo(),
+                    localUserInfo = new RoomLocalUserInfo(),
                 }
             };
 
-            statusElements.AddRange(new Drawable[] { statusInfo, typeInfo, participantInfo });
+            statusElements.AddRange(new Drawable[]
+            {
+                statusInfo, typeInfo, participantInfo, localUserInfo
+            });
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
-
             if (RoomID.Value == null)
                 statusElements.ForEach(e => e.FadeOut());
-
             RoomID.BindValueChanged(id =>
             {
                 if (id.NewValue == null)
@@ -83,7 +77,6 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
                 else
                     statusElements.ForEach(e => e.FadeIn(100));
             }, true);
-
             RoomName.BindValueChanged(name =>
             {
                 roomName.Text = name.NewValue ?? "No room selected";

From 0a9861d0abe19879a3d9772c248df7ed2b0c2e74 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 18:51:13 +0900
Subject: [PATCH 1242/3722] Use TestCaseSource and add multi-mod test

---
 osu.Game.Tests/Mods/ModUtilsTest.cs | 47 +++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Mods/ModUtilsTest.cs b/osu.Game.Tests/Mods/ModUtilsTest.cs
index ff1af88bac..fbdb1e2f3d 100644
--- a/osu.Game.Tests/Mods/ModUtilsTest.cs
+++ b/osu.Game.Tests/Mods/ModUtilsTest.cs
@@ -103,20 +103,43 @@ namespace osu.Game.Tests.Mods
             Assert.That(ModUtils.CheckAllowed(new[] { mod.Object }, new[] { typeof(Mod) }), Is.False);
         }
 
-        // test incompatible pair.
-        [TestCase(new[] { typeof(OsuModDoubleTime), typeof(OsuModHalfTime) }, new[] { typeof(OsuModDoubleTime), typeof(OsuModHalfTime) })]
-        // test incompatible pair with derived class.
-        [TestCase(new[] { typeof(OsuModNightcore), typeof(OsuModHalfTime) }, new[] { typeof(OsuModNightcore), typeof(OsuModHalfTime) })]
-        // test system mod.
-        [TestCase(new[] { typeof(OsuModDoubleTime), typeof(OsuModTouchDevice) }, new[] { typeof(OsuModTouchDevice) })]
-        // test valid.
-        [TestCase(new[] { typeof(OsuModDoubleTime), typeof(OsuModHardRock) }, null)]
-        public void TestInvalidModScenarios(Type[] input, Type[] expectedInvalid)
+        private static readonly object[] invalid_mod_test_scenarios =
         {
-            List<Mod> inputMods = new List<Mod>();
-            foreach (var t in input)
-                inputMods.Add((Mod)Activator.CreateInstance(t));
+            // incompatible pair.
+            new object[]
+            {
+                new Mod[] { new OsuModDoubleTime(), new OsuModHalfTime() },
+                new[] { typeof(OsuModDoubleTime), typeof(OsuModHalfTime) }
+            },
+            // incompatible pair with derived class.
+            new object[]
+            {
+                new Mod[] { new OsuModNightcore(), new OsuModHalfTime() },
+                new[] { typeof(OsuModNightcore), typeof(OsuModHalfTime) }
+            },
+            // system mod.
+            new object[]
+            {
+                new Mod[] { new OsuModDoubleTime(), new OsuModTouchDevice() },
+                new[] { typeof(OsuModTouchDevice) }
+            },
+            // multi mod.
+            new object[]
+            {
+                new Mod[] { new MultiMod(new OsuModHalfTime()), new OsuModHalfTime() },
+                new[] { typeof(MultiMod) }
+            },
+            // valid pair.
+            new object[]
+            {
+                new Mod[] { new OsuModDoubleTime(), new OsuModHardRock() },
+                null
+            }
+        };
 
+        [TestCaseSource(nameof(invalid_mod_test_scenarios))]
+        public void TestInvalidModScenarios(Mod[] inputMods, Type[] expectedInvalid)
+        {
             bool isValid = ModUtils.CheckValidForGameplay(inputMods, out var invalid);
 
             Assert.That(isValid, Is.EqualTo(expectedInvalid == null));

From 180af3c7f8311d0a4477ecb79e7f7403da9dc85a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 19:02:09 +0900
Subject: [PATCH 1243/3722] Add codeanalysis attribute

---
 osu.Game/Utils/ModUtils.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Utils/ModUtils.cs b/osu.Game/Utils/ModUtils.cs
index 9336add465..8ac5bde65a 100644
--- a/osu.Game/Utils/ModUtils.cs
+++ b/osu.Game/Utils/ModUtils.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using osu.Game.Rulesets.Mods;
 
@@ -45,7 +46,7 @@ namespace osu.Game.Utils
         /// <param name="combination">The <see cref="Mod"/> combination to check.</param>
         /// <param name="invalidMods">Any invalid mods in the set.</param>
         /// <returns>Whether all <see cref="Mod"/>s in the combination are compatible with each-other.</returns>
-        public static bool CheckCompatibleSet(IEnumerable<Mod> combination, out List<Mod>? invalidMods)
+        public static bool CheckCompatibleSet(IEnumerable<Mod> combination, [NotNullWhen(false)] out List<Mod>? invalidMods)
         {
             combination = FlattenMods(combination).ToArray();
             invalidMods = null;

From a2e3b1c0e454e81c6836b44ca6f29426040b6ac1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 18:56:57 +0900
Subject: [PATCH 1244/3722] Move Mods reset code to OnlinePlaySongSelect

---
 .../Multiplayer/MultiplayerMatchSongSelect.cs         |  9 ---------
 osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs   | 11 ++++++++++-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index f7f0402555..84e8849726 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy 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.Logging;
 using osu.Framework.Screens;
@@ -27,13 +25,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             AddInternal(loadingLayer = new LoadingLayer(true));
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            Mods.Value = Playlist.FirstOrDefault()?.RequiredMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
-        }
-
         protected override void SelectItem(PlaylistItem item)
         {
             // If the client is already in a room, update via the client.
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
index c58632c500..1c345b883f 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
@@ -58,8 +58,17 @@ namespace osu.Game.Screens.OnlinePlay
             initialRuleset = Ruleset.Value;
             initialMods = Mods.Value.ToList();
 
-            freeMods.Value = Playlist.FirstOrDefault()?.AllowedMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
             FooterPanels.Add(freeModSelectOverlay);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            // At this point, Mods contains both the required and allowed mods. For selection purposes, it should only contain the required mods.
+            // Similarly, freeMods is currently empty but should only contain the allowed mods.
+            Mods.Value = Playlist.FirstOrDefault()?.RequiredMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
+            freeMods.Value = Playlist.FirstOrDefault()?.AllowedMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
 
             Ruleset.BindValueChanged(onRulesetChanged);
         }

From 41593ff09e4ef0ac405cbd0fdcdba0beff9a29b5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 19:14:44 +0900
Subject: [PATCH 1245/3722] Privatise protected property setters

---
 osu.Game/Graphics/UserInterface/GrayButton.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/GrayButton.cs b/osu.Game/Graphics/UserInterface/GrayButton.cs
index dd05701545..88c46f29e0 100644
--- a/osu.Game/Graphics/UserInterface/GrayButton.cs
+++ b/osu.Game/Graphics/UserInterface/GrayButton.cs
@@ -11,8 +11,8 @@ namespace osu.Game.Graphics.UserInterface
 {
     public class GrayButton : OsuAnimatedButton
     {
-        protected SpriteIcon Icon;
-        protected Box Background;
+        protected SpriteIcon Icon { get; private set; }
+        protected Box Background { get; private set; }
 
         private readonly IconUsage icon;
 

From 8e70a50af0836af6fb821c69a7239c7cad9e1eec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Feb 2021 19:22:13 +0900
Subject: [PATCH 1246/3722] Remove unused using statement

---
 osu.Game.Tests/Mods/ModUtilsTest.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Mods/ModUtilsTest.cs b/osu.Game.Tests/Mods/ModUtilsTest.cs
index fbdb1e2f3d..7dcaabca3d 100644
--- a/osu.Game.Tests/Mods/ModUtilsTest.cs
+++ b/osu.Game.Tests/Mods/ModUtilsTest.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.Linq;
 using Moq;
 using NUnit.Framework;

From 2dece12a7c6041fb8ff9e5a4896c77b78865de3a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 19:57:42 +0900
Subject: [PATCH 1247/3722] Disable/disallow freemods on incompatible/selected
 mods

---
 osu.Game/Overlays/Mods/ModSection.cs       |  6 +++---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 11 ++++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 993f4ef9d7..728c726b82 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -130,13 +130,13 @@ namespace osu.Game.Overlays.Mods
         /// Updates all buttons with the given list of selected mods.
         /// </summary>
         /// <param name="newSelectedMods">The new list of selected mods to select.</param>
-        public void UpdateSelectedMods(IReadOnlyList<Mod> newSelectedMods)
+        public void UpdateSelectedButtons(IReadOnlyList<Mod> newSelectedMods)
         {
             foreach (var button in buttons)
-                updateButtonMods(button, newSelectedMods);
+                updateButtonSelection(button, newSelectedMods);
         }
 
-        private void updateButtonMods(ModButton button, IReadOnlyList<Mod> newSelectedMods)
+        private void updateButtonSelection(ModButton button, IReadOnlyList<Mod> newSelectedMods)
         {
             foreach (var mod in newSelectedMods)
             {
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index b20c2d9d19..56d6008b00 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -377,7 +377,7 @@ namespace osu.Game.Overlays.Mods
             base.LoadComplete();
 
             availableMods.BindValueChanged(_ => updateAvailableMods(), true);
-            SelectedMods.BindValueChanged(selectedModsChanged, true);
+            SelectedMods.BindValueChanged(_ => updateSelectedButtons(), true);
         }
 
         protected override void PopOut()
@@ -445,6 +445,8 @@ namespace osu.Game.Overlays.Mods
 
                 section.Mods = modEnumeration.Select(validModOrNull).Where(m => m != null);
             }
+
+            updateSelectedButtons();
         }
 
         /// <summary>
@@ -465,10 +467,13 @@ namespace osu.Game.Overlays.Mods
             return validSubset.Length == 0 ? null : new MultiMod(validSubset);
         }
 
-        private void selectedModsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
+        private void updateSelectedButtons()
         {
+            // Enumeration below may update the bindable list.
+            var selectedMods = SelectedMods.Value.ToList();
+
             foreach (var section in ModSectionsContainer.Children)
-                section.UpdateSelectedMods(mods.NewValue);
+                section.UpdateSelectedButtons(selectedMods);
 
             updateMods();
         }

From 3741f05ab335d5baeb755bd4e370310698c1fe7f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 20:11:40 +0900
Subject: [PATCH 1248/3722] Refactor mod sections and make them overridable

---
 osu.Game/Overlays/Mods/ModSection.cs          | 39 +++++++++----------
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    | 38 ++++++++++++++----
 .../Mods/Sections/AutomationSection.cs        | 19 ---------
 .../Mods/Sections/ConversionSection.cs        | 19 ---------
 .../Sections/DifficultyIncreaseSection.cs     | 19 ---------
 .../Sections/DifficultyReductionSection.cs    | 19 ---------
 osu.Game/Overlays/Mods/Sections/FunSection.cs | 19 ---------
 7 files changed, 50 insertions(+), 122 deletions(-)
 delete mode 100644 osu.Game/Overlays/Mods/Sections/AutomationSection.cs
 delete mode 100644 osu.Game/Overlays/Mods/Sections/ConversionSection.cs
 delete mode 100644 osu.Game/Overlays/Mods/Sections/DifficultyIncreaseSection.cs
 delete mode 100644 osu.Game/Overlays/Mods/Sections/DifficultyReductionSection.cs
 delete mode 100644 osu.Game/Overlays/Mods/Sections/FunSection.cs

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 573d1e5355..89a3e2f5cd 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -11,26 +11,23 @@ using System;
 using System.Linq;
 using System.Collections.Generic;
 using System.Threading;
+using Humanizer;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 
 namespace osu.Game.Overlays.Mods
 {
-    public abstract class ModSection : Container
+    public class ModSection : CompositeDrawable
     {
-        private readonly OsuSpriteText headerLabel;
+        private readonly Drawable header;
 
         public FillFlowContainer<ModButtonEmpty> ButtonsContainer { get; }
 
         public Action<Mod> Action;
-        protected abstract Key[] ToggleKeys { get; }
-        public abstract ModType ModType { get; }
 
-        public string Header
-        {
-            get => headerLabel.Text;
-            set => headerLabel.Text = value;
-        }
+        public Key[] ToggleKeys;
+
+        public readonly ModType ModType;
 
         public IEnumerable<Mod> SelectedMods => buttons.Select(b => b.SelectedMod).Where(m => m != null);
 
@@ -61,7 +58,7 @@ namespace osu.Game.Overlays.Mods
                 if (modContainers.Length == 0)
                 {
                     ModIconsLoaded = true;
-                    headerLabel.Hide();
+                    header.Hide();
                     Hide();
                     return;
                 }
@@ -76,7 +73,7 @@ namespace osu.Game.Overlays.Mods
 
                 buttons = modContainers.OfType<ModButton>().ToArray();
 
-                headerLabel.FadeIn(200);
+                header.FadeIn(200);
                 this.FadeIn(200);
             }
         }
@@ -153,23 +150,19 @@ namespace osu.Game.Overlays.Mods
             button.Deselect();
         }
 
-        protected ModSection()
+        public ModSection(ModType type)
         {
+            ModType = type;
+
             AutoSizeAxes = Axes.Y;
             RelativeSizeAxes = Axes.X;
 
             Origin = Anchor.TopCentre;
             Anchor = Anchor.TopCentre;
 
-            Children = new Drawable[]
+            InternalChildren = new[]
             {
-                headerLabel = new OsuSpriteText
-                {
-                    Origin = Anchor.TopLeft,
-                    Anchor = Anchor.TopLeft,
-                    Position = new Vector2(0f, 0f),
-                    Font = OsuFont.GetFont(weight: FontWeight.Bold)
-                },
+                header = CreateHeader(type.Humanize(LetterCasing.Title)),
                 ButtonsContainer = new FillFlowContainer<ModButtonEmpty>
                 {
                     AutoSizeAxes = Axes.Y,
@@ -185,5 +178,11 @@ namespace osu.Game.Overlays.Mods
                 },
             };
         }
+
+        protected virtual Drawable CreateHeader(string text) => new OsuSpriteText
+        {
+            Font = OsuFont.GetFont(weight: FontWeight.Bold),
+            Text = text
+        };
     }
 }
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 1258ba719d..fd6f771f16 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -19,7 +19,6 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
-using osu.Game.Overlays.Mods.Sections;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens;
 using osuTK;
@@ -190,13 +189,31 @@ namespace osu.Game.Overlays.Mods
                                                 Width = content_width,
                                                 LayoutDuration = 200,
                                                 LayoutEasing = Easing.OutQuint,
-                                                Children = new ModSection[]
+                                                Children = new[]
                                                 {
-                                                    new DifficultyReductionSection { Action = modButtonPressed },
-                                                    new DifficultyIncreaseSection { Action = modButtonPressed },
-                                                    new AutomationSection { Action = modButtonPressed },
-                                                    new ConversionSection { Action = modButtonPressed },
-                                                    new FunSection { Action = modButtonPressed },
+                                                    CreateModSection(ModType.DifficultyReduction).With(s =>
+                                                    {
+                                                        s.ToggleKeys = new[] { Key.Q, Key.W, Key.E, Key.R, Key.T, Key.Y, Key.U, Key.I, Key.O, Key.P };
+                                                        s.Action = modButtonPressed;
+                                                    }),
+                                                    CreateModSection(ModType.DifficultyIncrease).With(s =>
+                                                    {
+                                                        s.ToggleKeys = new[] { Key.A, Key.S, Key.D, Key.F, Key.G, Key.H, Key.J, Key.K, Key.L };
+                                                        s.Action = modButtonPressed;
+                                                    }),
+                                                    CreateModSection(ModType.Automation).With(s =>
+                                                    {
+                                                        s.ToggleKeys = new[] { Key.Z, Key.X, Key.C, Key.V, Key.B, Key.N, Key.M };
+                                                        s.Action = modButtonPressed;
+                                                    }),
+                                                    CreateModSection(ModType.Conversion).With(s =>
+                                                    {
+                                                        s.Action = modButtonPressed;
+                                                    }),
+                                                    CreateModSection(ModType.Fun).With(s =>
+                                                    {
+                                                        s.Action = modButtonPressed;
+                                                    }),
                                                 }
                                             },
                                         }
@@ -454,6 +471,13 @@ namespace osu.Game.Overlays.Mods
 
         private void refreshSelectedMods() => SelectedMods.Value = ModSectionsContainer.Children.SelectMany(s => s.SelectedMods).ToArray();
 
+        /// <summary>
+        /// Creates a <see cref="ModSection"/> that groups <see cref="Mod"/>s with the same <see cref="ModType"/>.
+        /// </summary>
+        /// <param name="type">The <see cref="ModType"/> of <see cref="Mod"/>s in the section.</param>
+        /// <returns>The <see cref="ModSection"/>.</returns>
+        protected virtual ModSection CreateModSection(ModType type) => new ModSection(type);
+
         #region Disposal
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Overlays/Mods/Sections/AutomationSection.cs b/osu.Game/Overlays/Mods/Sections/AutomationSection.cs
deleted file mode 100644
index a2d7fec15f..0000000000
--- a/osu.Game/Overlays/Mods/Sections/AutomationSection.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.Mods;
-using osuTK.Input;
-
-namespace osu.Game.Overlays.Mods.Sections
-{
-    public class AutomationSection : ModSection
-    {
-        protected override Key[] ToggleKeys => new[] { Key.Z, Key.X, Key.C, Key.V, Key.B, Key.N, Key.M };
-        public override ModType ModType => ModType.Automation;
-
-        public AutomationSection()
-        {
-            Header = @"Automation";
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Mods/Sections/ConversionSection.cs b/osu.Game/Overlays/Mods/Sections/ConversionSection.cs
deleted file mode 100644
index 24fd8c30dd..0000000000
--- a/osu.Game/Overlays/Mods/Sections/ConversionSection.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.Mods;
-using osuTK.Input;
-
-namespace osu.Game.Overlays.Mods.Sections
-{
-    public class ConversionSection : ModSection
-    {
-        protected override Key[] ToggleKeys => null;
-        public override ModType ModType => ModType.Conversion;
-
-        public ConversionSection()
-        {
-            Header = @"Conversion";
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Mods/Sections/DifficultyIncreaseSection.cs b/osu.Game/Overlays/Mods/Sections/DifficultyIncreaseSection.cs
deleted file mode 100644
index 0b7ccd1f25..0000000000
--- a/osu.Game/Overlays/Mods/Sections/DifficultyIncreaseSection.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.Mods;
-using osuTK.Input;
-
-namespace osu.Game.Overlays.Mods.Sections
-{
-    public class DifficultyIncreaseSection : ModSection
-    {
-        protected override Key[] ToggleKeys => new[] { Key.A, Key.S, Key.D, Key.F, Key.G, Key.H, Key.J, Key.K, Key.L };
-        public override ModType ModType => ModType.DifficultyIncrease;
-
-        public DifficultyIncreaseSection()
-        {
-            Header = @"Difficulty Increase";
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Mods/Sections/DifficultyReductionSection.cs b/osu.Game/Overlays/Mods/Sections/DifficultyReductionSection.cs
deleted file mode 100644
index 508e92508b..0000000000
--- a/osu.Game/Overlays/Mods/Sections/DifficultyReductionSection.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.Mods;
-using osuTK.Input;
-
-namespace osu.Game.Overlays.Mods.Sections
-{
-    public class DifficultyReductionSection : ModSection
-    {
-        protected override Key[] ToggleKeys => new[] { Key.Q, Key.W, Key.E, Key.R, Key.T, Key.Y, Key.U, Key.I, Key.O, Key.P };
-        public override ModType ModType => ModType.DifficultyReduction;
-
-        public DifficultyReductionSection()
-        {
-            Header = @"Difficulty Reduction";
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Mods/Sections/FunSection.cs b/osu.Game/Overlays/Mods/Sections/FunSection.cs
deleted file mode 100644
index af1f5836b1..0000000000
--- a/osu.Game/Overlays/Mods/Sections/FunSection.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.Mods;
-using osuTK.Input;
-
-namespace osu.Game.Overlays.Mods.Sections
-{
-    public class FunSection : ModSection
-    {
-        protected override Key[] ToggleKeys => null;
-        public override ModType ModType => ModType.Fun;
-
-        public FunSection()
-        {
-            Header = @"Fun";
-        }
-    }
-}

From 6d620264f48369f807a79983da19bf2ff37773e9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 20:27:41 +0900
Subject: [PATCH 1249/3722] Allow mod buttons to not be stacked

---
 .../TestSceneModSelectOverlay.cs              | 62 ++++++++++++-------
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    | 12 +++-
 2 files changed, 51 insertions(+), 23 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index bd4010a7f3..71c549b433 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -38,28 +38,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         }
 
         [SetUp]
-        public void SetUp() => Schedule(() =>
-        {
-            SelectedMods.Value = Array.Empty<Mod>();
-            Children = new Drawable[]
-            {
-                modSelect = new TestModSelectOverlay
-                {
-                    Origin = Anchor.BottomCentre,
-                    Anchor = Anchor.BottomCentre,
-                    SelectedMods = { BindTarget = SelectedMods }
-                },
-
-                modDisplay = new ModDisplay
-                {
-                    Anchor = Anchor.TopRight,
-                    Origin = Anchor.TopRight,
-                    AutoSizeAxes = Axes.Both,
-                    Position = new Vector2(-5, 25),
-                    Current = { BindTarget = modSelect.SelectedMods }
-                }
-            };
-        });
+        public void SetUp() => Schedule(() => createDisplay(() => new TestModSelectOverlay()));
 
         [SetUpSteps]
         public void SetUpSteps()
@@ -146,6 +125,18 @@ namespace osu.Game.Tests.Visual.UserInterface
             });
         }
 
+        [Test]
+        public void TestNonStacked()
+        {
+            changeRuleset(0);
+
+            AddStep("create overlay", () => createDisplay(() => new TestNonStackedModSelectOverlay()));
+
+            AddStep("show", () => modSelect.Show());
+
+            AddAssert("ensure all buttons are spread out", () => modSelect.ChildrenOfType<ModButton>().All(m => m.Mods.Length <= 1));
+        }
+
         private void testSingleMod(Mod mod)
         {
             selectNext(mod);
@@ -265,6 +256,28 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private void checkLabelColor(Func<Color4> getColour) => AddAssert("check label has expected colour", () => modSelect.MultiplierLabel.Colour.AverageColour == getColour());
 
+        private void createDisplay(Func<TestModSelectOverlay> createOverlayFunc)
+        {
+            SelectedMods.Value = Array.Empty<Mod>();
+            Children = new Drawable[]
+            {
+                modSelect = createOverlayFunc().With(d =>
+                {
+                    d.Origin = Anchor.BottomCentre;
+                    d.Anchor = Anchor.BottomCentre;
+                    d.SelectedMods.BindTarget = SelectedMods;
+                }),
+                modDisplay = new ModDisplay
+                {
+                    Anchor = Anchor.TopRight,
+                    Origin = Anchor.TopRight,
+                    AutoSizeAxes = Axes.Both,
+                    Position = new Vector2(-5, 25),
+                    Current = { BindTarget = modSelect.SelectedMods }
+                }
+            };
+        }
+
         private class TestModSelectOverlay : ModSelectOverlay
         {
             public new Bindable<IReadOnlyList<Mod>> SelectedMods => base.SelectedMods;
@@ -283,5 +296,10 @@ namespace osu.Game.Tests.Visual.UserInterface
             public new Color4 LowMultiplierColour => base.LowMultiplierColour;
             public new Color4 HighMultiplierColour => base.HighMultiplierColour;
         }
+
+        private class TestNonStackedModSelectOverlay : TestModSelectOverlay
+        {
+            protected override bool Stacked => false;
+        }
     }
 }
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 1258ba719d..c7e856028a 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -22,6 +22,7 @@ using osu.Game.Input.Bindings;
 using osu.Game.Overlays.Mods.Sections;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens;
+using osu.Game.Utils;
 using osuTK;
 using osuTK.Graphics;
 using osuTK.Input;
@@ -43,6 +44,11 @@ namespace osu.Game.Overlays.Mods
 
         protected override bool DimMainContent => false;
 
+        /// <summary>
+        /// Whether <see cref="Mod"/>s underneath the same <see cref="MultiMod"/> instance should appear as stacked buttons.
+        /// </summary>
+        protected virtual bool Stacked => true;
+
         protected readonly FillFlowContainer<ModSection> ModSectionsContainer;
 
         protected readonly ModSettingsContainer ModSettingsContainer;
@@ -405,7 +411,11 @@ namespace osu.Game.Overlays.Mods
             if (mods.NewValue == null) return;
 
             foreach (var section in ModSectionsContainer.Children)
-                section.Mods = mods.NewValue[section.ModType].Where(isValidMod);
+            {
+                section.Mods = Stacked
+                    ? availableMods.Value[section.ModType]
+                    : ModUtils.FlattenMods(availableMods.Value[section.ModType]);
+            }
         }
 
         private void selectedModsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)

From 75f81bfa062c9199759cd8257a10e64e543eb8ed Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 20:35:31 +0900
Subject: [PATCH 1250/3722] Add back mod validation

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

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index c7e856028a..775b0de1c0 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -412,9 +412,12 @@ namespace osu.Game.Overlays.Mods
 
             foreach (var section in ModSectionsContainer.Children)
             {
-                section.Mods = Stacked
-                    ? availableMods.Value[section.ModType]
-                    : ModUtils.FlattenMods(availableMods.Value[section.ModType]);
+                IEnumerable<Mod> modEnumeration = availableMods.Value[section.ModType];
+
+                if (!Stacked)
+                    modEnumeration = ModUtils.FlattenMods(modEnumeration);
+
+                section.Mods = modEnumeration.Where(isValidMod);
             }
         }
 

From 10ceddf3ffcf861f71aee5f4a681441b15913226 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 20:47:50 +0900
Subject: [PATCH 1251/3722] Make IsValidMod adjustable

---
 .../TestSceneModSelectOverlay.cs              | 16 ++++++
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    | 54 ++++++++++++++++---
 .../Multiplayer/MultiplayerMatchSongSelect.cs |  2 +-
 osu.Game/Screens/Select/MatchSongSelect.cs    |  2 +-
 4 files changed, 64 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 71c549b433..9cf8b95ddf 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -137,6 +137,22 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("ensure all buttons are spread out", () => modSelect.ChildrenOfType<ModButton>().All(m => m.Mods.Length <= 1));
         }
 
+        [Test]
+        public void TestChangeIsValidChangesButtonVisibility()
+        {
+            changeRuleset(0);
+
+            AddAssert("double time visible", () => modSelect.ChildrenOfType<ModButton>().Any(b => b.Mods.Any(m => m is OsuModDoubleTime)));
+
+            AddStep("make double time invalid", () => modSelect.IsValidMod = m => !(m is OsuModDoubleTime));
+            AddAssert("double time not visible", () => modSelect.ChildrenOfType<ModButton>().All(b => !b.Mods.Any(m => m is OsuModDoubleTime)));
+            AddAssert("nightcore still visible", () => modSelect.ChildrenOfType<ModButton>().Any(b => b.Mods.Any(m => m is OsuModNightcore)));
+
+            AddStep("make double time valid again", () => modSelect.IsValidMod = m => true);
+            AddAssert("double time visible", () => modSelect.ChildrenOfType<ModButton>().Any(b => b.Mods.Any(m => m is OsuModDoubleTime)));
+            AddAssert("nightcore still visible", () => modSelect.ChildrenOfType<ModButton>().Any(b => b.Mods.Any(m => m is OsuModNightcore)));
+        }
+
         private void testSingleMod(Mod mod)
         {
             selectNext(mod);
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 775b0de1c0..61e4b45495 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
@@ -31,7 +32,6 @@ namespace osu.Game.Overlays.Mods
 {
     public class ModSelectOverlay : WaveOverlayContainer
     {
-        private readonly Func<Mod, bool> isValidMod;
         public const float HEIGHT = 510;
 
         protected readonly TriangleButton DeselectAllButton;
@@ -49,6 +49,23 @@ namespace osu.Game.Overlays.Mods
         /// </summary>
         protected virtual bool Stacked => true;
 
+        [NotNull]
+        private Func<Mod, bool> isValidMod = m => true;
+
+        /// <summary>
+        /// A function that checks whether a given mod is selectable.
+        /// </summary>
+        [NotNull]
+        public Func<Mod, bool> IsValidMod
+        {
+            get => isValidMod;
+            set
+            {
+                isValidMod = value ?? throw new ArgumentNullException(nameof(value));
+                updateAvailableMods();
+            }
+        }
+
         protected readonly FillFlowContainer<ModSection> ModSectionsContainer;
 
         protected readonly ModSettingsContainer ModSettingsContainer;
@@ -67,10 +84,8 @@ namespace osu.Game.Overlays.Mods
 
         private SampleChannel sampleOn, sampleOff;
 
-        public ModSelectOverlay(Func<Mod, bool> isValidMod = null)
+        public ModSelectOverlay()
         {
-            this.isValidMod = isValidMod ?? (m => true);
-
             Waves.FirstWaveColour = Color4Extensions.FromHex(@"19b0e2");
             Waves.SecondWaveColour = Color4Extensions.FromHex(@"2280a2");
             Waves.ThirdWaveColour = Color4Extensions.FromHex(@"005774");
@@ -351,7 +366,7 @@ namespace osu.Game.Overlays.Mods
         {
             base.LoadComplete();
 
-            availableMods.BindValueChanged(availableModsChanged, true);
+            availableMods.BindValueChanged(_ => updateAvailableMods(), true);
             SelectedMods.BindValueChanged(selectedModsChanged, true);
         }
 
@@ -406,9 +421,10 @@ namespace osu.Game.Overlays.Mods
 
         public override bool OnPressed(GlobalAction action) => false; // handled by back button
 
-        private void availableModsChanged(ValueChangedEvent<Dictionary<ModType, IReadOnlyList<Mod>>> mods)
+        private void updateAvailableMods()
         {
-            if (mods.NewValue == null) return;
+            if (availableMods?.Value == null)
+                return;
 
             foreach (var section in ModSectionsContainer.Children)
             {
@@ -417,10 +433,32 @@ namespace osu.Game.Overlays.Mods
                 if (!Stacked)
                     modEnumeration = ModUtils.FlattenMods(modEnumeration);
 
-                section.Mods = modEnumeration.Where(isValidMod);
+                section.Mods = modEnumeration.Select(getValidModOrNull).Where(m => m != null);
             }
         }
 
+        /// <summary>
+        /// Returns a valid form of a given <see cref="Mod"/> if possible, or null otherwise.
+        /// </summary>
+        /// <remarks>
+        /// This is a recursive process during which any invalid mods are culled while preserving <see cref="MultiMod"/> structures where possible.
+        /// </remarks>
+        /// <param name="mod">The <see cref="Mod"/> to check.</param>
+        /// <returns>A valid form of <paramref name="mod"/> if exists, or null otherwise.</returns>
+        [CanBeNull]
+        private Mod getValidModOrNull([NotNull] Mod mod)
+        {
+            if (!(mod is MultiMod multi))
+                return IsValidMod(mod) ? mod : null;
+
+            var validSubset = multi.Mods.Select(getValidModOrNull).Where(m => m != null).ToArray();
+
+            if (validSubset.Length == 0)
+                return null;
+
+            return validSubset.Length == 1 ? validSubset[0] : new MultiMod(validSubset);
+        }
+
         private void selectedModsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
         {
             foreach (var section in ModSectionsContainer.Children)
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index ebc06d2445..5bf9b1ee7e 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea();
 
-        protected override ModSelectOverlay CreateModSelectOverlay() => new ModSelectOverlay(isValidMod);
+        protected override ModSelectOverlay CreateModSelectOverlay() => new ModSelectOverlay { IsValidMod = isValidMod };
 
         private bool isValidMod(Mod mod) => !(mod is ModAutoplay) && (mod as MultiMod)?.Mods.Any(mm => mm is ModAutoplay) != true;
     }
diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index ed47b5d5ac..1bb7374ce3 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Screens.Select
             item.RequiredMods.AddRange(Mods.Value.Select(m => m.CreateCopy()));
         }
 
-        protected override ModSelectOverlay CreateModSelectOverlay() => new ModSelectOverlay(isValidMod);
+        protected override ModSelectOverlay CreateModSelectOverlay() => new ModSelectOverlay { IsValidMod = isValidMod };
 
         private bool isValidMod(Mod mod) => !(mod is ModAutoplay) && (mod as MultiMod)?.Mods.Any(mm => mm is ModAutoplay) != true;
     }

From 50e92bd0ed729a2d4aa551bea13a66f37de6035c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 20:50:54 +0900
Subject: [PATCH 1252/3722] Fix selection not being preserved when IsValidMod
 changes

---
 .../UserInterface/TestSceneModSelectOverlay.cs       | 12 ++++++++++++
 osu.Game/Overlays/Mods/ModSection.cs                 |  6 +++---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs           | 11 ++++++++---
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 9cf8b95ddf..81edcd8db8 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -153,6 +153,18 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("nightcore still visible", () => modSelect.ChildrenOfType<ModButton>().Any(b => b.Mods.Any(m => m is OsuModNightcore)));
         }
 
+        [Test]
+        public void TestChangeIsValidPreservesSelection()
+        {
+            changeRuleset(0);
+
+            AddStep("select DT + HD", () => SelectedMods.Value = new Mod[] { new OsuModDoubleTime(), new OsuModHidden() });
+            AddAssert("DT + HD selected", () => modSelect.ChildrenOfType<ModButton>().Count(b => b.Selected) == 2);
+
+            AddStep("make NF invalid", () => modSelect.IsValidMod = m => !(m is ModNoFail));
+            AddAssert("DT + HD still selected", () => modSelect.ChildrenOfType<ModButton>().Count(b => b.Selected) == 2);
+        }
+
         private void testSingleMod(Mod mod)
         {
             selectNext(mod);
diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 573d1e5355..4c629aef54 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -130,13 +130,13 @@ namespace osu.Game.Overlays.Mods
         /// Updates all buttons with the given list of selected mods.
         /// </summary>
         /// <param name="newSelectedMods">The new list of selected mods to select.</param>
-        public void UpdateSelectedMods(IReadOnlyList<Mod> newSelectedMods)
+        public void UpdateSelectedButtons(IReadOnlyList<Mod> newSelectedMods)
         {
             foreach (var button in buttons)
-                updateButtonMods(button, newSelectedMods);
+                updateButtonSelection(button, newSelectedMods);
         }
 
-        private void updateButtonMods(ModButton button, IReadOnlyList<Mod> newSelectedMods)
+        private void updateButtonSelection(ModButton button, IReadOnlyList<Mod> newSelectedMods)
         {
             foreach (var mod in newSelectedMods)
             {
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 61e4b45495..fcec6f3926 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -367,7 +367,7 @@ namespace osu.Game.Overlays.Mods
             base.LoadComplete();
 
             availableMods.BindValueChanged(_ => updateAvailableMods(), true);
-            SelectedMods.BindValueChanged(selectedModsChanged, true);
+            SelectedMods.BindValueChanged(_ => updateSelectedButtons(), true);
         }
 
         protected override void PopOut()
@@ -435,6 +435,8 @@ namespace osu.Game.Overlays.Mods
 
                 section.Mods = modEnumeration.Select(getValidModOrNull).Where(m => m != null);
             }
+
+            updateSelectedButtons();
         }
 
         /// <summary>
@@ -459,10 +461,13 @@ namespace osu.Game.Overlays.Mods
             return validSubset.Length == 1 ? validSubset[0] : new MultiMod(validSubset);
         }
 
-        private void selectedModsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
+        private void updateSelectedButtons()
         {
+            // Enumeration below may update the bindable list.
+            var selectedMods = SelectedMods.Value.ToList();
+
             foreach (var section in ModSectionsContainer.Children)
-                section.UpdateSelectedMods(mods.NewValue);
+                section.UpdateSelectedButtons(selectedMods);
 
             updateMods();
         }

From e58ece9e108b757a72aaff635090ad00b245aa5a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 20:58:31 +0900
Subject: [PATCH 1253/3722] Make ModSelectOverlay abstract

---
 .../Visual/UserInterface/TestSceneModSelectOverlay.cs    | 2 +-
 .../Visual/UserInterface/TestSceneModSettings.cs         | 2 +-
 osu.Game/Overlays/Mods/ModSelectOverlay.cs               | 4 ++--
 osu.Game/Overlays/Mods/SoloModSelectOverlay.cs           | 9 +++++++++
 .../OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs | 2 +-
 osu.Game/Screens/Select/MatchSongSelect.cs               | 2 +-
 osu.Game/Screens/Select/SongSelect.cs                    | 2 +-
 7 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 osu.Game/Overlays/Mods/SoloModSelectOverlay.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 81edcd8db8..92104cfc72 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -306,7 +306,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             };
         }
 
-        private class TestModSelectOverlay : ModSelectOverlay
+        private class TestModSelectOverlay : SoloModSelectOverlay
         {
             public new Bindable<IReadOnlyList<Mod>> SelectedMods => base.SelectedMods;
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
index 8614700b15..3c889bdec4 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
@@ -151,7 +151,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddUntilStep("wait for ready", () => modSelect.State.Value == Visibility.Visible && modSelect.ButtonsLoaded);
         }
 
-        private class TestModSelectOverlay : ModSelectOverlay
+        private class TestModSelectOverlay : SoloModSelectOverlay
         {
             public new VisibilityContainer ModSettingsContainer => base.ModSettingsContainer;
             public new TriangleButton CustomiseButton => base.CustomiseButton;
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index fcec6f3926..75ad90f065 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -30,7 +30,7 @@ using osuTK.Input;
 
 namespace osu.Game.Overlays.Mods
 {
-    public class ModSelectOverlay : WaveOverlayContainer
+    public abstract class ModSelectOverlay : WaveOverlayContainer
     {
         public const float HEIGHT = 510;
 
@@ -84,7 +84,7 @@ namespace osu.Game.Overlays.Mods
 
         private SampleChannel sampleOn, sampleOff;
 
-        public ModSelectOverlay()
+        protected ModSelectOverlay()
         {
             Waves.FirstWaveColour = Color4Extensions.FromHex(@"19b0e2");
             Waves.SecondWaveColour = Color4Extensions.FromHex(@"2280a2");
diff --git a/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs b/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
new file mode 100644
index 0000000000..8f6819d7ff
--- /dev/null
+++ b/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
@@ -0,0 +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.
+
+namespace osu.Game.Overlays.Mods
+{
+    public class SoloModSelectOverlay : ModSelectOverlay
+    {
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index 5bf9b1ee7e..930f70d087 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea();
 
-        protected override ModSelectOverlay CreateModSelectOverlay() => new ModSelectOverlay { IsValidMod = isValidMod };
+        protected override ModSelectOverlay CreateModSelectOverlay() => new SoloModSelectOverlay { IsValidMod = isValidMod };
 
         private bool isValidMod(Mod mod) => !(mod is ModAutoplay) && (mod as MultiMod)?.Mods.Any(mm => mm is ModAutoplay) != true;
     }
diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index 1bb7374ce3..e181370cf7 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Screens.Select
             item.RequiredMods.AddRange(Mods.Value.Select(m => m.CreateCopy()));
         }
 
-        protected override ModSelectOverlay CreateModSelectOverlay() => new ModSelectOverlay { IsValidMod = isValidMod };
+        protected override ModSelectOverlay CreateModSelectOverlay() => new SoloModSelectOverlay { IsValidMod = isValidMod };
 
         private bool isValidMod(Mod mod) => !(mod is ModAutoplay) && (mod as MultiMod)?.Mods.Any(mm => mm is ModAutoplay) != true;
     }
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 4fca77a176..ff49dd9f7e 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -301,7 +301,7 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        protected virtual ModSelectOverlay CreateModSelectOverlay() => new ModSelectOverlay();
+        protected virtual ModSelectOverlay CreateModSelectOverlay() => new SoloModSelectOverlay();
 
         protected virtual void ApplyFilterToCarousel(FilterCriteria criteria)
         {

From 728f8599b2bedbc721481c2bafb017a130177d25 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 21:06:32 +0900
Subject: [PATCH 1254/3722] Move incompatible mod deselection to SoloModOverlay

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    | 23 ++++++++-----------
 .../Overlays/Mods/SoloModSelectOverlay.cs     |  9 ++++++++
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 75ad90f065..c400e4cc43 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -349,19 +349,6 @@ namespace osu.Game.Overlays.Mods
             refreshSelectedMods();
         }
 
-        /// <summary>
-        /// Deselect one or more mods.
-        /// </summary>
-        /// <param name="modTypes">The types of <see cref="Mod"/>s which should be deselected.</param>
-        /// <param name="immediate">Set to true to bypass animations and update selections immediately.</param>
-        private void deselectTypes(Type[] modTypes, bool immediate = false)
-        {
-            if (modTypes.Length == 0) return;
-
-            foreach (var section in ModSectionsContainer.Children)
-                section.DeselectTypes(modTypes, immediate);
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -496,7 +483,7 @@ namespace osu.Game.Overlays.Mods
             {
                 if (State.Value == Visibility.Visible) sampleOn?.Play();
 
-                deselectTypes(selectedMod.IncompatibleMods, true);
+                OnModSelected(selectedMod);
 
                 if (selectedMod.RequiresConfiguration) ModSettingsContainer.Show();
             }
@@ -508,6 +495,14 @@ namespace osu.Game.Overlays.Mods
             refreshSelectedMods();
         }
 
+        /// <summary>
+        /// Invoked when a new <see cref="Mod"/> has been selected.
+        /// </summary>
+        /// <param name="mod">The <see cref="Mod"/> that has been selected.</param>
+        protected virtual void OnModSelected(Mod mod)
+        {
+        }
+
         private void refreshSelectedMods() => SelectedMods.Value = ModSectionsContainer.Children.SelectMany(s => s.SelectedMods).ToArray();
 
         #region Disposal
diff --git a/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs b/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
index 8f6819d7ff..d039ad1f98 100644
--- a/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
@@ -1,9 +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.Mods;
+
 namespace osu.Game.Overlays.Mods
 {
     public class SoloModSelectOverlay : ModSelectOverlay
     {
+        protected override void OnModSelected(Mod mod)
+        {
+            base.OnModSelected(mod);
+
+            foreach (var section in ModSectionsContainer.Children)
+                section.DeselectTypes(mod.IncompatibleMods, true);
+        }
     }
 }

From 643c0605d85cf7808394c4b2fe3ea4f39b62906b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 21:14:38 +0900
Subject: [PATCH 1255/3722] Implement the freemod selection overlay

---
 .../TestSceneFreeModSelectOverlay.cs          |  21 +++
 osu.Game/Overlays/Mods/ModSection.cs          |  15 ++-
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    |  19 +--
 .../OnlinePlay/FreeModSelectOverlay.cs        | 120 ++++++++++++++++++
 4 files changed, 165 insertions(+), 10 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs
 create mode 100644 osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs
new file mode 100644
index 0000000000..26a0301d8a
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.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.Framework.Graphics.Containers;
+using osu.Game.Screens.OnlinePlay;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public class TestSceneFreeModSelectOverlay : MultiplayerTestScene
+    {
+        [SetUp]
+        public new void Setup() => Schedule(() =>
+        {
+            Child = new FreeModSelectOverlay
+            {
+                State = { Value = Visibility.Visible }
+            };
+        });
+    }
+}
diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index b3ddd30772..87a45ebf63 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -94,7 +94,20 @@ namespace osu.Game.Overlays.Mods
             return base.OnKeyDown(e);
         }
 
-        public void DeselectAll() => DeselectTypes(buttons.Select(b => b.SelectedMod?.GetType()).Where(t => t != null));
+        /// <summary>
+        /// Selects all mods.
+        /// </summary>
+        public void SelectAll()
+        {
+            foreach (var button in buttons.Where(b => !b.Selected))
+                button.SelectAt(0);
+        }
+
+        /// <summary>
+        /// Deselects all mods.
+        /// </summary>
+        /// <param name="immediate">Set to true to bypass animations and update selections immediately.</param>
+        public void DeselectAll(bool immediate = false) => DeselectTypes(buttons.Select(b => b.SelectedMod?.GetType()).Where(t => t != null), immediate);
 
         /// <summary>
         /// Deselect one or more mods in this section.
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index e064a6fb84..8225c1b6bb 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -37,8 +37,11 @@ namespace osu.Game.Overlays.Mods
         protected readonly TriangleButton CustomiseButton;
         protected readonly TriangleButton CloseButton;
 
+        protected readonly Drawable MultiplierSection;
         protected readonly OsuSpriteText MultiplierLabel;
 
+        protected readonly FillFlowContainer FooterContainer;
+
         protected override bool BlockNonPositionalInput => false;
 
         protected override bool DimMainContent => false;
@@ -79,8 +82,6 @@ namespace osu.Game.Overlays.Mods
         private const float content_width = 0.8f;
         private const float footer_button_spacing = 20;
 
-        private readonly FillFlowContainer footerContainer;
-
         private SampleChannel sampleOn, sampleOff;
 
         protected ModSelectOverlay()
@@ -269,7 +270,7 @@ namespace osu.Game.Overlays.Mods
                                         Colour = new Color4(172, 20, 116, 255),
                                         Alpha = 0.5f,
                                     },
-                                    footerContainer = new FillFlowContainer
+                                    FooterContainer = new FillFlowContainer
                                     {
                                         Origin = Anchor.BottomCentre,
                                         Anchor = Anchor.BottomCentre,
@@ -283,7 +284,7 @@ namespace osu.Game.Overlays.Mods
                                             Vertical = 15,
                                             Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING
                                         },
-                                        Children = new Drawable[]
+                                        Children = new[]
                                         {
                                             DeselectAllButton = new TriangleButton
                                             {
@@ -310,7 +311,7 @@ namespace osu.Game.Overlays.Mods
                                                 Origin = Anchor.CentreLeft,
                                                 Anchor = Anchor.CentreLeft,
                                             },
-                                            new FillFlowContainer
+                                            MultiplierSection = new FillFlowContainer
                                             {
                                                 AutoSizeAxes = Axes.Both,
                                                 Spacing = new Vector2(footer_button_spacing / 2, 0),
@@ -378,8 +379,8 @@ namespace osu.Game.Overlays.Mods
         {
             base.PopOut();
 
-            footerContainer.MoveToX(content_width, WaveContainer.DISAPPEAR_DURATION, Easing.InSine);
-            footerContainer.FadeOut(WaveContainer.DISAPPEAR_DURATION, Easing.InSine);
+            FooterContainer.MoveToX(content_width, WaveContainer.DISAPPEAR_DURATION, Easing.InSine);
+            FooterContainer.FadeOut(WaveContainer.DISAPPEAR_DURATION, Easing.InSine);
 
             foreach (var section in ModSectionsContainer.Children)
             {
@@ -393,8 +394,8 @@ namespace osu.Game.Overlays.Mods
         {
             base.PopIn();
 
-            footerContainer.MoveToX(0, WaveContainer.APPEAR_DURATION, Easing.OutQuint);
-            footerContainer.FadeIn(WaveContainer.APPEAR_DURATION, Easing.OutQuint);
+            FooterContainer.MoveToX(0, WaveContainer.APPEAR_DURATION, Easing.OutQuint);
+            FooterContainer.FadeIn(WaveContainer.APPEAR_DURATION, Easing.OutQuint);
 
             foreach (var section in ModSectionsContainer.Children)
             {
diff --git a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
new file mode 100644
index 0000000000..628199309a
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
@@ -0,0 +1,120 @@
+// Copyright (c) ppy 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.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays.Mods;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Screens.OnlinePlay
+{
+    /// <summary>
+    /// A <see cref="ModSelectOverlay"/> used for free-mod selection in online play.
+    /// </summary>
+    public class FreeModSelectOverlay : ModSelectOverlay
+    {
+        protected override bool Stacked => false;
+
+        public FreeModSelectOverlay()
+        {
+            CustomiseButton.Alpha = 0;
+            MultiplierSection.Alpha = 0;
+            DeselectAllButton.Alpha = 0;
+
+            Drawable selectAllButton;
+            Drawable deselectAllButton;
+
+            FooterContainer.AddRange(new[]
+            {
+                selectAllButton = new TriangleButton
+                {
+                    Origin = Anchor.CentreLeft,
+                    Anchor = Anchor.CentreLeft,
+                    Width = 180,
+                    Text = "Select All",
+                    Action = selectAll,
+                },
+                // Unlike the base mod select overlay, this button deselects mods instantaneously.
+                deselectAllButton = new TriangleButton
+                {
+                    Origin = Anchor.CentreLeft,
+                    Anchor = Anchor.CentreLeft,
+                    Width = 180,
+                    Text = "Deselect All",
+                    Action = deselectAll,
+                },
+            });
+
+            FooterContainer.SetLayoutPosition(selectAllButton, -2);
+            FooterContainer.SetLayoutPosition(deselectAllButton, -1);
+        }
+
+        private void selectAll()
+        {
+            foreach (var section in ModSectionsContainer.Children)
+                section.SelectAll();
+        }
+
+        private void deselectAll()
+        {
+            foreach (var section in ModSectionsContainer.Children)
+                section.DeselectAll(true);
+        }
+
+        protected override ModSection CreateModSection(ModType type) => new FreeModSection(type);
+
+        private class FreeModSection : ModSection
+        {
+            private HeaderCheckbox checkbox;
+
+            public FreeModSection(ModType type)
+                : base(type)
+            {
+            }
+
+            protected override Drawable CreateHeader(string text) => new Container
+            {
+                AutoSizeAxes = Axes.Y,
+                Width = 175,
+                Child = checkbox = new HeaderCheckbox
+                {
+                    LabelText = text,
+                    Changed = onCheckboxChanged
+                }
+            };
+
+            private void onCheckboxChanged(bool value)
+            {
+                foreach (var button in ButtonsContainer.OfType<ModButton>())
+                {
+                    if (value)
+                        button.SelectAt(0);
+                    else
+                        button.Deselect();
+                }
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+
+                var validButtons = ButtonsContainer.OfType<ModButton>().Where(b => b.Mod.HasImplementation);
+                checkbox.Current.Value = validButtons.All(b => b.Selected);
+            }
+        }
+
+        private class HeaderCheckbox : OsuCheckbox
+        {
+            public Action<bool> Changed;
+
+            protected override void OnUserChange(bool value)
+            {
+                base.OnUserChange(value);
+                Changed?.Invoke(value);
+            }
+        }
+    }
+}

From f25535548ae1910215fff01186cac34285cdac81 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 21:20:16 +0900
Subject: [PATCH 1256/3722] Fix buzzing on select all/deselect all

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 8225c1b6bb..c308dc2451 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -14,6 +14,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
+using osu.Framework.Threading;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
 using osu.Game.Graphics.Containers;
@@ -495,11 +496,17 @@ namespace osu.Game.Overlays.Mods
                 MultiplierLabel.FadeColour(Color4.White, 200);
         }
 
+        private ScheduledDelegate sampleOnDelegate;
+        private ScheduledDelegate sampleOffDelegate;
+
         private void modButtonPressed(Mod selectedMod)
         {
             if (selectedMod != null)
             {
-                if (State.Value == Visibility.Visible) sampleOn?.Play();
+                // Fixes buzzing when multiple mods are selected in the same frame.
+                sampleOnDelegate?.Cancel();
+                if (State.Value == Visibility.Visible)
+                    sampleOnDelegate = Scheduler.Add(() => sampleOn?.Play());
 
                 OnModSelected(selectedMod);
 
@@ -507,7 +514,10 @@ namespace osu.Game.Overlays.Mods
             }
             else
             {
-                if (State.Value == Visibility.Visible) sampleOff?.Play();
+                // Fixes buzzing when multiple mods are deselected in the same frame.
+                sampleOffDelegate?.Cancel();
+                if (State.Value == Visibility.Visible)
+                    sampleOffDelegate = Scheduler.Add(() => sampleOff?.Play());
             }
 
             refreshSelectedMods();

From 5a56e2ba4b66ae8058157a3b32935f154d0f0c02 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 21:29:00 +0900
Subject: [PATCH 1257/3722] Fix sound duplication due to checkbox

---
 osu.Game/Graphics/UserInterface/OsuCheckbox.cs  | 17 +++++++++++++----
 .../Screens/OnlinePlay/FreeModSelectOverlay.cs  |  2 ++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
index 6593531099..517f83daa9 100644
--- a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
@@ -18,6 +18,11 @@ namespace osu.Game.Graphics.UserInterface
         public Color4 UncheckedColor { get; set; } = Color4.White;
         public int FadeDuration { get; set; }
 
+        /// <summary>
+        /// Whether to play sounds when the state changes as a result of user interaction.
+        /// </summary>
+        protected virtual bool PlaySoundsOnUserChange => true;
+
         public string LabelText
         {
             set
@@ -96,10 +101,14 @@ namespace osu.Game.Graphics.UserInterface
         protected override void OnUserChange(bool value)
         {
             base.OnUserChange(value);
-            if (value)
-                sampleChecked?.Play();
-            else
-                sampleUnchecked?.Play();
+
+            if (PlaySoundsOnUserChange)
+            {
+                if (value)
+                    sampleChecked?.Play();
+                else
+                    sampleUnchecked?.Play();
+            }
         }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
index 628199309a..608e58b534 100644
--- a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
@@ -110,6 +110,8 @@ namespace osu.Game.Screens.OnlinePlay
         {
             public Action<bool> Changed;
 
+            protected override bool PlaySoundsOnUserChange => false;
+
             protected override void OnUserChange(bool value)
             {
                 base.OnUserChange(value);

From 6ff8e8dd37c3a79ea7b6c122f596272708cd6e58 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 21:29:08 +0900
Subject: [PATCH 1258/3722] Disable a few mods by default

---
 osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
index 608e58b534..5b9a19897f 100644
--- a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
@@ -18,8 +18,16 @@ namespace osu.Game.Screens.OnlinePlay
     {
         protected override bool Stacked => false;
 
+        public new Func<Mod, bool> IsValidMod
+        {
+            get => base.IsValidMod;
+            set => base.IsValidMod = m => m.HasImplementation && !m.RequiresConfiguration && !(m is ModAutoplay) && value(m);
+        }
+
         public FreeModSelectOverlay()
         {
+            IsValidMod = m => true;
+
             CustomiseButton.Alpha = 0;
             MultiplierSection.Alpha = 0;
             DeselectAllButton.Alpha = 0;

From 921f008217719bb6768b54c7746eef2d7d0f0ba7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 21:35:08 +0900
Subject: [PATCH 1259/3722] Fix ModIcon not updating background colour
 correctly

---
 .../Visual/UserInterface/TestSceneModIcon.cs  | 21 +++++++++
 osu.Game/Rulesets/UI/ModIcon.cs               | 46 +++++++++++--------
 2 files changed, 47 insertions(+), 20 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneModIcon.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModIcon.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModIcon.cs
new file mode 100644
index 0000000000..e7fa7d9235
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModIcon.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.Osu.Mods;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneModIcon : OsuTestScene
+    {
+        [Test]
+        public void TestChangeModType()
+        {
+            ModIcon icon = null;
+
+            AddStep("create mod icon", () => Child = icon = new ModIcon(new OsuModDoubleTime()));
+            AddStep("change mod", () => icon.Mod = new OsuModEasy());
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index 04a2e052fa..cae5da3d16 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -29,8 +29,6 @@ namespace osu.Game.Rulesets.UI
 
         private const float size = 80;
 
-        private readonly ModType type;
-
         public virtual string TooltipText => showTooltip ? mod.IconTooltip : null;
 
         private Mod mod;
@@ -42,10 +40,18 @@ namespace osu.Game.Rulesets.UI
             set
             {
                 mod = value;
-                updateMod(value);
+
+                if (IsLoaded)
+                    updateMod(value);
             }
         }
 
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        private Color4 backgroundColour;
+        private Color4 highlightedColour;
+
         /// <summary>
         /// Construct a new instance.
         /// </summary>
@@ -56,8 +62,6 @@ namespace osu.Game.Rulesets.UI
             this.mod = mod ?? throw new ArgumentNullException(nameof(mod));
             this.showTooltip = showTooltip;
 
-            type = mod.Type;
-
             Size = new Vector2(size);
 
             Children = new Drawable[]
@@ -89,6 +93,13 @@ namespace osu.Game.Rulesets.UI
                     Icon = FontAwesome.Solid.Question
                 },
             };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Selected.BindValueChanged(_ => updateColour());
 
             updateMod(mod);
         }
@@ -102,20 +113,14 @@ namespace osu.Game.Rulesets.UI
             {
                 modIcon.FadeOut();
                 modAcronym.FadeIn();
-                return;
+            }
+            else
+            {
+                modIcon.FadeIn();
+                modAcronym.FadeOut();
             }
 
-            modIcon.FadeIn();
-            modAcronym.FadeOut();
-        }
-
-        private Color4 backgroundColour;
-        private Color4 highlightedColour;
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            switch (type)
+            switch (value.Type)
             {
                 default:
                 case ModType.DifficultyIncrease:
@@ -149,12 +154,13 @@ namespace osu.Game.Rulesets.UI
                     modIcon.Colour = colours.Yellow;
                     break;
             }
+
+            updateColour();
         }
 
-        protected override void LoadComplete()
+        private void updateColour()
         {
-            base.LoadComplete();
-            Selected.BindValueChanged(selected => background.Colour = selected.NewValue ? highlightedColour : backgroundColour, true);
+            background.Colour = Selected.Value ? highlightedColour : backgroundColour;
         }
     }
 }

From aeb3ed8bb3bb12253eb2b4cf2092634e3c4c62ac Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Feb 2021 21:46:22 +0900
Subject: [PATCH 1260/3722] Renamespace footer button

---
 osu.Game/Screens/OnlinePlay/{Match => }/FooterButtonFreeMods.cs | 2 +-
 osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs             | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
 rename osu.Game/Screens/OnlinePlay/{Match => }/FooterButtonFreeMods.cs (97%)

diff --git a/osu.Game/Screens/OnlinePlay/Match/FooterButtonFreeMods.cs b/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs
similarity index 97%
rename from osu.Game/Screens/OnlinePlay/Match/FooterButtonFreeMods.cs
rename to osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs
index ca2db877c3..a3cc383b67 100644
--- a/osu.Game/Screens/OnlinePlay/Match/FooterButtonFreeMods.cs
+++ b/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs
@@ -13,7 +13,7 @@ using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Select;
 using osuTK;
 
-namespace osu.Game.Screens.OnlinePlay.Match
+namespace osu.Game.Screens.OnlinePlay
 {
     public class FooterButtonFreeMods : FooterButton, IHasCurrentValue<IReadOnlyList<Mod>>
     {
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
index 1c345b883f..0baa663578 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
@@ -15,7 +15,6 @@ using osu.Game.Online.Rooms;
 using osu.Game.Overlays.Mods;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Screens.OnlinePlay.Match;
 using osu.Game.Screens.Select;
 using osu.Game.Utils;
 

From 8e96ffd1e6ea4d848766c72e703503de6b23cffd Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 2 Feb 2021 16:54:40 +0300
Subject: [PATCH 1261/3722] Fix "wait for import" until step potentially
 finishing early

If not obvious, the issue with previous code is that it was checking for `IsAvailableLocally`, while the import is happening on a different thread, so that method could return `true` before the importing has finished and `ItemUpdated` event is called.
---
 .../TestSceneMultiplayerBeatmapAvailabilityTracker.cs     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapAvailabilityTracker.cs b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapAvailabilityTracker.cs
index 3c3793670a..646c4139af 100644
--- a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapAvailabilityTracker.cs
+++ b/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapAvailabilityTracker.cs
@@ -89,7 +89,7 @@ namespace osu.Game.Tests.Online
             addAvailabilityCheckStep("state importing", BeatmapAvailability.Importing);
 
             AddStep("allow importing", () => beatmaps.AllowImport.SetResult(true));
-            AddUntilStep("wait for import", () => beatmaps.IsAvailableLocally(testBeatmapSet));
+            AddUntilStep("wait for import", () => beatmaps.CurrentImportTask?.IsCompleted == true);
             addAvailabilityCheckStep("state locally available", BeatmapAvailability.LocallyAvailable);
         }
 
@@ -127,8 +127,6 @@ namespace osu.Game.Tests.Online
 
         private void addAvailabilityCheckStep(string description, Func<BeatmapAvailability> expected)
         {
-            // In DownloadTrackingComposite, state changes are scheduled one frame later, wait one step.
-            AddWaitStep("wait for potential change", 1);
             AddAssert(description, () => availablilityTracker.Availability.Value.Equals(expected.Invoke()));
         }
 
@@ -157,6 +155,8 @@ namespace osu.Game.Tests.Online
         {
             public TaskCompletionSource<bool> AllowImport = new TaskCompletionSource<bool>();
 
+            public Task<BeatmapSetInfo> CurrentImportTask { get; private set; }
+
             protected override ArchiveDownloadRequest<BeatmapSetInfo> CreateDownloadRequest(BeatmapSetInfo set, bool minimiseDownloadSize)
                 => new TestDownloadRequest(set);
 
@@ -168,7 +168,7 @@ namespace osu.Game.Tests.Online
             public override async Task<BeatmapSetInfo> Import(BeatmapSetInfo item, ArchiveReader archive = null, CancellationToken cancellationToken = default)
             {
                 await AllowImport.Task;
-                return await base.Import(item, archive, cancellationToken);
+                return await (CurrentImportTask = base.Import(item, archive, cancellationToken));
             }
         }
 

From 50d57a39317c32d59e30006679a030bedfbdb10b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 2 Feb 2021 17:07:16 +0300
Subject: [PATCH 1262/3722] Move tracker loading into BDL

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

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index f2cb1120cb..cdf889e4f1 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -41,11 +41,11 @@ namespace osu.Game.Screens.OnlinePlay.Match
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
 
         [Cached]
-        protected readonly MultiplayerBeatmapAvailablilityTracker BeatmapAvailablilityTracker;
+        protected MultiplayerBeatmapAvailablilityTracker BeatmapAvailablilityTracker { get; }
 
         protected RoomSubScreen()
         {
-            InternalChild = BeatmapAvailablilityTracker = new MultiplayerBeatmapAvailablilityTracker
+            BeatmapAvailablilityTracker = new MultiplayerBeatmapAvailablilityTracker
             {
                 SelectedItem = { BindTarget = SelectedItem },
             };
@@ -54,6 +54,8 @@ namespace osu.Game.Screens.OnlinePlay.Match
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
+            AddInternal(BeatmapAvailablilityTracker);
+
             sampleStart = audio.Samples.Get(@"SongSelect/confirm-selection");
         }
 

From 62d0036c819c0516005f9b5b3938d359e0cac987 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 2 Feb 2021 17:45:07 +0300
Subject: [PATCH 1263/3722] Fix using private constructor on MessagePack object

---
 osu.Game/Online/Rooms/BeatmapAvailability.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/Rooms/BeatmapAvailability.cs b/osu.Game/Online/Rooms/BeatmapAvailability.cs
index 2adeb9b959..a83327aad5 100644
--- a/osu.Game/Online/Rooms/BeatmapAvailability.cs
+++ b/osu.Game/Online/Rooms/BeatmapAvailability.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Online.Rooms
         public readonly float? DownloadProgress;
 
         [JsonConstructor]
-        private BeatmapAvailability(DownloadState state, float? downloadProgress = null)
+        public BeatmapAvailability(DownloadState state, float? downloadProgress = null)
         {
             State = state;
             DownloadProgress = downloadProgress;

From 181d2c672b5c93c1dfb84929b78a413dfe326db3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 2 Feb 2021 22:05:25 +0100
Subject: [PATCH 1264/3722] Fix outdated comment

---
 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 a7015ba1c4..2d438bd96e 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -343,7 +343,7 @@ namespace osu.Game.Screens.OnlinePlay
                                 Colour = Color4.Black,
                                 Width = 0.4f,
                             },
-                            // Piecewise-linear gradient with 3 segments to make it appear smoother
+                            // Piecewise-linear gradient with 2 segments to make it appear smoother
                             new Box
                             {
                                 RelativeSizeAxes = Axes.Both,

From fc84ec131347ee220c9c9df63561b3e6a099156f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 2 Feb 2021 22:18:14 +0100
Subject: [PATCH 1265/3722] Move anchor specification to central place

---
 .../Screens/OnlinePlay/DrawableRoomPlaylistItem.cs     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index 2d438bd96e..23c713a2c1 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -220,7 +220,11 @@ namespace osu.Game.Screens.OnlinePlay
                         AutoSizeAxes = Axes.Both,
                         Spacing = new Vector2(5),
                         X = -10,
-                        ChildrenEnumerable = CreateButtons()
+                        ChildrenEnumerable = CreateButtons().Select(button => button.With(b =>
+                        {
+                            b.Anchor = Anchor.Centre;
+                            b.Origin = Anchor.Centre;
+                        }))
                     }
                 }
             };
@@ -231,14 +235,10 @@ namespace osu.Game.Screens.OnlinePlay
             {
                 new PlaylistDownloadButton(Item)
                 {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
                     Size = new Vector2(50, 30)
                 },
                 new PlaylistRemoveButton
                 {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
                     Size = new Vector2(30, 30),
                     Alpha = allowEdit ? 1 : 0,
                     Action = () => RequestDeletion?.Invoke(Model),

From 21d5f842fccb799ad83ae47ca868b4b3a9827cbb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Feb 2021 14:52:36 +0900
Subject: [PATCH 1266/3722] Re-layout to reduce movement

---
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 95 +++++++++++--------
 1 file changed, 54 insertions(+), 41 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 86982e2794..4664ac6bfe 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -97,18 +97,19 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                                         },
                                         new Drawable[]
                                         {
-                                            new GridContainer
+                                            new Container
                                             {
                                                 RelativeSizeAxes = Axes.Both,
-                                                Content = new[]
+                                                Padding = new MarginPadding { Horizontal = 5, Vertical = 10 },
+                                                Child = new GridContainer
                                                 {
-                                                    new Drawable[]
+                                                    RelativeSizeAxes = Axes.Both,
+                                                    Content = new[]
                                                     {
-                                                        new Container
+                                                        new Drawable[]
                                                         {
-                                                            RelativeSizeAxes = Axes.Both,
-                                                            Padding = new MarginPadding { Horizontal = 5, Vertical = 10 },
-                                                            Child = new GridContainer
+                                                            // Main left column
+                                                            new GridContainer
                                                             {
                                                                 RelativeSizeAxes = Axes.Both,
                                                                 RowDimensions = new[]
@@ -126,45 +127,57 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                                                                         },
                                                                     }
                                                                 }
-                                                            }
-                                                        },
-                                                        new FillFlowContainer
-                                                        {
-                                                            Anchor = Anchor.Centre,
-                                                            Origin = Anchor.Centre,
-                                                            RelativeSizeAxes = Axes.X,
-                                                            AutoSizeAxes = Axes.Y,
-                                                            Padding = new MarginPadding { Horizontal = 5 },
-                                                            Spacing = new Vector2(0, 10),
-                                                            Children = new[]
+                                                            },
+                                                            // Main right column
+                                                            new FillFlowContainer
                                                             {
-                                                                new FillFlowContainer
+                                                                RelativeSizeAxes = Axes.X,
+                                                                AutoSizeAxes = Axes.Y,
+                                                                Children = new[]
                                                                 {
-                                                                    RelativeSizeAxes = Axes.X,
-                                                                    AutoSizeAxes = Axes.Y,
-                                                                    Children = new Drawable[]
+                                                                    new FillFlowContainer
                                                                     {
-                                                                        new OverlinedHeader("Beatmap"),
-                                                                        new BeatmapSelectionControl { RelativeSizeAxes = Axes.X }
-                                                                    }
-                                                                },
-                                                                userModsSection = new FillFlowContainer
-                                                                {
-                                                                    RelativeSizeAxes = Axes.X,
-                                                                    AutoSizeAxes = Axes.Y,
-                                                                    Children = new Drawable[]
+                                                                        RelativeSizeAxes = Axes.X,
+                                                                        AutoSizeAxes = Axes.Y,
+                                                                        Children = new Drawable[]
+                                                                        {
+                                                                            new OverlinedHeader("Beatmap"),
+                                                                            new BeatmapSelectionControl { RelativeSizeAxes = Axes.X }
+                                                                        }
+                                                                    },
+                                                                    userModsSection = new FillFlowContainer
                                                                     {
-                                                                        new OverlinedHeader("Extra mods"),
-                                                                        new ModDisplay
+                                                                        RelativeSizeAxes = Axes.X,
+                                                                        AutoSizeAxes = Axes.Y,
+                                                                        Margin = new MarginPadding { Top = 10 },
+                                                                        Children = new Drawable[]
                                                                         {
-                                                                            DisplayUnrankedText = false,
-                                                                            Current = UserMods
-                                                                        },
-                                                                        new PurpleTriangleButton
-                                                                        {
-                                                                            RelativeSizeAxes = Axes.X,
-                                                                            Text = "Select",
-                                                                            Action = () => userModsSelectOverlay.Show()
+                                                                            new OverlinedHeader("Extra mods"),
+                                                                            new FillFlowContainer
+                                                                            {
+                                                                                AutoSizeAxes = Axes.Both,
+                                                                                Direction = FillDirection.Horizontal,
+                                                                                Spacing = new Vector2(10, 0),
+                                                                                Children = new Drawable[]
+                                                                                {
+                                                                                    new PurpleTriangleButton
+                                                                                    {
+                                                                                        Anchor = Anchor.CentreLeft,
+                                                                                        Origin = Anchor.CentreLeft,
+                                                                                        Width = 90,
+                                                                                        Text = "Select",
+                                                                                        Action = () => userModsSelectOverlay.Show()
+                                                                                    },
+                                                                                    new ModDisplay
+                                                                                    {
+                                                                                        Anchor = Anchor.CentreLeft,
+                                                                                        Origin = Anchor.CentreLeft,
+                                                                                        DisplayUnrankedText = false,
+                                                                                        Current = UserMods,
+                                                                                        Scale = new Vector2(0.8f),
+                                                                                    },
+                                                                                }
+                                                                            }
                                                                         }
                                                                     }
                                                                 }

From 8bb13915152ef6c5ac4a96f684bdbece349409c8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Feb 2021 14:53:13 +0900
Subject: [PATCH 1267/3722] Fix inspection

---
 .../Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index 768dc6512c..e2c98c0aad 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
@@ -134,7 +134,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 Client.AddUser(new User
                 {
                     Id = 0,
-                    Username = $"User 0",
+                    Username = "User 0",
                     CurrentModeRank = RNG.Next(1, 100000),
                     CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
                 });

From 8295fb908174b78cdf7803a28e5b5be4ae5346e9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Feb 2021 16:28:22 +0900
Subject: [PATCH 1268/3722] Implement mania constant speed mod

---
 osu.Game.Rulesets.Mania/ManiaRuleset.cs       |  1 +
 .../Mods/ManiaModConstantSpeed.cs             | 35 +++++++++++++++++++
 .../UI/DrawableManiaRuleset.cs                |  5 +++
 .../UI/Scrolling/DrawableScrollingRuleset.cs  |  8 ++---
 4 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/Mods/ManiaModConstantSpeed.cs

diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 59c766fd84..4c729fef83 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -238,6 +238,7 @@ namespace osu.Game.Rulesets.Mania
                         new ManiaModMirror(),
                         new ManiaModDifficultyAdjust(),
                         new ManiaModInvert(),
+                        new ManiaModConstantSpeed()
                     };
 
                 case ModType.Automation:
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModConstantSpeed.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModConstantSpeed.cs
new file mode 100644
index 0000000000..078394b1d8
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModConstantSpeed.cs
@@ -0,0 +1,35 @@
+// Copyright (c) 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.Sprites;
+using osu.Game.Configuration;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public class ManiaModConstantSpeed : Mod, IApplicableToDrawableRuleset<ManiaHitObject>
+    {
+        public override string Name => "Constant Speed";
+
+        public override string Acronym => "CS";
+
+        public override double ScoreMultiplier => 1;
+
+        public override string Description => "No more tricky speed changes!";
+
+        public override IconUsage? Icon => FontAwesome.Solid.Equals;
+
+        public override ModType Type => ModType.Conversion;
+
+        public override bool Ranked => false;
+
+        public void ApplyToDrawableRuleset(DrawableRuleset<ManiaHitObject> drawableRuleset)
+        {
+            var maniaRuleset = (DrawableManiaRuleset)drawableRuleset;
+            maniaRuleset.ScrollMethod = ScrollVisualisationMethod.Constant;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 941ac9816c..6b34dbfa09 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -11,6 +11,7 @@ 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;
@@ -49,6 +50,10 @@ namespace osu.Game.Rulesets.Mania.UI
 
         protected new ManiaRulesetConfigManager Config => (ManiaRulesetConfigManager)base.Config;
 
+        public ScrollVisualisationMethod ScrollMethod = ScrollVisualisationMethod.Sequential;
+
+        protected override ScrollVisualisationMethod VisualisationMethod => ScrollMethod;
+
         private readonly Bindable<ManiaScrollingDirection> configDirection = new Bindable<ManiaScrollingDirection>();
         private readonly Bindable<double> configTimeRange = new BindableDouble();
 
diff --git a/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs b/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
index 0955f32790..6ffdad211b 100644
--- a/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs
@@ -91,7 +91,11 @@ namespace osu.Game.Rulesets.UI.Scrolling
             scrollingInfo = new LocalScrollingInfo();
             scrollingInfo.Direction.BindTo(Direction);
             scrollingInfo.TimeRange.BindTo(TimeRange);
+        }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
             switch (VisualisationMethod)
             {
                 case ScrollVisualisationMethod.Sequential:
@@ -106,11 +110,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
                     scrollingInfo.Algorithm = new ConstantScrollAlgorithm();
                     break;
             }
-        }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
             double lastObjectTime = Objects.LastOrDefault()?.GetEndTime() ?? double.MaxValue;
             double baseBeatLength = TimingControlPoint.DEFAULT_BEAT_LENGTH;
 

From c8f1126bd793cdf6169a1d27742fd0909cdd9c33 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Feb 2021 19:44:39 +0900
Subject: [PATCH 1269/3722] Add failing test

---
 ...tion.cs => TestAPIModJsonSerialization.cs} |   2 +-
 .../TestAPIModMessagePackSerialization.cs     | 139 ++++++++++++++++++
 2 files changed, 140 insertions(+), 1 deletion(-)
 rename osu.Game.Tests/Online/{TestAPIModSerialization.cs => TestAPIModJsonSerialization.cs} (99%)
 create mode 100644 osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs

diff --git a/osu.Game.Tests/Online/TestAPIModSerialization.cs b/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
similarity index 99%
rename from osu.Game.Tests/Online/TestAPIModSerialization.cs
rename to osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
index 5948582d77..aa6f66da81 100644
--- a/osu.Game.Tests/Online/TestAPIModSerialization.cs
+++ b/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
@@ -16,7 +16,7 @@ using osu.Game.Rulesets.UI;
 namespace osu.Game.Tests.Online
 {
     [TestFixture]
-    public class TestAPIModSerialization
+    public class TestAPIModJsonSerialization
     {
         [Test]
         public void TestAcronymIsPreserved()
diff --git a/osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs b/osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs
new file mode 100644
index 0000000000..4294f89397
--- /dev/null
+++ b/osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs
@@ -0,0 +1,139 @@
+// Copyright (c) ppy 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 MessagePack;
+using NUnit.Framework;
+using osu.Framework.Bindables;
+using osu.Game.Beatmaps;
+using osu.Game.Configuration;
+using osu.Game.Online.API;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Difficulty;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Tests.Online
+{
+    [TestFixture]
+    public class TestAPIModMessagePackSerialization
+    {
+        [Test]
+        public void TestAcronymIsPreserved()
+        {
+            var apiMod = new APIMod(new TestMod());
+
+            var deserialized = MessagePackSerializer.Deserialize<APIMod>(MessagePackSerializer.Serialize(apiMod));
+
+            Assert.That(deserialized.Acronym, Is.EqualTo(apiMod.Acronym));
+        }
+
+        [Test]
+        public void TestRawSettingIsPreserved()
+        {
+            var apiMod = new APIMod(new TestMod { TestSetting = { Value = 2 } });
+
+            var deserialized = MessagePackSerializer.Deserialize<APIMod>(MessagePackSerializer.Serialize(apiMod));
+
+            Assert.That(deserialized.Settings, Contains.Key("test_setting").With.ContainValue(2.0));
+        }
+
+        [Test]
+        public void TestConvertedModHasCorrectSetting()
+        {
+            var apiMod = new APIMod(new TestMod { TestSetting = { Value = 2 } });
+
+            var deserialized = MessagePackSerializer.Deserialize<APIMod>(MessagePackSerializer.Serialize(apiMod));
+            var converted = (TestMod)deserialized.ToMod(new TestRuleset());
+
+            Assert.That(converted.TestSetting.Value, Is.EqualTo(2));
+        }
+
+        [Test]
+        public void TestDeserialiseTimeRampMod()
+        {
+            // Create the mod with values different from default.
+            var apiMod = new APIMod(new TestModTimeRamp
+            {
+                AdjustPitch = { Value = false },
+                InitialRate = { Value = 1.25 },
+                FinalRate = { Value = 0.25 }
+            });
+
+            var deserialised = MessagePackSerializer.Deserialize<APIMod>(MessagePackSerializer.Serialize(apiMod));
+            var converted = (TestModTimeRamp)deserialised.ToMod(new TestRuleset());
+
+            Assert.That(converted.AdjustPitch.Value, Is.EqualTo(false));
+            Assert.That(converted.InitialRate.Value, Is.EqualTo(1.25));
+            Assert.That(converted.FinalRate.Value, Is.EqualTo(0.25));
+        }
+
+        private class TestRuleset : Ruleset
+        {
+            public override IEnumerable<Mod> GetModsFor(ModType type) => new Mod[]
+            {
+                new TestMod(),
+                new TestModTimeRamp(),
+            };
+
+            public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => throw new System.NotImplementedException();
+
+            public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => throw new System.NotImplementedException();
+
+            public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => throw new System.NotImplementedException();
+
+            public override string Description { get; } = string.Empty;
+            public override string ShortName { get; } = string.Empty;
+        }
+
+        private class TestMod : Mod
+        {
+            public override string Name => "Test Mod";
+            public override string Acronym => "TM";
+            public override double ScoreMultiplier => 1;
+
+            [SettingSource("Test")]
+            public BindableNumber<double> TestSetting { get; } = new BindableDouble
+            {
+                MinValue = 0,
+                MaxValue = 10,
+                Default = 5,
+                Precision = 0.01,
+            };
+        }
+
+        private class TestModTimeRamp : ModTimeRamp
+        {
+            public override string Name => "Test Mod";
+            public override string Acronym => "TMTR";
+            public override double ScoreMultiplier => 1;
+
+            [SettingSource("Initial rate", "The starting speed of the track")]
+            public override BindableNumber<double> InitialRate { get; } = new BindableDouble
+            {
+                MinValue = 1,
+                MaxValue = 2,
+                Default = 1.5,
+                Value = 1.5,
+                Precision = 0.01,
+            };
+
+            [SettingSource("Final rate", "The speed increase to ramp towards")]
+            public override BindableNumber<double> FinalRate { get; } = new BindableDouble
+            {
+                MinValue = 0,
+                MaxValue = 1,
+                Default = 0.5,
+                Value = 0.5,
+                Precision = 0.01,
+            };
+
+            [SettingSource("Adjust pitch", "Should pitch be adjusted with speed")]
+            public override BindableBool AdjustPitch { get; } = new BindableBool
+            {
+                Default = true,
+                Value = true
+            };
+        }
+    }
+}

From 75f1ebd5f92ef4200f21f457bea58a23d4cdfa70 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Feb 2021 19:46:47 +0900
Subject: [PATCH 1270/3722] Add custom resolver for mod settings dictionary

---
 osu.Game/Online/API/APIMod.cs                 |  1 +
 .../API/ModSettingsDictionaryFormatter.cs     | 96 +++++++++++++++++++
 2 files changed, 97 insertions(+)
 create mode 100644 osu.Game/Online/API/ModSettingsDictionaryFormatter.cs

diff --git a/osu.Game/Online/API/APIMod.cs b/osu.Game/Online/API/APIMod.cs
index 69ce3825ee..bff08b0515 100644
--- a/osu.Game/Online/API/APIMod.cs
+++ b/osu.Game/Online/API/APIMod.cs
@@ -23,6 +23,7 @@ namespace osu.Game.Online.API
 
         [JsonProperty("settings")]
         [Key(1)]
+        [MessagePackFormatter(typeof(ModSettingsDictionaryFormatter))]
         public Dictionary<string, object> Settings { get; set; } = new Dictionary<string, object>();
 
         [JsonConstructor]
diff --git a/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs b/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
new file mode 100644
index 0000000000..a8ee9beca5
--- /dev/null
+++ b/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
@@ -0,0 +1,96 @@
+using System;
+using System.Collections.Generic;
+using MessagePack;
+using MessagePack.Formatters;
+using osu.Framework.Bindables;
+
+namespace osu.Game.Online.API
+{
+    public class ModSettingsDictionaryFormatter : IMessagePackFormatter<Dictionary<string, object>>
+    {
+        public int Serialize(ref byte[] bytes, int offset, Dictionary<string, object> value, IFormatterResolver formatterResolver)
+        {
+            int startOffset = offset;
+
+            offset += MessagePackBinary.WriteArrayHeader(ref bytes, offset, value.Count);
+
+            foreach (var kvp in value)
+            {
+                offset += MessagePackBinary.WriteString(ref bytes, offset, kvp.Key);
+
+                switch (kvp.Value)
+                {
+                    case Bindable<double> d:
+                        offset += MessagePackBinary.WriteDouble(ref bytes, offset, d.Value);
+                        break;
+
+                    case Bindable<float> f:
+                        offset += MessagePackBinary.WriteSingle(ref bytes, offset, f.Value);
+                        break;
+
+                    case Bindable<bool> b:
+                        offset += MessagePackBinary.WriteBoolean(ref bytes, offset, b.Value);
+                        break;
+
+                    default:
+                        throw new ArgumentException("A setting was of a type not supported by the messagepack serialiser", nameof(bytes));
+                }
+            }
+
+            return offset - startOffset;
+        }
+
+        public Dictionary<string, object> Deserialize(byte[] bytes, int offset, IFormatterResolver formatterResolver, out int readSize)
+        {
+            int startOffset = offset;
+
+            var output = new Dictionary<string, object>();
+
+            int itemCount = MessagePackBinary.ReadArrayHeader(bytes, offset, out readSize);
+            offset += readSize;
+
+            for (int i = 0; i < itemCount; i++)
+            {
+                var key = MessagePackBinary.ReadString(bytes, offset, out readSize);
+                offset += readSize;
+
+                switch (MessagePackBinary.GetMessagePackType(bytes, offset))
+                {
+                    case MessagePackType.Float:
+                    {
+                        // could be either float or double...
+                        // see https://github.com/msgpack/msgpack/blob/master/spec.md#serialization-type-to-format-conversion
+                        switch (MessagePackCode.ToFormatName(bytes[offset]))
+                        {
+                            case "float 32":
+                                output[key] = MessagePackBinary.ReadSingle(bytes, offset, out readSize);
+                                offset += readSize;
+                                break;
+
+                            case "float 64":
+                                output[key] = MessagePackBinary.ReadDouble(bytes, offset, out readSize);
+                                offset += readSize;
+                                break;
+
+                            default:
+                                throw new ArgumentException("A setting was of a type not supported by the messagepack deserialiser", nameof(bytes));
+                        }
+
+                        break;
+                    }
+
+                    case MessagePackType.Boolean:
+                        output[key] = MessagePackBinary.ReadBoolean(bytes, offset, out readSize);
+                        offset += readSize;
+                        break;
+
+                    default:
+                        throw new ArgumentException("A setting was of a type not supported by the messagepack deserialiser", nameof(bytes));
+                }
+            }
+
+            readSize = offset - startOffset;
+            return output;
+        }
+    }
+}

From d3f056f188ee7410f7603d71b6abec964755231b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Feb 2021 20:06:25 +0900
Subject: [PATCH 1271/3722] Add missing licence header

---
 osu.Game/Online/API/ModSettingsDictionaryFormatter.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs b/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
index a8ee9beca5..1b381e7c98 100644
--- a/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
+++ b/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
@@ -1,3 +1,6 @@
+// Copyright (c) ppy 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 MessagePack;

From 1380717ebb5b51da488736df8cd30484ecc62532 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Feb 2021 20:19:27 +0900
Subject: [PATCH 1272/3722] Use PrimitiveObjectFormatter to simplify code

---
 .../API/ModSettingsDictionaryFormatter.cs     | 43 +++----------------
 1 file changed, 7 insertions(+), 36 deletions(-)

diff --git a/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs b/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
index 1b381e7c98..3dd8bff61b 100644
--- a/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
+++ b/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
@@ -15,6 +15,8 @@ namespace osu.Game.Online.API
         {
             int startOffset = offset;
 
+            var primitiveFormatter = PrimitiveObjectFormatter.Instance;
+
             offset += MessagePackBinary.WriteArrayHeader(ref bytes, offset, value.Count);
 
             foreach (var kvp in value)
@@ -24,15 +26,15 @@ namespace osu.Game.Online.API
                 switch (kvp.Value)
                 {
                     case Bindable<double> d:
-                        offset += MessagePackBinary.WriteDouble(ref bytes, offset, d.Value);
+                        offset += primitiveFormatter.Serialize(ref bytes, offset, d.Value, formatterResolver);
                         break;
 
                     case Bindable<float> f:
-                        offset += MessagePackBinary.WriteSingle(ref bytes, offset, f.Value);
+                        offset += primitiveFormatter.Serialize(ref bytes, offset, f.Value, formatterResolver);
                         break;
 
                     case Bindable<bool> b:
-                        offset += MessagePackBinary.WriteBoolean(ref bytes, offset, b.Value);
+                        offset += primitiveFormatter.Serialize(ref bytes, offset, b.Value, formatterResolver);
                         break;
 
                     default:
@@ -57,39 +59,8 @@ namespace osu.Game.Online.API
                 var key = MessagePackBinary.ReadString(bytes, offset, out readSize);
                 offset += readSize;
 
-                switch (MessagePackBinary.GetMessagePackType(bytes, offset))
-                {
-                    case MessagePackType.Float:
-                    {
-                        // could be either float or double...
-                        // see https://github.com/msgpack/msgpack/blob/master/spec.md#serialization-type-to-format-conversion
-                        switch (MessagePackCode.ToFormatName(bytes[offset]))
-                        {
-                            case "float 32":
-                                output[key] = MessagePackBinary.ReadSingle(bytes, offset, out readSize);
-                                offset += readSize;
-                                break;
-
-                            case "float 64":
-                                output[key] = MessagePackBinary.ReadDouble(bytes, offset, out readSize);
-                                offset += readSize;
-                                break;
-
-                            default:
-                                throw new ArgumentException("A setting was of a type not supported by the messagepack deserialiser", nameof(bytes));
-                        }
-
-                        break;
-                    }
-
-                    case MessagePackType.Boolean:
-                        output[key] = MessagePackBinary.ReadBoolean(bytes, offset, out readSize);
-                        offset += readSize;
-                        break;
-
-                    default:
-                        throw new ArgumentException("A setting was of a type not supported by the messagepack deserialiser", nameof(bytes));
-                }
+                output[key] = PrimitiveObjectFormatter.Instance.Deserialize(bytes, offset, formatterResolver, out readSize);
+                offset += readSize;
             }
 
             readSize = offset - startOffset;

From 65d45ec74cefcc4db80ef0d83d9bc598bc2e864b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Feb 2021 20:50:22 +0900
Subject: [PATCH 1273/3722] Unschedule cancellation

---
 .../Multiplayer/StatefulMultiplayerClient.cs     | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index de51a4b117..7d729a3c11 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -117,13 +117,7 @@ namespace osu.Game.Online.Multiplayer
         /// <param name="room">The API <see cref="Room"/>.</param>
         public async Task JoinRoom(Room room)
         {
-            var cancellationSource = new CancellationTokenSource();
-
-            await scheduleAsync(() =>
-            {
-                joinCancellationSource?.Cancel();
-                joinCancellationSource = cancellationSource;
-            }, CancellationToken.None);
+            var cancellationSource = joinCancellationSource = new CancellationTokenSource();
 
             await joinOrLeaveTaskChain.Add(async () =>
             {
@@ -162,15 +156,15 @@ namespace osu.Game.Online.Multiplayer
 
         public Task LeaveRoom()
         {
+            // The join may have not completed yet, so certain tasks that either update the room or reference the room should be cancelled.
+            // This includes the setting of Room itself along with the initial update of the room settings on join.
+            joinCancellationSource?.Cancel();
+
             // Leaving rooms is expected to occur instantaneously whilst the operation is finalised in the background.
             // However a few members need to be reset immediately to prevent other components from entering invalid states whilst the operation hasn't yet completed.
             // For example, if a room was left and the user immediately pressed the "create room" button, then the user could be taken into the lobby if the value of Room is not reset in time.
             var scheduledReset = scheduleAsync(() =>
             {
-                // The join may have not completed yet, so certain tasks that either update the room or reference the room should be cancelled.
-                // This includes the setting of Room itself along with the initial update of the room settings on join.
-                joinCancellationSource?.Cancel();
-
                 apiRoom = null;
                 Room = null;
                 CurrentMatchPlayingUserIds.Clear();

From 623b47f9af503a400facfea44e2db230db42a279 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Feb 2021 21:25:05 +0900
Subject: [PATCH 1274/3722] Add flag to toggle follow circle tracking for
 slider heads

---
 .../Objects/Drawables/DrawableSliderHead.cs        | 14 ++++++++++----
 osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs  |  4 ++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index acc95ab036..c051a9918d 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -12,6 +12,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
     public class DrawableSliderHead : DrawableHitCircle
     {
+        public new SliderHeadCircle HitObject => (SliderHeadCircle)base.HitObject;
+
         [CanBeNull]
         public Slider Slider => DrawableSlider?.HitObject;
 
@@ -59,12 +61,16 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             base.Update();
 
             Debug.Assert(Slider != null);
+            Debug.Assert(HitObject != null);
 
-            double completionProgress = Math.Clamp((Time.Current - Slider.StartTime) / Slider.Duration, 0, 1);
+            if (HitObject.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);
+                //todo: we probably want to reconsider this before adding scoring, but it looks and feels nice.
+                if (!IsHit)
+                    Position = Slider.CurvePositionAt(completionProgress);
+            }
         }
 
         public Action<double> OnShake;
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs b/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
index f6d46aeef5..5fc480883a 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
@@ -5,5 +5,9 @@ namespace osu.Game.Rulesets.Osu.Objects
 {
     public class SliderHeadCircle : HitCircle
     {
+        /// <summary>
+        /// Makes the head circle track the follow circle when the start time is reached.
+        /// </summary>
+        public bool TrackFollowCircle = true;
     }
 }

From 3fe190cfbe7c5fb3c6d2863ea53a33b370ea03cd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Feb 2021 22:00:16 +0900
Subject: [PATCH 1275/3722] Show original error message on web exceptions (or
 is no message is returned)

---
 osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
index 7936ab8ecd..dc98eb8687 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Diagnostics;
 using System.Linq;
+using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
@@ -65,7 +66,10 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
             {
                 failed = true;
 
-                Logger.Log($"You are not able to submit a score: {e.Message}", LoggingTarget.Information, LogLevel.Important);
+                if (e is WebException || string.IsNullOrEmpty(e.Message))
+                    Logger.Error(e, "Failed to retrieve a score submission token.\n\nThis may happen if you are running an old or non-official release of osu! (ie. you are self-compiling).");
+                else
+                    Logger.Log($"You are not able to submit a score: {e.Message}", level: LogLevel.Important);
 
                 Schedule(() =>
                 {

From 9d7164816cf073be96b07353d6d996c50086ad71 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Feb 2021 22:02:40 +0900
Subject: [PATCH 1276/3722] Add reverse binding for max attempts (currently
 unused but good for safety)

---
 .../OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
index bf85ecf13d..56d3143f59 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
@@ -280,6 +280,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                 RoomName.BindValueChanged(name => NameField.Text = name.NewValue, true);
                 Availability.BindValueChanged(availability => AvailabilityPicker.Current.Value = availability.NewValue, true);
                 MaxParticipants.BindValueChanged(count => MaxParticipantsField.Text = count.NewValue?.ToString(), true);
+                MaxAttempts.BindValueChanged(count => MaxAttemptsField.Text = count.NewValue?.ToString(), true);
                 Duration.BindValueChanged(duration => DurationField.Current.Value = duration.NewValue ?? TimeSpan.FromMinutes(30), true);
 
                 playlist.Items.BindTo(Playlist);

From e3d323989c6925304f1f8e126e3cab6aee31695a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Feb 2021 20:42:27 +0900
Subject: [PATCH 1277/3722] Switch to SignalR 5.0 and implement using better
 API

---
 .../API/ModSettingsDictionaryFormatter.cs     | 39 ++++++++-----------
 osu.Game/osu.Game.csproj                      |  7 ++--
 2 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs b/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
index 3dd8bff61b..fc6b82a16b 100644
--- a/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
+++ b/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
@@ -1,8 +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.Buffers;
 using System.Collections.Generic;
+using System.Text;
 using MessagePack;
 using MessagePack.Formatters;
 using osu.Framework.Bindables;
@@ -11,59 +12,51 @@ namespace osu.Game.Online.API
 {
     public class ModSettingsDictionaryFormatter : IMessagePackFormatter<Dictionary<string, object>>
     {
-        public int Serialize(ref byte[] bytes, int offset, Dictionary<string, object> value, IFormatterResolver formatterResolver)
+        public void Serialize(ref MessagePackWriter writer, Dictionary<string, object> value, MessagePackSerializerOptions options)
         {
-            int startOffset = offset;
-
             var primitiveFormatter = PrimitiveObjectFormatter.Instance;
 
-            offset += MessagePackBinary.WriteArrayHeader(ref bytes, offset, value.Count);
+            writer.WriteArrayHeader(value.Count);
 
             foreach (var kvp in value)
             {
-                offset += MessagePackBinary.WriteString(ref bytes, offset, kvp.Key);
+                var stringBytes = new ReadOnlySequence<byte>(Encoding.UTF8.GetBytes(kvp.Key));
+                writer.WriteString(in stringBytes);
 
                 switch (kvp.Value)
                 {
                     case Bindable<double> d:
-                        offset += primitiveFormatter.Serialize(ref bytes, offset, d.Value, formatterResolver);
+                        primitiveFormatter.Serialize(ref writer, d.Value, options);
                         break;
 
                     case Bindable<float> f:
-                        offset += primitiveFormatter.Serialize(ref bytes, offset, f.Value, formatterResolver);
+                        primitiveFormatter.Serialize(ref writer, f.Value, options);
                         break;
 
                     case Bindable<bool> b:
-                        offset += primitiveFormatter.Serialize(ref bytes, offset, b.Value, formatterResolver);
+                        primitiveFormatter.Serialize(ref writer, b.Value, options);
                         break;
 
                     default:
-                        throw new ArgumentException("A setting was of a type not supported by the messagepack serialiser", nameof(bytes));
+                        // fall back for non-bindable cases.
+                        primitiveFormatter.Serialize(ref writer, kvp.Value, options);
+                        break;
                 }
             }
-
-            return offset - startOffset;
         }
 
-        public Dictionary<string, object> Deserialize(byte[] bytes, int offset, IFormatterResolver formatterResolver, out int readSize)
+        public Dictionary<string, object> Deserialize(ref MessagePackReader reader, MessagePackSerializerOptions options)
         {
-            int startOffset = offset;
-
             var output = new Dictionary<string, object>();
 
-            int itemCount = MessagePackBinary.ReadArrayHeader(bytes, offset, out readSize);
-            offset += readSize;
+            int itemCount = reader.ReadArrayHeader();
 
             for (int i = 0; i < itemCount; i++)
             {
-                var key = MessagePackBinary.ReadString(bytes, offset, out readSize);
-                offset += readSize;
-
-                output[key] = PrimitiveObjectFormatter.Instance.Deserialize(bytes, offset, formatterResolver, out readSize);
-                offset += readSize;
+                output[reader.ReadString()] =
+                    PrimitiveObjectFormatter.Instance.Deserialize(ref reader, options);
             }
 
-            readSize = offset - startOffset;
             return output;
         }
     }
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index e2b506e187..eabd5c7d12 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -20,11 +20,12 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="DiffPlex" Version="1.6.3" />
     <PackageReference Include="Humanizer" Version="2.8.26" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.10" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.11" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.10" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="5.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="5.0.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.128.0" />

From 03b7817887ea059719094f001a81c5b4f1c9ee36 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Feb 2021 22:12:20 +0900
Subject: [PATCH 1278/3722] Add flags to return to classic slider scoring

---
 .../Objects/Drawables/DrawableHitCircle.cs    |  9 ++++++-
 .../Objects/Drawables/DrawableSlider.cs       | 24 ++++++++++++++++++-
 .../Objects/Drawables/DrawableSliderHead.cs   | 15 ++++++++++++
 osu.Game.Rulesets.Osu/Objects/Slider.cs       |  8 ++++++-
 .../Objects/SliderHeadCircle.cs               | 14 ++++++++++-
 5 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index 3c0260f5f5..77094f928b 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -123,7 +123,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 return;
             }
 
-            var result = HitObject.HitWindows.ResultFor(timeOffset);
+            var result = ResultFor(timeOffset);
 
             if (result == HitResult.None || CheckHittable?.Invoke(this, Time.Current) == false)
             {
@@ -146,6 +146,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             });
         }
 
+        /// <summary>
+        /// Retrieves the <see cref="HitResult"/> for a time offset.
+        /// </summary>
+        /// <param name="timeOffset">The time offset.</param>
+        /// <returns>The hit result, or <see cref="HitResult.None"/> if <paramref name="timeOffset"/> doesn't result in a judgement.</returns>
+        protected virtual HitResult ResultFor(double timeOffset) => HitObject.HitWindows.ResultFor(timeOffset);
+
         protected override void UpdateInitialTransforms()
         {
             base.UpdateInitialTransforms();
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 511cbc2347..7061ce59d0 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -15,6 +15,7 @@ using osu.Game.Rulesets.Objects;
 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 osuTK.Graphics;
 using osu.Game.Skinning;
 
@@ -249,7 +250,28 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (userTriggered || Time.Current < HitObject.EndTime)
                 return;
 
-            ApplyResult(r => r.Type = NestedHitObjects.Any(h => h.Result.IsHit) ? r.Judgement.MaxResult : r.Judgement.MinResult);
+            if (HitObject.IgnoreJudgement)
+            {
+                ApplyResult(r => r.Type = NestedHitObjects.Any(h => h.Result.IsHit) ? r.Judgement.MaxResult : r.Judgement.MinResult);
+                return;
+            }
+
+            // If not ignoring judgement, score proportionally based on the number of ticks hit, counting the head circle as a tick.
+            ApplyResult(r =>
+            {
+                int totalTicks = NestedHitObjects.Count;
+                int hitTicks = NestedHitObjects.Count(h => h.IsHit);
+                double hitFraction = (double)totalTicks / hitTicks;
+
+                if (hitTicks == totalTicks)
+                    r.Type = HitResult.Great;
+                else if (hitFraction >= 0.5)
+                    r.Type = HitResult.Ok;
+                else if (hitFraction > 0)
+                    r.Type = HitResult.Meh;
+                else
+                    r.Type = HitResult.Miss;
+            });
         }
 
         public override void PlaySamples()
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index c051a9918d..08e9c5eb14 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -7,6 +7,7 @@ using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
@@ -19,6 +20,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         protected DrawableSlider DrawableSlider => (DrawableSlider)ParentHitObject;
 
+        public override bool DisplayResult => HitObject?.JudgeAsNormalHitCircle ?? base.DisplayResult;
+
         private readonly IBindable<int> pathVersion = new Bindable<int>();
 
         protected override OsuSkinComponents CirclePieceComponent => OsuSkinComponents.SliderHeadHitCircle;
@@ -73,6 +76,18 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
         }
 
+        protected override HitResult ResultFor(double timeOffset)
+        {
+            Debug.Assert(HitObject != null);
+
+            if (HitObject.JudgeAsNormalHitCircle)
+                return base.ResultFor(timeOffset);
+
+            // If not judged as a normal hitcircle, only track whether a hit has occurred (via IgnoreHit) rather than a scorable hit result.
+            var result = base.ResultFor(timeOffset);
+            return result.IsHit() ? HitResult.IgnoreHit : result;
+        }
+
         public Action<double> OnShake;
 
         public override void Shake(double maximumLength) => OnShake?.Invoke(maximumLength);
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 1670df24a8..e3365a8ccf 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -114,6 +114,12 @@ namespace osu.Game.Rulesets.Osu.Objects
         /// </summary>
         public double TickDistanceMultiplier = 1;
 
+        /// <summary>
+        /// Whether this <see cref="Slider"/>'s judgement should be ignored.
+        /// If <c>false</c>, this <see cref="Slider"/> will be judged proportionally to the number of ticks hit.
+        /// </summary>
+        public bool IgnoreJudgement = true;
+
         [JsonIgnore]
         public HitCircle HeadCircle { get; protected set; }
 
@@ -233,7 +239,7 @@ namespace osu.Game.Rulesets.Osu.Objects
                 HeadCircle.Samples = this.GetNodeSamples(0);
         }
 
-        public override Judgement CreateJudgement() => new OsuIgnoreJudgement();
+        public override Judgement CreateJudgement() => IgnoreJudgement ? new OsuIgnoreJudgement() : new OsuJudgement();
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs b/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
index 5fc480883a..13eac60300 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.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 osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Osu.Judgements;
+
 namespace osu.Game.Rulesets.Osu.Objects
 {
     public class SliderHeadCircle : HitCircle
     {
         /// <summary>
-        /// Makes the head circle track the follow circle when the start time is reached.
+        /// Makes this <see cref="SliderHeadCircle"/> track the follow circle when the start time is reached.
+        /// If <c>false</c>, this <see cref="SliderHeadCircle"/> will be pinned to its initial position in the slider.
         /// </summary>
         public bool TrackFollowCircle = true;
+
+        /// <summary>
+        /// Whether to treat this <see cref="SliderHeadCircle"/> as a normal <see cref="HitCircle"/> for judgement purposes.
+        /// If <c>false</c>, judgement will be ignored.
+        /// </summary>
+        public bool JudgeAsNormalHitCircle = true;
+
+        public override Judgement CreateJudgement() => JudgeAsNormalHitCircle ? base.CreateJudgement() : new OsuIgnoreJudgement();
     }
 }

From 2f22dbe06be3645ed9c5e8f99cc015414f578256 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Feb 2021 22:42:50 +0900
Subject: [PATCH 1279/3722] Make sliders display judgements when not ignored

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs | 2 +-
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
index 13f5960bd4..79655c33e4 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             if (JudgedObject?.HitObject is OsuHitObject osuObject)
             {
-                Position = osuObject.StackedPosition;
+                Position = osuObject.StackedEndPosition;
                 Scale = new Vector2(osuObject.Scale);
             }
         }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 7061ce59d0..e607163b3e 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         public SliderBall Ball { get; private set; }
         public SkinnableDrawable Body { get; private set; }
 
-        public override bool DisplayResult => false;
+        public override bool DisplayResult => !HitObject.IgnoreJudgement;
 
         private PlaySliderBody sliderBody => Body.Drawable as PlaySliderBody;
 

From 3b5c67a0630681b6e1e2f0d52486e241772661d3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Feb 2021 23:08:59 +0900
Subject: [PATCH 1280/3722] Add OsuModClassic

---
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs | 43 +++++++++++++++++++++
 osu.Game.Rulesets.Osu/OsuRuleset.cs         |  1 +
 2 files changed, 44 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
new file mode 100644
index 0000000000..5542580979
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -0,0 +1,43 @@
+// Copyright (c) ppy 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.Graphics.Sprites;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu.Objects;
+
+namespace osu.Game.Rulesets.Osu.Mods
+{
+    public class OsuModClassic : Mod, IApplicableToHitObject
+    {
+        public override string Name => "Classic";
+
+        public override string Acronym => "CL";
+
+        public override double ScoreMultiplier => 1;
+
+        public override IconUsage? Icon => FontAwesome.Solid.History;
+
+        public override string Description => "Feeling nostalgic?";
+
+        public override bool Ranked => false;
+
+        public void ApplyToHitObject(HitObject hitObject)
+        {
+            switch (hitObject)
+            {
+                case Slider slider:
+                    slider.IgnoreJudgement = false;
+
+                    foreach (var head in slider.NestedHitObjects.OfType<SliderHeadCircle>())
+                    {
+                        head.TrackFollowCircle = false;
+                        head.JudgeAsNormalHitCircle = false;
+                    }
+
+                    break;
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index cba0c5be14..18324a18a8 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -163,6 +163,7 @@ namespace osu.Game.Rulesets.Osu
                     {
                         new OsuModTarget(),
                         new OsuModDifficultyAdjust(),
+                        new OsuModClassic()
                     };
 
                 case ModType.Automation:

From abdd417eb6ace553d81a11c32b6bc723247557b8 Mon Sep 17 00:00:00 2001
From: vmaggioli <vinmags16@gmail.com>
Date: Wed, 3 Feb 2021 10:03:38 -0500
Subject: [PATCH 1281/3722] Remove slider changes

---
 .../TestSceneSliderSelectionBlueprint.cs      | 19 -------------------
 .../Sliders/SliderSelectionBlueprint.cs       |  6 +-----
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
index 4edf778bfd..f6e1be693b 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
@@ -161,18 +161,6 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             checkControlPointSelected(1, false);
         }
 
-        [Test]
-        public void TestZeroLengthSliderNotAllowed()
-        {
-            moveMouseToControlPoint(1);
-            dragMouseToControlPoint(0);
-
-            moveMouseToControlPoint(2);
-            dragMouseToControlPoint(0);
-
-            AddAssert("slider has non-zero duration", () => slider.Duration > 0);
-        }
-
         private void moveHitObject()
         {
             AddStep("move hitobject", () =>
@@ -201,13 +189,6 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             });
         }
 
-        private void dragMouseToControlPoint(int index)
-        {
-            AddStep("hold down mouse button", () => InputManager.PressButton(MouseButton.Left));
-            moveMouseToControlPoint(index);
-            AddStep("release mouse button", () => InputManager.ReleaseButton(MouseButton.Left));
-        }
-
         private void checkControlPointSelected(int index, bool selected)
             => AddAssert($"control point {index} {(selected ? "selected" : "not selected")}", () => blueprint.ControlPointVisualiser.Pieces[index].IsSelected.Value == selected);
 
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 508783a499..3d3dff653a 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -226,11 +226,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
         private void updatePath()
         {
-            float expectedDistance = composer?.GetSnappedDistanceFromDistance(HitObject.StartTime, (float)HitObject.Path.CalculatedDistance) ?? (float)HitObject.Path.CalculatedDistance;
-            if (expectedDistance < 1)
-                return;
-
-            HitObject.Path.ExpectedDistance.Value = expectedDistance;
+            HitObject.Path.ExpectedDistance.Value = composer?.GetSnappedDistanceFromDistance(HitObject.StartTime, (float)HitObject.Path.CalculatedDistance) ?? (float)HitObject.Path.CalculatedDistance;
             editorBeatmap?.Update(HitObject);
         }
 

From db3f9e7cbee3ff3c719d80fc2943420b82a828a2 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 4 Feb 2021 02:20:18 +0300
Subject: [PATCH 1282/3722] Apply documentation suggestion

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

diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index 188cb9be7a..69c6ebd07c 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -67,10 +67,10 @@ namespace osu.Game.Online
         }
 
         /// <summary>
-        /// Verifies that the given databased model is in a correct state to be considered available.
+        /// Checks that a database model matches the one expected to be downloaded.
         /// </summary>
         /// <example>
-        /// In the case of multiplayer/playlists, this has to verify that the databased beatmap set with the selected beatmap matches what's online.
+        /// In the case of multiplayer/playlists, this has to check that the databased beatmap set with the selected beatmap matches what's online.
         /// </example>
         /// <param name="databasedModel">The model in database.</param>
         protected virtual bool VerifyDatabasedModel([NotNull] TModel databasedModel) => true;

From 76cfeae7e9cf844996ac9c53a54a1756034d1562 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 15:10:56 +0900
Subject: [PATCH 1283/3722] Add support for Bindable int in config

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

diff --git a/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs b/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
index fc6b82a16b..99e87677fa 100644
--- a/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
+++ b/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
@@ -29,6 +29,10 @@ namespace osu.Game.Online.API
                         primitiveFormatter.Serialize(ref writer, d.Value, options);
                         break;
 
+                    case Bindable<int> i:
+                        primitiveFormatter.Serialize(ref writer, i.Value, options);
+                        break;
+
                     case Bindable<float> f:
                         primitiveFormatter.Serialize(ref writer, f.Value, options);
                         break;

From d165344070434f8e47af0d92c206b7a7fe9ee9ae Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 15:19:57 +0900
Subject: [PATCH 1284/3722] Force newer version of MessagePack for fixed iOS
 compatibility

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

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index eabd5c7d12..f866b232d8 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -20,6 +20,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="DiffPlex" Version="1.6.3" />
     <PackageReference Include="Humanizer" Version="2.8.26" />
+    <PackageReference Include="MessagePack" Version="2.2.85" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="5.0.2" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.2" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="5.0.2" />

From 30dae5bf1c1188139fb683e235b15b16af5e83ec Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 4 Feb 2021 15:17:47 +0900
Subject: [PATCH 1285/3722] Add test to make sure the algorithm is passed down
 in time

---
 .../Mods/TestSceneManiaModConstantSpeed.cs    | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModConstantSpeed.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModConstantSpeed.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModConstantSpeed.cs
new file mode 100644
index 0000000000..60363aaeef
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModConstantSpeed.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 System.Linq;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Testing;
+using osu.Game.Rulesets.Mania.Mods;
+using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Rulesets.UI.Scrolling.Algorithms;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Mania.Tests.Mods
+{
+    public class TestSceneManiaModConstantSpeed : ModTestScene
+    {
+        protected override Ruleset CreatePlayerRuleset() => new ManiaRuleset();
+
+        [Test]
+        public void TestConstantScroll() => CreateModTest(new ModTestData
+        {
+            Mod = new ManiaModConstantSpeed(),
+            PassCondition = () =>
+            {
+                var hitObject = Player.ChildrenOfType<DrawableManiaHitObject>().FirstOrDefault();
+                return hitObject?.Dependencies.Get<IScrollingInfo>().Algorithm is ConstantScrollAlgorithm;
+            }
+        });
+    }
+}

From a36b426b243e42062b93782ad5204dd35bd5ad88 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 15:46:50 +0900
Subject: [PATCH 1286/3722] Force iOS back to previous versions of messagepack

---
 osu.iOS.props | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.iOS.props b/osu.iOS.props
index dc3527c687..22d104f2e1 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -80,6 +80,9 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.0.3" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.0.3" />
+    <PackageReference Include="MessagePack" Version="1.7.3.7" />
+    <PackageReference Include="MessagePack.Annotations" Version="2.2.85" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">

From b2f1e133f86d3cf26d9581cdb45c0beecbe2ab5f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 16:53:55 +0900
Subject: [PATCH 1287/3722] Allow checkbox nub to be moved to the left

---
 .../Graphics/UserInterface/OsuCheckbox.cs     | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
index 517f83daa9..313962d9c6 100644
--- a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Graphics.UserInterface
         private SampleChannel sampleChecked;
         private SampleChannel sampleUnchecked;
 
-        public OsuCheckbox()
+        public OsuCheckbox(bool nubOnRight = true)
         {
             AutoSizeAxes = Axes.Y;
             RelativeSizeAxes = Axes.X;
@@ -61,17 +61,24 @@ namespace osu.Game.Graphics.UserInterface
                 {
                     AutoSizeAxes = Axes.Y,
                     RelativeSizeAxes = Axes.X,
-                    Padding = new MarginPadding { Right = Nub.EXPANDED_SIZE + nub_padding }
-                },
-                Nub = new Nub
-                {
-                    Anchor = Anchor.CentreRight,
-                    Origin = Anchor.CentreRight,
-                    Margin = new MarginPadding { Right = nub_padding },
                 },
+                Nub = new Nub(),
                 new HoverClickSounds()
             };
 
+            if (nubOnRight)
+            {
+                Nub.Anchor = Anchor.CentreRight;
+                Nub.Origin = Anchor.CentreRight;
+                Nub.Margin = new MarginPadding { Right = nub_padding };
+                labelText.Padding = new MarginPadding { Right = Nub.EXPANDED_SIZE + nub_padding };
+            }
+            else
+            {
+                Nub.Margin = new MarginPadding { Left = nub_padding };
+                labelText.Padding = new MarginPadding { Left = Nub.EXPANDED_SIZE + nub_padding };
+            }
+
             Nub.Current.BindTo(Current);
 
             Current.DisabledChanged += disabled => labelText.Alpha = Nub.Alpha = disabled ? 0.3f : 1;

From 3148bbda2a09c00f38aec261bcb4b78559c9412e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 16:54:17 +0900
Subject: [PATCH 1288/3722] Allow custom font to be used in OsuCheckbox

---
 osu.Game/Graphics/UserInterface/OsuCheckbox.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
index 313962d9c6..61a42dac23 100644
--- a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
@@ -5,6 +5,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics.Containers;
@@ -57,7 +58,7 @@ namespace osu.Game.Graphics.UserInterface
 
             Children = new Drawable[]
             {
-                labelText = new OsuTextFlowContainer
+                labelText = new OsuTextFlowContainer(ApplyLabelParameters)
                 {
                     AutoSizeAxes = Axes.Y,
                     RelativeSizeAxes = Axes.X,
@@ -84,6 +85,13 @@ namespace osu.Game.Graphics.UserInterface
             Current.DisabledChanged += disabled => labelText.Alpha = Nub.Alpha = disabled ? 0.3f : 1;
         }
 
+        /// <summary>
+        /// A function which can be overridden to change the parameters of the label's text.
+        /// </summary>
+        protected virtual void ApplyLabelParameters(SpriteText text)
+        {
+        }
+
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {

From 48a58e790e2d2ec640d3273ee78e222ff6aed07e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 16:57:39 +0900
Subject: [PATCH 1289/3722] Don't specify arbitrary width

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

diff --git a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
index 5b9a19897f..c60afeb2aa 100644
--- a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Screens.OnlinePlay
             protected override Drawable CreateHeader(string text) => new Container
             {
                 AutoSizeAxes = Axes.Y,
-                Width = 175,
+                RelativeSizeAxes = Axes.X,
                 Child = checkbox = new HeaderCheckbox
                 {
                     LabelText = text,

From b32e10514d1f8f48d7e580947176a56faa497d5b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 16:58:02 +0900
Subject: [PATCH 1290/3722] Fix padding on label text not being double-applied
 (meaning no padding between nub and text)

---
 osu.Game/Graphics/UserInterface/OsuCheckbox.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
index 61a42dac23..b80941c0bc 100644
--- a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
@@ -72,12 +72,12 @@ namespace osu.Game.Graphics.UserInterface
                 Nub.Anchor = Anchor.CentreRight;
                 Nub.Origin = Anchor.CentreRight;
                 Nub.Margin = new MarginPadding { Right = nub_padding };
-                labelText.Padding = new MarginPadding { Right = Nub.EXPANDED_SIZE + nub_padding };
+                labelText.Padding = new MarginPadding { Right = Nub.EXPANDED_SIZE + nub_padding * 2 };
             }
             else
             {
                 Nub.Margin = new MarginPadding { Left = nub_padding };
-                labelText.Padding = new MarginPadding { Left = Nub.EXPANDED_SIZE + nub_padding };
+                labelText.Padding = new MarginPadding { Left = Nub.EXPANDED_SIZE + nub_padding * 2 };
             }
 
             Nub.Current.BindTo(Current);

From daf7ab942274a71298ff4caf3505cee52381aed0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 16:58:15 +0900
Subject: [PATCH 1291/3722] Apply the expected font to the checkbox's label

---
 .../Screens/OnlinePlay/FreeModSelectOverlay.cs   | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
index c60afeb2aa..180f6079ac 100644
--- a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
@@ -3,8 +3,11 @@
 
 using System;
 using System.Linq;
+using System.Reflection.Emit;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.Mods;
 using osu.Game.Rulesets.Mods;
@@ -120,6 +123,19 @@ namespace osu.Game.Screens.OnlinePlay
 
             protected override bool PlaySoundsOnUserChange => false;
 
+            public HeaderCheckbox()
+                : base(false)
+
+            {
+            }
+
+            protected override void ApplyLabelParameters(SpriteText text)
+            {
+                base.ApplyLabelParameters(text);
+
+                text.Font = OsuFont.GetFont(weight: FontWeight.Bold);
+            }
+
             protected override void OnUserChange(bool value)
             {
                 base.OnUserChange(value);

From 4bfe3aabdc6c165e2bd368b9a70ab45ec4cc39b3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 17:06:11 +0900
Subject: [PATCH 1292/3722] Simplify sound debounce logic

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index c308dc2451..97902d1c15 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -496,17 +496,12 @@ namespace osu.Game.Overlays.Mods
                 MultiplierLabel.FadeColour(Color4.White, 200);
         }
 
-        private ScheduledDelegate sampleOnDelegate;
-        private ScheduledDelegate sampleOffDelegate;
-
         private void modButtonPressed(Mod selectedMod)
         {
             if (selectedMod != null)
             {
-                // Fixes buzzing when multiple mods are selected in the same frame.
-                sampleOnDelegate?.Cancel();
                 if (State.Value == Visibility.Visible)
-                    sampleOnDelegate = Scheduler.Add(() => sampleOn?.Play());
+                    Scheduler.AddOnce(playSelectedSound);
 
                 OnModSelected(selectedMod);
 
@@ -514,15 +509,16 @@ namespace osu.Game.Overlays.Mods
             }
             else
             {
-                // Fixes buzzing when multiple mods are deselected in the same frame.
-                sampleOffDelegate?.Cancel();
                 if (State.Value == Visibility.Visible)
-                    sampleOffDelegate = Scheduler.Add(() => sampleOff?.Play());
+                    Scheduler.AddOnce(playDeselectedSound);
             }
 
             refreshSelectedMods();
         }
 
+        private void playSelectedSound() => sampleOn?.Play();
+        private void playDeselectedSound() => sampleOff?.Play();
+
         /// <summary>
         /// Invoked when a new <see cref="Mod"/> has been selected.
         /// </summary>

From f23ca7c7cfd7bbd752e50464189c2c84546beba2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 18:10:55 +0900
Subject: [PATCH 1293/3722] Centralise selection animation logic

---
 osu.Game/Overlays/Mods/ModSection.cs          | 51 +++++++++++++------
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    |  1 -
 .../Overlays/Mods/SoloModSelectOverlay.cs     |  2 +-
 .../OnlinePlay/FreeModSelectOverlay.cs        | 25 +++++----
 4 files changed, 48 insertions(+), 31 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 87a45ebf63..495b1c05cd 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -33,6 +33,8 @@ namespace osu.Game.Overlays.Mods
 
         private CancellationTokenSource modsLoadCts;
 
+        protected bool SelectionAnimationRunning => pendingSelectionOperations.Count > 0;
+
         /// <summary>
         /// True when all mod icons have completed loading.
         /// </summary>
@@ -49,7 +51,11 @@ namespace osu.Game.Overlays.Mods
 
                     return new ModButton(m)
                     {
-                        SelectionChanged = Action,
+                        SelectionChanged = mod =>
+                        {
+                            ModButtonStateChanged(mod);
+                            Action?.Invoke(mod);
+                        },
                     };
                 }).ToArray();
 
@@ -78,6 +84,10 @@ namespace osu.Game.Overlays.Mods
             }
         }
 
+        protected virtual void ModButtonStateChanged(Mod mod)
+        {
+        }
+
         private ModButton[] buttons = Array.Empty<ModButton>();
 
         protected override bool OnKeyDown(KeyDownEvent e)
@@ -94,44 +104,53 @@ namespace osu.Game.Overlays.Mods
             return base.OnKeyDown(e);
         }
 
+        private const double initial_multiple_selection_delay = 100;
+
+        private readonly Queue<Action> pendingSelectionOperations = new Queue<Action>();
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Scheduler.AddDelayed(() =>
+            {
+                if (pendingSelectionOperations.TryDequeue(out var dequeuedAction))
+                    dequeuedAction();
+            }, initial_multiple_selection_delay, true);
+        }
+
         /// <summary>
         /// Selects all mods.
         /// </summary>
         public void SelectAll()
         {
+            pendingSelectionOperations.Clear();
+
             foreach (var button in buttons.Where(b => !b.Selected))
-                button.SelectAt(0);
+                pendingSelectionOperations.Enqueue(() => button.SelectAt(0));
         }
 
         /// <summary>
         /// Deselects all mods.
         /// </summary>
-        /// <param name="immediate">Set to true to bypass animations and update selections immediately.</param>
-        public void DeselectAll(bool immediate = false) => DeselectTypes(buttons.Select(b => b.SelectedMod?.GetType()).Where(t => t != null), immediate);
+        public void DeselectAll() => DeselectTypes(buttons.Select(b => b.SelectedMod?.GetType()).Where(t => t != null));
 
         /// <summary>
         /// Deselect one or more mods in this section.
         /// </summary>
         /// <param name="modTypes">The types of <see cref="Mod"/>s which should be deselected.</param>
-        /// <param name="immediate">Set to true to bypass animations and update selections immediately.</param>
-        public void DeselectTypes(IEnumerable<Type> modTypes, bool immediate = false)
+        public void DeselectTypes(IEnumerable<Type> modTypes)
         {
-            int delay = 0;
+            pendingSelectionOperations.Clear();
 
             foreach (var button in buttons)
             {
-                Mod selected = button.SelectedMod;
-                if (selected == null) continue;
+                if (button.SelectedMod == null) continue;
 
                 foreach (var type in modTypes)
                 {
-                    if (type.IsInstanceOfType(selected))
-                    {
-                        if (immediate)
-                            button.Deselect();
-                        else
-                            Scheduler.AddDelayed(button.Deselect, delay += 50);
-                    }
+                    if (type.IsInstanceOfType(button.SelectedMod))
+                        pendingSelectionOperations.Enqueue(button.Deselect);
                 }
             }
         }
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 97902d1c15..4f65a39ed3 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -14,7 +14,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
-using osu.Framework.Threading;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
 using osu.Game.Graphics.Containers;
diff --git a/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs b/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
index d039ad1f98..aa0e78c126 100644
--- a/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Overlays.Mods
             base.OnModSelected(mod);
 
             foreach (var section in ModSectionsContainer.Children)
-                section.DeselectTypes(mod.IncompatibleMods, true);
+                section.DeselectTypes(mod.IncompatibleMods);
         }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
index 180f6079ac..7bc226bb3f 100644
--- a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Linq;
-using System.Reflection.Emit;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
@@ -72,7 +71,7 @@ namespace osu.Game.Screens.OnlinePlay
         private void deselectAll()
         {
             foreach (var section in ModSectionsContainer.Children)
-                section.DeselectAll(true);
+                section.DeselectAll();
         }
 
         protected override ModSection CreateModSection(ModType type) => new FreeModSection(type);
@@ -99,21 +98,21 @@ namespace osu.Game.Screens.OnlinePlay
 
             private void onCheckboxChanged(bool value)
             {
-                foreach (var button in ButtonsContainer.OfType<ModButton>())
-                {
-                    if (value)
-                        button.SelectAt(0);
-                    else
-                        button.Deselect();
-                }
+                if (value)
+                    SelectAll();
+                else
+                    DeselectAll();
             }
 
-            protected override void Update()
+            protected override void ModButtonStateChanged(Mod mod)
             {
-                base.Update();
+                base.ModButtonStateChanged(mod);
 
-                var validButtons = ButtonsContainer.OfType<ModButton>().Where(b => b.Mod.HasImplementation);
-                checkbox.Current.Value = validButtons.All(b => b.Selected);
+                if (!SelectionAnimationRunning)
+                {
+                    var validButtons = ButtonsContainer.OfType<ModButton>().Where(b => b.Mod.HasImplementation);
+                    checkbox.Current.Value = validButtons.All(b => b.Selected);
+                }
             }
         }
 

From 223b858227ed2a0d2aa3af284acbe581dbab84be Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 18:56:40 +0900
Subject: [PATCH 1294/3722] Ramp the animation speed

---
 osu.Game/Overlays/Mods/ModSection.cs | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 495b1c05cd..b9640a6026 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -104,19 +104,31 @@ namespace osu.Game.Overlays.Mods
             return base.OnKeyDown(e);
         }
 
-        private const double initial_multiple_selection_delay = 100;
+        private const double initial_multiple_selection_delay = 120;
+
+        private double selectionDelay = initial_multiple_selection_delay;
+        private double lastSelection;
 
         private readonly Queue<Action> pendingSelectionOperations = new Queue<Action>();
 
-        protected override void LoadComplete()
+        protected override void Update()
         {
-            base.LoadComplete();
+            base.Update();
 
-            Scheduler.AddDelayed(() =>
+            if (selectionDelay == initial_multiple_selection_delay || Time.Current - lastSelection >= selectionDelay)
             {
                 if (pendingSelectionOperations.TryDequeue(out var dequeuedAction))
+                {
                     dequeuedAction();
-            }, initial_multiple_selection_delay, true);
+
+                    selectionDelay = Math.Max(30, selectionDelay * 0.8f);
+                    lastSelection = Time.Current;
+                }
+                else
+                {
+                    selectionDelay = initial_multiple_selection_delay;
+                }
+            }
         }
 
         /// <summary>

From a2674f3c3ff5a99d81127aae980c0ed05614fc47 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 18:58:56 +0900
Subject: [PATCH 1295/3722] Add comments

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

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index b9640a6026..353f779b4f 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -121,11 +121,14 @@ 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);
                     lastSelection = Time.Current;
                 }
                 else
                 {
+                    // reset the selection delay after all animations have been completed.
+                    // this will cause the next action to be immediately performed.
                     selectionDelay = initial_multiple_selection_delay;
                 }
             }

From bf239f8bef321dbb90e61ebe8e453a13a22f11c8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 19:12:37 +0900
Subject: [PATCH 1296/3722] Flush animation on closing mod overlay

---
 osu.Game/Overlays/Mods/ModSection.cs       | 9 +++++++++
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 5 +++++
 2 files changed, 14 insertions(+)

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 353f779b4f..440abfb1c0 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -231,5 +231,14 @@ namespace osu.Game.Overlays.Mods
             Font = OsuFont.GetFont(weight: FontWeight.Bold),
             Text = text
         };
+
+        /// <summary>
+        /// Play out all remaining animations immediately to leave mods in a good (final) state.
+        /// </summary>
+        public void FlushAnimation()
+        {
+            while (pendingSelectionOperations.TryDequeue(out var dequeuedAction))
+                dequeuedAction();
+        }
     }
 }
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 4f65a39ed3..93fe693937 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -379,6 +379,11 @@ namespace osu.Game.Overlays.Mods
         {
             base.PopOut();
 
+            foreach (var section in ModSectionsContainer)
+            {
+                section.FlushAnimation();
+            }
+
             FooterContainer.MoveToX(content_width, WaveContainer.DISAPPEAR_DURATION, Easing.InSine);
             FooterContainer.FadeOut(WaveContainer.DISAPPEAR_DURATION, Easing.InSine);
 

From 15062cc63f71ae8ae64b9a5343da7585a5bb5fa0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 19:29:48 +0900
Subject: [PATCH 1297/3722] Fix intermittent test failures

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

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 92104cfc72..7f4dfaa9b0 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -145,11 +145,11 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("double time visible", () => modSelect.ChildrenOfType<ModButton>().Any(b => b.Mods.Any(m => m is OsuModDoubleTime)));
 
             AddStep("make double time invalid", () => modSelect.IsValidMod = m => !(m is OsuModDoubleTime));
-            AddAssert("double time not visible", () => modSelect.ChildrenOfType<ModButton>().All(b => !b.Mods.Any(m => m is OsuModDoubleTime)));
+            AddUntilStep("double time not visible", () => modSelect.ChildrenOfType<ModButton>().All(b => !b.Mods.Any(m => m is OsuModDoubleTime)));
             AddAssert("nightcore still visible", () => modSelect.ChildrenOfType<ModButton>().Any(b => b.Mods.Any(m => m is OsuModNightcore)));
 
             AddStep("make double time valid again", () => modSelect.IsValidMod = m => true);
-            AddAssert("double time visible", () => modSelect.ChildrenOfType<ModButton>().Any(b => b.Mods.Any(m => m is OsuModDoubleTime)));
+            AddUntilStep("double time visible", () => modSelect.ChildrenOfType<ModButton>().Any(b => b.Mods.Any(m => m is OsuModDoubleTime)));
             AddAssert("nightcore still visible", () => modSelect.ChildrenOfType<ModButton>().Any(b => b.Mods.Any(m => m is OsuModNightcore)));
         }
 

From 8f2f1a444f25058760583545c3390ce0562b3e5d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 19:55:09 +0900
Subject: [PATCH 1298/3722] Avoid resetting selection on deselecting
 incompatibile types

---
 osu.Game/Overlays/Mods/ModSection.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 440abfb1c0..3f93eec7df 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -148,7 +148,11 @@ namespace osu.Game.Overlays.Mods
         /// <summary>
         /// Deselects all mods.
         /// </summary>
-        public void DeselectAll() => DeselectTypes(buttons.Select(b => b.SelectedMod?.GetType()).Where(t => t != null));
+        public void DeselectAll()
+        {
+            pendingSelectionOperations.Clear();
+            DeselectTypes(buttons.Select(b => b.SelectedMod?.GetType()).Where(t => t != null));
+        }
 
         /// <summary>
         /// Deselect one or more mods in this section.
@@ -156,8 +160,6 @@ namespace osu.Game.Overlays.Mods
         /// <param name="modTypes">The types of <see cref="Mod"/>s which should be deselected.</param>
         public void DeselectTypes(IEnumerable<Type> modTypes)
         {
-            pendingSelectionOperations.Clear();
-
             foreach (var button in buttons)
             {
                 if (button.SelectedMod == null) continue;

From cef16a9f61e6a9550f80b81f5c3cf6a2603c45e9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 19:55:15 +0900
Subject: [PATCH 1299/3722] Add test coverage of animation / selection flushing

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

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 7f4dfaa9b0..44605f4994 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -8,6 +8,7 @@ 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.Sprites;
 using osu.Game.Graphics.UserInterface;
@@ -46,6 +47,32 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("show", () => modSelect.Show());
         }
 
+        [Test]
+        public void TestAnimationFlushOnClose()
+        {
+            changeRuleset(0);
+
+            AddStep("Select all fun mods", () =>
+            {
+                modSelect.ModSectionsContainer
+                         .Single(c => c.ModType == ModType.DifficultyIncrease)
+                         .SelectAll();
+            });
+
+            AddUntilStep("many mods selected", () => modDisplay.Current.Value.Count >= 5);
+
+            AddStep("trigger deselect and close overlay", () =>
+            {
+                modSelect.ModSectionsContainer
+                         .Single(c => c.ModType == ModType.DifficultyIncrease)
+                         .DeselectAll();
+
+                modSelect.Hide();
+            });
+
+            AddAssert("all mods deselected", () => modDisplay.Current.Value.Count == 0);
+        }
+
         [Test]
         public void TestOsuMods()
         {
@@ -312,6 +339,9 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             public bool AllLoaded => ModSectionsContainer.Children.All(c => c.ModIconsLoaded);
 
+            public new FillFlowContainer<ModSection> ModSectionsContainer =>
+                base.ModSectionsContainer;
+
             public ModButton GetModButton(Mod mod)
             {
                 var section = ModSectionsContainer.Children.Single(s => s.ModType == mod.Type);

From f86f3236254019b99ae64e37b3628159c6758c94 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 22:28:17 +0900
Subject: [PATCH 1300/3722] Add a basic guard against setting ScrollMethod too
 late in initialisation

---
 .../UI/DrawableManiaRuleset.cs                  | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 6b34dbfa09..4ee060e91e 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.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;
@@ -50,9 +51,21 @@ namespace osu.Game.Rulesets.Mania.UI
 
         protected new ManiaRulesetConfigManager Config => (ManiaRulesetConfigManager)base.Config;
 
-        public ScrollVisualisationMethod ScrollMethod = ScrollVisualisationMethod.Sequential;
+        public ScrollVisualisationMethod ScrollMethod
+        {
+            get => scrollMethod;
+            set
+            {
+                if (IsLoaded)
+                    throw new InvalidOperationException($"Can't alter {nameof(ScrollMethod)} after ruleset is already loaded");
 
-        protected override ScrollVisualisationMethod VisualisationMethod => ScrollMethod;
+                scrollMethod = value;
+            }
+        }
+
+        private ScrollVisualisationMethod scrollMethod = ScrollVisualisationMethod.Sequential;
+
+        protected override ScrollVisualisationMethod VisualisationMethod => scrollMethod;
 
         private readonly Bindable<ManiaScrollingDirection> configDirection = new Bindable<ManiaScrollingDirection>();
         private readonly Bindable<double> configTimeRange = new BindableDouble();

From 794f9e5e932294d8c77e9cdc5b0b995b8f8d9062 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 22:53:41 +0900
Subject: [PATCH 1301/3722] Add missing centre anchor/origin

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

diff --git a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
index b80941c0bc..f6effa0834 100644
--- a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
@@ -76,6 +76,8 @@ namespace osu.Game.Graphics.UserInterface
             }
             else
             {
+                Nub.Anchor = Anchor.CentreLeft;
+                Nub.Origin = Anchor.CentreLeft;
                 Nub.Margin = new MarginPadding { Left = nub_padding };
                 labelText.Padding = new MarginPadding { Left = Nub.EXPANDED_SIZE + nub_padding * 2 };
             }

From 0750c3cb6a3ae9f8bc614fe61f082e936ba4f705 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 23:44:46 +0900
Subject: [PATCH 1302/3722] Add back immediate deselection flow to ensure user
 selections can occur without contention

---
 osu.Game/Overlays/Mods/ModSection.cs           | 10 ++++++++--
 osu.Game/Overlays/Mods/SoloModSelectOverlay.cs |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 3f93eec7df..ecbcba7ad3 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -158,7 +158,8 @@ namespace osu.Game.Overlays.Mods
         /// Deselect one or more mods in this section.
         /// </summary>
         /// <param name="modTypes">The types of <see cref="Mod"/>s which should be deselected.</param>
-        public void DeselectTypes(IEnumerable<Type> modTypes)
+        /// <param name="immediate">Whether the deselection should happen immediately. Should only be used when required to ensure correct selection flow.</param>
+        public void DeselectTypes(IEnumerable<Type> modTypes, bool immediate = false)
         {
             foreach (var button in buttons)
             {
@@ -167,7 +168,12 @@ namespace osu.Game.Overlays.Mods
                 foreach (var type in modTypes)
                 {
                     if (type.IsInstanceOfType(button.SelectedMod))
-                        pendingSelectionOperations.Enqueue(button.Deselect);
+                    {
+                        if (immediate)
+                            button.Deselect();
+                        else
+                            pendingSelectionOperations.Enqueue(button.Deselect);
+                    }
                 }
             }
         }
diff --git a/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs b/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
index aa0e78c126..d039ad1f98 100644
--- a/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Overlays.Mods
             base.OnModSelected(mod);
 
             foreach (var section in ModSectionsContainer.Children)
-                section.DeselectTypes(mod.IncompatibleMods);
+                section.DeselectTypes(mod.IncompatibleMods, true);
         }
     }
 }

From 18e50815232534bc456429b064ae3e71bc320a01 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 00:42:38 +0900
Subject: [PATCH 1303/3722] Fix test failures

---
 .../Tests/Visual/Multiplayer/MultiplayerTestScene.cs     | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
index a87b22affe..d76f354774 100644
--- a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.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.Testing;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.OnlinePlay;
 using osu.Game.Screens.OnlinePlay.Lounge.Components;
@@ -50,5 +51,13 @@ namespace osu.Game.Tests.Visual.Multiplayer
             if (joinRoom)
                 RoomManager.Schedule(() => RoomManager.CreateRoom(Room));
         });
+
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
+
+            if (joinRoom)
+                AddUntilStep("wait for room join", () => Client.Room != null);
+        }
     }
 }

From dbea6d4ceed7504ff104683efcdf316d3c712d47 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 00:57:23 +0900
Subject: [PATCH 1304/3722] Remove unused using

---
 osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
index d76f354774..2e8c834c65 100644
--- a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
@@ -6,7 +6,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Testing;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.OnlinePlay;
 using osu.Game.Screens.OnlinePlay.Lounge.Components;

From 4e530d2eaf45fc3c1b890b1016d2a6cbcec8658b Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Wed, 3 Feb 2021 21:14:27 -0800
Subject: [PATCH 1305/3722] Remove old alpha hack from nub fill

---
 osu.Game/Graphics/UserInterface/Nub.cs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/Nub.cs b/osu.Game/Graphics/UserInterface/Nub.cs
index 82b09e0821..18d8b880ea 100644
--- a/osu.Game/Graphics/UserInterface/Nub.cs
+++ b/osu.Game/Graphics/UserInterface/Nub.cs
@@ -42,13 +42,7 @@ namespace osu.Game.Graphics.UserInterface
                 },
             };
 
-            Current.ValueChanged += filled =>
-            {
-                if (filled.NewValue)
-                    fill.FadeIn(200, Easing.OutQuint);
-                else
-                    fill.FadeTo(0.01f, 200, Easing.OutQuint); //todo: remove once we figure why containers aren't drawing at all times
-            };
+            Current.ValueChanged += filled => fill.FadeTo(filled.NewValue ? 1 : 0, 200, Easing.OutQuint);
         }
 
         [BackgroundDependencyLoader]

From 9ef130cdccd46535c40db44b01b16f9624b4e36f Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Thu, 4 Feb 2021 13:28:35 -0800
Subject: [PATCH 1306/3722] Fix codefactor style issues

---
 osu.Game.Rulesets.Catch/Skinning/Default/BorderPiece.cs      | 1 -
 osu.Game.Rulesets.Catch/Skinning/Default/HyperBorderPiece.cs | 1 -
 2 files changed, 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/Default/BorderPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/BorderPiece.cs
index 7308d6b499..8d8ee49af7 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Default/BorderPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Default/BorderPiece.cs
@@ -29,4 +29,3 @@ namespace osu.Game.Rulesets.Catch.Skinning.Default
         }
     }
 }
-
diff --git a/osu.Game.Rulesets.Catch/Skinning/Default/HyperBorderPiece.cs b/osu.Game.Rulesets.Catch/Skinning/Default/HyperBorderPiece.cs
index d160956a6e..c8895f32f4 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Default/HyperBorderPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Default/HyperBorderPiece.cs
@@ -19,4 +19,3 @@ namespace osu.Game.Rulesets.Catch.Skinning.Default
         }
     }
 }
-

From d62bbbb7627673b4dc03729639a54ad9b864079e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 5 Feb 2021 00:38:56 +0300
Subject: [PATCH 1307/3722] Enhance documentation

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
---
 osu.Game/Online/DownloadTrackingComposite.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index 69c6ebd07c..52042c266b 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Online
         /// Checks that a database model matches the one expected to be downloaded.
         /// </summary>
         /// <example>
-        /// In the case of multiplayer/playlists, this has to check that the databased beatmap set with the selected beatmap matches what's online.
+        /// For online play, this could be used to check that the databased model matches the online beatmap.
         /// </example>
         /// <param name="databasedModel">The model in database.</param>
         protected virtual bool VerifyDatabasedModel([NotNull] TModel databasedModel) => true;

From c0bd27fe832c0d05083107b0f488d7c979cce6d6 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Thu, 4 Feb 2021 13:55:15 -0800
Subject: [PATCH 1308/3722] Fix readme version badge not linking to correct
 page

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index efca075042..e09b4d86a5 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 # osu!
 
 [![Build status](https://ci.appveyor.com/api/projects/status/u2p01nx7l6og8buh?svg=true)](https://ci.appveyor.com/project/peppy/osu)
-[![GitHub release](https://img.shields.io/github/release/ppy/osu.svg)]()
+[![GitHub release](https://img.shields.io/github/release/ppy/osu.svg)](https://github.com/ppy/osu/releases/latest)
 [![CodeFactor](https://www.codefactor.io/repository/github/ppy/osu/badge)](https://www.codefactor.io/repository/github/ppy/osu)
 [![dev chat](https://discordapp.com/api/guilds/188630481301012481/widget.png?style=shield)](https://discord.gg/ppy)
 

From a2fdba3e5173441147761ace92894f54cc6f309f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 12:24:38 +0900
Subject: [PATCH 1309/3722] Rename to OnlinePlayBeatmapAvailabilityTracker

---
 ...s => TestSceneOnlinePlayBeatmapAvailabilityTracker.cs} | 8 ++++----
 ...racker.cs => OnlinePlayBeatmapAvailablilityTracker.cs} | 4 ++--
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs        | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename osu.Game.Tests/Online/{TestSceneMultiplayerBeatmapAvailabilityTracker.cs => TestSceneOnlinePlayBeatmapAvailabilityTracker.cs} (96%)
 rename osu.Game/Online/Rooms/{MultiplayerBeatmapAvailablilityTracker.cs => OnlinePlayBeatmapAvailablilityTracker.cs} (95%)

diff --git a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapAvailabilityTracker.cs b/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs
similarity index 96%
rename from osu.Game.Tests/Online/TestSceneMultiplayerBeatmapAvailabilityTracker.cs
rename to osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs
index 646c4139af..d3475de157 100644
--- a/osu.Game.Tests/Online/TestSceneMultiplayerBeatmapAvailabilityTracker.cs
+++ b/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs
@@ -28,7 +28,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Tests.Online
 {
     [HeadlessTest]
-    public class TestSceneMultiplayerBeatmapAvailabilityTracker : OsuTestScene
+    public class TestSceneOnlinePlayBeatmapAvailabilityTracker : OsuTestScene
     {
         private RulesetStore rulesets;
         private TestBeatmapManager beatmaps;
@@ -38,7 +38,7 @@ namespace osu.Game.Tests.Online
         private BeatmapSetInfo testBeatmapSet;
 
         private readonly Bindable<PlaylistItem> selectedItem = new Bindable<PlaylistItem>();
-        private MultiplayerBeatmapAvailablilityTracker availablilityTracker;
+        private OnlinePlayBeatmapAvailablilityTracker availablilityTracker;
 
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, GameHost host)
@@ -67,7 +67,7 @@ namespace osu.Game.Tests.Online
                 Ruleset = { Value = testBeatmapInfo.Ruleset },
             };
 
-            Child = availablilityTracker = new MultiplayerBeatmapAvailablilityTracker
+            Child = availablilityTracker = new OnlinePlayBeatmapAvailablilityTracker
             {
                 SelectedItem = { BindTarget = selectedItem, }
             };
@@ -118,7 +118,7 @@ namespace osu.Game.Tests.Online
             });
             addAvailabilityCheckStep("state still not downloaded", BeatmapAvailability.NotDownloaded);
 
-            AddStep("recreate tracker", () => Child = availablilityTracker = new MultiplayerBeatmapAvailablilityTracker
+            AddStep("recreate tracker", () => Child = availablilityTracker = new OnlinePlayBeatmapAvailablilityTracker
             {
                 SelectedItem = { BindTarget = selectedItem }
             });
diff --git a/osu.Game/Online/Rooms/MultiplayerBeatmapAvailablilityTracker.cs b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
similarity index 95%
rename from osu.Game/Online/Rooms/MultiplayerBeatmapAvailablilityTracker.cs
rename to osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
index 578c4db2f8..ad4b3c5151 100644
--- a/osu.Game/Online/Rooms/MultiplayerBeatmapAvailablilityTracker.cs
+++ b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Online.Rooms
     /// This differs from a regular download tracking composite as this accounts for the
     /// databased beatmap set's checksum, to disallow from playing with an altered version of the beatmap.
     /// </summary>
-    public class MultiplayerBeatmapAvailablilityTracker : DownloadTrackingComposite<BeatmapSetInfo, BeatmapManager>
+    public class OnlinePlayBeatmapAvailablilityTracker : DownloadTrackingComposite<BeatmapSetInfo, BeatmapManager>
     {
         public readonly IBindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
 
@@ -26,7 +26,7 @@ namespace osu.Game.Online.Rooms
 
         private readonly Bindable<BeatmapAvailability> availability = new Bindable<BeatmapAvailability>();
 
-        public MultiplayerBeatmapAvailablilityTracker()
+        public OnlinePlayBeatmapAvailablilityTracker()
         {
             State.BindValueChanged(_ => updateAvailability());
             Progress.BindValueChanged(_ => updateAvailability(), true);
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index cdf889e4f1..b1b3dde26e 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -41,11 +41,11 @@ namespace osu.Game.Screens.OnlinePlay.Match
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
 
         [Cached]
-        protected MultiplayerBeatmapAvailablilityTracker BeatmapAvailablilityTracker { get; }
+        protected OnlinePlayBeatmapAvailablilityTracker BeatmapAvailablilityTracker { get; }
 
         protected RoomSubScreen()
         {
-            BeatmapAvailablilityTracker = new MultiplayerBeatmapAvailablilityTracker
+            BeatmapAvailablilityTracker = new OnlinePlayBeatmapAvailablilityTracker
             {
                 SelectedItem = { BindTarget = SelectedItem },
             };

From 85e63afcb48288f7838409c5b14380507ea3443d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 12:36:25 +0900
Subject: [PATCH 1310/3722] Rename Mods -> RequiredMods

---
 osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs   | 6 +++---
 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
index d0e19d9f37..4fb9d724b5 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Online.Multiplayer
 
         [NotNull]
         [Key(4)]
-        public IEnumerable<APIMod> Mods { get; set; } = Enumerable.Empty<APIMod>();
+        public IEnumerable<APIMod> RequiredMods { get; set; } = Enumerable.Empty<APIMod>();
 
         [NotNull]
         [Key(5)]
@@ -39,14 +39,14 @@ namespace osu.Game.Online.Multiplayer
         public bool Equals(MultiplayerRoomSettings other)
             => BeatmapID == other.BeatmapID
                && BeatmapChecksum == other.BeatmapChecksum
-               && Mods.SequenceEqual(other.Mods)
+               && RequiredMods.SequenceEqual(other.RequiredMods)
                && AllowedMods.SequenceEqual(other.AllowedMods)
                && RulesetID == other.RulesetID
                && Name.Equals(other.Name, StringComparison.Ordinal);
 
         public override string ToString() => $"Name:{Name}"
                                              + $" Beatmap:{BeatmapID} ({BeatmapChecksum})"
-                                             + $" Mods:{string.Join(',', Mods)}"
+                                             + $" RequiredMods:{string.Join(',', RequiredMods)}"
                                              + $" AllowedMods:{string.Join(',', AllowedMods)}"
                                              + $" Ruleset:{RulesetID}";
     }
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 69df2a69cc..aedbe37d56 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -192,7 +192,7 @@ namespace osu.Game.Online.Multiplayer
                 BeatmapID = item.GetOr(existingPlaylistItem).BeatmapID,
                 BeatmapChecksum = item.GetOr(existingPlaylistItem).Beatmap.Value.MD5Hash,
                 RulesetID = item.GetOr(existingPlaylistItem).RulesetID,
-                Mods = item.HasValue ? item.Value.AsNonNull().RequiredMods.Select(m => new APIMod(m)).ToList() : Room.Settings.Mods,
+                RequiredMods = item.HasValue ? item.Value.AsNonNull().RequiredMods.Select(m => new APIMod(m)).ToList() : Room.Settings.RequiredMods,
                 AllowedMods = item.HasValue ? item.Value.AsNonNull().AllowedMods.Select(m => new APIMod(m)).ToList() : Room.Settings.AllowedMods
             });
         }
@@ -531,7 +531,7 @@ namespace osu.Game.Online.Multiplayer
             beatmap.MD5Hash = settings.BeatmapChecksum;
 
             var ruleset = rulesets.GetRuleset(settings.RulesetID).CreateInstance();
-            var mods = settings.Mods.Select(m => m.ToMod(ruleset));
+            var mods = settings.RequiredMods.Select(m => m.ToMod(ruleset));
             var allowedMods = settings.AllowedMods.Select(m => m.ToMod(ruleset));
 
             PlaylistItem playlistItem = new PlaylistItem

From 2e85ce5b824eeafe85f3b9b058b89601690314ea Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 12:40:16 +0900
Subject: [PATCH 1311/3722] Rename UserMods -> Mods for MultiplayerRoomUser

---
 osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs              | 2 +-
 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs        | 2 +-
 .../OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
index 3271133bcd..c654127b94 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomUser.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Online.Multiplayer
         /// </summary>
         [Key(3)]
         [NotNull]
-        public IEnumerable<APIMod> UserMods { get; set; } = Enumerable.Empty<APIMod>();
+        public IEnumerable<APIMod> Mods { get; set; } = Enumerable.Empty<APIMod>();
 
         [IgnoreMember]
         public User? User { get; set; }
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index aedbe37d56..f7c9193dfe 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -400,7 +400,7 @@ namespace osu.Game.Online.Multiplayer
                 if (user == null)
                     return;
 
-                user.UserMods = mods;
+                user.Mods = mods;
 
                 RoomUpdated?.Invoke();
             }, false);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index 8036e5f702..2983d1268d 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -165,7 +165,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
             var ruleset = rulesets.GetRuleset(Room.Settings.RulesetID).CreateInstance();
 
             userStateDisplay.Status = User.State;
-            userModsDisplay.Current.Value = User.UserMods.Select(m => m.ToMod(ruleset)).ToList();
+            userModsDisplay.Current.Value = User.Mods.Select(m => m.ToMod(ruleset)).ToList();
 
             if (Room.Host?.Equals(User) == true)
                 crown.FadeIn(fade_time);

From 8004c19a8037bb4faece8646d604b1cb3c13ba97 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 12:40:42 +0900
Subject: [PATCH 1312/3722] Remove ModValidationTest

---
 osu.Game.Tests/Mods/ModValidationTest.cs | 64 ------------------------
 1 file changed, 64 deletions(-)
 delete mode 100644 osu.Game.Tests/Mods/ModValidationTest.cs

diff --git a/osu.Game.Tests/Mods/ModValidationTest.cs b/osu.Game.Tests/Mods/ModValidationTest.cs
deleted file mode 100644
index 991adc221e..0000000000
--- a/osu.Game.Tests/Mods/ModValidationTest.cs
+++ /dev/null
@@ -1,64 +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 Moq;
-using NUnit.Framework;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Utils;
-
-namespace osu.Game.Tests.Mods
-{
-    [TestFixture]
-    public class ModValidationTest
-    {
-        [Test]
-        public void TestModIsCompatibleByItself()
-        {
-            var mod = new Mock<Mod>();
-            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod.Object }));
-        }
-
-        [Test]
-        public void TestIncompatibleThroughTopLevel()
-        {
-            var mod1 = new Mock<Mod>();
-            var mod2 = new Mock<Mod>();
-
-            mod1.Setup(m => m.IncompatibleMods).Returns(new[] { mod2.Object.GetType() });
-
-            // Test both orderings.
-            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod1.Object, mod2.Object }), Is.False);
-            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod2.Object, mod1.Object }), Is.False);
-        }
-
-        [Test]
-        public void TestIncompatibleThroughMultiMod()
-        {
-            var mod1 = new Mock<Mod>();
-
-            // The nested mod.
-            var mod2 = new Mock<Mod>();
-            mod2.Setup(m => m.IncompatibleMods).Returns(new[] { mod1.Object.GetType() });
-
-            var multiMod = new MultiMod(new MultiMod(mod2.Object));
-
-            // Test both orderings.
-            Assert.That(ModUtils.CheckCompatibleSet(new[] { multiMod, mod1.Object }), Is.False);
-            Assert.That(ModUtils.CheckCompatibleSet(new[] { mod1.Object, multiMod }), Is.False);
-        }
-
-        [Test]
-        public void TestAllowedThroughMostDerivedType()
-        {
-            var mod = new Mock<Mod>();
-            Assert.That(ModUtils.CheckAllowed(new[] { mod.Object }, new[] { mod.Object.GetType() }));
-        }
-
-        [Test]
-        public void TestNotAllowedThroughBaseType()
-        {
-            var mod = new Mock<Mod>();
-            Assert.That(ModUtils.CheckAllowed(new[] { mod.Object }, new[] { typeof(Mod) }), Is.False);
-        }
-    }
-}

From df2da5950f2f7b1fd233f75900e3979a362204e3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 13:05:11 +0900
Subject: [PATCH 1313/3722] Add back vertical spacer

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 4664ac6bfe..0466c8209f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -104,6 +104,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                                                 Child = new GridContainer
                                                 {
                                                     RelativeSizeAxes = Axes.Both,
+                                                    ColumnDimensions = new[]
+                                                    {
+                                                        new Dimension(GridSizeMode.Relative, size: 0.5f, maxSize: 400),
+                                                        new Dimension(),
+                                                        new Dimension(GridSizeMode.Relative, size: 0.5f, maxSize: 600),
+                                                    },
                                                     Content = new[]
                                                     {
                                                         new Drawable[]
@@ -128,6 +134,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                                                                     }
                                                                 }
                                                             },
+                                                            // Spacer
+                                                            null,
                                                             // Main right column
                                                             new FillFlowContainer
                                                             {

From c5fa818630c25ee7b3912de0d1bfeca9194bc7a3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 Feb 2021 14:08:11 +0900
Subject: [PATCH 1314/3722] Actually handle case of failing to achieve lock on
 SemaphoreSlim

---
 osu.Game/Online/Multiplayer/MultiplayerClient.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 9067c9a738..36cdf3bc8f 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -67,7 +67,8 @@ namespace osu.Game.Online.Multiplayer
         {
             cancelExistingConnect();
 
-            await connectionLock.WaitAsync(10000);
+            if (!await connectionLock.WaitAsync(10000))
+                throw new TimeoutException("Could not obtain a lock to connect. A previous attempt is likely stuck.");
 
             var builder = new HubConnectionBuilder()
                 .WithUrl(endpoint, options => { options.Headers.Add("Authorization", $"Bearer {api.AccessToken}"); });
@@ -199,7 +200,10 @@ namespace osu.Game.Online.Multiplayer
             cancelExistingConnect();
 
             if (takeLock)
-                await connectionLock.WaitAsync(10000);
+            {
+                if (!await connectionLock.WaitAsync(10000))
+                    throw new TimeoutException("Could not obtain a lock to disconnect. A previous attempt is likely stuck.");
+            }
 
             try
             {

From fc37d8b7df27a398f0343fcefbb6f15ce3b9450f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 Feb 2021 14:25:19 +0900
Subject: [PATCH 1315/3722] Refactor content redirection logic to be easier to
 parse

---
 .../Screens/OnlinePlay/Match/RoomSubScreen.cs     | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 19b68ee6d6..722b167387 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -45,18 +45,21 @@ namespace osu.Game.Screens.OnlinePlay.Match
         [Cached]
         protected OnlinePlayBeatmapAvailablilityTracker BeatmapAvailablilityTracker { get; }
 
-        private readonly Container content = new Container { RelativeSizeAxes = Axes.Both };
+        private readonly Container content;
 
         protected RoomSubScreen()
         {
-            BeatmapAvailablilityTracker = new OnlinePlayBeatmapAvailablilityTracker
+            InternalChildren = new Drawable[]
             {
-                SelectedItem = { BindTarget = SelectedItem }
+                BeatmapAvailablilityTracker = new OnlinePlayBeatmapAvailablilityTracker
+                {
+                    SelectedItem = { BindTarget = SelectedItem }
+                },
+                content = new Container { RelativeSizeAxes = Axes.Both },
             };
-
-            base.AddInternal(content);
         }
 
+        // Forward all internal management to content to ensure locally added components are not removed unintentionally.
         // This is a bit ugly but we don't have the concept of InternalContent so it'll have to do for now. (https://github.com/ppy/osu-framework/issues/1690)
         protected override void AddInternal(Drawable drawable) => content.Add(drawable);
         protected override bool RemoveInternal(Drawable drawable) => content.Remove(drawable);
@@ -65,8 +68,6 @@ namespace osu.Game.Screens.OnlinePlay.Match
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
-            base.AddInternal(BeatmapAvailablilityTracker);
-
             sampleStart = audio.Samples.Get(@"SongSelect/confirm-selection");
         }
 

From de8724b1f6b7d714260589dab5f5619afea0ca6f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 Feb 2021 14:39:25 +0900
Subject: [PATCH 1316/3722] Use AddRangeInternal for simplicity, but disallow
 ClearInternal for safety

---
 .../Screens/OnlinePlay/Match/RoomSubScreen.cs | 21 +++++--------------
 .../Multiplayer/MultiplayerMatchSubScreen.cs  |  4 ++--
 .../Playlists/PlaylistsRoomSubScreen.cs       |  4 ++--
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 722b167387..8be0e89665 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -7,8 +7,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
@@ -45,25 +43,16 @@ namespace osu.Game.Screens.OnlinePlay.Match
         [Cached]
         protected OnlinePlayBeatmapAvailablilityTracker BeatmapAvailablilityTracker { get; }
 
-        private readonly Container content;
-
         protected RoomSubScreen()
         {
-            InternalChildren = new Drawable[]
+            AddInternal(BeatmapAvailablilityTracker = new OnlinePlayBeatmapAvailablilityTracker
             {
-                BeatmapAvailablilityTracker = new OnlinePlayBeatmapAvailablilityTracker
-                {
-                    SelectedItem = { BindTarget = SelectedItem }
-                },
-                content = new Container { RelativeSizeAxes = Axes.Both },
-            };
+                SelectedItem = { BindTarget = SelectedItem }
+            });
         }
 
-        // Forward all internal management to content to ensure locally added components are not removed unintentionally.
-        // This is a bit ugly but we don't have the concept of InternalContent so it'll have to do for now. (https://github.com/ppy/osu-framework/issues/1690)
-        protected override void AddInternal(Drawable drawable) => content.Add(drawable);
-        protected override bool RemoveInternal(Drawable drawable) => content.Remove(drawable);
-        protected override void ClearInternal(bool disposeChildren = true) => content.Clear(disposeChildren);
+        protected override void ClearInternal(bool disposeChildren = true) =>
+            throw new InvalidOperationException($"{nameof(RoomSubScreen)}'s children should not be cleared as it will remove required components");
 
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 8cc2e9061b..e1524067da 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         [BackgroundDependencyLoader]
         private void load()
         {
-            InternalChildren = new Drawable[]
+            AddRangeInternal(new Drawable[]
             {
                 mainContent = new GridContainer
                 {
@@ -177,7 +177,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                     RelativeSizeAxes = Axes.Both,
                     State = { Value = client.Room == null ? Visibility.Visible : Visibility.Hidden }
                 }
-            };
+            });
 
             if (client.Room == null)
             {
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
index 745e5a58bf..0b8026044b 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         [BackgroundDependencyLoader]
         private void load()
         {
-            InternalChildren = new Drawable[]
+            AddRangeInternal(new Drawable[]
             {
                 mainContent = new GridContainer
                 {
@@ -190,7 +190,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                     EditPlaylist = () => this.Push(new MatchSongSelect()),
                     State = { Value = roomId.Value == null ? Visibility.Visible : Visibility.Hidden }
                 }
-            };
+            });
 
             if (roomId.Value == null)
             {

From 730e66f0ee00aec2b6c9f2a2f03ca56ec152a136 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 5 Feb 2021 09:07:59 +0300
Subject: [PATCH 1317/3722] Make pausing on window focus lose instant

---
 .../Screens/Play/HUD/HoldForMenuButton.cs     | 40 -------------------
 osu.Game/Screens/Play/Player.cs               | 21 +++++++---
 2 files changed, 16 insertions(+), 45 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs b/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs
index 387c0e587b..284ac899ed 100644
--- a/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs
+++ b/osu.Game/Screens/Play/HUD/HoldForMenuButton.cs
@@ -88,11 +88,6 @@ namespace osu.Game.Screens.Play.HUD
             return base.OnMouseMove(e);
         }
 
-        public bool PauseOnFocusLost
-        {
-            set => button.PauseOnFocusLost = value;
-        }
-
         protected override void Update()
         {
             base.Update();
@@ -120,8 +115,6 @@ namespace osu.Game.Screens.Play.HUD
             public Action HoverGained;
             public Action HoverLost;
 
-            private readonly IBindable<bool> gameActive = new Bindable<bool>(true);
-
             [BackgroundDependencyLoader]
             private void load(OsuColour colours, Framework.Game game)
             {
@@ -164,14 +157,6 @@ namespace osu.Game.Screens.Play.HUD
                 };
 
                 bind();
-
-                gameActive.BindTo(game.IsActive);
-            }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-                gameActive.BindValueChanged(_ => updateActive(), true);
             }
 
             private void bind()
@@ -221,31 +206,6 @@ namespace osu.Game.Screens.Play.HUD
                 base.OnHoverLost(e);
             }
 
-            private bool pauseOnFocusLost = true;
-
-            public bool PauseOnFocusLost
-            {
-                set
-                {
-                    if (pauseOnFocusLost == value)
-                        return;
-
-                    pauseOnFocusLost = value;
-                    if (IsLoaded)
-                        updateActive();
-                }
-            }
-
-            private void updateActive()
-            {
-                if (!pauseOnFocusLost || IsPaused.Value) return;
-
-                if (gameActive.Value)
-                    AbortConfirm();
-                else
-                    BeginConfirm();
-            }
-
             public bool OnPressed(GlobalAction action)
             {
                 switch (action)
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index b622f11775..556964bca4 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -59,6 +59,8 @@ namespace osu.Game.Screens.Play
         // We are managing our own adjustments (see OnEntering/OnExiting).
         public override bool AllowRateAdjustments => false;
 
+        private readonly IBindable<bool> gameActive = new Bindable<bool>(true);
+
         private readonly Bindable<bool> samplePlaybackDisabled = new Bindable<bool>();
 
         /// <summary>
@@ -154,6 +156,9 @@ namespace osu.Game.Screens.Play
             // replays should never be recorded or played back when autoplay is enabled
             if (!Mods.Value.Any(m => m is ModAutoplay))
                 PrepareReplay();
+
+            // needs to be bound here as the last binding, otherwise starting a replay while not focused causes player to exit.
+            gameActive.BindValueChanged(_ => updatePauseOnFocusLostState(), true);
         }
 
         [CanBeNull]
@@ -170,7 +175,7 @@ namespace osu.Game.Screens.Play
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(AudioManager audio, OsuConfigManager config, OsuGame game)
+        private void load(AudioManager audio, OsuConfigManager config, OsuGame game, OsuGameBase gameBase)
         {
             Mods.Value = base.Mods.Value.Select(m => m.CreateCopy()).ToArray();
 
@@ -186,6 +191,8 @@ namespace osu.Game.Screens.Play
 
             mouseWheelDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableWheel);
 
+            gameActive.BindTo(gameBase.IsActive);
+
             if (game != null)
                 LocalUserPlaying.BindTo(game.LocalUserPlaying);
 
@@ -420,10 +427,14 @@ namespace osu.Game.Screens.Play
             samplePlaybackDisabled.Value = DrawableRuleset.FrameStableClock.IsCatchingUp.Value || GameplayClockContainer.GameplayClock.IsPaused.Value;
         }
 
-        private void updatePauseOnFocusLostState() =>
-            HUDOverlay.HoldToQuit.PauseOnFocusLost = PauseOnFocusLost
-                                                     && !DrawableRuleset.HasReplayLoaded.Value
-                                                     && !breakTracker.IsBreakTime.Value;
+        private void updatePauseOnFocusLostState()
+        {
+            if (!IsLoaded || !PauseOnFocusLost || DrawableRuleset.HasReplayLoaded.Value || breakTracker.IsBreakTime.Value)
+                return;
+
+            if (gameActive.Value == false)
+                performUserRequestedExit();
+        }
 
         private IBeatmap loadPlayableBeatmap()
         {

From 0528469b440d33308cdc61c7d2a136027e4731e4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 14:04:04 +0900
Subject: [PATCH 1318/3722] Rename OrderedHitPolicy ->
 StartTimeOrderedHitPolicy

---
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs                      | 4 ++--
 .../UI/{OrderedHitPolicy.cs => StartTimeOrderedHitPolicy.cs}  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename osu.Game.Rulesets.Osu/UI/{OrderedHitPolicy.cs => StartTimeOrderedHitPolicy.cs} (97%)

diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 975b444699..5c77112df7 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.UI
         private readonly ProxyContainer spinnerProxies;
         private readonly JudgementContainer<DrawableOsuJudgement> judgementLayer;
         private readonly FollowPointRenderer followPoints;
-        private readonly OrderedHitPolicy hitPolicy;
+        private readonly StartTimeOrderedHitPolicy hitPolicy;
 
         public static readonly Vector2 BASE_SIZE = new Vector2(512, 384);
 
@@ -54,7 +54,7 @@ namespace osu.Game.Rulesets.Osu.UI
                 approachCircles = new ProxyContainer { RelativeSizeAxes = Axes.Both },
             };
 
-            hitPolicy = new OrderedHitPolicy(HitObjectContainer);
+            hitPolicy = new StartTimeOrderedHitPolicy(HitObjectContainer);
 
             var hitWindows = new OsuHitWindows();
 
diff --git a/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
similarity index 97%
rename from osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
rename to osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
index 8e4f81347d..1d9a5010ed 100644
--- a/osu.Game.Rulesets.Osu/UI/OrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
@@ -18,11 +18,11 @@ namespace osu.Game.Rulesets.Osu.UI
     /// <item><description>The hit causes all previous <see cref="HitObject"/>s to missed otherwise.</description></item>
     /// </list>
     /// </summary>
-    public class OrderedHitPolicy
+    public class StartTimeOrderedHitPolicy
     {
         private readonly HitObjectContainer hitObjectContainer;
 
-        public OrderedHitPolicy(HitObjectContainer hitObjectContainer)
+        public StartTimeOrderedHitPolicy(HitObjectContainer hitObjectContainer)
         {
             this.hitObjectContainer = hitObjectContainer;
         }

From df1df8184771f096a58acc095efc576485c7301c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 14:04:21 +0900
Subject: [PATCH 1319/3722] Better indicate ordering

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

diff --git a/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
index 1d9a5010ed..2b13a36e47 100644
--- a/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
@@ -11,7 +11,7 @@ using osu.Game.Rulesets.UI;
 namespace osu.Game.Rulesets.Osu.UI
 {
     /// <summary>
-    /// Ensures that <see cref="HitObject"/>s are hit in-order. Affectionately known as "note lock".
+    /// Ensures that <see cref="HitObject"/>s are hit in-order of their start times. Affectionately known as "note lock".
     /// If a <see cref="HitObject"/> is hit out of order:
     /// <list type="number">
     /// <item><description>The hit is blocked if it occurred earlier than the previous <see cref="HitObject"/>'s start time.</description></item>

From 08aae011c10880a24204717cfea5eb5c2629571b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 14:04:32 +0900
Subject: [PATCH 1320/3722] Add IHitPolicy interface

---
 osu.Game.Rulesets.Osu/UI/IHitPolicy.cs        | 25 +++++++++++++++++++
 .../UI/StartTimeOrderedHitPolicy.cs           | 13 ++--------
 2 files changed, 27 insertions(+), 11 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/UI/IHitPolicy.cs

diff --git a/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs
new file mode 100644
index 0000000000..fcc18b5f6f
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/UI/IHitPolicy.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.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Osu.UI
+{
+    public interface IHitPolicy
+    {
+        /// <summary>
+        /// Determines whether a <see cref="DrawableHitObject"/> can be hit at a point in time.
+        /// </summary>
+        /// <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);
+
+        /// <summary>
+        /// Handles a <see cref="HitObject"/> being hit.
+        /// </summary>
+        /// <param name="hitObject">The <see cref="HitObject"/> that was hit.</param>
+        void HandleHit(DrawableHitObject hitObject);
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
index 2b13a36e47..2b5a440f67 100644
--- a/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Osu.UI
     /// <item><description>The hit causes all previous <see cref="HitObject"/>s to missed otherwise.</description></item>
     /// </list>
     /// </summary>
-    public class StartTimeOrderedHitPolicy
+    public class StartTimeOrderedHitPolicy : IHitPolicy
     {
         private readonly HitObjectContainer hitObjectContainer;
 
@@ -27,12 +27,6 @@ namespace osu.Game.Rulesets.Osu.UI
             this.hitObjectContainer = hitObjectContainer;
         }
 
-        /// <summary>
-        /// Determines whether a <see cref="DrawableHitObject"/> can be hit at a point in time.
-        /// </summary>
-        /// <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>
         public bool IsHittable(DrawableHitObject hitObject, double time)
         {
             DrawableHitObject blockingObject = null;
@@ -54,10 +48,6 @@ namespace osu.Game.Rulesets.Osu.UI
             return blockingObject.Judged || time >= blockingObject.HitObject.StartTime;
         }
 
-        /// <summary>
-        /// Handles a <see cref="HitObject"/> being hit to potentially miss all earlier <see cref="HitObject"/>s.
-        /// </summary>
-        /// <param name="hitObject">The <see cref="HitObject"/> that was hit.</param>
         public void HandleHit(DrawableHitObject hitObject)
         {
             // Hitobjects which themselves don't block future hitobjects don't cause misses (e.g. slider ticks, spinners).
@@ -67,6 +57,7 @@ namespace osu.Game.Rulesets.Osu.UI
             if (!IsHittable(hitObject, hitObject.HitObject.StartTime + hitObject.Result.TimeOffset))
                 throw new InvalidOperationException($"A {hitObject} was hit before it became hittable!");
 
+            // Miss all hitobjects prior to the hit one.
             foreach (var obj in enumerateHitObjectsUpTo(hitObject.HitObject.StartTime))
             {
                 if (obj.Judged)

From 8adf37d958abc4bb3b42e600149a4b0fdbbbaa16 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 14:09:25 +0900
Subject: [PATCH 1321/3722] Add SetHitObjects() to IHitPolicy instead of using
 ctor

---
 osu.Game.Rulesets.Osu/UI/IHitPolicy.cs                |  7 +++++++
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs              |  3 ++-
 osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs | 10 +++-------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs
index fcc18b5f6f..72c3d781bb 100644
--- a/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/IHitPolicy.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.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 
@@ -8,6 +9,12 @@ namespace osu.Game.Rulesets.Osu.UI
 {
     public interface IHitPolicy
     {
+        /// <summary>
+        /// Sets the <see cref="DrawableHitObject"/>s which this <see cref="IHitPolicy"/> controls.
+        /// </summary>
+        /// <param name="hitObjects">An enumeration of the <see cref="DrawableHitObject"/>s.</param>
+        void SetHitObjects(IEnumerable<DrawableHitObject> hitObjects);
+
         /// <summary>
         /// Determines whether a <see cref="DrawableHitObject"/> can be hit at a point in time.
         /// </summary>
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 5c77112df7..c7900558a0 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -54,7 +54,8 @@ namespace osu.Game.Rulesets.Osu.UI
                 approachCircles = new ProxyContainer { RelativeSizeAxes = Axes.Both },
             };
 
-            hitPolicy = new StartTimeOrderedHitPolicy(HitObjectContainer);
+            hitPolicy = new StartTimeOrderedHitPolicy();
+            hitPolicy.SetHitObjects(HitObjectContainer.AliveObjects);
 
             var hitWindows = new OsuHitWindows();
 
diff --git a/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
index 2b5a440f67..38ba5fc490 100644
--- a/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
@@ -6,7 +6,6 @@ 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.UI;
 
 namespace osu.Game.Rulesets.Osu.UI
 {
@@ -20,12 +19,9 @@ namespace osu.Game.Rulesets.Osu.UI
     /// </summary>
     public class StartTimeOrderedHitPolicy : IHitPolicy
     {
-        private readonly HitObjectContainer hitObjectContainer;
+        private IEnumerable<DrawableHitObject> hitObjects;
 
-        public StartTimeOrderedHitPolicy(HitObjectContainer hitObjectContainer)
-        {
-            this.hitObjectContainer = hitObjectContainer;
-        }
+        public void SetHitObjects(IEnumerable<DrawableHitObject> hitObjects) => this.hitObjects = hitObjects;
 
         public bool IsHittable(DrawableHitObject hitObject, double time)
         {
@@ -77,7 +73,7 @@ namespace osu.Game.Rulesets.Osu.UI
 
         private IEnumerable<DrawableHitObject> enumerateHitObjectsUpTo(double targetTime)
         {
-            foreach (var obj in hitObjectContainer.AliveObjects)
+            foreach (var obj in hitObjects)
             {
                 if (obj.HitObject.StartTime >= targetTime)
                     yield break;

From c9481ebbafa4c28ba21730448dcdfbf2b71d59e6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 14:49:33 +0900
Subject: [PATCH 1322/3722] Rename test scene

---
 ...eOutOfOrderHits.cs => TestSceneStartTimeOrderedHitPolicy.cs} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename osu.Game.Rulesets.Osu.Tests/{TestSceneOutOfOrderHits.cs => TestSceneStartTimeOrderedHitPolicy.cs} (99%)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
similarity index 99%
rename from osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
rename to osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
index 296b421a11..b8c1217a73 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOutOfOrderHits.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
@@ -25,7 +25,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
-    public class TestSceneOutOfOrderHits : RateAdjustedBeatmapTestScene
+    public class TestSceneStartTimeOrderedHitPolicy : 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

From 64a2c7825e89811dec78f803507fdd4c8696cc52 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 14:53:47 +0900
Subject: [PATCH 1323/3722] Fix incorrect assert

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

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
index b8c1217a73..177a4f50a1 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneStartTimeOrderedHitPolicy.cs
@@ -169,7 +169,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             addJudgementAssert(hitObjects[0], HitResult.Great);
             addJudgementAssert(hitObjects[1], HitResult.Great);
             addJudgementOffsetAssert(hitObjects[0], -200); // time_first_circle - 200
-            addJudgementOffsetAssert(hitObjects[0], -200); // time_second_circle - first_circle_time - 100
+            addJudgementOffsetAssert(hitObjects[1], -200); // time_second_circle - first_circle_time - 100
         }
 
         /// <summary>

From 4bc324f040b3bfaca1e57af88f00558a6237d6bc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 Feb 2021 15:29:32 +0900
Subject: [PATCH 1324/3722] Rename parameter to make more sense

---
 osu.Game/Graphics/UserInterface/ProgressBar.cs | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/ProgressBar.cs b/osu.Game/Graphics/UserInterface/ProgressBar.cs
index 4ee1c73bf5..50367e600e 100644
--- a/osu.Game/Graphics/UserInterface/ProgressBar.cs
+++ b/osu.Game/Graphics/UserInterface/ProgressBar.cs
@@ -40,13 +40,18 @@ namespace osu.Game.Graphics.UserInterface
             set => CurrentNumber.Value = value;
         }
 
-        private readonly bool userInteractive;
-        public override bool HandlePositionalInput => userInteractive;
-        public override bool HandleNonPositionalInput => userInteractive;
+        private readonly bool allowSeek;
 
-        public ProgressBar(bool userInteractive)
+        public override bool HandlePositionalInput => allowSeek;
+        public override bool HandleNonPositionalInput => allowSeek;
+
+        /// <summary>
+        /// Construct a new progress bar.
+        /// </summary>
+        /// <param name="allowSeek">Whether the user should be allowed to click/drag to adjust the value.</param>
+        public ProgressBar(bool allowSeek)
         {
-            this.userInteractive = userInteractive;
+            this.allowSeek = allowSeek;
 
             CurrentNumber.MinValue = 0;
             CurrentNumber.MaxValue = 1;

From d1f9aa52a4c528053d7ee45344ad5ec15dff4fe5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 Feb 2021 15:33:48 +0900
Subject: [PATCH 1325/3722] Inline variable

---
 .../OnlinePlay/Multiplayer/Participants/StateDisplay.cs        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
index 4245628a59..c117c026dc 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
@@ -101,9 +101,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
                     case DownloadState.Downloading:
                         Debug.Assert(availability.DownloadProgress != null);
 
-                        var progress = availability.DownloadProgress.Value;
                         progressBar.FadeIn(fade_time);
-                        progressBar.CurrentTime = progress;
+                        progressBar.CurrentTime = availability.DownloadProgress.Value;
 
                         text.Text = "downloading map";
                         icon.Icon = FontAwesome.Solid.ArrowAltCircleDown;

From a4551dc1eeb2eb6afb9dec61752559eaa6e5632c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 14:31:22 +0900
Subject: [PATCH 1326/3722] Add object-ordered hit policy

---
 .../UI/ObjectOrderedHitPolicy.cs              | 55 +++++++++++++++++++
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs      |  4 +-
 2 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/UI/ObjectOrderedHitPolicy.cs

diff --git a/osu.Game.Rulesets.Osu/UI/ObjectOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/ObjectOrderedHitPolicy.cs
new file mode 100644
index 0000000000..fdab241a9b
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/UI/ObjectOrderedHitPolicy.cs
@@ -0,0 +1,55 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using System.Linq;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Osu.UI
+{
+    /// <summary>
+    /// Ensures that <see cref="HitObject"/>s are hit in order of appearance. The classic note lock.
+    /// <remarks>
+    /// Hits will be blocked until the previous <see cref="HitObject"/>s have been judged.
+    /// </remarks>
+    /// </summary>
+    public class ObjectOrderedHitPolicy : IHitPolicy
+    {
+        private IEnumerable<DrawableHitObject> hitObjects;
+
+        public void SetHitObjects(IEnumerable<DrawableHitObject> hitObjects) => this.hitObjects = hitObjects;
+
+        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)
+        {
+            foreach (var obj in hitObjects)
+            {
+                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;
+                }
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index c7900558a0..6cb890323b 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.UI
         private readonly ProxyContainer spinnerProxies;
         private readonly JudgementContainer<DrawableOsuJudgement> judgementLayer;
         private readonly FollowPointRenderer followPoints;
-        private readonly StartTimeOrderedHitPolicy hitPolicy;
+        private readonly IHitPolicy hitPolicy;
 
         public static readonly Vector2 BASE_SIZE = new Vector2(512, 384);
 
@@ -54,7 +54,7 @@ namespace osu.Game.Rulesets.Osu.UI
                 approachCircles = new ProxyContainer { RelativeSizeAxes = Axes.Both },
             };
 
-            hitPolicy = new StartTimeOrderedHitPolicy();
+            hitPolicy = new ObjectOrderedHitPolicy();
             hitPolicy.SetHitObjects(HitObjectContainer.AliveObjects);
 
             var hitWindows = new OsuHitWindows();

From 6aece18f8dedc392a84996d1c7e4a906b72b827e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 15:23:03 +0900
Subject: [PATCH 1327/3722] Add OOHP tests

---
 .../TestSceneObjectOrderedHitPolicy.cs        | 491 ++++++++++++++++++
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs   |  29 +-
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs      |  17 +-
 3 files changed, 529 insertions(+), 8 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
new file mode 100644
index 0000000000..039a4f142f
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
@@ -0,0 +1,491 @@
+// Copyright (c) ppy 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.Framework.Utils;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Judgements;
+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.Osu.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;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    public 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
+
+        /// <summary>
+        /// Tests clicking a future circle before the first circle's start time, while the first circle HAS NOT been judged.
+        /// </summary>
+        [Test]
+        public void TestClickSecondCircleBeforeFirstCircleTime()
+        {
+            const double time_first_circle = 1500;
+            const double time_second_circle = 1600;
+            Vector2 positionFirstCircle = Vector2.Zero;
+            Vector2 positionSecondCircle = new Vector2(80);
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new TestHitCircle
+                {
+                    StartTime = time_first_circle,
+                    Position = positionFirstCircle
+                },
+                new TestHitCircle
+                {
+                    StartTime = time_second_circle,
+                    Position = positionSecondCircle
+                }
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_first_circle - 100, Position = positionSecondCircle, Actions = { OsuAction.LeftButton } }
+            });
+
+            addJudgementAssert(hitObjects[0], HitResult.Miss);
+            addJudgementAssert(hitObjects[1], HitResult.Miss);
+            addJudgementOffsetAssert(hitObjects[0], late_miss_window);
+        }
+
+        /// <summary>
+        /// Tests clicking a future circle at the first circle's start time, while the first circle HAS NOT been judged.
+        /// </summary>
+        [Test]
+        public void TestClickSecondCircleAtFirstCircleTime()
+        {
+            const double time_first_circle = 1500;
+            const double time_second_circle = 1600;
+            Vector2 positionFirstCircle = Vector2.Zero;
+            Vector2 positionSecondCircle = new Vector2(80);
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new TestHitCircle
+                {
+                    StartTime = time_first_circle,
+                    Position = positionFirstCircle
+                },
+                new TestHitCircle
+                {
+                    StartTime = time_second_circle,
+                    Position = positionSecondCircle
+                }
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_first_circle, Position = positionSecondCircle, Actions = { OsuAction.LeftButton } }
+            });
+
+            addJudgementAssert(hitObjects[0], HitResult.Miss);
+            addJudgementAssert(hitObjects[1], HitResult.Miss);
+            addJudgementOffsetAssert(hitObjects[0], late_miss_window);
+        }
+
+        /// <summary>
+        /// Tests clicking a future circle after the first circle's start time, while the first circle HAS NOT been judged.
+        /// </summary>
+        [Test]
+        public void TestClickSecondCircleAfterFirstCircleTime()
+        {
+            const double time_first_circle = 1500;
+            const double time_second_circle = 1600;
+            Vector2 positionFirstCircle = Vector2.Zero;
+            Vector2 positionSecondCircle = new Vector2(80);
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new TestHitCircle
+                {
+                    StartTime = time_first_circle,
+                    Position = positionFirstCircle
+                },
+                new TestHitCircle
+                {
+                    StartTime = time_second_circle,
+                    Position = positionSecondCircle
+                }
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_first_circle + 100, Position = positionSecondCircle, Actions = { OsuAction.LeftButton } }
+            });
+
+            addJudgementAssert(hitObjects[0], HitResult.Miss);
+            addJudgementAssert(hitObjects[1], HitResult.Miss);
+            addJudgementOffsetAssert(hitObjects[0], late_miss_window);
+        }
+
+        /// <summary>
+        /// Tests clicking a future circle before the first circle's start time, while the first circle HAS been judged.
+        /// </summary>
+        [Test]
+        public void TestClickSecondCircleBeforeFirstCircleTimeWithFirstCircleJudged()
+        {
+            const double time_first_circle = 1500;
+            const double time_second_circle = 1600;
+            Vector2 positionFirstCircle = Vector2.Zero;
+            Vector2 positionSecondCircle = new Vector2(80);
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new TestHitCircle
+                {
+                    StartTime = time_first_circle,
+                    Position = positionFirstCircle
+                },
+                new TestHitCircle
+                {
+                    StartTime = time_second_circle,
+                    Position = positionSecondCircle
+                }
+            };
+
+            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 } }
+            });
+
+            addJudgementAssert(hitObjects[0], HitResult.Great);
+            addJudgementAssert(hitObjects[1], HitResult.Great);
+            addJudgementOffsetAssert(hitObjects[0], -200); // time_first_circle - 200
+            addJudgementOffsetAssert(hitObjects[0], -200); // time_second_circle - first_circle_time - 100
+        }
+
+        /// <summary>
+        /// Tests clicking a future circle after the first circle's start time, while the first circle HAS been judged.
+        /// </summary>
+        [Test]
+        public void TestClickSecondCircleAfterFirstCircleTimeWithFirstCircleJudged()
+        {
+            const double time_first_circle = 1500;
+            const double time_second_circle = 1600;
+            Vector2 positionFirstCircle = Vector2.Zero;
+            Vector2 positionSecondCircle = new Vector2(80);
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new TestHitCircle
+                {
+                    StartTime = time_first_circle,
+                    Position = positionFirstCircle
+                },
+                new TestHitCircle
+                {
+                    StartTime = time_second_circle,
+                    Position = positionSecondCircle
+                }
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_first_circle - 200, Position = positionFirstCircle, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_first_circle, Position = positionSecondCircle, Actions = { OsuAction.RightButton } }
+            });
+
+            addJudgementAssert(hitObjects[0], HitResult.Great);
+            addJudgementAssert(hitObjects[1], HitResult.Great);
+            addJudgementOffsetAssert(hitObjects[0], -200); // time_first_circle - 200
+            addJudgementOffsetAssert(hitObjects[1], -100); // time_second_circle - first_circle_time
+        }
+
+        /// <summary>
+        /// Tests clicking a future circle after a slider's start time, but hitting all slider ticks.
+        /// </summary>
+        [Test]
+        public void TestMissSliderHeadAndHitAllSliderTicks()
+        {
+            const double time_slider = 1500;
+            const double time_circle = 1510;
+            Vector2 positionCircle = Vector2.Zero;
+            Vector2 positionSlider = new Vector2(80);
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new TestHitCircle
+                {
+                    StartTime = time_circle,
+                    Position = positionCircle
+                },
+                new TestSlider
+                {
+                    StartTime = time_slider,
+                    Position = positionSlider,
+                    Path = new SliderPath(PathType.Linear, new[]
+                    {
+                        Vector2.Zero,
+                        new Vector2(25, 0),
+                    })
+                }
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_slider, Position = positionCircle, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_slider + 10, Position = positionSlider, Actions = { OsuAction.RightButton } }
+            });
+
+            addJudgementAssert(hitObjects[0], HitResult.Miss);
+            addJudgementAssert(hitObjects[1], HitResult.Great);
+            addJudgementAssert("slider head", () => ((Slider)hitObjects[1]).HeadCircle, HitResult.IgnoreHit);
+            addJudgementAssert("slider tick", () => ((Slider)hitObjects[1]).NestedHitObjects[1] as SliderTick, HitResult.LargeTickHit);
+        }
+
+        /// <summary>
+        /// Tests clicking hitting future slider ticks before a circle.
+        /// </summary>
+        [Test]
+        public void TestHitSliderTicksBeforeCircle()
+        {
+            const double time_slider = 1500;
+            const double time_circle = 1510;
+            Vector2 positionCircle = Vector2.Zero;
+            Vector2 positionSlider = new Vector2(30);
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new TestHitCircle
+                {
+                    StartTime = time_circle,
+                    Position = positionCircle
+                },
+                new TestSlider
+                {
+                    StartTime = time_slider,
+                    Position = positionSlider,
+                    Path = new SliderPath(PathType.Linear, new[]
+                    {
+                        Vector2.Zero,
+                        new Vector2(25, 0),
+                    })
+                }
+            };
+
+            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 } },
+            });
+
+            addJudgementAssert(hitObjects[0], HitResult.Great);
+            addJudgementAssert(hitObjects[1], HitResult.Great);
+            addJudgementAssert("slider head", () => ((Slider)hitObjects[1]).HeadCircle, HitResult.IgnoreHit);
+            addJudgementAssert("slider tick", () => ((Slider)hitObjects[1]).NestedHitObjects[1] as SliderTick, HitResult.LargeTickHit);
+        }
+
+        /// <summary>
+        /// Tests clicking a future circle before a spinner.
+        /// </summary>
+        [Test]
+        public void TestHitCircleBeforeSpinner()
+        {
+            const double time_spinner = 1500;
+            const double time_circle = 1800;
+            Vector2 positionCircle = Vector2.Zero;
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new TestSpinner
+                {
+                    StartTime = time_spinner,
+                    Position = new Vector2(256, 192),
+                    EndTime = time_spinner + 1000,
+                },
+                new TestHitCircle
+                {
+                    StartTime = time_circle,
+                    Position = positionCircle
+                },
+            };
+
+            performTest(hitObjects, 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 } },
+            });
+
+            addJudgementAssert(hitObjects[0], HitResult.Great);
+            addJudgementAssert(hitObjects[1], HitResult.Great);
+        }
+
+        [Test]
+        public void TestHitSliderHeadBeforeHitCircle()
+        {
+            const double time_circle = 1000;
+            const double time_slider = 1200;
+            Vector2 positionCircle = Vector2.Zero;
+            Vector2 positionSlider = new Vector2(80);
+
+            var hitObjects = new List<OsuHitObject>
+            {
+                new TestHitCircle
+                {
+                    StartTime = time_circle,
+                    Position = positionCircle
+                },
+                new TestSlider
+                {
+                    StartTime = time_slider,
+                    Position = positionSlider,
+                    Path = new SliderPath(PathType.Linear, new[]
+                    {
+                        Vector2.Zero,
+                        new Vector2(25, 0),
+                    })
+                }
+            };
+
+            performTest(hitObjects, new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Time = time_circle - 100, Position = positionSlider, Actions = { OsuAction.LeftButton } },
+                new OsuReplayFrame { Time = time_circle, Position = positionCircle, Actions = { OsuAction.RightButton } },
+                new OsuReplayFrame { Time = time_slider, Position = positionSlider, Actions = { OsuAction.LeftButton } },
+            });
+
+            addJudgementAssert(hitObjects[0], HitResult.Great);
+            addJudgementAssert(hitObjects[1], HitResult.Great);
+        }
+
+        private void addJudgementAssert(OsuHitObject hitObject, HitResult result)
+        {
+            AddAssert($"({hitObject.GetType().ReadableName()} @ {hitObject.StartTime}) judgement is {result}",
+                () => judgementResults.Single(r => r.HitObject == hitObject).Type == result);
+        }
+
+        private void addJudgementAssert(string name, Func<OsuHitObject> hitObject, HitResult result)
+        {
+            AddAssert($"{name} judgement is {result}",
+                () => judgementResults.Single(r => r.HitObject == hitObject()).Type == 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));
+        }
+
+        private ScoreAccessibleReplayPlayer currentPlayer;
+        private List<JudgementResult> judgementResults;
+
+        private void performTest(List<OsuHitObject> hitObjects, List<ReplayFrame> frames)
+        {
+            AddStep("load player", () =>
+            {
+                Beatmap.Value = CreateWorkingBeatmap(new Beatmap<OsuHitObject>
+                {
+                    HitObjects = hitObjects,
+                    BeatmapInfo =
+                    {
+                        BaseDifficulty = new BeatmapDifficulty { SliderTickRate = 3 },
+                        Ruleset = new OsuRuleset().RulesetInfo
+                    },
+                });
+
+                Beatmap.Value.Beatmap.ControlPointInfo.Add(0, new DifficultyControlPoint { SpeedMultiplier = 0.1f });
+
+                SelectedMods.Value = new[] { new OsuModClassic() };
+
+                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 class TestHitCircle : HitCircle
+        {
+            protected override HitWindows CreateHitWindows() => new TestHitWindows();
+        }
+
+        private class TestSlider : Slider
+        {
+            public TestSlider()
+            {
+                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, BeatmapDifficulty difficulty)
+            {
+                base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
+                SpinsRequired = 1;
+            }
+        }
+
+        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 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,
+                })
+            {
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index 5542580979..6f41bcc0b0 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -2,14 +2,18 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    public class OsuModClassic : Mod, IApplicableToHitObject
+    public class OsuModClassic : Mod, IApplicableToHitObject, IApplicableToDrawableRuleset<OsuHitObject>
     {
         public override string Name => "Classic";
 
@@ -23,21 +27,38 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public override bool Ranked => false;
 
+        [SettingSource("Disable slider head judgement", "Scores sliders proportionally to the number of ticks hit.")]
+        public Bindable<bool> DisableSliderHeadJudgement { get; } = new BindableBool(true);
+
+        [SettingSource("Disable slider head tracking", "Pins slider heads at their starting position, regardless of time.")]
+        public Bindable<bool> DisableSliderHeadTracking { get; } = new BindableBool(true);
+
+        [SettingSource("Disable note lock lenience", "Applies note lock to the full hit window.")]
+        public Bindable<bool> DisableLenientNoteLock { get; } = new BindableBool(true);
+
         public void ApplyToHitObject(HitObject hitObject)
         {
             switch (hitObject)
             {
                 case Slider slider:
-                    slider.IgnoreJudgement = false;
+                    slider.IgnoreJudgement = !DisableSliderHeadJudgement.Value;
 
                     foreach (var head in slider.NestedHitObjects.OfType<SliderHeadCircle>())
                     {
-                        head.TrackFollowCircle = false;
-                        head.JudgeAsNormalHitCircle = false;
+                        head.TrackFollowCircle = !DisableSliderHeadTracking.Value;
+                        head.JudgeAsNormalHitCircle = !DisableSliderHeadJudgement.Value;
                     }
 
                     break;
             }
         }
+
+        public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
+        {
+            var osuRuleset = (DrawableOsuRuleset)drawableRuleset;
+
+            if (!DisableLenientNoteLock.Value)
+                osuRuleset.Playfield.HitPolicy = new ObjectOrderedHitPolicy();
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 6cb890323b..9bd1dc74b7 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -31,7 +31,6 @@ namespace osu.Game.Rulesets.Osu.UI
         private readonly ProxyContainer spinnerProxies;
         private readonly JudgementContainer<DrawableOsuJudgement> judgementLayer;
         private readonly FollowPointRenderer followPoints;
-        private readonly IHitPolicy hitPolicy;
 
         public static readonly Vector2 BASE_SIZE = new Vector2(512, 384);
 
@@ -54,11 +53,9 @@ namespace osu.Game.Rulesets.Osu.UI
                 approachCircles = new ProxyContainer { RelativeSizeAxes = Axes.Both },
             };
 
-            hitPolicy = new ObjectOrderedHitPolicy();
-            hitPolicy.SetHitObjects(HitObjectContainer.AliveObjects);
+            HitPolicy = new ObjectOrderedHitPolicy();
 
             var hitWindows = new OsuHitWindows();
-
             foreach (var result in Enum.GetValues(typeof(HitResult)).OfType<HitResult>().Where(r => r > HitResult.None && hitWindows.IsHitResultAllowed(r)))
                 poolDictionary.Add(result, new DrawableJudgementPool(result, onJudgmentLoaded));
 
@@ -67,6 +64,18 @@ namespace osu.Game.Rulesets.Osu.UI
             NewResult += onNewResult;
         }
 
+        private IHitPolicy hitPolicy;
+
+        public IHitPolicy HitPolicy
+        {
+            get => hitPolicy;
+            set
+            {
+                hitPolicy = value ?? throw new ArgumentNullException(nameof(value));
+                hitPolicy.SetHitObjects(HitObjectContainer.AliveObjects);
+            }
+        }
+
         protected override void OnNewDrawableHitObject(DrawableHitObject drawable)
         {
             ((DrawableOsuHitObject)drawable).CheckHittable = hitPolicy.IsHittable;

From 1b6a05279847569be9d5568bc9812fa55b7fe503 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 Feb 2021 15:46:03 +0900
Subject: [PATCH 1328/3722] Refactor logic to suck a bit less

---
 .../Multiplayer/Participants/StateDisplay.cs  | 161 +++++++++---------
 1 file changed, 83 insertions(+), 78 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
index c117c026dc..c571b51c83 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.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.Extensions.Color4Extensions;
@@ -87,85 +88,89 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 
         public void UpdateStatus(MultiplayerUserState state, BeatmapAvailability availability)
         {
-            if (availability.State != DownloadState.LocallyAvailable)
-            {
-                switch (availability.State)
-                {
-                    case DownloadState.NotDownloaded:
-                        progressBar.FadeOut(fade_time);
-                        text.Text = "no map";
-                        icon.Icon = FontAwesome.Solid.MinusCircle;
-                        icon.Colour = colours.RedLight;
-                        break;
-
-                    case DownloadState.Downloading:
-                        Debug.Assert(availability.DownloadProgress != null);
-
-                        progressBar.FadeIn(fade_time);
-                        progressBar.CurrentTime = availability.DownloadProgress.Value;
-
-                        text.Text = "downloading map";
-                        icon.Icon = FontAwesome.Solid.ArrowAltCircleDown;
-                        icon.Colour = colours.Blue;
-                        break;
-
-                    case DownloadState.Importing:
-                        progressBar.FadeOut(fade_time);
-                        text.Text = "importing map";
-                        icon.Icon = FontAwesome.Solid.ArrowAltCircleDown;
-                        icon.Colour = colours.Yellow;
-                        break;
-                }
-            }
-            else
-            {
-                progressBar.FadeOut(fade_time);
-
-                switch (state)
-                {
-                    default:
-                        this.FadeOut(fade_time);
-                        return;
-
-                    case MultiplayerUserState.Ready:
-                        text.Text = "ready";
-                        icon.Icon = FontAwesome.Solid.CheckCircle;
-                        icon.Colour = Color4Extensions.FromHex("#AADD00");
-                        break;
-
-                    case MultiplayerUserState.WaitingForLoad:
-                        text.Text = "loading";
-                        icon.Icon = FontAwesome.Solid.PauseCircle;
-                        icon.Colour = colours.Yellow;
-                        break;
-
-                    case MultiplayerUserState.Loaded:
-                        text.Text = "loaded";
-                        icon.Icon = FontAwesome.Solid.DotCircle;
-                        icon.Colour = colours.YellowLight;
-                        break;
-
-                    case MultiplayerUserState.Playing:
-                        text.Text = "playing";
-                        icon.Icon = FontAwesome.Solid.PlayCircle;
-                        icon.Colour = colours.BlueLight;
-                        break;
-
-                    case MultiplayerUserState.FinishedPlay:
-                        text.Text = "results pending";
-                        icon.Icon = FontAwesome.Solid.ArrowAltCircleUp;
-                        icon.Colour = colours.BlueLighter;
-                        break;
-
-                    case MultiplayerUserState.Results:
-                        text.Text = "results";
-                        icon.Icon = FontAwesome.Solid.ArrowAltCircleUp;
-                        icon.Colour = colours.BlueLighter;
-                        break;
-                }
-            }
-
+            // the only case where the progress bar is used does its own local fade in.
+            // starting by fading out is a sane default.
+            progressBar.FadeOut(fade_time);
             this.FadeIn(fade_time);
+
+            switch (state)
+            {
+                case MultiplayerUserState.Idle:
+                    showBeatmapAvailability(availability);
+                    break;
+
+                case MultiplayerUserState.Ready:
+                    text.Text = "ready";
+                    icon.Icon = FontAwesome.Solid.CheckCircle;
+                    icon.Colour = Color4Extensions.FromHex("#AADD00");
+                    break;
+
+                case MultiplayerUserState.WaitingForLoad:
+                    text.Text = "loading";
+                    icon.Icon = FontAwesome.Solid.PauseCircle;
+                    icon.Colour = colours.Yellow;
+                    break;
+
+                case MultiplayerUserState.Loaded:
+                    text.Text = "loaded";
+                    icon.Icon = FontAwesome.Solid.DotCircle;
+                    icon.Colour = colours.YellowLight;
+                    break;
+
+                case MultiplayerUserState.Playing:
+                    text.Text = "playing";
+                    icon.Icon = FontAwesome.Solid.PlayCircle;
+                    icon.Colour = colours.BlueLight;
+                    break;
+
+                case MultiplayerUserState.FinishedPlay:
+                    text.Text = "results pending";
+                    icon.Icon = FontAwesome.Solid.ArrowAltCircleUp;
+                    icon.Colour = colours.BlueLighter;
+                    break;
+
+                case MultiplayerUserState.Results:
+                    text.Text = "results";
+                    icon.Icon = FontAwesome.Solid.ArrowAltCircleUp;
+                    icon.Colour = colours.BlueLighter;
+                    break;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(state), state, null);
+            }
+        }
+
+        private void showBeatmapAvailability(BeatmapAvailability availability)
+        {
+            switch (availability.State)
+            {
+                default:
+                    this.FadeOut(fade_time);
+                    break;
+
+                case DownloadState.NotDownloaded:
+                    text.Text = "no map";
+                    icon.Icon = FontAwesome.Solid.MinusCircle;
+                    icon.Colour = colours.RedLight;
+                    break;
+
+                case DownloadState.Downloading:
+                    Debug.Assert(availability.DownloadProgress != null);
+
+                    progressBar.FadeIn(fade_time);
+                    progressBar.CurrentTime = availability.DownloadProgress.Value;
+
+                    text.Text = "downloading map";
+                    icon.Icon = FontAwesome.Solid.ArrowAltCircleDown;
+                    icon.Colour = colours.Blue;
+                    break;
+
+                case DownloadState.Importing:
+                    text.Text = "importing map";
+                    icon.Icon = FontAwesome.Solid.ArrowAltCircleDown;
+                    icon.Colour = colours.Yellow;
+                    break;
+            }
         }
     }
 }

From 98c4573240670b7992894d2ddaf84c8f9acdf476 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 Feb 2021 15:52:49 +0900
Subject: [PATCH 1329/3722] Add assertions covering new test

---
 .../Multiplayer/TestSceneMultiplayerParticipantsList.cs  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index 4fec1c6dd8..b025440d04 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Online;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
@@ -82,12 +83,20 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             AddStep("set to no map", () => Client.ChangeBeatmapAvailability(BeatmapAvailability.NotDownloaded()));
             AddStep("set to downloading map", () => Client.ChangeBeatmapAvailability(BeatmapAvailability.Downloading(0)));
+
+            AddUntilStep("progress bar visible", () => this.ChildrenOfType<ProgressBar>().Single().IsPresent);
+
             AddRepeatStep("increment progress", () =>
             {
                 var progress = this.ChildrenOfType<ParticipantPanel>().Single().User.BeatmapAvailability.DownloadProgress ?? 0;
                 Client.ChangeBeatmapAvailability(BeatmapAvailability.Downloading(progress + RNG.NextSingle(0.1f)));
             }, 25);
+
+            AddAssert("progress bar increased", () => this.ChildrenOfType<ProgressBar>().Single().Current.Value > 0);
+
             AddStep("set to importing map", () => Client.ChangeBeatmapAvailability(BeatmapAvailability.Importing()));
+            AddUntilStep("progress bar not visible", () => !this.ChildrenOfType<ProgressBar>().Single().IsPresent);
+
             AddStep("set to available", () => Client.ChangeBeatmapAvailability(BeatmapAvailability.LocallyAvailable()));
         }
 

From 3aa3692ed4be0a5b94e4bbb9b489063b6532b0da Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 15:56:13 +0900
Subject: [PATCH 1330/3722] Disable snaking out when tracking is disabled

---
 .../Sliders/SliderCircleSelectionBlueprint.cs |  2 +-
 osu.Game.Rulesets.Osu/Objects/Slider.cs       |  2 +-
 .../Skinning/Default/PlaySliderBody.cs        | 22 ++++++++++++++++++-
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleSelectionBlueprint.cs
index a0392fe536..dec9cd8622 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleSelectionBlueprint.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         {
             base.Update();
 
-            CirclePiece.UpdateFrom(position == SliderPosition.Start ? HitObject.HeadCircle : HitObject.TailCircle);
+            CirclePiece.UpdateFrom(position == SliderPosition.Start ? (HitCircle)HitObject.HeadCircle : HitObject.TailCircle);
         }
 
         // Todo: This is temporary, since the slider circle masks don't do anything special yet. In the future they will handle input.
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index e3365a8ccf..01694a838b 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -121,7 +121,7 @@ namespace osu.Game.Rulesets.Osu.Objects
         public bool IgnoreJudgement = true;
 
         [JsonIgnore]
-        public HitCircle HeadCircle { get; protected set; }
+        public SliderHeadCircle HeadCircle { get; protected set; }
 
         [JsonIgnore]
         public SliderTailCircle TailCircle { get; protected set; }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs b/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
index e77c93c721..e9b4bb416c 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
@@ -21,6 +21,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
         [Resolved(CanBeNull = true)]
         private OsuRulesetConfigManager config { get; set; }
 
+        private readonly Bindable<bool> snakingOut = new Bindable<bool>();
+
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin, DrawableHitObject drawableObject)
         {
@@ -35,11 +37,29 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             accentColour = drawableObject.AccentColour.GetBoundCopy();
             accentColour.BindValueChanged(accent => updateAccentColour(skin, accent.NewValue), true);
 
+            SnakingOut.BindTo(snakingOut);
             config?.BindWith(OsuRulesetSetting.SnakingInSliders, SnakingIn);
-            config?.BindWith(OsuRulesetSetting.SnakingOutSliders, SnakingOut);
+            config?.BindWith(OsuRulesetSetting.SnakingOutSliders, snakingOut);
 
             BorderSize = skin.GetConfig<OsuSkinConfiguration, float>(OsuSkinConfiguration.SliderBorderSize)?.Value ?? 1;
             BorderColour = skin.GetConfig<OsuSkinColour, Color4>(OsuSkinColour.SliderBorder)?.Value ?? Color4.White;
+
+            drawableObject.HitObjectApplied += onHitObjectApplied;
+            onHitObjectApplied(drawableObject);
+        }
+
+        private void onHitObjectApplied(DrawableHitObject obj)
+        {
+            var drawableSlider = (DrawableSlider)obj;
+            if (drawableSlider.HitObject == null)
+                return;
+
+            if (!drawableSlider.HitObject.HeadCircle.TrackFollowCircle)
+            {
+                // When not tracking the follow circle, force the path to not snake out as it looks better that way.
+                SnakingOut.UnbindFrom(snakingOut);
+                SnakingOut.Value = false;
+            }
         }
 
         private void updateAccentColour(ISkinSource skin, Color4 defaultAccentColour)

From 1368d551529ac09ecb1d47c5d32c0ddbf5f313b1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 Feb 2021 15:58:27 +0900
Subject: [PATCH 1331/3722] Add test coverage of precedence of display

---
 .../TestSceneMultiplayerParticipantsList.cs   | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index b025440d04..c3852fafd4 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
@@ -78,13 +78,27 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("single panel is for second user", () => this.ChildrenOfType<ParticipantPanel>().Single().User.User == secondUser);
         }
 
+        [Test]
+        public void TestGameStateHasPriorityOverDownloadState()
+        {
+            AddStep("set to downloading map", () => Client.ChangeBeatmapAvailability(BeatmapAvailability.Downloading(0)));
+            checkProgressBarVisibility(true);
+
+            AddStep("make user ready", () => Client.ChangeState(MultiplayerUserState.Results));
+            checkProgressBarVisibility(false);
+            AddUntilStep("ready mark visible", () => this.ChildrenOfType<StateDisplay>().Single().IsPresent);
+
+            AddStep("make user ready", () => Client.ChangeState(MultiplayerUserState.Idle));
+            checkProgressBarVisibility(true);
+        }
+
         [Test]
         public void TestBeatmapDownloadingStates()
         {
             AddStep("set to no map", () => Client.ChangeBeatmapAvailability(BeatmapAvailability.NotDownloaded()));
             AddStep("set to downloading map", () => Client.ChangeBeatmapAvailability(BeatmapAvailability.Downloading(0)));
 
-            AddUntilStep("progress bar visible", () => this.ChildrenOfType<ProgressBar>().Single().IsPresent);
+            checkProgressBarVisibility(true);
 
             AddRepeatStep("increment progress", () =>
             {
@@ -95,7 +109,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("progress bar increased", () => this.ChildrenOfType<ProgressBar>().Single().Current.Value > 0);
 
             AddStep("set to importing map", () => Client.ChangeBeatmapAvailability(BeatmapAvailability.Importing()));
-            AddUntilStep("progress bar not visible", () => !this.ChildrenOfType<ProgressBar>().Single().IsPresent);
+            checkProgressBarVisibility(false);
 
             AddStep("set to available", () => Client.ChangeBeatmapAvailability(BeatmapAvailability.LocallyAvailable()));
         }
@@ -197,5 +211,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 AddStep($"set state: {state}", () => Client.ChangeUserState(0, state));
             }
         }
+
+        private void checkProgressBarVisibility(bool visible) =>
+            AddUntilStep($"progress bar {(visible ? "is" : "is not")}visible", () =>
+                this.ChildrenOfType<ProgressBar>().Single().IsPresent == visible);
     }
 }

From 9ba5ae3db7c7f235fab1d44fd75a2e2a2f0ded94 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 Feb 2021 16:17:02 +0900
Subject: [PATCH 1332/3722] Remove lots of unnecessary client side logic

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

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 5bcb1d6dc8..bd1ec9c54a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -270,7 +270,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             BeatmapAvailability.BindValueChanged(updateBeatmapAvailability, true);
             UserMods.BindValueChanged(onUserModsChanged);
 
-            client.RoomUpdated += onRoomUpdated;
             client.LoadRequested += onLoadRequested;
 
             isConnected = client.IsConnected.GetBoundCopy();
@@ -323,24 +322,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             client.ChangeUserMods(mods.NewValue);
         }
 
-        private void updateBeatmapAvailability(ValueChangedEvent<BeatmapAvailability> _ = null)
+        private void updateBeatmapAvailability(ValueChangedEvent<BeatmapAvailability> availability)
         {
             if (client.Room == null)
                 return;
 
-            client.ChangeBeatmapAvailability(BeatmapAvailability.Value);
-
-            if (client.LocalUser?.State == MultiplayerUserState.Ready)
-                client.ChangeState(MultiplayerUserState.Idle);
-        }
-
-        private void onRoomUpdated()
-        {
-            if (client.Room == null)
-                return;
-
-            if (client.LocalUser?.BeatmapAvailability.Equals(BeatmapAvailability.Value) == false)
-                updateBeatmapAvailability();
+            client.ChangeBeatmapAvailability(availability.NewValue);
         }
 
         private void onReadyClick()
@@ -392,10 +379,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             base.Dispose(isDisposing);
 
             if (client != null)
-            {
                 client.LoadRequested -= onLoadRequested;
-                client.RoomUpdated -= onRoomUpdated;
-            }
         }
 
         private class UserModSelectOverlay : ModSelectOverlay

From be91f54349202c6a633f0de9728ede538b120c9d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 Feb 2021 16:19:45 +0900
Subject: [PATCH 1333/3722] Add back edge case with comment

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index bd1ec9c54a..39e179262e 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -328,6 +328,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 return;
 
             client.ChangeBeatmapAvailability(availability.NewValue);
+
+            // 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);
         }
 
         private void onReadyClick()

From e1789c29b1a1e01f235b8e6bb9bdcfd131e5d715 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 5 Feb 2021 10:28:13 +0300
Subject: [PATCH 1334/3722] Use `Pause()` instead of
 `performUserRequestedExit()` to avoid unexpected operations

---
 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 556964bca4..542839f11d 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -433,7 +433,7 @@ namespace osu.Game.Screens.Play
                 return;
 
             if (gameActive.Value == false)
-                performUserRequestedExit();
+                Pause();
         }
 
         private IBeatmap loadPlayableBeatmap()

From 8d18c7e9299cc9c8e4a8b55563c3a9a22d1a99bd Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 5 Feb 2021 10:28:33 +0300
Subject: [PATCH 1335/3722] Fix `BreakTracker.IsBreakTime` not updated properly
 on breaks set

Causes a pause from focus lose when playing a beatmap that has a break section at the beginning, due to `IsBreakTime` incorrectly set to `false`
---
 osu.Game/Screens/Play/BreakTracker.cs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/BreakTracker.cs b/osu.Game/Screens/Play/BreakTracker.cs
index 51e21656e1..793b6b0ebe 100644
--- a/osu.Game/Screens/Play/BreakTracker.cs
+++ b/osu.Game/Screens/Play/BreakTracker.cs
@@ -23,16 +23,16 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public IBindable<bool> IsBreakTime => isBreakTime;
 
-        private readonly BindableBool isBreakTime = new BindableBool();
+        private readonly BindableBool isBreakTime = new BindableBool(true);
 
         public IReadOnlyList<BreakPeriod> Breaks
         {
             set
             {
-                isBreakTime.Value = false;
-
                 breaks = new PeriodTracker(value.Where(b => b.HasEffect)
                                                 .Select(b => new Period(b.StartTime, b.EndTime - BreakOverlay.BREAK_FADE_DURATION)));
+
+                updateBreakTime();
             }
         }
 
@@ -45,8 +45,12 @@ namespace osu.Game.Screens.Play
         protected override void Update()
         {
             base.Update();
+            updateBreakTime();
+        }
 
-            var time = Clock.CurrentTime;
+        private void updateBreakTime()
+        {
+            var time = Clock?.CurrentTime ?? 0;
 
             isBreakTime.Value = breaks?.IsInAny(time) == true
                                 || time < gameplayStartTime

From 3e750feaa49cd9b0f7dea85965f657181b1c2eeb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 Feb 2021 16:42:35 +0900
Subject: [PATCH 1336/3722] Subclass LocalPlayerModSelectOverlay to correctly
 deselect incompatible mods on free mod selection

---
 .../Visual/UserInterface/TestSceneModSelectOverlay.cs           | 2 +-
 osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs     | 2 +-
 .../{SoloModSelectOverlay.cs => LocalPlayerModSelectOverlay.cs} | 2 +-
 .../Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs | 2 +-
 osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs             | 2 +-
 osu.Game/Screens/Select/SongSelect.cs                           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename osu.Game/Overlays/Mods/{SoloModSelectOverlay.cs => LocalPlayerModSelectOverlay.cs} (88%)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 44605f4994..37ebc72984 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -333,7 +333,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             };
         }
 
-        private class TestModSelectOverlay : SoloModSelectOverlay
+        private class TestModSelectOverlay : LocalPlayerModSelectOverlay
         {
             public new Bindable<IReadOnlyList<Mod>> SelectedMods => base.SelectedMods;
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
index 3c889bdec4..89f9b7381b 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
@@ -151,7 +151,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddUntilStep("wait for ready", () => modSelect.State.Value == Visibility.Visible && modSelect.ButtonsLoaded);
         }
 
-        private class TestModSelectOverlay : SoloModSelectOverlay
+        private class TestModSelectOverlay : LocalPlayerModSelectOverlay
         {
             public new VisibilityContainer ModSettingsContainer => base.ModSettingsContainer;
             public new TriangleButton CustomiseButton => base.CustomiseButton;
diff --git a/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs b/osu.Game/Overlays/Mods/LocalPlayerModSelectOverlay.cs
similarity index 88%
rename from osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
rename to osu.Game/Overlays/Mods/LocalPlayerModSelectOverlay.cs
index d039ad1f98..78cd9bdae5 100644
--- a/osu.Game/Overlays/Mods/SoloModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/LocalPlayerModSelectOverlay.cs
@@ -5,7 +5,7 @@ using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Overlays.Mods
 {
-    public class SoloModSelectOverlay : ModSelectOverlay
+    public class LocalPlayerModSelectOverlay : ModSelectOverlay
     {
         protected override void OnModSelected(Mod mod)
         {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 061e3b4d3f..f030879625 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -373,7 +373,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 client.LoadRequested -= onLoadRequested;
         }
 
-        private class UserModSelectOverlay : ModSelectOverlay
+        private class UserModSelectOverlay : LocalPlayerModSelectOverlay
         {
             public UserModSelectOverlay()
             {
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
index 0baa663578..b201c62b7f 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
@@ -125,7 +125,7 @@ namespace osu.Game.Screens.OnlinePlay
             return base.OnExiting(next);
         }
 
-        protected override ModSelectOverlay CreateModSelectOverlay() => new SoloModSelectOverlay
+        protected override ModSelectOverlay CreateModSelectOverlay() => new LocalPlayerModSelectOverlay
         {
             IsValidMod = IsValidMod
         };
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index ed6e0a1028..b20effc67d 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -311,7 +311,7 @@ namespace osu.Game.Screens.Select
             (new FooterButtonOptions(), BeatmapOptions)
         };
 
-        protected virtual ModSelectOverlay CreateModSelectOverlay() => new SoloModSelectOverlay();
+        protected virtual ModSelectOverlay CreateModSelectOverlay() => new LocalPlayerModSelectOverlay();
 
         protected virtual void ApplyFilterToCarousel(FilterCriteria criteria)
         {

From 630c5bb74700ae3599013eddf70e2a1cda4a3642 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 Feb 2021 16:46:21 +0900
Subject: [PATCH 1337/3722] Avoid potential crashes when lease is held on
 SelectedMods

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index a00cd5e6a0..1a1f7bd233 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -469,6 +469,10 @@ namespace osu.Game
         {
             updateModDefaults();
 
+            // a lease may be taken on the mods bindable, at which point we can't really ensure valid mods.
+            if (SelectedMods.Disabled)
+                return;
+
             if (!ModUtils.CheckValidForGameplay(mods.NewValue, out var invalid))
             {
                 // ensure we always have a valid set of mods.

From ee3367d7c549acecb778c652365c290e3e186e5b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 16:59:13 +0900
Subject: [PATCH 1338/3722] Add classic slider ball tracking

---
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs     | 17 ++++++++++++++++-
 .../Skinning/Default/SliderBall.cs              | 15 ++++++++++++++-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index 6f41bcc0b0..df3afb7063 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.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.Collections.Generic;
 using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 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.UI;
 using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    public class OsuModClassic : Mod, IApplicableToHitObject, IApplicableToDrawableRuleset<OsuHitObject>
+    public class OsuModClassic : Mod, IApplicableToHitObject, IApplicableToDrawableHitObjects, IApplicableToDrawableRuleset<OsuHitObject>
     {
         public override string Name => "Classic";
 
@@ -36,6 +39,9 @@ namespace osu.Game.Rulesets.Osu.Mods
         [SettingSource("Disable note lock lenience", "Applies note lock to the full hit window.")]
         public Bindable<bool> DisableLenientNoteLock { get; } = new BindableBool(true);
 
+        [SettingSource("Disable exact slider follow circle tracking", "Makes the slider follow circle track its final size at all times.")]
+        public Bindable<bool> DisableExactFollowCircleTracking { get; } = new BindableBool(true);
+
         public void ApplyToHitObject(HitObject hitObject)
         {
             switch (hitObject)
@@ -60,5 +66,14 @@ namespace osu.Game.Rulesets.Osu.Mods
             if (!DisableLenientNoteLock.Value)
                 osuRuleset.Playfield.HitPolicy = new ObjectOrderedHitPolicy();
         }
+
+        public void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
+        {
+            foreach (var obj in drawables)
+            {
+                if (obj is DrawableSlider slider)
+                    slider.Ball.TrackVisualSize = !DisableExactFollowCircleTracking.Value;
+            }
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs
index a96beb66d4..da3debbd42 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs
@@ -31,6 +31,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             set => ball.Colour = value;
         }
 
+        /// <summary>
+        /// Whether to track accurately to the visual size of this <see cref="SliderBall"/>.
+        /// If <c>false</c>, tracking will be performed at the final scale at all times.
+        /// </summary>
+        public bool TrackVisualSize = true;
+
         private readonly Drawable followCircle;
         private readonly DrawableSlider drawableSlider;
         private readonly Drawable ball;
@@ -94,7 +100,14 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
                 tracking = value;
 
-                followCircle.ScaleTo(tracking ? 2.4f : 1f, 300, Easing.OutQuint);
+                if (TrackVisualSize)
+                    followCircle.ScaleTo(tracking ? 2.4f : 1f, 300, Easing.OutQuint);
+                else
+                {
+                    // We need to always be tracking the final size, at both endpoints. For now, this is achieved by removing the scale duration.
+                    followCircle.ScaleTo(tracking ? 2.4f : 1f);
+                }
+
                 followCircle.FadeTo(tracking ? 1f : 0, 300, Easing.OutQuint);
             }
         }

From 791cbb7f03e9637a123b83b77f339c3d44abbf1f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 Feb 2021 17:17:29 +0900
Subject: [PATCH 1339/3722] Don't reset ready state if the map is locally
 available

---
 .../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 39e179262e..53c939115c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -330,7 +330,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             client.ChangeBeatmapAvailability(availability.NewValue);
 
             // 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)
+            if (availability.NewValue != Online.Rooms.BeatmapAvailability.LocallyAvailable()
+                && client.LocalUser?.State == MultiplayerUserState.Ready)
                 client.ChangeState(MultiplayerUserState.Idle);
         }
 

From 110458612d730e449174fe533606faecc041785b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 Feb 2021 17:19:23 +0900
Subject: [PATCH 1340/3722] Avoid handling null playlist items when updating
 avaialability display

---
 .../Rooms/OnlinePlayBeatmapAvailablilityTracker.cs     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
index ad4b3c5151..dcb366ddab 100644
--- a/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
+++ b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
@@ -36,7 +36,15 @@ namespace osu.Game.Online.Rooms
         {
             base.LoadComplete();
 
-            SelectedItem.BindValueChanged(item => Model.Value = item.NewValue?.Beatmap.Value.BeatmapSet, true);
+            SelectedItem.BindValueChanged(item =>
+            {
+                // the underlying playlist is regularly cleared for maintenance purposes (things which probably need to be fixed eventually).
+                // to avoid exposing a state change when there may actually be none, ignore all nulls for now.
+                if (item.NewValue == null)
+                    return;
+
+                Model.Value = item.NewValue.Beatmap.Value.BeatmapSet;
+            }, true);
         }
 
         protected override bool VerifyDatabasedModel(BeatmapSetInfo databasedSet)

From a5855f5d28f8e7db6b9d4038806e5d70b38c3a7f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 17:33:48 +0900
Subject: [PATCH 1341/3722] Move follow circle tracking to DrawableSliderHead

---
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs       | 15 ++++++++++-----
 .../Objects/Drawables/DrawableSliderHead.cs       |  8 +++++++-
 osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs |  6 ------
 .../Skinning/Default/PlaySliderBody.cs            |  2 +-
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index df3afb7063..8cd6676f9d 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -50,10 +50,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                     slider.IgnoreJudgement = !DisableSliderHeadJudgement.Value;
 
                     foreach (var head in slider.NestedHitObjects.OfType<SliderHeadCircle>())
-                    {
-                        head.TrackFollowCircle = !DisableSliderHeadTracking.Value;
                         head.JudgeAsNormalHitCircle = !DisableSliderHeadJudgement.Value;
-                    }
 
                     break;
             }
@@ -71,8 +68,16 @@ namespace osu.Game.Rulesets.Osu.Mods
         {
             foreach (var obj in drawables)
             {
-                if (obj is DrawableSlider slider)
-                    slider.Ball.TrackVisualSize = !DisableExactFollowCircleTracking.Value;
+                switch (obj)
+                {
+                    case DrawableSlider slider:
+                        slider.Ball.TrackVisualSize = !DisableExactFollowCircleTracking.Value;
+                        break;
+
+                    case DrawableSliderHead head:
+                        head.TrackFollowCircle = !DisableSliderHeadTracking.Value;
+                        break;
+                }
             }
         }
     }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index 08e9c5eb14..ee1df00ef7 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -22,6 +22,12 @@ 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;
@@ -66,7 +72,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             Debug.Assert(Slider != null);
             Debug.Assert(HitObject != null);
 
-            if (HitObject.TrackFollowCircle)
+            if (TrackFollowCircle)
             {
                 double completionProgress = Math.Clamp((Time.Current - Slider.StartTime) / Slider.Duration, 0, 1);
 
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs b/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
index 13eac60300..28e57567cb 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
@@ -8,12 +8,6 @@ namespace osu.Game.Rulesets.Osu.Objects
 {
     public class SliderHeadCircle : HitCircle
     {
-        /// <summary>
-        /// Makes this <see cref="SliderHeadCircle"/> track the follow circle when the start time is reached.
-        /// If <c>false</c>, this <see cref="SliderHeadCircle"/> will be pinned to its initial position in the slider.
-        /// </summary>
-        public bool TrackFollowCircle = true;
-
         /// <summary>
         /// Whether to treat this <see cref="SliderHeadCircle"/> as a normal <see cref="HitCircle"/> for judgement purposes.
         /// If <c>false</c>, judgement will be ignored.
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs b/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
index e9b4bb416c..8eb2714c04 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             if (drawableSlider.HitObject == null)
                 return;
 
-            if (!drawableSlider.HitObject.HeadCircle.TrackFollowCircle)
+            if (!drawableSlider.HeadCircle.TrackFollowCircle)
             {
                 // When not tracking the follow circle, force the path to not snake out as it looks better that way.
                 SnakingOut.UnbindFrom(snakingOut);

From dad32da4153e8cb18443c6c1f12c1a1847754936 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 Feb 2021 17:34:05 +0900
Subject: [PATCH 1342/3722] Add rate limiting on sending download progress
 updates

---
 .../Rooms/OnlinePlayBeatmapAvailablilityTracker.cs  | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
index dcb366ddab..cfaf43451f 100644
--- a/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
+++ b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
@@ -5,6 +5,7 @@ using System;
 using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Logging;
+using osu.Framework.Threading;
 using osu.Game.Beatmaps;
 
 namespace osu.Game.Online.Rooms
@@ -24,12 +25,20 @@ namespace osu.Game.Online.Rooms
         /// </summary>
         public IBindable<BeatmapAvailability> Availability => availability;
 
-        private readonly Bindable<BeatmapAvailability> availability = new Bindable<BeatmapAvailability>();
+        private readonly Bindable<BeatmapAvailability> availability = new Bindable<BeatmapAvailability>(BeatmapAvailability.LocallyAvailable());
+
+        private ScheduledDelegate progressUpdate;
 
         public OnlinePlayBeatmapAvailablilityTracker()
         {
             State.BindValueChanged(_ => updateAvailability());
-            Progress.BindValueChanged(_ => updateAvailability(), true);
+            Progress.BindValueChanged(_ =>
+            {
+                // incoming progress changes are going to be at a very high rate.
+                // we don't want to flood the network with this, so rate limit how often we send progress updates.
+                if (progressUpdate?.Completed != false)
+                    progressUpdate = Scheduler.AddDelayed(updateAvailability, progressUpdate == null ? 0 : 500);
+            });
         }
 
         protected override void LoadComplete()

From 95ad7ea8f7667a5e3faacbcbe696ef09b5b38354 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 5 Feb 2021 18:44:26 +0900
Subject: [PATCH 1343/3722] Fix mods on participant panels flashing when
 changed

---
 .../Multiplayer/Participants/ParticipantPanel.cs      | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index 2983d1268d..0ee1b6d684 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -162,15 +162,20 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 
             const double fade_time = 50;
 
-            var ruleset = rulesets.GetRuleset(Room.Settings.RulesetID).CreateInstance();
-
             userStateDisplay.Status = User.State;
-            userModsDisplay.Current.Value = User.Mods.Select(m => m.ToMod(ruleset)).ToList();
 
             if (Room.Host?.Equals(User) == true)
                 crown.FadeIn(fade_time);
             else
                 crown.FadeOut(fade_time);
+
+            // If the mods are updated at the end of the frame, the flow container will skip a reflow cycle: https://github.com/ppy/osu-framework/issues/4187
+            // This looks particularly jarring here, so re-schedule the update to that start of our frame as a fix.
+            Schedule(() =>
+            {
+                var ruleset = rulesets.GetRuleset(Room.Settings.RulesetID).CreateInstance();
+                userModsDisplay.Current.Value = User.Mods.Select(m => m.ToMod(ruleset)).ToList();
+            });
         }
 
         public MenuItem[] ContextMenuItems

From 0679901e4d3048552b9e89ace1896958189c6d4e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 Feb 2021 22:53:40 +0900
Subject: [PATCH 1344/3722] Update error handling

---
 osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
index dc98eb8687..33200ca076 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
@@ -66,8 +66,8 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
             {
                 failed = true;
 
-                if (e is WebException || string.IsNullOrEmpty(e.Message))
-                    Logger.Error(e, "Failed to retrieve a score submission token.\n\nThis may happen if you are running an old or non-official release of osu! (ie. you are self-compiling).");
+                if (string.IsNullOrEmpty(e.Message))
+                    Logger.Error(e, "Failed to retrieve a score submission token.");
                 else
                     Logger.Log($"You are not able to submit a score: {e.Message}", level: LogLevel.Important);
 

From 7f82a06a61284b89a99a5b95cbae09cf428fa159 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 5 Feb 2021 23:08:31 +0900
Subject: [PATCH 1345/3722] Remove no longer used using directive

---
 osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
index 33200ca076..38eae2346a 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Diagnostics;
 using System.Linq;
-using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;

From 5061231e599a2d04a40a2526872383987c9acddb Mon Sep 17 00:00:00 2001
From: vmaggioli <vinmags16@gmail.com>
Date: Fri, 5 Feb 2021 09:39:14 -0500
Subject: [PATCH 1346/3722] Switch to beat length

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

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 301543b3c1..d24614299c 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -388,7 +388,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         case IHasDuration endTimeHitObject:
                             var snappedTime = Math.Max(hitObject.StartTime, beatSnapProvider.SnapTime(time));
 
-                            if (endTimeHitObject.EndTime == snappedTime || Precision.AlmostEquals(snappedTime, hitObject.StartTime, 1))
+                            if (endTimeHitObject.EndTime == snappedTime || Precision.AlmostEquals(snappedTime, hitObject.StartTime, beatmap.GetBeatLengthAtTime(snappedTime)))
                                 return;
 
                             endTimeHitObject.Duration = snappedTime - hitObject.StartTime;

From f29938e15d62bad02c0ff8d0f586bc2764f423a9 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 5 Feb 2021 20:39:57 +0300
Subject: [PATCH 1347/3722] Make last binding game activity more sensible

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 542839f11d..f38eba3f27 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -80,6 +80,9 @@ namespace osu.Game.Screens.Play
 
         public int RestartCount;
 
+        [Resolved]
+        private OsuGameBase gameBase { get; set; }
+
         [Resolved]
         private ScoreManager scoreManager { get; set; }
 
@@ -157,7 +160,8 @@ namespace osu.Game.Screens.Play
             if (!Mods.Value.Any(m => m is ModAutoplay))
                 PrepareReplay();
 
-            // needs to be bound here as the last binding, otherwise starting a replay while not focused causes player to exit.
+            // needs to be bound here as the last binding, otherwise cases like starting a replay while not focused causes player to exit, if activity is bound before checks.
+            gameActive.BindTo(gameBase.IsActive);
             gameActive.BindValueChanged(_ => updatePauseOnFocusLostState(), true);
         }
 
@@ -191,8 +195,6 @@ namespace osu.Game.Screens.Play
 
             mouseWheelDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableWheel);
 
-            gameActive.BindTo(gameBase.IsActive);
-
             if (game != null)
                 LocalUserPlaying.BindTo(game.LocalUserPlaying);
 
@@ -429,7 +431,7 @@ namespace osu.Game.Screens.Play
 
         private void updatePauseOnFocusLostState()
         {
-            if (!IsLoaded || !PauseOnFocusLost || DrawableRuleset.HasReplayLoaded.Value || breakTracker.IsBreakTime.Value)
+            if (!PauseOnFocusLost || DrawableRuleset.HasReplayLoaded.Value || breakTracker.IsBreakTime.Value)
                 return;
 
             if (gameActive.Value == false)

From f6d08f54e6e950f4784087012fe27cd3e566a22c Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Fri, 5 Feb 2021 21:19:13 +0100
Subject: [PATCH 1348/3722] Use the oldest user config file available when
 there happens to be multiple config files available.

---
 osu.Game/IO/StableStorage.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/IO/StableStorage.cs b/osu.Game/IO/StableStorage.cs
index f86b18c724..614e548d93 100644
--- a/osu.Game/IO/StableStorage.cs
+++ b/osu.Game/IO/StableStorage.cs
@@ -35,7 +35,11 @@ namespace osu.Game.IO
         {
             var songsDirectoryPath = Path.Combine(BasePath, stable_default_songs_path);
 
-            var configFile = GetFiles(".", "osu!.*.cfg").SingleOrDefault();
+            // enumerate the user config files available in case the user migrated their files from another pc / operating system.
+            var foundConfigFiles = GetFiles(".", "osu!.*.cfg");
+
+            // if more than one config file is found, let's use the oldest one (where the username in the filename doesn't match the local username).
+            var configFile = foundConfigFiles.Count() > 1 ? foundConfigFiles.FirstOrDefault(filename => !filename[5..^4].Contains(Environment.UserName, StringComparison.Ordinal)) : foundConfigFiles.FirstOrDefault();
 
             if (configFile == null)
                 return songsDirectoryPath;

From c9db0bf88651affc9bdd3a165984ad7577770149 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 6 Feb 2021 20:54:13 +0300
Subject: [PATCH 1349/3722] Call break time update when loaded

---
 osu.Game/Screens/Play/BreakTracker.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/BreakTracker.cs b/osu.Game/Screens/Play/BreakTracker.cs
index 793b6b0ebe..2f3673e91f 100644
--- a/osu.Game/Screens/Play/BreakTracker.cs
+++ b/osu.Game/Screens/Play/BreakTracker.cs
@@ -32,7 +32,8 @@ namespace osu.Game.Screens.Play
                 breaks = new PeriodTracker(value.Where(b => b.HasEffect)
                                                 .Select(b => new Period(b.StartTime, b.EndTime - BreakOverlay.BREAK_FADE_DURATION)));
 
-                updateBreakTime();
+                if (IsLoaded)
+                    updateBreakTime();
             }
         }
 
@@ -50,7 +51,7 @@ namespace osu.Game.Screens.Play
 
         private void updateBreakTime()
         {
-            var time = Clock?.CurrentTime ?? 0;
+            var time = Clock.CurrentTime;
 
             isBreakTime.Value = breaks?.IsInAny(time) == true
                                 || time < gameplayStartTime

From 40ddccf0c73904af580d3023b3d79d45a14868f3 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 6 Feb 2021 20:55:55 +0300
Subject: [PATCH 1350/3722] Do not consider replays for "pause on focus lost"

Replays are not pausable as can be seen in the `canPause` check.
---
 osu.Game/Screens/Play/Player.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index f38eba3f27..81401b08e8 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -160,7 +160,6 @@ namespace osu.Game.Screens.Play
             if (!Mods.Value.Any(m => m is ModAutoplay))
                 PrepareReplay();
 
-            // needs to be bound here as the last binding, otherwise cases like starting a replay while not focused causes player to exit, if activity is bound before checks.
             gameActive.BindTo(gameBase.IsActive);
             gameActive.BindValueChanged(_ => updatePauseOnFocusLostState(), true);
         }
@@ -267,8 +266,6 @@ namespace osu.Game.Screens.Play
 
             DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updateGameplayState());
 
-            DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updatePauseOnFocusLostState(), true);
-
             // bind clock into components that require it
             DrawableRuleset.IsPaused.BindTo(GameplayClockContainer.IsPaused);
 
@@ -431,7 +428,7 @@ namespace osu.Game.Screens.Play
 
         private void updatePauseOnFocusLostState()
         {
-            if (!PauseOnFocusLost || DrawableRuleset.HasReplayLoaded.Value || breakTracker.IsBreakTime.Value)
+            if (!PauseOnFocusLost || breakTracker.IsBreakTime.Value)
                 return;
 
             if (gameActive.Value == false)

From d0ca2b99a850f9903eec2f7ac1956e15a73089a2 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 6 Feb 2021 20:57:01 +0300
Subject: [PATCH 1351/3722] Remove unnecessary injected dependency

---
 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 81401b08e8..bd67d3f06a 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -178,7 +178,7 @@ namespace osu.Game.Screens.Play
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(AudioManager audio, OsuConfigManager config, OsuGame game, OsuGameBase gameBase)
+        private void load(AudioManager audio, OsuConfigManager config, OsuGame game)
         {
             Mods.Value = base.Mods.Value.Select(m => m.CreateCopy()).ToArray();
 

From 68c20a2a3705dcc0995303e83a4312164d9fd98d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 31 Jan 2021 17:19:07 +0100
Subject: [PATCH 1352/3722] Allow autoplay score generation to access mod list

---
 osu.Game.Rulesets.Catch/Mods/CatchModAutoplay.cs     |  3 ++-
 osu.Game.Rulesets.Catch/Mods/CatchModCinema.cs       |  3 ++-
 osu.Game.Rulesets.Mania/Mods/ManiaModAutoplay.cs     |  3 ++-
 osu.Game.Rulesets.Mania/Mods/ManiaModCinema.cs       |  3 ++-
 .../TestSceneMissHitWindowJudgements.cs              |  4 +++-
 osu.Game.Rulesets.Osu/Mods/OsuModAutoplay.cs         |  3 ++-
 osu.Game.Rulesets.Osu/Mods/OsuModCinema.cs           |  3 ++-
 osu.Game.Rulesets.Taiko/Mods/TaikoModAutoplay.cs     |  3 ++-
 osu.Game.Rulesets.Taiko/Mods/TaikoModCinema.cs       |  3 ++-
 osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs    |  2 +-
 osu.Game/Rulesets/Mods/ModAutoplay.cs                | 12 +++++++++++-
 osu.Game/Rulesets/Mods/ModCinema.cs                  |  4 +++-
 12 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModAutoplay.cs b/osu.Game.Rulesets.Catch/Mods/CatchModAutoplay.cs
index 692e63fa69..e1eceea606 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModAutoplay.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModAutoplay.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.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Replays;
@@ -12,7 +13,7 @@ namespace osu.Game.Rulesets.Catch.Mods
 {
     public class CatchModAutoplay : ModAutoplay<CatchHitObject>
     {
-        public override Score CreateReplayScore(IBeatmap beatmap) => new Score
+        public override Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => new Score
         {
             ScoreInfo = new ScoreInfo { User = new User { Username = "osu!salad!" } },
             Replay = new CatchAutoGenerator(beatmap).Generate(),
diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModCinema.cs b/osu.Game.Rulesets.Catch/Mods/CatchModCinema.cs
index 3bc1ee5bf5..d53d019e90 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModCinema.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModCinema.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.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Replays;
@@ -12,7 +13,7 @@ namespace osu.Game.Rulesets.Catch.Mods
 {
     public class CatchModCinema : ModCinema<CatchHitObject>
     {
-        public override Score CreateReplayScore(IBeatmap beatmap) => new Score
+        public override Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => new Score
         {
             ScoreInfo = new ScoreInfo { User = new User { Username = "osu!salad!" } },
             Replay = new CatchAutoGenerator(beatmap).Generate(),
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModAutoplay.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModAutoplay.cs
index c05e979e9a..105d88129c 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModAutoplay.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModAutoplay.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.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
@@ -13,7 +14,7 @@ namespace osu.Game.Rulesets.Mania.Mods
 {
     public class ManiaModAutoplay : ModAutoplay<ManiaHitObject>
     {
-        public override Score CreateReplayScore(IBeatmap beatmap) => new Score
+        public override Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => new Score
         {
             ScoreInfo = new ScoreInfo { User = new User { Username = "osu!topus!" } },
             Replay = new ManiaAutoGenerator((ManiaBeatmap)beatmap).Generate(),
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModCinema.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModCinema.cs
index 02c1fc1b79..064c55ed8d 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModCinema.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModCinema.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.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
@@ -13,7 +14,7 @@ namespace osu.Game.Rulesets.Mania.Mods
 {
     public class ManiaModCinema : ModCinema<ManiaHitObject>
     {
-        public override Score CreateReplayScore(IBeatmap beatmap) => new Score
+        public override Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => new Score
         {
             ScoreInfo = new ScoreInfo { User = new User { Username = "osu!topus!" } },
             Replay = new ManiaAutoGenerator((ManiaBeatmap)beatmap).Generate(),
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs
index 39deba2f57..f73649fcd9 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.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 System.Collections.Generic;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Replays;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Osu.Objects;
@@ -65,7 +67,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private class TestAutoMod : OsuModAutoplay
         {
-            public override Score CreateReplayScore(IBeatmap beatmap) => new Score
+            public override Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => new Score
             {
                 ScoreInfo = new ScoreInfo { User = new User { Username = "Autoplay" } },
                 Replay = new MissingAutoGenerator(beatmap).Generate()
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModAutoplay.cs b/osu.Game.Rulesets.Osu/Mods/OsuModAutoplay.cs
index bea2bbcb32..454c94cd96 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModAutoplay.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModAutoplay.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.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
@@ -16,7 +17,7 @@ namespace osu.Game.Rulesets.Osu.Mods
     {
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(OsuModAutopilot)).Append(typeof(OsuModSpunOut)).ToArray();
 
-        public override Score CreateReplayScore(IBeatmap beatmap) => new Score
+        public override Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => new Score
         {
             ScoreInfo = new ScoreInfo { User = new User { Username = "Autoplay" } },
             Replay = new OsuAutoGenerator(beatmap).Generate()
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModCinema.cs b/osu.Game.Rulesets.Osu/Mods/OsuModCinema.cs
index 5d9a524577..99e5568bb3 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModCinema.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModCinema.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.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
@@ -16,7 +17,7 @@ namespace osu.Game.Rulesets.Osu.Mods
     {
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(OsuModAutopilot)).Append(typeof(OsuModSpunOut)).ToArray();
 
-        public override Score CreateReplayScore(IBeatmap beatmap) => new Score
+        public override Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => new Score
         {
             ScoreInfo = new ScoreInfo { User = new User { Username = "Autoplay" } },
             Replay = new OsuAutoGenerator(beatmap).Generate()
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModAutoplay.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModAutoplay.cs
index 5b890b3d03..64e59b64d0 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModAutoplay.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModAutoplay.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.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Taiko.Objects;
@@ -12,7 +13,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
 {
     public class TaikoModAutoplay : ModAutoplay<TaikoHitObject>
     {
-        public override Score CreateReplayScore(IBeatmap beatmap) => new Score
+        public override Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => new Score
         {
             ScoreInfo = new ScoreInfo { User = new User { Username = "mekkadosu!" } },
             Replay = new TaikoAutoGenerator(beatmap).Generate(),
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModCinema.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModCinema.cs
index 71aa007d3b..00f0c8e321 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModCinema.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModCinema.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.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Taiko.Objects;
@@ -12,7 +13,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
 {
     public class TaikoModCinema : ModCinema<TaikoHitObject>
     {
-        public override Score CreateReplayScore(IBeatmap beatmap) => new Score
+        public override Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => new Score
         {
             ScoreInfo = new ScoreInfo { User = new User { Username = "mekkadosu!" } },
             Replay = new TaikoAutoGenerator(beatmap).Generate(),
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs
index 3a71d4ca54..f94e122b30 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             var beatmap = Beatmap.Value.GetPlayableBeatmap(ruleset.RulesetInfo, Array.Empty<Mod>());
 
-            return new ScoreAccessibleReplayPlayer(ruleset.GetAutoplayMod()?.CreateReplayScore(beatmap));
+            return new ScoreAccessibleReplayPlayer(ruleset.GetAutoplayMod()?.CreateReplayScore(beatmap, Array.Empty<Mod>()));
         }
 
         protected override void AddCheckSteps()
diff --git a/osu.Game/Rulesets/Mods/ModAutoplay.cs b/osu.Game/Rulesets/Mods/ModAutoplay.cs
index 945dd444be..748c7272f4 100644
--- a/osu.Game/Rulesets/Mods/ModAutoplay.cs
+++ b/osu.Game/Rulesets/Mods/ModAutoplay.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.Graphics.Sprites;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
@@ -15,7 +16,11 @@ namespace osu.Game.Rulesets.Mods
     public abstract class ModAutoplay<T> : ModAutoplay, IApplicableToDrawableRuleset<T>
         where T : HitObject
     {
-        public virtual void ApplyToDrawableRuleset(DrawableRuleset<T> drawableRuleset) => drawableRuleset.SetReplayScore(CreateReplayScore(drawableRuleset.Beatmap));
+        public virtual void ApplyToDrawableRuleset(DrawableRuleset<T> drawableRuleset)
+        {
+            var mods = (IReadOnlyList<Mod>)drawableRuleset.Dependencies.Get(typeof(IReadOnlyList<Mod>));
+            drawableRuleset.SetReplayScore(CreateReplayScore(drawableRuleset.Beatmap, mods));
+        }
     }
 
     public abstract class ModAutoplay : Mod, IApplicableFailOverride
@@ -35,6 +40,11 @@ namespace osu.Game.Rulesets.Mods
 
         public override bool HasImplementation => GetType().GenericTypeArguments.Length == 0;
 
+        [Obsolete("Use the mod-supporting override")] // can be removed 20210731
         public virtual Score CreateReplayScore(IBeatmap beatmap) => new Score { Replay = new Replay() };
+
+#pragma warning disable 618
+        public virtual Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => CreateReplayScore(beatmap);
+#pragma warning restore 618
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModCinema.cs b/osu.Game/Rulesets/Mods/ModCinema.cs
index bee9e56edd..16e6400f23 100644
--- a/osu.Game/Rulesets/Mods/ModCinema.cs
+++ b/osu.Game/Rulesets/Mods/ModCinema.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.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects;
@@ -14,7 +15,8 @@ namespace osu.Game.Rulesets.Mods
     {
         public virtual void ApplyToDrawableRuleset(DrawableRuleset<T> drawableRuleset)
         {
-            drawableRuleset.SetReplayScore(CreateReplayScore(drawableRuleset.Beatmap));
+            var mods = (IReadOnlyList<Mod>)drawableRuleset.Dependencies.Get(typeof(IReadOnlyList<Mod>));
+            drawableRuleset.SetReplayScore(CreateReplayScore(drawableRuleset.Beatmap, mods));
 
             // AlwaysPresent required for hitsounds
             drawableRuleset.Playfield.AlwaysPresent = true;

From 7daeacaff230b58a13847db3727918cf7da38d02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 31 Jan 2021 17:43:16 +0100
Subject: [PATCH 1353/3722] Add and implement IApplicableToRate interface

---
 osu.Game/Rulesets/Mods/IApplicableToRate.cs | 20 ++++++++++++++++++++
 osu.Game/Rulesets/Mods/ModRateAdjust.cs     |  4 +++-
 osu.Game/Rulesets/Mods/ModTimeRamp.cs       | 19 ++++++++++++-------
 3 files changed, 35 insertions(+), 8 deletions(-)
 create mode 100644 osu.Game/Rulesets/Mods/IApplicableToRate.cs

diff --git a/osu.Game/Rulesets/Mods/IApplicableToRate.cs b/osu.Game/Rulesets/Mods/IApplicableToRate.cs
new file mode 100644
index 0000000000..f613867132
--- /dev/null
+++ b/osu.Game/Rulesets/Mods/IApplicableToRate.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.
+
+namespace osu.Game.Rulesets.Mods
+{
+    /// <summary>
+    /// Interface that should be implemented by mods that affect the track playback speed,
+    /// and in turn, values of the track rate.
+    /// </summary>
+    public interface IApplicableToRate : IApplicableToAudio
+    {
+        /// <summary>
+        /// Returns the playback rate at <paramref name="time"/> after this mod is applied.
+        /// </summary>
+        /// <param name="time">The time instant at which the playback rate is queried.</param>
+        /// <param name="rate">The playback rate before applying this mod.</param>
+        /// <returns>The playback rate after applying this mod.</returns>
+        double ApplyToRate(double time, double rate = 1);
+    }
+}
diff --git a/osu.Game/Rulesets/Mods/ModRateAdjust.cs b/osu.Game/Rulesets/Mods/ModRateAdjust.cs
index 2150b0fb68..b016a6d43b 100644
--- a/osu.Game/Rulesets/Mods/ModRateAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModRateAdjust.cs
@@ -8,7 +8,7 @@ using osu.Framework.Graphics.Audio;
 
 namespace osu.Game.Rulesets.Mods
 {
-    public abstract class ModRateAdjust : Mod, IApplicableToAudio
+    public abstract class ModRateAdjust : Mod, IApplicableToRate
     {
         public abstract BindableNumber<double> SpeedChange { get; }
 
@@ -22,6 +22,8 @@ namespace osu.Game.Rulesets.Mods
             sample.AddAdjustment(AdjustableProperty.Frequency, SpeedChange);
         }
 
+        public double ApplyToRate(double time, double rate) => rate * SpeedChange.Value;
+
         public override string SettingDescription => SpeedChange.IsDefault ? string.Empty : $"{SpeedChange.Value:N2}x";
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index b6916c838e..7e801c3024 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -14,7 +14,7 @@ using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Mods
 {
-    public abstract class ModTimeRamp : Mod, IUpdatableByPlayfield, IApplicableToBeatmap, IApplicableToAudio
+    public abstract class ModTimeRamp : Mod, IUpdatableByPlayfield, IApplicableToBeatmap, IApplicableToRate
     {
         /// <summary>
         /// The point in the beatmap at which the final ramping rate should be reached.
@@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Mods
         protected ModTimeRamp()
         {
             // for preview purpose at song select. eventually we'll want to be able to update every frame.
-            FinalRate.BindValueChanged(val => applyRateAdjustment(1), true);
+            FinalRate.BindValueChanged(val => applyRateAdjustment(double.PositiveInfinity), true);
             AdjustPitch.BindValueChanged(applyPitchAdjustment);
         }
 
@@ -75,17 +75,22 @@ namespace osu.Game.Rulesets.Mods
             finalRateTime = firstObjectStart + FINAL_RATE_PROGRESS * (lastObjectEnd - firstObjectStart);
         }
 
+        public double ApplyToRate(double time, double rate = 1)
+        {
+            double amount = (time - beginRampTime) / Math.Max(1, finalRateTime - beginRampTime);
+            double ramp = InitialRate.Value + (FinalRate.Value - InitialRate.Value) * Math.Clamp(amount, 0, 1);
+            return rate * ramp;
+        }
+
         public virtual void Update(Playfield playfield)
         {
-            applyRateAdjustment((track.CurrentTime - beginRampTime) / Math.Max(1, finalRateTime - beginRampTime));
+            applyRateAdjustment(track.CurrentTime);
         }
 
         /// <summary>
-        /// Adjust the rate along the specified ramp
+        /// Adjust the rate along the specified ramp.
         /// </summary>
-        /// <param name="amount">The amount of adjustment to apply (from 0..1).</param>
-        private void applyRateAdjustment(double amount) =>
-            SpeedChange.Value = InitialRate.Value + (FinalRate.Value - InitialRate.Value) * Math.Clamp(amount, 0, 1);
+        private void applyRateAdjustment(double time) => SpeedChange.Value = ApplyToRate(time);
 
         private void applyPitchAdjustment(ValueChangedEvent<bool> adjustPitchSetting)
         {

From 3fabe247b09a32ccf1fb6a652356875ce1c63b43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 31 Jan 2021 17:59:35 +0100
Subject: [PATCH 1354/3722] Allow OsuModGenerator to accept a mod list

---
 .../TestSceneMissHitWindowJudgements.cs                     | 6 +++---
 osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs               | 3 ++-
 osu.Game.Rulesets.Osu/Mods/OsuModAutoplay.cs                | 2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModCinema.cs                  | 2 +-
 osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs           | 6 ++++--
 osu.Game.Rulesets.Osu/Replays/OsuAutoGeneratorBase.cs       | 3 ++-
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs
index f73649fcd9..af67ab5839 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             public override Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => new Score
             {
                 ScoreInfo = new ScoreInfo { User = new User { Username = "Autoplay" } },
-                Replay = new MissingAutoGenerator(beatmap).Generate()
+                Replay = new MissingAutoGenerator(beatmap, mods).Generate()
             };
         }
 
@@ -78,8 +78,8 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             public new OsuBeatmap Beatmap => (OsuBeatmap)base.Beatmap;
 
-            public MissingAutoGenerator(IBeatmap beatmap)
-                : base(beatmap)
+            public MissingAutoGenerator(IBeatmap beatmap, IReadOnlyList<Mod> mods)
+                : base(beatmap, mods)
             {
             }
 
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs b/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
index 8c819c4773..59a5295858 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
@@ -62,7 +62,8 @@ namespace osu.Game.Rulesets.Osu.Mods
             inputManager.AllowUserCursorMovement = false;
 
             // Generate the replay frames the cursor should follow
-            replayFrames = new OsuAutoGenerator(drawableRuleset.Beatmap).Generate().Frames.Cast<OsuReplayFrame>().ToList();
+            var mods = (IReadOnlyList<Mod>)drawableRuleset.Dependencies.Get(typeof(IReadOnlyList<Mod>));
+            replayFrames = new OsuAutoGenerator(drawableRuleset.Beatmap, mods).Generate().Frames.Cast<OsuReplayFrame>().ToList();
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModAutoplay.cs b/osu.Game.Rulesets.Osu/Mods/OsuModAutoplay.cs
index 454c94cd96..3b1f271d41 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModAutoplay.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModAutoplay.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => new Score
         {
             ScoreInfo = new ScoreInfo { User = new User { Username = "Autoplay" } },
-            Replay = new OsuAutoGenerator(beatmap).Generate()
+            Replay = new OsuAutoGenerator(beatmap, mods).Generate()
         };
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModCinema.cs b/osu.Game.Rulesets.Osu/Mods/OsuModCinema.cs
index 99e5568bb3..df06988b70 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModCinema.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModCinema.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => new Score
         {
             ScoreInfo = new ScoreInfo { User = new User { Username = "Autoplay" } },
-            Replay = new OsuAutoGenerator(beatmap).Generate()
+            Replay = new OsuAutoGenerator(beatmap, mods).Generate()
         };
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs b/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
index 954a217473..e4b6f6425d 100644
--- a/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
+++ b/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
@@ -6,10 +6,12 @@ using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Osu.Objects;
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Graphics;
 using osu.Game.Replays;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Rulesets.Osu.Scoring;
@@ -49,8 +51,8 @@ namespace osu.Game.Rulesets.Osu.Replays
 
         #region Construction / Initialisation
 
-        public OsuAutoGenerator(IBeatmap beatmap)
-            : base(beatmap)
+        public OsuAutoGenerator(IBeatmap beatmap, IReadOnlyList<Mod> mods)
+            : base(beatmap, mods)
         {
             // Already superhuman, but still somewhat realistic
             reactionTime = ApplyModsToRate(100);
diff --git a/osu.Game.Rulesets.Osu/Replays/OsuAutoGeneratorBase.cs b/osu.Game.Rulesets.Osu/Replays/OsuAutoGeneratorBase.cs
index 3356a0fbe0..f88594a3ee 100644
--- a/osu.Game.Rulesets.Osu/Replays/OsuAutoGeneratorBase.cs
+++ b/osu.Game.Rulesets.Osu/Replays/OsuAutoGeneratorBase.cs
@@ -6,6 +6,7 @@ using osu.Game.Beatmaps;
 using System;
 using System.Collections.Generic;
 using osu.Game.Replays;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.Replays;
 
@@ -34,7 +35,7 @@ namespace osu.Game.Rulesets.Osu.Replays
         protected Replay Replay;
         protected List<ReplayFrame> Frames => Replay.Frames;
 
-        protected OsuAutoGeneratorBase(IBeatmap beatmap)
+        protected OsuAutoGeneratorBase(IBeatmap beatmap, IReadOnlyList<Mod> mods)
             : base(beatmap)
         {
             Replay = new Replay();

From 0e1ec703d33907268dbb2acc49f3e8e19318ae2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 31 Jan 2021 17:56:03 +0100
Subject: [PATCH 1355/3722] Use IApplicableToRate in osu! auto generator

---
 .../Replays/OsuAutoGenerator.cs               | 42 ++++++++++-------
 .../Replays/OsuAutoGeneratorBase.cs           | 47 +++++++++++++++----
 2 files changed, 62 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs b/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
index e4b6f6425d..693943a08a 100644
--- a/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
+++ b/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
@@ -35,11 +35,6 @@ namespace osu.Game.Rulesets.Osu.Replays
 
         #region Constants
 
-        /// <summary>
-        /// The "reaction time" in ms between "seeing" a new hit object and moving to "react" to it.
-        /// </summary>
-        private readonly double reactionTime;
-
         private readonly HitWindows defaultHitWindows;
 
         /// <summary>
@@ -54,9 +49,6 @@ namespace osu.Game.Rulesets.Osu.Replays
         public OsuAutoGenerator(IBeatmap beatmap, IReadOnlyList<Mod> mods)
             : base(beatmap, mods)
         {
-            // Already superhuman, but still somewhat realistic
-            reactionTime = ApplyModsToRate(100);
-
             defaultHitWindows = new OsuHitWindows();
             defaultHitWindows.SetDifficulty(Beatmap.BeatmapInfo.BaseDifficulty.OverallDifficulty);
         }
@@ -242,7 +234,7 @@ namespace osu.Game.Rulesets.Osu.Replays
             OsuReplayFrame lastFrame = (OsuReplayFrame)Frames[^1];
 
             // Wait until Auto could "see and react" to the next note.
-            double waitTime = h.StartTime - Math.Max(0.0, h.TimePreempt - reactionTime);
+            double waitTime = h.StartTime - Math.Max(0.0, h.TimePreempt - getReactionTime(h.StartTime - h.TimePreempt));
 
             if (waitTime > lastFrame.Time)
             {
@@ -252,7 +244,7 @@ namespace osu.Game.Rulesets.Osu.Replays
 
             Vector2 lastPosition = lastFrame.Position;
 
-            double timeDifference = ApplyModsToTime(h.StartTime - lastFrame.Time);
+            double timeDifference = ApplyModsToTimeDelta(lastFrame.Time, h.StartTime);
 
             // Only "snap" to hitcircles if they are far enough apart. As the time between hitcircles gets shorter the snapping threshold goes up.
             if (timeDifference > 0 && // Sanity checks
@@ -260,7 +252,7 @@ namespace osu.Game.Rulesets.Osu.Replays
                  timeDifference >= 266)) // ... or the beats are slow enough to tap anyway.
             {
                 // Perform eased movement
-                for (double time = lastFrame.Time + FrameDelay; time < h.StartTime; time += FrameDelay)
+                for (double time = lastFrame.Time + GetFrameDelay(lastFrame.Time); time < h.StartTime; time += GetFrameDelay(time))
                 {
                     Vector2 currentPosition = Interpolation.ValueAt(time, lastPosition, targetPos, lastFrame.Time, h.StartTime, easing);
                     AddFrameToReplay(new OsuReplayFrame((int)time, new Vector2(currentPosition.X, currentPosition.Y)) { Actions = lastFrame.Actions });
@@ -274,6 +266,14 @@ namespace osu.Game.Rulesets.Osu.Replays
             }
         }
 
+        /// <summary>
+        /// Calculates the "reaction time" in ms between "seeing" a new hit object and moving to "react" to it.
+        /// </summary>
+        /// <remarks>
+        /// Already superhuman, but still somewhat realistic.
+        /// </remarks>
+        private double getReactionTime(double timeInstant) => ApplyModsToRate(timeInstant, 100);
+
         // Add frames to click the hitobject
         private void addHitObjectClickFrames(OsuHitObject h, Vector2 startPosition, float spinnerDirection)
         {
@@ -343,17 +343,23 @@ namespace osu.Game.Rulesets.Osu.Replays
                     float angle = radius == 0 ? 0 : MathF.Atan2(difference.Y, difference.X);
 
                     double t;
+                    double previousFrame = h.StartTime;
 
-                    for (double j = h.StartTime + FrameDelay; j < spinner.EndTime; j += FrameDelay)
+                    for (double nextFrame = h.StartTime + GetFrameDelay(h.StartTime); nextFrame < spinner.EndTime; nextFrame += GetFrameDelay(nextFrame))
                     {
-                        t = ApplyModsToTime(j - h.StartTime) * spinnerDirection;
+                        t = ApplyModsToTimeDelta(previousFrame, nextFrame) * spinnerDirection;
+                        angle += (float)t / 20;
 
-                        Vector2 pos = SPINNER_CENTRE + CirclePosition(t / 20 + angle, SPIN_RADIUS);
-                        AddFrameToReplay(new OsuReplayFrame((int)j, new Vector2(pos.X, pos.Y), action));
+                        Vector2 pos = SPINNER_CENTRE + CirclePosition(angle, SPIN_RADIUS);
+                        AddFrameToReplay(new OsuReplayFrame((int)nextFrame, new Vector2(pos.X, pos.Y), action));
+
+                        previousFrame = nextFrame;
                     }
 
-                    t = ApplyModsToTime(spinner.EndTime - h.StartTime) * spinnerDirection;
-                    Vector2 endPosition = SPINNER_CENTRE + CirclePosition(t / 20 + angle, SPIN_RADIUS);
+                    t = ApplyModsToTimeDelta(previousFrame, spinner.EndTime) * spinnerDirection;
+                    angle += (float)t / 20;
+
+                    Vector2 endPosition = SPINNER_CENTRE + CirclePosition(angle, SPIN_RADIUS);
 
                     AddFrameToReplay(new OsuReplayFrame(spinner.EndTime, new Vector2(endPosition.X, endPosition.Y), action));
 
@@ -361,7 +367,7 @@ namespace osu.Game.Rulesets.Osu.Replays
                     break;
 
                 case Slider slider:
-                    for (double j = FrameDelay; j < slider.Duration; j += FrameDelay)
+                    for (double j = GetFrameDelay(slider.StartTime); j < slider.Duration; j += GetFrameDelay(slider.StartTime + j))
                     {
                         Vector2 pos = slider.StackedPositionAt(j / slider.Duration);
                         AddFrameToReplay(new OsuReplayFrame(h.StartTime + j, new Vector2(pos.X, pos.Y), action));
diff --git a/osu.Game.Rulesets.Osu/Replays/OsuAutoGeneratorBase.cs b/osu.Game.Rulesets.Osu/Replays/OsuAutoGeneratorBase.cs
index f88594a3ee..1cb3208c30 100644
--- a/osu.Game.Rulesets.Osu/Replays/OsuAutoGeneratorBase.cs
+++ b/osu.Game.Rulesets.Osu/Replays/OsuAutoGeneratorBase.cs
@@ -5,6 +5,7 @@ using osuTK;
 using osu.Game.Beatmaps;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.UI;
@@ -23,33 +24,61 @@ namespace osu.Game.Rulesets.Osu.Replays
 
         public const float SPIN_RADIUS = 50;
 
-        /// <summary>
-        /// The time in ms between each ReplayFrame.
-        /// </summary>
-        protected readonly double FrameDelay;
-
         #endregion
 
         #region Construction / Initialisation
 
         protected Replay Replay;
         protected List<ReplayFrame> Frames => Replay.Frames;
+        private readonly IReadOnlyList<IApplicableToRate> timeAffectingMods;
 
         protected OsuAutoGeneratorBase(IBeatmap beatmap, IReadOnlyList<Mod> mods)
             : base(beatmap)
         {
             Replay = new Replay();
 
-            // We are using ApplyModsToRate and not ApplyModsToTime to counteract the speed up / slow down from HalfTime / DoubleTime so that we remain at a constant framerate of 60 fps.
-            FrameDelay = ApplyModsToRate(1000.0 / 60.0);
+            timeAffectingMods = mods.OfType<IApplicableToRate>().ToList();
         }
 
         #endregion
 
         #region Utilities
 
-        protected double ApplyModsToTime(double v) => v;
-        protected double ApplyModsToRate(double v) => v;
+        /// <summary>
+        /// Returns the real duration of time between <paramref name="startTime"/> and <paramref name="endTime"/>
+        /// after applying rate-affecting mods.
+        /// </summary>
+        /// <remarks>
+        /// This method should only be used when <paramref name="startTime"/> and <paramref name="endTime"/> are very close.
+        /// That is because the track rate might be changing with time,
+        /// and the method used here is a rough instantaneous approximation.
+        /// </remarks>
+        /// <param name="startTime">The start time of the time delta, in original track time.</param>
+        /// <param name="endTime">The end time of the time delta, in original track time.</param>
+        protected double ApplyModsToTimeDelta(double startTime, double endTime)
+        {
+            double delta = endTime - startTime;
+
+            foreach (var mod in timeAffectingMods)
+                delta /= mod.ApplyToRate(startTime);
+
+            return delta;
+        }
+
+        protected double ApplyModsToRate(double time, double rate)
+        {
+            foreach (var mod in timeAffectingMods)
+                rate = mod.ApplyToRate(time, rate);
+            return rate;
+        }
+
+        /// <summary>
+        /// Calculates the interval after which the next <see cref="ReplayFrame"/> should be generated,
+        /// in milliseconds.
+        /// </summary>
+        /// <param name="time">The time of the previous frame.</param>
+        protected double GetFrameDelay(double time)
+            => ApplyModsToRate(time, 1000.0 / 60);
 
         private class ReplayFrameComparer : IComparer<ReplayFrame>
         {

From 0229851c9ca93570e68dbe056cc15d20099b1cea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 7 Feb 2021 19:02:09 +0100
Subject: [PATCH 1356/3722] Apply rounding to ModTimeRamp to improve SPM
 consistency

---
 osu.Game/Rulesets/Mods/ModTimeRamp.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index 7e801c3024..330945d3d3 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -79,7 +79,9 @@ namespace osu.Game.Rulesets.Mods
         {
             double amount = (time - beginRampTime) / Math.Max(1, finalRateTime - beginRampTime);
             double ramp = InitialRate.Value + (FinalRate.Value - InitialRate.Value) * Math.Clamp(amount, 0, 1);
-            return rate * ramp;
+
+            // round the end result to match the bindable SpeedChange's precision, in case this is called externally.
+            return rate * Math.Round(ramp, 2);
         }
 
         public virtual void Update(Playfield playfield)

From 0df15b4d7a4361368d1504ec18695902b9969d82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 7 Feb 2021 19:25:33 +0100
Subject: [PATCH 1357/3722] Add test coverage

---
 .../Mods/TestSceneOsuModAutoplay.cs           | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs
new file mode 100644
index 0000000000..856b6554b9
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.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.Linq;
+using NUnit.Framework;
+using osu.Framework.Testing;
+using osu.Framework.Utils;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mods;
+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;
+
+namespace osu.Game.Rulesets.Osu.Tests.Mods
+{
+    public class TestSceneOsuModAutoplay : OsuModTestScene
+    {
+        [Test]
+        public void TestSpmUnaffectedByRateAdjust()
+            => runSpmTest(new OsuModDaycore
+            {
+                SpeedChange = { Value = 0.88 }
+            });
+
+        [Test]
+        public void TestSpmUnaffectedByTimeRamp()
+            => runSpmTest(new ModWindUp
+            {
+                InitialRate = { Value = 0.7 },
+                FinalRate = { Value = 1.3 }
+            });
+
+        private void runSpmTest(Mod mod)
+        {
+            SpinnerSpmCounter spmCounter = null;
+
+            CreateModTest(new ModTestData
+            {
+                Autoplay = true,
+                Mod = mod,
+                Beatmap = new Beatmap
+                {
+                    HitObjects =
+                    {
+                        new Spinner
+                        {
+                            Duration = 2000,
+                            Position = OsuPlayfield.BASE_SIZE / 2
+                        }
+                    }
+                },
+                PassCondition = () => Player.ScoreProcessor.JudgedHits >= 1
+            });
+
+            AddUntilStep("fetch SPM counter", () =>
+            {
+                spmCounter = this.ChildrenOfType<SpinnerSpmCounter>().SingleOrDefault();
+                return spmCounter != null;
+            });
+
+            AddUntilStep("SPM is correct", () => Precision.AlmostEquals(spmCounter.SpinsPerMinute, 477, 5));
+        }
+    }
+}

From d74a1437beddf07f471254588a4609130a361cd2 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 7 Feb 2021 15:14:08 -0800
Subject: [PATCH 1358/3722] Fix player loader metadata not being centred

---
 .../Screens/Play/BeatmapMetadataDisplay.cs    | 78 +++++++++++--------
 1 file changed, 46 insertions(+), 32 deletions(-)

diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index b53141e8fb..eff06e26ee 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -23,32 +23,6 @@ namespace osu.Game.Screens.Play
     /// </summary>
     public class BeatmapMetadataDisplay : Container
     {
-        private class MetadataLine : Container
-        {
-            public MetadataLine(string left, string right)
-            {
-                AutoSizeAxes = Axes.Both;
-                Children = new Drawable[]
-                {
-                    new OsuSpriteText
-                    {
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.TopRight,
-                        Margin = new MarginPadding { Right = 5 },
-                        Colour = OsuColour.Gray(0.8f),
-                        Text = left,
-                    },
-                    new OsuSpriteText
-                    {
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.TopLeft,
-                        Margin = new MarginPadding { Left = 5 },
-                        Text = string.IsNullOrEmpty(right) ? @"-" : right,
-                    }
-                };
-            }
-        }
-
         private readonly WorkingBeatmap beatmap;
         private readonly Bindable<IReadOnlyList<Mod>> mods;
         private readonly Drawable facade;
@@ -144,15 +118,34 @@ namespace osu.Game.Screens.Play
                                 Bottom = 40
                             },
                         },
-                        new MetadataLine("Source", metadata.Source)
+                        new GridContainer
                         {
-                            Origin = Anchor.TopCentre,
                             Anchor = Anchor.TopCentre,
-                        },
-                        new MetadataLine("Mapper", metadata.AuthorString)
-                        {
                             Origin = Anchor.TopCentre,
-                            Anchor = Anchor.TopCentre,
+                            AutoSizeAxes = Axes.Both,
+                            RowDimensions = new[]
+                            {
+                                new Dimension(GridSizeMode.AutoSize),
+                                new Dimension(GridSizeMode.AutoSize),
+                            },
+                            ColumnDimensions = new[]
+                            {
+                                new Dimension(GridSizeMode.AutoSize),
+                                new Dimension(GridSizeMode.AutoSize),
+                            },
+                            Content = new[]
+                            {
+                                new Drawable[]
+                                {
+                                    new MetadataLineLabel("Source"),
+                                    new MetadataLineInfo(metadata.Source)
+                                },
+                                new Drawable[]
+                                {
+                                    new MetadataLineLabel("Mapper"),
+                                    new MetadataLineInfo(metadata.AuthorString)
+                                }
+                            }
                         },
                         new ModDisplay
                         {
@@ -168,5 +161,26 @@ namespace osu.Game.Screens.Play
 
             Loading = true;
         }
+
+        private class MetadataLineLabel : OsuSpriteText
+        {
+            public MetadataLineLabel(string text)
+            {
+                Anchor = Anchor.TopRight;
+                Origin = Anchor.TopRight;
+                Margin = new MarginPadding { Right = 5 };
+                Colour = OsuColour.Gray(0.8f);
+                Text = text;
+            }
+        }
+
+        private class MetadataLineInfo : OsuSpriteText
+        {
+            public MetadataLineInfo(string text)
+            {
+                Margin = new MarginPadding { Left = 5 };
+                Text = string.IsNullOrEmpty(text) ? @"-" : text;
+            }
+        }
     }
 }

From 2218247b21d09a8317ae84dd4dffa1bbf7a744c0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 8 Feb 2021 11:07:50 +0900
Subject: [PATCH 1359/3722] Override mod type

---
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index 8cd6676f9d..863dc05216 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public override bool Ranked => false;
 
+        public override ModType Type => ModType.Conversion;
+
         [SettingSource("Disable slider head judgement", "Scores sliders proportionally to the number of ticks hit.")]
         public Bindable<bool> DisableSliderHeadJudgement { get; } = new BindableBool(true);
 

From d955200e0718db14fa4b5ea13e6355e5b7134983 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 8 Feb 2021 11:10:07 +0900
Subject: [PATCH 1360/3722] Prevent invalid hit results for ignored slider
 heads

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

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index ee1df00ef7..87cfa47091 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             // If not judged as a normal hitcircle, only track whether a hit has occurred (via IgnoreHit) rather than a scorable hit result.
             var result = base.ResultFor(timeOffset);
-            return result.IsHit() ? HitResult.IgnoreHit : result;
+            return result.IsHit() ? HitResult.IgnoreHit : HitResult.IgnoreMiss;
         }
 
         public Action<double> OnShake;

From 9e0724b138fd4c251dc61e5daa3e702dd2a77cee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 Feb 2021 15:58:41 +0900
Subject: [PATCH 1361/3722] Remove unnecessary double resolution of OsuGame

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index bd67d3f06a..669fa93298 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -80,9 +80,6 @@ namespace osu.Game.Screens.Play
 
         public int RestartCount;
 
-        [Resolved]
-        private OsuGameBase gameBase { get; set; }
-
         [Resolved]
         private ScoreManager scoreManager { get; set; }
 
@@ -160,7 +157,6 @@ namespace osu.Game.Screens.Play
             if (!Mods.Value.Any(m => m is ModAutoplay))
                 PrepareReplay();
 
-            gameActive.BindTo(gameBase.IsActive);
             gameActive.BindValueChanged(_ => updatePauseOnFocusLostState(), true);
         }
 
@@ -195,7 +191,10 @@ namespace osu.Game.Screens.Play
             mouseWheelDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableWheel);
 
             if (game != null)
+            {
                 LocalUserPlaying.BindTo(game.LocalUserPlaying);
+                gameActive.BindTo(game.IsActive);
+            }
 
             DrawableRuleset = ruleset.CreateDrawableRulesetWith(playableBeatmap, Mods.Value);
 

From 10142a44716882a4671d4cae2391a96348bd90ba Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 Feb 2021 16:59:21 +0900
Subject: [PATCH 1362/3722] Disable failing test temporarily pending resolution

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

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs
index 2f7e59f800..1d13c6229c 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs
@@ -143,6 +143,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         /// Tests that the same <see cref="Mod"/> instances are not shared between two playlist items.
         /// </summary>
         [Test]
+        [Ignore("Temporarily disabled due to a non-trivial test failure")]
         public void TestNewItemHasNewModInstances()
         {
             AddStep("set dt mod", () => SelectedMods.Value = new[] { new OsuModDoubleTime() });

From 42c169054afa0b0aaf6e84002d4f05fd80e63e17 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 Feb 2021 17:46:34 +0900
Subject: [PATCH 1363/3722] Revert "Disable failing test temporarily pending
 resolution"

This reverts commit 10142a44716882a4671d4cae2391a96348bd90ba.
---
 .../Visual/Multiplayer/TestScenePlaylistsSongSelect.cs           | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs
index 1d13c6229c..2f7e59f800 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs
@@ -143,7 +143,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
         /// Tests that the same <see cref="Mod"/> instances are not shared between two playlist items.
         /// </summary>
         [Test]
-        [Ignore("Temporarily disabled due to a non-trivial test failure")]
         public void TestNewItemHasNewModInstances()
         {
             AddStep("set dt mod", () => SelectedMods.Value = new[] { new OsuModDoubleTime() });

From fb8e31a30385636856e20ebdeb67d76ac6d815c8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 8 Feb 2021 17:51:57 +0900
Subject: [PATCH 1364/3722] Fix incorrect connection building due to bad merges

---
 .../Online/Multiplayer/MultiplayerClient.cs   | 31 ++++++++-----------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 1b966ae1dc..6908795510 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -71,20 +71,6 @@ namespace osu.Game.Online.Multiplayer
             if (!await connectionLock.WaitAsync(10000))
                 throw new TimeoutException("Could not obtain a lock to connect. A previous attempt is likely stuck.");
 
-            var builder = new HubConnectionBuilder()
-                .WithUrl(endpoint, options => { options.Headers.Add("Authorization", $"Bearer {api.AccessToken}"); });
-
-            if (RuntimeInfo.SupportsJIT)
-                builder.AddMessagePackProtocol();
-            else
-            {
-                // eventually we will precompile resolvers for messagepack, but this isn't working currently
-                // see https://github.com/neuecc/MessagePack-CSharp/issues/780#issuecomment-768794308.
-                builder.AddNewtonsoftJsonProtocol(options => { options.PayloadSerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; });
-            }
-
-            connection = builder.Build();
-
             try
             {
                 while (api.State.Value == APIState.Online)
@@ -235,10 +221,19 @@ namespace osu.Game.Online.Multiplayer
 
         private HubConnection createConnection(CancellationToken cancellationToken)
         {
-            var newConnection = new HubConnectionBuilder()
-                                .WithUrl(endpoint, options => { options.Headers.Add("Authorization", $"Bearer {api.AccessToken}"); })
-                                .AddNewtonsoftJsonProtocol(options => { options.PayloadSerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; })
-                                .Build();
+            var builder = new HubConnectionBuilder()
+                .WithUrl(endpoint, options => { options.Headers.Add("Authorization", $"Bearer {api.AccessToken}"); });
+
+            if (RuntimeInfo.SupportsJIT)
+                builder.AddMessagePackProtocol();
+            else
+            {
+                // eventually we will precompile resolvers for messagepack, but this isn't working currently
+                // see https://github.com/neuecc/MessagePack-CSharp/issues/780#issuecomment-768794308.
+                builder.AddNewtonsoftJsonProtocol(options => { options.PayloadSerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; });
+            }
+
+            var newConnection = builder.Build();
 
             // this is kind of SILLY
             // https://github.com/dotnet/aspnetcore/issues/15198

From 6b26a18a23162e784fad3c941ace78fa557bf7d4 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 8 Feb 2021 01:34:32 -0800
Subject: [PATCH 1365/3722] Fix attributes header not being aligned with
 content in editor timing mode

---
 osu.Game/Screens/Edit/Timing/ControlPointTable.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index e4b9150df1..81b006e6c8 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -74,7 +74,8 @@ namespace osu.Game.Screens.Edit.Timing
             {
                 new TableColumn(string.Empty, Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
                 new TableColumn("Time", Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
-                new TableColumn("Attributes", Anchor.Centre),
+                new TableColumn(),
+                new TableColumn("Attributes", Anchor.CentreLeft),
             };
 
             return columns.ToArray();
@@ -93,6 +94,7 @@ namespace osu.Game.Screens.Edit.Timing
                 Text = group.Time.ToEditorFormattedString(),
                 Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold)
             },
+            null,
             new ControlGroupAttributes(group),
         };
 
@@ -108,7 +110,6 @@ namespace osu.Game.Screens.Edit.Timing
                 {
                     RelativeSizeAxes = Axes.Both,
                     Direction = FillDirection.Horizontal,
-                    Padding = new MarginPadding(10),
                     Spacing = new Vector2(2)
                 };
 

From 5e7823b289a607731f253ec342c24fa9fcde7143 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 8 Feb 2021 01:37:34 -0800
Subject: [PATCH 1366/3722] Fix attributes content being zero size and
 disappearing after being half off-screen

---
 osu.Game/Screens/Edit/Timing/ControlPointTable.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index 81b006e6c8..8980c2019a 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -106,6 +106,7 @@ namespace osu.Game.Screens.Edit.Timing
 
             public ControlGroupAttributes(ControlPointGroup group)
             {
+                RelativeSizeAxes = Axes.Both;
                 InternalChild = fill = new FillFlowContainer
                 {
                     RelativeSizeAxes = Axes.Both,

From b40b159acb276d35bc553a597bc58980f3d3c1dd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 8 Feb 2021 18:52:50 +0900
Subject: [PATCH 1367/3722] Round beatlength

---
 osu.Game/Beatmaps/Beatmap.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/Beatmap.cs b/osu.Game/Beatmaps/Beatmap.cs
index 51fdbce96d..434bff14b5 100644
--- a/osu.Game/Beatmaps/Beatmap.cs
+++ b/osu.Game/Beatmaps/Beatmap.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.Timing;
 using osu.Game.Rulesets.Objects;
 using System.Collections.Generic;
@@ -65,7 +66,7 @@ namespace osu.Game.Beatmaps
                                     return (beatLength: t.BeatLength, duration: nextTime - t.Time);
                                 })
                                 // Aggregate durations into a set of (beatLength, duration) tuples for each beat length
-                                .GroupBy(t => t.beatLength)
+                                .GroupBy(t => Math.Round(t.beatLength * 1000) / 1000)
                                 .Select(g => (beatLength: g.Key, duration: g.Sum(t => t.duration)))
                                 // And if there are no timing points, use a default.
                                 .DefaultIfEmpty((TimingControlPoint.DEFAULT_BEAT_LENGTH, 0));

From 18e3f8c233da2ed3eb8b859944994d39f9f54512 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 8 Feb 2021 19:03:19 +0900
Subject: [PATCH 1368/3722] Sort beat lengths rather than linear search

---
 osu.Game/Beatmaps/Beatmap.cs | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Beatmaps/Beatmap.cs b/osu.Game/Beatmaps/Beatmap.cs
index 434bff14b5..e5b6a4bc44 100644
--- a/osu.Game/Beatmaps/Beatmap.cs
+++ b/osu.Game/Beatmaps/Beatmap.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Beatmaps
             // Note: This is more accurate and may present different results because osu-stable didn't have the ability to calculate slider durations in this context.
             double lastTime = HitObjects.LastOrDefault()?.GetEndTime() ?? ControlPointInfo.TimingPoints.LastOrDefault()?.Time ?? 0;
 
-            var beatLengthsAndDurations =
+            var mostCommon =
                 // Construct a set of (beatLength, duration) tuples for each individual timing point.
                 ControlPointInfo.TimingPoints.Select((t, i) =>
                                 {
@@ -68,23 +68,10 @@ namespace osu.Game.Beatmaps
                                 // Aggregate durations into a set of (beatLength, duration) tuples for each beat length
                                 .GroupBy(t => Math.Round(t.beatLength * 1000) / 1000)
                                 .Select(g => (beatLength: g.Key, duration: g.Sum(t => t.duration)))
-                                // And if there are no timing points, use a default.
-                                .DefaultIfEmpty((TimingControlPoint.DEFAULT_BEAT_LENGTH, 0));
+                                // Get the most common one, or 0 as a suitable default
+                                .OrderByDescending(i => i.duration).FirstOrDefault();
 
-            // Find the single beat length with the maximum aggregate duration.
-            double maxDurationBeatLength = double.NegativeInfinity;
-            double maxDuration = double.NegativeInfinity;
-
-            foreach (var (beatLength, duration) in beatLengthsAndDurations)
-            {
-                if (duration > maxDuration)
-                {
-                    maxDuration = duration;
-                    maxDurationBeatLength = beatLength;
-                }
-            }
-
-            return maxDurationBeatLength;
+            return mostCommon.beatLength;
         }
 
         IBeatmap IBeatmap.Clone() => Clone();

From f0dfa9f8f397269571b96d1165f03f36a555bc8e Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 8 Feb 2021 11:12:25 +0100
Subject: [PATCH 1369/3722] Use the newest config file available (where the
 local username matches the filename)

---
 osu.Game/IO/StableStorage.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game/IO/StableStorage.cs b/osu.Game/IO/StableStorage.cs
index 614e548d93..ccc6f9c311 100644
--- a/osu.Game/IO/StableStorage.cs
+++ b/osu.Game/IO/StableStorage.cs
@@ -35,11 +35,7 @@ namespace osu.Game.IO
         {
             var songsDirectoryPath = Path.Combine(BasePath, stable_default_songs_path);
 
-            // enumerate the user config files available in case the user migrated their files from another pc / operating system.
-            var foundConfigFiles = GetFiles(".", "osu!.*.cfg");
-
-            // if more than one config file is found, let's use the oldest one (where the username in the filename doesn't match the local username).
-            var configFile = foundConfigFiles.Count() > 1 ? foundConfigFiles.FirstOrDefault(filename => !filename[5..^4].Contains(Environment.UserName, StringComparison.Ordinal)) : foundConfigFiles.FirstOrDefault();
+            var configFile = GetFiles(".", $"osu!.{Environment.UserName}.cfg").SingleOrDefault();
 
             if (configFile == null)
                 return songsDirectoryPath;

From a08c51f213594a02ea3d354c4e913f29723ab2fd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 8 Feb 2021 19:23:10 +0900
Subject: [PATCH 1370/3722] Remove duplicate code

---
 .../OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs    | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index e29fb658a3..ae32295676 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -164,9 +164,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 
             userStateDisplay.UpdateStatus(User.State, User.BeatmapAvailability);
 
-            var ruleset = rulesets.GetRuleset(Room.Settings.RulesetID).CreateInstance();
-            userModsDisplay.Current.Value = User.Mods.Select(m => m.ToMod(ruleset)).ToList();
-
             if (Room.Host?.Equals(User) == true)
                 crown.FadeIn(fade_time);
             else

From d8c53e34ae5cba88b491d5379dec5d7ecd15e9f8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 8 Feb 2021 19:42:17 +0900
Subject: [PATCH 1371/3722] Fix missing using

---
 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 032493a5c6..f454fe619b 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -4,6 +4,7 @@
 #nullable enable
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;

From 19368f87fb8c37eec5bf06f71b2d15959722cf08 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 8 Feb 2021 19:59:07 +0900
Subject: [PATCH 1372/3722] Fix failing test

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 669fa93298..7924e1390b 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -174,7 +174,7 @@ namespace osu.Game.Screens.Play
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(AudioManager audio, OsuConfigManager config, OsuGame game)
+        private void load(AudioManager audio, OsuConfigManager config, OsuGameBase game)
         {
             Mods.Value = base.Mods.Value.Select(m => m.CreateCopy()).ToArray();
 
@@ -191,10 +191,9 @@ namespace osu.Game.Screens.Play
             mouseWheelDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableWheel);
 
             if (game != null)
-            {
-                LocalUserPlaying.BindTo(game.LocalUserPlaying);
                 gameActive.BindTo(game.IsActive);
-            }
+            if (game is OsuGame osuGame)
+                LocalUserPlaying.BindTo(osuGame.LocalUserPlaying);
 
             DrawableRuleset = ruleset.CreateDrawableRulesetWith(playableBeatmap, Mods.Value);
 

From 156f5bd5df715323e6dc227c7fb5be7e439ff72e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 Feb 2021 20:05:16 +0900
Subject: [PATCH 1373/3722] Add newline between statements

---
 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 7924e1390b..5d06ac5b3a 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -192,6 +192,7 @@ namespace osu.Game.Screens.Play
 
             if (game != null)
                 gameActive.BindTo(game.IsActive);
+
             if (game is OsuGame osuGame)
                 LocalUserPlaying.BindTo(osuGame.LocalUserPlaying);
 

From f4a31287bfca31bf088f077e014f7af4d68b6232 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 8 Feb 2021 20:11:06 +0900
Subject: [PATCH 1374/3722] Add/use IHitObjectContainer interface instead of
 IEnumerables

---
 osu.Game.Rulesets.Osu/UI/IHitPolicy.cs        |  7 +++---
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs      |  3 +--
 .../UI/StartTimeOrderedHitPolicy.cs           |  7 +++---
 osu.Game/Rulesets/UI/HitObjectContainer.cs    | 11 +--------
 osu.Game/Rulesets/UI/IHitObjectContainer.cs   | 24 +++++++++++++++++++
 5 files changed, 32 insertions(+), 20 deletions(-)
 create mode 100644 osu.Game/Rulesets/UI/IHitObjectContainer.cs

diff --git a/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs
index 72c3d781bb..5d8ea035a7 100644
--- a/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/IHitPolicy.cs
@@ -1,19 +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.Collections.Generic;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Osu.UI
 {
     public interface IHitPolicy
     {
         /// <summary>
-        /// Sets the <see cref="DrawableHitObject"/>s which this <see cref="IHitPolicy"/> controls.
+        /// The <see cref="IHitObjectContainer"/> containing the <see cref="DrawableHitObject"/>s which this <see cref="IHitPolicy"/> applies to.
         /// </summary>
-        /// <param name="hitObjects">An enumeration of the <see cref="DrawableHitObject"/>s.</param>
-        void SetHitObjects(IEnumerable<DrawableHitObject> hitObjects);
+        IHitObjectContainer HitObjectContainer { set; }
 
         /// <summary>
         /// Determines whether a <see cref="DrawableHitObject"/> can be hit at a point in time.
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index c7900558a0..e085714265 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -54,8 +54,7 @@ namespace osu.Game.Rulesets.Osu.UI
                 approachCircles = new ProxyContainer { RelativeSizeAxes = Axes.Both },
             };
 
-            hitPolicy = new StartTimeOrderedHitPolicy();
-            hitPolicy.SetHitObjects(HitObjectContainer.AliveObjects);
+            hitPolicy = new StartTimeOrderedHitPolicy { HitObjectContainer = HitObjectContainer };
 
             var hitWindows = new OsuHitWindows();
 
diff --git a/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs b/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
index 38ba5fc490..0173156246 100644
--- a/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu/UI/StartTimeOrderedHitPolicy.cs
@@ -6,6 +6,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.UI;
 
 namespace osu.Game.Rulesets.Osu.UI
 {
@@ -19,9 +20,7 @@ namespace osu.Game.Rulesets.Osu.UI
     /// </summary>
     public class StartTimeOrderedHitPolicy : IHitPolicy
     {
-        private IEnumerable<DrawableHitObject> hitObjects;
-
-        public void SetHitObjects(IEnumerable<DrawableHitObject> hitObjects) => this.hitObjects = hitObjects;
+        public IHitObjectContainer HitObjectContainer { get; set; }
 
         public bool IsHittable(DrawableHitObject hitObject, double time)
         {
@@ -73,7 +72,7 @@ namespace osu.Game.Rulesets.Osu.UI
 
         private IEnumerable<DrawableHitObject> enumerateHitObjectsUpTo(double targetTime)
         {
-            foreach (var obj in hitObjects)
+            foreach (var obj in HitObjectContainer.AliveObjects)
             {
                 if (obj.HitObject.StartTime >= targetTime)
                     yield break;
diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 1972043ccb..11312a46df 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -17,19 +17,10 @@ using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.UI
 {
-    public class HitObjectContainer : LifetimeManagementContainer
+    public class HitObjectContainer : LifetimeManagementContainer, IHitObjectContainer
     {
-        /// <summary>
-        /// All currently in-use <see cref="DrawableHitObject"/>s.
-        /// </summary>
         public IEnumerable<DrawableHitObject> Objects => InternalChildren.Cast<DrawableHitObject>().OrderBy(h => h.HitObject.StartTime);
 
-        /// <summary>
-        /// All currently in-use <see cref="DrawableHitObject"/>s that are alive.
-        /// </summary>
-        /// <remarks>
-        /// If this <see cref="HitObjectContainer"/> uses pooled objects, this is equivalent to <see cref="Objects"/>.
-        /// </remarks>
         public IEnumerable<DrawableHitObject> AliveObjects => AliveInternalChildren.Cast<DrawableHitObject>().OrderBy(h => h.HitObject.StartTime);
 
         /// <summary>
diff --git a/osu.Game/Rulesets/UI/IHitObjectContainer.cs b/osu.Game/Rulesets/UI/IHitObjectContainer.cs
new file mode 100644
index 0000000000..4c784132e8
--- /dev/null
+++ b/osu.Game/Rulesets/UI/IHitObjectContainer.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 osu.Game.Rulesets.Objects.Drawables;
+
+namespace osu.Game.Rulesets.UI
+{
+    public interface IHitObjectContainer
+    {
+        /// <summary>
+        /// All currently in-use <see cref="DrawableHitObject"/>s.
+        /// </summary>
+        IEnumerable<DrawableHitObject> Objects { get; }
+
+        /// <summary>
+        /// All currently in-use <see cref="DrawableHitObject"/>s that are alive.
+        /// </summary>
+        /// <remarks>
+        /// If this <see cref="IHitObjectContainer"/> uses pooled objects, this is equivalent to <see cref="Objects"/>.
+        /// </remarks>
+        IEnumerable<DrawableHitObject> AliveObjects { get; }
+    }
+}

From 414e05affdf867f3bda1eb02a9639c965368b3d7 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 8 Feb 2021 02:41:07 -0800
Subject: [PATCH 1375/3722] Fix editor effect attribute tooltip having
 unnecessary whitespace when only one is enabled

---
 osu.Game/Screens/Edit/Timing/ControlPointTable.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index 8980c2019a..cae7d5a021 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -151,7 +151,11 @@ namespace osu.Game.Screens.Edit.Timing
                         return new RowAttribute("difficulty", () => $"{difficulty.SpeedMultiplier:n2}x", colour);
 
                     case EffectControlPoint effect:
-                        return new RowAttribute("effect", () => $"{(effect.KiaiMode ? "Kiai " : "")}{(effect.OmitFirstBarLine ? "NoBarLine " : "")}", colour);
+                        return new RowAttribute("effect", () => string.Join(" ", new[]
+                        {
+                            effect.KiaiMode ? "Kiai" : string.Empty,
+                            effect.OmitFirstBarLine ? "NoBarLine" : string.Empty
+                        }.Where(s => !string.IsNullOrEmpty(s))), colour);
 
                     case SampleControlPoint sample:
                         return new RowAttribute("sample", () => $"{sample.SampleBank} {sample.SampleVolume}%", colour);

From bebff61a9dde4ea61b27094ae9c4c4c214dababa Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 8 Feb 2021 21:13:00 +0300
Subject: [PATCH 1376/3722] Add method for retrieving condensed user statistics

---
 osu.Game/Users/User.cs | 62 +++++++++++++++++++++++++++++++++++-------
 1 file changed, 52 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index 518236755d..2f8c6823c7 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -2,10 +2,16 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
+using JetBrains.Annotations;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using osu.Framework.Bindables;
+using osu.Game.IO.Serialization;
+using osu.Game.Online.API.Requests;
+using osu.Game.Rulesets;
 
 namespace osu.Game.Users
 {
@@ -178,6 +184,11 @@ namespace osu.Game.Users
 
         private UserStatistics statistics;
 
+        /// <summary>
+        /// The user statistics of the ruleset specified within the API request.
+        /// If the user is fetched from a <see cref="GetUsersRequest"/> or similar
+        /// (i.e. is a user compact instance), use <see cref="GetStatisticsFor"/> instead.
+        /// </summary>
         [JsonProperty(@"statistics")]
         public UserStatistics Statistics
         {
@@ -228,13 +239,35 @@ namespace osu.Game.Users
         [JsonProperty("replays_watched_counts")]
         public UserHistoryCount[] ReplaysWatchedCounts;
 
-        public class UserHistoryCount
-        {
-            [JsonProperty("start_date")]
-            public DateTime Date;
+        [UsedImplicitly]
+        [JsonExtensionData]
+        private readonly IDictionary<string, JToken> otherProperties = new Dictionary<string, JToken>();
 
-            [JsonProperty("count")]
-            public long Count;
+        private readonly Dictionary<RulesetInfo, UserStatistics> statisticsCache = new Dictionary<RulesetInfo, UserStatistics>();
+
+        /// <summary>
+        /// Retrieves the user statistics for a certain ruleset.
+        /// If user is fetched from a <see cref="GetUserRequest"/>,
+        /// this will always return null, use <see cref="Statistics"/> instead.
+        /// </summary>
+        /// <param name="ruleset">The ruleset to retrieve statistics for.</param>
+        // todo: this should likely be moved to a separate UserCompact class at some point.
+        public UserStatistics GetStatisticsFor(RulesetInfo ruleset)
+        {
+            if (statisticsCache.TryGetValue(ruleset, out var existing))
+                return existing;
+
+            return statisticsCache[ruleset] = parseStatisticsFor(ruleset);
+        }
+
+        private UserStatistics parseStatisticsFor(RulesetInfo ruleset)
+        {
+            if (!(otherProperties.TryGetValue($"statistics_{ruleset.ShortName}", out var token)))
+                return null;
+
+            var settings = JsonSerializableExtensions.CreateGlobalSettings();
+            settings.DefaultValueHandling = DefaultValueHandling.Include;
+            return token.ToObject<UserStatistics>(JsonSerializer.Create(settings));
         }
 
         public override string ToString() => Username;
@@ -249,6 +282,14 @@ namespace osu.Game.Users
             Id = 0
         };
 
+        public bool Equals(User other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+
+            return Id == other.Id;
+        }
+
         public enum PlayStyle
         {
             [Description("Keyboard")]
@@ -264,12 +305,13 @@ namespace osu.Game.Users
             Touch,
         }
 
-        public bool Equals(User other)
+        public class UserHistoryCount
         {
-            if (ReferenceEquals(null, other)) return false;
-            if (ReferenceEquals(this, other)) return true;
+            [JsonProperty("start_date")]
+            public DateTime Date;
 
-            return Id == other.Id;
+            [JsonProperty("count")]
+            public long Count;
         }
     }
 }

From d101add1591599c53f860c21e31901cbed220060 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 8 Feb 2021 21:14:12 +0300
Subject: [PATCH 1377/3722] Display user global rank for selected ruleset in
 participants panel

---
 .../Participants/ParticipantPanel.cs          | 21 ++++++++++++-------
 osu.Game/Users/UserStatistics.cs              |  8 +++++++
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index 0ee1b6d684..f69a21918a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -35,9 +35,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
+        private SpriteIcon crown;
+        private OsuSpriteText userRankText;
         private ModDisplay userModsDisplay;
         private StateDisplay userStateDisplay;
-        private SpriteIcon crown;
 
         public ParticipantPanel(MultiplayerRoomUser user)
         {
@@ -119,12 +120,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
                                         Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 18),
                                         Text = user?.Username
                                     },
-                                    new OsuSpriteText
+                                    userRankText = new OsuSpriteText
                                     {
                                         Anchor = Anchor.CentreLeft,
                                         Origin = Anchor.CentreLeft,
                                         Font = OsuFont.GetFont(size: 14),
-                                        Text = user?.CurrentModeRank != null ? $"#{user.CurrentModeRank}" : string.Empty
                                     }
                                 }
                             },
@@ -162,6 +162,15 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 
             const double fade_time = 50;
 
+            var ruleset = rulesets.GetRuleset(Room.Settings.RulesetID);
+
+            var currentModeRank = User.User?.GetStatisticsFor(ruleset)?.GlobalRank;
+
+            // fallback to current mode rank for testing purposes.
+            currentModeRank ??= User.User?.CurrentModeRank;
+
+            userRankText.Text = currentModeRank != null ? $"#{currentModeRank.Value:N0}" : string.Empty;
+
             userStateDisplay.Status = User.State;
 
             if (Room.Host?.Equals(User) == true)
@@ -171,11 +180,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 
             // If the mods are updated at the end of the frame, the flow container will skip a reflow cycle: https://github.com/ppy/osu-framework/issues/4187
             // This looks particularly jarring here, so re-schedule the update to that start of our frame as a fix.
-            Schedule(() =>
-            {
-                var ruleset = rulesets.GetRuleset(Room.Settings.RulesetID).CreateInstance();
-                userModsDisplay.Current.Value = User.Mods.Select(m => m.ToMod(ruleset)).ToList();
-            });
+            Schedule(() => userModsDisplay.Current.Value = User.Mods.Select(m => m.ToMod(ruleset.CreateInstance())).ToList());
         }
 
         public MenuItem[] ContextMenuItems
diff --git a/osu.Game/Users/UserStatistics.cs b/osu.Game/Users/UserStatistics.cs
index 8b7699d0ad..6c069f674e 100644
--- a/osu.Game/Users/UserStatistics.cs
+++ b/osu.Game/Users/UserStatistics.cs
@@ -3,6 +3,7 @@
 
 using System;
 using Newtonsoft.Json;
+using osu.Game.Online.API.Requests;
 using osu.Game.Scoring;
 using osu.Game.Utils;
 using static osu.Game.Users.User;
@@ -26,6 +27,13 @@ namespace osu.Game.Users
             public int Progress;
         }
 
+        /// <remarks>
+        /// This must only be used when coming from condensed user responses (e.g. from <see cref="GetUsersRequest"/>), otherwise use <code>Ranks.Global</code>.
+        /// </remarks>
+        // todo: this should likely be moved to a separate UserStatisticsCompact class at some point.
+        [JsonProperty(@"global_rank")]
+        public int? GlobalRank;
+
         [JsonProperty(@"pp")]
         public decimal? PP;
 

From cca1bac67d56d9d261149eb6f497fee824a69811 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 8 Feb 2021 22:00:01 +0300
Subject: [PATCH 1378/3722] Pass empty user statistics for consistency

Realized `Statistics` was never giving null user statistics, so decided to pass an empty one here as well.
---
 osu.Game/Users/User.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index 2f8c6823c7..467f00e409 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -248,7 +248,7 @@ namespace osu.Game.Users
         /// <summary>
         /// Retrieves the user statistics for a certain ruleset.
         /// If user is fetched from a <see cref="GetUserRequest"/>,
-        /// this will always return null, use <see cref="Statistics"/> instead.
+        /// this will always return empty instance, use <see cref="Statistics"/> instead.
         /// </summary>
         /// <param name="ruleset">The ruleset to retrieve statistics for.</param>
         // todo: this should likely be moved to a separate UserCompact class at some point.
@@ -263,7 +263,7 @@ namespace osu.Game.Users
         private UserStatistics parseStatisticsFor(RulesetInfo ruleset)
         {
             if (!(otherProperties.TryGetValue($"statistics_{ruleset.ShortName}", out var token)))
-                return null;
+                return new UserStatistics();
 
             var settings = JsonSerializableExtensions.CreateGlobalSettings();
             settings.DefaultValueHandling = DefaultValueHandling.Include;

From af345ea5db05c056234e665f665b53b0a4912d1a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 9 Feb 2021 01:52:35 +0300
Subject: [PATCH 1379/3722] Add a SignalR hub client connector component

---
 osu.Game/Online/HubClientConnector.cs | 209 ++++++++++++++++++++++++++
 1 file changed, 209 insertions(+)
 create mode 100644 osu.Game/Online/HubClientConnector.cs

diff --git a/osu.Game/Online/HubClientConnector.cs b/osu.Game/Online/HubClientConnector.cs
new file mode 100644
index 0000000000..49b1ab639a
--- /dev/null
+++ b/osu.Game/Online/HubClientConnector.cs
@@ -0,0 +1,209 @@
+// Copyright (c) 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
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.SignalR.Client;
+using Microsoft.Extensions.DependencyInjection;
+using Newtonsoft.Json;
+using osu.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Logging;
+using osu.Game.Online.API;
+
+namespace osu.Game.Online
+{
+    /// <summary>
+    /// A component that maintains over a hub connection between client and server.
+    /// </summary>
+    public class HubClientConnector : Component
+    {
+        /// <summary>
+        /// Invoked whenever a new hub connection is built.
+        /// </summary>
+        public Action<HubConnection>? OnNewConnection;
+
+        private readonly string clientName;
+        private readonly string endpoint;
+
+        /// <summary>
+        /// The current connection opened by this connector.
+        /// </summary>
+        public HubConnection? CurrentConnection { get; private set; }
+
+        /// <summary>
+        /// Whether this is connected to the hub, use <see cref="CurrentConnection"/> to access the connection, if this is <c>true</c>.
+        /// </summary>
+        public IBindable<bool> IsConnected => isConnected;
+
+        private readonly Bindable<bool> isConnected = new Bindable<bool>();
+        private readonly SemaphoreSlim connectionLock = new SemaphoreSlim(1);
+        private CancellationTokenSource connectCancelSource = new CancellationTokenSource();
+
+        [Resolved]
+        private IAPIProvider api { get; set; } = null!;
+
+        private readonly IBindable<APIState> apiState = new Bindable<APIState>();
+
+        /// <summary>
+        /// Constructs a new <see cref="HubClientConnector"/>.
+        /// </summary>
+        /// <param name="clientName">The name of the client this connector connects for, used for logging.</param>
+        /// <param name="endpoint">The endpoint to the hub.</param>
+        public HubClientConnector(string clientName, string endpoint)
+        {
+            this.clientName = clientName;
+            this.endpoint = endpoint;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            apiState.BindTo(api.State);
+            apiState.BindValueChanged(state =>
+            {
+                switch (state.NewValue)
+                {
+                    case APIState.Failing:
+                    case APIState.Offline:
+                        Task.Run(() => disconnect(true));
+                        break;
+
+                    case APIState.Online:
+                        Task.Run(connect);
+                        break;
+                }
+            });
+        }
+
+        private async Task connect()
+        {
+            cancelExistingConnect();
+
+            if (!await connectionLock.WaitAsync(10000))
+                throw new TimeoutException("Could not obtain a lock to connect. A previous attempt is likely stuck.");
+
+            try
+            {
+                while (apiState.Value == APIState.Online)
+                {
+                    // ensure any previous connection was disposed.
+                    // this will also create a new cancellation token source.
+                    await disconnect(false);
+
+                    // this token will be valid for the scope of this connection.
+                    // if cancelled, we can be sure that a disconnect or reconnect is handled elsewhere.
+                    var cancellationToken = connectCancelSource.Token;
+
+                    cancellationToken.ThrowIfCancellationRequested();
+
+                    Logger.Log($"{clientName} connecting...", LoggingTarget.Network);
+
+                    try
+                    {
+                        // importantly, rebuild the connection each attempt to get an updated access token.
+                        CurrentConnection = createConnection(cancellationToken);
+
+                        await CurrentConnection.StartAsync(cancellationToken);
+
+                        Logger.Log($"{clientName} connected!", LoggingTarget.Network);
+                        isConnected.Value = true;
+                        return;
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        //connection process was cancelled.
+                        throw;
+                    }
+                    catch (Exception e)
+                    {
+                        Logger.Log($"{clientName} connection error: {e}", LoggingTarget.Network);
+
+                        // retry on any failure.
+                        await Task.Delay(5000, cancellationToken);
+                    }
+                }
+            }
+            finally
+            {
+                connectionLock.Release();
+            }
+        }
+
+        private HubConnection createConnection(CancellationToken cancellationToken)
+        {
+            var builder = new HubConnectionBuilder()
+                .WithUrl(endpoint, options => { options.Headers.Add("Authorization", $"Bearer {api.AccessToken}"); });
+
+            if (RuntimeInfo.SupportsJIT)
+                builder.AddMessagePackProtocol();
+            else
+            {
+                // eventually we will precompile resolvers for messagepack, but this isn't working currently
+                // see https://github.com/neuecc/MessagePack-CSharp/issues/780#issuecomment-768794308.
+                builder.AddNewtonsoftJsonProtocol(options => { options.PayloadSerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; });
+            }
+
+            var newConnection = builder.Build();
+
+            OnNewConnection?.Invoke(newConnection);
+
+            newConnection.Closed += ex =>
+            {
+                isConnected.Value = false;
+
+                Logger.Log(ex != null ? $"{clientName} lost connection: {ex}" : $"{clientName} disconnected", LoggingTarget.Network);
+
+                // make sure a disconnect wasn't triggered (and this is still the active connection).
+                if (!cancellationToken.IsCancellationRequested)
+                    Task.Run(connect, default);
+
+                return Task.CompletedTask;
+            };
+
+            return newConnection;
+        }
+
+        private async Task disconnect(bool takeLock)
+        {
+            cancelExistingConnect();
+
+            if (takeLock)
+            {
+                if (!await connectionLock.WaitAsync(10000))
+                    throw new TimeoutException("Could not obtain a lock to disconnect. A previous attempt is likely stuck.");
+            }
+
+            try
+            {
+                if (CurrentConnection != null)
+                    await CurrentConnection.DisposeAsync();
+            }
+            finally
+            {
+                CurrentConnection = null;
+                if (takeLock)
+                    connectionLock.Release();
+            }
+        }
+
+        private void cancelExistingConnect()
+        {
+            connectCancelSource.Cancel();
+            connectCancelSource = new CancellationTokenSource();
+        }
+
+        public override string ToString() => $"Connector for {clientName} ({(IsConnected.Value ? "connected" : "not connected")}";
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            cancelExistingConnect();
+        }
+    }
+}

From 28b815ffe13a5439241ccaeb763e26cb4e794ca6 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 9 Feb 2021 02:01:52 +0300
Subject: [PATCH 1380/3722] Clean up multiplayer client with new hub connector

---
 .../Online/Multiplayer/MultiplayerClient.cs   | 209 +++---------------
 .../Multiplayer/StatefulMultiplayerClient.cs  |   7 +-
 2 files changed, 31 insertions(+), 185 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 493518ac80..07036e7ffc 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -3,17 +3,11 @@
 
 #nullable enable
 
-using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.SignalR.Client;
-using Microsoft.Extensions.DependencyInjection;
-using Newtonsoft.Json;
-using osu.Framework;
-using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Logging;
 using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 
@@ -21,106 +15,37 @@ namespace osu.Game.Online.Multiplayer
 {
     public class MultiplayerClient : StatefulMultiplayerClient
     {
-        public override IBindable<bool> IsConnected => isConnected;
+        private readonly HubClientConnector connector;
 
-        private readonly Bindable<bool> isConnected = new Bindable<bool>();
-        private readonly IBindable<APIState> apiState = new Bindable<APIState>();
+        public override IBindable<bool> IsConnected => connector.IsConnected;
 
-        private readonly SemaphoreSlim connectionLock = new SemaphoreSlim(1);
-
-        [Resolved]
-        private IAPIProvider api { get; set; } = null!;
-
-        private HubConnection? connection;
-
-        private CancellationTokenSource connectCancelSource = new CancellationTokenSource();
-
-        private readonly string endpoint;
+        private HubConnection? connection => connector.CurrentConnection;
 
         public MultiplayerClient(EndpointConfiguration endpoints)
         {
-            endpoint = endpoints.MultiplayerEndpointUrl;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            apiState.BindTo(api.State);
-            apiState.BindValueChanged(apiStateChanged, true);
-        }
-
-        private void apiStateChanged(ValueChangedEvent<APIState> state)
-        {
-            switch (state.NewValue)
+            InternalChild = connector = new HubClientConnector("Multiplayer client", endpoints.MultiplayerEndpointUrl)
             {
-                case APIState.Failing:
-                case APIState.Offline:
-                    Task.Run(() => disconnect(true));
-                    break;
-
-                case APIState.Online:
-                    Task.Run(connect);
-                    break;
-            }
-        }
-
-        private async Task connect()
-        {
-            cancelExistingConnect();
-
-            if (!await connectionLock.WaitAsync(10000))
-                throw new TimeoutException("Could not obtain a lock to connect. A previous attempt is likely stuck.");
-
-            try
-            {
-                while (api.State.Value == APIState.Online)
+                OnNewConnection = newConnection =>
                 {
-                    // ensure any previous connection was disposed.
-                    // this will also create a new cancellation token source.
-                    await disconnect(false);
-
-                    // this token will be valid for the scope of this connection.
-                    // if cancelled, we can be sure that a disconnect or reconnect is handled elsewhere.
-                    var cancellationToken = connectCancelSource.Token;
-
-                    cancellationToken.ThrowIfCancellationRequested();
-
-                    Logger.Log("Multiplayer client connecting...", LoggingTarget.Network);
-
-                    try
-                    {
-                        // importantly, rebuild the connection each attempt to get an updated access token.
-                        connection = createConnection(cancellationToken);
-
-                        await connection.StartAsync(cancellationToken);
-
-                        Logger.Log("Multiplayer client connected!", LoggingTarget.Network);
-                        isConnected.Value = true;
-                        return;
-                    }
-                    catch (OperationCanceledException)
-                    {
-                        //connection process was cancelled.
-                        throw;
-                    }
-                    catch (Exception e)
-                    {
-                        Logger.Log($"Multiplayer client connection error: {e}", LoggingTarget.Network);
-
-                        // retry on any failure.
-                        await Task.Delay(5000, cancellationToken);
-                    }
-                }
-            }
-            finally
-            {
-                connectionLock.Release();
-            }
+                    // this is kind of SILLY
+                    // https://github.com/dotnet/aspnetcore/issues/15198
+                    newConnection.On<MultiplayerRoomState>(nameof(IMultiplayerClient.RoomStateChanged), ((IMultiplayerClient)this).RoomStateChanged);
+                    newConnection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserJoined), ((IMultiplayerClient)this).UserJoined);
+                    newConnection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserLeft), ((IMultiplayerClient)this).UserLeft);
+                    newConnection.On<int>(nameof(IMultiplayerClient.HostChanged), ((IMultiplayerClient)this).HostChanged);
+                    newConnection.On<MultiplayerRoomSettings>(nameof(IMultiplayerClient.SettingsChanged), ((IMultiplayerClient)this).SettingsChanged);
+                    newConnection.On<int, MultiplayerUserState>(nameof(IMultiplayerClient.UserStateChanged), ((IMultiplayerClient)this).UserStateChanged);
+                    newConnection.On(nameof(IMultiplayerClient.LoadRequested), ((IMultiplayerClient)this).LoadRequested);
+                    newConnection.On(nameof(IMultiplayerClient.MatchStarted), ((IMultiplayerClient)this).MatchStarted);
+                    newConnection.On(nameof(IMultiplayerClient.ResultsReady), ((IMultiplayerClient)this).ResultsReady);
+                    newConnection.On<int, IEnumerable<APIMod>>(nameof(IMultiplayerClient.UserModsChanged), ((IMultiplayerClient)this).UserModsChanged);
+                },
+            };
         }
 
         protected override Task<MultiplayerRoom> JoinRoom(long roomId)
         {
-            if (!isConnected.Value)
+            if (!IsConnected.Value)
                 return Task.FromCanceled<MultiplayerRoom>(new CancellationToken(true));
 
             return connection.InvokeAsync<MultiplayerRoom>(nameof(IMultiplayerServer.JoinRoom), roomId);
@@ -128,7 +53,7 @@ namespace osu.Game.Online.Multiplayer
 
         protected override Task LeaveRoomInternal()
         {
-            if (!isConnected.Value)
+            if (!IsConnected.Value)
                 return Task.FromCanceled(new CancellationToken(true));
 
             return connection.InvokeAsync(nameof(IMultiplayerServer.LeaveRoom));
@@ -136,7 +61,7 @@ namespace osu.Game.Online.Multiplayer
 
         public override Task TransferHost(int userId)
         {
-            if (!isConnected.Value)
+            if (!IsConnected.Value)
                 return Task.CompletedTask;
 
             return connection.InvokeAsync(nameof(IMultiplayerServer.TransferHost), userId);
@@ -144,7 +69,7 @@ namespace osu.Game.Online.Multiplayer
 
         public override Task ChangeSettings(MultiplayerRoomSettings settings)
         {
-            if (!isConnected.Value)
+            if (!IsConnected.Value)
                 return Task.CompletedTask;
 
             return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeSettings), settings);
@@ -152,7 +77,7 @@ namespace osu.Game.Online.Multiplayer
 
         public override Task ChangeState(MultiplayerUserState newState)
         {
-            if (!isConnected.Value)
+            if (!IsConnected.Value)
                 return Task.CompletedTask;
 
             return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeState), newState);
@@ -160,7 +85,7 @@ namespace osu.Game.Online.Multiplayer
 
         public override Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability)
         {
-            if (!isConnected.Value)
+            if (!IsConnected.Value)
                 return Task.CompletedTask;
 
             return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeBeatmapAvailability), newBeatmapAvailability);
@@ -168,7 +93,7 @@ namespace osu.Game.Online.Multiplayer
 
         public override Task ChangeUserMods(IEnumerable<APIMod> newMods)
         {
-            if (!isConnected.Value)
+            if (!IsConnected.Value)
                 return Task.CompletedTask;
 
             return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeUserMods), newMods);
@@ -176,90 +101,10 @@ namespace osu.Game.Online.Multiplayer
 
         public override Task StartMatch()
         {
-            if (!isConnected.Value)
+            if (!IsConnected.Value)
                 return Task.CompletedTask;
 
             return connection.InvokeAsync(nameof(IMultiplayerServer.StartMatch));
         }
-
-        private async Task disconnect(bool takeLock)
-        {
-            cancelExistingConnect();
-
-            if (takeLock)
-            {
-                if (!await connectionLock.WaitAsync(10000))
-                    throw new TimeoutException("Could not obtain a lock to disconnect. A previous attempt is likely stuck.");
-            }
-
-            try
-            {
-                if (connection != null)
-                    await connection.DisposeAsync();
-            }
-            finally
-            {
-                connection = null;
-                if (takeLock)
-                    connectionLock.Release();
-            }
-        }
-
-        private void cancelExistingConnect()
-        {
-            connectCancelSource.Cancel();
-            connectCancelSource = new CancellationTokenSource();
-        }
-
-        private HubConnection createConnection(CancellationToken cancellationToken)
-        {
-            var builder = new HubConnectionBuilder()
-                .WithUrl(endpoint, options => { options.Headers.Add("Authorization", $"Bearer {api.AccessToken}"); });
-
-            if (RuntimeInfo.SupportsJIT)
-                builder.AddMessagePackProtocol();
-            else
-            {
-                // eventually we will precompile resolvers for messagepack, but this isn't working currently
-                // see https://github.com/neuecc/MessagePack-CSharp/issues/780#issuecomment-768794308.
-                builder.AddNewtonsoftJsonProtocol(options => { options.PayloadSerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; });
-            }
-
-            var newConnection = builder.Build();
-
-            // this is kind of SILLY
-            // https://github.com/dotnet/aspnetcore/issues/15198
-            newConnection.On<MultiplayerRoomState>(nameof(IMultiplayerClient.RoomStateChanged), ((IMultiplayerClient)this).RoomStateChanged);
-            newConnection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserJoined), ((IMultiplayerClient)this).UserJoined);
-            newConnection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserLeft), ((IMultiplayerClient)this).UserLeft);
-            newConnection.On<int>(nameof(IMultiplayerClient.HostChanged), ((IMultiplayerClient)this).HostChanged);
-            newConnection.On<MultiplayerRoomSettings>(nameof(IMultiplayerClient.SettingsChanged), ((IMultiplayerClient)this).SettingsChanged);
-            newConnection.On<int, MultiplayerUserState>(nameof(IMultiplayerClient.UserStateChanged), ((IMultiplayerClient)this).UserStateChanged);
-            newConnection.On(nameof(IMultiplayerClient.LoadRequested), ((IMultiplayerClient)this).LoadRequested);
-            newConnection.On(nameof(IMultiplayerClient.MatchStarted), ((IMultiplayerClient)this).MatchStarted);
-            newConnection.On(nameof(IMultiplayerClient.ResultsReady), ((IMultiplayerClient)this).ResultsReady);
-            newConnection.On<int, IEnumerable<APIMod>>(nameof(IMultiplayerClient.UserModsChanged), ((IMultiplayerClient)this).UserModsChanged);
-
-            newConnection.Closed += ex =>
-            {
-                isConnected.Value = false;
-
-                Logger.Log(ex != null ? $"Multiplayer client lost connection: {ex}" : "Multiplayer client disconnected", LoggingTarget.Network);
-
-                // make sure a disconnect wasn't triggered (and this is still the active connection).
-                if (!cancellationToken.IsCancellationRequested)
-                    Task.Run(connect, default);
-
-                return Task.CompletedTask;
-            };
-            return newConnection;
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-
-            cancelExistingConnect();
-        }
     }
 }
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index f454fe619b..06f6754258 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -12,7 +12,7 @@ using System.Threading.Tasks;
 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.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
@@ -28,7 +28,7 @@ using osu.Game.Utils;
 
 namespace osu.Game.Online.Multiplayer
 {
-    public abstract class StatefulMultiplayerClient : Component, IMultiplayerClient, IMultiplayerRoomServer
+    public abstract class StatefulMultiplayerClient : CompositeDrawable, IMultiplayerClient, IMultiplayerRoomServer
     {
         /// <summary>
         /// Invoked when any change occurs to the multiplayer room.
@@ -97,7 +97,8 @@ namespace osu.Game.Online.Multiplayer
         // Todo: This is temporary, until the multiplayer server returns the item id on match start or otherwise.
         private int playlistItemId;
 
-        protected StatefulMultiplayerClient()
+        [BackgroundDependencyLoader]
+        private void load()
         {
             IsConnected.BindValueChanged(connected =>
             {

From f76f92515e7eb3588af91e0b3aac4c47fbc26731 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 9 Feb 2021 02:15:51 +0300
Subject: [PATCH 1381/3722] Clean up spectator streaming client with new hub
 connector

---
 .../Visual/Gameplay/TestSceneSpectator.cs     |   8 +-
 ...TestSceneMultiplayerGameplayLeaderboard.cs |   5 +-
 .../Spectator/SpectatorStreamingClient.cs     | 159 +++++-------------
 3 files changed, 48 insertions(+), 124 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 26524f07da..61b0961638 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -233,6 +232,8 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         public class TestSpectatorStreamingClient : SpectatorStreamingClient
         {
+            protected override IBindable<bool> IsConnected { get; } = new BindableBool(false);
+
             public readonly User StreamingUser = new User { Id = 55, Username = "Test user" };
 
             public new BindableList<int> PlayingUsers => (BindableList<int>)base.PlayingUsers;
@@ -244,11 +245,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
             }
 
-            protected override Task Connect()
-            {
-                return Task.CompletedTask;
-            }
-
             public void StartPlay(int beatmapId)
             {
                 this.beatmapId = beatmapId;
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
index d016accc25..6a777e2a78 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -96,6 +95,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         public class TestMultiplayerStreaming : SpectatorStreamingClient
         {
+            protected override IBindable<bool> IsConnected { get; } = new BindableBool(false);
+
             public new BindableList<int> PlayingUsers => (BindableList<int>)base.PlayingUsers;
 
             private readonly int totalUsers;
@@ -163,8 +164,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     ((ISpectatorClient)this).UserSentFrames(userId, new FrameDataBundle(header, Array.Empty<LegacyReplayFrame>()));
                 }
             }
-
-            protected override Task Connect() => Task.CompletedTask;
         }
     }
 }
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index b95e3f1297..7cea76c969 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -8,13 +8,9 @@ using System.Linq;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.SignalR.Client;
-using Microsoft.Extensions.DependencyInjection;
-using Newtonsoft.Json;
-using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Logging;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Replays.Legacy;
@@ -27,14 +23,18 @@ using osu.Game.Screens.Play;
 
 namespace osu.Game.Online.Spectator
 {
-    public class SpectatorStreamingClient : Component, ISpectatorClient
+    public class SpectatorStreamingClient : CompositeDrawable, ISpectatorClient
     {
         /// <summary>
         /// The maximum milliseconds between frame bundle sends.
         /// </summary>
         public const double TIME_BETWEEN_SENDS = 200;
 
-        private HubConnection connection;
+        private readonly HubClientConnector connector;
+
+        protected virtual IBindable<bool> IsConnected => connector.IsConnected;
+
+        private HubConnection connection => connector.CurrentConnection;
 
         private readonly List<int> watchingUsers = new List<int>();
 
@@ -44,13 +44,6 @@ namespace osu.Game.Online.Spectator
 
         private readonly BindableList<int> playingUsers = new BindableList<int>();
 
-        private readonly IBindable<APIState> apiState = new Bindable<APIState>();
-
-        private bool isConnected;
-
-        [Resolved]
-        private IAPIProvider api { get; set; }
-
         [CanBeNull]
         private IBeatmap currentBeatmap;
 
@@ -82,114 +75,50 @@ namespace osu.Game.Online.Spectator
         /// </summary>
         public event Action<int, SpectatorState> OnUserFinishedPlaying;
 
-        private readonly string endpoint;
-
         public SpectatorStreamingClient(EndpointConfiguration endpoints)
         {
-            endpoint = endpoints.SpectatorEndpointUrl;
+            InternalChild = connector = new HubClientConnector("Spectator client", endpoints.SpectatorEndpointUrl)
+            {
+                OnNewConnection = newConnection =>
+                {
+                    // until strong typed client support is added, each method must be manually bound
+                    // (see https://github.com/dotnet/aspnetcore/issues/15198)
+                    newConnection.On<int, SpectatorState>(nameof(ISpectatorClient.UserBeganPlaying), ((ISpectatorClient)this).UserBeganPlaying);
+                    newConnection.On<int, FrameDataBundle>(nameof(ISpectatorClient.UserSentFrames), ((ISpectatorClient)this).UserSentFrames);
+                    newConnection.On<int, SpectatorState>(nameof(ISpectatorClient.UserFinishedPlaying), ((ISpectatorClient)this).UserFinishedPlaying);
+                }
+            };
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            apiState.BindTo(api.State);
-            apiState.BindValueChanged(apiStateChanged, true);
-        }
-
-        private void apiStateChanged(ValueChangedEvent<APIState> state)
-        {
-            switch (state.NewValue)
+            IsConnected.BindValueChanged(connected =>
             {
-                case APIState.Failing:
-                case APIState.Offline:
-                    connection?.StopAsync();
-                    connection = null;
-                    break;
-
-                case APIState.Online:
-                    Task.Run(Connect);
-                    break;
-            }
-        }
-
-        protected virtual async Task Connect()
-        {
-            if (connection != null)
-                return;
-
-            var builder = new HubConnectionBuilder()
-                .WithUrl(endpoint, options => { options.Headers.Add("Authorization", $"Bearer {api.AccessToken}"); });
-
-            if (RuntimeInfo.SupportsJIT)
-                builder.AddMessagePackProtocol();
-            else
-            {
-                // eventually we will precompile resolvers for messagepack, but this isn't working currently
-                // see https://github.com/neuecc/MessagePack-CSharp/issues/780#issuecomment-768794308.
-                builder.AddNewtonsoftJsonProtocol(options => { options.PayloadSerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; });
-            }
-
-            connection = builder.Build();
-            // until strong typed client support is added, each method must be manually bound (see https://github.com/dotnet/aspnetcore/issues/15198)
-            connection.On<int, SpectatorState>(nameof(ISpectatorClient.UserBeganPlaying), ((ISpectatorClient)this).UserBeganPlaying);
-            connection.On<int, FrameDataBundle>(nameof(ISpectatorClient.UserSentFrames), ((ISpectatorClient)this).UserSentFrames);
-            connection.On<int, SpectatorState>(nameof(ISpectatorClient.UserFinishedPlaying), ((ISpectatorClient)this).UserFinishedPlaying);
-
-            connection.Closed += async ex =>
-            {
-                isConnected = false;
-                playingUsers.Clear();
-
-                if (ex != null)
+                if (connected.NewValue)
                 {
-                    Logger.Log($"Spectator client lost connection: {ex}", LoggingTarget.Network);
-                    await tryUntilConnected();
+                    // get all the users that were previously being watched
+                    int[] users;
+
+                    lock (userLock)
+                    {
+                        users = watchingUsers.ToArray();
+                        watchingUsers.Clear();
+                    }
+
+                    // resubscribe to watched users.
+                    foreach (var userId in users)
+                        WatchUser(userId);
+
+                    // re-send state in case it wasn't received
+                    if (isPlaying)
+                        beginPlaying();
                 }
-            };
-
-            await tryUntilConnected();
-
-            async Task tryUntilConnected()
-            {
-                Logger.Log("Spectator client connecting...", LoggingTarget.Network);
-
-                while (api.State.Value == APIState.Online)
+                else
                 {
-                    try
-                    {
-                        // reconnect on any failure
-                        await connection.StartAsync();
-                        Logger.Log("Spectator client connected!", LoggingTarget.Network);
-
-                        // get all the users that were previously being watched
-                        int[] users;
-
-                        lock (userLock)
-                        {
-                            users = watchingUsers.ToArray();
-                            watchingUsers.Clear();
-                        }
-
-                        // success
-                        isConnected = true;
-
-                        // resubscribe to watched users
-                        foreach (var userId in users)
-                            WatchUser(userId);
-
-                        // re-send state in case it wasn't received
-                        if (isPlaying)
-                            beginPlaying();
-
-                        break;
-                    }
-                    catch (Exception e)
-                    {
-                        Logger.Log($"Spectator client connection error: {e}", LoggingTarget.Network);
-                        await Task.Delay(5000);
-                    }
+                    playingUsers.Clear();
                 }
-            }
+            }, true);
         }
 
         Task ISpectatorClient.UserBeganPlaying(int userId, SpectatorState state)
@@ -240,14 +169,14 @@ namespace osu.Game.Online.Spectator
         {
             Debug.Assert(isPlaying);
 
-            if (!isConnected) return;
+            if (!IsConnected.Value) return;
 
             connection.SendAsync(nameof(ISpectatorServer.BeginPlaySession), currentState);
         }
 
         public void SendFrames(FrameDataBundle data)
         {
-            if (!isConnected) return;
+            if (!IsConnected.Value) return;
 
             lastSend = connection.SendAsync(nameof(ISpectatorServer.SendFrameData), data);
         }
@@ -257,7 +186,7 @@ namespace osu.Game.Online.Spectator
             isPlaying = false;
             currentBeatmap = null;
 
-            if (!isConnected) return;
+            if (!IsConnected.Value) return;
 
             connection.SendAsync(nameof(ISpectatorServer.EndPlaySession), currentState);
         }
@@ -271,7 +200,7 @@ namespace osu.Game.Online.Spectator
 
                 watchingUsers.Add(userId);
 
-                if (!isConnected)
+                if (!IsConnected.Value)
                     return;
             }
 
@@ -284,7 +213,7 @@ namespace osu.Game.Online.Spectator
             {
                 watchingUsers.Remove(userId);
 
-                if (!isConnected)
+                if (!IsConnected.Value)
                     return;
             }
 

From 3ce605b5e5174632bc78ec5792c75ea0e92be009 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 9 Feb 2021 12:00:03 +0900
Subject: [PATCH 1382/3722] Small refactoring to use .Trim() instead

---
 osu.Game/Screens/Edit/Timing/ControlPointTable.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index cae7d5a021..a17b431fcc 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -151,11 +151,10 @@ namespace osu.Game.Screens.Edit.Timing
                         return new RowAttribute("difficulty", () => $"{difficulty.SpeedMultiplier:n2}x", colour);
 
                     case EffectControlPoint effect:
-                        return new RowAttribute("effect", () => string.Join(" ", new[]
-                        {
+                        return new RowAttribute("effect", () => string.Join(" ",
                             effect.KiaiMode ? "Kiai" : string.Empty,
                             effect.OmitFirstBarLine ? "NoBarLine" : string.Empty
-                        }.Where(s => !string.IsNullOrEmpty(s))), colour);
+                        ).Trim(), colour);
 
                     case SampleControlPoint sample:
                         return new RowAttribute("sample", () => $"{sample.SampleBank} {sample.SampleVolume}%", colour);

From 3133ccacfa79704dbf89faad3cb7c82fb242de32 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 13:09:38 +0900
Subject: [PATCH 1383/3722] Reset selected mods between each test method

This doesn't actually fix or change behaviour, but does seem like
something we probably want to do here.
---
 .../Visual/Multiplayer/TestScenePlaylistsSongSelect.cs           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs
index 2f7e59f800..7d83ba569d 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs
@@ -87,6 +87,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             {
                 Ruleset.Value = new OsuRuleset().RulesetInfo;
                 Beatmap.SetDefault();
+                SelectedMods.Value = Array.Empty<Mod>();
             });
 
             AddStep("create song select", () => LoadScreen(songSelect = new TestPlaylistsSongSelect()));

From be379e0e3cc910b7b3cf1fb6b48460aeaa2673d4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 13:44:11 +0900
Subject: [PATCH 1384/3722] Change CopyFrom to always overwrite all settings
 with incoming values

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

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 3a8717e678..dec72d94e5 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -134,7 +134,7 @@ namespace osu.Game.Rulesets.Mods
         }
 
         /// <summary>
-        /// Copies mod setting values from <paramref name="source"/> into this instance.
+        /// Copies mod setting values from <paramref name="source"/> into this instance, overwriting all existing settings.
         /// </summary>
         /// <param name="source">The mod to copy properties from.</param>
         public void CopyFrom(Mod source)
@@ -147,9 +147,7 @@ namespace osu.Game.Rulesets.Mods
                 var targetBindable = (IBindable)prop.GetValue(this);
                 var sourceBindable = (IBindable)prop.GetValue(source);
 
-                // we only care about changes that have been made away from defaults.
-                if (!sourceBindable.IsDefault)
-                    CopyAdjustedSetting(targetBindable, sourceBindable);
+                CopyAdjustedSetting(targetBindable, sourceBindable);
             }
         }
 

From 8204d360a8d84f5ac3fe2eec40155999c23a5ba2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 13:44:42 +0900
Subject: [PATCH 1385/3722] Always reset local user settings when a mod is
 deselected in ModSelectOverlay

---
 osu.Game/Overlays/Mods/ModButton.cs           |  2 ++
 osu.Game/Overlays/Mods/ModSection.cs          |  4 +++-
 osu.Game/Rulesets/Mods/Mod.cs                 |  5 +++++
 osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs | 11 +++++++++++
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index 8e0d1f5bbd..06f2fea43f 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -69,6 +69,8 @@ namespace osu.Game.Overlays.Mods
 
             Mod newSelection = SelectedMod ?? Mods[0];
 
+            newSelection.ResetSettingsToDefaults();
+
             Schedule(() =>
             {
                 if (beforeSelected != Selected)
diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index ecbcba7ad3..08bd3f8622 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -197,8 +197,10 @@ namespace osu.Game.Overlays.Mods
                     continue;
 
                 var buttonMod = button.Mods[index];
-                buttonMod.CopyFrom(mod);
                 button.SelectAt(index);
+
+                // the selection above will reset settings to defaults, but as this is an external change we want to copy the new settings across.
+                buttonMod.CopyFrom(mod);
                 return;
             }
 
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index dec72d94e5..2a11c92223 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -173,5 +173,10 @@ namespace osu.Game.Rulesets.Mods
         }
 
         public bool Equals(IMod other) => GetType() == other?.GetType();
+
+        /// <summary>
+        /// Reset all custom settings for this mod back to their defaults.
+        /// </summary>
+        public virtual void ResetSettingsToDefaults() => CopyFrom((Mod)Activator.CreateInstance(GetType()));
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
index a531e885db..dbc35569e7 100644
--- a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
@@ -141,5 +141,16 @@ namespace osu.Game.Rulesets.Mods
             ApplySetting(DrainRate, dr => difficulty.DrainRate = dr);
             ApplySetting(OverallDifficulty, od => difficulty.OverallDifficulty = od);
         }
+
+        public override void ResetSettingsToDefaults()
+        {
+            base.ResetSettingsToDefaults();
+
+            if (difficulty != null)
+            {
+                // base implementation potentially overwrite modified defaults that came from a beatmap selection.
+                TransferSettings(difficulty);
+            }
+        }
     }
 }

From 71e564d399e617d6083d8540bdcdc2d89a18d2e3 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 9 Feb 2021 07:46:00 +0300
Subject: [PATCH 1386/3722] Revert clients to be `Component`s

---
 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs | 4 ++--
 osu.Game/Online/Spectator/SpectatorStreamingClient.cs    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 06f6754258..18464a5f61 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -12,7 +12,7 @@ using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.ObjectExtensions;
-using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics;
 using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
@@ -28,7 +28,7 @@ using osu.Game.Utils;
 
 namespace osu.Game.Online.Multiplayer
 {
-    public abstract class StatefulMultiplayerClient : CompositeDrawable, IMultiplayerClient, IMultiplayerRoomServer
+    public abstract class StatefulMultiplayerClient : Component, IMultiplayerClient, IMultiplayerRoomServer
     {
         /// <summary>
         /// Invoked when any change occurs to the multiplayer room.
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 7cea76c969..33ebe27937 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -10,7 +10,7 @@ using JetBrains.Annotations;
 using Microsoft.AspNetCore.SignalR.Client;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Replays.Legacy;
@@ -23,7 +23,7 @@ using osu.Game.Screens.Play;
 
 namespace osu.Game.Online.Spectator
 {
-    public class SpectatorStreamingClient : CompositeDrawable, ISpectatorClient
+    public class SpectatorStreamingClient : Component, ISpectatorClient
     {
         /// <summary>
         /// The maximum milliseconds between frame bundle sends.

From 848b81e952934ee90f3cc4e86428bb385c0fdde6 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 9 Feb 2021 07:53:22 +0300
Subject: [PATCH 1387/3722] Remove necessity of making hub client connector a
 component

---
 osu.Game/Online/HubClientConnector.cs | 51 ++++++++++++++-------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Online/HubClientConnector.cs b/osu.Game/Online/HubClientConnector.cs
index 49b1ab639a..b740aabb92 100644
--- a/osu.Game/Online/HubClientConnector.cs
+++ b/osu.Game/Online/HubClientConnector.cs
@@ -4,15 +4,14 @@
 #nullable enable
 
 using System;
+using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.SignalR.Client;
 using Microsoft.Extensions.DependencyInjection;
 using Newtonsoft.Json;
 using osu.Framework;
-using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics;
 using osu.Framework.Logging;
 using osu.Game.Online.API;
 
@@ -21,7 +20,7 @@ namespace osu.Game.Online
     /// <summary>
     /// A component that maintains over a hub connection between client and server.
     /// </summary>
-    public class HubClientConnector : Component
+    public class HubClientConnector : IDisposable
     {
         /// <summary>
         /// Invoked whenever a new hub connection is built.
@@ -30,6 +29,7 @@ namespace osu.Game.Online
 
         private readonly string clientName;
         private readonly string endpoint;
+        private readonly IAPIProvider? api;
 
         /// <summary>
         /// The current connection opened by this connector.
@@ -45,9 +45,6 @@ namespace osu.Game.Online
         private readonly SemaphoreSlim connectionLock = new SemaphoreSlim(1);
         private CancellationTokenSource connectCancelSource = new CancellationTokenSource();
 
-        [Resolved]
-        private IAPIProvider api { get; set; } = null!;
-
         private readonly IBindable<APIState> apiState = new Bindable<APIState>();
 
         /// <summary>
@@ -55,30 +52,32 @@ namespace osu.Game.Online
         /// </summary>
         /// <param name="clientName">The name of the client this connector connects for, used for logging.</param>
         /// <param name="endpoint">The endpoint to the hub.</param>
-        public HubClientConnector(string clientName, string endpoint)
+        /// <param name="api">The API provider for listening to state changes, or null to not listen.</param>
+        public HubClientConnector(string clientName, string endpoint, IAPIProvider? api)
         {
             this.clientName = clientName;
             this.endpoint = endpoint;
-        }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            apiState.BindTo(api.State);
-            apiState.BindValueChanged(state =>
+            this.api = api;
+
+            if (api != null)
             {
-                switch (state.NewValue)
+                apiState.BindTo(api.State);
+                apiState.BindValueChanged(state =>
                 {
-                    case APIState.Failing:
-                    case APIState.Offline:
-                        Task.Run(() => disconnect(true));
-                        break;
+                    switch (state.NewValue)
+                    {
+                        case APIState.Failing:
+                        case APIState.Offline:
+                            Task.Run(() => disconnect(true));
+                            break;
 
-                    case APIState.Online:
-                        Task.Run(connect);
-                        break;
-                }
-            });
+                        case APIState.Online:
+                            Task.Run(connect);
+                            break;
+                    }
+                }, true);
+            }
         }
 
         private async Task connect()
@@ -137,6 +136,8 @@ namespace osu.Game.Online
 
         private HubConnection createConnection(CancellationToken cancellationToken)
         {
+            Debug.Assert(api != null);
+
             var builder = new HubConnectionBuilder()
                 .WithUrl(endpoint, options => { options.Headers.Add("Authorization", $"Bearer {api.AccessToken}"); });
 
@@ -200,9 +201,9 @@ namespace osu.Game.Online
 
         public override string ToString() => $"Connector for {clientName} ({(IsConnected.Value ? "connected" : "not connected")}";
 
-        protected override void Dispose(bool isDisposing)
+        public void Dispose()
         {
-            base.Dispose(isDisposing);
+            apiState.UnbindAll();
             cancelExistingConnect();
         }
     }

From 0efad9ded10e03233ef2f14d644260178d9c746d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 13:54:13 +0900
Subject: [PATCH 1388/3722] Add test coverage of setting reset on deselection

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

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 37ebc72984..85350c028c 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -47,6 +47,24 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("show", () => modSelect.Show());
         }
 
+        [Test]
+        public void TestSettingsResetOnDeselection()
+        {
+            var osuModDoubleTime = new OsuModDoubleTime { SpeedChange = { Value = 1.2 } };
+
+            changeRuleset(0);
+
+            AddStep("set dt mod with custom rate", () => { SelectedMods.Value = new[] { osuModDoubleTime }; });
+
+            AddAssert("selected mod matches", () => (SelectedMods.Value.Single() as OsuModDoubleTime)?.SpeedChange.Value == 1.2);
+
+            AddStep("deselect", () => modSelect.DeselectAllButton.Click());
+            AddAssert("selected mods empty", () => SelectedMods.Value.Count == 0);
+
+            AddStep("reselect", () => modSelect.GetModButton(osuModDoubleTime).Click());
+            AddAssert("selected mod has default value", () => (SelectedMods.Value.Single() as OsuModDoubleTime)?.SpeedChange.IsDefault == true);
+        }
+
         [Test]
         public void TestAnimationFlushOnClose()
         {

From f04d6d5e5e98ddbdc0d94e4825d4d31392024be7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 9 Feb 2021 08:02:32 +0300
Subject: [PATCH 1389/3722] Update hub clients with changes to connecotr

---
 .../Visual/Gameplay/TestSceneSpectator.cs     |  2 -
 ...TestSceneMultiplayerGameplayLeaderboard.cs |  2 -
 .../Online/Multiplayer/MultiplayerClient.cs   | 46 +++++++++++++------
 .../Spectator/SpectatorStreamingClient.cs     | 45 ++++++++++--------
 4 files changed, 56 insertions(+), 39 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 61b0961638..4a0e1282c4 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -232,8 +232,6 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         public class TestSpectatorStreamingClient : SpectatorStreamingClient
         {
-            protected override IBindable<bool> IsConnected { get; } = new BindableBool(false);
-
             public readonly User StreamingUser = new User { Id = 55, Username = "Test user" };
 
             public new BindableList<int> PlayingUsers => (BindableList<int>)base.PlayingUsers;
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
index 6a777e2a78..aab69d687a 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -95,8 +95,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         public class TestMultiplayerStreaming : SpectatorStreamingClient
         {
-            protected override IBindable<bool> IsConnected { get; } = new BindableBool(false);
-
             public new BindableList<int> PlayingUsers => (BindableList<int>)base.PlayingUsers;
 
             private readonly int totalUsers;
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 07036e7ffc..6b67954351 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.SignalR.Client;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
@@ -15,32 +16,41 @@ namespace osu.Game.Online.Multiplayer
 {
     public class MultiplayerClient : StatefulMultiplayerClient
     {
-        private readonly HubClientConnector connector;
+        private readonly string endpoint;
+        private HubClientConnector? connector;
 
-        public override IBindable<bool> IsConnected => connector.IsConnected;
+        public override IBindable<bool> IsConnected { get; } = new BindableBool();
 
-        private HubConnection? connection => connector.CurrentConnection;
+        private HubConnection? connection => connector?.CurrentConnection;
 
         public MultiplayerClient(EndpointConfiguration endpoints)
         {
-            InternalChild = connector = new HubClientConnector("Multiplayer client", endpoints.MultiplayerEndpointUrl)
+            endpoint = endpoints.MultiplayerEndpointUrl;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(IAPIProvider api)
+        {
+            connector = new HubClientConnector(nameof(MultiplayerClient), endpoint, api)
             {
-                OnNewConnection = newConnection =>
+                OnNewConnection = connection =>
                 {
                     // this is kind of SILLY
                     // https://github.com/dotnet/aspnetcore/issues/15198
-                    newConnection.On<MultiplayerRoomState>(nameof(IMultiplayerClient.RoomStateChanged), ((IMultiplayerClient)this).RoomStateChanged);
-                    newConnection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserJoined), ((IMultiplayerClient)this).UserJoined);
-                    newConnection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserLeft), ((IMultiplayerClient)this).UserLeft);
-                    newConnection.On<int>(nameof(IMultiplayerClient.HostChanged), ((IMultiplayerClient)this).HostChanged);
-                    newConnection.On<MultiplayerRoomSettings>(nameof(IMultiplayerClient.SettingsChanged), ((IMultiplayerClient)this).SettingsChanged);
-                    newConnection.On<int, MultiplayerUserState>(nameof(IMultiplayerClient.UserStateChanged), ((IMultiplayerClient)this).UserStateChanged);
-                    newConnection.On(nameof(IMultiplayerClient.LoadRequested), ((IMultiplayerClient)this).LoadRequested);
-                    newConnection.On(nameof(IMultiplayerClient.MatchStarted), ((IMultiplayerClient)this).MatchStarted);
-                    newConnection.On(nameof(IMultiplayerClient.ResultsReady), ((IMultiplayerClient)this).ResultsReady);
-                    newConnection.On<int, IEnumerable<APIMod>>(nameof(IMultiplayerClient.UserModsChanged), ((IMultiplayerClient)this).UserModsChanged);
+                    connection.On<MultiplayerRoomState>(nameof(IMultiplayerClient.RoomStateChanged), ((IMultiplayerClient)this).RoomStateChanged);
+                    connection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserJoined), ((IMultiplayerClient)this).UserJoined);
+                    connection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserLeft), ((IMultiplayerClient)this).UserLeft);
+                    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);
+                    connection.On(nameof(IMultiplayerClient.LoadRequested), ((IMultiplayerClient)this).LoadRequested);
+                    connection.On(nameof(IMultiplayerClient.MatchStarted), ((IMultiplayerClient)this).MatchStarted);
+                    connection.On(nameof(IMultiplayerClient.ResultsReady), ((IMultiplayerClient)this).ResultsReady);
+                    connection.On<int, IEnumerable<APIMod>>(nameof(IMultiplayerClient.UserModsChanged), ((IMultiplayerClient)this).UserModsChanged);
                 },
             };
+
+            IsConnected.BindTo(connector.IsConnected);
         }
 
         protected override Task<MultiplayerRoom> JoinRoom(long roomId)
@@ -106,5 +116,11 @@ namespace osu.Game.Online.Multiplayer
 
             return connection.InvokeAsync(nameof(IMultiplayerServer.StartMatch));
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            connector?.Dispose();
+        }
     }
 }
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 33ebe27937..4ef59b5e47 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -30,9 +30,11 @@ namespace osu.Game.Online.Spectator
         /// </summary>
         public const double TIME_BETWEEN_SENDS = 200;
 
-        private readonly HubClientConnector connector;
+        private readonly string endpoint;
 
-        protected virtual IBindable<bool> IsConnected => connector.IsConnected;
+        private HubClientConnector connector;
+
+        private readonly IBindable<bool> isConnected = new BindableBool();
 
         private HubConnection connection => connector.CurrentConnection;
 
@@ -77,23 +79,24 @@ namespace osu.Game.Online.Spectator
 
         public SpectatorStreamingClient(EndpointConfiguration endpoints)
         {
-            InternalChild = connector = new HubClientConnector("Spectator client", endpoints.SpectatorEndpointUrl)
-            {
-                OnNewConnection = newConnection =>
-                {
-                    // until strong typed client support is added, each method must be manually bound
-                    // (see https://github.com/dotnet/aspnetcore/issues/15198)
-                    newConnection.On<int, SpectatorState>(nameof(ISpectatorClient.UserBeganPlaying), ((ISpectatorClient)this).UserBeganPlaying);
-                    newConnection.On<int, FrameDataBundle>(nameof(ISpectatorClient.UserSentFrames), ((ISpectatorClient)this).UserSentFrames);
-                    newConnection.On<int, SpectatorState>(nameof(ISpectatorClient.UserFinishedPlaying), ((ISpectatorClient)this).UserFinishedPlaying);
-                }
-            };
+            endpoint = endpoints.SpectatorEndpointUrl;
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(IAPIProvider api)
         {
-            IsConnected.BindValueChanged(connected =>
+            connector = CreateConnector(nameof(SpectatorStreamingClient), endpoint, api);
+            connector.OnNewConnection = connection =>
+            {
+                // until strong typed client support is added, each method must be manually bound
+                // (see https://github.com/dotnet/aspnetcore/issues/15198)
+                connection.On<int, SpectatorState>(nameof(ISpectatorClient.UserBeganPlaying), ((ISpectatorClient)this).UserBeganPlaying);
+                connection.On<int, FrameDataBundle>(nameof(ISpectatorClient.UserSentFrames), ((ISpectatorClient)this).UserSentFrames);
+                connection.On<int, SpectatorState>(nameof(ISpectatorClient.UserFinishedPlaying), ((ISpectatorClient)this).UserFinishedPlaying);
+            };
+
+            isConnected.BindTo(connector.IsConnected);
+            isConnected.BindValueChanged(connected =>
             {
                 if (connected.NewValue)
                 {
@@ -121,6 +124,8 @@ namespace osu.Game.Online.Spectator
             }, true);
         }
 
+        protected virtual HubClientConnector CreateConnector(string name, string endpoint, IAPIProvider api) => new HubClientConnector(name, endpoint, api);
+
         Task ISpectatorClient.UserBeganPlaying(int userId, SpectatorState state)
         {
             if (!playingUsers.Contains(userId))
@@ -169,14 +174,14 @@ namespace osu.Game.Online.Spectator
         {
             Debug.Assert(isPlaying);
 
-            if (!IsConnected.Value) return;
+            if (!isConnected.Value) return;
 
             connection.SendAsync(nameof(ISpectatorServer.BeginPlaySession), currentState);
         }
 
         public void SendFrames(FrameDataBundle data)
         {
-            if (!IsConnected.Value) return;
+            if (!isConnected.Value) return;
 
             lastSend = connection.SendAsync(nameof(ISpectatorServer.SendFrameData), data);
         }
@@ -186,7 +191,7 @@ namespace osu.Game.Online.Spectator
             isPlaying = false;
             currentBeatmap = null;
 
-            if (!IsConnected.Value) return;
+            if (!isConnected.Value) return;
 
             connection.SendAsync(nameof(ISpectatorServer.EndPlaySession), currentState);
         }
@@ -200,7 +205,7 @@ namespace osu.Game.Online.Spectator
 
                 watchingUsers.Add(userId);
 
-                if (!IsConnected.Value)
+                if (!isConnected.Value)
                     return;
             }
 
@@ -213,7 +218,7 @@ namespace osu.Game.Online.Spectator
             {
                 watchingUsers.Remove(userId);
 
-                if (!IsConnected.Value)
+                if (!isConnected.Value)
                     return;
             }
 

From a0ead38496b9dcb9ead023729765c437e7902f95 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 9 Feb 2021 08:02:51 +0300
Subject: [PATCH 1390/3722] Prevent test spectator clients from attempting hub
 connections

---
 osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs       | 7 +++++++
 .../Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 4a0e1282c4..1e499f20cb 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -12,6 +12,7 @@ using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Online;
+using osu.Game.Online.API;
 using osu.Game.Online.Spectator;
 using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets.Osu;
@@ -243,6 +244,12 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
             }
 
+            protected override HubClientConnector CreateConnector(string name, string endpoint, IAPIProvider api)
+            {
+                // do not pass API to prevent attempting failing connections on an actual hub.
+                return base.CreateConnector(name, endpoint, null);
+            }
+
             public void StartPlay(int beatmapId)
             {
                 this.beatmapId = beatmapId;
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
index aab69d687a..b459cebdd7 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -13,6 +13,7 @@ using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Database;
 using osu.Game.Online;
+using osu.Game.Online.API;
 using osu.Game.Online.Spectator;
 using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets.Osu.Scoring;
@@ -105,6 +106,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 this.totalUsers = totalUsers;
             }
 
+            protected override HubClientConnector CreateConnector(string name, string endpoint, IAPIProvider api)
+            {
+                // do not pass API to prevent attempting failing connections on an actual hub.
+                return base.CreateConnector(name, endpoint, null);
+            }
+
             public void Start(int beatmapId)
             {
                 for (int i = 0; i < totalUsers; i++)

From b96a594546b38a866c7e661b707de04518407baf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 15:11:58 +0900
Subject: [PATCH 1391/3722] Remove unnecessary initial call to HitObjectApplied
 bound method

Was causing test failures. Looks to be unnecessary on a check of when
HitObjectApplied is invoked.
---
 osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs b/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
index 8eb2714c04..f9b8ffca7b 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
@@ -45,7 +45,6 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             BorderColour = skin.GetConfig<OsuSkinColour, Color4>(OsuSkinColour.SliderBorder)?.Value ?? Color4.White;
 
             drawableObject.HitObjectApplied += onHitObjectApplied;
-            onHitObjectApplied(drawableObject);
         }
 
         private void onHitObjectApplied(DrawableHitObject obj)

From 695e46a358ba1dd75da161ee70e09bd19d462334 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 15:31:55 +0900
Subject: [PATCH 1392/3722] Fix AutoPilot mod failing to block touch input

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

diff --git a/osu.Game.Rulesets.Osu/OsuInputManager.cs b/osu.Game.Rulesets.Osu/OsuInputManager.cs
index c8fe4f41ca..7314021a14 100644
--- a/osu.Game.Rulesets.Osu/OsuInputManager.cs
+++ b/osu.Game.Rulesets.Osu/OsuInputManager.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Osu
 
         protected override bool Handle(UIEvent e)
         {
-            if (e is MouseMoveEvent && !AllowUserCursorMovement) return false;
+            if ((e is MouseMoveEvent || e is TouchMoveEvent) && !AllowUserCursorMovement) return false;
 
             return base.Handle(e);
         }

From b87327841dec18cda4edcc9c6ee4a52d4b8ebf29 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 15:46:23 +0900
Subject: [PATCH 1393/3722] Add test covering initial state propagation

---
 .../TestSceneMultiplayerParticipantsList.cs   | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index c3852fafd4..0f7a9b442d 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
@@ -22,16 +22,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
     public class TestSceneMultiplayerParticipantsList : MultiplayerTestScene
     {
         [SetUp]
-        public new void Setup() => Schedule(() =>
-        {
-            Child = new ParticipantsList
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                RelativeSizeAxes = Axes.Y,
-                Size = new Vector2(380, 0.7f)
-            };
-        });
+        public new void Setup() => Schedule(createNewParticipantsList);
 
         [Test]
         public void TestAddUser()
@@ -92,6 +83,14 @@ namespace osu.Game.Tests.Visual.Multiplayer
             checkProgressBarVisibility(true);
         }
 
+        [Test]
+        public void TestCorrectInitialState()
+        {
+            AddStep("set to downloading map", () => Client.ChangeBeatmapAvailability(BeatmapAvailability.Downloading(0)));
+            AddStep("recreate list", createNewParticipantsList);
+            checkProgressBarVisibility(true);
+        }
+
         [Test]
         public void TestBeatmapDownloadingStates()
         {
@@ -212,6 +211,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
             }
         }
 
+        private void createNewParticipantsList()
+        {
+            Child = new ParticipantsList { Anchor = Anchor.Centre, Origin = Anchor.Centre, RelativeSizeAxes = Axes.Y, Size = new Vector2(380, 0.7f) };
+        }
+
         private void checkProgressBarVisibility(bool visible) =>
             AddUntilStep($"progress bar {(visible ? "is" : "is not")}visible", () =>
                 this.ChildrenOfType<ProgressBar>().Single().IsPresent == visible);

From 04c243386b136359a81606c612686fe1a8754527 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 16:02:56 +0900
Subject: [PATCH 1394/3722] Fix initial state transfer regressing

---
 .../OnlinePlayBeatmapAvailablilityTracker.cs  | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
index cfaf43451f..d6f4c45a75 100644
--- a/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
+++ b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
@@ -29,18 +29,6 @@ namespace osu.Game.Online.Rooms
 
         private ScheduledDelegate progressUpdate;
 
-        public OnlinePlayBeatmapAvailablilityTracker()
-        {
-            State.BindValueChanged(_ => updateAvailability());
-            Progress.BindValueChanged(_ =>
-            {
-                // incoming progress changes are going to be at a very high rate.
-                // we don't want to flood the network with this, so rate limit how often we send progress updates.
-                if (progressUpdate?.Completed != false)
-                    progressUpdate = Scheduler.AddDelayed(updateAvailability, progressUpdate == null ? 0 : 500);
-            });
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -54,6 +42,16 @@ namespace osu.Game.Online.Rooms
 
                 Model.Value = item.NewValue.Beatmap.Value.BeatmapSet;
             }, true);
+
+            Progress.BindValueChanged(_ =>
+            {
+                // incoming progress changes are going to be at a very high rate.
+                // we don't want to flood the network with this, so rate limit how often we send progress updates.
+                if (progressUpdate?.Completed != false)
+                    progressUpdate = Scheduler.AddDelayed(updateAvailability, progressUpdate == null ? 0 : 500);
+            });
+
+            State.BindValueChanged(_ => updateAvailability(), true);
         }
 
         protected override bool VerifyDatabasedModel(BeatmapSetInfo databasedSet)

From 5bd4f74ddf752f3ddc83d67d8ea48708a0248b13 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 16:24:29 +0900
Subject: [PATCH 1395/3722] Fix a potential crash when exiting play during the
 results screen transition

---
 osu.Game/Screens/Play/Player.cs | 48 +++++++++++++++++----------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 5d06ac5b3a..dbee49b5dd 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -339,7 +339,7 @@ namespace osu.Game.Screens.Play
                     {
                         HoldToQuit =
                         {
-                            Action = performUserRequestedExit,
+                            Action = () => PerformExit(true),
                             IsPaused = { BindTarget = GameplayClockContainer.IsPaused }
                         },
                         PlayerSettingsOverlay = { PlaybackSettings = { UserPlaybackRate = { BindTarget = GameplayClockContainer.UserPlaybackRate } } },
@@ -363,14 +363,14 @@ namespace osu.Game.Screens.Play
                     FailOverlay = new FailOverlay
                     {
                         OnRetry = Restart,
-                        OnQuit = performUserRequestedExit,
+                        OnQuit = () => PerformExit(true),
                     },
                     PauseOverlay = new PauseOverlay
                     {
                         OnResume = Resume,
                         Retries = RestartCount,
                         OnRetry = Restart,
-                        OnQuit = performUserRequestedExit,
+                        OnQuit = () => PerformExit(true),
                     },
                     new HotkeyExitOverlay
                     {
@@ -487,14 +487,30 @@ namespace osu.Game.Screens.Play
             // if a restart has been requested, cancel any pending completion (user has shown intent to restart).
             completionProgressDelegate?.Cancel();
 
-            ValidForResume = false;
-
-            if (!this.IsCurrentScreen()) return;
+            if (!this.IsCurrentScreen())
+            {
+                // there is a chance that the exit was performed after the transition to results has started.
+                // we want to give the user what they want, so forcefully return to this screen (to proceed with the upwards exit process).
+                ValidForResume = false;
+                this.MakeCurrent();
+            }
 
             if (userRequested)
-                performUserRequestedExit();
-            else
-                this.Exit();
+            {
+                if (ValidForResume && HasFailed && !FailOverlay.IsPresent)
+                {
+                    failAnimation.FinishTransforms(true);
+                    return;
+                }
+
+                if (canPause)
+                {
+                    Pause();
+                    return;
+                }
+            }
+
+            this.Exit();
         }
 
         private void performUserRequestedSkip()
@@ -508,20 +524,6 @@ namespace osu.Game.Screens.Play
             updateSampleDisabledState();
         }
 
-        private void performUserRequestedExit()
-        {
-            if (ValidForResume && HasFailed && !FailOverlay.IsPresent)
-            {
-                failAnimation.FinishTransforms(true);
-                return;
-            }
-
-            if (canPause)
-                Pause();
-            else
-                this.Exit();
-        }
-
         /// <summary>
         /// Restart gameplay via a parent <see cref="PlayerLoader"/>.
         /// <remarks>This can be called from a child screen in order to trigger the restart process.</remarks>

From 61b9539864289b9ded799cac93187fc641c3db35 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 17:14:16 +0900
Subject: [PATCH 1396/3722] Fix regression in quick exit logic

---
 osu.Game/Screens/Play/Player.cs | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index dbee49b5dd..3f8651761e 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -478,11 +478,11 @@ namespace osu.Game.Screens.Play
         /// <summary>
         /// Exits the <see cref="Player"/>.
         /// </summary>
-        /// <param name="userRequested">
-        /// Whether the exit is requested by the user, or a higher-level game component.
-        /// Pausing is allowed only in the former case.
+        /// <param name="showDialogFirst">
+        /// Whether the pause or fail dialog should be shown before performing an exit.
+        /// If true and a dialog is not yet displayed, the exit will be blocked the the relevant dialog will display instead.
         /// </param>
-        protected void PerformExit(bool userRequested)
+        protected void PerformExit(bool showDialogFirst)
         {
             // if a restart has been requested, cancel any pending completion (user has shown intent to restart).
             completionProgressDelegate?.Cancel();
@@ -495,7 +495,7 @@ namespace osu.Game.Screens.Play
                 this.MakeCurrent();
             }
 
-            if (userRequested)
+            if (showDialogFirst)
             {
                 if (ValidForResume && HasFailed && !FailOverlay.IsPresent)
                 {
@@ -503,7 +503,7 @@ namespace osu.Game.Screens.Play
                     return;
                 }
 
-                if (canPause)
+                if (canPause && !GameplayClockContainer.IsPaused.Value)
                 {
                     Pause();
                     return;
@@ -540,10 +540,7 @@ namespace osu.Game.Screens.Play
             sampleRestart?.Play();
             RestartRequested?.Invoke();
 
-            if (this.IsCurrentScreen())
-                PerformExit(true);
-            else
-                this.MakeCurrent();
+            PerformExit(false);
         }
 
         private ScheduledDelegate completionProgressDelegate;

From cba116ff090c650cbc4812f16e15ddfd13747e3f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 17:28:57 +0900
Subject: [PATCH 1397/3722] Fix incorrect call parameter for quick exit

---
 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 3f8651761e..8a977b0498 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -379,7 +379,7 @@ namespace osu.Game.Screens.Play
                             if (!this.IsCurrentScreen()) return;
 
                             fadeOut(true);
-                            PerformExit(true);
+                            PerformExit(false);
                         },
                     },
                     failAnimation = new FailAnimation(DrawableRuleset) { OnComplete = onFailComplete, },

From 2c052d70e8668bc9f64354fc14d3425b5f0e6552 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 17:29:18 +0900
Subject: [PATCH 1398/3722] Only trigger pause cooldown on pause (not exit)

---
 osu.Game/Screens/Play/Player.cs | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 8a977b0498..dda52f4dae 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -505,6 +505,10 @@ namespace osu.Game.Screens.Play
 
                 if (canPause && !GameplayClockContainer.IsPaused.Value)
                 {
+                    if (pauseCooldownActive && !GameplayClockContainer.IsPaused.Value)
+                        // still want to block if we are within the cooldown period and not already paused.
+                        return;
+
                     Pause();
                     return;
                 }
@@ -808,14 +812,6 @@ namespace osu.Game.Screens.Play
                 return true;
             }
 
-            // ValidForResume is false when restarting
-            if (ValidForResume)
-            {
-                if (pauseCooldownActive && !GameplayClockContainer.IsPaused.Value)
-                    // still want to block if we are within the cooldown period and not already paused.
-                    return true;
-            }
-
             // GameplayClockContainer performs seeks / start / stop operations on the beatmap's track.
             // as we are no longer the current screen, we cannot guarantee the track is still usable.
             GameplayClockContainer?.StopUsingBeatmapClock();

From 94f35825ddb28b8bf2d3e86562afc47dbd30e4a1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 17:29:27 +0900
Subject: [PATCH 1399/3722] Update test to cover changed exit/pause logic

I think this makes more sense?
---
 osu.Game.Tests/Visual/Gameplay/TestScenePause.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index 46dd91710a..ae806883b0 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -108,19 +108,19 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         [Test]
-        public void TestExitTooSoon()
+        public void TestExitSoonAfterResumeSucceeds()
         {
             AddStep("seek before gameplay", () => Player.GameplayClockContainer.Seek(-5000));
 
             pauseAndConfirm();
             resume();
 
-            AddStep("exit too soon", () => Player.Exit());
+            AddStep("exit quick", () => Player.Exit());
 
             confirmClockRunning(true);
             confirmPauseOverlayShown(false);
 
-            AddAssert("not exited", () => Player.IsCurrentScreen());
+            AddAssert("exited", () => !Player.IsCurrentScreen());
         }
 
         [Test]

From b5fa9508006c76decac0752a6bdaf47598196d4d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 18:30:05 +0900
Subject: [PATCH 1400/3722] Remove unnecessary depth specification

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

diff --git a/osu.Game/Overlays/OnlineOverlay.cs b/osu.Game/Overlays/OnlineOverlay.cs
index 4a7318d065..b07f91b9ed 100644
--- a/osu.Game/Overlays/OnlineOverlay.cs
+++ b/osu.Game/Overlays/OnlineOverlay.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Overlays
                         Direction = FillDirection.Vertical,
                         Children = new Drawable[]
                         {
-                            Header.With(h => h.Depth = -float.MaxValue),
+                            Header,
                             content = new Container
                             {
                                 RelativeSizeAxes = Axes.X,

From 178d88bcf197393fab133d3bd760d33c35b8e3c4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 18:32:44 +0900
Subject: [PATCH 1401/3722] Change BackgroundColour into a property

---
 osu.Game/Overlays/BeatmapListingOverlay.cs | 2 +-
 osu.Game/Overlays/BeatmapSetOverlay.cs     | 2 +-
 osu.Game/Overlays/ChangelogOverlay.cs      | 2 +-
 osu.Game/Overlays/FullscreenOverlay.cs     | 6 +++---
 osu.Game/Overlays/UserProfileOverlay.cs    | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index cfa0ff00bc..5df7a4650e 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Overlays
 
         protected override BeatmapListingHeader CreateHeader() => new BeatmapListingHeader();
 
-        protected override Color4 GetBackgroundColour() => ColourProvider.Background6;
+        protected override Color4 BackgroundColour => ColourProvider.Background6;
 
         private void onTypingStarted()
         {
diff --git a/osu.Game/Overlays/BeatmapSetOverlay.cs b/osu.Game/Overlays/BeatmapSetOverlay.cs
index 723b61bbc5..bdb3715e73 100644
--- a/osu.Game/Overlays/BeatmapSetOverlay.cs
+++ b/osu.Game/Overlays/BeatmapSetOverlay.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Overlays
 
         protected override BeatmapSetHeader CreateHeader() => new BeatmapSetHeader();
 
-        protected override Color4 GetBackgroundColour() => ColourProvider.Background6;
+        protected override Color4 BackgroundColour => ColourProvider.Background6;
 
         protected override void PopOutComplete()
         {
diff --git a/osu.Game/Overlays/ChangelogOverlay.cs b/osu.Game/Overlays/ChangelogOverlay.cs
index 5200b567ff..05bad30107 100644
--- a/osu.Game/Overlays/ChangelogOverlay.cs
+++ b/osu.Game/Overlays/ChangelogOverlay.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Overlays
             ListingSelected = ShowListing,
         };
 
-        protected override Color4 GetBackgroundColour() => ColourProvider.Background4;
+        protected override Color4 BackgroundColour => ColourProvider.Background4;
 
         public void ShowListing()
         {
diff --git a/osu.Game/Overlays/FullscreenOverlay.cs b/osu.Game/Overlays/FullscreenOverlay.cs
index d0a0c994aa..735f0bcbd4 100644
--- a/osu.Game/Overlays/FullscreenOverlay.cs
+++ b/osu.Game/Overlays/FullscreenOverlay.cs
@@ -23,6 +23,8 @@ namespace osu.Game.Overlays
 
         public T Header { get; }
 
+        protected virtual Color4 BackgroundColour => ColourProvider.Background5;
+
         [Resolved]
         protected IAPIProvider API { get; private set; }
 
@@ -59,7 +61,7 @@ namespace osu.Game.Overlays
                 new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = GetBackgroundColour()
+                    Colour = BackgroundColour
                 },
                 content = new Container
                 {
@@ -80,8 +82,6 @@ namespace osu.Game.Overlays
         [NotNull]
         protected abstract T CreateHeader();
 
-        protected virtual Color4 GetBackgroundColour() => ColourProvider.Background5;
-
         public override void Show()
         {
             if (State.Value == Visibility.Visible)
diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs
index ccd9c291c4..299a14b250 100644
--- a/osu.Game/Overlays/UserProfileOverlay.cs
+++ b/osu.Game/Overlays/UserProfileOverlay.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Overlays
 
         protected override ProfileHeader CreateHeader() => new ProfileHeader();
 
-        protected override Color4 GetBackgroundColour() => ColourProvider.Background6;
+        protected override Color4 BackgroundColour => ColourProvider.Background6;
 
         public void ShowUser(int userId) => ShowUser(new User { Id = userId });
 

From 167076663304d009769df70fae7feccdf4128f0b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 18:42:15 +0900
Subject: [PATCH 1402/3722] Avoid unbinding external events

---
 osu.Game/Overlays/RankingsOverlay.cs       | 44 +++++++++-------------
 osu.Game/Overlays/TabbableOnlineOverlay.cs |  2 +-
 2 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index 6cd72d6e2c..a093969115 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -17,8 +17,6 @@ namespace osu.Game.Overlays
     {
         protected Bindable<Country> Country => Header.Country;
 
-        protected Bindable<RankingsScope> Scope => Header.Current;
-
         private APIRequest lastRequest;
 
         [Resolved]
@@ -42,31 +40,31 @@ namespace osu.Game.Overlays
             {
                 // if a country is requested, force performance scope.
                 if (Country.Value != null)
-                    Scope.Value = RankingsScope.Performance;
+                    Header.Current.Value = RankingsScope.Performance;
 
-                Scheduler.AddOnce(loadNewContent);
-            });
-
-            // Unbind events from scope so base class event will not be called
-            Scope.UnbindEvents();
-            Scope.BindValueChanged(_ =>
-            {
-                // country filtering is only valid for performance scope.
-                if (Scope.Value != RankingsScope.Performance)
-                    Country.Value = null;
-
-                Scheduler.AddOnce(loadNewContent);
+                Scheduler.AddOnce(triggerTabChanged);
             });
 
             ruleset.BindValueChanged(_ =>
             {
-                if (Scope.Value == RankingsScope.Spotlights)
+                if (Header.Current.Value == RankingsScope.Spotlights)
                     return;
 
-                Scheduler.AddOnce(loadNewContent);
+                Scheduler.AddOnce(triggerTabChanged);
             });
         }
 
+        protected override void OnTabChanged(RankingsScope tab)
+        {
+            // country filtering is only valid for performance scope.
+            if (Header.Current.Value != RankingsScope.Performance)
+                Country.Value = null;
+
+            Scheduler.AddOnce(triggerTabChanged);
+        }
+
+        private void triggerTabChanged() => base.OnTabChanged(Header.Current.Value);
+
         protected override RankingsOverlayHeader CreateHeader() => new RankingsOverlayHeader();
 
         public void ShowCountry(Country requested)
@@ -79,17 +77,11 @@ namespace osu.Game.Overlays
             Country.Value = requested;
         }
 
-        public void ShowSpotlights()
-        {
-            Scope.Value = RankingsScope.Spotlights;
-            Show();
-        }
-
         protected override void CreateDisplayToLoad(RankingsScope tab)
         {
             lastRequest?.Cancel();
 
-            if (Scope.Value == RankingsScope.Spotlights)
+            if (Header.Current.Value == RankingsScope.Spotlights)
             {
                 LoadDisplay(new SpotlightsLayout
                 {
@@ -115,7 +107,7 @@ namespace osu.Game.Overlays
 
         private APIRequest createScopedRequest()
         {
-            switch (Scope.Value)
+            switch (Header.Current.Value)
             {
                 case RankingsScope.Performance:
                     return new GetUserRankingsRequest(ruleset.Value, country: Country.Value?.FlagName);
@@ -153,8 +145,6 @@ namespace osu.Game.Overlays
             return null;
         }
 
-        private void loadNewContent() => OnTabChanged(Scope.Value);
-
         protected override void Dispose(bool isDisposing)
         {
             lastRequest?.Cancel();
diff --git a/osu.Game/Overlays/TabbableOnlineOverlay.cs b/osu.Game/Overlays/TabbableOnlineOverlay.cs
index cbcf3cd96e..8172e99c1b 100644
--- a/osu.Game/Overlays/TabbableOnlineOverlay.cs
+++ b/osu.Game/Overlays/TabbableOnlineOverlay.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Overlays
             }, (cancellationToken = new CancellationTokenSource()).Token);
         }
 
-        protected void OnTabChanged(TEnum tab)
+        protected virtual void OnTabChanged(TEnum tab)
         {
             cancellationToken?.Cancel();
             Loading.Show();

From 17475e60b0a733344a60a619a3c4fc16f2d9b95d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 18:48:50 +0900
Subject: [PATCH 1403/3722] Fix missed test scene update

---
 osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs
index 626f545b91..aff510dd95 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Tests.Visual.Online
             Add(rankingsOverlay = new TestRankingsOverlay
             {
                 Country = { BindTarget = countryBindable },
-                Scope = { BindTarget = scope },
+                Header = { Current = { BindTarget = scope } },
             });
         }
 
@@ -65,8 +65,6 @@ namespace osu.Game.Tests.Visual.Online
         private class TestRankingsOverlay : RankingsOverlay
         {
             public new Bindable<Country> Country => base.Country;
-
-            public new Bindable<RankingsScope> Scope => base.Scope;
         }
     }
 }

From 0a96f4d403cf3be814b10de8e2d7cc3e4e2c335e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 18:56:27 +0900
Subject: [PATCH 1404/3722] Avoid assigning null to a non-nullable property

---
 .../Visual/Online/TestSceneFullscreenOverlay.cs       | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneFullscreenOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneFullscreenOverlay.cs
index f8b059e471..dc468bb62d 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneFullscreenOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneFullscreenOverlay.cs
@@ -53,7 +53,16 @@ namespace osu.Game.Tests.Visual.Online
                 };
             }
 
-            protected override OverlayHeader CreateHeader() => null;
+            protected override OverlayHeader CreateHeader() => new TestHeader();
+
+            internal class TestHeader : OverlayHeader
+            {
+                protected override OverlayTitle CreateTitle() => new TestTitle();
+
+                internal class TestTitle : OverlayTitle
+                {
+                }
+            }
         }
     }
 }

From d8d830db6e39a3d590dc3963f10e60a5919727fa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Feb 2021 19:46:57 +0900
Subject: [PATCH 1405/3722] Defer playlist load to improve load time of the now
 playing overlay

---
 osu.Game/Overlays/NowPlayingOverlay.cs | 37 +++++++++++++++++++-------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 9beb859f28..f94b41155a 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -84,11 +84,6 @@ namespace osu.Game.Overlays
                     AutoSizeAxes = Axes.Y,
                     Children = new Drawable[]
                     {
-                        playlist = new PlaylistOverlay
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            Y = player_height + 10,
-                        },
                         playerContainer = new Container
                         {
                             RelativeSizeAxes = Axes.X,
@@ -171,7 +166,7 @@ namespace osu.Game.Overlays
                                             Anchor = Anchor.CentreRight,
                                             Position = new Vector2(-bottom_black_area_height / 2, 0),
                                             Icon = FontAwesome.Solid.Bars,
-                                            Action = () => playlist.ToggleVisibility(),
+                                            Action = togglePlaylist
                                         },
                                     }
                                 },
@@ -191,13 +186,35 @@ namespace osu.Game.Overlays
             };
         }
 
+        private void togglePlaylist()
+        {
+            if (playlist == null)
+            {
+                LoadComponentAsync(playlist = new PlaylistOverlay
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Y = player_height + 10,
+                }, _ =>
+                {
+                    dragContainer.Add(playlist);
+
+                    playlist.BeatmapSets.BindTo(musicController.BeatmapSets);
+                    playlist.State.BindValueChanged(s => playlistButton.FadeColour(s.NewValue == Visibility.Visible ? colours.Yellow : Color4.White, 200, Easing.OutQuint), true);
+
+                    togglePlaylist();
+                });
+
+                return;
+            }
+
+            if (!beatmap.Disabled)
+                playlist.ToggleVisibility();
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            playlist.BeatmapSets.BindTo(musicController.BeatmapSets);
-            playlist.State.BindValueChanged(s => playlistButton.FadeColour(s.NewValue == Visibility.Visible ? colours.Yellow : Color4.White, 200, Easing.OutQuint), true);
-
             beatmap.BindDisabledChanged(beatmapDisabledChanged, true);
 
             musicController.TrackChanged += trackChanged;
@@ -306,7 +323,7 @@ namespace osu.Game.Overlays
         private void beatmapDisabledChanged(bool disabled)
         {
             if (disabled)
-                playlist.Hide();
+                playlist?.Hide();
 
             prevButton.Enabled.Value = !disabled;
             nextButton.Enabled.Value = !disabled;

From d9dcf8a042bc99e0161a49088784e06553c8b27e Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 9 Feb 2021 20:30:31 +0300
Subject: [PATCH 1406/3722] Fix incorrect header depth in OnlineOverlay

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

diff --git a/osu.Game/Overlays/OnlineOverlay.cs b/osu.Game/Overlays/OnlineOverlay.cs
index b07f91b9ed..4a7318d065 100644
--- a/osu.Game/Overlays/OnlineOverlay.cs
+++ b/osu.Game/Overlays/OnlineOverlay.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Overlays
                         Direction = FillDirection.Vertical,
                         Children = new Drawable[]
                         {
-                            Header,
+                            Header.With(h => h.Depth = -float.MaxValue),
                             content = new Container
                             {
                                 RelativeSizeAxes = Axes.X,

From e44667e5e073016b471c13d7cce1427d0db89be5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 10 Feb 2021 11:31:34 +0900
Subject: [PATCH 1407/3722] Use MinValue instead

Co-authored-by: Salman Ahmed <slmanarendo1950@gmail.com>
---
 osu.Game/Overlays/OnlineOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/OnlineOverlay.cs b/osu.Game/Overlays/OnlineOverlay.cs
index 4a7318d065..7c9f751d3b 100644
--- a/osu.Game/Overlays/OnlineOverlay.cs
+++ b/osu.Game/Overlays/OnlineOverlay.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Overlays
                         Direction = FillDirection.Vertical,
                         Children = new Drawable[]
                         {
-                            Header.With(h => h.Depth = -float.MaxValue),
+                            Header.With(h => h.Depth = float.MinValue),
                             content = new Container
                             {
                                 RelativeSizeAxes = Axes.X,

From e9ef4aaf88a8908596231461420bc83d5ccc569f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 10 Feb 2021 14:34:45 +0900
Subject: [PATCH 1408/3722] Add test covering expectations of external mod
 changes

---
 .../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 85350c028c..dec9e319ea 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -170,6 +170,31 @@ namespace osu.Game.Tests.Visual.UserInterface
             });
         }
 
+        [Test]
+        public void TestExternallySetModIsReplacedByOverlayInstance()
+        {
+            Mod external = new OsuModDoubleTime();
+            Mod overlayButtonMod = null;
+
+            changeRuleset(0);
+
+            AddStep("set mod externally", () => { SelectedMods.Value = new[] { external }; });
+
+            AddAssert("ensure button is selected", () =>
+            {
+                var button = modSelect.GetModButton(SelectedMods.Value.Single());
+                overlayButtonMod = button.SelectedMod;
+                return overlayButtonMod.GetType() == external.GetType();
+            });
+
+            // Right now, when an external change occurs, the ModSelectOverlay will replace the global instance with its own
+            AddAssert("mod instance doesn't match", () => external != overlayButtonMod);
+
+            AddAssert("one mod present in global selected", () => SelectedMods.Value.Count == 1);
+            AddAssert("globally selected matches button's mod instance", () => SelectedMods.Value.Contains(overlayButtonMod));
+            AddAssert("globally selected doesn't contain original external change", () => !SelectedMods.Value.Contains(external));
+        }
+
         [Test]
         public void TestNonStacked()
         {

From 52f0f3f3b212fb2d38057073138755b9e73c858b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 10 Feb 2021 14:38:15 +0900
Subject: [PATCH 1409/3722] Add a note about SelectedMods behavioural quirks

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

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 20d88d33f2..d3936ed27e 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -98,7 +98,14 @@ namespace osu.Game
         [Cached(typeof(IBindable<RulesetInfo>))]
         protected readonly Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
 
-        // todo: move this to SongSelect once Screen has the ability to unsuspend.
+        /// <summary>
+        /// The current mod selection for the local user.
+        /// </summary>
+        /// <remarks>
+        /// If a mod select overlay is present, mod instances set to this value are not guaranteed to remain as the provided instance and will be overwritten by a copy.
+        /// In such a case, changes to settings of a mod will *not* propagate after a mod is added to this collection.
+        /// As such, all settings should be finalised before adding a mod to this collection.
+        /// </remarks>
         [Cached]
         [Cached(typeof(IBindable<IReadOnlyList<Mod>>))]
         protected readonly Bindable<IReadOnlyList<Mod>> SelectedMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());

From de8a60435fca3f4644efa5b268848829b3812ae8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 10 Feb 2021 14:44:37 +0900
Subject: [PATCH 1410/3722] Add failing test covering reported breaking case

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

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index dec9e319ea..9ca1d4102a 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -170,6 +170,20 @@ namespace osu.Game.Tests.Visual.UserInterface
             });
         }
 
+        [Test]
+        public void TestSettingsAreRetainedOnReload()
+        {
+            changeRuleset(0);
+
+            AddStep("set customized mod externally", () => SelectedMods.Value = new[] { new OsuModDoubleTime { SpeedChange = { Value = 1.01 } } });
+
+            AddAssert("setting remains", () => (SelectedMods.Value.SingleOrDefault() as OsuModDoubleTime)?.SpeedChange.Value == 1.01);
+
+            AddStep("create overlay", () => createDisplay(() => new TestNonStackedModSelectOverlay()));
+
+            AddAssert("setting remains", () => (SelectedMods.Value.SingleOrDefault() as OsuModDoubleTime)?.SpeedChange.Value == 1.01);
+        }
+
         [Test]
         public void TestExternallySetModIsReplacedByOverlayInstance()
         {

From 75bc9f607e30495763ec305fe7f6fae608931754 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 10 Feb 2021 14:55:15 +0900
Subject: [PATCH 1411/3722] Rename wrongly named method

---
 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 93fe693937..21ed9af421 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -479,10 +479,10 @@ namespace osu.Game.Overlays.Mods
             foreach (var section in ModSectionsContainer.Children)
                 section.UpdateSelectedButtons(selectedMods);
 
-            updateMods();
+            updateMultiplier();
         }
 
-        private void updateMods()
+        private void updateMultiplier()
         {
             var multiplier = 1.0;
 

From a39263423c95dd25344dff4e4a5e56afb0842d3a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 10 Feb 2021 15:12:29 +0900
Subject: [PATCH 1412/3722] Fix externally changed settings from being reset
 when ModSelectOverlay is initialised

---
 osu.Game/Overlays/Mods/ModButton.cs  | 16 ++++++++++++----
 osu.Game/Overlays/Mods/ModSection.cs |  5 +++--
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index 06f2fea43f..5e3733cd5e 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -46,8 +46,9 @@ namespace osu.Game.Overlays.Mods
         /// Change the selected mod index of this button.
         /// </summary>
         /// <param name="newIndex">The new index.</param>
+        /// <param name="resetSettings">Whether any settings applied to the mod should be reset on selection.</param>
         /// <returns>Whether the selection changed.</returns>
-        private bool changeSelectedIndex(int newIndex)
+        private bool changeSelectedIndex(int newIndex, bool resetSettings = true)
         {
             if (newIndex == selectedIndex) return false;
 
@@ -69,7 +70,8 @@ namespace osu.Game.Overlays.Mods
 
             Mod newSelection = SelectedMod ?? Mods[0];
 
-            newSelection.ResetSettingsToDefaults();
+            if (resetSettings)
+                newSelection.ResetSettingsToDefaults();
 
             Schedule(() =>
             {
@@ -211,11 +213,17 @@ namespace osu.Game.Overlays.Mods
             Deselect();
         }
 
-        public bool SelectAt(int index)
+        /// <summary>
+        /// Select the mod at the provided index.
+        /// </summary>
+        /// <param name="index">The index to select.</param>
+        /// <param name="resetSettings">Whether any settings applied to the mod should be reset on selection.</param>
+        /// <returns>Whether the selection changed.</returns>
+        public bool SelectAt(int index, bool resetSettings = true)
         {
             if (!Mods[index].HasImplementation) return false;
 
-            changeSelectedIndex(index);
+            changeSelectedIndex(index, resetSettings);
             return true;
         }
 
diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 08bd3f8622..71ecef2b82 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -197,9 +197,10 @@ namespace osu.Game.Overlays.Mods
                     continue;
 
                 var buttonMod = button.Mods[index];
-                button.SelectAt(index);
 
-                // the selection above will reset settings to defaults, but as this is an external change we want to copy the new settings across.
+                button.SelectAt(index, false);
+
+                // as this is likely coming from an external change, ensure the settings of the mod are in sync.
                 buttonMod.CopyFrom(mod);
                 return;
             }

From 435c85a2e79b8682d093c261054c8d4ad67215b4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 10 Feb 2021 15:13:09 +0900
Subject: [PATCH 1413/3722] Avoid executing selection twice on ModSelectOverlay
 load

---
 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 21ed9af421..f1bfa26a98 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -371,8 +371,8 @@ namespace osu.Game.Overlays.Mods
         {
             base.LoadComplete();
 
+            SelectedMods.BindValueChanged(_ => updateSelectedButtons());
             availableMods.BindValueChanged(_ => updateAvailableMods(), true);
-            SelectedMods.BindValueChanged(_ => updateSelectedButtons(), true);
         }
 
         protected override void PopOut()

From 98a83722ff0ad8fffdd426a55a32792d8ce8febd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 10 Feb 2021 15:29:55 +0900
Subject: [PATCH 1414/3722] Move the point at which selected mods are reset in
 tests to allow mutliple creation test flow

---
 .../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 9ca1d4102a..2885dbee00 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -39,7 +39,11 @@ namespace osu.Game.Tests.Visual.UserInterface
         }
 
         [SetUp]
-        public void SetUp() => Schedule(() => createDisplay(() => new TestModSelectOverlay()));
+        public void SetUp() => Schedule(() =>
+        {
+            SelectedMods.Value = Array.Empty<Mod>();
+            createDisplay(() => new TestModSelectOverlay());
+        });
 
         [SetUpSteps]
         public void SetUpSteps()
@@ -370,7 +374,6 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private void createDisplay(Func<TestModSelectOverlay> createOverlayFunc)
         {
-            SelectedMods.Value = Array.Empty<Mod>();
             Children = new Drawable[]
             {
                 modSelect = createOverlayFunc().With(d =>

From 67c1c4c1ebdd89e8c63c76e071f9598c1db32250 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 10 Feb 2021 15:30:17 +0900
Subject: [PATCH 1415/3722] Copy settings before applying selection

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

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 71ecef2b82..c3e56abd05 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -198,10 +198,10 @@ namespace osu.Game.Overlays.Mods
 
                 var buttonMod = button.Mods[index];
 
-                button.SelectAt(index, false);
-
                 // as this is likely coming from an external change, ensure the settings of the mod are in sync.
                 buttonMod.CopyFrom(mod);
+
+                button.SelectAt(index, false);
                 return;
             }
 

From b3b0d97354d7c57e554a69ea78f516e0e64833c3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 10 Feb 2021 15:32:57 +0900
Subject: [PATCH 1416/3722] Avoid potential feedback from bindable event binds

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

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index f1bfa26a98..a6de0ad6b1 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -371,8 +371,11 @@ namespace osu.Game.Overlays.Mods
         {
             base.LoadComplete();
 
-            SelectedMods.BindValueChanged(_ => updateSelectedButtons());
             availableMods.BindValueChanged(_ => updateAvailableMods(), true);
+
+            // intentionally bound after the above line to avoid a potential update feedback cycle.
+            // i haven't actually observed this happening but as updateAvailableMods() changes the selection it is plausible.
+            SelectedMods.BindValueChanged(_ => updateSelectedButtons());
         }
 
         protected override void PopOut()

From 806324b196607d6d918f792289d4043100944904 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Fri, 15 Jan 2021 14:53:29 +0900
Subject: [PATCH 1417/3722] Allow overriding of Overlay pop-in and pop-out
 samples

---
 osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
index 41fd37a0d7..ee99a39523 100644
--- a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
+++ b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
@@ -20,6 +20,8 @@ namespace osu.Game.Graphics.Containers
     {
         private SampleChannel samplePopIn;
         private SampleChannel samplePopOut;
+        protected virtual string PopInSampleName => "UI/overlay-pop-in";
+        protected virtual string PopOutSampleName => "UI/overlay-pop-out";
 
         protected override bool BlockNonPositionalInput => true;
 
@@ -40,8 +42,8 @@ namespace osu.Game.Graphics.Containers
         [BackgroundDependencyLoader(true)]
         private void load(AudioManager audio)
         {
-            samplePopIn = audio.Samples.Get(@"UI/overlay-pop-in");
-            samplePopOut = audio.Samples.Get(@"UI/overlay-pop-out");
+            samplePopIn = audio.Samples.Get(PopInSampleName);
+            samplePopOut = audio.Samples.Get(PopOutSampleName);
         }
 
         protected override void LoadComplete()

From 3eda78c363def6589adc0a84aee6c7795cd72d76 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Fri, 15 Jan 2021 14:57:46 +0900
Subject: [PATCH 1418/3722] Use unique samples for Dialog, NowPlaying,
 SettingsPanel and WaveOverlay pop-in/pop-out

---
 osu.Game/Overlays/DialogOverlay.cs        | 3 +++
 osu.Game/Overlays/NowPlayingOverlay.cs    | 3 +++
 osu.Game/Overlays/SettingsPanel.cs        | 2 ++
 osu.Game/Overlays/WaveOverlayContainer.cs | 2 ++
 4 files changed, 10 insertions(+)

diff --git a/osu.Game/Overlays/DialogOverlay.cs b/osu.Game/Overlays/DialogOverlay.cs
index 9f9dbdbaf1..4cc17a4c14 100644
--- a/osu.Game/Overlays/DialogOverlay.cs
+++ b/osu.Game/Overlays/DialogOverlay.cs
@@ -14,6 +14,9 @@ namespace osu.Game.Overlays
     {
         private readonly Container dialogContainer;
 
+        protected override string PopInSampleName => "UI/dialog-pop-in";
+        protected override string PopOutSampleName => "UI/dialog-pop-out";
+
         public PopupDialog CurrentDialog { get; private set; }
 
         public DialogOverlay()
diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 5c16a6e5c4..2866d2ad6d 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -51,6 +51,9 @@ namespace osu.Game.Overlays
         private Container dragContainer;
         private Container playerContainer;
 
+        protected override string PopInSampleName => "UI/now-playing-pop-in";
+        protected override string PopOutSampleName => "UI/now-playing-pop-out";
+
         /// <summary>
         /// Provide a source for the toolbar height.
         /// </summary>
diff --git a/osu.Game/Overlays/SettingsPanel.cs b/osu.Game/Overlays/SettingsPanel.cs
index 7a5a586f67..f1270f750e 100644
--- a/osu.Game/Overlays/SettingsPanel.cs
+++ b/osu.Game/Overlays/SettingsPanel.cs
@@ -40,6 +40,8 @@ namespace osu.Game.Overlays
 
         private SeekLimitedSearchTextBox searchTextBox;
 
+        protected override string PopInSampleName => "UI/settings-pop-in";
+
         /// <summary>
         /// Provide a source for the toolbar height.
         /// </summary>
diff --git a/osu.Game/Overlays/WaveOverlayContainer.cs b/osu.Game/Overlays/WaveOverlayContainer.cs
index d0fa9987d5..52ae4dbdbb 100644
--- a/osu.Game/Overlays/WaveOverlayContainer.cs
+++ b/osu.Game/Overlays/WaveOverlayContainer.cs
@@ -18,6 +18,8 @@ namespace osu.Game.Overlays
 
         protected override bool StartHidden => true;
 
+        protected override string PopInSampleName => "UI/wave-pop-in";
+
         protected WaveOverlayContainer()
         {
             AddInternal(Waves = new WaveContainer

From 22995c216deb26b16ad5e307b35cc5c69ff54260 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Fri, 15 Jan 2021 14:59:30 +0900
Subject: [PATCH 1419/3722] Use unique sample for edit button click
 (ButtonSystem)

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

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index f400b2114b..c6774127c1 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -129,7 +129,7 @@ namespace osu.Game.Screens.Menu
             buttonsPlay.ForEach(b => b.VisibleState = ButtonSystemState.Play);
 
             buttonsTopLevel.Add(new Button(@"play", @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));
-            buttonsTopLevel.Add(new Button(@"edit", @"button-generic-select", OsuIcon.EditCircle, new Color4(238, 170, 0, 255), () => OnEdit?.Invoke(), 0, Key.E));
+            buttonsTopLevel.Add(new Button(@"edit", @"button-edit-select", OsuIcon.EditCircle, new Color4(238, 170, 0, 255), () => OnEdit?.Invoke(), 0, Key.E));
             buttonsTopLevel.Add(new Button(@"browse", @"button-direct-select", OsuIcon.ChevronDownCircle, new Color4(165, 204, 0, 255), () => OnBeatmapListing?.Invoke(), 0, Key.D));
 
             if (host.CanExit)

From 73ab1b2b21f2eaaf40884d6d674d22c08031bfd7 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Fri, 15 Jan 2021 15:01:22 +0900
Subject: [PATCH 1420/3722] Add pitch randomisation to HoverSounds on-hover
 sample playback

---
 osu.Game/Graphics/UserInterface/HoverSounds.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/HoverSounds.cs b/osu.Game/Graphics/UserInterface/HoverSounds.cs
index a1d06711db..21aae1b861 100644
--- a/osu.Game/Graphics/UserInterface/HoverSounds.cs
+++ b/osu.Game/Graphics/UserInterface/HoverSounds.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.Framework.Utils;
 
 namespace osu.Game.Graphics.UserInterface
 {
@@ -49,9 +50,11 @@ namespace osu.Game.Graphics.UserInterface
         {
             bool enoughTimePassedSinceLastPlayback = !lastPlaybackTime.Value.HasValue || Time.Current - lastPlaybackTime.Value >= HoverDebounceTime;
 
-            if (enoughTimePassedSinceLastPlayback)
+            if (enoughTimePassedSinceLastPlayback && sampleHover != null)
             {
-                sampleHover?.Play();
+                sampleHover.Frequency.Value = 0.96 + RNG.NextDouble(0.08);
+                sampleHover.Play();
+
                 lastPlaybackTime.Value = Time.Current;
             }
 

From 4e2ab0bad2c1aed6c9abc75250d1160ae87218f4 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Fri, 15 Jan 2021 15:02:17 +0900
Subject: [PATCH 1421/3722] Use a separate sample set for Toolbar buttons

---
 osu.Game/Graphics/UserInterface/HoverSounds.cs | 5 ++++-
 osu.Game/Overlays/Toolbar/ToolbarButton.cs     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/HoverSounds.cs b/osu.Game/Graphics/UserInterface/HoverSounds.cs
index a1d06711db..4a79d1fbec 100644
--- a/osu.Game/Graphics/UserInterface/HoverSounds.cs
+++ b/osu.Game/Graphics/UserInterface/HoverSounds.cs
@@ -68,6 +68,9 @@ namespace osu.Game.Graphics.UserInterface
         Normal,
 
         [Description("-softer")]
-        Soft
+        Soft,
+
+        [Description("-toolbar")]
+        Toolbar
     }
 }
diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
index 49b9c62d85..83f2bdf6cb 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
@@ -77,7 +77,7 @@ namespace osu.Game.Overlays.Toolbar
         private KeyBindingStore keyBindings { get; set; }
 
         protected ToolbarButton()
-            : base(HoverSampleSet.Loud)
+            : base(HoverSampleSet.Toolbar)
         {
             Width = Toolbar.HEIGHT;
             RelativeSizeAxes = Axes.Y;

From bc7f4a4f881b04feb4ac1c23b2d1fc5aba1fada5 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Fri, 15 Jan 2021 20:16:22 +0900
Subject: [PATCH 1422/3722] Use a single sample for CarouselHeader on-hover
 with randomised pitch instead of multiple samples

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

diff --git a/osu.Game/Screens/Select/Carousel/CarouselHeader.cs b/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
index f1120f55a6..4f53a6e202 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Screens.Select.Carousel
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, OsuColour colours)
         {
-            sampleHover = audio.Samples.Get($@"SongSelect/song-ping-variation-{RNG.Next(1, 5)}");
+            sampleHover = audio.Samples.Get("SongSelect/song-ping");
             hoverLayer.Colour = colours.Blue.Opacity(0.1f);
         }
 
@@ -99,7 +99,11 @@ namespace osu.Game.Screens.Select.Carousel
 
         protected override bool OnHover(HoverEvent e)
         {
-            sampleHover?.Play();
+            if (sampleHover != null)
+            {
+                sampleHover.Frequency.Value = 0.90 + RNG.NextDouble(0.2);
+                sampleHover.Play();
+            }
 
             hoverLayer.FadeIn(100, Easing.OutQuint);
             return base.OnHover(e);

From 625eb78a118566dc72161da36c9b5997d10309e4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 10 Feb 2021 17:59:52 +0900
Subject: [PATCH 1423/3722] Simplify with an early exit for null sample

---
 osu.Game/Graphics/UserInterface/HoverSounds.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/HoverSounds.cs b/osu.Game/Graphics/UserInterface/HoverSounds.cs
index 21aae1b861..5d6d0896fd 100644
--- a/osu.Game/Graphics/UserInterface/HoverSounds.cs
+++ b/osu.Game/Graphics/UserInterface/HoverSounds.cs
@@ -48,9 +48,12 @@ namespace osu.Game.Graphics.UserInterface
 
         protected override bool OnHover(HoverEvent e)
         {
+            if (sampleHover == null)
+                return false;
+
             bool enoughTimePassedSinceLastPlayback = !lastPlaybackTime.Value.HasValue || Time.Current - lastPlaybackTime.Value >= HoverDebounceTime;
 
-            if (enoughTimePassedSinceLastPlayback && sampleHover != null)
+            if (enoughTimePassedSinceLastPlayback)
             {
                 sampleHover.Frequency.Value = 0.96 + RNG.NextDouble(0.08);
                 sampleHover.Play();
@@ -58,7 +61,7 @@ namespace osu.Game.Graphics.UserInterface
                 lastPlaybackTime.Value = Time.Current;
             }
 
-            return base.OnHover(e);
+            return false;
         }
     }
 

From 996f1098f6e7054e97150421ead8188147f5aa09 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Wed, 10 Feb 2021 18:14:32 +0900
Subject: [PATCH 1424/3722] Use alternate sample on the downbeat while hovering
 OsuLogo

---
 osu.Game/Screens/Menu/OsuLogo.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs
index 68d23e1a32..1d0af30275 100644
--- a/osu.Game/Screens/Menu/OsuLogo.cs
+++ b/osu.Game/Screens/Menu/OsuLogo.cs
@@ -45,6 +45,7 @@ namespace osu.Game.Screens.Menu
 
         private SampleChannel sampleClick;
         private SampleChannel sampleBeat;
+        private SampleChannel sampleDownbeat;
 
         private readonly Container colourAndTriangles;
         private readonly Triangles triangles;
@@ -259,6 +260,7 @@ namespace osu.Game.Screens.Menu
         {
             sampleClick = audio.Samples.Get(@"Menu/osu-logo-select");
             sampleBeat = audio.Samples.Get(@"Menu/osu-logo-heartbeat");
+            sampleDownbeat = audio.Samples.Get(@"Menu/osu-logo-downbeat");
 
             logo.Texture = textures.Get(@"Menu/logo");
             ripple.Texture = textures.Get(@"Menu/logo");
@@ -281,7 +283,15 @@ namespace osu.Game.Screens.Menu
             if (beatIndex < 0) return;
 
             if (IsHovered)
-                this.Delay(early_activation).Schedule(() => sampleBeat.Play());
+            {
+                this.Delay(early_activation).Schedule(() =>
+                {
+                    if (beatIndex % (int)timingPoint.TimeSignature == 0)
+                        sampleDownbeat.Play();
+                    else
+                        sampleBeat.Play();
+                });
+            }
 
             logoBeatContainer
                 .ScaleTo(1 - 0.02f * amplitudeAdjust, early_activation, Easing.Out).Then()

From cf06684ad121d58548d6cf0b9e87a439167dbc57 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 18:38:31 +0900
Subject: [PATCH 1425/3722] Judge heads as slider ticks instead

---
 .../Judgements/SliderTickJudgement.cs                | 12 ++++++++++++
 .../Objects/Drawables/DrawableSliderHead.cs          |  2 +-
 osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs    |  4 ++--
 osu.Game.Rulesets.Osu/Objects/SliderTick.cs          |  5 -----
 4 files changed, 15 insertions(+), 8 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/Judgements/SliderTickJudgement.cs

diff --git a/osu.Game.Rulesets.Osu/Judgements/SliderTickJudgement.cs b/osu.Game.Rulesets.Osu/Judgements/SliderTickJudgement.cs
new file mode 100644
index 0000000000..a088696784
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Judgements/SliderTickJudgement.cs
@@ -0,0 +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 osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Rulesets.Osu.Judgements
+{
+    public class SliderTickJudgement : OsuJudgement
+    {
+        public override HitResult MaxResult => HitResult.LargeTickHit;
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index 87cfa47091..c3759b6a34 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             // If not judged as a normal hitcircle, only track whether a hit has occurred (via IgnoreHit) rather than a scorable hit result.
             var result = base.ResultFor(timeOffset);
-            return result.IsHit() ? HitResult.IgnoreHit : HitResult.IgnoreMiss;
+            return result.IsHit() ? HitResult.LargeTickHit : HitResult.LargeTickMiss;
         }
 
         public Action<double> OnShake;
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs b/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
index 28e57567cb..5672283230 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderHeadCircle.cs
@@ -10,10 +10,10 @@ namespace osu.Game.Rulesets.Osu.Objects
     {
         /// <summary>
         /// Whether to treat this <see cref="SliderHeadCircle"/> as a normal <see cref="HitCircle"/> for judgement purposes.
-        /// If <c>false</c>, judgement will be ignored.
+        /// If <c>false</c>, this <see cref="SliderHeadCircle"/> will be judged as a <see cref="SliderTick"/> instead.
         /// </summary>
         public bool JudgeAsNormalHitCircle = true;
 
-        public override Judgement CreateJudgement() => JudgeAsNormalHitCircle ? base.CreateJudgement() : new OsuIgnoreJudgement();
+        public override Judgement CreateJudgement() => JudgeAsNormalHitCircle ? base.CreateJudgement() : new SliderTickJudgement();
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderTick.cs b/osu.Game.Rulesets.Osu/Objects/SliderTick.cs
index a427ee1955..725dbe81fb 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderTick.cs
@@ -33,10 +33,5 @@ namespace osu.Game.Rulesets.Osu.Objects
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
 
         public override Judgement CreateJudgement() => new SliderTickJudgement();
-
-        public class SliderTickJudgement : OsuJudgement
-        {
-            public override HitResult MaxResult => HitResult.LargeTickHit;
-        }
     }
 }

From 6730c4c58b22ce2e753ac0f4b7055b5b87f62cde Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 18:41:28 +0900
Subject: [PATCH 1426/3722] Apply review comments (user explanations + property
 names)

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

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index 863dc05216..642da87693 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -32,27 +32,27 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public override ModType Type => ModType.Conversion;
 
-        [SettingSource("Disable slider head judgement", "Scores sliders proportionally to the number of ticks hit.")]
-        public Bindable<bool> DisableSliderHeadJudgement { get; } = new BindableBool(true);
+        [SettingSource("No slider head accuracy requirement", "Scores sliders proportionally to the number of ticks hit.")]
+        public Bindable<bool> NoSliderHeadAccuracy { get; } = new BindableBool(true);
 
-        [SettingSource("Disable slider head tracking", "Pins slider heads at their starting position, regardless of time.")]
-        public Bindable<bool> DisableSliderHeadTracking { 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("Disable note lock lenience", "Applies note lock to the full hit window.")]
-        public Bindable<bool> DisableLenientNoteLock { 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);
 
-        [SettingSource("Disable exact slider follow circle tracking", "Makes the slider follow circle track its final size at all times.")]
-        public Bindable<bool> DisableExactFollowCircleTracking { get; } = new BindableBool(true);
+        [SettingSource("Use fixed slider follow circle hit area", "Makes the slider follow circle track its final size at all times.")]
+        public Bindable<bool> FixedFollowCircleHitArea { get; } = new BindableBool(true);
 
         public void ApplyToHitObject(HitObject hitObject)
         {
             switch (hitObject)
             {
                 case Slider slider:
-                    slider.IgnoreJudgement = !DisableSliderHeadJudgement.Value;
+                    slider.IgnoreJudgement = !NoSliderHeadAccuracy.Value;
 
                     foreach (var head in slider.NestedHitObjects.OfType<SliderHeadCircle>())
-                        head.JudgeAsNormalHitCircle = !DisableSliderHeadJudgement.Value;
+                        head.JudgeAsNormalHitCircle = !NoSliderHeadAccuracy.Value;
 
                     break;
             }
@@ -62,7 +62,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         {
             var osuRuleset = (DrawableOsuRuleset)drawableRuleset;
 
-            if (!DisableLenientNoteLock.Value)
+            if (!ClassicNoteLock.Value)
                 osuRuleset.Playfield.HitPolicy = new ObjectOrderedHitPolicy();
         }
 
@@ -73,11 +73,11 @@ namespace osu.Game.Rulesets.Osu.Mods
                 switch (obj)
                 {
                     case DrawableSlider slider:
-                        slider.Ball.TrackVisualSize = !DisableExactFollowCircleTracking.Value;
+                        slider.Ball.TrackVisualSize = !FixedFollowCircleHitArea.Value;
                         break;
 
                     case DrawableSliderHead head:
-                        head.TrackFollowCircle = !DisableSliderHeadTracking.Value;
+                        head.TrackFollowCircle = !NoSliderHeadMovement.Value;
                         break;
                 }
             }

From 18a29dcb9664075e4fd1dadfc57157cbcc2fc21a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 18:42:13 +0900
Subject: [PATCH 1427/3722] Rename bindable member, reorder binds

---
 osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs b/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
index f9b8ffca7b..b9cd176c63 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
         [Resolved(CanBeNull = true)]
         private OsuRulesetConfigManager config { get; set; }
 
-        private readonly Bindable<bool> snakingOut = new Bindable<bool>();
+        private readonly Bindable<bool> configSnakingOut = new Bindable<bool>();
 
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin, DrawableHitObject drawableObject)
@@ -37,9 +37,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             accentColour = drawableObject.AccentColour.GetBoundCopy();
             accentColour.BindValueChanged(accent => updateAccentColour(skin, accent.NewValue), true);
 
-            SnakingOut.BindTo(snakingOut);
             config?.BindWith(OsuRulesetSetting.SnakingInSliders, SnakingIn);
-            config?.BindWith(OsuRulesetSetting.SnakingOutSliders, snakingOut);
+            config?.BindWith(OsuRulesetSetting.SnakingOutSliders, configSnakingOut);
+
+            SnakingOut.BindTo(configSnakingOut);
 
             BorderSize = skin.GetConfig<OsuSkinConfiguration, float>(OsuSkinConfiguration.SliderBorderSize)?.Value ?? 1;
             BorderColour = skin.GetConfig<OsuSkinColour, Color4>(OsuSkinColour.SliderBorder)?.Value ?? Color4.White;
@@ -56,7 +57,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             if (!drawableSlider.HeadCircle.TrackFollowCircle)
             {
                 // When not tracking the follow circle, force the path to not snake out as it looks better that way.
-                SnakingOut.UnbindFrom(snakingOut);
+                SnakingOut.UnbindFrom(configSnakingOut);
                 SnakingOut.Value = false;
             }
         }

From 9519b7f7c16e234d119ecaf65e3ff019ad84c400 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 18:43:14 +0900
Subject: [PATCH 1428/3722] Adjust comment

---
 osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs b/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
index b9cd176c63..4dd7b2d69c 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/PlaySliderBody.cs
@@ -54,9 +54,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             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)
             {
-                // When not tracking the follow circle, force the path to not snake out as it looks better that way.
                 SnakingOut.UnbindFrom(configSnakingOut);
                 SnakingOut.Value = false;
             }

From 2fcc4213e16f8a9ebc33d91474fe3c0a632cf36c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 18:46:26 +0900
Subject: [PATCH 1429/3722] Rename IgnoreJudgement -> OnlyJudgeNestedObjects

---
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs               | 2 +-
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs | 4 ++--
 osu.Game.Rulesets.Osu/Objects/Slider.cs                   | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index 642da87693..8e533854c0 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             switch (hitObject)
             {
                 case Slider slider:
-                    slider.IgnoreJudgement = !NoSliderHeadAccuracy.Value;
+                    slider.OnlyJudgeNestedObjects = !NoSliderHeadAccuracy.Value;
 
                     foreach (var head in slider.NestedHitObjects.OfType<SliderHeadCircle>())
                         head.JudgeAsNormalHitCircle = !NoSliderHeadAccuracy.Value;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index e607163b3e..13057d7a9a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         public SliderBall Ball { get; private set; }
         public SkinnableDrawable Body { get; private set; }
 
-        public override bool DisplayResult => !HitObject.IgnoreJudgement;
+        public override bool DisplayResult => !HitObject.OnlyJudgeNestedObjects;
 
         private PlaySliderBody sliderBody => Body.Drawable as PlaySliderBody;
 
@@ -250,7 +250,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (userTriggered || Time.Current < HitObject.EndTime)
                 return;
 
-            if (HitObject.IgnoreJudgement)
+            if (HitObject.OnlyJudgeNestedObjects)
             {
                 ApplyResult(r => r.Type = NestedHitObjects.Any(h => h.Result.IsHit) ? r.Judgement.MaxResult : r.Judgement.MinResult);
                 return;
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 01694a838b..332163454a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -115,10 +115,10 @@ namespace osu.Game.Rulesets.Osu.Objects
         public double TickDistanceMultiplier = 1;
 
         /// <summary>
-        /// Whether this <see cref="Slider"/>'s judgement should be ignored.
-        /// If <c>false</c>, this <see cref="Slider"/> will be judged proportionally to the number of ticks hit.
+        /// Whether this <see cref="Slider"/>'s judgement is fully handled by its nested <see cref="HitObject"/>s.
+        /// If <c>false</c>, this <see cref="Slider"/> will be judged proportionally to the number of nested <see cref="HitObject"/>s hit.
         /// </summary>
-        public bool IgnoreJudgement = true;
+        public bool OnlyJudgeNestedObjects = true;
 
         [JsonIgnore]
         public SliderHeadCircle HeadCircle { get; protected set; }
@@ -239,7 +239,7 @@ namespace osu.Game.Rulesets.Osu.Objects
                 HeadCircle.Samples = this.GetNodeSamples(0);
         }
 
-        public override Judgement CreateJudgement() => IgnoreJudgement ? new OsuIgnoreJudgement() : new OsuJudgement();
+        public override Judgement CreateJudgement() => OnlyJudgeNestedObjects ? new OsuIgnoreJudgement() : new OsuJudgement();
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }

From a16f4cee3a0d44bbcdf69adb4949f2d3a425efd1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 18:52:39 +0900
Subject: [PATCH 1430/3722] Adjust DrawableSlider comment

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

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 13057d7a9a..921139c4e9 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -250,13 +250,15 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (userTriggered || Time.Current < HitObject.EndTime)
                 return;
 
+            // If only the nested hitobjects are judged, then the slider's own judgement is ignored for scoring purposes.
+            // But the slider needs to still be judged with a reasonable hit/miss result for visual purposes (hit/miss transforms, etc).
             if (HitObject.OnlyJudgeNestedObjects)
             {
                 ApplyResult(r => r.Type = NestedHitObjects.Any(h => h.Result.IsHit) ? r.Judgement.MaxResult : r.Judgement.MinResult);
                 return;
             }
 
-            // If not ignoring judgement, score proportionally based on the number of ticks hit, counting the head circle as a tick.
+            // Otherwise, if this slider is also needs to be judged, apply judgement proportionally to the number of nested hitobjects hit. This is the classic osu!stable scoring.
             ApplyResult(r =>
             {
                 int totalTicks = NestedHitObjects.Count;

From 6bf40170db22f31cea0c040824a218794d236718 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 18:53:23 +0900
Subject: [PATCH 1431/3722] Rename SliderBall flag

---
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs          | 2 +-
 osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index 8e533854c0..17b0b18b52 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                 switch (obj)
                 {
                     case DrawableSlider slider:
-                        slider.Ball.TrackVisualSize = !FixedFollowCircleHitArea.Value;
+                        slider.Ball.InputTracksVisualSize = !FixedFollowCircleHitArea.Value;
                         break;
 
                     case DrawableSliderHead head:
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs
index da3debbd42..82b677e12c 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
         /// Whether to track accurately to the visual size of this <see cref="SliderBall"/>.
         /// If <c>false</c>, tracking will be performed at the final scale at all times.
         /// </summary>
-        public bool TrackVisualSize = true;
+        public bool InputTracksVisualSize = true;
 
         private readonly Drawable followCircle;
         private readonly DrawableSlider drawableSlider;
@@ -100,7 +100,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
                 tracking = value;
 
-                if (TrackVisualSize)
+                if (InputTracksVisualSize)
                     followCircle.ScaleTo(tracking ? 2.4f : 1f, 300, Easing.OutQuint);
                 else
                 {

From 0dcdad98397453b439cab67421e29ecb3ca13f00 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 19:04:23 +0900
Subject: [PATCH 1432/3722] Adjust comment for DrawableSliderHead

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

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
index c3759b6a34..01c0d988ee 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
@@ -89,7 +89,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (HitObject.JudgeAsNormalHitCircle)
                 return base.ResultFor(timeOffset);
 
-            // If not judged as a normal hitcircle, only track whether a hit has occurred (via IgnoreHit) rather than a scorable hit result.
+            // If not judged as a normal hitcircle, judge as a slider tick instead. This is the classic osu!stable scoring.
             var result = base.ResultFor(timeOffset);
             return result.IsHit() ? HitResult.LargeTickHit : HitResult.LargeTickMiss;
         }

From 393cd6c74a354919dc0b410d0bea38b8701bd032 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 19:39:47 +0900
Subject: [PATCH 1433/3722] Add helper class for tracking changes to mod
 settings

---
 .../Configuration/SettingSourceAttribute.cs   | 27 ++++++++++++++++
 .../Screens/Select/Details/AdvancedStats.cs   | 31 ++++++-------------
 2 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index 50069be4b2..00c322065a 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -9,6 +9,7 @@ using JetBrains.Annotations;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Overlays.Settings;
+using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Configuration
 {
@@ -140,4 +141,30 @@ namespace osu.Game.Configuration
             return orderedRelative.Concat(unordered);
         }
     }
+
+    public class ModSettingChangeTracker : IDisposable
+    {
+        public Action<Mod> SettingChanged;
+
+        private readonly List<ISettingsItem> references = new List<ISettingsItem>();
+
+        public ModSettingChangeTracker(IEnumerable<Mod> mods)
+        {
+            foreach (var mod in mods)
+            {
+                foreach (var setting in mod.CreateSettingsControls().OfType<ISettingsItem>())
+                {
+                    setting.SettingChanged += () => SettingChanged?.Invoke(mod);
+                    references.Add(setting);
+                }
+            }
+        }
+
+        public void Dispose()
+        {
+            foreach (var r in references)
+                r.Dispose();
+            references.Clear();
+        }
+    }
 }
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 44d908fc46..7966ec4240 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -18,7 +18,6 @@ using System.Threading;
 using osu.Framework.Threading;
 using osu.Framework.Utils;
 using osu.Game.Configuration;
-using osu.Game.Overlays.Settings;
 using osu.Game.Rulesets;
 
 namespace osu.Game.Screens.Select.Details
@@ -83,32 +82,22 @@ namespace osu.Game.Screens.Select.Details
             mods.BindValueChanged(modsChanged, true);
         }
 
-        private readonly List<ISettingsItem> references = new List<ISettingsItem>();
+        private ModSettingChangeTracker settingChangeTracker;
+        private ScheduledDelegate debouncedStatisticsUpdate;
 
         private void modsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
         {
-            // TODO: find a more permanent solution for this if/when it is needed in other components.
-            // this is generating drawables for the only purpose of storing bindable references.
-            foreach (var r in references)
-                r.Dispose();
+            settingChangeTracker?.Dispose();
 
-            references.Clear();
-
-            ScheduledDelegate debounce = null;
-
-            foreach (var mod in mods.NewValue.OfType<IApplicableToDifficulty>())
+            settingChangeTracker = new ModSettingChangeTracker(mods.NewValue);
+            settingChangeTracker.SettingChanged += m =>
             {
-                foreach (var setting in mod.CreateSettingsControls().OfType<ISettingsItem>())
-                {
-                    setting.SettingChanged += () =>
-                    {
-                        debounce?.Cancel();
-                        debounce = Scheduler.AddDelayed(updateStatistics, 100);
-                    };
+                if (!(m is IApplicableToDifficulty))
+                    return;
 
-                    references.Add(setting);
-                }
-            }
+                debouncedStatisticsUpdate?.Cancel();
+                debouncedStatisticsUpdate = Scheduler.AddDelayed(updateStatistics, 100);
+            };
 
             updateStatistics();
         }

From 7827e991b2dda30e265c3fc210e3828698d9d00b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 19:43:39 +0900
Subject: [PATCH 1434/3722] Also clear event on dispose

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

diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index 00c322065a..04b8f8e962 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -162,6 +162,8 @@ namespace osu.Game.Configuration
 
         public void Dispose()
         {
+            SettingChanged = null;
+
             foreach (var r in references)
                 r.Dispose();
             references.Clear();

From 822c66033f0d9cb2c2dbee0d138cdb67bc1fdd3c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 19:56:59 +0900
Subject: [PATCH 1435/3722] Add local-user freemod configuration

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    |  9 +++++++-
 .../OnlinePlay/FreeModSelectOverlay.cs        |  5 +++--
 .../Multiplayer/MultiplayerMatchSongSelect.cs |  2 +-
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 21 +++++++++++++++----
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 93fe693937..488c0659f4 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -51,6 +51,11 @@ namespace osu.Game.Overlays.Mods
         /// </summary>
         protected virtual bool Stacked => true;
 
+        /// <summary>
+        /// Whether configurable <see cref="Mod"/>s can be configured by the local user.
+        /// </summary>
+        protected virtual bool AllowConfiguration => true;
+
         [NotNull]
         private Func<Mod, bool> isValidMod = m => true;
 
@@ -300,6 +305,7 @@ namespace osu.Game.Overlays.Mods
                                                 Text = "Customisation",
                                                 Action = () => ModSettingsContainer.ToggleVisibility(),
                                                 Enabled = { Value = false },
+                                                Alpha = AllowConfiguration ? 1 : 0,
                                                 Origin = Anchor.CentreLeft,
                                                 Anchor = Anchor.CentreLeft,
                                             },
@@ -509,7 +515,8 @@ namespace osu.Game.Overlays.Mods
 
                 OnModSelected(selectedMod);
 
-                if (selectedMod.RequiresConfiguration) ModSettingsContainer.Show();
+                if (selectedMod.RequiresConfiguration && AllowConfiguration)
+                    ModSettingsContainer.Show();
             }
             else
             {
diff --git a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
index 7bc226bb3f..ab7be13479 100644
--- a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
@@ -20,17 +20,18 @@ namespace osu.Game.Screens.OnlinePlay
     {
         protected override bool Stacked => false;
 
+        protected override bool AllowConfiguration => false;
+
         public new Func<Mod, bool> IsValidMod
         {
             get => base.IsValidMod;
-            set => base.IsValidMod = m => m.HasImplementation && !m.RequiresConfiguration && !(m is ModAutoplay) && value(m);
+            set => base.IsValidMod = m => m.HasImplementation && !(m is ModAutoplay) && value(m);
         }
 
         public FreeModSelectOverlay()
         {
             IsValidMod = m => true;
 
-            CustomiseButton.Alpha = 0;
             MultiplierSection.Alpha = 0;
             DeselectAllButton.Alpha = 0;
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index 84e8849726..f17d97c3fd 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -59,6 +59,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea();
 
-        protected override bool IsValidFreeMod(Mod mod) => base.IsValidFreeMod(mod) && !(mod is ModTimeRamp) && !(mod is ModRateAdjust) && !mod.RequiresConfiguration;
+        protected override bool IsValidFreeMod(Mod mod) => base.IsValidFreeMod(mod) && !(mod is ModTimeRamp) && !(mod is ModRateAdjust);
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 5f2f1366f7..7edba3231c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -12,6 +12,8 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
+using osu.Framework.Threading;
+using osu.Game.Configuration;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays.Mods;
@@ -314,12 +316,27 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             }
         }
 
+        private ModSettingChangeTracker modSettingChangeTracker;
+        private ScheduledDelegate debouncedModSettingsUpdate;
+
         private void onUserModsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
         {
+            modSettingChangeTracker?.Dispose();
+
             if (client.Room == null)
                 return;
 
             client.ChangeUserMods(mods.NewValue);
+
+            modSettingChangeTracker = new ModSettingChangeTracker(mods.NewValue);
+            modSettingChangeTracker.SettingChanged += onModSettingsChanged;
+        }
+
+        private void onModSettingsChanged(Mod mod)
+        {
+            // Debounce changes to mod settings so as to not thrash the network.
+            debouncedModSettingsUpdate?.Cancel();
+            debouncedModSettingsUpdate = Scheduler.AddDelayed(() => client.ChangeUserMods(UserMods.Value), 500);
         }
 
         private void updateBeatmapAvailability(ValueChangedEvent<BeatmapAvailability> availability)
@@ -389,10 +406,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private class UserModSelectOverlay : LocalPlayerModSelectOverlay
         {
-            public UserModSelectOverlay()
-            {
-                CustomiseButton.Alpha = 0;
-            }
         }
     }
 }

From 4a405bb8598a8dcdbc6772eaac801c9fa4907956 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 20:04:16 +0900
Subject: [PATCH 1436/3722] Split ModSettingChangeTracker into separate file

---
 .../Configuration/ModSettingChangeTracker.cs  | 39 +++++++++++++++++++
 .../Configuration/SettingSourceAttribute.cs   | 29 --------------
 2 files changed, 39 insertions(+), 29 deletions(-)
 create mode 100644 osu.Game/Configuration/ModSettingChangeTracker.cs

diff --git a/osu.Game/Configuration/ModSettingChangeTracker.cs b/osu.Game/Configuration/ModSettingChangeTracker.cs
new file mode 100644
index 0000000000..f702a2fc22
--- /dev/null
+++ b/osu.Game/Configuration/ModSettingChangeTracker.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 System;
+using System.Collections.Generic;
+using System.Linq;
+using osu.Game.Overlays.Settings;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Configuration
+{
+    public class ModSettingChangeTracker : IDisposable
+    {
+        public Action<Mod> SettingChanged;
+
+        private readonly List<ISettingsItem> references = new List<ISettingsItem>();
+
+        public ModSettingChangeTracker(IEnumerable<Mod> mods)
+        {
+            foreach (var mod in mods)
+            {
+                foreach (var setting in mod.CreateSettingsControls().OfType<ISettingsItem>())
+                {
+                    setting.SettingChanged += () => SettingChanged?.Invoke(mod);
+                    references.Add(setting);
+                }
+            }
+        }
+
+        public void Dispose()
+        {
+            SettingChanged = null;
+
+            foreach (var r in references)
+                r.Dispose();
+            references.Clear();
+        }
+    }
+}
diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index 04b8f8e962..50069be4b2 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -9,7 +9,6 @@ using JetBrains.Annotations;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Overlays.Settings;
-using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Configuration
 {
@@ -141,32 +140,4 @@ namespace osu.Game.Configuration
             return orderedRelative.Concat(unordered);
         }
     }
-
-    public class ModSettingChangeTracker : IDisposable
-    {
-        public Action<Mod> SettingChanged;
-
-        private readonly List<ISettingsItem> references = new List<ISettingsItem>();
-
-        public ModSettingChangeTracker(IEnumerable<Mod> mods)
-        {
-            foreach (var mod in mods)
-            {
-                foreach (var setting in mod.CreateSettingsControls().OfType<ISettingsItem>())
-                {
-                    setting.SettingChanged += () => SettingChanged?.Invoke(mod);
-                    references.Add(setting);
-                }
-            }
-        }
-
-        public void Dispose()
-        {
-            SettingChanged = null;
-
-            foreach (var r in references)
-                r.Dispose();
-            references.Clear();
-        }
-    }
 }

From 6fff7c39daca9c27c39511b84223e7e98172325b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 20:09:45 +0900
Subject: [PATCH 1437/3722] Ensure tracker is disposed

---
 .../Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs | 2 ++
 osu.Game/Screens/Select/Details/AdvancedStats.cs                | 1 +
 2 files changed, 3 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 7edba3231c..59418cb348 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -402,6 +402,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             if (client != null)
                 client.LoadRequested -= onLoadRequested;
+
+            modSettingChangeTracker?.Dispose();
         }
 
         private class UserModSelectOverlay : LocalPlayerModSelectOverlay
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 7966ec4240..4a03c5e614 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -162,6 +162,7 @@ namespace osu.Game.Screens.Select.Details
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
+            settingChangeTracker?.Dispose();
             starDifficultyCancellationSource?.Cancel();
         }
 

From 169acb42de35e88c8755a5140808cb3563cfb97d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 20:11:36 +0900
Subject: [PATCH 1438/3722] Xmldoc + cleanup

---
 .../Configuration/ModSettingChangeTracker.cs  | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Configuration/ModSettingChangeTracker.cs b/osu.Game/Configuration/ModSettingChangeTracker.cs
index f702a2fc22..e2ade7dc6a 100644
--- a/osu.Game/Configuration/ModSettingChangeTracker.cs
+++ b/osu.Game/Configuration/ModSettingChangeTracker.cs
@@ -9,12 +9,25 @@ using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Configuration
 {
+    /// <summary>
+    /// A helper class for tracking changes to the settings of a set of <see cref="Mod"/>s.
+    /// </summary>
+    /// <remarks>
+    /// Ensure to dispose when usage is finished.
+    /// </remarks>
     public class ModSettingChangeTracker : IDisposable
     {
+        /// <summary>
+        /// Notifies that the setting of a <see cref="Mod"/> has changed.
+        /// </summary>
         public Action<Mod> SettingChanged;
 
-        private readonly List<ISettingsItem> references = new List<ISettingsItem>();
+        private readonly List<ISettingsItem> settings = new List<ISettingsItem>();
 
+        /// <summary>
+        /// Creates a new <see cref="ModSettingChangeTracker"/> for a set of <see cref="Mod"/>s.
+        /// </summary>
+        /// <param name="mods">The set of <see cref="Mod"/>s whose settings need to be tracked.</param>
         public ModSettingChangeTracker(IEnumerable<Mod> mods)
         {
             foreach (var mod in mods)
@@ -22,7 +35,7 @@ namespace osu.Game.Configuration
                 foreach (var setting in mod.CreateSettingsControls().OfType<ISettingsItem>())
                 {
                     setting.SettingChanged += () => SettingChanged?.Invoke(mod);
-                    references.Add(setting);
+                    settings.Add(setting);
                 }
             }
         }
@@ -31,9 +44,9 @@ namespace osu.Game.Configuration
         {
             SettingChanged = null;
 
-            foreach (var r in references)
+            foreach (var r in settings)
                 r.Dispose();
-            references.Clear();
+            settings.Clear();
         }
     }
 }

From 86682cdb3480e711d2ecdeab04926c7488a17046 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 20:16:26 +0900
Subject: [PATCH 1439/3722] Add client/room null check

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 59418cb348..b7adb71e2f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -336,7 +336,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             // Debounce changes to mod settings so as to not thrash the network.
             debouncedModSettingsUpdate?.Cancel();
-            debouncedModSettingsUpdate = Scheduler.AddDelayed(() => client.ChangeUserMods(UserMods.Value), 500);
+            debouncedModSettingsUpdate = Scheduler.AddDelayed(() =>
+            {
+                if (client.Room == null)
+                    return;
+
+                client.ChangeUserMods(UserMods.Value);
+            }, 500);
         }
 
         private void updateBeatmapAvailability(ValueChangedEvent<BeatmapAvailability> availability)

From c458c4cfaee1d9a830e8ddafa512d30d35b5b4cf Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 20:27:47 +0900
Subject: [PATCH 1440/3722] Fix unintended changes due to renaming or otherwise

---
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs | 2 +-
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index 17b0b18b52..5470d0fcb4 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         {
             var osuRuleset = (DrawableOsuRuleset)drawableRuleset;
 
-            if (!ClassicNoteLock.Value)
+            if (ClassicNoteLock.Value)
                 osuRuleset.Playfield.HitPolicy = new ObjectOrderedHitPolicy();
         }
 
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 189ef2d76c..b1069149f3 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Rulesets.Osu.UI
                 approachCircles = new ProxyContainer { RelativeSizeAxes = Axes.Both },
             };
 
-            HitPolicy = new ObjectOrderedHitPolicy();
+            HitPolicy = new StartTimeOrderedHitPolicy();
 
             var hitWindows = new OsuHitWindows();
             foreach (var result in Enum.GetValues(typeof(HitResult)).OfType<HitResult>().Where(r => r > HitResult.None && hitWindows.IsHitResultAllowed(r)))

From 321ca43b61a2a47857e04a117d622da6af385492 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 20:28:00 +0900
Subject: [PATCH 1441/3722] Update test

---
 .../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 039a4f142f..77a68b714b 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneObjectOrderedHitPolicy.cs
@@ -248,7 +248,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             addJudgementAssert(hitObjects[0], HitResult.Miss);
             addJudgementAssert(hitObjects[1], HitResult.Great);
-            addJudgementAssert("slider head", () => ((Slider)hitObjects[1]).HeadCircle, HitResult.IgnoreHit);
+            addJudgementAssert("slider head", () => ((Slider)hitObjects[1]).HeadCircle, HitResult.LargeTickHit);
             addJudgementAssert("slider tick", () => ((Slider)hitObjects[1]).NestedHitObjects[1] as SliderTick, HitResult.LargeTickHit);
         }
 
@@ -291,7 +291,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             addJudgementAssert(hitObjects[0], HitResult.Great);
             addJudgementAssert(hitObjects[1], HitResult.Great);
-            addJudgementAssert("slider head", () => ((Slider)hitObjects[1]).HeadCircle, HitResult.IgnoreHit);
+            addJudgementAssert("slider head", () => ((Slider)hitObjects[1]).HeadCircle, HitResult.LargeTickHit);
             addJudgementAssert("slider tick", () => ((Slider)hitObjects[1]).NestedHitObjects[1] as SliderTick, HitResult.LargeTickHit);
         }
 

From 4a391ce03d84adf76adb4214993c28e15cdebdbb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 21:24:41 +0900
Subject: [PATCH 1442/3722] Fix div-by-0 when 0 ticks are hit

---
 .../Objects/Drawables/DrawableSlider.cs          | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 921139c4e9..d35da64ad5 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -263,16 +263,20 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             {
                 int totalTicks = NestedHitObjects.Count;
                 int hitTicks = NestedHitObjects.Count(h => h.IsHit);
-                double hitFraction = (double)totalTicks / hitTicks;
 
                 if (hitTicks == totalTicks)
                     r.Type = HitResult.Great;
-                else if (hitFraction >= 0.5)
-                    r.Type = HitResult.Ok;
-                else if (hitFraction > 0)
-                    r.Type = HitResult.Meh;
-                else
+                else if (hitTicks == 0)
                     r.Type = HitResult.Miss;
+                else
+                {
+                    double hitFraction = (double)totalTicks / hitTicks;
+
+                    if (hitFraction >= 0.5)
+                        r.Type = HitResult.Ok;
+                    else if (hitFraction > 0)
+                        r.Type = HitResult.Meh;
+                }
             });
         }
 

From 1d425b83224ff7ac765b9af6d16389e637f1d840 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 21:25:31 +0900
Subject: [PATCH 1443/3722] Simplify case

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index d35da64ad5..847011850c 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -271,11 +271,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 else
                 {
                     double hitFraction = (double)totalTicks / hitTicks;
-
-                    if (hitFraction >= 0.5)
-                        r.Type = HitResult.Ok;
-                    else if (hitFraction > 0)
-                        r.Type = HitResult.Meh;
+                    r.Type = hitFraction >= 0.5 ? HitResult.Ok : HitResult.Meh;
                 }
             });
         }

From bd2486e5a04bda5fb2a0ff32df6d2dce8681f2f3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 21:27:12 +0900
Subject: [PATCH 1444/3722] Fix grammatical error in comment

---
 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 847011850c..253b9800a6 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -258,7 +258,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 return;
             }
 
-            // Otherwise, if this slider is also needs to be judged, apply judgement proportionally to the number of nested hitobjects hit. This is the classic osu!stable scoring.
+            // Otherwise, if this slider also needs to be judged, apply judgement proportionally to the number of nested hitobjects hit. This is the classic osu!stable scoring.
             ApplyResult(r =>
             {
                 int totalTicks = NestedHitObjects.Count;

From 20a6405fd20a6cef1251eebfd7435928344679a6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 22:06:19 +0900
Subject: [PATCH 1445/3722] Add explanatory comments + const

---
 .../Drawables/Connections/FollowPointConnection.cs |  6 ++++--
 osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs      | 14 ++++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
index 40154ca84c..5541d0e790 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
@@ -110,8 +110,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
             double startTime = start.GetEndTime();
             double duration = end.StartTime - startTime;
 
-            // For now, adjust the pre-empt for approach rates > 10.
-            double preempt = PREEMPT * Math.Min(1, start.TimePreempt / 450);
+            // Preempt time can go below 800ms. Normally, this is achieved via the DT mod which uniformly speeds up all animations game wide regardless of AR.
+            // This uniform speedup is hard to match 1:1, however we can at least make AR>10 (via mods) feel good by extending the upper linear preempt function (see: OsuHitObject).
+            // Note that this doesn't exactly match the AR>10 visuals as they're classically known, but it feels good.
+            double preempt = PREEMPT * Math.Min(1, start.TimePreempt / OsuHitObject.PREEMPT_MIN);
 
             fadeOutTime = startTime + fraction * duration;
             fadeInTime = fadeOutTime - preempt;
diff --git a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
index 6d28a576a4..22b64af3df 100644
--- a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
@@ -26,6 +26,11 @@ namespace osu.Game.Rulesets.Osu.Objects
         /// </summary>
         internal const float BASE_SCORING_DISTANCE = 100;
 
+        /// <summary>
+        /// Minimum preempt time at AR=10.
+        /// </summary>
+        public const double PREEMPT_MIN = 450;
+
         public double TimePreempt = 600;
         public double TimeFadeIn = 400;
 
@@ -113,8 +118,13 @@ namespace osu.Game.Rulesets.Osu.Objects
         {
             base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
 
-            TimePreempt = (float)BeatmapDifficulty.DifficultyRange(difficulty.ApproachRate, 1800, 1200, 450);
-            TimeFadeIn = 400 * Math.Min(1, TimePreempt / 450);
+            TimePreempt = (float)BeatmapDifficulty.DifficultyRange(difficulty.ApproachRate, 1800, 1200, PREEMPT_MIN);
+
+            // Preempt time can go below 450ms. Normally, this is achieved via the DT mod which uniformly speeds up all animations game wide regardless of AR.
+            // This uniform speedup is hard to match 1:1, however we can at least make AR>10 (via mods) feel good by extending the upper linear function above.
+            // Note that this doesn't exactly match the AR>10 visuals as they're classically known, but it feels good.
+            // 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;
         }

From 5d1d6ec1cbeef3ff0cf17b9e04d556e01772de1a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 22:09:24 +0900
Subject: [PATCH 1446/3722] Fix inverted calculation

---
 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 253b9800a6..9122f347d0 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -270,7 +270,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     r.Type = HitResult.Miss;
                 else
                 {
-                    double hitFraction = (double)totalTicks / hitTicks;
+                    double hitFraction = (double)hitTicks / totalTicks;
                     r.Type = hitFraction >= 0.5 ? HitResult.Ok : HitResult.Meh;
                 }
             });

From 07b661e28c2d2267dbe1a431f1a75e1d60fc6620 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 10 Feb 2021 23:44:06 +0900
Subject: [PATCH 1447/3722] Add Messagepack support for serialising unknown
 bindable types

---
 .../TestAPIModMessagePackSerialization.cs     | 27 +++++++++++++++++++
 .../API/ModSettingsDictionaryFormatter.cs     |  8 ++++++
 2 files changed, 35 insertions(+)

diff --git a/osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs b/osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs
index 4294f89397..74db477cfc 100644
--- a/osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs
+++ b/osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs
@@ -68,6 +68,16 @@ namespace osu.Game.Tests.Online
             Assert.That(converted.FinalRate.Value, Is.EqualTo(0.25));
         }
 
+        [Test]
+        public void TestDeserialiseEnumMod()
+        {
+            var apiMod = new APIMod(new TestModEnum { TestSetting = { Value = TestEnum.Value2 } });
+
+            var deserialized = MessagePackSerializer.Deserialize<APIMod>(MessagePackSerializer.Serialize(apiMod));
+
+            Assert.That(deserialized.Settings, Contains.Key("test_setting").With.ContainValue(1));
+        }
+
         private class TestRuleset : Ruleset
         {
             public override IEnumerable<Mod> GetModsFor(ModType type) => new Mod[]
@@ -135,5 +145,22 @@ namespace osu.Game.Tests.Online
                 Value = true
             };
         }
+
+        private class TestModEnum : Mod
+        {
+            public override string Name => "Test Mod";
+            public override string Acronym => "TM";
+            public override double ScoreMultiplier => 1;
+
+            [SettingSource("Test")]
+            public Bindable<TestEnum> TestSetting { get; } = new Bindable<TestEnum>();
+        }
+
+        private enum TestEnum
+        {
+            Value1 = 0,
+            Value2 = 1,
+            Value3 = 2
+        }
     }
 }
diff --git a/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs b/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
index 99e87677fa..dd854acc32 100644
--- a/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
+++ b/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
@@ -3,6 +3,7 @@
 
 using System.Buffers;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Text;
 using MessagePack;
 using MessagePack.Formatters;
@@ -41,6 +42,13 @@ namespace osu.Game.Online.API
                         primitiveFormatter.Serialize(ref writer, b.Value, options);
                         break;
 
+                    case IBindable u:
+                        // A mod with unknown (e.g. enum) generic type.
+                        var valueMethod = u.GetType().GetProperty(nameof(IBindable<int>.Value));
+                        Debug.Assert(valueMethod != null);
+                        primitiveFormatter.Serialize(ref writer, valueMethod.GetValue(u), options);
+                        break;
+
                     default:
                         // fall back for non-bindable cases.
                         primitiveFormatter.Serialize(ref writer, kvp.Value, options);

From 97e799a26bc22316442500aefc79fad3f9c6d646 Mon Sep 17 00:00:00 2001
From: Susko3 <16479013+Susko3@users.noreply.github.com>
Date: Wed, 10 Feb 2021 18:10:31 +0100
Subject: [PATCH 1448/3722] add more MIME types to Android share intent filter

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

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index 48b059b482..d3bb97973b 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -21,7 +21,7 @@ namespace osu.Android
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPattern = ".*\\\\.osz", DataHost = "*", DataMimeType = "*/*")]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPattern = ".*\\\\.osk", DataHost = "*", DataMimeType = "*/*")]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataMimeTypes = new[] { "application/x-osu-beatmap", "application/x-osu-skin" })]
-    [IntentFilter(new[] { Intent.ActionSend, Intent.ActionSendMultiple }, Categories = new[] { Intent.CategoryDefault }, DataMimeTypes = new[] { "application/x-osu-beatmap", "application/x-osu-skin", "application/zip", "application/octet-stream", "application/x-zip", "application/x-zip-compressed" })]
+    [IntentFilter(new[] { Intent.ActionSend, Intent.ActionSendMultiple }, Categories = new[] { Intent.CategoryDefault }, DataMimeTypes = new[] { "application/zip", "application/octet-stream", "application/download", "application/x-zip", "application/x-zip-compressed" })]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryBrowsable, Intent.CategoryDefault }, DataSchemes = new[] { "osu", "osump" })]
     public class OsuGameActivity : AndroidGameActivity
     {

From fed2dea7353a380103772ba99edb4882a6639d73 Mon Sep 17 00:00:00 2001
From: Susko3 <16479013+Susko3@users.noreply.github.com>
Date: Wed, 10 Feb 2021 18:13:59 +0100
Subject: [PATCH 1449/3722] remove unnecesary view intent filter

---
 osu.Android/OsuGameActivity.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index d3bb97973b..ad929bbac3 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -20,7 +20,6 @@ namespace osu.Android
     [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false, LaunchMode = LaunchMode.SingleInstance)]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPattern = ".*\\\\.osz", DataHost = "*", DataMimeType = "*/*")]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPattern = ".*\\\\.osk", DataHost = "*", DataMimeType = "*/*")]
-    [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataMimeTypes = new[] { "application/x-osu-beatmap", "application/x-osu-skin" })]
     [IntentFilter(new[] { Intent.ActionSend, Intent.ActionSendMultiple }, Categories = new[] { Intent.CategoryDefault }, DataMimeTypes = new[] { "application/zip", "application/octet-stream", "application/download", "application/x-zip", "application/x-zip-compressed" })]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryBrowsable, Intent.CategoryDefault }, DataSchemes = new[] { "osu", "osump" })]
     public class OsuGameActivity : AndroidGameActivity

From 63e6ec1c9fa3b0ecb12ecbd2f389edc0042de939 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Fri, 15 Jan 2021 20:06:55 +0900
Subject: [PATCH 1450/3722] Add audio feedback for OSD value changes

---
 osu.Game/Overlays/OSD/TrackedSettingToast.cs | 46 ++++++++++++++++++--
 1 file changed, 43 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/OSD/TrackedSettingToast.cs b/osu.Game/Overlays/OSD/TrackedSettingToast.cs
index 8e8a99a0a7..c5a289a85c 100644
--- a/osu.Game/Overlays/OSD/TrackedSettingToast.cs
+++ b/osu.Game/Overlays/OSD/TrackedSettingToast.cs
@@ -3,6 +3,8 @@
 
 using System;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Configuration.Tracking;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -19,6 +21,15 @@ namespace osu.Game.Overlays.OSD
     {
         private const int lights_bottom_margin = 40;
 
+        private readonly int optionCount;
+        private readonly int selectedOption = -1;
+
+        private SampleChannel sampleOn;
+        private SampleChannel sampleOff;
+        private SampleChannel sampleChange;
+
+        private bool playedSample;
+
         public TrackedSettingToast(SettingDescription description)
             : base(description.Name, description.Value, description.Shortcut)
         {
@@ -46,9 +57,6 @@ namespace osu.Game.Overlays.OSD
                 }
             };
 
-            int optionCount = 0;
-            int selectedOption = -1;
-
             switch (description.RawValue)
             {
                 case bool val:
@@ -69,6 +77,38 @@ namespace osu.Game.Overlays.OSD
                 optionLights.Add(new OptionLight { Glowing = i == selectedOption });
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            if (playedSample) return;
+
+            if (optionCount == 1)
+            {
+                if (selectedOption == 0)
+                    sampleOn?.Play();
+                else
+                    sampleOff?.Play();
+            }
+            else
+            {
+                if (sampleChange == null) return;
+
+                sampleChange.Frequency.Value = 1 + (double)selectedOption / (optionCount - 1) * 0.25f;
+                sampleChange.Play();
+            }
+
+            playedSample = true;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio)
+        {
+            sampleOn = audio.Samples.Get("UI/osd-on");
+            sampleOff = audio.Samples.Get("UI/osd-off");
+            sampleChange = audio.Samples.Get("UI/osd-change");
+        }
+
         private class OptionLight : Container
         {
             private Color4 glowingColour, idleColour;

From c12c09ec4d497ad7e52a3c4b625e3793dc23d8a1 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 11 Feb 2021 09:57:14 +0900
Subject: [PATCH 1451/3722] Move logic to LoadComplete instead

---
 osu.Game/Overlays/OSD/TrackedSettingToast.cs | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/OSD/TrackedSettingToast.cs b/osu.Game/Overlays/OSD/TrackedSettingToast.cs
index c5a289a85c..d61180baa2 100644
--- a/osu.Game/Overlays/OSD/TrackedSettingToast.cs
+++ b/osu.Game/Overlays/OSD/TrackedSettingToast.cs
@@ -28,8 +28,6 @@ namespace osu.Game.Overlays.OSD
         private SampleChannel sampleOff;
         private SampleChannel sampleChange;
 
-        private bool playedSample;
-
         public TrackedSettingToast(SettingDescription description)
             : base(description.Name, description.Value, description.Shortcut)
         {
@@ -77,11 +75,9 @@ namespace osu.Game.Overlays.OSD
                 optionLights.Add(new OptionLight { Glowing = i == selectedOption });
         }
 
-        protected override void Update()
+        protected override void LoadComplete()
         {
-            base.Update();
-
-            if (playedSample) return;
+            base.LoadComplete();
 
             if (optionCount == 1)
             {
@@ -97,8 +93,6 @@ namespace osu.Game.Overlays.OSD
                 sampleChange.Frequency.Value = 1 + (double)selectedOption / (optionCount - 1) * 0.25f;
                 sampleChange.Play();
             }
-
-            playedSample = true;
         }
 
         [BackgroundDependencyLoader]

From a1ae739a6235f72995ec460d93874eac2a504aa6 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Fri, 15 Jan 2021 15:21:50 +0900
Subject: [PATCH 1452/3722] Add support for Notification sounds

---
 .../Overlays/Notifications/Notification.cs    | 24 ++++++++++++++++++-
 .../Notifications/NotificationSection.cs      |  7 +++++-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 2dc6b39a92..86e409d0f6 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -3,6 +3,8 @@
 
 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.Colour;
@@ -40,6 +42,11 @@ namespace osu.Game.Overlays.Notifications
         /// </summary>
         public virtual bool DisplayOnTop => true;
 
+        private SampleChannel samplePopIn;
+        private SampleChannel samplePopOut;
+        protected virtual string PopInSampleName => "UI/notification-pop-in";
+        protected virtual string PopOutSampleName => "UI/overlay-pop-out"; // TODO: replace with a unique sample?
+
         protected NotificationLight Light;
         private readonly CloseButton closeButton;
         protected Container IconContent;
@@ -120,6 +127,13 @@ namespace osu.Game.Overlays.Notifications
             });
         }
 
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio)
+        {
+            samplePopIn = audio.Samples.Get(PopInSampleName);
+            samplePopOut = audio.Samples.Get(PopOutSampleName);
+        }
+
         protected override bool OnHover(HoverEvent e)
         {
             closeButton.FadeIn(75);
@@ -143,6 +157,9 @@ namespace osu.Game.Overlays.Notifications
         protected override void LoadComplete()
         {
             base.LoadComplete();
+
+            samplePopIn?.Play();
+
             this.FadeInFromZero(200);
             NotificationContent.MoveToX(DrawSize.X);
             NotificationContent.MoveToX(0, 500, Easing.OutQuint);
@@ -150,12 +167,17 @@ namespace osu.Game.Overlays.Notifications
 
         public bool WasClosed;
 
-        public virtual void Close()
+        public virtual void Close() => Close(true);
+
+        public virtual void Close(bool playSound)
         {
             if (WasClosed) return;
 
             WasClosed = true;
 
+            if (playSound)
+                samplePopOut?.Play();
+
             Closed?.Invoke();
             this.FadeOut(100);
             Expire();
diff --git a/osu.Game/Overlays/Notifications/NotificationSection.cs b/osu.Game/Overlays/Notifications/NotificationSection.cs
index c2a958b65e..c8cee22370 100644
--- a/osu.Game/Overlays/Notifications/NotificationSection.cs
+++ b/osu.Game/Overlays/Notifications/NotificationSection.cs
@@ -109,7 +109,12 @@ namespace osu.Game.Overlays.Notifications
 
         private void clearAll()
         {
-            notifications.Children.ForEach(c => c.Close());
+            bool playSound = true;
+            notifications.Children.ForEach(c =>
+            {
+                c.Close(playSound);
+                playSound = false;
+            });
         }
 
         protected override void Update()

From 2ee634d173647a97fa9e5ef40bfe1e262920162b Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 21 Jan 2021 18:42:53 +0900
Subject: [PATCH 1453/3722] Create subclass for "Error" notifications to allow
 them to have a unique pop-in sound

---
 .../TestSceneNotificationOverlay.cs           | 20 ++++++++++++++++++-
 osu.Game/OsuGame.cs                           |  2 +-
 .../Notifications/SimpleErrorNotification.cs  | 17 ++++++++++++++++
 3 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game/Overlays/Notifications/SimpleErrorNotification.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
index 43ba23e6c6..d0f6f3fe47 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
@@ -105,6 +105,15 @@ namespace osu.Game.Tests.Visual.UserInterface
             checkDisplayedCount(3);
         }
 
+        [Test]
+        public void TestError()
+        {
+            setState(Visibility.Visible);
+            AddStep(@"error #1", sendErrorNotification);
+            AddAssert("Is visible", () => notificationOverlay.State.Value == Visibility.Visible);
+            checkDisplayedCount(1);
+        }
+
         [Test]
         public void TestSpam()
         {
@@ -179,7 +188,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private void sendBarrage()
         {
-            switch (RNG.Next(0, 4))
+            switch (RNG.Next(0, 5))
             {
                 case 0:
                     sendHelloNotification();
@@ -196,6 +205,10 @@ namespace osu.Game.Tests.Visual.UserInterface
                 case 3:
                     sendDownloadProgress();
                     break;
+
+                case 4:
+                    sendErrorNotification();
+                    break;
             }
         }
 
@@ -214,6 +227,11 @@ namespace osu.Game.Tests.Visual.UserInterface
             notificationOverlay.Post(new BackgroundNotification { Text = @"Welcome to osu!. Enjoy your stay!" });
         }
 
+        private void sendErrorNotification()
+        {
+            notificationOverlay.Post(new SimpleErrorNotification { Text = @"Rut roh!. Something went wrong!" });
+        }
+
         private void sendManyNotifications()
         {
             for (int i = 0; i < 10; i++)
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 1a1f7bd233..0dc63dcd4b 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -778,7 +778,7 @@ namespace osu.Game
 
                 if (recentLogCount < short_term_display_limit)
                 {
-                    Schedule(() => notifications.Post(new SimpleNotification
+                    Schedule(() => notifications.Post(new SimpleErrorNotification
                     {
                         Icon = entry.Level == LogLevel.Important ? FontAwesome.Solid.ExclamationCircle : FontAwesome.Solid.Bomb,
                         Text = entry.Message.Truncate(256) + (entry.Exception != null && IsDeployedBuild ? "\n\nThis error has been automatically reported to the devs." : string.Empty),
diff --git a/osu.Game/Overlays/Notifications/SimpleErrorNotification.cs b/osu.Game/Overlays/Notifications/SimpleErrorNotification.cs
new file mode 100644
index 0000000000..13c9c5a02d
--- /dev/null
+++ b/osu.Game/Overlays/Notifications/SimpleErrorNotification.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics.Sprites;
+
+namespace osu.Game.Overlays.Notifications
+{
+    public class SimpleErrorNotification : SimpleNotification
+    {
+        protected override string PopInSampleName => "UI/error-notification-pop-in";
+
+        public SimpleErrorNotification()
+        {
+            Icon = FontAwesome.Solid.Bomb;
+        }
+    }
+}

From 72562070bcea0718bd6ddce220e354d934b6a987 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Feb 2021 14:18:00 +0900
Subject: [PATCH 1454/3722] Remove second overload of Close (makes the call
 structure hard to follow / invoke correctly)

---
 osu.Game/Overlays/Notifications/Notification.cs         | 6 ++----
 osu.Game/Overlays/Notifications/ProgressNotification.cs | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index 86e409d0f6..daf931bc24 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -114,7 +114,7 @@ namespace osu.Game.Overlays.Notifications
                         closeButton = new CloseButton
                         {
                             Alpha = 0,
-                            Action = Close,
+                            Action = () => Close(),
                             Anchor = Anchor.CentreRight,
                             Origin = Anchor.CentreRight,
                             Margin = new MarginPadding
@@ -167,9 +167,7 @@ namespace osu.Game.Overlays.Notifications
 
         public bool WasClosed;
 
-        public virtual void Close() => Close(true);
-
-        public virtual void Close(bool playSound)
+        public virtual void Close(bool playSound = true)
         {
             if (WasClosed) return;
 
diff --git a/osu.Game/Overlays/Notifications/ProgressNotification.cs b/osu.Game/Overlays/Notifications/ProgressNotification.cs
index 3105ecd742..703c14af2b 100644
--- a/osu.Game/Overlays/Notifications/ProgressNotification.cs
+++ b/osu.Game/Overlays/Notifications/ProgressNotification.cs
@@ -150,12 +150,12 @@ namespace osu.Game.Overlays.Notifications
             colourCancelled = colours.Red;
         }
 
-        public override void Close()
+        public override void Close(bool playSound = true)
         {
             switch (State)
             {
                 case ProgressNotificationState.Cancelled:
-                    base.Close();
+                    base.Close(playSound);
                     break;
 
                 case ProgressNotificationState.Active:

From 896f318b56866306e455d92c4443c252723d75f3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Feb 2021 14:18:40 +0900
Subject: [PATCH 1455/3722] Rename variable for clarity

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

diff --git a/osu.Game/Overlays/Notifications/NotificationSection.cs b/osu.Game/Overlays/Notifications/NotificationSection.cs
index c8cee22370..38ba712254 100644
--- a/osu.Game/Overlays/Notifications/NotificationSection.cs
+++ b/osu.Game/Overlays/Notifications/NotificationSection.cs
@@ -109,11 +109,11 @@ namespace osu.Game.Overlays.Notifications
 
         private void clearAll()
         {
-            bool playSound = true;
+            bool first = true;
             notifications.Children.ForEach(c =>
             {
-                c.Close(playSound);
-                playSound = false;
+                c.Close(first);
+                first = false;
             });
         }
 

From 800f12a358b234f7d3409e843c5b913cc563f4b6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Feb 2021 14:19:48 +0900
Subject: [PATCH 1456/3722] Update resources

---
 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 7060e88026..a522a5f43d 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -51,7 +51,7 @@
     <Reference Include="Java.Interop" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2021.128.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index f866b232d8..f69613cfd3 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -30,7 +30,7 @@
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.128.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.0" />
     <PackageReference Include="Sentry" Version="3.0.1" />
     <PackageReference Include="SharpCompress" Version="0.27.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 22d104f2e1..1c602e1584 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.128.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1202.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
   <PropertyGroup>

From c8899aff92f793ee03bf61ab026263d2e6bd4dd6 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 11 Feb 2021 14:36:41 +0900
Subject: [PATCH 1457/3722] Prevent the default on-click sample from playing
 for OsuCheckbox

---
 osu.Game/Graphics/UserInterface/OsuCheckbox.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
index f6effa0834..0d00bc0dce 100644
--- a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Graphics.UserInterface
                     RelativeSizeAxes = Axes.X,
                 },
                 Nub = new Nub(),
-                new HoverClickSounds()
+                new HoverSounds()
             };
 
             if (nubOnRight)

From f21a3c0c48abe02b8b949bd0881dfe02f5a143cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Feb 2021 14:50:55 +0900
Subject: [PATCH 1458/3722] Decrease the game-wide track playback volume to
 give samples some head-room

---
 osu.Game/OsuGame.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 1a1f7bd233..b77097a3f0 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -174,6 +174,8 @@ namespace osu.Game
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) =>
             dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
 
+        private readonly BindableNumber<double> globalTrackVolumeAdjust = new BindableNumber<double>(0.5f);
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -230,6 +232,11 @@ namespace osu.Game
 
             Audio.AddAdjustment(AdjustableProperty.Volume, inactiveVolumeFade);
 
+            // drop track volume game-wide to leave some head-room for UI effects / samples.
+            // this means that for the time being, gameplay sample playback is louder relative to the audio track, compared to stable.
+            // we may want to revisit this if users notice or complain about the difference (consider this a bit of a trial).
+            Audio.Tracks.AddAdjustment(AdjustableProperty.Volume, globalTrackVolumeAdjust);
+
             SelectedMods.BindValueChanged(modsChanged);
             Beatmap.BindValueChanged(beatmapChanged, true);
         }

From eaa7b4cb93cdad7a27bc8958cacd860a7f2e3b10 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Feb 2021 14:54:50 +0900
Subject: [PATCH 1459/3722] Rename second usage variable name to match

---
 osu.Game/Screens/Select/Details/AdvancedStats.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 4a03c5e614..ab4f3f4796 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -82,15 +82,15 @@ namespace osu.Game.Screens.Select.Details
             mods.BindValueChanged(modsChanged, true);
         }
 
-        private ModSettingChangeTracker settingChangeTracker;
+        private ModSettingChangeTracker modSettingChangeTracker;
         private ScheduledDelegate debouncedStatisticsUpdate;
 
         private void modsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
         {
-            settingChangeTracker?.Dispose();
+            modSettingChangeTracker?.Dispose();
 
-            settingChangeTracker = new ModSettingChangeTracker(mods.NewValue);
-            settingChangeTracker.SettingChanged += m =>
+            modSettingChangeTracker = new ModSettingChangeTracker(mods.NewValue);
+            modSettingChangeTracker.SettingChanged += m =>
             {
                 if (!(m is IApplicableToDifficulty))
                     return;
@@ -162,7 +162,7 @@ namespace osu.Game.Screens.Select.Details
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            settingChangeTracker?.Dispose();
+            modSettingChangeTracker?.Dispose();
             starDifficultyCancellationSource?.Cancel();
         }
 

From df7aaa5c816e6064920c32028bb3689e31174c81 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Feb 2021 15:02:34 +0900
Subject: [PATCH 1460/3722] Move implementation to OsuGameBase to ensure it
 applies to test scenes

This also removed a previous attempt at the same thing, which happened
to not be applying due to the reference to the applied bindable not
being held. Whoops.
---
 osu.Game/OsuGame.cs     | 7 -------
 osu.Game/OsuGameBase.cs | 9 ++++++---
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index b77097a3f0..1a1f7bd233 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -174,8 +174,6 @@ namespace osu.Game
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) =>
             dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
 
-        private readonly BindableNumber<double> globalTrackVolumeAdjust = new BindableNumber<double>(0.5f);
-
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -232,11 +230,6 @@ namespace osu.Game
 
             Audio.AddAdjustment(AdjustableProperty.Volume, inactiveVolumeFade);
 
-            // drop track volume game-wide to leave some head-room for UI effects / samples.
-            // this means that for the time being, gameplay sample playback is louder relative to the audio track, compared to stable.
-            // we may want to revisit this if users notice or complain about the difference (consider this a bit of a trial).
-            Audio.Tracks.AddAdjustment(AdjustableProperty.Volume, globalTrackVolumeAdjust);
-
             SelectedMods.BindValueChanged(modsChanged);
             Beatmap.BindValueChanged(beatmapChanged, true);
         }
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index d3936ed27e..a1b66ba9c0 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -155,6 +155,8 @@ namespace osu.Game
 
         protected override UserInputManager CreateUserInputManager() => new OsuUserInputManager();
 
+        private readonly BindableNumber<double> globalTrackVolumeAdjust = new BindableNumber<double>(0.5f);
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -278,9 +280,10 @@ namespace osu.Game
             RegisterImportHandler(ScoreManager);
             RegisterImportHandler(SkinManager);
 
-            // tracks play so loud our samples can't keep up.
-            // this adds a global reduction of track volume for the time being.
-            Audio.Tracks.AddAdjustment(AdjustableProperty.Volume, new BindableDouble(0.8));
+            // drop track volume game-wide to leave some head-room for UI effects / samples.
+            // this means that for the time being, gameplay sample playback is louder relative to the audio track, compared to stable.
+            // we may want to revisit this if users notice or complain about the difference (consider this a bit of a trial).
+            Audio.Tracks.AddAdjustment(AdjustableProperty.Volume, globalTrackVolumeAdjust);
 
             Beatmap = new NonNullableBindable<WorkingBeatmap>(defaultBeatmap);
 

From 21f66a19fd21c492f8340cc70ef2934ff1d1033e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Feb 2021 15:55:08 +0900
Subject: [PATCH 1461/3722] Make server authoritative in which mods the client
 should be using when gameplay starts

---
 .../Screens/OnlinePlay/Match/RoomSubScreen.cs |  8 +++---
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 25 +++++++++++++++++++
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index f3972ab7f9..6d06e638c8 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
             managerUpdated = beatmapManager.ItemUpdated.GetBoundCopy();
             managerUpdated.BindValueChanged(beatmapUpdated);
 
-            UserMods.BindValueChanged(_ => updateMods());
+            UserMods.BindValueChanged(_ => UpdateMods());
         }
 
         public override void OnEntering(IScreen last)
@@ -97,7 +97,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
         {
             base.OnResuming(last);
             beginHandlingTrack();
-            updateMods();
+            UpdateMods();
         }
 
         public override bool OnExiting(IScreen next)
@@ -128,7 +128,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
                                      .Where(m => SelectedItem.Value.AllowedMods.Any(a => m.GetType() == a.GetType()))
                                      .ToList();
 
-            updateMods();
+            UpdateMods();
 
             Ruleset.Value = SelectedItem.Value.Ruleset.Value;
         }
@@ -145,7 +145,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
             Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
         }
 
-        private void updateMods()
+        protected virtual void UpdateMods()
         {
             if (SelectedItem.Value == null)
                 return;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 5f2f1366f7..3dff291858 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -271,6 +271,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             UserMods.BindValueChanged(onUserModsChanged);
 
             client.LoadRequested += onLoadRequested;
+            client.RoomUpdated += onRoomUpdated;
 
             isConnected = client.IsConnected.GetBoundCopy();
             isConnected.BindValueChanged(connected =>
@@ -367,6 +368,27 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             }
         }
 
+        private void onRoomUpdated()
+        {
+            UpdateMods(); // user mods may have changed.
+        }
+
+        protected override void UpdateMods()
+        {
+            if (SelectedItem.Value == null || client.LocalUser == null)
+                return;
+
+            // update local mods based on room's reported status for the local user (omitting the base call implementation).
+            // this makes the server authoritative, and avoids the local user potentially settings mods that the server is not aware of (ie. if the match was started during the selection being changed).
+            var localUserMods = client.LocalUser.Mods.ToList();
+
+            Schedule(() =>
+            {
+                var ruleset = Ruleset.Value.CreateInstance();
+                Mods.Value = localUserMods.Select(m => m.ToMod(ruleset)).Concat(SelectedItem.Value.RequiredMods).ToList();
+            });
+        }
+
         private void onLoadRequested()
         {
             Debug.Assert(client.Room != null);
@@ -384,7 +406,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             base.Dispose(isDisposing);
 
             if (client != null)
+            {
+                client.RoomUpdated -= onRoomUpdated;
                 client.LoadRequested -= onLoadRequested;
+            }
         }
 
         private class UserModSelectOverlay : LocalPlayerModSelectOverlay

From 549e7520c520cb9b9e45773ad41a5d25b0d2fc7a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Feb 2021 16:00:26 +0900
Subject: [PATCH 1462/3722] Move scheduler logic to client callback rather than
 inside the update method

---
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 30 ++++++++-----------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 3dff291858..1599936a51 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -281,6 +281,17 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             }, true);
         }
 
+        protected override void UpdateMods()
+        {
+            if (SelectedItem.Value == null || client.LocalUser == null)
+                return;
+
+            // update local mods based on room's reported status for the local user (omitting the base call implementation).
+            // this makes the server authoritative, and avoids the local user potentially settings mods that the server is not aware of (ie. if the match was started during the selection being changed).
+            var ruleset = Ruleset.Value.CreateInstance();
+            Mods.Value = client.LocalUser.Mods.Select(m => m.ToMod(ruleset)).Concat(SelectedItem.Value.RequiredMods).ToList();
+        }
+
         public override bool OnBackButton()
         {
             if (client.Room != null && settingsOverlay.State.Value == Visibility.Visible)
@@ -370,23 +381,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private void onRoomUpdated()
         {
-            UpdateMods(); // user mods may have changed.
-        }
-
-        protected override void UpdateMods()
-        {
-            if (SelectedItem.Value == null || client.LocalUser == null)
-                return;
-
-            // update local mods based on room's reported status for the local user (omitting the base call implementation).
-            // this makes the server authoritative, and avoids the local user potentially settings mods that the server is not aware of (ie. if the match was started during the selection being changed).
-            var localUserMods = client.LocalUser.Mods.ToList();
-
-            Schedule(() =>
-            {
-                var ruleset = Ruleset.Value.CreateInstance();
-                Mods.Value = localUserMods.Select(m => m.ToMod(ruleset)).Concat(SelectedItem.Value.RequiredMods).ToList();
-            });
+            // user mods may have changed.
+            Scheduler.AddOnce(UpdateMods);
         }
 
         private void onLoadRequested()

From 889a99c49cd153b67e8ad7bc04b77517fbd90ef4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Feb 2021 16:00:35 +0900
Subject: [PATCH 1463/3722] Use AddOnce everywhere to reduce potential call
 count

---
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 6d06e638c8..3668743720 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
             managerUpdated = beatmapManager.ItemUpdated.GetBoundCopy();
             managerUpdated.BindValueChanged(beatmapUpdated);
 
-            UserMods.BindValueChanged(_ => UpdateMods());
+            UserMods.BindValueChanged(_ => Scheduler.AddOnce(UpdateMods));
         }
 
         public override void OnEntering(IScreen last)
@@ -97,7 +97,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
         {
             base.OnResuming(last);
             beginHandlingTrack();
-            UpdateMods();
+            Scheduler.AddOnce(UpdateMods);
         }
 
         public override bool OnExiting(IScreen next)

From dddd776802ad1f77f085c9862c317f93a3d1b191 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Feb 2021 16:38:17 +0900
Subject: [PATCH 1464/3722] Add the ability for settings items to have tooltips

---
 osu.Game/Configuration/SettingSourceAttribute.cs | 6 ++++++
 osu.Game/Overlays/Settings/SettingsItem.cs       | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index 50069be4b2..70d67aaaa0 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -57,6 +57,7 @@ namespace osu.Game.Configuration
                         yield return new SettingsSlider<float>
                         {
                             LabelText = attr.Label,
+                            TooltipText = attr.Description,
                             Current = bNumber,
                             KeyboardStep = 0.1f,
                         };
@@ -67,6 +68,7 @@ namespace osu.Game.Configuration
                         yield return new SettingsSlider<double>
                         {
                             LabelText = attr.Label,
+                            TooltipText = attr.Description,
                             Current = bNumber,
                             KeyboardStep = 0.1f,
                         };
@@ -77,6 +79,7 @@ namespace osu.Game.Configuration
                         yield return new SettingsSlider<int>
                         {
                             LabelText = attr.Label,
+                            TooltipText = attr.Description,
                             Current = bNumber
                         };
 
@@ -86,6 +89,7 @@ namespace osu.Game.Configuration
                         yield return new SettingsCheckbox
                         {
                             LabelText = attr.Label,
+                            TooltipText = attr.Description,
                             Current = bBool
                         };
 
@@ -95,6 +99,7 @@ namespace osu.Game.Configuration
                         yield return new SettingsTextBox
                         {
                             LabelText = attr.Label,
+                            TooltipText = attr.Description,
                             Current = bString
                         };
 
@@ -105,6 +110,7 @@ namespace osu.Game.Configuration
                         var dropdown = (Drawable)Activator.CreateInstance(dropdownType);
 
                         dropdownType.GetProperty(nameof(SettingsDropdown<object>.LabelText))?.SetValue(dropdown, attr.Label);
+                        dropdownType.GetProperty(nameof(SettingsDropdown<object>.TooltipText))?.SetValue(dropdown, attr.Description);
                         dropdownType.GetProperty(nameof(SettingsDropdown<object>.Current))?.SetValue(dropdown, bindable);
 
                         yield return dropdown;
diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index 278479e04f..27232d0a49 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -21,7 +21,7 @@ using osuTK;
 
 namespace osu.Game.Overlays.Settings
 {
-    public abstract class SettingsItem<T> : Container, IFilterable, ISettingsItem, IHasCurrentValue<T>
+    public abstract class SettingsItem<T> : Container, IFilterable, ISettingsItem, IHasCurrentValue<T>, IHasTooltip
     {
         protected abstract Drawable CreateControl();
 
@@ -214,5 +214,7 @@ namespace osu.Game.Overlays.Settings
                 this.FadeColour(bindable.Disabled ? Color4.Gray : buttonColour, 200, Easing.OutQuint);
             }
         }
+
+        public string TooltipText { get; set; }
     }
 }

From 9fb41dc0b6f416e2232cffbeb576f0d9cdcf5955 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Feb 2021 16:41:21 +0900
Subject: [PATCH 1465/3722] Move property to a better place in the class

---
 osu.Game/Overlays/Settings/SettingsItem.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index 27232d0a49..af225889da 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -37,6 +37,8 @@ namespace osu.Game.Overlays.Settings
 
         public bool ShowsDefaultIndicator = true;
 
+        public string TooltipText { get; set; }
+
         public virtual string LabelText
         {
             get => labelText?.Text ?? string.Empty;
@@ -214,7 +216,5 @@ namespace osu.Game.Overlays.Settings
                 this.FadeColour(bindable.Disabled ? Color4.Gray : buttonColour, 200, Easing.OutQuint);
             }
         }
-
-        public string TooltipText { get; set; }
     }
 }

From 5fb99fdc52e12845dadc48a57f043e0da4696bbd Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 11 Feb 2021 10:49:16 +0300
Subject: [PATCH 1466/3722] Rename some members and extract connection closure
 to separate method

---
 osu.Game/Online/HubClientConnector.cs         | 35 ++++++++++---------
 .../Online/Multiplayer/MultiplayerClient.cs   |  2 +-
 .../Spectator/SpectatorStreamingClient.cs     |  2 +-
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Online/HubClientConnector.cs b/osu.Game/Online/HubClientConnector.cs
index b740aabb92..65285882d9 100644
--- a/osu.Game/Online/HubClientConnector.cs
+++ b/osu.Game/Online/HubClientConnector.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Online
         /// <summary>
         /// Invoked whenever a new hub connection is built.
         /// </summary>
-        public Action<HubConnection>? OnNewConnection;
+        public Action<HubConnection>? ConfigureConnection;
 
         private readonly string clientName;
         private readonly string endpoint;
@@ -106,7 +106,7 @@ namespace osu.Game.Online
                     try
                     {
                         // importantly, rebuild the connection each attempt to get an updated access token.
-                        CurrentConnection = createConnection(cancellationToken);
+                        CurrentConnection = buildConnection(cancellationToken);
 
                         await CurrentConnection.StartAsync(cancellationToken);
 
@@ -134,7 +134,7 @@ namespace osu.Game.Online
             }
         }
 
-        private HubConnection createConnection(CancellationToken cancellationToken)
+        private HubConnection buildConnection(CancellationToken cancellationToken)
         {
             Debug.Assert(api != null);
 
@@ -152,24 +152,25 @@ namespace osu.Game.Online
 
             var newConnection = builder.Build();
 
-            OnNewConnection?.Invoke(newConnection);
-
-            newConnection.Closed += ex =>
-            {
-                isConnected.Value = false;
-
-                Logger.Log(ex != null ? $"{clientName} lost connection: {ex}" : $"{clientName} disconnected", LoggingTarget.Network);
-
-                // make sure a disconnect wasn't triggered (and this is still the active connection).
-                if (!cancellationToken.IsCancellationRequested)
-                    Task.Run(connect, default);
-
-                return Task.CompletedTask;
-            };
+            ConfigureConnection?.Invoke(newConnection);
 
+            newConnection.Closed += ex => onConnectionClosed(ex, cancellationToken);
             return newConnection;
         }
 
+        private Task onConnectionClosed(Exception? ex, CancellationToken cancellationToken)
+        {
+            isConnected.Value = false;
+
+            Logger.Log(ex != null ? $"{clientName} lost connection: {ex}" : $"{clientName} disconnected", LoggingTarget.Network);
+
+            // make sure a disconnect wasn't triggered (and this is still the active connection).
+            if (!cancellationToken.IsCancellationRequested)
+                Task.Run(connect, default);
+
+            return Task.CompletedTask;
+        }
+
         private async Task disconnect(bool takeLock)
         {
             cancelExistingConnect();
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index f025a5b429..ba2a8d7246 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Online.Multiplayer
         {
             connector = new HubClientConnector(nameof(MultiplayerClient), endpoint, api)
             {
-                OnNewConnection = connection =>
+                ConfigureConnection = connection =>
                 {
                     // this is kind of SILLY
                     // https://github.com/dotnet/aspnetcore/issues/15198
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 4ef59b5e47..532f717f2c 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Online.Spectator
         private void load(IAPIProvider api)
         {
             connector = CreateConnector(nameof(SpectatorStreamingClient), endpoint, api);
-            connector.OnNewConnection = connection =>
+            connector.ConfigureConnection = connection =>
             {
                 // until strong typed client support is added, each method must be manually bound
                 // (see https://github.com/dotnet/aspnetcore/issues/15198)

From 18acd7f08032369f3c87d2327a3e1197b3c09d76 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 11 Feb 2021 10:51:04 +0300
Subject: [PATCH 1467/3722] Apply documentation suggestions

Co-authored-by: Dean Herbert <pe@ppy.sh>
---
 osu.Game/Online/HubClientConnector.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/HubClientConnector.cs b/osu.Game/Online/HubClientConnector.cs
index 65285882d9..71d9df84c4 100644
--- a/osu.Game/Online/HubClientConnector.cs
+++ b/osu.Game/Online/HubClientConnector.cs
@@ -18,7 +18,7 @@ using osu.Game.Online.API;
 namespace osu.Game.Online
 {
     /// <summary>
-    /// A component that maintains over a hub connection between client and server.
+    /// A component that manages the life cycle of a connection to a SignalR Hub.
     /// </summary>
     public class HubClientConnector : IDisposable
     {
@@ -52,7 +52,7 @@ namespace osu.Game.Online
         /// </summary>
         /// <param name="clientName">The name of the client this connector connects for, used for logging.</param>
         /// <param name="endpoint">The endpoint to the hub.</param>
-        /// <param name="api">The API provider for listening to state changes, or null to not listen.</param>
+        /// <param name="api"> An API provider used to react to connection state changes, or null to not establish connection at all (for testing purposes).</param>
         public HubClientConnector(string clientName, string endpoint, IAPIProvider? api)
         {
             this.clientName = clientName;

From db79080bc4deebef8277866157d3067b024ee533 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Feb 2021 17:14:49 +0900
Subject: [PATCH 1468/3722] Fix GetNodeSamples potentially returning a live
 reference and overwriting existing samples

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

diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 1670df24a8..6fb36e80bc 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -140,7 +140,8 @@ namespace osu.Game.Rulesets.Osu.Objects
 
             // 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.
             // For now, the samples are attached to and played by the slider itself at the correct end time.
-            Samples = this.GetNodeSamples(repeatCount + 1);
+            // ToArray call is required as GetNodeSamples may fallback to Samples itself (without it it will get cleared due to the list reference being live).
+            Samples = this.GetNodeSamples(repeatCount + 1).ToArray();
         }
 
         protected override void CreateNestedHitObjects(CancellationToken cancellationToken)

From e9730d4782e9e8716d61bcf3b7e91c5cb2d1573d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Feb 2021 17:16:17 +0900
Subject: [PATCH 1469/3722] Move default sample addition to inside
 PlacementBlueprint

This isn't actually required to fix the behaviour but it does feel like
a better place to put this logic.
---
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs                  | 4 ++++
 .../Edit/Compose/Components/ComposeBlueprintContainer.cs      | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index c0eb891f5e..bfff93e7c5 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -7,6 +7,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
+using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Objects;
@@ -45,6 +46,9 @@ namespace osu.Game.Rulesets.Edit
         {
             HitObject = hitObject;
 
+            // adding the default hit sample should be the case regardless of the ruleset.
+            HitObject.Samples.Add(new HitSampleInfo(HitSampleInfo.HIT_NORMAL));
+
             RelativeSizeAxes = Axes.Both;
 
             // This is required to allow the blueprint's position to be updated via OnMouseMove/Handle
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index c09b935f28..79f457c050 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -211,9 +211,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             if (blueprint != null)
             {
-                // doing this post-creations as adding the default hit sample should be the case regardless of the ruleset.
-                blueprint.HitObject.Samples.Add(new HitSampleInfo(HitSampleInfo.HIT_NORMAL));
-
                 placementBlueprintContainer.Child = currentPlacement = blueprint;
 
                 // Fixes a 1-frame position discrepancy due to the first mouse move event happening in the next frame

From f84ea3063768bac3d8850c62f187f681ece7bbba Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Feb 2021 17:47:29 +0900
Subject: [PATCH 1470/3722] Expose Mods in DrawableRuleset to avoid using
 external DI

---
 osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs | 3 +--
 osu.Game/Rulesets/Mods/ModAutoplay.cs         | 3 +--
 osu.Game/Rulesets/Mods/ModCinema.cs           | 4 +---
 osu.Game/Rulesets/UI/DrawableRuleset.cs       | 4 ++--
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs b/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
index 59a5295858..77de0cb45b 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
@@ -62,8 +62,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             inputManager.AllowUserCursorMovement = false;
 
             // Generate the replay frames the cursor should follow
-            var mods = (IReadOnlyList<Mod>)drawableRuleset.Dependencies.Get(typeof(IReadOnlyList<Mod>));
-            replayFrames = new OsuAutoGenerator(drawableRuleset.Beatmap, mods).Generate().Frames.Cast<OsuReplayFrame>().ToList();
+            replayFrames = new OsuAutoGenerator(drawableRuleset.Beatmap, drawableRuleset.Mods).Generate().Frames.Cast<OsuReplayFrame>().ToList();
         }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModAutoplay.cs b/osu.Game/Rulesets/Mods/ModAutoplay.cs
index 748c7272f4..d1d23def67 100644
--- a/osu.Game/Rulesets/Mods/ModAutoplay.cs
+++ b/osu.Game/Rulesets/Mods/ModAutoplay.cs
@@ -18,8 +18,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public virtual void ApplyToDrawableRuleset(DrawableRuleset<T> drawableRuleset)
         {
-            var mods = (IReadOnlyList<Mod>)drawableRuleset.Dependencies.Get(typeof(IReadOnlyList<Mod>));
-            drawableRuleset.SetReplayScore(CreateReplayScore(drawableRuleset.Beatmap, mods));
+            drawableRuleset.SetReplayScore(CreateReplayScore(drawableRuleset.Beatmap, drawableRuleset.Mods));
         }
     }
 
diff --git a/osu.Game/Rulesets/Mods/ModCinema.cs b/osu.Game/Rulesets/Mods/ModCinema.cs
index 16e6400f23..eb0473016a 100644
--- a/osu.Game/Rulesets/Mods/ModCinema.cs
+++ b/osu.Game/Rulesets/Mods/ModCinema.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Collections.Generic;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects;
@@ -15,8 +14,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public virtual void ApplyToDrawableRuleset(DrawableRuleset<T> drawableRuleset)
         {
-            var mods = (IReadOnlyList<Mod>)drawableRuleset.Dependencies.Get(typeof(IReadOnlyList<Mod>));
-            drawableRuleset.SetReplayScore(CreateReplayScore(drawableRuleset.Beatmap, mods));
+            drawableRuleset.SetReplayScore(CreateReplayScore(drawableRuleset.Beatmap, drawableRuleset.Mods));
 
             // AlwaysPresent required for hitsounds
             drawableRuleset.Playfield.AlwaysPresent = true;
diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index 6940e43e5b..ca27e6b21a 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Rulesets.UI
         protected IRulesetConfigManager Config { get; private set; }
 
         [Cached(typeof(IReadOnlyList<Mod>))]
-        protected override IReadOnlyList<Mod> Mods { get; }
+        public sealed override IReadOnlyList<Mod> Mods { get; }
 
         private FrameStabilityContainer frameStabilityContainer;
 
@@ -434,7 +434,7 @@ namespace osu.Game.Rulesets.UI
         /// <summary>
         /// The mods which are to be applied.
         /// </summary>
-        protected abstract IReadOnlyList<Mod> Mods { get; }
+        public abstract IReadOnlyList<Mod> Mods { get; }
 
         /// <summary>~
         /// The associated ruleset.

From ffd3caacb5167bf10d49587ef15cde22ae5896f7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Feb 2021 17:57:50 +0900
Subject: [PATCH 1471/3722] Update resources

---
 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 a522a5f43d..d88a11257d 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -51,7 +51,7 @@
     <Reference Include="Java.Interop" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2021.128.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index f69613cfd3..d68a8a515c 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -30,7 +30,7 @@
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.128.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.0.1" />
     <PackageReference Include="SharpCompress" Version="0.27.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 1c602e1584..87ebd41fee 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.128.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
   <PropertyGroup>

From d3c1b475929227b761731ab2c0f7b5c0a1ae54cd Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 11 Feb 2021 12:32:54 +0300
Subject: [PATCH 1472/3722] Replace nullable API with null connector instead

---
 .../Visual/Gameplay/TestSceneSpectator.cs     |  6 +-
 ...TestSceneMultiplayerGameplayLeaderboard.cs |  6 +-
 osu.Game/Online/HubClientConnector.cs         | 36 +++++-----
 .../Spectator/SpectatorStreamingClient.cs     | 67 ++++++++++---------
 4 files changed, 53 insertions(+), 62 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 1e499f20cb..36e7e1fb29 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -244,11 +244,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
             }
 
-            protected override HubClientConnector CreateConnector(string name, string endpoint, IAPIProvider api)
-            {
-                // do not pass API to prevent attempting failing connections on an actual hub.
-                return base.CreateConnector(name, endpoint, null);
-            }
+            protected override HubClientConnector CreateConnector(string name, string endpoint, IAPIProvider api) => null;
 
             public void StartPlay(int beatmapId)
             {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
index b459cebdd7..49abd62dba 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -106,11 +106,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 this.totalUsers = totalUsers;
             }
 
-            protected override HubClientConnector CreateConnector(string name, string endpoint, IAPIProvider api)
-            {
-                // do not pass API to prevent attempting failing connections on an actual hub.
-                return base.CreateConnector(name, endpoint, null);
-            }
+            protected override HubClientConnector CreateConnector(string name, string endpoint, IAPIProvider api) => null;
 
             public void Start(int beatmapId)
             {
diff --git a/osu.Game/Online/HubClientConnector.cs b/osu.Game/Online/HubClientConnector.cs
index 71d9df84c4..cfc4ff5d60 100644
--- a/osu.Game/Online/HubClientConnector.cs
+++ b/osu.Game/Online/HubClientConnector.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Online
 
         private readonly string clientName;
         private readonly string endpoint;
-        private readonly IAPIProvider? api;
+        private readonly IAPIProvider api;
 
         /// <summary>
         /// The current connection opened by this connector.
@@ -52,32 +52,28 @@ namespace osu.Game.Online
         /// </summary>
         /// <param name="clientName">The name of the client this connector connects for, used for logging.</param>
         /// <param name="endpoint">The endpoint to the hub.</param>
-        /// <param name="api"> An API provider used to react to connection state changes, or null to not establish connection at all (for testing purposes).</param>
-        public HubClientConnector(string clientName, string endpoint, IAPIProvider? api)
+        /// <param name="api"> An API provider used to react to connection state changes.</param>
+        public HubClientConnector(string clientName, string endpoint, IAPIProvider api)
         {
             this.clientName = clientName;
             this.endpoint = endpoint;
-
             this.api = api;
 
-            if (api != null)
+            apiState.BindTo(api.State);
+            apiState.BindValueChanged(state =>
             {
-                apiState.BindTo(api.State);
-                apiState.BindValueChanged(state =>
+                switch (state.NewValue)
                 {
-                    switch (state.NewValue)
-                    {
-                        case APIState.Failing:
-                        case APIState.Offline:
-                            Task.Run(() => disconnect(true));
-                            break;
+                    case APIState.Failing:
+                    case APIState.Offline:
+                        Task.Run(() => disconnect(true));
+                        break;
 
-                        case APIState.Online:
-                            Task.Run(connect);
-                            break;
-                    }
-                }, true);
-            }
+                    case APIState.Online:
+                        Task.Run(connect);
+                        break;
+                }
+            }, true);
         }
 
         private async Task connect()
@@ -136,8 +132,6 @@ namespace osu.Game.Online
 
         private HubConnection buildConnection(CancellationToken cancellationToken)
         {
-            Debug.Assert(api != null);
-
             var builder = new HubConnectionBuilder()
                 .WithUrl(endpoint, options => { options.Headers.Add("Authorization", $"Bearer {api.AccessToken}"); });
 
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 532f717f2c..7e61da9b87 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -32,11 +32,12 @@ namespace osu.Game.Online.Spectator
 
         private readonly string endpoint;
 
+        [CanBeNull]
         private HubClientConnector connector;
 
         private readonly IBindable<bool> isConnected = new BindableBool();
 
-        private HubConnection connection => connector.CurrentConnection;
+        private HubConnection connection => connector?.CurrentConnection;
 
         private readonly List<int> watchingUsers = new List<int>();
 
@@ -86,42 +87,46 @@ namespace osu.Game.Online.Spectator
         private void load(IAPIProvider api)
         {
             connector = CreateConnector(nameof(SpectatorStreamingClient), endpoint, api);
-            connector.ConfigureConnection = connection =>
-            {
-                // until strong typed client support is added, each method must be manually bound
-                // (see https://github.com/dotnet/aspnetcore/issues/15198)
-                connection.On<int, SpectatorState>(nameof(ISpectatorClient.UserBeganPlaying), ((ISpectatorClient)this).UserBeganPlaying);
-                connection.On<int, FrameDataBundle>(nameof(ISpectatorClient.UserSentFrames), ((ISpectatorClient)this).UserSentFrames);
-                connection.On<int, SpectatorState>(nameof(ISpectatorClient.UserFinishedPlaying), ((ISpectatorClient)this).UserFinishedPlaying);
-            };
 
-            isConnected.BindTo(connector.IsConnected);
-            isConnected.BindValueChanged(connected =>
+            if (connector != null)
             {
-                if (connected.NewValue)
+                connector.ConfigureConnection = connection =>
                 {
-                    // get all the users that were previously being watched
-                    int[] users;
+                    // until strong typed client support is added, each method must be manually bound
+                    // (see https://github.com/dotnet/aspnetcore/issues/15198)
+                    connection.On<int, SpectatorState>(nameof(ISpectatorClient.UserBeganPlaying), ((ISpectatorClient)this).UserBeganPlaying);
+                    connection.On<int, FrameDataBundle>(nameof(ISpectatorClient.UserSentFrames), ((ISpectatorClient)this).UserSentFrames);
+                    connection.On<int, SpectatorState>(nameof(ISpectatorClient.UserFinishedPlaying), ((ISpectatorClient)this).UserFinishedPlaying);
+                };
 
-                    lock (userLock)
+                isConnected.BindTo(connector.IsConnected);
+                isConnected.BindValueChanged(connected =>
+                {
+                    if (connected.NewValue)
                     {
-                        users = watchingUsers.ToArray();
-                        watchingUsers.Clear();
+                        // get all the users that were previously being watched
+                        int[] users;
+
+                        lock (userLock)
+                        {
+                            users = watchingUsers.ToArray();
+                            watchingUsers.Clear();
+                        }
+
+                        // resubscribe to watched users.
+                        foreach (var userId in users)
+                            WatchUser(userId);
+
+                        // re-send state in case it wasn't received
+                        if (isPlaying)
+                            beginPlaying();
                     }
-
-                    // resubscribe to watched users.
-                    foreach (var userId in users)
-                        WatchUser(userId);
-
-                    // re-send state in case it wasn't received
-                    if (isPlaying)
-                        beginPlaying();
-                }
-                else
-                {
-                    playingUsers.Clear();
-                }
-            }, true);
+                    else
+                    {
+                        playingUsers.Clear();
+                    }
+                }, true);
+            }
         }
 
         protected virtual HubClientConnector CreateConnector(string name, string endpoint, IAPIProvider api) => new HubClientConnector(name, endpoint, api);

From 37e3d95c35a67f24f66302977bb31f0906e6babc Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 11 Feb 2021 12:39:06 +0300
Subject: [PATCH 1473/3722] Slight reword in `ConfigureConnection`'s xmldoc

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

diff --git a/osu.Game/Online/HubClientConnector.cs b/osu.Game/Online/HubClientConnector.cs
index cfc4ff5d60..fb76049446 100644
--- a/osu.Game/Online/HubClientConnector.cs
+++ b/osu.Game/Online/HubClientConnector.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Online
     public class HubClientConnector : IDisposable
     {
         /// <summary>
-        /// Invoked whenever a new hub connection is built.
+        /// Invoked whenever a new hub connection is built, to configure it before it's started.
         /// </summary>
         public Action<HubConnection>? ConfigureConnection;
 

From f4a7ec57e982922928ed3f327c61b228457135cc Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 11 Feb 2021 13:00:18 +0300
Subject: [PATCH 1474/3722] Remove unused using

---
 osu.Game/Online/HubClientConnector.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Online/HubClientConnector.cs b/osu.Game/Online/HubClientConnector.cs
index fb76049446..2298ac4243 100644
--- a/osu.Game/Online/HubClientConnector.cs
+++ b/osu.Game/Online/HubClientConnector.cs
@@ -4,7 +4,6 @@
 #nullable enable
 
 using System;
-using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.SignalR.Client;

From 970039b7e3ff29804999cc0f28633bb308db0eee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Feb 2021 12:14:49 +0900
Subject: [PATCH 1475/3722] Split out hover sample debounce logic so it can be
 more easily used in other places

---
 .../HoverSampleDebounceComponent.cs           | 46 +++++++++++++++++++
 .../Graphics/UserInterface/HoverSounds.cs     | 32 ++-----------
 2 files changed, 50 insertions(+), 28 deletions(-)
 create mode 100644 osu.Game/Graphics/UserInterface/HoverSampleDebounceComponent.cs

diff --git a/osu.Game/Graphics/UserInterface/HoverSampleDebounceComponent.cs b/osu.Game/Graphics/UserInterface/HoverSampleDebounceComponent.cs
new file mode 100644
index 0000000000..f0c7c20fe8
--- /dev/null
+++ b/osu.Game/Graphics/UserInterface/HoverSampleDebounceComponent.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 osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Events;
+using osu.Game.Configuration;
+
+namespace osu.Game.Graphics.UserInterface
+{
+    /// <summary>
+    /// Handles debouncing hover sounds at a global level to ensure the effects are not overwhelming.
+    /// </summary>
+    public abstract class HoverSampleDebounceComponent : CompositeDrawable
+    {
+        /// <summary>
+        /// Length of debounce for hover sound playback, in milliseconds.
+        /// </summary>
+        public double HoverDebounceTime { get; } = 20;
+
+        private Bindable<double?> lastPlaybackTime;
+
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio, SessionStatics statics)
+        {
+            lastPlaybackTime = statics.GetBindable<double?>(Static.LastHoverSoundPlaybackTime);
+        }
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            bool enoughTimePassedSinceLastPlayback = !lastPlaybackTime.Value.HasValue || Time.Current - lastPlaybackTime.Value >= HoverDebounceTime;
+
+            if (enoughTimePassedSinceLastPlayback)
+            {
+                PlayHoverSample();
+                lastPlaybackTime.Value = Time.Current;
+            }
+
+            return false;
+        }
+
+        public abstract void PlayHoverSample();
+    }
+}
diff --git a/osu.Game/Graphics/UserInterface/HoverSounds.cs b/osu.Game/Graphics/UserInterface/HoverSounds.cs
index fa43d4543f..29238377c7 100644
--- a/osu.Game/Graphics/UserInterface/HoverSounds.cs
+++ b/osu.Game/Graphics/UserInterface/HoverSounds.cs
@@ -5,11 +5,8 @@ using System.ComponentModel;
 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;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Input.Events;
 using osu.Game.Configuration;
 using osu.Framework.Utils;
 
@@ -19,19 +16,12 @@ namespace osu.Game.Graphics.UserInterface
     /// Adds hover sounds to a drawable.
     /// Does not draw anything.
     /// </summary>
-    public class HoverSounds : CompositeDrawable
+    public class HoverSounds : HoverSampleDebounceComponent
     {
         private SampleChannel sampleHover;
 
-        /// <summary>
-        /// Length of debounce for hover sound playback, in milliseconds.
-        /// </summary>
-        public double HoverDebounceTime { get; } = 20;
-
         protected readonly HoverSampleSet SampleSet;
 
-        private Bindable<double?> lastPlaybackTime;
-
         public HoverSounds(HoverSampleSet sampleSet = HoverSampleSet.Normal)
         {
             SampleSet = sampleSet;
@@ -41,27 +31,13 @@ namespace osu.Game.Graphics.UserInterface
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, SessionStatics statics)
         {
-            lastPlaybackTime = statics.GetBindable<double?>(Static.LastHoverSoundPlaybackTime);
-
             sampleHover = audio.Samples.Get($@"UI/generic-hover{SampleSet.GetDescription()}");
         }
 
-        protected override bool OnHover(HoverEvent e)
+        public override void PlayHoverSample()
         {
-            if (sampleHover == null)
-                return false;
-
-            bool enoughTimePassedSinceLastPlayback = !lastPlaybackTime.Value.HasValue || Time.Current - lastPlaybackTime.Value >= HoverDebounceTime;
-
-            if (enoughTimePassedSinceLastPlayback)
-            {
-                sampleHover.Frequency.Value = 0.96 + RNG.NextDouble(0.08);
-                sampleHover.Play();
-
-                lastPlaybackTime.Value = Time.Current;
-            }
-
-            return false;
+            sampleHover.Frequency.Value = 0.96 + RNG.NextDouble(0.08);
+            sampleHover.Play();
         }
     }
 

From cd01591dda9ae57e66eddb0d5a80564a98f7ab20 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Feb 2021 12:14:57 +0900
Subject: [PATCH 1476/3722] Consume new debounce logic in carousel header

---
 .../Screens/Select/Carousel/CarouselHeader.cs | 69 +++++++++++--------
 1 file changed, 41 insertions(+), 28 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselHeader.cs b/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
index 4f53a6e202..90eebfc05b 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Framework.Utils;
 using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
 using osuTK;
 using osuTK.Graphics;
 
@@ -20,10 +21,6 @@ namespace osu.Game.Screens.Select.Carousel
 {
     public class CarouselHeader : Container
     {
-        private SampleChannel sampleHover;
-
-        private readonly Box hoverLayer;
-
         public Container BorderContainer;
 
         public readonly Bindable<CarouselItemState> State = new Bindable<CarouselItemState>(CarouselItemState.NotSelected);
@@ -44,23 +41,11 @@ namespace osu.Game.Screens.Select.Carousel
                 Children = new Drawable[]
                 {
                     Content,
-                    hoverLayer = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Alpha = 0,
-                        Blending = BlendingParameters.Additive,
-                    },
+                    new HoverLayer()
                 }
             };
         }
 
-        [BackgroundDependencyLoader]
-        private void load(AudioManager audio, OsuColour colours)
-        {
-            sampleHover = audio.Samples.Get("SongSelect/song-ping");
-            hoverLayer.Colour = colours.Blue.Opacity(0.1f);
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -97,22 +82,50 @@ namespace osu.Game.Screens.Select.Carousel
             }
         }
 
-        protected override bool OnHover(HoverEvent e)
+        public class HoverLayer : HoverSampleDebounceComponent
         {
-            if (sampleHover != null)
+            private SampleChannel sampleHover;
+
+            private Box box;
+
+            public HoverLayer()
             {
+                RelativeSizeAxes = Axes.Both;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(AudioManager audio, OsuColour colours)
+            {
+                InternalChild = box = new Box
+                {
+                    Colour = colours.Blue.Opacity(0.1f),
+                    Alpha = 0,
+                    Blending = BlendingParameters.Additive,
+                    RelativeSizeAxes = Axes.Both,
+                };
+
+                sampleHover = audio.Samples.Get("SongSelect/song-ping");
+            }
+
+            protected override bool OnHover(HoverEvent e)
+            {
+                box.FadeIn(100, Easing.OutQuint);
+                return base.OnHover(e);
+            }
+
+            protected override void OnHoverLost(HoverLostEvent e)
+            {
+                box.FadeOut(1000, Easing.OutQuint);
+                base.OnHoverLost(e);
+            }
+
+            public override void PlayHoverSample()
+            {
+                if (sampleHover == null) return;
+
                 sampleHover.Frequency.Value = 0.90 + RNG.NextDouble(0.2);
                 sampleHover.Play();
             }
-
-            hoverLayer.FadeIn(100, Easing.OutQuint);
-            return base.OnHover(e);
-        }
-
-        protected override void OnHoverLost(HoverLostEvent e)
-        {
-            hoverLayer.FadeOut(1000, Easing.OutQuint);
-            base.OnHoverLost(e);
         }
     }
 }

From a2035a2e84d6a187331e0c56e2ffa906be673659 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Feb 2021 12:20:39 +0900
Subject: [PATCH 1477/3722] Stop hover sounds from playing when dragging
 (scrolling)

---
 .../Graphics/UserInterface/HoverSampleDebounceComponent.cs    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Graphics/UserInterface/HoverSampleDebounceComponent.cs b/osu.Game/Graphics/UserInterface/HoverSampleDebounceComponent.cs
index f0c7c20fe8..55f43cfe46 100644
--- a/osu.Game/Graphics/UserInterface/HoverSampleDebounceComponent.cs
+++ b/osu.Game/Graphics/UserInterface/HoverSampleDebounceComponent.cs
@@ -30,6 +30,10 @@ namespace osu.Game.Graphics.UserInterface
 
         protected override bool OnHover(HoverEvent e)
         {
+            // hover sounds shouldn't be played during scroll operations.
+            if (e.HasAnyButtonPressed)
+                return false;
+
             bool enoughTimePassedSinceLastPlayback = !lastPlaybackTime.Value.HasValue || Time.Current - lastPlaybackTime.Value >= HoverDebounceTime;
 
             if (enoughTimePassedSinceLastPlayback)

From 5f23bd725941a94304481d7aa37409162426e8ae Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Feb 2021 12:48:32 +0900
Subject: [PATCH 1478/3722] Revert most of the changes to ArchiveModeManager by
 using better code

---
 osu.Game/Beatmaps/BeatmapManager.cs      |  8 ++------
 osu.Game/Database/ArchiveModelManager.cs | 26 ++++++++++++++----------
 osu.Game/Scoring/ScoreManager.cs         |  7 +++----
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 4825569ee4..f23e135c68 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -64,13 +64,9 @@ namespace osu.Game.Beatmaps
 
         protected override string[] HashableFileTypes => new[] { ".osu" };
 
-        protected override bool StableDirectoryExists(StableStorage stableStorage) => stableStorage.GetSongStorage().ExistsDirectory(".");
+        protected override string ImportFromStablePath => ".";
 
-        protected override IEnumerable<string> GetStableImportPaths(StableStorage stableStorage)
-        {
-            var songStorage = stableStorage.GetSongStorage();
-            return songStorage.GetDirectories(".").Select(path => songStorage.GetFullPath(path));
-        }
+        protected override Storage PrepareStableStorage(StableStorage stableStorage) => stableStorage.GetSongStorage();
 
         private readonly RulesetStore rulesets;
         private readonly BeatmapStore beatmaps;
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index fd94660a4b..b55020c437 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -637,16 +637,11 @@ namespace osu.Game.Database
         /// </summary>
         protected virtual string ImportFromStablePath => null;
 
-        /// <summary>
-        /// Checks for the existence of an osu-stable directory.
-        /// </summary>
-        protected virtual bool StableDirectoryExists(StableStorage stableStorage) => stableStorage.ExistsDirectory(ImportFromStablePath);
-
         /// <summary>
         /// Select paths to import from stable where all paths should be absolute. Default implementation iterates all directories in <see cref="ImportFromStablePath"/>.
         /// </summary>
-        protected virtual IEnumerable<string> GetStableImportPaths(StableStorage stableStorage) => stableStorage.GetDirectories(ImportFromStablePath)
-                                                                                                                .Select(path => stableStorage.GetFullPath(path));
+        protected virtual IEnumerable<string> GetStableImportPaths(Storage storage) => storage.GetDirectories(ImportFromStablePath)
+                                                                                              .Select(path => storage.GetFullPath(path));
 
         /// <summary>
         /// Whether this specified path should be removed after successful import.
@@ -660,24 +655,33 @@ namespace osu.Game.Database
         /// </summary>
         public Task ImportFromStableAsync()
         {
-            var stable = GetStableStorage?.Invoke();
+            var stableStorage = GetStableStorage?.Invoke();
 
-            if (stable == null)
+            if (stableStorage == null)
             {
                 Logger.Log("No osu!stable installation available!", LoggingTarget.Information, LogLevel.Error);
                 return Task.CompletedTask;
             }
 
-            if (!StableDirectoryExists(stable))
+            var storage = PrepareStableStorage(stableStorage);
+
+            if (!storage.ExistsDirectory(ImportFromStablePath))
             {
                 // This handles situations like when the user does not have a Skins folder
                 Logger.Log($"No {ImportFromStablePath} folder available in osu!stable installation", LoggingTarget.Information, LogLevel.Error);
                 return Task.CompletedTask;
             }
 
-            return Task.Run(async () => await Import(GetStableImportPaths(stable).ToArray()));
+            return Task.Run(async () => await Import(GetStableImportPaths(storage).ToArray()));
         }
 
+        /// <summary>
+        /// Run any required traversal operations on the stable storage location before performing operations.
+        /// </summary>
+        /// <param name="stableStorage">The stable storage.</param>
+        /// <returns>The usable storage. Return the unchanged <paramref name="stableStorage"/> if no traversal is required.</returns>
+        protected virtual Storage PrepareStableStorage(StableStorage stableStorage) => stableStorage;
+
         #endregion
 
         /// <summary>
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 6aa0a30a75..a6beb19876 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -16,7 +16,6 @@ using osu.Framework.Platform;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Database;
-using osu.Game.IO;
 using osu.Game.IO.Archives;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
@@ -72,9 +71,9 @@ namespace osu.Game.Scoring
             }
         }
 
-        protected override IEnumerable<string> GetStableImportPaths(StableStorage stableStorage)
-            => stableStorage.GetFiles(ImportFromStablePath).Where(p => HandledExtensions.Any(ext => Path.GetExtension(p)?.Equals(ext, StringComparison.OrdinalIgnoreCase) ?? false))
-                            .Select(path => stableStorage.GetFullPath(path));
+        protected override IEnumerable<string> GetStableImportPaths(Storage storage)
+            => storage.GetFiles(ImportFromStablePath).Where(p => HandledExtensions.Any(ext => Path.GetExtension(p)?.Equals(ext, StringComparison.OrdinalIgnoreCase) ?? false))
+                      .Select(path => storage.GetFullPath(path));
 
         public Score GetScore(ScoreInfo score) => new LegacyDatabasedScore(score, rulesets, beatmaps(), Files.Store);
 

From 8ab7d07eab83befc7332496d20250fe54bf5ddc3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Feb 2021 12:57:57 +0900
Subject: [PATCH 1479/3722] Tidy up config parsing logic

---
 osu.Game/IO/StableStorage.cs | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/osu.Game/IO/StableStorage.cs b/osu.Game/IO/StableStorage.cs
index ccc6f9c311..d4b0d300ff 100644
--- a/osu.Game/IO/StableStorage.cs
+++ b/osu.Game/IO/StableStorage.cs
@@ -23,6 +23,7 @@ namespace osu.Game.IO
             : base(path, host)
         {
             this.host = host;
+
             songsPath = new Lazy<string>(locateSongsDirectory);
         }
 
@@ -33,32 +34,29 @@ namespace osu.Game.IO
 
         private string locateSongsDirectory()
         {
-            var songsDirectoryPath = Path.Combine(BasePath, stable_default_songs_path);
-
             var configFile = GetFiles(".", $"osu!.{Environment.UserName}.cfg").SingleOrDefault();
 
-            if (configFile == null)
-                return songsDirectoryPath;
-
-            using (var stream = GetStream(configFile))
-            using (var textReader = new StreamReader(stream))
+            if (configFile != null)
             {
-                string line;
-
-                while ((line = textReader.ReadLine()) != null)
+                using (var stream = GetStream(configFile))
+                using (var textReader = new StreamReader(stream))
                 {
-                    if (line.StartsWith("BeatmapDirectory", StringComparison.OrdinalIgnoreCase))
+                    string line;
+
+                    while ((line = textReader.ReadLine()) != null)
                     {
-                        var directory = line.Split('=')[1].TrimStart();
-                        if (Path.IsPathFullyQualified(directory))
-                            songsDirectoryPath = directory;
+                        if (!line.StartsWith("BeatmapDirectory", StringComparison.OrdinalIgnoreCase)) continue;
+
+                        var customDirectory = line.Split('=').LastOrDefault()?.Trim();
+                        if (customDirectory != null && Path.IsPathFullyQualified(customDirectory))
+                            return customDirectory;
 
                         break;
                     }
                 }
             }
 
-            return songsDirectoryPath;
+            return GetFullPath(stable_default_songs_path);
         }
     }
 }

From 33c9ecac8a291657d19e4d4ba3cf7c55e15e3a5c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Feb 2021 14:54:19 +0900
Subject: [PATCH 1480/3722] Fix MessageFormatter not working for custom
 endpoints

---
 osu.Game/Online/Chat/MessageFormatter.cs | 7 ++++++-
 osu.Game/OsuGameBase.cs                  | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/Chat/MessageFormatter.cs b/osu.Game/Online/Chat/MessageFormatter.cs
index d2a117876d..8673d73be7 100644
--- a/osu.Game/Online/Chat/MessageFormatter.cs
+++ b/osu.Game/Online/Chat/MessageFormatter.cs
@@ -49,6 +49,11 @@ namespace osu.Game.Online.Chat
         // Unicode emojis
         private static readonly Regex emoji_regex = new Regex(@"(\uD83D[\uDC00-\uDE4F])");
 
+        /// <summary>
+        /// The root URL for the website, used for chat link matching.
+        /// </summary>
+        public static string WebsiteRootUrl { get; set; } = "https://osu.ppy.sh";
+
         private static void handleMatches(Regex regex, string display, string link, MessageFormatterResult result, int startIndex = 0, LinkAction? linkActionOverride = null, char[] escapeChars = null)
         {
             int captureOffset = 0;
@@ -119,7 +124,7 @@ namespace osu.Game.Online.Chat
                 case "http":
                 case "https":
                     // length > 3 since all these links need another argument to work
-                    if (args.Length > 3 && args[1] == "osu.ppy.sh")
+                    if (args.Length > 3 && url.StartsWith(WebsiteRootUrl, StringComparison.OrdinalIgnoreCase))
                     {
                         switch (args[2])
                         {
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index a1b66ba9c0..174b5006a2 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -31,6 +31,7 @@ using osu.Game.Input;
 using osu.Game.Input.Bindings;
 using osu.Game.IO;
 using osu.Game.Online;
+using osu.Game.Online.Chat;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Spectator;
 using osu.Game.Overlays;
@@ -225,6 +226,8 @@ namespace osu.Game
 
             EndpointConfiguration endpoints = UseDevelopmentServer ? (EndpointConfiguration)new DevelopmentEndpointConfiguration() : new ProductionEndpointConfiguration();
 
+            MessageFormatter.WebsiteRootUrl = endpoints.WebsiteRootUrl;
+
             dependencies.CacheAs(API ??= new APIAccess(LocalConfig, endpoints));
 
             dependencies.CacheAs(spectatorStreaming = new SpectatorStreamingClient(endpoints));

From 6a42d312f62fd1ba45b2ffda559fbcb31b075c74 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Feb 2021 14:56:46 +0900
Subject: [PATCH 1481/3722] Match using EndsWith to ignore protocol (and allow
 http)

---
 osu.Game/Online/Chat/MessageFormatter.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Chat/MessageFormatter.cs b/osu.Game/Online/Chat/MessageFormatter.cs
index 8673d73be7..d8e02e5b6d 100644
--- a/osu.Game/Online/Chat/MessageFormatter.cs
+++ b/osu.Game/Online/Chat/MessageFormatter.cs
@@ -52,7 +52,14 @@ namespace osu.Game.Online.Chat
         /// <summary>
         /// The root URL for the website, used for chat link matching.
         /// </summary>
-        public static string WebsiteRootUrl { get; set; } = "https://osu.ppy.sh";
+        public static string WebsiteRootUrl
+        {
+            set => websiteRootUrl = value
+                                    .Trim('/') // trim potential trailing slash/
+                                    .Split('/').Last(); // only keep domain name, ignoring protocol.
+        }
+
+        private static string websiteRootUrl;
 
         private static void handleMatches(Regex regex, string display, string link, MessageFormatterResult result, int startIndex = 0, LinkAction? linkActionOverride = null, char[] escapeChars = null)
         {
@@ -124,7 +131,7 @@ namespace osu.Game.Online.Chat
                 case "http":
                 case "https":
                     // length > 3 since all these links need another argument to work
-                    if (args.Length > 3 && url.StartsWith(WebsiteRootUrl, StringComparison.OrdinalIgnoreCase))
+                    if (args.Length > 3 && args[1].EndsWith(websiteRootUrl, StringComparison.OrdinalIgnoreCase))
                     {
                         switch (args[2])
                         {

From 1c5aaf3832e97a258bb764aa5dfd2f07200e4b35 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Feb 2021 15:03:53 +0900
Subject: [PATCH 1482/3722] Add back default value

---
 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 d8e02e5b6d..3c6df31462 100644
--- a/osu.Game/Online/Chat/MessageFormatter.cs
+++ b/osu.Game/Online/Chat/MessageFormatter.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Online.Chat
                                     .Split('/').Last(); // only keep domain name, ignoring protocol.
         }
 
-        private static string websiteRootUrl;
+        private static string websiteRootUrl = "osu.ppy.sh";
 
         private static void handleMatches(Regex regex, string display, string link, MessageFormatterResult result, int startIndex = 0, LinkAction? linkActionOverride = null, char[] escapeChars = null)
         {

From 955c9a2dd3e47dab3752d62f4173bbde3b5ec0d5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Feb 2021 15:17:39 +0900
Subject: [PATCH 1483/3722] Add test coverage of beatmap link resolution

---
 osu.Game.Tests/Chat/MessageFormatterTests.cs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/osu.Game.Tests/Chat/MessageFormatterTests.cs b/osu.Game.Tests/Chat/MessageFormatterTests.cs
index 600c820ce1..151e05b18d 100644
--- a/osu.Game.Tests/Chat/MessageFormatterTests.cs
+++ b/osu.Game.Tests/Chat/MessageFormatterTests.cs
@@ -21,6 +21,21 @@ namespace osu.Game.Tests.Chat
             Assert.AreEqual(36, result.Links[0].Length);
         }
 
+        [TestCase(LinkAction.OpenBeatmap, "456", "https://osu.ppy.sh/beatmapsets/123#osu/456")]
+        [TestCase(LinkAction.OpenBeatmap, "456", "https://osu.ppy.sh/beatmapsets/123#osu/456?whatever")]
+        [TestCase(LinkAction.OpenBeatmap, "456", "https://osu.ppy.sh/beatmapsets/123/456")]
+        [TestCase(LinkAction.OpenBeatmapSet, "123", "https://osu.ppy.sh/beatmapsets/123")]
+        [TestCase(LinkAction.OpenBeatmapSet, "123", "https://osu.ppy.sh/beatmapsets/123/whatever")]
+        public void TestBeatmapLinks(LinkAction expectedAction, string expectedArg, string link)
+        {
+            Message result = MessageFormatter.FormatMessage(new Message { Content = link });
+
+            Assert.AreEqual(result.Content, result.DisplayContent);
+            Assert.AreEqual(1, result.Links.Count);
+            Assert.AreEqual(expectedAction, result.Links[0].Action);
+            Assert.AreEqual(expectedArg, result.Links[0].Argument);
+        }
+
         [Test]
         public void TestMultipleComplexLinks()
         {

From bb9123eecd231cde3b1ed240e7ffe3575b005fee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Feb 2021 15:17:54 +0900
Subject: [PATCH 1484/3722] Better handle fallback scenarios for beatmap links

---
 osu.Game/Online/Chat/MessageFormatter.cs | 33 ++++++++++++++++++------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Online/Chat/MessageFormatter.cs b/osu.Game/Online/Chat/MessageFormatter.cs
index d2a117876d..5aab476b6d 100644
--- a/osu.Game/Online/Chat/MessageFormatter.cs
+++ b/osu.Game/Online/Chat/MessageFormatter.cs
@@ -121,20 +121,37 @@ namespace osu.Game.Online.Chat
                     // length > 3 since all these links need another argument to work
                     if (args.Length > 3 && args[1] == "osu.ppy.sh")
                     {
+                        var mainArg = args[3];
+
                         switch (args[2])
                         {
+                            // old site only
                             case "b":
                             case "beatmaps":
-                                return new LinkDetails(LinkAction.OpenBeatmap, args[3]);
+                            {
+                                string trimmed = mainArg.Split('?').First();
+                                if (int.TryParse(trimmed, out var id))
+                                    return new LinkDetails(LinkAction.OpenBeatmap, id.ToString());
+
+                                break;
+                            }
 
                             case "s":
                             case "beatmapsets":
                             case "d":
-                                return new LinkDetails(LinkAction.OpenBeatmapSet, args[3]);
+                            {
+                                if (args.Length > 4 && int.TryParse(args[4], out var id))
+                                    // https://osu.ppy.sh/beatmapsets/1154158#osu/2768184
+                                    return new LinkDetails(LinkAction.OpenBeatmap, id.ToString());
+
+                                // https://osu.ppy.sh/beatmapsets/1154158#whatever
+                                string trimmed = mainArg.Split('#').First();
+                                return new LinkDetails(LinkAction.OpenBeatmapSet, trimmed);
+                            }
 
                             case "u":
                             case "users":
-                                return new LinkDetails(LinkAction.OpenUserProfile, args[3]);
+                                return new LinkDetails(LinkAction.OpenUserProfile, mainArg);
                         }
                     }
 
@@ -183,10 +200,9 @@ namespace osu.Game.Online.Chat
 
                 case "osump":
                     return new LinkDetails(LinkAction.JoinMultiplayerMatch, args[1]);
-
-                default:
-                    return new LinkDetails(LinkAction.External, null);
             }
+
+            return new LinkDetails(LinkAction.External, null);
         }
 
         private static MessageFormatterResult format(string toFormat, int startIndex = 0, int space = 3)
@@ -259,8 +275,9 @@ namespace osu.Game.Online.Chat
 
     public class LinkDetails
     {
-        public LinkAction Action;
-        public string Argument;
+        public readonly LinkAction Action;
+
+        public readonly string Argument;
 
         public LinkDetails(LinkAction action, string argument)
         {

From 3799493536907954559ed707d2edf07a1bd02c26 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Feb 2021 15:25:00 +0900
Subject: [PATCH 1485/3722] Add test coverage of int match failures

---
 osu.Game.Tests/Chat/MessageFormatterTests.cs | 4 ++++
 osu.Game/Online/Chat/MessageFormatter.cs     | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Chat/MessageFormatterTests.cs b/osu.Game.Tests/Chat/MessageFormatterTests.cs
index 151e05b18d..11e94f0b89 100644
--- a/osu.Game.Tests/Chat/MessageFormatterTests.cs
+++ b/osu.Game.Tests/Chat/MessageFormatterTests.cs
@@ -24,8 +24,10 @@ namespace osu.Game.Tests.Chat
         [TestCase(LinkAction.OpenBeatmap, "456", "https://osu.ppy.sh/beatmapsets/123#osu/456")]
         [TestCase(LinkAction.OpenBeatmap, "456", "https://osu.ppy.sh/beatmapsets/123#osu/456?whatever")]
         [TestCase(LinkAction.OpenBeatmap, "456", "https://osu.ppy.sh/beatmapsets/123/456")]
+        [TestCase(LinkAction.External, null, "https://osu.ppy.sh/beatmapsets/abc/def")]
         [TestCase(LinkAction.OpenBeatmapSet, "123", "https://osu.ppy.sh/beatmapsets/123")]
         [TestCase(LinkAction.OpenBeatmapSet, "123", "https://osu.ppy.sh/beatmapsets/123/whatever")]
+        [TestCase(LinkAction.External, null, "https://osu.ppy.sh/beatmapsets/abc")]
         public void TestBeatmapLinks(LinkAction expectedAction, string expectedArg, string link)
         {
             Message result = MessageFormatter.FormatMessage(new Message { Content = link });
@@ -34,6 +36,8 @@ namespace osu.Game.Tests.Chat
             Assert.AreEqual(1, result.Links.Count);
             Assert.AreEqual(expectedAction, result.Links[0].Action);
             Assert.AreEqual(expectedArg, result.Links[0].Argument);
+            if (expectedAction == LinkAction.External)
+                Assert.AreEqual(link, result.Links[0].Url);
         }
 
         [Test]
diff --git a/osu.Game/Online/Chat/MessageFormatter.cs b/osu.Game/Online/Chat/MessageFormatter.cs
index 5aab476b6d..8e92078c2c 100644
--- a/osu.Game/Online/Chat/MessageFormatter.cs
+++ b/osu.Game/Online/Chat/MessageFormatter.cs
@@ -146,7 +146,10 @@ namespace osu.Game.Online.Chat
 
                                 // https://osu.ppy.sh/beatmapsets/1154158#whatever
                                 string trimmed = mainArg.Split('#').First();
-                                return new LinkDetails(LinkAction.OpenBeatmapSet, trimmed);
+                                if (int.TryParse(trimmed, out id))
+                                    return new LinkDetails(LinkAction.OpenBeatmapSet, id.ToString());
+
+                                break;
                             }
 
                             case "u":

From a1be3c8bfdf71df5b0b0476b379d36a427ee0ee4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 12 Feb 2021 15:27:37 +0900
Subject: [PATCH 1486/3722] Fix header background being invisible in
 multiplayer/playlists

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

diff --git a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
index eb05cbaf85..3206f7b3ab 100644
--- a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
+++ b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
@@ -34,8 +34,8 @@ namespace osu.Game.Beatmaps.Drawables
         /// </summary>
         protected virtual double UnloadDelay => 10000;
 
-        protected override DelayedLoadWrapper CreateDelayedLoadWrapper(Func<Drawable> createContentFunc, double timeBeforeLoad)
-            => new DelayedLoadUnloadWrapper(createContentFunc, timeBeforeLoad, UnloadDelay);
+        protected override DelayedLoadWrapper CreateDelayedLoadWrapper(Func<Drawable> createContentFunc, double timeBeforeLoad) =>
+            new DelayedLoadUnloadWrapper(createContentFunc, timeBeforeLoad, UnloadDelay) { RelativeSizeAxes = Axes.Both };
 
         protected override double TransformDuration => 400;
 

From f7374703f00ee87f8865a51c5ef2fa5c3befad79 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Feb 2021 15:29:21 +0900
Subject: [PATCH 1487/3722] Update tests to match dev domain

---
 .../Visual/Online/TestSceneChatLink.cs        | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
index 9e69530a77..74f53ebdca 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
@@ -103,26 +103,26 @@ namespace osu.Game.Tests.Visual.Online
         private void testLinksGeneral()
         {
             addMessageWithChecks("test!");
-            addMessageWithChecks("osu.ppy.sh!");
-            addMessageWithChecks("https://osu.ppy.sh!", 1, expectedActions: LinkAction.External);
+            addMessageWithChecks("dev.ppy.sh!");
+            addMessageWithChecks("https://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.External);
-            addMessageWithChecks("(osu forums)[https://osu.ppy.sh/forum] (old link format)", 1, expectedActions: LinkAction.External);
-            addMessageWithChecks("[https://osu.ppy.sh/home New site] (new link format)", 1, expectedActions: LinkAction.External);
-            addMessageWithChecks("[osu forums](https://osu.ppy.sh/forum) (new link format 2)", 1, expectedActions: LinkAction.External);
-            addMessageWithChecks("[https://osu.ppy.sh/home This is only a link to the new osu webpage but this is supposed to test word wrap.]", 1, expectedActions: LinkAction.External);
-            addMessageWithChecks("is now listening to [https://osu.ppy.sh/s/93523 IMAGE -MATERIAL- <Version 0>]", 1, true, expectedActions: LinkAction.OpenBeatmapSet);
-            addMessageWithChecks("is now playing [https://osu.ppy.sh/b/252238 IMAGE -MATERIAL- <Version 0>]", 1, true, expectedActions: LinkAction.OpenBeatmap);
-            addMessageWithChecks("Let's (try)[https://osu.ppy.sh/home] [https://osu.ppy.sh/b/252238 multiple links] https://osu.ppy.sh/home", 3,
+            addMessageWithChecks("(osu forums)[https://dev.ppy.sh/forum] (old link format)", 1, expectedActions: LinkAction.External);
+            addMessageWithChecks("[https://dev.ppy.sh/home New site] (new link format)", 1, expectedActions: LinkAction.External);
+            addMessageWithChecks("[osu forums](https://dev.ppy.sh/forum) (new link format 2)", 1, expectedActions: LinkAction.External);
+            addMessageWithChecks("[https://dev.ppy.sh/home This is only a link to the new osu webpage but this is supposed to test word wrap.]", 1, expectedActions: LinkAction.External);
+            addMessageWithChecks("is now listening to [https://dev.ppy.sh/s/93523 IMAGE -MATERIAL- <Version 0>]", 1, true, expectedActions: LinkAction.OpenBeatmapSet);
+            addMessageWithChecks("is now playing [https://dev.ppy.sh/b/252238 IMAGE -MATERIAL- <Version 0>]", 1, true, expectedActions: LinkAction.OpenBeatmap);
+            addMessageWithChecks("Let's (try)[https://dev.ppy.sh/home] [https://dev.ppy.sh/b/252238 multiple links] https://dev.ppy.sh/home", 3,
                 expectedActions: new[] { LinkAction.External, LinkAction.OpenBeatmap, LinkAction.External });
-            addMessageWithChecks("[https://osu.ppy.sh/home New link format with escaped [and \\[ paired] braces]", 1, expectedActions: LinkAction.External);
-            addMessageWithChecks("[Markdown link format with escaped [and \\[ paired] braces](https://osu.ppy.sh/home)", 1, expectedActions: LinkAction.External);
-            addMessageWithChecks("(Old link format with escaped (and \\( paired) parentheses)[https://osu.ppy.sh/home] and [[also a rogue wiki link]]", 2, expectedActions: new[] { LinkAction.External, LinkAction.External });
+            addMessageWithChecks("[https://dev.ppy.sh/home New link format with escaped [and \\[ paired] braces]", 1, expectedActions: LinkAction.External);
+            addMessageWithChecks("[Markdown link format with escaped [and \\[ paired] braces](https://dev.ppy.sh/home)", 1, expectedActions: LinkAction.External);
+            addMessageWithChecks("(Old link format with escaped (and \\( paired) parentheses)[https://dev.ppy.sh/home] and [[also a rogue wiki link]]", 2, expectedActions: new[] { LinkAction.External, LinkAction.External });
             // note that there's 0 links here (they get removed if a channel is not found)
             addMessageWithChecks("#lobby or #osu would be blue (and work) in the ChatDisplay test (when a proper ChatOverlay is present).");
             addMessageWithChecks("I am important!", 0, false, true);
             addMessageWithChecks("feels important", 0, true, true);
-            addMessageWithChecks("likes to post this [https://osu.ppy.sh/home link].", 1, true, true, expectedActions: LinkAction.External);
+            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 game](osump://12346).", 1, expectedActions: LinkAction.JoinMultiplayerMatch);
             addMessageWithChecks("Join my [#english](osu://chan/#english).", 1, expectedActions: LinkAction.OpenChannel);
@@ -136,9 +136,9 @@ namespace osu.Game.Tests.Visual.Online
             int echoCounter = 0;
 
             addEchoWithWait("sent!", "received!");
-            addEchoWithWait("https://osu.ppy.sh/home", null, 500);
-            addEchoWithWait("[https://osu.ppy.sh/forum let's try multiple words too!]");
-            addEchoWithWait("(long loading times! clickable while loading?)[https://osu.ppy.sh/home]", null, 5000);
+            addEchoWithWait("https://dev.ppy.sh/home", null, 500);
+            addEchoWithWait("[https://dev.ppy.sh/forum let's try multiple words too!]");
+            addEchoWithWait("(long loading times! clickable while loading?)[https://dev.ppy.sh/home]", null, 5000);
 
             void addEchoWithWait(string text, string completeText = null, double delay = 250)
             {

From a0733769206b58026ec0b044da3e2820b71a0c76 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Feb 2021 15:18:16 +0900
Subject: [PATCH 1488/3722] Show URLs in tooltips when custom text has replaced
 the link

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

diff --git a/osu.Game/Graphics/Containers/LinkFlowContainer.cs b/osu.Game/Graphics/Containers/LinkFlowContainer.cs
index e3a9a5fe9d..914c8ff78d 100644
--- a/osu.Game/Graphics/Containers/LinkFlowContainer.cs
+++ b/osu.Game/Graphics/Containers/LinkFlowContainer.cs
@@ -38,7 +38,12 @@ namespace osu.Game.Graphics.Containers
             foreach (var link in links)
             {
                 AddText(text[previousLinkEnd..link.Index]);
-                AddLink(text.Substring(link.Index, link.Length), link.Action, link.Argument ?? link.Url);
+
+                string displayText = text.Substring(link.Index, link.Length);
+                string linkArgument = link.Argument ?? link.Url;
+                string tooltip = displayText == link.Url ? null : link.Url;
+
+                AddLink(displayText, link.Action, linkArgument, tooltip);
                 previousLinkEnd = link.Index + link.Length;
             }
 
@@ -52,7 +57,7 @@ namespace osu.Game.Graphics.Containers
             => createLink(AddText(text, creationParameters), new LinkDetails(LinkAction.Custom, null), tooltipText, action);
 
         public void AddLink(string text, LinkAction action, string argument, string tooltipText = null, Action<SpriteText> creationParameters = null)
-            => createLink(AddText(text, creationParameters), new LinkDetails(action, argument), null);
+            => createLink(AddText(text, creationParameters), new LinkDetails(action, argument), tooltipText);
 
         public void AddLink(IEnumerable<SpriteText> text, LinkAction action = LinkAction.External, string linkArgument = null, string tooltipText = null)
         {

From 4ab16694d1ca145d2af3f6aa758504e9dba0a511 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Feb 2021 16:22:19 +0900
Subject: [PATCH 1489/3722] Fix classic "welcome" intro not looping as expected

---
 osu.Game/Screens/Menu/IntroWelcome.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/Menu/IntroWelcome.cs b/osu.Game/Screens/Menu/IntroWelcome.cs
index abb83f894a..d454d85d9e 100644
--- a/osu.Game/Screens/Menu/IntroWelcome.cs
+++ b/osu.Game/Screens/Menu/IntroWelcome.cs
@@ -67,6 +67,10 @@ namespace osu.Game.Screens.Menu
                     {
                         StartTrack();
 
+                        // this classic intro loops forever.
+                        if (UsingThemedIntro)
+                            Track.Looping = true;
+
                         const float fade_in_time = 200;
 
                         logo.ScaleTo(1);

From 725db5683731e9b193fb9d309910c88e8e6ba398 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Feb 2021 16:55:34 +0900
Subject: [PATCH 1490/3722] Add loading spinner while tournament bracket is
 loading / retrieving data

---
 .../TournamentTestBrowser.cs                  |  2 +
 .../TournamentTestScene.cs                    |  2 +
 osu.Game.Tournament/TournamentGame.cs         | 43 +++++++++++++------
 osu.Game.Tournament/TournamentGameBase.cs     | 22 ++++++----
 4 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Tournament.Tests/TournamentTestBrowser.cs b/osu.Game.Tournament.Tests/TournamentTestBrowser.cs
index f7ad757926..2f50ae4141 100644
--- a/osu.Game.Tournament.Tests/TournamentTestBrowser.cs
+++ b/osu.Game.Tournament.Tests/TournamentTestBrowser.cs
@@ -13,6 +13,8 @@ namespace osu.Game.Tournament.Tests
         {
             base.LoadComplete();
 
+            BracketLoadTask.Wait();
+
             LoadComponentAsync(new Background("Menu/menu-background-0")
             {
                 Colour = OsuColour.Gray(0.5f),
diff --git a/osu.Game.Tournament.Tests/TournamentTestScene.cs b/osu.Game.Tournament.Tests/TournamentTestScene.cs
index d22da25f9d..62882d7188 100644
--- a/osu.Game.Tournament.Tests/TournamentTestScene.cs
+++ b/osu.Game.Tournament.Tests/TournamentTestScene.cs
@@ -154,6 +154,8 @@ namespace osu.Game.Tournament.Tests
 
             protected override void LoadAsyncComplete()
             {
+                BracketLoadTask.Wait();
+
                 // this has to be run here rather than LoadComplete because
                 // TestScene.cs is checking the IsLoaded state (on another thread) and expects
                 // the runner to be loaded at that point.
diff --git a/osu.Game.Tournament/TournamentGame.cs b/osu.Game.Tournament/TournamentGame.cs
index bbe4a53d8f..fadb821bef 100644
--- a/osu.Game.Tournament/TournamentGame.cs
+++ b/osu.Game.Tournament/TournamentGame.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics.Colour;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Tournament.Models;
 using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
 using osuTK;
 using osuTK.Graphics;
 
@@ -32,25 +33,24 @@ namespace osu.Game.Tournament
         private Drawable heightWarning;
         private Bindable<Size> windowSize;
         private Bindable<WindowMode> windowMode;
+        private LoadingSpinner loadingSpinner;
 
         [BackgroundDependencyLoader]
         private void load(FrameworkConfigManager frameworkConfig)
         {
             windowSize = frameworkConfig.GetBindable<Size>(FrameworkSetting.WindowedSize);
-            windowSize.BindValueChanged(size => ScheduleAfterChildren(() =>
-            {
-                var minWidth = (int)(size.NewValue.Height / 768f * TournamentSceneManager.REQUIRED_WIDTH) - 1;
-
-                heightWarning.Alpha = size.NewValue.Width < minWidth ? 1 : 0;
-            }), true);
-
             windowMode = frameworkConfig.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
-            windowMode.BindValueChanged(mode => ScheduleAfterChildren(() =>
-            {
-                windowMode.Value = WindowMode.Windowed;
-            }), true);
 
-            AddRange(new[]
+            Add(loadingSpinner = new LoadingSpinner(true, true)
+            {
+                Anchor = Anchor.BottomRight,
+                Origin = Anchor.BottomRight,
+                Margin = new MarginPadding(40),
+            });
+
+            loadingSpinner.Show();
+
+            BracketLoadTask.ContinueWith(_ => LoadComponentsAsync(new[]
             {
                 new Container
                 {
@@ -93,7 +93,24 @@ namespace osu.Game.Tournament
                     RelativeSizeAxes = Axes.Both,
                     Child = new TournamentSceneManager()
                 }
-            });
+            }, drawables =>
+            {
+                loadingSpinner.Hide();
+                loadingSpinner.Expire();
+
+                AddRange(drawables);
+
+                windowSize.BindValueChanged(size => ScheduleAfterChildren(() =>
+                {
+                    var minWidth = (int)(size.NewValue.Height / 768f * TournamentSceneManager.REQUIRED_WIDTH) - 1;
+                    heightWarning.Alpha = size.NewValue.Width < minWidth ? 1 : 0;
+                }), true);
+
+                windowMode.BindValueChanged(mode => ScheduleAfterChildren(() =>
+                {
+                    windowMode.Value = WindowMode.Windowed;
+                }), true);
+            }));
         }
     }
 }
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 97c950261b..4dd072cf17 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -4,6 +4,8 @@
 using System;
 using System.IO;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using Newtonsoft.Json;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Textures;
@@ -29,6 +31,8 @@ namespace osu.Game.Tournament
         private DependencyContainer dependencies;
         private FileBasedIPC ipc;
 
+        protected Task BracketLoadTask { get; private set; }
+
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
         {
             return dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
@@ -46,14 +50,9 @@ namespace osu.Game.Tournament
 
             Textures.AddStore(new TextureLoaderStore(new StorageBackedResourceStore(storage)));
 
-            readBracket();
-
-            ladder.CurrentMatch.Value = ladder.Matches.FirstOrDefault(p => p.Current.Value);
+            BracketLoadTask = Task.Run(readBracket);
 
             dependencies.CacheAs(new StableInfo(storage));
-
-            dependencies.CacheAs<MatchIPCInfo>(ipc = new FileBasedIPC());
-            Add(ipc);
         }
 
         private void readBracket()
@@ -70,8 +69,6 @@ namespace osu.Game.Tournament
 
             Ruleset.BindTo(ladder.Ruleset);
 
-            dependencies.Cache(ladder);
-
             bool addedInfo = false;
 
             // assign teams
@@ -127,6 +124,15 @@ namespace osu.Game.Tournament
 
             if (addedInfo)
                 SaveChanges();
+
+            ladder.CurrentMatch.Value = ladder.Matches.FirstOrDefault(p => p.Current.Value);
+
+            Schedule(() =>
+            {
+                dependencies.Cache(ladder);
+                dependencies.CacheAs<MatchIPCInfo>(ipc = new FileBasedIPC());
+                Add(ipc);
+            });
         }
 
         /// <summary>

From 0c3aef8645f234acdc8a4ceb4646af176ea8963b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 12 Feb 2021 17:42:02 +0900
Subject: [PATCH 1491/3722] Fix potential race in looping sample

As mentioned via GitHub comments. Very unlikely for this to happen unless: the sample takes a short amount of time to load, is very short itself, and the update thread stalls until the sample fully completes.
---
 osu.Game/Skinning/PoolableSkinnableSample.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/PoolableSkinnableSample.cs b/osu.Game/Skinning/PoolableSkinnableSample.cs
index cff793e8d4..45880a8e1e 100644
--- a/osu.Game/Skinning/PoolableSkinnableSample.cs
+++ b/osu.Game/Skinning/PoolableSkinnableSample.cs
@@ -115,8 +115,7 @@ namespace osu.Game.Skinning
             if (Sample == null)
                 return;
 
-            activeChannel = Sample.Play();
-            activeChannel.Looping = Looping;
+            activeChannel = Sample.Play(Looping);
 
             Played = true;
         }

From 9b5995f2f1f6710e3d26357e806f00168d559d01 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 12 Feb 2021 19:05:17 +0900
Subject: [PATCH 1492/3722] Update with removal of looping parameter

---
 osu.Game/Skinning/PoolableSkinnableSample.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/PoolableSkinnableSample.cs b/osu.Game/Skinning/PoolableSkinnableSample.cs
index 45880a8e1e..9025fdbd0f 100644
--- a/osu.Game/Skinning/PoolableSkinnableSample.cs
+++ b/osu.Game/Skinning/PoolableSkinnableSample.cs
@@ -115,7 +115,9 @@ namespace osu.Game.Skinning
             if (Sample == null)
                 return;
 
-            activeChannel = Sample.Play(Looping);
+            activeChannel = Sample.GetChannel();
+            activeChannel.Looping = Looping;
+            activeChannel.Play();
 
             Played = true;
         }

From 37a21cb192760c5f68a7842140d59d9421d681ef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Feb 2021 21:30:02 +0900
Subject: [PATCH 1493/3722] Set static locally in test to ensure tests always
 run correctly

---
 osu.Game.Tests/Chat/MessageFormatterTests.cs | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Chat/MessageFormatterTests.cs b/osu.Game.Tests/Chat/MessageFormatterTests.cs
index 11e94f0b89..b80da928c8 100644
--- a/osu.Game.Tests/Chat/MessageFormatterTests.cs
+++ b/osu.Game.Tests/Chat/MessageFormatterTests.cs
@@ -21,15 +21,17 @@ namespace osu.Game.Tests.Chat
             Assert.AreEqual(36, result.Links[0].Length);
         }
 
-        [TestCase(LinkAction.OpenBeatmap, "456", "https://osu.ppy.sh/beatmapsets/123#osu/456")]
-        [TestCase(LinkAction.OpenBeatmap, "456", "https://osu.ppy.sh/beatmapsets/123#osu/456?whatever")]
-        [TestCase(LinkAction.OpenBeatmap, "456", "https://osu.ppy.sh/beatmapsets/123/456")]
-        [TestCase(LinkAction.External, null, "https://osu.ppy.sh/beatmapsets/abc/def")]
-        [TestCase(LinkAction.OpenBeatmapSet, "123", "https://osu.ppy.sh/beatmapsets/123")]
-        [TestCase(LinkAction.OpenBeatmapSet, "123", "https://osu.ppy.sh/beatmapsets/123/whatever")]
-        [TestCase(LinkAction.External, null, "https://osu.ppy.sh/beatmapsets/abc")]
+        [TestCase(LinkAction.OpenBeatmap, "456", "https://dev.ppy.sh/beatmapsets/123#osu/456")]
+        [TestCase(LinkAction.OpenBeatmap, "456", "https://dev.ppy.sh/beatmapsets/123#osu/456?whatever")]
+        [TestCase(LinkAction.OpenBeatmap, "456", "https://dev.ppy.sh/beatmapsets/123/456")]
+        [TestCase(LinkAction.External, null, "https://dev.ppy.sh/beatmapsets/abc/def")]
+        [TestCase(LinkAction.OpenBeatmapSet, "123", "https://dev.ppy.sh/beatmapsets/123")]
+        [TestCase(LinkAction.OpenBeatmapSet, "123", "https://dev.ppy.sh/beatmapsets/123/whatever")]
+        [TestCase(LinkAction.External, null, "https://dev.ppy.sh/beatmapsets/abc")]
         public void TestBeatmapLinks(LinkAction expectedAction, string expectedArg, string link)
         {
+            MessageFormatter.WebsiteRootUrl = "dev.ppy.sh";
+
             Message result = MessageFormatter.FormatMessage(new Message { Content = link });
 
             Assert.AreEqual(result.Content, result.DisplayContent);

From 7d057ab6ce9d81a6afe6fe79884d7705a40491dd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Feb 2021 22:38:55 +0900
Subject: [PATCH 1494/3722] Fix two threading issues

---
 osu.Game.Tournament/TournamentGameBase.cs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 4dd072cf17..4224da4bbe 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -4,7 +4,6 @@
 using System;
 using System.IO;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using osu.Framework.Allocation;
@@ -31,7 +30,9 @@ namespace osu.Game.Tournament
         private DependencyContainer dependencies;
         private FileBasedIPC ipc;
 
-        protected Task BracketLoadTask { get; private set; }
+        protected Task BracketLoadTask => taskCompletionSource.Task;
+
+        private readonly TaskCompletionSource<bool> taskCompletionSource = new TaskCompletionSource<bool>();
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
         {
@@ -50,9 +51,9 @@ namespace osu.Game.Tournament
 
             Textures.AddStore(new TextureLoaderStore(new StorageBackedResourceStore(storage)));
 
-            BracketLoadTask = Task.Run(readBracket);
-
             dependencies.CacheAs(new StableInfo(storage));
+
+            Task.Run(readBracket);
         }
 
         private void readBracket()
@@ -67,8 +68,6 @@ namespace osu.Game.Tournament
             ladder ??= new LadderInfo();
             ladder.Ruleset.Value ??= RulesetStore.AvailableRulesets.First();
 
-            Ruleset.BindTo(ladder.Ruleset);
-
             bool addedInfo = false;
 
             // assign teams
@@ -129,9 +128,13 @@ namespace osu.Game.Tournament
 
             Schedule(() =>
             {
+                Ruleset.BindTo(ladder.Ruleset);
+
                 dependencies.Cache(ladder);
                 dependencies.CacheAs<MatchIPCInfo>(ipc = new FileBasedIPC());
                 Add(ipc);
+
+                taskCompletionSource.SetResult(true);
             });
         }
 

From 13aaf766f93eadf358ea9d6b0d0bac2e71358a46 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 13 Feb 2021 01:10:39 +0900
Subject: [PATCH 1495/3722] Fix regression in tournament test startup behaviour

---
 .../TournamentTestBrowser.cs                  | 19 ++++++++++---------
 .../TournamentTestScene.cs                    | 13 +++++++------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tournament.Tests/TournamentTestBrowser.cs b/osu.Game.Tournament.Tests/TournamentTestBrowser.cs
index 2f50ae4141..50bdcd86c5 100644
--- a/osu.Game.Tournament.Tests/TournamentTestBrowser.cs
+++ b/osu.Game.Tournament.Tests/TournamentTestBrowser.cs
@@ -13,17 +13,18 @@ namespace osu.Game.Tournament.Tests
         {
             base.LoadComplete();
 
-            BracketLoadTask.Wait();
-
-            LoadComponentAsync(new Background("Menu/menu-background-0")
+            BracketLoadTask.ContinueWith(_ => Schedule(() =>
             {
-                Colour = OsuColour.Gray(0.5f),
-                Depth = 10
-            }, AddInternal);
+                LoadComponentAsync(new Background("Menu/menu-background-0")
+                {
+                    Colour = OsuColour.Gray(0.5f),
+                    Depth = 10
+                }, AddInternal);
 
-            // 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());
+                // 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.Tournament.Tests/TournamentTestScene.cs b/osu.Game.Tournament.Tests/TournamentTestScene.cs
index 62882d7188..025abfcbc6 100644
--- a/osu.Game.Tournament.Tests/TournamentTestScene.cs
+++ b/osu.Game.Tournament.Tests/TournamentTestScene.cs
@@ -154,12 +154,13 @@ namespace osu.Game.Tournament.Tests
 
             protected override void LoadAsyncComplete()
             {
-                BracketLoadTask.Wait();
-
-                // this has to be run here rather than LoadComplete because
-                // TestScene.cs is checking the IsLoaded state (on another thread) and expects
-                // the runner to be loaded at that point.
-                Add(runner = new TestSceneTestRunner.TestRunner());
+                BracketLoadTask.ContinueWith(_ => Schedule(() =>
+                {
+                    // this has to be run here rather than LoadComplete because
+                    // TestScene.cs is checking the IsLoaded state (on another thread) and expects
+                    // the runner to be loaded at that point.
+                    Add(runner = new TestSceneTestRunner.TestRunner());
+                }));
             }
 
             public void RunTestBlocking(TestScene test) => runner.RunTestBlocking(test);

From 52975c51854c665495a8384d5356829e90062bfc Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Fri, 12 Feb 2021 10:23:33 -0800
Subject: [PATCH 1496/3722] Remove hardcoded padding from main content

---
 .../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 b7adb71e2f..56882e0d38 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -77,7 +77,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                                 RelativeSizeAxes = Axes.Both,
                                 Padding = new MarginPadding
                                 {
-                                    Horizontal = 105,
+                                    Horizontal = HORIZONTAL_OVERFLOW_PADDING + 55,
                                     Vertical = 20
                                 },
                                 Child = new GridContainer

From b28a906197eee66455c1201db6e3288afca2f571 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Fri, 12 Feb 2021 10:29:29 -0800
Subject: [PATCH 1497/3722] Fix extra mod settings overflowing from screen

---
 .../Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 56882e0d38..c5130baa94 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -237,6 +237,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                     Origin = Anchor.BottomLeft,
                     RelativeSizeAxes = Axes.Both,
                     Height = 0.5f,
+                    Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING },
                     Child = userModsSelectOverlay = new UserModSelectOverlay
                     {
                         SelectedMods = { BindTarget = UserMods },

From 982d8e35edc3efb9a05111b37596c94c44e182e8 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Fri, 12 Feb 2021 10:42:48 -0800
Subject: [PATCH 1498/3722] Fix mod settings showing scrollbar when screen is
 offset

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

diff --git a/osu.Game/Overlays/Mods/ModSettingsContainer.cs b/osu.Game/Overlays/Mods/ModSettingsContainer.cs
index 1c57ff54ad..64d65cab3b 100644
--- a/osu.Game/Overlays/Mods/ModSettingsContainer.cs
+++ b/osu.Game/Overlays/Mods/ModSettingsContainer.cs
@@ -52,6 +52,7 @@ namespace osu.Game.Overlays.Mods
                     new OsuScrollContainer
                     {
                         RelativeSizeAxes = Axes.Both,
+                        ScrollbarVisible = false,
                         Child = modSettingsContent = new FillFlowContainer<ModControlSection>
                         {
                             Anchor = Anchor.TopCentre,

From a4dc54423531c77a0fb34023f8a634a9faaf108d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Feb 2021 14:23:59 +0900
Subject: [PATCH 1499/3722] Refactor some shared code in TestScenePause

---
 .../Visual/Gameplay/TestScenePause.cs         | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index ae806883b0..1a0b594bb7 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -56,9 +56,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             pauseAndConfirm();
             resume();
 
-            confirmClockRunning(false);
-            confirmPauseOverlayShown(false);
-
+            confirmPausedWithNoOverlay();
             AddStep("click to resume", () => InputManager.Click(MouseButton.Left));
 
             confirmClockRunning(true);
@@ -73,9 +71,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             pauseAndConfirm();
 
             resume();
-            confirmClockRunning(false);
-            confirmPauseOverlayShown(false);
-
+            confirmPausedWithNoOverlay();
             pauseAndConfirm();
 
             AddUntilStep("resume overlay is not active", () => Player.DrawableRuleset.ResumeOverlay.State.Value == Visibility.Hidden);
@@ -94,7 +90,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         [Test]
-        public void TestPauseTooSoon()
+        public void TestPauseDuringCooldownTooSoon()
         {
             AddStep("move cursor outside", () => InputManager.MoveMouseTo(Player.ScreenSpaceDrawQuad.TopLeft - new Vector2(10)));
 
@@ -103,8 +99,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             resume();
             pause();
 
-            confirmClockRunning(true);
-            confirmPauseOverlayShown(false);
+            confirmResumed();
+            AddAssert("not exited", () => Player.IsCurrentScreen());
         }
 
         [Test]
@@ -117,9 +113,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep("exit quick", () => Player.Exit());
 
-            confirmClockRunning(true);
-            confirmPauseOverlayShown(false);
-
+            confirmResumed();
             AddAssert("exited", () => !Player.IsCurrentScreen());
         }
 
@@ -133,9 +127,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             pause();
 
-            confirmClockRunning(false);
-            confirmPauseOverlayShown(false);
-
+            confirmPausedWithNoOverlay();
             AddAssert("fail overlay still shown", () => Player.FailOverlayVisible);
 
             exitAndConfirm();
@@ -277,6 +269,12 @@ namespace osu.Game.Tests.Visual.Gameplay
             confirmPauseOverlayShown(false);
         }
 
+        private void confirmPausedWithNoOverlay()
+        {
+            confirmClockRunning(false);
+            confirmPauseOverlayShown(false);
+        }
+
         private void confirmExited()
         {
             AddUntilStep("player exited", () => !Player.IsCurrentScreen());

From 2b69c7b32530c4ab9ab712610b94664a2a9b9d43 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Feb 2021 14:00:30 +0900
Subject: [PATCH 1500/3722] Fix incorrect order of operation in pause blocking
 logic

---
 osu.Game/Screens/Play/Player.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index dda52f4dae..c462786916 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -503,14 +503,17 @@ namespace osu.Game.Screens.Play
                     return;
                 }
 
-                if (canPause && !GameplayClockContainer.IsPaused.Value)
+                if (!GameplayClockContainer.IsPaused.Value)
                 {
-                    if (pauseCooldownActive && !GameplayClockContainer.IsPaused.Value)
-                        // still want to block if we are within the cooldown period and not already paused.
+                    // if we are within the cooldown period and not already paused, the operation should block completely.
+                    if (pauseCooldownActive)
                         return;
 
-                    Pause();
-                    return;
+                    if (canPause)
+                    {
+                        Pause();
+                        return;
+                    }
                 }
             }
 

From 25f5120fdf51be4ca58c208f55198cdcbcf41d0d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Feb 2021 14:36:14 +0900
Subject: [PATCH 1501/3722] Add failing test coverage of user pausing or quick
 exiting during cooldown

---
 .../Visual/Gameplay/TestScenePause.cs         | 42 ++++++++++++++++---
 1 file changed, 37 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index 1a0b594bb7..8246e2c028 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -90,19 +90,47 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         [Test]
-        public void TestPauseDuringCooldownTooSoon()
+        public void TestExternalPauseDuringCooldownTooSoon()
         {
             AddStep("move cursor outside", () => InputManager.MoveMouseTo(Player.ScreenSpaceDrawQuad.TopLeft - new Vector2(10)));
 
             pauseAndConfirm();
 
             resume();
-            pause();
+            pauseExternally();
 
             confirmResumed();
             AddAssert("not exited", () => Player.IsCurrentScreen());
         }
 
+        [Test]
+        public void TestUserPauseDuringCooldownTooSoon()
+        {
+            AddStep("move cursor outside", () => InputManager.MoveMouseTo(Player.ScreenSpaceDrawQuad.TopLeft - new Vector2(10)));
+
+            pauseAndConfirm();
+
+            resume();
+            AddStep("pause via exit key", () => Player.ExitViaPause());
+
+            confirmResumed();
+            AddAssert("not exited", () => Player.IsCurrentScreen());
+        }
+
+        [Test]
+        public void TestQuickExitDuringCooldownTooSoon()
+        {
+            AddStep("move cursor outside", () => InputManager.MoveMouseTo(Player.ScreenSpaceDrawQuad.TopLeft - new Vector2(10)));
+
+            pauseAndConfirm();
+
+            resume();
+            AddStep("pause via exit key", () => Player.ExitViaQuickExit());
+
+            confirmResumed();
+            AddAssert("exited", () => !Player.IsCurrentScreen());
+        }
+
         [Test]
         public void TestExitSoonAfterResumeSucceeds()
         {
@@ -125,7 +153,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             confirmClockRunning(false);
 
-            pause();
+            pauseExternally();
 
             confirmPausedWithNoOverlay();
             AddAssert("fail overlay still shown", () => Player.FailOverlayVisible);
@@ -237,7 +265,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void pauseAndConfirm()
         {
-            pause();
+            pauseExternally();
             confirmPaused();
         }
 
@@ -286,7 +314,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         private void restart() => AddStep("restart", () => Player.Restart());
-        private void pause() => AddStep("pause", () => Player.Pause());
+        private void pauseExternally() => AddStep("pause", () => Player.Pause());
         private void resume() => AddStep("resume", () => Player.Resume());
 
         private void confirmPauseOverlayShown(bool isShown) =>
@@ -305,6 +333,10 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public bool PauseOverlayVisible => PauseOverlay.State.Value == Visibility.Visible;
 
+            public void ExitViaPause() => PerformExit(true);
+
+            public void ExitViaQuickExit() => PerformExit(false);
+
             public override void OnEntering(IScreen last)
             {
                 base.OnEntering(last);

From ec37e1602d566920601a1c197757991099b2447f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Feb 2021 15:02:58 +0900
Subject: [PATCH 1502/3722] Add failing test coverage of retrying from the
 results screen

---
 .../Visual/Navigation/OsuGameTestScene.cs     |  3 +++
 .../Navigation/TestSceneScreenNavigation.cs   | 26 +++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
index c5038068ec..96393cc4c3 100644
--- a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
+++ b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
@@ -17,6 +17,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 using osu.Game.Screens;
 using osu.Game.Screens.Menu;
@@ -115,6 +116,8 @@ namespace osu.Game.Tests.Visual.Navigation
 
             public new Bindable<RulesetInfo> Ruleset => base.Ruleset;
 
+            public new Bindable<IReadOnlyList<Mod>> SelectedMods => base.SelectedMods;
+
             // if we don't do this, when running under nUnit the version that gets populated is that of nUnit.
             public override string Version => "test game";
 
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index 8480e6eaaa..d8380b2dd3 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -11,7 +11,9 @@ using osu.Game.Beatmaps;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
 using osu.Game.Overlays.Toolbar;
+using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Screens.Play;
+using osu.Game.Screens.Ranking;
 using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Options;
 using osu.Game.Tests.Beatmaps.IO;
@@ -41,6 +43,30 @@ namespace osu.Game.Tests.Visual.Navigation
             exitViaEscapeAndConfirm();
         }
 
+        [Test]
+        public void TestRetryFromResults()
+        {
+            Player player = null;
+            ResultsScreen results = null;
+
+            WorkingBeatmap beatmap() => Game.Beatmap.Value;
+
+            PushAndConfirm(() => new TestSongSelect());
+
+            AddStep("import beatmap", () => ImportBeatmapTest.LoadOszIntoOsu(Game, virtualTrack: true).Wait());
+
+            AddUntilStep("wait for selected", () => !Game.Beatmap.IsDefault);
+
+            AddStep("set autoplay", () => Game.SelectedMods.Value = new[] { new OsuModAutoplay() });
+
+            AddStep("press enter", () => InputManager.Key(Key.Enter));
+            AddUntilStep("wait for player", () => (player = Game.ScreenStack.CurrentScreen as Player) != null);
+            AddStep("seek to end", () => beatmap().Track.Seek(beatmap().Track.Length));
+            AddUntilStep("wait for pass", () => (results = Game.ScreenStack.CurrentScreen as ResultsScreen) != null && results.IsLoaded);
+            AddStep("attempt to retry", () => results.ChildrenOfType<HotkeyRetryOverlay>().First().Action());
+            AddUntilStep("wait for player", () => Game.ScreenStack.CurrentScreen != player && Game.ScreenStack.CurrentScreen is Player);
+        }
+
         [TestCase(true)]
         [TestCase(false)]
         public void TestSongContinuesAfterExitPlayer(bool withUserPause)

From 1aea840504aa337e24173ca701188e6fd88a6d1a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Feb 2021 14:03:41 +0900
Subject: [PATCH 1503/3722] Add missing return in early exit scenario
 (MakeCurrent isn't compatible with the following Exit)

---
 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 c462786916..88ca516440 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -493,6 +493,7 @@ namespace osu.Game.Screens.Play
                 // we want to give the user what they want, so forcefully return to this screen (to proceed with the upwards exit process).
                 ValidForResume = false;
                 this.MakeCurrent();
+                return;
             }
 
             if (showDialogFirst)

From 83183a84da2a877e44a5472cc375e0e9b162793e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Feb 2021 15:31:51 +0900
Subject: [PATCH 1504/3722] Ensure the tournament test runner is ready before
 performing the test run

---
 osu.Game.Tournament.Tests/TournamentTestScene.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament.Tests/TournamentTestScene.cs b/osu.Game.Tournament.Tests/TournamentTestScene.cs
index 025abfcbc6..47d2160561 100644
--- a/osu.Game.Tournament.Tests/TournamentTestScene.cs
+++ b/osu.Game.Tournament.Tests/TournamentTestScene.cs
@@ -2,6 +2,7 @@
 // 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.Platform;
 using osu.Framework.Testing;
@@ -163,7 +164,13 @@ namespace osu.Game.Tournament.Tests
                 }));
             }
 
-            public void RunTestBlocking(TestScene test) => runner.RunTestBlocking(test);
+            public void RunTestBlocking(TestScene test)
+            {
+                while (runner?.IsLoaded != true && Host.ExecutionState == ExecutionState.Running)
+                    Thread.Sleep(10);
+
+                runner?.RunTestBlocking(test);
+            }
         }
     }
 }

From 4f264758a499fea09585cdd9403cba15d9a7777c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Feb 2021 15:57:34 +0900
Subject: [PATCH 1505/3722] Add test coverage of pause from resume overlay

---
 .../Visual/Gameplay/TestScenePause.cs           | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index 8246e2c028..1ad1479cd4 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -69,13 +69,14 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("wait for hitobjects", () => Player.HealthProcessor.Health.Value < 1);
 
             pauseAndConfirm();
-
             resume();
+
             confirmPausedWithNoOverlay();
             pauseAndConfirm();
 
             AddUntilStep("resume overlay is not active", () => Player.DrawableRuleset.ResumeOverlay.State.Value == Visibility.Hidden);
             confirmPaused();
+            confirmNotExited();
         }
 
         [Test]
@@ -100,7 +101,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             pauseExternally();
 
             confirmResumed();
-            AddAssert("not exited", () => Player.IsCurrentScreen());
+            confirmNotExited();
         }
 
         [Test]
@@ -114,7 +115,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("pause via exit key", () => Player.ExitViaPause());
 
             confirmResumed();
-            AddAssert("not exited", () => Player.IsCurrentScreen());
+            confirmNotExited();
         }
 
         [Test]
@@ -277,7 +278,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void exitAndConfirm()
         {
-            AddUntilStep("player not exited", () => Player.IsCurrentScreen());
+            confirmNotExited();
             AddStep("exit", () => Player.Exit());
             confirmExited();
             confirmNoTrackAdjustments();
@@ -286,7 +287,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private void confirmPaused()
         {
             confirmClockRunning(false);
-            AddAssert("player not exited", () => Player.IsCurrentScreen());
+            confirmNotExited();
             AddAssert("player not failed", () => !Player.HasFailed);
             AddAssert("pause overlay shown", () => Player.PauseOverlayVisible);
         }
@@ -303,10 +304,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             confirmPauseOverlayShown(false);
         }
 
-        private void confirmExited()
-        {
-            AddUntilStep("player exited", () => !Player.IsCurrentScreen());
-        }
+        private void confirmExited() => AddUntilStep("player exited", () => !Player.IsCurrentScreen());
+        private void confirmNotExited() => AddAssert("player not exited", () => Player.IsCurrentScreen());
 
         private void confirmNoTrackAdjustments()
         {

From 9cba350337484a3e1466063411daeb489c18abdc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Feb 2021 15:57:21 +0900
Subject: [PATCH 1506/3722] Refactor again to better cover cases where the
 pause dialog should definitely be shown

---
 osu.Game/Screens/Play/Player.cs | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 88ca516440..a844d3bcf7 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -487,35 +487,30 @@ namespace osu.Game.Screens.Play
             // if a restart has been requested, cancel any pending completion (user has shown intent to restart).
             completionProgressDelegate?.Cancel();
 
+            // there is a chance that the exit was performed after the transition to results has started.
+            // we want to give the user what they want, so forcefully return to this screen (to proceed with the upwards exit process).
             if (!this.IsCurrentScreen())
             {
-                // there is a chance that the exit was performed after the transition to results has started.
-                // we want to give the user what they want, so forcefully return to this screen (to proceed with the upwards exit process).
                 ValidForResume = false;
                 this.MakeCurrent();
                 return;
             }
 
-            if (showDialogFirst)
+            bool pauseDialogShown = PauseOverlay.State.Value == Visibility.Visible;
+
+            if (showDialogFirst && !pauseDialogShown)
             {
+                // if the fail animation is currently in progress, accelerate it (it will show the pause dialog on completion).
                 if (ValidForResume && HasFailed && !FailOverlay.IsPresent)
                 {
                     failAnimation.FinishTransforms(true);
                     return;
                 }
 
-                if (!GameplayClockContainer.IsPaused.Value)
-                {
-                    // if we are within the cooldown period and not already paused, the operation should block completely.
-                    if (pauseCooldownActive)
-                        return;
-
-                    if (canPause)
-                    {
-                        Pause();
-                        return;
-                    }
-                }
+                // in the case a dialog needs to be shown, attempt to pause and show it.
+                // this may fail (see internal checks in Pause()) at which point the exit attempt will be aborted.
+                Pause();
+                return;
             }
 
             this.Exit();

From f664fca0ddf2ac466af1d27048f0d370c74ecb94 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Feb 2021 16:11:17 +0900
Subject: [PATCH 1507/3722] Tidy up tests (and remove duplicate with new call
 logic)

---
 .../Visual/Gameplay/TestScenePause.cs         | 22 ++++---------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index 1ad1479cd4..aa56c636ab 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -90,20 +90,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             resumeAndConfirm();
         }
 
-        [Test]
-        public void TestExternalPauseDuringCooldownTooSoon()
-        {
-            AddStep("move cursor outside", () => InputManager.MoveMouseTo(Player.ScreenSpaceDrawQuad.TopLeft - new Vector2(10)));
-
-            pauseAndConfirm();
-
-            resume();
-            pauseExternally();
-
-            confirmResumed();
-            confirmNotExited();
-        }
-
         [Test]
         public void TestUserPauseDuringCooldownTooSoon()
         {
@@ -112,7 +98,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             pauseAndConfirm();
 
             resume();
-            AddStep("pause via exit key", () => Player.ExitViaPause());
+            pauseFromUserExitKey();
 
             confirmResumed();
             confirmNotExited();
@@ -154,7 +140,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             confirmClockRunning(false);
 
-            pauseExternally();
+            pauseFromUserExitKey();
 
             confirmPausedWithNoOverlay();
             AddAssert("fail overlay still shown", () => Player.FailOverlayVisible);
@@ -266,7 +252,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void pauseAndConfirm()
         {
-            pauseExternally();
+            pauseFromUserExitKey();
             confirmPaused();
         }
 
@@ -313,7 +299,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         private void restart() => AddStep("restart", () => Player.Restart());
-        private void pauseExternally() => AddStep("pause", () => Player.Pause());
+        private void pauseFromUserExitKey() => AddStep("user pause", () => Player.ExitViaPause());
         private void resume() => AddStep("resume", () => Player.Resume());
 
         private void confirmPauseOverlayShown(bool isShown) =>

From 9ad38ab20e9bcc6b43aa8cab09ee6f14c8b34638 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Feb 2021 16:31:00 +0900
Subject: [PATCH 1508/3722] Move HubClientConnector retrieval to IAPIProvider

---
 .../Visual/Gameplay/TestSceneSpectator.cs     |  3 --
 ...TestSceneMultiplayerGameplayLeaderboard.cs |  3 --
 osu.Game/Online/API/APIAccess.cs              |  2 ++
 osu.Game/Online/API/DummyAPIAccess.cs         |  2 ++
 osu.Game/Online/API/IAPIProvider.cs           |  9 +++++
 osu.Game/Online/HubClientConnector.cs         |  7 ++--
 osu.Game/Online/IHubClientConnector.cs        | 34 +++++++++++++++++++
 .../Online/Multiplayer/MultiplayerClient.cs   | 15 ++++----
 .../Spectator/SpectatorStreamingClient.cs     |  6 ++--
 9 files changed, 60 insertions(+), 21 deletions(-)
 create mode 100644 osu.Game/Online/IHubClientConnector.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 36e7e1fb29..4a0e1282c4 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -12,7 +12,6 @@ using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Online;
-using osu.Game.Online.API;
 using osu.Game.Online.Spectator;
 using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets.Osu;
@@ -244,8 +243,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
             }
 
-            protected override HubClientConnector CreateConnector(string name, string endpoint, IAPIProvider api) => null;
-
             public void StartPlay(int beatmapId)
             {
                 this.beatmapId = beatmapId;
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
index 49abd62dba..aab69d687a 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -13,7 +13,6 @@ using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Database;
 using osu.Game.Online;
-using osu.Game.Online.API;
 using osu.Game.Online.Spectator;
 using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets.Osu.Scoring;
@@ -106,8 +105,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 this.totalUsers = totalUsers;
             }
 
-            protected override HubClientConnector CreateConnector(string name, string endpoint, IAPIProvider api) => null;
-
             public void Start(int beatmapId)
             {
                 for (int i = 0; i < totalUsers; i++)
diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index 2aaea22155..657487971b 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -243,6 +243,8 @@ namespace osu.Game.Online.API
             this.password = password;
         }
 
+        public IHubClientConnector GetHubConnector(string clientName, string endpoint) => new HubClientConnector(clientName, endpoint, this);
+
         public RegistrationRequest.RegistrationRequestErrors CreateAccount(string email, string username, string password)
         {
             Debug.Assert(State.Value == APIState.Offline);
diff --git a/osu.Game/Online/API/DummyAPIAccess.cs b/osu.Game/Online/API/DummyAPIAccess.cs
index 3e996ac97f..943b52db88 100644
--- a/osu.Game/Online/API/DummyAPIAccess.cs
+++ b/osu.Game/Online/API/DummyAPIAccess.cs
@@ -83,6 +83,8 @@ namespace osu.Game.Online.API
             state.Value = APIState.Offline;
         }
 
+        public IHubClientConnector GetHubConnector(string clientName, string endpoint) => null;
+
         public RegistrationRequest.RegistrationRequestErrors CreateAccount(string email, string username, string password)
         {
             Thread.Sleep(200);
diff --git a/osu.Game/Online/API/IAPIProvider.cs b/osu.Game/Online/API/IAPIProvider.cs
index 1951dfaf40..34b7dc5f17 100644
--- a/osu.Game/Online/API/IAPIProvider.cs
+++ b/osu.Game/Online/API/IAPIProvider.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 enable
+
 using System.Threading.Tasks;
 using osu.Framework.Bindables;
 using osu.Game.Users;
@@ -95,6 +97,13 @@ namespace osu.Game.Online.API
         /// </summary>
         void Logout();
 
+        /// <summary>
+        /// Constructs a new <see cref="IHubClientConnector"/>. May be null if not supported.
+        /// </summary>
+        /// <param name="clientName">The name of the client this connector connects for, used for logging.</param>
+        /// <param name="endpoint">The endpoint to the hub.</param>
+        IHubClientConnector? GetHubConnector(string clientName, string endpoint);
+
         /// <summary>
         /// Create a new user account. This is a blocking operation.
         /// </summary>
diff --git a/osu.Game/Online/HubClientConnector.cs b/osu.Game/Online/HubClientConnector.cs
index 2298ac4243..7884a294d3 100644
--- a/osu.Game/Online/HubClientConnector.cs
+++ b/osu.Game/Online/HubClientConnector.cs
@@ -16,15 +16,12 @@ using osu.Game.Online.API;
 
 namespace osu.Game.Online
 {
-    /// <summary>
-    /// A component that manages the life cycle of a connection to a SignalR Hub.
-    /// </summary>
-    public class HubClientConnector : IDisposable
+    public class HubClientConnector : IHubClientConnector
     {
         /// <summary>
         /// Invoked whenever a new hub connection is built, to configure it before it's started.
         /// </summary>
-        public Action<HubConnection>? ConfigureConnection;
+        public Action<HubConnection>? ConfigureConnection { get; set; }
 
         private readonly string clientName;
         private readonly string endpoint;
diff --git a/osu.Game/Online/IHubClientConnector.cs b/osu.Game/Online/IHubClientConnector.cs
new file mode 100644
index 0000000000..d2ceb1f030
--- /dev/null
+++ b/osu.Game/Online/IHubClientConnector.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.
+
+#nullable enable
+
+using System;
+using Microsoft.AspNetCore.SignalR.Client;
+using osu.Framework.Bindables;
+using osu.Game.Online.API;
+
+namespace osu.Game.Online
+{
+    /// <summary>
+    /// A component that manages the life cycle of a connection to a SignalR Hub.
+    /// Should generally be retrieved from an <see cref="IAPIProvider"/>.
+    /// </summary>
+    public interface IHubClientConnector : IDisposable
+    {
+        /// <summary>
+        /// The current connection opened by this connector.
+        /// </summary>
+        HubConnection? CurrentConnection { get; }
+
+        /// <summary>
+        /// Whether this is connected to the hub, use <see cref="CurrentConnection"/> to access the connection, if this is <c>true</c>.
+        /// </summary>
+        IBindable<bool> IsConnected { get; }
+
+        /// <summary>
+        /// Invoked whenever a new hub connection is built, to configure it before it's started.
+        /// </summary>
+        public Action<HubConnection>? ConfigureConnection { get; set; }
+    }
+}
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index ba2a8d7246..95d76f384f 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -17,7 +17,8 @@ namespace osu.Game.Online.Multiplayer
     public class MultiplayerClient : StatefulMultiplayerClient
     {
         private readonly string endpoint;
-        private HubClientConnector? connector;
+
+        private IHubClientConnector? connector;
 
         public override IBindable<bool> IsConnected { get; } = new BindableBool();
 
@@ -31,9 +32,11 @@ namespace osu.Game.Online.Multiplayer
         [BackgroundDependencyLoader]
         private void load(IAPIProvider api)
         {
-            connector = new HubClientConnector(nameof(MultiplayerClient), endpoint, api)
+            connector = api.GetHubConnector(nameof(MultiplayerClient), endpoint);
+
+            if (connector != null)
             {
-                ConfigureConnection = connection =>
+                connector.ConfigureConnection = connection =>
                 {
                     // this is kind of SILLY
                     // https://github.com/dotnet/aspnetcore/issues/15198
@@ -48,10 +51,10 @@ namespace osu.Game.Online.Multiplayer
                     connection.On(nameof(IMultiplayerClient.ResultsReady), ((IMultiplayerClient)this).ResultsReady);
                     connection.On<int, IEnumerable<APIMod>>(nameof(IMultiplayerClient.UserModsChanged), ((IMultiplayerClient)this).UserModsChanged);
                     connection.On<int, BeatmapAvailability>(nameof(IMultiplayerClient.UserBeatmapAvailabilityChanged), ((IMultiplayerClient)this).UserBeatmapAvailabilityChanged);
-                },
-            };
+                };
 
-            IsConnected.BindTo(connector.IsConnected);
+                IsConnected.BindTo(connector.IsConnected);
+            }
         }
 
         protected override Task<MultiplayerRoom> JoinRoom(long roomId)
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 7e61da9b87..3a586874fe 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Online.Spectator
         private readonly string endpoint;
 
         [CanBeNull]
-        private HubClientConnector connector;
+        private IHubClientConnector connector;
 
         private readonly IBindable<bool> isConnected = new BindableBool();
 
@@ -86,7 +86,7 @@ namespace osu.Game.Online.Spectator
         [BackgroundDependencyLoader]
         private void load(IAPIProvider api)
         {
-            connector = CreateConnector(nameof(SpectatorStreamingClient), endpoint, api);
+            connector = api.GetHubConnector(nameof(SpectatorStreamingClient), endpoint);
 
             if (connector != null)
             {
@@ -129,8 +129,6 @@ namespace osu.Game.Online.Spectator
             }
         }
 
-        protected virtual HubClientConnector CreateConnector(string name, string endpoint, IAPIProvider api) => new HubClientConnector(name, endpoint, api);
-
         Task ISpectatorClient.UserBeganPlaying(int userId, SpectatorState state)
         {
             if (!playingUsers.Contains(userId))

From 55d5d8d5be4c3ad504681d1fa0d605429ccad684 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 14 Feb 2021 23:31:57 +0900
Subject: [PATCH 1509/3722] Send version hash on hub connection

---
 osu.Game/Online/API/APIAccess.cs      |  7 +++++--
 osu.Game/Online/HubClientConnector.cs | 11 +++++++++--
 osu.Game/OsuGameBase.cs               |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index 657487971b..8ffa0221c8 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Online.API
     {
         private readonly OsuConfigManager config;
 
+        private readonly string versionHash;
+
         private readonly OAuth authentication;
 
         private readonly Queue<APIRequest> queue = new Queue<APIRequest>();
@@ -56,9 +58,10 @@ namespace osu.Game.Online.API
 
         private readonly Logger log;
 
-        public APIAccess(OsuConfigManager config, EndpointConfiguration endpointConfiguration)
+        public APIAccess(OsuConfigManager config, EndpointConfiguration endpointConfiguration, string versionHash)
         {
             this.config = config;
+            this.versionHash = versionHash;
 
             APIEndpointUrl = endpointConfiguration.APIEndpointUrl;
             WebsiteRootUrl = endpointConfiguration.WebsiteRootUrl;
@@ -243,7 +246,7 @@ namespace osu.Game.Online.API
             this.password = password;
         }
 
-        public IHubClientConnector GetHubConnector(string clientName, string endpoint) => new HubClientConnector(clientName, endpoint, this);
+        public IHubClientConnector GetHubConnector(string clientName, string endpoint) => new HubClientConnector(clientName, endpoint, this, versionHash);
 
         public RegistrationRequest.RegistrationRequestErrors CreateAccount(string email, string username, string password)
         {
diff --git a/osu.Game/Online/HubClientConnector.cs b/osu.Game/Online/HubClientConnector.cs
index 7884a294d3..fdb21c5000 100644
--- a/osu.Game/Online/HubClientConnector.cs
+++ b/osu.Game/Online/HubClientConnector.cs
@@ -25,6 +25,7 @@ namespace osu.Game.Online
 
         private readonly string clientName;
         private readonly string endpoint;
+        private readonly string versionHash;
         private readonly IAPIProvider api;
 
         /// <summary>
@@ -49,11 +50,13 @@ namespace osu.Game.Online
         /// <param name="clientName">The name of the client this connector connects for, used for logging.</param>
         /// <param name="endpoint">The endpoint to the hub.</param>
         /// <param name="api"> An API provider used to react to connection state changes.</param>
-        public HubClientConnector(string clientName, string endpoint, IAPIProvider api)
+        /// <param name="versionHash">The hash representing the current game version, used for verification purposes.</param>
+        public HubClientConnector(string clientName, string endpoint, IAPIProvider api, string versionHash)
         {
             this.clientName = clientName;
             this.endpoint = endpoint;
             this.api = api;
+            this.versionHash = versionHash;
 
             apiState.BindTo(api.State);
             apiState.BindValueChanged(state =>
@@ -129,7 +132,11 @@ namespace osu.Game.Online
         private HubConnection buildConnection(CancellationToken cancellationToken)
         {
             var builder = new HubConnectionBuilder()
-                .WithUrl(endpoint, options => { options.Headers.Add("Authorization", $"Bearer {api.AccessToken}"); });
+                .WithUrl(endpoint, options =>
+                {
+                    options.Headers.Add("Authorization", $"Bearer {api.AccessToken}");
+                    options.Headers.Add("OsuVersionHash", versionHash);
+                });
 
             if (RuntimeInfo.SupportsJIT)
                 builder.AddMessagePackProtocol();
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 174b5006a2..00b436931a 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -228,7 +228,7 @@ namespace osu.Game
 
             MessageFormatter.WebsiteRootUrl = endpoints.WebsiteRootUrl;
 
-            dependencies.CacheAs(API ??= new APIAccess(LocalConfig, endpoints));
+            dependencies.CacheAs(API ??= new APIAccess(LocalConfig, endpoints, VersionHash));
 
             dependencies.CacheAs(spectatorStreaming = new SpectatorStreamingClient(endpoints));
             dependencies.CacheAs(multiplayerClient = new MultiplayerClient(endpoints));

From 3562fddc27a2f4c31c3b93c93f70e660f8207dd4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Feb 2021 17:02:07 +0900
Subject: [PATCH 1510/3722] Add missing nullability flag on CreateAccount
 return value

---
 osu.Game/Online/API/IAPIProvider.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/IAPIProvider.cs b/osu.Game/Online/API/IAPIProvider.cs
index 34b7dc5f17..3a77b9cfee 100644
--- a/osu.Game/Online/API/IAPIProvider.cs
+++ b/osu.Game/Online/API/IAPIProvider.cs
@@ -111,6 +111,6 @@ namespace osu.Game.Online.API
         /// <param name="username">The username to create the account with.</param>
         /// <param name="password">The password to create the account with.</param>
         /// <returns>Any errors encoutnered during account creation.</returns>
-        RegistrationRequest.RegistrationRequestErrors CreateAccount(string email, string username, string password);
+        RegistrationRequest.RegistrationRequestErrors? CreateAccount(string email, string username, string password);
     }
 }

From de52b8a5ba0dc72f41d694c2ba7d1aa583276486 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Feb 2021 17:14:41 +0900
Subject: [PATCH 1511/3722] Fix test failures in PerformFromScreen tests

---
 osu.Game/Overlays/Volume/VolumeMeter.cs |  2 ++
 osu.Game/Screens/BackgroundScreen.cs    | 10 +++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Volume/VolumeMeter.cs b/osu.Game/Overlays/Volume/VolumeMeter.cs
index 07accf8820..5b997bbd05 100644
--- a/osu.Game/Overlays/Volume/VolumeMeter.cs
+++ b/osu.Game/Overlays/Volume/VolumeMeter.cs
@@ -176,6 +176,7 @@ namespace osu.Game.Overlays.Volume
                     }
                 }
             };
+
             Bindable.ValueChanged += volume =>
             {
                 this.TransformTo("DisplayVolume",
@@ -183,6 +184,7 @@ namespace osu.Game.Overlays.Volume
                     400,
                     Easing.OutQuint);
             };
+
             bgProgress.Current.Value = 0.75f;
         }
 
diff --git a/osu.Game/Screens/BackgroundScreen.cs b/osu.Game/Screens/BackgroundScreen.cs
index c81362eebe..48c5523883 100644
--- a/osu.Game/Screens/BackgroundScreen.cs
+++ b/osu.Game/Screens/BackgroundScreen.cs
@@ -68,15 +68,19 @@ namespace osu.Game.Screens
 
         public override bool OnExiting(IScreen next)
         {
-            this.FadeOut(transition_length, Easing.OutExpo);
-            this.MoveToX(x_movement_amount, transition_length, Easing.OutExpo);
+            if (IsLoaded)
+            {
+                this.FadeOut(transition_length, Easing.OutExpo);
+                this.MoveToX(x_movement_amount, transition_length, Easing.OutExpo);
+            }
 
             return base.OnExiting(next);
         }
 
         public override void OnResuming(IScreen last)
         {
-            this.MoveToX(0, transition_length, Easing.OutExpo);
+            if (IsLoaded)
+                this.MoveToX(0, transition_length, Easing.OutExpo);
             base.OnResuming(last);
         }
     }

From 6bfc7da671c355c5586cb556f473ae7773cecefb Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 15 Feb 2021 18:10:45 +0900
Subject: [PATCH 1512/3722] Fix sample potentially playing at the wrong
 frequency

Co-authored-by: Dean Herbert <pe@ppy.sh>
---
 .../OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
index 1888bf06bd..c9fb234ccc 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -117,8 +117,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             if (sampleReadyCount == null)
                 return;
 
-            var channel = sampleReadyCount.Play();
+            var channel = sampleReadyCount.GetChannel();
             channel.Frequency.Value = 0.77f + countReady * 0.06f;
+            channel.Play();
         }
 
         private void updateButtonColour(bool green)

From 1ac274e478b8fcb50d3cad3bf95f1c40d585231e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Feb 2021 21:22:18 +0900
Subject: [PATCH 1513/3722] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index d88a11257d..e30416bc1c 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.128.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.215.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index d68a8a515c..cccebeb023 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.128.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.215.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.0.1" />
     <PackageReference Include="SharpCompress" Version="0.27.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 87ebd41fee..137c96a72d 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.128.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.215.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -91,7 +91,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.128.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.215.0" />
     <PackageReference Include="SharpCompress" Version="0.27.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 72b2123500f28257f140f6fc5f443e85973f99cf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Feb 2021 21:42:35 +0900
Subject: [PATCH 1514/3722] Update nunit in line with framework

---
 osu.Game.Benchmarks/osu.Game.Benchmarks.csproj                  | 2 +-
 .../osu.Game.Rulesets.Catch.Tests.csproj                        | 2 +-
 .../osu.Game.Rulesets.Mania.Tests.csproj                        | 2 +-
 osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj  | 2 +-
 .../osu.Game.Rulesets.Taiko.Tests.csproj                        | 2 +-
 osu.Game.Tests/osu.Game.Tests.csproj                            | 2 +-
 osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj      | 2 +-
 osu.Game/osu.Game.csproj                                        | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj b/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
index 7805bfcefc..ea43d9a54c 100644
--- a/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
+++ b/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
-    <PackageReference Include="nunit" Version="3.12.0" />
+    <PackageReference Include="nunit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
   </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 54fddc297e..bf3aba5859 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
@@ -3,7 +3,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
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 d55b4fe08a..fcc0cafefc 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
@@ -3,7 +3,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
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 345c3e6d35..b4c686ccea 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
@@ -3,7 +3,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
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 2a5a2e2fdb..2b084f3bee 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
@@ -3,7 +3,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index d29ed94b5f..7e3868bd3b 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -4,7 +4,7 @@
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="DeepEqual" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
     <PackageReference Include="Moq" Version="4.16.0" />
diff --git a/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj b/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
index 185b35e40d..77ae06d89c 100644
--- a/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
+++ b/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
@@ -6,7 +6,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
   </ItemGroup>
   <PropertyGroup Label="Project">
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index cccebeb023..72f680f6f8 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -33,7 +33,7 @@
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.0.1" />
     <PackageReference Include="SharpCompress" Version="0.27.1" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
 </Project>

From a1496cd8f3afed32bd9c126a18dc8a3714ca6212 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 9 Feb 2021 08:28:09 +0300
Subject: [PATCH 1515/3722] Remove necessity of using `CurrentModeRank` as a
 fallback

---
 .../TestSceneMultiplayerParticipantsList.cs            | 10 ++++++++--
 .../Multiplayer/Participants/ParticipantPanel.cs       |  4 ----
 osu.Game/Users/User.cs                                 |  9 ++++++---
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index 0f7a9b442d..5a0234e379 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
@@ -155,7 +155,10 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     {
                         Id = i,
                         Username = $"User {i}",
-                        CurrentModeRank = RNG.Next(1, 100000),
+                        AllStatistics =
+                        {
+                            { Ruleset.Value, new UserStatistics { GlobalRank = RNG.Next(1, 100000) } }
+                        },
                         CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
                     });
 
@@ -193,7 +196,10 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 {
                     Id = 0,
                     Username = "User 0",
-                    CurrentModeRank = RNG.Next(1, 100000),
+                    AllStatistics =
+                    {
+                        { Ruleset.Value, new UserStatistics { GlobalRank = RNG.Next(1, 100000) } }
+                    },
                     CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
                 });
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index 74bc86f279..e78264223e 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -165,10 +165,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
             var ruleset = rulesets.GetRuleset(Room.Settings.RulesetID);
 
             var currentModeRank = User.User?.GetStatisticsFor(ruleset)?.GlobalRank;
-
-            // fallback to current mode rank for testing purposes.
-            currentModeRank ??= User.User?.CurrentModeRank;
-
             userRankText.Text = currentModeRank != null ? $"#{currentModeRank.Value:N0}" : string.Empty;
 
             userStateDisplay.UpdateStatus(User.State, User.BeatmapAvailability);
diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index 467f00e409..621d70301d 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -243,7 +243,10 @@ namespace osu.Game.Users
         [JsonExtensionData]
         private readonly IDictionary<string, JToken> otherProperties = new Dictionary<string, JToken>();
 
-        private readonly Dictionary<RulesetInfo, UserStatistics> statisticsCache = new Dictionary<RulesetInfo, UserStatistics>();
+        /// <summary>
+        /// Map for ruleset with their associated user statistics, can be altered for testing purposes.
+        /// </summary>
+        internal readonly Dictionary<RulesetInfo, UserStatistics> AllStatistics = new Dictionary<RulesetInfo, UserStatistics>();
 
         /// <summary>
         /// Retrieves the user statistics for a certain ruleset.
@@ -254,10 +257,10 @@ namespace osu.Game.Users
         // todo: this should likely be moved to a separate UserCompact class at some point.
         public UserStatistics GetStatisticsFor(RulesetInfo ruleset)
         {
-            if (statisticsCache.TryGetValue(ruleset, out var existing))
+            if (AllStatistics.TryGetValue(ruleset, out var existing))
                 return existing;
 
-            return statisticsCache[ruleset] = parseStatisticsFor(ruleset);
+            return AllStatistics[ruleset] = parseStatisticsFor(ruleset);
         }
 
         private UserStatistics parseStatisticsFor(RulesetInfo ruleset)

From 1466f36649f12edf22942b01c5bf278b1ee55f17 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 9 Feb 2021 08:55:50 +0300
Subject: [PATCH 1516/3722] Improve documentation on `Statistics`

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

diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index 621d70301d..58f25703fc 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -185,9 +185,8 @@ namespace osu.Game.Users
         private UserStatistics statistics;
 
         /// <summary>
-        /// The user statistics of the ruleset specified within the API request.
-        /// If the user is fetched from a <see cref="GetUsersRequest"/> or similar
-        /// (i.e. is a user compact instance), use <see cref="GetStatisticsFor"/> instead.
+        /// User statistics for the requested ruleset (in the case of a <see cref="GetUserRequest"/> response).
+        /// Otherwise empty.
         /// </summary>
         [JsonProperty(@"statistics")]
         public UserStatistics Statistics

From 62514f23b59334ef3c6736941379a34c5ff0daf0 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 9 Feb 2021 08:56:01 +0300
Subject: [PATCH 1517/3722] Remove unnecessary json settings override

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

diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index 58f25703fc..b8ca345f5c 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -267,9 +267,7 @@ namespace osu.Game.Users
             if (!(otherProperties.TryGetValue($"statistics_{ruleset.ShortName}", out var token)))
                 return new UserStatistics();
 
-            var settings = JsonSerializableExtensions.CreateGlobalSettings();
-            settings.DefaultValueHandling = DefaultValueHandling.Include;
-            return token.ToObject<UserStatistics>(JsonSerializer.Create(settings));
+            return token.ToObject<UserStatistics>(JsonSerializer.Create(JsonSerializableExtensions.CreateGlobalSettings()));
         }
 
         public override string ToString() => Username;

From d15ffff9a57e6a09a1ecb6e196165eccd16c72e4 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 9 Feb 2021 09:54:17 +0300
Subject: [PATCH 1518/3722] Simplifiy user statistics retrieval to one-time on
 deserialization

---
 .../TestSceneMultiplayerParticipantsList.cs   |  4 +-
 .../Participants/ParticipantPanel.cs          |  3 +-
 osu.Game/Users/User.cs                        | 42 +++++++------------
 3 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index 5a0234e379..5da5ab74b2 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
@@ -157,7 +157,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                         Username = $"User {i}",
                         AllStatistics =
                         {
-                            { Ruleset.Value, new UserStatistics { GlobalRank = RNG.Next(1, 100000) } }
+                            { Ruleset.Value.ShortName, new UserStatistics { GlobalRank = RNG.Next(1, 100000) } }
                         },
                         CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
                     });
@@ -198,7 +198,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     Username = "User 0",
                     AllStatistics =
                     {
-                        { Ruleset.Value, new UserStatistics { GlobalRank = RNG.Next(1, 100000) } }
+                        { Ruleset.Value.ShortName, new UserStatistics { GlobalRank = RNG.Next(1, 100000) } }
                     },
                     CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
                 });
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index e78264223e..49d3bfc2dc 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.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.Extensions.Color4Extensions;
@@ -164,7 +165,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 
             var ruleset = rulesets.GetRuleset(Room.Settings.RulesetID);
 
-            var currentModeRank = User.User?.GetStatisticsFor(ruleset)?.GlobalRank;
+            var currentModeRank = User.User?.AllStatistics.GetValueOrDefault(ruleset.ShortName)?.GlobalRank;
             userRankText.Text = currentModeRank != null ? $"#{currentModeRank.Value:N0}" : string.Empty;
 
             userStateDisplay.UpdateStatus(User.State, User.BeatmapAvailability);
diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index b8ca345f5c..2c2f293aac 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -5,13 +5,13 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
+using System.Runtime.Serialization;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using osu.Framework.Bindables;
 using osu.Game.IO.Serialization;
 using osu.Game.Online.API.Requests;
-using osu.Game.Rulesets;
 
 namespace osu.Game.Users
 {
@@ -238,36 +238,26 @@ namespace osu.Game.Users
         [JsonProperty("replays_watched_counts")]
         public UserHistoryCount[] ReplaysWatchedCounts;
 
+        /// <summary>
+        /// All user statistics per ruleset's short name (in the case of a <see cref="GetUsersRequest"/> response).
+        /// Otherwise empty. Can be altered for testing purposes.
+        /// </summary>
+        // todo: this should likely be moved to a separate UserCompact class at some point.
+        [UsedImplicitly]
+        public readonly Dictionary<string, UserStatistics> AllStatistics = new Dictionary<string, UserStatistics>();
+
         [UsedImplicitly]
         [JsonExtensionData]
         private readonly IDictionary<string, JToken> otherProperties = new Dictionary<string, JToken>();
 
-        /// <summary>
-        /// Map for ruleset with their associated user statistics, can be altered for testing purposes.
-        /// </summary>
-        internal readonly Dictionary<RulesetInfo, UserStatistics> AllStatistics = new Dictionary<RulesetInfo, UserStatistics>();
-
-        /// <summary>
-        /// Retrieves the user statistics for a certain ruleset.
-        /// If user is fetched from a <see cref="GetUserRequest"/>,
-        /// this will always return empty instance, use <see cref="Statistics"/> instead.
-        /// </summary>
-        /// <param name="ruleset">The ruleset to retrieve statistics for.</param>
-        // todo: this should likely be moved to a separate UserCompact class at some point.
-        public UserStatistics GetStatisticsFor(RulesetInfo ruleset)
+        [OnDeserialized]
+        private void onDeserialized(StreamingContext context)
         {
-            if (AllStatistics.TryGetValue(ruleset, out var existing))
-                return existing;
-
-            return AllStatistics[ruleset] = parseStatisticsFor(ruleset);
-        }
-
-        private UserStatistics parseStatisticsFor(RulesetInfo ruleset)
-        {
-            if (!(otherProperties.TryGetValue($"statistics_{ruleset.ShortName}", out var token)))
-                return new UserStatistics();
-
-            return token.ToObject<UserStatistics>(JsonSerializer.Create(JsonSerializableExtensions.CreateGlobalSettings()));
+            foreach (var kvp in otherProperties.Where(kvp => kvp.Key.StartsWith("statistics_", StringComparison.Ordinal)))
+            {
+                var shortName = kvp.Key.Replace("statistics_", string.Empty);
+                AllStatistics[shortName] = kvp.Value.ToObject<UserStatistics>(JsonSerializer.Create(JsonSerializableExtensions.CreateGlobalSettings()));
+            }
         }
 
         public override string ToString() => Username;

From e838a5d9f09ae14738981a9d49ec002f353952e6 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 15 Feb 2021 18:38:54 -0800
Subject: [PATCH 1519/3722] Fix comment edited at date not showing tooltip

---
 osu.Game/Overlays/Comments/DrawableComment.cs | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs
index 31aa41e967..7c47ac655f 100644
--- a/osu.Game/Overlays/Comments/DrawableComment.cs
+++ b/osu.Game/Overlays/Comments/DrawableComment.cs
@@ -9,7 +9,6 @@ using osuTK;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Users.Drawables;
 using osu.Game.Graphics.Containers;
-using osu.Game.Utils;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Bindables;
 using System.Linq;
@@ -245,11 +244,32 @@ namespace osu.Game.Overlays.Comments
 
             if (Comment.EditedAt.HasValue)
             {
-                info.Add(new OsuSpriteText
+                var font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular);
+                var colour = colourProvider.Foreground1;
+
+                info.Add(new FillFlowContainer
                 {
-                    Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular),
-                    Text = $@"edited {HumanizerUtils.Humanize(Comment.EditedAt.Value)} by {Comment.EditedUser.Username}",
-                    Colour = colourProvider.Foreground1
+                    AutoSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        new OsuSpriteText
+                        {
+                            Font = font,
+                            Text = "edited ",
+                            Colour = colour
+                        },
+                        new DrawableDate(Comment.EditedAt.Value)
+                        {
+                            Font = font,
+                            Colour = colour
+                        },
+                        new OsuSpriteText
+                        {
+                            Font = font,
+                            Text = $@" by {Comment.EditedUser.Username}",
+                            Colour = colour
+                        },
+                    }
                 });
             }
 

From 02417697e994eb10183d4ba115c3085351a04a6d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Feb 2021 13:32:14 +0900
Subject: [PATCH 1520/3722] Display remaining attempts for playlist rooms with
 room-level attempt limits

---
 osu.Game/Online/Rooms/ItemAttemptsCount.cs    | 19 +++++++++++++
 .../Online/Rooms/PlaylistAggregateScore.cs    | 16 +++++++++++
 osu.Game/Online/Rooms/Room.cs                 |  5 ++++
 .../Components/RoomLocalUserInfo.cs           | 27 +++++++++++++++----
 .../Screens/OnlinePlay/OnlinePlayComposite.cs |  3 +++
 5 files changed, 65 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game/Online/Rooms/ItemAttemptsCount.cs
 create mode 100644 osu.Game/Online/Rooms/PlaylistAggregateScore.cs

diff --git a/osu.Game/Online/Rooms/ItemAttemptsCount.cs b/osu.Game/Online/Rooms/ItemAttemptsCount.cs
new file mode 100644
index 0000000000..298603d778
--- /dev/null
+++ b/osu.Game/Online/Rooms/ItemAttemptsCount.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 Newtonsoft.Json;
+
+namespace osu.Game.Online.Rooms
+{
+    /// <summary>
+    /// Represents attempts on a specific playlist item.
+    /// </summary>
+    public class ItemAttemptsCount
+    {
+        [JsonProperty("id")]
+        public int PlaylistItemID { get; set; }
+
+        [JsonProperty("attempts")]
+        public int Attempts { get; set; }
+    }
+}
diff --git a/osu.Game/Online/Rooms/PlaylistAggregateScore.cs b/osu.Game/Online/Rooms/PlaylistAggregateScore.cs
new file mode 100644
index 0000000000..61e0951cd5
--- /dev/null
+++ b/osu.Game/Online/Rooms/PlaylistAggregateScore.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 Newtonsoft.Json;
+
+namespace osu.Game.Online.Rooms
+{
+    /// <summary>
+    /// Represents aggregated score for the local user for a playlist.
+    /// </summary>
+    public class PlaylistAggregateScore
+    {
+        [JsonProperty("playlist_item_attempts")]
+        public ItemAttemptsCount[] PlaylistItemAttempts { get; set; }
+    }
+}
diff --git a/osu.Game/Online/Rooms/Room.cs b/osu.Game/Online/Rooms/Room.cs
index 763ba25d52..10a60ab374 100644
--- a/osu.Game/Online/Rooms/Room.cs
+++ b/osu.Game/Online/Rooms/Room.cs
@@ -72,6 +72,10 @@ namespace osu.Game.Online.Rooms
         [JsonIgnore]
         public readonly Bindable<int?> MaxParticipants = new Bindable<int?>();
 
+        [Cached]
+        [JsonProperty("current_user_score")]
+        public readonly Bindable<PlaylistAggregateScore> UserScore = new Bindable<PlaylistAggregateScore>();
+
         [Cached]
         [JsonProperty("recent_participants")]
         public readonly BindableList<User> RecentParticipants = new BindableList<User>();
@@ -144,6 +148,7 @@ namespace osu.Game.Online.Rooms
             MaxParticipants.Value = other.MaxParticipants.Value;
             ParticipantCount.Value = other.ParticipantCount.Value;
             EndDate.Value = other.EndDate.Value;
+            UserScore.Value = other.UserScore.Value;
 
             if (EndDate.Value != null && DateTimeOffset.Now >= EndDate.Value)
                 Status.Value = new RoomStatusEnded();
diff --git a/osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs b/osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs
index f52e59b0c8..2206726beb 100644
--- a/osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.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.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
@@ -39,12 +41,27 @@ namespace osu.Game.Screens.OnlinePlay.Components
         {
             base.LoadComplete();
 
-            MaxAttempts.BindValueChanged(attempts =>
+            MaxAttempts.BindValueChanged(_ => updateAttempts());
+            UserScore.BindValueChanged(_ => updateAttempts(), true);
+        }
+
+        private void updateAttempts()
+        {
+            if (MaxAttempts.Value != null)
             {
-                attemptDisplay.Text = attempts.NewValue == null
-                    ? string.Empty
-                    : $"Maximum attempts: {attempts.NewValue:N0}";
-            }, true);
+                attemptDisplay.Text = $"Maximum attempts: {MaxAttempts.Value:N0}";
+
+                if (UserScore.Value != null)
+                {
+                    int remaining = MaxAttempts.Value.Value - UserScore.Value.PlaylistItemAttempts.Sum(a => a.Attempts);
+                    attemptDisplay.Text += $" ({remaining} remaining)";
+                }
+            }
+
+            else
+            {
+                attemptDisplay.Text = string.Empty;
+            }
         }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
index b2f3e4a1d9..f7a51230eb 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
@@ -42,6 +42,9 @@ namespace osu.Game.Screens.OnlinePlay
         [Resolved(typeof(Room))]
         protected Bindable<int?> MaxAttempts { get; private set; }
 
+        [Resolved(typeof(Room))]
+        public Bindable<PlaylistAggregateScore> UserScore { get; private set; }
+
         [Resolved(typeof(Room))]
         protected Bindable<DateTimeOffset?> EndDate { get; private set; }
 

From 5b4999e8afd8779e0da7cd153f3a59beaa59ea3c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 16 Feb 2021 04:51:21 +0300
Subject: [PATCH 1521/3722] Update user statistics retrieval with API changes

---
 .../TestSceneMultiplayerParticipantsList.cs   |  5 +++--
 .../Participants/ParticipantPanel.cs          |  2 +-
 osu.Game/Users/User.cs                        | 22 +++----------------
 3 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index 5da5ab74b2..a7398ebf02 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.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.Framework.Graphics;
@@ -155,7 +156,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     {
                         Id = i,
                         Username = $"User {i}",
-                        AllStatistics =
+                        RulesetsStatistics = new Dictionary<string, UserStatistics>
                         {
                             { Ruleset.Value.ShortName, new UserStatistics { GlobalRank = RNG.Next(1, 100000) } }
                         },
@@ -196,7 +197,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 {
                     Id = 0,
                     Username = "User 0",
-                    AllStatistics =
+                    RulesetsStatistics = new Dictionary<string, UserStatistics>
                     {
                         { Ruleset.Value.ShortName, new UserStatistics { GlobalRank = RNG.Next(1, 100000) } }
                     },
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index 49d3bfc2dc..25bc314f1b 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -165,7 +165,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 
             var ruleset = rulesets.GetRuleset(Room.Settings.RulesetID);
 
-            var currentModeRank = User.User?.AllStatistics.GetValueOrDefault(ruleset.ShortName)?.GlobalRank;
+            var currentModeRank = User.User?.RulesetsStatistics?.GetValueOrDefault(ruleset.ShortName)?.GlobalRank;
             userRankText.Text = currentModeRank != null ? $"#{currentModeRank.Value:N0}" : string.Empty;
 
             userStateDisplay.UpdateStatus(User.State, User.BeatmapAvailability);
diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index 2c2f293aac..4a6fd540c7 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -5,12 +5,9 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using System.Runtime.Serialization;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using osu.Framework.Bindables;
-using osu.Game.IO.Serialization;
 using osu.Game.Online.API.Requests;
 
 namespace osu.Game.Users
@@ -243,22 +240,9 @@ namespace osu.Game.Users
         /// Otherwise empty. Can be altered for testing purposes.
         /// </summary>
         // todo: this should likely be moved to a separate UserCompact class at some point.
-        [UsedImplicitly]
-        public readonly Dictionary<string, UserStatistics> AllStatistics = new Dictionary<string, UserStatistics>();
-
-        [UsedImplicitly]
-        [JsonExtensionData]
-        private readonly IDictionary<string, JToken> otherProperties = new Dictionary<string, JToken>();
-
-        [OnDeserialized]
-        private void onDeserialized(StreamingContext context)
-        {
-            foreach (var kvp in otherProperties.Where(kvp => kvp.Key.StartsWith("statistics_", StringComparison.Ordinal)))
-            {
-                var shortName = kvp.Key.Replace("statistics_", string.Empty);
-                AllStatistics[shortName] = kvp.Value.ToObject<UserStatistics>(JsonSerializer.Create(JsonSerializableExtensions.CreateGlobalSettings()));
-            }
-        }
+        [JsonProperty("statistics_rulesets")]
+        [CanBeNull]
+        public Dictionary<string, UserStatistics> RulesetsStatistics { get; set; }
 
         public override string ToString() => Username;
 

From 0e7f52b5ccb1ae1a14147d1df9877d22024fde6e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 16 Feb 2021 07:28:51 +0300
Subject: [PATCH 1522/3722] Always use JSON property `global_rank` for global
 ranks instead

---
 .../TestSceneMultiplayerParticipantsList.cs   | 16 ++++++++++--
 .../Participants/ParticipantPanel.cs          |  2 +-
 osu.Game/Users/UserStatistics.cs              | 25 ++++++++-----------
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index a7398ebf02..1e14bbbbea 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
@@ -158,7 +158,13 @@ namespace osu.Game.Tests.Visual.Multiplayer
                         Username = $"User {i}",
                         RulesetsStatistics = new Dictionary<string, UserStatistics>
                         {
-                            { Ruleset.Value.ShortName, new UserStatistics { GlobalRank = RNG.Next(1, 100000) } }
+                            {
+                                Ruleset.Value.ShortName,
+                                new UserStatistics
+                                {
+                                    Ranks = new UserStatistics.UserRanks { Global = RNG.Next(1, 100000) }
+                                }
+                            }
                         },
                         CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
                     });
@@ -199,7 +205,13 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     Username = "User 0",
                     RulesetsStatistics = new Dictionary<string, UserStatistics>
                     {
-                        { Ruleset.Value.ShortName, new UserStatistics { GlobalRank = RNG.Next(1, 100000) } }
+                        {
+                            Ruleset.Value.ShortName,
+                            new UserStatistics
+                            {
+                                Ranks = new UserStatistics.UserRanks { Global = RNG.Next(1, 100000) }
+                            }
+                        }
                     },
                     CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
                 });
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index 25bc314f1b..c4d11676e7 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -165,7 +165,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 
             var ruleset = rulesets.GetRuleset(Room.Settings.RulesetID);
 
-            var currentModeRank = User.User?.RulesetsStatistics?.GetValueOrDefault(ruleset.ShortName)?.GlobalRank;
+            var currentModeRank = User.User?.RulesetsStatistics?.GetValueOrDefault(ruleset.ShortName)?.Ranks.Global;
             userRankText.Text = currentModeRank != null ? $"#{currentModeRank.Value:N0}" : string.Empty;
 
             userStateDisplay.UpdateStatus(User.State, User.BeatmapAvailability);
diff --git a/osu.Game/Users/UserStatistics.cs b/osu.Game/Users/UserStatistics.cs
index 6c069f674e..1fed908c39 100644
--- a/osu.Game/Users/UserStatistics.cs
+++ b/osu.Game/Users/UserStatistics.cs
@@ -3,7 +3,6 @@
 
 using System;
 using Newtonsoft.Json;
-using osu.Game.Online.API.Requests;
 using osu.Game.Scoring;
 using osu.Game.Utils;
 using static osu.Game.Users.User;
@@ -27,24 +26,22 @@ namespace osu.Game.Users
             public int Progress;
         }
 
-        /// <remarks>
-        /// This must only be used when coming from condensed user responses (e.g. from <see cref="GetUsersRequest"/>), otherwise use <code>Ranks.Global</code>.
-        /// </remarks>
-        // todo: this should likely be moved to a separate UserStatisticsCompact class at some point.
+        [JsonProperty(@"rank")]
+        public UserRanks Ranks;
+
+        // eventually UserRanks object will be completely replaced with separate global and country rank properties, see https://github.com/ppy/osu-web/blob/cb79bb72186c8f1a25f6a6f5ef315123decb4231/app/Transformers/UserStatisticsTransformer.php#L53.
+        // but for now, always point UserRanks.Global to the global_rank property, as that is included solely for requests like GetUsersRequest.
         [JsonProperty(@"global_rank")]
-        public int? GlobalRank;
-
-        [JsonProperty(@"pp")]
-        public decimal? PP;
-
-        [JsonProperty(@"pp_rank")] // the API sometimes only returns this value in condensed user responses
-        private int? rank
+        private int? globalRank
         {
             set => Ranks.Global = value;
         }
 
-        [JsonProperty(@"rank")]
-        public UserRanks Ranks;
+        [JsonProperty(@"pp")]
+        public decimal? PP;
+
+        [JsonProperty(@"pp_rank")]
+        public int PPRank;
 
         [JsonProperty(@"ranked_score")]
         public long RankedScore;

From e82922f8c545a6e82247c3fafb336094308f6c30 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Feb 2021 13:44:36 +0900
Subject: [PATCH 1523/3722] Add the ability to deselect the currently selected
 room via clicking away

Always felt wrong that you couldn't do this until now.
---
 .../Multiplayer/TestSceneLoungeRoomsContainer.cs   | 14 ++++++++++++++
 .../OnlinePlay/Lounge/Components/RoomsContainer.cs | 10 ++++++++++
 2 files changed, 24 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
index 279dcfa584..5682fd5c3c 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
@@ -69,6 +69,20 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("last room joined", () => RoomManager.Rooms.Last().Status.Value is JoinedRoomStatus);
         }
 
+        [Test]
+        public void TestClickDeselection()
+        {
+            AddRooms(1);
+
+            AddAssert("no selection", () => checkRoomSelected(null));
+
+            press(Key.Down);
+            AddAssert("first room selected", () => checkRoomSelected(RoomManager.Rooms.First()));
+
+            AddStep("click away", () => InputManager.Click(MouseButton.Left));
+            AddAssert("no selection", () => checkRoomSelected(null));
+        }
+
         private void press(Key down)
         {
             AddStep($"press {down}", () => InputManager.Key(down));
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
index f70c33babe..134758d023 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
@@ -11,6 +11,7 @@ using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
 using osu.Framework.Threading;
 using osu.Game.Extensions;
 using osu.Game.Graphics.Cursor;
@@ -42,6 +43,9 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
         [Resolved(CanBeNull = true)]
         private LoungeSubScreen loungeSubScreen { get; set; }
 
+        // handle deselection
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
+
         public RoomsContainer()
         {
             RelativeSizeAxes = Axes.X;
@@ -159,6 +163,12 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
             JoinRequested?.Invoke(selectedRoom.Value);
         }
 
+        protected override bool OnClick(ClickEvent e)
+        {
+            selectRoom(null);
+            return base.OnClick(e);
+        }
+
         #region Key selection logic (shared with BeatmapCarousel)
 
         public bool OnPressed(GlobalAction action)

From e969ca8974d621eb4a089231f65b684f1a3d4f60 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Feb 2021 13:52:42 +0900
Subject: [PATCH 1524/3722] Remove unused using statement that rider could not
 identify

---
 osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs b/osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs
index 2206726beb..c7d4ccd12e 100644
--- a/osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs
@@ -3,7 +3,6 @@
 
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;

From 31a5cdd8ac3339ed680a948355c1087af3fa3fd7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Feb 2021 14:02:21 +0900
Subject: [PATCH 1525/3722] Fix current selection not updating visually after
 creating a new playlist

---
 .../Lounge/Components/RoomsContainer.cs          | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
index f70c33babe..40102b1693 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
@@ -69,8 +69,16 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
             rooms.BindTo(roomManager.Rooms);
 
             filter?.BindValueChanged(criteria => Filter(criteria.NewValue));
+
+            selectedRoom.BindValueChanged(selection =>
+            {
+                updateSelection();
+            }, true);
         }
 
+        private void updateSelection() =>
+            roomFlow.Children.ForEach(r => r.State = r.Room == selectedRoom.Value ? SelectionState.Selected : SelectionState.NotSelected);
+
         public void Filter(FilterCriteria criteria)
         {
             roomFlow.Children.ForEach(r =>
@@ -125,6 +133,8 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
             }
 
             Filter(filter?.Value);
+
+            updateSelection();
         }
 
         private void removeRooms(IEnumerable<Room> rooms)
@@ -146,11 +156,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
                 roomFlow.SetLayoutPosition(room, room.Room.Position.Value);
         }
 
-        private void selectRoom(Room room)
-        {
-            roomFlow.Children.ForEach(r => r.State = r.Room == room ? SelectionState.Selected : SelectionState.NotSelected);
-            selectedRoom.Value = room;
-        }
+        private void selectRoom(Room room) => selectedRoom.Value = room;
 
         private void joinSelected()
         {

From 9ed45ce1ca49c365a9a54cd7af71c7513ba5f233 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Feb 2021 14:31:00 +0900
Subject: [PATCH 1526/3722] Remove redundant double call to ValueChanged on
 UserMods change

---
 .../Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 2f50bee677..cc63f53ac0 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -271,7 +271,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             Playlist.BindCollectionChanged(onPlaylistChanged, true);
             BeatmapAvailability.BindValueChanged(updateBeatmapAvailability, true);
-            UserMods.BindValueChanged(onUserModsChanged);
 
             client.LoadRequested += onLoadRequested;
             client.RoomUpdated += onRoomUpdated;

From 52e544aa678a5a2e2d42160299d2bf9cdfd88170 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Feb 2021 14:42:31 +0900
Subject: [PATCH 1527/3722] Revert "Remove redundant double call to
 ValueChanged on UserMods change"

This reverts commit 9ed45ce1ca49c365a9a54cd7af71c7513ba5f233.
---
 .../Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index cc63f53ac0..2f50bee677 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -271,6 +271,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             Playlist.BindCollectionChanged(onPlaylistChanged, true);
             BeatmapAvailability.BindValueChanged(updateBeatmapAvailability, true);
+            UserMods.BindValueChanged(onUserModsChanged);
 
             client.LoadRequested += onLoadRequested;
             client.RoomUpdated += onRoomUpdated;

From da42c6d2825d1a97d048c29f2bd4730b1dd989d5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Feb 2021 15:14:19 +0900
Subject: [PATCH 1528/3722] Expose FreeMods from OnlinePlaySongSelect

---
 osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
index b201c62b7f..3f2873cbc4 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
@@ -31,7 +31,8 @@ namespace osu.Game.Screens.OnlinePlay
         [Resolved(typeof(Room), nameof(Room.Playlist))]
         protected BindableList<PlaylistItem> Playlist { get; private set; }
 
-        private readonly Bindable<IReadOnlyList<Mod>> freeMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
+        protected readonly Bindable<IReadOnlyList<Mod>> FreeMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
+
         private readonly FreeModSelectOverlay freeModSelectOverlay;
 
         private WorkingBeatmap initialBeatmap;
@@ -45,7 +46,7 @@ namespace osu.Game.Screens.OnlinePlay
 
             freeModSelectOverlay = new FreeModSelectOverlay
             {
-                SelectedMods = { BindTarget = freeMods },
+                SelectedMods = { BindTarget = FreeMods },
                 IsValidMod = IsValidFreeMod,
             };
         }
@@ -67,14 +68,14 @@ namespace osu.Game.Screens.OnlinePlay
             // At this point, Mods contains both the required and allowed mods. For selection purposes, it should only contain the required mods.
             // Similarly, freeMods is currently empty but should only contain the allowed mods.
             Mods.Value = Playlist.FirstOrDefault()?.RequiredMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
-            freeMods.Value = Playlist.FirstOrDefault()?.AllowedMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
+            FreeMods.Value = Playlist.FirstOrDefault()?.AllowedMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
 
             Ruleset.BindValueChanged(onRulesetChanged);
         }
 
         private void onRulesetChanged(ValueChangedEvent<RulesetInfo> ruleset)
         {
-            freeMods.Value = Array.Empty<Mod>();
+            FreeMods.Value = Array.Empty<Mod>();
         }
 
         protected sealed override bool OnStart()
@@ -90,7 +91,7 @@ namespace osu.Game.Screens.OnlinePlay
             item.RequiredMods.AddRange(Mods.Value.Select(m => m.CreateCopy()));
 
             item.AllowedMods.Clear();
-            item.AllowedMods.AddRange(freeMods.Value.Select(m => m.CreateCopy()));
+            item.AllowedMods.AddRange(FreeMods.Value.Select(m => m.CreateCopy()));
 
             SelectItem(item);
             return true;
@@ -133,7 +134,7 @@ 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));
+            buttons.Insert(buttons.FindIndex(b => b.Item1 is FooterButtonMods) + 1, (new FooterButtonFreeMods { Current = FreeMods }, freeModSelectOverlay));
             return buttons;
         }
 

From fff1cb0b355e9b8984dbc950dd8d2d4412e01a94 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Feb 2021 15:13:57 +0900
Subject: [PATCH 1529/3722] Fix allowed mods not being copied when populating
 playlist items

---
 osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.cs
index 0e8db6dfe5..21335fc90c 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.cs
@@ -56,6 +56,9 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
 
             item.RequiredMods.Clear();
             item.RequiredMods.AddRange(Mods.Value.Select(m => m.CreateCopy()));
+
+            item.AllowedMods.Clear();
+            item.AllowedMods.AddRange(FreeMods.Value.Select(m => m.CreateCopy()));
         }
     }
 }

From 97a7572cb8daebc642cabe44e4ef8bbd1a0c97b4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Feb 2021 15:14:48 +0900
Subject: [PATCH 1530/3722] Move UserModSelectOverlay to RoomSubScreen for
 Playlists consumption

---
 .../Screens/OnlinePlay/Match/RoomSubScreen.cs | 68 ++++++++++++++++++-
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 49 +------------
 2 files changed, 67 insertions(+), 50 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index e755f8c405..24d42283f7 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -3,16 +3,20 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
+using osu.Game.Overlays.Mods;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Play;
 
@@ -25,6 +29,14 @@ namespace osu.Game.Screens.OnlinePlay.Match
 
         public override bool DisallowExternalBeatmapRulesetChanges => true;
 
+        private readonly ModSelectOverlay userModsSelectOverlay;
+
+        /// <summary>
+        /// A container that provides controls for selection of user mods.
+        /// This will be shown/hidden automatically when applicable.
+        /// </summary>
+        protected Drawable UserModsSection;
+
         private Sample sampleStart;
 
         [Resolved(typeof(Room), nameof(Room.Playlist))]
@@ -53,9 +65,26 @@ namespace osu.Game.Screens.OnlinePlay.Match
 
         protected RoomSubScreen()
         {
-            AddInternal(BeatmapAvailablilityTracker = new OnlinePlayBeatmapAvailablilityTracker
+            AddRangeInternal(new Drawable[]
             {
-                SelectedItem = { BindTarget = SelectedItem }
+                BeatmapAvailablilityTracker = new OnlinePlayBeatmapAvailablilityTracker
+                {
+                    SelectedItem = { BindTarget = SelectedItem }
+                },
+                new Container
+                {
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomLeft,
+                    Depth = float.MinValue,
+                    RelativeSizeAxes = Axes.Both,
+                    Height = 0.5f,
+                    Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING },
+                    Child = userModsSelectOverlay = new UserModSelectOverlay
+                    {
+                        SelectedMods = { BindTarget = UserMods },
+                        IsValidMod = _ => false
+                    }
+                },
             });
         }
 
@@ -73,7 +102,8 @@ namespace osu.Game.Screens.OnlinePlay.Match
             base.LoadComplete();
 
             SelectedItem.BindValueChanged(_ => Scheduler.AddOnce(selectedItemChanged));
-            SelectedItem.Value = Playlist.FirstOrDefault();
+
+            Playlist.BindCollectionChanged(onPlaylistChanged, true);
 
             managerUpdated = beatmapManager.ItemUpdated.GetBoundCopy();
             managerUpdated.BindValueChanged(beatmapUpdated);
@@ -81,6 +111,22 @@ namespace osu.Game.Screens.OnlinePlay.Match
             UserMods.BindValueChanged(_ => Scheduler.AddOnce(UpdateMods));
         }
 
+        public override bool OnBackButton()
+        {
+            if (userModsSelectOverlay.State.Value == Visibility.Visible)
+            {
+                userModsSelectOverlay.Hide();
+                return true;
+            }
+
+            return base.OnBackButton();
+        }
+
+        private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e) =>
+            SelectedItem.Value = Playlist.FirstOrDefault();
+
+        protected void ShowUserModSelect() => userModsSelectOverlay.Show();
+
         public override void OnEntering(IScreen last)
         {
             base.OnEntering(last);
@@ -131,6 +177,18 @@ namespace osu.Game.Screens.OnlinePlay.Match
             UpdateMods();
 
             Ruleset.Value = SelectedItem.Value.Ruleset.Value;
+
+            if (SelectedItem.Value?.AllowedMods.Any() != true)
+            {
+                UserModsSection?.Hide();
+                userModsSelectOverlay.Hide();
+                userModsSelectOverlay.IsValidMod = _ => false;
+            }
+            else
+            {
+                UserModsSection?.Show();
+                userModsSelectOverlay.IsValidMod = m => SelectedItem.Value.AllowedMods.Any(a => a.GetType() == m.GetType());
+            }
         }
 
         private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> weakSet) => Schedule(updateWorkingBeatmap);
@@ -190,5 +248,9 @@ namespace osu.Game.Screens.OnlinePlay.Match
                 track.RestartPoint = 0;
             }
         }
+
+        private class UserModSelectOverlay : LocalPlayerModSelectOverlay
+        {
+        }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 2f50bee677..49ac9f64ff 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Linq;
 using JetBrains.Annotations;
@@ -16,7 +15,6 @@ using osu.Framework.Threading;
 using osu.Game.Configuration;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
-using osu.Game.Overlays.Mods;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Screens.OnlinePlay.Match;
@@ -43,9 +41,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         [Resolved]
         private OngoingOperationTracker ongoingOperationTracker { get; set; }
 
-        private ModSelectOverlay userModsSelectOverlay;
         private MultiplayerMatchSettingsOverlay settingsOverlay;
-        private Drawable userModsSection;
 
         private IBindable<bool> isConnected;
 
@@ -155,7 +151,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                                                                             new BeatmapSelectionControl { RelativeSizeAxes = Axes.X }
                                                                         }
                                                                     },
-                                                                    userModsSection = new FillFlowContainer
+                                                                    UserModsSection = new FillFlowContainer
                                                                     {
                                                                         RelativeSizeAxes = Axes.X,
                                                                         AutoSizeAxes = Axes.Y,
@@ -176,7 +172,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                                                                                         Origin = Anchor.CentreLeft,
                                                                                         Width = 90,
                                                                                         Text = "Select",
-                                                                                        Action = () => userModsSelectOverlay.Show()
+                                                                                        Action = ShowUserModSelect,
                                                                                     },
                                                                                     new ModDisplay
                                                                                     {
@@ -231,19 +227,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                         new Dimension(GridSizeMode.AutoSize),
                     }
                 },
-                new Container
-                {
-                    Anchor = Anchor.BottomLeft,
-                    Origin = Anchor.BottomLeft,
-                    RelativeSizeAxes = Axes.Both,
-                    Height = 0.5f,
-                    Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING },
-                    Child = userModsSelectOverlay = new UserModSelectOverlay
-                    {
-                        SelectedMods = { BindTarget = UserMods },
-                        IsValidMod = _ => false
-                    }
-                },
                 settingsOverlay = new MultiplayerMatchSettingsOverlay
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -269,7 +252,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             base.LoadComplete();
 
-            Playlist.BindCollectionChanged(onPlaylistChanged, true);
             BeatmapAvailability.BindValueChanged(updateBeatmapAvailability, true);
             UserMods.BindValueChanged(onUserModsChanged);
 
@@ -303,32 +285,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 return true;
             }
 
-            if (userModsSelectOverlay.State.Value == Visibility.Visible)
-            {
-                userModsSelectOverlay.Hide();
-                return true;
-            }
-
             return base.OnBackButton();
         }
 
-        private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            SelectedItem.Value = Playlist.FirstOrDefault();
-
-            if (SelectedItem.Value?.AllowedMods.Any() != true)
-            {
-                userModsSection.Hide();
-                userModsSelectOverlay.Hide();
-                userModsSelectOverlay.IsValidMod = _ => false;
-            }
-            else
-            {
-                userModsSection.Show();
-                userModsSelectOverlay.IsValidMod = m => SelectedItem.Value.AllowedMods.Any(a => a.GetType() == m.GetType());
-            }
-        }
-
         private ModSettingChangeTracker modSettingChangeTracker;
         private ScheduledDelegate debouncedModSettingsUpdate;
 
@@ -433,9 +392,5 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             modSettingChangeTracker?.Dispose();
         }
-
-        private class UserModSelectOverlay : LocalPlayerModSelectOverlay
-        {
-        }
     }
 }

From fdcb6384cb808e3f616a73a8343c98c5956cacf7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Feb 2021 15:14:56 +0900
Subject: [PATCH 1531/3722] Add user mod selection to playlists room screen

---
 .../Playlists/PlaylistsRoomSubScreen.cs       | 46 ++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
index 88731a10bc..31c441bcd2 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
@@ -13,7 +13,9 @@ using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Screens.OnlinePlay.Match;
 using osu.Game.Screens.OnlinePlay.Match.Components;
+using osu.Game.Screens.Play.HUD;
 using osu.Game.Users;
+using osuTK;
 using Footer = osu.Game.Screens.OnlinePlay.Match.Components.Footer;
 
 namespace osu.Game.Screens.OnlinePlay.Playlists
@@ -140,13 +142,55 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                                                             RelativeSizeAxes = Axes.Both,
                                                             Content = new[]
                                                             {
-                                                                new Drawable[] { new OverlinedHeader("Leaderboard"), },
+                                                                new[]
+                                                                {
+                                                                    UserModsSection = new FillFlowContainer
+                                                                    {
+                                                                        RelativeSizeAxes = Axes.X,
+                                                                        AutoSizeAxes = Axes.Y,
+                                                                        Margin = new MarginPadding { Bottom = 10 },
+                                                                        Children = new Drawable[]
+                                                                        {
+                                                                            new OverlinedHeader("Extra mods"),
+                                                                            new FillFlowContainer
+                                                                            {
+                                                                                AutoSizeAxes = Axes.Both,
+                                                                                Direction = FillDirection.Horizontal,
+                                                                                Spacing = new Vector2(10, 0),
+                                                                                Children = new Drawable[]
+                                                                                {
+                                                                                    new PurpleTriangleButton
+                                                                                    {
+                                                                                        Anchor = Anchor.CentreLeft,
+                                                                                        Origin = Anchor.CentreLeft,
+                                                                                        Width = 90,
+                                                                                        Text = "Select",
+                                                                                        Action = ShowUserModSelect,
+                                                                                    },
+                                                                                    new ModDisplay
+                                                                                    {
+                                                                                        Anchor = Anchor.CentreLeft,
+                                                                                        Origin = Anchor.CentreLeft,
+                                                                                        DisplayUnrankedText = false,
+                                                                                        Current = UserMods,
+                                                                                        Scale = new Vector2(0.8f),
+                                                                                    },
+                                                                                }
+                                                                            }
+                                                                        }
+                                                                    },
+                                                                },
+                                                                new Drawable[]
+                                                                {
+                                                                    new OverlinedHeader("Leaderboard")
+                                                                },
                                                                 new Drawable[] { leaderboard = new MatchLeaderboard { RelativeSizeAxes = Axes.Both }, },
                                                                 new Drawable[] { new OverlinedHeader("Chat"), },
                                                                 new Drawable[] { new MatchChatDisplay { RelativeSizeAxes = Axes.Both } }
                                                             },
                                                             RowDimensions = new[]
                                                             {
+                                                                new Dimension(GridSizeMode.AutoSize),
                                                                 new Dimension(GridSizeMode.AutoSize),
                                                                 new Dimension(),
                                                                 new Dimension(GridSizeMode.AutoSize),

From f25b5147ef319c42329fd645490bf7ecc1907eb1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 16 Feb 2021 15:37:45 +0900
Subject: [PATCH 1532/3722] Select last playlist item in match subscreen

---
 .../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 c5130baa94..76608fb5c1 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -302,7 +302,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
-            SelectedItem.Value = Playlist.FirstOrDefault();
+            SelectedItem.Value = Playlist.LastOrDefault();
 
             if (SelectedItem.Value?.AllowedMods.Any() != true)
             {

From 855d24dce769ae8ab65bd8f2daadfe638e6a76d8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 16 Feb 2021 17:35:44 +0900
Subject: [PATCH 1533/3722] Cache selected item bindable from RoomSubScreen

---
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs |  1 +
 osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 2946d07588..6a2844fa74 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -21,6 +21,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
     [Cached(typeof(IPreviewTrackOwner))]
     public abstract class RoomSubScreen : OnlinePlaySubScreen, IPreviewTrackOwner
     {
+        [Cached(typeof(IBindable<PlaylistItem>))]
         protected readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
 
         public override bool DisallowExternalBeatmapRulesetChanges => true;
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
index b2f3e4a1d9..c1aa93526f 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
@@ -2,10 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Online.Rooms;
+using osu.Game.Screens.OnlinePlay.Match;
 using osu.Game.Users;
 
 namespace osu.Game.Screens.OnlinePlay
@@ -50,5 +52,13 @@ namespace osu.Game.Screens.OnlinePlay
 
         [Resolved(typeof(Room))]
         protected Bindable<TimeSpan?> Duration { get; private set; }
+
+        /// <summary>
+        /// The currently selected item in the <see cref="RoomSubScreen"/>.
+        /// May be null if this <see cref="OnlinePlayComposite"/> is not inside a <see cref="RoomSubScreen"/>.
+        /// </summary>
+        [CanBeNull]
+        [Resolved(typeof(Room), CanBeNull = true)]
+        protected IBindable<PlaylistItem> SelectedItem { get; private set; }
     }
 }

From 3ff9e14e35f851b32f40eb2339b6652beea37c2c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 16 Feb 2021 18:56:13 +0900
Subject: [PATCH 1534/3722] Make StatefulMultiplayerClient control current
 playlist item

---
 .../Multiplayer/MultiplayerRoomSettings.cs    | 12 +++++--
 .../Multiplayer/StatefulMultiplayerClient.cs  | 35 ++++++++++---------
 .../Screens/OnlinePlay/Match/RoomSubScreen.cs |  4 ---
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 13 ++++---
 .../Playlists/PlaylistsRoomSubScreen.cs       |  7 ++--
 5 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
index 4fb9d724b5..04752f4e6f 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
@@ -36,18 +36,26 @@ namespace osu.Game.Online.Multiplayer
         [Key(5)]
         public IEnumerable<APIMod> AllowedMods { get; set; } = Enumerable.Empty<APIMod>();
 
+        /// <summary>
+        /// Only used for client-side mutation.
+        /// </summary>
+        [Key(6)]
+        public int PlaylistItemId { get; set; }
+
         public bool Equals(MultiplayerRoomSettings other)
             => BeatmapID == other.BeatmapID
                && BeatmapChecksum == other.BeatmapChecksum
                && RequiredMods.SequenceEqual(other.RequiredMods)
                && AllowedMods.SequenceEqual(other.AllowedMods)
                && RulesetID == other.RulesetID
-               && Name.Equals(other.Name, StringComparison.Ordinal);
+               && Name.Equals(other.Name, StringComparison.Ordinal)
+               && PlaylistItemId == other.PlaylistItemId;
 
         public override string ToString() => $"Name:{Name}"
                                              + $" Beatmap:{BeatmapID} ({BeatmapChecksum})"
                                              + $" RequiredMods:{string.Join(',', RequiredMods)}"
                                              + $" AllowedMods:{string.Join(',', AllowedMods)}"
-                                             + $" Ruleset:{RulesetID}";
+                                             + $" Ruleset:{RulesetID}"
+                                             + $" Item:{PlaylistItemId}";
     }
 }
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 18464a5f61..f5f4c3a8ba 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -66,6 +66,8 @@ namespace osu.Game.Online.Multiplayer
         /// </summary>
         public readonly BindableList<int> CurrentMatchPlayingUserIds = new BindableList<int>();
 
+        public readonly Bindable<PlaylistItem?> CurrentMatchPlayingItem = new Bindable<PlaylistItem?>();
+
         /// <summary>
         /// The <see cref="MultiplayerRoomUser"/> corresponding to the local player, if available.
         /// </summary>
@@ -94,9 +96,6 @@ namespace osu.Game.Online.Multiplayer
 
         private Room? apiRoom;
 
-        // Todo: This is temporary, until the multiplayer server returns the item id on match start or otherwise.
-        private int playlistItemId;
-
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -142,7 +141,6 @@ namespace osu.Game.Online.Multiplayer
                 {
                     Room = joinedRoom;
                     apiRoom = room;
-                    playlistItemId = room.Playlist.SingleOrDefault()?.ID ?? 0;
                 }, cancellationSource.Token);
 
                 // Update room settings.
@@ -218,7 +216,8 @@ namespace osu.Game.Online.Multiplayer
                 BeatmapChecksum = item.GetOr(existingPlaylistItem).Beatmap.Value.MD5Hash,
                 RulesetID = item.GetOr(existingPlaylistItem).RulesetID,
                 RequiredMods = item.HasValue ? item.Value.AsNonNull().RequiredMods.Select(m => new APIMod(m)).ToList() : Room.Settings.RequiredMods,
-                AllowedMods = item.HasValue ? item.Value.AsNonNull().AllowedMods.Select(m => new APIMod(m)).ToList() : Room.Settings.AllowedMods
+                AllowedMods = item.HasValue ? item.Value.AsNonNull().AllowedMods.Select(m => new APIMod(m)).ToList() : Room.Settings.AllowedMods,
+                PlaylistItemId = Room.Settings.PlaylistItemId,
             });
         }
 
@@ -506,14 +505,13 @@ namespace osu.Game.Online.Multiplayer
             Room.Settings = settings;
             apiRoom.Name.Value = Room.Settings.Name;
 
-            // The playlist update is delayed until an online beatmap lookup (below) succeeds.
-            // In-order for the client to not display an outdated beatmap, the playlist is forcefully cleared here.
-            apiRoom.Playlist.Clear();
+            // The current item update is delayed until an online beatmap lookup (below) succeeds.
+            // In-order for the client to not display an outdated beatmap, the current item is forcefully cleared here.
+            CurrentMatchPlayingItem.Value = null;
 
             RoomUpdated?.Invoke();
 
             var req = new GetBeatmapSetRequest(settings.BeatmapID, BeatmapSetLookupType.BeatmapId);
-
             req.Success += res =>
             {
                 if (cancellationToken.IsCancellationRequested)
@@ -540,18 +538,21 @@ namespace osu.Game.Online.Multiplayer
             var mods = settings.RequiredMods.Select(m => m.ToMod(ruleset));
             var allowedMods = settings.AllowedMods.Select(m => m.ToMod(ruleset));
 
-            PlaylistItem playlistItem = new PlaylistItem
-            {
-                ID = playlistItemId,
-                Beatmap = { Value = beatmap },
-                Ruleset = { Value = ruleset.RulesetInfo },
-            };
+            // Update an existing playlist item from the API room, or create a new item.
+            var playlistItem = apiRoom.Playlist.FirstOrDefault(i => i.ID == settings.PlaylistItemId);
 
+            if (playlistItem == null)
+                apiRoom.Playlist.Add(playlistItem = new PlaylistItem());
+
+            playlistItem.ID = settings.PlaylistItemId;
+            playlistItem.Beatmap.Value = beatmap;
+            playlistItem.Ruleset.Value = ruleset.RulesetInfo;
+            playlistItem.RequiredMods.Clear();
             playlistItem.RequiredMods.AddRange(mods);
+            playlistItem.AllowedMods.Clear();
             playlistItem.AllowedMods.AddRange(allowedMods);
 
-            apiRoom.Playlist.Clear(); // Clearing should be unnecessary, but here for sanity.
-            apiRoom.Playlist.Add(playlistItem);
+            CurrentMatchPlayingItem.Value = playlistItem;
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 6a2844fa74..7740af9f63 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -28,9 +28,6 @@ namespace osu.Game.Screens.OnlinePlay.Match
 
         private Sample sampleStart;
 
-        [Resolved(typeof(Room), nameof(Room.Playlist))]
-        protected BindableList<PlaylistItem> Playlist { get; private set; }
-
         /// <summary>
         /// Any mods applied by/to the local user.
         /// </summary>
@@ -74,7 +71,6 @@ namespace osu.Game.Screens.OnlinePlay.Match
             base.LoadComplete();
 
             SelectedItem.BindValueChanged(_ => Scheduler.AddOnce(selectedItemChanged));
-            SelectedItem.Value = Playlist.FirstOrDefault();
 
             managerUpdated = beatmapManager.ItemUpdated.GetBoundCopy();
             managerUpdated.BindValueChanged(beatmapUpdated);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 76608fb5c1..f55b5b9713 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Linq;
 using JetBrains.Annotations;
@@ -269,7 +268,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             base.LoadComplete();
 
-            Playlist.BindCollectionChanged(onPlaylistChanged, true);
+            SelectedItem.BindValueChanged(onSelectedItemChanged);
+            SelectedItem.BindTo(client.CurrentMatchPlayingItem);
+
             BeatmapAvailability.BindValueChanged(updateBeatmapAvailability, true);
             UserMods.BindValueChanged(onUserModsChanged);
 
@@ -300,11 +301,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             return base.OnBackButton();
         }
 
-        private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e)
+        private void onSelectedItemChanged(ValueChangedEvent<PlaylistItem> item)
         {
-            SelectedItem.Value = Playlist.LastOrDefault();
-
-            if (SelectedItem.Value?.AllowedMods.Any() != true)
+            if (item.NewValue?.AllowedMods.Any() != true)
             {
                 userModsSection.Hide();
                 userModsSelectOverlay.Hide();
@@ -313,7 +312,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             else
             {
                 userModsSection.Show();
-                userModsSelectOverlay.IsValidMod = m => SelectedItem.Value.AllowedMods.Any(a => a.GetType() == m.GetType());
+                userModsSelectOverlay.IsValidMod = m => item.NewValue.AllowedMods.Any(a => a.GetType() == m.GetType());
             }
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
index 88731a10bc..b4870ab580 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
@@ -27,6 +27,9 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         [Resolved(typeof(Room), nameof(Room.RoomID))]
         private Bindable<int?> roomId { get; set; }
 
+        [Resolved(typeof(Room), nameof(Room.Playlist))]
+        private BindableList<PlaylistItem> playlist { get; set; }
+
         private MatchSettingsOverlay settingsOverlay;
         private MatchLeaderboard leaderboard;
 
@@ -117,7 +120,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                                                                         new DrawableRoomPlaylistWithResults
                                                                         {
                                                                             RelativeSizeAxes = Axes.Both,
-                                                                            Items = { BindTarget = Playlist },
+                                                                            Items = { BindTarget = playlist },
                                                                             SelectedItem = { BindTarget = SelectedItem },
                                                                             RequestShowResults = item =>
                                                                             {
@@ -222,7 +225,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
 
                     // Set the first playlist item.
                     // This is scheduled since updating the room and playlist may happen in an arbitrary order (via Room.CopyFrom()).
-                    Schedule(() => SelectedItem.Value = Playlist.FirstOrDefault());
+                    Schedule(() => SelectedItem.Value = playlist.FirstOrDefault());
                 }
             }, true);
         }

From 2a1096a3c8ca7a3c5f656963dcbcb2c6e7770eed Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 16 Feb 2021 19:02:16 +0900
Subject: [PATCH 1535/3722] Make BeatmapSelectionControl use the selected item

---
 .../Match/BeatmapSelectionControl.cs            | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
index f17e04d4d4..769596956b 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
@@ -1,14 +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.Collections.Specialized;
-using System.Linq;
+using System.Diagnostics;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Screens;
 using osu.Game.Online.API;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Match.Components;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
@@ -60,7 +61,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
         {
             base.LoadComplete();
 
-            Playlist.BindCollectionChanged(onPlaylistChanged, true);
+            Debug.Assert(SelectedItem != null);
+            SelectedItem.BindValueChanged(onSelectedItemChanged, true);
+
             Host.BindValueChanged(host =>
             {
                 if (RoomID.Value == null || host.NewValue?.Equals(api.LocalUser.Value) == true)
@@ -70,12 +73,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             }, true);
         }
 
-        private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e)
+        private void onSelectedItemChanged(ValueChangedEvent<PlaylistItem> selectedItem)
         {
-            if (Playlist.Any())
-                beatmapPanelContainer.Child = new DrawableRoomPlaylistItem(Playlist.Single(), false, false);
-            else
+            if (selectedItem.NewValue == null)
                 beatmapPanelContainer.Clear();
+            else
+                beatmapPanelContainer.Child = new DrawableRoomPlaylistItem(selectedItem.NewValue, false, false);
         }
     }
 }

From e24a5949c5a61c105e9f4670c07cdbccf0d7def6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 16 Feb 2021 19:26:51 +0900
Subject: [PATCH 1536/3722] Fix resolve

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

diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
index c1aa93526f..4c4b1ff6d0 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Screens.OnlinePlay
         /// May be null if this <see cref="OnlinePlayComposite"/> is not inside a <see cref="RoomSubScreen"/>.
         /// </summary>
         [CanBeNull]
-        [Resolved(typeof(Room), CanBeNull = true)]
+        [Resolved(CanBeNull = true)]
         protected IBindable<PlaylistItem> SelectedItem { get; private set; }
     }
 }

From 3e802531d384761c0be4eeabed1d9c923ada7fc0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 16 Feb 2021 19:29:40 +0900
Subject: [PATCH 1537/3722] Use long type where required in multiplayer

---
 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs  | 2 +-
 osu.Game/Online/Rooms/CreateRoomScoreRequest.cs           | 6 +++---
 osu.Game/Online/Rooms/GetRoomLeaderboardRequest.cs        | 4 ++--
 osu.Game/Online/Rooms/GetRoomRequest.cs                   | 4 ++--
 osu.Game/Online/Rooms/IndexPlaylistScoresRequest.cs       | 8 ++++----
 osu.Game/Online/Rooms/MultiplayerScore.cs                 | 2 +-
 osu.Game/Online/Rooms/PlaylistItem.cs                     | 2 +-
 osu.Game/Online/Rooms/Room.cs                             | 2 +-
 osu.Game/Online/Rooms/ShowPlaylistUserScoreRequest.cs     | 6 +++---
 osu.Game/Online/Rooms/SubmitRoomScoreRequest.cs           | 8 ++++----
 osu.Game/Screens/OnlinePlay/Components/RoomManager.cs     | 2 +-
 .../OnlinePlay/Match/Components/MatchChatDisplay.cs       | 2 +-
 .../OnlinePlay/Match/Components/MatchLeaderboard.cs       | 2 +-
 .../Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs  | 2 +-
 .../OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs    | 2 +-
 osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs        | 2 +-
 osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs  | 2 +-
 .../OnlinePlay/Playlists/PlaylistsResultsScreen.cs        | 4 ++--
 .../OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs        | 2 +-
 19 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 18464a5f61..639dce9230 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Online.Multiplayer
         private Room? apiRoom;
 
         // Todo: This is temporary, until the multiplayer server returns the item id on match start or otherwise.
-        private int playlistItemId;
+        private long playlistItemId;
 
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game/Online/Rooms/CreateRoomScoreRequest.cs b/osu.Game/Online/Rooms/CreateRoomScoreRequest.cs
index afd0dadc7e..d4303e77df 100644
--- a/osu.Game/Online/Rooms/CreateRoomScoreRequest.cs
+++ b/osu.Game/Online/Rooms/CreateRoomScoreRequest.cs
@@ -9,11 +9,11 @@ namespace osu.Game.Online.Rooms
 {
     public class CreateRoomScoreRequest : APIRequest<APIScoreToken>
     {
-        private readonly int roomId;
-        private readonly int playlistItemId;
+        private readonly long roomId;
+        private readonly long playlistItemId;
         private readonly string versionHash;
 
-        public CreateRoomScoreRequest(int roomId, int playlistItemId, string versionHash)
+        public CreateRoomScoreRequest(long roomId, long playlistItemId, string versionHash)
         {
             this.roomId = roomId;
             this.playlistItemId = playlistItemId;
diff --git a/osu.Game/Online/Rooms/GetRoomLeaderboardRequest.cs b/osu.Game/Online/Rooms/GetRoomLeaderboardRequest.cs
index 15f1221a00..67e2a2b27f 100644
--- a/osu.Game/Online/Rooms/GetRoomLeaderboardRequest.cs
+++ b/osu.Game/Online/Rooms/GetRoomLeaderboardRequest.cs
@@ -7,9 +7,9 @@ namespace osu.Game.Online.Rooms
 {
     public class GetRoomLeaderboardRequest : APIRequest<APILeaderboard>
     {
-        private readonly int roomId;
+        private readonly long roomId;
 
-        public GetRoomLeaderboardRequest(int roomId)
+        public GetRoomLeaderboardRequest(long roomId)
         {
             this.roomId = roomId;
         }
diff --git a/osu.Game/Online/Rooms/GetRoomRequest.cs b/osu.Game/Online/Rooms/GetRoomRequest.cs
index ce117075c7..853873901e 100644
--- a/osu.Game/Online/Rooms/GetRoomRequest.cs
+++ b/osu.Game/Online/Rooms/GetRoomRequest.cs
@@ -7,9 +7,9 @@ namespace osu.Game.Online.Rooms
 {
     public class GetRoomRequest : APIRequest<Room>
     {
-        public readonly int RoomId;
+        public readonly long RoomId;
 
-        public GetRoomRequest(int roomId)
+        public GetRoomRequest(long roomId)
         {
             RoomId = roomId;
         }
diff --git a/osu.Game/Online/Rooms/IndexPlaylistScoresRequest.cs b/osu.Game/Online/Rooms/IndexPlaylistScoresRequest.cs
index 43f80a2dc4..abce2093e3 100644
--- a/osu.Game/Online/Rooms/IndexPlaylistScoresRequest.cs
+++ b/osu.Game/Online/Rooms/IndexPlaylistScoresRequest.cs
@@ -15,8 +15,8 @@ namespace osu.Game.Online.Rooms
     /// </summary>
     public class IndexPlaylistScoresRequest : APIRequest<IndexedMultiplayerScores>
     {
-        public readonly int RoomId;
-        public readonly int PlaylistItemId;
+        public readonly long RoomId;
+        public readonly long PlaylistItemId;
 
         [CanBeNull]
         public readonly Cursor Cursor;
@@ -24,13 +24,13 @@ namespace osu.Game.Online.Rooms
         [CanBeNull]
         public readonly IndexScoresParams IndexParams;
 
-        public IndexPlaylistScoresRequest(int roomId, int playlistItemId)
+        public IndexPlaylistScoresRequest(long roomId, long playlistItemId)
         {
             RoomId = roomId;
             PlaylistItemId = playlistItemId;
         }
 
-        public IndexPlaylistScoresRequest(int roomId, int playlistItemId, [NotNull] Cursor cursor, [NotNull] IndexScoresParams indexParams)
+        public IndexPlaylistScoresRequest(long roomId, long playlistItemId, [NotNull] Cursor cursor, [NotNull] IndexScoresParams indexParams)
             : this(roomId, playlistItemId)
         {
             Cursor = cursor;
diff --git a/osu.Game/Online/Rooms/MultiplayerScore.cs b/osu.Game/Online/Rooms/MultiplayerScore.cs
index 677a3d3026..30c1d2f826 100644
--- a/osu.Game/Online/Rooms/MultiplayerScore.cs
+++ b/osu.Game/Online/Rooms/MultiplayerScore.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Online.Rooms
     public class MultiplayerScore
     {
         [JsonProperty("id")]
-        public int ID { get; set; }
+        public long ID { get; set; }
 
         [JsonProperty("user")]
         public User User { get; set; }
diff --git a/osu.Game/Online/Rooms/PlaylistItem.cs b/osu.Game/Online/Rooms/PlaylistItem.cs
index ada2140ca6..61982101c1 100644
--- a/osu.Game/Online/Rooms/PlaylistItem.cs
+++ b/osu.Game/Online/Rooms/PlaylistItem.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Online.Rooms
     public class PlaylistItem : IEquatable<PlaylistItem>
     {
         [JsonProperty("id")]
-        public int ID { get; set; }
+        public long ID { get; set; }
 
         [JsonProperty("beatmap_id")]
         public int BeatmapID { get; set; }
diff --git a/osu.Game/Online/Rooms/Room.cs b/osu.Game/Online/Rooms/Room.cs
index 763ba25d52..997f45ce52 100644
--- a/osu.Game/Online/Rooms/Room.cs
+++ b/osu.Game/Online/Rooms/Room.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Online.Rooms
     {
         [Cached]
         [JsonProperty("id")]
-        public readonly Bindable<int?> RoomID = new Bindable<int?>();
+        public readonly Bindable<long?> RoomID = new Bindable<long?>();
 
         [Cached]
         [JsonProperty("name")]
diff --git a/osu.Game/Online/Rooms/ShowPlaylistUserScoreRequest.cs b/osu.Game/Online/Rooms/ShowPlaylistUserScoreRequest.cs
index 3f728a5417..ba3e3c6349 100644
--- a/osu.Game/Online/Rooms/ShowPlaylistUserScoreRequest.cs
+++ b/osu.Game/Online/Rooms/ShowPlaylistUserScoreRequest.cs
@@ -7,11 +7,11 @@ namespace osu.Game.Online.Rooms
 {
     public class ShowPlaylistUserScoreRequest : APIRequest<MultiplayerScore>
     {
-        private readonly int roomId;
-        private readonly int playlistItemId;
+        private readonly long roomId;
+        private readonly long playlistItemId;
         private readonly long userId;
 
-        public ShowPlaylistUserScoreRequest(int roomId, int playlistItemId, long userId)
+        public ShowPlaylistUserScoreRequest(long roomId, long playlistItemId, long userId)
         {
             this.roomId = roomId;
             this.playlistItemId = playlistItemId;
diff --git a/osu.Game/Online/Rooms/SubmitRoomScoreRequest.cs b/osu.Game/Online/Rooms/SubmitRoomScoreRequest.cs
index 5a78b9fabd..9e432fa99e 100644
--- a/osu.Game/Online/Rooms/SubmitRoomScoreRequest.cs
+++ b/osu.Game/Online/Rooms/SubmitRoomScoreRequest.cs
@@ -11,12 +11,12 @@ namespace osu.Game.Online.Rooms
 {
     public class SubmitRoomScoreRequest : APIRequest<MultiplayerScore>
     {
-        private readonly int scoreId;
-        private readonly int roomId;
-        private readonly int playlistItemId;
+        private readonly long scoreId;
+        private readonly long roomId;
+        private readonly long playlistItemId;
         private readonly ScoreInfo scoreInfo;
 
-        public SubmitRoomScoreRequest(int scoreId, int roomId, int playlistItemId, ScoreInfo scoreInfo)
+        public SubmitRoomScoreRequest(long scoreId, long roomId, long playlistItemId, ScoreInfo scoreInfo)
         {
             this.scoreId = scoreId;
             this.roomId = roomId;
diff --git a/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs b/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
index 2ed259e2b8..227a772b2d 100644
--- a/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
@@ -116,7 +116,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
             joinedRoom.Value = null;
         }
 
-        private readonly HashSet<int> ignoredRooms = new HashSet<int>();
+        private readonly HashSet<long> ignoredRooms = new HashSet<long>();
 
         private void onRoomsReceived(List<Room> received)
         {
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
index 6da2866236..a96d64cb5d 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
     public class MatchChatDisplay : StandAloneChatDisplay
     {
         [Resolved(typeof(Room), nameof(Room.RoomID))]
-        private Bindable<int?> roomId { get; set; }
+        private Bindable<long?> roomId { get; set; }
 
         [Resolved(typeof(Room), nameof(Room.ChannelId))]
         private Bindable<int> channelId { get; set; }
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboard.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboard.cs
index 50869f42ff..134e083c42 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboard.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboard.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
     public class MatchLeaderboard : Leaderboard<MatchLeaderboardScope, APIUserScoreAggregate>
     {
         [Resolved(typeof(Room), nameof(Room.RoomID))]
-        private Bindable<int?> roomId { get; set; }
+        private Bindable<long?> roomId { get; set; }
 
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
index f0064ae0b4..3199232f6f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
@@ -357,7 +357,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
         public class CreateOrUpdateButton : TriangleButton
         {
             [Resolved(typeof(Room), nameof(Room.RoomID))]
-            private Bindable<int?> roomId { get; set; }
+            private Bindable<long?> roomId { get; set; }
 
             protected override void LoadComplete()
             {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs
index e3b47b3254..140b3c45d8 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
     public class MultiplayerResultsScreen : PlaylistsResultsScreen
     {
-        public MultiplayerResultsScreen(ScoreInfo score, int roomId, PlaylistItem playlistItem)
+        public MultiplayerResultsScreen(ScoreInfo score, long roomId, PlaylistItem playlistItem)
             : base(score, roomId, playlistItem, false, false)
         {
         }
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
index b2f3e4a1d9..239db18a07 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Screens.OnlinePlay
     public class OnlinePlayComposite : CompositeDrawable
     {
         [Resolved(typeof(Room))]
-        protected Bindable<int?> RoomID { get; private set; }
+        protected Bindable<long?> RoomID { get; private set; }
 
         [Resolved(typeof(Room), nameof(Room.Name))]
         protected Bindable<string> RoomName { get; private set; }
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
index 38eae2346a..ddc88261f7 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         public Action Exited;
 
         [Resolved(typeof(Room), nameof(Room.RoomID))]
-        protected Bindable<int?> RoomId { get; private set; }
+        protected Bindable<long?> RoomId { get; private set; }
 
         protected readonly PlaylistItem PlaylistItem;
 
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsResultsScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsResultsScreen.cs
index e13c8a9f82..2b252f9db7 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsResultsScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsResultsScreen.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
 {
     public class PlaylistsResultsScreen : ResultsScreen
     {
-        private readonly int roomId;
+        private readonly long roomId;
         private readonly PlaylistItem playlistItem;
 
         protected LoadingSpinner LeftSpinner { get; private set; }
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        public PlaylistsResultsScreen(ScoreInfo score, int roomId, PlaylistItem playlistItem, bool allowRetry, bool allowWatchingReplay = true)
+        public PlaylistsResultsScreen(ScoreInfo score, long roomId, PlaylistItem playlistItem, bool allowRetry, bool allowWatchingReplay = true)
             : base(score, allowRetry, allowWatchingReplay)
         {
             this.roomId = roomId;
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
index 88731a10bc..9ccf4775d0 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         public override string ShortTitle => "playlist";
 
         [Resolved(typeof(Room), nameof(Room.RoomID))]
-        private Bindable<int?> roomId { get; set; }
+        private Bindable<long?> roomId { get; set; }
 
         private MatchSettingsOverlay settingsOverlay;
         private MatchLeaderboard leaderboard;

From ffa90c1a2373b7d1c774f5d355a43452c9d19667 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 16 Feb 2021 20:23:19 +0900
Subject: [PATCH 1538/3722] Remove whitespace

---
 osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs b/osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs
index c7d4ccd12e..1fcf7f2277 100644
--- a/osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs
@@ -56,7 +56,6 @@ namespace osu.Game.Screens.OnlinePlay.Components
                     attemptDisplay.Text += $" ({remaining} remaining)";
                 }
             }
-
             else
             {
                 attemptDisplay.Text = string.Empty;

From 100097d78f0b28c66a86d9d8a4b8bbe309964429 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 16 Feb 2021 21:32:35 +0900
Subject: [PATCH 1539/3722] Fix playlist not being handled correctly for
 non-joined cases

---
 .../Multiplayer/StatefulMultiplayerClient.cs       |  8 ++++----
 .../Multiplayer/Match/BeatmapSelectionControl.cs   | 14 +++++++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index f5f4c3a8ba..e9eb80e6a1 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -539,10 +539,7 @@ namespace osu.Game.Online.Multiplayer
             var allowedMods = settings.AllowedMods.Select(m => m.ToMod(ruleset));
 
             // Update an existing playlist item from the API room, or create a new item.
-            var playlistItem = apiRoom.Playlist.FirstOrDefault(i => i.ID == settings.PlaylistItemId);
-
-            if (playlistItem == null)
-                apiRoom.Playlist.Add(playlistItem = new PlaylistItem());
+            var playlistItem = apiRoom.Playlist.FirstOrDefault(i => i.ID == settings.PlaylistItemId) ?? new PlaylistItem();
 
             playlistItem.ID = settings.PlaylistItemId;
             playlistItem.Beatmap.Value = beatmap;
@@ -552,6 +549,9 @@ namespace osu.Game.Online.Multiplayer
             playlistItem.AllowedMods.Clear();
             playlistItem.AllowedMods.AddRange(allowedMods);
 
+            if (!apiRoom.Playlist.Contains(playlistItem))
+                apiRoom.Playlist.Add(playlistItem);
+
             CurrentMatchPlayingItem.Value = playlistItem;
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
index 769596956b..8d394f2c2b 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
@@ -2,8 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Diagnostics;
+using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
@@ -62,7 +62,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             base.LoadComplete();
 
             Debug.Assert(SelectedItem != null);
-            SelectedItem.BindValueChanged(onSelectedItemChanged, true);
+            SelectedItem.BindValueChanged(_ => updateBeatmap());
+            Playlist.BindCollectionChanged((_, __) => updateBeatmap(), true);
 
             Host.BindValueChanged(host =>
             {
@@ -73,12 +74,15 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             }, true);
         }
 
-        private void onSelectedItemChanged(ValueChangedEvent<PlaylistItem> selectedItem)
+        private void updateBeatmap()
         {
-            if (selectedItem.NewValue == null)
+            Debug.Assert(SelectedItem != null);
+            PlaylistItem item = SelectedItem.Value ?? Playlist.FirstOrDefault();
+
+            if (item == null)
                 beatmapPanelContainer.Clear();
             else
-                beatmapPanelContainer.Child = new DrawableRoomPlaylistItem(selectedItem.NewValue, false, false);
+                beatmapPanelContainer.Child = new DrawableRoomPlaylistItem(item, false, false);
         }
     }
 }

From f61b8e6154c596a33f43dceed8f55b35ce479f58 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 16 Feb 2021 21:32:38 +0900
Subject: [PATCH 1540/3722] Change to long

---
 osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
index 04752f4e6f..473382cf5f 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Online.Multiplayer
         /// Only used for client-side mutation.
         /// </summary>
         [Key(6)]
-        public int PlaylistItemId { get; set; }
+        public long PlaylistItemId { get; set; }
 
         public bool Equals(MultiplayerRoomSettings other)
             => BeatmapID == other.BeatmapID

From 8f72631c314f576fb5e9b8ff0473ca23906a4f8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 16 Feb 2021 21:48:19 +0100
Subject: [PATCH 1541/3722] Fix typo in comment

---
 .../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 2f50bee677..3f3fee1b79 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -290,7 +290,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 return;
 
             // update local mods based on room's reported status for the local user (omitting the base call implementation).
-            // this makes the server authoritative, and avoids the local user potentially settings mods that the server is not aware of (ie. if the match was started during the selection being changed).
+            // this makes the server authoritative, and avoids the local user potentially setting mods that the server is not aware of (ie. if the match was started during the selection being changed).
             var ruleset = Ruleset.Value.CreateInstance();
             Mods.Value = client.LocalUser.Mods.Select(m => m.ToMod(ruleset)).Concat(SelectedItem.Value.RequiredMods).ToList();
         }

From 3b4e02e5c78fd77325f188c0379785e47b61d6aa Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 17 Feb 2021 07:29:45 +0300
Subject: [PATCH 1542/3722] Fix user population not immediate on bracket
 loading

---
 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 4224da4bbe..327d8f67b8 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -152,7 +152,7 @@ namespace osu.Game.Tournament
                 {
                     if (string.IsNullOrEmpty(p.Username) || p.Statistics == null)
                     {
-                        PopulateUser(p);
+                        PopulateUser(p, immediate: true);
                         addedInfo = true;
                     }
                 }
@@ -211,7 +211,7 @@ namespace osu.Game.Tournament
             return addedInfo;
         }
 
-        public void PopulateUser(User user, Action success = null, Action failure = null)
+        public void PopulateUser(User user, Action success = null, Action failure = null, bool immediate = false)
         {
             var req = new GetUserRequest(user.Id, Ruleset.Value);
 
@@ -231,7 +231,10 @@ namespace osu.Game.Tournament
                 failure?.Invoke();
             };
 
-            API.Queue(req);
+            if (immediate)
+                API.Perform(req);
+            else
+                API.Queue(req);
         }
 
         protected override void LoadComplete()

From 705e9267497bc1eec01da9d73ec2630ad2be327d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 17 Feb 2021 07:48:23 +0300
Subject: [PATCH 1543/3722] Fix attempting to populate users with invalid IDs

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

diff --git a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
index 582f72429b..263bbc533c 100644
--- a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
@@ -277,7 +277,8 @@ namespace osu.Game.Tournament.Screens.Editors
                         userId.Value = user.Id.ToString();
                         userId.BindValueChanged(idString =>
                         {
-                            int.TryParse(idString.NewValue, out var parsed);
+                            if (!(int.TryParse(idString.NewValue, out var parsed)))
+                                return;
 
                             user.Id = parsed;
 

From 85ebc8e06cd45be8e66f40c059dac6b20c926cc8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 17 Feb 2021 07:49:28 +0300
Subject: [PATCH 1544/3722] Fix potentially overwriting user ID from failed
 request

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

diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 327d8f67b8..0b101f050f 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -225,11 +225,7 @@ namespace osu.Game.Tournament
                 success?.Invoke();
             };
 
-            req.Failure += _ =>
-            {
-                user.Id = 1;
-                failure?.Invoke();
-            };
+            req.Failure += _ => failure?.Invoke();
 
             if (immediate)
                 API.Perform(req);

From 9a7b6ebe5058ea4afb2fc17ad6b62b838caff187 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 17 Feb 2021 14:30:52 +0900
Subject: [PATCH 1545/3722] Fix missed occurrence

---
 osu.Game/Online/API/Requests/Responses/APIUserScoreAggregate.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/Requests/Responses/APIUserScoreAggregate.cs b/osu.Game/Online/API/Requests/Responses/APIUserScoreAggregate.cs
index bcc8721400..172fa3a583 100644
--- a/osu.Game/Online/API/Requests/Responses/APIUserScoreAggregate.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIUserScoreAggregate.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Online.API.Requests.Responses
         public double? PP { get; set; }
 
         [JsonProperty(@"room_id")]
-        public int RoomID { get; set; }
+        public long RoomID { get; set; }
 
         [JsonProperty("total_score")]
         public long TotalScore { get; set; }

From a845e96b7a8a6eb55615c38567e5a1716b334008 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 17 Feb 2021 08:50:48 +0300
Subject: [PATCH 1546/3722] Replace `Ranks.Global` completely with a
 `GlobalRank` property

---
 osu.Desktop/DiscordRichPresence.cs               |  2 +-
 .../TestSceneMultiplayerParticipantsList.cs      | 10 ++--------
 .../Visual/Online/TestSceneRankGraph.cs          | 10 +++++-----
 .../Visual/Online/TestSceneUserProfileOverlay.cs |  3 ++-
 osu.Game.Tournament.Tests/TournamentTestScene.cs | 10 +++++-----
 osu.Game.Tournament/Models/TournamentTeam.cs     |  2 +-
 .../Screens/TeamIntro/SeedingScreen.cs           |  2 +-
 osu.Game.Tournament/TournamentGameBase.cs        |  2 +-
 .../Profile/Header/CentreHeaderContainer.cs      |  2 +-
 .../Profile/Header/DetailHeaderContainer.cs      |  2 +-
 .../Multiplayer/Participants/ParticipantPanel.cs |  2 +-
 osu.Game/Users/UserStatistics.cs                 | 16 +++++-----------
 12 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/osu.Desktop/DiscordRichPresence.cs b/osu.Desktop/DiscordRichPresence.cs
index 63b12fb84b..832d26b0ef 100644
--- a/osu.Desktop/DiscordRichPresence.cs
+++ b/osu.Desktop/DiscordRichPresence.cs
@@ -105,7 +105,7 @@ namespace osu.Desktop
             if (privacyMode.Value == DiscordRichPresenceMode.Limited)
                 presence.Assets.LargeImageText = string.Empty;
             else
-                presence.Assets.LargeImageText = $"{user.Value.Username}" + (user.Value.Statistics?.Ranks.Global > 0 ? $" (rank #{user.Value.Statistics.Ranks.Global:N0})" : string.Empty);
+                presence.Assets.LargeImageText = $"{user.Value.Username}" + (user.Value.Statistics?.GlobalRank > 0 ? $" (rank #{user.Value.Statistics.GlobalRank:N0})" : string.Empty);
 
             // update ruleset
             presence.Assets.SmallImageKey = ruleset.Value.ID <= 3 ? $"mode_{ruleset.Value.ID}" : "mode_custom";
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index 1e14bbbbea..e713cff233 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
@@ -160,10 +160,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                         {
                             {
                                 Ruleset.Value.ShortName,
-                                new UserStatistics
-                                {
-                                    Ranks = new UserStatistics.UserRanks { Global = RNG.Next(1, 100000) }
-                                }
+                                new UserStatistics { GlobalRank = RNG.Next(1, 100000), }
                             }
                         },
                         CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
@@ -207,10 +204,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     {
                         {
                             Ruleset.Value.ShortName,
-                            new UserStatistics
-                            {
-                                Ranks = new UserStatistics.UserRanks { Global = RNG.Next(1, 100000) }
-                            }
+                            new UserStatistics { GlobalRank = RNG.Next(1, 100000), }
                         }
                     },
                     CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankGraph.cs b/osu.Game.Tests/Visual/Online/TestSceneRankGraph.cs
index 3b31192259..5bf9e31309 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankGraph.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankGraph.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Tests.Visual.Online
             {
                 graph.Statistics.Value = new UserStatistics
                 {
-                    Ranks = new UserStatistics.UserRanks { Global = 123456 },
+                    GlobalRank = 123456,
                     PP = 12345,
                 };
             });
@@ -79,7 +79,7 @@ namespace osu.Game.Tests.Visual.Online
             {
                 graph.Statistics.Value = new UserStatistics
                 {
-                    Ranks = new UserStatistics.UserRanks { Global = 89000 },
+                    GlobalRank = 89000,
                     PP = 12345,
                     RankHistory = new User.RankHistoryData
                     {
@@ -92,7 +92,7 @@ namespace osu.Game.Tests.Visual.Online
             {
                 graph.Statistics.Value = new UserStatistics
                 {
-                    Ranks = new UserStatistics.UserRanks { Global = 89000 },
+                    GlobalRank = 89000,
                     PP = 12345,
                     RankHistory = new User.RankHistoryData
                     {
@@ -105,7 +105,7 @@ namespace osu.Game.Tests.Visual.Online
             {
                 graph.Statistics.Value = new UserStatistics
                 {
-                    Ranks = new UserStatistics.UserRanks { Global = 12000 },
+                    GlobalRank = 12000,
                     PP = 12345,
                     RankHistory = new User.RankHistoryData
                     {
@@ -118,7 +118,7 @@ namespace osu.Game.Tests.Visual.Online
             {
                 graph.Statistics.Value = new UserStatistics
                 {
-                    Ranks = new UserStatistics.UserRanks { Global = 12000 },
+                    GlobalRank = 12000,
                     PP = 12345,
                     RankHistory = new User.RankHistoryData
                     {
diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
index 7ade24f4de..b52cc6edb6 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
@@ -33,7 +33,8 @@ namespace osu.Game.Tests.Visual.Online
             ProfileOrder = new[] { "me" },
             Statistics = new UserStatistics
             {
-                Ranks = new UserStatistics.UserRanks { Global = 2148, Country = 1 },
+                GlobalRank = 2148,
+                Ranks = new UserStatistics.UserRanks { Country = 1, },
                 PP = 4567.89m,
                 Level = new UserStatistics.LevelInfo
                 {
diff --git a/osu.Game.Tournament.Tests/TournamentTestScene.cs b/osu.Game.Tournament.Tests/TournamentTestScene.cs
index 47d2160561..cdfd19c157 100644
--- a/osu.Game.Tournament.Tests/TournamentTestScene.cs
+++ b/osu.Game.Tournament.Tests/TournamentTestScene.cs
@@ -113,11 +113,11 @@ namespace osu.Game.Tournament.Tests
                     },
                     Players =
                     {
-                        new User { Username = "Hello", Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 12 } } },
-                        new User { Username = "Hello", Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 16 } } },
-                        new User { Username = "Hello", Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 20 } } },
-                        new User { Username = "Hello", Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 24 } } },
-                        new User { Username = "Hello", Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 30 } } },
+                        new User { Username = "Hello", Statistics = new UserStatistics { GlobalRank = 12 } },
+                        new User { Username = "Hello", Statistics = new UserStatistics { GlobalRank = 16 } },
+                        new User { Username = "Hello", Statistics = new UserStatistics { GlobalRank = 20 } },
+                        new User { Username = "Hello", Statistics = new UserStatistics { GlobalRank = 24 } },
+                        new User { Username = "Hello", Statistics = new UserStatistics { GlobalRank = 30 } },
                     }
                 }
             },
diff --git a/osu.Game.Tournament/Models/TournamentTeam.cs b/osu.Game.Tournament/Models/TournamentTeam.cs
index 7fca75cea4..7074ae413c 100644
--- a/osu.Game.Tournament/Models/TournamentTeam.cs
+++ b/osu.Game.Tournament/Models/TournamentTeam.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Tournament.Models
         {
             get
             {
-                var ranks = Players.Select(p => p.Statistics?.Ranks.Global)
+                var ranks = Players.Select(p => p.Statistics?.GlobalRank)
                                    .Where(i => i.HasValue)
                                    .Select(i => i.Value)
                                    .ToArray();
diff --git a/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs b/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
index 55fc80dba2..4f66d89b7f 100644
--- a/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
@@ -250,7 +250,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
                 };
 
                 foreach (var p in team.Players)
-                    fill.Add(new RowDisplay(p.Username, p.Statistics?.Ranks.Global?.ToString("\\##,0") ?? "-"));
+                    fill.Add(new RowDisplay(p.Username, p.Statistics?.GlobalRank?.ToString("\\##,0") ?? "-"));
             }
 
             internal class RowDisplay : CompositeDrawable
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 0b101f050f..3a2a880811 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -150,7 +150,7 @@ namespace osu.Game.Tournament
             {
                 foreach (var p in t.Players)
                 {
-                    if (string.IsNullOrEmpty(p.Username) || p.Statistics == null)
+                    if (string.IsNullOrEmpty(p.Username) || p.Statistics?.GlobalRank == null)
                     {
                         PopulateUser(p, immediate: true);
                         addedInfo = true;
diff --git a/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
index 04a1040e06..9285e2d875 100644
--- a/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
@@ -144,7 +144,7 @@ namespace osu.Game.Overlays.Profile.Header
 
         private void updateDisplay(User user)
         {
-            hiddenDetailGlobal.Content = user?.Statistics?.Ranks.Global?.ToString("\\##,##0") ?? "-";
+            hiddenDetailGlobal.Content = user?.Statistics?.GlobalRank?.ToString("\\##,##0") ?? "-";
             hiddenDetailCountry.Content = user?.Statistics?.Ranks.Country?.ToString("\\##,##0") ?? "-";
         }
     }
diff --git a/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs
index cf6ae1a3fc..05a0508e1f 100644
--- a/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs
@@ -176,7 +176,7 @@ namespace osu.Game.Overlays.Profile.Header
             foreach (var scoreRankInfo in scoreRankInfos)
                 scoreRankInfo.Value.RankCount = user?.Statistics?.GradesCount[scoreRankInfo.Key] ?? 0;
 
-            detailGlobalRank.Content = user?.Statistics?.Ranks.Global?.ToString("\\##,##0") ?? "-";
+            detailGlobalRank.Content = user?.Statistics?.GlobalRank?.ToString("\\##,##0") ?? "-";
             detailCountryRank.Content = user?.Statistics?.Ranks.Country?.ToString("\\##,##0") ?? "-";
 
             rankGraph.Statistics.Value = user?.Statistics;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index c4d11676e7..25bc314f1b 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -165,7 +165,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 
             var ruleset = rulesets.GetRuleset(Room.Settings.RulesetID);
 
-            var currentModeRank = User.User?.RulesetsStatistics?.GetValueOrDefault(ruleset.ShortName)?.Ranks.Global;
+            var currentModeRank = User.User?.RulesetsStatistics?.GetValueOrDefault(ruleset.ShortName)?.GlobalRank;
             userRankText.Text = currentModeRank != null ? $"#{currentModeRank.Value:N0}" : string.Empty;
 
             userStateDisplay.UpdateStatus(User.State, User.BeatmapAvailability);
diff --git a/osu.Game/Users/UserStatistics.cs b/osu.Game/Users/UserStatistics.cs
index 1fed908c39..e50ca57d90 100644
--- a/osu.Game/Users/UserStatistics.cs
+++ b/osu.Game/Users/UserStatistics.cs
@@ -26,17 +26,14 @@ namespace osu.Game.Users
             public int Progress;
         }
 
+        [JsonProperty(@"global_rank")]
+        public int? GlobalRank;
+
+        // eventually UserRanks object will be completely replaced with separate global rank (exists) and country rank properties
+        // see https://github.com/ppy/osu-web/blob/cb79bb72186c8f1a25f6a6f5ef315123decb4231/app/Transformers/UserStatisticsTransformer.php#L53.
         [JsonProperty(@"rank")]
         public UserRanks Ranks;
 
-        // eventually UserRanks object will be completely replaced with separate global and country rank properties, see https://github.com/ppy/osu-web/blob/cb79bb72186c8f1a25f6a6f5ef315123decb4231/app/Transformers/UserStatisticsTransformer.php#L53.
-        // but for now, always point UserRanks.Global to the global_rank property, as that is included solely for requests like GetUsersRequest.
-        [JsonProperty(@"global_rank")]
-        private int? globalRank
-        {
-            set => Ranks.Global = value;
-        }
-
         [JsonProperty(@"pp")]
         public decimal? PP;
 
@@ -120,9 +117,6 @@ namespace osu.Game.Users
 
         public struct UserRanks
         {
-            [JsonProperty(@"global")]
-            public int? Global;
-
             [JsonProperty(@"country")]
             public int? Country;
         }

From fb0e9d6760c2877ae97b40ad62d601b9e6774369 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 17 Feb 2021 16:44:39 +0900
Subject: [PATCH 1547/3722] Add played property to playlist item

---
 osu.Game/Online/Rooms/PlaylistItem.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Online/Rooms/PlaylistItem.cs b/osu.Game/Online/Rooms/PlaylistItem.cs
index 61982101c1..1d409d4b56 100644
--- a/osu.Game/Online/Rooms/PlaylistItem.cs
+++ b/osu.Game/Online/Rooms/PlaylistItem.cs
@@ -23,6 +23,12 @@ namespace osu.Game.Online.Rooms
         [JsonProperty("ruleset_id")]
         public int RulesetID { get; set; }
 
+        /// <summary>
+        /// Whether this <see cref="PlaylistItem"/> is still a valid selection for the <see cref="Room"/>.
+        /// </summary>
+        [JsonProperty("expired")]
+        public bool Expired { get; set; }
+
         [JsonIgnore]
         public readonly Bindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>();
 

From 61bf9a64bb117483093318b99ce135cd50a2e8c0 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 17 Feb 2021 11:21:33 +0300
Subject: [PATCH 1548/3722] Revert failed user requests changes with returning
 user ID instead

---
 osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs | 3 +--
 osu.Game.Tournament/TournamentGameBase.cs               | 8 +++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
index 263bbc533c..582f72429b 100644
--- a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
@@ -277,8 +277,7 @@ namespace osu.Game.Tournament.Screens.Editors
                         userId.Value = user.Id.ToString();
                         userId.BindValueChanged(idString =>
                         {
-                            if (!(int.TryParse(idString.NewValue, out var parsed)))
-                                return;
+                            int.TryParse(idString.NewValue, out var parsed);
 
                             user.Id = parsed;
 
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 0b101f050f..ffda101ee0 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -217,6 +217,8 @@ namespace osu.Game.Tournament
 
             req.Success += res =>
             {
+                user.Id = res.Id;
+
                 user.Username = res.Username;
                 user.Statistics = res.Statistics;
                 user.Country = res.Country;
@@ -225,7 +227,11 @@ namespace osu.Game.Tournament
                 success?.Invoke();
             };
 
-            req.Failure += _ => failure?.Invoke();
+            req.Failure += _ =>
+            {
+                user.Id = 1;
+                failure?.Invoke();
+            };
 
             if (immediate)
                 API.Perform(req);

From 0d1149911c44f16b1017c96ed79638fbcfe00a5c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 17 Feb 2021 17:33:10 +0900
Subject: [PATCH 1549/3722] Don't display expired playlist items

---
 osu.Game/Online/Rooms/Room.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Online/Rooms/Room.cs b/osu.Game/Online/Rooms/Room.cs
index 997f45ce52..aaaa712860 100644
--- a/osu.Game/Online/Rooms/Room.cs
+++ b/osu.Game/Online/Rooms/Room.cs
@@ -148,6 +148,12 @@ namespace osu.Game.Online.Rooms
             if (EndDate.Value != null && DateTimeOffset.Now >= EndDate.Value)
                 Status.Value = new RoomStatusEnded();
 
+            // Todo: This is not the best way/place to do this, but the intention is to display all playlist items when the room has ended,
+            // and display only the non-expired playlist items while the room is still active.
+            // In order to achieve this, all expired items are removed from the source Room.
+            if (!(Status.Value is RoomStatusEnded))
+                other.Playlist.RemoveAll(i => i.Expired);
+
             if (!Playlist.SequenceEqual(other.Playlist))
             {
                 Playlist.Clear();

From 70a995919cde7ae34501afac229872cf7317e693 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 17 Feb 2021 17:58:24 +0900
Subject: [PATCH 1550/3722] Update comments

---
 osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs        | 3 ---
 osu.Game/Online/Rooms/Room.cs                                 | 4 ++--
 .../OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs   | 2 ++
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs b/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
index 473382cf5f..7d6c76bc2f 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerRoomSettings.cs
@@ -36,9 +36,6 @@ namespace osu.Game.Online.Multiplayer
         [Key(5)]
         public IEnumerable<APIMod> AllowedMods { get; set; } = Enumerable.Empty<APIMod>();
 
-        /// <summary>
-        /// Only used for client-side mutation.
-        /// </summary>
         [Key(6)]
         public long PlaylistItemId { get; set; }
 
diff --git a/osu.Game/Online/Rooms/Room.cs b/osu.Game/Online/Rooms/Room.cs
index aaaa712860..00a7979f2c 100644
--- a/osu.Game/Online/Rooms/Room.cs
+++ b/osu.Game/Online/Rooms/Room.cs
@@ -149,8 +149,8 @@ namespace osu.Game.Online.Rooms
                 Status.Value = new RoomStatusEnded();
 
             // Todo: This is not the best way/place to do this, but the intention is to display all playlist items when the room has ended,
-            // and display only the non-expired playlist items while the room is still active.
-            // In order to achieve this, all expired items are removed from the source Room.
+            // and display only the non-expired playlist items while the room is still active. In order to achieve this, all expired items are removed from the source Room.
+            // More refactoring is required before this can be done locally instead - DrawableRoomPlaylist is currently directly bound to the playlist to display items in the room.
             if (!(Status.Value is RoomStatusEnded))
                 other.Playlist.RemoveAll(i => i.Expired);
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
index 8d394f2c2b..3cf0767cf8 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
@@ -77,6 +77,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
         private void updateBeatmap()
         {
             Debug.Assert(SelectedItem != null);
+
+            // When the selected item is null, the match hasn't yet been created. Use the playlist directly, which is mutated by song selection.
             PlaylistItem item = SelectedItem.Value ?? Playlist.FirstOrDefault();
 
             if (item == null)

From 604add04e495cbed44991962f3fa4e1bcb8b1451 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 17 Feb 2021 19:06:37 +0900
Subject: [PATCH 1551/3722] Fix song select mods being reset incorrectly

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

diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
index b201c62b7f..c60743a226 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Humanizer;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -31,6 +32,10 @@ namespace osu.Game.Screens.OnlinePlay
         [Resolved(typeof(Room), nameof(Room.Playlist))]
         protected BindableList<PlaylistItem> Playlist { get; private set; }
 
+        [CanBeNull]
+        [Resolved(CanBeNull = true)]
+        private IBindable<PlaylistItem> selectedItem { get; set; }
+
         private readonly Bindable<IReadOnlyList<Mod>> freeMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
         private readonly FreeModSelectOverlay freeModSelectOverlay;
 
@@ -66,8 +71,8 @@ namespace osu.Game.Screens.OnlinePlay
 
             // At this point, Mods contains both the required and allowed mods. For selection purposes, it should only contain the required mods.
             // Similarly, freeMods is currently empty but should only contain the allowed mods.
-            Mods.Value = Playlist.FirstOrDefault()?.RequiredMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
-            freeMods.Value = Playlist.FirstOrDefault()?.AllowedMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
+            Mods.Value = selectedItem?.Value?.RequiredMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
+            freeMods.Value = selectedItem?.Value?.AllowedMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
 
             Ruleset.BindValueChanged(onRulesetChanged);
         }

From c1620ce21b6e3194a200e980bb79891c0406be24 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Feb 2021 19:19:49 +0900
Subject: [PATCH 1552/3722] Fix intro beatmap always being imported even if
 already in a good state

---
 osu.Game/Screens/Menu/IntroScreen.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index b8b962be6c..71b83d4aab 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -111,12 +111,10 @@ namespace osu.Game.Screens.Menu
             {
                 setInfo = beatmaps.QueryBeatmapSet(b => b.Hash == BeatmapHash);
 
-                if (setInfo != null)
-                {
-                    initialBeatmap = beatmaps.GetWorkingBeatmap(setInfo.Beatmaps[0]);
-                }
+                if (setInfo == null)
+                    return false;
 
-                return UsingThemedIntro;
+                return (initialBeatmap = beatmaps.GetWorkingBeatmap(setInfo.Beatmaps[0])) != null;
             }
         }
 

From c1db33e0753e665334abd833330e13e5c3ee5c74 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Feb 2021 17:04:43 +0900
Subject: [PATCH 1553/3722] Improve some xmldoc on ArchiveModelManager for
 methods which are not going to trigger user interactive flow

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

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 232acba4a3..cc107d61c6 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -226,7 +226,7 @@ namespace osu.Game.Database
         public Action<IEnumerable<TModel>> PresentImport;
 
         /// <summary>
-        /// Import an item from an <see cref="ArchiveReader"/>.
+        /// Silently import an item from an <see cref="ArchiveReader"/>.
         /// </summary>
         /// <param name="archive">The archive to be imported.</param>
         /// <param name="cancellationToken">An optional cancellation token.</param>
@@ -303,7 +303,7 @@ namespace osu.Game.Database
         }
 
         /// <summary>
-        /// Import an item from a <typeparamref name="TModel"/>.
+        /// Silently import an item from a <typeparamref name="TModel"/>.
         /// </summary>
         /// <param name="item">The model to be imported.</param>
         /// <param name="archive">An optional archive to use for model population.</param>

From 0196ee882a5c6a956827e84fc79fb824de51a07c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Feb 2021 19:09:38 +0900
Subject: [PATCH 1554/3722] Redirect batch imports to a separate task scheduler
 to avoid contention with interactive actions

---
 ...eneOnlinePlayBeatmapAvailabilityTracker.cs |  4 +--
 osu.Game/Database/ArchiveModelManager.cs      | 36 ++++++++++++++-----
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs b/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs
index d3475de157..3ffb512b7f 100644
--- a/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs
+++ b/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs
@@ -165,10 +165,10 @@ namespace osu.Game.Tests.Online
             {
             }
 
-            public override async Task<BeatmapSetInfo> Import(BeatmapSetInfo item, ArchiveReader archive = null, CancellationToken cancellationToken = default)
+            public override async Task<BeatmapSetInfo> Import(BeatmapSetInfo item, ArchiveReader archive = null, bool lowPriority = false, CancellationToken cancellationToken = default)
             {
                 await AllowImport.Task;
-                return await (CurrentImportTask = base.Import(item, archive, cancellationToken));
+                return await (CurrentImportTask = base.Import(item, archive, lowPriority, cancellationToken));
             }
         }
 
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index cc107d61c6..03b8db2cb8 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -38,6 +38,11 @@ namespace osu.Game.Database
     {
         private const int import_queue_request_concurrency = 1;
 
+        /// <summary>
+        /// The size of a batch import operation before considering it a lower priority operation.
+        /// </summary>
+        private const int low_priority_import_batch_size = 1;
+
         /// <summary>
         /// A singleton scheduler shared by all <see cref="ArchiveModelManager{TModel,TFileModel}"/>.
         /// </summary>
@@ -47,6 +52,13 @@ namespace osu.Game.Database
         /// </remarks>
         private static readonly ThreadedTaskScheduler import_scheduler = new ThreadedTaskScheduler(import_queue_request_concurrency, nameof(ArchiveModelManager<TModel, TFileModel>));
 
+        /// <summary>
+        /// A second scheduler for lower priority imports.
+        /// For simplicity, these will just run in parallel with normal priority imports, but a future refactor would see this implemented via a custom scheduler/queue.
+        /// See https://gist.github.com/peppy/f0e118a14751fc832ca30dd48ba3876b for an incomplete version of this.
+        /// </summary>
+        private static readonly ThreadedTaskScheduler import_scheduler_low_priority = new ThreadedTaskScheduler(import_queue_request_concurrency, nameof(ArchiveModelManager<TModel, TFileModel>));
+
         /// <summary>
         /// Set an endpoint for notifications to be posted to.
         /// </summary>
@@ -103,8 +115,11 @@ namespace osu.Game.Database
 
         /// <summary>
         /// Import one or more <typeparamref name="TModel"/> items from filesystem <paramref name="paths"/>.
-        /// This will post notifications tracking progress.
         /// </summary>
+        /// <remarks>
+        /// This will be treated as a low priority import if more than one path is specified; use <see cref="Import(ImportTask[])"/> to always import at standard priority.
+        /// This will post notifications tracking progress.
+        /// </remarks>
         /// <param name="paths">One or more archive locations on disk.</param>
         public Task Import(params string[] paths)
         {
@@ -133,13 +148,15 @@ namespace osu.Game.Database
 
             var imported = new List<TModel>();
 
+            bool isLowPriorityImport = tasks.Length > low_priority_import_batch_size;
+
             await Task.WhenAll(tasks.Select(async task =>
             {
                 notification.CancellationToken.ThrowIfCancellationRequested();
 
                 try
                 {
-                    var model = await Import(task, notification.CancellationToken);
+                    var model = await Import(task, isLowPriorityImport, notification.CancellationToken);
 
                     lock (imported)
                     {
@@ -193,15 +210,16 @@ namespace osu.Game.Database
         /// Note that this bypasses the UI flow and should only be used for special cases or testing.
         /// </summary>
         /// <param name="task">The <see cref="ImportTask"/> containing data about the <typeparamref name="TModel"/> to import.</param>
+        /// <param name="lowPriority">Whether this is a low priority import.</param>
         /// <param name="cancellationToken">An optional cancellation token.</param>
         /// <returns>The imported model, if successful.</returns>
-        internal async Task<TModel> Import(ImportTask task, CancellationToken cancellationToken = default)
+        internal async Task<TModel> Import(ImportTask task, bool lowPriority = false, CancellationToken cancellationToken = default)
         {
             cancellationToken.ThrowIfCancellationRequested();
 
             TModel import;
             using (ArchiveReader reader = task.GetReader())
-                import = await Import(reader, cancellationToken);
+                import = await Import(reader, lowPriority, cancellationToken);
 
             // We may or may not want to delete the file depending on where it is stored.
             //  e.g. reconstructing/repairing database with items from default storage.
@@ -229,8 +247,9 @@ namespace osu.Game.Database
         /// Silently import an item from an <see cref="ArchiveReader"/>.
         /// </summary>
         /// <param name="archive">The archive to be imported.</param>
+        /// <param name="lowPriority">Whether this is a low priority import.</param>
         /// <param name="cancellationToken">An optional cancellation token.</param>
-        public Task<TModel> Import(ArchiveReader archive, CancellationToken cancellationToken = default)
+        public Task<TModel> Import(ArchiveReader archive, bool lowPriority = false, CancellationToken cancellationToken = default)
         {
             cancellationToken.ThrowIfCancellationRequested();
 
@@ -253,7 +272,7 @@ namespace osu.Game.Database
                 return null;
             }
 
-            return Import(model, archive, cancellationToken);
+            return Import(model, archive, lowPriority, cancellationToken);
         }
 
         /// <summary>
@@ -307,8 +326,9 @@ namespace osu.Game.Database
         /// </summary>
         /// <param name="item">The model to be imported.</param>
         /// <param name="archive">An optional archive to use for model population.</param>
+        /// <param name="lowPriority">Whether this is a low priority import.</param>
         /// <param name="cancellationToken">An optional cancellation token.</param>
-        public virtual async Task<TModel> Import(TModel item, ArchiveReader archive = null, CancellationToken cancellationToken = default) => await Task.Factory.StartNew(async () =>
+        public virtual async Task<TModel> Import(TModel item, ArchiveReader archive = null, bool lowPriority = false, CancellationToken cancellationToken = default) => await Task.Factory.StartNew(async () =>
         {
             cancellationToken.ThrowIfCancellationRequested();
 
@@ -383,7 +403,7 @@ namespace osu.Game.Database
 
             flushEvents(true);
             return item;
-        }, cancellationToken, TaskCreationOptions.HideScheduler, import_scheduler).Unwrap();
+        }, cancellationToken, TaskCreationOptions.HideScheduler, lowPriority ? import_scheduler_low_priority : import_scheduler).Unwrap();
 
         /// <summary>
         /// Exports an item to a legacy (.zip based) package.

From 172e2e9b3ffabfcc7fb7017529f9eecd103e2d62 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Feb 2021 20:40:15 +0900
Subject: [PATCH 1555/3722] Fix audio previews not being adjusted in volume
 correctly

---
 osu.Game/Audio/PreviewTrackManager.cs | 3 +++
 osu.Game/OsuGameBase.cs               | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Audio/PreviewTrackManager.cs b/osu.Game/Audio/PreviewTrackManager.cs
index 8d02af6574..d88fd1e62b 100644
--- a/osu.Game/Audio/PreviewTrackManager.cs
+++ b/osu.Game/Audio/PreviewTrackManager.cs
@@ -27,6 +27,8 @@ namespace osu.Game.Audio
 
         protected TrackManagerPreviewTrack CurrentTrack;
 
+        private readonly BindableNumber<double> globalTrackVolumeAdjust = new BindableNumber<double>(OsuGameBase.GLOBAL_TRACK_VOLUME_ADJUST);
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -35,6 +37,7 @@ namespace osu.Game.Audio
             trackStore = new PreviewTrackStore(new OnlineStore());
 
             audio.AddItem(trackStore);
+            trackStore.AddAdjustment(AdjustableProperty.Volume, globalTrackVolumeAdjust);
             trackStore.AddAdjustment(AdjustableProperty.Volume, audio.VolumeTrack);
         }
 
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 00b436931a..3d24f245f9 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -156,7 +156,12 @@ namespace osu.Game
 
         protected override UserInputManager CreateUserInputManager() => new OsuUserInputManager();
 
-        private readonly BindableNumber<double> globalTrackVolumeAdjust = new BindableNumber<double>(0.5f);
+        /// <summary>
+        /// The maximum volume at which audio tracks should playback. This can be set lower than 1 to create some head-room for sound effects.
+        /// </summary>
+        internal const double GLOBAL_TRACK_VOLUME_ADJUST = 0.5;
+
+        private readonly BindableNumber<double> globalTrackVolumeAdjust = new BindableNumber<double>(GLOBAL_TRACK_VOLUME_ADJUST);
 
         [BackgroundDependencyLoader]
         private void load()

From 403536ef80c64d475f56bb6fc290d849b49a491c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Feb 2021 21:09:20 +0900
Subject: [PATCH 1556/3722] Fix ModDisplay potentially being operated on before
 loaded completely

Closes https://github.com/ppy/osu/issues/11810.
---
 osu.Game/Screens/Play/HUD/ModDisplay.cs | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ModDisplay.cs b/osu.Game/Screens/Play/HUD/ModDisplay.cs
index 68d019bf71..7359f04dcf 100644
--- a/osu.Game/Screens/Play/HUD/ModDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ModDisplay.cs
@@ -72,19 +72,6 @@ namespace osu.Game.Screens.Play.HUD
                     }
                 },
             };
-
-            Current.ValueChanged += mods =>
-            {
-                iconsContainer.Clear();
-
-                foreach (Mod mod in mods.NewValue)
-                {
-                    iconsContainer.Add(new ModIcon(mod) { Scale = new Vector2(0.6f) });
-                }
-
-                if (IsLoaded)
-                    appearTransform();
-            };
         }
 
         protected override void Dispose(bool isDisposing)
@@ -97,7 +84,16 @@ namespace osu.Game.Screens.Play.HUD
         {
             base.LoadComplete();
 
-            appearTransform();
+            Current.BindValueChanged(mods =>
+            {
+                iconsContainer.Clear();
+
+                foreach (Mod mod in mods.NewValue)
+                    iconsContainer.Add(new ModIcon(mod) { Scale = new Vector2(0.6f) });
+
+                appearTransform();
+            }, true);
+
             iconsContainer.FadeInFromZero(fade_duration, Easing.OutQuint);
         }
 

From 2a1bb2f578ac8b74e6a7d5e7a949a7e995acc6c1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 17 Feb 2021 21:38:01 +0900
Subject: [PATCH 1557/3722] Fix selected item potentially changing during
 gameplay

---
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 51 ++++++++++++-------
 1 file changed, 32 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index c1930c525c..b5eff04532 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -46,7 +46,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         private MultiplayerMatchSettingsOverlay settingsOverlay;
         private Drawable userModsSection;
 
-        private IBindable<bool> isConnected;
+        private readonly IBindable<bool> isConnected = new Bindable<bool>();
+        private readonly IBindable<PlaylistItem> matchCurrentItem = new Bindable<PlaylistItem>();
 
         [CanBeNull]
         private IDisposable readyClickOperation;
@@ -268,8 +269,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             base.LoadComplete();
 
-            SelectedItem.BindValueChanged(onSelectedItemChanged);
-            SelectedItem.BindTo(client.CurrentMatchPlayingItem);
+            matchCurrentItem.BindTo(client.CurrentMatchPlayingItem);
+            matchCurrentItem.BindValueChanged(onCurrentItemChanged, true);
 
             BeatmapAvailability.BindValueChanged(updateBeatmapAvailability, true);
             UserMods.BindValueChanged(onUserModsChanged);
@@ -277,7 +278,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             client.LoadRequested += onLoadRequested;
             client.RoomUpdated += onRoomUpdated;
 
-            isConnected = client.IsConnected.GetBoundCopy();
+            isConnected.BindTo(client.IsConnected);
             isConnected.BindValueChanged(connected =>
             {
                 if (!connected.NewValue)
@@ -285,6 +286,33 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             }, true);
         }
 
+        private void onCurrentItemChanged(ValueChangedEvent<PlaylistItem> item)
+        {
+            if (client?.LocalUser == null)
+                return;
+
+            // If we're about to enter gameplay, schedule the item to be set at a later time.
+            if (client.LocalUser.State > MultiplayerUserState.Ready)
+            {
+                Schedule(() => onCurrentItemChanged(item));
+                return;
+            }
+
+            SelectedItem.Value = item.NewValue;
+
+            if (item.NewValue?.AllowedMods.Any() != true)
+            {
+                userModsSection.Hide();
+                userModsSelectOverlay.Hide();
+                userModsSelectOverlay.IsValidMod = _ => false;
+            }
+            else
+            {
+                userModsSection.Show();
+                userModsSelectOverlay.IsValidMod = m => item.NewValue.AllowedMods.Any(a => a.GetType() == m.GetType());
+            }
+        }
+
         protected override void UpdateMods()
         {
             if (SelectedItem.Value == null || client.LocalUser == null)
@@ -313,21 +341,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             return base.OnBackButton();
         }
 
-        private void onSelectedItemChanged(ValueChangedEvent<PlaylistItem> item)
-        {
-            if (item.NewValue?.AllowedMods.Any() != true)
-            {
-                userModsSection.Hide();
-                userModsSelectOverlay.Hide();
-                userModsSelectOverlay.IsValidMod = _ => false;
-            }
-            else
-            {
-                userModsSection.Show();
-                userModsSelectOverlay.IsValidMod = m => item.NewValue.AllowedMods.Any(a => a.GetType() == m.GetType());
-            }
-        }
-
         private ModSettingChangeTracker modSettingChangeTracker;
         private ScheduledDelegate debouncedModSettingsUpdate;
 

From 6ef235c4c5290f3254ed247b2f20054dde1aceaf Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 17 Feb 2021 21:42:22 +0900
Subject: [PATCH 1558/3722] Fix beatmap panel flickering multiple times

---
 .../Match/BeatmapSelectionControl.cs          | 17 ++------
 .../Screens/OnlinePlay/OnlinePlayComposite.cs | 41 +++++++++++++++++--
 2 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
index 3cf0767cf8..3af0d5b715 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.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.
 
-using System.Diagnostics;
-using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Screens;
 using osu.Game.Online.API;
-using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Match.Components;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
@@ -61,10 +58,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
         {
             base.LoadComplete();
 
-            Debug.Assert(SelectedItem != null);
-            SelectedItem.BindValueChanged(_ => updateBeatmap());
-            Playlist.BindCollectionChanged((_, __) => updateBeatmap(), true);
-
+            SelectedItem.BindValueChanged(_ => updateBeatmap(), true);
             Host.BindValueChanged(host =>
             {
                 if (RoomID.Value == null || host.NewValue?.Equals(api.LocalUser.Value) == true)
@@ -76,15 +70,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
         private void updateBeatmap()
         {
-            Debug.Assert(SelectedItem != null);
-
-            // When the selected item is null, the match hasn't yet been created. Use the playlist directly, which is mutated by song selection.
-            PlaylistItem item = SelectedItem.Value ?? Playlist.FirstOrDefault();
-
-            if (item == null)
+            if (SelectedItem.Value == null)
                 beatmapPanelContainer.Clear();
             else
-                beatmapPanelContainer.Child = new DrawableRoomPlaylistItem(item, false, false);
+                beatmapPanelContainer.Child = new DrawableRoomPlaylistItem(SelectedItem.Value, false, false);
         }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
index a7058d0ede..f203ef927c 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
@@ -2,6 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Specialized;
+using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -57,11 +59,44 @@ namespace osu.Game.Screens.OnlinePlay
         protected Bindable<TimeSpan?> Duration { get; private set; }
 
         /// <summary>
-        /// The currently selected item in the <see cref="RoomSubScreen"/>.
-        /// May be null if this <see cref="OnlinePlayComposite"/> is not inside a <see cref="RoomSubScreen"/>.
+        /// The currently selected item in the <see cref="RoomSubScreen"/>, or the first item from <see cref="Playlist"/>
+        /// if this <see cref="OnlinePlayComposite"/> is not within a <see cref="RoomSubScreen"/>.
         /// </summary>
+        protected IBindable<PlaylistItem> SelectedItem => selectedItem;
+
+        private readonly Bindable<PlaylistItem> selectedItem = new Bindable<PlaylistItem>();
+
         [CanBeNull]
         [Resolved(CanBeNull = true)]
-        protected IBindable<PlaylistItem> SelectedItem { get; private set; }
+        private IBindable<PlaylistItem> subScreenSelectedItem { get; set; }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            if (subScreenSelectedItem != null)
+                subScreenSelectedItem.BindValueChanged(onSelectedItemChanged, true);
+            else
+                Playlist.BindCollectionChanged(onPlaylistChanged, true);
+        }
+
+        /// <summary>
+        /// Invoked when the selected item from within a <see cref="RoomSubScreen"/> changes.
+        /// Does not occur when this <see cref="OnlinePlayComposite"/> is outside a <see cref="RoomSubScreen"/>.
+        /// </summary>
+        private void onSelectedItemChanged(ValueChangedEvent<PlaylistItem> item)
+        {
+            // If the room hasn't been created yet, fall-back to the first item from the playlist.
+            selectedItem.Value = RoomID.Value == null ? Playlist.FirstOrDefault() : item.NewValue;
+        }
+
+        /// <summary>
+        /// Invoked when the playlist changes.
+        /// Does not occur when this <see cref="OnlinePlayComposite"/> is inside a <see cref="RoomSubScreen"/>.
+        /// </summary>
+        private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            selectedItem.Value = Playlist.FirstOrDefault();
+        }
     }
 }

From 3208b2c5bf096bb25eab7946fb8475a1113b81e6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Feb 2021 23:13:51 +0900
Subject: [PATCH 1559/3722] Fix potential nullref if mods are never set

---
 osu.Game/Screens/Play/HUD/ModDisplay.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/ModDisplay.cs b/osu.Game/Screens/Play/HUD/ModDisplay.cs
index 7359f04dcf..cffdb21fb8 100644
--- a/osu.Game/Screens/Play/HUD/ModDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ModDisplay.cs
@@ -88,10 +88,13 @@ namespace osu.Game.Screens.Play.HUD
             {
                 iconsContainer.Clear();
 
-                foreach (Mod mod in mods.NewValue)
-                    iconsContainer.Add(new ModIcon(mod) { Scale = new Vector2(0.6f) });
+                if (mods.NewValue != null)
+                {
+                    foreach (Mod mod in mods.NewValue)
+                        iconsContainer.Add(new ModIcon(mod) { Scale = new Vector2(0.6f) });
 
-                appearTransform();
+                    appearTransform();
+                }
             }, true);
 
             iconsContainer.FadeInFromZero(fade_duration, Easing.OutQuint);

From e7308193e7bd33a8c6e38f90d7dca112bda6e084 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 13:03:29 +0900
Subject: [PATCH 1560/3722] Add xmldoc explaining how PreviewTime is intended
 to work

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

diff --git a/osu.Game/Beatmaps/BeatmapMetadata.cs b/osu.Game/Beatmaps/BeatmapMetadata.cs
index 39b3c23ddd..367f612dc8 100644
--- a/osu.Game/Beatmaps/BeatmapMetadata.cs
+++ b/osu.Game/Beatmaps/BeatmapMetadata.cs
@@ -51,7 +51,12 @@ namespace osu.Game.Beatmaps
         [JsonProperty(@"tags")]
         public string Tags { get; set; }
 
+        /// <summary>
+        /// The time in milliseconds to begin playing the track for preview purposes.
+        /// If -1, the track should begin playing at 40% of its length.
+        /// </summary>
         public int PreviewTime { get; set; }
+
         public string AudioFile { get; set; }
         public string BackgroundFile { get; set; }
 

From 90dce5204218ac9132e929d374a123f3da7abe34 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 14:10:28 +0900
Subject: [PATCH 1561/3722] Fix potential crash from cross-thread drawable
 manipulation in CollectionFilterDropdown

---
 osu.Game/Collections/CollectionFilterDropdown.cs | 13 ++++++-------
 osu.Game/Screens/Select/FilterControl.cs         |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Collections/CollectionFilterDropdown.cs b/osu.Game/Collections/CollectionFilterDropdown.cs
index ec0e9d5a89..3e55ecb084 100644
--- a/osu.Game/Collections/CollectionFilterDropdown.cs
+++ b/osu.Game/Collections/CollectionFilterDropdown.cs
@@ -41,19 +41,18 @@ namespace osu.Game.Collections
             ItemSource = filters;
         }
 
-        [BackgroundDependencyLoader(permitNulls: true)]
-        private void load([CanBeNull] CollectionManager collectionManager)
+        [Resolved(CanBeNull = true)]
+        private CollectionManager collectionManager { get; set; }
+
+        protected override void LoadComplete()
         {
+            base.LoadComplete();
+
             if (collectionManager != null)
                 collections.BindTo(collectionManager.Collections);
 
             collections.CollectionChanged += (_, __) => collectionsChanged();
             collectionsChanged();
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
 
             Current.BindValueChanged(filterChanged, true);
         }
diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index 952a5d1eaa..eafd8a87d1 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Screens.Select
                 Sort = sortMode.Value,
                 AllowConvertedBeatmaps = showConverted.Value,
                 Ruleset = ruleset.Value,
-                Collection = collectionDropdown?.Current.Value.Collection
+                Collection = collectionDropdown?.Current.Value?.Collection
             };
 
             if (!minimumStars.IsDefault)

From 49589b64c34792ac07d19f8f3d4efb97fd4c7aad Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 14:55:15 +0900
Subject: [PATCH 1562/3722] Intro track should not restart from preview point

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

diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index 71b83d4aab..71f3b60026 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -168,7 +168,7 @@ namespace osu.Game.Screens.Menu
         {
             // Only start the current track if it is the menu music. A beatmap's track is started when entering the Main Menu.
             if (UsingThemedIntro)
-                Track.Restart();
+                Track.Start();
         }
 
         protected override void LogoArriving(OsuLogo logo, bool resuming)

From dfedea9ea2abf6c09dead571889915a37570c0ff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 14:55:44 +0900
Subject: [PATCH 1563/3722] Move preview point logic to a specific method in
 WorkingBeatmap

---
 osu.Game/Beatmaps/WorkingBeatmap.cs | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 30382c444f..aab8ff6bd6 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -266,6 +266,26 @@ namespace osu.Game.Beatmaps
         [NotNull]
         public Track LoadTrack() => loadedTrack = GetBeatmapTrack() ?? GetVirtualTrack(1000);
 
+        /// <summary>
+        /// Reads the correct track restart point from beatmap metadata and sets looping to enabled.
+        /// </summary>
+        public void PrepareTrackForPreviewLooping()
+        {
+            Track.Looping = true;
+            Track.RestartPoint = Metadata.PreviewTime;
+
+            if (Track.RestartPoint == -1)
+            {
+                if (!Track.IsLoaded)
+                {
+                    // force length to be populated (https://github.com/ppy/osu-framework/issues/4202)
+                    Track.Seek(Track.CurrentTime);
+                }
+
+                Track.RestartPoint = 0.4f * Track.Length;
+            }
+        }
+
         /// <summary>
         /// Transfer a valid audio track into this working beatmap. Used as an optimisation to avoid reload / track swap
         /// across difficulties in the same beatmap set.

From 421cdb6650246d249d685812c8ea7dbd3c07a015 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 15:01:11 +0900
Subject: [PATCH 1564/3722] Consume new method in existing usages (and remove
 some unnecessary set/unset code)

---
 osu.Game/Screens/Menu/MainMenu.cs                  | 11 ++++++-----
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs |  7 +------
 osu.Game/Screens/Select/SongSelect.cs              |  7 +++----
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 97fd58318b..424e6d2cd5 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -179,14 +179,15 @@ namespace osu.Game.Screens.Menu
             base.OnEntering(last);
             buttons.FadeInFromZero(500);
 
-            var metadata = Beatmap.Value.Metadata;
-
             if (last is IntroScreen && musicController.TrackLoaded)
             {
-                if (!musicController.CurrentTrack.IsRunning)
+                var track = musicController.CurrentTrack;
+
+                // presume the track is the current beatmap's track. not sure how correct this assumption is but it has worked until now.
+                if (!track.IsRunning)
                 {
-                    musicController.CurrentTrack.Seek(metadata.PreviewTime != -1 ? metadata.PreviewTime : 0.4f * musicController.CurrentTrack.Length);
-                    musicController.CurrentTrack.Start();
+                    Beatmap.Value.PrepareTrackForPreviewLooping();
+                    track.Restart();
                 }
             }
 
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index e755f8c405..86422085a1 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -173,9 +173,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
 
             if (track != null)
             {
-                track.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
-                track.Looping = true;
-
+                Beatmap.Value.PrepareTrackForPreviewLooping();
                 music?.EnsurePlayingSomething();
             }
         }
@@ -185,10 +183,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
             var track = Beatmap?.Value?.Track;
 
             if (track != null)
-            {
                 track.Looping = false;
-                track.RestartPoint = 0;
-            }
         }
     }
 }
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index edbab083cd..b7f7c40539 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -648,8 +648,9 @@ namespace osu.Game.Screens.Select
         {
             Debug.Assert(!isHandlingLooping);
 
-            music.CurrentTrack.Looping = isHandlingLooping = true;
+            isHandlingLooping = true;
 
+            ensureTrackLooping(Beatmap.Value, TrackChangeDirection.None);
             music.TrackChanged += ensureTrackLooping;
         }
 
@@ -665,7 +666,7 @@ namespace osu.Game.Screens.Select
         }
 
         private void ensureTrackLooping(WorkingBeatmap beatmap, TrackChangeDirection changeDirection)
-            => music.CurrentTrack.Looping = true;
+            => beatmap.PrepareTrackForPreviewLooping();
 
         public override bool OnBackButton()
         {
@@ -719,8 +720,6 @@ namespace osu.Game.Screens.Select
 
             bool isNewTrack = !lastTrack.TryGetTarget(out var last) || last != track;
 
-            track.RestartPoint = Beatmap.Value.Metadata.PreviewTime;
-
             if (!track.IsRunning && (music.UserPauseRequested != true || isNewTrack))
                 music.Play(true);
 

From 56e9e10ff584742f80c21971771874c7f21ab745 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 18 Feb 2021 15:30:31 +0900
Subject: [PATCH 1565/3722] Make server authoritative in playlist item id

---
 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index e9eb80e6a1..416162779d 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -217,7 +217,6 @@ namespace osu.Game.Online.Multiplayer
                 RulesetID = item.GetOr(existingPlaylistItem).RulesetID,
                 RequiredMods = item.HasValue ? item.Value.AsNonNull().RequiredMods.Select(m => new APIMod(m)).ToList() : Room.Settings.RequiredMods,
                 AllowedMods = item.HasValue ? item.Value.AsNonNull().AllowedMods.Select(m => new APIMod(m)).ToList() : Room.Settings.AllowedMods,
-                PlaylistItemId = Room.Settings.PlaylistItemId,
             });
         }
 

From 143e1456701ad4808c55cbb75788e81dc3df9c9a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 15:42:26 +0900
Subject: [PATCH 1566/3722] Update implementation of AdjustableAudioComponents

---
 .../Rulesets/TestSceneDrawableRulesetDependencies.cs          | 4 ++--
 osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs           | 4 ++--
 osu.Game/Skinning/PoolableSkinnableSample.cs                  | 4 ++--
 osu.Game/Skinning/SkinnableSound.cs                           | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs b/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
index 787f72ba79..4aebed0d31 100644
--- a/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
+++ b/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
@@ -118,9 +118,9 @@ namespace osu.Game.Tests.Rulesets
             public BindableNumber<double> Frequency => throw new NotImplementedException();
             public BindableNumber<double> Tempo => throw new NotImplementedException();
 
-            public void AddAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => throw new NotImplementedException();
+            public void AddAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) => throw new NotImplementedException();
 
-            public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => throw new NotImplementedException();
+            public void RemoveAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) => throw new NotImplementedException();
 
             public void RemoveAllAdjustments(AdjustableProperty type) => throw new NotImplementedException();
 
diff --git a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
index deec948d14..bbaca7c80f 100644
--- a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
+++ b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
@@ -110,9 +110,9 @@ namespace osu.Game.Rulesets.UI
 
             public IEnumerable<string> GetAvailableResources() => throw new NotSupportedException();
 
-            public void AddAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => throw new NotSupportedException();
+            public void AddAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) => throw new NotSupportedException();
 
-            public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => throw new NotSupportedException();
+            public void RemoveAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) => throw new NotSupportedException();
 
             public void RemoveAllAdjustments(AdjustableProperty type) => throw new NotSupportedException();
 
diff --git a/osu.Game/Skinning/PoolableSkinnableSample.cs b/osu.Game/Skinning/PoolableSkinnableSample.cs
index 9025fdbd0f..abff57091b 100644
--- a/osu.Game/Skinning/PoolableSkinnableSample.cs
+++ b/osu.Game/Skinning/PoolableSkinnableSample.cs
@@ -165,9 +165,9 @@ namespace osu.Game.Skinning
 
         public BindableNumber<double> Tempo => sampleContainer.Tempo;
 
-        public void AddAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => sampleContainer.AddAdjustment(type, adjustBindable);
+        public void AddAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) => sampleContainer.AddAdjustment(type, adjustBindable);
 
-        public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => sampleContainer.RemoveAdjustment(type, adjustBindable);
+        public void RemoveAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) => sampleContainer.RemoveAdjustment(type, adjustBindable);
 
         public void RemoveAllAdjustments(AdjustableProperty type) => sampleContainer.RemoveAllAdjustments(type);
 
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index b3db2d6558..d3dfcb1dc0 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -176,10 +176,10 @@ namespace osu.Game.Skinning
 
         public BindableNumber<double> Tempo => samplesContainer.Tempo;
 
-        public void AddAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable)
+        public void AddAdjustment(AdjustableProperty type, IBindable<double> adjustBindable)
             => samplesContainer.AddAdjustment(type, adjustBindable);
 
-        public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable)
+        public void RemoveAdjustment(AdjustableProperty type, IBindable<double> adjustBindable)
             => samplesContainer.RemoveAdjustment(type, adjustBindable);
 
         public void RemoveAllAdjustments(AdjustableProperty type)

From e911760318edfb87b86bd6f5b74da4e285c441f5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 18 Feb 2021 15:47:33 +0900
Subject: [PATCH 1567/3722] Split OnlinePlayComposite to remove if-statement

---
 .../Match/BeatmapSelectionControl.cs          |  2 +-
 .../Screens/OnlinePlay/OnlinePlayComposite.cs | 36 ++++--------------
 .../OnlinePlay/RoomSubScreenComposite.cs      | 38 +++++++++++++++++++
 3 files changed, 46 insertions(+), 30 deletions(-)
 create mode 100644 osu.Game/Screens/OnlinePlay/RoomSubScreenComposite.cs

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
index 3af0d5b715..ebe63e26d6 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
@@ -11,7 +11,7 @@ using osu.Game.Screens.OnlinePlay.Match.Components;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 {
-    public class BeatmapSelectionControl : OnlinePlayComposite
+    public class BeatmapSelectionControl : RoomSubScreenComposite
     {
         [Resolved]
         private MultiplayerMatchSubScreen matchSubScreen { get; set; }
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
index f203ef927c..eb0b23f13f 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
@@ -2,9 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Specialized;
 using System.Linq;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
@@ -14,6 +12,9 @@ using osu.Game.Users;
 
 namespace osu.Game.Screens.OnlinePlay
 {
+    /// <summary>
+    /// A <see cref="CompositeDrawable"/> that exposes bindables for <see cref="Room"/> properties.
+    /// </summary>
     public class OnlinePlayComposite : CompositeDrawable
     {
         [Resolved(typeof(Room))]
@@ -62,41 +63,18 @@ namespace osu.Game.Screens.OnlinePlay
         /// The currently selected item in the <see cref="RoomSubScreen"/>, or the first item from <see cref="Playlist"/>
         /// if this <see cref="OnlinePlayComposite"/> is not within a <see cref="RoomSubScreen"/>.
         /// </summary>
-        protected IBindable<PlaylistItem> SelectedItem => selectedItem;
-
-        private readonly Bindable<PlaylistItem> selectedItem = new Bindable<PlaylistItem>();
-
-        [CanBeNull]
-        [Resolved(CanBeNull = true)]
-        private IBindable<PlaylistItem> subScreenSelectedItem { get; set; }
+        protected readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            if (subScreenSelectedItem != null)
-                subScreenSelectedItem.BindValueChanged(onSelectedItemChanged, true);
-            else
-                Playlist.BindCollectionChanged(onPlaylistChanged, true);
+            Playlist.BindCollectionChanged((_, __) => UpdateSelectedItem(), true);
         }
 
-        /// <summary>
-        /// Invoked when the selected item from within a <see cref="RoomSubScreen"/> changes.
-        /// Does not occur when this <see cref="OnlinePlayComposite"/> is outside a <see cref="RoomSubScreen"/>.
-        /// </summary>
-        private void onSelectedItemChanged(ValueChangedEvent<PlaylistItem> item)
+        protected virtual void UpdateSelectedItem()
         {
-            // If the room hasn't been created yet, fall-back to the first item from the playlist.
-            selectedItem.Value = RoomID.Value == null ? Playlist.FirstOrDefault() : item.NewValue;
-        }
-
-        /// <summary>
-        /// Invoked when the playlist changes.
-        /// Does not occur when this <see cref="OnlinePlayComposite"/> is inside a <see cref="RoomSubScreen"/>.
-        /// </summary>
-        private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            selectedItem.Value = Playlist.FirstOrDefault();
+            SelectedItem.Value = Playlist.FirstOrDefault();
         }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/RoomSubScreenComposite.cs b/osu.Game/Screens/OnlinePlay/RoomSubScreenComposite.cs
new file mode 100644
index 0000000000..4cfd881aa3
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/RoomSubScreenComposite.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 osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Game.Online.Rooms;
+using osu.Game.Screens.OnlinePlay.Match;
+
+namespace osu.Game.Screens.OnlinePlay
+{
+    /// <summary>
+    /// An <see cref="OnlinePlayComposite"/> with additional logic tracking the currently-selected <see cref="PlaylistItem"/> inside a <see cref="RoomSubScreen"/>.
+    /// </summary>
+    public class RoomSubScreenComposite : OnlinePlayComposite
+    {
+        [Resolved]
+        private IBindable<PlaylistItem> subScreenSelectedItem { get; set; }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            subScreenSelectedItem.BindValueChanged(_ => UpdateSelectedItem(), true);
+        }
+
+        protected override void UpdateSelectedItem()
+        {
+            if (RoomID.Value == null)
+            {
+                // If the room hasn't been created yet, fall-back to the base logic.
+                base.UpdateSelectedItem();
+                return;
+            }
+
+            SelectedItem.Value = subScreenSelectedItem.Value;
+        }
+    }
+}

From 46ba5de32c5e0dc63d94ab618121a61df655c2a9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 18 Feb 2021 16:19:36 +0900
Subject: [PATCH 1568/3722] Fix collections being imported from BDL thread

---
 osu.Game/Collections/CollectionManager.cs | 48 +++++++++++++----------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Collections/CollectionManager.cs b/osu.Game/Collections/CollectionManager.cs
index 569ac749a4..a65d9a415d 100644
--- a/osu.Game/Collections/CollectionManager.cs
+++ b/osu.Game/Collections/CollectionManager.cs
@@ -139,35 +139,43 @@ namespace osu.Game.Collections
             PostNotification?.Invoke(notification);
 
             var collection = readCollections(stream, notification);
-            bool importCompleted = false;
-
-            Schedule(() =>
-            {
-                importCollections(collection);
-                importCompleted = true;
-            });
-
-            while (!IsDisposed && !importCompleted)
-                await Task.Delay(10);
+            await importCollections(collection);
 
             notification.CompletionText = $"Imported {collection.Count} collections";
             notification.State = ProgressNotificationState.Completed;
         }
 
-        private void importCollections(List<BeatmapCollection> newCollections)
+        private Task importCollections(List<BeatmapCollection> newCollections)
         {
-            foreach (var newCol in newCollections)
-            {
-                var existing = Collections.FirstOrDefault(c => c.Name == newCol.Name);
-                if (existing == null)
-                    Collections.Add(existing = new BeatmapCollection { Name = { Value = newCol.Name.Value } });
+            var tcs = new TaskCompletionSource<bool>();
 
-                foreach (var newBeatmap in newCol.Beatmaps)
+            Schedule(() =>
+            {
+                try
                 {
-                    if (!existing.Beatmaps.Contains(newBeatmap))
-                        existing.Beatmaps.Add(newBeatmap);
+                    foreach (var newCol in newCollections)
+                    {
+                        var existing = Collections.FirstOrDefault(c => c.Name == newCol.Name);
+                        if (existing == null)
+                            Collections.Add(existing = new BeatmapCollection { Name = { Value = newCol.Name.Value } });
+
+                        foreach (var newBeatmap in newCol.Beatmaps)
+                        {
+                            if (!existing.Beatmaps.Contains(newBeatmap))
+                                existing.Beatmaps.Add(newBeatmap);
+                        }
+                    }
+
+                    tcs.SetResult(true);
                 }
-            }
+                catch (Exception e)
+                {
+                    Logger.Error(e, "Failed to import collection.");
+                    tcs.SetException(e);
+                }
+            });
+
+            return tcs.Task;
         }
 
         private List<BeatmapCollection> readCollections(Stream stream, ProgressNotification notification = null)

From c3a98b6ad15475a86565c2501fe0faeb2e898b14 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 16:59:43 +0900
Subject: [PATCH 1569/3722] Fix carousel items' borders getting blown out when
 selected and hovered

I tried restructuring the hierarchy to avoid needing this added property
(moving the hover layer out of the border container) but this leads to
some subpixel leakage outside the borders which looks even worse.

Closes #6915.
---
 .../Screens/Select/Carousel/CarouselHeader.cs | 34 +++++++++++++++++--
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselHeader.cs b/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
index 947334c747..73324894ee 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
@@ -24,9 +24,13 @@ namespace osu.Game.Screens.Select.Carousel
         public Container BorderContainer;
 
         public readonly Bindable<CarouselItemState> State = new Bindable<CarouselItemState>(CarouselItemState.NotSelected);
+        private HoverLayer hoverLayer;
 
         protected override Container<Drawable> Content { get; } = new Container { RelativeSizeAxes = Axes.Both };
 
+        private const float corner_radius = 10;
+        private const float border_thickness = 2.5f;
+
         public CarouselHeader()
         {
             RelativeSizeAxes = Axes.X;
@@ -36,12 +40,12 @@ namespace osu.Game.Screens.Select.Carousel
             {
                 RelativeSizeAxes = Axes.Both,
                 Masking = true,
-                CornerRadius = 10,
+                CornerRadius = corner_radius,
                 BorderColour = new Color4(221, 255, 255, 255),
                 Children = new Drawable[]
                 {
                     Content,
-                    new HoverLayer()
+                    hoverLayer = new HoverLayer()
                 }
             };
         }
@@ -59,6 +63,8 @@ namespace osu.Game.Screens.Select.Carousel
             {
                 case CarouselItemState.Collapsed:
                 case CarouselItemState.NotSelected:
+                    hoverLayer.InsetForBorder = false;
+
                     BorderContainer.BorderThickness = 0;
                     BorderContainer.EdgeEffect = new EdgeEffectParameters
                     {
@@ -70,7 +76,9 @@ namespace osu.Game.Screens.Select.Carousel
                     break;
 
                 case CarouselItemState.Selected:
-                    BorderContainer.BorderThickness = 2.5f;
+                    hoverLayer.InsetForBorder = true;
+
+                    BorderContainer.BorderThickness = border_thickness;
                     BorderContainer.EdgeEffect = new EdgeEffectParameters
                     {
                         Type = EdgeEffectType.Glow,
@@ -107,6 +115,26 @@ namespace osu.Game.Screens.Select.Carousel
                 sampleHover = audio.Samples.Get("SongSelect/song-ping");
             }
 
+            public bool InsetForBorder
+            {
+                set
+                {
+                    if (value)
+                    {
+                        // apply same border as above to avoid applying additive overlay to it (and blowing out the colour).
+                        Masking = true;
+                        CornerRadius = corner_radius;
+                        BorderThickness = border_thickness;
+                    }
+                    else
+                    {
+                        BorderThickness = 0;
+                        CornerRadius = 0;
+                        Masking = false;
+                    }
+                }
+            }
+
             protected override bool OnHover(HoverEvent e)
             {
                 box.FadeIn(100, Easing.OutQuint);

From b713eb2eae259e086ca3b62ff6e3d7b79bed06a4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 17:13:48 +0900
Subject: [PATCH 1570/3722] Make field readonly

---
 osu.Game/Screens/Select/Carousel/CarouselHeader.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselHeader.cs b/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
index 73324894ee..2fbf64de29 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
@@ -24,7 +24,8 @@ namespace osu.Game.Screens.Select.Carousel
         public Container BorderContainer;
 
         public readonly Bindable<CarouselItemState> State = new Bindable<CarouselItemState>(CarouselItemState.NotSelected);
-        private HoverLayer hoverLayer;
+
+        private readonly HoverLayer hoverLayer;
 
         protected override Container<Drawable> Content { get; } = new Container { RelativeSizeAxes = Axes.Both };
 

From 668cc144f68c339ab03a4601c4d36faae86b051e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 18 Feb 2021 17:39:01 +0900
Subject: [PATCH 1571/3722] Fix test failures + multiple filter operations
 firing

---
 .../Collections/CollectionFilterDropdown.cs   | 22 ++++++++++++++-----
 .../Collections/CollectionFilterMenuItem.cs   |  8 ++++++-
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Collections/CollectionFilterDropdown.cs b/osu.Game/Collections/CollectionFilterDropdown.cs
index 3e55ecb084..aad8400faa 100644
--- a/osu.Game/Collections/CollectionFilterDropdown.cs
+++ b/osu.Game/Collections/CollectionFilterDropdown.cs
@@ -29,6 +29,14 @@ namespace osu.Game.Collections
         /// </summary>
         protected virtual bool ShowManageCollectionsItem => true;
 
+        private readonly BindableWithCurrent<CollectionFilterMenuItem> current = new BindableWithCurrent<CollectionFilterMenuItem>();
+
+        public new Bindable<CollectionFilterMenuItem> Current
+        {
+            get => current.Current;
+            set => current.Current = value;
+        }
+
         private readonly IBindableList<BeatmapCollection> collections = new BindableList<BeatmapCollection>();
         private readonly IBindableList<BeatmapInfo> beatmaps = new BindableList<BeatmapInfo>();
         private readonly BindableList<CollectionFilterMenuItem> filters = new BindableList<CollectionFilterMenuItem>();
@@ -36,14 +44,15 @@ namespace osu.Game.Collections
         [Resolved(CanBeNull = true)]
         private ManageCollectionsDialog manageCollectionsDialog { get; set; }
 
+        [Resolved(CanBeNull = true)]
+        private CollectionManager collectionManager { get; set; }
+
         public CollectionFilterDropdown()
         {
             ItemSource = filters;
+            Current.Value = new AllBeatmapsCollectionFilterMenuItem();
         }
 
-        [Resolved(CanBeNull = true)]
-        private CollectionManager collectionManager { get; set; }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -51,9 +60,12 @@ namespace osu.Game.Collections
             if (collectionManager != null)
                 collections.BindTo(collectionManager.Collections);
 
-            collections.CollectionChanged += (_, __) => collectionsChanged();
-            collectionsChanged();
+            // Dropdown has logic which triggers a change on the bindable with every change to the contained items.
+            // This is not desirable here, as it leads to multiple filter operations running even though nothing has changed.
+            // An extra bindable is enough to subvert this behaviour.
+            base.Current.BindTo(Current);
 
+            collections.BindCollectionChanged((_, __) => collectionsChanged(), true);
             Current.BindValueChanged(filterChanged, true);
         }
 
diff --git a/osu.Game/Collections/CollectionFilterMenuItem.cs b/osu.Game/Collections/CollectionFilterMenuItem.cs
index 4a489d2945..fe79358223 100644
--- a/osu.Game/Collections/CollectionFilterMenuItem.cs
+++ b/osu.Game/Collections/CollectionFilterMenuItem.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 JetBrains.Annotations;
 using osu.Framework.Bindables;
 
@@ -9,7 +10,7 @@ namespace osu.Game.Collections
     /// <summary>
     /// A <see cref="BeatmapCollection"/> filter.
     /// </summary>
-    public class CollectionFilterMenuItem
+    public class CollectionFilterMenuItem : IEquatable<CollectionFilterMenuItem>
     {
         /// <summary>
         /// The collection to filter beatmaps from.
@@ -33,6 +34,11 @@ namespace osu.Game.Collections
             Collection = collection;
             CollectionName = Collection?.Name.GetBoundCopy() ?? new Bindable<string>("All beatmaps");
         }
+
+        public bool Equals(CollectionFilterMenuItem other)
+            => other != null && CollectionName.Value == other.CollectionName.Value;
+
+        public override int GetHashCode() => CollectionName.Value.GetHashCode();
     }
 
     public class AllBeatmapsCollectionFilterMenuItem : CollectionFilterMenuItem

From 71316bbee568c7ded598d502204054db85ffbb53 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 17:45:58 +0900
Subject: [PATCH 1572/3722] Allow using OnlineViewContainer without deriving it

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

diff --git a/osu.Game/Online/OnlineViewContainer.cs b/osu.Game/Online/OnlineViewContainer.cs
index c9fb70f0cc..8868f90524 100644
--- a/osu.Game/Online/OnlineViewContainer.cs
+++ b/osu.Game/Online/OnlineViewContainer.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Online
     /// A <see cref="Container"/> for displaying online content which require a local user to be logged in.
     /// Shows its children only when the local user is logged in and supports displaying a placeholder if not.
     /// </summary>
-    public abstract class OnlineViewContainer : Container
+    public class OnlineViewContainer : Container
     {
         protected LoadingSpinner LoadingSpinner { get; private set; }
 
@@ -30,7 +30,7 @@ namespace osu.Game.Online
         [Resolved]
         protected IAPIProvider API { get; private set; }
 
-        protected OnlineViewContainer(string placeholderMessage)
+        public OnlineViewContainer(string placeholderMessage)
         {
             this.placeholderMessage = placeholderMessage;
         }

From c3f66a0c745ce7c53fbf948625f5ad620dd2d730 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 17:46:07 +0900
Subject: [PATCH 1573/3722] Add login placeholder for chat overlay

---
 osu.Game/Overlays/ChatOverlay.cs | 73 ++++++++++++++++----------------
 1 file changed, 36 insertions(+), 37 deletions(-)

diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 8bc7e21047..f5dd4fae2c 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -24,6 +24,7 @@ using osu.Game.Overlays.Chat.Tabs;
 using osuTK.Input;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
+using osu.Game.Online;
 
 namespace osu.Game.Overlays
 {
@@ -118,40 +119,47 @@ namespace osu.Game.Overlays
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                 },
-                                currentChannelContainer = new Container<DrawableChannel>
+                                new OnlineViewContainer("Sign in to chat")
                                 {
                                     RelativeSizeAxes = Axes.Both,
-                                    Padding = new MarginPadding
-                                    {
-                                        Bottom = textbox_height
-                                    },
-                                },
-                                new Container
-                                {
-                                    Anchor = Anchor.BottomLeft,
-                                    Origin = Anchor.BottomLeft,
-                                    RelativeSizeAxes = Axes.X,
-                                    Height = textbox_height,
-                                    Padding = new MarginPadding
-                                    {
-                                        Top = padding * 2,
-                                        Bottom = padding * 2,
-                                        Left = ChatLine.LEFT_PADDING + padding * 2,
-                                        Right = padding * 2,
-                                    },
                                     Children = new Drawable[]
                                     {
-                                        textbox = new FocusedTextBox
+                                        currentChannelContainer = new Container<DrawableChannel>
                                         {
                                             RelativeSizeAxes = Axes.Both,
-                                            Height = 1,
-                                            PlaceholderText = "type your message",
-                                            ReleaseFocusOnCommit = false,
-                                            HoldFocus = true,
-                                        }
-                                    }
-                                },
-                                loading = new LoadingSpinner(),
+                                            Padding = new MarginPadding
+                                            {
+                                                Bottom = textbox_height
+                                            },
+                                        },
+                                        new Container
+                                        {
+                                            Anchor = Anchor.BottomLeft,
+                                            Origin = Anchor.BottomLeft,
+                                            RelativeSizeAxes = Axes.X,
+                                            Height = textbox_height,
+                                            Padding = new MarginPadding
+                                            {
+                                                Top = padding * 2,
+                                                Bottom = padding * 2,
+                                                Left = ChatLine.LEFT_PADDING + padding * 2,
+                                                Right = padding * 2,
+                                            },
+                                            Children = new Drawable[]
+                                            {
+                                                textbox = new FocusedTextBox
+                                                {
+                                                    RelativeSizeAxes = Axes.Both,
+                                                    Height = 1,
+                                                    PlaceholderText = "type your message",
+                                                    ReleaseFocusOnCommit = false,
+                                                    HoldFocus = true,
+                                                }
+                                            }
+                                        },
+                                        loading = new LoadingSpinner(),
+                                    },
+                                }
                             }
                         },
                         tabsArea = new TabsArea
@@ -184,9 +192,7 @@ namespace osu.Game.Overlays
                     },
                 },
             };
-
             textbox.OnCommit += postMessage;
-
             ChannelTabControl.Current.ValueChanged += current => channelManager.CurrentChannel.Value = current.NewValue;
             ChannelTabControl.ChannelSelectorActive.ValueChanged += active => ChannelSelectionOverlay.State.Value = active.NewValue ? Visibility.Visible : Visibility.Hidden;
             ChannelSelectionOverlay.State.ValueChanged += state =>
@@ -203,10 +209,8 @@ namespace osu.Game.Overlays
                 else
                     textbox.HoldFocus = true;
             };
-
             ChannelSelectionOverlay.OnRequestJoin = channel => channelManager.JoinChannel(channel);
             ChannelSelectionOverlay.OnRequestLeave = channelManager.LeaveChannel;
-
             ChatHeight = config.GetBindable<float>(OsuSetting.ChatDisplayHeight);
             ChatHeight.BindValueChanged(height =>
             {
@@ -214,9 +218,7 @@ namespace osu.Game.Overlays
                 channelSelectionContainer.Height = 1f - height.NewValue;
                 tabBackground.FadeTo(height.NewValue == 1f ? 1f : 0.8f, 200);
             }, true);
-
             chatBackground.Colour = colours.ChatBlue;
-
             loading.Show();
 
             // This is a relatively expensive (and blocking) operation.
@@ -226,13 +228,10 @@ namespace osu.Game.Overlays
             {
                 // TODO: consider scheduling bindable callbacks to not perform when overlay is not present.
                 channelManager.JoinedChannels.CollectionChanged += joinedChannelsChanged;
-
                 foreach (Channel channel in channelManager.JoinedChannels)
                     ChannelTabControl.AddChannel(channel);
-
                 channelManager.AvailableChannels.CollectionChanged += availableChannelsChanged;
                 availableChannelsChanged(null, null);
-
                 currentChannel = channelManager.CurrentChannel.GetBoundCopy();
                 currentChannel.BindValueChanged(currentChannelChanged, true);
             });

From 58d8f0733cfed3f432879263e827fc4cc1128162 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 17:45:58 +0900
Subject: [PATCH 1574/3722] Allow using OnlineViewContainer without deriving it

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

diff --git a/osu.Game/Online/OnlineViewContainer.cs b/osu.Game/Online/OnlineViewContainer.cs
index c9fb70f0cc..8868f90524 100644
--- a/osu.Game/Online/OnlineViewContainer.cs
+++ b/osu.Game/Online/OnlineViewContainer.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Online
     /// A <see cref="Container"/> for displaying online content which require a local user to be logged in.
     /// Shows its children only when the local user is logged in and supports displaying a placeholder if not.
     /// </summary>
-    public abstract class OnlineViewContainer : Container
+    public class OnlineViewContainer : Container
     {
         protected LoadingSpinner LoadingSpinner { get; private set; }
 
@@ -30,7 +30,7 @@ namespace osu.Game.Online
         [Resolved]
         protected IAPIProvider API { get; private set; }
 
-        protected OnlineViewContainer(string placeholderMessage)
+        public OnlineViewContainer(string placeholderMessage)
         {
             this.placeholderMessage = placeholderMessage;
         }

From 0bd1964d8e7db31f84374aa079c16e43b2c33a24 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 18:04:41 +0900
Subject: [PATCH 1575/3722] Add login placeholder logic to OnlineOverlay

A perfect implementation of this would probably leave the filter/header
content visible, but that requires some re-thinking and restructuring to
how the content is displayed in these overlays (ie. the header
component shouldn't be inside the `ScrollContainer` as it is fixed).

Supersedes and closes #10774.
Closes #933.
Addresses most pieces of #7417.
---
 osu.Game/Overlays/ChangelogOverlay.cs      |  2 +-
 osu.Game/Overlays/NewsOverlay.cs           |  2 +-
 osu.Game/Overlays/OnlineOverlay.cs         | 15 ++++++++++++---
 osu.Game/Overlays/TabbableOnlineOverlay.cs |  3 +--
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/ChangelogOverlay.cs b/osu.Game/Overlays/ChangelogOverlay.cs
index 593f59555a..537dd00727 100644
--- a/osu.Game/Overlays/ChangelogOverlay.cs
+++ b/osu.Game/Overlays/ChangelogOverlay.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Overlays
         protected List<APIUpdateStream> Streams;
 
         public ChangelogOverlay()
-            : base(OverlayColourScheme.Purple)
+            : base(OverlayColourScheme.Purple, false)
         {
         }
 
diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index 08e8331dd3..5beb285216 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Overlays
         private readonly Bindable<string> article = new Bindable<string>(null);
 
         public NewsOverlay()
-            : base(OverlayColourScheme.Purple)
+            : base(OverlayColourScheme.Purple, false)
         {
         }
 
diff --git a/osu.Game/Overlays/OnlineOverlay.cs b/osu.Game/Overlays/OnlineOverlay.cs
index 7c9f751d3b..0a5ceb1993 100644
--- a/osu.Game/Overlays/OnlineOverlay.cs
+++ b/osu.Game/Overlays/OnlineOverlay.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Online;
 
 namespace osu.Game.Overlays
 {
@@ -16,10 +17,16 @@ namespace osu.Game.Overlays
         protected readonly LoadingLayer Loading;
         private readonly Container content;
 
-        protected OnlineOverlay(OverlayColourScheme colourScheme)
+        protected OnlineOverlay(OverlayColourScheme colourScheme, bool requiresSignIn = true)
             : base(colourScheme)
         {
-            base.Content.AddRange(new Drawable[]
+            var mainContent = requiresSignIn
+                ? new OnlineViewContainer($"Sign in to view the {Header.Title.Title}")
+                : new Container();
+
+            mainContent.RelativeSizeAxes = Axes.Both;
+
+            mainContent.AddRange(new Drawable[]
             {
                 ScrollFlow = new OverlayScrollContainer
                 {
@@ -41,8 +48,10 @@ namespace osu.Game.Overlays
                         }
                     }
                 },
-                Loading = new LoadingLayer(true)
+                Loading = new LoadingLayer()
             });
+
+            base.Content.Add(mainContent);
         }
     }
 }
diff --git a/osu.Game/Overlays/TabbableOnlineOverlay.cs b/osu.Game/Overlays/TabbableOnlineOverlay.cs
index 8172e99c1b..9ceab12d3d 100644
--- a/osu.Game/Overlays/TabbableOnlineOverlay.cs
+++ b/osu.Game/Overlays/TabbableOnlineOverlay.cs
@@ -61,8 +61,7 @@ namespace osu.Game.Overlays
 
             LoadComponentAsync(display, loaded =>
             {
-                if (API.IsLoggedIn)
-                    Loading.Hide();
+                Loading.Hide();
 
                 Child = loaded;
             }, (cancellationToken = new CancellationTokenSource()).Token);

From 990c1b1d6ef118c755b8cdff7150601542f47535 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 18:19:57 +0900
Subject: [PATCH 1576/3722] Revert accidental removal of newlines

---
 osu.Game/Overlays/ChatOverlay.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index f5dd4fae2c..28f2287514 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -192,7 +192,9 @@ namespace osu.Game.Overlays
                     },
                 },
             };
+
             textbox.OnCommit += postMessage;
+
             ChannelTabControl.Current.ValueChanged += current => channelManager.CurrentChannel.Value = current.NewValue;
             ChannelTabControl.ChannelSelectorActive.ValueChanged += active => ChannelSelectionOverlay.State.Value = active.NewValue ? Visibility.Visible : Visibility.Hidden;
             ChannelSelectionOverlay.State.ValueChanged += state =>
@@ -209,8 +211,10 @@ namespace osu.Game.Overlays
                 else
                     textbox.HoldFocus = true;
             };
+
             ChannelSelectionOverlay.OnRequestJoin = channel => channelManager.JoinChannel(channel);
             ChannelSelectionOverlay.OnRequestLeave = channelManager.LeaveChannel;
+
             ChatHeight = config.GetBindable<float>(OsuSetting.ChatDisplayHeight);
             ChatHeight.BindValueChanged(height =>
             {
@@ -218,7 +222,9 @@ namespace osu.Game.Overlays
                 channelSelectionContainer.Height = 1f - height.NewValue;
                 tabBackground.FadeTo(height.NewValue == 1f ? 1f : 0.8f, 200);
             }, true);
+
             chatBackground.Colour = colours.ChatBlue;
+
             loading.Show();
 
             // This is a relatively expensive (and blocking) operation.
@@ -228,10 +234,13 @@ namespace osu.Game.Overlays
             {
                 // TODO: consider scheduling bindable callbacks to not perform when overlay is not present.
                 channelManager.JoinedChannels.CollectionChanged += joinedChannelsChanged;
+
                 foreach (Channel channel in channelManager.JoinedChannels)
                     ChannelTabControl.AddChannel(channel);
+
                 channelManager.AvailableChannels.CollectionChanged += availableChannelsChanged;
                 availableChannelsChanged(null, null);
+
                 currentChannel = channelManager.CurrentChannel.GetBoundCopy();
                 currentChannel.BindValueChanged(currentChannelChanged, true);
             });

From 00574a528868d1ef31907484e71623969c0cfeaf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 18:32:28 +0900
Subject: [PATCH 1577/3722] Use ISample everywhere in Skin GetSample lookup
 path

---
 .../Skinning/Legacy/ManiaLegacySkinTransformer.cs           | 2 +-
 osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs         | 2 +-
 osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs       | 2 +-
 .../Skinning/Legacy/TaikoLegacySkinTransformer.cs           | 2 +-
 osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs   | 2 +-
 osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs       | 4 ++--
 .../NonVisual/Skinning/LegacySkinAnimationTest.cs           | 2 +-
 osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs    | 2 +-
 .../Visual/Gameplay/TestSceneSkinnableDrawable.cs           | 6 +++---
 osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs   | 2 +-
 osu.Game/Skinning/DefaultSkin.cs                            | 2 +-
 osu.Game/Skinning/ISkin.cs                                  | 2 +-
 osu.Game/Skinning/LegacyBeatmapSkin.cs                      | 2 +-
 osu.Game/Skinning/LegacySkin.cs                             | 2 +-
 osu.Game/Skinning/LegacySkinTransformer.cs                  | 2 +-
 osu.Game/Skinning/Skin.cs                                   | 2 +-
 osu.Game/Skinning/SkinManager.cs                            | 2 +-
 osu.Game/Skinning/SkinProvidingContainer.cs                 | 4 ++--
 18 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
index cbbbacfe19..24ccae895d 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/ManiaLegacySkinTransformer.cs
@@ -140,7 +140,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
             return animation == null ? null : new LegacyManiaJudgementPiece(result, animation);
         }
 
-        public override Sample GetSample(ISampleInfo sampleInfo)
+        public override ISample GetSample(ISampleInfo sampleInfo)
         {
             // layered hit sounds never play in mania
             if (sampleInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacySample && legacySample.IsLayered)
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
index e2d9f144c0..8fd13c7417 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
                 return null;
             }
 
-            public Sample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
+            public ISample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotImplementedException();
 
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
index 8dbb48c048..19b6779619 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
@@ -162,7 +162,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => null;
 
-            public Sample GetSample(ISampleInfo sampleInfo) => null;
+            public ISample GetSample(ISampleInfo sampleInfo) => null;
 
             public TValue GetValue<TConfiguration, TValue>(Func<TConfiguration, TValue> query) where TConfiguration : SkinConfiguration => default;
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => null;
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
index 9f29675230..d1214d3456 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
@@ -152,7 +152,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
             throw new ArgumentOutOfRangeException(nameof(component), $"Invalid component type: {component}");
         }
 
-        public override Sample GetSample(ISampleInfo sampleInfo) => Source.GetSample(new LegacyTaikoSampleInfo(sampleInfo));
+        public override ISample GetSample(ISampleInfo sampleInfo) => Source.GetSample(new LegacyTaikoSampleInfo(sampleInfo));
 
         public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => Source.GetConfig<TLookup, TValue>(lookup);
 
diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
index 3ded3009bd..883791c35c 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
@@ -121,7 +121,7 @@ namespace osu.Game.Tests.Gameplay
 
             public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
 
-            public Sample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
+            public ISample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
             {
diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index 7a0dd5b719..6fa1839556 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Tests.Gameplay
         public void TestRetrieveTopLevelSample()
         {
             ISkin skin = null;
-            Sample channel = null;
+            ISample channel = null;
 
             AddStep("create skin", () => skin = new TestSkin("test-sample", this));
             AddStep("retrieve sample", () => channel = skin.GetSample(new SampleInfo("test-sample")));
@@ -47,7 +47,7 @@ namespace osu.Game.Tests.Gameplay
         public void TestRetrieveSampleInSubFolder()
         {
             ISkin skin = null;
-            Sample channel = null;
+            ISample channel = null;
 
             AddStep("create skin", () => skin = new TestSkin("folder/test-sample", this));
             AddStep("retrieve sample", () => channel = skin.GetSample(new SampleInfo("folder/test-sample")));
diff --git a/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs b/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs
index da004b9088..b08a228de3 100644
--- a/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs
+++ b/osu.Game.Tests/NonVisual/Skinning/LegacySkinAnimationTest.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Tests.NonVisual.Skinning
             }
 
             public Drawable GetDrawableComponent(ISkinComponent component) => throw new NotSupportedException();
-            public Sample GetSample(ISampleInfo sampleInfo) => throw new NotSupportedException();
+            public ISample GetSample(ISampleInfo sampleInfo) => throw new NotSupportedException();
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotSupportedException();
         }
 
diff --git a/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs b/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
index 414f7d3f88..732a3f3f42 100644
--- a/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
+++ b/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
@@ -219,7 +219,7 @@ namespace osu.Game.Tests.Skins
 
             public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => skin.GetTexture(componentName, wrapModeS, wrapModeT);
 
-            public Sample GetSample(ISampleInfo sampleInfo) => skin.GetSample(sampleInfo);
+            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.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
index 44142b69d7..7a6e2f54c2 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
@@ -298,7 +298,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
 
-            public Sample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
+            public ISample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotImplementedException();
         }
@@ -309,7 +309,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
 
-            public Sample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
+            public ISample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotImplementedException();
         }
@@ -321,7 +321,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => throw new NotImplementedException();
 
-            public Sample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
+            public ISample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
 
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotImplementedException();
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
index d688e9cb21..d792405eeb 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableSound.cs
@@ -145,7 +145,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public Drawable GetDrawableComponent(ISkinComponent component) => source?.GetDrawableComponent(component);
             public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => source?.GetTexture(componentName, wrapModeS, wrapModeT);
-            public Sample GetSample(ISampleInfo sampleInfo) => source?.GetSample(sampleInfo);
+            public ISample GetSample(ISampleInfo sampleInfo) => source?.GetSample(sampleInfo);
             public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => source?.GetConfig<TLookup, TValue>(lookup);
 
             public void TriggerSourceChanged()
diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index 346c7b3c65..0b3f5f3cde 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Skinning
 
         public override Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => null;
 
-        public override Sample GetSample(ISampleInfo sampleInfo) => null;
+        public override ISample GetSample(ISampleInfo sampleInfo) => null;
 
         public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
         {
diff --git a/osu.Game/Skinning/ISkin.cs b/osu.Game/Skinning/ISkin.cs
index ef8de01042..73f7cf6d39 100644
--- a/osu.Game/Skinning/ISkin.cs
+++ b/osu.Game/Skinning/ISkin.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Skinning
         /// <param name="sampleInfo">The requested sample.</param>
         /// <returns>A matching sample channel, or null if unavailable.</returns>
         [CanBeNull]
-        Sample GetSample(ISampleInfo sampleInfo);
+        ISample GetSample(ISampleInfo sampleInfo);
 
         /// <summary>
         /// Retrieve a configuration value.
diff --git a/osu.Game/Skinning/LegacyBeatmapSkin.cs b/osu.Game/Skinning/LegacyBeatmapSkin.cs
index fb4207b647..3ec205e897 100644
--- a/osu.Game/Skinning/LegacyBeatmapSkin.cs
+++ b/osu.Game/Skinning/LegacyBeatmapSkin.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Skinning
             return base.GetConfig<TLookup, TValue>(lookup);
         }
 
-        public override Sample GetSample(ISampleInfo sampleInfo)
+        public override ISample GetSample(ISampleInfo sampleInfo)
         {
             if (sampleInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacy && legacy.CustomSampleBank == 0)
             {
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index e5d0217671..1ee797098c 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -452,7 +452,7 @@ namespace osu.Game.Skinning
             return null;
         }
 
-        public override Sample GetSample(ISampleInfo sampleInfo)
+        public override ISample GetSample(ISampleInfo sampleInfo)
         {
             IEnumerable<string> lookupNames;
 
diff --git a/osu.Game/Skinning/LegacySkinTransformer.cs b/osu.Game/Skinning/LegacySkinTransformer.cs
index e2f4a82a54..ae8faf1a3b 100644
--- a/osu.Game/Skinning/LegacySkinTransformer.cs
+++ b/osu.Game/Skinning/LegacySkinTransformer.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Skinning
         public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
             => Source.GetTexture(componentName, wrapModeS, wrapModeT);
 
-        public virtual Sample GetSample(ISampleInfo sampleInfo)
+        public virtual ISample GetSample(ISampleInfo sampleInfo)
         {
             if (!(sampleInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacySample))
                 return Source.GetSample(sampleInfo);
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index e8d84b49f9..13f5385c20 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Skinning
 
         public abstract Drawable GetDrawableComponent(ISkinComponent componentName);
 
-        public abstract Sample GetSample(ISampleInfo sampleInfo);
+        public abstract ISample GetSample(ISampleInfo sampleInfo);
 
         public Texture GetTexture(string componentName) => GetTexture(componentName, default, default);
 
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 2826c826a5..9e730b2ce1 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -171,7 +171,7 @@ namespace osu.Game.Skinning
 
         public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => CurrentSkin.Value.GetTexture(componentName, wrapModeS, wrapModeT);
 
-        public Sample GetSample(ISampleInfo sampleInfo) => CurrentSkin.Value.GetSample(sampleInfo);
+        public ISample GetSample(ISampleInfo sampleInfo) => CurrentSkin.Value.GetSample(sampleInfo);
 
         public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => CurrentSkin.Value.GetConfig<TLookup, TValue>(lookup);
 
diff --git a/osu.Game/Skinning/SkinProvidingContainer.cs b/osu.Game/Skinning/SkinProvidingContainer.cs
index ba67d0a678..cf22b2e820 100644
--- a/osu.Game/Skinning/SkinProvidingContainer.cs
+++ b/osu.Game/Skinning/SkinProvidingContainer.cs
@@ -59,9 +59,9 @@ namespace osu.Game.Skinning
             return fallbackSource?.GetTexture(componentName, wrapModeS, wrapModeT);
         }
 
-        public Sample GetSample(ISampleInfo sampleInfo)
+        public ISample GetSample(ISampleInfo sampleInfo)
         {
-            Sample sourceChannel;
+            ISample sourceChannel;
             if (AllowSampleLookup(sampleInfo) && (sourceChannel = skin?.GetSample(sampleInfo)) != null)
                 return sourceChannel;
 

From 4aff54412a0a23707b4284510705dd2b2c91492d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 18:32:39 +0900
Subject: [PATCH 1578/3722] Move dispose method to end of file

---
 osu.Game/Skinning/LegacySkin.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 1ee797098c..12abc4d867 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -100,13 +100,6 @@ namespace osu.Game.Skinning
                 true) != null);
         }
 
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-            Textures?.Dispose();
-            Samples?.Dispose();
-        }
-
         public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
         {
             switch (lookup)
@@ -504,5 +497,12 @@ namespace osu.Game.Skinning
             string lastPiece = componentName.Split('/').Last();
             yield return componentName.StartsWith("Gameplay/taiko/", StringComparison.Ordinal) ? "taiko-" + lastPiece : lastPiece;
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            Textures?.Dispose();
+            Samples?.Dispose();
+        }
     }
 }

From 880fe820733d9159c6eb866f85336b01081ea1c2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 18:32:51 +0900
Subject: [PATCH 1579/3722] Add sample wrapper in LegacySkin to keep a
 reference and avoid GC death

---
 osu.Game/Skinning/LegacySkin.cs | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 12abc4d867..5d015ca5ab 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -461,12 +461,43 @@ namespace osu.Game.Skinning
                 var sample = Samples?.Get(lookup);
 
                 if (sample != null)
-                    return sample;
+                    return new LegacySkinSample(sample, this);
             }
 
             return null;
         }
 
+        /// <summary>
+        /// A sample wrapper which keeps a reference to the contained skin to avoid finalizer garbage collection of the managing SampleStore.
+        /// </summary>
+        private class LegacySkinSample : ISample
+        {
+            private readonly Sample sample;
+
+            [UsedImplicitly]
+            private readonly LegacySkin skin;
+
+            public LegacySkinSample(Sample sample, LegacySkin skin)
+            {
+                this.sample = sample;
+                this.skin = skin;
+            }
+
+            public SampleChannel Play()
+            {
+                return sample.Play();
+            }
+
+            public SampleChannel GetChannel()
+            {
+                return sample.GetChannel();
+            }
+
+            public double Length => sample.Length;
+
+            public Bindable<int> PlaybackConcurrency => sample.PlaybackConcurrency;
+        }
+
         private IEnumerable<string> getLegacyLookupNames(HitSampleInfo hitSample)
         {
             var lookupNames = hitSample.LookupNames.SelectMany(getFallbackNames);

From 487a39eea95a5215d5aec323c923a600144ba51a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 18:52:34 +0900
Subject: [PATCH 1580/3722] Update interface implementations with framework
 changes

---
 .../TestSceneDrawableRulesetDependencies.cs   |  6 ++--
 .../UI/DrawableRulesetDependencies.cs         | 11 +++++++
 osu.Game/Skinning/LegacySkin.cs               | 33 +++++++++++++++++++
 osu.Game/Skinning/PoolableSkinnableSample.cs  |  8 +++++
 osu.Game/Skinning/SkinnableSound.cs           | 17 ++++++----
 5 files changed, 67 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs b/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
index 787f72ba79..a2f2c5e41f 100644
--- a/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
+++ b/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
@@ -118,9 +118,11 @@ namespace osu.Game.Tests.Rulesets
             public BindableNumber<double> Frequency => throw new NotImplementedException();
             public BindableNumber<double> Tempo => throw new NotImplementedException();
 
-            public void AddAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => throw new NotImplementedException();
+            public void BindAdjustments(IAggregateAudioAdjustment component) => throw new NotImplementedException();
+            public void UnbindAdjustments(IAggregateAudioAdjustment component) => throw new NotImplementedException();
 
-            public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => throw new NotImplementedException();
+            public void AddAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) => throw new NotImplementedException();
+            public void RemoveAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) => throw new NotImplementedException();
 
             public void RemoveAllAdjustments(AdjustableProperty type) => throw new NotImplementedException();
 
diff --git a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
index deec948d14..6c31f05337 100644
--- a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
+++ b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
@@ -114,6 +114,11 @@ namespace osu.Game.Rulesets.UI
 
             public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => throw new NotSupportedException();
 
+            public void RemoveAdjustment(AdjustableProperty type, IBindable<double> adjustBindable)
+            {
+                throw new NotImplementedException();
+            }
+
             public void RemoveAllAdjustments(AdjustableProperty type) => throw new NotSupportedException();
 
             public BindableNumber<double> Volume => throw new NotSupportedException();
@@ -124,6 +129,12 @@ namespace osu.Game.Rulesets.UI
 
             public BindableNumber<double> Tempo => throw new NotSupportedException();
 
+            public void BindAdjustments(IAggregateAudioAdjustment component) => throw new NotImplementedException();
+
+            public void UnbindAdjustments(IAggregateAudioAdjustment component) => throw new NotImplementedException();
+
+            public void AddAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) => throw new NotImplementedException();
+
             public IBindable<double> GetAggregate(AdjustableProperty type) => throw new NotSupportedException();
 
             public IBindable<double> AggregateVolume => throw new NotSupportedException();
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 5d015ca5ab..2edc36a770 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -7,6 +7,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using JetBrains.Annotations;
+using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -496,6 +497,38 @@ namespace osu.Game.Skinning
             public double Length => sample.Length;
 
             public Bindable<int> PlaybackConcurrency => sample.PlaybackConcurrency;
+            public BindableNumber<double> Volume => sample.Volume;
+
+            public BindableNumber<double> Balance => sample.Balance;
+
+            public BindableNumber<double> Frequency => sample.Frequency;
+
+            public BindableNumber<double> Tempo => sample.Tempo;
+
+            public void BindAdjustments(IAggregateAudioAdjustment component)
+            {
+                sample.BindAdjustments(component);
+            }
+
+            public void UnbindAdjustments(IAggregateAudioAdjustment component)
+            {
+                sample.UnbindAdjustments(component);
+            }
+
+            public void AddAdjustment(AdjustableProperty type, IBindable<double> adjustBindable)
+            {
+                sample.AddAdjustment(type, adjustBindable);
+            }
+
+            public void RemoveAdjustment(AdjustableProperty type, IBindable<double> adjustBindable)
+            {
+                sample.RemoveAdjustment(type, adjustBindable);
+            }
+
+            public void RemoveAllAdjustments(AdjustableProperty type)
+            {
+                sample.RemoveAllAdjustments(type);
+            }
         }
 
         private IEnumerable<string> getLegacyLookupNames(HitSampleInfo hitSample)
diff --git a/osu.Game/Skinning/PoolableSkinnableSample.cs b/osu.Game/Skinning/PoolableSkinnableSample.cs
index 9025fdbd0f..b12fbf90f3 100644
--- a/osu.Game/Skinning/PoolableSkinnableSample.cs
+++ b/osu.Game/Skinning/PoolableSkinnableSample.cs
@@ -165,6 +165,14 @@ namespace osu.Game.Skinning
 
         public BindableNumber<double> Tempo => sampleContainer.Tempo;
 
+        public void BindAdjustments(IAggregateAudioAdjustment component) => sampleContainer.BindAdjustments(component);
+
+        public void UnbindAdjustments(IAggregateAudioAdjustment component) => sampleContainer.UnbindAdjustments(component);
+
+        public void AddAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) => sampleContainer.AddAdjustment(type, adjustBindable);
+
+        public void RemoveAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) => sampleContainer.RemoveAdjustment(type, adjustBindable);
+
         public void AddAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => sampleContainer.AddAdjustment(type, adjustBindable);
 
         public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => sampleContainer.RemoveAdjustment(type, adjustBindable);
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index b3db2d6558..c971517c7f 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -176,14 +176,19 @@ namespace osu.Game.Skinning
 
         public BindableNumber<double> Tempo => samplesContainer.Tempo;
 
-        public void AddAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable)
-            => samplesContainer.AddAdjustment(type, adjustBindable);
+        public void BindAdjustments(IAggregateAudioAdjustment component) => samplesContainer.BindAdjustments(component);
 
-        public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable)
-            => samplesContainer.RemoveAdjustment(type, adjustBindable);
+        public void UnbindAdjustments(IAggregateAudioAdjustment component) => samplesContainer.UnbindAdjustments(component);
 
-        public void RemoveAllAdjustments(AdjustableProperty type)
-            => samplesContainer.RemoveAllAdjustments(type);
+        public void AddAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) => samplesContainer.AddAdjustment(type, adjustBindable);
+
+        public void RemoveAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) => samplesContainer.RemoveAdjustment(type, adjustBindable);
+
+        public void AddAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => samplesContainer.AddAdjustment(type, adjustBindable);
+
+        public void RemoveAdjustment(AdjustableProperty type, BindableNumber<double> adjustBindable) => samplesContainer.RemoveAdjustment(type, adjustBindable);
+
+        public void RemoveAllAdjustments(AdjustableProperty type) => samplesContainer.RemoveAllAdjustments(type);
 
         /// <summary>
         /// Whether any samples are currently playing.

From a01896a652ee042cc66149a99ccf5b76dddef535 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 18 Feb 2021 13:04:22 +0300
Subject: [PATCH 1581/3722] Fix misordered hit error in score meter types

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

diff --git a/osu.Game/Configuration/ScoreMeterType.cs b/osu.Game/Configuration/ScoreMeterType.cs
index b9499c758e..ddbd2327c2 100644
--- a/osu.Game/Configuration/ScoreMeterType.cs
+++ b/osu.Game/Configuration/ScoreMeterType.cs
@@ -16,12 +16,12 @@ namespace osu.Game.Configuration
         [Description("Hit Error (right)")]
         HitErrorRight,
 
-        [Description("Hit Error (bottom)")]
-        HitErrorBottom,
-
         [Description("Hit Error (left+right)")]
         HitErrorBoth,
 
+        [Description("Hit Error (bottom)")]
+        HitErrorBottom,
+
         [Description("Colour (left)")]
         ColourLeft,
 

From d85a4a22e525cc4914c12bbe067e79f7ef8ba8cb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 19:19:28 +0900
Subject: [PATCH 1582/3722] Allow beatmap imports from any derived version of
 SongSelect, rather than only PlaySongSelect

---
 osu.Game/OsuGame.cs               | 2 +-
 osu.Game/PerformFromMenuRunner.cs | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 15785ea6bd..771bcd2310 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -383,7 +383,7 @@ namespace osu.Game
 
                 Ruleset.Value = selection.Ruleset;
                 Beatmap.Value = BeatmapManager.GetWorkingBeatmap(selection);
-            }, validScreens: new[] { typeof(PlaySongSelect) });
+            }, validScreens: new[] { typeof(SongSelect) });
         }
 
         /// <summary>
diff --git a/osu.Game/PerformFromMenuRunner.cs b/osu.Game/PerformFromMenuRunner.cs
index 7999023998..3df9ca5305 100644
--- a/osu.Game/PerformFromMenuRunner.cs
+++ b/osu.Game/PerformFromMenuRunner.cs
@@ -82,7 +82,9 @@ namespace osu.Game
             game?.CloseAllOverlays(false);
 
             // we may already be at the target screen type.
-            if (validScreens.Contains(current.GetType()) && !beatmap.Disabled)
+            var type = current.GetType();
+
+            if (validScreens.Any(t => type.IsAssignableFrom(t)) && !beatmap.Disabled)
             {
                 finalAction(current);
                 Cancel();
@@ -91,13 +93,14 @@ namespace osu.Game
 
             while (current != null)
             {
-                if (validScreens.Contains(current.GetType()))
+                if (validScreens.Any(t => type.IsAssignableFrom(t)))
                 {
                     current.MakeCurrent();
                     break;
                 }
 
                 current = current.GetParentScreen();
+                type = current?.GetType();
             }
         }
 

From 8a1a4ea2d42874d1dc752d4ec6a3371d02940054 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 18 Feb 2021 19:33:04 +0900
Subject: [PATCH 1583/3722] Set Current directly

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

diff --git a/osu.Game/Collections/CollectionFilterDropdown.cs b/osu.Game/Collections/CollectionFilterDropdown.cs
index aad8400faa..bb743d4ccc 100644
--- a/osu.Game/Collections/CollectionFilterDropdown.cs
+++ b/osu.Game/Collections/CollectionFilterDropdown.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Collections
             // Dropdown has logic which triggers a change on the bindable with every change to the contained items.
             // This is not desirable here, as it leads to multiple filter operations running even though nothing has changed.
             // An extra bindable is enough to subvert this behaviour.
-            base.Current.BindTo(Current);
+            base.Current = Current;
 
             collections.BindCollectionChanged((_, __) => collectionsChanged(), true);
             Current.BindValueChanged(filterChanged, true);

From e14a59f272f7c5feaab972493c2fc8cf1a91c3e6 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 18 Feb 2021 15:26:59 +0300
Subject: [PATCH 1584/3722] Fix creating ruleset instances per LINQ select

---
 .../OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
index 25bc314f1b..5bef934e6a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
@@ -163,7 +163,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 
             const double fade_time = 50;
 
-            var ruleset = rulesets.GetRuleset(Room.Settings.RulesetID);
+            var ruleset = rulesets.GetRuleset(Room.Settings.RulesetID).CreateInstance();
 
             var currentModeRank = User.User?.RulesetsStatistics?.GetValueOrDefault(ruleset.ShortName)?.GlobalRank;
             userRankText.Text = currentModeRank != null ? $"#{currentModeRank.Value:N0}" : string.Empty;
@@ -177,7 +177,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 
             // If the mods are updated at the end of the frame, the flow container will skip a reflow cycle: https://github.com/ppy/osu-framework/issues/4187
             // This looks particularly jarring here, so re-schedule the update to that start of our frame as a fix.
-            Schedule(() => userModsDisplay.Current.Value = User.Mods.Select(m => m.ToMod(ruleset.CreateInstance())).ToList());
+            Schedule(() => userModsDisplay.Current.Value = User.Mods.Select(m => m.ToMod(ruleset)).ToList());
         }
 
         public MenuItem[] ContextMenuItems

From a407bfe73bc0e4aefce7a30a00a4daf6cb30c481 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 18 Feb 2021 15:37:52 +0300
Subject: [PATCH 1585/3722] Privatize `UserRanks` and expose a similar
 `CountryRank` field instead

---
 .../Visual/Online/TestSceneUserProfileOverlay.cs    |  2 +-
 .../Profile/Header/CentreHeaderContainer.cs         |  2 +-
 .../Profile/Header/DetailHeaderContainer.cs         |  2 +-
 osu.Game/Users/UserStatistics.cs                    | 13 +++++++++----
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
index b52cc6edb6..03d079261d 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Tests.Visual.Online
             Statistics = new UserStatistics
             {
                 GlobalRank = 2148,
-                Ranks = new UserStatistics.UserRanks { Country = 1, },
+                CountryRank = 1,
                 PP = 4567.89m,
                 Level = new UserStatistics.LevelInfo
                 {
diff --git a/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
index 9285e2d875..62ebee7677 100644
--- a/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
@@ -145,7 +145,7 @@ namespace osu.Game.Overlays.Profile.Header
         private void updateDisplay(User user)
         {
             hiddenDetailGlobal.Content = user?.Statistics?.GlobalRank?.ToString("\\##,##0") ?? "-";
-            hiddenDetailCountry.Content = user?.Statistics?.Ranks.Country?.ToString("\\##,##0") ?? "-";
+            hiddenDetailCountry.Content = user?.Statistics?.CountryRank?.ToString("\\##,##0") ?? "-";
         }
     }
 }
diff --git a/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs
index 05a0508e1f..574aef02fd 100644
--- a/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs
@@ -177,7 +177,7 @@ namespace osu.Game.Overlays.Profile.Header
                 scoreRankInfo.Value.RankCount = user?.Statistics?.GradesCount[scoreRankInfo.Key] ?? 0;
 
             detailGlobalRank.Content = user?.Statistics?.GlobalRank?.ToString("\\##,##0") ?? "-";
-            detailCountryRank.Content = user?.Statistics?.Ranks.Country?.ToString("\\##,##0") ?? "-";
+            detailCountryRank.Content = user?.Statistics?.CountryRank?.ToString("\\##,##0") ?? "-";
 
             rankGraph.Statistics.Value = user?.Statistics;
         }
diff --git a/osu.Game/Users/UserStatistics.cs b/osu.Game/Users/UserStatistics.cs
index e50ca57d90..90c1d40848 100644
--- a/osu.Game/Users/UserStatistics.cs
+++ b/osu.Game/Users/UserStatistics.cs
@@ -29,10 +29,15 @@ namespace osu.Game.Users
         [JsonProperty(@"global_rank")]
         public int? GlobalRank;
 
-        // eventually UserRanks object will be completely replaced with separate global rank (exists) and country rank properties
-        // see https://github.com/ppy/osu-web/blob/cb79bb72186c8f1a25f6a6f5ef315123decb4231/app/Transformers/UserStatisticsTransformer.php#L53.
+        public int? CountryRank;
+
         [JsonProperty(@"rank")]
-        public UserRanks Ranks;
+        private UserRanks ranks
+        {
+            // eventually that will also become an own json property instead of reading from a `rank` object.
+            // see https://github.com/ppy/osu-web/blob/cb79bb72186c8f1a25f6a6f5ef315123decb4231/app/Transformers/UserStatisticsTransformer.php#L53.
+            set => CountryRank = value.Country;
+        }
 
         [JsonProperty(@"pp")]
         public decimal? PP;
@@ -115,7 +120,7 @@ namespace osu.Game.Users
             }
         }
 
-        public struct UserRanks
+        private struct UserRanks
         {
             [JsonProperty(@"country")]
             public int? Country;

From f6df5a9d2b67272e6a1e42a6cd71dad5777c0e02 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 18 Feb 2021 15:55:45 +0300
Subject: [PATCH 1586/3722] Suppress false warning

---
 osu.Game/Users/UserStatistics.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Users/UserStatistics.cs b/osu.Game/Users/UserStatistics.cs
index 90c1d40848..4b1e46d51a 100644
--- a/osu.Game/Users/UserStatistics.cs
+++ b/osu.Game/Users/UserStatistics.cs
@@ -122,8 +122,10 @@ namespace osu.Game.Users
 
         private struct UserRanks
         {
+#pragma warning disable 649
             [JsonProperty(@"country")]
             public int? Country;
+#pragma warning restore 649
         }
 
         public RankHistoryData RankHistory;

From 10ec4cd8e07950b8a48e8da8931e3e39b16559b8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 22:38:17 +0900
Subject: [PATCH 1587/3722] Revert change to loading layer's default state

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

diff --git a/osu.Game/Overlays/OnlineOverlay.cs b/osu.Game/Overlays/OnlineOverlay.cs
index 0a5ceb1993..de33e4a1bc 100644
--- a/osu.Game/Overlays/OnlineOverlay.cs
+++ b/osu.Game/Overlays/OnlineOverlay.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Overlays
                         }
                     }
                 },
-                Loading = new LoadingLayer()
+                Loading = new LoadingLayer(true)
             });
 
             base.Content.Add(mainContent);

From 4caca9653ab02ddbb9dea6105bb5cbeb807fae2b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Feb 2021 10:39:56 +0900
Subject: [PATCH 1588/3722] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index e30416bc1c..bc5ba57d71 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.215.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.219.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 72f680f6f8..fef2f567df 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.215.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.219.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.0.1" />
     <PackageReference Include="SharpCompress" Version="0.27.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 137c96a72d..0d473290e6 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.215.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.219.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -91,7 +91,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.215.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.219.0" />
     <PackageReference Include="SharpCompress" Version="0.27.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From bc10fcafae2d57b6bb07d6bf666ee72577e5b8f9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 19 Feb 2021 13:23:01 +0900
Subject: [PATCH 1589/3722] Remove now unnecessary schedule

---
 .../Multiplayer/MultiplayerMatchSubScreen.cs     | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index b5eff04532..cb2b6dda95 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -47,7 +47,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         private Drawable userModsSection;
 
         private readonly IBindable<bool> isConnected = new Bindable<bool>();
-        private readonly IBindable<PlaylistItem> matchCurrentItem = new Bindable<PlaylistItem>();
 
         [CanBeNull]
         private IDisposable readyClickOperation;
@@ -269,8 +268,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             base.LoadComplete();
 
-            matchCurrentItem.BindTo(client.CurrentMatchPlayingItem);
-            matchCurrentItem.BindValueChanged(onCurrentItemChanged, true);
+            SelectedItem.BindTo(client.CurrentMatchPlayingItem);
+            SelectedItem.BindValueChanged(onSelectedItemChanged, true);
 
             BeatmapAvailability.BindValueChanged(updateBeatmapAvailability, true);
             UserMods.BindValueChanged(onUserModsChanged);
@@ -286,20 +285,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             }, true);
         }
 
-        private void onCurrentItemChanged(ValueChangedEvent<PlaylistItem> item)
+        private void onSelectedItemChanged(ValueChangedEvent<PlaylistItem> item)
         {
             if (client?.LocalUser == null)
                 return;
 
-            // If we're about to enter gameplay, schedule the item to be set at a later time.
-            if (client.LocalUser.State > MultiplayerUserState.Ready)
-            {
-                Schedule(() => onCurrentItemChanged(item));
-                return;
-            }
-
-            SelectedItem.Value = item.NewValue;
-
             if (item.NewValue?.AllowedMods.Any() != true)
             {
                 userModsSection.Hide();

From 841c2c56d961e7eb76cb48f4fe2686f9250e6e7a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Feb 2021 13:30:42 +0900
Subject: [PATCH 1590/3722] Remove confusing pp_rank include (will be removed
 osu-web side too)

---
 osu.Game/Users/UserStatistics.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Users/UserStatistics.cs b/osu.Game/Users/UserStatistics.cs
index 4b1e46d51a..70969ea737 100644
--- a/osu.Game/Users/UserStatistics.cs
+++ b/osu.Game/Users/UserStatistics.cs
@@ -42,9 +42,6 @@ namespace osu.Game.Users
         [JsonProperty(@"pp")]
         public decimal? PP;
 
-        [JsonProperty(@"pp_rank")]
-        public int PPRank;
-
         [JsonProperty(@"ranked_score")]
         public long RankedScore;
 

From 183a481a345ea4fff4b55dd6df7fcdbc4e1dad4b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 19 Feb 2021 13:32:32 +0900
Subject: [PATCH 1591/3722] Refactor playlist update to remove .Contains()
 check

---
 .../Multiplayer/StatefulMultiplayerClient.cs  | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 416162779d..ed97307c95 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -537,21 +537,30 @@ namespace osu.Game.Online.Multiplayer
             var mods = settings.RequiredMods.Select(m => m.ToMod(ruleset));
             var allowedMods = settings.AllowedMods.Select(m => m.ToMod(ruleset));
 
-            // Update an existing playlist item from the API room, or create a new item.
-            var playlistItem = apiRoom.Playlist.FirstOrDefault(i => i.ID == settings.PlaylistItemId) ?? new PlaylistItem();
+            // Try to retrieve the existing playlist item from the API room.
+            var playlistItem = apiRoom.Playlist.FirstOrDefault(i => i.ID == settings.PlaylistItemId);
 
-            playlistItem.ID = settings.PlaylistItemId;
-            playlistItem.Beatmap.Value = beatmap;
-            playlistItem.Ruleset.Value = ruleset.RulesetInfo;
-            playlistItem.RequiredMods.Clear();
-            playlistItem.RequiredMods.AddRange(mods);
-            playlistItem.AllowedMods.Clear();
-            playlistItem.AllowedMods.AddRange(allowedMods);
-
-            if (!apiRoom.Playlist.Contains(playlistItem))
+            if (playlistItem != null)
+                updateItem(playlistItem);
+            else
+            {
+                // An existing playlist item does not exist, so append a new one.
+                updateItem(playlistItem = new PlaylistItem());
                 apiRoom.Playlist.Add(playlistItem);
+            }
 
             CurrentMatchPlayingItem.Value = playlistItem;
+
+            void updateItem(PlaylistItem item)
+            {
+                item.ID = settings.PlaylistItemId;
+                item.Beatmap.Value = beatmap;
+                item.Ruleset.Value = ruleset.RulesetInfo;
+                item.RequiredMods.Clear();
+                item.RequiredMods.AddRange(mods);
+                item.AllowedMods.Clear();
+                item.AllowedMods.AddRange(allowedMods);
+            }
         }
 
         /// <summary>

From 85a844a37820425e05df93d2d615593dbcc1989f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Feb 2021 13:40:12 +0900
Subject: [PATCH 1592/3722] Restructure class slightly

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

diff --git a/osu.Game/Users/UserStatistics.cs b/osu.Game/Users/UserStatistics.cs
index 70969ea737..78e6f5a05a 100644
--- a/osu.Game/Users/UserStatistics.cs
+++ b/osu.Game/Users/UserStatistics.cs
@@ -39,6 +39,9 @@ namespace osu.Game.Users
             set => CountryRank = value.Country;
         }
 
+        // populated via User model, as that's where the data currently lives.
+        public RankHistoryData RankHistory;
+
         [JsonProperty(@"pp")]
         public decimal? PP;
 
@@ -117,14 +120,12 @@ namespace osu.Game.Users
             }
         }
 
+#pragma warning disable 649
         private struct UserRanks
         {
-#pragma warning disable 649
             [JsonProperty(@"country")]
             public int? Country;
-#pragma warning restore 649
         }
-
-        public RankHistoryData RankHistory;
+#pragma warning restore 649
     }
 }

From c0e0bd4f421764ae6418597ed30bb64d501a69e8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 19 Feb 2021 13:57:04 +0900
Subject: [PATCH 1593/3722] Add compatibility with old server build

---
 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index ed97307c95..bfd505fb19 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -94,6 +94,10 @@ namespace osu.Game.Online.Multiplayer
         [Resolved]
         private RulesetStore rulesets { get; set; } = null!;
 
+        // Only exists for compatibility with old osu-server-spectator build.
+        // Todo: Can be removed on 2021/02/26.
+        private long defaultPlaylistItemId;
+
         private Room? apiRoom;
 
         [BackgroundDependencyLoader]
@@ -141,6 +145,7 @@ namespace osu.Game.Online.Multiplayer
                 {
                     Room = joinedRoom;
                     apiRoom = room;
+                    defaultPlaylistItemId = apiRoom.Playlist.FirstOrDefault()?.ID ?? 0;
                 }, cancellationSource.Token);
 
                 // Update room settings.
@@ -553,7 +558,7 @@ namespace osu.Game.Online.Multiplayer
 
             void updateItem(PlaylistItem item)
             {
-                item.ID = settings.PlaylistItemId;
+                item.ID = settings.PlaylistItemId == 0 ? defaultPlaylistItemId : settings.PlaylistItemId;
                 item.Beatmap.Value = beatmap;
                 item.Ruleset.Value = ruleset.RulesetInfo;
                 item.RequiredMods.Clear();

From 87edf6787981a49c7160dac2d26beebf8b404416 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Feb 2021 14:07:39 +0900
Subject: [PATCH 1594/3722] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index bc5ba57d71..bfdc8f6b3c 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.219.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.219.1" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index fef2f567df..4138fc8d6c 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.219.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.219.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.0.1" />
     <PackageReference Include="SharpCompress" Version="0.27.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 0d473290e6..783b638aa0 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.219.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.219.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -91,7 +91,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.219.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.219.1" />
     <PackageReference Include="SharpCompress" Version="0.27.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 1701d69a602520fb75c7f39f5c3fe7ad7d9f641d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Feb 2021 14:33:08 +0900
Subject: [PATCH 1595/3722] Fix calls to IsAssignableFrom being back-to-front

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

diff --git a/osu.Game/PerformFromMenuRunner.cs b/osu.Game/PerformFromMenuRunner.cs
index 3df9ca5305..a4179c94da 100644
--- a/osu.Game/PerformFromMenuRunner.cs
+++ b/osu.Game/PerformFromMenuRunner.cs
@@ -84,7 +84,7 @@ namespace osu.Game
             // we may already be at the target screen type.
             var type = current.GetType();
 
-            if (validScreens.Any(t => type.IsAssignableFrom(t)) && !beatmap.Disabled)
+            if (validScreens.Any(t => t.IsAssignableFrom(type)) && !beatmap.Disabled)
             {
                 finalAction(current);
                 Cancel();
@@ -93,7 +93,7 @@ namespace osu.Game
 
             while (current != null)
             {
-                if (validScreens.Any(t => type.IsAssignableFrom(t)))
+                if (validScreens.Any(t => t.IsAssignableFrom(type)))
                 {
                     current.MakeCurrent();
                     break;

From 39059ed82d57fa526018371089dc609c1fc0b7b3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Feb 2021 14:36:51 +0900
Subject: [PATCH 1596/3722] Remove unnecessary null coalesce check

---
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 15e12eac40..da516798c8 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -166,19 +166,21 @@ namespace osu.Game.Screens.OnlinePlay.Match
         {
             updateWorkingBeatmap();
 
-            if (SelectedItem.Value == null)
+            var selected = SelectedItem.Value;
+
+            if (selected == null)
                 return;
 
             // Remove any user mods that are no longer allowed.
             UserMods.Value = UserMods.Value
-                                     .Where(m => SelectedItem.Value.AllowedMods.Any(a => m.GetType() == a.GetType()))
+                                     .Where(m => selected.AllowedMods.Any(a => m.GetType() == a.GetType()))
                                      .ToList();
 
             UpdateMods();
 
-            Ruleset.Value = SelectedItem.Value.Ruleset.Value;
+            Ruleset.Value = selected.Ruleset.Value;
 
-            if (SelectedItem.Value?.AllowedMods.Any() != true)
+            if (selected.AllowedMods.Any() != true)
             {
                 UserModsSection?.Hide();
                 userModsSelectOverlay.Hide();
@@ -187,7 +189,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
             else
             {
                 UserModsSection?.Show();
-                userModsSelectOverlay.IsValidMod = m => SelectedItem.Value.AllowedMods.Any(a => a.GetType() == m.GetType());
+                userModsSelectOverlay.IsValidMod = m => selected.AllowedMods.Any(a => a.GetType() == m.GetType());
             }
         }
 

From 484968d797852ce71cb412ade2e43e11b267cd0f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Feb 2021 14:46:10 +0900
Subject: [PATCH 1597/3722] Fix weird bool check

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
---
 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 52705302aa..4a689314db 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -172,7 +172,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
 
             Ruleset.Value = selected.Ruleset.Value;
 
-            if (selected.AllowedMods.Any() != true)
+            if (!selected.AllowedMods.Any())
             {
                 UserModsSection?.Hide();
                 userModsSelectOverlay.Hide();

From ee9e6fff402b146f2c99b8a872f3fe3f5cfc703f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Feb 2021 15:09:41 +0900
Subject: [PATCH 1598/3722] Add bindable flow for expanded leaderboard state

---
 .../Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs    | 1 +
 osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs              | 4 ++++
 osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs         | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
index aab69d687a..026c302642 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -85,6 +85,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         public void TestScoreUpdates()
         {
             AddRepeatStep("update state", () => streamingClient.RandomlyUpdateState(), 100);
+            AddToggleStep("switch compact mode", expanded => leaderboard.Expanded.Value = expanded);
         }
 
         [Test]
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index 7b94bf19ec..20e24ed945 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Linq;
 using JetBrains.Annotations;
+using osu.Framework.Bindables;
 using osu.Framework.Caching;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -16,6 +17,8 @@ namespace osu.Game.Screens.Play.HUD
     {
         private readonly Cached sorting = new Cached();
 
+        public Bindable<bool> Expanded = new Bindable<bool>();
+
         public GameplayLeaderboard()
         {
             Width = GameplayLeaderboardScore.EXTENDED_WIDTH + GameplayLeaderboardScore.SHEAR_WIDTH;
@@ -49,6 +52,7 @@ namespace osu.Game.Screens.Play.HUD
             {
                 Anchor = Anchor.TopRight,
                 Origin = Anchor.TopRight,
+                Expanded = { BindTarget = Expanded },
             };
 
             base.Add(drawable);
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index cb20deb272..f738f91e63 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Screens.Play.HUD
 
         private const float panel_shear = 0.15f;
 
+        public Bindable<bool> Expanded = new Bindable<bool>();
+
         private OsuSpriteText positionText, scoreText, accuracyText, comboText, usernameText;
 
         public BindableDouble TotalScore { get; } = new BindableDouble();

From 43c35c5118045f9c52a1755698073415f455d03b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Feb 2021 15:15:31 +0900
Subject: [PATCH 1599/3722] Show local user in test scene

---
 .../Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
index 026c302642..1ee848b902 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -13,6 +13,7 @@ using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Database;
 using osu.Game.Online;
+using osu.Game.Online.API;
 using osu.Game.Online.Spectator;
 using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets.Osu.Scoring;
@@ -50,6 +51,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [SetUpSteps]
         public override void SetUpSteps()
         {
+            AddStep("set local user", () => ((DummyAPIAccess)API).LocalUser.Value = lookupCache.GetUserAsync(1).Result);
+
             AddStep("create leaderboard", () =>
             {
                 leaderboard?.Expire();

From 691cfa5bc3bdceda779441dcd99a2437bd2beee8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Feb 2021 16:46:30 +0900
Subject: [PATCH 1600/3722] Add expanded/compact display modes for
 GameplayLeaderboard

---
 .../Screens/Play/HUD/GameplayLeaderboard.cs   |   2 -
 .../Play/HUD/GameplayLeaderboardScore.cs      | 347 +++++++++++-------
 2 files changed, 210 insertions(+), 139 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
index 20e24ed945..34efeab54c 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboard.cs
@@ -50,8 +50,6 @@ namespace osu.Game.Screens.Play.HUD
         {
             var drawable = new GameplayLeaderboardScore(user, isTracked)
             {
-                Anchor = Anchor.TopRight,
-                Origin = Anchor.TopRight,
                 Expanded = { BindTarget = Expanded },
             };
 
diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index f738f91e63..10476e5565 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -20,16 +20,31 @@ namespace osu.Game.Screens.Play.HUD
 {
     public class GameplayLeaderboardScore : CompositeDrawable, ILeaderboardScore
     {
-        public const float EXTENDED_WIDTH = 255f;
+        public const float EXTENDED_WIDTH = regular_width + top_player_left_width_extension;
 
         private const float regular_width = 235f;
 
+        // a bit hand-wavy, but there's a lot of hard-coded paddings in each of the grid's internals.
+        private const float compact_width = 77.5f;
+
+        private const float top_player_left_width_extension = 20f;
+
         public const float PANEL_HEIGHT = 35f;
 
         public const float SHEAR_WIDTH = PANEL_HEIGHT * panel_shear;
 
         private const float panel_shear = 0.15f;
 
+        private const float rank_text_width = 35f;
+
+        private const float score_components_width = 85f;
+
+        private const float avatar_size = 25f;
+
+        private const double panel_transition_duration = 500;
+
+        private const double text_transition_duration = 200;
+
         public Bindable<bool> Expanded = new Bindable<bool>();
 
         private OsuSpriteText positionText, scoreText, accuracyText, comboText, usernameText;
@@ -65,8 +80,15 @@ namespace osu.Game.Screens.Play.HUD
         private readonly bool trackedPlayer;
 
         private Container mainFillContainer;
+
         private Box centralFill;
 
+        private Container backgroundPaddingAdjustContainer;
+
+        private GridContainer gridContainer;
+
+        private Container scoreComponents;
+
         /// <summary>
         /// Creates a new <see cref="GameplayLeaderboardScore"/>.
         /// </summary>
@@ -77,7 +99,8 @@ namespace osu.Game.Screens.Play.HUD
             User = user;
             this.trackedPlayer = trackedPlayer;
 
-            Size = new Vector2(EXTENDED_WIDTH, PANEL_HEIGHT);
+            AutoSizeAxes = Axes.X;
+            Height = PANEL_HEIGHT;
         }
 
         [BackgroundDependencyLoader]
@@ -87,147 +110,167 @@ namespace osu.Game.Screens.Play.HUD
 
             InternalChildren = new Drawable[]
             {
-                mainFillContainer = new Container
+                new Container
                 {
-                    Width = regular_width,
+                    AutoSizeAxes = Axes.X,
                     RelativeSizeAxes = Axes.Y,
-                    Anchor = Anchor.TopRight,
-                    Origin = Anchor.TopRight,
-                    Masking = true,
-                    CornerRadius = 5f,
-                    Shear = new Vector2(panel_shear, 0f),
-                    Child = new Box
+                    Margin = new MarginPadding { Left = top_player_left_width_extension },
+                    Children = new Drawable[]
                     {
-                        Alpha = 0.5f,
-                        RelativeSizeAxes = Axes.Both,
-                    }
-                },
-                new GridContainer
-                {
-                    Width = regular_width,
-                    RelativeSizeAxes = Axes.Y,
-                    Anchor = Anchor.TopRight,
-                    Origin = Anchor.TopRight,
-                    ColumnDimensions = new[]
-                    {
-                        new Dimension(GridSizeMode.Absolute, 35f),
-                        new Dimension(),
-                        new Dimension(GridSizeMode.Absolute, 85f),
-                    },
-                    Content = new[]
-                    {
-                        new Drawable[]
+                        backgroundPaddingAdjustContainer = new Container
                         {
-                            positionText = new OsuSpriteText
+                            RelativeSizeAxes = Axes.Both,
+                            Children = new Drawable[]
                             {
-                                Padding = new MarginPadding { Right = SHEAR_WIDTH / 2 },
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
-                                Colour = Color4.White,
-                                Font = OsuFont.Torus.With(size: 14, weight: FontWeight.Bold),
-                                Shadow = false,
-                            },
-                            new Container
-                            {
-                                Padding = new MarginPadding { Horizontal = SHEAR_WIDTH / 3 },
-                                RelativeSizeAxes = Axes.Both,
-                                Children = new Drawable[]
+                                mainFillContainer = new Container
                                 {
-                                    new Container
+                                    Anchor = Anchor.TopRight,
+                                    Origin = Anchor.TopRight,
+                                    RelativeSizeAxes = Axes.Both,
+                                    Masking = true,
+                                    CornerRadius = 5f,
+                                    Shear = new Vector2(panel_shear, 0f),
+                                    Children = new Drawable[]
                                     {
-                                        Masking = true,
-                                        CornerRadius = 5f,
-                                        Shear = new Vector2(panel_shear, 0f),
-                                        RelativeSizeAxes = Axes.Both,
-                                        Children = new[]
+                                        new Box
                                         {
-                                            centralFill = new Box
-                                            {
-                                                Alpha = 0.5f,
-                                                RelativeSizeAxes = Axes.Both,
-                                                Colour = Color4Extensions.FromHex("3399cc"),
-                                            },
-                                        }
-                                    },
-                                    new FillFlowContainer
-                                    {
-                                        Padding = new MarginPadding { Left = SHEAR_WIDTH },
-                                        Anchor = Anchor.CentreLeft,
-                                        Origin = Anchor.CentreLeft,
-                                        RelativeSizeAxes = Axes.Both,
-                                        Direction = FillDirection.Horizontal,
-                                        Spacing = new Vector2(4f, 0f),
-                                        Children = new Drawable[]
-                                        {
-                                            avatarContainer = new CircularContainer
-                                            {
-                                                Masking = true,
-                                                Anchor = Anchor.CentreLeft,
-                                                Origin = Anchor.CentreLeft,
-                                                Size = new Vector2(25f),
-                                                Children = new Drawable[]
-                                                {
-                                                    new Box
-                                                    {
-                                                        Name = "Placeholder while avatar loads",
-                                                        Alpha = 0.3f,
-                                                        RelativeSizeAxes = Axes.Both,
-                                                        Colour = colours.Gray4,
-                                                    }
-                                                }
-                                            },
-                                            usernameText = new OsuSpriteText
-                                            {
-                                                RelativeSizeAxes = Axes.X,
-                                                Width = 0.6f,
-                                                Anchor = Anchor.CentreLeft,
-                                                Origin = Anchor.CentreLeft,
-                                                Colour = Color4.White,
-                                                Font = OsuFont.Torus.With(size: 14, weight: FontWeight.SemiBold),
-                                                Text = User?.Username,
-                                                Truncate = true,
-                                                Shadow = false,
-                                            }
-                                        }
-                                    },
-                                }
-                            },
-                            new Container
-                            {
-                                Padding = new MarginPadding { Top = 2f, Right = 17.5f, Bottom = 5f },
-                                RelativeSizeAxes = Axes.Both,
-                                Anchor = Anchor.CentreLeft,
-                                Origin = Anchor.CentreLeft,
-                                Colour = Color4.White,
-                                Children = new Drawable[]
-                                {
-                                    scoreText = new OsuSpriteText
-                                    {
-                                        Spacing = new Vector2(-1f, 0f),
-                                        Font = OsuFont.Torus.With(size: 16, weight: FontWeight.SemiBold, fixedWidth: true),
-                                        Shadow = false,
-                                    },
-                                    accuracyText = new OsuSpriteText
-                                    {
-                                        Anchor = Anchor.BottomLeft,
-                                        Origin = Anchor.BottomLeft,
-                                        Font = OsuFont.Torus.With(size: 12, weight: FontWeight.SemiBold, fixedWidth: true),
-                                        Spacing = new Vector2(-1f, 0f),
-                                        Shadow = false,
-                                    },
-                                    comboText = new OsuSpriteText
-                                    {
-                                        Anchor = Anchor.BottomRight,
-                                        Origin = Anchor.BottomRight,
-                                        Spacing = new Vector2(-1f, 0f),
-                                        Font = OsuFont.Torus.With(size: 12, weight: FontWeight.SemiBold, fixedWidth: true),
-                                        Shadow = false,
+                                            Alpha = 0.5f,
+                                            RelativeSizeAxes = Axes.Both,
+                                        },
                                     },
                                 },
                             }
+                        },
+                        gridContainer = new GridContainer
+                        {
+                            RelativeSizeAxes = Axes.Y,
+                            Width = compact_width, // will be updated by expanded state.
+                            Anchor = Anchor.TopRight,
+                            Origin = Anchor.TopRight,
+                            ColumnDimensions = new[]
+                            {
+                                new Dimension(GridSizeMode.Absolute, rank_text_width),
+                                new Dimension(),
+                                new Dimension(GridSizeMode.AutoSize, maxSize: score_components_width),
+                            },
+                            Content = new[]
+                            {
+                                new Drawable[]
+                                {
+                                    positionText = new OsuSpriteText
+                                    {
+                                        Padding = new MarginPadding { Right = SHEAR_WIDTH / 2 },
+                                        Anchor = Anchor.Centre,
+                                        Origin = Anchor.Centre,
+                                        Colour = Color4.White,
+                                        Font = OsuFont.Torus.With(size: 14, weight: FontWeight.Bold),
+                                        Shadow = false,
+                                    },
+                                    new Container
+                                    {
+                                        Padding = new MarginPadding { Horizontal = SHEAR_WIDTH / 3 },
+                                        RelativeSizeAxes = Axes.Both,
+                                        Children = new Drawable[]
+                                        {
+                                            new Container
+                                            {
+                                                Masking = true,
+                                                CornerRadius = 5f,
+                                                Shear = new Vector2(panel_shear, 0f),
+                                                RelativeSizeAxes = Axes.Both,
+                                                Children = new[]
+                                                {
+                                                    centralFill = new Box
+                                                    {
+                                                        Alpha = 0.5f,
+                                                        RelativeSizeAxes = Axes.Both,
+                                                        Colour = Color4Extensions.FromHex("3399cc"),
+                                                    },
+                                                }
+                                            },
+                                            new FillFlowContainer
+                                            {
+                                                Padding = new MarginPadding { Left = SHEAR_WIDTH },
+                                                Anchor = Anchor.CentreLeft,
+                                                Origin = Anchor.CentreLeft,
+                                                RelativeSizeAxes = Axes.Both,
+                                                Direction = FillDirection.Horizontal,
+                                                Spacing = new Vector2(4f, 0f),
+                                                Children = new Drawable[]
+                                                {
+                                                    avatarContainer = new CircularContainer
+                                                    {
+                                                        Masking = true,
+                                                        Anchor = Anchor.CentreLeft,
+                                                        Origin = Anchor.CentreLeft,
+                                                        Size = new Vector2(avatar_size),
+                                                        Children = new Drawable[]
+                                                        {
+                                                            new Box
+                                                            {
+                                                                Name = "Placeholder while avatar loads",
+                                                                Alpha = 0.3f,
+                                                                RelativeSizeAxes = Axes.Both,
+                                                                Colour = colours.Gray4,
+                                                            }
+                                                        }
+                                                    },
+                                                    usernameText = new OsuSpriteText
+                                                    {
+                                                        RelativeSizeAxes = Axes.X,
+                                                        Width = 0.6f,
+                                                        Anchor = Anchor.CentreLeft,
+                                                        Origin = Anchor.CentreLeft,
+                                                        Colour = Color4.White,
+                                                        Font = OsuFont.Torus.With(size: 14, weight: FontWeight.SemiBold),
+                                                        Text = User?.Username,
+                                                        Truncate = true,
+                                                        Shadow = false,
+                                                    }
+                                                }
+                                            },
+                                        }
+                                    },
+                                    scoreComponents = new Container
+                                    {
+                                        Padding = new MarginPadding { Top = 2f, Right = 17.5f, Bottom = 5f },
+                                        AlwaysPresent = true, // required to smoothly animate autosize after hidden early.
+                                        Masking = true,
+                                        RelativeSizeAxes = Axes.Y,
+                                        Anchor = Anchor.CentreLeft,
+                                        Origin = Anchor.CentreLeft,
+                                        Colour = Color4.White,
+                                        Children = new Drawable[]
+                                        {
+                                            scoreText = new OsuSpriteText
+                                            {
+                                                Spacing = new Vector2(-1f, 0f),
+                                                Font = OsuFont.Torus.With(size: 16, weight: FontWeight.SemiBold, fixedWidth: true),
+                                                Shadow = false,
+                                            },
+                                            accuracyText = new OsuSpriteText
+                                            {
+                                                Anchor = Anchor.BottomLeft,
+                                                Origin = Anchor.BottomLeft,
+                                                Font = OsuFont.Torus.With(size: 12, weight: FontWeight.SemiBold, fixedWidth: true),
+                                                Spacing = new Vector2(-1f, 0f),
+                                                Shadow = false,
+                                            },
+                                            comboText = new OsuSpriteText
+                                            {
+                                                Anchor = Anchor.BottomRight,
+                                                Origin = Anchor.BottomRight,
+                                                Spacing = new Vector2(-1f, 0f),
+                                                Font = OsuFont.Torus.With(size: 12, weight: FontWeight.SemiBold, fixedWidth: true),
+                                                Shadow = false,
+                                            },
+                                        },
+                                    }
+                                }
+                            }
                         }
                     }
-                }
+                },
             };
 
             LoadComponentAsync(new DrawableAvatar(User), avatarContainer.Add);
@@ -243,18 +286,43 @@ namespace osu.Game.Screens.Play.HUD
             base.LoadComplete();
 
             updateState();
+            Expanded.BindValueChanged(changeExpandedState, true);
+
             FinishTransforms(true);
         }
 
-        private const double panel_transition_duration = 500;
+        private void changeExpandedState(ValueChangedEvent<bool> expanded)
+        {
+            scoreComponents.ClearTransforms();
+
+            if (expanded.NewValue)
+            {
+                gridContainer.ResizeWidthTo(regular_width, panel_transition_duration, Easing.OutQuint);
+
+                scoreComponents.ResizeWidthTo(score_components_width, panel_transition_duration, Easing.OutQuint);
+                scoreComponents.FadeIn(panel_transition_duration, Easing.OutQuint);
+
+                usernameText.FadeIn(panel_transition_duration, Easing.OutQuint);
+            }
+            else
+            {
+                gridContainer.ResizeWidthTo(compact_width, panel_transition_duration, Easing.OutQuint);
+
+                scoreComponents.ResizeWidthTo(0, panel_transition_duration, Easing.OutQuint);
+                scoreComponents.FadeOut(text_transition_duration, Easing.OutQuint);
+
+                usernameText.FadeOut(text_transition_duration, Easing.OutQuint);
+            }
+        }
 
         private void updateState()
         {
+            bool widthExtension = false;
+
             if (HasQuit.Value)
             {
                 // we will probably want to display this in a better way once we have a design.
                 // and also show states other than quit.
-                mainFillContainer.ResizeWidthTo(regular_width, panel_transition_duration, Easing.OutElastic);
                 panelColour = Color4.Gray;
                 textColour = Color4.White;
                 return;
@@ -262,22 +330,29 @@ namespace osu.Game.Screens.Play.HUD
 
             if (scorePosition == 1)
             {
-                mainFillContainer.ResizeWidthTo(EXTENDED_WIDTH, panel_transition_duration, Easing.OutElastic);
+                widthExtension = true;
                 panelColour = Color4Extensions.FromHex("7fcc33");
                 textColour = Color4.White;
             }
             else if (trackedPlayer)
             {
-                mainFillContainer.ResizeWidthTo(EXTENDED_WIDTH, panel_transition_duration, Easing.OutElastic);
+                widthExtension = true;
                 panelColour = Color4Extensions.FromHex("ffd966");
                 textColour = Color4Extensions.FromHex("2e576b");
             }
             else
             {
-                mainFillContainer.ResizeWidthTo(regular_width, panel_transition_duration, Easing.OutElastic);
                 panelColour = Color4Extensions.FromHex("3399cc");
                 textColour = Color4.White;
             }
+
+            this.TransformTo(nameof(SizeContainerLeftPadding), widthExtension ? -top_player_left_width_extension : 0, panel_transition_duration, Easing.OutElastic);
+        }
+
+        public float SizeContainerLeftPadding
+        {
+            get => backgroundPaddingAdjustContainer.Padding.Left;
+            set => backgroundPaddingAdjustContainer.Padding = new MarginPadding { Left = value };
         }
 
         private Color4 panelColour
@@ -289,8 +364,6 @@ namespace osu.Game.Screens.Play.HUD
             }
         }
 
-        private const double text_transition_duration = 200;
-
         private Color4 textColour
         {
             set

From 772471a6d826a730ca17176f2c542b7e4d2ba44a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 19 Feb 2021 09:34:39 +0300
Subject: [PATCH 1601/3722] Add failing test case

---
 .../Gameplay/TestScenePauseWhenInactive.cs    | 63 ++++++++++++++++---
 osu.Game/Screens/Play/Player.cs               | 10 +--
 2 files changed, 58 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs
index e43e5ba3ce..15412fea00 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs
@@ -1,28 +1,28 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
+using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Platform;
 using osu.Framework.Testing;
+using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Storyboards;
+using osu.Game.Tests.Beatmaps;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [HeadlessTest] // we alter unsafe properties on the game host to test inactive window state.
     public class TestScenePauseWhenInactive : OsuPlayerTestScene
     {
-        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
-        {
-            var beatmap = (Beatmap)base.CreateBeatmap(ruleset);
-
-            beatmap.HitObjects.RemoveAll(h => h.StartTime < 30000);
-
-            return beatmap;
-        }
-
         [Resolved]
         private GameHost host { get; set; }
 
@@ -33,10 +33,53 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep("resume player", () => Player.GameplayClockContainer.Start());
             AddAssert("ensure not paused", () => !Player.GameplayClockContainer.IsPaused.Value);
+
+            AddStep("progress time to gameplay", () => Player.GameplayClockContainer.Seek(Player.DrawableRuleset.GameplayStartTime));
+            AddUntilStep("wait for pause", () => Player.GameplayClockContainer.IsPaused.Value);
+        }
+
+        /// <summary>
+        /// Tests that if a pause from focus lose is performed while in pause cooldown,
+        /// the player will still pause after the cooldown is finished.
+        /// </summary>
+        [Test]
+        public void TestPauseWhileInCooldown()
+        {
+            AddStep("resume player", () => Player.GameplayClockContainer.Start());
+            AddStep("skip to gameplay", () => Player.GameplayClockContainer.Seek(Player.DrawableRuleset.GameplayStartTime));
+
+            AddStep("set inactive", () => ((Bindable<bool>)host.IsActive).Value = false);
+            AddUntilStep("wait for pause", () => Player.GameplayClockContainer.IsPaused.Value);
+
+            AddStep("set active", () => ((Bindable<bool>)host.IsActive).Value = true);
+
+            AddStep("resume player", () => Player.Resume());
+            AddStep("click resume overlay", () =>
+            {
+                InputManager.MoveMouseTo(this.ChildrenOfType<OsuResumeOverlay.OsuClickToResumeCursor>().Single());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddAssert("pause cooldown active", () => Player.PauseCooldownActive);
+            AddStep("set inactive again", () => ((Bindable<bool>)host.IsActive).Value = false);
             AddUntilStep("wait for pause", () => Player.GameplayClockContainer.IsPaused.Value);
-            AddAssert("time of pause is after gameplay start time", () => Player.GameplayClockContainer.GameplayClock.CurrentTime >= Player.DrawableRuleset.GameplayStartTime);
         }
 
         protected override TestPlayer CreatePlayer(Ruleset ruleset) => new TestPlayer(true, true, true);
+
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
+        {
+            return new Beatmap
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new HitCircle { StartTime = 30000 },
+                    new HitCircle { StartTime = 35000 },
+                },
+            };
+        }
+
+        protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
+            => new TestWorkingBeatmap(beatmap, storyboard, Audio);
     }
 }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 74059da21a..a7acda926b 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -667,6 +667,9 @@ namespace osu.Game.Screens.Play
 
         private double? lastPauseActionTime;
 
+        public bool PauseCooldownActive =>
+            lastPauseActionTime.HasValue && GameplayClockContainer.GameplayClock.CurrentTime < lastPauseActionTime + pause_cooldown;
+
         private bool canPause =>
             // must pass basic screen conditions (beatmap loaded, instance allows pause)
             LoadedBeatmapSuccessfully && Configuration.AllowPause && ValidForResume
@@ -675,10 +678,7 @@ namespace osu.Game.Screens.Play
             // cannot pause if we are already in a fail state
             && !HasFailed
             // cannot pause if already paused (or in a cooldown state) unless we are in a resuming state.
-            && (IsResuming || (GameplayClockContainer.IsPaused.Value == false && !pauseCooldownActive));
-
-        private bool pauseCooldownActive =>
-            lastPauseActionTime.HasValue && GameplayClockContainer.GameplayClock.CurrentTime < lastPauseActionTime + pause_cooldown;
+            && (IsResuming || (GameplayClockContainer.IsPaused.Value == false && !PauseCooldownActive));
 
         private bool canResume =>
             // cannot resume from a non-paused state
@@ -812,7 +812,7 @@ namespace osu.Game.Screens.Play
             // ValidForResume is false when restarting
             if (ValidForResume)
             {
-                if (pauseCooldownActive && !GameplayClockContainer.IsPaused.Value)
+                if (PauseCooldownActive && !GameplayClockContainer.IsPaused.Value)
                     // still want to block if we are within the cooldown period and not already paused.
                     return true;
             }

From 4436585aa4dea5bec025e5bf816ed23008b4c87e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 19 Feb 2021 09:35:29 +0300
Subject: [PATCH 1602/3722] Keep attempting to pause gameplay while window not
 active

---
 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 a7acda926b..72d9a60c91 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -427,11 +427,16 @@ namespace osu.Game.Screens.Play
 
         private void updatePauseOnFocusLostState()
         {
-            if (!PauseOnFocusLost || breakTracker.IsBreakTime.Value)
+            if (!PauseOnFocusLost || DrawableRuleset.HasReplayLoaded.Value || breakTracker.IsBreakTime.Value)
                 return;
 
             if (gameActive.Value == false)
-                Pause();
+            {
+                if (canPause)
+                    Pause();
+                else
+                    Scheduler.AddDelayed(updatePauseOnFocusLostState, 200);
+            }
         }
 
         private IBeatmap loadPlayableBeatmap()

From 9d02f589fe70bfa9b3d1b2ed9f46400b497250a1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Feb 2021 16:51:34 +0900
Subject: [PATCH 1603/3722] Compact leaderboard during gameplay

---
 .../Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index 04d9e0a72a..ffcf248575 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -89,6 +89,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             Debug.Assert(client.Room != null);
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            ((IBindable<bool>)leaderboard.Expanded).BindTo(IsBreakTime);
+        }
+
         protected override void StartGameplay()
         {
             // block base call, but let the server know we are ready to start.

From 52ebe343473007a06436cfe4c3969a129ef6c287 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Feb 2021 17:15:38 +0900
Subject: [PATCH 1604/3722] Update TestScenePause exit from fail test to
 actually fail

---
 .../Visual/Gameplay/TestScenePause.cs         | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index aa56c636ab..1214a33084 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -140,7 +140,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             confirmClockRunning(false);
 
-            pauseFromUserExitKey();
+            AddStep("pause via forced pause", () => Player.Pause());
 
             confirmPausedWithNoOverlay();
             AddAssert("fail overlay still shown", () => Player.FailOverlayVisible);
@@ -149,11 +149,28 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         [Test]
-        public void TestExitFromFailedGameplay()
+        public void TestExitFromFailedGameplayAfterFailAnimation()
         {
             AddUntilStep("wait for fail", () => Player.HasFailed);
-            AddStep("exit", () => Player.Exit());
+            AddUntilStep("wait for fail overlay shown", () => Player.FailOverlayVisible);
 
+            confirmClockRunning(false);
+
+            AddStep("exit via user pause", () => Player.ExitViaPause());
+            confirmExited();
+        }
+
+        [Test]
+        public void TestExitFromFailedGameplayDuringFailAnimation()
+        {
+            AddUntilStep("wait for fail", () => Player.HasFailed);
+
+            // will finish the fail animation and show the fail/pause screen.
+            AddStep("attempt exit via pause key", () => Player.ExitViaPause());
+            AddAssert("fail overlay shown", () => Player.FailOverlayVisible);
+
+            // will actually exit.
+            AddStep("exit via pause key", () => Player.ExitViaPause());
             confirmExited();
         }
 

From 82cc06ca57d1b8ba63739799c7db5120cfe3ae7e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Feb 2021 17:26:54 +0900
Subject: [PATCH 1605/3722] Fix new logic not considering fail overlay
 correctly

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 8f2c1d1b92..e4fc92b5f2 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -496,12 +496,13 @@ namespace osu.Game.Screens.Play
                 return;
             }
 
-            bool pauseDialogShown = PauseOverlay.State.Value == Visibility.Visible;
+            bool pauseOrFailDialogVisible =
+                PauseOverlay.State.Value == Visibility.Visible || FailOverlay.State.Value == Visibility.Visible;
 
-            if (showDialogFirst && !pauseDialogShown)
+            if (showDialogFirst && !pauseOrFailDialogVisible)
             {
                 // if the fail animation is currently in progress, accelerate it (it will show the pause dialog on completion).
-                if (ValidForResume && HasFailed && !FailOverlay.IsPresent)
+                if (ValidForResume && HasFailed)
                 {
                     failAnimation.FinishTransforms(true);
                     return;

From ddd1dcff88428460cfcde74c963196a0518924fe Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 19 Feb 2021 11:33:26 +0300
Subject: [PATCH 1606/3722] Attempt pausing every single frame

---
 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 72d9a60c91..fa545859d4 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -435,7 +435,7 @@ namespace osu.Game.Screens.Play
                 if (canPause)
                     Pause();
                 else
-                    Scheduler.AddDelayed(updatePauseOnFocusLostState, 200);
+                    Scheduler.AddOnce(updatePauseOnFocusLostState);
             }
         }
 

From 0771154dd2831f4d7de9d28913965f49df8909ce Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 19 Feb 2021 11:42:30 +0300
Subject: [PATCH 1607/3722] Make `PauseCooldownActive` protected and expose on
 test class

---
 osu.Game/Screens/Play/Player.cs     | 2 +-
 osu.Game/Tests/Visual/TestPlayer.cs | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index fa545859d4..8c816e8030 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -672,7 +672,7 @@ namespace osu.Game.Screens.Play
 
         private double? lastPauseActionTime;
 
-        public bool PauseCooldownActive =>
+        protected bool PauseCooldownActive =>
             lastPauseActionTime.HasValue && GameplayClockContainer.GameplayClock.CurrentTime < lastPauseActionTime + pause_cooldown;
 
         private bool canPause =>
diff --git a/osu.Game/Tests/Visual/TestPlayer.cs b/osu.Game/Tests/Visual/TestPlayer.cs
index f47391ce6a..0addc9de75 100644
--- a/osu.Game/Tests/Visual/TestPlayer.cs
+++ b/osu.Game/Tests/Visual/TestPlayer.cs
@@ -34,6 +34,8 @@ namespace osu.Game.Tests.Visual
 
         public new HealthProcessor HealthProcessor => base.HealthProcessor;
 
+        public new bool PauseCooldownActive => base.PauseCooldownActive;
+
         public readonly List<JudgementResult> Results = new List<JudgementResult>();
 
         public TestPlayer(bool allowPause = true, bool showResults = true, bool pauseOnFocusLost = false)

From fe5e45ea8180931f1c4c8d02a162e50b0000f186 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 19 Feb 2021 11:43:33 +0300
Subject: [PATCH 1608/3722] Move gameplay cursor outside instead and fix
 potential failure

---
 .../Gameplay/TestScenePauseWhenInactive.cs    | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs
index 15412fea00..fa596c4823 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs
@@ -2,21 +2,18 @@
 // 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.Bindables;
 using osu.Framework.Platform;
 using osu.Framework.Testing;
-using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Storyboards;
 using osu.Game.Tests.Beatmaps;
-using osuTK.Input;
+using osuTK;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -45,6 +42,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestPauseWhileInCooldown()
         {
+            AddStep("move cursor outside", () => InputManager.MoveMouseTo(Player.ScreenSpaceDrawQuad.TopLeft - new Vector2(10)));
+
             AddStep("resume player", () => Player.GameplayClockContainer.Start());
             AddStep("skip to gameplay", () => Player.GameplayClockContainer.Seek(Player.DrawableRuleset.GameplayStartTime));
 
@@ -54,14 +53,15 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("set active", () => ((Bindable<bool>)host.IsActive).Value = true);
 
             AddStep("resume player", () => Player.Resume());
-            AddStep("click resume overlay", () =>
-            {
-                InputManager.MoveMouseTo(this.ChildrenOfType<OsuResumeOverlay.OsuClickToResumeCursor>().Single());
-                InputManager.Click(MouseButton.Left);
-            });
 
-            AddAssert("pause cooldown active", () => Player.PauseCooldownActive);
-            AddStep("set inactive again", () => ((Bindable<bool>)host.IsActive).Value = false);
+            bool pauseCooldownActive = false;
+
+            AddStep("set inactive again", () =>
+            {
+                pauseCooldownActive = Player.PauseCooldownActive;
+                ((Bindable<bool>)host.IsActive).Value = false;
+            });
+            AddAssert("pause cooldown active", () => pauseCooldownActive);
             AddUntilStep("wait for pause", () => Player.GameplayClockContainer.IsPaused.Value);
         }
 

From f6c279ab00d6af3231e09332e4d35b4c2ce7e106 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 19 Feb 2021 11:45:45 +0300
Subject: [PATCH 1609/3722] Add assert ensuring player resumed properly

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs
index fa596c4823..49c1163c6c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs
@@ -53,6 +53,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("set active", () => ((Bindable<bool>)host.IsActive).Value = true);
 
             AddStep("resume player", () => Player.Resume());
+            AddAssert("unpaused", () => !Player.GameplayClockContainer.IsPaused.Value);
 
             bool pauseCooldownActive = false;
 

From 362e4802f761980213893e30c2de0c038b1463db Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Feb 2021 17:58:04 +0900
Subject: [PATCH 1610/3722] Add the ability for PerformFromMenuRunner to
 inspect nested screen stacks

---
 osu.Game/PerformFromMenuRunner.cs             | 21 ++++++++++++++++---
 osu.Game/Screens/IHasSubScreenStack.cs        | 15 +++++++++++++
 .../Screens/OnlinePlay/OnlinePlayScreen.cs    |  4 +++-
 3 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game/Screens/IHasSubScreenStack.cs

diff --git a/osu.Game/PerformFromMenuRunner.cs b/osu.Game/PerformFromMenuRunner.cs
index a4179c94da..39889ea7fc 100644
--- a/osu.Game/PerformFromMenuRunner.cs
+++ b/osu.Game/PerformFromMenuRunner.cs
@@ -13,6 +13,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Dialog;
 using osu.Game.Overlays.Notifications;
+using osu.Game.Screens;
 using osu.Game.Screens.Menu;
 
 namespace osu.Game
@@ -81,27 +82,41 @@ namespace osu.Game
 
             game?.CloseAllOverlays(false);
 
-            // we may already be at the target screen type.
+            findValidTarget(current);
+        }
+
+        private bool findValidTarget(IScreen current)
+        {
             var type = current.GetType();
 
+            // check if we are already at a valid target screen.
             if (validScreens.Any(t => t.IsAssignableFrom(type)) && !beatmap.Disabled)
             {
                 finalAction(current);
                 Cancel();
-                return;
+                return true;
             }
 
             while (current != null)
             {
+                // if this has a sub stack, recursively check the screens within it.
+                if (current is IHasSubScreenStack currentSubScreen)
+                {
+                    if (findValidTarget(currentSubScreen.SubScreenStack.CurrentScreen))
+                        return true;
+                }
+
                 if (validScreens.Any(t => t.IsAssignableFrom(type)))
                 {
                     current.MakeCurrent();
-                    break;
+                    return true;
                 }
 
                 current = current.GetParentScreen();
                 type = current?.GetType();
             }
+
+            return false;
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/IHasSubScreenStack.cs b/osu.Game/Screens/IHasSubScreenStack.cs
new file mode 100644
index 0000000000..c5e2015109
--- /dev/null
+++ b/osu.Game/Screens/IHasSubScreenStack.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.Screens;
+
+namespace osu.Game.Screens
+{
+    /// <summary>
+    /// A screen which manages a nested stack of screens within itself.
+    /// </summary>
+    public interface IHasSubScreenStack
+    {
+        ScreenStack SubScreenStack { get; }
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
index 71fd0d5c76..90e499c67f 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
@@ -28,7 +28,7 @@ using osuTK;
 namespace osu.Game.Screens.OnlinePlay
 {
     [Cached]
-    public abstract class OnlinePlayScreen : OsuScreen
+    public abstract class OnlinePlayScreen : OsuScreen, IHasSubScreenStack
     {
         public override bool CursorVisible => (screenStack.CurrentScreen as IOnlinePlaySubScreen)?.CursorVisible ?? true;
 
@@ -355,5 +355,7 @@ namespace osu.Game.Screens.OnlinePlay
                 protected override double TransformDuration => 200;
             }
         }
+
+        ScreenStack IHasSubScreenStack.SubScreenStack => screenStack;
     }
 }

From 5eee46074cbe5821394539ed4812c3d1cc8af844 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Feb 2021 19:45:29 +0900
Subject: [PATCH 1611/3722] Ensure the current screen is current when a sub
 screen is found as the target

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

diff --git a/osu.Game/PerformFromMenuRunner.cs b/osu.Game/PerformFromMenuRunner.cs
index 39889ea7fc..fe75a3a607 100644
--- a/osu.Game/PerformFromMenuRunner.cs
+++ b/osu.Game/PerformFromMenuRunner.cs
@@ -103,7 +103,11 @@ namespace osu.Game
                 if (current is IHasSubScreenStack currentSubScreen)
                 {
                     if (findValidTarget(currentSubScreen.SubScreenStack.CurrentScreen))
+                    {
+                        // should be correct in theory, but currently untested/unused in existing implementations.
+                        current.MakeCurrent();
                         return true;
+                    }
                 }
 
                 if (validScreens.Any(t => t.IsAssignableFrom(type)))

From 32556b1898cfb65e652a9bae2dabe827d663d27b Mon Sep 17 00:00:00 2001
From: Susko3 <16479013+Susko3@users.noreply.github.com>
Date: Sat, 20 Feb 2021 02:32:44 +0100
Subject: [PATCH 1612/3722] add `Exported = true` to Activity manifest

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

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index ad929bbac3..d087c6218d 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -17,7 +17,7 @@ using osu.Game.Database;
 
 namespace osu.Android
 {
-    [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false, LaunchMode = LaunchMode.SingleInstance)]
+    [Activity(Theme = "@android:style/Theme.NoTitleBar", MainLauncher = true, ScreenOrientation = ScreenOrientation.FullUser, SupportsPictureInPicture = false, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, HardwareAccelerated = false, LaunchMode = LaunchMode.SingleInstance, Exported = true)]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPattern = ".*\\\\.osz", DataHost = "*", DataMimeType = "*/*")]
     [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.CategoryDefault }, DataScheme = "content", DataPathPattern = ".*\\\\.osk", DataHost = "*", DataMimeType = "*/*")]
     [IntentFilter(new[] { Intent.ActionSend, Intent.ActionSendMultiple }, Categories = new[] { Intent.CategoryDefault }, DataMimeTypes = new[] { "application/zip", "application/octet-stream", "application/download", "application/x-zip", "application/x-zip-compressed" })]

From d2ec151c67d09a8a442960ffce216ac5f04a81e2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 20 Feb 2021 14:19:44 +0900
Subject: [PATCH 1613/3722] Add failing test for pausing when pause support is
 disabled

---
 osu.Game.Tests/Visual/Gameplay/TestScenePause.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index 1214a33084..bddc7ab731 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -90,6 +90,15 @@ namespace osu.Game.Tests.Visual.Gameplay
             resumeAndConfirm();
         }
 
+        [Test]
+        public void TestUserPauseWhenPauseNotAllowed()
+        {
+            AddStep("disable pause support", () => Player.Configuration.AllowPause = false);
+
+            pauseFromUserExitKey();
+            confirmExited();
+        }
+
         [Test]
         public void TestUserPauseDuringCooldownTooSoon()
         {

From 38a21249213912af02c88c08037026e94ab11de3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 20 Feb 2021 13:35:25 +0900
Subject: [PATCH 1614/3722] Support instant exit if pausing is not allowed in
 the current game mode

---
 osu.Game/Screens/Play/Player.cs | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index e4fc92b5f2..1e130b7f88 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -508,10 +508,14 @@ namespace osu.Game.Screens.Play
                     return;
                 }
 
-                // in the case a dialog needs to be shown, attempt to pause and show it.
-                // this may fail (see internal checks in Pause()) at which point the exit attempt will be aborted.
-                Pause();
-                return;
+                // there's a chance the pausing is not supported in the current state, at which point immediate exit should be preferred.
+                if (pausingSupportedByCurrentState)
+                {
+                    // 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;
+                }
             }
 
             this.Exit();
@@ -670,15 +674,17 @@ namespace osu.Game.Screens.Play
 
         private double? lastPauseActionTime;
 
-        private bool canPause =>
+        /// <summary>
+        /// A set of conditionals which defines whether the current game state and configuration allows for
+        /// pausing to be attempted via <see cref="Pause"/>. If false, the game should generally exit if a user pause
+        /// is attempted.
+        /// </summary>
+        private bool pausingSupportedByCurrentState =>
             // must pass basic screen conditions (beatmap loaded, instance allows pause)
             LoadedBeatmapSuccessfully && Configuration.AllowPause && ValidForResume
             // replays cannot be paused and exit immediately
             && !DrawableRuleset.HasReplayLoaded.Value
-            // cannot pause if we are already in a fail state
-            && !HasFailed
-            // cannot pause if already paused (or in a cooldown state) unless we are in a resuming state.
-            && (IsResuming || (GameplayClockContainer.IsPaused.Value == false && !pauseCooldownActive));
+            && !HasFailed;
 
         private bool pauseCooldownActive =>
             lastPauseActionTime.HasValue && GameplayClockContainer.GameplayClock.CurrentTime < lastPauseActionTime + pause_cooldown;
@@ -693,7 +699,10 @@ namespace osu.Game.Screens.Play
 
         public void Pause()
         {
-            if (!canPause) return;
+            if (!pausingSupportedByCurrentState) return;
+
+            if (!IsResuming && pauseCooldownActive)
+                return;
 
             if (IsResuming)
             {

From 9d229a5ec2ae17f70f68ec9d77fb99b2a6ebeaf4 Mon Sep 17 00:00:00 2001
From: Samuel Cattini-Schultz <syriiins@gmail.com>
Date: Sat, 20 Feb 2021 16:27:58 +1100
Subject: [PATCH 1615/3722] Add tests for clockrate adjusted difficulty
 calculations

---
 .../CatchDifficultyCalculatorTest.cs                        | 5 +++++
 .../ManiaDifficultyCalculatorTest.cs                        | 5 +++++
 osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs  | 6 ++++++
 .../TaikoDifficultyCalculatorTest.cs                        | 6 ++++++
 4 files changed, 22 insertions(+)

diff --git a/osu.Game.Rulesets.Catch.Tests/CatchDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Catch.Tests/CatchDifficultyCalculatorTest.cs
index ee416e5a38..f4ee3f5a42 100644
--- a/osu.Game.Rulesets.Catch.Tests/CatchDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Catch.Tests/CatchDifficultyCalculatorTest.cs
@@ -4,6 +4,7 @@
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Difficulty;
+using osu.Game.Rulesets.Catch.Mods;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Tests.Beatmaps;
 
@@ -17,6 +18,10 @@ namespace osu.Game.Rulesets.Catch.Tests
         public void Test(double expected, string name)
             => base.Test(expected, name);
 
+        [TestCase(5.0565038923984691d, "diffcalc-test")]
+        public void TestClockRateAdjusted(double expected, string name)
+            => Test(expected, name, new CatchModDoubleTime());
+
         protected override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new CatchDifficultyCalculator(new CatchRuleset(), beatmap);
 
         protected override Ruleset CreateRuleset() => new CatchRuleset();
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Mania.Tests/ManiaDifficultyCalculatorTest.cs
index a25551f854..09ca04be8a 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaDifficultyCalculatorTest.cs
@@ -5,6 +5,7 @@ using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Mania.Difficulty;
+using osu.Game.Rulesets.Mania.Mods;
 using osu.Game.Tests.Beatmaps;
 
 namespace osu.Game.Rulesets.Mania.Tests
@@ -17,6 +18,10 @@ namespace osu.Game.Rulesets.Mania.Tests
         public void Test(double expected, string name)
             => base.Test(expected, name);
 
+        [TestCase(2.7646128945056723d, "diffcalc-test")]
+        public void TestClockRateAdjusted(double expected, string name)
+            => Test(expected, name, new ManiaModDoubleTime());
+
         protected override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new ManiaDifficultyCalculator(new ManiaRuleset(), beatmap);
 
         protected override Ruleset CreateRuleset() => new ManiaRuleset();
diff --git a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
index 85a41137d4..a365ea10d4 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
@@ -5,6 +5,7 @@ using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Osu.Difficulty;
+using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Tests.Beatmaps;
 
 namespace osu.Game.Rulesets.Osu.Tests
@@ -19,6 +20,11 @@ namespace osu.Game.Rulesets.Osu.Tests
         public void Test(double expected, string name)
             => base.Test(expected, name);
 
+        [TestCase(8.6228371119393064d, "diffcalc-test")]
+        [TestCase(1.2864585434597433d, "zero-length-sliders")]
+        public void TestClockRateAdjusted(double expected, string name)
+            => Test(expected, name, new OsuModDoubleTime());
+
         protected override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new OsuDifficultyCalculator(new OsuRuleset(), beatmap);
 
         protected override Ruleset CreateRuleset() => new OsuRuleset();
diff --git a/osu.Game.Rulesets.Taiko.Tests/TaikoDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Taiko.Tests/TaikoDifficultyCalculatorTest.cs
index 71b3c23b50..eb21c02d5f 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TaikoDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TaikoDifficultyCalculatorTest.cs
@@ -5,6 +5,7 @@ using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Taiko.Difficulty;
+using osu.Game.Rulesets.Taiko.Mods;
 using osu.Game.Tests.Beatmaps;
 
 namespace osu.Game.Rulesets.Taiko.Tests
@@ -18,6 +19,11 @@ namespace osu.Game.Rulesets.Taiko.Tests
         public void Test(double expected, string name)
             => base.Test(expected, name);
 
+        [TestCase(3.1473940254109078d, "diffcalc-test")]
+        [TestCase(3.1473940254109078d, "diffcalc-test-strong")]
+        public void TestClockRateAdjusted(double expected, string name)
+            => Test(expected, name, new TaikoModDoubleTime());
+
         protected override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new TaikoDifficultyCalculator(new TaikoRuleset(), beatmap);
 
         protected override Ruleset CreateRuleset() => new TaikoRuleset();

From 3b7ebfa2acad63c3a426610450d681eab9947450 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 20 Feb 2021 17:17:31 +0900
Subject: [PATCH 1616/3722] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index bfdc8f6b3c..1513f6444d 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.219.1" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.220.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 4138fc8d6c..9c3d0c2020 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.219.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.220.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.0.1" />
     <PackageReference Include="SharpCompress" Version="0.27.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 783b638aa0..99ab88a064 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.219.1" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.220.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -91,7 +91,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.219.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.220.0" />
     <PackageReference Include="SharpCompress" Version="0.27.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 442347df8eee74c903a4564ab8ec92a8b20c7964 Mon Sep 17 00:00:00 2001
From: Samuel Cattini-Schultz <syriiins@gmail.com>
Date: Fri, 19 Feb 2021 18:04:25 +1100
Subject: [PATCH 1617/3722] Fix clockrate adjusted difficulty calculations bug
 in strain decay

When starting a new section, the starting strain value was calculated using the unadjusted timing value, meaning decay curves were essentially being stretched or squashed according to the clockrate.

This caused incorrect strain peaks for any section where the peak occurs at the start of the section (none of the objects in the section added enough strain after decay to exceed the starting strain).

This bug caused star ratings with clockrates above 1 to be lower than they should and below 1 to be higher than they should.
---
 osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs         | 4 ++--
 osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs        | 2 +-
 .../Difficulty/Preprocessing/DifficultyHitObject.cs         | 6 ++++++
 osu.Game/Rulesets/Difficulty/Skills/Skill.cs                | 6 +++---
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs b/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
index 7ebc1ff752..56fb138b1f 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
@@ -71,8 +71,8 @@ namespace osu.Game.Rulesets.Mania.Difficulty.Skills
         }
 
         protected override double GetPeakStrain(double offset)
-            => applyDecay(individualStrain, offset - Previous[0].BaseObject.StartTime, individual_decay_base)
-               + applyDecay(overallStrain, offset - Previous[0].BaseObject.StartTime, overall_decay_base);
+            => applyDecay(individualStrain, offset - Previous[0].StartTime, individual_decay_base)
+               + applyDecay(overallStrain, offset - Previous[0].StartTime, overall_decay_base);
 
         private double applyDecay(double value, double deltaTime, double decayBase)
             => value * Math.Pow(decayBase, deltaTime / 1000);
diff --git a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
index f15e5e1df0..8c2292dcaa 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
@@ -83,7 +83,7 @@ namespace osu.Game.Rulesets.Difficulty
                     foreach (Skill s in skills)
                     {
                         s.SaveCurrentPeak();
-                        s.StartNewSectionFrom(currentSectionEnd);
+                        s.StartNewSectionFrom(currentSectionEnd / clockRate);
                     }
 
                     currentSectionEnd += sectionLength;
diff --git a/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs b/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs
index ebbffb5143..fa578d55f0 100644
--- a/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs
+++ b/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs
@@ -25,6 +25,11 @@ namespace osu.Game.Rulesets.Difficulty.Preprocessing
         /// </summary>
         public readonly double DeltaTime;
 
+        /// <summary>
+        /// Start time of <see cref="BaseObject"/>.
+        /// </summary>
+        public readonly double StartTime;
+
         /// <summary>
         /// Creates a new <see cref="DifficultyHitObject"/>.
         /// </summary>
@@ -36,6 +41,7 @@ namespace osu.Game.Rulesets.Difficulty.Preprocessing
             BaseObject = hitObject;
             LastObject = lastObject;
             DeltaTime = (hitObject.StartTime - lastObject.StartTime) / clockRate;
+            StartTime = hitObject.StartTime / clockRate;
         }
     }
 }
diff --git a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
index 1063a24b27..44ce78c8e3 100644
--- a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
+++ b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         /// <summary>
         /// Sets the initial strain level for a new section.
         /// </summary>
-        /// <param name="time">The beginning of the new section in milliseconds.</param>
+        /// <param name="time">The beginning of the new section in milliseconds, adjusted by clockrate.</param>
         public void StartNewSectionFrom(double time)
         {
             // The maximum strain of the new section is not zero by default, strain decays as usual regardless of section boundaries.
@@ -87,9 +87,9 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         /// <summary>
         /// Retrieves the peak strain at a point in time.
         /// </summary>
-        /// <param name="time">The time to retrieve the peak strain at.</param>
+        /// <param name="time">The time to retrieve the peak strain at, adjusted by clockrate.</param>
         /// <returns>The peak strain.</returns>
-        protected virtual double GetPeakStrain(double time) => CurrentStrain * strainDecay(time - Previous[0].BaseObject.StartTime);
+        protected virtual double GetPeakStrain(double time) => CurrentStrain * strainDecay(time - Previous[0].StartTime);
 
         /// <summary>
         /// Returns the calculated difficulty value representing all processed <see cref="DifficultyHitObject"/>s.

From 417bb07b366394a41bef13dcc2a1c2a79891bfbd Mon Sep 17 00:00:00 2001
From: Samuel Cattini-Schultz <syriiins@gmail.com>
Date: Sat, 20 Feb 2021 16:52:19 +1100
Subject: [PATCH 1618/3722] Update tests with fixed diffcalc values

---
 .../CatchDifficultyCalculatorTest.cs                          | 2 +-
 .../ManiaDifficultyCalculatorTest.cs                          | 2 +-
 osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs    | 4 ++--
 .../TaikoDifficultyCalculatorTest.cs                          | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/CatchDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Catch.Tests/CatchDifficultyCalculatorTest.cs
index f4ee3f5a42..5580358f89 100644
--- a/osu.Game.Rulesets.Catch.Tests/CatchDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Catch.Tests/CatchDifficultyCalculatorTest.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         public void Test(double expected, string name)
             => base.Test(expected, name);
 
-        [TestCase(5.0565038923984691d, "diffcalc-test")]
+        [TestCase(5.169743871843191d, "diffcalc-test")]
         public void TestClockRateAdjusted(double expected, string name)
             => Test(expected, name, new CatchModDoubleTime());
 
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Mania.Tests/ManiaDifficultyCalculatorTest.cs
index 09ca04be8a..6e6500a339 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaDifficultyCalculatorTest.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Mania.Tests
         public void Test(double expected, string name)
             => base.Test(expected, name);
 
-        [TestCase(2.7646128945056723d, "diffcalc-test")]
+        [TestCase(2.7879104989252959d, "diffcalc-test")]
         public void TestClockRateAdjusted(double expected, string name)
             => Test(expected, name, new ManiaModDoubleTime());
 
diff --git a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
index a365ea10d4..b6db989231 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
@@ -20,8 +20,8 @@ namespace osu.Game.Rulesets.Osu.Tests
         public void Test(double expected, string name)
             => base.Test(expected, name);
 
-        [TestCase(8.6228371119393064d, "diffcalc-test")]
-        [TestCase(1.2864585434597433d, "zero-length-sliders")]
+        [TestCase(8.7212283220504574d, "diffcalc-test")]
+        [TestCase(1.3212137310562277d, "zero-length-sliders")]
         public void TestClockRateAdjusted(double expected, string name)
             => Test(expected, name, new OsuModDoubleTime());
 
diff --git a/osu.Game.Rulesets.Taiko.Tests/TaikoDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Taiko.Tests/TaikoDifficultyCalculatorTest.cs
index eb21c02d5f..dd3c6b317a 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TaikoDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TaikoDifficultyCalculatorTest.cs
@@ -19,8 +19,8 @@ namespace osu.Game.Rulesets.Taiko.Tests
         public void Test(double expected, string name)
             => base.Test(expected, name);
 
-        [TestCase(3.1473940254109078d, "diffcalc-test")]
-        [TestCase(3.1473940254109078d, "diffcalc-test-strong")]
+        [TestCase(3.1704781712282624d, "diffcalc-test")]
+        [TestCase(3.1704781712282624d, "diffcalc-test-strong")]
         public void TestClockRateAdjusted(double expected, string name)
             => Test(expected, name, new TaikoModDoubleTime());
 

From 66643a97b0af5b90793435d5b6abefae582ca163 Mon Sep 17 00:00:00 2001
From: Samuel Cattini-Schultz <syriiins@gmail.com>
Date: Sat, 6 Feb 2021 15:06:16 +1100
Subject: [PATCH 1619/3722] Add a list of mods to Skill class

Although this isn't necessary for existing official rulesets and calculators, custom calculators can have use cases for accessing mods in difficulty calculation.
For example, accounting for the effects of visual mods.
---
 .../Difficulty/CatchDifficultyCalculator.cs         |  4 ++--
 .../Difficulty/Skills/Movement.cs                   |  4 +++-
 .../Difficulty/ManiaDifficultyCalculator.cs         |  4 ++--
 osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs |  4 +++-
 .../Difficulty/OsuDifficultyCalculator.cs           |  6 +++---
 osu.Game.Rulesets.Osu/Difficulty/Skills/Aim.cs      |  6 ++++++
 osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs    |  6 ++++++
 osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs |  6 ++++++
 osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs |  6 ++++++
 .../Difficulty/Skills/Stamina.cs                    |  5 ++++-
 .../Difficulty/TaikoDifficultyCalculator.cs         | 10 +++++-----
 .../DifficultyAdjustmentModCombinationsTest.cs      |  2 +-
 .../Rulesets/Difficulty/DifficultyCalculator.cs     |  5 +++--
 osu.Game/Rulesets/Difficulty/Skills/Skill.cs        | 13 +++++++++++++
 14 files changed, 63 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
index a317ef252d..10aae70722 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
             }
         }
 
-        protected override Skill[] CreateSkills(IBeatmap beatmap)
+        protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods)
         {
             halfCatcherWidth = Catcher.CalculateCatchWidth(beatmap.BeatmapInfo.BaseDifficulty) * 0.5f;
 
@@ -78,7 +78,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
 
             return new Skill[]
             {
-                new Movement(halfCatcherWidth),
+                new Movement(mods, halfCatcherWidth),
             };
         }
 
diff --git a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
index e679231638..9ad719be1a 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
@@ -5,6 +5,7 @@ using System;
 using osu.Game.Rulesets.Catch.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
+using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Catch.Difficulty.Skills
 {
@@ -25,7 +26,8 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
         private float lastDistanceMoved;
         private double lastStrainTime;
 
-        public Movement(float halfCatcherWidth)
+        public Movement(Mod[] mods, float halfCatcherWidth)
+            : base(mods)
         {
             HalfCatcherWidth = halfCatcherWidth;
         }
diff --git a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
index ade830764d..8c0b9ed8b7 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs
@@ -68,9 +68,9 @@ namespace osu.Game.Rulesets.Mania.Difficulty
         // Sorting is done in CreateDifficultyHitObjects, since the full list of hitobjects is required.
         protected override IEnumerable<DifficultyHitObject> SortObjects(IEnumerable<DifficultyHitObject> input) => input;
 
-        protected override Skill[] CreateSkills(IBeatmap beatmap) => new Skill[]
+        protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods) => new Skill[]
         {
-            new Strain(((ManiaBeatmap)beatmap).TotalColumns)
+            new Strain(mods, ((ManiaBeatmap)beatmap).TotalColumns)
         };
 
         protected override Mod[] DifficultyAdjustmentMods
diff --git a/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs b/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
index 7ebc1ff752..d6ea58ee78 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
@@ -6,6 +6,7 @@ using osu.Framework.Utils;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
 using osu.Game.Rulesets.Mania.Difficulty.Preprocessing;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 
 namespace osu.Game.Rulesets.Mania.Difficulty.Skills
@@ -24,7 +25,8 @@ namespace osu.Game.Rulesets.Mania.Difficulty.Skills
         private double individualStrain;
         private double overallStrain;
 
-        public Strain(int totalColumns)
+        public Strain(Mod[] mods, int totalColumns)
+            : base(mods)
         {
             holdEndTimes = new double[totalColumns];
             individualStrains = new double[totalColumns];
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
index 6a7d76151c..75d6786d95 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
@@ -79,10 +79,10 @@ namespace osu.Game.Rulesets.Osu.Difficulty
             }
         }
 
-        protected override Skill[] CreateSkills(IBeatmap beatmap) => new Skill[]
+        protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods) => new Skill[]
         {
-            new Aim(),
-            new Speed()
+            new Aim(mods),
+            new Speed(mods)
         };
 
         protected override Mod[] DifficultyAdjustmentMods => new Mod[]
diff --git a/osu.Game.Rulesets.Osu/Difficulty/Skills/Aim.cs b/osu.Game.Rulesets.Osu/Difficulty/Skills/Aim.cs
index e74f4933b2..90cba13c7c 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Skills/Aim.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Skills/Aim.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Osu.Objects;
 
@@ -17,6 +18,11 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
         private const double angle_bonus_begin = Math.PI / 3;
         private const double timing_threshold = 107;
 
+        public Aim(Mod[] mods)
+            : base(mods)
+        {
+        }
+
         protected override double SkillMultiplier => 26.25;
         protected override double StrainDecayBase => 0.15;
 
diff --git a/osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs b/osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs
index 01f2fb8dc8..200bc7997d 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Osu.Objects;
 
@@ -27,6 +28,11 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
         private const double max_speed_bonus = 45; // ~330BPM
         private const double speed_balancing_factor = 40;
 
+        public Speed(Mod[] mods)
+            : base(mods)
+        {
+        }
+
         protected override double StrainValueOf(DifficultyHitObject current)
         {
             if (current.BaseObject is Spinner)
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
index 32421ee00a..cc0738e252 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
@@ -5,6 +5,7 @@ using System;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
 using osu.Game.Rulesets.Difficulty.Utils;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Taiko.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Taiko.Objects;
 
@@ -39,6 +40,11 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
         /// </summary>
         private int currentMonoLength;
 
+        public Colour(Mod[] mods)
+            : base(mods)
+        {
+        }
+
         protected override double StrainValueOf(DifficultyHitObject current)
         {
             // changing from/to a drum roll or a swell does not constitute a colour change.
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
index 5569b27ad5..f2b8309ac5 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
@@ -5,6 +5,7 @@ using System;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
 using osu.Game.Rulesets.Difficulty.Utils;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Taiko.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Taiko.Objects;
 
@@ -47,6 +48,11 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
         /// </summary>
         private int notesSinceRhythmChange;
 
+        public Rhythm(Mod[] mods)
+            : base(mods)
+        {
+        }
+
         protected override double StrainValueOf(DifficultyHitObject current)
         {
             // drum rolls and swells are exempt.
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
index 0b61eb9930..c34cce0cd6 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
 using osu.Game.Rulesets.Difficulty.Utils;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Taiko.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Taiko.Objects;
 
@@ -48,8 +49,10 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
         /// <summary>
         /// Creates a <see cref="Stamina"/> skill.
         /// </summary>
+        /// <param name="mods">Mods for use in skill calculations.</param>
         /// <param name="rightHand">Whether this instance is performing calculations for the right hand.</param>
-        public Stamina(bool rightHand)
+        public Stamina(Mod[] mods, bool rightHand)
+            : base(mods)
         {
             hand = rightHand ? 1 : 0;
         }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
index e5485db4df..fc198d2493 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
@@ -29,12 +29,12 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
         {
         }
 
-        protected override Skill[] CreateSkills(IBeatmap beatmap) => new Skill[]
+        protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods) => new Skill[]
         {
-            new Colour(),
-            new Rhythm(),
-            new Stamina(true),
-            new Stamina(false),
+            new Colour(mods),
+            new Rhythm(mods),
+            new Stamina(mods, true),
+            new Stamina(mods, false),
         };
 
         protected override Mod[] DifficultyAdjustmentMods => new Mod[]
diff --git a/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs b/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs
index 5c7adb3f49..1c0bfd56dd 100644
--- a/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs
+++ b/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs
@@ -212,7 +212,7 @@ namespace osu.Game.Tests.NonVisual
                 throw new NotImplementedException();
             }
 
-            protected override Skill[] CreateSkills(IBeatmap beatmap)
+            protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods)
             {
                 throw new NotImplementedException();
             }
diff --git a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
index f15e5e1df0..a25dc3e6db 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Rulesets.Difficulty
 
         private DifficultyAttributes calculate(IBeatmap beatmap, Mod[] mods, double clockRate)
         {
-            var skills = CreateSkills(beatmap);
+            var skills = CreateSkills(beatmap, mods);
 
             if (!beatmap.HitObjects.Any())
                 return CreateDifficultyAttributes(beatmap, mods, skills, clockRate);
@@ -202,7 +202,8 @@ namespace osu.Game.Rulesets.Difficulty
         /// Creates the <see cref="Skill"/>s to calculate the difficulty of an <see cref="IBeatmap"/>.
         /// </summary>
         /// <param name="beatmap">The <see cref="IBeatmap"/> whose difficulty will be calculated.</param>
+        /// <param name="mods">Mods to calculate difficulty with.</param>
         /// <returns>The <see cref="Skill"/>s.</returns>
-        protected abstract Skill[] CreateSkills(IBeatmap beatmap);
+        protected abstract Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods);
     }
 }
diff --git a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
index 1063a24b27..95117be073 100644
--- a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
+++ b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Utils;
+using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Difficulty.Skills
 {
@@ -46,10 +47,22 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         /// </summary>
         protected double CurrentStrain { get; private set; } = 1;
 
+        /// <summary>
+        /// Mods for use in skill calculations.
+        /// </summary>
+        protected IReadOnlyList<Mod> Mods => mods;
+
         private double currentSectionPeak = 1; // We also keep track of the peak strain level in the current section.
 
         private readonly List<double> strainPeaks = new List<double>();
 
+        private readonly Mod[] mods;
+
+        protected Skill(Mod[] mods)
+        {
+            this.mods = mods;
+        }
+
         /// <summary>
         /// Process a <see cref="DifficultyHitObject"/> and update current strain values accordingly.
         /// </summary>

From cc4c5f72d893bc014d4172b1e2ba1c0930165aa4 Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Sat, 20 Feb 2021 21:48:31 +0100
Subject: [PATCH 1620/3722] Move logic to keep selection in bounds into it's
 own method

---
 .../Edit/OsuSelectionHandler.cs               | 37 ++++++++++++-------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 871339ae7b..51e0e80e30 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -211,26 +211,35 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
             var hitObjects = selectedMovableObjects;
 
-            Quad quad = getSurroundingQuad(hitObjects);
-
-            Vector2 newTopLeft = quad.TopLeft + delta;
-            if (newTopLeft.X < 0)
-                delta.X -= newTopLeft.X;
-            if (newTopLeft.Y < 0)
-                delta.Y -= newTopLeft.Y;
-
-            Vector2 newBottomRight = quad.BottomRight + delta;
-            if (newBottomRight.X > DrawWidth)
-                delta.X -= newBottomRight.X - DrawWidth;
-            if (newBottomRight.Y > DrawHeight)
-                delta.Y -= newBottomRight.Y - DrawHeight;
-
             foreach (var h in hitObjects)
                 h.Position += delta;
 
+            moveSelectionInBounds();
+
             return true;
         }
 
+        private void moveSelectionInBounds()
+        {
+            var hitObjects = selectedMovableObjects;
+
+            Quad quad = getSurroundingQuad(hitObjects);
+            Vector2 delta = new Vector2(0);
+
+            if (quad.TopLeft.X < 0)
+                delta.X -= quad.TopLeft.X;
+            if (quad.TopLeft.Y < 0)
+                delta.Y -= quad.TopLeft.Y;
+
+            if (quad.BottomRight.X > DrawWidth)
+                delta.X -= quad.BottomRight.X - DrawWidth;
+            if (quad.BottomRight.Y > DrawHeight)
+                delta.Y -= quad.BottomRight.Y - DrawHeight;
+
+            foreach (var h in hitObjects)
+                h.Position += delta;
+        }
+
         /// <summary>
         /// Returns a gamefield-space quad surrounding the provided hit objects.
         /// </summary>

From 0b8009938a4c6c84b406cf6fd15ccd76e150935f Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Sat, 20 Feb 2021 21:50:30 +0100
Subject: [PATCH 1621/3722] Prevent selection from breaking playfield bounds
 when scaling

---
 .../Edit/OsuSelectionHandler.cs               | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 51e0e80e30..6c62bdd922 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -135,14 +135,21 @@ namespace osu.Game.Rulesets.Osu.Edit
             adjustScaleFromAnchor(ref scale, reference);
 
             var hitObjects = selectedMovableObjects;
+            Quad selectionQuad = getSurroundingQuad(hitObjects);
+
+            float newWidth = selectionQuad.Width + scale.X;
+            float newHeight = selectionQuad.Height + scale.Y;
+
+            if ((newHeight > DrawHeight) || (newWidth > DrawWidth))
+                return false;
 
             // for the time being, allow resizing of slider paths only if the slider is
             // the only hit object selected. with a group selection, it's likely the user
             // is not looking to change the duration of the slider but expand the whole pattern.
             if (hitObjects.Length == 1 && hitObjects.First() is Slider slider)
             {
-                Quad quad = getSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position.Value));
-                Vector2 pathRelativeDeltaScale = new Vector2(1 + scale.X / quad.Width, 1 + scale.Y / quad.Height);
+                Quad sliderQuad = getSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position.Value));
+                Vector2 pathRelativeDeltaScale = new Vector2(1 + scale.X / sliderQuad.Width, 1 + scale.Y / sliderQuad.Height);
 
                 foreach (var point in slider.Path.ControlPoints)
                     point.Position.Value *= pathRelativeDeltaScale;
@@ -153,23 +160,23 @@ namespace osu.Game.Rulesets.Osu.Edit
                 if ((reference & Anchor.x0) > 0 && !moveSelection(new Vector2(-scale.X, 0))) return false;
                 if ((reference & Anchor.y0) > 0 && !moveSelection(new Vector2(0, -scale.Y))) return false;
 
-                Quad quad = getSurroundingQuad(hitObjects);
-
                 foreach (var h in hitObjects)
                 {
                     var newPosition = h.Position;
 
                     // guard against no-ops and NaN.
-                    if (scale.X != 0 && quad.Width > 0)
-                        newPosition.X = quad.TopLeft.X + (h.X - quad.TopLeft.X) / quad.Width * (quad.Width + scale.X);
+                    if (scale.X != 0 && selectionQuad.Width > 0)
+                        newPosition.X = selectionQuad.TopLeft.X + (h.X - selectionQuad.TopLeft.X) / selectionQuad.Width * (selectionQuad.Width + scale.X);
 
-                    if (scale.Y != 0 && quad.Height > 0)
-                        newPosition.Y = quad.TopLeft.Y + (h.Y - quad.TopLeft.Y) / quad.Height * (quad.Height + scale.Y);
+                    if (scale.Y != 0 && selectionQuad.Height > 0)
+                        newPosition.Y = selectionQuad.TopLeft.Y + (h.Y - selectionQuad.TopLeft.Y) / selectionQuad.Height * (selectionQuad.Height + scale.Y);
 
                     h.Position = newPosition;
                 }
             }
 
+            moveSelectionInBounds();
+
             return true;
         }
 

From 562a4cefdb952b54d3b6c20eda47e13b78378010 Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Sun, 21 Feb 2021 12:12:32 +0100
Subject: [PATCH 1622/3722] Simplify HandleScale by extracting methods

---
 .../Edit/OsuSelectionHandler.cs               | 67 +++++++++++--------
 1 file changed, 40 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 6c62bdd922..9418752745 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -143,41 +143,18 @@ namespace osu.Game.Rulesets.Osu.Edit
             if ((newHeight > DrawHeight) || (newWidth > DrawWidth))
                 return false;
 
+            bool result;
             // for the time being, allow resizing of slider paths only if the slider is
             // the only hit object selected. with a group selection, it's likely the user
             // is not looking to change the duration of the slider but expand the whole pattern.
             if (hitObjects.Length == 1 && hitObjects.First() is Slider slider)
-            {
-                Quad sliderQuad = getSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position.Value));
-                Vector2 pathRelativeDeltaScale = new Vector2(1 + scale.X / sliderQuad.Width, 1 + scale.Y / sliderQuad.Height);
-
-                foreach (var point in slider.Path.ControlPoints)
-                    point.Position.Value *= pathRelativeDeltaScale;
-            }
+                result = scaleSlider(slider, scale);
             else
-            {
-                // move the selection before scaling if dragging from top or left anchors.
-                if ((reference & Anchor.x0) > 0 && !moveSelection(new Vector2(-scale.X, 0))) return false;
-                if ((reference & Anchor.y0) > 0 && !moveSelection(new Vector2(0, -scale.Y))) return false;
-
-                foreach (var h in hitObjects)
-                {
-                    var newPosition = h.Position;
-
-                    // guard against no-ops and NaN.
-                    if (scale.X != 0 && selectionQuad.Width > 0)
-                        newPosition.X = selectionQuad.TopLeft.X + (h.X - selectionQuad.TopLeft.X) / selectionQuad.Width * (selectionQuad.Width + scale.X);
-
-                    if (scale.Y != 0 && selectionQuad.Height > 0)
-                        newPosition.Y = selectionQuad.TopLeft.Y + (h.Y - selectionQuad.TopLeft.Y) / selectionQuad.Height * (selectionQuad.Height + scale.Y);
-
-                    h.Position = newPosition;
-                }
-            }
+                result = scaleHitObjects(hitObjects, reference, scale);
 
             moveSelectionInBounds();
 
-            return true;
+            return result;
         }
 
         private static void adjustScaleFromAnchor(ref Vector2 scale, Anchor reference)
@@ -214,6 +191,42 @@ namespace osu.Game.Rulesets.Osu.Edit
             return true;
         }
 
+        private bool scaleSlider(Slider slider, Vector2 scale)
+        {
+            Quad quad = getSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position.Value));
+            Vector2 pathRelativeDeltaScale = new Vector2(1 + scale.X / quad.Width, 1 + scale.Y / quad.Height);
+
+            foreach (var point in slider.Path.ControlPoints)
+                point.Position.Value *= pathRelativeDeltaScale;
+
+            return true;
+        }
+
+        private bool scaleHitObjects(OsuHitObject[] hitObjects, Anchor reference, Vector2 scale)
+        {
+            // move the selection before scaling if dragging from top or left anchors.
+            if ((reference & Anchor.x0) > 0 && !moveSelection(new Vector2(-scale.X, 0))) return false;
+            if ((reference & Anchor.y0) > 0 && !moveSelection(new Vector2(0, -scale.Y))) return false;
+
+            Quad selectionQuad = getSurroundingQuad(hitObjects);
+
+            foreach (var h in hitObjects)
+            {
+                var newPosition = h.Position;
+
+                // guard against no-ops and NaN.
+                if (scale.X != 0 && selectionQuad.Width > 0)
+                    newPosition.X = selectionQuad.TopLeft.X + (h.X - selectionQuad.TopLeft.X) / selectionQuad.Width * (selectionQuad.Width + scale.X);
+
+                if (scale.Y != 0 && selectionQuad.Height > 0)
+                    newPosition.Y = selectionQuad.TopLeft.Y + (h.Y - selectionQuad.TopLeft.Y) / selectionQuad.Height * (selectionQuad.Height + scale.Y);
+
+                h.Position = newPosition;
+            }
+
+            return true;
+        }
+
         private bool moveSelection(Vector2 delta)
         {
             var hitObjects = selectedMovableObjects;

From 2c6f92d12fb2d2a55ad8bb9f28e4f32634aadf8b Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Sun, 21 Feb 2021 17:38:50 +0100
Subject: [PATCH 1623/3722] Move bounds check from moveSelection to
 HandleMovement

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

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 9418752745..9ca8404a26 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -35,8 +35,12 @@ namespace osu.Game.Rulesets.Osu.Edit
             referenceOrigin = null;
         }
 
-        public override bool HandleMovement(MoveSelectionEvent moveEvent) =>
-            moveSelection(moveEvent.InstantDelta);
+        public override bool HandleMovement(MoveSelectionEvent moveEvent)
+        {
+            bool result = moveSelection(moveEvent.InstantDelta);
+            moveSelectionInBounds();
+            return result;
+        }
 
         /// <summary>
         /// During a transform, the initial origin is stored so it can be used throughout the operation.
@@ -234,8 +238,6 @@ namespace osu.Game.Rulesets.Osu.Edit
             foreach (var h in hitObjects)
                 h.Position += delta;
 
-            moveSelectionInBounds();
-
             return true;
         }
 

From 33985d9e7c27a3d2ec58e5a2cd6f3068e50be7ab Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Sun, 21 Feb 2021 17:40:57 +0100
Subject: [PATCH 1624/3722] Rewrite scaling bounds check to behave more
 intuively

---
 .../Edit/OsuSelectionHandler.cs               | 39 +++++++++++++------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 9ca8404a26..64dbe20c58 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -139,15 +139,8 @@ namespace osu.Game.Rulesets.Osu.Edit
             adjustScaleFromAnchor(ref scale, reference);
 
             var hitObjects = selectedMovableObjects;
-            Quad selectionQuad = getSurroundingQuad(hitObjects);
-
-            float newWidth = selectionQuad.Width + scale.X;
-            float newHeight = selectionQuad.Height + scale.Y;
-
-            if ((newHeight > DrawHeight) || (newWidth > DrawWidth))
-                return false;
-
             bool result;
+
             // for the time being, allow resizing of slider paths only if the slider is
             // the only hit object selected. with a group selection, it's likely the user
             // is not looking to change the duration of the slider but expand the whole pattern.
@@ -197,8 +190,18 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         private bool scaleSlider(Slider slider, Vector2 scale)
         {
-            Quad quad = getSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position.Value));
-            Vector2 pathRelativeDeltaScale = new Vector2(1 + scale.X / quad.Width, 1 + scale.Y / quad.Height);
+            Quad sliderQuad = getSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position.Value));
+            Vector2 pathRelativeDeltaScale = new Vector2(1 + scale.X / sliderQuad.Width, 1 + scale.Y / sliderQuad.Height);
+
+            Quad selectionQuad = getSurroundingQuad(new OsuHitObject[] { slider });
+            Quad scaledQuad = new Quad(selectionQuad.TopLeft.X, selectionQuad.TopLeft.Y, selectionQuad.Width + scale.X, selectionQuad.Height + scale.Y);
+            (bool X, bool Y) inBounds = isQuadInBounds(scaledQuad);
+
+            if (!inBounds.X)
+                pathRelativeDeltaScale.X = 1;
+
+            if (!inBounds.Y)
+                pathRelativeDeltaScale.Y = 1;
 
             foreach (var point in slider.Path.ControlPoints)
                 point.Position.Value *= pathRelativeDeltaScale;
@@ -213,16 +216,18 @@ namespace osu.Game.Rulesets.Osu.Edit
             if ((reference & Anchor.y0) > 0 && !moveSelection(new Vector2(0, -scale.Y))) return false;
 
             Quad selectionQuad = getSurroundingQuad(hitObjects);
+            Quad scaledQuad = new Quad(selectionQuad.TopLeft.X, selectionQuad.TopLeft.Y, selectionQuad.Width + scale.X, selectionQuad.Height + scale.Y);
+            (bool X, bool Y) inBounds = isQuadInBounds(scaledQuad);
 
             foreach (var h in hitObjects)
             {
                 var newPosition = h.Position;
 
                 // guard against no-ops and NaN.
-                if (scale.X != 0 && selectionQuad.Width > 0)
+                if (scale.X != 0 && selectionQuad.Width > 0 && inBounds.X)
                     newPosition.X = selectionQuad.TopLeft.X + (h.X - selectionQuad.TopLeft.X) / selectionQuad.Width * (selectionQuad.Width + scale.X);
 
-                if (scale.Y != 0 && selectionQuad.Height > 0)
+                if (scale.Y != 0 && selectionQuad.Height > 0 && inBounds.Y)
                     newPosition.Y = selectionQuad.TopLeft.Y + (h.Y - selectionQuad.TopLeft.Y) / selectionQuad.Height * (selectionQuad.Height + scale.Y);
 
                 h.Position = newPosition;
@@ -231,6 +236,16 @@ namespace osu.Game.Rulesets.Osu.Edit
             return true;
         }
 
+        private (bool X, bool Y) isQuadInBounds(Quad quad)
+        {
+            (bool X, bool Y) result;
+
+            result.X = (quad.TopLeft.X >= 0) && (quad.BottomRight.X < DrawWidth);
+            result.Y = (quad.TopLeft.Y >= 0) && (quad.BottomRight.Y < DrawHeight);
+
+            return result;
+        }
+
         private bool moveSelection(Vector2 delta)
         {
             var hitObjects = selectedMovableObjects;

From 8d463987dd6c7260f25c90a31804d180c147b5df Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 22 Feb 2021 13:21:50 +0900
Subject: [PATCH 1625/3722] Fix being able to select incompatible freemods

---
 .../Screens/OnlinePlay/OnlinePlaySongSelect.cs    | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
index f0c77b79bf..3f30ef1176 100644
--- a/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/OnlinePlaySongSelect.cs
@@ -75,9 +75,18 @@ namespace osu.Game.Screens.OnlinePlay
             Mods.Value = selectedItem?.Value?.RequiredMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
             FreeMods.Value = selectedItem?.Value?.AllowedMods.Select(m => m.CreateCopy()).ToArray() ?? Array.Empty<Mod>();
 
+            Mods.BindValueChanged(onModsChanged);
             Ruleset.BindValueChanged(onRulesetChanged);
         }
 
+        private void onModsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
+        {
+            FreeMods.Value = FreeMods.Value.Where(checkCompatibleFreeMod).ToList();
+
+            // Reset the validity delegate to update the overlay's display.
+            freeModSelectOverlay.IsValidMod = IsValidFreeMod;
+        }
+
         private void onRulesetChanged(ValueChangedEvent<RulesetInfo> ruleset)
         {
             FreeMods.Value = Array.Empty<Mod>();
@@ -155,6 +164,10 @@ namespace osu.Game.Screens.OnlinePlay
         /// </summary>
         /// <param name="mod">The <see cref="Mod"/> to check.</param>
         /// <returns>Whether <paramref name="mod"/> is a selectable free-mod.</returns>
-        protected virtual bool IsValidFreeMod(Mod mod) => IsValidMod(mod);
+        protected virtual bool IsValidFreeMod(Mod mod) => IsValidMod(mod) && checkCompatibleFreeMod(mod);
+
+        private bool checkCompatibleFreeMod(Mod mod)
+            => Mods.Value.All(m => m.Acronym != mod.Acronym) // Mod must not be contained in the required mods.
+               && ModUtils.CheckCompatibleSet(Mods.Value.Append(mod).ToArray()); // Mod must be compatible with all the required mods.
     }
 }

From ca92ad715a9a11bd772b2f53d04f3cb5a8e13431 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 22 Feb 2021 13:32:54 +0900
Subject: [PATCH 1626/3722] Add test

---
 osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs |  2 +-
 .../TestSceneMultiplayerMatchSongSelect.cs    | 28 +++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs b/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
index df0a41455f..4b0939db16 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
@@ -11,7 +11,7 @@ using osu.Game.Rulesets.Osu.Skinning.Default;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    internal class OsuModTraceable : ModWithVisibilityAdjustment
+    public class OsuModTraceable : ModWithVisibilityAdjustment
     {
         public override string Name => "Traceable";
         public override string Acronym => "TC";
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
index 95c333e9f4..faa5d9e6fc 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
@@ -7,17 +7,23 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions;
+using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Platform;
 using osu.Framework.Screens;
+using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Overlays.Mods;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Catch;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Taiko;
 using osu.Game.Rulesets.Taiko.Mods;
+using osu.Game.Screens.OnlinePlay;
 using osu.Game.Screens.OnlinePlay.Multiplayer;
 using osu.Game.Screens.Select;
 
@@ -137,8 +143,30 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("mods not changed", () => SelectedMods.Value.Single() is TaikoModDoubleTime);
         }
 
+        [TestCase(typeof(OsuModHidden), typeof(OsuModHidden))] // Same mod.
+        [TestCase(typeof(OsuModHidden), typeof(OsuModTraceable))] // Incompatible.
+        public void TestAllowedModDeselectedWhenRequired(Type allowedMod, Type requiredMod)
+        {
+            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) });
+
+            AddAssert("freemods empty", () => songSelect.FreeMods.Value.Count == 0);
+            assertHasFreeModButton(allowedMod, false);
+            assertHasFreeModButton(requiredMod, false);
+        }
+
+        private void assertHasFreeModButton(Type type, bool hasButton = true)
+        {
+            AddAssert($"{type.ReadableName()} {(hasButton ? "displayed" : "not displayed")} in freemod overlay",
+                () => songSelect.ChildrenOfType<FreeModSelectOverlay>().Single().ChildrenOfType<ModButton>().All(b => b.Mod.GetType() != type));
+        }
+
         private class TestMultiplayerMatchSongSelect : MultiplayerMatchSongSelect
         {
+            public new Bindable<IReadOnlyList<Mod>> Mods => base.Mods;
+
+            public new Bindable<IReadOnlyList<Mod>> FreeMods => base.FreeMods;
+
             public new BeatmapCarousel Carousel => base.Carousel;
         }
     }

From e2c5dded7f4e5b4ac1a5123e70e54728f251bb2a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 22 Feb 2021 14:14:36 +0900
Subject: [PATCH 1627/3722] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 1513f6444d..183ac61c90 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.220.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.222.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 9c3d0c2020..37d730bf42 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.220.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.222.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.0.1" />
     <PackageReference Include="SharpCompress" Version="0.27.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 99ab88a064..ca11952cc8 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.220.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.222.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -91,7 +91,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.220.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.222.0" />
     <PackageReference Include="SharpCompress" Version="0.27.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 63dd55c92c9f725926f89dfa14b4ba84d65760a3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 22 Feb 2021 14:18:52 +0900
Subject: [PATCH 1628/3722] Add missing methods from updated audio component
 interface implementation

---
 .../TestSceneDrawableRulesetDependencies.cs    |  4 ++++
 .../Rulesets/UI/DrawableRulesetDependencies.cs |  4 ++++
 osu.Game/Skinning/PoolableSkinnableSample.cs   |  4 ++++
 osu.Game/Skinning/SkinnableSound.cs            | 18 ++++++++++++++++++
 4 files changed, 30 insertions(+)

diff --git a/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs b/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
index 4aebed0d31..f421a30283 100644
--- a/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
+++ b/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
@@ -118,6 +118,10 @@ namespace osu.Game.Tests.Rulesets
             public BindableNumber<double> Frequency => throw new NotImplementedException();
             public BindableNumber<double> Tempo => throw new NotImplementedException();
 
+            public void BindAdjustments(IAggregateAudioAdjustment component) => throw new NotImplementedException();
+
+            public void UnbindAdjustments(IAggregateAudioAdjustment component) => throw new NotImplementedException();
+
             public void AddAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) => throw new NotImplementedException();
 
             public void RemoveAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) => throw new NotImplementedException();
diff --git a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
index bbaca7c80f..b31884d246 100644
--- a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
+++ b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
@@ -134,6 +134,10 @@ namespace osu.Game.Rulesets.UI
 
             public IBindable<double> AggregateTempo => throw new NotSupportedException();
 
+            public void BindAdjustments(IAggregateAudioAdjustment component) => throw new NotImplementedException();
+
+            public void UnbindAdjustments(IAggregateAudioAdjustment component) => throw new NotImplementedException();
+
             public int PlaybackConcurrency
             {
                 get => throw new NotSupportedException();
diff --git a/osu.Game/Skinning/PoolableSkinnableSample.cs b/osu.Game/Skinning/PoolableSkinnableSample.cs
index abff57091b..5a0cf94d6a 100644
--- a/osu.Game/Skinning/PoolableSkinnableSample.cs
+++ b/osu.Game/Skinning/PoolableSkinnableSample.cs
@@ -165,6 +165,10 @@ namespace osu.Game.Skinning
 
         public BindableNumber<double> Tempo => sampleContainer.Tempo;
 
+        public void BindAdjustments(IAggregateAudioAdjustment component) => sampleContainer.BindAdjustments(component);
+
+        public void UnbindAdjustments(IAggregateAudioAdjustment component) => sampleContainer.UnbindAdjustments(component);
+
         public void AddAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) => sampleContainer.AddAdjustment(type, adjustBindable);
 
         public void RemoveAdjustment(AdjustableProperty type, IBindable<double> adjustBindable) => sampleContainer.RemoveAdjustment(type, adjustBindable);
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index d3dfcb1dc0..57e20a8d31 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -176,6 +176,16 @@ namespace osu.Game.Skinning
 
         public BindableNumber<double> Tempo => samplesContainer.Tempo;
 
+        public void BindAdjustments(IAggregateAudioAdjustment component)
+        {
+            samplesContainer.BindAdjustments(component);
+        }
+
+        public void UnbindAdjustments(IAggregateAudioAdjustment component)
+        {
+            samplesContainer.UnbindAdjustments(component);
+        }
+
         public void AddAdjustment(AdjustableProperty type, IBindable<double> adjustBindable)
             => samplesContainer.AddAdjustment(type, adjustBindable);
 
@@ -192,6 +202,14 @@ namespace osu.Game.Skinning
 
         public bool IsPlayed => samplesContainer.Any(s => s.Played);
 
+        public IBindable<double> AggregateVolume => samplesContainer.AggregateVolume;
+
+        public IBindable<double> AggregateBalance => samplesContainer.AggregateBalance;
+
+        public IBindable<double> AggregateFrequency => samplesContainer.AggregateFrequency;
+
+        public IBindable<double> AggregateTempo => samplesContainer.AggregateTempo;
+
         #endregion
     }
 }

From 541237ef16c62d259e4e84fa13943c32a7a54be0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 22 Feb 2021 14:48:04 +0900
Subject: [PATCH 1629/3722] Use a shorter test beatmap for tests which need to
 run to completion

---
 .../Beatmaps/IO/ImportBeatmapTest.cs          |  15 +++++++++++
 ...241526 Soleily - Renatus_virtual_quick.osz | Bin 0 -> 89215 bytes
 osu.Game.Tests/Resources/TestResources.cs     |  25 +++++++++++++++++-
 .../Navigation/TestSceneScreenNavigation.cs   |   2 +-
 4 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Tests/Resources/Archives/241526 Soleily - Renatus_virtual_quick.osz

diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
index c32e359de6..0c35e9471d 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -852,6 +852,21 @@ namespace osu.Game.Tests.Beatmaps.IO
             }
         }
 
+        public static async Task<BeatmapSetInfo> LoadQuickOszIntoOsu(OsuGameBase osu)
+        {
+            var temp = TestResources.GetQuickTestBeatmapForImport();
+
+            var manager = osu.Dependencies.Get<BeatmapManager>();
+
+            var importedSet = await manager.Import(new ImportTask(temp));
+
+            ensureLoaded(osu);
+
+            waitForOrAssert(() => !File.Exists(temp), "Temporary file still exists after standard import", 5000);
+
+            return manager.GetAllUsableBeatmapSets().Find(beatmapSet => beatmapSet.ID == importedSet.ID);
+        }
+
         public static async Task<BeatmapSetInfo> LoadOszIntoOsu(OsuGameBase osu, string path = null, bool virtualTrack = false)
         {
             var temp = path ?? TestResources.GetTestBeatmapForImport(virtualTrack);
diff --git a/osu.Game.Tests/Resources/Archives/241526 Soleily - Renatus_virtual_quick.osz b/osu.Game.Tests/Resources/Archives/241526 Soleily - Renatus_virtual_quick.osz
new file mode 100644
index 0000000000000000000000000000000000000000..e9f5fb03282e189ffc23d77a0db40b3fa2488850
GIT binary patch
literal 89215
zcmV(-K-|AjO9KQH00;mG0HqC$MF0Q*000000P|J>02u%v0BvDoXlZU`bZ>B9Vqs%z
zXL4_KZe%WMaA#Fi4FCt08;ev%MKfTQK{H@=cnbgl1oZ&`00a~O008W~2UHZ@moIv%
zBRMt*l7rBaBuNmE0wk$OiwOahs0~U^0xAs%B9bv6Dwc|X0Td+%6FIkth$ImZL<y2a
z@~!4`=FXdN?_2N9e|@f*Ijil>vbv#8?ezPdv-er+T<Zs1J59_@0EB@c0098jR)Gw~
z!PUc0e7~pXDRISp2Ih+5J1NGd;>I3Mp3W{l;sGj3%F1A^8=MD30%I_tgM~3T)(7`r
zgYWm)_}36!AJU8=hYn?BWlc?Oh{VYl{ODM}EW18b{u;W!hxuQ_dVQQ=jMM0diHW&&
zD`V{y;AX-C{6Q?l4KUmgmK$2Dg6;wU;i2^beh&zP#o-A=CT12^E`WisSPTw}$K!D5
zm9ywIfaAvVNT?VPc=tLGCA~?iVM%wGqzv<3^I5(9A+6@<6VA-Szd=B7<0ctd@@6^p
zts0tI+S`nF7@L@yneW`U|G>dR)`xAJoL!Eept`#G`uPV0o(>9*I3F2xA^KuWa?0f^
zSFfdBPrG|B<9=pV_JfDdp63@778RG2zNxILuBol7Z)khh{=VZw=f|$k1A{|fhDW}R
zew&(}nVtJN|7&3p0$Avu#=n^lI&lbt!(nkm#(W@5Ambu84lkiX;4#=sbnxbtR1ISy
z87AGyd(AARX7z*5(dR7-zqI=2O;e01t<UKH-GsvbKh5Z$C-l$rS?dC9SO`@ZmK*4U
zg_l?RA(%HhSy)ipqkdH#$a%_`Tg%0FejmF_lRDm`4EBqVF{%b%$q*SJ7#a)sAMqaw
z)~WORS3U}2AACD^8L|!&a#=kwJGMO^#GAXf_*lAu=wvDoXa-u#u~dk;)&74T>HkGk
z$W$#j>JAQjtbr8=m~YoZuUluSnC(;u9!Uec9nnu5F!7BPL~zxB1Sk-U{~z)13Xv@_
z>dtLjFqPsO6RH`0t=<+F)ow_0geTT2oa&q(orHOw#)~sA+z^WdYTF$~9tF-L*aqg+
zr-Li$vp{Dm7U&V@5T=VVf4f2a(Sq~H)Yiuvqhb^fcyB6d-O%8(uYD;Xv)(kV_NhtI
zm=z>_)7R`SvoPDUl>GULPb+R9N=@qaHPO{ngjr31SpT^!Weq%|;}rVC5-NJ=IKRK&
zZvJQijcP0os)X-9XYHPBDnx6YKU=M0Jv^7KI5vDuOtqw8ruAL?_I!-8nd-S|qk@po
zxd&_}jtyEL#T>rF+|N(Yl*v&3A2E?XSrE;$%yB;+yM#YI`q+yEb)`lfVV-bbeo1yO
z!i5K?!H#802Ct9T1`~FeJ0<&2p$z)(FJk&xz@GnkzW<T!s&l;E8J~sQ2tJmSUfs`Y
zqD&-yTBdSe+H5%V#HcGQ)?c1xh7jnONNEa&f}vReLF|1XcTZVXgbbB5|J}F$#|pgz
zX0m!@OqJC$8t=^?#z5Wnxjdhge0LX3{;5P>2ThcZ%cbNe33P0Vw<Li(Kv0hiy|(eZ
zvLUIHf{l^Z4;l8{iJ~=|-6sG?<$a)v2KH@#z_k8AfuWIjIE;b0aG8iLolbZ>+;O^6
zZh0sGG0`C?zDpx$!=fXzBuI7Gcx7ZUZ`t(8XBgYSt-{&x^4HWN9e-T>CLKco1S%N)
z+o$qp3JlG1Cu)2c3ci~eQ=cC@Op|#TulIRSoFJww5(oCnC2`(#UIT&4RLtg0LAJ8f
zBKUQCrD)Y7I2jsgvpV3xgH1r-&j3e%k|5qW8VB=~Vq;hRAXcd@Zos;Z{pJ8oQ#~)M
zRbt6WB$kD?EuwRYE+sQe3=fQ6t`gPyJ_$FBF@1*#S_n35f(ogcBgDv8=#y4VzYOTi
z2)-ZH)E{9tf0Dr0Mg(KF|0HA7Z{v4dx*}o>j!X{}OTS{toE#X3!{;ry#FC1f9$;e#
z2MT$NRFlGP`k3wn<8!w}J4SZeUb6nEB$?nB_F^V}4O~%?3X}g{Es=!AjfYneW+v;}
z3SeSg0LWIsbYLs;KVa_PRY3HSJldx)1b>-XZF=0hyMrcnQrYaI`S*8epyFrU#{+hg
zPGKJkFd}SHO)gfkX0J$4aEJNet-)Itu7}lY3y8I(3T}&h5O2{h^4QYGh&*=SJIt;W
zLc!Vd>r!xG2M88GCA9#JGU(p|kUA*F<^Y-hD5l2%yWc-w297i~3WomQ#bq36qO4*A
zqir-kJKh<#2$<iIf2_>6C4`Q993v!GD>Z|#nixs%%G>TYqNf61lqk{MtG>y^_JN)c
z87pah%h|=laGu0wZ}@2^V79Iyu!9{wLF(vJWIS_7_A2jW`dJ-1c2~-)ehQWfc_-um
z*}u4Y_5b5mSnxoJ48aJ#8px0#6`0Tkj^v{^$IH;j<v-(5{bL3Hrs*TsJca$oVU~_I
z`!fwx%+@FqE4XD_{45AksFd>^@1t?M_zQd^W5&zh%AK2v@0msLrP!!_uY~y~^uA)u
zl_aj#OS*K`RYlFU=3q8Ye44JU#!A{}2k9h?!rWICP!2@Km<^m5xx1JKypx;+F0C$3
z{-WU20k8o2(7AjxTP#wb4`DECkq8wmqAY2B84ykQbO<Ie)I<CyO?96}aNP_oQSyO1
zf^`S#F~ETYy1?$g{XzcY1*hUmK@buH_NRC@d{SMc5YB64BuT5D^8@u)sdj3n30X4;
zlk<U8Phl}S9q)M^4NCOq&+&U!$|#t}3eM9#?$uyxy)5<BUYO0%M3q?pA%G??G+^z{
zyUX@cmQKM+C*6Kx&_$E_4znP6fGq{);gS*{%9gAF7O?-~r@Tc9<{2~}Z;2qdp;^?k
zm=BCL1Lb7uUpT@BkRfk|qO?%VMTS08p-u$LaCMR*syndmVi^>iGX=}UAaWc3e%SL5
z7RftU!_^|bks%(9#C|7raA!C+EE#<Qqd{J#`Wkw{bd1S2^RCsSA)>|r{+tx8zv2db
zcGtf{zk;dk)vIzi40-qX>)U{IvN(5&(i%`^8<&a!kLw2GZjk7p+v#Z7>17LW@PsrS
z1Jzgn?Y$Yg9Ar$}j?T?IUtV4;<E)`cFX?Iws*0(s0co*>VBk5KOB4%SU9bW1$CQ-s
z>9lOW1oK`0SW3tK)*&8{e|wwu{`7E~Fo`3RCajkYy+ZAeHHM*9?{#xLPr+IM<rol)
zzWzI?vQv}Z3=ZG(d=n<v3O*-2J3lwONLQKk+)g(;l`vBc^kmHm9|!7d+0az9Py9su
zW$;DLv`OnHLWsqp+NAyvP`8LeNeZ>rYo2E!Nx8@6;wyypny0(MPF{?Mmt|G~M){~V
z*HzD!u-L8*DGL<bkFNSHO{UlnwC$NRrLpi%_FCWcTNnDb(J_LoiAiC_0s8*>XhcjH
z+FW_uRS#uG;kMy}96=%~bPC?^aEk>%eb(@|R`<dj7@D;8$EaY=eK3cp%^JuL-3e5!
zLnxRq#wC8*28N%aZ~2Ts!>$hAp>L2N!qjR5-2a5w_YW1Q$=6Dm_~>(Y((#?Su`C;P
z`C8?I6S4{b^{(wVu9WA~<8Z7wqHG>9!$L5@OibW`ZA@Kp%elDsmcJ<2gCCQ2J>wxd
z!2GxuZd=j`pFY?2E>iFx`MJJ2S~RFk7lqb@@n^l;5iPS{uG^r~vO#|%Xr?NRy$JGE
z$hylBF@-qG47*0_m@ctwV*v&NhP(0<g45SPB#_eB=k}S)e|GsS6_b&|JDp{DbeJa9
zwPDhK76BtKzrc{_%PT<hi5pOXS<zI9Ih`|<$V0?d09^sfnR~v$N!7rlsl}&O9Y8P#
z3H%_Vj*J;#m^Jj<G+Yrv8gS4;2pd84e*^T1z05Dp2x*d+!vlCoGccPyG(Zz$n|{@O
z@6<++zopCInRR6Z%=bp(num~BHo}^2)%E#G(SvU&3o8%jyQDKO{<ZfjSM^E5G8d~m
zd2fU1xJZ*U6|84s{5Fx7E5QT}k)0u0*G0D`*)3PT8-+<XcrByn9a@dvQ!&ToHgNZ|
z*%uYv2k@k@k>ZD^2up2C$%q(vITC12{J0f*Y_$Neif#z>JoW=2c#N><*U;D>zC1lM
z3KOM+Spby;DR`A%2!nZ(*u>o>O=|ne7|o<1_a-Vt`|ZiXX!fOGzXAk@VAUD3W<}>M
zfiN`#l{jF6hV1_aI>ylP-Mb1e_zF}eR)o;81LcuJlEZxVA&V5;wEz|68Sz(Z;Dmky
zO>IMz@BmG*>|zS{331=_Oqyi)=R4BeSM-d*;n>>Z)RwRDnzF%wo<6)aX@?3}^3q<)
zhYrh5+kWXzdEe@JAILU+DSuupip(v>;52$=OkKD?4+*gLg~i|SvmYGx|E6CC^BL!L
zkJxFv*He4{;xfpQe(u1<XK<6#4MgXwV2CZDQ=e8VfbxYDb}9RS)>#CHOP8|a7^VqL
zZ&@-$eVh=0#i!0<XiCQJY(Xb40{JzdP}_$vWfTXIwy;E?9xO!y{fwlHCTB0y!Sg|X
zJ{Zpjd<cOXW-N9o0!C1O2XiOEY;Fv!{Duq_Gho@Dp{swCPy~7`c)h@Ykr+_s;!WLd
z{@E}@Wi=miJqT%DXStWOEb@{Cr(sf%?0jZHcjb%73KPPT7Jk>_vWd|Ly@X=KMQ=n~
zcZG^I{BUZ|^V;yxlGP9jc2nt0YHVyu{b(9!3;(EF6-R4?W}fz+#bdU1?~bZJ)22G|
zBKWLp*frhF-t&8E92(a^NOxBv8`VQGdZ=y?#~Y4>+7JvBcy)s2UBaZ|+95-e<b4Gu
z#H=}Wh{I}o>hU?0hV5S&H6JPRg_(BgHxP&j!s^{AQg%PdK{QKyIUAaBW98ju!+!DO
zRMZL?t9vzIQ@lAs1XKux<1_|zLxX@Q9_X@wB$PLe)gc7FYM`70)Z9_{jbd;mhOw~A
z!|Y@#6v=pDBpC*Qd%bQG|HXrYuF@enACy5Axdch;mx-5(_SUx1loa3JuMFC=ZB{`A
zzL=3;(B;ePr5{C8wPGJnjUVH^QmchHC-<5#bMGLWmVNRCCS_wyYJR<G6h_p~t$|8d
z$WylsdHt!vOX%SmSR9Sco#J~X7pPoYvS@`VTu{8pRejT*qd!Cp#oW_hvgGD*Lw;*u
zj-r~UsN7wIeHNe9L&q8Ka2~Hz{uaUl{4}2J3FM8OsG%wGvZpQI8=ljnVz(c5zWgQO
zGtAA05b*;vVQqx?FQYwV40h&2a_MA9;5bdFkj8Z%m>eR39ty^h@ey4aD%5ub?5Kyi
zROvWr3f3EDjzJkS){K$+{|I>f4-$Z}A+uZ1Ht9;DUu`h(uZr63nQ$uN!Q3(#Q(bsp
zdUIaQRCoGikkqqF@%3rP%E3H@$s>2;fJIA84t=l!972E5mcw>-Z&<1tUYFhrMA&x)
z*k1W0L@GXdr&Zu*res``gRn?$-tAfvE#Lj)Ky2Mt3E7LLQrlOfXq?ZQPiXNNr6y<#
zPcBm--3#ef52J6joU^8jjleZM&7@<}x{-t43~JqUT)|v7rH76+Oo2JNh$RRPq=Cem
z1_BjzSd>hAt;hIE68H>rqTbCxhJ0bxG@u5vIWXcn6CRjdg88}0(AZ51KG2SWHzh&L
z>ybW_wvmdy3Bk;NyYKy@lKr!1H@PEVCT#@o;;bb}6OI<sR~8WY3e^PIW8*r7Dfq}3
z`SYT7o-beC2dcK_5=UMQ1y+NDsAl;N-0Wuomn94?TXpJ(2(y6eN*hhs%T86^3tpjO
z-oMCrONbiReLvcI0NIgO*7d-p>gxEio(T%dw)*{05<J*tAbrG8?ab6|H+v7ajmFip
zqKBG1rY*rKDZ%fPu(0se=|@i!Psw>143eTuxOi)aslbuQx<Cif*8LRRZH3Ult8)zX
zA7|E92V)fMduD{l_2|Pif|LCxyiP?m%|Sr<84ECi*{T8A23+T-$p}+`4NW5PI8Dxs
zj47kwoatERzm`<o|5|zeBUJOBEJWA}r|j-NepK*7xw1k<;Dd&*&Fxf|kc~!y!U%h=
z=9cM23U-(uIX9Ym+Z*P!b)9aG@=OY~0iFBf`?eQjOEM+%0}E9x^FCg&oZ`4lEAw=5
zD7k;p>5Ap?Z=7wZ94VDvWeZU*7cKV-(>JL2vu<{0?w&DD7YMa6lCwQx;kI<oQP0!~
z-XOcQX<#8{Ks(`p9y_o)emS?}SlK5LGRF3>i%IAG!j}{R6>C|SRy|l^f)$QBdOHsI
z2YW_ancqF5&NG<1-DvkgrIV$?+ZtHAomCocD$9DO#P?;=Y=qUP%r50Wx%_h6Uq4bJ
z>3-o*PiUa%xh4PYZ)jqYxy{)cvOdA9`k!GwCNR}T6HY3RD?su5ktJ1Iu}?nU^o=0w
zew`cwLbrif7GTE!{w!qZ4Gm(5S9HuUjfaM^zSmTYF+xO10M^<Y=94Btd$TcW48q@q
z8W=mu8vcm5{hu$eRv)Z{b_8O57S})=aAPA4&gT^ku7U5FQW}H14<1wP`EpkOO=82r
zVe%J?DvluO6C{W(FruQH_slGVJymygf0b_$ucdsF#AtVcM8fl+oFQHb*7z|sSSYFY
z{&!xXQ#XVc(;OA<H*$Y5!@Tq~nnm!|jSu=h62l*T`bx!^6uh%|u)m1HDU7kzZ=oq~
z$$y|YI71Ohzf~=9)$e02Ci3>mF{d61;nMxPX3uRe2N89}uDo2FW%ApnzWW^gg-cob
zekZbJM=FnvbU^a8*dV&-gXLYbjPOyKd2-kJvi$Pv<2PcRF<CD~FGG(W{0f>o?{3q;
zE$zys7*TvPIE=mqwn4(q6Qm1?{HM;`d$|UztpsmLKiRyHuqWav!dkc(QX2HUD20Ff
z)Z{EetPe=4{$f~m=)<psL72qK{~ZQ`2+?m8O(g4vWz1MKSzks#f7C)L7q){Yf`SS(
z5Dn1e&0#(}3T_7l%MLVXTy!k;zi?SErn+FLBWL>N6aR5oh|=4=n=Nd)Q0(+ZN2!<Z
z?j*6%KXa&>I+?L_VD?{37rb1oTNRSvMzA}Ll*#(IU-sXLbMC41=KXvP83;@2?rv4D
zON!MVZ6RatUNTIh*bM)e6sDE;zk8Z%Rl54FFjPwDIsM^WwYa9@)t~xu+Bw&y6WRP;
zFS~|4+WN5SdeVo$`9rrmXxbtNnatUqJ<A>A6OMs*ba_a!pBf3og%-@JLmNM}BtPt_
zERNTCfE=GYuQBgz=He_J*|+_h=*PKCDU;!rI+NSZNmut>NeOB&JG-BP`6?=1{-gPw
zRFq25r`Y+$fW^H}xB8~Nh@YCUF%eYD^MUGz<}*~Lj88fT?tF3PS6#xd4J(s2AjjK(
zYvn}Jyl7v<S2Cs;mj(jpXr7y}MQy0o4cJkzZxXX&z)ql2Lj?@tf+8CHx+y`;K+gi`
ztE1SO&8Zq3@`d@jXp)jN0qS3PCLcuo{c8Wm2-aN+`)JR9gpMHJf5p#&j{NJE0`?{b
z#B79Rh|9|uP;Gj9yQ@w&ogUP0qsdFDp6wG7rW1|WA0GWEU3GiwX(cW3cicC!ErR&l
zFK?dp?n`WHH%%%!F@>-%DY`mTsohMNWW+y@TZRoE4|KU~D)rrMob@thxc8nvP+q!~
zK&KP+{XIjrjYkE@=|`3(JeY(9HcS6h&G*?NxR9c|(MUn4m`8I-ZI^)VxVS1EuRSqb
z+C6Na^hubGzhpaHWSD_r#V+`vIQe^Z$#qQ)YuUXkgWutc>AfDOuDosBHdOL06dIj`
z*@BuMVm-wJrG~YZ?tT9bH@G;9+i#XlN%#(PR9P=&>E8!Cn(jpo(@3T@BU&U7Yd$DI
z0#p3NChu=#sNuEt-iSpy*2b`g#wP3`6$4<wC`$~DWX}R%lnpzPKt(nhnWzA@Bx9gY
z0_RykxCw?PuZ=L7BTV%OL6l)j0_$-J<-MtYhW7uH#irywYO4Gl934N@mK%51uExh)
zpNu}>i)~&OO|tW+@vqhZJsT5J{N8>3gm^re`zn#dHk$uHYPGp5mz5};u+vfQSohYk
zI$BsBtM6O}LAq&*S3qD6aS28fs$rwm)gGpvprqj7vt-Qsj$DH(!NGe)Hh3qI-VDbk
zAM<*3w(ox5Ew+ERlqX$JeWC@Neq>4%c4?$pIlH&1);99yPyQ5bhgy3MS3Dx(QfDfi
zNKuMqB27z)p%pE@<M77Bqdnc?)-T__CeB}&)S6$t%oMK~-#=!MA23*fRqU}{Nmt(+
znc~@`U#e$;*(|5FrJ=-faw9?i6eZVEh9;r&<<!zSL)s=|?s%Qm6DZ@;^zIgGqY3bp
zrjs#M-Y%x|2?pO`rqklQ6%|ASn9Vn$zVTc*jcc=RIvyyQy8X3l!oMEl59m@bYN+H-
zrilkO1GpLHPGO*?H;ib+sNG=C2i!1wH4vd<jNG*Zr*BUqgax(GR*mI2AYr;MJmVY*
z46@w`bk{<dzW)8D@t-B~wl+2x$Z7!!zRcn%m1HX0DlqzujP>Xn-t2Td_7Oo$^U2_D
z6TN<8_h^>zb6-czT*{i|G~#rVt>6eB&0xopYr>lR2^ANkV~mtupDEHjR^cDZS6cuM
zx91ElZOc8dXDU3jCN-95dNF2Oe~gi$&FFJGpL51@>LB6d7aqQ_d4whY{vKu$v^D2S
z^VkiE*t`{DI~^Yt?yfOK+Vk+E*tQW2O-JXFo|et4W~~z`SCR;%+o5ibYTIksQgpB3
zGxsl@Uq+Uko+2!&*0t(4a(*Od>A-IiT4-|3lHif#%<b#XZ$HRTk@lt5{ot)z>V3%q
zk~_@4oa!Z<UP|-|U7Uq{hMVorTR<}sdSHBY1?-F4<RkFFF_?nCy5G1dR&BIfAH5;d
zYavcV+^QcKwjPiTY^g<N7wP!A@lS5eQVGVbzbH6Mc{>$r+JRcx?mn87@NyE{;%&xe
zfcp7_w>M@HLbCNx8bGsT4Deqkc=@2@6~c5q4j4AWT+cUx*fiilg-{O2ivl#p4!jZ-
z3ZP@n5N5}Ms}5z6mXn$o+7??OGk%jOH8n)Q>DyU6un@i^dh{ssDxV`2!!(g~)ee4g
zI|s;rQ&R}*jMqnF;_!-+;?8)lkIP@N0yqB)trST^b`YJ8Epiu<w!AYz239|wp1wUr
zg6wxXU)8uAC|C{r0yiA|dgsdW>rS!q{HhbDHe~rNIE=SjVd848=sF98248rWgXJDC
zz*0$ZbsXO9IY3p%KbmlPrjvpj_!_^opMtl&aYwdMKs<O}9m1*XQjbZx6QD;!SSfCr
z9m#ozq;yq(E@xw{S_aL^qs&I4rN`fQu7NE(gIV`>bfi_MJ@2ZSu~k{h@ap@unh)Iz
z-r`c&83Sqc@}D~{dYuGpIve?3PD-Wv^~8ELa7xlt=XB(StQ*UpEj+pPXgUp!&OcfB
zJTd?3sJcbF^6Gw$nz`PB%saf6$DPDE(<H(YvhJ%0s90{jd1Ju6z9%$J;>N%*kyeUa
zYTBLcA}cnqIl8X&T`rH7i?n|Fji~JvE1TIKlsGOJjFg2&0^6c+dA}v&S9N0kdX^Pn
zt8Vv)<P$pk*+SSBDWF>eYB1^y<)z~+H_I28RL_ca&?HfNg=Bij+w;MCk;ppQV=@MY
z?GToNGoeYXZ#T=(gcz1<c9$lNYA9Y%#yz`49U{l~ZD8?MKR+wxN5Q?bRBw&T%P{j|
zwwpzmWXj)++i@ZY%kD2xN8*55v!kiK9vQRJT>7R_xyz_OmQj8*;)UMD=Xe4c6Zt2s
zVf^O^PU=S>?T;|?_!c?EH7>>gdpQo`2)x1hs*XQg93Z9LilJ?0&fxLvZ3eCe=aRX^
zhCGk9Grf4W?PkK|#rUXHe&aSo=vS!6W$0qCbi7I6z9`+0Ho==MEkTS`q<h<x<;<iq
z$=E$YjhC1=*+yfT;XaWd1fTpyKDDXPqBxXCtQ<}G*P`cy$md!{e8On958rxQzk9p&
zhV8EFo64-ZTkEBQ7Y9<+sXfOm9`<aj&X>^Fy=A%v?C1oSz63X=w_V@2JK?J?REVn;
z?9wxQuUdz5TDloFcek=6#nX3ddAQllN5L^*TvspjZr`=2#g5+NDYR}cp{Z6I$1QH9
z@?CP}(9jOyEp}{l+`;F~KMhVfed0c|;LQI0`!5RC-;$%+^-{Em7fH=G5m^H~!3^@N
zcKz%J9}n@zyWS+s^d&Z4<5A$M6(u&P#eYNzx!U2zJn0z}4lt;#Igh88P9Q=o^E|iB
zj|A5DR#^*aY#UMQWg4JKI>3CWpDU0ts$}RqV;LP+4YZAcb(~-wiz*ef96)`1W}Y=H
znGDjbkDMvK^(Gi!I|B2?7@vBbnjC^cQS)>kf+d}T+w+?FmEh`rh-d@0Q3x56>fcg|
z$zj0GA4Lg+SKu$LbZ(eWiI0C@(L}m2FkaU`18wj#3Kai#GyMM{pr`KJ-$Krbd|3H8
z#KZvSk2u;7sxvO~Rx`1&-6kWfHDAV4s0-I-5n^|<a89!CYCXc*A7z!=ci~}yieS;U
z69<cQ^4@dqH9PKBQ`H~qNZZEjXKmHd@lB(ll;H0)*}{$~@wLq_D!A_RY?o*LRJzlm
z*i<Idm!v-JBKWY^X}wXlf~{@4<m$a1HW8SPk|CSUCfp;Lq3so>pJ8632L<5^-aN17
z1QC`)*L;pN5A&EJtvf+s>8<hiMIUV(S_SpYW}7i$PWU`U{E)k-B~LuEv_w(ebxHQQ
zl#q>Do859IZJWi0Dw}XzL|yu{eyQLg#oKO<vdPBru67<#$J7Ll-l*WbGl#G%ZvV1H
z_P|ZG-C}`Pb7-v}XXq%PesM2Ds->o#kb1&v?|H1Cj_>l(e0+=Ql!%A0rjwbAH)9c|
z6Jf>4WfF072-7PDHVDq8Vkp-UoO3lWji*AL12hTmYH-jS=0Xty9cuwpX(To};k<@4
zIXPhZ-Dv$H1veg$w0YP5=?`V1c8rP>7-8!6u0i25k493bsk`8&XfT)t!kw?*T*zry
zE?=VHHoeK^ol=LG*L#d*$QUDq*qF$R2fmV_snieB6S8z~7?)AHS<gU{Cb7QVxW3zr
zFp8ab0;B({eH0@&^*_Qy|2^TSK{xi~iL&EunVe}$jcu&Mm)8zA6iFu5^_L{88b*?P
z_@u<?_>Z%{s`mC6B<F6Qyo2l*=<1v9R6eFe{pF~$L?`%HS=s)SU3t;YmMzlG#Ytq8
zhhq)9mN&C1*UgDgv5s1+bgV?f8aVBbm>j*U(Lyj-AWDYaatXiR5_ambTHLqL$%kk0
z?cv%U=1DFF3VUyry}Tqap+m=S_G{igtPv78J?|$qF-$9It+-xv<x1Vzm%XEA_5)+=
z4UYlBvO|=Sg$vkN<0ej%pmx`v8@63Z(XG=>dV}$nI;;OCHRhVl(UOzSZ3`AZPe{Ah
zigPT5Sh2IMsO^98?l`Br6o<*7ylQM-m(3ns1M%2|%|plfZY~dTWKGRw6&I>)y|F7t
zrCqK#R<o`$^K9#rjzq$>Cwk>$$B%mr4%chx+hD4jP2?>O`O$(j@h=WapGxxXSpy+`
zslv4%hZGu%hL7G&tdaaen}qpu8ceF2+<tu(>YxeA>%17{u%U5bg6X)jfVt&t44f+H
z1_HhTr>(#^35MLj#V(qB9tpzQGj>DJ7yd?w_6ebQZsI`?Jg|wk7MF1U5E9yIvKme!
zqzw%0zA8iG9(q+1xD}|IlVhI<IxSK#CmO`dPOPN2LkAD4syM-1Nq_B=Vi=|Q*eI{F
zWT=1nydzEO)jE_^fe9#-A*7*Zz4QNwIVp@)()>Tce*azJX6yF2_;8eI_IH?H>2B1w
zPfZt}7u{sRIeTEk;AWwd5gw^Z0YwMax2g)ycej#a4T@6U(HH4bCcFF(%D=ZzR^5_c
z(EXw}XyWB(GqxkKLaw-tgk1%WVw!zu^fn6e#of5)!<pp<@_c<fdc}@+bVtMw)3%MX
z40DcEVoNXb8@>wR+8q5v@pF{xt5=r2d5eDP(7v(h-X4ohxmJ?O)>EalP0_ZGkJ`EB
zT|YN;yLN&d94kyZ*dlnQK!KRNAXZsQlXtsn<ELD@bKg0ihZR8xccYNWdE%K!Jv|GF
zt4{G+_hxdnuoEUabR2eXInPy&{h@w-B<Kn8qJO|%{xzUtI$z`c3xzQE6x;WF371U^
zi5%45N!W5-L4iew8LGDrY6gB>zcLRMP(3Ah)35hChrBC(Y`^D6dF0)M#(m4$%@S!>
zH>lKdyib(?lks~?ghN8;lH?|@BLv4}i6M8{tQitpnRjNTWKc&=;)sC9-7vwX1Lv$4
zSU<JXRiZPVQZ)6a5#|@xzlgqp>X1sT!F-ML>g4>n7qgHcqrd~@bzILWIG1cF@+(Fo
z7(^E^m>)-YUr1Ir55GF(d`ZVB;n%OrA<MKi6r?!yn5&37M$L+lF>R(inTF4XeEVqf
z`Bh&?e4-IKKzZR7AB-?tr_iAqGKSw~y^1#mcrfZi)EQyghGEfvwM7UpqIVZCTrU#&
zKk+IIO$25NreL5nV8?KoKZ5D~8-X!PGd^{X8|G0zYHL4-dH|s%&8ake*J1rW%kR4l
z*yj1)<&;13NYKKU#(=k}3p?&CwL^wf-61cIQMi8%@QG{xj5l@^<_Z}OOEwj?6uSk?
z#w5iQ!H&l@#>ZtN;Em6jkMIXB3`k+qz2W#2_vQ>PzU_V{TOGnK2nsH4wAW7W_{kp6
zcWq9rpNh$+SO{x!ne@(MdV>U3FGCl6WD8ln#rv#h(u^d7l7I3a4^3CO8Te`zVNvT<
zZ}S|D0db_A%id|=`hALqEK2EJf8KS44+<@@fUlBmgRyc=1cAZ8UonpCmX*`CTN+s(
z4cUt>+<onRM*B|A@S`uiRn_A749hGxxW3%r^H&95@8iv1PFxNxe`(ZrD@=_?0B3Km
z<o(g~V1}Aa+gPL0^zIN+y#9sGm9tc?1;3#R!;Uo|J+xf^{q_VMuP<%e{o<8@)0Zf{
z)+xuZxVVk)&mH)*<%#ne_`U|@Kp5YxlEq{yBrsDAwq6OJc#UEaCzx9WVQOTUGDekI
ziv&3+zGYeHwKPU~qPnPUki)bCWGx!^_Cf*Jx5LZF!5CXY0za=x*VYl~_Guu*PB;1?
z-(J(KUv$i4aitM0(Ob<x<>DzedyaPSCLeu4yr?b?(u95&xZr+UFvA{g(2$J>nj{eQ
z*Dk`p6AJ;OI+mC5abeVAP$aTmTZeMhb+`C4O!!|21;aZ`jzp>0Sp-W%sjrEXf?Ky`
z<7@o}niPVM`TRM_MrvkrojP=XYtIIisB5g`*-@C^y}rEgL~GOe(76ZENq3`8R~8<)
zR{V{OF)iRR;qMRX@fw_@5Ow_G*fKZia&{!vd68U7=~!kNnrL#pfVj%*Z)9vhV^xZ&
zuvd@LEDRjlSpxau3YRubGk;DQSzYvBHU@jyZo9gaU%z`TLFT~cv#$}Xl`H=nGY_fW
z_sPz}{;g64z?c8$HBH;))W)$RRUE~nDA<5Vppk?rxF6N>U(UO{nf4xqH!R->jJEJp
z`f&6SJqEP5`DaAzElgX^f56=;TJiiloUkuy@!h`jyGR!$(^Ka%rLNqX+rs(H%C76l
zEw*K|3yT{yL<iiu3JUMD!6Fgba(#XIglZ<g!txmTuObJHG&<X-nU9Uad;`yl)4zRf
z_GU`t4?L8(CDmYL4dlQZ17=(?suI@+C-^NtO9#{O@3JmMnoZnrX?Wl(UelZPbQa~^
zm1VR{2mT?EUzCtFP%xXJdgo%SYV3$>ogRv6Xb4MP7^QA-d&J8Qn!FlsA5Fpm{bz5E
zLTqAuJNV`9d_6$``(PaA@rdWK;_F#KzqAv?tG_-W>r25>5N&-GgmsIIQ>}Cic(@>|
zB|}r(A!uSII6e+@zSd0x7Wv?m3{9Y(Q5ME@9c82Wpe>VO`5JW0dJ9|eKbwCPjfa6@
zm>6Z=|Hh8+>xE=WjHW9LqX}^%Fo1a&1qAGjEx13ha)@~N88K|{U8@RHk<HO>O2Z_*
zi;}t$YmDVgs`PsuB4AzvM~^|DgqbZ`b0i3`a=#LuN0=vaQXDPCdd}UW)3NTJ=c<+Z
zHQDSF+(29SFmpzO=BIC2+3Ho)9fHvLyt!ldfmM4>x-~0J@LlojJi<Xuwvbp~K*A-q
zDwbV{Yj`?~unXmwKN<U3zo8|T<ICtTx}=VX&9`P+>vgetPRlo8w<c0DM?XB`$Z{X<
z{v1;p8|=H=<akNe$DM~Wc5{V(FwvitfTiNNB~@Pcwh~EE)UWe|u2r><tNVV@rF@UJ
zA=4IBZc=9}rTye*Gns~SALpL3W8M%kZ|##2VkPLb>t)5$;u*!E%?ah4z507$k-6I!
zAA1Tq-eel76`o32agC`J$`Q=*=u(T-Y|?HOolTXz5}y;2W&VQMtaWd@7<zx=@BMBa
z2yFFu+i>yq(Xa~h$=OWFQtKnV=3C$T`JJEC@nXWQfxtGJbkT?0yA@XYK`gh^c)T(b
zt-rB%+zR4*ws1+ZZp349F3ES^Hr_QXA_QN>Th=49OSv;<+u~Ujv*Xg!jne1q&bfhT
zhj=m+tJX%7bdjH)pM-f>Pk*M&3l4cjJXoaT7Ss%Fg*H43Yop0W*Qmrj3{``96?WD-
z{vh^A{~%*zr|&Hl*Um?OhgmD`3s`^n9s?33aL!-yV(FOk2r>E>f^`9SFY<adD}*q0
zsleO<C`dv9&G80cc$twFde#eD8J4Wha1DN%KszM(Z=xw_z0&S8qvcTLcfTPE9SbAG
zct#053iMt7#QGR)#`Bb50n5Hv&Z>P}A9K#slg4_kFVMc5v3>8BIH3V4WZh9`i)Ss&
zPdXA*>jup4$Gfs3QhM1~(_P83Tii8!u4O%^NLKv3OxJMI#tnq^wC?ZfJl@$3-4ng%
z4=lAju@gmW;Aq%}p({#GYF*|R;re5C0g|c0W4Y2vsbssKq$t(jam2(~dtU_1ll<~@
zHnEGQKHJLmX_Pv(!ywAC{K7Jom9yeK+p~<0rdOqoJGQqowY2Q<jv;_V0}|ACzbZKX
znqW`H<*rISrc5ar)(h0truqs*OFW_c)>A6x$Zmr`x9RSOkEgPwIV)<j=TM(i3vgvi
zKAd^^ky%rZJ?~dCrsIa|&&F=5K>seeEyGkSz2GI$ranZx&4s_^>7>2&*r}U9Pv;%g
z{HFG{isyIh%8WJ}I|2b=FIUJ%*In71J8IlqVy4pjO?+o2{t-3z=)ikO(!^p=nCnIH
zcpCVy?O|`NWa-3s-i<DraxO*CjHTNLwC=5zxYFbh%w?Jb$VVQP{Yo%^nUgrhJ$&0}
zn|8^t58DlmB(nok^$Qb&ir-<r&Zd}SBB3@Q`bG&&%v&!TQ>F1L5h(O6)A2JbRTsom
zMsNQ>n5vG`M0seUs6m>bq$@HTBZ=B}Hk1(o6YxL?LI|nVK)Dv?R&}I_yC4KVgg|G6
zM&;k{|K^}977!c*0?6o3V~lkefDjqN^*0h?)QA27QT<;Fp&H{DYbDYbv#w6W<Wj6~
zjJ<*86}hqN=Eo*O=e}YIA;)BPpO7k$NJ`EoV>Eo)ArBElf6L8l;PiPXV$mSH(fp@~
z3CMkY9Q)N0jn1(hhYr5<nlxGsrl^+hxg=To;Gh+U4h5fM*d={>f+8m4aeAz`8d#ks
zv`szrUorg*bD@tD;L^ak1A2@uR|`OOO|-7}zVvZ7b^joWKwy5CQfls%doERWN}w9E
z)nAX-EB;&4aqWAbibS-ASnRJinoHoa2NLTQH>C?6xaU(&C+;6Osgpfay2E<NB6G(V
zCf!FN`?xn%=R6+JPCIC+u<~o^0m626SLMv;*Ap$jo~pG<sax~1#vSb#G%w8O!cieX
z-Jz75!|`G6ySwFG=Y)#g?|#nk!b{xJxS>&WGFwQyQcKHfte5ZX=q019a$8sXU0W2L
zm9+L$5U5zDk7M+v=R1-ONsk?biIMZ7&ct*oM@E>xBF|fwiu{?jLAPcl%ZZuRtG1(Y
zpRNF_vclr{170_B8ty1*wHE2$2fJLQH;5^eOxNmbQaCFBrDQt!;B?r>WxZc>8LEmY
zBW^TKD@z+te5$KXI>l!~tw?vp@;=y~X1-|w9_dzxcp?q1X-m=wzEZw0j~tI7N^Du9
z!}WU~G^R6)HPB?76_yVDLa}x>1At2%N0>flW6HJy6C0X<1yDN+v{3ARCmVX54F%J&
zf(8gnOFjhIFq&E%QGCO-zE(rQxx;M#Do&zl`yr#@ZM}?|y50oAXpmwwzA*sN9|-JG
zht1pj;fWh)k2v&3Zuc$yXbS$FUk<A|hnVMHIJP?~>Z|-KaK@*CEO^uC1ThEL<QLdp
z#OU78^xHlQuJIq@U)U5V<6RO&f)3JTca@!&+i`xdgC?zX;_Pc>?-nwqx$q9#-g4gB
z;i?tWJ98waeVL{{Wn*91^h<k`5w=g8tL|zDXjfyIB~Rac<Yf%R>pxR5Us|pOoqYPt
z<%khMMA;bf$$oQ_!vg5-6Hd1P=CEkk=W(k(3qJdRW81oRho$cfz4^|TdBX8~mmkMF
z^Nnl~FQtmrl}(kldB4g~d(tK<l%v_mGhi0aqEhFg$DwnMR8?nuJ7qIhNwnq<P4cIm
zpnX?SVSJxZc9D{yR9LYX{D!9elKW$~aj^5HAs*o?V`Tf-M>_SVavjt7$$Lv<Pt0Yg
z-LY_$PEjNubgCR&h-gcFtiNP(+Vkr00DrQyiO^kX_tq(IScE;JBlx`8q_j_!^g&gC
z&3(6gG@t2P!5ZL>Y$M$EWG|>vcqP!e1|G|1s<dP4=Q5c^y#v__y>IYU%#1ZobSbOI
ze7doU;lw1?SRX!{d7yDvc`(G;!FR<KdgQ<s_~DwiT_t&%`{!U0<o!y)HB2vG<;~rm
z9gjkJ%RP>**gOkdY!i$cm7Xp%Kdze`dV_-J3EwPyp*J1HNAl0Y4G`u;UYfQ#<aH`+
zXLi$tNzJUM2rK{FX9;S=x92ix3W<^y5f7GX7b!UQR|wNCI@UU(HD`S<l?C+#Na#3Y
zKb1zuzD9@<jM{M)a50LCk=Y3@Ces9r89n$Y3rJ#c+8u9bg8wS!a_oh9!hWB*@Y@s_
zQIL(XL(8WAhn`Y`f9^?&VbSQ@wh@GzIVWT<Q=yoqEb)FicxXKZ^Rud8QHuw-2RI7R
zAj{6fJtOY<xp@7W)M$^{rJ&3MQVohVpI0XDgA*3_?QEAj`(8XU3zUpH7-j6QCFctZ
zX=)T+d;9pifW^v(JQSK(Z2#6d8TX7hwPml_@z_#_68@RWEop~+jJ(W6j8*I|P-0r_
z4`Zw4;+@XDj1*U`X(zFL^K0JgFCh6WSwU6iy?!4iHJ0;P@$opWYbK|{K422-(Daq^
zjE=jSSU!U@JX5oj5lkl_?>+jfG%wvka>veeW=g3%wI0{s;$-IXNIuoQF(ZpvlFPgE
zr#jQu{O-9Md$@OfsdLovUN+XxQQmsj?+S=37Fdj>5cFem1jh%<uo8RT{i44XJ{Xjt
z3RAI0yGzYvyVdVIdfXE{Rzo{sRw}J??yb9*gHxT{IYWJx0KUe>^IfMj8#i5dc&edl
zoonr5IM=)pvwH*~99G7io^1);X{7!n*S&*DlK-=G<n0!r;=u9R0*uVA3e%nWC-oCA
zSX6Jj(wlHo%m&!9UQ{ga6u%*_>*k_W$tIkbu@Z#1Jg`X2w>^1a6U44ib*5DoncWM=
zpR<0wH;iVEI75fKv7<1*_Ye;)Zl(1;;KnP4tFi-XRo`x7A?+4;bsT8wQgEtU!65}T
zn7ua!oYbIV)S4NKG;xt&hcTneH3H@&&`29W02S0wK^GIskf|8S%b;zY5HwLR+%Px#
zO8ZyQUz*_n4AP9RMosH3`rnLAD|Q*$Mn>-}mikYNqB!+G>v$N*xl%6IR7xZp9JY(g
zaIqwTt)=8TM>KN(wONtQ+@bJD_(al}=}z#~I%n=-gO==*=PZu=o7wURUn`?TXQ6}B
zUD}kVd&}A>cz3ye`GWEbEX$n7GjMk&v~o8Ju7QAW-s8KO$FI9*O>1(>IhAUxe*cNE
z7AfCvc$~xXyvC~`bnhw&y6|B1X%+uzR)OxK`{HVYNdx|VIy-NMlLbE>KGxkA<QsR}
z)nJBW4eT9rjjrs-pLyAO>0Tkr68*KnNkP5S8LFp;mUJG)vm~PUON6hvI_lZ^H?N(g
zCN$Y^d)kCta!N~lrn37?WsXGL{`&eMI{wkFFVC;(Xof4lp=l~iI$o*Vu^{!!ymAf9
zjYfZyOc(qt<#FJG+#8zK*-(p^hJJPVXWB$8eV!B*D^U&X3ZGs5yes9|rf<VEC4)2W
zye@@1N2H5F-_SJ9H4j%6HMNS4vg8>xICHk8#>$_*|E$dFQ(4!i&H62gEm5)?uZ$g^
zIC3#cCtmr0f&O)MCdZF<#w;z8N#k9+Jw~tA3Notm39cWl8v{>BH_C08(NJo~)va8^
zq~;ze*~RoYb6dEsrfieEf|1H|{DRY~exBeF1mW1jsp@!7mz<$?P+KCYzsND~{Jt5<
znbs!{5SIDUGab^{C@ZK(`#a1YX2@Rq!~y2-o-g*DPdMiL9p)~1g|H;6AS~6{pcx1@
z1Fg+9REQnyXopxSxZ^Zlb%4;ZVF(cmbCSRp7l+pbn!qf?y^e&|`^7RSxZPw7|8G8l
z8W-vn=$9Dy2?PIbGgd)~G=ob2ro<?KqB2ev_$ybSZuKWE7!guGn^3M)12U_OAs~jX
zfdk;s6%mdNx9<a3APo%;7`Q=LnFM(Zv~A`-ULbbbC+kC37|F4?w9q&2y7@Q##dbD&
z;d{fKyBp&w*^3tF@*Afb*&0)OlrsruS0a>EjXo4-5O!U6)_>vHL_oFDETZ9Z@n^jN
z)t2R>FlR8%Z^qE+va$yY?QE^nZWdnw@wg77rE9JIpH_mwn+OZdJhP5A_OIs#y#f|v
zU{mVwo3BA{olgu~q1bEN$r}Mzx$INUcwm(#r`EtmN9{P14f(gij+Oi9ZDwnh&Z|do
zf~_QoS{@Hwc^<#=6|*5Rors}H{nhvAZzGynw!_zQW+blXTt5B!%WRwOPqsn6*mxv9
zA8N9u$_EN3OS#+~X>{BmRUlrn^Vd<S=v*lk{8HW^b`3m%8}22e$dX!^<L%_X&9va|
zDS0Ul4m>!T|MF>BAvJfO+-={b%5L>)hrF(09@0Yi)1$Vy<B3%zS0^>Oxc#SZP3-X<
zO{cOGUAHwY?!P~7*>s2~4vZluq+-fXvsAuw(<Oy?l82T<vdR1!2&xES38WuvZ<s#H
zl#Ij2-W(K8NvK%;nxQg&>Sv71#UuBe@(xEapYpApLv|$At2cg;AMxHa^X~f?9;>*O
z79<r9zD&)qh05V}Or;h(M2wEYb;27#_Mkd+;DS16^M-j%NbD{5s4G+`dFM0dL85*X
z8Kc+^+Fs2eOxBDBIvi>+*hrvD0Ym4t1QF((_UP6<!!&^)gsBc8{N7DajsX{|0o)E6
z{z@1SOrWBCIvZi$Pr<HtYpO7u#E=XzniO`^v6kwL<tKM_aEHM>HUS1%*=P(j{&t4(
zzXj{6Yn(}2Q!&Dnku1tWV23$k#s}@(2{gRQ9-r~3MSFB+r5XWToe0a2yJs40>ulMJ
zjRd%%CpLYxy=nucR<>8m)2JhnlRu!SaKPe*^HDL;{8x`wZi|#Zs<>z}C{-BJhTS*T
z75Pl$@$>Al)1ED<0`oUmqqs@ZzG+5cS$#sgBApu21%hL6{xfUffnh4y<dEp)SID>L
zCJn)&ObEw0ZJD-7qs>cMGd4yVbMn@n<H_Gd&!1QWIlIm7WE|;{e(B<R%}MOC@`CSj
z4HbLz%fNJ>P+bF?=(*`t0!=G3+_+|c|EyMjo518%iEk(zcC2M&em|<SJrPZPdhg@j
zUl;XrF=Bh<Z>1Lp4kGNfA|BJt0ldSeD;?vr>QMGpZcp_?Dhf%pnti7nR;D`XQUL?K
zx#C?j>UpITM|vVgcPpL9OgaA3JW$wdw|k+B&qott;kLK-FESPD&bN}U*40KNS4X#g
zo-}jrI{P>{>X&_VmaxBjZ5vG@ejvo35+P(gcvGykgQhu)&uec=>?LR#T~VkVKDPTr
zj=HR$`IE2SwQfgy%@V~fZ~jahTD@$|tERrP{Y2i$FojTg&{!T+K7T;Zm968Qhip{u
zmM6NSysidvPHxIInu}XzG9`x}oXxrv<Z)|n<}KKG?{w@M;McE!xvfWcojCdPmZ3$C
z)=Jfp)QC1qI3M5at_ta>7wwZazg_XpTda3AAJiu+n)KgJeRG@aRX!9^U^$1dg*-Bi
zYk1IyOb_0dxPA@4?+XbsqvNA<4uATRtP3TZi*?WhedclOgG}4}^mD*I>6>)y2glr>
z+CLE{fte(j&EFq9t(l-QoRE>0ngLlI^cw>eZ~3{wmj%GisZd$1k+Y2^B}@m0VnA#T
zP-8T;V{K>>ZXhfYsG_9*e=pr88H1hcM~?+C4!QYjc`FqmTw#zM_I1a!V}L%k-#a3g
z8I0!7aKFEnad-4o3)?H1*M5OXXPbeg$aCes5jQ$6@dky-p|t{7^BNv;f{8B;V4ixC
z@wsymC5VZW*#mJE9+keZtC2tax7#mNP%-cCSMK;SC<#{%AB_s*t!U!CvwID^vc&Df
zn(i)Ed*$f)a)a33E}EQMNA+M|MK<;}A+aUJy#205O-CSB%qwMaAGc0&P7=)3V}S2U
zQ1;QGV^3|`=-0O+p_I8)Y@z_{e?L24m|7PRPQ@L~|Dc!|DOG&-S$56f+Y1#NSoy<Z
zcnjVi?Qp8=Kkqro=>)TH-}uxuY~hvOA^p0y_9ZC~ez~1gD`m#LO{sO<Y^~%FZ7p^q
zhG70mm_is%c_6>zl*dztbJtgSTrb9I@L$~^BcFZAK-QEve9U_mVb|Hh*8MuDr1wPR
zHI+i|+14C>*4X!otoLe&x}|4BqbW=`DnHz&=AS&MudA;b^2GZWB`i(RLAPH2WBoB*
zx%zjW#7PRlBhSH;B$vD3qSI#;v<9|cRyOgtk!zlH%s^pRAxUfVN`LT3Uo!DQo<mmm
zx3sh0<T<Z?zHUnwy+ER?-RAVp>Lq(f$31(jV<kG`CUZ7`J^?>gnI3sityi7rcv}6I
zlk*|&TK;=qBCWPt{Q4T&d(Yb~cHxX(t~Ds!<H7cQsoO*IOhw&S(|M{$OMt+O)-!p!
z*)owOJhAM3xA&Tz*c&>aqj+$jgO{T&Sur;9nbgQHp_jkj6+gCnFB!G}*jQ?kWYYdp
zLj7RoS%yoUT*%>8bQg@^t`qmbt$|}ZL0b%8c%$DAv)AV0J{)}|^9aZBMOK}#;qJm3
zp+J+Mdi~y?BwD?{{cF;h+F24?jL89L!xfPg%N$^60km1dibqfmHKgPdOvm1VKdG&}
zUZmrA&D!dYl+khfQ9dNfsE;*cd3dWaogJ97owKh2Z-(e#yrN!2hk|`e#Tb@TaBO78
zp(0T<0V)b5nW7o#6Zd=TWWB(9(_Y3o2EzE?PRRg`?2@Q6OEKEs(d3Ex1Yv;2Mu7?$
znQ})v==!_8^IwQ90@CuA?Tvh4zJ`3$bfE<bK0)IU>|#|H5(7?o8xGx8!_rYiF--j!
z)zr@dl5vMkME4MXpbR6mg91@V6v^j@JsWqNo=2RS-F3qEGS}V*I(~aJEGhssK+3=D
z0ug4#C(=(-%`TkN`YB1%IAon)b|h!%S%{`(OKNOmqiOU)Qe4B?%~1N=-4yM8`RK2B
z+Gp2oPiR;ay$n4dWSt~q>}o<);7d<f?5g%FyXY|ur}B@vEV-9`Y+WtgRJ+u;209S7
zkA8KsJsGF2gv1Ya&^Fhe%(lH3ecLBq5JkJR_iqbo6h-p;!FI~XY_oD++fkc~pZy%#
z?de2p(8*0VtA(<hzHMg9LGiU;+JWgKNI`L>@>0pF#OQA0l@I(LkA!0sFD~UWGkrRW
zQ1B0=W3>5{2B%Yn<7$WWO-A9^QS}FpC-LJqumwdyCyFQV*piU_9gfx)FE&)IOhtMA
zJT%(#*2~P}N{Gv2o92^}xLeO_e9J?l?_jl0RwzxhnUiXo9xNNB>$&0^(~crt2fmaS
z%V-{Xw&h_Om)iaEcm3_Tx>W<4TIw~Hn-_j&6`$Hy5VZuCs`dB0`V{Kfx41&>)YKSB
zuRIWUJc3ife$eZ+C=$QgiLeHwJx)84@w}^L<`J~|^xS;V;FIiGgths;>&C+Lr%idg
zyDcZ*O%k`S0Xm&{`}=m$Qu@%5=HWLZLy4RtlV<$)D>OQWUk{WQ$CyiAVLoUwrhmIF
zRfy8+s{XWbNIKU1Rc!wd9oxvdDQ!Zqv37$J5GpxkAMxP_!lv!+k{7O1e|NgNZ&cFm
zXOFSCnhkSj&<&1Ft4i%`nO_YMrZzRHelJkJJ)FjDEAEaHAB9=*#h0)89Ne_jyc$Bs
zcJrEHFdGE+#`aV2hu<D}6W7BrNJ5F964N;27>Rxk=2--z5%7AnRvn^Z5<O(EX^9yy
z8Z)466m0zfP23GcW}^-(r49*_{(3Q%NY+^tnFPtjfXgi4Gzk*7VH{Y@pnzcg2uPvz
z(;vfN)^*Y+vtBZ$N5*I%OsNdM`A7Kcx?sMSH2B4q1d^YZc{nt(fIRkhCU=<X&>1bM
zPfx2%uV^DoBL&V2*Y2RVFH>}#q;ixD)q6|!^Ol%8!913yr?U?%m<EI7w&iZb;(j(}
zDS9jU$GJm{&3e_d+lSenE?g+UZjL-I*xg2xjtRQE6mMGO20pZTygxoYjBUI;Gj^8B
zt6spqQIM~YJ(oxtBT6>ZRa@IfM3^}Zq*)93dF)@J{4eI-Gpflb+7{g@gx-6vYNSbt
zNGE`FfdGOCsC0r#moD&u0*Xin0TF_96{Sg40g>J!AR<kAQ9z|i^#wie-Eq$Qb<cbE
zjypz17^DzJzP;v}bMLk0LPcCR%W!xMbJE<24l5?mMRrZRf8^<v+_9<BD$STSWdv=u
zoY~zZ(3ENq-U$5VUD}yXG5T?9THMtQ?fp%P1MaP|9QhzK^6t5x2QO62-_ioF<grfo
zc^=z4F`7aIGSiC@^g@tguiW8Tih~mAMOeqt&#gkC8xOv&EFop1@bP;!ZL5td#|Cxh
zbTYY{I$5&Ko+X)B&w1>qFaO4Ivz&cSeV@_&ykS%GsK2CII)Pc?b+#_=RXNdb-V`gY
zG)of7m*mmzd34_g%%>X}i821H_uXb5n8<XxcP^5N$4oZrTSv8>cvn!eTv>aW*V@15
zVMl*0hTf;3^4Ixu+@@jU%%7r#e{L3eSuRObg(zJ-T=;PsIvi`8P+2OoDH36?H*Ds<
zx{mHopZ99;;y^*%;%(DflgZwu)1m7j11-c?#RT&9mnX~lN6v~}Mm~IB6*%<=G+<dJ
zF%PxhqwpfKqil<Iv%*7u7!rEi8Vy+}@z_q4`=!<`oaZK%7`r$Mojv;pP+T25*d8ct
zeTEL{l5T&Mdw@pvsOL_8wQky86Pd_KIe2$X^}t6fVxjNOb>Rqu%Z$n$-UH3jR4YDB
z@t>EmvRr?Fx{k}f!tM~$uNpF=04w+cGHvZK!RUGSVTc-)CO1|0Y0E57+qW=_AibWh
zHg*0=x#S2tf&W8@A-MD)diNeVUw)V<C>48gHv#k>i^*Uj@>zz>{uB;D3~X>PRUnXA
zmNBwtWrEv1d`7C@exhL!&<Pa8k_qlV1n2R8lP@g)xZ;PDd?`AP{XO*mHMEkFFB1&Q
z^puE9|5q4Ca~#o{SjMx*rE!Gg@*nAcCjfAW3x6ETz5i#q1}e|d;lWipV+>5_u8T>(
z2o<Q<zWGLwB%Oq{(wXkga@^$0!jUCPTeRc}ZZBgQ9z|&0XUN@R0XdGdw=VGW7Q+mO
z%DXt)a-mHE<=ySUI}1+MHGjZM=;YU11ewl;7^FH)#N?dpsjkrV+1H4ZLn}#am+ko*
zyb`goQ_X<{=ZTto3~h;h(eoU13jM?BFARK(tiDC}Ri`2xGO-T51rt{5%Zc9<SZH3T
zv%tLD%|leu$>`!#oiJ2wrSA$HL^6=YVQ)$gTBR^Fl*}t0Ti&;}PaWV9*>w?ak}DX;
zV%k*U*8+;)#cI!@kt48nCfE@FwcJ8vP*eulS4rKQp6?;~y6NCRD>)8PSDFV3dpLyY
zg02ll92a-jmq3f&>J*7>y%llZE<%U=09{M^Ckh9AlO{&o6wG3|P=3|y%V7uue){;Y
z+G?983iXnUm!xd+x;@r=w5QafjEi!gwp^IIY$Ye!6vg{c@E$b^$%jW={BrHu*yDm!
zXZ)i@<iS+X#t=@ZWN@vutd=qDfxP&eRn?;unxq!9cY}@-ZnCF}zZLx?&<$$+a?4FQ
zET?f_O`1*JTpoSW>fpZX=8<BIG*LV!?AkuVaSH>M&WO98yr@=RtJTIGeeegwgma~p
zzhRf;yge2ipN4Ngx=RKOivz5U@FE6Uhtn-W(j6U}YO~lid)H98w}Z26=eEDA)Zb2D
zT2fJ2s<jOIlHr*4qoqE<^Q){?XUm~f0EWEek=JvPij~I5(lvITgrI%C=UB@El|I5}
zCS#5bx_|_q-*djCRDYPkn<eKR>5<+sSoGDtWzA=gh_Z=tT_wv$i`3|-sonkqA_YYI
zowyX+j6Rse`>o+QpD3TGn7(`=nmYTa3TC0pY34<sNc3kQQQ^dM3FM}DxW8c${(A(8
z&+1Ub)5bl)!!LG;HNGPQ=Sl0B?%3T4<#X(`%j|o+kLvm#cZ|obUL;1$O-i%>k$e+b
zlCf-{iNvD+mZ&lvpLb`1dqfhUKK<9?{y)mKQGavz@y=}Q|49|A)X5*#S)C9Zyl7as
zu&7L{H8BR<rQrf)k7NbDC;q@Po#^oplZ}Nx#>0o~Ce8`F+w2gq`ib|M`AZREom3^X
zY(I(@Am-l8^P)|<YF2=2_*{R=>=GXKfQQJO=D4{@KpFT7L)<(#81MW*VeeS-ei2E;
zCUI=F0_iAPAnvVvfs><Tiv?EV@$yPb%Z&Oi7rb@QtKd3y6rVx%A&L36mL!MS4qvEs
zTWX1F6-;GuhR(e(>#Z51oorwFsL)k2kp6)E933(6-0+H&l*m;)LTGrw+Th{Go@Vv-
z4zJo!Oq9Qg-a<2X-hGp3^1QG}Y0jYP$J@m<qBC0jIj@12H`};6NBeb6PAr>*rIw6t
z2ghl0@>~MluHB%oZeoWHGOQ_O&rGD?T(tYDjbY*Vs@<1bwI_%=L*ED8oHSOc4U&Q5
zdE}~jui2@&bnCV2@A8%ktjT+naz_;}Ze3wm&R3LGcHF!5v?=2%b?tPT9D^i$)hjug
zZxfoVigYX3cYY)tpu0Ph{A#~2or_)ZYHG>YVS$je?5%bV4{cub_!)<|`m(wTZ(cf;
zU{j8Lv9agpCXg?(^U4p<h`a}v%NxxNH2}x0M72KGaSO#@i&Q~9@t3!Mx4S4DJg%9=
z^71_?v7Tg!ve;MRd#bt9UwI1yGib}^(|fufQZeJi|HkCN;QJN}hBDh(Bw$2F+Jcut
z9uwtCYtWbB+{kpLrAqux?lPp_ZiU1pP2Ze9+2+cn(j2uWrBl3&?M1)Qa}|*(-AdA3
zQ;cI@KjMG?q}6`-j;{;ve1o-(xN$@J!XI#{KM#l6nuyDIURkB?R-n7f9lpWs|MM`I
zNX{GV;CsWbR9^hCHU&A4FFc{E^87PSBjx${1lji2!1RX2eFV>~1KlkGnbwV4U;h9J
zC7N5kK#TFKNUZVr>^D42SUiizcL5T4^6ByQ!%s_S_}MK2B@Ps1LPDf9j#$PrGA92!
zCjVPB`}dCYYu_f=vLTX1lGx<550*{%0u}JVA^ygyG8J$Gm`rek3*ZT4$E8@La6dkE
zw*q$maxUVyH0!^f(Et1KcW_7*ktC4+H#dT^4J<?4kXj#fQbto|^%VcLUj(Y})E<sa
zB6JD_nDArgxjBCV4C_Z_mgA0w`<gzyn^07VLmDXmOlqhgCsFCc0v>M~w{KN2cQ~hP
zt->}zqocf1Kx`*Ymbgg(`9DiUr&Ii{gU;IYo?QVdlqMEMC;QiX3Z7To3nYg;>c55)
z5M9XvZVD=B*td0-^&Q@KDZpFa3Y5E^`{I0ws`ML&BjYlb*EQnwl-?>&zPsx5ZVLYe
zze3^cA#vx(*lbHgomrwTW!00*H#yp+PqKfHYacR0#fAS!T7$be>G<-{Uvt3nl(vjs
zvx!RNo7lK7C8Jse#qH>4wze%?((J0=6bc_NN&Xn72;LU<(!PG5!BCOhN5}mW1Dkk0
zp%L>_aiXb3EGP93Xc`pBeKv0S)k@h+m=bhYaCn9kb19T68NYs~YMf29iQl>zy1c!O
zft@VitE4etom@Dt7OX)2U7PU2ae!0hW$xL#4b#FRcHv7}Fo)~(44OmFwJi_6e=@G!
zA#vof6wN^Qmv?2#W{E`MlpzVzKDXy}VPD+8YL1(pW)P+VZ{2)Vp8tr_C>r7d%QxR#
zc!Bg!MDb6W9JDIMwB?UJ*~%<!%aL!WR11>v4|Lg$0bPv^#51K_ma7Fd_5BmqYVpLg
zGAmo;gNv6hqD)!@ms)BuQ8&Ak&pdnY7^PkDMBA^%xaHu8Ws|K)bx&n<=JKqE_|zkH
zBA2EFFPp(7gLKFJ3*6xrCI_EK(_i{#YQ4FXSh#H_R(EB;3^!XerI-mmZMeBDvZb{d
zLMfiV?Uv(7(f{d|fr4X_ZXP4~_{!2b7^GxkH@=YfagKgLU;|z<AJ~53=pxi!dogWl
z*Fj-1E(1gJA^{WJ1;3<L3Z$a2m!s&hXxLrb8R&#=p=~a%dUlzl-<VNjv7(+bczDUw
z3?y<<(4P<RXAn?)Y!GLhES7O96WH+(5nK>g;14W~0`KwEMg%Po;KaZbC4i-Q6M@nM
z4ZmrNLmFafk7M-MD-ZQI;7Npe`(F{+U(;QB{bMhVzs<IS|FZdiEg1$>z>`D_wDdt}
z7m&ljSqLcBzqgtHeL4B087Gb-R0!e`rU|tm-y~3s=rM1!;K=S~Y44|mOm9d4<HaaJ
zNA;*BbpmCUYL8+Re<FdZVdS9b<{jcsJY1$sVLFCia{v-<zF+1U8U>xYe4EHRFH9~>
zB4*6e4UA<SiMrph)C*PyN9A(WN+crXkv0~u9s@Ebzq~|53X6?GOa_4t(+MORPzvOr
z6H$S=H`_ko5Kl&3Bp}((EZ{8)4MbqQz_RMo%NO?<8BFR+c(~wgZ@A|3XKyY!^v_hS
ziLspJRXh>DD)*94ZKk>JG%O*utEog_A15=`&@uL;oBx^>_%!%(Hci&WTf1%l?jJz;
z2T<9guZ+IU>gA>hGUWs!IMi_bi`TK)HXo`a19_XbScsX5Pq#lC%-8C%#7@N^y+=t&
zTu*rk_9dq)ywE0UebM~&dJBD3WE1_)DZZQ^R0xOEjF<+=iF`ht0>K0-5Fk&Wmizq3
zBEFvUGX3%{j%=*dYGxPS!!TRKOaB^XpZOYGctxUgdRVS%3+9OrR>J|KSAE!4U&Y_t
zB1r0-?VU4u9Gog_*Fjh78TJI2qx(4>J}cvpD9V#zXvV?g^P%TYu1ZThc|GJUsrE@>
zy4|xd{XW@Hy_9*3%*(}-r$d+2R&s_DnBE>foYgK~nAF;DsL%4f9haYJd&Rof%s6!}
zB`|*8mTeBw2@A6Vk#F?;#a*up^l6kZCf9vdXg{Esc@TMj&?Lr|X?wuwqG7K6;fP72
zkBeIHU?zB8Vx#wLVmINQpgQG6e$k4TK|HVx{(0<8v#Ri}YF3U&VPxD<_GXlIPRr+K
zaw>10U39!%$6|R&A!90ylfpA-9nUGGCxEgz6~2CGecWcl>Vu_!NL|JP!;H`f@iz}G
zD(?^|uDwKqM19*}9MUD6v^bkiLc*a{Fh&Bb<_wA73iBKvs=`EWWP+;uSZ2`$=+s3L
zF%AL{5ujm)0COCCQkg*gSnVSIm90G^g}y#;INp@{>mtYSAFuh(3>l!|T2>&#6gqK{
zK)!N3X^6rC;;?{(oQ`*~QU8$z|3fkVuZ&T6w{;3uy`Kdnw#8l&$11xJiO8MPCyCbN
zy!%8leSn`MlBLvVD9r^E5l-TBsy%QttgPeNTs;cuzyk9!9dMeRZv~gKCkV~oigF1k
zdc_lTGO#r?Li<FZAN$Bs-~{%bFEbFPj>gbLblnQyky75_OM$)O`Dn1i!-bTwwk#kQ
zg>4b2m|O?WOb8Zpbf;;bHzQB!Zs(;XVIM^g3l4eW!7=FhkpWRmOsIysY6=WvLfhm>
zv!jBB&yD)daY!(Z21(5u&!FK&0z}lOs{7Bd63+4&<ZEM}N3&-}Ix{JAy<?+=61sYR
zEBkK!Z4~y{5fKRTBhVVJesQ|jHj9jPDP?Dk96akh=-B-#gE?gGC~p!f_qoUwT4C6l
z4;fBa&rAFPpNncG=zO}I?DHWl!EkLW@S3#_YB}4(#Br@qz86@hQM>qEDdnc$_6%cD
z8-PS#zbU4c<kj&#BJqav1xG2cxA_xeW8D=~t#f7bCrr&789P)r1!bSs{mgz6$TaTy
zSx99(ydem&Tx(Wl(-U`NzV4`hNVV6m<o#}Z|3}AfYFr>M#J>8GjIgya(sqr{#bh-*
zD&eD^C4=W&nt}?waVfZH9i?|iP}D5z6)zfLHTYpCWBp~W!E0L<F}j>ttyTwn0~IRE
z>XDjMc`7P{PM3c5<qKz}Uy6LX<?Ff9F5cm_aWZ(i1U3Iqbg$!^TyphyQ;4=pSLvRb
zYDjG%x%=lzn{$2T6RnJgqqU%}{g>M}_7Vck{uR~t=2hOODw!5{UgqcVn^c8-#Bv5X
z$E$oBznRXlx)4(Ox>{HLh)JcmOzv9R{s%54jM)aGeEX!?ok7fXE;hR71vg|EgRd7G
z`79~X>0qcYnm7DRd;`5rzO&(W(IFy$cd2a6%in@M4O!ZAhO^(Roo_QrqJe|8U`_s7
z2?2GwNj!)Mf1e?~`1B7@1o50F8YF;>dJXmR=kHhq?fuOoXGn~X6r2t0fjl|&r2Ng;
zr2pgg>;{2qP*6u$;1CVFM~d4y11wvrCmJ3w+Y5AC{+aka1n7T^nfByyKzETYv&6rI
zs}B-Ml9+%x3(k}B6#j1$XUl&*>16>VC3u|KwFs0EIQT03_?$`V_{bQ>X$8X5jxAnj
zTaP~@SC2sUci`A@Y5D)cO)!{znug|L>MEAG>zvL)p_GmgM8PB9b`Vw(#08QpFK5Y!
z{@NoV9j)}fML|NBq<e>W=$nYB6r%>1Ik&MgPAGr4U_3=Qdjib~SFT=PSG8;AdkTq<
zi<`E-<*xQRKK4P@YzUHbB+2oTTY<ERsfTgxV>#2;k?a`(osM1Gwm~?V(ifDTFJ+?;
zLePn-sME?FbMn5*JVdh8m}Sn?6Mf^JlTqPRH8Q!X_I&iDa2Ker4okgv5QHOBs-<xI
zD2a<3p9xRVNRw|f1WMiHg=qK(Hbab4$`t83a<$z8)u2x{6Qr(^mCuLw2Z5I+ZF<+b
zptDs^oDI%Q=o)AQhxspG(B9mxeiXyg%KiM7)9fw|b!F|r{Fxl*YhrzapMMgl{d}yy
z4bPu6Sty!ZF|N(?9O<wBxglpo-d|o|TNkcU&|2x1NI`Hw3G)>~9D1itLadf?n=s|m
z$}7dsti5Jq08!Df$w<U(C4fLF@X1%@9HTBW@elA;PyB7-WjP+-%H^EPrTOggX)39g
zdGh>yPu{m08Vz@`US4r_F^elo<<GN+w1vBvlZOU4KA<$~iV=kaFK_2$cOW0}zqy-}
zWWK#qDD?2aueE1*;CAUwo<}3+CP_OClzm2s$c^6dh<=hEyHB%kR%@BI-?BZR?et(r
ztG$bTfi@d5v90UwcksPQBXj<}#$*;x5Gj}p9o&TlAB6s-S>+rjsU0hk6A$#>VcUhv
z-M^-S%TYhf8P48~bGqj<FXP@`J1Yc<3Owk!B(NwlMI>vuVzJg!G1d^e$+8=5lO0H)
z9XrF=%A1n*S=!jMtj%20sGGxilZw2?%xI>ZHs_u%t>Rcm%$0;K3cu=sppCdq8*$gs
z-%oif0=HkuBH^mq2tVaNARAw6X)UJfo)`P(B=@6Gf6r(YdZIsp`ZJfs^8&rav2pj<
zv@vm)G{id<TKLD*r~)rvu2#htknb!x;(IGX^csHe*5pOqql+=Bc4KO-%>+ruiGX0!
zD2gJ>o`epg;j3?gP0MWhe5KXzv;`h4aWbEI^qL-buJJdH%$NJ?sc(3Yb<iB5c!-B3
zeBizBQU5lu6<9u0UN{j>p~#nhfQP>wig}eiAJEQ&Lk06>g0!<!II^WANJ58Mngaz%
zreDxR+7ihw(*kn`EG@?mEKHu|pIjfn!&nU%RPgXw4Jnoc_~uT3DX_TZC@)NUe&D#N
zmJI0Ukq`m{<K{ZvW0%DMml$C8_l^HKd*je>Cl;6;8+6J9%S41TA2X2Ae>NgQw+Iya
zM1&vixO4IDapR((KCrX;H^T6L*=`-R{dh4=QH?&Zb<2;mf7b?a&X@7{Y!b-y9F6Nq
zoZHcR(W?y)OMy9~za-ys>-eUKL%#Fvaag?4GLA!*SDCpvKX}FY4GpVdd&Yjtp~wWw
z5-yyGWuhF9m7-Buf^{nCB;1*Ie-_9B-WSU7(#h`O5SKIJ^cEnIm<9Y}@0y!F%UHJQ
zA&~f>2uU+L4Dn(ZY@(8c`-6}tv-%toQIuu_ka*d>gey|&ePMf>U^|Zb$rs$nH=VaY
zUwAZ}8G#7DKvUvQk&%Yg<+0`Q(REPQDC$n3-?qddgwhyPooqu$Iz?aSlxP!a;d6g~
zs8W5n)HxsaKAiW;+YgtdDTNhK=`61>!y9B18DC_4;(D>nqmx=P?)+kZ08hx!vGI{*
zCUtPiX`v`HEYG{#>4kf;W91&(#@F7bMl77@E$Gc7%apkr8-vmyWP&dPzGQ<7J@?<S
z?SDVic?(y(w^p_PCS61?dWW8V7l$}maqnr3Xz8FI2MNDgU*AihoNC`U`L&0WuHj03
zAZ(?-Zotw02+dPeO@FN~oTHS-Uc<sfXj{G&!KZ7INs>t9wH~RES69i8%^d>mtz^T-
z>eIgbiQehdLh-3}?LA8N>956Xmi?o&*9UtZs#<n!CY<qAStjdn^X=6%_BEW3_*Gs{
zZ-=#95<gHseA+g#eSQKfAmbPkJoxtgu;|33Xou<gSXW?>41LO-<pT}q^h{fyr{C_>
zubp~&hr@50n3Hkz;)gL|Rbx|S{d-GZLp)}Tsa%JI`DhTAWuMTT*eq$JM|SBjm4HnB
z(l&f8NqWSW6i%*00u|kXH^meYxvf~R`m7BiH%Vgr?70{_$oR=su`tbJ7JqGDazSfd
z?>0uA&VOq;`^md1RAK31K~oxbt>Y2@`fzWf|0d-i|3kP!B@NN0s**hc_GFC8g|CW+
zORi2Q(V2;DS5Hk&DLWWP7CGepWTwL4zOb&M3zBY;1xDMO_tk)PuJ5ve^mvfmC}>Xl
z62tCd>SP}V({++>vT$BGwiSM6!=^F{iOby2FbUA&kH>&7i}*(!n(;P4MAXH&EBChu
zDA6@rG<^I<GL}8T7KbX0VeAw+b2WnnCbFLA;=LXm1G*B32)ldwe}F6*Hq;&upRTEN
zZ1xaO#<E&X3ej~AW$~fmPmYC%M%oe@e)AqX;*oHU9hSzzQ+?bU4ZA#1dn$GT5*8pL
zys&iUy+B`^3~01LLJn9)5?uUkHoy@7GfN;zn{Q}%mjp0+j%E5c0R&5Ne9i~MQYjG;
z93*7<LZUmASb9bx;=Lyx2FD?&aL5Z)Fls6g8_V^d#`qzsd2n!BB7BMnyYtWE=>G=}
zV;yG^OO{;ZfMx3DQe2eZAy7H8VnFyk+aMycNk`01UM2homZ82v8fgznXuSLqU^MtK
z66l8xv~Ym9*|$I)ncQ{_-(O6iJQ_=Fqk0X@6R$)a5)fGWm`S}yqT1wdfv9z37Q?J?
z5*ofz9rI12oNofp_*leLr{y#Y%?)@F3EF`?0e0nMxLFJc>iV{zrKGn>p!WJE^NI=W
zwTnZ_^gKWLoBHH*FR+Z-715A{*{d$Iz^wFyTp!qF=&l74D8{;)5&o}%wBHU%#%~wS
zsin<&Z<EN5koDEmqL*U*m$B3i#m070x8{u}&4@AJyW1AB?m^GpU*rDQN~Jluifa<q
zZsDB~(O1>;QEr8ALvE~BQeHZI^^4#qXZv~OrPPTD%AGm0+835X%FoA`?m0ZF&pLMO
znXO*wTa(sxyt!Wt13$1_X+dkb&QDclbfbUDcO0N=EthPQwLei@lW!KLpP3J93+Kpu
z8SPV8-{6MN$t&p~_@ikA2;^vm&hH1su&D%}EF3a<0yFkty`4nho~w8VqmeXLx>24P
zOCiOzFK#@T5MBS`;P}-`kctq?$~U=?&QX);@<lC>r_OK$`Ku!z74Z$0XJ9>y(gu`1
zJ34h+h1{H%<mhiU<^2J99bOCD2VT08mnJuQdHkB7Hv(%RM}^^;CgQ)!W3K#a6xF10
z`AMLJn93h|Me@|_3lk24GQnMS-!N`&&z@%^P0Bg9afr~5o{LPkCodrxqX;kunH-Gd
z<l=D`C>ZBm<qNfyk*y77fnDzl9^)?O&0l|~M3dScmX`joc63cons-j}a>ejQ=u+&q
z#aw6=jPi+ud;h3lFnK64adu(v)r8#|8a9xhc~i%W?u1)pVi_uU@ktf9^3{?oF>ifa
zz});)j^>l1Uj&*GTZ7uW333A^New&bYm2%l^%HOW_}}SHx}?zNrwS_OTt{h&SUh`n
z=eGEVgjXHHq%`=Ry}HKL=)Hncg#rc^)B5;_x8)z8S_QMrlT9VzcaR`RB(1u#BJ#Kt
znBSzZSR@Oqo?)yBr7O`#L7?f>J(ZmTGjL6ew^hth$I|$3#5^rFznU|HhmA!*Uw1l=
zs$e!e@)!`yK>v0Rhjb(?$zthZ*>)eVl>$uChvZ3!kNw!=1L2oRx<{550FektO!}|0
zc`uMIhW)=9li=aU=lx_Oc^#coIOH6SEfui)Hz3gY7;0F+G?55eG6B`W5P)HsMPq;|
z>Ud(@dQJh*#=}psz^+7s^AmVj?abeHz<(Gr<VZx49$+~E&OE|Wm_l5p$9pAzTMYld
zZh!0*CrQzhKD$ttn`68R#3j~sN$ufaRJ-1*j^p&#fkW{n@jKz9FXs=atK&R%gNU%;
z6t;J8$HOev&DEq(5XVOOqaY_EG;C)2{+Q6|{%SPbf+~>}Hgs+V4bPW(Bk7me&o=~g
z*OEQjh6%JBFQ58yx|NP|A&o{7rLayIn1vn}nRz1e!N?B5(PH(6NKb($Hvt0+Qj!;z
z7<x_@70%)=F&kmN-zNKYAUwQsd?ZH8A(jMU=f8U~t@_IE@ZgY^q%S@V>8&OTUKc$G
z>~2MKDwix{>FZwCRHG@wGV1rJfTMKhjR00lc<8bUEpQDfnU&9EyXHHG6R=#7G{S0x
z)M8+UY(I?B-`K8_{}h7cm~OZk(Y~ekT~le5QuyAhYVEQ`o|`XI(JXw61*R-lbKN`l
z(bobX=fdQ>KU=azpwO6$0TvHG7ZZRNmfl7h=1B`~)mU8|_S5AGlVYrez6$P{mA$mr
zL%eUQC>xh4h>}q$q4CfMGKN4)EWGJEmhtrBsZ5~pfoErnKy7mUob+7_ReN;X=Q(?*
zT==o;*WMVE`4OfMyT?}rdxp{DBlZ_v*-dPu<(yjl7^y_HsQ6x2M6~Jo={YV<MHSB1
z)P%0{$&v%e8&P)cxQB;m#?YA#1Egm@q!gDi+C(>YjlU0)E~-fyJG{`eN%camW-j31
zAwoju*@Vo!!njd$Fn_{^A?ywJtMAzRk}iX9QpB9ZX-1kR+Ie>z4oLbqQN-D>{9Fc)
z13AxnXiC#?6!r26b-M1@+hgA6iyK$68~Y&PVAnNCSuaGbInVREPr`oWHt_CVYlB3R
zMlE8_TQ8k4OA@Ll6Pe9cSp12BY3i0gFi&`V`t~EUsG5!Uj{YOp6bQ)rLE6Z<;pC?G
zOds0%pfbdSt_mJ;ZeP{uN~uh-L#pk?_z!ce`N)M3{VyN<E!wV9aB^3Ejau9!P}mKf
zkKO;7t3L8DHU!NnZgrQ6*zsO1vBED-J77U>D!u?NR39O;EK^YxdfBZ(KP!1`gW#mQ
zlKLr){KSakoo32RP&Lf-VgG_eIr~Y7Lr|0vrKdbQ0Lk6F*{0KIhGkpJyBQv5tiFon
zlx@3Q{fe}Zr$5?%;gehY9%o5Jit)j&wmecBfQ0?TeX#Vp?_X|na<<#x$Sw&a#{m2s
z3AUJDrLZv$d4DxKVu5iLZxSfwrf~2TQkd&t=@^}%6O7Y%c>Xw!>>LKhcr1R7_gJ(f
zu>_<r@;?_Gkij7la{}e86{x*4cddj#StgBTEc@F^vvAyrMgk}LHuhfxu>SQSP~vpJ
zQcw`c-CF_K5$S4hS<k6O0-a3oFb)rA-YJHw)UklrS~$c-f~mhu2Jy)U%S^EZYo-Mk
zn8UGjqkqj>^qnC=Cjvzm@!0BU=701D{I^hOlw)4KZx{}tHfA|#vv3GvyL=z8!!q;e
zwa{q+(^~=86b|q(`&9Lo*!Zh6kfcn0jMVrx2E1pD`-1IUnyiBHEKO7F8Y#_Yf;j4k
z^h?~2c5!4CWgX;?PEsuQp@D^I^C>Obk=Z*~ifymOQvx`ovGX?>3Ji>rStIN|9yasM
zg4<@z>@x<2h}7`QiW`Cj4e#F!7U}1u|4k(8mm8k<OXKjkZ6D6!6fr}tkz4kb4$Ue0
zjXeJz{Q$&Q>Lh*>y4zn0KYhg-1JhMX*<qo1d4~l0i>Y0!;$B#G;cQA<-NkXLO}k|*
zb6fJOgJ2tS{)zrg42-okzdM71FP}~tOJ7|pH7=^$FzW?{pb=WD*aY21u{%R%jDZ?9
zt*@Kt$Nf}iAnAqhsf75q*(p$ea7L!a^iOOnLQ<XV2~qI=*Vu!+-5BJhx@x&8^k{ch
zbo(;4bNWsf#W#&wp6Ge*B|O7$g~SHy>EsR$wNwNrYl1(}ueEDlB+<3+ULi~mJfx&7
zrs+3(;b&C3j9s_=@0||{@5F_Kl!V9r>Sd#*Q_&Gh=*YxrgT-Npo9Biws|=Y+C5isD
zb*)HR2(=VmLWZWm7+=>TPI5{gEfXkGIWoa(WIT10W&|2x)i<MCu&<T3>lQz$6C0rt
z?X`MA`^}!)%Q}WkK=Vy)KJn{r?r!4~?x;3+ze;4&Zmik)FC86orkq6AcP9tkog9ZG
zrfge|tcp6?hgdl^fAlKFv|G!i7HQFUhj6|Bz8*NEkZZ5=vnyI)&z+!i_IZHw!sL)g
zh4g(2!KcZd?fXTXdokilS%a+-am0e{=QMe|bvq*yuHg5>tO}+4NNbM?@(%ZRU(EJ!
zWF^9N5B=AiPIt(h;@q5+KXeVx%$&^I4zD)tUOx4M{PRL*f1{PU{pQ~G)0OXMpBX*q
z|A9y<8j|x54J<_DHT*ovg}>++zNB>Y+a{N9Md1%<H{?PU<|N;6yCK+9<2Q9CLn!g&
zS1eU>_%0Xd56G>SNsBdH5a_Btm@N^AW&FJWQQt_7e3JqNx}3ThN4T?8aZBwXa2vh;
zlQZvb3v!3bk~IU%<jy}SEc(^v4wg3VbIa$N9OuloV6lWRqIm*$hQd4ca9nXi%BM;!
z?{l>UN=nG3nFFc*T$`MEt%yY>uf?XkzPp7SvbNb^`cl?R0-M{ZbL{k|>u+Z_Gy|V@
zVGPYk)MVf(%LpB%MvK@xIR$V<gAj?S`(39e-`K{b(DXG_Wgzi7ecEczaVX6%M=MFH
z7Itad1e)L!F+o2Y2YJ2)NFbfX{I2gQpOCP<A&}Todxu1r;bP_07hDK!Drk5vf!c3*
zE-JM#x@Z^@M3#$>XM$9A3`{21xrviNUgcyopol{ZD}q!90=aIw73i$x$plX~k7qAr
z5#d6Zhv8V5t#r+6AU+k?A8!TXpyQ6fe{NEKe;uoy;gHYL36z7tyN*EF_EmgphXr^L
zkP}!6-D3iG+#xv6BfUu=L)_iLfYaSn!256j56d7Rdx0<y837jG{rlJ`?m8*IcP>Dj
zu_PLJKq5&BETGNQ7!C<JjZH$#uSp*W#}Ccn$O>3sqD3rVy$Xy|0Sb;|TokhV+x%X!
zaXdki=D4Vg2pj!xVkJ3Tn}VdVF1%3KH3Ztf%9K(zR<TU&Qpxk~T+j&tsnHqebT{+)
zkYW(yd~YvaAJo#AzIqLWwF^9T#lDj=iGq-HHX-f<4vrGAhY*4sM^}pBb7W5Z4Sw23
zt3bC@<T9O3`6`zFvd>3v6><zklyyM9$cLtLJ9y6QuI8WGv_NSTqT7VIk8Wx->+aH9
zfkDR@^KQ{HmBW&I`NQZJnsUU@?|%8xrLM~Q`W5wuK}0f{K&lqrVz@-3Gz&~T)LQ<M
z8-XPF^ql*2b*{|T)Q~i&VA7T&{tn9SfX0W!g7wZO)^g99(<p|M;49{Vm+#G1&BVAN
zni}5u*1@Orsg>RI#szQ*mWIei|C3vr?ylhvyc=AE-Fvd1l+YMUf7wZbEw{74Y_DFp
zbYn(+X$X{8V4fBCvi&ei%mmpw**)PxvnoTgn}qWbYYO%wUAkK~a5XA`sHgqaS4s9Q
zPW2`Z&i&XLI=7q1@7zU18oDX#I!3mfl<{mL%Aj=8)MUE>T|N$xgnn542S{r8>_qE>
zgfBKi&)dEr9T}TRV%Gm8lkpRAkHbxey%?lTTJZP$4~b(}<~&E>#yz%!2;M;l*3pY`
z?WKar*h;L07o!vJPp{n=kU68v+1gs|;Qsvw_P$!xl^N;YYIBu*+=sAwV<AZP;IZ(|
z@cB)#j$@kkB|oiFdwWA&-l9KMaD;w{CrlCPyXXGe;|8^cq<fX~&8Yi#Y%Je}@pk?;
zqvlr1#ru>j&wL{~xV2_=qcuX`y^GGYm-f9vuJ?)IWO9kseHJg?_Z%noPy$q%b&+R(
z+&fS$q^`}!&LVouHbQuO50*wSj&gf1Q^k!Q)d$$O-)ER^Iz%J%+s5?4>$oBwr^fjw
zBhz6FY6ZZewmeh8aU<7-ijGg@^57nC(NGL{?&dgPSl^rIbT!QP%p*ykHsO%QgnY8j
z{5Rz()|2N~9OV_RNnVHxL^6aiULf1&p*t^aBks5{f8|Vy@!%=)pLQfd$E|+3usJ~^
z;8Zu+_TeR^Mp1G0leO`eqsGoj*62PgcO32crepY0)#<<si&s>5*>l66b)zCFrh6e?
zDM#B=evgPM_;886hSnoYl3_-7c-q{lO}f3e|8NJ(@%76&hH}P^Sbtkdzs5ON*q0?U
zYjyb8)syYo`<0Hx9LvO+bY4gQ#8&FVH06rhBNiL1m4iG-DX{oJmBXG2l~0)+%kh{t
zxm|oP;}2b$^!dtc%j(Yg4;<Ov+B!y6G~J(GFc>b9*CfeDt6tvkjhlfKHmm(l>MW6%
z;XScxOWSkQSWbUUrkwr_0;-wXP?W$aLPUPn(hR)u(fHc6AP@<|z?>LnF)(kAuGneg
zAtE4dq>hpszd-{NEVBRsZd{K?2zm7aTp}JuTLr<jKmKS1=-1=23ulT-feyxAPP(Lz
z{?sreAcm#Oy1l!FASHdvzZEi8AVB~4=K1#)V1q+ItpLnGe9=*RIJo;i?fRGA!L`Q9
z54{fYK-ujN@Pjzsh9R&_E{yR$SjOW+eqopR0wA_Y;*<<t$8r{B2!JnvoVD#EmZr@H
z2k)b>Cr1oGr^`sBlth}yd$DW@cE#|3p=2!kd0RR>{3HqAok?<>L5d7WMWA7^GI+Q$
zN&31C5fPmKTEi2u6gn6XP55sTO_&xqLy}xN`oKqSN=9LeKsl4eSZ&+~iQnRI*8=95
zOwqz?M5Jh|k$Nk*665$N3Y;Tdl3sVv6?zeN@h6(3_~$zopi|ZvP}@p;C?2-#nIF0?
z71C}6l6zje8ySBt1qv&}#+j$ce-Wtq-4uN_f8!7|rh(Q?9Rvz;6ogszcmxyK4dDp0
z0&iBjioBy^cX*2#aijWlzin(cS`l0W6R`b}H1#z!Tw>TbD^EKlP75fCi3Ot0w~YHA
zpkW9-cMAnd>QDT<XqfZ8ZUHp*@nLey@u+RKr(F%s8Wp$t6c6!?v>$|wCsV|-3qtL%
z9m#B!;R1;;j!87a@aS_D(kYQUFOGtsZN4(dKhbw5Xw!X@=Hcy#XWZUdAzDEA!^h%e
z!AC<lvUInkZ2=2ynkVX<1ZuR$^i3(|_Hh>sg{$K2hZ}hsVWJ>wL<Z_;Zc~dtAn|nH
zfb<BteFvfNBpq>>v<P^$lN8R{TjuX^VuNpd?iaTGa$nbbsS(<*%3+Z}KDt`T${7|-
z;^HP&Rnc>)#w_5e#r^7rgqB|{Fm$GZ(Fvcp$rPB7j?eW;rx!hqMp5B(`;KOE?xhjg
zKj^!{e&jS96oVUQsu0_p7E^zK|61eWdRPH4jo8~T_I|96h>E*Nqb7{)e!B2}HSrT)
z->sv?UdBUz`r&YH#_Pio$`zf+d^Z{ES^k}lFMA8=jFd%HX8vv}Z)Vj(N77x4car0W
z7_pRmxi_A7gnnYWFlWm;<{_X4jo?9yb)<h)b)zUDt62dj{rhNzh|(?s5f^k~`Q$nN
z0JTT~ZrW~oNlv-?KcGrBzB?0))YM7kTKlJ|?M=&FIy!8`G}YEvY#4A~#hA__^MBnu
zbwu_Dd?qDE$w%9lV!vG~^H_p*%aWJxB<>O6R?BIZwvUXr6Gn6aCyMc{U$x>NP>JR6
z&kR}3tTM8F+<Ehr<@{dks=b;bC?4(YNaHk5@5vZn`%uZ_fJ(4@?eY9VxpY9@NZ<%o
zEGKu)Wi*{#AVhSXj22Vo#_xHsL|^vpH0-*Vw8+PMUpVP~y)XR%d~-P2Py_$Ubccl6
z7Pr|0G@__d(P_m1lc2@@9DZbSOW+R(j=&z2U(kADZTMDeU*k$|RpG<{tHL#P(VX;P
zF3=HqGF7W;SWGEFx@In&9;dW#3TGcUOD$z*;A$VCfpRoif3<JBQ;76`$MPsxTw<Y_
z20y?$6{&nwWhrTEGjjIL^Eys**y48*q`DdPi6rL7`*GHiXHlWph#_h0K070B<by**
zl>5Y*k*Z1mG?t#Kr^)|1AUZL!+91Mn+8}XGUEszqy7+4q%TOui35Vntw+Q6<nm2f7
z=MkUZ0?}A15N8%ipjqVX1!lgT1XO)xR&p{H)qmROz;JK`hde<dS{4w$asXpioC6E&
zn%nVQ=%50i%l7{?)gHT@QnB9alP8cFzm0eJSGD*TaOj4>-2SW0qbjg7b;y82FtGKh
zpkY7W)0Z5g;i^MmKn4x7yge0y2BG)Vz7SAh)FEgXgX19?P^LMJ0rAbGXz#dZ{Zh3G
z)KI?9xk-Yc>{%4V9j7ymWkPp{Vqo^tX$0!wS=xAW3^<$>f`t8);z`=<00YjUAhP{J
zNDu=cZ!}!l=P&&ff;dTFa`KaK96bruq}o(d{+rfHbSy9#?by&QAU%6}4Gn`?aCr1V
zTo+543FI#-(9^~6^R-S$1_}bjoOE(3G8l(I!+ZSC+o}l<Lu~j8|EKeK_)Am(fgFd3
z^@z(!1?LI?FCL~Y@DmR|d_8nMJ#h>JcI~33oX_DVhhUFHjG5iM?qK0eFDO>AZ1!&g
zMzUz%Jwe0gjJY3nQA{l18I_c~8c&mt5XoF>!`DyVAs@oYq!i!#dRinnmJ2XBSx^f|
zW@jvK5|FhI9Xvn2n_megl0COR$dR0-%imI-fzEKt_xDn>sI6qhAXP?%9<Vk|#lIa>
zBW0`S{YBEF?{$rh@SHT~q>P#+qoxnejECS6hMW7BS-kGV5w;42QZlWjKX}LI=F22;
zKTy!?)ZxLQvMyaR)#mw-eCFBVH1=*<ur<WGBS^khJG=26OC@OIOetcVJKk6TggOJB
zshd9up3MX|*<*^j_s@we&UawI6`M9zvo0r#Z;CuPGT51v6+3yek&R50-r|Sv(RV{G
zk|->Sf^|2>xIYH?yy;}nbLdzx{!K(0aD+O9H4zbcH;OG+X_OM<(D06i7;_=Zx-BbE
zAS83{LJ$|I;d}1M?D*}G$!va}NC<Z^fm)iE+g0+B^qga)=*YnmTVY&I5vPINqvuU)
zEr;j3%WA5JyE1KM)~8>bnTng$kD|0!Q-~K(m|7$kf&_-#tHx?Jgf0su3mmq#FEmc;
zQd?w}cBmsOUX*8_>!j+AZ~tM2Ak=-d+R!tvxH1y5f5|6&4aWUwy%pGfsFu56X8tk1
zC6<!lXF>iMnMy#}ERXUeDp_8430UU+5KI>~$!P`JnZH?FqImBiu{}F4%pI1PFB>{&
z8F(VLH_v*4?sBYDq_@iZUwdYZjW-JMK_7k@IQfm<?#s&m@HES>drc$c0Z!sVKeH=4
z*KNkucf-?WY8c$p)&6~xau(^lyV6<Nr)kQP<V_obVsT_07pp&6f$z7*{33ODbqeu_
zs|xP+_Rrc~dFx3}zV@p&K20#q=);bF3rW94p!{rpspFBiu;*p4{0A5^Ltn3=8U4D3
zx4+RV4(xSJeK{PN@T;@&L}|N*+Yf%oe6fR$l4$UL$gG%lGw!{qj7lZevec*4<`2M&
zP#3<gl(WAO5z}L&$Va{y18+@yHr6ij_C=aK#mB2cCj^T9)MVFqaKhY{A+#cL{Wm_)
z#>-9Yh!<5Z?wJri^%!0=R4)=AK7Zj3-0<zi1ljgF0;9>zo3xomIraNbb?3P2_I^!5
zeD%snYNMvgTKz_PJMA{6h_f?xig$=vi%3sJUxHoKJk+P^b3D=FCR0~K3KMp93j@QS
zT2o!0pZgK_9uifhw!<C|O7L0tM8jVY9Adyr2LWe@mrFn?i-rm~&ISi&^!-@Ivc?b*
zmnr0hQIL=rmUawFM-eas@vt9zg93yI2}S%mo0jB{Hz^Ur5REqpM}%_;l(~McEX>(>
zSV8isIRcrWoTD?uaO@2i5M==(<@;o@^o*h*yX;E}7_f9u`cgm3)_;qD%zC*qD*rwP
z=w4j$Z`TJ7{1ZBV0GxoL0ztIxEa1*U$`J-6(P!-gHGN>qskzpKL*(&`aRIaU;Xkmn
zwwFmcf<BgZB^U=+=uy)?x&_lPsshmMP4K(DhlDf;P7Lh20_zpMtB1ufc9iYg8XWS1
z_lLbqU_uPR!>&ETfNc%H<Mm?_5^!qw!cvf5D*#e-co?rI^YS77cz#*>0wiP?11{GJ
z_#-kwyes^_w`uCx&Pkv&XRXs-fcQj&qglY`yNsleiAKwnk$=Zhv{FpjL)?G6#Nm*H
z6;0#h@+idbMFp$%#KY4UGl8cF4*tXafC!&A{&{o}l(&dvjLKqZ1WKAYFeE+T#nh3<
zX^V!-6rd=Y35ZdM&pbJTf<P`l@JdGr5|<d-modK*(h4rr5L2mslD;)M2Fr2Dc_b-y
z#TUBIiyX9qOKz$QvQO$rTwhQ-(RyBl|2n9Ud>Ows?$OU-hh=zS`>vBR-v0s#m^gC-
z_-{~wI+rks`kTT*e&nygwWEQEi%TZInw4Xa@{dFGC0@vNkk4;!6KJL?T?c8qc<GCR
zP*>U027X?Nu7rjtVzjC)I*b&f?~|ZZwwp<Esc<}`jeCP&FaEil!MJ}pXCo7-8SMS}
zguf(@7q-J8Rxk1G#rUh6;0KznLNY{wKxx5l*<I`vS38G844aa7b%p&JJYoS~m`=I9
zXt3PJA=M>qcT?lYNlVjI&q;g?^=s%4xJN)$TqvlKWI3jtM1*Od#cql_-w^mc<(d-t
zL^vf3k#zTvULRC)Hqy=+J8a*HT`vk%(UgE=o(|<}tt)SXKcM^V`r5VM)LZ-oQljHl
zRzK&RDt$hNZ`i77^TZD)usBCp>(KCW_<rTa$>t3xYXvijw)n%u4rF26p|m?;ivFw*
zzdyOU#U3)mU~`)D<PCfB!_CGX=Wq_q3-Q*e7HyqEStTAxQy86}$}!~Sv~3Swj=q=R
zzL3F_RlWY$`mq0~oFExfe~W9=zn|j%?WNyRy_Es|hPi!Vq6p1Uy*Id%e}L}Cc|Y||
z>CRgEo%-3$JRI>^X8v>Ex$)IOHj_`&_OgFKZkQrST5Pe`W%4R^O-4+d9BKdQ@o4L5
zvv(}ld5S*(6CV9qFgtuYEIR2sqCbk<k^Gf9mM`Ap=X>2`TCP9f>qU@!AeVt#ja}q@
z2z=PH;h$_zym>UXhDLBLw)o>-^>R~z*2l)#%!vtFKvQJLnLWnkGBYO}Ypk}CJp|M9
zy>fMuEmE?Ok*}n7^`MxVE6u7c$33lh=hCl+(|Ypp*UP_Yd#xY3-qXAF;E9geW1|5J
zgD9BMl|1goH|j`1zD=^u%?Ac5O6Sw8yZ0|k%zIZ_w_|c{*!=3T+kTRd<JGP@;(lEo
zp}Uy0I_F1Q?$-h1<x*fx=8wY@&nkRzpIi6ewf{6S#Y#trFZ9|q<s76n{po5ZHdZ?1
z%7u1d@5%oI0%pIt-s^~w^?o4kDJ-y?aXGI8G0y5SkU&>HSo%`LZ9wS4Id_eN_z$r>
zhj^GTuj0ixS&o}bI`ZGYauA$N?qQFty>&JSR4+@D+Xc&acL>PQxc73xgUUEEb!yC0
zX%dlTdOvVW0G1W@5L`;-lK*6+pg=$g=<d4L&Om|+B1yqGq!S+Qz~h;i{I+t(3rl0K
zbE>3|yZ~qpKs;}kV4cJo5)Tn{p}x}##Eb8FQilpb3?&jVfWt0l6yi>-EW*GfYE_*>
zU>F$1d?e6sfsp}G+NPZAq@2Y=Bzt_{Un7g>&S$@19GTHmNTRK_rknm<)0t^3ZI+m>
z23)4))d0j@OJNh2L4}4@(1=`H%UQ(IAmj;@d4PEZ4M%IMtA6c+n66%lFF6S@(41E-
zgn0QG>oy4pesRsAWGwt}LG?F*EdJgI5rI{;j=y<y5vKR~B!uMjAyJ-0$*Yj0wp7kT
zAk2(qx^thiaio6%4X;%uBA<8a19JuY_8JVx*gf8;fX78aTuO&%@QAy72^`lqQ^<T>
z9EOC==}#%sRe@okS6g#?lR#l(cW>u^xHJAwv148|;K3m~&p96~!LQVDn#F+oU+U$_
zCm|sMvhOd9^WC$8_<5|`%%eik@PJ{j=CE&QSdw)`Y+MMIK(%@NSEytY@5F%M{5l0>
z0vhODENn-7DeoXq9N|Y8yq2`U)tFTg8-0bXb}OLV5O{4T*guFb3KG|;YBO_}K9J~B
zO`#|~l?J<P*Syk=?JDc|S%*HhLVUa`I(1)2n{OP4Kxm^J#G{}S2H#VTln(<5<lMU(
z30|wCkU(wL1(}ZAw_3o!qgWAC9JG9{B~V|Y<^2#y!4b@Z6N)e@xLs0l@s>&}g5f>Y
z!a3Si06{>$zaoinX7YwRJvcSQ!v!8@2z&l)peM$F0YiOGdum0Wudy*mlMErV^l_P-
z9-OpLwyw2wxfzyOWic~fkBj+mN(v7f_U~n4NnSAa$^>Nt%Y&?w>8D~}u~5VXbEHzA
zUkQDFi09N7G417M;;;EU0G*ltB!r*+$_0N(j|=&Qy}wxZI#sUM-Qi})iZg`f4*9Ta
zD)wt2JV894hQDJ2%X}~P`GRQ9vz%otRZ>q8-mST|lLerYK2>o059ShR=~YLkwKpdl
zKQy*A8e1W+U+%Y`wvSuUeUg{%tr{Jnrf93@>r>nW*h+lC?2RV}p=#$yF)3xU%-nT!
zVbC>+u`4H2_&1I#GwjO_Ev0SRBVmt|;-}T3jpwl(pM!47AT4L&Cbf8?#0wf_<GY}f
z<wG7-@{_0CEbxv9l9bkFxygOcm*P#cN=D{HYGrxdwdQD&1f1bc|H_1U#&Ixt@umD8
zlNLKQb9*7aer3AtjYDb~e7v>l@SOV?_If?<Q8Ib#CYnjiP`}$GTx~vOBD&ILZ*a&;
zM&(-D-W!wjEqdC~*<ox?^b)?-x@R`+^j1yMtY-NY)qt|g0vSL5fb*E>vhsjC)_P20
z4+5^@q<q{F{4a^JSj#On`rn@~4{jDzMJm_k`P6OmL<Hl=^Or(}LyVfaB^}9cFd0$i
z3OJ8`JHsa}?DD-;iE8@Hy&iEU%{|kywTq8GSTUy>q?^|S75B2i;)?<_FY>Tz1aoOh
zy?V!CWpn35{x=^Yj-0pTK<Q0Yl;QA7e`3`ueK70mre@;S=o;xXq6bUn-=jk#Qfgyv
z)zwIF2jUJ#cB(<2E;&iJY^w@BHcZH8upSNl6`!5(<2GaL?V&X>u06T(JlELu2`lwt
zEy3=jS--IFkAeCD9%26nd|(So>E=s3HS%82j&*^Lt!e38rQ3EZ%z<xvjhVvrY0bl&
z7imyiOI)pZ{*g9xT1SNlb@Pt16IegE?09?1?pz7=+9e`~uZmPMTsT#&l)-WEtakBX
zKHpb;Nj8jlL3!2d4MP2iybI!Zsxp=SMk~-c<m*!V2N;~Dd8Xzck*Cz~2T%}bT+c|H
zFcCfVNGQ2Z=Bv~uDxr<BNJ$$6K#PkC2QuU&YUgR6IC~|^UO~+Y#9j3C+d{+zc36Rj
zgflxwN9WuKRA;!KGaUG1Kr7ZHegNX7inK`o1L!CAvQuC}SRBe1S)(v93NcNSXR^jm
za6djk!|%9w_1h5PMP{2Auncg|SCdKXUPLfLc9k3vUkWr@#P57&fw{L{NUkF<YJ3YW
zJq{f2DKKc%2ls2ucQ{E@R+mn>Whn|`C-2enom(Y6Fqf9!DpEJC!?y{e&`6uhF2WNi
zlyHcgd&Ce!a25#GEn}HcN<xdd9s|&cCmPQicPirtF)(U^WiGC{MwWjWOP4{{@l##C
zo!<(?M&u!WVL;x!6RJ%(7}u|O3v&XheoaShLLl@OxEs2PhFObwY+VNlk}g{O?`sdy
zaGswZaEPW47r_$8^hO6o0D&rLRlL>)hx9tr)jkS|TeVr%&CYA!;a>0QO93)`6guho
zly;W?7X2_J>LN@aP@4USw>w0`UicCC-edxeP<`Nz2TRc;I(^5h{UsSVJ0{saL`0G_
z4nL>r*8zwl56{2KPsAaSWhC*CoJ3#D@_)OO{?F}4Peq^t2p|FtL&KWCkaT%~ZI^*P
z#8sduMW96L#jfiV6UalJSUOojLP;m%ld)95NzfX(P09jJs&{c@_tyR|%FZ$@s_6Uo
zdjf{;ZUJFPDQTFabji>utqw?cGl-xfEg?vZ0(Q|LA|R3yLx@UAhjb`{#2tVCTQBat
z&vReR!_1k(IqS^+e%I%mz1NDuEJ17#Z4zpm1(aLe5+~)<QePUJXo1z0|IDa=p4>@R
zv9ba&k+k#%#UT-1O*5w!s<e!QH%yhfqDWWfW9^1wtyQxY#Hjx?H9Pv>`l0H)CoW9V
zvugVUN}ayy=i2!61&GCi;^oEQ|7nOFB>WQJ5bz)c)Rxf^QlcL&0N1-&nj`czt3i9l
z8x9)M;Dq5jrrTB^YA!7inA@vEEKJgr^EV0BWHazfTLcP{C{rqCTuey@N)LbDKg7Zl
zr&>hp@si_uXIy$5<M(gG%>2Q^&ffd9Hj`_$KTWcHNBy6lo?Q{0!t;noD>m}T5-4*O
zoF8y!AI8k=5s=|7xe#N&X$?60{?2vz7fFZ7AYU||o97g~$9%+}_3RDLI&UDPIjQ+5
zp3y|3)+VM=H|~9EGP&AcO^J3|pMa*nFX-Y7k>`ESUsefKt;<_pZNPCVzaQEJ%xw!w
zPyfvYrMs?M>s<ZKu{MUW`B-m{K)n^7#eI{(%d864G5!3<L(XH*2}#W#Cc~RogRX~1
z@Q6Q~CL*tw{z)*7Q|+INx+clkaCBjs$gWfJN1tt0i2RL9?_52_lT*M)QVx~7Ggqs8
ztL?I{DM$0fS|)j}Or0rUx2mtMedqLdm^OVsk)1X56#OwLwN3H=etDeygyXg2x#Jzn
z<S=T^!{9O2FD=)LbT|6FYdIg;q>D~Q9HVKC3UVJjbB-`yIczUqzWK|5jgvL~@3;vF
zu9XWPl~N1ouXKfO-N`vSxhGLyaGovcN8(Y0W<HmlQ$!eJTTZY0b!pRw9XbjfUk1#F
zL!{I!@qO22@`^h%G}`6#rtE#=<il0K-ZBo6S?T^Pyhp;DJZ%(})A@D5>~QF(=B?l{
z-kXCPvK-wS*x95E$4FdcY9*@jgV1r_DPYvO74XDvTjYM+kk9))-p;<GhVrZITDpxh
zMV1j^wV%29{*=kfor0N-TQA-eJ)RI(a^wQLP3|-8zaD5V8*~PA5$J@lTQy%QuesBI
z#LK*9`>oE&d&jK$S`F|Pc_G!_s3-YmK{5(-Zu9$+a-s7_Vm^$ux7!4pFOO%Z@0+r~
zqKtBPt>3p+*1WrV@V@dc-&!QA1jK7x;rY9w@<+Ju#;9&T@8#r}fX-#lTfGavB&5X8
z>s4iWCJpb0(cT(4dU8+zmLwllGpPs7e^^7htd{&?S~@U?uYa;0?H6c#+mt|?`<d->
zlb)+Fb>O5nry?}xwZzfNxzdmF0uKXyHYnu`giVU+5cHk6G9>a$p5TV!L`zWXbQDpJ
zbJXgaz9fDpTo5mz5RW$-DKWJN(I0FXKSc^i{+NN7B>JB_hjXkKFA<K=F!wt*Xifot
zf9G)~#5qLU((u!i1$2#Ua;`uKruhP3M?PY8WCGO1c4zrFuw;!wwNqizrJU2RN%=bE
z{hai|ViO>o3<e&KA7YWUtybkycq_`*4IIF$O*y2@FQDNgJNaijK!?qfSTx+|c67bZ
z$lK4V+v~~Tq1b$hwdgMb$~fXe=V1*AU`C%tf4|TPh=`ls+V01>n0x}tQQ7mX^9&Ur
z4biT5X)-F7P8cc>fS`Dh{_Z=b2xzz3o6ELv93=wXp6IguEWAhx<J*LhD*lgnA;f}9
z+@0+MENJtB$KAvtEN`4K4LCLdMtpJMOK(nrJzgTcf#k*0>la!`KBiA&o;@JML7>@3
zg%P=c?N>&AQjSo&!cmoTFriNZ^pD|Y5Y<CrVc*uhUj#~D?$7anuLuW!B6<&E?mVfe
z=anV-KpySiQL_{(;2zAsR0CwTAu5iWyecAi5&X`l_?7`vFYu=MTdXDM&A`EN`wHef
zG<z!$qsrN?lV#HNa?gaQ1>fYR(8<y75-0+8NUnPJ|9_6Z8j^$n9Lc~R`y+UF1){xj
zMg2ds{$M?8w-O-cviNk=bu7Zej%PRB3*5XxM+-C@!g@#t@5FXVPY}=Xx|^5@v9b3D
zv@PP<dy9o~4@lg`rIN=R^AwJ%yRx9dmks0U6Ltrg>kylJvFP7V5BZAFaFe%PO3`I>
z(?qyB)pYUufK`aqdZKyKC8m*x;N(-Bcf<2=)cxq!2!QCr9i_LlUaKa9o1_C~)<YOJ
zSUVnGD*(4&b6@AJ2K&{S<QHr>2702f2>1L<szSL#E>I+znndw^S<evM?ojWKbzL9D
zvxmIB=V?(l5<);dI3JLmqrXp}T1VdgtG`s&1jx!R)U>t(6P|WG^>pWL0!rutrl*Z`
z;!Z<W$P^wdj7Ij7jPTe=Dny$*rGH5aQAgY(PzvXUw7qk!*#CE@%zZ?pi(X{rgg6N?
z-K=i7D*V#p6a;S{a3QTz%HMx*-1c*J`tzIMURWmaj`NO5TSDt1Uh4Ktc3G05So&@k
zK|4$a>TmQ=-|OxJGHvPsv-(z<QTqgUMYQ`uE>_R1>j(#zKi}(FojayS3h8A^+Irq6
zV|c0ZFRKgI*VKb2A(njS2pSn2+=C|`VyHjUuS<gS7jiP<`a<;t+OG4HP8?szKJ!H4
z<BH%F>IILh0{oUfSIz=|tB;unAuKIv=NO$l|LVNyx!;;N@PL1s|H+c!jO)AC<-GIy
ztL5Y4YH#|4qu&0wP>cpc?@eBLuH9kn`1AFTF!xvfbfK+BGalDX=6EkIiX=NYi0YoO
z-4Z$&uD4xU+$p;+Ygv<~)s1bp*_t2XB--QlZ|1(OuNe^%@J$nJ5Smi#RQP1;U^EH;
zP5H}6?Rr$i{o6yKIknTFwm<w?$QP&IeaQ`J8k()eb#m_=IA)&gs9nYXQeBsyHEvTJ
zD^$x5mn`*2IG$G+N$d$OhTY&i7viHop(B~+8_!B-Cv@RR>#2&uFf^>e-iPvbeXBvw
z-(P%VWP%F*TF-an#sc@<Yhlvd$N<x)99-|+DB2DJIP>we)gI<JM%}5Mp9+}wDqX8O
zw}J?F%_L>~=js(2F3!CUUgtK``hY>d{aO7|tvF_uK8aRUebhMX4PjOPTK>;s&XIMi
zxlEp5RQeLc!Jf;mXuv^XInOE_iAD0O@y?UQmZhN)dM00MjAV?1x)irFCGm4x-m%$K
zpJc*wg@OXl%^4Wc=aj{JU@rCy)~#Neaoxq-s_9~zg3Yr4GKYMtu*3Bn=k!0UT;xyh
z1e@rY6r;5txt{AudHH6*|8rM6IIr9A=y5C0U!E%R6b1^v3uz<dNtY+Tyqe96NH0)*
zp;dk2H8F(XQMfMJPuI3)x+@r;E08=`cCg{Lvvq0cGW`yLnsIzAX_rBNoKBZQG#R)?
z*plrEMgI=y14@w+-nmG>2P&ysdNUBSX$bYDZHI@j7M{6yh|x5NJJ)g?KW^!Um(Uyu
zbKclO!!lbJ->rA35#jgCbGpZ~V$krf->&_=sFd3hkdUrJK)ovLe!`!9v=&ABq|tNt
zL85u;&YXHA7G8c&QT-!I_{0Zdy&N~{ZSg~xq@{aZ<LhR*qNm^`8Bj$RYv*1HT4ciT
z{VOS_+xlwol6==OAf<5kTWVtxfnBkpL+MU2OPn~!otn~X?9e=1T4@JHathYB|IFj_
zNeXWhKGAm$?38AHRe<?k<U9C17br8CeqjY-#h%MfF&N0|-1Pz;cp<sz8(Lf-O;@?j
zc|ZLp4j%j|Hj1(6`3sUM=me%jE#lesZ{Is6n65&M7ZV?M5;{-RlEDLYlQjG+USe(@
zbK$T66m^hfcRR60^W_N4_U*mc?Jiy%=n!-cg1GL<Tvn8MvZ-hau;iY~u4~OhctMpu
z;PCFs8OCN+fJdV^d3AsZgNW8I{yB)Di=}72ZW;~KpW9Y|u@sV!<$2jUPcVU+vO*|h
zDFj$wo%{w{hZwWSfJ3dDJ8yjKk5pjkbUD5G7lFcZ<`yT(NgHf$oPwYyBSf-5nY+I*
zL;tU)fv|i3x6kxneIvrNHJ-wX(6A0&A>`tJ-whQgI*W9D3R}acn?bC%1*VCJxtx1x
zr9*g8IOi=ME|6H7#hgis-r&Rw|Dz}({Jpq7+8+mFyQ*~uH3u=t>B$WIM8nBzGwAaQ
zz#Xk;os*axV8Aof*1EEcgRQG#L}cin7h-|0ZHnB#ZZ}+AgFFv~G@in*<jU`g$ztlX
zAi7=G2ULTpQ_lk+>fe^piIPtS6M<DQ?!!)IACTR;bfJqt>GCcYfe+N6Hv|ROpH2i&
z#ahC+v}oEE?p-Hwk``sk(fmVRdM`jzS@-!pW(H!^Q>b0@4<H@cVIOj3mlZ`!UxjXe
zV|8Q_Hhry6xDuAIFv&TAhE*8e{dAinwi;H-=tk)L`)O}LFrKkD(=hf5da4X7S6_4H
zcP@AHyYK-b5xLc<lRe%P_3-aUJj?i4my$rhp8$w~V$wm=*1t&ys8YI3rlaLbW;FCj
z8+WtTw3UeYN3yu5cM)MyPj8%)<K#v>RcAa=fLYP)j}4>{$=(R!KCHdOsDd&hxM?{s
z;q8ED8T>+(1C?T?`YYqhI>6fdi9OKa;3VZTN>`aKq^U5R0&4ozQM`0b`^!u?GU51E
z+nZ@pS}1S(c<~AcFKH-MHNLBL8`QV?#RBuGp%jhVOSC}^vYIZE!R23TUvyuPXFUZt
z7owa(nDKOm8WH(a+n^qApn*mNO6j%jU$9>6F|wvk{k>ivEB<57^nw@vR+=V(+B3}T
z@^e_u0?)M(E=hJVN1W=15&=)2Nh{MIPI`-Cbc;1<4G*QV?>zGyn(QBndnFfCH?FY9
zny+WNt?~PAfY@+t8SNQCCG13K_v+zLz5SB&m2Iw$z*6(!7R--y8q8+yDc}mD=4u{~
zWsuX+sC}ql(J(<1*ZBQl+Kk{8RuGo@UhnZozVLh26&=yNv@<c=1@Ptd;B>w}?iMZ|
zqP`o(-MB=i_O?<@*`1kyTeQpGq1gO0*eh+pZa#d@<3SV+p<kow(mu6qSCsW`)iB3n
zK_Ugiy`5s!U;-uUeKGMsQ~-(NLzJpN=LuZBr)Av0R&^yZMOx_M{ZnAqZgMNAXd9Iv
zS<@md#cP{*!oO7}-}^?LQ6==wwZyY4m0DGpi{S)1Bby;V1^tvT>rKW^bLFFDL}J#;
zL}sHvz<>hGjLD$vtj&!dIl%s|WqnFwW*uICzBn89^;>u)ib1+tAnW`$s_32oV)2D1
z0k+YVrcshvCTD9};@&An+!A`TP0j+lS&;bUfy_-+U1zm`ck+LfMKZXo{T?}zN8z2E
zRudh8noF|lGjj(i@>!blalPOncUK;=qg%VB(8!yB$4+{GU&Q1Ang!M3Tca5)f*C!J
z*%IZMvceD<q+$G-^86$1H}fp?g**u*1Z4$^=s?L**|z34eK($LFR_4EEEV-#J}Ij6
zGDpiCe^RJC+%gp*o{*&#h+br(B7~;2PK7}IXgXrE>DI<z?a`;ueS-EtOayCUwZz8?
zP|TgO@ss|QjF{9&Ww(eyr?_TzlH>4|YG$O*O)`Yk&PMm41w-w&-uZF)i|Jg_bh5*u
zy9C<nse+?Z`o?B~QguwS#5!IMBDuJIJL0u9#HQ$;-jnfJHN`-@WBiYP#}s+wwL_v{
ze4U_dj<L^xFAn~`!btMNHLLNX3aHyhO4=O9?MYUV?*E+y)Q#>&z|WgsY<|)N^fNwl
zyI<>dMEt>$c{ocid`o-Yf#=%(=<~k)63z9)3Ih3nABwicPXa?A(0sl<qVA4qJ?bV<
z)|N<5$3<kHRKtV={4#bFQ!0+gfMkVyJM!9VlJtz@xvu_lLoK3VjNIMX@g?`MNY?=V
z29mg)p@~xk!Qb@<aqwD-xv%{Fc#&*+>9dGGK@i*KZQD%LR{YUZ_|5xtQ=gMTYG6O=
zU=?C=yw?=?FKKou58uGS!#%DBo$T)ss6Kzb_p^<p%Pm)BMqo~t=;t8169rN(i$#oN
z!uAF6LL^)1CQ^YWrnNgk-((3?iEmZ?DF_tG^aEbNDE@DY2CE(kQ)H3oLn7iocc5T>
z|I0JplO6uA(!=mH*#E5oGZ_JubcKN0(Cr9-s9cd(On_D)7YGk=O=1C$HI)@$oXCIc
zjSM(dvB;KA^wKM!y)Cz+!UAs3n2J*ns0G8jJH3EjyhF|`UXW7mH%aMpEmD+44~U3b
z`X+9766y(~76PhIvcYTvhfw%2DS)p<b{_c3eMp6v*=up1$v8>D80_6HmeG4ipbqHD
z;^_#jIAJD9aQ$6WZ@S-1JFw2>4(icI?GTV@vp9bqU*}ztyG5)on7le9;fg&c3r7!0
z$gAbFV_hLe=6et&#KttM<H#ekPatRJrv2f+L?BSkC0^ka*4M080AG_PFDd2x`>M8W
zCg&tXYaw}Vf<F=jXGs=j1Je7cyrlxqS_!mdO?QTwB<P<Q0-D?f#iR)}@_!v|tTuS@
zyaB|0{#2m09vH`99z)93Xl1X^Wy!dHI|U>=G!Q6ESMZM8q`S2WG1nAIHa>a~6w(nv
zpcq=*_$vBb$-Sol@ToZ@%IVH3Zln%xDZr@i1nq2)(0`~??)4&l{jXU(S*{2qe3SVn
z9U3<45HQ@!pN4~Nq6!f&$dAy#AyBn=@~a@8Wz3=3v2#N+ge1PePO>@ZotRa{I5}Sa
zyF=)NI}1!1rb|kI^@e<F?!FOZ>>v6xr=|lJZr*xb<z{=J8JM=cdl>SlHQ4QTzQgrr
zj)8$_j@28DE!JIQYHoPJvGFjMxlz2-%08u^;@r}WfSQLfFX?{~=qd*~nC$hL79*rf
zU60JjGU=PuhwEQ@-ibc<ioZx|GX1zRZbdi#xytw{pqgk^iL$bDTTAiR`!nd$kfVUr
zzBu{a$ot2X@!XEzc9~qS{rQ^1Q}FPoj6Ce*wckYDVyyFMykmB_Ups?CFH`@L>)&w|
zBwbLaeW+`&6<6w-lVM+!ra2~Waf)5^A*%dL5$0B`;GYKu8Lz6d>dms4HApbaH#y^c
zSG8vS&~q#`o~hcqEs~>qJWWF^c`1ND`A8y;F=D~N*WWh7l7Bx>X!p@Nc}jh4Zk=py
zWqtBY+&7oF9P^9@<L*1UvaB7nvYcc2shNzrXn4~?(F@yl=FVJ1=*$SS;aA=@4?AbC
z0`109$-(s9q4I~1gFi<+41au1Wc{L{9_^<7wVd#A-7gC4ZI#_VqCKz9C?7J9V1@eq
zsxQmBXBnJ%U+dODi^>b~D|!C5T}GvA@B3^+N<?E=U}}lv+kvgzmSazvx}e8DVPit*
z$-?yv@2i^MXVQrUNDGF`WiP15%h;*f@-d-t+jF(?5Bm7Z{ohdEcgNjEEnMl3IH7qZ
zOXF~NBn>^Lkiqor%$HkyY0XL`{HG=4o)1ofTDPcayZ>w#Kw^y}NRe|@<Ig4H;554s
z5?Ofda~RKox5xV0vtt~*wb;`c?eofk>_&Y|N~DXgMfcHD*bcRcm8FSr#|+07+*`8^
zq0oZ2ce;Eo$CIgr(TLs6jVF}s0q5^Bm|xU&76)m*D?HKjG$cf0Yp#~en$YvzRUQ!3
zF=j0B0<Ov5%g65Nvdo`sts{s55M4tecZ9)--|ql{R=%ZjfNegL?|LzLFt>YrVg3}f
zR6y-XVq_1m?S^h=mHT6g;8Oa*E7K|EBQ0|qRq*$4jZ~o7U7BiJ)GVGM7d1D9XPMMm
z687(3PJ8|uOs|V-EW<oTa>|RW3OAKuQRn8MKJL^D!bxfoN|FXy4xfdWI8L%ZDUPjm
zyDa#+{%F92hAts~1|3j=T;T$o`m3!<g|d>yj=8#5K!17k4&`|Liw}y0M@>}_-CqwG
zr>=qD_j_+Yw=(Vf`T+;8)MM&fR2bl-i`-Ggl0_wDUnEROybxO-%HVo3u;aWx>ce^I
zKF^#6xmbKrfKQNAbI}4J^<ANe>E{w>L&){=?cNPVL?T45K-0`y%`~1Xid1fy+=yv<
z3V(K|)L=pkb~k?b=of)nif;9;KV7&Afug<gY;|f*PvJjS5gHfN5%=jQQZ6+Co4@S2
zy82z5q^qAb(k%^}#S0gFFVC2c-*qnl$@<AX?408(zX;^_C(BZNG*G()YWa^GPleN7
z#?fHOv~c~72`4&0hxdK_=TLi)Y&(CIgOfmsq~jB?+=ZygZQeMU07#C}w0Va>sdTbN
z6VeBuV}pGKm;(OUz+V=yRo2GAyAx*!{BnQ1M#Cj;x>me}gp$F#E^EoKol}rcpc)66
zmLw5412K4$2R`}nuM`YtuGR*0god+UZVW#KDg>0UL-L!~I2a$B<>b%EFar7QabN#P
zBK-Cb+MSXfJfmAEa$P+N3onz@pUgouu)sJu6u_b$meO2)2oK|~`1lNS0b-(dxFIK)
zk-l#N<hvhm?u_$mL6i$!n42e-02vrSl2}g8$dvz-E2FYZd-Q*v(M3tlL2nN(S>tIC
zLwKGys}L<(&k*<k6~|Y=kV<(G&oP*@|L*}3Rxc7{_^i!ikpwYbOCnN=8kX5b@-XZ4
zC#Hs=j^~-^r4QL)aXc*&i*!b-=#iLJP`NGs7!AgS<H9mmAc{Wf6lI|;0)@SBhgAao
zr9BwiM_oMya0AcB`?Zt{SjuMZ=8|0FvslVB?`IONz3!U0IfjFE%<NFK_?fi>2c!8b
zpPn6Hk>0gK(SsRJ25+%|St-EhLG$GJUM55-%(l+=$MJ6pmJHDcsCsXa=#i|v!GN7v
zB&Hq6=1vZ5e0#P}$`LarZXR?j94*5YvIUkYNFFGf$ucKf$ZrVZ=fe9r-0+N{^S=FP
zxVC<=u`h_LX$Q<LgDG=D-xl$L2<oD53gG5a4bbNWf8QS_Ky*xg9AOg0W%Ns=aU)rp
zC_WL805RO?ZY8;;?$0B6Mv?{V-V(_1Cb^*gI3jFX2N=w+gJ<o4TICWC;~s%hbC{#E
zZxqklV3#1q0uu}IR}wEkdf~!G3#`5ut>659xnAQ#c5Bwp!{ei|TMu09r+#?hnbSYT
zL$+V4w$ILYA^PvtpKKj8cic@(Y-r5dKaL&cOVj~UBa1tOgy5S+^}4v$aftI`jNzbq
zgU_SlGp9iP#0fJ=pj0^4(oen`K4%nR%CEYPx#a~OK3lE}%VTmZ>lWE93_b;`Say}a
zcO_m}+;O{dVwq%HGkRV^TChH*c@iUYlnQ(=%ucRWZhUd%E01d-*{09RVR2I2+_zR{
z#yT=M58u=t`QsN_$hY0>eLR7$IkXoLF%T)AU-DDu6<+@^x)l0l#>077@GjlF{m@T_
zJ7+ITe(xf#U8}_iAyUUHz9qvL`FXwW*`6<&H#6B4l9;<Lri-d$ag_9$2*2C*>RLcR
zdB<qj4g;TPibBvCjEqpu{<;p)uIO6Q`D1&d@XZe$S!8EzTmCw_e{b%H=avai=&&#j
z@E_{nxcL_{ZwVdPj;;Pe#C7OwGqa0Gtm+roKDdsIc}Z~!JO+Dtp4j=!odVj)U9n=C
z!^e6jY6W2zt7OvKF=TzA#E5&HH9eHZaim~gU(u7}&G)-pKP;7VuKMrI?;S@+3CGiy
z#1xY9bDl@*4{io?zN}H!{1Sir8y#lzb&im_1GX-oazx=%aIIT}9fI*>=Z4{l0)@|$
z+hsyM@3|i-FPKp}$2>{U`PgxvkFP1Cq_*ju^55BS2d=k{_HO%Yz9@(!e>Bk^Qf@C!
zz3TA7THwHL_l(LOMsfHQL>GWFwV5CLxIX(a2rW8JT;%4TGB+fWQNOtR%}5NlKvl+u
zWbQgz0iPv0q!wOg>D9===TPH3Sh5wrg<R7gojf<=i`uT!(3i^yB$2ySb%wvKpQoQH
zrT4vwCHu4aI`x}%lxLEr|EEBd%47!#)Cbj9^D;aGx~YJ*g<vmp+Oz}@R`AVu^o6TQ
z7{RI8q08-T`g%PvmFyg)X3K7^VSzicyX)&8EONe;DVjpE$&jMKYyNJU+&>6$2K2xv
z9<I~6_>svf;C8=UTvMCdeTEBB&+WQ=rGgR>aXl3L_K@>m-<l}#OTROjI>i<J^=3We
z-DXWL1=23OzsPh+p3erOEr^%@#Ae7iv@@p8oFVslpq2~IkAz3v_i3~1E-Wd~V&82S
zkmROD*ZJMa*bv&cp%&Qhv<F^eo-~x#yT8;6v(AaG7@wzHe>FWm-`o2#U-@e1sy>BB
z?y&2(d4q)3wo@QO3pAA)qP!(qTH|i<5aIcvbvD+i*>8Cg+7Uwa@0j(6dGPvtO=Ljh
z&CMPNRWdu)JO|w_u)0ds!$IR-cr`xH{u(xb5!!y+CcD{zV`Oq{{{BUF=UIz7{|teq
zSu%f4T61@=(-<o^!L097aGrWs*(q|V(0!MHn#gz|x8AZ#F?YNT(O=EHoc~u__D|fe
zr!Zk_wn4@erJN&@k*UcGJ?*f^Y8)P75ubCJgoIGSbb15=Txn-yDRAB;0D@P^bS?7~
z>yZ$MHGA{pbjp$fj7c(GRH`~7;A;vIaV0cRNtJ<P{}+kMUM92Z&J@Sp9m8{@%{bZ;
zI+aE6yhy{Y`FbRMBp^3_4(lJ$Xr=<`?!rBa^Z4-28lX-PRPP{J-8GU64RR<kO;3yN
zlfk*%s<K6#Q#^|5S0Jw6FCHHt*5R%R8RqD5%>EY{!5b!LM6Lz}W5OF{GM^!M?kxum
zv*7b<)RZh1z1YoMK;yUHryx*%IN8NAeEnRD^%o@>w~2O%+>@V6yvuO2C*2BzWdTNK
z##?L+gp)8OhLGs*vop+-+enI@G)3jVlbBoluVfm`W4O4ldKRp66lQ#INSROj(+&$N
ztF76(Tq>b){PHMnplk_+3bStKqBgI+8#A+Pz3`g$rTOb&{s(@GViSdF40Gg(E@6_L
zuRLpqIu}1vXlq{Urr@rf!*QBTER`6BUASrzFzdslcHLH&&?nfE914|_>rZCs2FjA8
z>HfX&1f%N*Z+ORS<bKD?R`XFzc6d5U_Rzlh$dY+>arS}o4mNo14?T-xsBGC6{+`_P
z@;(7mP8fkl8Mdzn^S(Xrok*GAhB^)g#l>vhCrf@;ov^^<ei-U&$S$)Vp&5RE32`Xf
zG3o7nLZWy(_PLTzna|r7U634fgL_AwKlxU4?Lv?=XM<sY|6^ou2YN(-!+zy!K(2I5
z-Vx~!aqnwx>a8WO1Q2wXJ8_#2FSQ1!*C3vrf)9xTtkGo%|AE1$u*&z|vD)K*h;pj`
zr<o%xSVS8MA<rCK!oen#DhSAfQ9ReB|5Qgr3FQz_N9k)gSfb$;=^eNwZeYqD6hThe
z;Oiad;v~F;TxAG>vb0_(X=w`2vr1E#1c*ou+<-mEQkkT$D+l%lOlF-65Iq%Po(ieE
zCBc)P{TC}&o%}P_1^uu0JNVab?A~V&jA~&N7V)9CUr9GCeH1S!-s9hr46?~O#Y+5f
zu$90qo-=AO+yx*fgq+vi5I74sJ<AL&jidtQ!gAW*LfU~qvN4<?bB{oVeh|^~uf{nq
z&rnOiIB}1FI@ppunBh+ZM!zjH{Nfu3<Oe&Y-t{y(KxN%6Q|V*d3dExCa*1T~w7r?Z
zt$a!NbDd|KzKu<jA7TXyYb$mC@GA|)C-7#vPPc{n;$YiGUPne8sF7<dF!kEE?~+pH
zR)*qP3Pddupso|#0O@d7B~o@r@f`oET?cj*sjz^>dZ{nEXc%4_2Zx@k25g{VGiAIK
zULdj`b5{almMm%|pc*`FI9q=q3XtNLe=3#=nh74BM@Y54`Pjy+Yk8Qa13y2LFN$@`
zbmVf;ypDV9s45Yo11v7fK0N#CY8GOd&W4o#s;@gS*6Kg1*Xq#wd_aUx;eLk&z!}}+
zHp_u)_snY7I9h#gvwHfZ`X#&k*c6k#T`1#`98GLBO#yYPg(>%=EFI_Hmq?^T1tzPv
zHGVBrkD43M=vt019uHy4)sjDLo6g3_+IT#RVD~Qi@y7l<Eyes-g}cL5=EKI`k(KGE
zz>FYia|&)o_McoFyS!#vtZnQ+w@Z+=$vnR<ReOKwPF`8E{;@TlI8?cP(tIVc<a2}B
zDbQf2Jq0l|X8x5@*QdmY(OQqI44!=EJ%S>9sd75`!~dH38$3$QZFo4*j<or`JN_>E
zu|wDa#eVt`npWReAysbNOi;zWp*kC%A1C&~HN&zb`xF!sQJ2e>l|~a|TVq1pg~a$S
zf20)1G<8ID&Om9t8{_Rx+#_cntTnoa9^5o|hvMHjG<&*tRU@}Dx30qi>6H?DMfSxn
zOrk)=px(=Hs|7oc8rw4Kzgv1ca>aezg$a9o8VC#1H7D*-(E#^QWTM;$bA`a&5gr<)
z+0s?r8zT>|Jfv1@nEGLEnML-gamL09>ArvGhTc~ijper+)-ghs!@ffAGRmJf!yU|{
zpB!1PA1NPV**S(M?+Luqf0KC$wbg(+eo20`0;72@T$9&RQ-2qDs8Y%_Unb14v{ZQ$
zmBXjbDQYe<71GcjTs`9di03~AOhgaGo%<d1U7W;F%+DW3I5>9{=lve4XL{=T&pmod
z9Qn}jrjA>`qf%2U*hCk;pUVhXt#zS=1wNv^#JtcN6+oS^@1)Cri^m)u<ynKYBOBEE
zx`}k(4I%AmBCnR+!KR0brSe|&8?&{g0}FU-EtwF`zWd9qi7Cz`jkmH8Wf0T&c<L;x
z4}sz3=aN56Bv^+lOFvE?G`wNCv|y(MU<C417YXvH{L)S+rR7Ep8gBF*E_qeo=e2g>
zGY>mqPK_}Y`2!*ug|UqdRa~WY03VmGov?1_(y<t<LOt?)wks2&L#BLRW=SI*lOw}~
zR<Qe~;4oOROKHmaTY!kPD6`&uezOPpIU;aLWlvNA@0v8^on2Q%9=lhjxE7S2#{xcX
zQp?m%BuB36l5%AtGR$VbPMXO&=EV(|xylialevmTO6b|dcj2^Z7*`)T#70!ajQhsE
zC&J%*2i(t<8i?<5J;aig6iRE3yh%uj{?2!-iiO`^w8Wn0zG5CXwsZ=32|Aw9U#MH$
z%9ArUa2&sK9$C4_sQ1nNM8mcwS~i7T$EEId@(>Y|Gxz#6<TRbs3V{22mAcfj9`Ys5
zWi~ve@a=9s>S?})0WYM1kUsm3{+Hjo53#aCz0J!N8K)plEiC|IE6bfy?pmmfdyiwJ
zF@0QpJ4wWa+<6g$Cy*PQebn2Vsn~lw3{i@=3qS9su$*>@Us;D(uhm))<Z&DX{CG2j
zKU2TUn?rM!!q{Dbrrvn=%z_qLDkbX}$H-cpr6-)l9Tp3p=64E$7!THVub5@ua{sDM
zl&R0!^DwC6?3YtrCs4TMPQNVn)gYIJSU=Xc$@FiaoX~JT*{-vJ%D)uAveY7O%%yFC
zqjhx^qO*HlN?WPlV9_R^fvP7UB?3eRKK8uNVnLr=jAvqrE}7KZc^wgm;cLRd-18Pg
zcIG%w!Q)&1d_ZoJM^3LOrHS%{3lQIr)Qrz?oA@5wo@ct-xmewH5q&;Y$KtMXIc0i&
zCU;>}x|cK?MYP`Y_R#%UL;XIcPcR)J9L7+ZO=~0C?o}^lZfKH@YJ=f*gwWXCx0UkF
z)*}ThscY*y1eib_-1yw30G*GYu9-FIXZR~F@i(Lt#tLRI)U-F8DKt5=cYuw(3o(Cp
z!foqo4!ZO|?Cva_Nby(RUo4J))=XD7y}+R=NFS7Y5_~z7T5}=1hMqd#BIdm&*7-gM
zcLZh=(auHHTWnN9rnX@V4gyjXHLH(_`zdNG?=`FFtH$%pi|zoPA!20CSs$UI=RcBg
z#PbsJ_WTXhC7modu8g-FvoaWFeK(4OMLd@!c{@<nEsL3fs28r{>4k}~`2t{yCc+lD
z{=FbL4gdER2{0V^*D)}dKt|Kn1k_-+%nE=f*?%v8%=e~)UJ%dn{FgO>9E%vzy_5}e
z6}CAff|YuAWdc=iN)ZlL4Q6{RxFdcM$cccG_uuMUVgIAQBvwC@bfFK3bvri}fagBl
z+&KZHOu_2ap#i5g3s|a6vznxiWr5j^+TKP9;-$1Ap|<!EGl=c1-}%^W)T99mtl(!)
z1P5uah)gX-In*egl}lf^r<P)a78vhWy<>Ibh>C|8bks8npB<qQCRb|T8OO0{uEWLT
zE~dDLT-j5gajEltZZ#4`L{@ZqFY(LOJ^Xj;spAv~WF+m0;Kd(A*r;O>pQy#J#9AXV
zaB%h{ZGM>}9iRuXF|BN|?(|?V{rGdjKUWivH~E8)e<ICt+}wAbr8d9AadH_6Bjf)h
zKx{*^V!GT5m~uGJcFWzQY5rFL;-VPfc8pOWc$8dAp7u@b*xZ=KOH^C57_@S1sA6I7
zR8YN&q%&od%Y-O6^Bxi?kslu6h3UAPmmunDM6t~ZME^PSGfA|Wlw17AtCB&z`wiDz
zs}oC#JL@SD_c!3jCJ2g<7k@~yF&!6G0KO!Al4*cjifyQ{P<%<+5ldPwvW>EU4;kmr
zW65&$U;9j*k9ly*td&6H(KM`dTyT}cB7KUE{sRtfP#vRo-Na8GQk<{$X$P)xZc`KS
z{vRB>PrAS9A3cLPTxq`>U1{PS!^0En7GJ>VRp*KtTbp}#_u-XOz?f;Q<52%HM4~Zx
z$Y&u<&!T}N{k?`5%!}6MlRdZ3y}r(U5AM8Q1ch_wZtqF#rkWZ!#icP<4^#83PuHX^
z&U@|{%wwn<H(6E_^sj~h{j(Vzg3_Val-CQu<`HJLD_AF)^Ns!D;Jx^_2N`vb>CN^;
zirU>PN<J}qy+xFIy?v0Se8bubwUrrX=vL9|G}ZLexL_bjD9eMJ3&-*D&ayt|k(xPw
z@4}|HkM~82#me{b_XCae6k_`|t&b@Ps7X&hk28(Q{lA4p&(4MvXnc4fcnX9d_Klj`
zzeMkpHyb4xlNEg-H0tpEt;Nimz}$}e%cII2TI$TDj_*ac8%FqT?xs9Dq9o8X-u8aO
zTSgSgmR91ve#>OKxY3lq9QM;;sOGZQ*u}w@FVMGNt2Zm99fc5RYKpIWI~uv&`)JVr
zOZgCG&WnRjetM_->`rFc+kiUmul?yy!ki!QV{tGVrP_de?PwRb+3tFND<_qG7U1ZW
z8se=~lRBtXGNrR%9NYYH1V;9@;-dYISSjbkBOb=I*wVc+M0s^(eZH}MLiBvxOQ$&I
z&Yj0dlhVtrfzNohOzR6H<lu2a$=1~A?92{o=?X7|+?f%F(*Y1gh|!&*`1mUl{Z{cu
zm1vmeM2cen15HO75!q9aj)mW>tJkv?sk!RNxa4R4!#IrJ9^eMc>!d;g&VTrF&>W<0
zJl>?3+Xo9=t{Pmr*<8Z>mO8U2eRz^qM(DdMr|ym5jQFI_bHBvJz>D8x{)7}6Or-ue
z|JE5}YLv-H)_32B!|R*aTE*LoamOhBa)8a4>}oj$SEv;SwCyZ;PQh1QOu2wUE<eM4
z3jty81>HT1UG%`^vVThjjmkzAgdM5FWFISuOoW`0pn=#I&d|NkbK;CB^j%+vx~#wV
zmNXtT&O~5xfYWsY=Fgs@DGXsgZY=+%pyx_yo@`j}9F>{WOIB)A9$tCM7<rC1_}uTJ
zu5fM`e<@cebxv_7Hd$TMN--<&)#0{2)z00JIw?sTgdcdy9iaf@>XvvcWaA;NO2EuP
z^aT@X{-sMDGHpCq<Xb(Oz^5Up0~)-jxJXdEcv;2pO<qqOCU~2a$QYF4GZ)}8^s6MT
zdU~~J(Xk{~csfv(NcK=&ko+8HCzwuv7%v3jKDbip<$skJ$Jm1i2VIO9)ytS=xMCV`
zw+iJKBk{wEwelnJJk;5DSTYsiYq)$8q%SV&UTzZ*>$HHFbfn&DXHF6~#$@EXc$XRN
zeBCehQU?n?34%JC4h_Wqeo98dH*u5mvI7dB`^ki^i;$2yQPxRE_UKLu3_{9RmNZqZ
z4wnP#tO&!5tn~ZtPo5DdAIWhJDRxY*c5Ku;Vi8y4qz#xeYw(?O5Y6=j&I1_AYxg9!
z8m16=bCs*T1>0~e53%LhH+oWeJ1WX|o&u+MTixc6U4!&Z8jouuM1=XY0`};>?SR$~
z7MS^xnVjKG?dPn!DWnrA8Cw%Zb*JO?Xd&DC&RPP_vfuTl)NC+)PZ5x_=k6KupI3y#
z?ob?)$w+=G=4BweXCCT@trWq~xTPYn)y{OUUOJT5$@y^C{Tf)%jeq7Ma@*8FWbYt1
z6=5#67HkcfW)_|T>bUq)Xk;L_r~R7i!sE#Vj+Md!g!#+ST0-=T!$E?Vwc=pp+%|!#
zvfYnCIlAPvCny_pKXzwcCgY+v7o{-mN&Qm*UiSQ#U6D+18TL_+{}T>28$kxt29#GI
z#;U4f6CnQzNDr?-<P`tof%iY}h2wb}N3P;oSo#3B)jKSFK0av$q7`o{z%wXuC;*?m
z|7^@g+MEpNiv&P)yWJe(v_MtCW?ove2@Su%W709f1#akbs_-O(WIPO_hUn<#O1VJf
zgdyhcE`coKs5MDP0mh`(@!cXBH1LiDrdHxf1L1;rJ7=#qeGRa^u`R=z^kV^Hr_gg`
z%!E?9N6-4*^Z%_tlY|#Z(nm3g&Z6OKxm&#tGG1fEkyqc{o=D@0Pq$8Np;6@Dqym*R
ztuotp@~Yx~EyLfxHGo;SauQ(W5f<4N@n4&O-eQHLlJYXihCgexi70zV5|JO*DGo+n
z&>I4)Vo_xjzdcgX$Rl_Hzcdz~ErWyU{+p6DUu?%9F;nq_hln&ZihfcKBwabyToYCy
zrhDgWZTznsErV2{`~HxhRy)u&D|Ndtrq=`nO(ebTZ0CRN6DYa#Jsc0BoR5o3a)8!7
z2*93#@0$>nknaQ$?i)fty}VUVphPT9;rTeyy#R-<u0whN#7KQLMDmu<k7V%r0*TkD
zUUmhRB|uyZUSG`sweR6B#FcUVb{n1S9zmz0U}ziiFpymxz0YZ5UB@<DWmn2^`)`vc
zsGSmMtT{NFBE!GMtkW`9`_)@|q*MBW>tK?OjGR!O^{^4gET5UrctEB;b?pbiw?>J@
z4yNK)_#<>Z6Vr-+eB$!n%FV?Y?y2nmR)BFYtFk@TdXDb?JE+8BE8Q>uX|VnJ^Uppk
zW*ujIIWLgaMNbU5q{J1w7%}N@;5gYyA*C`EWdWx^EPe9Kha~*@z4g!~6O$J-Zl*I2
z7U?w7_w&9blexuMd{U|#`naoyJ8_Dz>T=Q3`qu<xczB~)L_3T7MW2W@Dzw9$QDKkP
z#3+V}yG+jHcZ|6rGPmxdap?(Sgvc%)=Yq>i+4i&_xF;kOySN;24KvZ*X)nosjsL0V
zyR<xX+Rl`|sZU$Np2iBz*Wn|rkZZmbw3Vfd^{O`@L<(Q&?xPtu_t(x|H<Sfxvvd+;
zE%{Y0{JiPfxnyiDnzZw!JZ4;}F05<**8%>-oiy|wpHN4=?35U5bZ0s<A-kCj*%hlj
zz+Wq1_AiV*<Y687tHsIEGN4p;S^Q%k*Ben}!ca!{(5%t3QWX^Ck92!b;p+PQO`ms4
zXWyK=*y?)m9z}-zs+deK^Egvy(1FSRE%$aAV&A*rO^=NE4eR-e%aa-{A{o?v*Ci<W
znmQ)iXc|w!Ll#h%E1#>Qw$rI%Yq@<2yqDos-zL@hu8q6i7dr*k9)hN(@20UxCzEbk
z3HZ~5%AJT#o;Z7Quaz)9e%r~{ua}Z9DLx;UOwc@tjHI>*9Jj5GFB@NQl6<JQ`RY4W
z%J11r#UrrF(ZLD*Yf218O@VAGg1Vgh;e&~AnKx^XWe<`hreU0+DXQ_s?HW%xb%nTR
z9yaSzeS%3AJMjB+{vlADZQS9xQ@FXBlc|sSv%>#MK=IWZ!k0&BKh`=tA5a(daBLGT
zU?p2AUP-#P(+#z)6ZXc_Ky|C(QEQOg;@EW+SLPoMpX-WR>Mq8OnH4}bT&eBv`v)Dn
z@aK*y)Z~xR@F)!@yQ@}Nv$Jk`x*?Y^Qwp%kJo^amnA}sqvq2fgy|iLXEwZa8qc|>g
z`2j~;S9{#{D1qjdriJ#ZyMLzqHCg#u6iH2}pS_}ax^n&~9Ce5N6ui+V*Lgaj+a+}0
zQ1)ZBdwM^fZFb98&Mh^WC$r8s{5QeFM=HC*kK?X*tn&jvL@HKvY?}(!+9>lop<yCP
zR+k@(T>ccilnmSyAU^h|bD0p6dm!0`x}P8Me9w)aR(4h3>o<q+!tdBBGmu>}vA^jR
zVEWBjT~<|ZLs(!+W5UIPueg~m%%4%95G)=K4#*ea2=w22OCTq|yH1;zXd^`6j-w*C
zjl$V|tNH|Zqu<98h=NkJYKq4X^_NvoK`M}&9o&CBbwt<fY)G#0vW&5E!_DpjqQnq9
z$_+!`y+2X>L;=PUpA+bEBA}KG^2>Yg<ftrV;ovGXpR$rKnE=tvuK}%`AXuXUqEn);
z$)nvjU4<C(i9MLmi6|mj2d<@OK^GMX{0c5>k|JFIUI+`Paqkc)hQ2MGc?vg4X543;
zOrz5Qy0!PjU*30Q?m)xgU&V5ScOhz?m+ZbRBr~!UKyVQehC+KSM>tp#n?@fH>1+Pf
zwxs|b=m{5%fXOGP;0r`gW%K8L?7#YGybgN=@&>v<XVS|W$KQ{51|$jH8H!Q?IM)PF
zeA&R|5DRx-fhZyBoIL^}87LFTs3=w;iVG}YnjHPFv9-7k5LE!BX^-$c@ZxMxem{hh
zK)#?qk44}BG8tsB`ZYmx==-Y>V~*f|o@kTwzb9q#DQr8RVH!)8=rV_N!}Df+m?Pn(
zx|l!@k?d;f@KXXgq7T^WyWiWW)69k`+s<LR53ulf??_exMOlqSueWACfvSvk`o9`v
zz!WUH8K<{bAU3Y>1%U_;W|CbNt(Asw)6v4w1}vF8G6Xk0p^m^OEHGF5v1zhQZJ*<r
zA^e%#@3Y+TGz~w|u#7%Qscdg7*(s>YhqNeE)@T8gPGzWF!MaqTjz#7LjIGgg)BNRM
zfmkkx2h!03d!uZBHcL{9oUEOoqK7fY!u90aMcjq4h^2b@z@CO*aJ-O?jSCF13bA9V
zUeiQy43q=2EXCB?w*o{2oe4mPBK~y`3TSBuXMtKdQ20#>sXRpIoF~djpk#^;G5dps
zEvlDD%dbPU!H5bLkepRV-3QRS<Uu7*B7uv<$~}mVRw$#Pg@8K$vNWeHhV+AY`Ggcr
zCOn`dpir6N-7K)sam&U!p`{7T*dkuKX3fT&44tMJ$NmZ~7$sq#Vm`><i$%<xj8^kE
z<n>+{S2?ByVk7I1)%?6WVr&u)xPaM{m9V(&&5*aJAY>U<^8H;+f?xcDwCx&Tbe*if
zDMUC-PWK*iApgwRr!+91LgZ%geYsg3RU$phX8habV*SaZ_zkQ2aN+D~+501>fKr7(
zfrIze<g`y~UcBXcB#`<8zX_51NnYj7nG0T9CH;T9M1{{an!)Qn=icPKlRpK~I~Z|5
ztg863_MmTgK52#CDm5YDSIX|81>-Z;jd(TsT6>enlcyk7pbKNVMauFjj!S}`KVCl1
zAziy*B~8`Hpjk*np1Trp9htj7=JPdca=m=&?&d=6<_g5~GDE?vYfE!^H=&X0NAi+F
zlJyPUWUDKIH~9#e$>4{HmTeO4%{%K*2dA|TVjL41&$d?MBjRZPlWnlt;V!$t4LM~n
zT_dCLwe72{-tS5Hh6R6byLPfad&zs%W7z^p_Kl!@<|+L~Umxs-x=A&;X0uWx<Z0{B
z-|$!AN{8Z6m0tZRXmL<^jHLCl_dD0!lvp*G!FB{Xa0vTh3lhwKd^dkv=7NEHHhotq
z7G+T8HE^~Nd%v1{Ax#|&OUlDe0sItDG2~yK;1oVL)1c%o>0Y4Hxe7(M50?&YJ`R_f
z8xgqA|I1TSBK;5I0~&TXl^TUKeih>1519+UwO%2zL2bVX%qnfyUf3BL;hrh>MsFQt
zcK`b1cQhKG(f889K>E8&rn9nydVuLEC}lJ~(STStO5fSuQKe+u(asdkJO#^=b1X2a
zn-y@8@QrJC;_wqUFd|eqMC`Yh38`}0NO%B4K)k;wM}Ec0&j_CbqF_`JpPkgc!=%&4
zd{HI`-uxrhPSOq?2OenOm|_(2;)*VdnGu#rKPERh1?32tnUntdlAuo4L=Kn}Zg;a!
z0D0r*lxUXJg;}RSHs6GwB$aO}yMAwF`7BdQ4<>QV*^^_VM@OcDY<;RILcUKbtw_Fm
zM8|)$7lTqJ(D{3Y`JfA?hWvy}u=BB&_@?VYa+0|lRib&VoxKxLN~UcrFseUE+e*F-
z?}|8+F5L4&)NPyjS42Cjq^V?{d!*-gdG6$JuH@r=_LeMz<b#3{)9M^MYf1k0d>rhB
zYhaf!j<=OVrQ#~$N3>}nkv#f$=-?(hJz4E+3uo?1&<2SEA(r&twC~+iL<=0B3VdYE
z!)!@C&hXOlJkB1ZpStuaAxm)Jqz|IA!uKftbkJ3;4y1{Ni1LsLPwD5V2S!P*_+DWo
zf4dG`sDX^Cquc8!E<Ak|V*VIHk>*yDrZbn<Hf;gRlh5rL;E_#>kmU>4Ov>QcrS^Nk
zE<4Sq`3oU!|7~Tc<B^6ZYnM7l$-yw=rOP54Lmu)y9(Ti#l4VN63uW+j@*?5Ht0lg}
z*^c}V_GaUAHk|b+ZyFIIJybJ~p2F)MJi#lL&PS%7^x&n>j`u&vMTd!U-x-VB69*yf
zy)8^K-(Z1U_%k;3nI9jzc48DaFjSyg%J0s=7z@qxhNSY|3Uqru+4bJ<+qZdRqZi|I
zdQ(#1-CU>OeZxsMO!!rBGdgR`_z;92J!M4Y2;ECc)vJKV=TdwNSUh+93xe<QD{CGx
zLR5kW0Xd6!GFkWqbkH9n+(_!V;>Xw$DPR*<#W$f;4h(lby?u&IlkWp&N;Ig$c0ZqL
z@Mp<Q#fo$ivH@bEDFK@hEY}l-<~~6{j0Zuo{Ee=A_8>?L%`1EgK9~SqeXHf50)V?p
zAd^!>!}3M`O>w>yPc8=|xod|GFH5W&UP#(B<mf4&arm<hQJFP%H5UN|GG5zQI|6tf
z>V3ijC~W^tsN(q9xkEsX71d$kw|B>X5y)g2)aX0#94)X>Ji}Ey5BDgZeTC$z1R%?c
zgMCM0;V1&Y<6w$^iEx)>5=Lq<LUc5m*<kIE2xlS3GcR4r2EVfT-eVCRszmra5kXTP
z`3h(VqcU3wu-8;2@6d3?@IsH*B=*x*Uc`$SP}3;f!~&wsLIewpjV>S=c=rG24lvm|
z#H1&gnVwBV-VIUR^BclTbBbCW@1QQKg%T*7Mpf9Or8RF7$rR0Rp<a<Va%Gm=*4Nn(
zL_fPa7pOVBk_^g7G0I=c)u!mnK*NO!|8=~wG74sasR}+~7F47+#v-Y!Ne4={pEfDE
zyVEd$B;lc~Zk|aURqASCY&OhG<o)m+vgodVwb847-;J6V7n}%~m}8+Bh*6wZ>UntU
zsRGS2NmFK@kX8cuG!=OJc+7;5E_wKi1?HxGjzff19Fz8Mo$Xzmv=F%%Liq$SiWkiK
zxN#;gWv>t5?Cm}==*xZjeWe{Pu)A0pn5Et5P>7Y~^^w+RC`I}8;CUn;YbD)Q<{g<P
zBBdnt7pxo)HxytD;qeRfbqX+aRCG#8Sl1$+;kdvtE3^P;i*vKU<c;1&mx|!geZpCa
zjzpv_0d<Dzr>Q%{uGNWNBF8gapo@&Hh9QJ&*Xy~!hc_7%n-KkODC519y>;l0acjqS
zR>!z%%qwv5cWBm*l6IUdM9t-uTmM(RLuU_#c}Sp4ddso)q1yUL<tP<+N<Z*>HP%oa
z(UqQ~Rlh!0h%i=Eab>}+vy9LA2kZwOBx^}4=19Hw3=%)6O$k`kZaD>q>7#i02VPyF
z%ysI_Us+(WycXvA`AYfj8<q63aZcGVT|GOVw^06?Di&c`$<X7k7XWdOg}(1$<6iP~
z<E4g)Xg+K%XJ<{tRN%r03bcHuz*bncd4?zdB)H8yC@AK--@Mdrp)y)z5?Q+K{Q`^J
zUR4a^e>b|8!_8sGrO^||*mblF<8O=QAL&@-PQ96ySs!;4@)lP~UB$KArt~i8+B(9O
zKboB56hz)7>-}EMYmWYO10n3;p&lM`G@7wtQ_=Lmv{3cGvGpe4P`!U2|9xh&jeTE2
zsK&m{*HV_FY{@c02^Coy${wLG$dc@9sW^pbp)6%dNwSkkT5Sm-TiJL2<NN%c|Mfio
z|8rd~#x--sJ?Gq?&-?X0?)&pex@%~%17yI&*>`>&qMw2V!UKbT-WL0#MR*{~wDowo
z_-%h^W+>D3j_{#QFR{Bo!>)f&MdCMsVm}-FZrkK*0rn~R!N)V)mmhX=IV=)QoHyEy
zAMi^i9Xgh6bJ}k3YQ%gulPSAdr}8=-JG(fb(~6b)@X&j0L_v4;`3`6)#ypE}A2Z5+
zIQ&XMQgYs@ew~7^k^C})>^-nBeCAJo@C_7DM$rLc4@Z}5eaO7l;q&o4)YXzbzkc;i
zlrdYH?y3oEZC&j@CH<PCH}9vGCEIpsA303=XU|^deD^PW+{6_6z)ju5F*M=gGZ%Ev
zGr7xeKJyw?Pt`zEP<mbujb8eiR2#o9(mp8g=^;}CwotzU|5Zz$XL~%P;{uJ&cLNhf
zbeJ@R(W}lfw8G`EjW}u^qO(PBht2S_@JfCvbdmn&d4<=~b(?x6ytv59_oD`i=hj3<
zy4ttx{nzPu(pdLhDRmvV?X7EzC>j?E-d?$?!X}+Xf($vJbWJ(tK=rmY^pN$zy?`QB
z9NW#eG{d0fF3f?Ci@~D({N?KV*4~{|juE}%4?9fCnKi{V*iK7aJuiKr(`bd}$UbJu
zR3zltvsR&VTS>&T(J*uejO8tm86WS9jTyUs>*CB2(!k9C4&lEio3Op-mpz|^PsUaK
zMI2o7tE!WCfM^J4ds)@<;9Bd77cXVT+2e6KooE<t2eR7R2akA<{{E$*#@aoq-uiW;
zdTt3}FnZ9xRzCe{aT#in+wfm(j|VQF4?e7MJ$B5#s_)L*Bjej^9-y<f{^j*IxlNMi
zGzUuyw%t<N&;1n$e$4gQ&`)!B<H$?^*N2<q_-B3vJ_f-3`_yH%h8^IGf2(-NMQ?L5
zzOm&-siN-Xt#p^h?V2Q=N(VU)gGcUVVJp-8$~wL`f=@c?)N#Tbg@ZRGZXP>-MJieH
zV7d@zTF7}pgzY>f>-~xEo@3W4h@pddE3F0io0Z2Hy#C?A3XXR$EQMgkSf*s{)s$NT
zrQYktCU<g?1SaIqI_`j@&)1TsRh{$h@j#CD4(|`^FVkkm#|_AgnV0(NbaPtmy@g#Z
z{vymh?%9v7c3pdS^H2m2v9tQ9*85llVX@>UiZ8rO(y2iRN0ws)PM&_5d}3scPDr2R
zFO1UAUod=gIV!o7#FBYNohB0_rihC|om3CMkI3o1<nuo43y8i#wx6=_%&oFqL6X2w
zg^PF4>AnXx*%%s+5qFZM%0U<PMTEIC?nt!jWWxDEpnU1&lgL2!RStxq+w1S^pZTIR
zI;Q0PV2n-6>+rk4Si#N|rMuMW<1|UvDnZ4-vy(aC+N<n>2Q)c-&&bVc!SOrjHFm#c
z^ZKOTQWGGXJPGe@-T|}mz{jtJ<-*!uG}~`@#r?!@HUXtZS+;X=VG=aiSC5^g-qrt+
z0f|}vh${$e2!X^XMVls|zFRRt^H|a?gyGhHY?cQ|s1Pln17tTX9&Dc0xQGh$ywyui
zn6tGwKZy#_{w+$QfgUCz1l$n}jhKr1tSOic!HEk2ZwZ<RbMAebsM0|S6wwzC)S1Cy
zgpLh!L9m_ZsD0c8Lg<)aZ<rlp>X;A@tezXmqCA%v3s5g55|#lX_UH_6k|6!Zn@8Lc
zf>M%U>j9l=1S(0=vC09ohgOlwFoPA$f(}7jWE9iM@Ek}2VK7Posdcf;swg8c{FlQ!
zs!0a-X$Ou)*6&w0nxJC%N%o_=tNY9|AnAAuIi&^$Ivuyi44h*3I=44tZVw}ZXYwWq
z3p5WVeq2CU{`AW+OWr!=KcvaS=(7B`TYNr=O*O?(*917_ZVza#Wmh=smS6>PXs)ty
z9{xkS)v6!2h6lkjO+d$9BHvG`Z`J_laYD~J59d}RgsRpdh0uy7K(+s!en0pk@0L0R
z->M%MwQ|$B@6k5TI|8ZSZCuxCCENsd?GIKyx}7Y^nL{|bXP~n)|Gj5p(H<)1V}n%3
zM(g34?SFJTDUvG2x%{s0ec^W$&exX^oZInt5fLz^hRALQ%B2#^y2oLTmruKzsZh$b
z^Nn|i6rg{lwOh0jbh3pOLx1aDp{OQTo=qumq~lV%p2L!bK<5;naRWo9Cc^Zo5rk5q
zeYe}iN22;Exa$XVZDQw<!ybfVH-G+aQeCI3zUbL^TJ*h`BrZevcD2{yyYs8rl=#_}
z;270QQVu2r0rnCiXO!qm>8ha3!c(W2D-=NZO141vEAg@nPSu$9ybywI)j~-j7d&R)
zmlDnlJ{-)-^y~Ak{1N+LRp)F^1ZUd=cXejgECeg|<EE$XUEtDjK~Cjjis#A<+;*?3
zN)Af@wK$n~4`Ib+tq-kG9BR5ZD^gs-jL3|a`<P{!rURosA?NZ|=VaF@ID?A{evZ|)
zqa)roU!P+5jUq5re&_}n!K$|LKmKXGIr&?NU;Hn}bDIk#+CTckKldpc=*Au~c-z!m
z_aPv4!NFeZF2i?8&ibvzIw9<FhCg?oOxQBXce@=K*AG|BLB%=vl0jAb^X;Kk7S7d?
z)HMpf#EoNP)*gK4e^2MFbH&3RUngtl&)lne`64y&jvI9>xyY;lr8%d2_BLgI@ue<#
z=GS4ZI+iz^96!RW2{9IZ$9eHH@`dAfC&HJHOGAe)2wi=2WKvoB&02nzP0KG^3ZD#<
z<(*2s3~aLnnOM*E{1N=7<YTUK%v#InH^gAIPQPRah=q7&?0^~Ed><-!Ba1~oWfxDc
z8c}}!9Q^g6zAmvYJnwBH*2>7@LuFw4!Siua@#aHnjXR*6&Ofi%ePM*rBJ1P#-^#hU
zA(Gprx+Ow4jxaA6ekpauFKX;H5U)6_HhQ^Pn8)K#{+U5mO}UR-iZ+#lw+@YPz4Oz_
zU@Vf4x#M4D^}#D>2V~{dcyC^!tLD{IRWP(Wu?=rpnm&0zlQ$}qqr`e1oJrRl_!K@@
z$OHA*y63X@-X|EwXqq3js5B8?aOx5w6v|t`Jx<v!YAfFS4owo=Yf6ZMt9)K`I%nIJ
zP)_a3Z|lPJKOi0&6Co!q+g}KLBH%nuEC|c6RWK8cE|H0ixo{y<kZCOSPTm_!$67hY
ztEYsKy3=v_t3yHCo`(1C$sP2qS2^}ih6*2Wsn(-i37ZVwq+&{%Z+l4XKfSLYVR2r;
zT74`FmH70_PAY1Kd4Z|WJi~F{r8RfrE$5FXdZgSRTvI-vb0!$OwT?Ud;`6MInWa(J
zrn|(p78YjRkowTiZ)P~;m;Ab%Bium<1dIx0zH{t9D>o74)A_P&Dyb5DP2;_OHQ()b
zJL6zry><=?I?q47syj@bu~XRrikUjwQClOX%w=XQE&DGU)cyI|`ZMLN=2I^PebK-r
zUDD#AYJ`P5$mr}fuFv_{9{n946v+F*L|b9vp^i<P_(Hiv#|{X^8nYfFODiXeXWqbX
zY=)D`kn1IDw_tqIcHKYi(7NMCmW<IJ*GAqCuFVVsdA?$qkk7oQe4M(F>!LXu+$y<b
z2U4GE>Ck^3lU}*jd{|L;w<4>GLSfH$#l;}0qbfSfj4k8FuBqYvM349(*_QU@1|HD-
zsURZZC=sV9^00e%nRkCl!R<7G+o@9xEoC#X;I`}7#^yZvCWG+pqF+>u@ik+M?^kCT
zgas)0=-L;a8+OxahssCRDA*i<Y+{zW#}%FF<Sk4Dzl6J#!HJItZja3+gir9ixj@bK
zH>hJrEvZlQ$P!QFFP{NopTkHF!PF&7jX_o+2<xSr2~2V_9(NdkC8BK(?ofA<;R2_#
zn4%8}Dz~VE4rH+@zdgSu1d8QH`d*DP=njmmQ&iL<ds8HxB}J8l>wi{4Qp#N(4K5LH
zbT%m%3%_%znU;bUD=}0E|CSsyKhh=|#RKjC9MtSNGTvjr!+5PFsmy2xgom#$5)EIZ
zek7G8=hJcSPJUZFVV59@Zx&+vId%Z5^v<_}?e__wKJpjEhc2!=OUGIG%`|^Hiy(ws
z*OyR(p!IoC_ZC9n>Y9R?%Ia&WP@u*(_ZkHQsNj1j3CO(hV@1_l5W)Y?Wy?_0zw&&j
z1dyK=0&yt{HVXB8d%g_PI4}o=fY#fCsJ)fBLcy?+FnZG1Tq>mBs7=C98e&E0IDO*c
zcPhqU0iZrjl#vWL1RN9SSd5BDei#p6@(FW_g1KF#&Y<jf`18mr`wuEcLdqN!PbV3u
z+W8N{I04A0wNLTQ0ksu+D$%~lPgm(!sfq(P--i}ss`0|^XF^$liD$ud!4)Aui#gKT
zfUt0Ocy(OAk6yxHGw{!Lr%|ia770UMP-j=%Eu0jzmG%SL@0<~!(M-i;l&zVc^tpJM
z2NFQ=Qt68blT%F=c79}cRr2kx4=m@!eYd86M(_?E(@aS#6z<C*SZZ|hKysFHcTZb0
z10V0b)qN7^yStYnX-fCG*XVc!Uzp3lSMI==m-ZnFp|E7`4x_S5vUvuhjkTMT6m$Ml
z9_YAijr=KEoTt=?Bq1W3YxzU^l?qk%VTlMHZ$+I?5tXDfxs}9+)hR0e@xbQ0E%pt<
z#MtRryiUjImBCQ|D+8b@sp7}T1D+I@BK|obP2*D|;r%eo`R<9p-I^wFOex8r{RQI^
z!o>An+OspYT^(Anumi=yy%b#gaCTIrt_;xgF>XL1OGmH4k+MMnrYUzG&zg6AryWSz
zHqaniub+>CS>&g>gl5Aw|H7QF%526{zed2kUk{ctjV$m$QjGocMjtmx7|;1=$F^5j
zM$m^$I0y3iKeHt0+$pzqMJ<%TnUJdfLRTj-EiZ@U_q2UV$4HFvEbO&5s|eHa5z33P
z-W1)}>g?Sm7^d%^$FRq+`a?tJMx((9^Pe*wd@i9`(=*!>TH!<cBeIb%1rfItJUKJB
z*CQ&`HyLKPGiGHuD~0e=d@(<d8ESLc^w+P@3xv{-I6wZ1Sx%ojJ7?dPx@HB<2PG|i
zY^#rvz4zO?MSNZ5=Z)xixB0QmL4na6sMkEwEOu*d2iS;<Z+O0R?tFG_2UMR9FTsig
z;1BC`?fX=-xKO1yfd{tLpFWQgURB1A)q2bQ9=b_peB}1QW$J>j*hU3m`vSbQFL{HX
zfqP(o_$#iec@O+U@hEfuc@O3AHzTRx_YlI-^Odd&@?!$qf(-K-WauRN7e2J+1q*~4
z0K3ZiUU`dk?amM9Hxdjm`(m5UNF**N9=@pDz_5pX*x>6azH@);uY2C(dp1bA4)h5c
z?|CkbmK=Iku4w=J;LNC(*TosH%xB-`5&6|~H2M?QkBwu@-&#Xrt2_%re7ZJKKAU>+
zIo7HC+3l_3&97~naog7T>-ZfI<5fVoVBZmLC354y_BCh=&B5Y#D{tP}x_vUmIdce`
z-0MbDeg8OEkg+N<Kr~-+-q+ai%N*G?tj)us*sNe%pCZv|_+5i`+rlZgL|CbH^E*vk
z5s}4?ooODjkzC4$dtc;KmN{K~I_uQ^xHft75(+7f9;En*u<do}m2jvImGhjRG;)c&
zwZf_xC0YANZDNe>974rBA8X3YmpoeBUwP+;nMYdsQok`me7Gch9h*Ge=Z*~*whKOw
zVn`EkzU}7IBVyDtz}c2OX6!2c!MRz=sQW>9F@jGsOv4|daQ6ce=E+6g6<#8k@ZTa~
zi~eli^?b5cb`1Z{<Z<;;MmL8YP{~T(e>$)6<hsF3zI_*N(4{7^Rnn_d>@M}0!>3;R
z)71-m^Xx0-rlBM<9Og{-&H0CwS-s4|PV36hJ4IU9&)2^+76lRY3G&psWQA^DfK6(u
zP2N~r%SW<<T(iB$daxDer=lc{A?aGBhWfwl;NjD*2WJj^PkQpjiaqlj$F$fPH9BMS
zhW4mP8}4thU|T<aZ>qh+^#l4Bt~({(&KmT|uLl%{<ADv}U?4JG|88GgTbeeL-8t2Q
z*FE3#-8yG?KyIGQ_-_oIaO1*jQR5!c#Un3UI)aZijtnMZIv-xDHEXldI%zvIMrzUf
zOxt_qG<MoQBW;w|p;<6kKI!g3icpGsj@gZ8>X$uI`F`K4_*f)s%+NonR@N=^wRPbw
z;*@;+>jVj_B2c>hfv6H(Hoj_ZRBuA?I8t!Nlb!ED{AoitB~tbK&FJ)_pPn7_5H9<&
zl5EVJX4}QZrzre)_3!716vbPTKMceEieO=4&9k~VRV_Kq?%h-<R=?^-+ZW3uRHZpe
z$43R;yBsXzyR=*3AaQmiKy2besfAnkUxdkgGBBD{w<I3{6R${19qObL*IP-L$`{Ql
zy1|^?`SBo1xEP{jX!HLCbnNG`-ube;Re-R3p1FK5UFZ!%7>^K6xAi4%?(2{t4;Yf;
zzHZ3>wKO~v=(iPNSH?D}f-(xZk5l&wt|0n;WP|X)V|nMOf+sJI)yIXAp#!&qZhWej
z0k->VE^n_?@j$W;rfgbwC|IGu6Jv(q-LHV5my1p>#C=Tpj2&(7f5fv3$OD1@7E&OB
z$|h=6|4<?3bqWS!05p`esZc*Bs>GGf@c=SUP=;B?qUdxCulS`dAQAO-0cLww6iEf0
zsdVhMh}cdl2HxF^e7doI3MPy?MH&EAk0i@C2=3HfHg+;}ur-Ys7DMBAx17)2t-O>t
zlCUJqJ_!@m%ALidV2<glBko<`pe{+on0*-LKS8>ycl~ej5tx|ikUUr#{{2iP=uM-x
zw7xY!n6fSeH;XuKpl5RbwXkXF^&OCik-7dWb}V3vByivO&iJhQqa6?pOq$x0)s!W6
zKoA9I_)SVMdSN<*jt?|S7>*#&1QT{^3+mz0U-UNn_S11O&7;aTW-VK}C=c{_+a{-r
zC4v*VpY7cm<3WNlOTwM=g}_{B&`?11>{Bfv@Qm-fspsh@Y^vXB3}x&SB{Mw{JZCib
zdigQV!7WC<GCDKgbT;XP<i6otiL}y>Qwi}nN|uyOe@V+d#MQSA!DFSELHPsT!`CAH
zVWRR#iZQ};&EvPaUnmtUa8zKE7(zgxa{?5xK*75^ON|)-DaGf{{7BGWv+K8Wg=qU-
z*!r&I#tzc<%KXte$QciuG4K79VdnM^DR2`oRa3%`2wV8V*uJu}*{OYGh^XT++qe4k
z=`hUf3Ny5|6cy3wSchor1uv_wbZmZgP>l6R-*X`CcJ34;T1UrSkbGLbf-rraY#7s9
zTtd%<p&{qZ(#w~`7ZF0t{8uHdB>{v*`HV&@gI92i%@!4!l#?>vpX|(?888F$<xs~e
zl%JG)iHyui?;3a=*;{)x#sx<yDgm5kD^9KBz0T+~tIqo84Vx8xxD00PyCB{nE;f6&
zXt$orU+M=)N~L_uuf7Bvw7-2{+3&t(U(oh_n&M<_V#zHX(>brMmB_O1VfV_V<3jsS
zWDnI{>zkXa80{YJp^^THQgqdgD^R)H^yKe@5y9pw{xC-{7jLW88U-iC*^6Fv6d_s4
zGALSILpDvoz4757oIkxXeR3o1(q@u@GC%h_mEc=1pGTVCDgJJ#tqj|KtLS~A$ll>Q
zmcFTS(RT+V`@{UESDY!I)h+|lICOLewAe-P%yKoK+p{<%pPk&_9v@zamDywRv+Zc&
zTqOH&j=;D@HyL_=#$zf#`g~c%`>=V#4|$sb4<R1aqss3;Ichd6BCf5!KDg*k@~K>!
z;`zG8NM<>{^m2mhEw7hXNyHvT!>z+s^nc{;vKZaU^jy+E*D)m6{V^Uh=B}k2%6+w<
zHMTCOd(@1NB~zjDhOxxJufbac9iu4kFTeWTA?rQLCk1NQKdv%%VcBK6)*X1o!@0yJ
zVGbqB)Vi=r@FQDH_K^<w@sp<T?ew6%f32VH*No&bSeU+AGs7JAd#3E$FQTsPWd8}(
zC00Lq$5da|o~NEMTI`!KBo@J^Y)K!YH*DT{D1YW?Sq#y8=+ZcBq#smNXL_|<R{Xu%
z*6`|b5#nL-pg$wFBfjUuORp<Y!eX0YwEg_YE|A>Ge|&@^B-H$jzC0jdy*|EETh1C6
zI{h>K+g@f}tq(qBsl^(-qwcp2^YTVAM|JPVgV9pU<8D~$IMOY4cW(+EgF^G8sxMY{
zYsZIP8iq6<6QK|W^B$~P^0I#FP1E(Ihh;4CJ-8#3mFMox#AOn3GIbo(M~>!zmfL5Z
zvy2^HsAgH<u3-35jL2En^cp^uqk<%jwnI1XFE8`Z(sVh`Oj5-oN(%J0--p{>X5pQ!
zGYBV}6IwS1Uov={WZ_G1Qg?r0#c@DDWCtu2SKG$yfV0_@D%mklO|5a=9$J~n_hX-H
zjKVeJ9EjrybX5=8yMzxX4n)0Awaxn{!Ya*w^83x_Tr6GEF11$`q$V`q>uz15J@v`C
z8XHh|6$3deX-vWG<HvJ8Yiebga;dOO`4}xB1hU#knOpyu-tjU2jZ?n(Bwx~VUM)yh
zdQEQ*ZtvVS;f2f@MBHe5Szi-$e$fPe%;?1fdc3f}!Y^6wBuIOAPha}BRLdOu?Rxpo
z5uAh<-dT+1?B~=e%JgsM{9LvbPd$qW5xnCsjt91Ql0ENSZIN7~D9^cue86)oiuOV$
z+fuCv`x#KN7C|%N`6#i!(|NZkglo!g{}MI?FD5<uhUi-zu2AeCzImz#^IF=eTs9z`
zS=HV0AROJdOp(F1th~qpCGzjmX=3i1cyO4F6_|-ADg<V3nv<Z(i=~0Ltp5R~<Yk6m
z-mMg9U%AZI`$Z`4zbg<DsE{6lE%{&ag_+f<1TMQfT`0x~17Qha2oS9VG|u)M;FG>v
zWv|#N2Uy$<5s3$W<yC@YAQ0;ebEZtf>?aL}qk*hpY(4}NIh7|2z(1+k#k+l)P0|l;
z#Dm*2oFgez!17D_TV@wHaEoj^sE+DfnA4q*yjD8S%xl75a2E)!UiK>DQV72b<kH@Z
zj~Wg9)<6g|sb5x7x##F~kSOJ>{CarnBg`EWKZ(gg!=2HkB4CV-3O)4K5|iFc1STcK
z&5DcZ^E?m_-LyzC3mrWpk`XquT$LZ52n?iD^nIq{LGIwB=ZDxVfjm2qHgr5|;5PG1
zfpJf8R;aQ(L65&{4vy2Um{o95G5;#xPf>Z*oUJA4w>dQf^VB^7$K(OIf&-d?xtapV
z4(BE5bbNMQaJGj*v*sMkJE}HKdsJIr<N>bzApz5L)Cbqac8hG0Ad@FBcLxRM=%vvG
z4sjhY0epvFsjxo>N9$C6B#5ja_^-_K^>Jk2naa@qZ5d&5Q?3+_z>QMyC#`Wjnm7tB
z#dUyEbN0v_%<rAL8GRlr<HNkz1oW1p<o23h_G}IrrC{4*UJM2cGy$uV0m6De=-7{)
zPS4bNAYoZq*DIHKz%Qr0YpZA^a2Ig4-uBbKTO*)*1ZL;>aZ$QDy>E`a7-1Y_MP^SN
z)<)IiO?h+8n@hTJ2xDs_k+ZuH7)$QmQ_x+7V$fmE`84fBAgo%YtN04oa+*f1cvn+!
zUUMSx@YlwVsED@qXu4@0NQc>yPDu)!5ElY>-K1i;1-@SKU8mp{EL0EUUfVwiTOX02
z$u@<OWe#h$6auP&j0x?<YHw0?e<kC?03MS@@9h0X);}XM)%6L2f)>T7pOhrMea~LO
zMS@sP_i+^73Ku0|`YeK!#9Ypcs136JBw;KcRqD&7HaC6>5o;{O2+S39-$|Cs{mnj)
zFsFUHpZLL8%EGcYjE7jtlfvlRLlcT0-K;*)L*u`2o(3%<3|@LG5eP8(HvBD|i-ghh
zRp=*2M=X&c=^)=uubSCpn9sAQERpDE#PjCPFW6=W%-w^9EEVGZUc3;TKYl1BcFRE7
zL*^7!_3xffZ>wt0FaD(UMxJJ)M&1<Z)SbGmxPT~}Sg`w=ncFP6Jzt(j@4--?&SV-V
zmd;ds>ByFxA6fedbv$yAPz$&)%f4rI6Xndb@tL~;2mE({+5PSO0C7Hf`LP2XxfmF=
z1GMqQE?}UL{BUn~N+)~3uZaE{kJ_RX33cg<{Is;h`iFKnQ!VXB4tMg8C_ZRAem8PV
z_55XTpU?BADebX1)t@Qc@})JhkjQYvZ27}&YeMAUR|{{xjkgI5HVa83=-Bth|7x(j
zdOLUoDql?x3>p#KLxuJ~|5zZrITd#u9l*o9Ej$(a;O@)u+Wel!*0y7#*iD4xVd3u^
zo&2fFV*R&vK=Vz(s&%i|Oc!F(EH>Qpri{rdCf%GaAkvT#aRyQ&B6Pyttm~m+s$v=W
zTQ$7lroSQ_=;@6iF?R~1ntNmfRT6?&R;`{nP?JyRD3ZIlOH~(+a_T<Jr_j614%^<|
zav+|p&nj9fP&u{q@|L8{JmPSfGs$8Ewk;I#GndN#C3gik1+(Cvo!9|KlLEx1pRUsJ
zYx(p9%_AWqfif`>9yV1U|6zG`UpScA<wt778eR4H;P*M>6t4=EdWV=+GGqPz3ayTq
zkA-i#j|^?EJ-`Rg{qu5=t5g44AjN*c1AF*M)=5r%-JcFaGsfdJ>&HRNhtrv`rniB1
zv0#XRW5(NLW@zk%c~?`-x)mpfnH0Hf=9>R}_DEGBFuFvRb>PAH=iNDg75EW$iBNbY
zRBNarRV*VSNb`pfY~))cOlg&3P2loPLLt(nwFfZ1s$!tW<7_WgC@ZV9$X#0!5Gw=+
zXSE66)KwlUPZax^DfM<l3Mz=yDaUanD9Y!(PvNxqXOxZNU_AJ{E1m!=JVi0<)Lt?q
zUf0X8Ss4P{6uexa>;0j{7){3<3G6+=$vK$sXJmubO3&sFh-;aIxtlNE7dRGUIo+~J
z;wUURT)|Z6oiFwWAr9$Gq(2{G7>vl0tUPrNS1WtD+YVS20o^Z!Kz&0yeEiuC&`ksf
zzWTQ0RDuz=`a#Q8RNW__WbX>WJ48B8ML%Bm3l`>`_+JGSC{)n8yDav9msNlyXrj9-
zdi-*LDJ{$jX6M4LM1w;fRj9vuAh$>cjlxO2U@!wvaH*}_&w;t1t#23j=iZ6QCIEjZ
z58wf#DG$d}VLs?61CfeR_4>Ba3x++nKLLfw`%??@K<g+^KEo2in4<SGt=%8yyWA$K
z$);0B7nfk#x;;-OM$GhSaeUpJfZiU9W9U>b0mfg{$`v~cHYj*Cin+CuMF}u}@C(X3
zl--vKv($e7F&vvUI6#8N6iS+P)<e+5Z`T=evl|tLOE2UI&YGw|sq^zCwum;<{+W4B
z&BN%8<(=te>^X6iFg7<p#T0gxJfYo!1-AFX0%_k>?xjh-77wAT+`>Kw$B1*B)4Qb=
ztp?@FW^8G#qq!EtFps?e!XzG$oZd^v-c7dNB4JebFEvcTL|K?wt8spvj$OV(OrT%{
z1<g@Tz`*DwHwa{SK!x5*%(Lk%8-No;>&Sz2{DWII`B_?o?R^MK>ghgFHmkh15l}q6
z^P%vJKRqdiCfnhv{YaHSjE#cZZ?+*=5jyBDKmFkj1@~0$c&Q-Jxla?gZ*!#C>Wc^k
zmu8{Hql&TiX?!{kbKbc1`mgiLje!YFP-(tZ^*z=h_cvt7eFn*qXf2X*H8(mNf;-Q&
zziO-Rsn`ISSVjz7_;c%&_Q7AYz0~#>jD0ALJZdc(6YzF!0y^$el3Wk8n}EJ&!`aj-
zF%OV7cqkY;<)ZvLXe1t_dWs*)`~_9a=c0z)wqIt}W`Vz#f_JpWFz+rrm-9cy-|t7l
z%n$S*SZ|GD+oWLBzm+EWeFzie0nOz;u#wTa5Qucm-S>5vhDzN**@wdk_*5Dy5iPzv
zJ7C}2gk|5BahTE5`2dS}xAzg4HPJ14MfS%^6ENmUv#sh3two_msLC^T5rGbXpEm4$
z+ASk6AEw|pyf+Swto22RA>)n6aO@P!!3%!ep<vTa=L;Y>x4{rP_Q*j|CNUFGv1g{8
z{Z(Eufp);mZdvkXp8GQD7LU9Oxld!d-mDw1M6G^eUHwU_R_vcwwRy|j-sm(fHJ{k!
z(nQ|gNb872goR{i0L*v?IvJErC%30KVIk$!8z=Ole1EYULG^brWg_1<lg0xQvqJS<
z#OQQBQvXoN$Ju$wguL0=?E<>;q`SZPfXH#BCFXE6(a5W<iD<q^tr<xOSBAOj)Q79q
z{0vJPrd3xddszp|IK7nz)^<QvRQPr@Otq}3&pkhO&SHf_aUO9w>Z^GA7mcYXGjiP9
zVm2NmX^vm7YLS!-*{#Z1B6{qN%cb7?Rc;L(cd~R-5mSG6b#>L&87-~~u44=$+tv{2
zgCbA4fp|Z{9V3alZ-=K_(MmhO;k4%T?fOi}Pc{E7ds|4}AE^LDfpgMd_OaB99%p2b
zgqdmyjJ`bihb#C^cNc0ot-!)5V+ON;@zp)iz~l?x-~DiJX04;Bt{o^6%?}kWdvT@v
zj_1IE?ueNtagpqt0)`NBPt_LLblZWB8#(={eyo7Gjx$d_7Bw*(#~wc4Hu$s|U$E6{
zN-Drv?2E2GyMNx@zEm*Ga*d9={?LqbflpuVmeYJl0!8IoRcc4op}fCu#4^FrS3I74
zk5<pt9r0bK<24>Ma@EW7?>R)lch9g?I!fN6Id#7RETOXJj>NkC$U?3BqgGn71b0%f
z9Y}oeBK1bQ19x&Q!VLV(3J$9?x@2xJ3{yGXy}g#R7D_<Nz?+{pc?;6k*RuCnGOYMW
zLm?!E8;0}!rLD<WtiS{Ol^X+UhJmgsnUlTP#R5V=zPQREcBBn)R@gTrzBl>bMjDBp
z<EIzi+jMV`!BKop>G2;m(-=Cgj1VtJ^0os{=vjV!F5_D{K#wya@(BAQ3id`-)z&%>
zxZPc~wZQ|hs^>2{Ca>Uu`Lki(0@Af*84~7*IEoBq+lM1KOy4{mN`8tU#C5{|w=z0H
z!ThALKKRcUcj5o2nU0B;M@bEhMiN-ONP(iZhGDi7EJI{yzq7V6LQr{k<tI%-lA#2U
zq$t?BZ`xF_;Ih30R8aM}bs%7>6=7kLL3x+UjV4J=-AY7dp*26Xnu3wd9J4QShPiHK
z8LVZajvz|K@Y{P<V4i(;NGuLviabJ^VDF*ry>b}M+Nev$)IF=hJw#ZP9o|{YabSPr
zfrDZDn1B+Z?=N4W;Bvg^D@7%(OG<uTxo-~UZVM^j|B*Qz=K1g~XwSxOLntr#JmoR%
zmlW(M|7Gu2YhA!LtLNxmiU=+L-Xxr`CSP=2&qYIfLXZQ&Barn=M+!Dq_jU;|dj6Tl
zYyZg~X4okDLk2%=4E<wxz~Y^74g_<YT@pvZa`LWXXnV#wI9n%SPF4Pkxs@OmMR3Zg
zYJ^Gaq1w3n8!b9kb%E#`51v)|Pm{W8j3=lVsE5X*rin1t<^aEo^0BR=_i1uX2fpRS
zv~Pq*1Ff6yqT@M=?pdb7tVzc2oi$t+wZhJ1fVPt5QRLzkI<_P~$+9X?;F35Um#{Ch
zuEy=hWi2}1D9%V6V<3qdM)JsoxHtBhT>2rpXiP{Px^06aGxz&<n-KJ?OzUM!bt)ll
z<&#5|p51@YY-RF!1uH1H==~QVn0e9XZ=Jb=p74Dy&BLs3S-wnI+B`^+IQfy|v1;41
z6`e&WwHllR8*~-hGkSN+r*%-p^OsC=y(YGtoje9}8A%yLBz~C`->!tn(`gMaj9nZ=
z5{vxk5*1&`kAw!^<?m6A5sSvk{4_34+mDJC526*(@*Jp3rN(YfU<_2)hr4@d`{Nz$
z-El&|H&XMqbmG7lZ4@2$)Lmp^P5N<131JYpuhpnvv0?@eXA^7KUcRn`gyZ@$TbIcY
zhX!h$C#V1)fiOu*>4Z=S1Nq;SM9*hfY}g_Ow<;eW>dxij-s<EuW%j;5U|4-zY_Wh}
z;#9z~y;b8Z6NY05cEij?tp0h#)|>C)CLot-@uc`suc;k?-G9^L>@jVwix++K%yz&C
z>>*dHaA)dnm*}A^M8PtgJ(4MY(&B;9QUSlfy657NF&W>j&j_=)N8E@m^~Vl)4!4~>
zUav1RU(X<^om>JWr$W++g8kcPhhf{03zuCyeUca+#p9j2AM0#O+VpGlua|&R@v_1h
z5=O~~l2i`ojhQm2B^HeYE@Qvz>kh+E&*D3gPNPrt>&+>gI=3A)?d!sfHc3#-hkPlc
zP=W8hD{)=GMty}|gBh)Q?Wb!;FwgmgygJ4H36FWUP;zMWm^TZ1A>?Rg*vs)tkpBhm
z-!5QhX4urddG)l>>aUyZS3c|jImJ))Q%K8p2h3{!3TD&k5?>DAeg#aupNkiSUccUA
z6OQs|TVb%~E!TvNIo-}4j9RRj(xWF6PY#xyY(tpO*xfq(Zc2LHF|3kUYiE1X-%e6`
zk9qJGYF>UnGh~xH*X@jkXhCgOfRF98&5uwsa3U_+#|&7|A1)@7L9ai31PB3v*%LZH
zX?rB@BG4dB!bZ+F1)aUF5^+SWsa5vB2-7v8Fx}6(zeqssvr)m*bqZ$dwmC)Jq!+Yo
zcj`SieG*y>m9;r@vW``#f6+kjnOWn%nD%PZP`N($wY6P|5q)#^XYFk255g*e@S&6-
z@hu^muzZF7tuz~kkD6r2Ry70-((59dFLzrBzW5Os{+TB9_C)iMu-&rfP3gZhu@flH
zWnBqMt(O50|9=f90392FCKY@aPzXW@UR^+dKqFG1cwl<&KmW_n4K(Uhg;}Kn5!}DW
z>@Jy;{~yhfAQ|(iFDOKFxrD8vd6$aOlweaqk2{=R>(d_(ZVB-VfKXPTV$7>2KJt~0
z_h~ZML(}dhqaneSJyc99^_PQ)`U1izN*8t3jX+QqdlmiiA;Q!(Qt2viz8?ifcTFtY
zy_Q$NHqo>Hml|oH0w$(PMK{)&ya`w&LnYq9?w9V_GY`gYQaRFZ?oEYn%8CvcjljI6
zUTzT$0f!5GqhRhM{+`cjvVXI$QV0R9RgSJlD$6!r5A{T3MsB{0zY`J<q*9ca>mZmo
zI9LhBQr5RG0Sy1&-6rE2O@KI!zJNy-#V_CMw2>T;oT-xmsW`OOai`9~%*9E5C0)QU
zFs~TF8!68hRguA8UnRfc)&r;^@H&#v!S&(_YDOluyQ@`nK2D5?)3LqZEK(ZVy}eG*
z1eYbco=csWgNa$qRLzUdy%Y?*Jo|E=Wp39t8FIXr$hgsgW@H{C>?Qg66$d(|79Oz4
z*EJ_WmPJ*jj~^GI3~gFm=wkV$xC>~Rrd=(Ke#JOkkD}xmeHX1H67)9>*4y8|o=d_|
zXBD1EeaqFY4Yq>$T&^7ImGdPwemP`}Fw2$00~)$<WN<A%$y$184+;8k+JYS_*JhWX
z?YZsVCTD6I&WkX*oT6;5?cR`+pf;?1Nw)k<J77H1;d2?g77y~Kk0<ATH%)G(<D8CP
zybiG;e+cY5;0#SNex&sr!Fbv~3g+j#a<o~BBCs++<>YOD?*x7HIa}NAA5S=s(OX3D
zn^X)O<z_6tj4&XlfSlOWXPVUfk3e9ex8wnGjxnjlsyq~}`AL&0$|zScu4xG%Lo$5^
zYNp4-2sFWccm66&yRe&pNAJ?RfH)6WVr~>{K=6!u2u><$fw)D**pA-V4$5oTtz9qs
zKr`A^%n;StX5_}g>DJuNGc@+{v)zgB%Zba9y6rT+(+A=3z>*z+k=-UUMogFH3o38h
zl8HCEGNIF*48A$QqfJ62zdX+w=F9)2c)w+ig*}Xl>A6tBUN4|~Bp!dxzvNr(Ph*Gi
zZ)Qr*Zai^sjPPpQ#$?bky`KEC+K%ta9Xhc35tG<fd142oTzsTEB)KjGyVVtU&EK<}
z_1_{1v}po5?h<;kPt2fp!JH9c%Dha$ni~L(KQ~tY(+Yt1bnmFLSR!C~)iHmx<ugs*
zNb6a`Kb7aVMiHiuRxB;w=%FekjO`L5^Ti8(qwLG!ZzCA(js}})D$i{j0BdSlo%wxW
zypgZ_IU-}!HnU7POU#sln^`GbhDn%egr&^1_|etk_ajM*kZxZN7f296<JrqKefxAy
z1oNrz_^;bA9eXtD)l2qOR-kY9?v679nru!^!^@inKr^v)Xz5<~K+7rx&m{E8|9Rm>
zy7IHQ_^~nBZdiqiF=ALXjelM03v)`zSgentd3VrwYTO8g<crUuRysl%R_Pc+I_7e|
zn5hs*@4O!VX)PX2f_c<z-6^pJ1h0-SOR?Bwq+<jrOGkD<s1R@_>-$^_BSXCZM{k`R
z;6nyA2yXwsdt)io-GUJ~2^#l*ZgfMilrPLu83D8ICPN;O@!v;Q@75Od{IQ5I36XtM
z*C{x8?x)oV{^;F9qZItLTf$%I*c@`$eVS|~vF<4uNX_06MKkYy@$8~@D&|1+#}@`b
ziR&N*H+ku|CWN}{yLa4d+Cxd;f=h~5Vl+4rG>Fm{1&asT1u4bHTQD>M5_B*JJbTLZ
zt|8rDG*+7gMM?{*LrvhQS8`1r^^g%tRdSsIsq^DKG|2<x-H`$&9&oQ1Luojv+5H?C
z_A$2pSf_w;r9D(=ZNYftInexR^)VjA<umUttLE3D5UvG&Fpg;0XS|sR^t1?oIXwzy
zEK@}sq3$9(V4-4sXU{!z?Sph&o9{()muul~sF-P&gWJDGwlSM@NtNH4e5RFW&V<Vl
z^rZqMi9ra9WfylsdfC<$A&_DG<m=o_7e<PsQJn#*mxOs|J&!{x^P%i^gp;zBUO0|W
zl=_!r%vIXMh5oJdfs$09?EzWTB$stQu2V1?hcO+h&CbNYrDiI0qh1h0!`Ph|HVlmh
zO0x_M@xaH8S#uHw-y2g5fC-;YEW=PC&{4}_z?oR>r^zX)a?R#?Zx{z}7IQMi95`@6
zb>ouLDn&(75Qq01eCJ5V5Yki|WI{<$x1=${&6*Y;O@!bk<)zYyX7^{Q1{zy^PPIR2
zLXKH#2Yjtywo`G~t~iY)ge9xIZ(*#hVk>6jK?KjN{OBq5CSk=eHlty<HRp88xL%$Y
z8fgmO_m77)4xty#HB$PvpD{Yk_gCD4C5hU_7>2}=<}nF0W@!zAJkUWff{NdMxob2k
zG<k>()g^pEb%Ia#!SLE|Jm9V8_5N)0q5+FVgn`xYr*eeEYi;z?)@Cj|<&<T23~#1!
zK4<zC_^Mbpih_5`?N846`f%BKn+H1US2jWh)6&~$G{}q#k|A<n<e7A%)jJe?R8c>v
zl{93?0|}(fvtbXS@}ktMPCQ2RyOP=k2=*t${*I1Mn3FJSYMphbT6Ge_-_m4E?pZMY
z*8Pq!7GvJ|5X9F~x0uLK(A%eXUz><6JLKTVlhYRKP3Sbz_^L`;TMsX%3Ua$IB-g6%
z=HzABr)$5cfKT0MRo4<`{CxS?=lz?-7*&z>Cu-^%Gca?W$C+G56s&EoJXz@O#lkEv
zP#Eoimil0>;+sp+XmszcKiIE-LRU-tN&w=VSXj0Lvd%>?dOGcmU8!AwIfMlc9Zh~m
zQ6_ReDw;bvwt^6p11>&k&{#q63kn(MXGrKIOMF^t?c8a#*aQr#{KV=Pw)|mk`8CUT
zCOR2lq?j1~NbD{!RK#u#C$GQ=15=4=d)fK|%yr|2)r2lH?#RBbGF>_Q<X2d6nR!u3
zYtddv(w?UCSND$)c;xI8Hn~|0sXd$iH=*n%4aN`(=KpN^RSDc^#Q*merUQMKqzELa
zx(O&~AUHvUAx5$UC_o7AJ057@C1^sF<^MG9)fPMNNX0mjoWAft4k>0pI3C3wIlmuH
ziQw1^wQ&sUU7;~EK-Nn2{Z2b@^h50*Dl{E8k_z*FABY|JMH5PE6Kp`Qk#;VFpo|{+
zu5zYZsGelcaIg`^77^@K1(m#);ZJ$MuusQ)Cu-zQ^m&bXp>g_bKMfOvK*kKIIpBn6
zGYyhNhEexx(BaugjDm@M!iy-fDrI7SiO{h^YS`3x;KTzUnCU+)%Y0AlDF$3hI+ftZ
zaP1um=Ebr=U)~Xz^Ac)*R4^FsJP%ME^E1fS$@Y?V9Kr~ypNo`2=mfcRSIR+SYWoTu
zf7Dr7=Og;EtU=!DeKvo#BIaN|p+l`H`O=qAxl>I(L&dn!9zBi}WDoy~K*Q8O#**5M
zqZDxJCf;2|Hxm$D=eL((bO6gWT!(E&jt|`Qg;`@J^M`4YXh;{eRhz#HBQrkOo0_q9
zer%Q%%gOayB$Hu~COHTlz=@&w)>)_`As$MFB&!+Ct(A0MQ890nJF5k}oxh;O`qnTF
zwELh+7NKMkSr8H)fiSA=_ZcN7<rf0kBL@}54sQ6voXulWt<GXSG&!jxwwZ?Hhr0mv
zY`)P4F{!@j6TZI47*W7UOC!=WoF?JsNBJVn{TsgP6nwBGb$tb4Xcl)JEw3s@SQ+^)
zURzL2Z3!QTub=oQ@mOoUf^W5N6w05U1FKkS)yMZFf)jiveTGMTGspK#2y&mPy#B(t
zHzi1866Sc4hIc#t^5{nWmIt_X{IhGTu<%DR7>lv(ZrdyQ5gn~s&yiN6GD{fScW}S6
ztc2)b286l)M?j!p8qMifl$^)<6@)98L8R>&Inl>cFlUSejUxgEZ_sI*f3=Q_1l@Pf
zE=bT70zTDu*q0L5=vdzC7jr-wjU$Z&q|lIPk!<#RV!a^*s&g`b61`cs{}5<09f1pK
zrzm2s7}~z1S=)6S8cHL_tF@dMhGA}&nw#MzvD<58#v|m0I7RlYKgw{k))~iN)bP0!
z5=Qq~rzY_Mjo5Ff94j_kh7hiAkSo}mX`(K1$x8)jh!amy)MW}nM(Mb>!+SG;q)6y+
z9_q*LCPdwiYZ=)AUl0TJYdfI3U2K&TapuDXVs|^N*U55?xt<tD5XQ#Z#d9Q#p1%(R
zmpaPW!q>b1R*l1~Dy>EeLwA9?ujKA_Cz&5YfT^tuV5QE{cqDhgrEP2A6fr6U>`<h@
z+(D@Ur@vb-78i-%UJlCubNk7&s54<aZMALp9FY5;O-hQrr9qd~i_vM%pLJAcfg9#`
zG8R<|q+`44bZ#O9VX8$4NGus)m{T8vIkjZ+4<(OMG5=?4a=!o1@BCym=TI<?l-;e(
z6e<wOB|!~wQ!opP#cc>q#tdi+GT1Z$sh6n5G59xT@0y|3PSf@&YEeEP5Bt*v%u5qc
z3{a8bI{dH;C`$#cqY5wR^7|{ouqM+;-)(mB6cr{VWvdh_=G|pe9rO@xEjEoKd3K;A
zjS9p^w2L8CnB{r5#%}q^6pW!c9+-YGiikxRbJWlDf_C8dSVKb)!Szoyn}MS>zA<M8
zilG^<axX)xh;9$?6lRJCHX39w+&T%fd%sMfLbpHF#)A+<j+u^&77@AE1Wsu7qg;s5
z!v!KNYE}C+%Ufc8&<VF?91N{_y?#aruJB!Bolw$!iH293Uj_VVYN5ywVSdzPEdC=N
z3|7=9Sqp!a-2n%2$F8_!`^Gph>|u8{C1%FVcU@N=vl!f?#}lKia6gU%nbv*NAF+tA
zYKX^Jb4f(92kZdma~$8Ah%v5$Bbk$H6oTibZ{{gyP#P?`DNQUYmy8q`sYl(E$x+7s
zl7?9l^k;xaSEIW=1iUVnEj6Taq#2e!l~F}av3xrG%?iD;g1Fl&uGzSab2I@alyy?t
zBokC!uFx@SJ(<k*D6YEOv^p999nDkh?Iw9WG*P$2wgv9=K^l9-tnj_78<!Er8(qSV
z+lDmJ^dF8_>)UCfHX<&iy5BASAcRgS+cyj94}uUz&djj+Q3_$H{IOh62OzLwgqO6v
zb8v0nm-ZXmwr$(CZTrNwlM~xHv2EM7lM~x^^5)y!_r7(ze%){1TXom2RjX?6+H3Fe
z$N0?gj5+7C$fNGuZ8vdnZ?#L1A5hwemx>TqYG&X?BdO~Kbl^T+KWR5&b@Ak3#cuY1
zK8cKyCyIkS!X=wIf!D%tMBLOJNM0k;kN*}KVa>}GU2lhlHXf{GUO$&sE82%RA&p%y
z7Vmx_vD^~GhlK?{Cp8g8jmSFy1kfU>B*7u87>e;D4f{LJkCY7oYe*da6{)RS<89>S
zDL$M}ebUwRU(?}!Lg^92uWi@q6ahng(r}JoDgcoX!svixQDg%a5L2x=1VptM0#?r*
z${vJT{1iTERY8vFz@=A&#E{>=niJXrOq7AR_f!A1m1^PPlLc;%;Q=6}6wZ?27rwb^
z7vf)3LMEkPJ~5S$kA?uGdFT%d6eD40Y-sk%xFwbrUBKLI0b^DMn|2AB<J76}xZ?L2
zj{0NBcRZ$?2i`OFPN|V+@IHc4Da8!C5wU|HP`JMr>4Mf@2}s_7O(mP51SujP?ZU!}
zvGSaUCwH5&I!*v9a|!S(k}-|-vFUI)bLVG^-t)H=GF7<2H|*8-qs&wfr$07qu^Ccf
z7=T}zCP5j}$L)0<<VfX0-FM39K>zon&+~A!h}Q_t<RRIwLQ)VKlZO!nCrZ7`#z=&e
z^L!PAB&`C`zMNbXK|}~ba9+b0SWk*IGyftQU_hYg*iHN>0~;GUCSWRSdeF?cVMyjB
z>Ec=-CUnT1lb3!RR=|=2J*cD7@Bn=nS)GqO0{9b;)F3k%kosqk;RZ-Ig~vrKdcf8~
zU#P3OvIpTYo}B^)w+UNeE<%6s5)K&;xVJpaqlbGdVTpsGC#?KyH|^6;>6`!)DAbD2
z_z39FRpfY_?3vJLp4T@5-0%M19@XVq)CivvIpg~4>aO3>8U}pi%qMtueq%Ha1ZyD0
zB)C+3$z^gJ#&Sp+XW5sG94(4ZE}({z)RbN17(0n5R@H5RRxHzp7`H>6C9y6%g440Y
zDnHJ0CrAcpaVj6O{Wpa%7I^Fc<_W_(I4aCz1{CJo>y#@8v0BbLjOw$F-7|!QSxv@L
z;!&C-NLXUbq(z}}F+hOi2tmrED+l%~c)=-&AfegMM)aEvSVTe1r<$*CGhW(%@?Wo*
zVWn=3i47}1iYWU<F3ED8r~G{HUFctKw3_rGG)#Bry)4{MGYZV%NM~=6MczIALWX~%
zC8?^&jkRPq{28K^O9Rw?PX%-!-VZdQA0RJHn+&DWr7a8Y)FO^F%ji_BRq2)<Pvl}j
zIRN_3YR)wFG`uk`OeN}b3__TpENEyo^(Tc4kX93a1*cQGSt@#%r}q#199~{4TxB!J
z3t({MU}<u?1_*~~CiC4?`a<pJZW8MQ$6}mx?9WR7OV%6b5*O-+&jQ-ea8!Tqf0DVI
zMPVvdMFun%=@Il}%%=270Ci$44bjYP>UQi9?aIP|dat{lL0`nuh>^i<K1KIQSA(FT
z@3>_l(&ij>FZ}a#wz3e^qmO_)I`|_49tM}ZeLN=zIt>0$%x@xEC!UQ|fncW=o(u;f
z)>U@uIgAbLUnZkB=!Q|T7=@4nI`UW;7%r-YPq1M?=4fec`P6M@*@23eHEtWU7P*hw
z=HO8S7doF810WeD%VoT^ELIt+Id20to5St5EQp|#b1)1SZlriR^f+lknBeQWr&VuI
z7{`A;&c!y!UGW0y2alSW1>E?tGmznWpyN@ji+?BaepJCU`0XP=7eY4H4<yHF4Da}0
zxrKo%DAR*{ix?;yE`N8}?fd!W_FX;kAAa^s0xJXI?oR?EaE<qhr~rTY06NFT2<Cj&
ztgHbFggy;tazzXVVRNt)B6enlpmuK92RirKB?a<EY*Yp}%2a+Dj=nspbGhFRz{>)W
z3-^5HJ4Eq|q-BA+3-rZOJ6E2PGLZOv!Uk?!riE|d&gL+Csuqz@ye-<2(~k5oWZp6N
znE@yLegXt#TXF{&n^z3C-;ohjJqw$rM1eI{h65vz$!b}(QGmZ~c=I~e4BZr^0HFhS
z70%!mkcM!(gF5#8?820c_5A&8r=w1Nex4cpdcikq!sTI{9X6Xj>Aq>Bvdd%zs;POw
zJ>OiV)l`vCvLk}18cchWo?_8dolSfgc-x&xJAQAh#b|CFmj7(FcZ~wo@w<(kg#d)v
zj(^&Cerg!PsR=}O`fpxznd$6VVhE%H!k)ggDVo<fuwjBk9Of)ac=-`h>m+bUX-}*5
zd9R{MXr81SL>F#CG_N(JQxii=`2?S<Uel-Kz9kCfVFFD>%`Z)4AarA2pyP|&_!$=O
zsA8Ae?H|8ldZf^6k-dg(u-+F&w?OoAEg^6kW%N~A!)X_&>R|c#TCZB@G{oc;9jgT=
z@jt+<+K@qgC9E>ECykyy$>Yn;V;jJ&9%vE?>u88V-@7V2mc+(EK#0T_O`t(T3QE39
zXm%JT6JATAlW>d3P#zJ#j6nXt4M6rqui1_>!`z1_*828HiA3T;d_R>HHK79y4u*o^
zjY>O}u3JQ++Ot}Am9cp@c*VX;qOJ%FPO(o__BMv)w5dWa4Nb65;Fp5R+1?8z4I;5H
zCMsPX50V?Ql~*`hkw5}li9rQ8_utWH`2X#Z0zp6{OE~;i-b@x?_4sxEX-)<yOhDm8
zScrg1D~uA?had03Ag5|?7NrW3L>|6CuQHpY*_amiRjR5L37qS{j3y$6jU8r<h!`gb
zXx>*Q<Z~?E)w1&V*T=2vJ+uiZjHI%%VS3HWZ@Xn?>@OzMaNn!#=d5M827HTPjG*!6
za?qgrM8i5dL_<A|5G?jnA`{oj`xB*(LhVpEgBIqoJ+MzWB~YHHef>5XxiH-ye;@)a
z6uKA%pB$G1hB4<X9#7Df))hx=ir+OpSe5zai~Bl5+4TmTzl!r4uG}!U9vQN&R?Suz
z3g8)Efh50W6GGzbA8x=*dd&uAU2L2Y_Kx_;(|^4RNa0D;K5|e)P+*PAg|4~sjn!JU
zXhBjJY^oSA+UtJeQ@_PNes2G{Pg0T8np8usycmv=CW#)48+-(UHnCB}L0ZJ0u8BP*
zkz~9Vndw)_!ghG4|BJNVm<isU(vO<8B8EY2Si`4XS-kDr5MV+`h%ZF&_(xs+M{%-7
zKmco|fM+<$)?|Dk(Y_=T+qC#rW+j?kU;K$p*Nx((29M-jh!fGgEkn29O`8chXn5Of
zw+rwatmaBG5F3Oy{S_bd>(8emrG|)zm0qF|VhfyV`nvV|fE%0Q^yao{T3zBj4hc?m
z`zqa7uYI3xpq-X3{9Rm3HgA<(`CFHO?~A3=y3owUl$ha>xqMH0&1&uNo9f#|C{A`+
z2{`{dSIO(ylaG%PsO=^>5#Rl9#2&2idAMuu$kMJW^@`YEzG;cP;|ki|RUHT71BD+S
zU=9@L_v1YBl1ewSsWhm3w%@f|wAl39zWAYt1Df7%$8%4>iF%b=;*Kfc{M>Z*T_2JT
zyt-}+!DD6EZW+NPxxe4#=&JwtY;1{ioN<NHwm?xeh#i<XG_W%>9<A&c($Ek9YM*J6
zSqO!uzlN0UPihxfbo`D4rtGUUVRce>S5?ZMc6eGC+wmdNLz(t7eQVET&`)Q}^^b_!
z2I1alMw@Ff71~)VL~X8V_8@|Fo|SAIbjc3$@SA8S4mN3*?u}cXQ-a_WpIl$7Okphk
zth=D)`8Ip<fIzCr@o<+vCSO4awUR)h*BR7$_6o>3HTYv~O*^K^EysVSX{c#?Y<WZ0
zbIrRacz1!NndSZNH57zIGvno`KYImvVYGmxWgO44d6ahYtQ7ur>Pifxvx$D2on?t_
zPJ+CwhCAWM<cQ%+rm3&`OtbYBbr}n=`h65d!pcixGJL(V8|N}DM(CWAwzpDS1yLM9
zycxgFzD<0towF{cA$fOo0Kd!Cy*HUCK^euuN3PkCOi&?Kz2b>G4I1EpkoL|pxNnbr
ztV&E-7Jct4qt-t^3@3Ci&(EbxU*?#$9UrB2c1xFNS_*_^nBPYSS|WW^98UQ@*-A0u
z?i#y&9MyQhQUg0G+FAA&`<g)!O)5%%CL~w?AguufN-tp&3u$(u5Jv0VaGhUZs>cWO
z{94y#yyL)+_YsE$0hVu{IOLwM$lyY--e|L2a{1<6I6!Nlfhoh6#K@bO_9XVvJ|N>N
zY&KRF+gWj8Uh%~stq8GLLVDzAWK8h+zz3BhyNU<)h$_y6&XzdJJ<K_VD}Hh`T8r1X
zD<#3yAWiC;pt5^RxNq7KcK*ne@skyT!d$j+!Xm4uuwf=>|LnT7B3CYem3rY|HM05>
z`VT=)wl6tViJRAyuns;tqS-N09T_Uf(G-iJxw+a9AE}1}tSUAYbnS&tq=~aI?30=8
zM>zic(``%nA?WKat(Vti^?=h5bVDtzOVuK8VgFUQehp==vvlXpyU}urzOZ4#NnfQ>
z*D5LGvmykqGo4-kaxJyyvmI}uQN_{U*861G-CEi@I~Af;+#b)fx+zxPYUNY5PC($x
zGUz`tGpYe$TQNQp#ZqjhE>{3<;45gD)Zo-fj6J_^C$>*ccuukQ>aVm5lVgo-+gK$)
zJf(+s^+yhuaHZnz;3Y}^F3d?W-C=`iqlLI3%saTTa(uMP#(YJcMmlcy!+vS!j=R&!
zXt^>s)twwGr~!P>7fy)}Z1+bYCE%Li+}vpnJNHSq`J11=ss<c4GoyYGy+LlA%7WW!
zQ)BiW@~e#5rrUHJgj0YJyNSxZ-OZR$EJoEwF6Y?fXG)zYqn(~vk;=tmi$zP{Tk*!<
zqOnNCl<y4>^fyfy=fq{@J1_$$`mSW`!b9`CJJaPIrg!uj$I6}xAAFAJG(k;b{}mdk
z2mY};TbwvBSP%>>Qf_AR+8X1Zq{_|Pv5|`$z8`7zht8y-J+nZXy}KP`t*U}x7FFZQ
zq|Xz*gI_x^_6GI&brXQrfATVA8+fVot4xIJr&w*3o;r!KE^$;)4doTOK=!lmZ5tNi
zNQGRbqvZJz4b0;&dDy`^UWcH)q$g0|#>~o*HvII-igu>Q(ulM}_!w7Wh=K*(SQ|s2
z=tZ1fBP=oY19bZPj`w&8-&4nDdV;IRi(#$=UxAlJ8fF_<Q!H9qxAjd5^>x}y`#`Lp
z<a5Ifh7{3?rXREPKt%uD2vV{2RSX9T9qY>(8jgv6gu*xU7?W;etIiy#DG5dbd^^Q@
z&jrz-yy5Wm=aN;ZbP6lf2@jaVu7-SiqoEn7drprU9C8ni4K>Zf*LIkTQ|zE1Hx2ty
zCtP!`#Jz8kVc&VdcO9e(f^v~Hb}113OfGfKZgR<0bzvG;7$OqQu4jU-E600U*uO%{
z^u|*-83lTgF?@QcNexB+ih`<7?da)3PaPxnJfdb=CA(axKJGZ%naCz)NY+U`k%KdZ
z*kE}|$<(VMWOaCN66<}+Zxj1AUoz$I0gqQk%S}eyx3HK~DBYgA^>u`?@!5Jo_!v*e
zX)Kc)KJ3V&U1d9R;v5EcSpU61OaFxLa*;SH22f1gcoH|OM+&95pK>4($^Ik41WBEP
z2W9xjpu0?(7Z&58+A$qZ#W|i<?I81v8K{KsZ;2E}%Y9~(*;0_hLLcx{nTV0L6}&dH
z!PwUE6YlaS(l-s4jx@`_9J6=S1*WOxc;EHhzIYEGPHnXA5G9>m3v=c+Pr+$?@Q9Or
zGF=@HvNAfaHHM^1t+S4ECFAApj^M(ZV1!UI$c?>*9#A`O@2r!`d7=XLHHh&?udNi#
z5AUF~tmV4>qb7|rDC~P1sryfBGO<d~oM}GTgb*jr0;F{uufEL4uHR%#o+dF)(G8lh
zNK8JjaIK0OEiN<diUpS+vUfuvZ$0F3@fBp$N@z)n$!;@VaaiCLB#nu(g~PD=z}d1^
zX3nmSoJ!0Zm(U4a^Qi}&41wu53BUbI(hIc-H;TGfgX07waQjLv%Qz;WqvUrh@v__q
zFmdqqD``I&h{DWBB(}l`+k<v`6p5kXQWR2Z{7J*rR@DRo5TFVH1Q`yofDT~SB=oun
zFy#jDGY~$6ao%P^V;h=vAXEaoK7jKM4!f>x{G0VcVRte<B}p=AL!wWWFs{`Ce^vw_
zkPWj4v9$h?O18xS0YA&sau~f8=Z*(I<|oHQV)3c5aiGtz7$nhIIl{=J9VBBzwd;vJ
zN3XOdfZ2c`bl)Tm9$M^k<3szq_xqmsKpuex?zb^>jP)-e8(+s{6G7Stey1*?f#=PB
zmlc}^hn5<Dr1(#+?`sKH-wak1SfVZiO@@1PLTkMWAR^yUr)%wm%Fs@;ft5%U1zWDW
zr3r78pgJjCdG0E!DOX~S`RZUDe%ErKq__Ro{-X(`3x|h6i=b7n*01z1>OtBv_}kkY
z?i79RGrNPhJTsNI6y`{g^&q?;+k#J^%dPmQbkq40YSPfqm3*4ZaqlfALJC(a{XUSo
zl{`brVGA=J2vd=EMNsPQbe7#mSHg#u*@ZQ;6-I~8#!39B9D=`1208Rgh_5Q0H}mO!
z=Uc_Xj;^#;D{X1KB`J##r?T$2ru)T^_fyKM2n60os=`~(jo%JFM-In|oGD#eNle#Q
z<V80g107%TMsz5R8=&z>gPD4MitLIps3aT(9Hex~G`}v%Y=q$DO5g^^?HJ8mVH2~e
z$MZHT!KoJ?q6RHp98$TDbx3PLE~gLCO&>m?NwDQ&MlHj^nM8tr2LRo;>zoVGMNE>n
zL=|x!8eu-2eOea$hN<v-mWH4%eb;tf+|5TP0Mx&sqklO@m?}7!E-_|nj%|N8CH=Nr
zyV{2L9yi4qz6$H=5$JoTF!uPv1!FMw)984$4+a1MgsM$8Xm*U!;zPxd%6mbXcIhSu
z%^uDvP0^6Ix!)B+8gma{P$0>H3e6!_=-O2z>~-ntKzM18kju2r15&f}u{;6|;Qugd
z^Yn`+dkHsgM949>At8+Ftwy>gLsqIApqh-&@d1xV6vX|WGdMlfB43c1jY15ITp_A}
z(6m@vX+&aw`#3a!CeFT|m(`%mHUiaN;bHk*Rw9Yzy7G|WhO(4lyI)Vnc6fC~U9;`i
z0iwL7xgPGy-zKe5jl?OtnWsxvpzniXxVL@klZqf(b=Ii!?wpH9Mgg9shDV_oKtZs~
zH2K_*T}UyV)p*(dob}+yi5A0%fXX$E7N`l8S5QG4Y!1H;D%ChfW;Oh*p26kk-BlEN
zFjeNB9|S)ooN)A4&s-aI=1mre&5bYSHn#mUG)m{W6k%QxDNbcyfp(Ax7pMd`=a+_X
zy$7Lu<8yPn{zyJdlFikq3PRJ0<|Y$+tk_3!4Xu1^^}ZfO0rj<Q!!p~wd!>I?87lA3
zv#38n-Ly|!NaM0tWEtd$(x+n`WTmZ?RRP*spOA<(L`_pv{Mr#;=6XS=+&1{l5V6Mn
zrpCX<1Rot33wrB1F_1BgPnlS0WubJ@A<*t*;mC*{Ff1IglGN<$k^5(m_2OjC`6wID
z)dX;h4zDi?BSuH6?9>+=Ib=zM&ykD($|UAh*N&UZ)16?0daFuDd7%(xRtU2yl!P|b
z7{sj?UO-s^!FmqKG6@T0Ygebu5EG@n#^RSz`KC#p=RTNyz(_(v>V7=M4_?2lV)jVB
z(Qc({F7E-oab{Ku7EUe##I2-{(Jkrv^qhGqz01skITAaw;NFFL2!92SHFyEf*W(j+
zZu98+<K#`2UY{pV-CwcCXZ;=TbY1`C9bIL${E|3Tdz`u=;H-z#6%~ibj6%lM;Bq7w
zu3lj!DH)*T^h6!I!|T^K|KdTElRHGrLOs0#{|&js1}MV?ga@|NbExz%NRPY|jl|ZY
zK`XUnq(0p$!-1prVwV0^amwp;)q3Durim%0xmBHd31;85_S+K)n~3za&7#A1wuS#`
z^{tD^Xm`ua?_67xTM0-rXd;+cm%eayygF$oP9Y3jj^w*KG3`&}eSCAm+{C$H#vV=Z
z_315cFxr=#XiWSfy!J<rt@t-h__;5HAI+d6BUN5752qHyEee&N#BNM1d3uY3>q*!?
zd1K}fw<Lv%P;OLl@z@E7Fc?N80u&cSA7wCwEW`zVJPfo*dMA2yyZmFALVs37B~?QA
zSsoPGu!i;W07+-H1}Izwe`b(V9hek5b0)^^%gYszSGT4jnFb!5bMbijD(3QfVXBki
zpSmiI<2~sFKvEYy@NUqJ>^|+Bvh;HSD9Yg9!E7^kh656=Oq1#T#SMsNnzVQpf=Aw^
zC`VOJ7xz~mXgJxDPln~*Fa^!kHyzFAvsL4FKsDw|sU5Kh#Y?9X2aTGD+ME#D#BQo$
zm42iJ4QF2#WURxlxLTgG%-lFDU9<D=?TlAND7J4`l8BcAwdQ{ocjL%{B~39EgU$BA
za-;_+Rxe}Dd3xFy^dPODn#HYng?LD4433|A6U|-?_Wiy!mo5Qya`AUF2nz@;`zu(I
z4Y1_GA6<~m$fprJ9pFi3>%R%|!gx5rb`3uHD|El)Lt~@eCWZd?<UX$aNst)f$n|4;
zshE<-q$Y=JN1BX{XcIt{9cmK`mdnea^Ai^|fg#!gQC#zyn1}cbZ?X)Q#9Nq>gWMD*
z3wI2DkrE65i5fNnww{0!!jKl9xHnC{?`41l%>NV%ev$RhJ>*VU_&fVmD=XK~5iyw=
z`*)MR&zr~o*H9p-B@=vtc^%Q69MYI3Syue)f|v{yHFKizGkKaV$(ra0>1t}=2!{wy
zg25JE0q@Ulgt^8KK01WzHGiYs9Z%GkRAT$97@JvxQH*xBz6~U7I|MZP!r9alO?X@J
z0Upv#TGCau$2;9hL5;)r^TBB%d%3OGhb)u@G{k*md5K+nD#AWEY(jIbVn{NT7`2el
z@9*f(9L&F%fXWaODqM<MOW{^f17h<cu#sB_vsZ~Q(9Kf0l2D)%!hp})HIQ=Mj`rz3
z5m1TajK+xlgun@74_)d|Pr+aL$bX<#)3j@iAXeNFK;{{Qpc#uOg*m{}2O~^aX`>i8
z^Zcva?E5gsPsskT(2lhAsF6YlZiTC~A|DE{(A%$(6!6*#&2fwjK?H9tiY7M0hvK}I
zgqD8q3HW*4Zv!ewgF_UxF4baS0|MNu0RkvU1B0LdK>WOlV53C={^RKQxsm`70O;$>
z3JS|BYtYl_|1vbTu(UOGwzJnaGBma}ceHb{HKDVzH&<1G1prUMj#Lp7Wj4_GIbGbL
z0RTZB0RaGh?hF86Y=CNPZeV0^BP*kJ1FsgY;13js0Zfj74e0PQ8}QPB84eUfNGPa4
zCNTm-peCl=AC7=7J3X@`O+zs%xkODPOCvQ&JvJ$AO0me!P|Hxy#>~LR#@NWx05>KP
zUB<u!F(pkSH9blrO<QjU@DmR>1e-tri|x-Z{}aXkjxWqvP3h;2e>+5>0RYH;;#0P>
zF}1YuAfP2sGPN~yc5x!05HYnhqa@H)urYLYHg(jcvvYF!w+N?&m<|4k@Sp2{iZEGK
z+jc_?<&(UZ7va@0pp41R@kL$Q1EUt1RZ6*0R3WOgj+apsilj&-r27ok1n_ebsGYpv
zgw4}jVvR}`y*Y|8@15s)lUYTxrobsP^Q5yfrTsTsaEKtr$K5ze@%-xu!;5WK?V&UT
z<->g8+_2h|)^Yad;>nO?ych>eaq^nR{cD$tqKG42A_GS1dA?>+&PH6iUbQ1Lvn*DZ
z!)5Mx<=om*8D%A9JuOJ|9s>t8x<X)RUzsJA^3=q(T*UtPNyWPQ>l~d-w(2lSLvdyE
zy^=cgHNYx88k&v2r_s3>dU|@5vsomx01DWM7&~%Dor`7>B7Bf~vhL)?HJ&X7$4(pV
z<cw)s@D*|8=7>5kbF|)xn4hzvtnIv;fLKFykN(C*dBdl|>g4W~POtnDK&Z3Y(eTm6
z=d;ghl?O}^;DNKzg$IT=gX*sdqU@vfXt<B0b1G&^mN|46PgkB8VhY6?I$6{Fp6`$I
z9QqaZ6@9zvp3RTj#~~Ih{q>4Vt~be<reENCXG>!ws6=uQ-A%nvy%L;=DsPbFPam6R
z=bdZ)Q8gurQX6~OwlY)zc~wlS8N?CMJMSCO%3{8$31kdgR;tNd9S@Q>J}Cn!<;?aQ
zs<yJp35qmNN6!M8@P(K2Y{eE<79St4jHSEzKyx%iu*bk6sqwd8480Hq=F%2G+E(LB
zHTN4kb0ted%r{2*1Cpc}8RIF?qxs<o$+Z}W<v;H1dvfe^Wq&iM`se0!kL|#OC7d6W
zHoR9Q3ku4r&kf0gChM67hRl7JpNtm&z|ImvxN5DZAd`|9sYIJZ?e2at4<ZH_a=OA}
z#0}&4NMm5v1;K;Vv5hVWh4%vGGjvZp!JTl>IVq%Dv(csACy3Y+S_GCNTsf;jshK<A
zabzdEEKe_Jz6ypk4_R+?X8SRv<5L3eL=ds3gCLY}_j{b3=ab+;4!Zf%3~_T@oqik0
zKwM`C_pr&6g?Ws{z#T9OZgj3biazv;qKG4vQ+3xs$ih+Y?M6U8qw?O`2A;+sk46^x
zdFF;QFy#Xo!-x+<g<?^OB9A19u%tjGyyQs_hciVP=<Kn(N`MNZut}osKl@8FCR8)x
z45Prrx_$VC8mQFc(Za<6Ejj34GnDP)Gv;Zua6?w?dzW6{U<HsKAf@Ho#Afd&N${uy
z!ATQ_CJO<PGhQk0+lDwPwmiM>WJAw;>M%o@?14DM&k75n`tVTb;~}*YH7bWJur96z
zaGIv^YoWrF8m1BS)m;!D5?~<I?@0P_%5c#-fLwdd!vadn@$SZ|hOE%plc11&PRvh{
z*P%Q=teQ!dtf-;&o-8=`VLrCU0YSN(Y(4r$&^=|OK*o3>aO$AXHp(pW4z-?(b4Jwd
z@Yds!{Y*R}xs0ADo9wm)1Z&tg`E4PtFS#E`_a_4=lBP9$NdqPA=?0H?Z*CP%9|p@_
zV<igSz)uJ|CPAb;EcPa}R>AR0z?TwA3dC&<+5_Uv?$%-n?8dl@s&tNAT_NG3ECN3>
z+CG<a^pvRo?3#pJUxBn3B&9lizSl4JcyCA!ZxtWz`G<zVA+l8&AOHaWFz;W}u=a<E
zjQ>yC|9=4E|2y>K{-7Tl<A0+chyYFCAM~e6{om-Hkffobq?MDEl%$bVg@XX2)VVat
z0?5~`FM$lQ_&3l~+^whU{QUWU0{GXVNx%RA5dXKJS2DD;{U1@jNOj|f@(4cYxqbw9
zNkEnL&(Paeob0`}D%7%bXo7Vq%hSUslyON)=)UEC1o*Qf-U8p06mQtsno7+w%>F^+
zxgay?6X^}i6ZL;d%n6^zG&QSq5^X5)V}}d$bKd*a>HN6yd|EU^?=V|YY!4euu*=Q%
z@1}hZw(d;hNlkb%RDH2O!d3vgN|A&XZY{KIBg`~?Ep(4;o2EZE*){KYQ-WyjhiU0z
zyb-<YT0u&F<Hg2IkQN&3&&Ate>1U_(^w7XjUDKVV9hTHSJm%kZr?H#5cxbg-VFKoU
zI%D>NRl*BzwHoanTem<AaWY`V!gX514X`bmCX*WRc<O~5@_Znk#)wPsz=wPn(Wq<o
zldt!S4^@tIJ4mmzwwx>-@Nok&X2^aHkkQa_ZN!Rd5M09n`ILiknA|fx6ZUL=_BeGg
z%I7iWX5qfsv*C5!s^X3laXaJzIE>3S-C(NNAG^4EGb}+4uAIAd-;MG6eSTh#oX@P}
z@ag+~d>ogQG?={6>FC%d<ZP8e|7xLb@%2cPEQ2j#N1Mful2I62e}WrW)6}rJJ3_+p
zX5_BSefe$e4R*t#0?oms0*T_)G?X`L2h0Q=UA3Zmigs-T@xec{>tAl{KfndwJ-#~q
zgmn<1SIJvhMW2CX#pmG&@Z;vtS4)EoK7)Njhm3!F8(v7_(-;V4&n4UTb@?#tap&vv
z1)+fCv=dIktRLbCsYp|_h*hmTUdaN*YkN$}>6qFrC2{xCe8(O{$KvrZ8RCs$GPa*y
zac&qVY@+$PdvL#M-GShu0(=Ay=Ass=hD@zGo}Nu1y93_iL8SyW1r^9YORzxnnc~Q|
z>xFN>SEZZ;iX=aQa|GceH?d?XiJazUrbI@{mz^AdN*mt0py^?L88=P!#MDTt7kspI
z>eUlISq2oCQnVTX!bM{J?a!!zke4)s_e4M?0?i0qq|^ZJuzXY?l#nF2cmaiEy5j+Q
zL?c8=?61oR(-CM+uXE8~7038-0`+6zgVH~0koK!gEM65oSu~|A1vwDk423jmK}9D%
z0A>youNXqCt{Xw7M1~rAwp$D*TTzGDQl5BP6<U+y2#=(|nUY-Pk-$vmA{g1)vq`0b
z(>%g$93qi%D%8_tfHz+Rp||KTTSg`>4LHh^h!Gq$OG1kD%sI0t6*4n2oo1i6$yF4D
z(bK>tEi|u0ag-auly>k6(o!|jp6*SMp(83y1)}^N+*kx!a=_IJ(E|0*r&Q+zhr3ST
z%5RL+z2bMUS0_2ToI)^&Vi%r~k1aq%<+Vb?DxQes*7j7ZzgDr*n3ofHz5=XQwMUOy
zCm2F~u&ZZ)HzwXh&|`m{*c9r%NlS=`x1~tfib4}ivPxlrp+xA$=ME<L@J<a(8@o>&
z6HzlgW`fwDSg{)d?sbm}GNoq(<N{IDdQ4e}wVWTQ>hQW*6H2q+^WJab!k3+{z_{X1
zpA%cbUyYaYm{-)!mf<_X%Ap9R&ve9VqPr`fUgaSd2z?L^TQ#UHIE0YKKGaz68AT+w
z$*EWcGWsmuD?}!Tvyj9lyN@3sUh7H~&$baYT#}o1FttLXdY*H#jmee#aqNl_4>iKo
zGT=k#+qkfzsk5WF`rdWJNBHB<{QnFLz~^t%Q$GX4KaBj>^c;rxcNy?sj|R$yHijnu
zBYcLaZrN_Ip>(6?x*>Qb17-~HD;8c^b?^fwELC*CZ79Gr4wBfI%;lQ6;dwW83g8>0
z`uKM#GhDE`N{mS!VQB*43LSrYA0z+TaB;M>%GS|pQPHjMV~N>2NmXy3lUu^yJ9%wq
zdLnIQu_}u+G1h5Od(7ouDd)0|02!K_JdK{q`HOiS!fDJIQ}A1tUDuTVk<O_}XUVg=
zgXncS^#`4D$?V7NjO~;yJ1pb-C;e)1frE2xS6r89Pc02*7me+f!YTN&MH};$Ta(=9
z&CnG(s4%lnk>mbw?ReT=4Jy-N4E-e1m_wMd%o)USJi?k(l)ES<WL-%hB*s7LjX4f;
zoO6_BgurQBIf}HTjh`fpok$c6TvX$RBO{|(S+?w$S~cSc3c(+*@vPX)SnE7DlEd>*
zhLybs+<k8pST$4Z+vXC9g_!D7KW$IQtz0SlZKtbU3*8Rz!*<KJhwX4G_dSoXXvC7C
zk531j7sW~2TG{UT+N;Iu5yT%PJfe&()!{*}V|leWtwKw+7PiB+h%Ps{-6}HjmPDRF
zu%mrhj@<A2b%j62?%K9zbIZ5;eSacSlc|l3eZ%E0QHx?BwnL?&!4fbRQs#=a)?NWA
zl(~PvTiMCOa@=L>mtp@(Lz!~1M+KKIfCTcs)J}L9WZH|_zNQ902ug44aYb@Nc_$p<
z4PQ+F;uX-OnJV@r6wmn6x|_eo4KXi2Tl=Y2si!9w*q$!uj(IYL``@4zS?AgjL@C8L
z8%S0I!ED{n_EtAMA01s@U}`8%9_qw&*I_jTQ6A3VV~F^{hP{V}fc&wxb*t3egM+*~
zc5z*M$2+C;x7K(Pa^|Jxk!Td6s)donnSshr_Ej(z|G?g*bXHz6q!*drI1Vpj;SUML
zG(!wD!e9P?lGF2cj6kwdUOoaqj<Pne2e+1Fu5Gm(fO5$32{iXJxum&|Sat#Cv-5)7
z8ep_uNqO|Q>&|v)_%4_kLoiy2B#*LACq|vb!Kk?&9L##bLX^|FOW6{N0j@VM%pdTY
zo$wPM;Ro@*%?jBM_huVoi7>{1mHC5YfR#qx11<diK8waYfOeJaj<r3!`d|@4Ngxgr
zNqig+a{6)jV8(P~<=|2Zd*BJcu<!Oo@hxV4Jf;<0I3%6q!MhdP*)|h%o<<T`Fx7@2
zXq?>Uf6;~5r$9Ptu;9xeCHnuh33JFvZxFg8XM_$Qn!?!g8U+Ail#o*B`y&?gYK@O1
z5!|y*^??E~10fow5oa*Ufn_BHX9_k3^1w675OzF;JlcDvbe)LoJxU$wVK<(J6K9wN
zBGk(T)%$J97qE3LO5obVGy@NiLbL--CQr<)f{uwAHVeZG-8Tft_D=EJlrI;!94Nfg
z7$AcD`m0dqgPsefTUZ~~*X=%t><jcCDhbnEeUSW6=^ys|YbpUF0RWKy>zYo~UBT4t
zN4*Q$+BsYNXZ0@qqu&2H|C4$TQP;NJWJCGHH+UjApaunl!zZFVrEk6$`el+K`Hy^`
z#acJ4j0a0H%Q`jh3ZTi&(G++_LD>?k`GcugXgu(H%1Qrtb7BPLkgjz(9jY3-Azrn1
zWY?Q5=krVGaD4RQ)BDM}WqHVnVeC+hv`;V7ioC)0Q)uk5f(LTeyP3tRW@$@XSKAOT
z6lliWe2A`Qc}Ul~J|Xj0v0AxQpsIszpAhN726VD@atSyCC*u8@X<aCQGhc^-YSE<X
z?WwA-RZ=JI28MRBReDvqaB)V6{)1L>nIe_GY6zze>U?FMf9Oy{Qz$EegBD5)w&fWH
z<1w@li1(EFaeJl7pYkQOVy>Pt>hNBTu```(7tJ&h{~mpeF1=I!^YT$|HRMU>YG3LI
z*aJ?>$99!uoe8P#8dxfdOV|_D%kdmnuCB{v-)R@E#B+kUSrr9=da9p?b_;*I*|E{&
z0D9%d^Sn2zxZSUDn@Z^(j4gDQ@=*XMpl~OagVc{^GPUvWA_ERmv;dUvZ1;S>Uf+MN
zywmGn|5SeG6Ah;JPlDTcu6;FkQfDa_Vz&C(<WavNMh2i7A<-nmF?V5yoP2z$7If8c
z{SPJ%+v2(Wh^dqPMa<U=XV<hy;vOHn|72fe3jexu?qCg(;b)<PDWA@DI6^Y$nrdW{
zBsT4MLld#SXlJ`p)k}_h97|NjNW%tJZh|BE=mb6|Qh?>l$ph8mSr>q_kXN<&ZpDg{
z=d-oL1B}SPcw_;UHg&F}I}fo7Le?1#VgiK1^OJrES^xo$&5_P-6GY<C8?Sc`Lg9ff
z*z8k>ZE`J0g7rva$CxtB(}pw}Mo$_f*ZFZd`%0zj2L-f6p|zJq@YXv!dt4GvX2VOO
zx0gX{BCa5nIJ1jVxFat0b|ink*9;#u2m;3jAr2`p4#pvj>k?$hk3SUA$V4&@q^VJ;
zHHK&dN(k4S-C+#{ky2}8DJKn>8_j8jf=X}6MZ+?^ROyRC(yzkVXo72Vr{OU&LX;hK
zLf^YmGCv@}2-CY9j??Cz|6qdJLWeasv#<^miwlYkiF$n?LK?Rz^5i2atP}U_kI!x_
zu@XdE`V+guwiF-_-S!fN2%i&fh@X=t7jc!K6zr23o6m74FDkyy#5FAiS>k$9y^DLW
zj+nBdF(d~+ZuGY0(G(SvDbaTGv&kuK%Dj|@3|?h93=bRk95Y|SUBWG{LXZ%xo0$5?
zmzB^Hi?E1oAP*+|WP&wxxE(G})5QF8V_i@#)R_MH2*Q}>R-AaWj+17vi?g4j*-c<3
zjL`7f|8Ha;_aHM2+QHF)5KCLn3*+4lh_+b4c>ie2<&GdLWjp+6x*bP)E<DO&A|7`1
zhjB1()pc%I(O$3|UH|kppbM2&xVETV-8Ie*%hQ&2mIJpXeJyC)3?SX832;8*K|+N1
zXbZas%KJ26>m50FeWEJCQ4i#MWy+j`V4%Uf+?l0w+&Qm-M;kYt21nb^2ebz#ts$-4
zbh(FkWx>7OP68tR`VR=6HqJCI!9wqH=Mh(NVVMS)xahcsMs^+Df5Hj2T~Om!)eI?;
zq5K4em+R&zSTcFK-^)%2R#Y_fuFArRY~SHEwMQ9I(e`$c<#X0`4=`l^tPhwY^LWTV
zd((`5Hbzsn)HHVI!a1U$$l)&zgpo3F5_!_ccxSR6-9FPxPFSFDW$>iD!@JY&S+yRr
zpq=>r1Kt2BQ8^G$0Dyn+`me$JkIZKJKlTa!j|~3*zfthu$|?sihZP#u`yU-)pK8vQ
z|GrUh4Fv!|`ri*K5+3&dc}V#$8p6>k|K2Jf@BL{N8~_E@cWfRect_Izj$RMPDyCc~
zqEI_n|C_dlG?9$+Soam+Er5Ry`1#WkwsUq*q$eDbh@+k2Y%rgmgmY<nqEn^olK!RE
z?};s=JL2N&M+|K#@-^q8SH)bU4_t&mjp>DLdZBfo`=JwYQ5nvAzy(drF7>xtofR59
z$?<|q+*5Z|X1h5_q;gz`Y<^fTpPm+^Qo?T9G|wd7Hh}54+9{8jqt`9l$+C(?`t!At
zgGFgm<r1?<CV3ROW6BiyMbxxjDmqEjsA-L^i2)O3wv}THWw3WJZ<(Fi@QgX1APup9
z_mFF(ygpyTR4GCQRow-YFs`U}#HxVmml6E>?QkiLqTjMA;z}9pQF&aCWfxF3r)3gd
zA!>T<p0RAL!aDa!s;)YJm8$2$kT0EzR^~Z@MP8kPK-P&)x%bBRm1V~bVk<cI?bvZh
zr%N{cyowb1?P+ro7*_rYSu&$Vcm-8A2hSc}mO}E%yu|gt4I~p=pIa;M9rVwBKD?Ul
z;wxun9Z$Zf(s^1H)QW#_N1|>K-a8;*AOnMq!~%zR>e@S1PPtmNYu(#9*o088gOeF^
zm?;#~QOLB}A=lqrmAA7$2#ZL&sH6)-J+}(`u1Uh?(xC}TnbhY8-R0g-yezZ_&cWK^
zL#hN`4=03Mnbg6qRF5EEyaAe@OoBS#GV<0UQ7wA?E9t&9u14?W50{_?6rIF;aymm;
zq|8-u-CMc-wyjF-6JGBKo`eZPJ;CWgC&LE~a%+T_V}bdME{eh7|6y5PS1rT3x8L7!
zq-(U&MyNA5O0>YU2l+nh`HGr`a4)b3wGN7ND!<q`Bu{6<1YxolF>@iS@Iq*@Te-yt
z=mcgEx{aOveyv(<g*&`J4C9j{Qw%bYnJsw0$`5ZufLvpS2n#|GcTj>L&WSJ@|AW7k
z9OV%{Y<+c@lkjI$+*zmFO^hKT^l%qah+KO)e$<}_5&<{$n#CPKR_j9IU<1hqC8Xfg
z2bT}><CZd)oP>$ND@Sx&pwHMuh>vLht_w_*5Pvxr<z5nY{ES{1i`G(txZlJP3fIzN
z9tJO8InfN|QnOdCfEYGuwDlYJ6tUl!w0ZU~67XK^wf6Q<%+KooS^(K<uU<&(=267V
zzwB~1_qr#C+!i&W(<gs?&RMnQbHzr<S%pMKTJrH##jz}ePwuZJ%zZhOjKDAH8DWNV
zuzj$(=HtYIiTT>>;_;&{v{6L%-<zf3*Y3sp<+?*c55K|x!Jys~0&y!a0Kh*$_}3T=
z_^C|)i^-$^i+yr-j=v0T{%5*aS@)l|qAz(bH_Z<#g6lgzj<snxe=Bw<4zP%7gA7IB
ztYItb7_}u7@GYZ{0=}gIKgfyASv#kon65AgLM8ORcE6e(ZD=mpj%lg=>?5`dCgetI
zjXD2#0<)UUe>>o+X)aQ!iC2n*H8CM?T8lVC=mAjtvx1pd-LP1jX#Xy#g%%k|U{=kn
zzOkNk)?9L6w4f3fG$v8K3<fNQ!j7&WT^h-&WL9^sQ;r1cz0w9?EKswUdjF;p)N1J!
z4F*M7zIj1?0>nRov@Qg^*rw>&qa>7y>#v-ZjAYC)Sf<2|omVA>C5m^<$XDGESB2;T
z=s^snslNt?L=waR-IiE2kGWfYFE+uH>bF{bGX<wHhUKejWsID^$S0|OjTA)@f|x@y
zWe{{d$J+4AZ*zR_2;sdfB?R{tATNI109&(~DsIWw9p7T)28XxTu)cv_y458+Hdnjs
z>;l}&)*Yv9{S1id$LxCj;?5ZlImsf^dRE};_59ke=kM0GPe;$Y=l5|-18KVcMCND8
z2a%f46SAF%Q}<{;gB%C1*i9wFC@|VxX{J5linXQ<b;AheHXXXw=vx;<TwbPA88naH
zIZAie#u{ij9+J(C>VgGn#5o=5U^O)lug~vV8!AXH;|7CpUx67eyz?1H@FvT;vx(G_
zR#tT^^$HT89{l(!2<O&wg;-B|HVxpJ(bA*mrJt&KQ>RNH$ra1BXcVbY#nc)YenXgU
z5RWDAN88T2%_w1TdeE9Y@{Ep+DK%c+=f<W>4czZ}uxt5guiLuoaBa>MC3JyWVtDY$
zn=8uP&V0S;?Kou7=HlJI9r{sEbu5`vw8Mxg#};iiq~|>noby*B5AGrwmfrc-2D?ER
zcPjgUI7l}m$oG>Yuq_G;zObA_42>yUln!->edjEt_H$$N2w@bhJ+~4zXx9x8o)Gfp
z$4W9z-Dz2zNCtuP#LO!e1sp7}q|+SVkK)t1oov7>`>9yi56Zt5Dj?LlD^WmH#Ul$*
z?k5(6xSx_|!vJH+a$ydCahz(<7409w`G{|pB!Y<;ij)K!Va3$U6QDSy$U%kly^z5c
z3`z3Pv7{x<8hA^`knrP?!yYEg$``-MC0Ka3fdeb03@Zy+CjERzkpglg<O}$pjIJa+
z9?|>B=zsF|UuU%cPp<zLvjpOXzg&I<rG%m5|FF%arfrMOj`E3~%L{XN2oyZ<9QP4<
z*a?8GSny9agVN5y?axIqU~#(S)tCWm3h+1hUr|!DN8>4BO-Q1mhVsn%#64$uUE#7$
zs5)R)DCn?VZn_P@CJyx3-%Knhge|Mvg$9XNXxjWCD15r#iO5`arPlv-Y2G*UXQeuK
zpsy8{ow3soRT*VLDaD2ZgSDbPll7XN5Sd?J#Sn>0T_$4!E_7PHW=05Cn72!G)PWNx
zi@hPPU`A*q<SGC4(!*yS%&%*58GoOKrsNmIW1;o>M&xiy!-c?HtT`gvqW3(@iqm#6
zN(GCdjG`z<i4;;FYqAJbF^FP*VW7nrDtQr05^_PX(IAyHrlE?oXnbW=ll#vip?(lk
zFmfp^DA6>d&7Hh-!~`1wWHqYsc=IHx+ghx$VC5<oPYuCGdwZ<Z?3xn8`kMs}{eW8I
znEIe=xqVq3wkqn`u##U{vU}Hrev*S~b#VObQ#iMnHy$S+lWt$Kj&7><^m9eFO&`9f
zB`ew+@Ge<oQY~~W)tB}inJlW|OTWIm;5(ROdpTE~<v+byaXR5Hnb?}Vz}n|p%$DSW
z24KIePN(I?Oand+_kLLj-#+K~ecs;=9K+}E`Mtcn#>&Tz44wSy?AAr)e}%?pr#SY#
z{a6ejNPK8+62M?^979>b{A=0S8MUCgv<0-&aBF#P{5kK|*T)-iiJ~QSu@j8WE?Koi
zM;OARMYBFEzkQT+r;&FBb!It(h=8sNQ)N6--_i|a%9&u-=!|@3``Zhjk0(H)MvKBj
z&D~p%xSdky2_8I2;m#mNdp4t5^TX2t-TTAV;SoSDV@3jsZa6P`3Pv-FVcHaO3c^}5
zW_7HM<Gv-2*21B&<F%uUu#&@b&$wxOEV7_ZpYE9(lqr+#g5Nu#&bHVkea-)cV8H>I
zJ*zMeX%o+S629fMhakb;e@TI7O=iEej35z(&*}&rmO57patDK~dU1K&aEN`@aNgV+
zl@cxGU~OpJYgxDQOrGJeOJhrWf(h1|?nLuKPp1=l0VaSki3nCwfdvY`COru*&)RGr
zxrz`&zYUCFWMwfg-u6E1i7<X`aggP6aMP{GM|fARgP75=`ACWbA!%knlJceEK6pn%
zm}2>XQ;1^3RnklzQK)}_g%9PN^6+zIh_DWp3s6PprfG5ba2}a9_$aZ54xBNVI5gGL
z^w62I5m}`gbRlM2x`Z>^XACa4FgZe%y7^Q`aU^<JnX7LCmZl*UI&{JT8F4(KoB3x^
zsbh4!!_JApB@PNx46J-29$PB*Rg~_1Li=KtGwYUL6R7D)n@L$eOx3dhJXjdjKucKu
z$aEU(sth__ps-SX<LpK=G5|1H0O^V+0Q6>AqLk9sHWlSdfi=qt=^Ty?aPOX}_}xUM
z9k5$g1?waNAh${j!l+#RLEusU%$<R~Z|ebznxsejft6R8;CY*lbi3>q+b4GU_(R55
zf^QVIilU>Lo4M5vD6|%y$#xn~bWwt<v|onUur!4xM+ICUA_5l#i^>xhTC+2nvH|9F
zEjNRgBl3G(9b(Z76fC=C*y)4uz$Po$qE%?OR_e+!phOxCoW!ty!lgHaNiq_wk;2IL
zBsc`J<u&A%w5CG16xKx+NqG=5(R{E#irO)*J-#aZDwgV#w2ZNy6YsXjJ^ep?6+GcV
zzW(Xh{X@}z&DZXq8HWEtT>S@MC2gGyZB7421yi(|v@Nzc!WQxlE|?ytfbi9~ow?)}
zM4Z8pBMwObV$^5~4;rU1Oqe5zJ*s{$_~<<NXm%9A%4h`{<v6hz1juir&-SyWiZk1z
z$i4iG!o7UU5>s^@XkHu`@SaWy7psY}j@_M8BOTTmL#5OOl*se)OSD51T7J31m(mze
zd^oucXWgP$JF0plHEZ(Fpdd3vxBa92@q@~&X|huqmpTq>IxdKIM`xF;GpeNm?6ixv
z-JL?r5*weacDknHDLe5;-^}p}kCZQs=mqb^VwD^hSudx*NtYbdaSsg+pqP$-?J_DX
z*AgNTLb1t6*)u3D+sw2e3(^#0sLh&K5;!m0O#V_3YcK>rleI2|G85WB0OI#ijRf!Y
zYm>3KjWZYqKfKiTQ%|XZGVj8q-rNs!c!NNzleIOa@CEL<a&S~0>1xK#uT|oxK9VYJ
z-b-*MZyCDiPGz#8o%BUEW96v!lzfB;WUIKmwOJO|#kH*_E++5SQ*Xz&XBNI-;hv%0
zU!yObSkb=cRf~ZfYlRdy;mXCDPm!o5W==gvuT{MOxC4*9<Y&=^2DOxBtIOiXo_T1J
zJ6CBo7N9tYd2q&(zk^o`{A`o;u~Pnb&b}_J$m@6ezI{B#($C0620bq=P36Co@z7VO
zW-mCpI%5FFr|zi%X$ep?G0YzU!B<2^S~aFQvs2t2o*HVaJ)YM~&s|{_YBUks|3&~3
zsHy&4l~^SWQYdfU&`c?Q-JmS+7umjqH=sR3wtR6I=0oZYEZ4LHwRNUid27nyDv|s>
z_rw$$FE$dX$IfsIh4MTMc$&kDWeC$kZe`M!w}<ubJ41&z2<;4Gc+ZffRfQQ0{aA3)
zx@CTXLMTnM30=%Y<|10BdnfN}M>bi$`$uObSx0icySLW#aYr)LAK6S-aQ=y=YBQHV
za{!+LiwnhChDcFE6d}BkkO=`_RK@8cb!b`U6`DL2WVw*(_$&+eVkkRpV!IgRmXlgk
zghTATyQglnswU8omd(v?G0xW3Y>1s5#@6gg#}NBjvlHcBE?<Pvj*vtIsOOl;M)5DF
zO76Ibu9Tdyf5suQPD#IhJB|^*VW{&D1oXoNY*@Xe_Y}lqF;J`{tl~0-CF_V+rWG-;
zC2)<1irk$ICByweS$&OeLE?d;Px0rJvSk13Yp#YP3&;~_Y#9Gt6%nB-Wds@MsB(F$
zWPzJpY}{xlL4uxvd=~cjNAaYS(@j0H^K=l$upobdBjI+nw6J}j6cIdmTtK^_M92^#
zg4Oz+DiBU-DCjy{G}$oBxTONtYFg|vRqM=RIqfw&+!{qZj0)MF&>LAbXdDTE@?3@<
zU6!K2_Au(YB;69UhJbxc;+j~Z79?CGIBZ^#C}^zFz7t&oaT(%I4RyM9__WAbltzm^
zdO@kjkJaSfy0p@M)nCuwUV1F(gCxH?b<ha`iV{3eO-NetO9R>?m0b|(!zh{psUY&U
z-B$ODO+q_-H$p<8c$iwzJTD5AO9jQ8HjD?=4&PzhRWZqz!*e$!4v+HLI3nyKiI{RZ
zUoC5GE9%o^F!G`M&%y}%(o1KghF11VSR@b+o+jUQ8M2C{nXK=Wy0qJiJ%ZP{){cww
zbN%N$uimI??wvL9uj(TG#eLW~*3<)FdMD@ZPx;16CnY_1D_e&GLXN({q0OC7ZiSVG
z-PJkC-$3%JBs4g#h2WtxFcAs%wI0z2#7IqY)LY6s3)N@=TMh^I3xR*JCKYFCdF{@j
zJMDe*%3+B^R6_I6f0_w`Vh8Eu$11*q@BXjWt^=sat=j_9MClQfA}vUeCLILnMS>JV
zkq|<aCRLhJrHVwlv`YyDi3m!$p(zMR5fG&JUZqJu5kyMl55C8H$n*N^ynlZ)nS7I(
ztU2GwK4+J;a<bvU$$9FGK6Vz=fnIVc0iyQe9Nn)IU%8W^s*QH!5CXlpj;Oe1Nzf=y
zaC;||p>)+fT8*Oje56O3CkGJj^{lLJTlq0buiq}2i*t2U<l@(5H7aVskN3XwOWzdq
zM<el-#Diu3=Nm#QJ{14;hVTa&^dbEcA95eiFN3bQ#D8XNi?Dj_+y^>f<_O0(eQ5-!
zpM`)87N1QhFm!eDXZeaCoFChQ-g+^~Tm@byUYmVay?{J--zF|&x7B)qqr)*x;IEaf
zoocffI5xXr;)|~iqaGWQE2mu47K4t#)*Hfh^GbRjjod7qWLB%#Sj9PHW~U^H*y1MG
z`Io(zCR~)%yd;XoTFNdkhka(aKcHQx4adT-Ksj#8uWfbI_jz{b7COOM!Y6f>8x~g#
zdZG8$^#-qHyKg?Fye&>8p)Es(2$0w;M$I?S6xv8UNr2en|GFRHs+|Zlxn=x6F*j%K
z_n7-7KZqxc4iN`QOrTXO(+AL0@@tNP1>EpKH;F5Edl=_6VbiH6P!8a5skTueNZk~r
z9}UZk155QA=fZfOu5Ly9^^W+=sJY90+9a`4Ug{`U4_Hd0(Yg<1QI}`kmN(goZ7J}>
z2As4QP<^~4IyjQ&gdLr8=Cd`mfMBz?Ev9*Hz(!-rGJ(bwf~SSbjYcDt-usn}Tv@Ak
zZa?vnO0E6x41t|$NkIv@zWH6?8IU=E;r7hwfnvreX&IKeb2O>j=!b&43q`g2I9Gpn
z+^6}ShW1RhOv;ivbgi)fCKEffqm?NtBQGt&{?vSVfXMrG3%8!h9m@0DpWWr5`dA8q
znzQFsKYX}R?x~igz{aDiKSQP?l&n$G4_6YA%jmQ!e$*yN!V-NE1VYwf7ZUGucj4B1
zI|b*($yYF6)!>>pDkyJBNlAq|3UQWRY3DDLd_eWrhdtbR?gZJtEL2bDQ+}Ros;Jvt
zn`hLSLbIy%cu073hx1~jEYjOpc4*PpJXl!9PRh!Z@iB^~V#f>i#zQ#xM}3|BH;W(H
z`YMl#QR5?SWe@6*m`YR0-HN55Kmf<E#YblC9trwaV}nDQudeL}o0p)Vl$(#*zp;c;
z#A{54Tw*3mQf#2ZpG|!mU2aIlhg49HD=aX`F*1r@5Hy@9nRt`WsuVZ*uwTXjnHx2F
zW~07BsCjKH$AK`MaC+!<-kGR+oxybb5LDJT%$`0_rSRO2h@TeayuHL^K#V=0q33O&
zD3_<aiKsSxi!tMUy}R<wGY)?AEj#WC+P&w9_>pY_?7FAv{o29K6g#@NJt&t6w)RIr
zaUgab9^G(a0`y>fYP3VT)kd5?Z&hLF#WzVz=qQ>!W(FbgX(si;o8A?dhx*wsWOU4R
zdy*{E85t!-x;QX+I}`H_LR`7*K5d?95o7v@2KK}Fp;sH~fTkxSx`iO@v53rhA{t=(
zH!l?uKrpy;ImdKtjj0h`0p6NfN^L^G`yPJ)zC?X6c{`r)LX5vTrP8>zX0lI^T<9r4
zhMS`0Wne3~I?U(Qc%yy~{5pZU%Q7fF_F-98&qo(pB=IStwR%XhpJqsCzze||mB#Ol
zkH?kxgO2d=>%pS*^W~}*znJ~Qa;2r^<AbjcsCjz0dwTv>{OYOKrah_v7>BLPM;cv!
zOA%1(1tdhMfDya~Fw`x}$xx2yW~LbB2FxA-TNgK5mp>!!tiI>4*&-`59WTQAP28IF
z*7;1C=KTQNyn)seeln5wmWtd^<HEwFkz{(1Lf4-0Ak~M+PgXeq4?<z62!}&zZC_`g
zO|I&-YjEaMMj|h&ZX&F=3z>~7C8j(%L<0sPbd@0Ys|rnX8SxFg5jjhHrzuEPE0rKZ
zU1hYLedKVN6TFJozE<>R3k7yOvuRaNQcR=><cu?UegQ9<A^cbtBXVEd?}OaJXOc7d
z-0OY~?nJ%9jxywafU_8I4`*0T4lkb#SfY_3%dI8p`3&cU7h&{un9y<M&smP|p9glP
z3t3ujjR-_3^hAPv3dlvmzY<jdKP>yV_iSromFpnZizM}LPDbq9u6H-zUf$eJEElBi
z684Euf4u7puOhlGY}(jd_I#OXtH~iwDU!*<@Xh0I?Cesgi!KTT+n;9_CY!?-!gCkG
zn-|t})U8BbSbR3nlIuQcUC>J+pcDT00txDU5#L=gqf&TV39e}>Rx6jk!2PAtLziY{
zMd)os?#9J?uT>Dac@lF=BioSo+>>IURtqSFc5m7f5)F-LTOKv?5)oT=OS}M~z;vdS
z3E7XFqoaVLmg^MRxJ2kvaw2v2;2df6cCK(y%HAPZ7U}uux%Y!_Q^%?VY<(Z3wx3R9
z6Ctg;YnWGmL1r$pP=V&ric9FkN{-RZ{S=I!q}?N&a6$ffR!D})>(yxus{))<ev|AI
zN_Xk`=kOqKv6cE2Hf2Zk<<+x=7O09A{d-!SunV0$6|oYm<q?6l%vxXK9Gb9Yiu^Jg
z#gbzrs?Lm|X1aW@PEhPUJ>mAMWht0*bg9d&x@$F<vu*Y4;>#zKgxlp-UW!N;XM1Rz
zal8X@`58||WR=tQ849gCqw7o*xZ)Ft=b*(dgpv#M4)s9}NFau^>?R^0IPjF8`;Z(N
z0RivN8*KmWLt36bo(>l7cJ}ta=SPpe6Uv&`NETTin4$w?5eZijl@2oj#1CLa%a<Kh
zuXoWsDo#=j$sUtVZacL>=rv3>Btz0*Y88%ol=Xb(HI>J=g*!FYJB08>L)0m&!5)-A
z$1EsXt_G5U!QcSuo#AR}$x}UV%Pw{s!X#V1n9JY5NPhq)G<DbK7Z{pNI;@33k?t(&
zxi*U?RyC{ei!Uci^C5*QE`FCEK%}8X9R|4uH`ZP+r8IYsiOH$3WbiE{z*FTrE9sxj
z<+DBBd&1m5XqZ>%*0h?WHe%xujxiHsa@5_75PnuxdY(3tTWr=oiKc#<UR`utX1G6p
zq{aA7vYZp)gLvmB6_t|ZDwo1;7)mDA7|w>^51P!_X-M&mX!#TXc7K19D`Rht)#O?0
zolD%38?~n^O<5gly(+&@vI5Vhd&bs2zxK?ds>-*<y-G4uskuv2I@8Roxtq+|*QwG?
z&V-t8*vy`?L^Pzp;H3AQwONObwsbHEHxGt}eZ%c$?$?ZuP59MTZ+q<yZZV$n@Il|G
zBE$(ML)NO`ZSBL)a}pR+CSm4R%z@HRLZh@gHr|94h7Vw~+6N#0m00P^lW~z3kmp3n
zyr~zQTLHT#iajwE)hWsBaMRy2Twh?NvqNzp&5#dfDgUl|^Gc-ChK!^8v&)0Z1Gb&o
zQ`ZCqO!Pv4e)548insb^L0Ua?Z<*X)2d5AFnNG;C-5WNMBNS(~`pT?y%DT+n$K~z|
zHV?r&t=Rz9D?p#iOTpdUnt7x4aaoVUR(9=$PxKgxv%X@2jn=Z`hGb1x#^&o6apc6-
z8fuNgA<7r(_iZ$g=8IZ6-zHmL4Xk3<ALgqQF|y})&uCE8*uUKO)xC6qONKixI9UIh
zhBPIwwrs4q=^mgnO<1$IrQt3y(C}-rNG6qfO6M0V${O<yy86HF0`-y*oC$$6#7)hZ
z;`?Kh+G?s_$T_b*z%v3hkXGkKYD}iwjAM&e{a=`vuam1xN1fsTQP~1f-mOFka~)uU
zEy}G$MV0A3S22qei5kXL<5D}ZvRNd?g9uEI>~U2Ow@Wvt<;1_vPe;op@VuIm7Y-P=
zhvay_AdmT4#&9k(K5Hu2=8a0fDX-C83Nlsmy4-VhDlf8S&{-Uxzmr1uSTh_U_+t5i
zyZ+pfA^1-?f9c3N&cErwdiXZE)PFJRcM?cK^|J*5n*&4D#1AB$`<=QO-UKIIIOzZd
zfLh@Te{Tl`D6s7k;&RQqCl_@)NUnm&lTgwN?_B3k8_36s4iiZ0`EZ>cR*P8Mp2$t^
z3T9}xo%EIHgH$Vk`6P5>3;Jwm+O_tGRs6>ofE#!*azSX33))&08eiP9Wpm3;tDt6;
z7d_-bnP5(_ULg<;1#{(Zo-CysxfPzHJnwtTU=&buho~vgG;cq8l#9}GJO(<^#<T-I
zQHs9qQvp#L<O*yKFx8Bl&WlMfb_p$~L)s`Zm0Y3%S@Sm#xeqgU8|r#x$75d#q&+4M
z{j05DB~g%Edm5eO$tz^BSL`H?35x+cQ7BPw=@|#omR*`D;Z7k%NJ?>wZWNJ03tTMs
zOEDPAaRn(Ur{aL?`J^{Xs&F;v@i5yV;V%$=hUDa$Eh-No16X=FUHB7HxMC1VqqiA<
zv`u8zt2IG|6WjaEMU#_7g+&3TX8yI`zI@(}e<wKSBN<C=$vs!o9<>;~pqh%2ZC&GB
zJVk0xhZbY5N^2_-g;GWhTih#3au>L{t9BMdgVcbd61`;e)-s&27_luPP459u<A`O;
z1ok|~E~#n-Bd;i8xQZ8IcM+C8*z)j;gfmL~ilP6`2Km;k$t+X9%G4Sw=1dUnR`n(F
z5FX~|K^<rNaaEOEYynFhne0r_(ktt++;(}(6Qrw*;pq=p?dak|c9rf)^U_M+<+wRZ
z$}4SzsJRm&d@+&q&bphU(>>9hzr9VwO<K|MyR<`_QM~f+Ttj#()}*cmll#u1aLnRG
zInr?dpj-O72&wjv+n?f?8Fm-WM{r)g1*d7(3w2{m$e9K-uD=bH^-j4o1At)$g}p)b
zTrk@9`o`-QHHlh9R-cAmWm)$lLP1wL7;<HiU9Oi=8u1Taifg3yo}`R<3VU>)KTYA|
z#mW-2h7{W36QI69eR!p~<Wh^>iU_qTH1&!biz<V)#j+SRNu=7CziZNkn0HlY-oN9X
zfyRbMv~fLbbfnOj_2YygUzQWop1(am@G-J#tmG<Eu5a&qHvK*bp~H#y$OFIA)g&YW
zocLe8=20c*IlNCE8aC+Q-S0^@lNA3CCGt4TQ9<Q_EcDQ@LHF=7(*J}=^eEziQ1hs0
z>7dtsXxJb#7Q+9KZ1XtgQ8m$l9O}@pK~5Y$jPjr9@c*b9{R!vkIQ&sM{y{VH(6B*Q
zIe#_e-xe?(2RzEO{c%?B^ZW|%_c{N^5sy;L4j8<Lh7Drj|0&`jpW;vWyvIS0a=#AP
zYlnsnN)-Ng)B11me`8*c5=st|$V0;h-4^-fpnsolc6`W3JKjHfPrAe}A^)K2b{z9)
z7wE^Iuk+=fV*Y7o{W##!D&vpOwL|__fPc_xIu3cXQt%_>r0TCA{~wR_XkzsvWHk7v
zkbho~I6lgwA>cvAc4*k39<5(N{$c)h9QNowcMxA58a62H`mbPrH`>(IBq2TcP8$3r
Ni{DEH3<&Xe{{o+^{JH=D

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Resources/TestResources.cs b/osu.Game.Tests/Resources/TestResources.cs
index e882229570..14bc2c8733 100644
--- a/osu.Game.Tests/Resources/TestResources.cs
+++ b/osu.Game.Tests/Resources/TestResources.cs
@@ -13,8 +13,31 @@ namespace osu.Game.Tests.Resources
 
         public static Stream OpenResource(string name) => GetStore().GetStream($"Resources/{name}");
 
-        public static Stream GetTestBeatmapStream(bool virtualTrack = false) => OpenResource($"Archives/241526 Soleily - Renatus{(virtualTrack ? "_virtual" : "")}.osz");
+        public static Stream GetTestBeatmapStream(bool virtualTrack = false, bool quick = false) => OpenResource($"Archives/241526 Soleily - Renatus{(virtualTrack ? "_virtual" : "")}{(quick ? "_quick" : "")}.osz");
 
+        /// <summary>
+        /// Retrieve a path to a copy of a shortened (~10 second) beatmap archive with a virtual track.
+        /// </summary>
+        /// <remarks>
+        /// This is intended for use in tests which need to run to completion as soon as possible and don't need to test a full length beatmap.</remarks>
+        /// <returns>A path to a copy of a beatmap archive (osz). Should be deleted after use.</returns>
+        public static string GetQuickTestBeatmapForImport()
+        {
+            var tempPath = Path.GetTempFileName() + ".osz";
+
+            using (var stream = GetTestBeatmapStream(true, true))
+            using (var newFile = File.Create(tempPath))
+                stream.CopyTo(newFile);
+
+            Assert.IsTrue(File.Exists(tempPath));
+            return tempPath;
+        }
+
+        /// <summary>
+        /// Retrieve a path to a copy of a full-fledged beatmap archive.
+        /// </summary>
+        /// <param name="virtualTrack">Whether the audio track should be virtual.</param>
+        /// <returns>A path to a copy of a beatmap archive (osz). Should be deleted after use.</returns>
         public static string GetTestBeatmapForImport(bool virtualTrack = false)
         {
             var tempPath = Path.GetTempFileName() + ".osz";
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index d8380b2dd3..e5959a3edf 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Tests.Visual.Navigation
 
             PushAndConfirm(() => new TestSongSelect());
 
-            AddStep("import beatmap", () => ImportBeatmapTest.LoadOszIntoOsu(Game, virtualTrack: true).Wait());
+            AddStep("import beatmap", () => ImportBeatmapTest.LoadQuickOszIntoOsu(Game).Wait());
 
             AddUntilStep("wait for selected", () => !Game.Beatmap.IsDefault);
 

From cdbf8de29db80994e903c1e92837d6208e78312f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 22 Feb 2021 14:53:32 +0900
Subject: [PATCH 1630/3722] Update other tests which can benefit from using a
 shorter beatmap

---
 .../Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs     | 2 +-
 osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs | 2 +-
 .../Visual/Collections/TestSceneManageCollectionsDialog.cs      | 2 +-
 .../Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs       | 2 +-
 osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs   | 2 +-
 osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs      | 2 +-
 .../Visual/UserInterface/TestSceneDeleteLocalScore.cs           | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs b/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs
index 3ffb512b7f..8c30802ce3 100644
--- a/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs
+++ b/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Tests.Online
         {
             beatmaps.AllowImport = new TaskCompletionSource<bool>();
 
-            testBeatmapFile = TestResources.GetTestBeatmapForImport();
+            testBeatmapFile = TestResources.GetQuickTestBeatmapForImport();
 
             testBeatmapInfo = getTestBeatmapInfo(testBeatmapFile);
             testBeatmapSet = testBeatmapInfo.BeatmapSet;
diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
index 7ade7725d9..ba4d12b19f 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Tests.Visual.Background
             Dependencies.Cache(manager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, host, Beatmap.Default));
             Dependencies.Cache(new OsuConfigManager(LocalStorage));
 
-            manager.Import(TestResources.GetTestBeatmapForImport()).Wait();
+            manager.Import(TestResources.GetQuickTestBeatmapForImport()).Wait();
 
             Beatmap.SetDefault();
         }
diff --git a/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs b/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
index fef1605f0c..1655adf811 100644
--- a/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
+++ b/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Tests.Visual.Collections
             Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
             Dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, Audio, host, Beatmap.Default));
 
-            beatmapManager.Import(TestResources.GetTestBeatmapForImport()).Wait();
+            beatmapManager.Import(TestResources.GetQuickTestBeatmapForImport()).Wait();
 
             base.Content.AddRange(new Drawable[]
             {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
index 3b3b1bee86..b44e5b1e5b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
             Dependencies.Cache(beatmaps = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, host, Beatmap.Default));
-            beatmaps.Import(TestResources.GetTestBeatmapForImport(true)).Wait();
+            beatmaps.Import(TestResources.GetQuickTestBeatmapForImport()).Wait();
 
             Add(beatmapTracker = new OnlinePlayBeatmapAvailablilityTracker
             {
diff --git a/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs b/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs
index 63bda08c88..0c199bfb62 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Tests.Visual.Online
             ensureSoleilyRemoved();
             createButtonWithBeatmap(createSoleily());
             AddAssert("button state not downloaded", () => downloadButton.DownloadState == DownloadState.NotDownloaded);
-            AddStep("import soleily", () => beatmaps.Import(TestResources.GetTestBeatmapForImport()));
+            AddStep("import soleily", () => beatmaps.Import(TestResources.GetQuickTestBeatmapForImport()));
             AddUntilStep("wait for beatmap import", () => beatmaps.GetAllUsableBeatmapSets().Any(b => b.OnlineBeatmapSetID == 241526));
             createButtonWithBeatmap(createSoleily());
             AddAssert("button state downloaded", () => downloadButton.DownloadState == DownloadState.LocallyAvailable);
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
index 5d0fb248df..c13bdf0955 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
             Dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, Audio, host, Beatmap.Default));
 
-            beatmapManager.Import(TestResources.GetTestBeatmapForImport()).Wait();
+            beatmapManager.Import(TestResources.GetQuickTestBeatmapForImport()).Wait();
 
             base.Content.AddRange(new Drawable[]
             {
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
index 81862448a8..d615f1f440 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
@@ -84,7 +84,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, ContextFactory, rulesetStore, null, dependencies.Get<AudioManager>(), dependencies.Get<GameHost>(), Beatmap.Default));
             dependencies.Cache(scoreManager = new ScoreManager(rulesetStore, () => beatmapManager, LocalStorage, null, ContextFactory));
 
-            beatmap = beatmapManager.Import(new ImportTask(TestResources.GetTestBeatmapForImport())).Result.Beatmaps[0];
+            beatmap = beatmapManager.Import(new ImportTask(TestResources.GetQuickTestBeatmapForImport())).Result.Beatmaps[0];
 
             for (int i = 0; i < 50; i++)
             {

From fde026d44342534f7d06ddc0873e18f3f24e7070 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 22 Feb 2021 14:54:48 +0900
Subject: [PATCH 1631/3722] Remove redundant interface specification

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

diff --git a/osu.Game/Skinning/PoolableSkinnableSample.cs b/osu.Game/Skinning/PoolableSkinnableSample.cs
index 5a0cf94d6a..9103a6a960 100644
--- a/osu.Game/Skinning/PoolableSkinnableSample.cs
+++ b/osu.Game/Skinning/PoolableSkinnableSample.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Skinning
     /// <summary>
     /// A sample corresponding to an <see cref="ISampleInfo"/> that supports being pooled and responding to skin changes.
     /// </summary>
-    public class PoolableSkinnableSample : SkinReloadableDrawable, IAggregateAudioAdjustment, IAdjustableAudioComponent
+    public class PoolableSkinnableSample : SkinReloadableDrawable, IAdjustableAudioComponent
     {
         /// <summary>
         /// The currently-loaded <see cref="DrawableSample"/>.

From adf2dc36c9112200699ac8680b81a32bda9b937f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 22 Feb 2021 15:43:58 +0900
Subject: [PATCH 1632/3722] Fix PlaylistResults tests performing delays in
 real-time when headless

---
 .../TestScenePlaylistsResultsScreen.cs        | 87 +++++++------------
 1 file changed, 32 insertions(+), 55 deletions(-)

diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
index cdcded8f61..e34da1ef0c 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
@@ -76,7 +76,7 @@ namespace osu.Game.Tests.Visual.Playlists
             AddStep("bind user score info handler", () =>
             {
                 userScore = new TestScoreInfo(new OsuRuleset().RulesetInfo) { OnlineScoreID = currentScoreId++ };
-                bindHandler(3000, userScore);
+                bindHandler(true, userScore);
             });
 
             createResults(() => userScore);
@@ -89,7 +89,7 @@ namespace osu.Game.Tests.Visual.Playlists
         [Test]
         public void TestShowNullUserScoreWithDelay()
         {
-            AddStep("bind delayed handler", () => bindHandler(3000));
+            AddStep("bind delayed handler", () => bindHandler(true));
 
             createResults();
             waitForDisplay();
@@ -103,7 +103,7 @@ namespace osu.Game.Tests.Visual.Playlists
             createResults();
             waitForDisplay();
 
-            AddStep("bind delayed handler", () => bindHandler(3000));
+            AddStep("bind delayed handler", () => bindHandler(true));
 
             for (int i = 0; i < 2; i++)
             {
@@ -134,7 +134,7 @@ namespace osu.Game.Tests.Visual.Playlists
             createResults(() => userScore);
             waitForDisplay();
 
-            AddStep("bind delayed handler", () => bindHandler(3000));
+            AddStep("bind delayed handler", () => bindHandler(true));
 
             for (int i = 0; i < 2; i++)
             {
@@ -169,70 +169,47 @@ namespace osu.Game.Tests.Visual.Playlists
             AddWaitStep("wait for display", 5);
         }
 
-        private void bindHandler(double delay = 0, ScoreInfo userScore = null, bool failRequests = false) => ((DummyAPIAccess)API).HandleRequest = request =>
+        private void bindHandler(bool delayed = false, ScoreInfo userScore = null, bool failRequests = false) => ((DummyAPIAccess)API).HandleRequest = request =>
         {
             requestComplete = false;
 
-            if (failRequests)
-            {
-                triggerFail(request, delay);
-                return;
-            }
+            double delay = delayed ? 3000 : 0;
 
-            switch (request)
+            Scheduler.AddDelayed(() =>
             {
-                case ShowPlaylistUserScoreRequest s:
-                    if (userScore == null)
-                        triggerFail(s, delay);
-                    else
-                        triggerSuccess(s, createUserResponse(userScore), delay);
-                    break;
+                if (failRequests)
+                {
+                    triggerFail(request);
+                    return;
+                }
 
-                case IndexPlaylistScoresRequest i:
-                    triggerSuccess(i, createIndexResponse(i), delay);
-                    break;
-            }
+                switch (request)
+                {
+                    case ShowPlaylistUserScoreRequest s:
+                        if (userScore == null)
+                            triggerFail(s);
+                        else
+                            triggerSuccess(s, createUserResponse(userScore));
+                        break;
+
+                    case IndexPlaylistScoresRequest i:
+                        triggerSuccess(i, createIndexResponse(i));
+                        break;
+                }
+            }, delay);
         };
 
-        private void triggerSuccess<T>(APIRequest<T> req, T result, double delay)
+        private void triggerSuccess<T>(APIRequest<T> req, T result)
             where T : class
         {
-            if (delay == 0)
-                success();
-            else
-            {
-                Task.Run(async () =>
-                {
-                    await Task.Delay(TimeSpan.FromMilliseconds(delay));
-                    Schedule(success);
-                });
-            }
-
-            void success()
-            {
-                requestComplete = true;
-                req.TriggerSuccess(result);
-            }
+            requestComplete = true;
+            req.TriggerSuccess(result);
         }
 
-        private void triggerFail(APIRequest req, double delay)
+        private void triggerFail(APIRequest req)
         {
-            if (delay == 0)
-                fail();
-            else
-            {
-                Task.Run(async () =>
-                {
-                    await Task.Delay(TimeSpan.FromMilliseconds(delay));
-                    Schedule(fail);
-                });
-            }
-
-            void fail()
-            {
-                requestComplete = true;
-                req.TriggerFailure(new WebException("Failed."));
-            }
+            requestComplete = true;
+            req.TriggerFailure(new WebException("Failed."));
         }
 
         private MultiplayerScore createUserResponse([NotNull] ScoreInfo userScore)

From ccb83ef3a374f173b18473665c06c5002d68aecb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 22 Feb 2021 15:47:47 +0900
Subject: [PATCH 1633/3722] Fix checkbox not being updated

---
 osu.Game/Overlays/Mods/ModSection.cs          | 20 +++++++++----------
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    |  8 ++++++++
 .../OnlinePlay/FreeModSelectOverlay.cs        | 14 ++++++++++++-
 3 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index c3e56abd05..aa8a5efd39 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -23,13 +23,15 @@ namespace osu.Game.Overlays.Mods
 
         public FillFlowContainer<ModButtonEmpty> ButtonsContainer { get; }
 
+        protected IReadOnlyList<ModButton> Buttons { get; private set; } = Array.Empty<ModButton>();
+
         public Action<Mod> Action;
 
         public Key[] ToggleKeys;
 
         public readonly ModType ModType;
 
-        public IEnumerable<Mod> SelectedMods => buttons.Select(b => b.SelectedMod).Where(m => m != null);
+        public IEnumerable<Mod> SelectedMods => Buttons.Select(b => b.SelectedMod).Where(m => m != null);
 
         private CancellationTokenSource modsLoadCts;
 
@@ -77,7 +79,7 @@ namespace osu.Game.Overlays.Mods
                     ButtonsContainer.ChildrenEnumerable = c;
                 }, (modsLoadCts = new CancellationTokenSource()).Token);
 
-                buttons = modContainers.OfType<ModButton>().ToArray();
+                Buttons = modContainers.OfType<ModButton>().ToArray();
 
                 header.FadeIn(200);
                 this.FadeIn(200);
@@ -88,8 +90,6 @@ namespace osu.Game.Overlays.Mods
         {
         }
 
-        private ModButton[] buttons = Array.Empty<ModButton>();
-
         protected override bool OnKeyDown(KeyDownEvent e)
         {
             if (e.ControlPressed) return false;
@@ -97,8 +97,8 @@ namespace osu.Game.Overlays.Mods
             if (ToggleKeys != null)
             {
                 var index = Array.IndexOf(ToggleKeys, e.Key);
-                if (index > -1 && index < buttons.Length)
-                    buttons[index].SelectNext(e.ShiftPressed ? -1 : 1);
+                if (index > -1 && index < Buttons.Count)
+                    Buttons[index].SelectNext(e.ShiftPressed ? -1 : 1);
             }
 
             return base.OnKeyDown(e);
@@ -141,7 +141,7 @@ namespace osu.Game.Overlays.Mods
         {
             pendingSelectionOperations.Clear();
 
-            foreach (var button in buttons.Where(b => !b.Selected))
+            foreach (var button in Buttons.Where(b => !b.Selected))
                 pendingSelectionOperations.Enqueue(() => button.SelectAt(0));
         }
 
@@ -151,7 +151,7 @@ namespace osu.Game.Overlays.Mods
         public void DeselectAll()
         {
             pendingSelectionOperations.Clear();
-            DeselectTypes(buttons.Select(b => b.SelectedMod?.GetType()).Where(t => t != null));
+            DeselectTypes(Buttons.Select(b => b.SelectedMod?.GetType()).Where(t => t != null));
         }
 
         /// <summary>
@@ -161,7 +161,7 @@ namespace osu.Game.Overlays.Mods
         /// <param name="immediate">Whether the deselection should happen immediately. Should only be used when required to ensure correct selection flow.</param>
         public void DeselectTypes(IEnumerable<Type> modTypes, bool immediate = false)
         {
-            foreach (var button in buttons)
+            foreach (var button in Buttons)
             {
                 if (button.SelectedMod == null) continue;
 
@@ -184,7 +184,7 @@ namespace osu.Game.Overlays.Mods
         /// <param name="newSelectedMods">The new list of selected mods to select.</param>
         public void UpdateSelectedButtons(IReadOnlyList<Mod> newSelectedMods)
         {
-            foreach (var button in buttons)
+            foreach (var button in Buttons)
                 updateButtonSelection(button, newSelectedMods);
         }
 
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index eef91deb4c..26b8632d7f 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -456,6 +456,7 @@ namespace osu.Game.Overlays.Mods
             }
 
             updateSelectedButtons();
+            OnAvailableModsChanged();
         }
 
         /// <summary>
@@ -533,6 +534,13 @@ namespace osu.Game.Overlays.Mods
         private void playSelectedSound() => sampleOn?.Play();
         private void playDeselectedSound() => sampleOff?.Play();
 
+        /// <summary>
+        /// Invoked after <see cref="availableMods"/> has changed.
+        /// </summary>
+        protected virtual void OnAvailableModsChanged()
+        {
+        }
+
         /// <summary>
         /// Invoked when a new <see cref="Mod"/> has been selected.
         /// </summary>
diff --git a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
index ab7be13479..66262e7dc4 100644
--- a/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/FreeModSelectOverlay.cs
@@ -75,6 +75,14 @@ namespace osu.Game.Screens.OnlinePlay
                 section.DeselectAll();
         }
 
+        protected override void OnAvailableModsChanged()
+        {
+            base.OnAvailableModsChanged();
+
+            foreach (var section in ModSectionsContainer.Children)
+                ((FreeModSection)section).UpdateCheckboxState();
+        }
+
         protected override ModSection CreateModSection(ModType type) => new FreeModSection(type);
 
         private class FreeModSection : ModSection
@@ -108,10 +116,14 @@ namespace osu.Game.Screens.OnlinePlay
             protected override void ModButtonStateChanged(Mod mod)
             {
                 base.ModButtonStateChanged(mod);
+                UpdateCheckboxState();
+            }
 
+            public void UpdateCheckboxState()
+            {
                 if (!SelectionAnimationRunning)
                 {
-                    var validButtons = ButtonsContainer.OfType<ModButton>().Where(b => b.Mod.HasImplementation);
+                    var validButtons = Buttons.Where(b => b.Mod.HasImplementation);
                     checkbox.Current.Value = validButtons.All(b => b.Selected);
                 }
             }

From d985b8ab2aafd86c9f4d24fdcd39634de8a0b10c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 22 Feb 2021 17:14:39 +0900
Subject: [PATCH 1634/3722] Increase beatmapset download timeout

---
 osu.Game/Online/API/Requests/DownloadBeatmapSetRequest.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Online/API/Requests/DownloadBeatmapSetRequest.cs b/osu.Game/Online/API/Requests/DownloadBeatmapSetRequest.cs
index 707c59436d..e8871bef05 100644
--- a/osu.Game/Online/API/Requests/DownloadBeatmapSetRequest.cs
+++ b/osu.Game/Online/API/Requests/DownloadBeatmapSetRequest.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.IO.Network;
 using osu.Game.Beatmaps;
 
 namespace osu.Game.Online.API.Requests
@@ -15,6 +16,13 @@ namespace osu.Game.Online.API.Requests
             this.noVideo = noVideo;
         }
 
+        protected override WebRequest CreateWebRequest()
+        {
+            var req = base.CreateWebRequest();
+            req.Timeout = 60000;
+            return req;
+        }
+
         protected override string Target => $@"beatmapsets/{Model.OnlineBeatmapSetID}/download{(noVideo ? "?noVideo=1" : "")}";
     }
 }

From 0bda9e4b794f16d108f234563746202bf3b8a160 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 22 Feb 2021 18:31:33 +0900
Subject: [PATCH 1635/3722] Implement some new methods

---
 osu.Game/Skinning/LegacySkin.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 2edc36a770..6bdc4575c9 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -529,6 +529,14 @@ namespace osu.Game.Skinning
             {
                 sample.RemoveAllAdjustments(type);
             }
+
+            public IBindable<double> AggregateVolume => sample.AggregateVolume;
+
+            public IBindable<double> AggregateBalance => sample.AggregateBalance;
+
+            public IBindable<double> AggregateFrequency => sample.AggregateFrequency;
+
+            public IBindable<double> AggregateTempo => sample.AggregateTempo;
         }
 
         private IEnumerable<string> getLegacyLookupNames(HitSampleInfo hitSample)

From f48e017ac901bcd5387a87d53b2a5ab5dc771d06 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 22 Feb 2021 18:34:05 +0900
Subject: [PATCH 1636/3722] Move nested class to bottom of file

---
 osu.Game/Skinning/LegacySkin.cs | 78 ++++++++++++++++-----------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 6bdc4575c9..571d65e28b 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -468,7 +468,45 @@ namespace osu.Game.Skinning
             return null;
         }
 
-        /// <summary>
+        private IEnumerable<string> getLegacyLookupNames(HitSampleInfo hitSample)
+        {
+            var lookupNames = hitSample.LookupNames.SelectMany(getFallbackNames);
+
+            if (!UseCustomSampleBanks && !string.IsNullOrEmpty(hitSample.Suffix))
+            {
+                // for compatibility with stable, exclude the lookup names with the custom sample bank suffix, if they are not valid for use in this skin.
+                // using .EndsWith() is intentional as it ensures parity in all edge cases
+                // (see LegacyTaikoSampleInfo for an example of one - prioritising the taiko prefix should still apply, but the sample bank should not).
+                lookupNames = lookupNames.Where(name => !name.EndsWith(hitSample.Suffix, StringComparison.Ordinal));
+            }
+
+            foreach (var l in lookupNames)
+                yield return l;
+
+            // also for compatibility, try falling back to non-bank samples (so-called "universal" samples) as the last resort.
+            // going forward specifying banks shall always be required, even for elements that wouldn't require it on stable,
+            // which is why this is done locally here.
+            yield return hitSample.Name;
+        }
+
+        private IEnumerable<string> getFallbackNames(string componentName)
+        {
+            // May be something like "Gameplay/osu/approachcircle" from lazer, or "Arrows/note1" from a user skin.
+            yield return componentName;
+
+            // Fall back to using the last piece for components coming from lazer (e.g. "Gameplay/osu/approachcircle" -> "approachcircle").
+            string lastPiece = componentName.Split('/').Last();
+            yield return componentName.StartsWith("Gameplay/taiko/", StringComparison.Ordinal) ? "taiko-" + lastPiece : lastPiece;
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            Textures?.Dispose();
+            Samples?.Dispose();
+        }
+
+          /// <summary>
         /// A sample wrapper which keeps a reference to the contained skin to avoid finalizer garbage collection of the managing SampleStore.
         /// </summary>
         private class LegacySkinSample : ISample
@@ -538,43 +576,5 @@ namespace osu.Game.Skinning
 
             public IBindable<double> AggregateTempo => sample.AggregateTempo;
         }
-
-        private IEnumerable<string> getLegacyLookupNames(HitSampleInfo hitSample)
-        {
-            var lookupNames = hitSample.LookupNames.SelectMany(getFallbackNames);
-
-            if (!UseCustomSampleBanks && !string.IsNullOrEmpty(hitSample.Suffix))
-            {
-                // for compatibility with stable, exclude the lookup names with the custom sample bank suffix, if they are not valid for use in this skin.
-                // using .EndsWith() is intentional as it ensures parity in all edge cases
-                // (see LegacyTaikoSampleInfo for an example of one - prioritising the taiko prefix should still apply, but the sample bank should not).
-                lookupNames = lookupNames.Where(name => !name.EndsWith(hitSample.Suffix, StringComparison.Ordinal));
-            }
-
-            foreach (var l in lookupNames)
-                yield return l;
-
-            // also for compatibility, try falling back to non-bank samples (so-called "universal" samples) as the last resort.
-            // going forward specifying banks shall always be required, even for elements that wouldn't require it on stable,
-            // which is why this is done locally here.
-            yield return hitSample.Name;
-        }
-
-        private IEnumerable<string> getFallbackNames(string componentName)
-        {
-            // May be something like "Gameplay/osu/approachcircle" from lazer, or "Arrows/note1" from a user skin.
-            yield return componentName;
-
-            // Fall back to using the last piece for components coming from lazer (e.g. "Gameplay/osu/approachcircle" -> "approachcircle").
-            string lastPiece = componentName.Split('/').Last();
-            yield return componentName.StartsWith("Gameplay/taiko/", StringComparison.Ordinal) ? "taiko-" + lastPiece : lastPiece;
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-            Textures?.Dispose();
-            Samples?.Dispose();
-        }
     }
 }

From 1fd76ea3fb9db1d7e80e92fbd9e9cdb40353683c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 22 Feb 2021 17:14:00 +0900
Subject: [PATCH 1637/3722] Apply changes to UI components overriding functions
 with changing signatures

---
 osu.Game.Rulesets.Osu/Skinning/Default/NumberPiece.cs    | 2 +-
 .../Ranking/TestSceneExpandedPanelMiddleContent.cs       | 2 +-
 .../Visual/Settings/TestSceneKeyBindingPanel.cs          | 4 ++--
 .../Visual/SongSelect/TestSceneBeatmapInfoWedge.cs       | 2 +-
 .../Visual/UserInterface/TestSceneDeleteLocalScore.cs    | 2 +-
 osu.Game/Collections/CollectionFilterDropdown.cs         | 5 +++--
 osu.Game/Graphics/Sprites/GlowingSpriteText.cs           | 3 ++-
 osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs   | 3 ++-
 osu.Game/Graphics/UserInterface/OsuButton.cs             | 5 +++--
 osu.Game/Graphics/UserInterface/OsuDropdown.cs           | 5 +++--
 osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs | 3 ++-
 osu.Game/Graphics/UserInterface/ShowMoreButton.cs        | 3 ++-
 osu.Game/Graphics/UserInterface/TriangleButton.cs        | 2 +-
 .../Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs   | 1 -
 .../Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs   | 1 -
 osu.Game/Overlays/BeatmapSet/BasicStats.cs               | 3 ++-
 .../BeatmapSet/Scores/TopScoreStatisticsSection.cs       | 1 -
 osu.Game/Overlays/Chat/Selection/ChannelSection.cs       | 9 ++-------
 .../Overlays/Chat/Selection/ChannelSelectionOverlay.cs   | 6 +-----
 .../Overlays/Comments/Buttons/CommentRepliesButton.cs    | 3 ++-
 osu.Game/Overlays/KeyBinding/KeyBindingRow.cs            | 2 +-
 osu.Game/Overlays/Notifications/NotificationSection.cs   | 7 ++++---
 osu.Game/Overlays/NowPlayingOverlay.cs                   | 1 -
 osu.Game/Overlays/OverlaySortTabControl.cs               | 3 ++-
 .../Sections/Historical/DrawableMostPlayedBeatmap.cs     | 1 -
 .../Profile/Sections/Ranks/DrawableProfileScore.cs       | 1 -
 .../Settings/Sections/Audio/AudioDevicesSettings.cs      | 3 ++-
 .../Settings/Sections/Graphics/LayoutSettings.cs         | 3 ++-
 osu.Game/Overlays/Settings/Sections/SkinSection.cs       | 2 +-
 osu.Game/Overlays/Settings/SettingsCheckbox.cs           | 8 +++++---
 osu.Game/Overlays/Settings/SettingsItem.cs               | 5 +++--
 osu.Game/Overlays/Toolbar/ToolbarButton.cs               | 7 ++++---
 osu.Game/Screens/Menu/SongTicker.cs                      | 1 -
 osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs   | 1 -
 .../Playlists/PlaylistsMatchSettingsOverlay.cs           | 3 ++-
 osu.Game/Screens/Play/BeatmapMetadataDisplay.cs          | 1 -
 .../Ranking/Expanded/ExpandedPanelMiddleContent.cs       | 1 -
 osu.Game/Screens/Select/Carousel/SetPanelContent.cs      | 1 -
 osu.Game/Screens/Select/Details/AdvancedStats.cs         | 3 ++-
 osu.Game/Screens/Select/FooterButton.cs                  | 5 +++--
 osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs  | 5 +++--
 osu.Game/Skinning/SkinnableSpriteText.cs                 | 5 +++--
 42 files changed, 68 insertions(+), 66 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/NumberPiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/NumberPiece.cs
index bea6186501..43d8d1e27f 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/NumberPiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/NumberPiece.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
         public string Text
         {
-            get => number.Text;
+            get => number.Text.ToString();
             set => number.Text = value;
         }
 
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
index 7be44a62de..f9fe42131f 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Tests.Visual.Ranking
             }));
 
             AddAssert("mapped by text not present", () =>
-                this.ChildrenOfType<OsuSpriteText>().All(spriteText => !containsAny(spriteText.Text, "mapped", "by")));
+                this.ChildrenOfType<OsuSpriteText>().All(spriteText => !containsAny(spriteText.Text.ToString(), "mapped", "by")));
         }
 
         private void showPanel(ScoreInfo score) => Child = new ExpandedPanelMiddleContentContainer(score);
diff --git a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
index 8330b9b360..f495e0fb23 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Tests.Visual.Settings
 
             clickClearButton();
 
-            AddAssert("first binding cleared", () => string.IsNullOrEmpty(multiBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().First().Text.Text));
+            AddAssert("first binding cleared", () => string.IsNullOrEmpty(multiBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().First().Text.Text.ToString()));
 
             AddStep("click second binding", () =>
             {
@@ -90,7 +90,7 @@ namespace osu.Game.Tests.Visual.Settings
 
             clickClearButton();
 
-            AddAssert("second binding cleared", () => string.IsNullOrEmpty(multiBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().ElementAt(1).Text.Text));
+            AddAssert("second binding cleared", () => string.IsNullOrEmpty(multiBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().ElementAt(1).Text.Text.ToString()));
 
             void clickClearButton()
             {
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
index 0b2c0ce63b..fff4a9ba61 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
@@ -119,7 +119,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         public void TestNullBeatmap()
         {
             selectBeatmap(null);
-            AddAssert("check empty version", () => string.IsNullOrEmpty(infoWedge.Info.VersionLabel.Text));
+            AddAssert("check empty version", () => string.IsNullOrEmpty(infoWedge.Info.VersionLabel.Text.ToString()));
             AddAssert("check default title", () => infoWedge.Info.TitleLabel.Text == Beatmap.Default.BeatmapInfo.Metadata.Title);
             AddAssert("check default artist", () => infoWedge.Info.ArtistLabel.Text == Beatmap.Default.BeatmapInfo.Metadata.Artist);
             AddAssert("check empty author", () => !infoWedge.Info.MapperContainer.Children.Any());
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
index 81862448a8..1516a7d621 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
@@ -145,7 +145,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             AddStep("click delete option", () =>
             {
-                InputManager.MoveMouseTo(contextMenuContainer.ChildrenOfType<DrawableOsuMenuItem>().First(i => i.Item.Text.Value.ToLowerInvariant() == "delete"));
+                InputManager.MoveMouseTo(contextMenuContainer.ChildrenOfType<DrawableOsuMenuItem>().First(i => i.Item.Text.Value.ToString().ToLowerInvariant() == "delete"));
                 InputManager.Click(MouseButton.Left);
             });
 
diff --git a/osu.Game/Collections/CollectionFilterDropdown.cs b/osu.Game/Collections/CollectionFilterDropdown.cs
index bb743d4ccc..1eceb56e33 100644
--- a/osu.Game/Collections/CollectionFilterDropdown.cs
+++ b/osu.Game/Collections/CollectionFilterDropdown.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -121,7 +122,7 @@ namespace osu.Game.Collections
             Current.TriggerChange();
         }
 
-        protected override string GenerateItemText(CollectionFilterMenuItem item) => item.CollectionName.Value;
+        protected override LocalisableString GenerateItemText(CollectionFilterMenuItem item) => item.CollectionName.Value;
 
         protected sealed override DropdownHeader CreateHeader() => CreateCollectionHeader().With(d =>
         {
@@ -139,7 +140,7 @@ namespace osu.Game.Collections
             public readonly Bindable<CollectionFilterMenuItem> SelectedItem = new Bindable<CollectionFilterMenuItem>();
             private readonly Bindable<string> collectionName = new Bindable<string>();
 
-            protected override string Label
+            protected override LocalisableString Label
             {
                 get => base.Label;
                 set { } // See updateText().
diff --git a/osu.Game/Graphics/Sprites/GlowingSpriteText.cs b/osu.Game/Graphics/Sprites/GlowingSpriteText.cs
index 85df2d167f..fb273d7293 100644
--- a/osu.Game/Graphics/Sprites/GlowingSpriteText.cs
+++ b/osu.Game/Graphics/Sprites/GlowingSpriteText.cs
@@ -6,6 +6,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
 using osuTK;
 
 namespace osu.Game.Graphics.Sprites
@@ -14,7 +15,7 @@ namespace osu.Game.Graphics.Sprites
     {
         private readonly OsuSpriteText spriteText, blurredText;
 
-        public string Text
+        public LocalisableString Text
         {
             get => spriteText.Text;
             set => blurredText.Text = spriteText.Text = value;
diff --git a/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs b/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs
index b499b26f38..8df2c1c2fd 100644
--- a/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs
+++ b/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Game.Graphics.Sprites;
 using osuTK.Graphics;
 
@@ -105,7 +106,7 @@ namespace osu.Game.Graphics.UserInterface
 
         protected class TextContainer : Container, IHasText
         {
-            public string Text
+            public LocalisableString Text
             {
                 get => NormalText.Text;
                 set
diff --git a/osu.Game/Graphics/UserInterface/OsuButton.cs b/osu.Game/Graphics/UserInterface/OsuButton.cs
index 9cf8f02024..d2114134cf 100644
--- a/osu.Game/Graphics/UserInterface/OsuButton.cs
+++ b/osu.Game/Graphics/UserInterface/OsuButton.cs
@@ -11,6 +11,7 @@ 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.Sprites;
 using osuTK.Graphics;
 
@@ -21,9 +22,9 @@ namespace osu.Game.Graphics.UserInterface
     /// </summary>
     public class OsuButton : Button
     {
-        public string Text
+        public LocalisableString Text
         {
-            get => SpriteText?.Text;
+            get => SpriteText.Text;
             set
             {
                 if (SpriteText != null)
diff --git a/osu.Game/Graphics/UserInterface/OsuDropdown.cs b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
index cc76c12975..15fb00ccb0 100644
--- a/osu.Game/Graphics/UserInterface/OsuDropdown.cs
+++ b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Localisation;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osuTK;
@@ -168,7 +169,7 @@ namespace osu.Game.Graphics.UserInterface
 
                 protected new class Content : FillFlowContainer, IHasText
                 {
-                    public string Text
+                    public LocalisableString Text
                     {
                         get => Label.Text;
                         set => Label.Text = value;
@@ -215,7 +216,7 @@ namespace osu.Game.Graphics.UserInterface
         {
             protected readonly SpriteText Text;
 
-            protected override string Label
+            protected override LocalisableString Label
             {
                 get => Text.Text;
                 set => Text.Text = value;
diff --git a/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs b/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs
index bdc95ee048..b66a4a58ce 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs
@@ -11,6 +11,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 
 namespace osu.Game.Graphics.UserInterface
 {
@@ -35,7 +36,7 @@ namespace osu.Game.Graphics.UserInterface
             }
         }
 
-        public string Text
+        public LocalisableString Text
         {
             get => text.Text;
             set => text.Text = value;
diff --git a/osu.Game/Graphics/UserInterface/ShowMoreButton.cs b/osu.Game/Graphics/UserInterface/ShowMoreButton.cs
index 924c7913f3..615895074c 100644
--- a/osu.Game/Graphics/UserInterface/ShowMoreButton.cs
+++ b/osu.Game/Graphics/UserInterface/ShowMoreButton.cs
@@ -11,6 +11,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osuTK;
 using System.Collections.Generic;
+using osu.Framework.Localisation;
 
 namespace osu.Game.Graphics.UserInterface
 {
@@ -18,7 +19,7 @@ namespace osu.Game.Graphics.UserInterface
     {
         private const int duration = 200;
 
-        public string Text
+        public LocalisableString Text
         {
             get => text.Text;
             set => text.Text = value;
diff --git a/osu.Game/Graphics/UserInterface/TriangleButton.cs b/osu.Game/Graphics/UserInterface/TriangleButton.cs
index 5baf794227..003a81f562 100644
--- a/osu.Game/Graphics/UserInterface/TriangleButton.cs
+++ b/osu.Game/Graphics/UserInterface/TriangleButton.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Graphics.UserInterface
             });
         }
 
-        public virtual IEnumerable<string> FilterTerms => new[] { Text };
+        public virtual IEnumerable<string> FilterTerms => new[] { Text.ToString() };
 
         public bool MatchingFilter
         {
diff --git a/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs b/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
index c1d366bb82..97e7ce83a5 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
-using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
diff --git a/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs b/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
index 76a30d1c11..4a887ed571 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
diff --git a/osu.Game/Overlays/BeatmapSet/BasicStats.cs b/osu.Game/Overlays/BeatmapSet/BasicStats.cs
index a2464bef09..cf74c0d4d3 100644
--- a/osu.Game/Overlays/BeatmapSet/BasicStats.cs
+++ b/osu.Game/Overlays/BeatmapSet/BasicStats.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
@@ -96,7 +97,7 @@ namespace osu.Game.Overlays.BeatmapSet
 
             public string TooltipText { get; }
 
-            public string Value
+            public LocalisableString Value
             {
                 get => value.Text;
                 set => this.value.Text = value;
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index 93744dd6a3..c281d7b432 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -9,7 +9,6 @@ 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.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
diff --git a/osu.Game/Overlays/Chat/Selection/ChannelSection.cs b/osu.Game/Overlays/Chat/Selection/ChannelSection.cs
index eac48ca5cb..e18302770c 100644
--- a/osu.Game/Overlays/Chat/Selection/ChannelSection.cs
+++ b/osu.Game/Overlays/Chat/Selection/ChannelSection.cs
@@ -4,12 +4,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using osuTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.Chat;
+using osuTK;
 
 namespace osu.Game.Overlays.Chat.Selection
 {
@@ -29,12 +29,6 @@ namespace osu.Game.Overlays.Chat.Selection
 
         public bool FilteringActive { get; set; }
 
-        public string Header
-        {
-            get => header.Text;
-            set => header.Text = value.ToUpperInvariant();
-        }
-
         public IEnumerable<Channel> Channels
         {
             set => ChannelFlow.ChildrenEnumerable = value.Select(c => new ChannelListItem(c));
@@ -50,6 +44,7 @@ namespace osu.Game.Overlays.Chat.Selection
                 header = new OsuSpriteText
                 {
                     Font = OsuFont.GetFont(size: 15, weight: FontWeight.Bold),
+                    Text = "All Channels".ToUpperInvariant()
                 },
                 ChannelFlow = new FillFlowContainer<ChannelListItem>
                 {
diff --git a/osu.Game/Overlays/Chat/Selection/ChannelSelectionOverlay.cs b/osu.Game/Overlays/Chat/Selection/ChannelSelectionOverlay.cs
index be9ecc6746..231d7ca63c 100644
--- a/osu.Game/Overlays/Chat/Selection/ChannelSelectionOverlay.cs
+++ b/osu.Game/Overlays/Chat/Selection/ChannelSelectionOverlay.cs
@@ -131,11 +131,7 @@ namespace osu.Game.Overlays.Chat.Selection
             {
                 sectionsFlow.ChildrenEnumerable = new[]
                 {
-                    new ChannelSection
-                    {
-                        Header = "All Channels",
-                        Channels = channels,
-                    },
+                    new ChannelSection { Channels = channels, },
                 };
 
                 foreach (ChannelSection s in sectionsFlow.Children)
diff --git a/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs b/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
index 57bf2af4d2..2f7f16dd6f 100644
--- a/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
+++ b/osu.Game/Overlays/Comments/Buttons/CommentRepliesButton.cs
@@ -6,6 +6,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
@@ -16,7 +17,7 @@ namespace osu.Game.Overlays.Comments.Buttons
 {
     public abstract class CommentRepliesButton : CompositeDrawable
     {
-        protected string Text
+        protected LocalisableString Text
         {
             get => text.Text;
             set => text.Text = value;
diff --git a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
index b808d49fa2..300fce962a 100644
--- a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
+++ b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Overlays.KeyBinding
         private FillFlowContainer cancelAndClearButtons;
         private FillFlowContainer<KeyButton> buttons;
 
-        public IEnumerable<string> FilterTerms => bindings.Select(b => b.KeyCombination.ReadableString()).Prepend((string)text.Text);
+        public IEnumerable<string> FilterTerms => bindings.Select(b => b.KeyCombination.ReadableString()).Prepend(text.Text.ToString());
 
         public KeyBindingRow(object action, IEnumerable<Framework.Input.Bindings.KeyBinding> bindings)
         {
diff --git a/osu.Game/Overlays/Notifications/NotificationSection.cs b/osu.Game/Overlays/Notifications/NotificationSection.cs
index 38ba712254..bc41311a6d 100644
--- a/osu.Game/Overlays/Notifications/NotificationSection.cs
+++ b/osu.Game/Overlays/Notifications/NotificationSection.cs
@@ -8,6 +8,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osuTK;
@@ -37,7 +38,7 @@ namespace osu.Game.Overlays.Notifications
 
         public NotificationSection(string title, string clearButtonText)
         {
-            this.clearButtonText = clearButtonText;
+            this.clearButtonText = clearButtonText.ToUpperInvariant();
             titleText = title;
         }
 
@@ -138,10 +139,10 @@ namespace osu.Game.Overlays.Notifications
                 };
             }
 
-            public string Text
+            public LocalisableString Text
             {
                 get => text.Text;
-                set => text.Text = value.ToUpperInvariant();
+                set => text.Text = value;
             }
         }
 
diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 2866d2ad6d..74317a143c 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -13,7 +13,6 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input.Events;
-using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
diff --git a/osu.Game/Overlays/OverlaySortTabControl.cs b/osu.Game/Overlays/OverlaySortTabControl.cs
index b2212336ef..0ebabd424f 100644
--- a/osu.Game/Overlays/OverlaySortTabControl.cs
+++ b/osu.Game/Overlays/OverlaySortTabControl.cs
@@ -17,6 +17,7 @@ using osu.Game.Overlays.Comments;
 using JetBrains.Annotations;
 using System;
 using osu.Framework.Extensions;
+using osu.Framework.Localisation;
 
 namespace osu.Game.Overlays
 {
@@ -30,7 +31,7 @@ namespace osu.Game.Overlays
             set => current.Current = value;
         }
 
-        public string Title
+        public LocalisableString Title
         {
             get => text.Text;
             set => text.Text = value;
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs b/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
index 5b7c5efbe2..e485802095 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
@@ -5,7 +5,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
index 2c20dcc0ef..859637485f 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
@@ -7,7 +7,6 @@ using osu.Framework.Allocation;
 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.Graphics;
 using osu.Game.Graphics.Sprites;
diff --git a/osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs b/osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs
index bed74542c9..b31e7dc45b 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs
@@ -6,6 +6,7 @@ using osu.Framework.Audio;
 using osu.Framework.Graphics;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Localisation;
 using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Settings.Sections.Audio
@@ -76,7 +77,7 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
 
             private class AudioDeviceDropdownControl : DropdownControl
             {
-                protected override string GenerateItemText(string item)
+                protected override LocalisableString GenerateItemText(string item)
                     => string.IsNullOrEmpty(item) ? "Default" : base.GenerateItemText(item);
             }
         }
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index 7acbf038d8..4d5c2e06eb 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -11,6 +11,7 @@ using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Localisation;
 using osu.Framework.Platform;
 using osu.Game.Configuration;
 using osu.Game.Graphics.Containers;
@@ -234,7 +235,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
 
             private class ResolutionDropdownControl : DropdownControl
             {
-                protected override string GenerateItemText(Size item)
+                protected override LocalisableString GenerateItemText(Size item)
                 {
                     if (item == new Size(9999, 9999))
                         return "Default";
diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 7c8309fd56..75068bd611 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -178,7 +178,7 @@ namespace osu.Game.Overlays.Settings.Sections
 
             private class SkinDropdownControl : DropdownControl
             {
-                protected override string GenerateItemText(SkinInfo item) => item.ToString();
+                protected override LocalisableString GenerateItemText(SkinInfo item) => item.ToString();
             }
         }
 
diff --git a/osu.Game/Overlays/Settings/SettingsCheckbox.cs b/osu.Game/Overlays/Settings/SettingsCheckbox.cs
index 437b2e45b3..8b7ac80a5b 100644
--- a/osu.Game/Overlays/Settings/SettingsCheckbox.cs
+++ b/osu.Game/Overlays/Settings/SettingsCheckbox.cs
@@ -2,20 +2,22 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
+using osu.Framework.Localisation;
 using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Settings
 {
     public class SettingsCheckbox : SettingsItem<bool>
     {
-        private string labelText;
+        private LocalisableString labelText;
 
         protected override Drawable CreateControl() => new OsuCheckbox();
 
-        public override string LabelText
+        public override LocalisableString LabelText
         {
             get => labelText;
-            set => ((OsuCheckbox)Control).LabelText = labelText = value;
+            // checkbox doesn't properly support localisation yet.
+            set => ((OsuCheckbox)Control).LabelText = (labelText = value).ToString();
         }
     }
 }
diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index af225889da..aafd7463a6 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -15,6 +15,7 @@ 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.Sprites;
 using osuTK;
@@ -39,7 +40,7 @@ namespace osu.Game.Overlays.Settings
 
         public string TooltipText { get; set; }
 
-        public virtual string LabelText
+        public virtual LocalisableString LabelText
         {
             get => labelText?.Text ?? string.Empty;
             set
@@ -69,7 +70,7 @@ namespace osu.Game.Overlays.Settings
             set => controlWithCurrent.Current = value;
         }
 
-        public virtual IEnumerable<string> FilterTerms => Keywords == null ? new[] { LabelText } : new List<string>(Keywords) { LabelText }.ToArray();
+        public virtual IEnumerable<string> FilterTerms => Keywords == null ? new[] { LabelText.ToString() } : new List<string>(Keywords) { LabelText.ToString() }.ToArray();
 
         public IEnumerable<string> Keywords { get; set; }
 
diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
index 83f2bdf6cb..7790a21e0a 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
@@ -12,6 +12,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
 using osu.Game.Graphics.Containers;
@@ -43,19 +44,19 @@ namespace osu.Game.Overlays.Toolbar
                 Texture = textures.Get(texture),
             });
 
-        public string Text
+        public LocalisableString Text
         {
             get => DrawableText.Text;
             set => DrawableText.Text = value;
         }
 
-        public string TooltipMain
+        public LocalisableString TooltipMain
         {
             get => tooltip1.Text;
             set => tooltip1.Text = value;
         }
 
-        public string TooltipSub
+        public LocalisableString TooltipSub
         {
             get => tooltip2.Text;
             set => tooltip2.Text = value;
diff --git a/osu.Game/Screens/Menu/SongTicker.cs b/osu.Game/Screens/Menu/SongTicker.cs
index c4943e77d5..fd9d9a3fac 100644
--- a/osu.Game/Screens/Menu/SongTicker.cs
+++ b/osu.Game/Screens/Menu/SongTicker.cs
@@ -9,7 +9,6 @@ using osuTK;
 using osu.Game.Graphics;
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
-using osu.Framework.Localisation;
 
 namespace osu.Game.Screens.Menu
 {
diff --git a/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs b/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
index acb82360b3..b64ea37a59 100644
--- a/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
@@ -4,7 +4,6 @@
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
index 2a1efbc040..5062a296a8 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
@@ -10,6 +10,7 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
@@ -362,7 +363,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                 Menu.MaxHeight = 100;
             }
 
-            protected override string GenerateItemText(TimeSpan item) => item.Humanize();
+            protected override LocalisableString GenerateItemText(TimeSpan item) => item.Humanize();
         }
     }
 }
diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index eff06e26ee..bb82b00100 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -7,7 +7,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index ff6203bc25..85a9b06a70 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -6,7 +6,6 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
diff --git a/osu.Game/Screens/Select/Carousel/SetPanelContent.cs b/osu.Game/Screens/Select/Carousel/SetPanelContent.cs
index 4e8d27f14d..82704c24fb 100644
--- a/osu.Game/Screens/Select/Carousel/SetPanelContent.cs
+++ b/osu.Game/Screens/Select/Carousel/SetPanelContent.cs
@@ -6,7 +6,6 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Localisation;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index ab4f3f4796..1627d3ddfc 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -15,6 +15,7 @@ using System.Collections.Generic;
 using osu.Game.Rulesets.Mods;
 using System.Linq;
 using System.Threading;
+using osu.Framework.Localisation;
 using osu.Framework.Threading;
 using osu.Framework.Utils;
 using osu.Game.Configuration;
@@ -180,7 +181,7 @@ namespace osu.Game.Screens.Select.Details
             [Resolved]
             private OsuColour colours { get; set; }
 
-            public string Title
+            public LocalisableString Title
             {
                 get => name.Text;
                 set => name.Text = value;
diff --git a/osu.Game/Screens/Select/FooterButton.cs b/osu.Game/Screens/Select/FooterButton.cs
index 35970cd960..7bdeacc91a 100644
--- a/osu.Game/Screens/Select/FooterButton.cs
+++ b/osu.Game/Screens/Select/FooterButton.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.Containers;
 
@@ -21,9 +22,9 @@ namespace osu.Game.Screens.Select
 
         protected static readonly Vector2 SHEAR = new Vector2(SHEAR_WIDTH / Footer.HEIGHT, 0);
 
-        public string Text
+        public LocalisableString Text
         {
-            get => SpriteText?.Text;
+            get => SpriteText.Text;
             set
             {
                 if (SpriteText != null)
diff --git a/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs b/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs
index 6e2f3cc9df..845c0a914e 100644
--- a/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs
+++ b/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osuTK;
@@ -39,13 +40,13 @@ namespace osu.Game.Screens.Select.Options
             set => iconText.Icon = value;
         }
 
-        public string FirstLineText
+        public LocalisableString FirstLineText
         {
             get => firstLine.Text;
             set => firstLine.Text = value;
         }
 
-        public string SecondLineText
+        public LocalisableString SecondLineText
         {
             get => secondLine.Text;
             set => secondLine.Text = value;
diff --git a/osu.Game/Skinning/SkinnableSpriteText.cs b/osu.Game/Skinning/SkinnableSpriteText.cs
index 567dd348e1..06461127b1 100644
--- a/osu.Game/Skinning/SkinnableSpriteText.cs
+++ b/osu.Game/Skinning/SkinnableSpriteText.cs
@@ -3,6 +3,7 @@
 
 using System;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
 
 namespace osu.Game.Skinning
 {
@@ -21,9 +22,9 @@ namespace osu.Game.Skinning
                 textDrawable.Text = Text;
         }
 
-        private string text;
+        private LocalisableString text;
 
-        public string Text
+        public LocalisableString Text
         {
             get => text;
             set

From 8a97e2e28da1f7ad257c3bdf28c98f7c6bfe826f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 22 Feb 2021 17:14:13 +0900
Subject: [PATCH 1638/3722] Update LocalisedString usages to RomanisedString

---
 osu.Game.Tournament/Components/TournamentBeatmapPanel.cs | 4 ++--
 .../Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs   | 5 +++--
 .../Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs   | 5 +++--
 .../BeatmapSet/Scores/TopScoreStatisticsSection.cs       | 2 +-
 osu.Game/Overlays/Music/PlaylistItem.cs                  | 4 ++--
 osu.Game/Overlays/NowPlayingOverlay.cs                   | 5 +++--
 .../Sections/Historical/DrawableMostPlayedBeatmap.cs     | 9 +++++----
 .../Profile/Sections/Ranks/DrawableProfileScore.cs       | 9 +++++----
 osu.Game/Overlays/Settings/Sections/SkinSection.cs       | 1 +
 osu.Game/Screens/Menu/SongTicker.cs                      | 5 +++--
 osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs   | 5 +++--
 osu.Game/Screens/Play/BeatmapMetadataDisplay.cs          | 5 +++--
 .../Ranking/Expanded/ExpandedPanelMiddleContent.cs       | 5 +++--
 osu.Game/Screens/Select/BeatmapInfoWedge.cs              | 4 ++--
 osu.Game/Screens/Select/Carousel/SetPanelContent.cs      | 5 +++--
 15 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index d1197b1a61..e6d73c6e83 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -74,9 +74,9 @@ namespace osu.Game.Tournament.Components
                     {
                         new TournamentSpriteText
                         {
-                            Text = new LocalisedString((
+                            Text = new RomanisableString(
                                 $"{Beatmap.Metadata.ArtistUnicode ?? Beatmap.Metadata.Artist} - {Beatmap.Metadata.TitleUnicode ?? Beatmap.Metadata.Title}",
-                                $"{Beatmap.Metadata.Artist} - {Beatmap.Metadata.Title}")),
+                                $"{Beatmap.Metadata.Artist} - {Beatmap.Metadata.Title}"),
                             Font = OsuFont.Torus.With(weight: FontWeight.Bold),
                         },
                         new FillFlowContainer
diff --git a/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs b/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
index 97e7ce83a5..ba4725b49a 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
@@ -83,14 +84,14 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                                     {
                                         new OsuSpriteText
                                         {
-                                            Text = new LocalisedString((SetInfo.Metadata.TitleUnicode, SetInfo.Metadata.Title)),
+                                            Text = new RomanisableString(SetInfo.Metadata.Title, SetInfo.Metadata.TitleUnicode),
                                             Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold, italics: true)
                                         },
                                     }
                                 },
                                 new OsuSpriteText
                                 {
-                                    Text = new LocalisedString((SetInfo.Metadata.ArtistUnicode, SetInfo.Metadata.Artist)),
+                                    Text = new RomanisableString(SetInfo.Metadata.Artist, SetInfo.Metadata.ArtistUnicode),
                                     Font = OsuFont.GetFont(weight: FontWeight.Bold, italics: true)
                                 },
                             },
diff --git a/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs b/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
index 4a887ed571..624cb89d1e 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
@@ -106,14 +107,14 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                                                             {
                                                                 new OsuSpriteText
                                                                 {
-                                                                    Text = new LocalisedString((SetInfo.Metadata.TitleUnicode, SetInfo.Metadata.Title)),
+                                                                    Text = new RomanisableString(SetInfo.Metadata.Title, SetInfo.Metadata.TitleUnicode),
                                                                     Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold, italics: true)
                                                                 },
                                                             }
                                                         },
                                                         new OsuSpriteText
                                                         {
-                                                            Text = new LocalisedString((SetInfo.Metadata.ArtistUnicode, SetInfo.Metadata.Artist)),
+                                                            Text = new RomanisableString(SetInfo.Metadata.Artist, SetInfo.Metadata.ArtistUnicode),
                                                             Font = OsuFont.GetFont(weight: FontWeight.Bold, italics: true)
                                                         },
                                                     }
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index c281d7b432..5cb834b510 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -203,7 +203,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 this.text = text;
             }
 
-            public LocalisedString Text
+            public string Text
             {
                 set => text.Text = value;
             }
diff --git a/osu.Game/Overlays/Music/PlaylistItem.cs b/osu.Game/Overlays/Music/PlaylistItem.cs
index 96dff39fae..dab9bc9629 100644
--- a/osu.Game/Overlays/Music/PlaylistItem.cs
+++ b/osu.Game/Overlays/Music/PlaylistItem.cs
@@ -48,8 +48,8 @@ namespace osu.Game.Overlays.Music
             artistColour = colours.Gray9;
             HandleColour = colours.Gray5;
 
-            title = localisation.GetLocalisedString(new LocalisedString((Model.Metadata.TitleUnicode, Model.Metadata.Title)));
-            artist = localisation.GetLocalisedString(new LocalisedString((Model.Metadata.ArtistUnicode, Model.Metadata.Artist)));
+            title = localisation.GetLocalisedString(new RomanisableString(Model.Metadata.Title, Model.Metadata.TitleUnicode));
+            artist = localisation.GetLocalisedString(new RomanisableString(Model.Metadata.Artist, Model.Metadata.ArtistUnicode));
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 74317a143c..9c17392e25 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -292,8 +293,8 @@ namespace osu.Game.Overlays
                     else
                     {
                         BeatmapMetadata metadata = beatmap.Metadata;
-                        title.Text = new LocalisedString((metadata.TitleUnicode, metadata.Title));
-                        artist.Text = new LocalisedString((metadata.ArtistUnicode, metadata.Artist));
+                        title.Text = new RomanisableString(metadata.Title, metadata.TitleUnicode);
+                        artist.Text = new RomanisableString(metadata.Artist, metadata.ArtistUnicode);
                     }
                 });
 
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs b/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
index e485802095..48a0481b9e 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
@@ -12,6 +12,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osuTK;
 using osu.Framework.Graphics.Cursor;
+using osu.Framework.Localisation;
 
 namespace osu.Game.Overlays.Profile.Sections.Historical
 {
@@ -128,14 +129,14 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
             {
                 new OsuSpriteText
                 {
-                    Text = new LocalisedString((
-                        $"{beatmap.Metadata.TitleUnicode ?? beatmap.Metadata.Title} [{beatmap.Version}] ",
-                        $"{beatmap.Metadata.Title ?? beatmap.Metadata.TitleUnicode} [{beatmap.Version}] ")),
+                    Text = new RomanisableString(
+                        $"{beatmap.Metadata.Title ?? beatmap.Metadata.TitleUnicode} [{beatmap.Version}] ",
+                        $"{beatmap.Metadata.TitleUnicode ?? beatmap.Metadata.Title} [{beatmap.Version}] "),
                     Font = OsuFont.GetFont(weight: FontWeight.Bold)
                 },
                 new OsuSpriteText
                 {
-                    Text = "by " + new LocalisedString((beatmap.Metadata.ArtistUnicode, beatmap.Metadata.Artist)),
+                    Text = "by " + new RomanisableString(beatmap.Metadata.Artist, beatmap.Metadata.ArtistUnicode),
                     Font = OsuFont.GetFont(weight: FontWeight.Regular)
                 },
             };
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
index 859637485f..ca9e19cd56 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
@@ -7,6 +7,7 @@ using osu.Framework.Allocation;
 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.Graphics;
 using osu.Game.Graphics.Sprites;
@@ -255,16 +256,16 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                 {
                     Anchor = Anchor.BottomLeft,
                     Origin = Anchor.BottomLeft,
-                    Text = new LocalisedString((
-                        $"{beatmap.Metadata.TitleUnicode ?? beatmap.Metadata.Title} ",
-                        $"{beatmap.Metadata.Title ?? beatmap.Metadata.TitleUnicode} ")),
+                    Text = new RomanisableString(
+                        $"{beatmap.Metadata.Title ?? beatmap.Metadata.TitleUnicode} ",
+                        $"{beatmap.Metadata.TitleUnicode ?? beatmap.Metadata.Title} "),
                     Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold, italics: true)
                 },
                 new OsuSpriteText
                 {
                     Anchor = Anchor.BottomLeft,
                     Origin = Anchor.BottomLeft,
-                    Text = "by " + new LocalisedString((beatmap.Metadata.ArtistUnicode, beatmap.Metadata.Artist)),
+                    Text = "by " + new RomanisableString(beatmap.Metadata.Artist, beatmap.Metadata.ArtistUnicode),
                     Font = OsuFont.GetFont(size: 12, italics: true)
                 },
             };
diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 75068bd611..316837d27d 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -8,6 +8,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
 using osu.Framework.Logging;
 using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
diff --git a/osu.Game/Screens/Menu/SongTicker.cs b/osu.Game/Screens/Menu/SongTicker.cs
index fd9d9a3fac..2be446d71a 100644
--- a/osu.Game/Screens/Menu/SongTicker.cs
+++ b/osu.Game/Screens/Menu/SongTicker.cs
@@ -8,6 +8,7 @@ using osu.Game.Graphics.Sprites;
 using osuTK;
 using osu.Game.Graphics;
 using osu.Framework.Bindables;
+using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 
 namespace osu.Game.Screens.Menu
@@ -60,8 +61,8 @@ namespace osu.Game.Screens.Menu
         {
             var metadata = beatmap.Value.Metadata;
 
-            title.Text = new LocalisedString((metadata.TitleUnicode, metadata.Title));
-            artist.Text = new LocalisedString((metadata.ArtistUnicode, metadata.Artist));
+            title.Text = new RomanisableString(metadata.Title, metadata.TitleUnicode);
+            artist.Text = new RomanisableString(metadata.Artist, metadata.ArtistUnicode);
 
             this.FadeInFromZero(fade_duration / 2f)
                 .Delay(4000)
diff --git a/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs b/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
index b64ea37a59..299e3e3768 100644
--- a/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
@@ -72,7 +73,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
                 {
                     new OsuSpriteText
                     {
-                        Text = new LocalisedString((beatmap.Value.Metadata.ArtistUnicode, beatmap.Value.Metadata.Artist)),
+                        Text = new RomanisableString(beatmap.Value.Metadata.Artist, beatmap.Value.Metadata.ArtistUnicode),
                         Font = OsuFont.GetFont(size: TextSize),
                     },
                     new OsuSpriteText
@@ -82,7 +83,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
                     },
                     new OsuSpriteText
                     {
-                        Text = new LocalisedString((beatmap.Value.Metadata.TitleUnicode, beatmap.Value.Metadata.Title)),
+                        Text = new RomanisableString(beatmap.Value.Metadata.Title, beatmap.Value.Metadata.TitleUnicode),
                         Font = OsuFont.GetFont(size: TextSize),
                     }
                 }, LinkAction.OpenBeatmap, beatmap.Value.OnlineBeatmapID.ToString(), "Open beatmap");
diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index bb82b00100..0779a9c637 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -7,6 +7,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
@@ -72,7 +73,7 @@ namespace osu.Game.Screens.Play
                         }),
                         new OsuSpriteText
                         {
-                            Text = new LocalisedString((metadata.TitleUnicode, metadata.Title)),
+                            Text = new RomanisableString(metadata.Title, metadata.TitleUnicode),
                             Font = OsuFont.GetFont(size: 36, italics: true),
                             Origin = Anchor.TopCentre,
                             Anchor = Anchor.TopCentre,
@@ -80,7 +81,7 @@ namespace osu.Game.Screens.Play
                         },
                         new OsuSpriteText
                         {
-                            Text = new LocalisedString((metadata.ArtistUnicode, metadata.Artist)),
+                            Text = new RomanisableString(metadata.Artist, metadata.ArtistUnicode),
                             Font = OsuFont.GetFont(size: 26, italics: true),
                             Origin = Anchor.TopCentre,
                             Anchor = Anchor.TopCentre,
diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index 85a9b06a70..234e4f2023 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -100,7 +101,7 @@ namespace osu.Game.Screens.Ranking.Expanded
                                 {
                                     Anchor = Anchor.TopCentre,
                                     Origin = Anchor.TopCentre,
-                                    Text = new LocalisedString((metadata.TitleUnicode, metadata.Title)),
+                                    Text = new RomanisableString(metadata.Title, metadata.TitleUnicode),
                                     Font = OsuFont.Torus.With(size: 20, weight: FontWeight.SemiBold),
                                     MaxWidth = ScorePanel.EXPANDED_WIDTH - padding * 2,
                                     Truncate = true,
@@ -109,7 +110,7 @@ namespace osu.Game.Screens.Ranking.Expanded
                                 {
                                     Anchor = Anchor.TopCentre,
                                     Origin = Anchor.TopCentre,
-                                    Text = new LocalisedString((metadata.ArtistUnicode, metadata.Artist)),
+                                    Text = new RomanisableString(metadata.Artist, metadata.ArtistUnicode),
                                     Font = OsuFont.Torus.With(size: 14, weight: FontWeight.SemiBold),
                                     MaxWidth = ScorePanel.EXPANDED_WIDTH - padding * 2,
                                     Truncate = true,
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 86cb561bc7..0c5b67026c 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -187,8 +187,8 @@ namespace osu.Game.Screens.Select
 
                 RelativeSizeAxes = Axes.Both;
 
-                titleBinding = localisation.GetLocalisedString(new LocalisedString((metadata.TitleUnicode, metadata.Title)));
-                artistBinding = localisation.GetLocalisedString(new LocalisedString((metadata.ArtistUnicode, metadata.Artist)));
+                titleBinding = localisation.GetLocalisedString(new RomanisableString(metadata.Title, metadata.TitleUnicode));
+                artistBinding = localisation.GetLocalisedString(new RomanisableString(metadata.Artist, metadata.ArtistUnicode));
 
                 Children = new Drawable[]
                 {
diff --git a/osu.Game/Screens/Select/Carousel/SetPanelContent.cs b/osu.Game/Screens/Select/Carousel/SetPanelContent.cs
index 82704c24fb..0e99a4ce70 100644
--- a/osu.Game/Screens/Select/Carousel/SetPanelContent.cs
+++ b/osu.Game/Screens/Select/Carousel/SetPanelContent.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Localisation;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
@@ -40,13 +41,13 @@ namespace osu.Game.Screens.Select.Carousel
                 {
                     new OsuSpriteText
                     {
-                        Text = new LocalisedString((beatmapSet.Metadata.TitleUnicode, beatmapSet.Metadata.Title)),
+                        Text = new RomanisableString(beatmapSet.Metadata.Title, beatmapSet.Metadata.TitleUnicode),
                         Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 22, italics: true),
                         Shadow = true,
                     },
                     new OsuSpriteText
                     {
-                        Text = new LocalisedString((beatmapSet.Metadata.ArtistUnicode, beatmapSet.Metadata.Artist)),
+                        Text = new RomanisableString(beatmapSet.Metadata.Artist, beatmapSet.Metadata.ArtistUnicode),
                         Font = OsuFont.GetFont(weight: FontWeight.SemiBold, size: 17, italics: true),
                         Shadow = true,
                     },

From 5e9040c29108cf423ddcf0d6ea418f4aa6690b46 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 22 Feb 2021 16:26:35 +0300
Subject: [PATCH 1639/3722] Use "pausing supported" conditional instead

---
 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 5a86ac646a..0046eea91c 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -427,7 +427,7 @@ namespace osu.Game.Screens.Play
 
         private void updatePauseOnFocusLostState()
         {
-            if (!PauseOnFocusLost || DrawableRuleset.HasReplayLoaded.Value || breakTracker.IsBreakTime.Value)
+            if (!PauseOnFocusLost || pausingSupportedByCurrentState || breakTracker.IsBreakTime.Value)
                 return;
 
             if (gameActive.Value == false)

From 5493c55da7287bea7f77651ea0474587cc426626 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 22 Feb 2021 16:59:35 +0300
Subject: [PATCH 1640/3722] Fix silly mistake

---
 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 0046eea91c..2ded1752da 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -427,7 +427,7 @@ namespace osu.Game.Screens.Play
 
         private void updatePauseOnFocusLostState()
         {
-            if (!PauseOnFocusLost || pausingSupportedByCurrentState || breakTracker.IsBreakTime.Value)
+            if (!PauseOnFocusLost || !pausingSupportedByCurrentState || breakTracker.IsBreakTime.Value)
                 return;
 
             if (gameActive.Value == false)

From f62120c66b6cbb852f96d2ede5e60b933214f08b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 22 Feb 2021 22:45:55 +0100
Subject: [PATCH 1641/3722] Remove unused using directive

---
 .../Visual/Playlists/TestScenePlaylistsResultsScreen.cs          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
index e34da1ef0c..be8032cde8 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using Newtonsoft.Json.Linq;
 using NUnit.Framework;

From 6a5c6febc56567cd5acb43fdb274f9918c8ef230 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Feb 2021 13:23:32 +0900
Subject: [PATCH 1642/3722] Add inline comment explaining the retry loop

---
 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 2ded1752da..e81efdac78 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -434,6 +434,8 @@ namespace osu.Game.Screens.Play
             {
                 bool paused = Pause();
 
+                // if the initial pause could not be satisfied, the pause cooldown may be active.
+                // reschedule the pause attempt until it can be achieved.
                 if (!paused)
                     Scheduler.AddOnce(updatePauseOnFocusLostState);
             }

From 996c0897d1faa058fa12ea07b13799e01b67aab9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Feb 2021 13:40:21 +0900
Subject: [PATCH 1643/3722] Seek via GameplayClockContainer for better
 reliability

---
 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 e5959a3edf..5d070b424a 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Tests.Visual.Navigation
 
             AddStep("press enter", () => InputManager.Key(Key.Enter));
             AddUntilStep("wait for player", () => (player = Game.ScreenStack.CurrentScreen as Player) != null);
-            AddStep("seek to end", () => beatmap().Track.Seek(beatmap().Track.Length));
+            AddStep("seek to end", () => player.ChildrenOfType<GameplayClockContainer>().First().Seek(beatmap().Track.Length));
             AddUntilStep("wait for pass", () => (results = Game.ScreenStack.CurrentScreen as ResultsScreen) != null && results.IsLoaded);
             AddStep("attempt to retry", () => results.ChildrenOfType<HotkeyRetryOverlay>().First().Action());
             AddUntilStep("wait for player", () => Game.ScreenStack.CurrentScreen != player && Game.ScreenStack.CurrentScreen is Player);

From 672fd3f9d2935099f24ffa5f2a879295c6970f77 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Feb 2021 14:24:24 +0900
Subject: [PATCH 1644/3722] When disable mouse buttons during gameplay is
 selected, disable more globally

Until now the disable setting would only apply to left/right buttons,
and only in gameplay. This change will cause any global actions bound to
mouse buttons to also not work during gameplay.

Closes #11879.
---
 osu.Game/Rulesets/UI/RulesetInputManager.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 07de2bf601..963c3427d0 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -109,9 +109,9 @@ namespace osu.Game.Rulesets.UI
         {
             switch (e)
             {
-                case MouseDownEvent mouseDown when mouseDown.Button == MouseButton.Left || mouseDown.Button == MouseButton.Right:
+                case MouseDownEvent _:
                     if (mouseDisabled.Value)
-                        return false;
+                        return true; // importantly, block upwards propagation so global bindings also don't fire.
 
                     break;
 

From ec4b770cbac2260bfb731c64d8ba4f7990c9c02a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Feb 2021 14:56:03 +0900
Subject: [PATCH 1645/3722] Remove unused using statement

---
 osu.Game/Rulesets/UI/RulesetInputManager.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 963c3427d0..d6f002ea2c 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -16,7 +16,6 @@ using osu.Game.Configuration;
 using osu.Game.Input.Bindings;
 using osu.Game.Input.Handlers;
 using osu.Game.Screens.Play;
-using osuTK.Input;
 using static osu.Game.Input.Handlers.ReplayInputHandler;
 
 namespace osu.Game.Rulesets.UI

From 664d243003b3fab7d4d6b008302b95fdf7ac12c0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Feb 2021 15:22:46 +0900
Subject: [PATCH 1646/3722] Disable multiplayer/spectator on iOS until it can
 be supported again

---
 osu.Game/Online/API/APIAccess.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index 8ffa0221c8..ce01378b17 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -10,6 +10,7 @@ using System.Net.Sockets;
 using System.Threading;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using osu.Framework;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.ExceptionExtensions;
 using osu.Framework.Extensions.ObjectExtensions;
@@ -246,7 +247,14 @@ namespace osu.Game.Online.API
             this.password = password;
         }
 
-        public IHubClientConnector GetHubConnector(string clientName, string endpoint) => new HubClientConnector(clientName, endpoint, this, versionHash);
+        public IHubClientConnector GetHubConnector(string clientName, string endpoint)
+        {
+            // disabled until the underlying runtime issue is resolved, see https://github.com/mono/mono/issues/20805.
+            if (RuntimeInfo.OS == RuntimeInfo.Platform.iOS)
+                return null;
+
+            return new HubClientConnector(clientName, endpoint, this, versionHash);
+        }
 
         public RegistrationRequest.RegistrationRequestErrors CreateAccount(string email, string username, string password)
         {

From c514233141756f9700bb3b51881480ddba98f8ab Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Feb 2021 15:57:41 +0900
Subject: [PATCH 1647/3722] Fix importing collections twice from stable causing
 a hard crash

Somehow a bindable equality check failure got through review. Not sure
if there's some way to protect against this going forward, but we may
want to.
---
 osu.Game/Collections/CollectionManager.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Collections/CollectionManager.cs b/osu.Game/Collections/CollectionManager.cs
index a65d9a415d..fb9c230c7a 100644
--- a/osu.Game/Collections/CollectionManager.cs
+++ b/osu.Game/Collections/CollectionManager.cs
@@ -138,10 +138,10 @@ namespace osu.Game.Collections
 
             PostNotification?.Invoke(notification);
 
-            var collection = readCollections(stream, notification);
-            await importCollections(collection);
+            var collections = readCollections(stream, notification);
+            await importCollections(collections);
 
-            notification.CompletionText = $"Imported {collection.Count} collections";
+            notification.CompletionText = $"Imported {collections.Count} collections";
             notification.State = ProgressNotificationState.Completed;
         }
 
@@ -155,7 +155,7 @@ namespace osu.Game.Collections
                 {
                     foreach (var newCol in newCollections)
                     {
-                        var existing = Collections.FirstOrDefault(c => c.Name == newCol.Name);
+                        var existing = Collections.FirstOrDefault(c => c.Name.Value == newCol.Name.Value);
                         if (existing == null)
                             Collections.Add(existing = new BeatmapCollection { Name = { Value = newCol.Name.Value } });
 

From f45cedeb8524206a37f7dd7a59cadf5ed20fde21 Mon Sep 17 00:00:00 2001
From: Ronnie Moir <7267697+H2n9@users.noreply.github.com>
Date: Tue, 23 Feb 2021 15:38:09 +0000
Subject: [PATCH 1648/3722] Adjust initial and final rate ranges and prevent
 them from overlapping

---
 osu.Game/Rulesets/Mods/ModWindDown.cs | 13 +++++++++++--
 osu.Game/Rulesets/Mods/ModWindUp.cs   | 13 +++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModWindDown.cs b/osu.Game/Rulesets/Mods/ModWindDown.cs
index 679b50057b..c47ec5fbde 100644
--- a/osu.Game/Rulesets/Mods/ModWindDown.cs
+++ b/osu.Game/Rulesets/Mods/ModWindDown.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Mods
         [SettingSource("Initial rate", "The starting speed of the track")]
         public override BindableNumber<double> InitialRate { get; } = new BindableDouble
         {
-            MinValue = 1,
+            MinValue = 0.5,
             MaxValue = 2,
             Default = 1,
             Value = 1,
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Mods
         public override BindableNumber<double> FinalRate { get; } = new BindableDouble
         {
             MinValue = 0.5,
-            MaxValue = 0.99,
+            MaxValue = 2,
             Default = 0.75,
             Value = 0.75,
             Precision = 0.01,
@@ -45,5 +45,14 @@ namespace osu.Game.Rulesets.Mods
         };
 
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModWindUp)).ToArray();
+
+        public ModWindDown()
+        {
+            InitialRate.BindValueChanged(val =>
+                InitialRate.Value = Math.Max(val.NewValue, FinalRate.Value + 0.01));
+
+            FinalRate.BindValueChanged(val =>
+                FinalRate.Value = Math.Min(val.NewValue, InitialRate.Value - 0.01));
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModWindUp.cs b/osu.Game/Rulesets/Mods/ModWindUp.cs
index b733bf423e..5a0fab5e67 100644
--- a/osu.Game/Rulesets/Mods/ModWindUp.cs
+++ b/osu.Game/Rulesets/Mods/ModWindUp.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Mods
         public override BindableNumber<double> InitialRate { get; } = new BindableDouble
         {
             MinValue = 0.5,
-            MaxValue = 1,
+            MaxValue = 2,
             Default = 1,
             Value = 1,
             Precision = 0.01,
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Mods
         [SettingSource("Final rate", "The speed increase to ramp towards")]
         public override BindableNumber<double> FinalRate { get; } = new BindableDouble
         {
-            MinValue = 1.01,
+            MinValue = 0.5,
             MaxValue = 2,
             Default = 1.5,
             Value = 1.5,
@@ -45,5 +45,14 @@ namespace osu.Game.Rulesets.Mods
         };
 
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModWindDown)).ToArray();
+
+        public ModWindUp()
+        {
+            InitialRate.BindValueChanged(val =>
+                InitialRate.Value = Math.Min(val.NewValue, FinalRate.Value - 0.01));
+
+            FinalRate.BindValueChanged(val =>
+                FinalRate.Value = Math.Max(val.NewValue, InitialRate.Value + 0.01));
+        }
     }
 }

From a6e840634b255ea86e21cfa8140df3794965ebe6 Mon Sep 17 00:00:00 2001
From: Ronnie Moir <7267697+H2n9@users.noreply.github.com>
Date: Tue, 23 Feb 2021 15:52:53 +0000
Subject: [PATCH 1649/3722] Adjust scrubbing behaviour to allow dragging
 through rate values

---
 osu.Game/Rulesets/Mods/ModWindDown.cs | 8 ++++----
 osu.Game/Rulesets/Mods/ModWindUp.cs   | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModWindDown.cs b/osu.Game/Rulesets/Mods/ModWindDown.cs
index c47ec5fbde..f9e6854dd4 100644
--- a/osu.Game/Rulesets/Mods/ModWindDown.cs
+++ b/osu.Game/Rulesets/Mods/ModWindDown.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Mods
         [SettingSource("Initial rate", "The starting speed of the track")]
         public override BindableNumber<double> InitialRate { get; } = new BindableDouble
         {
-            MinValue = 0.5,
+            MinValue = 0.51,
             MaxValue = 2,
             Default = 1,
             Value = 1,
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Mods
         public override BindableNumber<double> FinalRate { get; } = new BindableDouble
         {
             MinValue = 0.5,
-            MaxValue = 2,
+            MaxValue = 1.99,
             Default = 0.75,
             Value = 0.75,
             Precision = 0.01,
@@ -49,10 +49,10 @@ namespace osu.Game.Rulesets.Mods
         public ModWindDown()
         {
             InitialRate.BindValueChanged(val =>
-                InitialRate.Value = Math.Max(val.NewValue, FinalRate.Value + 0.01));
+                FinalRate.Value = Math.Min(FinalRate.Value, val.NewValue - 0.01));
 
             FinalRate.BindValueChanged(val =>
-                FinalRate.Value = Math.Min(val.NewValue, InitialRate.Value - 0.01));
+                InitialRate.Value = Math.Max(InitialRate.Value, val.NewValue + 0.01));
         }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModWindUp.cs b/osu.Game/Rulesets/Mods/ModWindUp.cs
index 5a0fab5e67..0d57bbb52d 100644
--- a/osu.Game/Rulesets/Mods/ModWindUp.cs
+++ b/osu.Game/Rulesets/Mods/ModWindUp.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Mods
         public override BindableNumber<double> InitialRate { get; } = new BindableDouble
         {
             MinValue = 0.5,
-            MaxValue = 2,
+            MaxValue = 1.99,
             Default = 1,
             Value = 1,
             Precision = 0.01,
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Mods
         [SettingSource("Final rate", "The speed increase to ramp towards")]
         public override BindableNumber<double> FinalRate { get; } = new BindableDouble
         {
-            MinValue = 0.5,
+            MinValue = 0.51,
             MaxValue = 2,
             Default = 1.5,
             Value = 1.5,
@@ -49,10 +49,10 @@ namespace osu.Game.Rulesets.Mods
         public ModWindUp()
         {
             InitialRate.BindValueChanged(val =>
-                InitialRate.Value = Math.Min(val.NewValue, FinalRate.Value - 0.01));
+                FinalRate.Value = Math.Max(FinalRate.Value, val.NewValue + 0.01));
 
             FinalRate.BindValueChanged(val =>
-                FinalRate.Value = Math.Max(val.NewValue, InitialRate.Value + 0.01));
+                InitialRate.Value = Math.Min(InitialRate.Value, val.NewValue - 0.01));
         }
     }
 }

From 7394c62cc8ee4c30ce12543fa7c6609d7ee9dc58 Mon Sep 17 00:00:00 2001
From: Ronnie Moir <7267697+H2n9@users.noreply.github.com>
Date: Tue, 23 Feb 2021 18:10:03 +0000
Subject: [PATCH 1650/3722] Make ModTimeRamp and ModRateAdjust incompatible

---
 osu.Game/Rulesets/Mods/ModRateAdjust.cs | 3 +++
 osu.Game/Rulesets/Mods/ModTimeRamp.cs   | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/osu.Game/Rulesets/Mods/ModRateAdjust.cs b/osu.Game/Rulesets/Mods/ModRateAdjust.cs
index b016a6d43b..e66650f7b4 100644
--- a/osu.Game/Rulesets/Mods/ModRateAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModRateAdjust.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.Audio.Track;
 using osu.Framework.Bindables;
@@ -24,6 +25,8 @@ namespace osu.Game.Rulesets.Mods
 
         public double ApplyToRate(double time, double rate) => rate * SpeedChange.Value;
 
+        public override Type[] IncompatibleMods => new[] { typeof(ModTimeRamp) };
+
         public override string SettingDescription => SpeedChange.IsDefault ? string.Empty : $"{SpeedChange.Value:N2}x";
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModTimeRamp.cs b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
index 330945d3d3..b5cd64dafa 100644
--- a/osu.Game/Rulesets/Mods/ModTimeRamp.cs
+++ b/osu.Game/Rulesets/Mods/ModTimeRamp.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Rulesets.Mods
         [SettingSource("Adjust pitch", "Should pitch be adjusted with speed")]
         public abstract BindableBool AdjustPitch { get; }
 
+        public override Type[] IncompatibleMods => new[] { typeof(ModRateAdjust) };
+
         public override string SettingDescription => $"{InitialRate.Value:N2}x to {FinalRate.Value:N2}x";
 
         private double finalRateTime;

From dbde47fe94e5c26270e4b124f7539c953f32b5b4 Mon Sep 17 00:00:00 2001
From: Ronnie Moir <7267697+H2n9@users.noreply.github.com>
Date: Tue, 23 Feb 2021 19:43:04 +0000
Subject: [PATCH 1651/3722] Fix test failure

---
 osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index 7a0dd5b719..650ae68ffc 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -101,7 +101,7 @@ namespace osu.Game.Tests.Gameplay
                     break;
 
                 case ModTimeRamp m:
-                    m.InitialRate.Value = m.FinalRate.Value = expectedRate;
+                    m.FinalRate.Value = m.InitialRate.Value = expectedRate;
                     break;
             }
 

From 3491021f72a00eb5f4471dd6828678d2e6017315 Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Tue, 23 Feb 2021 20:58:46 +0100
Subject: [PATCH 1652/3722] Move moveSelection into HandleMovement

---
 .../Edit/OsuSelectionHandler.cs                | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 64dbe20c58..03c1676982 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -37,9 +37,13 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         public override bool HandleMovement(MoveSelectionEvent moveEvent)
         {
-            bool result = moveSelection(moveEvent.InstantDelta);
+            var hitObjects = selectedMovableObjects;
+
+            foreach (var h in hitObjects)
+                h.Position += moveEvent.InstantDelta;
+
             moveSelectionInBounds();
-            return result;
+            return true;
         }
 
         /// <summary>
@@ -246,16 +250,6 @@ namespace osu.Game.Rulesets.Osu.Edit
             return result;
         }
 
-        private bool moveSelection(Vector2 delta)
-        {
-            var hitObjects = selectedMovableObjects;
-
-            foreach (var h in hitObjects)
-                h.Position += delta;
-
-            return true;
-        }
-
         private void moveSelectionInBounds()
         {
             var hitObjects = selectedMovableObjects;

From 71b30bdbbb7de4988ca31afe8110a477f98ab4b2 Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Tue, 23 Feb 2021 00:16:35 +0100
Subject: [PATCH 1653/3722] Adjust tuple usage

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

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 03c1676982..e1ee0612fa 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -199,12 +199,12 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             Quad selectionQuad = getSurroundingQuad(new OsuHitObject[] { slider });
             Quad scaledQuad = new Quad(selectionQuad.TopLeft.X, selectionQuad.TopLeft.Y, selectionQuad.Width + scale.X, selectionQuad.Height + scale.Y);
-            (bool X, bool Y) inBounds = isQuadInBounds(scaledQuad);
+            (bool xInBounds, bool yInBounds) = isQuadInBounds(scaledQuad);
 
-            if (!inBounds.X)
+            if (!xInBounds)
                 pathRelativeDeltaScale.X = 1;
 
-            if (!inBounds.Y)
+            if (!yInBounds)
                 pathRelativeDeltaScale.Y = 1;
 
             foreach (var point in slider.Path.ControlPoints)
@@ -221,17 +221,17 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             Quad selectionQuad = getSurroundingQuad(hitObjects);
             Quad scaledQuad = new Quad(selectionQuad.TopLeft.X, selectionQuad.TopLeft.Y, selectionQuad.Width + scale.X, selectionQuad.Height + scale.Y);
-            (bool X, bool Y) inBounds = isQuadInBounds(scaledQuad);
+            (bool xInBounds, bool yInBounds) = isQuadInBounds(scaledQuad);
 
             foreach (var h in hitObjects)
             {
                 var newPosition = h.Position;
 
                 // guard against no-ops and NaN.
-                if (scale.X != 0 && selectionQuad.Width > 0 && inBounds.X)
+                if (scale.X != 0 && selectionQuad.Width > 0 && xInBounds)
                     newPosition.X = selectionQuad.TopLeft.X + (h.X - selectionQuad.TopLeft.X) / selectionQuad.Width * (selectionQuad.Width + scale.X);
 
-                if (scale.Y != 0 && selectionQuad.Height > 0 && inBounds.Y)
+                if (scale.Y != 0 && selectionQuad.Height > 0 && yInBounds)
                     newPosition.Y = selectionQuad.TopLeft.Y + (h.Y - selectionQuad.TopLeft.Y) / selectionQuad.Height * (selectionQuad.Height + scale.Y);
 
                 h.Position = newPosition;

From 2a4139a2070df2f324526c651f9844fa58be1288 Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Tue, 23 Feb 2021 00:25:40 +0100
Subject: [PATCH 1654/3722] Refactor isQuadInBounds

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

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index e1ee0612fa..ede756ab47 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -242,12 +242,10 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         private (bool X, bool Y) isQuadInBounds(Quad quad)
         {
-            (bool X, bool Y) result;
+            bool xInBounds = (quad.TopLeft.X >= 0) && (quad.BottomRight.X < DrawWidth);
+            bool yInBounds = (quad.TopLeft.Y >= 0) && (quad.BottomRight.Y < DrawHeight);
 
-            result.X = (quad.TopLeft.X >= 0) && (quad.BottomRight.X < DrawWidth);
-            result.Y = (quad.TopLeft.Y >= 0) && (quad.BottomRight.Y < DrawHeight);
-
-            return result;
+            return (xInBounds, yInBounds);
         }
 
         private void moveSelectionInBounds()

From 877e19421bfd44426bfcb15956fd75cc2dfabea0 Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Tue, 23 Feb 2021 16:36:51 +0100
Subject: [PATCH 1655/3722] Refactor movement while scaling

---
 osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index ede756ab47..28e6347f4f 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -216,11 +216,11 @@ namespace osu.Game.Rulesets.Osu.Edit
         private bool scaleHitObjects(OsuHitObject[] hitObjects, Anchor reference, Vector2 scale)
         {
             // move the selection before scaling if dragging from top or left anchors.
-            if ((reference & Anchor.x0) > 0 && !moveSelection(new Vector2(-scale.X, 0))) return false;
-            if ((reference & Anchor.y0) > 0 && !moveSelection(new Vector2(0, -scale.Y))) return false;
+            float xOffset = ((reference & Anchor.x0) > 0) ? -scale.X : 0;
+            float yOffset = ((reference & Anchor.y0) > 0) ? -scale.Y : 0;
 
             Quad selectionQuad = getSurroundingQuad(hitObjects);
-            Quad scaledQuad = new Quad(selectionQuad.TopLeft.X, selectionQuad.TopLeft.Y, selectionQuad.Width + scale.X, selectionQuad.Height + scale.Y);
+            Quad scaledQuad = new Quad(selectionQuad.TopLeft.X + xOffset, selectionQuad.TopLeft.Y + yOffset, selectionQuad.Width + scale.X, selectionQuad.Height + scale.Y);
             (bool xInBounds, bool yInBounds) = isQuadInBounds(scaledQuad);
 
             foreach (var h in hitObjects)
@@ -229,10 +229,10 @@ namespace osu.Game.Rulesets.Osu.Edit
 
                 // guard against no-ops and NaN.
                 if (scale.X != 0 && selectionQuad.Width > 0 && xInBounds)
-                    newPosition.X = selectionQuad.TopLeft.X + (h.X - selectionQuad.TopLeft.X) / selectionQuad.Width * (selectionQuad.Width + scale.X);
+                    newPosition.X = selectionQuad.TopLeft.X + xOffset + (h.X - selectionQuad.TopLeft.X) / selectionQuad.Width * (selectionQuad.Width + scale.X);
 
                 if (scale.Y != 0 && selectionQuad.Height > 0 && yInBounds)
-                    newPosition.Y = selectionQuad.TopLeft.Y + (h.Y - selectionQuad.TopLeft.Y) / selectionQuad.Height * (selectionQuad.Height + scale.Y);
+                    newPosition.Y = selectionQuad.TopLeft.Y + yOffset + (h.Y - selectionQuad.TopLeft.Y) / selectionQuad.Height * (selectionQuad.Height + scale.Y);
 
                 h.Position = newPosition;
             }

From f6d3cd6413e55eb4f44dc87d66644da55ecb0699 Mon Sep 17 00:00:00 2001
From: Ronnie Moir <7267697+H2n9@users.noreply.github.com>
Date: Tue, 23 Feb 2021 21:25:59 +0000
Subject: [PATCH 1656/3722] Change SamplePlaybackWithRateMods to use rate
 calulated from the sample Replace hardcoded numbers

---
 osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs | 9 +++++++--
 osu.Game/Rulesets/Mods/ModWindDown.cs                 | 4 ++--
 osu.Game/Rulesets/Mods/ModWindUp.cs                   | 4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index 650ae68ffc..10a1a13ba0 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics.Audio;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
+using osu.Framework.Utils;
 using osu.Game.Audio;
 using osu.Game.IO;
 using osu.Game.Rulesets;
@@ -90,6 +91,7 @@ namespace osu.Game.Tests.Gameplay
         public void TestSamplePlaybackWithRateMods(Type expectedMod, double expectedRate)
         {
             GameplayClockContainer gameplayContainer = null;
+            StoryboardSampleInfo sampleInfo = null;
             TestDrawableStoryboardSample sample = null;
 
             Mod testedMod = Activator.CreateInstance(expectedMod) as Mod;
@@ -117,7 +119,7 @@ namespace osu.Game.Tests.Gameplay
                     Child = beatmapSkinSourceContainer
                 });
 
-                beatmapSkinSourceContainer.Add(sample = new TestDrawableStoryboardSample(new StoryboardSampleInfo("test-sample", 1, 1))
+                beatmapSkinSourceContainer.Add(sample = new TestDrawableStoryboardSample(sampleInfo = new StoryboardSampleInfo("test-sample", 1, 1))
                 {
                     Clock = gameplayContainer.GameplayClock
                 });
@@ -125,7 +127,10 @@ namespace osu.Game.Tests.Gameplay
 
             AddStep("start", () => gameplayContainer.Start());
 
-            AddAssert("sample playback rate matches mod rates", () => sample.ChildrenOfType<DrawableSample>().First().AggregateFrequency.Value == expectedRate);
+            AddAssert("sample playback rate matches mod rates", () =>
+                testedMod != null && Precision.AlmostEquals(
+                    sample.ChildrenOfType<DrawableSample>().First().AggregateFrequency.Value,
+                    ((IApplicableToRate)testedMod).ApplyToRate(sampleInfo.StartTime)));
         }
 
         private class TestSkin : LegacySkin
diff --git a/osu.Game/Rulesets/Mods/ModWindDown.cs b/osu.Game/Rulesets/Mods/ModWindDown.cs
index f9e6854dd4..9bd5b5eefd 100644
--- a/osu.Game/Rulesets/Mods/ModWindDown.cs
+++ b/osu.Game/Rulesets/Mods/ModWindDown.cs
@@ -49,10 +49,10 @@ namespace osu.Game.Rulesets.Mods
         public ModWindDown()
         {
             InitialRate.BindValueChanged(val =>
-                FinalRate.Value = Math.Min(FinalRate.Value, val.NewValue - 0.01));
+                FinalRate.Value = Math.Min(FinalRate.Value, val.NewValue - FinalRate.Precision));
 
             FinalRate.BindValueChanged(val =>
-                InitialRate.Value = Math.Max(InitialRate.Value, val.NewValue + 0.01));
+                InitialRate.Value = Math.Max(InitialRate.Value, val.NewValue + InitialRate.Precision));
         }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModWindUp.cs b/osu.Game/Rulesets/Mods/ModWindUp.cs
index 0d57bbb52d..39d3c9c5d5 100644
--- a/osu.Game/Rulesets/Mods/ModWindUp.cs
+++ b/osu.Game/Rulesets/Mods/ModWindUp.cs
@@ -49,10 +49,10 @@ namespace osu.Game.Rulesets.Mods
         public ModWindUp()
         {
             InitialRate.BindValueChanged(val =>
-                FinalRate.Value = Math.Max(FinalRate.Value, val.NewValue + 0.01));
+                FinalRate.Value = Math.Max(FinalRate.Value, val.NewValue + FinalRate.Precision));
 
             FinalRate.BindValueChanged(val =>
-                InitialRate.Value = Math.Min(InitialRate.Value, val.NewValue - 0.01));
+                InitialRate.Value = Math.Min(InitialRate.Value, val.NewValue - InitialRate.Precision));
         }
     }
 }

From 71182347d677be782005acaf1e227c6cd21a0275 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Feb 2021 11:30:13 +0900
Subject: [PATCH 1657/3722] Also add a notifiation when trying to enter the
 multiplayer screen

Turns out the only check required to get into this screen was that the
API was online, which it always is even if the multiplayer component
isn't.

This provides a better end-user experience.
---
 osu.Game/Screens/Menu/ButtonSystem.cs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 81b1cb0bf1..dd1e318aa0 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -172,6 +172,23 @@ namespace osu.Game.Screens.Menu
                 return;
             }
 
+            // disabled until the underlying runtime issue is resolved, see https://github.com/mono/mono/issues/20805.
+            if (RuntimeInfo.OS == RuntimeInfo.Platform.iOS)
+            {
+                notifications?.Post(new SimpleNotification
+                {
+                    Text = "Multiplayer is temporarily unavailable on iOS as we figure out some low level issues.",
+                    Icon = FontAwesome.Solid.AppleAlt,
+                    Activated = () =>
+                    {
+                        loginOverlay?.Show();
+                        return true;
+                    }
+                });
+
+                return;
+            }
+
             OnMultiplayer?.Invoke();
         }
 

From e1f71038e39b09134ae2587692f7a9b9fa884d75 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Feb 2021 12:13:55 +0900
Subject: [PATCH 1658/3722] Remove unncessary action

---
 osu.Game/Screens/Menu/ButtonSystem.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index dd1e318aa0..f93bfd7705 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -179,11 +179,6 @@ namespace osu.Game.Screens.Menu
                 {
                     Text = "Multiplayer is temporarily unavailable on iOS as we figure out some low level issues.",
                     Icon = FontAwesome.Solid.AppleAlt,
-                    Activated = () =>
-                    {
-                        loginOverlay?.Show();
-                        return true;
-                    }
                 });
 
                 return;

From 7000132d034c6cf012b475ec44178c7202ca4c3a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Feb 2021 12:45:00 +0900
Subject: [PATCH 1659/3722] Specify full filename inline for quick beatmap

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

diff --git a/osu.Game.Tests/Resources/TestResources.cs b/osu.Game.Tests/Resources/TestResources.cs
index 14bc2c8733..c979b5c695 100644
--- a/osu.Game.Tests/Resources/TestResources.cs
+++ b/osu.Game.Tests/Resources/TestResources.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Tests.Resources
 
         public static Stream OpenResource(string name) => GetStore().GetStream($"Resources/{name}");
 
-        public static Stream GetTestBeatmapStream(bool virtualTrack = false, bool quick = false) => OpenResource($"Archives/241526 Soleily - Renatus{(virtualTrack ? "_virtual" : "")}{(quick ? "_quick" : "")}.osz");
+        public static Stream GetTestBeatmapStream(bool virtualTrack = false) => OpenResource($"Archives/241526 Soleily - Renatus{(virtualTrack ? "_virtual" : "")}.osz");
 
         /// <summary>
         /// Retrieve a path to a copy of a shortened (~10 second) beatmap archive with a virtual track.
@@ -24,8 +24,7 @@ namespace osu.Game.Tests.Resources
         public static string GetQuickTestBeatmapForImport()
         {
             var tempPath = Path.GetTempFileName() + ".osz";
-
-            using (var stream = GetTestBeatmapStream(true, true))
+            using (var stream = OpenResource($"Archives/241526 Soleily - Renatus_virtual_quick.osz"))
             using (var newFile = File.Create(tempPath))
                 stream.CopyTo(newFile);
 

From 59e6bad0b9cf128c4f208a67fface6ad82ff48bd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Feb 2021 12:46:35 +0900
Subject: [PATCH 1660/3722] Remove unnecessary interpolated string
 specification

---
 osu.Game.Tests/Resources/TestResources.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Resources/TestResources.cs b/osu.Game.Tests/Resources/TestResources.cs
index c979b5c695..cef0532f9d 100644
--- a/osu.Game.Tests/Resources/TestResources.cs
+++ b/osu.Game.Tests/Resources/TestResources.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Tests.Resources
         public static string GetQuickTestBeatmapForImport()
         {
             var tempPath = Path.GetTempFileName() + ".osz";
-            using (var stream = OpenResource($"Archives/241526 Soleily - Renatus_virtual_quick.osz"))
+            using (var stream = OpenResource("Archives/241526 Soleily - Renatus_virtual_quick.osz"))
             using (var newFile = File.Create(tempPath))
                 stream.CopyTo(newFile);
 

From dd702ccfd22ef251000985bdb72e71812855893e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 24 Feb 2021 13:39:15 +0900
Subject: [PATCH 1661/3722] Make mania FI/HD incompatible with each other

---
 .../Mods/ManiaModFadeIn.cs                    | 10 +++--
 .../Mods/ManiaModHidden.cs                    | 33 +-------------
 .../Mods/ManiaModPlayfieldCover.cs            | 43 +++++++++++++++++++
 3 files changed, 51 insertions(+), 35 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
index cbdcd49c5b..f80c9e1f7c 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
@@ -1,18 +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.Sprites;
-using osu.Game.Graphics;
+using System;
+using System.Linq;
 using osu.Game.Rulesets.Mania.UI;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
-    public class ManiaModFadeIn : ManiaModHidden
+    public class ManiaModFadeIn : ManiaModPlayfieldCover
     {
         public override string Name => "Fade In";
         public override string Acronym => "FI";
-        public override IconUsage? Icon => OsuIcon.ModHidden;
         public override string Description => @"Keys appear out of nowhere!";
+        public override double ScoreMultiplier => 1;
+
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ManiaModHidden)).ToArray();
 
         protected override CoverExpandDirection ExpandDirection => CoverExpandDirection.AlongScroll;
     }
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
index 4bdb15526f..a68f12cb84 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
@@ -3,43 +3,14 @@
 
 using System;
 using System.Linq;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Rulesets.Mania.Objects;
-using osu.Game.Rulesets.Mania.UI;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
-    public class ManiaModHidden : ModHidden, IApplicableToDrawableRuleset<ManiaHitObject>
+    public class ManiaModHidden : ManiaModPlayfieldCover
     {
         public override string Description => @"Keys fade out before you hit them!";
         public override double ScoreMultiplier => 1;
-        public override Type[] IncompatibleMods => new[] { typeof(ModFlashlight<ManiaHitObject>) };
 
-        /// <summary>
-        /// The direction in which the cover should expand.
-        /// </summary>
-        protected virtual CoverExpandDirection ExpandDirection => CoverExpandDirection.AgainstScroll;
-
-        public virtual void ApplyToDrawableRuleset(DrawableRuleset<ManiaHitObject> drawableRuleset)
-        {
-            ManiaPlayfield maniaPlayfield = (ManiaPlayfield)drawableRuleset.Playfield;
-
-            foreach (Column column in maniaPlayfield.Stages.SelectMany(stage => stage.Columns))
-            {
-                HitObjectContainer hoc = column.HitObjectArea.HitObjectContainer;
-                Container hocParent = (Container)hoc.Parent;
-
-                hocParent.Remove(hoc);
-                hocParent.Add(new PlayfieldCoveringWrapper(hoc).With(c =>
-                {
-                    c.RelativeSizeAxes = Axes.Both;
-                    c.Direction = ExpandDirection;
-                    c.Coverage = 0.5f;
-                }));
-            }
-        }
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ManiaModFadeIn)).ToArray();
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs
new file mode 100644
index 0000000000..78c3331fbf
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs
@@ -0,0 +1,43 @@
+// Copyright (c) ppy 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.Graphics.Containers;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public abstract class ManiaModPlayfieldCover : ModHidden, IApplicableToDrawableRuleset<ManiaHitObject>
+    {
+        public override Type[] IncompatibleMods => new[] { typeof(ModFlashlight<ManiaHitObject>) };
+
+        /// <summary>
+        /// The direction in which the cover should expand.
+        /// </summary>
+        protected virtual CoverExpandDirection ExpandDirection => CoverExpandDirection.AgainstScroll;
+
+        public virtual void ApplyToDrawableRuleset(DrawableRuleset<ManiaHitObject> drawableRuleset)
+        {
+            ManiaPlayfield maniaPlayfield = (ManiaPlayfield)drawableRuleset.Playfield;
+
+            foreach (Column column in maniaPlayfield.Stages.SelectMany(stage => stage.Columns))
+            {
+                HitObjectContainer hoc = column.HitObjectArea.HitObjectContainer;
+                Container hocParent = (Container)hoc.Parent;
+
+                hocParent.Remove(hoc);
+                hocParent.Add(new PlayfieldCoveringWrapper(hoc).With(c =>
+                {
+                    c.RelativeSizeAxes = Axes.Both;
+                    c.Direction = ExpandDirection;
+                    c.Coverage = 0.5f;
+                }));
+            }
+        }
+    }
+}

From 30a58691f04b48126fb8714331a6d84cf88b6cd6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 24 Feb 2021 14:32:50 +0900
Subject: [PATCH 1662/3722] Make SD and PF incompatible with each other

---
 osu.Game/Rulesets/Mods/ModFailCondition.cs | 25 ++++++++++++++++++++++
 osu.Game/Rulesets/Mods/ModPerfect.cs       |  9 +++++++-
 osu.Game/Rulesets/Mods/ModSuddenDeath.cs   | 15 ++++---------
 3 files changed, 37 insertions(+), 12 deletions(-)
 create mode 100644 osu.Game/Rulesets/Mods/ModFailCondition.cs

diff --git a/osu.Game/Rulesets/Mods/ModFailCondition.cs b/osu.Game/Rulesets/Mods/ModFailCondition.cs
new file mode 100644
index 0000000000..40a0843e06
--- /dev/null
+++ b/osu.Game/Rulesets/Mods/ModFailCondition.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 System;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Rulesets.Mods
+{
+    public abstract class ModFailCondition : Mod, IApplicableToHealthProcessor, IApplicableFailOverride
+    {
+        public override Type[] IncompatibleMods => new[] { typeof(ModNoFail), typeof(ModRelax), typeof(ModAutoplay) };
+
+        public bool PerformFail() => true;
+
+        public bool RestartOnFail => true;
+
+        public void ApplyToHealthProcessor(HealthProcessor healthProcessor)
+        {
+            healthProcessor.FailConditions += FailCondition;
+        }
+
+        protected abstract bool FailCondition(HealthProcessor healthProcessor, JudgementResult result);
+    }
+}
diff --git a/osu.Game/Rulesets/Mods/ModPerfect.cs b/osu.Game/Rulesets/Mods/ModPerfect.cs
index df0fc9c4b6..d0b09b50f2 100644
--- a/osu.Game/Rulesets/Mods/ModPerfect.cs
+++ b/osu.Game/Rulesets/Mods/ModPerfect.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 System;
+using System.Linq;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Judgements;
@@ -8,13 +10,18 @@ using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mods
 {
-    public abstract class ModPerfect : ModSuddenDeath
+    public abstract class ModPerfect : ModFailCondition
     {
         public override string Name => "Perfect";
         public override string Acronym => "PF";
         public override IconUsage? Icon => OsuIcon.ModPerfect;
+        public override ModType Type => ModType.DifficultyIncrease;
+        public override bool Ranked => true;
+        public override double ScoreMultiplier => 1;
         public override string Description => "SS or quit.";
 
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModSuddenDeath)).ToArray();
+
         protected override bool FailCondition(HealthProcessor healthProcessor, JudgementResult result)
             => result.Type.AffectsAccuracy()
                && result.Type != result.Judgement.MaxResult;
diff --git a/osu.Game/Rulesets/Mods/ModSuddenDeath.cs b/osu.Game/Rulesets/Mods/ModSuddenDeath.cs
index ae71041a64..617ae38feb 100644
--- a/osu.Game/Rulesets/Mods/ModSuddenDeath.cs
+++ b/osu.Game/Rulesets/Mods/ModSuddenDeath.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.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Judgements;
@@ -9,7 +10,7 @@ using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mods
 {
-    public abstract class ModSuddenDeath : Mod, IApplicableToHealthProcessor, IApplicableFailOverride
+    public abstract class ModSuddenDeath : ModFailCondition
     {
         public override string Name => "Sudden Death";
         public override string Acronym => "SD";
@@ -18,18 +19,10 @@ namespace osu.Game.Rulesets.Mods
         public override string Description => "Miss and fail.";
         public override double ScoreMultiplier => 1;
         public override bool Ranked => true;
-        public override Type[] IncompatibleMods => new[] { typeof(ModNoFail), typeof(ModRelax), typeof(ModAutoplay) };
 
-        public bool PerformFail() => true;
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModPerfect)).ToArray();
 
-        public bool RestartOnFail => true;
-
-        public void ApplyToHealthProcessor(HealthProcessor healthProcessor)
-        {
-            healthProcessor.FailConditions += FailCondition;
-        }
-
-        protected virtual bool FailCondition(HealthProcessor healthProcessor, JudgementResult result)
+        protected override bool FailCondition(HealthProcessor healthProcessor, JudgementResult result)
             => result.Type.AffectsCombo()
                && !result.IsHit;
     }

From 14160b897e238ebcba242f5fa09f6b237066c960 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 24 Feb 2021 14:42:04 +0900
Subject: [PATCH 1663/3722] Fix references to ModSuddenDeath

---
 osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs | 2 +-
 osu.Game/Rulesets/Mods/ModAutoplay.cs         | 2 +-
 osu.Game/Rulesets/Mods/ModNoFail.cs           | 2 +-
 osu.Game/Rulesets/Mods/ModRelax.cs            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs b/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
index 77de0cb45b..aac830801b 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override ModType Type => ModType.Automation;
         public override string Description => @"Automatic cursor movement - just follow the rhythm.";
         public override double ScoreMultiplier => 1;
-        public override Type[] IncompatibleMods => new[] { typeof(OsuModSpunOut), typeof(ModRelax), typeof(ModSuddenDeath), typeof(ModNoFail), typeof(ModAutoplay) };
+        public override Type[] IncompatibleMods => new[] { typeof(OsuModSpunOut), typeof(ModRelax), typeof(ModFailCondition), typeof(ModNoFail), typeof(ModAutoplay) };
 
         public bool PerformFail() => false;
 
diff --git a/osu.Game/Rulesets/Mods/ModAutoplay.cs b/osu.Game/Rulesets/Mods/ModAutoplay.cs
index d1d23def67..d6e1d46b06 100644
--- a/osu.Game/Rulesets/Mods/ModAutoplay.cs
+++ b/osu.Game/Rulesets/Mods/ModAutoplay.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Mods
 
         public bool RestartOnFail => false;
 
-        public override Type[] IncompatibleMods => new[] { typeof(ModRelax), typeof(ModSuddenDeath), typeof(ModNoFail) };
+        public override Type[] IncompatibleMods => new[] { typeof(ModRelax), typeof(ModFailCondition), typeof(ModNoFail) };
 
         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 b95ec7490e..c0f24e116a 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 string Description => "You can't fail, no matter what.";
         public override double ScoreMultiplier => 0.5;
         public override bool Ranked => true;
-        public override Type[] IncompatibleMods => new[] { typeof(ModRelax), typeof(ModSuddenDeath), typeof(ModAutoplay) };
+        public override Type[] IncompatibleMods => new[] { typeof(ModRelax), typeof(ModFailCondition), typeof(ModAutoplay) };
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModRelax.cs b/osu.Game/Rulesets/Mods/ModRelax.cs
index b6fec42f43..e5995ff180 100644
--- a/osu.Game/Rulesets/Mods/ModRelax.cs
+++ b/osu.Game/Rulesets/Mods/ModRelax.cs
@@ -14,6 +14,6 @@ namespace osu.Game.Rulesets.Mods
         public override IconUsage? Icon => OsuIcon.ModRelax;
         public override ModType Type => ModType.Automation;
         public override double ScoreMultiplier => 1;
-        public override Type[] IncompatibleMods => new[] { typeof(ModAutoplay), typeof(ModNoFail), typeof(ModSuddenDeath) };
+        public override Type[] IncompatibleMods => new[] { typeof(ModAutoplay), typeof(ModNoFail), typeof(ModFailCondition) };
     }
 }

From 0b44d2483b6f02dd415c461ab6d3081e96cd9971 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 24 Feb 2021 15:03:37 +0900
Subject: [PATCH 1664/3722] Make some properties virtual

I think they were intended to be this way from the beginning.
---
 osu.Game/Rulesets/Mods/ModFailCondition.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModFailCondition.cs b/osu.Game/Rulesets/Mods/ModFailCondition.cs
index 40a0843e06..c0d7bae2b2 100644
--- a/osu.Game/Rulesets/Mods/ModFailCondition.cs
+++ b/osu.Game/Rulesets/Mods/ModFailCondition.cs
@@ -11,9 +11,9 @@ namespace osu.Game.Rulesets.Mods
     {
         public override Type[] IncompatibleMods => new[] { typeof(ModNoFail), typeof(ModRelax), typeof(ModAutoplay) };
 
-        public bool PerformFail() => true;
+        public virtual bool PerformFail() => true;
 
-        public bool RestartOnFail => true;
+        public virtual bool RestartOnFail => true;
 
         public void ApplyToHealthProcessor(HealthProcessor healthProcessor)
         {

From 6b6811063b617b3cf5c0e38a6eae95193759dd18 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 24 Feb 2021 15:05:12 +0900
Subject: [PATCH 1665/3722] Make ExpandDirection abstract

---
 osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs         | 3 +++
 osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
index a68f12cb84..e3ac624a6e 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModHidden.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Linq;
+using osu.Game.Rulesets.Mania.UI;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
@@ -12,5 +13,7 @@ namespace osu.Game.Rulesets.Mania.Mods
         public override double ScoreMultiplier => 1;
 
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ManiaModFadeIn)).ToArray();
+
+        protected override CoverExpandDirection ExpandDirection => CoverExpandDirection.AgainstScroll;
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs
index 78c3331fbf..87501d07a5 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Mania.Mods
         /// <summary>
         /// The direction in which the cover should expand.
         /// </summary>
-        protected virtual CoverExpandDirection ExpandDirection => CoverExpandDirection.AgainstScroll;
+        protected abstract CoverExpandDirection ExpandDirection { get; }
 
         public virtual void ApplyToDrawableRuleset(DrawableRuleset<ManiaHitObject> drawableRuleset)
         {

From 165da3204454999cd8497d0f55987d871774b34c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Feb 2021 18:41:42 +0900
Subject: [PATCH 1666/3722] Fix dropdown crash on collection name collisions

---
 osu.Game/Collections/CollectionFilterMenuItem.cs | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Collections/CollectionFilterMenuItem.cs b/osu.Game/Collections/CollectionFilterMenuItem.cs
index fe79358223..0617996872 100644
--- a/osu.Game/Collections/CollectionFilterMenuItem.cs
+++ b/osu.Game/Collections/CollectionFilterMenuItem.cs
@@ -36,7 +36,19 @@ namespace osu.Game.Collections
         }
 
         public bool Equals(CollectionFilterMenuItem other)
-            => other != null && CollectionName.Value == other.CollectionName.Value;
+        {
+            if (other == null)
+                return false;
+
+            // collections may have the same name, so compare first on reference equality.
+            // this relies on the assumption that only one instance of the BeatmapCollection exists game-wide, managed by CollectionManager.
+            if (Collection != null)
+                return Collection == other.Collection;
+
+            // fallback to name-based comparison.
+            // this is required for special dropdown items which don't have a collection (all beatmaps / manage collections items below).
+            return CollectionName.Value == other.CollectionName.Value;
+        }
 
         public override int GetHashCode() => CollectionName.Value.GetHashCode();
     }

From 6e6fb31c050ad03ce1f064fb8077f8df4d0f7027 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Feb 2021 18:42:26 +0900
Subject: [PATCH 1667/3722] Add test coverage

---
 .../TestSceneManageCollectionsDialog.cs       | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs b/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
index 1655adf811..eca857f9e5 100644
--- a/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
+++ b/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Tests.Visual.Collections
             {
                 manager = new CollectionManager(LocalStorage),
                 Content,
-                dialogOverlay = new DialogOverlay()
+                dialogOverlay = new DialogOverlay(),
             });
 
             Dependencies.Cache(manager);
@@ -134,6 +134,27 @@ namespace osu.Game.Tests.Visual.Collections
             assertCollectionName(0, "2");
         }
 
+        [Test]
+        public void TestCollectionNameCollisions()
+        {
+            AddStep("add dropdown", () =>
+            {
+                Add(new CollectionFilterDropdown
+                    {
+                        Anchor = Anchor.TopRight,
+                        Origin = Anchor.TopRight,
+                        RelativeSizeAxes = Axes.X,
+                        Width = 0.4f,
+                    }
+                );
+            });
+            AddStep("add two collections with same name", () => manager.Collections.AddRange(new[]
+            {
+                new BeatmapCollection { Name = { Value = "1" } },
+                new BeatmapCollection { Name = { Value = "1" }, Beatmaps = { beatmapManager.GetAllUsableBeatmapSets().First().Beatmaps[0] } },
+            }));
+        }
+
         [Test]
         public void TestRemoveCollectionViaButton()
         {

From 5dc0aefb2bf36f7ab18e8c41a1643bcc31b05c98 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Feb 2021 19:54:52 +0900
Subject: [PATCH 1668/3722] Cancel request on leaving results screen

---
 osu.Game/Screens/Ranking/SoloResultsScreen.cs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Ranking/SoloResultsScreen.cs b/osu.Game/Screens/Ranking/SoloResultsScreen.cs
index 76b549da1a..4c35096910 100644
--- a/osu.Game/Screens/Ranking/SoloResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/SoloResultsScreen.cs
@@ -15,6 +15,8 @@ namespace osu.Game.Screens.Ranking
 {
     public class SoloResultsScreen : ResultsScreen
     {
+        private GetScoresRequest getScoreRequest;
+
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
@@ -28,9 +30,16 @@ namespace osu.Game.Screens.Ranking
             if (Score.Beatmap.OnlineBeatmapID == null || Score.Beatmap.Status <= BeatmapSetOnlineStatus.Pending)
                 return null;
 
-            var req = new GetScoresRequest(Score.Beatmap, Score.Ruleset);
-            req.Success += r => scoresCallback?.Invoke(r.Scores.Where(s => s.OnlineScoreID != Score.OnlineScoreID).Select(s => s.CreateScoreInfo(rulesets)));
-            return req;
+            getScoreRequest = new GetScoresRequest(Score.Beatmap, Score.Ruleset);
+            getScoreRequest.Success += r => scoresCallback?.Invoke(r.Scores.Where(s => s.OnlineScoreID != this.Score.OnlineScoreID).Select(s => s.CreateScoreInfo(rulesets)));
+            return getScoreRequest;
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            getScoreRequest?.Cancel();
         }
     }
 }

From 9ed8d902f7ca20f47179d5f6387e0c9583b8b320 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Feb 2021 19:57:42 +0900
Subject: [PATCH 1669/3722] Fix requests being indefinitely queued when user is
 offline

---
 osu.Game/Online/API/APIAccess.cs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index ce01378b17..569481d491 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -381,7 +381,13 @@ namespace osu.Game.Online.API
 
         public void Queue(APIRequest request)
         {
-            lock (queue) queue.Enqueue(request);
+            lock (queue)
+            {
+                if (state.Value == APIState.Offline)
+                    return;
+
+                queue.Enqueue(request);
+            }
         }
 
         private void flushQueue(bool failOldRequests = true)
@@ -402,8 +408,6 @@ namespace osu.Game.Online.API
 
         public void Logout()
         {
-            flushQueue();
-
             password = null;
             authentication.Clear();
 
@@ -415,6 +419,7 @@ namespace osu.Game.Online.API
             });
 
             state.Value = APIState.Offline;
+            flushQueue();
         }
 
         private static User createGuestUser() => new GuestUser();

From fa6d797adf9860bbde472efffcca6fa77256fb14 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Feb 2021 20:30:17 +0900
Subject: [PATCH 1670/3722] Remove redundant prefix

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

diff --git a/osu.Game/Screens/Ranking/SoloResultsScreen.cs b/osu.Game/Screens/Ranking/SoloResultsScreen.cs
index 4c35096910..9bc696948f 100644
--- a/osu.Game/Screens/Ranking/SoloResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/SoloResultsScreen.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Screens.Ranking
                 return null;
 
             getScoreRequest = new GetScoresRequest(Score.Beatmap, Score.Ruleset);
-            getScoreRequest.Success += r => scoresCallback?.Invoke(r.Scores.Where(s => s.OnlineScoreID != this.Score.OnlineScoreID).Select(s => s.CreateScoreInfo(rulesets)));
+            getScoreRequest.Success += r => scoresCallback?.Invoke(r.Scores.Where(s => s.OnlineScoreID != Score.OnlineScoreID).Select(s => s.CreateScoreInfo(rulesets)));
             return getScoreRequest;
         }
 

From 73d6a3687eacd25e26501cc2b9ea061b86512c38 Mon Sep 17 00:00:00 2001
From: Ronnie Moir <7267697+H2n9@users.noreply.github.com>
Date: Wed, 24 Feb 2021 14:40:56 +0000
Subject: [PATCH 1671/3722] Change rate correction logic to be more explicit

---
 osu.Game/Rulesets/Mods/ModWindDown.cs | 10 ++++++++--
 osu.Game/Rulesets/Mods/ModWindUp.cs   | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModWindDown.cs b/osu.Game/Rulesets/Mods/ModWindDown.cs
index 9bd5b5eefd..c8d79325a3 100644
--- a/osu.Game/Rulesets/Mods/ModWindDown.cs
+++ b/osu.Game/Rulesets/Mods/ModWindDown.cs
@@ -49,10 +49,16 @@ namespace osu.Game.Rulesets.Mods
         public ModWindDown()
         {
             InitialRate.BindValueChanged(val =>
-                FinalRate.Value = Math.Min(FinalRate.Value, val.NewValue - FinalRate.Precision));
+            {
+                if (val.NewValue <= FinalRate.Value)
+                    FinalRate.Value = val.NewValue - FinalRate.Precision;
+            });
 
             FinalRate.BindValueChanged(val =>
-                InitialRate.Value = Math.Max(InitialRate.Value, val.NewValue + InitialRate.Precision));
+            {
+                if (val.NewValue >= InitialRate.Value)
+                    InitialRate.Value = val.NewValue + FinalRate.Precision;
+            });
         }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModWindUp.cs b/osu.Game/Rulesets/Mods/ModWindUp.cs
index 39d3c9c5d5..4fc1f61e02 100644
--- a/osu.Game/Rulesets/Mods/ModWindUp.cs
+++ b/osu.Game/Rulesets/Mods/ModWindUp.cs
@@ -49,10 +49,16 @@ namespace osu.Game.Rulesets.Mods
         public ModWindUp()
         {
             InitialRate.BindValueChanged(val =>
-                FinalRate.Value = Math.Max(FinalRate.Value, val.NewValue + FinalRate.Precision));
+            {
+                if (val.NewValue >= FinalRate.Value)
+                    FinalRate.Value = val.NewValue + FinalRate.Precision;
+            });
 
             FinalRate.BindValueChanged(val =>
-                InitialRate.Value = Math.Min(InitialRate.Value, val.NewValue - InitialRate.Precision));
+            {
+                if (val.NewValue <= InitialRate.Value)
+                    InitialRate.Value = val.NewValue - FinalRate.Precision;
+            });
         }
     }
 }

From 421b7877d4eb9eed06942666c37d60d962d78b27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 24 Feb 2021 19:16:10 +0100
Subject: [PATCH 1672/3722] Avoid mixing precision across time ramp bindables

Bears no functional difference, it's just a bit less of an eyesore.
---
 osu.Game/Rulesets/Mods/ModWindDown.cs | 2 +-
 osu.Game/Rulesets/Mods/ModWindUp.cs   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Mods/ModWindDown.cs b/osu.Game/Rulesets/Mods/ModWindDown.cs
index c8d79325a3..08bd44f7bd 100644
--- a/osu.Game/Rulesets/Mods/ModWindDown.cs
+++ b/osu.Game/Rulesets/Mods/ModWindDown.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Mods
             FinalRate.BindValueChanged(val =>
             {
                 if (val.NewValue >= InitialRate.Value)
-                    InitialRate.Value = val.NewValue + FinalRate.Precision;
+                    InitialRate.Value = val.NewValue + InitialRate.Precision;
             });
         }
     }
diff --git a/osu.Game/Rulesets/Mods/ModWindUp.cs b/osu.Game/Rulesets/Mods/ModWindUp.cs
index 4fc1f61e02..df8f781148 100644
--- a/osu.Game/Rulesets/Mods/ModWindUp.cs
+++ b/osu.Game/Rulesets/Mods/ModWindUp.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Mods
             FinalRate.BindValueChanged(val =>
             {
                 if (val.NewValue <= InitialRate.Value)
-                    InitialRate.Value = val.NewValue - FinalRate.Precision;
+                    InitialRate.Value = val.NewValue - InitialRate.Precision;
             });
         }
     }

From a362382d381e6128b2eabc55ff7a6717eb1722ef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Feb 2021 14:06:21 +0900
Subject: [PATCH 1673/3722] Add back more correct null checks

---
 osu.Game/Graphics/UserInterface/OsuButton.cs | 2 +-
 osu.Game/Screens/Select/FooterButton.cs      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuButton.cs b/osu.Game/Graphics/UserInterface/OsuButton.cs
index d2114134cf..a22c837080 100644
--- a/osu.Game/Graphics/UserInterface/OsuButton.cs
+++ b/osu.Game/Graphics/UserInterface/OsuButton.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Graphics.UserInterface
     {
         public LocalisableString Text
         {
-            get => SpriteText.Text;
+            get => SpriteText?.Text ?? default;
             set
             {
                 if (SpriteText != null)
diff --git a/osu.Game/Screens/Select/FooterButton.cs b/osu.Game/Screens/Select/FooterButton.cs
index 7bdeacc91a..cd7c1c449f 100644
--- a/osu.Game/Screens/Select/FooterButton.cs
+++ b/osu.Game/Screens/Select/FooterButton.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Screens.Select
 
         public LocalisableString Text
         {
-            get => SpriteText.Text;
+            get => SpriteText?.Text ?? default;
             set
             {
                 if (SpriteText != null)

From 63d48f0c7d786ea069da6ac88fcc1d7e053356e0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Feb 2021 14:06:29 +0900
Subject: [PATCH 1674/3722] Fix incorrect unicode/romanised string order

---
 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 e6d73c6e83..a86699a9b5 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -75,8 +75,8 @@ namespace osu.Game.Tournament.Components
                         new TournamentSpriteText
                         {
                             Text = new RomanisableString(
-                                $"{Beatmap.Metadata.ArtistUnicode ?? Beatmap.Metadata.Artist} - {Beatmap.Metadata.TitleUnicode ?? Beatmap.Metadata.Title}",
-                                $"{Beatmap.Metadata.Artist} - {Beatmap.Metadata.Title}"),
+                                $"{Beatmap.Metadata.Artist} - {Beatmap.Metadata.Title}",
+                                $"{Beatmap.Metadata.ArtistUnicode ?? Beatmap.Metadata.Artist} - {Beatmap.Metadata.TitleUnicode ?? Beatmap.Metadata.Title}"),
                             Font = OsuFont.Torus.With(weight: FontWeight.Bold),
                         },
                         new FillFlowContainer

From 4cdde422280004f4013124ba29a78cf871f52bc0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Feb 2021 14:08:01 +0900
Subject: [PATCH 1675/3722] Remove unnecessary backing field

---
 osu.Game/Overlays/Chat/Selection/ChannelSection.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Chat/Selection/ChannelSection.cs b/osu.Game/Overlays/Chat/Selection/ChannelSection.cs
index e18302770c..537ac975ac 100644
--- a/osu.Game/Overlays/Chat/Selection/ChannelSection.cs
+++ b/osu.Game/Overlays/Chat/Selection/ChannelSection.cs
@@ -15,8 +15,6 @@ namespace osu.Game.Overlays.Chat.Selection
 {
     public class ChannelSection : Container, IHasFilterableChildren
     {
-        private readonly OsuSpriteText header;
-
         public readonly FillFlowContainer<ChannelListItem> ChannelFlow;
 
         public IEnumerable<IFilterable> FilterableChildren => ChannelFlow.Children;
@@ -41,7 +39,7 @@ namespace osu.Game.Overlays.Chat.Selection
 
             Children = new Drawable[]
             {
-                header = new OsuSpriteText
+                new OsuSpriteText
                 {
                     Font = OsuFont.GetFont(size: 15, weight: FontWeight.Bold),
                     Text = "All Channels".ToUpperInvariant()

From e82eaffaed6097e59262aa6106b4784edcb29157 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Feb 2021 14:12:59 +0900
Subject: [PATCH 1676/3722] Flip order back to original for romanisable strings

---
 osu.Game.Tournament/Components/TournamentBeatmapPanel.cs    | 4 ++--
 osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs | 4 ++--
 osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs | 4 ++--
 osu.Game/Overlays/Music/PlaylistItem.cs                     | 4 ++--
 osu.Game/Overlays/NowPlayingOverlay.cs                      | 4 ++--
 .../Sections/Historical/DrawableMostPlayedBeatmap.cs        | 6 +++---
 .../Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs | 6 +++---
 osu.Game/Screens/Menu/SongTicker.cs                         | 4 ++--
 osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs      | 4 ++--
 osu.Game/Screens/Play/BeatmapMetadataDisplay.cs             | 4 ++--
 .../Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs  | 4 ++--
 osu.Game/Screens/Select/BeatmapInfoWedge.cs                 | 4 ++--
 osu.Game/Screens/Select/Carousel/SetPanelContent.cs         | 4 ++--
 13 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index a86699a9b5..e6d73c6e83 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -75,8 +75,8 @@ namespace osu.Game.Tournament.Components
                         new TournamentSpriteText
                         {
                             Text = new RomanisableString(
-                                $"{Beatmap.Metadata.Artist} - {Beatmap.Metadata.Title}",
-                                $"{Beatmap.Metadata.ArtistUnicode ?? Beatmap.Metadata.Artist} - {Beatmap.Metadata.TitleUnicode ?? Beatmap.Metadata.Title}"),
+                                $"{Beatmap.Metadata.ArtistUnicode ?? Beatmap.Metadata.Artist} - {Beatmap.Metadata.TitleUnicode ?? Beatmap.Metadata.Title}",
+                                $"{Beatmap.Metadata.Artist} - {Beatmap.Metadata.Title}"),
                             Font = OsuFont.Torus.With(weight: FontWeight.Bold),
                         },
                         new FillFlowContainer
diff --git a/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs b/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
index ba4725b49a..4d5c387c4a 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
@@ -84,14 +84,14 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                                     {
                                         new OsuSpriteText
                                         {
-                                            Text = new RomanisableString(SetInfo.Metadata.Title, SetInfo.Metadata.TitleUnicode),
+                                            Text = new RomanisableString(SetInfo.Metadata.TitleUnicode, SetInfo.Metadata.Title),
                                             Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold, italics: true)
                                         },
                                     }
                                 },
                                 new OsuSpriteText
                                 {
-                                    Text = new RomanisableString(SetInfo.Metadata.Artist, SetInfo.Metadata.ArtistUnicode),
+                                    Text = new RomanisableString(SetInfo.Metadata.ArtistUnicode, SetInfo.Metadata.Artist),
                                     Font = OsuFont.GetFont(weight: FontWeight.Bold, italics: true)
                                 },
                             },
diff --git a/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs b/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
index 624cb89d1e..00ffd168c1 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
@@ -107,14 +107,14 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                                                             {
                                                                 new OsuSpriteText
                                                                 {
-                                                                    Text = new RomanisableString(SetInfo.Metadata.Title, SetInfo.Metadata.TitleUnicode),
+                                                                    Text = new RomanisableString(SetInfo.Metadata.TitleUnicode, SetInfo.Metadata.Title),
                                                                     Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold, italics: true)
                                                                 },
                                                             }
                                                         },
                                                         new OsuSpriteText
                                                         {
-                                                            Text = new RomanisableString(SetInfo.Metadata.Artist, SetInfo.Metadata.ArtistUnicode),
+                                                            Text = new RomanisableString(SetInfo.Metadata.ArtistUnicode, SetInfo.Metadata.Artist),
                                                             Font = OsuFont.GetFont(weight: FontWeight.Bold, italics: true)
                                                         },
                                                     }
diff --git a/osu.Game/Overlays/Music/PlaylistItem.cs b/osu.Game/Overlays/Music/PlaylistItem.cs
index dab9bc9629..571b14428e 100644
--- a/osu.Game/Overlays/Music/PlaylistItem.cs
+++ b/osu.Game/Overlays/Music/PlaylistItem.cs
@@ -48,8 +48,8 @@ namespace osu.Game.Overlays.Music
             artistColour = colours.Gray9;
             HandleColour = colours.Gray5;
 
-            title = localisation.GetLocalisedString(new RomanisableString(Model.Metadata.Title, Model.Metadata.TitleUnicode));
-            artist = localisation.GetLocalisedString(new RomanisableString(Model.Metadata.Artist, Model.Metadata.ArtistUnicode));
+            title = localisation.GetLocalisedString(new RomanisableString(Model.Metadata.TitleUnicode, Model.Metadata.Title));
+            artist = localisation.GetLocalisedString(new RomanisableString(Model.Metadata.ArtistUnicode, Model.Metadata.Artist));
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 9c17392e25..81bf71cdec 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -293,8 +293,8 @@ namespace osu.Game.Overlays
                     else
                     {
                         BeatmapMetadata metadata = beatmap.Metadata;
-                        title.Text = new RomanisableString(metadata.Title, metadata.TitleUnicode);
-                        artist.Text = new RomanisableString(metadata.Artist, metadata.ArtistUnicode);
+                        title.Text = new RomanisableString(metadata.TitleUnicode, metadata.Title);
+                        artist.Text = new RomanisableString(metadata.ArtistUnicode, metadata.Artist);
                     }
                 });
 
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs b/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
index 48a0481b9e..20e40569e8 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
@@ -130,13 +130,13 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
                 new OsuSpriteText
                 {
                     Text = new RomanisableString(
-                        $"{beatmap.Metadata.Title ?? beatmap.Metadata.TitleUnicode} [{beatmap.Version}] ",
-                        $"{beatmap.Metadata.TitleUnicode ?? beatmap.Metadata.Title} [{beatmap.Version}] "),
+                        $"{beatmap.Metadata.TitleUnicode ?? beatmap.Metadata.Title} [{beatmap.Version}] ",
+                        $"{beatmap.Metadata.Title ?? beatmap.Metadata.TitleUnicode} [{beatmap.Version}] "),
                     Font = OsuFont.GetFont(weight: FontWeight.Bold)
                 },
                 new OsuSpriteText
                 {
-                    Text = "by " + new RomanisableString(beatmap.Metadata.Artist, beatmap.Metadata.ArtistUnicode),
+                    Text = "by " + new RomanisableString(beatmap.Metadata.ArtistUnicode, beatmap.Metadata.Artist),
                     Font = OsuFont.GetFont(weight: FontWeight.Regular)
                 },
             };
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
index ca9e19cd56..713303285a 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
@@ -257,15 +257,15 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                     Anchor = Anchor.BottomLeft,
                     Origin = Anchor.BottomLeft,
                     Text = new RomanisableString(
-                        $"{beatmap.Metadata.Title ?? beatmap.Metadata.TitleUnicode} ",
-                        $"{beatmap.Metadata.TitleUnicode ?? beatmap.Metadata.Title} "),
+                        $"{beatmap.Metadata.TitleUnicode ?? beatmap.Metadata.Title} ",
+                        $"{beatmap.Metadata.Title ?? beatmap.Metadata.TitleUnicode} "),
                     Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold, italics: true)
                 },
                 new OsuSpriteText
                 {
                     Anchor = Anchor.BottomLeft,
                     Origin = Anchor.BottomLeft,
-                    Text = "by " + new RomanisableString(beatmap.Metadata.Artist, beatmap.Metadata.ArtistUnicode),
+                    Text = "by " + new RomanisableString(beatmap.Metadata.ArtistUnicode, beatmap.Metadata.Artist),
                     Font = OsuFont.GetFont(size: 12, italics: true)
                 },
             };
diff --git a/osu.Game/Screens/Menu/SongTicker.cs b/osu.Game/Screens/Menu/SongTicker.cs
index 2be446d71a..237fe43168 100644
--- a/osu.Game/Screens/Menu/SongTicker.cs
+++ b/osu.Game/Screens/Menu/SongTicker.cs
@@ -61,8 +61,8 @@ namespace osu.Game.Screens.Menu
         {
             var metadata = beatmap.Value.Metadata;
 
-            title.Text = new RomanisableString(metadata.Title, metadata.TitleUnicode);
-            artist.Text = new RomanisableString(metadata.Artist, metadata.ArtistUnicode);
+            title.Text = new RomanisableString(metadata.TitleUnicode, metadata.Title);
+            artist.Text = new RomanisableString(metadata.ArtistUnicode, metadata.Artist);
 
             this.FadeInFromZero(fade_duration / 2f)
                 .Delay(4000)
diff --git a/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs b/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
index 299e3e3768..e5a5e35897 100644
--- a/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
                 {
                     new OsuSpriteText
                     {
-                        Text = new RomanisableString(beatmap.Value.Metadata.Artist, beatmap.Value.Metadata.ArtistUnicode),
+                        Text = new RomanisableString(beatmap.Value.Metadata.ArtistUnicode, beatmap.Value.Metadata.Artist),
                         Font = OsuFont.GetFont(size: TextSize),
                     },
                     new OsuSpriteText
@@ -83,7 +83,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
                     },
                     new OsuSpriteText
                     {
-                        Text = new RomanisableString(beatmap.Value.Metadata.Title, beatmap.Value.Metadata.TitleUnicode),
+                        Text = new RomanisableString(beatmap.Value.Metadata.TitleUnicode, beatmap.Value.Metadata.Title),
                         Font = OsuFont.GetFont(size: TextSize),
                     }
                 }, LinkAction.OpenBeatmap, beatmap.Value.OnlineBeatmapID.ToString(), "Open beatmap");
diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index 0779a9c637..c56344a8fb 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Screens.Play
                         }),
                         new OsuSpriteText
                         {
-                            Text = new RomanisableString(metadata.Title, metadata.TitleUnicode),
+                            Text = new RomanisableString(metadata.TitleUnicode, metadata.Title),
                             Font = OsuFont.GetFont(size: 36, italics: true),
                             Origin = Anchor.TopCentre,
                             Anchor = Anchor.TopCentre,
@@ -81,7 +81,7 @@ namespace osu.Game.Screens.Play
                         },
                         new OsuSpriteText
                         {
-                            Text = new RomanisableString(metadata.Artist, metadata.ArtistUnicode),
+                            Text = new RomanisableString(metadata.ArtistUnicode, metadata.Artist),
                             Font = OsuFont.GetFont(size: 26, italics: true),
                             Origin = Anchor.TopCentre,
                             Anchor = Anchor.TopCentre,
diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index 234e4f2023..6a6b39b61c 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -101,7 +101,7 @@ namespace osu.Game.Screens.Ranking.Expanded
                                 {
                                     Anchor = Anchor.TopCentre,
                                     Origin = Anchor.TopCentre,
-                                    Text = new RomanisableString(metadata.Title, metadata.TitleUnicode),
+                                    Text = new RomanisableString(metadata.TitleUnicode, metadata.Title),
                                     Font = OsuFont.Torus.With(size: 20, weight: FontWeight.SemiBold),
                                     MaxWidth = ScorePanel.EXPANDED_WIDTH - padding * 2,
                                     Truncate = true,
@@ -110,7 +110,7 @@ namespace osu.Game.Screens.Ranking.Expanded
                                 {
                                     Anchor = Anchor.TopCentre,
                                     Origin = Anchor.TopCentre,
-                                    Text = new RomanisableString(metadata.Artist, metadata.ArtistUnicode),
+                                    Text = new RomanisableString(metadata.ArtistUnicode, metadata.Artist),
                                     Font = OsuFont.Torus.With(size: 14, weight: FontWeight.SemiBold),
                                     MaxWidth = ScorePanel.EXPANDED_WIDTH - padding * 2,
                                     Truncate = true,
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 0c5b67026c..1c1623e334 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -187,8 +187,8 @@ namespace osu.Game.Screens.Select
 
                 RelativeSizeAxes = Axes.Both;
 
-                titleBinding = localisation.GetLocalisedString(new RomanisableString(metadata.Title, metadata.TitleUnicode));
-                artistBinding = localisation.GetLocalisedString(new RomanisableString(metadata.Artist, metadata.ArtistUnicode));
+                titleBinding = localisation.GetLocalisedString(new RomanisableString(metadata.TitleUnicode, metadata.Title));
+                artistBinding = localisation.GetLocalisedString(new RomanisableString(metadata.ArtistUnicode, metadata.Artist));
 
                 Children = new Drawable[]
                 {
diff --git a/osu.Game/Screens/Select/Carousel/SetPanelContent.cs b/osu.Game/Screens/Select/Carousel/SetPanelContent.cs
index 0e99a4ce70..23a02547b2 100644
--- a/osu.Game/Screens/Select/Carousel/SetPanelContent.cs
+++ b/osu.Game/Screens/Select/Carousel/SetPanelContent.cs
@@ -41,13 +41,13 @@ namespace osu.Game.Screens.Select.Carousel
                 {
                     new OsuSpriteText
                     {
-                        Text = new RomanisableString(beatmapSet.Metadata.Title, beatmapSet.Metadata.TitleUnicode),
+                        Text = new RomanisableString(beatmapSet.Metadata.TitleUnicode, beatmapSet.Metadata.Title),
                         Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 22, italics: true),
                         Shadow = true,
                     },
                     new OsuSpriteText
                     {
-                        Text = new RomanisableString(beatmapSet.Metadata.Artist, beatmapSet.Metadata.ArtistUnicode),
+                        Text = new RomanisableString(beatmapSet.Metadata.ArtistUnicode, beatmapSet.Metadata.Artist),
                         Font = OsuFont.GetFont(weight: FontWeight.SemiBold, size: 17, italics: true),
                         Shadow = true,
                     },

From a08a3d44c796bafb3fac49b8612869b3f8131bd8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Feb 2021 14:51:23 +0900
Subject: [PATCH 1677/3722] Add failing test coverage for using hotkeys from
 main menu before toolbar displayed

---
 .../Navigation/TestSceneScreenNavigation.cs       | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index 5d070b424a..fc49517cdf 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -214,6 +214,21 @@ namespace osu.Game.Tests.Visual.Navigation
             AddAssert("Options overlay still visible", () => songSelect.BeatmapOptionsOverlay.State.Value == Visibility.Visible);
         }
 
+        [Test]
+        public void TestSettingsViaHotkeyFromMainMenu()
+        {
+            AddAssert("toolbar not displayed", () => Game.Toolbar.State.Value == Visibility.Hidden);
+
+            AddStep("press settings hotkey", () =>
+            {
+                InputManager.PressKey(Key.ControlLeft);
+                InputManager.Key(Key.O);
+                InputManager.ReleaseKey(Key.ControlLeft);
+            });
+
+            AddUntilStep("settings displayed", () => Game.Settings.State.Value == Visibility.Visible);
+        }
+
         private void pushEscape() =>
             AddStep("Press escape", () => InputManager.Key(Key.Escape));
 

From 2c8e62ae3589a28fd00dd68a72c20e38f53ca60b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Feb 2021 14:52:51 +0900
Subject: [PATCH 1678/3722] Fix toolbar not completing enough of layout to
 propagate hotkeys to buttons before initial display

---
 osu.Game/Overlays/Toolbar/Toolbar.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index 393e349bd0..0ccb22df3a 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -37,6 +37,15 @@ namespace osu.Game.Overlays.Toolbar
         {
             RelativeSizeAxes = Axes.X;
             Size = new Vector2(1, HEIGHT);
+            AlwaysPresent = true;
+        }
+
+        protected override void UpdateAfterChildren()
+        {
+            base.UpdateAfterChildren();
+
+            // this only needed to be set for the initial LoadComplete/Update, so layout completes and gets buttons in a state they can correctly handle keyboard input for hotkeys.
+            AlwaysPresent = false;
         }
 
         [BackgroundDependencyLoader(true)]

From 154dc03a8c9f3c0eb4b880cc9c25f0baaf0939a0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 25 Feb 2021 15:31:50 +0900
Subject: [PATCH 1679/3722] Update analyser package

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 2e1873a9ed..53ad973e47 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -18,7 +18,7 @@
   <ItemGroup Label="Code Analysis">
     <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.2" PrivateAssets="All" />
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)CodeAnalysis\BannedSymbols.txt" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.2" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3" PrivateAssets="All" />
   </ItemGroup>
   <PropertyGroup Label="Code Analysis">
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodeAnalysis\osu.ruleset</CodeAnalysisRuleSet>

From 996b6a1e57c639617fa4f6d897b75dd3fbe47845 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 25 Feb 2021 15:38:43 +0900
Subject: [PATCH 1680/3722] Add Enum.HasFlag to banned symbols

---
 .editorconfig                  | 5 ++++-
 CodeAnalysis/BannedSymbols.txt | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.editorconfig b/.editorconfig
index a5f7795882..0cdf3b92d3 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -194,4 +194,7 @@ dotnet_diagnostic.IDE0068.severity = none
 dotnet_diagnostic.IDE0069.severity = none
 
 #Disable operator overloads requiring alternate named methods
-dotnet_diagnostic.CA2225.severity = none
\ No newline at end of file
+dotnet_diagnostic.CA2225.severity = none
+
+# Banned APIs
+dotnet_diagnostic.RS0030.severity = error
\ No newline at end of file
diff --git a/CodeAnalysis/BannedSymbols.txt b/CodeAnalysis/BannedSymbols.txt
index 47839608c9..60cce39176 100644
--- a/CodeAnalysis/BannedSymbols.txt
+++ b/CodeAnalysis/BannedSymbols.txt
@@ -7,3 +7,4 @@ M:osu.Framework.Graphics.Sprites.SpriteText.#ctor;Use OsuSpriteText.
 M:osu.Framework.Bindables.IBindableList`1.GetBoundCopy();Fails on iOS. Use manual ctor + BindTo instead. (see https://github.com/mono/mono/issues/19900)
 T:Microsoft.EntityFrameworkCore.Internal.EnumerableExtensions;Don't use internal extension methods.
 T:Microsoft.EntityFrameworkCore.Internal.TypeExtensions;Don't use internal extension methods.
+M:System.Enum.HasFlagFast(System.Enum);Use osu.Framework.Extensions.EnumExtensions.HasFlagFast<T>() instead.
\ No newline at end of file

From dff1d80f3943c705cb4dfdb8b67123b5e80e1592 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 25 Feb 2021 15:38:56 +0900
Subject: [PATCH 1681/3722] Update HasFlag usages to HasFlagFast

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs       | 27 +++++-----
 .../TestSceneNotes.cs                         |  3 +-
 .../Legacy/DistanceObjectPatternGenerator.cs  | 17 ++++---
 .../Legacy/HitObjectPatternGenerator.cs       | 33 ++++++------
 osu.Game.Rulesets.Mania/ManiaRuleset.cs       | 51 ++++++++++---------
 osu.Game.Rulesets.Osu/OsuRuleset.cs           | 35 ++++++-------
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs       | 29 ++++++-----
 .../Beatmaps/Formats/LegacyBeatmapDecoder.cs  |  5 +-
 osu.Game/Graphics/UserInterface/BarGraph.cs   |  9 ++--
 .../Graphics/UserInterface/TwoLayerButton.cs  | 11 ++--
 osu.Game/Overlays/Toolbar/ToolbarButton.cs    |  5 +-
 osu.Game/Replays/Legacy/LegacyReplayFrame.cs  |  9 ++--
 .../Objects/Legacy/ConvertHitObjectParser.cs  | 19 +++----
 .../Drawables/DrawableStoryboardAnimation.cs  |  9 ++--
 .../Drawables/DrawableStoryboardSprite.cs     |  9 ++--
 15 files changed, 143 insertions(+), 128 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index 0a817eca0d..f4ddbd3021 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -21,6 +21,7 @@ using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using System;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Game.Rulesets.Catch.Skinning.Legacy;
 using osu.Game.Skinning;
 
@@ -50,40 +51,40 @@ namespace osu.Game.Rulesets.Catch
 
         public override IEnumerable<Mod> ConvertFromLegacyMods(LegacyMods mods)
         {
-            if (mods.HasFlag(LegacyMods.Nightcore))
+            if (mods.HasFlagFast(LegacyMods.Nightcore))
                 yield return new CatchModNightcore();
-            else if (mods.HasFlag(LegacyMods.DoubleTime))
+            else if (mods.HasFlagFast(LegacyMods.DoubleTime))
                 yield return new CatchModDoubleTime();
 
-            if (mods.HasFlag(LegacyMods.Perfect))
+            if (mods.HasFlagFast(LegacyMods.Perfect))
                 yield return new CatchModPerfect();
-            else if (mods.HasFlag(LegacyMods.SuddenDeath))
+            else if (mods.HasFlagFast(LegacyMods.SuddenDeath))
                 yield return new CatchModSuddenDeath();
 
-            if (mods.HasFlag(LegacyMods.Cinema))
+            if (mods.HasFlagFast(LegacyMods.Cinema))
                 yield return new CatchModCinema();
-            else if (mods.HasFlag(LegacyMods.Autoplay))
+            else if (mods.HasFlagFast(LegacyMods.Autoplay))
                 yield return new CatchModAutoplay();
 
-            if (mods.HasFlag(LegacyMods.Easy))
+            if (mods.HasFlagFast(LegacyMods.Easy))
                 yield return new CatchModEasy();
 
-            if (mods.HasFlag(LegacyMods.Flashlight))
+            if (mods.HasFlagFast(LegacyMods.Flashlight))
                 yield return new CatchModFlashlight();
 
-            if (mods.HasFlag(LegacyMods.HalfTime))
+            if (mods.HasFlagFast(LegacyMods.HalfTime))
                 yield return new CatchModHalfTime();
 
-            if (mods.HasFlag(LegacyMods.HardRock))
+            if (mods.HasFlagFast(LegacyMods.HardRock))
                 yield return new CatchModHardRock();
 
-            if (mods.HasFlag(LegacyMods.Hidden))
+            if (mods.HasFlagFast(LegacyMods.Hidden))
                 yield return new CatchModHidden();
 
-            if (mods.HasFlag(LegacyMods.NoFail))
+            if (mods.HasFlagFast(LegacyMods.NoFail))
                 yield return new CatchModNoFail();
 
-            if (mods.HasFlag(LegacyMods.Relax))
+            if (mods.HasFlagFast(LegacyMods.Relax))
                 yield return new CatchModRelax();
         }
 
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
index 6b8f5d5d9d..706268e478 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
@@ -6,6 +6,7 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -97,7 +98,7 @@ namespace osu.Game.Rulesets.Mania.Tests
         }
 
         private bool verifyAnchors(DrawableHitObject hitObject, Anchor expectedAnchor)
-            => hitObject.Anchor.HasFlag(expectedAnchor) && hitObject.Origin.HasFlag(expectedAnchor);
+            => hitObject.Anchor.HasFlagFast(expectedAnchor) && hitObject.Origin.HasFlagFast(expectedAnchor);
 
         private bool verifyAnchors(DrawableHoldNote holdNote, Anchor expectedAnchor)
             => verifyAnchors((DrawableHitObject)holdNote, expectedAnchor) && holdNote.NestedHitObjects.All(n => verifyAnchors(n, expectedAnchor));
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index 30d33de06e..c81710ed18 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.MathUtils;
@@ -141,7 +142,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
             if (ConversionDifficulty > 6.5)
             {
-                if (convertType.HasFlag(PatternType.LowProbability))
+                if (convertType.HasFlagFast(PatternType.LowProbability))
                     return generateNRandomNotes(StartTime, 0.78, 0.3, 0);
 
                 return generateNRandomNotes(StartTime, 0.85, 0.36, 0.03);
@@ -149,7 +150,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
             if (ConversionDifficulty > 4)
             {
-                if (convertType.HasFlag(PatternType.LowProbability))
+                if (convertType.HasFlagFast(PatternType.LowProbability))
                     return generateNRandomNotes(StartTime, 0.43, 0.08, 0);
 
                 return generateNRandomNotes(StartTime, 0.56, 0.18, 0);
@@ -157,13 +158,13 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
             if (ConversionDifficulty > 2.5)
             {
-                if (convertType.HasFlag(PatternType.LowProbability))
+                if (convertType.HasFlagFast(PatternType.LowProbability))
                     return generateNRandomNotes(StartTime, 0.3, 0, 0);
 
                 return generateNRandomNotes(StartTime, 0.37, 0.08, 0);
             }
 
-            if (convertType.HasFlag(PatternType.LowProbability))
+            if (convertType.HasFlagFast(PatternType.LowProbability))
                 return generateNRandomNotes(StartTime, 0.17, 0, 0);
 
             return generateNRandomNotes(StartTime, 0.27, 0, 0);
@@ -221,7 +222,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             var pattern = new Pattern();
 
             int nextColumn = GetColumn((HitObject as IHasXPosition)?.X ?? 0, true);
-            if (convertType.HasFlag(PatternType.ForceNotStack) && PreviousPattern.ColumnWithObjects < TotalColumns)
+            if (convertType.HasFlagFast(PatternType.ForceNotStack) && PreviousPattern.ColumnWithObjects < TotalColumns)
                 nextColumn = FindAvailableColumn(nextColumn, PreviousPattern);
 
             int lastColumn = nextColumn;
@@ -373,7 +374,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
             static bool isDoubleSample(HitSampleInfo sample) => sample.Name == HitSampleInfo.HIT_CLAP || sample.Name == HitSampleInfo.HIT_FINISH;
 
-            bool canGenerateTwoNotes = !convertType.HasFlag(PatternType.LowProbability);
+            bool canGenerateTwoNotes = !convertType.HasFlagFast(PatternType.LowProbability);
             canGenerateTwoNotes &= HitObject.Samples.Any(isDoubleSample) || sampleInfoListAt(StartTime).Any(isDoubleSample);
 
             if (canGenerateTwoNotes)
@@ -406,7 +407,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             int endTime = startTime + SegmentDuration * SpanCount;
 
             int nextColumn = GetColumn((HitObject as IHasXPosition)?.X ?? 0, true);
-            if (convertType.HasFlag(PatternType.ForceNotStack) && PreviousPattern.ColumnWithObjects < TotalColumns)
+            if (convertType.HasFlagFast(PatternType.ForceNotStack) && PreviousPattern.ColumnWithObjects < TotalColumns)
                 nextColumn = FindAvailableColumn(nextColumn, PreviousPattern);
 
             for (int i = 0; i < columnRepeat; i++)
@@ -435,7 +436,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             var pattern = new Pattern();
 
             int holdColumn = GetColumn((HitObject as IHasXPosition)?.X ?? 0, true);
-            if (convertType.HasFlag(PatternType.ForceNotStack) && PreviousPattern.ColumnWithObjects < TotalColumns)
+            if (convertType.HasFlagFast(PatternType.ForceNotStack) && PreviousPattern.ColumnWithObjects < TotalColumns)
                 holdColumn = FindAvailableColumn(holdColumn, PreviousPattern);
 
             // Create the hold note
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
index bc4ab55767..8e9020ee13 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Extensions.EnumExtensions;
 using osuTK;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
@@ -78,7 +79,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             else
                 convertType |= PatternType.LowProbability;
 
-            if (!convertType.HasFlag(PatternType.KeepSingle))
+            if (!convertType.HasFlagFast(PatternType.KeepSingle))
             {
                 if (HitObject.Samples.Any(s => s.Name == HitSampleInfo.HIT_FINISH) && TotalColumns != 8)
                     convertType |= PatternType.Mirror;
@@ -101,7 +102,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
                 int lastColumn = PreviousPattern.HitObjects.FirstOrDefault()?.Column ?? 0;
 
-                if (convertType.HasFlag(PatternType.Reverse) && PreviousPattern.HitObjects.Any())
+                if (convertType.HasFlagFast(PatternType.Reverse) && PreviousPattern.HitObjects.Any())
                 {
                     // Generate a new pattern by copying the last hit objects in reverse-column order
                     for (int i = RandomStart; i < TotalColumns; i++)
@@ -113,7 +114,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
                     return pattern;
                 }
 
-                if (convertType.HasFlag(PatternType.Cycle) && PreviousPattern.HitObjects.Count() == 1
+                if (convertType.HasFlagFast(PatternType.Cycle) && PreviousPattern.HitObjects.Count() == 1
                                                            // If we convert to 7K + 1, let's not overload the special key
                                                            && (TotalColumns != 8 || lastColumn != 0)
                                                            // Make sure the last column was not the centre column
@@ -126,7 +127,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
                     return pattern;
                 }
 
-                if (convertType.HasFlag(PatternType.ForceStack) && PreviousPattern.HitObjects.Any())
+                if (convertType.HasFlagFast(PatternType.ForceStack) && PreviousPattern.HitObjects.Any())
                 {
                     // Generate a new pattern by placing on the already filled columns
                     for (int i = RandomStart; i < TotalColumns; i++)
@@ -140,7 +141,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
                 if (PreviousPattern.HitObjects.Count() == 1)
                 {
-                    if (convertType.HasFlag(PatternType.Stair))
+                    if (convertType.HasFlagFast(PatternType.Stair))
                     {
                         // Generate a new pattern by placing on the next column, cycling back to the start if there is no "next"
                         int targetColumn = lastColumn + 1;
@@ -151,7 +152,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
                         return pattern;
                     }
 
-                    if (convertType.HasFlag(PatternType.ReverseStair))
+                    if (convertType.HasFlagFast(PatternType.ReverseStair))
                     {
                         // Generate a new pattern by placing on the previous column, cycling back to the end if there is no "previous"
                         int targetColumn = lastColumn - 1;
@@ -163,10 +164,10 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
                     }
                 }
 
-                if (convertType.HasFlag(PatternType.KeepSingle))
+                if (convertType.HasFlagFast(PatternType.KeepSingle))
                     return generateRandomNotes(1);
 
-                if (convertType.HasFlag(PatternType.Mirror))
+                if (convertType.HasFlagFast(PatternType.Mirror))
                 {
                     if (ConversionDifficulty > 6.5)
                         return generateRandomPatternWithMirrored(0.12, 0.38, 0.12);
@@ -178,7 +179,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
                 if (ConversionDifficulty > 6.5)
                 {
-                    if (convertType.HasFlag(PatternType.LowProbability))
+                    if (convertType.HasFlagFast(PatternType.LowProbability))
                         return generateRandomPattern(0.78, 0.42, 0, 0);
 
                     return generateRandomPattern(1, 0.62, 0, 0);
@@ -186,7 +187,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
                 if (ConversionDifficulty > 4)
                 {
-                    if (convertType.HasFlag(PatternType.LowProbability))
+                    if (convertType.HasFlagFast(PatternType.LowProbability))
                         return generateRandomPattern(0.35, 0.08, 0, 0);
 
                     return generateRandomPattern(0.52, 0.15, 0, 0);
@@ -194,7 +195,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
                 if (ConversionDifficulty > 2)
                 {
-                    if (convertType.HasFlag(PatternType.LowProbability))
+                    if (convertType.HasFlagFast(PatternType.LowProbability))
                         return generateRandomPattern(0.18, 0, 0, 0);
 
                     return generateRandomPattern(0.45, 0, 0, 0);
@@ -207,9 +208,9 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
             foreach (var obj in p.HitObjects)
             {
-                if (convertType.HasFlag(PatternType.Stair) && obj.Column == TotalColumns - 1)
+                if (convertType.HasFlagFast(PatternType.Stair) && obj.Column == TotalColumns - 1)
                     StairType = PatternType.ReverseStair;
-                if (convertType.HasFlag(PatternType.ReverseStair) && obj.Column == RandomStart)
+                if (convertType.HasFlagFast(PatternType.ReverseStair) && obj.Column == RandomStart)
                     StairType = PatternType.Stair;
             }
 
@@ -229,7 +230,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
         {
             var pattern = new Pattern();
 
-            bool allowStacking = !convertType.HasFlag(PatternType.ForceNotStack);
+            bool allowStacking = !convertType.HasFlagFast(PatternType.ForceNotStack);
 
             if (!allowStacking)
                 noteCount = Math.Min(noteCount, TotalColumns - RandomStart - PreviousPattern.ColumnWithObjects);
@@ -249,7 +250,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
             int getNextColumn(int last)
             {
-                if (convertType.HasFlag(PatternType.Gathered))
+                if (convertType.HasFlagFast(PatternType.Gathered))
                 {
                     last++;
                     if (last == TotalColumns)
@@ -296,7 +297,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
         /// <returns>The <see cref="Pattern"/> containing the hit objects.</returns>
         private Pattern generateRandomPatternWithMirrored(double centreProbability, double p2, double p3)
         {
-            if (convertType.HasFlag(PatternType.ForceNotStack))
+            if (convertType.HasFlagFast(PatternType.ForceNotStack))
                 return generateRandomPattern(1 / 2f + p2 / 2, p2, (p2 + p3) / 2, p3);
 
             var pattern = new Pattern();
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 4c729fef83..d624e094ad 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -9,6 +9,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Bindings;
@@ -59,76 +60,76 @@ namespace osu.Game.Rulesets.Mania
 
         public override IEnumerable<Mod> ConvertFromLegacyMods(LegacyMods mods)
         {
-            if (mods.HasFlag(LegacyMods.Nightcore))
+            if (mods.HasFlagFast(LegacyMods.Nightcore))
                 yield return new ManiaModNightcore();
-            else if (mods.HasFlag(LegacyMods.DoubleTime))
+            else if (mods.HasFlagFast(LegacyMods.DoubleTime))
                 yield return new ManiaModDoubleTime();
 
-            if (mods.HasFlag(LegacyMods.Perfect))
+            if (mods.HasFlagFast(LegacyMods.Perfect))
                 yield return new ManiaModPerfect();
-            else if (mods.HasFlag(LegacyMods.SuddenDeath))
+            else if (mods.HasFlagFast(LegacyMods.SuddenDeath))
                 yield return new ManiaModSuddenDeath();
 
-            if (mods.HasFlag(LegacyMods.Cinema))
+            if (mods.HasFlagFast(LegacyMods.Cinema))
                 yield return new ManiaModCinema();
-            else if (mods.HasFlag(LegacyMods.Autoplay))
+            else if (mods.HasFlagFast(LegacyMods.Autoplay))
                 yield return new ManiaModAutoplay();
 
-            if (mods.HasFlag(LegacyMods.Easy))
+            if (mods.HasFlagFast(LegacyMods.Easy))
                 yield return new ManiaModEasy();
 
-            if (mods.HasFlag(LegacyMods.FadeIn))
+            if (mods.HasFlagFast(LegacyMods.FadeIn))
                 yield return new ManiaModFadeIn();
 
-            if (mods.HasFlag(LegacyMods.Flashlight))
+            if (mods.HasFlagFast(LegacyMods.Flashlight))
                 yield return new ManiaModFlashlight();
 
-            if (mods.HasFlag(LegacyMods.HalfTime))
+            if (mods.HasFlagFast(LegacyMods.HalfTime))
                 yield return new ManiaModHalfTime();
 
-            if (mods.HasFlag(LegacyMods.HardRock))
+            if (mods.HasFlagFast(LegacyMods.HardRock))
                 yield return new ManiaModHardRock();
 
-            if (mods.HasFlag(LegacyMods.Hidden))
+            if (mods.HasFlagFast(LegacyMods.Hidden))
                 yield return new ManiaModHidden();
 
-            if (mods.HasFlag(LegacyMods.Key1))
+            if (mods.HasFlagFast(LegacyMods.Key1))
                 yield return new ManiaModKey1();
 
-            if (mods.HasFlag(LegacyMods.Key2))
+            if (mods.HasFlagFast(LegacyMods.Key2))
                 yield return new ManiaModKey2();
 
-            if (mods.HasFlag(LegacyMods.Key3))
+            if (mods.HasFlagFast(LegacyMods.Key3))
                 yield return new ManiaModKey3();
 
-            if (mods.HasFlag(LegacyMods.Key4))
+            if (mods.HasFlagFast(LegacyMods.Key4))
                 yield return new ManiaModKey4();
 
-            if (mods.HasFlag(LegacyMods.Key5))
+            if (mods.HasFlagFast(LegacyMods.Key5))
                 yield return new ManiaModKey5();
 
-            if (mods.HasFlag(LegacyMods.Key6))
+            if (mods.HasFlagFast(LegacyMods.Key6))
                 yield return new ManiaModKey6();
 
-            if (mods.HasFlag(LegacyMods.Key7))
+            if (mods.HasFlagFast(LegacyMods.Key7))
                 yield return new ManiaModKey7();
 
-            if (mods.HasFlag(LegacyMods.Key8))
+            if (mods.HasFlagFast(LegacyMods.Key8))
                 yield return new ManiaModKey8();
 
-            if (mods.HasFlag(LegacyMods.Key9))
+            if (mods.HasFlagFast(LegacyMods.Key9))
                 yield return new ManiaModKey9();
 
-            if (mods.HasFlag(LegacyMods.KeyCoop))
+            if (mods.HasFlagFast(LegacyMods.KeyCoop))
                 yield return new ManiaModDualStages();
 
-            if (mods.HasFlag(LegacyMods.NoFail))
+            if (mods.HasFlagFast(LegacyMods.NoFail))
                 yield return new ManiaModNoFail();
 
-            if (mods.HasFlag(LegacyMods.Random))
+            if (mods.HasFlagFast(LegacyMods.Random))
                 yield return new ManiaModRandom();
 
-            if (mods.HasFlag(LegacyMods.Mirror))
+            if (mods.HasFlagFast(LegacyMods.Mirror))
                 yield return new ManiaModMirror();
         }
 
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 18324a18a8..838d707d64 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -29,6 +29,7 @@ using osu.Game.Scoring;
 using osu.Game.Skinning;
 using System;
 using System.Linq;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Skinning.Legacy;
 using osu.Game.Rulesets.Osu.Statistics;
@@ -58,52 +59,52 @@ namespace osu.Game.Rulesets.Osu
 
         public override IEnumerable<Mod> ConvertFromLegacyMods(LegacyMods mods)
         {
-            if (mods.HasFlag(LegacyMods.Nightcore))
+            if (mods.HasFlagFast(LegacyMods.Nightcore))
                 yield return new OsuModNightcore();
-            else if (mods.HasFlag(LegacyMods.DoubleTime))
+            else if (mods.HasFlagFast(LegacyMods.DoubleTime))
                 yield return new OsuModDoubleTime();
 
-            if (mods.HasFlag(LegacyMods.Perfect))
+            if (mods.HasFlagFast(LegacyMods.Perfect))
                 yield return new OsuModPerfect();
-            else if (mods.HasFlag(LegacyMods.SuddenDeath))
+            else if (mods.HasFlagFast(LegacyMods.SuddenDeath))
                 yield return new OsuModSuddenDeath();
 
-            if (mods.HasFlag(LegacyMods.Autopilot))
+            if (mods.HasFlagFast(LegacyMods.Autopilot))
                 yield return new OsuModAutopilot();
 
-            if (mods.HasFlag(LegacyMods.Cinema))
+            if (mods.HasFlagFast(LegacyMods.Cinema))
                 yield return new OsuModCinema();
-            else if (mods.HasFlag(LegacyMods.Autoplay))
+            else if (mods.HasFlagFast(LegacyMods.Autoplay))
                 yield return new OsuModAutoplay();
 
-            if (mods.HasFlag(LegacyMods.Easy))
+            if (mods.HasFlagFast(LegacyMods.Easy))
                 yield return new OsuModEasy();
 
-            if (mods.HasFlag(LegacyMods.Flashlight))
+            if (mods.HasFlagFast(LegacyMods.Flashlight))
                 yield return new OsuModFlashlight();
 
-            if (mods.HasFlag(LegacyMods.HalfTime))
+            if (mods.HasFlagFast(LegacyMods.HalfTime))
                 yield return new OsuModHalfTime();
 
-            if (mods.HasFlag(LegacyMods.HardRock))
+            if (mods.HasFlagFast(LegacyMods.HardRock))
                 yield return new OsuModHardRock();
 
-            if (mods.HasFlag(LegacyMods.Hidden))
+            if (mods.HasFlagFast(LegacyMods.Hidden))
                 yield return new OsuModHidden();
 
-            if (mods.HasFlag(LegacyMods.NoFail))
+            if (mods.HasFlagFast(LegacyMods.NoFail))
                 yield return new OsuModNoFail();
 
-            if (mods.HasFlag(LegacyMods.Relax))
+            if (mods.HasFlagFast(LegacyMods.Relax))
                 yield return new OsuModRelax();
 
-            if (mods.HasFlag(LegacyMods.SpunOut))
+            if (mods.HasFlagFast(LegacyMods.SpunOut))
                 yield return new OsuModSpunOut();
 
-            if (mods.HasFlag(LegacyMods.Target))
+            if (mods.HasFlagFast(LegacyMods.Target))
                 yield return new OsuModTarget();
 
-            if (mods.HasFlag(LegacyMods.TouchDevice))
+            if (mods.HasFlagFast(LegacyMods.TouchDevice))
                 yield return new OsuModTouchDevice();
         }
 
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index f2b5d195b4..56f58f404b 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -22,6 +22,7 @@ using osu.Game.Rulesets.Taiko.Scoring;
 using osu.Game.Scoring;
 using System;
 using System.Linq;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Taiko.Edit;
 using osu.Game.Rulesets.Taiko.Objects;
@@ -57,43 +58,43 @@ namespace osu.Game.Rulesets.Taiko
 
         public override IEnumerable<Mod> ConvertFromLegacyMods(LegacyMods mods)
         {
-            if (mods.HasFlag(LegacyMods.Nightcore))
+            if (mods.HasFlagFast(LegacyMods.Nightcore))
                 yield return new TaikoModNightcore();
-            else if (mods.HasFlag(LegacyMods.DoubleTime))
+            else if (mods.HasFlagFast(LegacyMods.DoubleTime))
                 yield return new TaikoModDoubleTime();
 
-            if (mods.HasFlag(LegacyMods.Perfect))
+            if (mods.HasFlagFast(LegacyMods.Perfect))
                 yield return new TaikoModPerfect();
-            else if (mods.HasFlag(LegacyMods.SuddenDeath))
+            else if (mods.HasFlagFast(LegacyMods.SuddenDeath))
                 yield return new TaikoModSuddenDeath();
 
-            if (mods.HasFlag(LegacyMods.Cinema))
+            if (mods.HasFlagFast(LegacyMods.Cinema))
                 yield return new TaikoModCinema();
-            else if (mods.HasFlag(LegacyMods.Autoplay))
+            else if (mods.HasFlagFast(LegacyMods.Autoplay))
                 yield return new TaikoModAutoplay();
 
-            if (mods.HasFlag(LegacyMods.Easy))
+            if (mods.HasFlagFast(LegacyMods.Easy))
                 yield return new TaikoModEasy();
 
-            if (mods.HasFlag(LegacyMods.Flashlight))
+            if (mods.HasFlagFast(LegacyMods.Flashlight))
                 yield return new TaikoModFlashlight();
 
-            if (mods.HasFlag(LegacyMods.HalfTime))
+            if (mods.HasFlagFast(LegacyMods.HalfTime))
                 yield return new TaikoModHalfTime();
 
-            if (mods.HasFlag(LegacyMods.HardRock))
+            if (mods.HasFlagFast(LegacyMods.HardRock))
                 yield return new TaikoModHardRock();
 
-            if (mods.HasFlag(LegacyMods.Hidden))
+            if (mods.HasFlagFast(LegacyMods.Hidden))
                 yield return new TaikoModHidden();
 
-            if (mods.HasFlag(LegacyMods.NoFail))
+            if (mods.HasFlagFast(LegacyMods.NoFail))
                 yield return new TaikoModNoFail();
 
-            if (mods.HasFlag(LegacyMods.Relax))
+            if (mods.HasFlagFast(LegacyMods.Relax))
                 yield return new TaikoModRelax();
 
-            if (mods.HasFlag(LegacyMods.Random))
+            if (mods.HasFlagFast(LegacyMods.Random))
                 yield return new TaikoModRandom();
         }
 
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 37ab489da5..99dffa7041 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using osu.Framework.Extensions;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Legacy;
 using osu.Game.Beatmaps.Timing;
@@ -348,8 +349,8 @@ namespace osu.Game.Beatmaps.Formats
             if (split.Length >= 8)
             {
                 LegacyEffectFlags effectFlags = (LegacyEffectFlags)Parsing.ParseInt(split[7]);
-                kiaiMode = effectFlags.HasFlag(LegacyEffectFlags.Kiai);
-                omitFirstBarSignature = effectFlags.HasFlag(LegacyEffectFlags.OmitFirstBarLine);
+                kiaiMode = effectFlags.HasFlagFast(LegacyEffectFlags.Kiai);
+                omitFirstBarSignature = effectFlags.HasFlagFast(LegacyEffectFlags.OmitFirstBarLine);
             }
 
             string stringSampleSet = sampleSet.ToString().ToLowerInvariant();
diff --git a/osu.Game/Graphics/UserInterface/BarGraph.cs b/osu.Game/Graphics/UserInterface/BarGraph.cs
index 953f3985f9..407bf6a923 100644
--- a/osu.Game/Graphics/UserInterface/BarGraph.cs
+++ b/osu.Game/Graphics/UserInterface/BarGraph.cs
@@ -6,6 +6,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Extensions.EnumExtensions;
 
 namespace osu.Game.Graphics.UserInterface
 {
@@ -24,11 +25,11 @@ namespace osu.Game.Graphics.UserInterface
             set
             {
                 direction = value;
-                base.Direction = direction.HasFlag(BarDirection.Horizontal) ? FillDirection.Vertical : FillDirection.Horizontal;
+                base.Direction = direction.HasFlagFast(BarDirection.Horizontal) ? FillDirection.Vertical : FillDirection.Horizontal;
 
                 foreach (var bar in Children)
                 {
-                    bar.Size = direction.HasFlag(BarDirection.Horizontal) ? new Vector2(1, 1.0f / Children.Count) : new Vector2(1.0f / Children.Count, 1);
+                    bar.Size = direction.HasFlagFast(BarDirection.Horizontal) ? new Vector2(1, 1.0f / Children.Count) : new Vector2(1.0f / Children.Count, 1);
                     bar.Direction = direction;
                 }
             }
@@ -56,14 +57,14 @@ namespace osu.Game.Graphics.UserInterface
                     if (bar.Bar != null)
                     {
                         bar.Bar.Length = length;
-                        bar.Bar.Size = direction.HasFlag(BarDirection.Horizontal) ? new Vector2(1, size) : new Vector2(size, 1);
+                        bar.Bar.Size = direction.HasFlagFast(BarDirection.Horizontal) ? new Vector2(1, size) : new Vector2(size, 1);
                     }
                     else
                     {
                         Add(new Bar
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Size = direction.HasFlag(BarDirection.Horizontal) ? new Vector2(1, size) : new Vector2(size, 1),
+                            Size = direction.HasFlagFast(BarDirection.Horizontal) ? new Vector2(1, size) : new Vector2(size, 1),
                             Length = length,
                             Direction = Direction,
                         });
diff --git a/osu.Game/Graphics/UserInterface/TwoLayerButton.cs b/osu.Game/Graphics/UserInterface/TwoLayerButton.cs
index 120149d8c1..8f03c7073c 100644
--- a/osu.Game/Graphics/UserInterface/TwoLayerButton.cs
+++ b/osu.Game/Graphics/UserInterface/TwoLayerButton.cs
@@ -12,6 +12,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Framework.Audio.Track;
 using System;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
@@ -56,15 +57,15 @@ namespace osu.Game.Graphics.UserInterface
             set
             {
                 base.Origin = value;
-                c1.Origin = c1.Anchor = value.HasFlag(Anchor.x2) ? Anchor.TopLeft : Anchor.TopRight;
-                c2.Origin = c2.Anchor = value.HasFlag(Anchor.x2) ? Anchor.TopRight : Anchor.TopLeft;
+                c1.Origin = c1.Anchor = value.HasFlagFast(Anchor.x2) ? Anchor.TopLeft : Anchor.TopRight;
+                c2.Origin = c2.Anchor = value.HasFlagFast(Anchor.x2) ? Anchor.TopRight : Anchor.TopLeft;
 
-                X = value.HasFlag(Anchor.x2) ? SIZE_RETRACTED.X * shear.X * 0.5f : 0;
+                X = value.HasFlagFast(Anchor.x2) ? SIZE_RETRACTED.X * shear.X * 0.5f : 0;
 
                 Remove(c1);
                 Remove(c2);
-                c1.Depth = value.HasFlag(Anchor.x2) ? 0 : 1;
-                c2.Depth = value.HasFlag(Anchor.x2) ? 1 : 0;
+                c1.Depth = value.HasFlagFast(Anchor.x2) ? 0 : 1;
+                c2.Depth = value.HasFlagFast(Anchor.x2) ? 1 : 0;
                 Add(c1);
                 Add(c2);
             }
diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
index 83f2bdf6cb..5939f7a42f 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Caching;
 using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
@@ -127,9 +128,9 @@ namespace osu.Game.Overlays.Toolbar
                 {
                     Direction = FillDirection.Vertical,
                     RelativeSizeAxes = Axes.Both, // stops us being considered in parent's autosize
-                    Anchor = TooltipAnchor.HasFlag(Anchor.x0) ? Anchor.BottomLeft : Anchor.BottomRight,
+                    Anchor = TooltipAnchor.HasFlagFast(Anchor.x0) ? Anchor.BottomLeft : Anchor.BottomRight,
                     Origin = TooltipAnchor,
-                    Position = new Vector2(TooltipAnchor.HasFlag(Anchor.x0) ? 5 : -5, 5),
+                    Position = new Vector2(TooltipAnchor.HasFlagFast(Anchor.x0) ? 5 : -5, 5),
                     Alpha = 0,
                     Children = new Drawable[]
                     {
diff --git a/osu.Game/Replays/Legacy/LegacyReplayFrame.cs b/osu.Game/Replays/Legacy/LegacyReplayFrame.cs
index ab9ccda9b9..f6abf259e8 100644
--- a/osu.Game/Replays/Legacy/LegacyReplayFrame.cs
+++ b/osu.Game/Replays/Legacy/LegacyReplayFrame.cs
@@ -3,6 +3,7 @@
 
 using MessagePack;
 using Newtonsoft.Json;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Game.Rulesets.Replays;
 using osuTK;
 
@@ -31,19 +32,19 @@ namespace osu.Game.Replays.Legacy
 
         [JsonIgnore]
         [IgnoreMember]
-        public bool MouseLeft1 => ButtonState.HasFlag(ReplayButtonState.Left1);
+        public bool MouseLeft1 => ButtonState.HasFlagFast(ReplayButtonState.Left1);
 
         [JsonIgnore]
         [IgnoreMember]
-        public bool MouseRight1 => ButtonState.HasFlag(ReplayButtonState.Right1);
+        public bool MouseRight1 => ButtonState.HasFlagFast(ReplayButtonState.Right1);
 
         [JsonIgnore]
         [IgnoreMember]
-        public bool MouseLeft2 => ButtonState.HasFlag(ReplayButtonState.Left2);
+        public bool MouseLeft2 => ButtonState.HasFlagFast(ReplayButtonState.Left2);
 
         [JsonIgnore]
         [IgnoreMember]
-        public bool MouseRight2 => ButtonState.HasFlag(ReplayButtonState.Right2);
+        public bool MouseRight2 => ButtonState.HasFlagFast(ReplayButtonState.Right2);
 
         [Key(3)]
         public ReplayButtonState ButtonState;
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 72025de131..8419dd66de 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -10,6 +10,7 @@ using osu.Game.Beatmaps.Formats;
 using osu.Game.Audio;
 using System.Linq;
 using JetBrains.Annotations;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps.Legacy;
 using osu.Game.Skinning;
@@ -54,7 +55,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
             int comboOffset = (int)(type & LegacyHitObjectType.ComboOffset) >> 4;
             type &= ~LegacyHitObjectType.ComboOffset;
 
-            bool combo = type.HasFlag(LegacyHitObjectType.NewCombo);
+            bool combo = type.HasFlagFast(LegacyHitObjectType.NewCombo);
             type &= ~LegacyHitObjectType.NewCombo;
 
             var soundType = (LegacyHitSoundType)Parsing.ParseInt(split[4]);
@@ -62,14 +63,14 @@ namespace osu.Game.Rulesets.Objects.Legacy
 
             HitObject result = null;
 
-            if (type.HasFlag(LegacyHitObjectType.Circle))
+            if (type.HasFlagFast(LegacyHitObjectType.Circle))
             {
                 result = CreateHit(pos, combo, comboOffset);
 
                 if (split.Length > 5)
                     readCustomSampleBanks(split[5], bankInfo);
             }
-            else if (type.HasFlag(LegacyHitObjectType.Slider))
+            else if (type.HasFlagFast(LegacyHitObjectType.Slider))
             {
                 double? length = null;
 
@@ -141,7 +142,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
 
                 result = CreateSlider(pos, combo, comboOffset, convertPathString(split[5], pos), length, repeatCount, nodeSamples);
             }
-            else if (type.HasFlag(LegacyHitObjectType.Spinner))
+            else if (type.HasFlagFast(LegacyHitObjectType.Spinner))
             {
                 double duration = Math.Max(0, Parsing.ParseDouble(split[5]) + Offset - startTime);
 
@@ -150,7 +151,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
                 if (split.Length > 6)
                     readCustomSampleBanks(split[6], bankInfo);
             }
-            else if (type.HasFlag(LegacyHitObjectType.Hold))
+            else if (type.HasFlagFast(LegacyHitObjectType.Hold))
             {
                 // Note: Hold is generated by BMS converts
 
@@ -436,16 +437,16 @@ namespace osu.Game.Rulesets.Objects.Legacy
                 new LegacyHitSampleInfo(HitSampleInfo.HIT_NORMAL, bankInfo.Normal, bankInfo.Volume, bankInfo.CustomSampleBank,
                     // if the sound type doesn't have the Normal flag set, attach it anyway as a layered sample.
                     // None also counts as a normal non-layered sample: https://osu.ppy.sh/help/wiki/osu!_File_Formats/Osu_(file_format)#hitsounds
-                    type != LegacyHitSoundType.None && !type.HasFlag(LegacyHitSoundType.Normal))
+                    type != LegacyHitSoundType.None && !type.HasFlagFast(LegacyHitSoundType.Normal))
             };
 
-            if (type.HasFlag(LegacyHitSoundType.Finish))
+            if (type.HasFlagFast(LegacyHitSoundType.Finish))
                 soundTypes.Add(new LegacyHitSampleInfo(HitSampleInfo.HIT_FINISH, bankInfo.Add, bankInfo.Volume, bankInfo.CustomSampleBank));
 
-            if (type.HasFlag(LegacyHitSoundType.Whistle))
+            if (type.HasFlagFast(LegacyHitSoundType.Whistle))
                 soundTypes.Add(new LegacyHitSampleInfo(HitSampleInfo.HIT_WHISTLE, bankInfo.Add, bankInfo.Volume, bankInfo.CustomSampleBank));
 
-            if (type.HasFlag(LegacyHitSoundType.Clap))
+            if (type.HasFlagFast(LegacyHitSoundType.Clap))
                 soundTypes.Add(new LegacyHitSampleInfo(HitSampleInfo.HIT_CLAP, bankInfo.Add, bankInfo.Volume, bankInfo.CustomSampleBank));
 
             return soundTypes;
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
index 7eac994e07..81623a9307 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
@@ -3,6 +3,7 @@
 
 using System;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Textures;
@@ -80,17 +81,17 @@ namespace osu.Game.Storyboards.Drawables
 
                 if (FlipH)
                 {
-                    if (origin.HasFlag(Anchor.x0))
+                    if (origin.HasFlagFast(Anchor.x0))
                         origin = Anchor.x2 | (origin & (Anchor.y0 | Anchor.y1 | Anchor.y2));
-                    else if (origin.HasFlag(Anchor.x2))
+                    else if (origin.HasFlagFast(Anchor.x2))
                         origin = Anchor.x0 | (origin & (Anchor.y0 | Anchor.y1 | Anchor.y2));
                 }
 
                 if (FlipV)
                 {
-                    if (origin.HasFlag(Anchor.y0))
+                    if (origin.HasFlagFast(Anchor.y0))
                         origin = Anchor.y2 | (origin & (Anchor.x0 | Anchor.x1 | Anchor.x2));
-                    else if (origin.HasFlag(Anchor.y2))
+                    else if (origin.HasFlagFast(Anchor.y2))
                         origin = Anchor.y0 | (origin & (Anchor.x0 | Anchor.x1 | Anchor.x2));
                 }
 
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSprite.cs
index 7b1a6d54da..eb877f3dff 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.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Textures;
@@ -80,17 +81,17 @@ namespace osu.Game.Storyboards.Drawables
 
                 if (FlipH)
                 {
-                    if (origin.HasFlag(Anchor.x0))
+                    if (origin.HasFlagFast(Anchor.x0))
                         origin = Anchor.x2 | (origin & (Anchor.y0 | Anchor.y1 | Anchor.y2));
-                    else if (origin.HasFlag(Anchor.x2))
+                    else if (origin.HasFlagFast(Anchor.x2))
                         origin = Anchor.x0 | (origin & (Anchor.y0 | Anchor.y1 | Anchor.y2));
                 }
 
                 if (FlipV)
                 {
-                    if (origin.HasFlag(Anchor.y0))
+                    if (origin.HasFlagFast(Anchor.y0))
                         origin = Anchor.y2 | (origin & (Anchor.x0 | Anchor.x1 | Anchor.x2));
-                    else if (origin.HasFlag(Anchor.y2))
+                    else if (origin.HasFlagFast(Anchor.y2))
                         origin = Anchor.y0 | (origin & (Anchor.x0 | Anchor.x1 | Anchor.x2));
                 }
 

From 9f3ceb99eba64a20a600474963b84ac35b256147 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Feb 2021 16:05:08 +0900
Subject: [PATCH 1682/3722] Fix the star rating display at song select flashing
 to zero when changing mods

Due to the use of bindable flow provided by `BeatmapDifficultyCache` in
this usage, the display would briefly flash to zero while difficulty
calculation was still running (as there is no way for a consumer of the
provided bindable to know whether the returned 0 is an actual 0 SR or a
"pending" calculation).

While I hope to fix this by making the bindable flow return nullable
values, I think this particular use case works better with non-bindable
flow so have switched across to that.
---
 osu.Game/Screens/Select/Details/AdvancedStats.cs | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index ab4f3f4796..0c2cce0bb1 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -15,6 +15,7 @@ using System.Collections.Generic;
 using osu.Game.Rulesets.Mods;
 using System.Linq;
 using System.Threading;
+using System.Threading.Tasks;
 using osu.Framework.Threading;
 using osu.Framework.Utils;
 using osu.Game.Configuration;
@@ -137,8 +138,6 @@ namespace osu.Game.Screens.Select.Details
             updateStarDifficulty();
         }
 
-        private IBindable<StarDifficulty> normalStarDifficulty;
-        private IBindable<StarDifficulty> moddedStarDifficulty;
         private CancellationTokenSource starDifficultyCancellationSource;
 
         private void updateStarDifficulty()
@@ -150,13 +149,13 @@ namespace osu.Game.Screens.Select.Details
 
             starDifficultyCancellationSource = new CancellationTokenSource();
 
-            normalStarDifficulty = difficultyCache.GetBindableDifficulty(Beatmap, ruleset.Value, null, starDifficultyCancellationSource.Token);
-            moddedStarDifficulty = difficultyCache.GetBindableDifficulty(Beatmap, ruleset.Value, mods.Value, starDifficultyCancellationSource.Token);
+            var normalStarDifficulty = difficultyCache.GetDifficultyAsync(Beatmap, ruleset.Value, null, starDifficultyCancellationSource.Token);
+            var moddedStarDifficulty = difficultyCache.GetDifficultyAsync(Beatmap, ruleset.Value, mods.Value, starDifficultyCancellationSource.Token);
 
-            normalStarDifficulty.BindValueChanged(_ => updateDisplay());
-            moddedStarDifficulty.BindValueChanged(_ => updateDisplay(), true);
-
-            void updateDisplay() => starDifficulty.Value = ((float)normalStarDifficulty.Value.Stars, (float)moddedStarDifficulty.Value.Stars);
+            Task.WhenAll(normalStarDifficulty, moddedStarDifficulty).ContinueWith(_ => Schedule(() =>
+            {
+                starDifficulty.Value = ((float)normalStarDifficulty.Result.Stars, (float)moddedStarDifficulty.Result.Stars);
+            }), starDifficultyCancellationSource.Token, TaskContinuationOptions.OnlyOnRanToCompletion, TaskScheduler.Current);
         }
 
         protected override void Dispose(bool isDisposing)

From dcda7f62dff49a69cd1c0fdc8e38c937a490c02b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 25 Feb 2021 16:10:27 +0900
Subject: [PATCH 1683/3722] Fix incorrect banned symbol

---
 CodeAnalysis/BannedSymbols.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CodeAnalysis/BannedSymbols.txt b/CodeAnalysis/BannedSymbols.txt
index 60cce39176..46c50dbfa2 100644
--- a/CodeAnalysis/BannedSymbols.txt
+++ b/CodeAnalysis/BannedSymbols.txt
@@ -7,4 +7,4 @@ M:osu.Framework.Graphics.Sprites.SpriteText.#ctor;Use OsuSpriteText.
 M:osu.Framework.Bindables.IBindableList`1.GetBoundCopy();Fails on iOS. Use manual ctor + BindTo instead. (see https://github.com/mono/mono/issues/19900)
 T:Microsoft.EntityFrameworkCore.Internal.EnumerableExtensions;Don't use internal extension methods.
 T:Microsoft.EntityFrameworkCore.Internal.TypeExtensions;Don't use internal extension methods.
-M:System.Enum.HasFlagFast(System.Enum);Use osu.Framework.Extensions.EnumExtensions.HasFlagFast<T>() instead.
\ No newline at end of file
+M:System.Enum.HasFlag(System.Enum);Use osu.Framework.Extensions.EnumExtensions.HasFlagFast<T>() instead.
\ No newline at end of file

From 03771ce8ecedc5adcf405e28f7b07531f5da8f1c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Feb 2021 16:19:01 +0900
Subject: [PATCH 1684/3722] Allow determining a BeatmapDifficultyCache's
 bindable return's completion state via nullability

---
 osu.Game/Beatmaps/BeatmapDifficultyCache.cs               | 8 ++++----
 osu.Game/Beatmaps/Drawables/DifficultyIcon.cs             | 8 ++++++--
 osu.Game/Scoring/ScoreManager.cs                          | 8 ++++++--
 osu.Game/Screens/Select/BeatmapInfoWedge.cs               | 4 ++--
 .../Screens/Select/Carousel/DrawableCarouselBeatmap.cs    | 7 +++++--
 5 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
index 37d262abe5..72a9b36c6f 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Beatmaps
         /// <param name="beatmapInfo">The <see cref="BeatmapInfo"/> to get the difficulty of.</param>
         /// <param name="cancellationToken">An optional <see cref="CancellationToken"/> which stops updating the star difficulty for the given <see cref="BeatmapInfo"/>.</param>
         /// <returns>A bindable that is updated to contain the star difficulty when it becomes available.</returns>
-        public IBindable<StarDifficulty> GetBindableDifficulty([NotNull] BeatmapInfo beatmapInfo, CancellationToken cancellationToken = default)
+        public IBindable<StarDifficulty?> GetBindableDifficulty([NotNull] BeatmapInfo beatmapInfo, CancellationToken cancellationToken = default)
         {
             var bindable = createBindable(beatmapInfo, currentRuleset.Value, currentMods.Value, cancellationToken);
 
@@ -91,8 +91,8 @@ namespace osu.Game.Beatmaps
         /// <param name="mods">The <see cref="Mod"/>s to get the difficulty with. If <c>null</c>, no mods will be assumed.</param>
         /// <param name="cancellationToken">An optional <see cref="CancellationToken"/> which stops updating the star difficulty for the given <see cref="BeatmapInfo"/>.</param>
         /// <returns>A bindable that is updated to contain the star difficulty when it becomes available.</returns>
-        public IBindable<StarDifficulty> GetBindableDifficulty([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo, [CanBeNull] IEnumerable<Mod> mods,
-                                                               CancellationToken cancellationToken = default)
+        public IBindable<StarDifficulty?> GetBindableDifficulty([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo, [CanBeNull] IEnumerable<Mod> mods,
+                                                                CancellationToken cancellationToken = default)
             => createBindable(beatmapInfo, rulesetInfo, mods, cancellationToken);
 
         /// <summary>
@@ -313,7 +313,7 @@ namespace osu.Game.Beatmaps
             }
         }
 
-        private class BindableStarDifficulty : Bindable<StarDifficulty>
+        private class BindableStarDifficulty : Bindable<StarDifficulty?>
         {
             public readonly BeatmapInfo Beatmap;
             public readonly CancellationToken CancellationToken;
diff --git a/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs b/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
index 96e18f120a..c62b803d1a 100644
--- a/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
+++ b/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
@@ -151,7 +151,7 @@ namespace osu.Game.Beatmaps.Drawables
                 this.mods = mods;
             }
 
-            private IBindable<StarDifficulty> localStarDifficulty;
+            private IBindable<StarDifficulty?> localStarDifficulty;
 
             [BackgroundDependencyLoader]
             private void load()
@@ -160,7 +160,11 @@ namespace osu.Game.Beatmaps.Drawables
                 localStarDifficulty = ruleset != null
                     ? difficultyCache.GetBindableDifficulty(beatmap, ruleset, mods, difficultyCancellation.Token)
                     : difficultyCache.GetBindableDifficulty(beatmap, difficultyCancellation.Token);
-                localStarDifficulty.BindValueChanged(difficulty => StarDifficulty.Value = difficulty.NewValue);
+                localStarDifficulty.BindValueChanged(d =>
+                {
+                    if (d.NewValue is StarDifficulty diff)
+                        StarDifficulty.Value = diff;
+                });
             }
 
             protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index a6beb19876..96ec9644b5 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -137,7 +137,7 @@ namespace osu.Game.Scoring
                 ScoringMode.BindValueChanged(onScoringModeChanged, true);
             }
 
-            private IBindable<StarDifficulty> difficultyBindable;
+            private IBindable<StarDifficulty?> difficultyBindable;
             private CancellationTokenSource difficultyCancellationSource;
 
             private void onScoringModeChanged(ValueChangedEvent<ScoringMode> mode)
@@ -168,7 +168,11 @@ namespace osu.Game.Scoring
 
                         // We can compute the max combo locally after the async beatmap difficulty computation.
                         difficultyBindable = difficulties().GetBindableDifficulty(score.Beatmap, score.Ruleset, score.Mods, (difficultyCancellationSource = new CancellationTokenSource()).Token);
-                        difficultyBindable.BindValueChanged(d => updateScore(d.NewValue.MaxCombo), true);
+                        difficultyBindable.BindValueChanged(d =>
+                        {
+                            if (d.NewValue is StarDifficulty diff)
+                                updateScore(diff.MaxCombo);
+                        }, true);
 
                         return;
                     }
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 86cb561bc7..3b3ed88ccb 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private BeatmapDifficultyCache difficultyCache { get; set; }
 
-        private IBindable<StarDifficulty> beatmapDifficulty;
+        private IBindable<StarDifficulty?> beatmapDifficulty;
 
         protected BufferedWedgeInfo Info;
 
@@ -132,7 +132,7 @@ namespace osu.Game.Screens.Select
                     return;
                 }
 
-                LoadComponentAsync(loadingInfo = new BufferedWedgeInfo(beatmap, ruleset.Value, beatmapDifficulty.Value)
+                LoadComponentAsync(loadingInfo = new BufferedWedgeInfo(beatmap, ruleset.Value, beatmapDifficulty.Value ?? new StarDifficulty())
                 {
                     Shear = -Shear,
                     Depth = Info?.Depth + 1 ?? 0
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index e66469ff8d..633ef9297e 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Screens.Select.Carousel
         [Resolved(CanBeNull = true)]
         private ManageCollectionsDialog manageCollectionsDialog { get; set; }
 
-        private IBindable<StarDifficulty> starDifficultyBindable;
+        private IBindable<StarDifficulty?> starDifficultyBindable;
         private CancellationTokenSource starDifficultyCancellationSource;
 
         public DrawableCarouselBeatmap(CarouselBeatmap panel)
@@ -217,7 +217,10 @@ namespace osu.Game.Screens.Select.Carousel
             {
                 // We've potentially cancelled the computation above so a new bindable is required.
                 starDifficultyBindable = difficultyCache.GetBindableDifficulty(beatmap, (starDifficultyCancellationSource = new CancellationTokenSource()).Token);
-                starDifficultyBindable.BindValueChanged(d => starCounter.Current = (float)d.NewValue.Stars, true);
+                starDifficultyBindable.BindValueChanged(d =>
+                {
+                    starCounter.Current = (float)(d.NewValue?.Stars ?? 0);
+                }, true);
             }
 
             base.ApplyState();

From 5fa9bf61b6a8d2abfd374759da0553d8e807bc27 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Feb 2021 16:22:40 +0900
Subject: [PATCH 1685/3722] Update xmldoc

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

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
index 72a9b36c6f..53d82c385d 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Beatmaps
         /// </summary>
         /// <param name="beatmapInfo">The <see cref="BeatmapInfo"/> to get the difficulty of.</param>
         /// <param name="cancellationToken">An optional <see cref="CancellationToken"/> which stops updating the star difficulty for the given <see cref="BeatmapInfo"/>.</param>
-        /// <returns>A bindable that is updated to contain the star difficulty when it becomes available.</returns>
+        /// <returns>A bindable that is updated to contain the star difficulty when it becomes available. Will be null while in an initial calculating state (but not during updates to ruleset and mods if a stale value is already propagated).</returns>
         public IBindable<StarDifficulty?> GetBindableDifficulty([NotNull] BeatmapInfo beatmapInfo, CancellationToken cancellationToken = default)
         {
             var bindable = createBindable(beatmapInfo, currentRuleset.Value, currentMods.Value, cancellationToken);
@@ -90,7 +90,7 @@ namespace osu.Game.Beatmaps
         /// <param name="rulesetInfo">The <see cref="RulesetInfo"/> to get the difficulty with. If <c>null</c>, the <paramref name="beatmapInfo"/>'s ruleset is used.</param>
         /// <param name="mods">The <see cref="Mod"/>s to get the difficulty with. If <c>null</c>, no mods will be assumed.</param>
         /// <param name="cancellationToken">An optional <see cref="CancellationToken"/> which stops updating the star difficulty for the given <see cref="BeatmapInfo"/>.</param>
-        /// <returns>A bindable that is updated to contain the star difficulty when it becomes available.</returns>
+        /// <returns>A bindable that is updated to contain the star difficulty when it becomes available. Will be null while in an initial calculating state.</returns>
         public IBindable<StarDifficulty?> GetBindableDifficulty([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo, [CanBeNull] IEnumerable<Mod> mods,
                                                                 CancellationToken cancellationToken = default)
             => createBindable(beatmapInfo, rulesetInfo, mods, cancellationToken);

From 31c52bd585a55f925676313671c23c437aff28e2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Feb 2021 17:00:42 +0900
Subject: [PATCH 1686/3722] Update the displayed BPM at song select with rate
 adjust mods

This only covers constant rate rate adjust mods. Mods like wind up/wind
down will need a more complex implementation which we haven't really
planned yet.
---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 86cb561bc7..13ec106694 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -383,10 +383,18 @@ namespace osu.Game.Screens.Select
                 return labels.ToArray();
             }
 
+            [Resolved]
+            private IBindable<IReadOnlyList<Mod>> mods { get; set; }
+
             private string getBPMRange(IBeatmap beatmap)
             {
-                double bpmMax = beatmap.ControlPointInfo.BPMMaximum;
-                double bpmMin = beatmap.ControlPointInfo.BPMMinimum;
+                // this doesn't consider mods which apply variable rates, yet.
+                double rate = 1;
+                foreach (var mod in mods.Value.OfType<IApplicableToRate>())
+                    rate = mod.ApplyToRate(0, rate);
+
+                double bpmMax = beatmap.ControlPointInfo.BPMMaximum * rate;
+                double bpmMin = beatmap.ControlPointInfo.BPMMinimum * rate;
 
                 if (Precision.AlmostEquals(bpmMin, bpmMax))
                     return $"{bpmMin:0}";

From 2db4b793d7ab2c064c1a6a1b924ef379b71a86ee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Feb 2021 17:04:39 +0900
Subject: [PATCH 1687/3722] Also handle most common BPM display

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 13ec106694..311ed6ffb9 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -395,11 +395,12 @@ namespace osu.Game.Screens.Select
 
                 double bpmMax = beatmap.ControlPointInfo.BPMMaximum * rate;
                 double bpmMin = beatmap.ControlPointInfo.BPMMinimum * rate;
+                double mostCommonBPM = 60000 / beatmap.GetMostCommonBeatLength() * rate;
 
                 if (Precision.AlmostEquals(bpmMin, bpmMax))
                     return $"{bpmMin:0}";
 
-                return $"{bpmMin:0}-{bpmMax:0} (mostly {60000 / beatmap.GetMostCommonBeatLength():0})";
+                return $"{bpmMin:0}-{bpmMax:0} (mostly {mostCommonBPM:0})";
             }
 
             private OsuSpriteText[] getMapper(BeatmapMetadata metadata)

From 6d1c5979eafaf2dac1182b49c79c0e3a9e369c4d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Feb 2021 17:28:59 +0900
Subject: [PATCH 1688/3722] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 183ac61c90..8ea7cfac5b 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.222.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.225.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 37d730bf42..6ff08ae63c 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.222.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.225.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.0.1" />
     <PackageReference Include="SharpCompress" Version="0.27.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index ca11952cc8..d7a1b7d692 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.222.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.225.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -91,7 +91,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.222.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.225.0" />
     <PackageReference Include="SharpCompress" Version="0.27.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 3802cb29a42056927da2f2c5535cd55bbfc5cf0f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Feb 2021 17:46:35 +0900
Subject: [PATCH 1689/3722] Fix failing tests doing reference comparisons
 between string and LocalisedString

---
 .../Ranking/TestSceneExpandedPanelMiddleContent.cs |  4 ++--
 .../Visual/SongSelect/TestSceneBeatmapInfoWedge.cs | 14 +++++++-------
 .../UserInterface/TestSceneFooterButtonMods.cs     |  2 +-
 osu.Game/Configuration/SettingSourceAttribute.cs   |  3 ++-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
index f9fe42131f..2f558a6379 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Tests.Visual.Ranking
                 Beatmap = createTestBeatmap(author)
             }));
 
-            AddAssert("mapper name present", () => this.ChildrenOfType<OsuSpriteText>().Any(spriteText => spriteText.Text == "mapper_name"));
+            AddAssert("mapper name present", () => this.ChildrenOfType<OsuSpriteText>().Any(spriteText => spriteText.Current.Value == "mapper_name"));
         }
 
         [Test]
@@ -49,7 +49,7 @@ namespace osu.Game.Tests.Visual.Ranking
             }));
 
             AddAssert("mapped by text not present", () =>
-                this.ChildrenOfType<OsuSpriteText>().All(spriteText => !containsAny(spriteText.Text.ToString(), "mapped", "by")));
+                this.ChildrenOfType<OsuSpriteText>().All(spriteText => !containsAny(spriteText.Current.Value, "mapped", "by")));
         }
 
         private void showPanel(ScoreInfo score) => Child = new ExpandedPanelMiddleContentContainer(score);
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
index fff4a9ba61..07b67ca3ad 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
@@ -103,10 +103,10 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private void testBeatmapLabels(Ruleset ruleset)
         {
-            AddAssert("check version", () => infoWedge.Info.VersionLabel.Text == $"{ruleset.ShortName}Version");
-            AddAssert("check title", () => infoWedge.Info.TitleLabel.Text == $"{ruleset.ShortName}Source — {ruleset.ShortName}Title");
-            AddAssert("check artist", () => infoWedge.Info.ArtistLabel.Text == $"{ruleset.ShortName}Artist");
-            AddAssert("check author", () => infoWedge.Info.MapperContainer.Children.OfType<OsuSpriteText>().Any(s => s.Text == $"{ruleset.ShortName}Author"));
+            AddAssert("check version", () => infoWedge.Info.VersionLabel.Current.Value == $"{ruleset.ShortName}Version");
+            AddAssert("check title", () => infoWedge.Info.TitleLabel.Current.Value == $"{ruleset.ShortName}Source — {ruleset.ShortName}Title");
+            AddAssert("check artist", () => infoWedge.Info.ArtistLabel.Current.Value == $"{ruleset.ShortName}Artist");
+            AddAssert("check author", () => infoWedge.Info.MapperContainer.Children.OfType<OsuSpriteText>().Any(s => s.Current.Value == $"{ruleset.ShortName}Author"));
         }
 
         private void testInfoLabels(int expectedCount)
@@ -119,9 +119,9 @@ namespace osu.Game.Tests.Visual.SongSelect
         public void TestNullBeatmap()
         {
             selectBeatmap(null);
-            AddAssert("check empty version", () => string.IsNullOrEmpty(infoWedge.Info.VersionLabel.Text.ToString()));
-            AddAssert("check default title", () => infoWedge.Info.TitleLabel.Text == Beatmap.Default.BeatmapInfo.Metadata.Title);
-            AddAssert("check default artist", () => infoWedge.Info.ArtistLabel.Text == Beatmap.Default.BeatmapInfo.Metadata.Artist);
+            AddAssert("check empty version", () => string.IsNullOrEmpty(infoWedge.Info.VersionLabel.Current.Value));
+            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 empty author", () => !infoWedge.Info.MapperContainer.Children.Any());
             AddAssert("check no info labels", () => !infoWedge.Info.InfoLabelContainer.Children.Any());
         }
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs
index 1e3b1c2ffd..546e905ded 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneFooterButtonMods.cs
@@ -76,7 +76,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             var multiplier = mods.Aggregate(1.0, (current, mod) => current * mod.ScoreMultiplier);
             var expectedValue = multiplier.Equals(1.0) ? string.Empty : $"{multiplier:N2}x";
 
-            return expectedValue == footerButtonMods.MultiplierText.Text;
+            return expectedValue == footerButtonMods.MultiplierText.Current.Value;
         }
 
         private class TestFooterButtonMods : FooterButtonMods
diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index 70d67aaaa0..65a5a6d1b4 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -8,6 +8,7 @@ using System.Reflection;
 using JetBrains.Annotations;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Localisation;
 using osu.Game.Overlays.Settings;
 
 namespace osu.Game.Configuration
@@ -24,7 +25,7 @@ namespace osu.Game.Configuration
     [AttributeUsage(AttributeTargets.Property)]
     public class SettingSourceAttribute : Attribute
     {
-        public string Label { get; }
+        public LocalisableString Label { get; }
 
         public string Description { get; }
 

From cf4c88c647f2bbfc03984218b01d8dc81d396bbe Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 25 Feb 2021 21:38:21 +0900
Subject: [PATCH 1690/3722] Fix spacing

---
 .../Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
index 8e9020ee13..54c37e9742 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
@@ -115,10 +115,10 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
                 }
 
                 if (convertType.HasFlagFast(PatternType.Cycle) && PreviousPattern.HitObjects.Count() == 1
-                                                           // If we convert to 7K + 1, let's not overload the special key
-                                                           && (TotalColumns != 8 || lastColumn != 0)
-                                                           // Make sure the last column was not the centre column
-                                                           && (TotalColumns % 2 == 0 || lastColumn != TotalColumns / 2))
+                                                               // If we convert to 7K + 1, let's not overload the special key
+                                                               && (TotalColumns != 8 || lastColumn != 0)
+                                                               // Make sure the last column was not the centre column
+                                                               && (TotalColumns % 2 == 0 || lastColumn != TotalColumns / 2))
                 {
                     // Generate a new pattern by cycling backwards (similar to Reverse but for only one hit object)
                     int column = RandomStart + TotalColumns - lastColumn - 1;

From 98313a98bf4e0b89deb9b47219fc4e0fd3aaef4a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 25 Feb 2021 21:48:02 +0900
Subject: [PATCH 1691/3722] DI mods in parent class and pass them down

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 311ed6ffb9..37808f6e94 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -39,6 +39,7 @@ namespace osu.Game.Screens.Select
         private static readonly Vector2 wedged_container_shear = new Vector2(shear_width / SongSelect.WEDGE_HEIGHT, 0);
 
         private readonly IBindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
+        private readonly IBindable<IReadOnlyList<Mod>> mods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
 
         [Resolved]
         private BeatmapDifficultyCache difficultyCache { get; set; }
@@ -64,9 +65,11 @@ namespace osu.Game.Screens.Select
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load([CanBeNull] Bindable<RulesetInfo> parentRuleset)
+        private void load([CanBeNull] Bindable<RulesetInfo> parentRuleset, [CanBeNull] Bindable<IReadOnlyList<Mod>> parentMods)
         {
             ruleset.BindTo(parentRuleset);
+            mods.BindTo(parentMods);
+
             ruleset.ValueChanged += _ => updateDisplay();
         }
 
@@ -132,7 +135,7 @@ namespace osu.Game.Screens.Select
                     return;
                 }
 
-                LoadComponentAsync(loadingInfo = new BufferedWedgeInfo(beatmap, ruleset.Value, beatmapDifficulty.Value)
+                LoadComponentAsync(loadingInfo = new BufferedWedgeInfo(beatmap, ruleset.Value, mods.Value, beatmapDifficulty.Value)
                 {
                     Shear = -Shear,
                     Depth = Info?.Depth + 1 ?? 0
@@ -167,13 +170,15 @@ namespace osu.Game.Screens.Select
 
             private readonly WorkingBeatmap beatmap;
             private readonly RulesetInfo ruleset;
+            private readonly IReadOnlyList<Mod> mods;
             private readonly StarDifficulty starDifficulty;
 
-            public BufferedWedgeInfo(WorkingBeatmap beatmap, RulesetInfo userRuleset, StarDifficulty difficulty)
+            public BufferedWedgeInfo(WorkingBeatmap beatmap, RulesetInfo userRuleset, IReadOnlyList<Mod> mods, StarDifficulty difficulty)
                 : base(pixelSnapping: true)
             {
                 this.beatmap = beatmap;
                 ruleset = userRuleset ?? beatmap.BeatmapInfo.Ruleset;
+                this.mods = mods;
                 starDifficulty = difficulty;
             }
 
@@ -383,14 +388,11 @@ namespace osu.Game.Screens.Select
                 return labels.ToArray();
             }
 
-            [Resolved]
-            private IBindable<IReadOnlyList<Mod>> mods { get; set; }
-
             private string getBPMRange(IBeatmap beatmap)
             {
                 // this doesn't consider mods which apply variable rates, yet.
                 double rate = 1;
-                foreach (var mod in mods.Value.OfType<IApplicableToRate>())
+                foreach (var mod in mods.OfType<IApplicableToRate>())
                     rate = mod.ApplyToRate(0, rate);
 
                 double bpmMax = beatmap.ControlPointInfo.BPMMaximum * rate;

From de417a660d7121589abb9c0b0fe635f4e2f44eb0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 25 Feb 2021 21:51:32 +0900
Subject: [PATCH 1692/3722] Make BPM update with changes in mod settings

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 113 ++++++++++++--------
 1 file changed, 68 insertions(+), 45 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 37808f6e94..9084435f44 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -25,6 +25,7 @@ using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
 using osu.Framework.Logging;
+using osu.Game.Configuration;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
@@ -167,12 +168,15 @@ namespace osu.Game.Screens.Select
 
             private ILocalisedBindableString titleBinding;
             private ILocalisedBindableString artistBinding;
+            private Container bpmLabelContainer;
 
             private readonly WorkingBeatmap beatmap;
             private readonly RulesetInfo ruleset;
             private readonly IReadOnlyList<Mod> mods;
             private readonly StarDifficulty starDifficulty;
 
+            private ModSettingChangeTracker settingChangeTracker;
+
             public BufferedWedgeInfo(WorkingBeatmap beatmap, RulesetInfo userRuleset, IReadOnlyList<Mod> mods, StarDifficulty difficulty)
                 : base(pixelSnapping: true)
             {
@@ -189,9 +193,11 @@ namespace osu.Game.Screens.Select
                 var metadata = beatmapInfo.Metadata ?? beatmap.BeatmapSetInfo?.Metadata ?? new BeatmapMetadata();
 
                 CacheDrawnFrameBuffer = true;
-
                 RelativeSizeAxes = Axes.Both;
 
+                settingChangeTracker = new ModSettingChangeTracker(mods);
+                settingChangeTracker.SettingChanged += _ => updateBPM();
+
                 titleBinding = localisation.GetLocalisedString(new LocalisedString((metadata.TitleUnicode, metadata.Title)));
                 artistBinding = localisation.GetLocalisedString(new LocalisedString((metadata.ArtistUnicode, metadata.Artist)));
 
@@ -312,7 +318,25 @@ namespace osu.Game.Screens.Select
                                 Margin = new MarginPadding { Top = 20 },
                                 Spacing = new Vector2(20, 0),
                                 AutoSizeAxes = Axes.Both,
-                                Children = getInfoLabels()
+                                Children = new Drawable[]
+                                {
+                                    new InfoLabel(new BeatmapStatistic
+                                    {
+                                        Name = "Length",
+                                        CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Length),
+                                        Content = TimeSpan.FromMilliseconds(beatmapInfo.Length).ToString(@"m\:ss"),
+                                    }),
+                                    bpmLabelContainer = new Container
+                                    {
+                                        AutoSizeAxes = Axes.Both,
+                                    },
+                                    new FillFlowContainer
+                                    {
+                                        AutoSizeAxes = Axes.Both,
+                                        Spacing = new Vector2(20, 0),
+                                        Children = getRulesetInfoLabels()
+                                    }
+                                }
                             }
                         }
                     }
@@ -324,6 +348,8 @@ namespace osu.Game.Screens.Select
                 // no difficulty means it can't have a status to show
                 if (beatmapInfo.Version == null)
                     StatusPill.Hide();
+
+                updateBPM();
             }
 
             private static Drawable createStarRatingDisplay(StarDifficulty difficulty) => difficulty.Stars > 0
@@ -340,69 +366,60 @@ namespace osu.Game.Screens.Select
                 ForceRedraw();
             }
 
-            private InfoLabel[] getInfoLabels()
+            private InfoLabel[] getRulesetInfoLabels()
             {
-                var b = beatmap.Beatmap;
-
-                List<InfoLabel> labels = new List<InfoLabel>();
-
-                if (b?.HitObjects?.Any() == true)
+                try
                 {
-                    labels.Add(new InfoLabel(new BeatmapStatistic
-                    {
-                        Name = "Length",
-                        CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Length),
-                        Content = TimeSpan.FromMilliseconds(b.BeatmapInfo.Length).ToString(@"m\:ss"),
-                    }));
-
-                    labels.Add(new InfoLabel(new BeatmapStatistic
-                    {
-                        Name = "BPM",
-                        CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Bpm),
-                        Content = getBPMRange(b),
-                    }));
+                    IBeatmap playableBeatmap;
 
                     try
                     {
-                        IBeatmap playableBeatmap;
-
-                        try
-                        {
-                            // Try to get the beatmap with the user's ruleset
-                            playableBeatmap = beatmap.GetPlayableBeatmap(ruleset, Array.Empty<Mod>());
-                        }
-                        catch (BeatmapInvalidForRulesetException)
-                        {
-                            // Can't be converted to the user's ruleset, so use the beatmap's own ruleset
-                            playableBeatmap = beatmap.GetPlayableBeatmap(beatmap.BeatmapInfo.Ruleset, Array.Empty<Mod>());
-                        }
-
-                        labels.AddRange(playableBeatmap.GetStatistics().Select(s => new InfoLabel(s)));
+                        // Try to get the beatmap with the user's ruleset
+                        playableBeatmap = beatmap.GetPlayableBeatmap(ruleset, Array.Empty<Mod>());
                     }
-                    catch (Exception e)
+                    catch (BeatmapInvalidForRulesetException)
                     {
-                        Logger.Error(e, "Could not load beatmap successfully!");
+                        // Can't be converted to the user's ruleset, so use the beatmap's own ruleset
+                        playableBeatmap = beatmap.GetPlayableBeatmap(beatmap.BeatmapInfo.Ruleset, Array.Empty<Mod>());
                     }
+
+                    return playableBeatmap.GetStatistics().Select(s => new InfoLabel(s)).ToArray();
+                }
+                catch (Exception e)
+                {
+                    Logger.Error(e, "Could not load beatmap successfully!");
                 }
 
-                return labels.ToArray();
+                return Array.Empty<InfoLabel>();
             }
 
-            private string getBPMRange(IBeatmap beatmap)
+            private void updateBPM()
             {
+                var b = beatmap.Beatmap;
+                if (b == null)
+                    return;
+
                 // this doesn't consider mods which apply variable rates, yet.
                 double rate = 1;
                 foreach (var mod in mods.OfType<IApplicableToRate>())
                     rate = mod.ApplyToRate(0, rate);
 
-                double bpmMax = beatmap.ControlPointInfo.BPMMaximum * rate;
-                double bpmMin = beatmap.ControlPointInfo.BPMMinimum * rate;
-                double mostCommonBPM = 60000 / beatmap.GetMostCommonBeatLength() * rate;
+                double bpmMax = b.ControlPointInfo.BPMMaximum * rate;
+                double bpmMin = b.ControlPointInfo.BPMMinimum * rate;
+                double mostCommonBPM = 60000 / b.GetMostCommonBeatLength() * rate;
 
-                if (Precision.AlmostEquals(bpmMin, bpmMax))
-                    return $"{bpmMin:0}";
+                string labelText = Precision.AlmostEquals(bpmMin, bpmMax)
+                    ? $"{bpmMin:0}"
+                    : $"{bpmMin:0}-{bpmMax:0} (mostly {mostCommonBPM:0})";
 
-                return $"{bpmMin:0}-{bpmMax:0} (mostly {mostCommonBPM:0})";
+                bpmLabelContainer.Child = new InfoLabel(new BeatmapStatistic
+                {
+                    Name = "BPM",
+                    CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Bpm),
+                    Content = labelText
+                });
+
+                ForceRedraw();
             }
 
             private OsuSpriteText[] getMapper(BeatmapMetadata metadata)
@@ -425,6 +442,12 @@ namespace osu.Game.Screens.Select
                 };
             }
 
+            protected override void Dispose(bool isDisposing)
+            {
+                base.Dispose(isDisposing);
+                settingChangeTracker?.Dispose();
+            }
+
             public class InfoLabel : Container, IHasTooltip
             {
                 public string TooltipText { get; }

From 649ce20e354b2f30b08a3c60db94695e24aa5e34 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 25 Feb 2021 22:01:53 +0900
Subject: [PATCH 1693/3722] Fix up super weird and super wrong DI

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index d1b28e6607..97fe099975 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using JetBrains.Annotations;
 using osuTK;
 using osuTK.Graphics;
 using osu.Framework.Allocation;
@@ -39,8 +38,11 @@ namespace osu.Game.Screens.Select
 
         private static readonly Vector2 wedged_container_shear = new Vector2(shear_width / SongSelect.WEDGE_HEIGHT, 0);
 
-        private readonly IBindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
-        private readonly IBindable<IReadOnlyList<Mod>> mods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
+        [Resolved]
+        private IBindable<RulesetInfo> ruleset { get; set; }
+
+        [Resolved]
+        private IBindable<IReadOnlyList<Mod>> mods { get; set; }
 
         [Resolved]
         private BeatmapDifficultyCache difficultyCache { get; set; }
@@ -65,13 +67,10 @@ namespace osu.Game.Screens.Select
             };
         }
 
-        [BackgroundDependencyLoader(true)]
-        private void load([CanBeNull] Bindable<RulesetInfo> parentRuleset, [CanBeNull] Bindable<IReadOnlyList<Mod>> parentMods)
+        protected override void LoadComplete()
         {
-            ruleset.BindTo(parentRuleset);
-            mods.BindTo(parentMods);
-
-            ruleset.ValueChanged += _ => updateDisplay();
+            base.LoadComplete();
+            ruleset.BindValueChanged(_ => updateDisplay(), true);
         }
 
         protected override void PopIn()

From c3eb44137bfd109006f826fc196a2394a2675196 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 25 Feb 2021 22:09:41 +0900
Subject: [PATCH 1694/3722] Move ValueChanged bind back to load()

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

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 97fe099975..fe2b7b7525 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -67,10 +67,10 @@ namespace osu.Game.Screens.Select
             };
         }
 
-        protected override void LoadComplete()
+        [BackgroundDependencyLoader]
+        private void load()
         {
-            base.LoadComplete();
-            ruleset.BindValueChanged(_ => updateDisplay(), true);
+            ruleset.BindValueChanged(_ => updateDisplay());
         }
 
         protected override void PopIn()

From 01a48154126fbc2ca75cea6632349689ea41ce4f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 25 Feb 2021 23:36:02 +0900
Subject: [PATCH 1695/3722] Make labels disappear on null beatmap/no hitobjects

---
 .../SongSelect/TestSceneBeatmapInfoWedge.cs   |  7 ++-
 osu.Game/Screens/Select/BeatmapInfoWedge.cs   | 61 +++++++++++--------
 2 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
index 07b67ca3ad..7ea6373763 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
@@ -7,6 +7,7 @@ using JetBrains.Annotations;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets;
@@ -111,8 +112,8 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private void testInfoLabels(int expectedCount)
         {
-            AddAssert("check info labels exists", () => infoWedge.Info.InfoLabelContainer.Children.Any());
-            AddAssert("check info labels count", () => infoWedge.Info.InfoLabelContainer.Children.Count == expectedCount);
+            AddAssert("check info labels exists", () => infoWedge.Info.ChildrenOfType<BeatmapInfoWedge.BufferedWedgeInfo.InfoLabel>().Any());
+            AddAssert("check info labels count", () => infoWedge.Info.ChildrenOfType<BeatmapInfoWedge.BufferedWedgeInfo.InfoLabel>().Count() == expectedCount);
         }
 
         [Test]
@@ -123,7 +124,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             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 empty author", () => !infoWedge.Info.MapperContainer.Children.Any());
-            AddAssert("check no info labels", () => !infoWedge.Info.InfoLabelContainer.Children.Any());
+            AddAssert("check no info labels", () => !infoWedge.Info.ChildrenOfType<BeatmapInfoWedge.BufferedWedgeInfo.InfoLabel>().Any());
         }
 
         [Test]
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index fe2b7b7525..36cc19cce3 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -163,10 +163,10 @@ namespace osu.Game.Screens.Select
             public OsuSpriteText ArtistLabel { get; private set; }
             public BeatmapSetOnlineStatusPill StatusPill { get; private set; }
             public FillFlowContainer MapperContainer { get; private set; }
-            public FillFlowContainer InfoLabelContainer { get; private set; }
 
             private ILocalisedBindableString titleBinding;
             private ILocalisedBindableString artistBinding;
+            private FillFlowContainer infoLabelContainer;
             private Container bpmLabelContainer;
 
             private readonly WorkingBeatmap beatmap;
@@ -194,9 +194,6 @@ namespace osu.Game.Screens.Select
                 CacheDrawnFrameBuffer = true;
                 RelativeSizeAxes = Axes.Both;
 
-                settingChangeTracker = new ModSettingChangeTracker(mods);
-                settingChangeTracker.SettingChanged += _ => updateBPM();
-
                 titleBinding = localisation.GetLocalisedString(new RomanisableString(metadata.TitleUnicode, metadata.Title));
                 artistBinding = localisation.GetLocalisedString(new RomanisableString(metadata.ArtistUnicode, metadata.Artist));
 
@@ -312,30 +309,11 @@ namespace osu.Game.Screens.Select
                                 AutoSizeAxes = Axes.Both,
                                 Children = getMapper(metadata)
                             },
-                            InfoLabelContainer = new FillFlowContainer
+                            infoLabelContainer = new FillFlowContainer
                             {
                                 Margin = new MarginPadding { Top = 20 },
                                 Spacing = new Vector2(20, 0),
                                 AutoSizeAxes = Axes.Both,
-                                Children = new Drawable[]
-                                {
-                                    new InfoLabel(new BeatmapStatistic
-                                    {
-                                        Name = "Length",
-                                        CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Length),
-                                        Content = TimeSpan.FromMilliseconds(beatmapInfo.Length).ToString(@"m\:ss"),
-                                    }),
-                                    bpmLabelContainer = new Container
-                                    {
-                                        AutoSizeAxes = Axes.Both,
-                                    },
-                                    new FillFlowContainer
-                                    {
-                                        AutoSizeAxes = Axes.Both,
-                                        Spacing = new Vector2(20, 0),
-                                        Children = getRulesetInfoLabels()
-                                    }
-                                }
                             }
                         }
                     }
@@ -348,7 +326,7 @@ namespace osu.Game.Screens.Select
                 if (beatmapInfo.Version == null)
                     StatusPill.Hide();
 
-                updateBPM();
+                addInfoLabels();
             }
 
             private static Drawable createStarRatingDisplay(StarDifficulty difficulty) => difficulty.Stars > 0
@@ -365,6 +343,37 @@ namespace osu.Game.Screens.Select
                 ForceRedraw();
             }
 
+            private void addInfoLabels()
+            {
+                if (beatmap.Beatmap?.HitObjects?.Any() != true)
+                    return;
+
+                infoLabelContainer.Children = new Drawable[]
+                {
+                    new InfoLabel(new BeatmapStatistic
+                    {
+                        Name = "Length",
+                        CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Length),
+                        Content = TimeSpan.FromMilliseconds(beatmap.BeatmapInfo.Length).ToString(@"m\:ss"),
+                    }),
+                    bpmLabelContainer = new Container
+                    {
+                        AutoSizeAxes = Axes.Both,
+                    },
+                    new FillFlowContainer
+                    {
+                        AutoSizeAxes = Axes.Both,
+                        Spacing = new Vector2(20, 0),
+                        Children = getRulesetInfoLabels()
+                    }
+                };
+
+                settingChangeTracker = new ModSettingChangeTracker(mods);
+                settingChangeTracker.SettingChanged += _ => refreshBPMLabel();
+
+                refreshBPMLabel();
+            }
+
             private InfoLabel[] getRulesetInfoLabels()
             {
                 try
@@ -392,7 +401,7 @@ namespace osu.Game.Screens.Select
                 return Array.Empty<InfoLabel>();
             }
 
-            private void updateBPM()
+            private void refreshBPMLabel()
             {
                 var b = beatmap.Beatmap;
                 if (b == null)

From 254f9bb58be27c0981dd32df8a1d6038a6a090fb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 Feb 2021 13:37:58 +0900
Subject: [PATCH 1696/3722] Show API human readable error message when chat
 posting fails

Closes #11902.
---
 osu.Game/Online/Chat/ChannelManager.cs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Chat/ChannelManager.cs b/osu.Game/Online/Chat/ChannelManager.cs
index 036ec4d0f3..a980f4c54b 100644
--- a/osu.Game/Online/Chat/ChannelManager.cs
+++ b/osu.Game/Online/Chat/ChannelManager.cs
@@ -152,7 +152,7 @@ namespace osu.Game.Online.Chat
 
                     createNewPrivateMessageRequest.Failure += exception =>
                     {
-                        Logger.Error(exception, "Posting message failed.");
+                        handlePostException(exception);
                         target.ReplaceMessage(message, null);
                         dequeueAndRun();
                     };
@@ -171,7 +171,7 @@ namespace osu.Game.Online.Chat
 
                 req.Failure += exception =>
                 {
-                    Logger.Error(exception, "Posting message failed.");
+                    handlePostException(exception);
                     target.ReplaceMessage(message, null);
                     dequeueAndRun();
                 };
@@ -184,6 +184,14 @@ namespace osu.Game.Online.Chat
                 dequeueAndRun();
         }
 
+        private static void handlePostException(Exception exception)
+        {
+            if (exception is APIException apiException)
+                Logger.Log(apiException.Message, level: LogLevel.Important);
+            else
+                Logger.Error(exception, "Posting message failed.");
+        }
+
         /// <summary>
         /// Posts a command locally. Commands like /help will result in a help message written in the current channel.
         /// </summary>

From cd1c1bf534947585db53eb6b4641acef41f1a12f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 Feb 2021 14:15:12 +0900
Subject: [PATCH 1697/3722] Centralise cases of performing actions on the
 current selection

By moving this to a central location, we can avoid invoking the
EditorChangeHandler when there is no selection made. This helps
alleviate the issue pointed out in
https://github.com/ppy/osu/issues/11901, but not fix it completely.
---
 .../Edit/ManiaSelectionHandler.cs             |  8 +++--
 .../Edit/TaikoSelectionHandler.cs             | 32 +++++++------------
 .../Compose/Components/BlueprintContainer.cs  |  3 +-
 .../Compose/Components/SelectionHandler.cs    | 27 ++++------------
 osu.Game/Screens/Edit/EditorBeatmap.cs        | 16 ++++++++++
 5 files changed, 42 insertions(+), 44 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
index 50629f41a9..2689ed4112 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
@@ -45,6 +45,7 @@ namespace osu.Game.Rulesets.Mania.Edit
             int minColumn = int.MaxValue;
             int maxColumn = int.MinValue;
 
+            // find min/max in an initial pass before actually performing the movement.
             foreach (var obj in EditorBeatmap.SelectedHitObjects.OfType<ManiaHitObject>())
             {
                 if (obj.Column < minColumn)
@@ -55,8 +56,11 @@ namespace osu.Game.Rulesets.Mania.Edit
 
             columnDelta = Math.Clamp(columnDelta, -minColumn, maniaPlayfield.TotalColumns - 1 - maxColumn);
 
-            foreach (var obj in EditorBeatmap.SelectedHitObjects.OfType<ManiaHitObject>())
-                obj.Column += columnDelta;
+            EditorBeatmap.PerformOnSelection(h =>
+            {
+                if (h is ManiaHitObject maniaObj)
+                    maniaObj.Column += columnDelta;
+            });
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
index 3fbcee44af..ac2dd4bdb6 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
@@ -52,32 +52,24 @@ namespace osu.Game.Rulesets.Taiko.Edit
 
         public void SetStrongState(bool state)
         {
-            var hits = EditorBeatmap.SelectedHitObjects.OfType<Hit>();
-
-            EditorBeatmap.BeginChange();
-
-            foreach (var h in hits)
+            EditorBeatmap.PerformOnSelection(h =>
             {
-                if (h.IsStrong != state)
-                {
-                    h.IsStrong = state;
-                    EditorBeatmap.Update(h);
-                }
-            }
+                if (!(h is Hit taikoHit)) return;
 
-            EditorBeatmap.EndChange();
+                if (taikoHit.IsStrong != state)
+                {
+                    taikoHit.IsStrong = state;
+                    EditorBeatmap.Update(taikoHit);
+                }
+            });
         }
 
         public void SetRimState(bool state)
         {
-            var hits = EditorBeatmap.SelectedHitObjects.OfType<Hit>();
-
-            EditorBeatmap.BeginChange();
-
-            foreach (var h in hits)
-                h.Type = state ? HitType.Rim : HitType.Centre;
-
-            EditorBeatmap.EndChange();
+            EditorBeatmap.PerformOnSelection(h =>
+            {
+                if (h is Hit taikoHit) taikoHit.Type = state ? HitType.Rim : HitType.Centre;
+            });
         }
 
         protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint> selection)
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 5371beac60..051d0766bf 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -495,8 +495,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 // Apply the start time at the newly snapped-to position
                 double offset = result.Time.Value - movementBlueprints.First().HitObject.StartTime;
 
-                foreach (HitObject obj in Beatmap.SelectedHitObjects)
-                    obj.StartTime += offset;
+                Beatmap.PerformOnSelection(obj => obj.StartTime += offset);
             }
 
             return true;
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 788b485449..018d4d081c 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -320,18 +320,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="sampleName">The name of the hit sample.</param>
         public void AddHitSample(string sampleName)
         {
-            EditorBeatmap.BeginChange();
-
-            foreach (var h in EditorBeatmap.SelectedHitObjects)
+            EditorBeatmap.PerformOnSelection(h =>
             {
                 // Make sure there isn't already an existing sample
                 if (h.Samples.Any(s => s.Name == sampleName))
-                    continue;
+                    return;
 
                 h.Samples.Add(new HitSampleInfo(sampleName));
-            }
-
-            EditorBeatmap.EndChange();
+            });
         }
 
         /// <summary>
@@ -341,19 +337,15 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <exception cref="InvalidOperationException">Throws if any selected object doesn't implement <see cref="IHasComboInformation"/></exception>
         public void SetNewCombo(bool state)
         {
-            EditorBeatmap.BeginChange();
-
-            foreach (var h in EditorBeatmap.SelectedHitObjects)
+            EditorBeatmap.PerformOnSelection(h =>
             {
                 var comboInfo = h as IHasComboInformation;
 
-                if (comboInfo == null || comboInfo.NewCombo == state) continue;
+                if (comboInfo == null || comboInfo.NewCombo == state) return;
 
                 comboInfo.NewCombo = state;
                 EditorBeatmap.Update(h);
-            }
-
-            EditorBeatmap.EndChange();
+            });
         }
 
         /// <summary>
@@ -362,12 +354,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="sampleName">The name of the hit sample.</param>
         public void RemoveHitSample(string sampleName)
         {
-            EditorBeatmap.BeginChange();
-
-            foreach (var h in EditorBeatmap.SelectedHitObjects)
-                h.SamplesBindable.RemoveAll(s => s.Name == sampleName);
-
-            EditorBeatmap.EndChange();
+            EditorBeatmap.PerformOnSelection(h => h.SamplesBindable.RemoveAll(s => s.Name == sampleName));
         }
 
         #endregion
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 174ff1478b..4f1b0484d2 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -100,6 +100,22 @@ namespace osu.Game.Screens.Edit
 
         private readonly HashSet<HitObject> batchPendingUpdates = new HashSet<HitObject>();
 
+        /// <summary>
+        /// Perform the provided action on every selected hitobject.
+        /// Changes will be grouped as one history action.
+        /// </summary>
+        /// <param name="action">The action to perform.</param>
+        public void PerformOnSelection(Action<HitObject> action)
+        {
+            if (SelectedHitObjects.Count == 0)
+                return;
+
+            BeginChange();
+            foreach (var h in SelectedHitObjects)
+                action(h);
+            EndChange();
+        }
+
         /// <summary>
         /// Adds a collection of <see cref="HitObject"/>s to this <see cref="EditorBeatmap"/>.
         /// </summary>

From 3e65dfb9e7df4fe11c7d884e85efb30e461041b6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 Feb 2021 17:11:47 +0900
Subject: [PATCH 1698/3722] Reduce allocation overhead when notification
 overlay has visible notifications

---
 .../Notifications/NotificationSection.cs        | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Notifications/NotificationSection.cs b/osu.Game/Overlays/Notifications/NotificationSection.cs
index bc41311a6d..2316199049 100644
--- a/osu.Game/Overlays/Notifications/NotificationSection.cs
+++ b/osu.Game/Overlays/Notifications/NotificationSection.cs
@@ -10,9 +10,9 @@ 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 osuTK;
-using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays.Notifications
 {
@@ -122,7 +122,20 @@ namespace osu.Game.Overlays.Notifications
         {
             base.Update();
 
-            countDrawable.Text = notifications.Children.Count(c => c.Alpha > 0.99f).ToString();
+            countDrawable.Text = getVisibleCount().ToString();
+        }
+
+        private int getVisibleCount()
+        {
+            int count = 0;
+
+            foreach (var c in notifications)
+            {
+                if (c.Alpha > 0.99f)
+                    count++;
+            }
+
+            return count;
         }
 
         private class ClearAllButton : OsuClickableContainer

From 7e6bd0e995fe8ec1f33b5cbfa510ad7cac69c04e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 Feb 2021 17:30:59 +0900
Subject: [PATCH 1699/3722] Fix "failed to import" message showing when
 importing from a stable install with no beatmaps

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

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 03b8db2cb8..daaba9098e 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -141,6 +141,13 @@ namespace osu.Game.Database
 
         protected async Task<IEnumerable<TModel>> Import(ProgressNotification notification, params ImportTask[] tasks)
         {
+            if (tasks.Length == 0)
+            {
+                notification.CompletionText = $"No {HumanisedModelName}s were found to import!";
+                notification.State = ProgressNotificationState.Completed;
+                return Enumerable.Empty<TModel>();
+            }
+
             notification.Progress = 0;
             notification.Text = $"{HumanisedModelName.Humanize(LetterCasing.Title)} import is initialising...";
 

From 1ab449b73e081284f88125c696845c51c35ae984 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 Feb 2021 17:54:51 +0900
Subject: [PATCH 1700/3722] Add test scene for drawings screen

---
 .../Screens/TestSceneDrawingsScreen.cs        | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 osu.Game.Tournament.Tests/Screens/TestSceneDrawingsScreen.cs

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneDrawingsScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneDrawingsScreen.cs
new file mode 100644
index 0000000000..e2954c8f10
--- /dev/null
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneDrawingsScreen.cs
@@ -0,0 +1,35 @@
+// Copyright (c) ppy 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.Graphics;
+using osu.Framework.Platform;
+using osu.Game.Graphics.Cursor;
+using osu.Game.Tournament.Screens.Drawings;
+
+namespace osu.Game.Tournament.Tests.Screens
+{
+    public class TestSceneDrawingsScreen : TournamentTestScene
+    {
+        [BackgroundDependencyLoader]
+        private void load(Storage storage)
+        {
+            using (var stream = storage.GetStream("drawings.txt", FileAccess.Write))
+            using (var writer = new StreamWriter(stream))
+            {
+                writer.WriteLine("KR : South Korea : KOR");
+                writer.WriteLine("US : United States : USA");
+                writer.WriteLine("PH : Philippines : PHL");
+                writer.WriteLine("BR : Brazil : BRA");
+                writer.WriteLine("JP : Japan : JPN");
+            }
+
+            Add(new OsuContextMenuContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Child = new DrawingsScreen()
+            });
+        }
+    }
+}

From 1ac82af19abce0e1e2ce97facf22808652d9d305 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 Feb 2021 17:58:21 +0900
Subject: [PATCH 1701/3722] Adjust flag size to fit again

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

diff --git a/osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs b/osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs
index 3ff4718b75..c7060bd538 100644
--- a/osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs
+++ b/osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs
@@ -345,7 +345,7 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
 
                 Flag.Anchor = Anchor.Centre;
                 Flag.Origin = Anchor.Centre;
-                Flag.Scale = new Vector2(0.9f);
+                Flag.Scale = new Vector2(0.7f);
 
                 InternalChildren = new Drawable[]
                 {

From 98d525d1dbb6f8b854b682a45d5ba600f30da6ea Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 Feb 2021 19:56:10 +0900
Subject: [PATCH 1702/3722] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 8ea7cfac5b..5d83bb9583 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.225.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.226.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 6ff08ae63c..84a74502c2 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.225.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.226.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.0.1" />
     <PackageReference Include="SharpCompress" Version="0.27.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index d7a1b7d692..2cea2e4b13 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.225.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.226.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -91,7 +91,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.225.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.226.0" />
     <PackageReference Include="SharpCompress" Version="0.27.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 4fd8501c860989e09f1fdfedc9405bdde39aa70c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 Feb 2021 20:03:03 +0900
Subject: [PATCH 1703/3722] Remove unnecessary using (underlying enumerator
 change)

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

diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 5b4bd11216..7d906cdc5b 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Diagnostics;
-using System.Linq;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;

From 52e81385a6ba594cd325e24cf71c6580a7922727 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 27 Feb 2021 11:33:08 +0100
Subject: [PATCH 1704/3722] Fix restore default button mutating transforms
 during load

---
 osu.Game/Overlays/Settings/SettingsItem.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index aafd7463a6..4cb8d7f83c 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -207,7 +207,9 @@ namespace osu.Game.Overlays.Settings
                 UpdateState();
             }
 
-            public void UpdateState()
+            public void UpdateState() => Scheduler.AddOnce(updateState);
+
+            private void updateState()
             {
                 if (bindable == null)
                     return;

From 87b73da73edddc47f93d5c1a5edc6f8bae3ce6fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 27 Feb 2021 14:46:48 +0100
Subject: [PATCH 1705/3722] Add failing test case

---
 .../Mods/SettingsSourceAttributeTest.cs       | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 osu.Game.Tests/Mods/SettingsSourceAttributeTest.cs

diff --git a/osu.Game.Tests/Mods/SettingsSourceAttributeTest.cs b/osu.Game.Tests/Mods/SettingsSourceAttributeTest.cs
new file mode 100644
index 0000000000..240d617dc7
--- /dev/null
+++ b/osu.Game.Tests/Mods/SettingsSourceAttributeTest.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.Linq;
+using NUnit.Framework;
+using osu.Framework.Bindables;
+using osu.Game.Configuration;
+
+namespace osu.Game.Tests.Mods
+{
+    [TestFixture]
+    public class SettingsSourceAttributeTest
+    {
+        [Test]
+        public void TestOrdering()
+        {
+            var objectWithSettings = new ClassWithSettings();
+
+            var orderedSettings = objectWithSettings.GetOrderedSettingsSourceProperties().ToArray();
+
+            Assert.That(orderedSettings, Has.Length.EqualTo(3));
+        }
+
+        private class ClassWithSettings
+        {
+            [SettingSource("Second setting", "Another description", 2)]
+            public BindableBool SecondSetting { get; set; } = new BindableBool();
+
+            [SettingSource("First setting", "A description", 1)]
+            public BindableDouble FirstSetting { get; set; } = new BindableDouble();
+
+            [SettingSource("Third setting", "Yet another description", 3)]
+            public BindableInt ThirdSetting { get; set; } = new BindableInt();
+        }
+    }
+}

From 528de5869e305ec377d75098496ecaeadb949b69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 27 Feb 2021 14:47:09 +0100
Subject: [PATCH 1706/3722] Fix multiple enumerations when ordering setting
 sources

This was not spotted previously, because the base `Attribute` overrides
`Equals()` to have semantics similar to structs (per-field equality) by
using reflection. That masked the issue when strings were used, and
migrating to `LocalisableString` revealed it, as that struct's
implementation of equality currently uses instance checks.

Whether `LocalisableString.Equals()` is the correct implementation may
still be up for discussion, but allowing multiple enumeration is wrong
anyway, since the underlying enumerables are live (one especially is a
yield iterator, causing new object instances to be allocated).
---
 osu.Game/Configuration/SettingSourceAttribute.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index 65a5a6d1b4..d0d2480e62 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -139,9 +139,12 @@ namespace osu.Game.Configuration
 
         public static IEnumerable<(SettingSourceAttribute, PropertyInfo)> GetOrderedSettingsSourceProperties(this object obj)
         {
-            var original = obj.GetSettingsSourceProperties();
+            var original = obj.GetSettingsSourceProperties().ToArray();
 
-            var orderedRelative = original.Where(attr => attr.Item1.OrderPosition != null).OrderBy(attr => attr.Item1.OrderPosition);
+            var orderedRelative = original
+                                  .Where(attr => attr.Item1.OrderPosition != null)
+                                  .OrderBy(attr => attr.Item1.OrderPosition)
+                                  .ToArray();
             var unordered = original.Except(orderedRelative);
 
             return orderedRelative.Concat(unordered);

From dd2f63f3137c8a9923509f04b2bb5656eda0093a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 27 Feb 2021 14:57:37 +0100
Subject: [PATCH 1707/3722] Add assertions to actually check order

---
 osu.Game.Tests/Mods/SettingsSourceAttributeTest.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game.Tests/Mods/SettingsSourceAttributeTest.cs b/osu.Game.Tests/Mods/SettingsSourceAttributeTest.cs
index 240d617dc7..7fce1a6ce5 100644
--- a/osu.Game.Tests/Mods/SettingsSourceAttributeTest.cs
+++ b/osu.Game.Tests/Mods/SettingsSourceAttributeTest.cs
@@ -19,6 +19,10 @@ namespace osu.Game.Tests.Mods
             var orderedSettings = objectWithSettings.GetOrderedSettingsSourceProperties().ToArray();
 
             Assert.That(orderedSettings, Has.Length.EqualTo(3));
+
+            Assert.That(orderedSettings[0].Item2.Name, Is.EqualTo(nameof(ClassWithSettings.FirstSetting)));
+            Assert.That(orderedSettings[1].Item2.Name, Is.EqualTo(nameof(ClassWithSettings.SecondSetting)));
+            Assert.That(orderedSettings[2].Item2.Name, Is.EqualTo(nameof(ClassWithSettings.ThirdSetting)));
         }
 
         private class ClassWithSettings

From 7b6e53680c6035f6b7843f3ac5bd65b90e41128d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 27 Feb 2021 15:14:25 +0100
Subject: [PATCH 1708/3722] Add coverage for the unordered case

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

diff --git a/osu.Game.Tests/Mods/SettingsSourceAttributeTest.cs b/osu.Game.Tests/Mods/SettingsSourceAttributeTest.cs
index 7fce1a6ce5..883c9d1ac2 100644
--- a/osu.Game.Tests/Mods/SettingsSourceAttributeTest.cs
+++ b/osu.Game.Tests/Mods/SettingsSourceAttributeTest.cs
@@ -18,15 +18,19 @@ namespace osu.Game.Tests.Mods
 
             var orderedSettings = objectWithSettings.GetOrderedSettingsSourceProperties().ToArray();
 
-            Assert.That(orderedSettings, Has.Length.EqualTo(3));
+            Assert.That(orderedSettings, Has.Length.EqualTo(4));
 
             Assert.That(orderedSettings[0].Item2.Name, Is.EqualTo(nameof(ClassWithSettings.FirstSetting)));
             Assert.That(orderedSettings[1].Item2.Name, Is.EqualTo(nameof(ClassWithSettings.SecondSetting)));
             Assert.That(orderedSettings[2].Item2.Name, Is.EqualTo(nameof(ClassWithSettings.ThirdSetting)));
+            Assert.That(orderedSettings[3].Item2.Name, Is.EqualTo(nameof(ClassWithSettings.UnorderedSetting)));
         }
 
         private class ClassWithSettings
         {
+            [SettingSource("Unordered setting", "Should be last")]
+            public BindableFloat UnorderedSetting { get; set; } = new BindableFloat();
+
             [SettingSource("Second setting", "Another description", 2)]
             public BindableBool SecondSetting { get; set; } = new BindableBool();
 

From 1e56d2cbba16edec86632b5c1f780f1abaac2d1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 27 Feb 2021 15:30:05 +0100
Subject: [PATCH 1709/3722] Make `SettingSourceAttribute` implement
 `IComparable`

---
 .../Configuration/SettingSourceAttribute.cs   | 29 +++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index d0d2480e62..4cc31e14ac 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Configuration
     /// </remarks>
     [MeansImplicitUse]
     [AttributeUsage(AttributeTargets.Property)]
-    public class SettingSourceAttribute : Attribute
+    public class SettingSourceAttribute : Attribute, IComparable<SettingSourceAttribute>
     {
         public LocalisableString Label { get; }
 
@@ -42,6 +42,21 @@ namespace osu.Game.Configuration
         {
             OrderPosition = orderPosition;
         }
+
+        public int CompareTo(SettingSourceAttribute other)
+        {
+            if (OrderPosition == other.OrderPosition)
+                return 0;
+
+            // unordered items come last (are greater than any ordered items).
+            if (OrderPosition == null)
+                return 1;
+            if (other.OrderPosition == null)
+                return -1;
+
+            // ordered items are sorted by the order value.
+            return OrderPosition.Value.CompareTo(other.OrderPosition);
+        }
     }
 
     public static class SettingSourceExtensions
@@ -137,17 +152,13 @@ namespace osu.Game.Configuration
             }
         }
 
-        public static IEnumerable<(SettingSourceAttribute, PropertyInfo)> GetOrderedSettingsSourceProperties(this object obj)
+        public static ICollection<(SettingSourceAttribute, PropertyInfo)> GetOrderedSettingsSourceProperties(this object obj)
         {
             var original = obj.GetSettingsSourceProperties().ToArray();
 
-            var orderedRelative = original
-                                  .Where(attr => attr.Item1.OrderPosition != null)
-                                  .OrderBy(attr => attr.Item1.OrderPosition)
-                                  .ToArray();
-            var unordered = original.Except(orderedRelative);
-
-            return orderedRelative.Concat(unordered);
+            return original
+                   .OrderBy(attr => attr.Item1)
+                   .ToArray();
         }
     }
 }

From 7e17c5ab7180c460f6fe142a37a2b0fdf3b8c987 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 27 Feb 2021 15:46:18 +0100
Subject: [PATCH 1710/3722] Trim yet another array copy

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

diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index 4cc31e14ac..cfce615130 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -153,12 +153,8 @@ namespace osu.Game.Configuration
         }
 
         public static ICollection<(SettingSourceAttribute, PropertyInfo)> GetOrderedSettingsSourceProperties(this object obj)
-        {
-            var original = obj.GetSettingsSourceProperties().ToArray();
-
-            return original
-                   .OrderBy(attr => attr.Item1)
-                   .ToArray();
-        }
+            => obj.GetSettingsSourceProperties()
+                  .OrderBy(attr => attr.Item1)
+                  .ToArray();
     }
 }

From 41b43dd39a8b0b5e76a0f82e2d06b19ee633d696 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 28 Feb 2021 21:32:56 +0300
Subject: [PATCH 1711/3722] Add nested legacy-simulating coordinates container

---
 .../Skinning/Legacy/LegacySpinner.cs          | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index ec7ecb0d28..94b6a906d0 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -127,5 +127,33 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             if (DrawableSpinner != null)
                 DrawableSpinner.ApplyCustomUpdateState -= UpdateStateTransforms;
         }
+
+        /// <summary>
+        /// A <see cref="Container"/> simulating osu!stable's absolute screen-space,
+        /// for perfect placements of legacy spinner components with legacy coordinates.
+        /// </summary>
+        protected class LegacyCoordinatesContainer : Container
+        {
+            /// <summary>
+            /// An offset that simulates stable's spinner top offset,
+            /// for positioning some legacy spinner components perfectly as in stable.
+            /// (e.g. 'spin' sprite, 'clear' sprite, metre in old-style spinners)
+            /// </summary>
+            public const float SPINNER_TOP_OFFSET = 29f;
+
+            public LegacyCoordinatesContainer()
+            {
+                // legacy spinners relied heavily on absolute screen-space coordinate values.
+                // wrap everything in a container simulating absolute coords to preserve alignment
+                // as there are skins that depend on it.
+                Anchor = Anchor.Centre;
+                Origin = Anchor.Centre;
+                Size = new Vector2(640, 480);
+
+                // since legacy coordinates were on screen-space, they were accounting for the playfield shift offset.
+                // therefore cancel it from here.
+                Position = new Vector2(0, -8f);
+            }
+        }
     }
 }

From d528ef426fac4f30f380e35d12a2b4a99f59b69f Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 28 Feb 2021 21:41:11 +0300
Subject: [PATCH 1712/3722] Reposition legacy spinner components in-line with
 osu!stable

---
 .../Skinning/Legacy/LegacyOldStyleSpinner.cs  | 44 ++++++++-----------
 .../Skinning/Legacy/LegacySpinner.cs          | 40 +++++++++--------
 2 files changed, 39 insertions(+), 45 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyOldStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyOldStyleSpinner.cs
index 4e07cb60b3..7e9f73a89b 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyOldStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyOldStyleSpinner.cs
@@ -33,39 +33,31 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         {
             spinnerBlink = source.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.SpinnerNoBlink)?.Value != true;
 
-            AddInternal(new Container
+            AddRangeInternal(new Drawable[]
             {
-                // the old-style spinner relied heavily on absolute screen-space coordinate values.
-                // wrap everything in a container simulating absolute coords to preserve alignment
-                // as there are skins that depend on it.
-                Width = 640,
-                Height = 480,
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Children = new Drawable[]
+                new Sprite
                 {
-                    new Sprite
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        Texture = source.GetTexture("spinner-background"),
-                        Scale = new Vector2(SPRITE_SCALE)
-                    },
-                    disc = new Sprite
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        Texture = source.GetTexture("spinner-circle"),
-                        Scale = new Vector2(SPRITE_SCALE)
-                    },
-                    metre = new Container
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Texture = source.GetTexture("spinner-background"),
+                    Scale = new Vector2(SPRITE_SCALE)
+                },
+                disc = new Sprite
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Texture = source.GetTexture("spinner-circle"),
+                    Scale = new Vector2(SPRITE_SCALE)
+                },
+                new LegacyCoordinatesContainer
+                {
+                    Child = metre = new Container
                     {
                         AutoSizeAxes = Axes.Both,
                         // this anchor makes no sense, but that's what stable uses.
                         Anchor = Anchor.TopLeft,
                         Origin = Anchor.TopLeft,
-                        // adjustment for stable (metre has additional offset)
-                        Margin = new MarginPadding { Top = 20 },
+                        Margin = new MarginPadding { Top = LegacyCoordinatesContainer.SPINNER_TOP_OFFSET },
                         Masking = true,
                         Child = metreSprite = new Sprite
                         {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index 94b6a906d0..1f1fd1fbd9 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -30,27 +30,29 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
             DrawableSpinner = (DrawableSpinner)drawableHitObject;
 
-            AddRangeInternal(new[]
+            AddInternal(new LegacyCoordinatesContainer
             {
-                spin = new Sprite
+                Depth = float.MinValue,
+                Children = new Drawable[]
                 {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Depth = float.MinValue,
-                    Texture = source.GetTexture("spinner-spin"),
-                    Scale = new Vector2(SPRITE_SCALE),
-                    Y = 120 - 45 // offset temporarily to avoid overlapping default spin counter
-                },
-                clear = new Sprite
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Depth = float.MinValue,
-                    Alpha = 0,
-                    Texture = source.GetTexture("spinner-clear"),
-                    Scale = new Vector2(SPRITE_SCALE),
-                    Y = -60
-                },
+                    spin = new Sprite
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.Centre,
+                        Texture = source.GetTexture("spinner-spin"),
+                        Scale = new Vector2(SPRITE_SCALE),
+                        Y = LegacyCoordinatesContainer.SPINNER_TOP_OFFSET + 335,
+                    },
+                    clear = new Sprite
+                    {
+                        Alpha = 0,
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.Centre,
+                        Texture = source.GetTexture("spinner-clear"),
+                        Scale = new Vector2(SPRITE_SCALE),
+                        Y = LegacyCoordinatesContainer.SPINNER_TOP_OFFSET + 115,
+                    },
+                }
             });
         }
 

From 97bb217830e2f2e28942bb04083d3682c0c31c31 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Mar 2021 17:24:05 +0900
Subject: [PATCH 1713/3722] Fix test room playlist items not getting ids

---
 .../Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs
index 5e12156f3c..022c297ccd 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs
@@ -35,6 +35,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             int currentScoreId = 0;
             int currentRoomId = 0;
+            int currentPlaylistItemId = 0;
 
             ((DummyAPIAccess)api).HandleRequest = req =>
             {
@@ -46,6 +47,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
                         createdRoom.CopyFrom(createRoomRequest.Room);
                         createdRoom.RoomID.Value ??= currentRoomId++;
 
+                        for (int i = 0; i < createdRoom.Playlist.Count; i++)
+                            createdRoom.Playlist[i].ID = currentPlaylistItemId++;
+
                         rooms.Add(createdRoom);
                         createRoomRequest.TriggerSuccess(createdRoom);
                         break;

From f7e4cfa4d0dce04258aad29b03917048954b93c4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Mar 2021 17:24:32 +0900
Subject: [PATCH 1714/3722] Fix initial room settings not being returned
 correctly

---
 .../Multiplayer/TestMultiplayerClient.cs      | 28 +++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index 379bb758c5..67679b2659 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -25,6 +25,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Resolved]
         private IAPIProvider api { get; set; } = null!;
 
+        [Resolved]
+        private Room apiRoom { get; set; } = null!;
+
         public void Connect() => isConnected.Value = true;
 
         public void Disconnect() => isConnected.Value = false;
@@ -89,13 +92,28 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         protected override Task<MultiplayerRoom> JoinRoom(long roomId)
         {
-            var user = new MultiplayerRoomUser(api.LocalUser.Value.Id) { User = api.LocalUser.Value };
+            Debug.Assert(apiRoom != null);
 
-            var room = new MultiplayerRoom(roomId);
-            room.Users.Add(user);
+            var user = new MultiplayerRoomUser(api.LocalUser.Value.Id)
+            {
+                User = api.LocalUser.Value
+            };
 
-            if (room.Users.Count == 1)
-                room.Host = user;
+            var room = new MultiplayerRoom(roomId)
+            {
+                Settings =
+                {
+                    Name = apiRoom.Name.Value,
+                    BeatmapID = apiRoom.Playlist.Last().BeatmapID,
+                    RulesetID = apiRoom.Playlist.Last().RulesetID,
+                    BeatmapChecksum = apiRoom.Playlist.Last().Beatmap.Value.MD5Hash,
+                    RequiredMods = apiRoom.Playlist.Last().RequiredMods.Select(m => new APIMod(m)).ToArray(),
+                    AllowedMods = apiRoom.Playlist.Last().AllowedMods.Select(m => new APIMod(m)).ToArray(),
+                    PlaylistItemId = apiRoom.Playlist.Last().ID
+                },
+                Users = { user },
+                Host = user
+            };
 
             return Task.FromResult(room);
         }

From 7adb33f40e352137e26b9cb82fc1ad675da881af Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Mar 2021 17:24:54 +0900
Subject: [PATCH 1715/3722] Fix beatmap getting nulled due to failing web
 request

---
 .../Online/Multiplayer/MultiplayerClient.cs   | 25 ++++++++++++
 .../Multiplayer/StatefulMultiplayerClient.cs  | 38 ++++++++++---------
 .../Multiplayer/TestMultiplayerClient.cs      | 20 ++++++++++
 3 files changed, 65 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 95d76f384f..4529dfd0a7 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -9,7 +9,9 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.SignalR.Client;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Game.Beatmaps;
 using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
 using osu.Game.Online.Rooms;
 
 namespace osu.Game.Online.Multiplayer
@@ -121,6 +123,29 @@ namespace osu.Game.Online.Multiplayer
             return connection.InvokeAsync(nameof(IMultiplayerServer.StartMatch));
         }
 
+        protected override Task<BeatmapSetInfo> GetOnlineBeatmapSet(int beatmapId, CancellationToken cancellationToken = default)
+        {
+            var tcs = new TaskCompletionSource<BeatmapSetInfo>();
+            var req = new GetBeatmapSetRequest(beatmapId, BeatmapSetLookupType.BeatmapId);
+
+            req.Success += res =>
+            {
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    tcs.SetCanceled();
+                    return;
+                }
+
+                tcs.SetResult(res.ToBeatmapSet(Rulesets));
+            };
+
+            req.Failure += e => tcs.SetException(e);
+
+            API.Queue(req);
+
+            return tcs.Task;
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index bfd505fb19..73100be505 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -17,8 +17,6 @@ using osu.Framework.Logging;
 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.Online.Rooms;
 using osu.Game.Online.Rooms.RoomStatuses;
 using osu.Game.Rulesets;
@@ -71,7 +69,7 @@ namespace osu.Game.Online.Multiplayer
         /// <summary>
         /// The <see cref="MultiplayerRoomUser"/> corresponding to the local player, if available.
         /// </summary>
-        public MultiplayerRoomUser? LocalUser => Room?.Users.SingleOrDefault(u => u.User?.Id == api.LocalUser.Value.Id);
+        public MultiplayerRoomUser? LocalUser => Room?.Users.SingleOrDefault(u => u.User?.Id == API.LocalUser.Value.Id);
 
         /// <summary>
         /// Whether the <see cref="LocalUser"/> is the host in <see cref="Room"/>.
@@ -85,15 +83,15 @@ namespace osu.Game.Online.Multiplayer
             }
         }
 
+        [Resolved]
+        protected IAPIProvider API { get; private set; } = null!;
+
+        [Resolved]
+        protected RulesetStore Rulesets { get; private set; } = null!;
+
         [Resolved]
         private UserLookupCache userLookupCache { get; set; } = null!;
 
-        [Resolved]
-        private IAPIProvider api { get; set; } = null!;
-
-        [Resolved]
-        private RulesetStore rulesets { get; set; } = null!;
-
         // Only exists for compatibility with old osu-server-spectator build.
         // Todo: Can be removed on 2021/02/26.
         private long defaultPlaylistItemId;
@@ -515,30 +513,26 @@ namespace osu.Game.Online.Multiplayer
 
             RoomUpdated?.Invoke();
 
-            var req = new GetBeatmapSetRequest(settings.BeatmapID, BeatmapSetLookupType.BeatmapId);
-            req.Success += res =>
+            GetOnlineBeatmapSet(settings.BeatmapID, cancellationToken).ContinueWith(set => Schedule(() =>
             {
                 if (cancellationToken.IsCancellationRequested)
                     return;
 
-                updatePlaylist(settings, res);
-            };
-
-            api.Queue(req);
+                updatePlaylist(settings, set.Result);
+            }), TaskContinuationOptions.OnlyOnRanToCompletion);
         }, cancellationToken);
 
-        private void updatePlaylist(MultiplayerRoomSettings settings, APIBeatmapSet onlineSet)
+        private void updatePlaylist(MultiplayerRoomSettings settings, BeatmapSetInfo beatmapSet)
         {
             if (Room == null || !Room.Settings.Equals(settings))
                 return;
 
             Debug.Assert(apiRoom != null);
 
-            var beatmapSet = onlineSet.ToBeatmapSet(rulesets);
             var beatmap = beatmapSet.Beatmaps.Single(b => b.OnlineBeatmapID == settings.BeatmapID);
             beatmap.MD5Hash = settings.BeatmapChecksum;
 
-            var ruleset = rulesets.GetRuleset(settings.RulesetID).CreateInstance();
+            var ruleset = Rulesets.GetRuleset(settings.RulesetID).CreateInstance();
             var mods = settings.RequiredMods.Select(m => m.ToMod(ruleset));
             var allowedMods = settings.AllowedMods.Select(m => m.ToMod(ruleset));
 
@@ -568,6 +562,14 @@ namespace osu.Game.Online.Multiplayer
             }
         }
 
+        /// <summary>
+        /// Retrieves a <see cref="BeatmapSetInfo"/> from an online source.
+        /// </summary>
+        /// <param name="beatmapId">The beatmap set ID.</param>
+        /// <param name="cancellationToken">A token to cancel the request.</param>
+        /// <returns>The <see cref="BeatmapSetInfo"/> retrieval task.</returns>
+        protected abstract Task<BeatmapSetInfo> GetOnlineBeatmapSet(int beatmapId, CancellationToken cancellationToken = default);
+
         /// <summary>
         /// For the provided user ID, update whether the user is included in <see cref="CurrentMatchPlayingUserIds"/>.
         /// </summary>
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index 67679b2659..6a901fc45b 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -3,12 +3,15 @@
 
 #nullable enable
 
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
@@ -28,6 +31,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Resolved]
         private Room apiRoom { get; set; } = null!;
 
+        [Resolved]
+        private BeatmapManager beatmaps { get; set; } = null!;
+
         public void Connect() => isConnected.Value = true;
 
         public void Disconnect() => isConnected.Value = false;
@@ -168,5 +174,19 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             return ((IMultiplayerClient)this).LoadRequested();
         }
+
+        protected override Task<BeatmapSetInfo> GetOnlineBeatmapSet(int beatmapId, CancellationToken cancellationToken = default)
+        {
+            Debug.Assert(Room != null);
+            Debug.Assert(apiRoom != null);
+
+            var set = apiRoom.Playlist.FirstOrDefault(p => p.BeatmapID == beatmapId)?.Beatmap.Value.BeatmapSet
+                      ?? beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == beatmapId)?.BeatmapSet;
+
+            if (set == null)
+                throw new InvalidOperationException("Beatmap not found.");
+
+            return Task.FromResult(set);
+        }
     }
 }

From 5cfaf1de1b6d72cbbf900d0667bf2c2e48e6f77c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 1 Mar 2021 17:43:03 +0900
Subject: [PATCH 1716/3722] Fix duplicate ongoing operation tracker

---
 .../Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
index 2344ebea0e..8869718fd1 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
@@ -3,12 +3,10 @@
 
 using System.Linq;
 using NUnit.Framework;
-using osu.Framework.Allocation;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets.Osu;
-using osu.Game.Screens.OnlinePlay;
 using osu.Game.Screens.OnlinePlay.Multiplayer;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
 using osu.Game.Tests.Beatmaps;
@@ -20,9 +18,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
     {
         private MultiplayerMatchSubScreen screen;
 
-        [Cached]
-        private OngoingOperationTracker ongoingOperationTracker = new OngoingOperationTracker();
-
         public TestSceneMultiplayerMatchSubScreen()
             : base(false)
         {

From fe54a51b5a9c5995db488e1c8873fd1691463a3a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 1 Mar 2021 22:41:09 +0300
Subject: [PATCH 1717/3722] Remove `UserRanks` object and move to outer
 `country_rank` property

---
 osu.Game/Users/UserStatistics.cs | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/osu.Game/Users/UserStatistics.cs b/osu.Game/Users/UserStatistics.cs
index 78e6f5a05a..dc926898fc 100644
--- a/osu.Game/Users/UserStatistics.cs
+++ b/osu.Game/Users/UserStatistics.cs
@@ -29,16 +29,9 @@ namespace osu.Game.Users
         [JsonProperty(@"global_rank")]
         public int? GlobalRank;
 
+        [JsonProperty(@"country_rank")]
         public int? CountryRank;
 
-        [JsonProperty(@"rank")]
-        private UserRanks ranks
-        {
-            // eventually that will also become an own json property instead of reading from a `rank` object.
-            // see https://github.com/ppy/osu-web/blob/cb79bb72186c8f1a25f6a6f5ef315123decb4231/app/Transformers/UserStatisticsTransformer.php#L53.
-            set => CountryRank = value.Country;
-        }
-
         // populated via User model, as that's where the data currently lives.
         public RankHistoryData RankHistory;
 
@@ -119,13 +112,5 @@ namespace osu.Game.Users
                 }
             }
         }
-
-#pragma warning disable 649
-        private struct UserRanks
-        {
-            [JsonProperty(@"country")]
-            public int? Country;
-        }
-#pragma warning restore 649
     }
 }

From 51a5652666d7d5e653fa28ddc0c74e23ddafe0f6 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 1 Mar 2021 22:42:53 +0300
Subject: [PATCH 1718/3722] Refetch tournament users on null country rank

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

diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index d506724017..2ee52c35aa 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -150,7 +150,9 @@ namespace osu.Game.Tournament
             {
                 foreach (var p in t.Players)
                 {
-                    if (string.IsNullOrEmpty(p.Username) || p.Statistics?.GlobalRank == null)
+                    if (string.IsNullOrEmpty(p.Username)
+                        || p.Statistics?.GlobalRank == null
+                        || p.Statistics?.CountryRank == null)
                     {
                         PopulateUser(p, immediate: true);
                         addedInfo = true;

From 2d3c3c18d4c1c3e1174079f2363a5d2e03b29c16 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 1 Mar 2021 20:05:35 +0000
Subject: [PATCH 1719/3722] Bump SharpCompress from 0.27.1 to 0.28.1

Bumps [SharpCompress](https://github.com/adamhathcock/sharpcompress) from 0.27.1 to 0.28.1.
- [Release notes](https://github.com/adamhathcock/sharpcompress/releases)
- [Commits](https://github.com/adamhathcock/sharpcompress/compare/0.27.1...0.28.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 84a74502c2..4d086844e4 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -32,7 +32,7 @@
     <PackageReference Include="ppy.osu.Framework" Version="2021.226.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.0.1" />
-    <PackageReference Include="SharpCompress" Version="0.27.1" />
+    <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
diff --git a/osu.iOS.props b/osu.iOS.props
index 2cea2e4b13..c0cfb7a96d 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -92,7 +92,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.226.0" />
-    <PackageReference Include="SharpCompress" Version="0.27.1" />
+    <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

From 9db37e62d8dc33bd19ef35861dab19b5f861af86 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 1 Mar 2021 20:05:53 +0000
Subject: [PATCH 1720/3722] Bump
 Microsoft.AspNetCore.SignalR.Protocols.MessagePack

Bumps [Microsoft.AspNetCore.SignalR.Protocols.MessagePack](https://github.com/dotnet/aspnetcore) from 5.0.2 to 5.0.3.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v5.0.2...v5.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 84a74502c2..ca39c160a4 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -22,7 +22,7 @@
     <PackageReference Include="Humanizer" Version="2.8.26" />
     <PackageReference Include="MessagePack" Version="2.2.85" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="5.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.3" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="5.0.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 2cea2e4b13..c854ae7dff 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -80,7 +80,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.0.3" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.3" />
     <PackageReference Include="MessagePack" Version="1.7.3.7" />
     <PackageReference Include="MessagePack.Annotations" Version="2.2.85" />
   </ItemGroup>

From 2609b22d53626ff13206a88e70714b952ff5ff35 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 1 Mar 2021 23:07:25 +0300
Subject: [PATCH 1721/3722] Replace usage of `CurrentModeRank` in line with API
 change

---
 osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs       | 4 ++--
 .../Visual/Playlists/TestScenePlaylistsParticipantsList.cs   | 2 +-
 osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs         | 2 +-
 osu.Game/Users/User.cs                                       | 5 +----
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs
index 9bece39ca0..e8d9ff72af 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Tests.Visual.Online
                 Username = "flyte",
                 Id = 3103765,
                 IsOnline = true,
-                CurrentModeRank = 1111,
+                Statistics = new UserStatistics { GlobalRank = 1111 },
                 Country = new Country { FlagName = "JP" },
                 CoverUrl = "https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"
             },
@@ -60,7 +60,7 @@ namespace osu.Game.Tests.Visual.Online
                 Username = "peppy",
                 Id = 2,
                 IsOnline = false,
-                CurrentModeRank = 2222,
+                Statistics = new UserStatistics { GlobalRank = 2222 },
                 Country = new Country { FlagName = "AU" },
                 CoverUrl = "https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
                 IsSupporter = true,
diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsParticipantsList.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsParticipantsList.cs
index 8dd81e02e2..255f147ec9 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsParticipantsList.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Tests.Visual.Playlists
                 Room.RecentParticipants.Add(new User
                 {
                     Username = "peppy",
-                    CurrentModeRank = 1234,
+                    Statistics = new UserStatistics { GlobalRank = 1234 },
                     Id = 2
                 });
             }
diff --git a/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs b/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
index e6fe6ac749..0922ce5ecc 100644
--- a/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/Friends/FriendDisplay.cs
@@ -244,7 +244,7 @@ namespace osu.Game.Overlays.Dashboard.Friends
                     return unsorted.OrderByDescending(u => u.LastVisit).ToList();
 
                 case UserSortCriteria.Rank:
-                    return unsorted.OrderByDescending(u => u.CurrentModeRank.HasValue).ThenBy(u => u.CurrentModeRank ?? 0).ToList();
+                    return unsorted.OrderByDescending(u => u.Statistics.GlobalRank.HasValue).ThenBy(u => u.Statistics.GlobalRank ?? 0).ToList();
 
                 case UserSortCriteria.Username:
                     return unsorted.OrderBy(u => u.Username).ToList();
diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index 4a6fd540c7..4d537b91bd 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -72,9 +72,6 @@ namespace osu.Game.Users
         [JsonProperty(@"support_level")]
         public int SupportLevel;
 
-        [JsonProperty(@"current_mode_rank")]
-        public int? CurrentModeRank;
-
         [JsonProperty(@"is_gmt")]
         public bool IsGMT;
 
@@ -182,7 +179,7 @@ namespace osu.Game.Users
         private UserStatistics statistics;
 
         /// <summary>
-        /// User statistics for the requested ruleset (in the case of a <see cref="GetUserRequest"/> response).
+        /// User statistics for the requested ruleset (in the case of a <see cref="GetUserRequest"/> or <see cref="GetFriendsRequest"/> response).
         /// Otherwise empty.
         /// </summary>
         [JsonProperty(@"statistics")]

From d6925d09609c81bc8b8dc426d66440f7f25cedad Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 2 Mar 2021 00:43:44 +0000
Subject: [PATCH 1722/3722] Bump Moq from 4.16.0 to 4.16.1

Bumps [Moq](https://github.com/moq/moq4) from 4.16.0 to 4.16.1.
- [Release notes](https://github.com/moq/moq4/releases)
- [Changelog](https://github.com/moq/moq4/blob/main/CHANGELOG.md)
- [Commits](https://github.com/moq/moq4/compare/v4.16.0...v4.16.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 osu.Game.Tests.Android/osu.Game.Tests.Android.csproj | 2 +-
 osu.Game.Tests.iOS/osu.Game.Tests.iOS.csproj         | 2 +-
 osu.Game.Tests/osu.Game.Tests.csproj                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj b/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj
index 19e36a63f1..543f2f35a7 100644
--- a/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj
+++ b/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="DeepEqual" Version="2.0.0" />
-    <PackageReference Include="Moq" Version="4.16.0" />
+    <PackageReference Include="Moq" Version="4.16.1" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/osu.Game.Tests.iOS/osu.Game.Tests.iOS.csproj b/osu.Game.Tests.iOS/osu.Game.Tests.iOS.csproj
index 67b2298f4c..e83bef4a95 100644
--- a/osu.Game.Tests.iOS/osu.Game.Tests.iOS.csproj
+++ b/osu.Game.Tests.iOS/osu.Game.Tests.iOS.csproj
@@ -45,7 +45,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="DeepEqual" Version="2.0.0" />
-    <PackageReference Include="Moq" Version="4.16.0" />
+    <PackageReference Include="Moq" Version="4.16.1" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index 7e3868bd3b..877f41fbff 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -7,7 +7,7 @@
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
-    <PackageReference Include="Moq" Version="4.16.0" />
+    <PackageReference Include="Moq" Version="4.16.1" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>

From b03efd69402995a6bc4ce62cf3b903ace5de396b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 2 Mar 2021 00:43:45 +0000
Subject: [PATCH 1723/3722] Bump Microsoft.NET.Test.Sdk from 16.8.3 to 16.9.1

Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.8.3 to 16.9.1.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.8.3...v16.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 .../osu.Game.Rulesets.Catch.Tests.csproj                        | 2 +-
 .../osu.Game.Rulesets.Mania.Tests.csproj                        | 2 +-
 osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj  | 2 +-
 .../osu.Game.Rulesets.Taiko.Tests.csproj                        | 2 +-
 osu.Game.Tests/osu.Game.Tests.csproj                            | 2 +-
 osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

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 bf3aba5859..728af5124e 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
@@ -2,7 +2,7 @@
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
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 fcc0cafefc..af16f39563 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
@@ -2,7 +2,7 @@
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
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 b4c686ccea..3d2d1f3fec 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
@@ -2,7 +2,7 @@
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
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 2b084f3bee..fa00922706 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
@@ -2,7 +2,7 @@
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index 7e3868bd3b..6c5ca937e2 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -3,7 +3,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="DeepEqual" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
diff --git a/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj b/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
index 77ae06d89c..b20583dd7e 100644
--- a/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
+++ b/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
   </ItemGroup>

From 7829a0636e5c021db48d058df16a6554313182d6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 2 Mar 2021 00:43:47 +0000
Subject: [PATCH 1724/3722] Bump Sentry from 3.0.1 to 3.0.7

Bumps [Sentry](https://github.com/getsentry/sentry-dotnet) from 3.0.1 to 3.0.7.
- [Release notes](https://github.com/getsentry/sentry-dotnet/releases)
- [Changelog](https://github.com/getsentry/sentry-dotnet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-dotnet/compare/3.0.1...3.0.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 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 5ec7fb81fc..9916122a2a 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -31,7 +31,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.226.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
-    <PackageReference Include="Sentry" Version="3.0.1" />
+    <PackageReference Include="Sentry" Version="3.0.7" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

From fa959291216feeb9e24174d74f9c3bc9a3882f36 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Mar 2021 16:07:09 +0900
Subject: [PATCH 1725/3722] Remove easy to remove finalizers

---
 osu.Game/Database/DatabaseWriteUsage.cs | 5 -----
 osu.Game/Utils/SentryLogger.cs          | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/osu.Game/Database/DatabaseWriteUsage.cs b/osu.Game/Database/DatabaseWriteUsage.cs
index ddafd77066..84c39e3532 100644
--- a/osu.Game/Database/DatabaseWriteUsage.cs
+++ b/osu.Game/Database/DatabaseWriteUsage.cs
@@ -54,10 +54,5 @@ namespace osu.Game.Database
             Dispose(true);
             GC.SuppressFinalize(this);
         }
-
-        ~DatabaseWriteUsage()
-        {
-            Dispose(false);
-        }
     }
 }
diff --git a/osu.Game/Utils/SentryLogger.cs b/osu.Game/Utils/SentryLogger.cs
index be9d01cde6..8f12760a6b 100644
--- a/osu.Game/Utils/SentryLogger.cs
+++ b/osu.Game/Utils/SentryLogger.cs
@@ -86,11 +86,6 @@ namespace osu.Game.Utils
 
         #region Disposal
 
-        ~SentryLogger()
-        {
-            Dispose(false);
-        }
-
         public void Dispose()
         {
             Dispose(true);

From c4ba045df158275175e0a84675106986ae96b946 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Mar 2021 16:07:51 +0900
Subject: [PATCH 1726/3722] Add note about finalizers required for audio store
 clean-up

---
 osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs | 1 +
 osu.Game/Skinning/Skin.cs                           | 1 +
 2 files changed, 2 insertions(+)

diff --git a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
index b31884d246..14aa3fe99a 100644
--- a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
+++ b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
@@ -63,6 +63,7 @@ namespace osu.Game.Rulesets.UI
 
         ~DrawableRulesetDependencies()
         {
+            // required to potentially clean up sample store from audio hierarchy.
             Dispose(false);
         }
 
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index e8d84b49f9..6b435cff0f 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -36,6 +36,7 @@ namespace osu.Game.Skinning
 
         ~Skin()
         {
+            // required to potentially clean up sample store from audio hierarchy.
             Dispose(false);
         }
 

From 103dd4a6cea72ec399ac995acfe5270bd1da0de7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Mar 2021 16:14:43 +0900
Subject: [PATCH 1727/3722] Remove WorkingBeatmap's finalizer

---
 osu.Game/Beatmaps/BeatmapManager.cs |  4 ++++
 osu.Game/Beatmaps/WorkingBeatmap.cs | 10 ----------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 3c6a6ba302..d653e5386b 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -20,6 +20,7 @@ using osu.Framework.IO.Stores;
 using osu.Framework.Lists;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
+using osu.Framework.Statistics;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Database;
@@ -311,6 +312,9 @@ namespace osu.Game.Beatmaps
 
                 workingCache.Add(working = new BeatmapManagerWorkingBeatmap(beatmapInfo, this));
 
+                // best effort; may be higher than expected.
+                GlobalStatistics.Get<int>(nameof(Beatmaps), $"Cached {nameof(WorkingBeatmap)}s").Value = workingCache.Count();
+
                 return working;
             }
         }
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index aab8ff6bd6..f7f276230f 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -12,7 +12,6 @@ using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Logging;
-using osu.Framework.Statistics;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
@@ -34,8 +33,6 @@ namespace osu.Game.Beatmaps
 
         protected AudioManager AudioManager { get; }
 
-        private static readonly GlobalStatistic<int> total_count = GlobalStatistics.Get<int>(nameof(Beatmaps), $"Total {nameof(WorkingBeatmap)}s");
-
         protected WorkingBeatmap(BeatmapInfo beatmapInfo, AudioManager audioManager)
         {
             AudioManager = audioManager;
@@ -47,8 +44,6 @@ namespace osu.Game.Beatmaps
             waveform = new RecyclableLazy<Waveform>(GetWaveform);
             storyboard = new RecyclableLazy<Storyboard>(GetStoryboard);
             skin = new RecyclableLazy<ISkin>(GetSkin);
-
-            total_count.Value++;
         }
 
         protected virtual Track GetVirtualTrack(double emptyLength = 0)
@@ -331,11 +326,6 @@ namespace osu.Game.Beatmaps
         protected virtual ISkin GetSkin() => new DefaultSkin();
         private readonly RecyclableLazy<ISkin> skin;
 
-        ~WorkingBeatmap()
-        {
-            total_count.Value--;
-        }
-
         public class RecyclableLazy<T>
         {
             private Lazy<T> lazy;

From 6372a0265af98f48afa15d4c4499a1a33250db6c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Mar 2021 17:44:56 +0900
Subject: [PATCH 1728/3722] Fix confine mode dropdown becoming visible again
 after filtering

Changes from a hidden to a disabled state, with a tooltip explaining
why.

Closes #11851.
---
 .../Settings/Sections/Input/MouseSettings.cs     | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
index 455e13711d..768a18cca0 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
@@ -68,7 +68,21 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             };
 
             windowMode = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
-            windowMode.BindValueChanged(mode => confineMouseModeSetting.Alpha = mode.NewValue == WindowMode.Fullscreen ? 0 : 1, true);
+            windowMode.BindValueChanged(mode =>
+            {
+                var isFullscreen = mode.NewValue == WindowMode.Fullscreen;
+
+                if (isFullscreen)
+                {
+                    confineMouseModeSetting.Current.Disabled = true;
+                    confineMouseModeSetting.TooltipText = "Not applicable in full screen mode";
+                }
+                else
+                {
+                    confineMouseModeSetting.Current.Disabled = false;
+                    confineMouseModeSetting.TooltipText = string.Empty;
+                }
+            }, true);
 
             if (RuntimeInfo.OS != RuntimeInfo.Platform.Windows)
             {

From 0300a554476c72fb0e07774350f0fc79687718c2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 2 Mar 2021 18:00:50 +0900
Subject: [PATCH 1729/3722] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 5d83bb9583..c428cd2546 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.226.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.302.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 9916122a2a..2528292e17 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.226.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.302.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.0.7" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index b4f981162a..56a24bea12 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.226.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.302.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -91,7 +91,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.226.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.302.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 30ff0b83c199a20ddcd2e86beb643842f1263daf Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 2 Mar 2021 19:06:21 +0900
Subject: [PATCH 1730/3722] Fix test failures due to unpopulated room

---
 .../Tests/Visual/Multiplayer/MultiplayerTestScene.cs  | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
index 2e8c834c65..7775c2bd24 100644
--- a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
@@ -7,8 +7,10 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay;
 using osu.Game.Screens.OnlinePlay.Lounge.Components;
+using osu.Game.Tests.Beatmaps;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
@@ -48,7 +50,16 @@ namespace osu.Game.Tests.Visual.Multiplayer
             RoomManager.Schedule(() => RoomManager.PartRoom());
 
             if (joinRoom)
+            {
+                Room.Name.Value = "test name";
+                Room.Playlist.Add(new PlaylistItem
+                {
+                    Beatmap = { Value = new TestBeatmap(Ruleset.Value).BeatmapInfo },
+                    Ruleset = { Value = Ruleset.Value }
+                });
+
                 RoomManager.Schedule(() => RoomManager.CreateRoom(Room));
+            }
         });
 
         public override void SetUpSteps()

From 711cf3e5111e46f293b8aba2216c082378944eb3 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 2 Mar 2021 17:25:36 +0300
Subject: [PATCH 1731/3722] Add mobile logs location to issue templates

---
 .github/ISSUE_TEMPLATE/01-bug-issues.md   | 2 ++
 .github/ISSUE_TEMPLATE/02-crash-issues.md | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/01-bug-issues.md b/.github/ISSUE_TEMPLATE/01-bug-issues.md
index 0b80ce44dd..6050036cbf 100644
--- a/.github/ISSUE_TEMPLATE/01-bug-issues.md
+++ b/.github/ISSUE_TEMPLATE/01-bug-issues.md
@@ -13,4 +13,6 @@ about: Issues regarding encountered bugs.
 *please attach logs here, which are located at:*
 - `%AppData%/osu/logs` *(on Windows),*
 - `~/.local/share/osu/logs` *(on Linux & macOS).*
+- `Android/Data/sh.ppy.osulazer/logs` *(on Android)*,
+- on iOS they can be obtained by connecting your device to your desktop and copying the `logs` directory from the app's own document storage using iTunes. (https://support.apple.com/en-us/HT201301#copy-to-computer)
 -->
diff --git a/.github/ISSUE_TEMPLATE/02-crash-issues.md b/.github/ISSUE_TEMPLATE/02-crash-issues.md
index ada8de73c0..04170312d1 100644
--- a/.github/ISSUE_TEMPLATE/02-crash-issues.md
+++ b/.github/ISSUE_TEMPLATE/02-crash-issues.md
@@ -13,6 +13,8 @@ about: Issues regarding crashes or permanent freezes.
 *please attach logs here, which are located at:*
 - `%AppData%/osu/logs` *(on Windows),*
 - `~/.local/share/osu/logs` *(on Linux & macOS).*
+- `Android/Data/sh.ppy.osulazer/logs` *(on Android)*,
+- on iOS they can be obtained by connecting your device to your desktop and copying the `logs` directory from the app's own document storage using iTunes. (https://support.apple.com/en-us/HT201301#copy-to-computer)
 -->
 
 **Computer Specifications:** 

From 40a28367c63a2cf7e3c87eeccaf617b1f25564a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 2 Mar 2021 18:50:33 +0100
Subject: [PATCH 1732/3722] Fix restore-to-default buttons never showing if
 initially hidden

---
 osu.Game/Overlays/Settings/SettingsItem.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index 4cb8d7f83c..c5890a6fbb 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -147,6 +147,7 @@ namespace osu.Game.Overlays.Settings
                 RelativeSizeAxes = Axes.Y;
                 Width = SettingsPanel.CONTENT_MARGINS;
                 Alpha = 0f;
+                AlwaysPresent = true;
             }
 
             [BackgroundDependencyLoader]

From 3b125a26a863e61d20a9a5018ab10383c2486611 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 2 Mar 2021 19:18:01 +0100
Subject: [PATCH 1733/3722] Add test coverage

---
 .../Visual/Settings/TestSceneSettingsItem.cs  | 43 +++++++++++++++++++
 osu.Game/Overlays/Settings/SettingsItem.cs    |  2 +-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Tests/Visual/Settings/TestSceneSettingsItem.cs

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneSettingsItem.cs b/osu.Game.Tests/Visual/Settings/TestSceneSettingsItem.cs
new file mode 100644
index 0000000000..8f1c17ed29
--- /dev/null
+++ b/osu.Game.Tests/Visual/Settings/TestSceneSettingsItem.cs
@@ -0,0 +1,43 @@
+// Copyright (c) ppy 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.Overlays.Settings;
+
+namespace osu.Game.Tests.Visual.Settings
+{
+    [TestFixture]
+    public class TestSceneSettingsItem : OsuTestScene
+    {
+        [Test]
+        public void TestRestoreDefaultValueButtonVisibility()
+        {
+            TestSettingsTextBox textBox = null;
+
+            AddStep("create settings item", () => Child = textBox = new TestSettingsTextBox
+            {
+                Current = new Bindable<string>
+                {
+                    Default = "test",
+                    Value = "test"
+                }
+            });
+            AddAssert("restore button hidden", () => textBox.RestoreDefaultValueButton.Alpha == 0);
+
+            AddStep("change value from default", () => textBox.Current.Value = "non-default");
+            AddUntilStep("restore button shown", () => textBox.RestoreDefaultValueButton.Alpha > 0);
+
+            AddStep("restore default", () => textBox.Current.SetDefault());
+            AddUntilStep("restore button hidden", () => textBox.RestoreDefaultValueButton.Alpha == 0);
+        }
+
+        private class TestSettingsTextBox : SettingsTextBox
+        {
+            public new Drawable RestoreDefaultValueButton => this.ChildrenOfType<RestoreDefaultValueButton>().Single();
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index c5890a6fbb..8631b8ac7b 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -121,7 +121,7 @@ namespace osu.Game.Overlays.Settings
                 labelText.Alpha = controlWithCurrent.Current.Disabled ? 0.3f : 1;
         }
 
-        private class RestoreDefaultValueButton : Container, IHasTooltip
+        protected internal class RestoreDefaultValueButton : Container, IHasTooltip
         {
             private Bindable<T> bindable;
 

From 26736d990f792f15bd0c92f7f5a100a8f800816d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 2 Mar 2021 19:42:47 +0100
Subject: [PATCH 1734/3722] Enable filter parsing extensibility

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

diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index 4b6b3be45c..3f1b80ee1c 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Screens.Select
     internal static class FilterQueryParser
     {
         private static readonly Regex query_syntax_regex = new Regex(
-            @"\b(?<key>stars|ar|dr|hp|cs|divisor|length|objects|bpm|status|creator|artist)(?<op>[=:><]+)(?<value>("".*"")|(\S*))",
+            @"\b(?<key>\w+)(?<op>[=:><]+)(?<value>("".*"")|(\S*))",
             RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         internal static void ApplyQueries(FilterCriteria criteria, string query)
@@ -22,15 +22,14 @@ namespace osu.Game.Screens.Select
                 var op = match.Groups["op"].Value;
                 var value = match.Groups["value"].Value;
 
-                parseKeywordCriteria(criteria, key, value, op);
-
-                query = query.Replace(match.ToString(), "");
+                if (tryParseKeywordCriteria(criteria, key, value, op))
+                    query = query.Replace(match.ToString(), "");
             }
 
             criteria.SearchText = query;
         }
 
-        private static void parseKeywordCriteria(FilterCriteria criteria, string key, string value, string op)
+        private static bool tryParseKeywordCriteria(FilterCriteria criteria, string key, string value, string op)
         {
             switch (key)
             {
@@ -75,7 +74,12 @@ namespace osu.Game.Screens.Select
                 case "artist":
                     updateCriteriaText(ref criteria.Artist, op, value);
                     break;
+
+                default:
+                    return false;
             }
+
+            return true;
         }
 
         private static int getLengthScale(string value) =>

From e46543a4a924d6bab3b7ef67fa8d3d992d6504bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 2 Mar 2021 19:56:36 +0100
Subject: [PATCH 1735/3722] Constrain operator parsing better

---
 .../Filtering/FilterQueryParserTest.cs        |   9 ++
 osu.Game/Screens/Select/Filter/Operator.cs    |  17 +++
 osu.Game/Screens/Select/FilterQueryParser.cs  | 131 ++++++++++--------
 3 files changed, 99 insertions(+), 58 deletions(-)
 create mode 100644 osu.Game/Screens/Select/Filter/Operator.cs

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
index d15682b1eb..e121cb835c 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
@@ -194,5 +194,14 @@ namespace osu.Game.Tests.NonVisual.Filtering
             Assert.AreEqual(1, filterCriteria.SearchTerms.Length);
             Assert.AreEqual("double\"quote", filterCriteria.Artist.SearchTerm);
         }
+
+        [Test]
+        public void TestOperatorParsing()
+        {
+            const string query = "artist=><something";
+            var filterCriteria = new FilterCriteria();
+            FilterQueryParser.ApplyQueries(filterCriteria, query);
+            Assert.AreEqual("><something", filterCriteria.Artist.SearchTerm);
+        }
     }
 }
diff --git a/osu.Game/Screens/Select/Filter/Operator.cs b/osu.Game/Screens/Select/Filter/Operator.cs
new file mode 100644
index 0000000000..706daf631f
--- /dev/null
+++ b/osu.Game/Screens/Select/Filter/Operator.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace osu.Game.Screens.Select.Filter
+{
+    /// <summary>
+    /// Defines logical operators that can be used in the song select search box keyword filters.
+    /// </summary>
+    public enum Operator
+    {
+        Less,
+        LessOrEqual,
+        Equal,
+        GreaterOrEqual,
+        Greater
+    }
+}
diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index 3f1b80ee1c..d2d33b13f5 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -5,13 +5,14 @@ using System;
 using System.Globalization;
 using System.Text.RegularExpressions;
 using osu.Game.Beatmaps;
+using osu.Game.Screens.Select.Filter;
 
 namespace osu.Game.Screens.Select
 {
     internal 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)
@@ -19,7 +20,7 @@ namespace osu.Game.Screens.Select
             foreach (Match match in query_syntax_regex.Matches(query))
             {
                 var key = match.Groups["key"].Value.ToLower();
-                var op = match.Groups["op"].Value;
+                var op = parseOperator(match.Groups["op"].Value);
                 var value = match.Groups["value"].Value;
 
                 if (tryParseKeywordCriteria(criteria, key, value, op))
@@ -29,57 +30,72 @@ namespace osu.Game.Screens.Select
             criteria.SearchText = query;
         }
 
-        private static bool tryParseKeywordCriteria(FilterCriteria criteria, string key, string value, string op)
+        private static bool tryParseKeywordCriteria(FilterCriteria criteria, string key, string value, Operator op)
         {
             switch (key)
             {
                 case "stars" when parseFloatWithPoint(value, out var stars):
-                    updateCriteriaRange(ref criteria.StarDifficulty, op, stars, 0.01f / 2);
-                    break;
+                    return updateCriteriaRange(ref criteria.StarDifficulty, op, stars, 0.01f / 2);
 
                 case "ar" when parseFloatWithPoint(value, out var ar):
-                    updateCriteriaRange(ref criteria.ApproachRate, op, ar, 0.1f / 2);
-                    break;
+                    return updateCriteriaRange(ref criteria.ApproachRate, op, ar, 0.1f / 2);
 
                 case "dr" when parseFloatWithPoint(value, out var dr):
                 case "hp" when parseFloatWithPoint(value, out dr):
-                    updateCriteriaRange(ref criteria.DrainRate, op, dr, 0.1f / 2);
-                    break;
+                    return updateCriteriaRange(ref criteria.DrainRate, op, dr, 0.1f / 2);
 
                 case "cs" when parseFloatWithPoint(value, out var cs):
-                    updateCriteriaRange(ref criteria.CircleSize, op, cs, 0.1f / 2);
-                    break;
+                    return updateCriteriaRange(ref criteria.CircleSize, op, cs, 0.1f / 2);
 
                 case "bpm" when parseDoubleWithPoint(value, out var bpm):
-                    updateCriteriaRange(ref criteria.BPM, op, bpm, 0.01d / 2);
-                    break;
+                    return updateCriteriaRange(ref criteria.BPM, op, bpm, 0.01d / 2);
 
                 case "length" when parseDoubleWithPoint(value.TrimEnd('m', 's', 'h'), out var length):
                     var scale = getLengthScale(value);
-                    updateCriteriaRange(ref criteria.Length, op, length * scale, scale / 2.0);
-                    break;
+                    return updateCriteriaRange(ref criteria.Length, op, length * scale, scale / 2.0);
 
                 case "divisor" when parseInt(value, out var divisor):
-                    updateCriteriaRange(ref criteria.BeatDivisor, op, divisor);
-                    break;
+                    return updateCriteriaRange(ref criteria.BeatDivisor, op, divisor);
 
                 case "status" when Enum.TryParse<BeatmapSetOnlineStatus>(value, true, out var statusValue):
-                    updateCriteriaRange(ref criteria.OnlineStatus, op, statusValue);
-                    break;
+                    return updateCriteriaRange(ref criteria.OnlineStatus, op, statusValue);
 
                 case "creator":
-                    updateCriteriaText(ref criteria.Creator, op, value);
-                    break;
+                    return updateCriteriaText(ref criteria.Creator, op, value);
 
                 case "artist":
-                    updateCriteriaText(ref criteria.Artist, op, value);
-                    break;
+                    return updateCriteriaText(ref criteria.Artist, op, value);
 
                 default:
                     return false;
             }
+        }
 
-            return true;
+        private static Operator parseOperator(string value)
+        {
+            switch (value)
+            {
+                case "=":
+                case ":":
+                    return Operator.Equal;
+
+                case "<":
+                    return Operator.Less;
+
+                case "<=":
+                case "<:":
+                    return Operator.LessOrEqual;
+
+                case ">":
+                    return Operator.Greater;
+
+                case ">=":
+                case ">:":
+                    return Operator.GreaterOrEqual;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(value), $"Unsupported operator {value}");
+            }
         }
 
         private static int getLengthScale(string value) =>
@@ -97,120 +113,119 @@ namespace osu.Game.Screens.Select
         private static bool parseInt(string value, out int result) =>
             int.TryParse(value, NumberStyles.None, CultureInfo.InvariantCulture, out result);
 
-        private static void updateCriteriaText(ref FilterCriteria.OptionalTextFilter textFilter, string op, string value)
+        private static bool updateCriteriaText(ref FilterCriteria.OptionalTextFilter textFilter, Operator op, string value)
         {
             switch (op)
             {
-                case "=":
-                case ":":
+                case Operator.Equal:
                     textFilter.SearchTerm = value.Trim('"');
-                    break;
+                    return true;
+
+                default:
+                    return false;
             }
         }
 
-        private static void updateCriteriaRange(ref FilterCriteria.OptionalRange<float> range, string op, float value, float tolerance = 0.05f)
+        private static bool updateCriteriaRange(ref FilterCriteria.OptionalRange<float> range, Operator op, float value, float tolerance = 0.05f)
         {
             switch (op)
             {
                 default:
-                    return;
+                    return false;
 
-                case "=":
-                case ":":
+                case Operator.Equal:
                     range.Min = value - tolerance;
                     range.Max = value + tolerance;
                     break;
 
-                case ">":
+                case Operator.Greater:
                     range.Min = value + tolerance;
                     break;
 
-                case ">=":
-                case ">:":
+                case Operator.GreaterOrEqual:
                     range.Min = value - tolerance;
                     break;
 
-                case "<":
+                case Operator.Less:
                     range.Max = value - tolerance;
                     break;
 
-                case "<=":
-                case "<:":
+                case Operator.LessOrEqual:
                     range.Max = value + tolerance;
                     break;
             }
+
+            return true;
         }
 
-        private static void updateCriteriaRange(ref FilterCriteria.OptionalRange<double> range, string op, double value, double tolerance = 0.05)
+        private static bool updateCriteriaRange(ref FilterCriteria.OptionalRange<double> range, Operator op, double value, double tolerance = 0.05)
         {
             switch (op)
             {
                 default:
-                    return;
+                    return false;
 
-                case "=":
-                case ":":
+                case Operator.Equal:
                     range.Min = value - tolerance;
                     range.Max = value + tolerance;
                     break;
 
-                case ">":
+                case Operator.Greater:
                     range.Min = value + tolerance;
                     break;
 
-                case ">=":
-                case ">:":
+                case Operator.GreaterOrEqual:
                     range.Min = value - tolerance;
                     break;
 
-                case "<":
+                case Operator.Less:
                     range.Max = value - tolerance;
                     break;
 
-                case "<=":
-                case "<:":
+                case Operator.LessOrEqual:
                     range.Max = value + tolerance;
                     break;
             }
+
+            return true;
         }
 
-        private static void updateCriteriaRange<T>(ref FilterCriteria.OptionalRange<T> range, string op, T value)
+        private static bool updateCriteriaRange<T>(ref FilterCriteria.OptionalRange<T> range, Operator op, T value)
             where T : struct
         {
             switch (op)
             {
                 default:
-                    return;
+                    return false;
 
-                case "=":
-                case ":":
+                case Operator.Equal:
                     range.IsLowerInclusive = range.IsUpperInclusive = true;
                     range.Min = value;
                     range.Max = value;
                     break;
 
-                case ">":
+                case Operator.Greater:
                     range.IsLowerInclusive = false;
                     range.Min = value;
                     break;
 
-                case ">=":
-                case ">:":
+                case Operator.GreaterOrEqual:
                     range.IsLowerInclusive = true;
                     range.Min = value;
                     break;
 
-                case "<":
+                case Operator.Less:
                     range.IsUpperInclusive = false;
                     range.Max = value;
                     break;
 
-                case "<=":
-                case "<:":
+                case Operator.LessOrEqual:
                     range.IsUpperInclusive = true;
                     range.Max = value;
                     break;
             }
+
+            return true;
         }
     }
 }

From 14e249a13405e834a7ea90b32cc3e8246efc37be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 2 Mar 2021 20:07:11 +0100
Subject: [PATCH 1736/3722] Add ruleset interface for extending filter criteria

---
 .../Rulesets/Filter/IRulesetFilterCriteria.cs | 44 +++++++++++++++++++
 osu.Game/Rulesets/Ruleset.cs                  |  7 +++
 2 files changed, 51 insertions(+)
 create mode 100644 osu.Game/Rulesets/Filter/IRulesetFilterCriteria.cs

diff --git a/osu.Game/Rulesets/Filter/IRulesetFilterCriteria.cs b/osu.Game/Rulesets/Filter/IRulesetFilterCriteria.cs
new file mode 100644
index 0000000000..a83f87d72b
--- /dev/null
+++ b/osu.Game/Rulesets/Filter/IRulesetFilterCriteria.cs
@@ -0,0 +1,44 @@
+// Copyright (c) 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;
+using osu.Game.Screens.Select;
+using osu.Game.Screens.Select.Filter;
+
+namespace osu.Game.Rulesets.Filter
+{
+    /// <summary>
+    /// Allows for extending the beatmap filtering capabilities of song select (as implemented in <see cref="FilterCriteria"/>)
+    /// with ruleset-specific criteria.
+    /// </summary>
+    public interface IRulesetFilterCriteria
+    {
+        /// <summary>
+        /// Checks whether the supplied <paramref name="beatmap"/> satisfies ruleset-specific custom criteria,
+        /// in addition to the ones mandated by song select.
+        /// </summary>
+        /// <param name="beatmap">The beatmap to test the criteria against.</param>
+        /// <returns>
+        /// <c>true</c> if the beatmap matches the ruleset-specific custom filtering criteria,
+        /// <c>false</c> otherwise.
+        /// </returns>
+        bool Matches(BeatmapInfo beatmap);
+
+        /// <summary>
+        /// Attempts to parse a single custom keyword criterion, given by the user via the song select search box.
+        /// The format of the criterion is:
+        /// <code>
+        /// {key}{op}{value}
+        /// </code>
+        /// </summary>
+        /// <param name="key">The key (name) of the criterion.</param>
+        /// <param name="op">The operator in the criterion.</param>
+        /// <param name="value">The value of the criterion.</param>
+        /// <returns>
+        /// <c>true</c> if the keyword criterion is valid, <c>false</c> if it has been ignored.
+        /// Valid criteria are stripped from <see cref="FilterCriteria.SearchText"/>,
+        /// while ignored criteria are included in <see cref="FilterCriteria.SearchText"/>.
+        /// </returns>
+        bool TryParseCustomKeywordCriteria(string key, Operator op, string value);
+    }
+}
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index dbc2bd4d01..38d30a2e31 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -26,6 +26,7 @@ using JetBrains.Annotations;
 using osu.Framework.Extensions;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Testing;
+using osu.Game.Rulesets.Filter;
 using osu.Game.Screens.Ranking.Statistics;
 
 namespace osu.Game.Rulesets
@@ -306,5 +307,11 @@ namespace osu.Game.Rulesets
         /// <param name="result">The result type to get the name for.</param>
         /// <returns>The display name.</returns>
         public virtual string GetDisplayNameForHitResult(HitResult result) => result.GetDescription();
+
+        /// <summary>
+        /// Creates ruleset-specific beatmap filter criteria to be used on the song select screen.
+        /// </summary>
+        [CanBeNull]
+        public virtual IRulesetFilterCriteria CreateRulesetFilterCriteria() => null;
     }
 }

From c375be6b07b7d4bc19d29683c61a9f4da6529d52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 2 Mar 2021 20:10:03 +0100
Subject: [PATCH 1737/3722] Instantiate ruleset criteria

---
 osu.Game/Screens/Select/FilterControl.cs  | 8 ++++++++
 osu.Game/Screens/Select/FilterCriteria.cs | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index eafd8a87d1..983928ac51 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.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.Graphics;
@@ -34,8 +35,13 @@ namespace osu.Game.Screens.Select
 
         private Bindable<GroupMode> groupMode;
 
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
+
         public FilterCriteria CreateCriteria()
         {
+            Debug.Assert(ruleset.Value.ID != null);
+
             var query = searchTextBox.Text;
 
             var criteria = new FilterCriteria
@@ -53,6 +59,8 @@ namespace osu.Game.Screens.Select
             if (!maximumStars.IsDefault)
                 criteria.UserStarDifficulty.Max = maximumStars.Value;
 
+            criteria.RulesetCriteria = rulesets.GetRuleset(ruleset.Value.ID.Value).CreateInstance().CreateRulesetFilterCriteria();
+
             FilterQueryParser.ApplyQueries(criteria, query);
             return criteria;
         }
diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index 7bddb3e51b..208048380a 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -8,6 +8,7 @@ using JetBrains.Annotations;
 using osu.Game.Beatmaps;
 using osu.Game.Collections;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Filter;
 using osu.Game.Screens.Select.Filter;
 
 namespace osu.Game.Screens.Select
@@ -69,6 +70,9 @@ namespace osu.Game.Screens.Select
         [CanBeNull]
         public BeatmapCollection Collection;
 
+        [CanBeNull]
+        public IRulesetFilterCriteria RulesetCriteria { get; set; }
+
         public struct OptionalRange<T> : IEquatable<OptionalRange<T>>
             where T : struct
         {

From 42c3309d4918db8044c312d28f3efbc7422caae1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 2 Mar 2021 20:11:21 +0100
Subject: [PATCH 1738/3722] Use ruleset criteria in parsing and filtering

---
 osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs | 3 +++
 osu.Game/Screens/Select/FilterQueryParser.cs        | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index 1aab50037a..521b90202d 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -73,6 +73,9 @@ namespace osu.Game.Screens.Select.Carousel
             if (match)
                 match &= criteria.Collection?.Beatmaps.Contains(Beatmap) ?? true;
 
+            if (match && criteria.RulesetCriteria != null)
+                match &= criteria.RulesetCriteria.Matches(Beatmap);
+
             Filtered.Value = !match;
         }
 
diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index d2d33b13f5..c81a72d938 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Screens.Select
                     return updateCriteriaText(ref criteria.Artist, op, value);
 
                 default:
-                    return false;
+                    return criteria.RulesetCriteria?.TryParseCustomKeywordCriteria(key, op, value) ?? false;
             }
         }
 

From bf72f9ad1e988f14dbd8ca5b87f55c64b52d9c5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 2 Mar 2021 20:22:56 +0100
Subject: [PATCH 1739/3722] Add tests for custom parsing logic

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

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
index e121cb835c..d835e58b29 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
@@ -4,7 +4,9 @@
 using System;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Filter;
 using osu.Game.Screens.Select;
+using osu.Game.Screens.Select.Filter;
 
 namespace osu.Game.Tests.NonVisual.Filtering
 {
@@ -203,5 +205,43 @@ namespace osu.Game.Tests.NonVisual.Filtering
             FilterQueryParser.ApplyQueries(filterCriteria, query);
             Assert.AreEqual("><something", filterCriteria.Artist.SearchTerm);
         }
+
+        [Test]
+        public void TestUnrecognisedKeywordIsIgnored()
+        {
+            const string query = "unrecognised=keyword";
+            var filterCriteria = new FilterCriteria();
+            FilterQueryParser.ApplyQueries(filterCriteria, query);
+            Assert.AreEqual("unrecognised=keyword", filterCriteria.SearchText);
+        }
+
+        [Test]
+        public void TestCustomKeywordIsParsed()
+        {
+            var customCriteria = new CustomFilterCriteria();
+            const string query = "custom=readme unrecognised=keyword";
+            var filterCriteria = new FilterCriteria { RulesetCriteria = customCriteria };
+            FilterQueryParser.ApplyQueries(filterCriteria, query);
+            Assert.AreEqual("readme", customCriteria.CustomValue);
+            Assert.AreEqual("unrecognised=keyword", filterCriteria.SearchText.Trim());
+        }
+
+        private class CustomFilterCriteria : IRulesetFilterCriteria
+        {
+            public string CustomValue { get; set; }
+
+            public bool Matches(BeatmapInfo beatmap) => true;
+
+            public bool TryParseCustomKeywordCriteria(string key, Operator op, string value)
+            {
+                if (key == "custom" && op == Operator.Equal)
+                {
+                    CustomValue = value;
+                    return true;
+                }
+
+                return false;
+            }
+        }
     }
 }

From faf5fbf49b5a940b41ba3e7b1336fbefd868895a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 2 Mar 2021 20:27:50 +0100
Subject: [PATCH 1740/3722] Add tests for custom matching logic

---
 .../NonVisual/Filtering/FilterMatchingTest.cs | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs
index 24a0a662ba..8ff2743b6a 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs
@@ -4,8 +4,10 @@
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
+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
 {
@@ -214,5 +216,31 @@ namespace osu.Game.Tests.NonVisual.Filtering
 
             Assert.AreEqual(filtered, carouselItem.Filtered.Value);
         }
+
+        [Test]
+        public void TestCustomRulesetCriteria([Values(null, true, false)] bool? matchCustomCriteria)
+        {
+            var beatmap = getExampleBeatmap();
+
+            var customCriteria = matchCustomCriteria is bool match ? new CustomCriteria(match) : null;
+            var criteria = new FilterCriteria { RulesetCriteria = customCriteria };
+            var carouselItem = new CarouselBeatmap(beatmap);
+            carouselItem.Filter(criteria);
+
+            Assert.AreEqual(matchCustomCriteria == false, carouselItem.Filtered.Value);
+        }
+
+        private class CustomCriteria : IRulesetFilterCriteria
+        {
+            private readonly bool match;
+
+            public CustomCriteria(bool shouldMatch)
+            {
+                match = shouldMatch;
+            }
+
+            public bool Matches(BeatmapInfo beatmap) => match;
+            public bool TryParseCustomKeywordCriteria(string key, Operator op, string value) => false;
+        }
     }
 }

From 6e75ebbb06fb6bf394e257bc44877b3f7171923f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Mar 2021 14:02:01 +0900
Subject: [PATCH 1741/3722] Add interface to handle local beatmap presentation
 logic

---
 osu.Game/Screens/IHandlePresentBeatmap.cs | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 osu.Game/Screens/IHandlePresentBeatmap.cs

diff --git a/osu.Game/Screens/IHandlePresentBeatmap.cs b/osu.Game/Screens/IHandlePresentBeatmap.cs
new file mode 100644
index 0000000000..b94df630ef
--- /dev/null
+++ b/osu.Game/Screens/IHandlePresentBeatmap.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.
+
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
+
+namespace osu.Game.Screens
+{
+    /// <summary>
+    /// Denotes a screen which can handle beatmap / ruleset selection via local logic.
+    /// This is used in the <see cref="OsuGame.PresentBeatmap"/> flow to handle cases which require custom logic,
+    /// for instance, if a lease is held on the Beatmap.
+    /// </summary>
+    public interface IHandlePresentBeatmap
+    {
+        /// <summary>
+        /// Invoked with a requested beatmap / ruleset for selection.
+        /// </summary>
+        /// <param name="beatmap">The beatmap to be selected.</param>
+        /// <param name="ruleset">The ruleset to be selected.</param>
+        public void PresentBeatmap(WorkingBeatmap beatmap, RulesetInfo ruleset);
+    }
+}

From 36e1fb6da80a1416900d07ae9c69c9b12e8876ff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Mar 2021 14:04:00 +0900
Subject: [PATCH 1742/3722] Add flow to allow MatchSubScreen to handle beatmap
 presentation locally

---
 osu.Game/OsuGame.cs                           | 13 ++++++++++---
 osu.Game/PerformFromMenuRunner.cs             |  7 +------
 .../Multiplayer/MultiplayerMatchSongSelect.cs | 19 +++++++++++++++++++
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 12 +++++++++++-
 4 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 771bcd2310..1e0cb587e9 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -381,9 +381,16 @@ namespace osu.Game
                                 ?? beatmaps.FirstOrDefault(b => b.Ruleset.Equals(Ruleset.Value))
                                 ?? beatmaps.First();
 
-                Ruleset.Value = selection.Ruleset;
-                Beatmap.Value = BeatmapManager.GetWorkingBeatmap(selection);
-            }, validScreens: new[] { typeof(SongSelect) });
+                if (screen is IHandlePresentBeatmap presentableScreen)
+                {
+                    presentableScreen.PresentBeatmap(BeatmapManager.GetWorkingBeatmap(selection), selection.Ruleset);
+                }
+                else
+                {
+                    Ruleset.Value = selection.Ruleset;
+                    Beatmap.Value = BeatmapManager.GetWorkingBeatmap(selection);
+                }
+            }, validScreens: new[] { typeof(SongSelect), typeof(IHandlePresentBeatmap) });
         }
 
         /// <summary>
diff --git a/osu.Game/PerformFromMenuRunner.cs b/osu.Game/PerformFromMenuRunner.cs
index fe75a3a607..6f979b8dc8 100644
--- a/osu.Game/PerformFromMenuRunner.cs
+++ b/osu.Game/PerformFromMenuRunner.cs
@@ -5,11 +5,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Screens;
 using osu.Framework.Threading;
-using osu.Game.Beatmaps;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Dialog;
 using osu.Game.Overlays.Notifications;
@@ -30,9 +28,6 @@ namespace osu.Game
         [Resolved]
         private DialogOverlay dialogOverlay { get; set; }
 
-        [Resolved]
-        private IBindable<WorkingBeatmap> beatmap { get; set; }
-
         [Resolved(canBeNull: true)]
         private OsuGame game { get; set; }
 
@@ -90,7 +85,7 @@ namespace osu.Game
             var type = current.GetType();
 
             // check if we are already at a valid target screen.
-            if (validScreens.Any(t => t.IsAssignableFrom(type)) && !beatmap.Disabled)
+            if (validScreens.Any(t => t.IsAssignableFrom(type)))
             {
                 finalAction(current);
                 Cancel();
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index f17d97c3fd..c9f0f6de90 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -4,9 +4,11 @@
 using osu.Framework.Allocation;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Select;
 
@@ -19,6 +21,23 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private LoadingLayer loadingLayer;
 
+        /// <summary>
+        /// Construct a new instance of multiplayer song select.
+        /// </summary>
+        /// <param name="beatmap">An optional initial beatmap selection to perform.</param>
+        /// <param name="ruleset">An optional initial ruleset selection to perform.</param>
+        public MultiplayerMatchSongSelect(WorkingBeatmap beatmap = null, RulesetInfo ruleset = null)
+        {
+            if (beatmap != null || ruleset != null)
+            {
+                Schedule(() =>
+                {
+                    if (beatmap != null) Beatmap.Value = beatmap;
+                    if (ruleset != null) Ruleset.Value = ruleset;
+                });
+            }
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 4fbea4e3be..06d83e495c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -12,9 +12,11 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
 using osu.Framework.Threading;
+using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Screens.OnlinePlay.Match;
@@ -29,7 +31,7 @@ using ParticipantsList = osu.Game.Screens.OnlinePlay.Multiplayer.Participants.Pa
 namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
     [Cached]
-    public class MultiplayerMatchSubScreen : RoomSubScreen
+    public class MultiplayerMatchSubScreen : RoomSubScreen, IHandlePresentBeatmap
     {
         public override string Title { get; }
 
@@ -394,5 +396,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             modSettingChangeTracker?.Dispose();
         }
+
+        public void PresentBeatmap(WorkingBeatmap beatmap, RulesetInfo ruleset)
+        {
+            if (!this.IsCurrentScreen())
+                return;
+
+            this.Push(new MultiplayerMatchSongSelect(beatmap, ruleset));
+        }
     }
 }

From fcea900a5327cc3d421c7332ed001026f6521388 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Mar 2021 14:06:39 +0900
Subject: [PATCH 1743/3722] Move main menu (song select) presentation logic to
 a local implementation

Reduces cross-dependencies between OsuGame and MainMenu.
---
 osu.Game/OsuGame.cs               |  4 ----
 osu.Game/Screens/Menu/MainMenu.cs | 18 +++++++++++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 1e0cb587e9..6f760a1aa7 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -361,10 +361,6 @@ namespace osu.Game
 
             PerformFromScreen(screen =>
             {
-                // we might already be at song select, so a check is required before performing the load to solo.
-                if (screen is MainMenu)
-                    menuScreen.LoadToSolo();
-
                 // we might even already be at the song
                 if (Beatmap.Value.BeatmapSetInfo.Hash == databasedSet.Hash && (difficultyCriteria?.Invoke(Beatmap.Value.BeatmapInfo) ?? true))
                     return;
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 424e6d2cd5..baeb86c976 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -9,12 +9,14 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Platform;
 using osu.Framework.Screens;
+using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.IO;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
+using osu.Game.Rulesets;
 using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.OnlinePlay.Multiplayer;
@@ -23,7 +25,7 @@ using osu.Game.Screens.Select;
 
 namespace osu.Game.Screens.Menu
 {
-    public class MainMenu : OsuScreen
+    public class MainMenu : OsuScreen, IHandlePresentBeatmap
     {
         public const float FADE_IN_DURATION = 300;
 
@@ -104,7 +106,7 @@ namespace osu.Game.Screens.Menu
                                 Beatmap.SetDefault();
                                 this.Push(new Editor());
                             },
-                            OnSolo = onSolo,
+                            OnSolo = loadSoloSongSelect,
                             OnMultiplayer = () => this.Push(new Multiplayer()),
                             OnPlaylists = () => this.Push(new Playlists()),
                             OnExit = confirmAndExit,
@@ -160,9 +162,7 @@ namespace osu.Game.Screens.Menu
                 LoadComponentAsync(songSelect = new PlaySongSelect());
         }
 
-        public void LoadToSolo() => Schedule(onSolo);
-
-        private void onSolo() => this.Push(consumeSongSelect());
+        private void loadSoloSongSelect() => this.Push(consumeSongSelect());
 
         private Screen consumeSongSelect()
         {
@@ -289,5 +289,13 @@ namespace osu.Game.Screens.Menu
             this.FadeOut(3000);
             return base.OnExiting(next);
         }
+
+        public void PresentBeatmap(WorkingBeatmap beatmap, RulesetInfo ruleset)
+        {
+            Beatmap.Value = beatmap;
+            Ruleset.Value = ruleset;
+
+            Schedule(loadSoloSongSelect);
+        }
     }
 }

From 7c5904008247a113525396f9c4e1603ef470a464 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Mar 2021 14:17:06 +0900
Subject: [PATCH 1744/3722] Re-present even when already the current beatmap

This feels better and closer to what a user would expect.
---
 osu.Game/OsuGame.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 6f760a1aa7..7db85d0d66 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -361,10 +361,6 @@ namespace osu.Game
 
             PerformFromScreen(screen =>
             {
-                // we might even already be at the song
-                if (Beatmap.Value.BeatmapSetInfo.Hash == databasedSet.Hash && (difficultyCriteria?.Invoke(Beatmap.Value.BeatmapInfo) ?? true))
-                    return;
-
                 // Find beatmaps that match our predicate.
                 var beatmaps = databasedSet.Beatmaps.Where(b => difficultyCriteria?.Invoke(b) ?? true).ToList();
 

From 7dce9b04fa0a7870d7576c803c8130a095124484 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Mar 2021 14:50:45 +0900
Subject: [PATCH 1745/3722] Add a more basic ConfirmDialog implementation

---
 osu.Game/Overlays/Dialog/ConfirmDialog.cs  | 45 ++++++++++++++++++++++
 osu.Game/Screens/Menu/ConfirmExitDialog.cs | 26 +++----------
 2 files changed, 50 insertions(+), 21 deletions(-)
 create mode 100644 osu.Game/Overlays/Dialog/ConfirmDialog.cs

diff --git a/osu.Game/Overlays/Dialog/ConfirmDialog.cs b/osu.Game/Overlays/Dialog/ConfirmDialog.cs
new file mode 100644
index 0000000000..6f160daf97
--- /dev/null
+++ b/osu.Game/Overlays/Dialog/ConfirmDialog.cs
@@ -0,0 +1,45 @@
+// Copyright (c) ppy 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;
+
+namespace osu.Game.Overlays.Dialog
+{
+    /// <summary>
+    /// A dialog which confirms a user action.
+    /// </summary>
+    public class ConfirmDialog : PopupDialog
+    {
+        protected PopupDialogOkButton ButtonConfirm;
+        protected PopupDialogCancelButton ButtonCancel;
+
+        /// <summary>
+        /// Construct a new dialog.
+        /// </summary>
+        /// <param name="description">The description of the action to be displayed to the user.</param>
+        /// <param name="onConfirm">An action to perform on confirmation.</param>
+        /// <param name="onCancel">An optional action to perform on cancel.</param>
+        public ConfirmDialog(string description, Action onConfirm, Action onCancel = null)
+        {
+            HeaderText = $"Are you sure you want to {description}?";
+            BodyText = "Last chance to back out.";
+
+            Icon = FontAwesome.Solid.ExclamationTriangle;
+
+            Buttons = new PopupDialogButton[]
+            {
+                ButtonConfirm = new PopupDialogOkButton
+                {
+                    Text = @"Yes",
+                    Action = onConfirm
+                },
+                ButtonCancel = new PopupDialogCancelButton
+                {
+                    Text = @"Cancel",
+                    Action = onCancel
+                },
+            };
+        }
+    }
+}
diff --git a/osu.Game/Screens/Menu/ConfirmExitDialog.cs b/osu.Game/Screens/Menu/ConfirmExitDialog.cs
index d120eb21a8..41cc7b480c 100644
--- a/osu.Game/Screens/Menu/ConfirmExitDialog.cs
+++ b/osu.Game/Screens/Menu/ConfirmExitDialog.cs
@@ -2,33 +2,17 @@
 // 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.Menu
 {
-    public class ConfirmExitDialog : PopupDialog
+    public class ConfirmExitDialog : ConfirmDialog
     {
-        public ConfirmExitDialog(Action confirm, Action cancel)
+        public ConfirmExitDialog(Action confirm, Action onCancel = null)
+            : base("exit osu!", confirm, onCancel)
         {
-            HeaderText = "Are you sure you want to exit?";
-            BodyText = "Last chance to back out.";
-
-            Icon = FontAwesome.Solid.ExclamationTriangle;
-
-            Buttons = new PopupDialogButton[]
-            {
-                new PopupDialogOkButton
-                {
-                    Text = @"Goodbye",
-                    Action = confirm
-                },
-                new PopupDialogCancelButton
-                {
-                    Text = @"Just a little more",
-                    Action = cancel
-                },
-            };
+            ButtonConfirm.Text = "Let me out!";
+            ButtonCancel.Text = "Just a little more...";
         }
     }
 }

From d332fd2414c131a363437e1c71fb27047eaa48c1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Mar 2021 14:53:47 +0900
Subject: [PATCH 1746/3722] Handle case where local user tries to change
 beatmap while not the host

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 06d83e495c..e09e1fc3d4 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -402,6 +402,14 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             if (!this.IsCurrentScreen())
                 return;
 
+            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;
+            }
+
             this.Push(new MultiplayerMatchSongSelect(beatmap, ruleset));
         }
     }

From cb4c3503a01da92d0a68222702fa3b958da05fe1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Mar 2021 14:50:54 +0900
Subject: [PATCH 1747/3722] Confirm exiting a multiplayer match

---
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 4fbea4e3be..51445b0668 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -15,6 +15,8 @@ using osu.Framework.Threading;
 using osu.Game.Configuration;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Dialog;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Screens.OnlinePlay.Match;
@@ -279,14 +281,36 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             Mods.Value = client.LocalUser.Mods.Select(m => m.ToMod(ruleset)).Concat(SelectedItem.Value.RequiredMods).ToList();
         }
 
+        [Resolved]
+        private DialogOverlay dialogOverlay { get; set; }
+
+        private bool exitConfirmed;
+
         public override bool OnBackButton()
         {
-            if (client.Room != null && settingsOverlay.State.Value == Visibility.Visible)
+            if (client.Room == null)
+            {
+                // room has not been created yet; exit immediately.
+                return base.OnBackButton();
+            }
+
+            if (settingsOverlay.State.Value == Visibility.Visible)
             {
                 settingsOverlay.Hide();
                 return true;
             }
 
+            if (!exitConfirmed)
+            {
+                dialogOverlay.Push(new ConfirmDialog("leave this multiplayer match", () =>
+                {
+                    exitConfirmed = true;
+                    this.Exit();
+                }));
+
+                return true;
+            }
+
             return base.OnBackButton();
         }
 

From 0ede28da2f0f79b11cf2355cda4264f4d686ad12 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Mar 2021 15:24:55 +0900
Subject: [PATCH 1748/3722] Fix test failures due to missing dependency

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

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 51445b0668..f1d8bf97fd 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -281,7 +281,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             Mods.Value = client.LocalUser.Mods.Select(m => m.ToMod(ruleset)).Concat(SelectedItem.Value.RequiredMods).ToList();
         }
 
-        [Resolved]
+        [Resolved(canBeNull: true)]
         private DialogOverlay dialogOverlay { get; set; }
 
         private bool exitConfirmed;
@@ -300,7 +300,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 return true;
             }
 
-            if (!exitConfirmed)
+            if (!exitConfirmed && dialogOverlay != null)
             {
                 dialogOverlay.Push(new ConfirmDialog("leave this multiplayer match", () =>
                 {

From 002646370ccd589f94bf1d6947982961393003e6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Mar 2021 16:47:42 +0900
Subject: [PATCH 1749/3722] Move bindable logic in MouseSettings to
 LoadComplete

---
 .../Settings/Sections/Input/MouseSettings.cs  | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
index 768a18cca0..7599a748ab 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
@@ -17,7 +17,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         protected override string Header => "Mouse";
 
         private readonly BindableBool rawInputToggle = new BindableBool();
-        private Bindable<double> sensitivityBindable = new BindableDouble();
+
+        private Bindable<double> configSensitivity;
+
+        private Bindable<double> localSensitivity = new BindableDouble();
+
         private Bindable<string> ignoredInputHandlers;
 
         private Bindable<WindowMode> windowMode;
@@ -26,12 +30,12 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager osuConfig, FrameworkConfigManager config)
         {
-            var configSensitivity = config.GetBindable<double>(FrameworkSetting.CursorSensitivity);
-
             // use local bindable to avoid changing enabled state of game host's bindable.
-            sensitivityBindable = configSensitivity.GetUnboundCopy();
-            configSensitivity.BindValueChanged(val => sensitivityBindable.Value = val.NewValue);
-            sensitivityBindable.BindValueChanged(val => configSensitivity.Value = val.NewValue);
+            configSensitivity = config.GetBindable<double>(FrameworkSetting.CursorSensitivity);
+            localSensitivity = configSensitivity.GetUnboundCopy();
+
+            windowMode = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
+            ignoredInputHandlers = config.GetBindable<string>(FrameworkSetting.IgnoredInputHandlers);
 
             Children = new Drawable[]
             {
@@ -43,7 +47,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 new SensitivitySetting
                 {
                     LabelText = "Cursor sensitivity",
-                    Current = sensitivityBindable
+                    Current = localSensitivity
                 },
                 new SettingsCheckbox
                 {
@@ -66,8 +70,15 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                     Current = osuConfig.GetBindable<bool>(OsuSetting.MouseDisableButtons)
                 },
             };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            configSensitivity.BindValueChanged(val => localSensitivity.Value = val.NewValue, true);
+            localSensitivity.BindValueChanged(val => configSensitivity.Value = val.NewValue);
 
-            windowMode = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
             windowMode.BindValueChanged(mode =>
             {
                 var isFullscreen = mode.NewValue == WindowMode.Fullscreen;
@@ -87,7 +98,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             if (RuntimeInfo.OS != RuntimeInfo.Platform.Windows)
             {
                 rawInputToggle.Disabled = true;
-                sensitivityBindable.Disabled = true;
+                localSensitivity.Disabled = true;
             }
             else
             {
@@ -100,12 +111,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                     ignoredInputHandlers.Value = enabled.NewValue ? standard_mouse_handlers : raw_mouse_handler;
                 };
 
-                ignoredInputHandlers = config.GetBindable<string>(FrameworkSetting.IgnoredInputHandlers);
                 ignoredInputHandlers.ValueChanged += handler =>
                 {
                     bool raw = !handler.NewValue.Contains("Raw");
                     rawInputToggle.Value = raw;
-                    sensitivityBindable.Disabled = !raw;
+                    localSensitivity.Disabled = !raw;
                 };
 
                 ignoredInputHandlers.TriggerChange();

From 012b48dbe51e972b291f37f88dfe0788cd9adb84 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Mar 2021 19:03:44 +0900
Subject: [PATCH 1750/3722] Remove explicit public definition

Interface members are public by default.
---
 osu.Game/Screens/IHandlePresentBeatmap.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/IHandlePresentBeatmap.cs b/osu.Game/Screens/IHandlePresentBeatmap.cs
index b94df630ef..60801fb3eb 100644
--- a/osu.Game/Screens/IHandlePresentBeatmap.cs
+++ b/osu.Game/Screens/IHandlePresentBeatmap.cs
@@ -18,6 +18,6 @@ namespace osu.Game.Screens
         /// </summary>
         /// <param name="beatmap">The beatmap to be selected.</param>
         /// <param name="ruleset">The ruleset to be selected.</param>
-        public void PresentBeatmap(WorkingBeatmap beatmap, RulesetInfo ruleset);
+        void PresentBeatmap(WorkingBeatmap beatmap, RulesetInfo ruleset);
     }
 }

From 6affe33fb275acb9d3feee55d08433f88fb1e25a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Mar 2021 19:40:19 +0900
Subject: [PATCH 1751/3722] Fix another test scene

---
 .../TestSceneMultiplayerRoomManager.cs        | 46 +++++++++++++------
 .../Multiplayer/TestMultiplayerClient.cs      | 14 ++++--
 .../TestMultiplayerRoomContainer.cs           | 10 ++--
 .../Multiplayer/TestMultiplayerRoomManager.cs |  8 ++--
 4 files changed, 52 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
index 6de5704410..91c15de69f 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.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;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Game.Online.Rooms;
+using osu.Game.Screens.OnlinePlay.Components;
+using osu.Game.Tests.Beatmaps;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
@@ -21,15 +24,15 @@ namespace osu.Game.Tests.Visual.Multiplayer
             {
                 createRoomManager().With(d => d.OnLoadComplete += _ =>
                 {
-                    roomManager.CreateRoom(new Room { Name = { Value = "1" } });
+                    roomManager.CreateRoom(createRoom(r => r.Name.Value = "1"));
                     roomManager.PartRoom();
-                    roomManager.CreateRoom(new Room { Name = { Value = "2" } });
+                    roomManager.CreateRoom(createRoom(r => r.Name.Value = "2"));
                     roomManager.PartRoom();
                     roomManager.ClearRooms();
                 });
             });
 
-            AddAssert("manager polled for rooms", () => roomManager.Rooms.Count == 2);
+            AddAssert("manager polled for rooms", () => ((RoomManager)roomManager).Rooms.Count == 2);
             AddAssert("initial rooms received", () => roomManager.InitialRoomsReceived.Value);
         }
 
@@ -40,16 +43,16 @@ namespace osu.Game.Tests.Visual.Multiplayer
             {
                 createRoomManager().With(d => d.OnLoadComplete += _ =>
                 {
-                    roomManager.CreateRoom(new Room());
+                    roomManager.CreateRoom(createRoom());
                     roomManager.PartRoom();
-                    roomManager.CreateRoom(new Room());
+                    roomManager.CreateRoom(createRoom());
                     roomManager.PartRoom();
                 });
             });
 
             AddStep("disconnect", () => roomContainer.Client.Disconnect());
 
-            AddAssert("rooms cleared", () => roomManager.Rooms.Count == 0);
+            AddAssert("rooms cleared", () => ((RoomManager)roomManager).Rooms.Count == 0);
             AddAssert("initial rooms not received", () => !roomManager.InitialRoomsReceived.Value);
         }
 
@@ -60,9 +63,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
             {
                 createRoomManager().With(d => d.OnLoadComplete += _ =>
                 {
-                    roomManager.CreateRoom(new Room());
+                    roomManager.CreateRoom(createRoom());
                     roomManager.PartRoom();
-                    roomManager.CreateRoom(new Room());
+                    roomManager.CreateRoom(createRoom());
                     roomManager.PartRoom();
                 });
             });
@@ -70,7 +73,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddStep("disconnect", () => roomContainer.Client.Disconnect());
             AddStep("connect", () => roomContainer.Client.Connect());
 
-            AddAssert("manager polled for rooms", () => roomManager.Rooms.Count == 2);
+            AddAssert("manager polled for rooms", () => ((RoomManager)roomManager).Rooms.Count == 2);
             AddAssert("initial rooms received", () => roomManager.InitialRoomsReceived.Value);
         }
 
@@ -81,12 +84,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
             {
                 createRoomManager().With(d => d.OnLoadComplete += _ =>
                 {
-                    roomManager.CreateRoom(new Room());
+                    roomManager.CreateRoom(createRoom());
                     roomManager.ClearRooms();
                 });
             });
 
-            AddAssert("manager not polled for rooms", () => roomManager.Rooms.Count == 0);
+            AddAssert("manager not polled for rooms", () => ((RoomManager)roomManager).Rooms.Count == 0);
             AddAssert("initial rooms not received", () => !roomManager.InitialRoomsReceived.Value);
         }
 
@@ -97,7 +100,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             {
                 createRoomManager().With(d => d.OnLoadComplete += _ =>
                 {
-                    roomManager.CreateRoom(new Room());
+                    roomManager.CreateRoom(createRoom());
                 });
             });
 
@@ -111,7 +114,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             {
                 createRoomManager().With(d => d.OnLoadComplete += _ =>
                 {
-                    roomManager.CreateRoom(new Room());
+                    roomManager.CreateRoom(createRoom());
                     roomManager.PartRoom();
                 });
             });
@@ -126,7 +129,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             {
                 createRoomManager().With(d => d.OnLoadComplete += _ =>
                 {
-                    var r = new Room();
+                    var r = createRoom();
                     roomManager.CreateRoom(r);
                     roomManager.PartRoom();
                     roomManager.JoinRoom(r);
@@ -136,6 +139,21 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddUntilStep("multiplayer room joined", () => roomContainer.Client.Room != null);
         }
 
+        private Room createRoom(Action<Room> initFunc = null)
+        {
+            var room = new Room();
+
+            room.Name.Value = "test room";
+            room.Playlist.Add(new PlaylistItem
+            {
+                Beatmap = { Value = new TestBeatmap(Ruleset.Value).BeatmapInfo },
+                Ruleset = { Value = Ruleset.Value }
+            });
+
+            initFunc?.Invoke(room);
+            return room;
+        }
+
         private TestMultiplayerRoomManager createRoomManager()
         {
             Child = roomContainer = new TestMultiplayerRoomContainer
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index 6a901fc45b..c03364a391 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -28,12 +28,16 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Resolved]
         private IAPIProvider api { get; set; } = null!;
 
-        [Resolved]
-        private Room apiRoom { get; set; } = null!;
-
         [Resolved]
         private BeatmapManager beatmaps { get; set; } = null!;
 
+        private readonly TestMultiplayerRoomManager roomManager;
+
+        public TestMultiplayerClient(TestMultiplayerRoomManager roomManager)
+        {
+            this.roomManager = roomManager;
+        }
+
         public void Connect() => isConnected.Value = true;
 
         public void Disconnect() => isConnected.Value = false;
@@ -98,7 +102,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         protected override Task<MultiplayerRoom> JoinRoom(long roomId)
         {
-            Debug.Assert(apiRoom != null);
+            var apiRoom = roomManager.Rooms.Single(r => r.RoomID.Value == roomId);
 
             var user = new MultiplayerRoomUser(api.LocalUser.Value.Id)
             {
@@ -178,8 +182,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
         protected override Task<BeatmapSetInfo> GetOnlineBeatmapSet(int beatmapId, CancellationToken cancellationToken = default)
         {
             Debug.Assert(Room != null);
-            Debug.Assert(apiRoom != null);
 
+            var apiRoom = roomManager.Rooms.Single(r => r.RoomID.Value == Room.RoomID);
             var set = apiRoom.Playlist.FirstOrDefault(p => p.BeatmapID == beatmapId)?.Beatmap.Value.BeatmapSet
                       ?? beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == beatmapId)?.BeatmapSet;
 
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs
index 860caef071..e57411d04d 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs
@@ -32,11 +32,15 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             RelativeSizeAxes = Axes.Both;
 
+            RoomManager = new TestMultiplayerRoomManager();
+            Client = new TestMultiplayerClient(RoomManager);
+            OngoingOperationTracker = new OngoingOperationTracker();
+
             AddRangeInternal(new Drawable[]
             {
-                Client = new TestMultiplayerClient(),
-                RoomManager = new TestMultiplayerRoomManager(),
-                OngoingOperationTracker = new OngoingOperationTracker(),
+                Client,
+                RoomManager,
+                OngoingOperationTracker,
                 content = new Container { RelativeSizeAxes = Axes.Both }
             });
         }
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs
index 022c297ccd..7e824c4d7c 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Cached]
         public readonly Bindable<FilterCriteria> Filter = new Bindable<FilterCriteria>(new FilterCriteria());
 
-        private readonly List<Room> rooms = new List<Room>();
+        public new readonly List<Room> Rooms = new List<Room>();
 
         protected override void LoadComplete()
         {
@@ -50,7 +50,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                         for (int i = 0; i < createdRoom.Playlist.Count; i++)
                             createdRoom.Playlist[i].ID = currentPlaylistItemId++;
 
-                        rooms.Add(createdRoom);
+                        Rooms.Add(createdRoom);
                         createRoomRequest.TriggerSuccess(createdRoom);
                         break;
 
@@ -65,7 +65,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     case GetRoomsRequest getRoomsRequest:
                         var roomsWithoutParticipants = new List<Room>();
 
-                        foreach (var r in rooms)
+                        foreach (var r in Rooms)
                         {
                             var newRoom = new Room();
 
@@ -79,7 +79,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                         break;
 
                     case GetRoomRequest getRoomRequest:
-                        getRoomRequest.TriggerSuccess(rooms.Single(r => r.RoomID.Value == getRoomRequest.RoomId));
+                        getRoomRequest.TriggerSuccess(Rooms.Single(r => r.RoomID.Value == getRoomRequest.RoomId));
                         break;
 
                     case GetBeatmapSetRequest getBeatmapSetRequest:

From 0f5bce70ad4eec310f54113341e747e552b2a4e4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Mar 2021 20:34:36 +0900
Subject: [PATCH 1752/3722] Split confirmation dialog classes apart

---
 osu.Game/Overlays/Dialog/ConfirmDialog.cs     | 17 +++++-----
 osu.Game/Screens/Menu/ConfirmExitDialog.cs    | 31 ++++++++++++++++---
 .../Multiplayer/MultiplayerMatchSubScreen.cs  |  2 +-
 3 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Overlays/Dialog/ConfirmDialog.cs b/osu.Game/Overlays/Dialog/ConfirmDialog.cs
index 6f160daf97..a87c06ffdf 100644
--- a/osu.Game/Overlays/Dialog/ConfirmDialog.cs
+++ b/osu.Game/Overlays/Dialog/ConfirmDialog.cs
@@ -11,30 +11,27 @@ namespace osu.Game.Overlays.Dialog
     /// </summary>
     public class ConfirmDialog : PopupDialog
     {
-        protected PopupDialogOkButton ButtonConfirm;
-        protected PopupDialogCancelButton ButtonCancel;
-
         /// <summary>
-        /// Construct a new dialog.
+        /// Construct a new confirmation dialog.
         /// </summary>
-        /// <param name="description">The description of the action to be displayed to the user.</param>
+        /// <param name="message">The description of the action to be displayed to the user.</param>
         /// <param name="onConfirm">An action to perform on confirmation.</param>
         /// <param name="onCancel">An optional action to perform on cancel.</param>
-        public ConfirmDialog(string description, Action onConfirm, Action onCancel = null)
+        public ConfirmDialog(string message, Action onConfirm, Action onCancel = null)
         {
-            HeaderText = $"Are you sure you want to {description}?";
-            BodyText = "Last chance to back out.";
+            HeaderText = message;
+            BodyText = "Last chance to turn back";
 
             Icon = FontAwesome.Solid.ExclamationTriangle;
 
             Buttons = new PopupDialogButton[]
             {
-                ButtonConfirm = new PopupDialogOkButton
+                new PopupDialogOkButton
                 {
                     Text = @"Yes",
                     Action = onConfirm
                 },
-                ButtonCancel = new PopupDialogCancelButton
+                new PopupDialogCancelButton
                 {
                     Text = @"Cancel",
                     Action = onCancel
diff --git a/osu.Game/Screens/Menu/ConfirmExitDialog.cs b/osu.Game/Screens/Menu/ConfirmExitDialog.cs
index 41cc7b480c..6488a2fd63 100644
--- a/osu.Game/Screens/Menu/ConfirmExitDialog.cs
+++ b/osu.Game/Screens/Menu/ConfirmExitDialog.cs
@@ -2,17 +2,38 @@
 // 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.Menu
 {
-    public class ConfirmExitDialog : ConfirmDialog
+    public class ConfirmExitDialog : PopupDialog
     {
-        public ConfirmExitDialog(Action confirm, Action onCancel = null)
-            : base("exit osu!", confirm, 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)
         {
-            ButtonConfirm.Text = "Let me out!";
-            ButtonCancel.Text = "Just a little more...";
+            HeaderText = "Are you sure you want to exit osu!?";
+            BodyText = "Last chance to turn back";
+
+            Icon = FontAwesome.Solid.ExclamationTriangle;
+
+            Buttons = new PopupDialogButton[]
+            {
+                new PopupDialogOkButton
+                {
+                    Text = @"Let me out!",
+                    Action = onConfirm
+                },
+                new PopupDialogCancelButton
+                {
+                    Text = @"Just a little more...",
+                    Action = onCancel
+                },
+            };
         }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index f1d8bf97fd..5a9a26d997 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -302,7 +302,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             if (!exitConfirmed && dialogOverlay != null)
             {
-                dialogOverlay.Push(new ConfirmDialog("leave this multiplayer match", () =>
+                dialogOverlay.Push(new ConfirmDialog("Are you sure you want to leave this multiplayer match?", () =>
                 {
                     exitConfirmed = true;
                     this.Exit();

From 534e16237a5e74dd448af1d37e72d580393e5ba3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 3 Mar 2021 20:36:41 +0900
Subject: [PATCH 1753/3722] Remove unnecessary intial construction of bindable

---
 osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
index 7599a748ab..c3deb385cd 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         private Bindable<double> configSensitivity;
 
-        private Bindable<double> localSensitivity = new BindableDouble();
+        private Bindable<double> localSensitivity;
 
         private Bindable<string> ignoredInputHandlers;
 

From 1ecb1d122a55500204eaea01d2321a1a9c71c707 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Mar 2021 21:54:34 +0900
Subject: [PATCH 1754/3722] Fix up TestSceneMultiplayer

---
 .../Multiplayer/TestSceneMultiplayer.cs       | 36 ++++++-------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
index 2e39471dc0..bb5db5b803 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.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.
 
-using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.OnlinePlay.Components;
-using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneMultiplayer : MultiplayerTestScene
+    public class TestSceneMultiplayer : ScreenTestScene
     {
         public TestSceneMultiplayer()
         {
@@ -17,30 +17,16 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddUntilStep("wait for loaded", () => multi.IsLoaded);
         }
 
-        [Test]
-        public void TestOneUserJoinedMultipleTimes()
-        {
-            var user = new User { Id = 33 };
-
-            AddRepeatStep("add user multiple times", () => Client.AddUser(user), 3);
-
-            AddAssert("room has 2 users", () => Client.Room?.Users.Count == 2);
-        }
-
-        [Test]
-        public void TestOneUserLeftMultipleTimes()
-        {
-            var user = new User { Id = 44 };
-
-            AddStep("add user", () => Client.AddUser(user));
-            AddAssert("room has 2 users", () => Client.Room?.Users.Count == 2);
-
-            AddRepeatStep("remove user multiple times", () => Client.RemoveUser(user), 3);
-            AddAssert("room has 1 user", () => Client.Room?.Users.Count == 1);
-        }
-
         private class TestMultiplayer : Screens.OnlinePlay.Multiplayer.Multiplayer
         {
+            [Cached(typeof(StatefulMultiplayerClient))]
+            public readonly TestMultiplayerClient Client;
+
+            public TestMultiplayer()
+            {
+                AddInternal(Client = new TestMultiplayerClient((TestMultiplayerRoomManager)RoomManager));
+            }
+
             protected override RoomManager CreateRoomManager() => new TestMultiplayerRoomManager();
         }
     }

From 0f83b66cdabb1aad42d7f9d1c205b38089d7b2c2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Mar 2021 22:01:03 +0900
Subject: [PATCH 1755/3722] Add separate test for stateful multiplayer client

---
 .../StatefulMultiplayerClientTest.cs          | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 osu.Game.Tests/OnlinePlay/StatefulMultiplayerClientTest.cs

diff --git a/osu.Game.Tests/OnlinePlay/StatefulMultiplayerClientTest.cs b/osu.Game.Tests/OnlinePlay/StatefulMultiplayerClientTest.cs
new file mode 100644
index 0000000000..82ce588c6f
--- /dev/null
+++ b/osu.Game.Tests/OnlinePlay/StatefulMultiplayerClientTest.cs
@@ -0,0 +1,35 @@
+// Copyright (c) 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.Testing;
+using osu.Game.Tests.Visual.Multiplayer;
+using osu.Game.Users;
+
+namespace osu.Game.Tests.OnlinePlay
+{
+    [HeadlessTest]
+    public class StatefulMultiplayerClientTest : MultiplayerTestScene
+    {
+        [Test]
+        public void TestUserAddedOnJoin()
+        {
+            var user = new User { Id = 33 };
+
+            AddRepeatStep("add user multiple times", () => Client.AddUser(user), 3);
+            AddAssert("room has 2 users", () => Client.Room?.Users.Count == 2);
+        }
+
+        [Test]
+        public void TestUserRemovedOnLeave()
+        {
+            var user = new User { Id = 44 };
+
+            AddStep("add user", () => Client.AddUser(user));
+            AddAssert("room has 2 users", () => Client.Room?.Users.Count == 2);
+
+            AddRepeatStep("remove user multiple times", () => Client.RemoveUser(user), 3);
+            AddAssert("room has 1 user", () => Client.Room?.Users.Count == 1);
+        }
+    }
+}

From 77607c06eba37de48cb0670a4e7e09d9a9c8e4ae Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 3 Mar 2021 22:07:39 +0900
Subject: [PATCH 1756/3722] Fix not being able to enter gameplay in
 TestSceneMultiplayer

---
 .../Visual/Multiplayer/TestSceneMultiplayer.cs  | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
index bb5db5b803..78bc51e47b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
@@ -9,12 +9,21 @@ namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneMultiplayer : ScreenTestScene
     {
+        private TestMultiplayer multiplayerScreen;
+
         public TestSceneMultiplayer()
         {
-            var multi = new TestMultiplayer();
+            AddStep("show", () =>
+            {
+                multiplayerScreen = new TestMultiplayer();
 
-            AddStep("show", () => LoadScreen(multi));
-            AddUntilStep("wait for loaded", () => multi.IsLoaded);
+                // Needs to be added at a higher level since the multiplayer screen becomes non-current.
+                Child = multiplayerScreen.Client;
+
+                LoadScreen(multiplayerScreen);
+            });
+
+            AddUntilStep("wait for loaded", () => multiplayerScreen.IsLoaded);
         }
 
         private class TestMultiplayer : Screens.OnlinePlay.Multiplayer.Multiplayer
@@ -24,7 +33,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             public TestMultiplayer()
             {
-                AddInternal(Client = new TestMultiplayerClient((TestMultiplayerRoomManager)RoomManager));
+                Client = new TestMultiplayerClient((TestMultiplayerRoomManager)RoomManager);
             }
 
             protected override RoomManager CreateRoomManager() => new TestMultiplayerRoomManager();

From f9148eec206b1126ed0af01f24610d2eca2ab00d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 3 Mar 2021 21:33:41 +0100
Subject: [PATCH 1757/3722] Refactor filter query parsing helper methods

In preparation for exposition as public.
---
 .../Filtering/FilterQueryParserTest.cs        | 11 +++
 osu.Game/Screens/Select/FilterQueryParser.cs  | 75 ++++++++++++-------
 2 files changed, 59 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
index d835e58b29..49389e67aa 100644
--- a/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
+++ b/osu.Game.Tests/NonVisual/Filtering/FilterQueryParserTest.cs
@@ -215,6 +215,17 @@ namespace osu.Game.Tests.NonVisual.Filtering
             Assert.AreEqual("unrecognised=keyword", filterCriteria.SearchText);
         }
 
+        [TestCase("cs=nope")]
+        [TestCase("bpm>=bad")]
+        [TestCase("divisor<nah")]
+        [TestCase("status=noidea")]
+        public void TestInvalidKeywordValueIsIgnored(string query)
+        {
+            var filterCriteria = new FilterCriteria();
+            FilterQueryParser.ApplyQueries(filterCriteria, query);
+            Assert.AreEqual(query, filterCriteria.SearchText);
+        }
+
         [Test]
         public void TestCustomKeywordIsParsed()
         {
diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index c81a72d938..ce937d07b1 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -34,37 +34,37 @@ namespace osu.Game.Screens.Select
         {
             switch (key)
             {
-                case "stars" when parseFloatWithPoint(value, out var stars):
-                    return updateCriteriaRange(ref criteria.StarDifficulty, op, stars, 0.01f / 2);
+                case "stars":
+                    return tryUpdateCriteriaRange(ref criteria.StarDifficulty, op, value, 0.01d / 2);
 
-                case "ar" when parseFloatWithPoint(value, out var ar):
-                    return updateCriteriaRange(ref criteria.ApproachRate, op, ar, 0.1f / 2);
+                case "ar":
+                    return tryUpdateCriteriaRange(ref criteria.ApproachRate, op, value);
 
-                case "dr" when parseFloatWithPoint(value, out var dr):
-                case "hp" when parseFloatWithPoint(value, out dr):
-                    return updateCriteriaRange(ref criteria.DrainRate, op, dr, 0.1f / 2);
+                case "dr":
+                case "hp":
+                    return tryUpdateCriteriaRange(ref criteria.DrainRate, op, value);
 
-                case "cs" when parseFloatWithPoint(value, out var cs):
-                    return updateCriteriaRange(ref criteria.CircleSize, op, cs, 0.1f / 2);
+                case "cs":
+                    return tryUpdateCriteriaRange(ref criteria.CircleSize, op, value);
 
-                case "bpm" when parseDoubleWithPoint(value, out var bpm):
-                    return updateCriteriaRange(ref criteria.BPM, op, bpm, 0.01d / 2);
+                case "bpm":
+                    return tryUpdateCriteriaRange(ref criteria.BPM, op, value, 0.01d / 2);
 
-                case "length" when parseDoubleWithPoint(value.TrimEnd('m', 's', 'h'), out var length):
-                    var scale = getLengthScale(value);
-                    return updateCriteriaRange(ref criteria.Length, op, length * scale, scale / 2.0);
+                case "length":
+                    return tryUpdateLengthRange(criteria, op, value);
 
-                case "divisor" when parseInt(value, out var divisor):
-                    return updateCriteriaRange(ref criteria.BeatDivisor, op, divisor);
+                case "divisor":
+                    return tryUpdateCriteriaRange(ref criteria.BeatDivisor, op, value, tryParseInt);
 
-                case "status" when Enum.TryParse<BeatmapSetOnlineStatus>(value, true, out var statusValue):
-                    return updateCriteriaRange(ref criteria.OnlineStatus, op, statusValue);
+                case "status":
+                    return tryUpdateCriteriaRange(ref criteria.OnlineStatus, op, value,
+                        (string s, out BeatmapSetOnlineStatus val) => Enum.TryParse(value, true, out val));
 
                 case "creator":
-                    return updateCriteriaText(ref criteria.Creator, op, value);
+                    return tryUpdateCriteriaText(ref criteria.Creator, op, value);
 
                 case "artist":
-                    return updateCriteriaText(ref criteria.Artist, op, value);
+                    return tryUpdateCriteriaText(ref criteria.Artist, op, value);
 
                 default:
                     return criteria.RulesetCriteria?.TryParseCustomKeywordCriteria(key, op, value) ?? false;
@@ -104,16 +104,16 @@ namespace osu.Game.Screens.Select
             value.EndsWith('m') ? 60000 :
             value.EndsWith('h') ? 3600000 : 1000;
 
-        private static bool parseFloatWithPoint(string value, out float result) =>
+        private static bool tryParseFloatWithPoint(string value, out float result) =>
             float.TryParse(value, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out result);
 
-        private static bool parseDoubleWithPoint(string value, out double result) =>
+        private static bool tryParseDoubleWithPoint(string value, out double result) =>
             double.TryParse(value, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out result);
 
-        private static bool parseInt(string value, out int result) =>
+        private static bool tryParseInt(string value, out int result) =>
             int.TryParse(value, NumberStyles.None, CultureInfo.InvariantCulture, out result);
 
-        private static bool updateCriteriaText(ref FilterCriteria.OptionalTextFilter textFilter, Operator op, string value)
+        private static bool tryUpdateCriteriaText(ref FilterCriteria.OptionalTextFilter textFilter, Operator op, string value)
         {
             switch (op)
             {
@@ -126,7 +126,10 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        private static bool updateCriteriaRange(ref FilterCriteria.OptionalRange<float> range, Operator op, float value, float tolerance = 0.05f)
+        private static bool tryUpdateCriteriaRange(ref FilterCriteria.OptionalRange<float> range, Operator op, string val, float tolerance = 0.05f)
+            => tryParseFloatWithPoint(val, out float value) && tryUpdateCriteriaRange(ref range, op, value, tolerance);
+
+        private static bool tryUpdateCriteriaRange(ref FilterCriteria.OptionalRange<float> range, Operator op, float value, float tolerance = 0.05f)
         {
             switch (op)
             {
@@ -158,7 +161,10 @@ namespace osu.Game.Screens.Select
             return true;
         }
 
-        private static bool updateCriteriaRange(ref FilterCriteria.OptionalRange<double> range, Operator op, double value, double tolerance = 0.05)
+        private static bool tryUpdateCriteriaRange(ref FilterCriteria.OptionalRange<double> range, Operator op, string val, double tolerance = 0.05)
+            => tryParseDoubleWithPoint(val, out double value) && tryUpdateCriteriaRange(ref range, op, value, tolerance);
+
+        private static bool tryUpdateCriteriaRange(ref FilterCriteria.OptionalRange<double> range, Operator op, double value, double tolerance = 0.05)
         {
             switch (op)
             {
@@ -190,7 +196,13 @@ namespace osu.Game.Screens.Select
             return true;
         }
 
-        private static bool updateCriteriaRange<T>(ref FilterCriteria.OptionalRange<T> range, Operator op, T value)
+        private delegate bool TryParseFunction<T>(string val, out T value);
+
+        private static bool tryUpdateCriteriaRange<T>(ref FilterCriteria.OptionalRange<T> range, Operator op, string value, TryParseFunction<T> conversionFunc)
+            where T : struct
+            => conversionFunc.Invoke(value, out var converted) && tryUpdateCriteriaRange(ref range, op, converted);
+
+        private static bool tryUpdateCriteriaRange<T>(ref FilterCriteria.OptionalRange<T> range, Operator op, T value)
             where T : struct
         {
             switch (op)
@@ -227,5 +239,14 @@ namespace osu.Game.Screens.Select
 
             return true;
         }
+
+        private static bool tryUpdateLengthRange(FilterCriteria criteria, Operator op, string val)
+        {
+            if (!tryParseDoubleWithPoint(val.TrimEnd('m', 's', 'h'), out var length))
+                return false;
+
+            var scale = getLengthScale(val);
+            return tryUpdateCriteriaRange(ref criteria.Length, op, length * scale, scale / 2.0);
+        }
     }
 }

From f733d1ec1fcf08a147d24aeab20d3e8187936c71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 3 Mar 2021 21:58:34 +0100
Subject: [PATCH 1758/3722] Expose and document query parser and helpers

---
 .../Rulesets/Filter/IRulesetFilterCriteria.cs | 11 +++
 osu.Game/Screens/Select/FilterQueryParser.cs  | 89 +++++++++++++++----
 2 files changed, 84 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Rulesets/Filter/IRulesetFilterCriteria.cs b/osu.Game/Rulesets/Filter/IRulesetFilterCriteria.cs
index a83f87d72b..13cc41f8e0 100644
--- a/osu.Game/Rulesets/Filter/IRulesetFilterCriteria.cs
+++ b/osu.Game/Rulesets/Filter/IRulesetFilterCriteria.cs
@@ -31,6 +31,17 @@ namespace osu.Game.Rulesets.Filter
         /// {key}{op}{value}
         /// </code>
         /// </summary>
+        /// <remarks>
+        /// <para>
+        /// For adding optional string criteria, <see cref="FilterCriteria.OptionalTextFilter"/> can be used for matching,
+        /// along with <see cref="FilterQueryParser.TryUpdateCriteriaText"/> for parsing.
+        /// </para>
+        /// <para>
+        /// For adding numerical-type range criteria, <see cref="FilterCriteria.OptionalRange{T}"/> can be used for matching,
+        /// along with <see cref="FilterQueryParser.TryUpdateCriteriaRange{T}(ref osu.Game.Screens.Select.FilterCriteria.OptionalRange{T},osu.Game.Screens.Select.Filter.Operator,string,FilterQueryParser.TryParseFunction{T})"/>
+        /// and <see cref="float"/>- and <see cref="double"/>-typed overloads for parsing.
+        /// </para>
+        /// </remarks>
         /// <param name="key">The key (name) of the criterion.</param>
         /// <param name="op">The operator in the criterion.</param>
         /// <param name="value">The value of the criterion.</param>
diff --git a/osu.Game/Screens/Select/FilterQueryParser.cs b/osu.Game/Screens/Select/FilterQueryParser.cs
index ce937d07b1..ea7f233bea 100644
--- a/osu.Game/Screens/Select/FilterQueryParser.cs
+++ b/osu.Game/Screens/Select/FilterQueryParser.cs
@@ -9,7 +9,10 @@ using osu.Game.Screens.Select.Filter;
 
 namespace osu.Game.Screens.Select
 {
-    internal static class FilterQueryParser
+    /// <summary>
+    /// Utility class used for parsing song select filter queries entered via the search box.
+    /// </summary>
+    public static class FilterQueryParser
     {
         private static readonly Regex query_syntax_regex = new Regex(
             @"\b(?<key>\w+)(?<op>(:|=|(>|<)(:|=)?))(?<value>("".*"")|(\S*))",
@@ -35,36 +38,36 @@ namespace osu.Game.Screens.Select
             switch (key)
             {
                 case "stars":
-                    return tryUpdateCriteriaRange(ref criteria.StarDifficulty, op, value, 0.01d / 2);
+                    return TryUpdateCriteriaRange(ref criteria.StarDifficulty, op, value, 0.01d / 2);
 
                 case "ar":
-                    return tryUpdateCriteriaRange(ref criteria.ApproachRate, op, value);
+                    return TryUpdateCriteriaRange(ref criteria.ApproachRate, op, value);
 
                 case "dr":
                 case "hp":
-                    return tryUpdateCriteriaRange(ref criteria.DrainRate, op, value);
+                    return TryUpdateCriteriaRange(ref criteria.DrainRate, op, value);
 
                 case "cs":
-                    return tryUpdateCriteriaRange(ref criteria.CircleSize, op, value);
+                    return TryUpdateCriteriaRange(ref criteria.CircleSize, op, value);
 
                 case "bpm":
-                    return tryUpdateCriteriaRange(ref criteria.BPM, op, value, 0.01d / 2);
+                    return TryUpdateCriteriaRange(ref criteria.BPM, op, value, 0.01d / 2);
 
                 case "length":
                     return tryUpdateLengthRange(criteria, op, value);
 
                 case "divisor":
-                    return tryUpdateCriteriaRange(ref criteria.BeatDivisor, op, value, tryParseInt);
+                    return TryUpdateCriteriaRange(ref criteria.BeatDivisor, op, value, tryParseInt);
 
                 case "status":
-                    return tryUpdateCriteriaRange(ref criteria.OnlineStatus, op, value,
+                    return TryUpdateCriteriaRange(ref criteria.OnlineStatus, op, value,
                         (string s, out BeatmapSetOnlineStatus val) => Enum.TryParse(value, true, out val));
 
                 case "creator":
-                    return tryUpdateCriteriaText(ref criteria.Creator, op, value);
+                    return TryUpdateCriteriaText(ref criteria.Creator, op, value);
 
                 case "artist":
-                    return tryUpdateCriteriaText(ref criteria.Artist, op, value);
+                    return TryUpdateCriteriaText(ref criteria.Artist, op, value);
 
                 default:
                     return criteria.RulesetCriteria?.TryParseCustomKeywordCriteria(key, op, value) ?? false;
@@ -113,7 +116,18 @@ namespace osu.Game.Screens.Select
         private static bool tryParseInt(string value, out int result) =>
             int.TryParse(value, NumberStyles.None, CultureInfo.InvariantCulture, out result);
 
-        private static bool tryUpdateCriteriaText(ref FilterCriteria.OptionalTextFilter textFilter, Operator op, string value)
+        /// <summary>
+        /// Attempts to parse a keyword filter with the specified <paramref name="op"/> and textual <paramref name="value"/>.
+        /// If the value indicates a valid textual filter, the function returns <c>true</c> and the resulting data is stored into
+        /// <paramref name="textFilter"/>.
+        /// </summary>
+        /// <param name="textFilter">The <see cref="FilterCriteria.OptionalTextFilter"/> to store the parsed data into, if successful.</param>
+        /// <param name="op">
+        /// The operator for the keyword filter.
+        /// Only <see cref="Operator.Equal"/> is valid for textual filters.
+        /// </param>
+        /// <param name="value">The value of the keyword filter.</param>
+        public static bool TryUpdateCriteriaText(ref FilterCriteria.OptionalTextFilter textFilter, Operator op, string value)
         {
             switch (op)
             {
@@ -126,7 +140,20 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        private static bool tryUpdateCriteriaRange(ref FilterCriteria.OptionalRange<float> range, Operator op, string val, float tolerance = 0.05f)
+        /// <summary>
+        /// Attempts to parse a keyword filter of type <see cref="float"/>
+        /// from the specified <paramref name="op"/> and <paramref name="val"/>.
+        /// If <paramref name="val"/> can be parsed as a <see cref="float"/>, the function returns <c>true</c>
+        /// and the resulting range constraint is stored into <paramref name="range"/>.
+        /// </summary>
+        /// <param name="range">
+        /// The <see cref="float"/>-typed <see cref="FilterCriteria.OptionalRange{T}"/>
+        /// to store the parsed data into, if successful.
+        /// </param>
+        /// <param name="op">The operator for the keyword filter.</param>
+        /// <param name="val">The value of the keyword filter.</param>
+        /// <param name="tolerance">Allowed tolerance of the parsed range boundary value.</param>
+        public static bool TryUpdateCriteriaRange(ref FilterCriteria.OptionalRange<float> range, Operator op, string val, float tolerance = 0.05f)
             => tryParseFloatWithPoint(val, out float value) && tryUpdateCriteriaRange(ref range, op, value, tolerance);
 
         private static bool tryUpdateCriteriaRange(ref FilterCriteria.OptionalRange<float> range, Operator op, float value, float tolerance = 0.05f)
@@ -161,7 +188,20 @@ namespace osu.Game.Screens.Select
             return true;
         }
 
-        private static bool tryUpdateCriteriaRange(ref FilterCriteria.OptionalRange<double> range, Operator op, string val, double tolerance = 0.05)
+        /// <summary>
+        /// Attempts to parse a keyword filter of type <see cref="double"/>
+        /// from the specified <paramref name="op"/> and <paramref name="val"/>.
+        /// If <paramref name="val"/> can be parsed as a <see cref="double"/>, the function returns <c>true</c>
+        /// and the resulting range constraint is stored into <paramref name="range"/>.
+        /// </summary>
+        /// <param name="range">
+        /// The <see cref="double"/>-typed <see cref="FilterCriteria.OptionalRange{T}"/>
+        /// to store the parsed data into, if successful.
+        /// </param>
+        /// <param name="op">The operator for the keyword filter.</param>
+        /// <param name="val">The value of the keyword filter.</param>
+        /// <param name="tolerance">Allowed tolerance of the parsed range boundary value.</param>
+        public static bool TryUpdateCriteriaRange(ref FilterCriteria.OptionalRange<double> range, Operator op, string val, double tolerance = 0.05)
             => tryParseDoubleWithPoint(val, out double value) && tryUpdateCriteriaRange(ref range, op, value, tolerance);
 
         private static bool tryUpdateCriteriaRange(ref FilterCriteria.OptionalRange<double> range, Operator op, double value, double tolerance = 0.05)
@@ -196,11 +236,28 @@ namespace osu.Game.Screens.Select
             return true;
         }
 
-        private delegate bool TryParseFunction<T>(string val, out T value);
+        /// <summary>
+        /// Used to determine whether the string value <paramref name="val"/> can be converted to type <typeparamref name="T"/>.
+        /// If conversion can be performed, the delegate returns <c>true</c>
+        /// and the conversion result is returned in the <c>out</c> parameter <paramref name="parsed"/>.
+        /// </summary>
+        /// <param name="val">The string value to attempt parsing for.</param>
+        /// <param name="parsed">The parsed value, if conversion is possible.</param>
+        public delegate bool TryParseFunction<T>(string val, out T parsed);
 
-        private static bool tryUpdateCriteriaRange<T>(ref FilterCriteria.OptionalRange<T> range, Operator op, string value, TryParseFunction<T> conversionFunc)
+        /// <summary>
+        /// Attempts to parse a keyword filter of type <typeparamref name="T"/>,
+        /// from the specified <paramref name="op"/> and <paramref name="val"/>.
+        /// If <paramref name="val"/> can be parsed into <typeparamref name="T"/> using <paramref name="parseFunction"/>, the function returns <c>true</c>
+        /// and the resulting range constraint is stored into <paramref name="range"/>.
+        /// </summary>
+        /// <param name="range">The <see cref="FilterCriteria.OptionalRange{T}"/> to store the parsed data into, if successful.</param>
+        /// <param name="op">The operator for the keyword filter.</param>
+        /// <param name="val">The value of the keyword filter.</param>
+        /// <param name="parseFunction">Function used to determine if <paramref name="val"/> can be converted to type <typeparamref name="T"/>.</param>
+        public static bool TryUpdateCriteriaRange<T>(ref FilterCriteria.OptionalRange<T> range, Operator op, string val, TryParseFunction<T> parseFunction)
             where T : struct
-            => conversionFunc.Invoke(value, out var converted) && tryUpdateCriteriaRange(ref range, op, converted);
+            => parseFunction.Invoke(val, out var converted) && tryUpdateCriteriaRange(ref range, op, converted);
 
         private static bool tryUpdateCriteriaRange<T>(ref FilterCriteria.OptionalRange<T> range, Operator op, T value)
             where T : struct

From fe64c3dbd4de6ada5be2ca5112c65c2f17abb607 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 4 Mar 2021 14:59:08 +0300
Subject: [PATCH 1759/3722] Refrain from disabling cursor sensitivity at
 config-level

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 7db85d0d66..203cc458e0 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -880,13 +880,8 @@ namespace osu.Game
             switch (action)
             {
                 case GlobalAction.ResetInputSettings:
-                    var sensitivity = frameworkConfig.GetBindable<double>(FrameworkSetting.CursorSensitivity);
-
-                    sensitivity.Disabled = false;
-                    sensitivity.Value = 1;
-                    sensitivity.Disabled = true;
-
-                    frameworkConfig.Set(FrameworkSetting.IgnoredInputHandlers, string.Empty);
+                    frameworkConfig.GetBindable<string>(FrameworkSetting.IgnoredInputHandlers).SetDefault();
+                    frameworkConfig.GetBindable<double>(FrameworkSetting.CursorSensitivity).SetDefault();
                     frameworkConfig.GetBindable<ConfineMouseMode>(FrameworkSetting.ConfineMouseMode).SetDefault();
                     return true;
 

From 132fcda08987f880767bf20d2eb4a785f09dd9dd Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 4 Mar 2021 15:00:46 +0300
Subject: [PATCH 1760/3722] Force config sensitivity value to local setting
 bindable

Re-enable the local bindable to update the sensitivity value then change back to whatever state it was in previously.
---
 .../Overlays/Settings/Sections/Input/MouseSettings.cs  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
index c3deb385cd..3a78cff890 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
@@ -76,7 +76,15 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         {
             base.LoadComplete();
 
-            configSensitivity.BindValueChanged(val => localSensitivity.Value = val.NewValue, true);
+            configSensitivity.BindValueChanged(val =>
+            {
+                var disabled = localSensitivity.Disabled;
+
+                localSensitivity.Disabled = false;
+                localSensitivity.Value = val.NewValue;
+                localSensitivity.Disabled = disabled;
+            }, true);
+
             localSensitivity.BindValueChanged(val => configSensitivity.Value = val.NewValue);
 
             windowMode.BindValueChanged(mode =>

From 12b7d9e06d16b52a600c5506913c5569ee12b2ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 6 Mar 2021 12:16:01 +0100
Subject: [PATCH 1761/3722] Simplify custom filter criteria retrieval

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

diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index 983928ac51..298b6e49bd 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -35,9 +35,6 @@ namespace osu.Game.Screens.Select
 
         private Bindable<GroupMode> groupMode;
 
-        [Resolved]
-        private RulesetStore rulesets { get; set; }
-
         public FilterCriteria CreateCriteria()
         {
             Debug.Assert(ruleset.Value.ID != null);
@@ -59,7 +56,7 @@ namespace osu.Game.Screens.Select
             if (!maximumStars.IsDefault)
                 criteria.UserStarDifficulty.Max = maximumStars.Value;
 
-            criteria.RulesetCriteria = rulesets.GetRuleset(ruleset.Value.ID.Value).CreateInstance().CreateRulesetFilterCriteria();
+            criteria.RulesetCriteria = ruleset.Value.CreateInstance().CreateRulesetFilterCriteria();
 
             FilterQueryParser.ApplyQueries(criteria, query);
             return criteria;

From 06e42b4b4c2bab783e277fcbc86ef5f26efc50aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 6 Mar 2021 16:02:20 +0100
Subject: [PATCH 1762/3722] Fix taiko leaving behind empty judgements on legacy
 skins

---
 .../Skinning/Legacy/TaikoLegacySkinTransformer.cs  |  2 +-
 osu.Game/Rulesets/Judgements/DrawableJudgement.cs  | 14 +++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
index 9f29675230..40dc149ec9 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
             {
                 // if a taiko skin is providing explosion sprites, hide the judgements completely
                 if (hasExplosion.Value)
-                    return Drawable.Empty();
+                    return Drawable.Empty().With(d => d.LifetimeEnd = double.MinValue);
             }
 
             if (!(component is TaikoSkinComponent taikoComponent))
diff --git a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
index da9bb8a09d..feeafb7151 100644
--- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
@@ -150,17 +150,13 @@ namespace osu.Game.Rulesets.Judgements
                 }
 
                 if (JudgementBody.Drawable is IAnimatableJudgement animatable)
-                {
-                    var drawableAnimation = (Drawable)animatable;
-
                     animatable.PlayAnimation();
 
-                    // a derived version of DrawableJudgement may be proposing a lifetime.
-                    // if not adjusted (or the skinned portion requires greater bounds than calculated) use the skinned source's lifetime.
-                    double lastTransformTime = drawableAnimation.LatestTransformEndTime;
-                    if (LifetimeEnd == double.MaxValue || lastTransformTime > LifetimeEnd)
-                        LifetimeEnd = lastTransformTime;
-                }
+                // a derived version of DrawableJudgement may be proposing a lifetime.
+                // if not adjusted (or the skinned portion requires greater bounds than calculated) use the skinned source's lifetime.
+                double lastTransformTime = JudgementBody.Drawable.LatestTransformEndTime;
+                if (LifetimeEnd == double.MaxValue || lastTransformTime > LifetimeEnd)
+                    LifetimeEnd = lastTransformTime;
             }
         }
 

From 1525480e73196e9cbbef3128b012e04e130c84b6 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 6 Mar 2021 19:18:40 +0300
Subject: [PATCH 1763/3722] Demonstrate value of `SPINNER_TOP_OFFSET` to being
 more sensible

---
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index 1f1fd1fbd9..5df8f8a485 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -141,7 +141,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             /// for positioning some legacy spinner components perfectly as in stable.
             /// (e.g. 'spin' sprite, 'clear' sprite, metre in old-style spinners)
             /// </summary>
-            public const float SPINNER_TOP_OFFSET = 29f;
+            public static readonly float SPINNER_TOP_OFFSET = (float)Math.Ceiling(45f * SPRITE_SCALE);
 
             public LegacyCoordinatesContainer()
             {

From 8f4dadb06a393f760565ee61c3066644975b8c60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 6 Mar 2021 15:06:16 +0100
Subject: [PATCH 1764/3722] Enable pooling for taiko judgements

---
 .../UI/DrawableTaikoJudgement.cs              | 11 --------
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs  | 25 ++++++++++++++-----
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoJudgement.cs b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoJudgement.cs
index b5e35f88b5..1ad1e4495c 100644
--- a/osu.Game.Rulesets.Taiko/UI/DrawableTaikoJudgement.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DrawableTaikoJudgement.cs
@@ -3,7 +3,6 @@
 
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Taiko.UI
 {
@@ -12,16 +11,6 @@ namespace osu.Game.Rulesets.Taiko.UI
     /// </summary>
     public class DrawableTaikoJudgement : DrawableJudgement
     {
-        /// <summary>
-        /// Creates a new judgement text.
-        /// </summary>
-        /// <param name="judgedObject">The object which is being judged.</param>
-        /// <param name="result">The judgement to visualise.</param>
-        public DrawableTaikoJudgement(JudgementResult result, DrawableHitObject judgedObject)
-            : base(result, judgedObject)
-        {
-        }
-
         protected override void ApplyHitAnimations()
         {
             this.MoveToY(-100, 500);
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index 148ec7755e..d2e7b604bb 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -2,10 +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.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Pooling;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -17,6 +19,7 @@ using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Rulesets.Taiko.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.Judgements;
 using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.Scoring;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -38,6 +41,8 @@ namespace osu.Game.Rulesets.Taiko.UI
         internal Drawable HitTarget;
         private SkinnableDrawable mascot;
 
+        private readonly IDictionary<HitResult, DrawablePool<DrawableTaikoJudgement>> judgementPools = new Dictionary<HitResult, DrawablePool<DrawableTaikoJudgement>>();
+
         private ProxyContainer topLevelHitContainer;
         private Container rightArea;
         private Container leftArea;
@@ -159,6 +164,12 @@ namespace osu.Game.Rulesets.Taiko.UI
 
             RegisterPool<Swell, DrawableSwell>(5);
             RegisterPool<SwellTick, DrawableSwellTick>(100);
+
+            var hitWindows = new TaikoHitWindows();
+            foreach (var result in Enum.GetValues(typeof(HitResult)).OfType<HitResult>().Where(r => hitWindows.IsHitResultAllowed(r)))
+                judgementPools.Add(result, new DrawablePool<DrawableTaikoJudgement>(15));
+
+            AddRangeInternal(judgementPools.Values);
         }
 
         protected override void LoadComplete()
@@ -283,13 +294,15 @@ namespace osu.Game.Rulesets.Taiko.UI
                     break;
 
                 default:
-                    judgementContainer.Add(new DrawableTaikoJudgement(result, judgedObject)
+                    judgementContainer.Add(judgementPools[result.Type].Get(j =>
                     {
-                        Anchor = result.IsHit ? Anchor.TopLeft : Anchor.CentreLeft,
-                        Origin = result.IsHit ? Anchor.BottomCentre : Anchor.Centre,
-                        RelativePositionAxes = Axes.X,
-                        X = result.IsHit ? judgedObject.Position.X : 0,
-                    });
+                        j.Apply(result, judgedObject);
+
+                        j.Anchor = result.IsHit ? Anchor.TopLeft : Anchor.CentreLeft;
+                        j.Origin = result.IsHit ? Anchor.BottomCentre : Anchor.Centre;
+                        j.RelativePositionAxes = Axes.X;
+                        j.X = result.IsHit ? judgedObject.Position.X : 0;
+                    }));
 
                     var type = (judgedObject.HitObject as Hit)?.Type ?? HitType.Centre;
                     addExplosion(judgedObject, result.Type, type);

From 97f56340af36e85a13d85b02d477edee596f7f34 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 1 Mar 2021 20:57:25 +0300
Subject: [PATCH 1765/3722] Add legacy score font to testing old skin

---
 .../Resources/old-skin/score-0.png               | Bin 0 -> 3092 bytes
 .../Resources/old-skin/score-1.png               | Bin 0 -> 1237 bytes
 .../Resources/old-skin/score-2.png               | Bin 0 -> 3134 bytes
 .../Resources/old-skin/score-3.png               | Bin 0 -> 3712 bytes
 .../Resources/old-skin/score-4.png               | Bin 0 -> 2395 bytes
 .../Resources/old-skin/score-5.png               | Bin 0 -> 3067 bytes
 .../Resources/old-skin/score-6.png               | Bin 0 -> 3337 bytes
 .../Resources/old-skin/score-7.png               | Bin 0 -> 1910 bytes
 .../Resources/old-skin/score-8.png               | Bin 0 -> 3652 bytes
 .../Resources/old-skin/score-9.png               | Bin 0 -> 3561 bytes
 .../Resources/old-skin/score-comma.png           | Bin 0 -> 865 bytes
 .../Resources/old-skin/score-dot.png             | Bin 0 -> 771 bytes
 .../Resources/old-skin/score-percent.png         | Bin 0 -> 4904 bytes
 .../Resources/old-skin/score-x.png               | Bin 0 -> 2536 bytes
 .../Resources/old-skin/skin.ini                  |   6 +++++-
 15 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-0.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-1.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-2.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-3.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-4.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-5.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-6.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-7.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-8.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-9.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-comma.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-dot.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-percent.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-x.png

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-0.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..8304617d8c94a8400b50a90f364941bb02983065
GIT binary patch
literal 3092
zcmV+v4D0iWP)<h;3K|Lk000e1NJLTq001cf002A)1^@s6`+Jk#0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU-wn;=mRCwCdT4_vF>lyy$%&-kRE}()4
z1-Dz5xYV_-?GIYi>kp0bPmN1lqS1slu}Kq`8vkkZkER9_O^gv^aN(-8ii%h3l50f~
z>vg$WLA)RgFf0Si45!aKeLwPfIA<1bo79s$j&tVBe9w8_<$K@vVAFM7{J$Tz&$wPf
zQ(o1B?z-3Ts{gM^N+Nc^0Yn2)3N(c%k?}LU3Ve)Sh4_Dsq)IFfhzAn*mEOnl=Tg;P
zCes6S10JB0LI3aK^8vzl@80eGDI{%7kjOcKWFQR~01O0Dfh7JcMj<H`>|$bVKr7G!
zH1n$)=wPy5CaXtE(#Go0;)zUZD3A#Zr`O!v+?=69ho(=QIB^gHkFK@h)rO-N@IQL=
z$kpE7?tc9EaSc9e1R8)3z>kbZCM?PNgQ;pp(!r)A_0oY6z$jq!^5x5CZ``;sJ3l{P
zi;0O54u?Z%+NW{T+uJLAK3@P`U0veh#f#k)6&3a6<>gOZF4qfO@&oV|cn^GJrAc|8
z6;Yds55_V<QZFAE2gT;@*s<dmvuDqCBqb$@sHi9b#X|ZL5$^8p7M-1)qPDhH6c-ma
zo;-Q-F348m<L{a92X+OI6;X91jeU>^4gp32lO{}<@T=p;k53*sa-@ijjSY*O*+I&}
z1w>_KrM_+3wnuP<Z*lrDK<d^?q9ExtepfT77{>uZzV{UroKFNtj~*@J;^Kl5q)mZ{
z^z`%uK>t@a3UZC)<YX~p#td6oS=ppz%a(nO)00_@AsmR&_}p&hf0AGfUzh>prKP1!
z*|~G)6jG4<&+72|{leq%1XOzQ;)Qto_HE!if=i4YJ60qnCI;LiU^d(&{nn5nL&U*@
z2ea}1x2I2^mf4_-Q<o1!b)(sBOmHxn7x*1eynXw2cXM;I4!_c^4zJg%H#9WpyLRo;
zhYcH6hwt47t^>D#>cYapZkSc?=;-M8J5XD%s;biAPT%3$oj@V0O77+WNg*Lsq*Rj!
z{07*K0I7ce{=E*91tnNlSEnytyqNOgP2exQ*dKsD0{eh-2()+S&!5+!cE8_1K<Q`C
zo~7J+2G|1328OZQX_BO-_+lzwkiTx-x>2dAslslzTbdXVDmHA`&~f3yg>sy#04Nat
z4%`Fi_U{0<-EQ}{u*#23O-%tmRSycpxpU`gn>TNs$C-pON(yI~PjVY=ak)SN@aKYp
zf>-tR^*V@Hs@U4vsuvX%kph1O{sb%r#&f`>^J0`+e+?7?XV<S^-_z34Vrmg`35aqH
z*Zm%t%Nqv~wMivqz>rU7uUN4nn{uHsNvo-Zg5&7Xqg9+jo&m2ojnK~0#7X)CCv8eG
z|12pfsjjK1>8B<|eRg)XSh;c~MS3>#NL04lz&|p1r;ivhB7fn+g^uXxXv=7(#C+(`
zp>C*B&E(!ODca(CaOXbGbso-r0kXLM#kq6m{FK~{M|^y|fQzL-O_`2TnU`IXbh00$
z!$0!q3sx#p-lJ4=`SRtLc>9L8wk9U%HKYwc6K!FIYj54U)j;X0Umk>-nVFda0)3^B
zjF%}=<2Q6Ned*GrX_U0B4ocDw9y}25-o1Ox3Q?iZZbDG-`yRdlQncaf)vGVb60}_!
z52w>9=FOWonDcZR^NK>w)FergI%CqLNm?*dQ^8PLTIyzkAGz%Euxh4>fRl7P6a9GO
z#tngB>31O|`9+HsMS({alT46)Db1aX-61Q~-b^G>hSe$6OQ)HN1~t7(ZRxsq@1BP&
z(r<qT6;gBBv}rkPSs6Tbsbmt>hQU;%+=$d9o<4nA!>Y8gO8!u_1=oyZb~kpYHZvvZ
zp!Knx4&WGxS4mP7C5#$1DqilfR;dRn3WcDDeJ)fB;OFZC)jDp}ZA?R|$)RKdXPbT`
zohd0PQ50ptg697H`yMuPd#FNHEi0A2$5UNh?Xn_C>tipM+q6?9N%F;vA3xq^wGB!o
zQ7Cwrpj6QpMk%SQ-6Qg4hgoz7iU_PfV88&u1Y^0rbx4xYD9uDLlH`-GUcHjR($_?V
zV#rGCilV+?0|{1h5Uc2r(JhON;En~7i2QCQ*rW8(B1|=9&mA<-D9TZT#xcP@l4er~
zQ*+<BbEiR3(H|j65zaJ&QXrJJEB$;Q$&if;`;nYR_#>P|*bHNuNX9ufO+<G16@rnD
zOKjm<%|J5ng-8ZU5f7lK@lxhR_Hg`PSwmMzM&et#!Oy}ScsXPyv8u8RV)O~3vH5%v
znk<sBp-M1j)~s2BgKZj=o^TUB)%P`i<E5U3(o7f&Y7x#g?aFM)i2#fXm5*y{Yu!qk
z^J{Wnee&c<uhn*C=+mWNX<-I|?CB}@C7_T=wW<+FMJhhtym`~CraFz^bfW+81|!LS
z)VEdf;<hk?Myg1KLlXM)I4hF0J~d^Atv5h2upgs`?hHnfet720ndz)Zj56g7<sNdz
zNku~%4ZW;NLQ)Y;o|lVhx%~!6(i?YWWo5ltF{+Zx$jC@yMVyMF;h37flRA9(@L~D+
z`Ia>Tt^e@h!&YOZrExLZ`s~@W_f&aXRVYL<FE1~NtL6k&G|+<tF?EzODIPd^^5jgb
z!58@>SN?Ls)~+f^BwL!Bo9obj_=8o=Fn0`3e$~oZ3!-8y_w@9gA!xMHs70~z$LG(V
z3j{FDEL{r8UQO-hu3x|IGHW@dl2fNn6)>4>;8R#72dk#4C`-V2ZmKd+ROg@@)vP9T
zq~et;SK4@7-NYn&WHRsM-nhP^qT(g>)n+Cq6H!k-XU?1)9)qN_8ROKgjtQ&tCF-NI
z3kwTJ(HPKdx1sfD-Ak7)(XgRTQ8LivY3!T<l87vtGW5`0nH}U$Yu2nGfBYHGeKMG6
zEXX-nL5D(+W<qpRBiF87n@HWD*+Ekc^yEI6`k8S&EmK4{hkQNouT!T^{m|CdW~wHc
z9BqbJvSbO(F~{(@kox37Z2n|9XyCaH4Xu8@e*OBXsJ4Y!ex!BWZnrpc<j8BDiqtE^
z{$5Ga%YI4Ih#C~O-@!M0W-}WyIhkzt?%fH=$;nf3Y9bB(nM^LLMk<d6CeXNf%$PAV
zw{G1UlaP>L8r8H8t%r3Vl1My~`D7}hDKnd9o{YWRzkmM|vw5PDio~&F$MQjR4o=Mk
zrU6rU22SK>&_FaZGjrbI!-t3F<m3pmqJn;(*4ejjUzK6N->J44c0<V(C<f3Q+mMQK
zr%#{mq-ZocJ1v-%l|`l>c>DJ4p>U5B_RkSg#rgB+&pdJB#DH<*#+g2~ATzhNwu(J_
z_PEN*%C6wl6Mkeu7VV_zoUyEzIW3KSi3Xyx_U_&L^`=dmoHVaAE+UgJT2yi7%o$Nt
zRTVgmYi-B?lv4$L&uj~n)49^pQtzr&t4e7i%(Kq79NAqU={I|hBX@^E>|Ybm=Kiv{
zxVT`!f&~upDYNa26rt^mHUV0kt|6DOdLTvDpnn(Fu3hu5UcLHn*hJ_d06lzqE$5uZ
zXE}C@)-zBDBeC}&HFROYOawqQsbVBbM9BQ)76f^X89}NQDU!>}%Y8^?*FcbF>`z(2
zMh;*f(v@ySQa6l6=x(|}v;#j1|85$bo12?Rxzg;JVyI4&cCyCCMseW4ftD>>wtNFu
zxyJ<Gm_>9bCDpM=H%D4KHvSJKB_(ZGC>2rbB(-ENCDl~YWKvR%(hHfEA{hC%tEi}`
z68=jM1OCCY_P1=}b{=K>BYEC!eAYdfcaPy5SXl)H1>=yQGvEgCG-RSNjY<-`7d=es
zLFwhXdGqE=RNLP(DMAe=ZI?1@_kYe`4)hJP<TRKc$`57?<ZO_nj_KGEKF+;uoc9`;
zR0AvLQs$f9U<5^oqE*hkrRn9^?;|Ubq>Sid`G)L@yY#sVZ@Uuh%5y}2IDg_0s<PIV
z!IXSZ*~X<*EUPD535Q}CdA<Bw4D|u0H(YX``zJTTFpW^B5^7Jbrm~+hn)wgOFX4}u
iH1P!-Uj)g23oro3k}7(Gph-CZ0000<MNUMnLSTYH=J%Wc

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-1.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3b85eb873a9f46dcc300d92afda6155353bab39
GIT binary patch
literal 1237
zcmV;`1S<Q9P)<h;3K|Lk000e1NJLTq001HY002A)1^@s61Dj|m0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$cS%G+RCwC#Sx-wFK@^|eO?GXqjnxSK
zM@tc;77>wp5aXdYkHvliKZD@OPa^24A3!|xAgxEeM50JaMX=Hu|InJ&7&j)_-M*K+
zDPx*sXOc}TGy^|Y;_STN{N}wkGjBD|^Vm&jI=dk)RQZFZX^l)q6P~=G)UNPk_0<1^
z$ol$v&CcWF<DyZ6-VYN(g2E0UFQ5qHI!cNNMm51`hzz4aQ$U9Ri~8d1bASxsC*T5b
z3FCnvo~uNJX3h<xf!hK)g(t@yz%3$jMFfrkhcp?7;HoNO5CJq00rV1j0Qcy(yYws}
z7K=R`92~q2uykFwmzS5{t*x!ShyN7-HmM}PG^9qDW*P-N20R5k0XzcSpO~0<*5BXX
zJ1{WNH8eD2j*gBp%d(hhnk*Cwv0N_4Iy*aG1CdYA{|u0(rBd<{oz@>``VcTUGc)t%
zdAW6ujEorEXgD1HZCs2t{QWL8__GhtMdRtJL^OI42YN6yHT7zKetx2_udk}nY7N6Q
zpU?9#ELv)<5k<n}eBIO2(__(S6s49<EX87x?d<HhL?Yxz!Y{LyA}11wn1*2}WjNP$
z+4=doCnPrUDNV!^64GTNkw{%!TrkIRR5PwCgsj^rkpg-7>Ehzz>eABEX)2Y%S(ap%
zY2Zg_yeN=SCgKW7>G0&_WOHtA?(O8{WPEmZmhJ8Bp(FY(O%)<c)mdFy7F6Vf6FxXN
z&=(dKym&nRa&>i;_4M@A92A#vcX#))BBQD)0-F=}5t|Ybrs+MvM?i9ObMx4?ZC^#Q
z*=(K^;UtuohS5%mesW2f5%-O+fG>a)8j|o4M@5mEyDyL_c{`+hhjvi(nI8n1<}@2M
z)d+Eg`1!&&vyvjsElrJ(_QcbcpO0iRnVih_-{_gucV;|lwzjr@HWf8K1YB7~DoM~1
z2cifk;h-UjYltK3AB`&FY;SMN>^)uu0wcns$2mJYQy~)Q1xqPvT7A>=WRuh1x^jB|
zT9N<b65b}#CekL->ddONf3$*#cy09H7$`$V6YjiPD->}RCaKAgXyh1BItqB@CNs9d
z2~kZhuwy{!Jd#W%i}minx~?;!%BWW<eFmclT*jSxmn<yi#A30iP>l?X$hA`%U9kNW
z(Pc?AdP0*5VelbCAQGq|s^?InLXkk1hAAkb3uLrb_=s;p!>S_@(PVRpYSduN=D-;X
zbxRBoHDhCA9kTacRU$ZOsn~CtX0~2J!>9o=IjXM|g1m%#RF233zNgda6xPvdk-=nV
zSyqN>DK;tDSfQpyUF{rjw7<Wf*x1;3F+4mRp`3B89UUDNR#sL%Pz^3as?_(Z%2|Pd
zKRVHe0{k@64Y<$B9|@kZ@<#&9pk34z75heYw|&58Dtloq&IVgfvx@NAE0(ZM$zM>N
z16KZ&(n0;Mh)kLYeW!PP{X~igRvJN-A~~yAheZOWFb=O+=ZKI^eT!7BY}!Xkl}7v=
zM#iparj>iiwW<M!Uy-J&kF*cZZ6X!zmjD9*_`52{RF+Q&00000NkvXXu0mjf@8UPi

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-2.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f65eb7ca7e52a69d645d3550d932ec55c44acd7
GIT binary patch
literal 3134
zcmV-E48ik>P)<h;3K|Lk000e1NJLTq001cf002A)1^@s6`+Jk#0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU-;7LS5RCwCdT4`uh>lyxLa<Z?+{a#}>
z)41z3VvUI@h=N)L5jF0jh#*yq8%UvU6a-PL6o0s0h%16hQ9)_lHC9dP5^G#)_U)QD
ziCHF@_4Ij%_X}Ufb0*f_YwtbqFv*#j^F8NXpYJ_m(RE$?+z-qD_<gI%HFO1Em86vs
z1ZWKTw@Q|Xc>piq=D$74If>6F`QX8WfFH=r%nV{O!9W-gt{@Z$QHbhHfC#w&C&K}B
z@T-I0qZ{yI{cZ_s0mxYuauGl@5DWAG;(!<+lF0`1XC+BVj)>WTHlRg8E1&PcIz-qL
zh^!WXpvIOXay@~*Kz~L*J{LE7^yt1(QBe`nk`{}_TU1nJYieq0Rmgn=8i5Z$1LFgq
zr}x_xvU;~96@uYxF(Q-*qymE`PMnxAZQ8Wd2@@tnrlh1;f`fyF)oK+W=lj0b>lGf4
zN4VW?QCeCm%FD~$j~+d0dG_pC?Y(>V-rytEKqXKG)Bx`R8(Y_b_1*qf?GlstfJGq~
z4}1%x0mEUjtPLABjF~cJN(d|`!otEtP*6}Oxlhs?rA?A`I-R1UqeIlz)`}}vuCyIF
za^!hgSy>T2_7*4sDwr%;ww>ZtC8`-@a45$fxiuXaGjHC!>3jC<N$%CFmk13F^;xdl
zj0Aa2(|n*CiiwF4@$vB@H8nMI>C&Z{Cr+FgdGzSfM<pdC4>{(8mFm#mr2>#8*_u|4
zL5jUGz#?G(+_`hhYHDh9m&>L9SO=`Dx3skAPoF;3r%#_=jCKADECt4~_lR_m<Yx7=
zVi?CEeQ@x|kt1{V?%kW%yLWG&MY=nrizzMx9TX-MGDC(85pezB+}zxm6jB`f@sea0
zOEN)<!vVlV;P-IN<(oHedJ#+ATBWtMRj;qF*DES2^h=j6=|~d2y1H6#Y;4pW4u=lX
zrr#$I(f1JZ_p$C4U^0-z<<08j$0Rkbe{?swz+cv^S@VGw3A6wasH>~fckbM&j~h3R
z%E}Xf7JG;od^cmp4ELQocYHSy=sI@0UC+zQqauG4SOSb<i)u2lE$n8p;%|V>adB}s
z$Qps-kSzTC`Ew#i<>T+bVc<`|AAqgE0pJqIR$jb#QEzK&Grbl<L`UZ9IXOB1r1hD{
zH`L8!Ov;Ro;hLDVaN)u+iHV7(aR>{F*RNlT`Sa&jq6S{YsT;s;;2x0AxJzhmZoao{
z*|HjBv9BB%iUL%N$jC^Mm6b(q?#*1nWL(O^9l_@Prbmw+>8n<)ilr|Z9k8x=_wJoo
zuwX&e%a<>&Goi=8Gk`MnHNU<9p3`{{eRkl$0ny&xZkkLXAt7Su(4o;Bc2O!xjq4Mg
z>_u5UY0{)&2?+^?R-~-Of@0UMU9BKURx1RGxEMEbee-Y#wXhMW<|f>~f4>eS`$b1b
z8<M2Xm7SffF&9-2ba6GAIbreQ#eL1JNN&D-`LZ~9@?<_+={2{w58S7nh#~40E*2L=
zw29s?E-tPkFPQ2;xSUE8lan&gqLv=2jeSuU2ag{=-a@7~vf{^&AH|_VhsyEqOKxe^
ziUr+%;y~(2Db*a^)lV~xYvp=GanKjSA(^ab)Q_q6o;!Dr^dDv5J0@t8E;dpxyr7hP
z)<Er43KK;rd!@2hN%n!ViK5<Y)Jf3B#M!fFE16&w%Pn%T%R~!GElL**hj{5jac6c=
z=0hcU`KFyx6ibp6s6CRBk`gmAGAu?HA{E1Zw1{Jn6iYL?5a&Dwa?ip9!}<Dg5Ek)9
zVWh4BS?6HMCW(4fl5u0ljvWvl9&YGrDjgRtTxeo~b$*#FOsp6x4M0hWq8~+SC=f{q
z4jaq0HjZPD>TXil@n#8wwkFV%-?B*kz*!r}in8|l5)vIOan`I^7BfpyIFTU=3k%CQ
z&RdwIS0x#P4ijp05h@$kuU{9~4p1$u=R37?%$V&e)w1^O%$YOOs6Lt{4q5T><Hueo
z`7$;_t3OF!+@O$JjS4trHApsd95(U=oJQMHB^D!j4@CVpX~l{au@MmwrmjX`7pG30
zs`K-dQzaP+cf^ntjqa2RIND$XyP=t_=rSoeL5i{`@tib!_U!LQj2I!zGMloxva*s4
z@sdf}l&aBLf;1HIIIi}e#0rtj&(AMatmrUG7~a6i7E5j(NE^4cYuENBSDWpH$chlY
zO^}6enB*r(Nf&nG0&XKKQgKC`(B1sNUv4vVHCr)^vze5ADy*2%ofT1b$kn7n%Xpn;
zH6A5NJ7TfLXmCYI10m6>+@am5c=MDaM3s98p<(ORtuwVEtw&Yk@ZrOaNXnNiQe=bZ
z(qf5ZBQ{zk)KMtQBw4yk>eVk^yeQ!gV>8NXWuG3YxH%nCE@RZFQKnX;wVphAA`Tur
zNNVceY=|ZnCSHFR^=W8m@E|s#d-m+v4{p~;jv<&mr%#_Q-MxGFSynqzOmwVVxzg)b
z6D7eElKuk+4$S%f`|k(fdcr8yDU7hDSiO4nTdZ@JwWpMO9sc!K<2VRDcI?<G;5Nrp
z5GP3u$4aHVfZtsP`Ry=ikT7D$jvd2^pixPaI$;0){cX^gB>Ci2!_bP7q>bOOGpPtx
zFAgr;4NS0wr(x2Hn%^K{5D{FmWJxxPx5calQr*3E>z0m;CW8NBBh<4|48@A3EZ!!q
z$|T)<XYGE<#Ejs`VZ(-HLAA%k#>N`fT)Fkwx^?Rdl$-+Aq&1w;W>v#SQqBwQQup}{
zLnY+oHb`lEk|4!lHcCkfjbe=4OmS$l*~Iqk+iQ!8ith40s8UTxlLq12*Lswpr|4#0
zDaV15AjRN!C^uQyXpKxuOA|(VRI2)Y`}Vb-KY#u@CrT-|+SUM?H1H7Bpbo0zz)lN-
zVD|Cj$A3L}@?=3$&#WH8$}Uujzv0wVe>WScDOC?>pJ6>K7wSm4?UgYIf|)2a8AQ-%
z+d%~FcDuN7<A%O%+qOG6MO%+o?B=F!H0fuJqt!WiG;etmWSJR0e0Ww~Uf!Ve^mJh+
zmZ|SUf{EqJm*=Ca{DZT(oRyB<e-8QCB$e0;m4cXC9d(jlahb{4vSkZx2@GRU5`6RK
zjex)?2EhWhV3o3YbARq5l+H=7GRP0%S}8><xi^_cfe^+S>({RzwP?{IE0r0umM6zB
zxw*MbuU@^n$rFxZCfTTv^nYy9<#CF%vbyDz8>bkKJ!w6fl@Fom?50hddZeVJ_}puz
zvL(SebLNP*Z{JeiFW`N8g`yRm3K=(77Kie*LOxFM?HDzstVAhK84|b;r(>HtcJt=V
z$vHVWf)q`lZ7J1460l5A@HPALg0YGobtwd$Y}w9fha#})yvxFtlS(>~GdCT@dCbO*
z8;8MV8o8EY&rG<g9R;F9Jbd_2$dO82U7fSOzP<^Tw*yXG!&OyP)mBzk*2-i%m{0@v
z@Nz~SleSxwXEVOC0(WLY<&1}WBT!-jy4I*@lLRAzRDRU)w3LAI96_F=_n})I6%`eY
zXU?4Y>+RdOud#fqW&PlL!th(*kEmtkG#aL%JB^vY)<IKX+?@XY{d*l%gSyf0fNWM)
zp_)|FQ>IMGh6M-q@89201OB9siV;Q>>(mgElau=^!+qjsk^AnR*o>vo6M?Ty(4Q=b
zhA6X1i#q8IMT`W0ZtVS32gPz>VWCZ_0KUnZRn8GX(Eb1X6#*p@2@&K(nL3muk{XwQ
zj|kjGBukRn!y`FAl$lD9=YEWv<N0S5OSu}(YKJW5R78J(q`wc<JOU=y<el-p+qXBS
z592O9)z#H5#Eu7+_u$T5=+AcgpB^E9!Ot1IxQ+uNxiust#CGl4wR~lQ+$2d_xb^kt
z{yb>v)T!gJlM5>-C~(M7;SW3cZ<q4q-)%6N{cniseBCxCRnJ?P207B9`Mb1a5HHel
z_3G6!&iG)3q(3R6-&W{fNYcYbXy>*me^t;q&e8ZyUD+MV#}hKuJ$}~mS1w+4zWpUG
z_Y)ejuX|J#6r?~?e)J)f-&7dA`djWxvPU;~{lpuVZXQqkEPmN!`6c|q$|`;V$A1JE
Y0OO;-v8NaCZ2$lO07*qoM6N<$f&jDokN^Mx

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-3.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..82bec3babebd59263dc486e5900a3a01ea4aaed7
GIT binary patch
literal 3712
zcmV-`4uA29P)<h;3K|Lk000e1NJLTq001li002A)1^@s69a31D0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU=B1uF+RCwCdT6t_$br!yF=|Y#+QfT{X
zDFvZyr3kW=ttb*k9U<b35k_K+NQeZD7=nTsHHynW#C4)%j3|sIGBQXc%n(s_<H$0y
z6b7L{%VO#Npv!xG+nw*bbAI*5<G$B2noPXOXYsxJ?mhSX&iT%F&hI)*(=>ifhvOHz
zhC{oSeoa&R8~uM7%-=W#Zb1^@5;(PUqk@Qru>6f`==sgR{r1})oj7UIB!^~XGSCZ1
z6Y$?Dn&A%3t6@P9=mY}V-=KisM`261#=CoHtZryJ-~qCM9H6)SKR-{^yliU5(m+4Z
z0ki|H8rtOZ0PYi__hESCe>PZ*O%g9=0et~4Pzc;4|L!|&+Oz@DXfy>$+;vTd!x3q1
zZS@~Ha-=~s)CaTxO&XfzbAIo~JuR=>dEDItW0Pgs>CFOQATSsh^1uTRl;3mDJ%zX5
zetS|%N{ZohI<NUX83+$ygu`K@sj10;;gS9O_qQHCe7N?TZ@xK&Q+^a&0xkn}V*FJx
zTzTB=Hik9Na;f_O{ehuC+1+>FJ^ksYpDr0Wa-=gOBg05ePQK3A*dr2&ScZ3Yb{c^|
zz^JXQHMVZu+Oc87hSNun9zBLr&I0Fv^J09HgiEJxbRrMCBqkZ7MZgGP+=>+|W<UAl
zlf7|RhGN-!l(a6F%K}%z<M9|dIXT9lL4(pBdE}8>wr}5F`u_XxpW3%?-#>Bczk$=T
zvi0KafaHR`hv8jiY>s%g3@Cr~)mMMNXwjm~?Cfmo=D)<jkfGPFT)AR=_St9t7hZT_
zS4&IF0en>nREf8*(9>2j(qJ7zNu;P;U<@!H_!B%)+tAQpVp+|e9x%p)F=ks^n|bx>
zRkOXl-3*07*5|PYLdH60=gytc(W6JxkX69%#96swlfy0~obqM1u)vT}qee}B>7|#v
zJ@qVOwWFiM07DoD4jeGB)CP<(ii(O1B&dPdH!?Fb4Y&KJ+cO844-+R&bgWyquKeML
zAC4e76%G0&mc#M9OE#DUEC&Ai`RAWU{C<D89;KIHq=_Ul5jve&Sy{*N`|ZHr1Us2n
zbLY-A>+0$(Z`&PsSQGaoL;M9;2uuL-8Q1PO-u1`{gYLio{>f9PPIWR_y7Q{f=QBR}
z<P#HdSc#aVu{A)0WV=H+d@z`y4G%MN_3G7@r(=)Q)KsIQqQbpk!Ghb?u3cL#)Yr)C
zIBl4rmn0ht!=NQgmJ~9p6R`n}ZES2bmM&e|4txn?x8dVmz&_wR;Gl-@fuo?bX2i6;
zUckNhAP+tC5N+ru51K)mb=nk(OgW)HygR<EtjtJCO6u0w#fumF;9VNJ2OvHD3pgPZ
zbuI=qmo8m8UteEu@w45*dk!5s)QJQv5o%>UNOmR&hyL^D&o5vi#Pcq1#xPjEe0kgE
z&6~dxL+Qbj5)O4**}Wp1s{XbeJ9f;7r^k6u@_a!-f$}bC*6p+j2eLzcadB};d3m{$
zKe9V`BhZ!c-h1zbKmPdR9r%dc$%=JG<IVt*IizU<rT8o<%GFC0YGkC6l9DW0c`mcl
ztw~2!hAqu7Z{EBiiM&g)2WJ|uzy7-N>Iv~`qfk+oq1yFRl-dKu_07x6yO9E98k*Qv
z;gBi1!F$(TcV#kL<Haq-%yZ8@SA~!`B<0lB*qAc!k?ZF}-4*ug)vH_Psj8~-b#X8X
zqf@(Jio{9|!l4)ee+{wg2ebR-mtPK4R#qO=;?>qzDf7x1xsvq*7A{<vmdId+Tre0k
zPM$njE40Ys5z;-}CC;Z$pI*d^*@Xk2x~8Va`1I3HkBG6=B2uVjgEqz{izD)YVxVNs
zoH=7qJrlAIii&aS)T!v%vuA5WKX=3$+|{4WoH^4I@99}`*Q{C7icqK&in>;uTx)ES
zW-N8|FqHSvFTVJqhddiEKj>YS^>^QW_kw6;B{hTYn4qS2g1A{PyQe3OQB`f*w(Wc2
z*GuyBerYV@d6veO0=FVbZ-J~#=v{^aC@%{2#)Q70g<III85<V2x1bP&k-=^zoyuZG
zV+e)DbLY+-5bvr`VBI&R_~<dKjHTk500A}azWeSo62&e<4yw?2{`u!w+J6v(e{zb5
zo)qcL#sUvcnKES^1a%!-n)Bz+n?!YWH3dm)Zf@=xoU;I!ED4mZwfgB&B?pOk`h&>C
zf56xvm?fb+<#(ulCMxVjN?MV&W8}fFk(W_X^?Z^V^jq73A4Iiz<eaM#uhqf|mt~ov
zTHBu~JnoeQ8wQMqu~VQ)To62Qc~^-iII4By#*JS}5vtb1fo+m*aHk}XA+v%;>5>&0
z`{nyatx*h#XVWx8`-z8#p*W0r>#es+?zrO)OY6onmN83SNBh;he*OBtOCe&DS}XSn
zs)37TFtb}a)OLwwzhq{r*7t>E6*}bmu&_%nC6*}mf#IO>ThURELhqN%-i^6n#|UhX
zptFrLXU-T;J@r)kjvYJpN^5jlB&AR8d3_U#55h27O=<$#=t<4ZVn<F+@vKKeXV|!L
z<7T3js<`*wd($aN)6&x7dX-5`V>fNuWIXfCGwh;kw06Hqk~t7NpSY%!$rsA#?glJL
z5)O=8FS>}|y!P5_cjo8kTORGM?We)?>?^OlVzvCjR8CDCsee1V9i)g@xo!<(^npWu
zZ)pU0^;R&5<<%Yy^$;Q~|9kfAF_7TKJMX-6GsIMlghI1~Cu5i4YIYSRt(S9YQ=TkI
zqFg~Ak)7#6FUn9hsZ)R@D_5>O!LIj44|dRjK)}3w`Lg-;+iwRD^ILGe6~J$WWpczW
zYb4<oZ@RVlS-K!iohS+Cm#1!*#4`o-LObHo$8yRFM$yFB?a7dZ=dfSo>Y!6j>EFNq
zo#^F4&CSg!!PS)0${klsW$Gin+yJRi1B9k>CAm^G8Z@=ANQNNtL+ls8Q>hm(UUb0-
zCo3aC?aZ>yxF+l#M0FU2g@vvGI8da16dG+6!-F4u@PT#1WKH@N$)IoG;K753^y}Bp
zi&b+#PWlcWJgAh}X-!TBB{bA;i{*jyWGOumJG~LBg{Yo+EX!1B>FMcl*@INa9ubuI
z17yH@e6(LUnca8DAxqy^ZdQurc<}MZAD@hDcPTxr_!3R#X^8eev+EV(n}t!*q)}9{
z?h)aWE`Rwz13-0U%a$$c|HKnd7_55nn1uKG@WT)NsE%v#zq^H-S+0Ysk5kjhk!#nk
zom*O3>f)4#o*-DI$g5CUeNLP>5d<Aw(3Z=uP1oCm?3+XwU6yKP4fPNjfnB?HWn$TT
zC(^_8J{*?x=9_OS)@YE57j<gwOBQtSXs_4nvTHnf5vnXay;nSzA&DB%%65a?phm{0
zr$yu+7j0lEu#Z0a$ns*mgPtdsqm3FE!%UX=QIwX7%uMQTWC}0$19$cjgB9JV>KBT$
z)!>(NIX-BptE+2;*vU+EFB*;fNs`~WRS|J&TT{lNLx-+XH6=0_+3%5r%Fv$N_RuP4
zMB6QL6ciM=de|+;Zlzfv5f#rc20NIc@uo3MLd2gMWo4;pjC2_B=FCbbXG^Z+&YnFx
zt-Fqyi4Lj@X&XCHWpG5unF-W_G8v%UvpX2u6%`c@S=zp0H1DhmkYUp%sm_D6cQdGR
z*rSg=YQ!5M=p8dc@4Vt*RXCiQoMh6}@7=riN4D{HBP1^4h!G=<^78VbVnDvo8EGwv
zF)K*csO~1=cJ_3)tXj3InA;7BLW0I3JR?Gzt(u(e@~~g%=<<dQ8xB@hR&sW0Ta8F@
zk3IHSo@~&R2!DIEFi}hI)tgUlIiOpfgcd)ccU5Qp#TQ@H%WO`y_?E%C-c^Do9h6fv
zW5$eZyV(RigJq=$a?y--$OAjH@_t>51Wup&?6c2KK|ykm&l7o<Nl)1cF|`+Vd@uB9
z?eme1Trty2D@l$YKW;*V3>`jvcv9?65&uoXpD<xUGKxSRl2mma9*Jv~=9|T{V^D;q
zL4}phn>VjpW0`0iBfRm(8+Ew$*D|kDU32Hcg$qq3FJ0mtF5wJd8D$;>NSIpycAF@a
zgbbZovu1^)RC6}G5!eKLjehR*qD70s5JD!m8|<zTD>Eri*R5Me0-%Oi1Wc41NLBLE
z`j0kU%urheTuLNI1xob{G?6aGZfxymoKsT5aAWuG-NuCr7pxKvCNaj3A8$?38CLOT
zbh>A$>d@1L!64gEz&I2?tc61dTevO(FJ4wln<s;hIlv#`>8<Dn{M_<F_S$-en=9PX
zqKCM}#jURHJgN>}lh@`wM7*yAX30ioAIS};vh$ja#h6KBp6FpF&L}jOGnOu0S}<_n
zz=X|ZPY)&+^#l^vfXJzZI{QjO%Wl9JiM!VfquttEtdBNl7>W=nTfTgG`TY6wGr06z
z?i<;@<<c{ZNLz?)W6PE;ZL3$W{;s8^<*1CM&Weoe+Gmb^6(P~qts?(y@peDeiNNq7
zXgbTlseQ+e9qS~ok~!#g#;bY&mUy)(PD8mVj_eNujhi=bu7shd)FzD>S}*mWBi6G$
z+0AzeH>(iI7Fp?)IRxQ_@i$GJII$QiE(h8<1(h)6zwGBQeLi3G<jIo(c+_82Rn@p}
z-@bE_MD?PR)hh=LLS1V2J{<2QkA$z#2zw|2lPY22k&>(4M#+{6m!UPTE^Q(jkV@Jr
zBHX9F<l$30N^;(H??>Fw3m)>r*ojc9)c9Jh!%i25>Duj4xuq#V{S}%HZR8b{b9(g7
z&yBuSrEgoQ<V@BKRa1O*U0v9RG~+@sZ&#T&V!+QioHo#>MrO?GUeTZX4x8iG_GX~d
e_>~?15nuodi5A$|t>!iW0000<MNUMnLSTZ_KSS*R

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-4.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e38c75a9ddf9dc183531b5332ecede96a3f0053
GIT binary patch
literal 2395
zcmV-h38eOkP)<h;3K|Lk000e1NJLTq001oj002A)1^@s6@{lv60000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU){YgYYRCwC#T3cvT=NA6=%$`hcGr3=m
z=}DT##-=s4YR~D3+9Vc)cu)jEBriUxp!gE7AYQ-=A|j$9D5&6zNASrP5fqg?oRhSe
zcuB42oU}G+n<h~^F)_*9FI{W+cKT;$PiF6A#<tK6OJ=r{J>OpYTi^Qr^^X#Z#l#=&
zu!%q5p`<Ah9Civ-daX#`7nLGR5s}^}ee_CaXJ<-~HZ(M7;2acAifoE3yw1Q4C;-JE
zLlk}rFNF`U`COPV%?eyiAz;2%CPgkq0YxE2K7|`M;6T<HP!M3pC`Kq=;`Icw9Z4%_
z32+ubmQlP#@mGok6vY7U#FL03v#%(IDSp6{5THsZ?Vtf96WOhxc$cDX_3G8DHf`Ee
z-_p|JQq`GX!>ZNa-ygVg<x0oJix>Ze?E4U*w1K89+mXRMioZ}SqFB0l^X7k^IC0{g
zqM{;^nVBhUHk%>n^73*g#cBfmZ#wk?G_fapvg$l(!92~OD50pK_>i)@{?w^cRV5`Q
z!YIR23ZN(=BO^m(WihMblyc*V*^`NfZH|ByJS8r$B8n=C_m?bL(s=UZ$)tb{j(pUF
zYDR`_^Wd=)U&h5&TToE&@!`XVKb!+#fonM=Jx^_>K?|;S7ey&(v3T3IZ7Z9aniQwg
zY5H2s>u5A8AcHY8jm2`NK??_HQ4Ctt(fL(vZEe{umn+UyvqvNn5j{OULh6WSfLqSA
zCU5zWw?+B+`OD9pJNI^BVWF_wr`Hf?F&qwS*)#+_GBTopj+kuY=0QvH=7zj2q^Li1
z=+Gw%7cPt|fgaHK__(-v^QH&}gUK!*wL%fw9Odn8R*Q`rH#WAmwmP!2vuALX0UtYd
zOq@P_TKIgvS*dNsESbtQcx;Cx6{0=AS5;N@$-#pMONkycng@ftckiA!e*Cx?8ykyL
zBw0;bai%s4JkEo>ahqO34dkPmni}D7IHr9#6bgxF&z^~0yLP3`Ppc+rkqdcyhvjX@
zjvY<S&CLqB*|fqN9UT>W_wEf14GsMW&8<%L8bGz!_3BovSg~sV{{1e!yfKd_Cnv?#
zt5+j8ZrtdCkH{fKDS+C%kxc95t(N$^?C8;>HEe|RU5^!_ySrNu&+pUQui%Z#2=wF|
z0S$T6x?Y*q^>**x-LP!gGDCS|z1_EOUmww<n@)X)|H_~u4W^yblBu62Z)?`9`E={n
zt<IdBoEfxWc_V4_c64<7hfe($=AQq)j6NHA6NRYBTLD%e@vcYyxPna4jII|51Vnp#
zyC6^e1-<<mS)M?f4_cHn>xC%MVp`WDdHY+UuE(@EaNt1it5>fc(y4DK2GJ;7$(Bv?
z&a_V6G+KPHWy_YP_3PK$_43BFn3$LlXU?4QK6&!wOFH#`iXX91bz;4jma&JLfEMwt
zS6^S>Kx$E#mzOuA>#<rqeE3jYxNw01Kc(n{%uPU_&AK+rplu1vP+Tp@)W2U`Ts%YG
zm=;6_ZX*4p7LV!FGm0UM0Ro^!O!5_}rAHz&L|v~jk*W83z2efPOTo_0PR??#L<^q;
z*oq0V%xQT95Lb)Eix>ZcG}mop>e>9z(qGV8kPGjB6#Wt{LOQ?^mb^rMdOmYExrwm1
z_~6KqBXveyPb<Fj=g*H5ExwwC7E^OND$+5gQwoomHW^}XQOU)(bLY-a6VZYl+@nX2
z7&K@3dy3~2uc60^w3@afAqw4GC`qOjB+h|QQDgC%FqrE_RTN)2XPG?m(mi|j<QdUI
z>wH9uD1Zh4EE_&Mj4x8~z7Tdc*Tf9G0L_SNY8=;Ps)gtV;!{-uuRX4aiY&9l)zZ@G
zBO_X9T&71Y$iYRSGzIY24%|Rg%3MBNVI^pnaA1Svyaj5G<L_Ol5q{5x%TM4r>rpM!
ze0NnVSFT*%($b>x7|U=GN00dS?b}-MR^nnV@Hs50g!ZNE4Bz8~=v)6(L6P=zr^V+c
zkpRBo0gTDGUVhfAkqUEPxqbWg8n@eRICqO9rR=x0wF!^MBkte7zlc7!fX<B(AirML
zsPHl=@+jOD6%|6ihMekVbTibz#M!fF#pTPFm(wb!l4@yyy6@od@bK4<A3yE@&>$id
ze?aul=Z%ext=FzyTUuILnh>-`5nlhXNiwrnqs{9WbfT#fKS96W9}i7s_*`FKAM<$+
zz3qVsdrtJ2q;pQbQvTYtYpdCE&IVY^HWw*J$~2e0lW$7@G{`16K(QaR!KAjxj_Y(~
zWu;TUK>eK@+9Xw#_G}ysI+zZlo~lM-Fk*;jdbGE<*JEM|^u`WtoW|I&HxrU2mD4_a
z>(;H#*4EZ4E`&t#WZ6HW2$^<?YK6gZQFC$2t)3Hj_wL;RNFVRb_@xC!j5*TGCaJEj
z?(gf?ty@K{I+yN}CCk)++hBaF(%)w>=;r2Tv0=jo!9{L#FxczYuXC5>8}rjm4p9t~
z<h>xd>lz#!d;~)#+Xc6ReUfr?w=#%(4*bAeHb--CJ?<K{PoF*&wY9Z|Pmq^tv|ttw
z9z5vB*x?&w_a&MOFOWR|>?6qwlY(TcI2lA|8-SN^nw-iTnV(#=W#*%!tE;P;$7e>M
znG%#?wg68ky0K&%1jtFWaj(uMgjMwT06vf*Z6nNOYeQ?{uW_9P#M|oG8WG*h2(*}O
z?zd>&+U{)#79j%PF=dzn_)ni^C&l!A?73*G0~GNjoo?FgUKE=LKEop|CXB3UOvTBR
z=`?Z9A%5M&^h<U%k;+7*tZIAX3Gr~oZE0!<RyKaDY+YF2D6-NYkTpLQS|kZQ<X<3|
z0&YtqU<UJ=OjdBV&PUB>3?kq+JK#wd=pa<-C2`iT-@afq;ZDfQH|l)dC_b-lF)_ED
zfO&xSL#GGY+uOUSxqMbqQliQkrlp(r&Ye3wkh&MT5yb4enyO#cNa~@Y!4#p(R$~BE
zj&7@f4$q;_Z18`A+>H~Sz;Bi506MG!s(8e&zpxQ_60ap~9+jq3;<o@D!(;XWgio5J
zYAcNpZp??zY3gALw2~&tQ-txa#%$8lnA0!C;urt($Ao`^PJH|#zyP%AzN%$y6fXb(
N002ovPDHLkV1f?Fo=yM&

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-5.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-5.png
new file mode 100644
index 0000000000000000000000000000000000000000..a562d9f2accc9592595b3b07669195d5b75406f8
GIT binary patch
literal 3067
zcmV<X3k39uP)<h;3K|Lk000e1NJLTq001fg002A)1^@s65KJiD0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU-ok>JNRCwC#T6<^|`xTzuoqgt=XiRRh
z_ond~O^gpp;_Di<pte{m_^7oMsS2g2|EQpCDX2&*6e}nd5w&VX6pEN$BrSxhM6Iv-
zs9JBliH&-_d1zjn-DI<wnSN(EzvY*?v%AS{<Z__{AG<TVJM+!?oyT|1tj#bC<(shC
zm2b#qGrhMldAqc4OYnO`dNnNe#e4mKAxW#Q-n@BJnKf&c1N$oA1l)j&->XTiZb(Gp
zz3LX<Gv9=G)x>YWOE+88!KA!EDv$}J0V#lo$=Z^T9CQ)WzWKOrA~yg;fPSEl5$59>
z2pg4^l~EE7CPV~tfdU{8$YJ7c3l|U;(WQ%N2_S!Nz6l~20s=rM&<=F-F@wJoBTCjA
z1r(Q-md>uKs+yy!>ZpN%0iUL6P78mI61CZE2B7!!^bFM3*N5<4Bhbm|H4q4dA3l88
z#Y6`r!tyH-qVKc;uYs5BZn6PlewoTv9Dn@y@t=(yI~F`uA~GaL*L7XN4JmS}laJG@
z*l545t}gmYU$fio8m`rkn+;S~S6}@E8@qyVgNRI&ESghMQ8C@`_p3QMIqxma5a~5*
z)(G-8=AicX_xr|=AOC&ue8S5wTp*T5RSu*Kuh*OJa5&y?;<norr_-sp-R?n1O-)rm
z)Puk&<9PA1TgHgm*{VMHWXe#M`@JM|T$k|t`Exsy9F%SBl2u*sE7#XqeaIc&y?fVh
zQ8WfsAp6%@Qi&v1RN)K|;)stCRb`T}sC_6W42Q!?Utgbs0EnJkj_O29Oa4hQAV8Ug
zKt3CZM3mdNZ&Mz9!(@AzY>cR|qyt19iF}k&4$_En=FA!8!i5V&xb@bpTTS?=htr5I
zTS3adQTNKs%=Au~G9?S=agQ4}E<GhB#f`k}C@(Kpv$C?Bmo8nphVT6cc*j=N%oe5S
za!i;o!IvoN>8`I`yQb{gwJV5Zeh-H}WeWtPrHV(?(b?IlUcY{w;=q05#tkoP3WKdj
z>F9HSZu~7D)2uA2B1NdQJn=SKa@@57k`J+a2YAXS@8Odg3FM?*(iKig_}F+gLQ)Cs
z;$*MK_0dF2Pd?e$*hr)rfO_B=6AeixwX&!jutKSc@@?baL|BaU@@vG3sEvu*k_A#I
z6r#Ir1zH&NK5Uj{<_%KPCS@7BN%ty}0MR9>Hz?|rB;wdyS;SrUvGN&6Mv^wZs5TO<
zh;1l@;Tp0E(i8aQh;Hgv=?qLd!Nnbd%|cYi6#P)Eo{Xq%IMo9nk(~}?1EV=04Abi9
zl2E3gh~Q>~lGm(!aHtj?N+TE5kdGff_Tg<ICuIkx5;;)h7DKcby(UEco5^cKv9@Z_
zc_u7_$f0D#5+<1s1VzD+h-wnaAm`a`&XZk?0Dsm8!u?haotdbdj1%TjpU<bPUAtB}
zckW!-q)C%L%E-tF78VvN`T6;7%E6T0M0*kp2K&*TbiR4>=G}`IFTUUvcxy^)wBNxu
zLWC)UXvr+9mXwsJiApGHvvTCf5#_*v1GJlt@1_fZA>W{ALm*i4sO+}3wknq|U+%kq
z|9)F-ZSB81Iyye%n%=|(qlK*<B<os{l`U$Ah3tullG4F<q8QGWo13dZM|gUBd;PGm
zAMM8MW5<r&ho%3?dZB?EJF;*O$cD{i)#2pOubf&~&XMcTO%@dur7l~xY~InMM<*RV
zeE4tNT)N~c#bk9k;m0BrRY!mCi5rB|($W<8xUzfq?$M`Com!Qho&7OBqF$+p(_XX{
z;j$aE=m1A&fT|As%Q>99N<xK1G$|_~qJ>Cyxm=3J<B5U@nh8UnDl1m3aHXfGFWInR
zgWlfW-e(den%vj-bJV?UXlQ7I^M6PuP9&ZwK;Unbs+5ZtFB(whJr5o{Xhn{F%jdI$
zMB2oO6Z7ZJojZE{`t`Kj(WRGVB)zBZbK$~;>YhD&zO#Ar<~Gg(U7WhYf~buL50t<s
zZ`!o!C)>7dTZE;Ewg<wu$U-u~r%#_MCr+H`gotizYHE7HQ;rUndl7aiFHc{JV6mxt
z_wFqq!nEw>6v$1TvSrJbhV$po{|Sd~agb3q2pKHvGWmob0uzbw{Q2`M%F4=$kd9K2
zvfSLt>aSnF?n9b+SyxwA&&s}8BH1IUavRUAve@sY0<$5yixw|l9PQ(+v@TS?zF@(E
z)7bqx@Q}wl-QcOoKH9|>_FTPswIBGDYr2E26l6kgnOvKs#s$fK4o(}Z_cZ>Tj-??b
z70#PCPqiXSD~JHIPn$Na1a9;%{;iu=M^jCyNn^hVasuw-V?id>$`DozSUA5f^<iCH
zQt6_8xXNn;UQxXAOgAuN#tc7*W=Sc_E`rI${*=z6#?g#S{*o98_AtROn5?*wfjD(q
zLwYgzw?w$3ySuv`!lo!*ppsR`j2V;0Bt5(;F`_=sU4@9ykLS#pQ;ECIK&tUj-9|9=
zB5k}mefo3_yN1q79Of1znN%}Ro)hL+EWd}B+$qaYl_z<*=&xrUJb3WO#l^*g>OJ@J
z1rQ#o`}gk;unTms8nPw1xPw=WF7EUD{Tb$bYBi*=c#aTDBbfyS1>>NEXb_+voy0&T
z56eNSi88`?mUijVBsyL*CrFYZNF3zA|MIK?N!GjQ{dLoH+E65U=RuB4Nwg$+d3h9(
z<xDhFn(teYv@^*x_Ivt`A5|#T>-EMZN|o)|vu7bGgA9n4*)A9((mHuaWx0_hrcRwY
z7H>abpC*TQGAT1jC;NU5KNBdfsHiAgvSdlLtR|YoKoWLK=`JD@rJx8QU^?(6BOX~Q
zt21ZLqzn6jG4ilghzE&eim8Z{?%cUEpWG<kB!*&vG{fDycbkMZWo|K|z5GGT$&)AB
zpv)~#M3%tPk<XH!e#Fa}&7|BQ>1Hcta9J(}rU28oZ{J>7RaK=V@=vNvckbNLpivvS
z8|aY=NR()hKluFY*|T>W8yllPvKncVMOLp~UBW%n1SV6+#PWEVzr~+V2P&2?UtYCi
z#}21ejhC%S0tYS5E9}1F>K9<5v8+NCm<0R)*bhHyXl`yM7ck5le8_n6<cWd$Ph#Ob
z@C)Ea!1sXf0;_<Z1HS`mKr#SDAN^gT4MN9&3L~F83v2?u&Ck4C^kh*yZSn9jRsb7;
zKknPNFNic@K-GNdq@hsAsIIOykj{wgUxA~*Z-L(chk-xC@{ggy^p=*Eq$KI{moHx$
z<>lox9sD)01Q^R1!yyw@`5-OXB48V2-e2eru^e9_OZ)I+1KQKrxN##9Zszgh6GV0k
z2x^ZWJu<qwx-3`4Op+|VYSk)g^nMTg5Gdyo9?jD-Q5)yHY<2-!#$O`w*AQ8{AQG|V
zMd&kflUJ`^8IXVmWevKyWLBgNaS$cBa^*_$$s@o|flBuI6k*L6QF_Bc<>5Oi1(pN9
zf@MEBbm&lTTU%T7#3QlMO`{|mWOW24iS9qJU(RFgN>$G(ND87Vj|6q37oj=Z*vizy
zgrU0I(T^|Mx^?RZ)J{-upQv6Zdq@EVrPS2aM9|pXMk@LTxeV}}`+Heh4%Pu|QBhTd
z>`UdUQpmnL0j^NCZr!?>Xu@*fm(c=1xs{}uRT3vFQ0=B_Lj);5*VfiXAfBJ2L%7S+
z>d#okH_MN0%#x8FgAXEV5)(eIKBGB5`Z>{mxOC~#QbcLq<jIp$px7N`Vex22)NCRN
zi_uUmeDB`9jw@HLG+@7;i8b-Sp_y}dKs=+jnm<_*mB^|bd8wRhM=|MKe$AHtgy2Qj
z>4O%Cj!>ZFTcu8+%hbY%nNvFx3~^%D;%VEsM5UR#L;CxMk4dF7gcA2jPdLP^RLnwq
zP1C$?saxnB>S$g310vDPeE@`Y>G^qpm&(I%OKRL9sWD9=8#es~L;f4akZ1bCoj1uN
zN;Bj^uKZ^f^WQXvJ@==;9I3&WEzS&oM7Ai=|NoP0gtz|+FaQZ$3c`e8^P>O&002ov
JPDHLkV1kmK?iT<6

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-6.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-6.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4cf81f26e5cab5a068ce282ee22b15b92d0df12
GIT binary patch
literal 3337
zcmV+k4fgVhP)<h;3K|Lk000e1NJLTq001Wd002A)1^@s6<+7t~0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU;t4TybRCwCVT6t^~_Zgi%Y_HchU@zFl
z;if=rZUcpY93TRkgGxXX)I#!4qf~1DDqy5iKov!mKn)U7nuID%6jYE>oInXkiAowm
zxg2vDgN+Ra8+@(L^|fAmr|*rvpF50qmLrXnksfBpyR&b;^L^jgq3gQ#Lp>Z%`8lV2
zR{d1aO$b|Fe{bXz5f|VFVg#}B+GQd~QvE>4f&uwm__4{IJ$u&nmkSmwP^3s84)6d8
zCV1t%Ti&M&u^`Y3bPKwG9yxCi#rF<8ikv$NF-0m?h$I7Pz;HpTob$?i6uFRzP&?2D
zv<mn-K%%&QpO6ec5jlL&C2orcQh*V_NFWQy1~Svq(z2#ao0dIu=FD^?l^by2Ai04{
zmo7Cwc<`X<&Ye58c-;up19gHXpatj<k|8@Q4sojxQ`Q<rBET460x)Uq+O_%X*RRi>
zJ$tsx<MC)QF)^Cc=^XrgI2_jc`}?(EFsM~lR_Z5Do(!Bgaia3dl`Gfq>)XH`phgI{
zh=qe<MctO1xRS&Yfpj1Tm<;5uT)A?|=FOWY<mTo&5)%`(*w|PNma>f(mMD_!?d{b%
zJ3F;6zW5@vckkZPt5>fU<JUKUN+H=Ou4at(KSYq^grFieObD$2ehd74_wL;t_4V~S
zzDS2<^d~(A1_t!*?ry!dwpK4JEbJIIY}j#JcPH>OU@kBkNRm);C{Aum?ea*VGp?ra
zgGY`W`RVh|KOaMDxm>QND~fP?e0;n%a^y&D%a$!k^XJcBv3>jY47fU82ste^v47BV
z@=LD-`~u*Yz~6T5+SS?C*7n%ef*bWvC}dd5?%=g(#mkp3>v?&3m+?J&fu93&B)%Ez
zE`yhlixGD|3#<eF{Kgw^JZNleG`{drF6-**(i<8YbXY<^c<`WJU0tp7vxqg@&oe~$
zej)fLU@ed*u^uM|GyWmlXMm+Z;n=Zbzd_*YeSLjViP1_;O-=gSZ@;ZinKH$X&t3t}
z1DEl-Y3I(JI%5@?YfF$8oH1htKeG*31x%Fk<yKZ>QJoI_0yqG7b_W81M-oFV(_eb&
zC1%-a;IF_R<x6()I>5gR3JSVz+_+(TqjYgmQ4wS8Fz_qj$Kqa(OH7z588davm@$j@
z?b|m7MfRckWj^3at)-<!d-KgVyN(?@_Ai_|2V4Sf0@c8MfR+rv#lf1In$gRbFOOke
zv|iKgb~90&2#t&j7cSIFCo#H+OI%7nkEQiCZQ8Va$&w|;h3pR2EtHpm4?g&S#Lfz_
z3RB%`kygbv7A`L@cO)exjhj1nu2CN!DzvDTEaW*kISGdkA8v=MRdMcA<%2%<!CK?t
zCT}!iaHod0q#ZbLfP@&#rNAvy)mQDRMha~i--GwxLgpJ*AJRi%z0spbYpYkUW@wF)
z<cwD(gl_dMUApu~nVFf!o1<B6$BrHNp0=xaSq|J47j^=D$bL5dK6%aabk%LRwhWdw
z+FGQ;>-B0czx;9r{+l6uyk>G4aAyYJWOuL~-MxEP`}EUKFPqwrU;1N6DGd1;lJhNM
z$=a{K{<^8BrzhgI>2CIGv09R{T!N5GU%Ys6tTiUg2Qo{0_uY59rGeL4EcTG}k=K1f
zkU`#9TwHw5&T@=Bem6Lb7Bv(*NDjsD8K2K*+oIUW>C(?X|GY|wHA>L;ipq_c*z$X3
zUo%4CzTfYU7<a18nUuFfxixv#tXZR?Sq*hcL#k`{?%k`h$eoZ?>X;6z_3BDXOZyle
zwgS`b?ol`F7II0jS|U^0?x6I62xu3<*sR>iJA~AVkvYOV@C=5NkmUR8>+0%Sk@3E`
zxVVS!0y>Zez<DJ^d)?ySq^VP<dhE#2r3_>!T;<B3Ni4*h1|GL*o=}!^Nr3ZQ;M}=$
zWhhs^l$4Y~H!5OG7zoodqL#Z9xrFJ{r#tOR2xFw8qC$g90zx8LQa;fn=RIO2Wkt<2
zZK>~ZeDcXBC8tiE@<X)d;JQ4g<9j==UAuM@@pw~eCc`G6rmA=dK-*+s;f2*Sv4Bsy
zNwR#gc^Zp1O=Bt{%%dS=)79MET>sTqU)7t2p*FErgAilbbQ{wZ`e|yk!b`K4m9fwp
zvOOTBhZl`WO-&t+L1z>Oo#6=y32_LII8)3~{e~bAdZ9j=&zw1PU&5kQ2>2!Io8<qh
z?HO~0F(7AWXD3Bdxg?GPt-bf&dvOydPMn2eIRk1|gVb@3A3vT!Z1hLIk5ID(V->D*
zBRk^}Q)y`K6F&a<<KX-6zh8l@zad%KC^y<}8XbeGJpFFr!i8lNhtUKjg(C$e^;v6c
zt08qLo1SE*pzx#=12G+Pz1=iRP~grMCC)f@tHJB{Aa^qwx&QY;lDt8*!G2i(Kj82O
zV2x<X3`s7hJ3?Lh-VcTlOUVl_yx>B-&wu^(*EPgsNLCiTQa=Zr-(}mRW>fY{D|kNI
zdW~_(iEPrONe-x-e7JZPPLDH{s3<9F*DO)<Sdb|K*flVu7^>KMur#41Y7m)*9I~qh
z)Q(6t7gY6P2-tg4P7JZBKJi%lGg^d1Fu79zG+;KUmJ4-D&C;a+GiHV*Cnx8uTemI;
zgN`<0#0V`?@1_NL18=?cRvMIW?rj`6{eahXn|5kZ54M+Ew{B@`)~xA)>@Jphp;iiL
zuMEP999g7wbadoE0Z&6)%16<S$;ilvSm=2UH=?atwd&dZ`}bdvZI&T62f#l3sMx|6
zX&X0g)Ip3n&i?lez)a)CNcLNxME-wKh9186JX+tkw6>kl<iYq`wrp9N%rhxUZ1#g(
zKf6G*ID-qdl9G}NH4^~W#d?(@KC5MebVpv7%fg25zlkttW}Mm`EaHe!vl8~utwA(&
zznuV7?TbT=$fa5t{giYHSyixXt2)KS{IdJFxmpzM;nA{JDPe?x(W7~hUKGR*#+04)
z=vFBUoznNZ)e1GzW>U_n^{d))c1H7#Qo{J2!CkXcJ{&lG`gEA;!|tv`dp&Kje(a4p
z$T`h2op;rC{rdH8TF<VcL+@!KE<L6#y5kX#1JwG~kY#oo1ha==h{3J9Q&d1JifN<W
zWJGf5>FJ!xeUeFu7Tp$U3-6X2;d@i&&6^i>Mp20eiKUcwNRewkfBt+Gv&k+lSjmx1
zS<+t86hYY`54j&9mMlvm-*eABmmY1CprkqyPf4htBIid^+&y~qXpk+*t`4nUy*fn}
zJ|iUyseav(o#usioDfTwjnOkNzW8Fyqt+bA(vWl<V@EtljwRyIp+mQ!w<21PE?Kc+
zg$9wCD>6Mx2zrH}3vio=`DEue@s(Fz$-~SLb<IJqp^G$$DsER>rdWZurl!V&i%gw7
zd9u?wi7{gtd${}L&p!LCQ_4!u;Qsc1gHEbgYZ5R6(rDpFAAOXam6c^Xqfo(ARaI$)
zg@xb1bC;xuH@ZxZkBp0B0?L33jGc)!yLfSKgV4f!K#xdihgd5~;wwwGlQV#M@4WNQ
zEX12;=Tc@Uy|ri09zWcAN;(R6Fs&|=o-@*(5*jnXggJBOcsLuFpEamm8q{kn#=8vM
zh|?7KBP1RtiK5Mi8p)@S<R;$knFT9EadB~Y+qP|AqW69)?XW>Sqp1ZVC#%K4ulelZ
z!w)|UqS;5B5xC1mUDRKD?KK84S79fCe*i}*2J-Xsn~REybZ+9KExgszT6V(QfuG3D
zF*Mx90|{9tBuJT{8qI@PTm-qZvY?>AO}%A}7iJe1I~azwW5<qZ?d|Qx!!O7lUeAy~
zR?C}RNsDn%->_jr2?%~Es-|3ec84L=P0t}b;+m;)2b+OITeog)<zgBpA7Vwm<|3Mt
z8Od?7;^sWsL`F-}q6mvHEOtTG{OjdO&d}!&LeM4ImM#SOc<DF5UluJ|RLYGv$3i}H
zi1rX9+V)+Ig}C81c;=s$M@-q0RBrW%$@*Z<`owUQ#Nv29H3Z3-ufF=~IApVj+05F<
z+C`T$vlUn;*^2m+?xzdu>gu%P$B%bnpuU1Ga8(xERg#%aYO`d1IA`}rQ`M}&_9G_G
zlAohMbUfVR%goI5qK3tSloP$zfl}jOvT!ctJbv-w#Q<uU|HO$C*F^``2=2?Y-zu3o
z<gsSN$LP|Iloh=~GF7ZOTz;m>`9!rQH7S(=nLX83vrXEPU#!$D=TsqQ)`zW2$cX(!
z#9|mE)#ABFT8dv>o+$8|h{c$ehe~YrnZ#y5$OPnEujzSz_`Cddg!L~YRLhGqEe>6l
zKj9cK5ey3Y1pSZmml98-Y@L=r<#3wduqfZK<xe)A>`ym-$bXUJ)PBIne+3u-Y^mm;
TZ*tsI00000NkvXXu0mjfuoP_o

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-7.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-7.png
new file mode 100644
index 0000000000000000000000000000000000000000..a23f5379b223d61079e055162fdd93f107f0ec02
GIT binary patch
literal 1910
zcmV-+2Z{KJP)<h;3K|Lk000e1NJLTq001Tc002A)1^@s63UJ6%0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU(7)eAyRCwC#n)_=LSro_bOeRg6N84Cm
zNn=}=l(Kz*tUri?b*-Qv(pm){KM4M^f583=?myrk;0v^3WfgH%lvdobpu#RLcC}TD
z%l4sb-)-8YNhg`vbHcgxW_G4dlCj9L1BW!}H1nNvKKFaiy;Diob@nA5GW$Z0FIJfH
z^yyQ!bLUPJ=rRO;CQ&$f=oA@4XiuIz(fCOciEu-BAj%+o5Ty_$DBNLjC<rf}hFFGJ
z5+Vhmg18J9h9bNW<q%a6>me#3{3O=paJEob5+V*U3o#8b12GSgK*5+fg)$R>*bGqz
zu@xdrBK?##CxxX+6pDEdF%0n+{eGpa3S}h-QPbGi*m~i@h3~@Qu=2U#PN&nXr>AG~
z?AfzF4Gs?WVHv5MDf*dhf%q2U`!i?Gyq%ky)7Rq2WHS2v{JehU%9S~|_74#45DkQs
zEDNRF5RFDRdOV)B@hP~p-|uI;ckiwsd^VB})Fa8ls4RmUQ6x!PI}-(QWo2cowY9Yo
z-mW7@aPy35!VuQhdWymdZQHgjM4~+0qGS?;!*q6NXlPnh)io97a=F;{?b`zeQ_reP
zk%xR38ykB&Jw3ezz+{@HF?{8L@5KX4j$evlEI+<?yWOm`v^4uF%hod=CZeyeZ-xvv
zP1VZ^OOnxzo;!E$NBEL-Fc^#s4-ZSDqodlw!h+i0-#<%3SR*gWvRPMG=Z{1pJ}7_o
zZb7^UZo&^%P*q=F&pJChSw}}lR-mb=0X9oZOYGURXXs~(qy?{|OXT_iGE_9#kN~1W
zVpQ>NgsIF$=g9QxqwlDP_-4<ZJ?`7LZ?p39a#LZcREpide_uO%_;5G8?S=TA%r>Ub
zMdOr-6lKrLM+b>nab!W5%ri%?cs>sOTKcX{ZEbCJSZb>y9*?ujmoHDikAKtDv_K`*
z6}n)GUX#R|BD6%hAW9d6Ndl}gji?PIFj7%bp<*emd=Z@=m}U<jJ{+W}X@(M{X6H(3
zH8f~_GNd*kbQ8K5aPEqi!1<CvppUu}tbh#JT320N%@oCac0;zhy1EiD)BK48k1Dl9
zN%%NHi@lJYgGB0rNEZpia&81}f?luJ^lx#5!=Pf<u3dYBgAQU6xuVKxPIj;gaf!{q
z=GxlY=)QgX<dTvS)03B%msxLbuQoC=@`m`Dp-QQ|Dn$#U?ze<mBplh{g9i`R2Lb_0
z|3c_tv`$dA#v$g2Z_UY`-$l)4B~8SUW5<pKa1LAz`WrWHJcqaMXf!VJ2GJ2=#Fm@D
zNAC+AIB=l3si|pI=&xSAie($2Y~?`jRK~bXlv7Jy4Q))==kqbMF2w--7(vgyOLI~f
zABkATO_i0ETTh)jRbu5`7SP8<=!+I6K)+H(@U8}g-pcI>`f-AOg3LT=%vP}(<7KQM
z$B#g^HduL=0DZp!dezKBWv9HWrluykW5*83%DV{qIIW64SV3QuFrkdRD+!-CaiSi3
zcq`~*u^8*_?tc9#=!?x*&h&$21XJ}{^<CKB+`M@+13lg+p)XjNm3P6K)YQAM8C+ak
zWOwi0eJ6OACG^E)j6)wF=vVbFg#P8rm+ZlV2Y*m|vnuq(2vewxLBYG+R^ElsU%!5R
zfh^(!&5M@M7bJ|JcZ(BtdwcuW*gBhe7l;1dy?Y$`DGoi~)p06gGELYk-gV^2k#$xR
zHbQ^v)~&P&^l7Je6mz_*rKP38%DXu9ckbMIFIYrQGw6sgD5Fb&K09H9MQpVR{X4tR
z7m_itj9KqGdGe&!s*DEc$L&I&moS5OA@rgB`}a3lEjEgQKHrS}tM58==uimD=rr{C
z3d?~Wy$e=BikWvApcmU4ThQAUX13Ts@3LBK;3f${FSa*vyU^#8F_#hg)2B~ct{D@F
z1iN_g;;hi#<ORJgVFZ0n8JnA%8*swL?Iq)Z+f@iXbg2UZ^s#)Px0|t?Jz9kR`0?Xk
zS$S77nZ!+!WntOR7qV$qz!YP5v5_q!@Z~Y<yAXQp>A@mK1?XeKhK)1A%=)gQM~}8x
zc^5)IFfhO#KYsi|Xm3_+1`Ev??<Bkge%0Q+d#hH1{?esOQv^M42A2xS)~AGV@X@SF
zqtWR4j*bq~HKPFibLvtj1*g|OhcLct$Y8<_;bOzgyAXO<UC+Ytf=1&sL0?d|n2iTm
z{Gn80*REY56o8o#fyZo3O-<o?@fY~$HSslHDD-xOiBHNV&!0cv1#q{)$O{7KKA5N#
z=vq}+_Rl<e^ys%&uU`EM=M52Gi-kgOSC~qyjQ8~P{0#AiCh>Bzk|a6%1Z9dZWRt~Y
z%dW6E@ut#6`2$w|S%Um3MmLejcV5g(7=AH$Sz5Sz{-DCmK0fu$kho<bGR0<#F?-Lt
wWs~i5<F2+QY_~h|luY{nA42{s!u}Cp0M$qRX5W<0v;Y7A07*qoM6N<$f^;&YYybcN

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-8.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-8.png
new file mode 100644
index 0000000000000000000000000000000000000000..430b18509d3b38dba358be5c825d62b5e3e96134
GIT binary patch
literal 3652
zcmV-K4!iM*P)<h;3K|Lk000e1NJLTq001ih002A)1^@s6|BgfB0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU<=1D|BRCwCVS_y0v=NX+n>|I~@SmOii
z#9)VD4g&!vF(sT0U<eRG5~xxkg(PZIIjBe_w4zmss?r82Qc6OjCMF50s}iM@BY`w6
zM20{q4&}0`xdOq)*v2=$ubsX({eCnoJF_-Pq>l8oyEC&hZ@&LK-uM6G(C%(?n4mUY
zKK<Iav^fTNo>R_s0d62nK3%43kZix8&-A@tj`_cBvQ7cXd4LEYQs4!`g|KEK*$wo_
zXSeBhujwJ~ioE0K(W5~R<mKflE0R<+5DUZu2|yeWBgewzFN$av&;hgufcrY-c(;kX
z9~|_7kaY(ksfL?YixOf<Kq@dC7{=cT2?<H##*ItSb=|l|Yin!QsZ*!wgjg$Z6KDon
z1nT=uIo_to<DQ1aLE1kkvO?4&mKzGB0V9C>MvfervtYr3@sB?GXu_mPlU(89;hNLw
z)IeDC`~6x^Pmcz|T17=g@40j5+VQ>i$dMyg@ZWl%F5t5PXp#qL6Vg3mX@5vJz{zeQ
zIs`}tMgrNu_=19hIcwLhO^l6=)gmGyw6L%+&EdG+<w?4)ug?I96P=x%T5)l4|7V|l
z)^zgZ$;vZl&RoK&Rf6k4wLCzxSe$Os2VVV_WW`6rg(!zS3&@F&kI#Ge-FIism@&g0
z6BDDk-R?mJ1ufp&+iQ^S>gv*9asB=G->=`jdv{rLbMr-<@+EK;xCYb;X}VHRAYp^7
z_-U97JuP}4@W8~06X(A7-g^&?8a2v6YX(|!up2E;;vF3w+Rd9cwW6Y;j>5vilUJ@>
z`8N)q6XKQPBCU527R$PXD2M&Kz{{}c-|+PPxUfEu4J34)3v20hb#(?>T3U2iQ}6HZ
zzvFzkijJVvOG`_2xY!Ncvk3SJun-s{@xpB5Bu7G3p>Rn{_i*TeM=(??o_OMk@aX7h
zTZ__CZEbB@Wo4zdXU`t(+O=z4@J&9U6C)EnZQ3;Vym|99`nt#Cx#L>&Z(8}|k3a5S
zvu4ewjg5^*u=@;fS$w$-M0?HAA0tD*2>8uYPd)V&EfdTlYJ)H8?d|P40!Cl7Xc2?r
zIIs)Y3Ty%X0Bi>i=jP@%W0VX_@_&IF?*qd6&Ye4Zd_La}{HK5h1JWgZ8rD^bpGiMO
z2v6CvWlLUGR+hsqm>4ko_wU!9dFGkQ<HwH|V^;}q3Md!f`%0p{{`&Rn&HMK4i-M)&
zGcq#n2vS;`X)rZ4)djanIehqVwWPFG$;G|TKmWXu&gd8S0&{_1KK=C5mub~t7El{f
zl3~%bw6qHR=a0Y|8I^~CvB3SnXkaps5BwPTQ+9Ut4G=f{HQ2`ea3g*C^yv(^mw{Pg
zT`w)`6w5|PrAo$$!=j?1Z2gozx_<roZd~{a{5&B(RxW;4ArZ|~#DZ`E_zzH4US59c
zop;_bQdqFf<#K6padBFHe*P#aMm}+aFlH<>S>{(C0>Z-~vDz3A45p7h`lw9O%|*$R
zDn~LPls332)v8L)xw3cf-Uhmm)#mkjwG}H?L`$wuP-N-1iY%*EB+6;h(4j+(C$!pF
zl@KhNSdS!b2+1x+tr8{t1p1^R(f1ljyriV0s=K?}^7_1YWMrg<5zZ6?MhIDll7J)}
z4j+sSRiQ}s{Q2`8VzFka>)oQDf^AAV_DHaFvZ~n%7H~kY#R^f6@G~rXoAM7;rRWBi
zE?sI9$=4+$`a;M&b$!D)q3%I(l$@L#DQQ&+f5Wo6>FN7IJ#}COwL2(f+$}|iR*Ftf
zPfrLndgM@3Q`0E|-LLNB6rvo)jzfnIRdASD!|i-3B_$<NZmzloH;6ech(?HTPoxfp
zv`k?o3pIKm+ahk$BOHy3-4+BVPMqjVN=kBDU69fc1tVH&w@-*rc=Ui^uUNrMG(jSp
zxqKu_coapEomH9I%F4<r%|(INbqd)I5yCa7@3mA#RvRB;@#4jr2=Wo4CsKuYoJ4S(
z{7w~d!~!vH_Uze{Al@~*)JUR8i=EI2m6Ac)6<L?b3N&T()vH${mn>OwKiU>YuoOn;
zrzpXBNqG7Wxsb!u2E~dsQ{-W&peCbwO@}V_4Ie(-QWMjvAgR6b$}4Aaeab-!^%}8o
zzsnS@Mj#+zd(f7oKq>h+Tu!I+jylep<>cfzjvYIeit_0c-yI?(lcoA(nTS5Jef#!g
z=wi*vy%;B~j5x3Tt+(F#1iMP5kTi%Z=&m5C#f{XY!>XB+Cr|eB;(>%|@gYNoXpcYs
zco@`D#*G^{lJM!1hB5<Sxg3WPn6h%^%7<XlC}aU!qEK+!fddEnC=+3@FQiP@NEPfc
zcM2*P62-?J0A_61uwnj-FTUu45H|uVSk$s~Li%Y?UPiN6RaK>9s2vj~OwguGnWC{3
zVnwnWdRi1cnt#=*RR@}ynhuJ3yCl`I9UOa%>>{0l8p>oLx>EG$mkSpz)Y&(&6R^{^
zRASV()TR97Z#(72W9%YoYisq_UVBZ4fT8IAHLy$?fTX}q!74lZRiS|J&@wYKwN0Bg
zSz3pFOv?wezFmibjzU|vZk>kwepQD3s&u<elA-#{ZMoYtso@b3u7V_G^yty48#iv$
zX3m^xD{k&)qYKdhAgW28?=+WhF_u4YE=v)OHKm*EWy_Z3efZ&rG4tooH#FuzN+hjC
zMMba@qFu2(pSkw!x8K&bZr!TE$CISUB$$+zF^?w3yfq`^mi#zWh>m~q$tUM--n=;_
zF)`70Xi0`ioJEBA{PWLm5o88okfAhd6!X-n=F#E9BbRH-moL|lb>b1oxft>W(?mzF
zX%g?2qKlO_gl);MP+`g$(V+qgSwLrtf&{K3kFwWdr0xU$D&Y5{I9APbs;jGwfC{!@
zB#d^3jVk{0JK+1$5~YZhooX_MB{2{95uS86oZinr+ii??cB>#lP5Y^Iv%dgV13wh3
zmVLhm{sI4QJbn7KC1Dzegwd&#Nmf`QQ&*fK2vcOU#Hzo2>7|!yk>_lQG9~e*C<>L*
zYX1ya4$J`_7K==l@7(u2;OD?!@Nji!&z?1|VP#<mDIIxzpEQ}%r5e(@4wrO~ECdr?
zef8Cck)|A0k<Uug($b=>UcI`zw6v6Ad`z0fi_+rMiTG#=nBrs_>aVY_cfuGW=gyt$
zqz?y^pPW=d@TH)dsZy){Z%lMd<x`-i|0jLWE|GJn4jw#6hi9w25m+pxHCCecRsxqy
z6D|sjs%t5*2{_G>v5E<{;}9{l?k6(Y@vx-QFjcvt(ewD2PV8C^rX!FwH;c6@fwLr<
z6S#cu6^Yj<b)M~c1*e&q=B&g$OZ3vEOUFxwij~yrQcv%NppFZb_?gI&DY{LQ!0l>2
zHQ4#mm-WjzZQ>dYXytpX$STc@j>0Fw6)j|)su^=)1VT28%%P~|-BNATx<J2OvnUqs
zm&#;RDqh2`U@!;64Z?(|YMl(S#>J4-dk4`h>H}#Q?{*{EsZ*!AOiNf!Mb_x&FI>3L
z#9<yliySV)V!lwQ4p+^p8_QF;hR4q3m~}V}8o1jjL(`5-P#>zZ<rBmCz2fvSs)oxH
zzg;WtHLd(4j2$~RJk%5wQe$6$urbIoNSZHSzFcwf;zixgy1c<-k3FWz@=~%ig(U3>
zBrL7@ZIgb|Nu<x3HOp3WF!&IJT>&}P?>42D>K!|F)Fa;xrOL9h?3giQv<Dx2FuSCr
z<V#6i9TKFi(u(^{B1w(Hy)yTEKOS~WT3VWBS9mCnkc(@Cml8Hc!{}AH7M6`de#`Rt
ze0TI+N@R0C+LVZ0yLLHLi)^xBR6r|!OLDRU0m<*6AB!6{Y?vikS`{VNzjp1~zjK;Y
zCZ&z0(Pff}UObT(!;=XMMFpGxS4n%sh!G^5TwGl2324E6lE_nKJ|WZ8;ZA$~_19A&
z2en|OR%v3CW47X7K|>spDb*^;=|<BSAwEdu^#jgiZ`-!5o4u4(>19des?5%vJN4Y$
zTo#Cb$$G*zpitHo{!B%N4)@#(FTBuC0mIcCt7~#US9jig^UZeo|0*C?eBEOVtVw*U
z&UPZC;tVMGd2{B>aZ@-4a|!wuI|6pL<>lo@KZQ>vm>m!#VL3TD&e^kP8*TdlJKVnK
zo_lU@V`JkX>2TFjYKK}6a|&~x3>oF(dJx`A3pX@0gcRax4UD5f>kwR-v04KQl$>0{
zc;k&XI&sfExc5(i1tNYD#LfP<5^7qsi;(troDg2ep)4pUsIRD~Fa&p~8xLkvi*{T{
zdG^_7t7RcYE!vG0-;cO$(Jo-^R&}_EqH`(CvokU>rfk@-;Q{E-Fe)Mj$Y9rS1N%1k
zyoQnMEG#TMA<Lm^N$Q$JzcHh3UJeah6*s?U5HHSskN9#Hd@u(M9&=?RB&9)`g@VNG
z@}^oPr;pP&i;9XmKltE-bFk_u5$=~ocB(~`4$FmRi#IqTq&g*tdkm8ngBYHlpP!BH
zH5n->5}z)1s){sI9)pHfWZtCME-NcDUY^*$fB$);rz@r<sOv(qQN4E%atS|3sZ^>b
zQd~p5a*`-edNWRrN5NfU)6>(VrJ`{WxdFr7Dpjait=LHWQ)gO4X*JDq5A5X#3)1Rs
zBd-vT2|$$WR|Uc?WL2l2W?R}!ucN3}PufjlCFE--gLzfTX<E$i2)w56fv-;~(cNo$
z(WlGwLXYJ%(bpv#jJV4JYOYr|Pw<&O{ei16-}FmpU*|14{hR729Cl*+|84uP00RK#
WlYXW<G5A^l0000<MNUMnLSTZTCi=1f

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-9.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-9.png
new file mode 100644
index 0000000000000000000000000000000000000000..add1202c31255cdf492a9f8bcdfeb21d105e8ef9
GIT binary patch
literal 3561
zcmV<F4Hoi=P)<h;3K|Lk000e1NJLTq001oj002A)1^@s6@{lv60000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU<i%CR5RCwC#T6t_$RUW=?>Asgzx<f&r
zK&h0avJ{3*K_@kgppq~FH98@}KPE&&h%qL_FdD~+F`9^EG$v$p%ovTRGhq=hV1N<m
z0A-P_ETwecU*FO@-*@vn&EazIZN<qXCUcT6ukZEUcfa#HzvcU#bA6_18o##TH-3e~
zcMsq9YY5ohbC`kwAZB}2|GTH5ydrq`@L|s{&Y3gErxA<;;(-J~ydWsw@d+uCi~?bx
zUl0~V)g*B5dzwIS7-WM&FbPNj(gdmUK1qlNG|~|v*a!3g-9VST_Q>a9+#?F&vHuEb
z{FqKQ8OQ*#fE*23@;S*T$}0H84HRLL>;T$;7NA+c_nkm5?!{Gzf&9Qdlg5uIHz3(`
zU?h+S6amG2EiEk_yKv#cvE#>&&nPS`OvuX03RF~77=FLsh{a;Y_uqeS4h#&$>gwwH
zE?&IYx_kHTpW52m>T&IL;2LlPxFr)H`99n?GF;+5-KT|cf-L(8pa2*Rj3-vDTJ^x1
zHERm0s;UA>Nl8Y0e7q4128}=<V8Q3}86ayBCnAxE5e|oq-ring-@bj(UAuN&|Mb&O
zf52~@2Yv#s01aY!x=qB(U1raoeJ5!l954PlQpipO${&9C;RP?g_~N*!Q>Xe;Q&TOn
zBsko`iI9AEcQ;od_U4;!*5UOa{&iX=P%l;|@vxi4?;tHctO(}<V@WnUJA3w~O`8@!
z^UO1;nVFeCo2*mH>hJG2;3~%3Z@=BPZQHh8`1nWQj99%%v-p4;Y30)a$pQ?n5?~4l
zSMS)d<Do^176oZtF8?ns3Yc(WVxp0on`^)rS!ro$zuU59i{cQ|^7#M^X}YDvpv^7v
z#D6P4_~3(wmM&cyOi4-cv@Wej-=*J%LLnm>jauK2i;FYp_XPc3A2a}0ZvFc8jGY<~
z*K@kc<*Fz-j(AC7(}3Rt?`__^87tVv3}AW<kTqLdTTKL+SyNLJDk>`C5}%~6PMS2S
z`MKwwGjH6uVPZ0l*JFZaQ&W?<apOk%^LxNrU<NQs5`yKv3N(<aikxjJunc&4{`~nT
zc_aSdP=p&A8qC$JSJNs-ft|pgfUUqbU^}p<tgNi9wzk%lIDd!ttFEp-E!Wln6Ql+N
z-AHGPl{w45eDu*rVJx*LVNR&AvC(|=(MNl6%|C!Y0)GHj0Ly{j%BsB#d`7F27zsKJ
zPH6Amy>y4qfDOQ0Am46nMcOX`n8`2QfB*gE4?g%{TtY&EXF&Dz^cb(d{`$a|Uw+B7
z#hiHrI1ZeWOhBvE0{`MFpvWA0_0?CSyw1@-k(F?7-_uV&Jx^ABloYlECnc&#b18C>
zkH<4pu(G)g2HoY$mkneV`tAuKcUDr?O{sLZr1D(^>VSWvsMKD)desV4r>w&Ju3fv9
ziC~;qIaB08z>PF#H3FF=Z8%nb<&{^u+uPeuNnyAO+?H}2!ZNBX&?9<-CHoS-U-$02
z@AfmxI1Of-^73*6RhNNSC>1$HGMvv&I#EPV=Co<k{Jhw!vUPQJ8T<F|C)vwFsKs6o
zB)`(6y;7nZsXM;;=9?>=v{Sc4Ycst<)8vVK7$Lmk?Ydu8!XyyRAFAT96o3Bt=LW2H
zMO>goB<EeFSKfzZLhY<}_4W1F&YwST=@O^GRYq{fL4Xwt=``Wzx0ALcD10i}%a=J=
zJdPec+9l<-RS5Tc6oCQFRVYzg4<0;da`KM7AMT%=oNO#vvSflr`Yyj7Y@4uTfuVE-
zgOE~Fmb^<ebHuIOinU{6@es*hzkWU9W@(j4#*G`7Es{c!4%$f%TLF<Y(pQW4YQJ<S
zLv<c{zi4R-uN?rAo-$>M%4jKWmbQKnRvuD-GZ5j=eL^;>HLJsE*@!q0_Vhs}f&~i}
z_$8yINUjcw5*;MXn@8YJVUil=wu4$Bp9kT=AXnLmOAgZUUT#RgrnSe68Iz;+pF#az
ze&ufm4jj0_0P$Kn{$NH%M!Kz`9n7PArD_D?rCrOE>Q*F8MF}*9MapYX1wwqO;-WXr
zgQQh-cV4=5$s8(3CQh7~FA_Fa)FFR7orOu3G)w+hD9uC}8wz5^j2TmwFJEqW)dFQ4
zu80thb0Xa*)vWc<p+kM_EZhbKJXBz|Xl|yZ`=soS7L>|+wrNvEX3hcT&73*28e%Mt
zI(n$o%Kzu*=O=5f;YgY}^fq$nb(UE-7a{3qpM93ro{qOOfm!leDd6W-qSAf?EG;Q1
zc?4o<$yZ-}m4fblNY_yAk(Za3XxqW^>01bWQn4CQW>20zeR}-dxpRF^Kh6#W0b-!5
zNqOOg7Zx5nb}UzfQHP{6MtT~oISOrBDUkixV~_a|2UZ6&+?I`j3d8wqWbYu|FE?db
zzWnjWA2*=uE<lgySkhT)XU&>reEs#;@o=YUc%4RxjU_b;3k!o46%{`Cu2tDcl;0o9
z9h_P?+}pnIcgON4NMNzmT@U;f`XV}1BfwS+{%=A+nH?P+W@l%o2{FVH?b@ax$gM_z
zuU>;K+*40I)hHd%BN8tOdJ~}3ShL8?Gw{J5QLe2D=(U7&A?o1t^mGHAwPjsq2B#Hb
zIt3X6jf16OyaqEEgjJWV$sMp)MCBqB@#jvQIB{U>)~%Or-@a|QiJRdLihitwfmktC
zu3TxXTer?|)6{z9#l-Eqtfnq%)V@cG<kkm(b-<s|$(%iT@}$|_-96-zI=K!zdR~vN
zJc5;=<;>~Rr<=EK-SWKt=FOWX0{#%bzX_<8ydO~R5ftJv6o;@Vw+6KW$R?q4=gvKV
zPGt^yN6J?#u$)|gOG>M9>HGTnjI(FYnje1nVe=PXd{GCz(k`(>ojlnqi>Q5+D_5>G
zOJ?gAYnylMnrdQ1xk{U)G9RjBAC~kQ8c$ZU`;ZP(Rfi*$%Ocy-(qh!s)<%yUInoJ9
za20=FkX_Oixgqxlje>%L3Airk<xX%<Qwm;>((8JYp>~*pQhky&IcUg5OodS_b2D&K
zG;UI9X=z4rad9%TMi@6ya<$80FFGW@No$pWv}YM-44pc4DkL%1qgncn{pp~HpES`C
z*-B4n6Nm@_Wwilx<R+jrazxWG-D0IKc^}aBx8tx<L9ePv8FBph@fNMo2-!7zPy|Ve
zh@WD?C?TFCBtu%S*CJNvR>u%Z-U{)MpkJ=dkb7|zvrr{nEzPXK#&`Gb-50cW&XqK+
zoR8jY(dyN!S0e9bz_;R%SN-Tz`cb}n5ge`i_U${006QkBu~DqitEHuw_O~iraq2_?
z!F(Tcxm$&#l@Yj6#O*b$Y3|o^wC*03rRU9?S6x$6Q%ohMG6IkQ3#5Z|9$b3d(xpq4
zo7~bG*1PtTMN=n=r7ca3j${-`yA9^={rmSfN(O6@)eJk4_Ny}%1VIv0n$w02vqX7$
zc>*#=H3F|)tlXhlS|=P7!kOaFqoMXDp)~v5HiMWo(DWL6_Ut(=E7>YWiP{_IpjIMH
z<m3+3z1Z`x+DuusYSlE5z9g3D6u%yjJa1|nKv}ZsV(IHAo_Jy+)t+09rY~>bzP%j<
z>4J6+6LM;tmG-a#4MM5z%$YMWx6(~Ly<)|R1l*jud5SaxC1TAS*{jGEvTO(@0Tq)c
zPp*QL4Z67ot;~JCojZ5_D0_mp-TYaVZxxJI+G}cRDp<B`Sq^2TJz&&k3P|UC`|Y=?
z82Ocs7VC}@RYt;<`0m_y-g&1Ka@Vl|;Hq+~?Tt6yXhTujD?6`O#63cKte|fkB(1mk
z@fR*!Fh`6SF##1Yf&OQA6E*^6Wo0B^_}zEkC2Hr5IW`Md;wE$7fB*fl2wqEDyQx1k
z6Xu2u8~!PWM(4#nXz3_ACDVztepqh-!4Rsds+x%E6;S2cE=emZD-A4r9x7rficF3a
z5B7|c@#9rbKKbNKSU3~Cp|v_rgy|N|&CSO1&p%&RUtfPvtX!}B*?y*|NGqbMz>E}2
zRj}84?X}k)fkI1W3bY^gsIx%^5P_w&K4Uw^UXVdcvi9qAfyJXaX!mAJ?r-?$2ic6j
zE?McWO-;9R#8e?ZMgpyJ<Hn84HgDcMg6)@+yQm3}gw<7GRn+ONmnfp}gX?r|*|O#D
za*}XLnh^SOpVP^$BJI~U3L}yin`G~qJN$=e1uXSx1YV3vj#bOvt&=F-NF6)75$5D5
zTN@f0jF(<|=_Uw&CPy6SBsX`uWsITD#+9pN$uYthwa@YR<B!i?vt~_^IvZySBv~(g
zOrq4soGg!-p)0~~z4aDS{fWbJKBG%m*V9_ZvvJ!VT%2~Skt5`bBqxtXW+_8uELpsG
zaTfj#BHI}DfaPk?W$5?t_Zaej=O>?hat1-mGnh+)Ya$2QrLu;-o<wjZtq~7s&wHec
zWF0BRW28(bTRrnJfByV@5Djuyl<hwdLs{+s$tF!5Hfje+w{1#p$VVqUN!#2-f3hZ3
zCZLd}ZAL0Z=hq$y>en7t=@jzqn%-91#>09@#eSe~xa{P!cO1}4eYfP$L>rto3I{Ze
zt;qLj8ayImXxLBG-0Ra~YMUycNdW!TZ`%>l^>x&?9q_Zss;qVI4{tbBQkx-68-DQ^
jB>n#<Apb|>KLQK@`Y9D2Zm_ee00000NkvXXu0mjf72dv#

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-comma.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-comma.png
new file mode 100644
index 0000000000000000000000000000000000000000..f68d32957ff8dc2e6e26e2b739eab85385548faf
GIT binary patch
literal 865
zcmV-n1D^beP)<h;3K|Lk000e1NJLTq000vJ002A)1^@s6gsOor0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#14%?dRCwC#m`zUGKorNvj_nX=O4AUM
zHmRaYfI`Iq2=p4<pi;M-g41w_?t;_}0;O5eC=gZoE-g?8C${^4?we@hIILK7;gSB>
z8ION{U-N9C`MxinYv|$`M+}Q$F)W6~uoxD@Vpt6OzhDOaIXgR>o2*u=8V;)D@TF?C
z+T17S{{H?ym;%w+TADXmhT?$-O-NWvN0;UR_GXqT)+8VcT7_OfX+F1jnFIZS?x8!#
zh8}URz_+nygyLs1<TaFs3VgoGYX~%gdQgYY$=&gsWeiI~>rfHeIXpZ(*xcNFpGu`(
zwcG8nVHo$9mzUrA{eGSAow*&jOrP%XnP4jnsY0KQkB@6tS64o6^aq1MaO`wCezV#1
zPfkt<_8IyJm7o-H)Y71MrP!@^ySuwPg+f7WY;1^ZHX9uC`MfBVO5*6~=mXZgWiM7_
zg2J#BUQj3&i!V*nT&N{Y(}Zo?<X(njY0B~m!;+kU?B3oULS!t!T-OyB7Z)CTVXAeg
zEA^$8MLLm41XhH{bUGEI(a2W|m^HIZ))+l0SuU3|1dAF3Ycv{TE{8{&;;b&f$S(^)
zPCo_f^?DCnbB|mWb1+@8%tD$iUDubwP$Ivcf@#WrOm1&)FSTqknTUG5-ecG}%FQ{;
z*4EY{Eu%~hheL6T!TZu-*g^u-Zec{h$i?&XbDuZ5EfXNSMmPb1b(KoRigJ@+H#avF
zqX)$@H{5B}g7Pw%j93Ok@X0EffJm6nlXTIBi_>M9#738`=bqh+giU0>f>loV9|82+
zaU80#CVuw0IXW_vYCm)NDP(>JPj7d--Su=j9k?q&C<*&31~<mve9sJ~(L(G&lUsBS
zDnk|Q*MqICt({yhm%(+f)oNXzo}PZewFdMZ`T_l<TBDZ>y-*}fwjTm!p*P&Jvpnyz
z)m?^=o3|X6i423GymcH7s?X++lz!!LDcrGp4_y83T(4ux)LkG8*W#nj518@;Wz|pB
rcm*5<CX||!J0kK0tU^@SUjYUHNv2`hoe|eD00000NkvXXu0mjf`J|EL

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-dot.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-dot.png
new file mode 100644
index 0000000000000000000000000000000000000000..80c39b874533f1996978af8ada97133b743870a8
GIT binary patch
literal 771
zcmV+e1N{7nP)<h;3K|Lk000e1NJLTq000sI002A)1^@s6YiQ~b0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!rAb6VRCwC#n7@w_K@`V#*;_mj;;F2}
zKtgfXoSGO53StEfv9_@@v7z!mkb+L+Pq3Ae%8G=71PPSHXtWRvM#STX5JZmKU3UDw
z&0DkHp_iDebSL>_XP0^3eKYf&7eE$5NN3S}(it^R$P@B}JRwiW6Y_*SAy4SP5!!0C
zTE9F<CX+HQGQY&>JKtC>>NlHB>x7U?fC3eMrUE}-6&6|p1Lzp5^Zgp4;-?Tka0Ir&
z1rTBaEJ%Zoz;`eQ3$UbTh&3rgX9|7}x(Kd<2wyLO^E@RI`3er0F^e8jrdymkWwHaJ
zU>EG6-At#`*8_n7WhgqG&Jb^YGairM;r=~O+gUez%_x%?%@8~chr`cux!mVouO}vx
ziI~l1Vmh6Q;czJ0?Y5Q8W=ZG?xDRe~_LPX7{ta*sJS`LoBN8x8Qyg!)u8YB7AXw}%
zxJ%jddP>*89q=fXO1<p&`x`~vVw4#&e~y?3oYfUt=yR;7WipxlP$(oRit=0Isj4bP
zqfr@SZ{hYb@3QK1ZF?vdiv?)lX^qBcnzrMzhvIX&*zTkK^;si_>TEF6vaC~s48xE{
zqtTROY?u4ELr$I4>-A5|<x=|7k3kZ_hFFzKrA;wxRD*<8U<L-|a=G4UG**knLfVuW
zXCf7gMaP&2>~39QXWMIpY}VCkbsmq$cd@;G3M5vml{BBvrEa%t<@5R1rBdky#=iw0
zIjg12+aCmBcDQpy_7jQ3UL+DBYmj&PwOZ{J`d!cgAHWx$%}VBs{OkvExyH8F_z-XN
zhAjBd4tYuwo)#^QA>$xAWkltmAR9EuCtu}5>6DRg%ppIcnq=Aa2%R;=oZ@xF169W7
zDr`CzH^QVBIE8JK`;M1drwJD)wp9Li|3LU5zyS0^RhH-3lmq|(002ovPDHLkV1mea
BUy%R+

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-percent.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-percent.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc750abc7e80287192efb65633e58b6b19e47125
GIT binary patch
literal 4904
zcmV+@6W8pCP)<h;3K|Lk000e1NJLTq0021v002A)1^@s6+|?2`0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU^%1J~)RCwCVTX|5`^%no$4KBh(7G+V9
zMHC4T1Vu|t^r=~?6*l^;*P>>HPEA?bv`x0yR5sa^IhC4IP-&%2W!qCT)6~GN6jP8z
zltl$(hYNRk=iGM=@9+a<{p0;+&Rp*D`+dJ>|D1Ea=v3#IPV=h$PLh+zA^z^}r3W$!
zGSIW_KsG`4u0GIsjfJ#}={1b#=re=(4i|0#YNprjY=)m@0_q3k3FJZV@v;Kd0W|<M
z31Rk#NnXfZEQYUcv=M$dGiegfLFVd#YKa=?Gy65Ps-rcH#FPcd56B<LoA!aiss_3Q
zR4KIDH6{-pJlOi?`s=SZ5;Mq{4=pqR$d^7d(u3I?jkF1tb^~qVB2hUpi(0V3T28T+
zWDcL<MQa8E4FMXA>n>QZAbRG^nNiO?^UR0E#l_jgTq9~z?!8NzghdU+poJL2g+hsf
zr%s(3>2NrVMMXvR`T6-ZbeqY?$H!~YqD2vtCQb6+wr$(ljEsy-_`CopALtxOAAjEj
zYuGe?=SEiIO=||zdXeGb;n7b$^;GQbx8L61U@)iw0|q>G>#eu0fbXu5AobnyNm!iC
z4z)E9C>-cIe}DhP6)RT!WB&a4{vIA4N~hB)tJSLZ?Ahb^^2;xA!^W3iepw$D7N$%l
zlbSejV#3_Hb7Ph-U;alyK|vN-05e)gekv`XA88NQ97OAmNJ~pgUb=LtH!!Mj-IkUX
z<?ZdwrtH=o2BjuZi)PwX2vAH!L`2HkwQHwNo;=y)<>jSNns|XW)x3H0^tau1n;SBX
zn?MHf>esKInlWRBY5Vr=6Ysg_p1_kQPX@rpK|sYoRTMCIU1YF7xdbv8mYSNH^vENR
z1SBLRC|uKMG%Balsp{(L)P@ZkPK)5?=uYJ3;9;i4!hqsIgHtwc+&E|Y^yx<2I5HzI
zWE2<I>-FuvbA>_Bc1})?TD*91RaRCO`cV;31^JRgM9}_V?m^S0O^aH#Y*}zzT%68g
zvABfB&uwmQR^WS%l$4au;q4xv<76FG@VTw4nq($@$l0SFeDJ|3@X&S)+U<7L(9obR
zT)3dX9M#ydW6_M1o10sk-?_WHtEi|bwPVK)pC5nxal+1>J4ff`<yC?;G?FHCiHV86
z<HwKp246NKW4M-N4lfjBZEdYuw{Be-nfw(p`{wRy(o9Yt2{ab`V9wsXdnXPWG^o`?
zS$oyh)#}}M-&HTX@B(VX3LEuUzka<+N=kB>miEGX(4U%`nq05AY1g8_2nq&;fsEnr
zQ2Y3bpW%0`#RCTps3}vXd=GDT0Uf4*hJnW_qjhJRG*S3QMnje?S(4!E>)VDwyc!!D
zReE|lGMG=%(|Yvi(Sbkw@IxZ_uK~=i)i+zSJD4+W8cANrELsIJhMFoVDN)~j_nrFn
z*I(7<&70NW!Gm4DBQ0Vo$^*JUDGBp%OII0GBFb^v7<|huw|JS&<~BdV4OLZDsWofX
zoQJoVoN_3L1ikalJI!a#oSE?ItFNli(9kx*vDs`cM(}=S3_n8+6&4oS_U+r(yldAk
z=P$qff>B+qUcFkOfKk)<n-eEaC`e0(NvLI%imY7)0Ua^v4=ErjI5@bS>7lu8+O)|5
zzIY7Y{t0x3g2*6X-n4b=R=?S^XGaeiGNcWYcpoHjmlc3kTPiCnFJFQSHeYt-%9SQs
z8<T$|n7;SIg$or5n0@iR_ueak@6H09@2M7*25tDp$Hx!SYLP?u7hil)L<{DTUsx&c
zVU8;TjYXrT<b{6t=bwM7-+ucIH~1IbUq%9Qqlk`L353+)jV6ymA}u<<`s%A*Ymt!$
zqYev1ON-X8aO0;>pH|t~*}3o*C3~41znaK}Kr%Bk?P!W^q8gaph!G?3&%c4t3bKg)
zB0(YZEr4n)vu4e5`7Q>ZnwlEa;sv3_ik@mw1|Aps04W-@riwlVzGD+uw3;xglR`O~
zT@z^B4rI^<9(bgc@+4Y7E<M9cgs{;6vBw_s##DsAN7II2W&<r|3N2RmRErWrx)=qY
z)M=wCnhr$KYLaG+s4SeamV^!JIsyjpye86oIlb1?R~QF^@4ox)Sa6fpRDxRk@WT)D
zNz=XZMad+i9z8OM($q4Uo0}^cv{EIY7e4KgoSbaZnmVB(8)>_lKK39#2FM#W>fwhU
z_C*NCxcKLve{T8x_ur5Al@^tzbaF6UlNv!k0}NWu<qZWJr2*L%s1n*mWqckWB&*Q8
zJ5?NrkB37}jze&d_c7Q2E#`^5SV4ld^;C<jNjv)%Ml@}N#KlFW&)`@uYe2XHMvord
z4nUxQ$O;<iBToYC!zN6aFa}bF2LgNs8{mgl(Be^eTPPzcFlbl3xbz};)IlDzVc5S0
z1mr^3jnfXA9z^A#T#8BI;KsoUE)bJC!pB3goC16t$ti=u#+z@xnJu(fNm}d`gUqCr
zs`o1ZtIE+Yv}r)JK|BR>0R-qnZ@lrwfvgb;1OTcvLDDaw&AO2<M%;Plo#Oym85r)N
zFh2hH<HmF6&Yh$R<05IXxwl$mCY$JimjRgP)YsRuiE?zrN+W=(_Q6!S4<kSy6%rB>
zbN~JK>m)wK`w_8h*|H^%Hrz~t8Vs=QI!OG%oH9_0APDrulN3><7Hz5zE@l!V*v0((
z{8PJk?`}fL@`V}#O${Q(VzAx>N+gPZ;DHB*vDry54^h&(fB*iY6g-^NoC>?^uDcRP
zjT)unNQ^>-#9v2REYxVx(N|11(?ikG^Im-M#RE_)I@vd|&Re;1r5i{-0$U=)+!&zI
zbLPy6PfJTv(p1sh&z?Q&gy$TjG*CmP8VmqF7E*=}rwj~C0Myk7AAE3(e6g4iRAXQG
zqD&zzRET0xS^(Po11gH(H{N(7Iv^mxm81bYtIt0BEcBy~KJqLpE31VxV*~~Rq4GC#
zS%#?x{Scz56U;XYo|8$NZXt{s3MnI&QwD1h%oJiy)!*ccmnrchg9hpzax`nxxbBXY
zb(+oqnq?HwsFakH$#1{?_E?a<9yP^Gp!87-2;`B_uMjYx4?=<4ylT~|%wxxn?I+FD
zP#-5IHa2z!m~eDpV4zDVXep;ool>yQ9$@lkDu@fH7sM?RH&TR-KC_YK$>y~y$6qUt
zV&ByP5^JUidy#V|MB3VE)28L!ci(;E0YDE44-a?4ik(prGK`u)^Mp#n`st^i7DAvo
zNcgmn{M>_m@yREj93i!imCf3<YcG=)F9_zm7+}!f?v%FdlnEM0+x4QGZl!joqazLL
zut7_WUhZIfQ>f=?iphJx@ZrM;4IMhvAF6impr9ZxD3ohJdriRL#fpjwZYCF#Z`YC*
z5ZR2GF=NJ@jEsyBe}Dg0&4bpRQ>IM$5x)PGYSc1f#GBGnAelKgwQa;y4f!oo6@6Au
z47)}XQnN1Szz={?yXdC1&`p)JaUbwCZy*oayn%klV}WY1XakvAFr%BNpMH7>rwma_
zl~O6idDJYxLL^)<AcX56E_hok7Gr5?X(PD7MW{{l$#*Z2U}U$xisB1u*3MdO1)F5H
z?A$h)KgB$RM*?~=+-amua&=-NOTczY__Afo#wR2s=(stB<_)Ekol2>5Bp4mtgK28i
zv(G*|3lLEtcJVMsVGMwL>H`)K3|Khfr=NbR19vLkxpQYWSP^&Xi^%LRlhCna@2Xtd
zAZk*v4ZdV;Hj(L>#9+rDqMcncy)uyxB85W!jCtsxhgwsHrj*JfO*E7LVfQ?7-MV#i
z7c5xd)xUrLc37B!#=ZC6>jkJOs<^m##OBSLOViWS4*|0$$%jp1f39Gq>&noC#t3o_
zsWf4ot)f5qVFJ+PS6+GL&PN}8)B`o*ng%sAC>$?9irEfte<wz56xGLoS^pCPlplf%
zS@Lmbk0B>Ub+il&U>N)`uRs6%^Cx!f*zs@bK%5~rK=ZZgx;h!^L<j~lXABl2@uRr7
zxH(`}v79n+qmX0O4L96yyr`(?2MRWoB$(JqlP0A?bRNaOmz4~{J^&1A*REZ5un0$L
zYN`p4lR|ByIb$FzFE3Xhpwpj!{`ptbV#y&(sWbKggE}!R8o*V?6Hh!5E&I0&!hyjP
z<Udtp6=>Sw01u<J{azFdR7PsiqDAWa@4x?>f{h;hF&L_wNB}G@Mp3H>TmZz3%*@P8
z%FD|u6Rny?eIKAE0|g`o6T?7TNjKkob8D5s@Qpw?nrJBnER3iD@$vC-)2B~2X`9e!
zipU5scnIF^rF3%u=OOSckXMo7<{4@fQ`G$V^T$%^^CRmr=zFO}9{E`)x8cAj3VbmP
zCCq+>n_a(teGP!{zX&Msv={?L5C~*A1}Eu<xOrq^<Hn8XUq{FUkC2(8RtvuQ<{KsJ
zU-VVT$$pf&e27Vtu@AK9LG>j{FA@;aIGHkVv%s7JUtthlLb=R~g>%zQH(9j(UJNo{
zfBm(iy1M!lygf}mRzaJ`drQurKM#+$weo=4jEIQPlNP<nQjGduYLO??7;wTND#k8f
zzI*_u42ExDT2~0Z6_T%5$pXAVAYnKG)AonZhxhH<cZqUfu{bYK!)Fq(E6+nDIY@%i
za3~4iy|?DdgH(S?8`#oF<f$`v(2pNKj_BqOp~Y%4Ro8d|;9?N^qPBH{=?0ShS<T4K
zDsr+b(zdG||BI^J==sJTGf63fJ8x+J5rAvsq2l+1tF;}8i64@CDVZ9VQVsMNSLYs5
zhF3=oFr09ac~%j0w2B(jm9Jrqj?NY-YI5^29i6_1DZ{8u885x`Qmmh!Uuz0LpW45F
zzjNERZCTXTXid(tr3o7{X?wkB0T6WfSWCU86>1QNDhwSpw7Ys(sk2~XrX<cOW6aE%
zGmRWPxQDuC&6)zC#d0#aHfMK|latL_f5iM)Qc_|i1{=j$AUW3X7&&sJTSvoRVB9Xx
z7U+AJGQ0>-V^b??#flZ-GG(9^0qxkKoI2V;CtMy}>hNe9G6`wNDmw4n&@z#L(TXfk
z<LWwUXv02aVQts<P>Zc8WA5C!$pFb(yLH?{-LPQ;4|wD}!zMcR_;(8+lqT&o44;vc
zlhYuAj6+P|Jn2A1Ahu;BlNbjO;z2o9B&s5tz88rfQ%1~l&pj82wIcflhJL6FuoKSh
zj8aV}oEbz-HNt((+O9or7Dz9GM;ivO*3d>@hMLnMqH$BVm=r0)k4|e1hmt4>4-|3A
z5IxjvF<aDj!g=I}zE+!`pI_e5Toagd7Y%KTIMjs2_z<w3fm#58Eg2AGwWui@y3C|F
zlGd6sLPJC2p)|5^%3$~gDWielTftR2;oMO`Nmm{^bSM|^liI|D4tUm=8KMXtK@IH@
z;Qu4<xZ@7J#JYGtrmU@7x1OLFz^%>BnG`8QCjQ}&_+znZV4n~m{1|DGJK>F*PB=4(
zsO2(L8TkPDYGgwjH$QRWL_Kv1t`iOI(fIegdGn$}LPFa3BZ7yFjEq{SEl*IoVkRA3
z(Ioprf7arJ2@}RHT)5C(HkDBu@4x?k4FsK2;yhigwi8Z&bFUZ8st|%ymTYLF`2%QI
zW5$e$q^^AuP%^$k+K6AZYL#AE5I3|TW$h&am&&<jSDECzh!`~tv=}Z&1GqWVB535O
zrW4+Dl}@;gqAf<<bKsX*t5>f+i-j**1g0W<{<q(LYfei`iyJp?Tr$x3rAwD4?cTlH
zmuI2e3x-JSgqkxGtl|i*e~}L?qEL<9&?M$Yzge?p#ekHJ><<jW-+Jq<3Zcczd_3$b
zoo+h`;0l?w7x<Dp1e{x5fBp3+WCDZAz<~o5yf=fUg4vAGdbl}_)&tns{`ljM{{gRv
z1G6dEwGnVvnPeDcUb%AR2yQQmV=T^3KKbOJ0O7nyhpl|-46?~y<b7<}vZX0EH#d37
zk|kJl``{b~HO6HdPs`9e;di#}+qajcr>7sRsHpgh%CQ1@?6h4=vJ01E>eQ+J!NI}q
z%piks@WlcuWaT`grIUFDcf_m35zqP~M~++qItEq#5C}dIk&%%Y?DPo6;c|l2G#@^E
zxEOxJNa{SbQ;Ny_YXl7ZUkAOD=xXK`BQ~5CFJAmF001{47{?3HMZ@gbvp=C(Mz-js
zc6z{%0EUr#o`<^wi2NuH^dk_W6Qln+0{a!jScL%d)($)9ooSG6#D`wkv}x1VfM)Vj
zQ&SUDQc{M!_S$RPs12B}(PF0u8OUsHBF%6^`w}tj$<@6W`ZSAqNF7n5I3d<<_@nCv
zUga4{5J}pT&`Y&w*H@?>oJSSDZxEG+o0w|JhPF+${kIHxV8d~>(Op*;Hw%d6NgGfM
z&(#0^XT#bD15|mw=vx0=)1_nDx-Krt^`A))|L2WOGcW9uIe%YXx*kecJ1&rt{lB~Z
aBftRVw!D&5)M2&&0000<MNUMnLSTaY-$WSz

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-x.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/score-x.png
new file mode 100644
index 0000000000000000000000000000000000000000..779773f8bdedd6c382b39e66b967b206cc5cdbda
GIT binary patch
literal 2536
zcmV<E2^aQ>P)<h;3K|Lk000e1NJLTq001Wd002A)1^@s6<+7t~0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU*ib+I4RCwC#T4_vG=@~wEV^uamEhtKb
zRx1o(UC~;>WhT)HwQ6c>V(brp7#o$S{ZV6ai&_<z+Ef!)Od6{5!zDFov{9ymq6VXY
zWg-e=VPHU6L>S<5m(%CHc|Lo%3rgpYX*kJ~<30B~?|r{_eclgEx~^*<>SfkG;A=>^
zA?1dY8&Ymaxgq6-lp9j+!?>*X?%nJ6VAiZzCftlLUW)wbrKP3r!Tb>9nkmnCH_CN;
z-E|Xw#Q3sB6b5XB)gVm0=mZ?R3tW)l8bB!v<%+x@11tu)BBu|q^X`#rH7F+k4gtb|
z;XpVL3ItO@oiFwR-9Q)ct$fD&eN<BS@_>bkh@4@R8^PZQ=28dcbpo#`S3bL~TwtOQ
z5fB5621WwWd}gE7dMTt0cty1HnVmaUmr`svWsWq+jiSPCZcyZXLj&o`Ggd=lC_$qW
z5)#rgGBRfL^z_6zoz6(N+bz4)&1Q3NcXxM7Sy@>XK7U2jskni)Bo<xtgpC`E1I7W#
zz=Yh~+?h#9N%1b1%Vx1yoK~x~J2W)31G4Ljii-YHU0vOyJYuw*O(|DUP>?rg&YXmx
zprHQQfME#AYEPd&&Dpwj>*o(2KKz^(Qn4tCDXWR=MgZf1w5e04W^doVeeR4IGlFqx
zQ0A@NzP>)Krluyfu(0rNbhjrSjmjzO4TI&PVq;@95#oJ`f-x~Mw$rCi&tJA|nO0j{
z>!eHVbcdaC#C2nUiC91D;K74A)2C0jz)G6Q^xq-?3u?W+z1o>GXG&hYc+sOW)#E9z
zRF<sMFJ8P@-Pzfx!JR(JiQtfs5G^Go#k6C`j=6Z04t$@n6iHXgeU!LSzTdKC%ls)*
zruZl(8|~`q(k@)M&~ob3sWLq3F~qK0V=1vRXg>me1)RVOJ$O+MbYaJOOG}HsX3d&r
ztUu28ri!J2X}~IZzG%^+x~8Tk9pT_31M#b0y?WIJ%U;LYJYXK<Gu-1^Dre!2lYoW5
z@1mljiXT0Cq}%QGfC?g3^z!m@9c#b9J3D|Cz{kKZfIWC#`uOo<zcS?A%F0STEiLT{
z*8TzbIWU=VDq&$#Zgn$Wq$G$XYF@v7{b>FA^|h_7t)3+CciC(<4VkBH-n@Alt)5DV
zt22)rIWj#tIa%{gEQz!B_I52lKmR2ZEWx8HW_>GboYNC(VmX8LB*Wr?nZR1${JM4P
zI-sD(js7liS3^UCK55b<sZ)OkJ_ByATD7W6-0uAz;#kMV^*wv`NX`5!@EhPKKq9?o
zdAkdxoFVpxGyQXb&A^p&=gzqXia&{+vuDrhtnST77FT_Jz3y;0{I0!n<%&BxI{F_H
zJ`96oCXub5iM^ClokBXp4}njCors+~1I3?M=hdrM`r^flJtg4s<;yw>xX(IyzoMc-
z;;aJe_It%yun$WzDn|v)To}jLSqU7?%F3!~Y;5#v4fVqh9z4)d&pd7u_j$WtvUcIZ
zg<nJ7pMllDkJ-{f{n0m{2c$wywh-x^FMxmDy?ghI-Me>pzIpS;Z~c?x$jr>tHf-3S
z4I4Jhr=CgOJbd_Y_syF(rK?DW)&eh?gnj-fm|wC<3e?9Jn<RUI$`dC}6koe`%?+3N
zEzanZp3Fqg?Dw6lzkU0*e&E1?e~KL785?~E6>|-i3A<RWML+}aTr8NEm-qPDvuB=u
z_&%4cd;a{nwrSI*FKMxA%4;XfaSocMlbbo&QbbUrun@#k_1d*-yW85@JoRdzOWfbl
z(V=bJxY1EpSNA1Dq>&WKQ_qYXa8NS@<G^9yaiXM9rsktZk7`Jc0hJTwZ``<{6&Dvv
zY_(9SPHx!wE~@{&1CH)>*T#+=+b`$`A?Ljhq0R3YN)*)&VKWvQ6qB8uJ!-{@6`l+o
z=#s=h<JacRn-@!B5ydXx;cO(O|Fh+kVu}JKq9CWBXNKY4k1+Zbj_)HQBei44js+(s
zCQc;d7)>QZ`n9UTD92qX>OPW;W#Z1AJ2NLtnBddQRXy{*WSy+vwQJX8(y1gWD1%NA
zr?dB0j_$M?sJ85QBC31V%9SgvVPRoDN(q|<0npGXeB=qqT(V?|dG+em(%^r@-W|tK
zu?2Fk`5o>Q^Cti)aAPJ~Q-VKtO4eeY&=xFMAhg|wV#)f5hzJdH$B1#`#!X}29>X{c
zVf>lisaybePKG<D`*Ww%GHGf1_U)6wM_QDpRe8HuaX-jOC-+MsJqsLv0a!^a1^iN|
zwlwSJ=4QW~&On!>%{`TV8Hkn0`@#*u5#I<`BxjsSCBwWGG=CR&Dn@(g&>>+OcY!-{
z-@kwVH|Qij9Yncz+qP}PQ&Us3NSBi6AvL_4eUxL?D0hzHM3oxIopQly8mwlos;UyR
zKLligD!YIG{vC{ZcKP1t<Ot+I#?Ir%kITj-{w9$HkD&FeZx4_Ha5$Ny{seb61ahZg
zxDjjRlQ`z^o-ad>3^%gQ`x35)xYW;|KQE@e25bf9(;yL4@U7*Pa*_1^4<LLB+!^oB
zooe1JC@5%!`zpv-WI(A0{w<UU&&$F8nxyf2^FL{OQjT(SbIp7A?#*WQj%D_SzCD4W
z<$~#VVWz(Z&J`9G_6C|8P}B5Vw{E$)YneCa8eAhkGKYi9XOQENqzN<}iDxhj3CH^_
ztv8<a&#W>ultO<hKZb0o^fx)Fj1#&&d-iM@=k@_VW95%Bv^pshi-F%~WMtd}T?$C=
zIlnrPAb-UACE_)@)@<=QVTw&pPftU(eHtGhZ;{~jSJN(Cy7cDc$&+&EQcjlql9QLi
zcrqy)$42bH2qavb$P*co#R?K4aI+a!?148*NvmW;a2OAAJmeBAVhn`Xq(m4gkqDL6
zbp87EHVng8saP%N4397#e`zF=Ej%JK7Znvb5DGa<moEJX@oR%D3t5W;#aTwW?vj#{
zJKSKO+Mqi3RkckT^7!S;mw$qI`yP~u!S2HGvKfMUo;-O{19#U@sjo=4TMf$TEK4?q
ziefVf#AuG4syQ1E4ke+!=4Pcx_nHh{A&d&fQAjL(A4044@L05!0$TXF+k1NQI>uF}
zPSL!FGXYHugKw!!8|5jc?C=~|LzvZYb{lRu6IKU#>O5GTI;wM9yK-lM9<2_lgQ;i;
ze@7Ks7v~f^W%v3VSkuSK*LG@e^Eyd)8BWmEX}UYm93ao-7?$t#aWiHEjI>>y4Z02R
y`8$L6-yckV`2V2hfbVjdhW^vb|D$sM5nupg@=t#XK}<LR0000<MNUMnLSTY>yW+zD

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/skin.ini b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/skin.ini
index 5369de24e9..89bcd68343 100644
--- a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/skin.ini
+++ b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/skin.ini
@@ -1,2 +1,6 @@
 [General]
-Version: 1.0
\ No newline at end of file
+Version: 1.0
+
+[Fonts]
+HitCircleOverlap: 3
+ScoreOverlap: 3
\ No newline at end of file

From e4afe717d5b569fe9a6a7bca1bb8891b2cffee62 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 2 Mar 2021 21:23:38 +0300
Subject: [PATCH 1766/3722] Publicize legacy coordinates container and sprite
 scale

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

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index 5df8f8a485..06443ca8b8 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
     public abstract class LegacySpinner : CompositeDrawable
     {
-        protected const float SPRITE_SCALE = 0.625f;
+        public const float SPRITE_SCALE = 0.625f;
 
         protected DrawableSpinner DrawableSpinner { get; private set; }
 
@@ -134,7 +134,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         /// A <see cref="Container"/> simulating osu!stable's absolute screen-space,
         /// for perfect placements of legacy spinner components with legacy coordinates.
         /// </summary>
-        protected class LegacyCoordinatesContainer : Container
+        public class LegacyCoordinatesContainer : Container
         {
             /// <summary>
             /// An offset that simulates stable's spinner top offset,

From 1841a4d1c977e04377d7427681a93ad09d8c293d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 2 Mar 2021 21:37:25 +0300
Subject: [PATCH 1767/3722] Extract legacy spinner presence to lazy field

---
 .../Legacy/OsuLegacySkinTransformer.cs        | 30 ++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index d74f885573..d4a403fbd2 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -13,6 +13,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
     {
         private Lazy<bool> hasHitCircle;
 
+        private Lazy<SpinnerStyle> spinnerStyle;
+
+        private bool hasSpinner => spinnerStyle.Value != SpinnerStyle.Modern;
+
         /// <summary>
         /// On osu-stable, hitcircles have 5 pixels of transparent padding on each side to allow for shadows etc.
         /// Their hittable area is 128px, but the actual circle portion is 118px.
@@ -30,6 +34,19 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         private void sourceChanged()
         {
             hasHitCircle = new Lazy<bool>(() => Source.GetTexture("hitcircle") != null);
+
+            spinnerStyle = new Lazy<SpinnerStyle>(() =>
+            {
+                bool hasBackground = Source.GetTexture("spinner-background") != null;
+
+                if (Source.GetTexture("spinner-top") != null && !hasBackground)
+                    return SpinnerStyle.NewLegacy;
+
+                if (hasBackground)
+                    return SpinnerStyle.OldLegacy;
+
+                return SpinnerStyle.Modern;
+            });
         }
 
         public override Drawable GetDrawableComponent(ISkinComponent component)
@@ -110,11 +127,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         };
 
                 case OsuSkinComponents.SpinnerBody:
-                    bool hasBackground = Source.GetTexture("spinner-background") != null;
-
-                    if (Source.GetTexture("spinner-top") != null && !hasBackground)
+                    if (spinnerStyle.Value == SpinnerStyle.NewLegacy)
                         return new LegacyNewStyleSpinner();
-                    else if (hasBackground)
+                    else if (spinnerStyle.Value == SpinnerStyle.OldLegacy)
                         return new LegacyOldStyleSpinner();
 
                     return null;
@@ -151,5 +166,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
             return Source.GetConfig<TLookup, TValue>(lookup);
         }
+
+        private enum SpinnerStyle
+        {
+            NewLegacy,
+            OldLegacy,
+            Modern,
+        }
     }
 }

From c441e993ff5961cba259e56b162c7ee384f0afc7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 2 Mar 2021 21:43:32 +0300
Subject: [PATCH 1768/3722] Separate "gained bonus" to a read-only bindable

---
 .../Objects/Drawables/DrawableSpinner.cs      | 17 +++----
 osu.Game.Rulesets.Osu/OsuSkinComponents.cs    |  3 +-
 .../Skinning/Default/SpinnerBonusDisplay.cs   | 47 -------------------
 3 files changed, 11 insertions(+), 56 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Osu/Skinning/Default/SpinnerBonusDisplay.cs

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index d02376b6c3..f16c1fc9d9 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -33,12 +33,18 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         public SpinnerSpmCounter SpmCounter { get; private set; }
 
         private Container<DrawableSpinnerTick> ticks;
-        private SpinnerBonusDisplay bonusDisplay;
         private PausableSkinnableSound spinningSample;
 
         private Bindable<bool> isSpinning;
         private bool spinnerFrequencyModulate;
 
+        /// <summary>
+        /// The amount of bonus score gained from spinning after the required number of spins, for display purposes.
+        /// </summary>
+        public IBindable<double> GainedBonus => gainedBonus;
+
+        private readonly Bindable<double> gainedBonus = new Bindable<double>();
+
         public DrawableSpinner()
             : this(null)
         {
@@ -76,12 +82,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     Y = 120,
                     Alpha = 0
                 },
-                bonusDisplay = new SpinnerBonusDisplay
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Y = -120,
-                },
                 spinningSample = new PausableSkinnableSound
                 {
                     Volume = { Value = 0 },
@@ -293,8 +293,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 if (tick != null)
                 {
                     tick.TriggerResult(true);
+
                     if (tick is DrawableSpinnerBonusTick)
-                        bonusDisplay.SetBonusCount(spins - HitObject.SpinsRequired);
+                        gainedBonus.Value = tick.Result.Judgement.MaxNumericResult * (spins - HitObject.SpinsRequired);
                 }
 
                 wholeSpins++;
diff --git a/osu.Game.Rulesets.Osu/OsuSkinComponents.cs b/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
index 2883f0c187..131645406e 100644
--- a/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
+++ b/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
@@ -18,6 +18,7 @@ namespace osu.Game.Rulesets.Osu
         SliderFollowCircle,
         SliderBall,
         SliderBody,
-        SpinnerBody
+        SpinnerBody,
+        SpinnerBonusCounter,
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerBonusDisplay.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerBonusDisplay.cs
deleted file mode 100644
index c0db6228ef..0000000000
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerBonusDisplay.cs
+++ /dev/null
@@ -1,47 +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;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Rulesets.Osu.Objects;
-
-namespace osu.Game.Rulesets.Osu.Skinning.Default
-{
-    /// <summary>
-    /// Shows incremental bonus score achieved for a spinner.
-    /// </summary>
-    public class SpinnerBonusDisplay : CompositeDrawable
-    {
-        private static readonly int score_per_tick = new SpinnerBonusTick().CreateJudgement().MaxNumericResult;
-
-        private readonly OsuSpriteText bonusCounter;
-
-        public SpinnerBonusDisplay()
-        {
-            AutoSizeAxes = Axes.Both;
-
-            InternalChild = bonusCounter = new OsuSpriteText
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Font = OsuFont.Numeric.With(size: 24),
-                Alpha = 0,
-            };
-        }
-
-        private int displayedCount;
-
-        public void SetBonusCount(int count)
-        {
-            if (displayedCount == count)
-                return;
-
-            displayedCount = count;
-            bonusCounter.Text = $"{score_per_tick * count}";
-            bonusCounter.FadeOutFromOne(1500);
-            bonusCounter.ScaleTo(1.5f).Then().ScaleTo(1f, 1000, Easing.OutQuint);
-        }
-    }
-}

From 3f1d36ee6bced20b47a167b8780d2a736001c282 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 2 Mar 2021 21:49:38 +0300
Subject: [PATCH 1769/3722] Add default spinner bonus counter piece

---
 .../Objects/Drawables/DrawableSpinner.cs      |  1 +
 .../Default/DefaultSpinnerBonusCounter.cs     | 51 +++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerBonusCounter.cs

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index f16c1fc9d9..4f5afc85ab 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -82,6 +82,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     Y = 120,
                     Alpha = 0
                 },
+                new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SpinnerBonusCounter), _ => new DefaultSpinnerBonusCounter()),
                 spinningSample = new PausableSkinnableSound
                 {
                     Volume = { Value = 0 },
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerBonusCounter.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerBonusCounter.cs
new file mode 100644
index 0000000000..633766290f
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerBonusCounter.cs
@@ -0,0 +1,51 @@
+// Copyright (c) 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.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Osu.Skinning.Default
+{
+    public class DefaultSpinnerBonusCounter : CompositeDrawable
+    {
+        private OsuSpriteText bonusCounter;
+
+        private DrawableSpinner drawableSpinner;
+
+        private IBindable<double> gainedBonus;
+
+        [BackgroundDependencyLoader]
+        private void load(DrawableHitObject drawableHitObject)
+        {
+            drawableSpinner = (DrawableSpinner)drawableHitObject;
+
+            InternalChild = bonusCounter = new OsuSpriteText
+            {
+                Alpha = 0,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Font = OsuFont.Numeric.With(size: 24),
+                Y = -120,
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            gainedBonus = drawableSpinner.GainedBonus.GetBoundCopy();
+            gainedBonus.BindValueChanged(bonus =>
+            {
+                bonusCounter.Text = $"{bonus.NewValue}";
+                bonusCounter.FadeOutFromOne(1500);
+                bonusCounter.ScaleTo(1.5f).Then().ScaleTo(1f, 1000, Easing.OutQuint);
+            });
+        }
+    }
+}

From 30f07aa9fcc22167e429be3bb798309ab3964ec4 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 2 Mar 2021 21:49:46 +0300
Subject: [PATCH 1770/3722] Add legacy spinner bonus counter piece

---
 .../Legacy/LegacySpinnerBonusCounter.cs       | 56 +++++++++++++++++++
 .../Legacy/OsuLegacySkinTransformer.cs        |  9 +++
 2 files changed, 65 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinnerBonusCounter.cs

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinnerBonusCounter.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinnerBonusCounter.cs
new file mode 100644
index 0000000000..3c4a6be4dd
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinnerBonusCounter.cs
@@ -0,0 +1,56 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Skinning;
+using osuTK;
+using static osu.Game.Rulesets.Osu.Skinning.Legacy.LegacySpinner;
+
+namespace osu.Game.Rulesets.Osu.Skinning.Legacy
+{
+    public class LegacySpinnerBonusCounter : CompositeDrawable
+    {
+        private LegacySpriteText bonusCounter;
+
+        private DrawableSpinner drawableSpinner;
+
+        private IBindable<double> gainedBonus;
+
+        [BackgroundDependencyLoader]
+        private void load(DrawableHitObject drawableHitObject, ISkinSource source)
+        {
+            drawableSpinner = (DrawableSpinner)drawableHitObject;
+
+            InternalChild = new LegacyCoordinatesContainer
+            {
+                Child = bonusCounter = ((LegacySpriteText)source.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText))).With(s =>
+                {
+                    s.Alpha = 0f;
+                    s.Anchor = Anchor.TopCentre;
+                    s.Origin = Anchor.Centre;
+                    s.Font = s.Font.With(fixedWidth: false);
+                    s.Scale = new Vector2(SPRITE_SCALE);
+                    s.Y = LegacyCoordinatesContainer.SPINNER_TOP_OFFSET + 299;
+                }),
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            gainedBonus = drawableSpinner.GainedBonus.GetBoundCopy();
+            gainedBonus.BindValueChanged(bonus =>
+            {
+                bonusCounter.Text = $"{bonus.NewValue}";
+                bonusCounter.FadeOutFromOne(800, Easing.Out);
+                bonusCounter.ScaleTo(SPRITE_SCALE * 2f).Then().ScaleTo(SPRITE_SCALE * 1.28f, 800, Easing.Out);
+            });
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index d4a403fbd2..ed09031fc1 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -6,6 +6,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Skinning;
 using osuTK;
+using static osu.Game.Skinning.LegacySkinConfiguration;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
@@ -17,6 +18,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
         private bool hasSpinner => spinnerStyle.Value != SpinnerStyle.Modern;
 
+        private bool hasScoreFont => this.HasFont(GetConfig<LegacySetting, string>(LegacySetting.ScorePrefix)?.Value ?? "score");
+
         /// <summary>
         /// On osu-stable, hitcircles have 5 pixels of transparent padding on each side to allow for shadows etc.
         /// Their hittable area is 128px, but the actual circle portion is 118px.
@@ -133,6 +136,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         return new LegacyOldStyleSpinner();
 
                     return null;
+
+                case OsuSkinComponents.SpinnerBonusCounter:
+                    if (hasSpinner && hasScoreFont)
+                        return new LegacySpinnerBonusCounter();
+
+                    return null;
             }
 
             return null;

From ad1b86e33a566b009ee115812c72461d87388669 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 6 Mar 2021 18:54:25 +0100
Subject: [PATCH 1771/3722] Change `LifetimeEnd` idiom to `Expire()` for
 readability

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

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
index 40dc149ec9..d97da40ef2 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/TaikoLegacySkinTransformer.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
             {
                 // if a taiko skin is providing explosion sprites, hide the judgements completely
                 if (hasExplosion.Value)
-                    return Drawable.Empty().With(d => d.LifetimeEnd = double.MinValue);
+                    return Drawable.Empty().With(d => d.Expire());
             }
 
             if (!(component is TaikoSkinComponent taikoComponent))
@@ -118,7 +118,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
                     // suppress the default kiai explosion if the skin brings its own sprites.
                     // the drawable needs to expire as soon as possible to avoid accumulating empty drawables on the playfield.
                     if (hasExplosion.Value)
-                        return Drawable.Empty().With(d => d.LifetimeEnd = double.MinValue);
+                        return Drawable.Empty().With(d => d.Expire());
 
                     return null;
 

From 3e4dfdb6755f7ea4bb721deb22029edb3dd408d0 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sat, 6 Mar 2021 20:37:27 -0800
Subject: [PATCH 1772/3722] Fix pop out count being above displayed count on
 legacy combo counter

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

diff --git a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
index 4784bca7dd..81b22b68b2 100644
--- a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
@@ -84,14 +84,14 @@ namespace osu.Game.Screens.Play.HUD
         {
             InternalChildren = new[]
             {
-                displayedCountSpriteText = createSpriteText().With(s =>
-                {
-                    s.Alpha = 0;
-                }),
                 popOutCount = createSpriteText().With(s =>
                 {
                     s.Alpha = 0;
                     s.Margin = new MarginPadding(0.05f);
+                }),
+                displayedCountSpriteText = createSpriteText().With(s =>
+                {
+                    s.Alpha = 0;
                 })
             };
 

From 413cbb30a0f45b757941c053db0e983d1053d83f Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 7 Mar 2021 13:39:46 +0300
Subject: [PATCH 1773/3722] Reword playfield shift counteract 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/Legacy/LegacySpinner.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index 5df8f8a485..9ce9fb9fd0 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -152,8 +152,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 Origin = Anchor.Centre;
                 Size = new Vector2(640, 480);
 
-                // since legacy coordinates were on screen-space, they were accounting for the playfield shift offset.
-                // therefore cancel it from here.
+                // counteracts the playfield shift from OsuPlayfieldAdjustmentContainer.
                 Position = new Vector2(0, -8f);
             }
         }

From 503f29609a69451ee2cf0de0f5473bd1939495dd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 7 Mar 2021 23:40:09 +0900
Subject: [PATCH 1774/3722] Also set additive mode to match stable

---
 osu.Game/Screens/Play/HUD/LegacyComboCounter.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
index 81b22b68b2..81183a425a 100644
--- a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
@@ -88,6 +88,7 @@ namespace osu.Game.Screens.Play.HUD
                 {
                     s.Alpha = 0;
                     s.Margin = new MarginPadding(0.05f);
+                    s.Blending = BlendingParameters.Additive;
                 }),
                 displayedCountSpriteText = createSpriteText().With(s =>
                 {

From fbfaa378fc25ce640eb809a0b3817511edb1042e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 7 Mar 2021 20:47:16 +0300
Subject: [PATCH 1775/3722] Move spinner top offset constant outside

---
 .../Skinning/Legacy/LegacyOldStyleSpinner.cs   |  2 +-
 .../Skinning/Legacy/LegacySpinner.cs           | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyOldStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyOldStyleSpinner.cs
index 7e9f73a89b..5c25c38504 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyOldStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyOldStyleSpinner.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         // this anchor makes no sense, but that's what stable uses.
                         Anchor = Anchor.TopLeft,
                         Origin = Anchor.TopLeft,
-                        Margin = new MarginPadding { Top = LegacyCoordinatesContainer.SPINNER_TOP_OFFSET },
+                        Margin = new MarginPadding { Top = SPINNER_TOP_OFFSET },
                         Masking = true,
                         Child = metreSprite = new Sprite
                         {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index 9ce9fb9fd0..421c43fd7a 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -16,6 +16,13 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
     public abstract class LegacySpinner : CompositeDrawable
     {
+        /// <summary>
+        /// An offset that simulates stable's spinner top offset, can be used with <see cref="LegacyCoordinatesContainer"/>
+        /// for positioning some legacy spinner components perfectly as in stable.
+        /// (e.g. 'spin' sprite, 'clear' sprite, metre in old-style spinners)
+        /// </summary>
+        public static readonly float SPINNER_TOP_OFFSET = (float)Math.Ceiling(45f * SPRITE_SCALE);
+
         protected const float SPRITE_SCALE = 0.625f;
 
         protected DrawableSpinner DrawableSpinner { get; private set; }
@@ -41,7 +48,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         Origin = Anchor.Centre,
                         Texture = source.GetTexture("spinner-spin"),
                         Scale = new Vector2(SPRITE_SCALE),
-                        Y = LegacyCoordinatesContainer.SPINNER_TOP_OFFSET + 335,
+                        Y = SPINNER_TOP_OFFSET + 335,
                     },
                     clear = new Sprite
                     {
@@ -50,7 +57,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         Origin = Anchor.Centre,
                         Texture = source.GetTexture("spinner-clear"),
                         Scale = new Vector2(SPRITE_SCALE),
-                        Y = LegacyCoordinatesContainer.SPINNER_TOP_OFFSET + 115,
+                        Y = SPINNER_TOP_OFFSET + 115,
                     },
                 }
             });
@@ -136,13 +143,6 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         /// </summary>
         protected class LegacyCoordinatesContainer : Container
         {
-            /// <summary>
-            /// An offset that simulates stable's spinner top offset,
-            /// for positioning some legacy spinner components perfectly as in stable.
-            /// (e.g. 'spin' sprite, 'clear' sprite, metre in old-style spinners)
-            /// </summary>
-            public static readonly float SPINNER_TOP_OFFSET = (float)Math.Ceiling(45f * SPRITE_SCALE);
-
             public LegacyCoordinatesContainer()
             {
                 // legacy spinners relied heavily on absolute screen-space coordinate values.

From 0ad3073c1aa3863edbfb4c4f485ad970e507127e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 7 Mar 2021 21:21:44 +0300
Subject: [PATCH 1776/3722] Use MathF utility class instead

Co-authored-by: Berkan Diler <b.diler@gmx.de>
---
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index 421c43fd7a..406c19e76a 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         /// for positioning some legacy spinner components perfectly as in stable.
         /// (e.g. 'spin' sprite, 'clear' sprite, metre in old-style spinners)
         /// </summary>
-        public static readonly float SPINNER_TOP_OFFSET = (float)Math.Ceiling(45f * SPRITE_SCALE);
+        public static readonly float SPINNER_TOP_OFFSET = MathF.Ceiling(45f * SPRITE_SCALE);
 
         protected const float SPRITE_SCALE = 0.625f;
 

From d961d110bf5294e26d7d51987dce30098a53e168 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 8 Mar 2021 02:58:52 +0000
Subject: [PATCH 1777/3722] Bump
 Microsoft.Extensions.Configuration.Abstractions from 2.2.0 to 5.0.0

Bumps [Microsoft.Extensions.Configuration.Abstractions](https://github.com/dotnet/runtime) from 2.2.0 to 5.0.0.
- [Release notes](https://github.com/dotnet/runtime/releases)
- [Commits](https://github.com/dotnet/runtime/commits/v5.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 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 2528292e17..c7aa6a8e11 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="5.0.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.302.0" />

From 74fc5d5b8cdb3452a69b70c59fa9c8c394103d3d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 Mar 2021 13:29:09 +0900
Subject: [PATCH 1778/3722] Fix potential cross-thread drawable mutation in
 IntroTriangles

---
 osu.Game/Screens/BackgroundScreen.cs    | 2 ++
 osu.Game/Screens/Menu/IntroTriangles.cs | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/BackgroundScreen.cs b/osu.Game/Screens/BackgroundScreen.cs
index 48c5523883..a6fb94b151 100644
--- a/osu.Game/Screens/BackgroundScreen.cs
+++ b/osu.Game/Screens/BackgroundScreen.cs
@@ -13,6 +13,8 @@ namespace osu.Game.Screens
     {
         private readonly bool animateOnEnter;
 
+        public override bool IsPresent => base.IsPresent || Scheduler.HasPendingTasks;
+
         protected BackgroundScreen(bool animateOnEnter = true)
         {
             this.animateOnEnter = animateOnEnter;
diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index ffe6882a72..abe6c62461 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -170,7 +170,7 @@ namespace osu.Game.Screens.Menu
 
                 rulesets.Hide();
                 lazerLogo.Hide();
-                background.Hide();
+                background.ApplyToBackground(b => b.Hide());
 
                 using (BeginAbsoluteSequence(0, true))
                 {
@@ -231,7 +231,8 @@ namespace osu.Game.Screens.Menu
                             lazerLogo.Dispose(); // explicit disposal as we are pushing a new screen and the expire may not get run.
 
                             logo.FadeIn();
-                            background.FadeIn();
+
+                            background.ApplyToBackground(b => b.Show());
 
                             game.Add(new GameWideFlash());
 

From 7763e1dbe130233a61493ddf1cfacab1be0f3063 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 7 Mar 2021 12:39:46 +0900
Subject: [PATCH 1779/3722] Apply workaround for runtime iOS failures

See https://github.com/mono/mono/issues/20805#issuecomment-791440473.
---
 osu.iOS.props | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.iOS.props b/osu.iOS.props
index 56a24bea12..729d692e0e 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -77,12 +77,14 @@
   <PropertyGroup>
     <NoWarn>$(NoWarn);NU1605</NoWarn>
   </PropertyGroup>
+  <!-- Workaround to make SignalR 5.x work properly, avoiding a runtime error (https://github.com/mono/mono/issues/20805#issuecomment-791440473) -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.0.3" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.3" />
-    <PackageReference Include="MessagePack" Version="1.7.3.7" />
-    <PackageReference Include="MessagePack.Annotations" Version="2.2.85" />
+    <PackageReference Include="System.Memory" Version="4.5.4">
+      <IncludeAssets>none</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="System.Buffers" Version="4.5.1">
+      <IncludeAssets>none</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">

From 765cc5cf37120b9892e9233127573c5189b92456 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 Mar 2021 13:29:47 +0900
Subject: [PATCH 1780/3722] Remove iOS multiplayer blocking code

---
 osu.Game/Online/API/APIAccess.cs      | 11 ++---------
 osu.Game/Screens/Menu/ButtonSystem.cs | 12 ------------
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index 569481d491..ede64c0340 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -10,7 +10,6 @@ using System.Net.Sockets;
 using System.Threading;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
-using osu.Framework;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.ExceptionExtensions;
 using osu.Framework.Extensions.ObjectExtensions;
@@ -247,14 +246,8 @@ namespace osu.Game.Online.API
             this.password = password;
         }
 
-        public IHubClientConnector GetHubConnector(string clientName, string endpoint)
-        {
-            // disabled until the underlying runtime issue is resolved, see https://github.com/mono/mono/issues/20805.
-            if (RuntimeInfo.OS == RuntimeInfo.Platform.iOS)
-                return null;
-
-            return new HubClientConnector(clientName, endpoint, this, versionHash);
-        }
+        public IHubClientConnector GetHubConnector(string clientName, string endpoint) =>
+            new HubClientConnector(clientName, endpoint, this, versionHash);
 
         public RegistrationRequest.RegistrationRequestErrors CreateAccount(string email, string username, string password)
         {
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index f93bfd7705..81b1cb0bf1 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -172,18 +172,6 @@ namespace osu.Game.Screens.Menu
                 return;
             }
 
-            // disabled until the underlying runtime issue is resolved, see https://github.com/mono/mono/issues/20805.
-            if (RuntimeInfo.OS == RuntimeInfo.Platform.iOS)
-            {
-                notifications?.Post(new SimpleNotification
-                {
-                    Text = "Multiplayer is temporarily unavailable on iOS as we figure out some low level issues.",
-                    Icon = FontAwesome.Solid.AppleAlt,
-                });
-
-                return;
-            }
-
             OnMultiplayer?.Invoke();
         }
 

From b1cd01ceb82b9d04ea0c20b6a15392b2413f6bc4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 Mar 2021 12:57:16 +0900
Subject: [PATCH 1781/3722] Apply ConfigureAwait changes to game side

---
 CodeAnalysis/osu.ruleset                      |  2 +-
 osu.Desktop/Updater/SquirrelUpdateManager.cs  | 14 ++++++------
 osu.Game/Beatmaps/BeatmapManager.cs           |  2 +-
 osu.Game/Collections/CollectionManager.cs     |  4 ++--
 osu.Game/Database/ArchiveModelManager.cs      | 15 ++++++-------
 .../DownloadableArchiveModelManager.cs        |  2 +-
 osu.Game/Database/MemoryCachingComponent.cs   |  2 +-
 osu.Game/Database/UserLookupCache.cs          |  2 +-
 osu.Game/Graphics/ScreenshotManager.cs        |  6 ++---
 osu.Game/IO/Archives/ArchiveReader.cs         |  2 +-
 osu.Game/IPC/ArchiveImportIPCChannel.cs       |  4 ++--
 osu.Game/Online/HubClientConnector.cs         | 12 +++++-----
 .../Multiplayer/StatefulMultiplayerClient.cs  | 22 +++++++++----------
 osu.Game/OsuGame.cs                           |  8 +++----
 osu.Game/OsuGameBase.cs                       |  4 ++--
 osu.Game/Overlays/ChangelogOverlay.cs         |  4 ++--
 osu.Game/Scoring/ScorePerformanceCache.cs     |  2 +-
 osu.Game/Screens/Import/FileImportScreen.cs   |  2 +-
 .../Multiplayer/MultiplayerPlayer.cs          |  6 ++---
 .../OnlinePlay/Playlists/PlaylistsPlayer.cs   |  4 ++--
 osu.Game/Screens/Play/Player.cs               |  4 ++--
 osu.Game/Skinning/SkinManager.cs              |  2 +-
 .../Multiplayer/TestMultiplayerClient.cs      |  2 +-
 osu.Game/Updater/SimpleUpdateManager.cs       |  2 +-
 osu.Game/Updater/UpdateManager.cs             |  2 +-
 25 files changed, 65 insertions(+), 66 deletions(-)

diff --git a/CodeAnalysis/osu.ruleset b/CodeAnalysis/osu.ruleset
index d497365f87..6a99e230d1 100644
--- a/CodeAnalysis/osu.ruleset
+++ b/CodeAnalysis/osu.ruleset
@@ -30,7 +30,7 @@
     <Rule Id="CA1819" Action="None" />
     <Rule Id="CA1822" Action="None" />
     <Rule Id="CA1823" Action="None" />
-    <Rule Id="CA2007" Action="None" />
+    <Rule Id="CA2007" Action="Warning" />
     <Rule Id="CA2214" Action="None" />
     <Rule Id="CA2227" Action="None" />
   </Rules>
diff --git a/osu.Desktop/Updater/SquirrelUpdateManager.cs b/osu.Desktop/Updater/SquirrelUpdateManager.cs
index 71f9fafe57..47cd39dc5a 100644
--- a/osu.Desktop/Updater/SquirrelUpdateManager.cs
+++ b/osu.Desktop/Updater/SquirrelUpdateManager.cs
@@ -42,7 +42,7 @@ namespace osu.Desktop.Updater
             Splat.Locator.CurrentMutable.Register(() => new SquirrelLogger(), typeof(Splat.ILogger));
         }
 
-        protected override async Task<bool> PerformUpdateCheck() => await checkForUpdateAsync();
+        protected override async Task<bool> PerformUpdateCheck() => await checkForUpdateAsync().ConfigureAwait(false);
 
         private async Task<bool> checkForUpdateAsync(bool useDeltaPatching = true, UpdateProgressNotification notification = null)
         {
@@ -51,9 +51,9 @@ namespace osu.Desktop.Updater
 
             try
             {
-                updateManager ??= await UpdateManager.GitHubUpdateManager(@"https://github.com/ppy/osu", @"osulazer", null, null, true);
+                updateManager ??= await UpdateManager.GitHubUpdateManager(@"https://github.com/ppy/osu", @"osulazer", null, null, true).ConfigureAwait(false);
 
-                var info = await updateManager.CheckForUpdate(!useDeltaPatching);
+                var info = await updateManager.CheckForUpdate(!useDeltaPatching).ConfigureAwait(false);
 
                 if (info.ReleasesToApply.Count == 0)
                 {
@@ -79,12 +79,12 @@ namespace osu.Desktop.Updater
 
                 try
                 {
-                    await updateManager.DownloadReleases(info.ReleasesToApply, p => notification.Progress = p / 100f);
+                    await updateManager.DownloadReleases(info.ReleasesToApply, p => notification.Progress = p / 100f).ConfigureAwait(false);
 
                     notification.Progress = 0;
                     notification.Text = @"Installing update...";
 
-                    await updateManager.ApplyReleases(info, p => notification.Progress = p / 100f);
+                    await updateManager.ApplyReleases(info, p => notification.Progress = p / 100f).ConfigureAwait(false);
 
                     notification.State = ProgressNotificationState.Completed;
                     updatePending = true;
@@ -97,7 +97,7 @@ namespace osu.Desktop.Updater
 
                         // could fail if deltas are unavailable for full update path (https://github.com/Squirrel/Squirrel.Windows/issues/959)
                         // try again without deltas.
-                        await checkForUpdateAsync(false, notification);
+                        await checkForUpdateAsync(false, notification).ConfigureAwait(false);
                         scheduleRecheck = false;
                     }
                     else
@@ -116,7 +116,7 @@ namespace osu.Desktop.Updater
                 if (scheduleRecheck)
                 {
                     // check again in 30 minutes.
-                    Scheduler.AddDelayed(async () => await checkForUpdateAsync(), 60000 * 30);
+                    Scheduler.AddDelayed(async () => await checkForUpdateAsync().ConfigureAwait(false), 60000 * 30);
                 }
             }
 
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index d653e5386b..29b3f5d3a3 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -156,7 +156,7 @@ namespace osu.Game.Beatmaps
             bool hadOnlineBeatmapIDs = beatmapSet.Beatmaps.Any(b => b.OnlineBeatmapID > 0);
 
             if (onlineLookupQueue != null)
-                await onlineLookupQueue.UpdateAsync(beatmapSet, cancellationToken);
+                await onlineLookupQueue.UpdateAsync(beatmapSet, cancellationToken).ConfigureAwait(false);
 
             // ensure at least one beatmap was able to retrieve or keep an online ID, else drop the set ID.
             if (hadOnlineBeatmapIDs && !beatmapSet.Beatmaps.Any(b => b.OnlineBeatmapID > 0))
diff --git a/osu.Game/Collections/CollectionManager.cs b/osu.Game/Collections/CollectionManager.cs
index fb9c230c7a..9723409c79 100644
--- a/osu.Game/Collections/CollectionManager.cs
+++ b/osu.Game/Collections/CollectionManager.cs
@@ -124,7 +124,7 @@ namespace osu.Game.Collections
             return Task.Run(async () =>
             {
                 using (var stream = stable.GetStream(database_name))
-                    await Import(stream);
+                    await Import(stream).ConfigureAwait(false);
             });
         }
 
@@ -139,7 +139,7 @@ namespace osu.Game.Collections
             PostNotification?.Invoke(notification);
 
             var collections = readCollections(stream, notification);
-            await importCollections(collections);
+            await importCollections(collections).ConfigureAwait(false);
 
             notification.CompletionText = $"Imported {collections.Count} collections";
             notification.State = ProgressNotificationState.Completed;
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index daaba9098e..d809dbcb01 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -22,7 +22,6 @@ using osu.Game.IO.Archives;
 using osu.Game.IPC;
 using osu.Game.Overlays.Notifications;
 using SharpCompress.Archives.Zip;
-using FileInfo = osu.Game.IO.FileInfo;
 
 namespace osu.Game.Database
 {
@@ -163,7 +162,7 @@ namespace osu.Game.Database
 
                 try
                 {
-                    var model = await Import(task, isLowPriorityImport, notification.CancellationToken);
+                    var model = await Import(task, isLowPriorityImport, notification.CancellationToken).ConfigureAwait(false);
 
                     lock (imported)
                     {
@@ -183,7 +182,7 @@ namespace osu.Game.Database
                 {
                     Logger.Error(e, $@"Could not import ({task})", LoggingTarget.Database);
                 }
-            }));
+            })).ConfigureAwait(false);
 
             if (imported.Count == 0)
             {
@@ -226,7 +225,7 @@ namespace osu.Game.Database
 
             TModel import;
             using (ArchiveReader reader = task.GetReader())
-                import = await Import(reader, lowPriority, cancellationToken);
+                import = await Import(reader, lowPriority, cancellationToken).ConfigureAwait(false);
 
             // We may or may not want to delete the file depending on where it is stored.
             //  e.g. reconstructing/repairing database with items from default storage.
@@ -358,7 +357,7 @@ namespace osu.Game.Database
                 item.Files = archive != null ? createFileInfos(archive, Files) : new List<TFileModel>();
                 item.Hash = ComputeHash(item, archive);
 
-                await Populate(item, archive, cancellationToken);
+                await Populate(item, archive, cancellationToken).ConfigureAwait(false);
 
                 using (var write = ContextFactory.GetForWrite()) // used to share a context for full import. keep in mind this will block all writes.
                 {
@@ -410,7 +409,7 @@ namespace osu.Game.Database
 
             flushEvents(true);
             return item;
-        }, cancellationToken, TaskCreationOptions.HideScheduler, lowPriority ? import_scheduler_low_priority : import_scheduler).Unwrap();
+        }, cancellationToken, TaskCreationOptions.HideScheduler, lowPriority ? import_scheduler_low_priority : import_scheduler).Unwrap().ConfigureAwait(false);
 
         /// <summary>
         /// Exports an item to a legacy (.zip based) package.
@@ -621,7 +620,7 @@ namespace osu.Game.Database
         }
 
         /// <summary>
-        /// Create all required <see cref="FileInfo"/>s for the provided archive, adding them to the global file store.
+        /// Create all required <see cref="IO.FileInfo"/>s for the provided archive, adding them to the global file store.
         /// </summary>
         private List<TFileModel> createFileInfos(ArchiveReader reader, FileStore files)
         {
@@ -699,7 +698,7 @@ namespace osu.Game.Database
                 return Task.CompletedTask;
             }
 
-            return Task.Run(async () => await Import(GetStableImportPaths(storage).ToArray()));
+            return Task.Run(async () => await Import(GetStableImportPaths(storage).ToArray()).ConfigureAwait(false));
         }
 
         /// <summary>
diff --git a/osu.Game/Database/DownloadableArchiveModelManager.cs b/osu.Game/Database/DownloadableArchiveModelManager.cs
index 50b022f9ff..da3144e8d0 100644
--- a/osu.Game/Database/DownloadableArchiveModelManager.cs
+++ b/osu.Game/Database/DownloadableArchiveModelManager.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Database
                 Task.Factory.StartNew(async () =>
                 {
                     // This gets scheduled back to the update thread, but we want the import to run in the background.
-                    var imported = await Import(notification, new ImportTask(filename));
+                    var imported = await Import(notification, new ImportTask(filename)).ConfigureAwait(false);
 
                     // for now a failed import will be marked as a failed download for simplicity.
                     if (!imported.Any())
diff --git a/osu.Game/Database/MemoryCachingComponent.cs b/osu.Game/Database/MemoryCachingComponent.cs
index d913e66428..a1a1279d71 100644
--- a/osu.Game/Database/MemoryCachingComponent.cs
+++ b/osu.Game/Database/MemoryCachingComponent.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Database
             if (CheckExists(lookup, out TValue performance))
                 return performance;
 
-            var computed = await ComputeValueAsync(lookup, token);
+            var computed = await ComputeValueAsync(lookup, token).ConfigureAwait(false);
 
             if (computed != null || CacheNullValues)
                 cache[lookup] = computed;
diff --git a/osu.Game/Database/UserLookupCache.cs b/osu.Game/Database/UserLookupCache.cs
index 568726199c..19cc211709 100644
--- a/osu.Game/Database/UserLookupCache.cs
+++ b/osu.Game/Database/UserLookupCache.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Database
         public Task<User> GetUserAsync(int userId, CancellationToken token = default) => GetAsync(userId, token);
 
         protected override async Task<User> ComputeValueAsync(int lookup, CancellationToken token = default)
-            => await queryUser(lookup);
+            => await queryUser(lookup).ConfigureAwait(false);
 
         private readonly Queue<(int id, TaskCompletionSource<User>)> pendingUserTasks = new Queue<(int, TaskCompletionSource<User>)>();
         private Task pendingRequestTask;
diff --git a/osu.Game/Graphics/ScreenshotManager.cs b/osu.Game/Graphics/ScreenshotManager.cs
index f7914cbbca..fb7fe4947b 100644
--- a/osu.Game/Graphics/ScreenshotManager.cs
+++ b/osu.Game/Graphics/ScreenshotManager.cs
@@ -103,7 +103,7 @@ namespace osu.Game.Graphics
                 }
             }
 
-            using (var image = await host.TakeScreenshotAsync())
+            using (var image = await host.TakeScreenshotAsync().ConfigureAwait(false))
             {
                 if (Interlocked.Decrement(ref screenShotTasks) == 0 && cursorVisibility.Value == false)
                     cursorVisibility.Value = true;
@@ -116,13 +116,13 @@ namespace osu.Game.Graphics
                 switch (screenshotFormat.Value)
                 {
                     case ScreenshotFormat.Png:
-                        await image.SaveAsPngAsync(stream);
+                        await image.SaveAsPngAsync(stream).ConfigureAwait(false);
                         break;
 
                     case ScreenshotFormat.Jpg:
                         const int jpeg_quality = 92;
 
-                        await image.SaveAsJpegAsync(stream, new JpegEncoder { Quality = jpeg_quality });
+                        await image.SaveAsJpegAsync(stream, new JpegEncoder { Quality = jpeg_quality }).ConfigureAwait(false);
                         break;
 
                     default:
diff --git a/osu.Game/IO/Archives/ArchiveReader.cs b/osu.Game/IO/Archives/ArchiveReader.cs
index f74574e60c..679ab40402 100644
--- a/osu.Game/IO/Archives/ArchiveReader.cs
+++ b/osu.Game/IO/Archives/ArchiveReader.cs
@@ -41,7 +41,7 @@ namespace osu.Game.IO.Archives
                     return null;
 
                 byte[] buffer = new byte[input.Length];
-                await input.ReadAsync(buffer);
+                await input.ReadAsync(buffer).ConfigureAwait(false);
                 return buffer;
             }
         }
diff --git a/osu.Game/IPC/ArchiveImportIPCChannel.cs b/osu.Game/IPC/ArchiveImportIPCChannel.cs
index 029908ec9d..d9d0e4c0ea 100644
--- a/osu.Game/IPC/ArchiveImportIPCChannel.cs
+++ b/osu.Game/IPC/ArchiveImportIPCChannel.cs
@@ -33,12 +33,12 @@ namespace osu.Game.IPC
             if (importer == null)
             {
                 // we want to contact a remote osu! to handle the import.
-                await SendMessageAsync(new ArchiveImportMessage { Path = path });
+                await SendMessageAsync(new ArchiveImportMessage { Path = path }).ConfigureAwait(false);
                 return;
             }
 
             if (importer.HandledExtensions.Contains(Path.GetExtension(path)?.ToLowerInvariant()))
-                await importer.Import(path);
+                await importer.Import(path).ConfigureAwait(false);
         }
     }
 
diff --git a/osu.Game/Online/HubClientConnector.cs b/osu.Game/Online/HubClientConnector.cs
index fdb21c5000..3839762e46 100644
--- a/osu.Game/Online/HubClientConnector.cs
+++ b/osu.Game/Online/HubClientConnector.cs
@@ -79,7 +79,7 @@ namespace osu.Game.Online
         {
             cancelExistingConnect();
 
-            if (!await connectionLock.WaitAsync(10000))
+            if (!await connectionLock.WaitAsync(10000).ConfigureAwait(false))
                 throw new TimeoutException("Could not obtain a lock to connect. A previous attempt is likely stuck.");
 
             try
@@ -88,7 +88,7 @@ namespace osu.Game.Online
                 {
                     // ensure any previous connection was disposed.
                     // this will also create a new cancellation token source.
-                    await disconnect(false);
+                    await disconnect(false).ConfigureAwait(false);
 
                     // this token will be valid for the scope of this connection.
                     // if cancelled, we can be sure that a disconnect or reconnect is handled elsewhere.
@@ -103,7 +103,7 @@ namespace osu.Game.Online
                         // importantly, rebuild the connection each attempt to get an updated access token.
                         CurrentConnection = buildConnection(cancellationToken);
 
-                        await CurrentConnection.StartAsync(cancellationToken);
+                        await CurrentConnection.StartAsync(cancellationToken).ConfigureAwait(false);
 
                         Logger.Log($"{clientName} connected!", LoggingTarget.Network);
                         isConnected.Value = true;
@@ -119,7 +119,7 @@ namespace osu.Game.Online
                         Logger.Log($"{clientName} connection error: {e}", LoggingTarget.Network);
 
                         // retry on any failure.
-                        await Task.Delay(5000, cancellationToken);
+                        await Task.Delay(5000, cancellationToken).ConfigureAwait(false);
                     }
                 }
             }
@@ -174,14 +174,14 @@ namespace osu.Game.Online
 
             if (takeLock)
             {
-                if (!await connectionLock.WaitAsync(10000))
+                if (!await connectionLock.WaitAsync(10000).ConfigureAwait(false))
                     throw new TimeoutException("Could not obtain a lock to disconnect. A previous attempt is likely stuck.");
             }
 
             try
             {
                 if (CurrentConnection != null)
-                    await CurrentConnection.DisposeAsync();
+                    await CurrentConnection.DisposeAsync().ConfigureAwait(false);
             }
             finally
             {
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 73100be505..0f7050596f 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -131,12 +131,12 @@ namespace osu.Game.Online.Multiplayer
                 Debug.Assert(room.RoomID.Value != null);
 
                 // Join the server-side room.
-                var joinedRoom = await JoinRoom(room.RoomID.Value.Value);
+                var joinedRoom = await JoinRoom(room.RoomID.Value.Value).ConfigureAwait(false);
                 Debug.Assert(joinedRoom != null);
 
                 // Populate users.
                 Debug.Assert(joinedRoom.Users != null);
-                await Task.WhenAll(joinedRoom.Users.Select(PopulateUser));
+                await Task.WhenAll(joinedRoom.Users.Select(PopulateUser)).ConfigureAwait(false);
 
                 // Update the stored room (must be done on update thread for thread-safety).
                 await scheduleAsync(() =>
@@ -144,11 +144,11 @@ namespace osu.Game.Online.Multiplayer
                     Room = joinedRoom;
                     apiRoom = room;
                     defaultPlaylistItemId = apiRoom.Playlist.FirstOrDefault()?.ID ?? 0;
-                }, cancellationSource.Token);
+                }, cancellationSource.Token).ConfigureAwait(false);
 
                 // Update room settings.
-                await updateLocalRoomSettings(joinedRoom.Settings, cancellationSource.Token);
-            }, cancellationSource.Token);
+                await updateLocalRoomSettings(joinedRoom.Settings, cancellationSource.Token).ConfigureAwait(false);
+            }, cancellationSource.Token).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -178,8 +178,8 @@ namespace osu.Game.Online.Multiplayer
 
             return joinOrLeaveTaskChain.Add(async () =>
             {
-                await scheduledReset;
-                await LeaveRoomInternal();
+                await scheduledReset.ConfigureAwait(false);
+                await LeaveRoomInternal().ConfigureAwait(false);
             });
         }
 
@@ -237,11 +237,11 @@ namespace osu.Game.Online.Multiplayer
             switch (localUser.State)
             {
                 case MultiplayerUserState.Idle:
-                    await ChangeState(MultiplayerUserState.Ready);
+                    await ChangeState(MultiplayerUserState.Ready).ConfigureAwait(false);
                     return;
 
                 case MultiplayerUserState.Ready:
-                    await ChangeState(MultiplayerUserState.Idle);
+                    await ChangeState(MultiplayerUserState.Idle).ConfigureAwait(false);
                     return;
 
                 default:
@@ -307,7 +307,7 @@ namespace osu.Game.Online.Multiplayer
             if (Room == null)
                 return;
 
-            await PopulateUser(user);
+            await PopulateUser(user).ConfigureAwait(false);
 
             Scheduler.Add(() =>
             {
@@ -486,7 +486,7 @@ namespace osu.Game.Online.Multiplayer
         /// Populates the <see cref="User"/> for a given <see cref="MultiplayerRoomUser"/>.
         /// </summary>
         /// <param name="multiplayerUser">The <see cref="MultiplayerRoomUser"/> to populate.</param>
-        protected async Task PopulateUser(MultiplayerRoomUser multiplayerUser) => multiplayerUser.User ??= await userLookupCache.GetUserAsync(multiplayerUser.UserID);
+        protected async Task PopulateUser(MultiplayerRoomUser multiplayerUser) => multiplayerUser.User ??= await userLookupCache.GetUserAsync(multiplayerUser.UserID).ConfigureAwait(false);
 
         /// <summary>
         /// Updates the local room settings with the given <see cref="MultiplayerRoomSettings"/>.
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 203cc458e0..b7398efdc2 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -440,7 +440,7 @@ namespace osu.Game
         public override Task Import(params ImportTask[] imports)
         {
             // encapsulate task as we don't want to begin the import process until in a ready state.
-            var importTask = new Task(async () => await base.Import(imports));
+            var importTask = new Task(async () => await base.Import(imports).ConfigureAwait(false));
 
             waitForReady(() => this, _ => importTask.Start());
 
@@ -831,7 +831,7 @@ namespace osu.Game
                 asyncLoadStream = Task.Run(async () =>
                 {
                     if (previousLoadStream != null)
-                        await previousLoadStream;
+                        await previousLoadStream.ConfigureAwait(false);
 
                     try
                     {
@@ -845,7 +845,7 @@ namespace osu.Game
 
                         // The delegate won't complete if OsuGame has been disposed in the meantime
                         while (!IsDisposed && !del.Completed)
-                            await Task.Delay(10);
+                            await Task.Delay(10).ConfigureAwait(false);
 
                         // Either we're disposed or the load process has started successfully
                         if (IsDisposed)
@@ -853,7 +853,7 @@ namespace osu.Game
 
                         Debug.Assert(task != null);
 
-                        await task;
+                        await task.ConfigureAwait(false);
 
                         Logger.Log($"Loaded {component}!", level: LogLevel.Debug);
                     }
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 3d24f245f9..e1c7b67a8c 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -434,7 +434,7 @@ namespace osu.Game
             foreach (var importer in fileImporters)
             {
                 if (importer.HandledExtensions.Contains(extension))
-                    await importer.Import(paths);
+                    await importer.Import(paths).ConfigureAwait(false);
             }
         }
 
@@ -445,7 +445,7 @@ namespace osu.Game
             {
                 var importer = fileImporters.FirstOrDefault(i => i.HandledExtensions.Contains(taskGroup.Key));
                 return importer?.Import(taskGroup.ToArray()) ?? Task.CompletedTask;
-            }));
+            })).ConfigureAwait(false);
         }
 
         public IEnumerable<string> HandledExtensions => fileImporters.SelectMany(i => i.HandledExtensions);
diff --git a/osu.Game/Overlays/ChangelogOverlay.cs b/osu.Game/Overlays/ChangelogOverlay.cs
index 537dd00727..2da5be5e6c 100644
--- a/osu.Game/Overlays/ChangelogOverlay.cs
+++ b/osu.Game/Overlays/ChangelogOverlay.cs
@@ -160,9 +160,9 @@ namespace osu.Game.Overlays
                     tcs.SetException(e);
                 };
 
-                await API.PerformAsync(req);
+                await API.PerformAsync(req).ConfigureAwait(false);
 
-                await tcs.Task;
+                return tcs.Task;
             });
         }
 
diff --git a/osu.Game/Scoring/ScorePerformanceCache.cs b/osu.Game/Scoring/ScorePerformanceCache.cs
index 5f66c13d2f..bb15983de3 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.Beatmap, score.Ruleset, score.Mods, token);
+            var attributes = await difficultyCache.GetDifficultyAsync(score.Beatmap, 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/Import/FileImportScreen.cs b/osu.Game/Screens/Import/FileImportScreen.cs
index 329623e03a..ee8ef6926d 100644
--- a/osu.Game/Screens/Import/FileImportScreen.cs
+++ b/osu.Game/Screens/Import/FileImportScreen.cs
@@ -154,7 +154,7 @@ namespace osu.Game.Screens.Import
 
             Task.Factory.StartNew(async () =>
             {
-                await game.Import(path);
+                await game.Import(path).ConfigureAwait(false);
 
                 // some files will be deleted after successful import, so we want to refresh the view.
                 Schedule(() =>
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index ffcf248575..b3cd44d55a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -137,13 +137,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         protected override async Task SubmitScore(Score score)
         {
-            await base.SubmitScore(score);
+            await base.SubmitScore(score).ConfigureAwait(false);
 
-            await client.ChangeState(MultiplayerUserState.FinishedPlay);
+            await client.ChangeState(MultiplayerUserState.FinishedPlay).ConfigureAwait(false);
 
             // Await up to 60 seconds for results to become available (6 api request timeouts).
             // This is arbitrary just to not leave the player in an essentially deadlocked state if any connection issues occur.
-            await Task.WhenAny(resultsReady.Task, Task.Delay(TimeSpan.FromSeconds(60)));
+            await Task.WhenAny(resultsReady.Task, Task.Delay(TimeSpan.FromSeconds(60))).ConfigureAwait(false);
         }
 
         protected override ResultsScreen CreateResults(ScoreInfo score)
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
index ddc88261f7..a75e4bdc07 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
@@ -108,7 +108,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
 
         protected override async Task SubmitScore(Score score)
         {
-            await base.SubmitScore(score);
+            await base.SubmitScore(score).ConfigureAwait(false);
 
             Debug.Assert(Token != null);
 
@@ -128,7 +128,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
             };
 
             api.Queue(request);
-            await tcs.Task;
+            await tcs.Task.ConfigureAwait(false);
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index e81efdac78..0e221351aa 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -592,7 +592,7 @@ namespace osu.Game.Screens.Play
 
                 try
                 {
-                    await SubmitScore(score);
+                    await SubmitScore(score).ConfigureAwait(false);
                 }
                 catch (Exception ex)
                 {
@@ -601,7 +601,7 @@ namespace osu.Game.Screens.Play
 
                 try
                 {
-                    await ImportScore(score);
+                    await ImportScore(score).ConfigureAwait(false);
                 }
                 catch (Exception ex)
                 {
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 2826c826a5..fcde9f041b 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Skinning
 
         protected override async Task Populate(SkinInfo model, ArchiveReader archive, CancellationToken cancellationToken = default)
         {
-            await base.Populate(model, archive, cancellationToken);
+            await base.Populate(model, archive, cancellationToken).ConfigureAwait(false);
 
             if (model.Name?.Contains(".osk") == true)
                 populateMetadata(model);
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index c03364a391..09fcc1ff47 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -136,7 +136,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             Debug.Assert(Room != null);
 
-            await ((IMultiplayerClient)this).SettingsChanged(settings);
+            await ((IMultiplayerClient)this).SettingsChanged(settings).ConfigureAwait(false);
 
             foreach (var user in Room.Users.Where(u => u.State == MultiplayerUserState.Ready))
                 ChangeUserState(user.UserID, MultiplayerUserState.Idle);
diff --git a/osu.Game/Updater/SimpleUpdateManager.cs b/osu.Game/Updater/SimpleUpdateManager.cs
index 4ebf2a7368..6eded7ce53 100644
--- a/osu.Game/Updater/SimpleUpdateManager.cs
+++ b/osu.Game/Updater/SimpleUpdateManager.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Updater
             {
                 var releases = new OsuJsonWebRequest<GitHubRelease>("https://api.github.com/repos/ppy/osu/releases/latest");
 
-                await releases.PerformAsync();
+                await releases.PerformAsync().ConfigureAwait(false);
 
                 var latest = releases.ResponseObject;
 
diff --git a/osu.Game/Updater/UpdateManager.cs b/osu.Game/Updater/UpdateManager.cs
index f772c6d282..9a0454bc95 100644
--- a/osu.Game/Updater/UpdateManager.cs
+++ b/osu.Game/Updater/UpdateManager.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Updater
             lock (updateTaskLock)
                 waitTask = (updateCheckTask ??= PerformUpdateCheck());
 
-            bool hasUpdates = await waitTask;
+            bool hasUpdates = await waitTask.ConfigureAwait(false);
 
             lock (updateTaskLock)
                 updateCheckTask = null;

From d2bc48e57650d0ff2c1ec9cf840f4258f90b786b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 Mar 2021 12:57:30 +0900
Subject: [PATCH 1782/3722] Exclude tests from ConfigureAwait rule

---
 osu.Game.Tests/osu.Game.Tests.csproj | 3 +++
 osu.Game.Tests/tests.ruleset         | 6 ++++++
 2 files changed, 9 insertions(+)
 create mode 100644 osu.Game.Tests/tests.ruleset

diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index 32ccb5b699..e36b3cdc74 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -13,6 +13,9 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
+  <PropertyGroup Label="Code Analysis">
+    <CodeAnalysisRuleSet>tests.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj" />
     <ProjectReference Include="..\osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj" />
diff --git a/osu.Game.Tests/tests.ruleset b/osu.Game.Tests/tests.ruleset
new file mode 100644
index 0000000000..a0abb781d3
--- /dev/null
+++ b/osu.Game.Tests/tests.ruleset
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RuleSet Name="osu! Rule Set" Description=" " ToolsVersion="16.0">
+    <Rules AnalyzerId="Microsoft.CodeQuality.Analyzers" RuleNamespace="Microsoft.CodeQuality.Analyzers">
+        <Rule Id="CA2007" Action="None" />
+    </Rules>
+</RuleSet>

From 6cb0db9c33c41312e9a380168d41327794a2288c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 Mar 2021 14:45:11 +0900
Subject: [PATCH 1783/3722] Apply override rules to iOS/Android test projects

---
 osu.Game.Tests.Android/osu.Game.Tests.Android.csproj | 5 ++++-
 osu.Game.Tests.iOS/osu.Game.Tests.iOS.csproj         | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj b/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj
index 543f2f35a7..c3d9cb5875 100644
--- a/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj
+++ b/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj
@@ -20,6 +20,9 @@
   <ItemGroup>
     <None Include="Properties\AndroidManifest.xml" />
   </ItemGroup>
+  <PropertyGroup>
+    <NoWarn>$(NoWarn);CA2007</NoWarn>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\osu.Game.Tests\**\Beatmaps\**\*.cs">
       <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
@@ -74,4 +77,4 @@
     <PackageReference Include="Moq" Version="4.16.1" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/osu.Game.Tests.iOS/osu.Game.Tests.iOS.csproj b/osu.Game.Tests.iOS/osu.Game.Tests.iOS.csproj
index e83bef4a95..97df9b2cd5 100644
--- a/osu.Game.Tests.iOS/osu.Game.Tests.iOS.csproj
+++ b/osu.Game.Tests.iOS/osu.Game.Tests.iOS.csproj
@@ -21,6 +21,9 @@
       <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
     </Compile>
   </ItemGroup>
+  <PropertyGroup>
+    <NoWarn>$(NoWarn);CA2007</NoWarn>
+  </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game\osu.Game.csproj">
       <Project>{2A66DD92-ADB1-4994-89E2-C94E04ACDA0D}</Project>
@@ -48,4 +51,4 @@
     <PackageReference Include="Moq" Version="4.16.1" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-</Project>
\ No newline at end of file
+</Project>

From 02194a93cb324e9a3781e82a73ce47ae6ce40f45 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 Mar 2021 15:17:10 +0900
Subject: [PATCH 1784/3722] Apply missing additions to android project

---
 osu.Android/OsuGameActivity.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Android/OsuGameActivity.cs b/osu.Android/OsuGameActivity.cs
index d087c6218d..cffcea22c2 100644
--- a/osu.Android/OsuGameActivity.cs
+++ b/osu.Android/OsuGameActivity.cs
@@ -100,15 +100,15 @@ namespace osu.Android
                 // copy to an arbitrary-access memory stream to be able to proceed with the import.
                 var copy = new MemoryStream();
                 using (var stream = ContentResolver.OpenInputStream(uri))
-                    await stream.CopyToAsync(copy);
+                    await stream.CopyToAsync(copy).ConfigureAwait(false);
 
                 lock (tasks)
                 {
                     tasks.Add(new ImportTask(copy, filename));
                 }
-            }));
+            })).ConfigureAwait(false);
 
-            await game.Import(tasks.ToArray());
+            await game.Import(tasks.ToArray()).ConfigureAwait(false);
         }, TaskCreationOptions.LongRunning);
     }
 }

From bb79da1aacfd45dc73d1f493bd5e0400327dc61f Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 9 Mar 2021 00:33:43 +0300
Subject: [PATCH 1785/3722] Correct playfield shift counteract 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/Legacy/LegacySpinner.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index 406c19e76a..896c3f4a3e 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -152,7 +152,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 Origin = Anchor.Centre;
                 Size = new Vector2(640, 480);
 
-                // counteracts the playfield shift from OsuPlayfieldAdjustmentContainer.
+                // stable applies this adjustment conditionally, locally in the spinner.
+                // in lazer this is handled at a higher level in OsuPlayfieldAdjustmentContainer,
+                // therefore it's safe to apply it unconditionally in this component.
                 Position = new Vector2(0, -8f);
             }
         }

From dc9028d24acd3df3152057f36f0aa0217b9c954a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Mar 2021 14:27:20 +0900
Subject: [PATCH 1786/3722] Update framework

---
 osu.Android.props                       | 2 +-
 osu.Game/Updater/SimpleUpdateManager.cs | 2 +-
 osu.Game/osu.Game.csproj                | 2 +-
 osu.iOS.props                           | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index c428cd2546..5b700224db 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.302.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.309.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/Updater/SimpleUpdateManager.cs b/osu.Game/Updater/SimpleUpdateManager.cs
index 6eded7ce53..50572a7867 100644
--- a/osu.Game/Updater/SimpleUpdateManager.cs
+++ b/osu.Game/Updater/SimpleUpdateManager.cs
@@ -77,7 +77,7 @@ namespace osu.Game.Updater
                     bestAsset = release.Assets?.Find(f => f.Name.EndsWith(".exe", StringComparison.Ordinal));
                     break;
 
-                case RuntimeInfo.Platform.MacOsx:
+                case RuntimeInfo.Platform.macOS:
                     bestAsset = release.Assets?.Find(f => f.Name.EndsWith(".app.zip", StringComparison.Ordinal));
                     break;
 
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index c7aa6a8e11..90c8b98f42 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.302.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.309.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.0.7" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 729d692e0e..ccd33bf88c 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.302.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.309.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.302.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.309.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 05493958696d488c4a8b76582ee0f92d5e7cf75b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 9 Mar 2021 08:55:32 +0300
Subject: [PATCH 1787/3722] Inline "legacy coordinates container" and add
 "spinner Y centre" const

---
 .../Skinning/Legacy/LegacyNewStyleSpinner.cs  |  3 +-
 .../Skinning/Legacy/LegacyOldStyleSpinner.cs  | 33 ++++----
 .../Skinning/Legacy/LegacySpinner.cs          | 82 ++++++++-----------
 3 files changed, 50 insertions(+), 68 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyNewStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyNewStyleSpinner.cs
index efeca53969..22fb3aab86 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyNewStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyNewStyleSpinner.cs
@@ -37,9 +37,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             AddInternal(scaleContainer = new Container
             {
                 Scale = new Vector2(SPRITE_SCALE),
-                Anchor = Anchor.Centre,
+                Anchor = Anchor.TopCentre,
                 Origin = Anchor.Centre,
                 RelativeSizeAxes = Axes.Both,
+                Y = SPINNER_Y_CENTRE,
                 Children = new Drawable[]
                 {
                     glow = new Sprite
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyOldStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyOldStyleSpinner.cs
index 5c25c38504..19cb55c16e 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyOldStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyOldStyleSpinner.cs
@@ -37,35 +37,34 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             {
                 new Sprite
                 {
-                    Anchor = Anchor.Centre,
+                    Anchor = Anchor.TopCentre,
                     Origin = Anchor.Centre,
                     Texture = source.GetTexture("spinner-background"),
-                    Scale = new Vector2(SPRITE_SCALE)
+                    Scale = new Vector2(SPRITE_SCALE),
+                    Y = SPINNER_Y_CENTRE,
                 },
                 disc = new Sprite
                 {
-                    Anchor = Anchor.Centre,
+                    Anchor = Anchor.TopCentre,
                     Origin = Anchor.Centre,
                     Texture = source.GetTexture("spinner-circle"),
-                    Scale = new Vector2(SPRITE_SCALE)
+                    Scale = new Vector2(SPRITE_SCALE),
+                    Y = SPINNER_Y_CENTRE,
                 },
-                new LegacyCoordinatesContainer
+                metre = new Container
                 {
-                    Child = metre = new Container
+                    AutoSizeAxes = Axes.Both,
+                    // this anchor makes no sense, but that's what stable uses.
+                    Anchor = Anchor.TopLeft,
+                    Origin = Anchor.TopLeft,
+                    Margin = new MarginPadding { Top = SPINNER_TOP_OFFSET },
+                    Masking = true,
+                    Child = metreSprite = new Sprite
                     {
-                        AutoSizeAxes = Axes.Both,
-                        // this anchor makes no sense, but that's what stable uses.
+                        Texture = source.GetTexture("spinner-metre"),
                         Anchor = Anchor.TopLeft,
                         Origin = Anchor.TopLeft,
-                        Margin = new MarginPadding { Top = SPINNER_TOP_OFFSET },
-                        Masking = true,
-                        Child = metreSprite = new Sprite
-                        {
-                            Texture = source.GetTexture("spinner-metre"),
-                            Anchor = Anchor.TopLeft,
-                            Origin = Anchor.TopLeft,
-                            Scale = new Vector2(SPRITE_SCALE)
-                        }
+                        Scale = new Vector2(SPRITE_SCALE)
                     }
                 }
             });
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index 896c3f4a3e..1738003390 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -16,12 +16,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
     public abstract class LegacySpinner : CompositeDrawable
     {
-        /// <summary>
-        /// An offset that simulates stable's spinner top offset, can be used with <see cref="LegacyCoordinatesContainer"/>
-        /// for positioning some legacy spinner components perfectly as in stable.
-        /// (e.g. 'spin' sprite, 'clear' sprite, metre in old-style spinners)
-        /// </summary>
-        public static readonly float SPINNER_TOP_OFFSET = MathF.Ceiling(45f * SPRITE_SCALE);
+        protected static readonly float SPINNER_TOP_OFFSET = MathF.Ceiling(45f * SPRITE_SCALE);
+        protected static readonly float SPINNER_Y_CENTRE = SPINNER_TOP_OFFSET + 219f;
 
         protected const float SPRITE_SCALE = 0.625f;
 
@@ -33,33 +29,41 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         [BackgroundDependencyLoader]
         private void load(DrawableHitObject drawableHitObject, ISkinSource source)
         {
-            RelativeSizeAxes = Axes.Both;
+            // legacy spinners relied heavily on absolute screen-space coordinate values.
+            // wrap everything in a container simulating absolute coords to preserve alignment
+            // as there are skins that depend on it.
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+            Size = new Vector2(640, 480);
+
+            // stable applies this adjustment conditionally, locally in the spinner.
+            // in lazer this is handled at a higher level in OsuPlayfieldAdjustmentContainer,
+            // therefore it's safe to apply it unconditionally in this component.
+            Position = new Vector2(0, -8f);
 
             DrawableSpinner = (DrawableSpinner)drawableHitObject;
 
-            AddInternal(new LegacyCoordinatesContainer
+            AddRangeInternal(new[]
             {
-                Depth = float.MinValue,
-                Children = new Drawable[]
+                spin = new Sprite
                 {
-                    spin = new Sprite
-                    {
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.Centre,
-                        Texture = source.GetTexture("spinner-spin"),
-                        Scale = new Vector2(SPRITE_SCALE),
-                        Y = SPINNER_TOP_OFFSET + 335,
-                    },
-                    clear = new Sprite
-                    {
-                        Alpha = 0,
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.Centre,
-                        Texture = source.GetTexture("spinner-clear"),
-                        Scale = new Vector2(SPRITE_SCALE),
-                        Y = SPINNER_TOP_OFFSET + 115,
-                    },
-                }
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.Centre,
+                    Depth = float.MinValue,
+                    Texture = source.GetTexture("spinner-spin"),
+                    Scale = new Vector2(SPRITE_SCALE),
+                    Y = SPINNER_TOP_OFFSET + 335,
+                },
+                clear = new Sprite
+                {
+                    Alpha = 0,
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.Centre,
+                    Depth = float.MinValue,
+                    Texture = source.GetTexture("spinner-clear"),
+                    Scale = new Vector2(SPRITE_SCALE),
+                    Y = SPINNER_TOP_OFFSET + 115,
+                },
             });
         }
 
@@ -136,27 +140,5 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             if (DrawableSpinner != null)
                 DrawableSpinner.ApplyCustomUpdateState -= UpdateStateTransforms;
         }
-
-        /// <summary>
-        /// A <see cref="Container"/> simulating osu!stable's absolute screen-space,
-        /// for perfect placements of legacy spinner components with legacy coordinates.
-        /// </summary>
-        protected class LegacyCoordinatesContainer : Container
-        {
-            public LegacyCoordinatesContainer()
-            {
-                // legacy spinners relied heavily on absolute screen-space coordinate values.
-                // wrap everything in a container simulating absolute coords to preserve alignment
-                // as there are skins that depend on it.
-                Anchor = Anchor.Centre;
-                Origin = Anchor.Centre;
-                Size = new Vector2(640, 480);
-
-                // stable applies this adjustment conditionally, locally in the spinner.
-                // in lazer this is handled at a higher level in OsuPlayfieldAdjustmentContainer,
-                // therefore it's safe to apply it unconditionally in this component.
-                Position = new Vector2(0, -8f);
-            }
-        }
     }
 }

From a5b3ac7ef8101c867bec8c1188ec4595ccb1c919 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Mar 2021 15:45:03 +0900
Subject: [PATCH 1788/3722] Add failing test covering alpha commands proceeding
 non-alpha (but ignored) commands

---
 .../Visual/Gameplay/TestSceneLeadIn.cs        | 40 ++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneLeadIn.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneLeadIn.cs
index 563d6be0da..dccde366c2 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneLeadIn.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneLeadIn.cs
@@ -46,11 +46,12 @@ namespace osu.Game.Tests.Visual.Gameplay
         [TestCase(0, 0)]
         [TestCase(-1000, -1000)]
         [TestCase(-10000, -10000)]
-        public void TestStoryboardProducesCorrectStartTime(double firstStoryboardEvent, double expectedStartTime)
+        public void TestStoryboardProducesCorrectStartTimeSimpleAlpha(double firstStoryboardEvent, double expectedStartTime)
         {
             var storyboard = new Storyboard();
 
             var sprite = new StoryboardSprite("unknown", Anchor.TopLeft, Vector2.Zero);
+
             sprite.TimelineGroup.Alpha.Add(Easing.None, firstStoryboardEvent, firstStoryboardEvent + 500, 0, 1);
 
             storyboard.GetLayer("Background").Add(sprite);
@@ -64,6 +65,43 @@ namespace osu.Game.Tests.Visual.Gameplay
             });
         }
 
+        [TestCase(1000, 0, false)]
+        [TestCase(0, 0, false)]
+        [TestCase(-1000, -1000, false)]
+        [TestCase(-10000, -10000, false)]
+        [TestCase(1000, 0, true)]
+        [TestCase(0, 0, true)]
+        [TestCase(-1000, -1000, true)]
+        [TestCase(-10000, -10000, true)]
+        public void TestStoryboardProducesCorrectStartTimeFadeInAfterOtherEvents(double firstStoryboardEvent, double expectedStartTime, bool addEventToLoop)
+        {
+            var storyboard = new Storyboard();
+
+            var sprite = new StoryboardSprite("unknown", Anchor.TopLeft, Vector2.Zero);
+
+            // these should be ignored as we have an alpha visibility blocker proceeding this command.
+            sprite.TimelineGroup.Scale.Add(Easing.None, -20000, -18000, 0, 1);
+            var loopGroup = sprite.AddLoop(-20000, 50);
+            loopGroup.Scale.Add(Easing.None, -20000, -18000, 0, 1);
+
+            var target = addEventToLoop ? loopGroup : sprite.TimelineGroup;
+            target.Alpha.Add(Easing.None, firstStoryboardEvent, firstStoryboardEvent + 500, 0, 1);
+
+            // these should be ignored due to being in the future.
+            sprite.TimelineGroup.Alpha.Add(Easing.None, 18000, 20000, 0, 1);
+            loopGroup.Alpha.Add(Easing.None, 18000, 20000, 0, 1);
+
+            storyboard.GetLayer("Background").Add(sprite);
+
+            loadPlayerWithBeatmap(new TestBeatmap(new OsuRuleset().RulesetInfo), storyboard);
+
+            AddAssert($"first frame is {expectedStartTime}", () =>
+            {
+                Debug.Assert(player.FirstFrameClockTime != null);
+                return Precision.AlmostEquals(player.FirstFrameClockTime.Value, expectedStartTime, lenience_ms);
+            });
+        }
+
         private void loadPlayerWithBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
         {
             AddStep("create player", () =>

From 8aaba324314c4cfc628de35a3b6ab438227103a5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Mar 2021 15:55:05 +0900
Subject: [PATCH 1789/3722] Fix storyboard commands occurring before the
 earliest point of visibility delaying gameplay

In osu-stable, storyboard intros start from the first command, but in
the case of storyboard drawables which have an initial hidden state, all
commands before the time at which they become visible (ie. the first
command where `Alpha` increases to a non-zero value) are ignored.

This brings lazer in line with that behaviour. It also removes several
unnecessary LINQ calls.

Note that the alpha check being done in its own pass is important, as
it must be the "minimum present alpha across all command groups,
including loops". This is what makes the implementation slightly
complex.

Closes #11981.
---
 osu.Game/Storyboards/CommandTimelineGroup.cs | 19 +++++++++
 osu.Game/Storyboards/StoryboardSprite.cs     | 45 +++++++++++++++++---
 2 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Storyboards/CommandTimelineGroup.cs b/osu.Game/Storyboards/CommandTimelineGroup.cs
index 6ce3b617e9..617455cf0b 100644
--- a/osu.Game/Storyboards/CommandTimelineGroup.cs
+++ b/osu.Game/Storyboards/CommandTimelineGroup.cs
@@ -45,11 +45,30 @@ namespace osu.Game.Storyboards
             };
         }
 
+        /// <summary>
+        /// Returns the earliest visible time. Will be null unless this group has an <see cref="Alpha"/> command with a start value of zero.
+        /// </summary>
+        public double? EarliestDisplayedTime
+        {
+            get
+            {
+                var first = Alpha.Commands.FirstOrDefault();
+
+                return first?.StartValue == 0 ? first.StartTime : (double?)null;
+            }
+        }
+
         [JsonIgnore]
         public double CommandsStartTime
         {
             get
             {
+                // if the first alpha command starts at zero it should be given priority over anything else.
+                // this is due to it creating a state where the target is not present before that time, causing any other events to not be visible.
+                var earliestDisplay = EarliestDisplayedTime;
+                if (earliestDisplay != null)
+                    return earliestDisplay.Value;
+
                 double min = double.MaxValue;
 
                 for (int i = 0; i < timelines.Length; i++)
diff --git a/osu.Game/Storyboards/StoryboardSprite.cs b/osu.Game/Storyboards/StoryboardSprite.cs
index f411ad04f3..fdaa59d7d9 100644
--- a/osu.Game/Storyboards/StoryboardSprite.cs
+++ b/osu.Game/Storyboards/StoryboardSprite.cs
@@ -24,13 +24,46 @@ namespace osu.Game.Storyboards
 
         public readonly CommandTimelineGroup TimelineGroup = new CommandTimelineGroup();
 
-        public double StartTime => Math.Min(
-            TimelineGroup.HasCommands ? TimelineGroup.CommandsStartTime : double.MaxValue,
-            loops.Any(l => l.HasCommands) ? loops.Where(l => l.HasCommands).Min(l => l.StartTime) : double.MaxValue);
+        public double StartTime
+        {
+            get
+            {
+                // check for presence affecting commands as an initial pass.
+                double earliestStartTime = TimelineGroup.EarliestDisplayedTime ?? double.MaxValue;
 
-        public double EndTime => Math.Max(
-            TimelineGroup.HasCommands ? TimelineGroup.CommandsEndTime : double.MinValue,
-            loops.Any(l => l.HasCommands) ? loops.Where(l => l.HasCommands).Max(l => l.EndTime) : double.MinValue);
+                foreach (var l in loops)
+                {
+                    if (!(l.EarliestDisplayedTime is double lEarliest))
+                        continue;
+
+                    earliestStartTime = Math.Min(earliestStartTime, lEarliest);
+                }
+
+                if (earliestStartTime < double.MaxValue)
+                    return earliestStartTime;
+
+                // if an alpha-affecting command was not found, use the earliest of any command.
+                earliestStartTime = TimelineGroup.StartTime;
+
+                foreach (var l in loops)
+                    earliestStartTime = Math.Min(earliestStartTime, l.StartTime);
+
+                return earliestStartTime;
+            }
+        }
+
+        public double EndTime
+        {
+            get
+            {
+                double latestEndTime = TimelineGroup.EndTime;
+
+                foreach (var l in loops)
+                    latestEndTime = Math.Max(latestEndTime, l.EndTime);
+
+                return latestEndTime;
+            }
+        }
 
         public bool HasCommands => TimelineGroup.HasCommands || loops.Any(l => l.HasCommands);
 

From 5a6864eb7826502cc74132275206834bf81532fe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Mar 2021 16:43:44 +0900
Subject: [PATCH 1790/3722] Fix SPM counter immediately disappearing on
 completion of spinners

---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs  | 3 +++
 osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index d02376b6c3..69095fd160 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -109,6 +109,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             base.OnFree();
 
             spinningSample.Samples = null;
+
+            // the counter handles its own fade in (when spinning begins) so we should only be responsible for resetting it here, for pooling.
+            SpmCounter.Hide();
         }
 
         protected override void LoadSamples()
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs
index 69355f624b..f3e013c759 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs
@@ -21,6 +21,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
         private readonly OsuSpriteText spmText;
 
+        public override void ApplyTransformsAt(double time, bool propagateChildren = false)
+        {
+            // handles own fade in state.
+        }
+
         public SpinnerSpmCounter()
         {
             Children = new Drawable[]

From 4e8bcc92659b47bb1223e43458f8159475e78209 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Mar 2021 16:15:44 +0900
Subject: [PATCH 1791/3722] Fix SPM counter decreasing after spinner has
 already been completed

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

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 69095fd160..e6940f0985 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -267,7 +267,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (!SpmCounter.IsPresent && RotationTracker.Tracking)
                 SpmCounter.FadeIn(HitObject.TimeFadeIn);
 
-            SpmCounter.SetRotation(Result.RateAdjustedRotation);
+            // 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)
+                SpmCounter.SetRotation(Result.RateAdjustedRotation);
 
             updateBonusScore();
         }

From 3f349816649689b519f3ed93942c311c3881a90e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 11 Mar 2021 05:40:18 +0300
Subject: [PATCH 1792/3722] Fix incorrect spinner top offset calculation with
 clarification

---
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index 1738003390..ab7d265f67 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -16,7 +17,13 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
     public abstract class LegacySpinner : CompositeDrawable
     {
-        protected static readonly float SPINNER_TOP_OFFSET = MathF.Ceiling(45f * SPRITE_SCALE);
+        /// <remarks>
+        /// osu!stable applies this adjustment conditionally, locally in the spinner.
+        /// in lazer this is handled at a higher level in <see cref="OsuPlayfieldAdjustmentContainer"/>,
+        /// therefore it's safe to apply it unconditionally in this component.
+        /// </remarks>
+        protected static readonly float SPINNER_TOP_OFFSET = 45f - 16f;
+
         protected static readonly float SPINNER_Y_CENTRE = SPINNER_TOP_OFFSET + 219f;
 
         protected const float SPRITE_SCALE = 0.625f;

From efb4a366d42600b5217e574f40c5d53438a8d3c7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Mar 2021 12:15:59 +0900
Subject: [PATCH 1793/3722] Fix xmldoc explaining incorrect 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/Storyboards/CommandTimelineGroup.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Storyboards/CommandTimelineGroup.cs b/osu.Game/Storyboards/CommandTimelineGroup.cs
index 617455cf0b..c478b91c22 100644
--- a/osu.Game/Storyboards/CommandTimelineGroup.cs
+++ b/osu.Game/Storyboards/CommandTimelineGroup.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Storyboards
         }
 
         /// <summary>
-        /// Returns the earliest visible time. Will be null unless this group has an <see cref="Alpha"/> command with a start value of zero.
+        /// Returns the earliest visible time. Will be null unless this group's first <see cref="Alpha"/> command has a start value of zero.
         /// </summary>
         public double? EarliestDisplayedTime
         {

From 1591d593e26095201cedb9d2e1fde2f2761a09a6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Mar 2021 12:58:15 +0900
Subject: [PATCH 1794/3722] Move spin start time to inside result and switch to
 standard state handling

---
 .../Judgements/OsuSpinnerJudgementResult.cs   |  5 +++++
 .../Objects/Drawables/DrawableSpinner.cs      | 21 +++++++++++++++----
 .../Skinning/Default/SpinnerSpmCounter.cs     |  5 -----
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerJudgementResult.cs b/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerJudgementResult.cs
index e58aacd86e..9f77175398 100644
--- a/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerJudgementResult.cs
+++ b/osu.Game.Rulesets.Osu/Judgements/OsuSpinnerJudgementResult.cs
@@ -38,6 +38,11 @@ namespace osu.Game.Rulesets.Osu.Judgements
         /// </example>
         public float RateAdjustedRotation;
 
+        /// <summary>
+        /// Time instant at which the spin was started (the first user input which caused an increase in spin).
+        /// </summary>
+        public double? TimeStarted;
+
         /// <summary>
         /// Time instant at which the spinner has been completed (the user has executed all required spins).
         /// Will be null if all required spins haven't been completed.
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index e6940f0985..3d614c2dbd 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -109,9 +109,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             base.OnFree();
 
             spinningSample.Samples = null;
-
-            // the counter handles its own fade in (when spinning begins) so we should only be responsible for resetting it here, for pooling.
-            SpmCounter.Hide();
         }
 
         protected override void LoadSamples()
@@ -161,6 +158,17 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
         }
 
+        protected override void UpdateStartTimeStateTransforms()
+        {
+            base.UpdateStartTimeStateTransforms();
+
+            if (Result?.TimeStarted is double startTime)
+            {
+                using (BeginAbsoluteSequence(startTime))
+                    fadeInCounter();
+            }
+        }
+
         protected override void UpdateHitStateTransforms(ArmedState state)
         {
             base.UpdateHitStateTransforms(state);
@@ -265,7 +273,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             base.UpdateAfterChildren();
 
             if (!SpmCounter.IsPresent && RotationTracker.Tracking)
-                SpmCounter.FadeIn(HitObject.TimeFadeIn);
+            {
+                Result.TimeStarted ??= Time.Current;
+                fadeInCounter();
+            }
 
             // 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.
@@ -275,6 +286,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             updateBonusScore();
         }
 
+        private void fadeInCounter() => SpmCounter.FadeIn(HitObject.TimeFadeIn);
+
         private int wholeSpins;
 
         private void updateBonusScore()
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs
index f3e013c759..69355f624b 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs
@@ -21,11 +21,6 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
         private readonly OsuSpriteText spmText;
 
-        public override void ApplyTransformsAt(double time, bool propagateChildren = false)
-        {
-            // handles own fade in state.
-        }
-
         public SpinnerSpmCounter()
         {
             Children = new Drawable[]

From 8bc494b224639f79ab4bb6f0a31e18d89da5cfcf Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 11 Mar 2021 20:57:00 +0900
Subject: [PATCH 1795/3722] Adjust explanatory comments

---
 .../Skinning/Legacy/LegacySpinner.cs              | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index ab7d265f67..acaec9cbc0 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -18,13 +18,13 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
     public abstract class LegacySpinner : CompositeDrawable
     {
         /// <remarks>
-        /// osu!stable applies this adjustment conditionally, locally in the spinner.
-        /// in lazer this is handled at a higher level in <see cref="OsuPlayfieldAdjustmentContainer"/>,
-        /// therefore it's safe to apply it unconditionally in this component.
+        /// All constant spinner coordinates are in osu!stable's gamefield space, which is shifted 16px downwards.
+        /// This offset is negated in both osu!stable and osu!lazer to bring all constant coordinates into window-space.
+        /// Note: SPINNER_Y_CENTRE + SPINNER_TOP_OFFSET - Position.Y = 240 (=480/2, or half the window-space in osu!stable)
         /// </remarks>
-        protected static readonly float SPINNER_TOP_OFFSET = 45f - 16f;
+        protected const float SPINNER_TOP_OFFSET = 45f - 16f;
 
-        protected static readonly float SPINNER_Y_CENTRE = SPINNER_TOP_OFFSET + 219f;
+        protected const float SPINNER_Y_CENTRE = SPINNER_TOP_OFFSET + 219f;
 
         protected const float SPRITE_SCALE = 0.625f;
 
@@ -43,9 +43,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             Origin = Anchor.Centre;
             Size = new Vector2(640, 480);
 
-            // stable applies this adjustment conditionally, locally in the spinner.
-            // in lazer this is handled at a higher level in OsuPlayfieldAdjustmentContainer,
-            // therefore it's safe to apply it unconditionally in this component.
+            // osu!stable positions components of the spinner in window-space (as opposed to gamefield-space).
+            // in lazer, the gamefield-space transformation is applied in OsuPlayfieldAdjustmentContainer, which is inverted here to bring coordinates back into window-space.
             Position = new Vector2(0, -8f);
 
             DrawableSpinner = (DrawableSpinner)drawableHitObject;

From b5bdf235cad7a638ad0fc8ce62fd7f6a31edf094 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 11 Mar 2021 21:21:44 +0900
Subject: [PATCH 1796/3722] Slightly improve comments more

---
 .../Skinning/Legacy/LegacySpinner.cs                | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index acaec9cbc0..1cc25bf053 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -18,8 +18,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
     public abstract class LegacySpinner : CompositeDrawable
     {
         /// <remarks>
-        /// All constant spinner coordinates are in osu!stable's gamefield space, which is shifted 16px downwards.
-        /// This offset is negated in both osu!stable and osu!lazer to bring all constant coordinates into window-space.
+        /// All constants are in osu!stable's gamefield space, which is shifted 16px downwards.
+        /// This offset is negated in both osu!stable and osu!lazer to bring all constants into window-space.
         /// Note: SPINNER_Y_CENTRE + SPINNER_TOP_OFFSET - Position.Y = 240 (=480/2, or half the window-space in osu!stable)
         /// </remarks>
         protected const float SPINNER_TOP_OFFSET = 45f - 16f;
@@ -36,15 +36,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         [BackgroundDependencyLoader]
         private void load(DrawableHitObject drawableHitObject, ISkinSource source)
         {
-            // legacy spinners relied heavily on absolute screen-space coordinate values.
-            // wrap everything in a container simulating absolute coords to preserve alignment
-            // as there are skins that depend on it.
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
-            Size = new Vector2(640, 480);
 
-            // osu!stable positions components of the spinner in window-space (as opposed to gamefield-space).
-            // in lazer, the gamefield-space transformation is applied in OsuPlayfieldAdjustmentContainer, which is inverted here to bring coordinates back into window-space.
+            // osu!stable positions spinner components in window-space (as opposed to gamefield-space). This is a 640x480 area taking up the entire screen.
+            // In lazer, the gamefield-space positional transformation is applied in OsuPlayfieldAdjustmentContainer, which is inverted here to make this area take up the entire window space.
+            Size = new Vector2(640, 480);
             Position = new Vector2(0, -8f);
 
             DrawableSpinner = (DrawableSpinner)drawableHitObject;

From ea9b48d17d08444c2e7e458fd874cac580ec388c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 11 Mar 2021 21:21:48 +0900
Subject: [PATCH 1797/3722] Remove unused using

---
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index 1cc25bf053..513888db53 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
-using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Skinning;
 using osuTK;
 

From f1302d16006b567343c12a2624eeb544c7eae9bf Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Thu, 11 Mar 2021 19:23:56 +0300
Subject: [PATCH 1798/3722] Update Microsoft.EntityFrameworkCore

---
 osu.Desktop/osu.Desktop.csproj    | 7 +++++--
 osu.Game/Database/OsuDbContext.cs | 3 ---
 osu.Game/osu.Game.csproj          | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index 3e0f0cb7f6..4af69c573d 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -27,8 +27,11 @@
     <PackageReference Include="Microsoft.NETCore.Targets" Version="5.0.0" />
     <PackageReference Include="System.IO.Packaging" Version="5.0.0" />
     <PackageReference Include="ppy.squirrel.windows" Version="1.9.0.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.4">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
     <PackageReference Include="DiscordRichPresence" Version="1.0.175" />
   </ItemGroup>
diff --git a/osu.Game/Database/OsuDbContext.cs b/osu.Game/Database/OsuDbContext.cs
index 2aae62edea..d27da50448 100644
--- a/osu.Game/Database/OsuDbContext.cs
+++ b/osu.Game/Database/OsuDbContext.cs
@@ -111,9 +111,6 @@ namespace osu.Game.Database
         {
             base.OnConfiguring(optionsBuilder);
             optionsBuilder
-                // this is required for the time being due to the way we are querying in places like BeatmapStore.
-                // if we ever move to having consumers file their own .Includes, or get eager loading support, this could be re-enabled.
-                .ConfigureWarnings(warnings => warnings.Ignore(CoreEventId.IncludeIgnoredWarning))
                 .UseSqlite(connectionString, sqliteOptions => sqliteOptions.CommandTimeout(10))
                 .UseLoggerFactory(logger.Value);
         }
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 90c8b98f42..fa1b0a95c3 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,10 +24,10 @@
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="5.0.2" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.3" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="5.0.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="5.0.4" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
-    <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
+    <PackageReference Include="Microsoft.NETCore.Targets" Version="5.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.309.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />

From 47b80d2474f6c2a371dd91aa48fda003a60e808e Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Thu, 11 Mar 2021 20:51:54 +0300
Subject: [PATCH 1799/3722] Workaround InvalidOperation exceptions

---
 osu.Game/Beatmaps/BeatmapManager.cs      | 16 ++++++++++++++++
 osu.Game/Database/ArchiveModelManager.cs |  8 +++++++-
 osu.Game/Skinning/SkinManager.cs         | 12 ++++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 29b3f5d3a3..3254f53574 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -174,6 +174,22 @@ namespace osu.Game.Beatmaps
             if (beatmapSet.Beatmaps.Any(b => b.BaseDifficulty == null))
                 throw new InvalidOperationException($"Cannot import {nameof(BeatmapInfo)} with null {nameof(BeatmapInfo.BaseDifficulty)}.");
 
+            var dbContext = ContextFactory.Get();
+
+            // Workaround System.InvalidOperationException
+            // The instance of entity type 'RulesetInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
+            foreach (var beatmap in beatmapSet.Beatmaps)
+            {
+                beatmap.Ruleset = dbContext.RulesetInfo.Find(beatmap.RulesetID);
+            }
+
+            // Workaround System.InvalidOperationException
+            // The instance of entity type 'FileInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
+            foreach (var file in beatmapSet.Files)
+            {
+                file.FileInfo = dbContext.FileInfo.Find(file.FileInfoID);
+            }
+
             // check if a set already exists with the same online id, delete if it does.
             if (beatmapSet.OnlineBeatmapSetID != null)
             {
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index d809dbcb01..fe2caaa0b7 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -462,6 +462,10 @@ namespace osu.Game.Database
                 // Dereference the existing file info, since the file model will be removed.
                 if (file.FileInfo != null)
                 {
+                    // Workaround System.InvalidOperationException
+                    // The instance of entity type 'FileInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
+                    file.FileInfo = usage.Context.FileInfo.Find(file.FileInfoID);
+
                     Files.Dereference(file.FileInfo);
 
                     // This shouldn't be required, but here for safety in case the provided TModel is not being change tracked
@@ -635,10 +639,12 @@ namespace osu.Game.Database
             {
                 using (Stream s = reader.GetStream(file))
                 {
+                    var fileInfo = files.Add(s);
                     fileInfos.Add(new TFileModel
                     {
                         Filename = file.Substring(prefix.Length).ToStandardisedPath(),
-                        FileInfo = files.Add(s)
+                        FileInfo = fileInfo,
+                        FileInfoID = fileInfo.ID
                     });
                 }
             }
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index fcde9f041b..2bb27b60d6 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -142,6 +142,18 @@ namespace osu.Game.Skinning
             }
         }
 
+        protected override void PreImport(SkinInfo model)
+        {
+            var dbContext = ContextFactory.Get();
+
+            // Workaround System.InvalidOperationException
+            // The instance of entity type 'FileInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
+            foreach (var file in model.Files)
+            {
+                file.FileInfo = dbContext.FileInfo.Find(file.FileInfoID);
+            }
+        }
+
         /// <summary>
         /// Retrieve a <see cref="Skin"/> instance for the provided <see cref="SkinInfo"/>
         /// </summary>

From c6c616f244eb08e664c04937234ffcd6dd84b9c0 Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Thu, 11 Mar 2021 21:02:40 +0300
Subject: [PATCH 1800/3722] Actualize tests

---
 .../Multiplayer/TestSceneMultiplayerMatchSongSelect.cs |  1 +
 .../SongSelect/TestSceneBeatmapRecommendations.cs      |  1 +
 .../Visual/SongSelect/TestScenePlaySongSelect.cs       |  4 +++-
 osu.Game/Scoring/ScoreInfo.cs                          | 10 ++--------
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
index faa5d9e6fc..4a9eaa1842 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
@@ -56,6 +56,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 beatmaps.Add(new BeatmapInfo
                 {
                     Ruleset = rulesets.GetRuleset(i % 4),
+                    RulesetID = i % 4,
                     OnlineBeatmapID = beatmapId,
                     Length = length,
                     BPM = bpm,
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
index 53a956c77c..223ace6ca5 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
@@ -186,6 +186,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     Metadata = metadata,
                     BaseDifficulty = new BeatmapDifficulty(),
                     Ruleset = ruleset,
+                    RulesetID = ruleset.ID.GetValueOrDefault(),
                     StarDifficulty = difficultyIndex + 1,
                     Version = $"SR{difficultyIndex + 1}"
                 }).ToList()
diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 35c6d62cb7..4b402d0c54 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -911,9 +911,11 @@ namespace osu.Game.Tests.Visual.SongSelect
                 int length = RNG.Next(30000, 200000);
                 double bpm = RNG.NextSingle(80, 200);
 
+                var ruleset = getRuleset();
                 beatmaps.Add(new BeatmapInfo
                 {
-                    Ruleset = getRuleset(),
+                    Ruleset = ruleset,
+                    RulesetID = ruleset.ID.GetValueOrDefault(),
                     OnlineBeatmapID = beatmapId,
                     Version = $"{beatmapId} (length {TimeSpan.FromMilliseconds(length):m\\:ss}, bpm {bpm:0.#})",
                     Length = length,
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index f5192f3a40..c5ad43abba 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Scoring
             }
             set
             {
-                modsJson = null;
+                modsJson = JsonConvert.SerializeObject(value.Select(m => new DeserializedMod { Acronym = m.Acronym }));
                 mods = value;
             }
         }
@@ -88,13 +88,7 @@ namespace osu.Game.Scoring
         {
             get
             {
-                if (modsJson != null)
-                    return modsJson;
-
-                if (mods == null)
-                    return null;
-
-                return modsJson = JsonConvert.SerializeObject(mods.Select(m => new DeserializedMod { Acronym = m.Acronym }));
+                return modsJson;
             }
             set
             {

From d2f943395d349e08ae8e5a72b1f2996ea0d1d539 Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Thu, 11 Mar 2021 22:12:47 +0300
Subject: [PATCH 1801/3722] Hotfix importing scores from stable

---
 osu.Game/Scoring/ScoreManager.cs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 96ec9644b5..a97c516a1b 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -52,6 +52,23 @@ namespace osu.Game.Scoring
             this.configManager = configManager;
         }
 
+        protected override void PreImport(ScoreInfo model)
+        {
+            var dbContext = ContextFactory.Get();
+
+            // Workaround System.InvalidOperationException
+            // The instance of entity type 'FileInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
+            foreach (var file in model.Files)
+            {
+                file.FileInfo = dbContext.FileInfo.Find(file.FileInfoID);
+            }
+
+            foreach (var file in model.Beatmap.BeatmapSet.Files)
+            {
+                file.FileInfo = dbContext.FileInfo.Find(file.FileInfoID);
+            }
+        }
+
         protected override ScoreInfo CreateModel(ArchiveReader archive)
         {
             if (archive == null)

From 5a4b0174b187e649b9fb739fafd076ea19817f23 Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Thu, 11 Mar 2021 22:40:35 +0300
Subject: [PATCH 1802/3722] Ignore MultipleCollectionIncludeWarning

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

diff --git a/osu.Game/Database/OsuDbContext.cs b/osu.Game/Database/OsuDbContext.cs
index d27da50448..689f248de8 100644
--- a/osu.Game/Database/OsuDbContext.cs
+++ b/osu.Game/Database/OsuDbContext.cs
@@ -112,6 +112,7 @@ namespace osu.Game.Database
             base.OnConfiguring(optionsBuilder);
             optionsBuilder
                 .UseSqlite(connectionString, sqliteOptions => sqliteOptions.CommandTimeout(10))
+                .ConfigureWarnings(w => w.Ignore(RelationalEventId.MultipleCollectionIncludeWarning))
                 .UseLoggerFactory(logger.Value);
         }
 

From a60ff80c04850c1f09ad9f741197378e691fc78d Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Fri, 12 Mar 2021 00:02:29 +0300
Subject: [PATCH 1803/3722] Use expression body in ModsJson get accessor

---
 osu.Game/Scoring/ScoreInfo.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index c5ad43abba..78101991f6 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -86,10 +86,7 @@ namespace osu.Game.Scoring
         [Column("Mods")]
         public string ModsJson
         {
-            get
-            {
-                return modsJson;
-            }
+            get => modsJson;
             set
             {
                 modsJson = value;

From e7707eee94335149c2c284dfba421a93b11c0f69 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Mar 2021 15:23:11 +0900
Subject: [PATCH 1804/3722] Switch RestoreDefaultsValueButton to use
 HasPendingTasks to avoid tooltip always showing

---
 osu.Game/Overlays/Settings/SettingsItem.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index 8631b8ac7b..85765bf991 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -123,6 +123,8 @@ namespace osu.Game.Overlays.Settings
 
         protected internal class RestoreDefaultValueButton : Container, IHasTooltip
         {
+            public override bool IsPresent => base.IsPresent || Scheduler.HasPendingTasks;
+
             private Bindable<T> bindable;
 
             public Bindable<T> Bindable
@@ -147,7 +149,6 @@ namespace osu.Game.Overlays.Settings
                 RelativeSizeAxes = Axes.Y;
                 Width = SettingsPanel.CONTENT_MARGINS;
                 Alpha = 0f;
-                AlwaysPresent = true;
             }
 
             [BackgroundDependencyLoader]

From b9b095ee75c960287a8636d06c07afddade6865f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Mar 2021 14:49:38 +0900
Subject: [PATCH 1805/3722] Local framework

---
 osu.Desktop.slnf         |  6 ++++--
 osu.Game/osu.Game.csproj |  4 +++-
 osu.iOS.props            |  4 ++--
 osu.sln                  | 42 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/osu.Desktop.slnf b/osu.Desktop.slnf
index d2c14d321a..1e41d0af0e 100644
--- a/osu.Desktop.slnf
+++ b/osu.Desktop.slnf
@@ -15,7 +15,9 @@
       "osu.Game.Tests\\osu.Game.Tests.csproj",
       "osu.Game.Tournament.Tests\\osu.Game.Tournament.Tests.csproj",
       "osu.Game.Tournament\\osu.Game.Tournament.csproj",
-      "osu.Game\\osu.Game.csproj"
+      "osu.Game\\osu.Game.csproj",
+      "../osu-framework/osu.Framework/osu.Framework.csproj",
+      "../osu-framework/osu.Framework/osu.Framework.NativeLibs.csproj"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 90c8b98f42..f2fc1726cd 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,11 +29,13 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.309.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.0.7" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\osu-framework\osu.Framework\osu.Framework.csproj" />
+  </ItemGroup>
 </Project>
diff --git a/osu.iOS.props b/osu.iOS.props
index ccd33bf88c..30df8c423e 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.309.0" />
+    <ProjectReference Include="../../osu-framework/osu.Framework.iOS/osu.Framework.iOS.csproj" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.309.0" />
+    <ProjectReference Include="../../osu-framework/osu.Framework/osu.Framework.csproj" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />
diff --git a/osu.sln b/osu.sln
index c9453359b1..4d0b3656e7 100644
--- a/osu.sln
+++ b/osu.sln
@@ -66,6 +66,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Game.Benchmarks", "osu.Game.Benchmarks\osu.Game.Benchmarks.csproj", "{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Framework", "..\osu-framework\osu.Framework\osu.Framework.csproj", "{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Framework.iOS", "..\osu-framework\osu.Framework.iOS\osu.Framework.iOS.csproj", "{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Framework.NativeLibs", "..\osu-framework\osu.Framework.NativeLibs\osu.Framework.NativeLibs.csproj", "{500039B3-0706-40C3-B6E7-1FD9187644A5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -412,6 +418,42 @@ Global
 		{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}.Release|iPhone.Build.0 = Release|Any CPU
 		{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Release|iPhone.Build.0 = Release|Any CPU
+		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Release|iPhone.Build.0 = Release|Any CPU
+		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Release|iPhone.Build.0 = Release|Any CPU
+		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

From a33ffd56b80878e02a0cf03cac93a22869af4787 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Mar 2021 12:43:04 +0900
Subject: [PATCH 1806/3722] Allow CreateSettingsControls to work with all
 bindables in target class

---
 .../Configuration/SettingSourceAttribute.cs   | 33 +++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index cfce615130..a8cebb97b4 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using System.Reflection;
 using JetBrains.Annotations;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
 using osu.Game.Overlays.Settings;
@@ -61,9 +62,13 @@ namespace osu.Game.Configuration
 
     public static class SettingSourceExtensions
     {
-        public static IEnumerable<Drawable> CreateSettingsControls(this object obj)
+        public static IEnumerable<Drawable> CreateSettingsControls(this object obj) => createSettingsControls(obj, obj.GetOrderedSettingsSourceProperties());
+
+        public static IEnumerable<Drawable> CreateSettingsControlsFromAllBindables(this object obj) => createSettingsControls(obj, obj.GetSettingsSourcePropertiesFromBindables());
+
+        private static IEnumerable<Drawable> createSettingsControls(object obj, IEnumerable<(SettingSourceAttribute, PropertyInfo)> sourceAttribs)
         {
-            foreach (var (attr, property) in obj.GetOrderedSettingsSourceProperties())
+            foreach (var (attr, property) in sourceAttribs)
             {
                 object value = property.GetValue(obj);
 
@@ -139,6 +144,30 @@ namespace osu.Game.Configuration
             }
         }
 
+        public static IEnumerable<(SettingSourceAttribute, PropertyInfo)> GetSettingsSourcePropertiesFromBindables(this object obj)
+        {
+            HashSet<string> handledProperties = new HashSet<string>();
+
+            // reverse and de-dupe properties to surface base class settings to the top of return order.
+            foreach (var type in obj.GetType().EnumerateBaseTypes().Reverse())
+            {
+                foreach (var property in type.GetProperties(BindingFlags.GetProperty | BindingFlags.Public | BindingFlags.Instance))
+                {
+                    if (handledProperties.Contains(property.Name))
+                        continue;
+
+                    handledProperties.Add(property.Name);
+
+                    if (typeof(IBindable).IsAssignableFrom(property.PropertyType))
+                    {
+                        var val = property.GetValue(obj);
+                        string description = (val as IHasDescription)?.Description ?? string.Empty;
+                        yield return (new SettingSourceAttribute(property.Name, description), property);
+                    }
+                }
+            }
+        }
+
         public static IEnumerable<(SettingSourceAttribute, PropertyInfo)> GetSettingsSourceProperties(this object obj)
         {
             foreach (var property in obj.GetType().GetProperties(BindingFlags.GetProperty | BindingFlags.Public | BindingFlags.Instance))

From 4374e7da81cbece7dfed94b3478e22b19b5b49ca Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Mar 2021 15:26:18 +0900
Subject: [PATCH 1807/3722] Convert bindable names to human readable sentences

---
 osu.Game/Configuration/SettingSourceAttribute.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index a8cebb97b4..fe8886b52e 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using Humanizer;
 using JetBrains.Annotations;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.TypeExtensions;
@@ -162,7 +163,7 @@ namespace osu.Game.Configuration
                     {
                         var val = property.GetValue(obj);
                         string description = (val as IHasDescription)?.Description ?? string.Empty;
-                        yield return (new SettingSourceAttribute(property.Name, description), property);
+                        yield return (new SettingSourceAttribute(property.Name.Humanize(), description), property);
                     }
                 }
             }

From 6eadae8aaf56831d4ecfc19fb0f4dd1c0fdab2ee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Mar 2021 18:35:42 +0900
Subject: [PATCH 1808/3722] Remove remnants of OsuTK

---
 osu.Desktop/OsuGameDesktop.cs | 22 +++++-----------------
 osu.Desktop/Program.cs        |  2 +-
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index 5909b82c8f..b2487568ce 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -136,24 +136,12 @@ namespace osu.Desktop
 
             var iconStream = Assembly.GetExecutingAssembly().GetManifestResourceStream(GetType(), "lazer.ico");
 
-            switch (host.Window)
-            {
-                // Legacy osuTK DesktopGameWindow
-                case OsuTKDesktopWindow desktopGameWindow:
-                    desktopGameWindow.CursorState |= CursorState.Hidden;
-                    desktopGameWindow.SetIconFromStream(iconStream);
-                    desktopGameWindow.Title = Name;
-                    desktopGameWindow.FileDrop += (_, e) => fileDrop(e.FileNames);
-                    break;
+            var desktopWindow = (SDL2DesktopWindow)host.Window;
 
-                // SDL2 DesktopWindow
-                case SDL2DesktopWindow desktopWindow:
-                    desktopWindow.CursorState |= CursorState.Hidden;
-                    desktopWindow.SetIconFromStream(iconStream);
-                    desktopWindow.Title = Name;
-                    desktopWindow.DragDrop += f => fileDrop(new[] { f });
-                    break;
-            }
+            desktopWindow.CursorState |= CursorState.Hidden;
+            desktopWindow.SetIconFromStream(iconStream);
+            desktopWindow.Title = Name;
+            desktopWindow.DragDrop += f => fileDrop(new[] { f });
         }
 
         private void fileDrop(string[] filePaths)
diff --git a/osu.Desktop/Program.cs b/osu.Desktop/Program.cs
index 6ca7079654..0c527ba881 100644
--- a/osu.Desktop/Program.cs
+++ b/osu.Desktop/Program.cs
@@ -24,7 +24,7 @@ namespace osu.Desktop
             var cwd = Environment.CurrentDirectory;
             bool useOsuTK = args.Contains("--tk");
 
-            using (DesktopGameHost host = Host.GetSuitableHost(@"osu", true, useOsuTK: useOsuTK))
+            using (DesktopGameHost host = Host.GetSuitableHost(@"osu", true))
             {
                 host.ExceptionThrown += handleException;
 

From 3c21c83cc88e8a0613aeda4f6cb04069172c6777 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Mar 2021 18:36:28 +0900
Subject: [PATCH 1809/3722] Rename KeyboardSection to BindingSection

---
 .../Input/{KeyboardSettings.cs => BindingSettings.cs}     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename osu.Game/Overlays/Settings/Sections/Input/{KeyboardSettings.cs => BindingSettings.cs} (70%)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyboardSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/BindingSettings.cs
similarity index 70%
rename from osu.Game/Overlays/Settings/Sections/Input/KeyboardSettings.cs
rename to osu.Game/Overlays/Settings/Sections/Input/BindingSettings.cs
index db6f24a954..79c73863cf 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/KeyboardSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/BindingSettings.cs
@@ -5,17 +5,17 @@ using osu.Framework.Graphics;
 
 namespace osu.Game.Overlays.Settings.Sections.Input
 {
-    public class KeyboardSettings : SettingsSubsection
+    public class BindingSettings : SettingsSubsection
     {
-        protected override string Header => "Keyboard";
+        protected override string Header => "Shortcut and gameplay bindings";
 
-        public KeyboardSettings(KeyBindingPanel keyConfig)
+        public BindingSettings(KeyBindingPanel keyConfig)
         {
             Children = new Drawable[]
             {
                 new SettingsButton
                 {
-                    Text = "Key configuration",
+                    Text = "Configure",
                     TooltipText = "change global shortcut keys and gameplay bindings",
                     Action = keyConfig.ToggleVisibility
                 },

From 8635abbc4a616771e7ed702140109737919a4dd5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Mar 2021 18:37:55 +0900
Subject: [PATCH 1810/3722] Add the ability to not get controls for disabled
 bindables

---
 osu.Game/Configuration/SettingSourceAttribute.cs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index fe8886b52e..39d7fba32b 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -63,16 +63,21 @@ namespace osu.Game.Configuration
 
     public static class SettingSourceExtensions
     {
-        public static IEnumerable<Drawable> CreateSettingsControls(this object obj) => createSettingsControls(obj, obj.GetOrderedSettingsSourceProperties());
+        public static IReadOnlyList<Drawable> CreateSettingsControls(this object obj, bool includeDisabled = true) =>
+            createSettingsControls(obj, obj.GetOrderedSettingsSourceProperties(), includeDisabled).ToArray();
 
-        public static IEnumerable<Drawable> CreateSettingsControlsFromAllBindables(this object obj) => createSettingsControls(obj, obj.GetSettingsSourcePropertiesFromBindables());
+        public static IReadOnlyList<Drawable> CreateSettingsControlsFromAllBindables(this object obj, bool includeDisabled = true) =>
+            createSettingsControls(obj, obj.GetSettingsSourcePropertiesFromBindables(), includeDisabled).ToArray();
 
-        private static IEnumerable<Drawable> createSettingsControls(object obj, IEnumerable<(SettingSourceAttribute, PropertyInfo)> sourceAttribs)
+        private static IEnumerable<Drawable> createSettingsControls(object obj, IEnumerable<(SettingSourceAttribute, PropertyInfo)> sourceAttribs, bool includeDisabled = true)
         {
             foreach (var (attr, property) in sourceAttribs)
             {
                 object value = property.GetValue(obj);
 
+                if ((value as IBindable)?.Disabled == true)
+                    continue;
+
                 switch (value)
                 {
                     case BindableNumber<float> bNumber:

From 03230edcb11760ff457ce3667b3377e6aea30660 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Mar 2021 18:38:16 +0900
Subject: [PATCH 1811/3722] Update bindings settings to handle the new
 structure and show all handlers

---
 .../Settings/Sections/Input/MouseSettings.cs  | 60 ++++++-----------
 .../Settings/Sections/InputSection.cs         | 64 ++++++++++++++++++-
 2 files changed, 82 insertions(+), 42 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
index 3a78cff890..036c4edfba 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
@@ -1,11 +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;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
+using osu.Framework.Input.Handlers.Mouse;
 using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input;
@@ -14,35 +14,39 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 {
     public class MouseSettings : SettingsSubsection
     {
+        private readonly MouseHandler mouseHandler;
+
         protected override string Header => "Mouse";
 
-        private readonly BindableBool rawInputToggle = new BindableBool();
-
-        private Bindable<double> configSensitivity;
+        private Bindable<double> handlerSensitivity;
 
         private Bindable<double> localSensitivity;
 
-        private Bindable<string> ignoredInputHandlers;
-
         private Bindable<WindowMode> windowMode;
         private SettingsEnumDropdown<OsuConfineMouseMode> confineMouseModeSetting;
+        private Bindable<bool> relativeMode;
+
+        public MouseSettings(MouseHandler mouseHandler)
+        {
+            this.mouseHandler = mouseHandler;
+        }
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager osuConfig, FrameworkConfigManager config)
         {
             // use local bindable to avoid changing enabled state of game host's bindable.
-            configSensitivity = config.GetBindable<double>(FrameworkSetting.CursorSensitivity);
-            localSensitivity = configSensitivity.GetUnboundCopy();
+            handlerSensitivity = mouseHandler.Sensitivity.GetBoundCopy();
+            localSensitivity = handlerSensitivity.GetUnboundCopy();
 
+            relativeMode = mouseHandler.UseRelativeMode.GetBoundCopy();
             windowMode = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
-            ignoredInputHandlers = config.GetBindable<string>(FrameworkSetting.IgnoredInputHandlers);
 
             Children = new Drawable[]
             {
                 new SettingsCheckbox
                 {
-                    LabelText = "Raw input",
-                    Current = rawInputToggle
+                    LabelText = "High precision mouse",
+                    Current = relativeMode
                 },
                 new SensitivitySetting
                 {
@@ -76,7 +80,9 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         {
             base.LoadComplete();
 
-            configSensitivity.BindValueChanged(val =>
+            relativeMode.BindValueChanged(relative => localSensitivity.Disabled = !relative.NewValue, true);
+
+            handlerSensitivity.BindValueChanged(val =>
             {
                 var disabled = localSensitivity.Disabled;
 
@@ -85,7 +91,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 localSensitivity.Disabled = disabled;
             }, true);
 
-            localSensitivity.BindValueChanged(val => configSensitivity.Value = val.NewValue);
+            localSensitivity.BindValueChanged(val => handlerSensitivity.Value = val.NewValue);
 
             windowMode.BindValueChanged(mode =>
             {
@@ -102,32 +108,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                     confineMouseModeSetting.TooltipText = string.Empty;
                 }
             }, true);
-
-            if (RuntimeInfo.OS != RuntimeInfo.Platform.Windows)
-            {
-                rawInputToggle.Disabled = true;
-                localSensitivity.Disabled = true;
-            }
-            else
-            {
-                rawInputToggle.ValueChanged += enabled =>
-                {
-                    // this is temporary until we support per-handler settings.
-                    const string raw_mouse_handler = @"OsuTKRawMouseHandler";
-                    const string standard_mouse_handlers = @"OsuTKMouseHandler MouseHandler";
-
-                    ignoredInputHandlers.Value = enabled.NewValue ? standard_mouse_handlers : raw_mouse_handler;
-                };
-
-                ignoredInputHandlers.ValueChanged += handler =>
-                {
-                    bool raw = !handler.NewValue.Contains("Raw");
-                    rawInputToggle.Value = raw;
-                    localSensitivity.Disabled = !raw;
-                };
-
-                ignoredInputHandlers.TriggerChange();
-            }
         }
 
         private class SensitivitySetting : SettingsSlider<double, SensitivitySlider>
@@ -141,7 +121,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         private class SensitivitySlider : OsuSliderBar<double>
         {
-            public override string TooltipText => Current.Disabled ? "enable raw input to adjust sensitivity" : $"{base.TooltipText}x";
+            public override string TooltipText => Current.Disabled ? "enable high precision mouse to adjust sensitivity" : $"{base.TooltipText}x";
         }
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/InputSection.cs b/osu.Game/Overlays/Settings/Sections/InputSection.cs
index b43453f53d..107e37909c 100644
--- a/osu.Game/Overlays/Settings/Sections/InputSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/InputSection.cs
@@ -1,28 +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 osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Handlers;
+using osu.Framework.Input.Handlers.Mouse;
+using osu.Framework.Platform;
+using osu.Game.Configuration;
 using osu.Game.Overlays.Settings.Sections.Input;
 
 namespace osu.Game.Overlays.Settings.Sections
 {
     public class InputSection : SettingsSection
     {
+        private readonly KeyBindingPanel keyConfig;
+
         public override string Header => "Input";
 
+        [Resolved]
+        private GameHost host { get; set; }
+
         public override Drawable CreateIcon() => new SpriteIcon
         {
             Icon = FontAwesome.Solid.Keyboard
         };
 
         public InputSection(KeyBindingPanel keyConfig)
+        {
+            this.keyConfig = keyConfig;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
         {
             Children = new Drawable[]
             {
-                new MouseSettings(),
-                new KeyboardSettings(keyConfig),
+                new BindingSettings(keyConfig),
             };
+
+            foreach (var handler in host.AvailableInputHandlers)
+            {
+                var handlerSection = createSectionFor(handler);
+
+                if (handlerSection != null)
+                    Add(handlerSection);
+            }
+        }
+
+        private SettingsSubsection createSectionFor(InputHandler handler)
+        {
+            var settingsControls = handler.CreateSettingsControlsFromAllBindables(false);
+
+            if (settingsControls.Count == 0)
+                return null;
+
+            SettingsSubsection section;
+
+            switch (handler)
+            {
+                case MouseHandler mh:
+                    section = new MouseSettings(mh);
+                    break;
+
+                default:
+                    section = new HandlerSection(handler);
+                    break;
+            }
+
+            section.AddRange(settingsControls);
+
+            return section;
+        }
+
+        private class HandlerSection : SettingsSubsection
+        {
+            private readonly InputHandler handler;
+
+            public HandlerSection(InputHandler handler)
+            {
+                this.handler = handler;
+            }
+
+            protected override string Header => handler.Description;
         }
     }
 }

From 3458dcc33aa07615dad66ba2b2ee643f874b5f22 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Mar 2021 18:40:38 +0900
Subject: [PATCH 1812/3722] Use whitelist to avoid exposing settings to user
 that shouldn't be

---
 .../Settings/Sections/InputSection.cs         | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/InputSection.cs b/osu.Game/Overlays/Settings/Sections/InputSection.cs
index 107e37909c..e6aaa1ade9 100644
--- a/osu.Game/Overlays/Settings/Sections/InputSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/InputSection.cs
@@ -5,6 +5,8 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Handlers;
+using osu.Framework.Input.Handlers.Joystick;
+using osu.Framework.Input.Handlers.Midi;
 using osu.Framework.Input.Handlers.Mouse;
 using osu.Framework.Platform;
 using osu.Game.Configuration;
@@ -50,11 +52,6 @@ namespace osu.Game.Overlays.Settings.Sections
 
         private SettingsSubsection createSectionFor(InputHandler handler)
         {
-            var settingsControls = handler.CreateSettingsControlsFromAllBindables(false);
-
-            if (settingsControls.Count == 0)
-                return null;
-
             SettingsSubsection section;
 
             switch (handler)
@@ -63,11 +60,21 @@ namespace osu.Game.Overlays.Settings.Sections
                     section = new MouseSettings(mh);
                     break;
 
-                default:
+                // whitelist the handlers which should be displayed to avoid any weird cases of users touching settings they shouldn't.
+                case JoystickHandler _:
+                case MidiHandler _:
                     section = new HandlerSection(handler);
                     break;
+
+                default:
+                    return null;
             }
 
+            var settingsControls = handler.CreateSettingsControlsFromAllBindables(false);
+
+            if (settingsControls.Count == 0)
+                return null;
+
             section.AddRange(settingsControls);
 
             return section;

From 86164c027a052af679caeb9d1937828bde61df8e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Mar 2021 18:44:10 +0900
Subject: [PATCH 1813/3722] Update the method we use to reset input settings

---
 osu.Game/OsuGame.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index b7398efdc2..4dd7f97a72 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -880,8 +880,7 @@ namespace osu.Game
             switch (action)
             {
                 case GlobalAction.ResetInputSettings:
-                    frameworkConfig.GetBindable<string>(FrameworkSetting.IgnoredInputHandlers).SetDefault();
-                    frameworkConfig.GetBindable<double>(FrameworkSetting.CursorSensitivity).SetDefault();
+                    Host.ResetInputHandlers();
                     frameworkConfig.GetBindable<ConfineMouseMode>(FrameworkSetting.ConfineMouseMode).SetDefault();
                     return true;
 

From d0644221ff74801457b2b17efa728de723ddea20 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 9 Nov 2020 14:43:06 -0800
Subject: [PATCH 1814/3722] Add test showing toolbar behavior change

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

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index fc49517cdf..f2bb518b2e 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -229,6 +229,35 @@ namespace osu.Game.Tests.Visual.Navigation
             AddUntilStep("settings displayed", () => Game.Settings.State.Value == Visibility.Visible);
         }
 
+        [Test]
+        public void TestToolbarHiddenByUser()
+        {
+            AddStep("Enter menu", () => InputManager.Key(Key.Enter));
+
+            AddUntilStep("Wait for toolbar to load", () => Game.Toolbar.IsLoaded);
+
+            AddStep("Hide toolbar", () =>
+            {
+                InputManager.PressKey(Key.ControlLeft);
+                InputManager.Key(Key.T);
+                InputManager.ReleaseKey(Key.ControlLeft);
+            });
+
+            pushEscape();
+
+            AddStep("Enter menu", () => InputManager.Key(Key.Enter));
+
+            AddAssert("Toolbar is hidden", () => Game.Toolbar.State.Value == Visibility.Hidden);
+
+            AddStep("Enter song select", () =>
+            {
+                InputManager.Key(Key.Enter);
+                InputManager.Key(Key.Enter);
+            });
+
+            AddAssert("Toolbar is hidden", () => Game.Toolbar.State.Value == Visibility.Hidden);
+        }
+
         private void pushEscape() =>
             AddStep("Press escape", () => InputManager.Key(Key.Escape));
 

From 6c0734a09ff87754eb91917623f717476ee400e6 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 9 Nov 2020 14:45:20 -0800
Subject: [PATCH 1815/3722] Handle global action in toolbar instead of osugame

---
 osu.Game/OsuGame.cs                  |  4 ----
 osu.Game/Overlays/Toolbar/Toolbar.cs | 22 ++++++++++++++++++++--
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index b7398efdc2..dd775888a1 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -885,10 +885,6 @@ namespace osu.Game
                     frameworkConfig.GetBindable<ConfineMouseMode>(FrameworkSetting.ConfineMouseMode).SetDefault();
                     return true;
 
-                case GlobalAction.ToggleToolbar:
-                    Toolbar.ToggleVisibility();
-                    return true;
-
                 case GlobalAction.ToggleGameplayMouseButtons:
                     LocalConfig.Set(OsuSetting.MouseDisableButtons, !LocalConfig.Get<bool>(OsuSetting.MouseDisableButtons));
                     return true;
diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index 0ccb22df3a..011f5a03c9 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -13,10 +13,12 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Input.Events;
 using osu.Game.Rulesets;
+using osu.Framework.Input.Bindings;
+using osu.Game.Input.Bindings;
 
 namespace osu.Game.Overlays.Toolbar
 {
-    public class Toolbar : VisibilityContainer
+    public class Toolbar : VisibilityContainer, IKeyBindingHandler<GlobalAction>
     {
         public const float HEIGHT = 40;
         public const float TOOLTIP_HEIGHT = 30;
@@ -30,7 +32,7 @@ namespace osu.Game.Overlays.Toolbar
 
         protected readonly IBindable<OverlayActivation> OverlayActivationMode = new Bindable<OverlayActivation>(OverlayActivation.All);
 
-        // Toolbar components like RulesetSelector should receive keyboard input events even when the toolbar is hidden.
+        // Toolbar and its components need keyboard input even when hidden.
         public override bool PropagateNonPositionalInputSubTree => true;
 
         public Toolbar()
@@ -164,5 +166,21 @@ namespace osu.Game.Overlays.Toolbar
             this.MoveToY(-DrawSize.Y, transition_time, Easing.OutQuint);
             this.FadeOut(transition_time, Easing.InQuint);
         }
+
+        public bool OnPressed(GlobalAction action)
+        {
+            switch (action)
+            {
+                case GlobalAction.ToggleToolbar:
+                    ToggleVisibility();
+                    return true;
+            }
+
+            return false;
+        }
+
+        public void OnReleased(GlobalAction action)
+        {
+        }
     }
 }

From 62f2a823f6be7d27ec7c6db751193023927bb130 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 9 Nov 2020 14:46:08 -0800
Subject: [PATCH 1816/3722] Hide toolbar forever when the user hides it

---
 osu.Game/OsuGame.cs                   | 2 +-
 osu.Game/Overlays/Toolbar/Toolbar.cs  | 6 ++++++
 osu.Game/Screens/Menu/ButtonSystem.cs | 3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index dd775888a1..fa9a0d4eb5 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -983,7 +983,7 @@ namespace osu.Game
 
                 if (newOsuScreen.HideOverlaysOnEnter)
                     CloseAllOverlays();
-                else
+                else if (!Toolbar.HiddenByUser)
                     Toolbar.Show();
 
                 if (newOsuScreen.AllowBackButton)
diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index 011f5a03c9..7f77e5add9 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -23,6 +23,8 @@ namespace osu.Game.Overlays.Toolbar
         public const float HEIGHT = 40;
         public const float TOOLTIP_HEIGHT = 30;
 
+        public bool HiddenByUser;
+
         public Action OnHome;
 
         private ToolbarUserButton userButton;
@@ -169,10 +171,14 @@ namespace osu.Game.Overlays.Toolbar
 
         public bool OnPressed(GlobalAction action)
         {
+            if (OverlayActivationMode.Value == OverlayActivation.Disabled)
+                return false;
+
             switch (action)
             {
                 case GlobalAction.ToggleToolbar:
                     ToggleVisibility();
+                    HiddenByUser = State.Value == Visibility.Hidden;
                     return true;
             }
 
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 81b1cb0bf1..8f1fd627f5 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -352,7 +352,8 @@ namespace osu.Game.Screens.Menu
                                 if (impact)
                                     logo.Impact();
 
-                                game?.Toolbar.Show();
+                                if (game?.Toolbar.HiddenByUser == false)
+                                    game.Toolbar.Show();
                             }, 200);
                             break;
 

From 020a03e01ee7284d37359a67704b3e72ed8ff50a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 13 Mar 2021 05:22:20 +0300
Subject: [PATCH 1817/3722] Use sensible "score per tick" constant

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

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 8534cd89d7..1ec3c877e9 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -289,6 +289,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private void fadeInCounter() => SpmCounter.FadeIn(HitObject.TimeFadeIn);
 
+        private static readonly int score_per_tick = new SpinnerBonusTick.OsuSpinnerBonusTickJudgement().MaxNumericResult;
+
         private int wholeSpins;
 
         private void updateBonusScore()
@@ -315,7 +317,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     tick.TriggerResult(true);
 
                     if (tick is DrawableSpinnerBonusTick)
-                        gainedBonus.Value = tick.Result.Judgement.MaxNumericResult * (spins - HitObject.SpinsRequired);
+                        gainedBonus.Value = score_per_tick * (spins - HitObject.SpinsRequired);
                 }
 
                 wholeSpins++;

From 8fdab5a7de4a881604ebb5da7547106a153bf9dc Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 12 Mar 2021 02:37:07 +0300
Subject: [PATCH 1818/3722] Revert legacy spinner presence changes and bonus
 counter component

No longer necessary, after inlining legacy coordinates logic to `LegacySpinner` and limiting precisely-positioned legacy components there
---
 .../Objects/Drawables/DrawableSpinner.cs      |  1 -
 osu.Game.Rulesets.Osu/OsuSkinComponents.cs    |  1 -
 .../Legacy/OsuLegacySkinTransformer.cs        | 39 ++-----------------
 3 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 1ec3c877e9..a4919d5061 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -82,7 +82,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     Y = 120,
                     Alpha = 0
                 },
-                new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SpinnerBonusCounter), _ => new DefaultSpinnerBonusCounter()),
                 spinningSample = new PausableSkinnableSound
                 {
                     Volume = { Value = 0 },
diff --git a/osu.Game.Rulesets.Osu/OsuSkinComponents.cs b/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
index 131645406e..fcb544fa5b 100644
--- a/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
+++ b/osu.Game.Rulesets.Osu/OsuSkinComponents.cs
@@ -19,6 +19,5 @@ namespace osu.Game.Rulesets.Osu
         SliderBall,
         SliderBody,
         SpinnerBody,
-        SpinnerBonusCounter,
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index ed09031fc1..d74f885573 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -6,7 +6,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Skinning;
 using osuTK;
-using static osu.Game.Skinning.LegacySkinConfiguration;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
@@ -14,12 +13,6 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
     {
         private Lazy<bool> hasHitCircle;
 
-        private Lazy<SpinnerStyle> spinnerStyle;
-
-        private bool hasSpinner => spinnerStyle.Value != SpinnerStyle.Modern;
-
-        private bool hasScoreFont => this.HasFont(GetConfig<LegacySetting, string>(LegacySetting.ScorePrefix)?.Value ?? "score");
-
         /// <summary>
         /// On osu-stable, hitcircles have 5 pixels of transparent padding on each side to allow for shadows etc.
         /// Their hittable area is 128px, but the actual circle portion is 118px.
@@ -37,19 +30,6 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         private void sourceChanged()
         {
             hasHitCircle = new Lazy<bool>(() => Source.GetTexture("hitcircle") != null);
-
-            spinnerStyle = new Lazy<SpinnerStyle>(() =>
-            {
-                bool hasBackground = Source.GetTexture("spinner-background") != null;
-
-                if (Source.GetTexture("spinner-top") != null && !hasBackground)
-                    return SpinnerStyle.NewLegacy;
-
-                if (hasBackground)
-                    return SpinnerStyle.OldLegacy;
-
-                return SpinnerStyle.Modern;
-            });
         }
 
         public override Drawable GetDrawableComponent(ISkinComponent component)
@@ -130,18 +110,14 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         };
 
                 case OsuSkinComponents.SpinnerBody:
-                    if (spinnerStyle.Value == SpinnerStyle.NewLegacy)
+                    bool hasBackground = Source.GetTexture("spinner-background") != null;
+
+                    if (Source.GetTexture("spinner-top") != null && !hasBackground)
                         return new LegacyNewStyleSpinner();
-                    else if (spinnerStyle.Value == SpinnerStyle.OldLegacy)
+                    else if (hasBackground)
                         return new LegacyOldStyleSpinner();
 
                     return null;
-
-                case OsuSkinComponents.SpinnerBonusCounter:
-                    if (hasSpinner && hasScoreFont)
-                        return new LegacySpinnerBonusCounter();
-
-                    return null;
             }
 
             return null;
@@ -175,12 +151,5 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
             return Source.GetConfig<TLookup, TValue>(lookup);
         }
-
-        private enum SpinnerStyle
-        {
-            NewLegacy,
-            OldLegacy,
-            Modern,
-        }
     }
 }

From 774ebf50bca5d5c0022c824db4e0d5d50e60281b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 12 Mar 2021 02:38:25 +0300
Subject: [PATCH 1819/3722] Move legacy spinner bonus counter to
 `LegacySpinner`

---
 .../Skinning/Legacy/LegacySpinner.cs          | 62 +++++++++++++------
 .../Legacy/LegacySpinnerBonusCounter.cs       | 56 -----------------
 2 files changed, 43 insertions(+), 75 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinnerBonusCounter.cs

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index 513888db53..b0b9cba2bd 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -32,6 +32,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         private Sprite spin;
         private Sprite clear;
 
+        private LegacySpriteText bonusCounter;
+
         [BackgroundDependencyLoader]
         private void load(DrawableHitObject drawableHitObject, ISkinSource source)
         {
@@ -45,36 +47,58 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
             DrawableSpinner = (DrawableSpinner)drawableHitObject;
 
-            AddRangeInternal(new[]
+            AddInternal(new Container
             {
-                spin = new Sprite
+                Depth = float.MinValue,
+                RelativeSizeAxes = Axes.Both,
+                Children = new Drawable[]
                 {
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.Centre,
-                    Depth = float.MinValue,
-                    Texture = source.GetTexture("spinner-spin"),
-                    Scale = new Vector2(SPRITE_SCALE),
-                    Y = SPINNER_TOP_OFFSET + 335,
-                },
-                clear = new Sprite
-                {
-                    Alpha = 0,
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.Centre,
-                    Depth = float.MinValue,
-                    Texture = source.GetTexture("spinner-clear"),
-                    Scale = new Vector2(SPRITE_SCALE),
-                    Y = SPINNER_TOP_OFFSET + 115,
-                },
+                    spin = new Sprite
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.Centre,
+                        Texture = source.GetTexture("spinner-spin"),
+                        Scale = new Vector2(SPRITE_SCALE),
+                        Y = SPINNER_TOP_OFFSET + 335,
+                    },
+                    clear = new Sprite
+                    {
+                        Alpha = 0,
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.Centre,
+                        Texture = source.GetTexture("spinner-clear"),
+                        Scale = new Vector2(SPRITE_SCALE),
+                        Y = SPINNER_TOP_OFFSET + 115,
+                    },
+                    bonusCounter = ((LegacySpriteText)source.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText))).With(s =>
+                    {
+                        s.Alpha = 0f;
+                        s.Anchor = Anchor.TopCentre;
+                        s.Origin = Anchor.Centre;
+                        s.Font = s.Font.With(fixedWidth: false);
+                        s.Scale = new Vector2(SPRITE_SCALE);
+                        s.Y = SPINNER_TOP_OFFSET + 299;
+                    }),
+                }
             });
         }
 
+        private IBindable<double> gainedBonus;
+
         private readonly Bindable<bool> completed = new Bindable<bool>();
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
+            gainedBonus = DrawableSpinner.GainedBonus.GetBoundCopy();
+            gainedBonus.BindValueChanged(bonus =>
+            {
+                bonusCounter.Text = $"{bonus.NewValue}";
+                bonusCounter.FadeOutFromOne(800, Easing.Out);
+                bonusCounter.ScaleTo(SPRITE_SCALE * 2f).Then().ScaleTo(SPRITE_SCALE * 1.28f, 800, Easing.Out);
+            });
+
             completed.BindValueChanged(onCompletedChanged, true);
 
             DrawableSpinner.ApplyCustomUpdateState += UpdateStateTransforms;
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinnerBonusCounter.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinnerBonusCounter.cs
deleted file mode 100644
index 3c4a6be4dd..0000000000
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinnerBonusCounter.cs
+++ /dev/null
@@ -1,56 +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.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Osu.Objects.Drawables;
-using osu.Game.Skinning;
-using osuTK;
-using static osu.Game.Rulesets.Osu.Skinning.Legacy.LegacySpinner;
-
-namespace osu.Game.Rulesets.Osu.Skinning.Legacy
-{
-    public class LegacySpinnerBonusCounter : CompositeDrawable
-    {
-        private LegacySpriteText bonusCounter;
-
-        private DrawableSpinner drawableSpinner;
-
-        private IBindable<double> gainedBonus;
-
-        [BackgroundDependencyLoader]
-        private void load(DrawableHitObject drawableHitObject, ISkinSource source)
-        {
-            drawableSpinner = (DrawableSpinner)drawableHitObject;
-
-            InternalChild = new LegacyCoordinatesContainer
-            {
-                Child = bonusCounter = ((LegacySpriteText)source.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText))).With(s =>
-                {
-                    s.Alpha = 0f;
-                    s.Anchor = Anchor.TopCentre;
-                    s.Origin = Anchor.Centre;
-                    s.Font = s.Font.With(fixedWidth: false);
-                    s.Scale = new Vector2(SPRITE_SCALE);
-                    s.Y = LegacyCoordinatesContainer.SPINNER_TOP_OFFSET + 299;
-                }),
-            };
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            gainedBonus = drawableSpinner.GainedBonus.GetBoundCopy();
-            gainedBonus.BindValueChanged(bonus =>
-            {
-                bonusCounter.Text = $"{bonus.NewValue}";
-                bonusCounter.FadeOutFromOne(800, Easing.Out);
-                bonusCounter.ScaleTo(SPRITE_SCALE * 2f).Then().ScaleTo(SPRITE_SCALE * 1.28f, 800, Easing.Out);
-            });
-        }
-    }
-}

From 98f6e16113debd5a4890d7e6eb6aad4a70226bad Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 12 Mar 2021 02:38:40 +0300
Subject: [PATCH 1820/3722] Move default spinner bonus counter to new
 `DefaultSpinner`

---
 .../Objects/Drawables/DrawableSpinner.cs      |  2 +-
 ...innerBonusCounter.cs => DefaultSpinner.cs} | 38 +++++++++++++------
 .../Skinning/Default/DefaultSpinnerDisc.cs    |  5 ---
 3 files changed, 28 insertions(+), 17 deletions(-)
 rename osu.Game.Rulesets.Osu/Skinning/Default/{DefaultSpinnerBonusCounter.cs => DefaultSpinner.cs} (62%)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index a4919d5061..f995140123 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -71,7 +71,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     RelativeSizeAxes = Axes.Y,
                     Children = new Drawable[]
                     {
-                        new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SpinnerBody), _ => new DefaultSpinnerDisc()),
+                        new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SpinnerBody), _ => new DefaultSpinner()),
                         RotationTracker = new SpinnerRotationTracker(this)
                     }
                 },
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerBonusCounter.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs
similarity index 62%
rename from osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerBonusCounter.cs
rename to osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs
index 633766290f..83676d3784 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerBonusCounter.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs
@@ -12,29 +12,45 @@ using osu.Game.Rulesets.Osu.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
-    public class DefaultSpinnerBonusCounter : CompositeDrawable
+    public class DefaultSpinner : CompositeDrawable
     {
-        private OsuSpriteText bonusCounter;
-
         private DrawableSpinner drawableSpinner;
 
-        private IBindable<double> gainedBonus;
+        private OsuSpriteText bonusCounter;
+
+        public DefaultSpinner()
+        {
+            RelativeSizeAxes = Axes.Both;
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+        }
 
         [BackgroundDependencyLoader]
         private void load(DrawableHitObject drawableHitObject)
         {
             drawableSpinner = (DrawableSpinner)drawableHitObject;
 
-            InternalChild = bonusCounter = new OsuSpriteText
+            AddRangeInternal(new Drawable[]
             {
-                Alpha = 0,
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Font = OsuFont.Numeric.With(size: 24),
-                Y = -120,
-            };
+                new DefaultSpinnerDisc
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+                bonusCounter = new OsuSpriteText
+                {
+                    Alpha = 0,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Font = OsuFont.Numeric.With(size: 24),
+                    Y = -120,
+                }
+            });
         }
 
+        private IBindable<double> gainedBonus;
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerDisc.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerDisc.cs
index 667fee1495..542f3eff0d 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerDisc.cs
@@ -40,14 +40,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
         public DefaultSpinnerDisc()
         {
-            RelativeSizeAxes = Axes.Both;
-
             // we are slightly bigger than our parent, to clip the top and bottom of the circle
             // this should probably be revisited when scaled spinners are a thing.
             Scale = new Vector2(initial_scale);
-
-            Anchor = Anchor.Centre;
-            Origin = Anchor.Centre;
         }
 
         [BackgroundDependencyLoader]

From 115c186cb7a624065620391a83be90c502827bb2 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 7 Mar 2021 02:16:10 +0300
Subject: [PATCH 1821/3722] Move hit circle font from osu! ruleset

---
 osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs | 2 --
 osu.Game/Skinning/LegacySkinConfiguration.cs           | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs b/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
index 63c9b53278..75a62a6f8e 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
@@ -5,8 +5,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
 {
     public enum OsuSkinConfiguration
     {
-        HitCirclePrefix,
-        HitCircleOverlap,
         SliderBorderSize,
         SliderPathRadius,
         AllowSliderBallTint,
diff --git a/osu.Game/Skinning/LegacySkinConfiguration.cs b/osu.Game/Skinning/LegacySkinConfiguration.cs
index 84a834ec22..20d1da8aaa 100644
--- a/osu.Game/Skinning/LegacySkinConfiguration.cs
+++ b/osu.Game/Skinning/LegacySkinConfiguration.cs
@@ -19,6 +19,8 @@ namespace osu.Game.Skinning
             ComboOverlap,
             ScorePrefix,
             ScoreOverlap,
+            HitCirclePrefix,
+            HitCircleOverlap,
             AnimationFramerate,
             LayeredHitSounds
         }

From 91741564e8e06926a36b49f1c15dba97a03564da Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 7 Mar 2021 02:15:23 +0300
Subject: [PATCH 1822/3722] Add legacy font enum and extensions

---
 osu.Game/Skinning/LegacyFont.cs           | 15 +++++++
 osu.Game/Skinning/LegacySkinExtensions.cs | 48 ++++++++++++++++++++++-
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game/Skinning/LegacyFont.cs

diff --git a/osu.Game/Skinning/LegacyFont.cs b/osu.Game/Skinning/LegacyFont.cs
new file mode 100644
index 0000000000..d1971cb84c
--- /dev/null
+++ b/osu.Game/Skinning/LegacyFont.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.Skinning
+{
+    /// <summary>
+    /// The type of legacy font to use for <see cref="LegacySpriteText"/>s.
+    /// </summary>
+    public enum LegacyFont
+    {
+        Score,
+        Combo,
+        HitCircle,
+    }
+}
diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index a7c084998d..d08f50bccb 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.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;
@@ -63,8 +64,51 @@ namespace osu.Game.Skinning
             }
         }
 
-        public static bool HasFont(this ISkin source, string fontPrefix)
-            => source.GetTexture($"{fontPrefix}-0") != null;
+        public static bool HasFont(this ISkin source, LegacyFont font)
+        {
+            return source.GetTexture($"{source.GetFontPrefix(font)}-0") != null;
+        }
+
+        public static string GetFontPrefix(this ISkin source, LegacyFont font)
+        {
+            switch (font)
+            {
+                case LegacyFont.Score:
+                    return source.GetConfig<LegacySetting, string>(LegacySetting.ScorePrefix)?.Value ?? "score";
+
+                case LegacyFont.Combo:
+                    return source.GetConfig<LegacySetting, string>(LegacySetting.ComboPrefix)?.Value ?? "score";
+
+                case LegacyFont.HitCircle:
+                    return source.GetConfig<LegacySetting, string>(LegacySetting.HitCirclePrefix)?.Value ?? "default";
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(font));
+            }
+        }
+
+        /// <summary>
+        /// Returns the numeric overlap of number sprites to use.
+        /// A positive number will bring the number sprites closer together, while a negative number
+        /// will split them apart more.
+        /// </summary>
+        public static float GetFontOverlap(this ISkin source, LegacyFont font)
+        {
+            switch (font)
+            {
+                case LegacyFont.Score:
+                    return source.GetConfig<LegacySetting, float>(LegacySetting.ScoreOverlap)?.Value ?? -2f;
+
+                case LegacyFont.Combo:
+                    return source.GetConfig<LegacySetting, float>(LegacySetting.ComboOverlap)?.Value ?? -2f;
+
+                case LegacyFont.HitCircle:
+                    return source.GetConfig<LegacySetting, float>(LegacySetting.HitCircleOverlap)?.Value ?? -2f;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(font));
+            }
+        }
 
         public class SkinnableTextureAnimation : TextureAnimation
         {

From 64d1cb519324df2663aa85502ba6bed305ae1b0f Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 7 Mar 2021 02:30:16 +0300
Subject: [PATCH 1823/3722] Remove text skin components in favour of plain
 `LegacySpriteText`s

---
 osu.Game/Skinning/HUDSkinComponents.cs |  2 --
 osu.Game/Skinning/LegacySkin.cs        | 21 +--------------------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/osu.Game/Skinning/HUDSkinComponents.cs b/osu.Game/Skinning/HUDSkinComponents.cs
index b01be2d5a0..a345e060e5 100644
--- a/osu.Game/Skinning/HUDSkinComponents.cs
+++ b/osu.Game/Skinning/HUDSkinComponents.cs
@@ -9,7 +9,5 @@ namespace osu.Game.Skinning
         ScoreCounter,
         AccuracyCounter,
         HealthDisplay,
-        ScoreText,
-        ComboText,
     }
 }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index e5d0217671..83854c592b 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -18,7 +18,6 @@ using osu.Game.Beatmaps.Formats;
 using osu.Game.IO;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Skinning
@@ -327,19 +326,13 @@ namespace osu.Game.Skinning
             return null;
         }
 
-        private string scorePrefix => GetConfig<LegacySkinConfiguration.LegacySetting, string>(LegacySkinConfiguration.LegacySetting.ScorePrefix)?.Value ?? "score";
-
-        private string comboPrefix => GetConfig<LegacySkinConfiguration.LegacySetting, string>(LegacySkinConfiguration.LegacySetting.ComboPrefix)?.Value ?? "score";
-
-        private bool hasScoreFont => this.HasFont(scorePrefix);
-
         public override Drawable GetDrawableComponent(ISkinComponent component)
         {
             switch (component)
             {
                 case HUDSkinComponent hudComponent:
                 {
-                    if (!hasScoreFont)
+                    if (!this.HasFont(LegacyFont.Score))
                         return null;
 
                     switch (hudComponent.Component)
@@ -355,18 +348,6 @@ namespace osu.Game.Skinning
 
                         case HUDSkinComponents.HealthDisplay:
                             return new LegacyHealthDisplay(this);
-
-                        case HUDSkinComponents.ComboText:
-                            return new LegacySpriteText(this, comboPrefix)
-                            {
-                                Spacing = new Vector2(-(GetConfig<LegacySkinConfiguration.LegacySetting, int>(LegacySkinConfiguration.LegacySetting.ComboOverlap)?.Value ?? -2), 0)
-                            };
-
-                        case HUDSkinComponents.ScoreText:
-                            return new LegacySpriteText(this, scorePrefix)
-                            {
-                                Spacing = new Vector2(-(GetConfig<LegacySkinConfiguration.LegacySetting, int>(LegacySkinConfiguration.LegacySetting.ScoreOverlap)?.Value ?? -2), 0)
-                            };
                     }
 
                     return null;

From 2a2ee3fa5ea86bbfc875f5659c01b3463adb93fb Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 7 Mar 2021 02:28:08 +0300
Subject: [PATCH 1824/3722] Update legacy sprite text constructor

---
 osu.Game/Skinning/LegacyRollingCounter.cs | 23 +++++------------------
 osu.Game/Skinning/LegacySpriteText.cs     |  7 +++++--
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Skinning/LegacyRollingCounter.cs b/osu.Game/Skinning/LegacyRollingCounter.cs
index 8aa9d4e9af..0261db0e64 100644
--- a/osu.Game/Skinning/LegacyRollingCounter.cs
+++ b/osu.Game/Skinning/LegacyRollingCounter.cs
@@ -4,7 +4,6 @@
 using System;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -14,9 +13,7 @@ namespace osu.Game.Skinning
     public class LegacyRollingCounter : RollingCounter<int>
     {
         private readonly ISkin skin;
-
-        private readonly string fontName;
-        private readonly float fontOverlap;
+        private readonly LegacyFont font;
 
         protected override bool IsRollingProportional => true;
 
@@ -24,17 +21,11 @@ namespace osu.Game.Skinning
         /// Creates a new <see cref="LegacyRollingCounter"/>.
         /// </summary>
         /// <param name="skin">The <see cref="ISkin"/> from which to get counter number sprites.</param>
-        /// <param name="fontName">The name of the legacy font to use.</param>
-        /// <param name="fontOverlap">
-        /// The numeric overlap of number sprites to use.
-        /// A positive number will bring the number sprites closer together, while a negative number
-        /// will split them apart more.
-        /// </param>
-        public LegacyRollingCounter(ISkin skin, string fontName, float fontOverlap)
+        /// <param name="font">The legacy font to use for the counter.</param>
+        public LegacyRollingCounter(ISkin skin, LegacyFont font)
         {
             this.skin = skin;
-            this.fontName = fontName;
-            this.fontOverlap = fontOverlap;
+            this.font = font;
         }
 
         protected override double GetProportionalDuration(int currentValue, int newValue)
@@ -42,10 +33,6 @@ namespace osu.Game.Skinning
             return Math.Abs(newValue - currentValue) * 75.0;
         }
 
-        protected sealed override OsuSpriteText CreateSpriteText() =>
-            new LegacySpriteText(skin, fontName)
-            {
-                Spacing = new Vector2(-fontOverlap, 0f)
-            };
+        protected sealed override OsuSpriteText CreateSpriteText() => new LegacySpriteText(skin, font);
     }
 }
diff --git a/osu.Game/Skinning/LegacySpriteText.cs b/osu.Game/Skinning/LegacySpriteText.cs
index 5d0e312f7c..c55400e219 100644
--- a/osu.Game/Skinning/LegacySpriteText.cs
+++ b/osu.Game/Skinning/LegacySpriteText.cs
@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Text;
 using osu.Game.Graphics.Sprites;
+using osuTK;
 
 namespace osu.Game.Skinning
 {
@@ -16,12 +17,14 @@ namespace osu.Game.Skinning
 
         protected override char[] FixedWidthExcludeCharacters => new[] { ',', '.', '%', 'x' };
 
-        public LegacySpriteText(ISkin skin, string font = "score")
+        public LegacySpriteText(ISkin skin, LegacyFont font)
         {
             Shadow = false;
             UseFullGlyphHeight = false;
 
-            Font = new FontUsage(font, 1, fixedWidth: true);
+            Font = new FontUsage(skin.GetFontPrefix(font), 1, fixedWidth: true);
+            Spacing = new Vector2(-skin.GetFontOverlap(font), 0);
+
             glyphStore = new LegacyGlyphStore(skin);
         }
 

From 43c1e1d217388f56fe5e1e616fb000c65f7d2382 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 7 Mar 2021 02:18:31 +0300
Subject: [PATCH 1825/3722] Update existing usages

Resolve post-conflict issues
---
 .../Legacy/CatchLegacySkinTransformer.cs      |  4 +---
 .../Legacy/LegacyCatchComboCounter.cs         |  8 ++------
 .../Legacy/OsuLegacySkinTransformer.cs        | 17 +++++++----------
 .../Screens/Play/HUD/LegacyComboCounter.cs    | 19 ++++++++-----------
 osu.Game/Skinning/LegacyAccuracyCounter.cs    |  8 +++++---
 osu.Game/Skinning/LegacyScoreCounter.cs       |  8 +++++---
 6 files changed, 28 insertions(+), 36 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/CatchLegacySkinTransformer.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/CatchLegacySkinTransformer.cs
index 41fd0fe776..1b48832ed6 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/CatchLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/CatchLegacySkinTransformer.cs
@@ -5,7 +5,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Skinning;
 using osuTK.Graphics;
-using static osu.Game.Skinning.LegacySkinConfiguration;
 
 namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 {
@@ -14,7 +13,7 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
         /// <summary>
         /// For simplicity, let's use legacy combo font texture existence as a way to identify legacy skins from default.
         /// </summary>
-        private bool providesComboCounter => this.HasFont(GetConfig<LegacySetting, string>(LegacySetting.ComboPrefix)?.Value ?? "score");
+        private bool providesComboCounter => this.HasFont(LegacyFont.Combo);
 
         public CatchLegacySkinTransformer(ISkinSource source)
             : base(source)
@@ -69,7 +68,6 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
                            this.GetAnimation("fruit-ryuuta", true, true, true);
 
                 case CatchSkinComponents.CatchComboCounter:
-
                     if (providesComboCounter)
                         return new LegacyCatchComboCounter(Source);
 
diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatchComboCounter.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatchComboCounter.cs
index f797ae75c2..28ee7bd813 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatchComboCounter.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatchComboCounter.cs
@@ -7,7 +7,6 @@ using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
-using static osu.Game.Skinning.LegacySkinConfiguration;
 
 namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 {
@@ -22,9 +21,6 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 
         public LegacyCatchComboCounter(ISkin skin)
         {
-            var fontName = skin.GetConfig<LegacySetting, string>(LegacySetting.ComboPrefix)?.Value ?? "score";
-            var fontOverlap = skin.GetConfig<LegacySetting, float>(LegacySetting.ComboOverlap)?.Value ?? -2f;
-
             AutoSizeAxes = Axes.Both;
 
             Alpha = 0f;
@@ -34,7 +30,7 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 
             InternalChildren = new Drawable[]
             {
-                explosion = new LegacyRollingCounter(skin, fontName, fontOverlap)
+                explosion = new LegacyRollingCounter(skin, LegacyFont.Combo)
                 {
                     Alpha = 0.65f,
                     Blending = BlendingParameters.Additive,
@@ -42,7 +38,7 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
                     Origin = Anchor.Centre,
                     Scale = new Vector2(1.5f),
                 },
-                counter = new LegacyRollingCounter(skin, fontName, fontOverlap)
+                counter = new LegacyRollingCounter(skin, LegacyFont.Combo)
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index d74f885573..ffe238c507 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -97,17 +97,14 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                     return null;
 
                 case OsuSkinComponents.HitCircleText:
-                    var font = GetConfig<OsuSkinConfiguration, string>(OsuSkinConfiguration.HitCirclePrefix)?.Value ?? "default";
-                    var overlap = GetConfig<OsuSkinConfiguration, float>(OsuSkinConfiguration.HitCircleOverlap)?.Value ?? -2;
+                    if (!this.HasFont(LegacyFont.HitCircle))
+                        return null;
 
-                    return !this.HasFont(font)
-                        ? null
-                        : new LegacySpriteText(Source, font)
-                        {
-                            // stable applies a blanket 0.8x scale to hitcircle fonts
-                            Scale = new Vector2(0.8f),
-                            Spacing = new Vector2(-overlap, 0)
-                        };
+                    return new LegacySpriteText(Source, LegacyFont.HitCircle)
+                    {
+                        // stable applies a blanket 0.8x scale to hitcircle fonts
+                        Scale = new Vector2(0.8f),
+                    };
 
                 case OsuSkinComponents.SpinnerBody:
                     bool hasBackground = Source.GetTexture("spinner-background") != null;
diff --git a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
index 81183a425a..b4604c0d01 100644
--- a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/LegacyComboCounter.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.Graphics.Sprites;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -84,16 +83,16 @@ namespace osu.Game.Screens.Play.HUD
         {
             InternalChildren = new[]
             {
-                popOutCount = createSpriteText().With(s =>
+                popOutCount = new LegacySpriteText(skin, LegacyFont.Combo)
                 {
-                    s.Alpha = 0;
-                    s.Margin = new MarginPadding(0.05f);
-                    s.Blending = BlendingParameters.Additive;
-                }),
-                displayedCountSpriteText = createSpriteText().With(s =>
+                    Alpha = 0,
+                    Margin = new MarginPadding(0.05f),
+                    Blending = BlendingParameters.Additive,
+                },
+                displayedCountSpriteText = new LegacySpriteText(skin, LegacyFont.Combo)
                 {
-                    s.Alpha = 0;
-                })
+                    Alpha = 0,
+                },
             };
 
             Current.ValueChanged += combo => updateCount(combo.NewValue == 0);
@@ -247,7 +246,5 @@ namespace osu.Game.Screens.Play.HUD
             double difference = currentValue > newValue ? currentValue - newValue : newValue - currentValue;
             return difference * rolling_duration;
         }
-
-        private OsuSpriteText createSpriteText() => (OsuSpriteText)skin.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ComboText));
     }
 }
diff --git a/osu.Game/Skinning/LegacyAccuracyCounter.cs b/osu.Game/Skinning/LegacyAccuracyCounter.cs
index 5eda374337..7d6f1dc916 100644
--- a/osu.Game/Skinning/LegacyAccuracyCounter.cs
+++ b/osu.Game/Skinning/LegacyAccuracyCounter.cs
@@ -29,9 +29,11 @@ namespace osu.Game.Skinning
         [Resolved(canBeNull: true)]
         private HUDOverlay hud { get; set; }
 
-        protected sealed override OsuSpriteText CreateSpriteText()
-            => (OsuSpriteText)skin?.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText))
-                                  ?.With(s => s.Anchor = s.Origin = Anchor.TopRight);
+        protected sealed override OsuSpriteText CreateSpriteText() => new LegacySpriteText(skin, LegacyFont.Score)
+        {
+            Anchor = Anchor.TopRight,
+            Origin = Anchor.TopRight,
+        };
 
         protected override void Update()
         {
diff --git a/osu.Game/Skinning/LegacyScoreCounter.cs b/osu.Game/Skinning/LegacyScoreCounter.cs
index 5bffeff5a8..1d330ef495 100644
--- a/osu.Game/Skinning/LegacyScoreCounter.cs
+++ b/osu.Game/Skinning/LegacyScoreCounter.cs
@@ -33,8 +33,10 @@ namespace osu.Game.Skinning
             Margin = new MarginPadding(10);
         }
 
-        protected sealed override OsuSpriteText CreateSpriteText()
-            => (OsuSpriteText)skin.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText))
-                                  .With(s => s.Anchor = s.Origin = Anchor.TopRight);
+        protected sealed override OsuSpriteText CreateSpriteText() => new LegacySpriteText(skin, LegacyFont.Score)
+        {
+            Anchor = Anchor.TopRight,
+            Origin = Anchor.TopRight,
+        };
     }
 }

From 5999e4ba3361f54828eaa25f1539ca0e2b991279 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 9 Nov 2020 15:16:35 -0800
Subject: [PATCH 1826/3722] Add xmldoc for hiddenbyuser bool

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

diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index 7f77e5add9..483d82200b 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -23,6 +23,9 @@ namespace osu.Game.Overlays.Toolbar
         public const float HEIGHT = 40;
         public const float TOOLTIP_HEIGHT = 30;
 
+        /// <summary>
+        /// Whether the user hid this <see cref="Toolbar"/> with <see cref="GlobalAction.ToggleToolbar"/>.
+        /// </summary>
         public bool HiddenByUser;
 
         public Action OnHome;

From 0ba5312a4063e3308c666e17ab4590bfe2f38267 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sat, 13 Mar 2021 00:05:26 -0800
Subject: [PATCH 1827/3722] Move blocking show logic to UpdateState

---
 osu.Game/OsuGame.cs                   |  2 +-
 osu.Game/Overlays/Toolbar/Toolbar.cs  | 12 +++++++++---
 osu.Game/Screens/Menu/ButtonSystem.cs |  3 +--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index fa9a0d4eb5..dd775888a1 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -983,7 +983,7 @@ namespace osu.Game
 
                 if (newOsuScreen.HideOverlaysOnEnter)
                     CloseAllOverlays();
-                else if (!Toolbar.HiddenByUser)
+                else
                     Toolbar.Show();
 
                 if (newOsuScreen.AllowBackButton)
diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index 483d82200b..7497f4d210 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -26,7 +26,9 @@ namespace osu.Game.Overlays.Toolbar
         /// <summary>
         /// Whether the user hid this <see cref="Toolbar"/> with <see cref="GlobalAction.ToggleToolbar"/>.
         /// </summary>
-        public bool HiddenByUser;
+        private bool hiddenByUser;
+
+        private bool userToggled;
 
         public Action OnHome;
 
@@ -149,7 +151,9 @@ namespace osu.Game.Overlays.Toolbar
 
         protected override void UpdateState(ValueChangedEvent<Visibility> state)
         {
-            if (state.NewValue == Visibility.Visible && OverlayActivationMode.Value == OverlayActivation.Disabled)
+            var blockShow = !userToggled && hiddenByUser;
+
+            if (state.NewValue == Visibility.Visible && (OverlayActivationMode.Value == OverlayActivation.Disabled || blockShow))
             {
                 State.Value = Visibility.Hidden;
                 return;
@@ -180,8 +184,10 @@ namespace osu.Game.Overlays.Toolbar
             switch (action)
             {
                 case GlobalAction.ToggleToolbar:
+                    userToggled = true;
                     ToggleVisibility();
-                    HiddenByUser = State.Value == Visibility.Hidden;
+                    hiddenByUser = State.Value == Visibility.Hidden;
+                    userToggled = false;
                     return true;
             }
 
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 8f1fd627f5..81b1cb0bf1 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -352,8 +352,7 @@ namespace osu.Game.Screens.Menu
                                 if (impact)
                                     logo.Impact();
 
-                                if (game?.Toolbar.HiddenByUser == false)
-                                    game.Toolbar.Show();
+                                game?.Toolbar.Show();
                             }, 200);
                             break;
 

From b13f193c8dd60573aa579bb47b06d1d02ed0b5ef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 13 Mar 2021 19:26:38 +0900
Subject: [PATCH 1828/3722] Fix incorrect task being returned for changelog
 continuations

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

diff --git a/osu.Game/Overlays/ChangelogOverlay.cs b/osu.Game/Overlays/ChangelogOverlay.cs
index 2da5be5e6c..eda7748367 100644
--- a/osu.Game/Overlays/ChangelogOverlay.cs
+++ b/osu.Game/Overlays/ChangelogOverlay.cs
@@ -163,7 +163,7 @@ namespace osu.Game.Overlays
                 await API.PerformAsync(req).ConfigureAwait(false);
 
                 return tcs.Task;
-            });
+            }).Unwrap();
         }
 
         private CancellationTokenSource loadContentCancellation;

From 4afbccfcff2544fa4a4e80d765a2bccb270c1658 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 13 Mar 2021 19:30:40 +0900
Subject: [PATCH 1829/3722] Fix initial operation potentially running before DI
 is completed

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

diff --git a/osu.Game/Overlays/ChangelogOverlay.cs b/osu.Game/Overlays/ChangelogOverlay.cs
index eda7748367..e7d68853ad 100644
--- a/osu.Game/Overlays/ChangelogOverlay.cs
+++ b/osu.Game/Overlays/ChangelogOverlay.cs
@@ -21,6 +21,8 @@ namespace osu.Game.Overlays
 {
     public class ChangelogOverlay : OnlineOverlay<ChangelogHeader>
     {
+        public override bool IsPresent => base.IsPresent || Scheduler.HasPendingTasks;
+
         public readonly Bindable<APIChangelogBuild> Current = new Bindable<APIChangelogBuild>();
 
         private Sample sampleBack;
@@ -126,8 +128,11 @@ namespace osu.Game.Overlays
 
         private Task initialFetchTask;
 
-        private void performAfterFetch(Action action) => fetchListing()?.ContinueWith(_ =>
-            Schedule(action), TaskContinuationOptions.OnlyOnRanToCompletion);
+        private void performAfterFetch(Action action) => Schedule(() =>
+        {
+            fetchListing()?.ContinueWith(_ =>
+                Schedule(action), TaskContinuationOptions.OnlyOnRanToCompletion);
+        });
 
         private Task fetchListing()
         {

From e70ba2d005c45bb485d3c985873fbecf99a1c71c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 13 Mar 2021 23:29:01 +0900
Subject: [PATCH 1830/3722] Remove unnecessary second variable

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

diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index 7497f4d210..5e2280e2fc 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -28,8 +28,6 @@ namespace osu.Game.Overlays.Toolbar
         /// </summary>
         private bool hiddenByUser;
 
-        private bool userToggled;
-
         public Action OnHome;
 
         private ToolbarUserButton userButton;
@@ -151,9 +149,9 @@ namespace osu.Game.Overlays.Toolbar
 
         protected override void UpdateState(ValueChangedEvent<Visibility> state)
         {
-            var blockShow = !userToggled && hiddenByUser;
+            bool blockShow = hiddenByUser || OverlayActivationMode.Value == OverlayActivation.Disabled;
 
-            if (state.NewValue == Visibility.Visible && (OverlayActivationMode.Value == OverlayActivation.Disabled || blockShow))
+            if (state.NewValue == Visibility.Visible && blockShow)
             {
                 State.Value = Visibility.Hidden;
                 return;
@@ -184,10 +182,8 @@ namespace osu.Game.Overlays.Toolbar
             switch (action)
             {
                 case GlobalAction.ToggleToolbar:
-                    userToggled = true;
+                    hiddenByUser = State.Value == Visibility.Visible; // set before toggling to allow the operation to always succeed.
                     ToggleVisibility();
-                    hiddenByUser = State.Value == Visibility.Hidden;
-                    userToggled = false;
                     return true;
             }
 

From a227b0a581103004c10e767f0511f01bb8af2fbc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 13 Mar 2021 23:29:47 +0900
Subject: [PATCH 1831/3722] Build on xmldoc with rationale

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

diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index 5e2280e2fc..d049c2d3ec 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -25,6 +25,7 @@ namespace osu.Game.Overlays.Toolbar
 
         /// <summary>
         /// Whether the user hid this <see cref="Toolbar"/> with <see cref="GlobalAction.ToggleToolbar"/>.
+        /// In this state, automatic toggles should not occur, respecting the user's preference to have no toolbar.
         /// </summary>
         private bool hiddenByUser;
 

From 779c55d768a6723c1735ef92a26fedaec1dd6760 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 13 Mar 2021 06:05:08 +0300
Subject: [PATCH 1832/3722] Fix potentially adding null legacy text to
 hierarchy

---
 .../Skinning/Legacy/LegacySpinner.cs          | 41 +++++++++++--------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index b0b9cba2bd..610eb54316 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -47,7 +47,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
             DrawableSpinner = (DrawableSpinner)drawableHitObject;
 
-            AddInternal(new Container
+            Container overlayContainer;
+
+            AddInternal(overlayContainer = new Container
             {
                 Depth = float.MinValue,
                 RelativeSizeAxes = Axes.Both,
@@ -70,17 +72,21 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         Scale = new Vector2(SPRITE_SCALE),
                         Y = SPINNER_TOP_OFFSET + 115,
                     },
-                    bonusCounter = ((LegacySpriteText)source.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText))).With(s =>
-                    {
-                        s.Alpha = 0f;
-                        s.Anchor = Anchor.TopCentre;
-                        s.Origin = Anchor.Centre;
-                        s.Font = s.Font.With(fixedWidth: false);
-                        s.Scale = new Vector2(SPRITE_SCALE);
-                        s.Y = SPINNER_TOP_OFFSET + 299;
-                    }),
                 }
             });
+
+            bonusCounter = (LegacySpriteText)source.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText));
+
+            if (bonusCounter != null)
+            {
+                bonusCounter.Alpha = 0f;
+                bonusCounter.Anchor = Anchor.TopCentre;
+                bonusCounter.Origin = Anchor.Centre;
+                bonusCounter.Font = bonusCounter.Font.With(fixedWidth: false);
+                bonusCounter.Scale = new Vector2(SPRITE_SCALE);
+                bonusCounter.Y = SPINNER_TOP_OFFSET + 299;
+                overlayContainer.Add(bonusCounter);
+            }
         }
 
         private IBindable<double> gainedBonus;
@@ -91,13 +97,16 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         {
             base.LoadComplete();
 
-            gainedBonus = DrawableSpinner.GainedBonus.GetBoundCopy();
-            gainedBonus.BindValueChanged(bonus =>
+            if (bonusCounter != null)
             {
-                bonusCounter.Text = $"{bonus.NewValue}";
-                bonusCounter.FadeOutFromOne(800, Easing.Out);
-                bonusCounter.ScaleTo(SPRITE_SCALE * 2f).Then().ScaleTo(SPRITE_SCALE * 1.28f, 800, Easing.Out);
-            });
+                gainedBonus = DrawableSpinner.GainedBonus.GetBoundCopy();
+                gainedBonus.BindValueChanged(bonus =>
+                {
+                    bonusCounter.Text = $"{bonus.NewValue}";
+                    bonusCounter.FadeOutFromOne(800, Easing.Out);
+                    bonusCounter.ScaleTo(SPRITE_SCALE * 2f).Then().ScaleTo(SPRITE_SCALE * 1.28f, 800, Easing.Out);
+                });
+            }
 
             completed.BindValueChanged(onCompletedChanged, true);
 

From 8b74666cc339416b2b3f443c8dfdbb518c2f2148 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 14 Mar 2021 15:51:38 +0100
Subject: [PATCH 1833/3722] Add support for pooling explosions in taiko

---
 .../Skinning/TestSceneHitExplosion.cs         |  4 +-
 .../Skinning/Legacy/LegacyHitExplosion.cs     | 51 +++++-------
 .../UI/DefaultHitExplosion.cs                 | 41 +++++++---
 osu.Game.Rulesets.Taiko/UI/HitExplosion.cs    | 80 ++++++++++++++-----
 .../UI/HitExplosionPool.cs                    | 24 ++++++
 osu.Game.Rulesets.Taiko/UI/IHitExplosion.cs   | 23 ++++++
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs  | 11 ++-
 7 files changed, 170 insertions(+), 64 deletions(-)
 create mode 100644 osu.Game.Rulesets.Taiko/UI/HitExplosionPool.cs
 create mode 100644 osu.Game.Rulesets.Taiko/UI/IHitExplosion.cs

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
index fecb5d4a74..ba6e04c92e 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
@@ -38,11 +38,11 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
                     // the hit needs to be added to hierarchy in order for nested objects to be created correctly.
                     // setting zero alpha is supposed to prevent the test from looking broken.
                     hit.With(h => h.Alpha = 0),
-                    new HitExplosion(hit, hit.Type)
+                    new HitExplosion(hit.Type)
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
-                    }
+                    }.With(explosion => explosion.Apply(hit))
                 }
             };
         }
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs
index 651cdd6438..9734e12413 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs
@@ -1,22 +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.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Taiko.Objects.Drawables;
+using osu.Game.Rulesets.Taiko.UI;
 
 namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
 {
-    public class LegacyHitExplosion : CompositeDrawable
+    public class LegacyHitExplosion : CompositeDrawable, IHitExplosion
     {
-        private readonly Drawable sprite;
-        private readonly Drawable strongSprite;
+        public override bool RemoveWhenNotAlive => false;
 
-        private DrawableStrongNestedHit nestedStrongHit;
-        private bool switchedToStrongSprite;
+        private readonly Drawable sprite;
+
+        [CanBeNull]
+        private readonly Drawable strongSprite;
 
         /// <summary>
         /// Creates a new legacy hit explosion.
@@ -27,14 +29,14 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
         /// </remarks>
         /// <param name="sprite">The normal legacy explosion sprite.</param>
         /// <param name="strongSprite">The strong legacy explosion sprite.</param>
-        public LegacyHitExplosion(Drawable sprite, Drawable strongSprite = null)
+        public LegacyHitExplosion(Drawable sprite, [CanBeNull] Drawable strongSprite = null)
         {
             this.sprite = sprite;
             this.strongSprite = strongSprite;
         }
 
         [BackgroundDependencyLoader]
-        private void load(DrawableHitObject judgedObject)
+        private void load()
         {
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
@@ -56,17 +58,15 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
                     s.Origin = Anchor.Centre;
                 }));
             }
-
-            if (judgedObject is DrawableHit hit)
-                nestedStrongHit = hit.NestedHitObjects.SingleOrDefault() as DrawableStrongNestedHit;
         }
 
-        protected override void LoadComplete()
+        public void Animate(DrawableHitObject drawableHitObject)
         {
-            base.LoadComplete();
-
             const double animation_time = 120;
 
+            (sprite as IFramedAnimation)?.GotoFrame(0);
+            (strongSprite as IFramedAnimation)?.GotoFrame(0);
+
             this.FadeInFromZero(animation_time).Then().FadeOut(animation_time * 1.5);
 
             this.ScaleTo(0.6f)
@@ -77,24 +77,13 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
             Expire(true);
         }
 
-        protected override void Update()
+        public void AnimateSecondHit()
         {
-            base.Update();
+            if (strongSprite == null)
+                return;
 
-            if (shouldSwitchToStrongSprite() && !switchedToStrongSprite)
-            {
-                sprite.FadeOut(50, Easing.OutQuint);
-                strongSprite.FadeIn(50, Easing.OutQuint);
-                switchedToStrongSprite = true;
-            }
-        }
-
-        private bool shouldSwitchToStrongSprite()
-        {
-            if (nestedStrongHit == null || strongSprite == null)
-                return false;
-
-            return nestedStrongHit.IsHit;
+            sprite.FadeOut(50, Easing.OutQuint);
+            strongSprite.FadeIn(50, Easing.OutQuint);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs
index 3bd20e4bb4..2519573ce9 100644
--- a/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.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 JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -13,19 +14,25 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Taiko.UI
 {
-    internal class DefaultHitExplosion : CircularContainer
+    internal class DefaultHitExplosion : CircularContainer, IHitExplosion
     {
-        private readonly DrawableHitObject judgedObject;
+        public override bool RemoveWhenNotAlive => false;
+
         private readonly HitResult result;
 
-        public DefaultHitExplosion(DrawableHitObject judgedObject, HitResult result)
+        [CanBeNull]
+        private Box body;
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        public DefaultHitExplosion(HitResult result)
         {
-            this.judgedObject = judgedObject;
             this.result = result;
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load()
         {
             RelativeSizeAxes = Axes.Both;
 
@@ -40,26 +47,38 @@ namespace osu.Game.Rulesets.Taiko.UI
             if (!result.IsHit())
                 return;
 
-            bool isRim = (judgedObject.HitObject as Hit)?.Type == HitType.Rim;
-
             InternalChildren = new[]
             {
-                new Box
+                body = new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = isRim ? colours.BlueDarker : colours.PinkDarker,
                 }
             };
+
+            updateColour();
         }
 
-        protected override void LoadComplete()
+        private void updateColour([CanBeNull] DrawableHitObject judgedObject = null)
         {
-            base.LoadComplete();
+            if (body == null)
+                return;
+
+            bool isRim = (judgedObject?.HitObject as Hit)?.Type == HitType.Rim;
+            body.Colour = isRim ? colours.BlueDarker : colours.PinkDarker;
+        }
+
+        public void Animate(DrawableHitObject drawableHitObject)
+        {
+            updateColour(drawableHitObject);
 
             this.ScaleTo(3f, 1000, Easing.OutQuint);
             this.FadeOut(500);
 
             Expire(true);
         }
+
+        public void AnimateSecondHit()
+        {
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
index d1fb3348b9..d2ae36a03e 100644
--- a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
@@ -2,10 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using JetBrains.Annotations;
 using osuTK;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Pooling;
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Objects;
@@ -16,31 +18,35 @@ namespace osu.Game.Rulesets.Taiko.UI
     /// <summary>
     /// A circle explodes from the hit target to indicate a hitobject has been hit.
     /// </summary>
-    internal class HitExplosion : CircularContainer
+    internal class HitExplosion : PoolableDrawable
     {
         public override bool RemoveWhenNotAlive => true;
-
-        [Cached(typeof(DrawableHitObject))]
-        public readonly DrawableHitObject JudgedObject;
+        public override bool RemoveCompletedTransforms => false;
 
         private readonly HitResult result;
 
+        [CanBeNull]
+        public DrawableHitObject JudgedObject;
+
         private SkinnableDrawable skinnable;
 
-        public override double LifetimeStart => skinnable.Drawable.LifetimeStart;
-
-        public override double LifetimeEnd => skinnable.Drawable.LifetimeEnd;
-
-        public HitExplosion(DrawableHitObject judgedObject, HitResult result)
+        /// <summary>
+        /// This constructor only exists to meet the <c>new()</c> type constraint of <see cref="DrawablePool{T}"/>.
+        /// </summary>
+        public HitExplosion()
+            : this(HitResult.Great)
+        {
+        }
+
+        public HitExplosion(HitResult result)
         {
-            JudgedObject = judgedObject;
             this.result = result;
 
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
-            RelativeSizeAxes = Axes.Both;
             Size = new Vector2(TaikoHitObject.DEFAULT_SIZE);
+            RelativeSizeAxes = Axes.Both;
 
             RelativePositionAxes = Axes.Both;
         }
@@ -48,7 +54,44 @@ namespace osu.Game.Rulesets.Taiko.UI
         [BackgroundDependencyLoader]
         private void load()
         {
-            Child = skinnable = new SkinnableDrawable(new TaikoSkinComponent(getComponentName(result)), _ => new DefaultHitExplosion(JudgedObject, result));
+            InternalChild = skinnable = new SkinnableDrawable(new TaikoSkinComponent(getComponentName(result)), _ => new DefaultHitExplosion(result));
+            skinnable.OnSkinChanged += runAnimation;
+        }
+
+        public void Apply([CanBeNull] DrawableHitObject drawableHitObject)
+        {
+            JudgedObject = drawableHitObject;
+        }
+
+        protected override void PrepareForUse()
+        {
+            base.PrepareForUse();
+            runAnimation();
+        }
+
+        protected override void FreeAfterUse()
+        {
+            base.FreeAfterUse();
+
+            // clean up transforms on free instead of on prepare as is usually the case
+            // to avoid potentially overriding the effects of VisualiseSecondHit() in the case it is called before PrepareForUse().
+            ApplyTransformsAt(double.MinValue, true);
+            ClearTransforms(true);
+        }
+
+        private void runAnimation()
+        {
+            if (JudgedObject?.Result == null)
+                return;
+
+            double resultTime = JudgedObject.Result.TimeAbsolute;
+
+            LifetimeStart = resultTime;
+
+            using (BeginAbsoluteSequence(resultTime))
+                (skinnable.Drawable as IHitExplosion)?.Animate(JudgedObject);
+
+            LifetimeEnd = skinnable.Drawable.LatestTransformEndTime;
         }
 
         private static TaikoSkinComponents getComponentName(HitResult result)
@@ -68,12 +111,13 @@ namespace osu.Game.Rulesets.Taiko.UI
             throw new ArgumentOutOfRangeException(nameof(result), $"Invalid result type: {result}");
         }
 
-        /// <summary>
-        /// Transforms this hit explosion to visualise a secondary hit.
-        /// </summary>
-        public void VisualiseSecondHit()
+        public void VisualiseSecondHit(JudgementResult judgementResult)
         {
-            this.ResizeTo(new Vector2(TaikoStrongableHitObject.DEFAULT_STRONG_SIZE), 50);
+            using (BeginAbsoluteSequence(judgementResult.TimeAbsolute))
+            {
+                this.ResizeTo(new Vector2(TaikoStrongableHitObject.DEFAULT_STRONG_SIZE), 50);
+                (skinnable.Drawable as IHitExplosion)?.AnimateSecondHit();
+            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/UI/HitExplosionPool.cs b/osu.Game.Rulesets.Taiko/UI/HitExplosionPool.cs
new file mode 100644
index 0000000000..badf34554c
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/UI/HitExplosionPool.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.Graphics.Pooling;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Rulesets.Taiko.UI
+{
+    /// <summary>
+    /// Pool for hit explosions of a specific type.
+    /// </summary>
+    internal class HitExplosionPool : DrawablePool<HitExplosion>
+    {
+        private readonly HitResult hitResult;
+
+        public HitExplosionPool(HitResult hitResult)
+            : base(15)
+        {
+            this.hitResult = hitResult;
+        }
+
+        protected override HitExplosion CreateNewDrawable() => new HitExplosion(hitResult);
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/UI/IHitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/IHitExplosion.cs
new file mode 100644
index 0000000000..7af941d1ba
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/UI/IHitExplosion.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.
+
+using osu.Game.Rulesets.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Taiko.UI
+{
+    /// <summary>
+    /// Interface for hit explosions shown on the playfield's hit target in taiko.
+    /// </summary>
+    public interface IHitExplosion
+    {
+        /// <summary>
+        /// Shows the hit explosion for the supplied <paramref name="drawableHitObject"/>.
+        /// </summary>
+        void Animate(DrawableHitObject drawableHitObject);
+
+        /// <summary>
+        /// Transforms the hit explosion to visualise a secondary hit.
+        /// </summary>
+        void AnimateSecondHit();
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index d2e7b604bb..46dafc3a30 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -42,6 +42,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         private SkinnableDrawable mascot;
 
         private readonly IDictionary<HitResult, DrawablePool<DrawableTaikoJudgement>> judgementPools = new Dictionary<HitResult, DrawablePool<DrawableTaikoJudgement>>();
+        private readonly IDictionary<HitResult, HitExplosionPool> explosionPools = new Dictionary<HitResult, HitExplosionPool>();
 
         private ProxyContainer topLevelHitContainer;
         private Container rightArea;
@@ -166,10 +167,15 @@ namespace osu.Game.Rulesets.Taiko.UI
             RegisterPool<SwellTick, DrawableSwellTick>(100);
 
             var hitWindows = new TaikoHitWindows();
+
             foreach (var result in Enum.GetValues(typeof(HitResult)).OfType<HitResult>().Where(r => hitWindows.IsHitResultAllowed(r)))
+            {
                 judgementPools.Add(result, new DrawablePool<DrawableTaikoJudgement>(15));
+                explosionPools.Add(result, new HitExplosionPool(result));
+            }
 
             AddRangeInternal(judgementPools.Values);
+            AddRangeInternal(explosionPools.Values);
         }
 
         protected override void LoadComplete()
@@ -281,7 +287,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             {
                 case TaikoStrongJudgement _:
                     if (result.IsHit)
-                        hitExplosionContainer.Children.FirstOrDefault(e => e.JudgedObject == ((DrawableStrongNestedHit)judgedObject).ParentHitObject)?.VisualiseSecondHit();
+                        hitExplosionContainer.Children.FirstOrDefault(e => e.JudgedObject == ((DrawableStrongNestedHit)judgedObject).ParentHitObject)?.VisualiseSecondHit(result);
                     break;
 
                 case TaikoDrumRollTickJudgement _:
@@ -315,7 +321,8 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         private void addExplosion(DrawableHitObject drawableObject, HitResult result, HitType type)
         {
-            hitExplosionContainer.Add(new HitExplosion(drawableObject, result));
+            hitExplosionContainer.Add(explosionPools[result]
+                .Get(explosion => explosion.Apply(drawableObject)));
             if (drawableObject.HitObject.Kiai)
                 kiaiExplosionContainer.Add(new KiaiHitExplosion(drawableObject, type));
         }

From 00306c007529f176d92666f445a8ef7219787cea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 14 Mar 2021 15:56:34 +0100
Subject: [PATCH 1834/3722] Adjust test code after explosion pooling changes

---
 .../Skinning/TestSceneHitExplosion.cs         | 19 ++++++++++++++-----
 .../TestSceneHits.cs                          | 10 +++++-----
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
index ba6e04c92e..61ea8b664d 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneHitExplosion.cs
@@ -2,8 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Taiko.UI;
@@ -13,6 +17,8 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
     [TestFixture]
     public class TestSceneHitExplosion : TaikoSkinnableTestScene
     {
+        protected override double TimePerAction => 100;
+
         [Test]
         public void TestNormalHit()
         {
@@ -21,11 +27,14 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
             AddStep("Miss", () => SetContents(() => getContentFor(createHit(HitResult.Miss))));
         }
 
-        [Test]
-        public void TestStrongHit([Values(false, true)] bool hitBoth)
+        [TestCase(HitResult.Great)]
+        [TestCase(HitResult.Ok)]
+        public void TestStrongHit(HitResult type)
         {
-            AddStep("Great", () => SetContents(() => getContentFor(createStrongHit(HitResult.Great, hitBoth))));
-            AddStep("Good", () => SetContents(() => getContentFor(createStrongHit(HitResult.Ok, hitBoth))));
+            AddStep("create hit", () => SetContents(() => getContentFor(createStrongHit(type))));
+            AddStep("visualise second hit",
+                () => this.ChildrenOfType<HitExplosion>()
+                          .ForEach(e => e.VisualiseSecondHit(new JudgementResult(new HitObject { StartTime = Time.Current }, new Judgement()))));
         }
 
         private Drawable getContentFor(DrawableTestHit hit)
@@ -49,6 +58,6 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
 
         private DrawableTestHit createHit(HitResult type) => new DrawableTestHit(new Hit { StartTime = Time.Current }, type);
 
-        private DrawableTestHit createStrongHit(HitResult type, bool hitBoth) => new DrawableTestStrongHit(Time.Current, type, hitBoth);
+        private DrawableTestHit createStrongHit(HitResult type) => new DrawableTestStrongHit(Time.Current, type);
     }
 }
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
index 7695ca067b..87c936d386 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
@@ -11,7 +11,6 @@ using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Judgements;
 using osu.Game.Rulesets.Taiko.Objects;
@@ -108,12 +107,12 @@ namespace osu.Game.Rulesets.Taiko.Tests
         {
             HitResult hitResult = RNG.Next(2) == 0 ? HitResult.Ok : HitResult.Great;
 
-            Hit hit = new Hit();
+            Hit hit = new Hit { StartTime = DrawableRuleset.Playfield.Time.Current };
             var h = new DrawableTestHit(hit, kiai: kiai) { X = RNG.NextSingle(hitResult == HitResult.Ok ? -0.1f : -0.05f, hitResult == HitResult.Ok ? 0.1f : 0.05f) };
 
             DrawableRuleset.Playfield.Add(h);
 
-            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h, new JudgementResult(new HitObject(), new TaikoJudgement()) { Type = hitResult });
+            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h, new JudgementResult(hit, new TaikoJudgement()) { Type = hitResult });
         }
 
         private void addStrongHitJudgement(bool kiai)
@@ -122,6 +121,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
             Hit hit = new Hit
             {
+                StartTime = DrawableRuleset.Playfield.Time.Current,
                 IsStrong = true,
                 Samples = createSamples(strong: true)
             };
@@ -129,8 +129,8 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
             DrawableRuleset.Playfield.Add(h);
 
-            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h, new JudgementResult(new HitObject(), new TaikoJudgement()) { Type = hitResult });
-            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h.NestedHitObjects.Single(), new JudgementResult(new HitObject(), new TaikoStrongJudgement()) { Type = HitResult.Great });
+            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h, new JudgementResult(hit, new TaikoJudgement()) { Type = hitResult });
+            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h.NestedHitObjects.Single(), new JudgementResult(hit.NestedHitObjects.Single(), new TaikoStrongJudgement()) { Type = HitResult.Great });
         }
 
         private void addMissJudgement()

From 0a1e325fc774f371785ba95b618f71bd0637bb2e Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Sun, 14 Mar 2021 19:34:53 +0300
Subject: [PATCH 1835/3722] Extract requerying of navigational properties from
 DbContext

---
 osu.Game/Beatmaps/BeatmapManager.cs | 16 +----------
 osu.Game/Database/Extensions.cs     | 44 +++++++++++++++++++++++++++++
 osu.Game/Scoring/ScoreManager.cs    | 14 +--------
 osu.Game/Skinning/SkinManager.cs    |  9 +-----
 4 files changed, 47 insertions(+), 36 deletions(-)
 create mode 100644 osu.Game/Database/Extensions.cs

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 3254f53574..f42fba79cb 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -174,21 +174,7 @@ namespace osu.Game.Beatmaps
             if (beatmapSet.Beatmaps.Any(b => b.BaseDifficulty == null))
                 throw new InvalidOperationException($"Cannot import {nameof(BeatmapInfo)} with null {nameof(BeatmapInfo.BaseDifficulty)}.");
 
-            var dbContext = ContextFactory.Get();
-
-            // Workaround System.InvalidOperationException
-            // The instance of entity type 'RulesetInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
-            foreach (var beatmap in beatmapSet.Beatmaps)
-            {
-                beatmap.Ruleset = dbContext.RulesetInfo.Find(beatmap.RulesetID);
-            }
-
-            // Workaround System.InvalidOperationException
-            // The instance of entity type 'FileInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
-            foreach (var file in beatmapSet.Files)
-            {
-                file.FileInfo = dbContext.FileInfo.Find(file.FileInfoID);
-            }
+            beatmapSet.Requery(ContextFactory);
 
             // check if a set already exists with the same online id, delete if it does.
             if (beatmapSet.OnlineBeatmapSetID != null)
diff --git a/osu.Game/Database/Extensions.cs b/osu.Game/Database/Extensions.cs
new file mode 100644
index 0000000000..3af26c348e
--- /dev/null
+++ b/osu.Game/Database/Extensions.cs
@@ -0,0 +1,44 @@
+// Copyright (c) ppy 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.Scoring;
+
+namespace osu.Game.Database
+{
+    public static class Extensions
+    {
+        public static void Requery(this BeatmapSetInfo beatmapSetInfo, IDatabaseContextFactory databaseContextFactory)
+        {
+            var dbContext = databaseContextFactory.Get();
+
+            foreach (var beatmap in beatmapSetInfo.Beatmaps)
+            {
+                // Workaround System.InvalidOperationException
+                // The instance of entity type 'RulesetInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
+                beatmap.Ruleset = dbContext.RulesetInfo.Find(beatmap.RulesetID);
+            }
+
+            beatmapSetInfo.Files.Requery(databaseContextFactory);
+        }
+
+        public static void Requery(this ScoreInfo scoreInfo, IDatabaseContextFactory databaseContextFactory)
+        {
+            scoreInfo.Files.Requery(databaseContextFactory);
+            scoreInfo.Beatmap.BeatmapSet.Files.Requery(databaseContextFactory);
+        }
+
+        public static void Requery<T>(this List<T> files, IDatabaseContextFactory databaseContextFactory) where T : class, INamedFileInfo
+        {
+            var dbContext = databaseContextFactory.Get();
+
+            foreach (var file in files)
+            {
+                // Workaround System.InvalidOperationException
+                // The instance of entity type 'FileInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
+                file.FileInfo = dbContext.FileInfo.Find(file.FileInfoID);
+            }
+        }
+    }
+}
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index a97c516a1b..1e90ee1ac7 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -54,19 +54,7 @@ namespace osu.Game.Scoring
 
         protected override void PreImport(ScoreInfo model)
         {
-            var dbContext = ContextFactory.Get();
-
-            // Workaround System.InvalidOperationException
-            // The instance of entity type 'FileInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
-            foreach (var file in model.Files)
-            {
-                file.FileInfo = dbContext.FileInfo.Find(file.FileInfoID);
-            }
-
-            foreach (var file in model.Beatmap.BeatmapSet.Files)
-            {
-                file.FileInfo = dbContext.FileInfo.Find(file.FileInfoID);
-            }
+            model.Requery(ContextFactory);
         }
 
         protected override ScoreInfo CreateModel(ArchiveReader archive)
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 2bb27b60d6..c25f00eccb 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -144,14 +144,7 @@ namespace osu.Game.Skinning
 
         protected override void PreImport(SkinInfo model)
         {
-            var dbContext = ContextFactory.Get();
-
-            // Workaround System.InvalidOperationException
-            // The instance of entity type 'FileInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
-            foreach (var file in model.Files)
-            {
-                file.FileInfo = dbContext.FileInfo.Find(file.FileInfoID);
-            }
+            model.Files.Requery(ContextFactory);
         }
 
         /// <summary>

From 61d5a6cc57941cab31e2abb0acee00c8fad3f80f Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Sun, 14 Mar 2021 19:47:14 +0300
Subject: [PATCH 1836/3722] Simplify Microsoft.EntityFrameworkCore.Design
 PackageReference

---
 osu.Desktop/osu.Desktop.csproj | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index 4af69c573d..d9d23dea6b 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -28,10 +28,7 @@
     <PackageReference Include="System.IO.Packaging" Version="5.0.0" />
     <PackageReference Include="ppy.squirrel.windows" Version="1.9.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.4">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.4" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
     <PackageReference Include="DiscordRichPresence" Version="1.0.175" />
   </ItemGroup>

From 28ef64b62a5d873110a163c4275fb48c9c47b262 Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Sun, 14 Mar 2021 21:43:27 +0300
Subject: [PATCH 1837/3722] Explicitly specify SingleQuery behavior

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

diff --git a/osu.Game/Database/OsuDbContext.cs b/osu.Game/Database/OsuDbContext.cs
index 689f248de8..e5ae530018 100644
--- a/osu.Game/Database/OsuDbContext.cs
+++ b/osu.Game/Database/OsuDbContext.cs
@@ -3,7 +3,6 @@
 
 using System;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.Extensions.Logging;
 using osu.Framework.Logging;
 using osu.Framework.Statistics;
@@ -111,8 +110,7 @@ namespace osu.Game.Database
         {
             base.OnConfiguring(optionsBuilder);
             optionsBuilder
-                .UseSqlite(connectionString, sqliteOptions => sqliteOptions.CommandTimeout(10))
-                .ConfigureWarnings(w => w.Ignore(RelationalEventId.MultipleCollectionIncludeWarning))
+                .UseSqlite(connectionString, sqliteOptions => sqliteOptions.CommandTimeout(10).UseQuerySplittingBehavior(QuerySplittingBehavior.SingleQuery))
                 .UseLoggerFactory(logger.Value);
         }
 

From 900da7b891c3a74faa3ebbe0f030e9cf3350b273 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Mar 2021 12:42:41 +0900
Subject: [PATCH 1838/3722] Rename and refactor extenion methods to be easier
 to read

---
 .../Database/DatabaseWorkaroundExtensions.cs  | 48 +++++++++++++++++++
 osu.Game/Database/Extensions.cs               | 44 -----------------
 2 files changed, 48 insertions(+), 44 deletions(-)
 create mode 100644 osu.Game/Database/DatabaseWorkaroundExtensions.cs
 delete mode 100644 osu.Game/Database/Extensions.cs

diff --git a/osu.Game/Database/DatabaseWorkaroundExtensions.cs b/osu.Game/Database/DatabaseWorkaroundExtensions.cs
new file mode 100644
index 0000000000..07ce7e8529
--- /dev/null
+++ b/osu.Game/Database/DatabaseWorkaroundExtensions.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.Collections.Generic;
+using osu.Game.Beatmaps;
+using osu.Game.Scoring;
+
+namespace osu.Game.Database
+{
+    public static class DatabaseWorkaroundExtensions
+    {
+        public static void Requery(this IHasPrimaryKey model, IDatabaseContextFactory contextFactory)
+        {
+            switch (model)
+            {
+                case ScoreInfo scoreInfo:
+                    scoreInfo.Beatmap.BeatmapSet.Requery(contextFactory);
+                    scoreInfo.Files.RequeryFiles(contextFactory);
+                    break;
+
+                case BeatmapSetInfo beatmapSetInfo:
+                    var context = contextFactory.Get();
+
+                    foreach (var beatmap in beatmapSetInfo.Beatmaps)
+                    {
+                        // Workaround System.InvalidOperationException
+                        // The instance of entity type 'RulesetInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
+                        beatmap.Ruleset = context.RulesetInfo.Find(beatmap.RulesetID);
+                    }
+
+                    requeryFiles(beatmapSetInfo.Files, contextFactory);
+                    break;
+            }
+        }
+
+        public static void RequeryFiles<T>(this List<T> files, IDatabaseContextFactory databaseContextFactory) where T : class, INamedFileInfo
+        {
+            var dbContext = databaseContextFactory.Get();
+
+            foreach (var file in files)
+            {
+                // Workaround System.InvalidOperationException
+                // The instance of entity type 'FileInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
+                file.FileInfo = dbContext.FileInfo.Find(file.FileInfoID);
+            }
+        }
+    }
+}
diff --git a/osu.Game/Database/Extensions.cs b/osu.Game/Database/Extensions.cs
deleted file mode 100644
index 3af26c348e..0000000000
--- a/osu.Game/Database/Extensions.cs
+++ /dev/null
@@ -1,44 +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.Scoring;
-
-namespace osu.Game.Database
-{
-    public static class Extensions
-    {
-        public static void Requery(this BeatmapSetInfo beatmapSetInfo, IDatabaseContextFactory databaseContextFactory)
-        {
-            var dbContext = databaseContextFactory.Get();
-
-            foreach (var beatmap in beatmapSetInfo.Beatmaps)
-            {
-                // Workaround System.InvalidOperationException
-                // The instance of entity type 'RulesetInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
-                beatmap.Ruleset = dbContext.RulesetInfo.Find(beatmap.RulesetID);
-            }
-
-            beatmapSetInfo.Files.Requery(databaseContextFactory);
-        }
-
-        public static void Requery(this ScoreInfo scoreInfo, IDatabaseContextFactory databaseContextFactory)
-        {
-            scoreInfo.Files.Requery(databaseContextFactory);
-            scoreInfo.Beatmap.BeatmapSet.Files.Requery(databaseContextFactory);
-        }
-
-        public static void Requery<T>(this List<T> files, IDatabaseContextFactory databaseContextFactory) where T : class, INamedFileInfo
-        {
-            var dbContext = databaseContextFactory.Get();
-
-            foreach (var file in files)
-            {
-                // Workaround System.InvalidOperationException
-                // The instance of entity type 'FileInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
-                file.FileInfo = dbContext.FileInfo.Find(file.FileInfoID);
-            }
-        }
-    }
-}

From 2bdffd10044984ea0a5639754b8ecff8f4fc979b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Mar 2021 12:47:58 +0900
Subject: [PATCH 1839/3722] Move skin requery logic into extension methods

---
 .../Database/DatabaseWorkaroundExtensions.cs  | 19 +++++++++++++++++--
 osu.Game/Skinning/SkinManager.cs              |  2 +-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Database/DatabaseWorkaroundExtensions.cs b/osu.Game/Database/DatabaseWorkaroundExtensions.cs
index 07ce7e8529..39bf358071 100644
--- a/osu.Game/Database/DatabaseWorkaroundExtensions.cs
+++ b/osu.Game/Database/DatabaseWorkaroundExtensions.cs
@@ -1,21 +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.Collections.Generic;
 using osu.Game.Beatmaps;
 using osu.Game.Scoring;
+using osu.Game.Skinning;
 
 namespace osu.Game.Database
 {
+    /// <summary>
+    /// Extension methods which contain workarounds to make EFcore 5.x work with our existing (incorrect) thread safety.
+    /// The intention is to avoid blocking package updates while we consider the future of the database backend, with a potential backend switch imminent.
+    /// </summary>
     public static class DatabaseWorkaroundExtensions
     {
+        /// <summary>
+        /// Re-query the provided model to ensure it is in a sane state. This method requires explicit implementation per model type.
+        /// </summary>
+        /// <param name="model"></param>
+        /// <param name="contextFactory"></param>
         public static void Requery(this IHasPrimaryKey model, IDatabaseContextFactory contextFactory)
         {
             switch (model)
             {
+                case SkinInfo skinInfo:
+                    requeryFiles(skinInfo.Files, contextFactory);
+                    break;
+
                 case ScoreInfo scoreInfo:
                     scoreInfo.Beatmap.BeatmapSet.Requery(contextFactory);
-                    scoreInfo.Files.RequeryFiles(contextFactory);
+                    requeryFiles(scoreInfo.Files, contextFactory);
                     break;
 
                 case BeatmapSetInfo beatmapSetInfo:
@@ -33,7 +48,7 @@ namespace osu.Game.Database
             }
         }
 
-        public static void RequeryFiles<T>(this List<T> files, IDatabaseContextFactory databaseContextFactory) where T : class, INamedFileInfo
+        private static void requeryFiles<T>(List<T> files, IDatabaseContextFactory databaseContextFactory) where T : class, INamedFileInfo
         {
             var dbContext = databaseContextFactory.Get();
 
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index c25f00eccb..601b77e782 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -144,7 +144,7 @@ namespace osu.Game.Skinning
 
         protected override void PreImport(SkinInfo model)
         {
-            model.Files.Requery(ContextFactory);
+            model.Requery(ContextFactory);
         }
 
         /// <summary>

From 8a3553388972349a6833afcf915f44a7dae19995 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Mar 2021 12:48:23 +0900
Subject: [PATCH 1840/3722] Add fall-through case to catch a potential requery
 for unsupported model type

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

diff --git a/osu.Game/Database/DatabaseWorkaroundExtensions.cs b/osu.Game/Database/DatabaseWorkaroundExtensions.cs
index 39bf358071..1d5c98ed8d 100644
--- a/osu.Game/Database/DatabaseWorkaroundExtensions.cs
+++ b/osu.Game/Database/DatabaseWorkaroundExtensions.cs
@@ -45,6 +45,9 @@ namespace osu.Game.Database
 
                     requeryFiles(beatmapSetInfo.Files, contextFactory);
                     break;
+
+                default:
+                    throw new ArgumentException($"{nameof(Requery)} does not have support for the provided model type", nameof(model));
             }
         }
 

From 1573298e682329d133059a74dd56c8c849b86bba Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Mar 2021 13:12:10 +0900
Subject: [PATCH 1841/3722] Update remaining package references to point to
 efcore5

---
 .../osu.Game.Rulesets.Catch.Tests.csproj                        | 2 +-
 .../osu.Game.Rulesets.Mania.Tests.csproj                        | 2 +-
 osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj  | 2 +-
 .../osu.Game.Rulesets.Taiko.Tests.csproj                        | 2 +-
 osu.Game.Tests/osu.Game.Tests.csproj                            | 2 +-
 osu.iOS.props                                                   | 2 --
 6 files changed, 5 insertions(+), 7 deletions(-)

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 728af5124e..42f70151ac 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
@@ -5,7 +5,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
   </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 af16f39563..e51b20c9fe 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
@@ -5,7 +5,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
   </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 3d2d1f3fec..f1f75148ef 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
@@ -5,7 +5,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
   </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 fa00922706..c9a320bdd5 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
@@ -5,7 +5,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
   </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 e36b3cdc74..6f8e0fac6f 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -6,7 +6,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
     <PackageReference Include="Moq" Version="4.16.1" />
   </ItemGroup>
   <PropertyGroup Label="Project">
diff --git a/osu.iOS.props b/osu.iOS.props
index ccd33bf88c..71fcdd45f3 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -90,8 +90,6 @@
   <ItemGroup Label="Transitive Dependencies">
     <PackageReference Include="DiffPlex" Version="1.6.3" />
     <PackageReference Include="Humanizer" Version="2.8.26" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.309.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />

From 79d3379f55b2b23dbfdd613c58adc8a8b3259768 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Mar 2021 13:20:22 +0900
Subject: [PATCH 1842/3722] Reformat application of configuration

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

diff --git a/osu.Game/Database/OsuDbContext.cs b/osu.Game/Database/OsuDbContext.cs
index e5ae530018..2342ab07d4 100644
--- a/osu.Game/Database/OsuDbContext.cs
+++ b/osu.Game/Database/OsuDbContext.cs
@@ -110,7 +110,10 @@ namespace osu.Game.Database
         {
             base.OnConfiguring(optionsBuilder);
             optionsBuilder
-                .UseSqlite(connectionString, sqliteOptions => sqliteOptions.CommandTimeout(10).UseQuerySplittingBehavior(QuerySplittingBehavior.SingleQuery))
+                .UseSqlite(connectionString,
+                    sqliteOptions => sqliteOptions
+                                     .CommandTimeout(10)
+                                     .UseQuerySplittingBehavior(QuerySplittingBehavior.SingleQuery))
                 .UseLoggerFactory(logger.Value);
         }
 

From 2904f479c65bf9f2cd76a3164ab51d13ff53dc96 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Mar 2021 13:26:14 +0900
Subject: [PATCH 1843/3722] Share file lookup workaround in ArchiveModelManager
 with workaround extensions class

---
 osu.Game/Database/ArchiveModelManager.cs      |  4 +---
 .../Database/DatabaseWorkaroundExtensions.cs  | 23 +++++++++++--------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index fe2caaa0b7..31c365b478 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -462,9 +462,7 @@ namespace osu.Game.Database
                 // Dereference the existing file info, since the file model will be removed.
                 if (file.FileInfo != null)
                 {
-                    // Workaround System.InvalidOperationException
-                    // The instance of entity type 'FileInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
-                    file.FileInfo = usage.Context.FileInfo.Find(file.FileInfoID);
+                    file.Requery(usage.Context);
 
                     Files.Dereference(file.FileInfo);
 
diff --git a/osu.Game/Database/DatabaseWorkaroundExtensions.cs b/osu.Game/Database/DatabaseWorkaroundExtensions.cs
index 1d5c98ed8d..8ac05f78e0 100644
--- a/osu.Game/Database/DatabaseWorkaroundExtensions.cs
+++ b/osu.Game/Database/DatabaseWorkaroundExtensions.cs
@@ -49,18 +49,23 @@ namespace osu.Game.Database
                 default:
                     throw new ArgumentException($"{nameof(Requery)} does not have support for the provided model type", nameof(model));
             }
+
+            void requeryFiles<T>(List<T> files, IDatabaseContextFactory databaseContextFactory) where T : class, INamedFileInfo
+            {
+                var dbContext = databaseContextFactory.Get();
+
+                foreach (var file in files)
+                {
+                    Requery(file, dbContext);
+                }
+            }
         }
 
-        private static void requeryFiles<T>(List<T> files, IDatabaseContextFactory databaseContextFactory) where T : class, INamedFileInfo
+        public static void Requery(this INamedFileInfo file, OsuDbContext dbContext)
         {
-            var dbContext = databaseContextFactory.Get();
-
-            foreach (var file in files)
-            {
-                // Workaround System.InvalidOperationException
-                // The instance of entity type 'FileInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
-                file.FileInfo = dbContext.FileInfo.Find(file.FileInfoID);
-            }
+            // Workaround System.InvalidOperationException
+            // The instance of entity type 'FileInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
+            file.FileInfo = dbContext.FileInfo.Find(file.FileInfoID);
         }
     }
 }

From fce21f23d687ab72be391c23987ad1edff8740f0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Mar 2021 13:29:26 +0900
Subject: [PATCH 1844/3722] Add comments marking workarounds required for
 EFcore 5

---
 .../Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs   | 2 +-
 .../Visual/SongSelect/TestSceneBeatmapRecommendations.cs        | 2 +-
 osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs     | 2 +-
 osu.Game/Database/ArchiveModelManager.cs                        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
index 4a9eaa1842..8cfe5d8af2 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 beatmaps.Add(new BeatmapInfo
                 {
                     Ruleset = rulesets.GetRuleset(i % 4),
-                    RulesetID = i % 4,
+                    RulesetID = i % 4, // workaround for efcore 5 compatibility.
                     OnlineBeatmapID = beatmapId,
                     Length = length,
                     BPM = bpm,
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
index 223ace6ca5..9b8b74e6f6 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
@@ -186,7 +186,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     Metadata = metadata,
                     BaseDifficulty = new BeatmapDifficulty(),
                     Ruleset = ruleset,
-                    RulesetID = ruleset.ID.GetValueOrDefault(),
+                    RulesetID = ruleset.ID.GetValueOrDefault(), // workaround for efcore 5 compatibility.
                     StarDifficulty = difficultyIndex + 1,
                     Version = $"SR{difficultyIndex + 1}"
                 }).ToList()
diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 4b402d0c54..2d192ae207 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -915,7 +915,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 beatmaps.Add(new BeatmapInfo
                 {
                     Ruleset = ruleset,
-                    RulesetID = ruleset.ID.GetValueOrDefault(),
+                    RulesetID = ruleset.ID.GetValueOrDefault(), // workaround for efcore 5 compatibility.
                     OnlineBeatmapID = beatmapId,
                     Version = $"{beatmapId} (length {TimeSpan.FromMilliseconds(length):m\\:ss}, bpm {bpm:0.#})",
                     Length = length,
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 31c365b478..64428882ac 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -642,7 +642,7 @@ namespace osu.Game.Database
                     {
                         Filename = file.Substring(prefix.Length).ToStandardisedPath(),
                         FileInfo = fileInfo,
-                        FileInfoID = fileInfo.ID
+                        FileInfoID = fileInfo.ID // workaround for efcore 5 compatibility.
                     });
                 }
             }

From 6d4c1ba2aee43c9fdab49f83ba16c0bcdedcce78 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Mar 2021 13:35:08 +0900
Subject: [PATCH 1845/3722] Fix a couple of new inspections introduced in Rider
 EAPs

---
 osu.Game/Beatmaps/BeatmapConverter.cs             | 10 +++++-----
 osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs |  3 ---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapConverter.cs b/osu.Game/Beatmaps/BeatmapConverter.cs
index cb0b3a8d09..b291edd19d 100644
--- a/osu.Game/Beatmaps/BeatmapConverter.cs
+++ b/osu.Game/Beatmaps/BeatmapConverter.cs
@@ -17,12 +17,12 @@ namespace osu.Game.Beatmaps
     public abstract class BeatmapConverter<T> : IBeatmapConverter
         where T : HitObject
     {
-        private event Action<HitObject, IEnumerable<HitObject>> ObjectConverted;
+        private event Action<HitObject, IEnumerable<HitObject>> objectConverted;
 
         event Action<HitObject, IEnumerable<HitObject>> IBeatmapConverter.ObjectConverted
         {
-            add => ObjectConverted += value;
-            remove => ObjectConverted -= value;
+            add => objectConverted += value;
+            remove => objectConverted -= value;
         }
 
         public IBeatmap Beatmap { get; }
@@ -92,10 +92,10 @@ namespace osu.Game.Beatmaps
 
                 var converted = ConvertHitObject(obj, beatmap, cancellationToken);
 
-                if (ObjectConverted != null)
+                if (objectConverted != null)
                 {
                     converted = converted.ToList();
-                    ObjectConverted.Invoke(obj, converted);
+                    objectConverted.Invoke(obj, converted);
                 }
 
                 foreach (var c in converted)
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index df940e8c8e..d06478b9de 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -471,9 +471,6 @@ namespace osu.Game.Beatmaps.Formats
 
         private string toLegacyCustomSampleBank(HitSampleInfo hitSampleInfo)
         {
-            if (hitSampleInfo == null)
-                return "0";
-
             if (hitSampleInfo is ConvertHitObjectParser.LegacyHitSampleInfo legacy)
                 return legacy.CustomSampleBank.ToString(CultureInfo.InvariantCulture);
 

From 1e519f0d31125a3bb508be2dd97777556f69f0b1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Mar 2021 14:20:59 +0900
Subject: [PATCH 1846/3722] Fix seemingly innocent logic change causing
 breakage in score imports

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

diff --git a/osu.Game/Database/DatabaseWorkaroundExtensions.cs b/osu.Game/Database/DatabaseWorkaroundExtensions.cs
index 8ac05f78e0..a3a982f232 100644
--- a/osu.Game/Database/DatabaseWorkaroundExtensions.cs
+++ b/osu.Game/Database/DatabaseWorkaroundExtensions.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Database
                     break;
 
                 case ScoreInfo scoreInfo:
-                    scoreInfo.Beatmap.BeatmapSet.Requery(contextFactory);
+                    requeryFiles(scoreInfo.Beatmap.BeatmapSet.Files, contextFactory);
                     requeryFiles(scoreInfo.Files, contextFactory);
                     break;
 

From 3dd72d6f7d229bd7cb8311e707ace797fed31d3e Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 14 Mar 2021 22:47:05 -0700
Subject: [PATCH 1847/3722] Fix disable mouse buttons setting not showing
 default indicator when using keybind

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index dd775888a1..eb34ba4a37 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -886,7 +886,9 @@ namespace osu.Game
                     return true;
 
                 case GlobalAction.ToggleGameplayMouseButtons:
-                    LocalConfig.Set(OsuSetting.MouseDisableButtons, !LocalConfig.Get<bool>(OsuSetting.MouseDisableButtons));
+                    var mouseDisableButtons = LocalConfig.GetBindable<bool>(OsuSetting.MouseDisableButtons);
+
+                    mouseDisableButtons.Value = !mouseDisableButtons.Value;
                     return true;
 
                 case GlobalAction.RandomSkin:

From 848adddd9285c3b22c93e6fa06f12c2e9f825c48 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 15 Mar 2021 11:05:29 +0300
Subject: [PATCH 1848/3722] Use `double.ToString(InvariantInfo)` instead

---
 osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs | 3 ++-
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs
index 83676d3784..891821fe2f 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.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.Globalization;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -58,7 +59,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             gainedBonus = drawableSpinner.GainedBonus.GetBoundCopy();
             gainedBonus.BindValueChanged(bonus =>
             {
-                bonusCounter.Text = $"{bonus.NewValue}";
+                bonusCounter.Text = bonus.NewValue.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 610eb54316..6d4fbd7445 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.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.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -102,7 +103,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 gainedBonus = DrawableSpinner.GainedBonus.GetBoundCopy();
                 gainedBonus.BindValueChanged(bonus =>
                 {
-                    bonusCounter.Text = $"{bonus.NewValue}";
+                    bonusCounter.Text = bonus.NewValue.ToString(NumberFormatInfo.InvariantInfo);
                     bonusCounter.FadeOutFromOne(800, Easing.Out);
                     bonusCounter.ScaleTo(SPRITE_SCALE * 2f).Then().ScaleTo(SPRITE_SCALE * 1.28f, 800, Easing.Out);
                 });

From 393f1fbd3f7f4169fefb1df16b689e66314e6fdf Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 15 Mar 2021 10:07:50 -0700
Subject: [PATCH 1849/3722] Remove skype

---
 osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs | 1 -
 osu.Game/Users/User.cs                                    | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
index 2925107766..662f55317b 100644
--- a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
@@ -138,7 +138,6 @@ namespace osu.Game.Overlays.Profile.Header
             if (!string.IsNullOrEmpty(user.Twitter))
                 anyInfoAdded |= tryAddInfo(FontAwesome.Brands.Twitter, "@" + user.Twitter, $@"https://twitter.com/{user.Twitter}");
             anyInfoAdded |= tryAddInfo(FontAwesome.Brands.Discord, user.Discord);
-            anyInfoAdded |= tryAddInfo(FontAwesome.Brands.Skype, user.Skype, @"skype:" + user.Skype + @"?chat");
             anyInfoAdded |= tryAddInfo(FontAwesome.Solid.Link, websiteWithoutProtocol, user.Website);
 
             // If no information was added to the bottomLinkContainer, hide it to avoid unwanted padding
diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index 4d537b91bd..6c45417db0 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -111,9 +111,6 @@ namespace osu.Game.Users
         [JsonProperty(@"twitter")]
         public string Twitter;
 
-        [JsonProperty(@"skype")]
-        public string Skype;
-
         [JsonProperty(@"discord")]
         public string Discord;
 

From 58220481dbd71edf491a56494bafa302f8250915 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 15 Mar 2021 20:38:11 +0100
Subject: [PATCH 1850/3722] Rename `I{-> Animatable}HitExplosion`

---
 osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs | 2 +-
 osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs             | 2 +-
 osu.Game.Rulesets.Taiko/UI/HitExplosion.cs                    | 4 ++--
 .../UI/{IHitExplosion.cs => IAnimatableHitExplosion.cs}       | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename osu.Game.Rulesets.Taiko/UI/{IHitExplosion.cs => IAnimatableHitExplosion.cs} (79%)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs
index 9734e12413..aad9f53b93 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs
@@ -11,7 +11,7 @@ using osu.Game.Rulesets.Taiko.UI;
 
 namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
 {
-    public class LegacyHitExplosion : CompositeDrawable, IHitExplosion
+    public class LegacyHitExplosion : CompositeDrawable, IAnimatableHitExplosion
     {
         public override bool RemoveWhenNotAlive => false;
 
diff --git a/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs
index 2519573ce9..5bb463353d 100644
--- a/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs
@@ -14,7 +14,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Taiko.UI
 {
-    internal class DefaultHitExplosion : CircularContainer, IHitExplosion
+    internal class DefaultHitExplosion : CircularContainer, IAnimatableHitExplosion
     {
         public override bool RemoveWhenNotAlive => false;
 
diff --git a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
index d2ae36a03e..bdebe9da17 100644
--- a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
@@ -89,7 +89,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             LifetimeStart = resultTime;
 
             using (BeginAbsoluteSequence(resultTime))
-                (skinnable.Drawable as IHitExplosion)?.Animate(JudgedObject);
+                (skinnable.Drawable as IAnimatableHitExplosion)?.Animate(JudgedObject);
 
             LifetimeEnd = skinnable.Drawable.LatestTransformEndTime;
         }
@@ -116,7 +116,7 @@ namespace osu.Game.Rulesets.Taiko.UI
             using (BeginAbsoluteSequence(judgementResult.TimeAbsolute))
             {
                 this.ResizeTo(new Vector2(TaikoStrongableHitObject.DEFAULT_STRONG_SIZE), 50);
-                (skinnable.Drawable as IHitExplosion)?.AnimateSecondHit();
+                (skinnable.Drawable as IAnimatableHitExplosion)?.AnimateSecondHit();
             }
         }
     }
diff --git a/osu.Game.Rulesets.Taiko/UI/IHitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/IAnimatableHitExplosion.cs
similarity index 79%
rename from osu.Game.Rulesets.Taiko/UI/IHitExplosion.cs
rename to osu.Game.Rulesets.Taiko/UI/IAnimatableHitExplosion.cs
index 7af941d1ba..cf0f5f9fb6 100644
--- a/osu.Game.Rulesets.Taiko/UI/IHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/IAnimatableHitExplosion.cs
@@ -6,9 +6,9 @@ using osu.Game.Rulesets.Objects.Drawables;
 namespace osu.Game.Rulesets.Taiko.UI
 {
     /// <summary>
-    /// Interface for hit explosions shown on the playfield's hit target in taiko.
+    /// A skinnable element of a hit explosion that supports playing an animation from the current point in time.
     /// </summary>
-    public interface IHitExplosion
+    public interface IAnimatableHitExplosion
     {
         /// <summary>
         /// Shows the hit explosion for the supplied <paramref name="drawableHitObject"/>.

From f4e508b57051e887a00a8f4649e4616b762a8c8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 15 Mar 2021 20:43:30 +0100
Subject: [PATCH 1851/3722] Remove unnecessary overrides

---
 osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs             | 2 --
 osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs | 2 --
 2 files changed, 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs b/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
index 69b81d6d5c..1b5d576c1e 100644
--- a/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
@@ -21,8 +21,6 @@ namespace osu.Game.Rulesets.Mania.UI
     {
         private const float default_large_faint_size = 0.8f;
 
-        public override bool RemoveWhenNotAlive => true;
-
         [Resolved]
         private Column column { get; set; }
 
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs
index aad9f53b93..bef9279bac 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs
@@ -13,8 +13,6 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
 {
     public class LegacyHitExplosion : CompositeDrawable, IAnimatableHitExplosion
     {
-        public override bool RemoveWhenNotAlive => false;
-
         private readonly Drawable sprite;
 
         [CanBeNull]

From 72c18fbdfe8f91798a1adf16ca1f92ecbc593ae4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 15 Mar 2021 20:48:19 +0100
Subject: [PATCH 1852/3722] Restructure explosion animation to avoid resetting
 transforms on free

---
 osu.Game.Rulesets.Taiko/UI/HitExplosion.cs | 32 ++++++++++++----------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
index bdebe9da17..8f5e9e54ab 100644
--- a/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/HitExplosion.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         private readonly HitResult result;
 
+        private double? secondHitTime;
+
         [CanBeNull]
         public DrawableHitObject JudgedObject;
 
@@ -61,6 +63,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         public void Apply([CanBeNull] DrawableHitObject drawableHitObject)
         {
             JudgedObject = drawableHitObject;
+            secondHitTime = null;
         }
 
         protected override void PrepareForUse()
@@ -69,16 +72,6 @@ namespace osu.Game.Rulesets.Taiko.UI
             runAnimation();
         }
 
-        protected override void FreeAfterUse()
-        {
-            base.FreeAfterUse();
-
-            // clean up transforms on free instead of on prepare as is usually the case
-            // to avoid potentially overriding the effects of VisualiseSecondHit() in the case it is called before PrepareForUse().
-            ApplyTransformsAt(double.MinValue, true);
-            ClearTransforms(true);
-        }
-
         private void runAnimation()
         {
             if (JudgedObject?.Result == null)
@@ -88,9 +81,21 @@ namespace osu.Game.Rulesets.Taiko.UI
 
             LifetimeStart = resultTime;
 
+            ApplyTransformsAt(double.MinValue, true);
+            ClearTransforms(true);
+
             using (BeginAbsoluteSequence(resultTime))
                 (skinnable.Drawable as IAnimatableHitExplosion)?.Animate(JudgedObject);
 
+            if (secondHitTime != null)
+            {
+                using (BeginAbsoluteSequence(secondHitTime.Value))
+                {
+                    this.ResizeTo(new Vector2(TaikoStrongableHitObject.DEFAULT_STRONG_SIZE), 50);
+                    (skinnable.Drawable as IAnimatableHitExplosion)?.AnimateSecondHit();
+                }
+            }
+
             LifetimeEnd = skinnable.Drawable.LatestTransformEndTime;
         }
 
@@ -113,11 +118,8 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         public void VisualiseSecondHit(JudgementResult judgementResult)
         {
-            using (BeginAbsoluteSequence(judgementResult.TimeAbsolute))
-            {
-                this.ResizeTo(new Vector2(TaikoStrongableHitObject.DEFAULT_STRONG_SIZE), 50);
-                (skinnable.Drawable as IAnimatableHitExplosion)?.AnimateSecondHit();
-            }
+            secondHitTime = judgementResult.TimeAbsolute;
+            runAnimation();
         }
     }
 }

From da3dc61aae29202b7a0ebb498c274852c1d955ab Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 16 Mar 2021 10:58:42 +0900
Subject: [PATCH 1853/3722] Remove newline

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index eb34ba4a37..7d11029a9c 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -887,7 +887,6 @@ namespace osu.Game
 
                 case GlobalAction.ToggleGameplayMouseButtons:
                     var mouseDisableButtons = LocalConfig.GetBindable<bool>(OsuSetting.MouseDisableButtons);
-
                     mouseDisableButtons.Value = !mouseDisableButtons.Value;
                     return true;
 

From c7740d1181a165466b9960ed54f10c7e14e85075 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 15:52:24 +0900
Subject: [PATCH 1854/3722] Fix opening the editor occasionally causing a hard
 crash due to incorrect threading logic

Setting one of the global screen `Bindable`s (in this case, `Beatmap`)
is not valid from anywhere but the update thread. This changes the order
in which things happen during the editor startup process to ensure
correctness.

Closes #11968.
---
 osu.Game/Screens/Edit/Editor.cs | 67 +++++++++++++++++++++------------
 1 file changed, 42 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 0ba202b082..3a4c3491ff 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -106,26 +106,29 @@ namespace osu.Game.Screens.Edit
         [BackgroundDependencyLoader]
         private void load(OsuColour colours, GameHost host, OsuConfigManager config)
         {
-            if (Beatmap.Value is DummyWorkingBeatmap)
+            var loadableBeatmap = Beatmap.Value;
+
+            if (loadableBeatmap is DummyWorkingBeatmap)
             {
                 isNewBeatmap = true;
 
-                var newBeatmap = beatmapManager.CreateNew(Ruleset.Value, api.LocalUser.Value);
+                loadableBeatmap = beatmapManager.CreateNew(Ruleset.Value, api.LocalUser.Value);
+
+                // required so we can get the track length in EditorClock.
+                // this is safe as nothing has yet got a reference to this new beatmap.
+                loadableBeatmap.LoadTrack();
 
                 // this is a bit haphazard, but guards against setting the lease Beatmap bindable if
                 // the editor has already been exited.
                 if (!ValidForPush)
                     return;
-
-                // this probably shouldn't be set in the asynchronous load method, but everything following relies on it.
-                Beatmap.Value = newBeatmap;
             }
 
-            beatDivisor.Value = Beatmap.Value.BeatmapInfo.BeatDivisor;
-            beatDivisor.BindValueChanged(divisor => Beatmap.Value.BeatmapInfo.BeatDivisor = divisor.NewValue);
+            beatDivisor.Value = loadableBeatmap.BeatmapInfo.BeatDivisor;
+            beatDivisor.BindValueChanged(divisor => loadableBeatmap.BeatmapInfo.BeatDivisor = divisor.NewValue);
 
             // Todo: should probably be done at a DrawableRuleset level to share logic with Player.
-            clock = new EditorClock(Beatmap.Value, beatDivisor) { IsCoupled = false };
+            clock = new EditorClock(loadableBeatmap, beatDivisor) { IsCoupled = false };
 
             UpdateClockSource();
 
@@ -139,7 +142,7 @@ namespace osu.Game.Screens.Edit
 
             try
             {
-                playableBeatmap = Beatmap.Value.GetPlayableBeatmap(Beatmap.Value.BeatmapInfo.Ruleset);
+                playableBeatmap = loadableBeatmap.GetPlayableBeatmap(loadableBeatmap.BeatmapInfo.Ruleset);
 
                 // clone these locally for now to avoid incurring overhead on GetPlayableBeatmap usages.
                 // eventually we will want to improve how/where this is done as there are issues with *not* cloning it in all cases.
@@ -153,13 +156,21 @@ namespace osu.Game.Screens.Edit
                 return;
             }
 
-            AddInternal(editorBeatmap = new EditorBeatmap(playableBeatmap, Beatmap.Value.Skin));
+            AddInternal(editorBeatmap = new EditorBeatmap(playableBeatmap, loadableBeatmap.Skin));
             dependencies.CacheAs(editorBeatmap);
             changeHandler = new EditorChangeHandler(editorBeatmap);
             dependencies.CacheAs<IEditorChangeHandler>(changeHandler);
 
             updateLastSavedHash();
 
+            Schedule(() =>
+            {
+                // we need to avoid changing the beatmap from an asynchronous load thread. it can potentially cause weirdness including crashes.
+                // this assumes that nothing during the rest of this load() method is accessing Beatmap.Value (loadableBeatmap should be preferred).
+                // generally this is quite safe, as the actual load of editor content comes after menuBar.Mode.ValueChanged is fired in its own LoadComplete.
+                Beatmap.Value = loadableBeatmap;
+            });
+
             OsuMenuItem undoMenuItem;
             OsuMenuItem redoMenuItem;
 
@@ -167,17 +178,6 @@ namespace osu.Game.Screens.Edit
             EditorMenuItem copyMenuItem;
             EditorMenuItem pasteMenuItem;
 
-            var fileMenuItems = new List<MenuItem>
-            {
-                new EditorMenuItem("Save", MenuItemType.Standard, Save)
-            };
-
-            if (RuntimeInfo.IsDesktop)
-                fileMenuItems.Add(new EditorMenuItem("Export package", MenuItemType.Standard, exportBeatmap));
-
-            fileMenuItems.Add(new EditorMenuItemSpacer());
-            fileMenuItems.Add(new EditorMenuItem("Exit", MenuItemType.Standard, this.Exit));
-
             AddInternal(new OsuContextMenuContainer
             {
                 RelativeSizeAxes = Axes.Both,
@@ -209,7 +209,7 @@ namespace osu.Game.Screens.Edit
                             {
                                 new MenuItem("File")
                                 {
-                                    Items = fileMenuItems
+                                    Items = createFileMenuItems()
                                 },
                                 new MenuItem("Edit")
                                 {
@@ -242,7 +242,11 @@ namespace osu.Game.Screens.Edit
                         Height = 60,
                         Children = new Drawable[]
                         {
-                            bottomBackground = new Box { RelativeSizeAxes = Axes.Both },
+                            bottomBackground = new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Colour = colours.Gray2
+                            },
                             new Container
                             {
                                 RelativeSizeAxes = Axes.Both,
@@ -299,8 +303,6 @@ namespace osu.Game.Screens.Edit
             clipboard.BindValueChanged(content => pasteMenuItem.Action.Disabled = string.IsNullOrEmpty(content.NewValue));
 
             menuBar.Mode.ValueChanged += onModeChanged;
-
-            bottomBackground.Colour = colours.Gray2;
         }
 
         /// <summary>
@@ -681,6 +683,21 @@ namespace osu.Game.Screens.Edit
             lastSavedHash = changeHandler.CurrentStateHash;
         }
 
+        private List<MenuItem> createFileMenuItems()
+        {
+            var fileMenuItems = new List<MenuItem>
+            {
+                new EditorMenuItem("Save", MenuItemType.Standard, Save)
+            };
+
+            if (RuntimeInfo.IsDesktop)
+                fileMenuItems.Add(new EditorMenuItem("Export package", MenuItemType.Standard, exportBeatmap));
+
+            fileMenuItems.Add(new EditorMenuItemSpacer());
+            fileMenuItems.Add(new EditorMenuItem("Exit", MenuItemType.Standard, this.Exit));
+            return fileMenuItems;
+        }
+
         public double SnapTime(double time, double? referenceTime) => editorBeatmap.SnapTime(time, referenceTime);
 
         public double GetBeatLengthAtTime(double referenceTime) => editorBeatmap.GetBeatLengthAtTime(referenceTime);

From 7fa5fd56475124fa78c84cbb18e3c19838d98e5a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 17 Mar 2021 16:10:16 +0900
Subject: [PATCH 1855/3722] Update usages of config with framework changes

---
 .../TestSceneCatchModHidden.cs                |   2 +-
 .../TestSceneCatcher.cs                       |   4 +-
 .../ManiaRulesetConfigManager.cs              |   4 +-
 .../TestSceneDrawableJudgement.cs             |   4 +-
 .../TestSceneGameplayCursor.cs                |  12 +-
 .../TestSceneSkinFallbacks.cs                 |  20 +--
 .../Configuration/OsuRulesetConfigManager.cs  |   8 +-
 .../Input/ConfineMouseTrackerTest.cs          |   2 +-
 .../NonVisual/CustomDataDirectoryTest.cs      |   4 +-
 .../TestSceneSeasonalBackgroundLoader.cs      |   4 +-
 .../Visual/Gameplay/TestSceneFailingLayer.cs  |  12 +-
 .../Visual/Gameplay/TestSceneHUDOverlay.cs    |   8 +-
 .../TestSceneStoryboardSamplePlayback.cs      |   2 +-
 .../Visual/Navigation/OsuGameTestScene.cs     |   4 +-
 .../Navigation/TestSettingsMigration.cs       |   6 +-
 .../SongSelect/TestScenePlaySongSelect.cs     |  24 +--
 .../TestSceneBeatmapListingSearchControl.cs   |   4 +-
 .../UserInterface/TestSceneOnScreenDisplay.cs |  12 +-
 .../NonVisual/CustomTourneyDirectoryTest.cs   |   2 +-
 osu.Game.Tournament/IO/TournamentStorage.cs   |   2 +-
 .../Components/DrawingsConfigManager.cs       |   4 +-
 osu.Game/Configuration/OsuConfigManager.cs    | 142 +++++++++---------
 osu.Game/Configuration/SessionStatics.cs      |   8 +-
 .../Configuration/StorageConfigManager.cs     |   2 +-
 osu.Game/IO/OsuStorage.cs                     |   4 +-
 osu.Game/Online/API/APIAccess.cs              |   4 +-
 osu.Game/Updater/UpdateManager.cs             |   2 +-
 27 files changed, 153 insertions(+), 153 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs
index f15da29993..1248409b2a 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         [BackgroundDependencyLoader]
         private void load()
         {
-            LocalConfig.Set(OsuSetting.IncreaseFirstObjectVisibility, false);
+            LocalConfig.SetValue(OsuSetting.IncreaseFirstObjectVisibility, false);
         }
 
         [Test]
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index e8bb57cdf3..48efd73222 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -202,7 +202,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         public void TestHitLightingColour()
         {
             var fruitColour = SkinConfiguration.DefaultComboColours[1];
-            AddStep("enable hit lighting", () => config.Set(OsuSetting.HitLighting, true));
+            AddStep("enable hit lighting", () => config.SetValue(OsuSetting.HitLighting, true));
             AddStep("catch fruit", () => attemptCatch(new Fruit()));
             AddAssert("correct hit lighting colour", () =>
                 catcher.ChildrenOfType<HitExplosion>().First()?.ObjectColour == fruitColour);
@@ -211,7 +211,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         [Test]
         public void TestHitLightingDisabled()
         {
-            AddStep("disable hit lighting", () => config.Set(OsuSetting.HitLighting, false));
+            AddStep("disable hit lighting", () => config.SetValue(OsuSetting.HitLighting, false));
             AddStep("catch fruit", () => attemptCatch(new Fruit()));
             AddAssert("no hit lighting", () => !catcher.ChildrenOfType<HitExplosion>().Any());
         }
diff --git a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
index 756f2b7b2f..39d0f4bae4 100644
--- a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
+++ b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
@@ -20,8 +20,8 @@ namespace osu.Game.Rulesets.Mania.Configuration
         {
             base.InitialiseDefaults();
 
-            Set(ManiaRulesetSetting.ScrollTime, 1500.0, DrawableManiaRuleset.MIN_TIME_RANGE, DrawableManiaRuleset.MAX_TIME_RANGE, 5);
-            Set(ManiaRulesetSetting.ScrollDirection, ManiaScrollingDirection.Down);
+            SetDefault(ManiaRulesetSetting.ScrollTime, 1500.0, DrawableManiaRuleset.MIN_TIME_RANGE, DrawableManiaRuleset.MAX_TIME_RANGE, 5);
+            SetDefault(ManiaRulesetSetting.ScrollDirection, ManiaScrollingDirection.Down);
         }
 
         public override TrackedSettings CreateTrackedSettings() => new TrackedSettings
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
index e4158d8f07..4395ca6281 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [Test]
         public void TestHitLightingDisabled()
         {
-            AddStep("hit lighting disabled", () => config.Set(OsuSetting.HitLighting, false));
+            AddStep("hit lighting disabled", () => config.SetValue(OsuSetting.HitLighting, false));
 
             showResult(HitResult.Great);
 
@@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [Test]
         public void TestHitLightingEnabled()
         {
-            AddStep("hit lighting enabled", () => config.Set(OsuSetting.HitLighting, true));
+            AddStep("hit lighting enabled", () => config.SetValue(OsuSetting.HitLighting, true));
 
             showResult(HitResult.Great);
 
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
index 461779b185..e3ccf83715 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             AddSliderStep("circle size", 0f, 10f, 0f, val =>
             {
-                config.Set(OsuSetting.AutoCursorSize, true);
+                config.SetValue(OsuSetting.AutoCursorSize, true);
                 gameplayBeatmap.BeatmapInfo.BaseDifficulty.CircleSize = val;
                 Scheduler.AddOnce(recreate);
             });
@@ -64,21 +64,21 @@ namespace osu.Game.Rulesets.Osu.Tests
         [TestCase(10, 1.5f)]
         public void TestSizing(int circleSize, float userScale)
         {
-            AddStep($"set user scale to {userScale}", () => config.Set(OsuSetting.GameplayCursorSize, userScale));
+            AddStep($"set user scale to {userScale}", () => config.SetValue(OsuSetting.GameplayCursorSize, userScale));
             AddStep($"adjust cs to {circleSize}", () => gameplayBeatmap.BeatmapInfo.BaseDifficulty.CircleSize = circleSize);
-            AddStep("turn on autosizing", () => config.Set(OsuSetting.AutoCursorSize, true));
+            AddStep("turn on autosizing", () => config.SetValue(OsuSetting.AutoCursorSize, true));
 
             AddStep("load content", loadContent);
 
             AddUntilStep("cursor size correct", () => lastContainer.ActiveCursor.Scale.X == OsuCursorContainer.GetScaleForCircleSize(circleSize) * userScale);
 
-            AddStep("set user scale to 1", () => config.Set(OsuSetting.GameplayCursorSize, 1f));
+            AddStep("set user scale to 1", () => config.SetValue(OsuSetting.GameplayCursorSize, 1f));
             AddUntilStep("cursor size correct", () => lastContainer.ActiveCursor.Scale.X == OsuCursorContainer.GetScaleForCircleSize(circleSize));
 
-            AddStep("turn off autosizing", () => config.Set(OsuSetting.AutoCursorSize, false));
+            AddStep("turn off autosizing", () => config.SetValue(OsuSetting.AutoCursorSize, false));
             AddUntilStep("cursor size correct", () => lastContainer.ActiveCursor.Scale.X == 1);
 
-            AddStep($"set user scale to {userScale}", () => config.Set(OsuSetting.GameplayCursorSize, userScale));
+            AddStep($"set user scale to {userScale}", () => config.SetValue(OsuSetting.GameplayCursorSize, userScale));
             AddUntilStep("cursor size correct", () => lastContainer.ActiveCursor.Scale.X == userScale);
         }
 
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
index 8dbb48c048..56f6fb85fa 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
@@ -42,10 +42,10 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             AddStep("enable user provider", () => testUserSkin.Enabled = true);
 
-            AddStep("enable beatmap skin", () => LocalConfig.Set<bool>(OsuSetting.BeatmapSkins, true));
+            AddStep("enable beatmap skin", () => LocalConfig.SetValue(OsuSetting.BeatmapSkins, true));
             checkNextHitObject("beatmap");
 
-            AddStep("disable beatmap skin", () => LocalConfig.Set<bool>(OsuSetting.BeatmapSkins, false));
+            AddStep("disable beatmap skin", () => LocalConfig.SetValue(OsuSetting.BeatmapSkins, false));
             checkNextHitObject("user");
 
             AddStep("disable user provider", () => testUserSkin.Enabled = false);
@@ -57,20 +57,20 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             AddStep("enable user provider", () => testUserSkin.Enabled = true);
 
-            AddStep("enable beatmap skin", () => LocalConfig.Set<bool>(OsuSetting.BeatmapSkins, true));
-            AddStep("enable beatmap colours", () => LocalConfig.Set<bool>(OsuSetting.BeatmapColours, true));
+            AddStep("enable beatmap skin", () => LocalConfig.SetValue(OsuSetting.BeatmapSkins, true));
+            AddStep("enable beatmap colours", () => LocalConfig.SetValue(OsuSetting.BeatmapColours, true));
             checkNextHitObject("beatmap");
 
-            AddStep("enable beatmap skin", () => LocalConfig.Set<bool>(OsuSetting.BeatmapSkins, true));
-            AddStep("disable beatmap colours", () => LocalConfig.Set<bool>(OsuSetting.BeatmapColours, false));
+            AddStep("enable beatmap skin", () => LocalConfig.SetValue(OsuSetting.BeatmapSkins, true));
+            AddStep("disable beatmap colours", () => LocalConfig.SetValue(OsuSetting.BeatmapColours, false));
             checkNextHitObject("beatmap");
 
-            AddStep("disable beatmap skin", () => LocalConfig.Set<bool>(OsuSetting.BeatmapSkins, false));
-            AddStep("enable beatmap colours", () => LocalConfig.Set<bool>(OsuSetting.BeatmapColours, true));
+            AddStep("disable beatmap skin", () => LocalConfig.SetValue(OsuSetting.BeatmapSkins, false));
+            AddStep("enable beatmap colours", () => LocalConfig.SetValue(OsuSetting.BeatmapColours, true));
             checkNextHitObject("user");
 
-            AddStep("disable beatmap skin", () => LocalConfig.Set<bool>(OsuSetting.BeatmapSkins, false));
-            AddStep("disable beatmap colours", () => LocalConfig.Set<bool>(OsuSetting.BeatmapColours, false));
+            AddStep("disable beatmap skin", () => LocalConfig.SetValue(OsuSetting.BeatmapSkins, false));
+            AddStep("disable beatmap colours", () => LocalConfig.SetValue(OsuSetting.BeatmapColours, false));
             checkNextHitObject("user");
 
             AddStep("disable user provider", () => testUserSkin.Enabled = false);
diff --git a/osu.Game.Rulesets.Osu/Configuration/OsuRulesetConfigManager.cs b/osu.Game.Rulesets.Osu/Configuration/OsuRulesetConfigManager.cs
index e8272057f3..9589fd576f 100644
--- a/osu.Game.Rulesets.Osu/Configuration/OsuRulesetConfigManager.cs
+++ b/osu.Game.Rulesets.Osu/Configuration/OsuRulesetConfigManager.cs
@@ -17,10 +17,10 @@ namespace osu.Game.Rulesets.Osu.Configuration
         protected override void InitialiseDefaults()
         {
             base.InitialiseDefaults();
-            Set(OsuRulesetSetting.SnakingInSliders, true);
-            Set(OsuRulesetSetting.SnakingOutSliders, true);
-            Set(OsuRulesetSetting.ShowCursorTrail, true);
-            Set(OsuRulesetSetting.PlayfieldBorderStyle, PlayfieldBorderStyle.None);
+            SetDefault(OsuRulesetSetting.SnakingInSliders, true);
+            SetDefault(OsuRulesetSetting.SnakingOutSliders, true);
+            SetDefault(OsuRulesetSetting.ShowCursorTrail, true);
+            SetDefault(OsuRulesetSetting.PlayfieldBorderStyle, PlayfieldBorderStyle.None);
         }
     }
 
diff --git a/osu.Game.Tests/Input/ConfineMouseTrackerTest.cs b/osu.Game.Tests/Input/ConfineMouseTrackerTest.cs
index b90382488f..27cece42e8 100644
--- a/osu.Game.Tests/Input/ConfineMouseTrackerTest.cs
+++ b/osu.Game.Tests/Input/ConfineMouseTrackerTest.cs
@@ -88,7 +88,7 @@ namespace osu.Game.Tests.Input
             => AddStep($"make window {mode}", () => frameworkConfigManager.GetBindable<WindowMode>(FrameworkSetting.WindowMode).Value = mode);
 
         private void setGameSideModeTo(OsuConfineMouseMode mode)
-            => AddStep($"set {mode} game-side", () => Game.LocalConfig.Set(OsuSetting.ConfineMouseMode, mode));
+            => AddStep($"set {mode} game-side", () => Game.LocalConfig.SetValue(OsuSetting.ConfineMouseMode, mode));
 
         private void setLocalUserPlayingTo(bool playing)
             => AddStep($"local user {(playing ? "playing" : "not playing")}", () => Game.LocalUserPlaying.Value = playing);
diff --git a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
index 045246e5ed..a763544c37 100644
--- a/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
+++ b/osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Tests.NonVisual
             using (var host = new CustomTestHeadlessGameHost())
             {
                 using (var storageConfig = new StorageConfigManager(host.InitialStorage))
-                    storageConfig.Set(StorageConfig.FullPath, customPath);
+                    storageConfig.SetValue(StorageConfig.FullPath, customPath);
 
                 try
                 {
@@ -73,7 +73,7 @@ namespace osu.Game.Tests.NonVisual
             using (var host = new CustomTestHeadlessGameHost())
             {
                 using (var storageConfig = new StorageConfigManager(host.InitialStorage))
-                    storageConfig.Set(StorageConfig.FullPath, customPath);
+                    storageConfig.SetValue(StorageConfig.FullPath, customPath);
 
                 try
                 {
diff --git a/osu.Game.Tests/Visual/Background/TestSceneSeasonalBackgroundLoader.cs b/osu.Game.Tests/Visual/Background/TestSceneSeasonalBackgroundLoader.cs
index fba0d92d4b..e7cf830db0 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneSeasonalBackgroundLoader.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneSeasonalBackgroundLoader.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Tests.Visual.Background
         public void SetUp() => Schedule(() =>
         {
             // reset API response in statics to avoid test crosstalk.
-            statics.Set<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null);
+            statics.SetValue<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null);
             textureStore.PerformedLookups.Clear();
             dummyAPI.SetState(APIState.Online);
 
@@ -146,7 +146,7 @@ namespace osu.Game.Tests.Visual.Background
             });
 
         private void setSeasonalBackgroundMode(SeasonalBackgroundMode mode)
-            => AddStep($"set seasonal mode to {mode}", () => config.Set(OsuSetting.SeasonalBackgroundMode, mode));
+            => AddStep($"set seasonal mode to {mode}", () => config.SetValue(OsuSetting.SeasonalBackgroundMode, mode));
 
         private void createLoader()
             => AddStep("create loader", () =>
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
index 1c55595c97..5a1a9d3d87 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             });
 
             AddStep("show health", () => showHealth.Value = true);
-            AddStep("enable layer", () => config.Set(OsuSetting.FadePlayfieldWhenHealthLow, true));
+            AddStep("enable layer", () => config.SetValue(OsuSetting.FadePlayfieldWhenHealthLow, true));
             AddUntilStep("layer is visible", () => layer.IsPresent);
         }
 
@@ -53,7 +53,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestLayerDisabledViaConfig()
         {
-            AddStep("disable layer", () => config.Set(OsuSetting.FadePlayfieldWhenHealthLow, false));
+            AddStep("disable layer", () => config.SetValue(OsuSetting.FadePlayfieldWhenHealthLow, false));
             AddStep("set health to 0.10", () => layer.Current.Value = 0.1);
             AddUntilStep("layer is not visible", () => !layer.IsPresent);
         }
@@ -81,19 +81,19 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("set health to 0.10", () => layer.Current.Value = 0.1);
 
             AddStep("don't show health", () => showHealth.Value = false);
-            AddStep("disable FadePlayfieldWhenHealthLow", () => config.Set(OsuSetting.FadePlayfieldWhenHealthLow, false));
+            AddStep("disable FadePlayfieldWhenHealthLow", () => config.SetValue(OsuSetting.FadePlayfieldWhenHealthLow, false));
             AddUntilStep("layer fade is invisible", () => !layer.IsPresent);
 
             AddStep("don't show health", () => showHealth.Value = false);
-            AddStep("enable FadePlayfieldWhenHealthLow", () => config.Set(OsuSetting.FadePlayfieldWhenHealthLow, true));
+            AddStep("enable FadePlayfieldWhenHealthLow", () => config.SetValue(OsuSetting.FadePlayfieldWhenHealthLow, true));
             AddUntilStep("layer fade is invisible", () => !layer.IsPresent);
 
             AddStep("show health", () => showHealth.Value = true);
-            AddStep("disable FadePlayfieldWhenHealthLow", () => config.Set(OsuSetting.FadePlayfieldWhenHealthLow, false));
+            AddStep("disable FadePlayfieldWhenHealthLow", () => config.SetValue(OsuSetting.FadePlayfieldWhenHealthLow, false));
             AddUntilStep("layer fade is invisible", () => !layer.IsPresent);
 
             AddStep("show health", () => showHealth.Value = true);
-            AddStep("enable FadePlayfieldWhenHealthLow", () => config.Set(OsuSetting.FadePlayfieldWhenHealthLow, true));
+            AddStep("enable FadePlayfieldWhenHealthLow", () => config.SetValue(OsuSetting.FadePlayfieldWhenHealthLow, true));
             AddUntilStep("layer fade is visible", () => layer.IsPresent);
         }
     }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index f9914e0193..3cefb8623f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep("get original config value", () => originalConfigValue = config.Get<HUDVisibilityMode>(OsuSetting.HUDVisibilityMode));
 
-            AddStep("set hud to never show", () => config.Set(OsuSetting.HUDVisibilityMode, HUDVisibilityMode.Never));
+            AddStep("set hud to never show", () => config.SetValue(OsuSetting.HUDVisibilityMode, HUDVisibilityMode.Never));
 
             AddUntilStep("wait for fade", () => !hideTarget.IsPresent);
 
@@ -91,7 +91,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("stop trigering", () => InputManager.ReleaseKey(Key.ControlLeft));
             AddUntilStep("wait for fade", () => !hideTarget.IsPresent);
 
-            AddStep("set original config value", () => config.Set(OsuSetting.HUDVisibilityMode, originalConfigValue));
+            AddStep("set original config value", () => config.SetValue(OsuSetting.HUDVisibilityMode, originalConfigValue));
         }
 
         [Test]
@@ -120,7 +120,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep("set keycounter visible false", () =>
             {
-                config.Set<bool>(OsuSetting.KeyOverlay, false);
+                config.SetValue(OsuSetting.KeyOverlay, false);
                 hudOverlay.KeyCounter.AlwaysVisible.Value = false;
             });
 
@@ -132,7 +132,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("hidetarget is visible", () => hideTarget.IsPresent);
             AddAssert("key counters still hidden", () => !keyCounterFlow.IsPresent);
 
-            AddStep("return value", () => config.Set<bool>(OsuSetting.KeyOverlay, keyCounterVisibleValue));
+            AddStep("return value", () => config.SetValue(OsuSetting.KeyOverlay, keyCounterVisibleValue));
         }
 
         private void createNew(Action<HUDOverlay> action = null)
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardSamplePlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardSamplePlayback.cs
index 1544f8fd35..a718a98aa6 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardSamplePlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardSamplePlayback.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
-            config.Set(OsuSetting.ShowStoryboard, true);
+            config.SetValue(OsuSetting.ShowStoryboard, true);
 
             storyboard = new Storyboard();
             var backgroundLayer = storyboard.GetLayer("Background");
diff --git a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
index 96393cc4c3..6ca7707906 100644
--- a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
+++ b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Tests.Visual.Navigation
 
             // todo: this can be removed once we can run audio tracks without a device present
             // see https://github.com/ppy/osu/issues/1302
-            Game.LocalConfig.Set(OsuSetting.IntroSequence, IntroSequence.Circles);
+            Game.LocalConfig.SetValue(OsuSetting.IntroSequence, IntroSequence.Circles);
 
             Add(Game);
         }
@@ -136,7 +136,7 @@ namespace osu.Game.Tests.Visual.Navigation
                 base.LoadComplete();
                 API.Login("Rhythm Champion", "osu!");
 
-                Dependencies.Get<SessionStatics>().Set(Static.MutedAudioNotificationShownOnce, true);
+                Dependencies.Get<SessionStatics>().SetValue(Static.MutedAudioNotificationShownOnce, true);
             }
         }
 
diff --git a/osu.Game.Tests/Visual/Navigation/TestSettingsMigration.cs b/osu.Game.Tests/Visual/Navigation/TestSettingsMigration.cs
index c0b77b580e..768f2057a2 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSettingsMigration.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSettingsMigration.cs
@@ -15,8 +15,8 @@ namespace osu.Game.Tests.Visual.Navigation
 
             using (var config = new OsuConfigManager(LocalStorage))
             {
-                config.Set(OsuSetting.Version, "2020.101.0");
-                config.Set(OsuSetting.DisplayStarsMaximum, 10.0);
+                config.SetValue(OsuSetting.Version, "2020.101.0");
+                config.SetValue(OsuSetting.DisplayStarsMaximum, 10.0);
             }
         }
 
@@ -25,7 +25,7 @@ namespace osu.Game.Tests.Visual.Navigation
         {
             AddAssert("config has migrated value", () => Precision.AlmostEquals(Game.LocalConfig.Get<double>(OsuSetting.DisplayStarsMaximum), 10.1));
 
-            AddStep("set value again", () => Game.LocalConfig.Set<double>(OsuSetting.DisplayStarsMaximum, 10));
+            AddStep("set value again", () => Game.LocalConfig.SetValue(OsuSetting.DisplayStarsMaximum, 10));
 
             AddStep("force save config", () => Game.LocalConfig.Save());
 
diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 2d192ae207..057b539e44 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -207,14 +207,14 @@ namespace osu.Game.Tests.Visual.SongSelect
             addRulesetImportStep(0);
             addRulesetImportStep(0);
 
-            AddStep("change convert setting", () => config.Set(OsuSetting.ShowConvertedBeatmaps, false));
+            AddStep("change convert setting", () => config.SetValue(OsuSetting.ShowConvertedBeatmaps, false));
 
             createSongSelect();
 
             AddStep("push child screen", () => Stack.Push(new TestSceneOsuScreenStack.TestScreen("test child")));
             AddUntilStep("wait for not current", () => !songSelect.IsCurrentScreen());
 
-            AddStep("change convert setting", () => config.Set(OsuSetting.ShowConvertedBeatmaps, true));
+            AddStep("change convert setting", () => config.SetValue(OsuSetting.ShowConvertedBeatmaps, true));
 
             AddStep("return", () => songSelect.MakeCurrent());
             AddUntilStep("wait for current", () => songSelect.IsCurrentScreen());
@@ -297,13 +297,13 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddAssert("random map selected", () => songSelect.CurrentBeatmap != defaultBeatmap);
 
-            AddStep(@"Sort by Artist", () => config.Set(OsuSetting.SongSelectSortingMode, SortMode.Artist));
-            AddStep(@"Sort by Title", () => config.Set(OsuSetting.SongSelectSortingMode, SortMode.Title));
-            AddStep(@"Sort by Author", () => config.Set(OsuSetting.SongSelectSortingMode, SortMode.Author));
-            AddStep(@"Sort by DateAdded", () => config.Set(OsuSetting.SongSelectSortingMode, SortMode.DateAdded));
-            AddStep(@"Sort by BPM", () => config.Set(OsuSetting.SongSelectSortingMode, SortMode.BPM));
-            AddStep(@"Sort by Length", () => config.Set(OsuSetting.SongSelectSortingMode, SortMode.Length));
-            AddStep(@"Sort by Difficulty", () => config.Set(OsuSetting.SongSelectSortingMode, SortMode.Difficulty));
+            AddStep(@"Sort by Artist", () => config.SetValue(OsuSetting.SongSelectSortingMode, SortMode.Artist));
+            AddStep(@"Sort by Title", () => config.SetValue(OsuSetting.SongSelectSortingMode, SortMode.Title));
+            AddStep(@"Sort by Author", () => config.SetValue(OsuSetting.SongSelectSortingMode, SortMode.Author));
+            AddStep(@"Sort by DateAdded", () => config.SetValue(OsuSetting.SongSelectSortingMode, SortMode.DateAdded));
+            AddStep(@"Sort by BPM", () => config.SetValue(OsuSetting.SongSelectSortingMode, SortMode.BPM));
+            AddStep(@"Sort by Length", () => config.SetValue(OsuSetting.SongSelectSortingMode, SortMode.Length));
+            AddStep(@"Sort by Difficulty", () => config.SetValue(OsuSetting.SongSelectSortingMode, SortMode.Difficulty));
         }
 
         [Test]
@@ -470,7 +470,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             changeRuleset(0);
 
             // used for filter check below
-            AddStep("allow convert display", () => config.Set(OsuSetting.ShowConvertedBeatmaps, true));
+            AddStep("allow convert display", () => config.SetValue(OsuSetting.ShowConvertedBeatmaps, true));
 
             AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmap != null);
 
@@ -648,7 +648,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             int changeCount = 0;
 
-            AddStep("change convert setting", () => config.Set(OsuSetting.ShowConvertedBeatmaps, false));
+            AddStep("change convert setting", () => config.SetValue(OsuSetting.ShowConvertedBeatmaps, false));
             AddStep("bind beatmap changed", () =>
             {
                 Beatmap.ValueChanged += onChange;
@@ -686,7 +686,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("selection changed only fired twice", () => changeCount == 2);
 
             AddStep("unbind beatmap changed", () => Beatmap.ValueChanged -= onChange);
-            AddStep("change convert setting", () => config.Set(OsuSetting.ShowConvertedBeatmaps, true));
+            AddStep("change convert setting", () => config.SetValue(OsuSetting.ShowConvertedBeatmaps, true));
 
             // ReSharper disable once AccessToModifiedClosure
             void onChange(ValueChangedEvent<WorkingBeatmap> valueChangedEvent) => changeCount++;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
index a9747e73f9..9602758ffc 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
@@ -92,10 +92,10 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Test]
         public void TestExplicitConfig()
         {
-            AddStep("configure explicit content to allowed", () => localConfig.Set(OsuSetting.ShowOnlineExplicitContent, true));
+            AddStep("configure explicit content to allowed", () => localConfig.SetValue(OsuSetting.ShowOnlineExplicitContent, true));
             AddAssert("explicit control set to show", () => control.ExplicitContent.Value == SearchExplicit.Show);
 
-            AddStep("configure explicit content to disallowed", () => localConfig.Set(OsuSetting.ShowOnlineExplicitContent, false));
+            AddStep("configure explicit content to disallowed", () => localConfig.SetValue(OsuSetting.ShowOnlineExplicitContent, false));
             AddAssert("explicit control set to hide", () => control.ExplicitContent.Value == SearchExplicit.Hide);
         }
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOnScreenDisplay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOnScreenDisplay.cs
index 45720548c8..493e2f54e5 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOnScreenDisplay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOnScreenDisplay.cs
@@ -44,22 +44,22 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             protected override void InitialiseDefaults()
             {
-                Set(TestConfigSetting.ToggleSettingNoKeybind, false);
-                Set(TestConfigSetting.EnumSettingNoKeybind, EnumSetting.Setting1);
-                Set(TestConfigSetting.ToggleSettingWithKeybind, false);
-                Set(TestConfigSetting.EnumSettingWithKeybind, EnumSetting.Setting1);
+                SetDefault(TestConfigSetting.ToggleSettingNoKeybind, false);
+                SetDefault(TestConfigSetting.EnumSettingNoKeybind, EnumSetting.Setting1);
+                SetDefault(TestConfigSetting.ToggleSettingWithKeybind, false);
+                SetDefault(TestConfigSetting.EnumSettingWithKeybind, EnumSetting.Setting1);
 
                 base.InitialiseDefaults();
             }
 
-            public void ToggleSetting(TestConfigSetting setting) => Set(setting, !Get<bool>(setting));
+            public void ToggleSetting(TestConfigSetting setting) => SetValue(setting, !Get<bool>(setting));
 
             public void IncrementEnumSetting(TestConfigSetting setting)
             {
                 var nextValue = Get<EnumSetting>(setting) + 1;
                 if (nextValue > EnumSetting.Setting4)
                     nextValue = EnumSetting.Setting1;
-                Set(setting, nextValue);
+                SetValue(setting, nextValue);
             }
 
             public override TrackedSettings CreateTrackedSettings() => new TrackedSettings
diff --git a/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs b/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
index 567d9f0d62..46c3b8bc3b 100644
--- a/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
+++ b/osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Tournament.Tests.NonVisual
                 storage.DeleteDirectory(string.Empty);
 
                 using (var storageConfig = new TournamentStorageManager(storage))
-                    storageConfig.Set(StorageConfig.CurrentTournament, custom_tournament);
+                    storageConfig.SetValue(StorageConfig.CurrentTournament, custom_tournament);
 
                 try
                 {
diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index 2ba1b6be8f..5d9fed6288 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Tournament.IO
             moveFileIfExists("drawings.ini", destination);
 
             ChangeTargetStorage(newStorage);
-            storageConfig.Set(StorageConfig.CurrentTournament, default_tournament);
+            storageConfig.SetValue(StorageConfig.CurrentTournament, default_tournament);
             storageConfig.Save();
         }
 
diff --git a/osu.Game.Tournament/Screens/Drawings/Components/DrawingsConfigManager.cs b/osu.Game.Tournament/Screens/Drawings/Components/DrawingsConfigManager.cs
index d197c0f5d9..1a2f5a1ff4 100644
--- a/osu.Game.Tournament/Screens/Drawings/Components/DrawingsConfigManager.cs
+++ b/osu.Game.Tournament/Screens/Drawings/Components/DrawingsConfigManager.cs
@@ -12,8 +12,8 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
 
         protected override void InitialiseDefaults()
         {
-            Set(DrawingsConfig.Groups, 8, 1, 8);
-            Set(DrawingsConfig.TeamsPerGroup, 8, 1, 8);
+            SetDefault(DrawingsConfig.Groups, 8, 1, 8);
+            SetDefault(DrawingsConfig.TeamsPerGroup, 8, 1, 8);
         }
 
         public DrawingsConfigManager(Storage storage)
diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index d0fa45bb7a..387cfbb193 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -24,126 +24,126 @@ namespace osu.Game.Configuration
         protected override void InitialiseDefaults()
         {
             // UI/selection defaults
-            Set(OsuSetting.Ruleset, 0, 0, int.MaxValue);
-            Set(OsuSetting.Skin, 0, -1, int.MaxValue);
+            SetDefault(OsuSetting.Ruleset, 0, 0, int.MaxValue);
+            SetDefault(OsuSetting.Skin, 0, -1, int.MaxValue);
 
-            Set(OsuSetting.BeatmapDetailTab, PlayBeatmapDetailArea.TabType.Details);
-            Set(OsuSetting.BeatmapDetailModsFilter, false);
+            SetDefault(OsuSetting.BeatmapDetailTab, PlayBeatmapDetailArea.TabType.Details);
+            SetDefault(OsuSetting.BeatmapDetailModsFilter, false);
 
-            Set(OsuSetting.ShowConvertedBeatmaps, true);
-            Set(OsuSetting.DisplayStarsMinimum, 0.0, 0, 10, 0.1);
-            Set(OsuSetting.DisplayStarsMaximum, 10.1, 0, 10.1, 0.1);
+            SetDefault(OsuSetting.ShowConvertedBeatmaps, true);
+            SetDefault(OsuSetting.DisplayStarsMinimum, 0.0, 0, 10, 0.1);
+            SetDefault(OsuSetting.DisplayStarsMaximum, 10.1, 0, 10.1, 0.1);
 
-            Set(OsuSetting.SongSelectGroupingMode, GroupMode.All);
-            Set(OsuSetting.SongSelectSortingMode, SortMode.Title);
+            SetDefault(OsuSetting.SongSelectGroupingMode, GroupMode.All);
+            SetDefault(OsuSetting.SongSelectSortingMode, SortMode.Title);
 
-            Set(OsuSetting.RandomSelectAlgorithm, RandomSelectAlgorithm.RandomPermutation);
+            SetDefault(OsuSetting.RandomSelectAlgorithm, RandomSelectAlgorithm.RandomPermutation);
 
-            Set(OsuSetting.ChatDisplayHeight, ChatOverlay.DEFAULT_HEIGHT, 0.2f, 1f);
+            SetDefault(OsuSetting.ChatDisplayHeight, ChatOverlay.DEFAULT_HEIGHT, 0.2f, 1f);
 
             // Online settings
-            Set(OsuSetting.Username, string.Empty);
-            Set(OsuSetting.Token, string.Empty);
+            SetDefault(OsuSetting.Username, string.Empty);
+            SetDefault(OsuSetting.Token, string.Empty);
 
-            Set(OsuSetting.AutomaticallyDownloadWhenSpectating, false);
+            SetDefault(OsuSetting.AutomaticallyDownloadWhenSpectating, false);
 
-            Set(OsuSetting.SavePassword, false).ValueChanged += enabled =>
+            SetDefault(OsuSetting.SavePassword, false).ValueChanged += enabled =>
             {
-                if (enabled.NewValue) Set(OsuSetting.SaveUsername, true);
+                if (enabled.NewValue) SetValue(OsuSetting.SaveUsername, true);
             };
 
-            Set(OsuSetting.SaveUsername, true).ValueChanged += enabled =>
+            SetDefault(OsuSetting.SaveUsername, true).ValueChanged += enabled =>
             {
-                if (!enabled.NewValue) Set(OsuSetting.SavePassword, false);
+                if (!enabled.NewValue) SetValue(OsuSetting.SavePassword, false);
             };
 
-            Set(OsuSetting.ExternalLinkWarning, true);
-            Set(OsuSetting.PreferNoVideo, false);
+            SetDefault(OsuSetting.ExternalLinkWarning, true);
+            SetDefault(OsuSetting.PreferNoVideo, false);
 
-            Set(OsuSetting.ShowOnlineExplicitContent, false);
+            SetDefault(OsuSetting.ShowOnlineExplicitContent, false);
 
             // Audio
-            Set(OsuSetting.VolumeInactive, 0.25, 0, 1, 0.01);
+            SetDefault(OsuSetting.VolumeInactive, 0.25, 0, 1, 0.01);
 
-            Set(OsuSetting.MenuVoice, true);
-            Set(OsuSetting.MenuMusic, true);
+            SetDefault(OsuSetting.MenuVoice, true);
+            SetDefault(OsuSetting.MenuMusic, true);
 
-            Set(OsuSetting.AudioOffset, 0, -500.0, 500.0, 1);
+            SetDefault(OsuSetting.AudioOffset, 0, -500.0, 500.0, 1);
 
             // Input
-            Set(OsuSetting.MenuCursorSize, 1.0f, 0.5f, 2f, 0.01f);
-            Set(OsuSetting.GameplayCursorSize, 1.0f, 0.1f, 2f, 0.01f);
-            Set(OsuSetting.AutoCursorSize, false);
+            SetDefault(OsuSetting.MenuCursorSize, 1.0f, 0.5f, 2f, 0.01f);
+            SetDefault(OsuSetting.GameplayCursorSize, 1.0f, 0.1f, 2f, 0.01f);
+            SetDefault(OsuSetting.AutoCursorSize, false);
 
-            Set(OsuSetting.MouseDisableButtons, false);
-            Set(OsuSetting.MouseDisableWheel, false);
-            Set(OsuSetting.ConfineMouseMode, OsuConfineMouseMode.DuringGameplay);
+            SetDefault(OsuSetting.MouseDisableButtons, false);
+            SetDefault(OsuSetting.MouseDisableWheel, false);
+            SetDefault(OsuSetting.ConfineMouseMode, OsuConfineMouseMode.DuringGameplay);
 
             // Graphics
-            Set(OsuSetting.ShowFpsDisplay, false);
+            SetDefault(OsuSetting.ShowFpsDisplay, false);
 
-            Set(OsuSetting.ShowStoryboard, true);
-            Set(OsuSetting.BeatmapSkins, true);
-            Set(OsuSetting.BeatmapColours, true);
-            Set(OsuSetting.BeatmapHitsounds, true);
+            SetDefault(OsuSetting.ShowStoryboard, true);
+            SetDefault(OsuSetting.BeatmapSkins, true);
+            SetDefault(OsuSetting.BeatmapColours, true);
+            SetDefault(OsuSetting.BeatmapHitsounds, true);
 
-            Set(OsuSetting.CursorRotation, true);
+            SetDefault(OsuSetting.CursorRotation, true);
 
-            Set(OsuSetting.MenuParallax, true);
+            SetDefault(OsuSetting.MenuParallax, true);
 
             // Gameplay
-            Set(OsuSetting.DimLevel, 0.8, 0, 1, 0.01);
-            Set(OsuSetting.BlurLevel, 0, 0, 1, 0.01);
-            Set(OsuSetting.LightenDuringBreaks, true);
+            SetDefault(OsuSetting.DimLevel, 0.8, 0, 1, 0.01);
+            SetDefault(OsuSetting.BlurLevel, 0, 0, 1, 0.01);
+            SetDefault(OsuSetting.LightenDuringBreaks, true);
 
-            Set(OsuSetting.HitLighting, true);
+            SetDefault(OsuSetting.HitLighting, true);
 
-            Set(OsuSetting.HUDVisibilityMode, HUDVisibilityMode.Always);
-            Set(OsuSetting.ShowProgressGraph, true);
-            Set(OsuSetting.ShowHealthDisplayWhenCantFail, true);
-            Set(OsuSetting.FadePlayfieldWhenHealthLow, true);
-            Set(OsuSetting.KeyOverlay, false);
-            Set(OsuSetting.PositionalHitSounds, true);
-            Set(OsuSetting.AlwaysPlayFirstComboBreak, true);
-            Set(OsuSetting.ScoreMeter, ScoreMeterType.HitErrorBoth);
+            SetDefault(OsuSetting.HUDVisibilityMode, HUDVisibilityMode.Always);
+            SetDefault(OsuSetting.ShowProgressGraph, true);
+            SetDefault(OsuSetting.ShowHealthDisplayWhenCantFail, true);
+            SetDefault(OsuSetting.FadePlayfieldWhenHealthLow, true);
+            SetDefault(OsuSetting.KeyOverlay, false);
+            SetDefault(OsuSetting.PositionalHitSounds, true);
+            SetDefault(OsuSetting.AlwaysPlayFirstComboBreak, true);
+            SetDefault(OsuSetting.ScoreMeter, ScoreMeterType.HitErrorBoth);
 
-            Set(OsuSetting.FloatingComments, false);
+            SetDefault(OsuSetting.FloatingComments, false);
 
-            Set(OsuSetting.ScoreDisplayMode, ScoringMode.Standardised);
+            SetDefault(OsuSetting.ScoreDisplayMode, ScoringMode.Standardised);
 
-            Set(OsuSetting.IncreaseFirstObjectVisibility, true);
-            Set(OsuSetting.GameplayDisableWinKey, true);
+            SetDefault(OsuSetting.IncreaseFirstObjectVisibility, true);
+            SetDefault(OsuSetting.GameplayDisableWinKey, true);
 
             // Update
-            Set(OsuSetting.ReleaseStream, ReleaseStream.Lazer);
+            SetDefault(OsuSetting.ReleaseStream, ReleaseStream.Lazer);
 
-            Set(OsuSetting.Version, string.Empty);
+            SetDefault(OsuSetting.Version, string.Empty);
 
-            Set(OsuSetting.ScreenshotFormat, ScreenshotFormat.Jpg);
-            Set(OsuSetting.ScreenshotCaptureMenuCursor, false);
+            SetDefault(OsuSetting.ScreenshotFormat, ScreenshotFormat.Jpg);
+            SetDefault(OsuSetting.ScreenshotCaptureMenuCursor, false);
 
-            Set(OsuSetting.SongSelectRightMouseScroll, false);
+            SetDefault(OsuSetting.SongSelectRightMouseScroll, false);
 
-            Set(OsuSetting.Scaling, ScalingMode.Off);
+            SetDefault(OsuSetting.Scaling, ScalingMode.Off);
 
-            Set(OsuSetting.ScalingSizeX, 0.8f, 0.2f, 1f);
-            Set(OsuSetting.ScalingSizeY, 0.8f, 0.2f, 1f);
+            SetDefault(OsuSetting.ScalingSizeX, 0.8f, 0.2f, 1f);
+            SetDefault(OsuSetting.ScalingSizeY, 0.8f, 0.2f, 1f);
 
-            Set(OsuSetting.ScalingPositionX, 0.5f, 0f, 1f);
-            Set(OsuSetting.ScalingPositionY, 0.5f, 0f, 1f);
+            SetDefault(OsuSetting.ScalingPositionX, 0.5f, 0f, 1f);
+            SetDefault(OsuSetting.ScalingPositionY, 0.5f, 0f, 1f);
 
-            Set(OsuSetting.UIScale, 1f, 0.8f, 1.6f, 0.01f);
+            SetDefault(OsuSetting.UIScale, 1f, 0.8f, 1.6f, 0.01f);
 
-            Set(OsuSetting.UIHoldActivationDelay, 200f, 0f, 500f, 50f);
+            SetDefault(OsuSetting.UIHoldActivationDelay, 200f, 0f, 500f, 50f);
 
-            Set(OsuSetting.IntroSequence, IntroSequence.Triangles);
+            SetDefault(OsuSetting.IntroSequence, IntroSequence.Triangles);
 
-            Set(OsuSetting.MenuBackgroundSource, BackgroundSource.Skin);
-            Set(OsuSetting.SeasonalBackgroundMode, SeasonalBackgroundMode.Sometimes);
+            SetDefault(OsuSetting.MenuBackgroundSource, BackgroundSource.Skin);
+            SetDefault(OsuSetting.SeasonalBackgroundMode, SeasonalBackgroundMode.Sometimes);
 
-            Set(OsuSetting.DiscordRichPresence, DiscordRichPresenceMode.Full);
+            SetDefault(OsuSetting.DiscordRichPresence, DiscordRichPresenceMode.Full);
 
-            Set(OsuSetting.EditorWaveformOpacity, 1f);
+            SetDefault(OsuSetting.EditorWaveformOpacity, 1f);
         }
 
         public OsuConfigManager(Storage storage)
diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index fd401119ff..36eb6964dd 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.cs
@@ -14,10 +14,10 @@ namespace osu.Game.Configuration
     {
         protected override void InitialiseDefaults()
         {
-            Set(Static.LoginOverlayDisplayed, false);
-            Set(Static.MutedAudioNotificationShownOnce, false);
-            Set(Static.LastHoverSoundPlaybackTime, (double?)null);
-            Set<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null);
+            SetDefault(Static.LoginOverlayDisplayed, false);
+            SetDefault(Static.MutedAudioNotificationShownOnce, false);
+            SetDefault(Static.LastHoverSoundPlaybackTime, (double?)null);
+            SetDefault<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null);
         }
     }
 
diff --git a/osu.Game/Configuration/StorageConfigManager.cs b/osu.Game/Configuration/StorageConfigManager.cs
index 929f8f22ad..90ea42b638 100644
--- a/osu.Game/Configuration/StorageConfigManager.cs
+++ b/osu.Game/Configuration/StorageConfigManager.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Configuration
         {
             base.InitialiseDefaults();
 
-            Set(StorageConfig.FullPath, string.Empty);
+            SetDefault(StorageConfig.FullPath, string.Empty);
         }
     }
 
diff --git a/osu.Game/IO/OsuStorage.cs b/osu.Game/IO/OsuStorage.cs
index 8097f61ea4..7df5d820ee 100644
--- a/osu.Game/IO/OsuStorage.cs
+++ b/osu.Game/IO/OsuStorage.cs
@@ -58,7 +58,7 @@ namespace osu.Game.IO
         /// </summary>
         public void ResetCustomStoragePath()
         {
-            storageConfig.Set(StorageConfig.FullPath, string.Empty);
+            storageConfig.SetValue(StorageConfig.FullPath, string.Empty);
             storageConfig.Save();
 
             ChangeTargetStorage(defaultStorage);
@@ -103,7 +103,7 @@ namespace osu.Game.IO
         public override void Migrate(Storage newStorage)
         {
             base.Migrate(newStorage);
-            storageConfig.Set(StorageConfig.FullPath, newStorage.GetFullPath("."));
+            storageConfig.SetValue(StorageConfig.FullPath, newStorage.GetFullPath("."));
             storageConfig.Save();
         }
     }
diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index ede64c0340..944525c119 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -89,7 +89,7 @@ namespace osu.Game.Online.API
             thread.Start();
         }
 
-        private void onTokenChanged(ValueChangedEvent<OAuthToken> e) => config.Set(OsuSetting.Token, config.Get<bool>(OsuSetting.SavePassword) ? authentication.TokenString : string.Empty);
+        private void onTokenChanged(ValueChangedEvent<OAuthToken> e) => config.SetValue(OsuSetting.Token, config.Get<bool>(OsuSetting.SavePassword) ? authentication.TokenString : string.Empty);
 
         internal new void Schedule(Action action) => base.Schedule(action);
 
@@ -134,7 +134,7 @@ namespace osu.Game.Online.API
                         state.Value = APIState.Connecting;
 
                         // save the username at this point, if the user requested for it to be.
-                        config.Set(OsuSetting.Username, config.Get<bool>(OsuSetting.SaveUsername) ? ProvidedUsername : string.Empty);
+                        config.SetValue(OsuSetting.Username, config.Get<bool>(OsuSetting.SaveUsername) ? ProvidedUsername : string.Empty);
 
                         if (!authentication.HasValidAccessToken && !authentication.AuthenticateWithLogin(ProvidedUsername, password))
                         {
diff --git a/osu.Game/Updater/UpdateManager.cs b/osu.Game/Updater/UpdateManager.cs
index 9a0454bc95..1c72f3ebe2 100644
--- a/osu.Game/Updater/UpdateManager.cs
+++ b/osu.Game/Updater/UpdateManager.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Updater
 
             // debug / local compilations will reset to a non-release string.
             // can be useful to check when an install has transitioned between release and otherwise (see OsuConfigManager's migrations).
-            config.Set(OsuSetting.Version, version);
+            config.SetValue(OsuSetting.Version, version);
         }
 
         private readonly object updateTaskLock = new object();

From eda891223c469cdb23a07fa8faeac7331db2aa33 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 16:47:12 +0900
Subject: [PATCH 1856/3722] Start the editor with empty
 artist/creator/difficulty name fields

---
 osu.Game/Beatmaps/BeatmapManager.cs            | 3 ---
 osu.Game/Screens/Edit/Setup/MetadataSection.cs | 8 ++++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index f42fba79cb..115d1b33bb 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -113,8 +113,6 @@ namespace osu.Game.Beatmaps
         {
             var metadata = new BeatmapMetadata
             {
-                Artist = "artist",
-                Title = "title",
                 Author = user,
             };
 
@@ -128,7 +126,6 @@ namespace osu.Game.Beatmaps
                         BaseDifficulty = new BeatmapDifficulty(),
                         Ruleset = ruleset,
                         Metadata = metadata,
-                        Version = "difficulty"
                     }
                 }
             };
diff --git a/osu.Game/Screens/Edit/Setup/MetadataSection.cs b/osu.Game/Screens/Edit/Setup/MetadataSection.cs
index e812c042fb..2b10be0423 100644
--- a/osu.Game/Screens/Edit/Setup/MetadataSection.cs
+++ b/osu.Game/Screens/Edit/Setup/MetadataSection.cs
@@ -28,25 +28,25 @@ namespace osu.Game.Screens.Edit.Setup
                 },
                 artistTextBox = new LabelledTextBox
                 {
-                    Label = "Artist",
+                    PlaceholderText = "Artist",
                     Current = { Value = Beatmap.Metadata.Artist },
                     TabbableContentContainer = this
                 },
                 titleTextBox = new LabelledTextBox
                 {
-                    Label = "Title",
+                    PlaceholderText = "Title",
                     Current = { Value = Beatmap.Metadata.Title },
                     TabbableContentContainer = this
                 },
                 creatorTextBox = new LabelledTextBox
                 {
-                    Label = "Creator",
+                    PlaceholderText = "Creator",
                     Current = { Value = Beatmap.Metadata.AuthorString },
                     TabbableContentContainer = this
                 },
                 difficultyTextBox = new LabelledTextBox
                 {
-                    Label = "Difficulty Name",
+                    PlaceholderText = "Difficulty Name",
                     Current = { Value = Beatmap.BeatmapInfo.Version },
                     TabbableContentContainer = this
                 },

From 26d6f96c4e2decdba1836a98280a2ba6381c379d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 16:56:58 +0900
Subject: [PATCH 1857/3722] Fix LabelledTextBox not correctly forwarding focus
 to its underlying TextBox component

---
 osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs b/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs
index 4aeda74be8..266eb11319 100644
--- a/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs
@@ -5,6 +5,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input.Events;
 using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Graphics.UserInterfaceV2
@@ -53,6 +54,14 @@ namespace osu.Game.Graphics.UserInterfaceV2
             CornerRadius = CORNER_RADIUS,
         };
 
+        public override bool AcceptsFocus => true;
+
+        protected override void OnFocus(FocusEvent e)
+        {
+            base.OnFocus(e);
+            GetContainingInputManager().ChangeFocus(Component);
+        }
+
         protected override OsuTextBox CreateComponent() => CreateTextBox().With(t =>
         {
             t.OnCommit += (sender, newText) => OnCommit?.Invoke(sender, newText);

From 5adc675862afb015ad737db47ebda917fc24c2f2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 16:57:14 +0900
Subject: [PATCH 1858/3722] Focus artist textbox on entering song setup if
 fields are empty

---
 osu.Game/Screens/Edit/Setup/MetadataSection.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Screens/Edit/Setup/MetadataSection.cs b/osu.Game/Screens/Edit/Setup/MetadataSection.cs
index 2b10be0423..c5a2b77ab4 100644
--- a/osu.Game/Screens/Edit/Setup/MetadataSection.cs
+++ b/osu.Game/Screens/Edit/Setup/MetadataSection.cs
@@ -56,6 +56,14 @@ namespace osu.Game.Screens.Edit.Setup
                 item.OnCommit += onCommit;
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            if (string.IsNullOrEmpty(artistTextBox.Current.Value))
+                GetContainingInputManager().ChangeFocus(artistTextBox);
+        }
+
         private void onCommit(TextBox sender, bool newText)
         {
             if (!newText) return;

From 3b6a1180b68515b82a9e970f84a3e51d5f908f4e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 17:02:11 +0900
Subject: [PATCH 1859/3722] Remove non-accessed field

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

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 3a4c3491ff..0c24eb6a4d 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -74,7 +74,6 @@ namespace osu.Game.Screens.Edit
 
         private string lastSavedHash;
 
-        private Box bottomBackground;
         private Container<EditorScreen> screenContainer;
 
         private EditorScreen currentScreen;
@@ -242,7 +241,7 @@ namespace osu.Game.Screens.Edit
                         Height = 60,
                         Children = new Drawable[]
                         {
-                            bottomBackground = new Box
+                            new Box
                             {
                                 RelativeSizeAxes = Axes.Both,
                                 Colour = colours.Gray2

From d0e61e5b4d609c342e55e2b8a2ed86c66977d11e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 17:14:04 +0900
Subject: [PATCH 1860/3722] Put back the label

---
 osu.Game/Screens/Edit/Setup/MetadataSection.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Setup/MetadataSection.cs b/osu.Game/Screens/Edit/Setup/MetadataSection.cs
index c5a2b77ab4..f429164ece 100644
--- a/osu.Game/Screens/Edit/Setup/MetadataSection.cs
+++ b/osu.Game/Screens/Edit/Setup/MetadataSection.cs
@@ -28,25 +28,25 @@ namespace osu.Game.Screens.Edit.Setup
                 },
                 artistTextBox = new LabelledTextBox
                 {
-                    PlaceholderText = "Artist",
+                    Label = "Artist",
                     Current = { Value = Beatmap.Metadata.Artist },
                     TabbableContentContainer = this
                 },
                 titleTextBox = new LabelledTextBox
                 {
-                    PlaceholderText = "Title",
+                    Label = "Title",
                     Current = { Value = Beatmap.Metadata.Title },
                     TabbableContentContainer = this
                 },
                 creatorTextBox = new LabelledTextBox
                 {
-                    PlaceholderText = "Creator",
+                    Label = "Creator",
                     Current = { Value = Beatmap.Metadata.AuthorString },
                     TabbableContentContainer = this
                 },
                 difficultyTextBox = new LabelledTextBox
                 {
-                    PlaceholderText = "Difficulty Name",
+                    Label = "Difficulty Name",
                     Current = { Value = Beatmap.BeatmapInfo.Version },
                     TabbableContentContainer = this
                 },

From a1a0074c3203e4f259fde9f87f9516acca239cf2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 18:05:11 +0900
Subject: [PATCH 1861/3722] Revert "Local framework"

This reverts commit b9b095ee75c960287a8636d06c07afddade6865f.
---
 osu.Desktop.slnf         |  6 ++----
 osu.Game/osu.Game.csproj |  4 +---
 osu.iOS.props            |  4 ++--
 osu.sln                  | 42 ----------------------------------------
 4 files changed, 5 insertions(+), 51 deletions(-)

diff --git a/osu.Desktop.slnf b/osu.Desktop.slnf
index 1e41d0af0e..d2c14d321a 100644
--- a/osu.Desktop.slnf
+++ b/osu.Desktop.slnf
@@ -15,9 +15,7 @@
       "osu.Game.Tests\\osu.Game.Tests.csproj",
       "osu.Game.Tournament.Tests\\osu.Game.Tournament.Tests.csproj",
       "osu.Game.Tournament\\osu.Game.Tournament.csproj",
-      "osu.Game\\osu.Game.csproj",
-      "../osu-framework/osu.Framework/osu.Framework.csproj",
-      "../osu-framework/osu.Framework/osu.Framework.NativeLibs.csproj"
+      "osu.Game\\osu.Game.csproj"
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index f2fc1726cd..90c8b98f42 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,13 +29,11 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.309.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.0.7" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\osu-framework\osu.Framework\osu.Framework.csproj" />
-  </ItemGroup>
 </Project>
diff --git a/osu.iOS.props b/osu.iOS.props
index 30df8c423e..ccd33bf88c 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <ProjectReference Include="../../osu-framework/osu.Framework.iOS/osu.Framework.iOS.csproj" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.309.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <ProjectReference Include="../../osu-framework/osu.Framework/osu.Framework.csproj" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.309.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />
diff --git a/osu.sln b/osu.sln
index 4d0b3656e7..c9453359b1 100644
--- a/osu.sln
+++ b/osu.sln
@@ -66,12 +66,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Game.Benchmarks", "osu.Game.Benchmarks\osu.Game.Benchmarks.csproj", "{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Framework", "..\osu-framework\osu.Framework\osu.Framework.csproj", "{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Framework.iOS", "..\osu-framework\osu.Framework.iOS\osu.Framework.iOS.csproj", "{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Framework.NativeLibs", "..\osu-framework\osu.Framework.NativeLibs\osu.Framework.NativeLibs.csproj", "{500039B3-0706-40C3-B6E7-1FD9187644A5}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -418,42 +412,6 @@ Global
 		{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}.Release|iPhone.Build.0 = Release|Any CPU
 		{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Release|iPhone.Build.0 = Release|Any CPU
-		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{7EBA330C-6DD9-4F30-9332-6542D86D5BE1}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Release|iPhone.Build.0 = Release|Any CPU
-		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{7A6EEFF0-760C-4EE5-BB5E-101E7D013392}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Release|iPhone.Build.0 = Release|Any CPU
-		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{500039B3-0706-40C3-B6E7-1FD9187644A5}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

From 577d40d8d155daf4af76278b7dce81df355eef59 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 18:05:18 +0900
Subject: [PATCH 1862/3722] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 5b700224db..e0392bd687 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.309.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.317.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index fa1b0a95c3..360c522193 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="5.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.309.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.317.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.0.7" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 71fcdd45f3..b763a91dfb 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.309.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.317.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -91,7 +91,7 @@
     <PackageReference Include="DiffPlex" Version="1.6.3" />
     <PackageReference Include="Humanizer" Version="2.8.26" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.309.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.317.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 79041c1c4b7a386781a4c01cd2d56a1e74f601eb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 18:07:42 +0900
Subject: [PATCH 1863/3722] Remove osuTK reference

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

diff --git a/osu.Desktop/Program.cs b/osu.Desktop/Program.cs
index 0c527ba881..d06c4b6746 100644
--- a/osu.Desktop/Program.cs
+++ b/osu.Desktop/Program.cs
@@ -22,7 +22,6 @@ namespace osu.Desktop
         {
             // Back up the cwd before DesktopGameHost changes it
             var cwd = Environment.CurrentDirectory;
-            bool useOsuTK = args.Contains("--tk");
 
             using (DesktopGameHost host = Host.GetSuitableHost(@"osu", true))
             {

From fccd495f27e3955f33b4a2f3fd5258fffd7b5faa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 18:07:51 +0900
Subject: [PATCH 1864/3722] Remove obsoleted setting for now

---
 osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
index 036c4edfba..fb908a7669 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
@@ -53,11 +53,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                     LabelText = "Cursor sensitivity",
                     Current = localSensitivity
                 },
-                new SettingsCheckbox
-                {
-                    LabelText = "Map absolute input to window",
-                    Current = config.GetBindable<bool>(FrameworkSetting.MapAbsoluteInputToWindow)
-                },
                 confineMouseModeSetting = new SettingsEnumDropdown<OsuConfineMouseMode>
                 {
                     LabelText = "Confine mouse cursor to window",

From 4bf57ad86080133e9d437a0079eb3255c8e9c789 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 18:24:24 +0900
Subject: [PATCH 1865/3722] Remove remaining reference to obsolete value

---
 osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
index 6ca7707906..bf5338d81a 100644
--- a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
+++ b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Platform;
@@ -62,10 +61,6 @@ namespace osu.Game.Tests.Visual.Navigation
 
                 RecycleLocalStorage();
 
-                // see MouseSettings
-                var frameworkConfig = host.Dependencies.Get<FrameworkConfigManager>();
-                frameworkConfig.GetBindable<double>(FrameworkSetting.CursorSensitivity).Disabled = false;
-
                 CreateGame();
             });
 

From 8046b5a818f8d2a69d7199e6cff6fa2a1db024d8 Mon Sep 17 00:00:00 2001
From: Nathan Alo <n20gaming2000@gmail.com>
Date: Wed, 17 Mar 2021 17:35:49 +0800
Subject: [PATCH 1866/3722] set text to platform clipboard on copy

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

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 0ba202b082..88383bd3ed 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -21,6 +21,7 @@ using osu.Framework.Screens;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
+using osu.Game.Extensions;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Graphics.UserInterface;
@@ -29,6 +30,7 @@ using osu.Game.IO.Serialization;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Screens.Edit.Components;
 using osu.Game.Screens.Edit.Components.Menus;
 using osu.Game.Screens.Edit.Components.Timelines.Summary;
@@ -60,6 +62,9 @@ namespace osu.Game.Screens.Edit
 
         protected bool HasUnsavedChanges => lastSavedHash != changeHandler.CurrentStateHash;
 
+        [Resolved]
+        private GameHost host { get; set; }
+
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
 
@@ -104,7 +109,7 @@ namespace osu.Game.Screens.Edit
         private MusicController music { get; set; }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, GameHost host, OsuConfigManager config)
+        private void load(OsuColour colours, OsuConfigManager config)
         {
             if (Beatmap.Value is DummyWorkingBeatmap)
             {
@@ -542,8 +547,12 @@ namespace osu.Game.Screens.Edit
         protected void Copy()
         {
             if (editorBeatmap.SelectedHitObjects.Count == 0)
+            {
+                host.GetClipboard()?.SetText($"{clock.CurrentTime.ToEditorFormattedString()} - ");
                 return;
+            }
 
+            host.GetClipboard()?.SetText($"{editorBeatmap.SelectedHitObjects.FirstOrDefault().StartTime.ToEditorFormattedString()} ({string.Join(',', editorBeatmap.SelectedHitObjects.Select(h => ((h as IHasComboInformation)?.IndexInCurrentCombo + 1 ?? 0).ToString()))}) - ");
             clipboard.Value = new ClipboardContent(editorBeatmap).Serialize();
         }
 

From f7ec79c5f42cd90f3201ae8855bc4d53fc5594fc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 17 Mar 2021 19:02:25 +0900
Subject: [PATCH 1867/3722] Fix incorrect generic type

---
 osu.Game.Tests/Visual/Navigation/TestSettingsMigration.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSettingsMigration.cs b/osu.Game.Tests/Visual/Navigation/TestSettingsMigration.cs
index 768f2057a2..c1c968e862 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSettingsMigration.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSettingsMigration.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Tests.Visual.Navigation
         {
             AddAssert("config has migrated value", () => Precision.AlmostEquals(Game.LocalConfig.Get<double>(OsuSetting.DisplayStarsMaximum), 10.1));
 
-            AddStep("set value again", () => Game.LocalConfig.SetValue(OsuSetting.DisplayStarsMaximum, 10));
+            AddStep("set value again", () => Game.LocalConfig.SetValue(OsuSetting.DisplayStarsMaximum, 10.0));
 
             AddStep("force save config", () => Game.LocalConfig.Save());
 

From 133ff085a53711229834c0c3b3944f1c29d91b73 Mon Sep 17 00:00:00 2001
From: Nathan Alo <n20gaming2000@gmail.com>
Date: Wed, 17 Mar 2021 18:06:40 +0800
Subject: [PATCH 1868/3722] refactor code

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

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 88383bd3ed..fdb31a8b8c 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Text;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -546,14 +547,24 @@ namespace osu.Game.Screens.Edit
 
         protected void Copy()
         {
+            var builder = new StringBuilder();
+            const string suffix = " - ";
+
             if (editorBeatmap.SelectedHitObjects.Count == 0)
             {
-                host.GetClipboard()?.SetText($"{clock.CurrentTime.ToEditorFormattedString()} - ");
-                return;
+                builder.Append(clock.CurrentTime.ToEditorFormattedString());
+            }
+            else
+            {
+                var orderedHitObjects = editorBeatmap.SelectedHitObjects.OrderBy(h => h.StartTime);
+                builder.Append(orderedHitObjects.FirstOrDefault().StartTime.ToEditorFormattedString());
+                builder.Append($" ({string.Join(',', orderedHitObjects.Cast<IHasComboInformation>().Select(h => h.IndexInCurrentCombo + 1))})");
+
+                clipboard.Value = new ClipboardContent(editorBeatmap).Serialize();
             }
 
-            host.GetClipboard()?.SetText($"{editorBeatmap.SelectedHitObjects.FirstOrDefault().StartTime.ToEditorFormattedString()} ({string.Join(',', editorBeatmap.SelectedHitObjects.Select(h => ((h as IHasComboInformation)?.IndexInCurrentCombo + 1 ?? 0).ToString()))}) - ");
-            clipboard.Value = new ClipboardContent(editorBeatmap).Serialize();
+            builder.Append(suffix);
+            host.GetClipboard()?.SetText(builder.ToString());
         }
 
         protected void Paste()

From e59b8b4ce66a6b30057add268d1620d5af8be231 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 17 Mar 2021 19:07:29 +0900
Subject: [PATCH 1869/3722] Fix test checking nullable string

---
 .../Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
index 2f558a6379..591095252f 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Tests.Visual.Ranking
             }));
 
             AddAssert("mapped by text not present", () =>
-                this.ChildrenOfType<OsuSpriteText>().All(spriteText => !containsAny(spriteText.Current.Value, "mapped", "by")));
+                this.ChildrenOfType<OsuSpriteText>().All(spriteText => !containsAny(spriteText.Text.ToString(), "mapped", "by")));
         }
 
         private void showPanel(ScoreInfo score) => Child = new ExpandedPanelMiddleContentContainer(score);

From 51e0304c54a604bab6d6c8007c59ec755b115b2d Mon Sep 17 00:00:00 2001
From: Nathan Alo <n20gaming2000@gmail.com>
Date: Wed, 17 Mar 2021 18:31:09 +0800
Subject: [PATCH 1870/3722] properly format strings per ruleset

---
 osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs | 2 ++
 osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs | 2 ++
 osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs     | 2 ++
 osu.Game/Rulesets/Objects/HitObject.cs            | 2 ++
 osu.Game/Screens/Edit/Editor.cs                   | 2 +-
 5 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index ae45182960..631b50d686 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -120,5 +120,7 @@ namespace osu.Game.Rulesets.Catch.Objects
         }
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
+
+        public override string ToEditorString() => (IndexInCurrentCombo + 1).ToString();
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs b/osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs
index 27bf50493d..c43d223335 100644
--- a/osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs
+++ b/osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs
@@ -22,6 +22,8 @@ namespace osu.Game.Rulesets.Mania.Objects
 
         protected override HitWindows CreateHitWindows() => new ManiaHitWindows();
 
+        public override string ToEditorString() => $"{StartTime}|{Column}";
+
         #region LegacyBeatmapEncoder
 
         float IHasXPosition.X => Column;
diff --git a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
index 22b64af3df..e784d13084 100644
--- a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
@@ -130,5 +130,7 @@ namespace osu.Game.Rulesets.Osu.Objects
         }
 
         protected override HitWindows CreateHitWindows() => new OsuHitWindows();
+
+        public override string ToEditorString() => (IndexInCurrentCombo + 1).ToString();
     }
 }
diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index 826d411822..fa7b2811cc 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -168,6 +168,8 @@ namespace osu.Game.Rulesets.Objects
         /// </summary>
         [NotNull]
         protected virtual HitWindows CreateHitWindows() => new HitWindows();
+
+        public virtual string ToEditorString() => string.Empty;
     }
 
     public static class HitObjectExtensions
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index fdb31a8b8c..a6e84d59a7 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -558,7 +558,7 @@ namespace osu.Game.Screens.Edit
             {
                 var orderedHitObjects = editorBeatmap.SelectedHitObjects.OrderBy(h => h.StartTime);
                 builder.Append(orderedHitObjects.FirstOrDefault().StartTime.ToEditorFormattedString());
-                builder.Append($" ({string.Join(',', orderedHitObjects.Cast<IHasComboInformation>().Select(h => h.IndexInCurrentCombo + 1))})");
+                builder.Append($" ({string.Join(',', orderedHitObjects.Select(h => h.ToEditorString()))})");
 
                 clipboard.Value = new ClipboardContent(editorBeatmap).Serialize();
             }

From 3bfde7341f25b9fb06213426fed89a9e5accda0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 17 Mar 2021 17:14:53 +0100
Subject: [PATCH 1871/3722] Revert "Remove unnecessary overrides"

This reverts commit f4e508b57051e887a00a8f4649e4616b762a8c8c.
---
 osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs             | 2 ++
 osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs b/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
index 1b5d576c1e..69b81d6d5c 100644
--- a/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/UI/DefaultHitExplosion.cs
@@ -21,6 +21,8 @@ namespace osu.Game.Rulesets.Mania.UI
     {
         private const float default_large_faint_size = 0.8f;
 
+        public override bool RemoveWhenNotAlive => true;
+
         [Resolved]
         private Column column { get; set; }
 
diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs
index bef9279bac..aad9f53b93 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs
@@ -13,6 +13,8 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
 {
     public class LegacyHitExplosion : CompositeDrawable, IAnimatableHitExplosion
     {
+        public override bool RemoveWhenNotAlive => false;
+
         private readonly Drawable sprite;
 
         [CanBeNull]

From f1e66cc420ce69e133f08068fdc2c1affd3e02cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 17 Mar 2021 18:37:11 +0100
Subject: [PATCH 1872/3722] Adjust test namespace

---
 osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
index a824696022..aafd0ee32b 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
@@ -7,7 +7,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Screens.Edit.Components;
 using osuTK;
 
-namespace osu.Game.Tests.Visual.Editor
+namespace osu.Game.Tests.Visual.Editing
 {
     [TestFixture]
     public class TestSceneEditorClock : EditorClockTestScene

From 3b55eeb416c01f1f2ba5d2fa0a8ce0d7a25d6bd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 17 Mar 2021 18:39:48 +0100
Subject: [PATCH 1873/3722] Fix test failure by setting beatmap

Post-merge, it was failing because somewhere along the way
`EditorClockTestScene` started expecting inheritors to set the beatmap
themselves explicitly in BDL.
---
 osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
index aafd0ee32b..63d7dbc2b5 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
@@ -2,8 +2,10 @@
 // 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.Containers;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Edit.Components;
 using osuTK;
 
@@ -35,6 +37,12 @@ namespace osu.Game.Tests.Visual.Editing
             });
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Beatmap.Value = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
+        }
+
         [Test]
         public void TestStopAtTrackEnd()
         {

From 21e18c9f6eae256c894ec81ff00dc529dc7762fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 17 Mar 2021 18:44:21 +0100
Subject: [PATCH 1874/3722] Fix test hangs in browser due to changing tracks
 via music controller

---
 osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
index 63d7dbc2b5..58375f295b 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
@@ -41,6 +41,9 @@ namespace osu.Game.Tests.Visual.Editing
         private void load()
         {
             Beatmap.Value = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
+            // ensure that music controller does not change this beatmap due to it
+            // completing naturally as part of the test.
+            Beatmap.Disabled = true;
         }
 
         [Test]

From 6cea74f0fada8f90bf27e3005cccd2ca5dc42706 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Wed, 17 Mar 2021 13:13:13 -0700
Subject: [PATCH 1875/3722] Remove available kudosu section from user profile
 overlay in line with web

---
 .../Profile/Sections/Kudosu/KudosuInfo.cs     | 34 ++-----------------
 1 file changed, 3 insertions(+), 31 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs b/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
index d4d0976724..e5b4193f3b 100644
--- a/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
+++ b/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
@@ -23,44 +23,17 @@ namespace osu.Game.Overlays.Profile.Sections.Kudosu
         {
             this.user.BindTo(user);
             CountSection total;
-            CountSection avaliable;
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
             Masking = true;
             CornerRadius = 3;
-            Children = new Drawable[]
-            {
-                new FillFlowContainer
-                {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Direction = FillDirection.Horizontal,
-                    Spacing = new Vector2(5, 0),
-                    Children = new[]
-                    {
-                        total = new CountTotal(),
-                        avaliable = new CountAvailable()
-                    }
-                }
-            };
-            this.user.ValueChanged += u =>
-            {
-                total.Count = u.NewValue?.Kudosu.Total ?? 0;
-                avaliable.Count = u.NewValue?.Kudosu.Available ?? 0;
-            };
+            Child = total = new CountTotal();
+
+            this.user.ValueChanged += u => total.Count = u.NewValue?.Kudosu.Total ?? 0;
         }
 
         protected override bool OnClick(ClickEvent e) => true;
 
-        private class CountAvailable : CountSection
-        {
-            public CountAvailable()
-                : base("Kudosu Avaliable")
-            {
-                DescriptionText.Text = "Kudosu can be traded for kudosu stars, which will help your beatmap get more attention. This is the number of kudosu you haven't traded in yet.";
-            }
-        }
-
         private class CountTotal : CountSection
         {
             public CountTotal()
@@ -86,7 +59,6 @@ namespace osu.Game.Overlays.Profile.Sections.Kudosu
             public CountSection(string header)
             {
                 RelativeSizeAxes = Axes.X;
-                Width = 0.5f;
                 AutoSizeAxes = Axes.Y;
                 Padding = new MarginPadding { Top = 10, Bottom = 20 };
                 Child = new FillFlowContainer

From 599c55fca5d08f0f2a30cde6be78273b6ad24404 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Wed, 17 Mar 2021 13:14:18 -0700
Subject: [PATCH 1876/3722] Update total kudosu earned description text in line
 with web

---
 osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs b/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
index e5b4193f3b..87622939e2 100644
--- a/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
+++ b/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Overlays.Profile.Sections.Kudosu
                 : base("Total Kudosu Earned")
             {
                 DescriptionText.AddText("Based on how much of a contribution the user has made to beatmap moderation. See ");
-                DescriptionText.AddLink("this link", "https://osu.ppy.sh/wiki/Kudosu");
+                DescriptionText.AddLink("this page", "https://osu.ppy.sh/wiki/Kudosu");
                 DescriptionText.AddText(" for more information.");
             }
         }

From 2e63c2ce20ef4c707150f2eaf3c5a640a9c963c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 17 Mar 2021 21:50:45 +0100
Subject: [PATCH 1877/3722] Fix selection box operation hotkeys not registering
 in change handler

Could lead to crashes after reversing a note cluster and playing it
back.

The root cause of the crash was that the hotkey operations were not ran
inside of an editor change handler operation. This, in turn, caused the
autoplay replay to not be regenerated after flipping an object cluster,
therefore finally manifesting as a hard crash due to negative time
offsets appearing in judgement results, which interfered with the
default implementation of note lock.

Note that this incidentally also fixes the fact that selection box
hotkey operations (reverse and flip) did not handle undo/redo.
---
 .../Edit/Compose/Components/SelectionBox.cs       | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index 2f4721f63e..9d6b44e207 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -113,16 +113,25 @@ 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 && OnReverse?.Invoke() == true;
+                    return CanReverse && runOperationFromHotkey(OnReverse);
 
                 case Key.H:
-                    return CanScaleX && OnFlip?.Invoke(Direction.Horizontal) == true;
+                    return CanScaleX && runOperationFromHotkey(() => OnFlip?.Invoke(Direction.Horizontal) ?? false);
 
                 case Key.J:
-                    return CanScaleY && OnFlip?.Invoke(Direction.Vertical) == true;
+                    return CanScaleY && runOperationFromHotkey(() => OnFlip?.Invoke(Direction.Vertical) ?? false);
             }
 
             return base.OnKeyDown(e);

From 08ffe425f9b9a1cd9eba6c3cd903264680244090 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Wed, 17 Mar 2021 14:46:23 -0700
Subject: [PATCH 1878/3722] Update kudosu description color in line with web

---
 osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs b/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
index 87622939e2..115d705766 100644
--- a/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
+++ b/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
@@ -103,7 +103,6 @@ namespace osu.Game.Overlays.Profile.Sections.Kudosu
             private void load(OverlayColourProvider colourProvider)
             {
                 lineBackground.Colour = colourProvider.Highlight1;
-                DescriptionText.Colour = colourProvider.Foreground1;
             }
         }
     }

From f95ce90c95495691e1d7c57e10a8c456ffbfc82c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 17 Mar 2021 23:32:08 +0100
Subject: [PATCH 1879/3722] Adjust kudosu count formatting

---
 osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs b/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
index 115d705766..cdb24b784c 100644
--- a/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
+++ b/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Overlays.Profile.Sections.Kudosu
 
             public new int Count
             {
-                set => valueText.Text = value.ToString();
+                set => valueText.Text = value.ToString("N0");
             }
 
             public CountSection(string header)

From df6570ebf544dd6157e14376055ec271fd9c132c Mon Sep 17 00:00:00 2001
From: voidedWarranties <wz68.scratch@gmail.com>
Date: Wed, 17 Mar 2021 15:31:16 -0700
Subject: [PATCH 1880/3722] Improve logic and add previously failing test
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>
---
 .../Visual/Editing/TestSceneEditorClock.cs    | 35 ++++++++++++++-----
 osu.Game/Screens/Edit/EditorClock.cs          | 26 +++++++-------
 2 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
index 58375f295b..390198be04 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
@@ -49,14 +49,33 @@ namespace osu.Game.Tests.Visual.Editing
         [Test]
         public void TestStopAtTrackEnd()
         {
-            AddStep("Reset clock", () => Clock.Seek(0));
-            AddStep("Start clock", Clock.Start);
-            AddAssert("Clock running", () => Clock.IsRunning);
-            AddStep("Seek near end", () => Clock.Seek(Clock.TrackLength - 250));
-            AddUntilStep("Clock stops", () => !Clock.IsRunning);
-            AddAssert("Clock stopped at end", () => Clock.CurrentTime == Clock.TrackLength);
-            AddStep("Start clock again", Clock.Start);
-            AddAssert("Clock looped to start", () => Clock.IsRunning && Clock.CurrentTime < 500);
+            AddStep("reset clock", () => Clock.Seek(0));
+
+            AddStep("start clock", Clock.Start);
+            AddAssert("clock running", () => Clock.IsRunning);
+
+            AddStep("seek near end", () => Clock.Seek(Clock.TrackLength - 250));
+            AddUntilStep("clock stops", () => !Clock.IsRunning);
+
+            AddAssert("clock stopped at end", () => Clock.CurrentTime == Clock.TrackLength);
+
+            AddStep("start clock again", Clock.Start);
+            AddAssert("clock looped to start", () => Clock.IsRunning && Clock.CurrentTime < 500);
+        }
+
+        [Test]
+        public void TestWrapWhenStoppedAtTrackEnd()
+        {
+            AddStep("reset clock", () => Clock.Seek(0));
+
+            AddStep("stop clock", Clock.Stop);
+            AddAssert("clock stopped", () => !Clock.IsRunning);
+
+            AddStep("seek exactly to end", () => Clock.Seek(Clock.TrackLength));
+            AddAssert("clock stopped at end", () => Clock.CurrentTime == Clock.TrackLength);
+
+            AddStep("start clock again", Clock.Start);
+            AddAssert("clock looped to start", () => Clock.IsRunning && Clock.CurrentTime < 500);
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index 94bb4f5228..e227bd29bf 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -172,6 +172,10 @@ namespace osu.Game.Screens.Edit
         public void Start()
         {
             ClearTransforms();
+
+            if (playbackFinished)
+                underlyingClock.Seek(0);
+
             underlyingClock.Start();
         }
 
@@ -222,21 +226,15 @@ namespace osu.Game.Screens.Edit
         {
             underlyingClock.ProcessFrame();
 
-            if (IsRunning)
-            {
-                var playbackAlreadyStopped = playbackFinished;
-                playbackFinished = CurrentTime >= TrackLength;
+            var playbackAlreadyStopped = playbackFinished;
+            playbackFinished = CurrentTime >= TrackLength;
 
-                if (playbackFinished)
-                {
-                    if (!playbackAlreadyStopped)
-                    {
-                        underlyingClock.Stop();
-                        underlyingClock.Seek(TrackLength);
-                    }
-                    else
-                        underlyingClock.Seek(0);
-                }
+            if (playbackFinished && !playbackAlreadyStopped)
+            {
+                if (IsRunning)
+                    underlyingClock.Stop();
+
+                underlyingClock.Seek(TrackLength);
             }
         }
 

From bb3c3f302aa4b0cd2f0e5e8a9d80235fc7d810fd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Mar 2021 15:36:07 +0900
Subject: [PATCH 1881/3722] Fix skin parser not stripping whitespace before
 parsing

---
 osu.Game.Tests/Resources/skin-with-space.ini  | 2 ++
 osu.Game.Tests/Skins/LegacySkinDecoderTest.cs | 9 +++++++++
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs    | 2 ++
 3 files changed, 13 insertions(+)
 create mode 100644 osu.Game.Tests/Resources/skin-with-space.ini

diff --git a/osu.Game.Tests/Resources/skin-with-space.ini b/osu.Game.Tests/Resources/skin-with-space.ini
new file mode 100644
index 0000000000..3e64257a3e
--- /dev/null
+++ b/osu.Game.Tests/Resources/skin-with-space.ini
@@ -0,0 +1,2 @@
+[General] 
+Version: 2
\ No newline at end of file
diff --git a/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs b/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs
index aedf26ee75..dcb866c99f 100644
--- a/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs
+++ b/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs
@@ -91,6 +91,15 @@ namespace osu.Game.Tests.Skins
                 Assert.AreEqual(2.0m, decoder.Decode(stream).LegacyVersion);
         }
 
+        [Test]
+        public void TestStripWhitespace()
+        {
+            var decoder = new LegacySkinDecoder();
+            using (var resStream = TestResources.OpenResource("skin-with-space.ini"))
+            using (var stream = new LineBufferedReader(resStream))
+                Assert.AreEqual(2.0m, decoder.Decode(stream).LegacyVersion);
+        }
+
         [Test]
         public void TestDecodeLatestVersion()
         {
diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index 2fb24c24e0..bd1b6627b4 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -36,6 +36,8 @@ namespace osu.Game.Beatmaps.Formats
                 if (ShouldSkipLine(line))
                     continue;
 
+                line = line.Trim();
+
                 if (line.StartsWith('[') && line.EndsWith(']'))
                 {
                     if (!Enum.TryParse(line[1..^1], out section))

From 5b0d75ee56690dbb3a121d741768515417f51ee8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Mar 2021 16:30:30 +0900
Subject: [PATCH 1882/3722] Only trim trailing spaces to avoid breakage in
 storyboard parsing

---
 osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs  | 14 ++++++--------
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs         |  4 +---
 .../Beatmaps/Formats/LegacyStoryboardDecoder.cs    |  2 --
 osu.Game/Skinning/LegacyManiaSkinDecoder.cs        |  2 --
 4 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 99dffa7041..40bc75e847 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -67,16 +67,14 @@ namespace osu.Game.Beatmaps.Formats
 
         protected override void ParseLine(Beatmap beatmap, Section section, string line)
         {
-            var strippedLine = StripComments(line);
-
             switch (section)
             {
                 case Section.General:
-                    handleGeneral(strippedLine);
+                    handleGeneral(line);
                     return;
 
                 case Section.Editor:
-                    handleEditor(strippedLine);
+                    handleEditor(line);
                     return;
 
                 case Section.Metadata:
@@ -84,19 +82,19 @@ namespace osu.Game.Beatmaps.Formats
                     return;
 
                 case Section.Difficulty:
-                    handleDifficulty(strippedLine);
+                    handleDifficulty(line);
                     return;
 
                 case Section.Events:
-                    handleEvent(strippedLine);
+                    handleEvent(line);
                     return;
 
                 case Section.TimingPoints:
-                    handleTimingPoint(strippedLine);
+                    handleTimingPoint(line);
                     return;
 
                 case Section.HitObjects:
-                    handleHitObject(strippedLine);
+                    handleHitObject(line);
                     return;
             }
 
diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index bd1b6627b4..10a716963e 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Beatmaps.Formats
                 if (ShouldSkipLine(line))
                     continue;
 
-                line = line.Trim();
+                line = StripComments(line).TrimEnd();
 
                 if (line.StartsWith('[') && line.EndsWith(']'))
                 {
@@ -73,8 +73,6 @@ namespace osu.Game.Beatmaps.Formats
 
         protected virtual void ParseLine(T output, Section section, string line)
         {
-            line = StripComments(line);
-
             switch (section)
             {
                 case Section.Colours:
diff --git a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
index b9bf6823b5..6301c42deb 100644
--- a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
@@ -45,8 +45,6 @@ namespace osu.Game.Beatmaps.Formats
 
         protected override void ParseLine(Storyboard storyboard, Section section, string line)
         {
-            line = StripComments(line);
-
             switch (section)
             {
                 case Section.General:
diff --git a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
index 0a1de461ea..5308640bdd 100644
--- a/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinDecoder.cs
@@ -31,8 +31,6 @@ namespace osu.Game.Skinning
 
         protected override void ParseLine(List<LegacyManiaSkinConfiguration> output, Section section, string line)
         {
-            line = StripComments(line);
-
             switch (section)
             {
                 case Section.Mania:

From b68dc686ee9bf7c978fd746248403a6decbf18a4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 18 Mar 2021 19:19:53 +0900
Subject: [PATCH 1883/3722] Fix converted mania scores not accounting for
 GREATs

---
 osu.Game/Scoring/ScoreManager.cs | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 1e90ee1ac7..5fa971ce80 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -20,6 +20,7 @@ using osu.Game.IO.Archives;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring.Legacy;
 
@@ -157,9 +158,19 @@ namespace osu.Game.Scoring
                 }
 
                 int beatmapMaxCombo;
+                double accuracy = score.Accuracy;
 
                 if (score.IsLegacyScore)
                 {
+                    if (score.RulesetID == 3)
+                    {
+                        // Recalculate mania's accuracy based on hit statistics.
+                        double maxBaseScore = score.Statistics.Select(kvp => kvp.Value).Sum() * Judgement.ToNumericResult(HitResult.Perfect);
+                        double baseScore = score.Statistics.Select(kvp => Judgement.ToNumericResult(kvp.Key) * kvp.Value).Sum();
+                        if (maxBaseScore > 0)
+                            accuracy = baseScore / maxBaseScore;
+                    }
+
                     // This score is guaranteed to be an osu!stable score.
                     // The combo must be determined through either the beatmap's max combo value or the difficulty calculator, as lazer's scoring has changed and the score statistics cannot be used.
                     if (score.Beatmap.MaxCombo == null)
@@ -176,7 +187,7 @@ namespace osu.Game.Scoring
                         difficultyBindable.BindValueChanged(d =>
                         {
                             if (d.NewValue is StarDifficulty diff)
-                                updateScore(diff.MaxCombo);
+                                updateScore(diff.MaxCombo, accuracy);
                         }, true);
 
                         return;
@@ -191,10 +202,10 @@ namespace osu.Game.Scoring
                     beatmapMaxCombo = Enum.GetValues(typeof(HitResult)).OfType<HitResult>().Where(r => r.AffectsCombo()).Select(r => score.Statistics.GetOrDefault(r)).Sum();
                 }
 
-                updateScore(beatmapMaxCombo);
+                updateScore(beatmapMaxCombo, accuracy);
             }
 
-            private void updateScore(int beatmapMaxCombo)
+            private void updateScore(int beatmapMaxCombo, double accuracy)
             {
                 if (beatmapMaxCombo == 0)
                 {
@@ -207,7 +218,7 @@ namespace osu.Game.Scoring
 
                 scoreProcessor.Mods.Value = score.Mods;
 
-                Value = (long)Math.Round(scoreProcessor.GetScore(ScoringMode.Value, beatmapMaxCombo, score.Accuracy, (double)score.MaxCombo / beatmapMaxCombo, score.Statistics));
+                Value = (long)Math.Round(scoreProcessor.GetScore(ScoringMode.Value, beatmapMaxCombo, accuracy, (double)score.MaxCombo / beatmapMaxCombo, score.Statistics));
             }
         }
 

From 917717686a6bef391d86cb4a92683e9442ac8c78 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 18 Mar 2021 19:26:29 +0900
Subject: [PATCH 1884/3722] Expand explanatory comment

---
 osu.Game/Scoring/ScoreManager.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 5fa971ce80..7d0abc5996 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -164,7 +164,9 @@ namespace osu.Game.Scoring
                 {
                     if (score.RulesetID == 3)
                     {
-                        // Recalculate mania's accuracy based on hit statistics.
+                        // In osu!stable, a full-GREAT score has 100% accuracy in mania. Along with a full combo, the score becomes indistinguishable from a full-PERFECT score.
+                        // To get around this, recalculate accuracy based on the hit statistics.
+                        // Note: This cannot be applied universally to all legacy scores, as some rulesets (e.g. catch) group multiple judgements together.
                         double maxBaseScore = score.Statistics.Select(kvp => kvp.Value).Sum() * Judgement.ToNumericResult(HitResult.Perfect);
                         double baseScore = score.Statistics.Select(kvp => Judgement.ToNumericResult(kvp.Key) * kvp.Value).Sum();
                         if (maxBaseScore > 0)

From 0c3c8141dac75fbc7ccd5c8d79746dc413c8df21 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 18 Mar 2021 19:39:42 +0900
Subject: [PATCH 1885/3722] Remove Expires and RemoveWhenNotAlive override

---
 osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs | 4 ----
 osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs             | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs
index aad9f53b93..21bd35ad22 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyHitExplosion.cs
@@ -13,8 +13,6 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
 {
     public class LegacyHitExplosion : CompositeDrawable, IAnimatableHitExplosion
     {
-        public override bool RemoveWhenNotAlive => false;
-
         private readonly Drawable sprite;
 
         [CanBeNull]
@@ -73,8 +71,6 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
                 .Then().ScaleTo(1.1f, animation_time * 0.8)
                 .Then().ScaleTo(0.9f, animation_time * 0.4)
                 .Then().ScaleTo(1f, animation_time * 0.2);
-
-            Expire(true);
         }
 
         public void AnimateSecondHit()
diff --git a/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs b/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs
index 5bb463353d..91e844187a 100644
--- a/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs
+++ b/osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs
@@ -16,8 +16,6 @@ namespace osu.Game.Rulesets.Taiko.UI
 {
     internal class DefaultHitExplosion : CircularContainer, IAnimatableHitExplosion
     {
-        public override bool RemoveWhenNotAlive => false;
-
         private readonly HitResult result;
 
         [CanBeNull]
@@ -73,8 +71,6 @@ namespace osu.Game.Rulesets.Taiko.UI
 
             this.ScaleTo(3f, 1000, Easing.OutQuint);
             this.FadeOut(500);
-
-            Expire(true);
         }
 
         public void AnimateSecondHit()

From c694deb7d605759a3d7c6b7877d85bf422be4425 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Mar 2021 21:16:50 +0900
Subject: [PATCH 1886/3722] Revert changes to SettingsSourceAttribute class

---
 .../Configuration/SettingSourceAttribute.cs   | 39 +------------------
 1 file changed, 2 insertions(+), 37 deletions(-)

diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index 39d7fba32b..cfce615130 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -5,10 +5,8 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using Humanizer;
 using JetBrains.Annotations;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
 using osu.Game.Overlays.Settings;
@@ -63,21 +61,12 @@ namespace osu.Game.Configuration
 
     public static class SettingSourceExtensions
     {
-        public static IReadOnlyList<Drawable> CreateSettingsControls(this object obj, bool includeDisabled = true) =>
-            createSettingsControls(obj, obj.GetOrderedSettingsSourceProperties(), includeDisabled).ToArray();
-
-        public static IReadOnlyList<Drawable> CreateSettingsControlsFromAllBindables(this object obj, bool includeDisabled = true) =>
-            createSettingsControls(obj, obj.GetSettingsSourcePropertiesFromBindables(), includeDisabled).ToArray();
-
-        private static IEnumerable<Drawable> createSettingsControls(object obj, IEnumerable<(SettingSourceAttribute, PropertyInfo)> sourceAttribs, bool includeDisabled = true)
+        public static IEnumerable<Drawable> CreateSettingsControls(this object obj)
         {
-            foreach (var (attr, property) in sourceAttribs)
+            foreach (var (attr, property) in obj.GetOrderedSettingsSourceProperties())
             {
                 object value = property.GetValue(obj);
 
-                if ((value as IBindable)?.Disabled == true)
-                    continue;
-
                 switch (value)
                 {
                     case BindableNumber<float> bNumber:
@@ -150,30 +139,6 @@ namespace osu.Game.Configuration
             }
         }
 
-        public static IEnumerable<(SettingSourceAttribute, PropertyInfo)> GetSettingsSourcePropertiesFromBindables(this object obj)
-        {
-            HashSet<string> handledProperties = new HashSet<string>();
-
-            // reverse and de-dupe properties to surface base class settings to the top of return order.
-            foreach (var type in obj.GetType().EnumerateBaseTypes().Reverse())
-            {
-                foreach (var property in type.GetProperties(BindingFlags.GetProperty | BindingFlags.Public | BindingFlags.Instance))
-                {
-                    if (handledProperties.Contains(property.Name))
-                        continue;
-
-                    handledProperties.Add(property.Name);
-
-                    if (typeof(IBindable).IsAssignableFrom(property.PropertyType))
-                    {
-                        var val = property.GetValue(obj);
-                        string description = (val as IHasDescription)?.Description ?? string.Empty;
-                        yield return (new SettingSourceAttribute(property.Name.Humanize(), description), property);
-                    }
-                }
-            }
-        }
-
         public static IEnumerable<(SettingSourceAttribute, PropertyInfo)> GetSettingsSourceProperties(this object obj)
         {
             foreach (var property in obj.GetType().GetProperties(BindingFlags.GetProperty | BindingFlags.Public | BindingFlags.Instance))

From a8cc3a3b4468c885504c69ef9fbdb0dc62df059c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Mar 2021 21:17:04 +0900
Subject: [PATCH 1887/3722] Implement enable state changes locally for
 InputHandlers which should be toggleable

---
 .../Settings/Sections/InputSection.cs         | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/InputSection.cs b/osu.Game/Overlays/Settings/Sections/InputSection.cs
index e6aaa1ade9..8d5944f5bf 100644
--- a/osu.Game/Overlays/Settings/Sections/InputSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/InputSection.cs
@@ -9,7 +9,6 @@ using osu.Framework.Input.Handlers.Joystick;
 using osu.Framework.Input.Handlers.Midi;
 using osu.Framework.Input.Handlers.Mouse;
 using osu.Framework.Platform;
-using osu.Game.Configuration;
 using osu.Game.Overlays.Settings.Sections.Input;
 
 namespace osu.Game.Overlays.Settings.Sections
@@ -70,13 +69,6 @@ namespace osu.Game.Overlays.Settings.Sections
                     return null;
             }
 
-            var settingsControls = handler.CreateSettingsControlsFromAllBindables(false);
-
-            if (settingsControls.Count == 0)
-                return null;
-
-            section.AddRange(settingsControls);
-
             return section;
         }
 
@@ -89,6 +81,19 @@ namespace osu.Game.Overlays.Settings.Sections
                 this.handler = handler;
             }
 
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                Children = new Drawable[]
+                {
+                    new SettingsCheckbox
+                    {
+                        LabelText = "Enabled",
+                        Current = handler.Enabled
+                    },
+                };
+            }
+
             protected override string Header => handler.Description;
         }
     }

From b419d2c2e27762af7701c1823ae9e7786a730e0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 18 Mar 2021 19:52:38 +0100
Subject: [PATCH 1888/3722] Fix invalid xmldoc indent

---
 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 571d65e28b..b69e99773c 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -506,7 +506,7 @@ namespace osu.Game.Skinning
             Samples?.Dispose();
         }
 
-          /// <summary>
+        /// <summary>
         /// A sample wrapper which keeps a reference to the contained skin to avoid finalizer garbage collection of the managing SampleStore.
         /// </summary>
         private class LegacySkinSample : ISample

From b9761c819629f64d647d6178e7bbd7c9987b2b28 Mon Sep 17 00:00:00 2001
From: voidedWarranties <wz68.scratch@gmail.com>
Date: Thu, 18 Mar 2021 16:20:31 -0700
Subject: [PATCH 1889/3722] Further simplify logic

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

diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index e227bd29bf..d0197ce1ec 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -226,15 +226,15 @@ namespace osu.Game.Screens.Edit
         {
             underlyingClock.ProcessFrame();
 
-            var playbackAlreadyStopped = playbackFinished;
             playbackFinished = CurrentTime >= TrackLength;
 
-            if (playbackFinished && !playbackAlreadyStopped)
+            if (playbackFinished)
             {
                 if (IsRunning)
                     underlyingClock.Stop();
 
-                underlyingClock.Seek(TrackLength);
+                if (CurrentTime > TrackLength)
+                    underlyingClock.Seek(TrackLength);
             }
         }
 

From 5f31304d05fa71b356651643608aa34f8207e323 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 14:00:26 +0900
Subject: [PATCH 1890/3722] Give each type of slider path type a unique colour
 to help visually distinguish them

---
 .../Components/PathControlPointPiece.cs       | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index e9838de63d..311ab8ee62 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -12,6 +12,7 @@ using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit;
 using osuTK;
@@ -195,7 +196,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 
             markerRing.Alpha = IsSelected.Value ? 1 : 0;
 
-            Color4 colour = ControlPoint.Type.Value != null ? colours.Red : colours.Yellow;
+            Color4 colour = getColourFromNodeType();
 
             if (IsHovered || IsSelected.Value)
                 colour = colour.Lighten(1);
@@ -203,5 +204,26 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             marker.Colour = colour;
             marker.Scale = new Vector2(slider.Scale);
         }
+
+        private Color4 getColourFromNodeType()
+        {
+            if (!(ControlPoint.Type.Value is PathType pathType))
+                return colours.Yellow;
+
+            switch (pathType)
+            {
+                case PathType.Catmull:
+                    return colours.Seafoam;
+
+                case PathType.Bezier:
+                    return colours.Pink;
+
+                case PathType.PerfectCurve:
+                    return colours.PurpleDark;
+
+                default:
+                    return colours.Red;
+            }
+        }
     }
 }

From 0e821e857e34f810e1ede0c9f28df6678602caf3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 15:23:31 +0900
Subject: [PATCH 1891/3722] Remove unnecessary duplicated skin changed handling

For some reason we were handling this both in `DrawableSkinnableSound`
and `PoolableSkinnableSample` in very similar ways. Only one seems
required.
---
 osu.Game/Skinning/SkinnableSound.cs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index edd3a2cdd3..e447f9c44c 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -139,12 +139,6 @@ namespace osu.Game.Skinning
             samplesContainer.ForEach(c => c.Stop());
         }
 
-        protected override void SkinChanged(ISkinSource skin, bool allowFallback)
-        {
-            base.SkinChanged(skin, allowFallback);
-            updateSamples();
-        }
-
         private void updateSamples()
         {
             bool wasPlaying = IsPlaying;

From bf4317d3f06ecd3ba29c2f43c33561e5557c3b24 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 15:34:19 +0900
Subject: [PATCH 1892/3722] Ensure looping is disabled on old samples when
 switching skins

---
 osu.Game/Skinning/PoolableSkinnableSample.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Skinning/PoolableSkinnableSample.cs b/osu.Game/Skinning/PoolableSkinnableSample.cs
index 9103a6a960..09e087d0f2 100644
--- a/osu.Game/Skinning/PoolableSkinnableSample.cs
+++ b/osu.Game/Skinning/PoolableSkinnableSample.cs
@@ -83,6 +83,14 @@ namespace osu.Game.Skinning
 
             bool wasPlaying = Playing;
 
+            if (activeChannel != null)
+            {
+                // when switching away from previous samples, we don't want to call Stop() on them as it sounds better to let them play out.
+                // this may change in the future if we use PoolableSkinSample in more locations than gameplay.
+                // we *do* want to turn off looping, else we end up with an infinite looping sample running in the background.
+                activeChannel.Looping = false;
+            }
+
             sampleContainer.Clear();
             Sample = null;
 

From 9491e6394a65de287bb05c96188db69ca7837158 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 15:46:43 +0900
Subject: [PATCH 1893/3722] Include the bundled skins when selecting a random
 skin

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

diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 601b77e782..752c742a45 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Skinning
         public void SelectRandomSkin()
         {
             // choose from only user skins, removing the current selection to ensure a new one is chosen.
-            var randomChoices = GetAllUsableSkins().Where(s => s.ID > 0 && s.ID != CurrentSkinInfo.Value.ID).ToArray();
+            var randomChoices = GetAllUsableSkins().Where(s => s.ID != CurrentSkinInfo.Value.ID).ToArray();
 
             if (randomChoices.Length == 0)
             {

From a9c4fa442a983534897b6d91e3fe9dd60d97dead Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 16:47:39 +0900
Subject: [PATCH 1894/3722] Avoid potential crash if an overlay is toggled
 before it has been loaded

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 66b9141ce8..e5e1f6946e 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -756,6 +756,10 @@ namespace osu.Game
 
         private void showOverlayAboveOthers(OverlayContainer overlay, OverlayContainer[] otherOverlays)
         {
+            // generally shouldn't ever hit this state, but protects against a crash on attempting to change ChildDepth.
+            if (overlay.LoadState < LoadState.Ready)
+                return;
+
             otherOverlays.Where(o => o != overlay).ForEach(o => o.Hide());
 
             // show above others if not visible at all, else leave at current depth.

From 27c38db14dee71d4f5a40300acbe90eb84d8bf3e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 16:58:08 +0900
Subject: [PATCH 1895/3722] Add tooltips for slider path nodes which aren't
 inheriting

---
 .../Blueprints/Sliders/Components/PathControlPointPiece.cs   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index 311ab8ee62..1390675a1a 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -7,6 +7,7 @@ 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.Shapes;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
@@ -24,7 +25,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
     /// <summary>
     /// A visualisation of a single <see cref="PathControlPoint"/> in a <see cref="Slider"/>.
     /// </summary>
-    public class PathControlPointPiece : BlueprintPiece<Slider>
+    public class PathControlPointPiece : BlueprintPiece<Slider>, IHasTooltip
     {
         public Action<PathControlPointPiece, MouseButtonEvent> RequestSelection;
 
@@ -225,5 +226,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                     return colours.Red;
             }
         }
+
+        public string TooltipText => ControlPoint.Type.Value.ToString() ?? string.Empty;
     }
 }

From 0195d654cacb2e496ce7cc2b3c3b3991111eabb3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 17:09:49 +0900
Subject: [PATCH 1896/3722] Increase the precision of speed multiplier to match
 osu-stable

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

diff --git a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
index 0bc5605051..73337ab6f5 100644
--- a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// </summary>
         public readonly BindableDouble SpeedMultiplierBindable = new BindableDouble(1)
         {
-            Precision = 0.1,
+            Precision = 0.01,
             Default = 1,
             MinValue = 0.1,
             MaxValue = 10

From 32c571fc94a0ca6521b25226670f79238dc9bf98 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 17:13:30 +0900
Subject: [PATCH 1897/3722] Adjust keyboard step to be something sensible

---
 osu.Game/Screens/Edit/Timing/DifficultySection.cs      | 3 ++-
 osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Timing/DifficultySection.cs b/osu.Game/Screens/Edit/Timing/DifficultySection.cs
index b87b8961f8..9d80ca0b14 100644
--- a/osu.Game/Screens/Edit/Timing/DifficultySection.cs
+++ b/osu.Game/Screens/Edit/Timing/DifficultySection.cs
@@ -18,7 +18,8 @@ namespace osu.Game.Screens.Edit.Timing
             {
                 multiplierSlider = new SliderWithTextBoxInput<double>("Speed Multiplier")
                 {
-                    Current = new DifficultyControlPoint().SpeedMultiplierBindable
+                    Current = new DifficultyControlPoint().SpeedMultiplierBindable,
+                    KeyboardStep = 0.1f
                 }
             });
         }
diff --git a/osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs b/osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs
index f2f9f76143..10a5771520 100644
--- a/osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs
+++ b/osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs
@@ -69,6 +69,15 @@ namespace osu.Game.Screens.Edit.Timing
             }, true);
         }
 
+        /// <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;

From 563a0584d589bf0dce7c29fffc03268b097db485 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 18:48:51 +0900
Subject: [PATCH 1898/3722] Implement editor timeline stacking support

---
 .../Timeline/TimelineBlueprintContainer.cs    | 50 ++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index 1fc529910b..4522418e87 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -2,6 +2,8 @@
 // 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.Graphics;
@@ -121,6 +123,46 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             }
 
             base.Update();
+
+            updateStacking();
+        }
+
+        private void updateStacking()
+        {
+            // because only blueprints of objects which are alive (via pooling) are displayed in the timeline, it's feasible to do this every-update.
+
+            const int stack_offset = 5;
+
+            // after the stack gets this tall, we can presume there is space underneath to draw subsequent blueprints.
+            const int stack_reset_count = 3;
+
+            Stack<double> currentConcurrentObjects = new Stack<double>();
+
+            foreach (var b in SelectionBlueprints.Reverse())
+            {
+                while (currentConcurrentObjects.TryPeek(out double stackEndTime))
+                {
+                    if (Precision.AlmostBigger(stackEndTime, b.HitObject.StartTime, 1))
+                        break;
+
+                    currentConcurrentObjects.Pop();
+                }
+
+                b.Y = -(stack_offset * currentConcurrentObjects.Count);
+
+                var bEndTime = b.HitObject.GetEndTime();
+
+                // if the stack gets too high, we should have space below it to display the next batch of objects.
+                // importantly, we only do this if time has incremented, else a stack of hitobjects all at the same time value would start to overlap themselves.
+                if (!currentConcurrentObjects.TryPeek(out double nextStackEndTime) ||
+                    !Precision.AlmostEquals(nextStackEndTime, bEndTime, 1))
+                {
+                    if (currentConcurrentObjects.Count >= stack_reset_count)
+                        currentConcurrentObjects.Clear();
+                }
+
+                currentConcurrentObjects.Push(bEndTime);
+            }
         }
 
         protected override SelectionHandler CreateSelectionHandler() => new TimelineSelectionHandler();
@@ -203,7 +245,13 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 Box.X = Math.Min(rescaledStart, rescaledEnd);
                 Box.Width = Math.Abs(rescaledStart - rescaledEnd);
 
-                PerformSelection?.Invoke(Box.ScreenSpaceDrawQuad.AABBFloat);
+                var boxScreenRect = Box.ScreenSpaceDrawQuad.AABBFloat;
+
+                // we don't care about where the hitobjects are vertically. in cases like stacking display, they may be outside the box without this adjustment.
+                boxScreenRect.Y -= boxScreenRect.Height;
+                boxScreenRect.Height *= 2;
+
+                PerformSelection?.Invoke(boxScreenRect);
             }
 
             public override void Hide()

From 1c865682ae3b0d4116fa8483b1e173c67ab079a3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Mar 2021 16:25:50 +0900
Subject: [PATCH 1899/3722] Add tablet configuration tests

---
 .../Settings/TestSceneTabletAreaSelection.cs  | 104 ++++++++++++++++++
 1 file changed, 104 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Settings/TestSceneTabletAreaSelection.cs

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneTabletAreaSelection.cs b/osu.Game.Tests/Visual/Settings/TestSceneTabletAreaSelection.cs
new file mode 100644
index 0000000000..30e265baaa
--- /dev/null
+++ b/osu.Game.Tests/Visual/Settings/TestSceneTabletAreaSelection.cs
@@ -0,0 +1,104 @@
+// Copyright (c) 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 OpenTabletDriver.Plugin.Tablet;
+using osu.Framework.Allocation;
+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.Sprites;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Tests.Visual.Settings
+{
+    [TestFixture]
+    public class TestSceneTabletAreaSelection : OsuTestScene
+    {
+        private TabletAreaSelection areaSelection;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            DigitizerIdentifier testTablet = new DigitizerIdentifier
+            {
+                // size specifications in millimetres.
+                Width = 160,
+                Height = 100,
+            };
+
+            AddRange(new[]
+            {
+                areaSelection = new TabletAreaSelection(testTablet)
+                {
+                    State = { Value = Visibility.Visible }
+                }
+            });
+        }
+    }
+
+    public class TabletAreaSelection : OsuFocusedOverlayContainer
+    {
+        private readonly DigitizerIdentifier tablet;
+
+        private readonly Container tabletContainer;
+        private readonly Container usableAreaContainer;
+
+        public TabletAreaSelection(DigitizerIdentifier tablet)
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            this.tablet = tablet;
+
+            InternalChildren = new Drawable[]
+            {
+                tabletContainer = new Container
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Scale = new Vector2(3),
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = Color4.White,
+                        },
+                        usableAreaContainer = new Container
+                        {
+                            Children = new Drawable[]
+                            {
+                                new Box
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Colour = Color4.Yellow,
+                                },
+                                new OsuSpriteText
+                                {
+                                    Text = "usable area",
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    Colour = Color4.Black,
+                                    Font = OsuFont.Default.With(size: 12)
+                                }
+                            }
+                        },
+                    }
+                }
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            // TODO: handle tablet device changes etc.
+            tabletContainer.Size = new Vector2(tablet.Width, tablet.Height);
+
+            usableAreaContainer.Position = new Vector2(10, 30);
+            usableAreaContainer.Size = new Vector2(80, 60);
+        }
+    }
+}

From d026c8da851a5fbd399206b8efff28b76c09c643 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Mar 2021 18:37:46 +0900
Subject: [PATCH 1900/3722] Initial pass of configuration interface

---
 .../Settings/TestSceneTabletSettings.cs       |  40 +++++++
 .../Sections/Input/TabletAreaSelection.cs     |  79 ++++++-------
 .../Settings/Sections/Input/TabletSettings.cs | 111 ++++++++++++++++++
 .../Settings/Sections/InputSection.cs         |   6 +
 4 files changed, 194 insertions(+), 42 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
 rename osu.Game.Tests/Visual/Settings/TestSceneTabletAreaSelection.cs => osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs (55%)
 create mode 100644 osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs b/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
new file mode 100644
index 0000000000..be5b355e06
--- /dev/null
+++ b/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
@@ -0,0 +1,40 @@
+// Copyright (c) ppy 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 NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Input.Handlers.Tablet;
+using osu.Framework.Platform;
+using osu.Game.Overlays.Settings.Sections.Input;
+
+namespace osu.Game.Tests.Visual.Settings
+{
+    [TestFixture]
+    public class TestSceneTabletSettings : OsuTestScene
+    {
+        [BackgroundDependencyLoader]
+        private void load(GameHost host)
+        {
+            var tabletHandler = host.AvailableInputHandlers.OfType<ITabletHandler>().FirstOrDefault();
+
+            if (tabletHandler == null)
+                return;
+
+            tabletHandler.AreaOffset.MinValue = new Size(0, 0);
+            tabletHandler.AreaOffset.MaxValue = new Size(160, 100);
+            tabletHandler.AreaOffset.Value = new Size(10, 10);
+
+            tabletHandler.AreaSize.MinValue = new Size(0, 0);
+            tabletHandler.AreaSize.MaxValue = new Size(160, 100);
+            tabletHandler.AreaSize.Value = new Size(100, 80);
+
+            AddRange(new Drawable[]
+            {
+                new TabletSettings(tabletHandler),
+            });
+        }
+    }
+}
diff --git a/osu.Game.Tests/Visual/Settings/TestSceneTabletAreaSelection.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
similarity index 55%
rename from osu.Game.Tests/Visual/Settings/TestSceneTabletAreaSelection.cs
rename to osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
index 30e265baaa..31a2768735 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneTabletAreaSelection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
@@ -1,65 +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 NUnit.Framework;
-using OpenTabletDriver.Plugin.Tablet;
+using System.Drawing;
 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.Handlers.Tablet;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osuTK;
+
 using osuTK.Graphics;
 
-namespace osu.Game.Tests.Visual.Settings
+namespace osu.Game.Overlays.Settings.Sections.Input
 {
-    [TestFixture]
-    public class TestSceneTabletAreaSelection : OsuTestScene
+    public class TabletAreaSelection : CompositeDrawable
     {
-        private TabletAreaSelection areaSelection;
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            DigitizerIdentifier testTablet = new DigitizerIdentifier
-            {
-                // size specifications in millimetres.
-                Width = 160,
-                Height = 100,
-            };
-
-            AddRange(new[]
-            {
-                areaSelection = new TabletAreaSelection(testTablet)
-                {
-                    State = { Value = Visibility.Visible }
-                }
-            });
-        }
-    }
-
-    public class TabletAreaSelection : OsuFocusedOverlayContainer
-    {
-        private readonly DigitizerIdentifier tablet;
+        private readonly ITabletHandler handler;
 
         private readonly Container tabletContainer;
         private readonly Container usableAreaContainer;
 
-        public TabletAreaSelection(DigitizerIdentifier tablet)
-        {
-            RelativeSizeAxes = Axes.Both;
+        private readonly Bindable<Size> areaOffset = new BindableSize();
+        private readonly Bindable<Size> areaSize = new BindableSize();
+        private readonly Bindable<Size> tabletSize = new BindableSize();
 
-            this.tablet = tablet;
+        public TabletAreaSelection(ITabletHandler handler)
+        {
+            this.handler = handler;
+
+            Padding = new MarginPadding(5);
 
             InternalChildren = new Drawable[]
             {
                 tabletContainer = new Container
                 {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Scale = new Vector2(3),
+                    Masking = true,
+                    CornerRadius = 5,
+                    BorderThickness = 2,
+                    BorderColour = Color4.Black,
                     Children = new Drawable[]
                     {
                         new Box
@@ -69,6 +50,8 @@ namespace osu.Game.Tests.Visual.Settings
                         },
                         usableAreaContainer = new Container
                         {
+                            Masking = true,
+                            CornerRadius = 5,
                             Children = new Drawable[]
                             {
                                 new Box
@@ -94,11 +77,23 @@ namespace osu.Game.Tests.Visual.Settings
         [BackgroundDependencyLoader]
         private void load()
         {
-            // TODO: handle tablet device changes etc.
-            tabletContainer.Size = new Vector2(tablet.Width, tablet.Height);
+            areaOffset.BindTo(handler.AreaOffset);
+            areaOffset.BindValueChanged(val =>
+            {
+                usableAreaContainer.MoveTo(new Vector2(val.NewValue.Width, val.NewValue.Height), 100, Easing.OutQuint);
+            }, true);
 
-            usableAreaContainer.Position = new Vector2(10, 30);
-            usableAreaContainer.Size = new Vector2(80, 60);
+            areaSize.BindTo(handler.AreaSize);
+            areaSize.BindValueChanged(val =>
+            {
+                usableAreaContainer.ResizeTo(new Vector2(val.NewValue.Width, val.NewValue.Height), 100, Easing.OutQuint);
+            }, true);
+
+            ((IBindable<Size>)tabletSize).BindTo(handler.TabletSize);
+            tabletSize.BindValueChanged(val =>
+            {
+                tabletContainer.ResizeTo(new Vector2(tabletSize.Value.Width, tabletSize.Value.Height), 100, Easing.OutQuint);
+            }, true);
         }
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
new file mode 100644
index 0000000000..5df9c879eb
--- /dev/null
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.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.Drawing;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Configuration;
+using osu.Framework.Graphics;
+using osu.Framework.Input.Handlers.Tablet;
+using osu.Game.Configuration;
+
+namespace osu.Game.Overlays.Settings.Sections.Input
+{
+    public class TabletSettings : SettingsSubsection
+    {
+        private readonly ITabletHandler tabletHandler;
+
+        private readonly BindableSize areaOffset = new BindableSize();
+        private readonly BindableSize areaSize = new BindableSize();
+        private readonly BindableSize tabletSize = new BindableSize();
+
+        private readonly BindableNumber<int> offsetX = new BindableNumber<int> { MinValue = 0 };
+        private readonly BindableNumber<int> offsetY = new BindableNumber<int> { MinValue = 0 };
+
+        private readonly BindableNumber<int> sizeX = new BindableNumber<int> { MinValue = 0 };
+        private readonly BindableNumber<int> sizeY = new BindableNumber<int> { MinValue = 0 };
+
+        protected override string Header => "Tablet";
+
+        public TabletSettings(ITabletHandler tabletHandler)
+        {
+            this.tabletHandler = tabletHandler;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager osuConfig, FrameworkConfigManager config)
+        {
+            // TODO: this should all eventually be replaced with a control that handles BindableSize.
+            areaOffset.BindTo(tabletHandler.AreaOffset);
+            areaOffset.BindValueChanged(val =>
+            {
+                offsetX.Value = val.NewValue.Width;
+                offsetY.Value = val.NewValue.Height;
+            }, true);
+
+            offsetX.BindValueChanged(val => areaOffset.Value = new Size(val.NewValue, areaOffset.Value.Height));
+            offsetY.BindValueChanged(val => areaOffset.Value = new Size(areaOffset.Value.Width, val.NewValue));
+
+            areaSize.BindTo(tabletHandler.AreaSize);
+            areaSize.BindValueChanged(val =>
+            {
+                sizeX.Value = val.NewValue.Width;
+                sizeY.Value = val.NewValue.Height;
+            }, true);
+
+            sizeX.BindValueChanged(val => areaSize.Value = new Size(val.NewValue, areaSize.Value.Height));
+            sizeY.BindValueChanged(val => areaSize.Value = new Size(areaSize.Value.Width, val.NewValue));
+
+            ((IBindable<Size>)tabletSize).BindTo(tabletHandler.TabletSize);
+            tabletSize.BindValueChanged(val =>
+            {
+                // todo: these should propagate from a TabletChanged event or similar.
+                offsetX.MaxValue = val.NewValue.Width;
+                sizeX.Default = sizeX.MaxValue = val.NewValue.Width;
+
+                offsetY.MaxValue = val.NewValue.Height;
+                sizeY.Default = sizeY.MaxValue = val.NewValue.Height;
+
+                updateDisplay();
+            }, true);
+        }
+
+        private void updateDisplay()
+        {
+            if (tabletSize.Value == System.Drawing.Size.Empty)
+            {
+                Clear();
+                return;
+            }
+
+            Children = new Drawable[]
+            {
+                new SettingsSlider<int>
+                {
+                    LabelText = "Offset X",
+                    Current = offsetX
+                },
+                new SettingsSlider<int>
+                {
+                    LabelText = "Offset Y",
+                    Current = offsetY
+                },
+                new SettingsSlider<int>
+                {
+                    LabelText = "Size X",
+                    Current = sizeX
+                },
+                new SettingsSlider<int>
+                {
+                    LabelText = "Size Y",
+                    Current = sizeY
+                },
+                new TabletAreaSelection(tabletHandler)
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Height = 100,
+                }
+            };
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Settings/Sections/InputSection.cs b/osu.Game/Overlays/Settings/Sections/InputSection.cs
index 8d5944f5bf..6e99891794 100644
--- a/osu.Game/Overlays/Settings/Sections/InputSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/InputSection.cs
@@ -8,6 +8,7 @@ using osu.Framework.Input.Handlers;
 using osu.Framework.Input.Handlers.Joystick;
 using osu.Framework.Input.Handlers.Midi;
 using osu.Framework.Input.Handlers.Mouse;
+using osu.Framework.Input.Handlers.Tablet;
 using osu.Framework.Platform;
 using osu.Game.Overlays.Settings.Sections.Input;
 
@@ -55,6 +56,11 @@ namespace osu.Game.Overlays.Settings.Sections
 
             switch (handler)
             {
+                // ReSharper disable once SuspiciousTypeConversion.Global (net standard fuckery)
+                case ITabletHandler th:
+                    section = new TabletSettings(th);
+                    break;
+
                 case MouseHandler mh:
                     section = new MouseSettings(mh);
                     break;

From 3b7edf13337a26a9d358b2dd70eef5773ba73332 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Mar 2021 14:45:21 +0900
Subject: [PATCH 1901/3722] Make tablet display always fit to size of settings
 area

---
 .../Settings/TestSceneTabletSettings.cs       |  26 ++++-
 .../Sections/Input/TabletAreaSelection.cs     | 105 ++++++++++--------
 2 files changed, 78 insertions(+), 53 deletions(-)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs b/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
index be5b355e06..6455f51ab9 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
@@ -2,9 +2,9 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Drawing;
-using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Handlers.Tablet;
 using osu.Framework.Platform;
@@ -18,16 +18,13 @@ namespace osu.Game.Tests.Visual.Settings
         [BackgroundDependencyLoader]
         private void load(GameHost host)
         {
-            var tabletHandler = host.AvailableInputHandlers.OfType<ITabletHandler>().FirstOrDefault();
-
-            if (tabletHandler == null)
-                return;
+            var tabletHandler = new TestTabletHandler();
 
             tabletHandler.AreaOffset.MinValue = new Size(0, 0);
             tabletHandler.AreaOffset.MaxValue = new Size(160, 100);
             tabletHandler.AreaOffset.Value = new Size(10, 10);
 
-            tabletHandler.AreaSize.MinValue = new Size(0, 0);
+            tabletHandler.AreaSize.MinValue = new Size(10, 10);
             tabletHandler.AreaSize.MaxValue = new Size(160, 100);
             tabletHandler.AreaSize.Value = new Size(100, 80);
 
@@ -35,6 +32,23 @@ namespace osu.Game.Tests.Visual.Settings
             {
                 new TabletSettings(tabletHandler),
             });
+
+            AddStep("Test with wide tablet", () => tabletHandler.SetTabletSize(new Size(160, 100)));
+            AddStep("Test with square tablet", () => tabletHandler.SetTabletSize(new Size(300, 300)));
+            AddStep("Test with tall tablet", () => tabletHandler.SetTabletSize(new Size(100, 300)));
+            AddStep("Test with very tall tablet", () => tabletHandler.SetTabletSize(new Size(100, 700)));
+        }
+
+        public class TestTabletHandler : ITabletHandler
+        {
+            private readonly Bindable<Size> tabletSize = new Bindable<Size>();
+
+            public BindableSize AreaOffset { get; } = new BindableSize();
+            public BindableSize AreaSize { get; } = new BindableSize();
+            public IBindable<Size> TabletSize => tabletSize;
+            public BindableBool Enabled { get; } = new BindableBool(true);
+
+            public void SetTabletSize(Size size) => tabletSize.Value = size;
         }
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
index 31a2768735..775aceb5f9 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.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.Drawing;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -11,7 +12,6 @@ using osu.Framework.Input.Handlers.Tablet;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osuTK;
-
 using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Settings.Sections.Input
@@ -20,8 +20,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
     {
         private readonly ITabletHandler handler;
 
-        private readonly Container tabletContainer;
-        private readonly Container usableAreaContainer;
+        private Container tabletContainer;
+        private Container usableAreaContainer;
 
         private readonly Bindable<Size> areaOffset = new BindableSize();
         private readonly Bindable<Size> areaSize = new BindableSize();
@@ -30,53 +30,50 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         public TabletAreaSelection(ITabletHandler handler)
         {
             this.handler = handler;
-
-            Padding = new MarginPadding(5);
-
-            InternalChildren = new Drawable[]
-            {
-                tabletContainer = new Container
-                {
-                    Masking = true,
-                    CornerRadius = 5,
-                    BorderThickness = 2,
-                    BorderColour = Color4.Black,
-                    Children = new Drawable[]
-                    {
-                        new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Colour = Color4.White,
-                        },
-                        usableAreaContainer = new Container
-                        {
-                            Masking = true,
-                            CornerRadius = 5,
-                            Children = new Drawable[]
-                            {
-                                new Box
-                                {
-                                    RelativeSizeAxes = Axes.Both,
-                                    Colour = Color4.Yellow,
-                                },
-                                new OsuSpriteText
-                                {
-                                    Text = "usable area",
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                    Colour = Color4.Black,
-                                    Font = OsuFont.Default.With(size: 12)
-                                }
-                            }
-                        },
-                    }
-                }
-            };
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
+            Padding = new MarginPadding(5);
+
+            InternalChild = tabletContainer = new Container
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Masking = true,
+                CornerRadius = 5,
+                BorderThickness = 2,
+                BorderColour = Color4.Black,
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4.White,
+                    },
+                    usableAreaContainer = new Container
+                    {
+                        Children = new Drawable[]
+                        {
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Colour = Color4.Yellow,
+                            },
+                            new OsuSpriteText
+                            {
+                                Text = "usable area",
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Colour = Color4.Black,
+                                Font = OsuFont.Default.With(size: 12)
+                            }
+                        }
+                    },
+                }
+            };
+
             areaOffset.BindTo(handler.AreaOffset);
             areaOffset.BindValueChanged(val =>
             {
@@ -92,8 +89,22 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             ((IBindable<Size>)tabletSize).BindTo(handler.TabletSize);
             tabletSize.BindValueChanged(val =>
             {
-                tabletContainer.ResizeTo(new Vector2(tabletSize.Value.Width, tabletSize.Value.Height), 100, Easing.OutQuint);
-            }, true);
+                tabletContainer.Size = new Vector2(val.NewValue.Width, val.NewValue.Height);
+            });
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            var size = tabletSize.Value;
+
+            float fitX = size.Width / DrawWidth;
+            float fitY = size.Height / DrawHeight;
+
+            float adjust = MathF.Max(fitX, fitY);
+
+            tabletContainer.Scale = new Vector2(1 / adjust);
         }
     }
 }

From 926e40925ef0ba15bb6a3994f71e291dfd7196c5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Mar 2021 15:57:06 +0900
Subject: [PATCH 1902/3722] Add exclude rule to fix dynamic compilations issues
 with settings sections

---
 osu.Game/Overlays/Settings/SettingsSubsection.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Overlays/Settings/SettingsSubsection.cs b/osu.Game/Overlays/Settings/SettingsSubsection.cs
index 1b82d973e9..6abf6283b9 100644
--- a/osu.Game/Overlays/Settings/SettingsSubsection.cs
+++ b/osu.Game/Overlays/Settings/SettingsSubsection.cs
@@ -8,10 +8,12 @@ using osu.Game.Graphics.Sprites;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Testing;
 using osu.Game.Graphics;
 
 namespace osu.Game.Overlays.Settings
 {
+    [ExcludeFromDynamicCompile]
     public abstract class SettingsSubsection : FillFlowContainer, IHasFilterableChildren
     {
         protected override Container<Drawable> Content => FlowContent;

From 0a6525baee8afa45b44432e8acc0e13fb0ca1be7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Mar 2021 15:57:29 +0900
Subject: [PATCH 1903/3722] Fix slider bars reloading each time the tablet size
 is changed

---
 .../Settings/Sections/Input/TabletSettings.cs     | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index 5df9c879eb..ac4a42e984 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -4,10 +4,8 @@
 using System.Drawing;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Handlers.Tablet;
-using osu.Game.Configuration;
 
 namespace osu.Game.Overlays.Settings.Sections.Input
 {
@@ -33,9 +31,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager osuConfig, FrameworkConfigManager config)
+        private void load()
         {
-            // TODO: this should all eventually be replaced with a control that handles BindableSize.
             areaOffset.BindTo(tabletHandler.AreaOffset);
             areaOffset.BindValueChanged(val =>
             {
@@ -59,6 +56,9 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             ((IBindable<Size>)tabletSize).BindTo(tabletHandler.TabletSize);
             tabletSize.BindValueChanged(val =>
             {
+                if (tabletSize.Value == System.Drawing.Size.Empty)
+                    return;
+
                 // todo: these should propagate from a TabletChanged event or similar.
                 offsetX.MaxValue = val.NewValue.Width;
                 sizeX.Default = sizeX.MaxValue = val.NewValue.Width;
@@ -72,11 +72,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         private void updateDisplay()
         {
-            if (tabletSize.Value == System.Drawing.Size.Empty)
-            {
-                Clear();
+            if (Children.Count > 0)
                 return;
-            }
 
             Children = new Drawable[]
             {
@@ -103,7 +100,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 new TabletAreaSelection(tabletHandler)
                 {
                     RelativeSizeAxes = Axes.X,
-                    Height = 100,
+                    Height = 300,
                 }
             };
         }

From 94f184d113200bdca2c7c89496948a9e2e3d9990 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Mar 2021 16:02:39 +0900
Subject: [PATCH 1904/3722] Add feedback when area extends beyond tablet size

---
 .../Sections/Input/TabletAreaSelection.cs      | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
index 775aceb5f9..77b16a970d 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                             new Box
                             {
                                 RelativeSizeAxes = Axes.Both,
-                                Colour = Color4.Yellow,
+                                Colour = Color4.White,
                             },
                             new OsuSpriteText
                             {
@@ -78,21 +78,37 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             areaOffset.BindValueChanged(val =>
             {
                 usableAreaContainer.MoveTo(new Vector2(val.NewValue.Width, val.NewValue.Height), 100, Easing.OutQuint);
+                checkBounds();
             }, true);
 
             areaSize.BindTo(handler.AreaSize);
             areaSize.BindValueChanged(val =>
             {
                 usableAreaContainer.ResizeTo(new Vector2(val.NewValue.Width, val.NewValue.Height), 100, Easing.OutQuint);
+                checkBounds();
             }, true);
 
             ((IBindable<Size>)tabletSize).BindTo(handler.TabletSize);
             tabletSize.BindValueChanged(val =>
             {
                 tabletContainer.Size = new Vector2(val.NewValue.Width, val.NewValue.Height);
+                checkBounds();
             });
         }
 
+        [Resolved]
+        private OsuColour colour { get; set; }
+
+        private void checkBounds()
+        {
+            Size areaExtent = areaOffset.Value + areaSize.Value;
+
+            bool isWithinBounds = areaExtent.Width < tabletSize.Value.Width
+                                  && areaExtent.Height < tabletSize.Value.Height;
+
+            usableAreaContainer.FadeColour(isWithinBounds ? colour.Blue : colour.RedLight, 100);
+        }
+
         protected override void Update()
         {
             base.Update();

From 464702182d6064023064720824403e8277bd19a1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Mar 2021 16:23:46 +0900
Subject: [PATCH 1905/3722] Consume device name

---
 .../Visual/Settings/TestSceneTabletSettings.cs     |  1 +
 .../Settings/Sections/Input/TabletAreaSelection.cs | 14 +++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs b/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
index 6455f51ab9..1c9cd6c2ba 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
@@ -46,6 +46,7 @@ namespace osu.Game.Tests.Visual.Settings
             public BindableSize AreaOffset { get; } = new BindableSize();
             public BindableSize AreaSize { get; } = new BindableSize();
             public IBindable<Size> TabletSize => tabletSize;
+            public string DeviceName => "test tablet T-421";
             public BindableBool Enabled { get; } = new BindableBool(true);
 
             public void SetTabletSize(Size size) => tabletSize.Value = size;
diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
index 77b16a970d..54a14cd822 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
@@ -27,6 +27,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         private readonly Bindable<Size> areaSize = new BindableSize();
         private readonly Bindable<Size> tabletSize = new BindableSize();
 
+        private OsuSpriteText tabletName;
+
         public TabletAreaSelection(ITabletHandler handler)
         {
             this.handler = handler;
@@ -44,13 +46,13 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 Masking = true,
                 CornerRadius = 5,
                 BorderThickness = 2,
-                BorderColour = Color4.Black,
+                BorderColour = colour.Gray3,
                 Children = new Drawable[]
                 {
                     new Box
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Colour = Color4.White,
+                        Colour = colour.Gray1,
                     },
                     usableAreaContainer = new Container
                     {
@@ -59,7 +61,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                             new Box
                             {
                                 RelativeSizeAxes = Axes.Both,
-                                Colour = Color4.White,
+                                Alpha = 0.6f,
                             },
                             new OsuSpriteText
                             {
@@ -71,6 +73,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                             }
                         }
                     },
+                    tabletName = new OsuSpriteText
+                    {
+                        Padding = new MarginPadding(3),
+                        Font = OsuFont.Default.With(size: 8)
+                    },
                 }
             };
 
@@ -92,6 +99,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             tabletSize.BindValueChanged(val =>
             {
                 tabletContainer.Size = new Vector2(val.NewValue.Width, val.NewValue.Height);
+                tabletName.Text = handler.DeviceName;
                 checkBounds();
             });
         }

From 382109c7a221f83b02b00a70e002551e7244157f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Mar 2021 16:24:08 +0900
Subject: [PATCH 1906/3722] Make test scene feel more like settings
 (width-wise)

---
 .../Visual/Settings/TestSceneTabletSettings.cs           | 9 ++++++++-
 osu.Game/Overlays/SettingsPanel.cs                       | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs b/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
index 1c9cd6c2ba..3d65db9420 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
@@ -8,6 +8,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Handlers.Tablet;
 using osu.Framework.Platform;
+using osu.Game.Overlays;
 using osu.Game.Overlays.Settings.Sections.Input;
 
 namespace osu.Game.Tests.Visual.Settings
@@ -30,7 +31,13 @@ namespace osu.Game.Tests.Visual.Settings
 
             AddRange(new Drawable[]
             {
-                new TabletSettings(tabletHandler),
+                new TabletSettings(tabletHandler)
+                {
+                    RelativeSizeAxes = Axes.None,
+                    Width = SettingsPanel.WIDTH,
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopCentre,
+                }
             });
 
             AddStep("Test with wide tablet", () => tabletHandler.SetTabletSize(new Size(160, 100)));
diff --git a/osu.Game/Overlays/SettingsPanel.cs b/osu.Game/Overlays/SettingsPanel.cs
index f1270f750e..8f3274b2b5 100644
--- a/osu.Game/Overlays/SettingsPanel.cs
+++ b/osu.Game/Overlays/SettingsPanel.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Overlays
 
         private const float sidebar_width = Sidebar.DEFAULT_WIDTH;
 
-        protected const float WIDTH = 400;
+        public const float WIDTH = 400;
 
         protected Container<Drawable> ContentContainer;
 

From 2dc2cb04c317de94a762dbdb74dfede0a91b33ee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Mar 2021 16:24:20 +0900
Subject: [PATCH 1907/3722] Fix bounds check becoming false when using full
 area

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

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
index 54a14cd822..6a3cc46e2b 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
@@ -111,8 +111,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         {
             Size areaExtent = areaOffset.Value + areaSize.Value;
 
-            bool isWithinBounds = areaExtent.Width < tabletSize.Value.Width
-                                  && areaExtent.Height < tabletSize.Value.Height;
+            bool isWithinBounds = areaExtent.Width <= tabletSize.Value.Width
+                                  && areaExtent.Height <= tabletSize.Value.Height;
 
             usableAreaContainer.FadeColour(isWithinBounds ? colour.Blue : colour.RedLight, 100);
         }

From 9b70f0ee1fca97f9d8d686c131dd66f5a8be20ef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Mar 2021 16:24:51 +0900
Subject: [PATCH 1908/3722] Tidy up visual appearance of settings and add a
 reset button

---
 .../Settings/Sections/Input/TabletSettings.cs | 57 ++++++++++++-------
 1 file changed, 36 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index ac4a42e984..ca0a0349ab 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -66,6 +66,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 offsetY.MaxValue = val.NewValue.Height;
                 sizeY.Default = sizeY.MaxValue = val.NewValue.Height;
 
+                areaSize.Default = new Size(sizeX.Default, sizeY.Default);
+
                 updateDisplay();
             }, true);
         }
@@ -77,31 +79,44 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
             Children = new Drawable[]
             {
-                new SettingsSlider<int>
-                {
-                    LabelText = "Offset X",
-                    Current = offsetX
-                },
-                new SettingsSlider<int>
-                {
-                    LabelText = "Offset Y",
-                    Current = offsetY
-                },
-                new SettingsSlider<int>
-                {
-                    LabelText = "Size X",
-                    Current = sizeX
-                },
-                new SettingsSlider<int>
-                {
-                    LabelText = "Size Y",
-                    Current = sizeY
-                },
                 new TabletAreaSelection(tabletHandler)
                 {
                     RelativeSizeAxes = Axes.X,
                     Height = 300,
-                }
+                },
+                new SettingsButton
+                {
+                    Text = "Reset to full area",
+                    Action = () =>
+                    {
+                        areaOffset.SetDefault();
+                        areaSize.SetDefault();
+                    },
+                },
+                new SettingsCheckbox
+                {
+                    LabelText = "Lock aspect ratio",
+                },
+                new SettingsSlider<int>
+                {
+                    LabelText = "X Offset",
+                    Current = offsetX
+                },
+                new SettingsSlider<int>
+                {
+                    LabelText = "Y Offset",
+                    Current = offsetY
+                },
+                new SettingsSlider<int>
+                {
+                    LabelText = "Width",
+                    Current = sizeX
+                },
+                new SettingsSlider<int>
+                {
+                    LabelText = "Height",
+                    Current = sizeY
+                },
             };
         }
     }

From 43359553c1a3f6326ce13c0080440667ff13548e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Mar 2021 17:04:22 +0900
Subject: [PATCH 1909/3722] Add aspect ratio display and limiting

---
 .../Settings/Sections/Input/TabletSettings.cs | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index ca0a0349ab..5d85ecf138 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.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.Drawing;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -23,6 +24,15 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         private readonly BindableNumber<int> sizeX = new BindableNumber<int> { MinValue = 0 };
         private readonly BindableNumber<int> sizeY = new BindableNumber<int> { MinValue = 0 };
 
+        private SettingsButton aspectResetButton;
+
+        private readonly BindableNumber<float> aspectRatio = new BindableFloat(1)
+        {
+            MinValue = 0.5f,
+            MaxValue = 2,
+            Precision = 0.01f,
+        };
+
         protected override string Header => "Tablet";
 
         public TabletSettings(ITabletHandler tabletHandler)
@@ -48,6 +58,33 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             {
                 sizeX.Value = val.NewValue.Width;
                 sizeY.Value = val.NewValue.Height;
+
+                float proposedAspectRatio = (float)sizeX.Value / sizeY.Value;
+
+                aspectRatio.Value = proposedAspectRatio;
+
+                if (proposedAspectRatio < aspectRatio.MinValue || proposedAspectRatio > aspectRatio.MaxValue)
+                {
+                    // apply aspect ratio restrictions to keep things in a usable state.
+
+                    // correction is always going to be below 1.
+                    float correction = proposedAspectRatio > aspectRatio.Value
+                        ? aspectRatio.Value / proposedAspectRatio
+                        : proposedAspectRatio / aspectRatio.Value;
+
+                    if (val.NewValue.Width != val.OldValue.Width)
+                    {
+                        if (val.NewValue.Width > val.OldValue.Width)
+                            correction = 1 / correction;
+                        areaSize.Value = new Size(areaSize.Value.Width, (int)(val.NewValue.Height * correction));
+                    }
+                    else
+                    {
+                        if (val.NewValue.Height > val.OldValue.Height)
+                            correction = 1 / correction;
+                        areaSize.Value = new Size((int)(val.NewValue.Width * correction), areaSize.Value.Height);
+                    }
+                }
             }, true);
 
             sizeX.BindValueChanged(val => areaSize.Value = new Size(val.NewValue, areaSize.Value.Height));
@@ -97,6 +134,15 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 {
                     LabelText = "Lock aspect ratio",
                 },
+                aspectResetButton = new SettingsButton
+                {
+                    Text = "Take aspect ratio from screen size",
+                },
+                new SettingsSlider<float>
+                {
+                    LabelText = "Aspect Ratio",
+                    Current = aspectRatio
+                },
                 new SettingsSlider<int>
                 {
                     LabelText = "X Offset",

From e3bed4c97dff26b9af05609fa100c2d748956b3c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Mar 2021 17:57:50 +0900
Subject: [PATCH 1910/3722] Simplify aspect ratio application, add window
 conforming and direct adjustment

---
 .../Settings/Sections/Input/TabletSettings.cs | 120 ++++++++++++------
 1 file changed, 81 insertions(+), 39 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index 5d85ecf138..9fa74eda18 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.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 System.ComponentModel;
 using System.Drawing;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Handlers.Tablet;
+using osu.Framework.Platform;
+using osu.Framework.Threading;
 
 namespace osu.Game.Overlays.Settings.Sections.Input
 {
@@ -21,18 +23,28 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         private readonly BindableNumber<int> offsetX = new BindableNumber<int> { MinValue = 0 };
         private readonly BindableNumber<int> offsetY = new BindableNumber<int> { MinValue = 0 };
 
-        private readonly BindableNumber<int> sizeX = new BindableNumber<int> { MinValue = 0 };
-        private readonly BindableNumber<int> sizeY = new BindableNumber<int> { MinValue = 0 };
+        private readonly BindableNumber<int> sizeX = new BindableNumber<int> { MinValue = 10 };
+        private readonly BindableNumber<int> sizeY = new BindableNumber<int> { MinValue = 10 };
 
-        private SettingsButton aspectResetButton;
+        [Resolved]
+        private GameHost host { get; set; }
+
+        /// <summary>
+        /// Based on the longest available smartphone.
+        /// </summary>
+        private const float largest_feasible_aspect_ratio = 20f / 9;
 
         private readonly BindableNumber<float> aspectRatio = new BindableFloat(1)
         {
-            MinValue = 0.5f,
-            MaxValue = 2,
+            MinValue = 1 / largest_feasible_aspect_ratio,
+            MaxValue = largest_feasible_aspect_ratio,
             Precision = 0.01f,
         };
 
+        private readonly BindableBool aspectLock = new BindableBool();
+
+        private ScheduledDelegate aspectRatioApplication;
+
         protected override string Header => "Tablet";
 
         public TabletSettings(ITabletHandler tabletHandler)
@@ -59,37 +71,18 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 sizeX.Value = val.NewValue.Width;
                 sizeY.Value = val.NewValue.Height;
 
-                float proposedAspectRatio = (float)sizeX.Value / sizeY.Value;
-
-                aspectRatio.Value = proposedAspectRatio;
-
-                if (proposedAspectRatio < aspectRatio.MinValue || proposedAspectRatio > aspectRatio.MaxValue)
-                {
-                    // apply aspect ratio restrictions to keep things in a usable state.
-
-                    // correction is always going to be below 1.
-                    float correction = proposedAspectRatio > aspectRatio.Value
-                        ? aspectRatio.Value / proposedAspectRatio
-                        : proposedAspectRatio / aspectRatio.Value;
-
-                    if (val.NewValue.Width != val.OldValue.Width)
-                    {
-                        if (val.NewValue.Width > val.OldValue.Width)
-                            correction = 1 / correction;
-                        areaSize.Value = new Size(areaSize.Value.Width, (int)(val.NewValue.Height * correction));
-                    }
-                    else
-                    {
-                        if (val.NewValue.Height > val.OldValue.Height)
-                            correction = 1 / correction;
-                        areaSize.Value = new Size((int)(val.NewValue.Width * correction), areaSize.Value.Height);
-                    }
-                }
+                aspectRatioApplication?.Cancel();
+                aspectRatioApplication = Schedule(() => applyAspectRatio(val));
             }, true);
 
             sizeX.BindValueChanged(val => areaSize.Value = new Size(val.NewValue, areaSize.Value.Height));
             sizeY.BindValueChanged(val => areaSize.Value = new Size(areaSize.Value.Width, val.NewValue));
 
+            aspectRatio.BindValueChanged(aspect =>
+            {
+                forceAspectRatio(aspect.NewValue);
+            });
+
             ((IBindable<Size>)tabletSize).BindTo(tabletHandler.TabletSize);
             tabletSize.BindValueChanged(val =>
             {
@@ -109,6 +102,33 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             }, true);
         }
 
+        private void applyAspectRatio(ValueChangedEvent<Size> sizeChanged)
+        {
+            float proposedAspectRatio = (float)sizeX.Value / sizeY.Value;
+
+            if (!aspectLock.Value)
+            {
+                aspectRatio.Value = proposedAspectRatio;
+
+                // aspect ratio was in a valid range.
+                if (proposedAspectRatio >= aspectRatio.MinValue && proposedAspectRatio <= aspectRatio.MaxValue)
+                    return;
+            }
+
+            if (sizeChanged.NewValue.Width != sizeChanged.OldValue.Width)
+            {
+                areaSize.Value = new Size(areaSize.Value.Width, (int)(areaSize.Value.Width / aspectRatio.Value));
+            }
+            else
+            {
+                areaSize.Value = new Size((int)(areaSize.Value.Height * aspectRatio.Value), areaSize.Value.Height);
+            }
+
+            // cancel any event which may have fired while updating variables as a result of aspect ratio limitations.
+            // this avoids a potential feedback loop.
+            aspectRatioApplication?.Cancel();
+        }
+
         private void updateDisplay()
         {
             if (Children.Count > 0)
@@ -121,22 +141,24 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                     RelativeSizeAxes = Axes.X,
                     Height = 300,
                 },
-                new SettingsButton
+                new DangerousSettingsButton
                 {
                     Text = "Reset to full area",
                     Action = () =>
                     {
+                        aspectLock.Value = false;
+
                         areaOffset.SetDefault();
                         areaSize.SetDefault();
                     },
                 },
-                new SettingsCheckbox
+                new SettingsButton
                 {
-                    LabelText = "Lock aspect ratio",
-                },
-                aspectResetButton = new SettingsButton
-                {
-                    Text = "Take aspect ratio from screen size",
+                    Text = "Conform to current game aspect ratio",
+                    Action = () =>
+                    {
+                        forceAspectRatio((float)host.Window.ClientSize.Width / host.Window.ClientSize.Height);
+                    }
                 },
                 new SettingsSlider<float>
                 {
@@ -153,6 +175,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                     LabelText = "Y Offset",
                     Current = offsetY
                 },
+                new SettingsCheckbox
+                {
+                    LabelText = "Lock aspect ratio",
+                    Current = aspectLock
+                },
                 new SettingsSlider<int>
                 {
                     LabelText = "Width",
@@ -165,5 +192,20 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 },
             };
         }
+
+        private void forceAspectRatio(float aspectRatio)
+        {
+            aspectLock.Value = false;
+
+            int proposedHeight = (int)(sizeX.Value / aspectRatio);
+
+            if (proposedHeight < sizeY.MaxValue)
+                sizeY.Value = proposedHeight;
+            else
+                sizeX.Value = (int)(sizeY.Value * aspectRatio);
+
+            aspectRatioApplication?.Cancel();
+            aspectLock.Value = true;
+        }
     }
 }

From 932745e5c4049e8cf15074f5ecca437364d18fd9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Mar 2021 18:14:29 +0900
Subject: [PATCH 1911/3722] Fix remaining feedback loops

---
 .../Settings/Sections/Input/TabletSettings.cs | 51 ++++++++++++-------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index 9fa74eda18..e94df7dc1b 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.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.ComponentModel;
 using System.Drawing;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -80,7 +79,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
             aspectRatio.BindValueChanged(aspect =>
             {
-                forceAspectRatio(aspect.NewValue);
+                aspectRatioApplication?.Cancel();
+                aspectRatioApplication = Schedule(() => forceAspectRatio(aspect.NewValue));
             });
 
             ((IBindable<Size>)tabletSize).BindTo(tabletHandler.TabletSize);
@@ -102,31 +102,44 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             }, true);
         }
 
+        private float curentAspectRatio => (float)sizeX.Value / sizeY.Value;
+
         private void applyAspectRatio(ValueChangedEvent<Size> sizeChanged)
         {
-            float proposedAspectRatio = (float)sizeX.Value / sizeY.Value;
+            float proposedAspectRatio = curentAspectRatio;
 
-            if (!aspectLock.Value)
+            try
             {
-                aspectRatio.Value = proposedAspectRatio;
+                if (!aspectLock.Value)
+                {
+                    // aspect ratio was in a valid range.
+                    if (proposedAspectRatio >= aspectRatio.MinValue && proposedAspectRatio <= aspectRatio.MaxValue)
+                    {
+                        updateAspectRatio();
+                        return;
+                    }
+                }
 
-                // aspect ratio was in a valid range.
-                if (proposedAspectRatio >= aspectRatio.MinValue && proposedAspectRatio <= aspectRatio.MaxValue)
-                    return;
+                if (sizeChanged.NewValue.Width != sizeChanged.OldValue.Width)
+                {
+                    areaSize.Value = new Size(areaSize.Value.Width, (int)(areaSize.Value.Width / aspectRatio.Value));
+                }
+                else
+                {
+                    areaSize.Value = new Size((int)(areaSize.Value.Height * aspectRatio.Value), areaSize.Value.Height);
+                }
             }
-
-            if (sizeChanged.NewValue.Width != sizeChanged.OldValue.Width)
+            finally
             {
-                areaSize.Value = new Size(areaSize.Value.Width, (int)(areaSize.Value.Width / aspectRatio.Value));
-            }
-            else
-            {
-                areaSize.Value = new Size((int)(areaSize.Value.Height * aspectRatio.Value), areaSize.Value.Height);
+                // cancel any event which may have fired while updating variables as a result of aspect ratio limitations.
+                // this avoids a potential feedback loop.
+                aspectRatioApplication?.Cancel();
             }
+        }
 
-            // cancel any event which may have fired while updating variables as a result of aspect ratio limitations.
-            // this avoids a potential feedback loop.
-            aspectRatioApplication?.Cancel();
+        private void updateAspectRatio()
+        {
+            aspectRatio.Value = curentAspectRatio;
         }
 
         private void updateDisplay()
@@ -204,6 +217,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             else
                 sizeX.Value = (int)(sizeY.Value * aspectRatio);
 
+            updateAspectRatio();
+
             aspectRatioApplication?.Cancel();
             aspectLock.Value = true;
         }

From bba25a0182660443283b91c01356742cae676e56 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Mar 2021 18:40:21 +0900
Subject: [PATCH 1912/3722] Tidy up draw hierarchy and bindable logic

---
 .../Sections/Input/TabletAreaSelection.cs     |   7 +-
 .../Settings/Sections/Input/TabletSettings.cs | 184 +++++++++---------
 2 files changed, 95 insertions(+), 96 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
index 6a3cc46e2b..3a278820f0 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         private readonly Bindable<Size> areaOffset = new BindableSize();
         private readonly Bindable<Size> areaSize = new BindableSize();
-        private readonly Bindable<Size> tabletSize = new BindableSize();
+        private readonly IBindable<Size> tabletSize = new BindableSize();
 
         private OsuSpriteText tabletName;
 
@@ -95,7 +95,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 checkBounds();
             }, true);
 
-            ((IBindable<Size>)tabletSize).BindTo(handler.TabletSize);
+            tabletSize.BindTo(handler.TabletSize);
             tabletSize.BindValueChanged(val =>
             {
                 tabletContainer.Size = new Vector2(val.NewValue.Width, val.NewValue.Height);
@@ -123,6 +123,9 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
             var size = tabletSize.Value;
 
+            if (size == System.Drawing.Size.Empty)
+                return;
+
             float fitX = size.Width / DrawWidth;
             float fitY = size.Height / DrawHeight;
 
diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index e94df7dc1b..3f8723025f 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         private readonly BindableSize areaOffset = new BindableSize();
         private readonly BindableSize areaSize = new BindableSize();
-        private readonly BindableSize tabletSize = new BindableSize();
+        private readonly IBindable<Size> tabletSize = new BindableSize();
 
         private readonly BindableNumber<int> offsetX = new BindableNumber<int> { MinValue = 0 };
         private readonly BindableNumber<int> offsetY = new BindableNumber<int> { MinValue = 0 };
@@ -54,99 +54,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         [BackgroundDependencyLoader]
         private void load()
         {
-            areaOffset.BindTo(tabletHandler.AreaOffset);
-            areaOffset.BindValueChanged(val =>
-            {
-                offsetX.Value = val.NewValue.Width;
-                offsetY.Value = val.NewValue.Height;
-            }, true);
-
-            offsetX.BindValueChanged(val => areaOffset.Value = new Size(val.NewValue, areaOffset.Value.Height));
-            offsetY.BindValueChanged(val => areaOffset.Value = new Size(areaOffset.Value.Width, val.NewValue));
-
-            areaSize.BindTo(tabletHandler.AreaSize);
-            areaSize.BindValueChanged(val =>
-            {
-                sizeX.Value = val.NewValue.Width;
-                sizeY.Value = val.NewValue.Height;
-
-                aspectRatioApplication?.Cancel();
-                aspectRatioApplication = Schedule(() => applyAspectRatio(val));
-            }, true);
-
-            sizeX.BindValueChanged(val => areaSize.Value = new Size(val.NewValue, areaSize.Value.Height));
-            sizeY.BindValueChanged(val => areaSize.Value = new Size(areaSize.Value.Width, val.NewValue));
-
-            aspectRatio.BindValueChanged(aspect =>
-            {
-                aspectRatioApplication?.Cancel();
-                aspectRatioApplication = Schedule(() => forceAspectRatio(aspect.NewValue));
-            });
-
-            ((IBindable<Size>)tabletSize).BindTo(tabletHandler.TabletSize);
-            tabletSize.BindValueChanged(val =>
-            {
-                if (tabletSize.Value == System.Drawing.Size.Empty)
-                    return;
-
-                // todo: these should propagate from a TabletChanged event or similar.
-                offsetX.MaxValue = val.NewValue.Width;
-                sizeX.Default = sizeX.MaxValue = val.NewValue.Width;
-
-                offsetY.MaxValue = val.NewValue.Height;
-                sizeY.Default = sizeY.MaxValue = val.NewValue.Height;
-
-                areaSize.Default = new Size(sizeX.Default, sizeY.Default);
-
-                updateDisplay();
-            }, true);
-        }
-
-        private float curentAspectRatio => (float)sizeX.Value / sizeY.Value;
-
-        private void applyAspectRatio(ValueChangedEvent<Size> sizeChanged)
-        {
-            float proposedAspectRatio = curentAspectRatio;
-
-            try
-            {
-                if (!aspectLock.Value)
-                {
-                    // aspect ratio was in a valid range.
-                    if (proposedAspectRatio >= aspectRatio.MinValue && proposedAspectRatio <= aspectRatio.MaxValue)
-                    {
-                        updateAspectRatio();
-                        return;
-                    }
-                }
-
-                if (sizeChanged.NewValue.Width != sizeChanged.OldValue.Width)
-                {
-                    areaSize.Value = new Size(areaSize.Value.Width, (int)(areaSize.Value.Width / aspectRatio.Value));
-                }
-                else
-                {
-                    areaSize.Value = new Size((int)(areaSize.Value.Height * aspectRatio.Value), areaSize.Value.Height);
-                }
-            }
-            finally
-            {
-                // cancel any event which may have fired while updating variables as a result of aspect ratio limitations.
-                // this avoids a potential feedback loop.
-                aspectRatioApplication?.Cancel();
-            }
-        }
-
-        private void updateAspectRatio()
-        {
-            aspectRatio.Value = curentAspectRatio;
-        }
-
-        private void updateDisplay()
-        {
-            if (Children.Count > 0)
-                return;
-
             Children = new Drawable[]
             {
                 new TabletAreaSelection(tabletHandler)
@@ -204,6 +111,91 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                     Current = sizeY
                 },
             };
+
+            areaOffset.BindTo(tabletHandler.AreaOffset);
+            areaOffset.BindValueChanged(val =>
+            {
+                offsetX.Value = val.NewValue.Width;
+                offsetY.Value = val.NewValue.Height;
+            }, true);
+
+            offsetX.BindValueChanged(val => areaOffset.Value = new Size(val.NewValue, areaOffset.Value.Height));
+            offsetY.BindValueChanged(val => areaOffset.Value = new Size(areaOffset.Value.Width, val.NewValue));
+
+            areaSize.BindTo(tabletHandler.AreaSize);
+            areaSize.BindValueChanged(val =>
+            {
+                sizeX.Value = val.NewValue.Width;
+                sizeY.Value = val.NewValue.Height;
+            }, true);
+
+            sizeX.BindValueChanged(val =>
+            {
+                areaSize.Value = new Size(val.NewValue, areaSize.Value.Height);
+
+                aspectRatioApplication?.Cancel();
+                aspectRatioApplication = Schedule(() => applyAspectRatio(sizeX));
+            });
+
+            sizeY.BindValueChanged(val =>
+            {
+                areaSize.Value = new Size(areaSize.Value.Width, val.NewValue);
+
+                aspectRatioApplication?.Cancel();
+                aspectRatioApplication = Schedule(() => applyAspectRatio(sizeY));
+            });
+
+            aspectRatio.BindValueChanged(aspect =>
+            {
+                aspectRatioApplication?.Cancel();
+                aspectRatioApplication = Schedule(() => forceAspectRatio(aspect.NewValue));
+            });
+
+            tabletSize.BindTo(tabletHandler.TabletSize);
+            tabletSize.BindValueChanged(val =>
+            {
+                if (tabletSize.Value == System.Drawing.Size.Empty)
+                    return;
+
+                // todo: these should propagate from a TabletChanged event or similar.
+                offsetX.MaxValue = val.NewValue.Width;
+                sizeX.Default = sizeX.MaxValue = val.NewValue.Width;
+
+                offsetY.MaxValue = val.NewValue.Height;
+                sizeY.Default = sizeY.MaxValue = val.NewValue.Height;
+
+                areaSize.Default = new Size(sizeX.Default, sizeY.Default);
+            }, true);
+        }
+
+        private void applyAspectRatio(BindableNumber<int> sizeChanged)
+        {
+            try
+            {
+                if (!aspectLock.Value)
+                {
+                    float proposedAspectRatio = curentAspectRatio;
+
+                    if (proposedAspectRatio >= aspectRatio.MinValue && proposedAspectRatio <= aspectRatio.MaxValue)
+                    {
+                        // aspect ratio was in a valid range.
+                        updateAspectRatio();
+                        return;
+                    }
+                }
+
+                // if lock is applied (or the specified values were out of range) aim to adjust the axis the user was not adjusting to conform.
+                if (sizeChanged == sizeX)
+                    sizeY.Value = (int)(areaSize.Value.Width / aspectRatio.Value);
+                else
+                    sizeX.Value = (int)(areaSize.Value.Height * aspectRatio.Value);
+            }
+            finally
+            {
+                // cancel any event which may have fired while updating variables as a result of aspect ratio limitations.
+                // this avoids a potential feedback loop.
+                aspectRatioApplication?.Cancel();
+            }
         }
 
         private void forceAspectRatio(float aspectRatio)
@@ -222,5 +214,9 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             aspectRatioApplication?.Cancel();
             aspectLock.Value = true;
         }
+
+        private void updateAspectRatio() => aspectRatio.Value = curentAspectRatio;
+
+        private float curentAspectRatio => (float)sizeX.Value / sizeY.Value;
     }
 }

From a8e319a320a1aae74a29432b0794a16ce869330a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Mar 2021 18:51:43 +0900
Subject: [PATCH 1913/3722] Remove min/max from test scene to fix weirdness
 when switching test sizings

---
 osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs b/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
index 3d65db9420..aaf2f13953 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
@@ -21,12 +21,7 @@ namespace osu.Game.Tests.Visual.Settings
         {
             var tabletHandler = new TestTabletHandler();
 
-            tabletHandler.AreaOffset.MinValue = new Size(0, 0);
-            tabletHandler.AreaOffset.MaxValue = new Size(160, 100);
             tabletHandler.AreaOffset.Value = new Size(10, 10);
-
-            tabletHandler.AreaSize.MinValue = new Size(10, 10);
-            tabletHandler.AreaSize.MaxValue = new Size(160, 100);
             tabletHandler.AreaSize.Value = new Size(100, 80);
 
             AddRange(new Drawable[]

From 9a6a0f3df5e8a2d4a67f4bc567ba3e5db8a76a2c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Mar 2021 23:47:08 +0900
Subject: [PATCH 1914/3722] Add test coverage and better UI handling of no
 tablet connected scenario

---
 .../Settings/TestSceneTabletSettings.cs       |  10 +-
 .../Settings/Sections/Input/TabletSettings.cs | 130 +++++++++++-------
 2 files changed, 89 insertions(+), 51 deletions(-)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs b/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
index aaf2f13953..2baeadddc0 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
@@ -8,6 +8,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Handlers.Tablet;
 using osu.Framework.Platform;
+using osu.Framework.Utils;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Settings.Sections.Input;
 
@@ -39,6 +40,7 @@ namespace osu.Game.Tests.Visual.Settings
             AddStep("Test with square tablet", () => tabletHandler.SetTabletSize(new Size(300, 300)));
             AddStep("Test with tall tablet", () => tabletHandler.SetTabletSize(new Size(100, 300)));
             AddStep("Test with very tall tablet", () => tabletHandler.SetTabletSize(new Size(100, 700)));
+            AddStep("Test no tablet present", () => tabletHandler.SetTabletSize(System.Drawing.Size.Empty));
         }
 
         public class TestTabletHandler : ITabletHandler
@@ -48,10 +50,14 @@ namespace osu.Game.Tests.Visual.Settings
             public BindableSize AreaOffset { get; } = new BindableSize();
             public BindableSize AreaSize { get; } = new BindableSize();
             public IBindable<Size> TabletSize => tabletSize;
-            public string DeviceName => "test tablet T-421";
+            public string DeviceName { get; private set; }
             public BindableBool Enabled { get; } = new BindableBool(true);
 
-            public void SetTabletSize(Size size) => tabletSize.Value = size;
+            public void SetTabletSize(Size size)
+            {
+                DeviceName = size != System.Drawing.Size.Empty ? $"test tablet T-{RNG.Next(999):000}" : string.Empty;
+                tabletSize.Value = size;
+            }
         }
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index 3f8723025f..7da61cf192 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -5,9 +5,11 @@ using System.Drawing;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Handlers.Tablet;
 using osu.Framework.Platform;
 using osu.Framework.Threading;
+using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Overlays.Settings.Sections.Input
 {
@@ -44,6 +46,10 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         private ScheduledDelegate aspectRatioApplication;
 
+        private FillFlowContainer mainSettings;
+
+        private OsuSpriteText noTabletMessage;
+
         protected override string Header => "Tablet";
 
         public TabletSettings(ITabletHandler tabletHandler)
@@ -56,60 +62,77 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         {
             Children = new Drawable[]
             {
-                new TabletAreaSelection(tabletHandler)
+                noTabletMessage = new OsuSpriteText
                 {
+                    Text = "No tablet detected!",
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+                mainSettings = new FillFlowContainer
+                {
+                    Alpha = 0,
                     RelativeSizeAxes = Axes.X,
-                    Height = 300,
-                },
-                new DangerousSettingsButton
-                {
-                    Text = "Reset to full area",
-                    Action = () =>
+                    AutoSizeAxes = Axes.Y,
+                    Direction = FillDirection.Vertical,
+                    Children = new Drawable[]
                     {
-                        aspectLock.Value = false;
+                        new TabletAreaSelection(tabletHandler)
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            Height = 300,
+                            Margin = new MarginPadding(10)
+                        },
+                        new DangerousSettingsButton
+                        {
+                            Text = "Reset to full area",
+                            Action = () =>
+                            {
+                                aspectLock.Value = false;
 
-                        areaOffset.SetDefault();
-                        areaSize.SetDefault();
-                    },
-                },
-                new SettingsButton
-                {
-                    Text = "Conform to current game aspect ratio",
-                    Action = () =>
-                    {
-                        forceAspectRatio((float)host.Window.ClientSize.Width / host.Window.ClientSize.Height);
+                                areaOffset.SetDefault();
+                                areaSize.SetDefault();
+                            },
+                        },
+                        new SettingsButton
+                        {
+                            Text = "Conform to current game aspect ratio",
+                            Action = () =>
+                            {
+                                forceAspectRatio((float)host.Window.ClientSize.Width / host.Window.ClientSize.Height);
+                            }
+                        },
+                        new SettingsSlider<float>
+                        {
+                            LabelText = "Aspect Ratio",
+                            Current = aspectRatio
+                        },
+                        new SettingsSlider<int>
+                        {
+                            LabelText = "X Offset",
+                            Current = offsetX
+                        },
+                        new SettingsSlider<int>
+                        {
+                            LabelText = "Y Offset",
+                            Current = offsetY
+                        },
+                        new SettingsCheckbox
+                        {
+                            LabelText = "Lock aspect ratio",
+                            Current = aspectLock
+                        },
+                        new SettingsSlider<int>
+                        {
+                            LabelText = "Width",
+                            Current = sizeX
+                        },
+                        new SettingsSlider<int>
+                        {
+                            LabelText = "Height",
+                            Current = sizeY
+                        },
                     }
                 },
-                new SettingsSlider<float>
-                {
-                    LabelText = "Aspect Ratio",
-                    Current = aspectRatio
-                },
-                new SettingsSlider<int>
-                {
-                    LabelText = "X Offset",
-                    Current = offsetX
-                },
-                new SettingsSlider<int>
-                {
-                    LabelText = "Y Offset",
-                    Current = offsetY
-                },
-                new SettingsCheckbox
-                {
-                    LabelText = "Lock aspect ratio",
-                    Current = aspectLock
-                },
-                new SettingsSlider<int>
-                {
-                    LabelText = "Width",
-                    Current = sizeX
-                },
-                new SettingsSlider<int>
-                {
-                    LabelText = "Height",
-                    Current = sizeY
-                },
             };
 
             areaOffset.BindTo(tabletHandler.AreaOffset);
@@ -154,8 +177,17 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             tabletSize.BindTo(tabletHandler.TabletSize);
             tabletSize.BindValueChanged(val =>
             {
-                if (tabletSize.Value == System.Drawing.Size.Empty)
+                bool tabletFound = tabletSize.Value != System.Drawing.Size.Empty;
+
+                if (!tabletFound)
+                {
+                    mainSettings.Hide();
+                    noTabletMessage.Show();
                     return;
+                }
+
+                mainSettings.Show();
+                noTabletMessage.Hide();
 
                 // todo: these should propagate from a TabletChanged event or similar.
                 offsetX.MaxValue = val.NewValue.Width;

From d422a6590036dc26a881fa2519da4d09111ac479 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Mar 2021 23:47:18 +0900
Subject: [PATCH 1915/3722] Fix initial tablet size not being initialised

---
 .../Settings/Sections/Input/TabletAreaSelection.cs         | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
index 3a278820f0..af144c8102 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
@@ -80,6 +80,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                     },
                 }
             };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
 
             areaOffset.BindTo(handler.AreaOffset);
             areaOffset.BindValueChanged(val =>
@@ -101,7 +106,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 tabletContainer.Size = new Vector2(val.NewValue.Width, val.NewValue.Height);
                 tabletName.Text = handler.DeviceName;
                 checkBounds();
-            });
+            }, true);
         }
 
         [Resolved]

From 9d0c8902a6e6dcc1edc369b8ebf768089f22c8a6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 Mar 2021 23:57:05 +0900
Subject: [PATCH 1916/3722] Fix margins and spacing between sub flowed items

---
 .../Overlays/Settings/Sections/Input/TabletAreaSelection.cs | 6 +++---
 osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
index af144c8102..3b1bae7cf0 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
@@ -32,13 +32,13 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         public TabletAreaSelection(ITabletHandler handler)
         {
             this.handler = handler;
+
+            Padding = new MarginPadding { Horizontal = SettingsPanel.CONTENT_MARGINS };
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            Padding = new MarginPadding(5);
-
             InternalChild = tabletContainer = new Container
             {
                 Anchor = Anchor.Centre,
@@ -131,7 +131,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             if (size == System.Drawing.Size.Empty)
                 return;
 
-            float fitX = size.Width / DrawWidth;
+            float fitX = size.Width / (DrawWidth - Padding.Left - Padding.Right);
             float fitY = size.Height / DrawHeight;
 
             float adjust = MathF.Max(fitX, fitY);
diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index 7da61cf192..b17cfced95 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -10,6 +10,7 @@ using osu.Framework.Input.Handlers.Tablet;
 using osu.Framework.Platform;
 using osu.Framework.Threading;
 using osu.Game.Graphics.Sprites;
+using osuTK;
 
 namespace osu.Game.Overlays.Settings.Sections.Input
 {
@@ -67,12 +68,14 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                     Text = "No tablet detected!",
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
+                    Padding = new MarginPadding { Horizontal = SettingsPanel.CONTENT_MARGINS }
                 },
                 mainSettings = new FillFlowContainer
                 {
                     Alpha = 0,
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
+                    Spacing = new Vector2(0, 8),
                     Direction = FillDirection.Vertical,
                     Children = new Drawable[]
                     {
@@ -80,7 +83,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                         {
                             RelativeSizeAxes = Axes.X,
                             Height = 300,
-                            Margin = new MarginPadding(10)
                         },
                         new DangerousSettingsButton
                         {

From 196f95ae545853c00e3da66ba9bc20e4871c75a2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 12:50:02 +0900
Subject: [PATCH 1917/3722] Update to use new bindables and centered area
 offset

---
 .../Settings/TestSceneTabletSettings.cs       | 44 +++++++-----
 .../Sections/Input/TabletAreaSelection.cs     | 49 ++++++++------
 .../Settings/Sections/Input/TabletSettings.cs | 67 ++++++++++---------
 3 files changed, 89 insertions(+), 71 deletions(-)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs b/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
index 2baeadddc0..a7f6c8c0d3 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.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 NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -11,6 +10,7 @@ using osu.Framework.Platform;
 using osu.Framework.Utils;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Settings.Sections.Input;
+using osuTK;
 
 namespace osu.Game.Tests.Visual.Settings
 {
@@ -22,9 +22,6 @@ namespace osu.Game.Tests.Visual.Settings
         {
             var tabletHandler = new TestTabletHandler();
 
-            tabletHandler.AreaOffset.Value = new Size(10, 10);
-            tabletHandler.AreaSize.Value = new Size(100, 80);
-
             AddRange(new Drawable[]
             {
                 new TabletSettings(tabletHandler)
@@ -36,27 +33,40 @@ namespace osu.Game.Tests.Visual.Settings
                 }
             });
 
-            AddStep("Test with wide tablet", () => tabletHandler.SetTabletSize(new Size(160, 100)));
-            AddStep("Test with square tablet", () => tabletHandler.SetTabletSize(new Size(300, 300)));
-            AddStep("Test with tall tablet", () => tabletHandler.SetTabletSize(new Size(100, 300)));
-            AddStep("Test with very tall tablet", () => tabletHandler.SetTabletSize(new Size(100, 700)));
-            AddStep("Test no tablet present", () => tabletHandler.SetTabletSize(System.Drawing.Size.Empty));
+            AddStep("Test with wide tablet", () => tabletHandler.SetTabletSize(new Vector2(160, 100)));
+            AddStep("Test with square tablet", () => tabletHandler.SetTabletSize(new Vector2(300, 300)));
+            AddStep("Test with tall tablet", () => tabletHandler.SetTabletSize(new Vector2(100, 300)));
+            AddStep("Test with very tall tablet", () => tabletHandler.SetTabletSize(new Vector2(100, 700)));
+            AddStep("Test no tablet present", () => tabletHandler.SetTabletSize(Vector2.Zero));
         }
 
         public class TestTabletHandler : ITabletHandler
         {
-            private readonly Bindable<Size> tabletSize = new Bindable<Size>();
+            public Bindable<Vector2> AreaOffset { get; } = new Bindable<Vector2>();
+            public Bindable<Vector2> AreaSize { get; } = new Bindable<Vector2>();
+
+            public IBindable<TabletInfo> Tablet => tablet;
+
+            private readonly Bindable<TabletInfo> tablet = new Bindable<TabletInfo>();
 
-            public BindableSize AreaOffset { get; } = new BindableSize();
-            public BindableSize AreaSize { get; } = new BindableSize();
-            public IBindable<Size> TabletSize => tabletSize;
-            public string DeviceName { get; private set; }
             public BindableBool Enabled { get; } = new BindableBool(true);
 
-            public void SetTabletSize(Size size)
+            public void SetTabletSize(Vector2 size)
             {
-                DeviceName = size != System.Drawing.Size.Empty ? $"test tablet T-{RNG.Next(999):000}" : string.Empty;
-                tabletSize.Value = size;
+                tablet.Value = size != Vector2.Zero ? new TabletInfo($"test tablet T-{RNG.Next(999):000}", size) : null;
+
+                AreaSize.Default = new Vector2(size.X, size.Y);
+
+                // if it's clear the user has not configured the area, take the full area from the tablet that was just found.
+                if (AreaSize.Value == Vector2.Zero)
+                    AreaSize.SetDefault();
+
+                AreaOffset.Default = new Vector2(size.X / 2, size.Y / 2);
+
+                // likewise with the position, use the centre point if it has not been configured.
+                // it's safe to assume no user would set their centre point to 0,0 for now.
+                if (AreaOffset.Value == Vector2.Zero)
+                    AreaOffset.SetDefault();
             }
         }
     }
diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
index 3b1bae7cf0..c0412fb99d 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Drawing;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -23,9 +22,10 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         private Container tabletContainer;
         private Container usableAreaContainer;
 
-        private readonly Bindable<Size> areaOffset = new BindableSize();
-        private readonly Bindable<Size> areaSize = new BindableSize();
-        private readonly IBindable<Size> tabletSize = new BindableSize();
+        private readonly Bindable<Vector2> areaOffset = new Bindable<Vector2>();
+        private readonly Bindable<Vector2> areaSize = new Bindable<Vector2>();
+
+        private readonly IBindable<TabletInfo> tablet = new Bindable<TabletInfo>();
 
         private OsuSpriteText tabletName;
 
@@ -56,6 +56,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                     },
                     usableAreaContainer = new Container
                     {
+                        Origin = Anchor.Centre,
                         Children = new Drawable[]
                         {
                             new Box
@@ -89,24 +90,27 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             areaOffset.BindTo(handler.AreaOffset);
             areaOffset.BindValueChanged(val =>
             {
-                usableAreaContainer.MoveTo(new Vector2(val.NewValue.Width, val.NewValue.Height), 100, Easing.OutQuint);
-                checkBounds();
+                usableAreaContainer.MoveTo(val.NewValue, 100, Easing.OutQuint)
+                                   .OnComplete(_ => checkBounds()); // required as we are using SSDQ.
             }, true);
 
             areaSize.BindTo(handler.AreaSize);
             areaSize.BindValueChanged(val =>
             {
-                usableAreaContainer.ResizeTo(new Vector2(val.NewValue.Width, val.NewValue.Height), 100, Easing.OutQuint);
+                usableAreaContainer.ResizeTo(val.NewValue, 100, Easing.OutQuint)
+                                   .OnComplete(_ => checkBounds()); // required as we are using SSDQ.
+            }, true);
+
+            tablet.BindTo(handler.Tablet);
+            tablet.BindValueChanged(val =>
+            {
+                tabletContainer.Size = val.NewValue?.Size ?? Vector2.Zero;
+                tabletName.Text = val.NewValue?.Name ?? string.Empty;
                 checkBounds();
             }, true);
 
-            tabletSize.BindTo(handler.TabletSize);
-            tabletSize.BindValueChanged(val =>
-            {
-                tabletContainer.Size = new Vector2(val.NewValue.Width, val.NewValue.Height);
-                tabletName.Text = handler.DeviceName;
-                checkBounds();
-            }, true);
+            // initial animation should be instant.
+            FinishTransforms(true);
         }
 
         [Resolved]
@@ -114,10 +118,13 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         private void checkBounds()
         {
-            Size areaExtent = areaOffset.Value + areaSize.Value;
+            if (tablet.Value == null)
+                return;
 
-            bool isWithinBounds = areaExtent.Width <= tabletSize.Value.Width
-                                  && areaExtent.Height <= tabletSize.Value.Height;
+            var usableSsdq = usableAreaContainer.ScreenSpaceDrawQuad;
+
+            bool isWithinBounds = tabletContainer.ScreenSpaceDrawQuad.Contains(usableSsdq.TopLeft) &&
+                                  tabletContainer.ScreenSpaceDrawQuad.Contains(usableSsdq.BottomRight);
 
             usableAreaContainer.FadeColour(isWithinBounds ? colour.Blue : colour.RedLight, 100);
         }
@@ -126,13 +133,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         {
             base.Update();
 
-            var size = tabletSize.Value;
-
-            if (size == System.Drawing.Size.Empty)
+            if (!(tablet.Value?.Size is Vector2 size))
                 return;
 
-            float fitX = size.Width / (DrawWidth - Padding.Left - Padding.Right);
-            float fitY = size.Height / DrawHeight;
+            float fitX = size.X / (DrawWidth - Padding.Left - Padding.Right);
+            float fitY = size.Y / DrawHeight;
 
             float adjust = MathF.Max(fitX, fitY);
 
diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index b17cfced95..9f81391434 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.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 osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -18,15 +17,15 @@ namespace osu.Game.Overlays.Settings.Sections.Input
     {
         private readonly ITabletHandler tabletHandler;
 
-        private readonly BindableSize areaOffset = new BindableSize();
-        private readonly BindableSize areaSize = new BindableSize();
-        private readonly IBindable<Size> tabletSize = new BindableSize();
+        private readonly Bindable<Vector2> areaOffset = new Bindable<Vector2>();
+        private readonly Bindable<Vector2> areaSize = new Bindable<Vector2>();
+        private readonly IBindable<TabletInfo> tablet = new Bindable<TabletInfo>();
 
-        private readonly BindableNumber<int> offsetX = new BindableNumber<int> { MinValue = 0 };
-        private readonly BindableNumber<int> offsetY = new BindableNumber<int> { MinValue = 0 };
+        private readonly BindableNumber<float> offsetX = new BindableNumber<float> { MinValue = 0 };
+        private readonly BindableNumber<float> offsetY = new BindableNumber<float> { MinValue = 0 };
 
-        private readonly BindableNumber<int> sizeX = new BindableNumber<int> { MinValue = 10 };
-        private readonly BindableNumber<int> sizeY = new BindableNumber<int> { MinValue = 10 };
+        private readonly BindableNumber<float> sizeX = new BindableNumber<float> { MinValue = 10 };
+        private readonly BindableNumber<float> sizeY = new BindableNumber<float> { MinValue = 10 };
 
         [Resolved]
         private GameHost host { get; set; }
@@ -108,12 +107,12 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                             LabelText = "Aspect Ratio",
                             Current = aspectRatio
                         },
-                        new SettingsSlider<int>
+                        new SettingsSlider<float>
                         {
                             LabelText = "X Offset",
                             Current = offsetX
                         },
-                        new SettingsSlider<int>
+                        new SettingsSlider<float>
                         {
                             LabelText = "Y Offset",
                             Current = offsetY
@@ -123,12 +122,12 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                             LabelText = "Lock aspect ratio",
                             Current = aspectLock
                         },
-                        new SettingsSlider<int>
+                        new SettingsSlider<float>
                         {
                             LabelText = "Width",
                             Current = sizeX
                         },
-                        new SettingsSlider<int>
+                        new SettingsSlider<float>
                         {
                             LabelText = "Height",
                             Current = sizeY
@@ -140,23 +139,23 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             areaOffset.BindTo(tabletHandler.AreaOffset);
             areaOffset.BindValueChanged(val =>
             {
-                offsetX.Value = val.NewValue.Width;
-                offsetY.Value = val.NewValue.Height;
+                offsetX.Value = val.NewValue.X;
+                offsetY.Value = val.NewValue.Y;
             }, true);
 
-            offsetX.BindValueChanged(val => areaOffset.Value = new Size(val.NewValue, areaOffset.Value.Height));
-            offsetY.BindValueChanged(val => areaOffset.Value = new Size(areaOffset.Value.Width, val.NewValue));
+            offsetX.BindValueChanged(val => areaOffset.Value = new Vector2(val.NewValue, areaOffset.Value.Y));
+            offsetY.BindValueChanged(val => areaOffset.Value = new Vector2(areaOffset.Value.X, val.NewValue));
 
             areaSize.BindTo(tabletHandler.AreaSize);
             areaSize.BindValueChanged(val =>
             {
-                sizeX.Value = val.NewValue.Width;
-                sizeY.Value = val.NewValue.Height;
+                sizeX.Value = val.NewValue.X;
+                sizeY.Value = val.NewValue.Y;
             }, true);
 
             sizeX.BindValueChanged(val =>
             {
-                areaSize.Value = new Size(val.NewValue, areaSize.Value.Height);
+                areaSize.Value = new Vector2(val.NewValue, areaSize.Value.Y);
 
                 aspectRatioApplication?.Cancel();
                 aspectRatioApplication = Schedule(() => applyAspectRatio(sizeX));
@@ -164,7 +163,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
             sizeY.BindValueChanged(val =>
             {
-                areaSize.Value = new Size(areaSize.Value.Width, val.NewValue);
+                areaSize.Value = new Vector2(areaSize.Value.X, val.NewValue);
 
                 aspectRatioApplication?.Cancel();
                 aspectRatioApplication = Schedule(() => applyAspectRatio(sizeY));
@@ -176,10 +175,12 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 aspectRatioApplication = Schedule(() => forceAspectRatio(aspect.NewValue));
             });
 
-            tabletSize.BindTo(tabletHandler.TabletSize);
-            tabletSize.BindValueChanged(val =>
+            tablet.BindTo(tabletHandler.Tablet);
+            tablet.BindValueChanged(val =>
             {
-                bool tabletFound = tabletSize.Value != System.Drawing.Size.Empty;
+                var tab = val.NewValue;
+
+                bool tabletFound = tab != null;
 
                 if (!tabletFound)
                 {
@@ -192,17 +193,19 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 noTabletMessage.Hide();
 
                 // todo: these should propagate from a TabletChanged event or similar.
-                offsetX.MaxValue = val.NewValue.Width;
-                sizeX.Default = sizeX.MaxValue = val.NewValue.Width;
+                offsetX.MaxValue = tab.Size.X;
+                offsetX.Default = tab.Size.X / 2;
+                sizeX.Default = sizeX.MaxValue = tab.Size.X;
 
-                offsetY.MaxValue = val.NewValue.Height;
-                sizeY.Default = sizeY.MaxValue = val.NewValue.Height;
+                offsetY.MaxValue = tab.Size.Y;
+                offsetY.Default = tab.Size.Y / 2;
+                sizeY.Default = sizeY.MaxValue = tab.Size.Y;
 
-                areaSize.Default = new Size(sizeX.Default, sizeY.Default);
+                areaSize.Default = new Vector2(sizeX.Default, sizeY.Default);
             }, true);
         }
 
-        private void applyAspectRatio(BindableNumber<int> sizeChanged)
+        private void applyAspectRatio(BindableNumber<float> sizeChanged)
         {
             try
             {
@@ -220,9 +223,9 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
                 // if lock is applied (or the specified values were out of range) aim to adjust the axis the user was not adjusting to conform.
                 if (sizeChanged == sizeX)
-                    sizeY.Value = (int)(areaSize.Value.Width / aspectRatio.Value);
+                    sizeY.Value = (int)(areaSize.Value.X / aspectRatio.Value);
                 else
-                    sizeX.Value = (int)(areaSize.Value.Height * aspectRatio.Value);
+                    sizeX.Value = (int)(areaSize.Value.Y * aspectRatio.Value);
             }
             finally
             {
@@ -251,6 +254,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         private void updateAspectRatio() => aspectRatio.Value = curentAspectRatio;
 
-        private float curentAspectRatio => (float)sizeX.Value / sizeY.Value;
+        private float curentAspectRatio => sizeX.Value / sizeY.Value;
     }
 }

From fb7d095e4a0a934664db0a5cbc7585eea55b46da Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 13:03:06 +0900
Subject: [PATCH 1918/3722] Show aspect ratio for current usable area

---
 .../Sections/Input/TabletAreaSelection.cs     | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
index c0412fb99d..ba219cfe7d 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
@@ -29,6 +29,9 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         private OsuSpriteText tabletName;
 
+        private Box usableFill;
+        private OsuSpriteText usableAreaText;
+
         public TabletAreaSelection(ITabletHandler handler)
         {
             this.handler = handler;
@@ -59,17 +62,16 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                         Origin = Anchor.Centre,
                         Children = new Drawable[]
                         {
-                            new Box
+                            usableFill = new Box
                             {
                                 RelativeSizeAxes = Axes.Both,
                                 Alpha = 0.6f,
                             },
-                            new OsuSpriteText
+                            usableAreaText = new OsuSpriteText
                             {
-                                Text = "usable area",
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
-                                Colour = Color4.Black,
+                                Colour = Color4.White,
                                 Font = OsuFont.Default.With(size: 12)
                             }
                         }
@@ -99,6 +101,12 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             {
                 usableAreaContainer.ResizeTo(val.NewValue, 100, Easing.OutQuint)
                                    .OnComplete(_ => checkBounds()); // required as we are using SSDQ.
+
+                int x = (int)val.NewValue.X;
+                int y = (int)val.NewValue.Y;
+                int commonDivider = greatestCommonDivider(x, y);
+
+                usableAreaText.Text = $"{(float)x / commonDivider}:{(float)y / commonDivider}";
             }, true);
 
             tablet.BindTo(handler.Tablet);
@@ -113,6 +121,18 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             FinishTransforms(true);
         }
 
+        private static int greatestCommonDivider(int a, int b)
+        {
+            while (b != 0)
+            {
+                int remainder = a % b;
+                a = b;
+                b = remainder;
+            }
+
+            return a;
+        }
+
         [Resolved]
         private OsuColour colour { get; set; }
 
@@ -126,7 +146,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             bool isWithinBounds = tabletContainer.ScreenSpaceDrawQuad.Contains(usableSsdq.TopLeft) &&
                                   tabletContainer.ScreenSpaceDrawQuad.Contains(usableSsdq.BottomRight);
 
-            usableAreaContainer.FadeColour(isWithinBounds ? colour.Blue : colour.RedLight, 100);
+            usableFill.FadeColour(isWithinBounds ? colour.Blue : colour.RedLight, 100);
         }
 
         protected override void Update()

From e8c20bdcb12a3a1f513a6fa63f72511630799afe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 13:05:43 +0900
Subject: [PATCH 1919/3722] Add centre crosshair

---
 .../Sections/Input/TabletAreaSelection.cs       | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
index ba219cfe7d..0a44b1a44d 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
@@ -67,12 +67,27 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                                 RelativeSizeAxes = Axes.Both,
                                 Alpha = 0.6f,
                             },
+                            new Box
+                            {
+                                Colour = Color4.White,
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Height = 5,
+                            },
+                            new Box
+                            {
+                                Colour = Color4.White,
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Width = 5,
+                            },
                             usableAreaText = new OsuSpriteText
                             {
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
                                 Colour = Color4.White,
-                                Font = OsuFont.Default.With(size: 12)
+                                Font = OsuFont.Default.With(size: 12),
+                                Y = 10
                             }
                         }
                     },

From 6285dcd1a1d9989dd9daeeb685102b48472e4ba6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 13:09:15 +0900
Subject: [PATCH 1920/3722] Add arbitrary value to fix FP contains check
 failures

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

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
index 0a44b1a44d..df25668411 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
@@ -158,8 +158,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
             var usableSsdq = usableAreaContainer.ScreenSpaceDrawQuad;
 
-            bool isWithinBounds = tabletContainer.ScreenSpaceDrawQuad.Contains(usableSsdq.TopLeft) &&
-                                  tabletContainer.ScreenSpaceDrawQuad.Contains(usableSsdq.BottomRight);
+            bool isWithinBounds = tabletContainer.ScreenSpaceDrawQuad.Contains(usableSsdq.TopLeft + new Vector2(1)) &&
+                                  tabletContainer.ScreenSpaceDrawQuad.Contains(usableSsdq.BottomRight - new Vector2(1));
 
             usableFill.FadeColour(isWithinBounds ? colour.Blue : colour.RedLight, 100);
         }

From c624aa939774cc3f783eb2a588d96c8afefc37f2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 13:23:23 +0900
Subject: [PATCH 1921/3722] Only update tablet values on commit

---
 osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index 9f81391434..b2d37e345f 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -104,16 +104,19 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                         },
                         new SettingsSlider<float>
                         {
+                            TransferValueOnCommit = true,
                             LabelText = "Aspect Ratio",
                             Current = aspectRatio
                         },
                         new SettingsSlider<float>
                         {
+                            TransferValueOnCommit = true,
                             LabelText = "X Offset",
                             Current = offsetX
                         },
                         new SettingsSlider<float>
                         {
+                            TransferValueOnCommit = true,
                             LabelText = "Y Offset",
                             Current = offsetY
                         },
@@ -124,11 +127,13 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                         },
                         new SettingsSlider<float>
                         {
+                            TransferValueOnCommit = true,
                             LabelText = "Width",
                             Current = sizeX
                         },
                         new SettingsSlider<float>
                         {
+                            TransferValueOnCommit = true,
                             LabelText = "Height",
                             Current = sizeY
                         },

From b1c4ac9f42842943d451f13b57da44231b34431d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 14:13:53 +0900
Subject: [PATCH 1922/3722] Remove local implementation of Vector2Converter

This has been moved to framework in
https://github.com/ppy/osu-framework/pull/4285.
---
 .../Converters/Vector2Converter.cs            | 34 -------------------
 .../IO/Serialization/IJsonSerializable.cs     |  2 --
 2 files changed, 36 deletions(-)
 delete mode 100644 osu.Game/IO/Serialization/Converters/Vector2Converter.cs

diff --git a/osu.Game/IO/Serialization/Converters/Vector2Converter.cs b/osu.Game/IO/Serialization/Converters/Vector2Converter.cs
deleted file mode 100644
index 46447b607b..0000000000
--- a/osu.Game/IO/Serialization/Converters/Vector2Converter.cs
+++ /dev/null
@@ -1,34 +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 Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using osuTK;
-
-namespace osu.Game.IO.Serialization.Converters
-{
-    /// <summary>
-    /// A type of <see cref="JsonConverter"/> that serializes only the X and Y coordinates of a <see cref="Vector2"/>.
-    /// </summary>
-    public class Vector2Converter : JsonConverter<Vector2>
-    {
-        public override Vector2 ReadJson(JsonReader reader, Type objectType, Vector2 existingValue, bool hasExistingValue, JsonSerializer serializer)
-        {
-            var obj = JObject.Load(reader);
-            return new Vector2((float)obj["x"], (float)obj["y"]);
-        }
-
-        public override void WriteJson(JsonWriter writer, Vector2 value, JsonSerializer serializer)
-        {
-            writer.WriteStartObject();
-
-            writer.WritePropertyName("x");
-            writer.WriteValue(value.X);
-            writer.WritePropertyName("y");
-            writer.WriteValue(value.Y);
-
-            writer.WriteEndObject();
-        }
-    }
-}
diff --git a/osu.Game/IO/Serialization/IJsonSerializable.cs b/osu.Game/IO/Serialization/IJsonSerializable.cs
index ac95d47c4b..30430e6f7f 100644
--- a/osu.Game/IO/Serialization/IJsonSerializable.cs
+++ b/osu.Game/IO/Serialization/IJsonSerializable.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using Newtonsoft.Json;
-using osu.Game.IO.Serialization.Converters;
 
 namespace osu.Game.IO.Serialization
 {
@@ -28,7 +27,6 @@ namespace osu.Game.IO.Serialization
             Formatting = Formatting.Indented,
             ObjectCreationHandling = ObjectCreationHandling.Replace,
             DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate,
-            Converters = new JsonConverter[] { new Vector2Converter() },
             ContractResolver = new KeyContractResolver()
         };
     }

From 1e82033c840725d4facd32a95be7d7ebe682e908 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 14:18:56 +0900
Subject: [PATCH 1923/3722] Move bindings to LoadComplete to avoid cross-thread
 issues

---
 osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index b2d37e345f..19a3c5b6f2 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -140,6 +140,11 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                     }
                 },
             };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
 
             areaOffset.BindTo(tabletHandler.AreaOffset);
             areaOffset.BindValueChanged(val =>

From fefb0078056fcfada6602ca1396318b618767bde Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 14:19:15 +0900
Subject: [PATCH 1924/3722] Remove no longer relevant comment

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

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index 19a3c5b6f2..d0e3ddbd91 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -202,7 +202,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 mainSettings.Show();
                 noTabletMessage.Hide();
 
-                // todo: these should propagate from a TabletChanged event or similar.
                 offsetX.MaxValue = tab.Size.X;
                 offsetX.Default = tab.Size.X / 2;
                 sizeX.Default = sizeX.MaxValue = tab.Size.X;

From bd1e2da1c2260457234bf40d16af2f130f68765a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 19:09:39 +0900
Subject: [PATCH 1925/3722] Always hide other overlays, even if the new one is
 not loaded

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index e5e1f6946e..e2f0f0c05b 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -756,12 +756,12 @@ namespace osu.Game
 
         private void showOverlayAboveOthers(OverlayContainer overlay, OverlayContainer[] otherOverlays)
         {
+            otherOverlays.Where(o => o != overlay).ForEach(o => o.Hide());
+
             // generally shouldn't ever hit this state, but protects against a crash on attempting to change ChildDepth.
             if (overlay.LoadState < LoadState.Ready)
                 return;
 
-            otherOverlays.Where(o => o != overlay).ForEach(o => o.Hide());
-
             // show above others if not visible at all, else leave at current depth.
             if (!overlay.IsPresent)
                 overlayContent.ChangeChildDepth(overlay, (float)-Clock.CurrentTime);

From c0c8b3e46c49290709a8c9948693c72857404704 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 19:22:47 +0900
Subject: [PATCH 1926/3722] Fix regression meaning `SkinnableSound`
 initialisation may never happen

---
 osu.Game/Skinning/SkinnableSound.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index e447f9c44c..9c6a4f7970 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -131,6 +131,14 @@ namespace osu.Game.Skinning
             });
         }
 
+        protected override void LoadAsyncComplete()
+        {
+            base.LoadAsyncComplete();
+
+            if (!samplesContainer.Any())
+                updateSamples();
+        }
+
         /// <summary>
         /// Stops the samples.
         /// </summary>

From 9be7981e0d981cea5ed9b605ab9423e77877b7f7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 19:45:00 +0900
Subject: [PATCH 1927/3722] Adjust timeline ticks to be more visible

---
 osu.Game/Screens/Edit/BindableBeatDivisor.cs        |  3 +--
 .../Edit/Compose/Components/DistanceSnapGrid.cs     |  2 +-
 .../Components/Timeline/TimelineTickDisplay.cs      | 13 +++++++++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Edit/BindableBeatDivisor.cs b/osu.Game/Screens/Edit/BindableBeatDivisor.cs
index d9477dd4bc..ff33f0c70d 100644
--- a/osu.Game/Screens/Edit/BindableBeatDivisor.cs
+++ b/osu.Game/Screens/Edit/BindableBeatDivisor.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Linq;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics.Colour;
 using osu.Game.Graphics;
 using osuTK.Graphics;
 
@@ -48,7 +47,7 @@ namespace osu.Game.Screens.Edit
         /// <param name="beatDivisor">The beat divisor.</param>
         /// <param name="colours">The set of colours.</param>
         /// <returns>The applicable colour from <paramref name="colours"/> for <paramref name="beatDivisor"/>.</returns>
-        public static ColourInfo GetColourFor(int beatDivisor, OsuColour colours)
+        public static Color4 GetColourFor(int beatDivisor, OsuColour colours)
         {
             switch (beatDivisor)
             {
diff --git a/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs b/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs
index 8a92a2011d..59f88ac641 100644
--- a/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs
@@ -132,7 +132,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             var colour = BindableBeatDivisor.GetColourFor(BindableBeatDivisor.GetDivisorForBeatIndex(beatIndex + placementIndex + 1, beatDivisor.Value), Colours);
 
             int repeatIndex = placementIndex / beatDivisor.Value;
-            return colour.MultiplyAlpha(0.5f / (repeatIndex + 1));
+            return ColourInfo.SingleColour(colour).MultiplyAlpha(0.5f / (repeatIndex + 1));
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
index fb11b859a7..c070c833f8 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
@@ -6,7 +6,9 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Caching;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
@@ -124,25 +126,28 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         if (beat == 0 && i == 0)
                             nextMinTick = float.MinValue;
 
-                        var indexInBar = beat % ((int)point.TimeSignature * beatDivisor.Value);
+                        int indexInBar = beat % ((int)point.TimeSignature * beatDivisor.Value);
 
                         var divisor = BindableBeatDivisor.GetDivisorForBeatIndex(beat, beatDivisor.Value);
                         var colour = BindableBeatDivisor.GetColourFor(divisor, colours);
 
+                        bool isMainBeat = indexInBar == 0;
+
                         // even though "bar lines" take up the full vertical space, we render them in two pieces because it allows for less anchor/origin churn.
-                        var height = indexInBar == 0 ? 0.5f : 0.1f - (float)divisor / highestDivisor * 0.08f;
+                        float height = isMainBeat ? 0.5f : 0.4f - (float)divisor / highestDivisor * 0.2f;
+                        float gradientOpacity = isMainBeat ? 1 : 0;
 
                         var topPoint = getNextUsablePoint();
                         topPoint.X = xPos;
-                        topPoint.Colour = colour;
                         topPoint.Height = height;
+                        topPoint.Colour = ColourInfo.GradientVertical(colour, colour.Opacity(gradientOpacity));
                         topPoint.Anchor = Anchor.TopLeft;
                         topPoint.Origin = Anchor.TopCentre;
 
                         var bottomPoint = getNextUsablePoint();
                         bottomPoint.X = xPos;
-                        bottomPoint.Colour = colour;
                         bottomPoint.Anchor = Anchor.BottomLeft;
+                        bottomPoint.Colour = ColourInfo.GradientVertical(colour.Opacity(gradientOpacity), colour);
                         bottomPoint.Origin = Anchor.BottomCentre;
                         bottomPoint.Height = height;
                     }

From 8955071703d40ed9f0210a45def45546bf1c19cb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 20:01:45 +0900
Subject: [PATCH 1928/3722] Change editor speed adjust to adjust frequency

---
 osu.Game/Screens/Edit/Components/PlaybackControl.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Edit/Components/PlaybackControl.cs b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
index 9739f2876a..bdc6e238c8 100644
--- a/osu.Game/Screens/Edit/Components/PlaybackControl.cs
+++ b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Screens.Edit.Components
         [Resolved]
         private EditorClock editorClock { get; set; }
 
-        private readonly BindableNumber<double> tempo = new BindableDouble(1);
+        private readonly BindableNumber<double> freqAdjust = new BindableDouble(1);
 
         [BackgroundDependencyLoader]
         private void load()
@@ -58,16 +58,16 @@ namespace osu.Game.Screens.Edit.Components
                     RelativeSizeAxes = Axes.Both,
                     Height = 0.5f,
                     Padding = new MarginPadding { Left = 45 },
-                    Child = new PlaybackTabControl { Current = tempo },
+                    Child = new PlaybackTabControl { Current = freqAdjust },
                 }
             };
 
-            Track.BindValueChanged(tr => tr.NewValue?.AddAdjustment(AdjustableProperty.Tempo, tempo), true);
+            Track.BindValueChanged(tr => tr.NewValue?.AddAdjustment(AdjustableProperty.Frequency, freqAdjust), true);
         }
 
         protected override void Dispose(bool isDisposing)
         {
-            Track.Value?.RemoveAdjustment(AdjustableProperty.Tempo, tempo);
+            Track.Value?.RemoveAdjustment(AdjustableProperty.Frequency, freqAdjust);
 
             base.Dispose(isDisposing);
         }
@@ -101,7 +101,7 @@ namespace osu.Game.Screens.Edit.Components
 
         private class PlaybackTabControl : OsuTabControl<double>
         {
-            private static readonly double[] tempo_values = { 0.5, 0.75, 1 };
+            private static readonly double[] tempo_values = { 0.25, 0.5, 0.75, 1 };
 
             protected override TabItem<double> CreateTabItem(double value) => new PlaybackTabItem(value);
 

From 86b229b1c94a1e0e3379b4e013206fd5ac996771 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 20:05:18 +0900
Subject: [PATCH 1929/3722] Increase maximum usable aspect ratio to account for
 ultrawide monitors

---
 osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index d0e3ddbd91..73ac8e4f35 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -31,9 +31,9 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         private GameHost host { get; set; }
 
         /// <summary>
-        /// Based on the longest available smartphone.
+        /// Based on ultrawide monitor configurations.
         /// </summary>
-        private const float largest_feasible_aspect_ratio = 20f / 9;
+        private const float largest_feasible_aspect_ratio = 21f / 9;
 
         private readonly BindableNumber<float> aspectRatio = new BindableFloat(1)
         {

From 4795170c6044bc7092b4c78b687f5a5bdc880088 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 20:07:13 +0900
Subject: [PATCH 1930/3722] Add back the default json converter locally to
 ensure it's actually used

---
 osu.Game/IO/Serialization/IJsonSerializable.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/IO/Serialization/IJsonSerializable.cs b/osu.Game/IO/Serialization/IJsonSerializable.cs
index 30430e6f7f..ba188963ea 100644
--- a/osu.Game/IO/Serialization/IJsonSerializable.cs
+++ b/osu.Game/IO/Serialization/IJsonSerializable.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 Newtonsoft.Json;
+using osu.Framework.IO.Serialization;
 
 namespace osu.Game.IO.Serialization
 {
@@ -27,6 +29,7 @@ namespace osu.Game.IO.Serialization
             Formatting = Formatting.Indented,
             ObjectCreationHandling = ObjectCreationHandling.Replace,
             DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate,
+            Converters = new List<JsonConverter> { new Vector2Converter() },
             ContractResolver = new KeyContractResolver()
         };
     }

From 095b7f86685799249f5427ba7010f55a6a7e6646 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 20:09:12 +0900
Subject: [PATCH 1931/3722] Rewrite code to account for non-loaded edge case

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index e2f0f0c05b..be919d60ca 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -758,13 +758,15 @@ namespace osu.Game
         {
             otherOverlays.Where(o => o != overlay).ForEach(o => o.Hide());
 
-            // generally shouldn't ever hit this state, but protects against a crash on attempting to change ChildDepth.
-            if (overlay.LoadState < LoadState.Ready)
+            // Partially visible so leave it at the current depth.
+            if (overlay.IsPresent)
                 return;
 
-            // show above others if not visible at all, else leave at current depth.
-            if (!overlay.IsPresent)
+            // Show above all other overlays.
+            if (overlay.IsLoaded)
                 overlayContent.ChangeChildDepth(overlay, (float)-Clock.CurrentTime);
+            else
+                overlay.Depth = (float)-Clock.CurrentTime;
         }
 
         private void forwardLoggedErrorsToNotifications()

From 6f32c302eb692f2a8c7bf6122149a28d96672446 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 20:13:51 +0900
Subject: [PATCH 1932/3722] Add checkbox to optionally disable tablet handling

---
 .../Settings/Sections/Input/TabletSettings.cs         | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index 73ac8e4f35..893fe575cd 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -62,11 +62,18 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         {
             Children = new Drawable[]
             {
+                new SettingsCheckbox
+                {
+                    LabelText = "Enabled",
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopCentre,
+                    Current = tabletHandler.Enabled
+                },
                 noTabletMessage = new OsuSpriteText
                 {
                     Text = "No tablet detected!",
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopCentre,
                     Padding = new MarginPadding { Horizontal = SettingsPanel.CONTENT_MARGINS }
                 },
                 mainSettings = new FillFlowContainer

From 63cbac3bd059778a8b94ad0d5e5b47beab637f33 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 20:15:29 +0900
Subject: [PATCH 1933/3722] Ensure aspect ratio slider gets an initial value

---
 osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index 893fe575cd..b06b148984 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -186,6 +186,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 aspectRatioApplication = Schedule(() => applyAspectRatio(sizeY));
             });
 
+            updateAspectRatio();
             aspectRatio.BindValueChanged(aspect =>
             {
                 aspectRatioApplication?.Cancel();

From b2d8db3a92d65c2db7a26d08f276a30fef82c7c7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 20:25:21 +0900
Subject: [PATCH 1934/3722] Rename incorrect variable

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

diff --git a/osu.Game/Skinning/PoolableSkinnableSample.cs b/osu.Game/Skinning/PoolableSkinnableSample.cs
index 09e087d0f2..c01a6d20cc 100644
--- a/osu.Game/Skinning/PoolableSkinnableSample.cs
+++ b/osu.Game/Skinning/PoolableSkinnableSample.cs
@@ -94,21 +94,21 @@ namespace osu.Game.Skinning
             sampleContainer.Clear();
             Sample = null;
 
-            var ch = CurrentSkin.GetSample(sampleInfo);
+            var sample = CurrentSkin.GetSample(sampleInfo);
 
-            if (ch == null && AllowDefaultFallback)
+            if (sample == null && AllowDefaultFallback)
             {
                 foreach (var lookup in sampleInfo.LookupNames)
                 {
-                    if ((ch = sampleStore.Get(lookup)) != null)
+                    if ((sample = sampleStore.Get(lookup)) != null)
                         break;
                 }
             }
 
-            if (ch == null)
+            if (sample == null)
                 return;
 
-            sampleContainer.Add(Sample = new DrawableSample(ch));
+            sampleContainer.Add(Sample = new DrawableSample(sample));
 
             // Start playback internally for the new sample if the previous one was playing beforehand.
             if (wasPlaying && Looping)

From 68aaf90702458f288913e191c4d27c342aa7a358 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 20:30:52 +0900
Subject: [PATCH 1935/3722] Fix disposal rather than performing some weird hack

---
 osu.Game/Skinning/LegacySkin.cs              | 4 +++-
 osu.Game/Skinning/PoolableSkinnableSample.cs | 8 --------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index b69e99773c..ec49d43c67 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -509,7 +509,7 @@ namespace osu.Game.Skinning
         /// <summary>
         /// A sample wrapper which keeps a reference to the contained skin to avoid finalizer garbage collection of the managing SampleStore.
         /// </summary>
-        private class LegacySkinSample : ISample
+        private class LegacySkinSample : ISample, IDisposable
         {
             private readonly Sample sample;
 
@@ -575,6 +575,8 @@ namespace osu.Game.Skinning
             public IBindable<double> AggregateFrequency => sample.AggregateFrequency;
 
             public IBindable<double> AggregateTempo => sample.AggregateTempo;
+
+            public void Dispose() => sample.Dispose();
         }
     }
 }
diff --git a/osu.Game/Skinning/PoolableSkinnableSample.cs b/osu.Game/Skinning/PoolableSkinnableSample.cs
index c01a6d20cc..b04158a58f 100644
--- a/osu.Game/Skinning/PoolableSkinnableSample.cs
+++ b/osu.Game/Skinning/PoolableSkinnableSample.cs
@@ -83,14 +83,6 @@ namespace osu.Game.Skinning
 
             bool wasPlaying = Playing;
 
-            if (activeChannel != null)
-            {
-                // when switching away from previous samples, we don't want to call Stop() on them as it sounds better to let them play out.
-                // this may change in the future if we use PoolableSkinSample in more locations than gameplay.
-                // we *do* want to turn off looping, else we end up with an infinite looping sample running in the background.
-                activeChannel.Looping = false;
-            }
-
             sampleContainer.Clear();
             Sample = null;
 

From 71a361337da8ee2ddac2feeb8af3e9644248c3d7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 Mar 2021 21:57:48 +0900
Subject: [PATCH 1936/3722] Add comment regarding usage of `Reverse()`

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
---
 .../Compose/Components/Timeline/TimelineBlueprintContainer.cs    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index 4522418e87..3526f264a7 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -138,6 +138,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             Stack<double> currentConcurrentObjects = new Stack<double>();
 
+            // Reversing is done to enumerate in order of increasing StartTime.
             foreach (var b in SelectionBlueprints.Reverse())
             {
                 while (currentConcurrentObjects.TryPeek(out double stackEndTime))

From 9634560d4b761a2a3aa90d78ffb1933e2c96c7c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 19 Mar 2021 21:36:28 +0100
Subject: [PATCH 1937/3722] Fix control point visualiser crashing after
 deselections

`SliderSelectionBlueprint.OnDeselected()` would expire the
`ControlPointVisualiser` on deselection, leading to its removal from the
blueprint and eventual disposal, but still kept a separate reference to
said visualiser in another field.

This could lead to that stale reference to a disposed child getting read
in `ReceivePositionalInputAt()`, crashing quite a ways down over at the
framework side on futilely trying to compute the bounding box of a
drawable with no parent.
---
 .../Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 3d3dff653a..befe3c6695 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -114,6 +114,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
             // throw away frame buffers on deselection.
             ControlPointVisualiser?.Expire();
+            ControlPointVisualiser = null;
+
             BodyPiece.RecyclePath();
         }
 

From e67c759eef36a409e4b57ab1c7643eb307280cd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 19 Mar 2021 22:44:31 +0100
Subject: [PATCH 1938/3722] Mark control point visualiser as possibly-null

---
 .../Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index befe3c6695..ba9bb3c485 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -28,6 +29,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         protected SliderBodyPiece BodyPiece { get; private set; }
         protected SliderCircleSelectionBlueprint HeadBlueprint { get; private set; }
         protected SliderCircleSelectionBlueprint TailBlueprint { get; private set; }
+
+        [CanBeNull]
         protected PathControlPointVisualiser ControlPointVisualiser { get; private set; }
 
         private readonly DrawableSlider slider;

From 8e0536e1e2d2eb66a7572dcf27f19d65cb4f5e7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 19 Mar 2021 22:20:26 +0100
Subject: [PATCH 1939/3722] Add failing test scene

---
 .../Editing/TestSceneBlueprintSelection.cs    | 70 +++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Editing/TestSceneBlueprintSelection.cs

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneBlueprintSelection.cs b/osu.Game.Tests/Visual/Editing/TestSceneBlueprintSelection.cs
new file mode 100644
index 0000000000..fd9c09fd5f
--- /dev/null
+++ b/osu.Game.Tests/Visual/Editing/TestSceneBlueprintSelection.cs
@@ -0,0 +1,70 @@
+// Copyright (c) ppy 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.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Screens.Edit.Compose.Components;
+using osu.Game.Tests.Beatmaps;
+using osuTK;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Visual.Editing
+{
+    public class TestSceneBlueprintSelection : EditorTestScene
+    {
+        protected override Ruleset CreateEditorRuleset() => new OsuRuleset();
+
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TestBeatmap(ruleset, false);
+
+        private BlueprintContainer blueprintContainer
+            => Editor.ChildrenOfType<BlueprintContainer>().First();
+
+        [Test]
+        public void TestSelectedObjectHasPriorityWhenOverlapping()
+        {
+            var firstSlider = new Slider
+            {
+                Path = new SliderPath(new[]
+                {
+                    new PathControlPoint(new Vector2()),
+                    new PathControlPoint(new Vector2(150, -50)),
+                    new PathControlPoint(new Vector2(300, 0))
+                }),
+                Position = new Vector2(0, 100)
+            };
+            var secondSlider = new Slider
+            {
+                Path = new SliderPath(new[]
+                {
+                    new PathControlPoint(new Vector2()),
+                    new PathControlPoint(new Vector2(-50, 50)),
+                    new PathControlPoint(new Vector2(-100, 100))
+                }),
+                Position = new Vector2(200, 0)
+            };
+
+            AddStep("add overlapping sliders", () =>
+            {
+                EditorBeatmap.Add(firstSlider);
+                EditorBeatmap.Add(secondSlider);
+            });
+            AddStep("select first slider", () => EditorBeatmap.SelectedHitObjects.Add(firstSlider));
+
+            AddStep("move mouse to common point", () =>
+            {
+                var pos = blueprintContainer.ChildrenOfType<PathControlPointPiece>().ElementAt(1).ScreenSpaceDrawQuad.Centre;
+                InputManager.MoveMouseTo(pos);
+            });
+            AddStep("right click", () => InputManager.Click(MouseButton.Right));
+
+            AddAssert("selection is unchanged", () => EditorBeatmap.SelectedHitObjects.Single() == firstSlider);
+        }
+    }
+}

From dd48b68f8ad6fc513d17f9847d0863df2c90dc1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 19 Mar 2021 22:20:40 +0100
Subject: [PATCH 1940/3722] Ensure selected blueprints are given selection
 priority

---
 osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 051d0766bf..7def7e1d16 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -338,7 +338,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
         private bool beginClickSelection(MouseButtonEvent e)
         {
             // Iterate from the top of the input stack (blueprints closest to the front of the screen first).
-            foreach (SelectionBlueprint blueprint in SelectionBlueprints.AliveChildren.Reverse())
+            // Priority is given to already-selected blueprints.
+            foreach (SelectionBlueprint blueprint in SelectionBlueprints.AliveChildren.Reverse().OrderByDescending(b => b.IsSelected))
             {
                 if (!blueprint.IsHovered) continue;
 

From ca943a897a387e7a7f7d8a934aee7125f262f698 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 20 Mar 2021 10:51:58 +0900
Subject: [PATCH 1941/3722] Fix back to front initialisation order

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

diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index 9c6a4f7970..f935adf7a5 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -133,10 +133,11 @@ namespace osu.Game.Skinning
 
         protected override void LoadAsyncComplete()
         {
-            base.LoadAsyncComplete();
-
+            // ensure samples are constructed before SkinChanged() is called via base.LoadAsyncComplete().
             if (!samplesContainer.Any())
                 updateSamples();
+
+            base.LoadAsyncComplete();
         }
 
         /// <summary>

From d28bed6ed29f9aeea901ccbec2c075367007fb47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 20 Mar 2021 12:29:24 +0100
Subject: [PATCH 1942/3722] Schedule adding transforms on tablet changes

Fixes `InvalidThreadForMutationException`s that pop up when
disconnecting/reconnecting tablets during the game's operation. In those
cases the value change callback executes from  an OpenTabletDriver
thread.
---
 .../Sections/Input/TabletAreaSelection.cs     | 15 ++++++-----
 .../Settings/Sections/Input/TabletSettings.cs | 25 +++++++++++++------
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
index df25668411..ecb8acce54 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
@@ -125,17 +125,20 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             }, true);
 
             tablet.BindTo(handler.Tablet);
-            tablet.BindValueChanged(val =>
-            {
-                tabletContainer.Size = val.NewValue?.Size ?? Vector2.Zero;
-                tabletName.Text = val.NewValue?.Name ?? string.Empty;
-                checkBounds();
-            }, true);
+            tablet.BindValueChanged(_ => Scheduler.AddOnce(updateTabletDetails));
 
+            updateTabletDetails();
             // initial animation should be instant.
             FinishTransforms(true);
         }
 
+        private void updateTabletDetails()
+        {
+            tabletContainer.Size = tablet.Value?.Size ?? Vector2.Zero;
+            tabletName.Text = tablet.Value?.Name ?? string.Empty;
+            checkBounds();
+        }
+
         private static int greatestCommonDivider(int a, int b)
         {
             while (b != 0)
diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index b06b148984..4baf43783d 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -196,19 +196,13 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             tablet.BindTo(tabletHandler.Tablet);
             tablet.BindValueChanged(val =>
             {
+                Scheduler.AddOnce(toggleVisibility);
+
                 var tab = val.NewValue;
 
                 bool tabletFound = tab != null;
-
                 if (!tabletFound)
-                {
-                    mainSettings.Hide();
-                    noTabletMessage.Show();
                     return;
-                }
-
-                mainSettings.Show();
-                noTabletMessage.Hide();
 
                 offsetX.MaxValue = tab.Size.X;
                 offsetX.Default = tab.Size.X / 2;
@@ -222,6 +216,21 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             }, true);
         }
 
+        private void toggleVisibility()
+        {
+            bool tabletFound = tablet.Value != null;
+
+            if (!tabletFound)
+            {
+                mainSettings.Hide();
+                noTabletMessage.Show();
+                return;
+            }
+
+            mainSettings.Show();
+            noTabletMessage.Hide();
+        }
+
         private void applyAspectRatio(BindableNumber<float> sizeChanged)
         {
             try

From 86b569f5f7a13700b7ef728fafb6fe1c014ea8d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 20 Mar 2021 12:34:41 +0100
Subject: [PATCH 1943/3722] Fix typo in identifier

---
 osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index 4baf43783d..bd0f7ddc4c 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -237,7 +237,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             {
                 if (!aspectLock.Value)
                 {
-                    float proposedAspectRatio = curentAspectRatio;
+                    float proposedAspectRatio = currentAspectRatio;
 
                     if (proposedAspectRatio >= aspectRatio.MinValue && proposedAspectRatio <= aspectRatio.MaxValue)
                     {
@@ -278,8 +278,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             aspectLock.Value = true;
         }
 
-        private void updateAspectRatio() => aspectRatio.Value = curentAspectRatio;
+        private void updateAspectRatio() => aspectRatio.Value = currentAspectRatio;
 
-        private float curentAspectRatio => sizeX.Value / sizeY.Value;
+        private float currentAspectRatio => sizeX.Value / sizeY.Value;
     }
 }

From a294f328fb4f1471273b5ebe2e49b8e7e2003f21 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sun, 21 Mar 2021 06:30:17 +0100
Subject: [PATCH 1944/3722] Add linear circular arc test

---
 .../TestSceneSliderPlacementBlueprint.cs       | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index 67a2e5a47c..f9b6fb924e 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -276,6 +276,24 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertControlPointType(0, PathType.Linear);
         }
 
+        [Test]
+        public void TestPlacePerfectCurveSegmentAlmostLinearly()
+        {
+            addMovementStep(new Vector2(0));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(61.382935f, 6.423767f));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(217.69522f, 22.84021f));
+            addClickStep(MouseButton.Right);
+
+            assertPlaced(true);
+            assertControlPointCount(3);
+            // Will be > 10000 if not falling back to Bezier path calc.
+            assertLength(218.8901f);
+        }
+
         private void addMovementStep(Vector2 position) => AddStep($"move mouse to {position}", () => InputManager.MoveMouseTo(InputManager.ToScreenSpace(position)));
 
         private void addClickStep(MouseButton button)

From fcd1f4930f9118445a0976a785db75282bf9763b Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sun, 21 Mar 2021 06:34:55 +0100
Subject: [PATCH 1945/3722] Fix freeze due to large circular arc radius

Seems to stem from the osu!framework's PathApproximator not catching a few edge cases wherein the radius approaches infinity.
---
 osu.Game/Rulesets/Objects/SliderPath.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 3083fcfccb..94815fe0ea 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -219,8 +219,10 @@ namespace osu.Game.Rulesets.Objects
 
                     List<Vector2> subpath = PathApproximator.ApproximateCircularArc(subControlPoints);
 
-                    // If for some reason a circular arc could not be fit to the 3 given points, fall back to a numerically stable bezier approximation.
-                    if (subpath.Count == 0)
+                    // If for some reason a circular arc could not be fit to the 3 given points, or the
+                    // resulting radius is too large (e.g. points arranged almost linearly), fall back
+                    // to a numerically stable bezier approximation.
+                    if (subpath.Count == 0 || subpath.Count > 400)
                         break;
 
                     return subpath;

From a16c0641b27ab69f59c56a4cf96f388e941affa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 21 Mar 2021 11:01:06 +0100
Subject: [PATCH 1946/3722] Revert EF Core to version 2.2

This reverts commit f3faad74d587bbbd104395f5072723203c9d54aa, reversing
changes made to 712e7bc7bfaa94dd8c7248d9e800e7bc916476c0.

Several issues arose after migrating to 5.0, including, but possibly not
limited to, performance regressions in song select, as well as failures
when attempting to save beatmaps after metadata changes in the editor.
---
 osu.Desktop/osu.Desktop.csproj                |  4 +-
 .../osu.Game.Rulesets.Catch.Tests.csproj      |  2 +-
 .../osu.Game.Rulesets.Mania.Tests.csproj      |  2 +-
 .../osu.Game.Rulesets.Osu.Tests.csproj        |  2 +-
 .../osu.Game.Rulesets.Taiko.Tests.csproj      |  2 +-
 .../TestSceneMultiplayerMatchSongSelect.cs    |  1 -
 .../TestSceneBeatmapRecommendations.cs        |  1 -
 .../SongSelect/TestScenePlaySongSelect.cs     |  4 +-
 osu.Game.Tests/osu.Game.Tests.csproj          |  2 +-
 osu.Game/Beatmaps/BeatmapManager.cs           |  2 -
 osu.Game/Database/ArchiveModelManager.cs      |  6 +-
 .../Database/DatabaseWorkaroundExtensions.cs  | 71 -------------------
 osu.Game/Database/OsuDbContext.cs             |  9 +--
 osu.Game/Scoring/ScoreInfo.cs                 | 13 +++-
 osu.Game/Scoring/ScoreManager.cs              |  5 --
 osu.Game/Skinning/SkinManager.cs              |  5 --
 osu.Game/osu.Game.csproj                      |  6 +-
 osu.iOS.props                                 |  2 +
 18 files changed, 30 insertions(+), 109 deletions(-)
 delete mode 100644 osu.Game/Database/DatabaseWorkaroundExtensions.cs

diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index d9d23dea6b..3e0f0cb7f6 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -27,8 +27,8 @@
     <PackageReference Include="Microsoft.NETCore.Targets" Version="5.0.0" />
     <PackageReference Include="System.IO.Packaging" Version="5.0.0" />
     <PackageReference Include="ppy.squirrel.windows" Version="1.9.0.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.6" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
     <PackageReference Include="DiscordRichPresence" Version="1.0.175" />
   </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 42f70151ac..728af5124e 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
@@ -5,7 +5,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </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 e51b20c9fe..af16f39563 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
@@ -5,7 +5,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </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 f1f75148ef..3d2d1f3fec 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
@@ -5,7 +5,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </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 c9a320bdd5..fa00922706 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
@@ -5,7 +5,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
index 8cfe5d8af2..faa5d9e6fc 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSongSelect.cs
@@ -56,7 +56,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 beatmaps.Add(new BeatmapInfo
                 {
                     Ruleset = rulesets.GetRuleset(i % 4),
-                    RulesetID = i % 4, // workaround for efcore 5 compatibility.
                     OnlineBeatmapID = beatmapId,
                     Length = length,
                     BPM = bpm,
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
index 9b8b74e6f6..53a956c77c 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
@@ -186,7 +186,6 @@ namespace osu.Game.Tests.Visual.SongSelect
                     Metadata = metadata,
                     BaseDifficulty = new BeatmapDifficulty(),
                     Ruleset = ruleset,
-                    RulesetID = ruleset.ID.GetValueOrDefault(), // workaround for efcore 5 compatibility.
                     StarDifficulty = difficultyIndex + 1,
                     Version = $"SR{difficultyIndex + 1}"
                 }).ToList()
diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 057b539e44..5731b1ac2c 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -911,11 +911,9 @@ namespace osu.Game.Tests.Visual.SongSelect
                 int length = RNG.Next(30000, 200000);
                 double bpm = RNG.NextSingle(80, 200);
 
-                var ruleset = getRuleset();
                 beatmaps.Add(new BeatmapInfo
                 {
-                    Ruleset = ruleset,
-                    RulesetID = ruleset.ID.GetValueOrDefault(), // workaround for efcore 5 compatibility.
+                    Ruleset = getRuleset(),
                     OnlineBeatmapID = beatmapId,
                     Version = $"{beatmapId} (length {TimeSpan.FromMilliseconds(length):m\\:ss}, bpm {bpm:0.#})",
                     Length = length,
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index 6f8e0fac6f..e36b3cdc74 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -6,7 +6,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
     <PackageReference Include="Moq" Version="4.16.1" />
   </ItemGroup>
   <PropertyGroup Label="Project">
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 115d1b33bb..b4ea898b7d 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -171,8 +171,6 @@ namespace osu.Game.Beatmaps
             if (beatmapSet.Beatmaps.Any(b => b.BaseDifficulty == null))
                 throw new InvalidOperationException($"Cannot import {nameof(BeatmapInfo)} with null {nameof(BeatmapInfo.BaseDifficulty)}.");
 
-            beatmapSet.Requery(ContextFactory);
-
             // check if a set already exists with the same online id, delete if it does.
             if (beatmapSet.OnlineBeatmapSetID != null)
             {
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 64428882ac..d809dbcb01 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -462,8 +462,6 @@ namespace osu.Game.Database
                 // Dereference the existing file info, since the file model will be removed.
                 if (file.FileInfo != null)
                 {
-                    file.Requery(usage.Context);
-
                     Files.Dereference(file.FileInfo);
 
                     // This shouldn't be required, but here for safety in case the provided TModel is not being change tracked
@@ -637,12 +635,10 @@ namespace osu.Game.Database
             {
                 using (Stream s = reader.GetStream(file))
                 {
-                    var fileInfo = files.Add(s);
                     fileInfos.Add(new TFileModel
                     {
                         Filename = file.Substring(prefix.Length).ToStandardisedPath(),
-                        FileInfo = fileInfo,
-                        FileInfoID = fileInfo.ID // workaround for efcore 5 compatibility.
+                        FileInfo = files.Add(s)
                     });
                 }
             }
diff --git a/osu.Game/Database/DatabaseWorkaroundExtensions.cs b/osu.Game/Database/DatabaseWorkaroundExtensions.cs
deleted file mode 100644
index a3a982f232..0000000000
--- a/osu.Game/Database/DatabaseWorkaroundExtensions.cs
+++ /dev/null
@@ -1,71 +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 osu.Game.Beatmaps;
-using osu.Game.Scoring;
-using osu.Game.Skinning;
-
-namespace osu.Game.Database
-{
-    /// <summary>
-    /// Extension methods which contain workarounds to make EFcore 5.x work with our existing (incorrect) thread safety.
-    /// The intention is to avoid blocking package updates while we consider the future of the database backend, with a potential backend switch imminent.
-    /// </summary>
-    public static class DatabaseWorkaroundExtensions
-    {
-        /// <summary>
-        /// Re-query the provided model to ensure it is in a sane state. This method requires explicit implementation per model type.
-        /// </summary>
-        /// <param name="model"></param>
-        /// <param name="contextFactory"></param>
-        public static void Requery(this IHasPrimaryKey model, IDatabaseContextFactory contextFactory)
-        {
-            switch (model)
-            {
-                case SkinInfo skinInfo:
-                    requeryFiles(skinInfo.Files, contextFactory);
-                    break;
-
-                case ScoreInfo scoreInfo:
-                    requeryFiles(scoreInfo.Beatmap.BeatmapSet.Files, contextFactory);
-                    requeryFiles(scoreInfo.Files, contextFactory);
-                    break;
-
-                case BeatmapSetInfo beatmapSetInfo:
-                    var context = contextFactory.Get();
-
-                    foreach (var beatmap in beatmapSetInfo.Beatmaps)
-                    {
-                        // Workaround System.InvalidOperationException
-                        // The instance of entity type 'RulesetInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
-                        beatmap.Ruleset = context.RulesetInfo.Find(beatmap.RulesetID);
-                    }
-
-                    requeryFiles(beatmapSetInfo.Files, contextFactory);
-                    break;
-
-                default:
-                    throw new ArgumentException($"{nameof(Requery)} does not have support for the provided model type", nameof(model));
-            }
-
-            void requeryFiles<T>(List<T> files, IDatabaseContextFactory databaseContextFactory) where T : class, INamedFileInfo
-            {
-                var dbContext = databaseContextFactory.Get();
-
-                foreach (var file in files)
-                {
-                    Requery(file, dbContext);
-                }
-            }
-        }
-
-        public static void Requery(this INamedFileInfo file, OsuDbContext dbContext)
-        {
-            // Workaround System.InvalidOperationException
-            // The instance of entity type 'FileInfo' cannot be tracked because another instance with the same key value for {'ID'} is already being tracked.
-            file.FileInfo = dbContext.FileInfo.Find(file.FileInfoID);
-        }
-    }
-}
diff --git a/osu.Game/Database/OsuDbContext.cs b/osu.Game/Database/OsuDbContext.cs
index 2342ab07d4..2aae62edea 100644
--- a/osu.Game/Database/OsuDbContext.cs
+++ b/osu.Game/Database/OsuDbContext.cs
@@ -3,6 +3,7 @@
 
 using System;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.Extensions.Logging;
 using osu.Framework.Logging;
 using osu.Framework.Statistics;
@@ -110,10 +111,10 @@ namespace osu.Game.Database
         {
             base.OnConfiguring(optionsBuilder);
             optionsBuilder
-                .UseSqlite(connectionString,
-                    sqliteOptions => sqliteOptions
-                                     .CommandTimeout(10)
-                                     .UseQuerySplittingBehavior(QuerySplittingBehavior.SingleQuery))
+                // this is required for the time being due to the way we are querying in places like BeatmapStore.
+                // if we ever move to having consumers file their own .Includes, or get eager loading support, this could be re-enabled.
+                .ConfigureWarnings(warnings => warnings.Ignore(CoreEventId.IncludeIgnoredWarning))
+                .UseSqlite(connectionString, sqliteOptions => sqliteOptions.CommandTimeout(10))
                 .UseLoggerFactory(logger.Value);
         }
 
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 78101991f6..f5192f3a40 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Scoring
             }
             set
             {
-                modsJson = JsonConvert.SerializeObject(value.Select(m => new DeserializedMod { Acronym = m.Acronym }));
+                modsJson = null;
                 mods = value;
             }
         }
@@ -86,7 +86,16 @@ namespace osu.Game.Scoring
         [Column("Mods")]
         public string ModsJson
         {
-            get => modsJson;
+            get
+            {
+                if (modsJson != null)
+                    return modsJson;
+
+                if (mods == null)
+                    return null;
+
+                return modsJson = JsonConvert.SerializeObject(mods.Select(m => new DeserializedMod { Acronym = m.Acronym }));
+            }
             set
             {
                 modsJson = value;
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index 7d0abc5996..c7ee26c248 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -53,11 +53,6 @@ namespace osu.Game.Scoring
             this.configManager = configManager;
         }
 
-        protected override void PreImport(ScoreInfo model)
-        {
-            model.Requery(ContextFactory);
-        }
-
         protected override ScoreInfo CreateModel(ArchiveReader archive)
         {
             if (archive == null)
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 894a068b7f..9257636301 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -142,11 +142,6 @@ namespace osu.Game.Skinning
             }
         }
 
-        protected override void PreImport(SkinInfo model)
-        {
-            model.Requery(ContextFactory);
-        }
-
         /// <summary>
         /// Retrieve a <see cref="Skin"/> instance for the provided <see cref="SkinInfo"/>
         /// </summary>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 360c522193..9731c1d5ea 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,10 +24,10 @@
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="5.0.2" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.3" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="5.0.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="5.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
-    <PackageReference Include="Microsoft.NETCore.Targets" Version="5.0.0" />
+    <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.317.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index b763a91dfb..11677d345e 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -90,6 +90,8 @@
   <ItemGroup Label="Transitive Dependencies">
     <PackageReference Include="DiffPlex" Version="1.6.3" />
     <PackageReference Include="Humanizer" Version="2.8.26" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.317.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />

From c4f3714385c411dca8092f3163aad2817ff7f62b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 21 Mar 2021 18:39:52 +0100
Subject: [PATCH 1947/3722] Make hold note input tests fail due to head hiding

---
 .../TestSceneHoldNoteInput.cs                        | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index 596430f9e5..7ae69bf7d7 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -5,11 +5,13 @@ using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Screens;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.Replays;
 using osu.Game.Rulesets.Mania.Scoring;
 using osu.Game.Rulesets.Objects;
@@ -345,6 +347,14 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             AddUntilStep("Beatmap at 0", () => Beatmap.Value.Track.CurrentTime == 0);
             AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
+
+            AddUntilStep("wait for head", () => currentPlayer.GameplayClockContainer.GameplayClock.CurrentTime >= time_head);
+            AddAssert("head is visible",
+                () => currentPlayer.ChildrenOfType<DrawableHoldNote>()
+                                   .Single(note => note.HitObject == beatmap.HitObjects[0])
+                                   .Head
+                                   .Alpha == 1);
+
             AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor.HasCompleted.Value);
         }
 
@@ -352,6 +362,8 @@ namespace osu.Game.Rulesets.Mania.Tests
         {
             public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
 
+            public new GameplayClockContainer GameplayClockContainer => base.GameplayClockContainer;
+
             protected override bool PauseOnFocusLost => false;
 
             public ScoreAccessibleReplayPlayer(Score score)

From 9a330c4c56aeeda049cfccdd6a15f10c1966758c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 21 Mar 2021 18:34:31 +0100
Subject: [PATCH 1948/3722] Fix mania hold note heads hiding when frozen

This was an insidious regression from a3dc1d5. Prior to that commit,
`DrawableHoldNoteHead` had `UpdateStateTransforms()` overridden, to set
the hold note head's lifetime. When that method was split into
`UpdateInitialStateTransforms()` and `UpdateHitStateTransforms()`, the
lifetime set was moved to the former.

Unfortunately, that override served two purposes: both to set the
lifetime, and to suppress hit animations which would normally be added
by the base `DrawableManiaHitObject`. That fact being missed led to
`UpdateHitStateTransforms()` hiding the hold note head immediately on
hit and with a slight delay on miss.

To resolve, explicitly override `UpdateHitStateTransforms()` and
suppress the base call, with an explanatory comment.
---
 .../Objects/Drawables/DrawableHoldNoteHead.cs          | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs
index 75dcf0e55e..35ba2465fa 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.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.Objects.Drawables;
+
 namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
     /// <summary>
@@ -25,6 +27,14 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             LifetimeEnd = LifetimeStart + 30000;
         }
 
+        protected override void UpdateHitStateTransforms(ArmedState state)
+        {
+            // suppress the base call explicitly.
+            // the hold note head should never change its visual state on its own due to the "freezing" mechanic
+            // (when hit, it remains visible in place at the judgement line; when dropped, it will scroll past the line).
+            // it will be hidden along with its parenting hold note when required.
+        }
+
         public override bool OnPressed(ManiaAction action) => false; // Handled by the hold note
 
         public override void OnReleased(ManiaAction action)

From e31d583a7f468853844bb1e8aa38f2d70225f122 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 21 Mar 2021 11:16:59 -0700
Subject: [PATCH 1949/3722] Add comments count to user profile overlay

---
 osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs | 6 ++++++
 osu.Game/Users/User.cs                                    | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
index 662f55317b..e73579fad0 100644
--- a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Linq;
+using Humanizer;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
@@ -115,6 +116,11 @@ namespace osu.Game.Overlays.Profile.Header
             topLinkContainer.AddText("Contributed ");
             topLinkContainer.AddLink($@"{user.PostCount:#,##0} forum posts", $"{api.WebsiteRootUrl}/users/{user.Id}/posts", creationParameters: embolden);
 
+            addSpacer(topLinkContainer);
+
+            topLinkContainer.AddText("Posted ");
+            topLinkContainer.AddLink("comment".ToQuantity(user.CommentsCount, "#,##0"), $"{api.WebsiteRootUrl}/comments?user_id={user.Id}", creationParameters: embolden);
+
             string websiteWithoutProtocol = user.Website;
 
             if (!string.IsNullOrEmpty(websiteWithoutProtocol))
diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index 6c45417db0..74ffb7c457 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -120,6 +120,9 @@ namespace osu.Game.Users
         [JsonProperty(@"post_count")]
         public int PostCount;
 
+        [JsonProperty(@"comments_count")]
+        public int CommentsCount;
+
         [JsonProperty(@"follower_count")]
         public int FollowerCount;
 

From 9bc6cdf042317265f7e37b3feaf58f10770d6fac Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 21 Mar 2021 11:19:07 -0700
Subject: [PATCH 1950/3722] Fix singular format regression on forum post text

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

diff --git a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
index e73579fad0..fe61e532e1 100644
--- a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
@@ -114,7 +114,7 @@ namespace osu.Game.Overlays.Profile.Header
             }
 
             topLinkContainer.AddText("Contributed ");
-            topLinkContainer.AddLink($@"{user.PostCount:#,##0} forum posts", $"{api.WebsiteRootUrl}/users/{user.Id}/posts", creationParameters: embolden);
+            topLinkContainer.AddLink("forum post".ToQuantity(user.PostCount, "#,##0"), $"{api.WebsiteRootUrl}/users/{user.Id}/posts", creationParameters: embolden);
 
             addSpacer(topLinkContainer);
 

From f7bf23dbe9b51fa6f2a8168efdf4ce1b081e8874 Mon Sep 17 00:00:00 2001
From: owen-young <owen.young8699@gmail.com>
Date: Sun, 21 Mar 2021 21:50:19 -0500
Subject: [PATCH 1951/3722] first attempt at changing windowMode to be
 fullscreen on default

---
 osu.Game/OsuGame.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index dd775888a1..2fd6331c86 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -126,6 +126,8 @@ namespace osu.Game
 
         private Bindable<int> configSkin;
 
+        private Bindable<WindowMode> windowMode;
+
         private readonly string[] args;
 
         private readonly List<OverlayContainer> overlays = new List<OverlayContainer>();
@@ -631,6 +633,12 @@ namespace osu.Game
 
             loadComponentSingleFile(volume = new VolumeOverlay(), leftFloatingOverlayContent.Add, true);
 
+            frameworkConfig.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
+            windowMode.BindValueChanged(mode => ScheduleAfterChildren(() =>
+            {
+                    windowMode.Value = WindowMode.Windowed;
+            }), true);
+
             var onScreenDisplay = new OnScreenDisplay();
 
             onScreenDisplay.BeginTracking(this, frameworkConfig);

From 073dba5330663073433b38798626ae0d6781d971 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 22 Mar 2021 14:05:37 +0900
Subject: [PATCH 1952/3722] Remove local workarounds to attempt to avoid
 crashes on skin change

---
 osu.Game/Skinning/LegacySkin.cs | 76 +--------------------------------
 1 file changed, 1 insertion(+), 75 deletions(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index ec49d43c67..12abc4d867 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -7,7 +7,6 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using JetBrains.Annotations;
-using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -462,7 +461,7 @@ namespace osu.Game.Skinning
                 var sample = Samples?.Get(lookup);
 
                 if (sample != null)
-                    return new LegacySkinSample(sample, this);
+                    return sample;
             }
 
             return null;
@@ -505,78 +504,5 @@ namespace osu.Game.Skinning
             Textures?.Dispose();
             Samples?.Dispose();
         }
-
-        /// <summary>
-        /// A sample wrapper which keeps a reference to the contained skin to avoid finalizer garbage collection of the managing SampleStore.
-        /// </summary>
-        private class LegacySkinSample : ISample, IDisposable
-        {
-            private readonly Sample sample;
-
-            [UsedImplicitly]
-            private readonly LegacySkin skin;
-
-            public LegacySkinSample(Sample sample, LegacySkin skin)
-            {
-                this.sample = sample;
-                this.skin = skin;
-            }
-
-            public SampleChannel Play()
-            {
-                return sample.Play();
-            }
-
-            public SampleChannel GetChannel()
-            {
-                return sample.GetChannel();
-            }
-
-            public double Length => sample.Length;
-
-            public Bindable<int> PlaybackConcurrency => sample.PlaybackConcurrency;
-            public BindableNumber<double> Volume => sample.Volume;
-
-            public BindableNumber<double> Balance => sample.Balance;
-
-            public BindableNumber<double> Frequency => sample.Frequency;
-
-            public BindableNumber<double> Tempo => sample.Tempo;
-
-            public void BindAdjustments(IAggregateAudioAdjustment component)
-            {
-                sample.BindAdjustments(component);
-            }
-
-            public void UnbindAdjustments(IAggregateAudioAdjustment component)
-            {
-                sample.UnbindAdjustments(component);
-            }
-
-            public void AddAdjustment(AdjustableProperty type, IBindable<double> adjustBindable)
-            {
-                sample.AddAdjustment(type, adjustBindable);
-            }
-
-            public void RemoveAdjustment(AdjustableProperty type, IBindable<double> adjustBindable)
-            {
-                sample.RemoveAdjustment(type, adjustBindable);
-            }
-
-            public void RemoveAllAdjustments(AdjustableProperty type)
-            {
-                sample.RemoveAllAdjustments(type);
-            }
-
-            public IBindable<double> AggregateVolume => sample.AggregateVolume;
-
-            public IBindable<double> AggregateBalance => sample.AggregateBalance;
-
-            public IBindable<double> AggregateFrequency => sample.AggregateFrequency;
-
-            public IBindable<double> AggregateTempo => sample.AggregateTempo;
-
-            public void Dispose() => sample.Dispose();
-        }
     }
 }

From db64fac8241710308f02399909ec7f6f05be6251 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 22 Mar 2021 15:26:22 +0900
Subject: [PATCH 1953/3722] Delay key fade in legacy mania skins

---
 osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyKeyArea.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyKeyArea.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyKeyArea.cs
index 78ccb83a8c..174324f5f6 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyKeyArea.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyKeyArea.cs
@@ -101,8 +101,8 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         {
             if (action == column.Action.Value)
             {
-                upSprite.FadeTo(1);
-                downSprite.FadeTo(0);
+                upSprite.Delay(80).FadeTo(1);
+                downSprite.Delay(80).FadeTo(0);
             }
         }
     }

From fc632fd48aae56b1045a1955b035d8ac574609d8 Mon Sep 17 00:00:00 2001
From: Owen Young <owen.young8699@gmail.com>
Date: Mon, 22 Mar 2021 01:30:20 -0500
Subject: [PATCH 1954/3722] Added WindowSetting setting to OsuSetting enum so
 that it can be set by default at startup. Modified LayoutSettings.cs so that
 when it is changed in the settings, it is written to the local settings as
 well.

---
 osu.Game/Configuration/OsuConfigManager.cs               | 3 +++
 osu.Game/OsuGame.cs                                      | 9 +++------
 .../Settings/Sections/Graphics/LayoutSettings.cs         | 7 ++++++-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index d0fa45bb7a..cd74fe25f4 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -91,6 +91,8 @@ namespace osu.Game.Configuration
 
             Set(OsuSetting.MenuParallax, true);
 
+            Set(OsuSetting.WindowSetting, WindowMode.Fullscreen);
+
             // Gameplay
             Set(OsuSetting.DimLevel, 0.8, 0, 1, 0.01);
             Set(OsuSetting.BlurLevel, 0, 0, 1, 0.01);
@@ -233,6 +235,7 @@ namespace osu.Game.Configuration
         MenuVoice,
         CursorRotation,
         MenuParallax,
+        WindowSetting,
         BeatmapDetailTab,
         BeatmapDetailModsFilter,
         Username,
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 2fd6331c86..84737a56e4 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -234,6 +234,9 @@ namespace osu.Game
 
             SelectedMods.BindValueChanged(modsChanged);
             Beatmap.BindValueChanged(beatmapChanged, true);
+
+            windowMode = LocalConfig.GetBindable<WindowMode>(OsuSetting.WindowSetting);
+            frameworkConfig.GetBindable<WindowMode>(FrameworkSetting.WindowMode).Value = windowMode.Value;
         }
 
         private ExternalLinkOpener externalLinkOpener;
@@ -633,12 +636,6 @@ namespace osu.Game
 
             loadComponentSingleFile(volume = new VolumeOverlay(), leftFloatingOverlayContent.Add, true);
 
-            frameworkConfig.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
-            windowMode.BindValueChanged(mode => ScheduleAfterChildren(() =>
-            {
-                    windowMode.Value = WindowMode.Windowed;
-            }), true);
-
             var onScreenDisplay = new OnScreenDisplay();
 
             onScreenDisplay.BeginTracking(this, frameworkConfig);
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index 4d5c2e06eb..ab662cb9a0 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -31,6 +31,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
 
         private Bindable<ScalingMode> scalingMode;
         private Bindable<Size> sizeFullscreen;
+        private Bindable<WindowMode> windowMode;
 
         private readonly BindableList<Size> resolutions = new BindableList<Size>(new[] { new Size(9999, 9999) });
 
@@ -56,6 +57,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
             scalingSizeY = osuConfig.GetBindable<float>(OsuSetting.ScalingSizeY);
             scalingPositionX = osuConfig.GetBindable<float>(OsuSetting.ScalingPositionX);
             scalingPositionY = osuConfig.GetBindable<float>(OsuSetting.ScalingPositionY);
+            windowMode = osuConfig.GetBindable<WindowMode>(OsuSetting.WindowSetting);
 
             if (host.Window != null)
             {
@@ -141,7 +143,10 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
 
             scalingSettings.ForEach(s => bindPreviewEvent(s.Current));
 
-            windowModeDropdown.Current.ValueChanged += _ => updateResolutionDropdown();
+            windowModeDropdown.Current.ValueChanged += mode => {
+                windowMode.Value = mode.NewValue;
+                updateResolutionDropdown();
+            };
 
             windowModes.BindCollectionChanged((sender, args) =>
             {

From c4d08463addcf532926308dc319eebb981d530a8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 22 Mar 2021 16:04:51 +0900
Subject: [PATCH 1955/3722] Fix spinners playing looping sound too long in the
 editor

The `OnComplete` event was never being run due to the transform playing
out longer than the spinner's lifetime. I've matched the durations, but
also moved the `Stop()` call to what I deem a safer place to run it (I
did notice that without this it would still potentially never fire).

Note that this is more noticeable in the editor because of lifetime
extension. In gameplay, the returning of a spinner to the pool will
clean things up (but in the editor that can take longer, depending on
timeline zoom level).

Another thing worth mentioning is that the fade doesn't actually work.
This is due to https://github.com/ppy/osu-framework/pull/4212.

Closes #12119.
---
 .../Objects/Drawables/DrawableSpinner.cs         | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 3d614c2dbd..d92f63eb89 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -39,6 +39,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         private Bindable<bool> isSpinning;
         private bool spinnerFrequencyModulate;
 
+        private const double fade_out_duration = 160;
+
         public DrawableSpinner()
             : this(null)
         {
@@ -136,7 +138,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
             else
             {
-                spinningSample?.VolumeTo(0, 300).OnComplete(_ => spinningSample.Stop());
+                if (spinningSample != null)
+                    spinningSample.Volume.Value = 0;
+
+                spinningSample?.VolumeTo(0, fade_out_duration);
             }
         }
 
@@ -173,7 +178,14 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.UpdateHitStateTransforms(state);
 
-            this.FadeOut(160).Expire();
+            this.FadeOut(fade_out_duration).OnComplete(_ =>
+            {
+                // looping sample should be stopped here as it is safer than running in the OnComplete
+                // of the volume transition above.
+                spinningSample.Stop();
+            });
+
+            Expire();
 
             // skin change does a rewind of transforms, which will stop the spinning sound from playing if it's currently in playback.
             isSpinning?.TriggerChange();

From 690fb9224aaee2d2d4930de181992eb53970b32d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 22 Mar 2021 16:18:31 +0900
Subject: [PATCH 1956/3722] Combine constants for readability

---
 osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs | 4 +++-
 osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyKeyArea.cs      | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs
index 73aece1ed4..9ec122a12c 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs
@@ -17,6 +17,8 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 {
     public class LegacyHitExplosion : LegacyManiaColumnElement, IHitExplosion
     {
+        public const double FADE_IN_DURATION = 80;
+
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
         private Drawable explosion;
@@ -72,7 +74,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 
             (explosion as IFramedAnimation)?.GotoFrame(0);
 
-            explosion?.FadeInFromZero(80)
+            explosion?.FadeInFromZero(fade_in_duration)
                      .Then().FadeOut(120);
         }
     }
diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyKeyArea.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyKeyArea.cs
index 174324f5f6..10319a7d4d 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyKeyArea.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyKeyArea.cs
@@ -101,8 +101,8 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
         {
             if (action == column.Action.Value)
             {
-                upSprite.Delay(80).FadeTo(1);
-                downSprite.Delay(80).FadeTo(0);
+                upSprite.Delay(LegacyHitExplosion.FADE_IN_DURATION).FadeTo(1);
+                downSprite.Delay(LegacyHitExplosion.FADE_IN_DURATION).FadeTo(0);
             }
         }
     }

From 5b1d9f4cf07abd14860bc9ecf887fa98e55b4dc6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 22 Mar 2021 16:19:29 +0900
Subject: [PATCH 1957/3722] Fix constant case

---
 osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs
index 9ec122a12c..e4d466dca5 100644
--- a/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyHitExplosion.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
 
             (explosion as IFramedAnimation)?.GotoFrame(0);
 
-            explosion?.FadeInFromZero(fade_in_duration)
+            explosion?.FadeInFromZero(FADE_IN_DURATION)
                      .Then().FadeOut(120);
         }
     }

From e60ff45b73a2e236eed250f869a3b4afbafd3292 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 22 Mar 2021 16:57:40 +0900
Subject: [PATCH 1958/3722] Add another test for colinear perfect curves

---
 .../colinear-perfect-curve-expected-conversion.json | 13 +++++++++++++
 .../Testing/Beatmaps/colinear-perfect-curve.osu     |  4 +++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/colinear-perfect-curve-expected-conversion.json b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/colinear-perfect-curve-expected-conversion.json
index 96e4bf1637..1a0bd66246 100644
--- a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/colinear-perfect-curve-expected-conversion.json
+++ b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/colinear-perfect-curve-expected-conversion.json
@@ -1,5 +1,18 @@
 {
     "Mappings": [{
+        "StartTime": 114993,
+        "Objects": [{
+            "StartTime": 114993,
+            "EndTime": 114993,
+            "X": 493,
+            "Y": 92
+        }, {
+            "StartTime": 115290,
+            "EndTime": 115290,
+            "X": 451.659241,
+            "Y": 267.188
+        }]
+    }, {
         "StartTime": 118858.0,
         "Objects": [{
             "StartTime": 118858.0,
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/colinear-perfect-curve.osu b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/colinear-perfect-curve.osu
index 8c3edc9571..dd35098502 100644
--- a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/colinear-perfect-curve.osu
+++ b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/colinear-perfect-curve.osu
@@ -9,7 +9,9 @@ SliderMultiplier:1.87
 SliderTickRate:1
 
 [TimingPoints]
-49051,230.769230769231,4,2,1,15,1,0
+114000,346.820809248555,4,2,1,71,1,0
+118000,230.769230769231,4,2,1,15,1,0
 
 [HitObjects]
+493,92,114993,2,0,P|472:181|442:308,1,180,12|0,0:0|0:0,0:0:0:0:
 219,215,118858,2,0,P|224:170|244:-10,1,187,8|2,0:0|0:0,0:0:0:0:

From bee2f55d007bad3e83fd2d010f709ff720242784 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 22 Mar 2021 15:54:33 +0100
Subject: [PATCH 1959/3722] Undo subpath limiting

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

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 94815fe0ea..3083fcfccb 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -219,10 +219,8 @@ namespace osu.Game.Rulesets.Objects
 
                     List<Vector2> subpath = PathApproximator.ApproximateCircularArc(subControlPoints);
 
-                    // If for some reason a circular arc could not be fit to the 3 given points, or the
-                    // resulting radius is too large (e.g. points arranged almost linearly), fall back
-                    // to a numerically stable bezier approximation.
-                    if (subpath.Count == 0 || subpath.Count > 400)
+                    // If for some reason a circular arc could not be fit to the 3 given points, fall back to a numerically stable bezier approximation.
+                    if (subpath.Count == 0)
                         break;
 
                     return subpath;

From 7a2cb526e4bd9e04f5e0720336cf278551d4efac Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 22 Mar 2021 15:55:30 +0100
Subject: [PATCH 1960/3722] Add PointsInSegment method

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

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 3083fcfccb..e76699ac04 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -156,6 +156,38 @@ namespace osu.Game.Rulesets.Objects
             return interpolateVertices(indexOfDistance(d), d);
         }
 
+        /// <summary>
+        /// Returns the control points belonging to the same segment as the one given.
+        /// The first point has a PathType which all other points inherit.
+        /// </summary>
+        /// <param name="controlPoint">One of the control points in the segment.</param>
+        /// <returns></returns>
+        public List<PathControlPoint> PointsInSegment(PathControlPoint controlPoint)
+        {
+            bool found = false;
+            List<PathControlPoint> pointsInCurrentSegment = new List<PathControlPoint>();
+            foreach (PathControlPoint point in ControlPoints)
+            {
+                if (point.Type.Value is PathType)
+                {
+                    if (!found)
+                        pointsInCurrentSegment.Clear();
+                    else
+                    {
+                        pointsInCurrentSegment.Add(point);
+                        break;
+                    }
+                }
+
+                pointsInCurrentSegment.Add(point);
+
+                if (point == controlPoint)
+                    found = true;
+            }
+
+            return pointsInCurrentSegment;
+        }
+
         private void invalidate()
         {
             pathCache.Invalidate();

From c82218627f914ca51875422de48811dacb136c14 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 22 Mar 2021 15:57:57 +0100
Subject: [PATCH 1961/3722] Add path type update logic

Only attempts to change points to bezier if points in the slider are modified.
---
 osu.Game/Rulesets/Objects/SliderPath.cs | 53 +++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index e76699ac04..42f1a33dfc 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -54,13 +54,19 @@ namespace osu.Game.Rulesets.Objects
                 {
                     case NotifyCollectionChangedAction.Add:
                         foreach (var c in args.NewItems.Cast<PathControlPoint>())
+                        {
                             c.Changed += invalidate;
+                            c.Changed += updatePathTypes;
+                        }
                         break;
 
                     case NotifyCollectionChangedAction.Reset:
                     case NotifyCollectionChangedAction.Remove:
                         foreach (var c in args.OldItems.Cast<PathControlPoint>())
+                        {
                             c.Changed -= invalidate;
+                            c.Changed -= updatePathTypes;
+                        }
                         break;
                 }
 
@@ -188,6 +194,53 @@ namespace osu.Game.Rulesets.Objects
             return pointsInCurrentSegment;
         }
 
+        private void updatePathTypes()
+        {
+            // Updates each segment of the slider once
+            foreach (PathControlPoint controlPoint in ControlPoints.Where(p => p.Type.Value is PathType))
+                updatePathType(controlPoint);
+        }
+
+        private void updatePathType(PathControlPoint controlPoint)
+        {
+            List<PathControlPoint> pointsInSegment = PointsInSegment(controlPoint);
+            PathType? pathType = pointsInSegment[0].Type.Value;
+
+            // An almost linear arrangement of points results in radius approaching infinity,
+            // we should prevent that to avoid memory exhaustion when drawing / approximating
+            if (pathType == PathType.PerfectCurve)
+            {
+                Vector2[] points = pointsInSegment.Select(point => point.Position.Value).ToArray();
+                if (points.Length < 3)
+                    return;
+
+                Vector2 a = points[0];
+                Vector2 b = points[1];
+                Vector2 c = points[2];
+
+                float maxLength = points.Max(p => p.Length);
+
+                Vector2 normA = new Vector2(a.X / maxLength, a.Y / maxLength);
+                Vector2 normB = new Vector2(b.X / maxLength, b.Y / maxLength);
+                Vector2 normC = new Vector2(c.X / maxLength, c.Y / maxLength);
+
+                float det = (normA.X - normB.X) * (normB.Y - normC.Y) - (normB.X - normC.X) * (normA.Y - normB.Y);
+
+                float acSq = (a - c).LengthSquared;
+                float abSq = (a - b).LengthSquared;
+                float bcSq = (b - c).LengthSquared;
+
+                // Exterior = curve wraps around the long way between end-points
+                // Exterior bottleneck is drawing-related, interior bottleneck is approximation-related,
+                // where the latter is much faster, hence differing thresholds
+                bool exterior = abSq > acSq || bcSq > acSq;
+                float threshold = exterior ? 0.05f : 0.001f;
+
+                if (Math.Abs(det) < threshold)
+                    pointsInSegment[0].Type.Value = PathType.Bezier;
+            }
+        }
+
         private void invalidate()
         {
             pathCache.Invalidate();

From 067178e53779be114ffd067a28144bb6dee94dd4 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 22 Mar 2021 15:59:06 +0100
Subject: [PATCH 1962/3722] Maintain path type when dragging/placing

---
 .../Sliders/Components/PathControlPointPiece.cs        | 10 ++++++++++
 .../Blueprints/Sliders/SliderPlacementBlueprint.cs     |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index 1390675a1a..42a7d246ea 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.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.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -31,6 +32,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 
         public readonly BindableBool IsSelected = new BindableBool();
         public readonly PathControlPoint ControlPoint;
+        public readonly List<PathControlPoint> PointsInSegment;
 
         private readonly Slider slider;
         private readonly Container marker;
@@ -53,6 +55,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         {
             this.slider = slider;
             ControlPoint = controlPoint;
+            PointsInSegment = slider.Path.PointsInSegment(controlPoint);
 
             controlPoint.Type.BindValueChanged(_ => updateMarkerDisplay());
 
@@ -150,6 +153,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         protected override bool OnClick(ClickEvent e) => RequestSelection != null;
 
         private Vector2 dragStartPosition;
+        private PathType? dragPathType;
 
         protected override bool OnDragStart(DragStartEvent e)
         {
@@ -159,6 +163,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             if (e.Button == MouseButton.Left)
             {
                 dragStartPosition = ControlPoint.Position.Value;
+                dragPathType = PointsInSegment[0].Type.Value;
+
                 changeHandler?.BeginChange();
                 return true;
             }
@@ -184,6 +190,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             }
             else
                 ControlPoint.Position.Value = dragStartPosition + (e.MousePosition - e.MouseDownPosition);
+
+            // Maintain the path type in case it got defaulted to bezier at some point during the drag.
+            if (PointsInSegment[0].Type.Value != dragPathType)
+                PointsInSegment[0].Type.Value = dragPathType;
         }
 
         protected override void OnDragEnd(DragEndEvent e) => changeHandler?.EndChange();
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index b71e1914f7..16e2a52279 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -142,6 +142,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         {
             base.Update();
             updateSlider();
+
+            // Maintain the path type in case it got defaulted to bezier at some point during the drag.
+            updatePathType();
         }
 
         private void updatePathType()

From 3bddc4a75d2f312541aad38e6408d956c32f9d81 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 22 Mar 2021 15:59:45 +0100
Subject: [PATCH 1963/3722] Add path type test

---
 .../Editor/TestSceneSliderPlacementBlueprint.cs                  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index f9b6fb924e..4f716a31b7 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -290,6 +290,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             assertPlaced(true);
             assertControlPointCount(3);
+            assertControlPointType(0, PathType.Bezier);
             // Will be > 10000 if not falling back to Bezier path calc.
             assertLength(218.8901f);
         }

From 15af57de95ec260afef3a59bedc736202c06f297 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 22 Mar 2021 15:59:59 +0100
Subject: [PATCH 1964/3722] Add path type recovery test

---
 .../TestSceneSliderPlacementBlueprint.cs      | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index 4f716a31b7..db7b3aa973 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -295,6 +295,25 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertLength(218.8901f);
         }
 
+        [Test]
+        public void TestPlacePerfectCurveSegmentAlmostLinearlyRecovery()
+        {
+            addMovementStep(new Vector2(0));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(61.382935f, 6.423767f));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(217.69522f, 22.84021f));  // Should convert to bezier
+            addMovementStep(new Vector2(210.0f, 30.0f));          // Should convert back to perfect
+            addClickStep(MouseButton.Right);
+
+            assertPlaced(true);
+            assertControlPointCount(3);
+            assertControlPointType(0, PathType.PerfectCurve);
+            assertLength(212.2276f);
+        }
+
         private void addMovementStep(Vector2 position) => AddStep($"move mouse to {position}", () => InputManager.MoveMouseTo(InputManager.ToScreenSpace(position)));
 
         private void addClickStep(MouseButton button)

From 323b875cea686e080c3b58fc04de91e73d24b437 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 22 Mar 2021 17:32:40 +0100
Subject: [PATCH 1965/3722] Fix newlines/spaces

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

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index db7b3aa973..e7ea12e538 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -304,8 +304,8 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             addMovementStep(new Vector2(61.382935f, 6.423767f));
             addClickStep(MouseButton.Left);
 
-            addMovementStep(new Vector2(217.69522f, 22.84021f));  // Should convert to bezier
-            addMovementStep(new Vector2(210.0f, 30.0f));          // Should convert back to perfect
+            addMovementStep(new Vector2(217.69522f, 22.84021f)); // Should convert to bezier
+            addMovementStep(new Vector2(210.0f, 30.0f)); // Should convert back to perfect
             addClickStep(MouseButton.Right);
 
             assertPlaced(true);
diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 42f1a33dfc..639cd4c72e 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -58,6 +58,7 @@ namespace osu.Game.Rulesets.Objects
                             c.Changed += invalidate;
                             c.Changed += updatePathTypes;
                         }
+
                         break;
 
                     case NotifyCollectionChangedAction.Reset:
@@ -67,6 +68,7 @@ namespace osu.Game.Rulesets.Objects
                             c.Changed -= invalidate;
                             c.Changed -= updatePathTypes;
                         }
+
                         break;
                 }
 

From a7076c329c66752955ee7501b09a1a17b7554b30 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 22 Mar 2021 17:32:55 +0100
Subject: [PATCH 1966/3722] Fix null checks

---
 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 639cd4c72e..47cc2c6044 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -176,7 +176,7 @@ namespace osu.Game.Rulesets.Objects
             List<PathControlPoint> pointsInCurrentSegment = new List<PathControlPoint>();
             foreach (PathControlPoint point in ControlPoints)
             {
-                if (point.Type.Value is PathType)
+                if (point.Type.Value != null)
                 {
                     if (!found)
                         pointsInCurrentSegment.Clear();
@@ -199,7 +199,7 @@ namespace osu.Game.Rulesets.Objects
         private void updatePathTypes()
         {
             // Updates each segment of the slider once
-            foreach (PathControlPoint controlPoint in ControlPoints.Where(p => p.Type.Value is PathType))
+            foreach (PathControlPoint controlPoint in ControlPoints.Where(p => p.Type.Value != null))
                 updatePathType(controlPoint);
         }
 

From 6911a1b41546c04252b4d9e92bcbbf511befbf2a Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 22 Mar 2021 19:03:55 +0100
Subject: [PATCH 1967/3722] Fix missing newline

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

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 47cc2c6044..d8fbb46b76 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -174,6 +174,7 @@ namespace osu.Game.Rulesets.Objects
         {
             bool found = false;
             List<PathControlPoint> pointsInCurrentSegment = new List<PathControlPoint>();
+
             foreach (PathControlPoint point in ControlPoints)
             {
                 if (point.Type.Value != null)
@@ -241,6 +242,12 @@ namespace osu.Game.Rulesets.Objects
                 if (Math.Abs(det) < threshold)
                     pointsInSegment[0].Type.Value = PathType.Bezier;
             }
+            // where the latter is much faster, hence differing thresholds
+            bool exterior = abSq > acSq || bcSq > acSq;
+            float threshold = exterior ? 0.05f : 0.001f;
+
+            if (Math.Abs(det) < threshold)
+                pointsInSegment[0].Type.Value = PathType.Bezier;
         }
 
         private void invalidate()

From 80e7c3aba7e804ae1f1696219ee8c9a48871abb0 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 22 Mar 2021 19:09:28 +0100
Subject: [PATCH 1968/3722] Invert if statement

---
 osu.Game/Rulesets/Objects/SliderPath.cs | 42 +++++++++++--------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index d8fbb46b76..767f7909d5 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -211,37 +211,31 @@ namespace osu.Game.Rulesets.Objects
 
             // An almost linear arrangement of points results in radius approaching infinity,
             // we should prevent that to avoid memory exhaustion when drawing / approximating
-            if (pathType == PathType.PerfectCurve)
-            {
-                Vector2[] points = pointsInSegment.Select(point => point.Position.Value).ToArray();
-                if (points.Length < 3)
-                    return;
+            if (pathType != PathType.PerfectCurve)
+                return;
 
-                Vector2 a = points[0];
-                Vector2 b = points[1];
-                Vector2 c = points[2];
+            Vector2[] points = pointsInSegment.Select(point => point.Position.Value).ToArray();
+            if (points.Length < 3)
+                return;
 
-                float maxLength = points.Max(p => p.Length);
+            Vector2 a = points[0];
+            Vector2 b = points[1];
+            Vector2 c = points[2];
 
-                Vector2 normA = new Vector2(a.X / maxLength, a.Y / maxLength);
-                Vector2 normB = new Vector2(b.X / maxLength, b.Y / maxLength);
-                Vector2 normC = new Vector2(c.X / maxLength, c.Y / maxLength);
+            float maxLength = points.Max(p => p.Length);
 
-                float det = (normA.X - normB.X) * (normB.Y - normC.Y) - (normB.X - normC.X) * (normA.Y - normB.Y);
+            Vector2 normA = new Vector2(a.X / maxLength, a.Y / maxLength);
+            Vector2 normB = new Vector2(b.X / maxLength, b.Y / maxLength);
+            Vector2 normC = new Vector2(c.X / maxLength, c.Y / maxLength);
 
-                float acSq = (a - c).LengthSquared;
-                float abSq = (a - b).LengthSquared;
-                float bcSq = (b - c).LengthSquared;
+            float det = (normA.X - normB.X) * (normB.Y - normC.Y) - (normB.X - normC.X) * (normA.Y - normB.Y);
 
-                // Exterior = curve wraps around the long way between end-points
-                // Exterior bottleneck is drawing-related, interior bottleneck is approximation-related,
-                // where the latter is much faster, hence differing thresholds
-                bool exterior = abSq > acSq || bcSq > acSq;
-                float threshold = exterior ? 0.05f : 0.001f;
+            float acSq = (a - c).LengthSquared;
+            float abSq = (a - b).LengthSquared;
+            float bcSq = (b - c).LengthSquared;
 
-                if (Math.Abs(det) < threshold)
-                    pointsInSegment[0].Type.Value = PathType.Bezier;
-            }
+            // Exterior = curve wraps around the long way between end-points
+            // Exterior bottleneck is drawing-related, interior bottleneck is approximation-related,
             // where the latter is much faster, hence differing thresholds
             bool exterior = abSq > acSq || bcSq > acSq;
             float threshold = exterior ? 0.05f : 0.001f;

From 92f713a30e57d86b9c6408004be911f8c40755ca Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 22 Mar 2021 19:10:56 +0100
Subject: [PATCH 1969/3722] Improve fallback conditions

It's possible to create a `PerfectCurve` type path with more than 3 points currently, so this accounts for that.
---
 osu.Game/Rulesets/Objects/SliderPath.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 767f7909d5..23511be5e4 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -211,12 +211,10 @@ namespace osu.Game.Rulesets.Objects
 
             // An almost linear arrangement of points results in radius approaching infinity,
             // we should prevent that to avoid memory exhaustion when drawing / approximating
-            if (pathType != PathType.PerfectCurve)
+            if (pathType != PathType.PerfectCurve || pointsInSegment.Count != 3)
                 return;
 
             Vector2[] points = pointsInSegment.Select(point => point.Position.Value).ToArray();
-            if (points.Length < 3)
-                return;
 
             Vector2 a = points[0];
             Vector2 b = points[1];

From b11fd7972aafea70905a1f0f73addffe82442d91 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 22 Mar 2021 19:41:48 +0100
Subject: [PATCH 1970/3722] Separate condition logic from math logic

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

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 23511be5e4..ae08660404 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -199,23 +199,19 @@ namespace osu.Game.Rulesets.Objects
 
         private void updatePathTypes()
         {
-            // Updates each segment of the slider once
-            foreach (PathControlPoint controlPoint in ControlPoints.Where(p => p.Type.Value != null))
-                updatePathType(controlPoint);
+            foreach (PathControlPoint segmentStartPoint in ControlPoints.Where(p => p.Type.Value != null))
+            {
+                if (segmentStartPoint.Type.Value != PathType.PerfectCurve)
+                    continue;
+
+                Vector2[] points = PointsInSegment(segmentStartPoint).Select(p => p.Position.Value).ToArray();
+                if (points.Length == 3 && !validCircularArcSegment(points))
+                    segmentStartPoint.Type.Value = PathType.Bezier;
+            }
         }
 
-        private void updatePathType(PathControlPoint controlPoint)
+        private bool validCircularArcSegment(IReadOnlyList<Vector2> points)
         {
-            List<PathControlPoint> pointsInSegment = PointsInSegment(controlPoint);
-            PathType? pathType = pointsInSegment[0].Type.Value;
-
-            // An almost linear arrangement of points results in radius approaching infinity,
-            // we should prevent that to avoid memory exhaustion when drawing / approximating
-            if (pathType != PathType.PerfectCurve || pointsInSegment.Count != 3)
-                return;
-
-            Vector2[] points = pointsInSegment.Select(point => point.Position.Value).ToArray();
-
             Vector2 a = points[0];
             Vector2 b = points[1];
             Vector2 c = points[2];
@@ -238,8 +234,7 @@ namespace osu.Game.Rulesets.Objects
             bool exterior = abSq > acSq || bcSq > acSq;
             float threshold = exterior ? 0.05f : 0.001f;
 
-            if (Math.Abs(det) < threshold)
-                pointsInSegment[0].Type.Value = PathType.Bezier;
+            return Math.Abs(det) < threshold;
         }
 
         private void invalidate()

From 3fa5852e00cbb6d43e0383e5044dcd487ab43b2a Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 22 Mar 2021 19:42:27 +0100
Subject: [PATCH 1971/3722] Add method documentation

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

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index ae08660404..b048bf2a84 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -197,6 +197,9 @@ namespace osu.Game.Rulesets.Objects
             return pointsInCurrentSegment;
         }
 
+        /// <summary>
+        /// Handles correction of invalid path types.
+        /// </summary>
         private void updatePathTypes()
         {
             foreach (PathControlPoint segmentStartPoint in ControlPoints.Where(p => p.Type.Value != null))
@@ -210,6 +213,13 @@ namespace osu.Game.Rulesets.Objects
             }
         }
 
+        /// <summary>
+        /// Returns whether the given points are arranged in a valid way. Invalid if points
+        /// are almost entirely linear - as this causes the radius to approach infinity,
+        /// which would exhaust memory when drawing / approximating.
+        /// </summary>
+        /// <param name="points">The three points that make up this circular arc segment.</param>
+        /// <returns></returns>
         private bool validCircularArcSegment(IReadOnlyList<Vector2> points)
         {
             Vector2 a = points[0];

From e922e67c9847b8dfea62bed7c85d673acd6278bd Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 22 Mar 2021 19:48:21 +0100
Subject: [PATCH 1972/3722] Fix inverted return statement

Forgot to run tests, all passing now.
---
 osu.Game/Rulesets/Objects/SliderPath.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index b048bf2a84..c7931b440b 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -244,7 +244,7 @@ namespace osu.Game.Rulesets.Objects
             bool exterior = abSq > acSq || bcSq > acSq;
             float threshold = exterior ? 0.05f : 0.001f;
 
-            return Math.Abs(det) < threshold;
+            return Math.Abs(det) >= threshold;
         }
 
         private void invalidate()

From a65e491768441017e9cfe7e2e4fec2d15e57d708 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 22 Mar 2021 20:00:36 +0100
Subject: [PATCH 1973/3722] Remove osuTK desktop rider run config

No longer operational since 6eadae8.
---
 .../runConfigurations/osu___legacy_osuTK_.xml | 20 -------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 .idea/.idea.osu.Desktop/.idea/runConfigurations/osu___legacy_osuTK_.xml

diff --git a/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu___legacy_osuTK_.xml b/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu___legacy_osuTK_.xml
deleted file mode 100644
index 9ece926b34..0000000000
--- a/.idea/.idea.osu.Desktop/.idea/runConfigurations/osu___legacy_osuTK_.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="osu! (legacy osuTK)" type="DotNetProject" factoryName=".NET Project" folderName="osu!" activateToolWindowBeforeRun="false">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net5.0/osu!.dll" />
-    <option name="PROGRAM_PARAMETERS" value="--tk" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Desktop/bin/Debug/net5.0" />
-    <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
-    <option name="USE_MONO" value="0" />
-    <option name="RUNTIME_ARGUMENTS" value="" />
-    <option name="PROJECT_PATH" value="$PROJECT_DIR$/osu.Desktop/osu.Desktop.csproj" />
-    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
-    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
-    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
-    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
-    <method v="2">
-      <option name="Build" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file

From d85929d721254391d5e7e23d2e81d56180ee07f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 22 Mar 2021 22:45:18 +0100
Subject: [PATCH 1974/3722] Adjust autoplay generation tests to match expected
 behaviour

---
 .../TestSceneAutoGeneration.cs                         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs
index a5248c7712..399a46aa77 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             Assert.IsTrue(generated.Frames.Count == frame_offset + 2, "Replay must have 3 frames");
             Assert.AreEqual(1000, generated.Frames[frame_offset].Time, "Incorrect hit time");
-            Assert.AreEqual(3000 + ManiaAutoGenerator.RELEASE_DELAY, generated.Frames[frame_offset + 1].Time, "Incorrect release time");
+            Assert.AreEqual(3000, generated.Frames[frame_offset + 1].Time, "Incorrect release time");
             Assert.IsTrue(checkContains(generated.Frames[frame_offset], ManiaAction.Special1), "Special1 has not been pressed");
             Assert.IsFalse(checkContains(generated.Frames[frame_offset + 1], ManiaAction.Special1), "Special1 has not been released");
         }
@@ -99,7 +99,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             Assert.IsTrue(generated.Frames.Count == frame_offset + 2, "Replay must have 3 frames");
 
             Assert.AreEqual(1000, generated.Frames[frame_offset].Time, "Incorrect hit time");
-            Assert.AreEqual(3000 + ManiaAutoGenerator.RELEASE_DELAY, generated.Frames[frame_offset + 1].Time, "Incorrect release time");
+            Assert.AreEqual(3000, generated.Frames[frame_offset + 1].Time, "Incorrect release time");
 
             Assert.IsTrue(checkContains(generated.Frames[frame_offset], ManiaAction.Key1, ManiaAction.Key2), "Key1 & Key2 have not been pressed");
             Assert.IsFalse(checkContains(generated.Frames[frame_offset + 1], ManiaAction.Key1, ManiaAction.Key2), "Key1 & Key2 have not been released");
@@ -148,9 +148,9 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             Assert.IsTrue(generated.Frames.Count == frame_offset + 4, "Replay must have 4 generated frames");
             Assert.AreEqual(1000, generated.Frames[frame_offset].Time, "Incorrect first note hit time");
-            Assert.AreEqual(3000 + ManiaAutoGenerator.RELEASE_DELAY, generated.Frames[frame_offset + 2].Time, "Incorrect first note release time");
+            Assert.AreEqual(3000, generated.Frames[frame_offset + 2].Time, "Incorrect first note release time");
             Assert.AreEqual(2000, generated.Frames[frame_offset + 1].Time, "Incorrect second note hit time");
-            Assert.AreEqual(4000 + ManiaAutoGenerator.RELEASE_DELAY, generated.Frames[frame_offset + 3].Time, "Incorrect second note release time");
+            Assert.AreEqual(4000, generated.Frames[frame_offset + 3].Time, "Incorrect second note release time");
             Assert.IsTrue(checkContains(generated.Frames[frame_offset], ManiaAction.Key1), "Key1 has not been pressed");
             Assert.IsTrue(checkContains(generated.Frames[frame_offset + 1], ManiaAction.Key1, ManiaAction.Key2), "Key1 & Key2 have not been pressed");
             Assert.IsFalse(checkContains(generated.Frames[frame_offset + 2], ManiaAction.Key1), "Key1 has not been released");
@@ -168,7 +168,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             // |   |   |
 
             var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 2 });
-            beatmap.HitObjects.Add(new HoldNote { StartTime = 1000, Duration = 2000 - ManiaAutoGenerator.RELEASE_DELAY });
+            beatmap.HitObjects.Add(new HoldNote { StartTime = 1000, Duration = 2000 });
             beatmap.HitObjects.Add(new Note { StartTime = 3000, Column = 1 });
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();

From 29d4162e4e2110973571a8fcfe83509e3586d50a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 22 Mar 2021 22:38:51 +0100
Subject: [PATCH 1975/3722] Remove release delay for hold notes when generating
 autoplay

It was more intended for normal notes anyway (as they would be released
pretty much instantaneously, if it weren't for the delay).
---
 .../Replays/ManiaAutoGenerator.cs             | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs b/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
index 3ebbe5af8e..7c51d58b74 100644
--- a/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Mania.Beatmaps;
+using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Replays;
 
@@ -85,20 +86,28 @@ namespace osu.Game.Rulesets.Mania.Replays
             {
                 var currentObject = Beatmap.HitObjects[i];
                 var nextObjectInColumn = GetNextObject(i); // Get the next object that requires pressing the same button
-
-                double endTime = currentObject.GetEndTime();
-
-                bool canDelayKeyUp = nextObjectInColumn == null ||
-                                     nextObjectInColumn.StartTime > endTime + RELEASE_DELAY;
-
-                double calculatedDelay = canDelayKeyUp ? RELEASE_DELAY : (nextObjectInColumn.StartTime - endTime) * 0.9;
+                var releaseTime = calculateReleaseTime(currentObject, nextObjectInColumn);
 
                 yield return new HitPoint { Time = currentObject.StartTime, Column = currentObject.Column };
 
-                yield return new ReleasePoint { Time = endTime + calculatedDelay, Column = currentObject.Column };
+                yield return new ReleasePoint { Time = releaseTime, Column = currentObject.Column };
             }
         }
 
+        private double calculateReleaseTime(HitObject currentObject, HitObject nextObject)
+        {
+            double endTime = currentObject.GetEndTime();
+
+            if (currentObject is HoldNote)
+                // hold note releases must be timed exactly.
+                return endTime;
+
+            bool canDelayKeyUpFully = nextObject == null ||
+                                      nextObject.StartTime > endTime + RELEASE_DELAY;
+
+            return endTime + (canDelayKeyUpFully ? RELEASE_DELAY : (nextObject.StartTime - endTime) * 0.9);
+        }
+
         protected override HitObject GetNextObject(int currentIndex)
         {
             int desiredColumn = Beatmap.HitObjects[currentIndex].Column;

From 8ea7271d5c96b062bebcb8b702da739d9ef4dac1 Mon Sep 17 00:00:00 2001
From: Owen Young <owen.young8699@gmail.com>
Date: Mon, 22 Mar 2021 19:48:52 -0500
Subject: [PATCH 1976/3722] moved windowmode code to LoadComplete (?)

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 84737a56e4..ff215b63e5 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -234,9 +234,6 @@ namespace osu.Game
 
             SelectedMods.BindValueChanged(modsChanged);
             Beatmap.BindValueChanged(beatmapChanged, true);
-
-            windowMode = LocalConfig.GetBindable<WindowMode>(OsuSetting.WindowSetting);
-            frameworkConfig.GetBindable<WindowMode>(FrameworkSetting.WindowMode).Value = windowMode.Value;
         }
 
         private ExternalLinkOpener externalLinkOpener;
@@ -576,6 +573,9 @@ namespace osu.Game
 
             dependencies.CacheAs(idleTracker = new GameIdleTracker(6000));
 
+            windowMode = LocalConfig.GetBindable<WindowMode>(OsuSetting.WindowSetting);
+            frameworkConfig.GetBindable<WindowMode>(FrameworkSetting.WindowMode).Value = windowMode.Value;
+
             AddRange(new Drawable[]
             {
                 new VolumeControlReceptor

From bdcb9451f79798197825106a0762a0c823b771c7 Mon Sep 17 00:00:00 2001
From: Owen Young <owen.young8699@gmail.com>
Date: Mon, 22 Mar 2021 20:17:05 -0500
Subject: [PATCH 1977/3722] added code to OsuGameBase to default to fullscreen,
 but that might not be a good place to put it.

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

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index e1c7b67a8c..bcd384604f 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -21,6 +21,7 @@ using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Online.API;
+using osu.Framework.Configuration;
 using osu.Framework.Graphics.Performance;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input;
@@ -119,6 +120,7 @@ namespace osu.Game
         protected Bindable<WorkingBeatmap> Beatmap { get; private set; } // cached via load() method
 
         private Bindable<bool> fpsDisplayVisible;
+        private Bindable<WindowMode> windowMode;
 
         public virtual Version AssemblyVersion => Assembly.GetEntryAssembly()?.GetName().Version ?? new Version();
 
@@ -361,6 +363,9 @@ namespace osu.Game
             fpsDisplayVisible.ValueChanged += visible => { FrameStatistics.Value = visible.NewValue ? FrameStatisticsMode.Minimal : FrameStatisticsMode.None; };
             fpsDisplayVisible.TriggerChange();
 
+            windowMode = LocalConfig.GetBindable<WindowMode>(OsuSetting.WindowSetting);
+            windowMode.Value = WindowMode.Fullscreen;
+
             FrameStatistics.ValueChanged += e => fpsDisplayVisible.Value = e.NewValue != FrameStatisticsMode.None;
         }
 

From 098005393e999f5623769adc9e5458bb86e37513 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 10:38:37 +0900
Subject: [PATCH 1978/3722] Remove unnecessary null checks and debug code

---
 .../Objects/Drawables/DrawableSpinner.cs               | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index d92f63eb89..32a0a14dc0 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -133,15 +133,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             if (tracking.NewValue)
             {
                 if (!spinningSample.IsPlaying)
-                    spinningSample?.Play();
-                spinningSample?.VolumeTo(1, 300);
+                    spinningSample.Play();
+
+                spinningSample.VolumeTo(1, 300);
             }
             else
             {
-                if (spinningSample != null)
-                    spinningSample.Volume.Value = 0;
-
-                spinningSample?.VolumeTo(0, fade_out_duration);
+                spinningSample.VolumeTo(0, fade_out_duration);
             }
         }
 

From 16b3f22caf2754d97aacbf40f0d429e8b3cecdce Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 22 Mar 2021 19:32:17 -0700
Subject: [PATCH 1979/3722] Fix incorrect trash icon being used on deleted
 comments counter

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

diff --git a/osu.Game/Overlays/Comments/DeletedCommentsCounter.cs b/osu.Game/Overlays/Comments/DeletedCommentsCounter.cs
index 56588ef0a8..8c40d79f7a 100644
--- a/osu.Game/Overlays/Comments/DeletedCommentsCounter.cs
+++ b/osu.Game/Overlays/Comments/DeletedCommentsCounter.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Overlays.Comments
                 {
                     new SpriteIcon
                     {
-                        Icon = FontAwesome.Solid.Trash,
+                        Icon = FontAwesome.Regular.TrashAlt,
                         Size = new Vector2(14),
                     },
                     countText = new OsuSpriteText

From 9f788f58548d629144c4b8946b74542b424ea7a4 Mon Sep 17 00:00:00 2001
From: Owen Young <owen.young8699@gmail.com>
Date: Mon, 22 Mar 2021 22:52:16 -0500
Subject: [PATCH 1980/3722] removed code from OsuGameBase for
 fullscreen.....OsuSetting still exists but cannot figure out a way to set it
 to a default and have it actually work

---
 osu.Game/OsuGame.cs                                         | 6 +++---
 osu.Game/OsuGameBase.cs                                     | 4 ----
 .../Overlays/Settings/Sections/Graphics/LayoutSettings.cs   | 6 ++++--
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index ff215b63e5..2f2428e781 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -126,7 +126,7 @@ namespace osu.Game
 
         private Bindable<int> configSkin;
 
-        private Bindable<WindowMode> windowMode;
+        // private Bindable<WindowMode> windowMode;
 
         private readonly string[] args;
 
@@ -573,8 +573,8 @@ namespace osu.Game
 
             dependencies.CacheAs(idleTracker = new GameIdleTracker(6000));
 
-            windowMode = LocalConfig.GetBindable<WindowMode>(OsuSetting.WindowSetting);
-            frameworkConfig.GetBindable<WindowMode>(FrameworkSetting.WindowMode).Value = windowMode.Value;
+            // windowMode = LocalConfig.GetBindable<WindowMode>(OsuSetting.WindowSetting);
+            // frameworkConfig.GetBindable<WindowMode>(FrameworkSetting.WindowMode).Value = windowMode.Value;
 
             AddRange(new Drawable[]
             {
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index bcd384604f..8b1fe20708 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -120,7 +120,6 @@ namespace osu.Game
         protected Bindable<WorkingBeatmap> Beatmap { get; private set; } // cached via load() method
 
         private Bindable<bool> fpsDisplayVisible;
-        private Bindable<WindowMode> windowMode;
 
         public virtual Version AssemblyVersion => Assembly.GetEntryAssembly()?.GetName().Version ?? new Version();
 
@@ -363,9 +362,6 @@ namespace osu.Game
             fpsDisplayVisible.ValueChanged += visible => { FrameStatistics.Value = visible.NewValue ? FrameStatisticsMode.Minimal : FrameStatisticsMode.None; };
             fpsDisplayVisible.TriggerChange();
 
-            windowMode = LocalConfig.GetBindable<WindowMode>(OsuSetting.WindowSetting);
-            windowMode.Value = WindowMode.Fullscreen;
-
             FrameStatistics.ValueChanged += e => fpsDisplayVisible.Value = e.NewValue != FrameStatisticsMode.None;
         }
 
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index ab662cb9a0..a0cb8fc2de 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -12,6 +12,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Localisation;
+using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Configuration;
 using osu.Game.Graphics.Containers;
@@ -57,7 +58,8 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
             scalingSizeY = osuConfig.GetBindable<float>(OsuSetting.ScalingSizeY);
             scalingPositionX = osuConfig.GetBindable<float>(OsuSetting.ScalingPositionX);
             scalingPositionY = osuConfig.GetBindable<float>(OsuSetting.ScalingPositionY);
-            windowMode = osuConfig.GetBindable<WindowMode>(OsuSetting.WindowSetting);
+            windowMode = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
+            Logger.Log($"windowMode {windowMode.Value}");
 
             if (host.Window != null)
             {
@@ -71,7 +73,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 {
                     LabelText = "Screen mode",
                     ItemSource = windowModes,
-                    Current = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode),
+                    Current = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode)
                 },
                 resolutionDropdown = new ResolutionSettingsDropdown
                 {

From d9e2c44a34c17d9ed0f93587460fd506480ad478 Mon Sep 17 00:00:00 2001
From: Owen Young <owen.young8699@gmail.com>
Date: Mon, 22 Mar 2021 23:36:55 -0500
Subject: [PATCH 1981/3722] implemented GetFrameworkConfigDefaults for
 overriding framework default, removed previous code that added a new
 OsuSetting and modified settings layout.

---
 osu.Game/Configuration/OsuConfigManager.cs            |  3 ---
 osu.Game/OsuGame.cs                                   | 11 ++++++-----
 osu.Game/OsuGameBase.cs                               |  1 -
 .../Settings/Sections/Graphics/LayoutSettings.cs      | 11 ++---------
 4 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index cd74fe25f4..d0fa45bb7a 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -91,8 +91,6 @@ namespace osu.Game.Configuration
 
             Set(OsuSetting.MenuParallax, true);
 
-            Set(OsuSetting.WindowSetting, WindowMode.Fullscreen);
-
             // Gameplay
             Set(OsuSetting.DimLevel, 0.8, 0, 1, 0.01);
             Set(OsuSetting.BlurLevel, 0, 0, 1, 0.01);
@@ -235,7 +233,6 @@ namespace osu.Game.Configuration
         MenuVoice,
         CursorRotation,
         MenuParallax,
-        WindowSetting,
         BeatmapDetailTab,
         BeatmapDetailModsFilter,
         Username,
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 2f2428e781..ffb694c27e 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -126,8 +126,6 @@ namespace osu.Game
 
         private Bindable<int> configSkin;
 
-        // private Bindable<WindowMode> windowMode;
-
         private readonly string[] args;
 
         private readonly List<OverlayContainer> overlays = new List<OverlayContainer>();
@@ -573,9 +571,6 @@ namespace osu.Game
 
             dependencies.CacheAs(idleTracker = new GameIdleTracker(6000));
 
-            // windowMode = LocalConfig.GetBindable<WindowMode>(OsuSetting.WindowSetting);
-            // frameworkConfig.GetBindable<WindowMode>(FrameworkSetting.WindowMode).Value = windowMode.Value;
-
             AddRange(new Drawable[]
             {
                 new VolumeControlReceptor
@@ -1012,5 +1007,11 @@ namespace osu.Game
             if (newScreen == null)
                 Exit();
         }
+
+        protected override IDictionary<FrameworkSetting, object> GetFrameworkConfigDefaults() {
+            IDictionary<FrameworkSetting, object> defaultOverrides = new Dictionary<FrameworkSetting, object>();
+            defaultOverrides.Add(FrameworkSetting.WindowMode, WindowMode.Fullscreen);
+            return defaultOverrides;
+        }
     }
 }
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 8b1fe20708..e1c7b67a8c 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -21,7 +21,6 @@ using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Online.API;
-using osu.Framework.Configuration;
 using osu.Framework.Graphics.Performance;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input;
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index a0cb8fc2de..4d5c2e06eb 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -12,7 +12,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Localisation;
-using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Configuration;
 using osu.Game.Graphics.Containers;
@@ -32,7 +31,6 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
 
         private Bindable<ScalingMode> scalingMode;
         private Bindable<Size> sizeFullscreen;
-        private Bindable<WindowMode> windowMode;
 
         private readonly BindableList<Size> resolutions = new BindableList<Size>(new[] { new Size(9999, 9999) });
 
@@ -58,8 +56,6 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
             scalingSizeY = osuConfig.GetBindable<float>(OsuSetting.ScalingSizeY);
             scalingPositionX = osuConfig.GetBindable<float>(OsuSetting.ScalingPositionX);
             scalingPositionY = osuConfig.GetBindable<float>(OsuSetting.ScalingPositionY);
-            windowMode = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
-            Logger.Log($"windowMode {windowMode.Value}");
 
             if (host.Window != null)
             {
@@ -73,7 +69,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 {
                     LabelText = "Screen mode",
                     ItemSource = windowModes,
-                    Current = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode)
+                    Current = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode),
                 },
                 resolutionDropdown = new ResolutionSettingsDropdown
                 {
@@ -145,10 +141,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
 
             scalingSettings.ForEach(s => bindPreviewEvent(s.Current));
 
-            windowModeDropdown.Current.ValueChanged += mode => {
-                windowMode.Value = mode.NewValue;
-                updateResolutionDropdown();
-            };
+            windowModeDropdown.Current.ValueChanged += _ => updateResolutionDropdown();
 
             windowModes.BindCollectionChanged((sender, args) =>
             {

From 58c60100b431e6ce6ee720ff72206e9f9071d070 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 14:04:47 +0900
Subject: [PATCH 1982/3722] Fix APIScoreToken's data type not matching server
 side

---
 osu.Game/Online/Rooms/APIScoreToken.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/Rooms/APIScoreToken.cs b/osu.Game/Online/Rooms/APIScoreToken.cs
index f652c1720d..6b559876de 100644
--- a/osu.Game/Online/Rooms/APIScoreToken.cs
+++ b/osu.Game/Online/Rooms/APIScoreToken.cs
@@ -8,6 +8,6 @@ namespace osu.Game.Online.Rooms
     public class APIScoreToken
     {
         [JsonProperty("id")]
-        public int ID { get; set; }
+        public long ID { get; set; }
     }
 }

From 9c690f9545959c117b4358e391333b3882abb34c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 14:08:00 +0900
Subject: [PATCH 1983/3722] Fix second usage

---
 osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
index a75e4bdc07..2b6dbd9dcb 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
 
         protected readonly PlaylistItem PlaylistItem;
 
-        protected int? Token { get; private set; }
+        protected long? Token { get; private set; }
 
         [Resolved]
         private IAPIProvider api { get; set; }

From 254b0f5dc3b2469fdccf6baf0231af30baf11c9b Mon Sep 17 00:00:00 2001
From: Owen Young <owen.young8699@gmail.com>
Date: Tue, 23 Mar 2021 00:24:33 -0500
Subject: [PATCH 1984/3722] removed line (?) - tried doing testing to see if it
 launched in fullscreen (i.e., overriding the method ppy mentioned), but to no
 avail :(

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index ffb694c27e..a52899433a 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -1007,7 +1007,6 @@ namespace osu.Game
             if (newScreen == null)
                 Exit();
         }
-
         protected override IDictionary<FrameworkSetting, object> GetFrameworkConfigDefaults() {
             IDictionary<FrameworkSetting, object> defaultOverrides = new Dictionary<FrameworkSetting, object>();
             defaultOverrides.Add(FrameworkSetting.WindowMode, WindowMode.Fullscreen);

From 1171214541361b72ae23405a3549fd918af16fed Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 14:51:22 +0900
Subject: [PATCH 1985/3722] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index e0392bd687..75ac298626 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.317.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.323.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 9731c1d5ea..b90c938a8b 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.317.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.323.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.0.7" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 11677d345e..ce182a3054 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.317.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.323.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.317.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.323.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 08fcdc8ee46748eee4c8d66d5842b57f16d9d896 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 15:38:00 +0900
Subject: [PATCH 1986/3722] Update difficulty calculator tests with floating
 point differences

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

diff --git a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
index a365ea10d4..c2119585ab 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
@@ -15,13 +15,13 @@ namespace osu.Game.Rulesets.Osu.Tests
     {
         protected override string ResourceAssembly => "osu.Game.Rulesets.Osu";
 
-        [TestCase(6.9311451172608853d, "diffcalc-test")]
-        [TestCase(1.0736587013228804d, "zero-length-sliders")]
+        [TestCase(6.9311451172574934d, "diffcalc-test")]
+        [TestCase(1.0736586907780401d, "zero-length-sliders")]
         public void Test(double expected, string name)
             => base.Test(expected, name);
 
-        [TestCase(8.6228371119393064d, "diffcalc-test")]
-        [TestCase(1.2864585434597433d, "zero-length-sliders")]
+        [TestCase(8.6228371119271454d, "diffcalc-test")]
+        [TestCase(1.2864585280364178d, "zero-length-sliders")]
         public void TestClockRateAdjusted(double expected, string name)
             => Test(expected, name, new OsuModDoubleTime());
 

From f5ba746ae5522e6c1ba34f6a34218491ff4aa626 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 17:31:28 +0900
Subject: [PATCH 1987/3722] Fail all API requests sent to DummyAPIAccess

Until now, API requests sent to dummy API were just lost in the void. In most cases this somehow worked as expected, but any logic which is waiting on a request to finish will potentially never get a response.

Going forward, I'm not 100% sure that every `Wait` on a web response will have local timeout logic (I think there is a certain amount of assumption that this is being managed for us by `APIAccess`), so I've made this change to better handle such cases going forward. Now, rather than nothing happening, requests will trigger a failure via the existing exception logic rather than silently pretending the request never arrived.
---
 osu.Game/Online/API/APIRequest.cs     | 8 ++++++--
 osu.Game/Online/API/DummyAPIAccess.cs | 7 ++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/API/APIRequest.cs b/osu.Game/Online/API/APIRequest.cs
index a7174324d8..16d1b3ab17 100644
--- a/osu.Game/Online/API/APIRequest.cs
+++ b/osu.Game/Online/API/APIRequest.cs
@@ -181,9 +181,13 @@ namespace osu.Game.Online.API
         /// <returns>Whether we are in a failed or cancelled state.</returns>
         private bool checkAndScheduleFailure()
         {
-            if (API == null || pendingFailure == null) return cancelled;
+            if (pendingFailure == null) return cancelled;
+
+            if (API == null)
+                pendingFailure();
+            else
+                API.Schedule(pendingFailure);
 
-            API.Schedule(pendingFailure);
             pendingFailure = null;
             return true;
         }
diff --git a/osu.Game/Online/API/DummyAPIAccess.cs b/osu.Game/Online/API/DummyAPIAccess.cs
index 943b52db88..3cb22381c1 100644
--- a/osu.Game/Online/API/DummyAPIAccess.cs
+++ b/osu.Game/Online/API/DummyAPIAccess.cs
@@ -55,7 +55,12 @@ namespace osu.Game.Online.API
 
         public virtual void Queue(APIRequest request)
         {
-            HandleRequest?.Invoke(request);
+            if (HandleRequest != null)
+                HandleRequest.Invoke(request);
+            else
+                // this will fail due to not receiving an APIAccess, and trigger a failure on the request.
+                // this is intended - any request in testing that needs non-failures should use HandleRequest.
+                request.Perform(this);
         }
 
         public void Perform(APIRequest request) => HandleRequest?.Invoke(request);

From ce452565f45bba3106ffe89a21c63d4662e8a40e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 17:50:31 +0900
Subject: [PATCH 1988/3722] Avoid firing any kind of failures after success

---
 osu.Game/Online/API/APIRequest.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/API/APIRequest.cs b/osu.Game/Online/API/APIRequest.cs
index 16d1b3ab17..1a6868cfa4 100644
--- a/osu.Game/Online/API/APIRequest.cs
+++ b/osu.Game/Online/API/APIRequest.cs
@@ -131,8 +131,11 @@ namespace osu.Game.Online.API
         {
         }
 
+        private bool succeeded;
+
         internal virtual void TriggerSuccess()
         {
+            succeeded = true;
             Success?.Invoke();
         }
 
@@ -145,10 +148,7 @@ namespace osu.Game.Online.API
 
         public void Fail(Exception e)
         {
-            if (WebRequest?.Completed == true)
-                return;
-
-            if (cancelled)
+            if (succeeded || cancelled)
                 return;
 
             cancelled = true;

From aeff9bd8531962e7d509623407a819f3c7f69ae8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 18:08:32 +0900
Subject: [PATCH 1989/3722] Add return bool to HandleRequest to better trigger
 failures

---
 .../Online/TestDummyAPIRequestHandling.cs     |  8 ++++++--
 .../TestSceneSeasonalBackgroundLoader.cs      |  4 +++-
 .../Online/TestSceneBeatmapListingOverlay.cs  | 13 ++++++------
 .../Online/TestSceneChangelogOverlay.cs       |  6 ++++--
 .../Visual/Online/TestSceneChatOverlay.cs     | 20 +++++++++++++++++++
 .../Online/TestSceneCommentsContainer.cs      |  3 ++-
 .../Visual/Online/TestSceneNewsOverlay.cs     |  3 ++-
 .../TestScenePlaylistsResultsScreen.cs        | 13 ++++++++++++
 .../TestSceneBeatmapRecommendations.cs        |  4 +++-
 osu.Game/Online/API/DummyAPIAccess.cs         |  9 +++++----
 .../Multiplayer/TestMultiplayerRoomManager.cs | 18 +++++++++--------
 11 files changed, 75 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs b/osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs
index 42948c3731..aa29d76843 100644
--- a/osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs
+++ b/osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs
@@ -23,8 +23,10 @@ namespace osu.Game.Tests.Online
                 {
                     case CommentVoteRequest cRequest:
                         cRequest.TriggerSuccess(new CommentBundle());
-                        break;
+                        return true;
                 }
+
+                return false;
             });
 
             CommentVoteRequest request = null;
@@ -108,8 +110,10 @@ namespace osu.Game.Tests.Online
                 {
                     case LeaveChannelRequest cRequest:
                         cRequest.TriggerSuccess();
-                        break;
+                        return true;
                 }
+
+                return false;
             });
         }
     }
diff --git a/osu.Game.Tests/Visual/Background/TestSceneSeasonalBackgroundLoader.cs b/osu.Game.Tests/Visual/Background/TestSceneSeasonalBackgroundLoader.cs
index e7cf830db0..dc5a4f4a3e 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneSeasonalBackgroundLoader.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneSeasonalBackgroundLoader.cs
@@ -135,13 +135,15 @@ namespace osu.Game.Tests.Visual.Background
                 dummyAPI.HandleRequest = request =>
                 {
                     if (dummyAPI.State.Value != APIState.Online || !(request is GetSeasonalBackgroundsRequest backgroundsRequest))
-                        return;
+                        return false;
 
                     backgroundsRequest.TriggerSuccess(new APISeasonalBackgrounds
                     {
                         Backgrounds = seasonal_background_urls.Select(url => new APISeasonalBackground { Url = url }).ToList(),
                         EndDate = endDate
                     });
+
+                    return true;
                 };
             });
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
index 1349264bf9..156d6b744e 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
@@ -30,13 +30,14 @@ namespace osu.Game.Tests.Visual.Online
 
             ((DummyAPIAccess)API).HandleRequest = req =>
             {
-                if (req is SearchBeatmapSetsRequest searchBeatmapSetsRequest)
+                if (!(req is SearchBeatmapSetsRequest searchBeatmapSetsRequest)) return false;
+
+                searchBeatmapSetsRequest.TriggerSuccess(new SearchBeatmapSetsResponse
                 {
-                    searchBeatmapSetsRequest.TriggerSuccess(new SearchBeatmapSetsResponse
-                    {
-                        BeatmapSets = setsForResponse,
-                    });
-                }
+                    BeatmapSets = setsForResponse,
+                });
+
+                return true;
             };
         }
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
index cd2c4e9346..8818ac75b1 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
@@ -63,13 +63,15 @@ namespace osu.Game.Tests.Visual.Online
                             Builds = builds.Values.ToList()
                         };
                         changelogRequest.TriggerSuccess(changelogResponse);
-                        break;
+                        return true;
 
                     case GetChangelogBuildRequest buildRequest:
                         if (requestedBuild != null)
                             buildRequest.TriggerSuccess(requestedBuild);
-                        break;
+                        return true;
                 }
+
+                return false;
             };
 
             Child = changelog = new TestChangelogOverlay();
diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
index fca642ad6c..b13dd34ebc 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
@@ -11,6 +11,8 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Testing;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
 using osu.Game.Online.Chat;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Chat.Selection;
@@ -64,6 +66,24 @@ namespace osu.Game.Tests.Visual.Online
             });
         }
 
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("register request handling", () =>
+            {
+                ((DummyAPIAccess)API).HandleRequest = req =>
+                {
+                    switch (req)
+                    {
+                        case JoinChannelRequest _:
+                            return true;
+                    }
+
+                    return false;
+                };
+            });
+        }
+
         [Test]
         public void TestHideOverlay()
         {
diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
index c2a18330c9..cd22bb2513 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
@@ -85,9 +85,10 @@ namespace osu.Game.Tests.Visual.Online
                 dummyAPI.HandleRequest = request =>
                 {
                     if (!(request is GetCommentsRequest getCommentsRequest))
-                        return;
+                        return false;
 
                     getCommentsRequest.TriggerSuccess(commentBundle);
+                    return true;
                 };
             });
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
index 37d51c16d2..6ebe8fcc07 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
@@ -33,9 +33,10 @@ namespace osu.Game.Tests.Visual.Online
                 dummyAPI.HandleRequest = request =>
                 {
                     if (!(request is GetNewsRequest getNewsRequest))
-                        return;
+                        return false;
 
                     getNewsRequest.TriggerSuccess(r);
+                    return true;
                 };
             });
 
diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
index be8032cde8..61d49e4018 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
@@ -170,6 +170,17 @@ namespace osu.Game.Tests.Visual.Playlists
 
         private void bindHandler(bool delayed = false, ScoreInfo userScore = null, bool failRequests = false) => ((DummyAPIAccess)API).HandleRequest = request =>
         {
+            // pre-check for requests we should be handling (as they are scheduled below).
+            switch (request)
+            {
+                case ShowPlaylistUserScoreRequest _:
+                case IndexPlaylistScoresRequest _:
+                    break;
+
+                default:
+                    return false;
+            }
+
             requestComplete = false;
 
             double delay = delayed ? 3000 : 0;
@@ -196,6 +207,8 @@ namespace osu.Game.Tests.Visual.Playlists
                         break;
                 }
             }, delay);
+
+            return true;
         };
 
         private void triggerSuccess<T>(APIRequest<T> req, T result)
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
index 53a956c77c..5e2d5eba5d 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs
@@ -32,8 +32,10 @@ namespace osu.Game.Tests.Visual.SongSelect
                     {
                         case GetUserRequest userRequest:
                             userRequest.TriggerSuccess(getUser(userRequest.Ruleset.ID));
-                            break;
+                            return true;
                     }
+
+                    return false;
                 };
             });
 
diff --git a/osu.Game/Online/API/DummyAPIAccess.cs b/osu.Game/Online/API/DummyAPIAccess.cs
index 3cb22381c1..52f2365165 100644
--- a/osu.Game/Online/API/DummyAPIAccess.cs
+++ b/osu.Game/Online/API/DummyAPIAccess.cs
@@ -34,8 +34,9 @@ namespace osu.Game.Online.API
 
         /// <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 Action<APIRequest> HandleRequest;
+        public Func<APIRequest, bool> HandleRequest;
 
         private readonly Bindable<APIState> state = new Bindable<APIState>(APIState.Online);
 
@@ -55,12 +56,12 @@ namespace osu.Game.Online.API
 
         public virtual void Queue(APIRequest request)
         {
-            if (HandleRequest != null)
-                HandleRequest.Invoke(request);
-            else
+            if (HandleRequest?.Invoke(request) != true)
+            {
                 // this will fail due to not receiving an APIAccess, and trigger a failure on the request.
                 // this is intended - any request in testing that needs non-failures should use HandleRequest.
                 request.Perform(this);
+            }
         }
 
         public void Perform(APIRequest request) => HandleRequest?.Invoke(request);
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs
index 7e824c4d7c..315be510a3 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs
@@ -52,15 +52,15 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
                         Rooms.Add(createdRoom);
                         createRoomRequest.TriggerSuccess(createdRoom);
-                        break;
+                        return true;
 
                     case JoinRoomRequest joinRoomRequest:
                         joinRoomRequest.TriggerSuccess();
-                        break;
+                        return true;
 
                     case PartRoomRequest partRoomRequest:
                         partRoomRequest.TriggerSuccess();
-                        break;
+                        return true;
 
                     case GetRoomsRequest getRoomsRequest:
                         var roomsWithoutParticipants = new List<Room>();
@@ -76,11 +76,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
                         }
 
                         getRoomsRequest.TriggerSuccess(roomsWithoutParticipants);
-                        break;
+                        return true;
 
                     case GetRoomRequest getRoomRequest:
                         getRoomRequest.TriggerSuccess(Rooms.Single(r => r.RoomID.Value == getRoomRequest.RoomId));
-                        break;
+                        return true;
 
                     case GetBeatmapSetRequest getBeatmapSetRequest:
                         var onlineReq = new GetBeatmapSetRequest(getBeatmapSetRequest.ID, getBeatmapSetRequest.Type);
@@ -89,11 +89,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
                         // Get the online API from the game's dependencies.
                         game.Dependencies.Get<IAPIProvider>().Queue(onlineReq);
-                        break;
+                        return true;
 
                     case CreateRoomScoreRequest createRoomScoreRequest:
                         createRoomScoreRequest.TriggerSuccess(new APIScoreToken { ID = 1 });
-                        break;
+                        return true;
 
                     case SubmitRoomScoreRequest submitRoomScoreRequest:
                         submitRoomScoreRequest.TriggerSuccess(new MultiplayerScore
@@ -108,8 +108,10 @@ namespace osu.Game.Tests.Visual.Multiplayer
                             User = api.LocalUser.Value,
                             Statistics = new Dictionary<HitResult, int>()
                         });
-                        break;
+                        return true;
                 }
+
+                return false;
             };
         }
 

From 5267fb74c441c1c7f6ba48637f6981876ae5227e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 14:44:06 +0900
Subject: [PATCH 1990/3722] Add submission requests

---
 .../Online/Solo/CreateSoloScoreRequest.cs     | 32 +++++++++++++
 .../Online/Solo/SubmitSoloScoreRequest.cs     | 45 +++++++++++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 osu.Game/Online/Solo/CreateSoloScoreRequest.cs
 create mode 100644 osu.Game/Online/Solo/SubmitSoloScoreRequest.cs

diff --git a/osu.Game/Online/Solo/CreateSoloScoreRequest.cs b/osu.Game/Online/Solo/CreateSoloScoreRequest.cs
new file mode 100644
index 0000000000..ae5ac5e26c
--- /dev/null
+++ b/osu.Game/Online/Solo/CreateSoloScoreRequest.cs
@@ -0,0 +1,32 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Net.Http;
+using osu.Framework.IO.Network;
+using osu.Game.Online.API;
+using osu.Game.Online.Rooms;
+
+namespace osu.Game.Online.Solo
+{
+    public class CreateSoloScoreRequest : APIRequest<APIScoreToken>
+    {
+        private readonly int beatmapId;
+        private readonly string versionHash;
+
+        public CreateSoloScoreRequest(int beatmapId, string versionHash)
+        {
+            this.beatmapId = beatmapId;
+            this.versionHash = versionHash;
+        }
+
+        protected override WebRequest CreateWebRequest()
+        {
+            var req = base.CreateWebRequest();
+            req.Method = HttpMethod.Post;
+            req.AddParameter("version_hash", versionHash);
+            return req;
+        }
+
+        protected override string Target => $@"solo/{beatmapId}/scores";
+    }
+}
diff --git a/osu.Game/Online/Solo/SubmitSoloScoreRequest.cs b/osu.Game/Online/Solo/SubmitSoloScoreRequest.cs
new file mode 100644
index 0000000000..98ba4fa052
--- /dev/null
+++ b/osu.Game/Online/Solo/SubmitSoloScoreRequest.cs
@@ -0,0 +1,45 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Net.Http;
+using Newtonsoft.Json;
+using osu.Framework.IO.Network;
+using osu.Game.Online.API;
+using osu.Game.Online.Rooms;
+using osu.Game.Scoring;
+
+namespace osu.Game.Online.Solo
+{
+    public class SubmitSoloScoreRequest : APIRequest<MultiplayerScore>
+    {
+        private readonly long scoreId;
+
+        private readonly int beatmapId;
+
+        private readonly ScoreInfo scoreInfo;
+
+        public SubmitSoloScoreRequest(int beatmapId, long scoreId, ScoreInfo scoreInfo)
+        {
+            this.beatmapId = beatmapId;
+            this.scoreId = scoreId;
+            this.scoreInfo = scoreInfo;
+        }
+
+        protected override WebRequest CreateWebRequest()
+        {
+            var req = base.CreateWebRequest();
+
+            req.ContentType = "application/json";
+            req.Method = HttpMethod.Put;
+
+            req.AddRaw(JsonConvert.SerializeObject(scoreInfo, new JsonSerializerSettings
+            {
+                ReferenceLoopHandling = ReferenceLoopHandling.Ignore
+            }));
+
+            return req;
+        }
+
+        protected override string Target => $@"solo/{beatmapId}/scores/{scoreId}";
+    }
+}

From 6cb14e91c91043e1e3ddf0d2c999b9665def1d65 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 14:47:15 +0900
Subject: [PATCH 1991/3722] Make Player abstract and introduce SoloPlayer

---
 .../Visual/Navigation/TestScenePerformFromScreen.cs      | 4 ++--
 osu.Game/Screens/Play/Player.cs                          | 4 ++--
 osu.Game/Screens/Play/SoloPlayer.cs                      | 9 +++++++++
 osu.Game/Screens/Select/PlaySongSelect.cs                | 2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game/Screens/Play/SoloPlayer.cs

diff --git a/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs b/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs
index 21d3bdaae3..2791952b66 100644
--- a/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Tests.Visual.Navigation
         public void TestPerformAtSongSelectFromPlayerLoader()
         {
             PushAndConfirm(() => new PlaySongSelect());
-            PushAndConfirm(() => new PlayerLoader(() => new Player()));
+            PushAndConfirm(() => new PlayerLoader(() => new SoloPlayer()));
 
             AddStep("try to perform", () => Game.PerformFromScreen(_ => actionPerformed = true, new[] { typeof(PlaySongSelect) }));
             AddUntilStep("returned to song select", () => Game.ScreenStack.CurrentScreen is PlaySongSelect);
@@ -69,7 +69,7 @@ namespace osu.Game.Tests.Visual.Navigation
         public void TestPerformAtMenuFromPlayerLoader()
         {
             PushAndConfirm(() => new PlaySongSelect());
-            PushAndConfirm(() => new PlayerLoader(() => new Player()));
+            PushAndConfirm(() => new PlayerLoader(() => new SoloPlayer()));
 
             AddStep("try to perform", () => Game.PerformFromScreen(_ => actionPerformed = true));
             AddUntilStep("returned to song select", () => Game.ScreenStack.CurrentScreen is MainMenu);
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 0e221351aa..4cf0274614 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Screens.Play
 {
     [Cached]
     [Cached(typeof(ISamplePlaybackDisabler))]
-    public class Player : ScreenWithBeatmapBackground, ISamplePlaybackDisabler
+    public abstract class Player : ScreenWithBeatmapBackground, ISamplePlaybackDisabler
     {
         /// <summary>
         /// The delay upon completion of the beatmap before displaying the results screen.
@@ -135,7 +135,7 @@ namespace osu.Game.Screens.Play
         /// <summary>
         /// Create a new player instance.
         /// </summary>
-        public Player(PlayerConfiguration configuration = null)
+        protected Player(PlayerConfiguration configuration = null)
         {
             Configuration = configuration ?? new PlayerConfiguration();
         }
diff --git a/osu.Game/Screens/Play/SoloPlayer.cs b/osu.Game/Screens/Play/SoloPlayer.cs
new file mode 100644
index 0000000000..79860f3eda
--- /dev/null
+++ b/osu.Game/Screens/Play/SoloPlayer.cs
@@ -0,0 +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.
+
+namespace osu.Game.Screens.Play
+{
+    public class SoloPlayer : Player
+    {
+    }
+}
diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index e61d5cce85..dfb4b59060 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -106,7 +106,7 @@ namespace osu.Game.Screens.Select
 
             SampleConfirm?.Play();
 
-            this.Push(player = new PlayerLoader(() => new Player()));
+            this.Push(player = new PlayerLoader(() => new SoloPlayer()));
 
             return true;
         }

From 7045fce55542b0f56a5907f0a87532bfef0728f3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 15:00:02 +0900
Subject: [PATCH 1992/3722] Move score submission logic in general out to its
 own Player type

---
 .../Multiplayer/MultiplayerPlayer.cs          |   1 -
 .../OnlinePlay/Playlists/PlaylistsPlayer.cs   |  74 ++-----------
 osu.Game/Screens/Play/SubmittingPlayer.cs     | 100 ++++++++++++++++++
 3 files changed, 106 insertions(+), 69 deletions(-)
 create mode 100644 osu.Game/Screens/Play/SubmittingPlayer.cs

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index b3cd44d55a..ef34d40497 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -19,7 +19,6 @@ using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
-    // Todo: The "room" part of PlaylistsPlayer should be split out into an abstract player class to be inherited instead.
     public class MultiplayerPlayer : PlaylistsPlayer
     {
         protected override bool PauseOnFocusLost => false;
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
index 2b6dbd9dcb..a6aff5e43f 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
@@ -4,11 +4,8 @@
 using System;
 using System.Diagnostics;
 using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
@@ -19,23 +16,12 @@ using osu.Game.Screens.Ranking;
 
 namespace osu.Game.Screens.OnlinePlay.Playlists
 {
-    public class PlaylistsPlayer : Player
+    public class PlaylistsPlayer : RoomSubmittingPlayer
     {
         public Action Exited;
 
-        [Resolved(typeof(Room), nameof(Room.RoomID))]
-        protected Bindable<long?> RoomId { get; private set; }
-
         protected readonly PlaylistItem PlaylistItem;
 
-        protected long? Token { get; private set; }
-
-        [Resolved]
-        private IAPIProvider api { get; set; }
-
-        [Resolved]
-        private IBindable<RulesetInfo> ruleset { get; set; }
-
         public PlaylistsPlayer(PlaylistItem playlistItem, PlayerConfiguration configuration = null)
             : base(configuration)
         {
@@ -43,12 +29,8 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(IBindable<RulesetInfo> ruleset)
         {
-            Token = null;
-
-            bool failed = false;
-
             // Sanity checks to ensure that PlaylistsPlayer matches the settings for the current PlaylistItem
             if (Beatmap.Value.BeatmapInfo.OnlineBeatmapID != PlaylistItem.Beatmap.Value.OnlineBeatmapID)
                 throw new InvalidOperationException("Current Beatmap does not match PlaylistItem's Beatmap");
@@ -58,31 +40,12 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
 
             if (!PlaylistItem.RequiredMods.All(m => Mods.Value.Any(m.Equals)))
                 throw new InvalidOperationException("Current Mods do not match PlaylistItem's RequiredMods");
-
-            var req = new CreateRoomScoreRequest(RoomId.Value ?? 0, PlaylistItem.ID, Game.VersionHash);
-            req.Success += r => Token = r.ID;
-            req.Failure += e =>
-            {
-                failed = true;
-
-                if (string.IsNullOrEmpty(e.Message))
-                    Logger.Error(e, "Failed to retrieve a score submission token.");
-                else
-                    Logger.Log($"You are not able to submit a score: {e.Message}", level: LogLevel.Important);
-
-                Schedule(() =>
-                {
-                    ValidForResume = false;
-                    this.Exit();
-                });
-            };
-
-            api.Queue(req);
-
-            while (!failed && !Token.HasValue)
-                Thread.Sleep(1000);
         }
 
+        protected override APIRequest<APIScoreToken> CreateTokenRequestRequest() => new CreateRoomScoreRequest(RoomId.Value ?? 0, PlaylistItem.ID, Game.VersionHash);
+
+        public override APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, int token) => new SubmitRoomScoreRequest(token, RoomId.Value ?? 0, PlaylistItem.ID, score.ScoreInfo);
+
         public override bool OnExiting(IScreen next)
         {
             if (base.OnExiting(next))
@@ -106,31 +69,6 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
             return score;
         }
 
-        protected override async Task SubmitScore(Score score)
-        {
-            await base.SubmitScore(score).ConfigureAwait(false);
-
-            Debug.Assert(Token != null);
-
-            var tcs = new TaskCompletionSource<bool>();
-            var request = new SubmitRoomScoreRequest(Token.Value, RoomId.Value ?? 0, PlaylistItem.ID, score.ScoreInfo);
-
-            request.Success += s =>
-            {
-                score.ScoreInfo.OnlineScoreID = s.ID;
-                tcs.SetResult(true);
-            };
-
-            request.Failure += e =>
-            {
-                Logger.Error(e, "Failed to submit score");
-                tcs.SetResult(false);
-            };
-
-            api.Queue(request);
-            await tcs.Task.ConfigureAwait(false);
-        }
-
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
new file mode 100644
index 0000000000..250e308b3c
--- /dev/null
+++ b/osu.Game/Screens/Play/SubmittingPlayer.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.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Logging;
+using osu.Framework.Screens;
+using osu.Game.Online.API;
+using osu.Game.Online.Rooms;
+using osu.Game.Scoring;
+
+namespace osu.Game.Screens.Play
+{
+    public abstract class RoomSubmittingPlayer : SubmittingPlayer
+    {
+        [Resolved(typeof(Room), nameof(Room.RoomID))]
+        protected Bindable<long?> RoomId { get; private set; }
+
+        protected RoomSubmittingPlayer(PlayerConfiguration configuration)
+            : base(configuration)
+        {
+        }
+    }
+
+    public abstract class SubmittingPlayer : Player
+    {
+        protected long? Token { get; private set; }
+
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        protected SubmittingPlayer(PlayerConfiguration configuration)
+            : base(configuration)
+        {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Token = null;
+
+            bool failed = false;
+
+            var req = CreateTokenRequestRequest();
+            req.Success += r => Token = r.ID;
+            req.Failure += e =>
+            {
+                failed = true;
+
+                if (string.IsNullOrEmpty(e.Message))
+                    Logger.Error(e, "Failed to retrieve a score submission token.");
+                else
+                    Logger.Log($"You are not able to submit a score: {e.Message}", level: LogLevel.Important);
+
+                Schedule(() =>
+                {
+                    ValidForResume = false;
+                    this.Exit();
+                });
+            };
+
+            api.Queue(req);
+
+            while (!failed && !Token.HasValue)
+                Thread.Sleep(1000);
+        }
+
+        protected override async Task SubmitScore(Score score)
+        {
+            await base.SubmitScore(score).ConfigureAwait(false);
+
+            Debug.Assert(Token != null);
+
+            var tcs = new TaskCompletionSource<bool>();
+            var request = CreateSubmissionRequest(score, Token.Value);
+
+            request.Success += s =>
+            {
+                score.ScoreInfo.OnlineScoreID = s.ID;
+                tcs.SetResult(true);
+            };
+
+            request.Failure += e =>
+            {
+                Logger.Error(e, "Failed to submit score");
+                tcs.SetResult(false);
+            };
+
+            api.Queue(request);
+            await tcs.Task.ConfigureAwait(false);
+        }
+
+        protected abstract APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, long token);
+
+        protected abstract APIRequest<APIScoreToken> CreateTokenRequestRequest();
+    }
+}

From 12f050264aa31af09089a32d23472defe67a0ec5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 15:33:31 +0900
Subject: [PATCH 1993/3722] Further split out a player class which submits to
 "rooms"

---
 .../Multiplayer/MultiplayerPlayer.cs          |  3 +-
 .../OnlinePlay/Playlists/PlaylistsPlayer.cs   | 10 +-----
 osu.Game/Screens/Play/RoomSubmittingPlayer.cs | 32 +++++++++++++++++++
 osu.Game/Screens/Play/SubmittingPlayer.cs     | 15 ++-------
 4 files changed, 37 insertions(+), 23 deletions(-)
 create mode 100644 osu.Game/Screens/Play/RoomSubmittingPlayer.cs

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index ef34d40497..2ba04b75d6 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -11,7 +11,6 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Scoring;
-using osu.Game.Screens.OnlinePlay.Playlists;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Ranking;
@@ -19,7 +18,7 @@ using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
-    public class MultiplayerPlayer : PlaylistsPlayer
+    public class MultiplayerPlayer : RoomSubmittingPlayer
     {
         protected override bool PauseOnFocusLost => false;
 
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
index a6aff5e43f..260d4961ff 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
@@ -7,7 +7,6 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Screens;
-using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osu.Game.Scoring;
@@ -20,12 +19,9 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
     {
         public Action Exited;
 
-        protected readonly PlaylistItem PlaylistItem;
-
         public PlaylistsPlayer(PlaylistItem playlistItem, PlayerConfiguration configuration = null)
-            : base(configuration)
+            : base(playlistItem, configuration)
         {
-            PlaylistItem = playlistItem;
         }
 
         [BackgroundDependencyLoader]
@@ -42,10 +38,6 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                 throw new InvalidOperationException("Current Mods do not match PlaylistItem's RequiredMods");
         }
 
-        protected override APIRequest<APIScoreToken> CreateTokenRequestRequest() => new CreateRoomScoreRequest(RoomId.Value ?? 0, PlaylistItem.ID, Game.VersionHash);
-
-        public override APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, int token) => new SubmitRoomScoreRequest(token, RoomId.Value ?? 0, PlaylistItem.ID, score.ScoreInfo);
-
         public override bool OnExiting(IScreen next)
         {
             if (base.OnExiting(next))
diff --git a/osu.Game/Screens/Play/RoomSubmittingPlayer.cs b/osu.Game/Screens/Play/RoomSubmittingPlayer.cs
new file mode 100644
index 0000000000..c695e99874
--- /dev/null
+++ b/osu.Game/Screens/Play/RoomSubmittingPlayer.cs
@@ -0,0 +1,32 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Game.Online.API;
+using osu.Game.Online.Rooms;
+using osu.Game.Scoring;
+
+namespace osu.Game.Screens.Play
+{
+    /// <summary>
+    /// A player instance which submits to a room backing. This is generally used by playlists and multiplayer.
+    /// </summary>
+    public abstract class RoomSubmittingPlayer : SubmittingPlayer
+    {
+        [Resolved(typeof(Room), nameof(Room.RoomID))]
+        protected Bindable<long?> RoomId { get; private set; }
+
+        protected readonly PlaylistItem PlaylistItem;
+
+        protected RoomSubmittingPlayer(PlaylistItem playlistItem, PlayerConfiguration configuration = null)
+            : base(configuration)
+        {
+            PlaylistItem = playlistItem;
+        }
+
+        protected override APIRequest<APIScoreToken> CreateTokenRequestRequest() => new CreateRoomScoreRequest(RoomId.Value ?? 0, PlaylistItem.ID, Game.VersionHash);
+
+        public override APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, int token) => new SubmitRoomScoreRequest(token, RoomId.Value ?? 0, PlaylistItem.ID, score.ScoreInfo);
+    }
+}
diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index 250e308b3c..5577683f05 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -5,7 +5,6 @@ using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Online.API;
@@ -14,17 +13,9 @@ using osu.Game.Scoring;
 
 namespace osu.Game.Screens.Play
 {
-    public abstract class RoomSubmittingPlayer : SubmittingPlayer
-    {
-        [Resolved(typeof(Room), nameof(Room.RoomID))]
-        protected Bindable<long?> RoomId { get; private set; }
-
-        protected RoomSubmittingPlayer(PlayerConfiguration configuration)
-            : base(configuration)
-        {
-        }
-    }
-
+    /// <summary>
+    /// A player instance which supports submitting scores to an online store.
+    /// </summary>
     public abstract class SubmittingPlayer : Player
     {
         protected long? Token { get; private set; }

From 194b2d05d3749b6b60796c699490df6320c62d59 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 15:35:06 +0900
Subject: [PATCH 1994/3722] Update SoloPlayer to derive SubmittingPlayer

---
 osu.Game/Screens/Play/SoloPlayer.cs       | 15 ++++++++++++++-
 osu.Game/Screens/Play/SubmittingPlayer.cs |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/SoloPlayer.cs b/osu.Game/Screens/Play/SoloPlayer.cs
index 79860f3eda..f2f97c5d0d 100644
--- a/osu.Game/Screens/Play/SoloPlayer.cs
+++ b/osu.Game/Screens/Play/SoloPlayer.cs
@@ -1,9 +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 osu.Game.Online.API;
+using osu.Game.Online.Rooms;
+using osu.Game.Scoring;
+
 namespace osu.Game.Screens.Play
 {
-    public class SoloPlayer : Player
+    public class SoloPlayer : SubmittingPlayer
     {
+        public override APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, int token)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        protected override APIRequest<APIScoreToken> CreateTokenRequestRequest()
+        {
+            throw new System.NotImplementedException();
+        }
     }
 }
diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index 5577683f05..e7847a9902 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.Play
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        protected SubmittingPlayer(PlayerConfiguration configuration)
+        protected SubmittingPlayer(PlayerConfiguration configuration = null)
             : base(configuration)
         {
         }

From 571124669daf940ef35bc5a6a81cd8b64fa02bc7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 15:45:22 +0900
Subject: [PATCH 1995/3722] Remove all references to "score submission" from
 Player

---
 .../Multiplayer/MultiplayerPlayer.cs          |  4 ++--
 osu.Game/Screens/Play/Player.cs               | 20 +++++++++----------
 osu.Game/Screens/Play/SubmittingPlayer.cs     |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index 2ba04b75d6..3797adf360 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -133,9 +133,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private void onResultsReady() => resultsReady.SetResult(true);
 
-        protected override async Task SubmitScore(Score score)
+        protected override async Task PrepareScoreForResultsAsync(Score score)
         {
-            await base.SubmitScore(score).ConfigureAwait(false);
+            await base.PrepareScoreForResultsAsync(score).ConfigureAwait(false);
 
             await client.ChangeState(MultiplayerUserState.FinishedPlay).ConfigureAwait(false);
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 4cf0274614..efe5d26409 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -559,7 +559,7 @@ namespace osu.Game.Screens.Play
         }
 
         private ScheduledDelegate completionProgressDelegate;
-        private Task<ScoreInfo> scoreSubmissionTask;
+        private Task<ScoreInfo> prepareScoreForDisplayTask;
 
         private void updateCompletionState(ValueChangedEvent<bool> completionState)
         {
@@ -586,17 +586,17 @@ namespace osu.Game.Screens.Play
 
             if (!Configuration.ShowResults) return;
 
-            scoreSubmissionTask ??= Task.Run(async () =>
+            prepareScoreForDisplayTask ??= Task.Run(async () =>
             {
                 var score = CreateScore();
 
                 try
                 {
-                    await SubmitScore(score).ConfigureAwait(false);
+                    await PrepareScoreForResultsAsync(score).ConfigureAwait(false);
                 }
                 catch (Exception ex)
                 {
-                    Logger.Error(ex, "Score submission failed!");
+                    Logger.Error(ex, "Score preparation failed!");
                 }
 
                 try
@@ -617,7 +617,7 @@ namespace osu.Game.Screens.Play
 
         private void scheduleCompletion() => completionProgressDelegate = Schedule(() =>
         {
-            if (!scoreSubmissionTask.IsCompleted)
+            if (!prepareScoreForDisplayTask.IsCompleted)
             {
                 scheduleCompletion();
                 return;
@@ -625,7 +625,7 @@ namespace osu.Game.Screens.Play
 
             // screen may be in the exiting transition phase.
             if (this.IsCurrentScreen())
-                this.Push(CreateResults(scoreSubmissionTask.Result));
+                this.Push(CreateResults(prepareScoreForDisplayTask.Result));
         });
 
         protected override bool OnScroll(ScrollEvent e) => mouseWheelDisabled.Value && !GameplayClockContainer.IsPaused.Value;
@@ -895,11 +895,11 @@ namespace osu.Game.Screens.Play
         }
 
         /// <summary>
-        /// Submits the player's <see cref="Score"/>.
+        /// Prepare the <see cref="Score"/> for display at results.
         /// </summary>
-        /// <param name="score">The <see cref="Score"/> to submit.</param>
-        /// <returns>The submitted score.</returns>
-        protected virtual Task SubmitScore(Score score) => Task.CompletedTask;
+        /// <param name="score">The <see cref="Score"/> to prepare.</param>
+        /// <returns>A task that prepares the provided score. On completion, the score is assumed to be ready for display.</returns>
+        protected virtual Task PrepareScoreForResultsAsync(Score score) => Task.CompletedTask;
 
         /// <summary>
         /// Creates the <see cref="ResultsScreen"/> for a <see cref="ScoreInfo"/>.
diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index e7847a9902..d876cad941 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -59,9 +59,9 @@ namespace osu.Game.Screens.Play
                 Thread.Sleep(1000);
         }
 
-        protected override async Task SubmitScore(Score score)
+        protected override async Task PrepareScoreForResultsAsync(Score score)
         {
-            await base.SubmitScore(score).ConfigureAwait(false);
+            await base.PrepareScoreForResultsAsync(score).ConfigureAwait(false);
 
             Debug.Assert(Token != null);
 

From 3cd8bf2d7f30d2be87d7e67acdcae1a4cfef69f6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 16:05:40 +0900
Subject: [PATCH 1996/3722] Move token request construction to
 LoadAsyncComplete to better allow DI usage

---
 .../Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs     | 5 +++++
 osu.Game/Screens/Play/SubmittingPlayer.cs                   | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index 3797adf360..a5adcdb8ad 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -61,6 +61,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             LoadComponentAsync(leaderboard = new MultiplayerGameplayLeaderboard(ScoreProcessor, userIds), HUDOverlay.Add);
 
             HUDOverlay.Add(loadingDisplay = new LoadingLayer(true) { Depth = float.MaxValue });
+        }
+
+        protected override void LoadAsyncComplete()
+        {
+            base.LoadAsyncComplete();
 
             if (Token == null)
                 return; // Todo: Somehow handle token retrieval failure.
diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index d876cad941..356f70f4bf 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -28,11 +28,11 @@ namespace osu.Game.Screens.Play
         {
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
+        protected override void LoadAsyncComplete()
         {
-            Token = null;
+            base.LoadAsyncComplete();
 
+            // Token request construction should happen post-load to allow derived classes to potentially prepare DI backings that are used to create the request.
             bool failed = false;
 
             var req = CreateTokenRequestRequest();

From 242b847516cdf53f4f2c54fdd7097b9ec862f9a5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 16:41:36 +0900
Subject: [PATCH 1997/3722] Add flow for allowing gameplay to continue even
 when an error occurs with token retrieval

---
 osu.Game/Screens/Play/RoomSubmittingPlayer.cs |  2 +-
 osu.Game/Screens/Play/SubmittingPlayer.cs     | 71 +++++++++++++------
 2 files changed, 51 insertions(+), 22 deletions(-)

diff --git a/osu.Game/Screens/Play/RoomSubmittingPlayer.cs b/osu.Game/Screens/Play/RoomSubmittingPlayer.cs
index c695e99874..6ef39e4b75 100644
--- a/osu.Game/Screens/Play/RoomSubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/RoomSubmittingPlayer.cs
@@ -27,6 +27,6 @@ namespace osu.Game.Screens.Play
 
         protected override APIRequest<APIScoreToken> CreateTokenRequestRequest() => new CreateRoomScoreRequest(RoomId.Value ?? 0, PlaylistItem.ID, Game.VersionHash);
 
-        public override APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, int token) => new SubmitRoomScoreRequest(token, RoomId.Value ?? 0, PlaylistItem.ID, score.ScoreInfo);
+        protected override APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, long token) => new SubmitRoomScoreRequest(token, RoomId.Value ?? 0, PlaylistItem.ID, score.ScoreInfo);
     }
 }
diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index 356f70f4bf..55f4ba4b9b 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -1,8 +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.Diagnostics;
-using System.Threading;
+using System;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Logging;
@@ -30,40 +29,70 @@ namespace osu.Game.Screens.Play
 
         protected override void LoadAsyncComplete()
         {
-            base.LoadAsyncComplete();
-
             // Token request construction should happen post-load to allow derived classes to potentially prepare DI backings that are used to create the request.
-            bool failed = false;
+            var tcs = new TaskCompletionSource<bool>();
+
+            if (!api.IsLoggedIn)
+            {
+                fail(new InvalidOperationException("API is not online."));
+                return;
+            }
 
             var req = CreateTokenRequestRequest();
-            req.Success += r => Token = r.ID;
-            req.Failure += e =>
+
+            if (req == null)
             {
-                failed = true;
+                fail(new InvalidOperationException("Request could not be constructed."));
+                return;
+            }
 
-                if (string.IsNullOrEmpty(e.Message))
-                    Logger.Error(e, "Failed to retrieve a score submission token.");
-                else
-                    Logger.Log($"You are not able to submit a score: {e.Message}", level: LogLevel.Important);
-
-                Schedule(() =>
-                {
-                    ValidForResume = false;
-                    this.Exit();
-                });
+            req.Success += r =>
+            {
+                Token = r.ID;
+                tcs.SetResult(true);
             };
+            req.Failure += fail;
 
             api.Queue(req);
 
-            while (!failed && !Token.HasValue)
-                Thread.Sleep(1000);
+            tcs.Task.Wait();
+
+            void fail(Exception exception)
+            {
+                if (HandleTokenRetrievalFailure(exception))
+                {
+                    if (string.IsNullOrEmpty(exception.Message))
+                        Logger.Error(exception, "Failed to retrieve a score submission token.");
+                    else
+                        Logger.Log($"You are not able to submit a score: {exception.Message}", level: LogLevel.Important);
+
+                    Schedule(() =>
+                    {
+                        ValidForResume = false;
+                        this.Exit();
+                    });
+                }
+
+                tcs.SetResult(false);
+            }
+
+            base.LoadAsyncComplete();
         }
 
+        /// <summary>
+        /// Called when a token could not be retrieved for submission.
+        /// </summary>
+        /// <param name="exception">The error causing the failure.</param>
+        /// <returns>Whether gameplay should be immediately exited as a result. Returning false allows the gameplay session to continue. Defaults to true.</returns>
+        protected virtual bool HandleTokenRetrievalFailure(Exception exception) => true;
+
         protected override async Task PrepareScoreForResultsAsync(Score score)
         {
             await base.PrepareScoreForResultsAsync(score).ConfigureAwait(false);
 
-            Debug.Assert(Token != null);
+            // token may be null if the request failed but gameplay was still allowed (see HandleTokenRetrievalFailure).
+            if (Token == null)
+                return;
 
             var tcs = new TaskCompletionSource<bool>();
             var request = CreateSubmissionRequest(score, Token.Value);

From e649a330a405d7d58490e50ea8c7f3b17cb3e27c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 16:41:52 +0900
Subject: [PATCH 1998/3722] Implement SoloPlayer's request construction

---
 osu.Game/Screens/Play/SoloPlayer.cs | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/SoloPlayer.cs b/osu.Game/Screens/Play/SoloPlayer.cs
index f2f97c5d0d..3dc9df146e 100644
--- a/osu.Game/Screens/Play/SoloPlayer.cs
+++ b/osu.Game/Screens/Play/SoloPlayer.cs
@@ -1,22 +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;
+using System.Diagnostics;
 using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
+using osu.Game.Online.Solo;
 using osu.Game.Scoring;
 
 namespace osu.Game.Screens.Play
 {
     public class SoloPlayer : SubmittingPlayer
     {
-        public override APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, int token)
+        protected override APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, long token)
         {
-            throw new System.NotImplementedException();
+            Debug.Assert(Beatmap.Value.BeatmapInfo.OnlineBeatmapID != null);
+
+            int beatmapId = Beatmap.Value.BeatmapInfo.OnlineBeatmapID.Value;
+
+            return new SubmitSoloScoreRequest(beatmapId, token, score.ScoreInfo);
         }
 
         protected override APIRequest<APIScoreToken> CreateTokenRequestRequest()
         {
-            throw new System.NotImplementedException();
+            if (!(Beatmap.Value.BeatmapInfo.OnlineBeatmapID is int beatmapId))
+                return null;
+
+            return new CreateSoloScoreRequest(beatmapId, Game.VersionHash);
         }
+
+        protected override bool HandleTokenRetrievalFailure(Exception exception) => false;
     }
 }

From 64e85ba995a20dcf1cd3eb6f95fc65ae1a47a0cb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 19:19:07 +0900
Subject: [PATCH 1999/3722] Always fade out approach circles at a HitObject's
 start time to better match stable

---
 .../Objects/Drawables/DrawableHitCircle.cs    | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index 77094f928b..189003875d 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -164,28 +164,29 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             ApproachCircle.Expire(true);
         }
 
+        protected override void UpdateStartTimeStateTransforms()
+        {
+            base.UpdateStartTimeStateTransforms();
+
+            ApproachCircle.FadeOut(50);
+        }
+
         protected override void UpdateHitStateTransforms(ArmedState state)
         {
             Debug.Assert(HitObject.HitWindows != null);
 
+            // todo: temporary / arbitrary, used for lifetime optimisation.
+            this.Delay(800).FadeOut();
+
             switch (state)
             {
                 case ArmedState.Idle:
-                    this.Delay(HitObject.TimePreempt).FadeOut(500);
                     HitArea.HitAction = null;
                     break;
 
                 case ArmedState.Miss:
-                    ApproachCircle.FadeOut(50);
                     this.FadeOut(100);
                     break;
-
-                case ArmedState.Hit:
-                    ApproachCircle.FadeOut(50);
-
-                    // todo: temporary / arbitrary
-                    this.Delay(800).FadeOut();
-                    break;
             }
 
             Expire();

From d10ff615feeadb9ece5d1f67863ddb9d26152bdc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 23 Mar 2021 19:22:37 +0900
Subject: [PATCH 2000/3722] Fix default skin's glow resetting fade on miss

---
 osu.Game.Rulesets.Osu/Skinning/Default/MainCirclePiece.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/MainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/MainCirclePiece.cs
index fcbe4c1b28..46aeadc59b 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/MainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/MainCirclePiece.cs
@@ -74,10 +74,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
         private void updateState(DrawableHitObject drawableObject, ArmedState state)
         {
-            using (BeginAbsoluteSequence(drawableObject.HitStateUpdateTime, true))
-            {
+            using (BeginAbsoluteSequence(drawableObject.StateUpdateTime))
                 glow.FadeOut(400);
 
+            using (BeginAbsoluteSequence(drawableObject.HitStateUpdateTime))
+            {
                 switch (state)
                 {
                     case ArmedState.Hit:

From d17c431faf92affd103a85b46f0a79fdf633040e Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Tue, 23 Mar 2021 23:22:17 +0100
Subject: [PATCH 2001/3722] Disable relative mode for TournamentGame

---
 osu.Game.Tournament/TournamentGame.cs | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tournament/TournamentGame.cs b/osu.Game.Tournament/TournamentGame.cs
index fadb821bef..bf43b198c4 100644
--- a/osu.Game.Tournament/TournamentGame.cs
+++ b/osu.Game.Tournament/TournamentGame.cs
@@ -2,18 +2,21 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Drawing;
-using osu.Framework.Extensions.Color4Extensions;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 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.Graphics.Shapes;
-using osu.Framework.Graphics.Colour;
-using osu.Game.Graphics.Cursor;
-using osu.Game.Tournament.Models;
+using osu.Framework.Input.Handlers.Mouse;
+using osu.Framework.Platform;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Cursor;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Tournament.Models;
 using osuTK;
 using osuTK.Graphics;
 
@@ -36,7 +39,7 @@ namespace osu.Game.Tournament
         private LoadingSpinner loadingSpinner;
 
         [BackgroundDependencyLoader]
-        private void load(FrameworkConfigManager frameworkConfig)
+        private void load(FrameworkConfigManager frameworkConfig, GameHost host)
         {
             windowSize = frameworkConfig.GetBindable<Size>(FrameworkSetting.WindowedSize);
             windowMode = frameworkConfig.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
@@ -48,6 +51,9 @@ namespace osu.Game.Tournament
                 Margin = new MarginPadding(40),
             });
 
+            var m = (MouseHandler)host.AvailableInputHandlers.Single(t => t is MouseHandler);
+            m.UseRelativeMode.Value = false;
+
             loadingSpinner.Show();
 
             BracketLoadTask.ContinueWith(_ => LoadComponentsAsync(new[]

From fbb992fc7e432900ce9090d98446e6e3e18588ae Mon Sep 17 00:00:00 2001
From: Owen Young <owen.young8699@gmail.com>
Date: Tue, 23 Mar 2021 19:18:32 -0500
Subject: [PATCH 2002/3722] Added a comment to new method

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index a52899433a..e8284c0bad 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -1008,6 +1008,7 @@ namespace osu.Game
                 Exit();
         }
         protected override IDictionary<FrameworkSetting, object> GetFrameworkConfigDefaults() {
+            // Overriding settings determined by Framework
             IDictionary<FrameworkSetting, object> defaultOverrides = new Dictionary<FrameworkSetting, object>();
             defaultOverrides.Add(FrameworkSetting.WindowMode, WindowMode.Fullscreen);
             return defaultOverrides;

From 67a03ebc2371c2bb6c14b721fd03f2627cb58b92 Mon Sep 17 00:00:00 2001
From: Owen Young <owen.young8699@gmail.com>
Date: Tue, 23 Mar 2021 19:31:16 -0500
Subject: [PATCH 2003/3722] Fixed formatting issues to be in line with osu
 coding standards

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index e8284c0bad..ca8fa9f1f6 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -1007,7 +1007,9 @@ namespace osu.Game
             if (newScreen == null)
                 Exit();
         }
-        protected override IDictionary<FrameworkSetting, object> GetFrameworkConfigDefaults() {
+
+        protected override IDictionary<FrameworkSetting, object> GetFrameworkConfigDefaults()
+        {
             // Overriding settings determined by Framework
             IDictionary<FrameworkSetting, object> defaultOverrides = new Dictionary<FrameworkSetting, object>();
             defaultOverrides.Add(FrameworkSetting.WindowMode, WindowMode.Fullscreen);

From 437dadc85f0927936004abc72bc5331289d7e333 Mon Sep 17 00:00:00 2001
From: Owen Young <owen.young8699@gmail.com>
Date: Tue, 23 Mar 2021 19:37:55 -0500
Subject: [PATCH 2004/3722] Changed comment on GetFrameworkConfigDefaults() to
 be more accurate

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index ca8fa9f1f6..f211723c59 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -1010,7 +1010,7 @@ namespace osu.Game
 
         protected override IDictionary<FrameworkSetting, object> GetFrameworkConfigDefaults()
         {
-            // Overriding settings determined by Framework
+            // Overriding config defaults determined by Framework
             IDictionary<FrameworkSetting, object> defaultOverrides = new Dictionary<FrameworkSetting, object>();
             defaultOverrides.Add(FrameworkSetting.WindowMode, WindowMode.Fullscreen);
             return defaultOverrides;

From 5ee280f941b5738adf98211646b8f12cc3719702 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 24 Mar 2021 02:56:32 +0100
Subject: [PATCH 2005/3722] Update PointsInSegment when adding/removing points

There was a bug where if you created a slider, moved the last point, and then added a point such that it became a PerfectCurve, it would fail to recover after becoming a Bezier.

This fixes that.
---
 .../Blueprints/Sliders/Components/PathControlPointPiece.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index 42a7d246ea..f34403b377 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -29,10 +29,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
     public class PathControlPointPiece : BlueprintPiece<Slider>, IHasTooltip
     {
         public Action<PathControlPointPiece, MouseButtonEvent> RequestSelection;
+        public List<PathControlPoint> PointsInSegment;
 
         public readonly BindableBool IsSelected = new BindableBool();
         public readonly PathControlPoint ControlPoint;
-        public readonly List<PathControlPoint> PointsInSegment;
 
         private readonly Slider slider;
         private readonly Container marker;
@@ -55,7 +55,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         {
             this.slider = slider;
             ControlPoint = controlPoint;
-            PointsInSegment = slider.Path.PointsInSegment(controlPoint);
+            slider.Path.ControlPoints.BindCollectionChanged((_, args) =>
+            {
+                PointsInSegment = slider.Path.PointsInSegment(controlPoint);
+            }, runOnceImmediately: true);
 
             controlPoint.Type.BindValueChanged(_ => updateMarkerDisplay());
 

From 0bcd38e6613fff3009a7e59f55c422751cf9e6e5 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 24 Mar 2021 02:57:47 +0100
Subject: [PATCH 2006/3722] Simplify path type maintenance when dragging

---
 .../Blueprints/Sliders/Components/PathControlPointPiece.cs     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index f34403b377..4459308ea5 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -195,8 +195,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                 ControlPoint.Position.Value = dragStartPosition + (e.MousePosition - e.MouseDownPosition);
 
             // Maintain the path type in case it got defaulted to bezier at some point during the drag.
-            if (PointsInSegment[0].Type.Value != dragPathType)
-                PointsInSegment[0].Type.Value = dragPathType;
+            PointsInSegment[0].Type.Value = dragPathType;
         }
 
         protected override void OnDragEnd(DragEndEvent e) => changeHandler?.EndChange();

From 4ae3eaaac6265b54c649fc64789c84ebd87f4400 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 24 Mar 2021 03:02:19 +0100
Subject: [PATCH 2007/3722] Move path type correction

This is better because `PathControlPointVisualizer` is local to the editor, meaning there is no chance that this could affect gameplay.
---
 .../Components/PathControlPointVisualiser.cs  | 54 +++++++++++++++++
 osu.Game/Rulesets/Objects/PathControlPoint.cs |  2 +-
 osu.Game/Rulesets/Objects/SliderPath.cs       | 58 -------------------
 3 files changed, 55 insertions(+), 59 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 ce5dc4855e..0c9163ae41 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -91,6 +91,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                         }));
 
                         Connections.Add(new PathControlPointConnectionPiece(slider, e.NewStartingIndex + i));
+
+                        point.Changed += updatePathTypes;
                     }
 
                     break;
@@ -100,6 +102,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                     {
                         Pieces.RemoveAll(p => p.ControlPoint == point);
                         Connections.RemoveAll(c => c.ControlPoint == point);
+
+                        point.Changed -= updatePathTypes;
                     }
 
                     // If removing before the end of the path,
@@ -142,6 +146,56 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         {
         }
 
+        /// <summary>
+        /// Handles correction of invalid path types.
+        /// </summary>
+        private void updatePathTypes()
+        {
+            foreach (PathControlPoint segmentStartPoint in slider.Path.ControlPoints.Where(p => p.Type.Value != null))
+            {
+                if (segmentStartPoint.Type.Value != PathType.PerfectCurve)
+                    continue;
+
+                Vector2[] points = slider.Path.PointsInSegment(segmentStartPoint).Select(p => p.Position.Value).ToArray();
+                if (points.Length == 3 && !validCircularArcSegment(points))
+                    segmentStartPoint.Type.Value = PathType.Bezier;
+            }
+        }
+
+        /// <summary>
+        /// Returns whether the given points are arranged in a valid way. Invalid if points
+        /// are almost entirely linear - as this causes the radius to approach infinity,
+        /// which would exhaust memory when drawing / approximating.
+        /// </summary>
+        /// <param name="points">The three points that make up this circular arc segment.</param>
+        /// <returns></returns>
+        private bool validCircularArcSegment(IReadOnlyList<Vector2> points)
+        {
+            Vector2 a = points[0];
+            Vector2 b = points[1];
+            Vector2 c = points[2];
+
+            float maxLength = points.Max(p => p.Length);
+
+            Vector2 normA = new Vector2(a.X / maxLength, a.Y / maxLength);
+            Vector2 normB = new Vector2(b.X / maxLength, b.Y / maxLength);
+            Vector2 normC = new Vector2(c.X / maxLength, c.Y / maxLength);
+
+            float det = (normA.X - normB.X) * (normB.Y - normC.Y) - (normB.X - normC.X) * (normA.Y - normB.Y);
+
+            float acSq = (a - c).LengthSquared;
+            float abSq = (a - b).LengthSquared;
+            float bcSq = (b - c).LengthSquared;
+
+            // Exterior = curve wraps around the long way between end-points
+            // Exterior bottleneck is drawing-related, interior bottleneck is approximation-related,
+            // where the latter is much faster, hence differing thresholds
+            bool exterior = abSq > acSq || bcSq > acSq;
+            float threshold = exterior ? 0.05f : 0.001f;
+
+            return Math.Abs(det) >= threshold;
+        }
+
         private void selectPiece(PathControlPointPiece piece, MouseButtonEvent e)
         {
             if (e.Button == MouseButton.Left && inputManager.CurrentState.Keyboard.ControlPressed)
diff --git a/osu.Game/Rulesets/Objects/PathControlPoint.cs b/osu.Game/Rulesets/Objects/PathControlPoint.cs
index f11917f4f4..2e4100ee0b 100644
--- a/osu.Game/Rulesets/Objects/PathControlPoint.cs
+++ b/osu.Game/Rulesets/Objects/PathControlPoint.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Objects
         /// <summary>
         /// Invoked when any property of this <see cref="PathControlPoint"/> is changed.
         /// </summary>
-        internal event Action Changed;
+        public event Action Changed;
 
         /// <summary>
         /// Creates a new <see cref="PathControlPoint"/>.
diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index c7931b440b..61f5f94142 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -54,21 +54,13 @@ namespace osu.Game.Rulesets.Objects
                 {
                     case NotifyCollectionChangedAction.Add:
                         foreach (var c in args.NewItems.Cast<PathControlPoint>())
-                        {
                             c.Changed += invalidate;
-                            c.Changed += updatePathTypes;
-                        }
-
                         break;
 
                     case NotifyCollectionChangedAction.Reset:
                     case NotifyCollectionChangedAction.Remove:
                         foreach (var c in args.OldItems.Cast<PathControlPoint>())
-                        {
                             c.Changed -= invalidate;
-                            c.Changed -= updatePathTypes;
-                        }
-
                         break;
                 }
 
@@ -197,56 +189,6 @@ namespace osu.Game.Rulesets.Objects
             return pointsInCurrentSegment;
         }
 
-        /// <summary>
-        /// Handles correction of invalid path types.
-        /// </summary>
-        private void updatePathTypes()
-        {
-            foreach (PathControlPoint segmentStartPoint in ControlPoints.Where(p => p.Type.Value != null))
-            {
-                if (segmentStartPoint.Type.Value != PathType.PerfectCurve)
-                    continue;
-
-                Vector2[] points = PointsInSegment(segmentStartPoint).Select(p => p.Position.Value).ToArray();
-                if (points.Length == 3 && !validCircularArcSegment(points))
-                    segmentStartPoint.Type.Value = PathType.Bezier;
-            }
-        }
-
-        /// <summary>
-        /// Returns whether the given points are arranged in a valid way. Invalid if points
-        /// are almost entirely linear - as this causes the radius to approach infinity,
-        /// which would exhaust memory when drawing / approximating.
-        /// </summary>
-        /// <param name="points">The three points that make up this circular arc segment.</param>
-        /// <returns></returns>
-        private bool validCircularArcSegment(IReadOnlyList<Vector2> points)
-        {
-            Vector2 a = points[0];
-            Vector2 b = points[1];
-            Vector2 c = points[2];
-
-            float maxLength = points.Max(p => p.Length);
-
-            Vector2 normA = new Vector2(a.X / maxLength, a.Y / maxLength);
-            Vector2 normB = new Vector2(b.X / maxLength, b.Y / maxLength);
-            Vector2 normC = new Vector2(c.X / maxLength, c.Y / maxLength);
-
-            float det = (normA.X - normB.X) * (normB.Y - normC.Y) - (normB.X - normC.X) * (normA.Y - normB.Y);
-
-            float acSq = (a - c).LengthSquared;
-            float abSq = (a - b).LengthSquared;
-            float bcSq = (b - c).LengthSquared;
-
-            // Exterior = curve wraps around the long way between end-points
-            // Exterior bottleneck is drawing-related, interior bottleneck is approximation-related,
-            // where the latter is much faster, hence differing thresholds
-            bool exterior = abSq > acSq || bcSq > acSq;
-            float threshold = exterior ? 0.05f : 0.001f;
-
-            return Math.Abs(det) >= threshold;
-        }
-
         private void invalidate()
         {
             pathCache.Invalidate();

From a1c35677efb5e68f5691896b8ca6dfb3763b12e3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Mar 2021 13:02:17 +0900
Subject: [PATCH 2008/3722] Add more xmldoc

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

diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index 55f4ba4b9b..24d540fbf3 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -17,6 +17,9 @@ namespace osu.Game.Screens.Play
     /// </summary>
     public abstract class SubmittingPlayer : Player
     {
+        /// <summary>
+        /// The token to be used for the current submission. This is fetched via a request created by <see cref="CreateTokenRequestRequest"/>.
+        /// </summary>
         protected long? Token { get; private set; }
 
         [Resolved]

From 8bed7748d696666bfe0023f78710cf84440bc244 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Mar 2021 13:02:37 +0900
Subject: [PATCH 2009/3722] Rename token request method to avoid double Request
 terminology

---
 osu.Game/Screens/Play/RoomSubmittingPlayer.cs | 2 +-
 osu.Game/Screens/Play/SoloPlayer.cs           | 2 +-
 osu.Game/Screens/Play/SubmittingPlayer.cs     | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/RoomSubmittingPlayer.cs b/osu.Game/Screens/Play/RoomSubmittingPlayer.cs
index 6ef39e4b75..d7b49bf2cb 100644
--- a/osu.Game/Screens/Play/RoomSubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/RoomSubmittingPlayer.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Screens.Play
             PlaylistItem = playlistItem;
         }
 
-        protected override APIRequest<APIScoreToken> CreateTokenRequestRequest() => new CreateRoomScoreRequest(RoomId.Value ?? 0, PlaylistItem.ID, Game.VersionHash);
+        protected override APIRequest<APIScoreToken> CreateTokenRequest() => new CreateRoomScoreRequest(RoomId.Value ?? 0, PlaylistItem.ID, Game.VersionHash);
 
         protected override APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, long token) => new SubmitRoomScoreRequest(token, RoomId.Value ?? 0, PlaylistItem.ID, score.ScoreInfo);
     }
diff --git a/osu.Game/Screens/Play/SoloPlayer.cs b/osu.Game/Screens/Play/SoloPlayer.cs
index 3dc9df146e..5c465b6d8f 100644
--- a/osu.Game/Screens/Play/SoloPlayer.cs
+++ b/osu.Game/Screens/Play/SoloPlayer.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Screens.Play
             return new SubmitSoloScoreRequest(beatmapId, token, score.ScoreInfo);
         }
 
-        protected override APIRequest<APIScoreToken> CreateTokenRequestRequest()
+        protected override APIRequest<APIScoreToken> CreateTokenRequest()
         {
             if (!(Beatmap.Value.BeatmapInfo.OnlineBeatmapID is int beatmapId))
                 return null;
diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index 24d540fbf3..55b10abd5c 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Screens.Play
     public abstract class SubmittingPlayer : Player
     {
         /// <summary>
-        /// The token to be used for the current submission. This is fetched via a request created by <see cref="CreateTokenRequestRequest"/>.
+        /// The token to be used for the current submission. This is fetched via a request created by <see cref="CreateTokenRequest"/>.
         /// </summary>
         protected long? Token { get; private set; }
 
@@ -41,7 +41,7 @@ namespace osu.Game.Screens.Play
                 return;
             }
 
-            var req = CreateTokenRequestRequest();
+            var req = CreateTokenRequest();
 
             if (req == null)
             {
@@ -118,6 +118,6 @@ namespace osu.Game.Screens.Play
 
         protected abstract APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, long token);
 
-        protected abstract APIRequest<APIScoreToken> CreateTokenRequestRequest();
+        protected abstract APIRequest<APIScoreToken> CreateTokenRequest();
     }
 }

From 7bae4ff43d1d90c30dd874e54183e60934dd7fd3 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 24 Mar 2021 05:06:04 +0100
Subject: [PATCH 2010/3722] Add control point dragging tests

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

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
new file mode 100644
index 0000000000..c4f103e40c
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
@@ -0,0 +1,170 @@
+// Copyright (c) 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.Utils;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components;
+using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders;
+using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Tests.Visual;
+using osuTK;
+using osuTK.Input;
+
+namespace osu.Game.Rulesets.Osu.Tests.Editor
+{
+    public class TestSceneSliderControlPointPiece : SelectionBlueprintTestScene
+    {
+        private Slider slider;
+        private DrawableSlider drawableObject;
+        private TestSliderBlueprint blueprint;
+
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            Clear();
+
+            slider = new Slider
+            {
+                Position = new Vector2(256, 192),
+                Path = new SliderPath(new[]
+                {
+                    new PathControlPoint(Vector2.Zero, PathType.PerfectCurve),
+                    new PathControlPoint(new Vector2(150, 150)),
+                    new PathControlPoint(new Vector2(300, 0), PathType.PerfectCurve),
+                    new PathControlPoint(new Vector2(400, 0)),
+                    new PathControlPoint(new Vector2(400, 150))
+                })
+            };
+
+            slider.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { CircleSize = 2 });
+
+            Add(drawableObject = new DrawableSlider(slider));
+            AddBlueprint(blueprint = new TestSliderBlueprint(drawableObject));
+        });
+
+        [Test]
+        public void TestDragControlPoint()
+        {
+            moveMouseToControlPoint(1);
+            AddStep("hold", () => InputManager.PressButton(MouseButton.Left));
+
+            addMovementStep(new Vector2(150, 50));
+            AddStep("release", () => InputManager.ReleaseButton(MouseButton.Left));
+
+            assertControlPointPosition(1, new Vector2(150, 50));
+            assertControlPointType(0, PathType.PerfectCurve);
+        }
+
+        [Test]
+        public void TestDragControlPointAlmostLinearly()
+        {
+            moveMouseToControlPoint(1);
+            AddStep("hold", () => InputManager.PressButton(MouseButton.Left));
+
+            addMovementStep(new Vector2(150, 0.01f));
+            AddStep("release", () => InputManager.ReleaseButton(MouseButton.Left));
+
+            assertControlPointPosition(1, new Vector2(150, 0.01f));
+            assertControlPointType(0, PathType.Bezier);
+        }
+
+        [Test]
+        public void TestDragControlPointAlmostLinearlyExterior()
+        {
+            moveMouseToControlPoint(1);
+            AddStep("hold", () => InputManager.PressButton(MouseButton.Left));
+
+            addMovementStep(new Vector2(400, 0.01f));
+            AddStep("release", () => InputManager.ReleaseButton(MouseButton.Left));
+
+            assertControlPointPosition(1, new Vector2(400, 0.01f));
+            assertControlPointType(0, PathType.Bezier);
+        }
+
+        [Test]
+        public void TestDragControlPointPathRecovery()
+        {
+            moveMouseToControlPoint(1);
+            AddStep("hold", () => InputManager.PressButton(MouseButton.Left));
+
+            addMovementStep(new Vector2(150, 0.01f));
+            assertControlPointType(0, PathType.Bezier);
+
+            addMovementStep(new Vector2(150, 50));
+            AddStep("release", () => InputManager.ReleaseButton(MouseButton.Left));
+
+            assertControlPointPosition(1, new Vector2(150, 50));
+            assertControlPointType(0, PathType.PerfectCurve);
+        }
+
+        [Test]
+        public void TestDragControlPointPathRecoveryOtherSegment()
+        {
+            moveMouseToControlPoint(4);
+            AddStep("hold", () => InputManager.PressButton(MouseButton.Left));
+
+            addMovementStep(new Vector2(350, 0));
+            assertControlPointType(2, PathType.Bezier);
+
+            addMovementStep(new Vector2(150, 150));
+            AddStep("release", () => InputManager.ReleaseButton(MouseButton.Left));
+
+            assertControlPointPosition(1, new Vector2(150, 150));
+            assertControlPointType(2, PathType.PerfectCurve);
+        }
+
+        private void addMovementStep(Vector2 relativePosition)
+        {
+            AddStep($"move mouse to {relativePosition}", () =>
+            {
+                Vector2 position = slider.Position + relativePosition;
+                InputManager.MoveMouseTo(drawableObject.Parent.ToScreenSpace(position));
+            });
+        }
+
+        private void moveMouseToControlPoint(int index)
+        {
+            AddStep($"move mouse to control point {index}", () =>
+            {
+                Vector2 position = slider.Position + slider.Path.ControlPoints[index].Position.Value;
+                InputManager.MoveMouseTo(drawableObject.Parent.ToScreenSpace(position));
+            });
+        }
+
+        private void assertControlPointType(int index, PathType type) => AddAssert($"control point {index} is {type}", () => slider.Path.ControlPoints[index].Type.Value == type);
+
+        private void assertControlPointPosition(int index, Vector2 position) =>
+            AddAssert($"control point {index} at {position}", () => Precision.AlmostEquals(position, slider.Path.ControlPoints[index].Position.Value, 1));
+
+        private class TestSliderBlueprint : SliderSelectionBlueprint
+        {
+            public new SliderBodyPiece BodyPiece => base.BodyPiece;
+            public new TestSliderCircleBlueprint HeadBlueprint => (TestSliderCircleBlueprint)base.HeadBlueprint;
+            public new TestSliderCircleBlueprint TailBlueprint => (TestSliderCircleBlueprint)base.TailBlueprint;
+            public new PathControlPointVisualiser ControlPointVisualiser => base.ControlPointVisualiser;
+
+            public TestSliderBlueprint(DrawableSlider slider)
+                : base(slider)
+            {
+            }
+
+            protected override SliderCircleSelectionBlueprint CreateCircleSelectionBlueprint(DrawableSlider slider, SliderPosition position) => new TestSliderCircleBlueprint(slider, position);
+        }
+
+        private class TestSliderCircleBlueprint : SliderCircleSelectionBlueprint
+        {
+            public new HitCirclePiece CirclePiece => base.CirclePiece;
+
+            public TestSliderCircleBlueprint(DrawableSlider slider, SliderPosition position)
+                : base(slider, position)
+            {
+            }
+        }
+    }
+}

From e372e355efba030da6866f61fad35abca462cd6d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Mar 2021 13:12:51 +0900
Subject: [PATCH 2011/3722] Reorder overrides in SoloPlayer to better follow
 chronological request order

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

diff --git a/osu.Game/Screens/Play/SoloPlayer.cs b/osu.Game/Screens/Play/SoloPlayer.cs
index 5c465b6d8f..ee1ccdc5b3 100644
--- a/osu.Game/Screens/Play/SoloPlayer.cs
+++ b/osu.Game/Screens/Play/SoloPlayer.cs
@@ -12,15 +12,6 @@ namespace osu.Game.Screens.Play
 {
     public class SoloPlayer : SubmittingPlayer
     {
-        protected override APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, long token)
-        {
-            Debug.Assert(Beatmap.Value.BeatmapInfo.OnlineBeatmapID != null);
-
-            int beatmapId = Beatmap.Value.BeatmapInfo.OnlineBeatmapID.Value;
-
-            return new SubmitSoloScoreRequest(beatmapId, token, score.ScoreInfo);
-        }
-
         protected override APIRequest<APIScoreToken> CreateTokenRequest()
         {
             if (!(Beatmap.Value.BeatmapInfo.OnlineBeatmapID is int beatmapId))
@@ -30,5 +21,14 @@ namespace osu.Game.Screens.Play
         }
 
         protected override bool HandleTokenRetrievalFailure(Exception exception) => false;
+
+        protected override APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, long token)
+        {
+            Debug.Assert(Beatmap.Value.BeatmapInfo.OnlineBeatmapID != null);
+
+            int beatmapId = Beatmap.Value.BeatmapInfo.OnlineBeatmapID.Value;
+
+            return new SubmitSoloScoreRequest(beatmapId, token, score.ScoreInfo);
+        }
     }
 }

From 847d44c7d9998b9d2429fcc9bcef967004d314d4 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 24 Mar 2021 05:13:37 +0100
Subject: [PATCH 2012/3722] Remove unnecessary length asserts

We don't actually care about the length (as this isn't what we're testing), just the type of the slider.
---
 .../Editor/TestSceneSliderPlacementBlueprint.cs                | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index e7ea12e538..e47d86428b 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -291,8 +291,6 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertPlaced(true);
             assertControlPointCount(3);
             assertControlPointType(0, PathType.Bezier);
-            // Will be > 10000 if not falling back to Bezier path calc.
-            assertLength(218.8901f);
         }
 
         [Test]
@@ -311,7 +309,6 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertPlaced(true);
             assertControlPointCount(3);
             assertControlPointType(0, PathType.PerfectCurve);
-            assertLength(212.2276f);
         }
 
         private void addMovementStep(Vector2 position) => AddStep($"move mouse to {position}", () => InputManager.MoveMouseTo(InputManager.ToScreenSpace(position)));

From 6fbe5300163bea139a466c1be2bb09a63e2bd830 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 24 Mar 2021 05:14:35 +0100
Subject: [PATCH 2013/3722] Fix coordinates

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

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index e47d86428b..6eec5edfbe 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -279,13 +279,15 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         [Test]
         public void TestPlacePerfectCurveSegmentAlmostLinearly()
         {
-            addMovementStep(new Vector2(0));
+            Vector2 startPosition = new Vector2(200);
+
+            addMovementStep(startPosition);
             addClickStep(MouseButton.Left);
 
-            addMovementStep(new Vector2(61.382935f, 6.423767f));
+            addMovementStep(startPosition + new Vector2(300, 0));
             addClickStep(MouseButton.Left);
 
-            addMovementStep(new Vector2(217.69522f, 22.84021f));
+            addMovementStep(startPosition + new Vector2(150, 0.1f));
             addClickStep(MouseButton.Right);
 
             assertPlaced(true);
@@ -296,14 +298,16 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         [Test]
         public void TestPlacePerfectCurveSegmentAlmostLinearlyRecovery()
         {
-            addMovementStep(new Vector2(0));
+            Vector2 startPosition = new Vector2(200);
+
+            addMovementStep(startPosition);
             addClickStep(MouseButton.Left);
 
-            addMovementStep(new Vector2(61.382935f, 6.423767f));
+            addMovementStep(startPosition + new Vector2(61.382935f, 6.423767f));
             addClickStep(MouseButton.Left);
 
-            addMovementStep(new Vector2(217.69522f, 22.84021f)); // Should convert to bezier
-            addMovementStep(new Vector2(210.0f, 30.0f)); // Should convert back to perfect
+            addMovementStep(startPosition + new Vector2(217.69522f, 22.84021f)); // Should convert to bezier
+            addMovementStep(startPosition + new Vector2(210.0f, 0.0f)); // Should convert back to perfect
             addClickStep(MouseButton.Right);
 
             assertPlaced(true);

From 23a4d1c1350ef03a05b3c53b2c73be37ef18a4a7 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 24 Mar 2021 05:15:28 +0100
Subject: [PATCH 2014/3722] Shorten recovery test name

---
 .../Editor/TestSceneSliderPlacementBlueprint.cs                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index 6eec5edfbe..e42ceaa4ac 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -296,7 +296,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         }
 
         [Test]
-        public void TestPlacePerfectCurveSegmentAlmostLinearlyRecovery()
+        public void TestPlacePerfectCurveSegmentRecovery()
         {
             Vector2 startPosition = new Vector2(200);
 

From 7b395ed783e2811e9e29f73e287965b9bafe8b57 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 24 Mar 2021 05:15:50 +0100
Subject: [PATCH 2015/3722] Add exterior arc test

---
 .../TestSceneSliderPlacementBlueprint.cs      | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index e42ceaa4ac..0433acb25c 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -284,6 +284,25 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             addMovementStep(startPosition);
             addClickStep(MouseButton.Left);
 
+            addMovementStep(startPosition + new Vector2(61.382935f, 6.423767f));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(startPosition + new Vector2(217.69522f, 22.84021f));
+            addClickStep(MouseButton.Right);
+
+            assertPlaced(true);
+            assertControlPointCount(3);
+            assertControlPointType(0, PathType.Bezier);
+        }
+
+        [Test]
+        public void TestPlacePerfectCurveSegmentAlmostLinearlyExterior()
+        {
+            Vector2 startPosition = new Vector2(200);
+
+            addMovementStep(startPosition);
+            addClickStep(MouseButton.Left);
+
             addMovementStep(startPosition + new Vector2(300, 0));
             addClickStep(MouseButton.Left);
 

From a0c6c4da35dfe5cf2a28efa20da64acab28f25ab Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Mar 2021 13:17:13 +0900
Subject: [PATCH 2016/3722] Rename and refactor token request process to be
 easier to understand

---
 osu.Game/Screens/Play/SubmittingPlayer.cs | 24 +++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index 55b10abd5c..5d087c212d 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
@@ -37,7 +38,7 @@ namespace osu.Game.Screens.Play
 
             if (!api.IsLoggedIn)
             {
-                fail(new InvalidOperationException("API is not online."));
+                handleFailure(new InvalidOperationException("API is not online."));
                 return;
             }
 
@@ -45,7 +46,7 @@ namespace osu.Game.Screens.Play
 
             if (req == null)
             {
-                fail(new InvalidOperationException("Request could not be constructed."));
+                handleFailure(new InvalidOperationException("Request could not be constructed."));
                 return;
             }
 
@@ -54,13 +55,13 @@ namespace osu.Game.Screens.Play
                 Token = r.ID;
                 tcs.SetResult(true);
             };
-            req.Failure += fail;
+            req.Failure += handleFailure;
 
             api.Queue(req);
 
             tcs.Task.Wait();
 
-            void fail(Exception exception)
+            void handleFailure(Exception exception)
             {
                 if (HandleTokenRetrievalFailure(exception))
                 {
@@ -116,8 +117,19 @@ namespace osu.Game.Screens.Play
             await tcs.Task.ConfigureAwait(false);
         }
 
-        protected abstract APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, long token);
-
+        /// <summary>
+        /// Construct a request to be used for retrieval of the score token.
+        /// Can return null, at which point <see cref="HandleTokenRetrievalFailure"/> will be fired.
+        /// </summary>
+        [CanBeNull]
         protected abstract APIRequest<APIScoreToken> CreateTokenRequest();
+
+        /// <summary>
+        /// Construct a request to submit the score.
+        /// Will only be invoked if the request constructed via <see cref="CreateTokenRequest"/> was successful.
+        /// </summary>
+        /// <param name="score">The score to be submitted.</param>
+        /// <param name="token">The submission token.</param>
+        protected abstract APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, long token);
     }
 }

From 84b2f9a848c0c61b047f5eb463e7848cdbd9b03a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Mar 2021 13:20:44 +0900
Subject: [PATCH 2017/3722] Make token private

---
 .../Multiplayer/MultiplayerPlayer.cs          |  4 ++--
 osu.Game/Screens/Play/SubmittingPlayer.cs     | 20 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index a5adcdb8ad..aaacf891bb 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -67,8 +67,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             base.LoadAsyncComplete();
 
-            if (Token == null)
-                return; // Todo: Somehow handle token retrieval failure.
+            if (!ValidForResume)
+                return; // token retrieval may have failed.
 
             client.MatchStarted += onMatchStarted;
             client.ResultsReady += onResultsReady;
diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index 5d087c212d..87a4eb5efe 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Screens.Play
         /// <summary>
         /// The token to be used for the current submission. This is fetched via a request created by <see cref="CreateTokenRequest"/>.
         /// </summary>
-        protected long? Token { get; private set; }
+        private long? token;
 
         [Resolved]
         private IAPIProvider api { get; set; }
@@ -38,7 +38,7 @@ namespace osu.Game.Screens.Play
 
             if (!api.IsLoggedIn)
             {
-                handleFailure(new InvalidOperationException("API is not online."));
+                handleTokenFailure(new InvalidOperationException("API is not online."));
                 return;
             }
 
@@ -46,22 +46,24 @@ namespace osu.Game.Screens.Play
 
             if (req == null)
             {
-                handleFailure(new InvalidOperationException("Request could not be constructed."));
+                handleTokenFailure(new InvalidOperationException("Request could not be constructed."));
                 return;
             }
 
             req.Success += r =>
             {
-                Token = r.ID;
+                token = r.ID;
                 tcs.SetResult(true);
             };
-            req.Failure += handleFailure;
+            req.Failure += handleTokenFailure;
 
             api.Queue(req);
 
             tcs.Task.Wait();
 
-            void handleFailure(Exception exception)
+            base.LoadAsyncComplete();
+
+            void handleTokenFailure(Exception exception)
             {
                 if (HandleTokenRetrievalFailure(exception))
                 {
@@ -79,8 +81,6 @@ namespace osu.Game.Screens.Play
 
                 tcs.SetResult(false);
             }
-
-            base.LoadAsyncComplete();
         }
 
         /// <summary>
@@ -95,11 +95,11 @@ namespace osu.Game.Screens.Play
             await base.PrepareScoreForResultsAsync(score).ConfigureAwait(false);
 
             // token may be null if the request failed but gameplay was still allowed (see HandleTokenRetrievalFailure).
-            if (Token == null)
+            if (token == null)
                 return;
 
             var tcs = new TaskCompletionSource<bool>();
-            var request = CreateSubmissionRequest(score, Token.Value);
+            var request = CreateSubmissionRequest(score, token.Value);
 
             request.Success += s =>
             {

From d55324585d678603435adcaed815d3d85186037b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Mar 2021 13:23:23 +0900
Subject: [PATCH 2018/3722] Change RoomSubmittingPlayer's request
 implementation to return null on RoomID missing, rather than silently
 succeeding

---
 osu.Game/Screens/Play/RoomSubmittingPlayer.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/RoomSubmittingPlayer.cs b/osu.Game/Screens/Play/RoomSubmittingPlayer.cs
index d7b49bf2cb..7ba12f5db6 100644
--- a/osu.Game/Screens/Play/RoomSubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/RoomSubmittingPlayer.cs
@@ -25,7 +25,13 @@ namespace osu.Game.Screens.Play
             PlaylistItem = playlistItem;
         }
 
-        protected override APIRequest<APIScoreToken> CreateTokenRequest() => new CreateRoomScoreRequest(RoomId.Value ?? 0, PlaylistItem.ID, Game.VersionHash);
+        protected override APIRequest<APIScoreToken> CreateTokenRequest()
+        {
+            if (!(RoomId.Value is long roomId))
+                return null;
+
+            return new CreateRoomScoreRequest(roomId, PlaylistItem.ID, Game.VersionHash);
+        }
 
         protected override APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, long token) => new SubmitRoomScoreRequest(token, RoomId.Value ?? 0, PlaylistItem.ID, score.ScoreInfo);
     }

From f95175983ae6f4f79a2a27877467e8ef40f5cb22 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Mar 2021 13:37:37 +0900
Subject: [PATCH 2019/3722] Make code more concise and move method to a more
 appropriate place

---
 osu.Game/OsuGame.cs | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 53dc900254..dd1fa32ad9 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -531,6 +531,13 @@ namespace osu.Game
             SentryLogger.Dispose();
         }
 
+        protected override IDictionary<FrameworkSetting, object> GetFrameworkConfigDefaults()
+            => new Dictionary<FrameworkSetting, object>
+            {
+                // General expectation that osu! starts in fullscreen by default (also gives the most predictable performance)
+                { FrameworkSetting.WindowMode, WindowMode.Fullscreen }
+            };
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -1013,13 +1020,5 @@ namespace osu.Game
             if (newScreen == null)
                 Exit();
         }
-
-        protected override IDictionary<FrameworkSetting, object> GetFrameworkConfigDefaults()
-        {
-            // Overriding config defaults determined by Framework
-            IDictionary<FrameworkSetting, object> defaultOverrides = new Dictionary<FrameworkSetting, object>();
-            defaultOverrides.Add(FrameworkSetting.WindowMode, WindowMode.Fullscreen);
-            return defaultOverrides;
-        }
     }
 }

From f80b3ada25f1fe688262c95df3dc65f7862479ce Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 24 Mar 2021 05:54:48 +0100
Subject: [PATCH 2020/3722] Add circular arc size tests

---
 .../TestSceneSliderPlacementBlueprint.cs      | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index 0433acb25c..20df46cd2c 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -334,6 +334,40 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertControlPointType(0, PathType.PerfectCurve);
         }
 
+        [Test]
+        public void TestPlacePerfectCurveSegmentLarge()
+        {
+            addMovementStep(new Vector2(200));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(200, 800));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(600, 200));
+            addClickStep(MouseButton.Right);
+
+            assertPlaced(true);
+            assertControlPointCount(3);
+            assertControlPointType(0, PathType.PerfectCurve);
+        }
+
+        [Test]
+        public void TestPlacePerfectCurveSegmentTooLarge()
+        {
+            addMovementStep(new Vector2(200));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(200, 800));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(400, 200));
+            addClickStep(MouseButton.Right);
+
+            assertPlaced(true);
+            assertControlPointCount(3);
+            assertControlPointType(0, PathType.Bezier);
+        }
+
         private void addMovementStep(Vector2 position) => AddStep($"move mouse to {position}", () => InputManager.MoveMouseTo(InputManager.ToScreenSpace(position)));
 
         private void addClickStep(MouseButton button)

From e0240ab9d93db5e4d2467c4002e9a2784ff0e1a1 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 24 Mar 2021 05:55:34 +0100
Subject: [PATCH 2021/3722] Increase exterior threshold

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

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
index 0c9163ae41..c4a16f9c2a 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -191,7 +191,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             // Exterior bottleneck is drawing-related, interior bottleneck is approximation-related,
             // where the latter is much faster, hence differing thresholds
             bool exterior = abSq > acSq || bcSq > acSq;
-            float threshold = exterior ? 0.05f : 0.001f;
+            float threshold = exterior ? 0.35f : 0.001f;
 
             return Math.Abs(det) >= threshold;
         }

From 415797aadd3c77de155ebdefc53d1c22cb83a723 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 24 Mar 2021 06:01:12 +0100
Subject: [PATCH 2022/3722] Fix broken control point drag test

Broken for 2 reasons:
- Assert checks the wrong control point.
- The exterior arc is now too big.

This fixes both.
---
 .../Editor/TestSceneSliderControlPointPiece.cs                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
index c4f103e40c..c3492fc843 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
@@ -112,10 +112,10 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             addMovementStep(new Vector2(350, 0));
             assertControlPointType(2, PathType.Bezier);
 
-            addMovementStep(new Vector2(150, 150));
+            addMovementStep(new Vector2(400, 50));
             AddStep("release", () => InputManager.ReleaseButton(MouseButton.Left));
 
-            assertControlPointPosition(1, new Vector2(150, 150));
+            assertControlPointPosition(4, new Vector2(400, 50));
             assertControlPointType(2, PathType.PerfectCurve);
         }
 

From 5ad8dc316fa1aeed2f2dc194c2f9520b7f93ba09 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Mar 2021 14:09:15 +0900
Subject: [PATCH 2023/3722] Add inline comment and improve linq robustness

---
 osu.Game.Tournament/TournamentGame.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/TournamentGame.cs b/osu.Game.Tournament/TournamentGame.cs
index bf43b198c4..87e23e3404 100644
--- a/osu.Game.Tournament/TournamentGame.cs
+++ b/osu.Game.Tournament/TournamentGame.cs
@@ -51,8 +51,12 @@ namespace osu.Game.Tournament
                 Margin = new MarginPadding(40),
             });
 
-            var m = (MouseHandler)host.AvailableInputHandlers.Single(t => t is MouseHandler);
-            m.UseRelativeMode.Value = false;
+            // 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();
+
+            if (mouseHandler != null)
+                mouseHandler.UseRelativeMode.Value = false;
 
             loadingSpinner.Show();
 

From def0e5c42e90e5e8eb984c794a31eee0567caee4 Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Tue, 23 Mar 2021 17:21:42 +0100
Subject: [PATCH 2024/3722] Fix off-by-one error in isQuadInBounds

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

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 28e6347f4f..0418aa1925 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -242,8 +242,8 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         private (bool X, bool Y) isQuadInBounds(Quad quad)
         {
-            bool xInBounds = (quad.TopLeft.X >= 0) && (quad.BottomRight.X < DrawWidth);
-            bool yInBounds = (quad.TopLeft.Y >= 0) && (quad.BottomRight.Y < DrawHeight);
+            bool xInBounds = (quad.TopLeft.X >= 0) && (quad.BottomRight.X <= DrawWidth);
+            bool yInBounds = (quad.TopLeft.Y >= 0) && (quad.BottomRight.Y <= DrawHeight);
 
             return (xInBounds, yInBounds);
         }

From 3d471d239f2007c05e7af3bf417bae1c89b1d910 Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Tue, 23 Mar 2021 12:41:43 +0100
Subject: [PATCH 2025/3722] Clamp multi-object scale instead of cancelling it

---
 .../Edit/OsuSelectionHandler.cs               | 45 +++++++++++++++++--
 1 file changed, 41 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 0418aa1925..595357ee65 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -215,23 +215,23 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         private bool scaleHitObjects(OsuHitObject[] hitObjects, Anchor reference, Vector2 scale)
         {
+            scale = getClampedScale(hitObjects, reference, scale);
+
             // move the selection before scaling if dragging from top or left anchors.
             float xOffset = ((reference & Anchor.x0) > 0) ? -scale.X : 0;
             float yOffset = ((reference & Anchor.y0) > 0) ? -scale.Y : 0;
 
             Quad selectionQuad = getSurroundingQuad(hitObjects);
-            Quad scaledQuad = new Quad(selectionQuad.TopLeft.X + xOffset, selectionQuad.TopLeft.Y + yOffset, selectionQuad.Width + scale.X, selectionQuad.Height + scale.Y);
-            (bool xInBounds, bool yInBounds) = isQuadInBounds(scaledQuad);
 
             foreach (var h in hitObjects)
             {
                 var newPosition = h.Position;
 
                 // guard against no-ops and NaN.
-                if (scale.X != 0 && selectionQuad.Width > 0 && xInBounds)
+                if (scale.X != 0 && selectionQuad.Width > 0)
                     newPosition.X = selectionQuad.TopLeft.X + xOffset + (h.X - selectionQuad.TopLeft.X) / selectionQuad.Width * (selectionQuad.Width + scale.X);
 
-                if (scale.Y != 0 && selectionQuad.Height > 0 && yInBounds)
+                if (scale.Y != 0 && selectionQuad.Height > 0)
                     newPosition.Y = selectionQuad.TopLeft.Y + yOffset + (h.Y - selectionQuad.TopLeft.Y) / selectionQuad.Height * (selectionQuad.Height + scale.Y);
 
                 h.Position = newPosition;
@@ -269,6 +269,43 @@ namespace osu.Game.Rulesets.Osu.Edit
                 h.Position += delta;
         }
 
+        /// <summary>
+        /// Clamp scale where selection does not exceed playfield bounds or flip.
+        /// </summary>
+        /// <param name="hitObjects">The hitobjects to be scaled</param>
+        /// <param name="reference">The anchor from which the scale operation is performed</param>
+        /// <param name="scale">The scale to be clamped</param>
+        /// <returns>The clamped scale vector</returns>
+        private Vector2 getClampedScale(OsuHitObject[] hitObjects, Anchor reference, Vector2 scale)
+        {
+            float xOffset = ((reference & Anchor.x0) > 0) ? -scale.X : 0;
+            float yOffset = ((reference & Anchor.y0) > 0) ? -scale.Y : 0;
+
+            Quad selectionQuad = getSurroundingQuad(hitObjects);
+
+            //todo: this is not always correct for selections involving sliders
+            Quad scaledQuad = new Quad(selectionQuad.TopLeft.X + xOffset, selectionQuad.TopLeft.Y + yOffset, selectionQuad.Width + scale.X, selectionQuad.Height + scale.Y);
+
+            //max Size -> playfield bounds
+            if (scaledQuad.TopLeft.X < 0)
+                scale.X += scaledQuad.TopLeft.X;
+            if (scaledQuad.TopLeft.Y < 0)
+                scale.Y += scaledQuad.TopLeft.Y;
+
+            if (scaledQuad.BottomRight.X > DrawWidth)
+                scale.X -= scaledQuad.BottomRight.X - DrawWidth;
+            if (scaledQuad.BottomRight.Y > DrawHeight)
+                scale.Y -= scaledQuad.BottomRight.Y - DrawHeight;
+
+            //min Size -> almost 0. Less than 0 causes the quad to flip, exactly 0 causes scaling to get stuck at minimum scale.
+            Vector2 scaledSize = selectionQuad.Size + scale;
+            Vector2 minSize = new Vector2(Precision.FLOAT_EPSILON);
+
+            scale = Vector2.ComponentMax(minSize, scaledSize) - selectionQuad.Size;
+
+            return scale;
+        }
+
         /// <summary>
         /// Returns a gamefield-space quad surrounding the provided hit objects.
         /// </summary>

From e67ab3cca7cb55383a82769499686a37e09f82e6 Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Tue, 23 Mar 2021 16:09:44 +0100
Subject: [PATCH 2026/3722] Change single slider scaling to a method that works

---
 .../Edit/OsuSelectionHandler.cs               | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 595357ee65..ae92b12fd2 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -197,19 +197,19 @@ namespace osu.Game.Rulesets.Osu.Edit
             Quad sliderQuad = getSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position.Value));
             Vector2 pathRelativeDeltaScale = new Vector2(1 + scale.X / sliderQuad.Width, 1 + scale.Y / sliderQuad.Height);
 
-            Quad selectionQuad = getSurroundingQuad(new OsuHitObject[] { slider });
-            Quad scaledQuad = new Quad(selectionQuad.TopLeft.X, selectionQuad.TopLeft.Y, selectionQuad.Width + scale.X, selectionQuad.Height + scale.Y);
-            (bool xInBounds, bool yInBounds) = isQuadInBounds(scaledQuad);
-
-            if (!xInBounds)
-                pathRelativeDeltaScale.X = 1;
-
-            if (!yInBounds)
-                pathRelativeDeltaScale.Y = 1;
-
             foreach (var point in slider.Path.ControlPoints)
                 point.Position.Value *= pathRelativeDeltaScale;
 
+            //if sliderhead or sliderend end up outside playfield, revert scaling.
+            Quad scaledQuad = getSurroundingQuad(new OsuHitObject[] { slider });
+            (bool xInBounds, bool yInBounds) = isQuadInBounds(scaledQuad);
+
+            if (xInBounds && yInBounds)
+                return true;
+
+            foreach (var point in slider.Path.ControlPoints)
+                point.Position.Value *= new Vector2(1 / pathRelativeDeltaScale.X, 1 / pathRelativeDeltaScale.Y);
+
             return true;
         }
 

From b4dc35f66ba3c8c6761fdb8dc381057bb13ce73a Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 24 Mar 2021 17:24:05 +0100
Subject: [PATCH 2027/3722] Update large arc tests

Should now be more robust and readable.
---
 .../TestSceneSliderControlPointPiece.cs       |  4 ++--
 .../TestSceneSliderPlacementBlueprint.cs      | 20 +++++++++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
index c3492fc843..7ca86335ce 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
@@ -112,10 +112,10 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             addMovementStep(new Vector2(350, 0));
             assertControlPointType(2, PathType.Bezier);
 
-            addMovementStep(new Vector2(400, 50));
+            addMovementStep(new Vector2(150, 150));
             AddStep("release", () => InputManager.ReleaseButton(MouseButton.Left));
 
-            assertControlPointPosition(4, new Vector2(400, 50));
+            assertControlPointPosition(4, new Vector2(150, 150));
             assertControlPointType(2, PathType.PerfectCurve);
         }
 
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index 20df46cd2c..46fe7b7576 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -337,13 +337,17 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         [Test]
         public void TestPlacePerfectCurveSegmentLarge()
         {
-            addMovementStep(new Vector2(200));
+            Vector2 startPosition = new Vector2(400);
+
+            addMovementStep(startPosition);
             addClickStep(MouseButton.Left);
 
-            addMovementStep(new Vector2(200, 800));
+            addMovementStep(startPosition + new Vector2(240, 240));
             addClickStep(MouseButton.Left);
 
-            addMovementStep(new Vector2(600, 200));
+            // Playfield dimensions are 640 x 480.
+            // So a 480 * 480 bounding box area should be ok.
+            addMovementStep(startPosition + new Vector2(-240, 240));
             addClickStep(MouseButton.Right);
 
             assertPlaced(true);
@@ -354,13 +358,17 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         [Test]
         public void TestPlacePerfectCurveSegmentTooLarge()
         {
-            addMovementStep(new Vector2(200));
+            Vector2 startPosition = new Vector2(480, 200);
+
+            addMovementStep(startPosition);
             addClickStep(MouseButton.Left);
 
-            addMovementStep(new Vector2(200, 800));
+            addMovementStep(startPosition + new Vector2(400, 400));
             addClickStep(MouseButton.Left);
 
-            addMovementStep(new Vector2(400, 200));
+            // Playfield dimensions are 640 x 480.
+            // So an 800 * 800 bounding box area should not be ok.
+            addMovementStep(startPosition + new Vector2(-400, 400));
             addClickStep(MouseButton.Right);
 
             assertPlaced(true);

From 0f4314c1d8e6741037df4407326d186fb8c3210b Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 24 Mar 2021 17:24:33 +0100
Subject: [PATCH 2028/3722] Add complete arc test

Ensures we can still make smaller circles properly.
---
 .../Editor/TestSceneSliderPlacementBlueprint.cs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index 46fe7b7576..937034fc23 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -376,6 +376,23 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertControlPointType(0, PathType.Bezier);
         }
 
+        [Test]
+        public void TestPlacePerfectCurveSegmentCompleteArc()
+        {
+            addMovementStep(new Vector2(400));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(600, 400));
+            addClickStep(MouseButton.Left);
+
+            addMovementStep(new Vector2(400, 410));
+            addClickStep(MouseButton.Right);
+
+            assertPlaced(true);
+            assertControlPointCount(3);
+            assertControlPointType(0, PathType.PerfectCurve);
+        }
+
         private void addMovementStep(Vector2 position) => AddStep($"move mouse to {position}", () => InputManager.MoveMouseTo(InputManager.ToScreenSpace(position)));
 
         private void addClickStep(MouseButton button)

From 9df059b01decf63403094a3c071a6f54bea7fe7b Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 24 Mar 2021 17:25:28 +0100
Subject: [PATCH 2029/3722] Add bounding box limit

---
 .../Components/PathControlPointVisualiser.cs  | 101 ++++++++++++++++--
 1 file changed, 90 insertions(+), 11 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 c4a16f9c2a..0270485f31 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -11,6 +11,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
@@ -165,11 +166,26 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         /// <summary>
         /// Returns whether the given points are arranged in a valid way. Invalid if points
         /// are almost entirely linear - as this causes the radius to approach infinity,
-        /// which would exhaust memory when drawing / approximating.
+        /// or if the bounding box of the arc is too large.
         /// </summary>
         /// <param name="points">The three points that make up this circular arc segment.</param>
         /// <returns></returns>
         private bool validCircularArcSegment(IReadOnlyList<Vector2> points)
+        {
+            float det = circularArcDeterminant(points);
+            RectangleF boundingBox = circularArcBoundingBox(points);
+
+            // Determinant limit prevents memory exhaustion as a result of approximating the subpath.
+            // Bounding box area limit prevents memory exhaustion as a result of drawing the texture.
+            return Math.Abs(det) > 0.001f && boundingBox.Area < 640 * 480;
+        }
+
+        /// <summary>
+        /// Computes the determinant of the circular arc segment defined by the given points.
+        /// </summary>
+        /// <param name="points">The three points defining the circular arc.</param>
+        /// <returns></returns>
+        private float circularArcDeterminant(IReadOnlyList<Vector2> points)
         {
             Vector2 a = points[0];
             Vector2 b = points[1];
@@ -181,19 +197,82 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             Vector2 normB = new Vector2(b.X / maxLength, b.Y / maxLength);
             Vector2 normC = new Vector2(c.X / maxLength, c.Y / maxLength);
 
-            float det = (normA.X - normB.X) * (normB.Y - normC.Y) - (normB.X - normC.X) * (normA.Y - normB.Y);
+            return (normA.X - normB.X) * (normB.Y - normC.Y) - (normB.X - normC.X) * (normA.Y - normB.Y);
+        }
 
-            float acSq = (a - c).LengthSquared;
-            float abSq = (a - b).LengthSquared;
-            float bcSq = (b - c).LengthSquared;
+        /// <summary>
+        /// Computes the bounding box of the circular arc segment defined by the given points.
+        /// </summary>
+        /// <param name="points">The three points defining the circular arc.</param>
+        /// <returns></returns>
+        private RectangleF circularArcBoundingBox(IReadOnlyList<Vector2> points)
+        {
+            Vector2 a = points[0];
+            Vector2 b = points[1];
+            Vector2 c = points[2];
 
-            // Exterior = curve wraps around the long way between end-points
-            // Exterior bottleneck is drawing-related, interior bottleneck is approximation-related,
-            // where the latter is much faster, hence differing thresholds
-            bool exterior = abSq > acSq || bcSq > acSq;
-            float threshold = exterior ? 0.35f : 0.001f;
+            // See: https://en.wikipedia.org/wiki/Circumscribed_circle#Cartesian_coordinates_2
+            float d = 2 * (a.X * (b - c).Y + b.X * (c - a).Y + c.X * (a - b).Y);
+            float aSq = a.LengthSquared;
+            float bSq = b.LengthSquared;
+            float cSq = c.LengthSquared;
 
-            return Math.Abs(det) >= threshold;
+            Vector2 center = new Vector2(
+                aSq * (b - c).Y + bSq * (c - a).Y + cSq * (a - b).Y,
+                aSq * (c - b).X + bSq * (a - c).X + cSq * (b - a).X) / d;
+
+            Vector2 dA = a - center;
+            Vector2 dC = c - center;
+
+            float r = dA.Length;
+
+            double thetaStart = Math.Atan2(dA.Y, dA.X);
+            double thetaEnd = Math.Atan2(dC.Y, dC.X);
+
+            while (thetaEnd < thetaStart)
+                thetaEnd += 2 * Math.PI;
+
+            // Decide in which direction to draw the circle, depending on which side of
+            // AC B lies.
+            Vector2 orthoAtoC = c - a;
+            orthoAtoC = new Vector2(orthoAtoC.Y, -orthoAtoC.X);
+            bool clockwise = Vector2.Dot(orthoAtoC, b - a) >= 0;
+
+            if (clockwise)
+            {
+                if (thetaEnd < thetaStart)
+                    thetaEnd += Math.PI * 2;
+            }
+            else
+            {
+                if (thetaStart < thetaEnd)
+                    thetaStart += Math.PI * 2;
+            }
+
+            List<Vector2> boundingBoxPoints = new List<Vector2>(points);
+
+            bool includes0Degrees = 0 > thetaStart && 0 < thetaEnd;
+            bool includes90Degrees = Math.PI / 2 > thetaStart && Math.PI / 2 < thetaEnd;
+            bool includes180Degrees = Math.PI > thetaStart && Math.PI < thetaEnd;
+            bool includes270Degrees = Math.PI * 1.5f > thetaStart && Math.PI * 1.5f < thetaEnd;
+
+            if (!clockwise)
+            {
+                includes0Degrees = 0 < thetaStart && 0 > thetaEnd;
+                includes90Degrees = Math.PI / 2 < thetaStart && Math.PI / 2 > thetaEnd;
+                includes180Degrees = Math.PI < thetaStart && Math.PI > thetaEnd;
+                includes270Degrees = Math.PI * 1.5f < thetaStart && Math.PI * 1.5f > thetaEnd;
+            }
+
+            if (includes0Degrees) boundingBoxPoints.Add(center + new Vector2(1, 0) * r);
+            if (includes90Degrees) boundingBoxPoints.Add(center + new Vector2(0, 1) * r);
+            if (includes180Degrees) boundingBoxPoints.Add(center + new Vector2(-1, 0) * r);
+            if (includes270Degrees) boundingBoxPoints.Add(center + new Vector2(0, -1) * r);
+
+            float width = Math.Abs(boundingBoxPoints.Max(p => p.X) - boundingBoxPoints.Min(p => p.X));
+            float height = Math.Abs(boundingBoxPoints.Max(p => p.Y) - boundingBoxPoints.Min(p => p.Y));
+
+            return new RectangleF(slider.Position, new Vector2(width, height));
         }
 
         private void selectPiece(PathControlPointPiece piece, MouseButtonEvent e)

From fc5719e445750c10ddad28ead84239a9cb0f519d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 24 Mar 2021 21:31:53 +0300
Subject: [PATCH 2030/3722] Fix SkinManager not handling extensions casing
 comparsion properly

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

diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 9257636301..dfc2981c6f 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -104,7 +104,7 @@ namespace osu.Game.Skinning
         protected override string ComputeHash(SkinInfo item, ArchiveReader reader = null)
         {
             // we need to populate early to create a hash based off skin.ini contents
-            if (item.Name?.Contains(".osk") == true)
+            if (item.Name?.EndsWith(".osk", StringComparison.OrdinalIgnoreCase) == true)
                 populateMetadata(item);
 
             if (item.Creator != null && item.Creator != unknown_creator_string)
@@ -122,7 +122,7 @@ namespace osu.Game.Skinning
         {
             await base.Populate(model, archive, cancellationToken).ConfigureAwait(false);
 
-            if (model.Name?.Contains(".osk") == true)
+            if (model.Name?.EndsWith(".osk", StringComparison.OrdinalIgnoreCase) == true)
                 populateMetadata(model);
         }
 
@@ -137,7 +137,7 @@ namespace osu.Game.Skinning
             }
             else
             {
-                item.Name = item.Name.Replace(".osk", "");
+                item.Name = item.Name.Replace(".osk", "", StringComparison.OrdinalIgnoreCase);
                 item.Creator ??= unknown_creator_string;
             }
         }

From 35810bb2fb98b7f310d2e19b29a8369e1ddb99a8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 24 Mar 2021 22:55:15 +0300
Subject: [PATCH 2031/3722] Add test coverage

---
 osu.Game.Tests/Skins/IO/ImportSkinTest.cs | 25 +++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
index a5b4b04ef5..8124bd4199 100644
--- a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
+++ b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
@@ -113,6 +113,31 @@ namespace osu.Game.Tests.Skins.IO
             }
         }
 
+        [Test]
+        public async Task TestImportUpperCasedOskArchive()
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(ImportSkinTest)))
+            {
+                try
+                {
+                    var osu = LoadOsuIntoHost(host);
+
+                    var imported = await loadSkinIntoOsu(osu, new ZipArchiveReader(createOsk("name 1", "author 1"), "skin1.OsK"));
+
+                    Assert.That(imported.Name, Is.EqualTo("name 1"));
+                    Assert.That(imported.Creator, Is.EqualTo("author 1"));
+
+                    var imported2 = await loadSkinIntoOsu(osu, new ZipArchiveReader(createOsk("name 1", "author 1"), "skin1.oSK"));
+
+                    Assert.That(imported2.Hash, Is.EqualTo(imported.Hash));
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
         private MemoryStream createOsk(string name, string author)
         {
             var zipStream = new MemoryStream();

From 8753d45b71baab76b83f6245e5e8ad98c3ea3e92 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Mar 2021 12:32:51 +0900
Subject: [PATCH 2032/3722] Remove duplicate crash report issue template

---
 .github/ISSUE_TEMPLATE/02-crash-issues.md     | 20 -------------------
 ...issues.md => 02-feature-request-issues.md} |  2 +-
 2 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/02-crash-issues.md
 rename .github/ISSUE_TEMPLATE/{03-feature-request-issues.md => 02-feature-request-issues.md} (62%)

diff --git a/.github/ISSUE_TEMPLATE/02-crash-issues.md b/.github/ISSUE_TEMPLATE/02-crash-issues.md
deleted file mode 100644
index 04170312d1..0000000000
--- a/.github/ISSUE_TEMPLATE/02-crash-issues.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Crash Report
-about: Issues regarding crashes or permanent freezes.
----
-**Describe the crash:** 
-
-**Screenshots or videos showing encountered issue:** 
-
-**osu!lazer version:** 
-
-**Logs:**
-<!--
-*please attach logs here, which are located at:*
-- `%AppData%/osu/logs` *(on Windows),*
-- `~/.local/share/osu/logs` *(on Linux & macOS).*
-- `Android/Data/sh.ppy.osulazer/logs` *(on Android)*,
-- on iOS they can be obtained by connecting your device to your desktop and copying the `logs` directory from the app's own document storage using iTunes. (https://support.apple.com/en-us/HT201301#copy-to-computer)
--->
-
-**Computer Specifications:** 
diff --git a/.github/ISSUE_TEMPLATE/03-feature-request-issues.md b/.github/ISSUE_TEMPLATE/02-feature-request-issues.md
similarity index 62%
rename from .github/ISSUE_TEMPLATE/03-feature-request-issues.md
rename to .github/ISSUE_TEMPLATE/02-feature-request-issues.md
index 54c4ff94e5..c3357dd780 100644
--- a/.github/ISSUE_TEMPLATE/03-feature-request-issues.md
+++ b/.github/ISSUE_TEMPLATE/02-feature-request-issues.md
@@ -1,6 +1,6 @@
 ---
 name: Feature Request
-about: Features you would like to see in the game!
+about: Propose a feature you would like to see in the game!
 ---
 **Describe the new feature:** 
 

From f8f461a7a4b2c50edca8d0a2f3c9318d244394a9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Mar 2021 12:33:07 +0900
Subject: [PATCH 2033/3722] Include blurb in issue template to hopefully help
 people find existing reports

---
 .github/ISSUE_TEMPLATE/01-bug-issues.md | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/01-bug-issues.md b/.github/ISSUE_TEMPLATE/01-bug-issues.md
index 6050036cbf..e45893b97a 100644
--- a/.github/ISSUE_TEMPLATE/01-bug-issues.md
+++ b/.github/ISSUE_TEMPLATE/01-bug-issues.md
@@ -1,7 +1,18 @@
 ---
 name: Bug Report
-about: Issues regarding encountered bugs.
+about: Report a bug or crash to desktop
 ---
+
+<!--
+IMPORTANT: Your issue may already be reported.
+
+Please check:
+- Pinned issues, at the top of https://github.com/ppy/osu/issues
+- Current priority 0 issues at https://github.com/ppy/osu/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3Apriority%3A0
+- Search for your issue. If you find that it already exists, please respond with a reaction or add any further information that may be helpful.
+-->
+
+
 **Describe the bug:** 
 
 **Screenshots or videos showing encountered issue:** 
@@ -9,6 +20,7 @@ about: Issues regarding encountered bugs.
 **osu!lazer version:** 
 
 **Logs:**
+
 <!--
 *please attach logs here, which are located at:*
 - `%AppData%/osu/logs` *(on Windows),*

From e22650293dda921827d34f8beb49b12ea7ab04ca Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Mar 2021 13:35:42 +0900
Subject: [PATCH 2034/3722] Remove unnecessary second call to StripComments in
 skin parsing logic

---
 osu.Game/Skinning/LegacySkinDecoder.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Skinning/LegacySkinDecoder.cs b/osu.Game/Skinning/LegacySkinDecoder.cs
index 75b7ba28b9..2700f84815 100644
--- a/osu.Game/Skinning/LegacySkinDecoder.cs
+++ b/osu.Game/Skinning/LegacySkinDecoder.cs
@@ -17,8 +17,6 @@ namespace osu.Game.Skinning
         {
             if (section != Section.Colours)
             {
-                line = StripComments(line);
-
                 var pair = SplitKeyVal(line);
 
                 switch (section)

From 4f8edcd336c31694ad04c75d661f5c1873f0cf14 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Mar 2021 13:35:54 +0900
Subject: [PATCH 2035/3722] Don't strip comments from metadata during parsin

---
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index 10a716963e..b39890084f 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -36,7 +36,13 @@ namespace osu.Game.Beatmaps.Formats
                 if (ShouldSkipLine(line))
                     continue;
 
-                line = StripComments(line).TrimEnd();
+                if (section != Section.Metadata)
+                {
+                    // comments should not be stripped from metadata lines, as the song metadata may contain "//" as valid data.
+                    line = StripComments(line);
+                }
+
+                line = line.TrimEnd();
 
                 if (line.StartsWith('[') && line.EndsWith(']'))
                 {

From 4269cb7124804eae7364a6efccf0f33c2265912d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Mar 2021 13:48:41 +0900
Subject: [PATCH 2036/3722] Extract majority of token retrieval code out of
 LoadComponentAsync for legibility

---
 osu.Game/Screens/Play/SubmittingPlayer.cs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index 87a4eb5efe..d22199447d 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -32,6 +32,13 @@ namespace osu.Game.Screens.Play
         }
 
         protected override void LoadAsyncComplete()
+        {
+            if (!handleTokenRetrieval()) return;
+
+            base.LoadAsyncComplete();
+        }
+
+        private bool handleTokenRetrieval()
         {
             // Token request construction should happen post-load to allow derived classes to potentially prepare DI backings that are used to create the request.
             var tcs = new TaskCompletionSource<bool>();
@@ -39,7 +46,7 @@ namespace osu.Game.Screens.Play
             if (!api.IsLoggedIn)
             {
                 handleTokenFailure(new InvalidOperationException("API is not online."));
-                return;
+                return false;
             }
 
             var req = CreateTokenRequest();
@@ -47,7 +54,7 @@ namespace osu.Game.Screens.Play
             if (req == null)
             {
                 handleTokenFailure(new InvalidOperationException("Request could not be constructed."));
-                return;
+                return false;
             }
 
             req.Success += r =>
@@ -60,8 +67,7 @@ namespace osu.Game.Screens.Play
             api.Queue(req);
 
             tcs.Task.Wait();
-
-            base.LoadAsyncComplete();
+            return true;
 
             void handleTokenFailure(Exception exception)
             {

From 0324bfa857efcc4ac3b4b019e41da300d6e92edd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Mar 2021 14:14:38 +0900
Subject: [PATCH 2037/3722] Change checks back to `Contains`

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

diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index dfc2981c6f..ac4d63159a 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -104,7 +104,7 @@ namespace osu.Game.Skinning
         protected override string ComputeHash(SkinInfo item, ArchiveReader reader = null)
         {
             // we need to populate early to create a hash based off skin.ini contents
-            if (item.Name?.EndsWith(".osk", StringComparison.OrdinalIgnoreCase) == true)
+            if (item.Name?.Contains(".osk", StringComparison.OrdinalIgnoreCase) == true)
                 populateMetadata(item);
 
             if (item.Creator != null && item.Creator != unknown_creator_string)
@@ -122,7 +122,7 @@ namespace osu.Game.Skinning
         {
             await base.Populate(model, archive, cancellationToken).ConfigureAwait(false);
 
-            if (model.Name?.EndsWith(".osk", StringComparison.OrdinalIgnoreCase) == true)
+            if (model.Name?.Contains(".osk", StringComparison.OrdinalIgnoreCase) == true)
                 populateMetadata(model);
         }
 

From 7b3336783fb3e4864680fa69d2ea8240d3ac93b1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Mar 2021 15:24:59 +0900
Subject: [PATCH 2038/3722] Stabilise ordering instead of simple reversing
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>
---
 .../Compose/Components/Timeline/TimelineBlueprintContainer.cs  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index 3526f264a7..09da613a04 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -138,8 +138,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             Stack<double> currentConcurrentObjects = new Stack<double>();
 
-            // Reversing is done to enumerate in order of increasing StartTime.
-            foreach (var b in SelectionBlueprints.Reverse())
+            foreach (var b in SelectionBlueprints.OrderBy(b => b.HitObject.StartTime).ThenBy(b => b.HitObject.GetEndTime()))
             {
                 while (currentConcurrentObjects.TryPeek(out double stackEndTime))
                 {

From 9fdd23b134744140c66a5e8595fb1d655c038f83 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Mar 2021 16:28:30 +0900
Subject: [PATCH 2039/3722] Fix various issues with stacking

---
 .../Timeline/TimelineBlueprintContainer.cs    | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index 09da613a04..cec851b5bb 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -136,41 +136,42 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             // after the stack gets this tall, we can presume there is space underneath to draw subsequent blueprints.
             const int stack_reset_count = 3;
 
-            Stack<double> currentConcurrentObjects = new Stack<double>();
+            Stack<HitObject> currentConcurrentObjects = new Stack<HitObject>();
 
             foreach (var b in SelectionBlueprints.OrderBy(b => b.HitObject.StartTime).ThenBy(b => b.HitObject.GetEndTime()))
             {
-                while (currentConcurrentObjects.TryPeek(out double stackEndTime))
+                // remove objects from the stack as long as their end time is in the past.
+                while (currentConcurrentObjects.TryPeek(out HitObject hitObject))
                 {
-                    if (Precision.AlmostBigger(stackEndTime, b.HitObject.StartTime, 1))
+                    if (Precision.AlmostBigger(hitObject.GetEndTime(), b.HitObject.StartTime, 1))
                         break;
 
                     currentConcurrentObjects.Pop();
                 }
 
-                b.Y = -(stack_offset * currentConcurrentObjects.Count);
-
-                var bEndTime = b.HitObject.GetEndTime();
-
                 // if the stack gets too high, we should have space below it to display the next batch of objects.
                 // importantly, we only do this if time has incremented, else a stack of hitobjects all at the same time value would start to overlap themselves.
-                if (!currentConcurrentObjects.TryPeek(out double nextStackEndTime) ||
-                    !Precision.AlmostEquals(nextStackEndTime, bEndTime, 1))
+                if (currentConcurrentObjects.TryPeek(out HitObject h) && !Precision.AlmostEquals(h.StartTime, b.HitObject.StartTime, 1))
                 {
                     if (currentConcurrentObjects.Count >= stack_reset_count)
                         currentConcurrentObjects.Clear();
                 }
 
-                currentConcurrentObjects.Push(bEndTime);
+                b.Y = -(stack_offset * currentConcurrentObjects.Count);
+
+                currentConcurrentObjects.Push(b.HitObject);
             }
         }
 
         protected override SelectionHandler CreateSelectionHandler() => new TimelineSelectionHandler();
 
-        protected override SelectionBlueprint CreateBlueprintFor(HitObject hitObject) => new TimelineHitObjectBlueprint(hitObject)
+        protected override SelectionBlueprint CreateBlueprintFor(HitObject hitObject)
         {
-            OnDragHandled = handleScrollViaDrag
-        };
+            return new TimelineHitObjectBlueprint(hitObject)
+            {
+                OnDragHandled = handleScrollViaDrag
+            };
+        }
 
         protected override DragBox CreateDragBox(Action<RectangleF> performSelect) => new TimelineDragBox(performSelect);
 

From 8d4ff867bfe7000b08e0abbe0966a1aa9045a72e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Mar 2021 16:30:31 +0900
Subject: [PATCH 2040/3722] Fix barlines showing up in the osu!mania editor's
 timeline

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

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 7def7e1d16..5699be4560 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -268,6 +268,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private void addBlueprintFor(HitObject hitObject)
         {
+            if (hitObject is IBarLine)
+                return;
+
             if (blueprintMap.ContainsKey(hitObject))
                 return;
 

From 013ddc734c09c110b9590b71cd1f04aa1a5bf021 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Mar 2021 17:04:35 +0900
Subject: [PATCH 2041/3722] Fix osu!catch fruit showing on plate when hidden
 mod is enabled

Closes https://github.com/ppy/osu/issues/12065.
---
 osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs | 13 ++++++++++++-
 osu.Game.Rulesets.Catch/UI/Catcher.cs          |  5 +++--
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs      |  7 ++++++-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs b/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
index 4b008d2734..5c5e41234d 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
@@ -3,13 +3,16 @@
 
 using System.Linq;
 using osu.Framework.Graphics;
+using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
+using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Catch.Mods
 {
-    public class CatchModHidden : ModHidden
+    public class CatchModHidden : ModHidden, IApplicableToDrawableRuleset<CatchHitObject>
     {
         public override string Description => @"Play with fading fruits.";
         public override double ScoreMultiplier => 1.06;
@@ -17,6 +20,14 @@ namespace osu.Game.Rulesets.Catch.Mods
         private const double fade_out_offset_multiplier = 0.6;
         private const double fade_out_duration_multiplier = 0.44;
 
+        public void ApplyToDrawableRuleset(DrawableRuleset<CatchHitObject> drawableRuleset)
+        {
+            var drawableCatchRuleset = (DrawableCatchRuleset)drawableRuleset;
+            var catchPlayfield = (CatchPlayfield)drawableCatchRuleset.Playfield;
+
+            catchPlayfield.CatcherArea.CatchFruitOnPlate = false;
+        }
+
         protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
         {
             base.ApplyNormalVisibilityState(hitObject, state);
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index ed875e7002..42be745c2e 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -223,7 +223,7 @@ namespace osu.Game.Rulesets.Catch.UI
                    catchObjectPosition <= catcherPosition + halfCatchWidth;
         }
 
-        public void OnNewResult(DrawableCatchHitObject drawableObject, JudgementResult result)
+        public void OnNewResult(DrawableCatchHitObject drawableObject, JudgementResult result, bool placeOnPlate)
         {
             var catchResult = (CatchJudgementResult)result;
             catchResult.CatcherAnimationState = CurrentState;
@@ -237,7 +237,8 @@ namespace osu.Game.Rulesets.Catch.UI
             {
                 var positionInStack = computePositionInStack(new Vector2(palpableObject.X - X, 0), palpableObject.DisplaySize.X / 2);
 
-                placeCaughtObject(palpableObject, positionInStack);
+                if (placeOnPlate)
+                    placeCaughtObject(palpableObject, positionInStack);
 
                 if (hitLighting.Value)
                     addLighting(hitObject, positionInStack.X, drawableObject.AccentColour.Value);
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index 44adbd5512..29c95ec61c 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -21,6 +21,11 @@ namespace osu.Game.Rulesets.Catch.UI
         public readonly Catcher MovableCatcher;
         private readonly CatchComboDisplay comboDisplay;
 
+        /// <summary>
+        /// Whether <see cref="DrawablePalpableCatchHitObject"/> fruit should appear on the plate.
+        /// </summary>
+        public bool CatchFruitOnPlate { get; set; } = true;
+
         public CatcherArea(Container<CaughtObject> droppedObjectContainer, BeatmapDifficulty difficulty = null)
         {
             Size = new Vector2(CatchPlayfield.WIDTH, CATCHER_SIZE);
@@ -41,7 +46,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public void OnNewResult(DrawableCatchHitObject hitObject, JudgementResult result)
         {
-            MovableCatcher.OnNewResult(hitObject, result);
+            MovableCatcher.OnNewResult(hitObject, result, CatchFruitOnPlate);
 
             if (!result.Type.IsScorable())
                 return;

From 6808719efabe9cd5997e51f916ecd9f56535b1f5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Mar 2021 17:05:28 +0900
Subject: [PATCH 2042/3722] Update test scene

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

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index 48efd73222..ddb6194899 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -242,7 +242,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             Add(drawableObject);
             drawableObject.OnLoadComplete += _ =>
             {
-                catcher.OnNewResult(drawableObject, result);
+                catcher.OnNewResult(drawableObject, result, true);
                 drawableObject.Expire();
             };
         }

From cb4ae6e61a87745a3204baa7459c5f895dc5b9e1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Mar 2021 17:34:29 +0900
Subject: [PATCH 2043/3722] Fix very high accuracies feigning as "perfect" 100%
 plays when actually below

---
 osu.Game/Users/UserStatistics.cs |  2 +-
 osu.Game/Utils/FormatUtils.cs    | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Users/UserStatistics.cs b/osu.Game/Users/UserStatistics.cs
index dc926898fc..04a358436e 100644
--- a/osu.Game/Users/UserStatistics.cs
+++ b/osu.Game/Users/UserStatistics.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Users
         public long RankedScore;
 
         [JsonProperty(@"hit_accuracy")]
-        public decimal Accuracy;
+        public double Accuracy;
 
         [JsonIgnore]
         public string DisplayAccuracy => Accuracy.FormatAccuracy();
diff --git a/osu.Game/Utils/FormatUtils.cs b/osu.Game/Utils/FormatUtils.cs
index 2578d8d835..70a96367be 100644
--- a/osu.Game/Utils/FormatUtils.cs
+++ b/osu.Game/Utils/FormatUtils.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 Humanizer;
 
 namespace osu.Game.Utils
@@ -12,14 +13,14 @@ namespace osu.Game.Utils
         /// </summary>
         /// <param name="accuracy">The accuracy to be formatted</param>
         /// <returns>formatted accuracy in percentage</returns>
-        public static string FormatAccuracy(this double accuracy) => $"{accuracy:0.00%}";
+        public static string FormatAccuracy(this double accuracy)
+        {
+            // we don't ever want to show 100% when the accuracy is below perfect, even if it rounds to 100%.
+            if (accuracy < 1 && accuracy > 0.9999)
+                accuracy = 0.9999;
 
-        /// <summary>
-        /// Turns the provided accuracy into a percentage with 2 decimal places.
-        /// </summary>
-        /// <param name="accuracy">The accuracy to be formatted</param>
-        /// <returns>formatted accuracy in percentage</returns>
-        public static string FormatAccuracy(this decimal accuracy) => $"{accuracy:0.00}%";
+            return $"{accuracy:0.00%}";
+        }
 
         /// <summary>
         /// Formats the supplied rank/leaderboard position in a consistent, simplified way.

From 544117a49495a97c297f0253b0fcfa1725b9ce74 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Mar 2021 17:34:41 +0900
Subject: [PATCH 2044/3722] Add test coverage of accuracy formatting function

---
 osu.Game.Tests/NonVisual/FormatUtilsTest.cs | 25 +++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 osu.Game.Tests/NonVisual/FormatUtilsTest.cs

diff --git a/osu.Game.Tests/NonVisual/FormatUtilsTest.cs b/osu.Game.Tests/NonVisual/FormatUtilsTest.cs
new file mode 100644
index 0000000000..eb738f5f67
--- /dev/null
+++ b/osu.Game.Tests/NonVisual/FormatUtilsTest.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 NUnit.Framework;
+using osu.Game.Utils;
+
+namespace osu.Game.Tests.NonVisual
+{
+    [TestFixture]
+    public class FormatUtilsTest
+    {
+        [TestCase(0, "0.00%")]
+        [TestCase(0.01, "1.00%")]
+        [TestCase(0.9899, "98.99%")]
+        [TestCase(0.989999, "99.00%")]
+        [TestCase(0.99, "99.00%")]
+        [TestCase(0.9999, "99.99%")]
+        [TestCase(0.999999, "99.99%")]
+        [TestCase(1, "100.00%")]
+        public void TestAccuracyFormatting(double input, string expectedOutput)
+        {
+            Assert.AreEqual(expectedOutput, input.FormatAccuracy());
+        }
+    }
+}

From 701342e03673b4e9d647484a4193418fbf64d107 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Mar 2021 17:43:51 +0900
Subject: [PATCH 2045/3722] Remove accuracy rounding at a ScoreProcessor level

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

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 2024290460..b81fa79345 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -337,7 +337,7 @@ namespace osu.Game.Rulesets.Scoring
             score.TotalScore = (long)Math.Round(GetStandardisedScore());
             score.Combo = Combo.Value;
             score.MaxCombo = HighestCombo.Value;
-            score.Accuracy = Math.Round(Accuracy.Value, 4);
+            score.Accuracy = Accuracy.Value;
             score.Rank = Rank.Value;
             score.Date = DateTimeOffset.Now;
 

From 630faa3b56e5a3b36577c695f906d006088e61e3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Mar 2021 17:50:21 +0900
Subject: [PATCH 2046/3722] Add TODO marking incorrect EF core data type

As mentioned in the comment, we probably don't need to be storing this
in the database in the first place (as it should be able to be
calculated from the other statistics we have available to us). Something
to consider when we refactor the database backend.
---
 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 f5192f3a40..ef11c19e3f 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Scoring
         public long TotalScore { get; set; }
 
         [JsonProperty("accuracy")]
-        [Column(TypeName = "DECIMAL(1,4)")]
+        [Column(TypeName = "DECIMAL(1,4)")] // TODO: This data type is wrong (should contain more precision). But at the same time, we probably don't need to be storing this in the database.
         public double Accuracy { get; set; }
 
         [JsonIgnore]

From 77888ae6402c669a0f6330d698b6794bc9ff5539 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Mar 2021 17:51:20 +0900
Subject: [PATCH 2047/3722] Remove unnecessary using

---
 osu.Game/Utils/FormatUtils.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Utils/FormatUtils.cs b/osu.Game/Utils/FormatUtils.cs
index 70a96367be..4c7702f04e 100644
--- a/osu.Game/Utils/FormatUtils.cs
+++ b/osu.Game/Utils/FormatUtils.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 Humanizer;
 
 namespace osu.Game.Utils

From b4bccc19baaddaaa2c3f643da5ff15eb822b9c7d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Mar 2021 18:37:13 +0900
Subject: [PATCH 2048/3722] Refactor LegacySpriteText initialisation

---
 .../Skinning/Legacy/LegacySpinner.cs           | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index 6d4fbd7445..dd1c6cad77 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -76,18 +76,18 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 }
             });
 
-            bonusCounter = (LegacySpriteText)source.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText));
+            bonusCounter = (source.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText)) as LegacySpriteText)?.With(c =>
+            {
+                c.Alpha = 0f;
+                c.Anchor = Anchor.TopCentre;
+                c.Origin = Anchor.Centre;
+                c.Font = c.Font.With(fixedWidth: false);
+                c.Scale = new Vector2(SPRITE_SCALE);
+                c.Y = SPINNER_TOP_OFFSET + 299;
+            });
 
             if (bonusCounter != null)
-            {
-                bonusCounter.Alpha = 0f;
-                bonusCounter.Anchor = Anchor.TopCentre;
-                bonusCounter.Origin = Anchor.Centre;
-                bonusCounter.Font = bonusCounter.Font.With(fixedWidth: false);
-                bonusCounter.Scale = new Vector2(SPRITE_SCALE);
-                bonusCounter.Y = SPINNER_TOP_OFFSET + 299;
                 overlayContainer.Add(bonusCounter);
-            }
         }
 
         private IBindable<double> gainedBonus;

From f6647de7693de11ad68b8316eb17483bd9bb3126 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Mar 2021 19:56:26 +0900
Subject: [PATCH 2049/3722] Add support for nudging objects in the editor using
 ctrl+arrow keys

Closes #12042.
---
 .../Components/ComposeBlueprintContainer.cs   | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 79f457c050..5ab557804e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input;
+using osu.Framework.Input.Events;
 using osu.Game.Audio;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
@@ -19,6 +20,7 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Screens.Edit.Components.TernaryButtons;
 using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Screens.Edit.Compose.Components
 {
@@ -70,6 +72,50 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
         }
 
+        protected override bool OnKeyDown(KeyDownEvent e)
+        {
+            if (e.ControlPressed)
+            {
+                switch (e.Key)
+                {
+                    case Key.Left:
+                        moveSelection(new Vector2(-1, 0));
+                        return true;
+
+                    case Key.Right:
+                        moveSelection(new Vector2(1, 0));
+                        return true;
+
+                    case Key.Up:
+                        moveSelection(new Vector2(0, -1));
+                        return true;
+
+                    case Key.Down:
+                        moveSelection(new Vector2(0, 1));
+                        return true;
+                }
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Move the current selection spatially by the specified delta, in gamefield coordinates (ie. the same coordinates as the blueprints).
+        /// </summary>
+        /// <param name="delta"></param>
+        private void moveSelection(Vector2 delta)
+        {
+            var firstBlueprint = SelectionHandler.SelectedBlueprints.FirstOrDefault();
+
+            if (firstBlueprint == null)
+                return;
+
+            // convert to game space coordinates
+            delta = firstBlueprint.ToScreenSpace(delta) - firstBlueprint.ToScreenSpace(Vector2.Zero);
+
+            SelectionHandler.HandleMovement(new MoveSelectionEvent(firstBlueprint, firstBlueprint.ScreenSpaceSelectionPoint + delta));
+        }
+
         private void updatePlacementNewCombo()
         {
             if (currentPlacement?.HitObject is IHasComboInformation c)

From bada1e7189973f09452ad51419abbb79650f9972 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 25 Mar 2021 15:00:06 +0300
Subject: [PATCH 2050/3722] Update legacy spinner bonus counter usage

---
 .../Skinning/Legacy/LegacySpinner.cs          | 40 +++++++------------
 1 file changed, 15 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index dd1c6cad77..064b7a4680 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -48,9 +48,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
             DrawableSpinner = (DrawableSpinner)drawableHitObject;
 
-            Container overlayContainer;
-
-            AddInternal(overlayContainer = new Container
+            AddInternal(new Container
             {
                 Depth = float.MinValue,
                 RelativeSizeAxes = Axes.Both,
@@ -73,21 +71,16 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         Scale = new Vector2(SPRITE_SCALE),
                         Y = SPINNER_TOP_OFFSET + 115,
                     },
+                    bonusCounter = new LegacySpriteText(source, LegacyFont.Score)
+                    {
+                        Alpha = 0f,
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.Centre,
+                        Scale = new Vector2(SPRITE_SCALE),
+                        Y = SPINNER_TOP_OFFSET + 299,
+                    }.With(s => s.Font = s.Font.With(fixedWidth: false)),
                 }
             });
-
-            bonusCounter = (source.GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreText)) as LegacySpriteText)?.With(c =>
-            {
-                c.Alpha = 0f;
-                c.Anchor = Anchor.TopCentre;
-                c.Origin = Anchor.Centre;
-                c.Font = c.Font.With(fixedWidth: false);
-                c.Scale = new Vector2(SPRITE_SCALE);
-                c.Y = SPINNER_TOP_OFFSET + 299;
-            });
-
-            if (bonusCounter != null)
-                overlayContainer.Add(bonusCounter);
         }
 
         private IBindable<double> gainedBonus;
@@ -98,16 +91,13 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         {
             base.LoadComplete();
 
-            if (bonusCounter != null)
+            gainedBonus = DrawableSpinner.GainedBonus.GetBoundCopy();
+            gainedBonus.BindValueChanged(bonus =>
             {
-                gainedBonus = DrawableSpinner.GainedBonus.GetBoundCopy();
-                gainedBonus.BindValueChanged(bonus =>
-                {
-                    bonusCounter.Text = bonus.NewValue.ToString(NumberFormatInfo.InvariantInfo);
-                    bonusCounter.FadeOutFromOne(800, Easing.Out);
-                    bonusCounter.ScaleTo(SPRITE_SCALE * 2f).Then().ScaleTo(SPRITE_SCALE * 1.28f, 800, Easing.Out);
-                });
-            }
+                bonusCounter.Text = bonus.NewValue.ToString(NumberFormatInfo.InvariantInfo);
+                bonusCounter.FadeOutFromOne(800, Easing.Out);
+                bonusCounter.ScaleTo(SPRITE_SCALE * 2f).Then().ScaleTo(SPRITE_SCALE * 1.28f, 800, Easing.Out);
+            });
 
             completed.BindValueChanged(onCompletedChanged, true);
 

From ce9130ca5065f4278af498e3949049c03d43dbbe Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 25 Mar 2021 17:38:55 +0100
Subject: [PATCH 2051/3722] Remove determinant limit

This has since been added into the framework through https://github.com/ppy/osu-framework/pull/4302
---
 .../Components/PathControlPointVisualiser.cs  | 39 +------------------
 1 file changed, 1 insertion(+), 38 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 0270485f31..348ec30266 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -158,48 +158,11 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                     continue;
 
                 Vector2[] points = slider.Path.PointsInSegment(segmentStartPoint).Select(p => p.Position.Value).ToArray();
-                if (points.Length == 3 && !validCircularArcSegment(points))
+                if (points.Length == 3 && circularArcBoundingBox(points).Area >= 640 * 480)
                     segmentStartPoint.Type.Value = PathType.Bezier;
             }
         }
 
-        /// <summary>
-        /// Returns whether the given points are arranged in a valid way. Invalid if points
-        /// are almost entirely linear - as this causes the radius to approach infinity,
-        /// or if the bounding box of the arc is too large.
-        /// </summary>
-        /// <param name="points">The three points that make up this circular arc segment.</param>
-        /// <returns></returns>
-        private bool validCircularArcSegment(IReadOnlyList<Vector2> points)
-        {
-            float det = circularArcDeterminant(points);
-            RectangleF boundingBox = circularArcBoundingBox(points);
-
-            // Determinant limit prevents memory exhaustion as a result of approximating the subpath.
-            // Bounding box area limit prevents memory exhaustion as a result of drawing the texture.
-            return Math.Abs(det) > 0.001f && boundingBox.Area < 640 * 480;
-        }
-
-        /// <summary>
-        /// Computes the determinant of the circular arc segment defined by the given points.
-        /// </summary>
-        /// <param name="points">The three points defining the circular arc.</param>
-        /// <returns></returns>
-        private float circularArcDeterminant(IReadOnlyList<Vector2> points)
-        {
-            Vector2 a = points[0];
-            Vector2 b = points[1];
-            Vector2 c = points[2];
-
-            float maxLength = points.Max(p => p.Length);
-
-            Vector2 normA = new Vector2(a.X / maxLength, a.Y / maxLength);
-            Vector2 normB = new Vector2(b.X / maxLength, b.Y / maxLength);
-            Vector2 normC = new Vector2(c.X / maxLength, c.Y / maxLength);
-
-            return (normA.X - normB.X) * (normB.Y - normC.Y) - (normB.X - normC.X) * (normA.Y - normB.Y);
-        }
-
         /// <summary>
         /// Computes the bounding box of the circular arc segment defined by the given points.
         /// </summary>

From aa2c1ee85ed80ff380b8868606a12169dcbfe758 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20H=C3=BCbner?= <maxshuebner@gmail.com>
Date: Thu, 25 Mar 2021 23:20:10 +0100
Subject: [PATCH 2052/3722] Add new beatmap search filter row "General"

---
 .../API/Requests/SearchBeatmapSetsRequest.cs  |  8 ++++++++
 .../BeatmapListingFilterControl.cs            |  2 ++
 .../BeatmapListingSearchControl.cs            |  4 ++++
 .../Overlays/BeatmapListing/SearchGeneral.cs  | 19 +++++++++++++++++++
 4 files changed, 33 insertions(+)
 create mode 100644 osu.Game/Overlays/BeatmapListing/SearchGeneral.cs

diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index 5360d36f3d..f1cb02fb10 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
@@ -15,6 +15,9 @@ namespace osu.Game.Online.API.Requests
 {
     public class SearchBeatmapSetsRequest : APIRequest<SearchBeatmapSetsResponse>
     {
+        [CanBeNull]
+        public IReadOnlyCollection<SearchGeneral> General { get; }
+
         public SearchCategory SearchCategory { get; }
 
         public SortCriteria SortCriteria { get; }
@@ -45,6 +48,7 @@ namespace osu.Game.Online.API.Requests
             string query,
             RulesetInfo ruleset,
             Cursor cursor = null,
+            IReadOnlyCollection<SearchGeneral> general = null,
             SearchCategory searchCategory = SearchCategory.Any,
             SortCriteria sortCriteria = SortCriteria.Ranked,
             SortDirection sortDirection = SortDirection.Descending,
@@ -59,6 +63,7 @@ namespace osu.Game.Online.API.Requests
             this.ruleset = ruleset;
             this.cursor = cursor;
 
+            General = general;
             SearchCategory = searchCategory;
             SortCriteria = sortCriteria;
             SortDirection = sortDirection;
@@ -75,6 +80,9 @@ namespace osu.Game.Online.API.Requests
             var req = base.CreateWebRequest();
             req.AddParameter("q", query);
 
+            if (General != null && General.Any())
+                req.AddParameter("c", string.Join('.', General.Select(e => e.ToString().ToLowerInvariant())));
+
             if (ruleset.ID.HasValue)
                 req.AddParameter("m", ruleset.ID.Value.ToString());
 
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
index bcc5a91677..1935a250b7 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
@@ -134,6 +134,7 @@ namespace osu.Game.Overlays.BeatmapListing
                 queueUpdateSearch(true);
             });
 
+            searchControl.General.CollectionChanged += (_, __) => queueUpdateSearch();
             searchControl.Ruleset.BindValueChanged(_ => queueUpdateSearch());
             searchControl.Category.BindValueChanged(_ => queueUpdateSearch());
             searchControl.Genre.BindValueChanged(_ => queueUpdateSearch());
@@ -187,6 +188,7 @@ namespace osu.Game.Overlays.BeatmapListing
                 searchControl.Query.Value,
                 searchControl.Ruleset.Value,
                 lastResponse?.Cursor,
+                searchControl.General,
                 searchControl.Category.Value,
                 sortControl.Current.Value,
                 sortControl.SortDirection.Value,
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
index b138a5ac52..1576431d40 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
@@ -29,6 +29,8 @@ namespace osu.Game.Overlays.BeatmapListing
 
         public Bindable<string> Query => textBox.Current;
 
+        public BindableList<SearchGeneral> General => generalFilter.Current;
+
         public Bindable<RulesetInfo> Ruleset => modeFilter.Current;
 
         public Bindable<SearchCategory> Category => categoryFilter.Current;
@@ -61,6 +63,7 @@ namespace osu.Game.Overlays.BeatmapListing
         }
 
         private readonly BeatmapSearchTextBox textBox;
+        private readonly BeatmapSearchMultipleSelectionFilterRow<SearchGeneral> generalFilter;
         private readonly BeatmapSearchRulesetFilterRow modeFilter;
         private readonly BeatmapSearchFilterRow<SearchCategory> categoryFilter;
         private readonly BeatmapSearchFilterRow<SearchGenre> genreFilter;
@@ -123,6 +126,7 @@ namespace osu.Game.Overlays.BeatmapListing
                                 Padding = new MarginPadding { Horizontal = 10 },
                                 Children = new Drawable[]
                                 {
+                                    generalFilter = new BeatmapSearchMultipleSelectionFilterRow<SearchGeneral>(@"General"),
                                     modeFilter = new BeatmapSearchRulesetFilterRow(),
                                     categoryFilter = new BeatmapSearchFilterRow<SearchCategory>(@"Categories"),
                                     genreFilter = new BeatmapSearchFilterRow<SearchGenre>(@"Genre"),
diff --git a/osu.Game/Overlays/BeatmapListing/SearchGeneral.cs b/osu.Game/Overlays/BeatmapListing/SearchGeneral.cs
new file mode 100644
index 0000000000..175942c626
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListing/SearchGeneral.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.ComponentModel;
+
+namespace osu.Game.Overlays.BeatmapListing
+{
+    public enum SearchGeneral
+    {
+        [Description("Recommended difficulty")]
+        Recommended,
+
+        [Description("Include converted beatmaps")]
+        Converts,
+
+        [Description("Subscribed mappers")]
+        Follows
+    }
+}

From 558f8fa51e2480b0db48dfa5285541992b7c5414 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20H=C3=BCbner?= <maxshuebner@gmail.com>
Date: Thu, 25 Mar 2021 23:20:26 +0100
Subject: [PATCH 2053/3722] Adjust testscene

---
 .../UserInterface/TestSceneBeatmapListingSearchControl.cs      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
index 9602758ffc..abd1baf0ac 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchControl.cs
@@ -34,6 +34,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         public void SetUp() => Schedule(() =>
         {
             OsuSpriteText query;
+            OsuSpriteText general;
             OsuSpriteText ruleset;
             OsuSpriteText category;
             OsuSpriteText genre;
@@ -58,6 +59,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                     Children = new Drawable[]
                     {
                         query = new OsuSpriteText(),
+                        general = new OsuSpriteText(),
                         ruleset = new OsuSpriteText(),
                         category = new OsuSpriteText(),
                         genre = new OsuSpriteText(),
@@ -71,6 +73,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             };
 
             control.Query.BindValueChanged(q => query.Text = $"Query: {q.NewValue}", true);
+            control.General.BindCollectionChanged((u, v) => general.Text = $"General: {(control.General.Any() ? string.Join('.', control.General.Select(i => i.ToString().ToLowerInvariant())) : "")}", true);
             control.Ruleset.BindValueChanged(r => ruleset.Text = $"Ruleset: {r.NewValue}", true);
             control.Category.BindValueChanged(c => category.Text = $"Category: {c.NewValue}", true);
             control.Genre.BindValueChanged(g => genre.Text = $"Genre: {g.NewValue}", true);

From 1c1af981443df917fe27ace265c41c9f6a515760 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 26 Mar 2021 11:47:41 +0900
Subject: [PATCH 2054/3722] Update values

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

diff --git a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
index ab9b7f4847..afd94f4570 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
@@ -20,8 +20,8 @@ namespace osu.Game.Rulesets.Osu.Tests
         public void Test(double expected, string name)
             => base.Test(expected, name);
 
-        [TestCase(8.7212283220504574d, "diffcalc-test")]
-        [TestCase(1.3212137310562277d, "zero-length-sliders")]
+        [TestCase(8.7212283220412345d, "diffcalc-test")]
+        [TestCase(1.3212137158641493d, "zero-length-sliders")]
         public void TestClockRateAdjusted(double expected, string name)
             => Test(expected, name, new OsuModDoubleTime());
 

From 51f0477df4744b6702dff18740974e3a17913be3 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Fri, 26 Mar 2021 04:42:46 +0100
Subject: [PATCH 2055/3722] Move bounding box logic to framework

---
 .../Components/PathControlPointVisualiser.cs  | 81 +------------------
 1 file changed, 4 insertions(+), 77 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 348ec30266..dd39014bb6 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -16,6 +16,7 @@ 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.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
@@ -157,87 +158,13 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                 if (segmentStartPoint.Type.Value != PathType.PerfectCurve)
                     continue;
 
-                Vector2[] points = slider.Path.PointsInSegment(segmentStartPoint).Select(p => p.Position.Value).ToArray();
-                if (points.Length == 3 && circularArcBoundingBox(points).Area >= 640 * 480)
+                ReadOnlySpan<Vector2> points = slider.Path.PointsInSegment(segmentStartPoint).Select(p => p.Position.Value).ToArray();
+                RectangleF boundingBox = PathApproximator.CircularArcBoundingBox(points);
+                if (points.Length == 3 && boundingBox.Area >= 640 * 480)
                     segmentStartPoint.Type.Value = PathType.Bezier;
             }
         }
 
-        /// <summary>
-        /// Computes the bounding box of the circular arc segment defined by the given points.
-        /// </summary>
-        /// <param name="points">The three points defining the circular arc.</param>
-        /// <returns></returns>
-        private RectangleF circularArcBoundingBox(IReadOnlyList<Vector2> points)
-        {
-            Vector2 a = points[0];
-            Vector2 b = points[1];
-            Vector2 c = points[2];
-
-            // See: https://en.wikipedia.org/wiki/Circumscribed_circle#Cartesian_coordinates_2
-            float d = 2 * (a.X * (b - c).Y + b.X * (c - a).Y + c.X * (a - b).Y);
-            float aSq = a.LengthSquared;
-            float bSq = b.LengthSquared;
-            float cSq = c.LengthSquared;
-
-            Vector2 center = new Vector2(
-                aSq * (b - c).Y + bSq * (c - a).Y + cSq * (a - b).Y,
-                aSq * (c - b).X + bSq * (a - c).X + cSq * (b - a).X) / d;
-
-            Vector2 dA = a - center;
-            Vector2 dC = c - center;
-
-            float r = dA.Length;
-
-            double thetaStart = Math.Atan2(dA.Y, dA.X);
-            double thetaEnd = Math.Atan2(dC.Y, dC.X);
-
-            while (thetaEnd < thetaStart)
-                thetaEnd += 2 * Math.PI;
-
-            // Decide in which direction to draw the circle, depending on which side of
-            // AC B lies.
-            Vector2 orthoAtoC = c - a;
-            orthoAtoC = new Vector2(orthoAtoC.Y, -orthoAtoC.X);
-            bool clockwise = Vector2.Dot(orthoAtoC, b - a) >= 0;
-
-            if (clockwise)
-            {
-                if (thetaEnd < thetaStart)
-                    thetaEnd += Math.PI * 2;
-            }
-            else
-            {
-                if (thetaStart < thetaEnd)
-                    thetaStart += Math.PI * 2;
-            }
-
-            List<Vector2> boundingBoxPoints = new List<Vector2>(points);
-
-            bool includes0Degrees = 0 > thetaStart && 0 < thetaEnd;
-            bool includes90Degrees = Math.PI / 2 > thetaStart && Math.PI / 2 < thetaEnd;
-            bool includes180Degrees = Math.PI > thetaStart && Math.PI < thetaEnd;
-            bool includes270Degrees = Math.PI * 1.5f > thetaStart && Math.PI * 1.5f < thetaEnd;
-
-            if (!clockwise)
-            {
-                includes0Degrees = 0 < thetaStart && 0 > thetaEnd;
-                includes90Degrees = Math.PI / 2 < thetaStart && Math.PI / 2 > thetaEnd;
-                includes180Degrees = Math.PI < thetaStart && Math.PI > thetaEnd;
-                includes270Degrees = Math.PI * 1.5f < thetaStart && Math.PI * 1.5f > thetaEnd;
-            }
-
-            if (includes0Degrees) boundingBoxPoints.Add(center + new Vector2(1, 0) * r);
-            if (includes90Degrees) boundingBoxPoints.Add(center + new Vector2(0, 1) * r);
-            if (includes180Degrees) boundingBoxPoints.Add(center + new Vector2(-1, 0) * r);
-            if (includes270Degrees) boundingBoxPoints.Add(center + new Vector2(0, -1) * r);
-
-            float width = Math.Abs(boundingBoxPoints.Max(p => p.X) - boundingBoxPoints.Min(p => p.X));
-            float height = Math.Abs(boundingBoxPoints.Max(p => p.Y) - boundingBoxPoints.Min(p => p.Y));
-
-            return new RectangleF(slider.Position, new Vector2(width, height));
-        }
-
         private void selectPiece(PathControlPointPiece piece, MouseButtonEvent e)
         {
             if (e.Button == MouseButton.Left && inputManager.CurrentState.Keyboard.ControlPressed)

From 6a7f9261684602ab3b4633839a1bea1e0acd035c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 Mar 2021 13:06:30 +0900
Subject: [PATCH 2056/3722] Change rounding to use a more general flooring
 approach

---
 osu.Game.Tests/NonVisual/FormatUtilsTest.cs | 2 +-
 osu.Game/Utils/FormatUtils.cs               | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/FormatUtilsTest.cs b/osu.Game.Tests/NonVisual/FormatUtilsTest.cs
index eb738f5f67..46d8f4fec4 100644
--- a/osu.Game.Tests/NonVisual/FormatUtilsTest.cs
+++ b/osu.Game.Tests/NonVisual/FormatUtilsTest.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Tests.NonVisual
         [TestCase(0, "0.00%")]
         [TestCase(0.01, "1.00%")]
         [TestCase(0.9899, "98.99%")]
-        [TestCase(0.989999, "99.00%")]
+        [TestCase(0.989999, "98.99%")]
         [TestCase(0.99, "99.00%")]
         [TestCase(0.9999, "99.99%")]
         [TestCase(0.999999, "99.99%")]
diff --git a/osu.Game/Utils/FormatUtils.cs b/osu.Game/Utils/FormatUtils.cs
index 4c7702f04e..8312b9e756 100644
--- a/osu.Game/Utils/FormatUtils.cs
+++ b/osu.Game/Utils/FormatUtils.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 Humanizer;
 
 namespace osu.Game.Utils
@@ -14,9 +15,11 @@ namespace osu.Game.Utils
         /// <returns>formatted accuracy in percentage</returns>
         public static string FormatAccuracy(this double accuracy)
         {
-            // we don't ever want to show 100% when the accuracy is below perfect, even if it rounds to 100%.
-            if (accuracy < 1 && accuracy > 0.9999)
-                accuracy = 0.9999;
+            // for the sake of display purposes, we don't want to show a user a "rounded up" percentage to the next whole number.
+            // ie. a score which gets 89.99999% shouldn't ever show as 90%.
+            // the reasoning for this is that cutoffs for grade increases are at whole numbers and displaying the required
+            // percentile with a non-matching grade is confusing.
+            accuracy = Math.Floor(accuracy * 10000) / 10000;
 
             return $"{accuracy:0.00%}";
         }

From 4909eaf890715b10a6728270673a7c629f4a7493 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 Mar 2021 13:09:53 +0900
Subject: [PATCH 2057/3722] Add the ability to specify format provider (to make
 tests culture invariant)

---
 osu.Game.Tests/NonVisual/FormatUtilsTest.cs | 3 ++-
 osu.Game/Utils/FormatUtils.cs               | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/FormatUtilsTest.cs b/osu.Game.Tests/NonVisual/FormatUtilsTest.cs
index 46d8f4fec4..df095ddee3 100644
--- a/osu.Game.Tests/NonVisual/FormatUtilsTest.cs
+++ b/osu.Game.Tests/NonVisual/FormatUtilsTest.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.Globalization;
 using NUnit.Framework;
 using osu.Game.Utils;
 
@@ -19,7 +20,7 @@ namespace osu.Game.Tests.NonVisual
         [TestCase(1, "100.00%")]
         public void TestAccuracyFormatting(double input, string expectedOutput)
         {
-            Assert.AreEqual(expectedOutput, input.FormatAccuracy());
+            Assert.AreEqual(expectedOutput, input.FormatAccuracy(CultureInfo.InvariantCulture));
         }
     }
 }
diff --git a/osu.Game/Utils/FormatUtils.cs b/osu.Game/Utils/FormatUtils.cs
index 8312b9e756..df1b6cf00d 100644
--- a/osu.Game/Utils/FormatUtils.cs
+++ b/osu.Game/Utils/FormatUtils.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Globalization;
 using Humanizer;
 
 namespace osu.Game.Utils
@@ -11,9 +12,10 @@ namespace osu.Game.Utils
         /// <summary>
         /// Turns the provided accuracy into a percentage with 2 decimal places.
         /// </summary>
-        /// <param name="accuracy">The accuracy to be formatted</param>
+        /// <param name="accuracy">The accuracy to be formatted.</param>
+        /// <param name="formatProvider">An optional format provider.</param>
         /// <returns>formatted accuracy in percentage</returns>
-        public static string FormatAccuracy(this double accuracy)
+        public static string FormatAccuracy(this double accuracy, IFormatProvider formatProvider = null)
         {
             // for the sake of display purposes, we don't want to show a user a "rounded up" percentage to the next whole number.
             // ie. a score which gets 89.99999% shouldn't ever show as 90%.
@@ -21,7 +23,7 @@ namespace osu.Game.Utils
             // percentile with a non-matching grade is confusing.
             accuracy = Math.Floor(accuracy * 10000) / 10000;
 
-            return $"{accuracy:0.00%}";
+            return accuracy.ToString("0.00%", formatProvider ?? CultureInfo.CurrentCulture);
         }
 
         /// <summary>

From 17a0b19ee71c09f52baafabdadec7bd71aaafee8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 Mar 2021 14:04:09 +0900
Subject: [PATCH 2058/3722] Always set progress before updating download state

Without doing so, a state change may read from an old progress value.
---
 osu.Game/Online/DownloadTrackingComposite.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index 52042c266b..d9599481e7 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -123,13 +123,13 @@ namespace osu.Game.Online
             {
                 if (attachedRequest.Progress == 1)
                 {
-                    State.Value = DownloadState.Importing;
                     Progress.Value = 1;
+                    State.Value = DownloadState.Importing;
                 }
                 else
                 {
-                    State.Value = DownloadState.Downloading;
                     Progress.Value = attachedRequest.Progress;
+                    State.Value = DownloadState.Downloading;
 
                     attachedRequest.Failure += onRequestFailure;
                     attachedRequest.DownloadProgressed += onRequestProgress;

From 0a889fafc4fe0df932aeca07939cf4a6cc34c1f6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 Mar 2021 14:04:39 +0900
Subject: [PATCH 2059/3722] Don't send progress updates when not in a
 downloading state

This is mostly just a sanity/debounce check.
---
 osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
index d6f4c45a75..8278162353 100644
--- a/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
+++ b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
@@ -45,6 +45,9 @@ namespace osu.Game.Online.Rooms
 
             Progress.BindValueChanged(_ =>
             {
+                if (State.Value != DownloadState.Downloading)
+                    return;
+
                 // incoming progress changes are going to be at a very high rate.
                 // we don't want to flood the network with this, so rate limit how often we send progress updates.
                 if (progressUpdate?.Completed != false)

From 7faca766e45b0d369326a9bdc26422bb065c825c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 Mar 2021 14:49:02 +0900
Subject: [PATCH 2060/3722] Fix crash on attempting to join lobby using key
 press during a pending join

Closes https://github.com/ppy/osu/issues/12040.
---
 osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
index f13d623eae..5a28d0f968 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
@@ -170,7 +170,9 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
 
         private void joinRequested(Room room)
         {
-            Debug.Assert(joiningRoomOperation == null);
+            if (joiningRoomOperation != null)
+                return;
+
             joiningRoomOperation = ongoingOperationTracker?.BeginOperation();
 
             RoomManager?.JoinRoom(room, r =>

From 6a4157d1939f513d0ed1167192b9b7007e8db1d6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 Mar 2021 16:13:43 +0900
Subject: [PATCH 2061/3722] Remove unused using statement

---
 osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
index 5a28d0f968..f24577a8a5 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Diagnostics;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;

From 2bea69456e8bfbcdf780bd6e8adab5002913f3e3 Mon Sep 17 00:00:00 2001
From: Nathan Alo <n20gaming2000@gmail.com>
Date: Fri, 26 Mar 2021 15:24:33 +0800
Subject: [PATCH 2062/3722] remove implementations

---
 .../Objects/CatchHitObject.cs                 |  2 --
 .../Objects/ManiaHitObject.cs                 |  2 --
 osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs |  2 --
 osu.Game/Rulesets/Objects/HitObject.cs        |  2 --
 osu.Game/Screens/Edit/Editor.cs               | 23 +++----------------
 5 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index 631b50d686..ae45182960 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -120,7 +120,5 @@ namespace osu.Game.Rulesets.Catch.Objects
         }
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
-
-        public override string ToEditorString() => (IndexInCurrentCombo + 1).ToString();
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs b/osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs
index c43d223335..27bf50493d 100644
--- a/osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs
+++ b/osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs
@@ -22,8 +22,6 @@ namespace osu.Game.Rulesets.Mania.Objects
 
         protected override HitWindows CreateHitWindows() => new ManiaHitWindows();
 
-        public override string ToEditorString() => $"{StartTime}|{Column}";
-
         #region LegacyBeatmapEncoder
 
         float IHasXPosition.X => Column;
diff --git a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
index e784d13084..22b64af3df 100644
--- a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
@@ -130,7 +130,5 @@ namespace osu.Game.Rulesets.Osu.Objects
         }
 
         protected override HitWindows CreateHitWindows() => new OsuHitWindows();
-
-        public override string ToEditorString() => (IndexInCurrentCombo + 1).ToString();
     }
 }
diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index fa7b2811cc..826d411822 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -168,8 +168,6 @@ namespace osu.Game.Rulesets.Objects
         /// </summary>
         [NotNull]
         protected virtual HitWindows CreateHitWindows() => new HitWindows();
-
-        public virtual string ToEditorString() => string.Empty;
     }
 
     public static class HitObjectExtensions
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index a6e84d59a7..c2a9fd49b1 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -63,9 +63,6 @@ namespace osu.Game.Screens.Edit
 
         protected bool HasUnsavedChanges => lastSavedHash != changeHandler.CurrentStateHash;
 
-        [Resolved]
-        private GameHost host { get; set; }
-
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
 
@@ -110,7 +107,7 @@ namespace osu.Game.Screens.Edit
         private MusicController music { get; set; }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, OsuConfigManager config)
+        private void load(OsuColour colours, GameHost host, OsuConfigManager config)
         {
             if (Beatmap.Value is DummyWorkingBeatmap)
             {
@@ -547,24 +544,10 @@ namespace osu.Game.Screens.Edit
 
         protected void Copy()
         {
-            var builder = new StringBuilder();
-            const string suffix = " - ";
-
             if (editorBeatmap.SelectedHitObjects.Count == 0)
-            {
-                builder.Append(clock.CurrentTime.ToEditorFormattedString());
-            }
-            else
-            {
-                var orderedHitObjects = editorBeatmap.SelectedHitObjects.OrderBy(h => h.StartTime);
-                builder.Append(orderedHitObjects.FirstOrDefault().StartTime.ToEditorFormattedString());
-                builder.Append($" ({string.Join(',', orderedHitObjects.Select(h => h.ToEditorString()))})");
+                return;
 
-                clipboard.Value = new ClipboardContent(editorBeatmap).Serialize();
-            }
-
-            builder.Append(suffix);
-            host.GetClipboard()?.SetText(builder.ToString());
+            clipboard.Value = new ClipboardContent(editorBeatmap).Serialize();
         }
 
         protected void Paste()

From b8b7eb4c4b8e0af156ebdad46a83ecbe3427b0b2 Mon Sep 17 00:00:00 2001
From: Nathan Alo <n20gaming2000@gmail.com>
Date: Fri, 26 Mar 2021 15:25:20 +0800
Subject: [PATCH 2063/3722] refactor logic to its own component and handle hit
 object to string conversion to its ruleset-specific composers

---
 .../Edit/ManiaHitObjectComposer.cs            |  3 ++
 .../Edit/OsuHitObjectComposer.cs              |  3 ++
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   |  2 +
 .../Screens/Edit/Compose/ComposeScreen.cs     | 23 +++++++++-
 osu.Game/Screens/Edit/SelectionHelper.cs      | 46 +++++++++++++++++++
 5 files changed, 76 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Screens/Edit/SelectionHelper.cs

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 324670c4b2..4cb34a217c 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -119,5 +119,8 @@ namespace osu.Game.Rulesets.Mania.Edit
                     beatSnapGrid.SelectionTimeRange = null;
             }
         }
+
+        public override IEnumerable<string> ConvertSelectionToString()
+            => EditorBeatmap.SelectedHitObjects.Cast<ManiaHitObject>().Select(h => $"{h.StartTime}|{h.Column}");
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 0490e8b8ce..1943f52c73 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -82,6 +82,9 @@ namespace osu.Game.Rulesets.Osu.Edit
         protected override ComposeBlueprintContainer CreateBlueprintContainer()
             => new OsuBlueprintContainer(this);
 
+        public override IEnumerable<string> ConvertSelectionToString()
+            => selectedHitObjects.Cast<OsuHitObject>().Select(h => (h.IndexInCurrentCombo + 1).ToString());
+
         private DistanceSnapGrid distanceSnapGrid;
         private Container distanceSnapGridContainer;
 
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index e927951d0a..eee16043e4 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -438,6 +438,8 @@ namespace osu.Game.Rulesets.Edit
         /// </summary>
         public abstract bool CursorInPlacementArea { get; }
 
+        public virtual IEnumerable<string> ConvertSelectionToString() => Array.Empty<string>();
+
         #region IPositionSnapProvider
 
         public abstract SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition);
diff --git a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
index 81b1195a40..c63ef11c74 100644
--- a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
+++ b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
@@ -6,6 +6,8 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Input;
+using osu.Framework.Input.Bindings;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Edit;
@@ -14,16 +16,19 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Edit.Compose
 {
-    public class ComposeScreen : EditorScreenWithTimeline
+    public class ComposeScreen : EditorScreenWithTimeline, IKeyBindingHandler<PlatformAction>
     {
         [Resolved]
         private IBindable<WorkingBeatmap> beatmap { get; set; }
 
         private HitObjectComposer composer;
 
+        private SelectionHelper helper;
+
         public ComposeScreen()
             : base(EditorScreenMode.Compose)
         {
+            Add(helper = new SelectionHelper());
         }
 
         private Ruleset ruleset;
@@ -72,5 +77,21 @@ namespace osu.Game.Screens.Edit.Compose
             // this is intentionally done in two stages to ensure things are in a loaded state before exposing the ruleset to skin sources.
             return beatmapSkinProvider.WithChild(rulesetSkinProvider.WithChild(content));
         }
+
+        public bool OnPressed(PlatformAction action)
+        {
+            switch (action.ActionType)
+            {
+                case PlatformActionType.Copy:
+                    helper.CopySelectionToClipboard();
+                    return false;
+                default:
+                    return false;
+            };
+        }
+
+        public void OnReleased(PlatformAction action)
+        {
+        }
     }
 }
diff --git a/osu.Game/Screens/Edit/SelectionHelper.cs b/osu.Game/Screens/Edit/SelectionHelper.cs
new file mode 100644
index 0000000000..e0eb868c9f
--- /dev/null
+++ b/osu.Game/Screens/Edit/SelectionHelper.cs
@@ -0,0 +1,46 @@
+using System.Linq;
+using System.Text;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Platform;
+using osu.Game.Extensions;
+using osu.Game.Rulesets.Edit;
+
+namespace osu.Game.Screens.Edit
+{
+    public class SelectionHelper : Component
+    {
+        [Resolved]
+        private GameHost host { get; set; }
+
+        [Resolved]
+        private EditorClock clock { get; set; }
+
+        [Resolved]
+        private EditorBeatmap editorBeatmap { get; set; }
+
+        [Resolved(CanBeNull = true)]
+        private HitObjectComposer composer { get; set; }
+
+        public void CopySelectionToClipboard()
+        {
+            host.GetClipboard().SetText(formatSelectionAsString());
+        }
+
+        private string formatSelectionAsString()
+        {
+            const string separator = " - ";
+            var builder = new StringBuilder();
+
+            if (!editorBeatmap.SelectedHitObjects.Any())
+            {
+                builder.Append($"{clock.CurrentTime.ToEditorFormattedString()}{separator}");
+                return builder.ToString();
+            };
+
+            builder.Append(editorBeatmap.SelectedHitObjects.First().StartTime.ToEditorFormattedString());
+            builder.Append($" ({string.Join(',', composer.ConvertSelectionToString())}){separator}");
+            return builder.ToString();
+        }
+    }
+}

From cb48e5f15822a7aab53317bc8a1b938c777f8544 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 26 Mar 2021 16:33:16 +0900
Subject: [PATCH 2064/3722] Fix timeline not visually ordering hitobjects in a
 stable way

---
 .../Components/HitObjectOrderedSelectionContainer.cs      | 8 +++++++-
 .../Components/Timeline/TimelineBlueprintContainer.cs     | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs b/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs
index 9e95fe4fa1..d612cf3fe0 100644
--- a/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs
@@ -71,7 +71,13 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             // Put earlier blueprints towards the end of the list, so they handle input first
             int i = yObj.HitObject.StartTime.CompareTo(xObj.HitObject.StartTime);
-            return i == 0 ? CompareReverseChildID(x, y) : i;
+
+            if (i != 0) return i;
+
+            // Fall back to end time if the start time is equal.
+            i = yObj.HitObject.GetEndTime().CompareTo(xObj.HitObject.GetEndTime());
+
+            return i == 0 ? CompareReverseChildID(y, x) : i;
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index cec851b5bb..3623f8ad8e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -138,7 +138,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             Stack<HitObject> currentConcurrentObjects = new Stack<HitObject>();
 
-            foreach (var b in SelectionBlueprints.OrderBy(b => b.HitObject.StartTime).ThenBy(b => b.HitObject.GetEndTime()))
+            foreach (var b in SelectionBlueprints.Reverse())
             {
                 // remove objects from the stack as long as their end time is in the past.
                 while (currentConcurrentObjects.TryPeek(out HitObject hitObject))

From 374f8c5e229b314a2f7cf1de9b29285cccbff0d2 Mon Sep 17 00:00:00 2001
From: Nathan Alo <n20gaming2000@gmail.com>
Date: Fri, 26 Mar 2021 15:33:28 +0800
Subject: [PATCH 2065/3722] move to compose namespace and add license header

---
 osu.Game/Screens/Edit/{ => Compose}/SelectionHelper.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
 rename osu.Game/Screens/Edit/{ => Compose}/SelectionHelper.cs (85%)

diff --git a/osu.Game/Screens/Edit/SelectionHelper.cs b/osu.Game/Screens/Edit/Compose/SelectionHelper.cs
similarity index 85%
rename from osu.Game/Screens/Edit/SelectionHelper.cs
rename to osu.Game/Screens/Edit/Compose/SelectionHelper.cs
index e0eb868c9f..39d6d57a2a 100644
--- a/osu.Game/Screens/Edit/SelectionHelper.cs
+++ b/osu.Game/Screens/Edit/Compose/SelectionHelper.cs
@@ -1,4 +1,7 @@
-using System.Linq;
+// Copyright (c) ppy 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.Text;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -6,7 +9,7 @@ using osu.Framework.Platform;
 using osu.Game.Extensions;
 using osu.Game.Rulesets.Edit;
 
-namespace osu.Game.Screens.Edit
+namespace osu.Game.Screens.Edit.Compose
 {
     public class SelectionHelper : Component
     {

From 71a0616861916129456e0a301d0386269c51cd6c Mon Sep 17 00:00:00 2001
From: Nathan Alo <n20gaming2000@gmail.com>
Date: Fri, 26 Mar 2021 15:34:45 +0800
Subject: [PATCH 2066/3722] remove extra semi colons

---
 osu.Game/Screens/Edit/Compose/ComposeScreen.cs   | 2 +-
 osu.Game/Screens/Edit/Compose/SelectionHelper.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
index c63ef11c74..b249ae9bcd 100644
--- a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
+++ b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Screens.Edit.Compose
                     return false;
                 default:
                     return false;
-            };
+            }
         }
 
         public void OnReleased(PlatformAction action)
diff --git a/osu.Game/Screens/Edit/Compose/SelectionHelper.cs b/osu.Game/Screens/Edit/Compose/SelectionHelper.cs
index 39d6d57a2a..2e172c12dc 100644
--- a/osu.Game/Screens/Edit/Compose/SelectionHelper.cs
+++ b/osu.Game/Screens/Edit/Compose/SelectionHelper.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Screens.Edit.Compose
             {
                 builder.Append($"{clock.CurrentTime.ToEditorFormattedString()}{separator}");
                 return builder.ToString();
-            };
+            }
 
             builder.Append(editorBeatmap.SelectedHitObjects.First().StartTime.ToEditorFormattedString());
             builder.Append($" ({string.Join(',', composer.ConvertSelectionToString())}){separator}");

From 1b6e08b3eb34f80afc5126c2af1efb7ba16d8d19 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 26 Mar 2021 10:35:46 +0300
Subject: [PATCH 2067/3722] Fix incorrect default font overlap for score and
 combo

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

diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index d08f50bccb..d8fb1fa664 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -97,10 +97,10 @@ namespace osu.Game.Skinning
             switch (font)
             {
                 case LegacyFont.Score:
-                    return source.GetConfig<LegacySetting, float>(LegacySetting.ScoreOverlap)?.Value ?? -2f;
+                    return source.GetConfig<LegacySetting, float>(LegacySetting.ScoreOverlap)?.Value ?? 0f;
 
                 case LegacyFont.Combo:
-                    return source.GetConfig<LegacySetting, float>(LegacySetting.ComboOverlap)?.Value ?? -2f;
+                    return source.GetConfig<LegacySetting, float>(LegacySetting.ComboOverlap)?.Value ?? 0f;
 
                 case LegacyFont.HitCircle:
                     return source.GetConfig<LegacySetting, float>(LegacySetting.HitCircleOverlap)?.Value ?? -2f;

From c96321206a0e5157d8864e5d84204706f918ce30 Mon Sep 17 00:00:00 2001
From: Nathan Alo <n20gaming2000@gmail.com>
Date: Fri, 26 Mar 2021 16:17:24 +0800
Subject: [PATCH 2068/3722] fix appveyor complaints

---
 osu.Game/Screens/Edit/Compose/ComposeScreen.cs | 3 ++-
 osu.Game/Screens/Edit/Editor.cs                | 6 +-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
index b249ae9bcd..16043ff64b 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
 
         private HitObjectComposer composer;
 
-        private SelectionHelper helper;
+        private readonly SelectionHelper helper;
 
         public ComposeScreen()
             : base(EditorScreenMode.Compose)
@@ -85,6 +85,7 @@ namespace osu.Game.Screens.Edit.Compose
                 case PlatformActionType.Copy:
                     helper.CopySelectionToClipboard();
                     return false;
+
                 default:
                     return false;
             }
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index c2a9fd49b1..d9ba12d331 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Text;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -17,12 +16,10 @@ using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Logging;
-using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
-using osu.Game.Extensions;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Graphics.UserInterface;
@@ -31,7 +28,6 @@ using osu.Game.IO.Serialization;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Rulesets.Edit;
-using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Screens.Edit.Components;
 using osu.Game.Screens.Edit.Components.Menus;
 using osu.Game.Screens.Edit.Components.Timelines.Summary;
@@ -107,7 +103,7 @@ namespace osu.Game.Screens.Edit
         private MusicController music { get; set; }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, GameHost host, OsuConfigManager config)
+        private void load(OsuColour colours, OsuConfigManager config)
         {
             if (Beatmap.Value is DummyWorkingBeatmap)
             {

From 5d272bef9778d590b84e1e97edfde3d64a8b68de Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Fri, 26 Mar 2021 16:28:04 +0100
Subject: [PATCH 2069/3722] Remember ContolPoint positions instead of
 recalculating them

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

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index ae92b12fd2..b9578b4ae9 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -197,8 +197,13 @@ namespace osu.Game.Rulesets.Osu.Edit
             Quad sliderQuad = getSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position.Value));
             Vector2 pathRelativeDeltaScale = new Vector2(1 + scale.X / sliderQuad.Width, 1 + scale.Y / sliderQuad.Height);
 
+            Queue<Vector2> oldControlPoints = new Queue<Vector2>();
+
             foreach (var point in slider.Path.ControlPoints)
+            {
+                oldControlPoints.Enqueue(point.Position.Value);
                 point.Position.Value *= pathRelativeDeltaScale;
+            }
 
             //if sliderhead or sliderend end up outside playfield, revert scaling.
             Quad scaledQuad = getSurroundingQuad(new OsuHitObject[] { slider });
@@ -207,8 +212,8 @@ namespace osu.Game.Rulesets.Osu.Edit
             if (xInBounds && yInBounds)
                 return true;
 
-            foreach (var point in slider.Path.ControlPoints)
-                point.Position.Value *= new Vector2(1 / pathRelativeDeltaScale.X, 1 / pathRelativeDeltaScale.Y);
+            foreach(var point in slider.Path.ControlPoints)
+                point.Position.Value = oldControlPoints.Dequeue();
 
             return true;
         }

From 25ea60cb92c6d4e40b7c442d68d2fd17b4a7056d Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Fri, 26 Mar 2021 16:39:13 +0100
Subject: [PATCH 2070/3722] Remove return values from HandleScale submethods

---
 .../Edit/OsuSelectionHandler.cs                 | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index b9578b4ae9..8a657d0f9b 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -143,19 +143,18 @@ namespace osu.Game.Rulesets.Osu.Edit
             adjustScaleFromAnchor(ref scale, reference);
 
             var hitObjects = selectedMovableObjects;
-            bool result;
 
             // for the time being, allow resizing of slider paths only if the slider is
             // the only hit object selected. with a group selection, it's likely the user
             // is not looking to change the duration of the slider but expand the whole pattern.
             if (hitObjects.Length == 1 && hitObjects.First() is Slider slider)
-                result = scaleSlider(slider, scale);
+                scaleSlider(slider, scale);
             else
-                result = scaleHitObjects(hitObjects, reference, scale);
+                scaleHitObjects(hitObjects, reference, scale);
 
             moveSelectionInBounds();
 
-            return result;
+            return true;
         }
 
         private static void adjustScaleFromAnchor(ref Vector2 scale, Anchor reference)
@@ -192,7 +191,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             return true;
         }
 
-        private bool scaleSlider(Slider slider, Vector2 scale)
+        private void scaleSlider(Slider slider, Vector2 scale)
         {
             Quad sliderQuad = getSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position.Value));
             Vector2 pathRelativeDeltaScale = new Vector2(1 + scale.X / sliderQuad.Width, 1 + scale.Y / sliderQuad.Height);
@@ -210,15 +209,13 @@ namespace osu.Game.Rulesets.Osu.Edit
             (bool xInBounds, bool yInBounds) = isQuadInBounds(scaledQuad);
 
             if (xInBounds && yInBounds)
-                return true;
+                return;
 
             foreach(var point in slider.Path.ControlPoints)
                 point.Position.Value = oldControlPoints.Dequeue();
-
-            return true;
         }
 
-        private bool scaleHitObjects(OsuHitObject[] hitObjects, Anchor reference, Vector2 scale)
+        private void scaleHitObjects(OsuHitObject[] hitObjects, Anchor reference, Vector2 scale)
         {
             scale = getClampedScale(hitObjects, reference, scale);
 
@@ -241,8 +238,6 @@ namespace osu.Game.Rulesets.Osu.Edit
 
                 h.Position = newPosition;
             }
-
-            return true;
         }
 
         private (bool X, bool Y) isQuadInBounds(Quad quad)

From 305c2e31cfc7f7e6e30f94d561415619b37c87e0 Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Fri, 26 Mar 2021 16:45:05 +0100
Subject: [PATCH 2071/3722] Clarify todo comment

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

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 8a657d0f9b..24b0d22c1a 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -283,7 +283,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             Quad selectionQuad = getSurroundingQuad(hitObjects);
 
-            //todo: this is not always correct for selections involving sliders
+            //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);
 
             //max Size -> playfield bounds

From a50c4be8ab806e4f8875cd286a01d6cf5a3a2a7f Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Fri, 26 Mar 2021 17:41:36 +0100
Subject: [PATCH 2072/3722] Add missing space

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

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 24b0d22c1a..3a4a37c8cc 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -211,7 +211,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             if (xInBounds && yInBounds)
                 return;
 
-            foreach(var point in slider.Path.ControlPoints)
+            foreach (var point in slider.Path.ControlPoints)
                 point.Position.Value = oldControlPoints.Dequeue();
         }
 

From 21398e25b5b939ae40e15be42bb6ffb93365d315 Mon Sep 17 00:00:00 2001
From: Nathan Alo <n20gaming2000@gmail.com>
Date: Sat, 27 Mar 2021 10:02:21 +0800
Subject: [PATCH 2073/3722] null check composer and ensure the correct start
 time from selected hit objects

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

diff --git a/osu.Game/Screens/Edit/Compose/SelectionHelper.cs b/osu.Game/Screens/Edit/Compose/SelectionHelper.cs
index 2e172c12dc..a01a9e0144 100644
--- a/osu.Game/Screens/Edit/Compose/SelectionHelper.cs
+++ b/osu.Game/Screens/Edit/Compose/SelectionHelper.cs
@@ -41,8 +41,10 @@ namespace osu.Game.Screens.Edit.Compose
                 return builder.ToString();
             }
 
-            builder.Append(editorBeatmap.SelectedHitObjects.First().StartTime.ToEditorFormattedString());
-            builder.Append($" ({string.Join(',', composer.ConvertSelectionToString())}){separator}");
+            string hitObjects = composer != null ? string.Join(',', composer.ConvertSelectionToString()) : string.Empty;
+
+            builder.Append(editorBeatmap.SelectedHitObjects.Min(h => h.StartTime).ToEditorFormattedString());
+            builder.Append($" ({hitObjects}){separator}");
             return builder.ToString();
         }
     }

From 010db8968fa664cb7d0a44ec0da727c3a9776773 Mon Sep 17 00:00:00 2001
From: Samuel Cattini-Schultz <syriiins@gmail.com>
Date: Sat, 27 Mar 2021 18:38:23 +1100
Subject: [PATCH 2074/3722] Adjust wording of xmldoc

---
 .../Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs b/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs
index fa578d55f0..1bf0d8a222 100644
--- a/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs
+++ b/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Difficulty.Preprocessing
         public readonly double DeltaTime;
 
         /// <summary>
-        /// Start time of <see cref="BaseObject"/>.
+        /// Clockrate adjusted start time of <see cref="BaseObject"/>.
         /// </summary>
         public readonly double StartTime;
 

From 068f00d8a035834b7e21bec15318b6aafd48f9fc Mon Sep 17 00:00:00 2001
From: Samuel Cattini-Schultz <syriiins@gmail.com>
Date: Sat, 27 Mar 2021 18:38:43 +1100
Subject: [PATCH 2075/3722] Add EndTime to DifficultyHitObject for future
 convenience

---
 .../Difficulty/Preprocessing/DifficultyHitObject.cs         | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs b/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs
index 1bf0d8a222..ece8219071 100644
--- a/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs
+++ b/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs
@@ -30,6 +30,11 @@ namespace osu.Game.Rulesets.Difficulty.Preprocessing
         /// </summary>
         public readonly double StartTime;
 
+        /// <summary>
+        /// Clockrate adjusted start time of <see cref="BaseObject"/>.
+        /// </summary>
+        public readonly double EndTime;
+
         /// <summary>
         /// Creates a new <see cref="DifficultyHitObject"/>.
         /// </summary>
@@ -42,6 +47,7 @@ namespace osu.Game.Rulesets.Difficulty.Preprocessing
             LastObject = lastObject;
             DeltaTime = (hitObject.StartTime - lastObject.StartTime) / clockRate;
             StartTime = hitObject.StartTime / clockRate;
+            EndTime = hitObject.GetEndTime() / clockRate;
         }
     }
 }

From d58ef5310bf534f76a8d10170cdd71cd098bace0 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sun, 28 Mar 2021 17:36:22 +0200
Subject: [PATCH 2076/3722] Add verify tab

Currently empty, but works.
---
 .../Input/Bindings/GlobalActionContainer.cs   |   3 +
 osu.Game/Screens/Edit/Editor.cs               |   9 +
 osu.Game/Screens/Edit/EditorScreenMode.cs     |   3 +
 osu.Game/Screens/Edit/Verify/Issue.cs         |  10 +
 osu.Game/Screens/Edit/Verify/IssueTable.cs    | 191 ++++++++++++++++++
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs  |  68 +++++++
 6 files changed, 284 insertions(+)
 create mode 100644 osu.Game/Screens/Edit/Verify/Issue.cs
 create mode 100644 osu.Game/Screens/Edit/Verify/IssueTable.cs
 create mode 100644 osu.Game/Screens/Edit/Verify/VerifyScreen.cs

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 8ccdb9249e..6705d3ee61 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -193,6 +193,9 @@ namespace osu.Game.Input.Bindings
         [Description("Timing mode")]
         EditorTimingMode,
 
+        [Description("Verify mode")]
+        EditorVerifyMode,
+
         [Description("Hold for HUD")]
         HoldForHUD,
 
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 0c24eb6a4d..57499bf219 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -36,6 +36,7 @@ using osu.Game.Screens.Edit.Compose;
 using osu.Game.Screens.Edit.Design;
 using osu.Game.Screens.Edit.Setup;
 using osu.Game.Screens.Edit.Timing;
+using osu.Game.Screens.Edit.Verify;
 using osu.Game.Screens.Play;
 using osu.Game.Users;
 using osuTK.Graphics;
@@ -445,6 +446,10 @@ namespace osu.Game.Screens.Edit
                     menuBar.Mode.Value = EditorScreenMode.SongSetup;
                     return true;
 
+                case GlobalAction.EditorVerifyMode:
+                    menuBar.Mode.Value = EditorScreenMode.Verify;
+                    return true;
+
                 default:
                     return false;
             }
@@ -632,6 +637,10 @@ namespace osu.Game.Screens.Edit
                     case EditorScreenMode.Timing:
                         currentScreen = new TimingScreen();
                         break;
+
+                    case EditorScreenMode.Verify:
+                        currentScreen = new VerifyScreen();
+                        break;
                 }
 
                 LoadComponentAsync(currentScreen, newScreen =>
diff --git a/osu.Game/Screens/Edit/EditorScreenMode.cs b/osu.Game/Screens/Edit/EditorScreenMode.cs
index 12cfcc605b..ecd39f9b57 100644
--- a/osu.Game/Screens/Edit/EditorScreenMode.cs
+++ b/osu.Game/Screens/Edit/EditorScreenMode.cs
@@ -18,5 +18,8 @@ namespace osu.Game.Screens.Edit
 
         [Description("timing")]
         Timing,
+
+        [Description("verify")]
+        Verify,
     }
 }
diff --git a/osu.Game/Screens/Edit/Verify/Issue.cs b/osu.Game/Screens/Edit/Verify/Issue.cs
new file mode 100644
index 0000000000..25e913d819
--- /dev/null
+++ b/osu.Game/Screens/Edit/Verify/Issue.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.Screens.Edit.Verify
+{
+    public class Issue
+    {
+        public readonly double Time;
+    }
+}
diff --git a/osu.Game/Screens/Edit/Verify/IssueTable.cs b/osu.Game/Screens/Edit/Verify/IssueTable.cs
new file mode 100644
index 0000000000..6476cebe48
--- /dev/null
+++ b/osu.Game/Screens/Edit/Verify/IssueTable.cs
@@ -0,0 +1,191 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input.Events;
+using osu.Game.Extensions;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Edit.Verify
+{
+    public class IssueTable : TableContainer
+    {
+        private const float horizontal_inset = 20;
+        private const float row_height = 25;
+        private const int text_size = 14;
+
+        private readonly FillFlowContainer backgroundFlow;
+
+        public IssueTable()
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+
+            Padding = new MarginPadding { Horizontal = horizontal_inset };
+            RowSize = new Dimension(GridSizeMode.Absolute, row_height);
+
+            AddInternal(backgroundFlow = new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Depth = 1f,
+                Padding = new MarginPadding { Horizontal = -horizontal_inset },
+                Margin = new MarginPadding { Top = row_height }
+            });
+        }
+
+        public IEnumerable<Issue> Issues
+        {
+            set
+            {
+                Content = null;
+                backgroundFlow.Clear();
+
+                if (value?.Any() != true)
+                    return;
+
+                foreach (var issue in value)
+                {
+                    backgroundFlow.Add(new IssueTable.RowBackground(issue));
+                }
+
+                Columns = createHeaders();
+                Content = value.Select((g, i) => createContent(i, g)).ToArray().ToRectangular();
+            }
+        }
+
+        private TableColumn[] createHeaders()
+        {
+            var columns = new List<TableColumn>
+            {
+                new TableColumn(string.Empty, Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
+                new TableColumn("Time", Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
+                new TableColumn(),
+                new TableColumn("Attributes", Anchor.CentreLeft),
+            };
+
+            return columns.ToArray();
+        }
+
+        private Drawable[] createContent(int index, Issue issue) => new Drawable[]
+        {
+            new OsuSpriteText
+            {
+                Text = $"#{index + 1}",
+                Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold),
+                Margin = new MarginPadding(10)
+            },
+            new OsuSpriteText
+            {
+                Text = issue.Time.ToEditorFormattedString(),
+                Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold)
+            },
+            null,
+            null //new ControlGroupAttributes(issue),
+        };
+
+        public class RowBackground : OsuClickableContainer
+        {
+            private readonly Issue issue;
+            private const int fade_duration = 100;
+
+            private readonly Box hoveredBackground;
+
+            [Resolved]
+            private EditorClock clock { get; set; }
+
+            [Resolved]
+            private Bindable<Issue> selectedIssue { get; set; }
+
+            public RowBackground(Issue issue)
+            {
+                this.issue = issue;
+                RelativeSizeAxes = Axes.X;
+                Height = 25;
+
+                AlwaysPresent = true;
+
+                CornerRadius = 3;
+                Masking = true;
+
+                Children = new Drawable[]
+                {
+                    hoveredBackground = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Alpha = 0,
+                    },
+                };
+
+                Action = () =>
+                {
+                    selectedIssue.Value = issue;
+                    clock.SeekSmoothlyTo(issue.Time);
+                };
+            }
+
+            private Color4 colourHover;
+            private Color4 colourSelected;
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                hoveredBackground.Colour = colourHover = colours.BlueDarker;
+                colourSelected = colours.YellowDarker;
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                selectedIssue.BindValueChanged(group => { Selected = issue == group.NewValue; }, true);
+            }
+
+            private bool selected;
+
+            protected bool Selected
+            {
+                get => selected;
+                set
+                {
+                    if (value == selected)
+                        return;
+
+                    selected = value;
+                    updateState();
+                }
+            }
+
+            protected override bool OnHover(HoverEvent e)
+            {
+                updateState();
+                return base.OnHover(e);
+            }
+
+            protected override void OnHoverLost(HoverLostEvent e)
+            {
+                updateState();
+                base.OnHoverLost(e);
+            }
+
+            private void updateState()
+            {
+                hoveredBackground.FadeColour(selected ? colourSelected : colourHover, 450, Easing.OutQuint);
+
+                if (selected || IsHovered)
+                    hoveredBackground.FadeIn(fade_duration, Easing.OutQuint);
+                else
+                    hoveredBackground.FadeOut(fade_duration, Easing.OutQuint);
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
new file mode 100644
index 0000000000..c15cefae83
--- /dev/null
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -0,0 +1,68 @@
+// Copyright (c) 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.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+
+namespace osu.Game.Screens.Edit.Verify
+{
+    public class VerifyScreen : EditorScreenWithTimeline
+    {
+        public VerifyScreen()
+            : base(EditorScreenMode.Verify)
+        {
+        }
+
+        protected override Drawable CreateMainContent() => new GridContainer
+        {
+            RelativeSizeAxes = Axes.Both,
+            ColumnDimensions = new[]
+            {
+                new Dimension(),
+                new Dimension(GridSizeMode.Absolute, 200),
+            },
+            Content = new[]
+            {
+                new Drawable[]
+                {
+                    new ControlPointList()
+                },
+            }
+        };
+
+        public class ControlPointList : CompositeDrawable
+        {
+            private IssueTable table;
+
+            [Resolved]
+            private EditorClock clock { get; set; }
+
+            [Resolved]
+            protected EditorBeatmap Beatmap { get; private set; }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                RelativeSizeAxes = Axes.Both;
+
+                InternalChildren = new Drawable[]
+                {
+                    new Box
+                    {
+                        Colour = colours.Gray0,
+                        RelativeSizeAxes = Axes.Both,
+                    },
+                    new OsuScrollContainer
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Child = table = new IssueTable(),
+                    }
+                };
+            }
+        }
+    }
+}

From f49481e308b68176e560a283870d6dbcbd43c581 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 26 Mar 2021 12:48:21 +0300
Subject: [PATCH 2077/3722] Add old skin spinner SPM background for testing

---
 .../Resources/old-skin/spinner-rpm.png          | Bin 0 -> 10583 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/spinner-rpm.png

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/spinner-rpm.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/spinner-rpm.png
new file mode 100644
index 0000000000000000000000000000000000000000..73753554f74fab988c7e5d8c7722d22928120682
GIT binary patch
literal 10583
zcmW++1yob-8@_`9BNT?TfG|-yq+4PmrF-N+Kp4{9AmB(TL6i;!VT3S3Qba;Z5Qa!8
z5-Kq|9P#J(zvtZh-a6;I=RNm(-sgRuFVRq6^BNT!6#xL&w6);I003gXI+ulzUma)c
zI-Xnwke{)p8c;jN{^#m~+)-B(eig5_Q}y<!t3c_kW#tC|)HnXyLBPv=maCf-{@Qv7
zih0O&CceAd;ayn(zy)Z-RZWAxZ$((8bF2p}%B^39wGWQ~Pd;2da=g=1Kyt@8dj#?B
zk#L%@b;F%mb9%ul9xv^-v-BC$y-b}|sVY+e+A33HM&7D#nL>$7{E4snt^tTxuxj+T
znAzO+qdn2}l@j6@jS3Ag`ylD|Qr%mhb&&|dQtCyw^18zCGjG2i0XNO&zRx7EIAZK=
z2VbUE>($QT?>sxSyGfV$wiyDD0AHs4Y}6&AvSMiO_0iq(azp_;zz?8@B)aP22n}(y
z9bO5gf!qN{vjFr!rA3tH^oINB`k&j1FSrv}mVc=V)hAdA0SrJoNCm01#yD{z#WYHF
zaIMSKVg(9PAq6x*#gxFSx9hmS=R5L(>t#I8xQA%&^$k3=A@9p1QK1Epz!&o9>%f6v
zW&`8UVCo>*OzVAIlBqOl4;b(ujphY@pnz}2ozhd*SL1onPK<zhNC0-SXl9TDIj{zD
zsDi!pPi4G~UMR)&iPxJqgL*iC9ZKND{E!_m%Dzs7e}<J(z%T0GNHu9)rQr#wDhmRB
zkN8Ewgd*d^N+EglB^BUB(qjg^z}DnNI{y>{234}n43ltD01HL*7Epf^xPSo4w17M&
z)0}07+23^IE!Rk5HUdV@15#z(p`t3~8cywhzb1ORGkj95t^Dr#>~gy6({I2^?}HKL
zoo3AA3~4?5t9nE;rH<;c9B@Jayc=No6;ezzXv<V81R!RdF)RX{ya9Gt;Ril``xM%K
zUp=xV=j3(7E7YErD{+g{Q`Vy5(L>Gw<ot+1SV!+&2uXBwG#A%ub?}z5WrVqBkDN>x
z;c_(ZVs#)^twrn?Jb_1|Z{VoQ5-Bpc$WM6iXurw4ykNGby-9dOX!}NnsA|=~1u@Bx
z+=zz)D6QtlmZU&ZfgT<pyn=_x7uSG&v*Bc2+lOn&(Ra_om#9{dWhhdT(2)S<Sr}*M
zLJ&|wZd@_LnDCN>1K_@v!r%g}A8QN{g29q1mzf!uVpIf8;gz^rI}HXX3gs}~3;U7p
z$^_yE#l^*0UL@48A;!YE1(uwc9ISA)5DRSw=Ow9~LNdyGG?H%E^mL#>(PiB3Tcaf*
z9{3<HitcV#WDTyi?%UDfT>dpE!o^i_xQz9E4f$9;F<~@$n~~vsb@n6d%nE1)fGG0n
z<!z}PUCWH&*E+7J^nl9ze0Z(&`&FIE`3^cb&gM@KNI(Mw{51CP!H^hJ$yPu~F>yFP
z8ix0LNu)HT8v5njUy|sc*~UFIBb%S@H6Ghh{hGBLhH$~bC^`qaM^t6e3{U}>DUv&k
zX(K;)d^z70T@Z|d=1h94L}z-i#8LcGdr(?mexHfXL9D+aAPq{VMJj-(WZ;Iyc)K}-
zjH_YN;oSW`l_XegC^x@aJh+e*3|DMqacbie5>y+a`juDbca6+zS?=19Gv--?)3X)r
zcy{>btjV10W-hKx+w|sjTC@H^U7(%@SokdUj?|a3c*Kb{UR*$u2|lD|d@C;*ooXK8
zv7va~hUvpJQ4I8>$6Yo0L)@fJNg9kfUUi~!rU|A7>s3Kh#!gZ}p^h#?dunk~?prFW
zFd#Yx&q5vpL$GLq+$ug(>cuTK#(}g^LKIZ|iT-YRvZC<~%HyfDO)#t)d#gYk6`X~E
z|3Rh}h~(hwytCUj6dF*RPB#%UzS!93Qw(9OKQ1OsMOo74n^S!h<ATG%;Bh;}M#~M$
zc&(S1Mw<>yf{@@@Pb|N1*&!v|5}tq`rn?oEsaj{sg)-G`yZ3%2smXKy!o|A$2C%~b
z*wp&ZT?bas!nw%R`wJ96aoNAjG_);aUz?bP%%YTB(36hN4>eYP#}!;$2uuvV>G4Le
z?@G)^>lP2TYBHoCqJp{?);qG?u`X!RxaH*4-BRB=CDLSWs!Jc>O{mQvZY#*L{!u9b
zitn06_ZTB@7h1_L*zG0<8H@|#<TVtBw+rSro?hSLu($JYuH#g=_jT)y$d{MWsi|?a
z3t=-kqpvhFC0s>C3*@4z$`bj~NRAdIfS$CW#FbrxC`Vq%V4}$_A)8k5h5au7kh{G7
zzYLUu$5+-yZ%gqY-Yb&t8o#$#&U>@Q6sEZp?iv`{@4_UUPIA!9!z?N!(`b`GLZG{;
zwdOqa{cmLsnRX{f-{Geu8_vp;+qEf-Y~_2jnQQKVHw8?d1FU4MnubZ6y-lL!R!#$F
z?Aw^qR&h{;)9un}mbg#-`tjfAtXp*NooZ^Z9ll4pc3|~etgG+TT^y{=)QL5Euswzw
zC<i_qXTE=#XHYAeKq4mL6|!9+Qy6vnn+%A4QxtyCbED{dMSW{EkhuK(kL%f#&3y>z
z_ke-sHJPq|2e;>%J!khWPIYr5&(5j|91$CxZN13x!cVe-LASokTnsFoV8=;;vmb4_
z_LujUE{BM1_a0z&20tD@zQhwEPj`6|OAq_MZXXg4Wy4q7$2)=-Ed^~#*)~Rnb2F`j
z2SwC97{vG=XQzpCz-{6FFkj6(SU7qp-a$%GhCEuHzX0m?1m2Zx5!{31Q!%DY_bsEO
z#S~LQ5#BYkkZpygD57PVoh#w|%(s11hz7z3d!QoO6|jHusBuEEDeAayw`H+l<4s%j
zod!G-`|w;u1czK~)C50-8Wlg<KN+lqm8uhuJi>?zUnSZa*b|V|?leB^e|c#9=^j1k
zRgr^|1F}s)$J-4Wor{&cUfq#r1*}X^QJUL_NLg7fEW`9Np9&x&ji({VwYpko!ZR>~
zBg=dAi4Yh}g4zw+?8!Md^=N8?c)ZCz!zL;~hJgXShHS`-oW6SxbGW5*$eujVu`+(o
z#rSYBuOI0M0@%}sxe`SHAYSV_z=E)Rf%x_W;DTwfsvtU)mx?Stj;oMBdQ>2$b)TRl
zJr#ly5~7`<XDP1ZNf14h640}7%sJ1A#@5;tSeav3D3G6=Uuc1V^7wnA7iZtX7VNr<
z4NZ(#ERuVFG!`lQdLO4fo{Kf4@L_NV?IuAYDo}78lT0{LFh0gy@WCqlp|4~3nM_gS
z@{LiA^OYf!b*6t-?wT)g!QMhTSvr|o)@V7(vf^0}ydp3%COmREZD1e5tUFHA;e<y{
zT#yENa-i{9`^<GBf;?by9)Lk)DBcsA*>!Yw?OvaTp+hwE%k5HinDy?!_bH|+G{$)c
z1{6Qp>!<1Ev^wkY0F{fYecG50V}w#s^1-Oe47FD^Q`4l`j@jqiM-yGi;3>`z<OEX`
zqJHizCuX@aVT0)5Abv!7wV@Xa`G=T@_Pdjjo`$#OnG&0fZ>NTK=4S(Z(JwIo`E)jk
zyrDpnIs#M70Oii4h^Ef1)&HYXt)$TWnD{rhFm&^3qMHmD<iDqne?DnrC4wr3K)vs9
zPym0mjoXiZEDlXdt34#y84Fpj30t3{urMf4Zm(p_G>!&RdO6`>#gmdX@xD6tP7EfS
z_1|xD-wie==TE*yXwG2<B#L2Ya8vtRox5<a3~qxAoR90>EFbi{FD2C;{%EP7UFKP8
zny0e3d}x_1GqONG$JwjH=d4c%C<E$v%H7}{mxb-uYl7l*b+<h27`k-&J~AF(19jkF
zajP8~a5BK{O;P9JMP9XT&=xvs`J$axX>aE|NJb`A5~+*5E<p|DhH;T{k-_u$&o&R{
z_eh@}5jZ&9BsoJ)F2X!z)AU>BwvOz&<t1{tx!;NHBw71g2gPzHd~@hehD1Z`vckLn
zwKjVj)pd>yD?*=*r0I-0r&}clmo-hQ!d?JC810zcpMbFK)L&lq*gHP05x$OD#&8{e
zHIb~J7)&$a#W!)~@9eYPVe2PzgnXnHG0(4`l4vIL^Y3PFEDn$QQ-SShXqx)ldGNhq
ze_vNOL^u(LO9KHcbe)ZkSZ4spTD5y?HO40<Au-b)8t`vq*|_@h_eWax_hDD5leca;
z$bcZg`IwcE?SgyrpQ)n`MsJunm5qL1$=Nkh0br&)aWI(tq`PDI*Vm)BN7rIH+glVb
z8)xd?1@$Zr_4rnScdRix>Vd3|WqBetd7?8m9j!Tr_*V64ry&upLhX)$m{sFY1Rq2O
zPY1SQ0e@2%+|O4En|&8zlIfDyCaKg|4!t*7VvOV;A3^ftLWX~9v4BDD2q79gi~iRs
zRx~@HlCyex9C<P?>hgO1U%XV;*9~i@nwEIy4GyOYaB8Zw`g%SEUzrvH)ghH&W%*7q
z=*ff34nB|SX%YE_E?XPVf+8!+&8VNd2DcWK<?ewD69ywt;f3p6O9l&CjnEV?HeDn(
z5XlgK2Wv+62n(H%Uz4RWEz99K48^|23^FBP8-zxB7A-hwe_{vK6J8F}-Mlse%$N*c
zt9ich-JA*oF~?I=hJlO4;c;Mi$C%eWno?anix2+uljB=mzcOyqvUg3(GUw(H7xc$n
zLdH-m!EYsVc@lpe`M!DavQW1mXnx!OaUt`foM=B=S}7*`?K>B<s&>g`zR$!w!r{NP
z_zJOvGBFxKY7*wP+@#1txoK|VvhRj3y5xD}?w<id8~U=)mb7K?VcYoLyv#CBE8$Db
z<D!tw!OoUFcc$E2B8<io?^FX%#;izR6a@!2TyKC1=LSTCUfVeQ$OuAdi0mJrxE=+A
zc2ZU;YR3aUyjy!y^x6&`uRAPEEFjzu)5$Ql=9PX%m7E=apUd!WX-V*SZk@j9+1YfN
z1v3*fwF_uNs7Ns)@S>+n$z&KCNa(E?UZ|R#9g!b6mptsZZ0>(|g*A)_BY1Q)p-@q&
zJ%YG$GBtIuJhEwn-}V=xUmiKI2|Qya<S%rh2Xai_jE#(pjJmqzguvru)28-y>-6ml
z^8Q?25W?lEKludzJ!m^U{Zs)Pr(Sv-6c%+lZ(yK_<9jhLu8efI#F%XvTX{zV7H?c~
z?Ly8^ruADk_7q+1oZ5n;Ze~(lzao~`G(<>;ooy|;J?iSO0Y@Y~oxo0=DV=a%>V$-m
zxOjD}SgQNzC)J<n*)c9{d7jaj^u7k2Wy{CkCFv#q2G~~L5lDk^e9E}$P36|_h*A}~
zw4red%`=4d7*@J??s$}n79_;Z+cRanG5@RN{_9C&1}F^5<5TljyVO1PpALCFE+?X5
z4nhLffx<wIxk94f<Okv~NVJFK-}gCv0yOG-n|H>kmi`>FD~QGd+L@IZF19mhDcfg`
z92y{gY&xjNiWgzWsowszVIlIbd_k>l<Jrr9rT>Rewg=xi^c1MuCy#p1$5yg{opI0)
z4nUR`@SABzRGTM5Fu`=YmO9dAeUBWPYJRcNa3*&+!20yxtfw?g5{_+I5^7TjFq(%}
z>-i56KleL!3YEC%!Kx~oN@9Wl6N*4K+#zL}lrB_k{FcUy;w4E1<g<=|irGtzr1TC^
zR~dzzQl1-P_$0qHD1?lR4%8Wx?wohL2;x>PbWIug(Md|MiknRiGJGf(l<gY_c9u^D
zB%TBnQaj0x`r0#)F^7yT&e|slCrpX=_4_5ijgBAGlgg##?-T@oj9or|O97YhQWb}A
zE1>v&Q4Hi>spZb?q;E)5A<lPjjr!?y`NGxt&tWyw^v|bYjDOPAIOs^#mC`<03R>k5
zVN`?J<5qEZXh`19&~pqx5k3!IPU$#T?CU4>)(6<-`)wB7P>WM>ql%4=RY4V#QuRic
z^6}_VVFTDTGpL$izn>U9UhBk7293G8t$~18u3}@}UB`kOD1Jd)UPWb1scJUFtMTUV
zdT$?0>N?Yq-U6(1(YC3{rhG)4%+8H9S|+IR^Lh1Mnvm@_z9hzbs{HXWc(@LVbqH!y
zE=EOatb@XG3i80|$SV@TteDRa{?U;NDfEcNA)l;kWg}COC2BNfD*P%Bk5=glf(bgt
z^eD=v*LxHYZEn8OcbdAz5P0-#3^RoexBRdg_(fldPU8r3$j?;VW+!t61360N3Lqg*
zj)jsSZGZXw7KU0oFDp^>3v@S)zpMs$CI3q>r#4ODS#<}^thLSe+nRfNY&RY|rtYHe
ze}<>WapT<^zT^BfxBR+~z8z&`xWr*9pTisgF3YNfv3Dbd%6_#07n7@=-9_)WvaGWV
zI77VAjkB0+V~iOyFAo?kq(Er<y2bd$pa@+czpvWPN3+!M*m|$ZK)E#_Jlv!-TaD{2
ziF^f8aKxBpV^JZ%<<E&VZ%$2P{<<6s+7hmlJjgJ^S3kBSn;kxveQ)K8339ddJccKG
zhGYHQ+Po1Wt!g4IPv@ZgP>|M*1bM@tttExMXWi$T24u*MS6lo4CS;Z_?V~PodFyNn
zwr_>}zQ8VB;AILSA61q-mX-H64W8L|`5uBXC+*wcWsb03ky{hOzg}s2NzWJ*Dn_7C
zs9i?1(7ILs6J*INzdm~}qqve{g}wyReZ6bfBGkWE4PsOQK~xZKn&gsRz8AZcm<30a
zyyl@aD>J92=$kb7syLop`VXZF_mKXJ<ANN-kP-tQq<ASWdE)f^npmrnERkFK<19`c
z$Hs3z0`T(C0=v+Q<y9sLb^3uT=EbOi0supX{)4ZQ$A)-i45kl<G=5g*O;}u*JKmmE
z5|>hV^|Z4m-l&rN{qWP2&h8RQ@hO{xZ{G9bTE$t`?T8ti^FzKc&AqqQruzHO{Mmvx
z;^^+B-Ddn$B0!n3x_;HsMI3FmAymMw1v5UC&lH0%Ii9hH>~KLduS+3Nl?>1jf)zhP
zqR~%xOP?3FsM|6<JZ95cf3{}LyXLySwg(dpXV4T#yJ4o0`}t!qu^@|CKR-OGKbcug
z?bXeo@rb9qMZudHVU*CnhddB<y}0O2TSSxkl^mwx7c=+8#?#?_cIYr}MXjaUXfcQS
z2bK|<pyE~oH{ycL`>k{QD!ZM^!cZd74|T_(2bxExjVS3+EIA}1&o#B466EW{wg@R4
zVf*LD21QnBrYbcBd@vp;q{+@GHpruBzFa%&I4y>*px&eC1xr=9^g{yKiw`Wf?~YsH
zA5MPOY!#XRBFyIaF@t&u>1Xxy`R9VT)sOsLQ6EFRQ>mk4;TV#R$%R{VyFV@>f@)eW
zeXAF?4nxN*KN?DVUWo>QZ@vmrIRQYUkm%ZLR|Rl1Qm~gsQGwi$1dn8GYUywqI7(Cq
z^eAebAo$A{Tr4jed)7REcggs~ChPU(M8@!cLzBK6)|1kT_&RJ0uTNq!<1`BC?(d#0
zM=Efks@~c7Nt;<~1JUNy3mdLhA|t&vp+QNQf9FD%r{nhRVgUhfi(K1u8>gVqdlHwM
z&u0vZ&VTe8+pR?Ugvb@WvL9S$X4?Do$(fWy?7f?$STo(akUB!E)9(JpG11DVZlEkR
z6dNjBP*CJ`zKjj3eK0=a@>*=OBP)i#RZaK=nwd;<RWei8t^n-{B#`$X=`De)0-3t>
zT~$u_)<I!{FwQ;2bwyncSSiqBVE1n}tgh?mpQ#<o5>|(FPw03|?rwz`M2g?kk|F*W
zC{27cKDJ=3adWh<Vc*UCTV%Hv)-N)o?Rod{;-89rW|5<O+-Cj_TaikzS7GpaFS?GS
zQ&CRN>T>=@kzDJ38i#f6+}7gFI*#t0&l{R=a;=54j);pZa)R)tneu}x8F$IEMa$FV
z%X$482@MHPwUWOVJ#XgR0mI7oxO*sa6NY@3Dw$@F+-HEp-h4}r^<7b_rL9Ao?;8rg
z6q!T1j4jGZQxWFDwiUEXegxb0nVa8f3r{C@FVE~R=Gr?w*J_UGHO!tjVVaPSB@`51
ziHHc5cVD#e(#{7hErdl82p2~u+nw!W;g@;03apUG{Cz=3kxLwwhQa3ejAo&fTbjKM
zs9Wj9YKr)hCh>^|GVxhE?o;{IbI~pIW#`VZO-qrEB-^Bav2XQm2-^Ji>J}!tV}EQY
zKABnca9?rV^Lvoh{r$x-l*<<#6kR;aBRyBqe6Q}ngWrF4M_+B&NEIU`L{veW2k-w>
znY>|^-%1<ao40TCZ#!<Zuv5Uf`Adcnu{R`gMQs0Cp--1r1^=8TGq>BH^{(e0Z?^fV
z30Ay3)c9R<!zrZ(>wmFv?wWl$KUl!_9-;0bI}aNtE2+UOUUxP-P`V;aiBqxH%OnIa
zE{UdZ{aYc`)ro_ef1q)yS||qNvI#>Y7GoB09NeJ>Md*C!)^C*)awQeo2ToWZQJFkb
zk0cMY8cSY{Ce+Ss$iKZ)u2s@vo`Um8Sydbjck#7fA*21w#sK3on%!iAmLT(t$X-^`
zMC2+FXLXGj=C}L{0`#ezzOj8oOXbepiML;CRHtcx{=l;05buYXX3sYl-kVL_ddCaL
zdv?^0mu0JQJn9oD>L<P{TZx9?BWpc!u<6cb-+jiCsInOlW4)aDEz1SWgyB*ZG*;F%
zUbQDgP!O+wm!|jn@MjkX=<heId~j1_Sz``1V7cRlSN^wN9ix@2vdTkJVQOWiRICH$
zidTlH8<!it0AaWcsj_&CN*YTUOK3?l-S0`dfH)q(d3Nwr&=O;+baTBMC}^#C81`8F
zOSp2l^3y(vK61Zg&oZm2(IfJz-iaBZO}mA}GO=>mL~U^NTV(;55CYYwKtO<dxp-8f
zxgdsSjKjS&THvuT)k&7WzHO$i1rTa3?(9@nm8QwcbPR%P5@aSQl|vZ`GhET|eJ-I8
zsAajG+-eNx8*!u(9JAiF39M6xnbxQ@kdS}{6r`g|qtkV?<=l7#zMy7j$JmZw4oSTh
zBJ^P{4P!}o5D7qs7o$;si*K@%Ge8*C2k0ktI5g!@M&~z1eoA89`SRs0>lJtobM29~
z@Gy7$924R?K@B4WQ;~u?rCQwd+2B%s8a08MpLTWY?<Ado=<*!HPCJVvhNDoWXBaxL
zDy|02x~BhiM1g=RpD;wa^#S)Fl59?3O71jA<G1rm$l>Oc6T@Q4xq{{!(8}q*<qRd}
zAXcYuAp`OEN}sFofUPa>^(ReIG0?vY9!mYmqitF?@x_!$A?XG{vK-7~EKf81_A&Mz
z!8Lm=kC}<<XwpNPQT5L@pPp8^SQ?Ct?y(&MXRFPURz|NF;5hz3OBV9D&UZNds(L!C
z^!l1SAtuBp`(6{gXGdV-hS5R$wI5hFr#yXj|6&$PaYVQ|x;Njs)2l17Pfgu+T@sox
z9n+7@ubh~GMx4~PYj6htxY%9A`|j=y*Nq5^h_W(7CnhHD?D8tN3)fB`=#F>GDk(|4
z3PV*6P%7=7xbn()EwUHM?W=C|wG*1NLQ9h+kNepI$A)Tc6|%;a4p*9GlMWOJg*Ngb
zf6vp7g?#A$hHbY89mEg`H;amj#tS2k2EJ17Q)`gL^^)L_HOjkRo;W>IKKlKzeOe^)
zqS3;oz|Z$&r)1*eQ`*!|sLEcxNgYA9gZ+T9FcY(YaS@@1UR|fjWZ-CuTcHl&11k@0
z1@+1qtK1`WEm#P7vvRzy$|nw|6!*_2{Eb#>a4_^Rfz|gj-A&7hc-3FTIiKX6&;_z|
z-E)w|ISd3~ht2VG&3bpEb`F=?k4v6%&aVRwz8m<N%QMj~KWQ408)V$iSLmxrDQG1x
zhVGvoscWWPsgQwzo^F9I+wsc}C(N~WzK|Y!T`))e<F)64IXV>*hYSjfwvULO14oaC
zS}re^!h**a6?n%B74Dy}N9`^I*#+-b%y!t-3kr$ia<)2;7Zi@(MD2}7D$$UfkJu{_
z@lhwwF8{zq^=unwX}XT4m*h{Liz=W0*qlGx8_FV_*Uxz>aDX3SpCdb8N1js`EgcRl
z{rfoHq)>2iFg0b5`~H}C=ykTJR1|TL(e4?5q;{I`K5e<&wnB46ouj*nJzbq)%?q3R
z>tpsWBG)v>BfW5(>Uc{*+5ZSxtLKF9;HtXb`{6S=a)7M#L|yM$FISH&6@Qv~uRG54
z8eo4h=`}y|=P-%cF4#vPE%$M;q~~0h@CCMe|2gUZ(<4@?fqkv{YE(sqCnc6K19siX
zwr*My>R4t+d&L<7F1tGCE+<+pRm<$^I4(~G>&6&D#tt(Q7Mt9J*yb;A=8}_-$T7en
zQqN?X>V_p39u#kM2T$e4t|3sl$PBHTcK<Lr`A%;C;?JqxXa<k|vI<)7l}xJC%~TB%
zz&pU*eFC{o2h@&?G_`NlvbssDn_-V$theRa+iV6ycgMmUnBZ_!hD;h~=Sm7AgNj3r
zDv|tyFU`mJ-%q~<droWxTz1E-!MM2Mdbwtx)aE7gvPq`wye~1{>1WcD9{8?<1Lo_@
zuYcIHhxsW}!49X^i{?-B29zTl0-}0&wEeM0GccGByI^gO!jw<tvaGoP4PWhyBsZ3>
zXYh5y+O6>YjiUMY0m~~JUhD<7HZ~(NsVVR$7hduZK5fU<j;v7n>f)CNDgZ9D6n*%T
z#Dy#VMPCNh6XOuZE5_KXXmF~qbiVkB5P2NN{HpAB==u={PV`D>IX6(eKnJya-?}I|
zAHO_bYolfkEASjBKkrh9pY>(j#(k*T@|Qoasy5N>58GYbUro-<v5)-Y`juKY`BU$5
zCjWyEV^$4gRE_pNHe^1(Z(Z9JM7M=&`9os_I)pI2Gv2frYU#eX02uu3Uw@|Doc2Yl
z7W6vD4g1J{f7;jHxPE<X-Gb+g+S^q(V)=V|dW!Gs>tk_f>uJ0TW{lIZ0G9$Pw^ish
zsjxq_1m9*ZubiDyOSDN{6skWBjNA(9`d3w;K#<-4TBIDMtnH{b9ZK?2i%eC;huw%J
z&Yh0_F5E+s?ZfMd32$!!4GoQ0z9a?!pf5>t8YM}0&2xg%!GAwH>hxO`NQ;KJ6%y@Q
z(CyeOaxwBryR@Q79{?OS@Yq+)o(u2YybE6+6YN8GKNVf+5OUxX0Duhtw-$i#>18Ye
zeAeS=rG8hI!T;$u%!;w_@6g6a(B5k^BJ_N@A#XCR@!_QOvF2>?Wa-0d8ejmO8b<7E
zx8OXV;{6yAcI<IES{Gg=Bi9ztWL1se)$j0gd-#y2@Wl%jb-=KauC<(XO471}jgArl
zbOdZx{PTow9uq(L-M<)`J#9PPzJfvDoe6`8zdyA6c$A|q&N9U;5>L6x>8b>>?6N##
zQ<1{oI^2ZV=@6afUy&B~oS0DPS-If?^EnW}hj{U(?WU;#DfJ7*<8!;2RjajqA!n7H
zMI>kbt5QCX_JwUTJV)fthgmCt9IVQthE0r~&84uWr>SlARBw5Nxwg){FzNf@uqIcW
zMi`jE*8iT331aH-Gk($QCk3)n8H@4`wCYeGu9z5bMy_NSaDai6Pu5-qQN+H)JcIlH
zeit86q)ItrQ5ql<>@JPr(QLqCQiH|=l%;@hY@V}EB=_Y9`^d}9`4JC7)tkcBjqQ(5
z10OF*x5+_BQh{hYa^2_Nbl?sbMs**2LyMh1JN->wX&Db{YlMeolH_s0YR+REa?EPL
z>g6d9#<XzN^GA+w3(^G@IdKrGl)EnXjAa1Pc3lbpuGCx4wNqw0#azaCw6HMaR}+cZ
z`Cc_;1ql=XuU!%$A9_jfazB$A;|ij)bLQ#PJ^1D|`2O{iKZAVcQu8kuQXVW6PEwl`
z+J8c}6vN82#{5n<S0w1>sLR3ZxMJY%&(8&^$CZe`8n5P7<lfJxZSzHKMHM2W;&oVO
z3nn2dAlfHqzjVj#<-evGzp)S|=wQlj^02Opn_Jt9f>*<@U%w8uKQCD73K}oCa#K=<
zgMWRETv|P!64ZO)oJR&!PHzmE7$`SXe<d)zr7y|=9p9RlG2);-{%1R5U?PpL7fykI
zj*~~$5!xang~ZOnjU)NmnJqad8Z@?kiJ(BpX9ganrA}{m9v4z>bTWi&Pev|1baPMc
zJuxA4cb_pYoo+M0qG50fv^iBes_79XwW@7iKS8ASmywyw6k3>BEq;t?o)8d`a}<%^
z2Le<w`&8R!n%Bo|e+OJ>5<BhcT=lz%+h-FpX(FD5EVNZfDjw}+v2nkpt-yR^s=Q8`
z(DiqInMcH~nXOirvY*ScS2i{b`^YD<#L`{(W(6ddiTTai+WKT&)cG+XVkd^;2ms<#
zD?>ZGbdyJ1lN0XCh6S<$#dg&Q`?EbS#nwe__m;UoS8Zv=5m9;EuNhCp9~)V>PVxQ$
z*8JI|-QRs7*Y$i1<e+hi8Sl$503zwB<(L}?+WMv(S+*n_bTmIgTNJX^uF8_`N^6ya
zeQ74X376^XpR$PzQ4R9`R96K;QeO!`9AMD!-rhT<z=LnjfrX;>ZIkc4e>!@3qPki`
z4|R_AbVa*!coL~%)88-D{`b<fY*MV>`k1I)r@!1*Kv-c@Y@@64Z_bEczbSB`O7ebJ
z7NlFqtjqb7sIYL}j9u9IS)l^K<Ca2TxVuZ>U9SLn5r`zYe9wP1G&0b0``fL^{a5FS
ziNdKZOUn0JIyxSP71TP>1)o;rx)PNAfA@8r6Px*9Nb7^!&+leAyY2oeIy;!}J<D(C
zuOAxL7KNoB5ik0zy~b~KZG4#)G_gQZQ}4%1C19l-Q&4m<ZFzsrPIiCgCMmYS&CX+J
zBppbg<Q0-#J_o-mCQ}|d5Wslpg4mLu;(g@PHl7XU2l~JZaCC&BIpR`R#YUy4F<SB|
zgcTU;#Z}{Uu;wPJbPkQPrlT6_g2t6iY8&j<=!!wVz-bakBlaw{KG~#1Rk)(M-HOfU
zPhd-Z|8nu);IvMFJ9I;qM%~duxn<0!aD8O@So+nqg-4Rvcn}P>hS+YD`~?&3fPDP@
zyONXRCUqu{xe-eSe%1Y1F{Hz<cTD%C>(wvyKK>KpE7G$~QddbrJ(EXLT)gzEn?brc
zxbW@ehq<{eKpNwW;J<$T`fzd*Z0RNK&wwbWQx(+1TZ(vmK-hT~u67kwbS=2g1-{w(
zDtTBPUx5DOiQ$&cww4s=ZHJ#k(zUsn9pD^2+g@v#iJkqVzOPH<T!sh4cS^<cRTx_K
zgz@&vOCz|2gyP~<SsaQ<c?1M=hH>S7_kZVAXZMN;C4&oa;(YpG;EPU)F&h?V^Fr+f
zqDHC|*Dth1)UU?&^1*><q2XCM`y^IKx-;wX*X%50YAF{Nj07tgB2ryj5MXTiF{IG1
zZpQCCNjBT~5!LNs-Qim1gYf)59-;L0D;Fgt0|JHq>+E8NiuG%Cngluf+(oe@n2PMW
ze_|OPv(j!HIsT_asL4__ldNU({VX<q<tYq`OgDE~H|Y=X3gMVO+zcc#LkIQ7@YYRZ
ziFm5cePfLnA&ZD+-4DE^5dUZ$!6{^!pZ*KhUNN{+3LTV=UJ(0*fowwzPRQrOPAKpi
zF&G&!*f5Zxu^D+ELU`SBbQloqh%13d)*7j&1^&-1@EOy2v!I5RBv+LqcVV(<4gj2}
zni)$%T*=}-C@?+gNn#WaV{Zx-Lwpzu%MkE*p!H=VutO^TfM|Q`H}HJ2GFuJG1QXD1
z;Df{atVr=piV*c=*AJ+_mseaqpv@|bH{yvwZ3Q#PvRiyefp@xD?fysyJ(<-jmbJGv
zrs$Dk?wd4hqTEnew2INTSBe$mv&1iKzsNrO|N3x2dc`-N%$Vcdj{pqcn8HYMejAJw
zD`n?bzv`Z;25$|V2LL>q&-G7V-s=0Ey8?g~znIdm_njhi(CeA8GZ$$=`sB|i(Zu=e
zh_}JPsn;7y{;ayhZl_jhlFPm4YWd7*`#93y<dP=16W;KOCw*5qa~K~<_<odOCcP;|
zv@>`h$kR6FMf2~&{N{1UXai9oj}RE;^y0ZfUtJs;+!C1V>AySNFF*G4A%`R88TG+q
zSpyp22B3m&zL`xOK8RymA@{?bZd}+A3u{6;B86_bjW7PU<nNO9LiEL1WcPE{{F48c
OL~0}S;k9ZGvHt_&ZUYhk

literal 0
HcmV?d00001


From ecb66ad2e2213e52f3460964be7a2c8f21c69a08 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 29 Mar 2021 15:33:54 +0900
Subject: [PATCH 2078/3722] Fix up xmldoc

---
 .../Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs b/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs
index ece8219071..576fbb2af0 100644
--- a/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs
+++ b/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Difficulty.Preprocessing
         public readonly double StartTime;
 
         /// <summary>
-        /// Clockrate adjusted start time of <see cref="BaseObject"/>.
+        /// Clockrate adjusted end time of <see cref="BaseObject"/>.
         /// </summary>
         public readonly double EndTime;
 

From 699a317b445ff557163d91143682ab6f6c5faf8d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 29 Mar 2021 18:07:47 +0900
Subject: [PATCH 2079/3722] Fix chat scroll sticking visually when scrolling
 beyond bottom extent

---
 osu.Game/Overlays/Chat/DrawableChannel.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Chat/DrawableChannel.cs b/osu.Game/Overlays/Chat/DrawableChannel.cs
index 86ce724390..5f9c00b36a 100644
--- a/osu.Game/Overlays/Chat/DrawableChannel.cs
+++ b/osu.Game/Overlays/Chat/DrawableChannel.cs
@@ -275,7 +275,8 @@ namespace osu.Game.Overlays.Chat
                     {
                         if (!UserScrolling)
                         {
-                            ScrollToEnd();
+                            if (Current < ScrollableExtent)
+                                ScrollToEnd();
                             lastExtent = ScrollableExtent;
                         }
                     });

From 9a02f3868c2105e51dbd7e64ce4443d08938d02e Mon Sep 17 00:00:00 2001
From: Nathan Alo <n20gaming2000@gmail.com>
Date: Mon, 29 Mar 2021 17:29:05 +0800
Subject: [PATCH 2080/3722] return a string instead

---
 osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs | 4 ++--
 osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs     | 4 ++--
 osu.Game/Rulesets/Edit/HitObjectComposer.cs            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 4cb34a217c..d9570bf8be 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Rulesets.Mania.Edit
             }
         }
 
-        public override IEnumerable<string> ConvertSelectionToString()
-            => EditorBeatmap.SelectedHitObjects.Cast<ManiaHitObject>().Select(h => $"{h.StartTime}|{h.Column}");
+        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.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 1943f52c73..396fd41377 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -82,8 +82,8 @@ namespace osu.Game.Rulesets.Osu.Edit
         protected override ComposeBlueprintContainer CreateBlueprintContainer()
             => new OsuBlueprintContainer(this);
 
-        public override IEnumerable<string> ConvertSelectionToString()
-            => selectedHitObjects.Cast<OsuHitObject>().Select(h => (h.IndexInCurrentCombo + 1).ToString());
+        public override string ConvertSelectionToString()
+            => string.Join(',', selectedHitObjects.Cast<OsuHitObject>().OrderBy(h => h.StartTime).Select(h => (h.IndexInCurrentCombo + 1).ToString()));
 
         private DistanceSnapGrid distanceSnapGrid;
         private Container distanceSnapGridContainer;
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index eee16043e4..736fc47dee 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -438,7 +438,7 @@ namespace osu.Game.Rulesets.Edit
         /// </summary>
         public abstract bool CursorInPlacementArea { get; }
 
-        public virtual IEnumerable<string> ConvertSelectionToString() => Array.Empty<string>();
+        public virtual string ConvertSelectionToString() => string.Empty;
 
         #region IPositionSnapProvider
 

From cdb779f764bb09dcba1784f66fc87aab9debfd8b Mon Sep 17 00:00:00 2001
From: Nathan Alo <n20gaming2000@gmail.com>
Date: Mon, 29 Mar 2021 17:30:23 +0800
Subject: [PATCH 2081/3722] move copy logic inside ComposeScreen

---
 .../Screens/Edit/Compose/ComposeScreen.cs     | 37 ++++++++++----
 .../Screens/Edit/Compose/SelectionHelper.cs   | 51 -------------------
 2 files changed, 26 insertions(+), 62 deletions(-)
 delete mode 100644 osu.Game/Screens/Edit/Compose/SelectionHelper.cs

diff --git a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
index 16043ff64b..f6ce5a4e3d 100644
--- a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
+++ b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
@@ -2,13 +2,17 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Diagnostics;
+using System.Linq;
+using System.Text;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
+using osu.Framework.Platform;
 using osu.Game.Beatmaps;
+using osu.Game.Extensions;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Edit.Compose.Components.Timeline;
@@ -21,14 +25,17 @@ namespace osu.Game.Screens.Edit.Compose
         [Resolved]
         private IBindable<WorkingBeatmap> beatmap { get; set; }
 
-        private HitObjectComposer composer;
+        [Resolved]
+        private GameHost host { get; set; }
 
-        private readonly SelectionHelper helper;
+        [Resolved]
+        private EditorClock clock { get; set; }
+
+        private HitObjectComposer composer;
 
         public ComposeScreen()
             : base(EditorScreenMode.Compose)
         {
-            Add(helper = new SelectionHelper());
         }
 
         private Ruleset ruleset;
@@ -78,17 +85,25 @@ namespace osu.Game.Screens.Edit.Compose
             return beatmapSkinProvider.WithChild(rulesetSkinProvider.WithChild(content));
         }
 
+        private string formatSelectionAsString()
+        {
+            var builder = new StringBuilder();
+            builder.Append(EditorBeatmap.SelectedHitObjects.OrderBy(h => h.StartTime).FirstOrDefault()?.StartTime.ToEditorFormattedString() ?? clock.CurrentTime.ToEditorFormattedString());
+
+            if (EditorBeatmap.SelectedHitObjects.Any() && composer != null)
+                builder.Append($" ({composer.ConvertSelectionToString()})");
+
+            builder.Append(" - ");
+
+            return builder.ToString();
+        }
+
         public bool OnPressed(PlatformAction action)
         {
-            switch (action.ActionType)
-            {
-                case PlatformActionType.Copy:
-                    helper.CopySelectionToClipboard();
-                    return false;
+            if (action.ActionType == PlatformActionType.Copy)
+                host.GetClipboard().SetText(formatSelectionAsString());
 
-                default:
-                    return false;
-            }
+            return false;
         }
 
         public void OnReleased(PlatformAction action)
diff --git a/osu.Game/Screens/Edit/Compose/SelectionHelper.cs b/osu.Game/Screens/Edit/Compose/SelectionHelper.cs
deleted file mode 100644
index a01a9e0144..0000000000
--- a/osu.Game/Screens/Edit/Compose/SelectionHelper.cs
+++ /dev/null
@@ -1,51 +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 System.Text;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Platform;
-using osu.Game.Extensions;
-using osu.Game.Rulesets.Edit;
-
-namespace osu.Game.Screens.Edit.Compose
-{
-    public class SelectionHelper : Component
-    {
-        [Resolved]
-        private GameHost host { get; set; }
-
-        [Resolved]
-        private EditorClock clock { get; set; }
-
-        [Resolved]
-        private EditorBeatmap editorBeatmap { get; set; }
-
-        [Resolved(CanBeNull = true)]
-        private HitObjectComposer composer { get; set; }
-
-        public void CopySelectionToClipboard()
-        {
-            host.GetClipboard().SetText(formatSelectionAsString());
-        }
-
-        private string formatSelectionAsString()
-        {
-            const string separator = " - ";
-            var builder = new StringBuilder();
-
-            if (!editorBeatmap.SelectedHitObjects.Any())
-            {
-                builder.Append($"{clock.CurrentTime.ToEditorFormattedString()}{separator}");
-                return builder.ToString();
-            }
-
-            string hitObjects = composer != null ? string.Join(',', composer.ConvertSelectionToString()) : string.Empty;
-
-            builder.Append(editorBeatmap.SelectedHitObjects.Min(h => h.StartTime).ToEditorFormattedString());
-            builder.Append($" ({hitObjects}){separator}");
-            return builder.ToString();
-        }
-    }
-}

From 90ab765cf519be8be956175f492f3c7aff4e0f0e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 29 Mar 2021 18:46:32 +0900
Subject: [PATCH 2082/3722] Reorder methods and surround with region

---
 .../Screens/Edit/Compose/ComposeScreen.cs     | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
index f6ce5a4e3d..1d52cc60fd 100644
--- a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
+++ b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
@@ -85,6 +85,20 @@ namespace osu.Game.Screens.Edit.Compose
             return beatmapSkinProvider.WithChild(rulesetSkinProvider.WithChild(content));
         }
 
+        #region Input Handling
+
+        public bool OnPressed(PlatformAction action)
+        {
+            if (action.ActionType == PlatformActionType.Copy)
+                host.GetClipboard().SetText(formatSelectionAsString());
+
+            return false;
+        }
+
+        public void OnReleased(PlatformAction action)
+        {
+        }
+
         private string formatSelectionAsString()
         {
             var builder = new StringBuilder();
@@ -98,16 +112,6 @@ namespace osu.Game.Screens.Edit.Compose
             return builder.ToString();
         }
 
-        public bool OnPressed(PlatformAction action)
-        {
-            if (action.ActionType == PlatformActionType.Copy)
-                host.GetClipboard().SetText(formatSelectionAsString());
-
-            return false;
-        }
-
-        public void OnReleased(PlatformAction action)
-        {
-        }
+        #endregion
     }
 }

From 3909eda095ce5f6fcfdc7afa7e3ea4fdaf826540 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 29 Mar 2021 18:51:28 +0900
Subject: [PATCH 2083/3722] Avoid using a StringBuilder

---
 osu.Game/Screens/Edit/Compose/ComposeScreen.cs | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
index 1d52cc60fd..61056aeced 100644
--- a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
+++ b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
@@ -3,7 +3,6 @@
 
 using System.Diagnostics;
 using System.Linq;
-using System.Text;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -101,15 +100,15 @@ namespace osu.Game.Screens.Edit.Compose
 
         private string formatSelectionAsString()
         {
-            var builder = new StringBuilder();
-            builder.Append(EditorBeatmap.SelectedHitObjects.OrderBy(h => h.StartTime).FirstOrDefault()?.StartTime.ToEditorFormattedString() ?? clock.CurrentTime.ToEditorFormattedString());
+            if (composer == null)
+                return string.Empty;
 
-            if (EditorBeatmap.SelectedHitObjects.Any() && composer != null)
-                builder.Append($" ({composer.ConvertSelectionToString()})");
+            double displayTime = EditorBeatmap.SelectedHitObjects.OrderBy(h => h.StartTime).FirstOrDefault()?.StartTime ?? clock.CurrentTime;
+            string selectionAsString = composer.ConvertSelectionToString();
 
-            builder.Append(" - ");
-
-            return builder.ToString();
+            return !string.IsNullOrEmpty(selectionAsString)
+                ? $"{displayTime.ToEditorFormattedString()} ({selectionAsString}) - "
+                : $"{displayTime.ToEditorFormattedString()} - ";
         }
 
         #endregion

From 1d99a63f17f8e339097552dc51fbc27bef00b5c7 Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Mon, 29 Mar 2021 14:02:53 +0200
Subject: [PATCH 2084/3722] Limit minimum size for single slider scaling

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

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 3a4a37c8cc..6350bd7190 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -194,6 +194,10 @@ namespace osu.Game.Rulesets.Osu.Edit
         private void scaleSlider(Slider slider, Vector2 scale)
         {
             Quad sliderQuad = getSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position.Value));
+
+            // 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;
+
             Vector2 pathRelativeDeltaScale = new Vector2(1 + scale.X / sliderQuad.Width, 1 + scale.Y / sliderQuad.Height);
 
             Queue<Vector2> oldControlPoints = new Queue<Vector2>();

From 17b16d4f8914b9989b2f116e334e26fd0a4c39fe Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Mon, 29 Mar 2021 14:17:30 +0200
Subject: [PATCH 2085/3722] Clarify purpose of getClampedScale()

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

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 6350bd7190..07643bd75e 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -274,7 +274,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         }
 
         /// <summary>
-        /// Clamp scale where selection does not exceed playfield bounds or flip.
+        /// Clamp scale for multi-object-scaling where selection does not exceed playfield bounds or flip.
         /// </summary>
         /// <param name="hitObjects">The hitobjects to be scaled</param>
         /// <param name="reference">The anchor from which the scale operation is performed</param>

From badf5ee4a2403998b4508907425630b21ea9e392 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 29 Mar 2021 15:03:10 +0200
Subject: [PATCH 2086/3722] Fix stable.json file directory location due to the
 change of how TournamentStorage works

---
 .../NonVisual/IPCLocationTest.cs              | 68 +++++++++++++++++++
 osu.Game.Tournament/IO/TournamentStorage.cs   | 21 +++---
 osu.Game.Tournament/Models/StableInfo.cs      |  6 +-
 3 files changed, 85 insertions(+), 10 deletions(-)
 create mode 100644 osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs

diff --git a/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs b/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs
new file mode 100644
index 0000000000..29586dfdec
--- /dev/null
+++ b/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs
@@ -0,0 +1,68 @@
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using NUnit.Framework;
+using osu.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Platform;
+using osu.Game.Tournament.IO;
+using osu.Game.Tournament.IPC;
+
+namespace osu.Game.Tournament.Tests.NonVisual
+{
+    [TestFixture]
+    public class IPCLocationTest
+    {
+        [Test]
+        public void CheckIPCLocation()
+        {
+            // don't use clean run because files are being written before osu! launches.
+            using (HeadlessGameHost host = new HeadlessGameHost(nameof(CheckIPCLocation)))
+            {
+                string basePath = Path.Combine(RuntimeInfo.StartupDirectory, "headless", nameof(CheckIPCLocation));
+
+                // Set up a fake IPC client for the IPC Storage to switch to.
+                string testCeDir = Path.Combine(basePath, "stable-ce");
+                Directory.CreateDirectory(testCeDir);
+
+                string ipcFile = Path.Combine(testCeDir, "ipc.txt");
+                File.WriteAllText(ipcFile, string.Empty);
+
+                try
+                {
+                    var osu = loadOsu(host);
+                    TournamentStorage storage = (TournamentStorage)osu.Dependencies.Get<Storage>();
+                    FileBasedIPC ipc = (FileBasedIPC)osu.Dependencies.Get<MatchIPCInfo>();
+
+                    Assert.True(ipc.SetIPCLocation(testCeDir));
+                    Assert.True(storage.AllTournaments.Exists("stable.json"));
+                }
+                finally
+                {
+                    host.Storage.DeleteDirectory(testCeDir);
+                    host.Storage.DeleteDirectory("tournaments");
+                    host.Exit();
+                }
+            }
+        }
+
+        private TournamentGameBase loadOsu(GameHost host)
+        {
+            var osu = new TournamentGameBase();
+            Task.Run(() => host.Run(osu));
+            waitForOrAssert(() => osu.IsLoaded, @"osu! failed to start in a reasonable amount of time");
+            return osu;
+        }
+
+        private static void waitForOrAssert(Func<bool> result, string failureMessage, int timeout = 90000)
+        {
+            Task task = Task.Run(() =>
+            {
+                while (!result()) Thread.Sleep(200);
+            });
+
+            Assert.IsTrue(task.Wait(timeout), failureMessage);
+        }
+    }
+}
diff --git a/osu.Game.Tournament/IO/TournamentStorage.cs b/osu.Game.Tournament/IO/TournamentStorage.cs
index 5d9fed6288..044b60bbd5 100644
--- a/osu.Game.Tournament/IO/TournamentStorage.cs
+++ b/osu.Game.Tournament/IO/TournamentStorage.cs
@@ -1,12 +1,12 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
+using System.IO;
 using osu.Framework.Bindables;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.IO;
-using System.IO;
-using System.Collections.Generic;
 using osu.Game.Tournament.Configuration;
 
 namespace osu.Game.Tournament.IO
@@ -15,7 +15,12 @@ namespace osu.Game.Tournament.IO
     {
         private const string default_tournament = "default";
         private readonly Storage storage;
-        private readonly Storage allTournaments;
+
+        /// <summary>
+        /// The storage where all tournaments are located.
+        /// </summary>
+        public readonly Storage AllTournaments;
+
         private readonly TournamentStorageManager storageConfig;
         public readonly Bindable<string> CurrentTournament;
 
@@ -23,16 +28,16 @@ namespace osu.Game.Tournament.IO
             : base(storage.GetStorageForDirectory("tournaments"), string.Empty)
         {
             this.storage = storage;
-            allTournaments = UnderlyingStorage;
+            AllTournaments = UnderlyingStorage;
 
             storageConfig = new TournamentStorageManager(storage);
 
             if (storage.Exists("tournament.ini"))
             {
-                ChangeTargetStorage(allTournaments.GetStorageForDirectory(storageConfig.Get<string>(StorageConfig.CurrentTournament)));
+                ChangeTargetStorage(AllTournaments.GetStorageForDirectory(storageConfig.Get<string>(StorageConfig.CurrentTournament)));
             }
             else
-                Migrate(allTournaments.GetStorageForDirectory(default_tournament));
+                Migrate(AllTournaments.GetStorageForDirectory(default_tournament));
 
             CurrentTournament = storageConfig.GetBindable<string>(StorageConfig.CurrentTournament);
             Logger.Log("Using tournament storage: " + GetFullPath(string.Empty));
@@ -42,11 +47,11 @@ namespace osu.Game.Tournament.IO
 
         private void updateTournament(ValueChangedEvent<string> newTournament)
         {
-            ChangeTargetStorage(allTournaments.GetStorageForDirectory(newTournament.NewValue));
+            ChangeTargetStorage(AllTournaments.GetStorageForDirectory(newTournament.NewValue));
             Logger.Log("Changing tournament storage: " + GetFullPath(string.Empty));
         }
 
-        public IEnumerable<string> ListTournaments() => allTournaments.GetDirectories(string.Empty);
+        public IEnumerable<string> ListTournaments() => AllTournaments.GetDirectories(string.Empty);
 
         public override void Migrate(Storage newStorage)
         {
diff --git a/osu.Game.Tournament/Models/StableInfo.cs b/osu.Game.Tournament/Models/StableInfo.cs
index 0b0050a245..d390f88d59 100644
--- a/osu.Game.Tournament/Models/StableInfo.cs
+++ b/osu.Game.Tournament/Models/StableInfo.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using Newtonsoft.Json;
 using osu.Framework.Platform;
+using osu.Game.Tournament.IO;
 
 namespace osu.Game.Tournament.Models
 {
@@ -24,13 +25,14 @@ namespace osu.Game.Tournament.Models
         /// </summary>
         public event Action OnStableInfoSaved;
 
-        private const string config_path = "tournament/stable.json";
+        private const string config_path = "stable.json";
 
         private readonly Storage storage;
 
         public StableInfo(Storage storage)
         {
-            this.storage = storage;
+            TournamentStorage tStorage = (TournamentStorage)storage;
+            this.storage = tStorage.AllTournaments;
 
             if (!storage.Exists(config_path))
                 return;

From 36364a449249fb42289e82e1e8d6c05105a43885 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 29 Mar 2021 22:12:49 +0900
Subject: [PATCH 2087/3722] Update framework

---
 osu.Android.props                             | 2 +-
 osu.Game/Input/Handlers/ReplayInputHandler.cs | 2 --
 osu.Game/osu.Game.csproj                      | 2 +-
 osu.iOS.props                                 | 4 ++--
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 75ac298626..3682a44b9f 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.323.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.329.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/Input/Handlers/ReplayInputHandler.cs b/osu.Game/Input/Handlers/ReplayInputHandler.cs
index 93ed3ca884..fba1bee0b8 100644
--- a/osu.Game/Input/Handlers/ReplayInputHandler.cs
+++ b/osu.Game/Input/Handlers/ReplayInputHandler.cs
@@ -34,8 +34,6 @@ namespace osu.Game.Input.Handlers
 
         public override bool IsActive => true;
 
-        public override int Priority => 0;
-
         public class ReplayState<T> : IInput
             where T : struct
         {
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index b90c938a8b..35b0827715 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.323.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.329.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.0.7" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index ce182a3054..ceb46eae87 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.323.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.329.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.323.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.329.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From d84c9251e6d4d6569e5f895a7cf6943c2c722467 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 29 Mar 2021 22:17:24 +0900
Subject: [PATCH 2088/3722] Update nuget packages

---
 osu.Game/osu.Game.csproj | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 35b0827715..6d571218fc 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -18,20 +18,20 @@
     </None>
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="DiffPlex" Version="1.6.3" />
+    <PackageReference Include="DiffPlex" Version="1.7.0" />
     <PackageReference Include="Humanizer" Version="2.8.26" />
     <PackageReference Include="MessagePack" Version="2.2.85" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="5.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="5.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="5.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="5.0.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.329.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
-    <PackageReference Include="Sentry" Version="3.0.7" />
+    <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

From 6c5a10a7449a24fdd6932c6cb8ba99c7d98affd6 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 29 Mar 2021 15:27:25 +0200
Subject: [PATCH 2089/3722] Add missing license header

---
 osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs b/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs
index 29586dfdec..086ed54435 100644
--- a/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs
+++ b/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs
@@ -1,3 +1,6 @@
+// Copyright (c) ppy 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.Threading;

From 70d5b616f28bb8916bb9dda0a9e1810b942d8afb Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 29 Mar 2021 15:49:49 +0200
Subject: [PATCH 2090/3722] Add scaling path type recovery

---
 osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 871339ae7b..da484b9782 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -33,6 +33,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
             base.OnOperationEnded();
             referenceOrigin = null;
+            referencePathTypes = null;
         }
 
         public override bool HandleMovement(MoveSelectionEvent moveEvent) =>
@@ -43,6 +44,12 @@ namespace osu.Game.Rulesets.Osu.Edit
         /// </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.
+        /// </summary>
+        private List<PathType?> referencePathTypes;
+
         public override bool HandleReverse()
         {
             var hitObjects = EditorBeatmap.SelectedHitObjects;
@@ -141,11 +148,17 @@ namespace osu.Game.Rulesets.Osu.Edit
             // is not looking to change the duration of the slider but expand the whole pattern.
             if (hitObjects.Length == 1 && hitObjects.First() is Slider slider)
             {
+                referencePathTypes ??= slider.Path.ControlPoints.Select(p => p.Type.Value).ToList();
+
                 Quad quad = getSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position.Value));
                 Vector2 pathRelativeDeltaScale = new Vector2(1 + scale.X / quad.Width, 1 + scale.Y / quad.Height);
 
                 foreach (var point in slider.Path.ControlPoints)
                     point.Position.Value *= pathRelativeDeltaScale;
+
+                // Maintain the path types in case they were defaulted to bezier at some point during scaling
+                for (int i = 0; i < slider.Path.ControlPoints.Count; ++i)
+                    slider.Path.ControlPoints[i].Type.Value = referencePathTypes[i];
             }
             else
             {

From 6f01070408fb5fad37d33765a22997d1189d9cc8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 29 Mar 2021 23:06:29 +0900
Subject: [PATCH 2091/3722] Add weird android package requirements

---
 osu.Android/osu.Android.csproj                               | 5 +++++
 .../osu.Game.Rulesets.Catch.Tests.Android.csproj             | 5 +++++
 .../osu.Game.Rulesets.Mania.Tests.Android.csproj             | 5 +++++
 .../osu.Game.Rulesets.Osu.Tests.Android.csproj               | 5 +++++
 .../osu.Game.Rulesets.Taiko.Tests.Android.csproj             | 5 +++++
 osu.Game.Tests.Android/osu.Game.Tests.Android.csproj         | 3 +++
 6 files changed, 28 insertions(+)

diff --git a/osu.Android/osu.Android.csproj b/osu.Android/osu.Android.csproj
index a2638e95c8..2051beae21 100644
--- a/osu.Android/osu.Android.csproj
+++ b/osu.Android/osu.Android.csproj
@@ -53,5 +53,10 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\lazer.png" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="System.Formats.Asn1">
+      <Version>5.0.0</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch.Tests.Android/osu.Game.Rulesets.Catch.Tests.Android.csproj b/osu.Game.Rulesets.Catch.Tests.Android/osu.Game.Rulesets.Catch.Tests.Android.csproj
index 88b420ffad..2e6c10a02e 100644
--- a/osu.Game.Rulesets.Catch.Tests.Android/osu.Game.Rulesets.Catch.Tests.Android.csproj
+++ b/osu.Game.Rulesets.Catch.Tests.Android/osu.Game.Rulesets.Catch.Tests.Android.csproj
@@ -35,5 +35,10 @@
       <Name>osu.Game</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="System.Formats.Asn1">
+      <Version>5.0.0</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Mania.Tests.Android/osu.Game.Rulesets.Mania.Tests.Android.csproj b/osu.Game.Rulesets.Mania.Tests.Android/osu.Game.Rulesets.Mania.Tests.Android.csproj
index 0e557cb260..8c134c7114 100644
--- a/osu.Game.Rulesets.Mania.Tests.Android/osu.Game.Rulesets.Mania.Tests.Android.csproj
+++ b/osu.Game.Rulesets.Mania.Tests.Android/osu.Game.Rulesets.Mania.Tests.Android.csproj
@@ -35,5 +35,10 @@
       <Name>osu.Game</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="System.Formats.Asn1">
+      <Version>5.0.0</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Osu.Tests.Android/osu.Game.Rulesets.Osu.Tests.Android.csproj b/osu.Game.Rulesets.Osu.Tests.Android/osu.Game.Rulesets.Osu.Tests.Android.csproj
index dcf1573522..22fa605176 100644
--- a/osu.Game.Rulesets.Osu.Tests.Android/osu.Game.Rulesets.Osu.Tests.Android.csproj
+++ b/osu.Game.Rulesets.Osu.Tests.Android/osu.Game.Rulesets.Osu.Tests.Android.csproj
@@ -35,5 +35,10 @@
       <Name>osu.Game</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="System.Formats.Asn1">
+      <Version>5.0.0</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Taiko.Tests.Android/osu.Game.Rulesets.Taiko.Tests.Android.csproj b/osu.Game.Rulesets.Taiko.Tests.Android/osu.Game.Rulesets.Taiko.Tests.Android.csproj
index 392442b713..a48110b354 100644
--- a/osu.Game.Rulesets.Taiko.Tests.Android/osu.Game.Rulesets.Taiko.Tests.Android.csproj
+++ b/osu.Game.Rulesets.Taiko.Tests.Android/osu.Game.Rulesets.Taiko.Tests.Android.csproj
@@ -35,5 +35,10 @@
       <Name>osu.Game</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="System.Formats.Asn1">
+      <Version>5.0.0</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj b/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj
index c3d9cb5875..bf256f486c 100644
--- a/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj
+++ b/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj
@@ -75,6 +75,9 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="DeepEqual" Version="2.0.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
+    <PackageReference Include="System.Formats.Asn1">
+      <Version>5.0.0</Version>
+    </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>

From 2d344ae6ffd9a5dee8e47096060a1c4f949b677e Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 29 Mar 2021 16:16:50 +0200
Subject: [PATCH 2092/3722] wait for IPC to be populated in the test

Did not see this when locally running test until after a couple of subsequent runs.
---
 osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs b/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs
index 086ed54435..4791da93c6 100644
--- a/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs
+++ b/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs
@@ -38,6 +38,8 @@ namespace osu.Game.Tournament.Tests.NonVisual
                     TournamentStorage storage = (TournamentStorage)osu.Dependencies.Get<Storage>();
                     FileBasedIPC ipc = (FileBasedIPC)osu.Dependencies.Get<MatchIPCInfo>();
 
+                    waitForOrAssert(() => ipc != null, @"ipc could not be populated in a reasonable amount of time");
+
                     Assert.True(ipc.SetIPCLocation(testCeDir));
                     Assert.True(storage.AllTournaments.Exists("stable.json"));
                 }

From 804ffe9f48954378ef688bd9d3d58120d0ccbf21 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 30 Mar 2021 09:00:09 +0900
Subject: [PATCH 2093/3722] Fix inspections

---
 .../Online/TestAPIModJsonSerialization.cs     | 22 +++++++++----------
 .../Screens/Editors/TeamEditorScreen.cs       |  8 +++++--
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs b/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
index ab24a72a12..77f910c144 100644
--- a/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
+++ b/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Tests.Online
 
             var deserialized = JsonConvert.DeserializeObject<APIMod>(JsonConvert.SerializeObject(apiMod));
 
-            Assert.That(deserialized.Acronym, Is.EqualTo(apiMod.Acronym));
+            Assert.That(deserialized?.Acronym, Is.EqualTo(apiMod.Acronym));
         }
 
         [Test]
@@ -35,7 +35,7 @@ namespace osu.Game.Tests.Online
 
             var deserialized = JsonConvert.DeserializeObject<APIMod>(JsonConvert.SerializeObject(apiMod));
 
-            Assert.That(deserialized.Settings, Contains.Key("test_setting").With.ContainValue(2.0));
+            Assert.That(deserialized?.Settings, Contains.Key("test_setting").With.ContainValue(2.0));
         }
 
         [Test]
@@ -44,9 +44,9 @@ namespace osu.Game.Tests.Online
             var apiMod = new APIMod(new TestMod { TestSetting = { Value = 2 } });
 
             var deserialized = JsonConvert.DeserializeObject<APIMod>(JsonConvert.SerializeObject(apiMod));
-            var converted = (TestMod)deserialized.ToMod(new TestRuleset());
+            var converted = (TestMod)deserialized?.ToMod(new TestRuleset());
 
-            Assert.That(converted.TestSetting.Value, Is.EqualTo(2));
+            Assert.That(converted?.TestSetting.Value, Is.EqualTo(2));
         }
 
         [Test]
@@ -61,11 +61,11 @@ namespace osu.Game.Tests.Online
             });
 
             var deserialised = JsonConvert.DeserializeObject<APIMod>(JsonConvert.SerializeObject(apiMod));
-            var converted = (TestModTimeRamp)deserialised.ToMod(new TestRuleset());
+            var converted = (TestModTimeRamp)deserialised?.ToMod(new TestRuleset());
 
-            Assert.That(converted.AdjustPitch.Value, Is.EqualTo(false));
-            Assert.That(converted.InitialRate.Value, Is.EqualTo(1.25));
-            Assert.That(converted.FinalRate.Value, Is.EqualTo(0.25));
+            Assert.That(converted?.AdjustPitch.Value, Is.EqualTo(false));
+            Assert.That(converted?.InitialRate.Value, Is.EqualTo(1.25));
+            Assert.That(converted?.FinalRate.Value, Is.EqualTo(0.25));
         }
 
         [Test]
@@ -78,10 +78,10 @@ namespace osu.Game.Tests.Online
             });
 
             var deserialised = JsonConvert.DeserializeObject<APIMod>(JsonConvert.SerializeObject(apiMod));
-            var converted = (TestModDifficultyAdjust)deserialised.ToMod(new TestRuleset());
+            var converted = (TestModDifficultyAdjust)deserialised?.ToMod(new TestRuleset());
 
-            Assert.That(converted.ExtendedLimits.Value, Is.True);
-            Assert.That(converted.OverallDifficulty.Value, Is.EqualTo(11));
+            Assert.That(converted?.ExtendedLimits.Value, Is.True);
+            Assert.That(converted?.OverallDifficulty.Value, Is.EqualTo(11));
         }
 
         private class TestRuleset : Ruleset
diff --git a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
index 582f72429b..f051823541 100644
--- a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
@@ -43,12 +43,16 @@ namespace osu.Game.Tournament.Screens.Editors
         private void addAllCountries()
         {
             List<TournamentTeam> countries;
+
             using (Stream stream = game.Resources.GetStream("Resources/countries.json"))
             using (var sr = new StreamReader(stream))
                 countries = JsonConvert.DeserializeObject<List<TournamentTeam>>(sr.ReadToEnd());
 
-            foreach (var c in countries)
-                Storage.Add(c);
+            if (countries != null)
+            {
+                foreach (var c in countries)
+                    Storage.Add(c);
+            }
         }
 
         public class TeamRow : CompositeDrawable, IModelBacked<TournamentTeam>

From 69db0a55938176ca9ad4b67cb2922c00d896f934 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 30 Mar 2021 09:03:32 +0900
Subject: [PATCH 2094/3722] Countries should not be null (internal game
 resource)

---
 .../Screens/Editors/TeamEditorScreen.cs                | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
index f051823541..aa1be143ea 100644
--- a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using Newtonsoft.Json;
@@ -48,11 +49,10 @@ namespace osu.Game.Tournament.Screens.Editors
             using (var sr = new StreamReader(stream))
                 countries = JsonConvert.DeserializeObject<List<TournamentTeam>>(sr.ReadToEnd());
 
-            if (countries != null)
-            {
-                foreach (var c in countries)
-                    Storage.Add(c);
-            }
+            Debug.Assert(countries != null);
+
+            foreach (var c in countries)
+                Storage.Add(c);
         }
 
         public class TeamRow : CompositeDrawable, IModelBacked<TournamentTeam>

From 0bf84e473d9b83a0cce1b6ba15831901baedcbc5 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 26 Mar 2021 13:09:44 +0300
Subject: [PATCH 2095/3722] Refactor spinner SPM counter for skinning purposes

---
 .../Mods/TestSceneOsuModAutoplay.cs           | 10 +--
 .../Mods/TestSceneOsuModSpunOut.cs            |  4 +-
 .../TestSceneSpinnerRotation.cs               | 10 +--
 .../Objects/Drawables/DrawableSpinner.cs      | 48 +++++-------
 .../Skinning/Default/DefaultSpinner.cs        | 64 ++++++++++++++++
 ...rSpmCounter.cs => SpinnerSpmCalculator.cs} | 74 +++++--------------
 6 files changed, 114 insertions(+), 96 deletions(-)
 rename osu.Game.Rulesets.Osu/Skinning/Default/{SpinnerSpmCounter.cs => SpinnerSpmCalculator.cs} (61%)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs
index 856b6554b9..0ba775e5c7 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModAutoplay.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
 
         private void runSpmTest(Mod mod)
         {
-            SpinnerSpmCounter spmCounter = null;
+            SpinnerSpmCalculator spmCalculator = null;
 
             CreateModTest(new ModTestData
             {
@@ -53,13 +53,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                 PassCondition = () => Player.ScoreProcessor.JudgedHits >= 1
             });
 
-            AddUntilStep("fetch SPM counter", () =>
+            AddUntilStep("fetch SPM calculator", () =>
             {
-                spmCounter = this.ChildrenOfType<SpinnerSpmCounter>().SingleOrDefault();
-                return spmCounter != null;
+                spmCalculator = this.ChildrenOfType<SpinnerSpmCalculator>().SingleOrDefault();
+                return spmCalculator != null;
             });
 
-            AddUntilStep("SPM is correct", () => Precision.AlmostEquals(spmCounter.SpinsPerMinute, 477, 5));
+            AddUntilStep("SPM is correct", () => Precision.AlmostEquals(spmCalculator.Result.Value, 477, 5));
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.cs
index 7df5ca0f7c..24e69703a6 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModSpunOut.cs
@@ -47,8 +47,8 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                 Beatmap = singleSpinnerBeatmap,
                 PassCondition = () =>
                 {
-                    var counter = Player.ChildrenOfType<SpinnerSpmCounter>().SingleOrDefault();
-                    return counter != null && Precision.AlmostEquals(counter.SpinsPerMinute, 286, 1);
+                    var counter = Player.ChildrenOfType<SpinnerSpmCalculator>().SingleOrDefault();
+                    return counter != null && Precision.AlmostEquals(counter.Result.Value, 286, 1);
                 }
             });
         }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
index ac8d5c81bc..14c709cae1 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
@@ -168,13 +168,13 @@ namespace osu.Game.Rulesets.Osu.Tests
             double estimatedSpm = 0;
 
             addSeekStep(1000);
-            AddStep("retrieve spm", () => estimatedSpm = drawableSpinner.SpmCounter.SpinsPerMinute);
+            AddStep("retrieve spm", () => estimatedSpm = drawableSpinner.SpinsPerMinute.Value);
 
             addSeekStep(2000);
-            AddAssert("spm still valid", () => Precision.AlmostEquals(drawableSpinner.SpmCounter.SpinsPerMinute, estimatedSpm, 1.0));
+            AddAssert("spm still valid", () => Precision.AlmostEquals(drawableSpinner.SpinsPerMinute.Value, estimatedSpm, 1.0));
 
             addSeekStep(1000);
-            AddAssert("spm still valid", () => Precision.AlmostEquals(drawableSpinner.SpmCounter.SpinsPerMinute, estimatedSpm, 1.0));
+            AddAssert("spm still valid", () => Precision.AlmostEquals(drawableSpinner.SpinsPerMinute.Value, estimatedSpm, 1.0));
         }
 
         [TestCase(0.5)]
@@ -188,7 +188,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddStep("retrieve spinner state", () =>
             {
                 expectedProgress = drawableSpinner.Progress;
-                expectedSpm = drawableSpinner.SpmCounter.SpinsPerMinute;
+                expectedSpm = drawableSpinner.SpinsPerMinute.Value;
             });
 
             addSeekStep(0);
@@ -197,7 +197,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             addSeekStep(1000);
             AddAssert("progress almost same", () => Precision.AlmostEquals(expectedProgress, drawableSpinner.Progress, 0.05));
-            AddAssert("spm almost same", () => Precision.AlmostEquals(expectedSpm, drawableSpinner.SpmCounter.SpinsPerMinute, 2.0));
+            AddAssert("spm almost same", () => Precision.AlmostEquals(expectedSpm, drawableSpinner.SpinsPerMinute.Value, 2.0));
         }
 
         private Replay applyRateAdjustment(Replay scoreReplay, double rate) => new Replay
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 39e78a14aa..1a89fc308e 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -30,7 +30,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         public new OsuSpinnerJudgementResult Result => (OsuSpinnerJudgementResult)base.Result;
 
         public SpinnerRotationTracker RotationTracker { get; private set; }
-        public SpinnerSpmCounter SpmCounter { get; private set; }
+
+        private SpinnerSpmCalculator spmCalculator;
 
         private Container<DrawableSpinnerTick> ticks;
         private PausableSkinnableSound spinningSample;
@@ -43,7 +44,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// </summary>
         public IBindable<double> GainedBonus => gainedBonus;
 
-        private readonly Bindable<double> gainedBonus = new Bindable<double>();
+        private readonly Bindable<double> gainedBonus = new BindableDouble();
+
+        /// <summary>
+        /// The number of spins per minute this spinner is spinning at, for display purposes.
+        /// </summary>
+        public readonly IBindable<double> SpinsPerMinute = new BindableDouble();
 
         private const double fade_out_duration = 160;
 
@@ -63,7 +69,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             Origin = Anchor.Centre;
             RelativeSizeAxes = Axes.Both;
 
-            InternalChildren = new Drawable[]
+            AddInternal(spmCalculator = new SpinnerSpmCalculator
+            {
+                Result = { BindTarget = SpinsPerMinute },
+            });
+
+            AddRangeInternal(new Drawable[]
             {
                 ticks = new Container<DrawableSpinnerTick>(),
                 new AspectContainer
@@ -77,20 +88,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                         RotationTracker = new SpinnerRotationTracker(this)
                     }
                 },
-                SpmCounter = new SpinnerSpmCounter
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Y = 120,
-                    Alpha = 0
-                },
                 spinningSample = new PausableSkinnableSound
                 {
                     Volume = { Value = 0 },
                     Looping = true,
                     Frequency = { Value = spinning_sample_initial_frequency }
                 }
-            };
+            });
 
             PositionBindable.BindValueChanged(pos => Position = pos.NewValue);
         }
@@ -161,17 +165,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
         }
 
-        protected override void UpdateStartTimeStateTransforms()
-        {
-            base.UpdateStartTimeStateTransforms();
-
-            if (Result?.TimeStarted is double startTime)
-            {
-                using (BeginAbsoluteSequence(startTime))
-                    fadeInCounter();
-            }
-        }
-
         protected override void UpdateHitStateTransforms(ArmedState state)
         {
             base.UpdateHitStateTransforms(state);
@@ -282,22 +275,17 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.UpdateAfterChildren();
 
-            if (!SpmCounter.IsPresent && RotationTracker.Tracking)
-            {
-                Result.TimeStarted ??= Time.Current;
-                fadeInCounter();
-            }
+            if (Result.TimeStarted == null && RotationTracker.Tracking)
+                Result.TimeStarted = Time.Current;
 
             // 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)
-                SpmCounter.SetRotation(Result.RateAdjustedRotation);
+                spmCalculator.SetRotation(Result.RateAdjustedRotation);
 
             updateBonusScore();
         }
 
-        private void fadeInCounter() => SpmCounter.FadeIn(HitObject.TimeFadeIn);
-
         private static readonly int score_per_tick = new SpinnerBonusTick.OsuSpinnerBonusTickJudgement().MaxNumericResult;
 
         private int wholeSpins;
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs
index 891821fe2f..ae8c03dad1 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.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.Globalization;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -19,6 +20,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
         private OsuSpriteText bonusCounter;
 
+        private Container spmContainer;
+        private OsuSpriteText spmCounter;
+
         public DefaultSpinner()
         {
             RelativeSizeAxes = Axes.Both;
@@ -46,11 +50,37 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
                     Origin = Anchor.Centre,
                     Font = OsuFont.Numeric.With(size: 24),
                     Y = -120,
+                },
+                spmContainer = new Container
+                {
+                    Alpha = 0f,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Y = 120,
+                    Children = new[]
+                    {
+                        spmCounter = new OsuSpriteText
+                        {
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
+                            Text = @"0",
+                            Font = OsuFont.Numeric.With(size: 24)
+                        },
+                        new OsuSpriteText
+                        {
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
+                            Text = @"SPINS PER MINUTE",
+                            Font = OsuFont.Numeric.With(size: 12),
+                            Y = 30
+                        }
+                    }
                 }
             });
         }
 
         private IBindable<double> gainedBonus;
+        private IBindable<double> spinsPerMinute;
 
         protected override void LoadComplete()
         {
@@ -63,6 +93,40 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
                 bonusCounter.FadeOutFromOne(1500);
                 bonusCounter.ScaleTo(1.5f).Then().ScaleTo(1f, 1000, Easing.OutQuint);
             });
+
+            spinsPerMinute = drawableSpinner.SpinsPerMinute.GetBoundCopy();
+            spinsPerMinute.BindValueChanged(spm =>
+            {
+                spmCounter.Text = Math.Truncate(spm.NewValue).ToString(@"#0");
+            }, true);
+
+            drawableSpinner.ApplyCustomUpdateState += updateStateTransforms;
+            updateStateTransforms(drawableSpinner, drawableSpinner.State.Value);
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            if (!spmContainer.IsPresent && drawableSpinner.Result?.TimeStarted != null)
+                fadeCounterOnTimeStart();
+        }
+
+        private void updateStateTransforms(DrawableHitObject drawableHitObject, ArmedState state)
+        {
+            if (!(drawableHitObject is DrawableSpinner))
+                return;
+
+            fadeCounterOnTimeStart();
+        }
+
+        private void fadeCounterOnTimeStart()
+        {
+            if (drawableSpinner.Result?.TimeStarted is double startTime)
+            {
+                using (BeginAbsoluteSequence(startTime))
+                    spmContainer.FadeIn(drawableSpinner.HitObject.TimeFadeIn);
+            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCalculator.cs
similarity index 61%
rename from osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs
rename to osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCalculator.cs
index 69355f624b..a5205bbb8c 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCounter.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerSpmCalculator.cs
@@ -1,77 +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;
 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.Utils;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
-    public class SpinnerSpmCounter : Container
+    public class SpinnerSpmCalculator : Component
     {
+        private readonly Queue<RotationRecord> records = new Queue<RotationRecord>();
+        private const double spm_count_duration = 595; // not using hundreds to avoid frame rounding issues
+
+        /// <summary>
+        /// The resultant spins per minute value, which is updated via <see cref="SetRotation"/>.
+        /// </summary>
+        public IBindable<double> Result => result;
+
+        private readonly Bindable<double> result = new BindableDouble();
+
         [Resolved]
         private DrawableHitObject drawableSpinner { get; set; }
 
-        private readonly OsuSpriteText spmText;
-
-        public SpinnerSpmCounter()
-        {
-            Children = new Drawable[]
-            {
-                spmText = new OsuSpriteText
-                {
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre,
-                    Text = @"0",
-                    Font = OsuFont.Numeric.With(size: 24)
-                },
-                new OsuSpriteText
-                {
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre,
-                    Text = @"SPINS PER MINUTE",
-                    Font = OsuFont.Numeric.With(size: 12),
-                    Y = 30
-                }
-            };
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
             drawableSpinner.HitObjectApplied += resetState;
         }
 
-        private double spm;
-
-        public double SpinsPerMinute
-        {
-            get => spm;
-            private set
-            {
-                if (value == spm) return;
-
-                spm = value;
-                spmText.Text = Math.Truncate(value).ToString(@"#0");
-            }
-        }
-
-        private struct RotationRecord
-        {
-            public float Rotation;
-            public double Time;
-        }
-
-        private readonly Queue<RotationRecord> records = new Queue<RotationRecord>();
-        private const double spm_count_duration = 595; // not using hundreds to avoid frame rounding issues
-
         public void SetRotation(float currentRotation)
         {
             // Never calculate SPM by same time of record to avoid 0 / 0 = NaN or X / 0 = Infinity result.
@@ -88,7 +48,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
                 while (records.Count > 0 && Time.Current - records.Peek().Time > spm_count_duration)
                     record = records.Dequeue();
 
-                SpinsPerMinute = (currentRotation - record.Rotation) / (Time.Current - record.Time) * 1000 * 60 / 360;
+                result.Value = (currentRotation - record.Rotation) / (Time.Current - record.Time) * 1000 * 60 / 360;
             }
 
             records.Enqueue(new RotationRecord { Rotation = currentRotation, Time = Time.Current });
@@ -96,7 +56,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
 
         private void resetState(DrawableHitObject hitObject)
         {
-            SpinsPerMinute = 0;
+            result.Value = 0;
             records.Clear();
         }
 
@@ -107,5 +67,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             if (drawableSpinner != null)
                 drawableSpinner.HitObjectApplied -= resetState;
         }
+
+        private struct RotationRecord
+        {
+            public float Rotation;
+            public double Time;
+        }
     }
 }

From f848ef534747babe4c020e3b1a759b2fc42d259d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 26 Mar 2021 13:10:04 +0300
Subject: [PATCH 2096/3722] Add legacy spinner SPM counter support

---
 .../Skinning/Legacy/LegacySpinner.cs          | 39 +++++++++++++++++--
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index 064b7a4680..7eb6898abc 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -28,6 +28,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
         protected const float SPRITE_SCALE = 0.625f;
 
+        private const float spm_hide_offset = 50f;
+
         protected DrawableSpinner DrawableSpinner { get; private set; }
 
         private Sprite spin;
@@ -35,6 +37,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 
         private LegacySpriteText bonusCounter;
 
+        private Sprite spmBackground;
+        private LegacySpriteText spmCounter;
+
         [BackgroundDependencyLoader]
         private void load(DrawableHitObject drawableHitObject, ISkinSource source)
         {
@@ -79,11 +84,27 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         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,
+                        Origin = Anchor.TopLeft,
+                        Texture = source.GetTexture("spinner-rpm"),
+                        Scale = new Vector2(SPRITE_SCALE),
+                        Position = new Vector2(-87, 445 + spm_hide_offset),
+                    },
+                    spmCounter = new LegacySpriteText(source, LegacyFont.Score)
+                    {
+                        Anchor = Anchor.TopCentre,
+                        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)),
                 }
             });
         }
 
         private IBindable<double> gainedBonus;
+        private IBindable<double> spinsPerMinute;
 
         private readonly Bindable<bool> completed = new Bindable<bool>();
 
@@ -99,6 +120,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 bonusCounter.ScaleTo(SPRITE_SCALE * 2f).Then().ScaleTo(SPRITE_SCALE * 1.28f, 800, Easing.Out);
             });
 
+            spinsPerMinute = DrawableSpinner.SpinsPerMinute.GetBoundCopy();
+            spinsPerMinute.BindValueChanged(spm =>
+            {
+                spmCounter.Text = Math.Truncate(spm.NewValue).ToString(@"#0");
+            }, true);
+
             completed.BindValueChanged(onCompletedChanged, true);
 
             DrawableSpinner.ApplyCustomUpdateState += UpdateStateTransforms;
@@ -142,10 +169,16 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             switch (drawableHitObject)
             {
                 case DrawableSpinner d:
-                    double fadeOutLength = Math.Min(400, d.HitObject.Duration);
+                    using (BeginAbsoluteSequence(d.HitObject.StartTime - d.HitObject.TimeFadeIn))
+                    {
+                        spmBackground.MoveToOffset(new Vector2(0, -spm_hide_offset), d.HitObject.TimeFadeIn, Easing.Out);
+                        spmCounter.MoveToOffset(new Vector2(0, -spm_hide_offset), d.HitObject.TimeFadeIn, Easing.Out);
+                    }
 
-                    using (BeginAbsoluteSequence(drawableHitObject.HitStateUpdateTime - fadeOutLength, true))
-                        spin.FadeOutFromOne(fadeOutLength);
+                    double spinFadeOutLength = Math.Min(400, d.HitObject.Duration);
+
+                    using (BeginAbsoluteSequence(drawableHitObject.HitStateUpdateTime - spinFadeOutLength, true))
+                        spin.FadeOutFromOne(spinFadeOutLength);
                     break;
 
                 case DrawableSpinnerTick d:

From 8a0fcf20ede3a63a074072899b33cb02cd83fdec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 Mar 2021 12:32:42 +0900
Subject: [PATCH 2097/3722] Move offset settings up for more logical ordering

---
 .../Settings/Sections/Input/TabletSettings.cs        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index bd0f7ddc4c..571d79baf8 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -110,12 +110,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                             }
                         },
                         new SettingsSlider<float>
-                        {
-                            TransferValueOnCommit = true,
-                            LabelText = "Aspect Ratio",
-                            Current = aspectRatio
-                        },
-                        new SettingsSlider<float>
                         {
                             TransferValueOnCommit = true,
                             LabelText = "X Offset",
@@ -127,6 +121,12 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                             LabelText = "Y Offset",
                             Current = offsetY
                         },
+                        new SettingsSlider<float>
+                        {
+                            TransferValueOnCommit = true,
+                            LabelText = "Aspect Ratio",
+                            Current = aspectRatio
+                        },
                         new SettingsCheckbox
                         {
                             LabelText = "Lock aspect ratio",

From 8dfff999f9ced7f2e550df44fcf3c76e871055fb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 Mar 2021 12:40:50 +0900
Subject: [PATCH 2098/3722] Add rotation slider

---
 .../Visual/Settings/TestSceneTabletSettings.cs         |  2 ++
 .../Settings/Sections/Input/TabletAreaSelection.cs     |  9 +++++++++
 .../Overlays/Settings/Sections/Input/TabletSettings.cs | 10 ++++++++++
 3 files changed, 21 insertions(+)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs b/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
index a7f6c8c0d3..a62980addf 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneTabletSettings.cs
@@ -45,6 +45,8 @@ namespace osu.Game.Tests.Visual.Settings
             public Bindable<Vector2> AreaOffset { get; } = new Bindable<Vector2>();
             public Bindable<Vector2> AreaSize { get; } = new Bindable<Vector2>();
 
+            public Bindable<float> Rotation { get; } = new Bindable<float>();
+
             public IBindable<TabletInfo> Tablet => tablet;
 
             private readonly Bindable<TabletInfo> tablet = new Bindable<TabletInfo>();
diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
index ecb8acce54..f61742093c 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         private readonly Bindable<Vector2> areaOffset = new Bindable<Vector2>();
         private readonly Bindable<Vector2> areaSize = new Bindable<Vector2>();
 
+        private readonly BindableNumber<float> rotation = new BindableNumber<float>();
+
         private readonly IBindable<TabletInfo> tablet = new Bindable<TabletInfo>();
 
         private OsuSpriteText tabletName;
@@ -124,6 +126,13 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 usableAreaText.Text = $"{(float)x / commonDivider}:{(float)y / commonDivider}";
             }, true);
 
+            rotation.BindTo(handler.Rotation);
+            rotation.BindValueChanged(val =>
+            {
+                usableAreaContainer.RotateTo(val.NewValue, 100, Easing.OutQuint)
+                                   .OnComplete(_ => checkBounds()); // required as we are using SSDQ.
+            });
+
             tablet.BindTo(handler.Tablet);
             tablet.BindValueChanged(_ => Scheduler.AddOnce(updateTabletDetails));
 
diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index 571d79baf8..9d128f8db3 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -27,6 +27,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         private readonly BindableNumber<float> sizeX = new BindableNumber<float> { MinValue = 10 };
         private readonly BindableNumber<float> sizeY = new BindableNumber<float> { MinValue = 10 };
 
+        private readonly BindableNumber<float> rotation = new BindableNumber<float> { MinValue = 0, MaxValue = 360 };
+
         [Resolved]
         private GameHost host { get; set; }
 
@@ -122,6 +124,12 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                             Current = offsetY
                         },
                         new SettingsSlider<float>
+                        {
+                            TransferValueOnCommit = true,
+                            LabelText = "Rotation",
+                            Current = rotation
+                        },
+                        new SettingsSlider<float>
                         {
                             TransferValueOnCommit = true,
                             LabelText = "Aspect Ratio",
@@ -153,6 +161,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         {
             base.LoadComplete();
 
+            rotation.BindTo(tabletHandler.Rotation);
+
             areaOffset.BindTo(tabletHandler.AreaOffset);
             areaOffset.BindValueChanged(val =>
             {

From 1dfd08eded521c40576cc746216f3b487e239e9d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 Mar 2021 13:01:48 +0900
Subject: [PATCH 2099/3722] Add tablet rotation configuration

---
 .../Sections/Input/RotationPresetButtons.cs   | 109 ++++++++++++++++++
 .../Settings/Sections/Input/TabletSettings.cs |   1 +
 2 files changed, 110 insertions(+)
 create mode 100644 osu.Game/Overlays/Settings/Sections/Input/RotationPresetButtons.cs

diff --git a/osu.Game/Overlays/Settings/Sections/Input/RotationPresetButtons.cs b/osu.Game/Overlays/Settings/Sections/Input/RotationPresetButtons.cs
new file mode 100644
index 0000000000..3e8da9f7d0
--- /dev/null
+++ b/osu.Game/Overlays/Settings/Sections/Input/RotationPresetButtons.cs
@@ -0,0 +1,109 @@
+// Copyright (c) ppy 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.Input.Handlers.Tablet;
+using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Overlays.Settings.Sections.Input
+{
+    internal class RotationPresetButtons : FillFlowContainer
+    {
+        private readonly ITabletHandler tabletHandler;
+
+        private Bindable<float> rotation;
+
+        private const int height = 50;
+
+        public RotationPresetButtons(ITabletHandler tabletHandler)
+        {
+            this.tabletHandler = tabletHandler;
+
+            RelativeSizeAxes = Axes.X;
+            Height = height;
+
+            for (int i = 0; i < 360; i += 90)
+            {
+                var presetRotation = i;
+
+                Add(new RotationButton(i)
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Height = height,
+                    Width = 0.25f,
+                    Text = $"{presetRotation}º",
+                    Action = () => tabletHandler.Rotation.Value = presetRotation,
+                });
+            }
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            rotation = tabletHandler.Rotation.GetBoundCopy();
+            rotation.BindValueChanged(val =>
+            {
+                foreach (var b in Children.OfType<RotationButton>())
+                    b.IsSelected = b.Preset == val.NewValue;
+            }, true);
+        }
+
+        public class RotationButton : TriangleButton
+        {
+            [Resolved]
+            private OsuColour colours { get; set; }
+
+            public readonly int Preset;
+
+            public RotationButton(int preset)
+            {
+                Preset = preset;
+            }
+
+            private bool isSelected;
+
+            public bool IsSelected
+            {
+                get => isSelected;
+                set
+                {
+                    if (value == isSelected)
+                        return;
+
+                    isSelected = value;
+
+                    if (IsLoaded)
+                        updateColour();
+                }
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                updateColour();
+            }
+
+            private void updateColour()
+            {
+                if (isSelected)
+                {
+                    BackgroundColour = colours.BlueDark;
+                    Triangles.ColourDark = colours.BlueDarker;
+                    Triangles.ColourLight = colours.Blue;
+                }
+                else
+                {
+                    BackgroundColour = colours.Gray4;
+                    Triangles.ColourDark = colours.Gray5;
+                    Triangles.ColourLight = colours.Gray6;
+                }
+            }
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
index 9d128f8db3..d770c18878 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletSettings.cs
@@ -129,6 +129,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                             LabelText = "Rotation",
                             Current = rotation
                         },
+                        new RotationPresetButtons(tabletHandler),
                         new SettingsSlider<float>
                         {
                             TransferValueOnCommit = true,

From 9504fe3f3c1fb78b8b4f6510ec988933f26bd71d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 Mar 2021 13:43:05 +0900
Subject: [PATCH 2100/3722] Inline add of spm calculation (no need for it to be
 a separate call)

---
 .../Objects/Drawables/DrawableSpinner.cs                 | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 1a89fc308e..3a4753761a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -69,13 +69,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             Origin = Anchor.Centre;
             RelativeSizeAxes = Axes.Both;
 
-            AddInternal(spmCalculator = new SpinnerSpmCalculator
-            {
-                Result = { BindTarget = SpinsPerMinute },
-            });
-
             AddRangeInternal(new Drawable[]
             {
+                spmCalculator = new SpinnerSpmCalculator
+                {
+                    Result = { BindTarget = SpinsPerMinute },
+                },
                 ticks = new Container<DrawableSpinnerTick>(),
                 new AspectContainer
                 {

From b82247aabec2ee10c12105701d1c0e073a775e6a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 Mar 2021 14:13:16 +0900
Subject: [PATCH 2101/3722] Add inline comments and use Vector2.Zero

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

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 07643bd75e..82301bd37f 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -39,9 +39,11 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
             var hitObjects = selectedMovableObjects;
 
+            // this will potentially move the selection out of bounds...
             foreach (var h in hitObjects)
                 h.Position += moveEvent.InstantDelta;
 
+            // but this will be corrected.
             moveSelectionInBounds();
             return true;
         }
@@ -153,7 +155,6 @@ namespace osu.Game.Rulesets.Osu.Edit
                 scaleHitObjects(hitObjects, reference, scale);
 
             moveSelectionInBounds();
-
             return true;
         }
 
@@ -257,7 +258,8 @@ namespace osu.Game.Rulesets.Osu.Edit
             var hitObjects = selectedMovableObjects;
 
             Quad quad = getSurroundingQuad(hitObjects);
-            Vector2 delta = new Vector2(0);
+
+            Vector2 delta = Vector2.Zero;
 
             if (quad.TopLeft.X < 0)
                 delta.X -= quad.TopLeft.X;

From 88035f73e00229ca5587adb916dc36716da29fb4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 Mar 2021 14:23:46 +0900
Subject: [PATCH 2102/3722] Fix incorrect wait logic in IPC location test

Not really willing to put more effort into fixing this one. Should do the job.
---
 .../NonVisual/IPCLocationTest.cs                   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs b/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs
index 4791da93c6..4c5f5a7a1a 100644
--- a/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs
+++ b/osu.Game.Tournament.Tests/NonVisual/IPCLocationTest.cs
@@ -26,26 +26,26 @@ namespace osu.Game.Tournament.Tests.NonVisual
                 string basePath = Path.Combine(RuntimeInfo.StartupDirectory, "headless", nameof(CheckIPCLocation));
 
                 // Set up a fake IPC client for the IPC Storage to switch to.
-                string testCeDir = Path.Combine(basePath, "stable-ce");
-                Directory.CreateDirectory(testCeDir);
+                string testStableInstallDirectory = Path.Combine(basePath, "stable-ce");
+                Directory.CreateDirectory(testStableInstallDirectory);
 
-                string ipcFile = Path.Combine(testCeDir, "ipc.txt");
+                string ipcFile = Path.Combine(testStableInstallDirectory, "ipc.txt");
                 File.WriteAllText(ipcFile, string.Empty);
 
                 try
                 {
                     var osu = loadOsu(host);
                     TournamentStorage storage = (TournamentStorage)osu.Dependencies.Get<Storage>();
-                    FileBasedIPC ipc = (FileBasedIPC)osu.Dependencies.Get<MatchIPCInfo>();
+                    FileBasedIPC ipc = null;
 
-                    waitForOrAssert(() => ipc != null, @"ipc could not be populated in a reasonable amount of time");
+                    waitForOrAssert(() => (ipc = osu.Dependencies.Get<MatchIPCInfo>() as FileBasedIPC) != null, @"ipc could not be populated in a reasonable amount of time");
 
-                    Assert.True(ipc.SetIPCLocation(testCeDir));
+                    Assert.True(ipc.SetIPCLocation(testStableInstallDirectory));
                     Assert.True(storage.AllTournaments.Exists("stable.json"));
                 }
                 finally
                 {
-                    host.Storage.DeleteDirectory(testCeDir);
+                    host.Storage.DeleteDirectory(testStableInstallDirectory);
                     host.Storage.DeleteDirectory("tournaments");
                     host.Exit();
                 }

From 89bea2868a9ca68a8c09a9c93db6f504e9022a96 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 Mar 2021 14:33:55 +0900
Subject: [PATCH 2103/3722] Move bool one level down

---
 osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs | 2 +-
 osu.Game.Rulesets.Catch/UI/Catcher.cs          | 9 +++++++--
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs      | 7 +------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs b/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
index 5c5e41234d..bba42dea97 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Catch.Mods
             var drawableCatchRuleset = (DrawableCatchRuleset)drawableRuleset;
             var catchPlayfield = (CatchPlayfield)drawableCatchRuleset.Playfield;
 
-            catchPlayfield.CatcherArea.CatchFruitOnPlate = false;
+            catchPlayfield.CatcherArea.MovableCatcher.CatchFruitOnPlate = false;
         }
 
         protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 42be745c2e..5d57e84b75 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -43,6 +43,11 @@ namespace osu.Game.Rulesets.Catch.UI
         /// </summary>
         public bool HyperDashing => hyperDashModifier != 1;
 
+        /// <summary>
+        /// Whether <see cref="DrawablePalpableCatchHitObject"/> fruit should appear on the plate.
+        /// </summary>
+        public bool CatchFruitOnPlate { get; set; } = true;
+
         /// <summary>
         /// The relative space to cover in 1 millisecond. based on 1 game pixel per millisecond as in osu-stable.
         /// </summary>
@@ -223,7 +228,7 @@ namespace osu.Game.Rulesets.Catch.UI
                    catchObjectPosition <= catcherPosition + halfCatchWidth;
         }
 
-        public void OnNewResult(DrawableCatchHitObject drawableObject, JudgementResult result, bool placeOnPlate)
+        public void OnNewResult(DrawableCatchHitObject drawableObject, JudgementResult result)
         {
             var catchResult = (CatchJudgementResult)result;
             catchResult.CatcherAnimationState = CurrentState;
@@ -237,7 +242,7 @@ namespace osu.Game.Rulesets.Catch.UI
             {
                 var positionInStack = computePositionInStack(new Vector2(palpableObject.X - X, 0), palpableObject.DisplaySize.X / 2);
 
-                if (placeOnPlate)
+                if (CatchFruitOnPlate)
                     placeCaughtObject(palpableObject, positionInStack);
 
                 if (hitLighting.Value)
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index 29c95ec61c..44adbd5512 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -21,11 +21,6 @@ namespace osu.Game.Rulesets.Catch.UI
         public readonly Catcher MovableCatcher;
         private readonly CatchComboDisplay comboDisplay;
 
-        /// <summary>
-        /// Whether <see cref="DrawablePalpableCatchHitObject"/> fruit should appear on the plate.
-        /// </summary>
-        public bool CatchFruitOnPlate { get; set; } = true;
-
         public CatcherArea(Container<CaughtObject> droppedObjectContainer, BeatmapDifficulty difficulty = null)
         {
             Size = new Vector2(CatchPlayfield.WIDTH, CATCHER_SIZE);
@@ -46,7 +41,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public void OnNewResult(DrawableCatchHitObject hitObject, JudgementResult result)
         {
-            MovableCatcher.OnNewResult(hitObject, result, CatchFruitOnPlate);
+            MovableCatcher.OnNewResult(hitObject, result);
 
             if (!result.Type.IsScorable())
                 return;

From f12353a99e5b38c57d1578460b542b27d07a1cec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 Mar 2021 14:57:06 +0900
Subject: [PATCH 2104/3722] Update forgotten test scene usage

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

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index ddb6194899..48efd73222 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -242,7 +242,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             Add(drawableObject);
             drawableObject.OnLoadComplete += _ =>
             {
-                catcher.OnNewResult(drawableObject, result, true);
+                catcher.OnNewResult(drawableObject, result);
                 drawableObject.Expire();
             };
         }

From 90c75a64cf9e30e213821706e8d54de262d2b629 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 Mar 2021 15:24:11 +0900
Subject: [PATCH 2105/3722] Fix legacy control point precision having an
 adverse effect on the editor

---
 osu.Game/Screens/Edit/Timing/DifficultySection.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Timing/DifficultySection.cs b/osu.Game/Screens/Edit/Timing/DifficultySection.cs
index 9d80ca0b14..97d110c502 100644
--- a/osu.Game/Screens/Edit/Timing/DifficultySection.cs
+++ b/osu.Game/Screens/Edit/Timing/DifficultySection.cs
@@ -28,7 +28,16 @@ namespace osu.Game.Screens.Edit.Timing
         {
             if (point.NewValue != null)
             {
-                multiplierSlider.Current = point.NewValue.SpeedMultiplierBindable;
+                var selectedPointBindable = point.NewValue.SpeedMultiplierBindable;
+
+                // there may be legacy control points, which contain infinite precision for compatibility reasons (see LegacyDifficultyControlPoint).
+                // generally that level of precision could only be set by externally editing the .osu file, so at the point
+                // a user is looking to update this within the editor it should be safe to obliterate this additional precision.
+                double expectedPrecision = new DifficultyControlPoint().SpeedMultiplierBindable.Precision;
+                if (selectedPointBindable.Precision < expectedPrecision)
+                    selectedPointBindable.Precision = expectedPrecision;
+
+                multiplierSlider.Current = selectedPointBindable;
                 multiplierSlider.Current.BindValueChanged(_ => ChangeHandler?.SaveState());
             }
         }

From 1d968009c2c329a1abd107409c9e37c302ae36c7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 Mar 2021 16:07:04 +0900
Subject: [PATCH 2106/3722] Add osu!mania key filtering using "keys=4" at song
 select

---
 .../Beatmaps/ManiaBeatmapConverter.cs         |  8 ++++-
 .../ManiaFilterCriteria.cs                    | 33 +++++++++++++++++++
 osu.Game.Rulesets.Mania/ManiaRuleset.cs       |  6 ++++
 3 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Rulesets.Mania/ManiaFilterCriteria.cs

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
index 7a0e3b2b76..756207a201 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
 
             if (IsForCurrentRuleset)
             {
-                TargetColumns = (int)Math.Max(1, roundedCircleSize);
+                TargetColumns = GetColumnCountForNonConvert(beatmap.BeatmapInfo);
 
                 if (TargetColumns > ManiaRuleset.MAX_STAGE_KEYS)
                 {
@@ -71,6 +71,12 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
             originalTargetColumns = TargetColumns;
         }
 
+        internal static int GetColumnCountForNonConvert(BeatmapInfo beatmap)
+        {
+            var roundedCircleSize = Math.Round(beatmap.BaseDifficulty.CircleSize);
+            return (int)Math.Max(1, roundedCircleSize);
+        }
+
         public override bool CanConvert() => Beatmap.HitObjects.All(h => h is IHasXPosition);
 
         protected override Beatmap<ManiaHitObject> ConvertBeatmap(IBeatmap original, CancellationToken cancellationToken)
diff --git a/osu.Game.Rulesets.Mania/ManiaFilterCriteria.cs b/osu.Game.Rulesets.Mania/ManiaFilterCriteria.cs
new file mode 100644
index 0000000000..c9a1ae84d4
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/ManiaFilterCriteria.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 osu.Game.Beatmaps;
+using osu.Game.Rulesets.Filter;
+using osu.Game.Rulesets.Mania.Beatmaps;
+using osu.Game.Screens.Select;
+using osu.Game.Screens.Select.Filter;
+
+namespace osu.Game.Rulesets.Mania
+{
+    public class ManiaFilterCriteria : IRulesetFilterCriteria
+    {
+        private FilterCriteria.OptionalRange<float> keys;
+
+        public bool Matches(BeatmapInfo beatmap)
+        {
+            return !keys.HasFilter || (beatmap.RulesetID == new ManiaRuleset().LegacyID) && keys.IsInRange(ManiaBeatmapConverter.GetColumnCountForNonConvert(beatmap));
+        }
+
+        public bool TryParseCustomKeywordCriteria(string key, Operator op, string value)
+        {
+            switch (key)
+            {
+                case "key":
+                case "keys":
+                    return FilterQueryParser.TryUpdateCriteriaRange(ref keys, op, value);
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index d624e094ad..88b63606b9 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -22,6 +22,7 @@ using osu.Game.Overlays.Settings;
 using osu.Game.Rulesets.Configuration;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Filter;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Difficulty;
@@ -382,6 +383,11 @@ namespace osu.Game.Rulesets.Mania
                 }
             }
         };
+
+        public override IRulesetFilterCriteria CreateRulesetFilterCriteria()
+        {
+            return new ManiaFilterCriteria();
+        }
     }
 
     public enum PlayfieldType

From e769ef45be36d1bf700969bf76bcab5c0dac2f99 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 Mar 2021 16:55:39 +0900
Subject: [PATCH 2107/3722] Fix misplaced parenthesis

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

diff --git a/osu.Game.Rulesets.Mania/ManiaFilterCriteria.cs b/osu.Game.Rulesets.Mania/ManiaFilterCriteria.cs
index c9a1ae84d4..d9a278ef29 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 beatmap)
         {
-            return !keys.HasFilter || (beatmap.RulesetID == new ManiaRuleset().LegacyID) && keys.IsInRange(ManiaBeatmapConverter.GetColumnCountForNonConvert(beatmap));
+            return !keys.HasFilter || (beatmap.RulesetID == new ManiaRuleset().LegacyID && keys.IsInRange(ManiaBeatmapConverter.GetColumnCountForNonConvert(beatmap)));
         }
 
         public bool TryParseCustomKeywordCriteria(string key, Operator op, string value)

From 56428a027e53e9e89dcb321a5f58eb32c899d52d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 Mar 2021 16:56:19 +0900
Subject: [PATCH 2108/3722] Change static method to public

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

diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
index 756207a201..26393c8edb 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -71,7 +71,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
             originalTargetColumns = TargetColumns;
         }
 
-        internal static int GetColumnCountForNonConvert(BeatmapInfo beatmap)
+        public static int GetColumnCountForNonConvert(BeatmapInfo beatmap)
         {
             var roundedCircleSize = Math.Round(beatmap.BaseDifficulty.CircleSize);
             return (int)Math.Max(1, roundedCircleSize);

From 05961e98d5e3ac0b36f936d0f09ed62896b19093 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 Mar 2021 19:03:15 +0900
Subject: [PATCH 2109/3722] Ensure GlobalActions are handled before anything
 else game-wide

---
 .../Input/Bindings/GlobalActionContainer.cs   |  9 +++--
 osu.Game/Input/Bindings/GlobalInputManager.cs | 33 +++++++++++++++++++
 osu.Game/OsuGameBase.cs                       |  8 ++---
 3 files changed, 44 insertions(+), 6 deletions(-)
 create mode 100644 osu.Game/Input/Bindings/GlobalInputManager.cs

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 8ccdb9249e..6d038c43cf 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.ComponentModel;
 using System.Linq;
@@ -14,11 +15,13 @@ namespace osu.Game.Input.Bindings
     {
         private readonly Drawable handler;
 
-        public GlobalActionContainer(OsuGameBase game)
+        public GlobalActionContainer(OsuGameBase game, bool nested = false)
             : base(matchingMode: KeyCombinationMatchingMode.Modifiers)
         {
             if (game is IKeyBindingHandler<GlobalAction>)
                 handler = game;
+
+            GetInputQueue = () => base.KeyBindingInputQueue.ToArray();
         }
 
         public override IEnumerable<IKeyBinding> DefaultKeyBindings => GlobalKeyBindings.Concat(InGameKeyBindings).Concat(AudioControlKeyBindings).Concat(EditorKeyBindings);
@@ -91,8 +94,10 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(InputKey.F3, GlobalAction.MusicPlay)
         };
 
+        public Func<Drawable[]> GetInputQueue { get; set; }
+
         protected override IEnumerable<Drawable> KeyBindingInputQueue =>
-            handler == null ? base.KeyBindingInputQueue : base.KeyBindingInputQueue.Prepend(handler);
+            handler == null ? GetInputQueue() : GetInputQueue().Prepend(handler);
     }
 
     public enum GlobalAction
diff --git a/osu.Game/Input/Bindings/GlobalInputManager.cs b/osu.Game/Input/Bindings/GlobalInputManager.cs
new file mode 100644
index 0000000000..475397408a
--- /dev/null
+++ b/osu.Game/Input/Bindings/GlobalInputManager.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 System.Linq;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Input;
+
+namespace osu.Game.Input.Bindings
+{
+    public class GlobalInputManager : PassThroughInputManager
+    {
+        public readonly GlobalActionContainer GlobalBindings;
+
+        protected override Container<Drawable> Content { get; }
+
+        public GlobalInputManager(OsuGameBase game)
+        {
+            InternalChildren = new Drawable[]
+            {
+                Content = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                },
+                // to avoid positional input being blocked by children, ensure the GlobalActionContainer is above everything.
+                GlobalBindings = new GlobalActionContainer(game, true)
+                {
+                    GetInputQueue = () => NonPositionalInputQueue.ToArray()
+                },
+            };
+        }
+    }
+}
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index e1c7b67a8c..bff3e15bfb 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -310,9 +310,9 @@ namespace osu.Game
 
             MenuCursorContainer = new MenuCursorContainer { RelativeSizeAxes = Axes.Both };
 
-            GlobalActionContainer globalBindings;
+            GlobalInputManager globalInput;
 
-            MenuCursorContainer.Child = globalBindings = new GlobalActionContainer(this)
+            MenuCursorContainer.Child = globalInput = new GlobalInputManager(this)
             {
                 RelativeSizeAxes = Axes.Both,
                 Child = content = new OsuTooltipContainer(MenuCursorContainer.Cursor) { RelativeSizeAxes = Axes.Both }
@@ -320,8 +320,8 @@ namespace osu.Game
 
             base.Content.Add(CreateScalingContainer().WithChild(MenuCursorContainer));
 
-            KeyBindingStore.Register(globalBindings);
-            dependencies.Cache(globalBindings);
+            KeyBindingStore.Register(globalInput.GlobalBindings);
+            dependencies.Cache(globalInput.GlobalBindings);
 
             PreviewTrackManager previewTrackManager;
             dependencies.Cache(previewTrackManager = new PreviewTrackManager());

From a2f50af4243dfde95ec556859666b65e34f3007b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 Mar 2021 19:42:40 +0900
Subject: [PATCH 2110/3722] Fix fall-through scroll redirection

---
 osu.Game/OsuGame.cs                               | 7 -------
 osu.Game/Overlays/Volume/VolumeControlReceptor.cs | 8 ++++++++
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index dd1fa32ad9..5fa315a464 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -879,13 +879,6 @@ namespace osu.Game
             return component;
         }
 
-        protected override bool OnScroll(ScrollEvent e)
-        {
-            // forward any unhandled mouse scroll events to the volume control.
-            volume.Adjust(GlobalAction.IncreaseVolume, e.ScrollDelta.Y, e.IsPrecise);
-            return true;
-        }
-
         public bool OnPressed(GlobalAction action)
         {
             if (introScreen == null) return false;
diff --git a/osu.Game/Overlays/Volume/VolumeControlReceptor.cs b/osu.Game/Overlays/Volume/VolumeControlReceptor.cs
index 3478f18a40..3b39b74e00 100644
--- a/osu.Game/Overlays/Volume/VolumeControlReceptor.cs
+++ b/osu.Game/Overlays/Volume/VolumeControlReceptor.cs
@@ -5,6 +5,7 @@ using System;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
 using osu.Game.Input.Bindings;
 
 namespace osu.Game.Overlays.Volume
@@ -17,6 +18,13 @@ namespace osu.Game.Overlays.Volume
         public bool OnPressed(GlobalAction action) =>
             ActionRequested?.Invoke(action) ?? false;
 
+        protected override bool OnScroll(ScrollEvent e)
+        {
+            // forward any unhandled mouse scroll events to the volume control.
+            ScrollActionRequested?.Invoke(GlobalAction.IncreaseVolume, e.ScrollDelta.Y, e.IsPrecise);
+            return true;
+        }
+
         public bool OnScroll(GlobalAction action, float amount, bool isPrecise) =>
             ScrollActionRequested?.Invoke(action, amount, isPrecise) ?? false;
 

From 633e6130bf434c628d7be98eeba0f0fff9d30cf8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 Mar 2021 19:45:22 +0900
Subject: [PATCH 2111/3722] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 3682a44b9f..5b65670869 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.329.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.330.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 6d571218fc..6a7f7e7026 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.329.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.330.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index ceb46eae87..4aa3ad1c61 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.329.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.330.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.329.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.330.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From fb0079fb9f641c7a7c769a3144684cb90c0320a2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 Mar 2021 22:42:31 +0900
Subject: [PATCH 2112/3722] Fix accuracy displaying incorrectly in online
 contexts

Closes #12221.
---
 osu.Game/Users/UserStatistics.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Users/UserStatistics.cs b/osu.Game/Users/UserStatistics.cs
index 04a358436e..5ddcd86d28 100644
--- a/osu.Game/Users/UserStatistics.cs
+++ b/osu.Game/Users/UserStatistics.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Users
         public double Accuracy;
 
         [JsonIgnore]
-        public string DisplayAccuracy => Accuracy.FormatAccuracy();
+        public string DisplayAccuracy => (Accuracy / 100).FormatAccuracy();
 
         [JsonProperty(@"play_count")]
         public int PlayCount;

From ded91b32a4facc2e55d909428999401ffec0ac80 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 31 Mar 2021 12:11:43 +0900
Subject: [PATCH 2113/3722] Add failing test

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

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index 7ae69bf7d7..2357778948 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -288,6 +288,42 @@ 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 =
+                {
+                    BaseDifficulty = 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);
+            AddAssert("one tick missed", () => judgementResults.Where(j => j.HitObject is HoldNoteTick).Count(j => j.Type == HitResult.LargeTickMiss) == 1);
+            assertTailJudgement(HitResult.Ok);
+        }
+
         private void assertHeadJudgement(HitResult result)
             => AddAssert($"head judged as {result}", () => judgementResults[0].Type == result);
 

From f78d628878a0244c1de1b0efa26d9e206d593771 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 31 Mar 2021 12:21:07 +0900
Subject: [PATCH 2114/3722] Improve assertions

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

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index 2357778948..42ea12214f 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -320,21 +320,24 @@ namespace osu.Game.Rulesets.Mania.Tests
             }, beatmap);
 
             assertHeadJudgement(HitResult.Perfect);
-            AddAssert("one tick missed", () => judgementResults.Where(j => j.HitObject is HoldNoteTick).Count(j => j.Type == HitResult.LargeTickMiss) == 1);
+            assertLastTickJudgement(HitResult.LargeTickMiss);
             assertTailJudgement(HitResult.Ok);
         }
 
         private void assertHeadJudgement(HitResult result)
-            => AddAssert($"head judged as {result}", () => judgementResults[0].Type == result);
+            => AddAssert($"head judged as {result}", () => judgementResults.First(j => j.HitObject is Note).Type == result);
 
         private void assertTailJudgement(HitResult result)
-            => AddAssert($"tail judged as {result}", () => judgementResults[^2].Type == result);
+            => AddAssert($"tail judged as {result}", () => judgementResults.Single(j => j.HitObject is TailNote).Type == result);
 
         private void assertNoteJudgement(HitResult result)
-            => AddAssert($"hold note judged as {result}", () => judgementResults[^1].Type == result);
+            => AddAssert($"hold note judged as {result}", () => judgementResults.Single(j => j.HitObject is HoldNote).Type == result);
 
         private void assertTickJudgement(HitResult result)
-            => AddAssert($"tick judged as {result}", () => judgementResults[6].Type == result); // arbitrary tick
+            => AddAssert($"any tick judged as {result}", () => judgementResults.Where(j => j.HitObject is HoldNoteTick).Any(j => j.Type == result));
+
+        private void assertLastTickJudgement(HitResult result)
+            => AddAssert($"last tick judged as {result}", () => judgementResults.Last(j => j.HitObject is HoldNoteTick).Type == result);
 
         private ScoreAccessibleReplayPlayer currentPlayer;
 

From 43e48406caa2253ccdc580c53ad22d0b39ad7ebf Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 31 Mar 2021 12:21:14 +0900
Subject: [PATCH 2115/3722] Miss all ticks when hold note is hit

---
 .../Objects/Drawables/DrawableHoldNote.cs                   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index 4f062753a6..828ee7b03e 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -233,6 +233,12 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
             if (Tail.AllJudged)
             {
+                foreach (var tick in tickContainer)
+                {
+                    if (!tick.Judged)
+                        tick.MissForcefully();
+                }
+
                 ApplyResult(r => r.Type = r.Judgement.MaxResult);
                 endHold();
             }

From e0c61f4dc556189de3e841242568df93269aafdd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 31 Mar 2021 13:57:57 +0900
Subject: [PATCH 2116/3722] Fix retry count not updating correctly

Regressed with changes to player reference retention logic. Could add a
test but the logic is so local now it seems quite redundant.
---
 osu.Game/Screens/Play/PlayerLoader.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 7d906cdc5b..2bbc4a0469 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -309,10 +309,8 @@ namespace osu.Game.Screens.Play
             if (!this.IsCurrentScreen())
                 return;
 
-            var restartCount = player?.RestartCount + 1 ?? 0;
-
             player = createPlayer();
-            player.RestartCount = restartCount;
+            player.RestartCount = ++restartCount;
             player.RestartRequested = restartRequested;
 
             LoadTask = LoadComponentAsync(player, _ => MetadataInfo.Loading = false);
@@ -428,6 +426,8 @@ namespace osu.Game.Screens.Play
 
         private Bindable<bool> muteWarningShownOnce;
 
+        private int restartCount;
+
         private void showMuteWarningIfNeeded()
         {
             if (!muteWarningShownOnce.Value)

From 0c53b4eb938a2770c5b2420dcf646cce0bd16c23 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 31 Mar 2021 14:09:38 +0900
Subject: [PATCH 2117/3722] Fix wrong counting and add test

---
 .../Navigation/TestSceneScreenNavigation.cs   | 23 +++++++++++++++++++
 osu.Game/Screens/Play/PlayerLoader.cs         |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index f2bb518b2e..3e25e22b5f 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -43,6 +43,29 @@ namespace osu.Game.Tests.Visual.Navigation
             exitViaEscapeAndConfirm();
         }
 
+        [Test]
+        public void TestRetryCountIncrements()
+        {
+            Player player = null;
+
+            PushAndConfirm(() => new TestSongSelect());
+
+            AddStep("import beatmap", () => ImportBeatmapTest.LoadQuickOszIntoOsu(Game).Wait());
+
+            AddUntilStep("wait for selected", () => !Game.Beatmap.IsDefault);
+
+            AddStep("press enter", () => InputManager.Key(Key.Enter));
+
+            AddUntilStep("wait for player", () => (player = Game.ScreenStack.CurrentScreen as Player) != null);
+            AddAssert("retry count is 0", () => player.RestartCount == 0);
+
+            AddStep("attempt to retry", () => player.ChildrenOfType<HotkeyRetryOverlay>().First().Action());
+            AddUntilStep("wait for old player gone", () => Game.ScreenStack.CurrentScreen != player);
+
+            AddUntilStep("get new player", () => (player = Game.ScreenStack.CurrentScreen as Player) != null);
+            AddAssert("retry count is 1", () => player.RestartCount == 1);
+        }
+
         [Test]
         public void TestRetryFromResults()
         {
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 2bbc4a0469..679b3c7313 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -310,7 +310,7 @@ namespace osu.Game.Screens.Play
                 return;
 
             player = createPlayer();
-            player.RestartCount = ++restartCount;
+            player.RestartCount = restartCount++;
             player.RestartRequested = restartRequested;
 
             LoadTask = LoadComponentAsync(player, _ => MetadataInfo.Loading = false);

From 30cae46cbdf44021e850f63122d90d803052ca9d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 31 Mar 2021 14:57:28 +0900
Subject: [PATCH 2118/3722] Group large drag drop imports into a single
 operation

---
 osu.Desktop/OsuGameDesktop.cs | 34 +++++++++++++++++++++++++++++++---
 osu.Game/OsuGameBase.cs       |  3 +++
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index b2487568ce..0c21c75290 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -18,6 +19,7 @@ using osu.Framework.Screens;
 using osu.Game.Screens.Menu;
 using osu.Game.Updater;
 using osu.Desktop.Windows;
+using osu.Framework.Threading;
 using osu.Game.IO;
 
 namespace osu.Desktop
@@ -144,13 +146,39 @@ namespace osu.Desktop
             desktopWindow.DragDrop += f => fileDrop(new[] { f });
         }
 
+        private readonly List<string> importableFiles = new List<string>();
+        private ScheduledDelegate importSchedule;
+
         private void fileDrop(string[] filePaths)
         {
-            var firstExtension = Path.GetExtension(filePaths.First());
+            lock (importableFiles)
+            {
+                var firstExtension = Path.GetExtension(filePaths.First());
 
-            if (filePaths.Any(f => Path.GetExtension(f) != firstExtension)) return;
+                if (filePaths.Any(f => Path.GetExtension(f) != firstExtension)) return;
 
-            Task.Factory.StartNew(() => Import(filePaths), TaskCreationOptions.LongRunning);
+                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");
+
+                var paths = importableFiles.ToArray();
+                importableFiles.Clear();
+
+                Task.Factory.StartNew(() => Import(paths), TaskCreationOptions.LongRunning);
+            }
         }
     }
 }
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index e1c7b67a8c..7eef0f7158 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -429,6 +429,9 @@ namespace osu.Game
 
         public async Task Import(params string[] paths)
         {
+            if (paths.Length == 0)
+                return;
+
             var extension = Path.GetExtension(paths.First())?.ToLowerInvariant();
 
             foreach (var importer in fileImporters)

From 1718084dbc55761c9f0a2cc49bccde6d88ccb3f3 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 31 Mar 2021 20:08:39 +0200
Subject: [PATCH 2119/3722] Update/remove determinant tests

We now only change the path type based on the bounding box.

If the control points are too linear, the framework now handles the fallback to Bezier.
---
 .../TestSceneSliderControlPointPiece.cs       | 17 ++-----------
 .../TestSceneSliderPlacementBlueprint.cs      | 25 +++----------------
 2 files changed, 5 insertions(+), 37 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
index 7ca86335ce..b4eba7070b 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
@@ -61,19 +61,6 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertControlPointType(0, PathType.PerfectCurve);
         }
 
-        [Test]
-        public void TestDragControlPointAlmostLinearly()
-        {
-            moveMouseToControlPoint(1);
-            AddStep("hold", () => InputManager.PressButton(MouseButton.Left));
-
-            addMovementStep(new Vector2(150, 0.01f));
-            AddStep("release", () => InputManager.ReleaseButton(MouseButton.Left));
-
-            assertControlPointPosition(1, new Vector2(150, 0.01f));
-            assertControlPointType(0, PathType.Bezier);
-        }
-
         [Test]
         public void TestDragControlPointAlmostLinearlyExterior()
         {
@@ -93,7 +80,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             moveMouseToControlPoint(1);
             AddStep("hold", () => InputManager.PressButton(MouseButton.Left));
 
-            addMovementStep(new Vector2(150, 0.01f));
+            addMovementStep(new Vector2(400, 0.01f));
             assertControlPointType(0, PathType.Bezier);
 
             addMovementStep(new Vector2(150, 50));
@@ -109,7 +96,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             moveMouseToControlPoint(4);
             AddStep("hold", () => InputManager.PressButton(MouseButton.Left));
 
-            addMovementStep(new Vector2(350, 0));
+            addMovementStep(new Vector2(350, 0.01f));
             assertControlPointType(2, PathType.Bezier);
 
             addMovementStep(new Vector2(150, 150));
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index 937034fc23..24382d2c65 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -276,25 +276,6 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertControlPointType(0, PathType.Linear);
         }
 
-        [Test]
-        public void TestPlacePerfectCurveSegmentAlmostLinearly()
-        {
-            Vector2 startPosition = new Vector2(200);
-
-            addMovementStep(startPosition);
-            addClickStep(MouseButton.Left);
-
-            addMovementStep(startPosition + new Vector2(61.382935f, 6.423767f));
-            addClickStep(MouseButton.Left);
-
-            addMovementStep(startPosition + new Vector2(217.69522f, 22.84021f));
-            addClickStep(MouseButton.Right);
-
-            assertPlaced(true);
-            assertControlPointCount(3);
-            assertControlPointType(0, PathType.Bezier);
-        }
-
         [Test]
         public void TestPlacePerfectCurveSegmentAlmostLinearlyExterior()
         {
@@ -322,10 +303,10 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             addMovementStep(startPosition);
             addClickStep(MouseButton.Left);
 
-            addMovementStep(startPosition + new Vector2(61.382935f, 6.423767f));
+            addMovementStep(startPosition + new Vector2(300, 0));
             addClickStep(MouseButton.Left);
 
-            addMovementStep(startPosition + new Vector2(217.69522f, 22.84021f)); // Should convert to bezier
+            addMovementStep(startPosition + new Vector2(150, 0.1f)); // Should convert to bezier
             addMovementStep(startPosition + new Vector2(210.0f, 0.0f)); // Should convert back to perfect
             addClickStep(MouseButton.Right);
 
@@ -346,7 +327,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             addClickStep(MouseButton.Left);
 
             // Playfield dimensions are 640 x 480.
-            // So a 480 * 480 bounding box area should be ok.
+            // So a 480 x 480 bounding box should be ok.
             addMovementStep(startPosition + new Vector2(-240, 240));
             addClickStep(MouseButton.Right);
 

From 75b8f2535ff3c024b1cc4ab219989658c7003f1e Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 31 Mar 2021 20:09:56 +0200
Subject: [PATCH 2120/3722] Move updatePathTypes to PathControlPointPiece

Here we produce a local bound copy of the path version, and bind it to update the path type.

This way, if the path version updates (i.e. any control point changes type or position), we check that all control points have a well-defined path.

Additionally, if the control point piece is disposed of, the GB should also swoop up the subscription because of the local bound copy.
---
 .../Components/PathControlPointPiece.cs       | 24 +++++++++++++++++++
 .../Components/PathControlPointVisualiser.cs  | 23 ------------------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index 4459308ea5..8059fc910c 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -3,14 +3,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.Containers;
 using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
+using osu.Framework.Utils;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
@@ -47,6 +50,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         [Resolved]
         private OsuColour colours { get; set; }
 
+        private IBindable<int> sliderVersion;
         private IBindable<Vector2> sliderPosition;
         private IBindable<float> sliderScale;
         private IBindable<Vector2> controlPointPosition;
@@ -105,6 +109,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         {
             base.LoadComplete();
 
+            sliderVersion = slider.Path.Version.GetBoundCopy();
+            sliderVersion.BindValueChanged(_ => updatePathType());
+
             sliderPosition = slider.PositionBindable.GetBoundCopy();
             sliderPosition.BindValueChanged(_ => updateMarkerDisplay());
 
@@ -200,6 +207,23 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 
         protected override void OnDragEnd(DragEndEvent e) => changeHandler?.EndChange();
 
+        /// <summary>
+        /// Handles correction of invalid path types.
+        /// </summary>
+        private void updatePathType()
+        {
+            if (PointsInSegment[0].Type.Value != PathType.PerfectCurve)
+                return;
+
+            ReadOnlySpan<Vector2> points = PointsInSegment.Select(p => p.Position.Value).ToArray();
+            if (points.Length != 3)
+                return;
+
+            RectangleF boundingBox = PathApproximator.CircularArcBoundingBox(points);
+            if (boundingBox.Width >= 640 || boundingBox.Height >= 480)
+                PointsInSegment[0].Type.Value = PathType.Bezier;
+        }
+
         /// <summary>
         /// Updates the state of the circular control point marker.
         /// </summary>
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 dd39014bb6..ce5dc4855e 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -11,12 +11,10 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
-using osu.Framework.Graphics.Primitives;
 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.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
@@ -93,8 +91,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                         }));
 
                         Connections.Add(new PathControlPointConnectionPiece(slider, e.NewStartingIndex + i));
-
-                        point.Changed += updatePathTypes;
                     }
 
                     break;
@@ -104,8 +100,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                     {
                         Pieces.RemoveAll(p => p.ControlPoint == point);
                         Connections.RemoveAll(c => c.ControlPoint == point);
-
-                        point.Changed -= updatePathTypes;
                     }
 
                     // If removing before the end of the path,
@@ -148,23 +142,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         {
         }
 
-        /// <summary>
-        /// Handles correction of invalid path types.
-        /// </summary>
-        private void updatePathTypes()
-        {
-            foreach (PathControlPoint segmentStartPoint in slider.Path.ControlPoints.Where(p => p.Type.Value != null))
-            {
-                if (segmentStartPoint.Type.Value != PathType.PerfectCurve)
-                    continue;
-
-                ReadOnlySpan<Vector2> points = slider.Path.PointsInSegment(segmentStartPoint).Select(p => p.Position.Value).ToArray();
-                RectangleF boundingBox = PathApproximator.CircularArcBoundingBox(points);
-                if (points.Length == 3 && boundingBox.Area >= 640 * 480)
-                    segmentStartPoint.Type.Value = PathType.Bezier;
-            }
-        }
-
         private void selectPiece(PathControlPointPiece piece, MouseButtonEvent e)
         {
             if (e.Button == MouseButton.Left && inputManager.CurrentState.Keyboard.ControlPressed)

From 5022a78e80b1a07c54ab55176570a7e4be2debaa Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 31 Mar 2021 20:25:46 +0200
Subject: [PATCH 2121/3722] Check current point instead of start point

Since each control point will call this when the path updates, the previous would correct the start segment 3 times instead of just once.

This fixes that.
---
 .../Blueprints/Sliders/Components/PathControlPointPiece.cs    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index 8059fc910c..394d2b039d 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -212,7 +212,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         /// </summary>
         private void updatePathType()
         {
-            if (PointsInSegment[0].Type.Value != PathType.PerfectCurve)
+            if (ControlPoint.Type.Value != PathType.PerfectCurve)
                 return;
 
             ReadOnlySpan<Vector2> points = PointsInSegment.Select(p => p.Position.Value).ToArray();
@@ -221,7 +221,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 
             RectangleF boundingBox = PathApproximator.CircularArcBoundingBox(points);
             if (boundingBox.Width >= 640 || boundingBox.Height >= 480)
-                PointsInSegment[0].Type.Value = PathType.Bezier;
+                ControlPoint.Type.Value = PathType.Bezier;
         }
 
         /// <summary>

From 7b684339ed64703c169dfccc27c3abfec521e586 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 31 Mar 2021 20:32:49 +0200
Subject: [PATCH 2122/3722] Undo public -> internal for
 `PathControlPoint.Changed`

No longer used.
---
 osu.Game/Rulesets/Objects/PathControlPoint.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Objects/PathControlPoint.cs b/osu.Game/Rulesets/Objects/PathControlPoint.cs
index 2e4100ee0b..f11917f4f4 100644
--- a/osu.Game/Rulesets/Objects/PathControlPoint.cs
+++ b/osu.Game/Rulesets/Objects/PathControlPoint.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Objects
         /// <summary>
         /// Invoked when any property of this <see cref="PathControlPoint"/> is changed.
         /// </summary>
-        public event Action Changed;
+        internal event Action Changed;
 
         /// <summary>
         /// Creates a new <see cref="PathControlPoint"/>.

From 25afae5671514f88966f06b59eda1ef82b824ecf Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 31 Mar 2021 20:48:17 +0200
Subject: [PATCH 2123/3722] Fix broken test case

Seems this technically works, but only because of the edge case of being entirely linear, which the framework catches.

This fixes that.
---
 .../Editor/TestSceneSliderPlacementBlueprint.cs                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index 24382d2c65..462abf2edb 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -307,7 +307,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             addClickStep(MouseButton.Left);
 
             addMovementStep(startPosition + new Vector2(150, 0.1f)); // Should convert to bezier
-            addMovementStep(startPosition + new Vector2(210.0f, 0.0f)); // Should convert back to perfect
+            addMovementStep(startPosition + new Vector2(400.0f, 50.0f)); // Should convert back to perfect
             addClickStep(MouseButton.Right);
 
             assertPlaced(true);

From af478fb2eb6052ddfcc0b99137d9605d2ff06681 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 1 Apr 2021 22:02:32 +0900
Subject: [PATCH 2124/3722] Add abstract spectator screen class

---
 osu.Game/Screens/Spectate/GameplayState.cs   |  37 +++
 osu.Game/Screens/Spectate/SpectatorScreen.cs | 237 +++++++++++++++++++
 2 files changed, 274 insertions(+)
 create mode 100644 osu.Game/Screens/Spectate/GameplayState.cs
 create mode 100644 osu.Game/Screens/Spectate/SpectatorScreen.cs

diff --git a/osu.Game/Screens/Spectate/GameplayState.cs b/osu.Game/Screens/Spectate/GameplayState.cs
new file mode 100644
index 0000000000..4579b9c07c
--- /dev/null
+++ b/osu.Game/Screens/Spectate/GameplayState.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 osu.Game.Beatmaps;
+using osu.Game.Rulesets;
+using osu.Game.Scoring;
+
+namespace osu.Game.Screens.Spectate
+{
+    /// <summary>
+    /// The gameplay state of a spectated user. This class is immutable.
+    /// </summary>
+    public class GameplayState
+    {
+        /// <summary>
+        /// The score which the user is playing.
+        /// </summary>
+        public readonly Score Score;
+
+        /// <summary>
+        /// The ruleset which the user is playing.
+        /// </summary>
+        public readonly Ruleset Ruleset;
+
+        /// <summary>
+        /// The beatmap which the user is playing.
+        /// </summary>
+        public readonly WorkingBeatmap Beatmap;
+
+        public GameplayState(Score score, Ruleset ruleset, WorkingBeatmap beatmap)
+        {
+            Score = score;
+            Ruleset = ruleset;
+            Beatmap = beatmap;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Spectate/SpectatorScreen.cs b/osu.Game/Screens/Spectate/SpectatorScreen.cs
new file mode 100644
index 0000000000..a534581807
--- /dev/null
+++ b/osu.Game/Screens/Spectate/SpectatorScreen.cs
@@ -0,0 +1,237 @@
+// Copyright (c) ppy 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 System.Threading.Tasks;
+using JetBrains.Annotations;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Game.Beatmaps;
+using osu.Game.Database;
+using osu.Game.Online.Spectator;
+using osu.Game.Replays;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Replays;
+using osu.Game.Rulesets.Replays.Types;
+using osu.Game.Scoring;
+using osu.Game.Users;
+
+namespace osu.Game.Screens.Spectate
+{
+    /// <summary>
+    /// A <see cref="OsuScreen"/> which spectates one or more users.
+    /// </summary>
+    public abstract class SpectatorScreen : OsuScreen
+    {
+        private readonly int[] userIds;
+
+        [Resolved]
+        private BeatmapManager beatmaps { get; set; }
+
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
+
+        [Resolved]
+        private SpectatorStreamingClient spectatorClient { get; set; }
+
+        [Resolved]
+        private UserLookupCache userLookupCache { get; set; }
+
+        private readonly object stateLock = new object();
+
+        private readonly Dictionary<int, User> userMap = new Dictionary<int, User>();
+        private readonly Dictionary<int, SpectatorState> spectatorStates = new Dictionary<int, SpectatorState>();
+        private readonly Dictionary<int, GameplayState> gameplayStates = new Dictionary<int, GameplayState>();
+
+        private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
+
+        /// <summary>
+        /// Creates a new <see cref="SpectatorScreen"/>.
+        /// </summary>
+        /// <param name="userIds">The users to spectate.</param>
+        protected SpectatorScreen(params int[] userIds)
+        {
+            this.userIds = userIds;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            spectatorClient.OnUserBeganPlaying += userBeganPlaying;
+            spectatorClient.OnUserFinishedPlaying += userFinishedPlaying;
+            spectatorClient.OnNewFrames += userSentFrames;
+
+            foreach (var id in userIds)
+            {
+                userLookupCache.GetUserAsync(id).ContinueWith(u => Schedule(() =>
+                {
+                    if (u.Result == null)
+                        return;
+
+                    lock (stateLock)
+                        userMap[id] = u.Result;
+
+                    spectatorClient.WatchUser(id);
+                }), TaskContinuationOptions.OnlyOnRanToCompletion);
+            }
+
+            managerUpdated = beatmaps.ItemUpdated.GetBoundCopy();
+            managerUpdated.BindValueChanged(beatmapUpdated);
+        }
+
+        private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> beatmap)
+        {
+            if (!beatmap.NewValue.TryGetTarget(out var beatmapSet))
+                return;
+
+            lock (stateLock)
+            {
+                foreach (var (userId, state) in spectatorStates)
+                {
+                    if (beatmapSet.Beatmaps.Any(b => b.OnlineBeatmapID == state.BeatmapID))
+                        updateGameplayState(userId);
+                }
+            }
+        }
+
+        private void userBeganPlaying(int userId, SpectatorState state)
+        {
+            if (state.RulesetID == null || state.BeatmapID == null)
+                return;
+
+            lock (stateLock)
+            {
+                if (!userMap.ContainsKey(userId))
+                    return;
+
+                spectatorStates[userId] = state;
+                OnUserStateChanged(userId, state);
+
+                updateGameplayState(userId);
+            }
+        }
+
+        private void updateGameplayState(int userId)
+        {
+            lock (stateLock)
+            {
+                Debug.Assert(userMap.ContainsKey(userId));
+
+                var spectatorState = spectatorStates[userId];
+                var user = userMap[userId];
+
+                var resolvedRuleset = rulesets.AvailableRulesets.FirstOrDefault(r => r.ID == spectatorState.RulesetID)?.CreateInstance();
+                if (resolvedRuleset == null)
+                    return;
+
+                var resolvedBeatmap = beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == spectatorState.BeatmapID);
+                if (resolvedBeatmap == null)
+                    return;
+
+                var score = new Score
+                {
+                    ScoreInfo = new ScoreInfo
+                    {
+                        Beatmap = resolvedBeatmap,
+                        User = user,
+                        Mods = spectatorState.Mods.Select(m => m.ToMod(resolvedRuleset)).ToArray(),
+                        Ruleset = resolvedRuleset.RulesetInfo,
+                    },
+                    Replay = new Replay { HasReceivedAllFrames = false },
+                };
+
+                var gameplayState = new GameplayState(score, resolvedRuleset, beatmaps.GetWorkingBeatmap(resolvedBeatmap));
+
+                gameplayStates[userId] = gameplayState;
+                StartGameplay(userId, gameplayState);
+            }
+        }
+
+        private void userSentFrames(int userId, FrameDataBundle bundle)
+        {
+            lock (stateLock)
+            {
+                if (!userMap.ContainsKey(userId))
+                    return;
+
+                if (!gameplayStates.TryGetValue(userId, out var gameplayState))
+                    return;
+
+                // The ruleset instance should be guaranteed to be in sync with the score via ScoreLock.
+                Debug.Assert(gameplayState.Ruleset != null && gameplayState.Ruleset.RulesetInfo.Equals(gameplayState.Score.ScoreInfo.Ruleset));
+
+                foreach (var frame in bundle.Frames)
+                {
+                    IConvertibleReplayFrame convertibleFrame = gameplayState.Ruleset.CreateConvertibleReplayFrame();
+                    convertibleFrame.FromLegacy(frame, gameplayState.Beatmap.Beatmap);
+
+                    var convertedFrame = (ReplayFrame)convertibleFrame;
+                    convertedFrame.Time = frame.Time;
+
+                    gameplayState.Score.Replay.Frames.Add(convertedFrame);
+                }
+            }
+        }
+
+        private void userFinishedPlaying(int userId, SpectatorState state)
+        {
+            lock (stateLock)
+            {
+                if (!userMap.ContainsKey(userId))
+                    return;
+
+                if (!gameplayStates.TryGetValue(userId, out var gameplayState))
+                    return;
+
+                gameplayState.Score.Replay.HasReceivedAllFrames = true;
+
+                gameplayStates.Remove(userId);
+                EndGameplay(userId);
+            }
+        }
+
+        /// <summary>
+        /// Invoked when a spectated user's state has changed.
+        /// </summary>
+        /// <param name="userId">The user whose state has changed.</param>
+        /// <param name="spectatorState">The new state.</param>
+        protected abstract void OnUserStateChanged(int userId, [NotNull] SpectatorState spectatorState);
+
+        /// <summary>
+        /// Starts gameplay for a user.
+        /// </summary>
+        /// <param name="userId">The user to start gameplay for.</param>
+        /// <param name="gameplayState">The gameplay state.</param>
+        protected abstract void StartGameplay(int userId, [NotNull] GameplayState gameplayState);
+
+        /// <summary>
+        /// Ends gameplay for a user.
+        /// </summary>
+        /// <param name="userId">The user to end gameplay for.</param>
+        protected abstract void EndGameplay(int userId);
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (spectatorClient != null)
+            {
+                spectatorClient.OnUserBeganPlaying -= userBeganPlaying;
+                spectatorClient.OnUserFinishedPlaying -= userFinishedPlaying;
+                spectatorClient.OnNewFrames -= userSentFrames;
+
+                lock (stateLock)
+                {
+                    foreach (var (userId, _) in userMap)
+                        spectatorClient.StopWatchingUser(userId);
+                }
+            }
+
+            managerUpdated?.UnbindAll();
+        }
+    }
+}

From 9e95441aa63ef92065204aa349cbd7abe2f44f62 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 1 Apr 2021 22:08:52 +0900
Subject: [PATCH 2125/3722] Rename Spectator -> SoloSpectator

---
 osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs     | 8 ++++----
 osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs   | 2 +-
 osu.Game/Screens/Play/{Spectator.cs => SoloSpectator.cs} | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename osu.Game/Screens/Play/{Spectator.cs => SoloSpectator.cs} (99%)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 4a0e1282c4..b59f6a4eb7 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         // used just to show beatmap card for the time being.
         protected override bool UseOnlineAPI => true;
 
-        private Spectator spectatorScreen;
+        private SoloSpectator spectatorScreen;
 
         [Resolved]
         private OsuGameBase game { get; set; }
@@ -69,7 +69,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             loadSpectatingScreen();
 
-            AddAssert("screen hasn't changed", () => Stack.CurrentScreen is Spectator);
+            AddAssert("screen hasn't changed", () => Stack.CurrentScreen is SoloSpectator);
 
             start();
             sendFrames();
@@ -195,7 +195,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             start(-1234);
             sendFrames();
 
-            AddAssert("screen didn't change", () => Stack.CurrentScreen is Spectator);
+            AddAssert("screen didn't change", () => Stack.CurrentScreen is SoloSpectator);
         }
 
         private OsuFramedReplayInputHandler replayHandler =>
@@ -226,7 +226,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void loadSpectatingScreen()
         {
-            AddStep("load screen", () => LoadScreen(spectatorScreen = new Spectator(testSpectatorStreamingClient.StreamingUser)));
+            AddStep("load screen", () => LoadScreen(spectatorScreen = new SoloSpectator(testSpectatorStreamingClient.StreamingUser)));
             AddUntilStep("wait for screen load", () => spectatorScreen.LoadState == LoadState.Loaded);
         }
 
diff --git a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
index c89699f2ee..336430fd9b 100644
--- a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
@@ -137,7 +137,7 @@ namespace osu.Game.Overlays.Dashboard
                                 Text = "Watch",
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.TopCentre,
-                                Action = () => game?.PerformFromScreen(s => s.Push(new Spectator(User))),
+                                Action = () => game?.PerformFromScreen(s => s.Push(new SoloSpectator(User))),
                                 Enabled = { Value = User.Id != api.LocalUser.Value.Id }
                             }
                         }
diff --git a/osu.Game/Screens/Play/Spectator.cs b/osu.Game/Screens/Play/SoloSpectator.cs
similarity index 99%
rename from osu.Game/Screens/Play/Spectator.cs
rename to osu.Game/Screens/Play/SoloSpectator.cs
index 28311f5113..9be42b52b3 100644
--- a/osu.Game/Screens/Play/Spectator.cs
+++ b/osu.Game/Screens/Play/SoloSpectator.cs
@@ -37,7 +37,7 @@ using osuTK;
 namespace osu.Game.Screens.Play
 {
     [Cached(typeof(IPreviewTrackOwner))]
-    public class Spectator : OsuScreen, IPreviewTrackOwner
+    public class SoloSpectator : OsuScreen, IPreviewTrackOwner
     {
         private readonly User targetUser;
 
@@ -88,7 +88,7 @@ namespace osu.Game.Screens.Play
         /// </summary>
         private bool newStatePending;
 
-        public Spectator([NotNull] User targetUser)
+        public SoloSpectator([NotNull] User targetUser)
         {
             this.targetUser = targetUser ?? throw new ArgumentNullException(nameof(targetUser));
         }

From 9bc2a486e0c40baf2db334f6ef4cf1fdc5977a0a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 1 Apr 2021 22:09:51 +0900
Subject: [PATCH 2126/3722] Make SoloSpectator use the new SpectatorScreen
 class

---
 osu.Game/Screens/Play/SoloSpectator.cs | 233 ++++++-------------------
 1 file changed, 53 insertions(+), 180 deletions(-)

diff --git a/osu.Game/Screens/Play/SoloSpectator.cs b/osu.Game/Screens/Play/SoloSpectator.cs
index 9be42b52b3..f8ed7b585f 100644
--- a/osu.Game/Screens/Play/SoloSpectator.cs
+++ b/osu.Game/Screens/Play/SoloSpectator.cs
@@ -1,13 +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.Diagnostics;
-using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -24,73 +20,54 @@ using osu.Game.Online.API.Requests;
 using osu.Game.Online.Spectator;
 using osu.Game.Overlays.BeatmapListing.Panels;
 using osu.Game.Overlays.Settings;
-using osu.Game.Replays;
 using osu.Game.Rulesets;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Replays;
-using osu.Game.Rulesets.Replays.Types;
-using osu.Game.Scoring;
 using osu.Game.Screens.OnlinePlay.Match.Components;
+using osu.Game.Screens.Spectate;
 using osu.Game.Users;
 using osuTK;
 
 namespace osu.Game.Screens.Play
 {
     [Cached(typeof(IPreviewTrackOwner))]
-    public class SoloSpectator : OsuScreen, IPreviewTrackOwner
+    public class SoloSpectator : SpectatorScreen, IPreviewTrackOwner
     {
+        [NotNull]
         private readonly User targetUser;
 
-        [Resolved]
-        private Bindable<WorkingBeatmap> beatmap { get; set; }
-
-        [Resolved]
-        private Bindable<RulesetInfo> ruleset { get; set; }
-
-        private Ruleset rulesetInstance;
-
-        [Resolved]
-        private Bindable<IReadOnlyList<Mod>> mods { get; set; }
-
         [Resolved]
         private IAPIProvider api { get; set; }
 
         [Resolved]
-        private SpectatorStreamingClient spectatorStreaming { get; set; }
-
-        [Resolved]
-        private BeatmapManager beatmaps { get; set; }
+        private PreviewTrackManager previewTrackManager { get; set; }
 
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
         [Resolved]
-        private PreviewTrackManager previewTrackManager { get; set; }
-
-        private Score score;
-
-        private readonly object scoreLock = new object();
+        private BeatmapManager beatmaps { get; set; }
 
         private Container beatmapPanelContainer;
-
-        private SpectatorState state;
-
-        private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
-
         private TriangleButton watchButton;
-
         private SettingsCheckbox automaticDownload;
-
         private BeatmapSetInfo onlineBeatmap;
 
         /// <summary>
-        /// Becomes true if a new state is waiting to be loaded (while this screen was not active).
+        /// The player's immediate online gameplay state.
+        /// This doesn't reflect the gameplay state being watched by the user if <see cref="pendingGameplayState"/> is non-null.
         /// </summary>
-        private bool newStatePending;
+        private GameplayState immediateGameplayState;
+
+        /// <summary>
+        /// The gameplay state that is pending to be watched, upon this screen becoming current.
+        /// </summary>
+        private GameplayState pendingGameplayState;
+
+        private GetBeatmapSetRequest onlineBeatmapRequest;
 
         public SoloSpectator([NotNull] User targetUser)
+            : base(targetUser.Id)
         {
-            this.targetUser = targetUser ?? throw new ArgumentNullException(nameof(targetUser));
+            this.targetUser = targetUser;
         }
 
         [BackgroundDependencyLoader]
@@ -173,7 +150,7 @@ namespace osu.Game.Screens.Play
                                 Width = 250,
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
-                                Action = attemptStart,
+                                Action = () => attemptStart(immediateGameplayState),
                                 Enabled = { Value = false }
                             }
                         }
@@ -185,169 +162,81 @@ namespace osu.Game.Screens.Play
         protected override void LoadComplete()
         {
             base.LoadComplete();
-
-            spectatorStreaming.OnUserBeganPlaying += userBeganPlaying;
-            spectatorStreaming.OnUserFinishedPlaying += userFinishedPlaying;
-            spectatorStreaming.OnNewFrames += userSentFrames;
-
-            spectatorStreaming.WatchUser(targetUser.Id);
-
-            managerUpdated = beatmaps.ItemUpdated.GetBoundCopy();
-            managerUpdated.BindValueChanged(beatmapUpdated);
-
             automaticDownload.Current.BindValueChanged(_ => checkForAutomaticDownload());
         }
 
-        private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> beatmap)
+        protected override void OnUserStateChanged(int userId, SpectatorState spectatorState) => Schedule(() =>
         {
-            if (beatmap.NewValue.TryGetTarget(out var beatmapSet) && beatmapSet.Beatmaps.Any(b => b.OnlineBeatmapID == state.BeatmapID))
-                Schedule(attemptStart);
-        }
+            clearDisplay();
+            showBeatmapPanel(spectatorState);
+        });
 
-        private void userSentFrames(int userId, FrameDataBundle data)
+        protected override void StartGameplay(int userId, GameplayState gameplayState) => Schedule(() =>
         {
-            // this is not scheduled as it handles propagation of frames even when in a child screen (at which point we are not alive).
-            // probably not the safest way to handle this.
-
-            if (userId != targetUser.Id)
-                return;
-
-            lock (scoreLock)
-            {
-                // this should never happen as the server sends the user's state on watching,
-                // but is here as a safety measure.
-                if (score == null)
-                    return;
-
-                // rulesetInstance should be guaranteed to be in sync with the score via scoreLock.
-                Debug.Assert(rulesetInstance != null && rulesetInstance.RulesetInfo.Equals(score.ScoreInfo.Ruleset));
-
-                foreach (var frame in data.Frames)
-                {
-                    IConvertibleReplayFrame convertibleFrame = rulesetInstance.CreateConvertibleReplayFrame();
-                    convertibleFrame.FromLegacy(frame, beatmap.Value.Beatmap);
-
-                    var convertedFrame = (ReplayFrame)convertibleFrame;
-                    convertedFrame.Time = frame.Time;
-
-                    score.Replay.Frames.Add(convertedFrame);
-                }
-            }
-        }
-
-        private void userBeganPlaying(int userId, SpectatorState state)
-        {
-            if (userId != targetUser.Id)
-                return;
-
-            this.state = state;
+            pendingGameplayState = null;
+            immediateGameplayState = gameplayState;
 
             if (this.IsCurrentScreen())
-                Schedule(attemptStart);
+                attemptStart(gameplayState);
             else
-                newStatePending = true;
-        }
+                pendingGameplayState = gameplayState;
+
+            watchButton.Enabled.Value = true;
+        });
+
+        protected override void EndGameplay(int userId) => Schedule(() =>
+        {
+            pendingGameplayState = null;
+            immediateGameplayState = null;
+
+            Schedule(clearDisplay);
+
+            watchButton.Enabled.Value = false;
+        });
 
         public override void OnResuming(IScreen last)
         {
             base.OnResuming(last);
 
-            if (newStatePending)
+            if (pendingGameplayState != null)
             {
-                attemptStart();
-                newStatePending = false;
+                attemptStart(pendingGameplayState);
+                pendingGameplayState = null;
             }
         }
 
-        private void userFinishedPlaying(int userId, SpectatorState state)
-        {
-            if (userId != targetUser.Id)
-                return;
-
-            lock (scoreLock)
-            {
-                if (score != null)
-                {
-                    score.Replay.HasReceivedAllFrames = true;
-                    score = null;
-                }
-            }
-
-            Schedule(clearDisplay);
-        }
-
         private void clearDisplay()
         {
             watchButton.Enabled.Value = false;
+            onlineBeatmapRequest?.Cancel();
             beatmapPanelContainer.Clear();
             previewTrackManager.StopAnyPlaying(this);
         }
 
-        private void attemptStart()
+        private void attemptStart(GameplayState gameplayState)
         {
-            clearDisplay();
-            showBeatmapPanel(state);
-
-            var resolvedRuleset = rulesets.AvailableRulesets.FirstOrDefault(r => r.ID == state.RulesetID)?.CreateInstance();
-
-            // ruleset not available
-            if (resolvedRuleset == null)
+            if (gameplayState == null)
                 return;
 
-            if (state.BeatmapID == null)
-                return;
+            Beatmap.Value = gameplayState.Beatmap;
+            Ruleset.Value = gameplayState.Ruleset.RulesetInfo;
 
-            var resolvedBeatmap = beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == state.BeatmapID);
-
-            if (resolvedBeatmap == null)
-            {
-                return;
-            }
-
-            lock (scoreLock)
-            {
-                score = new Score
-                {
-                    ScoreInfo = new ScoreInfo
-                    {
-                        Beatmap = resolvedBeatmap,
-                        User = targetUser,
-                        Mods = state.Mods.Select(m => m.ToMod(resolvedRuleset)).ToArray(),
-                        Ruleset = resolvedRuleset.RulesetInfo,
-                    },
-                    Replay = new Replay { HasReceivedAllFrames = false },
-                };
-
-                ruleset.Value = resolvedRuleset.RulesetInfo;
-                rulesetInstance = resolvedRuleset;
-
-                beatmap.Value = beatmaps.GetWorkingBeatmap(resolvedBeatmap);
-                watchButton.Enabled.Value = true;
-
-                this.Push(new SpectatorPlayerLoader(score));
-            }
+            this.Push(new SpectatorPlayerLoader(gameplayState.Score));
         }
 
         private void showBeatmapPanel(SpectatorState state)
         {
-            if (state?.BeatmapID == null)
-            {
-                onlineBeatmap = null;
-                return;
-            }
+            Debug.Assert(state.BeatmapID != null);
 
-            var req = new GetBeatmapSetRequest(state.BeatmapID.Value, BeatmapSetLookupType.BeatmapId);
-            req.Success += res => Schedule(() =>
+            onlineBeatmapRequest = new GetBeatmapSetRequest(state.BeatmapID.Value, BeatmapSetLookupType.BeatmapId);
+            onlineBeatmapRequest.Success += res => Schedule(() =>
             {
-                if (state != this.state)
-                    return;
-
                 onlineBeatmap = res.ToBeatmapSet(rulesets);
                 beatmapPanelContainer.Child = new GridBeatmapPanel(onlineBeatmap);
                 checkForAutomaticDownload();
             });
 
-            api.Queue(req);
+            api.Queue(onlineBeatmapRequest);
         }
 
         private void checkForAutomaticDownload()
@@ -369,21 +258,5 @@ namespace osu.Game.Screens.Play
             previewTrackManager.StopAnyPlaying(this);
             return base.OnExiting(next);
         }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-
-            if (spectatorStreaming != null)
-            {
-                spectatorStreaming.OnUserBeganPlaying -= userBeganPlaying;
-                spectatorStreaming.OnUserFinishedPlaying -= userFinishedPlaying;
-                spectatorStreaming.OnNewFrames -= userSentFrames;
-
-                spectatorStreaming.StopWatchingUser(targetUser.Id);
-            }
-
-            managerUpdated?.UnbindAll();
-        }
     }
 }

From c3c7c18549e281503d3225db9bc0d3fbc85c1511 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 1 Apr 2021 23:48:26 +0900
Subject: [PATCH 2127/3722] Fix tests

---
 .../Visual/Gameplay/TestSceneSpectator.cs         | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index b59f6a4eb7..9d85a9995d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -3,6 +3,8 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -11,6 +13,7 @@ using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Database;
 using osu.Game.Online;
 using osu.Game.Online.Spectator;
 using osu.Game.Replays.Legacy;
@@ -29,6 +32,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached(typeof(SpectatorStreamingClient))]
         private TestSpectatorStreamingClient testSpectatorStreamingClient = new TestSpectatorStreamingClient();
 
+        [Cached(typeof(UserLookupCache))]
+        private UserLookupCache lookupCache = new TestUserLookupCache();
+
         // used just to show beatmap card for the time being.
         protected override bool UseOnlineAPI => true;
 
@@ -301,5 +307,14 @@ namespace osu.Game.Tests.Visual.Gameplay
                 });
             }
         }
+
+        internal class TestUserLookupCache : UserLookupCache
+        {
+            protected override Task<User> ComputeValueAsync(int lookup, CancellationToken token = default) => Task.FromResult(new User
+            {
+                Id = lookup,
+                Username = $"User {lookup}"
+            });
+        }
     }
 }

From b8479a979f1ae1453e4488ec555a3cdc0e49f082 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 1 Apr 2021 18:06:12 +0200
Subject: [PATCH 2128/3722] Remove unused blueprint variable

---
 .../Editor/TestSceneSliderControlPointPiece.cs                 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
index b4eba7070b..9b67d18db6 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
@@ -22,7 +22,6 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
     {
         private Slider slider;
         private DrawableSlider drawableObject;
-        private TestSliderBlueprint blueprint;
 
         [SetUp]
         public void Setup() => Schedule(() =>
@@ -45,7 +44,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             slider.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { CircleSize = 2 });
 
             Add(drawableObject = new DrawableSlider(slider));
-            AddBlueprint(blueprint = new TestSliderBlueprint(drawableObject));
+            AddBlueprint(new TestSliderBlueprint(drawableObject));
         });
 
         [Test]

From 6a286c5e2128c3103bd36548434f29260aec806d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 1 Apr 2021 17:16:02 +0000
Subject: [PATCH 2129/3722] Bump Microsoft.NET.Test.Sdk from 16.9.1 to 16.9.4

Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.9.1 to 16.9.4.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.9.1...v16.9.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 .../osu.Game.Rulesets.Catch.Tests.csproj                        | 2 +-
 .../osu.Game.Rulesets.Mania.Tests.csproj                        | 2 +-
 osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj  | 2 +-
 .../osu.Game.Rulesets.Taiko.Tests.csproj                        | 2 +-
 osu.Game.Tests/osu.Game.Tests.csproj                            | 2 +-
 osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

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 728af5124e..c2d9a923d9 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
@@ -2,7 +2,7 @@
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
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 af16f39563..64e934efd2 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
@@ -2,7 +2,7 @@
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
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 3d2d1f3fec..f743d65db3 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
@@ -2,7 +2,7 @@
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
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 fa00922706..eab144592f 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
@@ -2,7 +2,7 @@
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index e36b3cdc74..0e1f6f6b0c 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -3,7 +3,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="DeepEqual" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
diff --git a/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj b/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
index b20583dd7e..a4e52f8cd4 100644
--- a/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
+++ b/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
   </ItemGroup>

From 8621a6b4fe8b84e50e2a1d56b25e3bed9824be6f Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 1 Apr 2021 20:34:04 +0200
Subject: [PATCH 2130/3722] Add margin to large segment test

Test ran fine on my end, but apparently not on the CI. This should make results a bit more consistent, hopefully.
---
 .../Editor/TestSceneSliderPlacementBlueprint.cs             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index 462abf2edb..d2c37061f0 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -323,12 +323,12 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             addMovementStep(startPosition);
             addClickStep(MouseButton.Left);
 
-            addMovementStep(startPosition + new Vector2(240, 240));
+            addMovementStep(startPosition + new Vector2(220, 220));
             addClickStep(MouseButton.Left);
 
             // Playfield dimensions are 640 x 480.
-            // So a 480 x 480 bounding box should be ok.
-            addMovementStep(startPosition + new Vector2(-240, 240));
+            // So a 440 x 440 bounding box should be ok.
+            addMovementStep(startPosition + new Vector2(-220, 220));
             addClickStep(MouseButton.Right);
 
             assertPlaced(true);

From fcd56dba44a84e3e752e97f0eb3ed6409407f5ac Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 2 Apr 2021 01:38:10 +0300
Subject: [PATCH 2131/3722] Guard against same ruleset file with loaded
 assembly filenames instead

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

diff --git a/osu.Game/Rulesets/RulesetStore.cs b/osu.Game/Rulesets/RulesetStore.cs
index deabea57ef..eb5271aa17 100644
--- a/osu.Game/Rulesets/RulesetStore.cs
+++ b/osu.Game/Rulesets/RulesetStore.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -173,7 +174,7 @@ namespace osu.Game.Rulesets
         {
             var filename = Path.GetFileNameWithoutExtension(file);
 
-            if (loadedAssemblies.Values.Any(t => t.Namespace == filename))
+            if (loadedAssemblies.Values.Any(t => Path.GetFileNameWithoutExtension(t.Assembly.Location) == filename))
                 return;
 
             try

From 5b1dc7d2b426e505da4b67cf8876404078a7f72f Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 2 Apr 2021 02:45:26 +0300
Subject: [PATCH 2132/3722] Remove unused using directive

---
 osu.Game/Rulesets/RulesetStore.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Rulesets/RulesetStore.cs b/osu.Game/Rulesets/RulesetStore.cs
index eb5271aa17..4261ee3d47 100644
--- a/osu.Game/Rulesets/RulesetStore.cs
+++ b/osu.Game/Rulesets/RulesetStore.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;

From e1aa9278272eabe7f6a975f3c78f4c03fca9122c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 2 Apr 2021 13:20:15 +0900
Subject: [PATCH 2133/3722] Add dropdown option to export score

---
 osu.Game/Online/Leaderboards/LeaderboardScore.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index 5608002513..da1bbd18c7 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -61,6 +61,9 @@ namespace osu.Game.Online.Leaderboards
         [Resolved(CanBeNull = true)]
         private SongSelect songSelect { get; set; }
 
+        [Resolved]
+        private ScoreManager scoreManager { get; set; }
+
         public LeaderboardScore(ScoreInfo score, int? rank, bool allowHighlight = true)
         {
             this.score = score;
@@ -388,6 +391,9 @@ namespace osu.Game.Online.Leaderboards
                 if (score.Mods.Length > 0 && modsContainer.Any(s => s.IsHovered) && songSelect != null)
                     items.Add(new OsuMenuItem("Use these mods", MenuItemType.Highlighted, () => songSelect.Mods.Value = score.Mods));
 
+                if (score.Files.Count > 0)
+                    items.Add(new OsuMenuItem("Export", MenuItemType.Standard, () => scoreManager.Export(score)));
+
                 if (score.ID != 0)
                     items.Add(new OsuMenuItem("Delete", MenuItemType.Destructive, () => dialogOverlay?.Push(new LocalScoreDeleteDialog(score))));
 

From 6d4d574a659c5148a7400003c6896990b2b689aa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Apr 2021 14:10:25 +0900
Subject: [PATCH 2134/3722] Fix exported replay filenames not having full
 metadata

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

diff --git a/osu.Game/Beatmaps/BeatmapInfo.cs b/osu.Game/Beatmaps/BeatmapInfo.cs
index a898e10e4f..bf7906bd5c 100644
--- a/osu.Game/Beatmaps/BeatmapInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapInfo.cs
@@ -147,7 +147,7 @@ namespace osu.Game.Beatmaps
         {
             string version = string.IsNullOrEmpty(Version) ? string.Empty : $"[{Version}]";
 
-            return $"{Metadata} {version}".Trim();
+            return $"{Metadata ?? BeatmapSet?.Metadata} {version}".Trim();
         }
 
         public bool Equals(BeatmapInfo other)

From 5063cd957f8013c060aff0d5bc14b6a4ec58a9e1 Mon Sep 17 00:00:00 2001
From: Amber <amberkowalski03@gmail.com>
Date: Fri, 2 Apr 2021 02:54:35 -0500
Subject: [PATCH 2135/3722] Force hit sample to play when Classic mod is
 enabled

---
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs                 | 4 ++++
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs   | 2 +-
 .../Objects/Drawables/DrawableSliderTail.cs                 | 6 ++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index 5470d0fcb4..21fde7cdc7 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -79,6 +79,10 @@ namespace osu.Game.Rulesets.Osu.Mods
                     case DrawableSliderHead head:
                         head.TrackFollowCircle = !NoSliderHeadMovement.Value;
                         break;
+
+                    case DrawableSliderTail tail:
+                        tail.AlwaysPlaySample = true;
+                        break;
                 }
             }
         }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 9122f347d0..4288f00e3a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -280,7 +280,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             // 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.
-            if (TailCircle.IsHit)
+            if (TailCircle.IsHit || TailCircle.AlwaysPlaySample)
                 base.PlaySamples();
         }
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index 6a8e02e886..ad6b98cba8 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -26,6 +26,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// </summary>
         public override bool DisplayResult => false;
 
+        /// <summary>
+        /// Whether the hit sample should always be played, regardless of whether the tail was actually hit.
+        /// </summary>
+        public bool AlwaysPlaySample { get; set; }
+
         public bool Tracking { get; set; }
 
         private SkinnableDrawable circlePiece;
@@ -44,6 +49,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         [BackgroundDependencyLoader]
         private void load()
         {
+            AlwaysPlaySample = false;
             Origin = Anchor.Centre;
             Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
 

From 45d16fb9164014de9990b6342f2a2d04b3805ba8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 2 Apr 2021 16:56:47 +0900
Subject: [PATCH 2136/3722] Rename event parameter for clarity

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

diff --git a/osu.Game/Screens/Spectate/SpectatorScreen.cs b/osu.Game/Screens/Spectate/SpectatorScreen.cs
index a534581807..25dd482112 100644
--- a/osu.Game/Screens/Spectate/SpectatorScreen.cs
+++ b/osu.Game/Screens/Spectate/SpectatorScreen.cs
@@ -83,9 +83,9 @@ namespace osu.Game.Screens.Spectate
             managerUpdated.BindValueChanged(beatmapUpdated);
         }
 
-        private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> beatmap)
+        private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> e)
         {
-            if (!beatmap.NewValue.TryGetTarget(out var beatmapSet))
+            if (!e.NewValue.TryGetTarget(out var beatmapSet))
                 return;
 
             lock (stateLock)

From 48e9985782cb5537b1053d6beb05342409a7a921 Mon Sep 17 00:00:00 2001
From: Amber <amberkowalski03@gmail.com>
Date: Fri, 2 Apr 2021 03:10:28 -0500
Subject: [PATCH 2137/3722] Make "AlwaysPlayTailSample" a mod setting rather
 than a hardcoded constant.

---
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index 21fde7cdc7..ec74225774 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -44,6 +44,9 @@ namespace osu.Game.Rulesets.Osu.Mods
         [SettingSource("Use fixed slider follow circle hit area", "Makes the slider follow circle track its final size at all times.")]
         public Bindable<bool> FixedFollowCircleHitArea { get; } = new BindableBool(true);
 
+        [SettingSource("Always play a slider's tail sample", "Always plays a slider's tail sample regardless of whether it was hit or not.")]
+        public Bindable<bool> AlwaysPlayTailSample { get; } = new BindableBool(true);
+
         public void ApplyToHitObject(HitObject hitObject)
         {
             switch (hitObject)
@@ -81,7 +84,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                         break;
 
                     case DrawableSliderTail tail:
-                        tail.AlwaysPlaySample = true;
+                        tail.AlwaysPlaySample = AlwaysPlayTailSample.Value;
                         break;
                 }
             }

From 5ac36a24625eb80c5f897ed7929788e08bb988c4 Mon Sep 17 00:00:00 2001
From: Amber <amberkowalski03@gmail.com>
Date: Fri, 2 Apr 2021 03:56:23 -0500
Subject: [PATCH 2138/3722] Switch AlwaysPlaySample to SamplePlaysOnlyOnHit in
 DrawableSliderTail for conformity

---
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs                   | 2 +-
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs     | 2 +-
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index ec74225774..882f848190 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -84,7 +84,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                         break;
 
                     case DrawableSliderTail tail:
-                        tail.AlwaysPlaySample = AlwaysPlayTailSample.Value;
+                        tail.SamplePlaysOnlyOnHit = !AlwaysPlayTailSample.Value;
                         break;
                 }
             }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 4288f00e3a..04708a5ece 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -280,7 +280,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             // 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.
-            if (TailCircle.IsHit || TailCircle.AlwaysPlaySample)
+            if (!TailCircle.SamplePlaysOnlyOnHit || TailCircle.IsHit)
                 base.PlaySamples();
         }
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index ad6b98cba8..4b9c10ab67 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         /// <summary>
         /// Whether the hit sample should always be played, regardless of whether the tail was actually hit.
         /// </summary>
-        public bool AlwaysPlaySample { get; set; }
+        public bool SamplePlaysOnlyOnHit { get; set; } = true;
 
         public bool Tracking { get; set; }
 
@@ -49,7 +49,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         [BackgroundDependencyLoader]
         private void load()
         {
-            AlwaysPlaySample = false;
             Origin = Anchor.Centre;
             Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
 

From 9c3d15171c6ba033970550e6e158a3fce750c3f6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 2 Apr 2021 18:00:28 +0900
Subject: [PATCH 2139/3722] Reword xmldoc slightly

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

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index 4b9c10ab67..87f098dd29 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -27,7 +27,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         public override bool DisplayResult => false;
 
         /// <summary>
-        /// Whether the hit sample should always be played, regardless of whether the tail was actually hit.
+        /// Whether the hit samples only play on successful hits.
+        /// If <c>false</c>, the hit samples will also play on misses.
         /// </summary>
         public bool SamplePlaysOnlyOnHit { get; set; } = true;
 

From d2950105fb391fffe4463248ca3d172286b54d09 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 2 Apr 2021 20:31:34 +0900
Subject: [PATCH 2140/3722] Add comment explaining use of lock

---
 osu.Game/Screens/Spectate/SpectatorScreen.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Spectate/SpectatorScreen.cs b/osu.Game/Screens/Spectate/SpectatorScreen.cs
index 25dd482112..4d285d519e 100644
--- a/osu.Game/Screens/Spectate/SpectatorScreen.cs
+++ b/osu.Game/Screens/Spectate/SpectatorScreen.cs
@@ -40,6 +40,7 @@ namespace osu.Game.Screens.Spectate
         [Resolved]
         private UserLookupCache userLookupCache { get; set; }
 
+        // A lock is used to synchronise access to spectator/gameplay states, since this class is a screen which may become non-current and stop receiving updates at any point.
         private readonly object stateLock = new object();
 
         private readonly Dictionary<int, User> userMap = new Dictionary<int, User>();

From 1ff77754fd9f1e40709b3a547ca090fcef07ef76 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Fri, 2 Apr 2021 20:14:31 +0800
Subject: [PATCH 2141/3722] Use OnlineViewContainer

---
 .../Visual/SongSelect/TestSceneBeatmapDetails.cs   |  5 +++++
 osu.Game/Screens/Select/BeatmapDetails.cs          | 14 +++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapDetails.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapDetails.cs
index acf037198f..06572f66bf 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapDetails.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapDetails.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
+using osu.Game.Online.API;
 using osu.Game.Screens.Select;
 
 namespace osu.Game.Tests.Visual.SongSelect
@@ -14,6 +15,8 @@ namespace osu.Game.Tests.Visual.SongSelect
     {
         private BeatmapDetails details;
 
+        private DummyAPIAccess api => (DummyAPIAccess)API;
+
         [SetUp]
         public void Setup() => Schedule(() =>
         {
@@ -173,6 +176,8 @@ namespace osu.Game.Tests.Visual.SongSelect
             {
                 OnlineBeatmapID = 162,
             });
+            AddStep("set online", () => api.SetState(APIState.Online));
+            AddStep("set offline", () => api.SetState(APIState.Offline));
         }
     }
 }
diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index 8a1c291fca..55616b1640 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -19,6 +19,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API.Requests;
 using osu.Game.Rulesets;
+using osu.Game.Online;
 
 namespace osu.Game.Screens.Select
 {
@@ -136,7 +137,7 @@ namespace osu.Game.Screens.Select
                                 },
                             },
                         },
-                        failRetryContainer = new Container
+                        failRetryContainer = new OnlineViewContainer("Sign in to view more details")
                         {
                             Anchor = Anchor.BottomLeft,
                             Origin = Anchor.BottomLeft,
@@ -153,11 +154,11 @@ namespace osu.Game.Screens.Select
                                     RelativeSizeAxes = Axes.Both,
                                     Padding = new MarginPadding { Top = 14 + spacing / 2 },
                                 },
+                                loading = new LoadingLayer(true)
                             },
                         },
                     },
                 },
-                loading = new LoadingLayer(true),
             };
         }
 
@@ -222,11 +223,9 @@ namespace osu.Game.Screens.Select
                     if (beatmap != requestedBeatmap)
                         // the beatmap has been changed since we started the lookup.
                         return;
-
                     updateMetrics();
                 });
             };
-
             api.Queue(lookup);
             loading.Show();
         }
@@ -236,7 +235,9 @@ namespace osu.Game.Screens.Select
             var hasRatings = beatmap?.BeatmapSet?.Metrics?.Ratings?.Any() ?? false;
             var hasRetriesFails = (beatmap?.Metrics?.Retries?.Any() ?? false) || (beatmap?.Metrics?.Fails?.Any() ?? false);
 
-            if (hasRatings)
+            bool isOnline = api.State.Value == APIState.Online;
+
+            if (hasRatings && isOnline)
             {
                 ratings.Metrics = beatmap.BeatmapSet.Metrics;
                 ratingsContainer.FadeIn(transition_duration);
@@ -244,7 +245,7 @@ namespace osu.Game.Screens.Select
             else
             {
                 ratings.Metrics = new BeatmapSetMetrics { Ratings = new int[10] };
-                ratingsContainer.FadeTo(0.25f, transition_duration);
+                ratingsContainer.FadeTo(isOnline ? 0.25f : 0, transition_duration);
             }
 
             if (hasRetriesFails)
@@ -259,7 +260,6 @@ namespace osu.Game.Screens.Select
                     Fails = new int[100],
                     Retries = new int[100],
                 };
-                failRetryContainer.FadeOut(transition_duration);
             }
 
             loading.Hide();

From cd53074941d864e0e1eaa33d8008f1730e8339a6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 2 Apr 2021 21:27:20 +0900
Subject: [PATCH 2142/3722] Schedule spectator callbacks

---
 osu.Game/Screens/Play/SoloSpectator.cs       | 69 +++++++++-----------
 osu.Game/Screens/Spectate/SpectatorScreen.cs |  6 +-
 2 files changed, 33 insertions(+), 42 deletions(-)

diff --git a/osu.Game/Screens/Play/SoloSpectator.cs b/osu.Game/Screens/Play/SoloSpectator.cs
index f8ed7b585f..820d776e63 100644
--- a/osu.Game/Screens/Play/SoloSpectator.cs
+++ b/osu.Game/Screens/Play/SoloSpectator.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Screens;
+using osu.Framework.Threading;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
@@ -53,15 +54,10 @@ namespace osu.Game.Screens.Play
 
         /// <summary>
         /// The player's immediate online gameplay state.
-        /// This doesn't reflect the gameplay state being watched by the user if <see cref="pendingGameplayState"/> is non-null.
+        /// This doesn't always reflect the gameplay state being watched.
         /// </summary>
         private GameplayState immediateGameplayState;
 
-        /// <summary>
-        /// The gameplay state that is pending to be watched, upon this screen becoming current.
-        /// </summary>
-        private GameplayState pendingGameplayState;
-
         private GetBeatmapSetRequest onlineBeatmapRequest;
 
         public SoloSpectator([NotNull] User targetUser)
@@ -150,7 +146,7 @@ namespace osu.Game.Screens.Play
                                 Width = 250,
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
-                                Action = () => attemptStart(immediateGameplayState),
+                                Action = () => scheduleStart(immediateGameplayState),
                                 Enabled = { Value = false }
                             }
                         }
@@ -165,44 +161,27 @@ namespace osu.Game.Screens.Play
             automaticDownload.Current.BindValueChanged(_ => checkForAutomaticDownload());
         }
 
-        protected override void OnUserStateChanged(int userId, SpectatorState spectatorState) => Schedule(() =>
+        protected override void OnUserStateChanged(int userId, SpectatorState spectatorState)
         {
             clearDisplay();
             showBeatmapPanel(spectatorState);
-        });
+        }
 
-        protected override void StartGameplay(int userId, GameplayState gameplayState) => Schedule(() =>
+        protected override void StartGameplay(int userId, GameplayState gameplayState)
         {
-            pendingGameplayState = null;
             immediateGameplayState = gameplayState;
-
-            if (this.IsCurrentScreen())
-                attemptStart(gameplayState);
-            else
-                pendingGameplayState = gameplayState;
-
             watchButton.Enabled.Value = true;
-        });
 
-        protected override void EndGameplay(int userId) => Schedule(() =>
+            scheduleStart(gameplayState);
+        }
+
+        protected override void EndGameplay(int userId)
         {
-            pendingGameplayState = null;
+            scheduledStart?.Cancel();
             immediateGameplayState = null;
-
-            Schedule(clearDisplay);
-
             watchButton.Enabled.Value = false;
-        });
 
-        public override void OnResuming(IScreen last)
-        {
-            base.OnResuming(last);
-
-            if (pendingGameplayState != null)
-            {
-                attemptStart(pendingGameplayState);
-                pendingGameplayState = null;
-            }
+            clearDisplay();
         }
 
         private void clearDisplay()
@@ -213,15 +192,27 @@ namespace osu.Game.Screens.Play
             previewTrackManager.StopAnyPlaying(this);
         }
 
-        private void attemptStart(GameplayState gameplayState)
+        private ScheduledDelegate scheduledStart;
+
+        private void scheduleStart(GameplayState gameplayState)
         {
-            if (gameplayState == null)
-                return;
+            // This function may be called multiple times in quick succession once the screen becomes current again.
+            scheduledStart?.Cancel();
+            scheduledStart = Schedule(() =>
+            {
+                if (this.IsCurrentScreen())
+                    start();
+                else
+                    scheduleStart(gameplayState);
+            });
 
-            Beatmap.Value = gameplayState.Beatmap;
-            Ruleset.Value = gameplayState.Ruleset.RulesetInfo;
+            void start()
+            {
+                Beatmap.Value = gameplayState.Beatmap;
+                Ruleset.Value = gameplayState.Ruleset.RulesetInfo;
 
-            this.Push(new SpectatorPlayerLoader(gameplayState.Score));
+                this.Push(new SpectatorPlayerLoader(gameplayState.Score));
+            }
         }
 
         private void showBeatmapPanel(SpectatorState state)
diff --git a/osu.Game/Screens/Spectate/SpectatorScreen.cs b/osu.Game/Screens/Spectate/SpectatorScreen.cs
index 4d285d519e..6dd3144fc8 100644
--- a/osu.Game/Screens/Spectate/SpectatorScreen.cs
+++ b/osu.Game/Screens/Spectate/SpectatorScreen.cs
@@ -110,7 +110,7 @@ namespace osu.Game.Screens.Spectate
                     return;
 
                 spectatorStates[userId] = state;
-                OnUserStateChanged(userId, state);
+                Schedule(() => OnUserStateChanged(userId, state));
 
                 updateGameplayState(userId);
             }
@@ -148,7 +148,7 @@ namespace osu.Game.Screens.Spectate
                 var gameplayState = new GameplayState(score, resolvedRuleset, beatmaps.GetWorkingBeatmap(resolvedBeatmap));
 
                 gameplayStates[userId] = gameplayState;
-                StartGameplay(userId, gameplayState);
+                Schedule(() => StartGameplay(userId, gameplayState));
             }
         }
 
@@ -191,7 +191,7 @@ namespace osu.Game.Screens.Spectate
                 gameplayState.Score.Replay.HasReceivedAllFrames = true;
 
                 gameplayStates.Remove(userId);
-                EndGameplay(userId);
+                Schedule(() => EndGameplay(userId));
             }
         }
 

From a5a19319cc6682e8380b8bee725657b64c5ee66e Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Fri, 2 Apr 2021 21:15:28 +0800
Subject: [PATCH 2143/3722] Fix code style

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

diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index 55616b1640..40029cc19a 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -223,9 +223,11 @@ namespace osu.Game.Screens.Select
                     if (beatmap != requestedBeatmap)
                         // the beatmap has been changed since we started the lookup.
                         return;
+
                     updateMetrics();
                 });
             };
+
             api.Queue(lookup);
             loading.Show();
         }

From 438f3e63499528226d13e21dac77880dc118a67a Mon Sep 17 00:00:00 2001
From: hbnrmx <dev@hbnr.mx>
Date: Fri, 2 Apr 2021 17:57:21 +0200
Subject: [PATCH 2144/3722] move fallback text to PlaceholderText

---
 osu.Game/Screens/Edit/Setup/ResourcesSection.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
index 1b841775e2..e00eaf9aa2 100644
--- a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
+++ b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
@@ -73,7 +73,8 @@ namespace osu.Game.Screens.Edit.Setup
                 audioTrackTextBox = new FileChooserLabelledTextBox
                 {
                     Label = "Audio Track",
-                    Current = { Value = working.Value.Metadata.AudioFile ?? "Click to select a track" },
+                    PlaceholderText = "Click to select a track",
+                    Current = { Value = working.Value.Metadata.AudioFile },
                     Target = audioTrackFileChooserContainer,
                     TabbableContentContainer = this
                 },

From 824fb9f3987817585365e45ed01642b21573f387 Mon Sep 17 00:00:00 2001
From: hbnrmx <dev@hbnr.mx>
Date: Fri, 2 Apr 2021 18:01:26 +0200
Subject: [PATCH 2145/3722] reopen FileSelector in the directory of the
 previous selection

---
 osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs b/osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs
index 6e2737256a..70876bf26c 100644
--- a/osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs
+++ b/osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Screens.Edit.Setup
         {
             FileSelector fileSelector;
 
-            Target.Child = fileSelector = new FileSelector(validFileExtensions: ResourcesSection.AudioExtensions)
+            Target.Child = fileSelector = new FileSelector(currentFile.Value?.DirectoryName, ResourcesSection.AudioExtensions)
             {
                 RelativeSizeAxes = Axes.X,
                 Height = 400,

From 0dce4b8894a55d9d6295673476557fd8041b6b6e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 3 Apr 2021 13:01:08 +0900
Subject: [PATCH 2146/3722] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 5b65670869..73ee1d9d10 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.330.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.402.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 6a7f7e7026..931b55222a 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.330.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.402.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 4aa3ad1c61..64e9a01a92 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.330.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.402.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.330.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.402.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From bd7da9eb39703e033c0ffa5b30563659f505efc2 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sat, 3 Apr 2021 12:43:17 +0800
Subject: [PATCH 2147/3722] Make beatmap title use unicode

---
 osu.Game/Beatmaps/BeatmapMetadata.cs                    | 2 ++
 osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapMetadata.cs b/osu.Game/Beatmaps/BeatmapMetadata.cs
index 367f612dc8..eea9bdd976 100644
--- a/osu.Game/Beatmaps/BeatmapMetadata.cs
+++ b/osu.Game/Beatmaps/BeatmapMetadata.cs
@@ -19,8 +19,10 @@ namespace osu.Game.Beatmaps
         public int ID { get; set; }
 
         public string Title { get; set; }
+        [JsonProperty("title_unicode")]
         public string TitleUnicode { get; set; }
         public string Artist { get; set; }
+        [JsonProperty("artist_unicode")]
         public string ArtistUnicode { get; set; }
 
         [JsonIgnore]
diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs
index 153aa41582..a61640a02e 100644
--- a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs
+++ b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Localisation;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
@@ -228,8 +229,8 @@ namespace osu.Game.Overlays.BeatmapSet
 
                     loading.Hide();
 
-                    title.Text = setInfo.NewValue.Metadata.Title ?? string.Empty;
-                    artist.Text = setInfo.NewValue.Metadata.Artist ?? string.Empty;
+                    title.Text = new RomanisableString(setInfo.NewValue.Metadata.TitleUnicode, setInfo.NewValue.Metadata.Title);
+                    artist.Text = new RomanisableString(setInfo.NewValue.Metadata.ArtistUnicode, setInfo.NewValue.Metadata.Artist);
 
                     explicitContentPill.Alpha = setInfo.NewValue.OnlineInfo.HasExplicitContent ? 1 : 0;
 

From dde255980b9aa24bfe95764e20f811fca6b757f7 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sat, 3 Apr 2021 12:44:51 +0800
Subject: [PATCH 2148/3722] Fix formatting

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

diff --git a/osu.Game/Beatmaps/BeatmapMetadata.cs b/osu.Game/Beatmaps/BeatmapMetadata.cs
index eea9bdd976..858da8e602 100644
--- a/osu.Game/Beatmaps/BeatmapMetadata.cs
+++ b/osu.Game/Beatmaps/BeatmapMetadata.cs
@@ -19,9 +19,12 @@ namespace osu.Game.Beatmaps
         public int ID { get; set; }
 
         public string Title { get; set; }
+
         [JsonProperty("title_unicode")]
         public string TitleUnicode { get; set; }
+
         public string Artist { get; set; }
+
         [JsonProperty("artist_unicode")]
         public string ArtistUnicode { get; set; }
 

From fe66b84bede18b7a2148c5c4ae1fdea948cad717 Mon Sep 17 00:00:00 2001
From: Samuel Cattini-Schultz <syriiins@gmail.com>
Date: Sat, 6 Feb 2021 15:48:14 +1100
Subject: [PATCH 2149/3722] Implement dynamic previous hitobject retention for
 Skill class

There is no reason we should be limiting skills to knowing only the previous 2 objects. This originally existed as an angle implementation detail of the original pp+ codebase which made its way here, but didn't get used in the same way.
---
 .../NonVisual/LimitedCapacityStackTest.cs     | 115 --------------
 osu.Game.Tests/NonVisual/ReverseQueueTest.cs  | 143 ++++++++++++++++++
 osu.Game/Rulesets/Difficulty/Skills/Skill.cs  |  33 +++-
 .../Difficulty/Utils/LimitedCapacityStack.cs  |  92 -----------
 .../Rulesets/Difficulty/Utils/ReverseQueue.cs | 110 ++++++++++++++
 5 files changed, 284 insertions(+), 209 deletions(-)
 delete mode 100644 osu.Game.Tests/NonVisual/LimitedCapacityStackTest.cs
 create mode 100644 osu.Game.Tests/NonVisual/ReverseQueueTest.cs
 delete mode 100644 osu.Game/Rulesets/Difficulty/Utils/LimitedCapacityStack.cs
 create mode 100644 osu.Game/Rulesets/Difficulty/Utils/ReverseQueue.cs

diff --git a/osu.Game.Tests/NonVisual/LimitedCapacityStackTest.cs b/osu.Game.Tests/NonVisual/LimitedCapacityStackTest.cs
deleted file mode 100644
index d5ac38008e..0000000000
--- a/osu.Game.Tests/NonVisual/LimitedCapacityStackTest.cs
+++ /dev/null
@@ -1,115 +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 NUnit.Framework;
-using osu.Game.Rulesets.Difficulty.Utils;
-
-namespace osu.Game.Tests.NonVisual
-{
-    [TestFixture]
-    public class LimitedCapacityStackTest
-    {
-        private const int capacity = 3;
-
-        private LimitedCapacityStack<int> stack;
-
-        [SetUp]
-        public void Setup()
-        {
-            stack = new LimitedCapacityStack<int>(capacity);
-        }
-
-        [Test]
-        public void TestEmptyStack()
-        {
-            Assert.AreEqual(0, stack.Count);
-
-            Assert.Throws<ArgumentOutOfRangeException>(() =>
-            {
-                int unused = stack[0];
-            });
-
-            int count = 0;
-            foreach (var unused in stack)
-                count++;
-
-            Assert.AreEqual(0, count);
-        }
-
-        [TestCase(1)]
-        [TestCase(2)]
-        [TestCase(3)]
-        public void TestInRangeElements(int count)
-        {
-            // e.g. 0 -> 1 -> 2
-            for (int i = 0; i < count; i++)
-                stack.Push(i);
-
-            Assert.AreEqual(count, stack.Count);
-
-            // e.g. 2 -> 1 -> 0 (reverse order)
-            for (int i = 0; i < stack.Count; i++)
-                Assert.AreEqual(count - 1 - i, stack[i]);
-
-            // e.g. indices 3, 4, 5, 6 (out of range)
-            for (int i = stack.Count; i < stack.Count + capacity; i++)
-            {
-                Assert.Throws<ArgumentOutOfRangeException>(() =>
-                {
-                    int unused = stack[i];
-                });
-            }
-        }
-
-        [TestCase(4)]
-        [TestCase(5)]
-        [TestCase(6)]
-        public void TestOverflowElements(int count)
-        {
-            // e.g. 0 -> 1 -> 2 -> 3
-            for (int i = 0; i < count; i++)
-                stack.Push(i);
-
-            Assert.AreEqual(capacity, stack.Count);
-
-            // e.g. 3 -> 2 -> 1 (reverse order)
-            for (int i = 0; i < stack.Count; i++)
-                Assert.AreEqual(count - 1 - i, stack[i]);
-
-            // e.g. indices 3, 4, 5, 6 (out of range)
-            for (int i = stack.Count; i < stack.Count + capacity; i++)
-            {
-                Assert.Throws<ArgumentOutOfRangeException>(() =>
-                {
-                    int unused = stack[i];
-                });
-            }
-        }
-
-        [TestCase(1)]
-        [TestCase(2)]
-        [TestCase(3)]
-        [TestCase(4)]
-        [TestCase(5)]
-        [TestCase(6)]
-        public void TestEnumerator(int count)
-        {
-            // e.g. 0 -> 1 -> 2 -> 3
-            for (int i = 0; i < count; i++)
-                stack.Push(i);
-
-            int enumeratorCount = 0;
-            int expectedValue = count - 1;
-
-            foreach (var item in stack)
-            {
-                Assert.AreEqual(expectedValue, item);
-                enumeratorCount++;
-                expectedValue--;
-            }
-
-            Assert.AreEqual(stack.Count, enumeratorCount);
-        }
-    }
-}
diff --git a/osu.Game.Tests/NonVisual/ReverseQueueTest.cs b/osu.Game.Tests/NonVisual/ReverseQueueTest.cs
new file mode 100644
index 0000000000..93cd9403ce
--- /dev/null
+++ b/osu.Game.Tests/NonVisual/ReverseQueueTest.cs
@@ -0,0 +1,143 @@
+// Copyright (c) ppy 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.Rulesets.Difficulty.Utils;
+
+namespace osu.Game.Tests.NonVisual
+{
+    [TestFixture]
+    public class ReverseQueueTest
+    {
+        private ReverseQueue<char> queue;
+
+        [SetUp]
+        public void Setup()
+        {
+            queue = new ReverseQueue<char>(4);
+        }
+
+        [Test]
+        public void TestEmptyQueue()
+        {
+            Assert.AreEqual(0, queue.Count);
+
+            Assert.Throws<ArgumentOutOfRangeException>(() =>
+            {
+                char unused = queue[0];
+            });
+
+            int count = 0;
+            foreach (var unused in queue)
+                count++;
+
+            Assert.AreEqual(0, count);
+        }
+
+        [Test]
+        public void TestEnqueue()
+        {
+            // Assert correct values and reverse index after enqueueing
+            queue.Enqueue('a');
+            queue.Enqueue('b');
+            queue.Enqueue('c');
+
+            Assert.AreEqual('c', queue[0]);
+            Assert.AreEqual('b', queue[1]);
+            Assert.AreEqual('a', queue[2]);
+
+            // Assert correct values and reverse index after enqueueing beyond initial capacity of 4
+            queue.Enqueue('d');
+            queue.Enqueue('e');
+            queue.Enqueue('f');
+
+            Assert.AreEqual('f', queue[0]);
+            Assert.AreEqual('e', queue[1]);
+            Assert.AreEqual('d', queue[2]);
+            Assert.AreEqual('c', queue[3]);
+            Assert.AreEqual('b', queue[4]);
+            Assert.AreEqual('a', queue[5]);
+        }
+
+        [Test]
+        public void TestDequeue()
+        {
+            queue.Enqueue('a');
+            queue.Enqueue('b');
+            queue.Enqueue('c');
+            queue.Enqueue('d');
+            queue.Enqueue('e');
+            queue.Enqueue('f');
+
+            // Assert correct item return and no longer in queue after dequeueing
+            Assert.AreEqual('a', queue[5]);
+            var dequeuedItem = queue.Dequeue();
+
+            Assert.AreEqual('a', dequeuedItem);
+            Assert.AreEqual(5, queue.Count);
+            Assert.AreEqual('f', queue[0]);
+            Assert.AreEqual('b', queue[4]);
+            Assert.Throws<ArgumentOutOfRangeException>(() =>
+            {
+                char unused = queue[5];
+            });
+
+            // Assert correct state after enough enqueues and dequeues to wrap around array (queue.start = 0 again)
+            queue.Enqueue('g');
+            queue.Enqueue('h');
+            queue.Enqueue('i');
+            queue.Dequeue();
+            queue.Dequeue();
+            queue.Dequeue();
+            queue.Dequeue();
+            queue.Dequeue();
+            queue.Dequeue();
+            queue.Dequeue();
+
+            Assert.AreEqual(1, queue.Count);
+            Assert.AreEqual('i', queue[0]);
+        }
+
+        [Test]
+        public void TestClear()
+        {
+            queue.Enqueue('a');
+            queue.Enqueue('b');
+            queue.Enqueue('c');
+            queue.Enqueue('d');
+            queue.Enqueue('e');
+            queue.Enqueue('f');
+
+            // Assert queue is empty after clearing
+            queue.Clear();
+
+            Assert.AreEqual(0, queue.Count);
+            Assert.Throws<ArgumentOutOfRangeException>(() =>
+            {
+                char unused = queue[0];
+            });
+        }
+
+        [Test]
+        public void TestEnumerator()
+        {
+            queue.Enqueue('a');
+            queue.Enqueue('b');
+            queue.Enqueue('c');
+            queue.Enqueue('d');
+            queue.Enqueue('e');
+            queue.Enqueue('f');
+
+            char[] expectedValues = { 'f', 'e', 'd', 'c', 'b', 'a' };
+            int expectedValueIndex = 0;
+
+            // Assert items are enumerated in correct order
+            foreach (var item in queue)
+            {
+                Assert.AreEqual(expectedValues[expectedValueIndex], item);
+                expectedValueIndex++;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
index 126e30ed73..caa94a5355 100644
--- a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
+++ b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
@@ -40,7 +40,14 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         /// <summary>
         /// <see cref="DifficultyHitObject"/>s that were processed previously. They can affect the strain values of the following objects.
         /// </summary>
-        protected readonly LimitedCapacityStack<DifficultyHitObject> Previous = new LimitedCapacityStack<DifficultyHitObject>(2); // Contained objects not used yet
+        protected readonly ReverseQueue<DifficultyHitObject> Previous;
+
+        /// <summary>
+        /// Soft capacity of the <see cref="Previous"/> queue.
+        /// <see cref="Previous"/> will automatically resize if it exceeds capacity, but will do so at a very slight performance impact.
+        /// The actual capacity will be set to this value + 1 to allow for storage of the current object before the next can be processed.
+        /// </summary>
+        protected virtual int PreviousCollectionSoftCapacity => 1;
 
         /// <summary>
         /// The current strain level.
@@ -61,6 +68,7 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         protected Skill(Mod[] mods)
         {
             this.mods = mods;
+            Previous = new ReverseQueue<DifficultyHitObject>(PreviousCollectionSoftCapacity + 1);
         }
 
         /// <summary>
@@ -68,12 +76,33 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         /// </summary>
         public void Process(DifficultyHitObject current)
         {
+            RemoveExtraneousHistory(current);
+
             CurrentStrain *= strainDecay(current.DeltaTime);
             CurrentStrain += StrainValueOf(current) * SkillMultiplier;
 
             currentSectionPeak = Math.Max(CurrentStrain, currentSectionPeak);
 
-            Previous.Push(current);
+            AddToHistory(current);
+        }
+
+        /// <summary>
+        /// Remove objects from <see cref="Previous"/> that are no longer needed for calculations from the current object onwards.
+        /// </summary>
+        /// <param name="current">The <see cref="DifficultyHitObject"/> to be processed.</param>
+        protected virtual void RemoveExtraneousHistory(DifficultyHitObject current)
+        {
+            while (Previous.Count > 1)
+                Previous.Dequeue();
+        }
+
+        /// <summary>
+        /// Add the current <see cref="DifficultyHitObject"/> to the <see cref="Previous"/> queue (if required).
+        /// </summary>
+        /// <param name="current">The <see cref="DifficultyHitObject"/> that was just processed.</param>
+        protected virtual void AddToHistory(DifficultyHitObject current)
+        {
+            Previous.Enqueue(current);
         }
 
         /// <summary>
diff --git a/osu.Game/Rulesets/Difficulty/Utils/LimitedCapacityStack.cs b/osu.Game/Rulesets/Difficulty/Utils/LimitedCapacityStack.cs
deleted file mode 100644
index 1fc5abce90..0000000000
--- a/osu.Game/Rulesets/Difficulty/Utils/LimitedCapacityStack.cs
+++ /dev/null
@@ -1,92 +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;
-using System.Collections.Generic;
-
-namespace osu.Game.Rulesets.Difficulty.Utils
-{
-    /// <summary>
-    /// An indexed stack with limited depth. Indexing starts at the top of the stack.
-    /// </summary>
-    public class LimitedCapacityStack<T> : IEnumerable<T>
-    {
-        /// <summary>
-        /// The number of elements in the stack.
-        /// </summary>
-        public int Count { get; private set; }
-
-        private readonly T[] array;
-        private readonly int capacity;
-        private int marker; // Marks the position of the most recently added item.
-
-        /// <summary>
-        /// Constructs a new <see cref="LimitedCapacityStack{T}"/>.
-        /// </summary>
-        /// <param name="capacity">The number of items the stack can hold.</param>
-        public LimitedCapacityStack(int capacity)
-        {
-            if (capacity < 0)
-                throw new ArgumentOutOfRangeException(nameof(capacity));
-
-            this.capacity = capacity;
-            array = new T[capacity];
-            marker = capacity; // Set marker to the end of the array, outside of the indexed range by one.
-        }
-
-        /// <summary>
-        /// Retrieves the item at an index in the stack.
-        /// </summary>
-        /// <param name="i">The index of the item to retrieve. The top of the stack is returned at index 0.</param>
-        public T this[int i]
-        {
-            get
-            {
-                if (i < 0 || i > Count - 1)
-                    throw new ArgumentOutOfRangeException(nameof(i));
-
-                i += marker;
-                if (i > capacity - 1)
-                    i -= capacity;
-
-                return array[i];
-            }
-        }
-
-        /// <summary>
-        /// Pushes an item to this <see cref="LimitedCapacityStack{T}"/>.
-        /// </summary>
-        /// <param name="item">The item to push.</param>
-        public void Push(T item)
-        {
-            // Overwrite the oldest item instead of shifting every item by one with every addition.
-            if (marker == 0)
-                marker = capacity - 1;
-            else
-                --marker;
-
-            array[marker] = item;
-
-            if (Count < capacity)
-                ++Count;
-        }
-
-        /// <summary>
-        /// Returns an enumerator which enumerates items in the history starting from the most recently added one.
-        /// </summary>
-        public IEnumerator<T> GetEnumerator()
-        {
-            for (int i = marker; i < capacity; ++i)
-                yield return array[i];
-
-            if (Count == capacity)
-            {
-                for (int i = 0; i < marker; ++i)
-                    yield return array[i];
-            }
-        }
-
-        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
-    }
-}
diff --git a/osu.Game/Rulesets/Difficulty/Utils/ReverseQueue.cs b/osu.Game/Rulesets/Difficulty/Utils/ReverseQueue.cs
new file mode 100644
index 0000000000..08b2936876
--- /dev/null
+++ b/osu.Game/Rulesets/Difficulty/Utils/ReverseQueue.cs
@@ -0,0 +1,110 @@
+// Copyright (c) ppy 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;
+using System.Collections.Generic;
+
+namespace osu.Game.Rulesets.Difficulty.Utils
+{
+    /// <summary>
+    /// An indexed queue where items are indexed beginning from the end instead of the start.
+    /// </summary>
+    public class ReverseQueue<T> : IEnumerable<T>
+    {
+        /// <summary>
+        /// The number of elements in the <see cref="ReverseQueue{T}"/>.
+        /// </summary>
+        public int Count { get; private set; }
+
+        private T[] items;
+        private int capacity;
+        private int start;
+
+        public ReverseQueue(int initialCapacity)
+        {
+            if (initialCapacity <= 0)
+                throw new ArgumentOutOfRangeException(nameof(initialCapacity));
+
+            items = new T[initialCapacity];
+            capacity = initialCapacity;
+            start = 0;
+            Count = 0;
+        }
+
+        /// <summary>
+        /// Retrieves the item at an index in the <see cref="ReverseQueue{T}"/>.
+        /// </summary>
+        /// <param name="index">The index of the item to retrieve. The most recently enqueued item is at index 0.</param>
+        public T this[int index]
+        {
+            get
+            {
+                if (index < 0 || index > Count - 1)
+                    throw new ArgumentOutOfRangeException(nameof(index));
+
+                int reverseIndex = Count - 1 - index;
+                return items[(start + reverseIndex) % capacity];
+            }
+        }
+
+        /// <summary>
+        /// Enqueues an item to this <see cref="ReverseQueue{T}"/>.
+        /// </summary>
+        /// <param name="item">The item to enqueue.</param>
+        public void Enqueue(T item)
+        {
+            if (Count == capacity)
+            {
+                // Double the buffer size
+                var buffer = new T[capacity * 2];
+
+                // Copy items to new queue
+                for (int i = 0; i < Count; i++)
+                {
+                    buffer[i] = items[(start + i) % capacity];
+                }
+
+                // Replace array with new buffer
+                items = buffer;
+                capacity *= 2;
+                start = 0;
+            }
+
+            items[(start + Count) % capacity] = item;
+            Count++;
+        }
+
+        /// <summary>
+        /// Dequeues an item from the <see cref="ReverseQueue{T}"/> and returns it.
+        /// </summary>
+        /// <returns>The item dequeued from the <see cref="ReverseQueue{T}"/>.</returns>
+        public T Dequeue()
+        {
+            var item = items[start];
+            start = (start + 1) % capacity;
+            Count--;
+            return item;
+        }
+
+        /// <summary>
+        /// Clears the <see cref="ReverseQueue{T}"/> of all items.
+        /// </summary>
+        public void Clear()
+        {
+            start = 0;
+            Count = 0;
+        }
+
+        /// <summary>
+        /// Returns an enumerator which enumerates items in the <see cref="ReverseQueue{T}"/> starting from the most recently enqueued one.
+        /// </summary>
+        public IEnumerator<T> GetEnumerator()
+        {
+            for (int i = Count - 1; i >= 0; i--)
+                yield return items[(start + i) % capacity];
+        }
+
+        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+    }
+}

From 5b2dcea8a85b9655fc24f5419c5c19c7b93eb61c Mon Sep 17 00:00:00 2001
From: Samuel Cattini-Schultz <syriiins@gmail.com>
Date: Sat, 3 Apr 2021 20:47:39 +1100
Subject: [PATCH 2150/3722] Refactor to encapsulate strain logic into Skill
 class

As strains are an implementation detail of the current Skill calculations, it makes sense that strain related logic should be encapsulated within the Skill class.
---
 .../Difficulty/CatchDifficultyCalculator.cs   |  2 -
 .../Difficulty/Skills/Movement.cs             |  2 +
 .../Difficulty/Skills/Strain.cs               |  5 +-
 .../Difficulty/TaikoDifficultyCalculator.cs   | 13 +++--
 .../Difficulty/DifficultyCalculator.cs        | 29 ++----------
 .../Preprocessing/DifficultyHitObject.cs      |  2 +-
 osu.Game/Rulesets/Difficulty/Skills/Skill.cs  | 47 +++++++++++++------
 7 files changed, 49 insertions(+), 51 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
index 10aae70722..f5cce47186 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
@@ -21,8 +21,6 @@ namespace osu.Game.Rulesets.Catch.Difficulty
     {
         private const double star_scaling_factor = 0.153;
 
-        protected override int SectionLength => 750;
-
         private float halfCatcherWidth;
 
         public CatchDifficultyCalculator(Ruleset ruleset, WorkingBeatmap beatmap)
diff --git a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
index 9ad719be1a..7222166535 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
@@ -20,6 +20,8 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
 
         protected override double DecayWeight => 0.94;
 
+        protected override int SectionLength => 750;
+
         protected readonly float HalfCatcherWidth;
 
         private float? lastPlayerPosition;
diff --git a/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs b/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
index 830b6004a6..0761724e83 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
@@ -7,7 +7,6 @@ using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
 using osu.Game.Rulesets.Mania.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Objects;
 
 namespace osu.Game.Rulesets.Mania.Difficulty.Skills
 {
@@ -36,7 +35,7 @@ namespace osu.Game.Rulesets.Mania.Difficulty.Skills
         protected override double StrainValueOf(DifficultyHitObject current)
         {
             var maniaCurrent = (ManiaDifficultyHitObject)current;
-            var endTime = maniaCurrent.BaseObject.GetEndTime();
+            var endTime = maniaCurrent.EndTime;
             var column = maniaCurrent.BaseObject.Column;
 
             double holdFactor = 1.0; // Factor to all additional strains in case something else is held
@@ -46,7 +45,7 @@ namespace osu.Game.Rulesets.Mania.Difficulty.Skills
             for (int i = 0; i < holdEndTimes.Length; ++i)
             {
                 // If there is at least one other overlapping end or note, then we get an addition, buuuuuut...
-                if (Precision.DefinitelyBigger(holdEndTimes[i], maniaCurrent.BaseObject.StartTime, 1) && Precision.DefinitelyBigger(endTime, holdEndTimes[i], 1))
+                if (Precision.DefinitelyBigger(holdEndTimes[i], maniaCurrent.StartTime, 1) && Precision.DefinitelyBigger(endTime, holdEndTimes[i], 1))
                     holdAddition = 1.0;
 
                 // ... this addition only is valid if there is _no_ other note with the same ending. Releasing multiple notes at the same time is just as easy as releasing 1
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
index fc198d2493..6b3e31c5d5 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
@@ -133,11 +133,16 @@ namespace osu.Game.Rulesets.Taiko.Difficulty
         {
             List<double> peaks = new List<double>();
 
-            for (int i = 0; i < colour.StrainPeaks.Count; i++)
+            var colourPeaks = colour.GetCurrentStrainPeaks().ToList();
+            var rhythmPeaks = rhythm.GetCurrentStrainPeaks().ToList();
+            var staminaRightPeaks = staminaRight.GetCurrentStrainPeaks().ToList();
+            var staminaLeftPeaks = staminaLeft.GetCurrentStrainPeaks().ToList();
+
+            for (int i = 0; i < colourPeaks.Count; i++)
             {
-                double colourPeak = colour.StrainPeaks[i] * colour_skill_multiplier;
-                double rhythmPeak = rhythm.StrainPeaks[i] * rhythm_skill_multiplier;
-                double staminaPeak = (staminaRight.StrainPeaks[i] + staminaLeft.StrainPeaks[i]) * stamina_skill_multiplier * staminaPenalty;
+                double colourPeak = colourPeaks[i] * colour_skill_multiplier;
+                double rhythmPeak = rhythmPeaks[i] * rhythm_skill_multiplier;
+                double staminaPeak = (staminaRightPeaks[i] + staminaLeftPeaks[i]) * stamina_skill_multiplier * staminaPenalty;
                 peaks.Add(norm(2, colourPeak, rhythmPeak, staminaPeak));
             }
 
diff --git a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
index 9d06f960b7..14ada8ca09 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
@@ -16,11 +16,6 @@ namespace osu.Game.Rulesets.Difficulty
 {
     public abstract class DifficultyCalculator
     {
-        /// <summary>
-        /// The length of each strain section.
-        /// </summary>
-        protected virtual int SectionLength => 400;
-
         private readonly Ruleset ruleset;
         private readonly WorkingBeatmap beatmap;
 
@@ -71,32 +66,14 @@ namespace osu.Game.Rulesets.Difficulty
 
             var difficultyHitObjects = SortObjects(CreateDifficultyHitObjects(beatmap, clockRate)).ToList();
 
-            double sectionLength = SectionLength * clockRate;
-
-            // The first object doesn't generate a strain, so we begin with an incremented section end
-            double currentSectionEnd = Math.Ceiling(beatmap.HitObjects.First().StartTime / sectionLength) * sectionLength;
-
-            foreach (DifficultyHitObject h in difficultyHitObjects)
+            foreach (var hitObject in difficultyHitObjects)
             {
-                while (h.BaseObject.StartTime > currentSectionEnd)
+                foreach (var skill in skills)
                 {
-                    foreach (Skill s in skills)
-                    {
-                        s.SaveCurrentPeak();
-                        s.StartNewSectionFrom(currentSectionEnd / clockRate);
-                    }
-
-                    currentSectionEnd += sectionLength;
+                    skill.Process(hitObject);
                 }
-
-                foreach (Skill s in skills)
-                    s.Process(h);
             }
 
-            // The peak strain will not be saved for the last section in the above loop
-            foreach (Skill s in skills)
-                s.SaveCurrentPeak();
-
             return CreateDifficultyAttributes(beatmap, mods, skills, clockRate);
         }
 
diff --git a/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs b/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs
index 576fbb2af0..5edfb2207b 100644
--- a/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs
+++ b/osu.Game/Rulesets/Difficulty/Preprocessing/DifficultyHitObject.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Difficulty.Preprocessing
         public readonly HitObject LastObject;
 
         /// <summary>
-        /// Amount of time elapsed between <see cref="BaseObject"/> and <see cref="LastObject"/>.
+        /// Amount of time elapsed between <see cref="BaseObject"/> and <see cref="LastObject"/>, adjusted by clockrate.
         /// </summary>
         public readonly double DeltaTime;
 
diff --git a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
index 126e30ed73..aa187c6afd 100644
--- a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
+++ b/osu.Game/Rulesets/Difficulty/Skills/Skill.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;
@@ -16,11 +16,6 @@ namespace osu.Game.Rulesets.Difficulty.Skills
     /// </summary>
     public abstract class Skill
     {
-        /// <summary>
-        /// The peak strain for each <see cref="DifficultyCalculator.SectionLength"/> section of the beatmap.
-        /// </summary>
-        public IReadOnlyList<double> StrainPeaks => strainPeaks;
-
         /// <summary>
         /// Strain values are multiplied by this number for the given skill. Used to balance the value of different skills between each other.
         /// </summary>
@@ -47,6 +42,11 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         /// </summary>
         protected double CurrentStrain { get; private set; } = 1;
 
+        /// <summary>
+        /// The length of each strain section.
+        /// </summary>
+        protected virtual int SectionLength => 400;
+
         /// <summary>
         /// Mods for use in skill calculations.
         /// </summary>
@@ -54,6 +54,8 @@ namespace osu.Game.Rulesets.Difficulty.Skills
 
         private double currentSectionPeak = 1; // We also keep track of the peak strain level in the current section.
 
+        private double currentSectionEnd;
+
         private readonly List<double> strainPeaks = new List<double>();
 
         private readonly Mod[] mods;
@@ -68,6 +70,17 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         /// </summary>
         public void Process(DifficultyHitObject current)
         {
+            // The first object doesn't generate a strain, so we begin with an incremented section end
+            if (Previous.Count == 0)
+                currentSectionEnd = Math.Ceiling(current.StartTime / SectionLength) * SectionLength;
+
+            while (current.StartTime > currentSectionEnd)
+            {
+                saveCurrentPeak();
+                startNewSectionFrom(currentSectionEnd);
+                currentSectionEnd += SectionLength;
+            }
+
             CurrentStrain *= strainDecay(current.DeltaTime);
             CurrentStrain += StrainValueOf(current) * SkillMultiplier;
 
@@ -79,22 +92,20 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         /// <summary>
         /// Saves the current peak strain level to the list of strain peaks, which will be used to calculate an overall difficulty.
         /// </summary>
-        public void SaveCurrentPeak()
+        private void saveCurrentPeak()
         {
-            if (Previous.Count > 0)
-                strainPeaks.Add(currentSectionPeak);
+            strainPeaks.Add(currentSectionPeak);
         }
 
         /// <summary>
         /// Sets the initial strain level for a new section.
         /// </summary>
-        /// <param name="time">The beginning of the new section in milliseconds, adjusted by clockrate.</param>
-        public void StartNewSectionFrom(double time)
+        /// <param name="time">The beginning of the new section in milliseconds.</param>
+        private void startNewSectionFrom(double time)
         {
             // The maximum strain of the new section is not zero by default, strain decays as usual regardless of section boundaries.
             // This means we need to capture the strain level at the beginning of the new section, and use that as the initial peak level.
-            if (Previous.Count > 0)
-                currentSectionPeak = GetPeakStrain(time);
+            currentSectionPeak = GetPeakStrain(time);
         }
 
         /// <summary>
@@ -105,7 +116,13 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         protected virtual double GetPeakStrain(double time) => CurrentStrain * strainDecay(time - Previous[0].StartTime);
 
         /// <summary>
-        /// Returns the calculated difficulty value representing all processed <see cref="DifficultyHitObject"/>s.
+        /// Returns a live enumerable of the peak strains for each <see cref="SectionLength"/> section of the beatmap,
+        /// including the peak of the current section.
+        /// </summary>
+        public IEnumerable<double> GetCurrentStrainPeaks() => strainPeaks.Append(currentSectionPeak);
+
+        /// <summary>
+        /// Returns the calculated difficulty value representing all <see cref="DifficultyHitObject"/>s that have been processed up to this point.
         /// </summary>
         public double DifficultyValue()
         {
@@ -114,7 +131,7 @@ namespace osu.Game.Rulesets.Difficulty.Skills
 
             // Difficulty is the weighted sum of the highest strains from every section.
             // We're sorting from highest to lowest strain.
-            foreach (double strain in strainPeaks.OrderByDescending(d => d))
+            foreach (double strain in GetCurrentStrainPeaks().OrderByDescending(d => d))
             {
                 difficulty += strain * weight;
                 weight *= DecayWeight;

From 85d2b1232a22f900187731033a7b753ea1429225 Mon Sep 17 00:00:00 2001
From: Samuel Cattini-Schultz <syriiins@gmail.com>
Date: Sat, 3 Apr 2021 20:52:36 +1100
Subject: [PATCH 2151/3722] Refactor to abstract out strain logic into
 StrainSkill class

While it is the case for the existing official Skills, Skill implementations shouldn't be required to conform to a strain based approach.
There are other valid approaches to calculating skill difficulty that can be supported by abstracting the strain logic into its own StrainSkill class.
---
 .../Difficulty/Skills/Movement.cs             |   2 +-
 .../Difficulty/Skills/Strain.cs               |   2 +-
 .../Difficulty/Skills/Aim.cs                  |   2 +-
 .../Difficulty/Skills/Speed.cs                |   2 +-
 .../Difficulty/Skills/Colour.cs               |   2 +-
 .../Difficulty/Skills/Rhythm.cs               |   2 +-
 .../Difficulty/Skills/Stamina.cs              |   2 +-
 osu.Game/Rulesets/Difficulty/Skills/Skill.cs  | 115 +--------------
 .../Rulesets/Difficulty/Skills/StrainSkill.cs | 137 ++++++++++++++++++
 9 files changed, 150 insertions(+), 116 deletions(-)
 create mode 100644 osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs

diff --git a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
index 7222166535..75e17f6c48 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
@@ -9,7 +9,7 @@ using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Catch.Difficulty.Skills
 {
-    public class Movement : Skill
+    public class Movement : StrainSkill
     {
         private const float absolute_player_positioning_error = 16f;
         private const float normalized_hitobject_radius = 41.0f;
diff --git a/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs b/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
index 0761724e83..2ba2ee6b4a 100644
--- a/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
+++ b/osu.Game.Rulesets.Mania/Difficulty/Skills/Strain.cs
@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Mania.Difficulty.Skills
 {
-    public class Strain : Skill
+    public class Strain : StrainSkill
     {
         private const double individual_decay_base = 0.125;
         private const double overall_decay_base = 0.30;
diff --git a/osu.Game.Rulesets.Osu/Difficulty/Skills/Aim.cs b/osu.Game.Rulesets.Osu/Difficulty/Skills/Aim.cs
index 90cba13c7c..cb819ec090 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Skills/Aim.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Skills/Aim.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
     /// <summary>
     /// Represents the skill required to correctly aim at every object in the map with a uniform CircleSize and normalized distances.
     /// </summary>
-    public class Aim : Skill
+    public class Aim : StrainSkill
     {
         private const double angle_bonus_begin = Math.PI / 3;
         private const double timing_threshold = 107;
diff --git a/osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs b/osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs
index 200bc7997d..fbac080fc6 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
     /// <summary>
     /// Represents the skill required to press keys with regards to keeping up with the speed at which objects need to be hit.
     /// </summary>
-    public class Speed : Skill
+    public class Speed : StrainSkill
     {
         private const double single_spacing_threshold = 125;
 
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
index cc0738e252..769d021362 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Colour.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
     /// <summary>
     /// Calculates the colour coefficient of taiko difficulty.
     /// </summary>
-    public class Colour : Skill
+    public class Colour : StrainSkill
     {
         protected override double SkillMultiplier => 1;
         protected override double StrainDecayBase => 0.4;
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
index f2b8309ac5..a32f6ebe0d 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Rhythm.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
     /// <summary>
     /// Calculates the rhythm coefficient of taiko difficulty.
     /// </summary>
-    public class Rhythm : Skill
+    public class Rhythm : StrainSkill
     {
         protected override double SkillMultiplier => 10;
         protected override double StrainDecayBase => 0;
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
index c34cce0cd6..4cceadb23f 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/Skills/Stamina.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Taiko.Difficulty.Skills
     /// <remarks>
     /// The reference play style chosen uses two hands, with full alternating (the hand changes after every hit).
     /// </remarks>
-    public class Stamina : Skill
+    public class Stamina : StrainSkill
     {
         protected override double SkillMultiplier => 1;
         protected override double StrainDecayBase => 0.4;
diff --git a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
index aa187c6afd..b3d7ce3c40 100644
--- a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
+++ b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
@@ -1,9 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Utils;
 using osu.Game.Rulesets.Mods;
@@ -11,140 +9,39 @@ using osu.Game.Rulesets.Mods;
 namespace osu.Game.Rulesets.Difficulty.Skills
 {
     /// <summary>
-    /// Used to processes strain values of <see cref="DifficultyHitObject"/>s, keep track of strain levels caused by the processed objects
-    /// and to calculate a final difficulty value representing the difficulty of hitting all the processed objects.
+    /// A bare minimal abstract skill for fully custom skill implementations.
     /// </summary>
     public abstract class Skill
     {
-        /// <summary>
-        /// Strain values are multiplied by this number for the given skill. Used to balance the value of different skills between each other.
-        /// </summary>
-        protected abstract double SkillMultiplier { get; }
-
-        /// <summary>
-        /// Determines how quickly strain decays for the given skill.
-        /// For example a value of 0.15 indicates that strain decays to 15% of its original value in one second.
-        /// </summary>
-        protected abstract double StrainDecayBase { get; }
-
-        /// <summary>
-        /// The weight by which each strain value decays.
-        /// </summary>
-        protected virtual double DecayWeight => 0.9;
-
         /// <summary>
         /// <see cref="DifficultyHitObject"/>s that were processed previously. They can affect the strain values of the following objects.
         /// </summary>
         protected readonly LimitedCapacityStack<DifficultyHitObject> Previous = new LimitedCapacityStack<DifficultyHitObject>(2); // Contained objects not used yet
 
-        /// <summary>
-        /// The current strain level.
-        /// </summary>
-        protected double CurrentStrain { get; private set; } = 1;
-
-        /// <summary>
-        /// The length of each strain section.
-        /// </summary>
-        protected virtual int SectionLength => 400;
-
+        
         /// <summary>
         /// Mods for use in skill calculations.
         /// </summary>
         protected IReadOnlyList<Mod> Mods => mods;
 
-        private double currentSectionPeak = 1; // We also keep track of the peak strain level in the current section.
-
-        private double currentSectionEnd;
-
-        private readonly List<double> strainPeaks = new List<double>();
-
         private readonly Mod[] mods;
-
         protected Skill(Mod[] mods)
         {
             this.mods = mods;
         }
 
         /// <summary>
-        /// Process a <see cref="DifficultyHitObject"/> and update current strain values accordingly.
+        /// Process a <see cref="DifficultyHitObject"/>.
         /// </summary>
-        public void Process(DifficultyHitObject current)
+        /// <param name="current">The <see cref="DifficultyHitObject"/> to process.</param>
+        public virtual void Process(DifficultyHitObject current)
         {
-            // The first object doesn't generate a strain, so we begin with an incremented section end
-            if (Previous.Count == 0)
-                currentSectionEnd = Math.Ceiling(current.StartTime / SectionLength) * SectionLength;
-
-            while (current.StartTime > currentSectionEnd)
-            {
-                saveCurrentPeak();
-                startNewSectionFrom(currentSectionEnd);
-                currentSectionEnd += SectionLength;
-            }
-
-            CurrentStrain *= strainDecay(current.DeltaTime);
-            CurrentStrain += StrainValueOf(current) * SkillMultiplier;
-
-            currentSectionPeak = Math.Max(CurrentStrain, currentSectionPeak);
-
             Previous.Push(current);
         }
 
-        /// <summary>
-        /// Saves the current peak strain level to the list of strain peaks, which will be used to calculate an overall difficulty.
-        /// </summary>
-        private void saveCurrentPeak()
-        {
-            strainPeaks.Add(currentSectionPeak);
-        }
-
-        /// <summary>
-        /// Sets the initial strain level for a new section.
-        /// </summary>
-        /// <param name="time">The beginning of the new section in milliseconds.</param>
-        private void startNewSectionFrom(double time)
-        {
-            // The maximum strain of the new section is not zero by default, strain decays as usual regardless of section boundaries.
-            // This means we need to capture the strain level at the beginning of the new section, and use that as the initial peak level.
-            currentSectionPeak = GetPeakStrain(time);
-        }
-
-        /// <summary>
-        /// Retrieves the peak strain at a point in time.
-        /// </summary>
-        /// <param name="time">The time to retrieve the peak strain at, adjusted by clockrate.</param>
-        /// <returns>The peak strain.</returns>
-        protected virtual double GetPeakStrain(double time) => CurrentStrain * strainDecay(time - Previous[0].StartTime);
-
-        /// <summary>
-        /// Returns a live enumerable of the peak strains for each <see cref="SectionLength"/> section of the beatmap,
-        /// including the peak of the current section.
-        /// </summary>
-        public IEnumerable<double> GetCurrentStrainPeaks() => strainPeaks.Append(currentSectionPeak);
-
         /// <summary>
         /// Returns the calculated difficulty value representing all <see cref="DifficultyHitObject"/>s that have been processed up to this point.
         /// </summary>
-        public double DifficultyValue()
-        {
-            double difficulty = 0;
-            double weight = 1;
-
-            // Difficulty is the weighted sum of the highest strains from every section.
-            // We're sorting from highest to lowest strain.
-            foreach (double strain in GetCurrentStrainPeaks().OrderByDescending(d => d))
-            {
-                difficulty += strain * weight;
-                weight *= DecayWeight;
-            }
-
-            return difficulty;
-        }
-
-        /// <summary>
-        /// Calculates the strain value of a <see cref="DifficultyHitObject"/>. This value is affected by previously processed objects.
-        /// </summary>
-        protected abstract double StrainValueOf(DifficultyHitObject current);
-
-        private double strainDecay(double ms) => Math.Pow(StrainDecayBase, ms / 1000);
+        public abstract double DifficultyValue();
     }
 }
diff --git a/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs b/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs
new file mode 100644
index 0000000000..c324f8e414
--- /dev/null
+++ b/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs
@@ -0,0 +1,137 @@
+// Copyright (c) ppy 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.Rulesets.Difficulty.Preprocessing;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Difficulty.Skills
+{
+    /// <summary>
+    /// Used to processes strain values of <see cref="DifficultyHitObject"/>s, keep track of strain levels caused by the processed objects
+    /// and to calculate a final difficulty value representing the difficulty of hitting all the processed objects.
+    /// </summary>
+    public abstract class StrainSkill : Skill
+    {
+        /// <summary>
+        /// Strain values are multiplied by this number for the given skill. Used to balance the value of different skills between each other.
+        /// </summary>
+        protected abstract double SkillMultiplier { get; }
+
+        /// <summary>
+        /// Determines how quickly strain decays for the given skill.
+        /// For example a value of 0.15 indicates that strain decays to 15% of its original value in one second.
+        /// </summary>
+        protected abstract double StrainDecayBase { get; }
+
+        /// <summary>
+        /// The weight by which each strain value decays.
+        /// </summary>
+        protected virtual double DecayWeight => 0.9;
+
+        /// <summary>
+        /// The current strain level.
+        /// </summary>
+        protected double CurrentStrain { get; private set; } = 1;
+
+        /// <summary>
+        /// The length of each strain section.
+        /// </summary>
+        protected virtual int SectionLength => 400;
+
+        private double currentSectionPeak = 1; // We also keep track of the peak strain level in the current section.
+
+        private double currentSectionEnd;
+
+        private readonly List<double> strainPeaks = new List<double>();
+
+        protected StrainSkill(Mod[] mods)
+            : base(mods)
+        {
+        }
+
+        /// <summary>
+        /// Process a <see cref="DifficultyHitObject"/> and update current strain values accordingly.
+        /// </summary>
+        public sealed override void Process(DifficultyHitObject current)
+        {
+            // The first object doesn't generate a strain, so we begin with an incremented section end
+            if (Previous.Count == 0)
+                currentSectionEnd = Math.Ceiling(current.StartTime / SectionLength) * SectionLength;
+
+            while (current.StartTime > currentSectionEnd)
+            {
+                saveCurrentPeak();
+                startNewSectionFrom(currentSectionEnd);
+                currentSectionEnd += SectionLength;
+            }
+
+            CurrentStrain *= strainDecay(current.DeltaTime);
+            CurrentStrain += StrainValueOf(current) * SkillMultiplier;
+
+            currentSectionPeak = Math.Max(CurrentStrain, currentSectionPeak);
+
+            base.Process(current);
+        }
+
+        /// <summary>
+        /// Saves the current peak strain level to the list of strain peaks, which will be used to calculate an overall difficulty.
+        /// </summary>
+        private void saveCurrentPeak()
+        {
+            strainPeaks.Add(currentSectionPeak);
+        }
+
+        /// <summary>
+        /// Sets the initial strain level for a new section.
+        /// </summary>
+        /// <param name="time">The beginning of the new section in milliseconds.</param>
+        private void startNewSectionFrom(double time)
+        {
+            // The maximum strain of the new section is not zero by default, strain decays as usual regardless of section boundaries.
+            // This means we need to capture the strain level at the beginning of the new section, and use that as the initial peak level.
+            currentSectionPeak = GetPeakStrain(time);
+        }
+
+        /// <summary>
+        /// Retrieves the peak strain at a point in time.
+        /// </summary>
+        /// <param name="time">The time to retrieve the peak strain at.</param>
+        /// <returns>The peak strain.</returns>
+        protected virtual double GetPeakStrain(double time) => CurrentStrain * strainDecay(time - Previous[0].StartTime);
+
+        /// <summary>
+        /// Returns a live enumerable of the peak strains for each <see cref="SectionLength"/> section of the beatmap,
+        /// including the peak of the current section.
+        /// </summary>
+        public IEnumerable<double> GetCurrentStrainPeaks() => strainPeaks.Append(currentSectionPeak);
+
+        /// <summary>
+        /// Returns the calculated difficulty value representing all <see cref="DifficultyHitObject"/>s that have been processed up to this point.
+        /// </summary>
+        public sealed override double DifficultyValue()
+        {
+            double difficulty = 0;
+            double weight = 1;
+
+            // Difficulty is the weighted sum of the highest strains from every section.
+            // We're sorting from highest to lowest strain.
+            foreach (double strain in GetCurrentStrainPeaks().OrderByDescending(d => d))
+            {
+                difficulty += strain * weight;
+                weight *= DecayWeight;
+            }
+
+            return difficulty;
+        }
+
+        /// <summary>
+        /// Calculates the strain value of a <see cref="DifficultyHitObject"/>. This value is affected by previously processed objects.
+        /// </summary>
+        protected abstract double StrainValueOf(DifficultyHitObject current);
+
+        private double strainDecay(double ms) => Math.Pow(StrainDecayBase, ms / 1000);
+    }
+}

From 7d4b0e3f0afde6f3046ce3d0eecdddfaf90561e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 3 Apr 2021 12:34:48 +0200
Subject: [PATCH 2152/3722] Fix editor clock scene not re-enabling beatmap

Could interfere with other tests due to causing crashes on attempts to
change `Beatmap.Value`.
---
 osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
index 390198be04..0b1617b6a6 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
@@ -77,5 +77,11 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("start clock again", Clock.Start);
             AddAssert("clock looped to start", () => Clock.IsRunning && Clock.CurrentTime < 500);
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            Beatmap.Disabled = false;
+            base.Dispose(isDisposing);
+        }
     }
 }

From b66ba43bc56f27a096912255c147d31453dba659 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 3 Apr 2021 14:02:15 +0200
Subject: [PATCH 2153/3722] Add failing test scene

---
 .../Visual/Editing/TestSceneEditorSeeking.cs  | 79 +++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Editing/TestSceneEditorSeeking.cs

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSeeking.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSeeking.cs
new file mode 100644
index 0000000000..96ce418851
--- /dev/null
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSeeking.cs
@@ -0,0 +1,79 @@
+// Copyright (c) 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.Utils;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Visual.Editing
+{
+    public class TestSceneEditorSeeking : EditorTestScene
+    {
+        protected override Ruleset CreateEditorRuleset() => new OsuRuleset();
+
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
+        {
+            var beatmap = base.CreateBeatmap(ruleset);
+
+            beatmap.BeatmapInfo.BeatDivisor = 1;
+
+            beatmap.ControlPointInfo = new ControlPointInfo();
+            beatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = 1000 });
+            beatmap.ControlPointInfo.Add(2000, new TimingControlPoint { BeatLength = 500 });
+
+            return beatmap;
+        }
+
+        [Test]
+        public void TestSnappedSeeking()
+        {
+            AddStep("seek to 0", () => EditorClock.Seek(0));
+            AddAssert("time is 0", () => EditorClock.CurrentTime == 0);
+
+            pressAndCheckTime(Key.Right, 1000);
+            pressAndCheckTime(Key.Right, 2000);
+            pressAndCheckTime(Key.Right, 2500);
+            pressAndCheckTime(Key.Right, 3000);
+
+            pressAndCheckTime(Key.Left, 2500);
+            pressAndCheckTime(Key.Left, 2000);
+            pressAndCheckTime(Key.Left, 1000);
+        }
+
+        [Test]
+        public void TestSnappedSeekingAfterControlPointChange()
+        {
+            AddStep("seek to 0", () => EditorClock.Seek(0));
+            AddAssert("time is 0", () => EditorClock.CurrentTime == 0);
+
+            pressAndCheckTime(Key.Right, 1000);
+            pressAndCheckTime(Key.Right, 2000);
+            pressAndCheckTime(Key.Right, 2500);
+            pressAndCheckTime(Key.Right, 3000);
+
+            AddStep("remove 2nd timing point", () =>
+            {
+                EditorBeatmap.BeginChange();
+                var group = EditorBeatmap.ControlPointInfo.GroupAt(2000);
+                EditorBeatmap.ControlPointInfo.RemoveGroup(group);
+                EditorBeatmap.EndChange();
+            });
+
+            pressAndCheckTime(Key.Left, 2000);
+            pressAndCheckTime(Key.Left, 1000);
+
+            pressAndCheckTime(Key.Right, 2000);
+            pressAndCheckTime(Key.Right, 3000);
+        }
+
+        private void pressAndCheckTime(Key key, double expectedTime)
+        {
+            AddStep($"press {key}", () => InputManager.Key(key));
+            AddUntilStep($"time is {expectedTime}", () => Precision.AlmostEquals(expectedTime, EditorClock.CurrentTime, 1));
+        }
+    }
+}

From 4df7ff21c787fc3ebad631fb8d93331903b9c908 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 3 Apr 2021 11:43:47 +0200
Subject: [PATCH 2154/3722] Fix editor arrow seek snapping not updating after
 control point changes

The editor clock, which is responsible for performing the seek, was not
aware of changes in control points due to reading from the wrong
beatmap. `loadableBeatmap` is not actually changed by any of the editor
components; `playableBeatmap` and `editorBeatmap` are.

For now this is changed to use `playableBeatmap`. A better follow-up
would be to use `editorBeatmap`, but it would probably be best to move
the beat snap bindable into `EditorBeatmap` first.
---
 osu.Game/Screens/Edit/Editor.cs               | 32 +++++++++----------
 osu.Game/Screens/Edit/EditorClock.cs          |  8 ++---
 osu.Game/Tests/Visual/EditorClockTestScene.cs |  2 +-
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 389eb79797..0759e21382 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -122,22 +122,6 @@ namespace osu.Game.Screens.Edit
                     return;
             }
 
-            beatDivisor.Value = loadableBeatmap.BeatmapInfo.BeatDivisor;
-            beatDivisor.BindValueChanged(divisor => loadableBeatmap.BeatmapInfo.BeatDivisor = divisor.NewValue);
-
-            // Todo: should probably be done at a DrawableRuleset level to share logic with Player.
-            clock = new EditorClock(loadableBeatmap, beatDivisor) { IsCoupled = false };
-
-            UpdateClockSource();
-
-            dependencies.CacheAs(clock);
-            AddInternal(clock);
-
-            clock.SeekingOrStopped.BindValueChanged(_ => updateSampleDisabledState());
-
-            // todo: remove caching of this and consume via editorBeatmap?
-            dependencies.Cache(beatDivisor);
-
             try
             {
                 playableBeatmap = loadableBeatmap.GetPlayableBeatmap(loadableBeatmap.BeatmapInfo.Ruleset);
@@ -154,6 +138,22 @@ namespace osu.Game.Screens.Edit
                 return;
             }
 
+            beatDivisor.Value = playableBeatmap.BeatmapInfo.BeatDivisor;
+            beatDivisor.BindValueChanged(divisor => playableBeatmap.BeatmapInfo.BeatDivisor = divisor.NewValue);
+
+            // Todo: should probably be done at a DrawableRuleset level to share logic with Player.
+            clock = new EditorClock(playableBeatmap, beatDivisor) { IsCoupled = false };
+
+            UpdateClockSource();
+
+            dependencies.CacheAs(clock);
+            AddInternal(clock);
+
+            clock.SeekingOrStopped.BindValueChanged(_ => updateSampleDisabledState());
+
+            // todo: remove caching of this and consume via editorBeatmap?
+            dependencies.Cache(beatDivisor);
+
             AddInternal(editorBeatmap = new EditorBeatmap(playableBeatmap, loadableBeatmap.Skin));
             dependencies.CacheAs(editorBeatmap);
             changeHandler = new EditorChangeHandler(editorBeatmap);
diff --git a/osu.Game/Screens/Edit/EditorClock.cs b/osu.Game/Screens/Edit/EditorClock.cs
index d0197ce1ec..772f6ea192 100644
--- a/osu.Game/Screens/Edit/EditorClock.cs
+++ b/osu.Game/Screens/Edit/EditorClock.cs
@@ -42,12 +42,12 @@ namespace osu.Game.Screens.Edit
         /// </summary>
         public bool IsSeeking { get; private set; }
 
-        public EditorClock(WorkingBeatmap beatmap, BindableBeatDivisor beatDivisor)
-            : this(beatmap.Beatmap.ControlPointInfo, beatmap.Track.Length, beatDivisor)
+        public EditorClock(IBeatmap beatmap, BindableBeatDivisor beatDivisor)
+            : this(beatmap.ControlPointInfo, beatDivisor)
         {
         }
 
-        public EditorClock(ControlPointInfo controlPointInfo, double trackLength, BindableBeatDivisor beatDivisor)
+        public EditorClock(ControlPointInfo controlPointInfo, BindableBeatDivisor beatDivisor)
         {
             this.beatDivisor = beatDivisor;
 
@@ -57,7 +57,7 @@ namespace osu.Game.Screens.Edit
         }
 
         public EditorClock()
-            : this(new ControlPointInfo(), 1000, new BindableBeatDivisor())
+            : this(new ControlPointInfo(), new BindableBeatDivisor())
         {
         }
 
diff --git a/osu.Game/Tests/Visual/EditorClockTestScene.cs b/osu.Game/Tests/Visual/EditorClockTestScene.cs
index 693c9cb792..79cfee8518 100644
--- a/osu.Game/Tests/Visual/EditorClockTestScene.cs
+++ b/osu.Game/Tests/Visual/EditorClockTestScene.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Tests.Visual
 
         protected EditorClockTestScene()
         {
-            Clock = new EditorClock(new ControlPointInfo(), 5000, BeatDivisor) { IsCoupled = false };
+            Clock = new EditorClock(new ControlPointInfo(), BeatDivisor) { IsCoupled = false };
         }
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)

From bdd1072dcebf7fd88af0198645bcaa98c4218416 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 3 Apr 2021 18:52:50 +0200
Subject: [PATCH 2155/3722] Adjust colours and spacing to be closer to design

---
 osu.Game/Screens/Edit/Setup/SetupScreen.cs  | 4 ++--
 osu.Game/Screens/Edit/Setup/SetupSection.cs | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index 1c3cbb7206..de09347d0a 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Screens.Edit.Setup
         public SetupScreen()
             : base(EditorScreenMode.SongSetup)
         {
-            ColourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
+            ColourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
         }
 
         [BackgroundDependencyLoader]
@@ -41,7 +41,7 @@ namespace osu.Game.Screens.Edit.Setup
                     {
                         new Box
                         {
-                            Colour = colours.GreySeafoamDark,
+                            Colour = ColourProvider.Dark4,
                             RelativeSizeAxes = Axes.Both,
                         },
                         new SectionsContainer<SetupSection>
diff --git a/osu.Game/Screens/Edit/Setup/SetupSection.cs b/osu.Game/Screens/Edit/Setup/SetupSection.cs
index 88521a8fb0..8347ca1157 100644
--- a/osu.Game/Screens/Edit/Setup/SetupSection.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupSection.cs
@@ -33,6 +33,10 @@ namespace osu.Game.Screens.Edit.Setup
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y,
                 Spacing = new Vector2(20),
+                Padding = new MarginPadding
+                {
+                    Horizontal = 90
+                },
                 Direction = FillDirection.Vertical,
             };
         }

From 95d7e6c74b579c4049b0eec9c34b9ad451835a6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 3 Apr 2021 19:02:33 +0200
Subject: [PATCH 2156/3722] Explicitly associate setup sections with titles

---
 .../Screens/Edit/Setup/DifficultySection.cs   |  8 ++---
 .../Screens/Edit/Setup/MetadataSection.cs     |  8 ++---
 .../Screens/Edit/Setup/ResourcesSection.cs    |  8 ++---
 osu.Game/Screens/Edit/Setup/SetupSection.cs   | 35 ++++++++++++++-----
 4 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/osu.Game/Screens/Edit/Setup/DifficultySection.cs b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
index 36fb0191b0..493d3ed20c 100644
--- a/osu.Game/Screens/Edit/Setup/DifficultySection.cs
+++ b/osu.Game/Screens/Edit/Setup/DifficultySection.cs
@@ -5,8 +5,8 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterfaceV2;
 
 namespace osu.Game.Screens.Edit.Setup
@@ -18,15 +18,13 @@ namespace osu.Game.Screens.Edit.Setup
         private LabelledSliderBar<float> approachRateSlider;
         private LabelledSliderBar<float> overallDifficultySlider;
 
+        public override LocalisableString Title => "Difficulty";
+
         [BackgroundDependencyLoader]
         private void load()
         {
             Children = new Drawable[]
             {
-                new OsuSpriteText
-                {
-                    Text = "Difficulty settings"
-                },
                 circleSizeSlider = new LabelledSliderBar<float>
                 {
                     Label = "Object Size",
diff --git a/osu.Game/Screens/Edit/Setup/MetadataSection.cs b/osu.Game/Screens/Edit/Setup/MetadataSection.cs
index f429164ece..889a5eab5e 100644
--- a/osu.Game/Screens/Edit/Setup/MetadataSection.cs
+++ b/osu.Game/Screens/Edit/Setup/MetadataSection.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.UserInterface;
-using osu.Game.Graphics.Sprites;
+using osu.Framework.Localisation;
 using osu.Game.Graphics.UserInterfaceV2;
 
 namespace osu.Game.Screens.Edit.Setup
@@ -17,15 +17,13 @@ namespace osu.Game.Screens.Edit.Setup
         private LabelledTextBox creatorTextBox;
         private LabelledTextBox difficultyTextBox;
 
+        public override LocalisableString Title => "Metadata";
+
         [BackgroundDependencyLoader]
         private void load()
         {
             Children = new Drawable[]
             {
-                new OsuSpriteText
-                {
-                    Text = "Beatmap metadata"
-                },
                 artistTextBox = new LabelledTextBox
                 {
                     Label = "Artist",
diff --git a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
index e00eaf9aa2..be8efa18f4 100644
--- a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
+++ b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
@@ -11,12 +11,12 @@ 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.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Overlays;
 
@@ -27,6 +27,8 @@ namespace osu.Game.Screens.Edit.Setup
         private LabelledTextBox audioTrackTextBox;
         private Container backgroundSpriteContainer;
 
+        public override LocalisableString Title => "Resources";
+
         public IEnumerable<string> HandledExtensions => ImageExtensions.Concat(AudioExtensions);
 
         public static string[] ImageExtensions { get; } = { ".jpg", ".jpeg", ".png" };
@@ -66,10 +68,6 @@ namespace osu.Game.Screens.Edit.Setup
                     Masking = true,
                     CornerRadius = 10,
                 },
-                new OsuSpriteText
-                {
-                    Text = "Resources"
-                },
                 audioTrackTextBox = new FileChooserLabelledTextBox
                 {
                     Label = "Audio Track",
diff --git a/osu.Game/Screens/Edit/Setup/SetupSection.cs b/osu.Game/Screens/Edit/Setup/SetupSection.cs
index 8347ca1157..fb697eacc6 100644
--- a/osu.Game/Screens/Edit/Setup/SetupSection.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupSection.cs
@@ -4,12 +4,14 @@
 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.Sprites;
 using osuTK;
 
 namespace osu.Game.Screens.Edit.Setup
 {
-    internal class SetupSection : Container
+    internal abstract class SetupSection : Container
     {
         private readonly FillFlowContainer flow;
 
@@ -21,23 +23,40 @@ namespace osu.Game.Screens.Edit.Setup
 
         protected override Container<Drawable> Content => flow;
 
-        public SetupSection()
+        public abstract LocalisableString Title { get; }
+
+        protected SetupSection()
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
 
-            Padding = new MarginPadding(10);
+            Padding = new MarginPadding
+            {
+                Vertical = 10,
+                Horizontal = 90
+            };
 
-            InternalChild = flow = new FillFlowContainer
+            InternalChild = new FillFlowContainer
             {
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y,
                 Spacing = new Vector2(20),
-                Padding = new MarginPadding
-                {
-                    Horizontal = 90
-                },
                 Direction = FillDirection.Vertical,
+                Children = new Drawable[]
+                {
+                    new OsuSpriteText
+                    {
+                        Font = OsuFont.GetFont(weight: FontWeight.Bold),
+                        Text = Title
+                    },
+                    flow = new FillFlowContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Spacing = new Vector2(20),
+                        Direction = FillDirection.Vertical,
+                    }
+                }
             };
         }
     }

From 3572178bdcfbe917ca1ea15dc9b238a340d0734d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 3 Apr 2021 20:02:26 +0200
Subject: [PATCH 2157/3722] Add tab control to setup screen header

---
 osu.Game/Screens/Edit/Setup/SetupScreen.cs    |  22 +---
 .../Screens/Edit/Setup/SetupScreenHeader.cs   | 106 ++++++++++++++++++
 osu.Game/Screens/Edit/Setup/SetupSection.cs   |   2 +-
 3 files changed, 113 insertions(+), 17 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs

diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index de09347d0a..dccc69039c 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -13,12 +13,17 @@ namespace osu.Game.Screens.Edit.Setup
 {
     public class SetupScreen : EditorScreen
     {
+        public const int HORIZONTAL_PADDING = 100;
+
         [Resolved]
         private OsuColour colours { get; set; }
 
         [Cached]
         protected readonly OverlayColourProvider ColourProvider;
 
+        [Cached]
+        private SectionsContainer<SetupSection> sections = new SectionsContainer<SetupSection>();
+
         public SetupScreen()
             : base(EditorScreenMode.SongSetup)
         {
@@ -44,7 +49,7 @@ namespace osu.Game.Screens.Edit.Setup
                             Colour = ColourProvider.Dark4,
                             RelativeSizeAxes = Axes.Both,
                         },
-                        new SectionsContainer<SetupSection>
+                        sections = new SectionsContainer<SetupSection>
                         {
                             FixedHeader = new SetupScreenHeader(),
                             RelativeSizeAxes = Axes.Both,
@@ -60,19 +65,4 @@ namespace osu.Game.Screens.Edit.Setup
             };
         }
     }
-
-    internal class SetupScreenHeader : OverlayHeader
-    {
-        protected override OverlayTitle CreateTitle() => new SetupScreenTitle();
-
-        private class SetupScreenTitle : OverlayTitle
-        {
-            public SetupScreenTitle()
-            {
-                Title = "beatmap setup";
-                Description = "change general settings of your beatmap";
-                IconTexture = "Icons/Hexacons/social";
-            }
-        }
-    }
 }
diff --git a/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs b/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
new file mode 100644
index 0000000000..1be833cb9d
--- /dev/null
+++ b/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
@@ -0,0 +1,106 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Graphics.Containers;
+using osu.Game.Overlays;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Edit.Setup
+{
+    internal class SetupScreenHeader : OverlayHeader
+    {
+        [Resolved]
+        private SectionsContainer<SetupSection> sections { get; set; }
+
+        private SetupScreenTabControl tabControl;
+
+        protected override OverlayTitle CreateTitle() => new SetupScreenTitle();
+
+        protected override Drawable CreateContent() => new Container
+        {
+            RelativeSizeAxes = Axes.X,
+            AutoSizeAxes = Axes.Y,
+            Children = new Drawable[]
+            {
+                tabControl = new SetupScreenTabControl
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Height = 30
+                }
+            }
+        };
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            tabControl.AccentColour = colourProvider.Highlight1;
+            tabControl.BackgroundColour = colourProvider.Dark5;
+
+            foreach (var section in sections)
+                tabControl.AddItem(section);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            sections.SelectedSection.BindValueChanged(section => tabControl.Current.Value = section.NewValue);
+            tabControl.Current.BindValueChanged(section =>
+            {
+                if (section.NewValue != sections.SelectedSection.Value)
+                    sections.ScrollTo(section.NewValue);
+            });
+        }
+
+        private class SetupScreenTitle : OverlayTitle
+        {
+            public SetupScreenTitle()
+            {
+                Title = "beatmap setup";
+                Description = "change general settings of your beatmap";
+                IconTexture = "Icons/Hexacons/social";
+            }
+        }
+
+        internal class SetupScreenTabControl : OverlayTabControl<SetupSection>
+        {
+            private readonly Box background;
+
+            public Color4 BackgroundColour
+            {
+                get => background.Colour;
+                set => background.Colour = value;
+            }
+
+            public SetupScreenTabControl()
+            {
+                TabContainer.Margin = new MarginPadding { Horizontal = SetupScreen.HORIZONTAL_PADDING };
+
+                AddInternal(background = new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Depth = 1
+                });
+            }
+
+            protected override TabItem<SetupSection> CreateTabItem(SetupSection value) => new SetupScreenTabItem(value)
+            {
+                AccentColour = AccentColour
+            };
+
+            private class SetupScreenTabItem : OverlayTabItem
+            {
+                public SetupScreenTabItem(SetupSection value)
+                    : base(value)
+                {
+                    Text.Text = value.Title;
+                }
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Setup/SetupSection.cs b/osu.Game/Screens/Edit/Setup/SetupSection.cs
index fb697eacc6..de62c3a468 100644
--- a/osu.Game/Screens/Edit/Setup/SetupSection.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupSection.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Screens.Edit.Setup
             Padding = new MarginPadding
             {
                 Vertical = 10,
-                Horizontal = 90
+                Horizontal = SetupScreen.HORIZONTAL_PADDING
             };
 
             InternalChild = new FillFlowContainer

From 61f9eb51c474e2573bc49f55d6a435f75d598792 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 3 Apr 2021 18:20:40 +0200
Subject: [PATCH 2158/3722] Split background chooser to own component

---
 .../Screens/Edit/Setup/BackgroundChooser.cs   | 145 ++++++++++++++++++
 .../Screens/Edit/Setup/ResourcesSection.cs    |  86 +----------
 2 files changed, 148 insertions(+), 83 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/Setup/BackgroundChooser.cs

diff --git a/osu.Game/Screens/Edit/Setup/BackgroundChooser.cs b/osu.Game/Screens/Edit/Setup/BackgroundChooser.cs
new file mode 100644
index 0000000000..7bdd962ec8
--- /dev/null
+++ b/osu.Game/Screens/Edit/Setup/BackgroundChooser.cs
@@ -0,0 +1,145 @@
+// Copyright (c) ppy 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 System.Threading.Tasks;
+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.Database;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+
+namespace osu.Game.Screens.Edit.Setup
+{
+    public class BackgroundChooser : CompositeDrawable, ICanAcceptFiles
+    {
+        public IEnumerable<string> HandledExtensions => ImageExtensions;
+
+        public static string[] ImageExtensions { get; } = { ".jpg", ".jpeg", ".png" };
+
+        [Resolved]
+        private OsuGameBase game { get; set; }
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        [Resolved]
+        private BeatmapManager beatmaps { get; set; }
+
+        [Resolved]
+        private IBindable<WorkingBeatmap> working { get; set; }
+
+        private readonly Container content;
+
+        public BackgroundChooser()
+        {
+            InternalChild = content = new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Masking = true,
+                CornerRadius = 10,
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            updateBackgroundSprite();
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            game.RegisterImportHandler(this);
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            game?.UnregisterImportHandler(this);
+        }
+
+        Task ICanAcceptFiles.Import(params string[] paths)
+        {
+            Schedule(() =>
+            {
+                var firstFile = new FileInfo(paths.First());
+
+                ChangeBackgroundImage(firstFile.FullName);
+            });
+            return Task.CompletedTask;
+        }
+
+        Task ICanAcceptFiles.Import(params ImportTask[] tasks) => throw new NotImplementedException();
+
+        public bool ChangeBackgroundImage(string path)
+        {
+            var info = new FileInfo(path);
+
+            if (!info.Exists)
+                return false;
+
+            var set = working.Value.BeatmapSetInfo;
+
+            // remove the previous background for now.
+            // in the future we probably want to check if this is being used elsewhere (other difficulties?)
+            var oldFile = set.Files.FirstOrDefault(f => f.Filename == working.Value.Metadata.BackgroundFile);
+
+            using (var stream = info.OpenRead())
+            {
+                if (oldFile != null)
+                    beatmaps.ReplaceFile(set, oldFile, stream, info.Name);
+                else
+                    beatmaps.AddFile(set, stream, info.Name);
+            }
+
+            working.Value.Metadata.BackgroundFile = info.Name;
+            updateBackgroundSprite();
+
+            return true;
+        }
+
+        private void updateBackgroundSprite()
+        {
+            LoadComponentAsync(new BeatmapBackgroundSprite(working.Value)
+            {
+                RelativeSizeAxes = Axes.Both,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                FillMode = FillMode.Fill,
+            }, background =>
+            {
+                if (background.Texture != null)
+                    content.Child = background;
+                else
+                {
+                    content.Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            Colour = colours.GreySeafoamDarker,
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        new OsuTextFlowContainer(t => t.Font = OsuFont.Default.With(size: 24))
+                        {
+                            Text = "Drag image here to set beatmap background!",
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            AutoSizeAxes = Axes.X,
+                        }
+                    };
+                }
+
+                background.FadeInFromZero(500);
+            });
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
index be8efa18f4..523ded7aec 100644
--- a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
+++ b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
@@ -10,13 +10,9 @@ 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.Localisation;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.Drawables;
 using osu.Game.Database;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Overlays;
 
@@ -25,13 +21,10 @@ namespace osu.Game.Screens.Edit.Setup
     internal class ResourcesSection : SetupSection, ICanAcceptFiles
     {
         private LabelledTextBox audioTrackTextBox;
-        private Container backgroundSpriteContainer;
 
         public override LocalisableString Title => "Resources";
 
-        public IEnumerable<string> HandledExtensions => ImageExtensions.Concat(AudioExtensions);
-
-        public static string[] ImageExtensions { get; } = { ".jpg", ".jpeg", ".png" };
+        public IEnumerable<string> HandledExtensions => AudioExtensions;
 
         public static string[] AudioExtensions { get; } = { ".mp3", ".ogg" };
 
@@ -61,12 +54,10 @@ namespace osu.Game.Screens.Edit.Setup
 
             Children = new Drawable[]
             {
-                backgroundSpriteContainer = new Container
+                new BackgroundChooser
                 {
                     RelativeSizeAxes = Axes.X,
                     Height = 250,
-                    Masking = true,
-                    CornerRadius = 10,
                 },
                 audioTrackTextBox = new FileChooserLabelledTextBox
                 {
@@ -79,8 +70,6 @@ namespace osu.Game.Screens.Edit.Setup
                 audioTrackFileChooserContainer,
             };
 
-            updateBackgroundSprite();
-
             audioTrackTextBox.Current.BindValueChanged(audioTrackChanged);
         }
 
@@ -90,14 +79,7 @@ namespace osu.Game.Screens.Edit.Setup
             {
                 var firstFile = new FileInfo(paths.First());
 
-                if (ImageExtensions.Contains(firstFile.Extension))
-                {
-                    ChangeBackgroundImage(firstFile.FullName);
-                }
-                else if (AudioExtensions.Contains(firstFile.Extension))
-                {
-                    audioTrackTextBox.Text = firstFile.FullName;
-                }
+                audioTrackTextBox.Text = firstFile.FullName;
             });
             return Task.CompletedTask;
         }
@@ -110,33 +92,6 @@ namespace osu.Game.Screens.Edit.Setup
             game.RegisterImportHandler(this);
         }
 
-        public bool ChangeBackgroundImage(string path)
-        {
-            var info = new FileInfo(path);
-
-            if (!info.Exists)
-                return false;
-
-            var set = working.Value.BeatmapSetInfo;
-
-            // remove the previous background for now.
-            // in the future we probably want to check if this is being used elsewhere (other difficulties?)
-            var oldFile = set.Files.FirstOrDefault(f => f.Filename == working.Value.Metadata.BackgroundFile);
-
-            using (var stream = info.OpenRead())
-            {
-                if (oldFile != null)
-                    beatmaps.ReplaceFile(set, oldFile, stream, info.Name);
-                else
-                    beatmaps.AddFile(set, stream, info.Name);
-            }
-
-            working.Value.Metadata.BackgroundFile = info.Name;
-            updateBackgroundSprite();
-
-            return true;
-        }
-
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
@@ -177,40 +132,5 @@ namespace osu.Game.Screens.Edit.Setup
             if (!ChangeAudioTrack(filePath.NewValue))
                 audioTrackTextBox.Current.Value = filePath.OldValue;
         }
-
-        private void updateBackgroundSprite()
-        {
-            LoadComponentAsync(new BeatmapBackgroundSprite(working.Value)
-            {
-                RelativeSizeAxes = Axes.Both,
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                FillMode = FillMode.Fill,
-            }, background =>
-            {
-                if (background.Texture != null)
-                    backgroundSpriteContainer.Child = background;
-                else
-                {
-                    backgroundSpriteContainer.Children = new Drawable[]
-                    {
-                        new Box
-                        {
-                            Colour = Colours.GreySeafoamDarker,
-                            RelativeSizeAxes = Axes.Both,
-                        },
-                        new OsuTextFlowContainer(t => t.Font = OsuFont.Default.With(size: 24))
-                        {
-                            Text = "Drag image here to set beatmap background!",
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            AutoSizeAxes = Axes.X,
-                        }
-                    };
-                }
-
-                background.FadeInFromZero(500);
-            });
-        }
     }
 }

From 294d9114260af37de1aced94d4120096144188c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 3 Apr 2021 20:21:36 +0200
Subject: [PATCH 2159/3722] Move background chooser to header

---
 .../Screens/Edit/Setup/BackgroundChooser.cs   |  5 ++---
 .../Screens/Edit/Setup/ResourcesSection.cs    |  5 -----
 .../Screens/Edit/Setup/SetupScreenHeader.cs   | 20 +++++++++++++++----
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Edit/Setup/BackgroundChooser.cs b/osu.Game/Screens/Edit/Setup/BackgroundChooser.cs
index 7bdd962ec8..9137eca334 100644
--- a/osu.Game/Screens/Edit/Setup/BackgroundChooser.cs
+++ b/osu.Game/Screens/Edit/Setup/BackgroundChooser.cs
@@ -44,8 +44,7 @@ namespace osu.Game.Screens.Edit.Setup
             InternalChild = content = new Container
             {
                 RelativeSizeAxes = Axes.Both,
-                Masking = true,
-                CornerRadius = 10,
+                Masking = true
             };
         }
 
@@ -133,7 +132,7 @@ namespace osu.Game.Screens.Edit.Setup
                             Text = "Drag image here to set beatmap background!",
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
-                            AutoSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Both
                         }
                     };
                 }
diff --git a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
index 523ded7aec..3058f99fce 100644
--- a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
+++ b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
@@ -54,11 +54,6 @@ namespace osu.Game.Screens.Edit.Setup
 
             Children = new Drawable[]
             {
-                new BackgroundChooser
-                {
-                    RelativeSizeAxes = Axes.X,
-                    Height = 250,
-                },
                 audioTrackTextBox = new FileChooserLabelledTextBox
                 {
                     Label = "Audio Track",
diff --git a/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs b/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
index 1be833cb9d..b0533e6f00 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
@@ -25,12 +25,24 @@ namespace osu.Game.Screens.Edit.Setup
         {
             RelativeSizeAxes = Axes.X,
             AutoSizeAxes = Axes.Y,
-            Children = new Drawable[]
+            // reverse flow is used to ensure that the tab control's expandable bars extend over the background chooser.
+            Child = new ReverseChildIDFillFlowContainer<Drawable>
             {
-                tabControl = new SetupScreenTabControl
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Children = new Drawable[]
                 {
-                    RelativeSizeAxes = Axes.X,
-                    Height = 30
+                    tabControl = new SetupScreenTabControl
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Height = 30
+                    },
+                    new BackgroundChooser
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Height = 120
+                    }
                 }
             }
         };

From eb26f6f4273c638fac4be82a7a8535bcdf42a820 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 3 Apr 2021 21:45:11 +0200
Subject: [PATCH 2160/3722] Add failing test case

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

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
index c1159dc000..522567584d 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
@@ -1,9 +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.Linq;
+using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Testing;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Screens.Gameplay;
+using osu.Game.Tournament.Screens.Gameplay.Components;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
@@ -18,5 +22,24 @@ namespace osu.Game.Tournament.Tests.Screens
             Add(new GameplayScreen());
             Add(chat);
         }
+
+        [Test]
+        public void TestWarmup()
+        {
+            checkScoreVisibility(false);
+
+            toggleWarmup();
+            checkScoreVisibility(true);
+
+            toggleWarmup();
+            checkScoreVisibility(false);
+        }
+
+        private void checkScoreVisibility(bool visible)
+            => AddUntilStep($"scores {(visible ? "shown" : "hidden")}",
+                () => this.ChildrenOfType<TeamScore>().All(score => score.Alpha == (visible ? 1 : 0)));
+
+        private void toggleWarmup()
+            => AddStep("toggle warmup", () => this.ChildrenOfType<TourneyButton>().First().Click());
     }
 }

From 0d9793797ff07ceb9d9046eaa184e9863010967e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 3 Apr 2021 21:46:34 +0200
Subject: [PATCH 2161/3722] Fix scores being initially visible incorrectly in
 gameplay screen

---
 .../Screens/Gameplay/Components/MatchHeader.cs                | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
index d790f4b754..8048425ce1 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
@@ -95,7 +95,11 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                     Origin = Anchor.TopRight,
                 },
             };
+        }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
             updateDisplay();
         }
 

From 0febefd8eb187dc1f9e79d210ffd89dd17bac569 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 3 Apr 2021 22:24:55 +0200
Subject: [PATCH 2162/3722] Fix scores fading out on entering gameplay screen

---
 .../Gameplay/Components/TeamDisplay.cs        | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
index 4ba86dcefc..59132bfd2d 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
@@ -14,9 +14,21 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
     {
         private readonly TeamScore score;
 
+        private bool showScore;
+
         public bool ShowScore
         {
-            set => score.FadeTo(value ? 1 : 0, 200);
+            get => showScore;
+            set
+            {
+                if (showScore == value)
+                    return;
+
+                showScore = value;
+
+                if (IsLoaded)
+                    score.FadeTo(value ? 1 : 0, 200);
+            }
         }
 
         public TeamDisplay(TournamentTeam team, TeamColour colour, Bindable<int?> currentTeamScore, int pointsToWin)
@@ -92,5 +104,11 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                 }
             };
         }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            score.Alpha = ShowScore ? 1 : 0;
+        }
     }
 }

From d4724f4494e8184c4ad3d9ae6e262fe6f8da69b1 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sun, 4 Apr 2021 09:44:45 +0800
Subject: [PATCH 2163/3722] Fix crash

---
 osu.Game/Online/Leaderboards/LeaderboardScore.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index da1bbd18c7..795540b65d 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -391,7 +391,7 @@ namespace osu.Game.Online.Leaderboards
                 if (score.Mods.Length > 0 && modsContainer.Any(s => s.IsHovered) && songSelect != null)
                     items.Add(new OsuMenuItem("Use these mods", MenuItemType.Highlighted, () => songSelect.Mods.Value = score.Mods));
 
-                if (score.Files.Count > 0)
+                if (score.Files?.Count > 0)
                     items.Add(new OsuMenuItem("Export", MenuItemType.Standard, () => scoreManager.Export(score)));
 
                 if (score.ID != 0)

From 5df27ce3d4e1131bcb8567626582bb256ee9b096 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 4 Apr 2021 11:41:40 +0200
Subject: [PATCH 2164/3722] Split out score transform logic to method

---
 .../Screens/Gameplay/Components/TeamDisplay.cs        | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
index 59132bfd2d..33658115cc 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                 showScore = value;
 
                 if (IsLoaded)
-                    score.FadeTo(value ? 1 : 0, 200);
+                    updateDisplay();
             }
         }
 
@@ -108,7 +108,14 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            score.Alpha = ShowScore ? 1 : 0;
+
+            updateDisplay();
+            FinishTransforms(true);
+        }
+
+        private void updateDisplay()
+        {
+            score.FadeTo(ShowScore ? 1 : 0, 200);
         }
     }
 }

From 9394af32f5150ecbc911ee2191cf571a824033e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 4 Apr 2021 12:34:52 +0200
Subject: [PATCH 2165/3722] Move drag & drop support logic to chooser component

---
 .../Edit/Setup/FileChooserLabelledTextBox.cs  | 63 ++++++++++++++-----
 .../Screens/Edit/Setup/ResourcesSection.cs    | 40 +-----------
 2 files changed, 51 insertions(+), 52 deletions(-)

diff --git a/osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs b/osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs
index 70876bf26c..a33a70af65 100644
--- a/osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs
+++ b/osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs
@@ -2,12 +2,16 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
+using osu.Game.Database;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
@@ -17,27 +21,27 @@ namespace osu.Game.Screens.Edit.Setup
     /// <summary>
     /// A labelled textbox which reveals an inline file chooser when clicked.
     /// </summary>
-    internal class FileChooserLabelledTextBox : LabelledTextBox
+    internal class FileChooserLabelledTextBox : LabelledTextBox, ICanAcceptFiles
     {
+        private readonly string[] handledExtensions;
+        public IEnumerable<string> HandledExtensions => handledExtensions;
+
+        /// <summary>
+        /// The target container to display the file chooser in.
+        /// </summary>
         public Container Target;
 
-        private readonly IBindable<FileInfo> currentFile = new Bindable<FileInfo>();
+        private readonly Bindable<FileInfo> currentFile = new Bindable<FileInfo>();
+
+        [Resolved]
+        private OsuGameBase game { get; set; }
 
         [Resolved]
         private SectionsContainer<SetupSection> sectionsContainer { get; set; }
 
-        public FileChooserLabelledTextBox()
+        public FileChooserLabelledTextBox(params string[] handledExtensions)
         {
-            currentFile.BindValueChanged(onFileSelected);
-        }
-
-        private void onFileSelected(ValueChangedEvent<FileInfo> file)
-        {
-            if (file.NewValue == null)
-                return;
-
-            Target.Clear();
-            Current.Value = file.NewValue.FullName;
+            this.handledExtensions = handledExtensions;
         }
 
         protected override OsuTextBox CreateTextBox() =>
@@ -54,7 +58,7 @@ namespace osu.Game.Screens.Edit.Setup
         {
             FileSelector fileSelector;
 
-            Target.Child = fileSelector = new FileSelector(currentFile.Value?.DirectoryName, ResourcesSection.AudioExtensions)
+            Target.Child = fileSelector = new FileSelector(currentFile.Value?.DirectoryName, handledExtensions)
             {
                 RelativeSizeAxes = Axes.X,
                 Height = 400,
@@ -64,6 +68,37 @@ namespace osu.Game.Screens.Edit.Setup
             sectionsContainer.ScrollTo(fileSelector);
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            game.RegisterImportHandler(this);
+            currentFile.BindValueChanged(onFileSelected);
+        }
+
+        private void onFileSelected(ValueChangedEvent<FileInfo> file)
+        {
+            if (file.NewValue == null)
+                return;
+
+            Target.Clear();
+            Current.Value = file.NewValue.FullName;
+        }
+
+        Task ICanAcceptFiles.Import(params string[] paths)
+        {
+            Schedule(() => currentFile.Value = new FileInfo(paths.First()));
+            return Task.CompletedTask;
+        }
+
+        Task ICanAcceptFiles.Import(params ImportTask[] tasks) => throw new NotImplementedException();
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            game.UnregisterImportHandler(this);
+        }
+
         internal class FileChooserOsuTextBox : OsuTextBox
         {
             public Action OnFocused;
diff --git a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
index 3058f99fce..b4c7c865e2 100644
--- a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
+++ b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
@@ -1,36 +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.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
-using osu.Game.Database;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Overlays;
 
 namespace osu.Game.Screens.Edit.Setup
 {
-    internal class ResourcesSection : SetupSection, ICanAcceptFiles
+    internal class ResourcesSection : SetupSection
     {
         private LabelledTextBox audioTrackTextBox;
 
         public override LocalisableString Title => "Resources";
 
-        public IEnumerable<string> HandledExtensions => AudioExtensions;
-
-        public static string[] AudioExtensions { get; } = { ".mp3", ".ogg" };
-
-        [Resolved]
-        private OsuGameBase game { get; set; }
-
         [Resolved]
         private MusicController music { get; set; }
 
@@ -54,7 +43,7 @@ namespace osu.Game.Screens.Edit.Setup
 
             Children = new Drawable[]
             {
-                audioTrackTextBox = new FileChooserLabelledTextBox
+                audioTrackTextBox = new FileChooserLabelledTextBox(".mp3", ".ogg")
                 {
                     Label = "Audio Track",
                     PlaceholderText = "Click to select a track",
@@ -68,31 +57,6 @@ namespace osu.Game.Screens.Edit.Setup
             audioTrackTextBox.Current.BindValueChanged(audioTrackChanged);
         }
 
-        Task ICanAcceptFiles.Import(params string[] paths)
-        {
-            Schedule(() =>
-            {
-                var firstFile = new FileInfo(paths.First());
-
-                audioTrackTextBox.Text = firstFile.FullName;
-            });
-            return Task.CompletedTask;
-        }
-
-        Task ICanAcceptFiles.Import(params ImportTask[] tasks) => throw new NotImplementedException();
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            game.RegisterImportHandler(this);
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-            game?.UnregisterImportHandler(this);
-        }
-
         public bool ChangeAudioTrack(string path)
         {
             var info = new FileInfo(path);

From f2d4ca7676b5f3524a241d07b3c6c661dc553b91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 4 Apr 2021 12:50:50 +0200
Subject: [PATCH 2166/3722] Add background chooser text box

---
 .../Screens/Edit/Setup/BackgroundChooser.cs   | 144 ------------------
 .../Screens/Edit/Setup/ResourcesSection.cs    |  61 +++++++-
 osu.Game/Screens/Edit/Setup/SetupScreen.cs    |   5 +-
 .../Screens/Edit/Setup/SetupScreenHeader.cs   |   4 +-
 .../Edit/Setup/SetupScreenHeaderBackground.cs |  76 +++++++++
 5 files changed, 139 insertions(+), 151 deletions(-)
 delete mode 100644 osu.Game/Screens/Edit/Setup/BackgroundChooser.cs
 create mode 100644 osu.Game/Screens/Edit/Setup/SetupScreenHeaderBackground.cs

diff --git a/osu.Game/Screens/Edit/Setup/BackgroundChooser.cs b/osu.Game/Screens/Edit/Setup/BackgroundChooser.cs
deleted file mode 100644
index 9137eca334..0000000000
--- a/osu.Game/Screens/Edit/Setup/BackgroundChooser.cs
+++ /dev/null
@@ -1,144 +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 System.Threading.Tasks;
-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.Database;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
-
-namespace osu.Game.Screens.Edit.Setup
-{
-    public class BackgroundChooser : CompositeDrawable, ICanAcceptFiles
-    {
-        public IEnumerable<string> HandledExtensions => ImageExtensions;
-
-        public static string[] ImageExtensions { get; } = { ".jpg", ".jpeg", ".png" };
-
-        [Resolved]
-        private OsuGameBase game { get; set; }
-
-        [Resolved]
-        private OsuColour colours { get; set; }
-
-        [Resolved]
-        private BeatmapManager beatmaps { get; set; }
-
-        [Resolved]
-        private IBindable<WorkingBeatmap> working { get; set; }
-
-        private readonly Container content;
-
-        public BackgroundChooser()
-        {
-            InternalChild = content = new Container
-            {
-                RelativeSizeAxes = Axes.Both,
-                Masking = true
-            };
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            updateBackgroundSprite();
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            game.RegisterImportHandler(this);
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-            game?.UnregisterImportHandler(this);
-        }
-
-        Task ICanAcceptFiles.Import(params string[] paths)
-        {
-            Schedule(() =>
-            {
-                var firstFile = new FileInfo(paths.First());
-
-                ChangeBackgroundImage(firstFile.FullName);
-            });
-            return Task.CompletedTask;
-        }
-
-        Task ICanAcceptFiles.Import(params ImportTask[] tasks) => throw new NotImplementedException();
-
-        public bool ChangeBackgroundImage(string path)
-        {
-            var info = new FileInfo(path);
-
-            if (!info.Exists)
-                return false;
-
-            var set = working.Value.BeatmapSetInfo;
-
-            // remove the previous background for now.
-            // in the future we probably want to check if this is being used elsewhere (other difficulties?)
-            var oldFile = set.Files.FirstOrDefault(f => f.Filename == working.Value.Metadata.BackgroundFile);
-
-            using (var stream = info.OpenRead())
-            {
-                if (oldFile != null)
-                    beatmaps.ReplaceFile(set, oldFile, stream, info.Name);
-                else
-                    beatmaps.AddFile(set, stream, info.Name);
-            }
-
-            working.Value.Metadata.BackgroundFile = info.Name;
-            updateBackgroundSprite();
-
-            return true;
-        }
-
-        private void updateBackgroundSprite()
-        {
-            LoadComponentAsync(new BeatmapBackgroundSprite(working.Value)
-            {
-                RelativeSizeAxes = Axes.Both,
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                FillMode = FillMode.Fill,
-            }, background =>
-            {
-                if (background.Texture != null)
-                    content.Child = background;
-                else
-                {
-                    content.Children = new Drawable[]
-                    {
-                        new Box
-                        {
-                            Colour = colours.GreySeafoamDarker,
-                            RelativeSizeAxes = Axes.Both,
-                        },
-                        new OsuTextFlowContainer(t => t.Font = OsuFont.Default.With(size: 24))
-                        {
-                            Text = "Drag image here to set beatmap background!",
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            AutoSizeAxes = Axes.Both
-                        }
-                    };
-                }
-
-                background.FadeInFromZero(500);
-            });
-        }
-    }
-}
diff --git a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
index b4c7c865e2..dda6d79919 100644
--- a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
+++ b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
@@ -17,6 +17,7 @@ namespace osu.Game.Screens.Edit.Setup
     internal class ResourcesSection : SetupSection
     {
         private LabelledTextBox audioTrackTextBox;
+        private LabelledTextBox backgroundTextBox;
 
         public override LocalisableString Title => "Resources";
 
@@ -32,17 +33,26 @@ namespace osu.Game.Screens.Edit.Setup
         [Resolved(canBeNull: true)]
         private Editor editor { get; set; }
 
+        [Resolved]
+        private SetupScreenHeader header { get; set; }
+
         [BackgroundDependencyLoader]
         private void load()
         {
-            Container audioTrackFileChooserContainer = new Container
-            {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
-            };
+            Container audioTrackFileChooserContainer = createFileChooserContainer();
+            Container backgroundFileChooserContainer = createFileChooserContainer();
 
             Children = new Drawable[]
             {
+                backgroundTextBox = new FileChooserLabelledTextBox(".jpg", ".jpeg", ".png")
+                {
+                    Label = "Background",
+                    PlaceholderText = "Click to select a background image",
+                    Current = { Value = working.Value.Metadata.BackgroundFile },
+                    Target = backgroundFileChooserContainer,
+                    TabbableContentContainer = this
+                },
+                backgroundFileChooserContainer,
                 audioTrackTextBox = new FileChooserLabelledTextBox(".mp3", ".ogg")
                 {
                     Label = "Audio Track",
@@ -54,9 +64,17 @@ namespace osu.Game.Screens.Edit.Setup
                 audioTrackFileChooserContainer,
             };
 
+            backgroundTextBox.Current.BindValueChanged(backgroundChanged);
             audioTrackTextBox.Current.BindValueChanged(audioTrackChanged);
         }
 
+        private static Container createFileChooserContainer() =>
+            new Container
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+            };
+
         public bool ChangeAudioTrack(string path)
         {
             var info = new FileInfo(path);
@@ -86,6 +104,39 @@ namespace osu.Game.Screens.Edit.Setup
             return true;
         }
 
+        public bool ChangeBackgroundImage(string path)
+        {
+            var info = new FileInfo(path);
+
+            if (!info.Exists)
+                return false;
+
+            var set = working.Value.BeatmapSetInfo;
+
+            // remove the previous background for now.
+            // in the future we probably want to check if this is being used elsewhere (other difficulties?)
+            var oldFile = set.Files.FirstOrDefault(f => f.Filename == working.Value.Metadata.BackgroundFile);
+
+            using (var stream = info.OpenRead())
+            {
+                if (oldFile != null)
+                    beatmaps.ReplaceFile(set, oldFile, stream, info.Name);
+                else
+                    beatmaps.AddFile(set, stream, info.Name);
+            }
+
+            working.Value.Metadata.BackgroundFile = info.Name;
+            header.Background.UpdateBackground();
+
+            return true;
+        }
+
+        private void backgroundChanged(ValueChangedEvent<string> filePath)
+        {
+            if (!ChangeBackgroundImage(filePath.NewValue))
+                backgroundTextBox.Current.Value = filePath.OldValue;
+        }
+
         private void audioTrackChanged(ValueChangedEvent<string> filePath)
         {
             if (!ChangeAudioTrack(filePath.NewValue))
diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index dccc69039c..70671b487c 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -24,6 +24,9 @@ namespace osu.Game.Screens.Edit.Setup
         [Cached]
         private SectionsContainer<SetupSection> sections = new SectionsContainer<SetupSection>();
 
+        [Cached]
+        private SetupScreenHeader header = new SetupScreenHeader();
+
         public SetupScreen()
             : base(EditorScreenMode.SongSetup)
         {
@@ -51,7 +54,7 @@ namespace osu.Game.Screens.Edit.Setup
                         },
                         sections = new SectionsContainer<SetupSection>
                         {
-                            FixedHeader = new SetupScreenHeader(),
+                            FixedHeader = header,
                             RelativeSizeAxes = Axes.Both,
                             Children = new SetupSection[]
                             {
diff --git a/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs b/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
index b0533e6f00..06aad69afa 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
@@ -14,6 +14,8 @@ namespace osu.Game.Screens.Edit.Setup
 {
     internal class SetupScreenHeader : OverlayHeader
     {
+        public SetupScreenHeaderBackground Background { get; private set; }
+
         [Resolved]
         private SectionsContainer<SetupSection> sections { get; set; }
 
@@ -38,7 +40,7 @@ namespace osu.Game.Screens.Edit.Setup
                         RelativeSizeAxes = Axes.X,
                         Height = 30
                     },
-                    new BackgroundChooser
+                    Background = new SetupScreenHeaderBackground
                     {
                         RelativeSizeAxes = Axes.X,
                         Height = 120
diff --git a/osu.Game/Screens/Edit/Setup/SetupScreenHeaderBackground.cs b/osu.Game/Screens/Edit/Setup/SetupScreenHeaderBackground.cs
new file mode 100644
index 0000000000..7304323004
--- /dev/null
+++ b/osu.Game/Screens/Edit/Setup/SetupScreenHeaderBackground.cs
@@ -0,0 +1,76 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.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.Graphics;
+using osu.Game.Graphics.Containers;
+
+namespace osu.Game.Screens.Edit.Setup
+{
+    public class SetupScreenHeaderBackground : CompositeDrawable
+    {
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        [Resolved]
+        private IBindable<WorkingBeatmap> working { get; set; }
+
+        private readonly Container content;
+
+        public SetupScreenHeaderBackground()
+        {
+            InternalChild = content = new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Masking = true
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            UpdateBackground();
+        }
+
+        public void UpdateBackground()
+        {
+            LoadComponentAsync(new BeatmapBackgroundSprite(working.Value)
+            {
+                RelativeSizeAxes = Axes.Both,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                FillMode = FillMode.Fill,
+            }, background =>
+            {
+                if (background.Texture != null)
+                    content.Child = background;
+                else
+                {
+                    content.Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            Colour = colours.GreySeafoamDarker,
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        new OsuTextFlowContainer(t => t.Font = OsuFont.Default.With(size: 24))
+                        {
+                            Text = "Drag image here to set beatmap background!",
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            AutoSizeAxes = Axes.Both
+                        }
+                    };
+                }
+
+                background.FadeInFromZero(500);
+            });
+        }
+    }
+}

From a0f0ae7979727baa1eae01895e7e3606c526eb31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 4 Apr 2021 12:53:51 +0200
Subject: [PATCH 2167/3722] Adjust spacings in resources section

---
 .../Screens/Edit/Setup/ResourcesSection.cs    | 48 +++++++++++++------
 1 file changed, 33 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
index dda6d79919..74002b3b1c 100644
--- a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
+++ b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
@@ -44,24 +44,42 @@ namespace osu.Game.Screens.Edit.Setup
 
             Children = new Drawable[]
             {
-                backgroundTextBox = new FileChooserLabelledTextBox(".jpg", ".jpeg", ".png")
+                new FillFlowContainer
                 {
-                    Label = "Background",
-                    PlaceholderText = "Click to select a background image",
-                    Current = { Value = working.Value.Metadata.BackgroundFile },
-                    Target = backgroundFileChooserContainer,
-                    TabbableContentContainer = this
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Direction = FillDirection.Vertical,
+                    Children = new Drawable[]
+                    {
+                        backgroundTextBox = new FileChooserLabelledTextBox(".jpg", ".jpeg", ".png")
+                        {
+                            Label = "Background",
+                            PlaceholderText = "Click to select a background image",
+                            Current = { Value = working.Value.Metadata.BackgroundFile },
+                            Target = backgroundFileChooserContainer,
+                            TabbableContentContainer = this
+                        },
+                        backgroundFileChooserContainer,
+                    }
                 },
-                backgroundFileChooserContainer,
-                audioTrackTextBox = new FileChooserLabelledTextBox(".mp3", ".ogg")
+                new FillFlowContainer
                 {
-                    Label = "Audio Track",
-                    PlaceholderText = "Click to select a track",
-                    Current = { Value = working.Value.Metadata.AudioFile },
-                    Target = audioTrackFileChooserContainer,
-                    TabbableContentContainer = this
-                },
-                audioTrackFileChooserContainer,
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Direction = FillDirection.Vertical,
+                    Children = new Drawable[]
+                    {
+                        audioTrackTextBox = new FileChooserLabelledTextBox(".mp3", ".ogg")
+                        {
+                            Label = "Audio Track",
+                            PlaceholderText = "Click to select a track",
+                            Current = { Value = working.Value.Metadata.AudioFile },
+                            Target = audioTrackFileChooserContainer,
+                            TabbableContentContainer = this
+                        },
+                        audioTrackFileChooserContainer,
+                    }
+                }
             };
 
             backgroundTextBox.Current.BindValueChanged(backgroundChanged);

From 0a1417bc6731bdbddbeb6791b7dfcaf9d2d1c1d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 4 Apr 2021 13:10:12 +0200
Subject: [PATCH 2168/3722] Swap order of background/audio track changing
 methods

Mostly for quality of reviewing (restores previous order) and more
consistency overall.
---
 .../Screens/Edit/Setup/ResourcesSection.cs    | 54 +++++++++----------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
index 74002b3b1c..12270f2aa4 100644
--- a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
+++ b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
@@ -93,6 +93,33 @@ namespace osu.Game.Screens.Edit.Setup
                 AutoSizeAxes = Axes.Y,
             };
 
+        public bool ChangeBackgroundImage(string path)
+        {
+            var info = new FileInfo(path);
+
+            if (!info.Exists)
+                return false;
+
+            var set = working.Value.BeatmapSetInfo;
+
+            // remove the previous background for now.
+            // in the future we probably want to check if this is being used elsewhere (other difficulties?)
+            var oldFile = set.Files.FirstOrDefault(f => f.Filename == working.Value.Metadata.BackgroundFile);
+
+            using (var stream = info.OpenRead())
+            {
+                if (oldFile != null)
+                    beatmaps.ReplaceFile(set, oldFile, stream, info.Name);
+                else
+                    beatmaps.AddFile(set, stream, info.Name);
+            }
+
+            working.Value.Metadata.BackgroundFile = info.Name;
+            header.Background.UpdateBackground();
+
+            return true;
+        }
+
         public bool ChangeAudioTrack(string path)
         {
             var info = new FileInfo(path);
@@ -122,33 +149,6 @@ namespace osu.Game.Screens.Edit.Setup
             return true;
         }
 
-        public bool ChangeBackgroundImage(string path)
-        {
-            var info = new FileInfo(path);
-
-            if (!info.Exists)
-                return false;
-
-            var set = working.Value.BeatmapSetInfo;
-
-            // remove the previous background for now.
-            // in the future we probably want to check if this is being used elsewhere (other difficulties?)
-            var oldFile = set.Files.FirstOrDefault(f => f.Filename == working.Value.Metadata.BackgroundFile);
-
-            using (var stream = info.OpenRead())
-            {
-                if (oldFile != null)
-                    beatmaps.ReplaceFile(set, oldFile, stream, info.Name);
-                else
-                    beatmaps.AddFile(set, stream, info.Name);
-            }
-
-            working.Value.Metadata.BackgroundFile = info.Name;
-            header.Background.UpdateBackground();
-
-            return true;
-        }
-
         private void backgroundChanged(ValueChangedEvent<string> filePath)
         {
             if (!ChangeBackgroundImage(filePath.NewValue))

From 5f1f8ec0ef9d666fafa109196644691be877e713 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sun, 4 Apr 2021 14:10:07 +0200
Subject: [PATCH 2169/3722] Fix IPC Source getting read from the incorrect
 location

---
 osu.Game.Tournament/Models/StableInfo.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/Models/StableInfo.cs b/osu.Game.Tournament/Models/StableInfo.cs
index d390f88d59..2dc47db26d 100644
--- a/osu.Game.Tournament/Models/StableInfo.cs
+++ b/osu.Game.Tournament/Models/StableInfo.cs
@@ -34,10 +34,10 @@ namespace osu.Game.Tournament.Models
             TournamentStorage tStorage = (TournamentStorage)storage;
             this.storage = tStorage.AllTournaments;
 
-            if (!storage.Exists(config_path))
+            if (!this.storage.Exists(config_path))
                 return;
 
-            using (Stream stream = storage.GetStream(config_path, FileAccess.Read, FileMode.Open))
+            using (Stream stream = this.storage.GetStream(config_path, FileAccess.Read, FileMode.Open))
             using (var sr = new StreamReader(stream))
             {
                 JsonConvert.PopulateObject(sr.ReadToEnd(), this);

From 4ee8224f8b624320b52743c2e68986b795002388 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sun, 4 Apr 2021 14:31:08 +0200
Subject: [PATCH 2170/3722] change naming to be less confusing

---
 osu.Game.Tournament/Models/StableInfo.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tournament/Models/StableInfo.cs b/osu.Game.Tournament/Models/StableInfo.cs
index 2dc47db26d..c0538ca587 100644
--- a/osu.Game.Tournament/Models/StableInfo.cs
+++ b/osu.Game.Tournament/Models/StableInfo.cs
@@ -27,17 +27,17 @@ namespace osu.Game.Tournament.Models
 
         private const string config_path = "stable.json";
 
-        private readonly Storage storage;
+        private readonly Storage configStorage;
 
         public StableInfo(Storage storage)
         {
             TournamentStorage tStorage = (TournamentStorage)storage;
-            this.storage = tStorage.AllTournaments;
+            configStorage = tStorage.AllTournaments;
 
-            if (!this.storage.Exists(config_path))
+            if (!configStorage.Exists(config_path))
                 return;
 
-            using (Stream stream = this.storage.GetStream(config_path, FileAccess.Read, FileMode.Open))
+            using (Stream stream = configStorage.GetStream(config_path, FileAccess.Read, FileMode.Open))
             using (var sr = new StreamReader(stream))
             {
                 JsonConvert.PopulateObject(sr.ReadToEnd(), this);
@@ -46,7 +46,7 @@ namespace osu.Game.Tournament.Models
 
         public void SaveChanges()
         {
-            using (var stream = storage.GetStream(config_path, FileAccess.Write, FileMode.Create))
+            using (var stream = configStorage.GetStream(config_path, FileAccess.Write, FileMode.Create))
             using (var sw = new StreamWriter(stream))
             {
                 sw.Write(JsonConvert.SerializeObject(this,

From 879b1ab046eefd501e82a8d4d4ce4baa124872ac Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 4 Apr 2021 21:58:25 +0900
Subject: [PATCH 2171/3722] Avoid unnecessary casts

---
 osu.Game.Tournament.Tests/TournamentTestScene.cs | 3 ++-
 osu.Game.Tournament/Models/StableInfo.cs         | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tournament.Tests/TournamentTestScene.cs b/osu.Game.Tournament.Tests/TournamentTestScene.cs
index cdfd19c157..1fa0ffc8e9 100644
--- a/osu.Game.Tournament.Tests/TournamentTestScene.cs
+++ b/osu.Game.Tournament.Tests/TournamentTestScene.cs
@@ -10,6 +10,7 @@ using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Tests.Visual;
+using osu.Game.Tournament.IO;
 using osu.Game.Tournament.IPC;
 using osu.Game.Tournament.Models;
 using osu.Game.Users;
@@ -28,7 +29,7 @@ namespace osu.Game.Tournament.Tests
         protected MatchIPCInfo IPCInfo { get; private set; } = new MatchIPCInfo();
 
         [BackgroundDependencyLoader]
-        private void load(Storage storage)
+        private void load(TournamentStorage storage)
         {
             Ladder.Ruleset.Value ??= rulesetStore.AvailableRulesets.First();
 
diff --git a/osu.Game.Tournament/Models/StableInfo.cs b/osu.Game.Tournament/Models/StableInfo.cs
index c0538ca587..1ebc81c773 100644
--- a/osu.Game.Tournament/Models/StableInfo.cs
+++ b/osu.Game.Tournament/Models/StableInfo.cs
@@ -29,10 +29,9 @@ namespace osu.Game.Tournament.Models
 
         private readonly Storage configStorage;
 
-        public StableInfo(Storage storage)
+        public StableInfo(TournamentStorage storage)
         {
-            TournamentStorage tStorage = (TournamentStorage)storage;
-            configStorage = tStorage.AllTournaments;
+            configStorage = storage.AllTournaments;
 
             if (!configStorage.Exists(config_path))
                 return;

From 37f8b6220067a03615cb7d487e8429eb9822dbd4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 5 Apr 2021 11:41:40 +0900
Subject: [PATCH 2172/3722] Add ruleset templates structure

---
 Templates/LICENSE                             |  21 +
 Templates/README.md                           |  21 +
 .../Rulesets/ruleset-empty/.editorconfig      |  27 +
 Templates/Rulesets/ruleset-empty/.gitignore   | 288 ++++++
 .../.template.config/template.json            |  16 +
 .../.vscode/launch.json                       |  31 +
 .../.vscode/tasks.json                        |  47 +
 .../TestSceneOsuGame.cs                       |  32 +
 .../TestSceneOsuPlayer.cs                     |  14 +
 .../VisualTestRunner.cs                       |  23 +
 ...u.Game.Rulesets.EmptyFreeform.Tests.csproj |  26 +
 .../osu.Game.Rulesets.EmptyFreeform.sln       |  96 ++
 ...ame.Rulesets.EmptyFreeform.sln.DotSettings | 877 ++++++++++++++++++
 .../Beatmaps/EmptyFreeformBeatmapConverter.cs |  35 +
 .../EmptyFreeformDifficultyCalculator.cs      |  30 +
 .../EmptyFreeformInputManager.cs              |  26 +
 .../EmptyFreeformRuleset.cs                   |  80 ++
 .../Mods/EmptyFreeformModAutoplay.cs          |  25 +
 .../DrawableEmptyFreeformHitObject.cs         |  49 +
 .../Objects/EmptyFreeformHitObject.cs         |  20 +
 .../Replays/EmptyFreeformAutoGenerator.cs     |  42 +
 .../EmptyFreeformFramedReplayInputHandler.cs  |  51 +
 .../Replays/EmptyFreeformReplayFrame.cs       |  21 +
 .../UI/DrawableEmptyFreeformRuleset.cs        |  35 +
 .../UI/EmptyFreeformPlayfield.cs              |  22 +
 .../osu.Game.Rulesets.EmptyFreeform.csproj    |  15 +
 .../Rulesets/ruleset-example/.editorconfig    |  27 +
 Templates/Rulesets/ruleset-example/.gitignore | 288 ++++++
 .../.template.config/template.json            |  17 +
 .../.vscode/launch.json                       |  31 +
 .../.vscode/tasks.json                        |  47 +
 .../TestSceneOsuGame.cs                       |  32 +
 .../TestSceneOsuPlayer.cs                     |  14 +
 .../VisualTestRunner.cs                       |  23 +
 .../osu.Game.Rulesets.Pippidon.Tests.csproj   |  26 +
 .../osu.Game.Rulesets.Pippidon.sln            |  96 ++
 ...osu.Game.Rulesets.Pippidon.sln.DotSettings | 877 ++++++++++++++++++
 .../Beatmaps/PippidonBeatmapConverter.cs      |  34 +
 .../Mods/PippidonModAutoplay.cs               |  25 +
 .../Drawables/DrawablePippidonHitObject.cs    |  78 ++
 .../Objects/PippidonHitObject.cs              |  20 +
 .../PippidonDifficultyCalculator.cs           |  30 +
 .../PippidonInputManager.cs                   |  26 +
 .../PippidonRuleset.cs                        |  57 ++
 .../Replays/PippidonAutoGenerator.cs          |  41 +
 .../PippidonFramedReplayInputHandler.cs       |  46 +
 .../Replays/PippidonReplayFrame.cs            |  13 +
 .../Samples/Gameplay/normal-hitnormal.mp3     | Bin 0 -> 8022 bytes
 .../Resources/Textures/character.png          | Bin 0 -> 78937 bytes
 .../Resources/Textures/coin.png               | Bin 0 -> 3141 bytes
 .../Scoring/PippidonScoreProcessor.cs         |  11 +
 .../UI/DrawablePippidonRuleset.cs             |  37 +
 .../UI/PippidonCursorContainer.cs             |  34 +
 .../UI/PippidonPlayfield.cs                   |  24 +
 .../PippidonPlayfieldAdjustmentContainer.cs   |  20 +
 .../osu.Game.Rulesets.Pippidon.csproj         |  15 +
 .../ruleset-scrolling-empty/.editorconfig     |  27 +
 .../ruleset-scrolling-empty/.gitignore        | 288 ++++++
 .../.template.config/template.json            |  16 +
 .../.vscode/launch.json                       |  31 +
 .../.vscode/tasks.json                        |  47 +
 .../TestSceneOsuGame.cs                       |  32 +
 .../TestSceneOsuPlayer.cs                     |  14 +
 .../VisualTestRunner.cs                       |  23 +
 ....Game.Rulesets.EmptyScrolling.Tests.csproj |  26 +
 .../osu.Game.Rulesets.EmptyScrolling.sln      |  96 ++
 ...me.Rulesets.EmptyScrolling.sln.DotSettings | 877 ++++++++++++++++++
 .../EmptyScrollingBeatmapConverter.cs         |  32 +
 .../EmptyScrollingDifficultyCalculator.cs     |  30 +
 .../EmptyScrollingInputManager.cs             |  26 +
 .../EmptyScrollingRuleset.cs                  |  57 ++
 .../Mods/EmptyScrollingModAutoplay.cs         |  25 +
 .../DrawableEmptyScrollingHitObject.cs        |  48 +
 .../Objects/EmptyScrollingHitObject.cs        |  13 +
 .../Replays/EmptyScrollingAutoGenerator.cs    |  41 +
 .../EmptyScrollingFramedReplayInputHandler.cs |  29 +
 .../Replays/EmptyScrollingReplayFrame.cs      |  19 +
 .../UI/DrawableEmptyScrollingRuleset.cs       |  38 +
 .../UI/EmptyScrollingPlayfield.cs             |  22 +
 .../osu.Game.Rulesets.EmptyScrolling.csproj   |  15 +
 .../ruleset-scrolling-example/.editorconfig   |  27 +
 .../ruleset-scrolling-example/.gitignore      | 288 ++++++
 .../.template.config/template.json            |  16 +
 .../.vscode/launch.json                       |  31 +
 .../.vscode/tasks.json                        |  47 +
 .../TestSceneOsuGame.cs                       |  32 +
 .../TestSceneOsuPlayer.cs                     |  14 +
 .../VisualTestRunner.cs                       |  23 +
 .../osu.Game.Rulesets.Pippidon.Tests.csproj   |  26 +
 .../osu.Game.Rulesets.Pippidon.sln            |  96 ++
 ...osu.Game.Rulesets.Pippidon.sln.DotSettings | 877 ++++++++++++++++++
 .../Beatmaps/PippidonBeatmapConverter.cs      |  45 +
 .../Mods/PippidonModAutoplay.cs               |  25 +
 .../Drawables/DrawablePippidonHitObject.cs    |  75 ++
 .../Objects/PippidonHitObject.cs              |  18 +
 .../PippidonDifficultyCalculator.cs           |  30 +
 .../PippidonInputManager.cs                   |  26 +
 .../PippidonRuleset.cs                        |  55 ++
 .../Replays/PippidonAutoGenerator.cs          |  68 ++
 .../PippidonFramedReplayInputHandler.cs       |  29 +
 .../Replays/PippidonReplayFrame.cs            |  19 +
 .../Samples/Gameplay/normal-hitnormal.mp3     | Bin 0 -> 8022 bytes
 .../Resources/Textures/character.png          | Bin 0 -> 78937 bytes
 .../Resources/Textures/coin.png               | Bin 0 -> 3141 bytes
 .../UI/DrawablePippidonRuleset.cs             |  38 +
 .../UI/PippidonCharacter.cs                   |  87 ++
 .../UI/PippidonPlayfield.cs                   | 128 +++
 .../osu.Game.Rulesets.Pippidon.csproj         |  15 +
 Templates/osu.Game.Templates.csproj           |  24 +
 109 files changed, 7990 insertions(+)
 create mode 100644 Templates/LICENSE
 create mode 100644 Templates/README.md
 create mode 100644 Templates/Rulesets/ruleset-empty/.editorconfig
 create mode 100644 Templates/Rulesets/ruleset-empty/.gitignore
 create mode 100644 Templates/Rulesets/ruleset-empty/.template.config/template.json
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/.vscode/launch.json
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/.vscode/tasks.json
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/TestSceneOsuGame.cs
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/TestSceneOsuPlayer.cs
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/VisualTestRunner.cs
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.sln
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.sln.DotSettings
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Beatmaps/EmptyFreeformBeatmapConverter.cs
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/EmptyFreeformDifficultyCalculator.cs
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/EmptyFreeformInputManager.cs
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/EmptyFreeformRuleset.cs
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Mods/EmptyFreeformModAutoplay.cs
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Objects/Drawables/DrawableEmptyFreeformHitObject.cs
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Objects/EmptyFreeformHitObject.cs
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformAutoGenerator.cs
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformFramedReplayInputHandler.cs
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformReplayFrame.cs
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/UI/DrawableEmptyFreeformRuleset.cs
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/UI/EmptyFreeformPlayfield.cs
 create mode 100644 Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/osu.Game.Rulesets.EmptyFreeform.csproj
 create mode 100644 Templates/Rulesets/ruleset-example/.editorconfig
 create mode 100644 Templates/Rulesets/ruleset-example/.gitignore
 create mode 100644 Templates/Rulesets/ruleset-example/.template.config/template.json
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/launch.json
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/tasks.json
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/TestSceneOsuGame.cs
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/TestSceneOsuPlayer.cs
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/VisualTestRunner.cs
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.sln
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.sln.DotSettings
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Beatmaps/PippidonBeatmapConverter.cs
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Mods/PippidonModAutoplay.cs
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Objects/Drawables/DrawablePippidonHitObject.cs
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Objects/PippidonHitObject.cs
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/PippidonDifficultyCalculator.cs
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/PippidonInputManager.cs
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/PippidonRuleset.cs
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonFramedReplayInputHandler.cs
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonReplayFrame.cs
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Resources/Samples/Gameplay/normal-hitnormal.mp3
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Resources/Textures/character.png
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Resources/Textures/coin.png
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Scoring/PippidonScoreProcessor.cs
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/UI/DrawablePippidonRuleset.cs
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/UI/PippidonCursorContainer.cs
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfield.cs
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfieldAdjustmentContainer.cs
 create mode 100644 Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/.editorconfig
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/.gitignore
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/.template.config/template.json
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/.vscode/launch.json
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/.vscode/tasks.json
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/TestSceneOsuGame.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/TestSceneOsuPlayer.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/VisualTestRunner.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.sln
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.sln.DotSettings
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Beatmaps/EmptyScrollingBeatmapConverter.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingDifficultyCalculator.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingInputManager.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingRuleset.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Mods/EmptyScrollingModAutoplay.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Objects/Drawables/DrawableEmptyScrollingHitObject.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Objects/EmptyScrollingHitObject.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingAutoGenerator.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingFramedReplayInputHandler.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingReplayFrame.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/UI/DrawableEmptyScrollingRuleset.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/UI/EmptyScrollingPlayfield.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/osu.Game.Rulesets.EmptyScrolling.csproj
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/.editorconfig
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/.gitignore
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/.template.config/template.json
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/launch.json
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/tasks.json
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/TestSceneOsuGame.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/TestSceneOsuPlayer.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/VisualTestRunner.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.sln
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.sln.DotSettings
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Beatmaps/PippidonBeatmapConverter.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Mods/PippidonModAutoplay.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Objects/Drawables/DrawablePippidonHitObject.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Objects/PippidonHitObject.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/PippidonDifficultyCalculator.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/PippidonInputManager.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/PippidonRuleset.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonFramedReplayInputHandler.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonReplayFrame.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Resources/Samples/Gameplay/normal-hitnormal.mp3
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Resources/Textures/character.png
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Resources/Textures/coin.png
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/UI/DrawablePippidonRuleset.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/UI/PippidonCharacter.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfield.cs
 create mode 100644 Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj
 create mode 100644 Templates/osu.Game.Templates.csproj

diff --git a/Templates/LICENSE b/Templates/LICENSE
new file mode 100644
index 0000000000..3abffc40a7
--- /dev/null
+++ b/Templates/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 ppy Pty Ltd <contact@ppy.sh>.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/Templates/README.md b/Templates/README.md
new file mode 100644
index 0000000000..75ee76ddba
--- /dev/null
+++ b/Templates/README.md
@@ -0,0 +1,21 @@
+# osu-templates
+
+Templates for use when creating osu! dependent projects. Create a fully-testable (and ready for git) custom ruleset in just two lines.
+
+## Usage
+
+```bash
+# install (or update) templates package.
+# this only needs to be done once
+dotnet new -i ppy.osu.Game.Templates
+
+# create an empty freeform ruleset
+dotnet new ruleset -n MyCoolRuleset
+# create an empty scrolling ruleset (which provides the basics for a scrolling ←↑→↓ ruleset)
+dotnet new ruleset-scrolling -n MyCoolRuleset
+
+# ..or start with a working sample freeform game
+dotnet new ruleset-example -n MyCoolWorkingRuleset
+# ..or a working sample scrolling game
+dotnet new ruleset-scrolling-example -n MyCoolWorkingRuleset
+```
diff --git a/Templates/Rulesets/ruleset-empty/.editorconfig b/Templates/Rulesets/ruleset-empty/.editorconfig
new file mode 100644
index 0000000000..24825b7c42
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/.editorconfig
@@ -0,0 +1,27 @@
+# EditorConfig is awesome: http://editorconfig.org
+root = true
+
+[*.cs]
+end_of_line = crlf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+#Roslyn naming styles
+
+#PascalCase for public and protected members
+dotnet_naming_style.pascalcase.capitalization = pascal_case
+dotnet_naming_symbols.public_members.applicable_accessibilities = public,internal,protected,protected_internal
+dotnet_naming_symbols.public_members.applicable_kinds = property,method,field,event,delegate
+dotnet_naming_rule.public_members_pascalcase.severity = suggestion
+dotnet_naming_rule.public_members_pascalcase.symbols = public_members
+dotnet_naming_rule.public_members_pascalcase.style = pascalcase
+
+#camelCase for private members
+dotnet_naming_style.camelcase.capitalization = camel_case
+dotnet_naming_symbols.private_members.applicable_accessibilities = private
+dotnet_naming_symbols.private_members.applicable_kinds = property,method,field,event,delegate
+dotnet_naming_rule.private_members_camelcase.severity = suggestion
+dotnet_naming_rule.private_members_camelcase.symbols = private_members
+dotnet_naming_rule.private_members_camelcase.style = camelcase
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-empty/.gitignore b/Templates/Rulesets/ruleset-empty/.gitignore
new file mode 100644
index 0000000000..940794e60f
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/.gitignore
@@ -0,0 +1,288 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+**/Properties/launchSettings.json
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# TODO: Comment the next line if you want to checkin your web deploy settings
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Typescript v1 declaration files
+typings/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+# CodeRush
+.cr/
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
diff --git a/Templates/Rulesets/ruleset-empty/.template.config/template.json b/Templates/Rulesets/ruleset-empty/.template.config/template.json
new file mode 100644
index 0000000000..6bfe2e19dc
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/.template.config/template.json
@@ -0,0 +1,16 @@
+{
+    "$schema": "http://json.schemastore.org/template",
+    "author": "ppy Pty Ltd",
+    "classifications": [
+        "Console"
+    ],
+    "name": "osu! ruleset",
+    "identity": "ppy.osu.Game.Templates.Rulesets",
+    "shortName": "ruleset",
+    "tags": {
+        "language": "C#",
+        "type": "project"
+    },
+    "sourceName": "EmptyFreeform",
+    "preferNameDirectory": true
+}
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/.vscode/launch.json b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/.vscode/launch.json
new file mode 100644
index 0000000000..fd03878699
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/.vscode/launch.json
@@ -0,0 +1,31 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "VisualTests (Debug)",
+            "type": "coreclr",
+            "request": "launch",
+            "program": "dotnet",
+            "args": [
+                "${workspaceRoot}/bin/Debug/net5.0/osu.Game.Rulesets.EmptyFreeformRuleset.Tests.dll"
+            ],
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Debug)",
+            "env": {},
+            "console": "internalConsole"
+        },
+        {
+            "name": "VisualTests (Release)",
+            "type": "coreclr",
+            "request": "launch",
+            "program": "dotnet",
+            "args": [
+                "${workspaceRoot}/bin/Release/net5.0/osu.Game.Rulesets.EmptyFreeformRuleset.Tests.dll"
+            ],
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Release)",
+            "env": {},
+            "console": "internalConsole"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/.vscode/tasks.json b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/.vscode/tasks.json
new file mode 100644
index 0000000000..509df6a510
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/.vscode/tasks.json
@@ -0,0 +1,47 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Build (Debug)",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "build",
+                "--no-restore",
+                "osu.Game.Rulesets.EmptyFreeformRuleset.Tests.csproj",
+                "-p:GenerateFullPaths=true",
+                "-m",
+                "-verbosity:m"
+            ],
+            "group": "build",
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Build (Release)",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "build",
+                "--no-restore",
+                "osu.Game.Rulesets.EmptyFreeformRuleset.Tests.csproj",
+                "-p:Configuration=Release",
+                "-p:GenerateFullPaths=true",
+                "-m",
+                "-verbosity:m"
+            ],
+            "group": "build",
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Restore",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "restore"
+            ],
+            "problemMatcher": []
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/TestSceneOsuGame.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/TestSceneOsuGame.cs
new file mode 100644
index 0000000000..9c512a01ea
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/TestSceneOsuGame.cs
@@ -0,0 +1,32 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Platform;
+using osu.Game.Tests.Visual;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.EmptyFreeform.Tests
+{
+    public class TestSceneOsuGame : OsuTestScene
+    {
+        [BackgroundDependencyLoader]
+        private void load(GameHost host, OsuGameBase gameBase)
+        {
+            OsuGame game = new OsuGame();
+            game.SetHost(host);
+
+            Children = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4.Black,
+                },
+                game
+            };
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/TestSceneOsuPlayer.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/TestSceneOsuPlayer.cs
new file mode 100644
index 0000000000..0f2ddf82a5
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/TestSceneOsuPlayer.cs
@@ -0,0 +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 NUnit.Framework;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.EmptyFreeform.Tests
+{
+    [TestFixture]
+    public class TestSceneOsuPlayer : PlayerTestScene
+    {
+        protected override Ruleset CreatePlayerRuleset() => new EmptyFreeformRuleset();
+    }
+}
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/VisualTestRunner.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/VisualTestRunner.cs
new file mode 100644
index 0000000000..4f810ce17f
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/VisualTestRunner.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.
+
+using System;
+using osu.Framework;
+using osu.Framework.Platform;
+using osu.Game.Tests;
+
+namespace osu.Game.Rulesets.EmptyFreeform.Tests
+{
+    public static class VisualTestRunner
+    {
+        [STAThread]
+        public static int Main(string[] args)
+        {
+            using (DesktopGameHost host = Host.GetSuitableHost(@"osu", true))
+            {
+                host.Run(new OsuTestBrowser());
+                return 0;
+            }
+        }
+    }
+}
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
new file mode 100644
index 0000000000..98a32f9b3a
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+      <StartupObject>osu.Game.Rulesets.EmptyFreeform.Tests.VisualTestRunner</StartupObject>
+    </PropertyGroup>
+    <ItemGroup Label="Service">
+      <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+    </ItemGroup>
+    <PropertyGroup>
+      <GenerateProgramFile>false</GenerateProgramFile>
+    </PropertyGroup>
+  <ItemGroup Label="Package References">
+    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\osu.Game.Rulesets.EmptyFreeform\osu.Game.Rulesets.EmptyFreeform.csproj" />
+  </ItemGroup>
+  <PropertyGroup Label="Project">
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <RootNamespace>osu.Game.Rulesets.EmptyFreeform.Tests</RootNamespace>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.sln b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.sln
new file mode 100644
index 0000000000..706df08472
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.sln
@@ -0,0 +1,96 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29123.88
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Game.Rulesets.EmptyFreeform", "osu.Game.Rulesets.EmptyFreeform\osu.Game.Rulesets.EmptyFreeform.csproj", "{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.EmptyFreeform.Tests", "osu.Game.Rulesets.EmptyFreeform.Tests\osu.Game.Rulesets.EmptyFreeform.Tests.csproj", "{B4577C85-CB83-462A-BCE3-22FFEB16311D}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+		VisualTests|Any CPU = VisualTests|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.VisualTests|Any CPU.ActiveCfg = Release|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.VisualTests|Any CPU.Build.0 = Release|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.VisualTests|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.VisualTests|Any CPU.Build.0 = Debug|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {671B0BEC-2403-45B0-9357-2C97CC517668}
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		Policies = $0
+		$0.TextStylePolicy = $1
+		$1.EolMarker = Windows
+		$1.inheritsSet = VisualStudio
+		$1.inheritsScope = text/plain
+		$1.scope = text/x-csharp
+		$0.CSharpFormattingPolicy = $2
+		$2.IndentSwitchSection = True
+		$2.NewLinesForBracesInProperties = True
+		$2.NewLinesForBracesInAccessors = True
+		$2.NewLinesForBracesInAnonymousMethods = True
+		$2.NewLinesForBracesInControlBlocks = True
+		$2.NewLinesForBracesInAnonymousTypes = True
+		$2.NewLinesForBracesInObjectCollectionArrayInitializers = True
+		$2.NewLinesForBracesInLambdaExpressionBody = True
+		$2.NewLineForElse = True
+		$2.NewLineForCatch = True
+		$2.NewLineForFinally = True
+		$2.NewLineForMembersInObjectInit = True
+		$2.NewLineForMembersInAnonymousTypes = True
+		$2.NewLineForClausesInQuery = True
+		$2.SpacingAfterMethodDeclarationName = False
+		$2.SpaceAfterMethodCallName = False
+		$2.SpaceBeforeOpenSquareBracket = False
+		$2.inheritsSet = Mono
+		$2.inheritsScope = text/x-csharp
+		$2.scope = text/x-csharp
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		Policies = $0
+		$0.TextStylePolicy = $1
+		$1.EolMarker = Windows
+		$1.inheritsSet = VisualStudio
+		$1.inheritsScope = text/plain
+		$1.scope = text/x-csharp
+		$0.CSharpFormattingPolicy = $2
+		$2.IndentSwitchSection = True
+		$2.NewLinesForBracesInProperties = True
+		$2.NewLinesForBracesInAccessors = True
+		$2.NewLinesForBracesInAnonymousMethods = True
+		$2.NewLinesForBracesInControlBlocks = True
+		$2.NewLinesForBracesInAnonymousTypes = True
+		$2.NewLinesForBracesInObjectCollectionArrayInitializers = True
+		$2.NewLinesForBracesInLambdaExpressionBody = True
+		$2.NewLineForElse = True
+		$2.NewLineForCatch = True
+		$2.NewLineForFinally = True
+		$2.NewLineForMembersInObjectInit = True
+		$2.NewLineForMembersInAnonymousTypes = True
+		$2.NewLineForClausesInQuery = True
+		$2.SpacingAfterMethodDeclarationName = False
+		$2.SpaceAfterMethodCallName = False
+		$2.SpaceBeforeOpenSquareBracket = False
+		$2.inheritsSet = Mono
+		$2.inheritsScope = text/x-csharp
+		$2.scope = text/x-csharp
+	EndGlobalSection
+EndGlobal
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.sln.DotSettings b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.sln.DotSettings
new file mode 100644
index 0000000000..1cbe36794a
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.sln.DotSettings
@@ -0,0 +1,877 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Efnt/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Emp3/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Epng/@EntryIndexedValue">True</s:Boolean>
+	<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/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/=ArrangeMissingParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeConstructorOrDestructorBody/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeLocalFunctionBody/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeMethodOrOperatorBody/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeModifiersOrder/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue"></s:String>
+	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexRemoved">True</s:Boolean>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeMemberModifiers/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeModifiers/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignedValueIsNeverUsed/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignNullToNotNullAttribute/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadAttributeBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadBracesSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadChildStatementIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadColonSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadCommaSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadControlBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadControlBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadDeclarationBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadDeclarationBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadEmptyFreeformScrollingBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadExpressionBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadExpressionBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadGenericBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadLinqLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadListLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadMemberAccessSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadNamespaceBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadParensLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadParensSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadPreprocessorIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSemicolonSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSpacesAfterKeyword/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSquareBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSwitchBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSymbolSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CanBeReplacedWithTryCastAndCheckForNull/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CheckForReferenceEqualityInstead_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CheckForReferenceEqualityInstead_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ClassNeverInstantiated_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ClassNeverInstantiated_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ClassWithVirtualMembersNeverInherited_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CollectionNeverQueried_002EGlobal/@EntryIndexedValue">SUGGESTION</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CollectionNeverQueried_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CommentTypo/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CompareOfFloatsByEqualityOperator/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertClosureToMethodGroup/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfDoToWhile/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToConditionalTernaryExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToNullCoalescingExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfToOrExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertNullableToShortForm/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertPropertyToExpressionBody/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoProperty/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToConstant_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLambdaExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLocalFunction/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToStaticClass/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=DoubleNegationOperator/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EmptyScrollingGeneralCatchClause/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EventNeverSubscribedTo_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EventNeverSubscribedTo_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ForCanBeConvertedToForeach/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=IdentifierTypo/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ImpureMethodCallOnReadonlyValueField/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InconsistentNaming/@EntryIndexedValue">ERROR</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=IncorrectBlankLinesNearBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InheritdocConsiderUsage/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InlineOutVariableDeclaration/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InvertIf/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InvokeAsExtensionMethod/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=JoinDeclarationAndInitializer/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=JoinNullCheckWithUsage/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBeMadeStatic_002ELocal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBePrivate_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBePrivate_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBeProtected_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeCastWithTypeCheck/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeConditionalExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeSequentialChecks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodSupportsCancellation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingBlankLines/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingLinebreak/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingSpace/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MoreSpecificForeachVariableTypeAvailable/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MultipleSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MultipleStatementsOnOneLine/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MultipleTypeMembersOnOneLine/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=NestedStringInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=NotAccessedField_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=OutdentIsOffPrevLevel/@EntryIndexedValue">WARNING</s:String>
+	<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/=PossibleInterfaceMemberAmbiguity/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PossibleMultipleEnumeration/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PrivateVariableCanBeMadeReadonly/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PublicConstructorInAbstractClass/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantArgumentDefaultValue/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantArrayCreationExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantAttributeParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantAttributeUsageProperty/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantBlankLines/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCaseLabel/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInAttributeList/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInEnumDeclaration/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInInitializer/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantEmptyFreeformScrollingObjectCreationArgumentList/@EntryIndexedValue">WARNING</s:String>
+	
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantExplicitParamsArrayCreation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantImmediateDelegateInvocation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLambdaSignatureParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLinebreak/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantSpace/@EntryIndexedValue">WARNING</s:String>
+	<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/=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>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveToList_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E3/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithLastOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithLastOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithLastOrDefault_002E3/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithLastOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002E3/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EAny_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EAny_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ECount_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ECount_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EFirst_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EFirst_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EFirstOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EFirstOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELast_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELast_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELastOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELastOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELongCount/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingle_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingle_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingleOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingleOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EWhere/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSimpleAssignment_002EFalse/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSimpleAssignment_002ETrue/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleAssignment_002EFalse/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleAssignment_002ETrue/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToAny/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToCount/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirst/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirstOrDefault/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToLast/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToLastOrDefault/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToSingle/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToSingleOrDefault/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E3/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SeparateControlTransferStatement/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringLiteralTypo/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FBuiltInTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FSimpleTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SwitchStatementMissingSomeCases/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TabsAndSpacesMismatch/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TabsAreDisallowed/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TabsOutsideIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TooWideLocalVariableScope/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TryCastAlwaysSucceeds/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnassignedField_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnnecessaryWhitespace/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedAutoPropertyAccessor_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMemberHierarchy_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMemberInSuper_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMember_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMember_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002ELocal/@EntryIndexedValue">HINT</s:String>
+	
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedParameter_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseCollectionCountProperty/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInFormatString/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNameofExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexedValue"></s:String>
+	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexRemoved">True</s:Boolean>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNullPropagation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseObjectOrCollectionInitializer/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UsePatternMatching/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseStringInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VariableCanBeMadeConst/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberCallInConstructor/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=WrongIndentSize/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Code_0020Cleanup_0020_0028peppy_0029/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Code Cleanup (peppy)"&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_EXPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;ALWAYS_EXPLICIT&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_EXPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="False" ArrangeTypeMemberAccessModifier="False" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="False" ArrangeBraces="False" ArrangeAttributes="False" ArrangeArgumentsStyle="False" /&gt;&lt;XAMLCollapseEmptyFreeformScrollingTags&gt;False&lt;/XAMLCollapseEmptyFreeformScrollingTags&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;/Profile&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeCleanup/RecentlyUsedProfile/@EntryValue">Code Cleanup (peppy)</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/LOCAL_FUNCTION_BODY/@EntryValue">ExpressionBody</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/METHOD_OR_OPERATOR_BODY/@EntryValue">ExpressionBody</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/USE_HEURISTICS_FOR_BODY_STYLE/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_LINQ_QUERY/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_CALLS_CHAIN/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_EXTENDS_LIST/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_FOR_STMT/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_PARAMETER/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTIPLE_DECLARATION/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTLINE_TYPE_PARAMETER_CONSTRAINS/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTLINE_TYPE_PARAMETER_LIST/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ANONYMOUS_METHOD_DECLARATION_BRACES/@EntryValue">NEXT_LINE</s:String>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BEFORE_BLOCK_STATEMENTS/@EntryValue">1</s:Int64>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BEFORE_CASE/@EntryValue">1</s:Int64>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INITIALIZER_BRACES/@EntryValue">NEXT_LINE</s:String>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_CODE/@EntryValue">1</s:Int64>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue">1</s:Int64>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/LINE_FEED_AT_FILE_END/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AROUND_MULTIPLICATIVE_OP/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_SIZEOF_PARENTHESES/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_TYPEOF_PARENTHESES/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHING_EMPTY_BRACES/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/STICK_COMMENT/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_ARRAY_INITIALIZER_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_BINARY_OPSIGN/@EntryValue">True</s:Boolean>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">200</s:Int64>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_OBJECT_AND_COLLECTION_INITIALIZER_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/EncapsulateField/MakeFieldPrivate/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/EncapsulateField/UseAutoProperty/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AABB/@EntryIndexedValue">AABB</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=API/@EntryIndexedValue">API</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BPM/@EntryIndexedValue">BPM</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GC/@EntryIndexedValue">GC</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GL/@EntryIndexedValue">GL</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GLSL/@EntryIndexedValue">GLSL</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HID/@EntryIndexedValue">HID</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HUD/@EntryIndexedValue">HUD</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IL/@EntryIndexedValue">IL</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IPC/@EntryIndexedValue">IPC</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JIT/@EntryIndexedValue">JIT</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LTRB/@EntryIndexedValue">LTRB</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MD/@EntryIndexedValue">MD5</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NS/@EntryIndexedValue">NS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=OS/@EntryIndexedValue">OS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PM/@EntryIndexedValue">PM</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RGB/@EntryIndexedValue">RGB</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RNG/@EntryIndexedValue">RNG</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SHA/@EntryIndexedValue">SHA</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SRGB/@EntryIndexedValue">SRGB</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TK/@EntryIndexedValue">TK</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SS/@EntryIndexedValue">SS</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PP/@EntryIndexedValue">PP</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GMT/@EntryIndexedValue">GMT</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=QAT/@EntryIndexedValue">QAT</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BNG/@EntryIndexedValue">BNG</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UI/@EntryIndexedValue">UI</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpNaming/ApplyAutoDetectedRules/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeStyle/CSharpFileLayoutPatterns/Pattern/@EntryValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&#xD;
+&lt;Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"&gt;&#xD;
+  &lt;TypePattern DisplayName="COM interfaces or structs"&gt;&#xD;
+    &lt;TypePattern.Match&gt;&#xD;
+      &lt;Or&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="Interface" /&gt;&#xD;
+          &lt;Or&gt;&#xD;
+            &lt;HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /&gt;&#xD;
+            &lt;HasAttribute Name="System.Runtime.InteropServices.ComImport" /&gt;&#xD;
+          &lt;/Or&gt;&#xD;
+        &lt;/And&gt;&#xD;
+        &lt;Kind Is="Struct" /&gt;&#xD;
+      &lt;/Or&gt;&#xD;
+    &lt;/TypePattern.Match&gt;&#xD;
+  &lt;/TypePattern&gt;&#xD;
+  &lt;TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"&gt;&#xD;
+    &lt;TypePattern.Match&gt;&#xD;
+      &lt;And&gt;&#xD;
+        &lt;Kind Is="Class" /&gt;&#xD;
+        &lt;HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /&gt;&#xD;
+      &lt;/And&gt;&#xD;
+    &lt;/TypePattern.Match&gt;&#xD;
+    &lt;Entry DisplayName="Setup/Teardown Methods"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="Method" /&gt;&#xD;
+          &lt;Or&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="True" /&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="True" /&gt;&#xD;
+          &lt;/Or&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+    &lt;Entry DisplayName="All other members" /&gt;&#xD;
+    &lt;Entry Priority="100" DisplayName="Test Methods"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="Method" /&gt;&#xD;
+          &lt;HasAttribute Name="NUnit.Framework.TestAttribute" /&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+      &lt;Entry.SortBy&gt;&#xD;
+        &lt;Name /&gt;&#xD;
+      &lt;/Entry.SortBy&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+  &lt;/TypePattern&gt;&#xD;
+  &lt;TypePattern DisplayName="Default Pattern"&gt;&#xD;
+    &lt;Group DisplayName="Fields/Properties"&gt;&#xD;
+      &lt;Group DisplayName="Public Fields"&gt;&#xD;
+        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Kind Is="Constant" /&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+                &lt;And&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/And&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Or&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/Or&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Entry DisplayName="Public Properties"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Access Is="Public" /&gt;&#xD;
+            &lt;Kind Is="Property" /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+      &lt;Group DisplayName="Internal Fields"&gt;&#xD;
+        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Kind Is="Constant" /&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+                &lt;And&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/And&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Or&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/Or&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Entry DisplayName="Internal Properties"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Access Is="Internal" /&gt;&#xD;
+            &lt;Kind Is="Property" /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+      &lt;Group DisplayName="Protected Fields"&gt;&#xD;
+        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Kind Is="Constant" /&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+                &lt;And&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/And&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Or&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/Or&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Entry DisplayName="Protected Properties"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Access Is="Protected" /&gt;&#xD;
+            &lt;Kind Is="Property" /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+      &lt;Group DisplayName="Private Fields"&gt;&#xD;
+        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Kind Is="Constant" /&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+                &lt;And&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/And&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Or&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/Or&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Entry DisplayName="Private Properties"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Access Is="Private" /&gt;&#xD;
+            &lt;Kind Is="Property" /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+    &lt;/Group&gt;&#xD;
+    &lt;Group DisplayName="Constructor/Destructor"&gt;&#xD;
+      &lt;Entry DisplayName="Ctor"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;Kind Is="Constructor" /&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+      &lt;Region Name="Disposal"&gt;&#xD;
+        &lt;Entry DisplayName="Dtor"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;Kind Is="Destructor" /&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Dispose()"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+              &lt;Name Is="Dispose" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Dispose(true)"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Virtual /&gt;&#xD;
+                &lt;Override /&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+              &lt;Name Is="Dispose" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Region&gt;&#xD;
+    &lt;/Group&gt;&#xD;
+    &lt;Group DisplayName="Methods"&gt;&#xD;
+      &lt;Group DisplayName="Public"&gt;&#xD;
+        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Static /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Group DisplayName="Internal"&gt;&#xD;
+        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Static /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Group DisplayName="Protected"&gt;&#xD;
+        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Static /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Group DisplayName="Private"&gt;&#xD;
+        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Static /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+    &lt;/Group&gt;&#xD;
+  &lt;/TypePattern&gt;&#xD;
+&lt;/Patterns&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">Copyright (c) ppy Pty Ltd &lt;contact@ppy.sh&gt;. Licensed under the MIT Licence.&#xD;
+See the LICENCE file in the repository root for full licence text.&#xD;
+</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Constants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">&lt;Policy Inspect="False" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=LocalConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=LocalFunctions/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb"&gt;&lt;ExtraRule Prefix="_" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=StaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=TypeParameters/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=9d1af99b_002Dbefe_002D48a4_002D9eb3_002D661384e29869/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Private" Description="private methods"&gt;&lt;ElementKinds&gt;&lt;Kind Name="ASYNC_METHOD" /&gt;&lt;Kind Name="METHOD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=9ffbe43b_002Dc610_002D411b_002D9839_002D1416a146d9b0/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Protected, ProtectedInternal, Internal, Public" Description="internal/protected/public methods"&gt;&lt;ElementKinds&gt;&lt;Kind Name="ASYNC_METHOD" /&gt;&lt;Kind Name="METHOD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=a4c2df6c_002Db202_002D48d5_002Db077_002De678cb548c25/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Private" Description="private properties"&gt;&lt;ElementKinds&gt;&lt;Kind Name="PROPERTY" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=fd562728_002Dc23d_002D417f_002Da19f_002D9d854247fbea/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Protected, ProtectedInternal, Internal, Public" Description="internal/protected/public properties"&gt;&lt;ElementKinds&gt;&lt;Kind Name="PROPERTY" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FCONSTANT/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FCLASS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FCONSTRUCTOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FGLOBAL_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLABEL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLOCAL_005FCONSTRUCTOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLOCAL_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FOBJECT_005FPROPERTY_005FOF_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FPARAMETER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FCLASS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FENUM/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FENUM_005FMEMBER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FINTERFACE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="I" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMIXED_005FENUM/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE_005FEXPORTED/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE_005FLOCAL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FTYPE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FTYPE_005FPARAMETER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="T" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FHTML_005FCONTROL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FTAG_005FNAME/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FTAG_005FPREFIX/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=NAMESPACE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Description/@EntryValue">o!f – Object Initializer: Anchor&amp;Origin</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Field/=anchor/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Field/=anchor/Expression/@EntryValue">constant("Centre")</s:String>
+	<s:Int64 x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Field/=anchor/Order/@EntryValue">0</s:Int64>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Shortcut/@EntryValue">ofao</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Text/@EntryValue">Anchor = Anchor.$anchor$,
+Origin = Anchor.$anchor$,</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Description/@EntryValue">o!f – InternalChildren = []</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Shortcut/@EntryValue">ofic</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Text/@EntryValue">InternalChildren = new Drawable[]
+{
+    $END$
+};</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Description/@EntryValue">o!f – new GridContainer { .. }</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Shortcut/@EntryValue">ofgc</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Text/@EntryValue">new GridContainer
+{
+    RelativeSizeAxes = Axes.Both,
+    Content = new[]
+    {
+        new Drawable[] { $END$ },
+        new Drawable[] { }
+    }
+};</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Description/@EntryValue">o!f – new FillFlowContainer { .. }</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Shortcut/@EntryValue">offf</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Text/@EntryValue">new FillFlowContainer
+{
+    RelativeSizeAxes = Axes.Both,
+    Direction = FillDirection.Vertical,
+    Children = new Drawable[]
+    {
+        $END$
+    }
+},</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Description/@EntryValue">o!f – new Container { .. }</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Shortcut/@EntryValue">ofcont</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Text/@EntryValue">new Container
+{
+    RelativeSizeAxes = Axes.Both,
+    Children = new Drawable[]
+    {
+        $END$
+    }
+},</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Description/@EntryValue">o!f – BackgroundDependencyLoader load()</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Shortcut/@EntryValue">ofbdl</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Text/@EntryValue">[BackgroundDependencyLoader]
+private void load()
+{
+    $END$
+}</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Description/@EntryValue">o!f – new Box { .. }</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Shortcut/@EntryValue">ofbox</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Text/@EntryValue">new Box
+{
+    Colour = Color4.Black,
+    RelativeSizeAxes = Axes.Both,
+},</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Description/@EntryValue">o!f – Children = []</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Shortcut/@EntryValue">ofc</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Text/@EntryValue">Children = new Drawable[]
+{
+    $END$
+};</s:String>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Beatmap/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=beatmaps/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=beatmap_0027s/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=bindable/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Catmull/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Drawables/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=gameplay/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=hitobjects/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=keymods/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Kiai/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboard/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboards/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Playfield/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=resampler/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=ruleset/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=rulesets/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Taiko/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Unranked/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Beatmaps/EmptyFreeformBeatmapConverter.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Beatmaps/EmptyFreeformBeatmapConverter.cs
new file mode 100644
index 0000000000..a441438d80
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Beatmaps/EmptyFreeformBeatmapConverter.cs
@@ -0,0 +1,35 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using System.Threading;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.EmptyFreeform.Objects;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osuTK;
+
+namespace osu.Game.Rulesets.EmptyFreeform.Beatmaps
+{
+    public class EmptyFreeformBeatmapConverter : BeatmapConverter<EmptyFreeformHitObject>
+    {
+        public EmptyFreeformBeatmapConverter(IBeatmap beatmap, Ruleset ruleset)
+            : base(beatmap, ruleset)
+        {
+        }
+
+        // todo: Check for conversion types that should be supported (ie. Beatmap.HitObjects.Any(h => h is IHasXPosition))
+        // https://github.com/ppy/osu/tree/master/osu.Game/Rulesets/Objects/Types
+        public override bool CanConvert() => true;
+
+        protected override IEnumerable<EmptyFreeformHitObject> ConvertHitObject(HitObject original, IBeatmap beatmap, CancellationToken cancellationToken)
+        {
+            yield return new EmptyFreeformHitObject
+            {
+                Samples = original.Samples,
+                StartTime = original.StartTime,
+                Position = (original as IHasPosition)?.Position ?? Vector2.Zero,
+            };
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/EmptyFreeformDifficultyCalculator.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/EmptyFreeformDifficultyCalculator.cs
new file mode 100644
index 0000000000..59a68245a6
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/EmptyFreeformDifficultyCalculator.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.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Difficulty;
+using osu.Game.Rulesets.Difficulty.Preprocessing;
+using osu.Game.Rulesets.Difficulty.Skills;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.EmptyFreeform
+{
+    public class EmptyFreeformDifficultyCalculator : DifficultyCalculator
+    {
+        public EmptyFreeformDifficultyCalculator(Ruleset ruleset, WorkingBeatmap beatmap)
+            : base(ruleset, beatmap)
+        {
+        }
+
+        protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills, double clockRate)
+        {
+            return new DifficultyAttributes(mods, skills, 0);
+        }
+
+        protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate) => Enumerable.Empty<DifficultyHitObject>();
+
+        protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods) => new Skill[0];
+    }
+}
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/EmptyFreeformInputManager.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/EmptyFreeformInputManager.cs
new file mode 100644
index 0000000000..b292a28c0d
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/EmptyFreeformInputManager.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.ComponentModel;
+using osu.Framework.Input.Bindings;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.EmptyFreeform
+{
+    public class EmptyFreeformInputManager : RulesetInputManager<EmptyFreeformAction>
+    {
+        public EmptyFreeformInputManager(RulesetInfo ruleset)
+            : base(ruleset, 0, SimultaneousBindingMode.Unique)
+        {
+        }
+    }
+
+    public enum EmptyFreeformAction
+    {
+        [Description("Button 1")]
+        Button1,
+
+        [Description("Button 2")]
+        Button2,
+    }
+}
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/EmptyFreeformRuleset.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/EmptyFreeformRuleset.cs
new file mode 100644
index 0000000000..96675e3e99
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/EmptyFreeformRuleset.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 System.Collections.Generic;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Bindings;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Difficulty;
+using osu.Game.Rulesets.EmptyFreeform.Beatmaps;
+using osu.Game.Rulesets.EmptyFreeform.Mods;
+using osu.Game.Rulesets.EmptyFreeform.UI;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.UI;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.EmptyFreeform
+{
+    public class EmptyFreeformRuleset : Ruleset
+    {
+        public override string Description => "a very emptyfreeformruleset ruleset";
+
+        public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) =>
+            new DrawableEmptyFreeformRuleset(this, beatmap, mods);
+
+        public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) =>
+            new EmptyFreeformBeatmapConverter(beatmap, this);
+
+        public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) =>
+            new EmptyFreeformDifficultyCalculator(this, beatmap);
+
+        public override IEnumerable<Mod> GetModsFor(ModType type)
+        {
+            switch (type)
+            {
+                case ModType.Automation:
+                    return new[] { new EmptyFreeformModAutoplay() };
+
+                default:
+                    return new Mod[] { null };
+            }
+        }
+
+        public override string ShortName => "emptyfreeformruleset";
+
+        public override IEnumerable<KeyBinding> GetDefaultKeyBindings(int variant = 0) => new[]
+        {
+            new KeyBinding(InputKey.Z, EmptyFreeformAction.Button1),
+            new KeyBinding(InputKey.X, EmptyFreeformAction.Button2),
+        };
+
+        public override Drawable CreateIcon() => new Icon(ShortName[0]);
+
+        public class Icon : CompositeDrawable
+        {
+            public Icon(char c)
+            {
+                InternalChildren = new Drawable[]
+                {
+                    new Circle
+                    {
+                        Size = new Vector2(20),
+                        Colour = Color4.White,
+                    },
+                    new SpriteText
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Text = c.ToString(),
+                        Font = OsuFont.Default.With(size: 18)
+                    }
+                };
+            }
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Mods/EmptyFreeformModAutoplay.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Mods/EmptyFreeformModAutoplay.cs
new file mode 100644
index 0000000000..d5c1e9bd15
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Mods/EmptyFreeformModAutoplay.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 System.Collections.Generic;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.EmptyFreeform.Objects;
+using osu.Game.Rulesets.EmptyFreeform.Replays;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Scoring;
+using osu.Game.Users;
+
+namespace osu.Game.Rulesets.EmptyFreeform.Mods
+{
+    public class EmptyFreeformModAutoplay : ModAutoplay<EmptyFreeformHitObject>
+    {
+        public override Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => new Score
+        {
+            ScoreInfo = new ScoreInfo
+            {
+                User = new User { Username = "sample" },
+            },
+            Replay = new EmptyFreeformAutoGenerator(beatmap).Generate(),
+        };
+    }
+}
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Objects/Drawables/DrawableEmptyFreeformHitObject.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Objects/Drawables/DrawableEmptyFreeformHitObject.cs
new file mode 100644
index 0000000000..0f38e9fdf8
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Objects/Drawables/DrawableEmptyFreeformHitObject.cs
@@ -0,0 +1,49 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Scoring;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.EmptyFreeform.Objects.Drawables
+{
+    public class DrawableEmptyFreeformHitObject : DrawableHitObject<EmptyFreeformHitObject>
+    {
+        public DrawableEmptyFreeformHitObject(EmptyFreeformHitObject hitObject)
+            : base(hitObject)
+        {
+            Size = new Vector2(40);
+            Origin = Anchor.Centre;
+
+            Position = hitObject.Position;
+
+            // todo: add visuals.
+        }
+
+        protected override void CheckForResult(bool userTriggered, double timeOffset)
+        {
+            if (timeOffset >= 0)
+                // todo: implement judgement logic
+                ApplyResult(r => r.Type = HitResult.Perfect);
+        }
+
+        protected override void UpdateHitStateTransforms(ArmedState state)
+        {
+            const double duration = 1000;
+
+            switch (state)
+            {
+                case ArmedState.Hit:
+                    this.FadeOut(duration, Easing.OutQuint).Expire();
+                    break;
+
+                case ArmedState.Miss:
+                    this.FadeColour(Color4.Red, duration);
+                    this.FadeOut(duration, Easing.InQuint).Expire();
+                    break;
+            }
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Objects/EmptyFreeformHitObject.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Objects/EmptyFreeformHitObject.cs
new file mode 100644
index 0000000000..9cd18d2d9f
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Objects/EmptyFreeformHitObject.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.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osuTK;
+
+namespace osu.Game.Rulesets.EmptyFreeform.Objects
+{
+    public class EmptyFreeformHitObject : HitObject, IHasPosition
+    {
+        public override Judgement CreateJudgement() => new Judgement();
+
+        public Vector2 Position { get; set; }
+
+        public float X => Position.X;
+        public float Y => Position.Y;
+    }
+}
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformAutoGenerator.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformAutoGenerator.cs
new file mode 100644
index 0000000000..6d8d4215a2
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformAutoGenerator.cs
@@ -0,0 +1,42 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using osu.Game.Beatmaps;
+using osu.Game.Replays;
+using osu.Game.Rulesets.EmptyFreeform.Objects;
+using osu.Game.Rulesets.Replays;
+
+namespace osu.Game.Rulesets.EmptyFreeform.Replays
+{
+    public class EmptyFreeformAutoGenerator : AutoGenerator
+    {
+        protected Replay Replay;
+        protected List<ReplayFrame> Frames => Replay.Frames;
+
+        public new Beatmap<EmptyFreeformHitObject> Beatmap => (Beatmap<EmptyFreeformHitObject>)base.Beatmap;
+
+        public EmptyFreeformAutoGenerator(IBeatmap beatmap)
+            : base(beatmap)
+        {
+            Replay = new Replay();
+        }
+
+        public override Replay Generate()
+        {
+            Frames.Add(new EmptyFreeformReplayFrame());
+
+            foreach (EmptyFreeformHitObject hitObject in Beatmap.HitObjects)
+            {
+                Frames.Add(new EmptyFreeformReplayFrame
+                {
+                    Time = hitObject.StartTime,
+                    Position = hitObject.Position,
+                    // todo: add required inputs and extra frames.
+                });
+            }
+
+            return Replay;
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformFramedReplayInputHandler.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformFramedReplayInputHandler.cs
new file mode 100644
index 0000000000..f25ea6ec62
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformFramedReplayInputHandler.cs
@@ -0,0 +1,51 @@
+// Copyright (c) ppy 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.Framework.Input.StateChanges;
+using osu.Framework.Utils;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Replays;
+using osuTK;
+
+namespace osu.Game.Rulesets.EmptyFreeform.Replays
+{
+    public class EmptyFreeformFramedReplayInputHandler : FramedReplayInputHandler<EmptyFreeformReplayFrame>
+    {
+        public EmptyFreeformFramedReplayInputHandler(Replay replay)
+            : base(replay)
+        {
+        }
+
+        protected override bool IsImportant(EmptyFreeformReplayFrame frame) => frame.Actions.Any();
+
+        protected Vector2 Position
+        {
+            get
+            {
+                var frame = CurrentFrame;
+
+                if (frame == null)
+                    return Vector2.Zero;
+
+                Debug.Assert(CurrentTime != null);
+
+                return Interpolation.ValueAt(CurrentTime.Value, frame.Position, NextFrame.Position, frame.Time, NextFrame.Time);
+            }
+        }
+
+        public override void CollectPendingInputs(List<IInput> inputs)
+        {
+            inputs.Add(new MousePositionAbsoluteInput
+            {
+                Position = GamefieldToScreenSpace(Position),
+            });
+            inputs.Add(new ReplayState<EmptyFreeformAction>
+            {
+                PressedActions = CurrentFrame?.Actions ?? new List<EmptyFreeformAction>(),
+            });
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformReplayFrame.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformReplayFrame.cs
new file mode 100644
index 0000000000..c84101ca70
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformReplayFrame.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.Collections.Generic;
+using osu.Game.Rulesets.Replays;
+using osuTK;
+
+namespace osu.Game.Rulesets.EmptyFreeform.Replays
+{
+    public class EmptyFreeformReplayFrame : ReplayFrame
+    {
+        public List<EmptyFreeformAction> Actions = new List<EmptyFreeformAction>();
+        public Vector2 Position;
+
+        public EmptyFreeformReplayFrame(EmptyFreeformAction? button = null)
+        {
+            if (button.HasValue)
+                Actions.Add(button.Value);
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/UI/DrawableEmptyFreeformRuleset.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/UI/DrawableEmptyFreeformRuleset.cs
new file mode 100644
index 0000000000..290f35f516
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/UI/DrawableEmptyFreeformRuleset.cs
@@ -0,0 +1,35 @@
+// Copyright (c) ppy 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.Input;
+using osu.Game.Beatmaps;
+using osu.Game.Input.Handlers;
+using osu.Game.Replays;
+using osu.Game.Rulesets.EmptyFreeform.Objects;
+using osu.Game.Rulesets.EmptyFreeform.Objects.Drawables;
+using osu.Game.Rulesets.EmptyFreeform.Replays;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.EmptyFreeform.UI
+{
+    [Cached]
+    public class DrawableEmptyFreeformRuleset : DrawableRuleset<EmptyFreeformHitObject>
+    {
+        public DrawableEmptyFreeformRuleset(EmptyFreeformRuleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
+            : base(ruleset, beatmap, mods)
+        {
+        }
+
+        protected override Playfield CreatePlayfield() => new EmptyFreeformPlayfield();
+
+        protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new EmptyFreeformFramedReplayInputHandler(replay);
+
+        public override DrawableHitObject<EmptyFreeformHitObject> CreateDrawableRepresentation(EmptyFreeformHitObject h) => new DrawableEmptyFreeformHitObject(h);
+
+        protected override PassThroughInputManager CreateInputManager() => new EmptyFreeformInputManager(Ruleset?.RulesetInfo);
+    }
+}
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/UI/EmptyFreeformPlayfield.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/UI/EmptyFreeformPlayfield.cs
new file mode 100644
index 0000000000..9df5935c45
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/UI/EmptyFreeformPlayfield.cs
@@ -0,0 +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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.EmptyFreeform.UI
+{
+    [Cached]
+    public class EmptyFreeformPlayfield : Playfield
+    {
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AddRangeInternal(new Drawable[]
+            {
+                HitObjectContainer,
+            });
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/osu.Game.Rulesets.EmptyFreeform.csproj b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/osu.Game.Rulesets.EmptyFreeform.csproj
new file mode 100644
index 0000000000..26349ed34f
--- /dev/null
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/osu.Game.Rulesets.EmptyFreeform.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup Label="Project">
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <AssemblyTitle>osu.Game.Rulesets.Sample</AssemblyTitle>
+    <OutputType>Library</OutputType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <RootNamespace>osu.Game.Rulesets.EmptyFreeform</RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\**" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="ppy.osu.Game" Version="2021.331.0" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-example/.editorconfig b/Templates/Rulesets/ruleset-example/.editorconfig
new file mode 100644
index 0000000000..24825b7c42
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/.editorconfig
@@ -0,0 +1,27 @@
+# EditorConfig is awesome: http://editorconfig.org
+root = true
+
+[*.cs]
+end_of_line = crlf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+#Roslyn naming styles
+
+#PascalCase for public and protected members
+dotnet_naming_style.pascalcase.capitalization = pascal_case
+dotnet_naming_symbols.public_members.applicable_accessibilities = public,internal,protected,protected_internal
+dotnet_naming_symbols.public_members.applicable_kinds = property,method,field,event,delegate
+dotnet_naming_rule.public_members_pascalcase.severity = suggestion
+dotnet_naming_rule.public_members_pascalcase.symbols = public_members
+dotnet_naming_rule.public_members_pascalcase.style = pascalcase
+
+#camelCase for private members
+dotnet_naming_style.camelcase.capitalization = camel_case
+dotnet_naming_symbols.private_members.applicable_accessibilities = private
+dotnet_naming_symbols.private_members.applicable_kinds = property,method,field,event,delegate
+dotnet_naming_rule.private_members_camelcase.severity = suggestion
+dotnet_naming_rule.private_members_camelcase.symbols = private_members
+dotnet_naming_rule.private_members_camelcase.style = camelcase
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-example/.gitignore b/Templates/Rulesets/ruleset-example/.gitignore
new file mode 100644
index 0000000000..940794e60f
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/.gitignore
@@ -0,0 +1,288 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+**/Properties/launchSettings.json
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# TODO: Comment the next line if you want to checkin your web deploy settings
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Typescript v1 declaration files
+typings/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+# CodeRush
+.cr/
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
diff --git a/Templates/Rulesets/ruleset-example/.template.config/template.json b/Templates/Rulesets/ruleset-example/.template.config/template.json
new file mode 100644
index 0000000000..5d2f6f1ebd
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/.template.config/template.json
@@ -0,0 +1,17 @@
+{
+    "$schema": "http://json.schemastore.org/template",
+    "author": "ppy Pty Ltd",
+    "classifications": [
+        "Console"
+    ],
+    "name": "osu! ruleset (pippidon example)",
+    "identity": "ppy.osu.Game.Templates.Rulesets.Pippidon",
+    "shortName": "ruleset-example",
+    "tags": {
+        "language": "C#",
+        "type": "project"
+    },
+    "sourceName": "Pippidon",
+    "preferNameDirectory": true
+}
+
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/launch.json b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/launch.json
new file mode 100644
index 0000000000..bd9db14259
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/launch.json
@@ -0,0 +1,31 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "VisualTests (Debug)",
+            "type": "coreclr",
+            "request": "launch",
+            "program": "dotnet",
+            "args": [
+                "${workspaceRoot}/bin/Debug/net5.0/osu.Game.Rulesets.Pippidon.Tests.dll"
+            ],
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Debug)",
+            "env": {},
+            "console": "internalConsole"
+        },
+        {
+            "name": "VisualTests (Release)",
+            "type": "coreclr",
+            "request": "launch",
+            "program": "dotnet",
+            "args": [
+                "${workspaceRoot}/bin/Release/net5.0/osu.Game.Rulesets.Pippidon.Tests.dll"
+            ],
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Release)",
+            "env": {},
+            "console": "internalConsole"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/tasks.json b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/tasks.json
new file mode 100644
index 0000000000..0ee07c1036
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/tasks.json
@@ -0,0 +1,47 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Build (Debug)",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "build",
+                "--no-restore",
+                "osu.Game.Rulesets.Pippidon.Tests.csproj",
+                "-p:GenerateFullPaths=true",
+                "-m",
+                "-verbosity:m"
+            ],
+            "group": "build",
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Build (Release)",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "build",
+                "--no-restore",
+                "osu.Game.Rulesets.Pippidon.Tests.csproj",
+                "-p:Configuration=Release",
+                "-p:GenerateFullPaths=true",
+                "-m",
+                "-verbosity:m"
+            ],
+            "group": "build",
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Restore",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "restore"
+            ],
+            "problemMatcher": []
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/TestSceneOsuGame.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/TestSceneOsuGame.cs
new file mode 100644
index 0000000000..270d906b01
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/TestSceneOsuGame.cs
@@ -0,0 +1,32 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Platform;
+using osu.Game.Tests.Visual;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Pippidon.Tests
+{
+    public class TestSceneOsuGame : OsuTestScene
+    {
+        [BackgroundDependencyLoader]
+        private void load(GameHost host, OsuGameBase gameBase)
+        {
+            OsuGame game = new OsuGame();
+            game.SetHost(host);
+
+            Children = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4.Black,
+                },
+                game
+            };
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/TestSceneOsuPlayer.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/TestSceneOsuPlayer.cs
new file mode 100644
index 0000000000..f00528900c
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/TestSceneOsuPlayer.cs
@@ -0,0 +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 NUnit.Framework;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Pippidon.Tests
+{
+    [TestFixture]
+    public class TestSceneOsuPlayer : PlayerTestScene
+    {
+        protected override Ruleset CreatePlayerRuleset() => new PippidonRuleset();
+    }
+}
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/VisualTestRunner.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/VisualTestRunner.cs
new file mode 100644
index 0000000000..fd6bd9b714
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/VisualTestRunner.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.
+
+using System;
+using osu.Framework;
+using osu.Framework.Platform;
+using osu.Game.Tests;
+
+namespace osu.Game.Rulesets.Pippidon.Tests
+{
+    public static class VisualTestRunner
+    {
+        [STAThread]
+        public static int Main(string[] args)
+        {
+            using (DesktopGameHost host = Host.GetSuitableHost(@"osu", true))
+            {
+                host.Run(new OsuTestBrowser());
+                return 0;
+            }
+        }
+    }
+}
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
new file mode 100644
index 0000000000..afa7b03536
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <StartupObject>osu.Game.Rulesets.Pippidon.Tests.VisualTestRunner</StartupObject>
+  </PropertyGroup>
+  <ItemGroup Label="Service">
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+  <PropertyGroup>
+    <GenerateProgramFile>false</GenerateProgramFile>
+  </PropertyGroup>
+  <ItemGroup Label="Package References">
+    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj" />
+  </ItemGroup>
+  <PropertyGroup Label="Project">
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <RootNamespace>osu.Game.Rulesets.Pippidon.Tests</RootNamespace>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.sln b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.sln
new file mode 100644
index 0000000000..bccffcd7ff
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.sln
@@ -0,0 +1,96 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29123.88
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Game.Rulesets.Pippidon", "osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj", "{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.Pippidon.Tests", "osu.Game.Rulesets.Pippidon.Tests\osu.Game.Rulesets.Pippidon.Tests.csproj", "{B4577C85-CB83-462A-BCE3-22FFEB16311D}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+		VisualTests|Any CPU = VisualTests|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.VisualTests|Any CPU.ActiveCfg = Release|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.VisualTests|Any CPU.Build.0 = Release|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.VisualTests|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.VisualTests|Any CPU.Build.0 = Debug|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {671B0BEC-2403-45B0-9357-2C97CC517668}
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		Policies = $0
+		$0.TextStylePolicy = $1
+		$1.EolMarker = Windows
+		$1.inheritsSet = VisualStudio
+		$1.inheritsScope = text/plain
+		$1.scope = text/x-csharp
+		$0.CSharpFormattingPolicy = $2
+		$2.IndentSwitchSection = True
+		$2.NewLinesForBracesInProperties = True
+		$2.NewLinesForBracesInAccessors = True
+		$2.NewLinesForBracesInAnonymousMethods = True
+		$2.NewLinesForBracesInControlBlocks = True
+		$2.NewLinesForBracesInAnonymousTypes = True
+		$2.NewLinesForBracesInObjectCollectionArrayInitializers = True
+		$2.NewLinesForBracesInLambdaExpressionBody = True
+		$2.NewLineForElse = True
+		$2.NewLineForCatch = True
+		$2.NewLineForFinally = True
+		$2.NewLineForMembersInObjectInit = True
+		$2.NewLineForMembersInAnonymousTypes = True
+		$2.NewLineForClausesInQuery = True
+		$2.SpacingAfterMethodDeclarationName = False
+		$2.SpaceAfterMethodCallName = False
+		$2.SpaceBeforeOpenSquareBracket = False
+		$2.inheritsSet = Mono
+		$2.inheritsScope = text/x-csharp
+		$2.scope = text/x-csharp
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		Policies = $0
+		$0.TextStylePolicy = $1
+		$1.EolMarker = Windows
+		$1.inheritsSet = VisualStudio
+		$1.inheritsScope = text/plain
+		$1.scope = text/x-csharp
+		$0.CSharpFormattingPolicy = $2
+		$2.IndentSwitchSection = True
+		$2.NewLinesForBracesInProperties = True
+		$2.NewLinesForBracesInAccessors = True
+		$2.NewLinesForBracesInAnonymousMethods = True
+		$2.NewLinesForBracesInControlBlocks = True
+		$2.NewLinesForBracesInAnonymousTypes = True
+		$2.NewLinesForBracesInObjectCollectionArrayInitializers = True
+		$2.NewLinesForBracesInLambdaExpressionBody = True
+		$2.NewLineForElse = True
+		$2.NewLineForCatch = True
+		$2.NewLineForFinally = True
+		$2.NewLineForMembersInObjectInit = True
+		$2.NewLineForMembersInAnonymousTypes = True
+		$2.NewLineForClausesInQuery = True
+		$2.SpacingAfterMethodDeclarationName = False
+		$2.SpaceAfterMethodCallName = False
+		$2.SpaceBeforeOpenSquareBracket = False
+		$2.inheritsSet = Mono
+		$2.inheritsScope = text/x-csharp
+		$2.scope = text/x-csharp
+	EndGlobalSection
+EndGlobal
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.sln.DotSettings b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.sln.DotSettings
new file mode 100644
index 0000000000..190a1046f5
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.sln.DotSettings
@@ -0,0 +1,877 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Efnt/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Emp3/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Epng/@EntryIndexedValue">True</s:Boolean>
+	<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/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/=ArrangeMissingParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeConstructorOrDestructorBody/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeLocalFunctionBody/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeMethodOrOperatorBody/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeModifiersOrder/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue"></s:String>
+	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexRemoved">True</s:Boolean>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeMemberModifiers/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeModifiers/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignedValueIsNeverUsed/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignNullToNotNullAttribute/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadAttributeBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadBracesSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadChildStatementIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadColonSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadCommaSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadControlBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadControlBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadDeclarationBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadDeclarationBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadPippidonScrollingBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadExpressionBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadExpressionBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadGenericBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadLinqLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadListLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadMemberAccessSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadNamespaceBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadParensLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadParensSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadPreprocessorIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSemicolonSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSpacesAfterKeyword/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSquareBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSwitchBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSymbolSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CanBeReplacedWithTryCastAndCheckForNull/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CheckForReferenceEqualityInstead_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CheckForReferenceEqualityInstead_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ClassNeverInstantiated_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ClassNeverInstantiated_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ClassWithVirtualMembersNeverInherited_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CollectionNeverQueried_002EGlobal/@EntryIndexedValue">SUGGESTION</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CollectionNeverQueried_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CommentTypo/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CompareOfFloatsByEqualityOperator/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertClosureToMethodGroup/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfDoToWhile/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToConditionalTernaryExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToNullCoalescingExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfToOrExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertNullableToShortForm/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertPropertyToExpressionBody/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoProperty/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToConstant_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLambdaExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLocalFunction/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToStaticClass/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=DoubleNegationOperator/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PippidonScrollingGeneralCatchClause/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EventNeverSubscribedTo_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EventNeverSubscribedTo_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ForCanBeConvertedToForeach/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=IdentifierTypo/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ImpureMethodCallOnReadonlyValueField/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InconsistentNaming/@EntryIndexedValue">ERROR</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=IncorrectBlankLinesNearBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InheritdocConsiderUsage/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InlineOutVariableDeclaration/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InvertIf/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InvokeAsExtensionMethod/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=JoinDeclarationAndInitializer/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=JoinNullCheckWithUsage/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBeMadeStatic_002ELocal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBePrivate_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBePrivate_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBeProtected_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeCastWithTypeCheck/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeConditionalExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeSequentialChecks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodSupportsCancellation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingBlankLines/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingLinebreak/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingSpace/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MoreSpecificForeachVariableTypeAvailable/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MultipleSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MultipleStatementsOnOneLine/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MultipleTypeMembersOnOneLine/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=NestedStringInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=NotAccessedField_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=OutdentIsOffPrevLevel/@EntryIndexedValue">WARNING</s:String>
+	<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/=PossibleInterfaceMemberAmbiguity/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PossibleMultipleEnumeration/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PrivateVariableCanBeMadeReadonly/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PublicConstructorInAbstractClass/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantArgumentDefaultValue/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantArrayCreationExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantAttributeParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantAttributeUsageProperty/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantBlankLines/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCaseLabel/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInAttributeList/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInEnumDeclaration/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInInitializer/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantPippidonScrollingObjectCreationArgumentList/@EntryIndexedValue">WARNING</s:String>
+	
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantExplicitParamsArrayCreation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantImmediateDelegateInvocation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLambdaSignatureParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLinebreak/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantSpace/@EntryIndexedValue">WARNING</s:String>
+	<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/=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>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveToList_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E3/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithLastOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithLastOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithLastOrDefault_002E3/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithLastOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002E3/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EAny_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EAny_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ECount_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ECount_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EFirst_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EFirst_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EFirstOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EFirstOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELast_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELast_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELastOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELastOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELongCount/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingle_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingle_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingleOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingleOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EWhere/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSimpleAssignment_002EFalse/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSimpleAssignment_002ETrue/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleAssignment_002EFalse/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleAssignment_002ETrue/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToAny/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToCount/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirst/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirstOrDefault/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToLast/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToLastOrDefault/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToSingle/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToSingleOrDefault/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E3/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SeparateControlTransferStatement/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringLiteralTypo/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FBuiltInTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FSimpleTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SwitchStatementMissingSomeCases/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TabsAndSpacesMismatch/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TabsAreDisallowed/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TabsOutsideIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TooWideLocalVariableScope/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TryCastAlwaysSucceeds/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnassignedField_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnnecessaryWhitespace/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedAutoPropertyAccessor_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMemberHierarchy_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMemberInSuper_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMember_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMember_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002ELocal/@EntryIndexedValue">HINT</s:String>
+	
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedParameter_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseCollectionCountProperty/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInFormatString/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNameofExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexedValue"></s:String>
+	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexRemoved">True</s:Boolean>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNullPropagation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseObjectOrCollectionInitializer/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UsePatternMatching/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseStringInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VariableCanBeMadeConst/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberCallInConstructor/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=WrongIndentSize/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Code_0020Cleanup_0020_0028peppy_0029/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Code Cleanup (peppy)"&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_EXPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;ALWAYS_EXPLICIT&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_EXPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="False" ArrangeTypeMemberAccessModifier="False" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="False" ArrangeBraces="False" ArrangeAttributes="False" ArrangeArgumentsStyle="False" /&gt;&lt;XAMLCollapsePippidonScrollingTags&gt;False&lt;/XAMLCollapsePippidonScrollingTags&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;/Profile&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeCleanup/RecentlyUsedProfile/@EntryValue">Code Cleanup (peppy)</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/LOCAL_FUNCTION_BODY/@EntryValue">ExpressionBody</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/METHOD_OR_OPERATOR_BODY/@EntryValue">ExpressionBody</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/USE_HEURISTICS_FOR_BODY_STYLE/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_LINQ_QUERY/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_CALLS_CHAIN/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_EXTENDS_LIST/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_FOR_STMT/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_PARAMETER/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTIPLE_DECLARATION/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTLINE_TYPE_PARAMETER_CONSTRAINS/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTLINE_TYPE_PARAMETER_LIST/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ANONYMOUS_METHOD_DECLARATION_BRACES/@EntryValue">NEXT_LINE</s:String>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BEFORE_BLOCK_STATEMENTS/@EntryValue">1</s:Int64>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BEFORE_CASE/@EntryValue">1</s:Int64>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INITIALIZER_BRACES/@EntryValue">NEXT_LINE</s:String>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_CODE/@EntryValue">1</s:Int64>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue">1</s:Int64>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/LINE_FEED_AT_FILE_END/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AROUND_MULTIPLICATIVE_OP/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_SIZEOF_PARENTHESES/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_TYPEOF_PARENTHESES/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHING_EMPTY_BRACES/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/STICK_COMMENT/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_ARRAY_INITIALIZER_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_BINARY_OPSIGN/@EntryValue">True</s:Boolean>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">200</s:Int64>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_OBJECT_AND_COLLECTION_INITIALIZER_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/EncapsulateField/MakeFieldPrivate/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/EncapsulateField/UseAutoProperty/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AABB/@EntryIndexedValue">AABB</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=API/@EntryIndexedValue">API</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BPM/@EntryIndexedValue">BPM</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GC/@EntryIndexedValue">GC</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GL/@EntryIndexedValue">GL</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GLSL/@EntryIndexedValue">GLSL</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HID/@EntryIndexedValue">HID</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HUD/@EntryIndexedValue">HUD</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IL/@EntryIndexedValue">IL</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IPC/@EntryIndexedValue">IPC</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JIT/@EntryIndexedValue">JIT</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LTRB/@EntryIndexedValue">LTRB</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MD/@EntryIndexedValue">MD5</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NS/@EntryIndexedValue">NS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=OS/@EntryIndexedValue">OS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PM/@EntryIndexedValue">PM</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RGB/@EntryIndexedValue">RGB</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RNG/@EntryIndexedValue">RNG</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SHA/@EntryIndexedValue">SHA</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SRGB/@EntryIndexedValue">SRGB</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TK/@EntryIndexedValue">TK</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SS/@EntryIndexedValue">SS</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PP/@EntryIndexedValue">PP</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GMT/@EntryIndexedValue">GMT</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=QAT/@EntryIndexedValue">QAT</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BNG/@EntryIndexedValue">BNG</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UI/@EntryIndexedValue">UI</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpNaming/ApplyAutoDetectedRules/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeStyle/CSharpFileLayoutPatterns/Pattern/@EntryValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&#xD;
+&lt;Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"&gt;&#xD;
+  &lt;TypePattern DisplayName="COM interfaces or structs"&gt;&#xD;
+    &lt;TypePattern.Match&gt;&#xD;
+      &lt;Or&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="Interface" /&gt;&#xD;
+          &lt;Or&gt;&#xD;
+            &lt;HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /&gt;&#xD;
+            &lt;HasAttribute Name="System.Runtime.InteropServices.ComImport" /&gt;&#xD;
+          &lt;/Or&gt;&#xD;
+        &lt;/And&gt;&#xD;
+        &lt;Kind Is="Struct" /&gt;&#xD;
+      &lt;/Or&gt;&#xD;
+    &lt;/TypePattern.Match&gt;&#xD;
+  &lt;/TypePattern&gt;&#xD;
+  &lt;TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"&gt;&#xD;
+    &lt;TypePattern.Match&gt;&#xD;
+      &lt;And&gt;&#xD;
+        &lt;Kind Is="Class" /&gt;&#xD;
+        &lt;HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /&gt;&#xD;
+      &lt;/And&gt;&#xD;
+    &lt;/TypePattern.Match&gt;&#xD;
+    &lt;Entry DisplayName="Setup/Teardown Methods"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="Method" /&gt;&#xD;
+          &lt;Or&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="True" /&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="True" /&gt;&#xD;
+          &lt;/Or&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+    &lt;Entry DisplayName="All other members" /&gt;&#xD;
+    &lt;Entry Priority="100" DisplayName="Test Methods"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="Method" /&gt;&#xD;
+          &lt;HasAttribute Name="NUnit.Framework.TestAttribute" /&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+      &lt;Entry.SortBy&gt;&#xD;
+        &lt;Name /&gt;&#xD;
+      &lt;/Entry.SortBy&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+  &lt;/TypePattern&gt;&#xD;
+  &lt;TypePattern DisplayName="Default Pattern"&gt;&#xD;
+    &lt;Group DisplayName="Fields/Properties"&gt;&#xD;
+      &lt;Group DisplayName="Public Fields"&gt;&#xD;
+        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Kind Is="Constant" /&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+                &lt;And&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/And&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Or&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/Or&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Entry DisplayName="Public Properties"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Access Is="Public" /&gt;&#xD;
+            &lt;Kind Is="Property" /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+      &lt;Group DisplayName="Internal Fields"&gt;&#xD;
+        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Kind Is="Constant" /&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+                &lt;And&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/And&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Or&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/Or&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Entry DisplayName="Internal Properties"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Access Is="Internal" /&gt;&#xD;
+            &lt;Kind Is="Property" /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+      &lt;Group DisplayName="Protected Fields"&gt;&#xD;
+        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Kind Is="Constant" /&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+                &lt;And&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/And&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Or&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/Or&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Entry DisplayName="Protected Properties"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Access Is="Protected" /&gt;&#xD;
+            &lt;Kind Is="Property" /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+      &lt;Group DisplayName="Private Fields"&gt;&#xD;
+        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Kind Is="Constant" /&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+                &lt;And&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/And&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Or&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/Or&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Entry DisplayName="Private Properties"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Access Is="Private" /&gt;&#xD;
+            &lt;Kind Is="Property" /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+    &lt;/Group&gt;&#xD;
+    &lt;Group DisplayName="Constructor/Destructor"&gt;&#xD;
+      &lt;Entry DisplayName="Ctor"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;Kind Is="Constructor" /&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+      &lt;Region Name="Disposal"&gt;&#xD;
+        &lt;Entry DisplayName="Dtor"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;Kind Is="Destructor" /&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Dispose()"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+              &lt;Name Is="Dispose" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Dispose(true)"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Virtual /&gt;&#xD;
+                &lt;Override /&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+              &lt;Name Is="Dispose" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Region&gt;&#xD;
+    &lt;/Group&gt;&#xD;
+    &lt;Group DisplayName="Methods"&gt;&#xD;
+      &lt;Group DisplayName="Public"&gt;&#xD;
+        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Static /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Group DisplayName="Internal"&gt;&#xD;
+        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Static /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Group DisplayName="Protected"&gt;&#xD;
+        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Static /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Group DisplayName="Private"&gt;&#xD;
+        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Static /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+    &lt;/Group&gt;&#xD;
+  &lt;/TypePattern&gt;&#xD;
+&lt;/Patterns&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">Copyright (c) ppy Pty Ltd &lt;contact@ppy.sh&gt;. Licensed under the MIT Licence.&#xD;
+See the LICENCE file in the repository root for full licence text.&#xD;
+</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Constants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">&lt;Policy Inspect="False" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=LocalConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=LocalFunctions/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb"&gt;&lt;ExtraRule Prefix="_" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=StaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=TypeParameters/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=9d1af99b_002Dbefe_002D48a4_002D9eb3_002D661384e29869/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Private" Description="private methods"&gt;&lt;ElementKinds&gt;&lt;Kind Name="ASYNC_METHOD" /&gt;&lt;Kind Name="METHOD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=9ffbe43b_002Dc610_002D411b_002D9839_002D1416a146d9b0/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Protected, ProtectedInternal, Internal, Public" Description="internal/protected/public methods"&gt;&lt;ElementKinds&gt;&lt;Kind Name="ASYNC_METHOD" /&gt;&lt;Kind Name="METHOD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=a4c2df6c_002Db202_002D48d5_002Db077_002De678cb548c25/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Private" Description="private properties"&gt;&lt;ElementKinds&gt;&lt;Kind Name="PROPERTY" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=fd562728_002Dc23d_002D417f_002Da19f_002D9d854247fbea/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Protected, ProtectedInternal, Internal, Public" Description="internal/protected/public properties"&gt;&lt;ElementKinds&gt;&lt;Kind Name="PROPERTY" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FCONSTANT/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FCLASS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FCONSTRUCTOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FGLOBAL_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLABEL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLOCAL_005FCONSTRUCTOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLOCAL_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FOBJECT_005FPROPERTY_005FOF_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FPARAMETER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FCLASS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FENUM/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FENUM_005FMEMBER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FINTERFACE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="I" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMIXED_005FENUM/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE_005FEXPORTED/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE_005FLOCAL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FTYPE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FTYPE_005FPARAMETER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="T" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FHTML_005FCONTROL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FTAG_005FNAME/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FTAG_005FPREFIX/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=NAMESPACE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Description/@EntryValue">o!f – Object Initializer: Anchor&amp;Origin</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Field/=anchor/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Field/=anchor/Expression/@EntryValue">constant("Centre")</s:String>
+	<s:Int64 x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Field/=anchor/Order/@EntryValue">0</s:Int64>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Shortcut/@EntryValue">ofao</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Text/@EntryValue">Anchor = Anchor.$anchor$,
+Origin = Anchor.$anchor$,</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Description/@EntryValue">o!f – InternalChildren = []</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Shortcut/@EntryValue">ofic</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Text/@EntryValue">InternalChildren = new Drawable[]
+{
+    $END$
+};</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Description/@EntryValue">o!f – new GridContainer { .. }</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Shortcut/@EntryValue">ofgc</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Text/@EntryValue">new GridContainer
+{
+    RelativeSizeAxes = Axes.Both,
+    Content = new[]
+    {
+        new Drawable[] { $END$ },
+        new Drawable[] { }
+    }
+};</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Description/@EntryValue">o!f – new FillFlowContainer { .. }</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Shortcut/@EntryValue">offf</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Text/@EntryValue">new FillFlowContainer
+{
+    RelativeSizeAxes = Axes.Both,
+    Direction = FillDirection.Vertical,
+    Children = new Drawable[]
+    {
+        $END$
+    }
+},</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Description/@EntryValue">o!f – new Container { .. }</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Shortcut/@EntryValue">ofcont</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Text/@EntryValue">new Container
+{
+    RelativeSizeAxes = Axes.Both,
+    Children = new Drawable[]
+    {
+        $END$
+    }
+},</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Description/@EntryValue">o!f – BackgroundDependencyLoader load()</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Shortcut/@EntryValue">ofbdl</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Text/@EntryValue">[BackgroundDependencyLoader]
+private void load()
+{
+    $END$
+}</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Description/@EntryValue">o!f – new Box { .. }</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Shortcut/@EntryValue">ofbox</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Text/@EntryValue">new Box
+{
+    Colour = Color4.Black,
+    RelativeSizeAxes = Axes.Both,
+},</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Description/@EntryValue">o!f – Children = []</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Shortcut/@EntryValue">ofc</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Text/@EntryValue">Children = new Drawable[]
+{
+    $END$
+};</s:String>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Beatmap/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=beatmaps/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=beatmap_0027s/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=bindable/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Catmull/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Drawables/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=gameplay/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=hitobjects/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=keymods/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Kiai/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboard/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboards/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Playfield/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=resampler/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=ruleset/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=rulesets/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Taiko/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Unranked/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Beatmaps/PippidonBeatmapConverter.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Beatmaps/PippidonBeatmapConverter.cs
new file mode 100644
index 0000000000..a2a4784603
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Beatmaps/PippidonBeatmapConverter.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.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Pippidon.Objects;
+using osuTK;
+
+namespace osu.Game.Rulesets.Pippidon.Beatmaps
+{
+    public class PippidonBeatmapConverter : BeatmapConverter<PippidonHitObject>
+    {
+        public PippidonBeatmapConverter(IBeatmap beatmap, Ruleset ruleset)
+            : base(beatmap, ruleset)
+        {
+        }
+
+        public override bool CanConvert() => Beatmap.HitObjects.All(h => h is IHasPosition);
+
+        protected override IEnumerable<PippidonHitObject> ConvertHitObject(HitObject original, IBeatmap beatmap, CancellationToken cancellationToken)
+        {
+            yield return new PippidonHitObject
+            {
+                Samples = original.Samples,
+                StartTime = original.StartTime,
+                Position = (original as IHasPosition)?.Position ?? Vector2.Zero,
+            };
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Mods/PippidonModAutoplay.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Mods/PippidonModAutoplay.cs
new file mode 100644
index 0000000000..8ea334c99c
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Mods/PippidonModAutoplay.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 System.Collections.Generic;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Pippidon.Objects;
+using osu.Game.Rulesets.Pippidon.Replays;
+using osu.Game.Scoring;
+using osu.Game.Users;
+
+namespace osu.Game.Rulesets.Pippidon.Mods
+{
+    public class PippidonModAutoplay : ModAutoplay<PippidonHitObject>
+    {
+        public override Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => new Score
+        {
+            ScoreInfo = new ScoreInfo
+            {
+                User = new User { Username = "sample" },
+            },
+            Replay = new PippidonAutoGenerator(beatmap).Generate(),
+        };
+    }
+}
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Objects/Drawables/DrawablePippidonHitObject.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Objects/Drawables/DrawablePippidonHitObject.cs
new file mode 100644
index 0000000000..399d6adda2
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Objects/Drawables/DrawablePippidonHitObject.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 System.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Audio;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Scoring;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Pippidon.Objects.Drawables
+{
+    public class DrawablePippidonHitObject : DrawableHitObject<PippidonHitObject>
+    {
+        private const double time_preempt = 600;
+        private const double time_fadein = 400;
+
+        public override bool HandlePositionalInput => true;
+
+        public DrawablePippidonHitObject(PippidonHitObject hitObject)
+            : base(hitObject)
+        {
+            Size = new Vector2(80);
+
+            Origin = Anchor.Centre;
+            Position = hitObject.Position;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures)
+        {
+            AddInternal(new Sprite
+            {
+                RelativeSizeAxes = Axes.Both,
+                Texture = textures.Get("coin"),
+            });
+        }
+
+        public override IEnumerable<HitSampleInfo> GetSamples() => new[]
+        {
+            new HitSampleInfo(HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK)
+        };
+
+        protected override void CheckForResult(bool userTriggered, double timeOffset)
+        {
+            if (timeOffset >= 0)
+                ApplyResult(r => r.Type = IsHovered ? HitResult.Perfect : HitResult.Miss);
+        }
+
+        protected override double InitialLifetimeOffset => time_preempt;
+
+        protected override void UpdateInitialTransforms() => this.FadeInFromZero(time_fadein);
+
+        protected override void UpdateHitStateTransforms(ArmedState state)
+        {
+            switch (state)
+            {
+                case ArmedState.Hit:
+                    this.ScaleTo(5, 1500, Easing.OutQuint).FadeOut(1500, Easing.OutQuint).Expire();
+                    break;
+
+                case ArmedState.Miss:
+                    const double duration = 1000;
+
+                    this.ScaleTo(0.8f, duration, Easing.OutQuint);
+                    this.MoveToOffset(new Vector2(0, 10), duration, Easing.In);
+                    this.FadeColour(Color4.Red.Opacity(0.5f), duration / 2, Easing.OutQuint).Then().FadeOut(duration / 2, Easing.InQuint).Expire();
+                    break;
+            }
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Objects/PippidonHitObject.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Objects/PippidonHitObject.cs
new file mode 100644
index 0000000000..0c22554e82
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Objects/PippidonHitObject.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.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osuTK;
+
+namespace osu.Game.Rulesets.Pippidon.Objects
+{
+    public class PippidonHitObject : HitObject, IHasPosition
+    {
+        public override Judgement CreateJudgement() => new Judgement();
+
+        public Vector2 Position { get; set; }
+
+        public float X => Position.X;
+        public float Y => Position.Y;
+    }
+}
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/PippidonDifficultyCalculator.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/PippidonDifficultyCalculator.cs
new file mode 100644
index 0000000000..f6340f6c25
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/PippidonDifficultyCalculator.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.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Difficulty;
+using osu.Game.Rulesets.Difficulty.Preprocessing;
+using osu.Game.Rulesets.Difficulty.Skills;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Pippidon
+{
+    public class PippidonDifficultyCalculator : DifficultyCalculator
+    {
+        public PippidonDifficultyCalculator(Ruleset ruleset, WorkingBeatmap beatmap)
+            : base(ruleset, beatmap)
+        {
+        }
+
+        protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills, double clockRate)
+        {
+            return new DifficultyAttributes(mods, skills, 0);
+        }
+
+        protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate) => Enumerable.Empty<DifficultyHitObject>();
+
+        protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods) => new Skill[0];
+    }
+}
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/PippidonInputManager.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/PippidonInputManager.cs
new file mode 100644
index 0000000000..aa7fa3188b
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/PippidonInputManager.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.ComponentModel;
+using osu.Framework.Input.Bindings;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.Pippidon
+{
+    public class PippidonInputManager : RulesetInputManager<PippidonAction>
+    {
+        public PippidonInputManager(RulesetInfo ruleset)
+            : base(ruleset, 0, SimultaneousBindingMode.Unique)
+        {
+        }
+    }
+
+    public enum PippidonAction
+    {
+        [Description("Button 1")]
+        Button1,
+
+        [Description("Button 2")]
+        Button2,
+    }
+}
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/PippidonRuleset.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/PippidonRuleset.cs
new file mode 100644
index 0000000000..89fed791cd
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/PippidonRuleset.cs
@@ -0,0 +1,57 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.Input.Bindings;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Difficulty;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Pippidon.Beatmaps;
+using osu.Game.Rulesets.Pippidon.Mods;
+using osu.Game.Rulesets.Pippidon.UI;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.Pippidon
+{
+    public class PippidonRuleset : Ruleset
+    {
+        public override string Description => "gather the osu!coins";
+
+        public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) =>
+            new DrawablePippidonRuleset(this, beatmap, mods);
+
+        public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) =>
+            new PippidonBeatmapConverter(beatmap, this);
+
+        public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) =>
+            new PippidonDifficultyCalculator(this, beatmap);
+
+        public override IEnumerable<Mod> GetModsFor(ModType type)
+        {
+            switch (type)
+            {
+                case ModType.Automation:
+                    return new[] { new PippidonModAutoplay() };
+
+                default:
+                    return new Mod[] { null };
+            }
+        }
+
+        public override string ShortName => "pippidon";
+
+        public override IEnumerable<KeyBinding> GetDefaultKeyBindings(int variant = 0) => new[]
+        {
+            new KeyBinding(InputKey.Z, PippidonAction.Button1),
+            new KeyBinding(InputKey.X, PippidonAction.Button2),
+        };
+
+        public override Drawable CreateIcon() => new Sprite
+        {
+            Texture = new TextureStore(new TextureLoaderStore(CreateResourceStore()), false).Get("Textures/coin"),
+        };
+    }
+}
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs
new file mode 100644
index 0000000000..9c54b82e38
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs
@@ -0,0 +1,41 @@
+// Copyright (c) ppy 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.Replays;
+using osu.Game.Rulesets.Pippidon.Objects;
+using osu.Game.Rulesets.Replays;
+
+namespace osu.Game.Rulesets.Pippidon.Replays
+{
+    public class PippidonAutoGenerator : AutoGenerator
+    {
+        protected Replay Replay;
+        protected List<ReplayFrame> Frames => Replay.Frames;
+
+        public new Beatmap<PippidonHitObject> Beatmap => (Beatmap<PippidonHitObject>)base.Beatmap;
+
+        public PippidonAutoGenerator(IBeatmap beatmap)
+            : base(beatmap)
+        {
+            Replay = new Replay();
+        }
+
+        public override Replay Generate()
+        {
+            Frames.Add(new PippidonReplayFrame());
+
+            foreach (PippidonHitObject hitObject in Beatmap.HitObjects)
+            {
+                Frames.Add(new PippidonReplayFrame
+                {
+                    Time = hitObject.StartTime,
+                    Position = hitObject.Position,
+                });
+            }
+
+            return Replay;
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonFramedReplayInputHandler.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonFramedReplayInputHandler.cs
new file mode 100644
index 0000000000..18efa6b885
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonFramedReplayInputHandler.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.Generic;
+using System.Diagnostics;
+using osu.Framework.Input.StateChanges;
+using osu.Framework.Utils;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Replays;
+using osuTK;
+
+namespace osu.Game.Rulesets.Pippidon.Replays
+{
+    public class PippidonFramedReplayInputHandler : FramedReplayInputHandler<PippidonReplayFrame>
+    {
+        public PippidonFramedReplayInputHandler(Replay replay)
+            : base(replay)
+        {
+        }
+
+        protected override bool IsImportant(PippidonReplayFrame frame) => true;
+
+        protected Vector2 Position
+        {
+            get
+            {
+                var frame = CurrentFrame;
+
+                if (frame == null)
+                    return Vector2.Zero;
+
+                Debug.Assert(CurrentTime != null);
+
+                return NextFrame != null ? Interpolation.ValueAt(CurrentTime.Value, frame.Position, NextFrame.Position, frame.Time, NextFrame.Time) : frame.Position;
+            }
+        }
+
+        public override void CollectPendingInputs(List<IInput> inputs)
+        {
+            inputs.Add(new MousePositionAbsoluteInput
+            {
+                Position = GamefieldToScreenSpace(Position)
+            });
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonReplayFrame.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonReplayFrame.cs
new file mode 100644
index 0000000000..949ca160be
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonReplayFrame.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.Replays;
+using osuTK;
+
+namespace osu.Game.Rulesets.Pippidon.Replays
+{
+    public class PippidonReplayFrame : ReplayFrame
+    {
+        public Vector2 Position;
+    }
+}
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Resources/Samples/Gameplay/normal-hitnormal.mp3 b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Resources/Samples/Gameplay/normal-hitnormal.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..90b13d1f734a4020945bed6706f6a86228b87938
GIT binary patch
literal 8022
zcmeHsc{r5q+y6bQ88aA6%%BV*yRl_S8OAcCjHN6ovb8=@<k8}pdn_@QY?UQtNJ4rd
z!qYZmNkXE1Q7A=HM9R|4^^U&B_jr%@{r7#3-|vs#?{gg2b#KSaecspSJkRTMUYDDb
zISN_^%h$)pS#qRHnuo(CXPUWL=$_aZT3p1Tm_1PkXy(Q?HpZ4T-QBUV(Y7Wg`*;2k
zVH^`_d>|rL&)36wv*cH3NwYAs082R?lC%E`w*!$;k~?yerT{_eXh?P$YQLes4C~);
zUB;H*2wTR%-+-5K@;6F;qh=W`zj1FFPk-b6GQRx=Scc?Xw##3#Z22L?gMS-DhP5!|
zjt~Sd+fmGlU-<Wf|5uLxB1qcn;E_gCi0tk>VPakf?XfOKyxCqo{#61jlqMMqUmKhw
zsYo`agh(8V)4+=z6*ZQJ3T=<F>6=Vm14Ntu#4$_8IFgb6HD>eBr$1Q(hcz4nImv4l
zQz3}NSRPMz%~l9gkv;^5b8?#(7LD~D3{Icfl&pqmYEhYv_q&Cb-q(%n=~UCd=)Ql1
zgHN*0wDmcP>=7JFEj?5lajH&3#R@#t*dP*X>9~+p5f<b7@}9cZY#6-dvFlKFflYSb
zqX!#0xI;hYdda0?!Rg23yD5eFx3k8-s{2+MYy#hE@06vcY!m(R1BR9|3=O#4!MCxc
zU13V_?H&L9+|VSZZ+1%iP%W7J`{#i_8|zQ!X_<X}G?P-s5nr7xX5Q59nMn$L1(trU
zyCzh%y8bI^KgVd|RwWV*x7+q5<h-AY8tV4Fx$JD>&Z)08IIB00u3edxefc(mp}u^#
z`OasSa^FNz?QFq@=U-a=c&QEuqZhGQwSDIA<3DdE<dyuR-{#)kM(bgSEtB#P7O-^@
zS`94abtu9s-pOqFwFoKNIgH;v={4gtun_zDoN)ouS^k@?xt3FwzB{u-wfuR&;(+c4
zjXtynRDUh^h|;D<hb`UYF07rb2oEttpL6DU<r)`wDyPI7%}YtMM-!9rPrSgBDBudp
zdC_X<b1vQ&&shY0LJ(N4r5_Z~c|MvZi#poEp{zVGxsmhq%T%{!)7p(obGd7P=W9_|
z^cjO)yQ9&^`blV$gu!6!)tY~{Ia+3Ru!+$bolc+jO=u(|s;9q2ZZXeijJEex<DfJH
zP%d;aO>7+6rVVZ0rR(Qe0NzY}RuS~|r7)7&&3&E9k-)D+OVm&XL9Mz*2m`A5$CMeI
z0h<IN&dM?19Mlm_{58=Zk5xT?jR;D=pDFM1V9UvR2WCn&Z5Wp`?vaP;@-cn+=SahH
zcD+G6t~k7fE}@-uN<VKrm8`h2bYjiXOp(lenBwi5pzau#7Q}pGd@VI!TwtvfxH?kT
zcMBU4z`#K(6JlGNXESPE<X2Q7xA>?iGHWY@mhUU!S24534b?Ij{cKBh(F*9($RS0E
zN91*=LV;L0`>~m<$Cj;Q3Ehw4YmOB?S&1Crh$X~NU*bR&irZnT-L<>}i2CZqFi!RL
zj1l`gp{CnQTG|^41fn527*VEgcK1mxv+6lp?Ems?<@&XUjVq`<jvRD!ibqxP9ux1q
zJ*^i@Ki(Sgtj(GARn$S;2noqNmFxY$?s8Q&G4p(br|MK~#$oCk1vKL6y~?<?vkhA5
z3|+(5#dD;$*Yw7&Q(;_46d}jjjt&{ZgdyOtMiQ)_xA4pr*t&JqqMem8x7EL6ua-Cc
zGj@unJGdh~@$CA$3tyWioP^nmLc(Rn!;vzFT*r|O4sHiHc^7V0FFG18aJ8#ln6d14
zaS$nl=-1xJI%^)on+dnZj{Or}cs)Gzv~TQRxXWmK>iv#qzHzm+PYLzwO}qpi+e)py
zW@CGC@q7E_V)b4A=4N}@|HC&7Z=9pdUNCKt`S@&yw~m7dMUPLv=w&oId)jL?gJx#e
z{LJ`3+4EahD?_j>77~uwQ(PPkMG2iCNNCx+%V}pZd}51BvBjatOW!&Ruu|s5-_*iR
zEHk74Q_st6{~F=>D9OI|cD`rZk!PPP6;YJ=l2FF_W8OULk;K<}-2EhPMOEC3_a*CM
zY@rF6lD<bCIN4BSYDq5!W3`=V{UrKGyHVZYNYYEOdg(~-!mSB!{S4mLx3lfoj~Mbj
znO*JjNAn9Ge{ef`?sWhCS+#cZ_f>MNyKEK1W5AEmg5(bnOMz%j`mp0MFlX6+cg5Xn
zF2SG^+4^;7>37aA_%DvAe~XLAGXci|?v$|IA&rjxeZ4hEy}?nBb%r0dBAmGA$X5b3
zs^I(|-pr?LfAEYX4hy_J^1L*VFfX<fPn8yY7(7yNuoIvDB+IAWg8d}mM@Y9yaE=?M
z2cy3N@A2wpK(h8vR}BXXs}*mIG8^s{#g3j+(vBP{SIP}%B&O~0k8o?#O1F12`(!2)
ziy)|Byl(`9#ay4O;By2OzdIzf>;eFD0Ei@ZgE9aX()aZ|D5SgnX{sRIy1{1?)A+La
zK_F0ib2=SfEsHlZP1`fzuR*GM2up9a%%tjY%m02c1U{k~N#=-J^hEFi4=I;yxXh3y
zwBj^y{_?2tv7<0@{mEz2X+%nhDO%WFiP|0>2GieRGo_?`Uq-ys4Fu1w&1m;`G1Bh1
znS-VB+-f^xHeL6HOt&JTch_C4Q!W6;*qLKMJg%Baa=J~a=-voG5%0dl@<MqUMd?f_
z03~uy<-o6hY-LUrb#(aX!Y9UQ&{=i2DEwdE)yD^$^5gvX22-RD#x!<&wcs1DKf?0c
z^M=;d*962~e{2t`GBs(i0zpOk@1dElJH$Yxc!(<`TSD)nsZ~hz5K|2zb{@eH*5`bi
zUzhTfGr5NyHtg?vU<mLdJ!Jh4K_U5RsvVgKVf1|4Tjrn@6C}7YbqJN=0`TmD8GI?Z
z3l43-T}`<nuNb~vAR?y}qtLA%UW3Ixa+?O-qOgQsFTd8=1dPl2Q*P1L^?Npp8xSii
z8BnideO*G$x|)o`G-VwkL=GF4&UX5h{wp%#cEMP>qHh(2n&)H7R(PnQP-xFwX(q>m
zJbTYi)||e{D-cKTTd4%apwGmK&ilv<1Lsqa1HyI(zL}nu3~8AmJ(&6xWj^_%&L@Kr
zzHs1qZZYu=R>2GL97D4}D+QovNL#Jfz>dBtmCdk$7+x}F!Js@($H~HlK{<?aCZRr<
zNKw>%!h^x2pOjR_A7Bw*tlSxbaG>q;f&zu(wiki;Lb)!UyV(SYEO0GY6x`ZTcBmkC
zBM^1->tmDSfVkdKYbz8{H)J>BXP!uts0y@pQ$zKQUS1yBrtLn_1B-;MDF?HlqsLdl
z{H-$RJvlShMRE&KplZGn1rs<+Hq~bCgz0-&hsTJEs~H3mL#<%)_FuF^DQ~AFxf+N{
zuCWLB@BS1lUw|t!gQK#K2|soUgAVZnkt+}|$rq9v<R9J$>?V03T5@Qv^9mCQXBW9M
zlxc`29PXxFqmdQT<`eTftF3@Xi>fs>NNvqb`EJhlesdjckTFb&Rl>eyr&KEU2ZJZ+
z&Js6{{1#uDwd0~dd@YBD$YIYjUMGgUa__vn1$X17L?M$P+3N~lvz{fclW{3MJ*kGM
zBu1$1_l7DMnPsxKHYcXIJ_K{>^2-b<!77>vz4pc0?lJohzc^cp9Gt<To-(WIgR~Q!
zPCzj_?D*>!Mu|!gH7`CuBl?|3HrQO4i6EUC0HQ~>Z1vD&bSsUrh@!6%(s3$$C3y@o
zT;m64uIApo-Ry2h^(f$AHlj>r2!=!2a?}oDQAm1gIQxwpsNluZ)2I;HV$)ghnbCU!
ze+xnm>nmZ9%*NWi`JBZw-ZEsOog+=pxbGP7N(=mkB_?Cf8m3vF!yAZx=|Dt3G=#eB
zZM@;$Re#gEmaSFizYo)`@WZid<e}FVsUHp-H~B<?4OG)1;N^6fU}4D$jFv$&D92ao
zQZh%S9wU;H9ED7&X;2_oDvd}PHt`jJigcF>mOCwECPeMj1|l+j{&;Ad@kMawLRp)v
z);j=h=yafwPQrcP;t!T3r0E?Y3&a=71`$vL27s3|H44g7K8cbO=9>#duFg0tR=z;d
zk0Z`G<u+i)J;_6pwdG!1`4hr!g&<vlbWu#8XqGb@g(4hyKBg8+rmvSVXR#>?h`I5p
z&QAtSibJAhhLmCd1Yk6^^>l`!Fv6O%r7*HJA19d%s5xy#G+N<W915S*)(>@DCfVb<
zu&7WRk>7K|K@$(YSEW;wFlVj6I5i(-tjr*)B%qQ{LAtA`#|>kx+hf(i8~Hw|b=oh1
zXg9S0M@fcM)#Tp7*WkB!^S&VvD`kf@k=s=YzW1AC@+sc5-Pg0i$hkmVj9P_#Qa5Gc
z*$j57Dz=JI>dD1g3UV+@5?hClRu2U@S?TuC+l3G=<fMmAO-QmdvT=Oh^kC?@^XI|m
zgSD%yz>-#YfI89~2@C0)8)Y?*LOGP<D7xX!CSDTwZfG#fkAEY{VIG;R=)Ob}M3FDX
zeqD!(akVC(5DYy9%Q&#BcGv@p;G--#;>iQPDvS_*i`q0<7LO60Ja|~k8+_6XR~{v@
zWz}>ZNbEPKA(j$pX{sKD%13rD*@MaBaf#Yp9UHm>1xq?=ZJMjt^jA1;p^?mu2bK^-
zgNPTuUzzPxU$A_Ugu+5Qxz(k`%tSs8^K5m2>KUJApCM5Uty|(Pym;<1LsZ!RAkb@*
z#LyRE#PJ<Z3uRen6MGnGG@?ck>Z}SxLE1Qb70a;oO+ft^dxxf?3HTA?csyEaGnPg`
zOrSz^4GBSnU#1@kexkkQITa4_wA?r_XDF<+Mfo7H40@uW@o^=LoOYOB6!7ve;!{}q
z&We8Evsd9bx?T7Og06%-sTuoH87#VJ9zd-=;gUPW5k(@JPbb5~+CQj}@Wt&$HU#xk
z4_#S#;P_0}Ey7mo-VTOW;*Fwr<p=k_Y6m7~w!xm9xw<7;ykyECJwh9np&geXwv#EH
zQnW*AS{lh6h|+lPZ;8~rD$df-z(805sNN+VW=*k^(uePz$hm{;!f+i9_G}*d`6Si~
zdaZ~7;>5`0`4(um5*FZ*Lav*l4(l@b+L2=zs^Mu5epqS3$dxG7BIZZUi=*B^v<uxx
zr0D2u`2wnX8BS7$#6CNv*}iQxH{<DU&GKl}wpWWgbOq5T3{STV=GAbw`Zr9@sa~r8
z%ljB8Jnb0L8ggGUS(AIvEf<k5xtZv~vj~?;-UL`?hz83pfK8)&Gaumu<G=p!DqfUC
zIQl0L<r#BHuvt)4QNa)pmk$9DAk3lD6J_P}tbi!uq2xN+-4lQb4FM3vmj)Pr{WL6m
zGw8&S>DJ9|ERenW>=oY{y|(u8BX_9!yY=<$e$7Wk`9q@gGR=2!!63%bBaSy}#Ftxz
z#d8ZS3{g@Wc{jCy=;1S!R`eE0Bw@aFA!0-RWZ?(7nLHmL4xmZQC?X=A+&@W_2Pqf;
zuXrWoF#w(!uL0mG%Pz{j=H@QCYm__^b?BA$KxPDBe^y`>2l%v|>{!{6=sj`b*O$vu
zf<+Abq0{bcP{5*JW0F#MP+dR9Ka_L^!H?Y7AOL5*Wa~6#{{Z6al#_f$qf9+gI;VfV
z<YP4e_$*t8Sz~En1;k}vB(-@q;qqDl=3AqHNTt0Z1Yh@r0YMU9I#6`;(^d=dqwZ2)
zN4o7lmUUW8|6^+P-DOiC)MCHH`<%KyW~4cg4n!yNcaq_iYAVuDY9d#~;6oJnIC9Az
z{0uu39WKPtuwPNj4DE&F27v2(2}7CoA8r{xE#ihi$%#!G6T#p!nHJ!73C!t)Y|5ac
zQ-ytD{2>hdMgVGu&%ncobOCtG;KB?NisfW+e+37W+rsU`W(|@P<Iw5rh)m~->FXP-
zCBtTORbBz*|L);m2Trc;j`k^n8tX4btV&szAw2ix%a(5IKyZ!6^g4$n?gCE&)KR1U
zOafd6S%hvvOQC~!7Nme|P(P7mPnawPb5)-h`;uJY(Cm{A)^uJR0D3Z30DQtZq7?C(
zhb3wR(KZA`$QS<AQvmpna=`apOup^q-raPT8){$BR=RCzXK0#pYiDs_#|ib^igT0R
z7hm-|Oo^P=tVY7y0RMomfh_-*Fq(nb5JKW1owND}qQG89N3~FUiGZcB2%g$~MQ1sn
zFV{q(f#_mXg4Kp0u*kCq;1u(ir2p-+6UsF!r!pWM;!M-!zfPHsM{ZM!a)oiN^b2km
zNwrv|rEj`tTVBd>=Bx+F!C+vmPTKB=Qt$AIkfH)M%^Z`NeYb2-E3tf;p;9=fRm7CU
z(7=G8>eqU&Vj%icKPhRAWP%`!3VTxiMkKTOhs+@qx?LXbCtJ5ANP#9^P8grAwMG)%
z`4$FQFx{FapTUJgdYsU=(t|-ji21amf?hQT4EAThP#Uprw@hP_vbQVv$p{z@n;w2F
znPkKlOd%O(S**Q<ES;W|nk(@?2DSW)Pi%H;uBzGEeru?gj7@%0h;@Po+*)!v{@!`P
z3Y038uLhsZbaOOf@RA&cKsdI+cfF(Sr(5uN7wRh0)*Nhl@KR~5EjLP+Bg!>1)gz8u
z)lu+Av9HWgVHG$s5(z8BKYcA)C_DzK8Ld$Si%%li8YA;ag?S1UqVaX{EARS5azNO@
zLy&yqe${5s?;*@cV_{{`+@h23V2LsXVWHCKQx`}}9B~8G^(m82ZTVaG#KhBouPPc_
z{$8qt3JMh<91SvxoeQ{;*^S+mW_=1mBe==Jty2C-3I+vrhIXm783&Qg!NNCVO%CvS
zygHQO-+tV&j{YJBc2}e59s6Cej>B8Ofz_dlwLP*zExX_?MT4Xdo>u`Fd`V`y5RR<{
za{&+V--IizDKJ`!uL$$`M$ty|VZBOMmp)NanxGLIyKL~%+;IV|*n+@7A5b}L<28A?
z=>=fCB9ziX+$y!Q^D3B=6eRdtL^K|?H$4&7bXuNv9+}GLP|3y?xj(^^STjV<R}?D?
z{bc5zk6$)cs_COy%2dg1Kf>e2=ez#qbd!5;;qO&%gEbKHve?QVbIxk=k5!t=Ai!e}
zG6LcH@qrC6mNy+`^VtwGA4MBZ<zj`0ktcU1Sl}-J@nu=I*TFvo;)^AE+3;ts6N$nv
zUkUYMy0u?}U%mdNK-`dA<w!=6Q#Y1(NOUAPM+*i(9b!RyCFyLulLKZOnQjr-_&9k8
zL5K1=KTCc!d=vmeOx}3Ds{_27T&SkfT2J3vh=KC(&%;_oca?C>pzkbknhps-xhKgh
zFwIG+g2ZJoundd}B1PU2;?sh&Llb0l?OaR6ybD$4bt=ftiOb@~JWB(4`Gcr9Zeo4V
zatwWfDSZg_p151my9HwjH@4Pb;Z~L*sqIY)An0pWvM!6xk=+^n3Rnt6l88u&^2&9H
zIRT-hvl*ZDXj;0&x=n>f!Q#o|{tW6~eM}QaJgyU@`HqYtWHPivDKFrHTsMigA@`dI
zDQV^AnD3-Gdr%Q7^GKPr0z%X|k33eaY`Z%YD+!?pgDX0(n<DxjANG7#wLxh>u6y-H
z$a^V4GtYJns~J4^u#?1RZfyF==xdH++&kR#y~2b6e}xs&T#9MgQkE9yhutS^`btfE
za0R(QR*DaxQ9Q&_Ce{$i!;~V8WJ)WJ+lvxRBO(6xoH!ubqo{ccfgxETptXE0JhgmT
zt$b#cQ~N3Vl^k;YBq_YNQ2vE373Ecg+NZyc13dbZxH%n;Z+90zjS}S%9UYihZZWRi
zEZhxW92X8j1rUTf^zLx)L$5`%vBNy(=JZq?A_n~}DMQK}61w;}96cJRVh?&f33aao
zZySAGbCW9knb`;!rX)+N@hPWDq&}=b(B`wT?67uPNicAEzswMTgSt`54+F2Kiy5ow
zJDwKVlF{d%f&o@Xg)K83a(basm#kFGOybH^)MkJoue1Z)`k5Jf;JsV93rZfw8KRu1
z%zg6zc)ga05&R@kQ+kc0YLkd{;VKHkZ9FJXYj2)CC@;%GBz3)%RHtyFbI1&W=N2Bp
zY-U3UtoM!UN1vS%JlL~yV{Hf-9Vw%m85*PziKUTu6#DjBQnQr6;sa-kKRM$2RQdPT
zYW^e)BIR|+@z`iImpM%3h7s@-IdRSA9x_b<SvDlTA(3FivOz?<)u=8dhAvBaTGh_V
zL+R?`4RnqaiMRF`_z`D9I7P&|BkJjfXat|sEAb(LNMSmhq+*+uKM6oAVHAR#ha>X}
zg9b1rn)#eLV~-QDSbKC%cmnuNY=2{?<}YW1?`^U9Z<+01TQUEo_vaNwnyv?yO;Sfx
zPbNCb<A2_=pYPe=;{DXVPrm?>;<0(2_?E|xiBimSJ=!lgKK4~TYs|h%yEu*LoJ`xk
z%+M_4zX?#^$JO@Wg_?$vEEn)pDIoZx?e)kaxJp4G!#hNylNQM2qDb|K+`|>y*U#<S
zre<K8=14cP<Cz1|UR!_iw1YL#yxu`2<)L)LL$H`!yZOWo!N25K3@vg<+9^a*w=T2+
z04f8Cw*U~wW&$v^6XEH!?xudBy7&au;QHd8s}|DFFJ8Vu-Fda)f&v_QNAss}lGOb1
z9X9J;EnerBa@L;4)XgMPY_jiXT*qMZ!JpCUHsNA6jP=Zj(%w4d*C5|~W#Ws+SC_Xx
zSb00i25<_hOsPG#KMs7aKdD%MlLH#g6Nxg3sYi}aU(Ap!4h(K8<GD#)5l9k%YB{#s
zl$Fi`peuSz9e_8GP&lahN+Q`}6!eEA1r{>}?Pm6$g#6z0`ajSuGxQN!5djQFzh*tU
z!B{OSaS#39ey`v)3DRS?o{BNKq*1R{RndKLXVI5o{r)^(50BYgg1dH3KI?b}y_@#2
zoP6SS=g~GtgYyO%f$m$3SJwVjJaFI7%I3X%mp7Ac#J6kg%3Ckv)Zo1NRnx#|yt$Y9
z-tdc0vK}o+|4~#_dZq04YTk!Rr`++q2C%R<z54mNT_!{3d%p$??le8P^mDFx(aJN^
zl{UJHkZQJbG40)Aaca{&(rIQd7<}Sq=;3aJ%LzpETgaj7M{HI%0B5J*8conp-*I6i
qttH5XWwZDH4nyaYUV4e2U#j=(l5D!dk|nYKZHE5;|NRd};6DH%7mF(Z

literal 0
HcmV?d00001

diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Resources/Textures/character.png b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Resources/Textures/character.png
new file mode 100644
index 0000000000000000000000000000000000000000..e79d2528ecec4793705ba5bd9bd8e715fb36c36c
GIT binary patch
literal 78937
zcmX6^dpy(s_ut*^?S9+jGLidbOh_(UDk^CTsg%vVl8BJ&X1rZ;S;;NMluA-osVJAt
z+(M`nsjzaZ#E@HPzkR;HKi-emW7~UwoY(7|=XsvzIj;<otCOU-iZ}!Uk=*CJ`!ECo
z%@aQMqA1}v&ZV1f!UYjTJV=B<9_Pfby9s}UVEvpAAA~?+w?QCOIs~#N5U$e@$VD6k
z@{<gK*c3t_%I6F37Y{(7`0;(aiS98sd^ZFF2e>)e-`^jNyiG<x_iA4k>k8bJ2d4?F
zgCosCzR{JKQvx@fcqbA9Z8h(g623--K@4Y#S>(N_fi6gieUXZPLXY#`x11!@fcSR@
zm470Nf;1g4OK|ITZn7KB2tt5ld+OXK<KW{hrNz)^V@^sU6w>j))OS73Kf^r?vYaQe
zC7k5D$|#1Rh<AR652{BTp}j1UnN&_GQgspNp^=VC5JZ1)fVudz7$Z)uGj+#b8Tr_4
z$=+@(b8M`1=Y<(U511n6p*Ni`+Y=wzh^3yof_+~XtDaQ8YNa4Re48U}NM<%Wwj~ii
zV2>Kz&hOSkABJG5dkyp42vTgzhLkT6?7QlX$%Kv}u!``lQxPF@4P3%{VPq7=bQK~9
zYn}O0<y|Qn>1)&?k@WiVN!G3p>{wOdd)56SZ&_WikBd|fRqTdjmw*GgZ`}l$55oQv
zz2iV^YtrKRI8WwCWn?F7!XdEWT5}At4)RDGo)9dS5F>U8EsnvKK;Nf%n_;C7nQ3Ow
z3{WH_r;S=^G{lT*F~E@aFhyH^0Y(?~CiK}>;)=W_;dcXHWIs0+$K3x-O{NU`O_^jV
z+8ji9=tZ_uA|X>o&X&hc?7EG#nwAt9w@8s<NlN^4yt)PHh=3quzE7Wd<i@5Z$f;af
z6#?I-l@O3ScFKVskWNQ09M$^@i^AztlzXzq>~a)OpP+eBp@+-KzrulhP`3Igyvo7^
zK7S6?lZi|rDs~^Oe5paoI`x>1tHz>eGz01tLz!`Pt?I(`FT($M?ScKu(CpLAmRgrI
zgUC?r9-Je}q;n2MmzFo`6L<Fu1g4u=_WQ?<6_0hlHQsV+dEq{`^0n%%vGz&zl^JQB
z=4~~VI)#=O1b^!_aR~z=GNou(By}P9C}*yGYSPoMR=!Pig?x*z!;;zMedc=C@lWr=
zuwy5F9f0<ok<r`zRHplb!sUxu`xJKl6*uQ&s}+}<YEAmzqOijchS?R!Gbaf_anpa&
zcNJRSQM@`sJy)uA-@yGK+^+|}QhDs1h;w#C(8Y*n2m=*kwMkbaz-aSs_wb*AuXFMH
zt)09b+;y*gH?tXLoJon8nY}f1D3gAgco^k&cXR)j_CJND*PcRVt{;#{Cds7c9_n$L
zpjRAU5hOWxEA1g&t_(RsNx3ZdMpI<sFk-?$75xZ%>svt6j))M-LfQP89yVL%130~J
zAWxInMr}mgel7>->;Wsq_o_j@b<ID`WG3uqG6KX3s@a3?F)yWF+~z*t?v+C;J=+qo
zjz&P+|H){5aEzJLY`9n+&^1*OFI#-gkFvL@IIem@OKMTgq#N)08C?Q1|D{d5dUwtw
zsE#zBm3iY9OoEuIAfbFrJ@s)$-)lAdIP01Dbc4GYp=E-U+jG4TO+khVQu@%geI2fs
zN;|GMXqdaJA35CQXEd&uU*j$!p%U}YQY9-5GINY0o=i|s-G87*>coDrx7%(tPrq8H
zOTBeVB5bv&*|sMw>XX{x`;OPr*do$O6yEPAO_%WRlV2w}eI2aqJ`(WUEl_1+?X~q!
zCg=3k_Y?akd*WY^@>wcZ3I}#ZzB(CGfTVmD^%eu<u(og0v{Zo(covLyNyb<6amX>3
zvC#&d{cHQYcSeWoPBE5Kjm9i&Lc<HT>SsouNVl%yRRxxGWicmkmO~O%_6IQj)Ajw)
znwNQhPvn(dD2R3V`Aso+wV%F6FGAe-(4%tNowUJIDx8BKFeUg&okKDEss5*fA}qVe
ztE^c|l}w?n*PEr1ap=}uXZ^#1J*|7bv*D|drn-^`hnSk-xV?_w*t;Sb)<b=VPoo)a
zGV)F1umfW7A2rcV5_y8+s`RQy@B8;WFTg#j)g)!8?YgP`rZVHMrG<O7f5NwIhDnG*
z6W{*FcP^9pCv%!2Wgktke}uC%)9j)+I_h3n+``ME<FLgkQ64vm`|W7xt&C5X(Pw3O
zVF$xLw_4xyn|Y^jy1>I24|QCreSE57s{-|HnAz>E@7u0<fN!i=MUA2fR^z*2!fXJm
z`h0w!v0G&D#g528r~AeOed5~5`cNGjtlKUrNwQT*PqOd8e-KWWmihddP-8*v_Itc!
zL2d-ll3lAzo<6kF{;GjwKVJ?XlP>0r$J3@XcY76K5TAsP^$<FxZU-8%R)<MhTSM<o
zO+i<rv|+|m{L#CMSJ5en5qSOvk7<+wVpdxg=#&z+2Y5tKYSu8kp2C}0ngXmwn*CzL
zs=fYgY#wml`P{>g*|IDp;}A%2$N6ALhBx}0(Vp|{Nq>g!8YPepSzsyYsnKFpS#7cg
zgc<SHzd-tj7(Ixkk=R-94S0cFQuw;`q$w%&aW3=;iKnkXH&7<sSy2BOHN+p8-n|Kd
zQ6VZ1T~JEolFw|b8t9gSmcjSbC36CLz;}R51suX~OxHv?kJBu3Jls%R3FQ_Qg^~@8
zLJ^_;-UwZK9Ro{GW-8FdYHa8xY337}X5wRGMsslR>x~x}^`@8({;$;&;EO}2@L$$f
zX*^D@2GC4RHI-EaM6pNBv69SPYl?7xBqrpl#`EMEINY~I!?T_pi|;f}BK<|&A(HwO
zuif>>VDm-wviIPzAdyFvAA+YEC$o`+02xui+F~JZaBj421J<I8!5(;^VNNjUnj$q*
zzerYzQWo`ZD|QJ<!G9)BOE3z@Zq2<QbaXaK`e%8cW*bP6CQ)zBcA7DJ&*E@0Zl`g{
zN3G20X=VO9c3`x3$6!(>sEwilZm0m{CDiZcs{pDj08{txiJKO%7b*s^C{MaNr_ME7
zP6Jl#8-iBD|8D2zrfFd8<Nx*W7d~5oQw~Yy@vG};yp_?URnKfqxYstgK_t<5gAOq2
z#n9lhRbswGweK3#Lwf%K<{#vl3Tmtt(?Ue0SKN>AD?98$7$H_uyFeFVpfqILr-^dD
z15*)?>!D8Hr+(Qvd;o)m$PjMli~WWygefj8oEVbZH@@w~v?5AWOZt%JiX~yoVl5i$
z2xv>X(QXw;+5|!GTf|WFQ4Vw*>m3Q|p^{XA{zJ=0O*wd0A=r9M$<;T13VAw%65t8d
z8nn830y$=FU4nbhNdui|x7x#BnpXy`<{Zpyksg-p%t@`~0()SCcuNC1Z-(mpf~X8b
zE%_22CJv=IRDO`&|B6}eM#|kSnSPTxQ~<qN%AraYJ@-0xtnzRUwM&PDT-)q86f%oi
z+WXOr05%iyyW}fNh~HTGKDQecZ2sRVD@9lb8CuduG^O1*1`>ZpkkWFfc_LTj3E=<7
zl3*t(YiW6HzvFJC`)NJg^akjzG9v)H?3>*PMpWa2O|5HLJd^J`!9s^7^Z4eqVqV9?
zL%`fAVQ~HVXUAPSRK_};>S4s(g|59NUOR=faDY~M6YLa8bBJp>MD7V@s)`gLq?eF7
zBC1KfeVBGG7~w%>X2kZZ$_B4WSo}dgfFzk?b(Wl<+0g&-y>YmAn(VE<^Vk&&hM|<b
z9{8}^Dv<ie#`)(t9Q6AE$dHPHNTB~|$|;oCr9_mzq!=pT(k0YQhj(MV`)~LADQpC6
zbcEg9;`KVr*01jG_ifyV?^iIhH{*N4=HHwM>7pRFSH6I$9EL5C2oZA3Kawin%qfKG
zk1%+siR<-3HRcm>i$6>2R$caLUZw%tWkwO-;s8duX+J})@?*-I^(;?43ls!ualDv;
z>Nk`QQ4|R|ta>R}-2D<?i_%{zX{Wd4dB$aOMqf)y54)$ehuqrTfvv%|vF{1j2byi<
zC8sN#Z+Y*6@0ew=oj#ri=DeEB8iF>v__Vd1+*dwj=u(HccK*avG^ml3gx^5;lFr^N
z&QGNY6CdqlmPV1i7d7Kb25~_{gT7!&K`qtD0bi0ng%8gc{FdNuUCskK&X4%jy_&P<
zwkeyw&1WB9VkWOCxdQ|Iw}H%vJuo=qR96z&bVB6iPNL&+riTx+R6Kb47ZhG`6nTA}
zW~`}m=J06+hRFXoCr7$JPNQ>CZ90$F>FD0sDAkXCsv~3Q_<<9vW_=)$bRJ&ocIax}
zW#V3EDslI&t29NgjE07!GG2ej3Scv%3YaM-0+^bR)8Br$;c#O`?319H(F=5`-D($K
zFn$1hQA1r_j|L0bA6H9~lI9Cin7iBhI$N=bkTB=)3wTipF*DY_{pK4VCj%J;{(=0z
zw|mJ;(3PrJR{fb1ov+UVCC^V13PBG8=Ia>JUv)+%0yFmG4%N~=)Q>vT2wgf{DvXLB
z<Ohv=4HZ<N|HCgF^f~+&`N0G7fv_uvfQ%A>3j&NrRn{vr0wicc^EHRV?CI#n>T9vF
z)!SOI6fBpy)u4}z4QORPI@8Af^VgW$^*#a<_4`sgD}2f%Oy1DhC%b&mq?pK;R$g)>
z7tt3Ra?v>v_WpG%zwEeWE2HRt2~co)N&`r0hMidVNi^U1H(x>%i;Pm9_BO!=@&bd#
zzJCvt`92xM_%7o|3MvRBZJ6wTcJSIOWDUMLAt8hJYuO2q_Gu2RlbT5wyJ@Kl<--=A
z8i**<Z`2{+m+x56A6?gT{CUE#!EiBjGl|oGAzF=l{ooWPk#|hflB6gG{I@Bw+Go+&
z2#074HgAzRZ%YbDZ!n8cAj$r(LV`i-z#2xJ1}h?sjJA*!JMM;5aYX%IMXH?=eFdk}
zpiUD|ai36fjpOCCG@{#{8$`~De2(k;EY2RQA{ufCPJwtD0U=(VN1%q+uBM&_bazVQ
zy<tk0?|OQGe*wL~IgR-HiYTsJL(p1#7(<}M-F8<Q=<|v9U%j{>$?ecRk5Nzh+Znd9
zVhTE>WV0bKwmMZ|%a)i?$ugWWyaq6(-^jF}KV+%XCv>-=CIv&T$2$-r$WSw*q{IT=
z*N-~^r_qMM)&1YshlpZ_)987`Q?6OW4<~MFuIJ)M+B^46#sOdNS((q+#M61}WzAzP
zTN+l<g>i)}`iDAj40>Vk#he3U?y1Ng!(dn<QpSfu1>$IvNh9W1&%4>4dhY)P{Z&JG
zFKNW{pW^i^(4DnXm+Hjb!$lp<f*T+M>r}}TyqSwQ`k{LP&@$3lPG280*r<&;8_FIF
zQfX!0niCTAoH&;)Y7I6K)N;M;C6vXlPUNN+wHA)2BQ0XCCMXaf!M85G>Q@Be0uA%{
zx|M96V9g4c^Jxr>;s225(jA&l+q6Sf0^fZXS;j53Vzfi9p;a;NXw}gNewFa0tjQ+p
zR({B$8tA7nVz$8y-<B*H23@Sb!;+!LGIbmcYVfRk+mb!LT21-@d!ncC)kBG?y(Zd{
z)UL;64sNahRV}jq2K0%Wyu}XbE^FqRhF9vYf!RJcf+|FmdBv+3JGz$bO=IhH5xMTH
zdMOeT))l}MZ%v0@2vwZ%_pVkHogP0PcCVyZEYUt+ht<MQ$5Hh9e)x^Kqm)dH#-(#z
ziV9kA4`L;`N62@filT{+Cjorj?bnv)>!=CIR_LgP`cD4eX*?KxXcTX|x=_q}Tjl`&
z_-7p6o^5aHKrhNspr<@lrCZBeu_D(y!hUu6f%oEOaW__1X=fadU4xJe#Rodw!j4iz
z-Jbih1Wd4eQf^Kj)jS&tN()3*BH@)r@Hgeyb5SV|_kR{`)upc5z$<n^e>-6wk}3fq
z;Awm4u=XRO;xrb%q+x{=PqLq-SP6p~zkf!1LQxdii`?4Q*2b(c>A>=^T>cc^f!pji
zh*@@s?c|H0AGNr+08-!+VCl_oV8PR#S$r|mZhnp{0$#(4fX{+vg)nT}0EDN~0Jrll
z`j&B(w7iWKjHRHlhws0x2EKYxhWB1u^CRV)&||U8J0b61_c<hCdK1^p^@6CxuV>{$
z)lo<hMbs8QHINYv@-O8}j!NORjl8$Bq_pMOQGJ5lb~t(WS8M}?euQ1HgLq{cY}m}f
zM*q+@A;ZxsHzz*YO>UGKs@PGz08uNEv@zcj*(($LkG^G}G^$@oHjwnpjoknENDzM@
zoU%GUBg_4k{~6P((aZ@`9yWM4HRg}&drY2oDSN}#HgWZk{{6MTn{@MCZ`h`?zx+|w
z9VISsyOwgX%ETn>=F|@EnMVhJ++2G~Ov0or_fzg1#$K9@dmDyi_V~8Ge#5M+>SU7*
zda!ye?O|t^PlNP1d!Y7xI?7sSl8A}0gOA6XlB6e~@Slvq;M853LKozD7qfLfQ0!!f
z!auS0MGPfKV1eU)57^XuFtY;rp#FuA{$b|$AknC9|1l*QztzZPwBuAkC>U|s#9URd
zAvR)w^3X2zcm(91j-Yxd>n<fMZ;Cj&R>^a}9W3N{9}83hQ^e1M-=a+hUYuo6;jkCz
zj|~oe{P15|;Df$0A@jzgQ5n<H*3`8lscMn&4iaz;t1WaH2W7fKvkX0jAp>ug(clW2
z1?WV<-#7fJsq<hByL9-MPZ`F3W22Y9)Nvl1^GP&oNLtG0eJY#-a%nuL;CZMXo^NJu
z)}S%YJy8d#3|apxInjhB-GL5&5w#hV7;q$(I%2-2{r?^uFJ>Fak{r|q<Y^vTnI^Ex
z1?tTxaf1ZnqBc4L>uqEN==g30u8&j!`u`pSdke}5M`Ab^1nTy_MUS7Q^7vVFKt#Qf
zyb3CSu`@RSsQ@Y9P5ou8;nQG*df70Sp&-*8_On|VH+sPHDkYW-g$w3*&)j3~bnXBf
zMRLt-ZC0{)s{J+1s0o77Z<-0t7;{1ox4ZbISy4D7PEwT}M%L6aqP9)kZq`6Q7rbl_
zTl!`Ut_<4a;$xRmd9PoX@=q;=!K@9g1rXwMpih*M7URfaUT#B3i~<8H48b}No$0~!
z<o!ur+hDI6L@Y99xzvfe5E-0|47q>6gWNCv-q$(Yh%ECSmwbaE3Y#0j&kXIzpe(f<
z1aw_T{9+cApPjqcE!D%X_XOk*c=q3QN(K`D`Bzp0<f83UqIIdS#UlOAJc2vEpTiCh
z9}t1O%n!5dfPz|QbMQBkHVSwX%~y6hbxCF&^*I{=>U1MeW~a!Gw3}V|`mE`ORRM-O
z(!7EWy^+|;U!HaZBj!dVKaGf5Qt#}7W=or*zAXX_apZs_O$~#O{Ucs1R13ia0m-%%
zsqxu*!E$Qu8PuF^l$xt@C*(evWFTuvHf=5Pp%OpsOXa*C1vQ6nXVLbM(B)%Orr?&i
zqvkH3Y|D7VFV6x&%}H%xkl>>)T{CxZuO)v1s=r;enAf(6xwr&4UO$B6{(CXUj*k`#
z2WKl?Q1x>yh)5|{h>eXuYEBkBYiNQ~tzQZ8QVbr4^zVP5XJrg#Ox|ZJ986=ac6Wwt
zjKaZ-K99^AzW!nGMjCa2!o+wDrGpo1#gS3hHg}<%Q(@N~Y3D*VdU3JV+Q<Ggic4{2
zjfjS%Dh2zh)xspA;Hs6n-`XL?@<dGUH%d?tOGzn^B=wFgx&-*Lo*qJ|C1m0-MG%LZ
zJ9_);UzPAaHXH!feHvR{-Z*l-IF*QRxmIpielt{2Of>!ePyDnt+U&;9&k`g2sEr9j
za33IoiA95+bBM@yzk#<}z`emzKkJK|_A#Fpokf@_KhIWn_6JD1<f%p)^cD;7Ugq6+
zFYzvXeD;Q9$jdT6QX`+iTWb0Yq>VIhd6zF<c?GcffVR<>HiX|olWL6ij;J}r#@l85
zXV`^4M7<U4v%lz>t8|@@6z(x*Ud(TFzs|=U$BtocY|}=&Z{3brpdY}D|2ao{L#RDD
zC9Q!s8hQVQ71S$qqd^Vx2BMAUt}CheJo`u(+M;3n_nDr4lJ{%u*&lm%j(&sGgqHes
zN~DvA{{7ieG^eH2P0}c3GyfjUnhn(yQROvrS^V)(@PN}S?#o8@%D+WfWW&TAjEcNG
z+TA)8HJ~O)G{^O9CSB)^H~j*pa!%d;+af~x$D{cBjs^Pqj`>nxlLxVZev~nYZ&Xwu
zs$Gx;BvCKTt&}AJNrH`_)%owH+!753Oey>;@n;5fEP%@f#e*ZX6sWOSCeN58jf})%
zrf~;Idto<s0aX{l3!D3*g&D;0Sx|DK^7i0lHTT$L*Y8NlAlj^zbRgT@)Ym|}l{tIo
z4Wr;j5BZ!La`;xxnT2&}KzYT;x9EA|Hg4)kD@-V%a5T9}1rN1HA$0>l!_T3RJWcH*
zmx3SQ#<z7yIq!kNe7j<Ss@EV8bo`WA!@re6-uTlXVDXcyd2Pa$FCEoXDW#C4#|6BN
z<g>t3Q__~;DZqft?dX#!80Ros%veI-!9my8?*n&%@SJuaFGL!D!zTu$jOI-#{2o?D
zdaA}I?*dxx9tIW)E&#_vZULT2is)7WpV)VYdR=noZJ2w70A>D<z>jM`54_rO-uy=F
zh0DA)S{e|o-b|?z>$#WWjX0x6&!MgLwRiD<DO(GYyHNdlpa$H(31QKSe05)T01y3O
zbGuP~tFWAvd{!#<_ls!oKls2FXtps8tR)!M66|ChQMH=J$k0&K0mtpAG#6d)TE7%u
z>Y@T9<Z--RZDD!BoHi&SVTx1TT$Q~65_c9G@7{xPPu`Bc6;q8KK5F7S^miKLb=i<)
z`_wp<v!nK^!4|pKNTFW^=w<Ks9|~KyFPf{l#m0TYm(b><e|zS+!E`o0x3Hoo#K7Ac
z_BocD{g7#Q`ann=xc9VAt4A;$3Avmplvm7aZNIdJg-&b(7qu;5!uAEVtc=*T`zmqp
zREZ|TEsdC&svLe*Z3pC9Op_V(l|modvdQ{&*ri1e@Vn`#?95|o?y0pUiH3Svaf02o
zuY?AXbW<}zXlTkqzKYuHRykp<L8@|L#A&hWWxdWLEGm#cvr`BYGEV;R6PmLN3qaKm
z5Ks(H0ODH?7wI&|x3MD6X>mVd;?PpI@lvi?%+mA+DGKzkA{9r=lI`?it8lP7Edu>9
zv=I^doVt89W&4`hctuaebc{k3guKVgYI_0Y2v>^F-x7>Ac|M$0KAr!b{Zc}bnlmx|
zsWyc&_$CN`LHz>>Qu^c@AaQs<dT0mg#KB|)wK3&RQm<J^@zXTQdY*DjzPP!$nO9ea
znU_<sS!;xs89%IldVeta!r#SB2X4ch6I!a;zBg=xbGAXknlPb0J=va=&O1voMOb`6
zzNE-K7ePjG$EUT`W&cB%E}U|8A@s!k)Gu40!X$n$O$P{Wl$9qRJ+8aEupC#PPV8tE
zd8&wTA^Etf2I|cjQmpHyEV+KuhkXJ(JyBZ9CqWsl2-HgS@iEu)_(3I*yYo@9p<H-B
z(nG%;*zq_I)wC4~B@f!QndR{~Ukrhjxlxg$dV@K(<kfrs%4k0XW5KG`fi_(@zn?nb
zQy-_a+At{T<%R60TfPWmi1jZhJ<!r0caY&nKJhA@vbdy+wsX<c(LovR(?@-efrH*A
zaVRBEm36VAo?~@r%)7b}%)58zFj0y1U96ZkOE4kY=hh6IZYXl7^Ql%1AGQOR1wBlo
zh6W>+_7fC=nfRKwAElxHK}xwf?W-Z|y1$4T9ri1m>N<;5d#%z%jiTg2c5b1+q8T`n
zDKd`1gzb~#Hlp!sEny)OyTM1x#em4EMv;3$%3$(M4p0$7M!v>Z^w20V>x*Fwo!5Fz
ze#~R<4BP$eR28@Xx*0OE9DdNwRh;quiSO7_VbEB~DkR=y=+$B_`s0b4L86I%7X7Y%
zmCX*hl-G|g1Lx<zWSfbj(bY@i=&RPo7;twzvM2vcLkkc=7so8D9Q5<LxM321M@x@u
z^J|OQhM7#D-gtCH^Jl8!<()N_^tdOM+<~B17)w*zmauQ{m0g5oQfi*C?2KL&H|<w7
ztlTMGMIz+!nFZ3pQpf?k=G60KS)`Esu#W1mG7;`)=*!tu&odmIA!3BqM<CdVeIg?r
z=XJLPZxM9Rk6g&$g#M&E0S}E|1Kl4>Y3FSbl9I)B!DbaI*7%~vqbY{SuW65C-dlpV
z%j}caN~^>H<c>?gmkV|0AKq43T`60wN0aATUw0<+>c<qp#<>yPjU+)S@yDPaNCs&S
zTnHVUdur3ZUP-@yOn(uDGJCt)Wz=U-p-a-+*sze1gG-%(<caHVSiYl@eEv4QM=Rde
z9b@9v=oe>C2JtuU?ZD;03xH4Nj{r9hOW<JIQQXYuOLQJjW55O)`9OaQ>#>;KX|#LJ
zG<<#!s`G}J-g|DW-t7oogs|Z&`LPSJcGr<~7Ft`4tX-3FPd*DV3)VsgubF<?+{GM8
zPnB}?cC(<D991V-6@+eQ1#J9ll?8kL#DF)YN2&65b&A_`+R4{Kx=5&*Y+Tar4@U)w
zlHAz`((I4}>h`EX-$N+1SEQ;qG%_Bt{Dingwrw{W9djxDqtbK{m-W?G1OENF)!6*E
zl~)>gT+#dfn=z0|x!x}WZ&=@XCA4t147}Z>3Yax2>S&f0W6zgSlFzBY;ZwHY_7gR@
zc&Miy^Un)GYdDzHl7tR9cMTnbPH%pZHcVh#$txc<xk4%Xa1N}GuryPR;j7y3lm2;=
zYO=n|=DE82atfXhdKPic7a@6xGt1EUeRB*dlpN3^L07CaTfk=uRIkg>C;JVrKp$>>
zT*x5v`y$9ib^bf(C5NEPnTR5<j~2>!>s1skB+XMhgzzA_Cm(Z0UJhg65JUdLuyPs~
z<=*!wWQ!e2&M4+!xz{vxY8As9#GgScJy!l;92XZ<!R4=#+8VE0T01(hLAr049niNc
z<C90grw!7TbFQ#4wO`6$MgH&GiegtFk=X<=e`@SR;~w#`jgJ1HqRz3P8dTZ!c*&54
zlV8G1%O~FdgI-httRGjJ{|T%xUu`eK7hTX)InCmk=uzLiQNa<w_r%4g*fv&N)?TQT
z5DVxJgOa_kPzyGbU00B5U7}~6{D6cb+@)qhLzR?3$QC?makmyYGc8spv37nGGc3P}
ziG87wmisGtw%v8X%(t>IJBa)@>;4>SMFLD%l%}l|Qy1!P=GizNm~<igWDppeL0Hq*
zo15MIe}6B5nHL`d&7~~7MPLAVmZpiICT2c$A=hbLy2AUm83znDB?Jt;xm3bgeG0=!
zZIz~`J@<?@n@QRpnPa3YLY?ewrOs=$w6|l~91i<U+Z%RocQ?D|%^SW(EnOq>!S^`_
z!t#00K_I|w{9B^)X1k+-7o@pQ5Ub$GmRj_mq3P%gu!j)&z9jIqB?dS@TZ@~CT~IQL
zT3<0m-T73A&QZ9JAHo^P;b_YQ*pU6rD)|;tO=ln5l81<2Rk8h&`clwJgI?$n53X0y
zGvoIDR<S#S6cJX*9QR^u%~0}^Gr>-#Uwdb;s(h`OY*XIJd><-DdpNmVPm|7Jqx(>e
z(q-sO`VI8t&3ZA77b54bpAlQ8h$@G-T{j{ieMhs;0k6skQTea-XPCJw51O&k<-$#0
zFBXoyPCy}d%tY7w!P$uTdA<QC_W7e3u89{I7Li9`;KQ)4rYa=T3xD!cg&;D*Q->L6
zUpf+tI=1_uE+Z}w#x0$i`w^t62GOG!Jb7ZSC%$Md`XCb*Rw;^S?OQYtdxFFBh3W?%
z_tcz^4~J~g3jyM@Q~{WPRz#C`jxgs7CVa_%J47+zBJT!kMksn;o>6(Nx}9sG%f2nZ
zp8cippAKhWfg?%4!F~Eb?oM5tw?OO@|JC}31E{8xB50$p3g{vc&PRA4IqP}YD>I`?
zNMKgZZ?^b^ynmg<kaeo34i@q=gSywT)SNJRh`>F`3TP2_hm`*F&^zWd4{es>306iF
zX^${#MF&!Q%BZyZDg*klTb7P-!!9US;!N~WI_K32Am%y={F<{%lXwl4?`iEsqny<J
zZVVqsMB#1}UqpTZ-je--(jR5|lUNHny}C6%X5({}LFuFjGV70vh-WsUJ+oOr_NsrJ
zO6h3Y2^i%z;ffIZaJ%<Dmkm<3WVgM>R+_Mx2%`;xQ)W^lv`0i~e2bHKaMIHol;8J7
z{yffVC&&%`>W6u%#~M5V9>sbBle<)a9;SR85q<R1Y8mut5!6R!Q{#H903WQPkDp%n
zg}+f02Q-K{I*g<fGxG}zPL=QMA5-!Zb$u34WPVX&waSO2H9O7u1vE~^VY(2gzMDJ6
zdIEtNj~+nq`8iIN?y0BB-uU}nq)skn$u$)J-~JhE51B39)|K%4AD9`)kE@GKdnu5T
zG=yF`U;x?viO?t)v*#Nx@U@J}uTF-Hr}RMT=QY8p#z4_0=DRSVZ^=P^MQSB&%<jy%
zZ6DRke*uGmW$-d0!sg#+``#js!>ydva>HX7RAQ7Tc&y|Q&O0V9TNB?PGNt`@)U*t9
zUCAG3`&l}K|0RjdEUoNjl-i1|-;fp~9P}>W(WqGNNpjorzaLJSJzJGRd~MrU<lp;H
zEosMrQ;;g^n-AO2ElW4isukJnMaY<=66Y=P&QdTtb3)!hH>Rj(@3HIU>F2}F8QoFR
zyE5-z7qFgASt>s<rZ7J<=L6<NxZ=O)n~_Nr_IpSLKHc9UkX!}Z8}>^F^eb~P!`+^=
zBh|x?KajLpfPLIaGgegp+L?|L(g3ER{E(_x<yNR<JN5ZJx`AB(hG_5}Wbl!#U$SK{
zsRQR;=K~AFA6IobqfJ4gPw{*2J7-<mfl+cQFmpEh?%K)J>OZQwql-25;Q(&*;89w+
zX0$nr+r76THwA&|%6g9x&mA<I365<ITWpH}3sz5|)Q>4D1enhH_*R~9@8BnmI)UeF
zPT_(Bx0qe4c(XO36d}QKf9_}9^K45`;?n$1=!a|cLq-nhzmtzJS66cQkoQ;aqct3<
zH@7)9yxckdPM^QvJ#731`fzWwT%kWJ10OWDHA*kC5=ve+nima>N%Aw{&K|8{?-FYE
z0YwXAGF(I|=VH}G>)V=e3D&N)(dVVS)v3O*H(8^yjq)VFWg~b+H0<Rs=yUg&NG&ZD
zA<WULT^NRPq+En$Ewaj)&~b|`{B&0HNozLc!mI_#UjNd@U6|q3U}bsmYoE;b<*2Rk
zK=-b*m>4v_%)_IvfzBJh@?cCSP0>`taaXu4ym0G}?(LVVXD~m@TFtc8@B3NX^Yk1!
z^bjzsE(Rt4N{_X{fiGevYd&}J&ki009oXuOT?Lws2fu~9GcdL#xVlJs4emPbC75Q6
z9LRB{)bX>I^Oc@K^mwPAJjGA{IAC5;ziy5WHzdTB{`n-SwUyn%EDC64^oH(JUPp;n
zLbrr=iM<4rW0&biqiD-a+hYlNyr@rSQ6B`i;J<AZWO^$4_|0-fM~5w8ae8`<mxR^%
zb91)*{B(rw?E|S-{^L&W0ske?NoNB7GgCdoQfA%p6Zu8PBHuhl`IDK8;i(pO7dLHm
zAX)?cjvj(}{v`pad_m@Wkk^)XDUWBA)r=JEUi1CC0{B-9nDZCDheV)6M&lRaMFvd2
zV|x4l{=+y%ef0+&&$_}sZx>*IIgOyz?$*w*)7^exnn(^l?C}$bq1+KLXBFfA^<a`<
zej94<G_jz^qIB+t;Jh?<c`-NmtXMuoZ+8d+iH?L@U={{!(XGYlqg=;>{hS|`zDmWD
zVnaCFBX!-ZA0u#_VEXe5;HkP=z;uBm+AEC$)$Bn5g9k=%4QD@hgh>kfXTCwUGZq)d
zN5p1k^WJXOk%SlxcPnO^3XmS!%yihBE7ZXH50qKC$;m*`N0EU=UJc1KvCmiZI>#23
z!AyTs&|^xYCADX*9`g}tX@--nbZ)|L23prn*>e9ypXW$Deg59RGW%D@PF+VCQ9izC
ztpaC}kl0Nccw9v3E6)S6MyZ=ALXBSPq-`G-8G<>`fie5DJJJj%c4R(qH(4iU^_vd2
zV}<cqx%jkKiLIZ2&GKIk<ySrCND-_k*I|ZNeC0Jz#YvIgBcLQOv8k;M(+{*qtp!V>
zemvI&4$&l^&9Q42$P<#_y=@wp3JzS3F5w<wgSVB4>*o8v)<;z|S*|`ZNA(D|puL?_
z1{IEN!h*3^w|Bbs$4Chg#8{9j+=@pPCh*#=(67lw1JiA|`gloR=6J^;5c9hjh*&vA
zvyzXjw?=<Vv%=wI&5G@=_$hPW%3HDZVYOTA^^J3ACqZ_YiWy;VCg=UORF2ljHJbd8
z)~5@T3f#YoLDbFf0$@L961Yjc1KikOb?q}9IMoz5^!%a~mlMsn_|M3~R;77%x`CJ!
zrd3&p3B2Emd$#>@`KVstnBi4f(S`bl=$-+Ev5nj3M{q7liNRy4DIz%Nuk5`E=TTOU
z9w?K6>?|flw*T&F5(g_a@f4p`c^8@}JnBDEqQYT86(5M?bpsqB#|dhD8v5`9@~CzQ
z8^)~0XO-V3@8Er%O!|jY9kR%$3}+bw%}hyzqNOL8YL*Ik_oU1%LQcMm3>gsvl?DII
z)6LBA!FRUcy<TbO{U$0vsyc;!+H#VP2~nLvr_d(p*Uhgt!~-v1ZUvHco)0`0K~cXh
zi2ZtiHaY(a>T~ASR+kcq0#Cd~z)-@ZCM6Y)AXu$l($6$=33etIDKg$L1xI6<H!XZ=
zqFPpT-wGSLoJ572s7>3-$At&L9HvQ%)y;xGPO=4FyUhYoyLOG;_GChyyQ6Cr6rSVN
zBM0O=k7)V#%Q-+qv9Us41xZsI7R?mx?~Uqb6xhN2O~q_K+UV+-xli@zdSBW2uR+#{
z0-F{RSD~TiJx0LS`EX!=kJqd*2R0mP5@`KL{mIYnc2a4%WtH^M2(x#$HCpK7UV1z5
zL*N;lm-P-R{u)-;c6(4Hwlo7tZZ<8&TRaEx)%Qm`!zOfNstbu=YHInYSz*;O^|$Xv
z2g~=3378u*dl{_<*>C0vYXFSbMu2YfF3gutwW#5Jw;`f(){>Yk3z^HuT$^LNalbn5
zLnCDq$%}`saBlaP66u$>979`TYS@rZEs&p+$;YdiZ|7xw%7x>njgu}6t8K}y0_1ji
z;`g1*-;p_;vqe_h3pMQ%U~X=Uf4lU-oJmWNeqJ-5hGXe6%Eo%fI(-S(ZihxR`dYu7
zlPY@nrk5kbQ0rlD-7}$7&48dg^eyq}{6l`LrVE#OeHr%v{M-zsXu~jdLD4%&VD7z>
zm05o8X&$BT^*SGR3hH(GV8%Z3*tanqGUNwSFc=6rnvS@A_1+JiwwH-EJqSwu3Pzde
z7+8w#g|-o9%dqeVg$Vk`hdY76#7%?-;?mhgNfg)*wZ2vA%-~Ww!mNJo;J!!dqDM4!
zzEkd9Xb7aLK82ky01o4BO}Ro~>8I@E|7>Hk4rVaLqE}O#{hX{F<Ik9eU)*>l4M;}(
zLNDK_mzYcj#FjqzIR`9ahuz+rRtq&sJHve^Pb70jO)f{JSzln`V=gJ1yZrEOWisw^
z`M>eFuL*ZTcKn{3>O;TOX~Vl~=i{sG!j*-2W9tCXnNe<S#o&NPa&1DLU>e7o&1Oy{
z$R)OaB12!Qssg8xCPGnF-pTMPQG904HjIUW%v6M3-SQ2dD7R5~l$8D|#m=$2HPnV;
zS@-f)9H9%>&ljl-2VQ->xO?S4o79CiU6SiZC<T{lXF^Xe80;9NmFvW*hnFl<71<Tr
zCxF5NAL@(NgxWh8n+oTWU)C4KO>Ug~=8vfUDQaYQ7dECK6Byj%jo1-bn%i^depxfl
z$XlY?`Q9wqI(A)u<DGv0P4r*a>j3iQDd4zI#+FGf#oA_XZrHc)LD!28nuICI2X=Nz
zQ^M4%oa%CAWEKwPQVQoKP$QqMIEE0@`1LLpkAp;QLEfQ7skpM+I@?JY#a{k0&qc^0
zct;iJd%ddB*aNA=2d@Yi-`2S-5mD^%6_@_0eFXWVOjYUQfg(TeQw{MNA}7J7C!Yu&
zDY`wx13soRC%eLYTcF?p2dr^iKY9%@WqVb1`CoS&n42Us-{kw(5^U}(yW)@f1R3ap
zN+w--`FZnmG^loVC;F-|RmX}?;X_`op}nv0p>aq4Eo1_gcccJ$_wT`;SEwNJQ0PmW
zV5N_Axuet^Bkp+ejklTpq7WriAWHwB5=zUyGt-7N8~1#|p1VRE?AwDJc98>OPwN0J
zs(L~@@=C>l^bs*#uISuNVW=4!%8y@?8*<ZU=F2cWPKc9sptLaiz{~|-l)C=6<GK##
zM+1w@qfNMvbQ#GSk)?+Zgowih=igawiY<tm*XpF=Dp|Y0-6jc}9GPj~H~h&V`>Q?W
z5|HKA-g9N$j4Lxe{Y7uPS(D>xpi`273LnZ57N*8MAjht^pnRp#6h7!PEIIE|*C5pS
zS2&Lqgho%lHt)&SgUkg82m0YD;ivKG`dZ*i6Nk7q*3Z#4q2q-!Nv#E(Q&JO?o+LR$
z_I)~n7-W&Xy7Q3G<qGn}7WhiR4r0ME5*FbTU66;)h@m00`GZ};TF^HGKmR@meEA^&
z=vX<0d=Ws1zKYm$!W_M+SyQ6g;>(peI>sS)irr6_YWmwMBd5w?#f56c_{OoJtf@bL
zrlY`?t<vB^g$g)v!W8dKe>4E|NalEgKol|uc)uqZb8DpN-GKf&QrJrPl$3TiN=AZE
z|KX5hPWevTeA=ZV^>f?3X(K-5l6RgAqROzL$W80;js6K}lp+Po>Fi+Mtn9|NA<x$)
z3nMAhom7vyE`r)#<P<rFz*2*^2f=>jQ+KJ?zJ<ES(LK+nnqlAMX?xU}X>W^^3;HGy
z0KY6R;=FGrD#f4Q*$In|@BsHeB4>UijVFW$ko75kV>fFH|2L^M)tnflXMD3$CVbA8
z)lpkSqn(H3hzM57c%PRJ0AGJ?!I<>eb%ag-KC!AvV2Tg8x#kdU_R`B&FT?4bhJRJX
zp7^gsfhEmJvYyT&V_K%&48<+2*p^+J`DboZm)Ty28N8?IXzu$$#ske$H)7iPUCR=5
z^dejJyrYrc*yDh@N0F(NH~F7&nk2JvNGntFXlG$?cBe$G@ccaO<cGrbJ4LLMbMizc
z62p*_0aac7vY+7Yd%k?_?|XEUJY<ouh08m{2w*>lB?J0WBZ$5)TT%XvkAwIoVSfCp
zS7G;Z){_$PJvUyKX&QFZdB4xuM00!^e2eUMUe+|$Nv622sDlapnTT<dv-XJ~)!z`z
z6gG91qwRsM&C_{nlM)&M))zy=LP!?hCn;gh&jN8lSJZ;<Wx>pez*AXxO{saqTH@k+
zC(u|>BVAdN4&BJQ0qBUe0~fyN3G0_nsQp>Ylk?1l(AL?VP$6RcaUnO#k=mfb<D1++
z78I%<9)Yi@NHxbjkiB%RbF>*a`O5~K<DF`xh4}40c)-G+wd&mHf&Ebvf^NMUgB}`G
z^&h(MU5fiENg(WfH1+VmU)t(;;-~{X<+0s|nHKS;L_h1=1RHM4r*5?C&6gsj@-%2a
z?#9cf;*J%M?C6^!+flKhs{h(IE>i?meq+3J8j2ZX<!lz{99aIFF`~yb9$V|^WuNVR
z&AgaS=l$%{0QzWa>#)ja=W(mww-<7+^KP^wL8qYe>=eSoV-eUyHl%(9Q45v$xD(?h
zY;gn&S@@j38{``SRdIcI+sHMJLlqbdm!2tZ<NMBE<ePoOlF#1iA}y74mPqe|(9TPu
z6*f~aMSEVD&DdPX=e_^Wc@K>SuI88a;x7GkK@lTVJoH}7nHzZxcjA)%N`VrivT=t9
zTlAj^HCC8$2*!5w2f^lTBx>`^D@@MFrCmvv-$G&pS#%r62Pu7`A&Zg@W8Dv1`1{9g
zxF7B@YL{kLCBP)McCSUhm60rDhP}*ktj2JQOAeuDX^*Br3kLDtO}fgPT;VMn3{j40
z#*_8<kBB@=t0y0zQ5xm?qb`tEpcXrjt~#?_3&6Aa4=FWIQ<Ia}Ef;^ZX9H=cc72Tb
z%%8_2UJkzv`EZpJbPSZb9gM0WJEHUh1Nr7dZ(fv|kNe-n#lMV5{i}4U`E~ynMo)i#
zv+SuWRGmS`>H&0S_bqhb{eWEtSD}!(V@+n>$1cb=<pyAB53ZpdvyX_v4O3r`a*{dF
z|AxS<2V|z&?Jmui@?^fBw6#G=J5!#MaqpdWh$;<Gg_1Ya#uquR-)}vXe&Q2ShA_}m
zJpDo^Id&UUM&!3X^r-f&nHj(m;|UzrY4!22@$=ZhePBF@X@bRxF~1*n|NaLPKl0=7
z+fPLVzLhdP=eZm``>`x;58)lRcc&@Zz~%`j@B08k@z`4+p`<T4w~*l%ND(zZ9H>_b
z_!ZqQ>z4V`&ZvsIA|7Zy7hwHo21!Y^KwS@+0p9A{0~f04bDaxr1RY3$?YobM0o8ta
z-A97e-mtO7{z{i3YUr}$GYV;f)^{wq%c>u(Ryhw07fBv}AXVj}*KB!FR5;gpD=GkX
zLLB(atb7f*e}}{VdNQ}%Hhk+_R8vxH32&zT0g&cE=%qaw^q^Gwhu^!EXT~}F_6UH9
zRyGg$^|_6;JaC%7ua$Yt*Vw3Y>?{v4vPeA0FaBXww*s%K?YVdn)6n=E?R%=^$Oowl
zY>m6kK;cIp)X{HnF~Z<amDFGO)o{RNE<~YUs^~%&PVXskuU;Z-@l&4TN?MPKUcX24
zU7gI%T})q?g()zMf}U}qcQwjxmz5TtL)Cv!FofFURnwXZeZIrZxk%GQ^BV0Kqw_M8
zn(EbY{WvJnfgPMyiMW6t5-BoI->i6pdiJoT5Oer^54q@bV-Dp_Zv@a`p9K4Swx#Wj
z%=G!5ew&&!4*q%aG;fD5k?f|jTH!~!^NiPW2|Rc}8doj1<ABG`PUvOiA>56GjZD@q
z6}Z)Q5720P9Qmip);m3VSQYEdBNWD7o0jRXOD}-Ff54;Lv0*TBtOfsrA7k&=Xx|Ph
z`X@|sDYvrRM7a4MBb7rQA?lC9R2)+dg%s_cHn)zGOB#P&pZ5zr@+he*Z1VF_{`iCI
z_Y5323?&S9C_`Q6M}vxzRv_GLq!lSD`ayDUy}5@UF4w}(dA>4`ET>3QrSA$D`*yv3
zOz|m=vUKanSox#um05iJ^}knmN88VXMJod<rjN%ubKV1{0?C>7gA$>qP#Iy{Q0FW&
zpcgxYWB6mfegR`gCxXZ^$kVl7{;gi2XmLG27m#*frGgr)1P5>XI$=ufV<7Ud?RSa!
zV!=+fl?CzAt;~#mT3KWTTv%qEao6b-o{qQ)sisvtu&Fp*)G^UniFHQv!mEX{W&j^;
zOsR`pQz<&z*3rkP_zBb-<?V-9)PLc;%;SxG=@vFAo53<EgiZUG!yctXt+$MF_6r*A
z$nhMVd{I>hx8kWEoV(Je4*VMQ@n40_T=|`}lEYg}kpz+?{^47jUsT-uYR#4^e*jpS
zINW*F*a=biW<GfxxO3wp{AZ3E;RH57vx6P^$Fi;#Y3$H^;kzcBJ}V5F*5XTO?JtVx
zp-H=d)uk<oO=vyNh(9%}pDIN|7>|oQ>jD!7Rj|~`4|w8iK2@i@hw<j4*gOAzmKb)J
zMPHx7Z49rX8@{Vp6f)739P;0NwEeCD<RZhUEFS;*5x}WtG|kj%GSJ_jRe05(kvmAy
zTd47sIbv0DZd)><sIDFp8|R7N_^Zlhh4*a-HQ2&|C@sI64aG!@v=YuQ_)_lG4iU>!
zcF<D-2L@YV$nfpOs}vdkt-pJox#4Q5#jLG#TM5IM+c?p9o4?7tSCbkj*8*bGUbOg3
z<NzioywtA_xbH&9L2a*~Eb6ezP5LuhxJ~B5%zCC39fDM@JRu^!yI-bIvnM2iA`6bQ
z(ccbrZqDaX+8&<+bZ3b|AW&2abXIzirn=ywS;yH-E*DICg2Lfxw!{I3*16OajKbDu
z=nJq2jJwO1AD$Ulc$BOdxculCkn|)EZK?K3Y*t@Quu)9A*nS3;VUdWseaO8ouT(TF
zV?~Vn{m#k{Uu6@>&!1hNs?5i6xy$?eIfvREfX_uWX5NC0>%6sxM*#ti*4EnI!v<Qb
zLyQ1#*caf!3=BAvwH1gJXk%8rhD4T(CtL*{nDLkx^lVa$^rS=5S^;Gz_acZz4L=&H
zP!bIs2pFo2WbhV{t1PifXJ~dW6?{nuGNX0v?I#V6Szk^Eg{fHYp$j9oNJNbbi0@87
zRcs4au|ESS^=9ne5;Hku03I?tkGEZ4S8llKq~ii_SfL-r6(%@v3)V!?QcVdW8f=8x
zoASwf9ER$Z9<sm2cHs>oa~aQ%ewF8c`>z)Iw6Nyisj+qvkBYxADeCCgxY>bSx!Kt!
zp+MbJmTPw7@9wtw-R4v=Woi10hfw$;)&wCU9=T!D8CJC@$~{eX{H|QkZc?W$%oZ|!
zenB$h--M%^-+ag1#{y(tTnh*rclT!nkx)8|9K3FiSmXoNRtGrul5@a?-|JRF5xoqD
z5R=O8LPS<K#WTg>eb3?m9~nbCVw?uy#5m=_OTs}4X+6yAf2HTUF2uF3#O@Npc3h<n
zN)3Nr3O@)8JrG@7+E#v4c!7*Jq6nlhU-|yl-iA4RDFnN|?=^z?olxat>^D@u4693q
zLHCef47U=qHFY$TIUL<w`~1%CLB<Kyw%vS#JgcZcy)$}&t4D@=S!=Uetf7&@IkbUQ
zFS%&St(W~TH|ncEc}4?MTK$s#jB!gDq8MRdvLArD48tcu4)9J;Y!)ANsh#h)au9sw
z^WS}^T$>jX!xtoNM3-JiV}Gq5MS(8}w9jnd<&+9npZxuFd9@y$nWsR{sJ5k>-d2KZ
zz-6OF-^xL>yobF|Ud6VMh~`Z}A3sqLfkGvLnokdC5q78X(1Ly7?HXdqC?`N8c)N1&
zHPiqbB`Khv**`RKj4Qk?EwgQ#{NIFaEKQSDag*&q+fmXr@wX%!qQb4X-T79Wjw0$L
zuGP^46WPQ_(p@)PJ_IPHO__x_MCbB$MmDE3G9mPfG&RT5Eea?dBJrJMqqNZ&l4`6^
zl(Xz_jOz>gJ>!WoCK@N_i-}I}aKcx7X!2h@vOSNoj_-V3^=h_>T$xy(Qto6yi?os#
z3%sD=XTA7s+nXL;6goT{Ur}5q^|QQ~hLD?S0PK_=GmgFXaRH=H*;A}z7tOi7_Xg2T
zP5+=FW6kg~!!)7Bx}|g#7J~H=^spm0)w%ngzXwk2NyV(bX+;klRK&!4S)kqj$-9=+
zLOxzN4j2~YaHdQhz9zJ>N_pmvV=|bZ<^t0`CRw{XEM#yCC}3Pbxl0PAMxAd&$#W!(
z*ohC@L*jHH(A}p4U{%&+r+d_b)_P8lg>Y1r&wsY<uR9rZNJ3Alda=X)O4daM;gsck
zo&BEb#8u22e^v%t4(4H=e~p9Y*!44t(=xU?hMyLr7sLUdq8p<_9t6hxU6XKpc+iGk
zq!^rtY~Im)euP{(a=e@W^KBA{)DLVu28%4YnFQtjGOa;3xtsb~Z_LB%avP$#+rSTP
z_b|I0+ysP%IhSV4Y)$iPejqj1)$QWpK%D=bHwUk9#i<4-?g{|qHV52H(7z7$+K~+2
z=HdZBBR$=Lk$JW`(cC-kZx)TRiAT+67h<IN8vZhG<tVJk4?*dEct7%;@95j#O}C>0
zOiakJX#nv?%sNOD%ow9I{La06Nta_z-R})s?UV$ad^n#a2mwq<86PtBk1OG98PV}1
zH+Do=!Rp<2VMs?J)HJck06Oh?wu)oLA;q_#U0wJM-sbi7F;7Lkwaz$wd~o6w?QV*X
zS0e73Y7vLEq&}`E(|=*K$o(w%vY{9No|q#dzl(tT?*cEBHG=d`dGw53d77tbQz5o~
zQ+Ko(|7EzTsC;oI3I(Rw0;n8s_SM6wF_(*qG0EKPXcOC4-F#+*Y0M|>;I{6rwa;jy
z+a75DM8?|(E%5(i>0BI{e*gEs1DnIkA;%3lB}6fsqMQ$fh*d)6usK(97Da59<rq0D
zhlxr@>r4*YjGPZ0k+7+dlp)Od_j-T6zdvF3?$>=k@9TM8kLP5%l3$%U6M0A>BGRDl
zv_jVMQ6aKVCSbBX>hH1mR~-I5Eevp}^$svz{VClQh)^4NZ^PutNXz(g@^6A>tCmh?
z+_osYVoC+woUqo)n*=Qsy5kJ8;vU+jtv=aIfm$_(dacyZOV15bq*PXk*u1W{peTv{
z$)*#70s<xTxPF8>D0tU3)ijLgVe-448T?CM%S~ulvLpou!l~aUv{1^U6n$@~SQxqM
zF#br&lNs2PHT3K27BB(HdQkdkH3?1?jV@&Db}c1W6cn&p##8wjcS*7xnO8reLe1iU
zNrlJ=oPS!qjd-Lc+=*Xzlh}Q@V^c9X(+LoKpa+}|_((pkd$gQv&m6^Nb3ajVfV|5F
z!Na2|nagL705QUU0N-?buLZ?7sKTA4t@Pg;7Z8*BroaZ(0u^ba36By>yM7YXAq_QL
z{NgU}$svvwI&v}@bDtHdg}S<^z#9J(v-1AoT;4uVKuA3C+35s1H$}uo^5X#ND@u}g
z{U&jg(G8f4nfvmSc)Qq5ii7CBtJ@+fMo=*^#rXxCJ?bb{=un4&_Cf|0CGx<am^Tf<
z=}PlG>(?!m4NAA8Z*!NYv;c(uxIyFiQZe`araMqXo+N#c4?ey2px+1WeDQ5ZIH5fT
z0hc~a#fJqU<O5^A{`ncW*{-T5x;HA!lp;z#Ajv3+zNXec2e-LT6o5;tbDB>`M@v`L
z-8O~)E^P-G+oa#3_+YZ;mZkJOt>7t*Y82exNq^!53K-wI1TL-0F0?j?^q7jG_fS!T
z>UYG}muJxI+fB9Tr<O&(AD->R)+9>r`go4%-FKhC$%KBbIwAe1C+EZgxW`R=m}%XC
zi{>_8K0>I9C$ljL#aEImHx8RoQsopW7=0D?{eJLX39IX7F5J!|I~*%y4IRr->t@J$
zuybSmcD<-U*_;a8%^uX<4V+arO?k}w8k<+yPms5HFK_gakBrXm`S?+y##gT1GP^9#
z>f`BiFWr*`Hw5K)qT8iJ<Ar}>@Q++~z$kP)c}f-^j)ugmiaeYE(zg@<u0lDW@ZlY^
zHM@y>r$ZIq>Lw{3ymWKag!;$jlELiTsGHo;8|{GmoJByLSkv)EP5jp6vj*V0i#Y*v
z{3Zb-feWzzaUh7}TfLAr%KTt^(n-9dE?pg%$*LU*zsYU?t`8I>asi!L>!BqHDMA%^
zq9m`IvfHv%tUU3jg$@b+kc9iUB0iZw_vHx){-u{1fhAz1j`Y8%I?KDwI`9u)MGsoY
zBFxbf`cKcij)k#DGIFl&rWLsL6&B_+Rr$lj_lF|P3A$p2H<Q*C2UOj3-kc|G{{51#
zNBwZ&9H6-DNyr(xL?!=vWX3k3&H*kfJD~?4+c@oO(^!9jc!T0$TS%U4fG%C;aTChA
z>jutrUpYMV8QJY_*_kWp+;eqk%0CHcdee*TpQos}3go4O^xR|_8>zfb(pw@XIgg=&
z>$#GcLME<AQ@dB@SfW>)32U$a3*rEu{dxN%eCh5hnpc%2UAgx5n7E^@25}0Te*C`+
z$;8iPOMsn`N>E+otXhJ;oOaX2x2ySFLU$C^Myef^Z}SQLJU|Iujjk~g2vmD0sPV=x
zl_J;o*d*#YcO;`8*z<r4^v&u}mR~-SM3_;JMIupp-djS_u%#m)4rEA*h~Ed?N>wR*
z^cLK|^_7*-!?b75ZssWC{e)a^l5Ppp#8hc{Ser^;;7D>Z@IWvEn3=H+HD2E;Bfh)!
z3qVSYLfnThbv*}uo`3>QGM??a%(kxZ<$s64r03tsH}P}mQs4(l;ImlA0SQG=(htbl
z;qM<8F$=nb25Zru5;wsopnMSLKp}yb^}@HNx1v||$$6);fOe*}^+{GHcV-<96!n=w
zSDd{QSKomFd<jZ>Qdi-?7MT5|2d~RfZ>u2xlFaa|VA<M!PP@rlB@`kNCdw<USVu4G
zTl9usnL0?74g*c*>&W5wpQ?KAIJeIC4V1dKO9rD^G}SvtmXoE7Au~ZgCju}z27bI(
z3;qK}dA|H@l_BXX3k6)k=-5Nk{^Jck%~;Pv;GxnooB<T2_!yvs_h7@Z$HzRRH+Oen
zmWG`3(KD)O&<$vjh--vW+sa&gQ03(fZ9H~<1}oL!3VxYTQi4K@FIYgQ-ZOGiBx%Y*
z+J5AB-^Q(nX$n_7+%&=J!Z`poLngfq0eku|Ny;r5+RwwB=@^WwpLXr-K4xmw?JV)o
z(vh}sS{R&tcV&*5l72CH2W3Qm--!(p)IUkcKq;uHFMR2}33ZTpjsNS<PK3%ENx}%}
ztzDG8jv{u0)7a0OWyVmyhk4_I7v^!T)UP;!BL|K%j9UBp2zvM4g(v=YqppuPQ*dRi
zRTV(v7j-~qyt6_SCKhq=+vQ~LpK-F|_&u;Sdibw7AeH$;Oi<h?d}3}Fwa^iXdfIEz
zMqeMsQM0$V$?Z<1ZMJA7TrXN-;XDfF)Pkz3f6yQV7bl%_KkAvq>TbzkeL0iI)n9i+
z6khj1d2b}oTEgz;U$;oals56MaXZpZ0&j-Ou^y=xu=EqylUsQ=iSIj`c%Oq8m}46^
z&Ml$@vW!t<6^Trq(2(PmjYTcC5y5J+Ei;2vd>UMCe7Q&>u`Xg-j(xTRaRgr?lwREp
z<UEtZ7X=J?{}Pq7to}0B5$|Z3ca)}AD(jRh;X&4hG%#r|?xhNLyXgDXZ3$rKLz%tZ
zoc^O_Q8g{Ip6E{=YO-ISRjr_x|J<^Yje2k86m3HBsuZKZFmPq_SSs;X<tArD?HrUZ
z)`Q-7Vak+#q8iTs>`47AQJWku|05Z${}l60fs+<{&_)<>_1^oROjY{qiXioL#v9zM
z*X2xZtGj*JaY|O1ntE$aW!QOn8#}xfC7+JHss!)p*O~bOT&@3zF6_P4k+U<5MQH06
zRq03EeT(y9fa#&|a@M1!o0aQpnuLr}rv}pQo02BJ#va85Wn4uQxJ}KeLpJthDwI6Q
zAOEiJsxZffl+g2te`|4+$Vpbw=`t%Dp@2}ND=Jw@LP1*TixCDaD-M<&9(vVCi?GD!
zd61#M`f~AX%R6FgE2}tmo|y|+EG3ij3ymp1?PmOCiehgupC0;Q`sg~?hTmKIHlNHD
z6#F{`Sw<<~Cb1s(Zei(A(bWdsKCF|Mn^1Fh$_ykp(b`p-LXoQ0g1xPqS?s$FblW=T
z1t?9!9v8){NCcM)Jb4{;X(zv%iBN*<s{FGKrN(TUpuTu91e<R_J_Ykm=KI;tWcnAM
zG0wAczCzLyf-f7l%KSr}`Jid=xZLErnn~|1mNT9Nt)IIJ9Xk8hGdxEv#9Ei#xMJt<
zhVsjTqH5&pqJR{|u}8*Ln2TA$lf%G`06jp?G^hM`rNkUrwo8wCnL@X|$?xx14bc{l
zKG0Z%(DAd%3LVlgRb<nYs;iX1m(+uDSc;@J#&ZAOkR)N#W1Sw|xaqS}J|!VvaV6Z(
zr#s$;3|y;!_(&nGk0sH#^AB?+m&APks2>$rTU+IzCh^r_{5CFwrTO(5cMn}R@zNyd
zQYgwkIjW4wk@Tz4=?LPaEIZ$5zT6hh8^ytH(J8&jMQCNyD#Bg3EQu^+VI!2W1>Q3>
zR)10wO2j)f(0HJ!g4lny<DQqGoExG7???UmSAiN$ARe7B71|FO5Hme-6zHAb1aRc0
z>Q*O3gccEufpTci6bIg0^p+{2q~u)uhyHErn194W=^9c$Z8C#NlS<|rRA+yjfx(Z{
z@>t{iuefQt&5fkt?X7+6*ADS0xh->(X&o7~;%S7M8y{oAzvG7JP{IWpA`KtHb#O?l
zYbWHvwK`ZJJbR6R=a2%OSY&k;i$&l(Oo?((M?mCe;`^2Tj5mM5i!U(2tj~Pe+eepS
zV+xpQwAB@@+U?DNA)|}>>^I0a56&Y2dPfHsKo<sXSW$tZzhLO`WxZnYu3(G=6jVi@
zRsvr)a#mFaHnp7YHybGJP#yKTKK{+W?f}!SSNCg|*h32PmzbsWpOjc5tkUhsOztQ5
zj(cVUf67@uodH~=7OuttElwAG1|cZqpTPJ}-<Tl=|9(J71q`l9?4dwv++T6Kc2Ot4
z?gob2<qaCuC&SI~0qP`=orp8yn_Qz@bHZHBhst!;o_<8*gtWkN<K<rZ)fsQ<RSV?c
z=)8DoI&i2_dohW2#3;B%)HO62`<F9jXrl=#ktaasWL7$TRcgTLU>)(!E}a(1i?=La
z5^F2QeEIZW(2btG4!eXADRZAJ6gzrH)2#$=4P={M=^S9Z6>oINl_Q<>x?QRJri}IJ
zWFEKkYXhJ!9$J-V2As$RsAp1l{Yq+#>!aUZ5_dSV5xCaP3+(?6ZGt(2!93O%UrD*b
zXc&Y1i$2ZOq)Ll|rpC2R(Nfm8wpO(I88&LB@hqyi7`a-e%!GNL93>Nv{&l5pIkW+Z
z3MV*+4Ka{2?;0c7hpFGvPNKhTHKva51>c<$$*J`Se89qvO%WeAH)`M<0<kV2&3hoH
zO8?&GNIk3@i}|*_dgJ`q9hspmci)^`c{@4SLAiP?(GP`f_mGkR3zPgVfoi$SsiHE*
zyj^y8do@t4(Wxry-bul7>;kPEE_w&S=*tlGfV^c2;{XwZISzSYweGB^Z`{rMIkxZC
zkRWV>DhGT#TZGfrngQL{bwz>8{P@+D;jl4A5Ftq831?U%`X={%-r%Q8at@YuuEi{h
zm7nD(2G5b8-}mIlNwXhZzK{C5xhmG@xutUy;2z@w4<=88ZoLl>dd{2o622a$7kAq@
z9*0oWjC?<91W#X>df^US?CnOU_vr=j7Zg|KU7xq49!4dRWdBTAc-&xumf&fTi~ixf
z&q#?Z3Um3w3i_*fm@j|%x6!>dD8z{wNG9dUz>yPyr*mwq;-xKL?Vi1nM|3X%KcPJZ
z!Xbku(>>^cNTb7uX-RnrjKR5szj9t4oLflC;5Z4uu7K^)N|h}8aFKJW1H)viov)w&
z{-sOZqj>Aw7ZWH{^YTIJTF+r1LU_~gg<touS@`mO9|q}|@`p>iRT5*1xHA&i{zsKk
zk`XxpoDGY;@f&e0M$$G~q#`W97&j$Tw<O+W+YF{nA_|TJtSisJg;;<hkv2!eW!Z(N
zbWy&K3s@Pt1kT^NaUjFJ%+J2ej7;o*bGCR<X&Z%hJuJiV#P|Q`4x4?XK73gat>C+e
z{`NSUdEb+?%$OaIFQ}a0zO#xNc}va&C|IOcrl=0eO6wZ%`?53%qW&6d<s${m6ck&w
zp<b@?QKm1=Qr|3rA=(u?$-H;gGc7<eBhAOzNr#vCsGAmcS16G3W!A?t{1$h_PhnhB
z=%L3s!*g%_E?BTjMvb@$!cb*uhr~PE-`k!4u5;OcwE+0=jg!8_0Q~+tvje?q!labo
z#da@XDyZDQZvMBHvEQn8w}H&300ZL-YZ5Pi*TCWgcBAiI+80zjQrJ$=?Lo>T@4opX
z;e&O3(;rmR{EEt539HWCR+%1(X#E+ML@MYUWYiTsc62yrP_1>{Ant*c^H)gOrK^$L
z)700s@!>O-T0H1--DiAuIBb9G`>A8p&kw=gi~3!xmCD2f*`Z4}6*G-mm%R9^{^V~E
zutLd<NVawz%3V%5`nbS^qN(Wri#y-0kG>ZgTzzitnkHl@tD>o{m>9~Ep-K;Ye`~cP
zIOIW#>P7~V;jKYGKCRBq(}Kr`r2$4p6eKRjeNIe}&K(5V6w=wu{x1tRivsMQIQwHx
zTv8$w9Y;eHPxLLn2X4EC5VUzlfjLLM4hS7uyujL!27dj%k89+Mm-!<D53?-n*?!Ef
zA0sLo>lHnQrl`i}UZ~O(wUh(F8Land?I^d+dfThpIYPFm%P4_kyHOsexmEjVSQ*3j
z!e`Y1g&7660%1$Yj^F5^1YvDSOR}2y$8MOD#s@tS=6S00n@~gg%7i%e_qdwP-iIK4
zhWahvr`u6zC=nlkp;KP^T0T0a*JIMgTU<SPYs66&(&G{2{4~J+kqE)#)ay**pkr$y
z+GpP$>e0^N+)R_@d2{y9Ft|x;n?8$8o3|^aw-5!CH!k<n{ksBrtLIfYnmX?|UK729
zTB`(`kQ%6Fs5kZ9^IyR4doK;@j;a;zpe)-zF^SJsyBMj$ULDM4X{qmm4`>gms9&<A
z-qyes%b&%e!Yy^~R8?4DLrR}r=WZ~_{UZy3Sl~{L<29?QgJ5q1AAo&K{qG$%)Fp7h
z2L`6I8pc?^tZ(M!v79PiuHG<-uT8F<5`Z3rLJ>tS|4ObMGn~Ixd(vWycaZ&3ZNOxe
zKWSj|x!RuU@E{9l2vi~Ks|en;_K}UC9=s7yeY<{cPh9C`RdTW3pSc$*PMm(weQ@k|
zA!hcn;P4>)ZA06gp+dC}#+ON6N05-&yTQ{Y20i6wMQW|?*;bjt?;Q{RTi#_e(fR<;
zRaUlqzaUX;zP+WT9tP{xd!rYGIf^6Zq&!U=+2ZeE=P!+*#x~ZE9`nfoN>3M{qWO4n
zw!pDwQJZr^_(A%E|Fn|g|NTat6f3_yw6Zy#4cYKo3aas#Z|ZAaf5v?vOi%4V*Zg@A
zTxt%+)<zh!UeiGf5GygcEc)11Z|}iQCXc%d>IE7v8<yQ&F*1j*gD&^4ZS;B8)$nW)
z0ZUn5-%K>ycTfTGC8>I!NPP#0id&_ScTT|Shq{7Em!c#jYntoQi6aL)cA8+B*8O`w
zmR1f?|52HEL~`;6;H2X{EWi3JDLa)+MlzCcGLMHk@K>)K@&rD8(Rhf3LcyC%d`<zO
zn`FkbDpvI}aT)ioF>4@m=O71e?M3}SYvi|~izTD()2bzOOm1p%ulM5R|J%+xa_)l-
z$eN&*cGAmVM|vzX$!Dz!f<;%9&-R3`m{mijV2I~Af>-<fpFcC8z9EE;CHB!*cnNR6
zx=51#&Y0H~tC@|I5zle0sr%b&N$xEqNN|i3iK=endsx**UjOo=MDd8RfV$;^)MNgJ
z0?%oqqkCVT7BNS$?ijVB4m>$1(HtidZJU0Pq-@jRgNt#_SN0{P6i_NH?p3fFx>8uT
z<lmo1ru2To4RR8A<XnwR1(I9b{x%s*-R&BRW6(h07$`y;xH5*U4-e)Ekz!IwFThJ`
zrm~g>?q7=1r(|U}$7@jV@BIWU?0t+SFF7$!?L&%+Ql3{Gg6~;5UtWK;oC}S1pd*l4
z6y@6j4?^z=**5Jb4iu0}FUD*Rx=^2t7~wDpDnniz439S%L2U_4qK;J~s4?9xxYBEK
zYc%HT@A3qp?$-g+v5rCZi2*6&s-~RfR}Gxa190JLkR&*?EwLbW*%fBA)$Cu43s7W7
zO`j9`d*vbUYDYcbWWR552a+UvzU(aAhLC4L0kJ$^B9!s_VP~w5iR9!A_;+-r2ZR?<
zJy$k=%&AbNKe}M|uE!Tf8s!ORrUal|4<0WRqG+aCHA#B}z@!xAY`nmSyHfz{b^<a*
zDEP62xw%?zUmxe8zfEpRKgsK=hty3eDc|tB9}|QD`i5U1e#z~+5%TY!x9z<3U(B(q
zTR%smsP7&`05R`NfZJ>0*x4(a>0Eike9Iuil)7M?tN(6H^p;p<obb}RC_G+HUPvhI
zMrPGy5_W?aT=J%vEA>z2+*xxdB3r`_@r!(j9+5+KUG$_*zZF8bpdEnvZA*T3=8^2Q
zw~98F4~!B*|FvY#0T<R{F^y{`n5Kw|q%*)#b?rq8%}t=jO1w*eeV*~($vc80A8V$-
zAkhrXy3>2KI=Ttfhg-IC^?gw0W1EnvNbPxp)Xg94D)Ir<5;mDd5<Q_^ado|%_;c$4
zXZ_hPaZBAZ2VUcT1iiz~o*(L?bH8};u3VPnKwghE{?I^2c2Q7)j{-3sS7{rDKi5mc
zP-D#~{y}xU%UxmDl|*Q33kuZHSZ~ts9j6{J^@{+wN7CT44_ShZF}qNA9<`uDR*!!a
z&^F5biX)SSJ{lrk7~Am0SFhHN8@Se%nW!SI7jQ3dLNgf{46dpa6dFO8N**yP9RvQd
z1%Z%-ov+&kUULzEMgfVaeryBtnK9Lm9%I<PloSx_WPD1KQeE*Xwi<>^gbw8NZv`}v
zfweJ1{?9fWYVH`G`bstf^?KG=a6A?Qd*|s1>~U}dUTkEbPK@3BvdBj2g<AyHt;7)A
z>qruDAFH>}Ar!I4{HPmTURMV1RMe$F9Ux1uO+!pLTZU7m(#G-OcG9j78HksYwC)GN
z5H#Y;f%Ax<tFm<i)EC*Pd!FB%9-MSQGNs%;fS!g7!QErMC@S~h|KE2rRI)Gn^<LC$
zgeI8VzP#)7go`jDSur*nZ1#$r_S1)kJa{1NdnxRf;A5p;PLb1S{c<`e4YvP#hAOra
z52<*E&ynvBulcVNeBXtcm#qppgOViHzQdS3%Bcjgk>n`}B$RCrH}W<k#Lb5h!hizU
z+RdzrmsLJg1xT4d<GC;1d^594Fc^^LPziiX{#T}=goPAKob1J-J)b{jPW>a3Feyd_
zA`7XwYyN_mAyG@Y^5npC@=wg(@g^lU6;EnD{s25I<sC4ti4fP}TY~4KlVH{wkkJKp
zj)YEWs$Txl8Ea51V5BQbDK|K$)m$E*P{=iiUhtw)C|2K#P|%$(;b66kHmn@vdvAi$
zWP4@G%Qyc9^{HtuaHxAzE4YxM2s!T|QXy_l+YuX`--_!Q=nBBEAH8io)%n@Z(4a_$
zDG^c<l^aeS!3*ph9K_8g3ZchfWucEM0(%ILemYtX3L#5Nfmg2ufg4}WbL1Wi<@EPE
z466&OlwlA{fFDnmsTwX?ysh)4r!v{k0q)HBgp$E$yFm*cbeM3jw`rJy8xM2<6%ol-
zG-+TTJ7b4&pv=%g)Z<g74$o)ThIM(1G~2k#=zolX#3>U!=4MfumD>)ivuNbUt(XRM
z2O}z9i1!O;6LV97y^;PIF!64Lj0lS)3}nR|KK&OE9o0oOTA&B|5>@&9<Yt@8Ll9B=
z&rY+UY`6Om)9uYP;$r#>UUcZ)J^grM;Q{p`Xr4%M>u%J<t_{>i!6}pg*-Yf1a@Td%
zZ?B_hr=2k@q;)d0T+{_s*koq)tiBo&Dt7<@h40{<Q^P}!0v%>~#AoB+-;)Y9_Tn{p
z0m9FdO@R-$G(6v|O-Zmbe(Q5Q^&HF*<~kDJb3{TiC5<+`7z>$X@{!m#6rJ4U5Etrd
zh70D~_2nMR(N)RVoz$&rQ|g_hF`#GrTt%UIlOlijz+SL1mEgpVJsq<7brp!EnK}Q*
zL|Biz!25HpieyZ9^rxRte5akM_@GsCm)+&C8`m9E)vzCKvkr@3tGBq@7Sw{MSX|?_
zOZ)e0Lt8j|1qZmUZ2tSbf(ZMPLm_U_PyxwjpyiZ$xHa&wpcMh1Lw8zQQlzf*@5q}A
zIRj_hu{(K2%rq7bE3!xm;%_VnLU;N@2!i`750w*F?>TZ7Q!OE`9k%y8a8B;d0r;&W
zjKe}I&D>_kWN%VR+K%FQ>eRDEE%R~WP}GiRJ>Q0orl}p*3WazX3P2SVZODOGwm;Mb
zaVgZQWhM=xr?3TxFhxWz*?i}|Q9&s<Ke?MeYzv*-1~i>M0N7dHJKU`Ol_AU^z4#hv
zMNa@fl6$twlM~4gf&v45b3Wy1{7PM7=zC)lwtzi7mX6DDvJdj`9fC!16_}pUrrTVx
zXzMcq9uJi2UsKlPu5R|xL)xtP8YVRh3!QI*f&;~?9K!?<%?8`PaZ494u9`N@M%mK;
z^gY{n;%{FnzQpd?Z&*yWB5)Ls*@&m68DMS|!!pjycsU-Q!oMT<K7#5oEe)c5yJM(J
z+fVVm3D(So`|1=8dHLs(+C-9o<!ChiC-#Rf_<n0CdSMkw4`9&`N@ECcxm0Rk_2}T%
zblWLv>_Cf?(vWqIKUbYbxx_gz2-1M=$Kqy<<HZuBm8LldAL0EFXV=4L&LU>N9_6V~
z7x||>P_A{;jE7S@*;-V0cw?@pfMr4FHq_idSB}uhrU2_IHcwAM_CIsF`WfA0_zn5x
zxD7g7DoNzv@plnCY-<}5HzaJW@XRP_(|?E_uEMrMD2QFGg6=pHiXd9$<AjJGk+g*v
z4<{yEK(ex2xPwi*B`xzJ9U~k8Zp90`Km7HH<E`#s>rN*?Rq%|3aq_|a%Yy56)V_vz
z)Urw=MEQ~w!QYp@g7pvHH{;LYR<X8_iRRSwFDLj{#ov(9_ygq^0Qb1*c-!TVDz(VA
z-O)YF^mq`BMcb5gEc}~NafZ;>&c^>NfQH11ds5EH5MU<z!w{RU(g<Sk9G}zM4jk*h
z^szm1c^fGG@Qt%i77sBwE#UeNivuXaao}=KL35DA`+}6nl)d@=sw_53Rqg(<+{4-4
z=F|$|Huk%Bw3TDGlvYj%B;qy$YSv#;xc>@2a!yi)$xC-Lnv`u~&h4WVE1c^tO+#d6
z0&aQ{fb-Z_4n#18St%`#)-*K(l&{>8=iB!S+nJKk`6X0$ua<#J=VjSx**Tk{v|N@>
zOOBQ8xgSdY2lFkTIHD;{m9S#5TbYao9+n+SJ^S)a@lOkQ?Q;knOOCZ9D7Fw~J9Fm#
zlQ}AhdiXJtSQM+@Y=<-?G9|_S`SklI$nXPNT8fm3*tNN2y(y4k6Y~pA1vO{Vs`88o
zP=D$$kWO`e>GgJxdMm!ftDmDTHtfE*Fz!QDywH#R6n?R)tSp$b$gnz5g29PBdiz6~
zEkP|Cku+K#P8GuD8&^}Z532}LB<Kr57~8u72B-+@Nk8$caqaXqPQ+KEa8f~9-5uk&
z{kxt=p{U1GV3L;CK*8>_CvU0L`i`lkvT(Oa(l#+}Q7FPhwLx_=)^a8FPe2_GY-XOC
zezyAtNG0Mf%>xKIa`ZEwuRSSh57ZHf+3;z8{`w1jOplbwQTcVoMrHpHMvd8H_+tuv
z+;Zf>exNAH@`KE@t>B{ZNkr(uiCS<J!$0KHuPope>no>8i&i=A7$1rSYYg)1LYU)8
zK}{k;{L>NLg&*rVDw8lFRbMU6@xQuq`JDE<NE80%ZSHr+R_Z~$9W%~PcfkIGk9vBC
zlm80{5Sr!amT$CQ1@V^m+^g6{+83G4^hH#}Me)q^RO#EBXQ@?=&e+nQS1qG{Gqx1@
zW}2!@!^|t1*{E?`=`b0k{!DP$bn%Iuk+%31W=l)XghCHN7btnt1S%)&<)7D4Tbr7+
zY-`mHW+#(8R41f!)=Kv+L7HdN90V?9-3hah)0mLrjGg!73@7*9wVX(CV}OE*iEXzB
zzBExwFezZGlfKZQM!hJZLRzJD8htn3MNNM!7##&y;>{a;x_6AgGdM{Sz1R?6L0o%K
z22^+ipB+lt#__t7tw?FY2ciuBvHo>8p!=*P`ULLkzVIj5Se-~DdF>ZTg&uk63@jW!
z!>P)&<P5xO2R@Fe&>ob{X7&KHHDY1|9^3Si|Bha3&};F55MDz$Q#f;I&G;o3!YuEc
zs<q&H9zVWz@zVu<{SD&w%?q6G`z#G6gYUNuoH>wp<w<+L56W4|)4K6W%qeQ$9ZiH*
zL`SJKU%SX=5cQDpxavlHI0?i6OS#!1c~eGNx09k_G`5od#kb<Ma!>N_q9dI?B0n9g
zA{pjP<uD1zQMANcsddit?|?<phtS?#NV;)=pY^W<(iKhmcUS7h0s;K=Pu;oGU&IU=
zIY{2;Xyz6FAq2YY)VxWxmFmDdsI56Q&q==R3O_%8nb);Xl84Xt>(J{B;uPUEXn8`s
zZ436G$sii5)rJjew*UH>X8ku2kd^HOz7Fhs20H&dBMU2CNSC^0l7L+6jj1^w_8lMW
z_xVt2o{9x|m=-V|=pYBoTEk<*e`%}k)IK_c)!sdgO|@1mZ1(|^;JgU^-r4U2U%|p8
z?Ipo!XKC<e`@gTgxk~`7&0p?Cy<Adh-0P8FP+;XYoT}ltwE>cZ|48_=OI0xwt=l(^
zr>qf>eGOjEBDC0TDyd*|$I%R(8L~^;Xk$f%+OD;N`O){tmp@OwS=m}kHr!-lFxh*8
z>~$8XD)m=IJv#oDT_JJl%!^&4*9AA$a2`5&<2Fh8qSIUO-+h=3a%9$z-Dqsg1oD$Z
z70DFuU(!doD{wGeE;?)@<&-?ye5?AHemSKig^YeR2fcj+Jf_5cm4ojlE-2d+AVb*d
zjk;>@I*%;;{nS49*C2uVw^<H?sA&!R+F$YyH%BmzTT&|)JCuAzt3OlCym99n#DFqt
zz>Bvn6djec<y-eWY>&;Kg%V)f{29g-sfiKN$%$CPn3&ic-HN8>sKWUUr|c}Q`WDyw
z?qe$+nDH@KTVG+$B_hdlNn60`TmQi~kAV9=R-u4kR=w^uu!Aa+Awhq11bWcY!@khU
zWLPrMX){erAHBv<u1@pvWU9+P34$q(B_Cr-{O@P{SF7gD@m@8yn9g!`S=&Ry7>x)w
z%^dY>*@8naR;@;&>Mc{|=Tq)8ztd<nxHs;8!D(gJV*ex!w}w-z@7YtEPwxS0mqUCB
zaW{Sr*by>*e)@t2%x=HNV73T>9pTS{@Xr=@jaPb>0)Iw-qZ?x+6^-AFCUxPX&OuiL
zCm^8OtoArnoTEs`s;wiMtYB^zM@2*1l1cSB7@N|k+mMD}89ZzOz@ai@)U-?}U6~EK
zwK&tw)wG%AaLfx>yry=6@MCrKf{o{Y(DznnCi{Yfd7^l(c$@$^cFvnwtN)W2bazcG
zd78G)Mu4m|)!4ETFcq6G?~0+@PmD+SOn9|1#bz;Ox1)2_%=TxiH5|+(F3w6(x7W!}
z^4ncdsJ|8j55}Ex;#yx703?;5a!Z|1dlPVbF6rjcCE3^NyU~vYF0&HwjNlRSSs=^8
z{dmX$EPpWwqjax@$@@9yLpXy{YSM^gRwb#Rp88xC4y0hSi?72dw;G3;htA931&mj(
zp?mzC&@#09A{B}M@`)e%{ajUU{Pb-B(-LUB(O&UiL{J)TaR+g!+~dwKe@v=1smCqx
z)k=FikBx|BWE+oRzYRwsOU3!<5|q*lauYI2KY6XyRSczhzdwlg<R4M;M1lWM!-grl
z`t4odT%Inv%S{&JzfYGi^n85}I|*#y{JQiGcnw{3ZRkIX_o}FTe!tX8_*Su1d!N#o
zh#Op`aU0m7G-OheL~hrQaSN)-HquT%O$qaR(wqOz-A_*$VW*4BRdlZ+@W_S~LxfjA
z2Y&bT`QJslbGUE(^;-`wg~LXE27`ZAW=g>un?q_~RSq5j_15J0T*{|MhUAp?>+-4g
zT-yBRxbAQtrt}K(VAE&U6QoMxmtw(tZidQ95rndX1Ez!j`13km2NGaMHXfQ4q5D>p
z0{BrfSn@?bjTXYMyf!A&`EU}(z+h-K09)6lz@BmedAnVhsg_F*PtULPbEd@-*0!^`
zQ>w;I#Y#NI;=-^HyO0z4AB%#7-e;jL<+EVtp_<Nmh<@WB-X4T%_!bLJ{pHh#|13Va
zojIf<?QyW1iD~_>!c~txkHI3~AVQj;w#@y5G%oVWdEGD`wzH{?hdxwZCbP4Tsp>pY
zF6Raghd60M6~5bz{_s{B4SOkrehL#^j<FLrXtapD#^pB$0U2*zlUDlhvJl<-Z#VV;
zH%_Dmd<<F{4K(guA?du^R@5+)#_wPF{hed1mFY_74ep^v)vAff4jgt|Xzl`f_ErUj
zi^)q~1TEc~BB#%Z9AeD<UJC-Iwk_0X8HUVjXG&C8?5WWpkr7m}P6WUX&4Y~h)-K49
z$mYV<uF`I+?^Ui_iIx*|gFFiXR)4#s()(5n@rx;yXB&mMDDM0}rr7M)*V#mu_Dj@v
zr_%sn&Rp`qbphs+>ONXoNSCU(8DnO0&Ib_94y{ff-rg23cbKb~yG{sz0nK?PeJp*(
z2PtVkd;I<W`p_zpGYM3?2i%c;O$l>)?DVj~n)8CV^Jy8LX~61#azN^7E656F7o9LU
z!BwLviEV7Q^A@%4$o8`wM>=EOs@a)EPd$2>ycw}ossRoZfJ!j`-h}xE7oTEDo`2M*
z+SAiQ=Wdx%{hq9&(ly%*FpY7Chm@q4ChxX^13IY`n2#CFIb~^kjx$|CV$MlWz7IH@
zV6In;qsu+Xz+f_#LV96HX{;7cJXS^MAUjorAiTuw(SmO+fB$)X9~iHxvlIP<BesTc
z#8=Y=1VEu1ACUZE6DA0gut-xB-`)z~UpG9`*K0dMgdVf=Ldd#xB)nTihN0Y4io2M+
ztd<thA>Rl<+qd||1jMHI2SA1FJV<RAZ^njH#HCio=`3B*UU#YW=SQaP9LkHAkoWVw
z*O$&p+D5qa|5#~fMZ6T<L)aYe2Hcx1#dS}CPW$jzFHr<=_nv_mM93oc`L%ZSkGTH@
zHO-{*^OHDSrK_gLeJQFA*m+Kn=AjY@7z}UWX59V#^urs-UpFk2HKnFJ?FCB0LQsH{
z>b~_LW_k$wS`5HYIezYxjJ|}8eY7Hb<B1*W;UQmiri?9WY&NcIpy_RnZ`F8nd=EXi
zO@#UeDQ+;EAa?qSPHSsx&hMR0&xTbo#d1oUs~Z=B|0Hj>b%ak&ALe_OKFq{W7>8me
z0%QPlNy(iZsv<kjBg$wIYtu0gOF;I6Wmh`;juaV;fvLYVM7_QxDlU-XU{*bEL61t-
zKFCK0n*_CNWv76)$lI)9(JQOHoAQ9!@85go%2c7CN1a-oxd(8Jt?(~CJ>HYkbHVZE
zWfhBNf9>Br#JIP!8f>yej<>Kj?9RSdsK?tEj<eb<jq>W==NEDYiz-i*fGqzC?&{@^
za7}F+?f6Gz_wCGNu5e?t4JtE0axi_|B08Hpu^r@UpqTJ+f^dHLILO<Vd<`CDBPq|@
zR6dzWOYNTLUq&GEclKLv*E@W1(Xmgu$fnIcgpR4gzrKh#zwAK0KP8SISKk3v?<zis
z${LO5S^R}xVm1zrSoWXQcC>S13Q$Etz;^A+N8MVgi51zmtDED%WHgierW8#7stLS)
z=H*u>GAi(>vya884l`rwDF_-0f?)o&%2dA_eF>W_^qGS(g~B)k;;|JQE!=<LIos*T
zy^_>yM*|q#+V<!TL&Ytd8%@d3=A@TpBqUUmU?p35kwwrID#^0oPwul>$#q6hYbh6G
z-@oafL#6-rL+SOIh+E|3N_!CPj4xoEaMcOZ02=cQDF3L?oTPHbERQ1Jk8MouTi@f5
zh8^lUC_&FS0)1kY?x#aB(4TNk*J_wM+2$EINjx4#07uAOn+wq!0>Ly==mZgkY2UrV
zdroAB+3nk(Xz($Jed}Yq7$U`fA5T*wCo5>s%g^|E&;hSmO~l5A&|~|D>Zlv~ro!GZ
z00slaqnlf6K;Gx)4?<PGt13*ct@#O+DQ(=o$^DgfKU}XO#Tbs0n1dV&mKlJj3h%+x
z45{fIici?y$4*Jgmx$p`mjI$*>2Ph*3F8*^44dPjT`8+DetJ4K|A=sd38g7hp!llr
z&_adLW%J;Bw?mh|!;;1r0or@Te1{tNGI3EdLZs!wYj(FW{~R<wwmNHmVVx{VfbBeV
z&{ikUFB6<p!k_{X<iAaLgX$J9<0^tZ#3Ct-H|Z)_x3H<m{*vvkeIPFa<^G>9u;<?4
zxYx*2nza@9FQe-$TSol;>Leiys;wAfZ|NSWWVT2me(5^;DZ=Owh4CL>EMOfIa{6*P
zcX#x(Ks3`cJYCjCD{OD?Y=Dw&L1#P2vDpIdT-E0@`&^9Bf34zgJp5(~^nIvuOtupV
zcb_K?<fb^aQl3UPG~8Zjpl(Ur*}e7&oQiO*7E4}L*geR&vYKkEi-*r4%c%7P8m~%}
za#z{E92rd-DesI&HG4MLyBjf?<617L=hENMUqb4;c=Hw-9{Y!f(6Go^)YoEm@P$>?
zhfZVg?_Bf65%ML(an7&zc05Nq_~b_Y`*}ob+z#My2>7Vu<fw|#gkBz}Ki*V9h{B*u
zYlxhO|M#{j*|2M2<m?_}up;}B<~)_pg({i<o;Ve6;|y%$;xRQ=Mp)&9<y(~(kIV9P
zh*y#;-h>%wT(8GGHcdb#DlrVSj41BpT{i4~$gPq7jze*p94ob?Kky}I+k3Kci`%;F
zqLEaw2g!0$t|oh~$N;`Pv1fR#ffi}=Pcf^Yw?BrVchdi#g>})K81cVdq9dKtfBfin
z_ME+0xxg#UEr+RcVWB$4M_)`7ImCZs9(+&L@0Le}DtR0;T4#74YL}GeyrXY*os2W;
zr)F2MDu>D|mtPopePecXS<A<#3QBmN2pTot$2v|$0{t|{<hJ5sbTqIZIdr&+G|5@I
zK<z7t0le1Fusp9i;1K(TI|34Y$N}xWoB0<B8z!08>;JFGI)+=70DAi89Lku1{+45l
zs~P7A=O?9lB@rh>JCuv0D=ctMo`wZvF53?FR$G9{yArz~X;V`n!G7AFO5Ewb!vOID
zrbzwzru^kA6*OI<9Q;|0aX6l+nh;rc+z0z@O|ZT}z|dzx?+=D9erG=)GMjRB%XHu=
z3eV&I@uTi~q>uG1k0>X$zj_4#8yi66f#>0?Q$;=o8|x|U5E#TU02>nc0}2y58zp=B
zslYXEcP%L4$)Au`ls>PvoYBYj#L#$N*Q_ioZ*w<3oFqti4PU-pnRHCphWKIcz^@CR
z-bkX{^quE|I#O>08Lx@&2rQq-1r&ZA0b**+YQnUXF+*20RmQ}&tbY#=+i}YG3Z-_4
zU^>zsfX7g<5NY-8{pL*W(*1s5=h8(WQv^;wFZS~Jjv-v#;(`d9Qqhk#-(2tG{hEuV
z_JcU?jg9Rha#2d2Reo88RlZHJ71c4<D&3`!T$U#>gok<Ub}swZ^moaM>OS6#^W5U6
zkyly_5E4reg!~0X>XS$Mr0k%#Fc}LLFNc+GRZb^*KxE@Jr(>Pf#<N;d?};O}s-6*d
zxoqcPhQ$ShR6Pwyra>@;2}A*7Z_@VWt|~0i_MjO@{yQ@ZJ((77@J;qDo4yU&@Et7}
zxSC!@OSpZ28l}tz7PAi~XPMnM8=!s6IcR8G#9;F8zCFFP+=u;mm#K7tS&i4M&$!hE
zV)#YXHV89+o2zigXiuOXi^)6$7G4MW!TRi(j6qcB##(21115{u`}i*4bjLS3hP|zo
zjlMTm(Mvzyd7Qce_Qp3Lg+}A#%fi>Ja<1P@BO`~5e+C8yas-G3!Ir*vElgH#7jw_M
zUZ!3foB2SygQ@?nUA2E#7i|}<i=ayEVRrRqzprT%F^B4=yX&JpNP=?HdVHftp;%AD
zp>B@OpB`F=Nd<TKx(i2FX!)CQFX66TVt_UAqpTZ|)D?<P7PzPrMERg<9@&;Gsv0X}
z$(NU+7Oc?IQ>MEF|JR`4+_eZkJraAOzYcapJ(9Pn%oIaJj;EkM?TSI)a5fY0o{8nn
z>_<>9ccWeNGtt#QqIZZ`<@wW^B$Ehy{puB%j+5oS1j#Jj2$=NNlanT>TT$ugOQyC;
zE_1u~b<^^zy9fBUZrGgdAYBY!a%#SMhXC@+Ie%0L8T@@3PZlAf^6;yFpqF-BWHr0X
zlM|_Xj}EUdz->b9l-ZxYtkOn!)02oJgr6}>gLc%6afSimLS(WCe}%UDXVUxShvb=r
z>cjUEn0%=qVt{0zA2>p2(w`&4C2(?o21p*4C*s}QU~bs+03!Ji@HoUXM_Ei;pAp|3
zzS_Bm%7~3a8RqAspL#JwfV?8$1M&do-*prw)nO5KR=$EcInIE*1YA9Hj_Z=*HGd3h
z(zAZhy5KSfv~^387Y^aAtr*=X^w^peld2J!Es!s4^}UW(I2x-h=C^&VYdgg^S<nb<
zZ0Qj3=QRf~gV}QyLM3S;10tj3$4-{2MZGCpjj40gMW(>Ig2%bik;q$>lVP%yYC(O9
zVYVted)xv&HXhI7&Hq)T*48pG8+`uGA;tAh-p}?hL}KVAM53@a!s^rx#Gb2yh~398
zBd(&Q5dp`}5?mw6x+RWUMp&nizkx%Miv~mH_>i@(E?kFJuz_I{ng$X+#FtsGM1FzF
zydGX^r)OU><-3yv%6x-V9dnpaS>1Nu+OmBB;ZmLy5SQ`tL-6mkb>LR~6?A0d!_*6(
zPeL~Y3XhB@reZ;pX);pgn;Ps;_S{GC8S}<!onkpPO8y#6GkJO``G)SHR@Kg)7S$H<
zp6-oVptSKZprrH|$lU7$Ft#uTn8bhp!tvuoA;@y(m(lvR@bkR^)cb4q(T4l|(O-O0
zO0V%|!Hdt~129`%6d)rWMNXH-mxzI!!$&YnFS~)KAp^e}Xn991!AS<ztU(hf2xMQh
zgaQvS&9HfSRm3sXq~s5(8)zNzM;?hd$r@J(Ovoo7`I`xuGUxBA>0~eXZVu|*1Nquf
z^Hj4Xd`rE0Pn1M)@LZTVQ}s<*3R!V_z>X=v7aY9z&V_k&eKj6I1yR`^Ze@Nsf|^&(
z>FFV?9KcyLUJeNO1swIyZD#`|vqUk^C5rDy7ppWYO}Dbj)hzkZjZ`rVTvs|L9?{*>
zs&BDP(&O4XC{lzySJ%_Ive7T@80+g(p4PD-4XN)qeHQsIp)-QBrI&K7Y>pJL+Eh#R
zoQJLiNyC4$B>;&BacJ2?5U~>Sf~gQLVKezu)^w8z;1(%DSe7MF?gS1eAdFlF0zXR=
zo;CO|pug`G0cU_}3Ha9C5Vqm$V_STffNPpI+@Pi#(DC#~shY_pG)bW>m1AJ16x_*t
zad>t13PPB|r)BM@9YwhQB8epZP{YW8m$*juRn_rZ_A(GR&As;fZZl|Hv9I3etR+2A
zikQcBsnhZlYr)9J!t-`bB-b(IDccHCfw9ndLKm}f66mT^tx>;u<CI@8ngc%k;)Xp?
zL!{Ad6?omc3OYf6x*~lq8;Arnyk8&D;{Et8&*$D~Jkba|POuh;2E4*IhIb(D4Hidv
zT(?LdNS=L`!8+5DOFo(03is}W*j0E2#3gRdkSbon6`l?8Im)Gssg_;TH!Bvb)iBb6
ziE?@1z=>T~Pj9Q>w``VF_lyailA(Q&j(#9Bji|L%Mf|yQ*B?;)l=lqoJ7A_j^A&pu
zofVR_NC5`}17{M2XP%LCWbrP7RYjl%AN|ltvbR4etl27=2w}#QPXQ-OoDDX<r6rwy
zsIIF^NtTqSNUF%gvmsjWY*h*PeN}nB@{PgTaa@8xVB?(1Hs~u^E8xECSK(zDPyhb(
zml4-T*g7mf%7;R&ok}?@SE=;^LpaBa$E5ZXo;W3XuLEH+;pauf8hX=f8BM;%+Z%@L
zCo3zcK9%P7@W}~5U_UK)V(eD~VCFuB`?OGi#e~1-i5D@F(B__7@4_c`WflF-gIcl!
zkruSS35*D?9vmM0TVc<l%C?$W-Ztuvtptj6<|nO1CI4J2d8ibek_?qlS`?kfY5$(V
zgo|ciF;R=yjrFY*ZhuiWFmB#V<gYF7V^0;$p}i9}sG)j7B&m7@NnHa=ovbDx2WpKM
zgrC1k0oN={@Y8Lm>~01+M@I%MN{yh|vKwoMC#<rZGJ(>BR9pTETjH&|rv9*n!M{Z%
z-?%98;O#6VV3%`drz%r0<k^L&2waD@DApsc1g8=I(|~@o3s#jS7I{+)pg@ABKqVVc
zsTlVgijOy8504a~%m3E(^Cnn|)NUV(D&QvhMnRI%IbHVDbT$z14IYoH;3tLBEJ{%3
z+bYF(ho>Pj&JszmkGnHISegjJ8<CS$+Y*v_bB$-z;j`*k2z_ehPxo2sqgs93x2=sF
z?)=~&^Ig9@HG3}6V1u!Jn>_zMh#CgM8XIA9W3kOiaES{<_!J{406(@#<%*9(5wg2t
zZ=HH*7dl7aC;X6$Blh4S{c}l>orXdo=W;ON8$~-jOH}_PUq7YM>ZaWhrMUsv%Q}3>
zF99(KupaE0LqNivJ3ym)oxZ`3)m1PD_$D5xI9-iuz6vs7eosTG;2;)&(ae^2e`eXc
z0{7KY9fP&fo@_G}WWM2Gz1FP42Q9kb!mB?Bf_<1@G<r}VEIr_t`ejPx(Af6o^<VmI
zjhhs}-RK)3E^d7X`)=4cUP@P=PNU~a1q@{3d{dWt{PFK$%l|-D&Q_=XK9;1vZ=0mR
zW6!O7O#vRwwcvEa`ffnwz&Bsxe`~UFA#wuB+na1mz`PZ8-B};?^`$gQAnD^)Bqqdi
zO~QhLqPH(COmS+QEIFM~1e+kqz6&Y=2_3veX@3v6;i_I|n-Np51!{Q?7{WC#OqjAu
z-herd=F1><?u#h3R>It1BW^y6t4rrD{{fwF`v1{~C6fe}5f(R%dxTGHPE3eVg};~r
zd2`wZn1>ezT6In4z`(@(+Wuob_XOj3^SbOjP)hbk+1o27sj@w{cSJzWmWz)3wsQJ`
zu`xjAt}$j!O?w(!)H&(b%0!dUizz!jlwT+&U(j&&Mj#&XJP=PTcOt%2=m7Gs!~BZN
zCB;sPJXEo?IllwQQSNp|*ayHa9A{2?TPE^BqD`x-W~xIRL3LweQ~ulT-EUK1kDUZs
zceoR_wwx+<SDwA5hkHCm&*S!F-3MIW7fK};il1>fimA~;WAinZ40vhyfm1Ly^ByTF
zz~FcpU|?l|a=u&}m@`(N$=zD`4cLt_1l>nyK;!v2F{*yHCQb%%7>l~99+q`zx8?kG
zA&R7yRviz$moxe(mhv21zd9wx9t`tgg+wTOBX);&f+d&a2A{>7194rBVR{CoS1zY<
z*E$~owNDvPiTdX4tvv2$(4ihiDiGW!=kecgIje;qNz@{B36usZ7+(TWye#47Ls3aQ
zBm=3rS+~i)Omz*7pV+@i1Zn3r>OgAKPP#~nB&qk5>Z2gJTuHy2PoLh6>|zOS;jlQ~
zi`y8?i%qE8-s1qZ+#Cop3L_MkNJ*T8J=Dr1p$sDqsC4ec0N&>Ta3%G`5J>3s+Ncj>
z+lqR{IBo8)NVn?KwaulJW#ryvkw1aP#y=(5mDwtoA5QggsF%4}=mlRLl&j&znhOR<
zB&Eb}FQw$FA=~QqIY2$b9jo;9GCJXtsdlT;cw!gt+!rP4bg3nkZgk|+tJ{#Ab+uMz
zHyb`%dg9W|p8c$;K_BE-VGq_>!i6pP%kF+H?GD;L+R-FCh;H^^?VQ2vl}p9kje2le
zhF+6@+{!eL{ZZcst-P^yxaGu-E~s{UVpAf8o7w=_2#NJrEOAuXKjZb!5wI6oDN%zY
zufz{Jc|J9=lM>p9Q`+=XC-{)ZTJR6>GwFz14G{gHxAhmyDR(;ePK<(C<bZ3g$kK!a
z;K2I`;LO+;AmHdBz(P$o&MKESKW402j*MZuXd@bSf_1%@0!W700#mX}Qz~(NByt}A
zcdX#5Ept(7+;ZJDamzQZdpX65FE8;Rakq%!voQam&r#R7B4<QPv&c7DHYd~79yH~%
z-mBewePN0mII{i&<1u1u5bfj;G;}D!g8ix@hucJ%v%t{%zjdh=_OLlTtE@|*mT=m~
zykQNJS)Nw(i(FOy))rDDK<xR)H1kb<FK<o08ri#7w~MB3c|C4zzKr|*wiYl_p-eEo
z`p=O4@uLg6ylJB+T%!1fg+#J!oXa>PsBYo+{$o0M7xi6mjaK8S#sbU?lQ5Q11ePv^
zwg3(EAZ3z8`=S@DspPFHjp6FM?gLrBuSBe3&ymjK3in^_Mp=KHK_^C>)PIt`(1~mH
z77ZHu^DLdqJr@35#MOtSxn)BO-4==wjl(Mc?=^&fw~$Eb`;HuU*Ry<CB~T}TjzgD#
zJ$4^z81pZG*K(}k1E-m5udzzg2h)$=?7+UjTzhvK`^ji8{7Xn{!|fAHb=6k<$rra+
z<8e@%Q*L7H$~QR$It|`UzMQeTEUT7`Y^(2&1V+EHD|_0R;ndJCI|MAuw_q+uv2-AT
zm<A+5M&k8JDT+1Ff9_?XL(99GxwcaL<t*+%*-pSDRLL){d0UO05kH4|nzWi6g-uXp
z{Q>27!?BxjYl1g9tLtGL>C4v@;+Fp^vey~oXo1sdjw+1*g!OrO^C00dFD3~*fOlH@
zUeQ#2MN<|IKK1!DqWUgNdSL>LwfzCPuJ@hMD@AE3EN@>ZW$m>pwYd&Mow8$z`Q~`h
zo*oK*ymb)n4~|qMtc!!Xj<eVia{&NI+yom9D~jjX(lAqBpmE^f|0C(l<Dq)rH$ID*
zu^jt0W8af?Q1+NfiXtkah#7k&6xo*<!`LcYvS+k>Qi(|l*@m(2QBm2KD6(f?ey8v6
zpZR;vc|GTO?&rR*>wO9Jxs6}C{9FCdK?yW~ua*ytYgMF>-$0B__G472J72#9yfI55
zmw3WV4%1!&=Uw7!*?*Ldxz5$r#Fi}bT;%)D3$OpaVY9T}{M&aENyyp1+;tTH4^s5F
z_Vz>WJ1J7{A$0f9{lyE^S1-Q-g)0q!X;m#Sa74__K4=BXeA`=qbO(nvw8n!&%kPd}
z8=C`5_;=Zl1eUkJSk?Wmrm?!M$19@D-g-q20&a>0R2+tANf|*5n#FChYpB1C*}ru9
zg%6rj!(JcZ|0Cf-j(I3)(!6&cu;@}WVWrKyq!HEo*jbiK!oaG=E?Y_xiR301Fq#h5
zyT#MQWL2b~MtPhpMsSC4^(#eTE(;MoI)Fi@xXaL?MCuSeeSwVZ092DcVou8b1~XTX
z9)f~Ek^Qb#dDm|@>{M(eyd2aV9Ebw1PxXB2=1lZH2~2iTUg&S{%<C|<TC8FO`+4_}
z`TOhWe)~xTHG@Y-)RuaxJ}R8qS5cZTZKV8A+Ndgz_`ClSQ2n?LD!Hv;!+ueX_xpmj
z$DY|((r-m5Ei7IPA<dD9>-^Ds;^Voz(}aZ3?0r3Esqyj?fe*W4pLb#{8~F!Lz^#ZH
zIBnkO9&dfF8H)15o?(5e)r$?@U!s%blwt#uChe_TblORl@_os23*mA_pq%9q+y6wV
zQ7KsT9t=4?u=#8RuCA!aWFTtaEWqjR8;{7LM_LYC_j>!by$wKUUcC69fBDEx7d(J#
zm;Td255-)pa5snc1tt=TZnV3lP=w|N|H;oHmeC^%gWE^jrFvRU>+G_Ut!S>QXw=}}
z+92}c_CD{$h7~#;YvylV`EnIZQpPCfpk=0>qIYf#YI#?#$4~rJ-%(9|Ap|+z(^T%x
zrYr{sGI-VCTxv-3urMUAYm+TYsV`5++Jf_G>Lqn+wXd*@m$Yr9HIX%!bVPuU{z=B#
z3V94{HhI9lcqCy`LXUsj=mDG;F9s$EYmYy5j8$V%vKU9518u=2Am`$h-0DgbVR>pS
ziaIM<kUq_-aQ-}!>%1A1{kK}w7QVK_?a>@BwK}(?p|tV+^n|Om)d!cXhsN1>i`Kjw
zn_|`+x=3Lydjr|asB3yFBx1oh=f|O2%U2%ZQ<5TIF!*4S<l4_i?qw-2BKd|<mlek9
zPKGKt7JCC7d6RCrcYn61QOp0cq5f=lKyTEC8Y?RFw<8i6$Q%{*Z6cXFevVzEsEq6J
zX)bLVETACt$x)NgVl7G$rzC~7ykckjlV_Wpp)^PwnfQJm)h0s|;#iO}9r{(%1R1jZ
zEmaG88Bz*qIj(~6XM-?gw*FN>=W-Wui|THwTt(V8Zjms2xUccA9qzdr2fbY;7cK*{
z@v7fB?Q)aPp60(M8;WvvzUb*Sr9Nd$9WYSW$U8vl(JdvslAl!wn#B6bz^luYM$Q|^
zvn{V+<(gW+Kur@NDN^W>n`#ozlD;e)+M_E^A+5k+?DLIZy$yH6Tc)BUF-DPb#{zZ9
zwYt~2R@wWMb-1w>H*%TupW~Lps5mZZsfNy0f*R3+|J|+UcQK!vy)Iq205=0ipjpki
zSc?ZY+_4#NT~ek5U92Z!0K2H*-TM>j8czcl{p*YQc4mf1YYx6DP3gdLe$XG7(MijJ
zeJ(?F8;}&HbhM;w72hPh1YWPYyu4UQ>dH#VAgi#<Uul>P``2vfW%;VS-9Q@B?_CzR
zhtwS6C-YFsbj?&;*Ok3+%Y0jD4#WeEJpKDw^%}N=Zp-U^?$%lxF~bHYl^~W6PDJ!9
zyNoGN_59yqME*OaRo(*v)GKQ4P0YUbw3$zK7;470%}bpZi@3Wg&kPgVaTIEnHOZC#
zHVv_s30p~NBf|8_c2V^jHDt9Zur=nHGMOergY)kl>^&$vT=t-z2$JL(85Ub0SzRLG
zEl(CGcvQdM*6>5OX@TK@k`#z6KgG33ni(^vjSTcKqu8fgk-;vea98BYz5(3<*JQ>?
z-&~y&JX^)4zr=nSoqjQ!1X<`mX<Z1-F@Rb&fsye{Tun4o!@GqZ^hJmoz=kKNKhGqu
z&1mrz;~>_ini_5C6I+WWSm~5+)o3Z@D#C2QJ{;`p%B!u;95pV?VL$>tbj2mhT~+|O
z?KNfb88-D}2QdrJpYezd`-#=?3$m>1>0;!b2%sB>lQ3vqvpm`DzaYfCwi<XB7@(2&
z?at$gPKr9<YZOHcUYSQx6zO5gJ*};NZa*WDSAs&Q<s?4jbxwce!+BYAL^KSbN}L8n
z&yT`i#Lq8{X)N&6bnt9{e;BTnz#`MZIP0w*LH!aBEszK&i9I=C#t0)=t;ip<e0%3M
zmi110-P7RJnGnD@=ma{g^V(aeb@G@JBhlmMJM3G{IfG7(;bCTjUkFcr9|PJo<urN~
z;7|XKvH!+<pD4@5kK`Kt0stTh>6>vqrerUwfyN|7B^+i()uWxlV|AY3XOtIMoQB8=
z&q|nEs4sEh4~&YtkevIZo>S2GVh!%$H(l6LREY7flRW(V?h|+hKez|CCPW!6FFh3n
z;s(`SvK&4=Pysr`XcNc#nhwtu88b4Z|0lY~iQqHZwUEzVht-cpa8!{~hPGJ=Rmx8i
zy(acUthQ5?9AeZp94ljsu4lY|h8B6MkXCbJehEyZxb)RdBQG~BZ({Cm-1yXs)P{lj
zG3nhKPPK01Mp5Y#Kcmk9cM|l0yTn_7;n`_PRbC>7Nso3_X3EpPS&>gX8PF-go?;)U
z)6@{KgL<SfDL)l=e0%FP8R}6Omhs)rrRB4v)PjuSW>MpVJ(u7OA3s$U8Vg#nQ}fhK
z)4tCS#0DIxNvB_6)Fh8YzEo9(dY#r|IK>h#iqK^y@FN!)M-;mmD(!3%j<AfMI!jQ@
z$E~I6Z_7)3n!@27eDL38ggcsY-Y>DmC&{3R!XF=N=*68V51-6&rkYxwYe2I+oPLh^
z-1QfIEMFWm{YD&p06(!m*F>bQ%~xoN4V9yEBcy_iAd~VyN<x%1h$gv0N`CfFd;T7}
zpsi-V#4;J$SKGyHe6r-dJn@dhS;uHR&yYLIo2Q3s+rnEsryoU47vMhbPV>%*%cZ1W
zd*5h*wvRFQGL0@7JW+MOu(~v3qQA~zyt)*ROUus2=Vun+t<B;mW-EMw0x**+cy|iL
z6sH*$rF=Ws)1!E`DpNB>Phw=)Pht$=o$X3~F?YK#0s;t(+O@dy%a8LR8#d<k5@fgW
zEqp#0SdcN%v(#|=)?!7Fu~eoTC#X)^<T%xtWgeejTsh-L^dv|socWpr20@s`z0{x&
zY#9kFcnDF;pLtO?EB?bSMC?-O$g3X_@o>%=^nV^7wCM4KU$-Ir%CD8U-K^PIorV#Q
zUg`stR(H0#+vtaS9bOPGZ{ffRfdwC)I}q<Ls@_X%#a#zn$0a{gbbBG+<V%|&FJ&iU
zH)`Xo8iHG2{fSv1TZWJng79_7ZdF54&Y|FqBXCeZXb>$?8w4xSJ3K&aSUiR**Yy^d
z>t8gbItzv0Q1wDX101IKH#PzGv3BF{yPptE_SMpoV6Y7Vv64g1Xzahs2{_!y)LIB$
z6<fH#ujYd^J!6SHs-=PC4>U(cAdgb54(q|pq?XRA`d&<lb5!H9_xvsDl;kKp3|y7k
zj$sTx`7jx#1i^ANYq){&^xWjMoVpI>LAnC-zxkBWFY`Lim_@&O7whe_JAZCHgESaB
z0%g&TK#&vXgN|ugtm?3PD3jKKWqlBWQiwS$<=xJ?kVh%*IF*v0NsdT)BO@oAWp1u<
zO37fLS<PQn9k~|02J|`vYC4M2Ce(-o(}`bCTCf`bQOTx4o8;nXb{LSyIIS`lupDG%
zM7Fy*VR(7wh%7TUVp&4C$Pkfl0-euJDNExJC0Vw~7L0Qk+(8^GfaUZ-yL(CJl@V|L
zAV<isSJL=%?+9NcLtSETA)wjttI>ddq=d~;@`ke^HD_DoH)_lD3V5KaH$UyoCACK3
zPNerr)@y}_@5h4-xUI*ev`Qp}M-=M{Q%=_bCp5#e!RG?q??fL;Fe#hyg(vkmt|Kp)
z%On>dkedznFJXjcx;=EE#XNZE_)+C<TDnJ*b)yFdKzt@7FZ(R)X6Lge2CbE`d}<bM
zGWI4Ps2Ch^(cJ-&es>RV9GFwNEBev;?DLpY`4REHE^z)Q&);%V3_J0D-1A52oA1(h
zk=@GtJSjGU9)#fIx{s#o{+$TOf!Fv8+2Mz%E|UVOBqHu@n@R`%>#%)_2P@Mkb%fy^
zf5`U%45LB3c8gJ>JZ5K$!(4=sh}V2BH7=`di!(bhXD%#0dx64^kGo;dYI@AweN7<9
z&_7x{LX|<$0e1Vln`0}FKmGl?q)tr=8c$!BGNr+C@-iI3>wFw+9>U<Fu*jdZ?i95t
zBq{vDzpleof5opsX-WU#l-XivE;Ki8B{WVDu`v9G+gfWB*F1)APAOeMgo*vHoTe{w
zE=XzmX>lG~@L!o=LmJ$gbeLLAYyrY)C%BxAGz?Lf745D#V|6u)_`k*@7Pjsp#1f>W
z*cYg~raVzApOelV!JNG~kMY^xLr4VrYYe!Xao!<dWnD~3Ksv;v;IuBYp(6~K%nj69
z(2o=iui5)3TY;`KI_fg#y~B`N;x}DiE=b7Hq9ihGsByldBrBo1?MFsOUi?Pi(8NmA
z8Yq@XhjJC0Egb~Iznw8)jLXuG>~McfOXAMb9@1+QeKk47=aRx{>pFftO4ltDL3w43
zGPz4V+v&FR0AJ>h4G0~?hF96O(ZgGhe=MfLXD;jLnIktH?WinMHp{=pVn{*-G8C++
zXr<WB);u>;89bm`Nc##M_oLKh{qYFlVj9v`VY(-i0B_3`NmUlGo<S%%2Gh{f)?A7n
zu`c#<Oln6YZUpt}n32hfF!Hl0T+wb5tkvsmU=FIw95)oh|NPb>++6)B+ON=&1sctC
zW2919a;77<$a`!ZnZ0Ao2wHP*=QvT~zTFA2y{+~Xj0mj64976Hqe$zw<rF2dV1~4m
zG`g105m^(p5WXHT#ODo^I_B(a5ll&G0m4cAG%%ia$z?nvM&%1)dv@1-r`+wD?mA`~
z*^ULg#`>q$Hd&RQ!GpPrEh0^n`PKS33m2y2F1)&ajPjBu^*--(5JX?INwYs5Z=V)<
z#DPhsfg;+iP^y%J?Q&1pRj4)FjaKzG9?q^-eg{zuU-6xIa7xB7vne1;zS@A(@d2rb
z*4x93d$os%vsc)v&xzY$nOwooJd)trrqEmi=r_b~TL!fnw<b<w6YINML%YgVt_cb7
zTnkaGV->7sw+#|~#r;e&&|Uqj!8mAP22VWED7dZMvWM2(!D5`1MEXzDz(C}AQzzZc
zsk^Jbw!8OjxK|ROVK*<Ha&%(xmR`&r?D1PhxCOW7WEM0SeJ3@L@!2XmbgZV9MIYel
zr~cLzI~`MQ7I-40x$k&{5OYcEMS@mLQWDt#@z!u@mSQ!2KdT&h!&x3Ju!ZW4O!pLa
z=Kbdf;2j#@;k?C4hjC~~um`#;$KTXw`=|swGQA-O?Yl_$WF}6vp_D`Y;je4>m`!PF
z)MYt;q`c6ikFmTE>Cv7(M*?;$&R$dQ!)XnR#3gs0OWJbR&C-)mL);T_0WZd&ogm#&
zSERKbjZu@pWvfFuwaDzjL)RP1e}_v;CLn&Bla!!fR=CY_G`03$Rw7OUi#xA=x&@pR
z+c1nNui`j6r6tW0E<nNcrg4Hl1uB(1MiOCp91|6Ezg*T97u3L!-J!`yYcAcLzIJat
zWBUkvz~Iy~|IQWOLC&cCN5qDj=i^!M`-o1{In5>w>&mCXbN4QT-na^wfgd+Q;Ny?p
zQP(1ei>P8|!kjz(t)|)BS*B-$QRG&aUu;~>ebZ+!jhTjl8<886{9ylpJjQmIy@Fzv
zj-^aox_nvz>2$fHWwd{P3cV2PRn4CG9rDn)+u}Z2Q>C`yem<FH_=zTP0!*U5_2(C$
z#@8tD_aaV^b<SJWH{>X_($RoA`Ph(Jh2Td=-{V80b=%`T2~$}nuqWIPT_oz8Ms*_(
zXAPKDH<z6_isB*f^HR8jpS3pe+-Zi*i;;#QIXKk&5`0Fpfnp@LAiRA_tiKTq{)-=a
z-ax<G$-~y?l#VLE1BNJWSD3B29x{Yb$dOZduyeq{Jih1&2HTkbAcjAl)nG<F3!6h6
zOK@QEJ6JwT<p`2K$8~FZ23__=rAX+02CM{Fx@ZhC({D#l2+}j|1cOs%=7)D^Z&|id
z?4`_$E<Bzt9>LJho2wvA`Sn6CX5F~cx|JAAN_)!(XCCe6T6iW{xxI#Bek~ZpT>Pd2
zX3rOpw--<WY7Y?hTdeepm$QB=+H2XnUBx=y8e=;zOc5s~-cUC+MGkt&B4yoM$$?xf
z^fJxhtF2l?udA@@j|-T7K~uKW9}Mckn*w7pf`6lo(?*6|!p(zvbi6D&9N4=GPJV<g
z0v>4{fb{PMK*i9eG7%PVf~=zMHZQ>w9=yt1cA1^CcrOf^&7o9@LmXHAd9Dq5_{l2~
zOu*w65um>L3Hx%Mc9q?6?_hf^ZlZHdef+g4rZS<|Pa*L#&_Dbdy%@gLybKa`sP7z;
z%}Xpw-qpKpagR8|^nc?{K8o*r4u*g0-4vn(byBW6HP+n$^bd=|N`ngXIGD=MUjU*@
zhJ?z!DFbHW$PctP^DH?-^}yWG^|}_)d?N%<CkeL866C`Q5{w3aUuE;sFw>HB3)W}#
zsf6F6)da8V!zq7ob_(_AI+Fn*udH+N_Z#^sWLnqrw22Kc<@4r)u_r?+S7FxBg%`zL
z<B#VVJU$N%`+6E6j!*i5_db6Cz=w9+uoN9QHrDL7v0+Q~?H$wFi`?ZLV(fJ?)VjJE
zGA&FgDb*&Ll42)8@kuXDrO@OZ(`nn*lp%=Snr`+SlNPSkc>1U_&X?9?P;`V;w-(`5
z(#L>-%dgKescqK30W2eeK@1=>Kh6_lQ|_Jc!Q#x1Y&<STGMsyR3T(PAVpEJJ0Fl81
zZt=tv4_DWeS-F~L>wjWh0q$f&#Jj&$m6#g$@*;`Yi}%8T8yBtuE~?25Z~EfG7B%*2
zqB6<X5Qi-PC6?(?c)01+04NC=6sfOSgO!;jw=j0nH7R`RI?MrXxN!{&%vZgJxaGMo
zIW#U>X%JoyUE9!^n=w^kJbIxhI-_c@5XeQXsZpUGvAfZ5?h{HDay)47%V%_6nK$MM
z=#2WV#{vaYZcS*B01tPuK@$rLCWiEjr95W4cix$CdczqhG@U9!n7I>X9DbXvNCjc(
zBWqR1eXyv+27=RB?_X&6s>W2}-#XPgQecc$8!<Yc<DTaTh+Rzq*sp&2yCd<-;93-n
zd1!o$$pKO3KgtE$)g&R-SCwyqh}vj@oHCG;+H+{TGB3?9;P(xSPB5X4^hE77(YM!6
zHs)*vV}hG`Ypd0De!Y9b5wJrlnq&+cCU6>tt))&3)uZ6QslJD)O8nNPnfdx*&g(O8
zFk<iiFb2<XYeRm&M0wrN9P<2zZOU=C4*WUH3NK?&ixmTIGkSfE(N5SW+Ct|wjod2t
z1dK9aH|nAltO#rJ(|N7UpoCE5|CNbDSYhv4jX6W1WnG32K{fm@gV^uw>gvveeF(9l
zlDl=Sb`ndR4-Yl>_Ti#AM7OPOGuoY~&BqgaEn4GGt#JmIZNt4PKBwlU=9ACymAP<+
zbNq;qQ7a;Px{jxt1eiwFJsIn9Hg{FZ`(Q5bH`U5bt(ElQDiV#{J7g{+K3?GZti^j|
zZ7al^)>ukzFdpGEG}g9<6x~^?_~H?-xbAL-?G*Ex1@vfLvaM1qC!{9~=(qRzX1Yv~
z)Hjko*uB%<H7tTQZENz+Eb1ui7S`ujZ2Z9%RQDd`tNc^P^QL6GqJN7z>oJ>mt)?Q+
zc-1~P9kIz%ZcJ*Lkdfy#N6KrPv4jV2q)rGLTo20K`{(nJ>_5>#gFz&N!}rll=6s4o
zicFuAztQj+Icqpw#uhMs%=flaY^d5r7%z5yd-KSCXx-^FrSW%dNI2w=P6&NhDB|mf
zamW}*rQ2eurQ~PFrjpYezc|j(j=zeN)@=|oJf@jK;<R53jz5QGv8lpZyj&pq4X}w@
zZvwWomeLjm>e>o8=Jf^n!5Qse;EHSV^pWYdbKVI@PvA3Hius^#W>Kn47S5=6{PjNZ
z#yxAjA;FLEi&dbg{4L1;Ix=&n2+edRkPpNH!gUkuQbdksX|%1HC}>MY9CZ1m%|gw0
z4);u6S)lPc#*_8g9#e1L0Hw6qJyw4|ti6U}iksw166V+A1!v!c%BL(t4lcr`HaMDJ
zMDN+rvg;Sg%p)N2d$Hl&*z`pAAW$0lsdZ_H(VILrK^f}mx<?y8y}Svf^IcC~BC;kQ
zLl)Fwd2q>;bZIF@Rv}Fzqp-O)m3)aXp8OW`ij+>tB%AQ`k8i=fV`}!3D_{KDA6o*r
z)f#)bS!~5<ME0R+gN0MPCm}Y{BtGdPYp5U}jh&_3!-6;7mS)cuk5_fOUQ~mHPgV+~
z7zrWuZB;-?v_<0S5)0f2>(<61O0r(FCTfi})2Ns+)R#%NLzJbl2M9ELDh*<t!y)c5
z8Z+6x<{-a<hSiC&TL;TiqSV2@jyS6<3OR}VVUThVLYlizZ{yK9(f}>CAn>k;&V9}F
zUe7KPJZNT0$yjYC%HJS&g4e#T-C#Gy!r?yGg>9{O*iS#vydVbXLDx|rHp2+GyjK(R
z<q{hy)P(#o5g=O{0R!(0Fe-odki8eWO#~rRX_g|Iua-B*qL$g%vGn^BNah=EMOl7Y
zG}pto#5e=KA1IWdz0^5e28)-YNPy98Z61ntdp6{)G|#*y?mPmSZ-sc}h!f=U%2xJD
z=f9JT5STdj+Wy~WeotyuFqQ6lf9#}q8#n;+rM?N9)oN;b&wEQ+OI;FP`cx4<cKh^l
z)#cJ;=uKbQN%1abR|g}e{PWVR@7{^0$;tI3J99F`_`WY@uW5@i(JF4%DH8DIMS0G#
z3p+z#gxVIdbq%hZ9u)99n?y=X*N1n`oH=zo-HVeU9DA$2fx$CtB(<5l7n+<^>VkaJ
zQTT;Niq6x!`O=+raKqIrXP}ur59)o)KYvEjCR8GPz@|jRZR8R}m<nN<5#FBq9%1|x
z!VTfPpbQsv4a1MzI|K?+MLx9pfW*TG=m&A#nJN0)TxUt(6zlT<<UIqg9G8fe%7|5l
zyT$2yNr;wH_GIBM@X0gCrk^G}qJbwhx_ojLd_hFC%cD#w=Smnm(6_BhyO@UfoM=?N
z4?4}I8&3CKuUfqd3|4{BI9sdP69XeUz?nQBt)Xx!pV$mg8q)&2vA~%))gO#6W$#6h
zioA87U;n{AwtA?~+zm>xbxm|M1UAZ={^WwO)t=*UA*ZFoJ@|&jfkut%f6nfFjW=58
znQMy7?WOf9?JS;Pzr*9YViD+LzkD{wdgIGazI)8Zmty_dGwZTJCb7CzlX`qUNW-vx
zgF4YM+Y3k@rW@a8x$~9_q$E9gf~LHxN1CKLVJYS1T$O?+*oy$t3{Sx^b+``Q0`5DF
z<gB7R;TqbAs$7yTJ8S(@#<Pw^AfHyKWZi&xWl@8cs^u3dLbEd2&s*zpzB-2Uyg{aZ
z#=XwPogt6|hbap8@%fOUGPfby29}`r>HphGK@+YaTAS@q<R@vY9+Y%dZm{18(r0_4
zYuqVEy_J@WLHk5`R4y;7GSC0#0B8eEwhE1hRpTepE5JN~n!|lWJyNKt?1%B#a&M_M
zdyipMliyFRXPUgJ0&Z9>cB!+HC}jh<y4Sb40^{*7l9E|<{9jMW)1dk<&RIU3*lUi9
z5gdRzZm;AMXZLRcMjbf;1t<5`5TCG6JB4-oJVryq`1RbT@#}o;%PTVx)ceVs*gT_9
z^2FNy5@?w{Aa1dJ|Fu6a%-kHS$JFg_cY|(ANzj^j02h_)0>Z&Dk|9lNNf$&#RaT+1
zo?k&f<CMoZ26&^r1@p)r+|f_7;`DgjXOWVo+`qGNYT+(!x}7`m6D_V=A^x;PcsZxU
z=S!rK%<~I4h$1xl@~wYNm-fKEw=8q++8lhG7hU1aH1-8F{Mj9-syXtn6E0nsmWT+9
zG4vKT`ugsJ8R&BPhm87B6R*K`cz75^J)&-;5gxW3Lq3<dWqUF2Vi{1w#RuH0SR!xc
z8jkHkG*{2C@a!@>8LV%>o}kv?yV5N?%D$Zo)NV-%br@_}Ep%u{EdWZjhY`+?;38#w
z8<$}Ek1C%!>3*w3SK=dg*mB??>@y*?PT1}`2$iB=3y)a~W)Fo~U-~r#-ZQM+j5XWn
z13^Z!y>_Q6wLTSkM#FUVFk6D<=t<nr!jU<eHdPo@`#bK3gOL3}P|s6W>$$b{=Lo%a
zr2rb>1ua@@Y-V;zHMDlpRHT^WQnPJRE$6;p=X*-JBh{(UCIu_*bA~EMc=SDrGrkAp
z8asOiFAF+-C20zJ)y3p7#qn%B$GQ+V1W5{niJ7|>lVmCP^5mKCe>kH9&*%0oZ>xqs
z7W@xs1FeF*h4WC(KSo?@`%8jecw0lnUE{&sRtJ^dZQ%EMEcjdhecv(khJ;hoxTw>)
znl}u!ikBq{%-dhJ#{EA&z82Bq_x%7$`E>*lef4?NiWc^yl|Q08HvD5!6iTNQtF@IU
z(WmyMwA5>GvS4doml@ldLdj5VZbI{^L?`%M@u&O4GENE{!alC4=MT1?KG1R<>b{#Y
z(N#fqFpmXF3`08T%ZDM<8-7MK$*q0(Cx3UB=l<@|04_|psR<*8#@Q#6jW)#|!0wRv
zs#)O1M}(R0B#lWUtf&3VLqc>q4m7Pf5P=JZ3yBUcTDn^gw2@|4IC2(X!hHP<C$I1w
zB=wA8`1p$0;j09oi{bR=zVd6#SGC+uzq^=lb4?Bb$|6|@F}V+<T-&1E+NO*0<C)Ij
zZ~HehHWaw%ynV>|+HCBAHO(<DQ6v1{wQ2clzMO+t5q}R&j`hl)fW=Nvs%n%P?{llE
zTsdZx&#9yPyF&ES2MN{k>hf|;Qqb4oqX%w7?SAkVSMM}9w3Grm!q+^4Vcwe2+HQ$p
zr+Lo6l=n?RQbzj3kpS3+Fg<#jG1uNN)V9y#kuoTA@YUifC5$04yDz?pK8Sd+q&wKV
z6#oh3=dNkCF@7()f#ac`J0_Uy-UUWw=4PiRObpZ)070b;-+73<V&5G*dot&bVzaZ{
zkU(F98f%^lm*94CZR4etGL%>T7?bAVTwuU=k?42L<-Q7MKZl4K-1568^sOL|C`7{x
zr88%9rSGgpUpQn{{)!xEBa*o+>pjZy*%FRmFZvBfwUs*8V<ht68+mo9Uw_XI^ttkA
z#EJE@>d!4roSzId*4p=UBc$P)nhS)TF-}jNj3}_l{5u#MH|cY!R{t0wGY7}hhRuPw
zu#cI<L-Dpe%5xHrN!}ad>v5g`1SD(f#hTl#jFp0eR-ZZj-;GuZXkfgd83oK|$KNDa
zbL<`5M@JAmTqUmQ8?dv&i~{jU1$lF1q=%4Subb%nUFyxEbJ2Jc3$PTPR`~&Uw+MEb
zPHT*MrJJ0mW#YKZOTC^cq=hcVRV{GX&`CE6(NYfxq~fPv2qcT&6m2o`qv|q^lq>(z
z4MC-3Q40io>K{n%hd+A3-KQ4s(t-;70>)XQpB2suj#PmZI`-a6Ps-U@r4@vX!*|;J
z7B{5xZpaJ#MNi9qZctXkoyjx2c9%lzIlT0&N|0N(dkd6_?X8Ww_t18Q+)jQ*cR8k+
zX-+k_3Ik(>t!jQS4(x-&b>|TN?H{n3djWKkKWJ-RsE$O0SMk&`qMj)SX4{_$lRpNf
zVUZ&qZ2HB5pGhK521S?<Sy54@v$;0X6i-}^Z!FBs#2iTPu_(zBUl;wm>~P68aPF_g
zRc?nleL+)&k~0BYJ9c!r(zn#-xY!bHo)=i0$LoJRQ)%4gf5eui8;}r|z+(0yPgpfU
z0$4oQX{Qr5kM(;ag=#*XP5|^>QaULm2YU_l4ft);nOCfd%!trG14pQ$Rwd)M&OFx5
z1Xbj>Ut!}TAP&X9SECrlEq)PMhdpr1stf05zO_m*h4kc{1&*8Fr<wDlb%m^Li_?RU
z=B|4x#egH+Iy?Sw+BIdMaP*4JLzuOf;aEt)#H25uI`L^!PgGk*yH{z92%+KE72xQ%
z20+5;0g&@S2;kHH34AQ!0yZA^08nWOK(Ct(=uGY<Y#q$01s|VEffs|W1F<Mf@bS->
zE%KN4{e8vUN@C{u1||MG8$k@U57DKSp+TE!pK`|Dt!a2EZE78x$#-Q9_5vL`2&+LF
zJK|U`$+3{MQA(oL-~`#*O`O0DBhkeg$9ROIz<#mV+?x=_^5%`)elXp{c>a<pwFJ9@
zK(ardua4J6^Rjv$zS2^}S<SQD+W1&EEA#9*1<v|f1iSSGrIqD(o8sy=_2&ohV^-WV
zYvquI>3n+C;q=T8FqDxx>g?0f%^bfx*DO_d%e+i)sXl_Zg;Z^;B&&*-M3s*`Pv$`D
ziIBqlD2Tl9!w1Bk-Am(wn(L6Z`_p&<z=Y2*BJ{pAn|(sLP>-v9!~rjJg&T}sfQHG?
zzC1`K%{0aOj$t<H_Zalx*5g!aKLS{Z-3Bawh@cN@BF%@E8(2W`+hKtPaJaRNSv=fj
z`2E6kq!Fy=(Sg4D-b|^Z2(Dt8?M_m8-d4ki0U$PJW*|RRO%gJp4_&8zmlXuk3Ka#}
zi|FPA(n3*OcOj|gaMDd`MNtUcT|i`SfetiQB)q;oJ=Yhr_;~ny^lf1L_=ZN0G|<t<
zX>0em#&t-=BDfML*Ex9^@-}LEq+J*&m6&=NPm(wBK4n1h%{W34Q5GGN74;eQ82bJp
zS9-tkG&OeI*1w6O3JjtzR&*2X-yI6+-X-;1(X>479?$M0(=LYI+M5w(g3&ZFN%{Hs
zKf8=|9+|o<jk&eHrFia>kbwTRIL=K>&q2sZdksPG+Y9f}U5=x3Swf1jU&V8pdBh9a
z=|c7iq{WR1=ucyA4K}2)UI-O}kf-9@ZIS<6fwlxE7C{`%;dGEuR6D&UjN7E;89TMr
zN}ao0Js!nKOkELuwimiJ4QF;rE?*L0<ljVg%~U*t*qg$tSA>cW)v?Zdq36D9T*gYh
z_}0;9`;LsSLp?tU<$Qih3-`eN0vM9s+{i6>B(z3Yie#4kE0*&vxRk9oIc<JKo2-5Z
zi{wuAVz;8V8}bciNMr=RG14+Nl3HEiOtLe%We}FvV24kp8HF6bfTZfAxHnXc*16i>
zcGEU_-0wClVsDRTPkR9tst2)nugMF`i@VGMBP^?$amR8*y&RLb8U^%!j|SMi_kgPw
zF2K&=bCNV0+v6AaB+-k|+THQ7Fsf^XB-YS5j54tt7c`!Q=uT(Zna7rAsL9TsuBgWa
z?HO&SLcf+y3e32q9B5!S@39_CxTGA1Ty~2yH)zj(G`{fe1+Zr9Ou%}i|F_Mn+$P$K
zniFd&<OC(Hx}gL;6VEjns%Rga&<&;n-s8WA7O)k>96R+Hy?$yP9eJ?ZygbLeCKcJ`
zH~AYu{n1&96${yw81}zXy~)lT+q4Ay6;xaa9+<uA4aum;CI-tJ3nPhOstQ6$l=!+5
z=dPevq14FrJ$B>=*Q=Kdt>4Lu`R*yHUle*j-KYcJh`m7T2fRU-R5I-vqc4WTK969l
z34&<vEKc=*gnDKEA#34<dun|iV%F`ws~f$(R1|HcaawX*0`&=ZIj7<4;638aF$FrJ
zHyI2BdbS&bPiCB$g9@nu^AE-lR<FiT-y>$0ZIM)Z!PcxYSc8jjWNN6S6%%;=jP=l`
z7G0M^>>Ub>-3d<H5Ag-*xf35q5GF4kJPj}4sZljin5;Sob8Ft0Dyi;_t%(FXRjY%&
z1Oq(oVM4aFTuV&h)4M0&aP^ScNO9frl!>*!tpx2N)h<{3$b5`BLI?z!{74>#sw<)a
zhz%p$$-iLYREI2*L*e^q{VI0|?D2ovoL0+=qk>fPcaJE_d_)kedB$I!+CO{}$%)Vc
z-t+C<0X$X#KzipkU~E#S@i4$sOJyV!;dtkd-eF2%)J;*7gs2nyC-5@%+u`bY5mODW
zXnvdX(F%8t=Bwi+IAQm1l0VLkKl=Ga_6XW-!CbGEU2rc`%cDp*s=4p2UE)Ns)|R5Y
z{WYE@$kDNStQ6OCma2S$J1ZDk@)Kk2NV%bs(u!MCm?iSj<Qq%R8-tE>f2HdRFo%t!
zP<fEh#6CCN$_*qP7RVQM|Ekueq)NHG`8z+diC!GjJv(HieVJN0Btbp+riF1yQ$d4x
z|Aq`$o9k>{6v9sBX2~_8{oQ3OGe;Gqbc^eP#DH~ks%5f-rr6;sn`0^+o)jTVX#VWT
z*VFe2S!~vJVqb75%^-Xh&HPf)w|kkSs$qVexZ3rEk9F6pk)WhW_ramgkcstMGl-nA
zNB8wTHTAnpm9o~oPB6c{@I_lxg`m?C^UxkTy$x4WY4AX8HEO%<8hSWGDl8wznLVI<
zzW;mGLuj9boRJfCK6#8%RbL<FS-FNVN`{^_r*YnrGCx}~X9{+MGWfi{@B}ZqnRf<I
zeI*kr)!DeW8hU!Ik48PfS8zK;l9dGds*-5i{C#fPb7o;rGC4r1ADBnc=1<eWrC8x+
z0~$Q*te_mtZ|rWX4>Tj}1J=<NZv+|M)+a;XZ>WKwC77oVluUk&9F99PTI-rs9}24^
zDX`*1IV`;~3gx%l6o0D{SYO@tVAcK%u~WGW2IYu&FN{AD^eVQ4*?%Ja3<v;`pWfRn
z=xD$ett7IC*7mjU<hi1a$fLC(d?g)SE9<9~m{avBRmW}d(#Z7stuVK8<Z#qC%xBo=
zUp2S*jDz9&rQY4*RN1J-fzJ}tdi?)=>WFb$9&d3*q8u(!%ReYmMGl3K3Tk|ha^TD#
zKN^rd`)BGo&a}h(`2d~A`L2XuR!r(vFsJ*WNRh=UCqAHHNs5=D#6RS*G7Fe7Eq%`~
zNVm=?j#roKn<Q^)ATONT^5RpRr)cX$|2&VIU1KOru{l+O!P3(YG4v3A>o*)%L!mjU
z@LQ3@kTp=TvvzzFUDrI~Ii7YwZuFFp2Q}~BNooY@9Y*3{o9VYRAxqT@KZ8*kt(^Mu
zNSzl{h%bqN6;naO?Ad&0P|S9Fju&|aZZNqpGwDKK?j_O*ZNx3{m3ZRrTLdsTHsTtL
zJhn8S8I>Y<;@%-fS2r6i5MzqAko${X=$1jFajHRQIYbH2Z?$!)6Q6Ijd7SB!GpbJ(
zq3jx{c62?5wN2l3uWSm+o|t>lpcQmyu2~Cta7GyIE%1=ko}+#3Vbs$T{E3i?E?;W!
z5lN&LCwJNU>zA(>-|neUboXLo8TZ?c3x8#Vbq+pm6iy&rrP4V4=fDaSG97ZmeoFlF
z6PVz-%FT}k=)_@@wqqhtr}kf1i!9v?>F+8S1(sL3H5jP_NXE)3&MzS52&}<(YQV+E
z_>HMKE?M(yzGMFgpuB16VRmm`ww)lD3qkVNYE$E8C8Ar~eT!>5mRmo?l4m3rn^|a`
z`2i;b&^=uS&=QLWwTFy8gNg)VV@$rBWNd?yZ0or2<<{{tX=<wt8JBV~5<PV+8_KLh
z%8Hu79Yr#KMlrho!yAv7#7@k;@`wKs(A@$)?s|+^QunKZ&|=vcFMS)L$}N*VR}hCN
zFC+g<-#pmQCI0YfdTSA$7;WRn%L(D8SIA2v1HiUQ^`;SgfK3NJkl71t))zWXK)!23
zbJX!h@>zL8Ja^n-N`3elRWB9EJZO*PiB87OBpcJ0t>cW=!7l}k7!}7hx`KpZ8OtkS
z9REX_bm<xEF#N{UNB|qS!lp4p?pNr7*J!Ty@wEcW_TBlCW0>=cMwUBBIUhCTm|GO`
z_MGj@Ssx=0dzm{qv=0_g9i+n?+PJMnbiPDOY)mWpSoJT?$UV0#?b=-8rdHc;ZdL6-
zq>!X3m7#M=BHsd)a&*3%z|gCFfHhwK$;o{6!;}0n8TsbxVbO{7PeiqyXy+gwte7F2
zo)B9=aq@o#*~%GSY(w@KwA*tA<-`kaH4j2464SElx37Q4gvG{4rl9Ry$D70<h?#nE
z4I-OE<ae}HPu_4%7VPN-e9DL+Qo$qmBT5738BA6v!=(?<Zewdy1Hf9b0*ZXCO3Y~Y
z$zt)6Irv201-N@sjUEfn*>(|Lv3zq~nFHUoi396WyxpE!BSGv|8-t^J4`g|`WQ`al
zOpHm1Ji$W`4>Z=hy4`fkwv}{w@Nb{Gy0!6iyf|rg<Qn<6js{X(G!|rSuy3)ctQ2_H
zwbN%LZ|6FgBiby_fcNjvKG|!GrNLgz#gDJSsa9;>(u?lq=9DMrx0g9>p>uiKdKj}D
z$Yn9n(vx8q7<=Ix|0|Q3BHKMYcOJ3G!c&}vYS_SMeqYw`=I=p`QsR+G;&^F{rpd&l
z2U-}6?z>+_x%!)yK(u#{ewXoY1F=yUqJ9K}O~M;ivo|HtLXu8qJ5>fJqk+>aLgTff
zAY*INl^PKpW3{ciJJn5i5i>Mb@psRJn#dPbQ$2}dS8=+;^eYZC4)$SXSpcJ)ZAO|g
z!(*IvkL+^_B`NIljD?m~!~>XCPYd$}x-RPJ>hX$0%qMCU=?XlQrB{(A9=tK9Y2pzE
zW&RY6cl9@n;KXb__rg9jXG=+q@io{w80TW9J49jX3XHm!f4A{c<Km^&tp6Krg}k&N
zykNQXRCAl-IET$ml2UpnV8*{AEVOP-FjTVk?>PN4TDy;=tsZ?DLsH_e8IS?5Qa+$k
z`fs%O4(qDaoVJD^+x7$qs5ZD+3UMDz_fVqqng3OC$HsZM^c|#T#IZ{Ha_88YuW`dl
z8)4ACqfMfh^F6cra&bBP$B+geEZv3%-ewTT4BDDly_&PUA8MQYQqF`1Vge!G=Uv^*
zhEHs)!)P%<i+#tbB~iOaMGbMNdxzwf!Z$zp_@uV;-e16pZ5_;<Fqt1!pbig%-RC2V
z4Nv>CGSdr>6%zgOhg6jAmEG|F`q&5gC`q01gO#hsBzu}ABZ|g$6Aa|2Iv4#3y80Pb
zw8Hhh?~cR`N#=UuWn{~X%_0IP94=fBq1-A0Q(JC)p=j5UTdMIG=+cVPzgKWidh<Nt
zHGrF?kp`Na`&f3~%mP0)dZoS*jN~nm%{-RKq0vGABa#}!<B@plg8d*%Dm~x`^5|S&
zQ)g5Z=JMvE%aCqqTIEdRF(fS{PtcMBtvynOQZHKwn8AFX)1I-CFbh~lsV7TVjH}UG
zLvD`BQ#tC3!dT_L>hZTX_;1blK@LgVcYeM+3VgeZ07P>GH5Wqmk&h+I^}b;q9S?+X
zKzByz3Bn|8*(BM;o$cL;6U^<KzL*~8I2FXf8p_Fz)M3)sZvl#fZkS$jjpsn79GS$w
zZo<7T#%awgf1(B7wSC1IbOpgE6-C)f(3q0=T0ZO4dqG(o|59)di0|c#kVxBJ8lPn3
zpNaQNW9Sc(Lmc|SiN`LHGw?NbFbd`ve&k?3iMU#I{M2>TovG$=Q6f-aT(!D}GV%YW
zLjB1eMU8Sc3qT1rJT$EW-pzYpz3T!|qp){BXI+Z|?!%Vm(Orzycbb&!opELBO{1_D
z?EY^kLFj4!DLvWmM*KseYCdX-8+`X+iV*F&uVRn8d2)H0uvNiFncw+A<i`Q^VeEI%
zutGll3K0EoL(9zGo|A5p3Na9cQ-I&LZ5%o}T3E44?mB6qWBUgj8V|Y78qy2~iOL0S
zCr%=SaT32_mi?rUGB*nYA)?EN=#69UQ(rA%*4Q%q&qgI)YbwEwap@o5_j!bQ${B(v
z8jmuLZsBOSR_bdUscHB<Fmqzxr2ojdyB7QC={(+Dn;!8HhF?NvCG+6>wktaP+OhEy
zxj*V7H7s&NQl!6i=1m+Fa*oSKtivRohh5u#vAXDfdtX2t$e3StHO8Zcw>>{<6-8vw
zavc<*pCp`?Ly8+<IFoE0oont{2g#K;Iapz*KRfnz#Xt1Lox^7%GY{hgAT7354n`(U
z&E8bipvMh5zoH>?<F<dniB-)#d!z>E05m{Ogk)7IE0_v$Uc~f*awmrN!vIIdx^#Pj
zW-R1}Jtb70ekuC)wHQS89Q!uXbh=SQnDqBN?v0D}lz6$DuuWz3=@<s|W9WBH>Qd&>
zv9`9DP^@_I2RZwrpo&T!WXz5%)7@|OqEjB6HQL=#Wj>L8XI2nDOYrnt^LOu?C8=1}
z9)L{UduzGz{p=qTZkOFanmo%Fse!PJ2-YuxbbziR73#<Tq^K`ExuY{@`vHgp(LpCb
zQ^3{@>$qqDGfG4V$<n$Lgg#M$>yin>_Ij+OUG4~^a#e#4CIVUxM10eude)m8JP;Me
z8Rc?>7wD+mq&$i_3)GE%OMx<wBgY9=tICh=j5imI0bTV@nrQP}ZW41D(#J;#{M>xx
z=7&Jdy`ex+!x*39hHk$<;^F0Ro1f$!lFYFt#Muk<OQHDI$CO9I(NqHNnzIjbZ;h{Q
zMityrM5Ykni;AN(WS0DwU8T7f8qSdvIN6ZYshEk1jQgH+=LNeqC~SDRVL|w@k1u4;
zjj!i;pEtotR}Q|uuh$><ktEgjCJX<C^^-wW_?!{*dL8Q2FZYAqCak$ZX5p~`{_r?9
zK<scmoA|qFA26>=1@z3hfHT^b$UsS>OD|;E7gqK{w)2PwX?)a&FiGl+Z4x@L#2Bi!
zoI=hnQlwPoDKaG$luA!O(O~6X@kkMiIp@wjS_AsM+;nUwdEBpKcRrZ*x$VvQ35SsK
z^QE6ECP}wh^VYmz$B=p_zK4?w*XCH-IPX!Qq@QMeTt55D3wkEOr?i+I1{Gj<^nMF{
zze}0w9A9P60}r6fdIcbD`dojga=kXgt#Q+0SZ?H#6)K(=q64^uyk00Q{Ac35#!nw*
zD=LE>AH{>A#5u0V;r(j6ZpZIZqk7woL%jxoEyqnsWYfyF)Y_ruc>8q-v}w4nk0jGK
zG-UQ_M2d-*h(qwjbLyLCZA)V5A;$aeeVXZRDVG&)n@G@Y{Wb?N)XZHUjhgM<Oi*5S
zb1!p~pHe|%`*b=>t4LGvn=&^1a4&7**X!iv5fdwt>hp6IP8xYb0r3+<8yUcnu|Mux
z>kIl6vDb=lQCZQZbF^swu|6(EX=rurn6n{qD2gD#EE^d>KMLq|)2&)ZGsy!Ln39N{
z_$+Y~SWtbWdvMgAH1lX6!PhiB0YCqP@tDs-rEgEQ*^m5Ji21&C3Hkk~;y4OhqU#$@
z7=O>}+DG7%FNShwy^Z1qJ)$YF#;cZz4Qg@{wotE4t)dkTRw0n2C8heTiDz7}QOdog
zmC<sLkDvP$M4e@TnnwKy2z9nXs~1yw>`>FI6V1KQ?Y0+=PEs=p-(v7cEH?WsNq<F1
z(qO{JtUx#uD*p*ruEFWv1KL-%A_YW7DsA2!?>gLXE%G6gk`Mj69DC?>3}A$^ww*v&
zZ;Ayt$W%605GPL|3vei;hX&%L(P=2neDBIPy|xW+chWkE5cH0q{FMPJlZtLXmi!=|
zL(9P!QX&t)(aiBPU$wHT<Wg#e)jz$9p6CF@^Ezs{pVvwxYkK{f#<?inXC`&F$e+L4
z3u;-EeQ)ve`*W1K<~yoYLlHu5lCCX;4N7SEU5o1Si~oaV@{Ps<uvJ4K`r{-Zb5#?V
z96ky3*IWc99iIS_^|h|S+)a{^kuJf9zd4yqj!pFFFfy?g#4zuHD#A1MQB#H_ltA^_
z@pDxN6gwF*^$++j8vPE}Bd8}9XE7IT@-g>}l~V+?;n0iT5oihLyl%g=u4aG+*IMc)
zEOF2Ih<rj+qaFEeF_l?u^>7O3b*E_q>@8B9XDWxbHQa<N>u||f<c)P3ltEwb=W<`}
zXD1H*uFJtsGA>XZZuU~bmOMckg}pJ+fa3TDpj18BWK?p0UVGT!Jv^ctK_&L$w?3T&
zRjL8c*yeQIhIo1B(NZ%KMb8l(Vncj-Ma%HxmH0Dl6pz1nrW&X9TX`Vf)WWLp*n)Sd
zr1cs>5am6_W+oQ6C0m35&Ti2PwbT`JrN1?$7KVDrQu3lCg4@-lA+O9fJ`758fIxKA
z=!5_X;<A^l{lL5h8YIOj)l0fzCy#84Xq4h6Yg>_&UlYV_sWV~8SZq>?(c-9%&VAzb
zZ&#Opv+=|)e{#)|&OKYEC$*d~gJOD<Wr4v!C)eQczk1B=QfI%*5E?&aJ3FgEIsD)t
z?l@d(Ve@cBSdNxug9w~;Zwkh^-IYgs*EpgL0SZR#gl-Ggv%`YQ|3b3ih&29aS7LGj
zUe+e5Fn%xz|9h6<c+XU&Xum#(INHUuZ>?v8THQ8Ba{2gBRW}z?B38xK7)T3h0`WAE
z-*Uk%ccRax+iya7y7If5!*Obz<qP^!G-|^PgA1~|cUkcvl(6;X&viH5FJUa<cMytW
zTLu`7V}cJg&64`IPqFsVg^CJEmk-FH@{Ntl${1X>5P0@ot@sM0lyM*9H4=|6)szC~
z=Pk$XG;mx5_3Jn!xu@o$C&}>?;^S1V;0?7R&$p>iO>c1Cs~LmHrQnT1(2rIKC&c@L
z#fr|AFd)CONtZQ9i*jVEEw8L1jbkN0dY8`$+;tbxgxJcx&?$D!N{1RR@J|2t7YBSa
z+GPJ+u!LD&{})0g!gQ2^I21xw#dHKHR(wc@)hTYuLkVRH_0frTWUi9EW}ZGBWJdV6
zEwgt%wF2&(F9Q;d%}TR|4&Q>&MVDNbGc`R^{8Bu|`-q+?5o-nHKfCJGAV#Bjl@}y-
z$dm9Ks!v!}7N97sM$!K2;)DKEhAMNZN=P6hLZp#lH{GcVd1loA9+?B5p1%hcd4B;p
z$n!w)Bp;x8F$ak3Ap>dp3_{4(y@`=r_3_;c642^hyB@Hm8oJ5HyhiB-JPtE3_8_0p
z(!q?8cIEy=N8D?mVl*w%k+aBGo$pOIZ6h~x;!~1c<t2Fx<YDLIvEXKgYfCeMaeh?(
zYUcw9x8NQAi`~~**RWen|GAce0!<5lsOa+oqx8B;HvuUKc1c&sK+`Zis%Lp+84m7_
zhFgDEZc^<um(at<=PFZ$kA)vqr`!#`)%s)`c>TeLavP6OS>QU-7a>V=(@B6{+@gdE
z&?ZVs0kfnO8su^|sSGk_bK1I4vYn*3jL#PT+zAz@K$TYT{BP(nsOpcxms6#<Blgdv
z?RJxfl2&0igoYM$dPg;je=WHN-(5jdXleSD_*V8><Fj+K+{gn@D>PT{qI=c_C-Q=o
zHF6BnM1v0yOdO3d%U%C!%=aa4aHIaP+<4TNS2Pl_YJcB=dEgp{hD9Hw8h&n;k!u{!
z_}%TN79_%?7}qyko18%fY3TmCZaqyH+{^(=fE=K{_E6KCx2DT)eeD{xV)wCTO~_Wx
z#P>`q!1vSDd>Y4FH~TASIbB^0OK>n|=y@=@@-7Q{I$#=o@7X%K_&x=#YbqzL9OVbK
zo=3&Q<zHd;Ze2us-17C*HJpMlQ&Avc5TaaCTRMi#%PY^Fc-81mrCIAx$9tQ4xj%9E
z9k{y3bFLCAzZh`WS&{6Q*IT)f%1(huVI33_X{1fvNA(h8wB#WHu(f`+YP6h4EN1vH
z<+0I_J<s(u6rD^iOX3wLZ4{8MmT?z=pQ}K$X09f+BGn4xqoT`Z<T3Y$8V8iBE@{Rm
zewr{7G!$%)1C!aKwI<e3G?<VLJ-S0*LXlJd>ogSpj2`<}ik{B{yaJs(sG?NPSJnb(
zo(zPAY8#Z+2!H5@AJOc4rY{V4(Uf?oi$@rG+nw<4VHsXDon)45BNAdk?|>U)X77_~
zHRwLHxwnqqia}#Wje?t&m$^F3<)di9YH+ubX~DGGU@c`F<icxBvZ@1R#2<Et5s7S*
z{|km49C`$Q*q3HjOr8N8``P70C4Sp>&?CTGEb4`{vcQA<%2s;&jv-~tv%~6}`+jQ|
z&(>FxG*3Wc9Vgr*VmuJpeoYedA<qzb@5*Upm?;KHbYMd|$@3zipj8fIWR7&WtAjjx
zoZoEzVV<ibs1V8$n8s+P9nos49&w#>9%T3tH;z*G)tx9|N)AiLp1On8F~qobX~O9w
zsN_f8EYgoNx2WO=`asavJlS8xtbH=<r=`lbX&nsDj&?>{LzAD^?3Lw<=WdWMIoDxT
zvTO43ipfb0>pIs@2xwnEr9R!dITrJOB%OyN)!+Ze?{clTz3$Bp5yf?{A{qChNb8mv
z;a<CvgzRyzn=2ajN^&(d-J~Mxa>?c<pHk+Hka>-atna(u?_W6Y_c`ZvUa#l#@l1L{
z;`==6$8hr+GYSW<6pUDQ<x||iK+H|@PJcLX#l4!G7ZM_4`Pf<G@@(P(0j7hxvKi+3
z_2Pl22<>uZ3|`2YgE1@NAQe;iE*h}Ael|FaG(3TU!CL;h=$QWw+3b$~j6Et5d4zs6
zx_t+@A>*N<P!B=Z!fvmy9K-6P)cUlu^oT3U$llH|#;!vG7Y#dN=!YkC$-)wSJzkt(
zU5@OIH4#Uu*<bx?4+ZjIJTa;z`V=Y2JmKS|kw00vMK#{e@8X3lEdX><hTtO3TV?`#
zKDE@d0y&do%I7;E^Wp<GB6^CJ3$+uzH&zE`((|n8TTk!cZs@<o^gYhkH~9V-C$Os@
zuiNPPWRWAqlw&`8*+q0Hzs`NvznA`+?;4<)>+W44FcWLa|M%*j)(s%H8{D>$7xjDF
z8>vaZk-{apLVgii+iB$a_77Img!`J%!VQO4zXebHJOMO+D<VfM%Efw9Vwj`#Qpgn%
zel%js6lK3HUe|ClTSTJPJZ@9<bppget8I~`)b^$RZTU3;7+EzEsbPACzO^x|Kd`l!
zPgwkA-EbFVP0&?JR4EVjBVxYE(zlXy8!8x$k$F(;KReTrA}F?+Pdk8+*~_$4yed=i
zPv0r%uO)1+)S#zwMjy-{nHcw-{1`!7_<malkZRyQ)u2V~)g{I<e~3o%eLJnb;-PLf
zbMQRz7wlpmt&PhMr1`WkibeOAe4l*r38YSevX;zNQ>0a@@WJXM7#w)y9XM{?ccvBm
zAb7b$wByPBEZNcecS-mOu{58GWIF}g5sGZ}m57mg9eVAKt5)~{>1ywtM$E=1K{}iN
zG-Z8d;S(U$^F&`D3Tg4R(5`AX0SWS>AN<V$1{Gb=QF8BahytwyF)D&84@&(`^b5=+
z?tkr*x8o%@JAmIkveVflt~3g*i>LeZgwI^iijgDx=dSoMQw+R_o~rROvc{0d%vft(
z{ZOSJ&AgQSwQN5H1%bLvL}3<>)>7s5y-!7^ZPHBoU!E|nT<MXfU@d0ORAhdZ&p}<N
z%t$BW+v)q*HLHf)ME0IR!pZdlAg%bdB(lYqKt%Jq)+b&;3B2!De19%oc#o>KMk`B0
zrA6gAqlGl`s~a=BpyM5@V#*loWW3NJWUeqm%B&cF320>HaX$H<32q{=A9zt0amaH>
zHwN#>pz50chIn#16Emq1+Ty3-KXp}*g{ERI*<qqnr#TAZCD;b1V-FzU1_<+k9p03%
zFQ9&mXE=!QcFj(4qk;bStC@br{D&<gkK$;GlWixEEw5L$+D~DtJ)dq4Npg@4e^Xu2
zrvlBIc)xedk=-h$^zG_%K!>d@BG7aXq!x~AY-(?O;pgXt`D5do_hA8Lc`U?;_V9*E
z^?K0a7dd*_dI8!q>;q;%{pZN>C<^n6ETG$UQGL*MZAb26oYZ;~o1-V*NJ{taV%&LO
zd|MLYvK<@RevW=uxF21+tri%VlnH+`x;`;q*XXoI1!5Lw8MWLO6%55}D%B+{2NNET
znd^#fPPOte?yKKV85?ZR1tb@>*bf<tmq0QGh3{P-VZxY-Rq<cud*5Hkxtzk}YNUO`
zCoA0NRK&%QNWNq;33|{5Z%}$ei`^lo6@pTUWx(6<FPiPq#Cad<;r(JSh$OHP-bU*C
zbd>lQ_FM~ZD#k%uS%Ys|l6nbWtn718@<-K{Bqkybd)z8XKKXC0L*(CYqwO1LXFr8#
zAq}ndKxGm$_&c&J6`PJJCu7>nVamr~ux9f(Pyed78J^bPc!53@2;-d5d1d4k`2+Or
z3^dS@ViVq17X^PgLH#|Uh>6=4KXh<=_Aom^<`*!ntEV|gs5Sx49eRrzpBrjR6TgTs
zYX_6X-hBMkb)0_d!WMu7%>;qEBKX2Efc7vCLr%o-;2}oBp?$y9zltMYoH&kj3!9Pw
z!6I|{GJa@V<v^dcrF@=xB?I%oZ(-EX+fKU`VxLdZ&aMx=Zmh_9Iu9nkiN43Y{K%y2
z+lsG^^^J%}pS@v=d5a0+eI|`Q5MZimr&jG==dJ8#KBbh!$Y%Y*qfw#HB>%ynR>*Q5
z)NysZAmY6k!UN`&;Mo@=&=+z7AI{uaPbo%~Ya)&(!i?pV46OKm#6f>J2pXsG#b&C(
z;SbJ;RS|`~#Y@gc!v4TZ&LR#h5{~DW;xDA_;7wm!6W=l2Hq{3u!BI@_sfCt*tpySL
zbk-FzqA(!RZ%2{-OTM55r-)i>(su(^?gj_7-<hkf4@xN7d<gfwq3BzoKe{hM_mlNW
zYVpVNyHp3^*$2=2!%;3@rLm7rogn4asuXay&X5S(E2eXTE~HfN&v!4<E%}EqEyqeS
zCorU7DaWrqlSS`}isOAWX+?B{HDfz*qn%lK_R4pD)K_5-mF@s-*g{bZVAiT@C1$tP
ze3i3j^3>gJk9r`C?;!B$-hlIeX>h!}onDtYo49gW2Xo}7az<tvVPEK)=!q9QwVuAA
z4<P;(!Ui)<2P<@CA8I(qMe4I(wfdnBzPs$JHFUO#x21C-9R25B;isSl<QT?DAGCnV
zMJi4m5(V3Z1rh}Qu%9Il&8lOY8O6mZ`w-7n@RvY^o-p&P@r<~&vj(hxgSy(Gou`8m
zchzFO79Sb)T5G3oT@2VKBV;4ye@MS29kjg@g+&bp66g2n^=%4jsm5RbxFgf6r?QDi
zDIzoxWaG&A0HXSZ{M~rS=LhT8&3gH!d}ApoxO<SV+x<=oDjPNtVSCRZKPX&TJL1ex
zoAL{EJDGFN8WD(7@Q6v_vXa7qf4O7DzsNw!3N%ls^8~8xPY(*5M59lgJlvU<p4FA+
zrrf}cIU~rPf58H$kUbb7=7H)<8&-7qhC4RsLW~#YO|nY+<seo^BWXILff@8$mM-l9
zk4Ow&9Ob7g4l5CT4`$<k^2;OJA#S|I3l@}o{LPv_V7%_7bTt~E*q?Fb*D!gZT;F@1
zC4Pg@jy)B#PB~7LjgiC5;-G06LCdU3h_gz9jx<=#-J+qLc^5I&+iU6MrA%uex=Iu?
z7M6uksC}PY;`3$t^(&Immv}@BT1jhDW?34w`HuZ;6yr!b_X2T?A36~JC?;a{PJL5r
z0{741wMXV9FJT}=gnk{rKWv$-+?OW1SSw~hkr1RoaX1`1-X!D>L+CM=cMK&L_BvM#
z{wN&gve@2@UkeP&lPA|?&lBTg=s)#{W-o)SR^*RCR3HbOzGUE0*OlE&@(6t7NSktl
zGG-Z1GE$4yW>+|+5GrEaTWl^K`g=4y6nj`&@q}Ks;>_XB@_lx8HV=C^*<t00Dw)oS
z{v^HjvJKJsnd<Hs6T7`Vp8CagIV0M8j|<OzdfM}w2)nf#cv!#NU-Y!!3&GcKPo9r>
z7<v2Q8#(*c<DWAfw*D#}Yn9JA@7Oos-cl)|m@m&-?zLSI&kLEnWqUjQATH)Nd`%42
z_hU(IhQ~siTdG{NcKRrrao2dDQqlSC52Kg68#*S9#(pgJ=PvxEpXVt}3(92?WbaR?
zkKI$%4&9IPLL4=d$+`1)4?^u5Z;$OaCjG?hq}Mx*qTi=MvggfoQ=!q78f;=;(g~zw
zIMDpb0GTg)BPAfjwxi+VuyslZ#o$06rtel*&ABz})|{4P36CQ-Z8OTpyd2=7qZ_;k
zWr^-L6@ZmQ@co}>!$dPr!1as3s1g77oPm*>_ehb^GV(VM&X~y%ji?`669p&7{w~TL
zNep|p*uOknYQdk}<k?WXky3Z0E2{@DolO*)MDq1^r5=;8xV3xi_?;pb;k~bV+TBiM
z+oy29M>0FQr_~Zv|2uOke6iEe`<=mV+Qd5^KU7(D>sgF|ii_hO(h^$y_)mO07cXUf
zVm@xmbEM+WeS(v92Eji4R#i6`GikMsMk~!5H}OWA!+Ecl>sH;dYm+Ye%q`8p^?;^S
zFp$--kbi!fch%l&GSKxjFU9dFsnNw1%$GcrkHy&3l1ZD3N!*Ed-+=i#0Zc$#L<)E1
ztsAI^n(-o;tkUaE@i*)DGV?;~$nex6to`h3zle7uyV&oarq;`pyeQMAWo3)gmJAO}
z^$}FX*Vs+Gu8eeU=U$S=2LEb`=@n}@GE-Ry(TUr5(!%>MpT?bNdJ2dg%NJ;d<26N?
z_oADE&Ti<?)IRKHKBoO(cx|y8m<ufuy!r?6l;W2c_SBQSB&;f%7+@P2zp;32EilO2
z%PZ&%*0W;uw>JA>RcU?adE!uY*o+x_Xs{nG>Tb>oTI+(+L%xZE)A2Vn@=(ta;F8=G
za$f{*51Z|gcF6u5h*KHSK24AK652MXrUl8bY6$5$;D5(Tq)(+Pb^?7uz&@QqkHzPn
z0&jTE+9Cfk#a@dCk63g?p1>|^K9MujJ0{Sojw<F2uDQ-!qy^{HwF@Wr)7xDSVq;?9
zwYyOuX#(sUMT!!ggbwaI(s{F@1qRL-r`r(gc{0Ql=z%ZwkGI&}9_XR?*p89Qzdx}$
znyt&~u|j`=+&Tr%ijYm!3T))&pTq3%|5AajnJC1cF0Oeall&=;H-wZYn9+|3=iq{l
zw@dw2JBl<Dj6`a_5J$#;z$1kZ9HUz&tfI{Ze7qvUr*+t~m!G0K9=t<i&uUuU8DvOT
zM>ccnKHlQmtP<#3^D0jFT!NOcEgI9<@)+KuDKmLn>Sx1q^e;cIpp=T@Q?AYc0u=0N
z40HF_b^69F73rngHtc5jPx4yug2aEIW-0kIFyVo@m%a6gw0Ad~^+)-$_Sj!Gm>#h#
zL2qW+@{dJn1Ue#1S>99kJcTcoP@?uSXu9!dmsIlW;dznkXp{2&DEBu*<cMp(G$MS|
zwZ52dFWlr#Wv&8#rL`oZU{Evrx&1UMuzFMA^+0`pE0sIFdw=VQ>v$V+#GcTyYZD^v
z#ITDew68BT_E#mPqO82V!FhU8Gap!fI4HEERHVMFqQqqc>j#Gs5Uuq3JB9ojahzZK
zJL)K=<&>A|NMzuqurppJ<%l=H&bfaoPaFsLJc2H<fOaOQ8Js)yFK4A36mUVpUZ7@v
z%JHT36~*tM;!L+&c<0v+(%!x?ulPWagzS+%egsEv-}rzXh*^>-+cVd77%6<o4VgY{
zV)V{!H0~4T!gw%Uc(|6j8eG02i<>k~%9zt3TKxJ&9^vy%d2!`6#w2<%mAms+6ZrZD
z3H)lhNr}~;k-DT#oi|5)eHlQ?`@*DiH&d^WR29QSLHvL<eOzpa_Ix)Ls-}C09&KKP
zJs-b-v=j|J>{fF75N#^_XZZ4TT&C|xkhu3+(7M@w+F7}*6PrtmA#|Nh5L)ST1a*Cf
zFmV6`!Uj}=oX9TgmYDk;Ac1eBPkQR)Bif2K^^OsL;Z4M@m0fiHBiN7yOvO|srX_z7
z!wlK<OxtN}WGze^deitY+utd9@V-y>zJ7k3Q8^MOEz6T5_RYJbeXkF%_c2pWU}}pR
zXg$_!I*k1BJua->5xL(r>%|4Kr7NS=iFgF|F;g%s%j8_<XMc!&Mg5(#(925Y*HiS3
z5LNm?wh~Hi;A>aA=O@toKH=1L{@iDbbS2`vpg}I&RT{sgR(TBa|641}3KCFw;Kmh*
z53UCKUb3<@4zVI+rtg38aM}P2(Rn6_7w=h7xn!_baz~D3@l$P77-@cW;KTd>?s>47
zTe6Q_<wqYhrJXYrp4_#l8ygk7WMcVi=oCH4?;L7-am!mk?49S0<G*PqYR?L7Z+jWl
z`0TMfy>38X8de>h6#~`sd%q6>>mF`<4U3LaCiM8(;qX0ly<8<)(xEh{GIQ}x`FnEO
zma0`o{@q~>6k=8#<?c~w`A+E9U|k)c9BASdfe7FvKLerLn^F+N$S{+dmY`Wd@6G!=
z-{R?OX&BB*!1F#qeujlu=yzFv-Cxa^d&kMXWMU@Ai}z-k%q;)vw|2R)h4o6OOU3JD
z3xkAcumyte1Orc$J_4=o^?-g@GV7E)pOZ7KP2>z|+TC&2{PzguAu#cB;Cz?3hfCr<
zK%0^Z;xn50WV)Cjo%FMK@s?U6hyj4RMDi6FLPbKTt_44QT>wdB<KV}(7mreg4nt>^
zq3?dAT?toU$_jx+;9`tuUylJX5E?04z8hw6|DE&=J5tzu)XFVtUG#oha>4=H%WVGE
zoCstNX6DfQRBl&HOXJ?jf!7zpHqd2eMxG_6`+^F%Gs*m<_k2vJGyMnU=f@P>Apz$c
zbuW0Yt==dgutvayYOjN|dvBy7eaX<%seyizC6i<$XwBoZpvbn^pgvdiujZ3Fr2LHt
zuZAG(f&{zfSQ1)ERWWlnVxKo6F7un$QpD3HR<=Yl3lk#2CUD}EwILj{tk|kkIPk&M
z&NH4Arp+rWA_IM(EyhYJ6&ths>`M76^sQe1AO&OpVE3~?xtVlX((l6};W1*;5ZT4E
zJuZMok4yPmnp9tVW{$ei@H+Q5j(#K5gFe{LZU0Sn`kXKaPn!LURLq9CP*Y-31rCg>
zl8%RhJ`wzc`#Feyd*Yxq3Xr^kLzI7P?`_K9E-P{FTL!@uLthG)zz`x$r2Y^Kr+=r>
zdxdpzEN4wgs|+j&7>bX1y5E1ae?VP~o<eP#Mc_Y*fOd-m-)jI}+a8iGxU{sTRE)_;
zqk`|buo(VLcWK4b*N|~>*!e$5k<<5#+ey#0I*D15Eu7q{ThC=$S6#oMv~6#qSE?y9
z0^@wXZTEtr>Hc5qJ<?hDL1i%{?yxD(R1Kq2-`UDI(I75o%-mqK5ex5jko2s+7wVbV
zn36cB)-N}AVFS*G=8#3d>_w{joIyJGgZZSLU)B1V@)r9c+Ca99%IKzAz(cho5NSt7
zteUM5LMJ1H|0_;wvZUBaow3Ltx>u&en?9=n6*)(7(PpZuT|DW}))hy90o28BFJY2v
zro$5EB~@kD8tYRdp$9$@-Wim9fLBe0<E6yGKam~Wr|Qjgt;dh1Gp-)vJZl*7oi-<>
zdd_~m2_#C{QO_Lv3%!!?JPL@@s0Ve)gI}sVsy!#GKO!v$bNz0pCKg`O!y2rrW2?=}
za+ej?8AA#0_gF>^SRobr#ixKv^$@0xyR$+&^VeTHjGR4FBLa;X6Goiv7B&7q@Ys{E
z=YUf1jfZ=$t5@zdd)YIS39~#NjHK0IB4tucnBqSgTHD3D8j#(QjH-(V-K!ge0=`Dl
zo9A~RI`UTUE5aAeVjW3>!dOg+_U-%gM*v9S%8LgA-#_2+^WJ0^7y^+;;(#ZhRintf
ze#xw)19~8ELSN;MI923w{kTnuet9B5YQDz`dsOF%|F|?Z%iXe)e?;<5?%=z&M350I
z8L>34PM-tExRd%&F<8q}w}wy4csB%R3duQ(d@{_E{rTl)H@f!fpf?k@q#3DX>G~yy
z+mJa380wkAn}784&!hSR`cSuaRPG#EFWyYzj=p+2@}IFX^;MUYpE6cqxICNNFgOdO
zyxa#gNVYYee4pTA!9bjx%^6#r2M(Mh13KS45Z`JUF_PqG9h`^vkGVxpB7nM9On^gN
zJ1cxthK(boa=siZsHfiKT|8`o-;`6Py?G|ee&w2rQpzwgK?r?OcN9hH_&OrxRchDg
z_1Kq4K2X~%!{HhqV$@0!x9zDIFT-k+Uy7D@@GvbS1>H2aM}Q=?e2*QTaDO+%<%Es~
z^mh~Y+@f$wwNBDO{k*<@oPtS^%sHgJ0c9NRh{0=1h|8Bh+huSI`kX}4c~CMKMRAB^
z-cDkW_j1zA{Ur-8%ui(lN|k&(;TJrpu97?bWX&KDuW|uCc8a5Vhw0@`ibIKmTXq@r
z?#l?y<avujB9#nOM4prL&34w=yu}VFq!KqA_)FJ)B=eQk=%fDhQ;^@V8QoRcjJBE@
zQ?+udzP>k)IxnW45sH>Z*#}6Y<AOmC($*wAB1Fdj*<__oH`u2eY7Uy}HAcGMDFuYi
z{y<c9+4Jvg<2nj6+nEpI4cWqzpC`7bBmvwj+xl<{aD;^jU6p&23e4wQp$tHVr)0<Z
zdKu^e3hzo_nYMIVTLhSZshwg)F%>r_i5(HJ@jyJ`Bl5*ff3eQW7&FJ5td-hmAGs{o
z!fHJ6R0jesDPvj8_^Z;ehMO9cqJ562XXPkVCLtlV#+%f)ymlF|v^XWqyo^*nmgJTS
z{b3H9LQ?4YB(@9FF8)GIx$OIsuwL58^)gT(GGf)V_}7e<@Jgp%=*Z+ZL;4`@2`+}d
z&kFPoaAYH$69xLka4P?PTZeoW<fR3{tQ*-o3!goY7~Zpj?7dX6Mj;%(okVcy%zGr`
zZsJ)6C?A^FHyMh~<{n_;k$><*oAE6pI?0o}Y<Hx+c`{gE(lt2}DgIA7_rLz`5mO1q
zuLn*_)jme=e+jUY3w6L9VB*U;^WKxx7#^})rhe$!AaHX!SO4CYP<~Ljw48U|gljA7
z;Eg$qD*t3`rf;8CXd%@uH%WB?cg=N`A#_BfFC;o>Yu7QE6hkJAoAg9S{8>|D$B3|W
zw8)8!@Xt|jWopdV<9evB>O(Cf-qY=@6h9i;0ooGF7%ELuc_bscD@E~wsZ3fOf#0vq
z#xihk)3=Jvtt9fqR2<T&j!3UbDphT#fRB`MOODC@NmL}~-Ygv1l6H7;Q{WX`ZhcY5
zIT3bu9&&O8J6I8sO*od3N+6z;yOOv#F%(IUlzIY=1cIf@B}KrNAH55oxd8{w^(qwP
zb1dOC5f3r=0vtA{{;r?U1BwENe3-pXej}Nxvs0%mPg>L8iiPP9)c#etm!f38!D4x}
zG?F^5f85<XQUK6$Gtg{hd6L(}wl)2!M;+}ynoz2IshR%y!AL51=GiM?w`2zpEQIX+
zUO|UfSA=F2mp-{k-mq*jN!}}F$i9Bv1erWs(Ji&hcBEj^k3LrF3!IOC7SAj0Jq<<b
zyY8i1%LU>Os!Ku@^3S0kafJ4qB5fK&n?&-QQLiD<dt0`oh?b+j*8M;U%B&~nt36p<
z(uwgzjt3`xgunYl$QEiBcxI1}?!spalxV_?O(}w>hc<RVuVe8^;Jb_<@NWN2RP8qY
z_ic)Cfjkuz+IZ04Svb^JsAPn1KN2QWy*zM8bO{kKtXOgus^QE@*~g1%Zgty0y)?Op
z0+pP(k*i^PK7Ajq>fI6!K70f2(uY`-D$%g5aUHiofaU6Z8v;SHbZ539zFI=B84|1$
z6ZkDlYa-fte_I`p;W$^MBl+i*cDRqx<-KS+|Ar`T;O`px-d*?ev5g~_$)ZDW>Vsu-
zDO#uU0i<=T7k&P(Il5vFl*25-%fdI{7`A)-S_=2`$|%si<4$5?S9ZsGY3PrDNSC`S
z()5#6r4&2*ZebnE%V3juJ=}O8{-h@4M}*DI6a+FW?gl34$AZ3zNr>=yo)qi}%hpn+
z85-TgvfV?;R*dmk`V}8PGWv#b?5}IMhrY>R{B^EO^EIT@HS4K+LHK<X2W>`jl(>kC
zG=BU@2u+sKAXRQ59NM5);&hY&U0ql=rGI>O0r+)p5b)D8v&ez*0h7+soGs}Iv`UQx
zaUK!rEWAF|PlYhadPEHpLdNSymA@eE$$J6#hpb&k#rVpnUbM*8HUn84!u=t!#{`jJ
z&c!#-!w*3fEAjyr3SCwb+GjzC;Z)*Ad`EBdm!j{-8h4NQ{pLS*-U>$8t3mgB38vL3
zR`8km{gz=;BG=}2S*A&@bP^Z|U5RH3>VMc5ai1<4BELqn?hAzqE<6OWORp6xn}U|=
z1CbyE1Sx7p2;RCSbFUv;Kt491O;5sa;G0}8GWjfbzYunqMG4}klML7%u8#DLr}GJh
z>ObLkSt*U;-JAScO1CJBf%^ggv7H^Sh(+ZdDah%b__Y?^%E)DUW_TFJpBJPru-E@{
z`L`4(K8!kUkC*xb;u*?Gh+aF@2a<~AkgN|)R8xryf;LBvshI4<#dLEH?WYy%d`Kk!
zzAFWI#6Mg<ibscw!N+<u`xF%!sw!YxF$(`V+G5ds7ZS>`#d6NrjmUO^(@J#LOScY&
z?`#X}Q>)->``YUG<}}shvPjvi7C8)FRzgMZf)X<joOSDOTf45b*wo#ER>`5uWhKkG
z@Lp+tk!$NXm9SQvz?-+Y#tCE0vi&QHw~A+dcM<R#9SF#OE%aN1E~}M@<V*Q>5%m--
ziPQV%<N&+C%f3b*mSov7lh58UY6O)W?*fna-v)MldUWM=qfl*(Pf5!k(5$>-k~jTI
zrGeS|_P()iDv{G!mPqE7*F?-`t@1lc{%16o&O)wiZgp~Yruo^^J2zs4+Wx#x0QLET
zbijw(3EXqZDn0v9fU>CXF93wPG<;ANkHQo|k)ViY9UZzXm~Ogl-hCglZ=kP>=>;O&
zXAPC~W2|4{2?`t&0sm`Xz(aJ;1rE|`Z1gC;CViN=DV!3oM(#U$wCoN^Q<5U&OswR;
zs7P~soA9-Z)@27338x-RXX$bh;DKglbTAF|)F`r2${_Ru6^e~X8o;5!z5ef9^@G7$
z+7r_!PUA1VAw1Ph$m!OP<zLz7?jBRmySpVs%S_f=uoPw?o@?oJ@uqm^=<@T!G?DnY
zB@NnxSL(F3E1TAa0z2bm-Wbjo^ZtwH8gD_Lz2#Iy*}GuQo^37#H48Ot5~-wBMP;Am
z{nB*Sj+Z8Sm+=!Y`by-&G3!ISaL$WqS5p?XDDdg{i$M1^bL>FX8Y1Q$?jWSCl_8Yq
z%s|YvA|U_KkoZz~v?()VygpSK$US97s;G$8VcLIWGj!kq@C8whnFLWyJT#nt@`Mq`
zU4~f77YYE(Rm2cK-(5A>9}?2Dmd`#WfgV7b%gCa<?1DLHU3UzC4Q}uT%;?*RKERih
zA86Uvrfosv-!Jv`IEz#M96f~ti!N|PWCM5`mHY=uk>;eqN-pRDK1-HOghXS16TvJM
zXOwvK0sQMH4v7iX;)0IpRPDo@IJqMw1>5xliyNA4W=3f)#8TnVP2rM>!~q>N$7>P_
z^H%|Za;$^#U@ip<Iy;9reIgbT<`wT2)ycCRLDF7P#kLQO+u%>wW^-lR57FbBl`U6t
zAW|a*{j2DiTL3y@N76l8ZQ*8Wz3b-$ZuYV;UB}R!;+4M9Bu8J0SJHQ$F3=BJA{vcd
z+f--Yg;%kjK2Kn69qvZ;DORF@c*)3w1ud4)y}WCvxxLk-is&uAuh%jdUu|JJ7mkB>
zyL7|KlL7uG59K)SLRu#Ww$~E59kuO%+?^|)#Bt=4!{}>Mf!-Q&ls&HrY!ZX4&Uv$+
z0Xv_j+`#X~C*tx<;5h|v3MUqyy0FkH@J_58OiQ>bIu%Lj>VVA(LmhTAWX>^c6Z3Cq
z?6BPbyK{L9kQz6{1^Byz9mVD&^qZx_`Y}h{yrGAG%az*-+tXuce<ADJ;+*;vhKyYq
zaaZU?y^;gqWDc4|B~*D3ER|Zo$Uh1}=|OSW<AiDl*m{pPu?NvPPs!PT({k|o`2|YU
zxh1qp_y@ME6e~)-&VS@o1_(wJ8N<j8*dlGls4n7+9Jp4`0hEed3*}=hXz(AH6(-ty
zV|3n=wN4jUpHDy}#K&)Ay$%236bhrVxT;K7pln~`(QNV)cU}0G_@A2}U3tcq-Hk^8
z&AK@9h@ZD-P)e9z-q~+WEVW|%1E<d{P>o{k7ml?mKkc`MxXtex2Sv`q4C%L=-e={T
zHq<+f7Xf^^vY40Vp?uSeIi2^afuDVWExRS}ZEhry$LEztvOQYxiq3gIK0d=4?D<ch
z*LO&y^F=h_RUF4%6LZvy*2YiN;1fDb<U@GU{DU4h+I|NR7~z=et5otF_Zjf*y_-)&
zIQJ0y&FU3&Ep%{ctNAqJEip<>1u(V~uBm~5-^ay^kpj)VgpVS)O5(G{OYlgU9)?n<
zygDEWzrCL-G*txLP{mw?jm2ul5I@|s(7z#4bxZ<*ADv|!J?OtZp#h%~SDJa94SfYl
z2K^b)doYyqc53qk>V7mb{74`u304W6H)O}Y4*|X&jk7u#gM~?bETqEO*{;^8xxqN-
zg*KCQ7SC}9N0XAeYH4eCC>3|!B!WN2oMz1Q@lkqGKk_rrCdc{=gjt~X^dgJ5JZDBP
z2zRHsRx$*4hUJR%tAl(=%+2REoEv8-iWJ>rnU1pLh@~}fP??(d!Tc^f8dWBJkE8<c
z72c)&#nY1<fjA*|g>jqufn~8e@X873KN#R05gaH_dsQt9&wMn-F%B2bD#h2t6I1zm
zqoIGw@HHYFrnCU9k8!ewkqBY5Ng6BzXHQ=|0uw6J^FX~;aBF9h+%(ynpZ3rbV?$8y
z0}gcut!y8sZw%KFE{c$7JTcEWL?cAz5pzgDfTAr%gxgc0XT@nke!eCsd&-i<f3$Hw
zLh~(JTmCTd>M3OJ=&>}X!n1E#N0suS4gw4zczF+yMIy^6_$vvNV`ufH&8dHt!_M*;
zB{q2QC4xNe1A|R2Y4RNMfiywwpv2&<PI+W{QaoCz?7kn<U|B;O`WEh5yh}S6=)QB`
zyJCF>z81<g%)O5j_yOKdJ2_1+R^^xU=zpqKarYt?ggOkfb4VqnMGdUI_=aGg7)nw>
z{h%3z`+125q?XpfszgFN{thp7qm&MBk(uiUV{!z($lGj5k|F|^Qn~H<*1Z2BF)Bj)
z20EWHAG(S9pHg9-J@b#T3VCTiWT7L&(Qc3m_rSh%d6U2$uXg~B_ACMeSRpI1&!Wd6
zLc2&mw*T^E*`Erf(Bu1OyqyO)Y-Y?*6kQ~`6mvdqQ7MKj`?u-hu*5e}%7;7p_;FeA
zl~5|Qs~#faK&8KD$rq7R2oLu$qQB--uQnnYZ?W8^f7k$v_d)f96C<VRI`r%_CRT-B
zwXM&2Z$Y?k4*ipW_faZohE63{C;l`f{xyY9ZE2JnZ71#nU(Pggo-msAF_x*LOK87N
zh(2vX?Ms0g5AX$hJ*tJ$uHM;eN%$H1KxFuBWl^#Di(GDtbqhJ;=)id(6Ss&euRAu{
zi}RQ<V$a;U27IHKB01tt7TNNacIy|hHA(WD(Hl9crK<P1BN=abppOAmNxl@ijGh{b
zI6GLIj#$id!p#)MNyj`e0JLDjx!DT6h5Pt_J%Y!_<2tstGP$BZc)99K;@i*Jo-O-Z
z{5avs2_4EnfcwM!5Rqe4$6RQ%QYq-1Hu^In&R#E&Ln+;lYvFN!MAQ4{hj0VUAvHMc
z+TtJiTY?u~c_fq(+9&XqmRkE^$3#Vud{AAa%po#TW`877|KuU$9tLi^cBhLs2gYm5
zu|7>s8y2DG%p<yk{(y3u(munF3831=Q$EyX-=u#Ohg;70k38uYaYmjs7nk4=d;%!x
z^ck!CMX*a|{X2=@|9gLY+e`>H_J06?!>W%Uoz&(yJ)iRGmW`ShGIO6Dy?SkLV?MAv
z-3u1$xaqGHuwr2yJAZ@h;w?dIJUvs@i5uSM?Ogj8$eYzw?ZWuXN+R{$goUcXRo&*@
zQ7zTD%l+Aa1DuMFXLMFXqGpz6(a(qNE*x4EK+K;5xdiSW^~}g_K6;VO`V}~{S^G$R
zwV*DfjI75zoBwBnpA9en&(4Bn+hKbyt6t}OQhodWL;}%;4;x^R1@&K2XRbmnin~=_
zyTKjE!~up~pdS6&mIk|7vj{yDv-yd)2Bs8#h;YoH+MePZJ*$X9uIzfc`4{^7Ub=Rs
z9jNanWJ1rLV(CcAiCjSL09WWXx%NoHf!Iw`JaK4eGm*Rg-&>&Yl?>3_H3WCu=Yfvf
zJo;<^&xa`Cxwk-`vG5y*@W+GFb+QN!d13}2c_PYbPs;&4EFJ2cEA|KpzUp3GgcK&i
zriu}uUMrFyY7O`82(rT=aiqiyDIC>E4&r*;N5dVsDO-dT+e@X?<p6Ahr!eGPU5QQ*
ze&ghGxh~(nt-msGe$08#kN|Yl-47$?LsSdi?A9gv&suN##!?rEJpj<thT}hdd7a^8
ztu@TY{Pgod*LOtOGY$o)gF{tfa_wHfNH<ikI>_yXWTl1gK>ygsQ6?PHpjxKC;qpS*
zyFUR7C2int%0)nQ*BsCmOiw!`#5vzc`2gAxq~_~(@N=*Ed*bV2JR>$|wAq7BhN$~-
zF>Smt&@1mJr-ZGp0|6I<FG>Nu+E~8`U>R3zmZZg${FdmX&@poR(Tu;6`|5<8Wpn9#
zOST}AC^hb<_53E;=H%S&y0hE7Wb*voV?fR2FX$Ds$WGpbo^7e5{e^vg6nk&Ri&%nn
zE+xu_QLJ@Q*}?n~6m02&n%h@>F!Dizjy8&OmVmtB^;h>G4hD=jCpc+x{s(s%c!_@0
z+GSr!(UEo}SpYZ#PiD(o@0OG~%{KiV_gYVz)5|31kg<b(l4%bu3VYE{E_xRaym0TR
zODB7MGou@_WV0VKFqZArj!4A`e<4}|W^HRr*pl05M0a|tr#}<3CArVHrL{@iZiJn-
zNe<1Ht7JF@D6{A8n*y4(amb}a>V;TSW_SZ(^sIc=C(yC^=}=vKL--dpIOmriGG-Hy
z3|<7{Z#ANgG`4X;SIaOwn6Nce*BwcAmq1>H?nUk;A3+|vDuOf%RGmEQK9=oZV*oy3
z4osGl(_%?~&AlfD3yiY1RyCQsBf=87b2sII(?h175i#?s>?*MKuQl0e<ZaE0(dU)p
zu`wHeZ*p-=%|#_=GUe2+HQPovJ%&gfqs>A-g}{F)Me?&+HNwFBS2K8iu!Mwa?!l;I
zCp76_6D|M`w4Wn7cMIUh&7<pyj^b@h?`A%F?lAGS9WwjaTa?O+W{|=Zz=!f*BjqV)
z9W?>}e;21cOk0HGRm#_sG;Mw*t#NPs%W3+nO5_nvII`EW58r9smtoF%ejBeP?_P|!
zbV0u_+gSgR^{T`#W~$sNthYv!en2I>QcNjpgspZG6}3Lf+B`f^iZTv+>E#^qOS|tX
z_p>kX<>}0We#DdqsooB&f0x@?Ee{mjH$mL|eKiQ{J%QA}9$(yv>9>KP&7H6_?m>Xr
zScc$Cp?VK990c9%fBcGN>%%Ahu=^Q{f?;M55ub3HIy!KE@wd=ut(O5aK!<_?(80(t
z)YN3htNbbYBZeu3y+ukH?7+U?y0ybH$P?~3$cXx7-cn>9kK5c?Na7BkCUyU8zCy37
z+s1CL|4HJ0>#hULsmrHTcADqo0rMS*K5<Kv(LV&g5Nvyl*iMvr{F4OrusM3_8BFM5
ziLwW=5$}+e`_h2sl&x$T8YJaCEOY?MTz%(zN`pQ2=?Gx$&c1RfQE}Iyd}wg7tiKXp
zd7F?yD87`oo8R=`x))v%ePM;aAS~Svl4%XjAziMiBAS?;77D-(FbnN8R*Nr|-lMX8
zr6iy6p9sUTUQ}g;ObM{?To;+id0iQHo9nbBhWu2wgX;MyAQrhGpNH!;aKgs4KJzl-
zt(dNDXU^($>kIfS;Ouu6{PJ4kGPs{(ZBzr>I@=i+pIdy(HtJx(Uf1~_u;jahpjpmq
z(&5TOxbtAbB>8Kv2(arA7WiAVcbIA}N%(j}gRMNf3S82))II64IH74NAS_=Ij=u!4
zHDzqr;n!rDi~(f8;QZRgO|Ifuny7ti&DKixcwn(K#f8Gi%>9MRuRs3MhiWP!Liz=L
zZc}n?Q^PRF=&FpAA5$mT_l9V|qc|{m5F9zEqTPVqXU_tUTlWJKL$uP~#O%x=AT3sj
z;otxUu!nv9=I;ah*NB^aT;Gx{5TGVHxryeywj-W~8JO^aX+q<s_$6gV%NwXC(M~?}
zx4>i>iZdV(z`i4ph5X}*-^(xiY=jnz7O%3($2;u|ZSttxoqRvQgKrLpLPtm{gvdI4
z^%{|jXbzem@c}RFTU%)VPf5b3(L+XCUJ=2!^SPW~mqxxmN-hUz$(gFOgHLyRzg3Sg
zDG-JKz#l$;f`;naH2uUI9kZi<i{HVR>}(Zq504&4dMtb%5<G-olrv{vc<2P2&mBrg
zwS<=bf*yU0uF<VcfRRbuOVDzhP@g~3%h!j9lx<)L%{Ipqr+@D-v<mSu$dU&fz7<{k
z;T^&%%ZkawJ$ic;GgfvLdmZ{caNkQ(yuU@#>yqySuy?w0I|Ky{nDH6c1K;zCRm<Vd
zSOL4wdki4A`1!60)2)l{=$}8dmB!`w7Uk>R3!Ba3KiR0J*Zug<V;4*0Ke2aGWm-}>
zp3meZ7V@eEcHkj_|1MQq!W!Aalo1$dt7raDdQT7xl@%%J7EEa@B1R*M$Bi-gar=>W
zy5f-|XxOD#bXm_+skxIeTWy$lUo-ZjoNK@;<2YCnt)sl9vr&#7A0gwkoJrdk?fT3%
zCU$d_FX|+SPNo&)QwwO>1Q+~uRTegf;MkeqEA?b}s1B^sZu<0noHB~|4DrwZeQ)yw
za(aHM{7q0EoHMspZRm<#d1cbV+ukwf-D@=lgNM_p9<2iW;QO?<0_vr*A(gcyc+;rF
z>112+35Kd0=ND-cxHa-?Zj)FGfvepUX*dtBhC#CAU)9B4UovgfKy@6SMW>wg{p=$(
zSywuY`Wf4a&QZMX@t&{$T3r@2xZKqL0DlRXk#&q#ysb<G>)qaqcj_HI>T{M8?usyM
z5#?&)<>hkadj_(h?a6tF0Y0o9_;|U%+AV1SMNWApEQ*x`LksP^VDE17*&mvV{*%Hz
zJ{U!pEA`Mf$cBs-7RY}%iLY$r?V%ga4`Dm<VEF<3uO4__cT`si`YFtm2wu_lF3*DY
zSV=(k_{Nbg-AYYNBr8uiBFS!NkUppP(}~j&NEuW9=X=6*3HtQjJQV#y)fLQ4{OTR<
zA?9O)=;kQor46Cy-}N&f{{P)CxU0avf<6Z#nUoU@TRXS5XvO!gXI{S`g6BIV$HdDi
zoBWX<tT!)T%s=fyueTq%75G#Tb2UUCF?Jm{P=ih8j=6GLWGlc0@nNXV5iI{O=(;7h
z{wDWlrNjSu;y~;9I+igcP?8G)&%E}17HAb2AjR!23<k740JBde2LJ^V*4>|9^ysC^
zwYciIjeKrbQa8{Y&p6K(dT|}UTAQGoQP~1HGzoxFOwXP1*&Sjfv83ozHSx{7vMc87
zs{TNr#!Uy+_n0>mnw#UPCGyfMVs+7!UF|Tzvi>@H$(QoCe4disb(m)=$vCjW8k#Hq
z0GK3Q!76b3+Zj@in~6DJTUB1ZyxA<>LrIK8!Rt;O=KKsNZ8v|b$US}s)}XTaPLN$c
zVhxmK7GX`c!Dho~kq7Yk<qUu|=nKaRwZN4>A3eE!OjzG}7a!+8k@~<yKtA-F{yh_(
z>>h-+2i`}a<R$#wS+ejAIxi913k6TH3qCN=flU><OXTmot%bqgF~90d>7cUaOp);L
zlLwI50tb+qGO<YE%VJ1D8MT&cj~G{5&ExBzCdNgE6_Gb8{{xc36i5|u<NECF=<f7E
z;Rc49G(JR+!PVmo2>NeI8ax!bsOoPy2->0A<>(sIdYI~3ZU-iE$O5Tv+UUkZ;T;l-
zJGD}{qi<7z<6^`0&k+Wy{vFNTDz8f#Sz78Hy!mw;y&DW{AAmWYXAD*|xJb_2UmWfZ
z#$-UDQQT3YO<a2LL}BuV^=Xuu$p$b1R!RwW7m|#$NN+sXo~<Wv7qX{EG9cxx%;ei^
z$NP>#FGE3qPh0e@wjGr78e(!<fHZH_@03ZM?z=|6a$|6j(fK78Ee;|pg%JYa&y&%H
zsN4+|xkPnzr0(e>RM}agRAht)Vnjf8+k}Y@-QpX7JYwnBLb%!j2|Fz)W(ZGZs#uo1
zmaz0+_TXIw{8nCj`~RNy>5GB6x3If<uEKwM0XKZ281*MPkMab2F9StX(|aeKl=Q3r
z2zgH4?Q0>8<=)sjl~wQoHEsq@Xt^C;(q!VvlJ5Fe24i=t%Fh=aEWO5Nl@>LY$|s#R
z*57Y=+^&LX;4EmELd{jQ2XQymc-6uses8y0!Q-~+EqbmlvXOYtfY15AvuT1uwSJS6
zZDgb6arnRz)^V*{TAuGZ^@o!n@)t=4S=hf?pUap<d~y>98Hc94holj3xpu<>(vk%&
z#d05MLL5C$-Ms_6F#3Qyf8Bl$qY=6bN>y|<cge?trFQyZXljfr3e?bL2Y~y{Uqg1X
zF9IyGO|1WZoWj}rjAQaDt<plbbcNQoY23{&8Q}MyYoKJ$<VX(mfVQ6Hf>TKqJ{(1f
zI?A*hVDZ;HgX%md>A~qwRvxqNJjaaL%%1i@<-88`?K6%)%%(<{jubHQN(S6<Ut+iu
z8LW(bc;Q`MB-mg#Wjb)G)B~+M;|~69Kc(rHCzR^-d|?h&$$#pBWVBt&bn)hPXHd)^
zY5Jp?qjWz`VWkqN6?5a}1Hr==DjxV;rwpHnN0$ZeCplMbz#`TpLw&zVin>4Fe?^gR
z49-b6$TnAHR~`i;HTK3P1D`)DE{C@yr2@r{dw}V{hOS&hDrFhAAc$<)Qe(g_G^QT@
z2WC5o>0^T9cijMgVS76oh*_H`V+Zc@5{Ilnb}!AKKi(Y22H6rT^b#^@^%xZ@IhU$t
z8R>*&-^<@f--0}E#MACF`sj+CKm+4gJg3Z4mg6R1Xcp_6$NUYj=S=?s&x+>&z3o_%
zQS~1acK)gdDo$TTTf*+2J=a5op20Ye6vSyFk%Zk*GOUzl6%`u!bu5D2FlRy^LKoCe
z#Jg>R1z5;@7}Bni4=}E6Rgc~n%?<$yuWj*CtO{=z*6V%FCd|$HAF&W&{Y}lUA0Ei!
zeox*2tj*&Q9x?AGS5MQuv4+?<$idxsIlmgjPbd7!X%*ybbDFO=th<@ie^_6LN%OPu
zi%f<rJu3V-%`&>4noH<Ckw9Je8ryd&hBufF+*r@}d|yx;tOY=lofZ#&NTjzD4!+<D
z(?#z-g<Mula#G*La*RPTkK8XXkqDmNl}(`}n6Nuq!Ege=7IhY@S$~}%a*T6Gjd3jT
z3UOD=4ITKS4BC9o4qw1;kBzPtVuim{N+qKg^4zMNl5InX(4{5hAC8<uI+`qqgrK%<
ze&ISUID>!>uo)nAWmvz%?A;ym18aqaZ=y5^^N9UmdUp`-zi5nH=>1HG5?#w)*N~pU
z142Qtq7PAkYpgEzo=coiwZgUSd1c@=DDexnI`xT`^Lq~Y{sEz?UvISUyC|G-GFAed
z=*{6x5T%_DbShG$a|R?$fHK>o@KJG+7sc+JKunhD@_;VL<<W+dn|o6o_u#>s{t*%u
za39h8gMU^P3U+-vMc)86mab6^7Qi)AG*F4Qd*+hP0*wHco*={M<?nT^2SD0=fszFH
zIiZVR!9-pV-^;lh#G_2i50~83#Vf&P)sk-;_~umvW7*fYF9SlS2w9Z{w{NQ+dVP~%
z?ksj53J&;(URHJUCL5qXJ0W|1H0fMKugrcF9G3X?TDP5}C4H*4>L~P-_;dd@k_M!b
zj?N<fh>vY9g$fM8N8fS386vyqi&*@Ul3=*m$U)*s9PyPNQOv(#XK+WN&J?PNuWib(
zb`8RpT8#gi@FiI+Ym;47@xK(`Km2K}{twQnEj2cMjWBA)6b$El=J6iawXwd&Muiwy
zMw}PEtfq{5(|REmNKOpINc3^!OV(k}$M997>x^KA?Jv`^uryD3vpBjINu#Is(M@vC
zbw!XpteRFZRsyBCc^wFGK=Pltidp?$5DrwmzO3r9@%Alf#0kIR86i~Dj|i2HjUtJ|
zhl^C>&abQRoti&@dKBxx4bkwUa%<PczE<h7NODX~$?Z|xnvJx#1EWTjQTSue`2pZm
zLId!%dK35;l-<KZip!skgg?K52f;wv*+?+9C-X*%KbUpanO(|A@=Q1-<%l`^sB>Yj
z6)f%`m^$6NwV!!k@TCQM0c;i9pvNt0{SfvR+88`NZ6x||BQ@LF^Od>fQCq#it~XPA
zJsN{Xs}<P`aE6^IYYtMV3mDg&5r1yQH{~92DokA5Gi~_{`NkhHKj!<?=JV%{YA{Ou
z8-kKo4dCn-a)1XVv5S4WH2KTgZ=B`v`2FndZ)xvlADrj_be|mr9F^(AuWm8~c{&59
z(f{J6B3R4!xl47!BUdjFqYL4aS2}kd00%v?(B5$Zk_I==imQ1w@lJr8F{)TvjfoW1
zl%J!&JHcj2fpJKJSn9Lm(WpAjxJ7PgXEUZ>H!!@sS{Qqtd}8QcYT-=}E7MntJh0W9
zyj$Fc7cYR-qFV2@vI#-<+r!;x-Iy(*T30^rwu7X{d<~2O<#tM9&dj8{9R0<PxSBxl
zOIF*tAL7ATpCM4fK_#RvDW4t+HSjML{7d|HBTxc7PX49L^eC1~3zsiR85D?WKiVSu
zGO2U2t>xsBj=RUc!6o>tj-Yc+yL2%aez#^E`?h8Km<9ty^rJ#R<+VeAZs2zV58o2l
z%M*Ew5cQ(%ZJ)J8sqo`+q9EZmujWAlmvd*D$K7vzNrPTiG*lj<rC6^_`t_!0N0v=(
zo<QBd7v07iU(lp?*Tq3~`pp3kyyjP!>%$RC#JTS%E6V=QhgnMBm1^yPTOh$i!MGay
zaV+{rQl)8~nm$M+?bRN9_PY}lV|agp)CeD%@zC~fe0<Wp=^^;ct6n(hBjw2AN|u>Y
zG9+F~nUBq#m%gNQr$*;j0#mg#$0Q^6X3<U#d1ZVLGXLQ!Do(k!J7}`ii^RvLKd;W&
zY?&`YXPi5P@;vuF*;w1NB4NoUJjG_=s(#-&D^bQJ6y?Gh3Lz~qk;`{oIAs^7L2dci
znuOawAi<m8GSWl_p62#c*w{}P9Qsv%6}XD=^lvS+ts(E0q`Z6&W#2^?f{*K8D!O0Q
zT>JW*Q6F8fXwT8-^)lk7tfdJ<G^*Hbw2sw~oOzo!wsD2T4G#Kb#(Nzg&Y2kV*20KU
zfnE_Z(`{0SJ+9M?R#J*!1&uDrRezYH-odUdPiw;A0`Y$ZfR?8tmUZXCp;c^_?YO#_
z7~57=6)Af;4(YC_iag**Kt3&fJ`$^zm0+c>Lw}m^0SsDCS{4e2L}x{vsAGjFGTat1
zPPDFap%sp|zYaJ_dG^e5x#`3{SObv%Mhe~25RdI}^Jr&<jcBv0W}VQYHPOQEqoNlB
zPw=nYSb;`^B(lo-@YlBtAhq_uvkA>B+D$BVn~nQ>%~b05wz0ZXde#t!1j3ZROsbpw
zyWaG(1%pcw(iFxnv_Y0S|CcL59ewV5b%6mP`-(^O6C<d+mb4FE{Ot11q!Gi%3vb?H
z^S(dF*;`FuP*F(ED@iI<PH!Gp9WDC3Mo%!{!eWSIUhmFo5&7#^S-KQQafcy&QG&r{
z{BcP6r2AO0g0+!H{`5=)a7s1ztk_)QCyPWtN+K$^<eiyy@y#qqLpb$nb$&V_y^uyW
zS5}69cnN_QC2P^>*QIIgPS=pxrJm~j<jr$bf-dnk_41G)=;qKZZ;fy`c#xj4DNeu9
zh$IDyYfit^@;w+vO6+M$o7uTdE<UM9<Bf*^6X71-6-)9x(R`i7kG9qtFp0DRLhyAF
z@C-Tlh*V=vU<{kmHYpmNtd%e7mFnmS=Q9J4ex^VH4juW<Y!`SDc<M+I8TF1q)Tp^y
z;#Ews%*%Fhbk7MLLrFe_)phjWiI+YRSFXT9_u?$=UDRm>UXqx%$J5>`<hnqdMGNcV
z)42ouE!A}bhH|u;_c-_c@g8P=MrIQj_N7Vhm$#V^%S4-&G}Av%tpoJf$<M4&E7g%S
zRes|@x74IuYEmkw&`Y~b^|+TyID0gU;CwWLE8MJ1H#98z*UqMM*-IckV>s3;;?Ey2
z0mD3=I2XhZ<q)O)^~3~l)lsdipp`vq_P=hkQe5pp7i5d`J;L#miS_F@chMFNf9{fc
z*02JEufNt;SYMW~>`F*YDt>O7TR&tjSKX3umeo<;lqNmM77vKeEe^N{rEwB)z|&d_
z-Rn`nJ|es}-d7whTf#hSiFZb}j3dWQWRDV$eG(|*^QGP_PR1qN?Y?FC<af2=Gp7fd
zjm;zE0wc<6DunD9N3Yu<_9z7qdM0gkwf?O!h|Lw3n+cR8`s@b2Olxa)6SM3wj7+Z}
zm6mQMX&P#ygA5&pPP5+m)|!57=aHI3)*_6G5X!W~b6SBStWe{4IMXRuu15!YIq>bx
zGLrZv&Y(NRr9GNXcIsA&s26}Sq#v-sx6JeXT?|F<2Jrw?1A}paFW(RHSeX|)%E0~D
zRv`=QY)$h6Re_hijG{LU*f(+AD0kEKmY`J~W=4IPkWlFJ#U;HW6e^I)^ForJgaDVQ
z+5c<qJKvh<x_;9GVJK1)dXXY1gx(>MDxyS1L<C9bDk>t<OF|$hBBFvcl_01{Gb&=E
z1VR@jAWE+ya3caD(#sj|=XuZdp8w$RAs@Ihxn^dsz4qQ~{mS*M-IjFLb1Xgeoe7<f
z6?|k>Gycm@6VF1N=)OX1>g@h9#|mR3Y|g-SY&+~_QO(4CPupyY!=IxJ;r!hw8g2>~
zS{;iNM~itf`O~y^K(2;Wz6`5N(76+@tC-VGwt%M#mNCiRjiZNr*%dtfA-wOjJ2SH@
zC9cudeK*q7MQn7>pj1q5s*&LxwHDs1%My={8%FLC{~NmdAMINdl9*0+<QA);i;Tj%
zJoehtiOu0chXg)22v+c6vBTB=)3YBby)p3M&3LScF5MwrbGzJx^(U4*XF-03IJ)L~
z?Hb-^>oTV-RtV0`XfC-sOL%HeXl}#W&S;D7cF|UoG@|tI%n--3B88mOy?G2@dh^^w
zxX6NXe$f%XvM3#m`oI&XJaTyG_%2TFh8!CmWdU<Bn>Ln?j#8K&UNM#5OdwK!!8q!g
znnB+cz0^K23$C4fi*=LKnH{{$clu;2NZu|KUBhRs`E&i|MO!w^q5%=U6Zr1Ss@g%0
z=4cDqyc|d<QOGD^yWj&^hX_gUBxYPSV(E-Mw3?p;$zU{@GYHA?Ma&XZTn`@i=Hs1<
zAXa?a=FA)F*{V3wW*()&i}E)HbLLu}!00(V7<`O@urSbMf(h}c)-QtMjkltH#pnCE
zNpf;*n#Z#1_n&0s<FPyV(XJck0o6G|q%!l$AIUm5;NA|(LgW@)yn65hYo|}cXe8%m
zo<huiae7>k@^?e$_%2B;LAc;E6)Wo5eO3fKJ|%9`XLWl{nX|2{fjfNKq;+AU#RIfW
zx70CPU%fUqH}8q<8Kp&DA5ESU;IZ^g^QmcJ-S<o*l1|0bI^5!kIrlTi{+ZVTOu&-T
z#&9*#AJXBf#3-B=F9yz!A=xN9@235X)~YpNM5+=$8+&LXI9M9uyh_*H87C(U-m2%V
zS;D-KLrKY5U*5kK%?#nGhTc9+ZoJs=MSi`06DXh54tXgh7rypwAIHD@G`=ODnJQWo
zE8AJ}h74{Hd5){J7^>E*i@cHDbLcq3zQ?Tp?FBU&=oB^VY1T+Gej7j5Fj)d<<?}iT
z^gh%-@SHq)%cZ_-WeX%azkIC_sSFC#K9x>Q`+YM>{>}3pmFPt`jO(h@q#J$}eI#G8
z4n^<_4#o#Le9#R)kf|L`6EA^(8((Q&0g?_s^D&BDQ{!;pud&0!(H#p5992e?tGdJj
ztM|Pj+wYeYD!-ry8xp>TL#(c1KUF8Shv9;L<0ry*cRuU+(9n`5WlkfeC+3YE{N>L0
z=4nx2Pgj}9AWy|W&m0JNMiX({MF<d*J9-Nc3z`FWhu7_qm3ONZ;dk2Qv1cIhJ(iX_
z(fd7UJTswm@M!ZF7K`ir&kJF#36nYydj4LRJ87e%<k1)3{Dm?)nfbpN5XiDc&2V)c
zKH{7Pr|(QNcG*0RKTiwo>#Zwth@rQlQ)L@C*!wYPQN;&os<yu{#yM%}8vEvHC5)vx
z<p@euNg@b(z>wY6##UEs8lBDNYXX#au-mblEkU#0>I|h!0i8k9Ao|$P8)59W@4B|%
zVeb}Zg;<JSt5=Qi#8&%wV%^ug*f}(mth{TNTSw6E?;Z@NviG=h#j=FUK7PJxWT{wH
zg?77{4C-N^1@lolt5MgLeTvK(mze1^WLgV=mUZf)Bz~juq_<#!su#478-*TM>B5_v
zu=nqG$ZGP~t^=sNKL)B#0mlpsb=^H;v&RO@?0}mj)oE;s(OaC6bR*U^Vj<yki6Nk|
zeu5pP^A4<IBqtvwTyiscP&xWR&iYrovOJrq;h$`$F9Ttb{lrCmSXZ3T-i+}$(2gvc
zY!n(S#>v0Fft!<i$6xL)8@<^OB-dL)EO#f^oDA~X9UgFFj+&U5Z*pFob4LRTgq_HP
zjog95er#`gUG?|1>&v$6uDb&ECa<N(EqzbG`uv$iaczo5zm*6A0X<i!sRtlmVq2>3
zfV$kE4Q3l6J&!DgiMD$vq@_hi$Sr@tb0jy{KQ2tS%Q7O)sp{VIh)Wz>DhUH^<~Av-
z{5h+MDh4WKjeCjNiDNUhT0s5pXWE6HDgHvQ#Qj+5J^n$ROTMGxw;{Qlg=HD5a}g$-
z<&CR3RxZxzbu&*k32Uk9gamrVSnCP<x`mAaL&m9<4*b=pQX*U%J4mT}Rzd<c&`cLJ
zhMcwJjD%gpetIy}67<i^9>$NP4qdaVU$@7;W#$1d>S4ef+~`6FXe5@F>(Q|A$5nyz
zRkefd#WekqxwY1s_R%CdQnjU8SZLuF)MdAD;k?L0UdZGZr;Zw(O&doxUDz-{htDND
zW!aGmM)g%tqxrWA%Nx$7^7ry*NTe0ye@5+EUAZ|nb$<Z(AaIz{`#MC9^Zj54_5y_O
zz>>(-U2QwMo9ipNppt0D`?+Bc)YoP~TzY7*j=O|W9q2Ev4=+&>g!epoHu`m;(*N0!
zqY6p)U|{`0a;gcnJK-%BTeDv!dagFMk@anvh>{}RB(oy<T-S83U)9Na`-G}(wF|!5
zrHA5T@R}DEwL%Jnxw=bUc&)*Ppt5MO)yM!LSN_@i4bNGhuLR$70p*KN1Ph%pW}!@_
ztSU~mQ7<|t&{o2p;iGGpv&W{MjkMG=DVp3~rGTPyAu!p$#n;|L*ICLlLePNq;}SiO
zuN9z>5dJVT(D7_~R-N%Bs#1HfH}d+}Y{_c?WY;!5maLqVPG^zD@K^n4Sg@x$Io|;o
zTEah%e6s^eGhNw+mO8q+w2PJ2HABHW&y@hr2ZLVWb3Z^uE&qVwQ(mJFKd{aXLxXDN
zLS)L<??wS5R<gQ54g&cljJ0t2@HFaXLMza-;_egvW(#BFPBe@thb$jHnnaxUsh^iq
z<5$<+w+DrKMKe7FmnpS;nKjm@k$(INb5r2GDK9vPs}FcVm*->I?5`va954uJX;!w@
z2<w!i8ni$~+7tN(u*>cv9YI${^cl@3JheeWFm0?atn@=MS&YYiQ62QoM6%asn5U(S
z1|By<`i!9i&)_Jgf_5Mk**g%0YB)7#?%Qh_!OKzXJP#CG%m5E=Hvy^hU!HzHmP2=x
zbz<Cie}erKM<4Ww{HOgq<F42vpbV*jx;XE{f`hJ~6)Ay?Q|N=(PqB3AZd8sbR0d<r
zQ^|LSpYTL0&pP*9Mc6AZvXIPfJ`y!?=<O3hY<cW<!d{F?7qp^4Omr91%(7n>3Ik=|
zK}v`ukx7N=Hy=r@+WNDi#mSHW{Rm#6I$e$SKtkf@OHKf<FGy2*LoaA>8mlF6vP0pV
zps68M#*}58&Sqn*kU}X8dgY=Po-h}OQr^q;kq*3q=3%Gi8G{`d-;*@x3t@rXjOb06
z!z%rgDE+<$N}Uk~d;cYBs)o|r8ks{po{&d$a7wA;y5`mWc_QwS>Z2;Luruj}4<dOP
z)&9g}37R+^ywG)kL6<y+n>Bxl?!96qf$g)^DROo6GI~F6lC>l5%B5kv4o=o-OIxc$
zWNzq=NlZqZmokv`;Yp6GWA8pVc6`Jc5;t5;S*`eC%qf`<3X5-}4gpuq1aD)@{%5)p
zK+4?mmcXOB%s8{SmAhkKUzUu%4^Bcr{%Fow`h@>lz;I@)G;p6}Yukc$mQ5M&<t%lp
zVB-C8JL8UmEmp2Q)Kx{ePnlTJ2%iH<j*9ILgeD3G0zgFow89lyk-}GjnbQ%H^P)Pd
z-~p2(kcx82kYY#xNmf*XWvjB8OcAQVIJWdy#QBk<7H`uo_voYe1rDPk_9&o^9OFeD
zI&>WMGfx<JH&Vz>TqQ&Gi$PkxQ7%?<f7F$zks8YA{5=j+=}e1!AX%SXF7=R_m|bU3
zpFP$-W(tJmbIO=eB*t0a7k{h1Q#;yH=T$G%lC!F67z&mbp<6PEC<B>$twCFhGCm5V
z@6dh^z{Eweq6guunX;Mzs#FS5t4sXP$n!j$zu<pSD@nZn+BTp-))KEYSl6AM?Mi0G
z)g3N%wvLz7zW>~qU;L@?b)mqe?jT!pzWZ-)?pBOf!#sp@Vh875yl4FmUH<u84l0tp
zw@>YQUHbhuRX+CquX_ScdqiJesZpyM?SG}7ylvueF3RXnZor^<LshfsgCzUO%X}cX
zAYGde>%RQYq2d?1yq|-&tldM;D7=TN?)($})GtEVa=)NEA_PHhI%$^%Il2<=cp=%`
z_Q)*hxXDTp0_t1_b&~OJpTN&b0@(O-fdS{~YGXd4Qu3fInR<X?Kx4j&QQ=8mTjQWt
za4VE?@aQeR9-TA^{g!cq!151PM^moU|4C~+Z{L5kb;bYiK(*P&M`$Jb+o!zFhJx=z
zPMJNm5}SPP?ApY&WJWvqJ&_=}^%1K>WuJVQ&E|<4-_lV$P4LO6zRmi*%yUw_dwE>b
zZ*c?r(P=w+>SzRJptsi~K@M^9ZZAXU9N)9LiH_gOidz5f81xKyB$W_i#SHmtg6yL|
ze+}mXKwn(lzQ;r~b>H~4gNxY1hb`-ZW|!fNX6~=3y%3iO>Lz9;f;MSE2y3cM@^YR3
zrUZW|0dugHhsWWWnt};mNUQ_lE~tjCv!QyDE`3yxgd)ZVijdBtZcu0p(A-Cp*_L|~
z`Wyn2^^XHjSF1on53$6NWO(2Xl6)P?#_nZPpT7Y1qTRL{65fVWg;oXjE>+IeqPjiX
zx!LaR@)MJm0S1rw#n|;9nwi2+KgyGKgrfHX0Y%d-wU)qzb}J2O)3{jw)diWA48#V=
z%2jLo<mFoVlL!7X%Sgt90l9Hm2N(LxB6TmKZHl>ege%}p>Vv3D*a=1_{5Nl5>|Hw$
z&S^D_WZJR0vSUu5b0Vm$MxG-cv%3vY6VLsbwPu_;riCx9jY7w~+!fpbPtTFl1@TUV
zYjBq{RD4nRHsVq3er+{ra<!1F6XL5Bv2sGLTef#b6U&hKgyFP^@$+yZwOh<H3P7Aq
zBNZB4Yi<f37eJQ&)|!AUTzR|mG*1h3M1GTrm>r9TcI7U+gPIv7$#tV&-5Am%Ca4Qy
zhl&S`?-6g?C~|hq(E(LvbE*5*MwtC^mE4_8uil++Qo(NU?-`$gwEF(rP`8@W>YzLY
zt)82dnX0W2&j&I8%(^gszwFSi+U6bEfdzl_L)m+afGNA}YG-TMZm_}7AWC5Jpu`H9
z@yp6W^!1+6sF9o1u^jH(7z`)mnBfaeo`+(qTjMy+mdy#A!EkNT12S=yS18Y$&>q1C
zancvzE|=Jha`LJKd<=t-qL#&59S&mE%T-2W-^N3I6$Mb%7m*2+-<tB0&i~NVC3{J@
z*~f-ySrBJ_#|Q9McfZ|0NiVh&4;Pobe*?H$UPZXHFxBBn9#s;TD6P4aIc7ZsN>L2V
zYbQL8)Llh7^G|0$t$6K!^x^H*U;`4F3K^}h;(AY@1#BVjmWqEgpO`RrlW+1s+1J38
zg}C>27j-tk91MSd&GQ!;Tk;RM#}dz~Uz`5c0^%&zqXw{{gKrXNZAnO&+ZsgOa+o;8
zr!ECrIQ|7$Bm`^CcAq8DFvX4pk&X?jEAH{=r_B$*lY1xdS$(#h?Y9c!@2iSyyTAF3
zjcHa75a-u(L_54;X*>1aLzga6`A^ZNM}Q(bWua3vAsBwEMHx~`up8cuDc(&m7a~2P
znswB-QnBiEkQ?U+nl*sX&<)Ql?yPkf8V>hUj-R#Y%|NtdNT|ZcF~_n_k>?2I70k;7
z0JvEb<L&x<elKT3N((D6Y|>1U7~!zB3idn8rv|Va8|A%};f^0~vIlc_wrL_$^3s7#
zkSmt8+Eq3lION$D8ThzA$zs}-pR|4y4)zp_J0FN8VTa>_{Ic|}h_F;L3ZHHaTULJ{
zxrueK{Pwl|)MkzjwLs2*N3~?4@7T1urrzJU(L+)$^D^Tl^wt3Nt3-(_)L`=uHL6Zn
zKgZm9vY)Jp+MEm-qSC!(8mc?E0nO{BzfvbWg@d6tDBvK(RM<;WS_7ZV=uGb*I&hnQ
zdPS5yTW4U#a6iJ*Wr}yTm<uem!7ELGw|4PWYoZa?bZQ>(!f#{OgJep_<0-vnyIx3<
zL9qR*fS&u44#*xnduAJYF5{<D9^QQhBuECw?Y440B1+HnADfO9g%NCyWfN1^L|4s>
zxOZzecD8kj@ceT#KCSb40NS#^agNrtZX%B=Q;2J$7C90?_Qs)Lrbqc+OKNpi-+-2O
z)k39TmZ3imezQjV&s0BEZ1Eo@4V;Q|g?6dMmHT5_Ggnao;NqVPlN3(+<6t}Gzy<Ns
zyWXGK<=hhQHV=}zx=m?$Ph-Oe#28<G<YM=8(91KYg;qDFwK-p^!?-t1j2j^bSj<P&
zOl_w$%d`{ZTRI^&f>bjz)Nh{PXD}D0?!#;OCuCc|G$WYM?T`RHAh4!~2o%F=0;d8Y
zGp$th5bmR8P?35~F6imP(m)vFI9dxI{eCBPEV%DDV{syzeworN4^`=E0vw`G;bg0m
zO7$YwcjQ=C48u8mA!*(n{^_|IMBg?yR7-+EK;!PBI<&()a~GWSO&}dDjAg!lx4r&5
ziSqM%642vrj#U)-iB;E)#AZ1k-&6Y);(BHie*acaI-3>Qx{FaFcf>$7eo?ll%CsJG
zCL#4x#^_)CNuY1M87Tdh8jtZI9pdj-tqY$2aDwqj{~#_z?<Y?0k9)wRYrW=H2mXwm
z2Ir}vT$&BBjE5^Ep{7k8<Oh$(Id-gHpXx{vqwrovV;VHrhI*Pp&J|I3JkIt<M<N+z
zx2@)ob*UM&q3iIO`}TN3(*t7lDN9s<7P7)U>Kh#mtZ01I8GQRIEx-1x1^nhT`=Yy4
z3fum}4O-F@sTY9=o?$L|4DpI>N47b!`CTczKv$I7rBg&hgRRU6k#up82E1B`McEVi
z9W42%Myb$$WFP&=v(VK$)K|y4)OrLJW_q4cT&03Kyw9UWf2a^b{`URXPhEho(#g+A
z`!{F{AaN0di0|*q<PTN~*!B|<8u1~tXGHsBe`b*XT58Xxs0J4CIiIIb9wH<zYNA>O
zd3#g#t;lIFWE|IaeDI`!t(7>Xs3r;H(gIZ_?s=`Q!hMlVp+!+iKl&GT?DfnIoOYdx
z$Y1dx{DT0KQI2;6ZzI!2h<W;<D%=OBXSB~_ed*d*YkL7;c>%5K+|#2QkQLckcgl*7
zD)87x#G4LO;i;h<!Qq(8BC*ll;na8PnC^P?eE}#496AF@*P`SWQmoqLU$HgS!!PRb
z(4|zE#}q%+Y_Wr4Iogaw(->U)L?X_eUW%=9tit&;e!*fvQ&KDfK|LfftuV#>c71!(
zcXfSo59d~{DehBkRnx-srV^tE{Qxf=xtKooQ7~P(jb+?*9!SFoI^QxQQwzV0xrCC$
z{@c#$MLKKH`}cz?Ujd3y`a*UvZH<8MjqCJGY!-;rnbhoSX75%bh@ihAnAhHc1<<4m
z1%tW#!SnDUkdlQVmH1a2C*tIvEXE%<V=gW8CQ~*-$x#u6%X{VkZt|22YvJUpA7-2m
zv<-0N#uOF?D?xopu7jcjOM!diSHHiYzw&?atwW2EaWz+w7$N9fLY+K7P?BPbAy~->
zgNj766TDKpppPU-`2y<a$eD23)WCz-4N&K5-H>rerUYlwXQ*or(-5Lq2%s!tLs15x
z47Q)F0H`h{z=)d%!PpTXr{E8WD|u}Z>l4m9o4Cmtd;?q_Q7qaZXUG&mx3ZzyRr*Ho
zDC%GI%?ojnO4=^bA|^YA4LO;L$+^x&X8-vK(zo?Dp6TKf2DIB<E3eZ$tmFIV8hMxJ
zvg(6;K#|<cA`P2RJfZ&rs{#KG=1qo_YQs*EA!lRa$6?NIId^^NpuKh-EGHbPzo%{=
z_f^kD-Ky3H^+7+k^%=#p5u+NBc2FU_t}gz%;$i(*Qyz^w2SMy<y5f*)E9BZv29TBv
zt<b@ATR|I5XYGZ1H}^X3Q!Ar(@v6mCB^IMUzNEb?2C3hxGXySbIEkH%OsIQ$RS!h!
zE$b2t`00bF;%S1_IFs>70%hH&y$Xv=0|jb9BU;)kQ4qW4punV}UI`O89?VPoxMyYV
zUbKt@b8v9(*poaZPQ&+eSnKa+;vBa=pYq50xj6Y7EuxggXu@c<P77b`P??D<B=`~R
zlsiNnjAu+`Ejoc1Hc@}^kJ;+FK8N#oAFxvX2JaY<^?_Z04>?SFtV|aD&Uk4Fyr7gn
z0T&IQm~Cow;I6>qq5;oP0nTveSa~NurIm1sl}AhNW8zt&)gk5sSP=_dwhJX=j>vh9
z)VCmgdZh$OGt{JaNfmYSN@3zKSEOcr$P<Ys1-@w6zYvc(VY-c;+BdqQc;#Dx?tPAl
z*=sVc`GHjn)Ul)|f>z%WTu>fUK|u$T#Yg8sSImsQR^Z38htf@`;BS&B>mO*ndph7a
zE<h#}fZnIwERHp$T8w+YjLGN0E~%CUVX>^>?>NRqLprW4R|C6rzhIANt8RCloOSTF
z3H1{J&2(cfZAdV}uD*{WZ&V#7o^gePx?BdOoxen`F=YNhsD}|aUzs8bgc3GE7hDsB
zx%C3v3_<3Y(1f{D3UD>~AFXa_Za|w-krcsPcH;61xmmR?H8bgWU;z~Z7Wh-z61bNn
zQ&Lh|HVzYz`m^_*B7w9=(d5f<5RG)1l|0=+Oo!jX@4QB?vt=I5=E$w&!|2ELPIB0;
z{pWEma_@L+hJ;jrh9sQ)K@!o*or!>{Gi}341T-NfByQ9mW(Bf@M8H{OK}~MLByBxn
zCRI4^8-f|knF8R<o;&D|=cD0JY^}VDT#Sr0$DMikwWj>1dU&HofZ90?xYsjO5hUsR
z0e7T+q?Y)^Nl?JFh>gDStL|_TRpxG_xC34CEwfRURqeuB`U5|UDn$cQr)?~t@X$%w
z@Q%JXw|iQ8j(=z49TCbc0J9(n6m0<Fc=_XM%yXK=Bq0m;n4Gb83k}A-hXJVC!btMc
zZ!hh;q7s|_;W1M>R<Y4WoPOP~u`nv0APf|}g1PO9AIy*iHASi*1`_ClCs?O3i}xI`
z@WM1Q^ia-R>~j3rg*6?<?<eK>rC0m>N7J#i4@pE{>0r=*zW+c;?2eD?Ca>=q3pJ;5
zFY3exGzhOc=ymf#lD-L945oIT+J$Hl?u`g-d1B4}^ww%Fo83;BgL2fxv9=>`%#2_m
zJW$X9WcRCa8xv*mN>i!yR-(rt?uFyr8t6Xx!(N1Y{74k@6vD=+7boq!8(V6%7k3oi
zhI2js#eSd_v)6vuvbF;san_i_IJtq<tg-7uARYEHzdz=~%7ZpyVUpc4vO_+4dXPX~
z?O88vQV#6=1;oc@T2o^T4cq-H@yVVGp$4dn9ubV02Y#T25^4Q?xP0A69FX1V0(_|S
zKwc(h|1y%;p~^}_-W6&5`F4u@P2jX072^jA#0}_eQlXt13SryATY;uaR>wM>lE`F&
zxd-ek+}1*q_p23SAB;-xOy&Ixvr&5r%Jse754}N&S7{{RWJAhR&EXTF#8r=Jc{Zxl
z%=KgzPS4mFx1`sIO^Ip8-UEhk-99&H_g%Qv1JP+1kUWiclM|TLv<#01A<6gQKvd<d
zcX;^39!{Nq2X33G`2((u;v)KkQ7yJ=T$Byy8!eS7cSwvb$G$5>?-C6N#p#I)NWxEm
zi`*VQ`A{;!;TZGt)t}bZ*oSB1vA4Ta;Yiz-#j*JjoUnNr?(6;c{1PVY#%8uY;S1;n
zlR4cXhqaJ5*rqM+o^IdAomd8qTI`|wmd~=yQeuS>iw6YdAth>Lj-Rzmrk-22kRVuL
z?fT2;%a+sICD^v<MF1qjNM!1gb2L^S32RD|l#<ebo3ff8Hnuj(*K_LFt^5<eS=y|{
z7rHD=5PowT)c^cFBnaFbiSc@~^-YQs)xIG}9`fWiS#!hp1k!iS_R>3timgQ0;KTL8
z^i%}E2YR3taA)sy)p`)BA<GEca_O>eIBG^`$*Gsk)>LzdllY9Qs*TB37}8CnOqFB?
zJud?()(=ybo;ecrttNVI0zF5j4iHMp@9Gfl_Q#(!Tk>UF!BSjQ8sMOkcGIkKV2}DN
z7J-#=&f<J!&?7a7;6WIAVg8wCEp5*aL(T!Ra^32KUD4O&X1!E`?m)4(jLJVJ?)wSP
z7M!uAGb#uguL-=^?scegzZ_5?)=EOMB1By^gd;pL0U7)O?J^+%->N(zjbZ0mtFzbb
zO6u50<#UXt>@6V2Zx}uv6iNGL7^-7tXKt4~rh$KSU4YPBI5u@+DH+kw$A+94RJiCU
z?Sa!z0TaZLb9;cjzm=ZlP={zR^+Do6C^6AIU>-8<idcol;SEQh8l^!?Rbe>|aG9_L
zo@B~<XX3#vvgvU<jobPB+)P1^iYMjHBJ;MW-Yin`Fj6ooX6Mg!3g-(N(Av6<9Y41p
zcl(73+?O%6IHuuLjvri0>_1k!G%rYpiAZ@2X-iBq`145W`XqOnfy!;uF$)aiF9P5!
za5>)|l<0UA&rl$I8)iN_#at8RCa4GWs0XybLIhO<_SQ3?+6YFhngWl!+(!X*YXNO}
z#&d$kEAo^n?Jg!>cy=09Foq_dff>vq-`OF-Pf1(kp-*&|sC*#mz@<ytZ~BYz6^<S)
z@{fw_!t6eaZmxk1l9?7(z)vKw=eUX=11lbiG8A{o$y2DB2feuKJLYk*O3Ux5k+Mws
zF5+u?yviVvzeS;1FD@kOdN{adc9%Pjwqb=z_K-g;lYi7xq*4fav+>H@XuhHYiSAG3
zwZsz3_|g3L>plg?58dV|u_jmF>ipWVfMD5T)XZsJ!bOz$s(wD-9y1=QcvLTjPY2<G
z)b@FN2y3wNF)l9rro!-024&-p1TYdbSfJV1+A7resZOY_?eLug5!_pg*E}uo(d*ZA
z#sqTYz-Aotb0|?{j@dMvW+8p4LPtRs+^&{^{n=ntx9L7YnO*Od3N!ma*An5%K|usp
z>pJW>mZfCKo%c>Uu2`ULSp{8Oq%3_o%`7QA!l)+a?0#c}yZ2EHC#mY_OX{waSu~yU
zZ~y2wz1OXMVVZ9&W_~|NK&xXrD5qx7iCGTYsPk#S&ho9XVZ(I3X@U}h4<`iP&6jlM
zFD;VN#TJ7FTMdzMFa$f_>Cn!36FioAPl*V;j}?EbNc8-a<etwq5YNA;DS6}9EqI!f
zyshjqtV|y9=O_UkmWU@rRxMx>GZGW)9PHETp0G3W)%;ah>f`nJaC>TpCsugtJl5s@
zo5ltBrBc%(3i90nQN3uuq)o1}2PR+y8p}xc8sl#F8R07S81?g{|FakuO)*-)ecw$c
z#olX%oIJv762%wl-j+79*X+MZ>U0Kg@-Cog<(kqnzGf7+hv7Zsu7|OerhY77&)Gvi
zw$_3Aux~|4T8+1%Wtoa?t*xV8^39|#o%KxLf1F<GehWY@U%1~w5*uj`nl#_kJ58d*
z=0J5i`6ZW;YZ4Xg#w=(ji4Nx`AK*Kz$p|+PK%ElrVr&s`tkvcdj3G}8C5aczWFKC5
zp(6C>FWAqOc#jqQ#FVDpf8HX$wXY7w7WxXZ$dV{3f&O?z1#P82bP}yRp+K6kN&07O
zI}(W-)GfuSzj&;Tzy5i?7?I3=(gEyg{RA8|^z>RyG_u~MH_P{KTfD+dR<Do$Yyd6N
zm&xD2j4@6H(iDh7)Fh~yTnSX;YXJGtct_hOLXjI3=O$2U9~!gMw6Gz#+2thUtqPx*
z4(&}a{j2`IZLnK)u(K|}cR$FoWOlashyqurV1RcYq?O4czJT=>IWAYCC}WOIee-J<
zkYH?#z4yu&mwXn3b@ULyVU2qKnGF$Ug9~j^&tV^X`!fG<YL*66Y%-U&Y6PDUvLO)#
zX85V<E+i*@F#Qy}5;aB$5;tj+S)*Z8HWh)F-rsA4dq~YlhTPrcFSb7$7wg-*$X@_b
zDbCO|Tj)Q7&}A<YJg%AhOdUx3e{NHPT9yfOixqJDg`9arWz-O+qG%Y`^m^yayqk4R
zp1Jv&uj#~g_F2;K^y>DEF(Z5j!YEtGt4|;#8W)W|z%)!@<r9qq!g-z3==G40U`Wv-
zq%0DCyp-vH)O$7o`|j<m9t}>HIgq#ci|t@@jaO$Atu7-O8|&@5^OKJw*C0$z8)EWv
zm=VI<wtd_L)5ZK^&O=2g4YVcyn`#O&TGg<JA=R0%oP$vQOMhd}0U4rEgock(33#%<
zw=YXVjKVtj(o4-@#+RIV`_b!xOLWi;_-NN4PW+<T&FK9GMO|4RAjaUJpMaY5%Q$Dz
zF_EN0kW<Fj+@Dg_kCMJ)7NrBe<eI_VF7hK>PoBg9y}j6RYIVjPP(q+|bsf3obAj{-
z`HsWWtpxpZm7p&jK-Zb=zD9xncVgdgQ7IrB!6r^)0vja)JuyWP<VR&{d2EI^;aoo7
zrC_{~nuGSL*oJlk>MQ)pV&}lmqS4R(jG1B~#>w9T+ErFVpD!V<z6K{dib+32$%RuM
zS(M)XtI?G#_Vy_BBY2l$T%=Dw;HoaR7gCA9hD?eFq$0YN6hb<`q@fBj{@qd8YTP-3
zzXuIemI&5DZpn8MQ1+DTN7K}UF6+8xYv>d{Zr1L7TL`&MiH&?G1+$2uWPQEYMzXx3
z1VV+h;3%<P=G$v)1fU-lcO9yIf>vWJ6oJzZTorVA`nS74ffhRxGWJeqL3B~}t`vZ#
zEiZ7<y$ND`nNP12)qfCHY|oe#2-{EoPyXcwfU}fgO8s+`-29xXGEMn#mALP6FE>*J
z-p`d#E0bFIt&3edqmzz&j4$d%K;CP@LM|<h_;+C2+`Mt(pDddeWMA3AW}xkU)Ib4*
z*bGZSB|2=Gc|x5fvWK8wC?ras%p_#+m7>wbt_k^(MBQx`U5cntNtha|PUz<wFf!YF
zaOi)>&>l$TGhTyPx|uP5t`qdW*b@%5(lC*pkx@r<Pp^|7PRsArOC`1lyUt(b>1@gX
zg>43nt7!Q(kMB~xWxoeTj+}6!sRO-*hDBub$2-(Xt*g~9(QC72pznxD4yqy$>++nP
zY83C0$afTODk1127;u%(`5IMagwl-V{~*f?{CC?VS>|Y4XAhfxKSi;7!FGwM1IHFo
zy&K*iBpC4OPPV)y{qYlZtE`uX^o(PQtbI<6?~k3X_M5(+1}c1fy}<aL_4;Z&CWKpP
zI4ypJ%M~vQgA7R9pQQ<uIFro{TrVP>TZ47w%h|rP96pf3QZ2&$rN)ZtvTJA^{NHgR
z3|&N+7hMsMT#x_wgnE}-58lPtt<m>WxAb4Wc!3WH4%VK=wrRU2oziLeVXYffd<GV!
zQD2z1@dw=2y#!D9ljT1tZ&-_FoVkq-P=s&&Mk&mhOb>lcPrXvx1nIlSlk*;Q&trY0
zO=vdS)W9SRpn@gt1Z<_PWT+1Y;FQN>mz971uY{T61Cd&fKXh2>Vt4`=__;DeIF|Gw
zSR3C9_j`cKi`#(uwmNXc;VWPw%m7k!2xTu`u+Q>zxA-TB_obwrE24=t_GryxQ&0ER
z2aRnTGX`=$=?<E$q>t5SYJrMto7M)hUuQrXN8d*Xs24b?@mCw-&TzWR?q10H5xW+$
zwXE-dcj*BYIyj_~40EIoKCr+uKopSLhW#uI^JWL@@$yiYpI&9Lbku?_YuhI;;1^nd
z=?3uzQ|AkJnj3hU;%c@ipzAlB^F(3<`v9(SGs+T#1Fo)J9~-euS%-jn^{EG-KQ+<&
zYLR94V1H~0zr|QTik=?5l_Gw(fa(Swi~gO&7<ov91=2v9|I|-}<o5nyn>j$tD!a%I
z)ebr-Iod}cgZckhGHT;~-Q8i06;=aj2bMu!rvstfE>AEnX6?g@hX!=rvQuDZ!PDfw
z@uo&VverZ=9FP_7ctHV+_j^R0|IW%oIQb9B6ful(51BJ5N6>imS7{LqbDQJq=RiU7
zX7w)6eeui1T{2+If-5co@^7XSC8JwP?h`nkEOT|{7f;r?BAa}yb1U^il(RS0*$m9j
z15i)a`!IqSY<e2}g)b*j4Szl}uPqyrfcFQMq~POO!o?k+^`pxFe&z-E#K3+Es9E(I
zq<oU6PXE%CU-qX?x)aPLU5aE~8N?c6Q9b9xXfgeO)fu>GoFBm>_Ifn0^cQeF)4>!W
zL2aeK16M#bqE@x>h8|Qa>Y{p>->9;LhkjOA{Fu)=-3l6#VUW&e<UOtUXA-&R*TDGu
zf3DP{)<latKbN2XNGP}GCcR6$$dCME#9g_--BO?VyQ-7;Ac%i6n=RBA0?v2*tom7Z
z9MUD9>HY4wyjm*m?|aGs-_tGk?3DN;c#LhG8WuSXjw@;;Be;Mp`tLs((*NBg{O2ps
z#{WC+|9)K*JX`%|(6C7G5)$w~PxkNS1nvKiE@nd@o}cUx4C-D8_;<kOuyy%<a{T`R
D=3DJh

literal 0
HcmV?d00001

diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Resources/Textures/coin.png b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Resources/Textures/coin.png
new file mode 100644
index 0000000000000000000000000000000000000000..3cd89c6ce6cc5729af435691e9784161b1d3a474
GIT binary patch
literal 3141
zcmV-L47&4)P)<h;3K|Lk000e1NJLTq001Ze001cn1^@s6N1|)U000aONkl<Zcmchb
z33yFs8plsWBZ;k1BsA7mhmaCmEDa&{5XntsPc0F(mY`K0rlxA2MoTp)ttyJ55>-_?
zs49|L6J*guBHSzczTSKP^FQDH#>9PO%5<jZd4A`f^DXE6zxVy#_xsLO{>XuX!vjzl
z`!)&=9!K8Z4CL>xLf$@*0^}WtN6x34k+nDgIolnH^55{x9gMkO+9P}GOz1xN5jop(
zDG(G23IuX@NxtO$9zeH>tgqqqO_qIv+?{Sjc^00!VR8DVCi;ib%Z$3HEaZL$WJkl8
zJ`2XX3-~)7xI2x61L;$MjOj3>Oh(Pk3Bdj3Y`cY`zaTqd$lmdNjdqJ0QJ#jUYLs|x
ziAQnP<^<$?NQ<oDOW&o4H&An99Lj$l3Vp&@;Eo3P%~xPd)rj({E2DulicAj!G9y)M
zf^Ju-dYH5}Dt6BswnX_)$cws(*)wB43b#}sdp#``!54;6!~~O&6kk;SItKb%J}mb)
zmGigy>R6PYA5PJJkZp;EbwLz5k3#<r6h=dvyzb}OQwF_El)4b7x=4*%wgwg3#K>!I
z1<_KTe35*q#E|TZn#A!YF%)M=@<G{8L!iIm$$JgUeWZ2$B)m?49mrY+<ZT2>HvabR
z{GrZ7c@j!p7032QEJf8`idzl+?O;^Kjil?OI5YGVsK0HpVoicKsuRK}V4>tK5-Hp)
zMG8xbx@-z8_ze1j?I}aux^^InIpSna^qO&gC|zYh_A0t{1}ZNOhyJGbBR863OxD0~
zTf>*m0UoXdazBPKYb6YsD`3c20sWo1Y@@dI5vWr`pE8qm@4<L~1Kqt9d3V;H>E-NT
zO_bUw<^>}LI&{FjN!qHb<56<j9mOXHql)vaE^z_|LiKe9%mpu$U*a6Rq2avr=Ag!@
z0Yr-iGTK#ZE)f_r-sZFjWsrGtVB<|0py;po=}^!rqSQt)FG&1u%pRl#Qj{l3|1p%4
zeFR7E`#S>tMVs<pMzGId{tg#&6Y2h}3ji`_m|T5tp^Cho#ri<j`%&Ozmc0WMEU%ar
z(!CE+h(KPLm^HD78w!_HBWoTzhmr~MC3Ofhvm%Ac_U3~T!C{8)<MnqVfb2!M^K<x-
zW=*Xvh@zsN9&!2G!2QTsAQG;O);|duI2p8R?t&`K=$HBtMMXUc`uDW&f(J7Skugm)
z{&NLN(kB5qvvG9C$d8DkqMig%%UtImXF3~A{By))1_Jkk&8*1#tOyj`2utqRrg3wk
zDC&ua<*D7nV(>6r%)S4+_3j3s@T42EK6irQu>cG(8Av<1X0WTh2T>ID^rF2@E8Qip
zWMl@5sH^Lt9JPSgwcO$_%Y#h686>S%pGQkzt^2GXq^@_w^+;<N)69d4ZFIp{G2eL}
zQ55y$;`F?$A=NM6)R35q<4dc#F(^1WNWg3HGKv!xC_d|f{O?~w@#!HbW2#{y7X4}x
zyjZU>rJ*~1?B`{w<MVDUeI6-mTLbrk9(Qwk2n9~W{*C>%(z8}Xsn^HZ&Xa3t4emU7
zuH=6=5Lf3kz?IonxJs_gwLuZZsH0C=-3nJ`HNdrbWNri8SlAGi+$>bYk3#%3OBDS$
z2+)S2^xROyg<GQJEc?+2*B990-e*qc0wIDldm3W54me6}O^IUV+TAVysp>MMx^IfK
zqB@!Y?&*ARb*?p%Ryv@Xt3yqaj}Vc%t~IKzjl-o$3Lbpv41;u&AxR_Loqv1)1t}<x
z8zlth#kwLs!UC07Jk@oZ1GYl;q27=JWsroJ1l|wAv26p+P+Lo)H0<ka7ltHnHVS5k
zIbyfL4x)20M|?3%LD4B%;z0;Ihv3$`cDTK~8JDj>{I;Pj;-^|5d1Wh3e0MP@WCcU}
zRS#O#noF9u=y!kjtGE_vLzkPjXqRU`N2_|M9+Cq6MgA4rxpZF~-O~RYwK)={sY{op
zq56dJdb-&p?(S4muux#mH+>LKOQ<7<HiUD?PrUeUbSIPG%up1b@j=SE&J<c78PPAZ
zJQR1gbVB0dCc>H&%z8&8zSBe<fDl=D%AJ<f$N-V=&5Yn&Rqr)85Y^`twY4Wovsc<T
z@-4hHrUc18GWw>FNn&&bCkEou>k4vWTv5qMet%atT;zQrgGJ8(D3A9-#gzb*T+kqK
zX$!jFmIDh$(t9nCu&6Og<HsO<QwO@+0;voNiWhTQcfiFI@iM{<DV$E%$D{JnC>Y~M
zV&lTjhp4RsQJUM@SPr{>XmA#8jR#WIMLt-pjf^OE^raiy;qvtQYJdpWWbN!KtfJfB
zljT+n5=&g3QBSR>#rp~oSzkEe*9c2opWjf-(X@{`Aah3-Ko^Gek6%K{npU*~M9ke9
z8laK`0tHU;Y`y7U7JPy9+q=dk4vAw;`#O$DSTKF^qs5=|hI3|^*j91mYPp!~<s5M-
zxA&z?FH9@!_wPJd5jR?-B)VA$kV)BeouXcwZ8nHLfg<BZ8(ca!d55~%5~T_0G1<#;
z7p{(0M<F`|nyi=>`Y6d#m`t{{l5~bBCuRveP1eaWIndf-%y&a#%VxahiOahO=o;D9
z523CXiDFASx3RZgtUc~tp}#yvxS1Vfz=S_Bc{8BI17+@fHpHNVA6rr>p2isu)kyEp
z=yaNzMvxXnd5*Lrf!h{4-N3ISRV&I72FQq(X-C33;m(Q+BRM5}WLv+dz?Z1Y;w<sm
zst#N}PkirG$Bkli57Bq)*eHs6`V+BHuprIJaF<saZ!0?KZm8sr*qEe|Rt%M{4km#l
zfT_kGRa`BqRhX<f5V?l`4s62=Aqgjw<umy_HH}>yhR>HeB~i;X(v>tI;;<z>$(vDg
zI^D!C9wM5g=_xXd6FdmeMFGV}Va!~@6=s~63gTl*_W@88BmM%Zn{R;p1LB_sKGQT{
z?K&8>>Q|#5s?K{r7yDYxD{XAIQ->F6P3jSG)R%7db9ljOOX9A+rPXKLg@rh|h09C0
zk`#RFj<WL;P;k^ud}=Z<IFQlEj~xts(lp@Sn{?l7GRGXQI<ru5NkdDGr8u$eXOw&K
zqih(;xUL({x+5~6O*}P35?A3~v!jWui1g@b_e0UKfyRn6Lxt)2FM$wQ5ZfQx?OiB#
z@S~_SGDz}{^hMFJe!N%bnEY6;4a*E%N~>>%!}wq=@NgrL^8r&$2uk>oWu&+R%bm3K
zER+vbBS~Y`H`6By+7NHDdg>U5E2Xjh=#}0mKIJY1aXI7zhls%7y-Xhg!qVA$d!p*H
zr?_Xi#B3X-T~2Wufb0#Zx*17N3_$gF{c&znk3xGptG#^hY|=|w&%#`w1!+i}NjTX&
zXKc&FqOW_Q{DhloNtxRM&A-}&*rM;<kbk6~*!R`_6{rTDH$Q2IBYSr@R37Pr^B=uh
z)Xu&^4Bxj*rWOZcNuGGrBh6%p&n2IRj&6M|`}FV{T;ytT#>14W(##Ssuhlu3v#*!<
zHhwH&6ZttRHmemEN1@<gZ<HVIg#*j}^3cJ~O5OLZlCFJ;Sesk#Nv?Jv?qs1V(xp?Q
zpH95rxuBdoo6@8Gg`2CdjTJ8xFPGc?GVZK%5B3oWT!@s@z;Mf32rK5UyMk8B`n<b-
zp>L}c%X$_E`TVscm^eufQrzz!Rx-?oka^@2tNIo(5u;k(ivO@{S?NJqDyA<=xGSMp
zVKqjlSg&)w>V?ANZX&wNxOSKPFbHKw`=R2S-q7xLF>HUcy{=n38+EU@TUsuNbR&(W
z2cPP&kRn@=fiiKfC%c>4TArBjTC;>b3p?f}M>|&+?Q?-Dxa=_9M(dRGxAg0tqD=kO
z?dpzmYde>$2z@c5TYH;d_>9A3D_J4~va`9kXA$|F-0gHH8nTFNB6~=zV{@ysgS$1p
zGJC9j%9=@z_cqUHr;VQ3P8T(`?fqo|t<wG7nk9B^YjeTIs@@5<KS*{+t3}8u)Ly#v
znZ=n0P9xGzS~G~eB`vy5y6S6bnIj}d{vIUz$WHPx`5T!|#z>d8kY4&jhq*PMCml#%
z;z=gT%)gYpPu5CSOF@gID1SMhyUGBxHMiRTQfPf?(Uzp6%$u%c5E)85q?iGur<`Ms
f#Ew`$tFV6pp{%!<38}eB00000NkvXXu0mjf%8Lds

literal 0
HcmV?d00001

diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Scoring/PippidonScoreProcessor.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Scoring/PippidonScoreProcessor.cs
new file mode 100644
index 0000000000..1c4fe698c2
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Scoring/PippidonScoreProcessor.cs
@@ -0,0 +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.Game.Rulesets.Scoring;
+
+namespace osu.Game.Rulesets.Pippidon.Scoring
+{
+    public class PippidonScoreProcessor : ScoreProcessor
+    {
+    }
+}
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/UI/DrawablePippidonRuleset.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/UI/DrawablePippidonRuleset.cs
new file mode 100644
index 0000000000..d923963bef
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/UI/DrawablePippidonRuleset.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.Allocation;
+using osu.Framework.Input;
+using osu.Game.Beatmaps;
+using osu.Game.Input.Handlers;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Pippidon.Objects;
+using osu.Game.Rulesets.Pippidon.Objects.Drawables;
+using osu.Game.Rulesets.Pippidon.Replays;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.Pippidon.UI
+{
+    [Cached]
+    public class DrawablePippidonRuleset : DrawableRuleset<PippidonHitObject>
+    {
+        public DrawablePippidonRuleset(PippidonRuleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
+            : base(ruleset, beatmap, mods)
+        {
+        }
+
+        public override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new PippidonPlayfieldAdjustmentContainer();
+
+        protected override Playfield CreatePlayfield() => new PippidonPlayfield();
+
+        protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new PippidonFramedReplayInputHandler(replay);
+
+        public override DrawableHitObject<PippidonHitObject> CreateDrawableRepresentation(PippidonHitObject h) => new DrawablePippidonHitObject(h);
+
+        protected override PassThroughInputManager CreateInputManager() => new PippidonInputManager(Ruleset?.RulesetInfo);
+    }
+}
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/UI/PippidonCursorContainer.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/UI/PippidonCursorContainer.cs
new file mode 100644
index 0000000000..9de3f4ba14
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/UI/PippidonCursorContainer.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;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Rulesets.UI;
+using osuTK;
+
+namespace osu.Game.Rulesets.Pippidon.UI
+{
+    public class PippidonCursorContainer : GameplayCursorContainer
+    {
+        private Sprite cursorSprite;
+        private Texture cursorTexture;
+
+        protected override Drawable CreateCursor() => cursorSprite = new Sprite
+        {
+            Scale = new Vector2(0.5f),
+            Origin = Anchor.Centre,
+            Texture = cursorTexture,
+        };
+
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures)
+        {
+            cursorTexture = textures.Get("character");
+
+            if (cursorSprite != null)
+                cursorSprite.Texture = cursorTexture;
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfield.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfield.cs
new file mode 100644
index 0000000000..b5a97c5ea3
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfield.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.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.Pippidon.UI
+{
+    [Cached]
+    public class PippidonPlayfield : Playfield
+    {
+        protected override GameplayCursorContainer CreateCursor() => new PippidonCursorContainer();
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AddRangeInternal(new Drawable[]
+            {
+                HitObjectContainer,
+            });
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfieldAdjustmentContainer.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfieldAdjustmentContainer.cs
new file mode 100644
index 0000000000..9236683827
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfieldAdjustmentContainer.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;
+using osu.Game.Rulesets.UI;
+using osuTK;
+
+namespace osu.Game.Rulesets.Pippidon.UI
+{
+    public class PippidonPlayfieldAdjustmentContainer : PlayfieldAdjustmentContainer
+    {
+        public PippidonPlayfieldAdjustmentContainer()
+        {
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+
+            Size = new Vector2(0.8f);
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj
new file mode 100644
index 0000000000..e4a3d39d6d
--- /dev/null
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup Label="Project">
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <AssemblyTitle>osu.Game.Rulesets.Sample</AssemblyTitle>
+    <OutputType>Library</OutputType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <RootNamespace>osu.Game.Rulesets.Pippidon</RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\**" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="ppy.osu.Game" Version="2021.331.0" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/.editorconfig b/Templates/Rulesets/ruleset-scrolling-empty/.editorconfig
new file mode 100644
index 0000000000..24825b7c42
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/.editorconfig
@@ -0,0 +1,27 @@
+# EditorConfig is awesome: http://editorconfig.org
+root = true
+
+[*.cs]
+end_of_line = crlf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+#Roslyn naming styles
+
+#PascalCase for public and protected members
+dotnet_naming_style.pascalcase.capitalization = pascal_case
+dotnet_naming_symbols.public_members.applicable_accessibilities = public,internal,protected,protected_internal
+dotnet_naming_symbols.public_members.applicable_kinds = property,method,field,event,delegate
+dotnet_naming_rule.public_members_pascalcase.severity = suggestion
+dotnet_naming_rule.public_members_pascalcase.symbols = public_members
+dotnet_naming_rule.public_members_pascalcase.style = pascalcase
+
+#camelCase for private members
+dotnet_naming_style.camelcase.capitalization = camel_case
+dotnet_naming_symbols.private_members.applicable_accessibilities = private
+dotnet_naming_symbols.private_members.applicable_kinds = property,method,field,event,delegate
+dotnet_naming_rule.private_members_camelcase.severity = suggestion
+dotnet_naming_rule.private_members_camelcase.symbols = private_members
+dotnet_naming_rule.private_members_camelcase.style = camelcase
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/.gitignore b/Templates/Rulesets/ruleset-scrolling-empty/.gitignore
new file mode 100644
index 0000000000..940794e60f
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/.gitignore
@@ -0,0 +1,288 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+**/Properties/launchSettings.json
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# TODO: Comment the next line if you want to checkin your web deploy settings
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Typescript v1 declaration files
+typings/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+# CodeRush
+.cr/
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/.template.config/template.json b/Templates/Rulesets/ruleset-scrolling-empty/.template.config/template.json
new file mode 100644
index 0000000000..3eb99a1f9d
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/.template.config/template.json
@@ -0,0 +1,16 @@
+{
+    "$schema": "http://json.schemastore.org/template",
+    "author": "ppy Pty Ltd",
+    "classifications": [
+        "Console"
+    ],
+    "name": "osu! ruleset (scrolling)",
+    "identity": "ppy.osu.Game.Templates.Rulesets.Scrolling",
+    "shortName": "ruleset-scrolling",
+    "tags": {
+        "language": "C#",
+        "type": "project"
+    },
+    "sourceName": "EmptyScrolling",
+    "preferNameDirectory": true
+}
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/.vscode/launch.json b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/.vscode/launch.json
new file mode 100644
index 0000000000..24e4873ed6
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/.vscode/launch.json
@@ -0,0 +1,31 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "VisualTests (Debug)",
+            "type": "coreclr",
+            "request": "launch",
+            "program": "dotnet",
+            "args": [
+                "${workspaceRoot}/bin/Debug/net5.0/osu.Game.Rulesets.EmptyScrolling.Tests.dll"
+            ],
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Debug)",
+            "env": {},
+            "console": "internalConsole"
+        },
+        {
+            "name": "VisualTests (Release)",
+            "type": "coreclr",
+            "request": "launch",
+            "program": "dotnet",
+            "args": [
+                "${workspaceRoot}/bin/Release/net5.0/osu.Game.Rulesets.EmptyScrolling.Tests.dll"
+            ],
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Release)",
+            "env": {},
+            "console": "internalConsole"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/.vscode/tasks.json b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/.vscode/tasks.json
new file mode 100644
index 0000000000..00d0dc7d9b
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/.vscode/tasks.json
@@ -0,0 +1,47 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Build (Debug)",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "build",
+                "--no-restore",
+                "osu.Game.Rulesets.EmptyScrolling.Tests.csproj",
+                "-p:GenerateFullPaths=true",
+                "-m",
+                "-verbosity:m"
+            ],
+            "group": "build",
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Build (Release)",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "build",
+                "--no-restore",
+                "osu.Game.Rulesets.EmptyScrolling.Tests.csproj",
+                "-p:Configuration=Release",
+                "-p:GenerateFullPaths=true",
+                "-m",
+                "-verbosity:m"
+            ],
+            "group": "build",
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Restore",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "restore"
+            ],
+            "problemMatcher": []
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/TestSceneOsuGame.cs b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/TestSceneOsuGame.cs
new file mode 100644
index 0000000000..aed6abb6bf
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/TestSceneOsuGame.cs
@@ -0,0 +1,32 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Platform;
+using osu.Game.Tests.Visual;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.EmptyScrolling.Tests
+{
+    public class TestSceneOsuGame : OsuTestScene
+    {
+        [BackgroundDependencyLoader]
+        private void load(GameHost host, OsuGameBase gameBase)
+        {
+            OsuGame game = new OsuGame();
+            game.SetHost(host);
+
+            Children = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4.Black,
+                },
+                game
+            };
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/TestSceneOsuPlayer.cs b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/TestSceneOsuPlayer.cs
new file mode 100644
index 0000000000..9460576196
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/TestSceneOsuPlayer.cs
@@ -0,0 +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 NUnit.Framework;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.EmptyScrolling.Tests
+{
+    [TestFixture]
+    public class TestSceneOsuPlayer : PlayerTestScene
+    {
+        protected override Ruleset CreatePlayerRuleset() => new EmptyScrollingRuleset();
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/VisualTestRunner.cs b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/VisualTestRunner.cs
new file mode 100644
index 0000000000..65cfb2bff4
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/VisualTestRunner.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.
+
+using System;
+using osu.Framework;
+using osu.Framework.Platform;
+using osu.Game.Tests;
+
+namespace osu.Game.Rulesets.EmptyScrolling.Tests
+{
+    public static class VisualTestRunner
+    {
+        [STAThread]
+        public static int Main(string[] args)
+        {
+            using (DesktopGameHost host = Host.GetSuitableHost(@"osu", true))
+            {
+                host.Run(new OsuTestBrowser());
+                return 0;
+            }
+        }
+    }
+}
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
new file mode 100644
index 0000000000..c9f87a8551
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <StartupObject>osu.Game.Rulesets.EmptyScrolling.Tests.VisualTestRunner</StartupObject>
+  </PropertyGroup>
+  <ItemGroup Label="Service">
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+  <PropertyGroup>
+    <GenerateProgramFile>false</GenerateProgramFile>
+  </PropertyGroup>
+  <ItemGroup Label="Package References">
+    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\osu.Game.Rulesets.EmptyScrolling\osu.Game.Rulesets.EmptyScrolling.csproj" />
+  </ItemGroup>
+  <PropertyGroup Label="Project">
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <RootNamespace>osu.Game.Rulesets.EmptyScrolling.Tests</RootNamespace>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.sln b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.sln
new file mode 100644
index 0000000000..97361e1a7b
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.sln
@@ -0,0 +1,96 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29123.88
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Game.Rulesets.EmptyScrolling", "osu.Game.Rulesets.EmptyScrolling\osu.Game.Rulesets.EmptyScrolling.csproj", "{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.EmptyScrolling.Tests", "osu.Game.Rulesets.EmptyScrolling.Tests\osu.Game.Rulesets.EmptyScrolling.Tests.csproj", "{B4577C85-CB83-462A-BCE3-22FFEB16311D}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+		VisualTests|Any CPU = VisualTests|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.VisualTests|Any CPU.ActiveCfg = Release|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.VisualTests|Any CPU.Build.0 = Release|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.VisualTests|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.VisualTests|Any CPU.Build.0 = Debug|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {671B0BEC-2403-45B0-9357-2C97CC517668}
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		Policies = $0
+		$0.TextStylePolicy = $1
+		$1.EolMarker = Windows
+		$1.inheritsSet = VisualStudio
+		$1.inheritsScope = text/plain
+		$1.scope = text/x-csharp
+		$0.CSharpFormattingPolicy = $2
+		$2.IndentSwitchSection = True
+		$2.NewLinesForBracesInProperties = True
+		$2.NewLinesForBracesInAccessors = True
+		$2.NewLinesForBracesInAnonymousMethods = True
+		$2.NewLinesForBracesInControlBlocks = True
+		$2.NewLinesForBracesInAnonymousTypes = True
+		$2.NewLinesForBracesInObjectCollectionArrayInitializers = True
+		$2.NewLinesForBracesInLambdaExpressionBody = True
+		$2.NewLineForElse = True
+		$2.NewLineForCatch = True
+		$2.NewLineForFinally = True
+		$2.NewLineForMembersInObjectInit = True
+		$2.NewLineForMembersInAnonymousTypes = True
+		$2.NewLineForClausesInQuery = True
+		$2.SpacingAfterMethodDeclarationName = False
+		$2.SpaceAfterMethodCallName = False
+		$2.SpaceBeforeOpenSquareBracket = False
+		$2.inheritsSet = Mono
+		$2.inheritsScope = text/x-csharp
+		$2.scope = text/x-csharp
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		Policies = $0
+		$0.TextStylePolicy = $1
+		$1.EolMarker = Windows
+		$1.inheritsSet = VisualStudio
+		$1.inheritsScope = text/plain
+		$1.scope = text/x-csharp
+		$0.CSharpFormattingPolicy = $2
+		$2.IndentSwitchSection = True
+		$2.NewLinesForBracesInProperties = True
+		$2.NewLinesForBracesInAccessors = True
+		$2.NewLinesForBracesInAnonymousMethods = True
+		$2.NewLinesForBracesInControlBlocks = True
+		$2.NewLinesForBracesInAnonymousTypes = True
+		$2.NewLinesForBracesInObjectCollectionArrayInitializers = True
+		$2.NewLinesForBracesInLambdaExpressionBody = True
+		$2.NewLineForElse = True
+		$2.NewLineForCatch = True
+		$2.NewLineForFinally = True
+		$2.NewLineForMembersInObjectInit = True
+		$2.NewLineForMembersInAnonymousTypes = True
+		$2.NewLineForClausesInQuery = True
+		$2.SpacingAfterMethodDeclarationName = False
+		$2.SpaceAfterMethodCallName = False
+		$2.SpaceBeforeOpenSquareBracket = False
+		$2.inheritsSet = Mono
+		$2.inheritsScope = text/x-csharp
+		$2.scope = text/x-csharp
+	EndGlobalSection
+EndGlobal
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.sln.DotSettings b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.sln.DotSettings
new file mode 100644
index 0000000000..1ceac22be9
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.sln.DotSettings
@@ -0,0 +1,877 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Efnt/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Emp3/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Epng/@EntryIndexedValue">True</s:Boolean>
+	<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/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/=ArrangeMissingParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeConstructorOrDestructorBody/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeLocalFunctionBody/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeMethodOrOperatorBody/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeModifiersOrder/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue"></s:String>
+	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexRemoved">True</s:Boolean>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeMemberModifiers/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeModifiers/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignedValueIsNeverUsed/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignNullToNotNullAttribute/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadAttributeBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadBracesSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadChildStatementIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadColonSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadCommaSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadControlBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadControlBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadDeclarationBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadDeclarationBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadEmptyScrollingBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadExpressionBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadExpressionBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadGenericBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadLinqLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadListLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadMemberAccessSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadNamespaceBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadParensLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadParensSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadPreprocessorIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSemicolonSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSpacesAfterKeyword/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSquareBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSwitchBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSymbolSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CanBeReplacedWithTryCastAndCheckForNull/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CheckForReferenceEqualityInstead_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CheckForReferenceEqualityInstead_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ClassNeverInstantiated_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ClassNeverInstantiated_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ClassWithVirtualMembersNeverInherited_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CollectionNeverQueried_002EGlobal/@EntryIndexedValue">SUGGESTION</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CollectionNeverQueried_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CommentTypo/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CompareOfFloatsByEqualityOperator/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertClosureToMethodGroup/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfDoToWhile/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToConditionalTernaryExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToNullCoalescingExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfToOrExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertNullableToShortForm/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertPropertyToExpressionBody/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoProperty/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToConstant_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLambdaExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLocalFunction/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToStaticClass/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=DoubleNegationOperator/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EmptyScrollingGeneralCatchClause/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EventNeverSubscribedTo_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EventNeverSubscribedTo_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ForCanBeConvertedToForeach/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=IdentifierTypo/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ImpureMethodCallOnReadonlyValueField/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InconsistentNaming/@EntryIndexedValue">ERROR</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=IncorrectBlankLinesNearBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InheritdocConsiderUsage/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InlineOutVariableDeclaration/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InvertIf/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InvokeAsExtensionMethod/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=JoinDeclarationAndInitializer/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=JoinNullCheckWithUsage/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBeMadeStatic_002ELocal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBePrivate_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBePrivate_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBeProtected_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeCastWithTypeCheck/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeConditionalExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeSequentialChecks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodSupportsCancellation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingBlankLines/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingLinebreak/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingSpace/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MoreSpecificForeachVariableTypeAvailable/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MultipleSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MultipleStatementsOnOneLine/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MultipleTypeMembersOnOneLine/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=NestedStringInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=NotAccessedField_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=OutdentIsOffPrevLevel/@EntryIndexedValue">WARNING</s:String>
+	<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/=PossibleInterfaceMemberAmbiguity/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PossibleMultipleEnumeration/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PrivateVariableCanBeMadeReadonly/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PublicConstructorInAbstractClass/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantArgumentDefaultValue/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantArrayCreationExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantAttributeParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantAttributeUsageProperty/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantBlankLines/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCaseLabel/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInAttributeList/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInEnumDeclaration/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInInitializer/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantEmptyScrollingObjectCreationArgumentList/@EntryIndexedValue">WARNING</s:String>
+	
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantExplicitParamsArrayCreation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantImmediateDelegateInvocation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLambdaSignatureParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLinebreak/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantSpace/@EntryIndexedValue">WARNING</s:String>
+	<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/=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>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveToList_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E3/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithLastOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithLastOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithLastOrDefault_002E3/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithLastOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002E3/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EAny_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EAny_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ECount_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ECount_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EFirst_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EFirst_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EFirstOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EFirstOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELast_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELast_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELastOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELastOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELongCount/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingle_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingle_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingleOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingleOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EWhere/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSimpleAssignment_002EFalse/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSimpleAssignment_002ETrue/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleAssignment_002EFalse/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleAssignment_002ETrue/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToAny/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToCount/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirst/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirstOrDefault/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToLast/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToLastOrDefault/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToSingle/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToSingleOrDefault/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E3/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SeparateControlTransferStatement/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringLiteralTypo/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FBuiltInTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FSimpleTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SwitchStatementMissingSomeCases/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TabsAndSpacesMismatch/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TabsAreDisallowed/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TabsOutsideIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TooWideLocalVariableScope/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TryCastAlwaysSucceeds/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnassignedField_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnnecessaryWhitespace/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedAutoPropertyAccessor_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMemberHierarchy_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMemberInSuper_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMember_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMember_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002ELocal/@EntryIndexedValue">HINT</s:String>
+	
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedParameter_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseCollectionCountProperty/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInFormatString/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNameofExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexedValue"></s:String>
+	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexRemoved">True</s:Boolean>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNullPropagation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseObjectOrCollectionInitializer/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UsePatternMatching/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseStringInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VariableCanBeMadeConst/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberCallInConstructor/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=WrongIndentSize/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Code_0020Cleanup_0020_0028peppy_0029/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Code Cleanup (peppy)"&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_EXPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;ALWAYS_EXPLICIT&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_EXPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="False" ArrangeTypeMemberAccessModifier="False" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="False" ArrangeBraces="False" ArrangeAttributes="False" ArrangeArgumentsStyle="False" /&gt;&lt;XAMLCollapseEmptyScrollingTags&gt;False&lt;/XAMLCollapseEmptyScrollingTags&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;/Profile&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeCleanup/RecentlyUsedProfile/@EntryValue">Code Cleanup (peppy)</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/LOCAL_FUNCTION_BODY/@EntryValue">ExpressionBody</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/METHOD_OR_OPERATOR_BODY/@EntryValue">ExpressionBody</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/USE_HEURISTICS_FOR_BODY_STYLE/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_LINQ_QUERY/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_CALLS_CHAIN/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_EXTENDS_LIST/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_FOR_STMT/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_PARAMETER/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTIPLE_DECLARATION/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTLINE_TYPE_PARAMETER_CONSTRAINS/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTLINE_TYPE_PARAMETER_LIST/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ANONYMOUS_METHOD_DECLARATION_BRACES/@EntryValue">NEXT_LINE</s:String>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BEFORE_BLOCK_STATEMENTS/@EntryValue">1</s:Int64>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BEFORE_CASE/@EntryValue">1</s:Int64>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INITIALIZER_BRACES/@EntryValue">NEXT_LINE</s:String>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_CODE/@EntryValue">1</s:Int64>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue">1</s:Int64>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/LINE_FEED_AT_FILE_END/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AROUND_MULTIPLICATIVE_OP/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_SIZEOF_PARENTHESES/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_TYPEOF_PARENTHESES/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHING_EMPTY_BRACES/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/STICK_COMMENT/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_ARRAY_INITIALIZER_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_BINARY_OPSIGN/@EntryValue">True</s:Boolean>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">200</s:Int64>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_OBJECT_AND_COLLECTION_INITIALIZER_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/EncapsulateField/MakeFieldPrivate/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/EncapsulateField/UseAutoProperty/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AABB/@EntryIndexedValue">AABB</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=API/@EntryIndexedValue">API</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BPM/@EntryIndexedValue">BPM</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GC/@EntryIndexedValue">GC</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GL/@EntryIndexedValue">GL</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GLSL/@EntryIndexedValue">GLSL</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HID/@EntryIndexedValue">HID</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HUD/@EntryIndexedValue">HUD</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IL/@EntryIndexedValue">IL</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IPC/@EntryIndexedValue">IPC</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JIT/@EntryIndexedValue">JIT</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LTRB/@EntryIndexedValue">LTRB</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MD/@EntryIndexedValue">MD5</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NS/@EntryIndexedValue">NS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=OS/@EntryIndexedValue">OS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PM/@EntryIndexedValue">PM</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RGB/@EntryIndexedValue">RGB</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RNG/@EntryIndexedValue">RNG</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SHA/@EntryIndexedValue">SHA</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SRGB/@EntryIndexedValue">SRGB</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TK/@EntryIndexedValue">TK</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SS/@EntryIndexedValue">SS</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PP/@EntryIndexedValue">PP</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GMT/@EntryIndexedValue">GMT</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=QAT/@EntryIndexedValue">QAT</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BNG/@EntryIndexedValue">BNG</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UI/@EntryIndexedValue">UI</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpNaming/ApplyAutoDetectedRules/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeStyle/CSharpFileLayoutPatterns/Pattern/@EntryValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&#xD;
+&lt;Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"&gt;&#xD;
+  &lt;TypePattern DisplayName="COM interfaces or structs"&gt;&#xD;
+    &lt;TypePattern.Match&gt;&#xD;
+      &lt;Or&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="Interface" /&gt;&#xD;
+          &lt;Or&gt;&#xD;
+            &lt;HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /&gt;&#xD;
+            &lt;HasAttribute Name="System.Runtime.InteropServices.ComImport" /&gt;&#xD;
+          &lt;/Or&gt;&#xD;
+        &lt;/And&gt;&#xD;
+        &lt;Kind Is="Struct" /&gt;&#xD;
+      &lt;/Or&gt;&#xD;
+    &lt;/TypePattern.Match&gt;&#xD;
+  &lt;/TypePattern&gt;&#xD;
+  &lt;TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"&gt;&#xD;
+    &lt;TypePattern.Match&gt;&#xD;
+      &lt;And&gt;&#xD;
+        &lt;Kind Is="Class" /&gt;&#xD;
+        &lt;HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /&gt;&#xD;
+      &lt;/And&gt;&#xD;
+    &lt;/TypePattern.Match&gt;&#xD;
+    &lt;Entry DisplayName="Setup/Teardown Methods"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="Method" /&gt;&#xD;
+          &lt;Or&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="True" /&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="True" /&gt;&#xD;
+          &lt;/Or&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+    &lt;Entry DisplayName="All other members" /&gt;&#xD;
+    &lt;Entry Priority="100" DisplayName="Test Methods"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="Method" /&gt;&#xD;
+          &lt;HasAttribute Name="NUnit.Framework.TestAttribute" /&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+      &lt;Entry.SortBy&gt;&#xD;
+        &lt;Name /&gt;&#xD;
+      &lt;/Entry.SortBy&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+  &lt;/TypePattern&gt;&#xD;
+  &lt;TypePattern DisplayName="Default Pattern"&gt;&#xD;
+    &lt;Group DisplayName="Fields/Properties"&gt;&#xD;
+      &lt;Group DisplayName="Public Fields"&gt;&#xD;
+        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Kind Is="Constant" /&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+                &lt;And&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/And&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Or&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/Or&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Entry DisplayName="Public Properties"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Access Is="Public" /&gt;&#xD;
+            &lt;Kind Is="Property" /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+      &lt;Group DisplayName="Internal Fields"&gt;&#xD;
+        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Kind Is="Constant" /&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+                &lt;And&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/And&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Or&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/Or&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Entry DisplayName="Internal Properties"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Access Is="Internal" /&gt;&#xD;
+            &lt;Kind Is="Property" /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+      &lt;Group DisplayName="Protected Fields"&gt;&#xD;
+        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Kind Is="Constant" /&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+                &lt;And&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/And&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Or&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/Or&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Entry DisplayName="Protected Properties"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Access Is="Protected" /&gt;&#xD;
+            &lt;Kind Is="Property" /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+      &lt;Group DisplayName="Private Fields"&gt;&#xD;
+        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Kind Is="Constant" /&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+                &lt;And&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/And&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Or&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/Or&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Entry DisplayName="Private Properties"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Access Is="Private" /&gt;&#xD;
+            &lt;Kind Is="Property" /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+    &lt;/Group&gt;&#xD;
+    &lt;Group DisplayName="Constructor/Destructor"&gt;&#xD;
+      &lt;Entry DisplayName="Ctor"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;Kind Is="Constructor" /&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+      &lt;Region Name="Disposal"&gt;&#xD;
+        &lt;Entry DisplayName="Dtor"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;Kind Is="Destructor" /&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Dispose()"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+              &lt;Name Is="Dispose" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Dispose(true)"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Virtual /&gt;&#xD;
+                &lt;Override /&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+              &lt;Name Is="Dispose" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Region&gt;&#xD;
+    &lt;/Group&gt;&#xD;
+    &lt;Group DisplayName="Methods"&gt;&#xD;
+      &lt;Group DisplayName="Public"&gt;&#xD;
+        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Static /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Group DisplayName="Internal"&gt;&#xD;
+        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Static /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Group DisplayName="Protected"&gt;&#xD;
+        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Static /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Group DisplayName="Private"&gt;&#xD;
+        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Static /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+    &lt;/Group&gt;&#xD;
+  &lt;/TypePattern&gt;&#xD;
+&lt;/Patterns&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">Copyright (c) ppy Pty Ltd &lt;contact@ppy.sh&gt;. Licensed under the MIT Licence.&#xD;
+See the LICENCE file in the repository root for full licence text.&#xD;
+</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Constants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">&lt;Policy Inspect="False" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=LocalConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=LocalFunctions/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb"&gt;&lt;ExtraRule Prefix="_" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=StaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=TypeParameters/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=9d1af99b_002Dbefe_002D48a4_002D9eb3_002D661384e29869/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Private" Description="private methods"&gt;&lt;ElementKinds&gt;&lt;Kind Name="ASYNC_METHOD" /&gt;&lt;Kind Name="METHOD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=9ffbe43b_002Dc610_002D411b_002D9839_002D1416a146d9b0/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Protected, ProtectedInternal, Internal, Public" Description="internal/protected/public methods"&gt;&lt;ElementKinds&gt;&lt;Kind Name="ASYNC_METHOD" /&gt;&lt;Kind Name="METHOD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=a4c2df6c_002Db202_002D48d5_002Db077_002De678cb548c25/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Private" Description="private properties"&gt;&lt;ElementKinds&gt;&lt;Kind Name="PROPERTY" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=fd562728_002Dc23d_002D417f_002Da19f_002D9d854247fbea/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Protected, ProtectedInternal, Internal, Public" Description="internal/protected/public properties"&gt;&lt;ElementKinds&gt;&lt;Kind Name="PROPERTY" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FCONSTANT/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FCLASS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FCONSTRUCTOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FGLOBAL_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLABEL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLOCAL_005FCONSTRUCTOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLOCAL_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FOBJECT_005FPROPERTY_005FOF_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FPARAMETER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FCLASS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FENUM/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FENUM_005FMEMBER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FINTERFACE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="I" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMIXED_005FENUM/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE_005FEXPORTED/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE_005FLOCAL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FTYPE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FTYPE_005FPARAMETER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="T" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FHTML_005FCONTROL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FTAG_005FNAME/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FTAG_005FPREFIX/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=NAMESPACE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Description/@EntryValue">o!f – Object Initializer: Anchor&amp;Origin</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Field/=anchor/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Field/=anchor/Expression/@EntryValue">constant("Centre")</s:String>
+	<s:Int64 x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Field/=anchor/Order/@EntryValue">0</s:Int64>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Shortcut/@EntryValue">ofao</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Text/@EntryValue">Anchor = Anchor.$anchor$,
+Origin = Anchor.$anchor$,</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Description/@EntryValue">o!f – InternalChildren = []</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Shortcut/@EntryValue">ofic</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Text/@EntryValue">InternalChildren = new Drawable[]
+{
+    $END$
+};</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Description/@EntryValue">o!f – new GridContainer { .. }</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Shortcut/@EntryValue">ofgc</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Text/@EntryValue">new GridContainer
+{
+    RelativeSizeAxes = Axes.Both,
+    Content = new[]
+    {
+        new Drawable[] { $END$ },
+        new Drawable[] { }
+    }
+};</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Description/@EntryValue">o!f – new FillFlowContainer { .. }</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Shortcut/@EntryValue">offf</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Text/@EntryValue">new FillFlowContainer
+{
+    RelativeSizeAxes = Axes.Both,
+    Direction = FillDirection.Vertical,
+    Children = new Drawable[]
+    {
+        $END$
+    }
+},</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Description/@EntryValue">o!f – new Container { .. }</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Shortcut/@EntryValue">ofcont</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Text/@EntryValue">new Container
+{
+    RelativeSizeAxes = Axes.Both,
+    Children = new Drawable[]
+    {
+        $END$
+    }
+},</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Description/@EntryValue">o!f – BackgroundDependencyLoader load()</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Shortcut/@EntryValue">ofbdl</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Text/@EntryValue">[BackgroundDependencyLoader]
+private void load()
+{
+    $END$
+}</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Description/@EntryValue">o!f – new Box { .. }</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Shortcut/@EntryValue">ofbox</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Text/@EntryValue">new Box
+{
+    Colour = Color4.Black,
+    RelativeSizeAxes = Axes.Both,
+},</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Description/@EntryValue">o!f – Children = []</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Shortcut/@EntryValue">ofc</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Text/@EntryValue">Children = new Drawable[]
+{
+    $END$
+};</s:String>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Beatmap/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=beatmaps/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=beatmap_0027s/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=bindable/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Catmull/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Drawables/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=gameplay/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=hitobjects/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=keymods/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Kiai/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboard/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboards/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Playfield/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=resampler/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=ruleset/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=rulesets/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Taiko/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Unranked/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Beatmaps/EmptyScrollingBeatmapConverter.cs b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Beatmaps/EmptyScrollingBeatmapConverter.cs
new file mode 100644
index 0000000000..02fb9a9dd5
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Beatmaps/EmptyScrollingBeatmapConverter.cs
@@ -0,0 +1,32 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using System.Threading;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.EmptyScrolling.Objects;
+
+namespace osu.Game.Rulesets.EmptyScrolling.Beatmaps
+{
+    public class EmptyScrollingBeatmapConverter : BeatmapConverter<EmptyScrollingHitObject>
+    {
+        public EmptyScrollingBeatmapConverter(IBeatmap beatmap, Ruleset ruleset)
+            : base(beatmap, ruleset)
+        {
+        }
+
+        // todo: Check for conversion types that should be supported (ie. Beatmap.HitObjects.Any(h => h is IHasXPosition))
+        // https://github.com/ppy/osu/tree/master/osu.Game/Rulesets/Objects/Types
+        public override bool CanConvert() => true;
+
+        protected override IEnumerable<EmptyScrollingHitObject> ConvertHitObject(HitObject original, IBeatmap beatmap, CancellationToken cancellationToken)
+        {
+            yield return new EmptyScrollingHitObject
+            {
+                Samples = original.Samples,
+                StartTime = original.StartTime,
+            };
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingDifficultyCalculator.cs b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingDifficultyCalculator.cs
new file mode 100644
index 0000000000..7f29c4e712
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingDifficultyCalculator.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.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Difficulty;
+using osu.Game.Rulesets.Difficulty.Preprocessing;
+using osu.Game.Rulesets.Difficulty.Skills;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.EmptyScrolling
+{
+    public class EmptyScrollingDifficultyCalculator : DifficultyCalculator
+    {
+        public EmptyScrollingDifficultyCalculator(Ruleset ruleset, WorkingBeatmap beatmap)
+            : base(ruleset, beatmap)
+        {
+        }
+
+        protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills, double clockRate)
+        {
+            return new DifficultyAttributes(mods, skills, 0);
+        }
+
+        protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate) => Enumerable.Empty<DifficultyHitObject>();
+
+        protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods) => new Skill[0];
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingInputManager.cs b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingInputManager.cs
new file mode 100644
index 0000000000..632e04f301
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingInputManager.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.ComponentModel;
+using osu.Framework.Input.Bindings;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.EmptyScrolling
+{
+    public class EmptyScrollingInputManager : RulesetInputManager<EmptyScrollingAction>
+    {
+        public EmptyScrollingInputManager(RulesetInfo ruleset)
+            : base(ruleset, 0, SimultaneousBindingMode.Unique)
+        {
+        }
+    }
+
+    public enum EmptyScrollingAction
+    {
+        [Description("Button 1")]
+        Button1,
+
+        [Description("Button 2")]
+        Button2,
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingRuleset.cs b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingRuleset.cs
new file mode 100644
index 0000000000..c1d4de52b7
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingRuleset.cs
@@ -0,0 +1,57 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Bindings;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Difficulty;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.EmptyScrolling.Beatmaps;
+using osu.Game.Rulesets.EmptyScrolling.Mods;
+using osu.Game.Rulesets.EmptyScrolling.UI;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.EmptyScrolling
+{
+    public class EmptyScrollingRuleset : Ruleset
+    {
+        public override string Description => "a very emptyscrolling ruleset";
+
+        public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => new DrawableEmptyScrollingRuleset(this, beatmap, mods);
+
+        public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new EmptyScrollingBeatmapConverter(beatmap, this);
+
+        public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new EmptyScrollingDifficultyCalculator(this, beatmap);
+
+        public override IEnumerable<Mod> GetModsFor(ModType type)
+        {
+            switch (type)
+            {
+                case ModType.Automation:
+                    return new[] { new EmptyScrollingModAutoplay() };
+
+                default:
+                    return new Mod[] { null };
+            }
+        }
+
+        public override string ShortName => "emptyscrolling";
+
+        public override IEnumerable<KeyBinding> GetDefaultKeyBindings(int variant = 0) => new[]
+        {
+            new KeyBinding(InputKey.Z, EmptyScrollingAction.Button1),
+            new KeyBinding(InputKey.X, EmptyScrollingAction.Button2),
+        };
+
+        public override Drawable CreateIcon() => new SpriteText
+        {
+            Anchor = Anchor.Centre,
+            Origin = Anchor.Centre,
+            Text = ShortName[0].ToString(),
+            Font = OsuFont.Default.With(size: 18),
+        };
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Mods/EmptyScrollingModAutoplay.cs b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Mods/EmptyScrollingModAutoplay.cs
new file mode 100644
index 0000000000..6dad1ff43b
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Mods/EmptyScrollingModAutoplay.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.Game.Beatmaps;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.EmptyScrolling.Objects;
+using osu.Game.Rulesets.EmptyScrolling.Replays;
+using osu.Game.Scoring;
+using osu.Game.Users;
+using System.Collections.Generic;
+
+namespace osu.Game.Rulesets.EmptyScrolling.Mods
+{
+    public class EmptyScrollingModAutoplay : ModAutoplay<EmptyScrollingHitObject>
+    {
+        public override Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => new Score
+        {
+            ScoreInfo = new ScoreInfo
+            {
+                User = new User { Username = "sample" },
+            },
+            Replay = new EmptyScrollingAutoGenerator(beatmap).Generate(),
+        };
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Objects/Drawables/DrawableEmptyScrollingHitObject.cs b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Objects/Drawables/DrawableEmptyScrollingHitObject.cs
new file mode 100644
index 0000000000..b5ff0cde7c
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Objects/Drawables/DrawableEmptyScrollingHitObject.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 osu.Framework.Graphics;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Scoring;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.EmptyScrolling.Objects.Drawables
+{
+    public class DrawableEmptyScrollingHitObject : DrawableHitObject<EmptyScrollingHitObject>
+    {
+        public DrawableEmptyScrollingHitObject(EmptyScrollingHitObject hitObject)
+            : base(hitObject)
+        {
+            Size = new Vector2(40);
+            Origin = Anchor.Centre;
+
+            // todo: add visuals.
+        }
+
+        protected override void CheckForResult(bool userTriggered, double timeOffset)
+        {
+            if (timeOffset >= 0)
+                // todo: implement judgement logic
+                ApplyResult(r => r.Type = HitResult.Perfect);
+        }
+
+        protected override void UpdateHitStateTransforms(ArmedState state)
+        {
+            const double duration = 1000;
+
+            switch (state)
+            {
+                case ArmedState.Hit:
+                    this.FadeOut(duration, Easing.OutQuint).Expire();
+                    break;
+
+                case ArmedState.Miss:
+
+                    this.FadeColour(Color4.Red, duration);
+                    this.FadeOut(duration, Easing.InQuint).Expire();
+                    break;
+            }
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Objects/EmptyScrollingHitObject.cs b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Objects/EmptyScrollingHitObject.cs
new file mode 100644
index 0000000000..9b469be496
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Objects/EmptyScrollingHitObject.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.Judgements;
+using osu.Game.Rulesets.Objects;
+
+namespace osu.Game.Rulesets.EmptyScrolling.Objects
+{
+    public class EmptyScrollingHitObject : HitObject
+    {
+        public override Judgement CreateJudgement() => new Judgement();
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingAutoGenerator.cs b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingAutoGenerator.cs
new file mode 100644
index 0000000000..7923918842
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingAutoGenerator.cs
@@ -0,0 +1,41 @@
+// Copyright (c) ppy 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.Replays;
+using osu.Game.Rulesets.EmptyScrolling.Objects;
+using osu.Game.Rulesets.Replays;
+
+namespace osu.Game.Rulesets.EmptyScrolling.Replays
+{
+    public class EmptyScrollingAutoGenerator : AutoGenerator
+    {
+        protected Replay Replay;
+        protected List<ReplayFrame> Frames => Replay.Frames;
+
+        public new Beatmap<EmptyScrollingHitObject> Beatmap => (Beatmap<EmptyScrollingHitObject>)base.Beatmap;
+
+        public EmptyScrollingAutoGenerator(IBeatmap beatmap)
+            : base(beatmap)
+        {
+            Replay = new Replay();
+        }
+
+        public override Replay Generate()
+        {
+            Frames.Add(new EmptyScrollingReplayFrame());
+
+            foreach (EmptyScrollingHitObject hitObject in Beatmap.HitObjects)
+            {
+                Frames.Add(new EmptyScrollingReplayFrame
+                {
+                    Time = hitObject.StartTime
+                    // todo: add required inputs and extra frames.
+                });
+            }
+
+            return Replay;
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingFramedReplayInputHandler.cs b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingFramedReplayInputHandler.cs
new file mode 100644
index 0000000000..4b998cfca3
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingFramedReplayInputHandler.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.Collections.Generic;
+using System.Linq;
+using osu.Framework.Input.StateChanges;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Replays;
+
+namespace osu.Game.Rulesets.EmptyScrolling.Replays
+{
+    public class EmptyScrollingFramedReplayInputHandler : FramedReplayInputHandler<EmptyScrollingReplayFrame>
+    {
+        public EmptyScrollingFramedReplayInputHandler(Replay replay)
+            : base(replay)
+        {
+        }
+
+        protected override bool IsImportant(EmptyScrollingReplayFrame frame) => frame.Actions.Any();
+
+        public override void CollectPendingInputs(List<IInput> inputs)
+        {
+            inputs.Add(new ReplayState<EmptyScrollingAction>
+            {
+                PressedActions = CurrentFrame?.Actions ?? new List<EmptyScrollingAction>(),
+            });
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingReplayFrame.cs b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingReplayFrame.cs
new file mode 100644
index 0000000000..2f19cffd2a
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingReplayFrame.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.Game.Rulesets.Replays;
+
+namespace osu.Game.Rulesets.EmptyScrolling.Replays
+{
+    public class EmptyScrollingReplayFrame : ReplayFrame
+    {
+        public List<EmptyScrollingAction> Actions = new List<EmptyScrollingAction>();
+
+        public EmptyScrollingReplayFrame(EmptyScrollingAction? button = null)
+        {
+            if (button.HasValue)
+                Actions.Add(button.Value);
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/UI/DrawableEmptyScrollingRuleset.cs b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/UI/DrawableEmptyScrollingRuleset.cs
new file mode 100644
index 0000000000..620a4abc51
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/UI/DrawableEmptyScrollingRuleset.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.Framework.Allocation;
+using osu.Framework.Input;
+using osu.Game.Beatmaps;
+using osu.Game.Input.Handlers;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.EmptyScrolling.Objects;
+using osu.Game.Rulesets.EmptyScrolling.Objects.Drawables;
+using osu.Game.Rulesets.EmptyScrolling.Replays;
+using osu.Game.Rulesets.UI;
+using osu.Game.Rulesets.UI.Scrolling;
+
+namespace osu.Game.Rulesets.EmptyScrolling.UI
+{
+    [Cached]
+    public class DrawableEmptyScrollingRuleset : DrawableScrollingRuleset<EmptyScrollingHitObject>
+    {
+        public DrawableEmptyScrollingRuleset(EmptyScrollingRuleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
+            : base(ruleset, beatmap, mods)
+        {
+            Direction.Value = ScrollingDirection.Left;
+            TimeRange.Value = 6000;
+        }
+
+        protected override Playfield CreatePlayfield() => new EmptyScrollingPlayfield();
+
+        protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new EmptyScrollingFramedReplayInputHandler(replay);
+
+        public override DrawableHitObject<EmptyScrollingHitObject> CreateDrawableRepresentation(EmptyScrollingHitObject h) => new DrawableEmptyScrollingHitObject(h);
+
+        protected override PassThroughInputManager CreateInputManager() => new EmptyScrollingInputManager(Ruleset?.RulesetInfo);
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/UI/EmptyScrollingPlayfield.cs b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/UI/EmptyScrollingPlayfield.cs
new file mode 100644
index 0000000000..56620e44b3
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/UI/EmptyScrollingPlayfield.cs
@@ -0,0 +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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Rulesets.UI.Scrolling;
+
+namespace osu.Game.Rulesets.EmptyScrolling.UI
+{
+    [Cached]
+    public class EmptyScrollingPlayfield : ScrollingPlayfield
+    {
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AddRangeInternal(new Drawable[]
+            {
+                HitObjectContainer,
+            });
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/osu.Game.Rulesets.EmptyScrolling.csproj b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/osu.Game.Rulesets.EmptyScrolling.csproj
new file mode 100644
index 0000000000..ce0ada6b6e
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/osu.Game.Rulesets.EmptyScrolling.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup Label="Project">
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <AssemblyTitle>osu.Game.Rulesets.Sample</AssemblyTitle>
+    <OutputType>Library</OutputType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <RootNamespace>osu.Game.Rulesets.EmptyScrolling</RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\**" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="ppy.osu.Game" Version="2021.331.0" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-scrolling-example/.editorconfig b/Templates/Rulesets/ruleset-scrolling-example/.editorconfig
new file mode 100644
index 0000000000..24825b7c42
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/.editorconfig
@@ -0,0 +1,27 @@
+# EditorConfig is awesome: http://editorconfig.org
+root = true
+
+[*.cs]
+end_of_line = crlf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+#Roslyn naming styles
+
+#PascalCase for public and protected members
+dotnet_naming_style.pascalcase.capitalization = pascal_case
+dotnet_naming_symbols.public_members.applicable_accessibilities = public,internal,protected,protected_internal
+dotnet_naming_symbols.public_members.applicable_kinds = property,method,field,event,delegate
+dotnet_naming_rule.public_members_pascalcase.severity = suggestion
+dotnet_naming_rule.public_members_pascalcase.symbols = public_members
+dotnet_naming_rule.public_members_pascalcase.style = pascalcase
+
+#camelCase for private members
+dotnet_naming_style.camelcase.capitalization = camel_case
+dotnet_naming_symbols.private_members.applicable_accessibilities = private
+dotnet_naming_symbols.private_members.applicable_kinds = property,method,field,event,delegate
+dotnet_naming_rule.private_members_camelcase.severity = suggestion
+dotnet_naming_rule.private_members_camelcase.symbols = private_members
+dotnet_naming_rule.private_members_camelcase.style = camelcase
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-scrolling-example/.gitignore b/Templates/Rulesets/ruleset-scrolling-example/.gitignore
new file mode 100644
index 0000000000..940794e60f
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/.gitignore
@@ -0,0 +1,288 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+**/Properties/launchSettings.json
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# TODO: Comment the next line if you want to checkin your web deploy settings
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Typescript v1 declaration files
+typings/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+# CodeRush
+.cr/
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
diff --git a/Templates/Rulesets/ruleset-scrolling-example/.template.config/template.json b/Templates/Rulesets/ruleset-scrolling-example/.template.config/template.json
new file mode 100644
index 0000000000..a1c097f1c8
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/.template.config/template.json
@@ -0,0 +1,16 @@
+{
+    "$schema": "http://json.schemastore.org/template",
+    "author": "ppy Pty Ltd",
+    "classifications": [
+        "Console"
+    ],
+    "name": "osu! ruleset (scrolling pippidon example)",
+    "identity": "ppy.osu.Game.Templates.Rulesets.Scrolling.Pippidon",
+    "shortName": "ruleset-scrolling-example",
+    "tags": {
+        "language": "C#",
+        "type": "project"
+    },
+    "sourceName": "Pippidon",
+    "preferNameDirectory": true
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/launch.json b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/launch.json
new file mode 100644
index 0000000000..bd9db14259
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/launch.json
@@ -0,0 +1,31 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "VisualTests (Debug)",
+            "type": "coreclr",
+            "request": "launch",
+            "program": "dotnet",
+            "args": [
+                "${workspaceRoot}/bin/Debug/net5.0/osu.Game.Rulesets.Pippidon.Tests.dll"
+            ],
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Debug)",
+            "env": {},
+            "console": "internalConsole"
+        },
+        {
+            "name": "VisualTests (Release)",
+            "type": "coreclr",
+            "request": "launch",
+            "program": "dotnet",
+            "args": [
+                "${workspaceRoot}/bin/Release/net5.0/osu.Game.Rulesets.Pippidon.Tests.dll"
+            ],
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Release)",
+            "env": {},
+            "console": "internalConsole"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/tasks.json b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/tasks.json
new file mode 100644
index 0000000000..0ee07c1036
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/.vscode/tasks.json
@@ -0,0 +1,47 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Build (Debug)",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "build",
+                "--no-restore",
+                "osu.Game.Rulesets.Pippidon.Tests.csproj",
+                "-p:GenerateFullPaths=true",
+                "-m",
+                "-verbosity:m"
+            ],
+            "group": "build",
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Build (Release)",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "build",
+                "--no-restore",
+                "osu.Game.Rulesets.Pippidon.Tests.csproj",
+                "-p:Configuration=Release",
+                "-p:GenerateFullPaths=true",
+                "-m",
+                "-verbosity:m"
+            ],
+            "group": "build",
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Restore",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "restore"
+            ],
+            "problemMatcher": []
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/TestSceneOsuGame.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/TestSceneOsuGame.cs
new file mode 100644
index 0000000000..270d906b01
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/TestSceneOsuGame.cs
@@ -0,0 +1,32 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Platform;
+using osu.Game.Tests.Visual;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Pippidon.Tests
+{
+    public class TestSceneOsuGame : OsuTestScene
+    {
+        [BackgroundDependencyLoader]
+        private void load(GameHost host, OsuGameBase gameBase)
+        {
+            OsuGame game = new OsuGame();
+            game.SetHost(host);
+
+            Children = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4.Black,
+                },
+                game
+            };
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/TestSceneOsuPlayer.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/TestSceneOsuPlayer.cs
new file mode 100644
index 0000000000..f00528900c
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/TestSceneOsuPlayer.cs
@@ -0,0 +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 NUnit.Framework;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Pippidon.Tests
+{
+    [TestFixture]
+    public class TestSceneOsuPlayer : PlayerTestScene
+    {
+        protected override Ruleset CreatePlayerRuleset() => new PippidonRuleset();
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/VisualTestRunner.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/VisualTestRunner.cs
new file mode 100644
index 0000000000..fd6bd9b714
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/VisualTestRunner.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.
+
+using System;
+using osu.Framework;
+using osu.Framework.Platform;
+using osu.Game.Tests;
+
+namespace osu.Game.Rulesets.Pippidon.Tests
+{
+    public static class VisualTestRunner
+    {
+        [STAThread]
+        public static int Main(string[] args)
+        {
+            using (DesktopGameHost host = Host.GetSuitableHost(@"osu", true))
+            {
+                host.Run(new OsuTestBrowser());
+                return 0;
+            }
+        }
+    }
+}
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
new file mode 100644
index 0000000000..afa7b03536
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <StartupObject>osu.Game.Rulesets.Pippidon.Tests.VisualTestRunner</StartupObject>
+  </PropertyGroup>
+  <ItemGroup Label="Service">
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+  <PropertyGroup>
+    <GenerateProgramFile>false</GenerateProgramFile>
+  </PropertyGroup>
+  <ItemGroup Label="Package References">
+    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj" />
+  </ItemGroup>
+  <PropertyGroup Label="Project">
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <RootNamespace>osu.Game.Rulesets.Pippidon.Tests</RootNamespace>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.sln b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.sln
new file mode 100644
index 0000000000..bccffcd7ff
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.sln
@@ -0,0 +1,96 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29123.88
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Game.Rulesets.Pippidon", "osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj", "{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.Pippidon.Tests", "osu.Game.Rulesets.Pippidon.Tests\osu.Game.Rulesets.Pippidon.Tests.csproj", "{B4577C85-CB83-462A-BCE3-22FFEB16311D}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+		VisualTests|Any CPU = VisualTests|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.VisualTests|Any CPU.ActiveCfg = Release|Any CPU
+		{5AE1F0F1-DAFA-46E7-959C-DA233B7C87E9}.VisualTests|Any CPU.Build.0 = Release|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.VisualTests|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4577C85-CB83-462A-BCE3-22FFEB16311D}.VisualTests|Any CPU.Build.0 = Debug|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {671B0BEC-2403-45B0-9357-2C97CC517668}
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		Policies = $0
+		$0.TextStylePolicy = $1
+		$1.EolMarker = Windows
+		$1.inheritsSet = VisualStudio
+		$1.inheritsScope = text/plain
+		$1.scope = text/x-csharp
+		$0.CSharpFormattingPolicy = $2
+		$2.IndentSwitchSection = True
+		$2.NewLinesForBracesInProperties = True
+		$2.NewLinesForBracesInAccessors = True
+		$2.NewLinesForBracesInAnonymousMethods = True
+		$2.NewLinesForBracesInControlBlocks = True
+		$2.NewLinesForBracesInAnonymousTypes = True
+		$2.NewLinesForBracesInObjectCollectionArrayInitializers = True
+		$2.NewLinesForBracesInLambdaExpressionBody = True
+		$2.NewLineForElse = True
+		$2.NewLineForCatch = True
+		$2.NewLineForFinally = True
+		$2.NewLineForMembersInObjectInit = True
+		$2.NewLineForMembersInAnonymousTypes = True
+		$2.NewLineForClausesInQuery = True
+		$2.SpacingAfterMethodDeclarationName = False
+		$2.SpaceAfterMethodCallName = False
+		$2.SpaceBeforeOpenSquareBracket = False
+		$2.inheritsSet = Mono
+		$2.inheritsScope = text/x-csharp
+		$2.scope = text/x-csharp
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		Policies = $0
+		$0.TextStylePolicy = $1
+		$1.EolMarker = Windows
+		$1.inheritsSet = VisualStudio
+		$1.inheritsScope = text/plain
+		$1.scope = text/x-csharp
+		$0.CSharpFormattingPolicy = $2
+		$2.IndentSwitchSection = True
+		$2.NewLinesForBracesInProperties = True
+		$2.NewLinesForBracesInAccessors = True
+		$2.NewLinesForBracesInAnonymousMethods = True
+		$2.NewLinesForBracesInControlBlocks = True
+		$2.NewLinesForBracesInAnonymousTypes = True
+		$2.NewLinesForBracesInObjectCollectionArrayInitializers = True
+		$2.NewLinesForBracesInLambdaExpressionBody = True
+		$2.NewLineForElse = True
+		$2.NewLineForCatch = True
+		$2.NewLineForFinally = True
+		$2.NewLineForMembersInObjectInit = True
+		$2.NewLineForMembersInAnonymousTypes = True
+		$2.NewLineForClausesInQuery = True
+		$2.SpacingAfterMethodDeclarationName = False
+		$2.SpaceAfterMethodCallName = False
+		$2.SpaceBeforeOpenSquareBracket = False
+		$2.inheritsSet = Mono
+		$2.inheritsScope = text/x-csharp
+		$2.scope = text/x-csharp
+	EndGlobalSection
+EndGlobal
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.sln.DotSettings b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.sln.DotSettings
new file mode 100644
index 0000000000..c3e274569d
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.sln.DotSettings
@@ -0,0 +1,877 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Efnt/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Emp3/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=_002A_002Epng/@EntryIndexedValue">True</s:Boolean>
+	<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/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/=ArrangeMissingParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeConstructorOrDestructorBody/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeLocalFunctionBody/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeMethodOrOperatorBody/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeModifiersOrder/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue"></s:String>
+	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexRemoved">True</s:Boolean>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeMemberModifiers/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeModifiers/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignedValueIsNeverUsed/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignNullToNotNullAttribute/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadAttributeBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadBracesSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadChildStatementIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadColonSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadCommaSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadControlBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadControlBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadDeclarationBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadDeclarationBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadEmptyBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadExpressionBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadExpressionBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadGenericBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadLinqLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadListLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadMemberAccessSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadNamespaceBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadParensLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadParensSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadPreprocessorIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSemicolonSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSpacesAfterKeyword/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSquareBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSwitchBracesIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadSymbolSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CanBeReplacedWithTryCastAndCheckForNull/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CheckForReferenceEqualityInstead_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CheckForReferenceEqualityInstead_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ClassNeverInstantiated_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ClassNeverInstantiated_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ClassWithVirtualMembersNeverInherited_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CollectionNeverQueried_002EGlobal/@EntryIndexedValue">SUGGESTION</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CollectionNeverQueried_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CommentTypo/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CompareOfFloatsByEqualityOperator/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertClosureToMethodGroup/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfDoToWhile/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToConditionalTernaryExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToNullCoalescingExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfToOrExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertNullableToShortForm/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertPropertyToExpressionBody/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoProperty/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToConstant_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLambdaExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLocalFunction/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToStaticClass/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=DoubleNegationOperator/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EmptyGeneralCatchClause/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EventNeverSubscribedTo_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EventNeverSubscribedTo_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ForCanBeConvertedToForeach/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=IdentifierTypo/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ImpureMethodCallOnReadonlyValueField/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InconsistentNaming/@EntryIndexedValue">ERROR</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=IncorrectBlankLinesNearBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InheritdocConsiderUsage/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InlineOutVariableDeclaration/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InvertIf/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InvokeAsExtensionMethod/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=JoinDeclarationAndInitializer/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=JoinNullCheckWithUsage/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBeMadeStatic_002ELocal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBePrivate_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBePrivate_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBeProtected_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeCastWithTypeCheck/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeConditionalExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeSequentialChecks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodSupportsCancellation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingBlankLines/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingLinebreak/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingSpace/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MoreSpecificForeachVariableTypeAvailable/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MultipleSpaces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MultipleStatementsOnOneLine/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MultipleTypeMembersOnOneLine/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=NestedStringInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=NotAccessedField_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=OutdentIsOffPrevLevel/@EntryIndexedValue">WARNING</s:String>
+	<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/=PossibleInterfaceMemberAmbiguity/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PossibleMultipleEnumeration/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PrivateVariableCanBeMadeReadonly/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PublicConstructorInAbstractClass/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantArgumentDefaultValue/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantArrayCreationExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantAttributeParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantAttributeUsageProperty/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantBlankLines/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCaseLabel/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInAttributeList/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInEnumDeclaration/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInInitializer/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantEmptyObjectCreationArgumentList/@EntryIndexedValue">WARNING</s:String>
+	
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantExplicitParamsArrayCreation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantImmediateDelegateInvocation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLambdaSignatureParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLinebreak/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantSpace/@EntryIndexedValue">WARNING</s:String>
+	<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/=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>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveToList_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E3/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithLastOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithLastOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithLastOrDefault_002E3/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithLastOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002E3/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EAny_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EAny_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ECount_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ECount_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EFirst_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EFirst_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EFirstOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EFirstOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELast_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELast_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELastOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELastOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ELongCount/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingle_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingle_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingleOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002ESingleOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithOfType_002EWhere/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSimpleAssignment_002EFalse/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSimpleAssignment_002ETrue/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleAssignment_002EFalse/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleAssignment_002ETrue/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToAny/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToCount/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirst/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirstOrDefault/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToLast/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToLastOrDefault/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToSingle/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToSingleOrDefault/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E2/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E3/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SeparateControlTransferStatement/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringLiteralTypo/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FBuiltInTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FSimpleTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SwitchStatementMissingSomeCases/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TabsAndSpacesMismatch/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TabsAreDisallowed/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TabsOutsideIndent/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TooWideLocalVariableScope/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TryCastAlwaysSucceeds/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnassignedField_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnnecessaryWhitespace/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedAutoPropertyAccessor_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMemberHierarchy_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMemberInSuper_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMember_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMember_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002ELocal/@EntryIndexedValue">HINT</s:String>
+	
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedParameter_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseCollectionCountProperty/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInFormatString/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNameofExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexedValue"></s:String>
+	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexRemoved">True</s:Boolean>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNullPropagation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseObjectOrCollectionInitializer/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UsePatternMatching/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseStringInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VariableCanBeMadeConst/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberCallInConstructor/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002ELocal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=WrongIndentSize/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Code_0020Cleanup_0020_0028peppy_0029/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Code Cleanup (peppy)"&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_EXPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;ALWAYS_EXPLICIT&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_EXPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="False" ArrangeTypeMemberAccessModifier="False" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="False" ArrangeBraces="False" ArrangeAttributes="False" ArrangeArgumentsStyle="False" /&gt;&lt;XAMLCollapseEmptyTags&gt;False&lt;/XAMLCollapseEmptyTags&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;/Profile&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeCleanup/RecentlyUsedProfile/@EntryValue">Code Cleanup (peppy)</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/LOCAL_FUNCTION_BODY/@EntryValue">ExpressionBody</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/METHOD_OR_OPERATOR_BODY/@EntryValue">ExpressionBody</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/USE_HEURISTICS_FOR_BODY_STYLE/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_LINQ_QUERY/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_CALLS_CHAIN/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_EXTENDS_LIST/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_FOR_STMT/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_PARAMETER/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTIPLE_DECLARATION/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTLINE_TYPE_PARAMETER_CONSTRAINS/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTLINE_TYPE_PARAMETER_LIST/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ANONYMOUS_METHOD_DECLARATION_BRACES/@EntryValue">NEXT_LINE</s:String>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BEFORE_BLOCK_STATEMENTS/@EntryValue">1</s:Int64>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BEFORE_CASE/@EntryValue">1</s:Int64>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INITIALIZER_BRACES/@EntryValue">NEXT_LINE</s:String>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_CODE/@EntryValue">1</s:Int64>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue">1</s:Int64>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/LINE_FEED_AT_FILE_END/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AROUND_MULTIPLICATIVE_OP/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_SIZEOF_PARENTHESES/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_TYPEOF_PARENTHESES/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHING_EMPTY_BRACES/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/STICK_COMMENT/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_ARRAY_INITIALIZER_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_BINARY_OPSIGN/@EntryValue">True</s:Boolean>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">200</s:Int64>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_OBJECT_AND_COLLECTION_INITIALIZER_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/EncapsulateField/MakeFieldPrivate/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/EncapsulateField/UseAutoProperty/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AABB/@EntryIndexedValue">AABB</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=API/@EntryIndexedValue">API</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BPM/@EntryIndexedValue">BPM</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GC/@EntryIndexedValue">GC</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GL/@EntryIndexedValue">GL</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GLSL/@EntryIndexedValue">GLSL</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HID/@EntryIndexedValue">HID</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HUD/@EntryIndexedValue">HUD</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IL/@EntryIndexedValue">IL</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IPC/@EntryIndexedValue">IPC</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JIT/@EntryIndexedValue">JIT</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LTRB/@EntryIndexedValue">LTRB</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MD/@EntryIndexedValue">MD5</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NS/@EntryIndexedValue">NS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=OS/@EntryIndexedValue">OS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PM/@EntryIndexedValue">PM</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RGB/@EntryIndexedValue">RGB</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RNG/@EntryIndexedValue">RNG</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SHA/@EntryIndexedValue">SHA</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SRGB/@EntryIndexedValue">SRGB</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TK/@EntryIndexedValue">TK</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SS/@EntryIndexedValue">SS</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PP/@EntryIndexedValue">PP</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GMT/@EntryIndexedValue">GMT</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=QAT/@EntryIndexedValue">QAT</s:String>
+  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BNG/@EntryIndexedValue">BNG</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UI/@EntryIndexedValue">UI</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpNaming/ApplyAutoDetectedRules/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeStyle/CSharpFileLayoutPatterns/Pattern/@EntryValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&#xD;
+&lt;Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"&gt;&#xD;
+  &lt;TypePattern DisplayName="COM interfaces or structs"&gt;&#xD;
+    &lt;TypePattern.Match&gt;&#xD;
+      &lt;Or&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="Interface" /&gt;&#xD;
+          &lt;Or&gt;&#xD;
+            &lt;HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /&gt;&#xD;
+            &lt;HasAttribute Name="System.Runtime.InteropServices.ComImport" /&gt;&#xD;
+          &lt;/Or&gt;&#xD;
+        &lt;/And&gt;&#xD;
+        &lt;Kind Is="Struct" /&gt;&#xD;
+      &lt;/Or&gt;&#xD;
+    &lt;/TypePattern.Match&gt;&#xD;
+  &lt;/TypePattern&gt;&#xD;
+  &lt;TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"&gt;&#xD;
+    &lt;TypePattern.Match&gt;&#xD;
+      &lt;And&gt;&#xD;
+        &lt;Kind Is="Class" /&gt;&#xD;
+        &lt;HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /&gt;&#xD;
+      &lt;/And&gt;&#xD;
+    &lt;/TypePattern.Match&gt;&#xD;
+    &lt;Entry DisplayName="Setup/Teardown Methods"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="Method" /&gt;&#xD;
+          &lt;Or&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="True" /&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="True" /&gt;&#xD;
+          &lt;/Or&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+    &lt;Entry DisplayName="All other members" /&gt;&#xD;
+    &lt;Entry Priority="100" DisplayName="Test Methods"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="Method" /&gt;&#xD;
+          &lt;HasAttribute Name="NUnit.Framework.TestAttribute" /&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+      &lt;Entry.SortBy&gt;&#xD;
+        &lt;Name /&gt;&#xD;
+      &lt;/Entry.SortBy&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+  &lt;/TypePattern&gt;&#xD;
+  &lt;TypePattern DisplayName="Default Pattern"&gt;&#xD;
+    &lt;Group DisplayName="Fields/Properties"&gt;&#xD;
+      &lt;Group DisplayName="Public Fields"&gt;&#xD;
+        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Kind Is="Constant" /&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+                &lt;And&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/And&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Or&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/Or&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Entry DisplayName="Public Properties"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Access Is="Public" /&gt;&#xD;
+            &lt;Kind Is="Property" /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+      &lt;Group DisplayName="Internal Fields"&gt;&#xD;
+        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Kind Is="Constant" /&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+                &lt;And&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/And&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Or&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/Or&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Entry DisplayName="Internal Properties"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Access Is="Internal" /&gt;&#xD;
+            &lt;Kind Is="Property" /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+      &lt;Group DisplayName="Protected Fields"&gt;&#xD;
+        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Kind Is="Constant" /&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+                &lt;And&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/And&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Or&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/Or&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Entry DisplayName="Protected Properties"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Access Is="Protected" /&gt;&#xD;
+            &lt;Kind Is="Property" /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+      &lt;Group DisplayName="Private Fields"&gt;&#xD;
+        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Kind Is="Constant" /&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+                &lt;And&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/And&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Readonly /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Or&gt;&#xD;
+                  &lt;Static /&gt;&#xD;
+                  &lt;Readonly /&gt;&#xD;
+                &lt;/Or&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Entry DisplayName="Private Properties"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Access Is="Private" /&gt;&#xD;
+            &lt;Kind Is="Property" /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+    &lt;/Group&gt;&#xD;
+    &lt;Group DisplayName="Constructor/Destructor"&gt;&#xD;
+      &lt;Entry DisplayName="Ctor"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;Kind Is="Constructor" /&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+      &lt;Region Name="Disposal"&gt;&#xD;
+        &lt;Entry DisplayName="Dtor"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;Kind Is="Destructor" /&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Dispose()"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+              &lt;Name Is="Dispose" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Dispose(true)"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Or&gt;&#xD;
+                &lt;Virtual /&gt;&#xD;
+                &lt;Override /&gt;&#xD;
+              &lt;/Or&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+              &lt;Name Is="Dispose" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Region&gt;&#xD;
+    &lt;/Group&gt;&#xD;
+    &lt;Group DisplayName="Methods"&gt;&#xD;
+      &lt;Group DisplayName="Public"&gt;&#xD;
+        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Public" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Static /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Group DisplayName="Internal"&gt;&#xD;
+        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Internal" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Static /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Group DisplayName="Protected"&gt;&#xD;
+        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Protected" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Static /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+      &lt;Group DisplayName="Private"&gt;&#xD;
+        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Static /&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+        &lt;Entry DisplayName="Methods"&gt;&#xD;
+          &lt;Entry.Match&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Access Is="Private" /&gt;&#xD;
+              &lt;Not&gt;&#xD;
+                &lt;Static /&gt;&#xD;
+              &lt;/Not&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/Entry.Match&gt;&#xD;
+        &lt;/Entry&gt;&#xD;
+      &lt;/Group&gt;&#xD;
+    &lt;/Group&gt;&#xD;
+  &lt;/TypePattern&gt;&#xD;
+&lt;/Patterns&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">Copyright (c) ppy Pty Ltd &lt;contact@ppy.sh&gt;. Licensed under the MIT Licence.&#xD;
+See the LICENCE file in the repository root for full licence text.&#xD;
+</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Constants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">&lt;Policy Inspect="False" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=LocalConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=LocalFunctions/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb"&gt;&lt;ExtraRule Prefix="_" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=StaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=TypeParameters/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=9d1af99b_002Dbefe_002D48a4_002D9eb3_002D661384e29869/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Private" Description="private methods"&gt;&lt;ElementKinds&gt;&lt;Kind Name="ASYNC_METHOD" /&gt;&lt;Kind Name="METHOD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=9ffbe43b_002Dc610_002D411b_002D9839_002D1416a146d9b0/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Protected, ProtectedInternal, Internal, Public" Description="internal/protected/public methods"&gt;&lt;ElementKinds&gt;&lt;Kind Name="ASYNC_METHOD" /&gt;&lt;Kind Name="METHOD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=a4c2df6c_002Db202_002D48d5_002Db077_002De678cb548c25/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Private" Description="private properties"&gt;&lt;ElementKinds&gt;&lt;Kind Name="PROPERTY" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=fd562728_002Dc23d_002D417f_002Da19f_002D9d854247fbea/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Protected, ProtectedInternal, Internal, Public" Description="internal/protected/public properties"&gt;&lt;ElementKinds&gt;&lt;Kind Name="PROPERTY" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FCONSTANT/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FCLASS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FCONSTRUCTOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FGLOBAL_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLABEL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLOCAL_005FCONSTRUCTOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLOCAL_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FOBJECT_005FPROPERTY_005FOF_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FPARAMETER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FCLASS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FENUM/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FENUM_005FMEMBER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FINTERFACE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="I" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMIXED_005FENUM/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE_005FEXPORTED/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE_005FLOCAL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FTYPE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FTYPE_005FPARAMETER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="T" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FHTML_005FCONTROL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FTAG_005FNAME/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FTAG_005FPREFIX/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=NAMESPACE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Description/@EntryValue">o!f – Object Initializer: Anchor&amp;Origin</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Field/=anchor/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Field/=anchor/Expression/@EntryValue">constant("Centre")</s:String>
+	<s:Int64 x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Field/=anchor/Order/@EntryValue">0</s:Int64>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Shortcut/@EntryValue">ofao</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Text/@EntryValue">Anchor = Anchor.$anchor$,
+Origin = Anchor.$anchor$,</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Description/@EntryValue">o!f – InternalChildren = []</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Shortcut/@EntryValue">ofic</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Text/@EntryValue">InternalChildren = new Drawable[]
+{
+    $END$
+};</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Description/@EntryValue">o!f – new GridContainer { .. }</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Shortcut/@EntryValue">ofgc</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Text/@EntryValue">new GridContainer
+{
+    RelativeSizeAxes = Axes.Both,
+    Content = new[]
+    {
+        new Drawable[] { $END$ },
+        new Drawable[] { }
+    }
+};</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Description/@EntryValue">o!f – new FillFlowContainer { .. }</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Shortcut/@EntryValue">offf</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Text/@EntryValue">new FillFlowContainer
+{
+    RelativeSizeAxes = Axes.Both,
+    Direction = FillDirection.Vertical,
+    Children = new Drawable[]
+    {
+        $END$
+    }
+},</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Description/@EntryValue">o!f – new Container { .. }</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Shortcut/@EntryValue">ofcont</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Text/@EntryValue">new Container
+{
+    RelativeSizeAxes = Axes.Both,
+    Children = new Drawable[]
+    {
+        $END$
+    }
+},</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Description/@EntryValue">o!f – BackgroundDependencyLoader load()</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Shortcut/@EntryValue">ofbdl</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Text/@EntryValue">[BackgroundDependencyLoader]
+private void load()
+{
+    $END$
+}</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Description/@EntryValue">o!f – new Box { .. }</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Shortcut/@EntryValue">ofbox</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Text/@EntryValue">new Box
+{
+    Colour = Color4.Black,
+    RelativeSizeAxes = Axes.Both,
+},</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Description/@EntryValue">o!f – Children = []</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Shortcut/@EntryValue">ofc</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Text/@EntryValue">Children = new Drawable[]
+{
+    $END$
+};</s:String>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Beatmap/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=beatmaps/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=beatmap_0027s/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=bindable/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Catmull/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Drawables/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=gameplay/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=hitobjects/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=keymods/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Kiai/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboard/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboards/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Playfield/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=resampler/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=ruleset/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=rulesets/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Taiko/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Unranked/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Beatmaps/PippidonBeatmapConverter.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Beatmaps/PippidonBeatmapConverter.cs
new file mode 100644
index 0000000000..8f0b31ef1b
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Beatmaps/PippidonBeatmapConverter.cs
@@ -0,0 +1,45 @@
+// Copyright (c) ppy 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 System.Threading;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Pippidon.Objects;
+using osu.Game.Rulesets.Pippidon.UI;
+using osuTK;
+
+namespace osu.Game.Rulesets.Pippidon.Beatmaps
+{
+    public class PippidonBeatmapConverter : BeatmapConverter<PippidonHitObject>
+    {
+        private readonly float minPosition;
+        private readonly float maxPosition;
+
+        public PippidonBeatmapConverter(IBeatmap beatmap, Ruleset ruleset)
+            : base(beatmap, ruleset)
+        {
+            minPosition = beatmap.HitObjects.Min(getUsablePosition);
+            maxPosition = beatmap.HitObjects.Max(getUsablePosition);
+        }
+
+        public override bool CanConvert() => Beatmap.HitObjects.All(h => h is IHasXPosition && h is IHasYPosition);
+
+        protected override IEnumerable<PippidonHitObject> ConvertHitObject(HitObject original, IBeatmap beatmap, CancellationToken cancellationToken)
+        {
+            yield return new PippidonHitObject
+            {
+                Samples = original.Samples,
+                StartTime = original.StartTime,
+                Lane = getLane(original)
+            };
+        }
+
+        private int getLane(HitObject hitObject) => (int)MathHelper.Clamp(
+            (getUsablePosition(hitObject) - minPosition) / (maxPosition - minPosition) * PippidonPlayfield.LANE_COUNT, 0, PippidonPlayfield.LANE_COUNT - 1);
+
+        private float getUsablePosition(HitObject h) => (h as IHasYPosition)?.Y ?? ((IHasXPosition)h).X;
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Mods/PippidonModAutoplay.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Mods/PippidonModAutoplay.cs
new file mode 100644
index 0000000000..8ea334c99c
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Mods/PippidonModAutoplay.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 System.Collections.Generic;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Pippidon.Objects;
+using osu.Game.Rulesets.Pippidon.Replays;
+using osu.Game.Scoring;
+using osu.Game.Users;
+
+namespace osu.Game.Rulesets.Pippidon.Mods
+{
+    public class PippidonModAutoplay : ModAutoplay<PippidonHitObject>
+    {
+        public override Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => new Score
+        {
+            ScoreInfo = new ScoreInfo
+            {
+                User = new User { Username = "sample" },
+            },
+            Replay = new PippidonAutoGenerator(beatmap).Generate(),
+        };
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Objects/Drawables/DrawablePippidonHitObject.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Objects/Drawables/DrawablePippidonHitObject.cs
new file mode 100644
index 0000000000..e458cacef9
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Objects/Drawables/DrawablePippidonHitObject.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.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Audio;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Pippidon.UI;
+using osu.Game.Rulesets.Scoring;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Pippidon.Objects.Drawables
+{
+    public class DrawablePippidonHitObject : DrawableHitObject<PippidonHitObject>
+    {
+        private BindableNumber<int> currentLane;
+
+        public DrawablePippidonHitObject(PippidonHitObject hitObject)
+            : base(hitObject)
+        {
+            Size = new Vector2(40);
+
+            Origin = Anchor.Centre;
+            Y = hitObject.Lane * PippidonPlayfield.LANE_HEIGHT;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(PippidonPlayfield playfield, TextureStore textures)
+        {
+            AddInternal(new Sprite
+            {
+                RelativeSizeAxes = Axes.Both,
+                Texture = textures.Get("coin"),
+            });
+
+            currentLane = playfield.CurrentLane.GetBoundCopy();
+        }
+
+        public override IEnumerable<HitSampleInfo> GetSamples() => new[]
+        {
+            new HitSampleInfo(HitSampleInfo.HIT_NORMAL, SampleControlPoint.DEFAULT_BANK)
+        };
+
+        protected override void CheckForResult(bool userTriggered, double timeOffset)
+        {
+            if (timeOffset >= 0)
+                ApplyResult(r => r.Type = currentLane.Value == HitObject.Lane ? HitResult.Perfect : HitResult.Miss);
+        }
+
+        protected override void UpdateHitStateTransforms(ArmedState state)
+        {
+            switch (state)
+            {
+                case ArmedState.Hit:
+                    this.ScaleTo(5, 1500, Easing.OutQuint).FadeOut(1500, Easing.OutQuint).Expire();
+                    break;
+
+                case ArmedState.Miss:
+
+                    const double duration = 1000;
+
+                    this.ScaleTo(0.8f, duration, Easing.OutQuint);
+                    this.MoveToOffset(new Vector2(0, 10), duration, Easing.In);
+                    this.FadeColour(Color4.Red, duration / 2, Easing.OutQuint).Then().FadeOut(duration / 2, Easing.InQuint).Expire();
+                    break;
+            }
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Objects/PippidonHitObject.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Objects/PippidonHitObject.cs
new file mode 100644
index 0000000000..9dd135479f
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Objects/PippidonHitObject.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.Judgements;
+using osu.Game.Rulesets.Objects;
+
+namespace osu.Game.Rulesets.Pippidon.Objects
+{
+    public class PippidonHitObject : HitObject
+    {
+        /// <summary>
+        /// Range = [-1,1]
+        /// </summary>
+        public int Lane;
+
+        public override Judgement CreateJudgement() => new Judgement();
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/PippidonDifficultyCalculator.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/PippidonDifficultyCalculator.cs
new file mode 100644
index 0000000000..f6340f6c25
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/PippidonDifficultyCalculator.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.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Difficulty;
+using osu.Game.Rulesets.Difficulty.Preprocessing;
+using osu.Game.Rulesets.Difficulty.Skills;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Pippidon
+{
+    public class PippidonDifficultyCalculator : DifficultyCalculator
+    {
+        public PippidonDifficultyCalculator(Ruleset ruleset, WorkingBeatmap beatmap)
+            : base(ruleset, beatmap)
+        {
+        }
+
+        protected override DifficultyAttributes CreateDifficultyAttributes(IBeatmap beatmap, Mod[] mods, Skill[] skills, double clockRate)
+        {
+            return new DifficultyAttributes(mods, skills, 0);
+        }
+
+        protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate) => Enumerable.Empty<DifficultyHitObject>();
+
+        protected override Skill[] CreateSkills(IBeatmap beatmap, Mod[] mods) => new Skill[0];
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/PippidonInputManager.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/PippidonInputManager.cs
new file mode 100644
index 0000000000..c9e6e6faaa
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/PippidonInputManager.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.ComponentModel;
+using osu.Framework.Input.Bindings;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.Pippidon
+{
+    public class PippidonInputManager : RulesetInputManager<PippidonAction>
+    {
+        public PippidonInputManager(RulesetInfo ruleset)
+            : base(ruleset, 0, SimultaneousBindingMode.Unique)
+        {
+        }
+    }
+
+    public enum PippidonAction
+    {
+        [Description("Move up")]
+        MoveUp,
+
+        [Description("Move down")]
+        MoveDown,
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/PippidonRuleset.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/PippidonRuleset.cs
new file mode 100644
index 0000000000..ede00f1510
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/PippidonRuleset.cs
@@ -0,0 +1,55 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.Input.Bindings;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Difficulty;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Pippidon.Beatmaps;
+using osu.Game.Rulesets.Pippidon.Mods;
+using osu.Game.Rulesets.Pippidon.UI;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.Pippidon
+{
+    public class PippidonRuleset : Ruleset
+    {
+        public override string Description => "gather the osu!coins";
+
+        public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => new DrawablePippidonRuleset(this, beatmap, mods);
+
+        public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new PippidonBeatmapConverter(beatmap, this);
+
+        public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new PippidonDifficultyCalculator(this, beatmap);
+
+        public override IEnumerable<Mod> GetModsFor(ModType type)
+        {
+            switch (type)
+            {
+                case ModType.Automation:
+                    return new[] { new PippidonModAutoplay() };
+
+                default:
+                    return new Mod[] { null };
+            }
+        }
+
+        public override string ShortName => "pippidon";
+
+        public override IEnumerable<KeyBinding> GetDefaultKeyBindings(int variant = 0) => new[]
+        {
+            new KeyBinding(InputKey.W, PippidonAction.MoveUp),
+            new KeyBinding(InputKey.S, PippidonAction.MoveDown),
+        };
+
+        public override Drawable CreateIcon() => new Sprite
+        {
+            Margin = new MarginPadding { Top = 3 },
+            Texture = new TextureStore(new TextureLoaderStore(CreateResourceStore()), false).Get("Textures/coin"),
+        };
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs
new file mode 100644
index 0000000000..bd99cdcdbd
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs
@@ -0,0 +1,68 @@
+// Copyright (c) ppy 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.Beatmaps;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Pippidon.Objects;
+using osu.Game.Rulesets.Pippidon.UI;
+using osu.Game.Rulesets.Replays;
+
+namespace osu.Game.Rulesets.Pippidon.Replays
+{
+    public class PippidonAutoGenerator : AutoGenerator
+    {
+        protected Replay Replay;
+        protected List<ReplayFrame> Frames => Replay.Frames;
+
+        public new Beatmap<PippidonHitObject> Beatmap => (Beatmap<PippidonHitObject>)base.Beatmap;
+
+        public PippidonAutoGenerator(IBeatmap beatmap)
+            : base(beatmap)
+        {
+            Replay = new Replay();
+        }
+
+        public override Replay Generate()
+        {
+            int currentLane = 0;
+
+            Frames.Add(new PippidonReplayFrame());
+
+            foreach (PippidonHitObject hitObject in Beatmap.HitObjects)
+            {
+                if (currentLane == hitObject.Lane)
+                    continue;
+
+                int totalTravel = Math.Abs(hitObject.Lane - currentLane);
+                var direction = hitObject.Lane > currentLane ? PippidonAction.MoveDown : PippidonAction.MoveUp;
+
+                double time = hitObject.StartTime - 5;
+
+                if (totalTravel == PippidonPlayfield.LANE_COUNT - 1)
+                    addFrame(time, direction == PippidonAction.MoveDown ? PippidonAction.MoveUp : PippidonAction.MoveDown);
+                else
+                {
+                    time -= totalTravel * KEY_UP_DELAY;
+
+                    for (int i = 0; i < totalTravel; i++)
+                    {
+                        addFrame(time, direction);
+                        time += KEY_UP_DELAY;
+                    }
+                }
+
+                currentLane = hitObject.Lane;
+            }
+
+            return Replay;
+        }
+
+        private void addFrame(double time, PippidonAction direction)
+        {
+            Frames.Add(new PippidonReplayFrame(direction) { Time = time });
+            Frames.Add(new PippidonReplayFrame { Time = time + KEY_UP_DELAY }); //Release the keys as well
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonFramedReplayInputHandler.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonFramedReplayInputHandler.cs
new file mode 100644
index 0000000000..7652357b4d
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonFramedReplayInputHandler.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.Collections.Generic;
+using System.Linq;
+using osu.Framework.Input.StateChanges;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Replays;
+
+namespace osu.Game.Rulesets.Pippidon.Replays
+{
+    public class PippidonFramedReplayInputHandler : FramedReplayInputHandler<PippidonReplayFrame>
+    {
+        public PippidonFramedReplayInputHandler(Replay replay)
+            : base(replay)
+        {
+        }
+
+        protected override bool IsImportant(PippidonReplayFrame frame) => frame.Actions.Any();
+
+        public override void CollectPendingInputs(List<IInput> inputs)
+        {
+            inputs.Add(new ReplayState<PippidonAction>
+            {
+                PressedActions = CurrentFrame?.Actions ?? new List<PippidonAction>(),
+            });
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonReplayFrame.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonReplayFrame.cs
new file mode 100644
index 0000000000..468ac9c725
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonReplayFrame.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.Game.Rulesets.Replays;
+
+namespace osu.Game.Rulesets.Pippidon.Replays
+{
+    public class PippidonReplayFrame : ReplayFrame
+    {
+        public List<PippidonAction> Actions = new List<PippidonAction>();
+
+        public PippidonReplayFrame(PippidonAction? button = null)
+        {
+            if (button.HasValue)
+                Actions.Add(button.Value);
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Resources/Samples/Gameplay/normal-hitnormal.mp3 b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Resources/Samples/Gameplay/normal-hitnormal.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..90b13d1f734a4020945bed6706f6a86228b87938
GIT binary patch
literal 8022
zcmeHsc{r5q+y6bQ88aA6%%BV*yRl_S8OAcCjHN6ovb8=@<k8}pdn_@QY?UQtNJ4rd
z!qYZmNkXE1Q7A=HM9R|4^^U&B_jr%@{r7#3-|vs#?{gg2b#KSaecspSJkRTMUYDDb
zISN_^%h$)pS#qRHnuo(CXPUWL=$_aZT3p1Tm_1PkXy(Q?HpZ4T-QBUV(Y7Wg`*;2k
zVH^`_d>|rL&)36wv*cH3NwYAs082R?lC%E`w*!$;k~?yerT{_eXh?P$YQLes4C~);
zUB;H*2wTR%-+-5K@;6F;qh=W`zj1FFPk-b6GQRx=Scc?Xw##3#Z22L?gMS-DhP5!|
zjt~Sd+fmGlU-<Wf|5uLxB1qcn;E_gCi0tk>VPakf?XfOKyxCqo{#61jlqMMqUmKhw
zsYo`agh(8V)4+=z6*ZQJ3T=<F>6=Vm14Ntu#4$_8IFgb6HD>eBr$1Q(hcz4nImv4l
zQz3}NSRPMz%~l9gkv;^5b8?#(7LD~D3{Icfl&pqmYEhYv_q&Cb-q(%n=~UCd=)Ql1
zgHN*0wDmcP>=7JFEj?5lajH&3#R@#t*dP*X>9~+p5f<b7@}9cZY#6-dvFlKFflYSb
zqX!#0xI;hYdda0?!Rg23yD5eFx3k8-s{2+MYy#hE@06vcY!m(R1BR9|3=O#4!MCxc
zU13V_?H&L9+|VSZZ+1%iP%W7J`{#i_8|zQ!X_<X}G?P-s5nr7xX5Q59nMn$L1(trU
zyCzh%y8bI^KgVd|RwWV*x7+q5<h-AY8tV4Fx$JD>&Z)08IIB00u3edxefc(mp}u^#
z`OasSa^FNz?QFq@=U-a=c&QEuqZhGQwSDIA<3DdE<dyuR-{#)kM(bgSEtB#P7O-^@
zS`94abtu9s-pOqFwFoKNIgH;v={4gtun_zDoN)ouS^k@?xt3FwzB{u-wfuR&;(+c4
zjXtynRDUh^h|;D<hb`UYF07rb2oEttpL6DU<r)`wDyPI7%}YtMM-!9rPrSgBDBudp
zdC_X<b1vQ&&shY0LJ(N4r5_Z~c|MvZi#poEp{zVGxsmhq%T%{!)7p(obGd7P=W9_|
z^cjO)yQ9&^`blV$gu!6!)tY~{Ia+3Ru!+$bolc+jO=u(|s;9q2ZZXeijJEex<DfJH
zP%d;aO>7+6rVVZ0rR(Qe0NzY}RuS~|r7)7&&3&E9k-)D+OVm&XL9Mz*2m`A5$CMeI
z0h<IN&dM?19Mlm_{58=Zk5xT?jR;D=pDFM1V9UvR2WCn&Z5Wp`?vaP;@-cn+=SahH
zcD+G6t~k7fE}@-uN<VKrm8`h2bYjiXOp(lenBwi5pzau#7Q}pGd@VI!TwtvfxH?kT
zcMBU4z`#K(6JlGNXESPE<X2Q7xA>?iGHWY@mhUU!S24534b?Ij{cKBh(F*9($RS0E
zN91*=LV;L0`>~m<$Cj;Q3Ehw4YmOB?S&1Crh$X~NU*bR&irZnT-L<>}i2CZqFi!RL
zj1l`gp{CnQTG|^41fn527*VEgcK1mxv+6lp?Ems?<@&XUjVq`<jvRD!ibqxP9ux1q
zJ*^i@Ki(Sgtj(GARn$S;2noqNmFxY$?s8Q&G4p(br|MK~#$oCk1vKL6y~?<?vkhA5
z3|+(5#dD;$*Yw7&Q(;_46d}jjjt&{ZgdyOtMiQ)_xA4pr*t&JqqMem8x7EL6ua-Cc
zGj@unJGdh~@$CA$3tyWioP^nmLc(Rn!;vzFT*r|O4sHiHc^7V0FFG18aJ8#ln6d14
zaS$nl=-1xJI%^)on+dnZj{Or}cs)Gzv~TQRxXWmK>iv#qzHzm+PYLzwO}qpi+e)py
zW@CGC@q7E_V)b4A=4N}@|HC&7Z=9pdUNCKt`S@&yw~m7dMUPLv=w&oId)jL?gJx#e
z{LJ`3+4EahD?_j>77~uwQ(PPkMG2iCNNCx+%V}pZd}51BvBjatOW!&Ruu|s5-_*iR
zEHk74Q_st6{~F=>D9OI|cD`rZk!PPP6;YJ=l2FF_W8OULk;K<}-2EhPMOEC3_a*CM
zY@rF6lD<bCIN4BSYDq5!W3`=V{UrKGyHVZYNYYEOdg(~-!mSB!{S4mLx3lfoj~Mbj
znO*JjNAn9Ge{ef`?sWhCS+#cZ_f>MNyKEK1W5AEmg5(bnOMz%j`mp0MFlX6+cg5Xn
zF2SG^+4^;7>37aA_%DvAe~XLAGXci|?v$|IA&rjxeZ4hEy}?nBb%r0dBAmGA$X5b3
zs^I(|-pr?LfAEYX4hy_J^1L*VFfX<fPn8yY7(7yNuoIvDB+IAWg8d}mM@Y9yaE=?M
z2cy3N@A2wpK(h8vR}BXXs}*mIG8^s{#g3j+(vBP{SIP}%B&O~0k8o?#O1F12`(!2)
ziy)|Byl(`9#ay4O;By2OzdIzf>;eFD0Ei@ZgE9aX()aZ|D5SgnX{sRIy1{1?)A+La
zK_F0ib2=SfEsHlZP1`fzuR*GM2up9a%%tjY%m02c1U{k~N#=-J^hEFi4=I;yxXh3y
zwBj^y{_?2tv7<0@{mEz2X+%nhDO%WFiP|0>2GieRGo_?`Uq-ys4Fu1w&1m;`G1Bh1
znS-VB+-f^xHeL6HOt&JTch_C4Q!W6;*qLKMJg%Baa=J~a=-voG5%0dl@<MqUMd?f_
z03~uy<-o6hY-LUrb#(aX!Y9UQ&{=i2DEwdE)yD^$^5gvX22-RD#x!<&wcs1DKf?0c
z^M=;d*962~e{2t`GBs(i0zpOk@1dElJH$Yxc!(<`TSD)nsZ~hz5K|2zb{@eH*5`bi
zUzhTfGr5NyHtg?vU<mLdJ!Jh4K_U5RsvVgKVf1|4Tjrn@6C}7YbqJN=0`TmD8GI?Z
z3l43-T}`<nuNb~vAR?y}qtLA%UW3Ixa+?O-qOgQsFTd8=1dPl2Q*P1L^?Npp8xSii
z8BnideO*G$x|)o`G-VwkL=GF4&UX5h{wp%#cEMP>qHh(2n&)H7R(PnQP-xFwX(q>m
zJbTYi)||e{D-cKTTd4%apwGmK&ilv<1Lsqa1HyI(zL}nu3~8AmJ(&6xWj^_%&L@Kr
zzHs1qZZYu=R>2GL97D4}D+QovNL#Jfz>dBtmCdk$7+x}F!Js@($H~HlK{<?aCZRr<
zNKw>%!h^x2pOjR_A7Bw*tlSxbaG>q;f&zu(wiki;Lb)!UyV(SYEO0GY6x`ZTcBmkC
zBM^1->tmDSfVkdKYbz8{H)J>BXP!uts0y@pQ$zKQUS1yBrtLn_1B-;MDF?HlqsLdl
z{H-$RJvlShMRE&KplZGn1rs<+Hq~bCgz0-&hsTJEs~H3mL#<%)_FuF^DQ~AFxf+N{
zuCWLB@BS1lUw|t!gQK#K2|soUgAVZnkt+}|$rq9v<R9J$>?V03T5@Qv^9mCQXBW9M
zlxc`29PXxFqmdQT<`eTftF3@Xi>fs>NNvqb`EJhlesdjckTFb&Rl>eyr&KEU2ZJZ+
z&Js6{{1#uDwd0~dd@YBD$YIYjUMGgUa__vn1$X17L?M$P+3N~lvz{fclW{3MJ*kGM
zBu1$1_l7DMnPsxKHYcXIJ_K{>^2-b<!77>vz4pc0?lJohzc^cp9Gt<To-(WIgR~Q!
zPCzj_?D*>!Mu|!gH7`CuBl?|3HrQO4i6EUC0HQ~>Z1vD&bSsUrh@!6%(s3$$C3y@o
zT;m64uIApo-Ry2h^(f$AHlj>r2!=!2a?}oDQAm1gIQxwpsNluZ)2I;HV$)ghnbCU!
ze+xnm>nmZ9%*NWi`JBZw-ZEsOog+=pxbGP7N(=mkB_?Cf8m3vF!yAZx=|Dt3G=#eB
zZM@;$Re#gEmaSFizYo)`@WZid<e}FVsUHp-H~B<?4OG)1;N^6fU}4D$jFv$&D92ao
zQZh%S9wU;H9ED7&X;2_oDvd}PHt`jJigcF>mOCwECPeMj1|l+j{&;Ad@kMawLRp)v
z);j=h=yafwPQrcP;t!T3r0E?Y3&a=71`$vL27s3|H44g7K8cbO=9>#duFg0tR=z;d
zk0Z`G<u+i)J;_6pwdG!1`4hr!g&<vlbWu#8XqGb@g(4hyKBg8+rmvSVXR#>?h`I5p
z&QAtSibJAhhLmCd1Yk6^^>l`!Fv6O%r7*HJA19d%s5xy#G+N<W915S*)(>@DCfVb<
zu&7WRk>7K|K@$(YSEW;wFlVj6I5i(-tjr*)B%qQ{LAtA`#|>kx+hf(i8~Hw|b=oh1
zXg9S0M@fcM)#Tp7*WkB!^S&VvD`kf@k=s=YzW1AC@+sc5-Pg0i$hkmVj9P_#Qa5Gc
z*$j57Dz=JI>dD1g3UV+@5?hClRu2U@S?TuC+l3G=<fMmAO-QmdvT=Oh^kC?@^XI|m
zgSD%yz>-#YfI89~2@C0)8)Y?*LOGP<D7xX!CSDTwZfG#fkAEY{VIG;R=)Ob}M3FDX
zeqD!(akVC(5DYy9%Q&#BcGv@p;G--#;>iQPDvS_*i`q0<7LO60Ja|~k8+_6XR~{v@
zWz}>ZNbEPKA(j$pX{sKD%13rD*@MaBaf#Yp9UHm>1xq?=ZJMjt^jA1;p^?mu2bK^-
zgNPTuUzzPxU$A_Ugu+5Qxz(k`%tSs8^K5m2>KUJApCM5Uty|(Pym;<1LsZ!RAkb@*
z#LyRE#PJ<Z3uRen6MGnGG@?ck>Z}SxLE1Qb70a;oO+ft^dxxf?3HTA?csyEaGnPg`
zOrSz^4GBSnU#1@kexkkQITa4_wA?r_XDF<+Mfo7H40@uW@o^=LoOYOB6!7ve;!{}q
z&We8Evsd9bx?T7Og06%-sTuoH87#VJ9zd-=;gUPW5k(@JPbb5~+CQj}@Wt&$HU#xk
z4_#S#;P_0}Ey7mo-VTOW;*Fwr<p=k_Y6m7~w!xm9xw<7;ykyECJwh9np&geXwv#EH
zQnW*AS{lh6h|+lPZ;8~rD$df-z(805sNN+VW=*k^(uePz$hm{;!f+i9_G}*d`6Si~
zdaZ~7;>5`0`4(um5*FZ*Lav*l4(l@b+L2=zs^Mu5epqS3$dxG7BIZZUi=*B^v<uxx
zr0D2u`2wnX8BS7$#6CNv*}iQxH{<DU&GKl}wpWWgbOq5T3{STV=GAbw`Zr9@sa~r8
z%ljB8Jnb0L8ggGUS(AIvEf<k5xtZv~vj~?;-UL`?hz83pfK8)&Gaumu<G=p!DqfUC
zIQl0L<r#BHuvt)4QNa)pmk$9DAk3lD6J_P}tbi!uq2xN+-4lQb4FM3vmj)Pr{WL6m
zGw8&S>DJ9|ERenW>=oY{y|(u8BX_9!yY=<$e$7Wk`9q@gGR=2!!63%bBaSy}#Ftxz
z#d8ZS3{g@Wc{jCy=;1S!R`eE0Bw@aFA!0-RWZ?(7nLHmL4xmZQC?X=A+&@W_2Pqf;
zuXrWoF#w(!uL0mG%Pz{j=H@QCYm__^b?BA$KxPDBe^y`>2l%v|>{!{6=sj`b*O$vu
zf<+Abq0{bcP{5*JW0F#MP+dR9Ka_L^!H?Y7AOL5*Wa~6#{{Z6al#_f$qf9+gI;VfV
z<YP4e_$*t8Sz~En1;k}vB(-@q;qqDl=3AqHNTt0Z1Yh@r0YMU9I#6`;(^d=dqwZ2)
zN4o7lmUUW8|6^+P-DOiC)MCHH`<%KyW~4cg4n!yNcaq_iYAVuDY9d#~;6oJnIC9Az
z{0uu39WKPtuwPNj4DE&F27v2(2}7CoA8r{xE#ihi$%#!G6T#p!nHJ!73C!t)Y|5ac
zQ-ytD{2>hdMgVGu&%ncobOCtG;KB?NisfW+e+37W+rsU`W(|@P<Iw5rh)m~->FXP-
zCBtTORbBz*|L);m2Trc;j`k^n8tX4btV&szAw2ix%a(5IKyZ!6^g4$n?gCE&)KR1U
zOafd6S%hvvOQC~!7Nme|P(P7mPnawPb5)-h`;uJY(Cm{A)^uJR0D3Z30DQtZq7?C(
zhb3wR(KZA`$QS<AQvmpna=`apOup^q-raPT8){$BR=RCzXK0#pYiDs_#|ib^igT0R
z7hm-|Oo^P=tVY7y0RMomfh_-*Fq(nb5JKW1owND}qQG89N3~FUiGZcB2%g$~MQ1sn
zFV{q(f#_mXg4Kp0u*kCq;1u(ir2p-+6UsF!r!pWM;!M-!zfPHsM{ZM!a)oiN^b2km
zNwrv|rEj`tTVBd>=Bx+F!C+vmPTKB=Qt$AIkfH)M%^Z`NeYb2-E3tf;p;9=fRm7CU
z(7=G8>eqU&Vj%icKPhRAWP%`!3VTxiMkKTOhs+@qx?LXbCtJ5ANP#9^P8grAwMG)%
z`4$FQFx{FapTUJgdYsU=(t|-ji21amf?hQT4EAThP#Uprw@hP_vbQVv$p{z@n;w2F
znPkKlOd%O(S**Q<ES;W|nk(@?2DSW)Pi%H;uBzGEeru?gj7@%0h;@Po+*)!v{@!`P
z3Y038uLhsZbaOOf@RA&cKsdI+cfF(Sr(5uN7wRh0)*Nhl@KR~5EjLP+Bg!>1)gz8u
z)lu+Av9HWgVHG$s5(z8BKYcA)C_DzK8Ld$Si%%li8YA;ag?S1UqVaX{EARS5azNO@
zLy&yqe${5s?;*@cV_{{`+@h23V2LsXVWHCKQx`}}9B~8G^(m82ZTVaG#KhBouPPc_
z{$8qt3JMh<91SvxoeQ{;*^S+mW_=1mBe==Jty2C-3I+vrhIXm783&Qg!NNCVO%CvS
zygHQO-+tV&j{YJBc2}e59s6Cej>B8Ofz_dlwLP*zExX_?MT4Xdo>u`Fd`V`y5RR<{
za{&+V--IizDKJ`!uL$$`M$ty|VZBOMmp)NanxGLIyKL~%+;IV|*n+@7A5b}L<28A?
z=>=fCB9ziX+$y!Q^D3B=6eRdtL^K|?H$4&7bXuNv9+}GLP|3y?xj(^^STjV<R}?D?
z{bc5zk6$)cs_COy%2dg1Kf>e2=ez#qbd!5;;qO&%gEbKHve?QVbIxk=k5!t=Ai!e}
zG6LcH@qrC6mNy+`^VtwGA4MBZ<zj`0ktcU1Sl}-J@nu=I*TFvo;)^AE+3;ts6N$nv
zUkUYMy0u?}U%mdNK-`dA<w!=6Q#Y1(NOUAPM+*i(9b!RyCFyLulLKZOnQjr-_&9k8
zL5K1=KTCc!d=vmeOx}3Ds{_27T&SkfT2J3vh=KC(&%;_oca?C>pzkbknhps-xhKgh
zFwIG+g2ZJoundd}B1PU2;?sh&Llb0l?OaR6ybD$4bt=ftiOb@~JWB(4`Gcr9Zeo4V
zatwWfDSZg_p151my9HwjH@4Pb;Z~L*sqIY)An0pWvM!6xk=+^n3Rnt6l88u&^2&9H
zIRT-hvl*ZDXj;0&x=n>f!Q#o|{tW6~eM}QaJgyU@`HqYtWHPivDKFrHTsMigA@`dI
zDQV^AnD3-Gdr%Q7^GKPr0z%X|k33eaY`Z%YD+!?pgDX0(n<DxjANG7#wLxh>u6y-H
z$a^V4GtYJns~J4^u#?1RZfyF==xdH++&kR#y~2b6e}xs&T#9MgQkE9yhutS^`btfE
za0R(QR*DaxQ9Q&_Ce{$i!;~V8WJ)WJ+lvxRBO(6xoH!ubqo{ccfgxETptXE0JhgmT
zt$b#cQ~N3Vl^k;YBq_YNQ2vE373Ecg+NZyc13dbZxH%n;Z+90zjS}S%9UYihZZWRi
zEZhxW92X8j1rUTf^zLx)L$5`%vBNy(=JZq?A_n~}DMQK}61w;}96cJRVh?&f33aao
zZySAGbCW9knb`;!rX)+N@hPWDq&}=b(B`wT?67uPNicAEzswMTgSt`54+F2Kiy5ow
zJDwKVlF{d%f&o@Xg)K83a(basm#kFGOybH^)MkJoue1Z)`k5Jf;JsV93rZfw8KRu1
z%zg6zc)ga05&R@kQ+kc0YLkd{;VKHkZ9FJXYj2)CC@;%GBz3)%RHtyFbI1&W=N2Bp
zY-U3UtoM!UN1vS%JlL~yV{Hf-9Vw%m85*PziKUTu6#DjBQnQr6;sa-kKRM$2RQdPT
zYW^e)BIR|+@z`iImpM%3h7s@-IdRSA9x_b<SvDlTA(3FivOz?<)u=8dhAvBaTGh_V
zL+R?`4RnqaiMRF`_z`D9I7P&|BkJjfXat|sEAb(LNMSmhq+*+uKM6oAVHAR#ha>X}
zg9b1rn)#eLV~-QDSbKC%cmnuNY=2{?<}YW1?`^U9Z<+01TQUEo_vaNwnyv?yO;Sfx
zPbNCb<A2_=pYPe=;{DXVPrm?>;<0(2_?E|xiBimSJ=!lgKK4~TYs|h%yEu*LoJ`xk
z%+M_4zX?#^$JO@Wg_?$vEEn)pDIoZx?e)kaxJp4G!#hNylNQM2qDb|K+`|>y*U#<S
zre<K8=14cP<Cz1|UR!_iw1YL#yxu`2<)L)LL$H`!yZOWo!N25K3@vg<+9^a*w=T2+
z04f8Cw*U~wW&$v^6XEH!?xudBy7&au;QHd8s}|DFFJ8Vu-Fda)f&v_QNAss}lGOb1
z9X9J;EnerBa@L;4)XgMPY_jiXT*qMZ!JpCUHsNA6jP=Zj(%w4d*C5|~W#Ws+SC_Xx
zSb00i25<_hOsPG#KMs7aKdD%MlLH#g6Nxg3sYi}aU(Ap!4h(K8<GD#)5l9k%YB{#s
zl$Fi`peuSz9e_8GP&lahN+Q`}6!eEA1r{>}?Pm6$g#6z0`ajSuGxQN!5djQFzh*tU
z!B{OSaS#39ey`v)3DRS?o{BNKq*1R{RndKLXVI5o{r)^(50BYgg1dH3KI?b}y_@#2
zoP6SS=g~GtgYyO%f$m$3SJwVjJaFI7%I3X%mp7Ac#J6kg%3Ckv)Zo1NRnx#|yt$Y9
z-tdc0vK}o+|4~#_dZq04YTk!Rr`++q2C%R<z54mNT_!{3d%p$??le8P^mDFx(aJN^
zl{UJHkZQJbG40)Aaca{&(rIQd7<}Sq=;3aJ%LzpETgaj7M{HI%0B5J*8conp-*I6i
qttH5XWwZDH4nyaYUV4e2U#j=(l5D!dk|nYKZHE5;|NRd};6DH%7mF(Z

literal 0
HcmV?d00001

diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Resources/Textures/character.png b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Resources/Textures/character.png
new file mode 100644
index 0000000000000000000000000000000000000000..e79d2528ecec4793705ba5bd9bd8e715fb36c36c
GIT binary patch
literal 78937
zcmX6^dpy(s_ut*^?S9+jGLidbOh_(UDk^CTsg%vVl8BJ&X1rZ;S;;NMluA-osVJAt
z+(M`nsjzaZ#E@HPzkR;HKi-emW7~UwoY(7|=XsvzIj;<otCOU-iZ}!Uk=*CJ`!ECo
z%@aQMqA1}v&ZV1f!UYjTJV=B<9_Pfby9s}UVEvpAAA~?+w?QCOIs~#N5U$e@$VD6k
z@{<gK*c3t_%I6F37Y{(7`0;(aiS98sd^ZFF2e>)e-`^jNyiG<x_iA4k>k8bJ2d4?F
zgCosCzR{JKQvx@fcqbA9Z8h(g623--K@4Y#S>(N_fi6gieUXZPLXY#`x11!@fcSR@
zm470Nf;1g4OK|ITZn7KB2tt5ld+OXK<KW{hrNz)^V@^sU6w>j))OS73Kf^r?vYaQe
zC7k5D$|#1Rh<AR652{BTp}j1UnN&_GQgspNp^=VC5JZ1)fVudz7$Z)uGj+#b8Tr_4
z$=+@(b8M`1=Y<(U511n6p*Ni`+Y=wzh^3yof_+~XtDaQ8YNa4Re48U}NM<%Wwj~ii
zV2>Kz&hOSkABJG5dkyp42vTgzhLkT6?7QlX$%Kv}u!``lQxPF@4P3%{VPq7=bQK~9
zYn}O0<y|Qn>1)&?k@WiVN!G3p>{wOdd)56SZ&_WikBd|fRqTdjmw*GgZ`}l$55oQv
zz2iV^YtrKRI8WwCWn?F7!XdEWT5}At4)RDGo)9dS5F>U8EsnvKK;Nf%n_;C7nQ3Ow
z3{WH_r;S=^G{lT*F~E@aFhyH^0Y(?~CiK}>;)=W_;dcXHWIs0+$K3x-O{NU`O_^jV
z+8ji9=tZ_uA|X>o&X&hc?7EG#nwAt9w@8s<NlN^4yt)PHh=3quzE7Wd<i@5Z$f;af
z6#?I-l@O3ScFKVskWNQ09M$^@i^AztlzXzq>~a)OpP+eBp@+-KzrulhP`3Igyvo7^
zK7S6?lZi|rDs~^Oe5paoI`x>1tHz>eGz01tLz!`Pt?I(`FT($M?ScKu(CpLAmRgrI
zgUC?r9-Je}q;n2MmzFo`6L<Fu1g4u=_WQ?<6_0hlHQsV+dEq{`^0n%%vGz&zl^JQB
z=4~~VI)#=O1b^!_aR~z=GNou(By}P9C}*yGYSPoMR=!Pig?x*z!;;zMedc=C@lWr=
zuwy5F9f0<ok<r`zRHplb!sUxu`xJKl6*uQ&s}+}<YEAmzqOijchS?R!Gbaf_anpa&
zcNJRSQM@`sJy)uA-@yGK+^+|}QhDs1h;w#C(8Y*n2m=*kwMkbaz-aSs_wb*AuXFMH
zt)09b+;y*gH?tXLoJon8nY}f1D3gAgco^k&cXR)j_CJND*PcRVt{;#{Cds7c9_n$L
zpjRAU5hOWxEA1g&t_(RsNx3ZdMpI<sFk-?$75xZ%>svt6j))M-LfQP89yVL%130~J
zAWxInMr}mgel7>->;Wsq_o_j@b<ID`WG3uqG6KX3s@a3?F)yWF+~z*t?v+C;J=+qo
zjz&P+|H){5aEzJLY`9n+&^1*OFI#-gkFvL@IIem@OKMTgq#N)08C?Q1|D{d5dUwtw
zsE#zBm3iY9OoEuIAfbFrJ@s)$-)lAdIP01Dbc4GYp=E-U+jG4TO+khVQu@%geI2fs
zN;|GMXqdaJA35CQXEd&uU*j$!p%U}YQY9-5GINY0o=i|s-G87*>coDrx7%(tPrq8H
zOTBeVB5bv&*|sMw>XX{x`;OPr*do$O6yEPAO_%WRlV2w}eI2aqJ`(WUEl_1+?X~q!
zCg=3k_Y?akd*WY^@>wcZ3I}#ZzB(CGfTVmD^%eu<u(og0v{Zo(covLyNyb<6amX>3
zvC#&d{cHQYcSeWoPBE5Kjm9i&Lc<HT>SsouNVl%yRRxxGWicmkmO~O%_6IQj)Ajw)
znwNQhPvn(dD2R3V`Aso+wV%F6FGAe-(4%tNowUJIDx8BKFeUg&okKDEss5*fA}qVe
ztE^c|l}w?n*PEr1ap=}uXZ^#1J*|7bv*D|drn-^`hnSk-xV?_w*t;Sb)<b=VPoo)a
zGV)F1umfW7A2rcV5_y8+s`RQy@B8;WFTg#j)g)!8?YgP`rZVHMrG<O7f5NwIhDnG*
z6W{*FcP^9pCv%!2Wgktke}uC%)9j)+I_h3n+``ME<FLgkQ64vm`|W7xt&C5X(Pw3O
zVF$xLw_4xyn|Y^jy1>I24|QCreSE57s{-|HnAz>E@7u0<fN!i=MUA2fR^z*2!fXJm
z`h0w!v0G&D#g528r~AeOed5~5`cNGjtlKUrNwQT*PqOd8e-KWWmihddP-8*v_Itc!
zL2d-ll3lAzo<6kF{;GjwKVJ?XlP>0r$J3@XcY76K5TAsP^$<FxZU-8%R)<MhTSM<o
zO+i<rv|+|m{L#CMSJ5en5qSOvk7<+wVpdxg=#&z+2Y5tKYSu8kp2C}0ngXmwn*CzL
zs=fYgY#wml`P{>g*|IDp;}A%2$N6ALhBx}0(Vp|{Nq>g!8YPepSzsyYsnKFpS#7cg
zgc<SHzd-tj7(Ixkk=R-94S0cFQuw;`q$w%&aW3=;iKnkXH&7<sSy2BOHN+p8-n|Kd
zQ6VZ1T~JEolFw|b8t9gSmcjSbC36CLz;}R51suX~OxHv?kJBu3Jls%R3FQ_Qg^~@8
zLJ^_;-UwZK9Ro{GW-8FdYHa8xY337}X5wRGMsslR>x~x}^`@8({;$;&;EO}2@L$$f
zX*^D@2GC4RHI-EaM6pNBv69SPYl?7xBqrpl#`EMEINY~I!?T_pi|;f}BK<|&A(HwO
zuif>>VDm-wviIPzAdyFvAA+YEC$o`+02xui+F~JZaBj421J<I8!5(;^VNNjUnj$q*
zzerYzQWo`ZD|QJ<!G9)BOE3z@Zq2<QbaXaK`e%8cW*bP6CQ)zBcA7DJ&*E@0Zl`g{
zN3G20X=VO9c3`x3$6!(>sEwilZm0m{CDiZcs{pDj08{txiJKO%7b*s^C{MaNr_ME7
zP6Jl#8-iBD|8D2zrfFd8<Nx*W7d~5oQw~Yy@vG};yp_?URnKfqxYstgK_t<5gAOq2
z#n9lhRbswGweK3#Lwf%K<{#vl3Tmtt(?Ue0SKN>AD?98$7$H_uyFeFVpfqILr-^dD
z15*)?>!D8Hr+(Qvd;o)m$PjMli~WWygefj8oEVbZH@@w~v?5AWOZt%JiX~yoVl5i$
z2xv>X(QXw;+5|!GTf|WFQ4Vw*>m3Q|p^{XA{zJ=0O*wd0A=r9M$<;T13VAw%65t8d
z8nn830y$=FU4nbhNdui|x7x#BnpXy`<{Zpyksg-p%t@`~0()SCcuNC1Z-(mpf~X8b
zE%_22CJv=IRDO`&|B6}eM#|kSnSPTxQ~<qN%AraYJ@-0xtnzRUwM&PDT-)q86f%oi
z+WXOr05%iyyW}fNh~HTGKDQecZ2sRVD@9lb8CuduG^O1*1`>ZpkkWFfc_LTj3E=<7
zl3*t(YiW6HzvFJC`)NJg^akjzG9v)H?3>*PMpWa2O|5HLJd^J`!9s^7^Z4eqVqV9?
zL%`fAVQ~HVXUAPSRK_};>S4s(g|59NUOR=faDY~M6YLa8bBJp>MD7V@s)`gLq?eF7
zBC1KfeVBGG7~w%>X2kZZ$_B4WSo}dgfFzk?b(Wl<+0g&-y>YmAn(VE<^Vk&&hM|<b
z9{8}^Dv<ie#`)(t9Q6AE$dHPHNTB~|$|;oCr9_mzq!=pT(k0YQhj(MV`)~LADQpC6
zbcEg9;`KVr*01jG_ifyV?^iIhH{*N4=HHwM>7pRFSH6I$9EL5C2oZA3Kawin%qfKG
zk1%+siR<-3HRcm>i$6>2R$caLUZw%tWkwO-;s8duX+J})@?*-I^(;?43ls!ualDv;
z>Nk`QQ4|R|ta>R}-2D<?i_%{zX{Wd4dB$aOMqf)y54)$ehuqrTfvv%|vF{1j2byi<
zC8sN#Z+Y*6@0ew=oj#ri=DeEB8iF>v__Vd1+*dwj=u(HccK*avG^ml3gx^5;lFr^N
z&QGNY6CdqlmPV1i7d7Kb25~_{gT7!&K`qtD0bi0ng%8gc{FdNuUCskK&X4%jy_&P<
zwkeyw&1WB9VkWOCxdQ|Iw}H%vJuo=qR96z&bVB6iPNL&+riTx+R6Kb47ZhG`6nTA}
zW~`}m=J06+hRFXoCr7$JPNQ>CZ90$F>FD0sDAkXCsv~3Q_<<9vW_=)$bRJ&ocIax}
zW#V3EDslI&t29NgjE07!GG2ej3Scv%3YaM-0+^bR)8Br$;c#O`?319H(F=5`-D($K
zFn$1hQA1r_j|L0bA6H9~lI9Cin7iBhI$N=bkTB=)3wTipF*DY_{pK4VCj%J;{(=0z
zw|mJ;(3PrJR{fb1ov+UVCC^V13PBG8=Ia>JUv)+%0yFmG4%N~=)Q>vT2wgf{DvXLB
z<Ohv=4HZ<N|HCgF^f~+&`N0G7fv_uvfQ%A>3j&NrRn{vr0wicc^EHRV?CI#n>T9vF
z)!SOI6fBpy)u4}z4QORPI@8Af^VgW$^*#a<_4`sgD}2f%Oy1DhC%b&mq?pK;R$g)>
z7tt3Ra?v>v_WpG%zwEeWE2HRt2~co)N&`r0hMidVNi^U1H(x>%i;Pm9_BO!=@&bd#
zzJCvt`92xM_%7o|3MvRBZJ6wTcJSIOWDUMLAt8hJYuO2q_Gu2RlbT5wyJ@Kl<--=A
z8i**<Z`2{+m+x56A6?gT{CUE#!EiBjGl|oGAzF=l{ooWPk#|hflB6gG{I@Bw+Go+&
z2#074HgAzRZ%YbDZ!n8cAj$r(LV`i-z#2xJ1}h?sjJA*!JMM;5aYX%IMXH?=eFdk}
zpiUD|ai36fjpOCCG@{#{8$`~De2(k;EY2RQA{ufCPJwtD0U=(VN1%q+uBM&_bazVQ
zy<tk0?|OQGe*wL~IgR-HiYTsJL(p1#7(<}M-F8<Q=<|v9U%j{>$?ecRk5Nzh+Znd9
zVhTE>WV0bKwmMZ|%a)i?$ugWWyaq6(-^jF}KV+%XCv>-=CIv&T$2$-r$WSw*q{IT=
z*N-~^r_qMM)&1YshlpZ_)987`Q?6OW4<~MFuIJ)M+B^46#sOdNS((q+#M61}WzAzP
zTN+l<g>i)}`iDAj40>Vk#he3U?y1Ng!(dn<QpSfu1>$IvNh9W1&%4>4dhY)P{Z&JG
zFKNW{pW^i^(4DnXm+Hjb!$lp<f*T+M>r}}TyqSwQ`k{LP&@$3lPG280*r<&;8_FIF
zQfX!0niCTAoH&;)Y7I6K)N;M;C6vXlPUNN+wHA)2BQ0XCCMXaf!M85G>Q@Be0uA%{
zx|M96V9g4c^Jxr>;s225(jA&l+q6Sf0^fZXS;j53Vzfi9p;a;NXw}gNewFa0tjQ+p
zR({B$8tA7nVz$8y-<B*H23@Sb!;+!LGIbmcYVfRk+mb!LT21-@d!ncC)kBG?y(Zd{
z)UL;64sNahRV}jq2K0%Wyu}XbE^FqRhF9vYf!RJcf+|FmdBv+3JGz$bO=IhH5xMTH
zdMOeT))l}MZ%v0@2vwZ%_pVkHogP0PcCVyZEYUt+ht<MQ$5Hh9e)x^Kqm)dH#-(#z
ziV9kA4`L;`N62@filT{+Cjorj?bnv)>!=CIR_LgP`cD4eX*?KxXcTX|x=_q}Tjl`&
z_-7p6o^5aHKrhNspr<@lrCZBeu_D(y!hUu6f%oEOaW__1X=fadU4xJe#Rodw!j4iz
z-Jbih1Wd4eQf^Kj)jS&tN()3*BH@)r@Hgeyb5SV|_kR{`)upc5z$<n^e>-6wk}3fq
z;Awm4u=XRO;xrb%q+x{=PqLq-SP6p~zkf!1LQxdii`?4Q*2b(c>A>=^T>cc^f!pji
zh*@@s?c|H0AGNr+08-!+VCl_oV8PR#S$r|mZhnp{0$#(4fX{+vg)nT}0EDN~0Jrll
z`j&B(w7iWKjHRHlhws0x2EKYxhWB1u^CRV)&||U8J0b61_c<hCdK1^p^@6CxuV>{$
z)lo<hMbs8QHINYv@-O8}j!NORjl8$Bq_pMOQGJ5lb~t(WS8M}?euQ1HgLq{cY}m}f
zM*q+@A;ZxsHzz*YO>UGKs@PGz08uNEv@zcj*(($LkG^G}G^$@oHjwnpjoknENDzM@
zoU%GUBg_4k{~6P((aZ@`9yWM4HRg}&drY2oDSN}#HgWZk{{6MTn{@MCZ`h`?zx+|w
z9VISsyOwgX%ETn>=F|@EnMVhJ++2G~Ov0or_fzg1#$K9@dmDyi_V~8Ge#5M+>SU7*
zda!ye?O|t^PlNP1d!Y7xI?7sSl8A}0gOA6XlB6e~@Slvq;M853LKozD7qfLfQ0!!f
z!auS0MGPfKV1eU)57^XuFtY;rp#FuA{$b|$AknC9|1l*QztzZPwBuAkC>U|s#9URd
zAvR)w^3X2zcm(91j-Yxd>n<fMZ;Cj&R>^a}9W3N{9}83hQ^e1M-=a+hUYuo6;jkCz
zj|~oe{P15|;Df$0A@jzgQ5n<H*3`8lscMn&4iaz;t1WaH2W7fKvkX0jAp>ug(clW2
z1?WV<-#7fJsq<hByL9-MPZ`F3W22Y9)Nvl1^GP&oNLtG0eJY#-a%nuL;CZMXo^NJu
z)}S%YJy8d#3|apxInjhB-GL5&5w#hV7;q$(I%2-2{r?^uFJ>Fak{r|q<Y^vTnI^Ex
z1?tTxaf1ZnqBc4L>uqEN==g30u8&j!`u`pSdke}5M`Ab^1nTy_MUS7Q^7vVFKt#Qf
zyb3CSu`@RSsQ@Y9P5ou8;nQG*df70Sp&-*8_On|VH+sPHDkYW-g$w3*&)j3~bnXBf
zMRLt-ZC0{)s{J+1s0o77Z<-0t7;{1ox4ZbISy4D7PEwT}M%L6aqP9)kZq`6Q7rbl_
zTl!`Ut_<4a;$xRmd9PoX@=q;=!K@9g1rXwMpih*M7URfaUT#B3i~<8H48b}No$0~!
z<o!ur+hDI6L@Y99xzvfe5E-0|47q>6gWNCv-q$(Yh%ECSmwbaE3Y#0j&kXIzpe(f<
z1aw_T{9+cApPjqcE!D%X_XOk*c=q3QN(K`D`Bzp0<f83UqIIdS#UlOAJc2vEpTiCh
z9}t1O%n!5dfPz|QbMQBkHVSwX%~y6hbxCF&^*I{=>U1MeW~a!Gw3}V|`mE`ORRM-O
z(!7EWy^+|;U!HaZBj!dVKaGf5Qt#}7W=or*zAXX_apZs_O$~#O{Ucs1R13ia0m-%%
zsqxu*!E$Qu8PuF^l$xt@C*(evWFTuvHf=5Pp%OpsOXa*C1vQ6nXVLbM(B)%Orr?&i
zqvkH3Y|D7VFV6x&%}H%xkl>>)T{CxZuO)v1s=r;enAf(6xwr&4UO$B6{(CXUj*k`#
z2WKl?Q1x>yh)5|{h>eXuYEBkBYiNQ~tzQZ8QVbr4^zVP5XJrg#Ox|ZJ986=ac6Wwt
zjKaZ-K99^AzW!nGMjCa2!o+wDrGpo1#gS3hHg}<%Q(@N~Y3D*VdU3JV+Q<Ggic4{2
zjfjS%Dh2zh)xspA;Hs6n-`XL?@<dGUH%d?tOGzn^B=wFgx&-*Lo*qJ|C1m0-MG%LZ
zJ9_);UzPAaHXH!feHvR{-Z*l-IF*QRxmIpielt{2Of>!ePyDnt+U&;9&k`g2sEr9j
za33IoiA95+bBM@yzk#<}z`emzKkJK|_A#Fpokf@_KhIWn_6JD1<f%p)^cD;7Ugq6+
zFYzvXeD;Q9$jdT6QX`+iTWb0Yq>VIhd6zF<c?GcffVR<>HiX|olWL6ij;J}r#@l85
zXV`^4M7<U4v%lz>t8|@@6z(x*Ud(TFzs|=U$BtocY|}=&Z{3brpdY}D|2ao{L#RDD
zC9Q!s8hQVQ71S$qqd^Vx2BMAUt}CheJo`u(+M;3n_nDr4lJ{%u*&lm%j(&sGgqHes
zN~DvA{{7ieG^eH2P0}c3GyfjUnhn(yQROvrS^V)(@PN}S?#o8@%D+WfWW&TAjEcNG
z+TA)8HJ~O)G{^O9CSB)^H~j*pa!%d;+af~x$D{cBjs^Pqj`>nxlLxVZev~nYZ&Xwu
zs$Gx;BvCKTt&}AJNrH`_)%owH+!753Oey>;@n;5fEP%@f#e*ZX6sWOSCeN58jf})%
zrf~;Idto<s0aX{l3!D3*g&D;0Sx|DK^7i0lHTT$L*Y8NlAlj^zbRgT@)Ym|}l{tIo
z4Wr;j5BZ!La`;xxnT2&}KzYT;x9EA|Hg4)kD@-V%a5T9}1rN1HA$0>l!_T3RJWcH*
zmx3SQ#<z7yIq!kNe7j<Ss@EV8bo`WA!@re6-uTlXVDXcyd2Pa$FCEoXDW#C4#|6BN
z<g>t3Q__~;DZqft?dX#!80Ros%veI-!9my8?*n&%@SJuaFGL!D!zTu$jOI-#{2o?D
zdaA}I?*dxx9tIW)E&#_vZULT2is)7WpV)VYdR=noZJ2w70A>D<z>jM`54_rO-uy=F
zh0DA)S{e|o-b|?z>$#WWjX0x6&!MgLwRiD<DO(GYyHNdlpa$H(31QKSe05)T01y3O
zbGuP~tFWAvd{!#<_ls!oKls2FXtps8tR)!M66|ChQMH=J$k0&K0mtpAG#6d)TE7%u
z>Y@T9<Z--RZDD!BoHi&SVTx1TT$Q~65_c9G@7{xPPu`Bc6;q8KK5F7S^miKLb=i<)
z`_wp<v!nK^!4|pKNTFW^=w<Ks9|~KyFPf{l#m0TYm(b><e|zS+!E`o0x3Hoo#K7Ac
z_BocD{g7#Q`ann=xc9VAt4A;$3Avmplvm7aZNIdJg-&b(7qu;5!uAEVtc=*T`zmqp
zREZ|TEsdC&svLe*Z3pC9Op_V(l|modvdQ{&*ri1e@Vn`#?95|o?y0pUiH3Svaf02o
zuY?AXbW<}zXlTkqzKYuHRykp<L8@|L#A&hWWxdWLEGm#cvr`BYGEV;R6PmLN3qaKm
z5Ks(H0ODH?7wI&|x3MD6X>mVd;?PpI@lvi?%+mA+DGKzkA{9r=lI`?it8lP7Edu>9
zv=I^doVt89W&4`hctuaebc{k3guKVgYI_0Y2v>^F-x7>Ac|M$0KAr!b{Zc}bnlmx|
zsWyc&_$CN`LHz>>Qu^c@AaQs<dT0mg#KB|)wK3&RQm<J^@zXTQdY*DjzPP!$nO9ea
znU_<sS!;xs89%IldVeta!r#SB2X4ch6I!a;zBg=xbGAXknlPb0J=va=&O1voMOb`6
zzNE-K7ePjG$EUT`W&cB%E}U|8A@s!k)Gu40!X$n$O$P{Wl$9qRJ+8aEupC#PPV8tE
zd8&wTA^Etf2I|cjQmpHyEV+KuhkXJ(JyBZ9CqWsl2-HgS@iEu)_(3I*yYo@9p<H-B
z(nG%;*zq_I)wC4~B@f!QndR{~Ukrhjxlxg$dV@K(<kfrs%4k0XW5KG`fi_(@zn?nb
zQy-_a+At{T<%R60TfPWmi1jZhJ<!r0caY&nKJhA@vbdy+wsX<c(LovR(?@-efrH*A
zaVRBEm36VAo?~@r%)7b}%)58zFj0y1U96ZkOE4kY=hh6IZYXl7^Ql%1AGQOR1wBlo
zh6W>+_7fC=nfRKwAElxHK}xwf?W-Z|y1$4T9ri1m>N<;5d#%z%jiTg2c5b1+q8T`n
zDKd`1gzb~#Hlp!sEny)OyTM1x#em4EMv;3$%3$(M4p0$7M!v>Z^w20V>x*Fwo!5Fz
ze#~R<4BP$eR28@Xx*0OE9DdNwRh;quiSO7_VbEB~DkR=y=+$B_`s0b4L86I%7X7Y%
zmCX*hl-G|g1Lx<zWSfbj(bY@i=&RPo7;twzvM2vcLkkc=7so8D9Q5<LxM321M@x@u
z^J|OQhM7#D-gtCH^Jl8!<()N_^tdOM+<~B17)w*zmauQ{m0g5oQfi*C?2KL&H|<w7
ztlTMGMIz+!nFZ3pQpf?k=G60KS)`Esu#W1mG7;`)=*!tu&odmIA!3BqM<CdVeIg?r
z=XJLPZxM9Rk6g&$g#M&E0S}E|1Kl4>Y3FSbl9I)B!DbaI*7%~vqbY{SuW65C-dlpV
z%j}caN~^>H<c>?gmkV|0AKq43T`60wN0aATUw0<+>c<qp#<>yPjU+)S@yDPaNCs&S
zTnHVUdur3ZUP-@yOn(uDGJCt)Wz=U-p-a-+*sze1gG-%(<caHVSiYl@eEv4QM=Rde
z9b@9v=oe>C2JtuU?ZD;03xH4Nj{r9hOW<JIQQXYuOLQJjW55O)`9OaQ>#>;KX|#LJ
zG<<#!s`G}J-g|DW-t7oogs|Z&`LPSJcGr<~7Ft`4tX-3FPd*DV3)VsgubF<?+{GM8
zPnB}?cC(<D991V-6@+eQ1#J9ll?8kL#DF)YN2&65b&A_`+R4{Kx=5&*Y+Tar4@U)w
zlHAz`((I4}>h`EX-$N+1SEQ;qG%_Bt{Dingwrw{W9djxDqtbK{m-W?G1OENF)!6*E
zl~)>gT+#dfn=z0|x!x}WZ&=@XCA4t147}Z>3Yax2>S&f0W6zgSlFzBY;ZwHY_7gR@
zc&Miy^Un)GYdDzHl7tR9cMTnbPH%pZHcVh#$txc<xk4%Xa1N}GuryPR;j7y3lm2;=
zYO=n|=DE82atfXhdKPic7a@6xGt1EUeRB*dlpN3^L07CaTfk=uRIkg>C;JVrKp$>>
zT*x5v`y$9ib^bf(C5NEPnTR5<j~2>!>s1skB+XMhgzzA_Cm(Z0UJhg65JUdLuyPs~
z<=*!wWQ!e2&M4+!xz{vxY8As9#GgScJy!l;92XZ<!R4=#+8VE0T01(hLAr049niNc
z<C90grw!7TbFQ#4wO`6$MgH&GiegtFk=X<=e`@SR;~w#`jgJ1HqRz3P8dTZ!c*&54
zlV8G1%O~FdgI-httRGjJ{|T%xUu`eK7hTX)InCmk=uzLiQNa<w_r%4g*fv&N)?TQT
z5DVxJgOa_kPzyGbU00B5U7}~6{D6cb+@)qhLzR?3$QC?makmyYGc8spv37nGGc3P}
ziG87wmisGtw%v8X%(t>IJBa)@>;4>SMFLD%l%}l|Qy1!P=GizNm~<igWDppeL0Hq*
zo15MIe}6B5nHL`d&7~~7MPLAVmZpiICT2c$A=hbLy2AUm83znDB?Jt;xm3bgeG0=!
zZIz~`J@<?@n@QRpnPa3YLY?ewrOs=$w6|l~91i<U+Z%RocQ?D|%^SW(EnOq>!S^`_
z!t#00K_I|w{9B^)X1k+-7o@pQ5Ub$GmRj_mq3P%gu!j)&z9jIqB?dS@TZ@~CT~IQL
zT3<0m-T73A&QZ9JAHo^P;b_YQ*pU6rD)|;tO=ln5l81<2Rk8h&`clwJgI?$n53X0y
zGvoIDR<S#S6cJX*9QR^u%~0}^Gr>-#Uwdb;s(h`OY*XIJd><-DdpNmVPm|7Jqx(>e
z(q-sO`VI8t&3ZA77b54bpAlQ8h$@G-T{j{ieMhs;0k6skQTea-XPCJw51O&k<-$#0
zFBXoyPCy}d%tY7w!P$uTdA<QC_W7e3u89{I7Li9`;KQ)4rYa=T3xD!cg&;D*Q->L6
zUpf+tI=1_uE+Z}w#x0$i`w^t62GOG!Jb7ZSC%$Md`XCb*Rw;^S?OQYtdxFFBh3W?%
z_tcz^4~J~g3jyM@Q~{WPRz#C`jxgs7CVa_%J47+zBJT!kMksn;o>6(Nx}9sG%f2nZ
zp8cippAKhWfg?%4!F~Eb?oM5tw?OO@|JC}31E{8xB50$p3g{vc&PRA4IqP}YD>I`?
zNMKgZZ?^b^ynmg<kaeo34i@q=gSywT)SNJRh`>F`3TP2_hm`*F&^zWd4{es>306iF
zX^${#MF&!Q%BZyZDg*klTb7P-!!9US;!N~WI_K32Am%y={F<{%lXwl4?`iEsqny<J
zZVVqsMB#1}UqpTZ-je--(jR5|lUNHny}C6%X5({}LFuFjGV70vh-WsUJ+oOr_NsrJ
zO6h3Y2^i%z;ffIZaJ%<Dmkm<3WVgM>R+_Mx2%`;xQ)W^lv`0i~e2bHKaMIHol;8J7
z{yffVC&&%`>W6u%#~M5V9>sbBle<)a9;SR85q<R1Y8mut5!6R!Q{#H903WQPkDp%n
zg}+f02Q-K{I*g<fGxG}zPL=QMA5-!Zb$u34WPVX&waSO2H9O7u1vE~^VY(2gzMDJ6
zdIEtNj~+nq`8iIN?y0BB-uU}nq)skn$u$)J-~JhE51B39)|K%4AD9`)kE@GKdnu5T
zG=yF`U;x?viO?t)v*#Nx@U@J}uTF-Hr}RMT=QY8p#z4_0=DRSVZ^=P^MQSB&%<jy%
zZ6DRke*uGmW$-d0!sg#+``#js!>ydva>HX7RAQ7Tc&y|Q&O0V9TNB?PGNt`@)U*t9
zUCAG3`&l}K|0RjdEUoNjl-i1|-;fp~9P}>W(WqGNNpjorzaLJSJzJGRd~MrU<lp;H
zEosMrQ;;g^n-AO2ElW4isukJnMaY<=66Y=P&QdTtb3)!hH>Rj(@3HIU>F2}F8QoFR
zyE5-z7qFgASt>s<rZ7J<=L6<NxZ=O)n~_Nr_IpSLKHc9UkX!}Z8}>^F^eb~P!`+^=
zBh|x?KajLpfPLIaGgegp+L?|L(g3ER{E(_x<yNR<JN5ZJx`AB(hG_5}Wbl!#U$SK{
zsRQR;=K~AFA6IobqfJ4gPw{*2J7-<mfl+cQFmpEh?%K)J>OZQwql-25;Q(&*;89w+
zX0$nr+r76THwA&|%6g9x&mA<I365<ITWpH}3sz5|)Q>4D1enhH_*R~9@8BnmI)UeF
zPT_(Bx0qe4c(XO36d}QKf9_}9^K45`;?n$1=!a|cLq-nhzmtzJS66cQkoQ;aqct3<
zH@7)9yxckdPM^QvJ#731`fzWwT%kWJ10OWDHA*kC5=ve+nima>N%Aw{&K|8{?-FYE
z0YwXAGF(I|=VH}G>)V=e3D&N)(dVVS)v3O*H(8^yjq)VFWg~b+H0<Rs=yUg&NG&ZD
zA<WULT^NRPq+En$Ewaj)&~b|`{B&0HNozLc!mI_#UjNd@U6|q3U}bsmYoE;b<*2Rk
zK=-b*m>4v_%)_IvfzBJh@?cCSP0>`taaXu4ym0G}?(LVVXD~m@TFtc8@B3NX^Yk1!
z^bjzsE(Rt4N{_X{fiGevYd&}J&ki009oXuOT?Lws2fu~9GcdL#xVlJs4emPbC75Q6
z9LRB{)bX>I^Oc@K^mwPAJjGA{IAC5;ziy5WHzdTB{`n-SwUyn%EDC64^oH(JUPp;n
zLbrr=iM<4rW0&biqiD-a+hYlNyr@rSQ6B`i;J<AZWO^$4_|0-fM~5w8ae8`<mxR^%
zb91)*{B(rw?E|S-{^L&W0ske?NoNB7GgCdoQfA%p6Zu8PBHuhl`IDK8;i(pO7dLHm
zAX)?cjvj(}{v`pad_m@Wkk^)XDUWBA)r=JEUi1CC0{B-9nDZCDheV)6M&lRaMFvd2
zV|x4l{=+y%ef0+&&$_}sZx>*IIgOyz?$*w*)7^exnn(^l?C}$bq1+KLXBFfA^<a`<
zej94<G_jz^qIB+t;Jh?<c`-NmtXMuoZ+8d+iH?L@U={{!(XGYlqg=;>{hS|`zDmWD
zVnaCFBX!-ZA0u#_VEXe5;HkP=z;uBm+AEC$)$Bn5g9k=%4QD@hgh>kfXTCwUGZq)d
zN5p1k^WJXOk%SlxcPnO^3XmS!%yihBE7ZXH50qKC$;m*`N0EU=UJc1KvCmiZI>#23
z!AyTs&|^xYCADX*9`g}tX@--nbZ)|L23prn*>e9ypXW$Deg59RGW%D@PF+VCQ9izC
ztpaC}kl0Nccw9v3E6)S6MyZ=ALXBSPq-`G-8G<>`fie5DJJJj%c4R(qH(4iU^_vd2
zV}<cqx%jkKiLIZ2&GKIk<ySrCND-_k*I|ZNeC0Jz#YvIgBcLQOv8k;M(+{*qtp!V>
zemvI&4$&l^&9Q42$P<#_y=@wp3JzS3F5w<wgSVB4>*o8v)<;z|S*|`ZNA(D|puL?_
z1{IEN!h*3^w|Bbs$4Chg#8{9j+=@pPCh*#=(67lw1JiA|`gloR=6J^;5c9hjh*&vA
zvyzXjw?=<Vv%=wI&5G@=_$hPW%3HDZVYOTA^^J3ACqZ_YiWy;VCg=UORF2ljHJbd8
z)~5@T3f#YoLDbFf0$@L961Yjc1KikOb?q}9IMoz5^!%a~mlMsn_|M3~R;77%x`CJ!
zrd3&p3B2Emd$#>@`KVstnBi4f(S`bl=$-+Ev5nj3M{q7liNRy4DIz%Nuk5`E=TTOU
z9w?K6>?|flw*T&F5(g_a@f4p`c^8@}JnBDEqQYT86(5M?bpsqB#|dhD8v5`9@~CzQ
z8^)~0XO-V3@8Er%O!|jY9kR%$3}+bw%}hyzqNOL8YL*Ik_oU1%LQcMm3>gsvl?DII
z)6LBA!FRUcy<TbO{U$0vsyc;!+H#VP2~nLvr_d(p*Uhgt!~-v1ZUvHco)0`0K~cXh
zi2ZtiHaY(a>T~ASR+kcq0#Cd~z)-@ZCM6Y)AXu$l($6$=33etIDKg$L1xI6<H!XZ=
zqFPpT-wGSLoJ572s7>3-$At&L9HvQ%)y;xGPO=4FyUhYoyLOG;_GChyyQ6Cr6rSVN
zBM0O=k7)V#%Q-+qv9Us41xZsI7R?mx?~Uqb6xhN2O~q_K+UV+-xli@zdSBW2uR+#{
z0-F{RSD~TiJx0LS`EX!=kJqd*2R0mP5@`KL{mIYnc2a4%WtH^M2(x#$HCpK7UV1z5
zL*N;lm-P-R{u)-;c6(4Hwlo7tZZ<8&TRaEx)%Qm`!zOfNstbu=YHInYSz*;O^|$Xv
z2g~=3378u*dl{_<*>C0vYXFSbMu2YfF3gutwW#5Jw;`f(){>Yk3z^HuT$^LNalbn5
zLnCDq$%}`saBlaP66u$>979`TYS@rZEs&p+$;YdiZ|7xw%7x>njgu}6t8K}y0_1ji
z;`g1*-;p_;vqe_h3pMQ%U~X=Uf4lU-oJmWNeqJ-5hGXe6%Eo%fI(-S(ZihxR`dYu7
zlPY@nrk5kbQ0rlD-7}$7&48dg^eyq}{6l`LrVE#OeHr%v{M-zsXu~jdLD4%&VD7z>
zm05o8X&$BT^*SGR3hH(GV8%Z3*tanqGUNwSFc=6rnvS@A_1+JiwwH-EJqSwu3Pzde
z7+8w#g|-o9%dqeVg$Vk`hdY76#7%?-;?mhgNfg)*wZ2vA%-~Ww!mNJo;J!!dqDM4!
zzEkd9Xb7aLK82ky01o4BO}Ro~>8I@E|7>Hk4rVaLqE}O#{hX{F<Ik9eU)*>l4M;}(
zLNDK_mzYcj#FjqzIR`9ahuz+rRtq&sJHve^Pb70jO)f{JSzln`V=gJ1yZrEOWisw^
z`M>eFuL*ZTcKn{3>O;TOX~Vl~=i{sG!j*-2W9tCXnNe<S#o&NPa&1DLU>e7o&1Oy{
z$R)OaB12!Qssg8xCPGnF-pTMPQG904HjIUW%v6M3-SQ2dD7R5~l$8D|#m=$2HPnV;
zS@-f)9H9%>&ljl-2VQ->xO?S4o79CiU6SiZC<T{lXF^Xe80;9NmFvW*hnFl<71<Tr
zCxF5NAL@(NgxWh8n+oTWU)C4KO>Ug~=8vfUDQaYQ7dECK6Byj%jo1-bn%i^depxfl
z$XlY?`Q9wqI(A)u<DGv0P4r*a>j3iQDd4zI#+FGf#oA_XZrHc)LD!28nuICI2X=Nz
zQ^M4%oa%CAWEKwPQVQoKP$QqMIEE0@`1LLpkAp;QLEfQ7skpM+I@?JY#a{k0&qc^0
zct;iJd%ddB*aNA=2d@Yi-`2S-5mD^%6_@_0eFXWVOjYUQfg(TeQw{MNA}7J7C!Yu&
zDY`wx13soRC%eLYTcF?p2dr^iKY9%@WqVb1`CoS&n42Us-{kw(5^U}(yW)@f1R3ap
zN+w--`FZnmG^loVC;F-|RmX}?;X_`op}nv0p>aq4Eo1_gcccJ$_wT`;SEwNJQ0PmW
zV5N_Axuet^Bkp+ejklTpq7WriAWHwB5=zUyGt-7N8~1#|p1VRE?AwDJc98>OPwN0J
zs(L~@@=C>l^bs*#uISuNVW=4!%8y@?8*<ZU=F2cWPKc9sptLaiz{~|-l)C=6<GK##
zM+1w@qfNMvbQ#GSk)?+Zgowih=igawiY<tm*XpF=Dp|Y0-6jc}9GPj~H~h&V`>Q?W
z5|HKA-g9N$j4Lxe{Y7uPS(D>xpi`273LnZ57N*8MAjht^pnRp#6h7!PEIIE|*C5pS
zS2&Lqgho%lHt)&SgUkg82m0YD;ivKG`dZ*i6Nk7q*3Z#4q2q-!Nv#E(Q&JO?o+LR$
z_I)~n7-W&Xy7Q3G<qGn}7WhiR4r0ME5*FbTU66;)h@m00`GZ};TF^HGKmR@meEA^&
z=vX<0d=Ws1zKYm$!W_M+SyQ6g;>(peI>sS)irr6_YWmwMBd5w?#f56c_{OoJtf@bL
zrlY`?t<vB^g$g)v!W8dKe>4E|NalEgKol|uc)uqZb8DpN-GKf&QrJrPl$3TiN=AZE
z|KX5hPWevTeA=ZV^>f?3X(K-5l6RgAqROzL$W80;js6K}lp+Po>Fi+Mtn9|NA<x$)
z3nMAhom7vyE`r)#<P<rFz*2*^2f=>jQ+KJ?zJ<ES(LK+nnqlAMX?xU}X>W^^3;HGy
z0KY6R;=FGrD#f4Q*$In|@BsHeB4>UijVFW$ko75kV>fFH|2L^M)tnflXMD3$CVbA8
z)lpkSqn(H3hzM57c%PRJ0AGJ?!I<>eb%ag-KC!AvV2Tg8x#kdU_R`B&FT?4bhJRJX
zp7^gsfhEmJvYyT&V_K%&48<+2*p^+J`DboZm)Ty28N8?IXzu$$#ske$H)7iPUCR=5
z^dejJyrYrc*yDh@N0F(NH~F7&nk2JvNGntFXlG$?cBe$G@ccaO<cGrbJ4LLMbMizc
z62p*_0aac7vY+7Yd%k?_?|XEUJY<ouh08m{2w*>lB?J0WBZ$5)TT%XvkAwIoVSfCp
zS7G;Z){_$PJvUyKX&QFZdB4xuM00!^e2eUMUe+|$Nv622sDlapnTT<dv-XJ~)!z`z
z6gG91qwRsM&C_{nlM)&M))zy=LP!?hCn;gh&jN8lSJZ;<Wx>pez*AXxO{saqTH@k+
zC(u|>BVAdN4&BJQ0qBUe0~fyN3G0_nsQp>Ylk?1l(AL?VP$6RcaUnO#k=mfb<D1++
z78I%<9)Yi@NHxbjkiB%RbF>*a`O5~K<DF`xh4}40c)-G+wd&mHf&Ebvf^NMUgB}`G
z^&h(MU5fiENg(WfH1+VmU)t(;;-~{X<+0s|nHKS;L_h1=1RHM4r*5?C&6gsj@-%2a
z?#9cf;*J%M?C6^!+flKhs{h(IE>i?meq+3J8j2ZX<!lz{99aIFF`~yb9$V|^WuNVR
z&AgaS=l$%{0QzWa>#)ja=W(mww-<7+^KP^wL8qYe>=eSoV-eUyHl%(9Q45v$xD(?h
zY;gn&S@@j38{``SRdIcI+sHMJLlqbdm!2tZ<NMBE<ePoOlF#1iA}y74mPqe|(9TPu
z6*f~aMSEVD&DdPX=e_^Wc@K>SuI88a;x7GkK@lTVJoH}7nHzZxcjA)%N`VrivT=t9
zTlAj^HCC8$2*!5w2f^lTBx>`^D@@MFrCmvv-$G&pS#%r62Pu7`A&Zg@W8Dv1`1{9g
zxF7B@YL{kLCBP)McCSUhm60rDhP}*ktj2JQOAeuDX^*Br3kLDtO}fgPT;VMn3{j40
z#*_8<kBB@=t0y0zQ5xm?qb`tEpcXrjt~#?_3&6Aa4=FWIQ<Ia}Ef;^ZX9H=cc72Tb
z%%8_2UJkzv`EZpJbPSZb9gM0WJEHUh1Nr7dZ(fv|kNe-n#lMV5{i}4U`E~ynMo)i#
zv+SuWRGmS`>H&0S_bqhb{eWEtSD}!(V@+n>$1cb=<pyAB53ZpdvyX_v4O3r`a*{dF
z|AxS<2V|z&?Jmui@?^fBw6#G=J5!#MaqpdWh$;<Gg_1Ya#uquR-)}vXe&Q2ShA_}m
zJpDo^Id&UUM&!3X^r-f&nHj(m;|UzrY4!22@$=ZhePBF@X@bRxF~1*n|NaLPKl0=7
z+fPLVzLhdP=eZm``>`x;58)lRcc&@Zz~%`j@B08k@z`4+p`<T4w~*l%ND(zZ9H>_b
z_!ZqQ>z4V`&ZvsIA|7Zy7hwHo21!Y^KwS@+0p9A{0~f04bDaxr1RY3$?YobM0o8ta
z-A97e-mtO7{z{i3YUr}$GYV;f)^{wq%c>u(Ryhw07fBv}AXVj}*KB!FR5;gpD=GkX
zLLB(atb7f*e}}{VdNQ}%Hhk+_R8vxH32&zT0g&cE=%qaw^q^Gwhu^!EXT~}F_6UH9
zRyGg$^|_6;JaC%7ua$Yt*Vw3Y>?{v4vPeA0FaBXww*s%K?YVdn)6n=E?R%=^$Oowl
zY>m6kK;cIp)X{HnF~Z<amDFGO)o{RNE<~YUs^~%&PVXskuU;Z-@l&4TN?MPKUcX24
zU7gI%T})q?g()zMf}U}qcQwjxmz5TtL)Cv!FofFURnwXZeZIrZxk%GQ^BV0Kqw_M8
zn(EbY{WvJnfgPMyiMW6t5-BoI->i6pdiJoT5Oer^54q@bV-Dp_Zv@a`p9K4Swx#Wj
z%=G!5ew&&!4*q%aG;fD5k?f|jTH!~!^NiPW2|Rc}8doj1<ABG`PUvOiA>56GjZD@q
z6}Z)Q5720P9Qmip);m3VSQYEdBNWD7o0jRXOD}-Ff54;Lv0*TBtOfsrA7k&=Xx|Ph
z`X@|sDYvrRM7a4MBb7rQA?lC9R2)+dg%s_cHn)zGOB#P&pZ5zr@+he*Z1VF_{`iCI
z_Y5323?&S9C_`Q6M}vxzRv_GLq!lSD`ayDUy}5@UF4w}(dA>4`ET>3QrSA$D`*yv3
zOz|m=vUKanSox#um05iJ^}knmN88VXMJod<rjN%ubKV1{0?C>7gA$>qP#Iy{Q0FW&
zpcgxYWB6mfegR`gCxXZ^$kVl7{;gi2XmLG27m#*frGgr)1P5>XI$=ufV<7Ud?RSa!
zV!=+fl?CzAt;~#mT3KWTTv%qEao6b-o{qQ)sisvtu&Fp*)G^UniFHQv!mEX{W&j^;
zOsR`pQz<&z*3rkP_zBb-<?V-9)PLc;%;SxG=@vFAo53<EgiZUG!yctXt+$MF_6r*A
z$nhMVd{I>hx8kWEoV(Je4*VMQ@n40_T=|`}lEYg}kpz+?{^47jUsT-uYR#4^e*jpS
zINW*F*a=biW<GfxxO3wp{AZ3E;RH57vx6P^$Fi;#Y3$H^;kzcBJ}V5F*5XTO?JtVx
zp-H=d)uk<oO=vyNh(9%}pDIN|7>|oQ>jD!7Rj|~`4|w8iK2@i@hw<j4*gOAzmKb)J
zMPHx7Z49rX8@{Vp6f)739P;0NwEeCD<RZhUEFS;*5x}WtG|kj%GSJ_jRe05(kvmAy
zTd47sIbv0DZd)><sIDFp8|R7N_^Zlhh4*a-HQ2&|C@sI64aG!@v=YuQ_)_lG4iU>!
zcF<D-2L@YV$nfpOs}vdkt-pJox#4Q5#jLG#TM5IM+c?p9o4?7tSCbkj*8*bGUbOg3
z<NzioywtA_xbH&9L2a*~Eb6ezP5LuhxJ~B5%zCC39fDM@JRu^!yI-bIvnM2iA`6bQ
z(ccbrZqDaX+8&<+bZ3b|AW&2abXIzirn=ywS;yH-E*DICg2Lfxw!{I3*16OajKbDu
z=nJq2jJwO1AD$Ulc$BOdxculCkn|)EZK?K3Y*t@Quu)9A*nS3;VUdWseaO8ouT(TF
zV?~Vn{m#k{Uu6@>&!1hNs?5i6xy$?eIfvREfX_uWX5NC0>%6sxM*#ti*4EnI!v<Qb
zLyQ1#*caf!3=BAvwH1gJXk%8rhD4T(CtL*{nDLkx^lVa$^rS=5S^;Gz_acZz4L=&H
zP!bIs2pFo2WbhV{t1PifXJ~dW6?{nuGNX0v?I#V6Szk^Eg{fHYp$j9oNJNbbi0@87
zRcs4au|ESS^=9ne5;Hku03I?tkGEZ4S8llKq~ii_SfL-r6(%@v3)V!?QcVdW8f=8x
zoASwf9ER$Z9<sm2cHs>oa~aQ%ewF8c`>z)Iw6Nyisj+qvkBYxADeCCgxY>bSx!Kt!
zp+MbJmTPw7@9wtw-R4v=Woi10hfw$;)&wCU9=T!D8CJC@$~{eX{H|QkZc?W$%oZ|!
zenB$h--M%^-+ag1#{y(tTnh*rclT!nkx)8|9K3FiSmXoNRtGrul5@a?-|JRF5xoqD
z5R=O8LPS<K#WTg>eb3?m9~nbCVw?uy#5m=_OTs}4X+6yAf2HTUF2uF3#O@Npc3h<n
zN)3Nr3O@)8JrG@7+E#v4c!7*Jq6nlhU-|yl-iA4RDFnN|?=^z?olxat>^D@u4693q
zLHCef47U=qHFY$TIUL<w`~1%CLB<Kyw%vS#JgcZcy)$}&t4D@=S!=Uetf7&@IkbUQ
zFS%&St(W~TH|ncEc}4?MTK$s#jB!gDq8MRdvLArD48tcu4)9J;Y!)ANsh#h)au9sw
z^WS}^T$>jX!xtoNM3-JiV}Gq5MS(8}w9jnd<&+9npZxuFd9@y$nWsR{sJ5k>-d2KZ
zz-6OF-^xL>yobF|Ud6VMh~`Z}A3sqLfkGvLnokdC5q78X(1Ly7?HXdqC?`N8c)N1&
zHPiqbB`Khv**`RKj4Qk?EwgQ#{NIFaEKQSDag*&q+fmXr@wX%!qQb4X-T79Wjw0$L
zuGP^46WPQ_(p@)PJ_IPHO__x_MCbB$MmDE3G9mPfG&RT5Eea?dBJrJMqqNZ&l4`6^
zl(Xz_jOz>gJ>!WoCK@N_i-}I}aKcx7X!2h@vOSNoj_-V3^=h_>T$xy(Qto6yi?os#
z3%sD=XTA7s+nXL;6goT{Ur}5q^|QQ~hLD?S0PK_=GmgFXaRH=H*;A}z7tOi7_Xg2T
zP5+=FW6kg~!!)7Bx}|g#7J~H=^spm0)w%ngzXwk2NyV(bX+;klRK&!4S)kqj$-9=+
zLOxzN4j2~YaHdQhz9zJ>N_pmvV=|bZ<^t0`CRw{XEM#yCC}3Pbxl0PAMxAd&$#W!(
z*ohC@L*jHH(A}p4U{%&+r+d_b)_P8lg>Y1r&wsY<uR9rZNJ3Alda=X)O4daM;gsck
zo&BEb#8u22e^v%t4(4H=e~p9Y*!44t(=xU?hMyLr7sLUdq8p<_9t6hxU6XKpc+iGk
zq!^rtY~Im)euP{(a=e@W^KBA{)DLVu28%4YnFQtjGOa;3xtsb~Z_LB%avP$#+rSTP
z_b|I0+ysP%IhSV4Y)$iPejqj1)$QWpK%D=bHwUk9#i<4-?g{|qHV52H(7z7$+K~+2
z=HdZBBR$=Lk$JW`(cC-kZx)TRiAT+67h<IN8vZhG<tVJk4?*dEct7%;@95j#O}C>0
zOiakJX#nv?%sNOD%ow9I{La06Nta_z-R})s?UV$ad^n#a2mwq<86PtBk1OG98PV}1
zH+Do=!Rp<2VMs?J)HJck06Oh?wu)oLA;q_#U0wJM-sbi7F;7Lkwaz$wd~o6w?QV*X
zS0e73Y7vLEq&}`E(|=*K$o(w%vY{9No|q#dzl(tT?*cEBHG=d`dGw53d77tbQz5o~
zQ+Ko(|7EzTsC;oI3I(Rw0;n8s_SM6wF_(*qG0EKPXcOC4-F#+*Y0M|>;I{6rwa;jy
z+a75DM8?|(E%5(i>0BI{e*gEs1DnIkA;%3lB}6fsqMQ$fh*d)6usK(97Da59<rq0D
zhlxr@>r4*YjGPZ0k+7+dlp)Od_j-T6zdvF3?$>=k@9TM8kLP5%l3$%U6M0A>BGRDl
zv_jVMQ6aKVCSbBX>hH1mR~-I5Eevp}^$svz{VClQh)^4NZ^PutNXz(g@^6A>tCmh?
z+_osYVoC+woUqo)n*=Qsy5kJ8;vU+jtv=aIfm$_(dacyZOV15bq*PXk*u1W{peTv{
z$)*#70s<xTxPF8>D0tU3)ijLgVe-448T?CM%S~ulvLpou!l~aUv{1^U6n$@~SQxqM
zF#br&lNs2PHT3K27BB(HdQkdkH3?1?jV@&Db}c1W6cn&p##8wjcS*7xnO8reLe1iU
zNrlJ=oPS!qjd-Lc+=*Xzlh}Q@V^c9X(+LoKpa+}|_((pkd$gQv&m6^Nb3ajVfV|5F
z!Na2|nagL705QUU0N-?buLZ?7sKTA4t@Pg;7Z8*BroaZ(0u^ba36By>yM7YXAq_QL
z{NgU}$svvwI&v}@bDtHdg}S<^z#9J(v-1AoT;4uVKuA3C+35s1H$}uo^5X#ND@u}g
z{U&jg(G8f4nfvmSc)Qq5ii7CBtJ@+fMo=*^#rXxCJ?bb{=un4&_Cf|0CGx<am^Tf<
z=}PlG>(?!m4NAA8Z*!NYv;c(uxIyFiQZe`araMqXo+N#c4?ey2px+1WeDQ5ZIH5fT
z0hc~a#fJqU<O5^A{`ncW*{-T5x;HA!lp;z#Ajv3+zNXec2e-LT6o5;tbDB>`M@v`L
z-8O~)E^P-G+oa#3_+YZ;mZkJOt>7t*Y82exNq^!53K-wI1TL-0F0?j?^q7jG_fS!T
z>UYG}muJxI+fB9Tr<O&(AD->R)+9>r`go4%-FKhC$%KBbIwAe1C+EZgxW`R=m}%XC
zi{>_8K0>I9C$ljL#aEImHx8RoQsopW7=0D?{eJLX39IX7F5J!|I~*%y4IRr->t@J$
zuybSmcD<-U*_;a8%^uX<4V+arO?k}w8k<+yPms5HFK_gakBrXm`S?+y##gT1GP^9#
z>f`BiFWr*`Hw5K)qT8iJ<Ar}>@Q++~z$kP)c}f-^j)ugmiaeYE(zg@<u0lDW@ZlY^
zHM@y>r$ZIq>Lw{3ymWKag!;$jlELiTsGHo;8|{GmoJByLSkv)EP5jp6vj*V0i#Y*v
z{3Zb-feWzzaUh7}TfLAr%KTt^(n-9dE?pg%$*LU*zsYU?t`8I>asi!L>!BqHDMA%^
zq9m`IvfHv%tUU3jg$@b+kc9iUB0iZw_vHx){-u{1fhAz1j`Y8%I?KDwI`9u)MGsoY
zBFxbf`cKcij)k#DGIFl&rWLsL6&B_+Rr$lj_lF|P3A$p2H<Q*C2UOj3-kc|G{{51#
zNBwZ&9H6-DNyr(xL?!=vWX3k3&H*kfJD~?4+c@oO(^!9jc!T0$TS%U4fG%C;aTChA
z>jutrUpYMV8QJY_*_kWp+;eqk%0CHcdee*TpQos}3go4O^xR|_8>zfb(pw@XIgg=&
z>$#GcLME<AQ@dB@SfW>)32U$a3*rEu{dxN%eCh5hnpc%2UAgx5n7E^@25}0Te*C`+
z$;8iPOMsn`N>E+otXhJ;oOaX2x2ySFLU$C^Myef^Z}SQLJU|Iujjk~g2vmD0sPV=x
zl_J;o*d*#YcO;`8*z<r4^v&u}mR~-SM3_;JMIupp-djS_u%#m)4rEA*h~Ed?N>wR*
z^cLK|^_7*-!?b75ZssWC{e)a^l5Ppp#8hc{Ser^;;7D>Z@IWvEn3=H+HD2E;Bfh)!
z3qVSYLfnThbv*}uo`3>QGM??a%(kxZ<$s64r03tsH}P}mQs4(l;ImlA0SQG=(htbl
z;qM<8F$=nb25Zru5;wsopnMSLKp}yb^}@HNx1v||$$6);fOe*}^+{GHcV-<96!n=w
zSDd{QSKomFd<jZ>Qdi-?7MT5|2d~RfZ>u2xlFaa|VA<M!PP@rlB@`kNCdw<USVu4G
zTl9usnL0?74g*c*>&W5wpQ?KAIJeIC4V1dKO9rD^G}SvtmXoE7Au~ZgCju}z27bI(
z3;qK}dA|H@l_BXX3k6)k=-5Nk{^Jck%~;Pv;GxnooB<T2_!yvs_h7@Z$HzRRH+Oen
zmWG`3(KD)O&<$vjh--vW+sa&gQ03(fZ9H~<1}oL!3VxYTQi4K@FIYgQ-ZOGiBx%Y*
z+J5AB-^Q(nX$n_7+%&=J!Z`poLngfq0eku|Ny;r5+RwwB=@^WwpLXr-K4xmw?JV)o
z(vh}sS{R&tcV&*5l72CH2W3Qm--!(p)IUkcKq;uHFMR2}33ZTpjsNS<PK3%ENx}%}
ztzDG8jv{u0)7a0OWyVmyhk4_I7v^!T)UP;!BL|K%j9UBp2zvM4g(v=YqppuPQ*dRi
zRTV(v7j-~qyt6_SCKhq=+vQ~LpK-F|_&u;Sdibw7AeH$;Oi<h?d}3}Fwa^iXdfIEz
zMqeMsQM0$V$?Z<1ZMJA7TrXN-;XDfF)Pkz3f6yQV7bl%_KkAvq>TbzkeL0iI)n9i+
z6khj1d2b}oTEgz;U$;oals56MaXZpZ0&j-Ou^y=xu=EqylUsQ=iSIj`c%Oq8m}46^
z&Ml$@vW!t<6^Trq(2(PmjYTcC5y5J+Ei;2vd>UMCe7Q&>u`Xg-j(xTRaRgr?lwREp
z<UEtZ7X=J?{}Pq7to}0B5$|Z3ca)}AD(jRh;X&4hG%#r|?xhNLyXgDXZ3$rKLz%tZ
zoc^O_Q8g{Ip6E{=YO-ISRjr_x|J<^Yje2k86m3HBsuZKZFmPq_SSs;X<tArD?HrUZ
z)`Q-7Vak+#q8iTs>`47AQJWku|05Z${}l60fs+<{&_)<>_1^oROjY{qiXioL#v9zM
z*X2xZtGj*JaY|O1ntE$aW!QOn8#}xfC7+JHss!)p*O~bOT&@3zF6_P4k+U<5MQH06
zRq03EeT(y9fa#&|a@M1!o0aQpnuLr}rv}pQo02BJ#va85Wn4uQxJ}KeLpJthDwI6Q
zAOEiJsxZffl+g2te`|4+$Vpbw=`t%Dp@2}ND=Jw@LP1*TixCDaD-M<&9(vVCi?GD!
zd61#M`f~AX%R6FgE2}tmo|y|+EG3ij3ymp1?PmOCiehgupC0;Q`sg~?hTmKIHlNHD
z6#F{`Sw<<~Cb1s(Zei(A(bWdsKCF|Mn^1Fh$_ykp(b`p-LXoQ0g1xPqS?s$FblW=T
z1t?9!9v8){NCcM)Jb4{;X(zv%iBN*<s{FGKrN(TUpuTu91e<R_J_Ykm=KI;tWcnAM
zG0wAczCzLyf-f7l%KSr}`Jid=xZLErnn~|1mNT9Nt)IIJ9Xk8hGdxEv#9Ei#xMJt<
zhVsjTqH5&pqJR{|u}8*Ln2TA$lf%G`06jp?G^hM`rNkUrwo8wCnL@X|$?xx14bc{l
zKG0Z%(DAd%3LVlgRb<nYs;iX1m(+uDSc;@J#&ZAOkR)N#W1Sw|xaqS}J|!VvaV6Z(
zr#s$;3|y;!_(&nGk0sH#^AB?+m&APks2>$rTU+IzCh^r_{5CFwrTO(5cMn}R@zNyd
zQYgwkIjW4wk@Tz4=?LPaEIZ$5zT6hh8^ytH(J8&jMQCNyD#Bg3EQu^+VI!2W1>Q3>
zR)10wO2j)f(0HJ!g4lny<DQqGoExG7???UmSAiN$ARe7B71|FO5Hme-6zHAb1aRc0
z>Q*O3gccEufpTci6bIg0^p+{2q~u)uhyHErn194W=^9c$Z8C#NlS<|rRA+yjfx(Z{
z@>t{iuefQt&5fkt?X7+6*ADS0xh->(X&o7~;%S7M8y{oAzvG7JP{IWpA`KtHb#O?l
zYbWHvwK`ZJJbR6R=a2%OSY&k;i$&l(Oo?((M?mCe;`^2Tj5mM5i!U(2tj~Pe+eepS
zV+xpQwAB@@+U?DNA)|}>>^I0a56&Y2dPfHsKo<sXSW$tZzhLO`WxZnYu3(G=6jVi@
zRsvr)a#mFaHnp7YHybGJP#yKTKK{+W?f}!SSNCg|*h32PmzbsWpOjc5tkUhsOztQ5
zj(cVUf67@uodH~=7OuttElwAG1|cZqpTPJ}-<Tl=|9(J71q`l9?4dwv++T6Kc2Ot4
z?gob2<qaCuC&SI~0qP`=orp8yn_Qz@bHZHBhst!;o_<8*gtWkN<K<rZ)fsQ<RSV?c
z=)8DoI&i2_dohW2#3;B%)HO62`<F9jXrl=#ktaasWL7$TRcgTLU>)(!E}a(1i?=La
z5^F2QeEIZW(2btG4!eXADRZAJ6gzrH)2#$=4P={M=^S9Z6>oINl_Q<>x?QRJri}IJ
zWFEKkYXhJ!9$J-V2As$RsAp1l{Yq+#>!aUZ5_dSV5xCaP3+(?6ZGt(2!93O%UrD*b
zXc&Y1i$2ZOq)Ll|rpC2R(Nfm8wpO(I88&LB@hqyi7`a-e%!GNL93>Nv{&l5pIkW+Z
z3MV*+4Ka{2?;0c7hpFGvPNKhTHKva51>c<$$*J`Se89qvO%WeAH)`M<0<kV2&3hoH
zO8?&GNIk3@i}|*_dgJ`q9hspmci)^`c{@4SLAiP?(GP`f_mGkR3zPgVfoi$SsiHE*
zyj^y8do@t4(Wxry-bul7>;kPEE_w&S=*tlGfV^c2;{XwZISzSYweGB^Z`{rMIkxZC
zkRWV>DhGT#TZGfrngQL{bwz>8{P@+D;jl4A5Ftq831?U%`X={%-r%Q8at@YuuEi{h
zm7nD(2G5b8-}mIlNwXhZzK{C5xhmG@xutUy;2z@w4<=88ZoLl>dd{2o622a$7kAq@
z9*0oWjC?<91W#X>df^US?CnOU_vr=j7Zg|KU7xq49!4dRWdBTAc-&xumf&fTi~ixf
z&q#?Z3Um3w3i_*fm@j|%x6!>dD8z{wNG9dUz>yPyr*mwq;-xKL?Vi1nM|3X%KcPJZ
z!Xbku(>>^cNTb7uX-RnrjKR5szj9t4oLflC;5Z4uu7K^)N|h}8aFKJW1H)viov)w&
z{-sOZqj>Aw7ZWH{^YTIJTF+r1LU_~gg<touS@`mO9|q}|@`p>iRT5*1xHA&i{zsKk
zk`XxpoDGY;@f&e0M$$G~q#`W97&j$Tw<O+W+YF{nA_|TJtSisJg;;<hkv2!eW!Z(N
zbWy&K3s@Pt1kT^NaUjFJ%+J2ej7;o*bGCR<X&Z%hJuJiV#P|Q`4x4?XK73gat>C+e
z{`NSUdEb+?%$OaIFQ}a0zO#xNc}va&C|IOcrl=0eO6wZ%`?53%qW&6d<s${m6ck&w
zp<b@?QKm1=Qr|3rA=(u?$-H;gGc7<eBhAOzNr#vCsGAmcS16G3W!A?t{1$h_PhnhB
z=%L3s!*g%_E?BTjMvb@$!cb*uhr~PE-`k!4u5;OcwE+0=jg!8_0Q~+tvje?q!labo
z#da@XDyZDQZvMBHvEQn8w}H&300ZL-YZ5Pi*TCWgcBAiI+80zjQrJ$=?Lo>T@4opX
z;e&O3(;rmR{EEt539HWCR+%1(X#E+ML@MYUWYiTsc62yrP_1>{Ant*c^H)gOrK^$L
z)700s@!>O-T0H1--DiAuIBb9G`>A8p&kw=gi~3!xmCD2f*`Z4}6*G-mm%R9^{^V~E
zutLd<NVawz%3V%5`nbS^qN(Wri#y-0kG>ZgTzzitnkHl@tD>o{m>9~Ep-K;Ye`~cP
zIOIW#>P7~V;jKYGKCRBq(}Kr`r2$4p6eKRjeNIe}&K(5V6w=wu{x1tRivsMQIQwHx
zTv8$w9Y;eHPxLLn2X4EC5VUzlfjLLM4hS7uyujL!27dj%k89+Mm-!<D53?-n*?!Ef
zA0sLo>lHnQrl`i}UZ~O(wUh(F8Land?I^d+dfThpIYPFm%P4_kyHOsexmEjVSQ*3j
z!e`Y1g&7660%1$Yj^F5^1YvDSOR}2y$8MOD#s@tS=6S00n@~gg%7i%e_qdwP-iIK4
zhWahvr`u6zC=nlkp;KP^T0T0a*JIMgTU<SPYs66&(&G{2{4~J+kqE)#)ay**pkr$y
z+GpP$>e0^N+)R_@d2{y9Ft|x;n?8$8o3|^aw-5!CH!k<n{ksBrtLIfYnmX?|UK729
zTB`(`kQ%6Fs5kZ9^IyR4doK;@j;a;zpe)-zF^SJsyBMj$ULDM4X{qmm4`>gms9&<A
z-qyes%b&%e!Yy^~R8?4DLrR}r=WZ~_{UZy3Sl~{L<29?QgJ5q1AAo&K{qG$%)Fp7h
z2L`6I8pc?^tZ(M!v79PiuHG<-uT8F<5`Z3rLJ>tS|4ObMGn~Ixd(vWycaZ&3ZNOxe
zKWSj|x!RuU@E{9l2vi~Ks|en;_K}UC9=s7yeY<{cPh9C`RdTW3pSc$*PMm(weQ@k|
zA!hcn;P4>)ZA06gp+dC}#+ON6N05-&yTQ{Y20i6wMQW|?*;bjt?;Q{RTi#_e(fR<;
zRaUlqzaUX;zP+WT9tP{xd!rYGIf^6Zq&!U=+2ZeE=P!+*#x~ZE9`nfoN>3M{qWO4n
zw!pDwQJZr^_(A%E|Fn|g|NTat6f3_yw6Zy#4cYKo3aas#Z|ZAaf5v?vOi%4V*Zg@A
zTxt%+)<zh!UeiGf5GygcEc)11Z|}iQCXc%d>IE7v8<yQ&F*1j*gD&^4ZS;B8)$nW)
z0ZUn5-%K>ycTfTGC8>I!NPP#0id&_ScTT|Shq{7Em!c#jYntoQi6aL)cA8+B*8O`w
zmR1f?|52HEL~`;6;H2X{EWi3JDLa)+MlzCcGLMHk@K>)K@&rD8(Rhf3LcyC%d`<zO
zn`FkbDpvI}aT)ioF>4@m=O71e?M3}SYvi|~izTD()2bzOOm1p%ulM5R|J%+xa_)l-
z$eN&*cGAmVM|vzX$!Dz!f<;%9&-R3`m{mijV2I~Af>-<fpFcC8z9EE;CHB!*cnNR6
zx=51#&Y0H~tC@|I5zle0sr%b&N$xEqNN|i3iK=endsx**UjOo=MDd8RfV$;^)MNgJ
z0?%oqqkCVT7BNS$?ijVB4m>$1(HtidZJU0Pq-@jRgNt#_SN0{P6i_NH?p3fFx>8uT
z<lmo1ru2To4RR8A<XnwR1(I9b{x%s*-R&BRW6(h07$`y;xH5*U4-e)Ekz!IwFThJ`
zrm~g>?q7=1r(|U}$7@jV@BIWU?0t+SFF7$!?L&%+Ql3{Gg6~;5UtWK;oC}S1pd*l4
z6y@6j4?^z=**5Jb4iu0}FUD*Rx=^2t7~wDpDnniz439S%L2U_4qK;J~s4?9xxYBEK
zYc%HT@A3qp?$-g+v5rCZi2*6&s-~RfR}Gxa190JLkR&*?EwLbW*%fBA)$Cu43s7W7
zO`j9`d*vbUYDYcbWWR552a+UvzU(aAhLC4L0kJ$^B9!s_VP~w5iR9!A_;+-r2ZR?<
zJy$k=%&AbNKe}M|uE!Tf8s!ORrUal|4<0WRqG+aCHA#B}z@!xAY`nmSyHfz{b^<a*
zDEP62xw%?zUmxe8zfEpRKgsK=hty3eDc|tB9}|QD`i5U1e#z~+5%TY!x9z<3U(B(q
zTR%smsP7&`05R`NfZJ>0*x4(a>0Eike9Iuil)7M?tN(6H^p;p<obb}RC_G+HUPvhI
zMrPGy5_W?aT=J%vEA>z2+*xxdB3r`_@r!(j9+5+KUG$_*zZF8bpdEnvZA*T3=8^2Q
zw~98F4~!B*|FvY#0T<R{F^y{`n5Kw|q%*)#b?rq8%}t=jO1w*eeV*~($vc80A8V$-
zAkhrXy3>2KI=Ttfhg-IC^?gw0W1EnvNbPxp)Xg94D)Ir<5;mDd5<Q_^ado|%_;c$4
zXZ_hPaZBAZ2VUcT1iiz~o*(L?bH8};u3VPnKwghE{?I^2c2Q7)j{-3sS7{rDKi5mc
zP-D#~{y}xU%UxmDl|*Q33kuZHSZ~ts9j6{J^@{+wN7CT44_ShZF}qNA9<`uDR*!!a
z&^F5biX)SSJ{lrk7~Am0SFhHN8@Se%nW!SI7jQ3dLNgf{46dpa6dFO8N**yP9RvQd
z1%Z%-ov+&kUULzEMgfVaeryBtnK9Lm9%I<PloSx_WPD1KQeE*Xwi<>^gbw8NZv`}v
zfweJ1{?9fWYVH`G`bstf^?KG=a6A?Qd*|s1>~U}dUTkEbPK@3BvdBj2g<AyHt;7)A
z>qruDAFH>}Ar!I4{HPmTURMV1RMe$F9Ux1uO+!pLTZU7m(#G-OcG9j78HksYwC)GN
z5H#Y;f%Ax<tFm<i)EC*Pd!FB%9-MSQGNs%;fS!g7!QErMC@S~h|KE2rRI)Gn^<LC$
zgeI8VzP#)7go`jDSur*nZ1#$r_S1)kJa{1NdnxRf;A5p;PLb1S{c<`e4YvP#hAOra
z52<*E&ynvBulcVNeBXtcm#qppgOViHzQdS3%Bcjgk>n`}B$RCrH}W<k#Lb5h!hizU
z+RdzrmsLJg1xT4d<GC;1d^594Fc^^LPziiX{#T}=goPAKob1J-J)b{jPW>a3Feyd_
zA`7XwYyN_mAyG@Y^5npC@=wg(@g^lU6;EnD{s25I<sC4ti4fP}TY~4KlVH{wkkJKp
zj)YEWs$Txl8Ea51V5BQbDK|K$)m$E*P{=iiUhtw)C|2K#P|%$(;b66kHmn@vdvAi$
zWP4@G%Qyc9^{HtuaHxAzE4YxM2s!T|QXy_l+YuX`--_!Q=nBBEAH8io)%n@Z(4a_$
zDG^c<l^aeS!3*ph9K_8g3ZchfWucEM0(%ILemYtX3L#5Nfmg2ufg4}WbL1Wi<@EPE
z466&OlwlA{fFDnmsTwX?ysh)4r!v{k0q)HBgp$E$yFm*cbeM3jw`rJy8xM2<6%ol-
zG-+TTJ7b4&pv=%g)Z<g74$o)ThIM(1G~2k#=zolX#3>U!=4MfumD>)ivuNbUt(XRM
z2O}z9i1!O;6LV97y^;PIF!64Lj0lS)3}nR|KK&OE9o0oOTA&B|5>@&9<Yt@8Ll9B=
z&rY+UY`6Om)9uYP;$r#>UUcZ)J^grM;Q{p`Xr4%M>u%J<t_{>i!6}pg*-Yf1a@Td%
zZ?B_hr=2k@q;)d0T+{_s*koq)tiBo&Dt7<@h40{<Q^P}!0v%>~#AoB+-;)Y9_Tn{p
z0m9FdO@R-$G(6v|O-Zmbe(Q5Q^&HF*<~kDJb3{TiC5<+`7z>$X@{!m#6rJ4U5Etrd
zh70D~_2nMR(N)RVoz$&rQ|g_hF`#GrTt%UIlOlijz+SL1mEgpVJsq<7brp!EnK}Q*
zL|Biz!25HpieyZ9^rxRte5akM_@GsCm)+&C8`m9E)vzCKvkr@3tGBq@7Sw{MSX|?_
zOZ)e0Lt8j|1qZmUZ2tSbf(ZMPLm_U_PyxwjpyiZ$xHa&wpcMh1Lw8zQQlzf*@5q}A
zIRj_hu{(K2%rq7bE3!xm;%_VnLU;N@2!i`750w*F?>TZ7Q!OE`9k%y8a8B;d0r;&W
zjKe}I&D>_kWN%VR+K%FQ>eRDEE%R~WP}GiRJ>Q0orl}p*3WazX3P2SVZODOGwm;Mb
zaVgZQWhM=xr?3TxFhxWz*?i}|Q9&s<Ke?MeYzv*-1~i>M0N7dHJKU`Ol_AU^z4#hv
zMNa@fl6$twlM~4gf&v45b3Wy1{7PM7=zC)lwtzi7mX6DDvJdj`9fC!16_}pUrrTVx
zXzMcq9uJi2UsKlPu5R|xL)xtP8YVRh3!QI*f&;~?9K!?<%?8`PaZ494u9`N@M%mK;
z^gY{n;%{FnzQpd?Z&*yWB5)Ls*@&m68DMS|!!pjycsU-Q!oMT<K7#5oEe)c5yJM(J
z+fVVm3D(So`|1=8dHLs(+C-9o<!ChiC-#Rf_<n0CdSMkw4`9&`N@ECcxm0Rk_2}T%
zblWLv>_Cf?(vWqIKUbYbxx_gz2-1M=$Kqy<<HZuBm8LldAL0EFXV=4L&LU>N9_6V~
z7x||>P_A{;jE7S@*;-V0cw?@pfMr4FHq_idSB}uhrU2_IHcwAM_CIsF`WfA0_zn5x
zxD7g7DoNzv@plnCY-<}5HzaJW@XRP_(|?E_uEMrMD2QFGg6=pHiXd9$<AjJGk+g*v
z4<{yEK(ex2xPwi*B`xzJ9U~k8Zp90`Km7HH<E`#s>rN*?Rq%|3aq_|a%Yy56)V_vz
z)Urw=MEQ~w!QYp@g7pvHH{;LYR<X8_iRRSwFDLj{#ov(9_ygq^0Qb1*c-!TVDz(VA
z-O)YF^mq`BMcb5gEc}~NafZ;>&c^>NfQH11ds5EH5MU<z!w{RU(g<Sk9G}zM4jk*h
z^szm1c^fGG@Qt%i77sBwE#UeNivuXaao}=KL35DA`+}6nl)d@=sw_53Rqg(<+{4-4
z=F|$|Huk%Bw3TDGlvYj%B;qy$YSv#;xc>@2a!yi)$xC-Lnv`u~&h4WVE1c^tO+#d6
z0&aQ{fb-Z_4n#18St%`#)-*K(l&{>8=iB!S+nJKk`6X0$ua<#J=VjSx**Tk{v|N@>
zOOBQ8xgSdY2lFkTIHD;{m9S#5TbYao9+n+SJ^S)a@lOkQ?Q;knOOCZ9D7Fw~J9Fm#
zlQ}AhdiXJtSQM+@Y=<-?G9|_S`SklI$nXPNT8fm3*tNN2y(y4k6Y~pA1vO{Vs`88o
zP=D$$kWO`e>GgJxdMm!ftDmDTHtfE*Fz!QDywH#R6n?R)tSp$b$gnz5g29PBdiz6~
zEkP|Cku+K#P8GuD8&^}Z532}LB<Kr57~8u72B-+@Nk8$caqaXqPQ+KEa8f~9-5uk&
z{kxt=p{U1GV3L;CK*8>_CvU0L`i`lkvT(Oa(l#+}Q7FPhwLx_=)^a8FPe2_GY-XOC
zezyAtNG0Mf%>xKIa`ZEwuRSSh57ZHf+3;z8{`w1jOplbwQTcVoMrHpHMvd8H_+tuv
z+;Zf>exNAH@`KE@t>B{ZNkr(uiCS<J!$0KHuPope>no>8i&i=A7$1rSYYg)1LYU)8
zK}{k;{L>NLg&*rVDw8lFRbMU6@xQuq`JDE<NE80%ZSHr+R_Z~$9W%~PcfkIGk9vBC
zlm80{5Sr!amT$CQ1@V^m+^g6{+83G4^hH#}Me)q^RO#EBXQ@?=&e+nQS1qG{Gqx1@
zW}2!@!^|t1*{E?`=`b0k{!DP$bn%Iuk+%31W=l)XghCHN7btnt1S%)&<)7D4Tbr7+
zY-`mHW+#(8R41f!)=Kv+L7HdN90V?9-3hah)0mLrjGg!73@7*9wVX(CV}OE*iEXzB
zzBExwFezZGlfKZQM!hJZLRzJD8htn3MNNM!7##&y;>{a;x_6AgGdM{Sz1R?6L0o%K
z22^+ipB+lt#__t7tw?FY2ciuBvHo>8p!=*P`ULLkzVIj5Se-~DdF>ZTg&uk63@jW!
z!>P)&<P5xO2R@Fe&>ob{X7&KHHDY1|9^3Si|Bha3&};F55MDz$Q#f;I&G;o3!YuEc
zs<q&H9zVWz@zVu<{SD&w%?q6G`z#G6gYUNuoH>wp<w<+L56W4|)4K6W%qeQ$9ZiH*
zL`SJKU%SX=5cQDpxavlHI0?i6OS#!1c~eGNx09k_G`5od#kb<Ma!>N_q9dI?B0n9g
zA{pjP<uD1zQMANcsddit?|?<phtS?#NV;)=pY^W<(iKhmcUS7h0s;K=Pu;oGU&IU=
zIY{2;Xyz6FAq2YY)VxWxmFmDdsI56Q&q==R3O_%8nb);Xl84Xt>(J{B;uPUEXn8`s
zZ436G$sii5)rJjew*UH>X8ku2kd^HOz7Fhs20H&dBMU2CNSC^0l7L+6jj1^w_8lMW
z_xVt2o{9x|m=-V|=pYBoTEk<*e`%}k)IK_c)!sdgO|@1mZ1(|^;JgU^-r4U2U%|p8
z?Ipo!XKC<e`@gTgxk~`7&0p?Cy<Adh-0P8FP+;XYoT}ltwE>cZ|48_=OI0xwt=l(^
zr>qf>eGOjEBDC0TDyd*|$I%R(8L~^;Xk$f%+OD;N`O){tmp@OwS=m}kHr!-lFxh*8
z>~$8XD)m=IJv#oDT_JJl%!^&4*9AA$a2`5&<2Fh8qSIUO-+h=3a%9$z-Dqsg1oD$Z
z70DFuU(!doD{wGeE;?)@<&-?ye5?AHemSKig^YeR2fcj+Jf_5cm4ojlE-2d+AVb*d
zjk;>@I*%;;{nS49*C2uVw^<H?sA&!R+F$YyH%BmzTT&|)JCuAzt3OlCym99n#DFqt
zz>Bvn6djec<y-eWY>&;Kg%V)f{29g-sfiKN$%$CPn3&ic-HN8>sKWUUr|c}Q`WDyw
z?qe$+nDH@KTVG+$B_hdlNn60`TmQi~kAV9=R-u4kR=w^uu!Aa+Awhq11bWcY!@khU
zWLPrMX){erAHBv<u1@pvWU9+P34$q(B_Cr-{O@P{SF7gD@m@8yn9g!`S=&Ry7>x)w
z%^dY>*@8naR;@;&>Mc{|=Tq)8ztd<nxHs;8!D(gJV*ex!w}w-z@7YtEPwxS0mqUCB
zaW{Sr*by>*e)@t2%x=HNV73T>9pTS{@Xr=@jaPb>0)Iw-qZ?x+6^-AFCUxPX&OuiL
zCm^8OtoArnoTEs`s;wiMtYB^zM@2*1l1cSB7@N|k+mMD}89ZzOz@ai@)U-?}U6~EK
zwK&tw)wG%AaLfx>yry=6@MCrKf{o{Y(DznnCi{Yfd7^l(c$@$^cFvnwtN)W2bazcG
zd78G)Mu4m|)!4ETFcq6G?~0+@PmD+SOn9|1#bz;Ox1)2_%=TxiH5|+(F3w6(x7W!}
z^4ncdsJ|8j55}Ex;#yx703?;5a!Z|1dlPVbF6rjcCE3^NyU~vYF0&HwjNlRSSs=^8
z{dmX$EPpWwqjax@$@@9yLpXy{YSM^gRwb#Rp88xC4y0hSi?72dw;G3;htA931&mj(
zp?mzC&@#09A{B}M@`)e%{ajUU{Pb-B(-LUB(O&UiL{J)TaR+g!+~dwKe@v=1smCqx
z)k=FikBx|BWE+oRzYRwsOU3!<5|q*lauYI2KY6XyRSczhzdwlg<R4M;M1lWM!-grl
z`t4odT%Inv%S{&JzfYGi^n85}I|*#y{JQiGcnw{3ZRkIX_o}FTe!tX8_*Su1d!N#o
zh#Op`aU0m7G-OheL~hrQaSN)-HquT%O$qaR(wqOz-A_*$VW*4BRdlZ+@W_S~LxfjA
z2Y&bT`QJslbGUE(^;-`wg~LXE27`ZAW=g>un?q_~RSq5j_15J0T*{|MhUAp?>+-4g
zT-yBRxbAQtrt}K(VAE&U6QoMxmtw(tZidQ95rndX1Ez!j`13km2NGaMHXfQ4q5D>p
z0{BrfSn@?bjTXYMyf!A&`EU}(z+h-K09)6lz@BmedAnVhsg_F*PtULPbEd@-*0!^`
zQ>w;I#Y#NI;=-^HyO0z4AB%#7-e;jL<+EVtp_<Nmh<@WB-X4T%_!bLJ{pHh#|13Va
zojIf<?QyW1iD~_>!c~txkHI3~AVQj;w#@y5G%oVWdEGD`wzH{?hdxwZCbP4Tsp>pY
zF6Raghd60M6~5bz{_s{B4SOkrehL#^j<FLrXtapD#^pB$0U2*zlUDlhvJl<-Z#VV;
zH%_Dmd<<F{4K(guA?du^R@5+)#_wPF{hed1mFY_74ep^v)vAff4jgt|Xzl`f_ErUj
zi^)q~1TEc~BB#%Z9AeD<UJC-Iwk_0X8HUVjXG&C8?5WWpkr7m}P6WUX&4Y~h)-K49
z$mYV<uF`I+?^Ui_iIx*|gFFiXR)4#s()(5n@rx;yXB&mMDDM0}rr7M)*V#mu_Dj@v
zr_%sn&Rp`qbphs+>ONXoNSCU(8DnO0&Ib_94y{ff-rg23cbKb~yG{sz0nK?PeJp*(
z2PtVkd;I<W`p_zpGYM3?2i%c;O$l>)?DVj~n)8CV^Jy8LX~61#azN^7E656F7o9LU
z!BwLviEV7Q^A@%4$o8`wM>=EOs@a)EPd$2>ycw}ossRoZfJ!j`-h}xE7oTEDo`2M*
z+SAiQ=Wdx%{hq9&(ly%*FpY7Chm@q4ChxX^13IY`n2#CFIb~^kjx$|CV$MlWz7IH@
zV6In;qsu+Xz+f_#LV96HX{;7cJXS^MAUjorAiTuw(SmO+fB$)X9~iHxvlIP<BesTc
z#8=Y=1VEu1ACUZE6DA0gut-xB-`)z~UpG9`*K0dMgdVf=Ldd#xB)nTihN0Y4io2M+
ztd<thA>Rl<+qd||1jMHI2SA1FJV<RAZ^njH#HCio=`3B*UU#YW=SQaP9LkHAkoWVw
z*O$&p+D5qa|5#~fMZ6T<L)aYe2Hcx1#dS}CPW$jzFHr<=_nv_mM93oc`L%ZSkGTH@
zHO-{*^OHDSrK_gLeJQFA*m+Kn=AjY@7z}UWX59V#^urs-UpFk2HKnFJ?FCB0LQsH{
z>b~_LW_k$wS`5HYIezYxjJ|}8eY7Hb<B1*W;UQmiri?9WY&NcIpy_RnZ`F8nd=EXi
zO@#UeDQ+;EAa?qSPHSsx&hMR0&xTbo#d1oUs~Z=B|0Hj>b%ak&ALe_OKFq{W7>8me
z0%QPlNy(iZsv<kjBg$wIYtu0gOF;I6Wmh`;juaV;fvLYVM7_QxDlU-XU{*bEL61t-
zKFCK0n*_CNWv76)$lI)9(JQOHoAQ9!@85go%2c7CN1a-oxd(8Jt?(~CJ>HYkbHVZE
zWfhBNf9>Br#JIP!8f>yej<>Kj?9RSdsK?tEj<eb<jq>W==NEDYiz-i*fGqzC?&{@^
za7}F+?f6Gz_wCGNu5e?t4JtE0axi_|B08Hpu^r@UpqTJ+f^dHLILO<Vd<`CDBPq|@
zR6dzWOYNTLUq&GEclKLv*E@W1(Xmgu$fnIcgpR4gzrKh#zwAK0KP8SISKk3v?<zis
z${LO5S^R}xVm1zrSoWXQcC>S13Q$Etz;^A+N8MVgi51zmtDED%WHgierW8#7stLS)
z=H*u>GAi(>vya884l`rwDF_-0f?)o&%2dA_eF>W_^qGS(g~B)k;;|JQE!=<LIos*T
zy^_>yM*|q#+V<!TL&Ytd8%@d3=A@TpBqUUmU?p35kwwrID#^0oPwul>$#q6hYbh6G
z-@oafL#6-rL+SOIh+E|3N_!CPj4xoEaMcOZ02=cQDF3L?oTPHbERQ1Jk8MouTi@f5
zh8^lUC_&FS0)1kY?x#aB(4TNk*J_wM+2$EINjx4#07uAOn+wq!0>Ly==mZgkY2UrV
zdroAB+3nk(Xz($Jed}Yq7$U`fA5T*wCo5>s%g^|E&;hSmO~l5A&|~|D>Zlv~ro!GZ
z00slaqnlf6K;Gx)4?<PGt13*ct@#O+DQ(=o$^DgfKU}XO#Tbs0n1dV&mKlJj3h%+x
z45{fIici?y$4*Jgmx$p`mjI$*>2Ph*3F8*^44dPjT`8+DetJ4K|A=sd38g7hp!llr
z&_adLW%J;Bw?mh|!;;1r0or@Te1{tNGI3EdLZs!wYj(FW{~R<wwmNHmVVx{VfbBeV
z&{ikUFB6<p!k_{X<iAaLgX$J9<0^tZ#3Ct-H|Z)_x3H<m{*vvkeIPFa<^G>9u;<?4
zxYx*2nza@9FQe-$TSol;>Leiys;wAfZ|NSWWVT2me(5^;DZ=Owh4CL>EMOfIa{6*P
zcX#x(Ks3`cJYCjCD{OD?Y=Dw&L1#P2vDpIdT-E0@`&^9Bf34zgJp5(~^nIvuOtupV
zcb_K?<fb^aQl3UPG~8Zjpl(Ur*}e7&oQiO*7E4}L*geR&vYKkEi-*r4%c%7P8m~%}
za#z{E92rd-DesI&HG4MLyBjf?<617L=hENMUqb4;c=Hw-9{Y!f(6Go^)YoEm@P$>?
zhfZVg?_Bf65%ML(an7&zc05Nq_~b_Y`*}ob+z#My2>7Vu<fw|#gkBz}Ki*V9h{B*u
zYlxhO|M#{j*|2M2<m?_}up;}B<~)_pg({i<o;Ve6;|y%$;xRQ=Mp)&9<y(~(kIV9P
zh*y#;-h>%wT(8GGHcdb#DlrVSj41BpT{i4~$gPq7jze*p94ob?Kky}I+k3Kci`%;F
zqLEaw2g!0$t|oh~$N;`Pv1fR#ffi}=Pcf^Yw?BrVchdi#g>})K81cVdq9dKtfBfin
z_ME+0xxg#UEr+RcVWB$4M_)`7ImCZs9(+&L@0Le}DtR0;T4#74YL}GeyrXY*os2W;
zr)F2MDu>D|mtPopePecXS<A<#3QBmN2pTot$2v|$0{t|{<hJ5sbTqIZIdr&+G|5@I
zK<z7t0le1Fusp9i;1K(TI|34Y$N}xWoB0<B8z!08>;JFGI)+=70DAi89Lku1{+45l
zs~P7A=O?9lB@rh>JCuv0D=ctMo`wZvF53?FR$G9{yArz~X;V`n!G7AFO5Ewb!vOID
zrbzwzru^kA6*OI<9Q;|0aX6l+nh;rc+z0z@O|ZT}z|dzx?+=D9erG=)GMjRB%XHu=
z3eV&I@uTi~q>uG1k0>X$zj_4#8yi66f#>0?Q$;=o8|x|U5E#TU02>nc0}2y58zp=B
zslYXEcP%L4$)Au`ls>PvoYBYj#L#$N*Q_ioZ*w<3oFqti4PU-pnRHCphWKIcz^@CR
z-bkX{^quE|I#O>08Lx@&2rQq-1r&ZA0b**+YQnUXF+*20RmQ}&tbY#=+i}YG3Z-_4
zU^>zsfX7g<5NY-8{pL*W(*1s5=h8(WQv^;wFZS~Jjv-v#;(`d9Qqhk#-(2tG{hEuV
z_JcU?jg9Rha#2d2Reo88RlZHJ71c4<D&3`!T$U#>gok<Ub}swZ^moaM>OS6#^W5U6
zkyly_5E4reg!~0X>XS$Mr0k%#Fc}LLFNc+GRZb^*KxE@Jr(>Pf#<N;d?};O}s-6*d
zxoqcPhQ$ShR6Pwyra>@;2}A*7Z_@VWt|~0i_MjO@{yQ@ZJ((77@J;qDo4yU&@Et7}
zxSC!@OSpZ28l}tz7PAi~XPMnM8=!s6IcR8G#9;F8zCFFP+=u;mm#K7tS&i4M&$!hE
zV)#YXHV89+o2zigXiuOXi^)6$7G4MW!TRi(j6qcB##(21115{u`}i*4bjLS3hP|zo
zjlMTm(Mvzyd7Qce_Qp3Lg+}A#%fi>Ja<1P@BO`~5e+C8yas-G3!Ir*vElgH#7jw_M
zUZ!3foB2SygQ@?nUA2E#7i|}<i=ayEVRrRqzprT%F^B4=yX&JpNP=?HdVHftp;%AD
zp>B@OpB`F=Nd<TKx(i2FX!)CQFX66TVt_UAqpTZ|)D?<P7PzPrMERg<9@&;Gsv0X}
z$(NU+7Oc?IQ>MEF|JR`4+_eZkJraAOzYcapJ(9Pn%oIaJj;EkM?TSI)a5fY0o{8nn
z>_<>9ccWeNGtt#QqIZZ`<@wW^B$Ehy{puB%j+5oS1j#Jj2$=NNlanT>TT$ugOQyC;
zE_1u~b<^^zy9fBUZrGgdAYBY!a%#SMhXC@+Ie%0L8T@@3PZlAf^6;yFpqF-BWHr0X
zlM|_Xj}EUdz->b9l-ZxYtkOn!)02oJgr6}>gLc%6afSimLS(WCe}%UDXVUxShvb=r
z>cjUEn0%=qVt{0zA2>p2(w`&4C2(?o21p*4C*s}QU~bs+03!Ji@HoUXM_Ei;pAp|3
zzS_Bm%7~3a8RqAspL#JwfV?8$1M&do-*prw)nO5KR=$EcInIE*1YA9Hj_Z=*HGd3h
z(zAZhy5KSfv~^387Y^aAtr*=X^w^peld2J!Es!s4^}UW(I2x-h=C^&VYdgg^S<nb<
zZ0Qj3=QRf~gV}QyLM3S;10tj3$4-{2MZGCpjj40gMW(>Ig2%bik;q$>lVP%yYC(O9
zVYVted)xv&HXhI7&Hq)T*48pG8+`uGA;tAh-p}?hL}KVAM53@a!s^rx#Gb2yh~398
zBd(&Q5dp`}5?mw6x+RWUMp&nizkx%Miv~mH_>i@(E?kFJuz_I{ng$X+#FtsGM1FzF
zydGX^r)OU><-3yv%6x-V9dnpaS>1Nu+OmBB;ZmLy5SQ`tL-6mkb>LR~6?A0d!_*6(
zPeL~Y3XhB@reZ;pX);pgn;Ps;_S{GC8S}<!onkpPO8y#6GkJO``G)SHR@Kg)7S$H<
zp6-oVptSKZprrH|$lU7$Ft#uTn8bhp!tvuoA;@y(m(lvR@bkR^)cb4q(T4l|(O-O0
zO0V%|!Hdt~129`%6d)rWMNXH-mxzI!!$&YnFS~)KAp^e}Xn991!AS<ztU(hf2xMQh
zgaQvS&9HfSRm3sXq~s5(8)zNzM;?hd$r@J(Ovoo7`I`xuGUxBA>0~eXZVu|*1Nquf
z^Hj4Xd`rE0Pn1M)@LZTVQ}s<*3R!V_z>X=v7aY9z&V_k&eKj6I1yR`^Ze@Nsf|^&(
z>FFV?9KcyLUJeNO1swIyZD#`|vqUk^C5rDy7ppWYO}Dbj)hzkZjZ`rVTvs|L9?{*>
zs&BDP(&O4XC{lzySJ%_Ive7T@80+g(p4PD-4XN)qeHQsIp)-QBrI&K7Y>pJL+Eh#R
zoQJLiNyC4$B>;&BacJ2?5U~>Sf~gQLVKezu)^w8z;1(%DSe7MF?gS1eAdFlF0zXR=
zo;CO|pug`G0cU_}3Ha9C5Vqm$V_STffNPpI+@Pi#(DC#~shY_pG)bW>m1AJ16x_*t
zad>t13PPB|r)BM@9YwhQB8epZP{YW8m$*juRn_rZ_A(GR&As;fZZl|Hv9I3etR+2A
zikQcBsnhZlYr)9J!t-`bB-b(IDccHCfw9ndLKm}f66mT^tx>;u<CI@8ngc%k;)Xp?
zL!{Ad6?omc3OYf6x*~lq8;Arnyk8&D;{Et8&*$D~Jkba|POuh;2E4*IhIb(D4Hidv
zT(?LdNS=L`!8+5DOFo(03is}W*j0E2#3gRdkSbon6`l?8Im)Gssg_;TH!Bvb)iBb6
ziE?@1z=>T~Pj9Q>w``VF_lyailA(Q&j(#9Bji|L%Mf|yQ*B?;)l=lqoJ7A_j^A&pu
zofVR_NC5`}17{M2XP%LCWbrP7RYjl%AN|ltvbR4etl27=2w}#QPXQ-OoDDX<r6rwy
zsIIF^NtTqSNUF%gvmsjWY*h*PeN}nB@{PgTaa@8xVB?(1Hs~u^E8xECSK(zDPyhb(
zml4-T*g7mf%7;R&ok}?@SE=;^LpaBa$E5ZXo;W3XuLEH+;pauf8hX=f8BM;%+Z%@L
zCo3zcK9%P7@W}~5U_UK)V(eD~VCFuB`?OGi#e~1-i5D@F(B__7@4_c`WflF-gIcl!
zkruSS35*D?9vmM0TVc<l%C?$W-Ztuvtptj6<|nO1CI4J2d8ibek_?qlS`?kfY5$(V
zgo|ciF;R=yjrFY*ZhuiWFmB#V<gYF7V^0;$p}i9}sG)j7B&m7@NnHa=ovbDx2WpKM
zgrC1k0oN={@Y8Lm>~01+M@I%MN{yh|vKwoMC#<rZGJ(>BR9pTETjH&|rv9*n!M{Z%
z-?%98;O#6VV3%`drz%r0<k^L&2waD@DApsc1g8=I(|~@o3s#jS7I{+)pg@ABKqVVc
zsTlVgijOy8504a~%m3E(^Cnn|)NUV(D&QvhMnRI%IbHVDbT$z14IYoH;3tLBEJ{%3
z+bYF(ho>Pj&JszmkGnHISegjJ8<CS$+Y*v_bB$-z;j`*k2z_ehPxo2sqgs93x2=sF
z?)=~&^Ig9@HG3}6V1u!Jn>_zMh#CgM8XIA9W3kOiaES{<_!J{406(@#<%*9(5wg2t
zZ=HH*7dl7aC;X6$Blh4S{c}l>orXdo=W;ON8$~-jOH}_PUq7YM>ZaWhrMUsv%Q}3>
zF99(KupaE0LqNivJ3ym)oxZ`3)m1PD_$D5xI9-iuz6vs7eosTG;2;)&(ae^2e`eXc
z0{7KY9fP&fo@_G}WWM2Gz1FP42Q9kb!mB?Bf_<1@G<r}VEIr_t`ejPx(Af6o^<VmI
zjhhs}-RK)3E^d7X`)=4cUP@P=PNU~a1q@{3d{dWt{PFK$%l|-D&Q_=XK9;1vZ=0mR
zW6!O7O#vRwwcvEa`ffnwz&Bsxe`~UFA#wuB+na1mz`PZ8-B};?^`$gQAnD^)Bqqdi
zO~QhLqPH(COmS+QEIFM~1e+kqz6&Y=2_3veX@3v6;i_I|n-Np51!{Q?7{WC#OqjAu
z-herd=F1><?u#h3R>It1BW^y6t4rrD{{fwF`v1{~C6fe}5f(R%dxTGHPE3eVg};~r
zd2`wZn1>ezT6In4z`(@(+Wuob_XOj3^SbOjP)hbk+1o27sj@w{cSJzWmWz)3wsQJ`
zu`xjAt}$j!O?w(!)H&(b%0!dUizz!jlwT+&U(j&&Mj#&XJP=PTcOt%2=m7Gs!~BZN
zCB;sPJXEo?IllwQQSNp|*ayHa9A{2?TPE^BqD`x-W~xIRL3LweQ~ulT-EUK1kDUZs
zceoR_wwx+<SDwA5hkHCm&*S!F-3MIW7fK};il1>fimA~;WAinZ40vhyfm1Ly^ByTF
zz~FcpU|?l|a=u&}m@`(N$=zD`4cLt_1l>nyK;!v2F{*yHCQb%%7>l~99+q`zx8?kG
zA&R7yRviz$moxe(mhv21zd9wx9t`tgg+wTOBX);&f+d&a2A{>7194rBVR{CoS1zY<
z*E$~owNDvPiTdX4tvv2$(4ihiDiGW!=kecgIje;qNz@{B36usZ7+(TWye#47Ls3aQ
zBm=3rS+~i)Omz*7pV+@i1Zn3r>OgAKPP#~nB&qk5>Z2gJTuHy2PoLh6>|zOS;jlQ~
zi`y8?i%qE8-s1qZ+#Cop3L_MkNJ*T8J=Dr1p$sDqsC4ec0N&>Ta3%G`5J>3s+Ncj>
z+lqR{IBo8)NVn?KwaulJW#ryvkw1aP#y=(5mDwtoA5QggsF%4}=mlRLl&j&znhOR<
zB&Eb}FQw$FA=~QqIY2$b9jo;9GCJXtsdlT;cw!gt+!rP4bg3nkZgk|+tJ{#Ab+uMz
zHyb`%dg9W|p8c$;K_BE-VGq_>!i6pP%kF+H?GD;L+R-FCh;H^^?VQ2vl}p9kje2le
zhF+6@+{!eL{ZZcst-P^yxaGu-E~s{UVpAf8o7w=_2#NJrEOAuXKjZb!5wI6oDN%zY
zufz{Jc|J9=lM>p9Q`+=XC-{)ZTJR6>GwFz14G{gHxAhmyDR(;ePK<(C<bZ3g$kK!a
z;K2I`;LO+;AmHdBz(P$o&MKESKW402j*MZuXd@bSf_1%@0!W700#mX}Qz~(NByt}A
zcdX#5Ept(7+;ZJDamzQZdpX65FE8;Rakq%!voQam&r#R7B4<QPv&c7DHYd~79yH~%
z-mBewePN0mII{i&<1u1u5bfj;G;}D!g8ix@hucJ%v%t{%zjdh=_OLlTtE@|*mT=m~
zykQNJS)Nw(i(FOy))rDDK<xR)H1kb<FK<o08ri#7w~MB3c|C4zzKr|*wiYl_p-eEo
z`p=O4@uLg6ylJB+T%!1fg+#J!oXa>PsBYo+{$o0M7xi6mjaK8S#sbU?lQ5Q11ePv^
zwg3(EAZ3z8`=S@DspPFHjp6FM?gLrBuSBe3&ymjK3in^_Mp=KHK_^C>)PIt`(1~mH
z77ZHu^DLdqJr@35#MOtSxn)BO-4==wjl(Mc?=^&fw~$Eb`;HuU*Ry<CB~T}TjzgD#
zJ$4^z81pZG*K(}k1E-m5udzzg2h)$=?7+UjTzhvK`^ji8{7Xn{!|fAHb=6k<$rra+
z<8e@%Q*L7H$~QR$It|`UzMQeTEUT7`Y^(2&1V+EHD|_0R;ndJCI|MAuw_q+uv2-AT
zm<A+5M&k8JDT+1Ff9_?XL(99GxwcaL<t*+%*-pSDRLL){d0UO05kH4|nzWi6g-uXp
z{Q>27!?BxjYl1g9tLtGL>C4v@;+Fp^vey~oXo1sdjw+1*g!OrO^C00dFD3~*fOlH@
zUeQ#2MN<|IKK1!DqWUgNdSL>LwfzCPuJ@hMD@AE3EN@>ZW$m>pwYd&Mow8$z`Q~`h
zo*oK*ymb)n4~|qMtc!!Xj<eVia{&NI+yom9D~jjX(lAqBpmE^f|0C(l<Dq)rH$ID*
zu^jt0W8af?Q1+NfiXtkah#7k&6xo*<!`LcYvS+k>Qi(|l*@m(2QBm2KD6(f?ey8v6
zpZR;vc|GTO?&rR*>wO9Jxs6}C{9FCdK?yW~ua*ytYgMF>-$0B__G472J72#9yfI55
zmw3WV4%1!&=Uw7!*?*Ldxz5$r#Fi}bT;%)D3$OpaVY9T}{M&aENyyp1+;tTH4^s5F
z_Vz>WJ1J7{A$0f9{lyE^S1-Q-g)0q!X;m#Sa74__K4=BXeA`=qbO(nvw8n!&%kPd}
z8=C`5_;=Zl1eUkJSk?Wmrm?!M$19@D-g-q20&a>0R2+tANf|*5n#FChYpB1C*}ru9
zg%6rj!(JcZ|0Cf-j(I3)(!6&cu;@}WVWrKyq!HEo*jbiK!oaG=E?Y_xiR301Fq#h5
zyT#MQWL2b~MtPhpMsSC4^(#eTE(;MoI)Fi@xXaL?MCuSeeSwVZ092DcVou8b1~XTX
z9)f~Ek^Qb#dDm|@>{M(eyd2aV9Ebw1PxXB2=1lZH2~2iTUg&S{%<C|<TC8FO`+4_}
z`TOhWe)~xTHG@Y-)RuaxJ}R8qS5cZTZKV8A+Ndgz_`ClSQ2n?LD!Hv;!+ueX_xpmj
z$DY|((r-m5Ei7IPA<dD9>-^Ds;^Voz(}aZ3?0r3Esqyj?fe*W4pLb#{8~F!Lz^#ZH
zIBnkO9&dfF8H)15o?(5e)r$?@U!s%blwt#uChe_TblORl@_os23*mA_pq%9q+y6wV
zQ7KsT9t=4?u=#8RuCA!aWFTtaEWqjR8;{7LM_LYC_j>!by$wKUUcC69fBDEx7d(J#
zm;Td255-)pa5snc1tt=TZnV3lP=w|N|H;oHmeC^%gWE^jrFvRU>+G_Ut!S>QXw=}}
z+92}c_CD{$h7~#;YvylV`EnIZQpPCfpk=0>qIYf#YI#?#$4~rJ-%(9|Ap|+z(^T%x
zrYr{sGI-VCTxv-3urMUAYm+TYsV`5++Jf_G>Lqn+wXd*@m$Yr9HIX%!bVPuU{z=B#
z3V94{HhI9lcqCy`LXUsj=mDG;F9s$EYmYy5j8$V%vKU9518u=2Am`$h-0DgbVR>pS
ziaIM<kUq_-aQ-}!>%1A1{kK}w7QVK_?a>@BwK}(?p|tV+^n|Om)d!cXhsN1>i`Kjw
zn_|`+x=3Lydjr|asB3yFBx1oh=f|O2%U2%ZQ<5TIF!*4S<l4_i?qw-2BKd|<mlek9
zPKGKt7JCC7d6RCrcYn61QOp0cq5f=lKyTEC8Y?RFw<8i6$Q%{*Z6cXFevVzEsEq6J
zX)bLVETACt$x)NgVl7G$rzC~7ykckjlV_Wpp)^PwnfQJm)h0s|;#iO}9r{(%1R1jZ
zEmaG88Bz*qIj(~6XM-?gw*FN>=W-Wui|THwTt(V8Zjms2xUccA9qzdr2fbY;7cK*{
z@v7fB?Q)aPp60(M8;WvvzUb*Sr9Nd$9WYSW$U8vl(JdvslAl!wn#B6bz^luYM$Q|^
zvn{V+<(gW+Kur@NDN^W>n`#ozlD;e)+M_E^A+5k+?DLIZy$yH6Tc)BUF-DPb#{zZ9
zwYt~2R@wWMb-1w>H*%TupW~Lps5mZZsfNy0f*R3+|J|+UcQK!vy)Iq205=0ipjpki
zSc?ZY+_4#NT~ek5U92Z!0K2H*-TM>j8czcl{p*YQc4mf1YYx6DP3gdLe$XG7(MijJ
zeJ(?F8;}&HbhM;w72hPh1YWPYyu4UQ>dH#VAgi#<Uul>P``2vfW%;VS-9Q@B?_CzR
zhtwS6C-YFsbj?&;*Ok3+%Y0jD4#WeEJpKDw^%}N=Zp-U^?$%lxF~bHYl^~W6PDJ!9
zyNoGN_59yqME*OaRo(*v)GKQ4P0YUbw3$zK7;470%}bpZi@3Wg&kPgVaTIEnHOZC#
zHVv_s30p~NBf|8_c2V^jHDt9Zur=nHGMOergY)kl>^&$vT=t-z2$JL(85Ub0SzRLG
zEl(CGcvQdM*6>5OX@TK@k`#z6KgG33ni(^vjSTcKqu8fgk-;vea98BYz5(3<*JQ>?
z-&~y&JX^)4zr=nSoqjQ!1X<`mX<Z1-F@Rb&fsye{Tun4o!@GqZ^hJmoz=kKNKhGqu
z&1mrz;~>_ini_5C6I+WWSm~5+)o3Z@D#C2QJ{;`p%B!u;95pV?VL$>tbj2mhT~+|O
z?KNfb88-D}2QdrJpYezd`-#=?3$m>1>0;!b2%sB>lQ3vqvpm`DzaYfCwi<XB7@(2&
z?at$gPKr9<YZOHcUYSQx6zO5gJ*};NZa*WDSAs&Q<s?4jbxwce!+BYAL^KSbN}L8n
z&yT`i#Lq8{X)N&6bnt9{e;BTnz#`MZIP0w*LH!aBEszK&i9I=C#t0)=t;ip<e0%3M
zmi110-P7RJnGnD@=ma{g^V(aeb@G@JBhlmMJM3G{IfG7(;bCTjUkFcr9|PJo<urN~
z;7|XKvH!+<pD4@5kK`Kt0stTh>6>vqrerUwfyN|7B^+i()uWxlV|AY3XOtIMoQB8=
z&q|nEs4sEh4~&YtkevIZo>S2GVh!%$H(l6LREY7flRW(V?h|+hKez|CCPW!6FFh3n
z;s(`SvK&4=Pysr`XcNc#nhwtu88b4Z|0lY~iQqHZwUEzVht-cpa8!{~hPGJ=Rmx8i
zy(acUthQ5?9AeZp94ljsu4lY|h8B6MkXCbJehEyZxb)RdBQG~BZ({Cm-1yXs)P{lj
zG3nhKPPK01Mp5Y#Kcmk9cM|l0yTn_7;n`_PRbC>7Nso3_X3EpPS&>gX8PF-go?;)U
z)6@{KgL<SfDL)l=e0%FP8R}6Omhs)rrRB4v)PjuSW>MpVJ(u7OA3s$U8Vg#nQ}fhK
z)4tCS#0DIxNvB_6)Fh8YzEo9(dY#r|IK>h#iqK^y@FN!)M-;mmD(!3%j<AfMI!jQ@
z$E~I6Z_7)3n!@27eDL38ggcsY-Y>DmC&{3R!XF=N=*68V51-6&rkYxwYe2I+oPLh^
z-1QfIEMFWm{YD&p06(!m*F>bQ%~xoN4V9yEBcy_iAd~VyN<x%1h$gv0N`CfFd;T7}
zpsi-V#4;J$SKGyHe6r-dJn@dhS;uHR&yYLIo2Q3s+rnEsryoU47vMhbPV>%*%cZ1W
zd*5h*wvRFQGL0@7JW+MOu(~v3qQA~zyt)*ROUus2=Vun+t<B;mW-EMw0x**+cy|iL
z6sH*$rF=Ws)1!E`DpNB>Phw=)Pht$=o$X3~F?YK#0s;t(+O@dy%a8LR8#d<k5@fgW
zEqp#0SdcN%v(#|=)?!7Fu~eoTC#X)^<T%xtWgeejTsh-L^dv|socWpr20@s`z0{x&
zY#9kFcnDF;pLtO?EB?bSMC?-O$g3X_@o>%=^nV^7wCM4KU$-Ir%CD8U-K^PIorV#Q
zUg`stR(H0#+vtaS9bOPGZ{ffRfdwC)I}q<Ls@_X%#a#zn$0a{gbbBG+<V%|&FJ&iU
zH)`Xo8iHG2{fSv1TZWJng79_7ZdF54&Y|FqBXCeZXb>$?8w4xSJ3K&aSUiR**Yy^d
z>t8gbItzv0Q1wDX101IKH#PzGv3BF{yPptE_SMpoV6Y7Vv64g1Xzahs2{_!y)LIB$
z6<fH#ujYd^J!6SHs-=PC4>U(cAdgb54(q|pq?XRA`d&<lb5!H9_xvsDl;kKp3|y7k
zj$sTx`7jx#1i^ANYq){&^xWjMoVpI>LAnC-zxkBWFY`Lim_@&O7whe_JAZCHgESaB
z0%g&TK#&vXgN|ugtm?3PD3jKKWqlBWQiwS$<=xJ?kVh%*IF*v0NsdT)BO@oAWp1u<
zO37fLS<PQn9k~|02J|`vYC4M2Ce(-o(}`bCTCf`bQOTx4o8;nXb{LSyIIS`lupDG%
zM7Fy*VR(7wh%7TUVp&4C$Pkfl0-euJDNExJC0Vw~7L0Qk+(8^GfaUZ-yL(CJl@V|L
zAV<isSJL=%?+9NcLtSETA)wjttI>ddq=d~;@`ke^HD_DoH)_lD3V5KaH$UyoCACK3
zPNerr)@y}_@5h4-xUI*ev`Qp}M-=M{Q%=_bCp5#e!RG?q??fL;Fe#hyg(vkmt|Kp)
z%On>dkedznFJXjcx;=EE#XNZE_)+C<TDnJ*b)yFdKzt@7FZ(R)X6Lge2CbE`d}<bM
zGWI4Ps2Ch^(cJ-&es>RV9GFwNEBev;?DLpY`4REHE^z)Q&);%V3_J0D-1A52oA1(h
zk=@GtJSjGU9)#fIx{s#o{+$TOf!Fv8+2Mz%E|UVOBqHu@n@R`%>#%)_2P@Mkb%fy^
zf5`U%45LB3c8gJ>JZ5K$!(4=sh}V2BH7=`di!(bhXD%#0dx64^kGo;dYI@AweN7<9
z&_7x{LX|<$0e1Vln`0}FKmGl?q)tr=8c$!BGNr+C@-iI3>wFw+9>U<Fu*jdZ?i95t
zBq{vDzpleof5opsX-WU#l-XivE;Ki8B{WVDu`v9G+gfWB*F1)APAOeMgo*vHoTe{w
zE=XzmX>lG~@L!o=LmJ$gbeLLAYyrY)C%BxAGz?Lf745D#V|6u)_`k*@7Pjsp#1f>W
z*cYg~raVzApOelV!JNG~kMY^xLr4VrYYe!Xao!<dWnD~3Ksv;v;IuBYp(6~K%nj69
z(2o=iui5)3TY;`KI_fg#y~B`N;x}DiE=b7Hq9ihGsByldBrBo1?MFsOUi?Pi(8NmA
z8Yq@XhjJC0Egb~Iznw8)jLXuG>~McfOXAMb9@1+QeKk47=aRx{>pFftO4ltDL3w43
zGPz4V+v&FR0AJ>h4G0~?hF96O(ZgGhe=MfLXD;jLnIktH?WinMHp{=pVn{*-G8C++
zXr<WB);u>;89bm`Nc##M_oLKh{qYFlVj9v`VY(-i0B_3`NmUlGo<S%%2Gh{f)?A7n
zu`c#<Oln6YZUpt}n32hfF!Hl0T+wb5tkvsmU=FIw95)oh|NPb>++6)B+ON=&1sctC
zW2919a;77<$a`!ZnZ0Ao2wHP*=QvT~zTFA2y{+~Xj0mj64976Hqe$zw<rF2dV1~4m
zG`g105m^(p5WXHT#ODo^I_B(a5ll&G0m4cAG%%ia$z?nvM&%1)dv@1-r`+wD?mA`~
z*^ULg#`>q$Hd&RQ!GpPrEh0^n`PKS33m2y2F1)&ajPjBu^*--(5JX?INwYs5Z=V)<
z#DPhsfg;+iP^y%J?Q&1pRj4)FjaKzG9?q^-eg{zuU-6xIa7xB7vne1;zS@A(@d2rb
z*4x93d$os%vsc)v&xzY$nOwooJd)trrqEmi=r_b~TL!fnw<b<w6YINML%YgVt_cb7
zTnkaGV->7sw+#|~#r;e&&|Uqj!8mAP22VWED7dZMvWM2(!D5`1MEXzDz(C}AQzzZc
zsk^Jbw!8OjxK|ROVK*<Ha&%(xmR`&r?D1PhxCOW7WEM0SeJ3@L@!2XmbgZV9MIYel
zr~cLzI~`MQ7I-40x$k&{5OYcEMS@mLQWDt#@z!u@mSQ!2KdT&h!&x3Ju!ZW4O!pLa
z=Kbdf;2j#@;k?C4hjC~~um`#;$KTXw`=|swGQA-O?Yl_$WF}6vp_D`Y;je4>m`!PF
z)MYt;q`c6ikFmTE>Cv7(M*?;$&R$dQ!)XnR#3gs0OWJbR&C-)mL);T_0WZd&ogm#&
zSERKbjZu@pWvfFuwaDzjL)RP1e}_v;CLn&Bla!!fR=CY_G`03$Rw7OUi#xA=x&@pR
z+c1nNui`j6r6tW0E<nNcrg4Hl1uB(1MiOCp91|6Ezg*T97u3L!-J!`yYcAcLzIJat
zWBUkvz~Iy~|IQWOLC&cCN5qDj=i^!M`-o1{In5>w>&mCXbN4QT-na^wfgd+Q;Ny?p
zQP(1ei>P8|!kjz(t)|)BS*B-$QRG&aUu;~>ebZ+!jhTjl8<886{9ylpJjQmIy@Fzv
zj-^aox_nvz>2$fHWwd{P3cV2PRn4CG9rDn)+u}Z2Q>C`yem<FH_=zTP0!*U5_2(C$
z#@8tD_aaV^b<SJWH{>X_($RoA`Ph(Jh2Td=-{V80b=%`T2~$}nuqWIPT_oz8Ms*_(
zXAPKDH<z6_isB*f^HR8jpS3pe+-Zi*i;;#QIXKk&5`0Fpfnp@LAiRA_tiKTq{)-=a
z-ax<G$-~y?l#VLE1BNJWSD3B29x{Yb$dOZduyeq{Jih1&2HTkbAcjAl)nG<F3!6h6
zOK@QEJ6JwT<p`2K$8~FZ23__=rAX+02CM{Fx@ZhC({D#l2+}j|1cOs%=7)D^Z&|id
z?4`_$E<Bzt9>LJho2wvA`Sn6CX5F~cx|JAAN_)!(XCCe6T6iW{xxI#Bek~ZpT>Pd2
zX3rOpw--<WY7Y?hTdeepm$QB=+H2XnUBx=y8e=;zOc5s~-cUC+MGkt&B4yoM$$?xf
z^fJxhtF2l?udA@@j|-T7K~uKW9}Mckn*w7pf`6lo(?*6|!p(zvbi6D&9N4=GPJV<g
z0v>4{fb{PMK*i9eG7%PVf~=zMHZQ>w9=yt1cA1^CcrOf^&7o9@LmXHAd9Dq5_{l2~
zOu*w65um>L3Hx%Mc9q?6?_hf^ZlZHdef+g4rZS<|Pa*L#&_Dbdy%@gLybKa`sP7z;
z%}Xpw-qpKpagR8|^nc?{K8o*r4u*g0-4vn(byBW6HP+n$^bd=|N`ngXIGD=MUjU*@
zhJ?z!DFbHW$PctP^DH?-^}yWG^|}_)d?N%<CkeL866C`Q5{w3aUuE;sFw>HB3)W}#
zsf6F6)da8V!zq7ob_(_AI+Fn*udH+N_Z#^sWLnqrw22Kc<@4r)u_r?+S7FxBg%`zL
z<B#VVJU$N%`+6E6j!*i5_db6Cz=w9+uoN9QHrDL7v0+Q~?H$wFi`?ZLV(fJ?)VjJE
zGA&FgDb*&Ll42)8@kuXDrO@OZ(`nn*lp%=Snr`+SlNPSkc>1U_&X?9?P;`V;w-(`5
z(#L>-%dgKescqK30W2eeK@1=>Kh6_lQ|_Jc!Q#x1Y&<STGMsyR3T(PAVpEJJ0Fl81
zZt=tv4_DWeS-F~L>wjWh0q$f&#Jj&$m6#g$@*;`Yi}%8T8yBtuE~?25Z~EfG7B%*2
zqB6<X5Qi-PC6?(?c)01+04NC=6sfOSgO!;jw=j0nH7R`RI?MrXxN!{&%vZgJxaGMo
zIW#U>X%JoyUE9!^n=w^kJbIxhI-_c@5XeQXsZpUGvAfZ5?h{HDay)47%V%_6nK$MM
z=#2WV#{vaYZcS*B01tPuK@$rLCWiEjr95W4cix$CdczqhG@U9!n7I>X9DbXvNCjc(
zBWqR1eXyv+27=RB?_X&6s>W2}-#XPgQecc$8!<Yc<DTaTh+Rzq*sp&2yCd<-;93-n
zd1!o$$pKO3KgtE$)g&R-SCwyqh}vj@oHCG;+H+{TGB3?9;P(xSPB5X4^hE77(YM!6
zHs)*vV}hG`Ypd0De!Y9b5wJrlnq&+cCU6>tt))&3)uZ6QslJD)O8nNPnfdx*&g(O8
zFk<iiFb2<XYeRm&M0wrN9P<2zZOU=C4*WUH3NK?&ixmTIGkSfE(N5SW+Ct|wjod2t
z1dK9aH|nAltO#rJ(|N7UpoCE5|CNbDSYhv4jX6W1WnG32K{fm@gV^uw>gvveeF(9l
zlDl=Sb`ndR4-Yl>_Ti#AM7OPOGuoY~&BqgaEn4GGt#JmIZNt4PKBwlU=9ACymAP<+
zbNq;qQ7a;Px{jxt1eiwFJsIn9Hg{FZ`(Q5bH`U5bt(ElQDiV#{J7g{+K3?GZti^j|
zZ7al^)>ukzFdpGEG}g9<6x~^?_~H?-xbAL-?G*Ex1@vfLvaM1qC!{9~=(qRzX1Yv~
z)Hjko*uB%<H7tTQZENz+Eb1ui7S`ujZ2Z9%RQDd`tNc^P^QL6GqJN7z>oJ>mt)?Q+
zc-1~P9kIz%ZcJ*Lkdfy#N6KrPv4jV2q)rGLTo20K`{(nJ>_5>#gFz&N!}rll=6s4o
zicFuAztQj+Icqpw#uhMs%=flaY^d5r7%z5yd-KSCXx-^FrSW%dNI2w=P6&NhDB|mf
zamW}*rQ2eurQ~PFrjpYezc|j(j=zeN)@=|oJf@jK;<R53jz5QGv8lpZyj&pq4X}w@
zZvwWomeLjm>e>o8=Jf^n!5Qse;EHSV^pWYdbKVI@PvA3Hius^#W>Kn47S5=6{PjNZ
z#yxAjA;FLEi&dbg{4L1;Ix=&n2+edRkPpNH!gUkuQbdksX|%1HC}>MY9CZ1m%|gw0
z4);u6S)lPc#*_8g9#e1L0Hw6qJyw4|ti6U}iksw166V+A1!v!c%BL(t4lcr`HaMDJ
zMDN+rvg;Sg%p)N2d$Hl&*z`pAAW$0lsdZ_H(VILrK^f}mx<?y8y}Svf^IcC~BC;kQ
zLl)Fwd2q>;bZIF@Rv}Fzqp-O)m3)aXp8OW`ij+>tB%AQ`k8i=fV`}!3D_{KDA6o*r
z)f#)bS!~5<ME0R+gN0MPCm}Y{BtGdPYp5U}jh&_3!-6;7mS)cuk5_fOUQ~mHPgV+~
z7zrWuZB;-?v_<0S5)0f2>(<61O0r(FCTfi})2Ns+)R#%NLzJbl2M9ELDh*<t!y)c5
z8Z+6x<{-a<hSiC&TL;TiqSV2@jyS6<3OR}VVUThVLYlizZ{yK9(f}>CAn>k;&V9}F
zUe7KPJZNT0$yjYC%HJS&g4e#T-C#Gy!r?yGg>9{O*iS#vydVbXLDx|rHp2+GyjK(R
z<q{hy)P(#o5g=O{0R!(0Fe-odki8eWO#~rRX_g|Iua-B*qL$g%vGn^BNah=EMOl7Y
zG}pto#5e=KA1IWdz0^5e28)-YNPy98Z61ntdp6{)G|#*y?mPmSZ-sc}h!f=U%2xJD
z=f9JT5STdj+Wy~WeotyuFqQ6lf9#}q8#n;+rM?N9)oN;b&wEQ+OI;FP`cx4<cKh^l
z)#cJ;=uKbQN%1abR|g}e{PWVR@7{^0$;tI3J99F`_`WY@uW5@i(JF4%DH8DIMS0G#
z3p+z#gxVIdbq%hZ9u)99n?y=X*N1n`oH=zo-HVeU9DA$2fx$CtB(<5l7n+<^>VkaJ
zQTT;Niq6x!`O=+raKqIrXP}ur59)o)KYvEjCR8GPz@|jRZR8R}m<nN<5#FBq9%1|x
z!VTfPpbQsv4a1MzI|K?+MLx9pfW*TG=m&A#nJN0)TxUt(6zlT<<UIqg9G8fe%7|5l
zyT$2yNr;wH_GIBM@X0gCrk^G}qJbwhx_ojLd_hFC%cD#w=Smnm(6_BhyO@UfoM=?N
z4?4}I8&3CKuUfqd3|4{BI9sdP69XeUz?nQBt)Xx!pV$mg8q)&2vA~%))gO#6W$#6h
zioA87U;n{AwtA?~+zm>xbxm|M1UAZ={^WwO)t=*UA*ZFoJ@|&jfkut%f6nfFjW=58
znQMy7?WOf9?JS;Pzr*9YViD+LzkD{wdgIGazI)8Zmty_dGwZTJCb7CzlX`qUNW-vx
zgF4YM+Y3k@rW@a8x$~9_q$E9gf~LHxN1CKLVJYS1T$O?+*oy$t3{Sx^b+``Q0`5DF
z<gB7R;TqbAs$7yTJ8S(@#<Pw^AfHyKWZi&xWl@8cs^u3dLbEd2&s*zpzB-2Uyg{aZ
z#=XwPogt6|hbap8@%fOUGPfby29}`r>HphGK@+YaTAS@q<R@vY9+Y%dZm{18(r0_4
zYuqVEy_J@WLHk5`R4y;7GSC0#0B8eEwhE1hRpTepE5JN~n!|lWJyNKt?1%B#a&M_M
zdyipMliyFRXPUgJ0&Z9>cB!+HC}jh<y4Sb40^{*7l9E|<{9jMW)1dk<&RIU3*lUi9
z5gdRzZm;AMXZLRcMjbf;1t<5`5TCG6JB4-oJVryq`1RbT@#}o;%PTVx)ceVs*gT_9
z^2FNy5@?w{Aa1dJ|Fu6a%-kHS$JFg_cY|(ANzj^j02h_)0>Z&Dk|9lNNf$&#RaT+1
zo?k&f<CMoZ26&^r1@p)r+|f_7;`DgjXOWVo+`qGNYT+(!x}7`m6D_V=A^x;PcsZxU
z=S!rK%<~I4h$1xl@~wYNm-fKEw=8q++8lhG7hU1aH1-8F{Mj9-syXtn6E0nsmWT+9
zG4vKT`ugsJ8R&BPhm87B6R*K`cz75^J)&-;5gxW3Lq3<dWqUF2Vi{1w#RuH0SR!xc
z8jkHkG*{2C@a!@>8LV%>o}kv?yV5N?%D$Zo)NV-%br@_}Ep%u{EdWZjhY`+?;38#w
z8<$}Ek1C%!>3*w3SK=dg*mB??>@y*?PT1}`2$iB=3y)a~W)Fo~U-~r#-ZQM+j5XWn
z13^Z!y>_Q6wLTSkM#FUVFk6D<=t<nr!jU<eHdPo@`#bK3gOL3}P|s6W>$$b{=Lo%a
zr2rb>1ua@@Y-V;zHMDlpRHT^WQnPJRE$6;p=X*-JBh{(UCIu_*bA~EMc=SDrGrkAp
z8asOiFAF+-C20zJ)y3p7#qn%B$GQ+V1W5{niJ7|>lVmCP^5mKCe>kH9&*%0oZ>xqs
z7W@xs1FeF*h4WC(KSo?@`%8jecw0lnUE{&sRtJ^dZQ%EMEcjdhecv(khJ;hoxTw>)
znl}u!ikBq{%-dhJ#{EA&z82Bq_x%7$`E>*lef4?NiWc^yl|Q08HvD5!6iTNQtF@IU
z(WmyMwA5>GvS4doml@ldLdj5VZbI{^L?`%M@u&O4GENE{!alC4=MT1?KG1R<>b{#Y
z(N#fqFpmXF3`08T%ZDM<8-7MK$*q0(Cx3UB=l<@|04_|psR<*8#@Q#6jW)#|!0wRv
zs#)O1M}(R0B#lWUtf&3VLqc>q4m7Pf5P=JZ3yBUcTDn^gw2@|4IC2(X!hHP<C$I1w
zB=wA8`1p$0;j09oi{bR=zVd6#SGC+uzq^=lb4?Bb$|6|@F}V+<T-&1E+NO*0<C)Ij
zZ~HehHWaw%ynV>|+HCBAHO(<DQ6v1{wQ2clzMO+t5q}R&j`hl)fW=Nvs%n%P?{llE
zTsdZx&#9yPyF&ES2MN{k>hf|;Qqb4oqX%w7?SAkVSMM}9w3Grm!q+^4Vcwe2+HQ$p
zr+Lo6l=n?RQbzj3kpS3+Fg<#jG1uNN)V9y#kuoTA@YUifC5$04yDz?pK8Sd+q&wKV
z6#oh3=dNkCF@7()f#ac`J0_Uy-UUWw=4PiRObpZ)070b;-+73<V&5G*dot&bVzaZ{
zkU(F98f%^lm*94CZR4etGL%>T7?bAVTwuU=k?42L<-Q7MKZl4K-1568^sOL|C`7{x
zr88%9rSGgpUpQn{{)!xEBa*o+>pjZy*%FRmFZvBfwUs*8V<ht68+mo9Uw_XI^ttkA
z#EJE@>d!4roSzId*4p=UBc$P)nhS)TF-}jNj3}_l{5u#MH|cY!R{t0wGY7}hhRuPw
zu#cI<L-Dpe%5xHrN!}ad>v5g`1SD(f#hTl#jFp0eR-ZZj-;GuZXkfgd83oK|$KNDa
zbL<`5M@JAmTqUmQ8?dv&i~{jU1$lF1q=%4Subb%nUFyxEbJ2Jc3$PTPR`~&Uw+MEb
zPHT*MrJJ0mW#YKZOTC^cq=hcVRV{GX&`CE6(NYfxq~fPv2qcT&6m2o`qv|q^lq>(z
z4MC-3Q40io>K{n%hd+A3-KQ4s(t-;70>)XQpB2suj#PmZI`-a6Ps-U@r4@vX!*|;J
z7B{5xZpaJ#MNi9qZctXkoyjx2c9%lzIlT0&N|0N(dkd6_?X8Ww_t18Q+)jQ*cR8k+
zX-+k_3Ik(>t!jQS4(x-&b>|TN?H{n3djWKkKWJ-RsE$O0SMk&`qMj)SX4{_$lRpNf
zVUZ&qZ2HB5pGhK521S?<Sy54@v$;0X6i-}^Z!FBs#2iTPu_(zBUl;wm>~P68aPF_g
zRc?nleL+)&k~0BYJ9c!r(zn#-xY!bHo)=i0$LoJRQ)%4gf5eui8;}r|z+(0yPgpfU
z0$4oQX{Qr5kM(;ag=#*XP5|^>QaULm2YU_l4ft);nOCfd%!trG14pQ$Rwd)M&OFx5
z1Xbj>Ut!}TAP&X9SECrlEq)PMhdpr1stf05zO_m*h4kc{1&*8Fr<wDlb%m^Li_?RU
z=B|4x#egH+Iy?Sw+BIdMaP*4JLzuOf;aEt)#H25uI`L^!PgGk*yH{z92%+KE72xQ%
z20+5;0g&@S2;kHH34AQ!0yZA^08nWOK(Ct(=uGY<Y#q$01s|VEffs|W1F<Mf@bS->
zE%KN4{e8vUN@C{u1||MG8$k@U57DKSp+TE!pK`|Dt!a2EZE78x$#-Q9_5vL`2&+LF
zJK|U`$+3{MQA(oL-~`#*O`O0DBhkeg$9ROIz<#mV+?x=_^5%`)elXp{c>a<pwFJ9@
zK(ardua4J6^Rjv$zS2^}S<SQD+W1&EEA#9*1<v|f1iSSGrIqD(o8sy=_2&ohV^-WV
zYvquI>3n+C;q=T8FqDxx>g?0f%^bfx*DO_d%e+i)sXl_Zg;Z^;B&&*-M3s*`Pv$`D
ziIBqlD2Tl9!w1Bk-Am(wn(L6Z`_p&<z=Y2*BJ{pAn|(sLP>-v9!~rjJg&T}sfQHG?
zzC1`K%{0aOj$t<H_Zalx*5g!aKLS{Z-3Bawh@cN@BF%@E8(2W`+hKtPaJaRNSv=fj
z`2E6kq!Fy=(Sg4D-b|^Z2(Dt8?M_m8-d4ki0U$PJW*|RRO%gJp4_&8zmlXuk3Ka#}
zi|FPA(n3*OcOj|gaMDd`MNtUcT|i`SfetiQB)q;oJ=Yhr_;~ny^lf1L_=ZN0G|<t<
zX>0em#&t-=BDfML*Ex9^@-}LEq+J*&m6&=NPm(wBK4n1h%{W34Q5GGN74;eQ82bJp
zS9-tkG&OeI*1w6O3JjtzR&*2X-yI6+-X-;1(X>479?$M0(=LYI+M5w(g3&ZFN%{Hs
zKf8=|9+|o<jk&eHrFia>kbwTRIL=K>&q2sZdksPG+Y9f}U5=x3Swf1jU&V8pdBh9a
z=|c7iq{WR1=ucyA4K}2)UI-O}kf-9@ZIS<6fwlxE7C{`%;dGEuR6D&UjN7E;89TMr
zN}ao0Js!nKOkELuwimiJ4QF;rE?*L0<ljVg%~U*t*qg$tSA>cW)v?Zdq36D9T*gYh
z_}0;9`;LsSLp?tU<$Qih3-`eN0vM9s+{i6>B(z3Yie#4kE0*&vxRk9oIc<JKo2-5Z
zi{wuAVz;8V8}bciNMr=RG14+Nl3HEiOtLe%We}FvV24kp8HF6bfTZfAxHnXc*16i>
zcGEU_-0wClVsDRTPkR9tst2)nugMF`i@VGMBP^?$amR8*y&RLb8U^%!j|SMi_kgPw
zF2K&=bCNV0+v6AaB+-k|+THQ7Fsf^XB-YS5j54tt7c`!Q=uT(Zna7rAsL9TsuBgWa
z?HO&SLcf+y3e32q9B5!S@39_CxTGA1Ty~2yH)zj(G`{fe1+Zr9Ou%}i|F_Mn+$P$K
zniFd&<OC(Hx}gL;6VEjns%Rga&<&;n-s8WA7O)k>96R+Hy?$yP9eJ?ZygbLeCKcJ`
zH~AYu{n1&96${yw81}zXy~)lT+q4Ay6;xaa9+<uA4aum;CI-tJ3nPhOstQ6$l=!+5
z=dPevq14FrJ$B>=*Q=Kdt>4Lu`R*yHUle*j-KYcJh`m7T2fRU-R5I-vqc4WTK969l
z34&<vEKc=*gnDKEA#34<dun|iV%F`ws~f$(R1|HcaawX*0`&=ZIj7<4;638aF$FrJ
zHyI2BdbS&bPiCB$g9@nu^AE-lR<FiT-y>$0ZIM)Z!PcxYSc8jjWNN6S6%%;=jP=l`
z7G0M^>>Ub>-3d<H5Ag-*xf35q5GF4kJPj}4sZljin5;Sob8Ft0Dyi;_t%(FXRjY%&
z1Oq(oVM4aFTuV&h)4M0&aP^ScNO9frl!>*!tpx2N)h<{3$b5`BLI?z!{74>#sw<)a
zhz%p$$-iLYREI2*L*e^q{VI0|?D2ovoL0+=qk>fPcaJE_d_)kedB$I!+CO{}$%)Vc
z-t+C<0X$X#KzipkU~E#S@i4$sOJyV!;dtkd-eF2%)J;*7gs2nyC-5@%+u`bY5mODW
zXnvdX(F%8t=Bwi+IAQm1l0VLkKl=Ga_6XW-!CbGEU2rc`%cDp*s=4p2UE)Ns)|R5Y
z{WYE@$kDNStQ6OCma2S$J1ZDk@)Kk2NV%bs(u!MCm?iSj<Qq%R8-tE>f2HdRFo%t!
zP<fEh#6CCN$_*qP7RVQM|Ekueq)NHG`8z+diC!GjJv(HieVJN0Btbp+riF1yQ$d4x
z|Aq`$o9k>{6v9sBX2~_8{oQ3OGe;Gqbc^eP#DH~ks%5f-rr6;sn`0^+o)jTVX#VWT
z*VFe2S!~vJVqb75%^-Xh&HPf)w|kkSs$qVexZ3rEk9F6pk)WhW_ramgkcstMGl-nA
zNB8wTHTAnpm9o~oPB6c{@I_lxg`m?C^UxkTy$x4WY4AX8HEO%<8hSWGDl8wznLVI<
zzW;mGLuj9boRJfCK6#8%RbL<FS-FNVN`{^_r*YnrGCx}~X9{+MGWfi{@B}ZqnRf<I
zeI*kr)!DeW8hU!Ik48PfS8zK;l9dGds*-5i{C#fPb7o;rGC4r1ADBnc=1<eWrC8x+
z0~$Q*te_mtZ|rWX4>Tj}1J=<NZv+|M)+a;XZ>WKwC77oVluUk&9F99PTI-rs9}24^
zDX`*1IV`;~3gx%l6o0D{SYO@tVAcK%u~WGW2IYu&FN{AD^eVQ4*?%Ja3<v;`pWfRn
z=xD$ett7IC*7mjU<hi1a$fLC(d?g)SE9<9~m{avBRmW}d(#Z7stuVK8<Z#qC%xBo=
zUp2S*jDz9&rQY4*RN1J-fzJ}tdi?)=>WFb$9&d3*q8u(!%ReYmMGl3K3Tk|ha^TD#
zKN^rd`)BGo&a}h(`2d~A`L2XuR!r(vFsJ*WNRh=UCqAHHNs5=D#6RS*G7Fe7Eq%`~
zNVm=?j#roKn<Q^)ATONT^5RpRr)cX$|2&VIU1KOru{l+O!P3(YG4v3A>o*)%L!mjU
z@LQ3@kTp=TvvzzFUDrI~Ii7YwZuFFp2Q}~BNooY@9Y*3{o9VYRAxqT@KZ8*kt(^Mu
zNSzl{h%bqN6;naO?Ad&0P|S9Fju&|aZZNqpGwDKK?j_O*ZNx3{m3ZRrTLdsTHsTtL
zJhn8S8I>Y<;@%-fS2r6i5MzqAko${X=$1jFajHRQIYbH2Z?$!)6Q6Ijd7SB!GpbJ(
zq3jx{c62?5wN2l3uWSm+o|t>lpcQmyu2~Cta7GyIE%1=ko}+#3Vbs$T{E3i?E?;W!
z5lN&LCwJNU>zA(>-|neUboXLo8TZ?c3x8#Vbq+pm6iy&rrP4V4=fDaSG97ZmeoFlF
z6PVz-%FT}k=)_@@wqqhtr}kf1i!9v?>F+8S1(sL3H5jP_NXE)3&MzS52&}<(YQV+E
z_>HMKE?M(yzGMFgpuB16VRmm`ww)lD3qkVNYE$E8C8Ar~eT!>5mRmo?l4m3rn^|a`
z`2i;b&^=uS&=QLWwTFy8gNg)VV@$rBWNd?yZ0or2<<{{tX=<wt8JBV~5<PV+8_KLh
z%8Hu79Yr#KMlrho!yAv7#7@k;@`wKs(A@$)?s|+^QunKZ&|=vcFMS)L$}N*VR}hCN
zFC+g<-#pmQCI0YfdTSA$7;WRn%L(D8SIA2v1HiUQ^`;SgfK3NJkl71t))zWXK)!23
zbJX!h@>zL8Ja^n-N`3elRWB9EJZO*PiB87OBpcJ0t>cW=!7l}k7!}7hx`KpZ8OtkS
z9REX_bm<xEF#N{UNB|qS!lp4p?pNr7*J!Ty@wEcW_TBlCW0>=cMwUBBIUhCTm|GO`
z_MGj@Ssx=0dzm{qv=0_g9i+n?+PJMnbiPDOY)mWpSoJT?$UV0#?b=-8rdHc;ZdL6-
zq>!X3m7#M=BHsd)a&*3%z|gCFfHhwK$;o{6!;}0n8TsbxVbO{7PeiqyXy+gwte7F2
zo)B9=aq@o#*~%GSY(w@KwA*tA<-`kaH4j2464SElx37Q4gvG{4rl9Ry$D70<h?#nE
z4I-OE<ae}HPu_4%7VPN-e9DL+Qo$qmBT5738BA6v!=(?<Zewdy1Hf9b0*ZXCO3Y~Y
z$zt)6Irv201-N@sjUEfn*>(|Lv3zq~nFHUoi396WyxpE!BSGv|8-t^J4`g|`WQ`al
zOpHm1Ji$W`4>Z=hy4`fkwv}{w@Nb{Gy0!6iyf|rg<Qn<6js{X(G!|rSuy3)ctQ2_H
zwbN%LZ|6FgBiby_fcNjvKG|!GrNLgz#gDJSsa9;>(u?lq=9DMrx0g9>p>uiKdKj}D
z$Yn9n(vx8q7<=Ix|0|Q3BHKMYcOJ3G!c&}vYS_SMeqYw`=I=p`QsR+G;&^F{rpd&l
z2U-}6?z>+_x%!)yK(u#{ewXoY1F=yUqJ9K}O~M;ivo|HtLXu8qJ5>fJqk+>aLgTff
zAY*INl^PKpW3{ciJJn5i5i>Mb@psRJn#dPbQ$2}dS8=+;^eYZC4)$SXSpcJ)ZAO|g
z!(*IvkL+^_B`NIljD?m~!~>XCPYd$}x-RPJ>hX$0%qMCU=?XlQrB{(A9=tK9Y2pzE
zW&RY6cl9@n;KXb__rg9jXG=+q@io{w80TW9J49jX3XHm!f4A{c<Km^&tp6Krg}k&N
zykNQXRCAl-IET$ml2UpnV8*{AEVOP-FjTVk?>PN4TDy;=tsZ?DLsH_e8IS?5Qa+$k
z`fs%O4(qDaoVJD^+x7$qs5ZD+3UMDz_fVqqng3OC$HsZM^c|#T#IZ{Ha_88YuW`dl
z8)4ACqfMfh^F6cra&bBP$B+geEZv3%-ewTT4BDDly_&PUA8MQYQqF`1Vge!G=Uv^*
zhEHs)!)P%<i+#tbB~iOaMGbMNdxzwf!Z$zp_@uV;-e16pZ5_;<Fqt1!pbig%-RC2V
z4Nv>CGSdr>6%zgOhg6jAmEG|F`q&5gC`q01gO#hsBzu}ABZ|g$6Aa|2Iv4#3y80Pb
zw8Hhh?~cR`N#=UuWn{~X%_0IP94=fBq1-A0Q(JC)p=j5UTdMIG=+cVPzgKWidh<Nt
zHGrF?kp`Na`&f3~%mP0)dZoS*jN~nm%{-RKq0vGABa#}!<B@plg8d*%Dm~x`^5|S&
zQ)g5Z=JMvE%aCqqTIEdRF(fS{PtcMBtvynOQZHKwn8AFX)1I-CFbh~lsV7TVjH}UG
zLvD`BQ#tC3!dT_L>hZTX_;1blK@LgVcYeM+3VgeZ07P>GH5Wqmk&h+I^}b;q9S?+X
zKzByz3Bn|8*(BM;o$cL;6U^<KzL*~8I2FXf8p_Fz)M3)sZvl#fZkS$jjpsn79GS$w
zZo<7T#%awgf1(B7wSC1IbOpgE6-C)f(3q0=T0ZO4dqG(o|59)di0|c#kVxBJ8lPn3
zpNaQNW9Sc(Lmc|SiN`LHGw?NbFbd`ve&k?3iMU#I{M2>TovG$=Q6f-aT(!D}GV%YW
zLjB1eMU8Sc3qT1rJT$EW-pzYpz3T!|qp){BXI+Z|?!%Vm(Orzycbb&!opELBO{1_D
z?EY^kLFj4!DLvWmM*KseYCdX-8+`X+iV*F&uVRn8d2)H0uvNiFncw+A<i`Q^VeEI%
zutGll3K0EoL(9zGo|A5p3Na9cQ-I&LZ5%o}T3E44?mB6qWBUgj8V|Y78qy2~iOL0S
zCr%=SaT32_mi?rUGB*nYA)?EN=#69UQ(rA%*4Q%q&qgI)YbwEwap@o5_j!bQ${B(v
z8jmuLZsBOSR_bdUscHB<Fmqzxr2ojdyB7QC={(+Dn;!8HhF?NvCG+6>wktaP+OhEy
zxj*V7H7s&NQl!6i=1m+Fa*oSKtivRohh5u#vAXDfdtX2t$e3StHO8Zcw>>{<6-8vw
zavc<*pCp`?Ly8+<IFoE0oont{2g#K;Iapz*KRfnz#Xt1Lox^7%GY{hgAT7354n`(U
z&E8bipvMh5zoH>?<F<dniB-)#d!z>E05m{Ogk)7IE0_v$Uc~f*awmrN!vIIdx^#Pj
zW-R1}Jtb70ekuC)wHQS89Q!uXbh=SQnDqBN?v0D}lz6$DuuWz3=@<s|W9WBH>Qd&>
zv9`9DP^@_I2RZwrpo&T!WXz5%)7@|OqEjB6HQL=#Wj>L8XI2nDOYrnt^LOu?C8=1}
z9)L{UduzGz{p=qTZkOFanmo%Fse!PJ2-YuxbbziR73#<Tq^K`ExuY{@`vHgp(LpCb
zQ^3{@>$qqDGfG4V$<n$Lgg#M$>yin>_Ij+OUG4~^a#e#4CIVUxM10eude)m8JP;Me
z8Rc?>7wD+mq&$i_3)GE%OMx<wBgY9=tICh=j5imI0bTV@nrQP}ZW41D(#J;#{M>xx
z=7&Jdy`ex+!x*39hHk$<;^F0Ro1f$!lFYFt#Muk<OQHDI$CO9I(NqHNnzIjbZ;h{Q
zMityrM5Ykni;AN(WS0DwU8T7f8qSdvIN6ZYshEk1jQgH+=LNeqC~SDRVL|w@k1u4;
zjj!i;pEtotR}Q|uuh$><ktEgjCJX<C^^-wW_?!{*dL8Q2FZYAqCak$ZX5p~`{_r?9
zK<scmoA|qFA26>=1@z3hfHT^b$UsS>OD|;E7gqK{w)2PwX?)a&FiGl+Z4x@L#2Bi!
zoI=hnQlwPoDKaG$luA!O(O~6X@kkMiIp@wjS_AsM+;nUwdEBpKcRrZ*x$VvQ35SsK
z^QE6ECP}wh^VYmz$B=p_zK4?w*XCH-IPX!Qq@QMeTt55D3wkEOr?i+I1{Gj<^nMF{
zze}0w9A9P60}r6fdIcbD`dojga=kXgt#Q+0SZ?H#6)K(=q64^uyk00Q{Ac35#!nw*
zD=LE>AH{>A#5u0V;r(j6ZpZIZqk7woL%jxoEyqnsWYfyF)Y_ruc>8q-v}w4nk0jGK
zG-UQ_M2d-*h(qwjbLyLCZA)V5A;$aeeVXZRDVG&)n@G@Y{Wb?N)XZHUjhgM<Oi*5S
zb1!p~pHe|%`*b=>t4LGvn=&^1a4&7**X!iv5fdwt>hp6IP8xYb0r3+<8yUcnu|Mux
z>kIl6vDb=lQCZQZbF^swu|6(EX=rurn6n{qD2gD#EE^d>KMLq|)2&)ZGsy!Ln39N{
z_$+Y~SWtbWdvMgAH1lX6!PhiB0YCqP@tDs-rEgEQ*^m5Ji21&C3Hkk~;y4OhqU#$@
z7=O>}+DG7%FNShwy^Z1qJ)$YF#;cZz4Qg@{wotE4t)dkTRw0n2C8heTiDz7}QOdog
zmC<sLkDvP$M4e@TnnwKy2z9nXs~1yw>`>FI6V1KQ?Y0+=PEs=p-(v7cEH?WsNq<F1
z(qO{JtUx#uD*p*ruEFWv1KL-%A_YW7DsA2!?>gLXE%G6gk`Mj69DC?>3}A$^ww*v&
zZ;Ayt$W%605GPL|3vei;hX&%L(P=2neDBIPy|xW+chWkE5cH0q{FMPJlZtLXmi!=|
zL(9P!QX&t)(aiBPU$wHT<Wg#e)jz$9p6CF@^Ezs{pVvwxYkK{f#<?inXC`&F$e+L4
z3u;-EeQ)ve`*W1K<~yoYLlHu5lCCX;4N7SEU5o1Si~oaV@{Ps<uvJ4K`r{-Zb5#?V
z96ky3*IWc99iIS_^|h|S+)a{^kuJf9zd4yqj!pFFFfy?g#4zuHD#A1MQB#H_ltA^_
z@pDxN6gwF*^$++j8vPE}Bd8}9XE7IT@-g>}l~V+?;n0iT5oihLyl%g=u4aG+*IMc)
zEOF2Ih<rj+qaFEeF_l?u^>7O3b*E_q>@8B9XDWxbHQa<N>u||f<c)P3ltEwb=W<`}
zXD1H*uFJtsGA>XZZuU~bmOMckg}pJ+fa3TDpj18BWK?p0UVGT!Jv^ctK_&L$w?3T&
zRjL8c*yeQIhIo1B(NZ%KMb8l(Vncj-Ma%HxmH0Dl6pz1nrW&X9TX`Vf)WWLp*n)Sd
zr1cs>5am6_W+oQ6C0m35&Ti2PwbT`JrN1?$7KVDrQu3lCg4@-lA+O9fJ`758fIxKA
z=!5_X;<A^l{lL5h8YIOj)l0fzCy#84Xq4h6Yg>_&UlYV_sWV~8SZq>?(c-9%&VAzb
zZ&#Opv+=|)e{#)|&OKYEC$*d~gJOD<Wr4v!C)eQczk1B=QfI%*5E?&aJ3FgEIsD)t
z?l@d(Ve@cBSdNxug9w~;Zwkh^-IYgs*EpgL0SZR#gl-Ggv%`YQ|3b3ih&29aS7LGj
zUe+e5Fn%xz|9h6<c+XU&Xum#(INHUuZ>?v8THQ8Ba{2gBRW}z?B38xK7)T3h0`WAE
z-*Uk%ccRax+iya7y7If5!*Obz<qP^!G-|^PgA1~|cUkcvl(6;X&viH5FJUa<cMytW
zTLu`7V}cJg&64`IPqFsVg^CJEmk-FH@{Ntl${1X>5P0@ot@sM0lyM*9H4=|6)szC~
z=Pk$XG;mx5_3Jn!xu@o$C&}>?;^S1V;0?7R&$p>iO>c1Cs~LmHrQnT1(2rIKC&c@L
z#fr|AFd)CONtZQ9i*jVEEw8L1jbkN0dY8`$+;tbxgxJcx&?$D!N{1RR@J|2t7YBSa
z+GPJ+u!LD&{})0g!gQ2^I21xw#dHKHR(wc@)hTYuLkVRH_0frTWUi9EW}ZGBWJdV6
zEwgt%wF2&(F9Q;d%}TR|4&Q>&MVDNbGc`R^{8Bu|`-q+?5o-nHKfCJGAV#Bjl@}y-
z$dm9Ks!v!}7N97sM$!K2;)DKEhAMNZN=P6hLZp#lH{GcVd1loA9+?B5p1%hcd4B;p
z$n!w)Bp;x8F$ak3Ap>dp3_{4(y@`=r_3_;c642^hyB@Hm8oJ5HyhiB-JPtE3_8_0p
z(!q?8cIEy=N8D?mVl*w%k+aBGo$pOIZ6h~x;!~1c<t2Fx<YDLIvEXKgYfCeMaeh?(
zYUcw9x8NQAi`~~**RWen|GAce0!<5lsOa+oqx8B;HvuUKc1c&sK+`Zis%Lp+84m7_
zhFgDEZc^<um(at<=PFZ$kA)vqr`!#`)%s)`c>TeLavP6OS>QU-7a>V=(@B6{+@gdE
z&?ZVs0kfnO8su^|sSGk_bK1I4vYn*3jL#PT+zAz@K$TYT{BP(nsOpcxms6#<Blgdv
z?RJxfl2&0igoYM$dPg;je=WHN-(5jdXleSD_*V8><Fj+K+{gn@D>PT{qI=c_C-Q=o
zHF6BnM1v0yOdO3d%U%C!%=aa4aHIaP+<4TNS2Pl_YJcB=dEgp{hD9Hw8h&n;k!u{!
z_}%TN79_%?7}qyko18%fY3TmCZaqyH+{^(=fE=K{_E6KCx2DT)eeD{xV)wCTO~_Wx
z#P>`q!1vSDd>Y4FH~TASIbB^0OK>n|=y@=@@-7Q{I$#=o@7X%K_&x=#YbqzL9OVbK
zo=3&Q<zHd;Ze2us-17C*HJpMlQ&Avc5TaaCTRMi#%PY^Fc-81mrCIAx$9tQ4xj%9E
z9k{y3bFLCAzZh`WS&{6Q*IT)f%1(huVI33_X{1fvNA(h8wB#WHu(f`+YP6h4EN1vH
z<+0I_J<s(u6rD^iOX3wLZ4{8MmT?z=pQ}K$X09f+BGn4xqoT`Z<T3Y$8V8iBE@{Rm
zewr{7G!$%)1C!aKwI<e3G?<VLJ-S0*LXlJd>ogSpj2`<}ik{B{yaJs(sG?NPSJnb(
zo(zPAY8#Z+2!H5@AJOc4rY{V4(Uf?oi$@rG+nw<4VHsXDon)45BNAdk?|>U)X77_~
zHRwLHxwnqqia}#Wje?t&m$^F3<)di9YH+ubX~DGGU@c`F<icxBvZ@1R#2<Et5s7S*
z{|km49C`$Q*q3HjOr8N8``P70C4Sp>&?CTGEb4`{vcQA<%2s;&jv-~tv%~6}`+jQ|
z&(>FxG*3Wc9Vgr*VmuJpeoYedA<qzb@5*Upm?;KHbYMd|$@3zipj8fIWR7&WtAjjx
zoZoEzVV<ibs1V8$n8s+P9nos49&w#>9%T3tH;z*G)tx9|N)AiLp1On8F~qobX~O9w
zsN_f8EYgoNx2WO=`asavJlS8xtbH=<r=`lbX&nsDj&?>{LzAD^?3Lw<=WdWMIoDxT
zvTO43ipfb0>pIs@2xwnEr9R!dITrJOB%OyN)!+Ze?{clTz3$Bp5yf?{A{qChNb8mv
z;a<CvgzRyzn=2ajN^&(d-J~Mxa>?c<pHk+Hka>-atna(u?_W6Y_c`ZvUa#l#@l1L{
z;`==6$8hr+GYSW<6pUDQ<x||iK+H|@PJcLX#l4!G7ZM_4`Pf<G@@(P(0j7hxvKi+3
z_2Pl22<>uZ3|`2YgE1@NAQe;iE*h}Ael|FaG(3TU!CL;h=$QWw+3b$~j6Et5d4zs6
zx_t+@A>*N<P!B=Z!fvmy9K-6P)cUlu^oT3U$llH|#;!vG7Y#dN=!YkC$-)wSJzkt(
zU5@OIH4#Uu*<bx?4+ZjIJTa;z`V=Y2JmKS|kw00vMK#{e@8X3lEdX><hTtO3TV?`#
zKDE@d0y&do%I7;E^Wp<GB6^CJ3$+uzH&zE`((|n8TTk!cZs@<o^gYhkH~9V-C$Os@
zuiNPPWRWAqlw&`8*+q0Hzs`NvznA`+?;4<)>+W44FcWLa|M%*j)(s%H8{D>$7xjDF
z8>vaZk-{apLVgii+iB$a_77Img!`J%!VQO4zXebHJOMO+D<VfM%Efw9Vwj`#Qpgn%
zel%js6lK3HUe|ClTSTJPJZ@9<bppget8I~`)b^$RZTU3;7+EzEsbPACzO^x|Kd`l!
zPgwkA-EbFVP0&?JR4EVjBVxYE(zlXy8!8x$k$F(;KReTrA}F?+Pdk8+*~_$4yed=i
zPv0r%uO)1+)S#zwMjy-{nHcw-{1`!7_<malkZRyQ)u2V~)g{I<e~3o%eLJnb;-PLf
zbMQRz7wlpmt&PhMr1`WkibeOAe4l*r38YSevX;zNQ>0a@@WJXM7#w)y9XM{?ccvBm
zAb7b$wByPBEZNcecS-mOu{58GWIF}g5sGZ}m57mg9eVAKt5)~{>1ywtM$E=1K{}iN
zG-Z8d;S(U$^F&`D3Tg4R(5`AX0SWS>AN<V$1{Gb=QF8BahytwyF)D&84@&(`^b5=+
z?tkr*x8o%@JAmIkveVflt~3g*i>LeZgwI^iijgDx=dSoMQw+R_o~rROvc{0d%vft(
z{ZOSJ&AgQSwQN5H1%bLvL}3<>)>7s5y-!7^ZPHBoU!E|nT<MXfU@d0ORAhdZ&p}<N
z%t$BW+v)q*HLHf)ME0IR!pZdlAg%bdB(lYqKt%Jq)+b&;3B2!De19%oc#o>KMk`B0
zrA6gAqlGl`s~a=BpyM5@V#*loWW3NJWUeqm%B&cF320>HaX$H<32q{=A9zt0amaH>
zHwN#>pz50chIn#16Emq1+Ty3-KXp}*g{ERI*<qqnr#TAZCD;b1V-FzU1_<+k9p03%
zFQ9&mXE=!QcFj(4qk;bStC@br{D&<gkK$;GlWixEEw5L$+D~DtJ)dq4Npg@4e^Xu2
zrvlBIc)xedk=-h$^zG_%K!>d@BG7aXq!x~AY-(?O;pgXt`D5do_hA8Lc`U?;_V9*E
z^?K0a7dd*_dI8!q>;q;%{pZN>C<^n6ETG$UQGL*MZAb26oYZ;~o1-V*NJ{taV%&LO
zd|MLYvK<@RevW=uxF21+tri%VlnH+`x;`;q*XXoI1!5Lw8MWLO6%55}D%B+{2NNET
znd^#fPPOte?yKKV85?ZR1tb@>*bf<tmq0QGh3{P-VZxY-Rq<cud*5Hkxtzk}YNUO`
zCoA0NRK&%QNWNq;33|{5Z%}$ei`^lo6@pTUWx(6<FPiPq#Cad<;r(JSh$OHP-bU*C
zbd>lQ_FM~ZD#k%uS%Ys|l6nbWtn718@<-K{Bqkybd)z8XKKXC0L*(CYqwO1LXFr8#
zAq}ndKxGm$_&c&J6`PJJCu7>nVamr~ux9f(Pyed78J^bPc!53@2;-d5d1d4k`2+Or
z3^dS@ViVq17X^PgLH#|Uh>6=4KXh<=_Aom^<`*!ntEV|gs5Sx49eRrzpBrjR6TgTs
zYX_6X-hBMkb)0_d!WMu7%>;qEBKX2Efc7vCLr%o-;2}oBp?$y9zltMYoH&kj3!9Pw
z!6I|{GJa@V<v^dcrF@=xB?I%oZ(-EX+fKU`VxLdZ&aMx=Zmh_9Iu9nkiN43Y{K%y2
z+lsG^^^J%}pS@v=d5a0+eI|`Q5MZimr&jG==dJ8#KBbh!$Y%Y*qfw#HB>%ynR>*Q5
z)NysZAmY6k!UN`&;Mo@=&=+z7AI{uaPbo%~Ya)&(!i?pV46OKm#6f>J2pXsG#b&C(
z;SbJ;RS|`~#Y@gc!v4TZ&LR#h5{~DW;xDA_;7wm!6W=l2Hq{3u!BI@_sfCt*tpySL
zbk-FzqA(!RZ%2{-OTM55r-)i>(su(^?gj_7-<hkf4@xN7d<gfwq3BzoKe{hM_mlNW
zYVpVNyHp3^*$2=2!%;3@rLm7rogn4asuXay&X5S(E2eXTE~HfN&v!4<E%}EqEyqeS
zCorU7DaWrqlSS`}isOAWX+?B{HDfz*qn%lK_R4pD)K_5-mF@s-*g{bZVAiT@C1$tP
ze3i3j^3>gJk9r`C?;!B$-hlIeX>h!}onDtYo49gW2Xo}7az<tvVPEK)=!q9QwVuAA
z4<P;(!Ui)<2P<@CA8I(qMe4I(wfdnBzPs$JHFUO#x21C-9R25B;isSl<QT?DAGCnV
zMJi4m5(V3Z1rh}Qu%9Il&8lOY8O6mZ`w-7n@RvY^o-p&P@r<~&vj(hxgSy(Gou`8m
zchzFO79Sb)T5G3oT@2VKBV;4ye@MS29kjg@g+&bp66g2n^=%4jsm5RbxFgf6r?QDi
zDIzoxWaG&A0HXSZ{M~rS=LhT8&3gH!d}ApoxO<SV+x<=oDjPNtVSCRZKPX&TJL1ex
zoAL{EJDGFN8WD(7@Q6v_vXa7qf4O7DzsNw!3N%ls^8~8xPY(*5M59lgJlvU<p4FA+
zrrf}cIU~rPf58H$kUbb7=7H)<8&-7qhC4RsLW~#YO|nY+<seo^BWXILff@8$mM-l9
zk4Ow&9Ob7g4l5CT4`$<k^2;OJA#S|I3l@}o{LPv_V7%_7bTt~E*q?Fb*D!gZT;F@1
zC4Pg@jy)B#PB~7LjgiC5;-G06LCdU3h_gz9jx<=#-J+qLc^5I&+iU6MrA%uex=Iu?
z7M6uksC}PY;`3$t^(&Immv}@BT1jhDW?34w`HuZ;6yr!b_X2T?A36~JC?;a{PJL5r
z0{741wMXV9FJT}=gnk{rKWv$-+?OW1SSw~hkr1RoaX1`1-X!D>L+CM=cMK&L_BvM#
z{wN&gve@2@UkeP&lPA|?&lBTg=s)#{W-o)SR^*RCR3HbOzGUE0*OlE&@(6t7NSktl
zGG-Z1GE$4yW>+|+5GrEaTWl^K`g=4y6nj`&@q}Ks;>_XB@_lx8HV=C^*<t00Dw)oS
z{v^HjvJKJsnd<Hs6T7`Vp8CagIV0M8j|<OzdfM}w2)nf#cv!#NU-Y!!3&GcKPo9r>
z7<v2Q8#(*c<DWAfw*D#}Yn9JA@7Oos-cl)|m@m&-?zLSI&kLEnWqUjQATH)Nd`%42
z_hU(IhQ~siTdG{NcKRrrao2dDQqlSC52Kg68#*S9#(pgJ=PvxEpXVt}3(92?WbaR?
zkKI$%4&9IPLL4=d$+`1)4?^u5Z;$OaCjG?hq}Mx*qTi=MvggfoQ=!q78f;=;(g~zw
zIMDpb0GTg)BPAfjwxi+VuyslZ#o$06rtel*&ABz})|{4P36CQ-Z8OTpyd2=7qZ_;k
zWr^-L6@ZmQ@co}>!$dPr!1as3s1g77oPm*>_ehb^GV(VM&X~y%ji?`669p&7{w~TL
zNep|p*uOknYQdk}<k?WXky3Z0E2{@DolO*)MDq1^r5=;8xV3xi_?;pb;k~bV+TBiM
z+oy29M>0FQr_~Zv|2uOke6iEe`<=mV+Qd5^KU7(D>sgF|ii_hO(h^$y_)mO07cXUf
zVm@xmbEM+WeS(v92Eji4R#i6`GikMsMk~!5H}OWA!+Ecl>sH;dYm+Ye%q`8p^?;^S
zFp$--kbi!fch%l&GSKxjFU9dFsnNw1%$GcrkHy&3l1ZD3N!*Ed-+=i#0Zc$#L<)E1
ztsAI^n(-o;tkUaE@i*)DGV?;~$nex6to`h3zle7uyV&oarq;`pyeQMAWo3)gmJAO}
z^$}FX*Vs+Gu8eeU=U$S=2LEb`=@n}@GE-Ry(TUr5(!%>MpT?bNdJ2dg%NJ;d<26N?
z_oADE&Ti<?)IRKHKBoO(cx|y8m<ufuy!r?6l;W2c_SBQSB&;f%7+@P2zp;32EilO2
z%PZ&%*0W;uw>JA>RcU?adE!uY*o+x_Xs{nG>Tb>oTI+(+L%xZE)A2Vn@=(ta;F8=G
za$f{*51Z|gcF6u5h*KHSK24AK652MXrUl8bY6$5$;D5(Tq)(+Pb^?7uz&@QqkHzPn
z0&jTE+9Cfk#a@dCk63g?p1>|^K9MujJ0{Sojw<F2uDQ-!qy^{HwF@Wr)7xDSVq;?9
zwYyOuX#(sUMT!!ggbwaI(s{F@1qRL-r`r(gc{0Ql=z%ZwkGI&}9_XR?*p89Qzdx}$
znyt&~u|j`=+&Tr%ijYm!3T))&pTq3%|5AajnJC1cF0Oeall&=;H-wZYn9+|3=iq{l
zw@dw2JBl<Dj6`a_5J$#;z$1kZ9HUz&tfI{Ze7qvUr*+t~m!G0K9=t<i&uUuU8DvOT
zM>ccnKHlQmtP<#3^D0jFT!NOcEgI9<@)+KuDKmLn>Sx1q^e;cIpp=T@Q?AYc0u=0N
z40HF_b^69F73rngHtc5jPx4yug2aEIW-0kIFyVo@m%a6gw0Ad~^+)-$_Sj!Gm>#h#
zL2qW+@{dJn1Ue#1S>99kJcTcoP@?uSXu9!dmsIlW;dznkXp{2&DEBu*<cMp(G$MS|
zwZ52dFWlr#Wv&8#rL`oZU{Evrx&1UMuzFMA^+0`pE0sIFdw=VQ>v$V+#GcTyYZD^v
z#ITDew68BT_E#mPqO82V!FhU8Gap!fI4HEERHVMFqQqqc>j#Gs5Uuq3JB9ojahzZK
zJL)K=<&>A|NMzuqurppJ<%l=H&bfaoPaFsLJc2H<fOaOQ8Js)yFK4A36mUVpUZ7@v
z%JHT36~*tM;!L+&c<0v+(%!x?ulPWagzS+%egsEv-}rzXh*^>-+cVd77%6<o4VgY{
zV)V{!H0~4T!gw%Uc(|6j8eG02i<>k~%9zt3TKxJ&9^vy%d2!`6#w2<%mAms+6ZrZD
z3H)lhNr}~;k-DT#oi|5)eHlQ?`@*DiH&d^WR29QSLHvL<eOzpa_Ix)Ls-}C09&KKP
zJs-b-v=j|J>{fF75N#^_XZZ4TT&C|xkhu3+(7M@w+F7}*6PrtmA#|Nh5L)ST1a*Cf
zFmV6`!Uj}=oX9TgmYDk;Ac1eBPkQR)Bif2K^^OsL;Z4M@m0fiHBiN7yOvO|srX_z7
z!wlK<OxtN}WGze^deitY+utd9@V-y>zJ7k3Q8^MOEz6T5_RYJbeXkF%_c2pWU}}pR
zXg$_!I*k1BJua->5xL(r>%|4Kr7NS=iFgF|F;g%s%j8_<XMc!&Mg5(#(925Y*HiS3
z5LNm?wh~Hi;A>aA=O@toKH=1L{@iDbbS2`vpg}I&RT{sgR(TBa|641}3KCFw;Kmh*
z53UCKUb3<@4zVI+rtg38aM}P2(Rn6_7w=h7xn!_baz~D3@l$P77-@cW;KTd>?s>47
zTe6Q_<wqYhrJXYrp4_#l8ygk7WMcVi=oCH4?;L7-am!mk?49S0<G*PqYR?L7Z+jWl
z`0TMfy>38X8de>h6#~`sd%q6>>mF`<4U3LaCiM8(;qX0ly<8<)(xEh{GIQ}x`FnEO
zma0`o{@q~>6k=8#<?c~w`A+E9U|k)c9BASdfe7FvKLerLn^F+N$S{+dmY`Wd@6G!=
z-{R?OX&BB*!1F#qeujlu=yzFv-Cxa^d&kMXWMU@Ai}z-k%q;)vw|2R)h4o6OOU3JD
z3xkAcumyte1Orc$J_4=o^?-g@GV7E)pOZ7KP2>z|+TC&2{PzguAu#cB;Cz?3hfCr<
zK%0^Z;xn50WV)Cjo%FMK@s?U6hyj4RMDi6FLPbKTt_44QT>wdB<KV}(7mreg4nt>^
zq3?dAT?toU$_jx+;9`tuUylJX5E?04z8hw6|DE&=J5tzu)XFVtUG#oha>4=H%WVGE
zoCstNX6DfQRBl&HOXJ?jf!7zpHqd2eMxG_6`+^F%Gs*m<_k2vJGyMnU=f@P>Apz$c
zbuW0Yt==dgutvayYOjN|dvBy7eaX<%seyizC6i<$XwBoZpvbn^pgvdiujZ3Fr2LHt
zuZAG(f&{zfSQ1)ERWWlnVxKo6F7un$QpD3HR<=Yl3lk#2CUD}EwILj{tk|kkIPk&M
z&NH4Arp+rWA_IM(EyhYJ6&ths>`M76^sQe1AO&OpVE3~?xtVlX((l6};W1*;5ZT4E
zJuZMok4yPmnp9tVW{$ei@H+Q5j(#K5gFe{LZU0Sn`kXKaPn!LURLq9CP*Y-31rCg>
zl8%RhJ`wzc`#Feyd*Yxq3Xr^kLzI7P?`_K9E-P{FTL!@uLthG)zz`x$r2Y^Kr+=r>
zdxdpzEN4wgs|+j&7>bX1y5E1ae?VP~o<eP#Mc_Y*fOd-m-)jI}+a8iGxU{sTRE)_;
zqk`|buo(VLcWK4b*N|~>*!e$5k<<5#+ey#0I*D15Eu7q{ThC=$S6#oMv~6#qSE?y9
z0^@wXZTEtr>Hc5qJ<?hDL1i%{?yxD(R1Kq2-`UDI(I75o%-mqK5ex5jko2s+7wVbV
zn36cB)-N}AVFS*G=8#3d>_w{joIyJGgZZSLU)B1V@)r9c+Ca99%IKzAz(cho5NSt7
zteUM5LMJ1H|0_;wvZUBaow3Ltx>u&en?9=n6*)(7(PpZuT|DW}))hy90o28BFJY2v
zro$5EB~@kD8tYRdp$9$@-Wim9fLBe0<E6yGKam~Wr|Qjgt;dh1Gp-)vJZl*7oi-<>
zdd_~m2_#C{QO_Lv3%!!?JPL@@s0Ve)gI}sVsy!#GKO!v$bNz0pCKg`O!y2rrW2?=}
za+ej?8AA#0_gF>^SRobr#ixKv^$@0xyR$+&^VeTHjGR4FBLa;X6Goiv7B&7q@Ys{E
z=YUf1jfZ=$t5@zdd)YIS39~#NjHK0IB4tucnBqSgTHD3D8j#(QjH-(V-K!ge0=`Dl
zo9A~RI`UTUE5aAeVjW3>!dOg+_U-%gM*v9S%8LgA-#_2+^WJ0^7y^+;;(#ZhRintf
ze#xw)19~8ELSN;MI923w{kTnuet9B5YQDz`dsOF%|F|?Z%iXe)e?;<5?%=z&M350I
z8L>34PM-tExRd%&F<8q}w}wy4csB%R3duQ(d@{_E{rTl)H@f!fpf?k@q#3DX>G~yy
z+mJa380wkAn}784&!hSR`cSuaRPG#EFWyYzj=p+2@}IFX^;MUYpE6cqxICNNFgOdO
zyxa#gNVYYee4pTA!9bjx%^6#r2M(Mh13KS45Z`JUF_PqG9h`^vkGVxpB7nM9On^gN
zJ1cxthK(boa=siZsHfiKT|8`o-;`6Py?G|ee&w2rQpzwgK?r?OcN9hH_&OrxRchDg
z_1Kq4K2X~%!{HhqV$@0!x9zDIFT-k+Uy7D@@GvbS1>H2aM}Q=?e2*QTaDO+%<%Es~
z^mh~Y+@f$wwNBDO{k*<@oPtS^%sHgJ0c9NRh{0=1h|8Bh+huSI`kX}4c~CMKMRAB^
z-cDkW_j1zA{Ur-8%ui(lN|k&(;TJrpu97?bWX&KDuW|uCc8a5Vhw0@`ibIKmTXq@r
z?#l?y<avujB9#nOM4prL&34w=yu}VFq!KqA_)FJ)B=eQk=%fDhQ;^@V8QoRcjJBE@
zQ?+udzP>k)IxnW45sH>Z*#}6Y<AOmC($*wAB1Fdj*<__oH`u2eY7Uy}HAcGMDFuYi
z{y<c9+4Jvg<2nj6+nEpI4cWqzpC`7bBmvwj+xl<{aD;^jU6p&23e4wQp$tHVr)0<Z
zdKu^e3hzo_nYMIVTLhSZshwg)F%>r_i5(HJ@jyJ`Bl5*ff3eQW7&FJ5td-hmAGs{o
z!fHJ6R0jesDPvj8_^Z;ehMO9cqJ562XXPkVCLtlV#+%f)ymlF|v^XWqyo^*nmgJTS
z{b3H9LQ?4YB(@9FF8)GIx$OIsuwL58^)gT(GGf)V_}7e<@Jgp%=*Z+ZL;4`@2`+}d
z&kFPoaAYH$69xLka4P?PTZeoW<fR3{tQ*-o3!goY7~Zpj?7dX6Mj;%(okVcy%zGr`
zZsJ)6C?A^FHyMh~<{n_;k$><*oAE6pI?0o}Y<Hx+c`{gE(lt2}DgIA7_rLz`5mO1q
zuLn*_)jme=e+jUY3w6L9VB*U;^WKxx7#^})rhe$!AaHX!SO4CYP<~Ljw48U|gljA7
z;Eg$qD*t3`rf;8CXd%@uH%WB?cg=N`A#_BfFC;o>Yu7QE6hkJAoAg9S{8>|D$B3|W
zw8)8!@Xt|jWopdV<9evB>O(Cf-qY=@6h9i;0ooGF7%ELuc_bscD@E~wsZ3fOf#0vq
z#xihk)3=Jvtt9fqR2<T&j!3UbDphT#fRB`MOODC@NmL}~-Ygv1l6H7;Q{WX`ZhcY5
zIT3bu9&&O8J6I8sO*od3N+6z;yOOv#F%(IUlzIY=1cIf@B}KrNAH55oxd8{w^(qwP
zb1dOC5f3r=0vtA{{;r?U1BwENe3-pXej}Nxvs0%mPg>L8iiPP9)c#etm!f38!D4x}
zG?F^5f85<XQUK6$Gtg{hd6L(}wl)2!M;+}ynoz2IshR%y!AL51=GiM?w`2zpEQIX+
zUO|UfSA=F2mp-{k-mq*jN!}}F$i9Bv1erWs(Ji&hcBEj^k3LrF3!IOC7SAj0Jq<<b
zyY8i1%LU>Os!Ku@^3S0kafJ4qB5fK&n?&-QQLiD<dt0`oh?b+j*8M;U%B&~nt36p<
z(uwgzjt3`xgunYl$QEiBcxI1}?!spalxV_?O(}w>hc<RVuVe8^;Jb_<@NWN2RP8qY
z_ic)Cfjkuz+IZ04Svb^JsAPn1KN2QWy*zM8bO{kKtXOgus^QE@*~g1%Zgty0y)?Op
z0+pP(k*i^PK7Ajq>fI6!K70f2(uY`-D$%g5aUHiofaU6Z8v;SHbZ539zFI=B84|1$
z6ZkDlYa-fte_I`p;W$^MBl+i*cDRqx<-KS+|Ar`T;O`px-d*?ev5g~_$)ZDW>Vsu-
zDO#uU0i<=T7k&P(Il5vFl*25-%fdI{7`A)-S_=2`$|%si<4$5?S9ZsGY3PrDNSC`S
z()5#6r4&2*ZebnE%V3juJ=}O8{-h@4M}*DI6a+FW?gl34$AZ3zNr>=yo)qi}%hpn+
z85-TgvfV?;R*dmk`V}8PGWv#b?5}IMhrY>R{B^EO^EIT@HS4K+LHK<X2W>`jl(>kC
zG=BU@2u+sKAXRQ59NM5);&hY&U0ql=rGI>O0r+)p5b)D8v&ez*0h7+soGs}Iv`UQx
zaUK!rEWAF|PlYhadPEHpLdNSymA@eE$$J6#hpb&k#rVpnUbM*8HUn84!u=t!#{`jJ
z&c!#-!w*3fEAjyr3SCwb+GjzC;Z)*Ad`EBdm!j{-8h4NQ{pLS*-U>$8t3mgB38vL3
zR`8km{gz=;BG=}2S*A&@bP^Z|U5RH3>VMc5ai1<4BELqn?hAzqE<6OWORp6xn}U|=
z1CbyE1Sx7p2;RCSbFUv;Kt491O;5sa;G0}8GWjfbzYunqMG4}klML7%u8#DLr}GJh
z>ObLkSt*U;-JAScO1CJBf%^ggv7H^Sh(+ZdDah%b__Y?^%E)DUW_TFJpBJPru-E@{
z`L`4(K8!kUkC*xb;u*?Gh+aF@2a<~AkgN|)R8xryf;LBvshI4<#dLEH?WYy%d`Kk!
zzAFWI#6Mg<ibscw!N+<u`xF%!sw!YxF$(`V+G5ds7ZS>`#d6NrjmUO^(@J#LOScY&
z?`#X}Q>)->``YUG<}}shvPjvi7C8)FRzgMZf)X<joOSDOTf45b*wo#ER>`5uWhKkG
z@Lp+tk!$NXm9SQvz?-+Y#tCE0vi&QHw~A+dcM<R#9SF#OE%aN1E~}M@<V*Q>5%m--
ziPQV%<N&+C%f3b*mSov7lh58UY6O)W?*fna-v)MldUWM=qfl*(Pf5!k(5$>-k~jTI
zrGeS|_P()iDv{G!mPqE7*F?-`t@1lc{%16o&O)wiZgp~Yruo^^J2zs4+Wx#x0QLET
zbijw(3EXqZDn0v9fU>CXF93wPG<;ANkHQo|k)ViY9UZzXm~Ogl-hCglZ=kP>=>;O&
zXAPC~W2|4{2?`t&0sm`Xz(aJ;1rE|`Z1gC;CViN=DV!3oM(#U$wCoN^Q<5U&OswR;
zs7P~soA9-Z)@27338x-RXX$bh;DKglbTAF|)F`r2${_Ru6^e~X8o;5!z5ef9^@G7$
z+7r_!PUA1VAw1Ph$m!OP<zLz7?jBRmySpVs%S_f=uoPw?o@?oJ@uqm^=<@T!G?DnY
zB@NnxSL(F3E1TAa0z2bm-Wbjo^ZtwH8gD_Lz2#Iy*}GuQo^37#H48Ot5~-wBMP;Am
z{nB*Sj+Z8Sm+=!Y`by-&G3!ISaL$WqS5p?XDDdg{i$M1^bL>FX8Y1Q$?jWSCl_8Yq
z%s|YvA|U_KkoZz~v?()VygpSK$US97s;G$8VcLIWGj!kq@C8whnFLWyJT#nt@`Mq`
zU4~f77YYE(Rm2cK-(5A>9}?2Dmd`#WfgV7b%gCa<?1DLHU3UzC4Q}uT%;?*RKERih
zA86Uvrfosv-!Jv`IEz#M96f~ti!N|PWCM5`mHY=uk>;eqN-pRDK1-HOghXS16TvJM
zXOwvK0sQMH4v7iX;)0IpRPDo@IJqMw1>5xliyNA4W=3f)#8TnVP2rM>!~q>N$7>P_
z^H%|Za;$^#U@ip<Iy;9reIgbT<`wT2)ycCRLDF7P#kLQO+u%>wW^-lR57FbBl`U6t
zAW|a*{j2DiTL3y@N76l8ZQ*8Wz3b-$ZuYV;UB}R!;+4M9Bu8J0SJHQ$F3=BJA{vcd
z+f--Yg;%kjK2Kn69qvZ;DORF@c*)3w1ud4)y}WCvxxLk-is&uAuh%jdUu|JJ7mkB>
zyL7|KlL7uG59K)SLRu#Ww$~E59kuO%+?^|)#Bt=4!{}>Mf!-Q&ls&HrY!ZX4&Uv$+
z0Xv_j+`#X~C*tx<;5h|v3MUqyy0FkH@J_58OiQ>bIu%Lj>VVA(LmhTAWX>^c6Z3Cq
z?6BPbyK{L9kQz6{1^Byz9mVD&^qZx_`Y}h{yrGAG%az*-+tXuce<ADJ;+*;vhKyYq
zaaZU?y^;gqWDc4|B~*D3ER|Zo$Uh1}=|OSW<AiDl*m{pPu?NvPPs!PT({k|o`2|YU
zxh1qp_y@ME6e~)-&VS@o1_(wJ8N<j8*dlGls4n7+9Jp4`0hEed3*}=hXz(AH6(-ty
zV|3n=wN4jUpHDy}#K&)Ay$%236bhrVxT;K7pln~`(QNV)cU}0G_@A2}U3tcq-Hk^8
z&AK@9h@ZD-P)e9z-q~+WEVW|%1E<d{P>o{k7ml?mKkc`MxXtex2Sv`q4C%L=-e={T
zHq<+f7Xf^^vY40Vp?uSeIi2^afuDVWExRS}ZEhry$LEztvOQYxiq3gIK0d=4?D<ch
z*LO&y^F=h_RUF4%6LZvy*2YiN;1fDb<U@GU{DU4h+I|NR7~z=et5otF_Zjf*y_-)&
zIQJ0y&FU3&Ep%{ctNAqJEip<>1u(V~uBm~5-^ay^kpj)VgpVS)O5(G{OYlgU9)?n<
zygDEWzrCL-G*txLP{mw?jm2ul5I@|s(7z#4bxZ<*ADv|!J?OtZp#h%~SDJa94SfYl
z2K^b)doYyqc53qk>V7mb{74`u304W6H)O}Y4*|X&jk7u#gM~?bETqEO*{;^8xxqN-
zg*KCQ7SC}9N0XAeYH4eCC>3|!B!WN2oMz1Q@lkqGKk_rrCdc{=gjt~X^dgJ5JZDBP
z2zRHsRx$*4hUJR%tAl(=%+2REoEv8-iWJ>rnU1pLh@~}fP??(d!Tc^f8dWBJkE8<c
z72c)&#nY1<fjA*|g>jqufn~8e@X873KN#R05gaH_dsQt9&wMn-F%B2bD#h2t6I1zm
zqoIGw@HHYFrnCU9k8!ewkqBY5Ng6BzXHQ=|0uw6J^FX~;aBF9h+%(ynpZ3rbV?$8y
z0}gcut!y8sZw%KFE{c$7JTcEWL?cAz5pzgDfTAr%gxgc0XT@nke!eCsd&-i<f3$Hw
zLh~(JTmCTd>M3OJ=&>}X!n1E#N0suS4gw4zczF+yMIy^6_$vvNV`ufH&8dHt!_M*;
zB{q2QC4xNe1A|R2Y4RNMfiywwpv2&<PI+W{QaoCz?7kn<U|B;O`WEh5yh}S6=)QB`
zyJCF>z81<g%)O5j_yOKdJ2_1+R^^xU=zpqKarYt?ggOkfb4VqnMGdUI_=aGg7)nw>
z{h%3z`+125q?XpfszgFN{thp7qm&MBk(uiUV{!z($lGj5k|F|^Qn~H<*1Z2BF)Bj)
z20EWHAG(S9pHg9-J@b#T3VCTiWT7L&(Qc3m_rSh%d6U2$uXg~B_ACMeSRpI1&!Wd6
zLc2&mw*T^E*`Erf(Bu1OyqyO)Y-Y?*6kQ~`6mvdqQ7MKj`?u-hu*5e}%7;7p_;FeA
zl~5|Qs~#faK&8KD$rq7R2oLu$qQB--uQnnYZ?W8^f7k$v_d)f96C<VRI`r%_CRT-B
zwXM&2Z$Y?k4*ipW_faZohE63{C;l`f{xyY9ZE2JnZ71#nU(Pggo-msAF_x*LOK87N
zh(2vX?Ms0g5AX$hJ*tJ$uHM;eN%$H1KxFuBWl^#Di(GDtbqhJ;=)id(6Ss&euRAu{
zi}RQ<V$a;U27IHKB01tt7TNNacIy|hHA(WD(Hl9crK<P1BN=abppOAmNxl@ijGh{b
zI6GLIj#$id!p#)MNyj`e0JLDjx!DT6h5Pt_J%Y!_<2tstGP$BZc)99K;@i*Jo-O-Z
z{5avs2_4EnfcwM!5Rqe4$6RQ%QYq-1Hu^In&R#E&Ln+;lYvFN!MAQ4{hj0VUAvHMc
z+TtJiTY?u~c_fq(+9&XqmRkE^$3#Vud{AAa%po#TW`877|KuU$9tLi^cBhLs2gYm5
zu|7>s8y2DG%p<yk{(y3u(munF3831=Q$EyX-=u#Ohg;70k38uYaYmjs7nk4=d;%!x
z^ck!CMX*a|{X2=@|9gLY+e`>H_J06?!>W%Uoz&(yJ)iRGmW`ShGIO6Dy?SkLV?MAv
z-3u1$xaqGHuwr2yJAZ@h;w?dIJUvs@i5uSM?Ogj8$eYzw?ZWuXN+R{$goUcXRo&*@
zQ7zTD%l+Aa1DuMFXLMFXqGpz6(a(qNE*x4EK+K;5xdiSW^~}g_K6;VO`V}~{S^G$R
zwV*DfjI75zoBwBnpA9en&(4Bn+hKbyt6t}OQhodWL;}%;4;x^R1@&K2XRbmnin~=_
zyTKjE!~up~pdS6&mIk|7vj{yDv-yd)2Bs8#h;YoH+MePZJ*$X9uIzfc`4{^7Ub=Rs
z9jNanWJ1rLV(CcAiCjSL09WWXx%NoHf!Iw`JaK4eGm*Rg-&>&Yl?>3_H3WCu=Yfvf
zJo;<^&xa`Cxwk-`vG5y*@W+GFb+QN!d13}2c_PYbPs;&4EFJ2cEA|KpzUp3GgcK&i
zriu}uUMrFyY7O`82(rT=aiqiyDIC>E4&r*;N5dVsDO-dT+e@X?<p6Ahr!eGPU5QQ*
ze&ghGxh~(nt-msGe$08#kN|Yl-47$?LsSdi?A9gv&suN##!?rEJpj<thT}hdd7a^8
ztu@TY{Pgod*LOtOGY$o)gF{tfa_wHfNH<ikI>_yXWTl1gK>ygsQ6?PHpjxKC;qpS*
zyFUR7C2int%0)nQ*BsCmOiw!`#5vzc`2gAxq~_~(@N=*Ed*bV2JR>$|wAq7BhN$~-
zF>Smt&@1mJr-ZGp0|6I<FG>Nu+E~8`U>R3zmZZg${FdmX&@poR(Tu;6`|5<8Wpn9#
zOST}AC^hb<_53E;=H%S&y0hE7Wb*voV?fR2FX$Ds$WGpbo^7e5{e^vg6nk&Ri&%nn
zE+xu_QLJ@Q*}?n~6m02&n%h@>F!Dizjy8&OmVmtB^;h>G4hD=jCpc+x{s(s%c!_@0
z+GSr!(UEo}SpYZ#PiD(o@0OG~%{KiV_gYVz)5|31kg<b(l4%bu3VYE{E_xRaym0TR
zODB7MGou@_WV0VKFqZArj!4A`e<4}|W^HRr*pl05M0a|tr#}<3CArVHrL{@iZiJn-
zNe<1Ht7JF@D6{A8n*y4(amb}a>V;TSW_SZ(^sIc=C(yC^=}=vKL--dpIOmriGG-Hy
z3|<7{Z#ANgG`4X;SIaOwn6Nce*BwcAmq1>H?nUk;A3+|vDuOf%RGmEQK9=oZV*oy3
z4osGl(_%?~&AlfD3yiY1RyCQsBf=87b2sII(?h175i#?s>?*MKuQl0e<ZaE0(dU)p
zu`wHeZ*p-=%|#_=GUe2+HQPovJ%&gfqs>A-g}{F)Me?&+HNwFBS2K8iu!Mwa?!l;I
zCp76_6D|M`w4Wn7cMIUh&7<pyj^b@h?`A%F?lAGS9WwjaTa?O+W{|=Zz=!f*BjqV)
z9W?>}e;21cOk0HGRm#_sG;Mw*t#NPs%W3+nO5_nvII`EW58r9smtoF%ejBeP?_P|!
zbV0u_+gSgR^{T`#W~$sNthYv!en2I>QcNjpgspZG6}3Lf+B`f^iZTv+>E#^qOS|tX
z_p>kX<>}0We#DdqsooB&f0x@?Ee{mjH$mL|eKiQ{J%QA}9$(yv>9>KP&7H6_?m>Xr
zScc$Cp?VK990c9%fBcGN>%%Ahu=^Q{f?;M55ub3HIy!KE@wd=ut(O5aK!<_?(80(t
z)YN3htNbbYBZeu3y+ukH?7+U?y0ybH$P?~3$cXx7-cn>9kK5c?Na7BkCUyU8zCy37
z+s1CL|4HJ0>#hULsmrHTcADqo0rMS*K5<Kv(LV&g5Nvyl*iMvr{F4OrusM3_8BFM5
ziLwW=5$}+e`_h2sl&x$T8YJaCEOY?MTz%(zN`pQ2=?Gx$&c1RfQE}Iyd}wg7tiKXp
zd7F?yD87`oo8R=`x))v%ePM;aAS~Svl4%XjAziMiBAS?;77D-(FbnN8R*Nr|-lMX8
zr6iy6p9sUTUQ}g;ObM{?To;+id0iQHo9nbBhWu2wgX;MyAQrhGpNH!;aKgs4KJzl-
zt(dNDXU^($>kIfS;Ouu6{PJ4kGPs{(ZBzr>I@=i+pIdy(HtJx(Uf1~_u;jahpjpmq
z(&5TOxbtAbB>8Kv2(arA7WiAVcbIA}N%(j}gRMNf3S82))II64IH74NAS_=Ij=u!4
zHDzqr;n!rDi~(f8;QZRgO|Ifuny7ti&DKixcwn(K#f8Gi%>9MRuRs3MhiWP!Liz=L
zZc}n?Q^PRF=&FpAA5$mT_l9V|qc|{m5F9zEqTPVqXU_tUTlWJKL$uP~#O%x=AT3sj
z;otxUu!nv9=I;ah*NB^aT;Gx{5TGVHxryeywj-W~8JO^aX+q<s_$6gV%NwXC(M~?}
zx4>i>iZdV(z`i4ph5X}*-^(xiY=jnz7O%3($2;u|ZSttxoqRvQgKrLpLPtm{gvdI4
z^%{|jXbzem@c}RFTU%)VPf5b3(L+XCUJ=2!^SPW~mqxxmN-hUz$(gFOgHLyRzg3Sg
zDG-JKz#l$;f`;naH2uUI9kZi<i{HVR>}(Zq504&4dMtb%5<G-olrv{vc<2P2&mBrg
zwS<=bf*yU0uF<VcfRRbuOVDzhP@g~3%h!j9lx<)L%{Ipqr+@D-v<mSu$dU&fz7<{k
z;T^&%%ZkawJ$ic;GgfvLdmZ{caNkQ(yuU@#>yqySuy?w0I|Ky{nDH6c1K;zCRm<Vd
zSOL4wdki4A`1!60)2)l{=$}8dmB!`w7Uk>R3!Ba3KiR0J*Zug<V;4*0Ke2aGWm-}>
zp3meZ7V@eEcHkj_|1MQq!W!Aalo1$dt7raDdQT7xl@%%J7EEa@B1R*M$Bi-gar=>W
zy5f-|XxOD#bXm_+skxIeTWy$lUo-ZjoNK@;<2YCnt)sl9vr&#7A0gwkoJrdk?fT3%
zCU$d_FX|+SPNo&)QwwO>1Q+~uRTegf;MkeqEA?b}s1B^sZu<0noHB~|4DrwZeQ)yw
za(aHM{7q0EoHMspZRm<#d1cbV+ukwf-D@=lgNM_p9<2iW;QO?<0_vr*A(gcyc+;rF
z>112+35Kd0=ND-cxHa-?Zj)FGfvepUX*dtBhC#CAU)9B4UovgfKy@6SMW>wg{p=$(
zSywuY`Wf4a&QZMX@t&{$T3r@2xZKqL0DlRXk#&q#ysb<G>)qaqcj_HI>T{M8?usyM
z5#?&)<>hkadj_(h?a6tF0Y0o9_;|U%+AV1SMNWApEQ*x`LksP^VDE17*&mvV{*%Hz
zJ{U!pEA`Mf$cBs-7RY}%iLY$r?V%ga4`Dm<VEF<3uO4__cT`si`YFtm2wu_lF3*DY
zSV=(k_{Nbg-AYYNBr8uiBFS!NkUppP(}~j&NEuW9=X=6*3HtQjJQV#y)fLQ4{OTR<
zA?9O)=;kQor46Cy-}N&f{{P)CxU0avf<6Z#nUoU@TRXS5XvO!gXI{S`g6BIV$HdDi
zoBWX<tT!)T%s=fyueTq%75G#Tb2UUCF?Jm{P=ih8j=6GLWGlc0@nNXV5iI{O=(;7h
z{wDWlrNjSu;y~;9I+igcP?8G)&%E}17HAb2AjR!23<k740JBde2LJ^V*4>|9^ysC^
zwYciIjeKrbQa8{Y&p6K(dT|}UTAQGoQP~1HGzoxFOwXP1*&Sjfv83ozHSx{7vMc87
zs{TNr#!Uy+_n0>mnw#UPCGyfMVs+7!UF|Tzvi>@H$(QoCe4disb(m)=$vCjW8k#Hq
z0GK3Q!76b3+Zj@in~6DJTUB1ZyxA<>LrIK8!Rt;O=KKsNZ8v|b$US}s)}XTaPLN$c
zVhxmK7GX`c!Dho~kq7Yk<qUu|=nKaRwZN4>A3eE!OjzG}7a!+8k@~<yKtA-F{yh_(
z>>h-+2i`}a<R$#wS+ejAIxi913k6TH3qCN=flU><OXTmot%bqgF~90d>7cUaOp);L
zlLwI50tb+qGO<YE%VJ1D8MT&cj~G{5&ExBzCdNgE6_Gb8{{xc36i5|u<NECF=<f7E
z;Rc49G(JR+!PVmo2>NeI8ax!bsOoPy2->0A<>(sIdYI~3ZU-iE$O5Tv+UUkZ;T;l-
zJGD}{qi<7z<6^`0&k+Wy{vFNTDz8f#Sz78Hy!mw;y&DW{AAmWYXAD*|xJb_2UmWfZ
z#$-UDQQT3YO<a2LL}BuV^=Xuu$p$b1R!RwW7m|#$NN+sXo~<Wv7qX{EG9cxx%;ei^
z$NP>#FGE3qPh0e@wjGr78e(!<fHZH_@03ZM?z=|6a$|6j(fK78Ee;|pg%JYa&y&%H
zsN4+|xkPnzr0(e>RM}agRAht)Vnjf8+k}Y@-QpX7JYwnBLb%!j2|Fz)W(ZGZs#uo1
zmaz0+_TXIw{8nCj`~RNy>5GB6x3If<uEKwM0XKZ281*MPkMab2F9StX(|aeKl=Q3r
z2zgH4?Q0>8<=)sjl~wQoHEsq@Xt^C;(q!VvlJ5Fe24i=t%Fh=aEWO5Nl@>LY$|s#R
z*57Y=+^&LX;4EmELd{jQ2XQymc-6uses8y0!Q-~+EqbmlvXOYtfY15AvuT1uwSJS6
zZDgb6arnRz)^V*{TAuGZ^@o!n@)t=4S=hf?pUap<d~y>98Hc94holj3xpu<>(vk%&
z#d05MLL5C$-Ms_6F#3Qyf8Bl$qY=6bN>y|<cge?trFQyZXljfr3e?bL2Y~y{Uqg1X
zF9IyGO|1WZoWj}rjAQaDt<plbbcNQoY23{&8Q}MyYoKJ$<VX(mfVQ6Hf>TKqJ{(1f
zI?A*hVDZ;HgX%md>A~qwRvxqNJjaaL%%1i@<-88`?K6%)%%(<{jubHQN(S6<Ut+iu
z8LW(bc;Q`MB-mg#Wjb)G)B~+M;|~69Kc(rHCzR^-d|?h&$$#pBWVBt&bn)hPXHd)^
zY5Jp?qjWz`VWkqN6?5a}1Hr==DjxV;rwpHnN0$ZeCplMbz#`TpLw&zVin>4Fe?^gR
z49-b6$TnAHR~`i;HTK3P1D`)DE{C@yr2@r{dw}V{hOS&hDrFhAAc$<)Qe(g_G^QT@
z2WC5o>0^T9cijMgVS76oh*_H`V+Zc@5{Ilnb}!AKKi(Y22H6rT^b#^@^%xZ@IhU$t
z8R>*&-^<@f--0}E#MACF`sj+CKm+4gJg3Z4mg6R1Xcp_6$NUYj=S=?s&x+>&z3o_%
zQS~1acK)gdDo$TTTf*+2J=a5op20Ye6vSyFk%Zk*GOUzl6%`u!bu5D2FlRy^LKoCe
z#Jg>R1z5;@7}Bni4=}E6Rgc~n%?<$yuWj*CtO{=z*6V%FCd|$HAF&W&{Y}lUA0Ei!
zeox*2tj*&Q9x?AGS5MQuv4+?<$idxsIlmgjPbd7!X%*ybbDFO=th<@ie^_6LN%OPu
zi%f<rJu3V-%`&>4noH<Ckw9Je8ryd&hBufF+*r@}d|yx;tOY=lofZ#&NTjzD4!+<D
z(?#z-g<Mula#G*La*RPTkK8XXkqDmNl}(`}n6Nuq!Ege=7IhY@S$~}%a*T6Gjd3jT
z3UOD=4ITKS4BC9o4qw1;kBzPtVuim{N+qKg^4zMNl5InX(4{5hAC8<uI+`qqgrK%<
ze&ISUID>!>uo)nAWmvz%?A;ym18aqaZ=y5^^N9UmdUp`-zi5nH=>1HG5?#w)*N~pU
z142Qtq7PAkYpgEzo=coiwZgUSd1c@=DDexnI`xT`^Lq~Y{sEz?UvISUyC|G-GFAed
z=*{6x5T%_DbShG$a|R?$fHK>o@KJG+7sc+JKunhD@_;VL<<W+dn|o6o_u#>s{t*%u
za39h8gMU^P3U+-vMc)86mab6^7Qi)AG*F4Qd*+hP0*wHco*={M<?nT^2SD0=fszFH
zIiZVR!9-pV-^;lh#G_2i50~83#Vf&P)sk-;_~umvW7*fYF9SlS2w9Z{w{NQ+dVP~%
z?ksj53J&;(URHJUCL5qXJ0W|1H0fMKugrcF9G3X?TDP5}C4H*4>L~P-_;dd@k_M!b
zj?N<fh>vY9g$fM8N8fS386vyqi&*@Ul3=*m$U)*s9PyPNQOv(#XK+WN&J?PNuWib(
zb`8RpT8#gi@FiI+Ym;47@xK(`Km2K}{twQnEj2cMjWBA)6b$El=J6iawXwd&Muiwy
zMw}PEtfq{5(|REmNKOpINc3^!OV(k}$M997>x^KA?Jv`^uryD3vpBjINu#Is(M@vC
zbw!XpteRFZRsyBCc^wFGK=Pltidp?$5DrwmzO3r9@%Alf#0kIR86i~Dj|i2HjUtJ|
zhl^C>&abQRoti&@dKBxx4bkwUa%<PczE<h7NODX~$?Z|xnvJx#1EWTjQTSue`2pZm
zLId!%dK35;l-<KZip!skgg?K52f;wv*+?+9C-X*%KbUpanO(|A@=Q1-<%l`^sB>Yj
z6)f%`m^$6NwV!!k@TCQM0c;i9pvNt0{SfvR+88`NZ6x||BQ@LF^Od>fQCq#it~XPA
zJsN{Xs}<P`aE6^IYYtMV3mDg&5r1yQH{~92DokA5Gi~_{`NkhHKj!<?=JV%{YA{Ou
z8-kKo4dCn-a)1XVv5S4WH2KTgZ=B`v`2FndZ)xvlADrj_be|mr9F^(AuWm8~c{&59
z(f{J6B3R4!xl47!BUdjFqYL4aS2}kd00%v?(B5$Zk_I==imQ1w@lJr8F{)TvjfoW1
zl%J!&JHcj2fpJKJSn9Lm(WpAjxJ7PgXEUZ>H!!@sS{Qqtd}8QcYT-=}E7MntJh0W9
zyj$Fc7cYR-qFV2@vI#-<+r!;x-Iy(*T30^rwu7X{d<~2O<#tM9&dj8{9R0<PxSBxl
zOIF*tAL7ATpCM4fK_#RvDW4t+HSjML{7d|HBTxc7PX49L^eC1~3zsiR85D?WKiVSu
zGO2U2t>xsBj=RUc!6o>tj-Yc+yL2%aez#^E`?h8Km<9ty^rJ#R<+VeAZs2zV58o2l
z%M*Ew5cQ(%ZJ)J8sqo`+q9EZmujWAlmvd*D$K7vzNrPTiG*lj<rC6^_`t_!0N0v=(
zo<QBd7v07iU(lp?*Tq3~`pp3kyyjP!>%$RC#JTS%E6V=QhgnMBm1^yPTOh$i!MGay
zaV+{rQl)8~nm$M+?bRN9_PY}lV|agp)CeD%@zC~fe0<Wp=^^;ct6n(hBjw2AN|u>Y
zG9+F~nUBq#m%gNQr$*;j0#mg#$0Q^6X3<U#d1ZVLGXLQ!Do(k!J7}`ii^RvLKd;W&
zY?&`YXPi5P@;vuF*;w1NB4NoUJjG_=s(#-&D^bQJ6y?Gh3Lz~qk;`{oIAs^7L2dci
znuOawAi<m8GSWl_p62#c*w{}P9Qsv%6}XD=^lvS+ts(E0q`Z6&W#2^?f{*K8D!O0Q
zT>JW*Q6F8fXwT8-^)lk7tfdJ<G^*Hbw2sw~oOzo!wsD2T4G#Kb#(Nzg&Y2kV*20KU
zfnE_Z(`{0SJ+9M?R#J*!1&uDrRezYH-odUdPiw;A0`Y$ZfR?8tmUZXCp;c^_?YO#_
z7~57=6)Af;4(YC_iag**Kt3&fJ`$^zm0+c>Lw}m^0SsDCS{4e2L}x{vsAGjFGTat1
zPPDFap%sp|zYaJ_dG^e5x#`3{SObv%Mhe~25RdI}^Jr&<jcBv0W}VQYHPOQEqoNlB
zPw=nYSb;`^B(lo-@YlBtAhq_uvkA>B+D$BVn~nQ>%~b05wz0ZXde#t!1j3ZROsbpw
zyWaG(1%pcw(iFxnv_Y0S|CcL59ewV5b%6mP`-(^O6C<d+mb4FE{Ot11q!Gi%3vb?H
z^S(dF*;`FuP*F(ED@iI<PH!Gp9WDC3Mo%!{!eWSIUhmFo5&7#^S-KQQafcy&QG&r{
z{BcP6r2AO0g0+!H{`5=)a7s1ztk_)QCyPWtN+K$^<eiyy@y#qqLpb$nb$&V_y^uyW
zS5}69cnN_QC2P^>*QIIgPS=pxrJm~j<jr$bf-dnk_41G)=;qKZZ;fy`c#xj4DNeu9
zh$IDyYfit^@;w+vO6+M$o7uTdE<UM9<Bf*^6X71-6-)9x(R`i7kG9qtFp0DRLhyAF
z@C-Tlh*V=vU<{kmHYpmNtd%e7mFnmS=Q9J4ex^VH4juW<Y!`SDc<M+I8TF1q)Tp^y
z;#Ews%*%Fhbk7MLLrFe_)phjWiI+YRSFXT9_u?$=UDRm>UXqx%$J5>`<hnqdMGNcV
z)42ouE!A}bhH|u;_c-_c@g8P=MrIQj_N7Vhm$#V^%S4-&G}Av%tpoJf$<M4&E7g%S
zRes|@x74IuYEmkw&`Y~b^|+TyID0gU;CwWLE8MJ1H#98z*UqMM*-IckV>s3;;?Ey2
z0mD3=I2XhZ<q)O)^~3~l)lsdipp`vq_P=hkQe5pp7i5d`J;L#miS_F@chMFNf9{fc
z*02JEufNt;SYMW~>`F*YDt>O7TR&tjSKX3umeo<;lqNmM77vKeEe^N{rEwB)z|&d_
z-Rn`nJ|es}-d7whTf#hSiFZb}j3dWQWRDV$eG(|*^QGP_PR1qN?Y?FC<af2=Gp7fd
zjm;zE0wc<6DunD9N3Yu<_9z7qdM0gkwf?O!h|Lw3n+cR8`s@b2Olxa)6SM3wj7+Z}
zm6mQMX&P#ygA5&pPP5+m)|!57=aHI3)*_6G5X!W~b6SBStWe{4IMXRuu15!YIq>bx
zGLrZv&Y(NRr9GNXcIsA&s26}Sq#v-sx6JeXT?|F<2Jrw?1A}paFW(RHSeX|)%E0~D
zRv`=QY)$h6Re_hijG{LU*f(+AD0kEKmY`J~W=4IPkWlFJ#U;HW6e^I)^ForJgaDVQ
z+5c<qJKvh<x_;9GVJK1)dXXY1gx(>MDxyS1L<C9bDk>t<OF|$hBBFvcl_01{Gb&=E
z1VR@jAWE+ya3caD(#sj|=XuZdp8w$RAs@Ihxn^dsz4qQ~{mS*M-IjFLb1Xgeoe7<f
z6?|k>Gycm@6VF1N=)OX1>g@h9#|mR3Y|g-SY&+~_QO(4CPupyY!=IxJ;r!hw8g2>~
zS{;iNM~itf`O~y^K(2;Wz6`5N(76+@tC-VGwt%M#mNCiRjiZNr*%dtfA-wOjJ2SH@
zC9cudeK*q7MQn7>pj1q5s*&LxwHDs1%My={8%FLC{~NmdAMINdl9*0+<QA);i;Tj%
zJoehtiOu0chXg)22v+c6vBTB=)3YBby)p3M&3LScF5MwrbGzJx^(U4*XF-03IJ)L~
z?Hb-^>oTV-RtV0`XfC-sOL%HeXl}#W&S;D7cF|UoG@|tI%n--3B88mOy?G2@dh^^w
zxX6NXe$f%XvM3#m`oI&XJaTyG_%2TFh8!CmWdU<Bn>Ln?j#8K&UNM#5OdwK!!8q!g
znnB+cz0^K23$C4fi*=LKnH{{$clu;2NZu|KUBhRs`E&i|MO!w^q5%=U6Zr1Ss@g%0
z=4cDqyc|d<QOGD^yWj&^hX_gUBxYPSV(E-Mw3?p;$zU{@GYHA?Ma&XZTn`@i=Hs1<
zAXa?a=FA)F*{V3wW*()&i}E)HbLLu}!00(V7<`O@urSbMf(h}c)-QtMjkltH#pnCE
zNpf;*n#Z#1_n&0s<FPyV(XJck0o6G|q%!l$AIUm5;NA|(LgW@)yn65hYo|}cXe8%m
zo<huiae7>k@^?e$_%2B;LAc;E6)Wo5eO3fKJ|%9`XLWl{nX|2{fjfNKq;+AU#RIfW
zx70CPU%fUqH}8q<8Kp&DA5ESU;IZ^g^QmcJ-S<o*l1|0bI^5!kIrlTi{+ZVTOu&-T
z#&9*#AJXBf#3-B=F9yz!A=xN9@235X)~YpNM5+=$8+&LXI9M9uyh_*H87C(U-m2%V
zS;D-KLrKY5U*5kK%?#nGhTc9+ZoJs=MSi`06DXh54tXgh7rypwAIHD@G`=ODnJQWo
zE8AJ}h74{Hd5){J7^>E*i@cHDbLcq3zQ?Tp?FBU&=oB^VY1T+Gej7j5Fj)d<<?}iT
z^gh%-@SHq)%cZ_-WeX%azkIC_sSFC#K9x>Q`+YM>{>}3pmFPt`jO(h@q#J$}eI#G8
z4n^<_4#o#Le9#R)kf|L`6EA^(8((Q&0g?_s^D&BDQ{!;pud&0!(H#p5992e?tGdJj
ztM|Pj+wYeYD!-ry8xp>TL#(c1KUF8Shv9;L<0ry*cRuU+(9n`5WlkfeC+3YE{N>L0
z=4nx2Pgj}9AWy|W&m0JNMiX({MF<d*J9-Nc3z`FWhu7_qm3ONZ;dk2Qv1cIhJ(iX_
z(fd7UJTswm@M!ZF7K`ir&kJF#36nYydj4LRJ87e%<k1)3{Dm?)nfbpN5XiDc&2V)c
zKH{7Pr|(QNcG*0RKTiwo>#Zwth@rQlQ)L@C*!wYPQN;&os<yu{#yM%}8vEvHC5)vx
z<p@euNg@b(z>wY6##UEs8lBDNYXX#au-mblEkU#0>I|h!0i8k9Ao|$P8)59W@4B|%
zVeb}Zg;<JSt5=Qi#8&%wV%^ug*f}(mth{TNTSw6E?;Z@NviG=h#j=FUK7PJxWT{wH
zg?77{4C-N^1@lolt5MgLeTvK(mze1^WLgV=mUZf)Bz~juq_<#!su#478-*TM>B5_v
zu=nqG$ZGP~t^=sNKL)B#0mlpsb=^H;v&RO@?0}mj)oE;s(OaC6bR*U^Vj<yki6Nk|
zeu5pP^A4<IBqtvwTyiscP&xWR&iYrovOJrq;h$`$F9Ttb{lrCmSXZ3T-i+}$(2gvc
zY!n(S#>v0Fft!<i$6xL)8@<^OB-dL)EO#f^oDA~X9UgFFj+&U5Z*pFob4LRTgq_HP
zjog95er#`gUG?|1>&v$6uDb&ECa<N(EqzbG`uv$iaczo5zm*6A0X<i!sRtlmVq2>3
zfV$kE4Q3l6J&!DgiMD$vq@_hi$Sr@tb0jy{KQ2tS%Q7O)sp{VIh)Wz>DhUH^<~Av-
z{5h+MDh4WKjeCjNiDNUhT0s5pXWE6HDgHvQ#Qj+5J^n$ROTMGxw;{Qlg=HD5a}g$-
z<&CR3RxZxzbu&*k32Uk9gamrVSnCP<x`mAaL&m9<4*b=pQX*U%J4mT}Rzd<c&`cLJ
zhMcwJjD%gpetIy}67<i^9>$NP4qdaVU$@7;W#$1d>S4ef+~`6FXe5@F>(Q|A$5nyz
zRkefd#WekqxwY1s_R%CdQnjU8SZLuF)MdAD;k?L0UdZGZr;Zw(O&doxUDz-{htDND
zW!aGmM)g%tqxrWA%Nx$7^7ry*NTe0ye@5+EUAZ|nb$<Z(AaIz{`#MC9^Zj54_5y_O
zz>>(-U2QwMo9ipNppt0D`?+Bc)YoP~TzY7*j=O|W9q2Ev4=+&>g!epoHu`m;(*N0!
zqY6p)U|{`0a;gcnJK-%BTeDv!dagFMk@anvh>{}RB(oy<T-S83U)9Na`-G}(wF|!5
zrHA5T@R}DEwL%Jnxw=bUc&)*Ppt5MO)yM!LSN_@i4bNGhuLR$70p*KN1Ph%pW}!@_
ztSU~mQ7<|t&{o2p;iGGpv&W{MjkMG=DVp3~rGTPyAu!p$#n;|L*ICLlLePNq;}SiO
zuN9z>5dJVT(D7_~R-N%Bs#1HfH}d+}Y{_c?WY;!5maLqVPG^zD@K^n4Sg@x$Io|;o
zTEah%e6s^eGhNw+mO8q+w2PJ2HABHW&y@hr2ZLVWb3Z^uE&qVwQ(mJFKd{aXLxXDN
zLS)L<??wS5R<gQ54g&cljJ0t2@HFaXLMza-;_egvW(#BFPBe@thb$jHnnaxUsh^iq
z<5$<+w+DrKMKe7FmnpS;nKjm@k$(INb5r2GDK9vPs}FcVm*->I?5`va954uJX;!w@
z2<w!i8ni$~+7tN(u*>cv9YI${^cl@3JheeWFm0?atn@=MS&YYiQ62QoM6%asn5U(S
z1|By<`i!9i&)_Jgf_5Mk**g%0YB)7#?%Qh_!OKzXJP#CG%m5E=Hvy^hU!HzHmP2=x
zbz<Cie}erKM<4Ww{HOgq<F42vpbV*jx;XE{f`hJ~6)Ay?Q|N=(PqB3AZd8sbR0d<r
zQ^|LSpYTL0&pP*9Mc6AZvXIPfJ`y!?=<O3hY<cW<!d{F?7qp^4Omr91%(7n>3Ik=|
zK}v`ukx7N=Hy=r@+WNDi#mSHW{Rm#6I$e$SKtkf@OHKf<FGy2*LoaA>8mlF6vP0pV
zps68M#*}58&Sqn*kU}X8dgY=Po-h}OQr^q;kq*3q=3%Gi8G{`d-;*@x3t@rXjOb06
z!z%rgDE+<$N}Uk~d;cYBs)o|r8ks{po{&d$a7wA;y5`mWc_QwS>Z2;Luruj}4<dOP
z)&9g}37R+^ywG)kL6<y+n>Bxl?!96qf$g)^DROo6GI~F6lC>l5%B5kv4o=o-OIxc$
zWNzq=NlZqZmokv`;Yp6GWA8pVc6`Jc5;t5;S*`eC%qf`<3X5-}4gpuq1aD)@{%5)p
zK+4?mmcXOB%s8{SmAhkKUzUu%4^Bcr{%Fow`h@>lz;I@)G;p6}Yukc$mQ5M&<t%lp
zVB-C8JL8UmEmp2Q)Kx{ePnlTJ2%iH<j*9ILgeD3G0zgFow89lyk-}GjnbQ%H^P)Pd
z-~p2(kcx82kYY#xNmf*XWvjB8OcAQVIJWdy#QBk<7H`uo_voYe1rDPk_9&o^9OFeD
zI&>WMGfx<JH&Vz>TqQ&Gi$PkxQ7%?<f7F$zks8YA{5=j+=}e1!AX%SXF7=R_m|bU3
zpFP$-W(tJmbIO=eB*t0a7k{h1Q#;yH=T$G%lC!F67z&mbp<6PEC<B>$twCFhGCm5V
z@6dh^z{Eweq6guunX;Mzs#FS5t4sXP$n!j$zu<pSD@nZn+BTp-))KEYSl6AM?Mi0G
z)g3N%wvLz7zW>~qU;L@?b)mqe?jT!pzWZ-)?pBOf!#sp@Vh875yl4FmUH<u84l0tp
zw@>YQUHbhuRX+CquX_ScdqiJesZpyM?SG}7ylvueF3RXnZor^<LshfsgCzUO%X}cX
zAYGde>%RQYq2d?1yq|-&tldM;D7=TN?)($})GtEVa=)NEA_PHhI%$^%Il2<=cp=%`
z_Q)*hxXDTp0_t1_b&~OJpTN&b0@(O-fdS{~YGXd4Qu3fInR<X?Kx4j&QQ=8mTjQWt
za4VE?@aQeR9-TA^{g!cq!151PM^moU|4C~+Z{L5kb;bYiK(*P&M`$Jb+o!zFhJx=z
zPMJNm5}SPP?ApY&WJWvqJ&_=}^%1K>WuJVQ&E|<4-_lV$P4LO6zRmi*%yUw_dwE>b
zZ*c?r(P=w+>SzRJptsi~K@M^9ZZAXU9N)9LiH_gOidz5f81xKyB$W_i#SHmtg6yL|
ze+}mXKwn(lzQ;r~b>H~4gNxY1hb`-ZW|!fNX6~=3y%3iO>Lz9;f;MSE2y3cM@^YR3
zrUZW|0dugHhsWWWnt};mNUQ_lE~tjCv!QyDE`3yxgd)ZVijdBtZcu0p(A-Cp*_L|~
z`Wyn2^^XHjSF1on53$6NWO(2Xl6)P?#_nZPpT7Y1qTRL{65fVWg;oXjE>+IeqPjiX
zx!LaR@)MJm0S1rw#n|;9nwi2+KgyGKgrfHX0Y%d-wU)qzb}J2O)3{jw)diWA48#V=
z%2jLo<mFoVlL!7X%Sgt90l9Hm2N(LxB6TmKZHl>ege%}p>Vv3D*a=1_{5Nl5>|Hw$
z&S^D_WZJR0vSUu5b0Vm$MxG-cv%3vY6VLsbwPu_;riCx9jY7w~+!fpbPtTFl1@TUV
zYjBq{RD4nRHsVq3er+{ra<!1F6XL5Bv2sGLTef#b6U&hKgyFP^@$+yZwOh<H3P7Aq
zBNZB4Yi<f37eJQ&)|!AUTzR|mG*1h3M1GTrm>r9TcI7U+gPIv7$#tV&-5Am%Ca4Qy
zhl&S`?-6g?C~|hq(E(LvbE*5*MwtC^mE4_8uil++Qo(NU?-`$gwEF(rP`8@W>YzLY
zt)82dnX0W2&j&I8%(^gszwFSi+U6bEfdzl_L)m+afGNA}YG-TMZm_}7AWC5Jpu`H9
z@yp6W^!1+6sF9o1u^jH(7z`)mnBfaeo`+(qTjMy+mdy#A!EkNT12S=yS18Y$&>q1C
zancvzE|=Jha`LJKd<=t-qL#&59S&mE%T-2W-^N3I6$Mb%7m*2+-<tB0&i~NVC3{J@
z*~f-ySrBJ_#|Q9McfZ|0NiVh&4;Pobe*?H$UPZXHFxBBn9#s;TD6P4aIc7ZsN>L2V
zYbQL8)Llh7^G|0$t$6K!^x^H*U;`4F3K^}h;(AY@1#BVjmWqEgpO`RrlW+1s+1J38
zg}C>27j-tk91MSd&GQ!;Tk;RM#}dz~Uz`5c0^%&zqXw{{gKrXNZAnO&+ZsgOa+o;8
zr!ECrIQ|7$Bm`^CcAq8DFvX4pk&X?jEAH{=r_B$*lY1xdS$(#h?Y9c!@2iSyyTAF3
zjcHa75a-u(L_54;X*>1aLzga6`A^ZNM}Q(bWua3vAsBwEMHx~`up8cuDc(&m7a~2P
znswB-QnBiEkQ?U+nl*sX&<)Ql?yPkf8V>hUj-R#Y%|NtdNT|ZcF~_n_k>?2I70k;7
z0JvEb<L&x<elKT3N((D6Y|>1U7~!zB3idn8rv|Va8|A%};f^0~vIlc_wrL_$^3s7#
zkSmt8+Eq3lION$D8ThzA$zs}-pR|4y4)zp_J0FN8VTa>_{Ic|}h_F;L3ZHHaTULJ{
zxrueK{Pwl|)MkzjwLs2*N3~?4@7T1urrzJU(L+)$^D^Tl^wt3Nt3-(_)L`=uHL6Zn
zKgZm9vY)Jp+MEm-qSC!(8mc?E0nO{BzfvbWg@d6tDBvK(RM<;WS_7ZV=uGb*I&hnQ
zdPS5yTW4U#a6iJ*Wr}yTm<uem!7ELGw|4PWYoZa?bZQ>(!f#{OgJep_<0-vnyIx3<
zL9qR*fS&u44#*xnduAJYF5{<D9^QQhBuECw?Y440B1+HnADfO9g%NCyWfN1^L|4s>
zxOZzecD8kj@ceT#KCSb40NS#^agNrtZX%B=Q;2J$7C90?_Qs)Lrbqc+OKNpi-+-2O
z)k39TmZ3imezQjV&s0BEZ1Eo@4V;Q|g?6dMmHT5_Ggnao;NqVPlN3(+<6t}Gzy<Ns
zyWXGK<=hhQHV=}zx=m?$Ph-Oe#28<G<YM=8(91KYg;qDFwK-p^!?-t1j2j^bSj<P&
zOl_w$%d`{ZTRI^&f>bjz)Nh{PXD}D0?!#;OCuCc|G$WYM?T`RHAh4!~2o%F=0;d8Y
zGp$th5bmR8P?35~F6imP(m)vFI9dxI{eCBPEV%DDV{syzeworN4^`=E0vw`G;bg0m
zO7$YwcjQ=C48u8mA!*(n{^_|IMBg?yR7-+EK;!PBI<&()a~GWSO&}dDjAg!lx4r&5
ziSqM%642vrj#U)-iB;E)#AZ1k-&6Y);(BHie*acaI-3>Qx{FaFcf>$7eo?ll%CsJG
zCL#4x#^_)CNuY1M87Tdh8jtZI9pdj-tqY$2aDwqj{~#_z?<Y?0k9)wRYrW=H2mXwm
z2Ir}vT$&BBjE5^Ep{7k8<Oh$(Id-gHpXx{vqwrovV;VHrhI*Pp&J|I3JkIt<M<N+z
zx2@)ob*UM&q3iIO`}TN3(*t7lDN9s<7P7)U>Kh#mtZ01I8GQRIEx-1x1^nhT`=Yy4
z3fum}4O-F@sTY9=o?$L|4DpI>N47b!`CTczKv$I7rBg&hgRRU6k#up82E1B`McEVi
z9W42%Myb$$WFP&=v(VK$)K|y4)OrLJW_q4cT&03Kyw9UWf2a^b{`URXPhEho(#g+A
z`!{F{AaN0di0|*q<PTN~*!B|<8u1~tXGHsBe`b*XT58Xxs0J4CIiIIb9wH<zYNA>O
zd3#g#t;lIFWE|IaeDI`!t(7>Xs3r;H(gIZ_?s=`Q!hMlVp+!+iKl&GT?DfnIoOYdx
z$Y1dx{DT0KQI2;6ZzI!2h<W;<D%=OBXSB~_ed*d*YkL7;c>%5K+|#2QkQLckcgl*7
zD)87x#G4LO;i;h<!Qq(8BC*ll;na8PnC^P?eE}#496AF@*P`SWQmoqLU$HgS!!PRb
z(4|zE#}q%+Y_Wr4Iogaw(->U)L?X_eUW%=9tit&;e!*fvQ&KDfK|LfftuV#>c71!(
zcXfSo59d~{DehBkRnx-srV^tE{Qxf=xtKooQ7~P(jb+?*9!SFoI^QxQQwzV0xrCC$
z{@c#$MLKKH`}cz?Ujd3y`a*UvZH<8MjqCJGY!-;rnbhoSX75%bh@ihAnAhHc1<<4m
z1%tW#!SnDUkdlQVmH1a2C*tIvEXE%<V=gW8CQ~*-$x#u6%X{VkZt|22YvJUpA7-2m
zv<-0N#uOF?D?xopu7jcjOM!diSHHiYzw&?atwW2EaWz+w7$N9fLY+K7P?BPbAy~->
zgNj766TDKpppPU-`2y<a$eD23)WCz-4N&K5-H>rerUYlwXQ*or(-5Lq2%s!tLs15x
z47Q)F0H`h{z=)d%!PpTXr{E8WD|u}Z>l4m9o4Cmtd;?q_Q7qaZXUG&mx3ZzyRr*Ho
zDC%GI%?ojnO4=^bA|^YA4LO;L$+^x&X8-vK(zo?Dp6TKf2DIB<E3eZ$tmFIV8hMxJ
zvg(6;K#|<cA`P2RJfZ&rs{#KG=1qo_YQs*EA!lRa$6?NIId^^NpuKh-EGHbPzo%{=
z_f^kD-Ky3H^+7+k^%=#p5u+NBc2FU_t}gz%;$i(*Qyz^w2SMy<y5f*)E9BZv29TBv
zt<b@ATR|I5XYGZ1H}^X3Q!Ar(@v6mCB^IMUzNEb?2C3hxGXySbIEkH%OsIQ$RS!h!
zE$b2t`00bF;%S1_IFs>70%hH&y$Xv=0|jb9BU;)kQ4qW4punV}UI`O89?VPoxMyYV
zUbKt@b8v9(*poaZPQ&+eSnKa+;vBa=pYq50xj6Y7EuxggXu@c<P77b`P??D<B=`~R
zlsiNnjAu+`Ejoc1Hc@}^kJ;+FK8N#oAFxvX2JaY<^?_Z04>?SFtV|aD&Uk4Fyr7gn
z0T&IQm~Cow;I6>qq5;oP0nTveSa~NurIm1sl}AhNW8zt&)gk5sSP=_dwhJX=j>vh9
z)VCmgdZh$OGt{JaNfmYSN@3zKSEOcr$P<Ys1-@w6zYvc(VY-c;+BdqQc;#Dx?tPAl
z*=sVc`GHjn)Ul)|f>z%WTu>fUK|u$T#Yg8sSImsQR^Z38htf@`;BS&B>mO*ndph7a
zE<h#}fZnIwERHp$T8w+YjLGN0E~%CUVX>^>?>NRqLprW4R|C6rzhIANt8RCloOSTF
z3H1{J&2(cfZAdV}uD*{WZ&V#7o^gePx?BdOoxen`F=YNhsD}|aUzs8bgc3GE7hDsB
zx%C3v3_<3Y(1f{D3UD>~AFXa_Za|w-krcsPcH;61xmmR?H8bgWU;z~Z7Wh-z61bNn
zQ&Lh|HVzYz`m^_*B7w9=(d5f<5RG)1l|0=+Oo!jX@4QB?vt=I5=E$w&!|2ELPIB0;
z{pWEma_@L+hJ;jrh9sQ)K@!o*or!>{Gi}341T-NfByQ9mW(Bf@M8H{OK}~MLByBxn
zCRI4^8-f|knF8R<o;&D|=cD0JY^}VDT#Sr0$DMikwWj>1dU&HofZ90?xYsjO5hUsR
z0e7T+q?Y)^Nl?JFh>gDStL|_TRpxG_xC34CEwfRURqeuB`U5|UDn$cQr)?~t@X$%w
z@Q%JXw|iQ8j(=z49TCbc0J9(n6m0<Fc=_XM%yXK=Bq0m;n4Gb83k}A-hXJVC!btMc
zZ!hh;q7s|_;W1M>R<Y4WoPOP~u`nv0APf|}g1PO9AIy*iHASi*1`_ClCs?O3i}xI`
z@WM1Q^ia-R>~j3rg*6?<?<eK>rC0m>N7J#i4@pE{>0r=*zW+c;?2eD?Ca>=q3pJ;5
zFY3exGzhOc=ymf#lD-L945oIT+J$Hl?u`g-d1B4}^ww%Fo83;BgL2fxv9=>`%#2_m
zJW$X9WcRCa8xv*mN>i!yR-(rt?uFyr8t6Xx!(N1Y{74k@6vD=+7boq!8(V6%7k3oi
zhI2js#eSd_v)6vuvbF;san_i_IJtq<tg-7uARYEHzdz=~%7ZpyVUpc4vO_+4dXPX~
z?O88vQV#6=1;oc@T2o^T4cq-H@yVVGp$4dn9ubV02Y#T25^4Q?xP0A69FX1V0(_|S
zKwc(h|1y%;p~^}_-W6&5`F4u@P2jX072^jA#0}_eQlXt13SryATY;uaR>wM>lE`F&
zxd-ek+}1*q_p23SAB;-xOy&Ixvr&5r%Jse754}N&S7{{RWJAhR&EXTF#8r=Jc{Zxl
z%=KgzPS4mFx1`sIO^Ip8-UEhk-99&H_g%Qv1JP+1kUWiclM|TLv<#01A<6gQKvd<d
zcX;^39!{Nq2X33G`2((u;v)KkQ7yJ=T$Byy8!eS7cSwvb$G$5>?-C6N#p#I)NWxEm
zi`*VQ`A{;!;TZGt)t}bZ*oSB1vA4Ta;Yiz-#j*JjoUnNr?(6;c{1PVY#%8uY;S1;n
zlR4cXhqaJ5*rqM+o^IdAomd8qTI`|wmd~=yQeuS>iw6YdAth>Lj-Rzmrk-22kRVuL
z?fT2;%a+sICD^v<MF1qjNM!1gb2L^S32RD|l#<ebo3ff8Hnuj(*K_LFt^5<eS=y|{
z7rHD=5PowT)c^cFBnaFbiSc@~^-YQs)xIG}9`fWiS#!hp1k!iS_R>3timgQ0;KTL8
z^i%}E2YR3taA)sy)p`)BA<GEca_O>eIBG^`$*Gsk)>LzdllY9Qs*TB37}8CnOqFB?
zJud?()(=ybo;ecrttNVI0zF5j4iHMp@9Gfl_Q#(!Tk>UF!BSjQ8sMOkcGIkKV2}DN
z7J-#=&f<J!&?7a7;6WIAVg8wCEp5*aL(T!Ra^32KUD4O&X1!E`?m)4(jLJVJ?)wSP
z7M!uAGb#uguL-=^?scegzZ_5?)=EOMB1By^gd;pL0U7)O?J^+%->N(zjbZ0mtFzbb
zO6u50<#UXt>@6V2Zx}uv6iNGL7^-7tXKt4~rh$KSU4YPBI5u@+DH+kw$A+94RJiCU
z?Sa!z0TaZLb9;cjzm=ZlP={zR^+Do6C^6AIU>-8<idcol;SEQh8l^!?Rbe>|aG9_L
zo@B~<XX3#vvgvU<jobPB+)P1^iYMjHBJ;MW-Yin`Fj6ooX6Mg!3g-(N(Av6<9Y41p
zcl(73+?O%6IHuuLjvri0>_1k!G%rYpiAZ@2X-iBq`145W`XqOnfy!;uF$)aiF9P5!
za5>)|l<0UA&rl$I8)iN_#at8RCa4GWs0XybLIhO<_SQ3?+6YFhngWl!+(!X*YXNO}
z#&d$kEAo^n?Jg!>cy=09Foq_dff>vq-`OF-Pf1(kp-*&|sC*#mz@<ytZ~BYz6^<S)
z@{fw_!t6eaZmxk1l9?7(z)vKw=eUX=11lbiG8A{o$y2DB2feuKJLYk*O3Ux5k+Mws
zF5+u?yviVvzeS;1FD@kOdN{adc9%Pjwqb=z_K-g;lYi7xq*4fav+>H@XuhHYiSAG3
zwZsz3_|g3L>plg?58dV|u_jmF>ipWVfMD5T)XZsJ!bOz$s(wD-9y1=QcvLTjPY2<G
z)b@FN2y3wNF)l9rro!-024&-p1TYdbSfJV1+A7resZOY_?eLug5!_pg*E}uo(d*ZA
z#sqTYz-Aotb0|?{j@dMvW+8p4LPtRs+^&{^{n=ntx9L7YnO*Od3N!ma*An5%K|usp
z>pJW>mZfCKo%c>Uu2`ULSp{8Oq%3_o%`7QA!l)+a?0#c}yZ2EHC#mY_OX{waSu~yU
zZ~y2wz1OXMVVZ9&W_~|NK&xXrD5qx7iCGTYsPk#S&ho9XVZ(I3X@U}h4<`iP&6jlM
zFD;VN#TJ7FTMdzMFa$f_>Cn!36FioAPl*V;j}?EbNc8-a<etwq5YNA;DS6}9EqI!f
zyshjqtV|y9=O_UkmWU@rRxMx>GZGW)9PHETp0G3W)%;ah>f`nJaC>TpCsugtJl5s@
zo5ltBrBc%(3i90nQN3uuq)o1}2PR+y8p}xc8sl#F8R07S81?g{|FakuO)*-)ecw$c
z#olX%oIJv762%wl-j+79*X+MZ>U0Kg@-Cog<(kqnzGf7+hv7Zsu7|OerhY77&)Gvi
zw$_3Aux~|4T8+1%Wtoa?t*xV8^39|#o%KxLf1F<GehWY@U%1~w5*uj`nl#_kJ58d*
z=0J5i`6ZW;YZ4Xg#w=(ji4Nx`AK*Kz$p|+PK%ElrVr&s`tkvcdj3G}8C5aczWFKC5
zp(6C>FWAqOc#jqQ#FVDpf8HX$wXY7w7WxXZ$dV{3f&O?z1#P82bP}yRp+K6kN&07O
zI}(W-)GfuSzj&;Tzy5i?7?I3=(gEyg{RA8|^z>RyG_u~MH_P{KTfD+dR<Do$Yyd6N
zm&xD2j4@6H(iDh7)Fh~yTnSX;YXJGtct_hOLXjI3=O$2U9~!gMw6Gz#+2thUtqPx*
z4(&}a{j2`IZLnK)u(K|}cR$FoWOlashyqurV1RcYq?O4czJT=>IWAYCC}WOIee-J<
zkYH?#z4yu&mwXn3b@ULyVU2qKnGF$Ug9~j^&tV^X`!fG<YL*66Y%-U&Y6PDUvLO)#
zX85V<E+i*@F#Qy}5;aB$5;tj+S)*Z8HWh)F-rsA4dq~YlhTPrcFSb7$7wg-*$X@_b
zDbCO|Tj)Q7&}A<YJg%AhOdUx3e{NHPT9yfOixqJDg`9arWz-O+qG%Y`^m^yayqk4R
zp1Jv&uj#~g_F2;K^y>DEF(Z5j!YEtGt4|;#8W)W|z%)!@<r9qq!g-z3==G40U`Wv-
zq%0DCyp-vH)O$7o`|j<m9t}>HIgq#ci|t@@jaO$Atu7-O8|&@5^OKJw*C0$z8)EWv
zm=VI<wtd_L)5ZK^&O=2g4YVcyn`#O&TGg<JA=R0%oP$vQOMhd}0U4rEgock(33#%<
zw=YXVjKVtj(o4-@#+RIV`_b!xOLWi;_-NN4PW+<T&FK9GMO|4RAjaUJpMaY5%Q$Dz
zF_EN0kW<Fj+@Dg_kCMJ)7NrBe<eI_VF7hK>PoBg9y}j6RYIVjPP(q+|bsf3obAj{-
z`HsWWtpxpZm7p&jK-Zb=zD9xncVgdgQ7IrB!6r^)0vja)JuyWP<VR&{d2EI^;aoo7
zrC_{~nuGSL*oJlk>MQ)pV&}lmqS4R(jG1B~#>w9T+ErFVpD!V<z6K{dib+32$%RuM
zS(M)XtI?G#_Vy_BBY2l$T%=Dw;HoaR7gCA9hD?eFq$0YN6hb<`q@fBj{@qd8YTP-3
zzXuIemI&5DZpn8MQ1+DTN7K}UF6+8xYv>d{Zr1L7TL`&MiH&?G1+$2uWPQEYMzXx3
z1VV+h;3%<P=G$v)1fU-lcO9yIf>vWJ6oJzZTorVA`nS74ffhRxGWJeqL3B~}t`vZ#
zEiZ7<y$ND`nNP12)qfCHY|oe#2-{EoPyXcwfU}fgO8s+`-29xXGEMn#mALP6FE>*J
z-p`d#E0bFIt&3edqmzz&j4$d%K;CP@LM|<h_;+C2+`Mt(pDddeWMA3AW}xkU)Ib4*
z*bGZSB|2=Gc|x5fvWK8wC?ras%p_#+m7>wbt_k^(MBQx`U5cntNtha|PUz<wFf!YF
zaOi)>&>l$TGhTyPx|uP5t`qdW*b@%5(lC*pkx@r<Pp^|7PRsArOC`1lyUt(b>1@gX
zg>43nt7!Q(kMB~xWxoeTj+}6!sRO-*hDBub$2-(Xt*g~9(QC72pznxD4yqy$>++nP
zY83C0$afTODk1127;u%(`5IMagwl-V{~*f?{CC?VS>|Y4XAhfxKSi;7!FGwM1IHFo
zy&K*iBpC4OPPV)y{qYlZtE`uX^o(PQtbI<6?~k3X_M5(+1}c1fy}<aL_4;Z&CWKpP
zI4ypJ%M~vQgA7R9pQQ<uIFro{TrVP>TZ47w%h|rP96pf3QZ2&$rN)ZtvTJA^{NHgR
z3|&N+7hMsMT#x_wgnE}-58lPtt<m>WxAb4Wc!3WH4%VK=wrRU2oziLeVXYffd<GV!
zQD2z1@dw=2y#!D9ljT1tZ&-_FoVkq-P=s&&Mk&mhOb>lcPrXvx1nIlSlk*;Q&trY0
zO=vdS)W9SRpn@gt1Z<_PWT+1Y;FQN>mz971uY{T61Cd&fKXh2>Vt4`=__;DeIF|Gw
zSR3C9_j`cKi`#(uwmNXc;VWPw%m7k!2xTu`u+Q>zxA-TB_obwrE24=t_GryxQ&0ER
z2aRnTGX`=$=?<E$q>t5SYJrMto7M)hUuQrXN8d*Xs24b?@mCw-&TzWR?q10H5xW+$
zwXE-dcj*BYIyj_~40EIoKCr+uKopSLhW#uI^JWL@@$yiYpI&9Lbku?_YuhI;;1^nd
z=?3uzQ|AkJnj3hU;%c@ipzAlB^F(3<`v9(SGs+T#1Fo)J9~-euS%-jn^{EG-KQ+<&
zYLR94V1H~0zr|QTik=?5l_Gw(fa(Swi~gO&7<ov91=2v9|I|-}<o5nyn>j$tD!a%I
z)ebr-Iod}cgZckhGHT;~-Q8i06;=aj2bMu!rvstfE>AEnX6?g@hX!=rvQuDZ!PDfw
z@uo&VverZ=9FP_7ctHV+_j^R0|IW%oIQb9B6ful(51BJ5N6>imS7{LqbDQJq=RiU7
zX7w)6eeui1T{2+If-5co@^7XSC8JwP?h`nkEOT|{7f;r?BAa}yb1U^il(RS0*$m9j
z15i)a`!IqSY<e2}g)b*j4Szl}uPqyrfcFQMq~POO!o?k+^`pxFe&z-E#K3+Es9E(I
zq<oU6PXE%CU-qX?x)aPLU5aE~8N?c6Q9b9xXfgeO)fu>GoFBm>_Ifn0^cQeF)4>!W
zL2aeK16M#bqE@x>h8|Qa>Y{p>->9;LhkjOA{Fu)=-3l6#VUW&e<UOtUXA-&R*TDGu
zf3DP{)<latKbN2XNGP}GCcR6$$dCME#9g_--BO?VyQ-7;Ac%i6n=RBA0?v2*tom7Z
z9MUD9>HY4wyjm*m?|aGs-_tGk?3DN;c#LhG8WuSXjw@;;Be;Mp`tLs((*NBg{O2ps
z#{WC+|9)K*JX`%|(6C7G5)$w~PxkNS1nvKiE@nd@o}cUx4C-D8_;<kOuyy%<a{T`R
D=3DJh

literal 0
HcmV?d00001

diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Resources/Textures/coin.png b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Resources/Textures/coin.png
new file mode 100644
index 0000000000000000000000000000000000000000..3cd89c6ce6cc5729af435691e9784161b1d3a474
GIT binary patch
literal 3141
zcmV-L47&4)P)<h;3K|Lk000e1NJLTq001Ze001cn1^@s6N1|)U000aONkl<Zcmchb
z33yFs8plsWBZ;k1BsA7mhmaCmEDa&{5XntsPc0F(mY`K0rlxA2MoTp)ttyJ55>-_?
zs49|L6J*guBHSzczTSKP^FQDH#>9PO%5<jZd4A`f^DXE6zxVy#_xsLO{>XuX!vjzl
z`!)&=9!K8Z4CL>xLf$@*0^}WtN6x34k+nDgIolnH^55{x9gMkO+9P}GOz1xN5jop(
zDG(G23IuX@NxtO$9zeH>tgqqqO_qIv+?{Sjc^00!VR8DVCi;ib%Z$3HEaZL$WJkl8
zJ`2XX3-~)7xI2x61L;$MjOj3>Oh(Pk3Bdj3Y`cY`zaTqd$lmdNjdqJ0QJ#jUYLs|x
ziAQnP<^<$?NQ<oDOW&o4H&An99Lj$l3Vp&@;Eo3P%~xPd)rj({E2DulicAj!G9y)M
zf^Ju-dYH5}Dt6BswnX_)$cws(*)wB43b#}sdp#``!54;6!~~O&6kk;SItKb%J}mb)
zmGigy>R6PYA5PJJkZp;EbwLz5k3#<r6h=dvyzb}OQwF_El)4b7x=4*%wgwg3#K>!I
z1<_KTe35*q#E|TZn#A!YF%)M=@<G{8L!iIm$$JgUeWZ2$B)m?49mrY+<ZT2>HvabR
z{GrZ7c@j!p7032QEJf8`idzl+?O;^Kjil?OI5YGVsK0HpVoicKsuRK}V4>tK5-Hp)
zMG8xbx@-z8_ze1j?I}aux^^InIpSna^qO&gC|zYh_A0t{1}ZNOhyJGbBR863OxD0~
zTf>*m0UoXdazBPKYb6YsD`3c20sWo1Y@@dI5vWr`pE8qm@4<L~1Kqt9d3V;H>E-NT
zO_bUw<^>}LI&{FjN!qHb<56<j9mOXHql)vaE^z_|LiKe9%mpu$U*a6Rq2avr=Ag!@
z0Yr-iGTK#ZE)f_r-sZFjWsrGtVB<|0py;po=}^!rqSQt)FG&1u%pRl#Qj{l3|1p%4
zeFR7E`#S>tMVs<pMzGId{tg#&6Y2h}3ji`_m|T5tp^Cho#ri<j`%&Ozmc0WMEU%ar
z(!CE+h(KPLm^HD78w!_HBWoTzhmr~MC3Ofhvm%Ac_U3~T!C{8)<MnqVfb2!M^K<x-
zW=*Xvh@zsN9&!2G!2QTsAQG;O);|duI2p8R?t&`K=$HBtMMXUc`uDW&f(J7Skugm)
z{&NLN(kB5qvvG9C$d8DkqMig%%UtImXF3~A{By))1_Jkk&8*1#tOyj`2utqRrg3wk
zDC&ua<*D7nV(>6r%)S4+_3j3s@T42EK6irQu>cG(8Av<1X0WTh2T>ID^rF2@E8Qip
zWMl@5sH^Lt9JPSgwcO$_%Y#h686>S%pGQkzt^2GXq^@_w^+;<N)69d4ZFIp{G2eL}
zQ55y$;`F?$A=NM6)R35q<4dc#F(^1WNWg3HGKv!xC_d|f{O?~w@#!HbW2#{y7X4}x
zyjZU>rJ*~1?B`{w<MVDUeI6-mTLbrk9(Qwk2n9~W{*C>%(z8}Xsn^HZ&Xa3t4emU7
zuH=6=5Lf3kz?IonxJs_gwLuZZsH0C=-3nJ`HNdrbWNri8SlAGi+$>bYk3#%3OBDS$
z2+)S2^xROyg<GQJEc?+2*B990-e*qc0wIDldm3W54me6}O^IUV+TAVysp>MMx^IfK
zqB@!Y?&*ARb*?p%Ryv@Xt3yqaj}Vc%t~IKzjl-o$3Lbpv41;u&AxR_Loqv1)1t}<x
z8zlth#kwLs!UC07Jk@oZ1GYl;q27=JWsroJ1l|wAv26p+P+Lo)H0<ka7ltHnHVS5k
zIbyfL4x)20M|?3%LD4B%;z0;Ihv3$`cDTK~8JDj>{I;Pj;-^|5d1Wh3e0MP@WCcU}
zRS#O#noF9u=y!kjtGE_vLzkPjXqRU`N2_|M9+Cq6MgA4rxpZF~-O~RYwK)={sY{op
zq56dJdb-&p?(S4muux#mH+>LKOQ<7<HiUD?PrUeUbSIPG%up1b@j=SE&J<c78PPAZ
zJQR1gbVB0dCc>H&%z8&8zSBe<fDl=D%AJ<f$N-V=&5Yn&Rqr)85Y^`twY4Wovsc<T
z@-4hHrUc18GWw>FNn&&bCkEou>k4vWTv5qMet%atT;zQrgGJ8(D3A9-#gzb*T+kqK
zX$!jFmIDh$(t9nCu&6Og<HsO<QwO@+0;voNiWhTQcfiFI@iM{<DV$E%$D{JnC>Y~M
zV&lTjhp4RsQJUM@SPr{>XmA#8jR#WIMLt-pjf^OE^raiy;qvtQYJdpWWbN!KtfJfB
zljT+n5=&g3QBSR>#rp~oSzkEe*9c2opWjf-(X@{`Aah3-Ko^Gek6%K{npU*~M9ke9
z8laK`0tHU;Y`y7U7JPy9+q=dk4vAw;`#O$DSTKF^qs5=|hI3|^*j91mYPp!~<s5M-
zxA&z?FH9@!_wPJd5jR?-B)VA$kV)BeouXcwZ8nHLfg<BZ8(ca!d55~%5~T_0G1<#;
z7p{(0M<F`|nyi=>`Y6d#m`t{{l5~bBCuRveP1eaWIndf-%y&a#%VxahiOahO=o;D9
z523CXiDFASx3RZgtUc~tp}#yvxS1Vfz=S_Bc{8BI17+@fHpHNVA6rr>p2isu)kyEp
z=yaNzMvxXnd5*Lrf!h{4-N3ISRV&I72FQq(X-C33;m(Q+BRM5}WLv+dz?Z1Y;w<sm
zst#N}PkirG$Bkli57Bq)*eHs6`V+BHuprIJaF<saZ!0?KZm8sr*qEe|Rt%M{4km#l
zfT_kGRa`BqRhX<f5V?l`4s62=Aqgjw<umy_HH}>yhR>HeB~i;X(v>tI;;<z>$(vDg
zI^D!C9wM5g=_xXd6FdmeMFGV}Va!~@6=s~63gTl*_W@88BmM%Zn{R;p1LB_sKGQT{
z?K&8>>Q|#5s?K{r7yDYxD{XAIQ->F6P3jSG)R%7db9ljOOX9A+rPXKLg@rh|h09C0
zk`#RFj<WL;P;k^ud}=Z<IFQlEj~xts(lp@Sn{?l7GRGXQI<ru5NkdDGr8u$eXOw&K
zqih(;xUL({x+5~6O*}P35?A3~v!jWui1g@b_e0UKfyRn6Lxt)2FM$wQ5ZfQx?OiB#
z@S~_SGDz}{^hMFJe!N%bnEY6;4a*E%N~>>%!}wq=@NgrL^8r&$2uk>oWu&+R%bm3K
zER+vbBS~Y`H`6By+7NHDdg>U5E2Xjh=#}0mKIJY1aXI7zhls%7y-Xhg!qVA$d!p*H
zr?_Xi#B3X-T~2Wufb0#Zx*17N3_$gF{c&znk3xGptG#^hY|=|w&%#`w1!+i}NjTX&
zXKc&FqOW_Q{DhloNtxRM&A-}&*rM;<kbk6~*!R`_6{rTDH$Q2IBYSr@R37Pr^B=uh
z)Xu&^4Bxj*rWOZcNuGGrBh6%p&n2IRj&6M|`}FV{T;ytT#>14W(##Ssuhlu3v#*!<
zHhwH&6ZttRHmemEN1@<gZ<HVIg#*j}^3cJ~O5OLZlCFJ;Sesk#Nv?Jv?qs1V(xp?Q
zpH95rxuBdoo6@8Gg`2CdjTJ8xFPGc?GVZK%5B3oWT!@s@z;Mf32rK5UyMk8B`n<b-
zp>L}c%X$_E`TVscm^eufQrzz!Rx-?oka^@2tNIo(5u;k(ivO@{S?NJqDyA<=xGSMp
zVKqjlSg&)w>V?ANZX&wNxOSKPFbHKw`=R2S-q7xLF>HUcy{=n38+EU@TUsuNbR&(W
z2cPP&kRn@=fiiKfC%c>4TArBjTC;>b3p?f}M>|&+?Q?-Dxa=_9M(dRGxAg0tqD=kO
z?dpzmYde>$2z@c5TYH;d_>9A3D_J4~va`9kXA$|F-0gHH8nTFNB6~=zV{@ysgS$1p
zGJC9j%9=@z_cqUHr;VQ3P8T(`?fqo|t<wG7nk9B^YjeTIs@@5<KS*{+t3}8u)Ly#v
znZ=n0P9xGzS~G~eB`vy5y6S6bnIj}d{vIUz$WHPx`5T!|#z>d8kY4&jhq*PMCml#%
z;z=gT%)gYpPu5CSOF@gID1SMhyUGBxHMiRTQfPf?(Uzp6%$u%c5E)85q?iGur<`Ms
f#Ew`$tFV6pp{%!<38}eB00000NkvXXu0mjf%8Lds

literal 0
HcmV?d00001

diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/UI/DrawablePippidonRuleset.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/UI/DrawablePippidonRuleset.cs
new file mode 100644
index 0000000000..9a73dd7790
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/UI/DrawablePippidonRuleset.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.Framework.Allocation;
+using osu.Framework.Input;
+using osu.Game.Beatmaps;
+using osu.Game.Input.Handlers;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Pippidon.Objects;
+using osu.Game.Rulesets.Pippidon.Objects.Drawables;
+using osu.Game.Rulesets.Pippidon.Replays;
+using osu.Game.Rulesets.UI;
+using osu.Game.Rulesets.UI.Scrolling;
+
+namespace osu.Game.Rulesets.Pippidon.UI
+{
+    [Cached]
+    public class DrawablePippidonRuleset : DrawableScrollingRuleset<PippidonHitObject>
+    {
+        public DrawablePippidonRuleset(PippidonRuleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
+            : base(ruleset, beatmap, mods)
+        {
+            Direction.Value = ScrollingDirection.Left;
+            TimeRange.Value = 6000;
+        }
+
+        protected override Playfield CreatePlayfield() => new PippidonPlayfield();
+
+        protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new PippidonFramedReplayInputHandler(replay);
+
+        public override DrawableHitObject<PippidonHitObject> CreateDrawableRepresentation(PippidonHitObject h) => new DrawablePippidonHitObject(h);
+
+        protected override PassThroughInputManager CreateInputManager() => new PippidonInputManager(Ruleset?.RulesetInfo);
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/UI/PippidonCharacter.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/UI/PippidonCharacter.cs
new file mode 100644
index 0000000000..dd0a20f1b4
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/UI/PippidonCharacter.cs
@@ -0,0 +1,87 @@
+// Copyright (c) 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.Audio.Track;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.Input.Bindings;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics.Containers;
+using osuTK;
+
+namespace osu.Game.Rulesets.Pippidon.UI
+{
+    public class PippidonCharacter : BeatSyncedContainer, IKeyBindingHandler<PippidonAction>
+    {
+        public readonly BindableInt LanePosition = new BindableInt
+        {
+            Value = 0,
+            MinValue = 0,
+            MaxValue = PippidonPlayfield.LANE_COUNT - 1,
+        };
+
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures)
+        {
+            Size = new Vector2(PippidonPlayfield.LANE_HEIGHT);
+
+            Child = new Sprite
+            {
+                FillMode = FillMode.Fit,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Scale = new Vector2(1.2f),
+                RelativeSizeAxes = Axes.Both,
+                Texture = textures.Get("character")
+            };
+
+            LanePosition.BindValueChanged(e => { this.MoveToY(e.NewValue * PippidonPlayfield.LANE_HEIGHT); });
+        }
+
+        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
+        {
+            if (effectPoint.KiaiMode)
+            {
+                bool direction = beatIndex % 2 == 1;
+                double duration = timingPoint.BeatLength / 2;
+
+                Child.RotateTo(direction ? 10 : -10, duration * 2, Easing.InOutSine);
+
+                Child.Animate(i => i.MoveToY(-10, duration, Easing.Out))
+                     .Then(i => i.MoveToY(0, duration, Easing.In));
+            }
+            else
+            {
+                Child.ClearTransforms();
+                Child.RotateTo(0, 500, Easing.Out);
+                Child.MoveTo(Vector2.Zero, 500, Easing.Out);
+            }
+        }
+
+        public bool OnPressed(PippidonAction action)
+        {
+            switch (action)
+            {
+                case PippidonAction.MoveUp:
+                    changeLane(-1);
+                    return true;
+
+                case PippidonAction.MoveDown:
+                    changeLane(1);
+                    return true;
+
+                default:
+                    return false;
+            }
+        }
+
+        public void OnReleased(PippidonAction action)
+        {
+        }
+
+        private void changeLane(int change) => LanePosition.Value = (LanePosition.Value + change + PippidonPlayfield.LANE_COUNT) % PippidonPlayfield.LANE_COUNT;
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfield.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfield.cs
new file mode 100644
index 0000000000..0e50030162
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfield.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 osu.Framework.Allocation;
+using osu.Framework.Audio.Track;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Rulesets.UI.Scrolling;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Pippidon.UI
+{
+    [Cached]
+    public class PippidonPlayfield : ScrollingPlayfield
+    {
+        public const float LANE_HEIGHT = 70;
+
+        public const int LANE_COUNT = 6;
+
+        public BindableInt CurrentLane => pippidon.LanePosition;
+
+        private PippidonCharacter pippidon;
+
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures)
+        {
+            AddRangeInternal(new Drawable[]
+            {
+                new LaneContainer
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Child = new Container
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Padding = new MarginPadding
+                        {
+                            Left = 200,
+                            Top = LANE_HEIGHT / 2,
+                            Bottom = LANE_HEIGHT / 2
+                        },
+                        Children = new Drawable[]
+                        {
+                            HitObjectContainer,
+                            pippidon = new PippidonCharacter
+                            {
+                                Origin = Anchor.Centre,
+                            },
+                        }
+                    },
+                },
+            });
+        }
+
+        private class LaneContainer : BeatSyncedContainer
+        {
+            private OsuColour colours;
+            private FillFlowContainer fill;
+
+            private readonly Container content = new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+            };
+
+            protected override Container<Drawable> Content => content;
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                this.colours = colours;
+
+                InternalChildren = new Drawable[]
+                {
+                    fill = new FillFlowContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Colour = colours.BlueLight,
+                        Direction = FillDirection.Vertical,
+                    },
+                    content,
+                };
+
+                for (int i = 0; i < LANE_COUNT; i++)
+                {
+                    fill.Add(new Lane
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Height = LANE_HEIGHT,
+                    });
+                }
+            }
+
+            private class Lane : CompositeDrawable
+            {
+                public Lane()
+                {
+                    InternalChildren = new Drawable[]
+                    {
+                        new Box
+                        {
+                            Colour = Color4.White,
+                            RelativeSizeAxes = Axes.Both,
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                            Height = 0.95f,
+                        },
+                    };
+                }
+            }
+
+            protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, ChannelAmplitudes amplitudes)
+            {
+                if (effectPoint.KiaiMode)
+                    fill.FlashColour(colours.PinkLight, 800, Easing.In);
+            }
+        }
+    }
+}
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj
new file mode 100644
index 0000000000..e4a3d39d6d
--- /dev/null
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup Label="Project">
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <AssemblyTitle>osu.Game.Rulesets.Sample</AssemblyTitle>
+    <OutputType>Library</OutputType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <RootNamespace>osu.Game.Rulesets.Pippidon</RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\**" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="ppy.osu.Game" Version="2021.331.0" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Templates/osu.Game.Templates.csproj b/Templates/osu.Game.Templates.csproj
new file mode 100644
index 0000000000..3894bf2166
--- /dev/null
+++ b/Templates/osu.Game.Templates.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <PackageType>Template</PackageType>
+    <PackageId>ppy.osu.Game.Templates</PackageId>
+    <Title>osu! templates</Title>
+    <Authors>ppy Pty Ltd</Authors>
+    <PackageLicenseUrl>https://github.com/ppy/osu-templates/blob/master/LICENCE.md</PackageLicenseUrl>
+    <PackageProjectUrl>https://github.com/ppy/osu-templates</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/ppy/osu-templates</RepositoryUrl>
+    <PackageReleaseNotes>Automated release.</PackageReleaseNotes>
+    <copyright>Copyright (c) 2021 ppy Pty Ltd</copyright>
+    <Description>Templates to use when creating a ruleset for consumption in osu!.</Description>
+    <PackageTags>dotnet-new;templates;osu</PackageTags>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <IncludeContentInPack>true</IncludeContentInPack>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <ContentTargetFolders>content</ContentTargetFolders>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Content Include="Templates\**\*" Exclude="Templates\**\bin\**;templates\**\obj\**" />
+    <Compile Remove="**\*" />
+  </ItemGroup>
+</Project>

From 3c3980b6bf7b32a750783143f282af22d2431725 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 5 Apr 2021 11:41:48 +0900
Subject: [PATCH 2173/3722] Update links

---
 Templates/osu.Game.Templates.csproj | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Templates/osu.Game.Templates.csproj b/Templates/osu.Game.Templates.csproj
index 3894bf2166..38789e3246 100644
--- a/Templates/osu.Game.Templates.csproj
+++ b/Templates/osu.Game.Templates.csproj
@@ -4,9 +4,9 @@
     <PackageId>ppy.osu.Game.Templates</PackageId>
     <Title>osu! templates</Title>
     <Authors>ppy Pty Ltd</Authors>
-    <PackageLicenseUrl>https://github.com/ppy/osu-templates/blob/master/LICENCE.md</PackageLicenseUrl>
-    <PackageProjectUrl>https://github.com/ppy/osu-templates</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/ppy/osu-templates</RepositoryUrl>
+    <PackageLicenseUrl>https://github.com/ppy/osu/blob/master/LICENCE.md</PackageLicenseUrl>
+    <PackageProjectUrl>https://github.com/ppy/osu/blob/master/Templates</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/ppy/osu</RepositoryUrl>
     <PackageReleaseNotes>Automated release.</PackageReleaseNotes>
     <copyright>Copyright (c) 2021 ppy Pty Ltd</copyright>
     <Description>Templates to use when creating a ruleset for consumption in osu!.</Description>

From d1504e1b3e2d4d6aaf1f9b8fc5ee4e1840ef1d41 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 5 Apr 2021 11:47:37 +0900
Subject: [PATCH 2174/3722] Remove license file, fix link

---
 Templates/LICENSE                   | 21 ---------------------
 Templates/osu.Game.Templates.csproj |  2 +-
 2 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 Templates/LICENSE

diff --git a/Templates/LICENSE b/Templates/LICENSE
deleted file mode 100644
index 3abffc40a7..0000000000
--- a/Templates/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2021 ppy Pty Ltd <contact@ppy.sh>.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/Templates/osu.Game.Templates.csproj b/Templates/osu.Game.Templates.csproj
index 38789e3246..ebde5f70a5 100644
--- a/Templates/osu.Game.Templates.csproj
+++ b/Templates/osu.Game.Templates.csproj
@@ -4,7 +4,7 @@
     <PackageId>ppy.osu.Game.Templates</PackageId>
     <Title>osu! templates</Title>
     <Authors>ppy Pty Ltd</Authors>
-    <PackageLicenseUrl>https://github.com/ppy/osu/blob/master/LICENCE.md</PackageLicenseUrl>
+    <PackageLicenseUrl>https://github.com/ppy/osu/blob/master/LICENCE</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/ppy/osu/blob/master/Templates</PackageProjectUrl>
     <RepositoryUrl>https://github.com/ppy/osu</RepositoryUrl>
     <PackageReleaseNotes>Automated release.</PackageReleaseNotes>

From 4d9b886c07d1c6b641dc3927ffe5571892ba1921 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 5 Apr 2021 12:04:02 +0900
Subject: [PATCH 2175/3722] Add ruleset examples to solution

---
 .../osu.Game.Rulesets.EmptyFreeform.csproj    |   2 +-
 .../osu.Game.Rulesets.Pippidon.csproj         |   2 +-
 .../osu.Game.Rulesets.EmptyScrolling.csproj   |   2 +-
 .../osu.Game.Rulesets.Pippidon.csproj         |   2 +-
 osu.sln                                       | 154 ++++++++++++++++++
 5 files changed, 158 insertions(+), 4 deletions(-)

diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/osu.Game.Rulesets.EmptyFreeform.csproj b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/osu.Game.Rulesets.EmptyFreeform.csproj
index 26349ed34f..cfe2bd1cb2 100644
--- a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/osu.Game.Rulesets.EmptyFreeform.csproj
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/osu.Game.Rulesets.EmptyFreeform.csproj
@@ -10,6 +10,6 @@
     <EmbeddedResource Include="Resources\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2021.331.0" />
+    <ProjectReference Include="..\..\..\..\osu.Game\osu.Game.csproj" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj
index e4a3d39d6d..61b859f45b 100644
--- a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj
@@ -10,6 +10,6 @@
     <EmbeddedResource Include="Resources\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2021.331.0" />
+    <ProjectReference Include="..\..\..\..\osu.Game\osu.Game.csproj" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/osu.Game.Rulesets.EmptyScrolling.csproj b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/osu.Game.Rulesets.EmptyScrolling.csproj
index ce0ada6b6e..9dce3c9a0a 100644
--- a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/osu.Game.Rulesets.EmptyScrolling.csproj
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/osu.Game.Rulesets.EmptyScrolling.csproj
@@ -10,6 +10,6 @@
     <EmbeddedResource Include="Resources\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2021.331.0" />
+    <ProjectReference Include="..\..\..\..\osu.Game\osu.Game.csproj" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj
index e4a3d39d6d..61b859f45b 100644
--- a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/osu.Game.Rulesets.Pippidon.csproj
@@ -10,6 +10,6 @@
     <EmbeddedResource Include="Resources\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2021.331.0" />
+    <ProjectReference Include="..\..\..\..\osu.Game\osu.Game.csproj" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/osu.sln b/osu.sln
index c9453359b1..5a251cb727 100644
--- a/osu.sln
+++ b/osu.sln
@@ -66,6 +66,36 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Game.Benchmarks", "osu.Game.Benchmarks\osu.Game.Benchmarks.csproj", "{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Templates", "Templates", "{70CFC05F-CF79-4A7F-81EC-B32F1E564480}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Rulesets", "Rulesets", "{CA1DD4A8-FA22-48E0-860F-D57A7ED7D426}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ruleset-empty", "ruleset-empty", "{6E22BB20-901E-49B3-90A1-B0E6377FE568}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ruleset-example", "ruleset-example", "{7DBBBA73-6D84-4EBA-8711-EBC2939B04B5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ruleset-scrolling-empty", "ruleset-scrolling-empty", "{5CB72FDE-BA77-47D1-A556-FEB15AAD4523}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ruleset-scrolling-example", "ruleset-scrolling-example", "{0E0EDD4C-1E45-4E03-BC08-0102C98D34B3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.EmptyFreeform", "Templates\Rulesets\ruleset-empty\osu.Game.Rulesets.EmptyFreeform\osu.Game.Rulesets.EmptyFreeform.csproj", "{9014CA66-5217-49F6-8C1E-3430FD08EF61}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.EmptyFreeform.Tests", "Templates\Rulesets\ruleset-empty\osu.Game.Rulesets.EmptyFreeform.Tests\osu.Game.Rulesets.EmptyFreeform.Tests.csproj", "{561DFD5E-5896-40D1-9708-4D692F5BAE66}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.Pippidon", "Templates\Rulesets\ruleset-example\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj", "{B325271C-85E7-4DB3-8BBB-B70F242954F8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.Pippidon.Tests", "Templates\Rulesets\ruleset-example\osu.Game.Rulesets.Pippidon.Tests\osu.Game.Rulesets.Pippidon.Tests.csproj", "{4C834F7F-07CA-46C7-8C7B-F10A1B3BC738}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.EmptyScrolling", "Templates\Rulesets\ruleset-scrolling-empty\osu.Game.Rulesets.EmptyScrolling\osu.Game.Rulesets.EmptyScrolling.csproj", "{AD923016-F318-49B7-B08B-89DED6DC2422}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.EmptyScrolling.Tests", "Templates\Rulesets\ruleset-scrolling-empty\osu.Game.Rulesets.EmptyScrolling.Tests\osu.Game.Rulesets.EmptyScrolling.Tests.csproj", "{B9B92246-02EB-4118-9C6F-85A0D726AA70}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.Pippidon", "Templates\Rulesets\ruleset-scrolling-example\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj", "{B9022390-8184-4548-9DB1-50EB8878D20A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.Pippidon.Tests", "Templates\Rulesets\ruleset-scrolling-example\osu.Game.Rulesets.Pippidon.Tests\osu.Game.Rulesets.Pippidon.Tests.csproj", "{1743BF7C-E6AE-4A06-BAD9-166D62894303}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Templates", "Templates\osu.Game.Templates.csproj", "{7526A36E-09B9-4342-88CF-25969CF4158C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -412,6 +442,114 @@ Global
 		{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}.Release|iPhone.Build.0 = Release|Any CPU
 		{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{9014CA66-5217-49F6-8C1E-3430FD08EF61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9014CA66-5217-49F6-8C1E-3430FD08EF61}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9014CA66-5217-49F6-8C1E-3430FD08EF61}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{9014CA66-5217-49F6-8C1E-3430FD08EF61}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{9014CA66-5217-49F6-8C1E-3430FD08EF61}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{9014CA66-5217-49F6-8C1E-3430FD08EF61}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{9014CA66-5217-49F6-8C1E-3430FD08EF61}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9014CA66-5217-49F6-8C1E-3430FD08EF61}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9014CA66-5217-49F6-8C1E-3430FD08EF61}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{9014CA66-5217-49F6-8C1E-3430FD08EF61}.Release|iPhone.Build.0 = Release|Any CPU
+		{9014CA66-5217-49F6-8C1E-3430FD08EF61}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{9014CA66-5217-49F6-8C1E-3430FD08EF61}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{561DFD5E-5896-40D1-9708-4D692F5BAE66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{561DFD5E-5896-40D1-9708-4D692F5BAE66}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{561DFD5E-5896-40D1-9708-4D692F5BAE66}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{561DFD5E-5896-40D1-9708-4D692F5BAE66}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{561DFD5E-5896-40D1-9708-4D692F5BAE66}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{561DFD5E-5896-40D1-9708-4D692F5BAE66}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{561DFD5E-5896-40D1-9708-4D692F5BAE66}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{561DFD5E-5896-40D1-9708-4D692F5BAE66}.Release|Any CPU.Build.0 = Release|Any CPU
+		{561DFD5E-5896-40D1-9708-4D692F5BAE66}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{561DFD5E-5896-40D1-9708-4D692F5BAE66}.Release|iPhone.Build.0 = Release|Any CPU
+		{561DFD5E-5896-40D1-9708-4D692F5BAE66}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{561DFD5E-5896-40D1-9708-4D692F5BAE66}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{B325271C-85E7-4DB3-8BBB-B70F242954F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B325271C-85E7-4DB3-8BBB-B70F242954F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B325271C-85E7-4DB3-8BBB-B70F242954F8}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{B325271C-85E7-4DB3-8BBB-B70F242954F8}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{B325271C-85E7-4DB3-8BBB-B70F242954F8}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{B325271C-85E7-4DB3-8BBB-B70F242954F8}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{B325271C-85E7-4DB3-8BBB-B70F242954F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B325271C-85E7-4DB3-8BBB-B70F242954F8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B325271C-85E7-4DB3-8BBB-B70F242954F8}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{B325271C-85E7-4DB3-8BBB-B70F242954F8}.Release|iPhone.Build.0 = Release|Any CPU
+		{B325271C-85E7-4DB3-8BBB-B70F242954F8}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{B325271C-85E7-4DB3-8BBB-B70F242954F8}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{4C834F7F-07CA-46C7-8C7B-F10A1B3BC738}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C834F7F-07CA-46C7-8C7B-F10A1B3BC738}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C834F7F-07CA-46C7-8C7B-F10A1B3BC738}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{4C834F7F-07CA-46C7-8C7B-F10A1B3BC738}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{4C834F7F-07CA-46C7-8C7B-F10A1B3BC738}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{4C834F7F-07CA-46C7-8C7B-F10A1B3BC738}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{4C834F7F-07CA-46C7-8C7B-F10A1B3BC738}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C834F7F-07CA-46C7-8C7B-F10A1B3BC738}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C834F7F-07CA-46C7-8C7B-F10A1B3BC738}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{4C834F7F-07CA-46C7-8C7B-F10A1B3BC738}.Release|iPhone.Build.0 = Release|Any CPU
+		{4C834F7F-07CA-46C7-8C7B-F10A1B3BC738}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{4C834F7F-07CA-46C7-8C7B-F10A1B3BC738}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{AD923016-F318-49B7-B08B-89DED6DC2422}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AD923016-F318-49B7-B08B-89DED6DC2422}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AD923016-F318-49B7-B08B-89DED6DC2422}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{AD923016-F318-49B7-B08B-89DED6DC2422}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{AD923016-F318-49B7-B08B-89DED6DC2422}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{AD923016-F318-49B7-B08B-89DED6DC2422}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{AD923016-F318-49B7-B08B-89DED6DC2422}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AD923016-F318-49B7-B08B-89DED6DC2422}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AD923016-F318-49B7-B08B-89DED6DC2422}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{AD923016-F318-49B7-B08B-89DED6DC2422}.Release|iPhone.Build.0 = Release|Any CPU
+		{AD923016-F318-49B7-B08B-89DED6DC2422}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{AD923016-F318-49B7-B08B-89DED6DC2422}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{B9B92246-02EB-4118-9C6F-85A0D726AA70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B9B92246-02EB-4118-9C6F-85A0D726AA70}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B9B92246-02EB-4118-9C6F-85A0D726AA70}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{B9B92246-02EB-4118-9C6F-85A0D726AA70}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{B9B92246-02EB-4118-9C6F-85A0D726AA70}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{B9B92246-02EB-4118-9C6F-85A0D726AA70}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{B9B92246-02EB-4118-9C6F-85A0D726AA70}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B9B92246-02EB-4118-9C6F-85A0D726AA70}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B9B92246-02EB-4118-9C6F-85A0D726AA70}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{B9B92246-02EB-4118-9C6F-85A0D726AA70}.Release|iPhone.Build.0 = Release|Any CPU
+		{B9B92246-02EB-4118-9C6F-85A0D726AA70}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{B9B92246-02EB-4118-9C6F-85A0D726AA70}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{B9022390-8184-4548-9DB1-50EB8878D20A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B9022390-8184-4548-9DB1-50EB8878D20A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B9022390-8184-4548-9DB1-50EB8878D20A}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{B9022390-8184-4548-9DB1-50EB8878D20A}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{B9022390-8184-4548-9DB1-50EB8878D20A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{B9022390-8184-4548-9DB1-50EB8878D20A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{B9022390-8184-4548-9DB1-50EB8878D20A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B9022390-8184-4548-9DB1-50EB8878D20A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B9022390-8184-4548-9DB1-50EB8878D20A}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{B9022390-8184-4548-9DB1-50EB8878D20A}.Release|iPhone.Build.0 = Release|Any CPU
+		{B9022390-8184-4548-9DB1-50EB8878D20A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{B9022390-8184-4548-9DB1-50EB8878D20A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{1743BF7C-E6AE-4A06-BAD9-166D62894303}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1743BF7C-E6AE-4A06-BAD9-166D62894303}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1743BF7C-E6AE-4A06-BAD9-166D62894303}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{1743BF7C-E6AE-4A06-BAD9-166D62894303}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{1743BF7C-E6AE-4A06-BAD9-166D62894303}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{1743BF7C-E6AE-4A06-BAD9-166D62894303}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{1743BF7C-E6AE-4A06-BAD9-166D62894303}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1743BF7C-E6AE-4A06-BAD9-166D62894303}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1743BF7C-E6AE-4A06-BAD9-166D62894303}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{1743BF7C-E6AE-4A06-BAD9-166D62894303}.Release|iPhone.Build.0 = Release|Any CPU
+		{1743BF7C-E6AE-4A06-BAD9-166D62894303}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{1743BF7C-E6AE-4A06-BAD9-166D62894303}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{7526A36E-09B9-4342-88CF-25969CF4158C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7526A36E-09B9-4342-88CF-25969CF4158C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7526A36E-09B9-4342-88CF-25969CF4158C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{7526A36E-09B9-4342-88CF-25969CF4158C}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{7526A36E-09B9-4342-88CF-25969CF4158C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{7526A36E-09B9-4342-88CF-25969CF4158C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{7526A36E-09B9-4342-88CF-25969CF4158C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7526A36E-09B9-4342-88CF-25969CF4158C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7526A36E-09B9-4342-88CF-25969CF4158C}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{7526A36E-09B9-4342-88CF-25969CF4158C}.Release|iPhone.Build.0 = Release|Any CPU
+		{7526A36E-09B9-4342-88CF-25969CF4158C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{7526A36E-09B9-4342-88CF-25969CF4158C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -448,4 +586,20 @@ Global
 		$2.inheritsScope = text/x-csharp
 		$2.scope = text/x-csharp
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{CA1DD4A8-FA22-48E0-860F-D57A7ED7D426} = {70CFC05F-CF79-4A7F-81EC-B32F1E564480}
+		{6E22BB20-901E-49B3-90A1-B0E6377FE568} = {CA1DD4A8-FA22-48E0-860F-D57A7ED7D426}
+		{9014CA66-5217-49F6-8C1E-3430FD08EF61} = {6E22BB20-901E-49B3-90A1-B0E6377FE568}
+		{561DFD5E-5896-40D1-9708-4D692F5BAE66} = {6E22BB20-901E-49B3-90A1-B0E6377FE568}
+		{7DBBBA73-6D84-4EBA-8711-EBC2939B04B5} = {CA1DD4A8-FA22-48E0-860F-D57A7ED7D426}
+		{B325271C-85E7-4DB3-8BBB-B70F242954F8} = {7DBBBA73-6D84-4EBA-8711-EBC2939B04B5}
+		{4C834F7F-07CA-46C7-8C7B-F10A1B3BC738} = {7DBBBA73-6D84-4EBA-8711-EBC2939B04B5}
+		{5CB72FDE-BA77-47D1-A556-FEB15AAD4523} = {CA1DD4A8-FA22-48E0-860F-D57A7ED7D426}
+		{0E0EDD4C-1E45-4E03-BC08-0102C98D34B3} = {CA1DD4A8-FA22-48E0-860F-D57A7ED7D426}
+		{AD923016-F318-49B7-B08B-89DED6DC2422} = {5CB72FDE-BA77-47D1-A556-FEB15AAD4523}
+		{B9B92246-02EB-4118-9C6F-85A0D726AA70} = {5CB72FDE-BA77-47D1-A556-FEB15AAD4523}
+		{B9022390-8184-4548-9DB1-50EB8878D20A} = {0E0EDD4C-1E45-4E03-BC08-0102C98D34B3}
+		{1743BF7C-E6AE-4A06-BAD9-166D62894303} = {0E0EDD4C-1E45-4E03-BC08-0102C98D34B3}
+		{7526A36E-09B9-4342-88CF-25969CF4158C} = {70CFC05F-CF79-4A7F-81EC-B32F1E564480}
+	EndGlobalSection
 EndGlobal

From 33d16a4b544b68ba444ddca8938a9b9c693c6fc4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 5 Apr 2021 12:22:38 +0900
Subject: [PATCH 2176/3722] Isolate rulesets subtree

---
 Templates/Directory.Build.props | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 Templates/Directory.Build.props

diff --git a/Templates/Directory.Build.props b/Templates/Directory.Build.props
new file mode 100644
index 0000000000..0e470106e8
--- /dev/null
+++ b/Templates/Directory.Build.props
@@ -0,0 +1,3 @@
+<Project>
+  <!-- Isolated subtree -->
+</Project>

From 73c59c4e1bfa4f8922271f3adebc6c2bc269862c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 5 Apr 2021 12:23:03 +0900
Subject: [PATCH 2177/3722] Fix ruleset templates not being included

---
 Templates/osu.Game.Templates.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Templates/osu.Game.Templates.csproj b/Templates/osu.Game.Templates.csproj
index ebde5f70a5..31a24a301f 100644
--- a/Templates/osu.Game.Templates.csproj
+++ b/Templates/osu.Game.Templates.csproj
@@ -18,7 +18,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="Templates\**\*" Exclude="Templates\**\bin\**;templates\**\obj\**" />
+    <Content Include="Rulesets\**\*" Exclude="Rulesets\**\bin\**;Rulesets\**\obj\**" />
     <Compile Remove="**\*" />
   </ItemGroup>
 </Project>

From b6681d01e55c65a13cdf3f2908a11adbff43cafe Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 5 Apr 2021 12:23:06 +0900
Subject: [PATCH 2178/3722] Add appveyor matrix

---
 appveyor_deploy.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/appveyor_deploy.yml b/appveyor_deploy.yml
index 737e5c43ab..adf98848bc 100644
--- a/appveyor_deploy.yml
+++ b/appveyor_deploy.yml
@@ -16,6 +16,8 @@ environment:
       job_depends_on: osu-game
     - job_name: mania-ruleset
       job_depends_on: osu-game
+    - job_name: templates
+      job_depends_on: osu-game
 
 nuget:
   project_feed: true
@@ -59,6 +61,22 @@ for:
       - cmd: dotnet remove osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj reference osu.Game\osu.Game.csproj
       - cmd: dotnet add osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME%
       - cmd: dotnet pack osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj /p:Version=%APPVEYOR_REPO_TAG_NAME%
+  -
+    matrix:
+      only:
+        - job_name: templates
+    build_script:
+      - cmd: dotnet remove Templates\Rulesets\ruleset-empty\osu.Game.Rulesets.EmptyFreeform\osu.Game.Rulesets.EmptyFreeform.csproj reference osu.Game\osu.Game.csproj
+      - cmd: dotnet remove Templates\Rulesets\ruleset-example\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj reference osu.Game\osu.Game.csproj
+      - cmd: dotnet remove Templates\Rulesets\ruleset-scrolling-empty\osu.Game.Rulesets.EmptyScrolling\osu.Game.Rulesets.EmptyScrolling.csproj reference osu.Game\osu.Game.csproj
+      - cmd: dotnet remove Templates\Rulesets\ruleset-scrolling-example\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj reference osu.Game\osu.Game.csproj
+
+      - cmd: dotnet add Templates\Rulesets\ruleset-empty\osu.Game.Rulesets.EmptyFreeform\osu.Game.Rulesets.EmptyFreeform.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME%
+      - cmd: dotnet add Templates\Rulesets\ruleset-example\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME%
+      - cmd: dotnet add Templates\Rulesets\ruleset-scrolling-empty\osu.Game.Rulesets.EmptyScrolling\osu.Game.Rulesets.EmptyScrolling.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME%
+      - cmd: dotnet add Templates\Rulesets\ruleset-scrolling-example\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME%
+
+      - cmd: dotnet pack Templates\osu.Game.Templates.csproj /p:Version=%APPVEYOR_REPO_TAG_NAME%
 
 artifacts:
   - path: '**\*.nupkg'

From 3acc612a6702e9e7d7553fcec5fc6a53eaa0ee92 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 5 Apr 2021 13:28:46 +0900
Subject: [PATCH 2179/3722] Adjust scoring values to better fit osu!mania

---
 osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs | 4 ++--
 osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs  | 4 ++--
 osu.Game/Rulesets/Judgements/Judgement.cs              | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
index 71cc0bdf1f..48b377c794 100644
--- a/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
+++ b/osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
@@ -7,8 +7,8 @@ namespace osu.Game.Rulesets.Mania.Scoring
 {
     internal class ManiaScoreProcessor : ScoreProcessor
     {
-        protected override double DefaultAccuracyPortion => 0.95;
+        protected override double DefaultAccuracyPortion => 0.99;
 
-        protected override double DefaultComboPortion => 0.05;
+        protected override double DefaultComboPortion => 0.01;
     }
 }
diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index 9f16312121..20fa0732b9 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -77,7 +77,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(ScoringMode.Standardised, HitResult.Miss, HitResult.Great, 0)] // (3 * 0) / (4 * 300) * 300_000 + (0 / 4) * 700_000
         [TestCase(ScoringMode.Standardised, HitResult.Meh, HitResult.Great, 387_500)] // (3 * 50) / (4 * 300) * 300_000 + (2 / 4) * 700_000
         [TestCase(ScoringMode.Standardised, HitResult.Ok, HitResult.Great, 425_000)] // (3 * 100) / (4 * 300) * 300_000 + (2 / 4) * 700_000
-        [TestCase(ScoringMode.Standardised, HitResult.Good, HitResult.Perfect, 478_571)] // (3 * 200) / (4 * 350) * 300_000 + (2 / 4) * 700_000
+        [TestCase(ScoringMode.Standardised, HitResult.Good, HitResult.Perfect, 492_857)] // (3 * 200) / (4 * 350) * 300_000 + (2 / 4) * 700_000
         [TestCase(ScoringMode.Standardised, HitResult.Great, HitResult.Great, 575_000)] // (3 * 300) / (4 * 300) * 300_000 + (2 / 4) * 700_000
         [TestCase(ScoringMode.Standardised, HitResult.Perfect, HitResult.Perfect, 575_000)] // (3 * 350) / (4 * 350) * 300_000 + (2 / 4) * 700_000
         [TestCase(ScoringMode.Standardised, HitResult.SmallTickMiss, HitResult.SmallTickHit, 700_000)] // (3 * 0) / (4 * 10) * 300_000 + 700_000 (max combo 0)
@@ -89,7 +89,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(ScoringMode.Classic, HitResult.Miss, HitResult.Great, 0)] // (0 * 4 * 300) * (1 + 0 / 25)
         [TestCase(ScoringMode.Classic, HitResult.Meh, HitResult.Great, 156)] // (((3 * 50) / (4 * 300)) * 4 * 300) * (1 + 1 / 25)
         [TestCase(ScoringMode.Classic, HitResult.Ok, HitResult.Great, 312)] // (((3 * 100) / (4 * 300)) * 4 * 300) * (1 + 1 / 25)
-        [TestCase(ScoringMode.Classic, HitResult.Good, HitResult.Perfect, 535)] // (((3 * 200) / (4 * 350)) * 4 * 300) * (1 + 1 / 25)
+        [TestCase(ScoringMode.Classic, HitResult.Good, HitResult.Perfect, 594)] // (((3 * 200) / (4 * 350)) * 4 * 300) * (1 + 1 / 25)
         [TestCase(ScoringMode.Classic, HitResult.Great, HitResult.Great, 936)] // (((3 * 300) / (4 * 300)) * 4 * 300) * (1 + 1 / 25)
         [TestCase(ScoringMode.Classic, HitResult.Perfect, HitResult.Perfect, 936)] // (((3 * 350) / (4 * 350)) * 4 * 300) * (1 + 1 / 25)
         [TestCase(ScoringMode.Classic, HitResult.SmallTickMiss, HitResult.SmallTickHit, 0)] // (0 * 1 * 300) * (1 + 0 / 25)
diff --git a/osu.Game/Rulesets/Judgements/Judgement.cs b/osu.Game/Rulesets/Judgements/Judgement.cs
index 89a3a2b855..b1ca72b1c0 100644
--- a/osu.Game/Rulesets/Judgements/Judgement.cs
+++ b/osu.Game/Rulesets/Judgements/Judgement.cs
@@ -181,7 +181,7 @@ namespace osu.Game.Rulesets.Judgements
                     return 300;
 
                 case HitResult.Perfect:
-                    return 350;
+                    return 315;
 
                 case HitResult.SmallBonus:
                     return SMALL_BONUS_SCORE;

From fe9efc277d38e9df9819be91b07be73c86a30b29 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 5 Apr 2021 13:56:04 +0900
Subject: [PATCH 2180/3722] Rename README header

---
 Templates/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Templates/README.md b/Templates/README.md
index 75ee76ddba..cf25a89273 100644
--- a/Templates/README.md
+++ b/Templates/README.md
@@ -1,4 +1,4 @@
-# osu-templates
+# Templates
 
 Templates for use when creating osu! dependent projects. Create a fully-testable (and ready for git) custom ruleset in just two lines.
 

From 0f171f092f0fa12a9f600437ce751d235c2436ec Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 5 Apr 2021 14:24:47 +0900
Subject: [PATCH 2181/3722] Add template projects to desktop slnf

---
 osu.Desktop.slnf | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Desktop.slnf b/osu.Desktop.slnf
index d2c14d321a..68541dbcfc 100644
--- a/osu.Desktop.slnf
+++ b/osu.Desktop.slnf
@@ -15,7 +15,16 @@
       "osu.Game.Tests\\osu.Game.Tests.csproj",
       "osu.Game.Tournament.Tests\\osu.Game.Tournament.Tests.csproj",
       "osu.Game.Tournament\\osu.Game.Tournament.csproj",
-      "osu.Game\\osu.Game.csproj"
+      "osu.Game\\osu.Game.csproj",
+
+      "Templates\\Rulesets\\ruleset-empty\\osu.Game.Rulesets.EmptyFreeform\\osu.Game.Rulesets.EmptyFreeform.csproj",
+      "Templates\\Rulesets\\ruleset-empty\\osu.Game.Rulesets.EmptyFreeform.Tests\\osu.Game.Rulesets.EmptyFreeform.Tests.csproj",
+      "Templates\\Rulesets\\ruleset-example\\osu.Game.Rulesets.Pippidon\\osu.Game.Rulesets.Pippidon.csproj",
+      "Templates\\Rulesets\\ruleset-example\\osu.Game.Rulesets.Pippidon.Tests\\osu.Game.Rulesets.Pippidon.Tests.csproj",
+      "Templates\\Rulesets\\ruleset-scrolling-empty\\osu.Game.Rulesets.EmptyScrolling\\osu.Game.Rulesets.EmptyScrolling.csproj",
+      "Templates\\Rulesets\\ruleset-scrolling-empty\\osu.Game.Rulesets.EmptyScrolling.Tests\\osu.Game.Rulesets.EmptyScrolling.Tests.csproj",
+      "Templates\\Rulesets\\ruleset-scrolling-example\\osu.Game.Rulesets.Pippidon\\osu.Game.Rulesets.Pippidon.csproj",
+      "Templates\\Rulesets\\ruleset-scrolling-example\\osu.Game.Rulesets.Pippidon.Tests\\osu.Game.Rulesets.Pippidon.Tests.csproj",
     ]
   }
 }
\ No newline at end of file

From d3f61b4aab145b35621622767ff54257f97ddbc4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 5 Apr 2021 14:42:15 +0900
Subject: [PATCH 2182/3722] Remove templates project from sln

---
 osu.sln | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/osu.sln b/osu.sln
index 5a251cb727..b5018db362 100644
--- a/osu.sln
+++ b/osu.sln
@@ -94,8 +94,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.Pippidon"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Rulesets.Pippidon.Tests", "Templates\Rulesets\ruleset-scrolling-example\osu.Game.Rulesets.Pippidon.Tests\osu.Game.Rulesets.Pippidon.Tests.csproj", "{1743BF7C-E6AE-4A06-BAD9-166D62894303}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "osu.Game.Templates", "Templates\osu.Game.Templates.csproj", "{7526A36E-09B9-4342-88CF-25969CF4158C}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -538,18 +536,6 @@ Global
 		{1743BF7C-E6AE-4A06-BAD9-166D62894303}.Release|iPhone.Build.0 = Release|Any CPU
 		{1743BF7C-E6AE-4A06-BAD9-166D62894303}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{1743BF7C-E6AE-4A06-BAD9-166D62894303}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{7526A36E-09B9-4342-88CF-25969CF4158C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7526A36E-09B9-4342-88CF-25969CF4158C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7526A36E-09B9-4342-88CF-25969CF4158C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{7526A36E-09B9-4342-88CF-25969CF4158C}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{7526A36E-09B9-4342-88CF-25969CF4158C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{7526A36E-09B9-4342-88CF-25969CF4158C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{7526A36E-09B9-4342-88CF-25969CF4158C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7526A36E-09B9-4342-88CF-25969CF4158C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7526A36E-09B9-4342-88CF-25969CF4158C}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{7526A36E-09B9-4342-88CF-25969CF4158C}.Release|iPhone.Build.0 = Release|Any CPU
-		{7526A36E-09B9-4342-88CF-25969CF4158C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{7526A36E-09B9-4342-88CF-25969CF4158C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -600,6 +586,5 @@ Global
 		{B9B92246-02EB-4118-9C6F-85A0D726AA70} = {5CB72FDE-BA77-47D1-A556-FEB15AAD4523}
 		{B9022390-8184-4548-9DB1-50EB8878D20A} = {0E0EDD4C-1E45-4E03-BC08-0102C98D34B3}
 		{1743BF7C-E6AE-4A06-BAD9-166D62894303} = {0E0EDD4C-1E45-4E03-BC08-0102C98D34B3}
-		{7526A36E-09B9-4342-88CF-25969CF4158C} = {70CFC05F-CF79-4A7F-81EC-B32F1E564480}
 	EndGlobalSection
 EndGlobal

From 85e1bc85bfe56f45702f06eb416d57d58b61a879 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 5 Apr 2021 15:21:53 +0900
Subject: [PATCH 2183/3722] Update DotSettings and .editorconfig

---
 .../Rulesets/ruleset-empty/.editorconfig      | 185 +++-
 ...ame.Rulesets.EmptyFreeform.sln.DotSettings | 897 ++++++++++--------
 .../Rulesets/ruleset-example/.editorconfig    | 185 +++-
 ...osu.Game.Rulesets.Pippidon.sln.DotSettings | 897 ++++++++++--------
 .../ruleset-scrolling-empty/.editorconfig     | 185 +++-
 ...me.Rulesets.EmptyScrolling.sln.DotSettings | 897 ++++++++++--------
 .../ruleset-scrolling-example/.editorconfig   | 185 +++-
 ...osu.Game.Rulesets.Pippidon.sln.DotSettings | 889 +++++++++--------
 8 files changed, 2620 insertions(+), 1700 deletions(-)

diff --git a/Templates/Rulesets/ruleset-empty/.editorconfig b/Templates/Rulesets/ruleset-empty/.editorconfig
index 24825b7c42..f3badda9b3 100644
--- a/Templates/Rulesets/ruleset-empty/.editorconfig
+++ b/Templates/Rulesets/ruleset-empty/.editorconfig
@@ -12,16 +12,189 @@ trim_trailing_whitespace = true
 
 #PascalCase for public and protected members
 dotnet_naming_style.pascalcase.capitalization = pascal_case
-dotnet_naming_symbols.public_members.applicable_accessibilities = public,internal,protected,protected_internal
-dotnet_naming_symbols.public_members.applicable_kinds = property,method,field,event,delegate
-dotnet_naming_rule.public_members_pascalcase.severity = suggestion
+dotnet_naming_symbols.public_members.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.public_members.applicable_kinds = property,method,field,event
+dotnet_naming_rule.public_members_pascalcase.severity = error
 dotnet_naming_rule.public_members_pascalcase.symbols = public_members
 dotnet_naming_rule.public_members_pascalcase.style = pascalcase
 
 #camelCase for private members
 dotnet_naming_style.camelcase.capitalization = camel_case
+
 dotnet_naming_symbols.private_members.applicable_accessibilities = private
-dotnet_naming_symbols.private_members.applicable_kinds = property,method,field,event,delegate
-dotnet_naming_rule.private_members_camelcase.severity = suggestion
+dotnet_naming_symbols.private_members.applicable_kinds = property,method,field,event
+dotnet_naming_rule.private_members_camelcase.severity = warning
 dotnet_naming_rule.private_members_camelcase.symbols = private_members
-dotnet_naming_rule.private_members_camelcase.style = camelcase
\ No newline at end of file
+dotnet_naming_rule.private_members_camelcase.style = camelcase
+
+dotnet_naming_symbols.local_function.applicable_kinds = local_function
+dotnet_naming_rule.local_function_camelcase.severity = warning
+dotnet_naming_rule.local_function_camelcase.symbols = local_function
+dotnet_naming_rule.local_function_camelcase.style = camelcase
+
+#all_lower for private and local constants/static readonlys
+dotnet_naming_style.all_lower.capitalization = all_lower
+dotnet_naming_style.all_lower.word_separator = _
+
+dotnet_naming_symbols.private_constants.applicable_accessibilities = private
+dotnet_naming_symbols.private_constants.required_modifiers = const
+dotnet_naming_symbols.private_constants.applicable_kinds = field
+dotnet_naming_rule.private_const_all_lower.severity = warning
+dotnet_naming_rule.private_const_all_lower.symbols = private_constants
+dotnet_naming_rule.private_const_all_lower.style = all_lower
+
+dotnet_naming_symbols.private_static_readonly.applicable_accessibilities = private
+dotnet_naming_symbols.private_static_readonly.required_modifiers = static,readonly
+dotnet_naming_symbols.private_static_readonly.applicable_kinds = field
+dotnet_naming_rule.private_static_readonly_all_lower.severity = warning
+dotnet_naming_rule.private_static_readonly_all_lower.symbols = private_static_readonly
+dotnet_naming_rule.private_static_readonly_all_lower.style = all_lower
+
+dotnet_naming_symbols.local_constants.applicable_kinds = local
+dotnet_naming_symbols.local_constants.required_modifiers = const
+dotnet_naming_rule.local_const_all_lower.severity = warning
+dotnet_naming_rule.local_const_all_lower.symbols = local_constants
+dotnet_naming_rule.local_const_all_lower.style = all_lower
+
+#ALL_UPPER for non private constants/static readonlys
+dotnet_naming_style.all_upper.capitalization = all_upper
+dotnet_naming_style.all_upper.word_separator = _
+
+dotnet_naming_symbols.public_constants.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.public_constants.required_modifiers = const
+dotnet_naming_symbols.public_constants.applicable_kinds = field
+dotnet_naming_rule.public_const_all_upper.severity = warning
+dotnet_naming_rule.public_const_all_upper.symbols = public_constants
+dotnet_naming_rule.public_const_all_upper.style = all_upper
+
+dotnet_naming_symbols.public_static_readonly.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.public_static_readonly.required_modifiers = static,readonly
+dotnet_naming_symbols.public_static_readonly.applicable_kinds = field
+dotnet_naming_rule.public_static_readonly_all_upper.severity = warning
+dotnet_naming_rule.public_static_readonly_all_upper.symbols = public_static_readonly
+dotnet_naming_rule.public_static_readonly_all_upper.style = all_upper
+
+#Roslyn formating options
+
+#Formatting - indentation options
+csharp_indent_case_contents = true
+csharp_indent_case_contents_when_block = false
+csharp_indent_labels = one_less_than_current
+csharp_indent_switch_labels = true
+
+#Formatting - new line options
+csharp_new_line_before_catch = true
+csharp_new_line_before_else = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_open_brace = all
+#csharp_new_line_before_members_in_anonymous_types = true
+#csharp_new_line_before_members_in_object_initializers = true # Currently no effect in VS/dotnet format (16.4), and makes Rider confusing
+csharp_new_line_between_query_expression_clauses = true
+
+#Formatting - organize using options
+dotnet_sort_system_directives_first = true
+
+#Formatting - spacing options
+csharp_space_after_cast = false
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+
+#Formatting - wrapping options
+csharp_preserve_single_line_blocks = true
+csharp_preserve_single_line_statements = true
+
+#Roslyn language styles
+
+#Style - this. qualification
+dotnet_style_qualification_for_field = false:warning
+dotnet_style_qualification_for_property = false:warning
+dotnet_style_qualification_for_method = false:warning
+dotnet_style_qualification_for_event = false:warning
+
+#Style - type names
+dotnet_style_predefined_type_for_locals_parameters_members = true:warning
+dotnet_style_predefined_type_for_member_access = true:warning
+csharp_style_var_when_type_is_apparent = true:none
+csharp_style_var_for_built_in_types = true:none
+csharp_style_var_elsewhere = true:silent
+
+#Style - modifiers
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:warning
+csharp_preferred_modifier_order = public,private,protected,internal,new,abstract,virtual,sealed,override,static,readonly,extern,unsafe,volatile,async:warning
+
+#Style - parentheses
+# Skipped because roslyn cannot separate +-*/ with << >>
+
+#Style - expression bodies
+csharp_style_expression_bodied_accessors = true:warning
+csharp_style_expression_bodied_constructors = false:none
+csharp_style_expression_bodied_indexers = true:warning
+csharp_style_expression_bodied_methods = false:silent
+csharp_style_expression_bodied_operators = true:warning
+csharp_style_expression_bodied_properties = true:warning
+csharp_style_expression_bodied_local_functions = true:silent
+
+#Style - expression preferences
+dotnet_style_object_initializer = true:warning
+dotnet_style_collection_initializer = true:warning
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:warning
+dotnet_style_prefer_auto_properties = true:warning
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+dotnet_style_prefer_compound_assignment = true:warning
+
+#Style - null/type checks
+dotnet_style_coalesce_expression = true:warning
+dotnet_style_null_propagation = true:warning
+csharp_style_pattern_matching_over_is_with_cast_check = true:warning
+csharp_style_pattern_matching_over_as_with_null_check = true:warning
+csharp_style_throw_expression = true:silent
+csharp_style_conditional_delegate_call = true:warning
+
+#Style - unused
+dotnet_style_readonly_field = true:silent
+dotnet_code_quality_unused_parameters = non_public:silent
+csharp_style_unused_value_expression_statement_preference = discard_variable:silent
+csharp_style_unused_value_assignment_preference = discard_variable:warning
+
+#Style - variable declaration
+csharp_style_inlined_variable_declaration = true:warning
+csharp_style_deconstructed_variable_declaration = true:warning
+
+#Style - other C# 7.x features
+dotnet_style_prefer_inferred_tuple_names = true:warning
+csharp_prefer_simple_default_expression = true:warning
+csharp_style_pattern_local_over_anonymous_function = true:warning
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
+
+#Style - C# 8 features
+csharp_prefer_static_local_function = true:warning
+csharp_prefer_simple_using_statement = true:silent
+csharp_style_prefer_index_operator = true:warning
+csharp_style_prefer_range_operator = true:warning
+csharp_style_prefer_switch_expression = false:none
+
+#Supressing roslyn built-in analyzers
+# Suppress: EC112
+
+#Private method is unused
+dotnet_diagnostic.IDE0051.severity = silent
+#Private member is unused
+dotnet_diagnostic.IDE0052.severity = silent
+
+#Rules for disposable
+dotnet_diagnostic.IDE0067.severity = none
+dotnet_diagnostic.IDE0068.severity = none
+dotnet_diagnostic.IDE0069.severity = none
+
+#Disable operator overloads requiring alternate named methods
+dotnet_diagnostic.CA2225.severity = none
+
+# Banned APIs
+dotnet_diagnostic.RS0030.severity = error
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.sln.DotSettings b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.sln.DotSettings
index 1cbe36794a..aa8f8739c1 100644
--- a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.sln.DotSettings
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.sln.DotSettings
@@ -12,14 +12,15 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeLocalFunctionBody/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeMethodOrOperatorBody/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeModifiersOrder/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue"></s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue">WARNING</s:String>
 	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexRemoved">True</s:Boolean>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeMemberModifiers/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeModifiers/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignedValueIsNeverUsed/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignmentIsFullyDiscarded/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignNullToNotNullAttribute/@EntryIndexedValue">HINT</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002EGlobal/@EntryIndexedValue">HINT</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002EGlobal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadAttributeBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadBracesSpaces/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadChildStatementIndent/@EntryIndexedValue">WARNING</s:String>
@@ -29,7 +30,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadControlBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadDeclarationBracesIndent/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadDeclarationBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadEmptyFreeformScrollingBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadEmptyBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadExpressionBracesIndent/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadExpressionBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadGenericBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
@@ -59,22 +60,35 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertClosureToMethodGroup/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfDoToWhile/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToConditionalTernaryExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToNullCoalescingAssignment/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToNullCoalescingExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfToOrExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertNullableToShortForm/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertPropertyToExpressionBody/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoProperty/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoProperty/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoPropertyWhenPossible/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoPropertyWithPrivateSetter/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToConstant_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLambdaExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLocalFunction/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToStaticClass/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToUsingDeclaration/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=DoubleNegationOperator/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EmptyScrollingGeneralCatchClause/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EmptyGeneralCatchClause/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceDoWhileStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceFixedStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceForeachStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceForStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceIfStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceLockStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceUsingStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceWhileStatementBraces/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EventNeverSubscribedTo_002EGlobal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EventNeverSubscribedTo_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ForCanBeConvertedToForeach/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ForStatementConditionIsTrue/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=IdentifierTypo/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ImpureMethodCallOnReadonlyValueField/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InconsistentNaming/@EntryIndexedValue">ERROR</s:String>
@@ -92,6 +106,9 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeCastWithTypeCheck/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeConditionalExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeSequentialChecks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeSequentialPatterns/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodHasAsyncOverload/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodHasAsyncOverloadWithCancellation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodSupportsCancellation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingBlankLines/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingIndent/@EntryIndexedValue">WARNING</s:String>
@@ -107,6 +124,7 @@
 	<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/=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>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PrivateVariableCanBeMadeReadonly/@EntryIndexedValue">WARNING</s:String>
@@ -120,11 +138,12 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInAttributeList/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInEnumDeclaration/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInInitializer/@EntryIndexedValue">DO_NOT_SHOW</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantEmptyFreeformScrollingObjectCreationArgumentList/@EntryIndexedValue">WARNING</s:String>
-	
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantEmptyObjectCreationArgumentList/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantExplicitParamsArrayCreation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantImmediateDelegateInvocation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLambdaSignatureParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantReadonlyModifier/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantTypeSpecificationInDefaultExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLinebreak/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantSpace/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantUsingDirective/@EntryIndexedValue">ERROR</s:String>
@@ -171,7 +190,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToAny/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToCount/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirst/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirstOrDefault/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirstOrDefault/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToLast/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToLastOrDefault/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToSingle/@EntryIndexedValue">WARNING</s:String>
@@ -181,7 +200,10 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E3/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SeparateControlTransferStatement/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringEndsWithIsCultureSpecific/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringLiteralTypo/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringStartsWithIsCultureSpecific/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StructCanBeMadeReadOnly/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FBuiltInTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FSimpleTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SwitchStatementMissingSomeCases/@EntryIndexedValue">DO_NOT_SHOW</s:String>
@@ -199,12 +221,16 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMember_002ELocal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002EGlobal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002ELocal/@EntryIndexedValue">HINT</s:String>
-	
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedParameter_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedParameter_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedType_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseAwaitUsing/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseCollectionCountProperty/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInFormatString/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseIndexFromEndExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNameofExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNameOfInsteadOfTypeOf/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexedValue"></s:String>
 	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexRemoved">True</s:Boolean>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNullPropagation/@EntryIndexedValue">WARNING</s:String>
@@ -216,11 +242,21 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002EGlobal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=WrongIndentSize/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Code_0020Cleanup_0020_0028peppy_0029/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Code Cleanup (peppy)"&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_EXPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;ALWAYS_EXPLICIT&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_EXPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="False" ArrangeTypeMemberAccessModifier="False" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="False" ArrangeBraces="False" ArrangeAttributes="False" ArrangeArgumentsStyle="False" /&gt;&lt;XAMLCollapseEmptyFreeformScrollingTags&gt;False&lt;/XAMLCollapseEmptyFreeformScrollingTags&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;/Profile&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Code_0020Cleanup_0020_0028peppy_0029/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Code Cleanup (peppy)"&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_EXPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;ALWAYS_EXPLICIT&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_EXPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="False" ArrangeTypeMemberAccessModifier="False" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="False" ArrangeBraces="False" ArrangeAttributes="False" ArrangeArgumentsStyle="False" /&gt;&lt;XAMLCollapseEmptyTags&gt;False&lt;/XAMLCollapseEmptyTags&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;/Profile&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeCleanup/RecentlyUsedProfile/@EntryValue">Code Cleanup (peppy)</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_DOWHILE/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FIXED/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOR/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOREACH/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_IFELSE/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_LOCK/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_USING/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_WHILE/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/DEFAULT_INTERNAL_MODIFIER/@EntryValue">Explicit</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/LOCAL_FUNCTION_BODY/@EntryValue">ExpressionBody</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/METHOD_OR_OPERATOR_BODY/@EntryValue">ExpressionBody</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/METHOD_OR_OPERATOR_BODY/@EntryValue">BlockBody</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/USE_HEURISTICS_FOR_BODY_STYLE/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ACCESSOR_DECLARATION_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_LINQ_QUERY/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_CALLS_CHAIN/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_EXTENDS_LIST/@EntryValue">True</s:Boolean>
@@ -232,14 +268,24 @@
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ANONYMOUS_METHOD_DECLARATION_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BEFORE_BLOCK_STATEMENTS/@EntryValue">1</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BEFORE_CASE/@EntryValue">1</s:Int64>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/CASE_BLOCK_BRACES/@EntryValue">NEXT_LINE</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/EMPTY_BLOCK_STYLE/@EntryValue">MULTILINE</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_FOR_STMT/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_FOREACH_STMT/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_LOCK_STMT/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_WHILE_STMT/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INITIALIZER_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_CODE/@EntryValue">1</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue">1</s:Int64>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/LINE_FEED_AT_FILE_END/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/OTHER_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CATCH_ON_NEW_LINE/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ELSE_ON_NEW_LINE/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_WHILE_ON_NEW_LINE/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AROUND_MULTIPLICATIVE_OP/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_SIZEOF_PARENTHESES/@EntryValue">False</s:Boolean>
@@ -247,6 +293,7 @@
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHING_EMPTY_BRACES/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/STICK_COMMENT/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_AFTER_DECLARATION_LPAR/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_ARRAY_INITIALIZER_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_BINARY_OPSIGN/@EntryValue">True</s:Boolean>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">200</s:Int64>
@@ -260,9 +307,11 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GL/@EntryIndexedValue">GL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GLSL/@EntryIndexedValue">GLSL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HID/@EntryIndexedValue">HID</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HTML/@EntryIndexedValue">HTML</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HUD/@EntryIndexedValue">HUD</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IL/@EntryIndexedValue">IL</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IOS/@EntryIndexedValue">IOS</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IPC/@EntryIndexedValue">IPC</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JIT/@EntryIndexedValue">JIT</s:String>
@@ -276,397 +325,397 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SHA/@EntryIndexedValue">SHA</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SRGB/@EntryIndexedValue">SRGB</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TK/@EntryIndexedValue">TK</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SS/@EntryIndexedValue">SS</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PP/@EntryIndexedValue">PP</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GMT/@EntryIndexedValue">GMT</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=QAT/@EntryIndexedValue">QAT</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BNG/@EntryIndexedValue">BNG</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SS/@EntryIndexedValue">SS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PP/@EntryIndexedValue">PP</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GMT/@EntryIndexedValue">GMT</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=QAT/@EntryIndexedValue">QAT</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BNG/@EntryIndexedValue">BNG</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UI/@EntryIndexedValue">UI</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpNaming/ApplyAutoDetectedRules/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeStyle/CSharpFileLayoutPatterns/Pattern/@EntryValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&#xD;
 &lt;Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"&gt;&#xD;
-  &lt;TypePattern DisplayName="COM interfaces or structs"&gt;&#xD;
-    &lt;TypePattern.Match&gt;&#xD;
-      &lt;Or&gt;&#xD;
-        &lt;And&gt;&#xD;
-          &lt;Kind Is="Interface" /&gt;&#xD;
-          &lt;Or&gt;&#xD;
-            &lt;HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /&gt;&#xD;
-            &lt;HasAttribute Name="System.Runtime.InteropServices.ComImport" /&gt;&#xD;
-          &lt;/Or&gt;&#xD;
-        &lt;/And&gt;&#xD;
-        &lt;Kind Is="Struct" /&gt;&#xD;
-      &lt;/Or&gt;&#xD;
-    &lt;/TypePattern.Match&gt;&#xD;
-  &lt;/TypePattern&gt;&#xD;
-  &lt;TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"&gt;&#xD;
-    &lt;TypePattern.Match&gt;&#xD;
-      &lt;And&gt;&#xD;
-        &lt;Kind Is="Class" /&gt;&#xD;
-        &lt;HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /&gt;&#xD;
-      &lt;/And&gt;&#xD;
-    &lt;/TypePattern.Match&gt;&#xD;
-    &lt;Entry DisplayName="Setup/Teardown Methods"&gt;&#xD;
-      &lt;Entry.Match&gt;&#xD;
-        &lt;And&gt;&#xD;
-          &lt;Kind Is="Method" /&gt;&#xD;
-          &lt;Or&gt;&#xD;
-            &lt;HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /&gt;&#xD;
-            &lt;HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /&gt;&#xD;
-            &lt;HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="True" /&gt;&#xD;
-            &lt;HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="True" /&gt;&#xD;
-          &lt;/Or&gt;&#xD;
-        &lt;/And&gt;&#xD;
-      &lt;/Entry.Match&gt;&#xD;
-    &lt;/Entry&gt;&#xD;
-    &lt;Entry DisplayName="All other members" /&gt;&#xD;
-    &lt;Entry Priority="100" DisplayName="Test Methods"&gt;&#xD;
-      &lt;Entry.Match&gt;&#xD;
-        &lt;And&gt;&#xD;
-          &lt;Kind Is="Method" /&gt;&#xD;
-          &lt;HasAttribute Name="NUnit.Framework.TestAttribute" /&gt;&#xD;
-        &lt;/And&gt;&#xD;
-      &lt;/Entry.Match&gt;&#xD;
-      &lt;Entry.SortBy&gt;&#xD;
-        &lt;Name /&gt;&#xD;
-      &lt;/Entry.SortBy&gt;&#xD;
-    &lt;/Entry&gt;&#xD;
-  &lt;/TypePattern&gt;&#xD;
-  &lt;TypePattern DisplayName="Default Pattern"&gt;&#xD;
-    &lt;Group DisplayName="Fields/Properties"&gt;&#xD;
-      &lt;Group DisplayName="Public Fields"&gt;&#xD;
-        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Kind Is="Constant" /&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-                &lt;And&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/And&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Or&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/Or&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Entry DisplayName="Public Properties"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;And&gt;&#xD;
-            &lt;Access Is="Public" /&gt;&#xD;
-            &lt;Kind Is="Property" /&gt;&#xD;
-          &lt;/And&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-      &lt;Group DisplayName="Internal Fields"&gt;&#xD;
-        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Kind Is="Constant" /&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-                &lt;And&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/And&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Or&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/Or&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Entry DisplayName="Internal Properties"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;And&gt;&#xD;
-            &lt;Access Is="Internal" /&gt;&#xD;
-            &lt;Kind Is="Property" /&gt;&#xD;
-          &lt;/And&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-      &lt;Group DisplayName="Protected Fields"&gt;&#xD;
-        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Kind Is="Constant" /&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-                &lt;And&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/And&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Or&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/Or&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Entry DisplayName="Protected Properties"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;And&gt;&#xD;
-            &lt;Access Is="Protected" /&gt;&#xD;
-            &lt;Kind Is="Property" /&gt;&#xD;
-          &lt;/And&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-      &lt;Group DisplayName="Private Fields"&gt;&#xD;
-        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Kind Is="Constant" /&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-                &lt;And&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/And&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Or&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/Or&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Entry DisplayName="Private Properties"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;And&gt;&#xD;
-            &lt;Access Is="Private" /&gt;&#xD;
-            &lt;Kind Is="Property" /&gt;&#xD;
-          &lt;/And&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-    &lt;/Group&gt;&#xD;
-    &lt;Group DisplayName="Constructor/Destructor"&gt;&#xD;
-      &lt;Entry DisplayName="Ctor"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;Kind Is="Constructor" /&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-      &lt;Region Name="Disposal"&gt;&#xD;
-        &lt;Entry DisplayName="Dtor"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;Kind Is="Destructor" /&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Dispose()"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-              &lt;Name Is="Dispose" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Dispose(true)"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Virtual /&gt;&#xD;
-                &lt;Override /&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-              &lt;Name Is="Dispose" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Region&gt;&#xD;
-    &lt;/Group&gt;&#xD;
-    &lt;Group DisplayName="Methods"&gt;&#xD;
-      &lt;Group DisplayName="Public"&gt;&#xD;
-        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Static /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Group DisplayName="Internal"&gt;&#xD;
-        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Static /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Group DisplayName="Protected"&gt;&#xD;
-        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Static /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Group DisplayName="Private"&gt;&#xD;
-        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Static /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-    &lt;/Group&gt;&#xD;
-  &lt;/TypePattern&gt;&#xD;
+	&lt;TypePattern DisplayName="COM interfaces or structs"&gt;&#xD;
+	&lt;TypePattern.Match&gt;&#xD;
+		&lt;Or&gt;&#xD;
+		&lt;And&gt;&#xD;
+			&lt;Kind Is="Interface" /&gt;&#xD;
+			&lt;Or&gt;&#xD;
+			&lt;HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /&gt;&#xD;
+			&lt;HasAttribute Name="System.Runtime.InteropServices.ComImport" /&gt;&#xD;
+			&lt;/Or&gt;&#xD;
+		&lt;/And&gt;&#xD;
+		&lt;Kind Is="Struct" /&gt;&#xD;
+		&lt;/Or&gt;&#xD;
+	&lt;/TypePattern.Match&gt;&#xD;
+	&lt;/TypePattern&gt;&#xD;
+	&lt;TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"&gt;&#xD;
+	&lt;TypePattern.Match&gt;&#xD;
+		&lt;And&gt;&#xD;
+		&lt;Kind Is="Class" /&gt;&#xD;
+		&lt;HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /&gt;&#xD;
+		&lt;/And&gt;&#xD;
+	&lt;/TypePattern.Match&gt;&#xD;
+	&lt;Entry DisplayName="Setup/Teardown Methods"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+		&lt;And&gt;&#xD;
+			&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;Or&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="True" /&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="True" /&gt;&#xD;
+			&lt;/Or&gt;&#xD;
+		&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+	&lt;/Entry&gt;&#xD;
+	&lt;Entry DisplayName="All other members" /&gt;&#xD;
+	&lt;Entry Priority="100" DisplayName="Test Methods"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+		&lt;And&gt;&#xD;
+			&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.TestAttribute" /&gt;&#xD;
+		&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;Entry.SortBy&gt;&#xD;
+		&lt;Name /&gt;&#xD;
+		&lt;/Entry.SortBy&gt;&#xD;
+	&lt;/Entry&gt;&#xD;
+	&lt;/TypePattern&gt;&#xD;
+	&lt;TypePattern DisplayName="Default Pattern"&gt;&#xD;
+	&lt;Group DisplayName="Fields/Properties"&gt;&#xD;
+		&lt;Group DisplayName="Public Fields"&gt;&#xD;
+		&lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Kind Is="Constant" /&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;And&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/And&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Static Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Or&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Entry DisplayName="Public Properties"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+			&lt;Access Is="Public" /&gt;&#xD;
+			&lt;Kind Is="Property" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Group DisplayName="Internal Fields"&gt;&#xD;
+		&lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Kind Is="Constant" /&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;And&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/And&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Static Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Or&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Entry DisplayName="Internal Properties"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+			&lt;Access Is="Internal" /&gt;&#xD;
+			&lt;Kind Is="Property" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Group DisplayName="Protected Fields"&gt;&#xD;
+		&lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Kind Is="Constant" /&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;And&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/And&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Static Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Or&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Entry DisplayName="Protected Properties"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+			&lt;Access Is="Protected" /&gt;&#xD;
+			&lt;Kind Is="Property" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Group DisplayName="Private Fields"&gt;&#xD;
+		&lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Kind Is="Constant" /&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;And&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/And&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Static Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Or&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Entry DisplayName="Private Properties"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+			&lt;Access Is="Private" /&gt;&#xD;
+			&lt;Kind Is="Property" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+	&lt;/Group&gt;&#xD;
+	&lt;Group DisplayName="Constructor/Destructor"&gt;&#xD;
+		&lt;Entry DisplayName="Ctor"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;Kind Is="Constructor" /&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Region Name="Disposal"&gt;&#xD;
+		&lt;Entry DisplayName="Dtor"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;Kind Is="Destructor" /&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Dispose()"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+				&lt;Name Is="Dispose" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Dispose(true)"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Virtual /&gt;&#xD;
+				&lt;Override /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+				&lt;Name Is="Dispose" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Region&gt;&#xD;
+	&lt;/Group&gt;&#xD;
+	&lt;Group DisplayName="Methods"&gt;&#xD;
+		&lt;Group DisplayName="Public"&gt;&#xD;
+		&lt;Entry DisplayName="Static Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Group DisplayName="Internal"&gt;&#xD;
+		&lt;Entry DisplayName="Static Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Group DisplayName="Protected"&gt;&#xD;
+		&lt;Entry DisplayName="Static Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Group DisplayName="Private"&gt;&#xD;
+		&lt;Entry DisplayName="Static Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+	&lt;/Group&gt;&#xD;
+	&lt;/TypePattern&gt;&#xD;
 &lt;/Patterns&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">Copyright (c) ppy Pty Ltd &lt;contact@ppy.sh&gt;. Licensed under the MIT Licence.&#xD;
 See the LICENCE file in the repository root for full licence text.&#xD;
@@ -726,6 +775,8 @@ See the LICENCE file in the repository root for full licence text.&#xD;
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=NAMESPACE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CustomTools/CustomToolsData/@EntryValue"></s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002EDaemon_002ESettings_002EMigration_002ESwaWarningsModeSettingsMigrate/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
@@ -736,6 +787,7 @@ See the LICENCE file in the repository root for full licence text.&#xD;
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/Environment/UnitTesting/NUnitProvider/SetCurrentDirectoryTo/@EntryValue">TestFolder</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Description/@EntryValue">o!f – Object Initializer: Anchor&amp;Origin</s:String>
@@ -761,7 +813,7 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Text/@EntryValue">InternalChildren = new Drawable[]
 {
-    $END$
+	$END$
 };</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -774,12 +826,12 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Text/@EntryValue">new GridContainer
 {
-    RelativeSizeAxes = Axes.Both,
-    Content = new[]
-    {
-        new Drawable[] { $END$ },
-        new Drawable[] { }
-    }
+	RelativeSizeAxes = Axes.Both,
+	Content = new[]
+	{
+		new Drawable[] { $END$ },
+		new Drawable[] { }
+	}
 };</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -792,12 +844,12 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Text/@EntryValue">new FillFlowContainer
 {
-    RelativeSizeAxes = Axes.Both,
-    Direction = FillDirection.Vertical,
-    Children = new Drawable[]
-    {
-        $END$
-    }
+	RelativeSizeAxes = Axes.Both,
+	Direction = FillDirection.Vertical,
+	Children = new Drawable[]
+	{
+		$END$
+	}
 },</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -810,11 +862,11 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Text/@EntryValue">new Container
 {
-    RelativeSizeAxes = Axes.Both,
-    Children = new Drawable[]
-    {
-        $END$
-    }
+	RelativeSizeAxes = Axes.Both,
+	Children = new Drawable[]
+	{
+		$END$
+	}
 },</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -828,7 +880,7 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Text/@EntryValue">[BackgroundDependencyLoader]
 private void load()
 {
-    $END$
+	$END$
 }</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -841,8 +893,8 @@ private void load()
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Text/@EntryValue">new Box
 {
-    Colour = Color4.Black,
-    RelativeSizeAxes = Axes.Both,
+	Colour = Color4.Black,
+	RelativeSizeAxes = Axes.Both,
 },</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -855,23 +907,28 @@ private void load()
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Text/@EntryValue">Children = new Drawable[]
 {
-    $END$
+	$END$
 };</s:String>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Beatmap/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=beatmaps/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=beatmap_0027s/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=bindable/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=bindables/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Catmull/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Drawables/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=gameplay/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=hitobject/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=hitobjects/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=keymods/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Kiai/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboard/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboards/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Playfield/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=playfields/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=resampler/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=ruleset/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=rulesets/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=ruleset_0027s/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Strongable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Taiko/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Unranked/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/Templates/Rulesets/ruleset-example/.editorconfig b/Templates/Rulesets/ruleset-example/.editorconfig
index 24825b7c42..f3badda9b3 100644
--- a/Templates/Rulesets/ruleset-example/.editorconfig
+++ b/Templates/Rulesets/ruleset-example/.editorconfig
@@ -12,16 +12,189 @@ trim_trailing_whitespace = true
 
 #PascalCase for public and protected members
 dotnet_naming_style.pascalcase.capitalization = pascal_case
-dotnet_naming_symbols.public_members.applicable_accessibilities = public,internal,protected,protected_internal
-dotnet_naming_symbols.public_members.applicable_kinds = property,method,field,event,delegate
-dotnet_naming_rule.public_members_pascalcase.severity = suggestion
+dotnet_naming_symbols.public_members.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.public_members.applicable_kinds = property,method,field,event
+dotnet_naming_rule.public_members_pascalcase.severity = error
 dotnet_naming_rule.public_members_pascalcase.symbols = public_members
 dotnet_naming_rule.public_members_pascalcase.style = pascalcase
 
 #camelCase for private members
 dotnet_naming_style.camelcase.capitalization = camel_case
+
 dotnet_naming_symbols.private_members.applicable_accessibilities = private
-dotnet_naming_symbols.private_members.applicable_kinds = property,method,field,event,delegate
-dotnet_naming_rule.private_members_camelcase.severity = suggestion
+dotnet_naming_symbols.private_members.applicable_kinds = property,method,field,event
+dotnet_naming_rule.private_members_camelcase.severity = warning
 dotnet_naming_rule.private_members_camelcase.symbols = private_members
-dotnet_naming_rule.private_members_camelcase.style = camelcase
\ No newline at end of file
+dotnet_naming_rule.private_members_camelcase.style = camelcase
+
+dotnet_naming_symbols.local_function.applicable_kinds = local_function
+dotnet_naming_rule.local_function_camelcase.severity = warning
+dotnet_naming_rule.local_function_camelcase.symbols = local_function
+dotnet_naming_rule.local_function_camelcase.style = camelcase
+
+#all_lower for private and local constants/static readonlys
+dotnet_naming_style.all_lower.capitalization = all_lower
+dotnet_naming_style.all_lower.word_separator = _
+
+dotnet_naming_symbols.private_constants.applicable_accessibilities = private
+dotnet_naming_symbols.private_constants.required_modifiers = const
+dotnet_naming_symbols.private_constants.applicable_kinds = field
+dotnet_naming_rule.private_const_all_lower.severity = warning
+dotnet_naming_rule.private_const_all_lower.symbols = private_constants
+dotnet_naming_rule.private_const_all_lower.style = all_lower
+
+dotnet_naming_symbols.private_static_readonly.applicable_accessibilities = private
+dotnet_naming_symbols.private_static_readonly.required_modifiers = static,readonly
+dotnet_naming_symbols.private_static_readonly.applicable_kinds = field
+dotnet_naming_rule.private_static_readonly_all_lower.severity = warning
+dotnet_naming_rule.private_static_readonly_all_lower.symbols = private_static_readonly
+dotnet_naming_rule.private_static_readonly_all_lower.style = all_lower
+
+dotnet_naming_symbols.local_constants.applicable_kinds = local
+dotnet_naming_symbols.local_constants.required_modifiers = const
+dotnet_naming_rule.local_const_all_lower.severity = warning
+dotnet_naming_rule.local_const_all_lower.symbols = local_constants
+dotnet_naming_rule.local_const_all_lower.style = all_lower
+
+#ALL_UPPER for non private constants/static readonlys
+dotnet_naming_style.all_upper.capitalization = all_upper
+dotnet_naming_style.all_upper.word_separator = _
+
+dotnet_naming_symbols.public_constants.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.public_constants.required_modifiers = const
+dotnet_naming_symbols.public_constants.applicable_kinds = field
+dotnet_naming_rule.public_const_all_upper.severity = warning
+dotnet_naming_rule.public_const_all_upper.symbols = public_constants
+dotnet_naming_rule.public_const_all_upper.style = all_upper
+
+dotnet_naming_symbols.public_static_readonly.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.public_static_readonly.required_modifiers = static,readonly
+dotnet_naming_symbols.public_static_readonly.applicable_kinds = field
+dotnet_naming_rule.public_static_readonly_all_upper.severity = warning
+dotnet_naming_rule.public_static_readonly_all_upper.symbols = public_static_readonly
+dotnet_naming_rule.public_static_readonly_all_upper.style = all_upper
+
+#Roslyn formating options
+
+#Formatting - indentation options
+csharp_indent_case_contents = true
+csharp_indent_case_contents_when_block = false
+csharp_indent_labels = one_less_than_current
+csharp_indent_switch_labels = true
+
+#Formatting - new line options
+csharp_new_line_before_catch = true
+csharp_new_line_before_else = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_open_brace = all
+#csharp_new_line_before_members_in_anonymous_types = true
+#csharp_new_line_before_members_in_object_initializers = true # Currently no effect in VS/dotnet format (16.4), and makes Rider confusing
+csharp_new_line_between_query_expression_clauses = true
+
+#Formatting - organize using options
+dotnet_sort_system_directives_first = true
+
+#Formatting - spacing options
+csharp_space_after_cast = false
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+
+#Formatting - wrapping options
+csharp_preserve_single_line_blocks = true
+csharp_preserve_single_line_statements = true
+
+#Roslyn language styles
+
+#Style - this. qualification
+dotnet_style_qualification_for_field = false:warning
+dotnet_style_qualification_for_property = false:warning
+dotnet_style_qualification_for_method = false:warning
+dotnet_style_qualification_for_event = false:warning
+
+#Style - type names
+dotnet_style_predefined_type_for_locals_parameters_members = true:warning
+dotnet_style_predefined_type_for_member_access = true:warning
+csharp_style_var_when_type_is_apparent = true:none
+csharp_style_var_for_built_in_types = true:none
+csharp_style_var_elsewhere = true:silent
+
+#Style - modifiers
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:warning
+csharp_preferred_modifier_order = public,private,protected,internal,new,abstract,virtual,sealed,override,static,readonly,extern,unsafe,volatile,async:warning
+
+#Style - parentheses
+# Skipped because roslyn cannot separate +-*/ with << >>
+
+#Style - expression bodies
+csharp_style_expression_bodied_accessors = true:warning
+csharp_style_expression_bodied_constructors = false:none
+csharp_style_expression_bodied_indexers = true:warning
+csharp_style_expression_bodied_methods = false:silent
+csharp_style_expression_bodied_operators = true:warning
+csharp_style_expression_bodied_properties = true:warning
+csharp_style_expression_bodied_local_functions = true:silent
+
+#Style - expression preferences
+dotnet_style_object_initializer = true:warning
+dotnet_style_collection_initializer = true:warning
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:warning
+dotnet_style_prefer_auto_properties = true:warning
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+dotnet_style_prefer_compound_assignment = true:warning
+
+#Style - null/type checks
+dotnet_style_coalesce_expression = true:warning
+dotnet_style_null_propagation = true:warning
+csharp_style_pattern_matching_over_is_with_cast_check = true:warning
+csharp_style_pattern_matching_over_as_with_null_check = true:warning
+csharp_style_throw_expression = true:silent
+csharp_style_conditional_delegate_call = true:warning
+
+#Style - unused
+dotnet_style_readonly_field = true:silent
+dotnet_code_quality_unused_parameters = non_public:silent
+csharp_style_unused_value_expression_statement_preference = discard_variable:silent
+csharp_style_unused_value_assignment_preference = discard_variable:warning
+
+#Style - variable declaration
+csharp_style_inlined_variable_declaration = true:warning
+csharp_style_deconstructed_variable_declaration = true:warning
+
+#Style - other C# 7.x features
+dotnet_style_prefer_inferred_tuple_names = true:warning
+csharp_prefer_simple_default_expression = true:warning
+csharp_style_pattern_local_over_anonymous_function = true:warning
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
+
+#Style - C# 8 features
+csharp_prefer_static_local_function = true:warning
+csharp_prefer_simple_using_statement = true:silent
+csharp_style_prefer_index_operator = true:warning
+csharp_style_prefer_range_operator = true:warning
+csharp_style_prefer_switch_expression = false:none
+
+#Supressing roslyn built-in analyzers
+# Suppress: EC112
+
+#Private method is unused
+dotnet_diagnostic.IDE0051.severity = silent
+#Private member is unused
+dotnet_diagnostic.IDE0052.severity = silent
+
+#Rules for disposable
+dotnet_diagnostic.IDE0067.severity = none
+dotnet_diagnostic.IDE0068.severity = none
+dotnet_diagnostic.IDE0069.severity = none
+
+#Disable operator overloads requiring alternate named methods
+dotnet_diagnostic.CA2225.severity = none
+
+# Banned APIs
+dotnet_diagnostic.RS0030.severity = error
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.sln.DotSettings b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.sln.DotSettings
index 190a1046f5..aa8f8739c1 100644
--- a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.sln.DotSettings
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.sln.DotSettings
@@ -12,14 +12,15 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeLocalFunctionBody/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeMethodOrOperatorBody/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeModifiersOrder/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue"></s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue">WARNING</s:String>
 	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexRemoved">True</s:Boolean>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeMemberModifiers/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeModifiers/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignedValueIsNeverUsed/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignmentIsFullyDiscarded/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignNullToNotNullAttribute/@EntryIndexedValue">HINT</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002EGlobal/@EntryIndexedValue">HINT</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002EGlobal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadAttributeBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadBracesSpaces/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadChildStatementIndent/@EntryIndexedValue">WARNING</s:String>
@@ -29,7 +30,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadControlBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadDeclarationBracesIndent/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadDeclarationBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadPippidonScrollingBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadEmptyBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadExpressionBracesIndent/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadExpressionBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadGenericBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
@@ -59,22 +60,35 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertClosureToMethodGroup/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfDoToWhile/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToConditionalTernaryExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToNullCoalescingAssignment/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToNullCoalescingExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfToOrExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertNullableToShortForm/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertPropertyToExpressionBody/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoProperty/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoProperty/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoPropertyWhenPossible/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoPropertyWithPrivateSetter/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToConstant_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLambdaExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLocalFunction/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToStaticClass/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToUsingDeclaration/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=DoubleNegationOperator/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PippidonScrollingGeneralCatchClause/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EmptyGeneralCatchClause/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceDoWhileStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceFixedStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceForeachStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceForStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceIfStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceLockStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceUsingStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceWhileStatementBraces/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EventNeverSubscribedTo_002EGlobal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EventNeverSubscribedTo_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ForCanBeConvertedToForeach/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ForStatementConditionIsTrue/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=IdentifierTypo/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ImpureMethodCallOnReadonlyValueField/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InconsistentNaming/@EntryIndexedValue">ERROR</s:String>
@@ -92,6 +106,9 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeCastWithTypeCheck/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeConditionalExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeSequentialChecks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeSequentialPatterns/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodHasAsyncOverload/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodHasAsyncOverloadWithCancellation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodSupportsCancellation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingBlankLines/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingIndent/@EntryIndexedValue">WARNING</s:String>
@@ -107,6 +124,7 @@
 	<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/=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>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PrivateVariableCanBeMadeReadonly/@EntryIndexedValue">WARNING</s:String>
@@ -120,11 +138,12 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInAttributeList/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInEnumDeclaration/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInInitializer/@EntryIndexedValue">DO_NOT_SHOW</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantPippidonScrollingObjectCreationArgumentList/@EntryIndexedValue">WARNING</s:String>
-	
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantEmptyObjectCreationArgumentList/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantExplicitParamsArrayCreation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantImmediateDelegateInvocation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLambdaSignatureParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantReadonlyModifier/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantTypeSpecificationInDefaultExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLinebreak/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantSpace/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantUsingDirective/@EntryIndexedValue">ERROR</s:String>
@@ -171,7 +190,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToAny/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToCount/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirst/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirstOrDefault/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirstOrDefault/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToLast/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToLastOrDefault/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToSingle/@EntryIndexedValue">WARNING</s:String>
@@ -181,7 +200,10 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E3/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SeparateControlTransferStatement/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringEndsWithIsCultureSpecific/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringLiteralTypo/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringStartsWithIsCultureSpecific/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StructCanBeMadeReadOnly/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FBuiltInTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FSimpleTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SwitchStatementMissingSomeCases/@EntryIndexedValue">DO_NOT_SHOW</s:String>
@@ -199,12 +221,16 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMember_002ELocal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002EGlobal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002ELocal/@EntryIndexedValue">HINT</s:String>
-	
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedParameter_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedParameter_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedType_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseAwaitUsing/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseCollectionCountProperty/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInFormatString/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseIndexFromEndExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNameofExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNameOfInsteadOfTypeOf/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexedValue"></s:String>
 	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexRemoved">True</s:Boolean>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNullPropagation/@EntryIndexedValue">WARNING</s:String>
@@ -216,11 +242,21 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002EGlobal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=WrongIndentSize/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Code_0020Cleanup_0020_0028peppy_0029/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Code Cleanup (peppy)"&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_EXPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;ALWAYS_EXPLICIT&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_EXPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="False" ArrangeTypeMemberAccessModifier="False" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="False" ArrangeBraces="False" ArrangeAttributes="False" ArrangeArgumentsStyle="False" /&gt;&lt;XAMLCollapsePippidonScrollingTags&gt;False&lt;/XAMLCollapsePippidonScrollingTags&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;/Profile&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Code_0020Cleanup_0020_0028peppy_0029/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Code Cleanup (peppy)"&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_EXPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;ALWAYS_EXPLICIT&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_EXPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="False" ArrangeTypeMemberAccessModifier="False" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="False" ArrangeBraces="False" ArrangeAttributes="False" ArrangeArgumentsStyle="False" /&gt;&lt;XAMLCollapseEmptyTags&gt;False&lt;/XAMLCollapseEmptyTags&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;/Profile&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeCleanup/RecentlyUsedProfile/@EntryValue">Code Cleanup (peppy)</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_DOWHILE/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FIXED/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOR/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOREACH/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_IFELSE/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_LOCK/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_USING/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_WHILE/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/DEFAULT_INTERNAL_MODIFIER/@EntryValue">Explicit</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/LOCAL_FUNCTION_BODY/@EntryValue">ExpressionBody</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/METHOD_OR_OPERATOR_BODY/@EntryValue">ExpressionBody</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/METHOD_OR_OPERATOR_BODY/@EntryValue">BlockBody</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/USE_HEURISTICS_FOR_BODY_STYLE/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ACCESSOR_DECLARATION_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_LINQ_QUERY/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_CALLS_CHAIN/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_EXTENDS_LIST/@EntryValue">True</s:Boolean>
@@ -232,14 +268,24 @@
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ANONYMOUS_METHOD_DECLARATION_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BEFORE_BLOCK_STATEMENTS/@EntryValue">1</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BEFORE_CASE/@EntryValue">1</s:Int64>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/CASE_BLOCK_BRACES/@EntryValue">NEXT_LINE</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/EMPTY_BLOCK_STYLE/@EntryValue">MULTILINE</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_FOR_STMT/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_FOREACH_STMT/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_LOCK_STMT/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_WHILE_STMT/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INITIALIZER_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_CODE/@EntryValue">1</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue">1</s:Int64>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/LINE_FEED_AT_FILE_END/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/OTHER_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CATCH_ON_NEW_LINE/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ELSE_ON_NEW_LINE/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_WHILE_ON_NEW_LINE/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AROUND_MULTIPLICATIVE_OP/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_SIZEOF_PARENTHESES/@EntryValue">False</s:Boolean>
@@ -247,6 +293,7 @@
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHING_EMPTY_BRACES/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/STICK_COMMENT/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_AFTER_DECLARATION_LPAR/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_ARRAY_INITIALIZER_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_BINARY_OPSIGN/@EntryValue">True</s:Boolean>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">200</s:Int64>
@@ -260,9 +307,11 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GL/@EntryIndexedValue">GL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GLSL/@EntryIndexedValue">GLSL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HID/@EntryIndexedValue">HID</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HTML/@EntryIndexedValue">HTML</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HUD/@EntryIndexedValue">HUD</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IL/@EntryIndexedValue">IL</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IOS/@EntryIndexedValue">IOS</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IPC/@EntryIndexedValue">IPC</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JIT/@EntryIndexedValue">JIT</s:String>
@@ -276,397 +325,397 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SHA/@EntryIndexedValue">SHA</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SRGB/@EntryIndexedValue">SRGB</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TK/@EntryIndexedValue">TK</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SS/@EntryIndexedValue">SS</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PP/@EntryIndexedValue">PP</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GMT/@EntryIndexedValue">GMT</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=QAT/@EntryIndexedValue">QAT</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BNG/@EntryIndexedValue">BNG</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SS/@EntryIndexedValue">SS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PP/@EntryIndexedValue">PP</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GMT/@EntryIndexedValue">GMT</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=QAT/@EntryIndexedValue">QAT</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BNG/@EntryIndexedValue">BNG</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UI/@EntryIndexedValue">UI</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpNaming/ApplyAutoDetectedRules/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeStyle/CSharpFileLayoutPatterns/Pattern/@EntryValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&#xD;
 &lt;Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"&gt;&#xD;
-  &lt;TypePattern DisplayName="COM interfaces or structs"&gt;&#xD;
-    &lt;TypePattern.Match&gt;&#xD;
-      &lt;Or&gt;&#xD;
-        &lt;And&gt;&#xD;
-          &lt;Kind Is="Interface" /&gt;&#xD;
-          &lt;Or&gt;&#xD;
-            &lt;HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /&gt;&#xD;
-            &lt;HasAttribute Name="System.Runtime.InteropServices.ComImport" /&gt;&#xD;
-          &lt;/Or&gt;&#xD;
-        &lt;/And&gt;&#xD;
-        &lt;Kind Is="Struct" /&gt;&#xD;
-      &lt;/Or&gt;&#xD;
-    &lt;/TypePattern.Match&gt;&#xD;
-  &lt;/TypePattern&gt;&#xD;
-  &lt;TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"&gt;&#xD;
-    &lt;TypePattern.Match&gt;&#xD;
-      &lt;And&gt;&#xD;
-        &lt;Kind Is="Class" /&gt;&#xD;
-        &lt;HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /&gt;&#xD;
-      &lt;/And&gt;&#xD;
-    &lt;/TypePattern.Match&gt;&#xD;
-    &lt;Entry DisplayName="Setup/Teardown Methods"&gt;&#xD;
-      &lt;Entry.Match&gt;&#xD;
-        &lt;And&gt;&#xD;
-          &lt;Kind Is="Method" /&gt;&#xD;
-          &lt;Or&gt;&#xD;
-            &lt;HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /&gt;&#xD;
-            &lt;HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /&gt;&#xD;
-            &lt;HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="True" /&gt;&#xD;
-            &lt;HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="True" /&gt;&#xD;
-          &lt;/Or&gt;&#xD;
-        &lt;/And&gt;&#xD;
-      &lt;/Entry.Match&gt;&#xD;
-    &lt;/Entry&gt;&#xD;
-    &lt;Entry DisplayName="All other members" /&gt;&#xD;
-    &lt;Entry Priority="100" DisplayName="Test Methods"&gt;&#xD;
-      &lt;Entry.Match&gt;&#xD;
-        &lt;And&gt;&#xD;
-          &lt;Kind Is="Method" /&gt;&#xD;
-          &lt;HasAttribute Name="NUnit.Framework.TestAttribute" /&gt;&#xD;
-        &lt;/And&gt;&#xD;
-      &lt;/Entry.Match&gt;&#xD;
-      &lt;Entry.SortBy&gt;&#xD;
-        &lt;Name /&gt;&#xD;
-      &lt;/Entry.SortBy&gt;&#xD;
-    &lt;/Entry&gt;&#xD;
-  &lt;/TypePattern&gt;&#xD;
-  &lt;TypePattern DisplayName="Default Pattern"&gt;&#xD;
-    &lt;Group DisplayName="Fields/Properties"&gt;&#xD;
-      &lt;Group DisplayName="Public Fields"&gt;&#xD;
-        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Kind Is="Constant" /&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-                &lt;And&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/And&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Or&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/Or&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Entry DisplayName="Public Properties"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;And&gt;&#xD;
-            &lt;Access Is="Public" /&gt;&#xD;
-            &lt;Kind Is="Property" /&gt;&#xD;
-          &lt;/And&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-      &lt;Group DisplayName="Internal Fields"&gt;&#xD;
-        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Kind Is="Constant" /&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-                &lt;And&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/And&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Or&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/Or&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Entry DisplayName="Internal Properties"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;And&gt;&#xD;
-            &lt;Access Is="Internal" /&gt;&#xD;
-            &lt;Kind Is="Property" /&gt;&#xD;
-          &lt;/And&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-      &lt;Group DisplayName="Protected Fields"&gt;&#xD;
-        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Kind Is="Constant" /&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-                &lt;And&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/And&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Or&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/Or&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Entry DisplayName="Protected Properties"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;And&gt;&#xD;
-            &lt;Access Is="Protected" /&gt;&#xD;
-            &lt;Kind Is="Property" /&gt;&#xD;
-          &lt;/And&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-      &lt;Group DisplayName="Private Fields"&gt;&#xD;
-        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Kind Is="Constant" /&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-                &lt;And&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/And&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Or&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/Or&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Entry DisplayName="Private Properties"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;And&gt;&#xD;
-            &lt;Access Is="Private" /&gt;&#xD;
-            &lt;Kind Is="Property" /&gt;&#xD;
-          &lt;/And&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-    &lt;/Group&gt;&#xD;
-    &lt;Group DisplayName="Constructor/Destructor"&gt;&#xD;
-      &lt;Entry DisplayName="Ctor"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;Kind Is="Constructor" /&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-      &lt;Region Name="Disposal"&gt;&#xD;
-        &lt;Entry DisplayName="Dtor"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;Kind Is="Destructor" /&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Dispose()"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-              &lt;Name Is="Dispose" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Dispose(true)"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Virtual /&gt;&#xD;
-                &lt;Override /&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-              &lt;Name Is="Dispose" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Region&gt;&#xD;
-    &lt;/Group&gt;&#xD;
-    &lt;Group DisplayName="Methods"&gt;&#xD;
-      &lt;Group DisplayName="Public"&gt;&#xD;
-        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Static /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Group DisplayName="Internal"&gt;&#xD;
-        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Static /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Group DisplayName="Protected"&gt;&#xD;
-        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Static /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Group DisplayName="Private"&gt;&#xD;
-        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Static /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-    &lt;/Group&gt;&#xD;
-  &lt;/TypePattern&gt;&#xD;
+	&lt;TypePattern DisplayName="COM interfaces or structs"&gt;&#xD;
+	&lt;TypePattern.Match&gt;&#xD;
+		&lt;Or&gt;&#xD;
+		&lt;And&gt;&#xD;
+			&lt;Kind Is="Interface" /&gt;&#xD;
+			&lt;Or&gt;&#xD;
+			&lt;HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /&gt;&#xD;
+			&lt;HasAttribute Name="System.Runtime.InteropServices.ComImport" /&gt;&#xD;
+			&lt;/Or&gt;&#xD;
+		&lt;/And&gt;&#xD;
+		&lt;Kind Is="Struct" /&gt;&#xD;
+		&lt;/Or&gt;&#xD;
+	&lt;/TypePattern.Match&gt;&#xD;
+	&lt;/TypePattern&gt;&#xD;
+	&lt;TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"&gt;&#xD;
+	&lt;TypePattern.Match&gt;&#xD;
+		&lt;And&gt;&#xD;
+		&lt;Kind Is="Class" /&gt;&#xD;
+		&lt;HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /&gt;&#xD;
+		&lt;/And&gt;&#xD;
+	&lt;/TypePattern.Match&gt;&#xD;
+	&lt;Entry DisplayName="Setup/Teardown Methods"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+		&lt;And&gt;&#xD;
+			&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;Or&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="True" /&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="True" /&gt;&#xD;
+			&lt;/Or&gt;&#xD;
+		&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+	&lt;/Entry&gt;&#xD;
+	&lt;Entry DisplayName="All other members" /&gt;&#xD;
+	&lt;Entry Priority="100" DisplayName="Test Methods"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+		&lt;And&gt;&#xD;
+			&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.TestAttribute" /&gt;&#xD;
+		&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;Entry.SortBy&gt;&#xD;
+		&lt;Name /&gt;&#xD;
+		&lt;/Entry.SortBy&gt;&#xD;
+	&lt;/Entry&gt;&#xD;
+	&lt;/TypePattern&gt;&#xD;
+	&lt;TypePattern DisplayName="Default Pattern"&gt;&#xD;
+	&lt;Group DisplayName="Fields/Properties"&gt;&#xD;
+		&lt;Group DisplayName="Public Fields"&gt;&#xD;
+		&lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Kind Is="Constant" /&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;And&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/And&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Static Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Or&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Entry DisplayName="Public Properties"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+			&lt;Access Is="Public" /&gt;&#xD;
+			&lt;Kind Is="Property" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Group DisplayName="Internal Fields"&gt;&#xD;
+		&lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Kind Is="Constant" /&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;And&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/And&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Static Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Or&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Entry DisplayName="Internal Properties"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+			&lt;Access Is="Internal" /&gt;&#xD;
+			&lt;Kind Is="Property" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Group DisplayName="Protected Fields"&gt;&#xD;
+		&lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Kind Is="Constant" /&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;And&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/And&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Static Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Or&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Entry DisplayName="Protected Properties"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+			&lt;Access Is="Protected" /&gt;&#xD;
+			&lt;Kind Is="Property" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Group DisplayName="Private Fields"&gt;&#xD;
+		&lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Kind Is="Constant" /&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;And&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/And&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Static Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Or&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Entry DisplayName="Private Properties"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+			&lt;Access Is="Private" /&gt;&#xD;
+			&lt;Kind Is="Property" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+	&lt;/Group&gt;&#xD;
+	&lt;Group DisplayName="Constructor/Destructor"&gt;&#xD;
+		&lt;Entry DisplayName="Ctor"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;Kind Is="Constructor" /&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Region Name="Disposal"&gt;&#xD;
+		&lt;Entry DisplayName="Dtor"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;Kind Is="Destructor" /&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Dispose()"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+				&lt;Name Is="Dispose" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Dispose(true)"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Virtual /&gt;&#xD;
+				&lt;Override /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+				&lt;Name Is="Dispose" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Region&gt;&#xD;
+	&lt;/Group&gt;&#xD;
+	&lt;Group DisplayName="Methods"&gt;&#xD;
+		&lt;Group DisplayName="Public"&gt;&#xD;
+		&lt;Entry DisplayName="Static Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Group DisplayName="Internal"&gt;&#xD;
+		&lt;Entry DisplayName="Static Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Group DisplayName="Protected"&gt;&#xD;
+		&lt;Entry DisplayName="Static Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Group DisplayName="Private"&gt;&#xD;
+		&lt;Entry DisplayName="Static Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+	&lt;/Group&gt;&#xD;
+	&lt;/TypePattern&gt;&#xD;
 &lt;/Patterns&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">Copyright (c) ppy Pty Ltd &lt;contact@ppy.sh&gt;. Licensed under the MIT Licence.&#xD;
 See the LICENCE file in the repository root for full licence text.&#xD;
@@ -726,6 +775,8 @@ See the LICENCE file in the repository root for full licence text.&#xD;
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=NAMESPACE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CustomTools/CustomToolsData/@EntryValue"></s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002EDaemon_002ESettings_002EMigration_002ESwaWarningsModeSettingsMigrate/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
@@ -736,6 +787,7 @@ See the LICENCE file in the repository root for full licence text.&#xD;
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/Environment/UnitTesting/NUnitProvider/SetCurrentDirectoryTo/@EntryValue">TestFolder</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Description/@EntryValue">o!f – Object Initializer: Anchor&amp;Origin</s:String>
@@ -761,7 +813,7 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Text/@EntryValue">InternalChildren = new Drawable[]
 {
-    $END$
+	$END$
 };</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -774,12 +826,12 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Text/@EntryValue">new GridContainer
 {
-    RelativeSizeAxes = Axes.Both,
-    Content = new[]
-    {
-        new Drawable[] { $END$ },
-        new Drawable[] { }
-    }
+	RelativeSizeAxes = Axes.Both,
+	Content = new[]
+	{
+		new Drawable[] { $END$ },
+		new Drawable[] { }
+	}
 };</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -792,12 +844,12 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Text/@EntryValue">new FillFlowContainer
 {
-    RelativeSizeAxes = Axes.Both,
-    Direction = FillDirection.Vertical,
-    Children = new Drawable[]
-    {
-        $END$
-    }
+	RelativeSizeAxes = Axes.Both,
+	Direction = FillDirection.Vertical,
+	Children = new Drawable[]
+	{
+		$END$
+	}
 },</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -810,11 +862,11 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Text/@EntryValue">new Container
 {
-    RelativeSizeAxes = Axes.Both,
-    Children = new Drawable[]
-    {
-        $END$
-    }
+	RelativeSizeAxes = Axes.Both,
+	Children = new Drawable[]
+	{
+		$END$
+	}
 },</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -828,7 +880,7 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Text/@EntryValue">[BackgroundDependencyLoader]
 private void load()
 {
-    $END$
+	$END$
 }</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -841,8 +893,8 @@ private void load()
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Text/@EntryValue">new Box
 {
-    Colour = Color4.Black,
-    RelativeSizeAxes = Axes.Both,
+	Colour = Color4.Black,
+	RelativeSizeAxes = Axes.Both,
 },</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -855,23 +907,28 @@ private void load()
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Text/@EntryValue">Children = new Drawable[]
 {
-    $END$
+	$END$
 };</s:String>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Beatmap/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=beatmaps/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=beatmap_0027s/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=bindable/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=bindables/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Catmull/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Drawables/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=gameplay/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=hitobject/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=hitobjects/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=keymods/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Kiai/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboard/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboards/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Playfield/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=playfields/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=resampler/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=ruleset/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=rulesets/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=ruleset_0027s/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Strongable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Taiko/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Unranked/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/.editorconfig b/Templates/Rulesets/ruleset-scrolling-empty/.editorconfig
index 24825b7c42..f3badda9b3 100644
--- a/Templates/Rulesets/ruleset-scrolling-empty/.editorconfig
+++ b/Templates/Rulesets/ruleset-scrolling-empty/.editorconfig
@@ -12,16 +12,189 @@ trim_trailing_whitespace = true
 
 #PascalCase for public and protected members
 dotnet_naming_style.pascalcase.capitalization = pascal_case
-dotnet_naming_symbols.public_members.applicable_accessibilities = public,internal,protected,protected_internal
-dotnet_naming_symbols.public_members.applicable_kinds = property,method,field,event,delegate
-dotnet_naming_rule.public_members_pascalcase.severity = suggestion
+dotnet_naming_symbols.public_members.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.public_members.applicable_kinds = property,method,field,event
+dotnet_naming_rule.public_members_pascalcase.severity = error
 dotnet_naming_rule.public_members_pascalcase.symbols = public_members
 dotnet_naming_rule.public_members_pascalcase.style = pascalcase
 
 #camelCase for private members
 dotnet_naming_style.camelcase.capitalization = camel_case
+
 dotnet_naming_symbols.private_members.applicable_accessibilities = private
-dotnet_naming_symbols.private_members.applicable_kinds = property,method,field,event,delegate
-dotnet_naming_rule.private_members_camelcase.severity = suggestion
+dotnet_naming_symbols.private_members.applicable_kinds = property,method,field,event
+dotnet_naming_rule.private_members_camelcase.severity = warning
 dotnet_naming_rule.private_members_camelcase.symbols = private_members
-dotnet_naming_rule.private_members_camelcase.style = camelcase
\ No newline at end of file
+dotnet_naming_rule.private_members_camelcase.style = camelcase
+
+dotnet_naming_symbols.local_function.applicable_kinds = local_function
+dotnet_naming_rule.local_function_camelcase.severity = warning
+dotnet_naming_rule.local_function_camelcase.symbols = local_function
+dotnet_naming_rule.local_function_camelcase.style = camelcase
+
+#all_lower for private and local constants/static readonlys
+dotnet_naming_style.all_lower.capitalization = all_lower
+dotnet_naming_style.all_lower.word_separator = _
+
+dotnet_naming_symbols.private_constants.applicable_accessibilities = private
+dotnet_naming_symbols.private_constants.required_modifiers = const
+dotnet_naming_symbols.private_constants.applicable_kinds = field
+dotnet_naming_rule.private_const_all_lower.severity = warning
+dotnet_naming_rule.private_const_all_lower.symbols = private_constants
+dotnet_naming_rule.private_const_all_lower.style = all_lower
+
+dotnet_naming_symbols.private_static_readonly.applicable_accessibilities = private
+dotnet_naming_symbols.private_static_readonly.required_modifiers = static,readonly
+dotnet_naming_symbols.private_static_readonly.applicable_kinds = field
+dotnet_naming_rule.private_static_readonly_all_lower.severity = warning
+dotnet_naming_rule.private_static_readonly_all_lower.symbols = private_static_readonly
+dotnet_naming_rule.private_static_readonly_all_lower.style = all_lower
+
+dotnet_naming_symbols.local_constants.applicable_kinds = local
+dotnet_naming_symbols.local_constants.required_modifiers = const
+dotnet_naming_rule.local_const_all_lower.severity = warning
+dotnet_naming_rule.local_const_all_lower.symbols = local_constants
+dotnet_naming_rule.local_const_all_lower.style = all_lower
+
+#ALL_UPPER for non private constants/static readonlys
+dotnet_naming_style.all_upper.capitalization = all_upper
+dotnet_naming_style.all_upper.word_separator = _
+
+dotnet_naming_symbols.public_constants.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.public_constants.required_modifiers = const
+dotnet_naming_symbols.public_constants.applicable_kinds = field
+dotnet_naming_rule.public_const_all_upper.severity = warning
+dotnet_naming_rule.public_const_all_upper.symbols = public_constants
+dotnet_naming_rule.public_const_all_upper.style = all_upper
+
+dotnet_naming_symbols.public_static_readonly.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.public_static_readonly.required_modifiers = static,readonly
+dotnet_naming_symbols.public_static_readonly.applicable_kinds = field
+dotnet_naming_rule.public_static_readonly_all_upper.severity = warning
+dotnet_naming_rule.public_static_readonly_all_upper.symbols = public_static_readonly
+dotnet_naming_rule.public_static_readonly_all_upper.style = all_upper
+
+#Roslyn formating options
+
+#Formatting - indentation options
+csharp_indent_case_contents = true
+csharp_indent_case_contents_when_block = false
+csharp_indent_labels = one_less_than_current
+csharp_indent_switch_labels = true
+
+#Formatting - new line options
+csharp_new_line_before_catch = true
+csharp_new_line_before_else = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_open_brace = all
+#csharp_new_line_before_members_in_anonymous_types = true
+#csharp_new_line_before_members_in_object_initializers = true # Currently no effect in VS/dotnet format (16.4), and makes Rider confusing
+csharp_new_line_between_query_expression_clauses = true
+
+#Formatting - organize using options
+dotnet_sort_system_directives_first = true
+
+#Formatting - spacing options
+csharp_space_after_cast = false
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+
+#Formatting - wrapping options
+csharp_preserve_single_line_blocks = true
+csharp_preserve_single_line_statements = true
+
+#Roslyn language styles
+
+#Style - this. qualification
+dotnet_style_qualification_for_field = false:warning
+dotnet_style_qualification_for_property = false:warning
+dotnet_style_qualification_for_method = false:warning
+dotnet_style_qualification_for_event = false:warning
+
+#Style - type names
+dotnet_style_predefined_type_for_locals_parameters_members = true:warning
+dotnet_style_predefined_type_for_member_access = true:warning
+csharp_style_var_when_type_is_apparent = true:none
+csharp_style_var_for_built_in_types = true:none
+csharp_style_var_elsewhere = true:silent
+
+#Style - modifiers
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:warning
+csharp_preferred_modifier_order = public,private,protected,internal,new,abstract,virtual,sealed,override,static,readonly,extern,unsafe,volatile,async:warning
+
+#Style - parentheses
+# Skipped because roslyn cannot separate +-*/ with << >>
+
+#Style - expression bodies
+csharp_style_expression_bodied_accessors = true:warning
+csharp_style_expression_bodied_constructors = false:none
+csharp_style_expression_bodied_indexers = true:warning
+csharp_style_expression_bodied_methods = false:silent
+csharp_style_expression_bodied_operators = true:warning
+csharp_style_expression_bodied_properties = true:warning
+csharp_style_expression_bodied_local_functions = true:silent
+
+#Style - expression preferences
+dotnet_style_object_initializer = true:warning
+dotnet_style_collection_initializer = true:warning
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:warning
+dotnet_style_prefer_auto_properties = true:warning
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+dotnet_style_prefer_compound_assignment = true:warning
+
+#Style - null/type checks
+dotnet_style_coalesce_expression = true:warning
+dotnet_style_null_propagation = true:warning
+csharp_style_pattern_matching_over_is_with_cast_check = true:warning
+csharp_style_pattern_matching_over_as_with_null_check = true:warning
+csharp_style_throw_expression = true:silent
+csharp_style_conditional_delegate_call = true:warning
+
+#Style - unused
+dotnet_style_readonly_field = true:silent
+dotnet_code_quality_unused_parameters = non_public:silent
+csharp_style_unused_value_expression_statement_preference = discard_variable:silent
+csharp_style_unused_value_assignment_preference = discard_variable:warning
+
+#Style - variable declaration
+csharp_style_inlined_variable_declaration = true:warning
+csharp_style_deconstructed_variable_declaration = true:warning
+
+#Style - other C# 7.x features
+dotnet_style_prefer_inferred_tuple_names = true:warning
+csharp_prefer_simple_default_expression = true:warning
+csharp_style_pattern_local_over_anonymous_function = true:warning
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
+
+#Style - C# 8 features
+csharp_prefer_static_local_function = true:warning
+csharp_prefer_simple_using_statement = true:silent
+csharp_style_prefer_index_operator = true:warning
+csharp_style_prefer_range_operator = true:warning
+csharp_style_prefer_switch_expression = false:none
+
+#Supressing roslyn built-in analyzers
+# Suppress: EC112
+
+#Private method is unused
+dotnet_diagnostic.IDE0051.severity = silent
+#Private member is unused
+dotnet_diagnostic.IDE0052.severity = silent
+
+#Rules for disposable
+dotnet_diagnostic.IDE0067.severity = none
+dotnet_diagnostic.IDE0068.severity = none
+dotnet_diagnostic.IDE0069.severity = none
+
+#Disable operator overloads requiring alternate named methods
+dotnet_diagnostic.CA2225.severity = none
+
+# Banned APIs
+dotnet_diagnostic.RS0030.severity = error
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.sln.DotSettings b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.sln.DotSettings
index 1ceac22be9..aa8f8739c1 100644
--- a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.sln.DotSettings
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.sln.DotSettings
@@ -12,14 +12,15 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeLocalFunctionBody/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeMethodOrOperatorBody/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeModifiersOrder/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue"></s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue">WARNING</s:String>
 	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexRemoved">True</s:Boolean>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeMemberModifiers/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeModifiers/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignedValueIsNeverUsed/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignmentIsFullyDiscarded/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignNullToNotNullAttribute/@EntryIndexedValue">HINT</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002EGlobal/@EntryIndexedValue">HINT</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002EGlobal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadAttributeBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadBracesSpaces/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadChildStatementIndent/@EntryIndexedValue">WARNING</s:String>
@@ -29,7 +30,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadControlBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadDeclarationBracesIndent/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadDeclarationBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadEmptyScrollingBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadEmptyBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadExpressionBracesIndent/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadExpressionBracesLineBreaks/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadGenericBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
@@ -59,22 +60,35 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertClosureToMethodGroup/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfDoToWhile/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToConditionalTernaryExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToNullCoalescingAssignment/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToNullCoalescingExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfToOrExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertNullableToShortForm/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertPropertyToExpressionBody/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoProperty/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoProperty/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoPropertyWhenPossible/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoPropertyWithPrivateSetter/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToConstant_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLambdaExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLocalFunction/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToStaticClass/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToUsingDeclaration/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=DoubleNegationOperator/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EmptyScrollingGeneralCatchClause/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EmptyGeneralCatchClause/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceDoWhileStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceFixedStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceForeachStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceForStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceIfStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceLockStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceUsingStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceWhileStatementBraces/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EventNeverSubscribedTo_002EGlobal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EventNeverSubscribedTo_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ForCanBeConvertedToForeach/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ForStatementConditionIsTrue/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=IdentifierTypo/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ImpureMethodCallOnReadonlyValueField/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InconsistentNaming/@EntryIndexedValue">ERROR</s:String>
@@ -92,6 +106,9 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeCastWithTypeCheck/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeConditionalExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeSequentialChecks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeSequentialPatterns/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodHasAsyncOverload/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodHasAsyncOverloadWithCancellation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodSupportsCancellation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingBlankLines/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingIndent/@EntryIndexedValue">WARNING</s:String>
@@ -107,6 +124,7 @@
 	<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/=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>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PrivateVariableCanBeMadeReadonly/@EntryIndexedValue">WARNING</s:String>
@@ -120,11 +138,12 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInAttributeList/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInEnumDeclaration/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInInitializer/@EntryIndexedValue">DO_NOT_SHOW</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantEmptyScrollingObjectCreationArgumentList/@EntryIndexedValue">WARNING</s:String>
-	
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantEmptyObjectCreationArgumentList/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantExplicitParamsArrayCreation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantImmediateDelegateInvocation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLambdaSignatureParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantReadonlyModifier/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantTypeSpecificationInDefaultExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLinebreak/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantSpace/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantUsingDirective/@EntryIndexedValue">ERROR</s:String>
@@ -171,7 +190,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToAny/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToCount/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirst/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirstOrDefault/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirstOrDefault/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToLast/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToLastOrDefault/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToSingle/@EntryIndexedValue">WARNING</s:String>
@@ -181,7 +200,10 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E3/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SeparateControlTransferStatement/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringEndsWithIsCultureSpecific/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringLiteralTypo/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringStartsWithIsCultureSpecific/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StructCanBeMadeReadOnly/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FBuiltInTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FSimpleTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SwitchStatementMissingSomeCases/@EntryIndexedValue">DO_NOT_SHOW</s:String>
@@ -199,12 +221,16 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMember_002ELocal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002EGlobal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002ELocal/@EntryIndexedValue">HINT</s:String>
-	
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedParameter_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedParameter_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedType_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseAwaitUsing/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseCollectionCountProperty/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInFormatString/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseIndexFromEndExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNameofExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNameOfInsteadOfTypeOf/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexedValue"></s:String>
 	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexRemoved">True</s:Boolean>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNullPropagation/@EntryIndexedValue">WARNING</s:String>
@@ -216,11 +242,21 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002EGlobal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=WrongIndentSize/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Code_0020Cleanup_0020_0028peppy_0029/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Code Cleanup (peppy)"&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_EXPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;ALWAYS_EXPLICIT&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_EXPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="False" ArrangeTypeMemberAccessModifier="False" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="False" ArrangeBraces="False" ArrangeAttributes="False" ArrangeArgumentsStyle="False" /&gt;&lt;XAMLCollapseEmptyScrollingTags&gt;False&lt;/XAMLCollapseEmptyScrollingTags&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;/Profile&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Code_0020Cleanup_0020_0028peppy_0029/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Code Cleanup (peppy)"&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_EXPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;ALWAYS_EXPLICIT&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_EXPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="False" ArrangeTypeMemberAccessModifier="False" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="False" ArrangeBraces="False" ArrangeAttributes="False" ArrangeArgumentsStyle="False" /&gt;&lt;XAMLCollapseEmptyTags&gt;False&lt;/XAMLCollapseEmptyTags&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;/Profile&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeCleanup/RecentlyUsedProfile/@EntryValue">Code Cleanup (peppy)</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_DOWHILE/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FIXED/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOR/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOREACH/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_IFELSE/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_LOCK/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_USING/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_WHILE/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/DEFAULT_INTERNAL_MODIFIER/@EntryValue">Explicit</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/LOCAL_FUNCTION_BODY/@EntryValue">ExpressionBody</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/METHOD_OR_OPERATOR_BODY/@EntryValue">ExpressionBody</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/METHOD_OR_OPERATOR_BODY/@EntryValue">BlockBody</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/USE_HEURISTICS_FOR_BODY_STYLE/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ACCESSOR_DECLARATION_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_LINQ_QUERY/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_CALLS_CHAIN/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_EXTENDS_LIST/@EntryValue">True</s:Boolean>
@@ -232,14 +268,24 @@
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ANONYMOUS_METHOD_DECLARATION_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BEFORE_BLOCK_STATEMENTS/@EntryValue">1</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BEFORE_CASE/@EntryValue">1</s:Int64>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/CASE_BLOCK_BRACES/@EntryValue">NEXT_LINE</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/EMPTY_BLOCK_STYLE/@EntryValue">MULTILINE</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_FOR_STMT/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_FOREACH_STMT/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_LOCK_STMT/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_WHILE_STMT/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INITIALIZER_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_CODE/@EntryValue">1</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue">1</s:Int64>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/LINE_FEED_AT_FILE_END/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/OTHER_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CATCH_ON_NEW_LINE/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ELSE_ON_NEW_LINE/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_WHILE_ON_NEW_LINE/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AROUND_MULTIPLICATIVE_OP/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_SIZEOF_PARENTHESES/@EntryValue">False</s:Boolean>
@@ -247,6 +293,7 @@
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHING_EMPTY_BRACES/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/STICK_COMMENT/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_AFTER_DECLARATION_LPAR/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_ARRAY_INITIALIZER_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_BINARY_OPSIGN/@EntryValue">True</s:Boolean>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">200</s:Int64>
@@ -260,9 +307,11 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GL/@EntryIndexedValue">GL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GLSL/@EntryIndexedValue">GLSL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HID/@EntryIndexedValue">HID</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HTML/@EntryIndexedValue">HTML</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HUD/@EntryIndexedValue">HUD</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IL/@EntryIndexedValue">IL</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IOS/@EntryIndexedValue">IOS</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IPC/@EntryIndexedValue">IPC</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JIT/@EntryIndexedValue">JIT</s:String>
@@ -276,397 +325,397 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SHA/@EntryIndexedValue">SHA</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SRGB/@EntryIndexedValue">SRGB</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TK/@EntryIndexedValue">TK</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SS/@EntryIndexedValue">SS</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PP/@EntryIndexedValue">PP</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GMT/@EntryIndexedValue">GMT</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=QAT/@EntryIndexedValue">QAT</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BNG/@EntryIndexedValue">BNG</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SS/@EntryIndexedValue">SS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PP/@EntryIndexedValue">PP</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GMT/@EntryIndexedValue">GMT</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=QAT/@EntryIndexedValue">QAT</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BNG/@EntryIndexedValue">BNG</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UI/@EntryIndexedValue">UI</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpNaming/ApplyAutoDetectedRules/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeStyle/CSharpFileLayoutPatterns/Pattern/@EntryValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&#xD;
 &lt;Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"&gt;&#xD;
-  &lt;TypePattern DisplayName="COM interfaces or structs"&gt;&#xD;
-    &lt;TypePattern.Match&gt;&#xD;
-      &lt;Or&gt;&#xD;
-        &lt;And&gt;&#xD;
-          &lt;Kind Is="Interface" /&gt;&#xD;
-          &lt;Or&gt;&#xD;
-            &lt;HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /&gt;&#xD;
-            &lt;HasAttribute Name="System.Runtime.InteropServices.ComImport" /&gt;&#xD;
-          &lt;/Or&gt;&#xD;
-        &lt;/And&gt;&#xD;
-        &lt;Kind Is="Struct" /&gt;&#xD;
-      &lt;/Or&gt;&#xD;
-    &lt;/TypePattern.Match&gt;&#xD;
-  &lt;/TypePattern&gt;&#xD;
-  &lt;TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"&gt;&#xD;
-    &lt;TypePattern.Match&gt;&#xD;
-      &lt;And&gt;&#xD;
-        &lt;Kind Is="Class" /&gt;&#xD;
-        &lt;HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /&gt;&#xD;
-      &lt;/And&gt;&#xD;
-    &lt;/TypePattern.Match&gt;&#xD;
-    &lt;Entry DisplayName="Setup/Teardown Methods"&gt;&#xD;
-      &lt;Entry.Match&gt;&#xD;
-        &lt;And&gt;&#xD;
-          &lt;Kind Is="Method" /&gt;&#xD;
-          &lt;Or&gt;&#xD;
-            &lt;HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /&gt;&#xD;
-            &lt;HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /&gt;&#xD;
-            &lt;HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="True" /&gt;&#xD;
-            &lt;HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="True" /&gt;&#xD;
-          &lt;/Or&gt;&#xD;
-        &lt;/And&gt;&#xD;
-      &lt;/Entry.Match&gt;&#xD;
-    &lt;/Entry&gt;&#xD;
-    &lt;Entry DisplayName="All other members" /&gt;&#xD;
-    &lt;Entry Priority="100" DisplayName="Test Methods"&gt;&#xD;
-      &lt;Entry.Match&gt;&#xD;
-        &lt;And&gt;&#xD;
-          &lt;Kind Is="Method" /&gt;&#xD;
-          &lt;HasAttribute Name="NUnit.Framework.TestAttribute" /&gt;&#xD;
-        &lt;/And&gt;&#xD;
-      &lt;/Entry.Match&gt;&#xD;
-      &lt;Entry.SortBy&gt;&#xD;
-        &lt;Name /&gt;&#xD;
-      &lt;/Entry.SortBy&gt;&#xD;
-    &lt;/Entry&gt;&#xD;
-  &lt;/TypePattern&gt;&#xD;
-  &lt;TypePattern DisplayName="Default Pattern"&gt;&#xD;
-    &lt;Group DisplayName="Fields/Properties"&gt;&#xD;
-      &lt;Group DisplayName="Public Fields"&gt;&#xD;
-        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Kind Is="Constant" /&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-                &lt;And&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/And&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Or&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/Or&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Entry DisplayName="Public Properties"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;And&gt;&#xD;
-            &lt;Access Is="Public" /&gt;&#xD;
-            &lt;Kind Is="Property" /&gt;&#xD;
-          &lt;/And&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-      &lt;Group DisplayName="Internal Fields"&gt;&#xD;
-        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Kind Is="Constant" /&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-                &lt;And&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/And&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Or&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/Or&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Entry DisplayName="Internal Properties"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;And&gt;&#xD;
-            &lt;Access Is="Internal" /&gt;&#xD;
-            &lt;Kind Is="Property" /&gt;&#xD;
-          &lt;/And&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-      &lt;Group DisplayName="Protected Fields"&gt;&#xD;
-        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Kind Is="Constant" /&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-                &lt;And&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/And&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Or&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/Or&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Entry DisplayName="Protected Properties"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;And&gt;&#xD;
-            &lt;Access Is="Protected" /&gt;&#xD;
-            &lt;Kind Is="Property" /&gt;&#xD;
-          &lt;/And&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-      &lt;Group DisplayName="Private Fields"&gt;&#xD;
-        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Kind Is="Constant" /&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-                &lt;And&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/And&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Or&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/Or&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Entry DisplayName="Private Properties"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;And&gt;&#xD;
-            &lt;Access Is="Private" /&gt;&#xD;
-            &lt;Kind Is="Property" /&gt;&#xD;
-          &lt;/And&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-    &lt;/Group&gt;&#xD;
-    &lt;Group DisplayName="Constructor/Destructor"&gt;&#xD;
-      &lt;Entry DisplayName="Ctor"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;Kind Is="Constructor" /&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-      &lt;Region Name="Disposal"&gt;&#xD;
-        &lt;Entry DisplayName="Dtor"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;Kind Is="Destructor" /&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Dispose()"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-              &lt;Name Is="Dispose" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Dispose(true)"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Virtual /&gt;&#xD;
-                &lt;Override /&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-              &lt;Name Is="Dispose" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Region&gt;&#xD;
-    &lt;/Group&gt;&#xD;
-    &lt;Group DisplayName="Methods"&gt;&#xD;
-      &lt;Group DisplayName="Public"&gt;&#xD;
-        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Static /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Group DisplayName="Internal"&gt;&#xD;
-        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Static /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Group DisplayName="Protected"&gt;&#xD;
-        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Static /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Group DisplayName="Private"&gt;&#xD;
-        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Static /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-    &lt;/Group&gt;&#xD;
-  &lt;/TypePattern&gt;&#xD;
+	&lt;TypePattern DisplayName="COM interfaces or structs"&gt;&#xD;
+	&lt;TypePattern.Match&gt;&#xD;
+		&lt;Or&gt;&#xD;
+		&lt;And&gt;&#xD;
+			&lt;Kind Is="Interface" /&gt;&#xD;
+			&lt;Or&gt;&#xD;
+			&lt;HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /&gt;&#xD;
+			&lt;HasAttribute Name="System.Runtime.InteropServices.ComImport" /&gt;&#xD;
+			&lt;/Or&gt;&#xD;
+		&lt;/And&gt;&#xD;
+		&lt;Kind Is="Struct" /&gt;&#xD;
+		&lt;/Or&gt;&#xD;
+	&lt;/TypePattern.Match&gt;&#xD;
+	&lt;/TypePattern&gt;&#xD;
+	&lt;TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"&gt;&#xD;
+	&lt;TypePattern.Match&gt;&#xD;
+		&lt;And&gt;&#xD;
+		&lt;Kind Is="Class" /&gt;&#xD;
+		&lt;HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /&gt;&#xD;
+		&lt;/And&gt;&#xD;
+	&lt;/TypePattern.Match&gt;&#xD;
+	&lt;Entry DisplayName="Setup/Teardown Methods"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+		&lt;And&gt;&#xD;
+			&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;Or&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="True" /&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="True" /&gt;&#xD;
+			&lt;/Or&gt;&#xD;
+		&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+	&lt;/Entry&gt;&#xD;
+	&lt;Entry DisplayName="All other members" /&gt;&#xD;
+	&lt;Entry Priority="100" DisplayName="Test Methods"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+		&lt;And&gt;&#xD;
+			&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.TestAttribute" /&gt;&#xD;
+		&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;Entry.SortBy&gt;&#xD;
+		&lt;Name /&gt;&#xD;
+		&lt;/Entry.SortBy&gt;&#xD;
+	&lt;/Entry&gt;&#xD;
+	&lt;/TypePattern&gt;&#xD;
+	&lt;TypePattern DisplayName="Default Pattern"&gt;&#xD;
+	&lt;Group DisplayName="Fields/Properties"&gt;&#xD;
+		&lt;Group DisplayName="Public Fields"&gt;&#xD;
+		&lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Kind Is="Constant" /&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;And&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/And&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Static Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Or&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Entry DisplayName="Public Properties"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+			&lt;Access Is="Public" /&gt;&#xD;
+			&lt;Kind Is="Property" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Group DisplayName="Internal Fields"&gt;&#xD;
+		&lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Kind Is="Constant" /&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;And&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/And&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Static Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Or&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Entry DisplayName="Internal Properties"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+			&lt;Access Is="Internal" /&gt;&#xD;
+			&lt;Kind Is="Property" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Group DisplayName="Protected Fields"&gt;&#xD;
+		&lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Kind Is="Constant" /&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;And&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/And&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Static Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Or&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Entry DisplayName="Protected Properties"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+			&lt;Access Is="Protected" /&gt;&#xD;
+			&lt;Kind Is="Property" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Group DisplayName="Private Fields"&gt;&#xD;
+		&lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Kind Is="Constant" /&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;And&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/And&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Static Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Or&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Entry DisplayName="Private Properties"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+			&lt;Access Is="Private" /&gt;&#xD;
+			&lt;Kind Is="Property" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+	&lt;/Group&gt;&#xD;
+	&lt;Group DisplayName="Constructor/Destructor"&gt;&#xD;
+		&lt;Entry DisplayName="Ctor"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;Kind Is="Constructor" /&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Region Name="Disposal"&gt;&#xD;
+		&lt;Entry DisplayName="Dtor"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;Kind Is="Destructor" /&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Dispose()"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+				&lt;Name Is="Dispose" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Dispose(true)"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Virtual /&gt;&#xD;
+				&lt;Override /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+				&lt;Name Is="Dispose" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Region&gt;&#xD;
+	&lt;/Group&gt;&#xD;
+	&lt;Group DisplayName="Methods"&gt;&#xD;
+		&lt;Group DisplayName="Public"&gt;&#xD;
+		&lt;Entry DisplayName="Static Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Group DisplayName="Internal"&gt;&#xD;
+		&lt;Entry DisplayName="Static Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Group DisplayName="Protected"&gt;&#xD;
+		&lt;Entry DisplayName="Static Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Group DisplayName="Private"&gt;&#xD;
+		&lt;Entry DisplayName="Static Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+	&lt;/Group&gt;&#xD;
+	&lt;/TypePattern&gt;&#xD;
 &lt;/Patterns&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">Copyright (c) ppy Pty Ltd &lt;contact@ppy.sh&gt;. Licensed under the MIT Licence.&#xD;
 See the LICENCE file in the repository root for full licence text.&#xD;
@@ -726,6 +775,8 @@ See the LICENCE file in the repository root for full licence text.&#xD;
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=NAMESPACE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CustomTools/CustomToolsData/@EntryValue"></s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002EDaemon_002ESettings_002EMigration_002ESwaWarningsModeSettingsMigrate/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
@@ -736,6 +787,7 @@ See the LICENCE file in the repository root for full licence text.&#xD;
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/Environment/UnitTesting/NUnitProvider/SetCurrentDirectoryTo/@EntryValue">TestFolder</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Description/@EntryValue">o!f – Object Initializer: Anchor&amp;Origin</s:String>
@@ -761,7 +813,7 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Text/@EntryValue">InternalChildren = new Drawable[]
 {
-    $END$
+	$END$
 };</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -774,12 +826,12 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Text/@EntryValue">new GridContainer
 {
-    RelativeSizeAxes = Axes.Both,
-    Content = new[]
-    {
-        new Drawable[] { $END$ },
-        new Drawable[] { }
-    }
+	RelativeSizeAxes = Axes.Both,
+	Content = new[]
+	{
+		new Drawable[] { $END$ },
+		new Drawable[] { }
+	}
 };</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -792,12 +844,12 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Text/@EntryValue">new FillFlowContainer
 {
-    RelativeSizeAxes = Axes.Both,
-    Direction = FillDirection.Vertical,
-    Children = new Drawable[]
-    {
-        $END$
-    }
+	RelativeSizeAxes = Axes.Both,
+	Direction = FillDirection.Vertical,
+	Children = new Drawable[]
+	{
+		$END$
+	}
 },</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -810,11 +862,11 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Text/@EntryValue">new Container
 {
-    RelativeSizeAxes = Axes.Both,
-    Children = new Drawable[]
-    {
-        $END$
-    }
+	RelativeSizeAxes = Axes.Both,
+	Children = new Drawable[]
+	{
+		$END$
+	}
 },</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -828,7 +880,7 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Text/@EntryValue">[BackgroundDependencyLoader]
 private void load()
 {
-    $END$
+	$END$
 }</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -841,8 +893,8 @@ private void load()
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Text/@EntryValue">new Box
 {
-    Colour = Color4.Black,
-    RelativeSizeAxes = Axes.Both,
+	Colour = Color4.Black,
+	RelativeSizeAxes = Axes.Both,
 },</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -855,23 +907,28 @@ private void load()
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Text/@EntryValue">Children = new Drawable[]
 {
-    $END$
+	$END$
 };</s:String>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Beatmap/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=beatmaps/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=beatmap_0027s/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=bindable/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=bindables/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Catmull/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Drawables/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=gameplay/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=hitobject/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=hitobjects/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=keymods/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Kiai/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboard/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboards/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Playfield/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=playfields/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=resampler/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=ruleset/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=rulesets/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=ruleset_0027s/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Strongable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Taiko/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Unranked/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/Templates/Rulesets/ruleset-scrolling-example/.editorconfig b/Templates/Rulesets/ruleset-scrolling-example/.editorconfig
index 24825b7c42..f3badda9b3 100644
--- a/Templates/Rulesets/ruleset-scrolling-example/.editorconfig
+++ b/Templates/Rulesets/ruleset-scrolling-example/.editorconfig
@@ -12,16 +12,189 @@ trim_trailing_whitespace = true
 
 #PascalCase for public and protected members
 dotnet_naming_style.pascalcase.capitalization = pascal_case
-dotnet_naming_symbols.public_members.applicable_accessibilities = public,internal,protected,protected_internal
-dotnet_naming_symbols.public_members.applicable_kinds = property,method,field,event,delegate
-dotnet_naming_rule.public_members_pascalcase.severity = suggestion
+dotnet_naming_symbols.public_members.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.public_members.applicable_kinds = property,method,field,event
+dotnet_naming_rule.public_members_pascalcase.severity = error
 dotnet_naming_rule.public_members_pascalcase.symbols = public_members
 dotnet_naming_rule.public_members_pascalcase.style = pascalcase
 
 #camelCase for private members
 dotnet_naming_style.camelcase.capitalization = camel_case
+
 dotnet_naming_symbols.private_members.applicable_accessibilities = private
-dotnet_naming_symbols.private_members.applicable_kinds = property,method,field,event,delegate
-dotnet_naming_rule.private_members_camelcase.severity = suggestion
+dotnet_naming_symbols.private_members.applicable_kinds = property,method,field,event
+dotnet_naming_rule.private_members_camelcase.severity = warning
 dotnet_naming_rule.private_members_camelcase.symbols = private_members
-dotnet_naming_rule.private_members_camelcase.style = camelcase
\ No newline at end of file
+dotnet_naming_rule.private_members_camelcase.style = camelcase
+
+dotnet_naming_symbols.local_function.applicable_kinds = local_function
+dotnet_naming_rule.local_function_camelcase.severity = warning
+dotnet_naming_rule.local_function_camelcase.symbols = local_function
+dotnet_naming_rule.local_function_camelcase.style = camelcase
+
+#all_lower for private and local constants/static readonlys
+dotnet_naming_style.all_lower.capitalization = all_lower
+dotnet_naming_style.all_lower.word_separator = _
+
+dotnet_naming_symbols.private_constants.applicable_accessibilities = private
+dotnet_naming_symbols.private_constants.required_modifiers = const
+dotnet_naming_symbols.private_constants.applicable_kinds = field
+dotnet_naming_rule.private_const_all_lower.severity = warning
+dotnet_naming_rule.private_const_all_lower.symbols = private_constants
+dotnet_naming_rule.private_const_all_lower.style = all_lower
+
+dotnet_naming_symbols.private_static_readonly.applicable_accessibilities = private
+dotnet_naming_symbols.private_static_readonly.required_modifiers = static,readonly
+dotnet_naming_symbols.private_static_readonly.applicable_kinds = field
+dotnet_naming_rule.private_static_readonly_all_lower.severity = warning
+dotnet_naming_rule.private_static_readonly_all_lower.symbols = private_static_readonly
+dotnet_naming_rule.private_static_readonly_all_lower.style = all_lower
+
+dotnet_naming_symbols.local_constants.applicable_kinds = local
+dotnet_naming_symbols.local_constants.required_modifiers = const
+dotnet_naming_rule.local_const_all_lower.severity = warning
+dotnet_naming_rule.local_const_all_lower.symbols = local_constants
+dotnet_naming_rule.local_const_all_lower.style = all_lower
+
+#ALL_UPPER for non private constants/static readonlys
+dotnet_naming_style.all_upper.capitalization = all_upper
+dotnet_naming_style.all_upper.word_separator = _
+
+dotnet_naming_symbols.public_constants.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.public_constants.required_modifiers = const
+dotnet_naming_symbols.public_constants.applicable_kinds = field
+dotnet_naming_rule.public_const_all_upper.severity = warning
+dotnet_naming_rule.public_const_all_upper.symbols = public_constants
+dotnet_naming_rule.public_const_all_upper.style = all_upper
+
+dotnet_naming_symbols.public_static_readonly.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.public_static_readonly.required_modifiers = static,readonly
+dotnet_naming_symbols.public_static_readonly.applicable_kinds = field
+dotnet_naming_rule.public_static_readonly_all_upper.severity = warning
+dotnet_naming_rule.public_static_readonly_all_upper.symbols = public_static_readonly
+dotnet_naming_rule.public_static_readonly_all_upper.style = all_upper
+
+#Roslyn formating options
+
+#Formatting - indentation options
+csharp_indent_case_contents = true
+csharp_indent_case_contents_when_block = false
+csharp_indent_labels = one_less_than_current
+csharp_indent_switch_labels = true
+
+#Formatting - new line options
+csharp_new_line_before_catch = true
+csharp_new_line_before_else = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_open_brace = all
+#csharp_new_line_before_members_in_anonymous_types = true
+#csharp_new_line_before_members_in_object_initializers = true # Currently no effect in VS/dotnet format (16.4), and makes Rider confusing
+csharp_new_line_between_query_expression_clauses = true
+
+#Formatting - organize using options
+dotnet_sort_system_directives_first = true
+
+#Formatting - spacing options
+csharp_space_after_cast = false
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+
+#Formatting - wrapping options
+csharp_preserve_single_line_blocks = true
+csharp_preserve_single_line_statements = true
+
+#Roslyn language styles
+
+#Style - this. qualification
+dotnet_style_qualification_for_field = false:warning
+dotnet_style_qualification_for_property = false:warning
+dotnet_style_qualification_for_method = false:warning
+dotnet_style_qualification_for_event = false:warning
+
+#Style - type names
+dotnet_style_predefined_type_for_locals_parameters_members = true:warning
+dotnet_style_predefined_type_for_member_access = true:warning
+csharp_style_var_when_type_is_apparent = true:none
+csharp_style_var_for_built_in_types = true:none
+csharp_style_var_elsewhere = true:silent
+
+#Style - modifiers
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:warning
+csharp_preferred_modifier_order = public,private,protected,internal,new,abstract,virtual,sealed,override,static,readonly,extern,unsafe,volatile,async:warning
+
+#Style - parentheses
+# Skipped because roslyn cannot separate +-*/ with << >>
+
+#Style - expression bodies
+csharp_style_expression_bodied_accessors = true:warning
+csharp_style_expression_bodied_constructors = false:none
+csharp_style_expression_bodied_indexers = true:warning
+csharp_style_expression_bodied_methods = false:silent
+csharp_style_expression_bodied_operators = true:warning
+csharp_style_expression_bodied_properties = true:warning
+csharp_style_expression_bodied_local_functions = true:silent
+
+#Style - expression preferences
+dotnet_style_object_initializer = true:warning
+dotnet_style_collection_initializer = true:warning
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:warning
+dotnet_style_prefer_auto_properties = true:warning
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+dotnet_style_prefer_compound_assignment = true:warning
+
+#Style - null/type checks
+dotnet_style_coalesce_expression = true:warning
+dotnet_style_null_propagation = true:warning
+csharp_style_pattern_matching_over_is_with_cast_check = true:warning
+csharp_style_pattern_matching_over_as_with_null_check = true:warning
+csharp_style_throw_expression = true:silent
+csharp_style_conditional_delegate_call = true:warning
+
+#Style - unused
+dotnet_style_readonly_field = true:silent
+dotnet_code_quality_unused_parameters = non_public:silent
+csharp_style_unused_value_expression_statement_preference = discard_variable:silent
+csharp_style_unused_value_assignment_preference = discard_variable:warning
+
+#Style - variable declaration
+csharp_style_inlined_variable_declaration = true:warning
+csharp_style_deconstructed_variable_declaration = true:warning
+
+#Style - other C# 7.x features
+dotnet_style_prefer_inferred_tuple_names = true:warning
+csharp_prefer_simple_default_expression = true:warning
+csharp_style_pattern_local_over_anonymous_function = true:warning
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
+
+#Style - C# 8 features
+csharp_prefer_static_local_function = true:warning
+csharp_prefer_simple_using_statement = true:silent
+csharp_style_prefer_index_operator = true:warning
+csharp_style_prefer_range_operator = true:warning
+csharp_style_prefer_switch_expression = false:none
+
+#Supressing roslyn built-in analyzers
+# Suppress: EC112
+
+#Private method is unused
+dotnet_diagnostic.IDE0051.severity = silent
+#Private member is unused
+dotnet_diagnostic.IDE0052.severity = silent
+
+#Rules for disposable
+dotnet_diagnostic.IDE0067.severity = none
+dotnet_diagnostic.IDE0068.severity = none
+dotnet_diagnostic.IDE0069.severity = none
+
+#Disable operator overloads requiring alternate named methods
+dotnet_diagnostic.CA2225.severity = none
+
+# Banned APIs
+dotnet_diagnostic.RS0030.severity = error
\ No newline at end of file
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.sln.DotSettings b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.sln.DotSettings
index c3e274569d..aa8f8739c1 100644
--- a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.sln.DotSettings
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.sln.DotSettings
@@ -12,14 +12,15 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeLocalFunctionBody/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeMethodOrOperatorBody/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeModifiersOrder/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue"></s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue">WARNING</s:String>
 	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexRemoved">True</s:Boolean>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeMemberModifiers/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeModifiers/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignedValueIsNeverUsed/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignmentIsFullyDiscarded/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignNullToNotNullAttribute/@EntryIndexedValue">HINT</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002EGlobal/@EntryIndexedValue">HINT</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002EGlobal/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadAttributeBracketsSpaces/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadBracesSpaces/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadChildStatementIndent/@EntryIndexedValue">WARNING</s:String>
@@ -59,22 +60,35 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertClosureToMethodGroup/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfDoToWhile/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToConditionalTernaryExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToNullCoalescingAssignment/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToNullCoalescingExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfToOrExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertNullableToShortForm/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertPropertyToExpressionBody/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoProperty/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoProperty/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoPropertyWhenPossible/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToAutoPropertyWithPrivateSetter/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToConstant_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLambdaExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLocalFunction/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToStaticClass/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToUsingDeclaration/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=DoubleNegationOperator/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EmptyGeneralCatchClause/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceDoWhileStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceFixedStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceForeachStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceForStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceIfStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceLockStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceUsingStatementBraces/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EnforceWhileStatementBraces/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EventNeverSubscribedTo_002EGlobal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=EventNeverSubscribedTo_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ForCanBeConvertedToForeach/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ForStatementConditionIsTrue/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=IdentifierTypo/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ImpureMethodCallOnReadonlyValueField/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InconsistentNaming/@EntryIndexedValue">ERROR</s:String>
@@ -92,6 +106,9 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeCastWithTypeCheck/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeConditionalExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeSequentialChecks/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeSequentialPatterns/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodHasAsyncOverload/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodHasAsyncOverloadWithCancellation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodSupportsCancellation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingBlankLines/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MissingIndent/@EntryIndexedValue">WARNING</s:String>
@@ -107,6 +124,7 @@
 	<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/=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>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PrivateVariableCanBeMadeReadonly/@EntryIndexedValue">WARNING</s:String>
@@ -121,10 +139,11 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInEnumDeclaration/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInInitializer/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantEmptyObjectCreationArgumentList/@EntryIndexedValue">WARNING</s:String>
-	
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantExplicitParamsArrayCreation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantImmediateDelegateInvocation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLambdaSignatureParentheses/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantReadonlyModifier/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantTypeSpecificationInDefaultExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantLinebreak/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantSpace/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantUsingDirective/@EntryIndexedValue">ERROR</s:String>
@@ -171,7 +190,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToAny/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToCount/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirst/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirstOrDefault/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToFirstOrDefault/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToLast/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToLastOrDefault/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleCallToSingle/@EntryIndexedValue">WARNING</s:String>
@@ -181,7 +200,10 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E3/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithSingleOrDefault_002E4/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SeparateControlTransferStatement/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringEndsWithIsCultureSpecific/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringLiteralTypo/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringStartsWithIsCultureSpecific/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StructCanBeMadeReadOnly/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FBuiltInTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FSimpleTypes/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SwitchStatementMissingSomeCases/@EntryIndexedValue">DO_NOT_SHOW</s:String>
@@ -199,12 +221,16 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMember_002ELocal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002EGlobal/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedMethodReturnValue_002ELocal/@EntryIndexedValue">HINT</s:String>
-	
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedParameter_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedParameter_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedType_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseAwaitUsing/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseCollectionCountProperty/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInFormatString/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInInterpolation/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseIndexFromEndExpression/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNameofExpression/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNameOfInsteadOfTypeOf/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexedValue"></s:String>
 	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexRemoved">True</s:Boolean>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNullPropagation/@EntryIndexedValue">WARNING</s:String>
@@ -218,9 +244,19 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=WrongIndentSize/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Code_0020Cleanup_0020_0028peppy_0029/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Code Cleanup (peppy)"&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_EXPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;ALWAYS_EXPLICIT&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_EXPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="False" ArrangeTypeMemberAccessModifier="False" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="False" ArrangeBraces="False" ArrangeAttributes="False" ArrangeArgumentsStyle="False" /&gt;&lt;XAMLCollapseEmptyTags&gt;False&lt;/XAMLCollapseEmptyTags&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;/Profile&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeCleanup/RecentlyUsedProfile/@EntryValue">Code Cleanup (peppy)</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_DOWHILE/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FIXED/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOR/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOREACH/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_IFELSE/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_LOCK/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_USING/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_WHILE/@EntryValue">RequiredForMultiline</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/DEFAULT_INTERNAL_MODIFIER/@EntryValue">Explicit</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/LOCAL_FUNCTION_BODY/@EntryValue">ExpressionBody</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/METHOD_OR_OPERATOR_BODY/@EntryValue">ExpressionBody</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/METHOD_OR_OPERATOR_BODY/@EntryValue">BlockBody</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/USE_HEURISTICS_FOR_BODY_STYLE/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ACCESSOR_DECLARATION_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_LINQ_QUERY/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_CALLS_CHAIN/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_EXTENDS_LIST/@EntryValue">True</s:Boolean>
@@ -232,14 +268,24 @@
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ANONYMOUS_METHOD_DECLARATION_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BEFORE_BLOCK_STATEMENTS/@EntryValue">1</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BEFORE_CASE/@EntryValue">1</s:Int64>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/CASE_BLOCK_BRACES/@EntryValue">NEXT_LINE</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/EMPTY_BLOCK_STYLE/@EntryValue">MULTILINE</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_FOR_STMT/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_FOREACH_STMT/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_LOCK_STMT/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_WHILE_STMT/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INITIALIZER_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_CODE/@EntryValue">1</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue">1</s:Int64>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/LINE_FEED_AT_FILE_END/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/OTHER_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CATCH_ON_NEW_LINE/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ELSE_ON_NEW_LINE/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_WHILE_ON_NEW_LINE/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AROUND_MULTIPLICATIVE_OP/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_SIZEOF_PARENTHESES/@EntryValue">False</s:Boolean>
@@ -247,6 +293,7 @@
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHING_EMPTY_BRACES/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/STICK_COMMENT/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_AFTER_DECLARATION_LPAR/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_ARRAY_INITIALIZER_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_BINARY_OPSIGN/@EntryValue">True</s:Boolean>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">200</s:Int64>
@@ -260,9 +307,11 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GL/@EntryIndexedValue">GL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GLSL/@EntryIndexedValue">GLSL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HID/@EntryIndexedValue">HID</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HTML/@EntryIndexedValue">HTML</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HUD/@EntryIndexedValue">HUD</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IL/@EntryIndexedValue">IL</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IOS/@EntryIndexedValue">IOS</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IPC/@EntryIndexedValue">IPC</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JIT/@EntryIndexedValue">JIT</s:String>
@@ -276,397 +325,397 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SHA/@EntryIndexedValue">SHA</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SRGB/@EntryIndexedValue">SRGB</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TK/@EntryIndexedValue">TK</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SS/@EntryIndexedValue">SS</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PP/@EntryIndexedValue">PP</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GMT/@EntryIndexedValue">GMT</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=QAT/@EntryIndexedValue">QAT</s:String>
-  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BNG/@EntryIndexedValue">BNG</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SS/@EntryIndexedValue">SS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PP/@EntryIndexedValue">PP</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GMT/@EntryIndexedValue">GMT</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=QAT/@EntryIndexedValue">QAT</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=BNG/@EntryIndexedValue">BNG</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UI/@EntryIndexedValue">UI</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpNaming/ApplyAutoDetectedRules/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=EnumMember/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeStyle/CSharpFileLayoutPatterns/Pattern/@EntryValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&#xD;
 &lt;Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"&gt;&#xD;
-  &lt;TypePattern DisplayName="COM interfaces or structs"&gt;&#xD;
-    &lt;TypePattern.Match&gt;&#xD;
-      &lt;Or&gt;&#xD;
-        &lt;And&gt;&#xD;
-          &lt;Kind Is="Interface" /&gt;&#xD;
-          &lt;Or&gt;&#xD;
-            &lt;HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /&gt;&#xD;
-            &lt;HasAttribute Name="System.Runtime.InteropServices.ComImport" /&gt;&#xD;
-          &lt;/Or&gt;&#xD;
-        &lt;/And&gt;&#xD;
-        &lt;Kind Is="Struct" /&gt;&#xD;
-      &lt;/Or&gt;&#xD;
-    &lt;/TypePattern.Match&gt;&#xD;
-  &lt;/TypePattern&gt;&#xD;
-  &lt;TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"&gt;&#xD;
-    &lt;TypePattern.Match&gt;&#xD;
-      &lt;And&gt;&#xD;
-        &lt;Kind Is="Class" /&gt;&#xD;
-        &lt;HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /&gt;&#xD;
-      &lt;/And&gt;&#xD;
-    &lt;/TypePattern.Match&gt;&#xD;
-    &lt;Entry DisplayName="Setup/Teardown Methods"&gt;&#xD;
-      &lt;Entry.Match&gt;&#xD;
-        &lt;And&gt;&#xD;
-          &lt;Kind Is="Method" /&gt;&#xD;
-          &lt;Or&gt;&#xD;
-            &lt;HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /&gt;&#xD;
-            &lt;HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /&gt;&#xD;
-            &lt;HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="True" /&gt;&#xD;
-            &lt;HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="True" /&gt;&#xD;
-          &lt;/Or&gt;&#xD;
-        &lt;/And&gt;&#xD;
-      &lt;/Entry.Match&gt;&#xD;
-    &lt;/Entry&gt;&#xD;
-    &lt;Entry DisplayName="All other members" /&gt;&#xD;
-    &lt;Entry Priority="100" DisplayName="Test Methods"&gt;&#xD;
-      &lt;Entry.Match&gt;&#xD;
-        &lt;And&gt;&#xD;
-          &lt;Kind Is="Method" /&gt;&#xD;
-          &lt;HasAttribute Name="NUnit.Framework.TestAttribute" /&gt;&#xD;
-        &lt;/And&gt;&#xD;
-      &lt;/Entry.Match&gt;&#xD;
-      &lt;Entry.SortBy&gt;&#xD;
-        &lt;Name /&gt;&#xD;
-      &lt;/Entry.SortBy&gt;&#xD;
-    &lt;/Entry&gt;&#xD;
-  &lt;/TypePattern&gt;&#xD;
-  &lt;TypePattern DisplayName="Default Pattern"&gt;&#xD;
-    &lt;Group DisplayName="Fields/Properties"&gt;&#xD;
-      &lt;Group DisplayName="Public Fields"&gt;&#xD;
-        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Kind Is="Constant" /&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-                &lt;And&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/And&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Or&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/Or&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Entry DisplayName="Public Properties"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;And&gt;&#xD;
-            &lt;Access Is="Public" /&gt;&#xD;
-            &lt;Kind Is="Property" /&gt;&#xD;
-          &lt;/And&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-      &lt;Group DisplayName="Internal Fields"&gt;&#xD;
-        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Kind Is="Constant" /&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-                &lt;And&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/And&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Or&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/Or&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Entry DisplayName="Internal Properties"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;And&gt;&#xD;
-            &lt;Access Is="Internal" /&gt;&#xD;
-            &lt;Kind Is="Property" /&gt;&#xD;
-          &lt;/And&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-      &lt;Group DisplayName="Protected Fields"&gt;&#xD;
-        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Kind Is="Constant" /&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-                &lt;And&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/And&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Or&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/Or&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Entry DisplayName="Protected Properties"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;And&gt;&#xD;
-            &lt;Access Is="Protected" /&gt;&#xD;
-            &lt;Kind Is="Property" /&gt;&#xD;
-          &lt;/And&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-      &lt;Group DisplayName="Private Fields"&gt;&#xD;
-        &lt;Entry DisplayName="Constant Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Kind Is="Constant" /&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-                &lt;And&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/And&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Static Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Readonly /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Normal Fields"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Or&gt;&#xD;
-                  &lt;Static /&gt;&#xD;
-                  &lt;Readonly /&gt;&#xD;
-                &lt;/Or&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Entry DisplayName="Private Properties"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;And&gt;&#xD;
-            &lt;Access Is="Private" /&gt;&#xD;
-            &lt;Kind Is="Property" /&gt;&#xD;
-          &lt;/And&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-    &lt;/Group&gt;&#xD;
-    &lt;Group DisplayName="Constructor/Destructor"&gt;&#xD;
-      &lt;Entry DisplayName="Ctor"&gt;&#xD;
-        &lt;Entry.Match&gt;&#xD;
-          &lt;Kind Is="Constructor" /&gt;&#xD;
-        &lt;/Entry.Match&gt;&#xD;
-      &lt;/Entry&gt;&#xD;
-      &lt;Region Name="Disposal"&gt;&#xD;
-        &lt;Entry DisplayName="Dtor"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;Kind Is="Destructor" /&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Dispose()"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-              &lt;Name Is="Dispose" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Dispose(true)"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Or&gt;&#xD;
-                &lt;Virtual /&gt;&#xD;
-                &lt;Override /&gt;&#xD;
-              &lt;/Or&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-              &lt;Name Is="Dispose" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Region&gt;&#xD;
-    &lt;/Group&gt;&#xD;
-    &lt;Group DisplayName="Methods"&gt;&#xD;
-      &lt;Group DisplayName="Public"&gt;&#xD;
-        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Public" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Static /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Group DisplayName="Internal"&gt;&#xD;
-        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Internal" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Static /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Group DisplayName="Protected"&gt;&#xD;
-        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Protected" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Static /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-      &lt;Group DisplayName="Private"&gt;&#xD;
-        &lt;Entry DisplayName="Static Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Static /&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-        &lt;Entry DisplayName="Methods"&gt;&#xD;
-          &lt;Entry.Match&gt;&#xD;
-            &lt;And&gt;&#xD;
-              &lt;Access Is="Private" /&gt;&#xD;
-              &lt;Not&gt;&#xD;
-                &lt;Static /&gt;&#xD;
-              &lt;/Not&gt;&#xD;
-              &lt;Kind Is="Method" /&gt;&#xD;
-            &lt;/And&gt;&#xD;
-          &lt;/Entry.Match&gt;&#xD;
-        &lt;/Entry&gt;&#xD;
-      &lt;/Group&gt;&#xD;
-    &lt;/Group&gt;&#xD;
-  &lt;/TypePattern&gt;&#xD;
+	&lt;TypePattern DisplayName="COM interfaces or structs"&gt;&#xD;
+	&lt;TypePattern.Match&gt;&#xD;
+		&lt;Or&gt;&#xD;
+		&lt;And&gt;&#xD;
+			&lt;Kind Is="Interface" /&gt;&#xD;
+			&lt;Or&gt;&#xD;
+			&lt;HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /&gt;&#xD;
+			&lt;HasAttribute Name="System.Runtime.InteropServices.ComImport" /&gt;&#xD;
+			&lt;/Or&gt;&#xD;
+		&lt;/And&gt;&#xD;
+		&lt;Kind Is="Struct" /&gt;&#xD;
+		&lt;/Or&gt;&#xD;
+	&lt;/TypePattern.Match&gt;&#xD;
+	&lt;/TypePattern&gt;&#xD;
+	&lt;TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"&gt;&#xD;
+	&lt;TypePattern.Match&gt;&#xD;
+		&lt;And&gt;&#xD;
+		&lt;Kind Is="Class" /&gt;&#xD;
+		&lt;HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /&gt;&#xD;
+		&lt;/And&gt;&#xD;
+	&lt;/TypePattern.Match&gt;&#xD;
+	&lt;Entry DisplayName="Setup/Teardown Methods"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+		&lt;And&gt;&#xD;
+			&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;Or&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="True" /&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="True" /&gt;&#xD;
+			&lt;/Or&gt;&#xD;
+		&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+	&lt;/Entry&gt;&#xD;
+	&lt;Entry DisplayName="All other members" /&gt;&#xD;
+	&lt;Entry Priority="100" DisplayName="Test Methods"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+		&lt;And&gt;&#xD;
+			&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;HasAttribute Name="NUnit.Framework.TestAttribute" /&gt;&#xD;
+		&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;Entry.SortBy&gt;&#xD;
+		&lt;Name /&gt;&#xD;
+		&lt;/Entry.SortBy&gt;&#xD;
+	&lt;/Entry&gt;&#xD;
+	&lt;/TypePattern&gt;&#xD;
+	&lt;TypePattern DisplayName="Default Pattern"&gt;&#xD;
+	&lt;Group DisplayName="Fields/Properties"&gt;&#xD;
+		&lt;Group DisplayName="Public Fields"&gt;&#xD;
+		&lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Kind Is="Constant" /&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;And&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/And&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Static Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Or&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Entry DisplayName="Public Properties"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+			&lt;Access Is="Public" /&gt;&#xD;
+			&lt;Kind Is="Property" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Group DisplayName="Internal Fields"&gt;&#xD;
+		&lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Kind Is="Constant" /&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;And&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/And&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Static Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Or&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Entry DisplayName="Internal Properties"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+			&lt;Access Is="Internal" /&gt;&#xD;
+			&lt;Kind Is="Property" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Group DisplayName="Protected Fields"&gt;&#xD;
+		&lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Kind Is="Constant" /&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;And&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/And&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Static Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Or&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Entry DisplayName="Protected Properties"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+			&lt;Access Is="Protected" /&gt;&#xD;
+			&lt;Kind Is="Property" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Group DisplayName="Private Fields"&gt;&#xD;
+		&lt;Entry DisplayName="Constant Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Kind Is="Constant" /&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;And&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/And&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Static Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Readonly /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Normal Fields"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Or&gt;&#xD;
+					&lt;Static /&gt;&#xD;
+					&lt;Readonly /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Field" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Entry DisplayName="Private Properties"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+			&lt;Access Is="Private" /&gt;&#xD;
+			&lt;Kind Is="Property" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+	&lt;/Group&gt;&#xD;
+	&lt;Group DisplayName="Constructor/Destructor"&gt;&#xD;
+		&lt;Entry DisplayName="Ctor"&gt;&#xD;
+		&lt;Entry.Match&gt;&#xD;
+			&lt;Kind Is="Constructor" /&gt;&#xD;
+		&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Region Name="Disposal"&gt;&#xD;
+		&lt;Entry DisplayName="Dtor"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;Kind Is="Destructor" /&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Dispose()"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+				&lt;Name Is="Dispose" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Dispose(true)"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Or&gt;&#xD;
+				&lt;Virtual /&gt;&#xD;
+				&lt;Override /&gt;&#xD;
+				&lt;/Or&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+				&lt;Name Is="Dispose" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Region&gt;&#xD;
+	&lt;/Group&gt;&#xD;
+	&lt;Group DisplayName="Methods"&gt;&#xD;
+		&lt;Group DisplayName="Public"&gt;&#xD;
+		&lt;Entry DisplayName="Static Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Public" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Group DisplayName="Internal"&gt;&#xD;
+		&lt;Entry DisplayName="Static Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Internal" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Group DisplayName="Protected"&gt;&#xD;
+		&lt;Entry DisplayName="Static Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Protected" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+		&lt;Group DisplayName="Private"&gt;&#xD;
+		&lt;Entry DisplayName="Static Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;Entry DisplayName="Methods"&gt;&#xD;
+			&lt;Entry.Match&gt;&#xD;
+			&lt;And&gt;&#xD;
+				&lt;Access Is="Private" /&gt;&#xD;
+				&lt;Not&gt;&#xD;
+				&lt;Static /&gt;&#xD;
+				&lt;/Not&gt;&#xD;
+				&lt;Kind Is="Method" /&gt;&#xD;
+			&lt;/And&gt;&#xD;
+			&lt;/Entry.Match&gt;&#xD;
+		&lt;/Entry&gt;&#xD;
+		&lt;/Group&gt;&#xD;
+	&lt;/Group&gt;&#xD;
+	&lt;/TypePattern&gt;&#xD;
 &lt;/Patterns&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">Copyright (c) ppy Pty Ltd &lt;contact@ppy.sh&gt;. Licensed under the MIT Licence.&#xD;
 See the LICENCE file in the repository root for full licence text.&#xD;
@@ -726,6 +775,8 @@ See the LICENCE file in the repository root for full licence text.&#xD;
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=NAMESPACE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CustomTools/CustomToolsData/@EntryValue"></s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002EDaemon_002ESettings_002EMigration_002ESwaWarningsModeSettingsMigrate/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
@@ -736,6 +787,7 @@ See the LICENCE file in the repository root for full licence text.&#xD;
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/Environment/UnitTesting/NUnitProvider/SetCurrentDirectoryTo/@EntryValue">TestFolder</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=28A2A5FC43E07C488A4BC7430879479E/Description/@EntryValue">o!f – Object Initializer: Anchor&amp;Origin</s:String>
@@ -761,7 +813,7 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=2A3ECBA387AF6D468F6ABDA35DED325A/Text/@EntryValue">InternalChildren = new Drawable[]
 {
-    $END$
+	$END$
 };</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -774,12 +826,12 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=62B70E4DCA5E284A9E383E16C13789C1/Text/@EntryValue">new GridContainer
 {
-    RelativeSizeAxes = Axes.Both,
-    Content = new[]
-    {
-        new Drawable[] { $END$ },
-        new Drawable[] { }
-    }
+	RelativeSizeAxes = Axes.Both,
+	Content = new[]
+	{
+		new Drawable[] { $END$ },
+		new Drawable[] { }
+	}
 };</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -792,12 +844,12 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=72BD3C3DCA42C84DA1E71F1D05A903C4/Text/@EntryValue">new FillFlowContainer
 {
-    RelativeSizeAxes = Axes.Both,
-    Direction = FillDirection.Vertical,
-    Children = new Drawable[]
-    {
-        $END$
-    }
+	RelativeSizeAxes = Axes.Both,
+	Direction = FillDirection.Vertical,
+	Children = new Drawable[]
+	{
+		$END$
+	}
 },</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -810,11 +862,11 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=750A3C67E083484FAEEA0ED2382181CC/Text/@EntryValue">new Container
 {
-    RelativeSizeAxes = Axes.Both,
-    Children = new Drawable[]
-    {
-        $END$
-    }
+	RelativeSizeAxes = Axes.Both,
+	Children = new Drawable[]
+	{
+		$END$
+	}
 },</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -828,7 +880,7 @@ Origin = Anchor.$anchor$,</s:String>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=78D9C2B1742FD449BD69CD18437E0C07/Text/@EntryValue">[BackgroundDependencyLoader]
 private void load()
 {
-    $END$
+	$END$
 }</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -841,8 +893,8 @@ private void load()
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=CC879477D8841A4CBD724C2DCD249435/Text/@EntryValue">new Box
 {
-    Colour = Color4.Black,
-    RelativeSizeAxes = Axes.Both,
+	Colour = Color4.Black,
+	RelativeSizeAxes = Axes.Both,
 },</s:String>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/@KeyIndexDefined">True</s:Boolean>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
@@ -855,23 +907,28 @@ private void load()
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F5B3CB743153774F99FB9FCA0FC744EE/Text/@EntryValue">Children = new Drawable[]
 {
-    $END$
+	$END$
 };</s:String>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Beatmap/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=beatmaps/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=beatmap_0027s/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=bindable/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=bindables/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Catmull/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Drawables/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=gameplay/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=hitobject/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=hitobjects/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=keymods/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Kiai/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboard/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboards/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Playfield/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=playfields/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=resampler/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=ruleset/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=rulesets/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=ruleset_0027s/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Strongable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Taiko/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Unranked/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

From 78759ceb6c3abfb870ec39b668e7f776300ade00 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 5 Apr 2021 16:06:31 +0900
Subject: [PATCH 2184/3722] Update link to templates

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e09b4d86a5..0d6af2aeba 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ If your platform is not listed above, there is still a chance you can manually b
 
 ## 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-templates).
+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).
 
 You can see some examples of custom rulesets by visiting the [custom ruleset directory](https://github.com/ppy/osu/issues/5852).
 

From 42e816fcae108ac2b4a3e6e92f87035e46dd965f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 5 Apr 2021 17:47:12 +0900
Subject: [PATCH 2185/3722] Add failing tests

---
 .../OsuBeatmapConversionTest.cs               |  1 +
 ...ti-segment-slider-expected-conversion.json | 36 +++++++++++++++++++
 .../Testing/Beatmaps/multi-segment-slider.osu | 17 +++++++++
 .../Formats/LegacyBeatmapDecoderTest.cs       | 33 +++++++++++++++++
 .../Resources/multi-segment-slider.osu        |  6 ++++
 5 files changed, 93 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/multi-segment-slider-expected-conversion.json
 create mode 100644 osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/multi-segment-slider.osu

diff --git a/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
index 7d32895083..5f44e1b6b6 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("repeat-slider")]
         [TestCase("uneven-repeat-slider")]
         [TestCase("old-stacking")]
+        [TestCase("multi-segment-slider")]
         public void Test(string name) => base.Test(name);
 
         protected override IEnumerable<ConvertValue> CreateConvertValue(HitObject hitObject)
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/multi-segment-slider-expected-conversion.json b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/multi-segment-slider-expected-conversion.json
new file mode 100644
index 0000000000..8a056b3039
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/multi-segment-slider-expected-conversion.json
@@ -0,0 +1,36 @@
+{
+    "Mappings": [{
+        "StartTime": 347893,
+        "Objects": [{
+                "StartTime": 347893,
+                "EndTime": 347893,
+                "X": 329,
+                "Y": 245,
+                "StackOffset": {
+                    "X": 0,
+                    "Y": 0
+                }
+            },
+            {
+                "StartTime": 348193,
+                "EndTime": 348193,
+                "X": 183.0447,
+                "Y": 245.24292,
+                "StackOffset": {
+                    "X": 0,
+                    "Y": 0
+                }
+            },
+            {
+                "StartTime": 348457,
+                "EndTime": 348457,
+                "X": 329,
+                "Y": 245,
+                "StackOffset": {
+                    "X": 0,
+                    "Y": 0
+                }
+            }
+        ]
+    }]
+}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/multi-segment-slider.osu b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/multi-segment-slider.osu
new file mode 100644
index 0000000000..843c32b8ef
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Resources/Testing/Beatmaps/multi-segment-slider.osu
@@ -0,0 +1,17 @@
+osu file format v14
+
+[General]
+Mode: 0
+
+[Difficulty]
+CircleSize:4
+OverallDifficulty:7
+ApproachRate:8
+SliderMultiplier:2
+SliderTickRate:1
+
+[TimingPoints]
+337093,300,4,2,1,40,1,0
+
+[HitObjects]
+329,245,347893,2,0,B|319:311|199:343|183:245|183:245,2,200,8|8|8,0:0|0:0|0:0,0:0:0:0:
diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index 4b9e9dd88c..fb18be3ae1 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -707,6 +707,39 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.That(third.ControlPoints[5].Type.Value, Is.EqualTo(null));
                 Assert.That(third.ControlPoints[6].Position.Value, Is.EqualTo(new Vector2(480, 0)));
                 Assert.That(third.ControlPoints[6].Type.Value, Is.EqualTo(null));
+
+                // Last control point duplicated
+                var fourth = ((IHasPath)decoded.HitObjects[3]).Path;
+
+                Assert.That(fourth.ControlPoints[0].Position.Value, Is.EqualTo(Vector2.Zero));
+                Assert.That(fourth.ControlPoints[0].Type.Value, Is.EqualTo(PathType.Bezier));
+                Assert.That(fourth.ControlPoints[1].Position.Value, Is.EqualTo(new Vector2(1, 1)));
+                Assert.That(fourth.ControlPoints[1].Type.Value, Is.EqualTo(null));
+                Assert.That(fourth.ControlPoints[2].Position.Value, Is.EqualTo(new Vector2(2, 2)));
+                Assert.That(fourth.ControlPoints[2].Type.Value, Is.EqualTo(null));
+                Assert.That(fourth.ControlPoints[3].Position.Value, Is.EqualTo(new Vector2(3, 3)));
+                Assert.That(fourth.ControlPoints[3].Type.Value, Is.EqualTo(null));
+                Assert.That(fourth.ControlPoints[4].Position.Value, Is.EqualTo(new Vector2(3, 3)));
+                Assert.That(fourth.ControlPoints[4].Type.Value, Is.EqualTo(null));
+
+                // Last control point in segment duplicated
+                var fifth = ((IHasPath)decoded.HitObjects[4]).Path;
+
+                Assert.That(fifth.ControlPoints[0].Position.Value, Is.EqualTo(Vector2.Zero));
+                Assert.That(fifth.ControlPoints[0].Type.Value, Is.EqualTo(PathType.Bezier));
+                Assert.That(fifth.ControlPoints[1].Position.Value, Is.EqualTo(new Vector2(1, 1)));
+                Assert.That(fifth.ControlPoints[1].Type.Value, Is.EqualTo(null));
+                Assert.That(fifth.ControlPoints[2].Position.Value, Is.EqualTo(new Vector2(2, 2)));
+                Assert.That(fifth.ControlPoints[2].Type.Value, Is.EqualTo(null));
+                Assert.That(fifth.ControlPoints[3].Position.Value, Is.EqualTo(new Vector2(3, 3)));
+                Assert.That(fifth.ControlPoints[3].Type.Value, Is.EqualTo(null));
+                Assert.That(fifth.ControlPoints[4].Position.Value, Is.EqualTo(new Vector2(3, 3)));
+                Assert.That(fifth.ControlPoints[4].Type.Value, Is.EqualTo(null));
+
+                Assert.That(fifth.ControlPoints[5].Position.Value, Is.EqualTo(new Vector2(4, 4)));
+                Assert.That(fifth.ControlPoints[5].Type.Value, Is.EqualTo(PathType.Bezier));
+                Assert.That(fifth.ControlPoints[6].Position.Value, Is.EqualTo(new Vector2(5, 5)));
+                Assert.That(fifth.ControlPoints[6].Type.Value, Is.EqualTo(null));
             }
         }
     }
diff --git a/osu.Game.Tests/Resources/multi-segment-slider.osu b/osu.Game.Tests/Resources/multi-segment-slider.osu
index 6eabe640e4..504a6c3c24 100644
--- a/osu.Game.Tests/Resources/multi-segment-slider.osu
+++ b/osu.Game.Tests/Resources/multi-segment-slider.osu
@@ -9,3 +9,9 @@ osu file format v128
 
 // Implicit multi-segment
 32,192,3000,6,0,B|32:384|256:384|256:192|256:192|256:0|512:0|512:192,1,800
+
+// Last control point duplicated
+0,0,4000,2,0,B|1:1|2:2|3:3|3:3,2,200
+
+// Last control point in segment duplicated
+0,0,4000,2,0,B|1:1|2:2|3:3|3:3|B|4:4|5:5,2,200

From 4b29d0ebe2eee8475170d35540a5ebe95dbbe0d1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 5 Apr 2021 17:49:36 +0900
Subject: [PATCH 2186/3722] Fix last control point starting new segment

---
 osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 8419dd66de..e8a5463cce 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -336,9 +336,14 @@ namespace osu.Game.Rulesets.Objects.Legacy
 
             while (++endIndex < vertices.Length - endPointLength)
             {
+                // Keep incrementing while an implicit segment doesn't need to be started
                 if (vertices[endIndex].Position.Value != vertices[endIndex - 1].Position.Value)
                     continue;
 
+                // The last control point of each segment is not allowed to start a new implicit segment.
+                if (endIndex == vertices.Length - endPointLength - 1)
+                    continue;
+
                 // Force a type on the last point, and return the current control point set as a segment.
                 vertices[endIndex - 1].Type.Value = type;
                 yield return vertices.AsMemory().Slice(startIndex, endIndex - startIndex);

From a3faf0a28e12528dae79108b1ad4b83f920303f7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 5 Apr 2021 18:07:07 +0900
Subject: [PATCH 2187/3722] Increment start time

---
 osu.Game.Tests/Resources/multi-segment-slider.osu | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Resources/multi-segment-slider.osu b/osu.Game.Tests/Resources/multi-segment-slider.osu
index 504a6c3c24..cc86710067 100644
--- a/osu.Game.Tests/Resources/multi-segment-slider.osu
+++ b/osu.Game.Tests/Resources/multi-segment-slider.osu
@@ -14,4 +14,4 @@ osu file format v128
 0,0,4000,2,0,B|1:1|2:2|3:3|3:3,2,200
 
 // Last control point in segment duplicated
-0,0,4000,2,0,B|1:1|2:2|3:3|3:3|B|4:4|5:5,2,200
+0,0,5000,2,0,B|1:1|2:2|3:3|3:3|B|4:4|5:5,2,200

From eee3d83ed25375fa58b262cfc48ecc3548b3138a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 5 Apr 2021 19:36:18 +0900
Subject: [PATCH 2188/3722] Disable sdk linker for android debug releases

Aimed to improve build time (especially for CI builds).

The additional lines come from visual studio. I'm intentionally
committing its output so it doesn't cause a diff on further csproj
changes.
---
 osu.Android/osu.Android.csproj                               | 5 +++++
 .../osu.Game.Rulesets.Catch.Tests.Android.csproj             | 5 +++++
 .../osu.Game.Rulesets.Mania.Tests.Android.csproj             | 5 +++++
 .../osu.Game.Rulesets.Osu.Tests.Android.csproj               | 5 +++++
 .../osu.Game.Rulesets.Taiko.Tests.Android.csproj             | 5 +++++
 osu.Game.Tests.Android/osu.Game.Tests.Android.csproj         | 5 +++++
 6 files changed, 30 insertions(+)

diff --git a/osu.Android/osu.Android.csproj b/osu.Android/osu.Android.csproj
index 2051beae21..54857ac87d 100644
--- a/osu.Android/osu.Android.csproj
+++ b/osu.Android/osu.Android.csproj
@@ -20,6 +20,11 @@
     <AndroidDexTool>d8</AndroidDexTool>
     <AndroidLinkTool>r8</AndroidLinkTool>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AndroidLinkMode>None</AndroidLinkMode>
+    <MandroidI18n>cjk;mideast;other;rare;west</MandroidI18n>
+    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="GameplayScreenRotationLocker.cs" />
     <Compile Include="OsuGameActivity.cs" />
diff --git a/osu.Game.Rulesets.Catch.Tests.Android/osu.Game.Rulesets.Catch.Tests.Android.csproj b/osu.Game.Rulesets.Catch.Tests.Android/osu.Game.Rulesets.Catch.Tests.Android.csproj
index 2e6c10a02e..94fdba4a3e 100644
--- a/osu.Game.Rulesets.Catch.Tests.Android/osu.Game.Rulesets.Catch.Tests.Android.csproj
+++ b/osu.Game.Rulesets.Catch.Tests.Android/osu.Game.Rulesets.Catch.Tests.Android.csproj
@@ -14,6 +14,11 @@
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a</AndroidSupportedAbis>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AndroidLinkMode>None</AndroidLinkMode>
+    <MandroidI18n>cjk;mideast;other;rare;west</MandroidI18n>
+    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />
   </ItemGroup>
diff --git a/osu.Game.Rulesets.Mania.Tests.Android/osu.Game.Rulesets.Mania.Tests.Android.csproj b/osu.Game.Rulesets.Mania.Tests.Android/osu.Game.Rulesets.Mania.Tests.Android.csproj
index 8c134c7114..9674186039 100644
--- a/osu.Game.Rulesets.Mania.Tests.Android/osu.Game.Rulesets.Mania.Tests.Android.csproj
+++ b/osu.Game.Rulesets.Mania.Tests.Android/osu.Game.Rulesets.Mania.Tests.Android.csproj
@@ -14,6 +14,11 @@
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a</AndroidSupportedAbis>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AndroidLinkMode>None</AndroidLinkMode>
+    <MandroidI18n>cjk;mideast;other;rare;west</MandroidI18n>
+    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />
   </ItemGroup>
diff --git a/osu.Game.Rulesets.Osu.Tests.Android/osu.Game.Rulesets.Osu.Tests.Android.csproj b/osu.Game.Rulesets.Osu.Tests.Android/osu.Game.Rulesets.Osu.Tests.Android.csproj
index 22fa605176..f4b673f10b 100644
--- a/osu.Game.Rulesets.Osu.Tests.Android/osu.Game.Rulesets.Osu.Tests.Android.csproj
+++ b/osu.Game.Rulesets.Osu.Tests.Android/osu.Game.Rulesets.Osu.Tests.Android.csproj
@@ -14,6 +14,11 @@
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a</AndroidSupportedAbis>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AndroidLinkMode>None</AndroidLinkMode>
+    <MandroidI18n>cjk;mideast;other;rare;west</MandroidI18n>
+    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />
   </ItemGroup>
diff --git a/osu.Game.Rulesets.Taiko.Tests.Android/osu.Game.Rulesets.Taiko.Tests.Android.csproj b/osu.Game.Rulesets.Taiko.Tests.Android/osu.Game.Rulesets.Taiko.Tests.Android.csproj
index a48110b354..4d4dabebe6 100644
--- a/osu.Game.Rulesets.Taiko.Tests.Android/osu.Game.Rulesets.Taiko.Tests.Android.csproj
+++ b/osu.Game.Rulesets.Taiko.Tests.Android/osu.Game.Rulesets.Taiko.Tests.Android.csproj
@@ -14,6 +14,11 @@
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a</AndroidSupportedAbis>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AndroidLinkMode>None</AndroidLinkMode>
+    <MandroidI18n>cjk;mideast;other;rare;west</MandroidI18n>
+    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />
   </ItemGroup>
diff --git a/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj b/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj
index bf256f486c..b45a3249ff 100644
--- a/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj
+++ b/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj
@@ -23,6 +23,11 @@
   <PropertyGroup>
     <NoWarn>$(NoWarn);CA2007</NoWarn>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AndroidLinkMode>None</AndroidLinkMode>
+    <MandroidI18n>cjk;mideast;other;rare;west</MandroidI18n>
+    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\osu.Game.Tests\**\Beatmaps\**\*.cs">
       <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>

From d0510222aeec68a7984dcb42411bff0a5fff3241 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 5 Apr 2021 19:59:54 +0900
Subject: [PATCH 2189/3722] Fix legacy beatmap encoding

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

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index d06478b9de..b581c46ec5 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -329,7 +329,13 @@ namespace osu.Game.Beatmaps.Formats
 
                 if (point.Type.Value != null)
                 {
-                    if (point.Type.Value != lastType)
+                    // We've reached a new segment!
+
+                    // To preserve compatibility with osu-stable as much as possible, segments with the same type are converted to use implicit segments by duplicating the control point.
+                    // One exception to this is when the last control point of the last segment was itself a duplicate, which can't be supported by osu-stable.
+                    bool lastPointWasDuplicate = i > 1 && pathData.Path.ControlPoints[i - 1].Position.Value == pathData.Path.ControlPoints[i - 2].Position.Value;
+
+                    if (lastPointWasDuplicate || point.Type.Value != lastType)
                     {
                         switch (point.Type.Value)
                         {

From 57983ae61f665229cbf8445d76d3f1ad9386a95e Mon Sep 17 00:00:00 2001
From: Samuel Cattini-Schultz <syriiins@gmail.com>
Date: Mon, 5 Apr 2021 22:14:31 +1000
Subject: [PATCH 2190/3722] Fix whitespace

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

diff --git a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
index b3d7ce3c40..b317c140d8 100644
--- a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
+++ b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
@@ -18,13 +18,13 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         /// </summary>
         protected readonly LimitedCapacityStack<DifficultyHitObject> Previous = new LimitedCapacityStack<DifficultyHitObject>(2); // Contained objects not used yet
 
-        
         /// <summary>
         /// Mods for use in skill calculations.
         /// </summary>
         protected IReadOnlyList<Mod> Mods => mods;
 
         private readonly Mod[] mods;
+
         protected Skill(Mod[] mods)
         {
             this.mods = mods;

From 5bdd15f7468a2319a3370850d966458e0936b232 Mon Sep 17 00:00:00 2001
From: Samuel Cattini-Schultz <syriiins@gmail.com>
Date: Mon, 5 Apr 2021 22:14:37 +1000
Subject: [PATCH 2191/3722] Refactor Skill.Process() to not require calling
 base.Process()

---
 osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs |  2 +-
 osu.Game/Rulesets/Difficulty/Skills/Skill.cs         | 11 +++++++----
 osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs   |  4 +---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
index 14ada8ca09..5780fe39fa 100644
--- a/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
+++ b/osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Rulesets.Difficulty
             {
                 foreach (var skill in skills)
                 {
-                    skill.Process(hitObject);
+                    skill.ProcessInternal(hitObject);
                 }
             }
 
diff --git a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
index b317c140d8..534dee3ba8 100644
--- a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
+++ b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
@@ -30,14 +30,17 @@ namespace osu.Game.Rulesets.Difficulty.Skills
             this.mods = mods;
         }
 
+        internal void ProcessInternal(DifficultyHitObject current)
+        {
+            Process(current);
+            Previous.Push(current);
+        }
+
         /// <summary>
         /// Process a <see cref="DifficultyHitObject"/>.
         /// </summary>
         /// <param name="current">The <see cref="DifficultyHitObject"/> to process.</param>
-        public virtual void Process(DifficultyHitObject current)
-        {
-            Previous.Push(current);
-        }
+        protected abstract void Process(DifficultyHitObject current);
 
         /// <summary>
         /// Returns the calculated difficulty value representing all <see cref="DifficultyHitObject"/>s that have been processed up to this point.
diff --git a/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs b/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs
index c324f8e414..71cee36812 100644
--- a/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs
+++ b/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         /// <summary>
         /// Process a <see cref="DifficultyHitObject"/> and update current strain values accordingly.
         /// </summary>
-        public sealed override void Process(DifficultyHitObject current)
+        protected sealed override void Process(DifficultyHitObject current)
         {
             // The first object doesn't generate a strain, so we begin with an incremented section end
             if (Previous.Count == 0)
@@ -72,8 +72,6 @@ namespace osu.Game.Rulesets.Difficulty.Skills
             CurrentStrain += StrainValueOf(current) * SkillMultiplier;
 
             currentSectionPeak = Math.Max(CurrentStrain, currentSectionPeak);
-
-            base.Process(current);
         }
 
         /// <summary>

From beebdb073471fdd6bf075fdb1a3d243018e8c8e7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 5 Apr 2021 22:30:51 +0900
Subject: [PATCH 2192/3722] Clean up implementation

---
 .../Gameplay/TestSceneGameplayMenuOverlay.cs  |  2 +-
 .../Input/Bindings/GlobalActionContainer.cs   | 20 ++++++++++++-------
 osu.Game/Input/Bindings/GlobalInputManager.cs |  6 +-----
 osu.Game/OsuGame.cs                           |  1 -
 .../Visual/OsuManualInputManagerTestScene.cs  |  2 +-
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.cs
index d69ac665cc..75e8194708 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [BackgroundDependencyLoader]
         private void load(OsuGameBase game)
         {
-            Child = globalActionContainer = new GlobalActionContainer(game);
+            Child = globalActionContainer = new GlobalActionContainer(game, null);
         }
 
         [SetUp]
diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 6d038c43cf..ab8a40dbe3 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.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.ComponentModel;
 using System.Linq;
@@ -13,15 +12,17 @@ namespace osu.Game.Input.Bindings
 {
     public class GlobalActionContainer : DatabasedKeyBindingContainer<GlobalAction>, IHandleGlobalKeyboardInput
     {
+        private readonly GlobalInputManager globalInputManager;
+
         private readonly Drawable handler;
 
-        public GlobalActionContainer(OsuGameBase game, bool nested = false)
+        public GlobalActionContainer(OsuGameBase game, GlobalInputManager globalInputManager)
             : base(matchingMode: KeyCombinationMatchingMode.Modifiers)
         {
+            this.globalInputManager = globalInputManager;
+
             if (game is IKeyBindingHandler<GlobalAction>)
                 handler = game;
-
-            GetInputQueue = () => base.KeyBindingInputQueue.ToArray();
         }
 
         public override IEnumerable<IKeyBinding> DefaultKeyBindings => GlobalKeyBindings.Concat(InGameKeyBindings).Concat(AudioControlKeyBindings).Concat(EditorKeyBindings);
@@ -94,10 +95,15 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(InputKey.F3, GlobalAction.MusicPlay)
         };
 
-        public Func<Drawable[]> GetInputQueue { get; set; }
+        protected override IEnumerable<Drawable> KeyBindingInputQueue
+        {
+            get
+            {
+                var inputQueue = globalInputManager?.NonPositionalInputQueue ?? base.KeyBindingInputQueue;
 
-        protected override IEnumerable<Drawable> KeyBindingInputQueue =>
-            handler == null ? GetInputQueue() : GetInputQueue().Prepend(handler);
+                return handler != null ? inputQueue.Prepend(handler) : inputQueue;
+            }
+        }
     }
 
     public enum GlobalAction
diff --git a/osu.Game/Input/Bindings/GlobalInputManager.cs b/osu.Game/Input/Bindings/GlobalInputManager.cs
index 475397408a..91373712fb 100644
--- a/osu.Game/Input/Bindings/GlobalInputManager.cs
+++ b/osu.Game/Input/Bindings/GlobalInputManager.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 osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
@@ -23,10 +22,7 @@ namespace osu.Game.Input.Bindings
                     RelativeSizeAxes = Axes.Both,
                 },
                 // to avoid positional input being blocked by children, ensure the GlobalActionContainer is above everything.
-                GlobalBindings = new GlobalActionContainer(game, true)
-                {
-                    GetInputQueue = () => NonPositionalInputQueue.ToArray()
-                },
+                GlobalBindings = new GlobalActionContainer(game, this)
             };
         }
     }
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 5fa315a464..809e5d3c1b 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -27,7 +27,6 @@ using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
-using osu.Framework.Input.Events;
 using osu.Framework.Threading;
 using osu.Game.Beatmaps;
 using osu.Game.Collections;
diff --git a/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs b/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
index 64f4d7b95b..b3073c8bea 100644
--- a/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Tests.Visual
                 InputManager = new ManualInputManager
                 {
                     UseParentInput = true,
-                    Child = new GlobalActionContainer(null)
+                    Child = new GlobalActionContainer(null, null)
                         .WithChild((cursorContainer = new MenuCursorContainer { RelativeSizeAxes = Axes.Both })
                             .WithChild(content = new OsuTooltipContainer(cursorContainer.Cursor) { RelativeSizeAxes = Axes.Both }))
                 },

From e486e521ffcea5d099f5563af6cbba98dd2a1bbb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 5 Apr 2021 22:46:01 +0900
Subject: [PATCH 2193/3722] Fix regressed test

---
 osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index 3e25e22b5f..00f9bf3432 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
 using osu.Game.Overlays.Toolbar;
@@ -146,7 +147,7 @@ namespace osu.Game.Tests.Visual.Navigation
             AddStep("Move mouse to backButton", () => InputManager.MoveMouseTo(backButtonPosition));
 
             // BackButton handles hover using its child button, so this checks whether or not any of BackButton's children are hovered.
-            AddUntilStep("Back button is hovered", () => InputManager.HoveredDrawables.Any(d => d.Parent == Game.BackButton));
+            AddUntilStep("Back button is hovered", () => Game.ChildrenOfType<BackButton>().First().Children.Any(c => c.IsHovered));
 
             AddStep("Click back button", () => InputManager.Click(MouseButton.Left));
             AddUntilStep("Overlay was hidden", () => songSelect.ModSelectOverlay.State.Value == Visibility.Hidden);

From ffe7edc16ac13f4460d3dbfc327d1622bfb7e32e Mon Sep 17 00:00:00 2001
From: Samuel Cattini-Schultz <syriiins@gmail.com>
Date: Tue, 6 Apr 2021 11:06:10 +1000
Subject: [PATCH 2194/3722] Update xmldocs

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
---
 osu.Game/Rulesets/Difficulty/Utils/ReverseQueue.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Difficulty/Utils/ReverseQueue.cs b/osu.Game/Rulesets/Difficulty/Utils/ReverseQueue.cs
index 08b2936876..e94fbd4e0f 100644
--- a/osu.Game/Rulesets/Difficulty/Utils/ReverseQueue.cs
+++ b/osu.Game/Rulesets/Difficulty/Utils/ReverseQueue.cs
@@ -8,7 +8,7 @@ using System.Collections.Generic;
 namespace osu.Game.Rulesets.Difficulty.Utils
 {
     /// <summary>
-    /// An indexed queue where items are indexed beginning from the end instead of the start.
+    /// An indexed queue where items are indexed beginning from the most recently enqueued item.
     /// </summary>
     public class ReverseQueue<T> : IEnumerable<T>
     {
@@ -76,7 +76,7 @@ namespace osu.Game.Rulesets.Difficulty.Utils
         }
 
         /// <summary>
-        /// Dequeues an item from the <see cref="ReverseQueue{T}"/> and returns it.
+        /// Dequeues the least recently enqueued item from the <see cref="ReverseQueue{T}"/> and returns it.
         /// </summary>
         /// <returns>The item dequeued from the <see cref="ReverseQueue{T}"/>.</returns>
         public T Dequeue()
@@ -97,7 +97,7 @@ namespace osu.Game.Rulesets.Difficulty.Utils
         }
 
         /// <summary>
-        /// Returns an enumerator which enumerates items in the <see cref="ReverseQueue{T}"/> starting from the most recently enqueued one.
+        /// Returns an enumerator which enumerates items in the <see cref="ReverseQueue{T}"/> starting from the most recently enqueued item.
         /// </summary>
         public IEnumerator<T> GetEnumerator()
         {

From 65f93d6f9d9fbc8a9b3c68b10e6303ed425aaf71 Mon Sep 17 00:00:00 2001
From: Samuel Cattini-Schultz <syriiins@gmail.com>
Date: Tue, 6 Apr 2021 11:30:58 +1000
Subject: [PATCH 2195/3722] Add more descriptive xmldoc for ReverseQueue

---
 osu.Game/Rulesets/Difficulty/Utils/ReverseQueue.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Rulesets/Difficulty/Utils/ReverseQueue.cs b/osu.Game/Rulesets/Difficulty/Utils/ReverseQueue.cs
index e94fbd4e0f..f104b8105a 100644
--- a/osu.Game/Rulesets/Difficulty/Utils/ReverseQueue.cs
+++ b/osu.Game/Rulesets/Difficulty/Utils/ReverseQueue.cs
@@ -9,6 +9,8 @@ namespace osu.Game.Rulesets.Difficulty.Utils
 {
     /// <summary>
     /// An indexed queue where items are indexed beginning from the most recently enqueued item.
+    /// Enqueuing an item pushes all existing indexes up by one and inserts the item at index 0.
+    /// Dequeuing an item removes the item from the highest index and returns it.
     /// </summary>
     public class ReverseQueue<T> : IEnumerable<T>
     {

From 5cd43b3a7fc2f267628e5b1b979affa52d4f9e2d Mon Sep 17 00:00:00 2001
From: Samuel Cattini-Schultz <syriiins@gmail.com>
Date: Tue, 6 Apr 2021 11:53:31 +1000
Subject: [PATCH 2196/3722] Set default history retention to 0 for Skill and
 override in StrainSkill

Some skills might not even require history retention, so why waste the allocations?
---
 osu.Game/Rulesets/Difficulty/Skills/Skill.cs       | 10 +++++-----
 osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs | 13 +++++++++++++
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
index 94d823f2ad..ebd389d823 100644
--- a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
+++ b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
@@ -22,8 +22,9 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         /// Soft capacity of the <see cref="Previous"/> queue.
         /// <see cref="Previous"/> will automatically resize if it exceeds capacity, but will do so at a very slight performance impact.
         /// The actual capacity will be set to this value + 1 to allow for storage of the current object before the next can be processed.
+        /// Setting to zero (default) will cause <see cref="Previous"/> to be uninstanciated.
         /// </summary>
-        protected virtual int PreviousCollectionSoftCapacity => 1;
+        protected virtual int PreviousCollectionSoftCapacity => 0;
 
         /// <summary>
         /// Mods for use in skill calculations.
@@ -35,7 +36,9 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         protected Skill(Mod[] mods)
         {
             this.mods = mods;
-            Previous = new ReverseQueue<DifficultyHitObject>(PreviousCollectionSoftCapacity + 1);
+
+            if (PreviousCollectionSoftCapacity > 0)
+                Previous = new ReverseQueue<DifficultyHitObject>(PreviousCollectionSoftCapacity + 1);
         }
 
         internal void ProcessInternal(DifficultyHitObject current)
@@ -51,8 +54,6 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         /// <param name="current">The <see cref="DifficultyHitObject"/> to be processed.</param>
         protected virtual void RemoveExtraneousHistory(DifficultyHitObject current)
         {
-            while (Previous.Count > 1)
-                Previous.Dequeue();
         }
 
         /// <summary>
@@ -61,7 +62,6 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         /// <param name="current">The <see cref="DifficultyHitObject"/> that was just processed.</param>
         protected virtual void AddToHistory(DifficultyHitObject current)
         {
-            Previous.Enqueue(current);
         }
 
         /// <summary>
diff --git a/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs b/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs
index 71cee36812..16816be35c 100644
--- a/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs
+++ b/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs
@@ -20,6 +20,8 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         /// </summary>
         protected abstract double SkillMultiplier { get; }
 
+        protected override int PreviousCollectionSoftCapacity => 1;
+
         /// <summary>
         /// Determines how quickly strain decays for the given skill.
         /// For example a value of 0.15 indicates that strain decays to 15% of its original value in one second.
@@ -52,6 +54,17 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         {
         }
 
+        protected override void RemoveExtraneousHistory(DifficultyHitObject current)
+        {
+            while (Previous.Count > 1)
+                Previous.Dequeue();
+        }
+
+        protected override void AddToHistory(DifficultyHitObject current)
+        {
+            Previous.Enqueue(current);
+        }
+
         /// <summary>
         /// Process a <see cref="DifficultyHitObject"/> and update current strain values accordingly.
         /// </summary>

From a2544100d418cdbe3b7de383d9dfb2a2e2a95f38 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 6 Apr 2021 14:10:59 +0900
Subject: [PATCH 2197/3722] Fix floating point error in slider path encoding

---
 .../Beatmaps/Formats/LegacyBeatmapEncoder.cs  | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index b581c46ec5..5eb5fcdfa0 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -329,13 +329,25 @@ namespace osu.Game.Beatmaps.Formats
 
                 if (point.Type.Value != null)
                 {
-                    // We've reached a new segment!
+                    // We've reached a new (explicit) segment!
 
-                    // To preserve compatibility with osu-stable as much as possible, segments with the same type are converted to use implicit segments by duplicating the control point.
-                    // One exception to this is when the last control point of the last segment was itself a duplicate, which can't be supported by osu-stable.
-                    bool lastPointWasDuplicate = i > 1 && pathData.Path.ControlPoints[i - 1].Position.Value == pathData.Path.ControlPoints[i - 2].Position.Value;
+                    // Explicit segments have a new format in which the type is injected into the middle of the control point string.
+                    // To preserve compatibility with osu-stable as much as possible, explicit segments with the same type are converted to use implicit segments by duplicating the control point.
+                    bool needsExplicitSegment = point.Type.Value != lastType;
 
-                    if (lastPointWasDuplicate || point.Type.Value != lastType)
+                    // One exception to this is when the last two control points of the last segment were duplicated. This is not a scenario supported by osu!stable.
+                    // Lazer does not add implicit segments for the last two control points of _any_ explicit segment, so an explicit segment is forced in order to maintain consistency with the decoder.
+                    if (i > 1)
+                    {
+                        // We need to use the absolute control point position to determine equality, otherwise floating point issues may arise.
+                        Vector2 p1 = position + pathData.Path.ControlPoints[i - 1].Position.Value;
+                        Vector2 p2 = position + pathData.Path.ControlPoints[i - 2].Position.Value;
+
+                        if ((int)p1.X == (int)p2.X && (int)p1.Y == (int)p2.Y)
+                            needsExplicitSegment = true;
+                    }
+
+                    if (needsExplicitSegment)
                     {
                         switch (point.Type.Value)
                         {

From 8ff13845d1b911031fef877656337bba471a3b0f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Apr 2021 14:24:22 +0900
Subject: [PATCH 2198/3722] Add marker showing where 00:00:000 is

---
 .../Screens/Edit/Compose/Components/Timeline/Timeline.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 0697dbb392..86a30b7e2d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -9,6 +9,7 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Audio;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
@@ -91,6 +92,14 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         },
                         ticks = new TimelineTickDisplay(),
                         controlPoints = new TimelineControlPointDisplay(),
+                        new Box
+                        {
+                            Name = "zero marker",
+                            RelativeSizeAxes = Axes.Y,
+                            Width = 2,
+                            Origin = Anchor.TopCentre,
+                            Colour = colours.YellowDarker,
+                        },
                     }
                 },
             });

From 35dd1c68aab5084a5bb0e3a0b984d0847fefd390 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Apr 2021 14:27:45 +0900
Subject: [PATCH 2199/3722] Fix drag/selection events not propagating correctly
 to TimelineBlueprintContainer when before time zero

---
 .../Components/Timeline/TimelineBlueprintContainer.cs      | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index 3623f8ad8e..e94634e6c4 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -36,6 +36,13 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private SelectionBlueprint placementBlueprint;
 
         private readonly Box backgroundBox;
+        // we only care about checking vertical validity.
+        // this allows selecting and dragging selections before time=0.
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos)
+        {
+            float localY = ToLocalSpace(screenSpacePos).Y;
+            return DrawRectangle.Top <= localY && DrawRectangle.Bottom >= localY;
+        }
 
         public TimelineBlueprintContainer(HitObjectComposer composer)
             : base(composer)

From 7d301a633639e9856ad0e05014f2ccbbde1e7f10 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Apr 2021 14:28:10 +0900
Subject: [PATCH 2200/3722] Improve timeline hover display before time zero
 with a gradient fade

---
 .../Timeline/TimelineBlueprintContainer.cs    | 49 ++++++++++++++++---
 1 file changed, 42 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index e94634e6c4..d17a7551dd 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -7,6 +7,7 @@ using System.Linq;
 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.Primitives;
 using osu.Framework.Graphics.Shapes;
@@ -16,6 +17,7 @@ using osu.Game.Graphics;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Compose.Components.Timeline
@@ -35,7 +37,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private Bindable<HitObject> placement;
         private SelectionBlueprint placementBlueprint;
 
-        private readonly Box backgroundBox;
+        private Box backgroundBox;
+        private Box backgroundBoxIntro;
+
         // we only care about checking vertical validity.
         // this allows selecting and dragging selections before time=0.
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos)
@@ -52,12 +56,26 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             Origin = Anchor.Centre;
 
             Height = 0.6f;
+        }
 
-            AddInternal(backgroundBox = new Box
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AddRangeInternal(new[]
             {
-                Colour = Color4.Black,
-                RelativeSizeAxes = Axes.Both,
-                Alpha = 0.1f,
+                backgroundBoxIntro = new Box
+                {
+                    RelativeSizeAxes = Axes.Y,
+                    Width = 200,
+                    Origin = Anchor.TopRight,
+                    Alpha = 0.1f,
+                },
+                backgroundBox = new Box
+                {
+                    Colour = Color4.Black,
+                    RelativeSizeAxes = Axes.Both,
+                    Alpha = 0.1f,
+                }
             });
         }
 
@@ -68,6 +86,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             placement = beatmap.PlacementObject.GetBoundCopy();
             placement.ValueChanged += placementChanged;
+
+            updateHoverState();
+            FinishTransforms(true);
         }
 
         private void placementChanged(ValueChangedEvent<HitObject> obj)
@@ -94,13 +115,13 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         protected override bool OnHover(HoverEvent e)
         {
-            backgroundBox.FadeColour(colours.BlueLighter, 120, Easing.OutQuint);
+            updateHoverState();
             return base.OnHover(e);
         }
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
-            backgroundBox.FadeColour(Color4.Black, 600, Easing.OutQuint);
+            updateHoverState();
             base.OnHoverLost(e);
         }
 
@@ -134,6 +155,20 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             updateStacking();
         }
 
+        private void updateHoverState()
+        {
+            if (IsHovered)
+            {
+                backgroundBox.FadeColour(colours.BlueLighter, 120, Easing.OutQuint);
+                backgroundBoxIntro.FadeColour(ColourInfo.GradientHorizontal(Color4.Black, colours.BlueLighter), 120, Easing.OutQuint);
+            }
+            else
+            {
+                backgroundBox.FadeColour(Color4.Black, 600, Easing.OutQuint);
+                backgroundBoxIntro.FadeColour(Color4.Black, 600, Easing.OutQuint);
+            }
+        }
+
         private void updateStacking()
         {
             // because only blueprints of objects which are alive (via pooling) are displayed in the timeline, it's feasible to do this every-update.

From 9c1320e18ba20c94637e35994d4ae526f3321f76 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 6 Apr 2021 14:33:46 +0900
Subject: [PATCH 2201/3722] Add test

---
 .../Formats/LegacyBeatmapEncoderTest.cs       | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index 0784109158..920cc36776 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -18,10 +18,14 @@ using osu.Game.IO;
 using osu.Game.IO.Serialization;
 using osu.Game.Rulesets.Catch;
 using osu.Game.Rulesets.Mania;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Taiko;
 using osu.Game.Skinning;
 using osu.Game.Tests.Resources;
+using osuTK;
 
 namespace osu.Game.Tests.Beatmaps.Formats
 {
@@ -45,6 +49,33 @@ namespace osu.Game.Tests.Beatmaps.Formats
             Assert.IsTrue(areComboColoursEqual(decodedAfterEncode.beatmapSkin.Configuration, decoded.beatmapSkin.Configuration));
         }
 
+        [Test]
+        public void TestEncodeMultiSegmentSliderWithFloatingPointError()
+        {
+            var beatmap = new Beatmap
+            {
+                HitObjects =
+                {
+                    new Slider
+                    {
+                        Position = new Vector2(0.6f),
+                        Path = new SliderPath(new[]
+                        {
+                            new PathControlPoint(Vector2.Zero, PathType.Bezier),
+                            new PathControlPoint(new Vector2(0.5f)),
+                            new PathControlPoint(new Vector2(0.51f)), // This is actually on the same position as the previous one in legacy beatmaps (truncated to int).
+                            new PathControlPoint(new Vector2(1f), PathType.Bezier),
+                            new PathControlPoint(new Vector2(2f))
+                        })
+                    },
+                }
+            };
+
+            var decodedAfterEncode = decodeFromLegacy(encodeToLegacy((beatmap, new TestLegacySkin(beatmaps_resource_store, string.Empty))), string.Empty);
+            var decodedSlider = (Slider)decodedAfterEncode.beatmap.HitObjects[0];
+            Assert.That(decodedSlider.Path.ControlPoints.Count, Is.EqualTo(5));
+        }
+
         private bool areComboColoursEqual(IHasComboColours a, IHasComboColours b)
         {
             // equal to null, no need to SequenceEqual

From 53c1bc666cde003e07fd396d49a0b75ec77358f8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Apr 2021 15:05:34 +0900
Subject: [PATCH 2202/3722] Make addition of nested GlobalActionContainer in
 OsuGameTestScene optional

---
 .../Visual/Navigation/OsuGameTestScene.cs     |  2 ++
 .../Visual/OsuManualInputManagerTestScene.cs  | 19 ++++++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
index bf5338d81a..f9a991f756 100644
--- a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
+++ b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
@@ -36,6 +36,8 @@ namespace osu.Game.Tests.Visual.Navigation
 
         protected override bool UseFreshStoragePerRun => true;
 
+        protected override bool CreateNestedActionContainer => false;
+
         [BackgroundDependencyLoader]
         private void load(GameHost host)
         {
diff --git a/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs b/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
index b3073c8bea..7dad636da7 100644
--- a/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
@@ -24,18 +24,31 @@ namespace osu.Game.Tests.Visual
         private readonly TriangleButton buttonTest;
         private readonly TriangleButton buttonLocal;
 
+        /// <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.
+        /// </summary>
+        protected virtual bool CreateNestedActionContainer => true;
+
         protected OsuManualInputManagerTestScene()
         {
             MenuCursorContainer cursorContainer;
 
+            CompositeDrawable mainContent =
+                (cursorContainer = new MenuCursorContainer { RelativeSizeAxes = Axes.Both })
+                .WithChild(content = new OsuTooltipContainer(cursorContainer.Cursor) { RelativeSizeAxes = Axes.Both });
+
+            if (CreateNestedActionContainer)
+            {
+                mainContent = new GlobalActionContainer(null, null).WithChild(mainContent);
+            }
+
             base.Content.AddRange(new Drawable[]
             {
                 InputManager = new ManualInputManager
                 {
                     UseParentInput = true,
-                    Child = new GlobalActionContainer(null, null)
-                        .WithChild((cursorContainer = new MenuCursorContainer { RelativeSizeAxes = Axes.Both })
-                            .WithChild(content = new OsuTooltipContainer(cursorContainer.Cursor) { RelativeSizeAxes = Axes.Both }))
+                    Child = mainContent
                 },
                 new Container
                 {

From 316a557a99d159b1887508e353dd610be4f9053f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Apr 2021 15:34:34 +0900
Subject: [PATCH 2203/3722] Split select area background into own class to
 reduce hover state complexity

---
 .../Timeline/TimelineBlueprintContainer.cs    | 66 +++++++++----------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index d17a7551dd..eb26a0d16f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -6,6 +6,7 @@ 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;
@@ -37,8 +38,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private Bindable<HitObject> placement;
         private SelectionBlueprint placementBlueprint;
 
-        private Box backgroundBox;
-        private Box backgroundBoxIntro;
+        private SelectableAreaBackground backgroundBox;
 
         // we only care about checking vertical validity.
         // this allows selecting and dragging selections before time=0.
@@ -61,21 +61,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [BackgroundDependencyLoader]
         private void load()
         {
-            AddRangeInternal(new[]
+            AddInternal(backgroundBox = new SelectableAreaBackground
             {
-                backgroundBoxIntro = new Box
-                {
-                    RelativeSizeAxes = Axes.Y,
-                    Width = 200,
-                    Origin = Anchor.TopRight,
-                    Alpha = 0.1f,
-                },
-                backgroundBox = new Box
-                {
-                    Colour = Color4.Black,
-                    RelativeSizeAxes = Axes.Both,
-                    Alpha = 0.1f,
-                }
+                Colour = Color4.Black
             });
         }
 
@@ -87,7 +75,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             placement = beatmap.PlacementObject.GetBoundCopy();
             placement.ValueChanged += placementChanged;
 
-            updateHoverState();
             FinishTransforms(true);
         }
 
@@ -115,13 +102,13 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         protected override bool OnHover(HoverEvent e)
         {
-            updateHoverState();
+            backgroundBox.FadeColour(colours.BlueLighter, 120, Easing.OutQuint);
             return base.OnHover(e);
         }
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
-            updateHoverState();
+            backgroundBox.FadeColour(Color4.Black, 600, Easing.OutQuint);
             base.OnHoverLost(e);
         }
 
@@ -155,20 +142,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             updateStacking();
         }
 
-        private void updateHoverState()
-        {
-            if (IsHovered)
-            {
-                backgroundBox.FadeColour(colours.BlueLighter, 120, Easing.OutQuint);
-                backgroundBoxIntro.FadeColour(ColourInfo.GradientHorizontal(Color4.Black, colours.BlueLighter), 120, Easing.OutQuint);
-            }
-            else
-            {
-                backgroundBox.FadeColour(Color4.Black, 600, Easing.OutQuint);
-                backgroundBoxIntro.FadeColour(Color4.Black, 600, Easing.OutQuint);
-            }
-        }
-
         private void updateStacking()
         {
             // because only blueprints of objects which are alive (via pooling) are displayed in the timeline, it's feasible to do this every-update.
@@ -237,6 +210,33 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             }
         }
 
+        private class SelectableAreaBackground : CompositeDrawable
+        {
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                RelativeSizeAxes = Axes.Both;
+                Alpha = 0.1f;
+
+                AddRangeInternal(new[]
+                {
+                    // fade out over intro time, outside the valid time bounds.
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Y,
+                        Width = 200,
+                        Origin = Anchor.TopRight,
+                        Colour = ColourInfo.GradientHorizontal(Color4.White.Opacity(0), Color4.White),
+                    },
+                    new Box
+                    {
+                        Colour = Color4.White,
+                        RelativeSizeAxes = Axes.Both,
+                    }
+                });
+            }
+        }
+
         internal class TimelineSelectionHandler : SelectionHandler
         {
             // for now we always allow movement. snapping is provided by the Timeline's "distance" snap implementation

From 9d0839be8ff83793883386c0701da939a5f7d954 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Apr 2021 15:35:07 +0900
Subject: [PATCH 2204/3722] Remove no longer necessary FinishTranforms call

---
 .../Compose/Components/Timeline/TimelineBlueprintContainer.cs   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index eb26a0d16f..be34c8d57e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -74,8 +74,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             placement = beatmap.PlacementObject.GetBoundCopy();
             placement.ValueChanged += placementChanged;
-
-            FinishTransforms(true);
         }
 
         private void placementChanged(ValueChangedEvent<HitObject> obj)

From 933c4010da4cf1f23d27326fca1c7ad9288ec1bb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Apr 2021 16:17:20 +0900
Subject: [PATCH 2205/3722] Allow creating OnlineViewContainers with no
 placeholder button

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

diff --git a/osu.Game/Online/OnlineViewContainer.cs b/osu.Game/Online/OnlineViewContainer.cs
index 8868f90524..4955aa9058 100644
--- a/osu.Game/Online/OnlineViewContainer.cs
+++ b/osu.Game/Online/OnlineViewContainer.cs
@@ -23,13 +23,17 @@ namespace osu.Game.Online
 
         private readonly string placeholderMessage;
 
-        private Placeholder placeholder;
+        private Drawable placeholder;
 
         private const double transform_duration = 300;
 
         [Resolved]
         protected IAPIProvider API { get; private set; }
 
+        /// <summary>
+        /// Construct a new instance of an online view container.
+        /// </summary>
+        /// <param name="placeholderMessage">The message to display when not logged in. If empty, no button will display.</param>
         public OnlineViewContainer(string placeholderMessage)
         {
             this.placeholderMessage = placeholderMessage;
@@ -40,10 +44,10 @@ namespace osu.Game.Online
         [BackgroundDependencyLoader]
         private void load(IAPIProvider api)
         {
-            InternalChildren = new Drawable[]
+            InternalChildren = new[]
             {
                 Content,
-                placeholder = new LoginPlaceholder(placeholderMessage),
+                placeholder = string.IsNullOrEmpty(placeholderMessage) ? Empty() : new LoginPlaceholder(placeholderMessage),
                 LoadingSpinner = new LoadingSpinner
                 {
                     Alpha = 0,

From dafa8bbe4e51935b5b7264e134018d064fd42503 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Apr 2021 16:17:38 +0900
Subject: [PATCH 2206/3722] Refactor BeatmapDetails to use GridContainer to
 keep a consistent layout

---
 osu.Game/Screens/Select/BeatmapDetails.cs | 173 ++++++++++++----------
 1 file changed, 91 insertions(+), 82 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index 40029cc19a..41bde40221 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -8,8 +8,8 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using System.Linq;
+using osu.Framework.Bindables;
 using osu.Game.Online.API;
-using osu.Framework.Threading;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Game.Screens.Select.Details;
@@ -28,11 +28,8 @@ namespace osu.Game.Screens.Select
         private const float spacing = 10;
         private const float transition_duration = 250;
 
-        private readonly FillFlowContainer top, statsFlow;
         private readonly AdvancedStats advanced;
-        private readonly DetailBox ratingsContainer;
         private readonly UserRatings ratings;
-        private readonly OsuScrollContainer metadataScroll;
         private readonly MetadataSection description, source, tags;
         private readonly Container failRetryContainer;
         private readonly FailRetryGraph failRetryGraph;
@@ -41,8 +38,6 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        private ScheduledDelegate pendingBeatmapSwitch;
-
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
@@ -57,8 +52,7 @@ namespace osu.Game.Screens.Select
 
                 beatmap = value;
 
-                pendingBeatmapSwitch?.Cancel();
-                pendingBeatmapSwitch = Schedule(updateStatistics);
+                Scheduler.AddOnce(updateStatistics);
             }
         }
 
@@ -75,99 +69,115 @@ namespace osu.Game.Screens.Select
                 {
                     RelativeSizeAxes = Axes.Both,
                     Padding = new MarginPadding { Horizontal = spacing },
-                    Children = new Drawable[]
+                    Child = new GridContainer
                     {
-                        top = new FillFlowContainer
+                        RelativeSizeAxes = Axes.Both,
+                        RowDimensions = new[]
                         {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                            Direction = FillDirection.Horizontal,
-                            Children = new Drawable[]
+                            new Dimension(GridSizeMode.AutoSize),
+                            new Dimension()
+                        },
+                        Content = new[]
+                        {
+                            new Drawable[]
                             {
-                                statsFlow = new FillFlowContainer
+                                new FillFlowContainer
                                 {
                                     RelativeSizeAxes = Axes.X,
                                     AutoSizeAxes = Axes.Y,
-                                    Width = 0.5f,
-                                    Spacing = new Vector2(spacing),
-                                    Padding = new MarginPadding { Right = spacing / 2 },
-                                    Children = new[]
+                                    Direction = FillDirection.Horizontal,
+                                    Children = new Drawable[]
                                     {
-                                        new DetailBox
+                                        new FillFlowContainer
                                         {
-                                            Child = advanced = new AdvancedStats
+                                            RelativeSizeAxes = Axes.X,
+                                            AutoSizeAxes = Axes.Y,
+                                            Width = 0.5f,
+                                            Spacing = new Vector2(spacing),
+                                            Padding = new MarginPadding { Right = spacing / 2 },
+                                            Children = new[]
+                                            {
+                                                new DetailBox().WithChild(advanced = new AdvancedStats
+                                                {
+                                                    RelativeSizeAxes = Axes.X,
+                                                    AutoSizeAxes = Axes.Y,
+                                                    Padding = new MarginPadding { Horizontal = spacing, Top = spacing * 2, Bottom = spacing },
+                                                }),
+                                                new DetailBox().WithChild(new OnlineViewContainer(string.Empty)
+                                                {
+                                                    RelativeSizeAxes = Axes.X,
+                                                    Height = 134,
+                                                    Padding = new MarginPadding { Horizontal = spacing, Top = spacing },
+                                                    Child = ratings = new UserRatings
+                                                    {
+                                                        RelativeSizeAxes = Axes.Both,
+                                                    },
+                                                }),
+                                            },
+                                        },
+                                        new OsuScrollContainer
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                            Width = 0.5f,
+                                            ScrollbarVisible = false,
+                                            Padding = new MarginPadding { Left = spacing / 2 },
+                                            Child = new FillFlowContainer
                                             {
                                                 RelativeSizeAxes = Axes.X,
                                                 AutoSizeAxes = Axes.Y,
-                                                Padding = new MarginPadding { Horizontal = spacing, Top = spacing * 2, Bottom = spacing },
+                                                LayoutDuration = transition_duration,
+                                                LayoutEasing = Easing.OutQuad,
+                                                Spacing = new Vector2(spacing * 2),
+                                                Margin = new MarginPadding { Top = spacing * 2 },
+                                                Children = new[]
+                                                {
+                                                    description = new MetadataSection("Description"),
+                                                    source = new MetadataSection("Source"),
+                                                    tags = new MetadataSection("Tags"),
+                                                },
                                             },
                                         },
-                                        ratingsContainer = new DetailBox
-                                        {
-                                            Child = ratings = new UserRatings
-                                            {
-                                                RelativeSizeAxes = Axes.X,
-                                                Height = 134,
-                                                Padding = new MarginPadding { Horizontal = spacing, Top = spacing },
-                                            },
-                                        },
-                                    },
-                                },
-                                metadataScroll = new OsuScrollContainer
-                                {
-                                    RelativeSizeAxes = Axes.X,
-                                    Width = 0.5f,
-                                    ScrollbarVisible = false,
-                                    Padding = new MarginPadding { Left = spacing / 2 },
-                                    Child = new FillFlowContainer
-                                    {
-                                        RelativeSizeAxes = Axes.X,
-                                        AutoSizeAxes = Axes.Y,
-                                        LayoutDuration = transition_duration,
-                                        LayoutEasing = Easing.OutQuad,
-                                        Spacing = new Vector2(spacing * 2),
-                                        Margin = new MarginPadding { Top = spacing * 2 },
-                                        Children = new[]
-                                        {
-                                            description = new MetadataSection("Description"),
-                                            source = new MetadataSection("Source"),
-                                            tags = new MetadataSection("Tags"),
-                                        },
                                     },
                                 },
                             },
-                        },
-                        failRetryContainer = new OnlineViewContainer("Sign in to view more details")
-                        {
-                            Anchor = Anchor.BottomLeft,
-                            Origin = Anchor.BottomLeft,
-                            RelativeSizeAxes = Axes.X,
-                            Children = new Drawable[]
+                            new Drawable[]
                             {
-                                new OsuSpriteText
-                                {
-                                    Text = "Points of Failure",
-                                    Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 14),
-                                },
-                                failRetryGraph = new FailRetryGraph
+                                failRetryContainer = new OnlineViewContainer("Sign in to view more details")
                                 {
                                     RelativeSizeAxes = Axes.Both,
-                                    Padding = new MarginPadding { Top = 14 + spacing / 2 },
+                                    Children = new Drawable[]
+                                    {
+                                        new OsuSpriteText
+                                        {
+                                            Text = "Points of Failure",
+                                            Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 14),
+                                        },
+                                        failRetryGraph = new FailRetryGraph
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                            Padding = new MarginPadding { Top = 14 + spacing / 2 },
+                                        },
+                                        loading = new LoadingLayer(true)
+                                    },
                                 },
-                                loading = new LoadingLayer(true)
-                            },
-                        },
-                    },
+                            }
+                        }
+                    }
                 },
             };
         }
 
-        protected override void UpdateAfterChildren()
-        {
-            base.UpdateAfterChildren();
+        private IBindable<APIState> apiOnlineState;
 
-            metadataScroll.Height = statsFlow.DrawHeight;
-            failRetryContainer.Height = DrawHeight - Padding.TotalVertical - (top.DrawHeight + spacing / 2);
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            apiOnlineState = api.State.GetBoundCopy();
+            apiOnlineState.BindValueChanged(state =>
+            {
+                Scheduler.AddOnce(updateStatistics);
+            });
         }
 
         private void updateStatistics()
@@ -185,7 +195,7 @@ namespace osu.Game.Screens.Select
             }
 
             // for now, let's early abort if an OnlineBeatmapID is not present (should have been populated at import time).
-            if (Beatmap?.OnlineBeatmapID == null)
+            if (Beatmap?.OnlineBeatmapID == null || apiOnlineState.Value != APIState.Online)
             {
                 updateMetrics();
                 return;
@@ -237,17 +247,16 @@ namespace osu.Game.Screens.Select
             var hasRatings = beatmap?.BeatmapSet?.Metrics?.Ratings?.Any() ?? false;
             var hasRetriesFails = (beatmap?.Metrics?.Retries?.Any() ?? false) || (beatmap?.Metrics?.Fails?.Any() ?? false);
 
-            bool isOnline = api.State.Value == APIState.Online;
-
-            if (hasRatings && isOnline)
+            if (hasRatings)
             {
                 ratings.Metrics = beatmap.BeatmapSet.Metrics;
-                ratingsContainer.FadeIn(transition_duration);
+                ratings.FadeIn(transition_duration);
             }
             else
             {
+                // loading or just has no data server-side.
                 ratings.Metrics = new BeatmapSetMetrics { Ratings = new int[10] };
-                ratingsContainer.FadeTo(isOnline ? 0.25f : 0, transition_duration);
+                ratings.FadeTo(0.25f, transition_duration);
             }
 
             if (hasRetriesFails)

From 59e6c46644d89d19ad1915db2d657367153246fa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Apr 2021 16:23:27 +0900
Subject: [PATCH 2207/3722] Remove unnecessary online state logic

---
 osu.Game/Screens/Select/BeatmapDetails.cs | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index 41bde40221..86a21dcc42 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using System.Linq;
-using osu.Framework.Bindables;
 using osu.Game.Online.API;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Extensions.Color4Extensions;
@@ -167,19 +166,6 @@ namespace osu.Game.Screens.Select
             };
         }
 
-        private IBindable<APIState> apiOnlineState;
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            apiOnlineState = api.State.GetBoundCopy();
-            apiOnlineState.BindValueChanged(state =>
-            {
-                Scheduler.AddOnce(updateStatistics);
-            });
-        }
-
         private void updateStatistics()
         {
             advanced.Beatmap = Beatmap;
@@ -195,7 +181,7 @@ namespace osu.Game.Screens.Select
             }
 
             // for now, let's early abort if an OnlineBeatmapID is not present (should have been populated at import time).
-            if (Beatmap?.OnlineBeatmapID == null || apiOnlineState.Value != APIState.Online)
+            if (Beatmap?.OnlineBeatmapID == null)
             {
                 updateMetrics();
                 return;

From 1934e8e1fe0c2c66cecbacba3db59299f839a915 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Apr 2021 16:29:07 +0900
Subject: [PATCH 2208/3722] Fix loading layer being in the wrong place

---
 osu.Game/Screens/Select/BeatmapDetails.cs | 145 +++++++++++-----------
 1 file changed, 74 insertions(+), 71 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index 86a21dcc42..46aa568039 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -68,99 +68,102 @@ namespace osu.Game.Screens.Select
                 {
                     RelativeSizeAxes = Axes.Both,
                     Padding = new MarginPadding { Horizontal = spacing },
-                    Child = new GridContainer
+                    Children = new Drawable[]
                     {
-                        RelativeSizeAxes = Axes.Both,
-                        RowDimensions = new[]
+                        new GridContainer
                         {
-                            new Dimension(GridSizeMode.AutoSize),
-                            new Dimension()
-                        },
-                        Content = new[]
-                        {
-                            new Drawable[]
+                            RelativeSizeAxes = Axes.Both,
+                            RowDimensions = new[]
                             {
-                                new FillFlowContainer
+                                new Dimension(GridSizeMode.AutoSize),
+                                new Dimension()
+                            },
+                            Content = new[]
+                            {
+                                new Drawable[]
                                 {
-                                    RelativeSizeAxes = Axes.X,
-                                    AutoSizeAxes = Axes.Y,
-                                    Direction = FillDirection.Horizontal,
-                                    Children = new Drawable[]
+                                    new FillFlowContainer
                                     {
-                                        new FillFlowContainer
+                                        RelativeSizeAxes = Axes.X,
+                                        AutoSizeAxes = Axes.Y,
+                                        Direction = FillDirection.Horizontal,
+                                        Children = new Drawable[]
                                         {
-                                            RelativeSizeAxes = Axes.X,
-                                            AutoSizeAxes = Axes.Y,
-                                            Width = 0.5f,
-                                            Spacing = new Vector2(spacing),
-                                            Padding = new MarginPadding { Right = spacing / 2 },
-                                            Children = new[]
-                                            {
-                                                new DetailBox().WithChild(advanced = new AdvancedStats
-                                                {
-                                                    RelativeSizeAxes = Axes.X,
-                                                    AutoSizeAxes = Axes.Y,
-                                                    Padding = new MarginPadding { Horizontal = spacing, Top = spacing * 2, Bottom = spacing },
-                                                }),
-                                                new DetailBox().WithChild(new OnlineViewContainer(string.Empty)
-                                                {
-                                                    RelativeSizeAxes = Axes.X,
-                                                    Height = 134,
-                                                    Padding = new MarginPadding { Horizontal = spacing, Top = spacing },
-                                                    Child = ratings = new UserRatings
-                                                    {
-                                                        RelativeSizeAxes = Axes.Both,
-                                                    },
-                                                }),
-                                            },
-                                        },
-                                        new OsuScrollContainer
-                                        {
-                                            RelativeSizeAxes = Axes.Both,
-                                            Width = 0.5f,
-                                            ScrollbarVisible = false,
-                                            Padding = new MarginPadding { Left = spacing / 2 },
-                                            Child = new FillFlowContainer
+                                            new FillFlowContainer
                                             {
                                                 RelativeSizeAxes = Axes.X,
                                                 AutoSizeAxes = Axes.Y,
-                                                LayoutDuration = transition_duration,
-                                                LayoutEasing = Easing.OutQuad,
-                                                Spacing = new Vector2(spacing * 2),
-                                                Margin = new MarginPadding { Top = spacing * 2 },
+                                                Width = 0.5f,
+                                                Spacing = new Vector2(spacing),
+                                                Padding = new MarginPadding { Right = spacing / 2 },
                                                 Children = new[]
                                                 {
-                                                    description = new MetadataSection("Description"),
-                                                    source = new MetadataSection("Source"),
-                                                    tags = new MetadataSection("Tags"),
+                                                    new DetailBox().WithChild(advanced = new AdvancedStats
+                                                    {
+                                                        RelativeSizeAxes = Axes.X,
+                                                        AutoSizeAxes = Axes.Y,
+                                                        Padding = new MarginPadding { Horizontal = spacing, Top = spacing * 2, Bottom = spacing },
+                                                    }),
+                                                    new DetailBox().WithChild(new OnlineViewContainer(string.Empty)
+                                                    {
+                                                        RelativeSizeAxes = Axes.X,
+                                                        Height = 134,
+                                                        Padding = new MarginPadding { Horizontal = spacing, Top = spacing },
+                                                        Child = ratings = new UserRatings
+                                                        {
+                                                            RelativeSizeAxes = Axes.Both,
+                                                        },
+                                                    }),
+                                                },
+                                            },
+                                            new OsuScrollContainer
+                                            {
+                                                RelativeSizeAxes = Axes.Both,
+                                                Width = 0.5f,
+                                                ScrollbarVisible = false,
+                                                Padding = new MarginPadding { Left = spacing / 2 },
+                                                Child = new FillFlowContainer
+                                                {
+                                                    RelativeSizeAxes = Axes.X,
+                                                    AutoSizeAxes = Axes.Y,
+                                                    LayoutDuration = transition_duration,
+                                                    LayoutEasing = Easing.OutQuad,
+                                                    Spacing = new Vector2(spacing * 2),
+                                                    Margin = new MarginPadding { Top = spacing * 2 },
+                                                    Children = new[]
+                                                    {
+                                                        description = new MetadataSection("Description"),
+                                                        source = new MetadataSection("Source"),
+                                                        tags = new MetadataSection("Tags"),
+                                                    },
                                                 },
                                             },
                                         },
                                     },
                                 },
-                            },
-                            new Drawable[]
-                            {
-                                failRetryContainer = new OnlineViewContainer("Sign in to view more details")
+                                new Drawable[]
                                 {
-                                    RelativeSizeAxes = Axes.Both,
-                                    Children = new Drawable[]
+                                    failRetryContainer = new OnlineViewContainer("Sign in to view more details")
                                     {
-                                        new OsuSpriteText
+                                        RelativeSizeAxes = Axes.Both,
+                                        Children = new Drawable[]
                                         {
-                                            Text = "Points of Failure",
-                                            Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 14),
+                                            new OsuSpriteText
+                                            {
+                                                Text = "Points of Failure",
+                                                Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 14),
+                                            },
+                                            failRetryGraph = new FailRetryGraph
+                                            {
+                                                RelativeSizeAxes = Axes.Both,
+                                                Padding = new MarginPadding { Top = 14 + spacing / 2 },
+                                            },
                                         },
-                                        failRetryGraph = new FailRetryGraph
-                                        {
-                                            RelativeSizeAxes = Axes.Both,
-                                            Padding = new MarginPadding { Top = 14 + spacing / 2 },
-                                        },
-                                        loading = new LoadingLayer(true)
                                     },
-                                },
+                                }
                             }
-                        }
+                        },
+                        loading = new LoadingLayer(true)
                     }
                 },
             };

From 37e30b00bf6d6a494847565036d3538fb1f1e939 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 6 Apr 2021 16:39:02 +0900
Subject: [PATCH 2209/3722] Refactor to keep a consistent API

---
 osu.Game/Rulesets/Difficulty/Skills/Skill.cs  | 32 ++++---------------
 .../Rulesets/Difficulty/Skills/StrainSkill.cs | 13 --------
 2 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
index ebd389d823..9f0fb987a7 100644
--- a/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
+++ b/osu.Game/Rulesets/Difficulty/Skills/Skill.cs
@@ -19,12 +19,9 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         protected readonly ReverseQueue<DifficultyHitObject> Previous;
 
         /// <summary>
-        /// Soft capacity of the <see cref="Previous"/> queue.
-        /// <see cref="Previous"/> will automatically resize if it exceeds capacity, but will do so at a very slight performance impact.
-        /// The actual capacity will be set to this value + 1 to allow for storage of the current object before the next can be processed.
-        /// Setting to zero (default) will cause <see cref="Previous"/> to be uninstanciated.
+        /// Number of previous <see cref="DifficultyHitObject"/>s to keep inside the <see cref="Previous"/> queue.
         /// </summary>
-        protected virtual int PreviousCollectionSoftCapacity => 0;
+        protected virtual int HistoryLength => 1;
 
         /// <summary>
         /// Mods for use in skill calculations.
@@ -36,32 +33,17 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         protected Skill(Mod[] mods)
         {
             this.mods = mods;
-
-            if (PreviousCollectionSoftCapacity > 0)
-                Previous = new ReverseQueue<DifficultyHitObject>(PreviousCollectionSoftCapacity + 1);
+            Previous = new ReverseQueue<DifficultyHitObject>(HistoryLength + 1);
         }
 
         internal void ProcessInternal(DifficultyHitObject current)
         {
-            RemoveExtraneousHistory(current);
+            while (Previous.Count > HistoryLength)
+                Previous.Dequeue();
+
             Process(current);
-            AddToHistory(current);
-        }
 
-        /// <summary>
-        /// Remove objects from <see cref="Previous"/> that are no longer needed for calculations from the current object onwards.
-        /// </summary>
-        /// <param name="current">The <see cref="DifficultyHitObject"/> to be processed.</param>
-        protected virtual void RemoveExtraneousHistory(DifficultyHitObject current)
-        {
-        }
-
-        /// <summary>
-        /// Add the current <see cref="DifficultyHitObject"/> to the <see cref="Previous"/> queue (if required).
-        /// </summary>
-        /// <param name="current">The <see cref="DifficultyHitObject"/> that was just processed.</param>
-        protected virtual void AddToHistory(DifficultyHitObject current)
-        {
+            Previous.Enqueue(current);
         }
 
         /// <summary>
diff --git a/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs b/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs
index 16816be35c..71cee36812 100644
--- a/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs
+++ b/osu.Game/Rulesets/Difficulty/Skills/StrainSkill.cs
@@ -20,8 +20,6 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         /// </summary>
         protected abstract double SkillMultiplier { get; }
 
-        protected override int PreviousCollectionSoftCapacity => 1;
-
         /// <summary>
         /// Determines how quickly strain decays for the given skill.
         /// For example a value of 0.15 indicates that strain decays to 15% of its original value in one second.
@@ -54,17 +52,6 @@ namespace osu.Game.Rulesets.Difficulty.Skills
         {
         }
 
-        protected override void RemoveExtraneousHistory(DifficultyHitObject current)
-        {
-            while (Previous.Count > 1)
-                Previous.Dequeue();
-        }
-
-        protected override void AddToHistory(DifficultyHitObject current)
-        {
-            Previous.Enqueue(current);
-        }
-
         /// <summary>
         /// Process a <see cref="DifficultyHitObject"/> and update current strain values accordingly.
         /// </summary>

From f08b340e811ba6fd7ec5cfcc3f8b854002ab62bf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Apr 2021 16:49:13 +0900
Subject: [PATCH 2210/3722] Add nullability hinting

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

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index ab8a40dbe3..cda962f0ab 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
@@ -12,11 +13,12 @@ namespace osu.Game.Input.Bindings
 {
     public class GlobalActionContainer : DatabasedKeyBindingContainer<GlobalAction>, IHandleGlobalKeyboardInput
     {
+        [CanBeNull]
         private readonly GlobalInputManager globalInputManager;
 
         private readonly Drawable handler;
 
-        public GlobalActionContainer(OsuGameBase game, GlobalInputManager globalInputManager)
+        public GlobalActionContainer(OsuGameBase game, [CanBeNull] GlobalInputManager globalInputManager)
             : base(matchingMode: KeyCombinationMatchingMode.Modifiers)
         {
             this.globalInputManager = globalInputManager;

From 899d708dacf0394ee116931b5425fbce05cb93cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Apr 2021 17:09:51 +0900
Subject: [PATCH 2211/3722] Move loading layer up one level to correct padding

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

diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index 46aa568039..ca0af2f3f5 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -163,9 +163,9 @@ namespace osu.Game.Screens.Select
                                 }
                             }
                         },
-                        loading = new LoadingLayer(true)
-                    }
+                    },
                 },
+                loading = new LoadingLayer(true)
             };
         }
 

From 3113eefcf6ab960fcde6a9aff369591dc3f129ef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Apr 2021 17:12:00 +0900
Subject: [PATCH 2212/3722] Don't attempt to load content when not online

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

diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index ca0af2f3f5..26da4279f0 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -184,7 +184,7 @@ namespace osu.Game.Screens.Select
             }
 
             // for now, let's early abort if an OnlineBeatmapID is not present (should have been populated at import time).
-            if (Beatmap?.OnlineBeatmapID == null)
+            if (Beatmap?.OnlineBeatmapID == null || api.State.Value == APIState.Offline)
             {
                 updateMetrics();
                 return;

From d81f270e21f81f5ff91f5a5d27a04e30687d2543 Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Mon, 5 Apr 2021 18:01:16 +0200
Subject: [PATCH 2213/3722] Always encode perfect curves as explicit segments

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

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 5eb5fcdfa0..0bb1aa873f 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -333,9 +333,10 @@ namespace osu.Game.Beatmaps.Formats
 
                     // Explicit segments have a new format in which the type is injected into the middle of the control point string.
                     // To preserve compatibility with osu-stable as much as possible, explicit segments with the same type are converted to use implicit segments by duplicating the control point.
-                    bool needsExplicitSegment = point.Type.Value != lastType;
+                    // One exception are consecutive perfect curves, which aren't supported in osu-stable
+                    bool needsExplicitSegment = point.Type.Value != lastType || point.Type.Value == PathType.PerfectCurve;
 
-                    // One exception to this is when the last two control points of the last segment were duplicated. This is not a scenario supported by osu!stable.
+                    // Another exception to this is when the last two control points of the last segment were duplicated. This is not a scenario supported by osu!stable.
                     // Lazer does not add implicit segments for the last two control points of _any_ explicit segment, so an explicit segment is forced in order to maintain consistency with the decoder.
                     if (i > 1)
                     {

From dd902441b098983802cb1bbda3fae0ad8c86fa5f Mon Sep 17 00:00:00 2001
From: Leon Gebler <leon.gebler@gebler-online.de>
Date: Mon, 5 Apr 2021 17:21:45 +0200
Subject: [PATCH 2214/3722] Add tests for consecutive perfect-curve segments

---
 .../Formats/LegacyBeatmapDecoderTest.cs       | 30 +++++++++++++++++++
 .../Resources/multi-segment-slider.osu        |  7 +++++
 .../Beatmaps/Formats/LegacyBeatmapEncoder.cs  |  2 +-
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
index fb18be3ae1..0f82492e51 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
@@ -740,6 +740,36 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.That(fifth.ControlPoints[5].Type.Value, Is.EqualTo(PathType.Bezier));
                 Assert.That(fifth.ControlPoints[6].Position.Value, Is.EqualTo(new Vector2(5, 5)));
                 Assert.That(fifth.ControlPoints[6].Type.Value, Is.EqualTo(null));
+
+                // Implicit perfect-curve multi-segment(Should convert to bezier to match stable)
+                var sixth = ((IHasPath)decoded.HitObjects[5]).Path;
+
+                Assert.That(sixth.ControlPoints[0].Position.Value, Is.EqualTo(Vector2.Zero));
+                Assert.That(sixth.ControlPoints[0].Type.Value == PathType.Bezier);
+                Assert.That(sixth.ControlPoints[1].Position.Value, Is.EqualTo(new Vector2(75, 145)));
+                Assert.That(sixth.ControlPoints[1].Type.Value == null);
+                Assert.That(sixth.ControlPoints[2].Position.Value, Is.EqualTo(new Vector2(170, 75)));
+
+                Assert.That(sixth.ControlPoints[2].Type.Value == PathType.Bezier);
+                Assert.That(sixth.ControlPoints[3].Position.Value, Is.EqualTo(new Vector2(300, 145)));
+                Assert.That(sixth.ControlPoints[3].Type.Value == null);
+                Assert.That(sixth.ControlPoints[4].Position.Value, Is.EqualTo(new Vector2(410, 20)));
+                Assert.That(sixth.ControlPoints[4].Type.Value == null);
+
+                // Explicit perfect-curve multi-segment(Should not convert to bezier)
+                var seventh = ((IHasPath)decoded.HitObjects[6]).Path;
+
+                Assert.That(seventh.ControlPoints[0].Position.Value, Is.EqualTo(Vector2.Zero));
+                Assert.That(seventh.ControlPoints[0].Type.Value == PathType.PerfectCurve);
+                Assert.That(seventh.ControlPoints[1].Position.Value, Is.EqualTo(new Vector2(75, 145)));
+                Assert.That(seventh.ControlPoints[1].Type.Value == null);
+                Assert.That(seventh.ControlPoints[2].Position.Value, Is.EqualTo(new Vector2(170, 75)));
+
+                Assert.That(seventh.ControlPoints[2].Type.Value == PathType.PerfectCurve);
+                Assert.That(seventh.ControlPoints[3].Position.Value, Is.EqualTo(new Vector2(300, 145)));
+                Assert.That(seventh.ControlPoints[3].Type.Value == null);
+                Assert.That(seventh.ControlPoints[4].Position.Value, Is.EqualTo(new Vector2(410, 20)));
+                Assert.That(seventh.ControlPoints[4].Type.Value == null);
             }
         }
     }
diff --git a/osu.Game.Tests/Resources/multi-segment-slider.osu b/osu.Game.Tests/Resources/multi-segment-slider.osu
index cc86710067..135132e35c 100644
--- a/osu.Game.Tests/Resources/multi-segment-slider.osu
+++ b/osu.Game.Tests/Resources/multi-segment-slider.osu
@@ -15,3 +15,10 @@ osu file format v128
 
 // Last control point in segment duplicated
 0,0,5000,2,0,B|1:1|2:2|3:3|3:3|B|4:4|5:5,2,200
+
+// Implicit perfect-curve multi-segment (Should convert to bezier to match stable)
+0,0,6000,2,0,P|75:145|170:75|170:75|300:145|410:20,1,475,0:0:0:0:
+
+// Explicit perfect-curve multi-segment (Should not convert to bezier)
+0,0,7000,2,0,P|75:145|P|170:75|300:145|410:20,1,650,0:0:0:0:
+
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index 0bb1aa873f..da44b96ed3 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -333,7 +333,7 @@ namespace osu.Game.Beatmaps.Formats
 
                     // Explicit segments have a new format in which the type is injected into the middle of the control point string.
                     // To preserve compatibility with osu-stable as much as possible, explicit segments with the same type are converted to use implicit segments by duplicating the control point.
-                    // One exception are consecutive perfect curves, which aren't supported in osu-stable
+                    // One exception are consecutive perfect curves, which aren't supported in osu!stable and can lead to decoding issues if encoded as implicit segments
                     bool needsExplicitSegment = point.Type.Value != lastType || point.Type.Value == PathType.PerfectCurve;
 
                     // Another exception to this is when the last two control points of the last segment were duplicated. This is not a scenario supported by osu!stable.

From d5ba77b2c2b5984b279c7809a1f58878c92e0936 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 6 Apr 2021 21:22:28 +0900
Subject: [PATCH 2215/3722] Add spectating user state

---
 osu.Game/Online/Multiplayer/MultiplayerUserState.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerUserState.cs b/osu.Game/Online/Multiplayer/MultiplayerUserState.cs
index e54c71cd85..c467ff84bb 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerUserState.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerUserState.cs
@@ -55,5 +55,10 @@ namespace osu.Game.Online.Multiplayer
         /// The user is currently viewing results. This is a reserved state, and is set by the server.
         /// </summary>
         Results,
+
+        /// <summary>
+        /// The user is currently spectating this room.
+        /// </summary>
+        Spectating
     }
 }

From 6de91d7b6bb38caa25ea455a2868b548b083d5ab Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 6 Apr 2021 21:37:21 +0900
Subject: [PATCH 2216/3722] Add spectate button + test

---
 .../TestSceneMultiplayerSpectateButton.cs     | 53 +++++++++++
 .../Multiplayer/StatefulMultiplayerClient.cs  | 27 ++++++
 .../Match/MultiplayerSpectateButton.cs        | 92 +++++++++++++++++++
 3 files changed, 172 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
 create mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
new file mode 100644
index 0000000000..730fee2fba
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
@@ -0,0 +1,53 @@
+// Copyright (c) ppy 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.Graphics;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
+using osuTK;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public class TestSceneMultiplayerSpectateButton : MultiplayerTestScene
+    {
+        private MultiplayerSpectateButton button;
+        private IDisposable readyClickOperation;
+
+        [SetUp]
+        public new void Setup() => Schedule(() =>
+        {
+            Child = button = new MultiplayerSpectateButton
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Size = new Vector2(200, 50),
+                OnSpectateClick = async () =>
+                {
+                    readyClickOperation = OngoingOperationTracker.BeginOperation();
+                    await Client.ToggleSpectate();
+                    readyClickOperation.Dispose();
+                }
+            };
+        });
+
+        [TestCase(MultiplayerUserState.Idle)]
+        [TestCase(MultiplayerUserState.Ready)]
+        public void TestToggleWhenIdle(MultiplayerUserState initialState)
+        {
+            addClickButtonStep();
+            AddAssert("user is spectating", () => Client.Room?.Users[0].State == MultiplayerUserState.Spectating);
+
+            addClickButtonStep();
+            AddAssert("user is idle", () => Client.Room?.Users[0].State == MultiplayerUserState.Idle);
+        }
+
+        private void addClickButtonStep() => AddStep("click button", () =>
+        {
+            InputManager.MoveMouseTo(button);
+            InputManager.Click(MouseButton.Left);
+        });
+    }
+}
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 0f7050596f..2ddc10db0f 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -249,6 +249,33 @@ namespace osu.Game.Online.Multiplayer
             }
         }
 
+        /// <summary>
+        /// Toggles the <see cref="LocalUser"/>'s spectating state.
+        /// </summary>
+        /// <exception cref="InvalidOperationException">If a toggle of the spectating state is not valid at this time.</exception>
+        public async Task ToggleSpectate()
+        {
+            var localUser = LocalUser;
+
+            if (localUser == null)
+                return;
+
+            switch (localUser.State)
+            {
+                case MultiplayerUserState.Idle:
+                case MultiplayerUserState.Ready:
+                    await ChangeState(MultiplayerUserState.Spectating).ConfigureAwait(false);
+                    return;
+
+                case MultiplayerUserState.Spectating:
+                    await ChangeState(MultiplayerUserState.Idle).ConfigureAwait(false);
+                    return;
+
+                default:
+                    throw new InvalidOperationException($"Cannot toggle spectate when in {localUser.State}");
+            }
+        }
+
         public abstract Task TransferHost(int userId);
 
         public abstract Task ChangeSettings(MultiplayerRoomSettings settings);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs
new file mode 100644
index 0000000000..50be7719d9
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs
@@ -0,0 +1,92 @@
+// Copyright (c) ppy 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;
+using osu.Framework.Graphics;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Backgrounds;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.Multiplayer;
+using osuTK;
+
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
+{
+    public class MultiplayerSpectateButton : MultiplayerRoomComposite
+    {
+        public Action OnSpectateClick
+        {
+            set => button.Action = value;
+        }
+
+        [Resolved]
+        private OngoingOperationTracker ongoingOperationTracker { get; set; }
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        private IBindable<bool> operationInProgress;
+
+        private readonly ButtonWithTrianglesExposed button;
+
+        public MultiplayerSpectateButton()
+        {
+            InternalChild = button = new ButtonWithTrianglesExposed
+            {
+                RelativeSizeAxes = Axes.Both,
+                Size = Vector2.One,
+                Enabled = { Value = true },
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            operationInProgress = ongoingOperationTracker.InProgress.GetBoundCopy();
+            operationInProgress.BindValueChanged(_ => updateState());
+        }
+
+        protected override void OnRoomUpdated()
+        {
+            base.OnRoomUpdated();
+
+            updateState();
+        }
+
+        private void updateState()
+        {
+            var localUser = Client.LocalUser;
+
+            if (localUser == null)
+                return;
+
+            Debug.Assert(Room != null);
+
+            switch (localUser.State)
+            {
+                default:
+                    button.Text = "Spectate";
+                    button.BackgroundColour = colours.Blue;
+                    button.Triangles.ColourDark = colours.Blue;
+                    button.Triangles.ColourLight = colours.BlueLight;
+                    break;
+
+                case MultiplayerUserState.Spectating:
+                    button.Text = "Stop spectating";
+                    button.BackgroundColour = colours.Red;
+                    button.Triangles.ColourDark = colours.Red;
+                    button.Triangles.ColourLight = colours.RedLight;
+                    break;
+            }
+
+            button.Enabled.Value = Client.Room?.State == MultiplayerRoomState.Open && !operationInProgress.Value;
+        }
+
+        private class ButtonWithTrianglesExposed : TriangleButton
+        {
+            public new Triangles Triangles => base.Triangles;
+        }
+    }
+}

From ef658e9597484f008119240601b5921e6713b563 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 7 Apr 2021 15:54:16 +0900
Subject: [PATCH 2217/3722] Fix invalid array definition in slnf

---
 osu.Desktop.slnf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Desktop.slnf b/osu.Desktop.slnf
index 68541dbcfc..503e5935f5 100644
--- a/osu.Desktop.slnf
+++ b/osu.Desktop.slnf
@@ -24,7 +24,7 @@
       "Templates\\Rulesets\\ruleset-scrolling-empty\\osu.Game.Rulesets.EmptyScrolling\\osu.Game.Rulesets.EmptyScrolling.csproj",
       "Templates\\Rulesets\\ruleset-scrolling-empty\\osu.Game.Rulesets.EmptyScrolling.Tests\\osu.Game.Rulesets.EmptyScrolling.Tests.csproj",
       "Templates\\Rulesets\\ruleset-scrolling-example\\osu.Game.Rulesets.Pippidon\\osu.Game.Rulesets.Pippidon.csproj",
-      "Templates\\Rulesets\\ruleset-scrolling-example\\osu.Game.Rulesets.Pippidon.Tests\\osu.Game.Rulesets.Pippidon.Tests.csproj",
+      "Templates\\Rulesets\\ruleset-scrolling-example\\osu.Game.Rulesets.Pippidon.Tests\\osu.Game.Rulesets.Pippidon.Tests.csproj"
     ]
   }
-}
\ No newline at end of file
+}

From 1f57b6884d0e944907cf4ce6f2cc12c157fc32c6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 7 Apr 2021 16:19:10 +0900
Subject: [PATCH 2218/3722] Add ready button to test scene

---
 .../TestSceneMultiplayerSpectateButton.cs     | 121 ++++++++++++++++--
 1 file changed, 108 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
index 730fee2fba..52a1909396 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
@@ -2,10 +2,22 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Platform;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
+using osu.Game.Rulesets;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
+using osu.Game.Tests.Resources;
 using osuTK;
 using osuTK.Input;
 
@@ -13,22 +25,96 @@ namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneMultiplayerSpectateButton : MultiplayerTestScene
     {
-        private MultiplayerSpectateButton button;
+        private MultiplayerSpectateButton spectateButton;
+        private MultiplayerReadyButton readyButton;
+
+        private readonly Bindable<PlaylistItem> selectedItem = new Bindable<PlaylistItem>();
+
+        private BeatmapSetInfo importedSet;
+        private BeatmapManager beatmaps;
+        private RulesetStore rulesets;
+
         private IDisposable readyClickOperation;
 
+        protected override Container<Drawable> Content => content;
+        private readonly Container content;
+
+        public TestSceneMultiplayerSpectateButton()
+        {
+            base.Content.Add(content = new Container
+            {
+                RelativeSizeAxes = Axes.Both
+            });
+        }
+
+        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
+        {
+            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+
+            return dependencies;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(GameHost host, AudioManager audio)
+        {
+            Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
+            Dependencies.Cache(beatmaps = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, host, Beatmap.Default));
+
+            var beatmapTracker = new OnlinePlayBeatmapAvailablilityTracker { SelectedItem = { BindTarget = selectedItem } };
+            base.Content.Add(beatmapTracker);
+            Dependencies.Cache(beatmapTracker);
+
+            beatmaps.Import(TestResources.GetQuickTestBeatmapForImport()).Wait();
+        }
+
         [SetUp]
         public new void Setup() => Schedule(() =>
         {
-            Child = button = new MultiplayerSpectateButton
+            importedSet = beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.All).First();
+            Beatmap.Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First());
+            selectedItem.Value = new PlaylistItem
             {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Size = new Vector2(200, 50),
-                OnSpectateClick = async () =>
+                Beatmap = { Value = Beatmap.Value.BeatmapInfo },
+                Ruleset = { Value = Beatmap.Value.BeatmapInfo.Ruleset },
+            };
+
+            Child = new FillFlowContainer
+            {
+                AutoSizeAxes = Axes.Both,
+                Direction = FillDirection.Vertical,
+                Children = new Drawable[]
                 {
-                    readyClickOperation = OngoingOperationTracker.BeginOperation();
-                    await Client.ToggleSpectate();
-                    readyClickOperation.Dispose();
+                    spectateButton = new MultiplayerSpectateButton
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Size = new Vector2(200, 50),
+                        OnSpectateClick = async () =>
+                        {
+                            readyClickOperation = OngoingOperationTracker.BeginOperation();
+                            await Client.ToggleSpectate();
+                            readyClickOperation.Dispose();
+                        }
+                    },
+                    readyButton = new MultiplayerReadyButton
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Size = new Vector2(200, 50),
+                        OnReadyClick = async () =>
+                        {
+                            readyClickOperation = OngoingOperationTracker.BeginOperation();
+
+                            if (Client.IsHost && Client.LocalUser?.State == MultiplayerUserState.Ready)
+                            {
+                                await Client.StartMatch();
+                                return;
+                            }
+
+                            await Client.ToggleReady();
+                            readyClickOperation.Dispose();
+                        }
+                    }
                 }
             };
         });
@@ -37,17 +123,26 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [TestCase(MultiplayerUserState.Ready)]
         public void TestToggleWhenIdle(MultiplayerUserState initialState)
         {
-            addClickButtonStep();
+            addClickSpectateButtonStep();
             AddAssert("user is spectating", () => Client.Room?.Users[0].State == MultiplayerUserState.Spectating);
 
-            addClickButtonStep();
+            addClickSpectateButtonStep();
             AddAssert("user is idle", () => Client.Room?.Users[0].State == MultiplayerUserState.Idle);
         }
 
-        private void addClickButtonStep() => AddStep("click button", () =>
+        private void addClickSpectateButtonStep() => AddStep("click spectate button", () =>
         {
-            InputManager.MoveMouseTo(button);
+            InputManager.MoveMouseTo(spectateButton);
             InputManager.Click(MouseButton.Left);
         });
+
+        private void addClickReadyButtonStep() => AddStep("click ready button", () =>
+        {
+            InputManager.MoveMouseTo(readyButton);
+            InputManager.Click(MouseButton.Left);
+        });
+
+        private void assertReadyButtonEnablement(bool shouldBeEnabled)
+            => AddAssert($"ready button {(shouldBeEnabled ? "is" : "is not")} enabled", () => readyButton.ChildrenOfType<OsuButton>().Single().Enabled.Value == shouldBeEnabled);
     }
 }

From 6be9c9f0f4e8188d4e50b55e26f0025cc2d06292 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 7 Apr 2021 16:35:36 +0900
Subject: [PATCH 2219/3722] Link up ready button to spectate state

---
 .../TestSceneMultiplayerSpectateButton.cs     | 51 +++++++++++++++++++
 .../Match/MultiplayerReadyButton.cs           | 11 +++-
 .../Multiplayer/TestMultiplayerClient.cs      |  6 +++
 3 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
index 52a1909396..631511eac5 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
@@ -18,6 +18,7 @@ using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
 using osu.Game.Tests.Resources;
+using osu.Game.Users;
 using osuTK;
 using osuTK.Input;
 
@@ -119,6 +120,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
             };
         });
 
+        [Test]
+        public void TestEnabledWhenRoomOpen()
+        {
+            assertSpectateButtonEnablement(true);
+        }
+
         [TestCase(MultiplayerUserState.Idle)]
         [TestCase(MultiplayerUserState.Ready)]
         public void TestToggleWhenIdle(MultiplayerUserState initialState)
@@ -130,6 +137,47 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("user is idle", () => Client.Room?.Users[0].State == MultiplayerUserState.Idle);
         }
 
+        [TestCase(MultiplayerRoomState.WaitingForLoad)]
+        [TestCase(MultiplayerRoomState.Playing)]
+        [TestCase(MultiplayerRoomState.Closed)]
+        public void TestDisabledDuringGameplayOrClosed(MultiplayerRoomState roomState)
+        {
+            AddStep($"change user to {roomState}", () => Client.ChangeRoomState(roomState));
+            assertSpectateButtonEnablement(false);
+        }
+
+        [Test]
+        public void TestReadyButtonDisabledWhenHostAndNoReadyUsers()
+        {
+            addClickSpectateButtonStep();
+            assertReadyButtonEnablement(false);
+        }
+
+        [Test]
+        public void TestReadyButtonEnabledWhenHostAndUsersReady()
+        {
+            AddStep("add user", () => Client.AddUser(new User { Id = 55 }));
+            AddStep("set user ready", () => Client.ChangeUserState(55, MultiplayerUserState.Ready));
+
+            addClickSpectateButtonStep();
+            assertReadyButtonEnablement(true);
+        }
+
+        [Test]
+        public void TestReadyButtonDisabledWhenNotHostAndUsersReady()
+        {
+            AddStep("add user and transfer host", () =>
+            {
+                Client.AddUser(new User { Id = 55 });
+                Client.TransferHost(55);
+            });
+
+            AddStep("set user ready", () => Client.ChangeUserState(55, MultiplayerUserState.Ready));
+
+            addClickSpectateButtonStep();
+            assertReadyButtonEnablement(false);
+        }
+
         private void addClickSpectateButtonStep() => AddStep("click spectate button", () =>
         {
             InputManager.MoveMouseTo(spectateButton);
@@ -142,6 +190,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
             InputManager.Click(MouseButton.Left);
         });
 
+        private void assertSpectateButtonEnablement(bool shouldBeEnabled)
+            => AddAssert($"spectate button {(shouldBeEnabled ? "is" : "is not")} enabled", () => spectateButton.ChildrenOfType<OsuButton>().Single().Enabled.Value == shouldBeEnabled);
+
         private void assertReadyButtonEnablement(bool shouldBeEnabled)
             => AddAssert($"ready button {(shouldBeEnabled ? "is" : "is not")} enabled", () => readyButton.ChildrenOfType<OsuButton>().Single().Enabled.Value == shouldBeEnabled);
     }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
index c9fb234ccc..6919be2d56 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -78,8 +78,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             Debug.Assert(Room != null);
 
             int newCountReady = Room.Users.Count(u => u.State == MultiplayerUserState.Ready);
+            int newCountTotal = Room.Users.Count(u => u.State != MultiplayerUserState.Spectating);
 
-            string countText = $"({newCountReady} / {Room.Users.Count} ready)";
+            string countText = $"({newCountReady} / {newCountTotal} ready)";
 
             switch (localUser.State)
             {
@@ -88,6 +89,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                     updateButtonColour(true);
                     break;
 
+                case MultiplayerUserState.Spectating:
                 case MultiplayerUserState.Ready:
                     if (Room?.Host?.Equals(localUser) == true)
                     {
@@ -105,6 +107,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 
             button.Enabled.Value = Client.Room?.State == MultiplayerRoomState.Open && !operationInProgress.Value;
 
+            // When the local user is the host and spectating the match, the "start match" state should be enabled.
+            if (localUser.State == MultiplayerUserState.Spectating)
+            {
+                button.Enabled.Value &= Room?.Host?.Equals(localUser) == true;
+                button.Enabled.Value &= newCountReady > 0;
+            }
+
             if (newCountReady != countReady)
             {
                 countReady = newCountReady;
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index 09fcc1ff47..4c954c7d27 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -58,6 +58,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
             });
         }
 
+        public void ChangeRoomState(MultiplayerRoomState newState)
+        {
+            Debug.Assert(Room != null);
+            ((IMultiplayerClient)this).RoomStateChanged(newState);
+        }
+
         public void ChangeUserState(int userId, MultiplayerUserState newState)
         {
             Debug.Assert(Room != null);

From f5667125a017e56d153c388638c2f2a13d624389 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 7 Apr 2021 16:37:43 +0900
Subject: [PATCH 2220/3722] Remove unnecessary method

---
 .../Multiplayer/TestSceneMultiplayerSpectateButton.cs       | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
index 631511eac5..8fe1f99e1d 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
@@ -184,12 +184,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
             InputManager.Click(MouseButton.Left);
         });
 
-        private void addClickReadyButtonStep() => AddStep("click ready button", () =>
-        {
-            InputManager.MoveMouseTo(readyButton);
-            InputManager.Click(MouseButton.Left);
-        });
-
         private void assertSpectateButtonEnablement(bool shouldBeEnabled)
             => AddAssert($"spectate button {(shouldBeEnabled ? "is" : "is not")} enabled", () => spectateButton.ChildrenOfType<OsuButton>().Single().Enabled.Value == shouldBeEnabled);
 

From c744f77cfafdab402bbc1e34793402baf6c0995c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 7 Apr 2021 16:40:24 +0900
Subject: [PATCH 2221/3722] Add participant panel state

---
 .../Multiplayer/TestSceneMultiplayerParticipantsList.cs    | 7 +++++++
 .../OnlinePlay/Multiplayer/Participants/StateDisplay.cs    | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
index e713cff233..7f8f04b718 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerParticipantsList.cs
@@ -126,6 +126,13 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddUntilStep("ready mark invisible", () => !this.ChildrenOfType<StateDisplay>().Single().IsPresent);
         }
 
+        [Test]
+        public void TestToggleSpectateState()
+        {
+            AddStep("make user spectating", () => Client.ChangeState(MultiplayerUserState.Spectating));
+            AddStep("make user idle", () => Client.ChangeState(MultiplayerUserState.Idle));
+        }
+
         [Test]
         public void TestCrownChangesStateWhenHostTransferred()
         {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
index c571b51c83..e6a407acec 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
@@ -135,6 +135,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
                     icon.Colour = colours.BlueLighter;
                     break;
 
+                case MultiplayerUserState.Spectating:
+                    text.Text = "spectating";
+                    icon.Icon = FontAwesome.Solid.Eye;
+                    icon.Colour = colours.BlueLight;
+                    break;
+
                 default:
                     throw new ArgumentOutOfRangeException(nameof(state), state, null);
             }

From 56c13148f1861b38b71cd87fdcaf5619b6527c1d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 7 Apr 2021 16:45:06 +0900
Subject: [PATCH 2222/3722] Fix typo in class name

---
 .../TestSceneOnlinePlayBeatmapAvailabilityTracker.cs      | 8 ++++----
 .../Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs | 4 ++--
 ...Tracker.cs => OnlinePlayBeatmapAvailabilityTracker.cs} | 2 +-
 osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs     | 2 +-
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs        | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)
 rename osu.Game/Online/Rooms/{OnlinePlayBeatmapAvailablilityTracker.cs => OnlinePlayBeatmapAvailabilityTracker.cs} (97%)

diff --git a/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs b/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs
index 8c30802ce3..8dab570e30 100644
--- a/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs
+++ b/osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Tests.Online
         private BeatmapSetInfo testBeatmapSet;
 
         private readonly Bindable<PlaylistItem> selectedItem = new Bindable<PlaylistItem>();
-        private OnlinePlayBeatmapAvailablilityTracker availablilityTracker;
+        private OnlinePlayBeatmapAvailabilityTracker availabilityTracker;
 
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, GameHost host)
@@ -67,7 +67,7 @@ namespace osu.Game.Tests.Online
                 Ruleset = { Value = testBeatmapInfo.Ruleset },
             };
 
-            Child = availablilityTracker = new OnlinePlayBeatmapAvailablilityTracker
+            Child = availabilityTracker = new OnlinePlayBeatmapAvailabilityTracker
             {
                 SelectedItem = { BindTarget = selectedItem, }
             };
@@ -118,7 +118,7 @@ namespace osu.Game.Tests.Online
             });
             addAvailabilityCheckStep("state still not downloaded", BeatmapAvailability.NotDownloaded);
 
-            AddStep("recreate tracker", () => Child = availablilityTracker = new OnlinePlayBeatmapAvailablilityTracker
+            AddStep("recreate tracker", () => Child = availabilityTracker = new OnlinePlayBeatmapAvailabilityTracker
             {
                 SelectedItem = { BindTarget = selectedItem }
             });
@@ -127,7 +127,7 @@ namespace osu.Game.Tests.Online
 
         private void addAvailabilityCheckStep(string description, Func<BeatmapAvailability> expected)
         {
-            AddAssert(description, () => availablilityTracker.Availability.Value.Equals(expected.Invoke()));
+            AddAssert(description, () => availabilityTracker.Availability.Value.Equals(expected.Invoke()));
         }
 
         private static BeatmapInfo getTestBeatmapInfo(string archiveFile)
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
index b44e5b1e5b..dad1237991 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
     public class TestSceneMultiplayerReadyButton : MultiplayerTestScene
     {
         private MultiplayerReadyButton button;
-        private OnlinePlayBeatmapAvailablilityTracker beatmapTracker;
+        private OnlinePlayBeatmapAvailabilityTracker beatmapTracker;
         private BeatmapSetInfo importedSet;
 
         private readonly Bindable<PlaylistItem> selectedItem = new Bindable<PlaylistItem>();
@@ -44,7 +44,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             Dependencies.Cache(beatmaps = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, host, Beatmap.Default));
             beatmaps.Import(TestResources.GetQuickTestBeatmapForImport()).Wait();
 
-            Add(beatmapTracker = new OnlinePlayBeatmapAvailablilityTracker
+            Add(beatmapTracker = new OnlinePlayBeatmapAvailabilityTracker
             {
                 SelectedItem = { BindTarget = selectedItem }
             });
diff --git a/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs
similarity index 97%
rename from osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
rename to osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs
index 8278162353..72ea84d4a8 100644
--- a/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailablilityTracker.cs
+++ b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Online.Rooms
     /// This differs from a regular download tracking composite as this accounts for the
     /// databased beatmap set's checksum, to disallow from playing with an altered version of the beatmap.
     /// </summary>
-    public class OnlinePlayBeatmapAvailablilityTracker : DownloadTrackingComposite<BeatmapSetInfo, BeatmapManager>
+    public class OnlinePlayBeatmapAvailabilityTracker : DownloadTrackingComposite<BeatmapSetInfo, BeatmapManager>
     {
         public readonly IBindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
 
diff --git a/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs b/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
index 6eb675976a..8f85608b29 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
         private IBindable<BeatmapAvailability> availability;
 
         [BackgroundDependencyLoader]
-        private void load(OnlinePlayBeatmapAvailablilityTracker beatmapTracker)
+        private void load(OnlinePlayBeatmapAvailabilityTracker beatmapTracker)
         {
             availability = beatmapTracker.Availability.GetBoundCopy();
 
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 4a689314db..706da05d15 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -56,15 +56,15 @@ namespace osu.Game.Screens.OnlinePlay.Match
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
 
         [Cached]
-        protected OnlinePlayBeatmapAvailablilityTracker BeatmapAvailablilityTracker { get; }
+        protected OnlinePlayBeatmapAvailabilityTracker BeatmapAvailabilityTracker { get; }
 
-        protected IBindable<BeatmapAvailability> BeatmapAvailability => BeatmapAvailablilityTracker.Availability;
+        protected IBindable<BeatmapAvailability> BeatmapAvailability => BeatmapAvailabilityTracker.Availability;
 
         protected RoomSubScreen()
         {
             AddRangeInternal(new Drawable[]
             {
-                BeatmapAvailablilityTracker = new OnlinePlayBeatmapAvailablilityTracker
+                BeatmapAvailabilityTracker = new OnlinePlayBeatmapAvailabilityTracker
                 {
                     SelectedItem = { BindTarget = SelectedItem }
                 },

From abd637ffaa5345f71f248823de47a3d5d4e805f3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 7 Apr 2021 17:35:18 +0900
Subject: [PATCH 2223/3722] Add button to footer

---
 .../TestSceneMultiplayerMatchFooter.cs        | 27 +++++++++++++
 .../Match/MultiplayerMatchFooter.cs           | 40 ++++++++++++++++---
 2 files changed, 62 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchFooter.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchFooter.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchFooter.cs
new file mode 100644
index 0000000000..08c94b8135
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchFooter.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.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Online.Rooms;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public class TestSceneMultiplayerMatchFooter : MultiplayerTestScene
+    {
+        [Cached]
+        private readonly OnlinePlayBeatmapAvailablilityTracker availablilityTracker = new OnlinePlayBeatmapAvailablilityTracker();
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Child = new MultiplayerMatchFooter
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Height = 50
+            };
+        }
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
index fdc1ae9d3c..d4f5428bfb 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
@@ -8,21 +8,28 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
-using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
 {
     public class MultiplayerMatchFooter : CompositeDrawable
     {
         public const float HEIGHT = 50;
+        private const float ready_button_width = 600;
+        private const float spectate_button_width = 200;
 
         public Action OnReadyClick
         {
             set => readyButton.OnReadyClick = value;
         }
 
+        public Action OnSpectateClick
+        {
+            set => spectateButton.OnSpectateClick = value;
+        }
+
         private readonly Drawable background;
         private readonly MultiplayerReadyButton readyButton;
+        private readonly MultiplayerSpectateButton spectateButton;
 
         public MultiplayerMatchFooter()
         {
@@ -32,11 +39,34 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             InternalChildren = new[]
             {
                 background = new Box { RelativeSizeAxes = Axes.Both },
-                readyButton = new MultiplayerReadyButton
+                new GridContainer
                 {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Size = new Vector2(600, 50),
+                    RelativeSizeAxes = Axes.Both,
+                    Content = new[]
+                    {
+                        new Drawable[]
+                        {
+                            null,
+                            spectateButton = new MultiplayerSpectateButton
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                            },
+                            null,
+                            readyButton = new MultiplayerReadyButton
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                            },
+                            null
+                        }
+                    },
+                    ColumnDimensions = new[]
+                    {
+                        new Dimension(),
+                        new Dimension(maxSize: spectate_button_width),
+                        new Dimension(GridSizeMode.Absolute, 10),
+                        new Dimension(maxSize: ready_button_width),
+                        new Dimension()
+                    }
                 }
             };
         }

From 08858e6426c520bb038ca774da64902dc21e70e9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Apr 2021 17:41:05 +0900
Subject: [PATCH 2224/3722] Reorder defaults to give non-global areas priority
 for global actions

---
 .../Input/Bindings/DatabasedKeyBindingContainer.cs   | 12 ++++++++++--
 osu.Game/Input/Bindings/GlobalActionContainer.cs     |  4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs b/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
index d12eaa10f6..cd8b486f23 100644
--- a/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
+++ b/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
@@ -64,12 +64,20 @@ namespace osu.Game.Input.Bindings
 
         protected override void ReloadMappings()
         {
+            var defaults = DefaultKeyBindings.ToList();
+
             if (ruleset != null && !ruleset.ID.HasValue)
                 // if the provided ruleset is not stored to the database, we have no way to retrieve custom bindings.
                 // fallback to defaults instead.
-                KeyBindings = DefaultKeyBindings;
+                KeyBindings = defaults;
             else
-                KeyBindings = store.Query(ruleset?.ID, variant).ToList();
+            {
+                KeyBindings = store.Query(ruleset?.ID, variant)
+                                   // this ordering is important to ensure that we read entries from the database in the order
+                                   // enforced by DefaultKeyBindings. allow for song select to handle actions that may otherwise
+                                   // have been eaten by the music controller due to query order.
+                                   .OrderBy(b => defaults.FindIndex(d => (int)d.Action == b.IntAction)).ToList();
+            }
         }
     }
 }
diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index c2f707a4e8..042960d54c 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -28,10 +28,10 @@ namespace osu.Game.Input.Bindings
         }
 
         public override IEnumerable<IKeyBinding> DefaultKeyBindings => GlobalKeyBindings
+                                                                       .Concat(EditorKeyBindings)
                                                                        .Concat(InGameKeyBindings)
-                                                                       .Concat(AudioControlKeyBindings)
                                                                        .Concat(SongSelectKeyBindings)
-                                                                       .Concat(EditorKeyBindings);
+                                                                       .Concat(AudioControlKeyBindings);
 
         public IEnumerable<KeyBinding> GlobalKeyBindings => new[]
         {

From b4c6894d13d96a9ba65162492459a2fe0a46de3e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Apr 2021 18:29:31 +0900
Subject: [PATCH 2225/3722] Add test coverage for song select footer area

---
 .../SongSelect/TestSceneSongSelectFooter.cs   | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectFooter.cs

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectFooter.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectFooter.cs
new file mode 100644
index 0000000000..0ac65b357c
--- /dev/null
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectFooter.cs
@@ -0,0 +1,35 @@
+// Copyright (c) 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.Game.Screens.Select;
+
+namespace osu.Game.Tests.Visual.SongSelect
+{
+    public class TestSceneSongSelectFooter : OsuManualInputManagerTestScene
+    {
+        public TestSceneSongSelectFooter()
+        {
+            AddStep("Create footer", () =>
+            {
+                Footer footer;
+                AddRange(new Drawable[]
+                {
+                    footer = new Footer
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                    }
+                });
+
+                footer.AddButton(new FooterButtonMods(), null);
+                footer.AddButton(new FooterButtonRandom
+                {
+                    NextRandom = () => { },
+                    PreviousRandom = () => { },
+                }, null);
+                footer.AddButton(new FooterButtonOptions(), null);
+            });
+        }
+    }
+}

From 0f2c03d54bb19c36ccc85bead76f4ce574ac7af9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Apr 2021 18:29:45 +0900
Subject: [PATCH 2226/3722] Add back "rewind" text, showing temporarily after a
 rewind occurs

---
 osu.Game/Screens/Select/FooterButton.cs       |  1 +
 osu.Game/Screens/Select/FooterButtonRandom.cs | 23 +++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/osu.Game/Screens/Select/FooterButton.cs b/osu.Game/Screens/Select/FooterButton.cs
index dfcdd1b45f..7528651fd9 100644
--- a/osu.Game/Screens/Select/FooterButton.cs
+++ b/osu.Game/Screens/Select/FooterButton.cs
@@ -106,6 +106,7 @@ namespace osu.Game.Screens.Select
                                     AutoSizeAxes = Axes.Both,
                                     Child = SpriteText = new OsuSpriteText
                                     {
+                                        AlwaysPresent = true,
                                         Anchor = Anchor.Centre,
                                         Origin = Anchor.Centre,
                                     }
diff --git a/osu.Game/Screens/Select/FooterButtonRandom.cs b/osu.Game/Screens/Select/FooterButtonRandom.cs
index b314971cb3..2d14111137 100644
--- a/osu.Game/Screens/Select/FooterButtonRandom.cs
+++ b/osu.Game/Screens/Select/FooterButtonRandom.cs
@@ -4,8 +4,11 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Input.Bindings;
+using osuTK;
 
 namespace osu.Game.Screens.Select
 {
@@ -22,10 +25,30 @@ namespace osu.Game.Screens.Select
             SelectedColour = colours.Green;
             DeselectedColour = SelectedColour.Opacity(0.5f);
             Text = @"random";
+
             Action = () =>
             {
                 if (rewindSearch)
                 {
+                    const double fade_time = 500;
+
+                    OsuSpriteText rewindSpriteText;
+
+                    TextContainer.Add(rewindSpriteText = new OsuSpriteText
+                    {
+                        Alpha = 0,
+                        Text = @"rewind",
+                        AlwaysPresent = true, // make sure the button is sized large enough to always show this
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                    });
+
+                    rewindSpriteText.FadeOutFromOne(fade_time, Easing.In);
+                    rewindSpriteText.MoveTo(Vector2.Zero).MoveTo(new Vector2(0, 10), fade_time, Easing.In);
+                    rewindSpriteText.Expire();
+
+                    SpriteText.FadeInFromZero(fade_time, Easing.In);
+
                     PreviousRandom.Invoke();
                 }
                 else

From aa424165b3790cdccd6d094b7310d68de6a16e6a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Apr 2021 18:45:57 +0900
Subject: [PATCH 2227/3722] Fix broken taiko test

---
 osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneInputDrum.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneInputDrum.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneInputDrum.cs
index fa6c9da174..9b36b064bc 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneInputDrum.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneInputDrum.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
         [BackgroundDependencyLoader]
         private void load()
         {
-            SetContents(() => new TaikoInputManager(new RulesetInfo { ID = 1 })
+            SetContents(() => new TaikoInputManager(new TaikoRuleset().RulesetInfo)
             {
                 RelativeSizeAxes = Axes.Both,
                 Child = new Container

From e7f47c635fdbad79b71831e8d4b86b0708138440 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Apr 2021 19:00:04 +0900
Subject: [PATCH 2228/3722] Fix gameplay mouse cursor being overridden by menu
 cursor

Closes https://github.com/ppy/osu/issues/12313.
---
 osu.Game/OsuGameBase.cs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index b2bbd0b48b..21313d0596 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -308,17 +308,15 @@ namespace osu.Game
 
             AddInternal(RulesetConfigCache);
 
-            MenuCursorContainer = new MenuCursorContainer { RelativeSizeAxes = Axes.Both };
-
-            GlobalInputManager globalInput;
-
-            MenuCursorContainer.Child = globalInput = new GlobalInputManager(this)
+            var globalInput = new GlobalInputManager(this)
             {
                 RelativeSizeAxes = Axes.Both,
-                Child = content = new OsuTooltipContainer(MenuCursorContainer.Cursor) { RelativeSizeAxes = Axes.Both }
+                Child = MenuCursorContainer = new MenuCursorContainer { RelativeSizeAxes = Axes.Both }
             };
 
-            base.Content.Add(CreateScalingContainer().WithChild(MenuCursorContainer));
+            MenuCursorContainer.Child = content = new OsuTooltipContainer(MenuCursorContainer.Cursor) { RelativeSizeAxes = Axes.Both };
+
+            base.Content.Add(CreateScalingContainer().WithChild(globalInput));
 
             KeyBindingStore.Register(globalInput.GlobalBindings);
             dependencies.Cache(globalInput.GlobalBindings);

From 7d37c4df8cc6d1e043b06cb1b887bc443b7ad5c2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 7 Apr 2021 20:17:20 +0900
Subject: [PATCH 2229/3722] Fix broken osu tests

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

diff --git a/osu.Game.Rulesets.Osu.Tests/OsuSkinnableTestScene.cs b/osu.Game.Rulesets.Osu.Tests/OsuSkinnableTestScene.cs
index cad98185ce..233aaf2ed9 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuSkinnableTestScene.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             get
             {
                 if (content == null)
-                    base.Content.Add(content = new OsuInputManager(new RulesetInfo { ID = 0 }));
+                    base.Content.Add(content = new OsuInputManager(new OsuRuleset().RulesetInfo));
 
                 return content;
             }

From 93c5935ebc4adc5989122b0f502fab6c44dd5064 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 7 Apr 2021 20:46:30 +0900
Subject: [PATCH 2230/3722] Add match subscreen support + test

---
 .../TestSceneMultiplayerMatchSubScreen.cs     | 61 +++++++++++++++++++
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 19 +++++-
 .../Multiplayer/TestMultiplayerClient.cs      |  3 +
 3 files changed, 81 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
index 8869718fd1..6f8ec7fcfb 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
@@ -3,13 +3,21 @@
 
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.OnlinePlay.Multiplayer;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
 using osu.Game.Tests.Beatmaps;
+using osu.Game.Tests.Resources;
+using osu.Game.Users;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Multiplayer
@@ -18,11 +26,25 @@ namespace osu.Game.Tests.Visual.Multiplayer
     {
         private MultiplayerMatchSubScreen screen;
 
+        private BeatmapManager beatmaps;
+        private RulesetStore rulesets;
+        private BeatmapSetInfo importedSet;
+
         public TestSceneMultiplayerMatchSubScreen()
             : base(false)
         {
         }
 
+        [BackgroundDependencyLoader]
+        private void load(GameHost host, AudioManager audio)
+        {
+            Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
+            Dependencies.Cache(beatmaps = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, host, Beatmap.Default));
+            beatmaps.Import(TestResources.GetQuickTestBeatmapForImport()).Wait();
+
+            importedSet = beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.All).First();
+        }
+
         [SetUp]
         public new void Setup() => Schedule(() =>
         {
@@ -73,5 +95,44 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             AddWaitStep("wait", 10);
         }
+
+        [Test]
+        public void TestStartMatchWhileSpectating()
+        {
+            AddStep("set playlist", () =>
+            {
+                Room.Playlist.Add(new PlaylistItem
+                {
+                    Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First()).BeatmapInfo },
+                    Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                });
+            });
+
+            AddStep("click create button", () =>
+            {
+                InputManager.MoveMouseTo(this.ChildrenOfType<MultiplayerMatchSettingsOverlay.CreateOrUpdateButton>().Single());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddStep("join other user (ready)", () =>
+            {
+                Client.AddUser(new User { Id = 55 });
+                Client.ChangeUserState(55, MultiplayerUserState.Ready);
+            });
+
+            AddStep("click spectate button", () =>
+            {
+                InputManager.MoveMouseTo(this.ChildrenOfType<MultiplayerSpectateButton>().Single());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddStep("click ready button", () =>
+            {
+                InputManager.MoveMouseTo(this.ChildrenOfType<MultiplayerReadyButton>().Single());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddAssert("match started", () => Client.Room?.State == MultiplayerRoomState.WaitingForLoad);
+        }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index ceeee67806..90cef0107c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -221,7 +221,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                         {
                             new MultiplayerMatchFooter
                             {
-                                OnReadyClick = onReadyClick
+                                OnReadyClick = onReadyClick,
+                                OnSpectateClick = onSpectateClick
                             }
                         }
                     },
@@ -363,7 +364,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             Debug.Assert(readyClickOperation == null);
             readyClickOperation = ongoingOperationTracker.BeginOperation();
 
-            if (client.IsHost && client.LocalUser?.State == MultiplayerUserState.Ready)
+            if (client.IsHost && (client.LocalUser?.State == MultiplayerUserState.Ready || client.LocalUser?.State == MultiplayerUserState.Spectating))
             {
                 client.StartMatch()
                       .ContinueWith(t =>
@@ -390,6 +391,20 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             }
         }
 
+        private void onSpectateClick()
+        {
+            Debug.Assert(readyClickOperation == null);
+            readyClickOperation = ongoingOperationTracker.BeginOperation();
+
+            client.ToggleSpectate().ContinueWith(t => endOperation());
+
+            void endOperation()
+            {
+                readyClickOperation?.Dispose();
+                readyClickOperation = null;
+            }
+        }
+
         private void onRoomUpdated()
         {
             // user mods may have changed.
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index 4c954c7d27..b5cd3dad02 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -77,6 +77,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     case MultiplayerUserState.Loaded:
                         if (Room.Users.All(u => u.State != MultiplayerUserState.WaitingForLoad))
                         {
+                            ChangeRoomState(MultiplayerRoomState.Playing);
                             foreach (var u in Room.Users.Where(u => u.State == MultiplayerUserState.Loaded))
                                 ChangeUserState(u.UserID, MultiplayerUserState.Playing);
 
@@ -88,6 +89,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     case MultiplayerUserState.FinishedPlay:
                         if (Room.Users.All(u => u.State != MultiplayerUserState.Playing))
                         {
+                            ChangeRoomState(MultiplayerRoomState.Open);
                             foreach (var u in Room.Users.Where(u => u.State == MultiplayerUserState.FinishedPlay))
                                 ChangeUserState(u.UserID, MultiplayerUserState.Results);
 
@@ -179,6 +181,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             Debug.Assert(Room != null);
 
+            ChangeRoomState(MultiplayerRoomState.WaitingForLoad);
             foreach (var user in Room.Users.Where(u => u.State == MultiplayerUserState.Ready))
                 ChangeUserState(user.UserID, MultiplayerUserState.WaitingForLoad);
 

From 1f4c17b8f856a1d010fd2e45345d199c51dfba14 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 7 Apr 2021 21:20:44 +0900
Subject: [PATCH 2231/3722] Apply changes to AllowScreenSuspension bindable

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

diff --git a/osu.Game/Screens/Play/ScreenSuspensionHandler.cs b/osu.Game/Screens/Play/ScreenSuspensionHandler.cs
index 8585a5c309..30ca15c311 100644
--- a/osu.Game/Screens/Play/ScreenSuspensionHandler.cs
+++ b/osu.Game/Screens/Play/ScreenSuspensionHandler.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Diagnostics;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -19,6 +18,8 @@ namespace osu.Game.Screens.Play
         private readonly GameplayClockContainer gameplayClockContainer;
         private Bindable<bool> isPaused;
 
+        private readonly Bindable<bool> disableSuspensionBindable = new Bindable<bool>();
+
         [Resolved]
         private GameHost host { get; set; }
 
@@ -31,12 +32,14 @@ namespace osu.Game.Screens.Play
         {
             base.LoadComplete();
 
-            // This is the only usage game-wide of suspension changes.
-            // Assert to ensure we don't accidentally forget this in the future.
-            Debug.Assert(host.AllowScreenSuspension.Value);
-
             isPaused = gameplayClockContainer.IsPaused.GetBoundCopy();
-            isPaused.BindValueChanged(paused => host.AllowScreenSuspension.Value = paused.NewValue, true);
+            isPaused.BindValueChanged(paused =>
+            {
+                if (paused.NewValue)
+                    host.AllowScreenSuspension.RemoveSource(disableSuspensionBindable);
+                else
+                    host.AllowScreenSuspension.AddSource(disableSuspensionBindable);
+            }, true);
         }
 
         protected override void Dispose(bool isDisposing)
@@ -44,9 +47,7 @@ namespace osu.Game.Screens.Play
             base.Dispose(isDisposing);
 
             isPaused?.UnbindAll();
-
-            if (host != null)
-                host.AllowScreenSuspension.Value = true;
+            host?.AllowScreenSuspension.RemoveSource(disableSuspensionBindable);
         }
     }
 }

From b24ce66a0d4bfcc9f53d84fe998b6d4027ef8a5a Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 7 Apr 2021 14:35:33 +0200
Subject: [PATCH 2232/3722] Add check/issue classes

---
 osu.Game/Rulesets/Edit/Checker.cs             | 25 ++++++
 .../Edit/Verify/Components/BeatmapCheck.cs    | 19 +++++
 .../Screens/Edit/Verify/Components/Check.cs   | 41 +++++++++
 .../Edit/Verify/Components/CheckMetadata.cs   | 62 ++++++++++++++
 .../Screens/Edit/Verify/Components/Issue.cs   | 83 ++++++++++++++++++
 .../Edit/Verify/Components/IssueTemplate.cs   | 84 +++++++++++++++++++
 osu.Game/Screens/Edit/Verify/Issue.cs         | 10 ---
 7 files changed, 314 insertions(+), 10 deletions(-)
 create mode 100644 osu.Game/Rulesets/Edit/Checker.cs
 create mode 100644 osu.Game/Screens/Edit/Verify/Components/BeatmapCheck.cs
 create mode 100644 osu.Game/Screens/Edit/Verify/Components/Check.cs
 create mode 100644 osu.Game/Screens/Edit/Verify/Components/CheckMetadata.cs
 create mode 100644 osu.Game/Screens/Edit/Verify/Components/Issue.cs
 create mode 100644 osu.Game/Screens/Edit/Verify/Components/IssueTemplate.cs
 delete mode 100644 osu.Game/Screens/Edit/Verify/Issue.cs

diff --git a/osu.Game/Rulesets/Edit/Checker.cs b/osu.Game/Rulesets/Edit/Checker.cs
new file mode 100644
index 0000000000..1c267c3435
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/Checker.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 System.Collections.Generic;
+using System.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Checks;
+using osu.Game.Screens.Edit.Verify.Components;
+
+namespace osu.Game.Rulesets.Edit
+{
+    public abstract class Checker
+    {
+        // These are all mode-invariant, hence here instead of in e.g. `OsuChecker`.
+        private readonly List<BeatmapCheck> beatmapChecks = new List<BeatmapCheck>
+        {
+            new CheckMetadataVowels()
+        };
+
+        public virtual IEnumerable<Issue> Run(IBeatmap beatmap)
+        {
+            return beatmapChecks.SelectMany(check => check.Run(beatmap));
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Verify/Components/BeatmapCheck.cs b/osu.Game/Screens/Edit/Verify/Components/BeatmapCheck.cs
new file mode 100644
index 0000000000..7297dab60d
--- /dev/null
+++ b/osu.Game/Screens/Edit/Verify/Components/BeatmapCheck.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.Game.Beatmaps;
+
+namespace osu.Game.Screens.Edit.Verify.Components
+{
+    public abstract class BeatmapCheck : Check<IBeatmap>
+    {
+        /// <summary>
+        /// Returns zero, one, or several issues detected by this
+        /// check on the given beatmap.
+        /// </summary>
+        /// <param name="beatmap">The beatmap to run the check on.</param>
+        /// <returns></returns>
+        public abstract override IEnumerable<Issue> Run(IBeatmap beatmap);
+    }
+}
diff --git a/osu.Game/Screens/Edit/Verify/Components/Check.cs b/osu.Game/Screens/Edit/Verify/Components/Check.cs
new file mode 100644
index 0000000000..2ae21fd350
--- /dev/null
+++ b/osu.Game/Screens/Edit/Verify/Components/Check.cs
@@ -0,0 +1,41 @@
+// Copyright (c) ppy 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;
+
+namespace osu.Game.Screens.Edit.Verify.Components
+{
+    public abstract class Check
+    {
+        /// <summary>
+        /// Returns the <see cref="CheckMetadata"/> for this check.
+        /// Basically, its information.
+        /// </summary>
+        /// <returns></returns>
+        public abstract CheckMetadata Metadata();
+
+        /// <summary>
+        /// The templates for issues that this check may use.
+        /// Basically, what issues this check can detect.
+        /// </summary>
+        /// <returns></returns>
+        public abstract IEnumerable<IssueTemplate> Templates();
+
+        protected Check()
+        {
+            foreach (var template in Templates())
+                template.Origin = this;
+        }
+    }
+
+    public abstract class Check<T> : Check
+    {
+        /// <summary>
+        /// Returns zero, one, or several issues detected by
+        /// this check on the given object.
+        /// </summary>
+        /// <param name="obj">The object to run the check on.</param>
+        /// <returns></returns>
+        public abstract IEnumerable<Issue> Run(T obj);
+    }
+}
diff --git a/osu.Game/Screens/Edit/Verify/Components/CheckMetadata.cs b/osu.Game/Screens/Edit/Verify/Components/CheckMetadata.cs
new file mode 100644
index 0000000000..1cac99d47d
--- /dev/null
+++ b/osu.Game/Screens/Edit/Verify/Components/CheckMetadata.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.
+
+namespace osu.Game.Screens.Edit.Verify
+{
+    public class CheckMetadata
+    {
+        /// <summary>
+        /// The category of an issue.
+        /// </summary>
+        public enum CheckCategory
+        {
+            /// <summary> Anything to do with control points. </summary>
+            Timing,
+
+            /// <summary> Anything to do with artist, title, creator, etc. </summary>
+            Metadata,
+
+            /// <summary> Anything to do with non-audio files, e.g. background, skin, sprites, and video. </summary>
+            Resources,
+
+            /// <summary> Anything to do with audio files, e.g. song and hitsounds. </summary>
+            Audio,
+
+            /// <summary> Anything to do with files that don't fit into the above, e.g. unused, osu, or osb. </summary>
+            Files,
+
+            /// <summary> Anything to do with hitobjects unrelated to spread. </summary>
+            Compose,
+
+            /// <summary> Anything to do with difficulty levels or their progression. </summary>
+            Spread,
+
+            /// <summary> Anything to do with variables like CS, OD, AR, HP, and global SV. </summary>
+            Settings,
+
+            /// <summary> Anything to do with hitobject feedback. </summary>
+            Hitsounds,
+
+            /// <summary> Anything to do with storyboarding, breaks, video offset, etc. </summary>
+            Events
+        }
+
+        /// <summary>
+        /// The category this check belongs to. E.g. <see cref="CheckCategory.Metadata"/>,
+        /// <see cref="CheckCategory.Timing"/>, or <see cref="CheckCategory.Compose"/>.
+        /// </summary>
+        public readonly CheckCategory Category;
+
+        /// <summary>
+        /// Describes the issue(s) that this check looks for. Keep this brief, such that
+        /// it fits into "No {description}". E.g. "Offscreen objects" / "Too short sliders".
+        /// </summary>
+        public readonly string Description;
+
+        public CheckMetadata(CheckCategory category, string description)
+        {
+            Category = category;
+            Description = description;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Verify/Components/Issue.cs b/osu.Game/Screens/Edit/Verify/Components/Issue.cs
new file mode 100644
index 0000000000..fe81cb9335
--- /dev/null
+++ b/osu.Game/Screens/Edit/Verify/Components/Issue.cs
@@ -0,0 +1,83 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using osu.Game.Extensions;
+using osu.Game.Rulesets.Objects;
+
+namespace osu.Game.Screens.Edit.Verify.Components
+{
+    public class Issue
+    {
+        /// <summary>
+        /// The time which this issue is associated with, if any, otherwise null.
+        /// </summary>
+        public double? Time;
+
+        /// <summary>
+        /// The hitobjects which this issue is associated with. Empty by default.
+        /// </summary>
+        public IReadOnlyList<HitObject> HitObjects;
+
+        /// <summary>
+        /// The template which this issue is using. This provides properties
+        /// such as the <see cref="IssueTemplate.IssueType"/>, and the
+        /// <see cref="IssueTemplate.UnformattedMessage"/>.
+        /// </summary>
+        public IssueTemplate Template;
+
+        /// <summary>
+        /// The arguments that give this issue its context, based on the
+        /// <see cref="IssueTemplate"/>. These are then substituted into the
+        /// <see cref="IssueTemplate.UnformattedMessage"/>.
+        /// E.g. timestamps, which diff is being compared to, what some volume is, etc.
+        /// </summary>
+        public object[] Arguments;
+
+        public Issue(IssueTemplate template, params object[] args)
+        {
+            Time = null;
+            HitObjects = System.Array.Empty<HitObject>();
+            Template = template;
+            Arguments = args;
+
+            if (template.Origin == null)
+            {
+                throw new ArgumentException(
+                    "A template had no origin. Make sure the `Templates()` method contains all templates used."
+                );
+            }
+        }
+
+        public Issue(double? time, IssueTemplate template, params object[] args)
+            : this(template, args)
+        {
+            Time = time;
+        }
+
+        public Issue(IEnumerable<HitObject> hitObjects, IssueTemplate template, params object[] args)
+            : this(template, args)
+        {
+            Time = hitObjects.FirstOrDefault()?.StartTime;
+            HitObjects = hitObjects.ToArray();
+        }
+
+        public override string ToString()
+        {
+            return Template.Message(Arguments);
+        }
+
+        public string GetEditorTimestamp()
+        {
+            // TODO: Editor timestamp formatting is handled in https://github.com/ppy/osu/pull/12030
+            // We may be able to use that here too (if we decouple it from the HitObjectComposer class).
+
+            if (Time == null)
+                return string.Empty;
+
+            return Time.Value.ToEditorFormattedString();
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Verify/Components/IssueTemplate.cs b/osu.Game/Screens/Edit/Verify/Components/IssueTemplate.cs
new file mode 100644
index 0000000000..b178fa7122
--- /dev/null
+++ b/osu.Game/Screens/Edit/Verify/Components/IssueTemplate.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 Humanizer;
+using osu.Framework.Graphics;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Edit.Verify.Components
+{
+    public class IssueTemplate
+    {
+        /// <summary>
+        /// The type, or severity, of an issue. This decides its priority.
+        /// </summary>
+        public enum IssueType
+        {
+            /// <summary> A must-fix in the vast majority of cases. </summary>
+            Problem = 3,
+
+            /// <summary> A possible mistake. Often requires critical thinking.  </summary>
+            Warning = 2,
+
+            // TODO: Try/catch all checks run and return error templates if exceptions occur.
+            /// <summary> An error occurred and a complete check could not be made. </summary>
+            Error = 1,
+
+            // TODO: Negligible issues should be hidden by default.
+            /// <summary> A possible mistake so minor/unlikely that it can often be safely ignored. </summary>
+            Negligible = 0,
+        }
+
+        /// <summary>
+        /// The check that this template originates from.
+        /// </summary>
+        public Check Origin;
+
+        /// <summary>
+        /// The type of the issue. E.g. <see cref="IssueType.Problem"/>,
+        /// <see cref="IssueType.Warning"/>, or <see cref="IssueType.Negligible"/>.
+        /// </summary>
+        public readonly IssueType Type;
+
+        /// <summary>
+        /// The unformatted message given when this issue is detected.
+        /// This gets populated later when an issue is constructed with this template.
+        /// E.g. "Inconsistent snapping (1/{0}) with [{1}] (1/{2})."
+        /// </summary>
+        public readonly string UnformattedMessage;
+
+        public IssueTemplate(IssueType type, string unformattedMessage)
+        {
+            Type = type;
+            UnformattedMessage = unformattedMessage;
+        }
+
+        /// <summary>
+        /// Returns the formatted message given the arguments used to format it.
+        /// </summary>
+        /// <param name="args">The arguments used to format the message.</param>
+        /// <returns></returns>
+        public string Message(params object[] args) => UnformattedMessage.FormatWith(args);
+
+        public static readonly Color4 PROBLEM_RED = new Colour4(1.0f, 0.4f, 0.4f, 1.0f);
+        public static readonly Color4 WARNING_YELLOW = new Colour4(1.0f, 0.8f, 0.2f, 1.0f);
+        public static readonly Color4 NEGLIGIBLE_GREEN = new Colour4(0.33f, 0.8f, 0.5f, 1.0f);
+        public static readonly Color4 ERROR_GRAY = new Colour4(0.5f, 0.5f, 0.5f, 1.0f);
+
+        /// <summary>
+        /// Returns the colour corresponding to the type of this issue.
+        /// </summary>
+        /// <returns></returns>
+        public Colour4 TypeColour()
+        {
+            return Type switch
+            {
+                IssueType.Problem => PROBLEM_RED,
+                IssueType.Warning => WARNING_YELLOW,
+                IssueType.Negligible => NEGLIGIBLE_GREEN,
+                IssueType.Error => ERROR_GRAY,
+                _ => Color4.White
+            };
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Verify/Issue.cs b/osu.Game/Screens/Edit/Verify/Issue.cs
deleted file mode 100644
index 25e913d819..0000000000
--- a/osu.Game/Screens/Edit/Verify/Issue.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.
-
-namespace osu.Game.Screens.Edit.Verify
-{
-    public class Issue
-    {
-        public readonly double Time;
-    }
-}

From 0343ef7f147b12a8bd71dfced08c6b503b6b8b79 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 7 Apr 2021 14:36:43 +0200
Subject: [PATCH 2233/3722] Add ruleset-specific checker

---
 osu.Game.Rulesets.Osu/Edit/OsuChecker.cs | 30 ++++++++++++++++++++++++
 osu.Game.Rulesets.Osu/OsuRuleset.cs      |  2 ++
 osu.Game/Rulesets/Ruleset.cs             |  2 ++
 3 files changed, 34 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu/Edit/OsuChecker.cs

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs b/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs
new file mode 100644
index 0000000000..9918b53c85
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Edit/OsuChecker.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.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Osu.Edit.Checks;
+using osu.Game.Screens.Edit.Verify.Components;
+
+namespace osu.Game.Rulesets.Osu.Edit
+{
+    public class OsuChecker : Checker
+    {
+        public readonly List<BeatmapCheck> beatmapChecks = new List<BeatmapCheck>
+        {
+            new CheckConsecutiveCircles()
+        };
+
+        public override IEnumerable<Issue> Run(IBeatmap beatmap)
+        {
+            // Also run mode-invariant checks.
+            foreach (var issue in base.Run(beatmap))
+                yield return issue;
+
+            foreach (var issue in beatmapChecks.SelectMany(check => check.Run(beatmap)))
+                yield return issue;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 838d707d64..74679bd578 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -206,6 +206,8 @@ namespace osu.Game.Rulesets.Osu
 
         public override HitObjectComposer CreateHitObjectComposer() => new OsuHitObjectComposer(this);
 
+        public override Checker CreateChecker() => new OsuChecker();
+
         public override string Description => "osu!";
 
         public override string ShortName => SHORT_NAME;
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 38d30a2e31..71f80c9982 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -202,6 +202,8 @@ namespace osu.Game.Rulesets
 
         public virtual HitObjectComposer CreateHitObjectComposer() => null;
 
+        public virtual Checker CreateChecker() => null;
+
         public virtual Drawable CreateIcon() => new SpriteIcon { Icon = FontAwesome.Solid.QuestionCircle };
 
         public virtual IResourceStore<byte[]> CreateResourceStore() => new NamespacedResourceStore<byte[]>(new DllResourceStore(GetType().Assembly), @"Resources");

From 9c4604e3c5fdbfa9f5201f39ee41584fa5b47d18 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 7 Apr 2021 14:36:53 +0200
Subject: [PATCH 2234/3722] Add example checks

---
 .../Edit/Checks/CheckConsecutiveCircles.cs    | 86 +++++++++++++++++++
 osu.Game/Checks/CheckMetadataVowels.cs        | 65 ++++++++++++++
 2 files changed, 151 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu/Edit/Checks/CheckConsecutiveCircles.cs
 create mode 100644 osu.Game/Checks/CheckMetadataVowels.cs

diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckConsecutiveCircles.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckConsecutiveCircles.cs
new file mode 100644
index 0000000000..c41c0dac2b
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckConsecutiveCircles.cs
@@ -0,0 +1,86 @@
+// Copyright (c) ppy 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.Objects;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Screens.Edit.Verify;
+using osu.Game.Screens.Edit.Verify.Components;
+
+namespace osu.Game.Rulesets.Osu.Edit.Checks
+{
+    public class CheckConsecutiveCircles : BeatmapCheck
+    {
+        private const double consecutive_threshold = 3;
+        private const double delta_time_min_expected = 300;
+        private const double delta_time_min_threshold = 100;
+
+        public override CheckMetadata Metadata() => new CheckMetadata
+        (
+            category: CheckMetadata.CheckCategory.Spread,
+            description: "Too many or fast consecutive circles."
+        );
+
+        private IssueTemplate templateManyInARow = new IssueTemplate
+        (
+            type: IssueTemplate.IssueType.Problem,
+            unformattedMessage: "There are {0} circles in a row here, expected at most {1}."
+        );
+
+        private IssueTemplate templateTooFast = new IssueTemplate
+        (
+            type: IssueTemplate.IssueType.Warning,
+            unformattedMessage: "These circles are too fast ({0:0} ms), expected at least {1:0} ms."
+        );
+
+        private IssueTemplate templateAlmostTooFast = new IssueTemplate
+        (
+            type: IssueTemplate.IssueType.Negligible,
+            unformattedMessage: "These circles are almost too fast ({0:0} ms), expected at least {1:0} ms."
+        );
+
+        public override IEnumerable<IssueTemplate> Templates() => new[]
+        {
+            templateManyInARow,
+            templateTooFast,
+            templateAlmostTooFast
+        };
+
+        public override IEnumerable<Issue> Run(IBeatmap beatmap)
+        {
+            List<HitCircle> prevCircles = new List<HitCircle>();
+
+            foreach (HitObject hitobject in beatmap.HitObjects)
+            {
+                if (!(hitobject is HitCircle circle) || hitobject == beatmap.HitObjects.Last())
+                {
+                    if (prevCircles.Count > consecutive_threshold)
+                    {
+                        yield return new Issue(
+                            prevCircles,
+                            templateManyInARow,
+                            prevCircles.Count, consecutive_threshold
+                        );
+                    }
+
+                    prevCircles.Clear();
+                    continue;
+                }
+
+                double? prevDeltaTime = circle.StartTime - prevCircles.LastOrDefault()?.StartTime;
+                prevCircles.Add(circle);
+
+                if (prevDeltaTime == null || prevDeltaTime >= delta_time_min_expected)
+                    continue;
+
+                yield return new Issue(
+                    prevCircles.TakeLast(2),
+                    prevDeltaTime < delta_time_min_threshold ? templateTooFast : templateAlmostTooFast,
+                    prevDeltaTime, delta_time_min_expected
+                );
+            }
+        }
+    }
+}
diff --git a/osu.Game/Checks/CheckMetadataVowels.cs b/osu.Game/Checks/CheckMetadataVowels.cs
new file mode 100644
index 0000000000..8bcfe89c3a
--- /dev/null
+++ b/osu.Game/Checks/CheckMetadataVowels.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 System.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Screens.Edit.Verify;
+using osu.Game.Screens.Edit.Verify.Components;
+
+namespace osu.Game.Checks
+{
+    public class CheckMetadataVowels : BeatmapCheck
+    {
+        private static readonly char[] vowels = { 'a', 'e', 'i', 'o', 'u' };
+
+        public override CheckMetadata Metadata() => new CheckMetadata
+        (
+            category: CheckMetadata.CheckCategory.Metadata,
+            description: "Metadata fields contain vowels"
+        );
+
+        public override IEnumerable<IssueTemplate> Templates() => new[]
+        {
+            templateArtistHasVowels
+        };
+
+        private IssueTemplate templateArtistHasVowels = new IssueTemplate
+        (
+            type: IssueTemplate.IssueType.Warning,
+            unformattedMessage: "The {0} field \"{1}\" contains the vowel(s) {2}."
+        );
+
+        public override IEnumerable<Issue> Run(IBeatmap beatmap)
+        {
+            foreach (var issue in GetVowelIssues("artist", beatmap.Metadata.Artist))
+                yield return issue;
+
+            foreach (var issue in GetVowelIssues("unicode artist", beatmap.Metadata.ArtistUnicode))
+                yield return issue;
+
+            foreach (var issue in GetVowelIssues("title", beatmap.Metadata.Title))
+                yield return issue;
+
+            foreach (var issue in GetVowelIssues("unicode title", beatmap.Metadata.TitleUnicode))
+                yield return issue;
+        }
+
+        private IEnumerable<Issue> GetVowelIssues(string fieldName, string fieldValue)
+        {
+            if (fieldValue == null)
+                // Unicode fields can be null if same as respective romanized fields.
+                yield break;
+
+            List<char> matches = vowels.Where(c => fieldValue.ToLower().Contains(c)).ToList();
+
+            if (!matches.Any())
+                yield break;
+
+            yield return new Issue(
+                templateArtistHasVowels,
+                fieldName, fieldValue, string.Join(", ", matches)
+            );
+        }
+    }
+}

From bab36e529a5b9e1ff5b2300e9def2b5bc11687a7 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 7 Apr 2021 14:38:43 +0200
Subject: [PATCH 2235/3722] Update UI with new components

---
 osu.Game/Screens/Edit/Verify/IssueSettings.cs | 47 +++++++++
 osu.Game/Screens/Edit/Verify/IssueTable.cs    | 91 +++++++++--------
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs  | 98 +++++++++++++++----
 .../Screens/Edit/Verify/VisibilitySettings.cs | 52 ++++++++++
 4 files changed, 229 insertions(+), 59 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/Verify/IssueSettings.cs
 create mode 100644 osu.Game/Screens/Edit/Verify/VisibilitySettings.cs

diff --git a/osu.Game/Screens/Edit/Verify/IssueSettings.cs b/osu.Game/Screens/Edit/Verify/IssueSettings.cs
new file mode 100644
index 0000000000..608be877de
--- /dev/null
+++ b/osu.Game/Screens/Edit/Verify/IssueSettings.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 System.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+
+namespace osu.Game.Screens.Edit.Verify
+{
+    public class IssueSettings : CompositeDrawable
+    {
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            InternalChildren = new Drawable[]
+            {
+                new Box
+                {
+                    Colour = colours.Gray3,
+                    RelativeSizeAxes = Axes.Both,
+                },
+                new OsuScrollContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Child = new FillFlowContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Direction = FillDirection.Vertical,
+                        Children = createSections()
+                    },
+                }
+            };
+        }
+
+        private IReadOnlyList<Drawable> createSections() => new Drawable[]
+        {
+            new VisibilitySettings()
+        };
+    }
+}
diff --git a/osu.Game/Screens/Edit/Verify/IssueTable.cs b/osu.Game/Screens/Edit/Verify/IssueTable.cs
index 6476cebe48..c70695a849 100644
--- a/osu.Game/Screens/Edit/Verify/IssueTable.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueTable.cs
@@ -4,16 +4,16 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
-using osu.Game.Extensions;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Input.Bindings;
+using osu.Game.Screens.Edit.Verify.Components;
 using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Verify
@@ -34,6 +34,9 @@ namespace osu.Game.Screens.Edit.Verify
             Padding = new MarginPadding { Horizontal = horizontal_inset };
             RowSize = new Dimension(GridSizeMode.Absolute, row_height);
 
+            Masking = true;
+            CornerRadius = 6;
+
             AddInternal(backgroundFlow = new FillFlowContainer
             {
                 RelativeSizeAxes = Axes.Both,
@@ -55,7 +58,7 @@ namespace osu.Game.Screens.Edit.Verify
 
                 foreach (var issue in value)
                 {
-                    backgroundFlow.Add(new IssueTable.RowBackground(issue));
+                    backgroundFlow.Add(new RowBackground(issue));
                 }
 
                 Columns = createHeaders();
@@ -68,9 +71,10 @@ namespace osu.Game.Screens.Edit.Verify
             var columns = new List<TableColumn>
             {
                 new TableColumn(string.Empty, Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
+                new TableColumn("Type", Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
                 new TableColumn("Time", Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
-                new TableColumn(),
-                new TableColumn("Attributes", Anchor.CentreLeft),
+                new TableColumn("Message", Anchor.CentreLeft),
+                new TableColumn("Category", Anchor.CentreRight, new Dimension(GridSizeMode.AutoSize)),
             };
 
             return columns.ToArray();
@@ -81,21 +85,36 @@ namespace osu.Game.Screens.Edit.Verify
             new OsuSpriteText
             {
                 Text = $"#{index + 1}",
+                Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Medium)
+            },
+            new OsuSpriteText
+            {
+                Text = issue.Template.Type.ToString(),
+                Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold),
+                Margin = new MarginPadding { Left = 10 },
+                Colour = issue.Template.TypeColour()
+            },
+            new OsuSpriteText
+            {
+                Text = issue.GetEditorTimestamp(),
                 Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold),
                 Margin = new MarginPadding(10)
             },
             new OsuSpriteText
             {
-                Text = issue.Time.ToEditorFormattedString(),
-                Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold)
+                Text = issue.ToString(),
+                Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Medium)
             },
-            null,
-            null //new ControlGroupAttributes(issue),
+            new OsuSpriteText
+            {
+                Text = issue.Template.Origin.Metadata().Category.ToString(),
+                Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold),
+                Margin = new MarginPadding(10)
+            }
         };
 
         public class RowBackground : OsuClickableContainer
         {
-            private readonly Issue issue;
             private const int fade_duration = 100;
 
             private readonly Box hoveredBackground;
@@ -104,13 +123,15 @@ namespace osu.Game.Screens.Edit.Verify
             private EditorClock clock { get; set; }
 
             [Resolved]
-            private Bindable<Issue> selectedIssue { get; set; }
+            private Editor editor { get; set; }
+
+            [Resolved]
+            private EditorBeatmap editorBeatmap { get; set; }
 
             public RowBackground(Issue issue)
             {
-                this.issue = issue;
                 RelativeSizeAxes = Axes.X;
-                Height = 25;
+                Height = row_height;
 
                 AlwaysPresent = true;
 
@@ -128,41 +149,29 @@ namespace osu.Game.Screens.Edit.Verify
 
                 Action = () =>
                 {
-                    selectedIssue.Value = issue;
-                    clock.SeekSmoothlyTo(issue.Time);
+                    // Supposed to work like clicking timestamps outside of the game.
+                    // TODO: Is there already defined behaviour for this I may be able to call?
+
+                    if (issue.Time != null)
+                    {
+                        clock.Seek(issue.Time.Value);
+                        editor.OnPressed(GlobalAction.EditorComposeMode);
+                    }
+
+                    if (!issue.HitObjects.Any())
+                        return;
+
+                    editorBeatmap.SelectedHitObjects.Clear();
+                    editorBeatmap.SelectedHitObjects.AddRange(issue.HitObjects);
                 };
             }
 
             private Color4 colourHover;
-            private Color4 colourSelected;
 
             [BackgroundDependencyLoader]
             private void load(OsuColour colours)
             {
                 hoveredBackground.Colour = colourHover = colours.BlueDarker;
-                colourSelected = colours.YellowDarker;
-            }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-
-                selectedIssue.BindValueChanged(group => { Selected = issue == group.NewValue; }, true);
-            }
-
-            private bool selected;
-
-            protected bool Selected
-            {
-                get => selected;
-                set
-                {
-                    if (value == selected)
-                        return;
-
-                    selected = value;
-                    updateState();
-                }
             }
 
             protected override bool OnHover(HoverEvent e)
@@ -179,9 +188,9 @@ namespace osu.Game.Screens.Edit.Verify
 
             private void updateState()
             {
-                hoveredBackground.FadeColour(selected ? colourSelected : colourHover, 450, Easing.OutQuint);
+                hoveredBackground.FadeColour(colourHover, 450, Easing.OutQuint);
 
-                if (selected || IsHovered)
+                if (IsHovered)
                     hoveredBackground.FadeIn(fade_duration, Easing.OutQuint);
                 else
                     hoveredBackground.FadeOut(fade_duration, Easing.OutQuint);
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index c15cefae83..88397fdbff 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -1,40 +1,70 @@
 // Copyright (c) ppy 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.Shapes;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Edit;
+using osuTK;
 
 namespace osu.Game.Screens.Edit.Verify
 {
-    public class VerifyScreen : EditorScreenWithTimeline
+    public class VerifyScreen : EditorScreen
     {
+        private Ruleset ruleset;
+        private static Checker checker; // TODO: Should not be static, but apparently needs to be?
+
         public VerifyScreen()
             : base(EditorScreenMode.Verify)
         {
         }
 
-        protected override Drawable CreateMainContent() => new GridContainer
+        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
         {
-            RelativeSizeAxes = Axes.Both,
-            ColumnDimensions = new[]
-            {
-                new Dimension(),
-                new Dimension(GridSizeMode.Absolute, 200),
-            },
-            Content = new[]
-            {
-                new Drawable[]
-                {
-                    new ControlPointList()
-                },
-            }
-        };
+            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
 
-        public class ControlPointList : CompositeDrawable
+            ruleset = parent.Get<IBindable<WorkingBeatmap>>().Value.BeatmapInfo.Ruleset?.CreateInstance();
+            checker = ruleset?.CreateChecker();
+
+            return dependencies;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Child = new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Padding = new MarginPadding(20),
+                Child = new GridContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    ColumnDimensions = new[]
+                    {
+                        new Dimension(),
+                        new Dimension(GridSizeMode.Absolute, 200),
+                    },
+                    Content = new[]
+                    {
+                        new Drawable[]
+                        {
+                            new IssueList(),
+                            new IssueSettings(),
+                        },
+                    }
+                }
+            };
+        }
+
+        public class IssueList : CompositeDrawable
         {
             private IssueTable table;
 
@@ -60,9 +90,41 @@ namespace osu.Game.Screens.Edit.Verify
                     {
                         RelativeSizeAxes = Axes.Both,
                         Child = table = new IssueTable(),
-                    }
+                    },
+                    new FillFlowContainer
+                    {
+                        AutoSizeAxes = Axes.Both,
+                        Anchor = Anchor.BottomRight,
+                        Origin = Anchor.BottomRight,
+                        Margin = new MarginPadding(20),
+                        Children = new Drawable[]
+                        {
+                            new TriangleButton
+                            {
+                                Text = "Refresh",
+                                Action = refresh,
+                                Size = new Vector2(120, 40),
+                                Anchor = Anchor.BottomRight,
+                                Origin = Anchor.BottomRight,
+                            },
+                        }
+                    },
                 };
             }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                refresh();
+            }
+
+            private void refresh()
+            {
+                table.Issues = checker.Run(Beatmap)
+                                      .OrderByDescending(issue => issue.Template.Type)
+                                      .ThenByDescending(issue => issue.Template.Origin.Metadata().Category);
+            }
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Verify/VisibilitySettings.cs b/osu.Game/Screens/Edit/Verify/VisibilitySettings.cs
new file mode 100644
index 0000000000..6488c616e4
--- /dev/null
+++ b/osu.Game/Screens/Edit/Verify/VisibilitySettings.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 osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.UserInterfaceV2;
+using osuTK;
+
+namespace osu.Game.Screens.Edit.Verify
+{
+    internal class VisibilitySettings : CompositeDrawable
+    {
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+
+            Padding = new MarginPadding(10);
+
+            InternalChildren = new Drawable[]
+            {
+                new FillFlowContainer
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Spacing = new Vector2(10),
+                    Direction = FillDirection.Vertical,
+                    Children = new Drawable[]
+                    {
+                        new LabelledSwitchButton
+                        {
+                            Label = "Show problems",
+                            Current = new Bindable<bool>(true)
+                        },
+                        new LabelledSwitchButton
+                        {
+                            Label = "Show warnings",
+                            Current = new Bindable<bool>(true)
+                        },
+                        new LabelledSwitchButton
+                        {
+                            Label = "Show negligibles"
+                        }
+                    }
+                },
+            };
+        }
+    }
+}

From 2791d454d22a8d61e254531635d7a6d7c8bb746e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 7 Apr 2021 22:21:22 +0900
Subject: [PATCH 2236/3722] Don't send spectating user state yet

---
 osu.Game/Online/Multiplayer/MultiplayerClient.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 4529dfd0a7..37e11cc576 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -96,6 +96,9 @@ namespace osu.Game.Online.Multiplayer
             if (!IsConnected.Value)
                 return Task.CompletedTask;
 
+            if (newState == MultiplayerUserState.Spectating)
+                return Task.CompletedTask; // Not supported yet.
+
             return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeState), newState);
         }
 

From 214813154b775f1fa8c3a075e55690ce8ef2ee0a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 7 Apr 2021 22:28:22 +0900
Subject: [PATCH 2237/3722] Fix class name

---
 .../Visual/Multiplayer/TestSceneMultiplayerMatchFooter.cs       | 2 +-
 .../Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchFooter.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchFooter.cs
index 08c94b8135..6b03b53b4b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchFooter.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchFooter.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
     public class TestSceneMultiplayerMatchFooter : MultiplayerTestScene
     {
         [Cached]
-        private readonly OnlinePlayBeatmapAvailablilityTracker availablilityTracker = new OnlinePlayBeatmapAvailablilityTracker();
+        private readonly OnlinePlayBeatmapAvailabilityTracker availablilityTracker = new OnlinePlayBeatmapAvailabilityTracker();
 
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
index 8fe1f99e1d..e65e4a68a7 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
             Dependencies.Cache(beatmaps = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, host, Beatmap.Default));
 
-            var beatmapTracker = new OnlinePlayBeatmapAvailablilityTracker { SelectedItem = { BindTarget = selectedItem } };
+            var beatmapTracker = new OnlinePlayBeatmapAvailabilityTracker { SelectedItem = { BindTarget = selectedItem } };
             base.Content.Add(beatmapTracker);
             Dependencies.Cache(beatmapTracker);
 

From 6fe1b68510397ccccaf4339d2974784864ad02bb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 7 Apr 2021 22:30:40 +0900
Subject: [PATCH 2238/3722] Add a way to retrieve new WorkingBeatmap instances

---
 osu.Game/Beatmaps/BeatmapManager.cs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index b4ea898b7d..69b513d256 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -281,8 +281,9 @@ namespace osu.Game.Beatmaps
         /// </summary>
         /// <param name="beatmapInfo">The beatmap to lookup.</param>
         /// <param name="previous">The currently loaded <see cref="WorkingBeatmap"/>. Allows for optimisation where elements are shared with the new beatmap. May be returned if beatmapInfo requested matches</param>
+        /// <param name="bypassCache">Whether to bypass the cache and return a new <see cref="WorkingBeatmap"/> instance.</param>
         /// <returns>A <see cref="WorkingBeatmap"/> instance correlating to the provided <see cref="BeatmapInfo"/>.</returns>
-        public WorkingBeatmap GetWorkingBeatmap(BeatmapInfo beatmapInfo, WorkingBeatmap previous = null)
+        public WorkingBeatmap GetWorkingBeatmap(BeatmapInfo beatmapInfo, WorkingBeatmap previous = null, bool bypassCache = false)
         {
             if (beatmapInfo?.ID > 0 && previous != null && previous.BeatmapInfo?.ID == beatmapInfo.ID)
                 return previous;
@@ -301,9 +302,14 @@ namespace osu.Game.Beatmaps
 
             lock (workingCache)
             {
-                var working = workingCache.FirstOrDefault(w => w.BeatmapInfo?.ID == beatmapInfo.ID);
-                if (working != null)
-                    return working;
+                BeatmapManagerWorkingBeatmap working;
+
+                if (!bypassCache)
+                {
+                    working = workingCache.FirstOrDefault(w => w.BeatmapInfo?.ID == beatmapInfo.ID);
+                    if (working != null)
+                        return working;
+                }
 
                 beatmapInfo.Metadata ??= beatmapInfo.BeatmapSet.Metadata;
 

From 8cc1e8b8b0605e981b1d0be53cb9a0590383e532 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Apr 2021 23:11:01 +0900
Subject: [PATCH 2239/3722] Update framework

---
 .idea/.idea.osu.Desktop/.idea/indexLayout.xml | 2 +-
 osu.Android.props                             | 2 +-
 osu.Game/osu.Game.csproj                      | 2 +-
 osu.iOS.props                                 | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.idea/.idea.osu.Desktop/.idea/indexLayout.xml b/.idea/.idea.osu.Desktop/.idea/indexLayout.xml
index 27ba142e96..7b08163ceb 100644
--- a/.idea/.idea.osu.Desktop/.idea/indexLayout.xml
+++ b/.idea/.idea.osu.Desktop/.idea/indexLayout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ContentModelUserStore">
+  <component name="UserContentModel">
     <attachedFolders />
     <explicitIncludes />
     <explicitExcludes />
diff --git a/osu.Android.props b/osu.Android.props
index 73ee1d9d10..cba3975209 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.402.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.407.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 931b55222a..292e5b932f 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.402.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.407.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 64e9a01a92..36e581a80c 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.402.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.407.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.402.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.407.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 544fff5af6f9fa20e1aa04e5aaa0a5ea3865b220 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Apr 2021 23:18:45 +0900
Subject: [PATCH 2240/3722] Undo rider EAP changes for the time being

---
 .idea/.idea.osu.Desktop/.idea/indexLayout.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.idea/.idea.osu.Desktop/.idea/indexLayout.xml b/.idea/.idea.osu.Desktop/.idea/indexLayout.xml
index 7b08163ceb..27ba142e96 100644
--- a/.idea/.idea.osu.Desktop/.idea/indexLayout.xml
+++ b/.idea/.idea.osu.Desktop/.idea/indexLayout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="UserContentModel">
+  <component name="ContentModelUserStore">
     <attachedFolders />
     <explicitIncludes />
     <explicitExcludes />

From 648a9d52584896db0cd3ce3cc7b5bb350bb46d32 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 7 Apr 2021 23:15:09 +0900
Subject: [PATCH 2241/3722] Add multiplayer spectator player grid

---
 .../Multiplayer/Spectate/PlayerGrid.cs        | 142 ++++++++++++++++++
 .../Multiplayer/Spectate/PlayerGrid_Cell.cs   |  78 ++++++++++
 .../Multiplayer/Spectate/PlayerGrid_Facade.cs |  19 +++
 3 files changed, 239 insertions(+)
 create mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
 create mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
 create 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
new file mode 100644
index 0000000000..a8bd1db9dc
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
@@ -0,0 +1,142 @@
+// Copyright (c) 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.Screens.OnlinePlay.Multiplayer.Spectate
+{
+    public partial class PlayerGrid : CompositeDrawable
+    {
+        private const float player_spacing = 5;
+
+        public Drawable MaximisedFacade => maximisedFacade;
+
+        private readonly PlayerGridFacade maximisedFacade;
+        private readonly Container paddingContainer;
+        private readonly FillFlowContainer<PlayerGridFacade> facadeContainer;
+        private readonly Container<Cell> cellContainer;
+
+        public PlayerGrid()
+        {
+            InternalChildren = new Drawable[]
+            {
+                paddingContainer = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Padding = new MarginPadding(player_spacing),
+                    Children = new Drawable[]
+                    {
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Child = facadeContainer = new FillFlowContainer<PlayerGridFacade>
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y,
+                                Spacing = new Vector2(player_spacing),
+                            }
+                        },
+                        maximisedFacade = new PlayerGridFacade { RelativeSizeAxes = Axes.Both }
+                    }
+                },
+                cellContainer = new Container<Cell> { RelativeSizeAxes = Axes.Both }
+            };
+        }
+
+        public void AddContent(Drawable content)
+        {
+            var facade = new PlayerGridFacade();
+            facadeContainer.Add(facade);
+
+            var cell = new Cell(content) { ToggleMaximisationState = toggleMaximisationState };
+            cell.SetFacade(facade);
+
+            cellContainer.Add(cell);
+        }
+
+        // A depth value that gets decremented every time a new instance is maximised in order to reduce underlaps.
+        private float maximisedInstanceDepth;
+
+        private void toggleMaximisationState(Cell target)
+        {
+            // Iterate through all cells to ensure only one is maximised at any time.
+            foreach (var i in cellContainer)
+            {
+                if (i == target)
+                    i.IsMaximised = !i.IsMaximised;
+                else
+                    i.IsMaximised = false;
+
+                if (i.IsMaximised)
+                {
+                    // Transfer cell to the maximised facade.
+                    i.SetFacade(maximisedFacade);
+                    cellContainer.ChangeChildDepth(i, maximisedInstanceDepth -= 0.001f);
+                }
+                else
+                {
+                    // Transfer cell back to its original facade.
+                    i.SetFacade(facadeContainer[cellContainer.IndexOf(target)]);
+                }
+            }
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            Vector2 cellsPerDimension;
+
+            switch (facadeContainer.Count)
+            {
+                case 1:
+                    cellsPerDimension = Vector2.One;
+                    break;
+
+                case 2:
+                    cellsPerDimension = new Vector2(2, 1);
+                    break;
+
+                case 3:
+                case 4:
+                    cellsPerDimension = new Vector2(2);
+                    break;
+
+                case 5:
+                case 6:
+                    cellsPerDimension = new Vector2(3, 2);
+                    break;
+
+                case 7:
+                case 8:
+                case 9:
+                    // 3 rows / 3 cols.
+                    cellsPerDimension = new Vector2(3);
+                    break;
+
+                case 10:
+                case 11:
+                case 12:
+                    // 3 rows / 4 cols.
+                    cellsPerDimension = new Vector2(4, 3);
+                    break;
+
+                default:
+                    // 4 rows / 4 cols.
+                    cellsPerDimension = new Vector2(4);
+                    break;
+            }
+
+            // Total spacing between cells
+            Vector2 totalCellSpacing = player_spacing * (cellsPerDimension - Vector2.One);
+
+            Vector2 fullSize = paddingContainer.ChildSize - totalCellSpacing;
+            Vector2 cellSize = Vector2.Divide(fullSize, new Vector2(cellsPerDimension.X, cellsPerDimension.Y));
+
+            foreach (var cell in facadeContainer)
+                cell.Size = cellSize;
+        }
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
new file mode 100644
index 0000000000..1f6e718aa7
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.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 System;
+using JetBrains.Annotations;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Events;
+using osuTK;
+
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
+{
+    public partial class PlayerGrid
+    {
+        private class Cell : CompositeDrawable
+        {
+            public Action<Cell> ToggleMaximisationState;
+            public bool IsMaximised;
+
+            private PlayerGridFacade facade;
+            private bool isTracking = true;
+
+            public Cell(Drawable content)
+            {
+                Origin = Anchor.Centre;
+
+                InternalChild = content;
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+
+                if (isTracking)
+                {
+                    Position = getFinalPosition();
+                    Size = getFinalSize();
+                }
+            }
+
+            public void SetFacade([NotNull] PlayerGridFacade newFacade)
+            {
+                PlayerGridFacade 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;
+                    });
+            }
+
+            private Vector2 getFinalPosition()
+            {
+                var topLeft = Parent.ToLocalSpace(facade.ToScreenSpace(Vector2.Zero));
+                return topLeft + facade.DrawSize / 2;
+            }
+
+            private Vector2 getFinalSize() => facade.DrawSize;
+
+            // Todo: Temporary?
+            protected override bool ShouldBeConsideredForInput(Drawable child) => false;
+
+            protected override bool OnClick(ClickEvent e)
+            {
+                ToggleMaximisationState(this);
+                return true;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Facade.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Facade.cs
new file mode 100644
index 0000000000..c565e2fec6
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Facade.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;
+
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
+{
+    public partial class PlayerGrid
+    {
+        private class PlayerGridFacade : Drawable
+        {
+            public PlayerGridFacade()
+            {
+                Anchor = Anchor.Centre;
+                Origin = Anchor.Centre;
+            }
+        }
+    }
+}

From 024adb699c44b5748eebc77a33c2010eb841f562 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 8 Apr 2021 00:06:14 +0900
Subject: [PATCH 2242/3722] Add test and fix several issues

---
 ...TestSceneMultiplayerSpectatorPlayerGrid.cs | 115 ++++++++++++++++++
 .../Multiplayer/Spectate/PlayerGrid.cs        |  30 +++--
 .../Multiplayer/Spectate/PlayerGrid_Cell.cs   |  26 +++-
 .../Multiplayer/Spectate/PlayerGrid_Facade.cs |   7 +-
 4 files changed, 161 insertions(+), 17 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorPlayerGrid.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorPlayerGrid.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorPlayerGrid.cs
new file mode 100644
index 0000000000..c0958c7fe8
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorPlayerGrid.cs
@@ -0,0 +1,115 @@
+// Copyright (c) ppy 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.Shapes;
+using osu.Framework.Utils;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate;
+using osuTK.Graphics;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public class TestSceneMultiplayerSpectatorPlayerGrid : OsuManualInputManagerTestScene
+    {
+        private PlayerGrid grid;
+
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            Child = grid = new PlayerGrid { RelativeSizeAxes = Axes.Both };
+        });
+
+        [Test]
+        public void TestMaximiseAndMinimise()
+        {
+            addCells(2);
+
+            assertMaximisation(0, false, true);
+            assertMaximisation(1, false, true);
+
+            clickCell(0);
+            assertMaximisation(0, true);
+            assertMaximisation(1, false, true);
+            clickCell(0);
+            assertMaximisation(0, false);
+            assertMaximisation(1, false, true);
+
+            clickCell(1);
+            assertMaximisation(1, true);
+            assertMaximisation(0, false, true);
+            clickCell(1);
+            assertMaximisation(1, false);
+            assertMaximisation(0, false, true);
+        }
+
+        [Test]
+        public void TestClickBothCellsSimultaneously()
+        {
+            addCells(2);
+
+            AddStep("click cell 0 then 1", () =>
+            {
+                InputManager.MoveMouseTo(grid.Content.ElementAt(0));
+                InputManager.Click(MouseButton.Left);
+
+                InputManager.MoveMouseTo(grid.Content.ElementAt(1));
+                InputManager.Click(MouseButton.Left);
+            });
+
+            assertMaximisation(1, true);
+            assertMaximisation(0, false);
+        }
+
+        [TestCase(1)]
+        [TestCase(2)]
+        [TestCase(3)]
+        [TestCase(4)]
+        [TestCase(5)]
+        [TestCase(9)]
+        [TestCase(11)]
+        [TestCase(12)]
+        [TestCase(15)]
+        [TestCase(16)]
+        public void TestCellCount(int count)
+        {
+            addCells(count);
+            AddWaitStep("wait for display", 2);
+        }
+
+        private void addCells(int count) => AddStep($"add {count} grid cells", () =>
+        {
+            for (int i = 0; i < count; i++)
+                grid.Add(new GridContent());
+        });
+
+        private void clickCell(int index) => AddStep($"click cell index {index}", () =>
+        {
+            InputManager.MoveMouseTo(grid.Content.ElementAt(index));
+            InputManager.Click(MouseButton.Left);
+        });
+
+        private void assertMaximisation(int index, bool shouldBeMaximised, bool instant = false)
+        {
+            string assertionText = $"cell index {index} {(shouldBeMaximised ? "is" : "is not")} maximised";
+
+            if (instant)
+                AddAssert(assertionText, checkAction);
+            else
+                AddUntilStep(assertionText, checkAction);
+
+            bool checkAction() => Precision.AlmostEquals(grid.MaximisedFacade.DrawSize, grid.Content.ElementAt(index).DrawSize, 10) == shouldBeMaximised;
+        }
+
+        private class GridContent : Box
+        {
+            public GridContent()
+            {
+                RelativeSizeAxes = Axes.Both;
+                Colour = new Color4(RNG.NextSingle(), RNG.NextSingle(), RNG.NextSingle(), 1f);
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
index a8bd1db9dc..f41948217c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
@@ -13,9 +13,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         public Drawable MaximisedFacade => maximisedFacade;
 
-        private readonly PlayerGridFacade maximisedFacade;
+        private readonly Facade maximisedFacade;
         private readonly Container paddingContainer;
-        private readonly FillFlowContainer<PlayerGridFacade> facadeContainer;
+        private readonly FillFlowContainer<Facade> facadeContainer;
         private readonly Container<Cell> cellContainer;
 
         public PlayerGrid()
@@ -31,38 +31,50 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                         new Container
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Child = facadeContainer = new FillFlowContainer<PlayerGridFacade>
+                            Child = facadeContainer = new FillFlowContainer<Facade>
                             {
                                 RelativeSizeAxes = Axes.X,
                                 AutoSizeAxes = Axes.Y,
                                 Spacing = new Vector2(player_spacing),
                             }
                         },
-                        maximisedFacade = new PlayerGridFacade { RelativeSizeAxes = Axes.Both }
+                        maximisedFacade = new Facade { RelativeSizeAxes = Axes.Both }
                     }
                 },
                 cellContainer = new Container<Cell> { RelativeSizeAxes = Axes.Both }
             };
         }
 
-        public void AddContent(Drawable content)
+        /// <summary>
+        /// Adds a new cell with content to this grid.
+        /// </summary>
+        /// <param name="content">The content the cell should contain.</param>
+        /// <exception cref="InvalidOperationException">If more than 16 cells are added.</exception>
+        public void Add(Drawable content)
         {
-            var facade = new PlayerGridFacade();
+            int index = cellContainer.Count;
+
+            var facade = new Facade();
             facadeContainer.Add(facade);
 
-            var cell = new Cell(content) { ToggleMaximisationState = toggleMaximisationState };
+            var cell = new Cell(index, content) { ToggleMaximisationState = toggleMaximisationState };
             cell.SetFacade(facade);
 
             cellContainer.Add(cell);
         }
 
+        /// <summary>
+        /// The content added to this grid.
+        /// </summary>
+        public IEnumerable<Drawable> Content => cellContainer.OrderBy(c => c.FacadeIndex).Select(c => c.Content);
+
         // A depth value that gets decremented every time a new instance is maximised in order to reduce underlaps.
         private float maximisedInstanceDepth;
 
         private void toggleMaximisationState(Cell target)
         {
             // Iterate through all cells to ensure only one is maximised at any time.
-            foreach (var i in cellContainer)
+            foreach (var i in cellContainer.ToList())
             {
                 if (i == target)
                     i.IsMaximised = !i.IsMaximised;
@@ -78,7 +90,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 else
                 {
                     // Transfer cell back to its original facade.
-                    i.SetFacade(facadeContainer[cellContainer.IndexOf(target)]);
+                    i.SetFacade(facadeContainer[i.FacadeIndex]);
                 }
             }
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
index 1f6e718aa7..c2ac190d40 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
@@ -14,17 +14,28 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
     {
         private class Cell : CompositeDrawable
         {
+            /// <summary>
+            /// The index of the original facade of this cell.
+            /// </summary>
+            public readonly int FacadeIndex;
+
+            /// <summary>
+            /// The contained content.
+            /// </summary>
+            public readonly Drawable Content;
+
             public Action<Cell> ToggleMaximisationState;
             public bool IsMaximised;
 
-            private PlayerGridFacade facade;
+            private Facade facade;
             private bool isTracking = true;
 
-            public Cell(Drawable content)
+            public Cell(int facadeIndex, Drawable content)
             {
-                Origin = Anchor.Centre;
+                FacadeIndex = facadeIndex;
 
-                InternalChild = content;
+                Origin = Anchor.Centre;
+                InternalChild = Content = content;
             }
 
             protected override void Update()
@@ -38,9 +49,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 }
             }
 
-            public void SetFacade([NotNull] PlayerGridFacade newFacade)
+            /// <summary>
+            /// Makes this cell track a new facade.
+            /// </summary>
+            public void SetFacade([NotNull] Facade newFacade)
             {
-                PlayerGridFacade lastFacade = facade;
+                Facade lastFacade = facade;
                 facade = newFacade;
 
                 if (lastFacade == null || lastFacade == newFacade)
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Facade.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Facade.cs
index c565e2fec6..6b363c6040 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Facade.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Facade.cs
@@ -7,9 +7,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     public partial class PlayerGrid
     {
-        private class PlayerGridFacade : Drawable
+        /// <summary>
+        /// A facade of the grid which is used as a dummy object to store the required position/size of cells.
+        /// </summary>
+        private class Facade : Drawable
         {
-            public PlayerGridFacade()
+            public Facade()
             {
                 Anchor = Anchor.Centre;
                 Origin = Anchor.Centre;

From 5dc939c2f365d09395f0fe1880bb88a3d8dbda21 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 8 Apr 2021 00:06:32 +0900
Subject: [PATCH 2243/3722] More documentation

---
 .../OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs | 15 ++++++++++++++-
 .../Multiplayer/Spectate/PlayerGrid_Cell.cs       | 10 ++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
index f41948217c..830378f129 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
@@ -1,16 +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.Collections.Generic;
+using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osuTK;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
+    /// <summary>
+    /// A grid of players playing the multiplayer match.
+    /// </summary>
     public partial class PlayerGrid : CompositeDrawable
     {
         private const float player_spacing = 5;
 
+        /// <summary>
+        /// The currently-maximised facade.
+        /// </summary>
         public Drawable MaximisedFacade => maximisedFacade;
 
         private readonly Facade maximisedFacade;
@@ -52,6 +61,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         /// <exception cref="InvalidOperationException">If more than 16 cells are added.</exception>
         public void Add(Drawable content)
         {
+            if (cellContainer.Count == 16)
+                throw new InvalidOperationException("Only 16 cells are supported.");
+
             int index = cellContainer.Count;
 
             var facade = new Facade();
@@ -99,6 +111,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         {
             base.Update();
 
+            // Different layouts are used for varying cell counts in order to maximise dimensions.
             Vector2 cellsPerDimension;
 
             switch (facadeContainer.Count)
@@ -141,7 +154,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                     break;
             }
 
-            // Total spacing between cells
+            // Total inter-cell spacing.
             Vector2 totalCellSpacing = player_spacing * (cellsPerDimension - Vector2.One);
 
             Vector2 fullSize = paddingContainer.ChildSize - totalCellSpacing;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
index c2ac190d40..37d88693ee 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
@@ -12,6 +12,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     public partial class PlayerGrid
     {
+        /// <summary>
+        /// A cell of the grid. Contains the content and tracks to the linked facade.
+        /// </summary>
         private class Cell : CompositeDrawable
         {
             /// <summary>
@@ -24,7 +27,14 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             /// </summary>
             public readonly Drawable Content;
 
+            /// <summary>
+            /// An action that toggles the maximisation state of this cell.
+            /// </summary>
             public Action<Cell> ToggleMaximisationState;
+
+            /// <summary>
+            /// Whether this cell is currently maximised.
+            /// </summary>
             public bool IsMaximised;
 
             private Facade facade;

From 9d0293070971e17132b201448afbb42c5f40b295 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 7 Apr 2021 17:18:55 +0200
Subject: [PATCH 2244/3722] Add regression test for type changes

---
 .../TestSceneSliderControlPointPiece.cs       | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
index 9b67d18db6..d7dfc3bd42 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
@@ -105,6 +105,25 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             assertControlPointType(2, PathType.PerfectCurve);
         }
 
+        [Test]
+        public void TestDragControlPointPathAfterChangingType()
+        {
+            AddStep("change type to bezier", () => slider.Path.ControlPoints[2].Type.Value = PathType.Bezier);
+            AddStep("add point", () => slider.Path.ControlPoints.Add(new PathControlPoint(new Vector2(500, 10))));
+            AddStep("change type to perfect", () => slider.Path.ControlPoints[3].Type.Value = PathType.PerfectCurve);
+
+            moveMouseToControlPoint(4);
+            AddStep("hold", () => InputManager.PressButton(MouseButton.Left));
+
+            assertControlPointType(3, PathType.PerfectCurve);
+
+            addMovementStep(new Vector2(350, 0.01f));
+            AddStep("release", () => InputManager.ReleaseButton(MouseButton.Left));
+
+            assertControlPointPosition(4, new Vector2(350, 0.01f));
+            assertControlPointType(3, PathType.Bezier);
+        }
+
         private void addMovementStep(Vector2 relativePosition)
         {
             AddStep($"move mouse to {relativePosition}", () =>

From b8ab1c768253402bdfb3644808cbfde05234ef07 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 7 Apr 2021 17:19:12 +0200
Subject: [PATCH 2245/3722] Track path type changes for `PointsInSegment`

---
 .../Sliders/Components/PathControlPointPiece.cs     | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index 394d2b039d..5fcf0656c5 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -50,6 +50,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         [Resolved]
         private OsuColour colours { get; set; }
 
+        private readonly List<IBindable<PathType?>> pathTypes;
+
         private IBindable<int> sliderVersion;
         private IBindable<Vector2> sliderPosition;
         private IBindable<float> sliderScale;
@@ -59,8 +61,19 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         {
             this.slider = slider;
             ControlPoint = controlPoint;
+            pathTypes = new List<IBindable<PathType?>>();
+
             slider.Path.ControlPoints.BindCollectionChanged((_, args) =>
             {
+                pathTypes.Clear();
+
+                foreach (var point in slider.Path.ControlPoints)
+                {
+                    IBindable<PathType?> boundTypeCopy = point.Type.GetBoundCopy();
+                    pathTypes.Add(boundTypeCopy);
+                    boundTypeCopy.BindValueChanged(_ => PointsInSegment = slider.Path.PointsInSegment(controlPoint));
+                }
+
                 PointsInSegment = slider.Path.PointsInSegment(controlPoint);
             }, runOnceImmediately: true);
 

From 0a6baf670eff5a90704b95277cf8a8b89dd44375 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Wed, 7 Apr 2021 14:41:21 -0400
Subject: [PATCH 2246/3722] Send a warning notification if device is unplugged
 and low battery - Uses Xamarin.Essentials in osu.Game.PlayerLoader to check
 battery level - Encapsulated battery checking in the public BatteryManager
 class so battery level and plugged in status can be accessed and edited in
 TestPlayerLoader - When checking battery level, catch NotImplementedException
 thrown by Xamarin.Essentials.Battery on non-mobile platforms - Added visual
 unit tests for battery notification   To mock battery status and level, we
 had to define a batteryManager object in TestPlayerLoader and add a new
 function ResetPlayerWithBattery()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Marlina José <marlina@umich.edu>
---
 osu.Android/Properties/AndroidManifest.xml    |  1 +
 .../Visual/Gameplay/TestScenePlayerLoader.cs  | 48 +++++++++++++
 osu.Game.Tests/osu.Game.Tests.csproj          |  2 +-
 osu.Game/Configuration/SessionStatics.cs      |  2 +
 osu.Game/Screens/Play/PlayerLoader.cs         | 71 +++++++++++++++++++
 osu.Game/osu.Game.csproj                      |  3 +-
 6 files changed, 125 insertions(+), 2 deletions(-)

diff --git a/osu.Android/Properties/AndroidManifest.xml b/osu.Android/Properties/AndroidManifest.xml
index 770eaf2222..e717bab310 100644
--- a/osu.Android/Properties/AndroidManifest.xml
+++ b/osu.Android/Properties/AndroidManifest.xml
@@ -6,5 +6,6 @@
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
 	<uses-permission android:name="android.permission.READ_FRAME_BUFFER" />
 	<uses-permission android:name="android.permission.INTERNET" />
+	<uses-permission android:name="android.permission.BATTERY_STATS" />
 	<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.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index 88fbf09ef4..a31d53e3b6 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -93,6 +93,26 @@ namespace osu.Game.Tests.Visual.Gameplay
             LoadScreen(loader = new TestPlayerLoader(() => player = new TestPlayer(interactive, interactive)));
         }
 
+        /// <summary>
+        /// Sets the input manager child to a new test player loader container instance with a custom battery level
+        /// </summary>
+        /// <param name="interactive">If the test player should behave like the production one.</param>
+        /// <param name="pluggedIn">If the player's device is plugged in.</param>
+        /// <param name="batteryLevel">A custom battery level for the test player.</param>
+        private void resetPlayerWithBattery(bool interactive, bool pluggedIn, double batteryLevel)
+        {
+            Beatmap.Value = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
+            Beatmap.Value.BeatmapInfo.EpilepsyWarning = epilepsyWarning;
+
+            foreach (var mod in SelectedMods.Value.OfType<IApplicableToTrack>())
+                mod.ApplyToTrack(Beatmap.Value.Track);
+
+            loader = new TestPlayerLoader(() => player = new TestPlayer(interactive, interactive));
+            loader.batteryManager.ChargeLevel = batteryLevel;
+            loader.batteryManager.PluggedIn = pluggedIn;
+            LoadScreen(loader);
+        }
+
         [Test]
         public void TestEarlyExitBeforePlayerConstruction()
         {
@@ -270,6 +290,32 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("wait for player load", () => player.IsLoaded);
         }
 
+        [TestCase(false, 1.0)] // not plugged in, full battery, no notification
+        [TestCase(false, 0.2)] // not plugged in, at warning level, no notification
+        [TestCase(true, 0.1)] // plugged in, charging, below warning level, no notification
+        [TestCase(false, 0.1)] // not plugged in, below warning level, notification
+        public void TestLowBatteryNotification(bool pluggedIn, double batteryLevel)
+        {
+            AddStep("reset notification lock", () => sessionStatics.GetBindable<bool>(Static.BatteryLowNotificationShownOnce).Value = false);
+
+            // mock phone on battery
+            AddStep("load player", () => resetPlayerWithBattery(false, pluggedIn, batteryLevel));
+            AddUntilStep("wait for player", () => player?.LoadState == LoadState.Ready);
+            int notificationCount = !pluggedIn && batteryLevel < PlayerLoader.battery_tolerance ? 1 : 0;
+            AddAssert("check for notification", () => notificationOverlay.UnreadCount.Value == notificationCount);
+            AddStep("click notification", () =>
+                {
+                    var scrollContainer = (OsuScrollContainer)notificationOverlay.Children.Last();
+                    var flowContainer = scrollContainer.Children.OfType<FillFlowContainer<NotificationSection>>().First();
+                    var notification = flowContainer.First();
+
+                    InputManager.MoveMouseTo(notification);
+                    InputManager.Click(MouseButton.Left);
+                });
+
+            AddUntilStep("wait for player load", () => player.IsLoaded);
+        }
+
         [TestCase(true)]
         [TestCase(false)]
         public void TestEpilepsyWarning(bool warning)
@@ -310,6 +356,8 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public IReadOnlyList<Mod> DisplayedMods => MetadataInfo.Mods.Value;
 
+            public new BatteryManager batteryManager => base.batteryManager;
+
             public TestPlayerLoader(Func<Player> createPlayer)
                 : base(createPlayer)
             {
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index 0e1f6f6b0c..df6d17f615 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -22,4 +22,4 @@
     <ProjectReference Include="..\osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj" />
     <ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index 36eb6964dd..e8ee04731c 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.cs
@@ -16,6 +16,7 @@ namespace osu.Game.Configuration
         {
             SetDefault(Static.LoginOverlayDisplayed, false);
             SetDefault(Static.MutedAudioNotificationShownOnce, false);
+            SetDefault(Static.BatteryLowNotificationShownOnce, false);
             SetDefault(Static.LastHoverSoundPlaybackTime, (double?)null);
             SetDefault<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null);
         }
@@ -25,6 +26,7 @@ namespace osu.Game.Configuration
     {
         LoginOverlayDisplayed,
         MutedAudioNotificationShownOnce,
+        BatteryLowNotificationShownOnce,
 
         /// <summary>
         /// Info about seasonal backgrounds available fetched from API - see <see cref="APISeasonalBackgrounds"/>.
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 679b3c7313..01a51e6e7a 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -26,6 +26,7 @@ using osu.Game.Screens.Play.PlayerSettings;
 using osu.Game.Users;
 using osuTK;
 using osuTK.Graphics;
+using Xamarin.Essentials;
 
 namespace osu.Game.Screens.Play
 {
@@ -121,6 +122,7 @@ namespace osu.Game.Screens.Play
         private void load(SessionStatics sessionStatics)
         {
             muteWarningShownOnce = sessionStatics.GetBindable<bool>(Static.MutedAudioNotificationShownOnce);
+            batteryWarningShownOnce = sessionStatics.GetBindable<bool>(Static.BatteryLowNotificationShownOnce);
 
             InternalChild = (content = new LogoTrackingContainer
             {
@@ -196,6 +198,7 @@ namespace osu.Game.Screens.Play
             Scheduler.Add(new ScheduledDelegate(pushWhenLoaded, Clock.CurrentTime + 1800, 0));
 
             showMuteWarningIfNeeded();
+            showBatteryWarningIfNeeded();
         }
 
         public override void OnResuming(IScreen last)
@@ -470,5 +473,73 @@ namespace osu.Game.Screens.Play
         }
 
         #endregion
+
+        #region Low battery warning
+        private Bindable<bool> batteryWarningShownOnce;
+
+        // Send a warning if battery is less than 20%
+        public const double battery_tolerance = 0.2;
+
+        private void showBatteryWarningIfNeeded()
+        {
+            if (!batteryWarningShownOnce.Value)
+            {
+                // Checks if the notification has not been shown yet, device is unplugged and if device battery is low.
+                if (!batteryManager.PluggedIn && batteryManager.ChargeLevel < battery_tolerance)
+                {
+                    Console.WriteLine("Battery level: {0}", batteryManager.ChargeLevel);
+                    notificationOverlay?.Post(new BatteryWarningNotification());
+                    batteryWarningShownOnce.Value = true;
+                }
+            }
+        }
+        public BatteryManager batteryManager = new BatteryManager();
+        public class BatteryManager
+        {
+            public double ChargeLevel;
+            public bool PluggedIn;
+            public BatteryManager()
+            {
+                // Attempt to get battery information using Xamarin.Essentials
+                // Xamarin.Essentials throws a NotSupportedOrImplementedException on .NET standard so this only works on iOS/Android
+                // https://github.com/xamarin/Essentials/blob/7218ab88f7fbe00ec3379bd54e6c0ce35ffc0c22/Xamarin.Essentials/Battery/Battery.netstandard.tvos.cs
+                try
+                {
+                    ChargeLevel = Battery.ChargeLevel;
+                    PluggedIn = Battery.PowerSource == BatteryPowerSource.Battery;
+                }
+                catch (NotImplementedException e)
+                {
+                    Console.WriteLine("Could not access battery info: {0}", e);
+                    ChargeLevel = 1.0;
+                    PluggedIn = false;
+                }
+            }
+        }
+
+        private class BatteryWarningNotification : SimpleNotification
+        {
+            public override bool IsImportant => true;
+
+            public BatteryWarningNotification()
+            {
+                Text = "Your battery level is low! Charge your device to prevent interruptions.";
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours, NotificationOverlay notificationOverlay)
+            {
+                Icon = FontAwesome.Solid.BatteryQuarter;
+                IconBackgound.Colour = colours.RedDark;
+
+                Activated = delegate
+                {
+                    notificationOverlay.Hide();
+                    return true;
+                };
+            }
+        }
+
+        #endregion
     }
 }
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 292e5b932f..c68be5313d 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>netstandard2.1</TargetFramework>
     <OutputType>Library</OutputType>
@@ -35,5 +35,6 @@
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
   </ItemGroup>
 </Project>

From d1d56c636a04a48e5cafdc3cf0cb1d1996d2162e Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 8 Apr 2021 01:43:06 +0200
Subject: [PATCH 2247/3722] Convert `pathTypes` to local variable

Not entirely sure what holds the reference to pathTypes now (the binding to`slider.Path.ControlPoints` maybe?), but this does seem to work still.
---
 .../Blueprints/Sliders/Components/PathControlPointPiece.cs    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index 5fcf0656c5..bb50fec5dc 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -50,8 +50,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         [Resolved]
         private OsuColour colours { get; set; }
 
-        private readonly List<IBindable<PathType?>> pathTypes;
-
         private IBindable<int> sliderVersion;
         private IBindable<Vector2> sliderPosition;
         private IBindable<float> sliderScale;
@@ -61,7 +59,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         {
             this.slider = slider;
             ControlPoint = controlPoint;
-            pathTypes = new List<IBindable<PathType?>>();
+            var pathTypes = new List<IBindable<PathType?>>();
 
             slider.Path.ControlPoints.BindCollectionChanged((_, args) =>
             {

From d6490899e2946294bbdab7f0d0db6a5bd014ce5d Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 8 Apr 2021 03:21:56 +0200
Subject: [PATCH 2248/3722] Simplify slider path bindings

Adds a slight performance overhead, but solves the memory leak and makes the code much easier to follow.
---
 .../Components/PathControlPointPiece.cs       | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index bb50fec5dc..20d4fe4ea9 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -50,7 +50,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         [Resolved]
         private OsuColour colours { get; set; }
 
-        private IBindable<int> sliderVersion;
         private IBindable<Vector2> sliderPosition;
         private IBindable<float> sliderScale;
         private IBindable<Vector2> controlPointPosition;
@@ -59,20 +58,11 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         {
             this.slider = slider;
             ControlPoint = controlPoint;
-            var pathTypes = new List<IBindable<PathType?>>();
 
-            slider.Path.ControlPoints.BindCollectionChanged((_, args) =>
+            slider.Path.Version.BindValueChanged(_ =>
             {
-                pathTypes.Clear();
-
-                foreach (var point in slider.Path.ControlPoints)
-                {
-                    IBindable<PathType?> boundTypeCopy = point.Type.GetBoundCopy();
-                    pathTypes.Add(boundTypeCopy);
-                    boundTypeCopy.BindValueChanged(_ => PointsInSegment = slider.Path.PointsInSegment(controlPoint));
-                }
-
-                PointsInSegment = slider.Path.PointsInSegment(controlPoint);
+                PointsInSegment = slider.Path.PointsInSegment(ControlPoint);
+                updatePathType();
             }, runOnceImmediately: true);
 
             controlPoint.Type.BindValueChanged(_ => updateMarkerDisplay());
@@ -120,9 +110,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         {
             base.LoadComplete();
 
-            sliderVersion = slider.Path.Version.GetBoundCopy();
-            sliderVersion.BindValueChanged(_ => updatePathType());
-
             sliderPosition = slider.PositionBindable.GetBoundCopy();
             sliderPosition.BindValueChanged(_ => updateMarkerDisplay());
 

From 8aff53172de5f153b5926926bc0bf1c8e75f3ef5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Apr 2021 15:17:53 +0900
Subject: [PATCH 2249/3722] Remove necessity for nested PassThroughInputManger

---
 .../Gameplay/TestSceneGameplayMenuOverlay.cs  |  2 +-
 .../Input/Bindings/GlobalActionContainer.cs   | 23 ++++++++++-----
 osu.Game/Input/Bindings/GlobalInputManager.cs | 29 -------------------
 osu.Game/OsuGameBase.cs                       | 15 ++++++----
 .../Visual/OsuManualInputManagerTestScene.cs  |  2 +-
 5 files changed, 26 insertions(+), 45 deletions(-)
 delete mode 100644 osu.Game/Input/Bindings/GlobalInputManager.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.cs
index 75e8194708..d69ac665cc 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [BackgroundDependencyLoader]
         private void load(OsuGameBase game)
         {
-            Child = globalActionContainer = new GlobalActionContainer(game, null);
+            Child = globalActionContainer = new GlobalActionContainer(game);
         }
 
         [SetUp]
diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 042960d54c..671c3bc8bc 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using JetBrains.Annotations;
 using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
@@ -13,20 +12,23 @@ namespace osu.Game.Input.Bindings
 {
     public class GlobalActionContainer : DatabasedKeyBindingContainer<GlobalAction>, IHandleGlobalKeyboardInput
     {
-        [CanBeNull]
-        private readonly GlobalInputManager globalInputManager;
-
         private readonly Drawable handler;
+        private InputManager parentInputManager;
 
-        public GlobalActionContainer(OsuGameBase game, [CanBeNull] GlobalInputManager globalInputManager)
+        public GlobalActionContainer(OsuGameBase game)
             : base(matchingMode: KeyCombinationMatchingMode.Modifiers)
         {
-            this.globalInputManager = globalInputManager;
-
             if (game is IKeyBindingHandler<GlobalAction>)
                 handler = game;
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            parentInputManager = GetContainingInputManager();
+        }
+
         public override IEnumerable<IKeyBinding> DefaultKeyBindings => GlobalKeyBindings
                                                                        .Concat(EditorKeyBindings)
                                                                        .Concat(InGameKeyBindings)
@@ -113,7 +115,12 @@ namespace osu.Game.Input.Bindings
         {
             get
             {
-                var inputQueue = globalInputManager?.NonPositionalInputQueue ?? base.KeyBindingInputQueue;
+                // 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.
+
+                // 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;
             }
diff --git a/osu.Game/Input/Bindings/GlobalInputManager.cs b/osu.Game/Input/Bindings/GlobalInputManager.cs
deleted file mode 100644
index 91373712fb..0000000000
--- a/osu.Game/Input/Bindings/GlobalInputManager.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 osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Input;
-
-namespace osu.Game.Input.Bindings
-{
-    public class GlobalInputManager : PassThroughInputManager
-    {
-        public readonly GlobalActionContainer GlobalBindings;
-
-        protected override Container<Drawable> Content { get; }
-
-        public GlobalInputManager(OsuGameBase game)
-        {
-            InternalChildren = new Drawable[]
-            {
-                Content = new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                },
-                // to avoid positional input being blocked by children, ensure the GlobalActionContainer is above everything.
-                GlobalBindings = new GlobalActionContainer(game, this)
-            };
-        }
-    }
-}
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 21313d0596..ca132df552 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -308,18 +308,21 @@ namespace osu.Game
 
             AddInternal(RulesetConfigCache);
 
-            var globalInput = new GlobalInputManager(this)
+            GlobalActionContainer globalBindings;
+
+            var mainContent = new Drawable[]
             {
-                RelativeSizeAxes = Axes.Both,
-                Child = MenuCursorContainer = new MenuCursorContainer { RelativeSizeAxes = Axes.Both }
+                MenuCursorContainer = new MenuCursorContainer { RelativeSizeAxes = Axes.Both },
+                // to avoid positional input being blocked by children, ensure the GlobalActionContainer is above everything.
+                globalBindings = new GlobalActionContainer(this)
             };
 
             MenuCursorContainer.Child = content = new OsuTooltipContainer(MenuCursorContainer.Cursor) { RelativeSizeAxes = Axes.Both };
 
-            base.Content.Add(CreateScalingContainer().WithChild(globalInput));
+            base.Content.Add(CreateScalingContainer().WithChildren(mainContent));
 
-            KeyBindingStore.Register(globalInput.GlobalBindings);
-            dependencies.Cache(globalInput.GlobalBindings);
+            KeyBindingStore.Register(globalBindings);
+            dependencies.Cache(globalBindings);
 
             PreviewTrackManager previewTrackManager;
             dependencies.Cache(previewTrackManager = new PreviewTrackManager());
diff --git a/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs b/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
index 7dad636da7..01dd7a25c8 100644
--- a/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Tests.Visual
 
             if (CreateNestedActionContainer)
             {
-                mainContent = new GlobalActionContainer(null, null).WithChild(mainContent);
+                mainContent = new GlobalActionContainer(null).WithChild(mainContent);
             }
 
             base.Content.AddRange(new Drawable[]

From 545156d15ca19a67bc22c43aa6dded4cee3cd877 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Apr 2021 15:20:53 +0900
Subject: [PATCH 2250/3722] Add regression test coverage

---
 .../Visual/Navigation/TestSceneScreenNavigation.cs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index 00f9bf3432..859cefe3a9 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -44,6 +44,20 @@ namespace osu.Game.Tests.Visual.Navigation
             exitViaEscapeAndConfirm();
         }
 
+        /// <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).
+        /// </summary>
+        [Test]
+        public void TestOpenModSelectOverlayUsingAction()
+        {
+            TestSongSelect songSelect = null;
+
+            PushAndConfirm(() => songSelect = new TestSongSelect());
+            AddStep("Show mods overlay", () => InputManager.Key(Key.F1));
+            AddAssert("Overlay was shown", () => songSelect.ModSelectOverlay.State.Value == Visibility.Visible);
+        }
+
         [Test]
         public void TestRetryCountIncrements()
         {

From b73860cb5f6de153df50f3dc64b067dd611a6f40 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Apr 2021 15:47:55 +0900
Subject: [PATCH 2251/3722] Slightly alter button colour scheme to make text
 more legible and reduce saturation

---
 .../Multiplayer/Match/MultiplayerSpectateButton.cs   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs
index 50be7719d9..4b3fb5d00f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs
@@ -68,16 +68,16 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             {
                 default:
                     button.Text = "Spectate";
-                    button.BackgroundColour = colours.Blue;
-                    button.Triangles.ColourDark = colours.Blue;
-                    button.Triangles.ColourLight = colours.BlueLight;
+                    button.BackgroundColour = colours.BlueDark;
+                    button.Triangles.ColourDark = colours.BlueDarker;
+                    button.Triangles.ColourLight = colours.Blue;
                     break;
 
                 case MultiplayerUserState.Spectating:
                     button.Text = "Stop spectating";
-                    button.BackgroundColour = colours.Red;
-                    button.Triangles.ColourDark = colours.Red;
-                    button.Triangles.ColourLight = colours.RedLight;
+                    button.BackgroundColour = colours.Gray4;
+                    button.Triangles.ColourDark = colours.Gray5;
+                    button.Triangles.ColourLight = colours.Gray6;
                     break;
             }
 

From a55e62188ebe87648bcc1ffe9f6af93f167072a3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Apr 2021 15:54:58 +0900
Subject: [PATCH 2252/3722] Change state icon to binoculars so the eye isn't
 staring at me

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

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
index e6a407acec..2616b07c1f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
@@ -137,7 +137,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
 
                 case MultiplayerUserState.Spectating:
                     text.Text = "spectating";
-                    icon.Icon = FontAwesome.Solid.Eye;
+                    icon.Icon = FontAwesome.Solid.Binoculars;
                     icon.Colour = colours.BlueLight;
                     break;
 

From 725edfcbf35bdbdca7f1e277722ed7d749e5f8f2 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 8 Apr 2021 09:05:35 +0200
Subject: [PATCH 2253/3722] Add path type menu change method

---
 .../Components/PathControlPointVisualiser.cs       | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
index ce5dc4855e..ff2e4ea152 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -153,6 +153,18 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             }
         }
 
+        /// <summary>
+        /// Attempts to set the given control point piece to the given path type.
+        /// If that would fail, try to change the path such that it instead succeeds
+        /// in a UX-friendly way.
+        /// </summary>
+        /// <param name="piece">The control point piece that we want to change the path type of.</param>
+        /// <param name="type">The path type we want to assign to the given control point piece.</param>
+        private void updatePathType(PathControlPointPiece piece, PathType? type)
+        {
+            piece.ControlPoint.Type.Value = type;
+        }
+
         [Resolved(CanBeNull = true)]
         private IEditorChangeHandler changeHandler { get; set; }
 
@@ -218,7 +230,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             var item = new PathTypeMenuItem(type, () =>
             {
                 foreach (var p in Pieces.Where(p => p.IsSelected.Value))
-                    p.ControlPoint.Type.Value = type;
+                    updatePathType(p, type);
             });
 
             if (countOfState == totalCount)

From 0341023d13cf7926a04d67852ec995874e10e79f Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 8 Apr 2021 09:06:28 +0200
Subject: [PATCH 2254/3722] Improve UX of selecting PerfectCurve

---
 .../Components/PathControlPointVisualiser.cs     | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

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 ff2e4ea152..0b163cbc44 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -162,6 +162,22 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         /// <param name="type">The path type we want to assign to the given control point piece.</param>
         private void updatePathType(PathControlPointPiece piece, PathType? type)
         {
+            int indexInSegment = piece.PointsInSegment.IndexOf(piece.ControlPoint);
+
+            switch (type)
+            {
+                case PathType.PerfectCurve:
+                    if (piece.PointsInSegment.Count > 3)
+                    {
+                        // Can't always create a circular arc out of 4 or more points,
+                        // so we split the segment into one 3-point circular arc segment
+                        // and one bezier segment.
+                        piece.PointsInSegment[indexInSegment + 2].Type.Value = PathType.Bezier;
+                    }
+
+                    break;
+            }
+
             piece.ControlPoint.Type.Value = type;
         }
 

From b38d332268bf678cda1746bb264a7adb32d7a7e5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 8 Apr 2021 16:29:11 +0900
Subject: [PATCH 2255/3722] Fix broken test

---
 .../Multiplayer/TestSceneMultiplayerReadyButton.cs       | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
index dad1237991..dfb4306e67 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
@@ -209,9 +209,16 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             addClickButtonStep();
             AddAssert("user waiting for load", () => Client.Room?.Users[0].State == MultiplayerUserState.WaitingForLoad);
-            AddAssert("ready button disabled", () => !button.ChildrenOfType<OsuButton>().Single().Enabled.Value);
 
+            AddAssert("ready button disabled", () => !button.ChildrenOfType<OsuButton>().Single().Enabled.Value);
             AddStep("transitioned to gameplay", () => readyClickOperation.Dispose());
+
+            AddStep("finish gameplay", () =>
+            {
+                Client.ChangeUserState(Client.Room?.Users[0].UserID ?? 0, MultiplayerUserState.Loaded);
+                Client.ChangeUserState(Client.Room?.Users[0].UserID ?? 0, MultiplayerUserState.FinishedPlay);
+            });
+
             AddAssert("ready button enabled", () => button.ChildrenOfType<OsuButton>().Single().Enabled.Value);
         }
     }

From fd2a14a0bf07fd5e8b940f2f666455fc4eb923ba Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 8 Apr 2021 16:30:48 +0900
Subject: [PATCH 2256/3722] Only set button state once

---
 .../Multiplayer/Match/MultiplayerReadyButton.cs       | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
index 6919be2d56..f2dd9a6f25 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
@@ -105,14 +105,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                     break;
             }
 
-            button.Enabled.Value = Client.Room?.State == MultiplayerRoomState.Open && !operationInProgress.Value;
+            bool enableButton = Client.Room?.State == MultiplayerRoomState.Open && !operationInProgress.Value;
 
-            // When the local user is the host and spectating the match, the "start match" state should be enabled.
+            // When the local user is the host and spectating the match, the "start match" state should be enabled if any users are ready.
             if (localUser.State == MultiplayerUserState.Spectating)
-            {
-                button.Enabled.Value &= Room?.Host?.Equals(localUser) == true;
-                button.Enabled.Value &= newCountReady > 0;
-            }
+                enableButton &= Room?.Host?.Equals(localUser) == true && newCountReady > 0;
+
+            button.Enabled.Value = enableButton;
 
             if (newCountReady != countReady)
             {

From be4520fe33ff6ec67367ef207a59a00fa47b8d61 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 8 Apr 2021 11:46:00 +0200
Subject: [PATCH 2257/3722] Fix index out of range possibility

---
 .../Components/PathControlPointVisualiser.cs       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 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 0b163cbc44..1dfbf97682 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -167,13 +167,13 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             switch (type)
             {
                 case PathType.PerfectCurve:
-                    if (piece.PointsInSegment.Count > 3)
-                    {
-                        // Can't always create a circular arc out of 4 or more points,
-                        // so we split the segment into one 3-point circular arc segment
-                        // and one bezier segment.
-                        piece.PointsInSegment[indexInSegment + 2].Type.Value = PathType.Bezier;
-                    }
+                    // Can't always create a circular arc out of 4 or more points,
+                    // so we split the segment into one 3-point circular arc segment
+                    // and one bezier segment.
+                    int thirdPointIndex = indexInSegment + 2;
+
+                    if (piece.PointsInSegment.Count > thirdPointIndex + 1)
+                        piece.PointsInSegment[thirdPointIndex].Type.Value = PathType.Bezier;
 
                     break;
             }

From 4110d1675d001919dca028a51f5e92b19eb5d611 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 8 Apr 2021 11:46:52 +0200
Subject: [PATCH 2258/3722] Add path type menu test cases

---
 .../TestScenePathControlPointVisualiser.cs    | 101 +++++++++++++++++-
 1 file changed, 99 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
index 738a21b17e..3e2d1cff0e 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
@@ -4,9 +4,11 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.UserInterface;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Tests.Visual;
@@ -14,7 +16,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests.Editor
 {
-    public class TestScenePathControlPointVisualiser : OsuTestScene
+    public class TestScenePathControlPointVisualiser : OsuManualInputManagerTestScene
     {
         private Slider slider;
         private PathControlPointVisualiser visualiser;
@@ -43,12 +45,107 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             });
         }
 
+        [Test]
+        public void TestPerfectCurveTooManyPoints()
+        {
+            createVisualiser(true);
+
+            addControlPointStep(new Vector2(200), PathType.Bezier);
+            addControlPointStep(new Vector2(300));
+            addControlPointStep(new Vector2(500, 300));
+            addControlPointStep(new Vector2(700, 200));
+            addControlPointStep(new Vector2(500, 100));
+
+            // Must be both hovering and selecting the control point for the context menu to work.
+            moveMouseToControlPoint(1);
+            AddStep("select control point", () => visualiser.Pieces[1].IsSelected.Value = true);
+            addContextMenuItemStep("Perfect curve");
+
+            assertControlPointPathType(0, PathType.Bezier);
+            assertControlPointPathType(1, PathType.PerfectCurve);
+            AddAssert("point 3 is not inherited", () => slider.Path.ControlPoints[3].Type != null);
+        }
+
+        [Test]
+        public void TestPerfectCurveLastThreePoints()
+        {
+            createVisualiser(true);
+
+            addControlPointStep(new Vector2(200), PathType.Bezier);
+            addControlPointStep(new Vector2(300));
+            addControlPointStep(new Vector2(500, 300));
+            addControlPointStep(new Vector2(700, 200));
+            addControlPointStep(new Vector2(500, 100));
+
+            moveMouseToControlPoint(2);
+            AddStep("select control point", () => visualiser.Pieces[2].IsSelected.Value = true);
+            addContextMenuItemStep("Perfect curve");
+
+            assertControlPointPathType(0, PathType.Bezier);
+            assertControlPointPathType(2, PathType.PerfectCurve);
+            assertControlPointPathType(4, null);
+        }
+
+        [Test]
+        public void TestPerfectCurveLastTwoPoints()
+        {
+            createVisualiser(true);
+
+            addControlPointStep(new Vector2(200), PathType.Bezier);
+            addControlPointStep(new Vector2(300));
+            addControlPointStep(new Vector2(500, 300));
+            addControlPointStep(new Vector2(700, 200));
+            addControlPointStep(new Vector2(500, 100));
+
+            moveMouseToControlPoint(3);
+            AddStep("select control point", () => visualiser.Pieces[3].IsSelected.Value = true);
+            addContextMenuItemStep("Perfect curve");
+
+            assertControlPointPathType(0, PathType.Bezier);
+            AddAssert("point 3 is not inherited", () => slider.Path.ControlPoints[3].Type != null);
+        }
+
         private void createVisualiser(bool allowSelection) => AddStep("create visualiser", () => Child = visualiser = new PathControlPointVisualiser(slider, allowSelection)
         {
             Anchor = Anchor.Centre,
             Origin = Anchor.Centre
         });
 
-        private void addControlPointStep(Vector2 position) => AddStep($"add control point {position}", () => slider.Path.ControlPoints.Add(new PathControlPoint(position)));
+        private void addControlPointStep(Vector2 position) => addControlPointStep(position, null);
+
+        private void addControlPointStep(Vector2 position, PathType? type)
+        {
+            AddStep($"add {type} control point at {position}", () =>
+            {
+                slider.Path.ControlPoints.Add(new PathControlPoint(position, type));
+            });
+        }
+
+        private void moveMouseToControlPoint(int index)
+        {
+            AddStep($"move mouse to control point {index}", () =>
+            {
+                Vector2 position = slider.Path.ControlPoints[index].Position.Value;
+                InputManager.MoveMouseTo(visualiser.Pieces[0].Parent.ToScreenSpace(position));
+            });
+        }
+
+        private void assertControlPointPathType(int controlPointIndex, PathType? type)
+        {
+            AddAssert($"point {controlPointIndex} is {type}", () =>
+            {
+                return slider.Path.ControlPoints[controlPointIndex].Type.Value == type;
+            });
+        }
+
+        private void addContextMenuItemStep(string contextMenuText)
+        {
+            AddStep($"click context menu item \"{contextMenuText}\"", () =>
+            {
+                MenuItem item = visualiser.ContextMenuItems[1].Items.FirstOrDefault(menuItem => menuItem.Text.Value == contextMenuText);
+
+                item?.Action?.Value();
+            });
+        }
     }
 }

From 7d2b54ca42b5d98ffaf69b5bbaba2cbf5f8059df Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 8 Apr 2021 12:32:45 +0200
Subject: [PATCH 2259/3722] Add change to Bezier test

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

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
index 3e2d1cff0e..1d5a175a26 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
@@ -105,6 +105,26 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddAssert("point 3 is not inherited", () => slider.Path.ControlPoints[3].Type != null);
         }
 
+        [Test]
+        public void TestPerfectCurveChangeToBezier()
+        {
+            createVisualiser(true);
+
+            addControlPointStep(new Vector2(200), PathType.Bezier);
+            addControlPointStep(new Vector2(300), PathType.PerfectCurve);
+            addControlPointStep(new Vector2(500, 300));
+            addControlPointStep(new Vector2(700, 200), PathType.Bezier);
+            addControlPointStep(new Vector2(500, 100));
+
+            moveMouseToControlPoint(3);
+            AddStep("select control point", () => visualiser.Pieces[3].IsSelected.Value = true);
+            addContextMenuItemStep("Inherit");
+
+            assertControlPointPathType(0, PathType.Bezier);
+            assertControlPointPathType(1, PathType.Bezier);
+            assertControlPointPathType(3, null);
+        }
+
         private void createVisualiser(bool allowSelection) => AddStep("create visualiser", () => Child = visualiser = new PathControlPointVisualiser(slider, allowSelection)
         {
             Anchor = Anchor.Centre,

From 9a675a22195fe0d24576dbffec32285282f3209c Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 8 Apr 2021 12:33:43 +0200
Subject: [PATCH 2260/3722] Correct 4+ point perfect curves to Bezier

---
 .../Blueprints/Sliders/Components/PathControlPointPiece.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index 20d4fe4ea9..6b78cff33e 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -213,10 +213,13 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             if (ControlPoint.Type.Value != PathType.PerfectCurve)
                 return;
 
-            ReadOnlySpan<Vector2> points = PointsInSegment.Select(p => p.Position.Value).ToArray();
-            if (points.Length != 3)
+            if (PointsInSegment.Count > 3)
+                ControlPoint.Type.Value = PathType.Bezier;
+
+            if (PointsInSegment.Count != 3)
                 return;
 
+            ReadOnlySpan<Vector2> points = PointsInSegment.Select(p => p.Position.Value).ToArray();
             RectangleF boundingBox = PathApproximator.CircularArcBoundingBox(points);
             if (boundingBox.Width >= 640 || boundingBox.Height >= 480)
                 ControlPoint.Type.Value = PathType.Bezier;

From 2d9448456671c8b7e1966341af66338f45923f85 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 8 Apr 2021 12:49:46 +0200
Subject: [PATCH 2261/3722] Use lambda expression

Apparently CI dislikes this not being a lambda.
---
 .../Editor/TestScenePathControlPointVisualiser.cs            | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
index 1d5a175a26..440ab7c889 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
@@ -152,10 +152,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
         private void assertControlPointPathType(int controlPointIndex, PathType? type)
         {
-            AddAssert($"point {controlPointIndex} is {type}", () =>
-            {
-                return slider.Path.ControlPoints[controlPointIndex].Type.Value == type;
-            });
+            AddAssert($"point {controlPointIndex} is {type}", () => slider.Path.ControlPoints[controlPointIndex].Type.Value == type);
         }
 
         private void addContextMenuItemStep(string contextMenuText)

From 7713c8a45f0763a7aff7b24622e58a203c7d1c4b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 8 Apr 2021 20:19:41 +0900
Subject: [PATCH 2262/3722] Add support for sliderwhistle

---
 .../Objects/Drawables/DrawableSlider.cs                | 10 +++++++---
 osu.Game.Rulesets.Osu/Objects/Slider.cs                |  3 +++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 04708a5ece..8167a9f243 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.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 JetBrains.Annotations;
 using osuTK;
@@ -110,13 +111,16 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.LoadSamples();
 
-            var firstSample = HitObject.Samples.FirstOrDefault();
+            var firstSample = HitObject.OriginalSamples.FirstOrDefault();
 
             if (firstSample != null)
             {
-                var clone = HitObject.SampleControlPoint.ApplyTo(firstSample).With("sliderslide");
+                var samples = new List<ISampleInfo> { HitObject.SampleControlPoint.ApplyTo(firstSample).With("sliderslide") };
 
-                slidingSample.Samples = new ISampleInfo[] { clone };
+                if (HitObject.OriginalSamples.Any(s => s.Name == HitSampleInfo.HIT_WHISTLE))
+                    samples.Add(HitObject.SampleControlPoint.ApplyTo(firstSample).With("sliderwhistle"));
+
+                slidingSample.Samples = samples.ToArray();
             }
         }
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index e2b6c84896..54e781bbe9 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -81,6 +81,8 @@ namespace osu.Game.Rulesets.Osu.Objects
 
         public List<IList<HitSampleInfo>> NodeSamples { get; set; } = new List<IList<HitSampleInfo>>();
 
+        public IList<HitSampleInfo> OriginalSamples { get; private set; }
+
         private int repeatCount;
 
         public int RepeatCount
@@ -147,6 +149,7 @@ namespace osu.Game.Rulesets.Osu.Objects
             // 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.
             // For now, the samples are attached to and played by the slider itself at the correct end time.
             // ToArray call is required as GetNodeSamples may fallback to Samples itself (without it it will get cleared due to the list reference being live).
+            OriginalSamples = Samples.ToList();
             Samples = this.GetNodeSamples(repeatCount + 1).ToArray();
         }
 

From 7d291ed7d73f18bcb9bdac5f1aa26f511ee6ecf6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 8 Apr 2021 20:57:50 +0900
Subject: [PATCH 2263/3722] Don't serialise OriginalSamples

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

diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 54e781bbe9..4e71d82cab 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -81,6 +81,7 @@ namespace osu.Game.Rulesets.Osu.Objects
 
         public List<IList<HitSampleInfo>> NodeSamples { get; set; } = new List<IList<HitSampleInfo>>();
 
+        [JsonIgnore]
         public IList<HitSampleInfo> OriginalSamples { get; private set; }
 
         private int repeatCount;

From d64b236f8619451b3827b3dd1ca6a263ee9c7ea9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 8 Apr 2021 21:27:16 +0900
Subject: [PATCH 2264/3722] Add a container that provides an isolated gameplay
 context

---
 .../Spectate/GameplayIsolationContainer.cs    | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/GameplayIsolationContainer.cs

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/GameplayIsolationContainer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/GameplayIsolationContainer.cs
new file mode 100644
index 0000000000..3ccb67d342
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/GameplayIsolationContainer.cs
@@ -0,0 +1,43 @@
+// Copyright (c) ppy 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.Containers;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
+{
+    public class GameplayIsolationContainer : Container
+    {
+        [Cached]
+        private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
+
+        [Cached]
+        private readonly Bindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
+
+        [Cached]
+        private readonly Bindable<IReadOnlyList<Mod>> mods = new Bindable<IReadOnlyList<Mod>>();
+
+        public GameplayIsolationContainer(WorkingBeatmap beatmap, RulesetInfo ruleset, IReadOnlyList<Mod> mods)
+        {
+            this.beatmap.Value = beatmap;
+            this.ruleset.Value = ruleset;
+            this.mods.Value = mods;
+
+            beatmap.LoadTrack();
+        }
+
+        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
+        {
+            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+            dependencies.CacheAs(ruleset.BeginLease(false));
+            dependencies.CacheAs(beatmap.BeginLease(false));
+            dependencies.CacheAs(mods.BeginLease(false));
+            return dependencies;
+        }
+    }
+}

From 70cd018a984cf2c80e354b367ffe5698e6dda39b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 8 Apr 2021 21:38:58 +0900
Subject: [PATCH 2265/3722] Fix intermittent test failure

---
 .../Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
index 6f8ec7fcfb..839118de2f 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
@@ -93,7 +93,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddWaitStep("wait", 10);
+            AddUntilStep("wait for join", () => Client.Room != null);
         }
 
         [Test]
@@ -114,6 +114,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 InputManager.Click(MouseButton.Left);
             });
 
+            AddUntilStep("wait for room join", () => Client.Room != null);
+
             AddStep("join other user (ready)", () =>
             {
                 Client.AddUser(new User { Id = 55 });

From 709016f0d639f6899de78d5b2e153ec3775d829a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 8 Apr 2021 22:07:00 +0900
Subject: [PATCH 2266/3722] Add initial multiplayer screen implementation

---
 .../Spectate/MultiplayerSpectator.cs          | 146 ++++++++++++++++++
 .../Spectate/MultiplayerSpectatorPlayer.cs    |  19 +++
 .../MultiplayerSpectatorPlayerLoader.cs       |  26 ++++
 .../Multiplayer/Spectate/PlayerGrid.cs        |  13 ++
 .../Multiplayer/Spectate/PlayerInstance.cs    |  55 +++++++
 .../Screens/Play/SpectatorPlayerLoader.cs     |   7 +-
 6 files changed, 265 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
 create mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
 create mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayerLoader.cs
 create mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
new file mode 100644
index 0000000000..6b8249eae0
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -0,0 +1,146 @@
+// Copyright (c) ppy 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;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Testing;
+using osu.Framework.Utils;
+using osu.Game.Online.Rooms;
+using osu.Game.Online.Spectator;
+using osu.Game.Screens.Play;
+using osu.Game.Screens.Spectate;
+
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
+{
+    public class MultiplayerSpectator : SpectatorScreen
+    {
+        private const double min_duration_to_allow_playback = 50;
+        private const double max_sync_offset = 2;
+
+        // Isolates beatmap/ruleset to this screen.
+        public override bool DisallowExternalBeatmapRulesetChanges => true;
+
+        public bool AllPlayersLoaded => instances.All(p => p?.PlayerLoaded == true);
+
+        [Resolved]
+        private SpectatorStreamingClient spectatorClient { get; set; }
+
+        private readonly int[] userIds;
+        private readonly PlayerInstance[] instances;
+
+        private PlayerGrid grid;
+
+        public MultiplayerSpectator(PlaylistItem playlistItem, int[] userIds)
+            : this(userIds.AsSpan().Slice(0, Math.Min(16, userIds.Length)).ToArray())
+        {
+        }
+
+        private MultiplayerSpectator(int[] userIds)
+            : base(userIds)
+        {
+            this.userIds = userIds;
+            instances = new PlayerInstance[userIds.Length];
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChild = grid = new PlayerGrid
+            {
+                RelativeSizeAxes = Axes.Both
+            };
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+            updatePlayTime();
+        }
+
+        private bool gameplayStarted;
+
+        private void updatePlayTime()
+        {
+            if (gameplayStarted)
+            {
+                ensurePlaying(instances.Select(i => i.Beatmap.Track.CurrentTime).Max());
+                return;
+            }
+
+            // Make sure all players are loaded.
+            if (!AllPlayersLoaded)
+            {
+                ensureAllStopped();
+                return;
+            }
+
+            if (!instances.All(i => i.Score.Replay.Frames.Count > 0))
+            {
+                ensureAllStopped();
+                return;
+            }
+
+            gameplayStarted = true;
+        }
+
+        private void ensureAllStopped()
+        {
+            foreach (var inst in instances)
+                inst.ChildrenOfType<GameplayClockContainer>().SingleOrDefault()?.Stop();
+        }
+
+        private readonly BindableDouble catchupFrequencyAdjustment = new BindableDouble(2.0);
+
+        private void ensurePlaying(double targetTime)
+        {
+            foreach (var inst in instances)
+            {
+                double lastFrameTime = inst.Score.Replay.Frames.Select(f => f.Time).Last();
+                double currentTime = inst.Beatmap.Track.CurrentTime;
+
+                // If we have enough frames to play back, start playback.
+                if (Precision.DefinitelyBigger(lastFrameTime, currentTime, min_duration_to_allow_playback))
+                {
+                    inst.ChildrenOfType<GameplayClockContainer>().Single().Start();
+
+                    if (targetTime < lastFrameTime && targetTime > currentTime + 16)
+                        inst.Beatmap.Track.AddAdjustment(AdjustableProperty.Frequency, catchupFrequencyAdjustment);
+                    else
+                        inst.Beatmap.Track.RemoveAdjustment(AdjustableProperty.Frequency, catchupFrequencyAdjustment);
+                }
+                else
+                    inst.Beatmap.Track.RemoveAdjustment(AdjustableProperty.Frequency, catchupFrequencyAdjustment);
+            }
+        }
+
+        protected override void OnUserStateChanged(int userId, SpectatorState spectatorState)
+        {
+        }
+
+        protected override void StartGameplay(int userId, GameplayState gameplayState)
+        {
+            int userIndex = getIndexForUser(userId);
+            var existingInstance = instances[userIndex];
+
+            if (existingInstance != null)
+                grid.Remove(existingInstance);
+
+            LoadComponentAsync(instances[userIndex] = new PlayerInstance(gameplayState.Score), d =>
+            {
+                if (instances[userIndex] == d)
+                    grid.Add(d);
+            });
+        }
+
+        protected override void EndGameplay(int userId)
+        {
+            spectatorClient.StopWatchingUser(userId);
+        }
+
+        private int getIndexForUser(int userId) => Array.IndexOf(userIds, userId);
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
new file mode 100644
index 0000000000..bad093f666
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.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.Scoring;
+using osu.Game.Scoring;
+using osu.Game.Screens.Play;
+
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
+{
+    public class MultiplayerSpectatorPlayer : SpectatorPlayer
+    {
+        public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
+
+        public MultiplayerSpectatorPlayer(Score score)
+            : base(score)
+        {
+        }
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayerLoader.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayerLoader.cs
new file mode 100644
index 0000000000..c8f16b5e90
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayerLoader.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.Scoring;
+using osu.Game.Screens.Menu;
+using osu.Game.Screens.Play;
+
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
+{
+    public class MultiplayerSpectatorPlayerLoader : SpectatorPlayerLoader
+    {
+        public MultiplayerSpectatorPlayerLoader(Score score, Func<MultiplayerSpectatorPlayer> createPlayer)
+            : base(score, createPlayer)
+        {
+        }
+
+        protected override void LogoArriving(OsuLogo logo, bool resuming)
+        {
+        }
+
+        protected override void LogoExiting(OsuLogo logo)
+        {
+        }
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
index 830378f129..b2d114d9cc 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
@@ -75,6 +75,19 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             cellContainer.Add(cell);
         }
 
+        public void Remove(Drawable content)
+        {
+            var cell = cellContainer.FirstOrDefault(c => c.Content == content);
+            if (cell == null)
+                return;
+
+            if (cell.IsMaximised)
+                toggleMaximisationState(cell);
+
+            cellContainer.Remove(cell);
+            facadeContainer.Remove(facadeContainer[cell.FacadeIndex]);
+        }
+
         /// <summary>
         /// The content added to this grid.
         /// </summary>
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
new file mode 100644
index 0000000000..ab7d3e2502
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
@@ -0,0 +1,55 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
+using osu.Game.Screens.Play;
+using osu.Game.Users;
+
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
+{
+    public class PlayerInstance : CompositeDrawable
+    {
+        public bool PlayerLoaded => stack?.CurrentScreen is Player;
+
+        public User User => Score.ScoreInfo.User;
+        public ScoreProcessor ScoreProcessor => player?.ScoreProcessor;
+
+        public WorkingBeatmap Beatmap { get; private set; }
+        public Ruleset Ruleset { get; private set; }
+
+        public readonly Score Score;
+
+        private OsuScreenStack stack;
+        private MultiplayerSpectatorPlayer player;
+
+        public PlayerInstance(Score score)
+        {
+            Score = score;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(BeatmapManager beatmapManager)
+        {
+            Beatmap = beatmapManager.GetWorkingBeatmap(Score.ScoreInfo.Beatmap, bypassCache: true);
+            Ruleset = Score.ScoreInfo.Ruleset.CreateInstance();
+
+            InternalChild = new GameplayIsolationContainer(Beatmap, Score.ScoreInfo.Ruleset, Score.ScoreInfo.Mods)
+            {
+                RelativeSizeAxes = Axes.Both,
+                Child = new DrawSizePreservingFillContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Child = stack = new OsuScreenStack()
+                }
+            };
+
+            stack.Push(new MultiplayerSpectatorPlayerLoader(Score, () => player = new MultiplayerSpectatorPlayer(Score)));
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/SpectatorPlayerLoader.cs b/osu.Game/Screens/Play/SpectatorPlayerLoader.cs
index 580af81166..bdd23962dc 100644
--- a/osu.Game/Screens/Play/SpectatorPlayerLoader.cs
+++ b/osu.Game/Screens/Play/SpectatorPlayerLoader.cs
@@ -12,7 +12,12 @@ namespace osu.Game.Screens.Play
         public readonly ScoreInfo Score;
 
         public SpectatorPlayerLoader(Score score)
-            : base(() => new SpectatorPlayer(score))
+            : this(score, () => new SpectatorPlayer(score))
+        {
+        }
+
+        public SpectatorPlayerLoader(Score score, Func<Player> createPlayer)
+            : base(createPlayer)
         {
             if (score.Replay == null)
                 throw new ArgumentException($"{nameof(score)} must have a non-null {nameof(score.Replay)}.", nameof(score));

From 7d276144b871f219d07321480aea1852e9aa7d44 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 8 Apr 2021 22:13:54 +0900
Subject: [PATCH 2267/3722] Fix player sizing + masking

---
 .../Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
index ab7d3e2502..5689a3222a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
@@ -31,6 +31,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         public PlayerInstance(Score score)
         {
             Score = score;
+
+            RelativeSizeAxes = Axes.Both;
+            Masking = true;
         }
 
         [BackgroundDependencyLoader]

From 1b5679b0d75509eae6ba24761965ec5904020fbd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 8 Apr 2021 22:14:26 +0900
Subject: [PATCH 2268/3722] Refactor ctor

---
 .../Multiplayer/Spectate/MultiplayerSpectator.cs  | 15 +++------------
 osu.Game/Screens/Spectate/SpectatorScreen.cs      |  6 +++---
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index 6b8249eae0..8fa9dcf3af 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -9,7 +9,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
-using osu.Game.Online.Rooms;
 using osu.Game.Online.Spectator;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Spectate;
@@ -29,20 +28,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         [Resolved]
         private SpectatorStreamingClient spectatorClient { get; set; }
 
-        private readonly int[] userIds;
         private readonly PlayerInstance[] instances;
-
         private PlayerGrid grid;
 
-        public MultiplayerSpectator(PlaylistItem playlistItem, int[] userIds)
-            : this(userIds.AsSpan().Slice(0, Math.Min(16, userIds.Length)).ToArray())
+        public MultiplayerSpectator(int[] userIds)
+            : base(userIds.AsSpan().Slice(0, Math.Min(16, userIds.Length)).ToArray())
         {
-        }
-
-        private MultiplayerSpectator(int[] userIds)
-            : base(userIds)
-        {
-            this.userIds = userIds;
             instances = new PlayerInstance[userIds.Length];
         }
 
@@ -141,6 +132,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             spectatorClient.StopWatchingUser(userId);
         }
 
-        private int getIndexForUser(int userId) => Array.IndexOf(userIds, userId);
+        private int getIndexForUser(int userId) => Array.IndexOf(UserIds, userId);
     }
 }
diff --git a/osu.Game/Screens/Spectate/SpectatorScreen.cs b/osu.Game/Screens/Spectate/SpectatorScreen.cs
index 6dd3144fc8..b7e1b8496c 100644
--- a/osu.Game/Screens/Spectate/SpectatorScreen.cs
+++ b/osu.Game/Screens/Spectate/SpectatorScreen.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Screens.Spectate
     /// </summary>
     public abstract class SpectatorScreen : OsuScreen
     {
-        private readonly int[] userIds;
+        protected readonly int[] UserIds;
 
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
@@ -55,7 +55,7 @@ namespace osu.Game.Screens.Spectate
         /// <param name="userIds">The users to spectate.</param>
         protected SpectatorScreen(params int[] userIds)
         {
-            this.userIds = userIds;
+            this.UserIds = userIds;
         }
 
         protected override void LoadComplete()
@@ -66,7 +66,7 @@ namespace osu.Game.Screens.Spectate
             spectatorClient.OnUserFinishedPlaying += userFinishedPlaying;
             spectatorClient.OnNewFrames += userSentFrames;
 
-            foreach (var id in userIds)
+            foreach (var id in UserIds)
             {
                 userLookupCache.GetUserAsync(id).ContinueWith(u => Schedule(() =>
                 {

From 7958a257e88d04a97e9b72e4a4493eb67dc28141 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 8 Apr 2021 22:14:30 +0900
Subject: [PATCH 2269/3722] Add tests

---
 .../Multiplayer/TestSceneMultiplayerScreen.cs | 327 ++++++++++++++++++
 1 file changed, 327 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerScreen.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerScreen.cs
new file mode 100644
index 0000000000..d085827986
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerScreen.cs
@@ -0,0 +1,327 @@
+// Copyright (c) ppy 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 System.Threading;
+using System.Threading.Tasks;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Testing;
+using osu.Framework.Utils;
+using osu.Game.Beatmaps;
+using osu.Game.Database;
+using osu.Game.Online;
+using osu.Game.Online.Spectator;
+using osu.Game.Replays.Legacy;
+using osu.Game.Scoring;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate;
+using osu.Game.Screens.Play;
+using osu.Game.Tests.Beatmaps.IO;
+using osu.Game.Users;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public class TestSceneMultiplayerSpectator : MultiplayerTestScene
+    {
+        [Cached(typeof(SpectatorStreamingClient))]
+        private TestSpectatorStreamingClient testSpectatorStreamingClient = new TestSpectatorStreamingClient();
+
+        [Cached(typeof(UserLookupCache))]
+        private UserLookupCache lookupCache = new TestUserLookupCache();
+
+        [Resolved]
+        private OsuGameBase game { get; set; }
+
+        [Resolved]
+        private BeatmapManager beatmapManager { get; set; }
+
+        private MultiplayerSpectator spectator;
+
+        private readonly List<int> playingUserIds = new List<int>();
+        private readonly Dictionary<int, int> nextFrame = new Dictionary<int, int>();
+
+        private BeatmapSetInfo importedSet;
+        private BeatmapInfo importedBeatmap;
+        private int importedBeatmapId;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            importedSet = ImportBeatmapTest.LoadOszIntoOsu(game, virtualTrack: true).Result;
+            importedBeatmap = importedSet.Beatmaps.First(b => b.RulesetID == 0);
+            importedBeatmapId = importedBeatmap.OnlineBeatmapID ?? -1;
+        }
+
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
+
+            AddStep("reset sent frames", () => nextFrame.Clear());
+
+            AddStep("add streaming client", () =>
+            {
+                Remove(testSpectatorStreamingClient);
+                Add(testSpectatorStreamingClient);
+            });
+
+            AddStep("finish previous gameplay", () =>
+            {
+                foreach (var id in playingUserIds)
+                    testSpectatorStreamingClient.EndPlay(id, importedBeatmapId);
+                playingUserIds.Clear();
+            });
+        }
+
+        [Test]
+        public void TestGeneral()
+        {
+            int[] userIds = Enumerable.Range(0, 4).Select(i => 55 + i).ToArray();
+
+            start(userIds);
+            loadSpectateScreen();
+
+            sendFrames(userIds, 1000);
+            AddWaitStep("wait a bit", 20);
+        }
+
+        [Test]
+        public void TestPlayersMustStartSimultaneously()
+        {
+            start(new[] { 55, 56 });
+            loadSpectateScreen();
+
+            // Send frames for one player only, both should remain paused.
+            sendFrames(55, 20);
+            checkPausedInstant(55, true);
+            checkPausedInstant(56, true);
+
+            // Send frames for the other player, both should now start playing.
+            sendFrames(56, 20);
+            checkPausedInstant(55, false);
+            checkPausedInstant(56, false);
+        }
+
+        [Test]
+        public void TestPlayersDoNotStartSimultaneouslyIfBufferingFor15Seconds()
+        {
+            start(new[] { 55, 56 });
+            loadSpectateScreen();
+
+            // Send frames for one player only, both should remain paused.
+            sendFrames(55, 20);
+            checkPausedInstant(55, true);
+            checkPausedInstant(56, true);
+
+            // Wait 15 seconds...
+            AddWaitStep("wait 15 seconds", (int)(15000 / TimePerAction));
+
+            // Player 1 should start playing by itself, player 2 should remain paused.
+            checkPausedInstant(55, false);
+            checkPausedInstant(56, true);
+        }
+
+        [Test]
+        public void TestPlayersContinueWhileOthersBuffer()
+        {
+            start(new[] { 55, 56 });
+            loadSpectateScreen();
+
+            // Send initial frames for both players. A few more for player 1.
+            sendFrames(55, 20);
+            sendFrames(56, 10);
+            checkPausedInstant(55, false);
+            checkPausedInstant(56, false);
+
+            // Eventually player 2 will pause, player 1 must remain running.
+            checkPaused(56, true);
+            checkPausedInstant(55, false);
+
+            // Eventually both players will run out of frames and should pause.
+            checkPaused(55, true);
+            checkPausedInstant(56, true);
+
+            // Send more frames for the first player only. Player 1 should start playing with player 2 remaining paused.
+            sendFrames(55, 20);
+            checkPausedInstant(56, true);
+            checkPausedInstant(55, false);
+
+            // Send more frames for the second player. Both should be playing
+            sendFrames(56, 20);
+            checkPausedInstant(56, false);
+            checkPausedInstant(55, false);
+        }
+
+        [Test]
+        public void TestPlayersCatchUpAfterFallingBehind()
+        {
+            start(new[] { 55, 56 });
+            loadSpectateScreen();
+
+            // Send initial frames for both players. A few more for player 1.
+            sendFrames(55, 100);
+            sendFrames(56, 10);
+            checkPausedInstant(55, false);
+            checkPausedInstant(56, false);
+
+            // Eventually player 2 will run out of frames and should pause.
+            checkPaused(56, true);
+            AddWaitStep("wait a few more frames", 10);
+
+            // Send more frames for player 2. It should unpause.
+            sendFrames(56, 100);
+            checkPausedInstant(56, false);
+
+            // Player 2 should catch up to player 1 after unpausing.
+            AddUntilStep("player 1 time == player 2 time", () => Precision.AlmostEquals(getGameplayTime(55), getGameplayTime(56), 16));
+        }
+
+        private void loadSpectateScreen()
+        {
+            AddStep("load screen", () =>
+            {
+                Beatmap.Value = beatmapManager.GetWorkingBeatmap(importedBeatmap);
+                Ruleset.Value = importedBeatmap.Ruleset;
+
+                LoadScreen(spectator = new MultiplayerSpectator(playingUserIds.ToArray()));
+            });
+
+            AddUntilStep("wait for screen load", () => spectator.LoadState == LoadState.Loaded && spectator.AllPlayersLoaded);
+        }
+
+        private void start(int userId, int? beatmapId = null) => start(new[] { userId }, beatmapId);
+
+        private void start(int[] userIds, int? beatmapId = null)
+        {
+            AddStep("start play", () =>
+            {
+                foreach (int id in userIds)
+                {
+                    Client.CurrentMatchPlayingUserIds.Add(id);
+                    testSpectatorStreamingClient.StartPlay(id, beatmapId ?? importedBeatmapId);
+                    playingUserIds.Add(id);
+                    nextFrame[id] = 0;
+                }
+            });
+        }
+
+        private void finish(int userId, int? beatmapId = null)
+        {
+            AddStep("end play", () =>
+            {
+                testSpectatorStreamingClient.EndPlay(userId, beatmapId ?? importedBeatmapId);
+                playingUserIds.Remove(userId);
+                nextFrame.Remove(userId);
+            });
+        }
+
+        private void sendFrames(int userId, int count = 10) => sendFrames(new[] { userId }, count);
+
+        private void sendFrames(int[] userIds, int count = 10)
+        {
+            AddStep("send frames", () =>
+            {
+                foreach (int id in userIds)
+                {
+                    testSpectatorStreamingClient.SendFrames(id, nextFrame[id], count);
+                    nextFrame[id] += count;
+                }
+            });
+        }
+
+        private void checkPaused(int userId, bool state) =>
+            AddUntilStep($"{userId} is {(state ? "paused" : "playing")}", () => getPlayer(userId).ChildrenOfType<GameplayClockContainer>().First().IsPaused.Value == state);
+
+        private void checkPausedInstant(int userId, bool state) =>
+            AddAssert($"{userId} is {(state ? "paused" : "playing")}", () => getPlayer(userId).ChildrenOfType<GameplayClockContainer>().First().IsPaused.Value == state);
+
+        private double getGameplayTime(int userId) => getPlayer(userId).ChildrenOfType<GameplayClockContainer>().Single().GameplayClock.CurrentTime;
+
+        private Player getPlayer(int userId) => getInstance(userId).ChildrenOfType<Player>().Single();
+
+        private PlayerInstance getInstance(int userId) => spectator.ChildrenOfType<PlayerInstance>().Single(p => p.User.Id == userId);
+
+        public class TestSpectatorStreamingClient : SpectatorStreamingClient
+        {
+            private readonly Dictionary<int, int> userBeatmapDictionary = new Dictionary<int, int>();
+            private readonly Dictionary<int, bool> userSentStateDictionary = new Dictionary<int, bool>();
+
+            public TestSpectatorStreamingClient()
+                : base(new DevelopmentEndpointConfiguration())
+            {
+            }
+
+            public void StartPlay(int userId, int beatmapId)
+            {
+                userBeatmapDictionary[userId] = beatmapId;
+                userSentStateDictionary[userId] = false;
+
+                sendState(userId, beatmapId);
+            }
+
+            public void EndPlay(int userId, int beatmapId)
+            {
+                ((ISpectatorClient)this).UserFinishedPlaying(userId, new SpectatorState
+                {
+                    BeatmapID = beatmapId,
+                    RulesetID = 0,
+                });
+
+                userSentStateDictionary[userId] = false;
+            }
+
+            public void SendFrames(int userId, int index, int count)
+            {
+                var frames = new List<LegacyReplayFrame>();
+
+                for (int i = index; i < index + count; i++)
+                {
+                    var buttonState = i == index + count - 1 ? ReplayButtonState.None : ReplayButtonState.Left1;
+
+                    frames.Add(new LegacyReplayFrame(i * 100, RNG.Next(0, 512), RNG.Next(0, 512), buttonState));
+                }
+
+                var bundle = new FrameDataBundle(new ScoreInfo { Combo = index + count }, frames);
+                ((ISpectatorClient)this).UserSentFrames(userId, bundle);
+
+                if (!userSentStateDictionary[userId])
+                    sendState(userId, userBeatmapDictionary[userId]);
+            }
+
+            public override void WatchUser(int userId)
+            {
+                if (userSentStateDictionary[userId])
+                {
+                    // usually the server would do this.
+                    sendState(userId, userBeatmapDictionary[userId]);
+                }
+
+                base.WatchUser(userId);
+            }
+
+            private void sendState(int userId, int beatmapId)
+            {
+                ((ISpectatorClient)this).UserBeganPlaying(userId, new SpectatorState
+                {
+                    BeatmapID = beatmapId,
+                    RulesetID = 0,
+                });
+
+                userSentStateDictionary[userId] = true;
+            }
+        }
+
+        internal class TestUserLookupCache : UserLookupCache
+        {
+            protected override Task<User> ComputeValueAsync(int lookup, CancellationToken token = default)
+            {
+                return Task.FromResult(new User
+                {
+                    Id = lookup,
+                    Username = $"User {lookup}"
+                });
+            }
+        }
+    }
+}

From ecd0b84d944ed82e9de9e244c32230918846055b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 8 Apr 2021 22:15:07 +0900
Subject: [PATCH 2270/3722] Use max_sync_offset constant

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

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index 8fa9dcf3af..90cf031584 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -98,7 +98,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 {
                     inst.ChildrenOfType<GameplayClockContainer>().Single().Start();
 
-                    if (targetTime < lastFrameTime && targetTime > currentTime + 16)
+                    if (targetTime < lastFrameTime && targetTime > currentTime + max_sync_offset)
                         inst.Beatmap.Track.AddAdjustment(AdjustableProperty.Frequency, catchupFrequencyAdjustment);
                     else
                         inst.Beatmap.Track.RemoveAdjustment(AdjustableProperty.Frequency, catchupFrequencyAdjustment);

From 8efa381d3a1f71eb8e169495bf5a54f99a4a751c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 8 Apr 2021 23:13:16 +0900
Subject: [PATCH 2271/3722] Actually use whistle sample for sliderwhistle

---
 .../Objects/Drawables/DrawableSlider.cs          | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 8167a9f243..e29e28b1fa 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -111,17 +111,17 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.LoadSamples();
 
-            var firstSample = HitObject.OriginalSamples.FirstOrDefault();
+            var slidingSamples = new List<ISampleInfo>();
 
-            if (firstSample != null)
-            {
-                var samples = new List<ISampleInfo> { HitObject.SampleControlPoint.ApplyTo(firstSample).With("sliderslide") };
+            var normalSample = HitObject.OriginalSamples.FirstOrDefault(s => s.Name == HitSampleInfo.HIT_NORMAL);
+            if (normalSample != null)
+                slidingSamples.Add(HitObject.SampleControlPoint.ApplyTo(normalSample).With("sliderslide"));
 
-                if (HitObject.OriginalSamples.Any(s => s.Name == HitSampleInfo.HIT_WHISTLE))
-                    samples.Add(HitObject.SampleControlPoint.ApplyTo(firstSample).With("sliderwhistle"));
+            var whistleSample = HitObject.OriginalSamples.FirstOrDefault(s => s.Name == HitSampleInfo.HIT_WHISTLE);
+            if (whistleSample != null)
+                slidingSamples.Add(HitObject.SampleControlPoint.ApplyTo(whistleSample).With("sliderwhistle"));
 
-                slidingSample.Samples = samples.ToArray();
-            }
+            slidingSample.Samples = slidingSamples.ToArray();
         }
 
         public override void StopAllSamples()

From 24ae5b91696c8141588ba379081d075196fe7e6b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Apr 2021 23:15:08 +0900
Subject: [PATCH 2272/3722] Fix slightly incorrect solo score submission routes

---
 osu.Game/Online/Solo/CreateSoloScoreRequest.cs | 2 +-
 osu.Game/Online/Solo/SubmitSoloScoreRequest.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Solo/CreateSoloScoreRequest.cs b/osu.Game/Online/Solo/CreateSoloScoreRequest.cs
index ae5ac5e26c..dea5a77496 100644
--- a/osu.Game/Online/Solo/CreateSoloScoreRequest.cs
+++ b/osu.Game/Online/Solo/CreateSoloScoreRequest.cs
@@ -27,6 +27,6 @@ namespace osu.Game.Online.Solo
             return req;
         }
 
-        protected override string Target => $@"solo/{beatmapId}/scores";
+        protected override string Target => $@"beatmaps/{beatmapId}/solo/scores";
     }
 }
diff --git a/osu.Game/Online/Solo/SubmitSoloScoreRequest.cs b/osu.Game/Online/Solo/SubmitSoloScoreRequest.cs
index 98ba4fa052..85fa3eeb34 100644
--- a/osu.Game/Online/Solo/SubmitSoloScoreRequest.cs
+++ b/osu.Game/Online/Solo/SubmitSoloScoreRequest.cs
@@ -40,6 +40,6 @@ namespace osu.Game.Online.Solo
             return req;
         }
 
-        protected override string Target => $@"solo/{beatmapId}/scores/{scoreId}";
+        protected override string Target => $@"beatmaps/{beatmapId}/solo/scores/{scoreId}";
     }
 }

From 5dd6f19ec5b74b9f0b68802562ad858b8b374434 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Apr 2021 23:15:34 +0900
Subject: [PATCH 2273/3722] Update rider metadata files for 2021.1

---
 .idea/.idea.osu.Desktop/.idea/indexLayout.xml | 2 +-
 .idea/.idea.osu.Desktop/.idea/modules.xml     | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)
 delete mode 100644 .idea/.idea.osu.Desktop/.idea/modules.xml

diff --git a/.idea/.idea.osu.Desktop/.idea/indexLayout.xml b/.idea/.idea.osu.Desktop/.idea/indexLayout.xml
index 27ba142e96..7b08163ceb 100644
--- a/.idea/.idea.osu.Desktop/.idea/indexLayout.xml
+++ b/.idea/.idea.osu.Desktop/.idea/indexLayout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ContentModelUserStore">
+  <component name="UserContentModel">
     <attachedFolders />
     <explicitIncludes />
     <explicitExcludes />
diff --git a/.idea/.idea.osu.Desktop/.idea/modules.xml b/.idea/.idea.osu.Desktop/.idea/modules.xml
deleted file mode 100644
index 680312ad27..0000000000
--- a/.idea/.idea.osu.Desktop/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/.idea.osu.Desktop/.idea/riderModule.iml" filepath="$PROJECT_DIR$/.idea/.idea.osu.Desktop/.idea/riderModule.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file

From 6bccb3aab6487e0edd0d8030378c2f18c2868194 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Thu, 8 Apr 2021 19:34:35 -0400
Subject: [PATCH 2274/3722] Use DI to implement battery detection, add
 BatteryCutoff property

- Removed the Xamarin.Essentials package from osu.Game and added it to osu.iOS and osu.Android only.
- iOS and Android implementations use Xamarin.Essentials.Battery, while the Desktop implementation
only returns 100% battery for now.
- Added a BatteryCutoff property to PowerStatus so it can be different for each platform (default 20%, 25% on iOS)
---
 osu.Android/OsuGameAndroid.cs                 |  9 +++
 osu.Android/osu.Android.csproj                |  4 +
 osu.Desktop/OsuGameDesktop.cs                 |  3 +
 .../Visual/Gameplay/TestScenePlayerLoader.cs  | 76 +++++++------------
 osu.Game/OsuGameBase.cs                       |  5 ++
 osu.Game/Screens/Play/PlayerLoader.cs         | 37 ++-------
 osu.Game/Tests/OsuTestBrowser.cs              |  5 ++
 osu.Game/Utils/PowerStatus.cs                 | 22 ++++++
 osu.iOS/OsuGameIOS.cs                         | 17 +++++
 osu.iOS/osu.iOS.csproj                        |  4 +
 10 files changed, 103 insertions(+), 79 deletions(-)
 create mode 100644 osu.Game/Utils/PowerStatus.cs

diff --git a/osu.Android/OsuGameAndroid.cs b/osu.Android/OsuGameAndroid.cs
index 21d6336b2c..4c82a175fc 100644
--- a/osu.Android/OsuGameAndroid.cs
+++ b/osu.Android/OsuGameAndroid.cs
@@ -7,6 +7,8 @@ using Android.OS;
 using osu.Framework.Allocation;
 using osu.Game;
 using osu.Game.Updater;
+using osu.Game.Utils;
+using Xamarin.Essentials;
 
 namespace osu.Android
 {
@@ -19,6 +21,7 @@ namespace osu.Android
             : base(null)
         {
             gameActivity = activity;
+            powerStatus = new AndroidPowerStatus();
         }
 
         public override Version AssemblyVersion
@@ -72,5 +75,11 @@ namespace osu.Android
         }
 
         protected override UpdateManager CreateUpdateManager() => new SimpleUpdateManager();
+        public class AndroidPowerStatus : PowerStatus
+        {
+            public override double ChargeLevel => Battery.ChargeLevel;
+
+            public override bool IsCharging => Battery.PowerSource != BatteryPowerSource.Battery;
+        }
     }
 }
diff --git a/osu.Android/osu.Android.csproj b/osu.Android/osu.Android.csproj
index 54857ac87d..64d5e5b1c8 100644
--- a/osu.Android/osu.Android.csproj
+++ b/osu.Android/osu.Android.csproj
@@ -63,5 +63,9 @@
       <Version>5.0.0</Version>
     </PackageReference>
   </ItemGroup>
+  <ItemGroup>
+    <!-- Used for obtaining battery info. -->
+    <PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index 0c21c75290..b6c57b219d 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -21,6 +21,8 @@ using osu.Game.Updater;
 using osu.Desktop.Windows;
 using osu.Framework.Threading;
 using osu.Game.IO;
+using osu.Game.Utils;
+using osu.Framework.Allocation;
 
 namespace osu.Desktop
 {
@@ -33,6 +35,7 @@ namespace osu.Desktop
             : base(args)
         {
             noVersionOverlay = args?.Any(a => a == "--no-version-overlay") ?? false;
+            powerStatus = new DefaultPowerStatus();
         }
 
         public override StableStorage GetStorageForStableInstall()
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index a31d53e3b6..c5cc10993c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -25,6 +25,7 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.PlayerSettings;
+using osu.Game.Utils;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -48,6 +49,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached]
         private readonly VolumeOverlay volumeOverlay;
 
+        [Resolved]
+        private PowerStatus powerStatus { get; set; }
+
         private readonly ChangelogOverlay changelogOverlay;
 
         public TestScenePlayerLoader()
@@ -93,26 +97,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             LoadScreen(loader = new TestPlayerLoader(() => player = new TestPlayer(interactive, interactive)));
         }
 
-        /// <summary>
-        /// Sets the input manager child to a new test player loader container instance with a custom battery level
-        /// </summary>
-        /// <param name="interactive">If the test player should behave like the production one.</param>
-        /// <param name="pluggedIn">If the player's device is plugged in.</param>
-        /// <param name="batteryLevel">A custom battery level for the test player.</param>
-        private void resetPlayerWithBattery(bool interactive, bool pluggedIn, double batteryLevel)
-        {
-            Beatmap.Value = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
-            Beatmap.Value.BeatmapInfo.EpilepsyWarning = epilepsyWarning;
-
-            foreach (var mod in SelectedMods.Value.OfType<IApplicableToTrack>())
-                mod.ApplyToTrack(Beatmap.Value.Track);
-
-            loader = new TestPlayerLoader(() => player = new TestPlayer(interactive, interactive));
-            loader.batteryManager.ChargeLevel = batteryLevel;
-            loader.batteryManager.PluggedIn = pluggedIn;
-            LoadScreen(loader);
-        }
-
         [Test]
         public void TestEarlyExitBeforePlayerConstruction()
         {
@@ -290,32 +274,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("wait for player load", () => player.IsLoaded);
         }
 
-        [TestCase(false, 1.0)] // not plugged in, full battery, no notification
-        [TestCase(false, 0.2)] // not plugged in, at warning level, no notification
-        [TestCase(true, 0.1)] // plugged in, charging, below warning level, no notification
-        [TestCase(false, 0.1)] // not plugged in, below warning level, notification
-        public void TestLowBatteryNotification(bool pluggedIn, double batteryLevel)
-        {
-            AddStep("reset notification lock", () => sessionStatics.GetBindable<bool>(Static.BatteryLowNotificationShownOnce).Value = false);
-
-            // mock phone on battery
-            AddStep("load player", () => resetPlayerWithBattery(false, pluggedIn, batteryLevel));
-            AddUntilStep("wait for player", () => player?.LoadState == LoadState.Ready);
-            int notificationCount = !pluggedIn && batteryLevel < PlayerLoader.battery_tolerance ? 1 : 0;
-            AddAssert("check for notification", () => notificationOverlay.UnreadCount.Value == notificationCount);
-            AddStep("click notification", () =>
-                {
-                    var scrollContainer = (OsuScrollContainer)notificationOverlay.Children.Last();
-                    var flowContainer = scrollContainer.Children.OfType<FillFlowContainer<NotificationSection>>().First();
-                    var notification = flowContainer.First();
-
-                    InputManager.MoveMouseTo(notification);
-                    InputManager.Click(MouseButton.Left);
-                });
-
-            AddUntilStep("wait for player load", () => player.IsLoaded);
-        }
-
         [TestCase(true)]
         [TestCase(false)]
         public void TestEpilepsyWarning(bool warning)
@@ -334,6 +292,30 @@ namespace osu.Game.Tests.Visual.Gameplay
             }
         }
 
+        [TestCase(false, 1.0)] // not charging, full battery --> no warning
+        [TestCase(false, 0.2)] // not charging, at cutoff --> warning
+        [TestCase(false, 0.1)] // charging, below cutoff --> warning
+        public void TestLowBatteryNotification(bool isCharging, double chargeLevel)
+        {
+            AddStep("reset notification lock", () => sessionStatics.GetBindable<bool>(Static.BatteryLowNotificationShownOnce).Value = false);
+
+            // set charge status and level
+            AddStep("load player", () => resetPlayer(false, () => { powerStatus.IsCharging = isCharging; powerStatus.ChargeLevel = chargeLevel; }));
+            AddUntilStep("wait for player", () => player?.LoadState == LoadState.Ready);
+            int notificationCount = !isCharging && chargeLevel <= powerStatus.BatteryCutoff ? 1 : 0;
+            AddAssert("check for notification", () => notificationOverlay.UnreadCount.Value == notificationCount);
+            AddStep("click notification", () =>
+                {
+                    var scrollContainer = (OsuScrollContainer)notificationOverlay.Children.Last();
+                    var flowContainer = scrollContainer.Children.OfType<FillFlowContainer<NotificationSection>>().First();
+                    var notification = flowContainer.First();
+
+                    InputManager.MoveMouseTo(notification);
+                    InputManager.Click(MouseButton.Left);
+                });
+            AddUntilStep("wait for player load", () => player.IsLoaded);
+        }
+
         [Test]
         public void TestEpilepsyWarningEarlyExit()
         {
@@ -356,8 +338,6 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public IReadOnlyList<Mod> DisplayedMods => MetadataInfo.Mods.Value;
 
-            public new BatteryManager batteryManager => base.batteryManager;
-
             public TestPlayerLoader(Func<Player> createPlayer)
                 : base(createPlayer)
             {
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 21313d0596..53873b0127 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -40,6 +40,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 using osu.Game.Skinning;
+using osu.Game.Utils;
 using osuTK.Input;
 using RuntimeInfo = osu.Framework.RuntimeInfo;
 
@@ -95,6 +96,8 @@ namespace osu.Game
 
         protected Storage Storage { get; set; }
 
+        protected PowerStatus powerStatus;
+
         [Cached]
         [Cached(typeof(IBindable<RulesetInfo>))]
         protected readonly Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
@@ -329,6 +332,8 @@ namespace osu.Game
             dependencies.CacheAs(MusicController);
 
             Ruleset.BindValueChanged(onRulesetChanged);
+
+            dependencies.CacheAs(powerStatus);
         }
 
         private void onRulesetChanged(ValueChangedEvent<RulesetInfo> r)
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 01a51e6e7a..9710fa7e46 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -24,9 +24,9 @@ using osu.Game.Overlays.Notifications;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.Play.PlayerSettings;
 using osu.Game.Users;
+using osu.Game.Utils;
 using osuTK;
 using osuTK.Graphics;
-using Xamarin.Essentials;
 
 namespace osu.Game.Screens.Play
 {
@@ -113,6 +113,9 @@ namespace osu.Game.Screens.Play
         [Resolved]
         private AudioManager audioManager { get; set; }
 
+        [Resolved]
+        private PowerStatus powerStatus { get; set; }
+
         public PlayerLoader(Func<Player> createPlayer)
         {
             this.createPlayer = createPlayer;
@@ -265,7 +268,6 @@ namespace osu.Game.Screens.Play
         }
 
         #endregion
-
         protected override void Update()
         {
             base.Update();
@@ -477,45 +479,18 @@ namespace osu.Game.Screens.Play
         #region Low battery warning
         private Bindable<bool> batteryWarningShownOnce;
 
-        // Send a warning if battery is less than 20%
-        public const double battery_tolerance = 0.2;
-
         private void showBatteryWarningIfNeeded()
         {
             if (!batteryWarningShownOnce.Value)
             {
-                // Checks if the notification has not been shown yet, device is unplugged and if device battery is low.
-                if (!batteryManager.PluggedIn && batteryManager.ChargeLevel < battery_tolerance)
+                // Checks if the notification has not been shown yet, device is unplugged and if device battery is at or below the cutoff
+                if (!powerStatus.IsCharging && powerStatus.ChargeLevel <= powerStatus.BatteryCutoff)
                 {
-                    Console.WriteLine("Battery level: {0}", batteryManager.ChargeLevel);
                     notificationOverlay?.Post(new BatteryWarningNotification());
                     batteryWarningShownOnce.Value = true;
                 }
             }
         }
-        public BatteryManager batteryManager = new BatteryManager();
-        public class BatteryManager
-        {
-            public double ChargeLevel;
-            public bool PluggedIn;
-            public BatteryManager()
-            {
-                // Attempt to get battery information using Xamarin.Essentials
-                // Xamarin.Essentials throws a NotSupportedOrImplementedException on .NET standard so this only works on iOS/Android
-                // https://github.com/xamarin/Essentials/blob/7218ab88f7fbe00ec3379bd54e6c0ce35ffc0c22/Xamarin.Essentials/Battery/Battery.netstandard.tvos.cs
-                try
-                {
-                    ChargeLevel = Battery.ChargeLevel;
-                    PluggedIn = Battery.PowerSource == BatteryPowerSource.Battery;
-                }
-                catch (NotImplementedException e)
-                {
-                    Console.WriteLine("Could not access battery info: {0}", e);
-                    ChargeLevel = 1.0;
-                    PluggedIn = false;
-                }
-            }
-        }
 
         private class BatteryWarningNotification : SimpleNotification
         {
diff --git a/osu.Game/Tests/OsuTestBrowser.cs b/osu.Game/Tests/OsuTestBrowser.cs
index 71b0b02fa6..afce7dd38b 100644
--- a/osu.Game/Tests/OsuTestBrowser.cs
+++ b/osu.Game/Tests/OsuTestBrowser.cs
@@ -7,11 +7,16 @@ using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Graphics;
 using osu.Game.Screens.Backgrounds;
+using osu.Game.Utils;
 
 namespace osu.Game.Tests
 {
     public class OsuTestBrowser : OsuGameBase
     {
+        public OsuTestBrowser()
+        {
+            powerStatus = new DefaultPowerStatus();
+        }
         protected override void LoadComplete()
         {
             base.LoadComplete();
diff --git a/osu.Game/Utils/PowerStatus.cs b/osu.Game/Utils/PowerStatus.cs
new file mode 100644
index 0000000000..0657c98af1
--- /dev/null
+++ b/osu.Game/Utils/PowerStatus.cs
@@ -0,0 +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.
+
+namespace osu.Game.Utils
+{
+    public abstract class PowerStatus
+    {
+        /// <summary>
+        /// The maximum battery level before a warning notification
+        /// is sent.
+        /// </summary>
+        public virtual double BatteryCutoff { get; } = 0.2;
+        public virtual double ChargeLevel { get; set; }
+        public virtual bool IsCharging { get; set; }
+    }
+
+    public class DefaultPowerStatus : PowerStatus
+    {
+        public override double ChargeLevel { get; set; } = 1;
+        public override bool IsCharging { get; set; } = true;
+    }
+}
diff --git a/osu.iOS/OsuGameIOS.cs b/osu.iOS/OsuGameIOS.cs
index 5125ad81e0..21dce338dc 100644
--- a/osu.iOS/OsuGameIOS.cs
+++ b/osu.iOS/OsuGameIOS.cs
@@ -5,13 +5,30 @@ using System;
 using Foundation;
 using osu.Game;
 using osu.Game.Updater;
+using osu.Game.Utils;
+using Xamarin.Essentials;
 
 namespace osu.iOS
 {
     public class OsuGameIOS : OsuGame
     {
+        public OsuGameIOS()
+            : base(null)
+        {
+            powerStatus = new IOSPowerStatus();
+        }
         public override Version AssemblyVersion => new Version(NSBundle.MainBundle.InfoDictionary["CFBundleVersion"].ToString());
 
         protected override UpdateManager CreateUpdateManager() => new SimpleUpdateManager();
+
+        public class IOSPowerStatus : PowerStatus
+        {
+            // The low battery alert appears at 20% on iOS
+            // https://github.com/ppy/osu/issues/12239
+            public override double BatteryCutoff => 0.25;
+            public override double ChargeLevel => Battery.ChargeLevel;
+
+            public override bool IsCharging => Battery.PowerSource != BatteryPowerSource.Battery;
+        }
     }
 }
diff --git a/osu.iOS/osu.iOS.csproj b/osu.iOS/osu.iOS.csproj
index 1e9a21865d..ed6f52c60e 100644
--- a/osu.iOS/osu.iOS.csproj
+++ b/osu.iOS/osu.iOS.csproj
@@ -116,5 +116,9 @@
       <Visible>false</Visible>
     </ImageAsset>
   </ItemGroup>
+  <ItemGroup>
+  <!-- Used for obtaining battery info. -->
+    <PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
 </Project>

From 493c095535c3acdddfada39ab29ecfd430c7afe9 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Thu, 8 Apr 2021 20:28:23 -0400
Subject: [PATCH 2275/3722] Fixed code style

---
 osu.Android/OsuGameAndroid.cs                           | 2 +-
 osu.Desktop/OsuGameDesktop.cs                           | 3 +--
 osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs | 6 +++++-
 osu.Game/OsuGameBase.cs                                 | 4 ++--
 osu.Game/Screens/Play/PlayerLoader.cs                   | 1 +
 osu.Game/Tests/OsuTestBrowser.cs                        | 3 ++-
 osu.Game/Utils/PowerStatus.cs                           | 1 +
 osu.iOS/OsuGameIOS.cs                                   | 2 +-
 8 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/osu.Android/OsuGameAndroid.cs b/osu.Android/OsuGameAndroid.cs
index 4c82a175fc..eb0d499c8f 100644
--- a/osu.Android/OsuGameAndroid.cs
+++ b/osu.Android/OsuGameAndroid.cs
@@ -21,7 +21,7 @@ namespace osu.Android
             : base(null)
         {
             gameActivity = activity;
-            powerStatus = new AndroidPowerStatus();
+            PowerStatus = new AndroidPowerStatus();
         }
 
         public override Version AssemblyVersion
diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index b6c57b219d..48e28fa251 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -22,7 +22,6 @@ using osu.Desktop.Windows;
 using osu.Framework.Threading;
 using osu.Game.IO;
 using osu.Game.Utils;
-using osu.Framework.Allocation;
 
 namespace osu.Desktop
 {
@@ -35,7 +34,7 @@ namespace osu.Desktop
             : base(args)
         {
             noVersionOverlay = args?.Any(a => a == "--no-version-overlay") ?? false;
-            powerStatus = new DefaultPowerStatus();
+            PowerStatus = new DefaultPowerStatus();
         }
 
         public override StableStorage GetStorageForStableInstall()
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index c5cc10993c..b885f0a9be 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -300,7 +300,11 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("reset notification lock", () => sessionStatics.GetBindable<bool>(Static.BatteryLowNotificationShownOnce).Value = false);
 
             // set charge status and level
-            AddStep("load player", () => resetPlayer(false, () => { powerStatus.IsCharging = isCharging; powerStatus.ChargeLevel = chargeLevel; }));
+            AddStep("load player", () => resetPlayer(false, () =>
+            { 
+                    powerStatus.IsCharging = isCharging;
+                    powerStatus.ChargeLevel = chargeLevel;
+            }));
             AddUntilStep("wait for player", () => player?.LoadState == LoadState.Ready);
             int notificationCount = !isCharging && chargeLevel <= powerStatus.BatteryCutoff ? 1 : 0;
             AddAssert("check for notification", () => notificationOverlay.UnreadCount.Value == notificationCount);
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 53873b0127..a907afd8af 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -96,7 +96,7 @@ namespace osu.Game
 
         protected Storage Storage { get; set; }
 
-        protected PowerStatus powerStatus;
+        protected PowerStatus PowerStatus;
 
         [Cached]
         [Cached(typeof(IBindable<RulesetInfo>))]
@@ -333,7 +333,7 @@ namespace osu.Game
 
             Ruleset.BindValueChanged(onRulesetChanged);
 
-            dependencies.CacheAs(powerStatus);
+            dependencies.CacheAs(PowerStatus);
         }
 
         private void onRulesetChanged(ValueChangedEvent<RulesetInfo> r)
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 9710fa7e46..6ba99d65d5 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -477,6 +477,7 @@ namespace osu.Game.Screens.Play
         #endregion
 
         #region Low battery warning
+
         private Bindable<bool> batteryWarningShownOnce;
 
         private void showBatteryWarningIfNeeded()
diff --git a/osu.Game/Tests/OsuTestBrowser.cs b/osu.Game/Tests/OsuTestBrowser.cs
index afce7dd38b..d4fa2a11d3 100644
--- a/osu.Game/Tests/OsuTestBrowser.cs
+++ b/osu.Game/Tests/OsuTestBrowser.cs
@@ -15,8 +15,9 @@ namespace osu.Game.Tests
     {
         public OsuTestBrowser()
         {
-            powerStatus = new DefaultPowerStatus();
+            PowerStatus = new DefaultPowerStatus();
         }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
diff --git a/osu.Game/Utils/PowerStatus.cs b/osu.Game/Utils/PowerStatus.cs
index 0657c98af1..1caed5b6fa 100644
--- a/osu.Game/Utils/PowerStatus.cs
+++ b/osu.Game/Utils/PowerStatus.cs
@@ -10,6 +10,7 @@ namespace osu.Game.Utils
         /// is sent.
         /// </summary>
         public virtual double BatteryCutoff { get; } = 0.2;
+
         public virtual double ChargeLevel { get; set; }
         public virtual bool IsCharging { get; set; }
     }
diff --git a/osu.iOS/OsuGameIOS.cs b/osu.iOS/OsuGameIOS.cs
index 21dce338dc..d417fa8f8d 100644
--- a/osu.iOS/OsuGameIOS.cs
+++ b/osu.iOS/OsuGameIOS.cs
@@ -15,7 +15,7 @@ namespace osu.iOS
         public OsuGameIOS()
             : base(null)
         {
-            powerStatus = new IOSPowerStatus();
+            PowerStatus = new IOSPowerStatus();
         }
         public override Version AssemblyVersion => new Version(NSBundle.MainBundle.InfoDictionary["CFBundleVersion"].ToString());
 

From 6b6a71d3c38e47f2e6441cb6a03dcb04c43b51ac Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Thu, 8 Apr 2021 20:38:16 -0400
Subject: [PATCH 2276/3722] trim whitespace

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index b885f0a9be..2a0f46f5ff 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -301,7 +301,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             // set charge status and level
             AddStep("load player", () => resetPlayer(false, () =>
-            { 
+            {
                     powerStatus.IsCharging = isCharging;
                     powerStatus.ChargeLevel = chargeLevel;
             }));

From 59d13b0dd3faa9baca04c6664437294a2ed820f6 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Thu, 8 Apr 2021 21:53:42 -0400
Subject: [PATCH 2277/3722] Fixed indentation

sorry about the style fixes... I'm using JetBrains Rider from now on.
---
 osu.Android/OsuGameAndroid.cs                  |  1 +
 .../Visual/Gameplay/TestScenePlayerLoader.cs   | 18 +++++++++---------
 osu.Game/Screens/Play/PlayerLoader.cs          |  1 +
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/osu.Android/OsuGameAndroid.cs b/osu.Android/OsuGameAndroid.cs
index eb0d499c8f..a0c6a1e354 100644
--- a/osu.Android/OsuGameAndroid.cs
+++ b/osu.Android/OsuGameAndroid.cs
@@ -75,6 +75,7 @@ namespace osu.Android
         }
 
         protected override UpdateManager CreateUpdateManager() => new SimpleUpdateManager();
+
         public class AndroidPowerStatus : PowerStatus
         {
             public override double ChargeLevel => Battery.ChargeLevel;
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index 2a0f46f5ff..1377459c62 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -302,21 +302,21 @@ namespace osu.Game.Tests.Visual.Gameplay
             // set charge status and level
             AddStep("load player", () => resetPlayer(false, () =>
             {
-                    powerStatus.IsCharging = isCharging;
-                    powerStatus.ChargeLevel = chargeLevel;
+                powerStatus.IsCharging = isCharging;
+                powerStatus.ChargeLevel = chargeLevel;
             }));
             AddUntilStep("wait for player", () => player?.LoadState == LoadState.Ready);
             int notificationCount = !isCharging && chargeLevel <= powerStatus.BatteryCutoff ? 1 : 0;
             AddAssert("check for notification", () => notificationOverlay.UnreadCount.Value == notificationCount);
             AddStep("click notification", () =>
-                {
-                    var scrollContainer = (OsuScrollContainer)notificationOverlay.Children.Last();
-                    var flowContainer = scrollContainer.Children.OfType<FillFlowContainer<NotificationSection>>().First();
-                    var notification = flowContainer.First();
+            {
+                var scrollContainer = (OsuScrollContainer)notificationOverlay.Children.Last();
+                var flowContainer = scrollContainer.Children.OfType<FillFlowContainer<NotificationSection>>().First();
+                var notification = flowContainer.First();
 
-                    InputManager.MoveMouseTo(notification);
-                    InputManager.Click(MouseButton.Left);
-                });
+                InputManager.MoveMouseTo(notification);
+                InputManager.Click(MouseButton.Left);
+            });
             AddUntilStep("wait for player load", () => player.IsLoaded);
         }
 
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 6ba99d65d5..e1ab0b8ef5 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -268,6 +268,7 @@ namespace osu.Game.Screens.Play
         }
 
         #endregion
+
         protected override void Update()
         {
             base.Update();

From 8293b06c0afe9dfe16e1340f9ffab8ca1e737fd5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 13:56:55 +0900
Subject: [PATCH 2278/3722] Remove obsolete code

---
 osu.Game/Beatmaps/BeatmapConverter.cs         | 34 +------------------
 osu.Game/Beatmaps/BeatmapStatistic.cs         | 12 -------
 osu.Game/Overlays/Settings/SettingsItem.cs    |  7 ----
 osu.Game/Rulesets/Judgements/Judgement.cs     | 12 -------
 .../Objects/Drawables/DrawableHitObject.cs    | 18 ----------
 osu.Game/Rulesets/Objects/HitObject.cs        |  9 -----
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs   |  6 ----
 7 files changed, 1 insertion(+), 97 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapConverter.cs b/osu.Game/Beatmaps/BeatmapConverter.cs
index b291edd19d..f3434c5153 100644
--- a/osu.Game/Beatmaps/BeatmapConverter.cs
+++ b/osu.Game/Beatmaps/BeatmapConverter.cs
@@ -27,8 +27,6 @@ namespace osu.Game.Beatmaps
 
         public IBeatmap Beatmap { get; }
 
-        private CancellationToken cancellationToken;
-
         protected BeatmapConverter(IBeatmap beatmap, Ruleset ruleset)
         {
             Beatmap = beatmap;
@@ -41,8 +39,6 @@ namespace osu.Game.Beatmaps
 
         public IBeatmap Convert(CancellationToken cancellationToken = default)
         {
-            this.cancellationToken = cancellationToken;
-
             // We always operate on a clone of the original beatmap, to not modify it game-wide
             return ConvertBeatmap(Beatmap.Clone(), cancellationToken);
         }
@@ -55,19 +51,6 @@ namespace osu.Game.Beatmaps
         /// <returns>The converted Beatmap.</returns>
         protected virtual Beatmap<T> ConvertBeatmap(IBeatmap original, CancellationToken cancellationToken)
         {
-#pragma warning disable 618
-            return ConvertBeatmap(original);
-#pragma warning restore 618
-        }
-
-        /// <summary>
-        /// Performs the conversion of a Beatmap using this Beatmap Converter.
-        /// </summary>
-        /// <param name="original">The un-converted Beatmap.</param>
-        /// <returns>The converted Beatmap.</returns>
-        [Obsolete("Use the cancellation-supporting override")] // Can be removed 20210318
-        protected virtual Beatmap<T> ConvertBeatmap(IBeatmap original)
-        {
             var beatmap = CreateBeatmap();
 
             beatmap.BeatmapInfo = original.BeatmapInfo;
@@ -121,21 +104,6 @@ namespace osu.Game.Beatmaps
         /// <param name="beatmap">The un-converted Beatmap.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>The converted hit object.</returns>
-        protected virtual IEnumerable<T> ConvertHitObject(HitObject original, IBeatmap beatmap, CancellationToken cancellationToken)
-        {
-#pragma warning disable 618
-            return ConvertHitObject(original, beatmap);
-#pragma warning restore 618
-        }
-
-        /// <summary>
-        /// Performs the conversion of a hit object.
-        /// This method is generally executed sequentially for all objects in a beatmap.
-        /// </summary>
-        /// <param name="original">The hit object to convert.</param>
-        /// <param name="beatmap">The un-converted Beatmap.</param>
-        /// <returns>The converted hit object.</returns>
-        [Obsolete("Use the cancellation-supporting override")] // Can be removed 20210318
-        protected virtual IEnumerable<T> ConvertHitObject(HitObject original, IBeatmap beatmap) => Enumerable.Empty<T>();
+        protected virtual IEnumerable<T> ConvertHitObject(HitObject original, IBeatmap beatmap, CancellationToken cancellationToken) => Enumerable.Empty<T>();
     }
 }
diff --git a/osu.Game/Beatmaps/BeatmapStatistic.cs b/osu.Game/Beatmaps/BeatmapStatistic.cs
index 9d87a20d60..7d7ba09fcf 100644
--- a/osu.Game/Beatmaps/BeatmapStatistic.cs
+++ b/osu.Game/Beatmaps/BeatmapStatistic.cs
@@ -3,16 +3,11 @@
 
 using System;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
-using osuTK;
 
 namespace osu.Game.Beatmaps
 {
     public class BeatmapStatistic
     {
-        [Obsolete("Use CreateIcon instead")] // can be removed 20210203
-        public IconUsage Icon = FontAwesome.Regular.QuestionCircle;
-
         /// <summary>
         /// A function to create the icon for display purposes. Use default icons available via <see cref="BeatmapStatisticIcon"/> whenever possible for conformity.
         /// </summary>
@@ -20,12 +15,5 @@ namespace osu.Game.Beatmaps
 
         public string Content;
         public string Name;
-
-        public BeatmapStatistic()
-        {
-#pragma warning disable 618
-            CreateIcon = () => new SpriteIcon { Icon = Icon, Scale = new Vector2(0.7f) };
-#pragma warning restore 618
-        }
     }
 }
diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index 85765bf991..0bd9750b0b 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -57,13 +57,6 @@ namespace osu.Game.Overlays.Settings
             }
         }
 
-        [Obsolete("Use Current instead")] // Can be removed 20210406
-        public Bindable<T> Bindable
-        {
-            get => Current;
-            set => Current = value;
-        }
-
         public virtual Bindable<T> Current
         {
             get => controlWithCurrent.Current;
diff --git a/osu.Game/Rulesets/Judgements/Judgement.cs b/osu.Game/Rulesets/Judgements/Judgement.cs
index b1ca72b1c0..be69db5ca8 100644
--- a/osu.Game/Rulesets/Judgements/Judgement.cs
+++ b/osu.Game/Rulesets/Judgements/Judgement.cs
@@ -28,18 +28,6 @@ namespace osu.Game.Rulesets.Judgements
         /// </summary>
         protected const double DEFAULT_MAX_HEALTH_INCREASE = 0.05;
 
-        /// <summary>
-        /// Whether this <see cref="Judgement"/> should affect the current combo.
-        /// </summary>
-        [Obsolete("Has no effect. Use HitResult members instead (e.g. use small-tick or bonus to not affect combo).")] // Can be removed 20210328
-        public virtual bool AffectsCombo => true;
-
-        /// <summary>
-        /// Whether this <see cref="Judgement"/> should be counted as base (combo) or bonus score.
-        /// </summary>
-        [Obsolete("Has no effect. Use HitResult members instead (e.g. use small-tick or bonus to not affect combo).")] // Can be removed 20210328
-        public virtual bool IsBonus => !AffectsCombo;
-
         /// <summary>
         /// The maximum <see cref="HitResult"/> that can be achieved.
         /// </summary>
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index e5eaf5db88..e69c4e2d91 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -736,24 +736,6 @@ 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)}.");
 
-            // Some (especially older) rulesets use scorable judgements instead of the newer ignorehit/ignoremiss judgements.
-            // Can be removed 20210328
-            if (Result.Judgement.MaxResult == HitResult.IgnoreHit)
-            {
-                HitResult originalType = Result.Type;
-
-                if (Result.Type == HitResult.Miss)
-                    Result.Type = HitResult.IgnoreMiss;
-                else if (Result.Type >= HitResult.Meh && Result.Type <= HitResult.Perfect)
-                    Result.Type = HitResult.IgnoreHit;
-
-                if (Result.Type != originalType)
-                {
-                    Logger.Log($"{GetType().ReadableName()} applied an invalid hit result ({originalType}) when {nameof(HitResult.IgnoreMiss)} or {nameof(HitResult.IgnoreHit)} is expected.\n"
-                               + $"This has been automatically adjusted to {Result.Type}, and support will be removed from 2021-03-28 onwards.", level: LogLevel.Important);
-                }
-            }
-
             if (!Result.Type.IsValidHitResult(Result.Judgement.MinResult, Result.Judgement.MaxResult))
             {
                 throw new InvalidOperationException(
diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index 826d411822..db02eafa92 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -139,15 +139,6 @@ namespace osu.Game.Rulesets.Objects
         }
 
         protected virtual void CreateNestedHitObjects(CancellationToken cancellationToken)
-        {
-            // ReSharper disable once MethodSupportsCancellation (https://youtrack.jetbrains.com/issue/RIDER-44520)
-#pragma warning disable 618
-            CreateNestedHitObjects();
-#pragma warning restore 618
-        }
-
-        [Obsolete("Use the cancellation-supporting override")] // Can be removed 20210318
-        protected virtual void CreateNestedHitObjects()
         {
         }
 
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index b81fa79345..0fb5c2f4b5 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -346,12 +346,6 @@ namespace osu.Game.Rulesets.Scoring
 
             score.HitEvents = hitEvents;
         }
-
-        /// <summary>
-        /// Create a <see cref="HitWindows"/> for this processor.
-        /// </summary>
-        [Obsolete("Method is now unused.")] // Can be removed 20210328
-        public virtual HitWindows CreateHitWindows() => new HitWindows();
     }
 
     public enum ScoringMode

From 76981f25478029cf948324f9e4c2e9e780ce57e1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 13:58:24 +0900
Subject: [PATCH 2279/3722] Remove unused using

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

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index e69c4e2d91..6da9f12b50 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -11,7 +11,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Primitives;
-using osu.Framework.Logging;
 using osu.Framework.Threading;
 using osu.Game.Audio;
 using osu.Game.Rulesets.Judgements;

From 51fee79ef19946f48262bd14fce5c7bc5254bcdb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 9 Apr 2021 15:18:02 +0900
Subject: [PATCH 2280/3722] Fix scores not being accepted due to missing
 ruleset ID

---
 osu.Game/Online/Solo/CreateSoloScoreRequest.cs | 6 +++++-
 osu.Game/Screens/Play/SoloPlayer.cs            | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Solo/CreateSoloScoreRequest.cs b/osu.Game/Online/Solo/CreateSoloScoreRequest.cs
index dea5a77496..0d2bea1f2a 100644
--- a/osu.Game/Online/Solo/CreateSoloScoreRequest.cs
+++ b/osu.Game/Online/Solo/CreateSoloScoreRequest.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.Globalization;
 using System.Net.Http;
 using osu.Framework.IO.Network;
 using osu.Game.Online.API;
@@ -11,11 +12,13 @@ namespace osu.Game.Online.Solo
     public class CreateSoloScoreRequest : APIRequest<APIScoreToken>
     {
         private readonly int beatmapId;
+        private readonly int rulesetId;
         private readonly string versionHash;
 
-        public CreateSoloScoreRequest(int beatmapId, string versionHash)
+        public CreateSoloScoreRequest(int beatmapId, int rulesetId, string versionHash)
         {
             this.beatmapId = beatmapId;
+            this.rulesetId = rulesetId;
             this.versionHash = versionHash;
         }
 
@@ -24,6 +27,7 @@ namespace osu.Game.Online.Solo
             var req = base.CreateWebRequest();
             req.Method = HttpMethod.Post;
             req.AddParameter("version_hash", versionHash);
+            req.AddParameter("ruleset_id", rulesetId.ToString(CultureInfo.InvariantCulture));
             return req;
         }
 
diff --git a/osu.Game/Screens/Play/SoloPlayer.cs b/osu.Game/Screens/Play/SoloPlayer.cs
index ee1ccdc5b3..d0ef4131dc 100644
--- a/osu.Game/Screens/Play/SoloPlayer.cs
+++ b/osu.Game/Screens/Play/SoloPlayer.cs
@@ -17,7 +17,10 @@ namespace osu.Game.Screens.Play
             if (!(Beatmap.Value.BeatmapInfo.OnlineBeatmapID is int beatmapId))
                 return null;
 
-            return new CreateSoloScoreRequest(beatmapId, Game.VersionHash);
+            if (!(Ruleset.Value.ID is int rulesetId))
+                return null;
+
+            return new CreateSoloScoreRequest(beatmapId, rulesetId, Game.VersionHash);
         }
 
         protected override bool HandleTokenRetrievalFailure(Exception exception) => false;

From f2e811928bb30d2b4c5a69bfcce67f5dbac7a68e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 15:28:08 +0900
Subject: [PATCH 2281/3722] Rework slider hackery to not overwrite Samples

---
 .../Objects/Drawables/DrawableSlider.cs            | 14 +++++++++++---
 osu.Game.Rulesets.Osu/Objects/Slider.cs            | 12 +++++-------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index e29e28b1fa..82b5492de6 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -109,15 +109,23 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         protected override void LoadSamples()
         {
-            base.LoadSamples();
+            // Note: base.LoadSamples() isn't called since the slider plays the tail's hitsounds for the time being.
+
+            if (HitObject.SampleControlPoint == null)
+            {
+                throw new InvalidOperationException($"{nameof(HitObject)}s must always have an attached {nameof(HitObject.SampleControlPoint)}."
+                                                    + $" This is an indication that {nameof(HitObject.ApplyDefaults)} has not been invoked on {this}.");
+            }
+
+            Samples.Samples = HitObject.TailSamples.Select(s => HitObject.SampleControlPoint.ApplyTo(s)).Cast<ISampleInfo>().ToArray();
 
             var slidingSamples = new List<ISampleInfo>();
 
-            var normalSample = HitObject.OriginalSamples.FirstOrDefault(s => s.Name == HitSampleInfo.HIT_NORMAL);
+            var normalSample = HitObject.Samples.FirstOrDefault(s => s.Name == HitSampleInfo.HIT_NORMAL);
             if (normalSample != null)
                 slidingSamples.Add(HitObject.SampleControlPoint.ApplyTo(normalSample).With("sliderslide"));
 
-            var whistleSample = HitObject.OriginalSamples.FirstOrDefault(s => s.Name == HitSampleInfo.HIT_WHISTLE);
+            var whistleSample = HitObject.Samples.FirstOrDefault(s => s.Name == HitSampleInfo.HIT_WHISTLE);
             if (whistleSample != null)
                 slidingSamples.Add(HitObject.SampleControlPoint.ApplyTo(whistleSample).With("sliderwhistle"));
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 4e71d82cab..8ba9597dc3 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Rulesets.Osu.Objects
         public List<IList<HitSampleInfo>> NodeSamples { get; set; } = new List<IList<HitSampleInfo>>();
 
         [JsonIgnore]
-        public IList<HitSampleInfo> OriginalSamples { get; private set; }
+        public IList<HitSampleInfo> TailSamples { get; private set; }
 
         private int repeatCount;
 
@@ -146,12 +146,6 @@ namespace osu.Game.Rulesets.Osu.Objects
 
             Velocity = scoringDistance / timingPoint.BeatLength;
             TickDistance = scoringDistance / difficulty.SliderTickRate * TickDistanceMultiplier;
-
-            // 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.
-            // For now, the samples are attached to and played by the slider itself at the correct end time.
-            // ToArray call is required as GetNodeSamples may fallback to Samples itself (without it it will get cleared due to the list reference being live).
-            OriginalSamples = Samples.ToList();
-            Samples = this.GetNodeSamples(repeatCount + 1).ToArray();
         }
 
         protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
@@ -242,6 +236,10 @@ 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.
+            // For now, the samples are played by the slider itself at the correct end time.
+            TailSamples = this.GetNodeSamples(repeatCount + 1);
         }
 
         public override Judgement CreateJudgement() => OnlyJudgeNestedObjects ? new OsuIgnoreJudgement() : new OsuJudgement();

From 9b0ce2999ffe05292826c048942058da5d1679d4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 15:28:42 +0900
Subject: [PATCH 2282/3722] Fix legacy encoder

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

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
index da44b96ed3..acbf57d25f 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -273,7 +273,7 @@ namespace osu.Game.Beatmaps.Formats
             if (hitObject is IHasPath path)
             {
                 addPathData(writer, path, position);
-                writer.Write(getSampleBank(hitObject.Samples, zeroBanks: true));
+                writer.Write(getSampleBank(hitObject.Samples));
             }
             else
             {
@@ -420,15 +420,15 @@ namespace osu.Game.Beatmaps.Formats
             writer.Write(FormattableString.Invariant($"{endTimeData.EndTime}{suffix}"));
         }
 
-        private string getSampleBank(IList<HitSampleInfo> samples, bool banksOnly = false, bool zeroBanks = false)
+        private string getSampleBank(IList<HitSampleInfo> samples, bool banksOnly = false)
         {
             LegacySampleBank normalBank = toLegacySampleBank(samples.SingleOrDefault(s => s.Name == HitSampleInfo.HIT_NORMAL)?.Bank);
             LegacySampleBank addBank = toLegacySampleBank(samples.FirstOrDefault(s => !string.IsNullOrEmpty(s.Name) && s.Name != HitSampleInfo.HIT_NORMAL)?.Bank);
 
             StringBuilder sb = new StringBuilder();
 
-            sb.Append(FormattableString.Invariant($"{(zeroBanks ? 0 : (int)normalBank)}:"));
-            sb.Append(FormattableString.Invariant($"{(zeroBanks ? 0 : (int)addBank)}"));
+            sb.Append(FormattableString.Invariant($"{(int)normalBank}:"));
+            sb.Append(FormattableString.Invariant($"{(int)addBank}"));
 
             if (!banksOnly)
             {

From b10ee7482d8b72986448b2c33ec81d898df16556 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 25 Dec 2020 15:43:50 +0900
Subject: [PATCH 2283/3722] Add a failing test to check catch replay accuracy

---
 .../TestSceneCatchReplay.cs                   | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 osu.Game.Rulesets.Catch.Tests/TestSceneCatchReplay.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchReplay.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchReplay.cs
new file mode 100644
index 0000000000..a10371b0f7
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchReplay.cs
@@ -0,0 +1,53 @@
+// Copyright (c) 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.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Rulesets.Catch.UI;
+
+namespace osu.Game.Rulesets.Catch.Tests
+{
+    public class TestSceneCatchReplay : TestSceneCatchPlayer
+    {
+        protected override bool Autoplay => true;
+
+        private const int object_count = 10;
+
+        [Test]
+        public void TestReplayCatcherPositionIsFramePerfect()
+        {
+            AddUntilStep("caught all fruits", () => Player.ScoreProcessor.Combo.Value == object_count);
+        }
+
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
+        {
+            var beatmap = new Beatmap
+            {
+                BeatmapInfo =
+                {
+                    Ruleset = ruleset,
+                }
+            };
+
+            beatmap.ControlPointInfo.Add(0, new TimingControlPoint());
+
+            for (int i = 0; i < object_count / 2; i++)
+            {
+                beatmap.HitObjects.Add(new Fruit
+                {
+                    StartTime = (i + 1) * 1000,
+                    X = 0
+                });
+                beatmap.HitObjects.Add(new Fruit
+                {
+                    StartTime = (i + 1) * 1000 + 1,
+                    X = CatchPlayfield.WIDTH
+                });
+            }
+
+            return beatmap;
+        }
+    }
+}

From 6d0dc62502ecd82dd409b85ffcfdb6bee1a61f2a Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 9 Apr 2021 16:04:45 +0900
Subject: [PATCH 2284/3722] Make sure latest catcher position is used for
 catching logic

A replay frame processed in CatchInputManager is applied to catcher in `CatcherArea`.
The catcher position is then used for the catching logic for each hit object under `HitObjectContainer`.
Thus, if `HitObjectContainer` came before `CatcherArea`, the replay input is delayed one frame.
That was one reason why the catch autoplay misses hit objects (especially when fast-forwarded).
---
 osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
index 73420a9eda..0e1ef90737 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
@@ -51,8 +51,11 @@ namespace osu.Game.Rulesets.Catch.UI
             {
                 droppedObjectContainer,
                 CatcherArea.MovableCatcher.CreateProxiedContent(),
-                HitObjectContainer,
+                HitObjectContainer.CreateProxy(),
+                // This ordering (`CatcherArea` before `HitObjectContainer`) is important to
+                // make sure the up-to-date catcher position is used for the catcher catching logic of hit objects.
                 CatcherArea,
+                HitObjectContainer,
             };
         }
 

From bb15baf118f6e49306acc9688cd6790b39dc102c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 17:31:14 +0900
Subject: [PATCH 2285/3722] Add initial multiplayer spectator leaderboard

---
 .../MultiplayerSpectatorLeaderboard.cs        | 82 +++++++++++++++++++
 .../HUD/MultiplayerGameplayLeaderboard.cs     | 19 +++--
 2 files changed, 94 insertions(+), 7 deletions(-)
 create mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs
new file mode 100644
index 0000000000..35c3471ce2
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs
@@ -0,0 +1,82 @@
+// Copyright (c) ppy 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.Timing;
+using osu.Game.Online.Spectator;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Screens.Play.HUD;
+
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
+{
+    public class MultiplayerSpectatorLeaderboard : MultiplayerGameplayLeaderboard
+    {
+        private readonly Dictionary<int, TrackedUserData> trackedData = new Dictionary<int, TrackedUserData>();
+
+        public MultiplayerSpectatorLeaderboard(ScoreProcessor scoreProcessor, int[] userIds)
+            : base(scoreProcessor, userIds)
+        {
+        }
+
+        public void AddSource(int userId, IClock source) => trackedData[userId] = new TrackedUserData(source);
+
+        public void RemoveSource(int userId, IClock source) => trackedData.Remove(userId);
+
+        protected override void OnIncomingFrames(int userId, FrameDataBundle bundle)
+        {
+            if (!trackedData.TryGetValue(userId, out var data))
+                return;
+
+            data.Frames.Add(new TimedFrameHeader(bundle.Frames.First().Time, bundle.Header));
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            foreach (var (userId, data) in trackedData)
+            {
+                var targetTime = data.Clock.CurrentTime;
+
+                int frameIndex = data.Frames.BinarySearch(new TimedFrameHeader(targetTime));
+                if (frameIndex < 0)
+                    frameIndex = ~frameIndex;
+                frameIndex = Math.Clamp(frameIndex - 1, 0, data.Frames.Count - 1);
+
+                SetCurrentFrame(userId, data.Frames[frameIndex].Header);
+            }
+        }
+
+        private class TrackedUserData
+        {
+            public readonly IClock Clock;
+            public readonly List<TimedFrameHeader> Frames = new List<TimedFrameHeader>();
+
+            public TrackedUserData(IClock clock)
+            {
+                Clock = clock;
+            }
+        }
+
+        private class TimedFrameHeader : IComparable<TimedFrameHeader>
+        {
+            public readonly double Time;
+            public readonly FrameHeader Header;
+
+            public TimedFrameHeader(double time)
+            {
+                Time = time;
+            }
+
+            public TimedFrameHeader(double time, FrameHeader header)
+            {
+                Time = time;
+                Header = header;
+            }
+
+            public int CompareTo(TimedFrameHeader other) => Time.CompareTo(other.Time);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index a3d27c4e71..65ad8be3f0 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -20,7 +20,6 @@ namespace osu.Game.Screens.Play.HUD
     public class MultiplayerGameplayLeaderboard : GameplayLeaderboard
     {
         private readonly ScoreProcessor scoreProcessor;
-
         private readonly Dictionary<int, TrackedUserData> userScores = new Dictionary<int, TrackedUserData>();
 
         [Resolved]
@@ -116,13 +115,19 @@ namespace osu.Game.Screens.Play.HUD
                 trackedData.UpdateScore(scoreProcessor, mode.NewValue);
         }
 
-        private void handleIncomingFrames(int userId, FrameDataBundle bundle)
+        private void handleIncomingFrames(int userId, FrameDataBundle bundle) => Schedule(() =>
         {
-            if (userScores.TryGetValue(userId, out var trackedData))
-            {
-                trackedData.LastHeader = bundle.Header;
-                trackedData.UpdateScore(scoreProcessor, scoringMode.Value);
-            }
+            if (userScores.ContainsKey(userId))
+                OnIncomingFrames(userId, bundle);
+        });
+
+        protected virtual void OnIncomingFrames(int userId, FrameDataBundle bundle) => SetCurrentFrame(userId, bundle.Header);
+
+        protected void SetCurrentFrame(int userId, FrameHeader header)
+        {
+            var trackedScore = userScores[userId];
+            trackedScore.LastHeader = header;
+            trackedScore.UpdateScore(scoreProcessor, scoringMode.Value);
         }
 
         protected override void Dispose(bool isDisposing)

From 0af6d77192e3af39430098a2dc35c26cdde55d69 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Fri, 9 Apr 2021 11:03:38 +0200
Subject: [PATCH 2286/3722] Test for path type transfer

---
 .../TestScenePathControlPointVisualiser.cs    | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
index 440ab7c889..35b79aa8ac 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestScenePathControlPointVisualiser.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             assertControlPointPathType(0, PathType.Bezier);
             assertControlPointPathType(1, PathType.PerfectCurve);
-            AddAssert("point 3 is not inherited", () => slider.Path.ControlPoints[3].Type != null);
+            assertControlPointPathType(3, PathType.Bezier);
         }
 
         [Test]
@@ -105,6 +105,27 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddAssert("point 3 is not inherited", () => slider.Path.ControlPoints[3].Type != null);
         }
 
+        [Test]
+        public void TestPerfectCurveTooManyPointsLinear()
+        {
+            createVisualiser(true);
+
+            addControlPointStep(new Vector2(200), PathType.Linear);
+            addControlPointStep(new Vector2(300));
+            addControlPointStep(new Vector2(500, 300));
+            addControlPointStep(new Vector2(700, 200));
+            addControlPointStep(new Vector2(500, 100));
+
+            // Must be both hovering and selecting the control point for the context menu to work.
+            moveMouseToControlPoint(1);
+            AddStep("select control point", () => visualiser.Pieces[1].IsSelected.Value = true);
+            addContextMenuItemStep("Perfect curve");
+
+            assertControlPointPathType(0, PathType.Linear);
+            assertControlPointPathType(1, PathType.PerfectCurve);
+            assertControlPointPathType(3, PathType.Linear);
+        }
+
         [Test]
         public void TestPerfectCurveChangeToBezier()
         {

From f64b2095bf6c06de31b2cc0ca7d9b888dc101347 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Fri, 9 Apr 2021 11:04:00 +0200
Subject: [PATCH 2287/3722] Carry over the previous path type

---
 .../Sliders/Components/PathControlPointVisualiser.cs          | 4 ++--
 1 file changed, 2 insertions(+), 2 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 1dfbf97682..44c3056910 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -169,11 +169,11 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
                 case PathType.PerfectCurve:
                     // Can't always create a circular arc out of 4 or more points,
                     // so we split the segment into one 3-point circular arc segment
-                    // and one bezier segment.
+                    // and one segment of the previous type.
                     int thirdPointIndex = indexInSegment + 2;
 
                     if (piece.PointsInSegment.Count > thirdPointIndex + 1)
-                        piece.PointsInSegment[thirdPointIndex].Type.Value = PathType.Bezier;
+                        piece.PointsInSegment[thirdPointIndex].Type.Value = piece.PointsInSegment[0].Type.Value;
 
                     break;
             }

From 3b86f0eb2f55839c4301cba1aefcc971ba205149 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 18:15:23 +0900
Subject: [PATCH 2288/3722] Fix exception with 0 frames

---
 .../Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs
index 35c3471ce2..08db5befa4 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs
@@ -40,6 +40,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             {
                 var targetTime = data.Clock.CurrentTime;
 
+                if (data.Frames.Count == 0)
+                    continue;
+
                 int frameIndex = data.Frames.BinarySearch(new TimedFrameHeader(targetTime));
                 if (frameIndex < 0)
                     frameIndex = ~frameIndex;

From 90e243eea5404e1632fc3f63c679c8fc38874c60 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 18:15:27 +0900
Subject: [PATCH 2289/3722] Rename methods

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

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs
index 08db5befa4..f16869b43d 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs
@@ -20,9 +20,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         {
         }
 
-        public void AddSource(int userId, IClock source) => trackedData[userId] = new TrackedUserData(source);
+        public void AddClock(int userId, IClock source) => trackedData[userId] = new TrackedUserData(source);
 
-        public void RemoveSource(int userId, IClock source) => trackedData.Remove(userId);
+        public void RemoveClock(int userId, IClock source) => trackedData.Remove(userId);
 
         protected override void OnIncomingFrames(int userId, FrameDataBundle bundle)
         {

From 589ce4bdc2b09c7f96d99582aea7e7f8ef430eb8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 18:16:10 +0900
Subject: [PATCH 2290/3722] Add test

---
 ...estSceneMultiplayerSpectatorLeaderboard.cs | 207 ++++++++++++++++++
 1 file changed, 207 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs
new file mode 100644
index 0000000000..57e9fb37cc
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs
@@ -0,0 +1,207 @@
+// Copyright (c) ppy 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 System.Threading;
+using System.Threading.Tasks;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Framework.Timing;
+using osu.Framework.Utils;
+using osu.Game.Database;
+using osu.Game.Online;
+using osu.Game.Online.Spectator;
+using osu.Game.Replays.Legacy;
+using osu.Game.Rulesets.Osu.Scoring;
+using osu.Game.Scoring;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate;
+using osu.Game.Screens.Play.HUD;
+using osu.Game.Users;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public class TestSceneMultiplayerSpectatorLeaderboard : MultiplayerTestScene
+    {
+        [Cached(typeof(SpectatorStreamingClient))]
+        private TestSpectatorStreamingClient streamingClient = new TestSpectatorStreamingClient();
+
+        [Cached(typeof(UserLookupCache))]
+        private UserLookupCache lookupCache = new TestUserLookupCache();
+
+        protected override Container<Drawable> Content => content;
+        private readonly Container content;
+
+        private readonly Dictionary<int, ManualClock> clocks = new Dictionary<int, ManualClock>
+        {
+            { 55, new ManualClock() },
+            { 56, new ManualClock() }
+        };
+
+        public TestSceneMultiplayerSpectatorLeaderboard()
+        {
+            base.Content.AddRange(new Drawable[]
+            {
+                streamingClient,
+                lookupCache,
+                content = new Container { RelativeSizeAxes = Axes.Both }
+            });
+        }
+
+        [SetUpSteps]
+        public new void SetUpSteps()
+        {
+            MultiplayerSpectatorLeaderboard leaderboard = null;
+
+            AddStep("reset", () =>
+            {
+                Clear();
+
+                foreach (var (userId, clock) in clocks)
+                {
+                    streamingClient.EndPlay(userId, 0);
+                    clock.CurrentTime = 0;
+                }
+            });
+
+            AddStep("create leaderboard", () =>
+            {
+                foreach (var (userId, _) in clocks)
+                    streamingClient.StartPlay(userId, 0);
+
+                Beatmap.Value = CreateWorkingBeatmap(Ruleset.Value);
+
+                var playable = Beatmap.Value.GetPlayableBeatmap(Ruleset.Value);
+                var scoreProcessor = new OsuScoreProcessor();
+                scoreProcessor.ApplyBeatmap(playable);
+
+                LoadComponentAsync(leaderboard = new MultiplayerSpectatorLeaderboard(scoreProcessor, clocks.Keys.ToArray()) { Expanded = { Value = true } }, Add);
+            });
+
+            AddUntilStep("wait for load", () => leaderboard.IsLoaded);
+
+            AddStep("add clock sources", () =>
+            {
+                foreach (var (userId, clock) in clocks)
+                    leaderboard.AddClock(userId, clock);
+            });
+        }
+
+        [Test]
+        public void TestLeaderboardTracksCurrentTime()
+        {
+            AddStep("send frames", () =>
+            {
+                // For user 55, send 100 frames in sets of 1.
+                // For user 56, send 100 frames in sets of 10.
+                for (int i = 0; i < 100; i++)
+                {
+                    streamingClient.SendFrames(55, i, 1);
+
+                    if (i % 10 == 0)
+                        streamingClient.SendFrames(56, i, 10);
+                }
+            });
+
+            assertCombo(55, 1);
+            assertCombo(56, 10);
+
+            setTime(500);
+            assertCombo(55, 5);
+            assertCombo(56, 10);
+
+            setTime(1100);
+            assertCombo(55, 11);
+            assertCombo(56, 20);
+        }
+
+        private void setTime(double time) => AddStep($"set time {time}", () =>
+        {
+            foreach (var (_, clock) in clocks)
+                clock.CurrentTime = time;
+        });
+
+        private void assertCombo(int userId, int expectedCombo)
+            => AddUntilStep($"player {userId} has {expectedCombo} combo", () => this.ChildrenOfType<GameplayLeaderboardScore>().Single(s => s.User?.Id == userId).Combo.Value == expectedCombo);
+
+        private class TestSpectatorStreamingClient : SpectatorStreamingClient
+        {
+            private readonly Dictionary<int, int> userBeatmapDictionary = new Dictionary<int, int>();
+            private readonly Dictionary<int, bool> userSentStateDictionary = new Dictionary<int, bool>();
+
+            public TestSpectatorStreamingClient()
+                : base(new DevelopmentEndpointConfiguration())
+            {
+            }
+
+            public void StartPlay(int userId, int beatmapId)
+            {
+                userBeatmapDictionary[userId] = beatmapId;
+                userSentStateDictionary[userId] = false;
+                sendState(userId, beatmapId);
+            }
+
+            public void EndPlay(int userId, int beatmapId)
+            {
+                ((ISpectatorClient)this).UserFinishedPlaying(userId, new SpectatorState
+                {
+                    BeatmapID = beatmapId,
+                    RulesetID = 0,
+                });
+                userSentStateDictionary[userId] = false;
+            }
+
+            public void SendFrames(int userId, int index, int count)
+            {
+                var frames = new List<LegacyReplayFrame>();
+
+                for (int i = index; i < index + count; i++)
+                {
+                    var buttonState = i == index + count - 1 ? ReplayButtonState.None : ReplayButtonState.Left1;
+                    frames.Add(new LegacyReplayFrame(i * 100, RNG.Next(0, 512), RNG.Next(0, 512), buttonState));
+                }
+
+                var bundle = new FrameDataBundle(new ScoreInfo { Combo = index + count }, frames);
+                ((ISpectatorClient)this).UserSentFrames(userId, bundle);
+                if (!userSentStateDictionary[userId])
+                    sendState(userId, userBeatmapDictionary[userId]);
+            }
+
+            public override void WatchUser(int userId)
+            {
+                if (userSentStateDictionary[userId])
+                {
+                    // usually the server would do this.
+                    sendState(userId, userBeatmapDictionary[userId]);
+                }
+
+                base.WatchUser(userId);
+            }
+
+            private void sendState(int userId, int beatmapId)
+            {
+                ((ISpectatorClient)this).UserBeganPlaying(userId, new SpectatorState
+                {
+                    BeatmapID = beatmapId,
+                    RulesetID = 0,
+                });
+                userSentStateDictionary[userId] = true;
+            }
+        }
+
+        private class TestUserLookupCache : UserLookupCache
+        {
+            protected override Task<User> ComputeValueAsync(int lookup, CancellationToken token = default)
+            {
+                return Task.FromResult(new User
+                {
+                    Id = lookup,
+                    Username = $"User {lookup}"
+                });
+            }
+        }
+    }
+}

From b49997f531dad5e80f50fa6cbe1f4349a99be38f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 18:18:23 +0900
Subject: [PATCH 2291/3722] Add test for no frames

---
 .../TestSceneMultiplayerSpectatorLeaderboard.cs            | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs
index 57e9fb37cc..53efb4392f 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs
@@ -118,6 +118,13 @@ namespace osu.Game.Tests.Visual.Multiplayer
             assertCombo(56, 20);
         }
 
+        [Test]
+        public void TestNoFrames()
+        {
+            assertCombo(55, 0);
+            assertCombo(56, 1);
+        }
+
         private void setTime(double time) => AddStep($"set time {time}", () =>
         {
             foreach (var (_, clock) in clocks)

From 9ddcd686ac09e3f0aa35c0f5a9c9ae01e7e44f0e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 18:23:38 +0900
Subject: [PATCH 2292/3722] Fix incorrect assert

---
 .../Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs
index 53efb4392f..8589cffcc9 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs
@@ -122,7 +122,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         public void TestNoFrames()
         {
             assertCombo(55, 0);
-            assertCombo(56, 1);
+            assertCombo(56, 0);
         }
 
         private void setTime(double time) => AddStep($"set time {time}", () =>

From e73f3f52d7730854a9f360dc2f1ae7df0ec834ea Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 18:23:41 +0900
Subject: [PATCH 2293/3722] Add some more asserts

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

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs
index 8589cffcc9..3b2cfb1c7b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs
@@ -95,8 +95,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             AddStep("send frames", () =>
             {
-                // For user 55, send 100 frames in sets of 1.
-                // For user 56, send 100 frames in sets of 10.
+                // For user 55, send frames in sets of 1.
+                // For user 56, send frames in sets of 10.
                 for (int i = 0; i < 100; i++)
                 {
                     streamingClient.SendFrames(55, i, 1);
@@ -109,13 +109,25 @@ namespace osu.Game.Tests.Visual.Multiplayer
             assertCombo(55, 1);
             assertCombo(56, 10);
 
+            // Advance to a point where only user 55's frame changes.
             setTime(500);
             assertCombo(55, 5);
             assertCombo(56, 10);
 
+            // Advance to a point where both user's frame changes.
             setTime(1100);
             assertCombo(55, 11);
             assertCombo(56, 20);
+
+            // Advance user 56 only to a point where its frame changes.
+            setTime(56, 2100);
+            assertCombo(55, 11);
+            assertCombo(56, 30);
+
+            // Advance both users beyond their last frame
+            setTime(101 * 100);
+            assertCombo(55, 100);
+            assertCombo(56, 100);
         }
 
         [Test]
@@ -131,6 +143,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 clock.CurrentTime = time;
         });
 
+        private void setTime(int userId, double time)
+            => AddStep($"set user {userId} time {time}", () => clocks[userId].CurrentTime = time);
+
         private void assertCombo(int userId, int expectedCombo)
             => AddUntilStep($"player {userId} has {expectedCombo} combo", () => this.ChildrenOfType<GameplayLeaderboardScore>().Single(s => s.User?.Id == userId).Combo.Value == expectedCombo);
 

From 7cbc8f2695b4868fa4be7a9b41ebd8ef42b1b0d4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 18:29:02 +0900
Subject: [PATCH 2294/3722] Add some xmldocs

---
 .../Play/HUD/MultiplayerGameplayLeaderboard.cs      | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index 65ad8be3f0..f0d2ac4b7f 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -121,8 +121,21 @@ namespace osu.Game.Screens.Play.HUD
                 OnIncomingFrames(userId, bundle);
         });
 
+        /// <summary>
+        /// Invoked when new frames have arrived for a user.
+        /// </summary>
+        /// <remarks>
+        /// By default, this immediately sets the current frame to be displayed for the user.
+        /// </remarks>
+        /// <param name="userId">The user which the frames arrived for.</param>
+        /// <param name="bundle">The bundle of frames.</param>
         protected virtual void OnIncomingFrames(int userId, FrameDataBundle bundle) => SetCurrentFrame(userId, bundle.Header);
 
+        /// <summary>
+        /// Sets the current frame to be displayed for a user.
+        /// </summary>
+        /// <param name="userId">The user to set the frame of.</param>
+        /// <param name="header">The frame to set.</param>
         protected void SetCurrentFrame(int userId, FrameHeader header)
         {
             var trackedScore = userScores[userId];

From 8005f146a914b26bbe87d763d8ee7d073101711c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 18:37:11 +0900
Subject: [PATCH 2295/3722] Fix inspection

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

diff --git a/osu.Game/Screens/Spectate/SpectatorScreen.cs b/osu.Game/Screens/Spectate/SpectatorScreen.cs
index b7e1b8496c..6fa045c962 100644
--- a/osu.Game/Screens/Spectate/SpectatorScreen.cs
+++ b/osu.Game/Screens/Spectate/SpectatorScreen.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Screens.Spectate
         /// <param name="userIds">The users to spectate.</param>
         protected SpectatorScreen(params int[] userIds)
         {
-            this.UserIds = userIds;
+            UserIds = userIds;
         }
 
         protected override void LoadComplete()

From 4fa51d5ec87a9b5592968737c7e908cfaa0da10b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 18:41:48 +0900
Subject: [PATCH 2296/3722] Add leaderboard to multiplayer spectate screen

---
 .../Spectate/MultiplayerSpectator.cs          | 38 ++++++++++++++++++-
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index 90cf031584..d415669cb1 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -7,6 +7,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Online.Spectator;
@@ -30,6 +31,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         private readonly PlayerInstance[] instances;
         private PlayerGrid grid;
+        private MultiplayerSpectatorLeaderboard leaderboard;
 
         public MultiplayerSpectator(int[] userIds)
             : base(userIds.AsSpan().Slice(0, Math.Min(16, userIds.Length)).ToArray())
@@ -40,10 +42,35 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         [BackgroundDependencyLoader]
         private void load()
         {
-            InternalChild = grid = new PlayerGrid
+            Container leaderboardContainer;
+
+            InternalChild = new GridContainer
             {
-                RelativeSizeAxes = Axes.Both
+                RelativeSizeAxes = Axes.Both,
+                ColumnDimensions = new[]
+                {
+                    new Dimension(GridSizeMode.AutoSize)
+                },
+                Content = new[]
+                {
+                    new Drawable[]
+                    {
+                        leaderboardContainer = new Container
+                        {
+                            RelativeSizeAxes = Axes.Y,
+                            AutoSizeAxes = Axes.X
+                        },
+                        grid = new PlayerGrid { RelativeSizeAxes = Axes.Both }
+                    }
+                }
             };
+
+            // Todo: This is not quite correct - it should be per-user to adjust for other mod combinations.
+            var playableBeatmap = Beatmap.Value.GetPlayableBeatmap(Ruleset.Value);
+            var scoreProcessor = Ruleset.Value.CreateInstance().CreateScoreProcessor();
+            scoreProcessor.ApplyBeatmap(playableBeatmap);
+
+            LoadComponentAsync(leaderboard = new MultiplayerSpectatorLeaderboard(scoreProcessor, UserIds) { Expanded = { Value = true } }, leaderboardContainer.Add);
         }
 
         protected override void Update()
@@ -118,18 +145,25 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             var existingInstance = instances[userIndex];
 
             if (existingInstance != null)
+            {
                 grid.Remove(existingInstance);
+                leaderboard.RemoveClock(existingInstance.User.Id);
+            }
 
             LoadComponentAsync(instances[userIndex] = new PlayerInstance(gameplayState.Score), d =>
             {
                 if (instances[userIndex] == d)
+                {
                     grid.Add(d);
+                    leaderboard.AddClock(d.User.Id, d.Beatmap.Track);
+                }
             });
         }
 
         protected override void EndGameplay(int userId)
         {
             spectatorClient.StopWatchingUser(userId);
+            leaderboard.RemoveClock(userId);
         }
 
         private int getIndexForUser(int userId) => Array.IndexOf(UserIds, userId);

From d2c37e6cf8828e5793c9aef36b76fd6ce986b537 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 18:41:58 +0900
Subject: [PATCH 2297/3722] Remove unnecessary parameter

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

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs
index f16869b43d..aa9f162036 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         public void AddClock(int userId, IClock source) => trackedData[userId] = new TrackedUserData(source);
 
-        public void RemoveClock(int userId, IClock source) => trackedData.Remove(userId);
+        public void RemoveClock(int userId) => trackedData.Remove(userId);
 
         protected override void OnIncomingFrames(int userId, FrameDataBundle bundle)
         {

From c93ce73123c142499f554fa77b752ec668573876 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 19:58:24 +0900
Subject: [PATCH 2298/3722] Move catchup logic inside PlayerInstance, fixup
 some edge cases

---
 .../Spectate/MultiplayerSpectator.cs          | 37 +++------
 .../Spectate/MultiplayerSpectatorPlayer.cs    |  2 +
 .../Multiplayer/Spectate/PlayerInstance.cs    | 79 ++++++++++++++++++-
 3 files changed, 93 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index d415669cb1..19c0d4e742 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -2,16 +2,13 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Audio;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Online.Spectator;
-using osu.Game.Screens.Play;
 using osu.Game.Screens.Spectate;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
@@ -19,7 +16,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
     public class MultiplayerSpectator : SpectatorScreen
     {
         private const double min_duration_to_allow_playback = 50;
-        private const double max_sync_offset = 2;
 
         // Isolates beatmap/ruleset to this screen.
         public override bool DisallowExternalBeatmapRulesetChanges => true;
@@ -73,9 +69,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             LoadComponentAsync(leaderboard = new MultiplayerSpectatorLeaderboard(scoreProcessor, UserIds) { Expanded = { Value = true } }, leaderboardContainer.Add);
         }
 
-        protected override void Update()
+        protected override void UpdateAfterChildren()
         {
-            base.Update();
+            base.UpdateAfterChildren();
             updatePlayTime();
         }
 
@@ -85,7 +81,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         {
             if (gameplayStarted)
             {
-                ensurePlaying(instances.Select(i => i.Beatmap.Track.CurrentTime).Max());
+                ensurePlaying(instances.Select(i => i.GetCurrentTrackTime()).Max());
                 return;
             }
 
@@ -108,30 +104,23 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         private void ensureAllStopped()
         {
             foreach (var inst in instances)
-                inst.ChildrenOfType<GameplayClockContainer>().SingleOrDefault()?.Stop();
+                inst?.PauseGameplay();
         }
 
-        private readonly BindableDouble catchupFrequencyAdjustment = new BindableDouble(2.0);
-
-        private void ensurePlaying(double targetTime)
+        private void ensurePlaying(double targetTrackTime)
         {
             foreach (var inst in instances)
             {
+                Debug.Assert(inst != null);
+
                 double lastFrameTime = inst.Score.Replay.Frames.Select(f => f.Time).Last();
-                double currentTime = inst.Beatmap.Track.CurrentTime;
+                double currentTime = inst.GetCurrentGameplayTime();
 
-                // If we have enough frames to play back, start playback.
-                if (Precision.DefinitelyBigger(lastFrameTime, currentTime, min_duration_to_allow_playback))
-                {
-                    inst.ChildrenOfType<GameplayClockContainer>().Single().Start();
+                bool canContinuePlayback = Precision.DefinitelyBigger(lastFrameTime, currentTime, min_duration_to_allow_playback);
+                if (!canContinuePlayback)
+                    continue;
 
-                    if (targetTime < lastFrameTime && targetTime > currentTime + max_sync_offset)
-                        inst.Beatmap.Track.AddAdjustment(AdjustableProperty.Frequency, catchupFrequencyAdjustment);
-                    else
-                        inst.Beatmap.Track.RemoveAdjustment(AdjustableProperty.Frequency, catchupFrequencyAdjustment);
-                }
-                else
-                    inst.Beatmap.Track.RemoveAdjustment(AdjustableProperty.Frequency, catchupFrequencyAdjustment);
+                inst.ContinueGameplay(targetTrackTime);
             }
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
index bad093f666..1634438850 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
@@ -11,6 +11,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
     {
         public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
 
+        public new GameplayClockContainer GameplayClockContainer => base.GameplayClockContainer;
+
         public MultiplayerSpectatorPlayer(Score score)
             : base(score)
         {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
index 5689a3222a..acac753fe2 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.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.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
@@ -15,10 +17,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     public class PlayerInstance : CompositeDrawable
     {
+        private const double catchup_rate = 2;
+        private const double max_sync_offset = catchup_rate * 2; // Double the catchup rate to prevent ringing.
+
         public bool PlayerLoaded => stack?.CurrentScreen is Player;
 
         public User User => Score.ScoreInfo.User;
-        public ScoreProcessor ScoreProcessor => player?.ScoreProcessor;
 
         public WorkingBeatmap Beatmap { get; private set; }
         public Ruleset Ruleset { get; private set; }
@@ -54,5 +58,78 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
             stack.Push(new MultiplayerSpectatorPlayerLoader(Score, () => player = new MultiplayerSpectatorPlayer(Score)));
         }
+
+        protected override void UpdateAfterChildren()
+        {
+            base.UpdateAfterChildren();
+            updateCatchup();
+        }
+
+        private readonly BindableDouble catchupFrequencyAdjustment = new BindableDouble(catchup_rate);
+        private double targetTrackTime;
+        private bool isCatchingUp;
+
+        private void updateCatchup()
+        {
+            if (player?.IsLoaded != true)
+                return;
+
+            if (Score.Replay.Frames.Count == 0)
+                return;
+
+            if (player.GameplayClockContainer.IsPaused.Value)
+                return;
+
+            double currentTime = Beatmap.Track.CurrentTime;
+            bool catchupRequired = targetTrackTime > currentTime + max_sync_offset;
+
+            // Skip catchup if nothing needs to be done.
+            if (catchupRequired == isCatchingUp)
+                return;
+
+            if (catchupRequired)
+            {
+                Beatmap.Track.AddAdjustment(AdjustableProperty.Frequency, catchupFrequencyAdjustment);
+                isCatchingUp = true;
+            }
+            else
+            {
+                Beatmap.Track.RemoveAdjustment(AdjustableProperty.Frequency, catchupFrequencyAdjustment);
+                isCatchingUp = false;
+            }
+        }
+
+        public double GetCurrentGameplayTime()
+        {
+            if (player?.IsLoaded != true)
+                return 0;
+
+            return player.GameplayClockContainer.GameplayClock.CurrentTime;
+        }
+
+        public double GetCurrentTrackTime()
+        {
+            if (player?.IsLoaded != true)
+                return 0;
+
+            return Beatmap.Track.CurrentTime;
+        }
+
+        public void ContinueGameplay(double targetTrackTime)
+        {
+            if (player?.IsLoaded != true)
+                return;
+
+            player.GameplayClockContainer.Start();
+            this.targetTrackTime = targetTrackTime;
+        }
+
+        public void PauseGameplay()
+        {
+            if (player?.IsLoaded != true)
+                return;
+
+            player.GameplayClockContainer.Stop();
+        }
     }
 }

From 49b7519c53a765d9bb4576dd1f0c529a0027fd24 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 20:03:34 +0900
Subject: [PATCH 2299/3722] Refactor gameplay starting logic

---
 .../Spectate/MultiplayerSpectator.cs          | 36 ++++---------------
 .../Multiplayer/Spectate/PlayerInstance.cs    |  1 -
 2 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index 19c0d4e742..b0747f5027 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -72,43 +72,21 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         protected override void UpdateAfterChildren()
         {
             base.UpdateAfterChildren();
-            updatePlayTime();
+            updateGameplayPlayingState();
         }
 
-        private bool gameplayStarted;
-
-        private void updatePlayTime()
+        private void updateGameplayPlayingState()
         {
-            if (gameplayStarted)
+            // Make sure all players are loaded and have frames before starting any.
+            if (!AllPlayersLoaded || !instances.All(i => i.Score.Replay.Frames.Count > 0))
             {
-                ensurePlaying(instances.Select(i => i.GetCurrentTrackTime()).Max());
+                foreach (var inst in instances)
+                    inst?.PauseGameplay();
                 return;
             }
 
-            // Make sure all players are loaded.
-            if (!AllPlayersLoaded)
-            {
-                ensureAllStopped();
-                return;
-            }
+            double targetTrackTime = instances.Select(i => i.GetCurrentGameplayTime()).Max();
 
-            if (!instances.All(i => i.Score.Replay.Frames.Count > 0))
-            {
-                ensureAllStopped();
-                return;
-            }
-
-            gameplayStarted = true;
-        }
-
-        private void ensureAllStopped()
-        {
-            foreach (var inst in instances)
-                inst?.PauseGameplay();
-        }
-
-        private void ensurePlaying(double targetTrackTime)
-        {
             foreach (var inst in instances)
             {
                 Debug.Assert(inst != null);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
index acac753fe2..ca58d888fa 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
-using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Users;

From eccd269ccee483973c260daa44a0dddc7740f9c0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 20:17:57 +0900
Subject: [PATCH 2300/3722] Implement maximum start delay

---
 .../Multiplayer/TestSceneMultiplayerScreen.cs |  2 +-
 .../Spectate/MultiplayerSpectator.cs          | 26 ++++++++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerScreen.cs
index d085827986..897219dbad 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerScreen.cs
@@ -110,7 +110,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             loadSpectateScreen();
 
             // Send frames for one player only, both should remain paused.
-            sendFrames(55, 20);
+            sendFrames(55, 1000);
             checkPausedInstant(55, true);
             checkPausedInstant(56, true);
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index b0747f5027..d8ec25fedb 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.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.Diagnostics;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -16,6 +17,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
     public class MultiplayerSpectator : SpectatorScreen
     {
         private const double min_duration_to_allow_playback = 50;
+        private const double maximum_start_delay = 15000;
 
         // Isolates beatmap/ruleset to this screen.
         public override bool DisallowExternalBeatmapRulesetChanges => true;
@@ -28,6 +30,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         private readonly PlayerInstance[] instances;
         private PlayerGrid grid;
         private MultiplayerSpectatorLeaderboard leaderboard;
+        private double? loadStartTime;
 
         public MultiplayerSpectator(int[] userIds)
             : base(userIds.AsSpan().Slice(0, Math.Min(16, userIds.Length)).ToArray())
@@ -72,22 +75,39 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         protected override void UpdateAfterChildren()
         {
             base.UpdateAfterChildren();
+
+            loadStartTime ??= Time.Current;
+
             updateGameplayPlayingState();
         }
 
+        private bool canStartGameplay =>
+            // All players must be loaded.
+            AllPlayersLoaded
+            && (
+                // All players have frames...
+                instances.All(i => i.Score.Replay.Frames.Count > 0)
+                // Or any player has frames and the maximum start delay has been exceeded.
+                || (Time.Current - loadStartTime > maximum_start_delay
+                    && instances.Any(i => i.Score.Replay.Frames.Count > 0))
+            );
+
         private void updateGameplayPlayingState()
         {
             // Make sure all players are loaded and have frames before starting any.
-            if (!AllPlayersLoaded || !instances.All(i => i.Score.Replay.Frames.Count > 0))
+            if (!canStartGameplay)
             {
                 foreach (var inst in instances)
                     inst?.PauseGameplay();
                 return;
             }
 
-            double targetTrackTime = instances.Select(i => i.GetCurrentGameplayTime()).Max();
+            // Not all instances may be in a valid gameplay state (see canStartGameplay). Only control the ones that are.
+            IEnumerable<PlayerInstance> validInstances = instances.Where(i => i.Score.Replay.Frames.Count > 0);
 
-            foreach (var inst in instances)
+            double targetTrackTime = validInstances.Select(i => i.GetCurrentTrackTime()).Max();
+
+            foreach (var inst in validInstances)
             {
                 Debug.Assert(inst != null);
 

From 61c400b1a1187a17a17467a02a061fb87dca65f4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 20:18:26 +0900
Subject: [PATCH 2301/3722] Fix filename

---
 ...SceneMultiplayerScreen.cs => TestSceneMultiplayerSpectator.cs} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename osu.Game.Tests/Visual/Multiplayer/{TestSceneMultiplayerScreen.cs => TestSceneMultiplayerSpectator.cs} (100%)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
similarity index 100%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerScreen.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs

From 3e46d6401eeaef7a63ed6506f8b8d2840b53767c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 20:22:30 +0900
Subject: [PATCH 2302/3722] Remove some unnecessary code

---
 .../Multiplayer/Spectate/MultiplayerSpectator.cs      |  2 +-
 .../OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index d8ec25fedb..db5de45f72 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         }
 
         private bool canStartGameplay =>
-            // All players must be loaded.
+            // All players must be loaded, and...
             AllPlayersLoaded
             && (
                 // All players have frames...
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
index ca58d888fa..6b5f102543 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
@@ -7,7 +7,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
-using osu.Game.Rulesets;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Users;
@@ -24,7 +23,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         public User User => Score.ScoreInfo.User;
 
         public WorkingBeatmap Beatmap { get; private set; }
-        public Ruleset Ruleset { get; private set; }
 
         public readonly Score Score;
 
@@ -43,7 +41,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         private void load(BeatmapManager beatmapManager)
         {
             Beatmap = beatmapManager.GetWorkingBeatmap(Score.ScoreInfo.Beatmap, bypassCache: true);
-            Ruleset = Score.ScoreInfo.Ruleset.CreateInstance();
 
             InternalChild = new GameplayIsolationContainer(Beatmap, Score.ScoreInfo.Ruleset, Score.ScoreInfo.Mods)
             {
@@ -87,15 +84,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 return;
 
             if (catchupRequired)
-            {
                 Beatmap.Track.AddAdjustment(AdjustableProperty.Frequency, catchupFrequencyAdjustment);
-                isCatchingUp = true;
-            }
             else
-            {
                 Beatmap.Track.RemoveAdjustment(AdjustableProperty.Frequency, catchupFrequencyAdjustment);
-                isCatchingUp = false;
-            }
+
+            isCatchingUp = catchupRequired;
         }
 
         public double GetCurrentGameplayTime()

From 6eddc6c59e6c63c219798bc0fb92a59e0d3c3b96 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 21:03:45 +0900
Subject: [PATCH 2303/3722] Enable spectating multiplayer matches

---
 .../Online/Multiplayer/MultiplayerClient.cs   |  3 ---
 .../Screens/OnlinePlay/Match/RoomSubScreen.cs |  6 ++++--
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 20 +++++++++++++++----
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 37e11cc576..4529dfd0a7 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -96,9 +96,6 @@ namespace osu.Game.Online.Multiplayer
             if (!IsConnected.Value)
                 return Task.CompletedTask;
 
-            if (newState == MultiplayerUserState.Spectating)
-                return Task.CompletedTask; // Not supported yet.
-
             return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeState), newState);
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 706da05d15..0d1ed5d88e 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -148,10 +148,12 @@ namespace osu.Game.Screens.OnlinePlay.Match
             return base.OnExiting(next);
         }
 
-        protected void StartPlay(Func<Player> player)
+        protected void StartPlay(Func<Player> player) => PushTopLevelScreen(() => new PlayerLoader(player));
+
+        protected void PushTopLevelScreen(Func<Screen> screen)
         {
             sampleStart?.Play();
-            ParentScreen?.Push(new PlayerLoader(player));
+            ParentScreen?.Push(screen());
         }
 
         private void selectedItemChanged()
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 90cef0107c..035eba4f30 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -25,6 +25,7 @@ using osu.Game.Screens.OnlinePlay.Match;
 using osu.Game.Screens.OnlinePlay.Match.Components;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Participants;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Users;
 using osuTK;
@@ -405,11 +406,22 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             }
         }
 
-        private void onRoomUpdated()
+        private void onRoomUpdated() => Scheduler.Add(() =>
         {
-            // user mods may have changed.
-            Scheduler.AddOnce(UpdateMods);
-        }
+            if (client.Room == null)
+                return;
+
+            Debug.Assert(client.LocalUser != null);
+
+            UpdateMods();
+
+            if (client.LocalUser.State == MultiplayerUserState.Spectating
+                && (client.Room.State == MultiplayerRoomState.Playing || client.Room.State == MultiplayerRoomState.WaitingForLoad)
+                && ParentScreen.IsCurrentScreen())
+            {
+                PushTopLevelScreen(() => new MultiplayerSpectator(client.CurrentMatchPlayingUserIds.ToArray()));
+            }
+        });
 
         private void onLoadRequested()
         {

From 4409c1a36f18dbae1484dd6ef65413a275e0b57b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 9 Apr 2021 22:01:21 +0900
Subject: [PATCH 2304/3722] Increase sync offset to prevent constant catchups

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

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
index 6b5f102543..f0994ec375 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
     public class PlayerInstance : CompositeDrawable
     {
         private const double catchup_rate = 2;
-        private const double max_sync_offset = catchup_rate * 2; // Double the catchup rate to prevent ringing.
+        private const double max_sync_offset = 50;
 
         public bool PlayerLoaded => stack?.CurrentScreen is Player;
 

From 8a0da06e89eed9d93c32db7b045e6bd3c021853b Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Fri, 9 Apr 2021 22:40:21 +0900
Subject: [PATCH 2305/3722] Add a hover sample type for SongSelect buttons

---
 osu.Game/Graphics/UserInterface/HoverSounds.cs | 5 ++++-
 osu.Game/Screens/Select/FooterButton.cs        | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/UserInterface/HoverSounds.cs b/osu.Game/Graphics/UserInterface/HoverSounds.cs
index 00cf5798e7..49bcc3759b 100644
--- a/osu.Game/Graphics/UserInterface/HoverSounds.cs
+++ b/osu.Game/Graphics/UserInterface/HoverSounds.cs
@@ -53,6 +53,9 @@ namespace osu.Game.Graphics.UserInterface
         Soft,
 
         [Description("-toolbar")]
-        Toolbar
+        Toolbar,
+
+        [Description("-songselect")]
+        SongSelect
     }
 }
diff --git a/osu.Game/Screens/Select/FooterButton.cs b/osu.Game/Screens/Select/FooterButton.cs
index 7528651fd9..afb3943a09 100644
--- a/osu.Game/Screens/Select/FooterButton.cs
+++ b/osu.Game/Screens/Select/FooterButton.cs
@@ -14,6 +14,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.Containers;
 using osu.Game.Input.Bindings;
 using osu.Framework.Input.Bindings;
+using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Screens.Select
 {
@@ -65,6 +66,7 @@ namespace osu.Game.Screens.Select
         private readonly Box light;
 
         public FooterButton()
+            : base(HoverSampleSet.SongSelect)
         {
             AutoSizeAxes = Axes.Both;
             Shear = SHEAR;

From ffacd38e573bb0f7b01a531bfde6c1ca9383ac96 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Fri, 9 Apr 2021 22:41:51 +0900
Subject: [PATCH 2306/3722] Reduce the randomised pitch range of hover sounds

---
 osu.Game/Graphics/UserInterface/HoverSounds.cs     | 2 +-
 osu.Game/Screens/Select/Carousel/CarouselHeader.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/HoverSounds.cs b/osu.Game/Graphics/UserInterface/HoverSounds.cs
index 00cf5798e7..4ba79236d9 100644
--- a/osu.Game/Graphics/UserInterface/HoverSounds.cs
+++ b/osu.Game/Graphics/UserInterface/HoverSounds.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Graphics.UserInterface
 
         public override void PlayHoverSample()
         {
-            sampleHover.Frequency.Value = 0.96 + RNG.NextDouble(0.08);
+            sampleHover.Frequency.Value = 0.98 + RNG.NextDouble(0.04);
             sampleHover.Play();
         }
     }
diff --git a/osu.Game/Screens/Select/Carousel/CarouselHeader.cs b/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
index 2fbf64de29..40ca3e0764 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselHeader.cs
@@ -152,7 +152,7 @@ namespace osu.Game.Screens.Select.Carousel
             {
                 if (sampleHover == null) return;
 
-                sampleHover.Frequency.Value = 0.90 + RNG.NextDouble(0.2);
+                sampleHover.Frequency.Value = 0.99 + RNG.NextDouble(0.02);
                 sampleHover.Play();
             }
         }

From bfd3d0cce978c77d4bfa7bbe1a15262e4cc23c80 Mon Sep 17 00:00:00 2001
From: Samuel Cattini-Schultz <syriiins@gmail.com>
Date: Sat, 10 Apr 2021 01:16:54 +1000
Subject: [PATCH 2307/3722] Implement custom enumerator for ReverseQueue to
 avoid allocations

---
 .../Rulesets/Difficulty/Utils/ReverseQueue.cs | 31 ++++++++++++++++---
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Difficulty/Utils/ReverseQueue.cs b/osu.Game/Rulesets/Difficulty/Utils/ReverseQueue.cs
index f104b8105a..57db9df3ca 100644
--- a/osu.Game/Rulesets/Difficulty/Utils/ReverseQueue.cs
+++ b/osu.Game/Rulesets/Difficulty/Utils/ReverseQueue.cs
@@ -101,12 +101,33 @@ namespace osu.Game.Rulesets.Difficulty.Utils
         /// <summary>
         /// Returns an enumerator which enumerates items in the <see cref="ReverseQueue{T}"/> starting from the most recently enqueued item.
         /// </summary>
-        public IEnumerator<T> GetEnumerator()
-        {
-            for (int i = Count - 1; i >= 0; i--)
-                yield return items[(start + i) % capacity];
-        }
+        public IEnumerator<T> GetEnumerator() => new Enumerator(this);
 
         IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+        public struct Enumerator : IEnumerator<T>
+        {
+            private ReverseQueue<T> reverseQueue;
+            private int currentIndex;
+
+            internal Enumerator(ReverseQueue<T> reverseQueue)
+            {
+                this.reverseQueue = reverseQueue;
+                currentIndex = -1; // The first MoveNext() should bring the iterator to 0
+            }
+
+            public bool MoveNext() => ++currentIndex < reverseQueue.Count;
+
+            public void Reset() => currentIndex = -1;
+
+            public readonly T Current => reverseQueue[currentIndex];
+
+            readonly object IEnumerator.Current => Current;
+
+            public void Dispose()
+            {
+                reverseQueue = null;
+            }
+        }
     }
 }

From affc878db9ff3a0e322dc5d25c8bfcbb76d98a33 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 10 Apr 2021 01:03:15 +0900
Subject: [PATCH 2308/3722] Update resources

---
 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 cba3975209..31308b80d8 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -51,7 +51,7 @@
     <Reference Include="Java.Interop" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.410.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2021.407.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 292e5b932f..16b888a064 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -30,7 +30,7 @@
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.407.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.410.0" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 36e581a80c..f72a1eb256 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.407.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.410.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
   <PropertyGroup>

From b66ef2fdec193cc0227e974c56de92937aabf73b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 10 Apr 2021 02:14:28 +0900
Subject: [PATCH 2309/3722] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 31308b80d8..196d122a2a 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.410.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.407.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.410.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 16b888a064..71a6f0e5cd 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.407.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.410.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.410.0" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index f72a1eb256..a389cc13dd 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.407.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.410.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.410.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.407.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.410.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 08311abc5ec93907337976e0d8ae0209684ef769 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Fri, 9 Apr 2021 17:55:41 -0400
Subject: [PATCH 2310/3722] Remove setters, cache CreatePowerStatus() and use a
 dummy LocalPowerStatus class in test scene

---
 osu.Android/OsuGameAndroid.cs                 |  7 ++-
 osu.Desktop/OsuGameDesktop.cs                 |  2 -
 .../Visual/Gameplay/TestScenePlayerLoader.cs  | 44 +++++++++++++++----
 osu.Game/Configuration/SessionStatics.cs      |  4 +-
 osu.Game/OsuGame.cs                           |  5 +++
 osu.Game/OsuGameBase.cs                       |  4 +-
 osu.Game/Screens/Play/PlayerLoader.cs         | 11 ++---
 osu.Game/Tests/OsuTestBrowser.cs              |  6 ---
 osu.Game/Utils/PowerStatus.cs                 | 26 ++++++-----
 osu.iOS/OsuGameIOS.cs                         | 12 ++---
 10 files changed, 74 insertions(+), 47 deletions(-)

diff --git a/osu.Android/OsuGameAndroid.cs b/osu.Android/OsuGameAndroid.cs
index a0c6a1e354..02f4fa1ad6 100644
--- a/osu.Android/OsuGameAndroid.cs
+++ b/osu.Android/OsuGameAndroid.cs
@@ -21,7 +21,6 @@ namespace osu.Android
             : base(null)
         {
             gameActivity = activity;
-            PowerStatus = new AndroidPowerStatus();
         }
 
         public override Version AssemblyVersion
@@ -76,8 +75,12 @@ namespace osu.Android
 
         protected override UpdateManager CreateUpdateManager() => new SimpleUpdateManager();
 
-        public class AndroidPowerStatus : PowerStatus
+        protected override PowerStatus CreatePowerStatus() => new AndroidPowerStatus();
+
+        private class AndroidPowerStatus : PowerStatus
         {
+            public override double BatteryCutoff => 0.20;
+
             public override double ChargeLevel => Battery.ChargeLevel;
 
             public override bool IsCharging => Battery.PowerSource != BatteryPowerSource.Battery;
diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index 48e28fa251..0c21c75290 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -21,7 +21,6 @@ using osu.Game.Updater;
 using osu.Desktop.Windows;
 using osu.Framework.Threading;
 using osu.Game.IO;
-using osu.Game.Utils;
 
 namespace osu.Desktop
 {
@@ -34,7 +33,6 @@ namespace osu.Desktop
             : base(args)
         {
             noVersionOverlay = args?.Any(a => a == "--no-version-overlay") ?? false;
-            PowerStatus = new DefaultPowerStatus();
         }
 
         public override StableStorage GetStorageForStableInstall()
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index 1377459c62..36958b0741 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -49,8 +49,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached]
         private readonly VolumeOverlay volumeOverlay;
 
-        [Resolved]
-        private PowerStatus powerStatus { get; set; }
+        [Cached(typeof(PowerStatus))]
+        private readonly LocalPowerStatus powerStatus = new LocalPowerStatus();
 
         private readonly ChangelogOverlay changelogOverlay;
 
@@ -292,22 +292,22 @@ namespace osu.Game.Tests.Visual.Gameplay
             }
         }
 
-        [TestCase(false, 1.0)] // not charging, full battery --> no warning
+        [TestCase(false, 1.0)] // not charging, above cutoff --> no warning
         [TestCase(false, 0.2)] // not charging, at cutoff --> warning
-        [TestCase(false, 0.1)] // charging, below cutoff --> warning
+        [TestCase(true, 0.1)] // charging, below cutoff --> no warning
         public void TestLowBatteryNotification(bool isCharging, double chargeLevel)
         {
-            AddStep("reset notification lock", () => sessionStatics.GetBindable<bool>(Static.BatteryLowNotificationShownOnce).Value = false);
+            AddStep("reset notification lock", () => sessionStatics.GetBindable<bool>(Static.LowBatteryNotificationShownOnce).Value = false);
 
             // set charge status and level
             AddStep("load player", () => resetPlayer(false, () =>
             {
-                powerStatus.IsCharging = isCharging;
-                powerStatus.ChargeLevel = chargeLevel;
+                powerStatus.SetCharging(isCharging);
+                powerStatus.SetChargeLevel(chargeLevel);
             }));
             AddUntilStep("wait for player", () => player?.LoadState == LoadState.Ready);
-            int notificationCount = !isCharging && chargeLevel <= powerStatus.BatteryCutoff ? 1 : 0;
-            AddAssert("check for notification", () => notificationOverlay.UnreadCount.Value == notificationCount);
+            int warning = !isCharging && chargeLevel <= powerStatus.BatteryCutoff ? 1 : 0;
+            AddAssert($"notification {(warning == 1 ? "triggered" : "not triggered")}", () => notificationOverlay.UnreadCount.Value == warning);
             AddStep("click notification", () =>
             {
                 var scrollContainer = (OsuScrollContainer)notificationOverlay.Children.Last();
@@ -380,5 +380,31 @@ namespace osu.Game.Tests.Visual.Gameplay
                     throw new TimeoutException();
             }
         }
+
+        /// <summary>
+        /// Mutable dummy PowerStatus class for <see cref="TestScenePlayerLoader.TestLowBatteryNotification"/>
+        /// </summary>
+        /// <inheritdoc/>
+        private class LocalPowerStatus : PowerStatus
+        {
+            private bool isCharging = true;
+            private double chargeLevel = 1;
+
+            public override double BatteryCutoff => 0.2;
+
+            public override bool IsCharging => isCharging;
+
+            public override double ChargeLevel => chargeLevel;
+
+            public void SetCharging(bool value)
+            {
+                isCharging = value;
+            }
+
+            public void SetChargeLevel(double value)
+            {
+                chargeLevel = value;
+            }
+        }
     }
 }
diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index e8ee04731c..71e1a1efcc 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Configuration
         {
             SetDefault(Static.LoginOverlayDisplayed, false);
             SetDefault(Static.MutedAudioNotificationShownOnce, false);
-            SetDefault(Static.BatteryLowNotificationShownOnce, false);
+            SetDefault(Static.LowBatteryNotificationShownOnce, false);
             SetDefault(Static.LastHoverSoundPlaybackTime, (double?)null);
             SetDefault<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null);
         }
@@ -26,7 +26,7 @@ namespace osu.Game.Configuration
     {
         LoginOverlayDisplayed,
         MutedAudioNotificationShownOnce,
-        BatteryLowNotificationShownOnce,
+        LowBatteryNotificationShownOnce,
 
         /// <summary>
         /// Info about seasonal backgrounds available fetched from API - see <see cref="APISeasonalBackgrounds"/>.
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 809e5d3c1b..277455b7d3 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -694,6 +694,11 @@ namespace osu.Game
             loadComponentSingleFile(new AccountCreationOverlay(), topMostOverlayContent.Add, true);
             loadComponentSingleFile(new DialogOverlay(), topMostOverlayContent.Add, true);
 
+            if (CreatePowerStatus() != null)
+            {
+                dependencies.CacheAs(CreatePowerStatus());
+            }
+
             chatOverlay.State.ValueChanged += state => channelManager.HighPollRate.Value = state.NewValue == Visibility.Visible;
 
             Add(externalLinkOpener = new ExternalLinkOpener());
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index a907afd8af..1b10de614a 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -96,7 +96,7 @@ namespace osu.Game
 
         protected Storage Storage { get; set; }
 
-        protected PowerStatus PowerStatus;
+        protected virtual PowerStatus CreatePowerStatus() => null;
 
         [Cached]
         [Cached(typeof(IBindable<RulesetInfo>))]
@@ -332,8 +332,6 @@ namespace osu.Game
             dependencies.CacheAs(MusicController);
 
             Ruleset.BindValueChanged(onRulesetChanged);
-
-            dependencies.CacheAs(PowerStatus);
         }
 
         private void onRulesetChanged(ValueChangedEvent<RulesetInfo> r)
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index e1ab0b8ef5..d342bf8273 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -113,7 +113,7 @@ namespace osu.Game.Screens.Play
         [Resolved]
         private AudioManager audioManager { get; set; }
 
-        [Resolved]
+        [Resolved(CanBeNull = true)]
         private PowerStatus powerStatus { get; set; }
 
         public PlayerLoader(Func<Player> createPlayer)
@@ -125,7 +125,7 @@ namespace osu.Game.Screens.Play
         private void load(SessionStatics sessionStatics)
         {
             muteWarningShownOnce = sessionStatics.GetBindable<bool>(Static.MutedAudioNotificationShownOnce);
-            batteryWarningShownOnce = sessionStatics.GetBindable<bool>(Static.BatteryLowNotificationShownOnce);
+            batteryWarningShownOnce = sessionStatics.GetBindable<bool>(Static.LowBatteryNotificationShownOnce);
 
             InternalChild = (content = new LogoTrackingContainer
             {
@@ -483,10 +483,11 @@ namespace osu.Game.Screens.Play
 
         private void showBatteryWarningIfNeeded()
         {
+            if (powerStatus == null) return;
+
             if (!batteryWarningShownOnce.Value)
             {
-                // Checks if the notification has not been shown yet, device is unplugged and if device battery is at or below the cutoff
-                if (!powerStatus.IsCharging && powerStatus.ChargeLevel <= powerStatus.BatteryCutoff)
+                if (powerStatus.IsLowBattery)
                 {
                     notificationOverlay?.Post(new BatteryWarningNotification());
                     batteryWarningShownOnce.Value = true;
@@ -500,7 +501,7 @@ namespace osu.Game.Screens.Play
 
             public BatteryWarningNotification()
             {
-                Text = "Your battery level is low! Charge your device to prevent interruptions.";
+                Text = "Your battery level is low! Charge your device to prevent interruptions during gameplay.";
             }
 
             [BackgroundDependencyLoader]
diff --git a/osu.Game/Tests/OsuTestBrowser.cs b/osu.Game/Tests/OsuTestBrowser.cs
index d4fa2a11d3..71b0b02fa6 100644
--- a/osu.Game/Tests/OsuTestBrowser.cs
+++ b/osu.Game/Tests/OsuTestBrowser.cs
@@ -7,17 +7,11 @@ using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Graphics;
 using osu.Game.Screens.Backgrounds;
-using osu.Game.Utils;
 
 namespace osu.Game.Tests
 {
     public class OsuTestBrowser : OsuGameBase
     {
-        public OsuTestBrowser()
-        {
-            PowerStatus = new DefaultPowerStatus();
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
diff --git a/osu.Game/Utils/PowerStatus.cs b/osu.Game/Utils/PowerStatus.cs
index 1caed5b6fa..77d531710e 100644
--- a/osu.Game/Utils/PowerStatus.cs
+++ b/osu.Game/Utils/PowerStatus.cs
@@ -3,21 +3,27 @@
 
 namespace osu.Game.Utils
 {
+    /// <summary>
+    /// Provides access to the system's power status.
+    /// Currently implemented on iOS and Android only.
+    /// </summary>
     public abstract class PowerStatus
     {
         /// <summary>
-        /// The maximum battery level before a warning notification
-        /// is sent.
+        /// The maximum battery level considered as low, from 0 to 1.
         /// </summary>
-        public virtual double BatteryCutoff { get; } = 0.2;
+        public virtual double BatteryCutoff { get; } = 0;
 
-        public virtual double ChargeLevel { get; set; }
-        public virtual bool IsCharging { get; set; }
-    }
+        /// <summary>
+        /// The charge level of the battery, from 0 to 1.
+        /// </summary>
+        public virtual double ChargeLevel { get; } = 0;
 
-    public class DefaultPowerStatus : PowerStatus
-    {
-        public override double ChargeLevel { get; set; } = 1;
-        public override bool IsCharging { get; set; } = true;
+        public virtual bool IsCharging { get; } = false;
+
+        /// <summary>
+        /// Returns true if <see cref="IsCharging"/> = false and <see cref="ChargeLevel"/> &lt;= <see cref="BatteryCutoff"/>.
+        /// </summary>
+        public bool IsLowBattery => !IsCharging && ChargeLevel <= BatteryCutoff;
     }
 }
diff --git a/osu.iOS/OsuGameIOS.cs b/osu.iOS/OsuGameIOS.cs
index d417fa8f8d..b53b594eae 100644
--- a/osu.iOS/OsuGameIOS.cs
+++ b/osu.iOS/OsuGameIOS.cs
@@ -12,20 +12,16 @@ namespace osu.iOS
 {
     public class OsuGameIOS : OsuGame
     {
-        public OsuGameIOS()
-            : base(null)
-        {
-            PowerStatus = new IOSPowerStatus();
-        }
         public override Version AssemblyVersion => new Version(NSBundle.MainBundle.InfoDictionary["CFBundleVersion"].ToString());
 
         protected override UpdateManager CreateUpdateManager() => new SimpleUpdateManager();
 
-        public class IOSPowerStatus : PowerStatus
+        protected override PowerStatus CreatePowerStatus() => new IOSPowerStatus();
+
+        private class IOSPowerStatus : PowerStatus
         {
-            // The low battery alert appears at 20% on iOS
-            // https://github.com/ppy/osu/issues/12239
             public override double BatteryCutoff => 0.25;
+
             public override double ChargeLevel => Battery.ChargeLevel;
 
             public override bool IsCharging => Battery.PowerSource != BatteryPowerSource.Battery;

From 43174b708c007e7bf8156fd3f6a01a6f8313a024 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sat, 10 Apr 2021 12:58:40 +0200
Subject: [PATCH 2311/3722] Remove visibility settings

Can look into this later, not really important for a first iteration.
---
 osu.Game/Screens/Edit/Verify/IssueSettings.cs |  1 -
 .../Screens/Edit/Verify/VisibilitySettings.cs | 52 -------------------
 2 files changed, 53 deletions(-)
 delete mode 100644 osu.Game/Screens/Edit/Verify/VisibilitySettings.cs

diff --git a/osu.Game/Screens/Edit/Verify/IssueSettings.cs b/osu.Game/Screens/Edit/Verify/IssueSettings.cs
index 608be877de..4519231cd2 100644
--- a/osu.Game/Screens/Edit/Verify/IssueSettings.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueSettings.cs
@@ -41,7 +41,6 @@ namespace osu.Game.Screens.Edit.Verify
 
         private IReadOnlyList<Drawable> createSections() => new Drawable[]
         {
-            new VisibilitySettings()
         };
     }
 }
diff --git a/osu.Game/Screens/Edit/Verify/VisibilitySettings.cs b/osu.Game/Screens/Edit/Verify/VisibilitySettings.cs
deleted file mode 100644
index 6488c616e4..0000000000
--- a/osu.Game/Screens/Edit/Verify/VisibilitySettings.cs
+++ /dev/null
@@ -1,52 +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.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics.UserInterfaceV2;
-using osuTK;
-
-namespace osu.Game.Screens.Edit.Verify
-{
-    internal class VisibilitySettings : CompositeDrawable
-    {
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Axes.Y;
-
-            Padding = new MarginPadding(10);
-
-            InternalChildren = new Drawable[]
-            {
-                new FillFlowContainer
-                {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Spacing = new Vector2(10),
-                    Direction = FillDirection.Vertical,
-                    Children = new Drawable[]
-                    {
-                        new LabelledSwitchButton
-                        {
-                            Label = "Show problems",
-                            Current = new Bindable<bool>(true)
-                        },
-                        new LabelledSwitchButton
-                        {
-                            Label = "Show warnings",
-                            Current = new Bindable<bool>(true)
-                        },
-                        new LabelledSwitchButton
-                        {
-                            Label = "Show negligibles"
-                        }
-                    }
-                },
-            };
-        }
-    }
-}

From d1007ff26aa9b2f9827e666125d0161dba6fd35f Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sat, 10 Apr 2021 13:02:22 +0200
Subject: [PATCH 2312/3722] Move components to more appropriate spot

---
 osu.Game.Rulesets.Osu/Edit/OsuChecker.cs      |  2 +-
 osu.Game/Rulesets/Edit/Checker.cs             |  4 +--
 .../Edit/Checks}/Components/BeatmapCheck.cs   |  2 +-
 .../Edit/Checks}/Components/Check.cs          |  2 +-
 .../Edit/Checks}/Components/CheckMetadata.cs  |  2 +-
 .../Edit/Checks}/Components/Issue.cs          | 25 +++++++++++--------
 .../Edit/Checks}/Components/IssueTemplate.cs  |  2 +-
 osu.Game/Screens/Edit/Verify/IssueTable.cs    |  2 +-
 8 files changed, 22 insertions(+), 19 deletions(-)
 rename osu.Game/{Screens/Edit/Verify => Rulesets/Edit/Checks}/Components/BeatmapCheck.cs (92%)
 rename osu.Game/{Screens/Edit/Verify => Rulesets/Edit/Checks}/Components/Check.cs (96%)
 rename osu.Game/{Screens/Edit/Verify => Rulesets/Edit/Checks}/Components/CheckMetadata.cs (97%)
 rename osu.Game/{Screens/Edit/Verify => Rulesets/Edit/Checks}/Components/Issue.cs (79%)
 rename osu.Game/{Screens/Edit/Verify => Rulesets/Edit/Checks}/Components/IssueTemplate.cs (98%)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs b/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs
index 9918b53c85..df3847f2fe 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs
@@ -5,8 +5,8 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Edit.Checks.Components;
 using osu.Game.Rulesets.Osu.Edit.Checks;
-using osu.Game.Screens.Edit.Verify.Components;
 
 namespace osu.Game.Rulesets.Osu.Edit
 {
diff --git a/osu.Game/Rulesets/Edit/Checker.cs b/osu.Game/Rulesets/Edit/Checker.cs
index 1c267c3435..9bebfc0668 100644
--- a/osu.Game/Rulesets/Edit/Checker.cs
+++ b/osu.Game/Rulesets/Edit/Checker.cs
@@ -4,8 +4,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
-using osu.Game.Checks;
-using osu.Game.Screens.Edit.Verify.Components;
+using osu.Game.Rulesets.Edit.Checks;
+using osu.Game.Rulesets.Edit.Checks.Components;
 
 namespace osu.Game.Rulesets.Edit
 {
diff --git a/osu.Game/Screens/Edit/Verify/Components/BeatmapCheck.cs b/osu.Game/Rulesets/Edit/Checks/Components/BeatmapCheck.cs
similarity index 92%
rename from osu.Game/Screens/Edit/Verify/Components/BeatmapCheck.cs
rename to osu.Game/Rulesets/Edit/Checks/Components/BeatmapCheck.cs
index 7297dab60d..d0f93b5eef 100644
--- a/osu.Game/Screens/Edit/Verify/Components/BeatmapCheck.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/BeatmapCheck.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using osu.Game.Beatmaps;
 
-namespace osu.Game.Screens.Edit.Verify.Components
+namespace osu.Game.Rulesets.Edit.Checks.Components
 {
     public abstract class BeatmapCheck : Check<IBeatmap>
     {
diff --git a/osu.Game/Screens/Edit/Verify/Components/Check.cs b/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
similarity index 96%
rename from osu.Game/Screens/Edit/Verify/Components/Check.cs
rename to osu.Game/Rulesets/Edit/Checks/Components/Check.cs
index 2ae21fd350..228c11f0f3 100644
--- a/osu.Game/Screens/Edit/Verify/Components/Check.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 
-namespace osu.Game.Screens.Edit.Verify.Components
+namespace osu.Game.Rulesets.Edit.Checks.Components
 {
     public abstract class Check
     {
diff --git a/osu.Game/Screens/Edit/Verify/Components/CheckMetadata.cs b/osu.Game/Rulesets/Edit/Checks/Components/CheckMetadata.cs
similarity index 97%
rename from osu.Game/Screens/Edit/Verify/Components/CheckMetadata.cs
rename to osu.Game/Rulesets/Edit/Checks/Components/CheckMetadata.cs
index 1cac99d47d..5a226729ad 100644
--- a/osu.Game/Screens/Edit/Verify/Components/CheckMetadata.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/CheckMetadata.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.
 
-namespace osu.Game.Screens.Edit.Verify
+namespace osu.Game.Rulesets.Edit.Checks.Components
 {
     public class CheckMetadata
     {
diff --git a/osu.Game/Screens/Edit/Verify/Components/Issue.cs b/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
similarity index 79%
rename from osu.Game/Screens/Edit/Verify/Components/Issue.cs
rename to osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
index fe81cb9335..0f835202e7 100644
--- a/osu.Game/Screens/Edit/Verify/Components/Issue.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using osu.Game.Extensions;
 using osu.Game.Rulesets.Objects;
 
-namespace osu.Game.Screens.Edit.Verify.Components
+namespace osu.Game.Rulesets.Edit.Checks.Components
 {
     public class Issue
     {
@@ -39,7 +39,7 @@ namespace osu.Game.Screens.Edit.Verify.Components
         public Issue(IssueTemplate template, params object[] args)
         {
             Time = null;
-            HitObjects = System.Array.Empty<HitObject>();
+            HitObjects = Array.Empty<HitObject>();
             Template = template;
             Arguments = args;
 
@@ -57,11 +57,20 @@ namespace osu.Game.Screens.Edit.Verify.Components
             Time = time;
         }
 
+        public Issue(HitObject hitObject, IssueTemplate template, params object[] args)
+            : this(template, args)
+        {
+            Time = hitObject.StartTime;
+            HitObjects = new[] { hitObject };
+        }
+
         public Issue(IEnumerable<HitObject> hitObjects, IssueTemplate template, params object[] args)
             : this(template, args)
         {
-            Time = hitObjects.FirstOrDefault()?.StartTime;
-            HitObjects = hitObjects.ToArray();
+            var hitObjectList = hitObjects.ToList();
+
+            Time = hitObjectList.FirstOrDefault()?.StartTime;
+            HitObjects = hitObjectList;
         }
 
         public override string ToString()
@@ -71,13 +80,7 @@ namespace osu.Game.Screens.Edit.Verify.Components
 
         public string GetEditorTimestamp()
         {
-            // TODO: Editor timestamp formatting is handled in https://github.com/ppy/osu/pull/12030
-            // We may be able to use that here too (if we decouple it from the HitObjectComposer class).
-
-            if (Time == null)
-                return string.Empty;
-
-            return Time.Value.ToEditorFormattedString();
+            return Time == null ? string.Empty : Time.Value.ToEditorFormattedString();
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Verify/Components/IssueTemplate.cs b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
similarity index 98%
rename from osu.Game/Screens/Edit/Verify/Components/IssueTemplate.cs
rename to osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
index b178fa7122..7eaabdc59b 100644
--- a/osu.Game/Screens/Edit/Verify/Components/IssueTemplate.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
@@ -5,7 +5,7 @@ using Humanizer;
 using osu.Framework.Graphics;
 using osuTK.Graphics;
 
-namespace osu.Game.Screens.Edit.Verify.Components
+namespace osu.Game.Rulesets.Edit.Checks.Components
 {
     public class IssueTemplate
     {
diff --git a/osu.Game/Screens/Edit/Verify/IssueTable.cs b/osu.Game/Screens/Edit/Verify/IssueTable.cs
index c70695a849..20dceb5333 100644
--- a/osu.Game/Screens/Edit/Verify/IssueTable.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueTable.cs
@@ -13,7 +13,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Input.Bindings;
-using osu.Game.Screens.Edit.Verify.Components;
+using osu.Game.Rulesets.Edit.Checks.Components;
 using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Verify

From b30e41b805ffb7196851c42fc7c8b36c2828df0d Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sat, 10 Apr 2021 13:02:36 +0200
Subject: [PATCH 2313/3722] Fix comment; mode -> ruleset

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

diff --git a/osu.Game/Rulesets/Edit/Checker.cs b/osu.Game/Rulesets/Edit/Checker.cs
index 9bebfc0668..6687160b10 100644
--- a/osu.Game/Rulesets/Edit/Checker.cs
+++ b/osu.Game/Rulesets/Edit/Checker.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Edit
 {
     public abstract class Checker
     {
-        // These are all mode-invariant, hence here instead of in e.g. `OsuChecker`.
+        // These are all ruleset-invariant, hence here instead of in e.g. `OsuChecker`.
         private readonly List<BeatmapCheck> beatmapChecks = new List<BeatmapCheck>
         {
             new CheckMetadataVowels()

From bc4f3351f38bdf5d7e5812db554ceceeaa6ec2cc Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sat, 10 Apr 2021 13:03:16 +0200
Subject: [PATCH 2314/3722] Replace checks with realistic ones

---
 .../Edit/Checks/CheckConsecutiveCircles.cs    |  86 --------------
 .../Edit/Checks/CheckOffscreenObjects.cs      | 110 ++++++++++++++++++
 osu.Game.Rulesets.Osu/Edit/OsuChecker.cs      |   2 +-
 osu.Game/Checks/CheckMetadataVowels.cs        |  65 -----------
 osu.Game/Rulesets/Edit/Checker.cs             |   2 +-
 .../Rulesets/Edit/Checks/CheckBackground.cs   |  57 +++++++++
 6 files changed, 169 insertions(+), 153 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Osu/Edit/Checks/CheckConsecutiveCircles.cs
 create mode 100644 osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
 delete mode 100644 osu.Game/Checks/CheckMetadataVowels.cs
 create mode 100644 osu.Game/Rulesets/Edit/Checks/CheckBackground.cs

diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckConsecutiveCircles.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckConsecutiveCircles.cs
deleted file mode 100644
index c41c0dac2b..0000000000
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckConsecutiveCircles.cs
+++ /dev/null
@@ -1,86 +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 osu.Game.Beatmaps;
-using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Screens.Edit.Verify;
-using osu.Game.Screens.Edit.Verify.Components;
-
-namespace osu.Game.Rulesets.Osu.Edit.Checks
-{
-    public class CheckConsecutiveCircles : BeatmapCheck
-    {
-        private const double consecutive_threshold = 3;
-        private const double delta_time_min_expected = 300;
-        private const double delta_time_min_threshold = 100;
-
-        public override CheckMetadata Metadata() => new CheckMetadata
-        (
-            category: CheckMetadata.CheckCategory.Spread,
-            description: "Too many or fast consecutive circles."
-        );
-
-        private IssueTemplate templateManyInARow = new IssueTemplate
-        (
-            type: IssueTemplate.IssueType.Problem,
-            unformattedMessage: "There are {0} circles in a row here, expected at most {1}."
-        );
-
-        private IssueTemplate templateTooFast = new IssueTemplate
-        (
-            type: IssueTemplate.IssueType.Warning,
-            unformattedMessage: "These circles are too fast ({0:0} ms), expected at least {1:0} ms."
-        );
-
-        private IssueTemplate templateAlmostTooFast = new IssueTemplate
-        (
-            type: IssueTemplate.IssueType.Negligible,
-            unformattedMessage: "These circles are almost too fast ({0:0} ms), expected at least {1:0} ms."
-        );
-
-        public override IEnumerable<IssueTemplate> Templates() => new[]
-        {
-            templateManyInARow,
-            templateTooFast,
-            templateAlmostTooFast
-        };
-
-        public override IEnumerable<Issue> Run(IBeatmap beatmap)
-        {
-            List<HitCircle> prevCircles = new List<HitCircle>();
-
-            foreach (HitObject hitobject in beatmap.HitObjects)
-            {
-                if (!(hitobject is HitCircle circle) || hitobject == beatmap.HitObjects.Last())
-                {
-                    if (prevCircles.Count > consecutive_threshold)
-                    {
-                        yield return new Issue(
-                            prevCircles,
-                            templateManyInARow,
-                            prevCircles.Count, consecutive_threshold
-                        );
-                    }
-
-                    prevCircles.Clear();
-                    continue;
-                }
-
-                double? prevDeltaTime = circle.StartTime - prevCircles.LastOrDefault()?.StartTime;
-                prevCircles.Add(circle);
-
-                if (prevDeltaTime == null || prevDeltaTime >= delta_time_min_expected)
-                    continue;
-
-                yield return new Issue(
-                    prevCircles.TakeLast(2),
-                    prevDeltaTime < delta_time_min_threshold ? templateTooFast : templateAlmostTooFast,
-                    prevDeltaTime, delta_time_min_expected
-                );
-            }
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
new file mode 100644
index 0000000000..c47864855b
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -0,0 +1,110 @@
+// Copyright (c) ppy 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;
+using osu.Game.Rulesets.Osu.Objects;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Edit.Checks
+{
+    public class CheckOffscreenObjects : BeatmapCheck
+    {
+        // These are close approximates to the edges of the screen
+        // in gameplay on a 4:3 aspect ratio for osu!stable.
+        private const int min_x = -67;
+        private const int min_y = -60;
+        private const int max_x = 579;
+        private const int max_y = 428;
+
+        // The amount of milliseconds to step through a slider path at a time
+        // (higher = more performant, but higher false-negative chance).
+        private const int path_step_size = 5;
+
+        public override CheckMetadata Metadata() => new CheckMetadata
+        (
+            category: CheckMetadata.CheckCategory.Compose,
+            description: "Offscreen hitobjects."
+        );
+
+        public override IEnumerable<IssueTemplate> Templates() => new[]
+        {
+            templateOffscreen,
+            templateOffscreenSliderPath
+        };
+
+        private readonly IssueTemplate templateOffscreen = new IssueTemplate
+        (
+            type: IssueTemplate.IssueType.Problem,
+            unformattedMessage: "This object goes offscreen on a 4:3 aspect ratio."
+        );
+
+        private readonly IssueTemplate templateOffscreenSliderPath = new IssueTemplate
+        (
+            type: IssueTemplate.IssueType.Problem,
+            unformattedMessage: "This slider goes offscreen here on a 4:3 aspect ratio."
+        );
+
+        public override IEnumerable<Issue> Run(IBeatmap beatmap)
+        {
+            foreach (var hitobject in beatmap.HitObjects)
+            {
+                switch (hitobject)
+                {
+                    case Slider slider:
+                    {
+                        foreach (var issue in sliderIssues(slider))
+                            yield return issue;
+
+                        break;
+                    }
+
+                    case HitCircle circle:
+                    {
+                        if (isOffscreen(circle.StackedPosition, circle.Radius))
+                            yield return new Issue(circle, templateOffscreen);
+
+                        break;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Steps through points on the slider to ensure the entire path is on-screen.
+        /// Returns at most one issue.
+        /// </summary>
+        /// <param name="slider">The slider whose path to check.</param>
+        /// <returns></returns>
+        private IEnumerable<Issue> sliderIssues(Slider slider)
+        {
+            for (int i = 0; i < slider.Distance; i += path_step_size)
+            {
+                double progress = i / slider.Distance;
+                Vector2 position = slider.StackedPositionAt(progress);
+
+                if (!isOffscreen(position, slider.Radius))
+                    continue;
+
+                // `SpanDuration` ensures we don't include reverses.
+                double time = slider.StartTime + progress * slider.SpanDuration;
+                yield return new Issue(slider, templateOffscreenSliderPath) { Time = time };
+
+                yield break;
+            }
+
+            // Above loop may skip the last position in the slider due to step size.
+            if (!isOffscreen(slider.StackedEndPosition, slider.Radius))
+                yield break;
+
+            yield return new Issue(slider, templateOffscreenSliderPath) { Time = slider.EndTime };
+        }
+
+        private bool isOffscreen(Vector2 position, double radius)
+        {
+            return position.X - radius < min_x || position.X + radius > max_x ||
+                   position.Y - radius < min_y || position.Y + radius > max_y;
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs b/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs
index df3847f2fe..ee3b230679 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Osu.Edit
     {
         public readonly List<BeatmapCheck> beatmapChecks = new List<BeatmapCheck>
         {
-            new CheckConsecutiveCircles()
+            new CheckOffscreenObjects()
         };
 
         public override IEnumerable<Issue> Run(IBeatmap beatmap)
diff --git a/osu.Game/Checks/CheckMetadataVowels.cs b/osu.Game/Checks/CheckMetadataVowels.cs
deleted file mode 100644
index 8bcfe89c3a..0000000000
--- a/osu.Game/Checks/CheckMetadataVowels.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System.Collections.Generic;
-using System.Linq;
-using osu.Game.Beatmaps;
-using osu.Game.Screens.Edit.Verify;
-using osu.Game.Screens.Edit.Verify.Components;
-
-namespace osu.Game.Checks
-{
-    public class CheckMetadataVowels : BeatmapCheck
-    {
-        private static readonly char[] vowels = { 'a', 'e', 'i', 'o', 'u' };
-
-        public override CheckMetadata Metadata() => new CheckMetadata
-        (
-            category: CheckMetadata.CheckCategory.Metadata,
-            description: "Metadata fields contain vowels"
-        );
-
-        public override IEnumerable<IssueTemplate> Templates() => new[]
-        {
-            templateArtistHasVowels
-        };
-
-        private IssueTemplate templateArtistHasVowels = new IssueTemplate
-        (
-            type: IssueTemplate.IssueType.Warning,
-            unformattedMessage: "The {0} field \"{1}\" contains the vowel(s) {2}."
-        );
-
-        public override IEnumerable<Issue> Run(IBeatmap beatmap)
-        {
-            foreach (var issue in GetVowelIssues("artist", beatmap.Metadata.Artist))
-                yield return issue;
-
-            foreach (var issue in GetVowelIssues("unicode artist", beatmap.Metadata.ArtistUnicode))
-                yield return issue;
-
-            foreach (var issue in GetVowelIssues("title", beatmap.Metadata.Title))
-                yield return issue;
-
-            foreach (var issue in GetVowelIssues("unicode title", beatmap.Metadata.TitleUnicode))
-                yield return issue;
-        }
-
-        private IEnumerable<Issue> GetVowelIssues(string fieldName, string fieldValue)
-        {
-            if (fieldValue == null)
-                // Unicode fields can be null if same as respective romanized fields.
-                yield break;
-
-            List<char> matches = vowels.Where(c => fieldValue.ToLower().Contains(c)).ToList();
-
-            if (!matches.Any())
-                yield break;
-
-            yield return new Issue(
-                templateArtistHasVowels,
-                fieldName, fieldValue, string.Join(", ", matches)
-            );
-        }
-    }
-}
diff --git a/osu.Game/Rulesets/Edit/Checker.cs b/osu.Game/Rulesets/Edit/Checker.cs
index 6687160b10..65d7fc5913 100644
--- a/osu.Game/Rulesets/Edit/Checker.cs
+++ b/osu.Game/Rulesets/Edit/Checker.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Edit
         // These are all ruleset-invariant, hence here instead of in e.g. `OsuChecker`.
         private readonly List<BeatmapCheck> beatmapChecks = new List<BeatmapCheck>
         {
-            new CheckMetadataVowels()
+            new CheckBackground()
         };
 
         public virtual IEnumerable<Issue> Run(IBeatmap beatmap)
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
new file mode 100644
index 0000000000..9376f9568a
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
@@ -0,0 +1,57 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using System.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit.Checks.Components;
+
+namespace osu.Game.Rulesets.Edit.Checks
+{
+    public class CheckBackground : BeatmapCheck
+    {
+        public override CheckMetadata Metadata() => new CheckMetadata
+        (
+            category: CheckMetadata.CheckCategory.Resources,
+            description: "Missing background."
+        );
+
+        public override IEnumerable<IssueTemplate> Templates() => new[]
+        {
+            templateNoneSet,
+            templateDoesNotExist
+        };
+
+        private readonly IssueTemplate templateNoneSet = new IssueTemplate
+        (
+            type: IssueTemplate.IssueType.Problem,
+            unformattedMessage: "No background has been set."
+        );
+
+        private readonly IssueTemplate templateDoesNotExist = new IssueTemplate
+        (
+            type: IssueTemplate.IssueType.Problem,
+            unformattedMessage: "The background file \"{0}\" is does not exist."
+        );
+
+        public override IEnumerable<Issue> Run(IBeatmap beatmap)
+        {
+            if (beatmap.Metadata.BackgroundFile == null)
+            {
+                yield return new Issue(templateNoneSet);
+
+                yield break;
+            }
+
+            // If the background is set, also make sure it still exists.
+
+            var set = beatmap.BeatmapInfo.BeatmapSet;
+            var file = set.Files.FirstOrDefault(f => f.Filename == beatmap.Metadata.BackgroundFile);
+
+            if (file != null)
+                yield break;
+
+            yield return new Issue(templateDoesNotExist, beatmap.Metadata.BackgroundFile);
+        }
+    }
+}

From 6d3cf78e4a4e50bd40c2b5f667d7e805e5bb93e5 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sat, 10 Apr 2021 13:04:39 +0200
Subject: [PATCH 2315/3722] Add issue selection

This mainly helps with keeping track of which issue was clicked, since doing so switches tab.
---
 osu.Game/Screens/Edit/Verify/IssueTable.cs   | 42 ++++++++++++++++++--
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs |  7 ++++
 2 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Verify/IssueTable.cs b/osu.Game/Screens/Edit/Verify/IssueTable.cs
index 20dceb5333..458b0184b6 100644
--- a/osu.Game/Screens/Edit/Verify/IssueTable.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueTable.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -26,6 +27,9 @@ namespace osu.Game.Screens.Edit.Verify
 
         private readonly FillFlowContainer backgroundFlow;
 
+        [Resolved]
+        private Bindable<Issue> selectedIssue { get; set; }
+
         public IssueTable()
         {
             RelativeSizeAxes = Axes.X;
@@ -115,6 +119,7 @@ namespace osu.Game.Screens.Edit.Verify
 
         public class RowBackground : OsuClickableContainer
         {
+            private readonly Issue issue;
             private const int fade_duration = 100;
 
             private readonly Box hoveredBackground;
@@ -128,13 +133,16 @@ namespace osu.Game.Screens.Edit.Verify
             [Resolved]
             private EditorBeatmap editorBeatmap { get; set; }
 
+            [Resolved]
+            private Bindable<Issue> selectedIssue { get; set; }
+
             public RowBackground(Issue issue)
             {
+                this.issue = issue;
+
                 RelativeSizeAxes = Axes.X;
                 Height = row_height;
-
                 AlwaysPresent = true;
-
                 CornerRadius = 3;
                 Masking = true;
 
@@ -152,6 +160,8 @@ namespace osu.Game.Screens.Edit.Verify
                     // Supposed to work like clicking timestamps outside of the game.
                     // TODO: Is there already defined behaviour for this I may be able to call?
 
+                    selectedIssue.Value = issue;
+
                     if (issue.Time != null)
                     {
                         clock.Seek(issue.Time.Value);
@@ -167,11 +177,35 @@ namespace osu.Game.Screens.Edit.Verify
             }
 
             private Color4 colourHover;
+            private Color4 colourSelected;
 
             [BackgroundDependencyLoader]
             private void load(OsuColour colours)
             {
                 hoveredBackground.Colour = colourHover = colours.BlueDarker;
+                colourSelected = colours.YellowDarker;
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                selectedIssue.BindValueChanged(change => { Selected = issue == change.NewValue; }, true);
+            }
+
+            private bool selected;
+
+            protected bool Selected
+            {
+                get => selected;
+                set
+                {
+                    if (value == selected)
+                        return;
+
+                    selected = value;
+                    updateState();
+                }
             }
 
             protected override bool OnHover(HoverEvent e)
@@ -188,9 +222,9 @@ namespace osu.Game.Screens.Edit.Verify
 
             private void updateState()
             {
-                hoveredBackground.FadeColour(colourHover, 450, Easing.OutQuint);
+                hoveredBackground.FadeColour(selected ? colourSelected : colourHover, 450, Easing.OutQuint);
 
-                if (IsHovered)
+                if (selected || IsHovered)
                     hoveredBackground.FadeIn(fade_duration, Easing.OutQuint);
                 else
                     hoveredBackground.FadeOut(fade_duration, Easing.OutQuint);
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index 88397fdbff..ea9f986eb6 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -13,6 +13,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Edit.Checks.Components;
 using osuTK;
 
 namespace osu.Game.Screens.Edit.Verify
@@ -22,6 +23,9 @@ namespace osu.Game.Screens.Edit.Verify
         private Ruleset ruleset;
         private static Checker checker; // TODO: Should not be static, but apparently needs to be?
 
+        [Cached]
+        private Bindable<Issue> selectedIssue = new Bindable<Issue>();
+
         public VerifyScreen()
             : base(EditorScreenMode.Verify)
         {
@@ -74,6 +78,9 @@ namespace osu.Game.Screens.Edit.Verify
             [Resolved]
             protected EditorBeatmap Beatmap { get; private set; }
 
+            [Resolved]
+            private Bindable<Issue> selectedIssue { get; set; }
+
             [BackgroundDependencyLoader]
             private void load(OsuColour colours)
             {

From c995eca029f5f126e734507018b62fb3ea717bb5 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sat, 10 Apr 2021 13:05:24 +0200
Subject: [PATCH 2316/3722] Remove todo

Doesn't really matter in the end, as only one checker will run at a time in this case.
---
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index ea9f986eb6..b9fd93ac19 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Screens.Edit.Verify
     public class VerifyScreen : EditorScreen
     {
         private Ruleset ruleset;
-        private static Checker checker; // TODO: Should not be static, but apparently needs to be?
+        private static Checker checker;
 
         [Cached]
         private Bindable<Issue> selectedIssue = new Bindable<Issue>();

From 3a4f2e3d7e393d29d1f0f4ad8dcbf989f4f19073 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sat, 10 Apr 2021 13:09:16 +0200
Subject: [PATCH 2317/3722] Show table even if no issues

---
 osu.Game/Screens/Edit/Verify/IssueTable.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Verify/IssueTable.cs b/osu.Game/Screens/Edit/Verify/IssueTable.cs
index 458b0184b6..e4612927fd 100644
--- a/osu.Game/Screens/Edit/Verify/IssueTable.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueTable.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Screens.Edit.Verify
                 Content = null;
                 backgroundFlow.Clear();
 
-                if (value?.Any() != true)
+                if (value == null)
                     return;
 
                 foreach (var issue in value)

From 747e0f00dc63e060feb246f69a5ffe6c33249604 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sat, 10 Apr 2021 13:10:05 +0200
Subject: [PATCH 2318/3722] Improve table formatting

---
 osu.Game/Screens/Edit/Verify/IssueTable.cs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/Verify/IssueTable.cs b/osu.Game/Screens/Edit/Verify/IssueTable.cs
index e4612927fd..40bd134551 100644
--- a/osu.Game/Screens/Edit/Verify/IssueTable.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueTable.cs
@@ -74,9 +74,9 @@ namespace osu.Game.Screens.Edit.Verify
         {
             var columns = new List<TableColumn>
             {
-                new TableColumn(string.Empty, Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
-                new TableColumn("Type", Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
-                new TableColumn("Time", Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
+                new TableColumn(string.Empty, Anchor.CentreLeft, new Dimension(GridSizeMode.AutoSize)),
+                new TableColumn("Type", Anchor.CentreLeft, new Dimension(GridSizeMode.AutoSize, minSize: 60)),
+                new TableColumn("Time", Anchor.CentreLeft, new Dimension(GridSizeMode.AutoSize, minSize: 60)),
                 new TableColumn("Message", Anchor.CentreLeft),
                 new TableColumn("Category", Anchor.CentreRight, new Dimension(GridSizeMode.AutoSize)),
             };
@@ -89,20 +89,21 @@ namespace osu.Game.Screens.Edit.Verify
             new OsuSpriteText
             {
                 Text = $"#{index + 1}",
-                Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Medium)
+                Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Medium),
+                Margin = new MarginPadding { Right = 10 }
             },
             new OsuSpriteText
             {
                 Text = issue.Template.Type.ToString(),
                 Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold),
-                Margin = new MarginPadding { Left = 10 },
+                Margin = new MarginPadding { Right = 10 },
                 Colour = issue.Template.TypeColour()
             },
             new OsuSpriteText
             {
                 Text = issue.GetEditorTimestamp(),
                 Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold),
-                Margin = new MarginPadding(10)
+                Margin = new MarginPadding { Right = 10 },
             },
             new OsuSpriteText
             {

From 3289bb03791a11f0181d86a4c21ce13d1e214c2b Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sat, 10 Apr 2021 14:56:30 +0200
Subject: [PATCH 2319/3722] Merge `Check` and `BeatmapCheck`

We're probably not going to need GeneralChecks or BeatmapsetChecks.

The verify tab is only available to a single difficulty at a time, and we already have access to the rest of the set through `IBeatmap`.
---
 .../Edit/Checks/CheckOffscreenObjects.cs      |  2 +-
 osu.Game.Rulesets.Osu/Edit/OsuChecker.cs      |  2 +-
 osu.Game/Rulesets/Edit/Checker.cs             |  4 ++--
 .../Rulesets/Edit/Checks/CheckBackground.cs   |  2 +-
 .../Edit/Checks/Components/BeatmapCheck.cs    | 19 ------------------
 .../Rulesets/Edit/Checks/Components/Check.cs  | 20 +++++++++----------
 6 files changed, 14 insertions(+), 35 deletions(-)
 delete mode 100644 osu.Game/Rulesets/Edit/Checks/Components/BeatmapCheck.cs

diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index c47864855b..3d411d6e12 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -9,7 +9,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Edit.Checks
 {
-    public class CheckOffscreenObjects : BeatmapCheck
+    public class CheckOffscreenObjects : Check
     {
         // These are close approximates to the edges of the screen
         // in gameplay on a 4:3 aspect ratio for osu!stable.
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs b/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs
index ee3b230679..d0dbc043d4 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 {
     public class OsuChecker : Checker
     {
-        public readonly List<BeatmapCheck> beatmapChecks = new List<BeatmapCheck>
+        public readonly List<Check> beatmapChecks = new List<Check>
         {
             new CheckOffscreenObjects()
         };
diff --git a/osu.Game/Rulesets/Edit/Checker.cs b/osu.Game/Rulesets/Edit/Checker.cs
index 65d7fc5913..6ab6ed75e8 100644
--- a/osu.Game/Rulesets/Edit/Checker.cs
+++ b/osu.Game/Rulesets/Edit/Checker.cs
@@ -12,14 +12,14 @@ namespace osu.Game.Rulesets.Edit
     public abstract class Checker
     {
         // These are all ruleset-invariant, hence here instead of in e.g. `OsuChecker`.
-        private readonly List<BeatmapCheck> beatmapChecks = new List<BeatmapCheck>
+        private readonly IReadOnlyList<Check> checks = new List<Check>
         {
             new CheckBackground()
         };
 
         public virtual IEnumerable<Issue> Run(IBeatmap beatmap)
         {
-            return beatmapChecks.SelectMany(check => check.Run(beatmap));
+            return checks.SelectMany(check => check.Run(beatmap));
         }
     }
 }
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
index 9376f9568a..aa10fad77b 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
@@ -8,7 +8,7 @@ using osu.Game.Rulesets.Edit.Checks.Components;
 
 namespace osu.Game.Rulesets.Edit.Checks
 {
-    public class CheckBackground : BeatmapCheck
+    public class CheckBackground : Check
     {
         public override CheckMetadata Metadata() => new CheckMetadata
         (
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/BeatmapCheck.cs b/osu.Game/Rulesets/Edit/Checks/Components/BeatmapCheck.cs
deleted file mode 100644
index d0f93b5eef..0000000000
--- a/osu.Game/Rulesets/Edit/Checks/Components/BeatmapCheck.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 System.Collections.Generic;
-using osu.Game.Beatmaps;
-
-namespace osu.Game.Rulesets.Edit.Checks.Components
-{
-    public abstract class BeatmapCheck : Check<IBeatmap>
-    {
-        /// <summary>
-        /// Returns zero, one, or several issues detected by this
-        /// check on the given beatmap.
-        /// </summary>
-        /// <param name="beatmap">The beatmap to run the check on.</param>
-        /// <returns></returns>
-        public abstract override IEnumerable<Issue> Run(IBeatmap beatmap);
-    }
-}
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/Check.cs b/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
index 228c11f0f3..4e444cacbf 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using osu.Game.Beatmaps;
 
 namespace osu.Game.Rulesets.Edit.Checks.Components
 {
@@ -21,21 +22,18 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// <returns></returns>
         public abstract IEnumerable<IssueTemplate> Templates();
 
+        /// <summary>
+        /// Returns zero, one, or several issues detected by this
+        /// check on the given beatmap.
+        /// </summary>
+        /// <param name="beatmap">The beatmap to run the check on.</param>
+        /// <returns></returns>
+        public abstract IEnumerable<Issue> Run(IBeatmap beatmap);
+
         protected Check()
         {
             foreach (var template in Templates())
                 template.Origin = this;
         }
     }
-
-    public abstract class Check<T> : Check
-    {
-        /// <summary>
-        /// Returns zero, one, or several issues detected by
-        /// this check on the given object.
-        /// </summary>
-        /// <param name="obj">The object to run the check on.</param>
-        /// <returns></returns>
-        public abstract IEnumerable<Issue> Run(T obj);
-    }
 }

From 7d40b017223a008e17cf53cf0b05006e8dfe288f Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sat, 10 Apr 2021 15:18:15 +0200
Subject: [PATCH 2320/3722] Remove old todo

---
 osu.Game/Screens/Edit/Verify/IssueTable.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Verify/IssueTable.cs b/osu.Game/Screens/Edit/Verify/IssueTable.cs
index 40bd134551..5f04c7c4e8 100644
--- a/osu.Game/Screens/Edit/Verify/IssueTable.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueTable.cs
@@ -158,9 +158,6 @@ namespace osu.Game.Screens.Edit.Verify
 
                 Action = () =>
                 {
-                    // Supposed to work like clicking timestamps outside of the game.
-                    // TODO: Is there already defined behaviour for this I may be able to call?
-
                     selectedIssue.Value = issue;
 
                     if (issue.Time != null)

From dac733cced62e30089f52fa6147f5210197b3e20 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sat, 10 Apr 2021 15:49:57 +0200
Subject: [PATCH 2321/3722] Fix field name and accessibility

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

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs b/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs
index d0dbc043d4..10f0ecf0cf 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 {
     public class OsuChecker : Checker
     {
-        public readonly List<Check> beatmapChecks = new List<Check>
+        private readonly List<Check> checks = new List<Check>
         {
             new CheckOffscreenObjects()
         };
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             foreach (var issue in base.Run(beatmap))
                 yield return issue;
 
-            foreach (var issue in beatmapChecks.SelectMany(check => check.Run(beatmap)))
+            foreach (var issue in checks.SelectMany(check => check.Run(beatmap)))
                 yield return issue;
         }
     }

From a42714540b6c24385042725540bd6b85a53ebdda Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sat, 10 Apr 2021 23:04:15 -0700
Subject: [PATCH 2322/3722] Add follow delay setting to osu! flashlight mod

---
 .../Mods/OsuModFlashlight.cs                  | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs b/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
index 20c0818d03..683b35f282 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
@@ -9,10 +9,12 @@ using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
 using osu.Framework.Utils;
+using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.UI;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Mods
@@ -23,6 +25,8 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         private const float default_flashlight_size = 180;
 
+        private const double default_follow_delay = 120;
+
         private OsuFlashlight flashlight;
 
         public override Flashlight CreateFlashlight() => flashlight = new OsuFlashlight();
@@ -35,8 +39,25 @@ namespace osu.Game.Rulesets.Osu.Mods
             }
         }
 
+        public override void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
+        {
+            base.ApplyToDrawableRuleset(drawableRuleset);
+
+            flashlight.FollowDelay = FollowDelay.Value;
+        }
+
+        [SettingSource("Follow delay", "Milliseconds until the flashlight reaches the cursor")]
+        public BindableNumber<double> FollowDelay { get; } = new BindableDouble(default_follow_delay)
+        {
+            MinValue = default_follow_delay,
+            MaxValue = default_follow_delay * 10,
+            Precision = default_follow_delay,
+        };
+
         private class OsuFlashlight : Flashlight, IRequireHighFrequencyMousePosition
         {
+            public double FollowDelay { private get; set; }
+
             public OsuFlashlight()
             {
                 FlashlightSize = new Vector2(0, getSizeFor(0));
@@ -50,13 +71,11 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             protected override bool OnMouseMove(MouseMoveEvent e)
             {
-                const double follow_delay = 120;
-
                 var position = FlashlightPosition;
                 var destination = e.MousePosition;
 
                 FlashlightPosition = Interpolation.ValueAt(
-                    Math.Min(Math.Abs(Clock.ElapsedFrameTime), follow_delay), position, destination, 0, follow_delay, Easing.Out);
+                    Math.Min(Math.Abs(Clock.ElapsedFrameTime), FollowDelay), position, destination, 0, FollowDelay, Easing.Out);
 
                 return base.OnMouseMove(e);
             }

From 2b947a44da2d320669f61d13d6c1ee8c7c660001 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 11 Apr 2021 09:00:37 +0300
Subject: [PATCH 2323/3722] Cache power status at base instead

---
 osu.Game/OsuGame.cs     | 5 -----
 osu.Game/OsuGameBase.cs | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 277455b7d3..809e5d3c1b 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -694,11 +694,6 @@ namespace osu.Game
             loadComponentSingleFile(new AccountCreationOverlay(), topMostOverlayContent.Add, true);
             loadComponentSingleFile(new DialogOverlay(), topMostOverlayContent.Add, true);
 
-            if (CreatePowerStatus() != null)
-            {
-                dependencies.CacheAs(CreatePowerStatus());
-            }
-
             chatOverlay.State.ValueChanged += state => channelManager.HighPollRate.Value = state.NewValue == Visibility.Visible;
 
             Add(externalLinkOpener = new ExternalLinkOpener());
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 41d790ea4a..fec8272076 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -284,6 +284,11 @@ namespace osu.Game
             dependencies.Cache(KeyBindingStore = new KeyBindingStore(contextFactory, RulesetStore));
             dependencies.Cache(SettingsStore = new SettingsStore(contextFactory));
             dependencies.Cache(RulesetConfigCache = new RulesetConfigCache(SettingsStore));
+
+            var powerStatus = CreatePowerStatus();
+            if (powerStatus != null)
+                dependencies.CacheAs(powerStatus);
+
             dependencies.Cache(new SessionStatics());
             dependencies.Cache(new OsuColour());
 

From 3d85dc11c62aedccda43b373326463c9d5be5162 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 11 Apr 2021 09:02:32 +0300
Subject: [PATCH 2324/3722] Adjust documentation

---
 osu.Game/Utils/PowerStatus.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Utils/PowerStatus.cs b/osu.Game/Utils/PowerStatus.cs
index 77d531710e..a53f50b620 100644
--- a/osu.Game/Utils/PowerStatus.cs
+++ b/osu.Game/Utils/PowerStatus.cs
@@ -22,7 +22,8 @@ namespace osu.Game.Utils
         public virtual bool IsCharging { get; } = false;
 
         /// <summary>
-        /// Returns true if <see cref="IsCharging"/> = false and <see cref="ChargeLevel"/> &lt;= <see cref="BatteryCutoff"/>.
+        /// Whether the battery is currently low in charge.
+        /// Returns true if not charging and current charge level is lower than or equal to <see cref="BatteryCutoff"/>.
         /// </summary>
         public bool IsLowBattery => !IsCharging && ChargeLevel <= BatteryCutoff;
     }

From 07ee1b4d0b73edebaaffc632acd13dc993f0871c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 11 Apr 2021 09:11:28 +0300
Subject: [PATCH 2325/3722] Make power status properties abstract

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

diff --git a/osu.Game/Utils/PowerStatus.cs b/osu.Game/Utils/PowerStatus.cs
index a53f50b620..46f7e32b9e 100644
--- a/osu.Game/Utils/PowerStatus.cs
+++ b/osu.Game/Utils/PowerStatus.cs
@@ -12,14 +12,14 @@ namespace osu.Game.Utils
         /// <summary>
         /// The maximum battery level considered as low, from 0 to 1.
         /// </summary>
-        public virtual double BatteryCutoff { get; } = 0;
+        public abstract double BatteryCutoff { get; }
 
         /// <summary>
         /// The charge level of the battery, from 0 to 1.
         /// </summary>
-        public virtual double ChargeLevel { get; } = 0;
+        public abstract double ChargeLevel { get; }
 
-        public virtual bool IsCharging { get; } = false;
+        public abstract bool IsCharging { get; }
 
         /// <summary>
         /// Whether the battery is currently low in charge.

From cb947a3b2710d1c22a55a1ac91262c83bc68591c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 11 Apr 2021 10:02:51 +0300
Subject: [PATCH 2326/3722] Add expected output in test case rather than
 determining internally

---
 .../Visual/Gameplay/TestScenePlayerLoader.cs          | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index 36958b0741..657c1dd47e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -292,10 +292,10 @@ namespace osu.Game.Tests.Visual.Gameplay
             }
         }
 
-        [TestCase(false, 1.0)] // not charging, above cutoff --> no warning
-        [TestCase(false, 0.2)] // not charging, at cutoff --> warning
-        [TestCase(true, 0.1)] // charging, below cutoff --> no warning
-        public void TestLowBatteryNotification(bool isCharging, double chargeLevel)
+        [TestCase(false, 1.0, false)] // not charging, above cutoff --> no warning
+        [TestCase(true, 0.1, false)] // charging, below cutoff --> no warning
+        [TestCase(false, 0.2, true)] // not charging, at cutoff --> warning
+        public void TestLowBatteryNotification(bool isCharging, double chargeLevel, bool shouldWarn)
         {
             AddStep("reset notification lock", () => sessionStatics.GetBindable<bool>(Static.LowBatteryNotificationShownOnce).Value = false);
 
@@ -306,8 +306,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 powerStatus.SetChargeLevel(chargeLevel);
             }));
             AddUntilStep("wait for player", () => player?.LoadState == LoadState.Ready);
-            int warning = !isCharging && chargeLevel <= powerStatus.BatteryCutoff ? 1 : 0;
-            AddAssert($"notification {(warning == 1 ? "triggered" : "not triggered")}", () => notificationOverlay.UnreadCount.Value == warning);
+            AddAssert($"notification {(shouldWarn ? "triggered" : "not triggered")}", () => notificationOverlay.UnreadCount.Value == (shouldWarn ? 1 : 0));
             AddStep("click notification", () =>
             {
                 var scrollContainer = (OsuScrollContainer)notificationOverlay.Children.Last();

From 419fd4470cbb818298cd5fe324d8ff528b2f3901 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 11 Apr 2021 08:57:44 +0300
Subject: [PATCH 2327/3722] Reorder method declaration

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

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index fec8272076..96aabf0024 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -96,8 +96,6 @@ namespace osu.Game
 
         protected Storage Storage { get; set; }
 
-        protected virtual PowerStatus CreatePowerStatus() => null;
-
         [Cached]
         [Cached(typeof(IBindable<RulesetInfo>))]
         protected readonly Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
@@ -159,6 +157,8 @@ namespace osu.Game
 
         protected override UserInputManager CreateUserInputManager() => new OsuUserInputManager();
 
+        protected virtual PowerStatus CreatePowerStatus() => null;
+
         /// <summary>
         /// The maximum volume at which audio tracks should playback. This can be set lower than 1 to create some head-room for sound effects.
         /// </summary>

From b7e16c2fcc8cad36ab2f40cc59c3f254088624e9 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Sun, 11 Apr 2021 15:47:38 -0400
Subject: [PATCH 2328/3722] Remove Xamarin.Essentials package from main project

---
 osu.Game/osu.Game.csproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index d0a918a8f5..471eced55a 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -35,6 +35,5 @@
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
   </ItemGroup>
 </Project>

From fbd5195738bdd9843434ea7462a906e928285d5a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 12 Apr 2021 03:37:03 +0300
Subject: [PATCH 2329/3722] Extract mod setting value handling to utils class

---
 .../API/ModSettingsDictionaryFormatter.cs     | 34 ++----------------
 osu.Game/Utils/ModUtils.cs                    | 36 +++++++++++++++++++
 2 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs b/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
index dd854acc32..81ecc74ddb 100644
--- a/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
+++ b/osu.Game/Online/API/ModSettingsDictionaryFormatter.cs
@@ -3,11 +3,10 @@
 
 using System.Buffers;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Text;
 using MessagePack;
 using MessagePack.Formatters;
-using osu.Framework.Bindables;
+using osu.Game.Utils;
 
 namespace osu.Game.Online.API
 {
@@ -24,36 +23,7 @@ namespace osu.Game.Online.API
                 var stringBytes = new ReadOnlySequence<byte>(Encoding.UTF8.GetBytes(kvp.Key));
                 writer.WriteString(in stringBytes);
 
-                switch (kvp.Value)
-                {
-                    case Bindable<double> d:
-                        primitiveFormatter.Serialize(ref writer, d.Value, options);
-                        break;
-
-                    case Bindable<int> i:
-                        primitiveFormatter.Serialize(ref writer, i.Value, options);
-                        break;
-
-                    case Bindable<float> f:
-                        primitiveFormatter.Serialize(ref writer, f.Value, options);
-                        break;
-
-                    case Bindable<bool> b:
-                        primitiveFormatter.Serialize(ref writer, b.Value, options);
-                        break;
-
-                    case IBindable u:
-                        // A mod with unknown (e.g. enum) generic type.
-                        var valueMethod = u.GetType().GetProperty(nameof(IBindable<int>.Value));
-                        Debug.Assert(valueMethod != null);
-                        primitiveFormatter.Serialize(ref writer, valueMethod.GetValue(u), options);
-                        break;
-
-                    default:
-                        // fall back for non-bindable cases.
-                        primitiveFormatter.Serialize(ref writer, kvp.Value, options);
-                        break;
-                }
+                primitiveFormatter.Serialize(ref writer, ModUtils.GetSettingUnderlyingValue(kvp.Value), options);
             }
         }
 
diff --git a/osu.Game/Utils/ModUtils.cs b/osu.Game/Utils/ModUtils.cs
index c12b5a9fd4..596880f2e7 100644
--- a/osu.Game/Utils/ModUtils.cs
+++ b/osu.Game/Utils/ModUtils.cs
@@ -3,8 +3,11 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using osu.Framework.Bindables;
+using osu.Game.Online.API;
 using osu.Game.Rulesets.Mods;
 
 #nullable enable
@@ -129,5 +132,38 @@ namespace osu.Game.Utils
             else
                 yield return mod;
         }
+
+        /// <summary>
+        /// Returns the underlying value of the given mod setting object.
+        /// Used in <see cref="APIMod"/> for serialization and equality comparison purposes.
+        /// </summary>
+        /// <param name="setting">The mod setting.</param>
+        public static object GetSettingUnderlyingValue(object setting)
+        {
+            switch (setting)
+            {
+                case Bindable<double> d:
+                    return d.Value;
+
+                case Bindable<int> i:
+                    return i.Value;
+
+                case Bindable<float> f:
+                    return f.Value;
+
+                case Bindable<bool> b:
+                    return b.Value;
+
+                case IBindable u:
+                    // A mod with unknown (e.g. enum) generic type.
+                    var valueMethod = u.GetType().GetProperty(nameof(IBindable<int>.Value));
+                    Debug.Assert(valueMethod != null);
+                    return valueMethod.GetValue(u);
+
+                default:
+                    // fall back for non-bindable cases.
+                    return setting;
+            }
+        }
     }
 }

From d6d8ea5b6b5ce956d81863136f5eff3f62bf5cd6 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 12 Apr 2021 11:17:56 +0900
Subject: [PATCH 2330/3722] Throw when getting a frame of an empty replay

---
 .../Gameplay/TestSceneSpectatorPlayback.cs    | 30 +++++++++----------
 osu.Game/Input/Handlers/ReplayInputHandler.cs |  2 --
 .../Replays/FramedReplayInputHandler.cs       |  9 ++++--
 osu.Game/Rulesets/UI/RulesetInputManager.cs   | 10 +++++++
 4 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
index 35b3bfc1f8..9c763814f3 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
@@ -204,27 +204,27 @@ namespace osu.Game.Tests.Visual.Gameplay
                 return;
             }
 
-            if (replayHandler.NextFrame != null)
-            {
-                var lastFrame = replay.Frames.LastOrDefault();
+            if (!replayHandler.HasFrames)
+                return;
 
-                // this isn't perfect as we basically can't be aware of the rate-of-send here (the streamer is not sending data when not being moved).
-                // in gameplay playback, the case where NextFrame is null would pause gameplay and handle this correctly; it's strictly a test limitation / best effort implementation.
-                if (lastFrame != null)
-                    latency = Math.Max(latency, Time.Current - lastFrame.Time);
+            var lastFrame = replay.Frames.LastOrDefault();
 
-                latencyDisplay.Text = $"latency: {latency:N1}";
+            // this isn't perfect as we basically can't be aware of the rate-of-send here (the streamer is not sending data when not being moved).
+            // in gameplay playback, the case where NextFrame is null would pause gameplay and handle this correctly; it's strictly a test limitation / best effort implementation.
+            if (lastFrame != null)
+                latency = Math.Max(latency, Time.Current - lastFrame.Time);
 
-                double proposedTime = Time.Current - latency + Time.Elapsed;
+            latencyDisplay.Text = $"latency: {latency:N1}";
 
-                // this will either advance by one or zero frames.
-                double? time = replayHandler.SetFrameFromTime(proposedTime);
+            double proposedTime = Time.Current - latency + Time.Elapsed;
 
-                if (time == null)
-                    return;
+            // this will either advance by one or zero frames.
+            double? time = replayHandler.SetFrameFromTime(proposedTime);
 
-                manualClock.CurrentTime = time.Value;
-            }
+            if (time == null)
+                return;
+
+            manualClock.CurrentTime = time.Value;
         }
 
         [TearDownSteps]
diff --git a/osu.Game/Input/Handlers/ReplayInputHandler.cs b/osu.Game/Input/Handlers/ReplayInputHandler.cs
index fba1bee0b8..cd76000f98 100644
--- a/osu.Game/Input/Handlers/ReplayInputHandler.cs
+++ b/osu.Game/Input/Handlers/ReplayInputHandler.cs
@@ -32,8 +32,6 @@ namespace osu.Game.Input.Handlers
 
         public override bool Initialize(GameHost host) => true;
 
-        public override bool IsActive => true;
-
         public class ReplayState<T> : IInput
             where T : struct
         {
diff --git a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
index 0b41ca31ea..5eaccc766e 100644
--- a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
+++ b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
@@ -17,6 +17,8 @@ namespace osu.Game.Rulesets.Replays
     public abstract class FramedReplayInputHandler<TFrame> : ReplayInputHandler
         where TFrame : ReplayFrame
     {
+        public override bool IsActive => HasFrames;
+
         private readonly Replay replay;
 
         protected List<ReplayFrame> Frames => replay.Frames;
@@ -25,7 +27,10 @@ namespace osu.Game.Rulesets.Replays
         {
             get
             {
-                if (!HasFrames || !currentFrameIndex.HasValue)
+                if (!HasFrames)
+                    throw new InvalidOperationException($"Cannot get {nameof(CurrentFrame)} of the empty replay");
+
+                if (!currentFrameIndex.HasValue)
                     return null;
 
                 return (TFrame)Frames[currentFrameIndex.Value];
@@ -37,7 +42,7 @@ namespace osu.Game.Rulesets.Replays
             get
             {
                 if (!HasFrames)
-                    return null;
+                    throw new InvalidOperationException($"Cannot get {nameof(NextFrame)} of the empty replay");
 
                 if (!currentFrameIndex.HasValue)
                     return currentDirection > 0 ? (TFrame)Frames[0] : null;
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index d6f002ea2c..fb56a5d93d 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.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;
@@ -10,6 +11,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Framework.Input.StateChanges;
 using osu.Framework.Input.StateChanges.Events;
 using osu.Framework.Input.States;
 using osu.Game.Configuration;
@@ -100,6 +102,14 @@ namespace osu.Game.Rulesets.UI
 
         #endregion
 
+        protected override List<IInput> GetPendingInputs()
+        {
+            if (replayInputHandler != null && !replayInputHandler.IsActive)
+                return new List<IInput>();
+
+            return base.GetPendingInputs();
+        }
+
         #region Setting application (disables etc.)
 
         private Bindable<bool> mouseDisabled;

From 4fcddfb44b7284dcf39720a685d2f34813e56ecd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 12 Apr 2021 13:42:14 +0900
Subject: [PATCH 2331/3722] Fix multiplayer test failure

---
 .../Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
index 839118de2f..caa731f985 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
@@ -134,7 +134,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 InputManager.Click(MouseButton.Left);
             });
 
-            AddAssert("match started", () => Client.Room?.State == MultiplayerRoomState.WaitingForLoad);
+            AddUntilStep("match started", () => Client.Room?.State == MultiplayerRoomState.WaitingForLoad);
         }
     }
 }

From 995c244ceef985c3b381b6ec6af54f8d5d940b0d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Apr 2021 14:00:26 +0900
Subject: [PATCH 2332/3722] Remove alt-mousewheel bindings for volume
 adjustment

With the recent changes to the order of processing key bindings
(`GlobalAction`s are handled first), having the alt-wheel bindings in here causes a
regression as they are handled before `OnScroll` events.

Specifically, this means editor alt-scroll functionality no longer works
with the default bindings.

Removing the bindings fixes this, while also still allowing alt-wheel
adjustment of the volume via `VolumeControlReceptor`:

https://github.com/ppy/osu/blob/a2f50af4243dfde95ec556859666b65e34f3007b/osu.Game/Overlays/Volume/VolumeControlReceptor.cs#L21-L26

In conjunction with the special case in `OsuScrollContainer`:

https://github.com/ppy/osu/blob/02d5b1352b6c9971ea83a131c0d2637e167b56b3/osu.Game/Graphics/Containers/OsuScrollContainer.cs#L103-L105
---
 .../Input/Bindings/GlobalActionContainer.cs   |   2 -
 ...700_RefreshVolumeBindingsAgain.Designer.cs | 506 ++++++++++++++++++
 ...210412045700_RefreshVolumeBindingsAgain.cs |  16 +
 3 files changed, 522 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game/Migrations/20210412045700_RefreshVolumeBindingsAgain.Designer.cs
 create mode 100644 osu.Game/Migrations/20210412045700_RefreshVolumeBindingsAgain.cs

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 671c3bc8bc..ba4d757cd7 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -97,9 +97,7 @@ namespace osu.Game.Input.Bindings
         public IEnumerable<KeyBinding> AudioControlKeyBindings => new[]
         {
             new KeyBinding(new[] { InputKey.Alt, InputKey.Up }, GlobalAction.IncreaseVolume),
-            new KeyBinding(new[] { InputKey.Alt, InputKey.MouseWheelUp }, GlobalAction.IncreaseVolume),
             new KeyBinding(new[] { InputKey.Alt, InputKey.Down }, GlobalAction.DecreaseVolume),
-            new KeyBinding(new[] { InputKey.Alt, InputKey.MouseWheelDown }, GlobalAction.DecreaseVolume),
 
             new KeyBinding(new[] { InputKey.Control, InputKey.F4 }, GlobalAction.ToggleMute),
 
diff --git a/osu.Game/Migrations/20210412045700_RefreshVolumeBindingsAgain.Designer.cs b/osu.Game/Migrations/20210412045700_RefreshVolumeBindingsAgain.Designer.cs
new file mode 100644
index 0000000000..2c100d39b9
--- /dev/null
+++ b/osu.Game/Migrations/20210412045700_RefreshVolumeBindingsAgain.Designer.cs
@@ -0,0 +1,506 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using osu.Game.Database;
+
+namespace osu.Game.Migrations
+{
+    [DbContext(typeof(OsuDbContext))]
+    [Migration("20210412045700_RefreshVolumeBindingsAgain")]
+    partial class RefreshVolumeBindingsAgain
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "2.2.6-servicing-10079");
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<float>("ApproachRate");
+
+                    b.Property<float>("CircleSize");
+
+                    b.Property<float>("DrainRate");
+
+                    b.Property<float>("OverallDifficulty");
+
+                    b.Property<double>("SliderMultiplier");
+
+                    b.Property<double>("SliderTickRate");
+
+                    b.HasKey("ID");
+
+                    b.ToTable("BeatmapDifficulty");
+                });
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<double>("AudioLeadIn");
+
+                    b.Property<double>("BPM");
+
+                    b.Property<int>("BaseDifficultyID");
+
+                    b.Property<int>("BeatDivisor");
+
+                    b.Property<int>("BeatmapSetInfoID");
+
+                    b.Property<bool>("Countdown");
+
+                    b.Property<double>("DistanceSpacing");
+
+                    b.Property<int>("GridSize");
+
+                    b.Property<string>("Hash");
+
+                    b.Property<bool>("Hidden");
+
+                    b.Property<double>("Length");
+
+                    b.Property<bool>("LetterboxInBreaks");
+
+                    b.Property<string>("MD5Hash");
+
+                    b.Property<int?>("MetadataID");
+
+                    b.Property<int?>("OnlineBeatmapID");
+
+                    b.Property<string>("Path");
+
+                    b.Property<int>("RulesetID");
+
+                    b.Property<bool>("SpecialStyle");
+
+                    b.Property<float>("StackLeniency");
+
+                    b.Property<double>("StarDifficulty");
+
+                    b.Property<int>("Status");
+
+                    b.Property<string>("StoredBookmarks");
+
+                    b.Property<double>("TimelineZoom");
+
+                    b.Property<string>("Version");
+
+                    b.Property<bool>("WidescreenStoryboard");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("BaseDifficultyID");
+
+                    b.HasIndex("BeatmapSetInfoID");
+
+                    b.HasIndex("Hash");
+
+                    b.HasIndex("MD5Hash");
+
+                    b.HasIndex("MetadataID");
+
+                    b.HasIndex("OnlineBeatmapID")
+                        .IsUnique();
+
+                    b.HasIndex("RulesetID");
+
+                    b.ToTable("BeatmapInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Artist");
+
+                    b.Property<string>("ArtistUnicode");
+
+                    b.Property<string>("AudioFile");
+
+                    b.Property<string>("AuthorString")
+                        .HasColumnName("Author");
+
+                    b.Property<string>("BackgroundFile");
+
+                    b.Property<int>("PreviewTime");
+
+                    b.Property<string>("Source");
+
+                    b.Property<string>("Tags");
+
+                    b.Property<string>("Title");
+
+                    b.Property<string>("TitleUnicode");
+
+                    b.Property<string>("VideoFile");
+
+                    b.HasKey("ID");
+
+                    b.ToTable("BeatmapMetadata");
+                });
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("BeatmapSetInfoID");
+
+                    b.Property<int>("FileInfoID");
+
+                    b.Property<string>("Filename")
+                        .IsRequired();
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("BeatmapSetInfoID");
+
+                    b.HasIndex("FileInfoID");
+
+                    b.ToTable("BeatmapSetFileInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTimeOffset>("DateAdded");
+
+                    b.Property<bool>("DeletePending");
+
+                    b.Property<string>("Hash");
+
+                    b.Property<int?>("MetadataID");
+
+                    b.Property<int?>("OnlineBeatmapSetID");
+
+                    b.Property<bool>("Protected");
+
+                    b.Property<int>("Status");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("DeletePending");
+
+                    b.HasIndex("Hash")
+                        .IsUnique();
+
+                    b.HasIndex("MetadataID");
+
+                    b.HasIndex("OnlineBeatmapSetID")
+                        .IsUnique();
+
+                    b.ToTable("BeatmapSetInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Key")
+                        .HasColumnName("Key");
+
+                    b.Property<int?>("RulesetID");
+
+                    b.Property<int?>("SkinInfoID");
+
+                    b.Property<string>("StringValue")
+                        .HasColumnName("Value");
+
+                    b.Property<int?>("Variant");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("SkinInfoID");
+
+                    b.HasIndex("RulesetID", "Variant");
+
+                    b.ToTable("Settings");
+                });
+
+            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Hash");
+
+                    b.Property<int>("ReferenceCount");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("Hash")
+                        .IsUnique();
+
+                    b.HasIndex("ReferenceCount");
+
+                    b.ToTable("FileInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("IntAction")
+                        .HasColumnName("Action");
+
+                    b.Property<string>("KeysString")
+                        .HasColumnName("Keys");
+
+                    b.Property<int?>("RulesetID");
+
+                    b.Property<int?>("Variant");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("IntAction");
+
+                    b.HasIndex("RulesetID", "Variant");
+
+                    b.ToTable("KeyBinding");
+                });
+
+            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
+                {
+                    b.Property<int?>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("Available");
+
+                    b.Property<string>("InstantiationInfo");
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("ShortName");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("Available");
+
+                    b.HasIndex("ShortName")
+                        .IsUnique();
+
+                    b.ToTable("RulesetInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("FileInfoID");
+
+                    b.Property<string>("Filename")
+                        .IsRequired();
+
+                    b.Property<int?>("ScoreInfoID");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("FileInfoID");
+
+                    b.HasIndex("ScoreInfoID");
+
+                    b.ToTable("ScoreFileInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<double>("Accuracy")
+                        .HasColumnType("DECIMAL(1,4)");
+
+                    b.Property<int>("BeatmapInfoID");
+
+                    b.Property<int>("Combo");
+
+                    b.Property<DateTimeOffset>("Date");
+
+                    b.Property<bool>("DeletePending");
+
+                    b.Property<string>("Hash");
+
+                    b.Property<int>("MaxCombo");
+
+                    b.Property<string>("ModsJson")
+                        .HasColumnName("Mods");
+
+                    b.Property<long?>("OnlineScoreID");
+
+                    b.Property<double?>("PP");
+
+                    b.Property<int>("Rank");
+
+                    b.Property<int>("RulesetID");
+
+                    b.Property<string>("StatisticsJson")
+                        .HasColumnName("Statistics");
+
+                    b.Property<long>("TotalScore");
+
+                    b.Property<long?>("UserID")
+                        .HasColumnName("UserID");
+
+                    b.Property<string>("UserString")
+                        .HasColumnName("User");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("BeatmapInfoID");
+
+                    b.HasIndex("OnlineScoreID")
+                        .IsUnique();
+
+                    b.HasIndex("RulesetID");
+
+                    b.ToTable("ScoreInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("FileInfoID");
+
+                    b.Property<string>("Filename")
+                        .IsRequired();
+
+                    b.Property<int>("SkinInfoID");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("FileInfoID");
+
+                    b.HasIndex("SkinInfoID");
+
+                    b.ToTable("SkinFileInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Creator");
+
+                    b.Property<bool>("DeletePending");
+
+                    b.Property<string>("Hash");
+
+                    b.Property<string>("Name");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("DeletePending");
+
+                    b.HasIndex("Hash")
+                        .IsUnique();
+
+                    b.ToTable("SkinInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
+                {
+                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
+                        .WithMany()
+                        .HasForeignKey("BaseDifficultyID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
+                        .WithMany("Beatmaps")
+                        .HasForeignKey("BeatmapSetInfoID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
+                        .WithMany("Beatmaps")
+                        .HasForeignKey("MetadataID");
+
+                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
+                        .WithMany()
+                        .HasForeignKey("RulesetID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
+                {
+                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
+                        .WithMany("Files")
+                        .HasForeignKey("BeatmapSetInfoID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
+                        .WithMany()
+                        .HasForeignKey("FileInfoID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
+                {
+                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
+                        .WithMany("BeatmapSets")
+                        .HasForeignKey("MetadataID");
+                });
+
+            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
+                {
+                    b.HasOne("osu.Game.Skinning.SkinInfo")
+                        .WithMany("Settings")
+                        .HasForeignKey("SkinInfoID");
+                });
+
+            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
+                {
+                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
+                        .WithMany()
+                        .HasForeignKey("FileInfoID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("osu.Game.Scoring.ScoreInfo")
+                        .WithMany("Files")
+                        .HasForeignKey("ScoreInfoID");
+                });
+
+            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
+                {
+                    b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "Beatmap")
+                        .WithMany("Scores")
+                        .HasForeignKey("BeatmapInfoID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
+                        .WithMany()
+                        .HasForeignKey("RulesetID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
+                {
+                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
+                        .WithMany()
+                        .HasForeignKey("FileInfoID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("osu.Game.Skinning.SkinInfo")
+                        .WithMany("Files")
+                        .HasForeignKey("SkinInfoID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/osu.Game/Migrations/20210412045700_RefreshVolumeBindingsAgain.cs b/osu.Game/Migrations/20210412045700_RefreshVolumeBindingsAgain.cs
new file mode 100644
index 0000000000..155d6670a8
--- /dev/null
+++ b/osu.Game/Migrations/20210412045700_RefreshVolumeBindingsAgain.cs
@@ -0,0 +1,16 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace osu.Game.Migrations
+{
+    public partial class RefreshVolumeBindingsAgain : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.Sql("DELETE FROM KeyBinding WHERE action in (6,7)");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+        }
+    }
+}

From dd1925aaedc756a57e1aecadbe2e36992bd17e8a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Apr 2021 14:29:27 +0900
Subject: [PATCH 2333/3722] Remove temporary input ignore

---
 .../Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
index 37d88693ee..2df05cb5ed 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid_Cell.cs
@@ -89,9 +89,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
             private Vector2 getFinalSize() => facade.DrawSize;
 
-            // Todo: Temporary?
-            protected override bool ShouldBeConsideredForInput(Drawable child) => false;
-
             protected override bool OnClick(ClickEvent e)
             {
                 ToggleMaximisationState(this);

From 1c553b5d481d21186eed0498160f90a6e51eedee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Apr 2021 15:14:53 +0900
Subject: [PATCH 2334/3722] Checker -> BeatmapVerifier

---
 .../Edit/{OsuChecker.cs => OsuBeatmapVerifier.cs}      |  2 +-
 osu.Game.Rulesets.Osu/OsuRuleset.cs                    |  2 +-
 .../Rulesets/Edit/{Checker.cs => BeatmapVerifier.cs}   |  2 +-
 osu.Game/Rulesets/Ruleset.cs                           |  2 +-
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs           | 10 +++++-----
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename osu.Game.Rulesets.Osu/Edit/{OsuChecker.cs => OsuBeatmapVerifier.cs} (94%)
 rename osu.Game/Rulesets/Edit/{Checker.cs => BeatmapVerifier.cs} (94%)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
similarity index 94%
rename from osu.Game.Rulesets.Osu/Edit/OsuChecker.cs
rename to osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
index 10f0ecf0cf..272612dbaf 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Osu.Edit.Checks;
 
 namespace osu.Game.Rulesets.Osu.Edit
 {
-    public class OsuChecker : Checker
+    public class OsuBeatmapVerifier : BeatmapVerifier
     {
         private readonly List<Check> checks = new List<Check>
         {
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 74679bd578..1658846e98 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -206,7 +206,7 @@ namespace osu.Game.Rulesets.Osu
 
         public override HitObjectComposer CreateHitObjectComposer() => new OsuHitObjectComposer(this);
 
-        public override Checker CreateChecker() => new OsuChecker();
+        public override BeatmapVerifier CreateChecker() => new OsuBeatmapVerifier();
 
         public override string Description => "osu!";
 
diff --git a/osu.Game/Rulesets/Edit/Checker.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
similarity index 94%
rename from osu.Game/Rulesets/Edit/Checker.cs
rename to osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index 6ab6ed75e8..230b128cc1 100644
--- a/osu.Game/Rulesets/Edit/Checker.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -9,7 +9,7 @@ using osu.Game.Rulesets.Edit.Checks.Components;
 
 namespace osu.Game.Rulesets.Edit
 {
-    public abstract class Checker
+    public abstract class BeatmapVerifier
     {
         // These are all ruleset-invariant, hence here instead of in e.g. `OsuChecker`.
         private readonly IReadOnlyList<Check> checks = new List<Check>
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 71f80c9982..088bcc7712 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -202,7 +202,7 @@ namespace osu.Game.Rulesets
 
         public virtual HitObjectComposer CreateHitObjectComposer() => null;
 
-        public virtual Checker CreateChecker() => null;
+        public virtual BeatmapVerifier CreateChecker() => null;
 
         public virtual Drawable CreateIcon() => new SpriteIcon { Icon = FontAwesome.Solid.QuestionCircle };
 
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index b9fd93ac19..7a520826f5 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Screens.Edit.Verify
     public class VerifyScreen : EditorScreen
     {
         private Ruleset ruleset;
-        private static Checker checker;
+        private static BeatmapVerifier beatmapVerifier;
 
         [Cached]
         private Bindable<Issue> selectedIssue = new Bindable<Issue>();
@@ -36,7 +36,7 @@ namespace osu.Game.Screens.Edit.Verify
             var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
 
             ruleset = parent.Get<IBindable<WorkingBeatmap>>().Value.BeatmapInfo.Ruleset?.CreateInstance();
-            checker = ruleset?.CreateChecker();
+            beatmapVerifier = ruleset?.CreateChecker();
 
             return dependencies;
         }
@@ -128,9 +128,9 @@ namespace osu.Game.Screens.Edit.Verify
 
             private void refresh()
             {
-                table.Issues = checker.Run(Beatmap)
-                                      .OrderByDescending(issue => issue.Template.Type)
-                                      .ThenByDescending(issue => issue.Template.Origin.Metadata().Category);
+                table.Issues = beatmapVerifier.Run(Beatmap)
+                                              .OrderByDescending(issue => issue.Template.Type)
+                                              .ThenByDescending(issue => issue.Template.Origin.Metadata().Category);
             }
         }
     }

From 136627b9ac59697129ccd1ae94a67e50442d3d61 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Apr 2021 15:27:12 +0900
Subject: [PATCH 2335/3722] Wrap xmldoc less and make a few fixes

---
 osu.Game/Rulesets/Edit/BeatmapVerifier.cs            |  9 ++++++---
 osu.Game/Rulesets/Edit/Checks/Components/Check.cs    | 12 +++---------
 .../Rulesets/Edit/Checks/Components/CheckMetadata.cs |  6 ++----
 osu.Game/Rulesets/Edit/Checks/Components/Issue.cs    | 10 +++-------
 .../Rulesets/Edit/Checks/Components/IssueTemplate.cs |  5 +----
 5 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index 230b128cc1..f67a068525 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -11,15 +11,18 @@ namespace osu.Game.Rulesets.Edit
 {
     public abstract class BeatmapVerifier
     {
-        // These are all ruleset-invariant, hence here instead of in e.g. `OsuChecker`.
-        private readonly IReadOnlyList<Check> checks = new List<Check>
+        /// <summary>
+        /// Checks which are performed regardless of ruleset.
+        /// These handle things like beatmap metadata, timing, and other ruleset agnostic elements.
+        /// </summary>
+        private readonly IReadOnlyList<Check> generalChecks = new List<Check>
         {
             new CheckBackground()
         };
 
         public virtual IEnumerable<Issue> Run(IBeatmap beatmap)
         {
-            return checks.SelectMany(check => check.Run(beatmap));
+            return generalChecks.SelectMany(check => check.Run(beatmap));
         }
     }
 }
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/Check.cs b/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
index 4e444cacbf..5a922fde56 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
@@ -9,25 +9,19 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
     public abstract class Check
     {
         /// <summary>
-        /// Returns the <see cref="CheckMetadata"/> for this check.
-        /// Basically, its information.
+        /// The metadata for this check.
         /// </summary>
-        /// <returns></returns>
         public abstract CheckMetadata Metadata();
 
         /// <summary>
-        /// The templates for issues that this check may use.
-        /// Basically, what issues this check can detect.
+        /// All possible templates for issues that this check may return.
         /// </summary>
-        /// <returns></returns>
         public abstract IEnumerable<IssueTemplate> Templates();
 
         /// <summary>
-        /// Returns zero, one, or several issues detected by this
-        /// check on the given beatmap.
+        /// Runs this check and returns any issues detected for the provided beatmap.
         /// </summary>
         /// <param name="beatmap">The beatmap to run the check on.</param>
-        /// <returns></returns>
         public abstract IEnumerable<Issue> Run(IBeatmap beatmap);
 
         protected Check()
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/CheckMetadata.cs b/osu.Game/Rulesets/Edit/Checks/Components/CheckMetadata.cs
index 5a226729ad..38a9a16325 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/CheckMetadata.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/CheckMetadata.cs
@@ -42,14 +42,12 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         }
 
         /// <summary>
-        /// The category this check belongs to. E.g. <see cref="CheckCategory.Metadata"/>,
-        /// <see cref="CheckCategory.Timing"/>, or <see cref="CheckCategory.Compose"/>.
+        /// The category this check belongs to. E.g. <see cref="CheckCategory.Metadata"/>, <see cref="CheckCategory.Timing"/>, or <see cref="CheckCategory.Compose"/>.
         /// </summary>
         public readonly CheckCategory Category;
 
         /// <summary>
-        /// Describes the issue(s) that this check looks for. Keep this brief, such that
-        /// it fits into "No {description}". E.g. "Offscreen objects" / "Too short sliders".
+        /// Describes the issue(s) that this check looks for. Keep this brief, such that it fits into "No {description}". E.g. "Offscreen objects" / "Too short sliders".
         /// </summary>
         public readonly string Description;
 
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs b/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
index 0f835202e7..6f6ba2a323 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
@@ -22,17 +22,13 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         public IReadOnlyList<HitObject> HitObjects;
 
         /// <summary>
-        /// The template which this issue is using. This provides properties
-        /// such as the <see cref="IssueTemplate.IssueType"/>, and the
-        /// <see cref="IssueTemplate.UnformattedMessage"/>.
+        /// The template which this issue is using. This provides properties such as the <see cref="IssueTemplate.IssueType"/>, and the <see cref="IssueTemplate.UnformattedMessage"/>.
         /// </summary>
         public IssueTemplate Template;
 
         /// <summary>
-        /// The arguments that give this issue its context, based on the
-        /// <see cref="IssueTemplate"/>. These are then substituted into the
-        /// <see cref="IssueTemplate.UnformattedMessage"/>.
-        /// E.g. timestamps, which diff is being compared to, what some volume is, etc.
+        /// The arguments that give this issue its context, based on the <see cref="IssueTemplate"/>. These are then substituted into the <see cref="IssueTemplate.UnformattedMessage"/>.
+        /// This could for instance include timestamps, which diff is being compared to, what some volume is, etc.
         /// </summary>
         public object[] Arguments;
 
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
index 7eaabdc59b..69c421140b 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
@@ -35,8 +35,7 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         public Check Origin;
 
         /// <summary>
-        /// The type of the issue. E.g. <see cref="IssueType.Problem"/>,
-        /// <see cref="IssueType.Warning"/>, or <see cref="IssueType.Negligible"/>.
+        /// The type of the issue.
         /// </summary>
         public readonly IssueType Type;
 
@@ -57,7 +56,6 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// Returns the formatted message given the arguments used to format it.
         /// </summary>
         /// <param name="args">The arguments used to format the message.</param>
-        /// <returns></returns>
         public string Message(params object[] args) => UnformattedMessage.FormatWith(args);
 
         public static readonly Color4 PROBLEM_RED = new Colour4(1.0f, 0.4f, 0.4f, 1.0f);
@@ -68,7 +66,6 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// <summary>
         /// Returns the colour corresponding to the type of this issue.
         /// </summary>
-        /// <returns></returns>
         public Colour4 TypeColour()
         {
             return Type switch

From 257acf9cd88f3826e6da336fe66e71d3a7834c60 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Apr 2021 15:28:13 +0900
Subject: [PATCH 2336/3722] Colour constants to private

---
 .../Edit/Checks/Components/IssueTemplate.cs    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
index 69c421140b..5381d54600 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
@@ -9,6 +9,11 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
 {
     public class IssueTemplate
     {
+        private static readonly Color4 problem_red = new Colour4(1.0f, 0.4f, 0.4f, 1.0f);
+        private static readonly Color4 warning_yellow = new Colour4(1.0f, 0.8f, 0.2f, 1.0f);
+        private static readonly Color4 negligible_green = new Colour4(0.33f, 0.8f, 0.5f, 1.0f);
+        private static readonly Color4 error_gray = new Colour4(0.5f, 0.5f, 0.5f, 1.0f);
+
         /// <summary>
         /// The type, or severity, of an issue. This decides its priority.
         /// </summary>
@@ -58,11 +63,6 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// <param name="args">The arguments used to format the message.</param>
         public string Message(params object[] args) => UnformattedMessage.FormatWith(args);
 
-        public static readonly Color4 PROBLEM_RED = new Colour4(1.0f, 0.4f, 0.4f, 1.0f);
-        public static readonly Color4 WARNING_YELLOW = new Colour4(1.0f, 0.8f, 0.2f, 1.0f);
-        public static readonly Color4 NEGLIGIBLE_GREEN = new Colour4(0.33f, 0.8f, 0.5f, 1.0f);
-        public static readonly Color4 ERROR_GRAY = new Colour4(0.5f, 0.5f, 0.5f, 1.0f);
-
         /// <summary>
         /// Returns the colour corresponding to the type of this issue.
         /// </summary>
@@ -70,10 +70,10 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         {
             return Type switch
             {
-                IssueType.Problem => PROBLEM_RED,
-                IssueType.Warning => WARNING_YELLOW,
-                IssueType.Negligible => NEGLIGIBLE_GREEN,
-                IssueType.Error => ERROR_GRAY,
+                IssueType.Problem => problem_red,
+                IssueType.Warning => warning_yellow,
+                IssueType.Negligible => negligible_green,
+                IssueType.Error => error_gray,
                 _ => Color4.White
             };
         }

From 3551322f1d95738e09c9e5f9c847abf0163d1d3b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Apr 2021 15:30:33 +0900
Subject: [PATCH 2337/3722] Fix formatting of colour getter

---
 .../Edit/Checks/Components/IssueTemplate.cs   | 28 +++++++++++++------
 osu.Game/Screens/Edit/Verify/IssueTable.cs    |  2 +-
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
index 5381d54600..6fe8b8de87 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
@@ -66,16 +66,28 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// <summary>
         /// Returns the colour corresponding to the type of this issue.
         /// </summary>
-        public Colour4 TypeColour()
+        public Colour4 Colour
         {
-            return Type switch
+            get
             {
-                IssueType.Problem => problem_red,
-                IssueType.Warning => warning_yellow,
-                IssueType.Negligible => negligible_green,
-                IssueType.Error => error_gray,
-                _ => Color4.White
-            };
+                switch (Type)
+                {
+                    case IssueType.Problem:
+                        return problem_red;
+
+                    case IssueType.Warning:
+                        return warning_yellow;
+
+                    case IssueType.Negligible:
+                        return negligible_green;
+
+                    case IssueType.Error:
+                        return error_gray;
+
+                    default:
+                        return Color4.White;
+                }
+            }
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Verify/IssueTable.cs b/osu.Game/Screens/Edit/Verify/IssueTable.cs
index 5f04c7c4e8..1f275ca537 100644
--- a/osu.Game/Screens/Edit/Verify/IssueTable.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueTable.cs
@@ -97,7 +97,7 @@ namespace osu.Game.Screens.Edit.Verify
                 Text = issue.Template.Type.ToString(),
                 Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold),
                 Margin = new MarginPadding { Right = 10 },
-                Colour = issue.Template.TypeColour()
+                Colour = issue.Template.Colour
             },
             new OsuSpriteText
             {

From f78239c7f238bd64a6272de1c3b5648511f8c581 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Apr 2021 15:32:52 +0900
Subject: [PATCH 2338/3722] Move enums out of nesting

---
 .../Edit/Checks/CheckOffscreenObjects.cs      |  6 +--
 .../Rulesets/Edit/Checks/CheckBackground.cs   |  6 +--
 .../Edit/Checks/Components/CheckCategory.cs   | 41 +++++++++++++++++++
 .../Edit/Checks/Components/CheckMetadata.cs   | 36 ----------------
 .../Rulesets/Edit/Checks/Components/Issue.cs  |  2 +-
 .../Edit/Checks/Components/IssueTemplate.cs   | 20 ---------
 .../Edit/Checks/Components/IssueType.cs       | 25 +++++++++++
 7 files changed, 73 insertions(+), 63 deletions(-)
 create mode 100644 osu.Game/Rulesets/Edit/Checks/Components/CheckCategory.cs
 create mode 100644 osu.Game/Rulesets/Edit/Checks/Components/IssueType.cs

diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index 3d411d6e12..910de76c5f 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
 
         public override CheckMetadata Metadata() => new CheckMetadata
         (
-            category: CheckMetadata.CheckCategory.Compose,
+            category: CheckCategory.Compose,
             description: "Offscreen hitobjects."
         );
 
@@ -36,13 +36,13 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
 
         private readonly IssueTemplate templateOffscreen = new IssueTemplate
         (
-            type: IssueTemplate.IssueType.Problem,
+            type: IssueType.Problem,
             unformattedMessage: "This object goes offscreen on a 4:3 aspect ratio."
         );
 
         private readonly IssueTemplate templateOffscreenSliderPath = new IssueTemplate
         (
-            type: IssueTemplate.IssueType.Problem,
+            type: IssueType.Problem,
             unformattedMessage: "This slider goes offscreen here on a 4:3 aspect ratio."
         );
 
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
index aa10fad77b..2de9d9daae 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Edit.Checks
     {
         public override CheckMetadata Metadata() => new CheckMetadata
         (
-            category: CheckMetadata.CheckCategory.Resources,
+            category: CheckCategory.Resources,
             description: "Missing background."
         );
 
@@ -24,13 +24,13 @@ namespace osu.Game.Rulesets.Edit.Checks
 
         private readonly IssueTemplate templateNoneSet = new IssueTemplate
         (
-            type: IssueTemplate.IssueType.Problem,
+            type: IssueType.Problem,
             unformattedMessage: "No background has been set."
         );
 
         private readonly IssueTemplate templateDoesNotExist = new IssueTemplate
         (
-            type: IssueTemplate.IssueType.Problem,
+            type: IssueType.Problem,
             unformattedMessage: "The background file \"{0}\" is does not exist."
         );
 
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/CheckCategory.cs b/osu.Game/Rulesets/Edit/Checks/Components/CheckCategory.cs
new file mode 100644
index 0000000000..c37a580dd8
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/Checks/Components/CheckCategory.cs
@@ -0,0 +1,41 @@
+// Copyright (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.Edit.Checks.Components
+{
+    /// <summary>
+    /// The category of an issue.
+    /// </summary>
+    public enum CheckCategory
+    {
+        /// <summary> Anything to do with control points. </summary>
+        Timing,
+
+        /// <summary> Anything to do with artist, title, creator, etc. </summary>
+        Metadata,
+
+        /// <summary> Anything to do with non-audio files, e.g. background, skin, sprites, and video. </summary>
+        Resources,
+
+        /// <summary> Anything to do with audio files, e.g. song and hitsounds. </summary>
+        Audio,
+
+        /// <summary> Anything to do with files that don't fit into the above, e.g. unused, osu, or osb. </summary>
+        Files,
+
+        /// <summary> Anything to do with hitobjects unrelated to spread. </summary>
+        Compose,
+
+        /// <summary> Anything to do with difficulty levels or their progression. </summary>
+        Spread,
+
+        /// <summary> Anything to do with variables like CS, OD, AR, HP, and global SV. </summary>
+        Settings,
+
+        /// <summary> Anything to do with hitobject feedback. </summary>
+        Hitsounds,
+
+        /// <summary> Anything to do with storyboarding, breaks, video offset, etc. </summary>
+        Events
+    }
+}
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/CheckMetadata.cs b/osu.Game/Rulesets/Edit/Checks/Components/CheckMetadata.cs
index 38a9a16325..cebb2f5455 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/CheckMetadata.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/CheckMetadata.cs
@@ -5,42 +5,6 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
 {
     public class CheckMetadata
     {
-        /// <summary>
-        /// The category of an issue.
-        /// </summary>
-        public enum CheckCategory
-        {
-            /// <summary> Anything to do with control points. </summary>
-            Timing,
-
-            /// <summary> Anything to do with artist, title, creator, etc. </summary>
-            Metadata,
-
-            /// <summary> Anything to do with non-audio files, e.g. background, skin, sprites, and video. </summary>
-            Resources,
-
-            /// <summary> Anything to do with audio files, e.g. song and hitsounds. </summary>
-            Audio,
-
-            /// <summary> Anything to do with files that don't fit into the above, e.g. unused, osu, or osb. </summary>
-            Files,
-
-            /// <summary> Anything to do with hitobjects unrelated to spread. </summary>
-            Compose,
-
-            /// <summary> Anything to do with difficulty levels or their progression. </summary>
-            Spread,
-
-            /// <summary> Anything to do with variables like CS, OD, AR, HP, and global SV. </summary>
-            Settings,
-
-            /// <summary> Anything to do with hitobject feedback. </summary>
-            Hitsounds,
-
-            /// <summary> Anything to do with storyboarding, breaks, video offset, etc. </summary>
-            Events
-        }
-
         /// <summary>
         /// The category this check belongs to. E.g. <see cref="CheckCategory.Metadata"/>, <see cref="CheckCategory.Timing"/>, or <see cref="CheckCategory.Compose"/>.
         /// </summary>
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs b/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
index 6f6ba2a323..f392fa8ef4 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         public IReadOnlyList<HitObject> HitObjects;
 
         /// <summary>
-        /// The template which this issue is using. This provides properties such as the <see cref="IssueTemplate.IssueType"/>, and the <see cref="IssueTemplate.UnformattedMessage"/>.
+        /// The template which this issue is using. This provides properties such as the <see cref="IssueType"/>, and the <see cref="IssueTemplate.UnformattedMessage"/>.
         /// </summary>
         public IssueTemplate Template;
 
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
index 6fe8b8de87..976341e41c 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
@@ -14,26 +14,6 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         private static readonly Color4 negligible_green = new Colour4(0.33f, 0.8f, 0.5f, 1.0f);
         private static readonly Color4 error_gray = new Colour4(0.5f, 0.5f, 0.5f, 1.0f);
 
-        /// <summary>
-        /// The type, or severity, of an issue. This decides its priority.
-        /// </summary>
-        public enum IssueType
-        {
-            /// <summary> A must-fix in the vast majority of cases. </summary>
-            Problem = 3,
-
-            /// <summary> A possible mistake. Often requires critical thinking.  </summary>
-            Warning = 2,
-
-            // TODO: Try/catch all checks run and return error templates if exceptions occur.
-            /// <summary> An error occurred and a complete check could not be made. </summary>
-            Error = 1,
-
-            // TODO: Negligible issues should be hidden by default.
-            /// <summary> A possible mistake so minor/unlikely that it can often be safely ignored. </summary>
-            Negligible = 0,
-        }
-
         /// <summary>
         /// The check that this template originates from.
         /// </summary>
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/IssueType.cs b/osu.Game/Rulesets/Edit/Checks/Components/IssueType.cs
new file mode 100644
index 0000000000..be43060cfc
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/Checks/Components/IssueType.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.Edit.Checks.Components
+{
+    /// <summary>
+    /// The type, or severity, of an issue. This decides its priority.
+    /// </summary>
+    public enum IssueType
+    {
+        /// <summary> A must-fix in the vast majority of cases. </summary>
+        Problem = 3,
+
+        /// <summary> A possible mistake. Often requires critical thinking.  </summary>
+        Warning = 2,
+
+        // TODO: Try/catch all checks run and return error templates if exceptions occur.
+        /// <summary> An error occurred and a complete check could not be made. </summary>
+        Error = 1,
+
+        // TODO: Negligible issues should be hidden by default.
+        /// <summary> A possible mistake so minor/unlikely that it can often be safely ignored. </summary>
+        Negligible = 0,
+    }
+}

From 8c31e96cdfd657c537dce50a722438fdad7b63dc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Apr 2021 15:37:41 +0900
Subject: [PATCH 2339/3722] Change some methods to get properties

---
 osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs | 2 +-
 osu.Game/Rulesets/Edit/Checks/CheckBackground.cs           | 2 +-
 osu.Game/Rulesets/Edit/Checks/Components/Check.cs          | 4 ++--
 osu.Game/Rulesets/Edit/Checks/Components/Issue.cs          | 5 +----
 osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs  | 2 +-
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index 910de76c5f..b2a00da12a 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
             description: "Offscreen hitobjects."
         );
 
-        public override IEnumerable<IssueTemplate> Templates() => new[]
+        public override IEnumerable<IssueTemplate> PossibleTemplates => new[]
         {
             templateOffscreen,
             templateOffscreenSliderPath
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
index 2de9d9daae..89b2e8293c 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             description: "Missing background."
         );
 
-        public override IEnumerable<IssueTemplate> Templates() => new[]
+        public override IEnumerable<IssueTemplate> PossibleTemplates => new[]
         {
             templateNoneSet,
             templateDoesNotExist
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/Check.cs b/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
index 5a922fde56..550d2ea0a2 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// <summary>
         /// All possible templates for issues that this check may return.
         /// </summary>
-        public abstract IEnumerable<IssueTemplate> Templates();
+        public abstract IEnumerable<IssueTemplate> PossibleTemplates { get; }
 
         /// <summary>
         /// Runs this check and returns any issues detected for the provided beatmap.
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
 
         protected Check()
         {
-            foreach (var template in Templates())
+            foreach (var template in PossibleTemplates)
                 template.Origin = this;
         }
     }
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs b/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
index f392fa8ef4..0d5c5411fd 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
@@ -69,10 +69,7 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
             HitObjects = hitObjectList;
         }
 
-        public override string ToString()
-        {
-            return Template.Message(Arguments);
-        }
+        public override string ToString() => Template.GetMessage(Arguments);
 
         public string GetEditorTimestamp()
         {
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
index 976341e41c..a1156c7c72 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// Returns the formatted message given the arguments used to format it.
         /// </summary>
         /// <param name="args">The arguments used to format the message.</param>
-        public string Message(params object[] args) => UnformattedMessage.FormatWith(args);
+        public string GetMessage(params object[] args) => UnformattedMessage.FormatWith(args);
 
         /// <summary>
         /// Returns the colour corresponding to the type of this issue.

From 78bbc8f5c824ffd35a8dab92ca0082c4e7244d7c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Apr 2021 15:47:32 +0900
Subject: [PATCH 2340/3722] Tidy some remaining code

---
 .../Edit/Checks/Components/CheckCategory.cs   | 42 ++++++++++++++-----
 .../Rulesets/Edit/Checks/Components/Issue.cs  |  6 +--
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/Components/CheckCategory.cs b/osu.Game/Rulesets/Edit/Checks/Components/CheckCategory.cs
index c37a580dd8..ae943cfda9 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/CheckCategory.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/CheckCategory.cs
@@ -8,34 +8,54 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
     /// </summary>
     public enum CheckCategory
     {
-        /// <summary> Anything to do with control points. </summary>
+        /// <summary>
+        /// Anything to do with control points.
+        /// </summary>
         Timing,
 
-        /// <summary> Anything to do with artist, title, creator, etc. </summary>
+        /// <summary>
+        /// Anything to do with artist, title, creator, etc.
+        /// </summary>
         Metadata,
 
-        /// <summary> Anything to do with non-audio files, e.g. background, skin, sprites, and video. </summary>
+        /// <summary>
+        /// Anything to do with non-audio files, e.g. background, skin, sprites, and video.
+        /// </summary>
         Resources,
 
-        /// <summary> Anything to do with audio files, e.g. song and hitsounds. </summary>
+        /// <summary>
+        /// Anything to do with audio files, e.g. song and hitsounds.
+        /// </summary>
         Audio,
 
-        /// <summary> Anything to do with files that don't fit into the above, e.g. unused, osu, or osb. </summary>
+        /// <summary>
+        /// Anything to do with files that don't fit into the above, e.g. unused, osu, or osb.
+        /// </summary>
         Files,
 
-        /// <summary> Anything to do with hitobjects unrelated to spread. </summary>
+        /// <summary>
+        /// Anything to do with hitobjects unrelated to spread.
+        /// </summary>
         Compose,
 
-        /// <summary> Anything to do with difficulty levels or their progression. </summary>
+        /// <summary>
+        /// Anything to do with difficulty levels or their progression.
+        /// </summary>
         Spread,
 
-        /// <summary> Anything to do with variables like CS, OD, AR, HP, and global SV. </summary>
+        /// <summary>
+        /// Anything to do with variables like CS, OD, AR, HP, and global SV.
+        /// </summary>
         Settings,
 
-        /// <summary> Anything to do with hitobject feedback. </summary>
-        Hitsounds,
+        /// <summary>
+        /// Anything to do with hitobject feedback.
+        /// </summary>
+        HitObjects,
 
-        /// <summary> Anything to do with storyboarding, breaks, video offset, etc. </summary>
+        /// <summary>
+        /// Anything to do with storyboarding, breaks, video offset, etc.
+        /// </summary>
         Events
     }
 }
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs b/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
index 0d5c5411fd..7241fabf5b 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
@@ -40,11 +40,7 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
             Arguments = args;
 
             if (template.Origin == null)
-            {
-                throw new ArgumentException(
-                    "A template had no origin. Make sure the `Templates()` method contains all templates used."
-                );
-            }
+                throw new ArgumentException("A template had no origin. Make sure the `Templates()` method contains all templates used.");
         }
 
         public Issue(double? time, IssueTemplate template, params object[] args)

From 8bf85d737c75a71ba9e388842770cfc987f2bed7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Apr 2021 15:52:29 +0900
Subject: [PATCH 2341/3722] Change Metadata into a get property

---
 osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs | 2 +-
 osu.Game/Rulesets/Edit/Checks/CheckBackground.cs           | 2 +-
 osu.Game/Rulesets/Edit/Checks/Components/Check.cs          | 2 +-
 osu.Game/Screens/Edit/Verify/IssueTable.cs                 | 2 +-
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs               | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index b2a00da12a..252f65ab5a 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
         // (higher = more performant, but higher false-negative chance).
         private const int path_step_size = 5;
 
-        public override CheckMetadata Metadata() => new CheckMetadata
+        public override CheckMetadata Metadata { get; } = new CheckMetadata
         (
             category: CheckCategory.Compose,
             description: "Offscreen hitobjects."
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
index 89b2e8293c..22f98b6fd7 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Rulesets.Edit.Checks
 {
     public class CheckBackground : Check
     {
-        public override CheckMetadata Metadata() => new CheckMetadata
+        public override CheckMetadata Metadata { get; } = new CheckMetadata
         (
             category: CheckCategory.Resources,
             description: "Missing background."
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/Check.cs b/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
index 550d2ea0a2..7c039d1572 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// <summary>
         /// The metadata for this check.
         /// </summary>
-        public abstract CheckMetadata Metadata();
+        public abstract CheckMetadata Metadata { get; }
 
         /// <summary>
         /// All possible templates for issues that this check may return.
diff --git a/osu.Game/Screens/Edit/Verify/IssueTable.cs b/osu.Game/Screens/Edit/Verify/IssueTable.cs
index 1f275ca537..84dbabf300 100644
--- a/osu.Game/Screens/Edit/Verify/IssueTable.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueTable.cs
@@ -112,7 +112,7 @@ namespace osu.Game.Screens.Edit.Verify
             },
             new OsuSpriteText
             {
-                Text = issue.Template.Origin.Metadata().Category.ToString(),
+                Text = issue.Template.Origin.Metadata.Category.ToString(),
                 Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold),
                 Margin = new MarginPadding(10)
             }
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index 7a520826f5..0c4aa04ff3 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -130,7 +130,7 @@ namespace osu.Game.Screens.Edit.Verify
             {
                 table.Issues = beatmapVerifier.Run(Beatmap)
                                               .OrderByDescending(issue => issue.Template.Type)
-                                              .ThenByDescending(issue => issue.Template.Origin.Metadata().Category);
+                                              .ThenByDescending(issue => issue.Template.Origin.Metadata.Category);
             }
         }
     }

From 42604afcdcf9ed0ae922b07434b4587ad4b4c85d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Apr 2021 16:15:27 +0900
Subject: [PATCH 2342/3722] Add binding for verify mode (and move enum entry to
 end)

---
 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 3ea7f5f5fa..36e465720a 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -70,6 +70,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.F2 }, GlobalAction.EditorDesignMode),
             new KeyBinding(new[] { InputKey.F3 }, GlobalAction.EditorTimingMode),
             new KeyBinding(new[] { InputKey.F4 }, GlobalAction.EditorSetupMode),
+            new KeyBinding(new[] { InputKey.Control, InputKey.Shift, InputKey.A }, GlobalAction.EditorVerifyMode),
         };
 
         public IEnumerable<KeyBinding> InGameKeyBindings => new[]
@@ -225,9 +226,6 @@ namespace osu.Game.Input.Bindings
         [Description("Timing mode")]
         EditorTimingMode,
 
-        [Description("Verify mode")]
-        EditorVerifyMode,
-
         [Description("Hold for HUD")]
         HoldForHUD,
 
@@ -252,5 +250,8 @@ namespace osu.Game.Input.Bindings
 
         [Description("Beatmap Options")]
         ToggleBeatmapOptions,
+
+        [Description("Verify mode")]
+        EditorVerifyMode,
     }
 }

From e19e8ff2a3252b9adde46dae589ce8d2a134f4dc Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 12 Apr 2021 15:52:43 +0900
Subject: [PATCH 2343/3722] Rewrite FramedReplayInputHandler for robustness

This commit changes the semantics of `CurrentFrame` and `NextFrame` of the class.
The ordering of `NextFrame.Time` and `CurrentFrame.Time` was dependent on the current direction.
Now, it should always satisfy `CurrentFrame.Time <= CurrentTime <= NextFrame.Time` except at the start/end.
This change, however, doesn't break existing deriving classes if the template code pattern usage of interpolation is used.
The deriving class code can be simplified due to the elimination of nullable types. I didn't include those changes in this commit.

I removed `StreamingFramedReplayInputHandlerTest` for now, as it is almost-duplicate of `FramedReplayInputHandlerTest`. I'll include more tests in later commits.

This commit fixes #6150.
---
 .../NonVisual/FramedReplayInputHandlerTest.cs |  81 ++---
 .../StreamingFramedReplayInputHandlerTest.cs  | 296 ------------------
 .../Visual/Gameplay/TestSceneSpectator.cs     |   4 +-
 .../Replays/FramedReplayInputHandler.cs       | 167 +++++-----
 4 files changed, 109 insertions(+), 439 deletions(-)
 delete mode 100644 osu.Game.Tests/NonVisual/StreamingFramedReplayInputHandlerTest.cs

diff --git a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
index 92a60663de..b4fc081a2a 100644
--- a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
+++ b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
@@ -37,11 +37,6 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestNormalPlayback()
         {
-            Assert.IsNull(handler.CurrentFrame);
-
-            confirmCurrentFrame(null);
-            confirmNextFrame(0);
-
             setTime(0, 0);
             confirmCurrentFrame(0);
             confirmNextFrame(1);
@@ -97,22 +92,22 @@ namespace osu.Game.Tests.NonVisual
             // exited important section
             setTime(8200, 8000);
             confirmCurrentFrame(7);
-            confirmNextFrame(null);
+            confirmNextFrame(7);
 
             setTime(8200, 8200);
             confirmCurrentFrame(7);
-            confirmNextFrame(null);
+            confirmNextFrame(7);
         }
 
         [Test]
         public void TestIntroTime()
         {
             setTime(-1000, -1000);
-            confirmCurrentFrame(null);
+            confirmCurrentFrame(0);
             confirmNextFrame(0);
 
             setTime(-500, -500);
-            confirmCurrentFrame(null);
+            confirmCurrentFrame(0);
             confirmNextFrame(0);
 
             setTime(0, 0);
@@ -133,29 +128,29 @@ namespace osu.Game.Tests.NonVisual
             // pivot without crossing a frame boundary
             setTime(2700, 2700);
             confirmCurrentFrame(2);
-            confirmNextFrame(1);
+            confirmNextFrame(3);
 
-            // cross current frame boundary; should not yet update frame
-            setTime(1980, 1980);
+            // cross current frame boundary
+            setTime(1980, 2000);
             confirmCurrentFrame(2);
-            confirmNextFrame(1);
+            confirmNextFrame(3);
 
             setTime(1200, 1200);
-            confirmCurrentFrame(2);
-            confirmNextFrame(1);
+            confirmCurrentFrame(1);
+            confirmNextFrame(2);
 
             // ensure each frame plays out until start
             setTime(-500, 1000);
             confirmCurrentFrame(1);
-            confirmNextFrame(0);
+            confirmNextFrame(2);
 
             setTime(-500, 0);
             confirmCurrentFrame(0);
-            confirmNextFrame(null);
+            confirmNextFrame(1);
 
             setTime(-500, -500);
             confirmCurrentFrame(0);
-            confirmNextFrame(null);
+            confirmNextFrame(0);
         }
 
         [Test]
@@ -168,12 +163,12 @@ namespace osu.Game.Tests.NonVisual
             confirmNextFrame(5);
 
             setTime(3500, null);
-            confirmCurrentFrame(4);
-            confirmNextFrame(3);
+            confirmCurrentFrame(3);
+            confirmNextFrame(4);
 
             setTime(3000, 3000);
             confirmCurrentFrame(3);
-            confirmNextFrame(2);
+            confirmNextFrame(4);
 
             setTime(3500, null);
             confirmCurrentFrame(3);
@@ -187,17 +182,17 @@ namespace osu.Game.Tests.NonVisual
             confirmCurrentFrame(4);
             confirmNextFrame(5);
 
-            setTime(4000, null);
+            setTime(4000, 4000);
             confirmCurrentFrame(4);
             confirmNextFrame(5);
 
             setTime(3500, null);
-            confirmCurrentFrame(4);
-            confirmNextFrame(3);
+            confirmCurrentFrame(3);
+            confirmNextFrame(4);
 
             setTime(3000, 3000);
             confirmCurrentFrame(3);
-            confirmNextFrame(2);
+            confirmNextFrame(4);
         }
 
         [Test]
@@ -209,24 +204,24 @@ namespace osu.Game.Tests.NonVisual
             confirmNextFrame(4);
 
             setTime(3200, null);
-            // next frame doesn't change even though direction reversed, because of important section.
             confirmCurrentFrame(3);
             confirmNextFrame(4);
 
-            setTime(3000, null);
+            setTime(3000, 3000);
             confirmCurrentFrame(3);
             confirmNextFrame(4);
 
             setTime(2800, 2800);
-            confirmCurrentFrame(3);
-            confirmNextFrame(2);
+            confirmCurrentFrame(2);
+            confirmNextFrame(3);
         }
 
         private void fastForwardToPoint(double destination)
         {
             for (int i = 0; i < 1000; i++)
             {
-                if (handler.SetFrameFromTime(destination) == null)
+                var time = handler.SetFrameFromTime(destination);
+                if (time == null || time == destination)
                     return;
             }
 
@@ -235,33 +230,17 @@ namespace osu.Game.Tests.NonVisual
 
         private void setTime(double set, double? expect)
         {
-            Assert.AreEqual(expect, handler.SetFrameFromTime(set));
+            Assert.AreEqual(expect, handler.SetFrameFromTime(set), "Unexpected return value");
         }
 
-        private void confirmCurrentFrame(int? frame)
+        private void confirmCurrentFrame(int frame)
         {
-            if (frame.HasValue)
-            {
-                Assert.IsNotNull(handler.CurrentFrame);
-                Assert.AreEqual(replay.Frames[frame.Value].Time, handler.CurrentFrame.Time);
-            }
-            else
-            {
-                Assert.IsNull(handler.CurrentFrame);
-            }
+            Assert.AreEqual(replay.Frames[frame].Time, handler.CurrentFrame.Time, "Unexpected current frame");
         }
 
-        private void confirmNextFrame(int? frame)
+        private void confirmNextFrame(int frame)
         {
-            if (frame.HasValue)
-            {
-                Assert.IsNotNull(handler.NextFrame);
-                Assert.AreEqual(replay.Frames[frame.Value].Time, handler.NextFrame.Time);
-            }
-            else
-            {
-                Assert.IsNull(handler.NextFrame);
-            }
+            Assert.AreEqual(replay.Frames[frame].Time, handler.NextFrame.Time, "Unexpected next frame");
         }
 
         private class TestReplayFrame : ReplayFrame
diff --git a/osu.Game.Tests/NonVisual/StreamingFramedReplayInputHandlerTest.cs b/osu.Game.Tests/NonVisual/StreamingFramedReplayInputHandlerTest.cs
deleted file mode 100644
index 21ec29b10b..0000000000
--- a/osu.Game.Tests/NonVisual/StreamingFramedReplayInputHandlerTest.cs
+++ /dev/null
@@ -1,296 +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 NUnit.Framework;
-using osu.Game.Replays;
-using osu.Game.Rulesets.Replays;
-
-namespace osu.Game.Tests.NonVisual
-{
-    [TestFixture]
-    public class StreamingFramedReplayInputHandlerTest
-    {
-        private Replay replay;
-        private TestInputHandler handler;
-
-        [SetUp]
-        public void SetUp()
-        {
-            handler = new TestInputHandler(replay = new Replay
-            {
-                HasReceivedAllFrames = false,
-                Frames = new List<ReplayFrame>
-                {
-                    new TestReplayFrame(0),
-                    new TestReplayFrame(1000),
-                    new TestReplayFrame(2000),
-                    new TestReplayFrame(3000, true),
-                    new TestReplayFrame(4000, true),
-                    new TestReplayFrame(5000, true),
-                    new TestReplayFrame(7000, true),
-                    new TestReplayFrame(8000),
-                }
-            });
-        }
-
-        [Test]
-        public void TestNormalPlayback()
-        {
-            Assert.IsNull(handler.CurrentFrame);
-
-            confirmCurrentFrame(null);
-            confirmNextFrame(0);
-
-            setTime(0, 0);
-            confirmCurrentFrame(0);
-            confirmNextFrame(1);
-
-            // if we hit the first frame perfectly, time should progress to it.
-            setTime(1000, 1000);
-            confirmCurrentFrame(1);
-            confirmNextFrame(2);
-
-            // in between non-important frames should progress based on input.
-            setTime(1200, 1200);
-            confirmCurrentFrame(1);
-
-            setTime(1400, 1400);
-            confirmCurrentFrame(1);
-
-            // progressing beyond the next frame should force time to that frame once.
-            setTime(2200, 2000);
-            confirmCurrentFrame(2);
-
-            // second attempt should progress to input time
-            setTime(2200, 2200);
-            confirmCurrentFrame(2);
-
-            // entering important section
-            setTime(3000, 3000);
-            confirmCurrentFrame(3);
-
-            // cannot progress within
-            setTime(3500, null);
-            confirmCurrentFrame(3);
-
-            setTime(4000, 4000);
-            confirmCurrentFrame(4);
-
-            // still cannot progress
-            setTime(4500, null);
-            confirmCurrentFrame(4);
-
-            setTime(5200, 5000);
-            confirmCurrentFrame(5);
-
-            // important section AllowedImportantTimeSpan allowance
-            setTime(5200, 5200);
-            confirmCurrentFrame(5);
-
-            setTime(7200, 7000);
-            confirmCurrentFrame(6);
-
-            setTime(7200, null);
-            confirmCurrentFrame(6);
-
-            // exited important section
-            setTime(8200, 8000);
-            confirmCurrentFrame(7);
-            confirmNextFrame(null);
-
-            setTime(8200, null);
-            confirmCurrentFrame(7);
-            confirmNextFrame(null);
-
-            setTime(8400, null);
-            confirmCurrentFrame(7);
-            confirmNextFrame(null);
-        }
-
-        [Test]
-        public void TestIntroTime()
-        {
-            setTime(-1000, -1000);
-            confirmCurrentFrame(null);
-            confirmNextFrame(0);
-
-            setTime(-500, -500);
-            confirmCurrentFrame(null);
-            confirmNextFrame(0);
-
-            setTime(0, 0);
-            confirmCurrentFrame(0);
-            confirmNextFrame(1);
-        }
-
-        [Test]
-        public void TestBasicRewind()
-        {
-            setTime(2800, 0);
-            setTime(2800, 1000);
-            setTime(2800, 2000);
-            setTime(2800, 2800);
-            confirmCurrentFrame(2);
-            confirmNextFrame(3);
-
-            // pivot without crossing a frame boundary
-            setTime(2700, 2700);
-            confirmCurrentFrame(2);
-            confirmNextFrame(1);
-
-            // cross current frame boundary; should not yet update frame
-            setTime(1980, 1980);
-            confirmCurrentFrame(2);
-            confirmNextFrame(1);
-
-            setTime(1200, 1200);
-            confirmCurrentFrame(2);
-            confirmNextFrame(1);
-
-            // ensure each frame plays out until start
-            setTime(-500, 1000);
-            confirmCurrentFrame(1);
-            confirmNextFrame(0);
-
-            setTime(-500, 0);
-            confirmCurrentFrame(0);
-            confirmNextFrame(null);
-
-            setTime(-500, -500);
-            confirmCurrentFrame(0);
-            confirmNextFrame(null);
-        }
-
-        [Test]
-        public void TestRewindInsideImportantSection()
-        {
-            fastForwardToPoint(3000);
-
-            setTime(4000, 4000);
-            confirmCurrentFrame(4);
-            confirmNextFrame(5);
-
-            setTime(3500, null);
-            confirmCurrentFrame(4);
-            confirmNextFrame(3);
-
-            setTime(3000, 3000);
-            confirmCurrentFrame(3);
-            confirmNextFrame(2);
-
-            setTime(3500, null);
-            confirmCurrentFrame(3);
-            confirmNextFrame(4);
-
-            setTime(4000, 4000);
-            confirmCurrentFrame(4);
-            confirmNextFrame(5);
-
-            setTime(4500, null);
-            confirmCurrentFrame(4);
-            confirmNextFrame(5);
-
-            setTime(4000, null);
-            confirmCurrentFrame(4);
-            confirmNextFrame(5);
-
-            setTime(3500, null);
-            confirmCurrentFrame(4);
-            confirmNextFrame(3);
-
-            setTime(3000, 3000);
-            confirmCurrentFrame(3);
-            confirmNextFrame(2);
-        }
-
-        [Test]
-        public void TestRewindOutOfImportantSection()
-        {
-            fastForwardToPoint(3500);
-
-            confirmCurrentFrame(3);
-            confirmNextFrame(4);
-
-            setTime(3200, null);
-            // next frame doesn't change even though direction reversed, because of important section.
-            confirmCurrentFrame(3);
-            confirmNextFrame(4);
-
-            setTime(3000, null);
-            confirmCurrentFrame(3);
-            confirmNextFrame(4);
-
-            setTime(2800, 2800);
-            confirmCurrentFrame(3);
-            confirmNextFrame(2);
-        }
-
-        private void fastForwardToPoint(double destination)
-        {
-            for (int i = 0; i < 1000; i++)
-            {
-                if (handler.SetFrameFromTime(destination) == null)
-                    return;
-            }
-
-            throw new TimeoutException("Seek was never fulfilled");
-        }
-
-        private void setTime(double set, double? expect)
-        {
-            Assert.AreEqual(expect, handler.SetFrameFromTime(set));
-        }
-
-        private void confirmCurrentFrame(int? frame)
-        {
-            if (frame.HasValue)
-            {
-                Assert.IsNotNull(handler.CurrentFrame);
-                Assert.AreEqual(replay.Frames[frame.Value].Time, handler.CurrentFrame.Time);
-            }
-            else
-            {
-                Assert.IsNull(handler.CurrentFrame);
-            }
-        }
-
-        private void confirmNextFrame(int? frame)
-        {
-            if (frame.HasValue)
-            {
-                Assert.IsNotNull(handler.NextFrame);
-                Assert.AreEqual(replay.Frames[frame.Value].Time, handler.NextFrame.Time);
-            }
-            else
-            {
-                Assert.IsNull(handler.NextFrame);
-            }
-        }
-
-        private class TestReplayFrame : ReplayFrame
-        {
-            public readonly bool IsImportant;
-
-            public TestReplayFrame(double time, bool isImportant = false)
-                : base(time)
-            {
-                IsImportant = isImportant;
-            }
-        }
-
-        private class TestInputHandler : FramedReplayInputHandler<TestReplayFrame>
-        {
-            public TestInputHandler(Replay replay)
-                : base(replay)
-            {
-                FrameAccuratePlayback = true;
-            }
-
-            protected override double AllowedImportantTimeSpan => 1000;
-
-            protected override bool IsImportant(TestReplayFrame frame) => frame.IsImportant;
-        }
-    }
-}
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 9d85a9995d..9f1faa8e26 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -83,7 +83,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             waitForPlayer();
             AddAssert("ensure frames arrived", () => replayHandler.HasFrames);
 
-            AddUntilStep("wait for frame starvation", () => replayHandler.NextFrame == null);
+            AddUntilStep("wait for frame starvation", () => replayHandler.WaitingNextFrame);
             checkPaused(true);
 
             double? pausedTime = null;
@@ -92,7 +92,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             sendFrames();
 
-            AddUntilStep("wait for frame starvation", () => replayHandler.NextFrame == null);
+            AddUntilStep("wait for frame starvation", () => replayHandler.WaitingNextFrame);
             checkPaused(true);
 
             AddAssert("time advanced", () => currentFrameStableTime > pausedTime);
diff --git a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
index 5eaccc766e..f527c0e105 100644
--- a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
+++ b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
@@ -1,9 +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 enable
+
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using JetBrains.Annotations;
 using osu.Game.Input.Handlers;
 using osu.Game.Replays;
@@ -17,70 +18,80 @@ namespace osu.Game.Rulesets.Replays
     public abstract class FramedReplayInputHandler<TFrame> : ReplayInputHandler
         where TFrame : ReplayFrame
     {
-        public override bool IsActive => HasFrames;
+        /// <summary>
+        /// Whether we have at least one replay frame.
+        /// </summary>
+        public bool HasFrames => Frames.Count != 0;
 
-        private readonly Replay replay;
-
-        protected List<ReplayFrame> Frames => replay.Frames;
+        /// <summary>
+        /// Whether we are waiting for new frames to be received.
+        /// </summary>
+        public bool WaitingNextFrame => !replay.HasReceivedAllFrames && currentFrameIndex == Frames.Count - 1;
 
+        /// <summary>
+        /// The current frame of the replay.
+        /// The current time is always between the start and the end time of the current frame.
+        /// </summary>
+        /// <exception cref="InvalidOperationException">The replay is empty.</exception>
         public TFrame CurrentFrame
         {
             get
             {
                 if (!HasFrames)
-                    throw new InvalidOperationException($"Cannot get {nameof(CurrentFrame)} of the empty replay");
+                    throw new InvalidOperationException($"Attempted to get {nameof(CurrentFrame)} of an empty replay");
 
-                if (!currentFrameIndex.HasValue)
-                    return null;
-
-                return (TFrame)Frames[currentFrameIndex.Value];
+                return (TFrame)Frames[Math.Max(0, currentFrameIndex)];
             }
         }
 
+        /// <summary>
+        /// The next frame of the replay.
+        /// The start time is always greater or equals to the start time of <see cref="CurrentFrame"/> regardless of the seeking direction.
+        /// If it is before the first frame of the replay or the after the last frame of the replay, <see cref="CurrentFrame"/> and <see cref="NextFrame"/> agree.
+        /// </summary>
+        /// <exception cref="InvalidOperationException">The replay is empty.</exception>
         public TFrame NextFrame
         {
             get
             {
                 if (!HasFrames)
-                    throw new InvalidOperationException($"Cannot get {nameof(NextFrame)} of the empty replay");
+                    throw new InvalidOperationException($"Attempted to get {nameof(NextFrame)} of an empty replay");
 
-                if (!currentFrameIndex.HasValue)
-                    return currentDirection > 0 ? (TFrame)Frames[0] : null;
-
-                int nextFrame = clampedNextFrameIndex;
-
-                if (nextFrame == currentFrameIndex.Value)
-                    return null;
-
-                return (TFrame)Frames[clampedNextFrameIndex];
+                return (TFrame)Frames[Math.Min(currentFrameIndex + 1, Frames.Count - 1)];
             }
         }
 
-        private int? currentFrameIndex;
-
-        private int clampedNextFrameIndex =>
-            currentFrameIndex.HasValue ? Math.Clamp(currentFrameIndex.Value + currentDirection, 0, Frames.Count - 1) : 0;
-
-        protected FramedReplayInputHandler(Replay replay)
-        {
-            this.replay = replay;
-        }
-
-        private const double sixty_frame_time = 1000.0 / 60;
-
-        protected virtual double AllowedImportantTimeSpan => sixty_frame_time * 1.2;
-
-        protected double? CurrentTime { get; private set; }
-
-        private int currentDirection = 1;
-
         /// <summary>
         /// When set, we will ensure frames executed by nested drawables are frame-accurate to replay data.
         /// Disabling this can make replay playback smoother (useful for autoplay, currently).
         /// </summary>
         public bool FrameAccuratePlayback;
 
-        public bool HasFrames => Frames.Count > 0;
+        // This input handler should be enabled only if there is at least one replay frame.
+        public override bool IsActive => HasFrames;
+
+        // Can make it non-null but that is a breaking change.
+        protected double? CurrentTime { get; private set; }
+
+        protected virtual double AllowedImportantTimeSpan => sixty_frame_time * 1.2;
+
+        protected List<ReplayFrame> Frames => replay.Frames;
+
+        private readonly Replay replay;
+
+        private int currentFrameIndex;
+
+        private const double sixty_frame_time = 1000.0 / 60;
+
+        protected FramedReplayInputHandler(Replay replay)
+        {
+            // This replay frame ordering should be enforced on the Replay type
+            replay.Frames.Sort((x, y) => x.Time.CompareTo(y.Time));
+
+            this.replay = replay;
+            currentFrameIndex = -1;
+            CurrentTime = double.NegativeInfinity;
+        }
 
         private bool inImportantSection
         {
@@ -89,13 +100,8 @@ namespace osu.Game.Rulesets.Replays
                 if (!HasFrames || !FrameAccuratePlayback)
                     return false;
 
-                var frame = currentDirection > 0 ? CurrentFrame : NextFrame;
-
-                if (frame == null)
-                    return false;
-
-                return IsImportant(frame) && // a button is in a pressed state
-                       Math.Abs(CurrentTime - NextFrame?.Time ?? 0) <= AllowedImportantTimeSpan; // the next frame is within an allowable time span
+                return IsImportant(CurrentFrame) && // a button is in a pressed state
+                       Math.Abs(CurrentTime - NextFrame.Time ?? 0) <= AllowedImportantTimeSpan; // the next frame is within an allowable time span
             }
         }
 
@@ -110,71 +116,52 @@ namespace osu.Game.Rulesets.Replays
         /// <returns>The usable time value. If null, we should not advance time as we do not have enough data.</returns>
         public override double? SetFrameFromTime(double time)
         {
-            updateDirection(time);
-
-            Debug.Assert(currentDirection != 0);
-
             if (!HasFrames)
             {
-                // in the case all frames are received, allow time to progress regardless.
+                // In the case all frames are received, allow time to progress regardless.
                 if (replay.HasReceivedAllFrames)
                     return CurrentTime = time;
 
                 return null;
             }
 
-            TFrame next = NextFrame;
+            double frameStart = getFrameTime(currentFrameIndex);
+            double frameEnd = getFrameTime(currentFrameIndex + 1);
 
-            // if we have a next frame, check if it is before or at the current time in playback, and advance time to it if so.
-            if (next != null)
+            // If the proposed time is after the current frame end time, we progress forwards.
+            // If the proposed time is before the current frame start time, and we are at the frame boundary, we progress backwards.
+            if (frameEnd <= time)
             {
-                int compare = time.CompareTo(next.Time);
-
-                if (compare == 0 || compare == currentDirection)
-                {
-                    currentFrameIndex = clampedNextFrameIndex;
-                    return CurrentTime = CurrentFrame.Time;
-                }
+                time = frameEnd;
+                currentFrameIndex++;
             }
+            else if (time < frameStart && CurrentTime == frameStart)
+                currentFrameIndex--;
 
-            // at this point, the frame index can't be advanced.
-            // even so, we may be able to propose the clock progresses forward due to being at an extent of the replay,
-            // or moving towards the next valid frame (ie. interpolating in a non-important section).
+            frameStart = getFrameTime(currentFrameIndex);
+            frameEnd = getFrameTime(currentFrameIndex + 1);
 
-            // the exception is if currently in an important section, which is respected above all.
-            if (inImportantSection)
+            // Pause until more frames are arrived.
+            if (WaitingNextFrame && frameStart < time)
             {
-                Debug.Assert(next != null || !replay.HasReceivedAllFrames);
+                CurrentTime = frameStart;
                 return null;
             }
 
-            // if a next frame does exist, allow interpolation.
-            if (next != null)
-                return CurrentTime = time;
+            CurrentTime = Math.Clamp(time, frameStart, frameEnd);
 
-            // if all frames have been received, allow playing beyond extents.
-            if (replay.HasReceivedAllFrames)
-                return CurrentTime = time;
-
-            // if not all frames are received but we are before the first frame, allow playing.
-            if (time < Frames[0].Time)
-                return CurrentTime = time;
-
-            // in the case we have no next frames and haven't received enough frame data, block.
-            return null;
+            // In an important section, a mid-frame time cannot be used and a null is returned instead.
+            return inImportantSection && frameStart < time && time < frameEnd ? null : CurrentTime;
         }
 
-        private void updateDirection(double time)
+        private double getFrameTime(int index)
         {
-            if (!CurrentTime.HasValue)
-            {
-                currentDirection = 1;
-            }
-            else
-            {
-                currentDirection = time.CompareTo(CurrentTime);
-                if (currentDirection == 0) currentDirection = 1;
-            }
+            if (index < 0)
+                return double.NegativeInfinity;
+            if (index >= Frames.Count)
+                return double.PositiveInfinity;
+
+            return Frames[index].Time;
         }
     }
 }

From 3c28c09ab5073c20a8eaebb8ce043a6cdc16b77f Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 12 Apr 2021 16:18:35 +0900
Subject: [PATCH 2344/3722] Add more FramedReplayInputHandler tests

---
 .../NonVisual/FramedReplayInputHandlerTest.cs | 100 ++++++++++++++++--
 1 file changed, 89 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
index b4fc081a2a..64af4b6db6 100644
--- a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
+++ b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
@@ -20,23 +20,15 @@ namespace osu.Game.Tests.NonVisual
         {
             handler = new TestInputHandler(replay = new Replay
             {
-                Frames = new List<ReplayFrame>
-                {
-                    new TestReplayFrame(0),
-                    new TestReplayFrame(1000),
-                    new TestReplayFrame(2000),
-                    new TestReplayFrame(3000, true),
-                    new TestReplayFrame(4000, true),
-                    new TestReplayFrame(5000, true),
-                    new TestReplayFrame(7000, true),
-                    new TestReplayFrame(8000),
-                }
+                HasReceivedAllFrames = false
             });
         }
 
         [Test]
         public void TestNormalPlayback()
         {
+            setReplayFrames();
+
             setTime(0, 0);
             confirmCurrentFrame(0);
             confirmNextFrame(1);
@@ -102,6 +94,8 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestIntroTime()
         {
+            setReplayFrames();
+
             setTime(-1000, -1000);
             confirmCurrentFrame(0);
             confirmNextFrame(0);
@@ -118,6 +112,8 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestBasicRewind()
         {
+            setReplayFrames();
+
             setTime(2800, 0);
             setTime(2800, 1000);
             setTime(2800, 2000);
@@ -156,6 +152,7 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestRewindInsideImportantSection()
         {
+            setReplayFrames();
             fastForwardToPoint(3000);
 
             setTime(4000, 4000);
@@ -198,6 +195,7 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestRewindOutOfImportantSection()
         {
+            setReplayFrames();
             fastForwardToPoint(3500);
 
             confirmCurrentFrame(3);
@@ -216,6 +214,86 @@ namespace osu.Game.Tests.NonVisual
             confirmNextFrame(3);
         }
 
+        [Test]
+        public void TestReplayStreaming()
+        {
+            // no frames are arrived yet
+            setTime(0, null);
+            setTime(1000, null);
+            Assert.IsTrue(handler.WaitingNextFrame, "Should be waiting for the first frame");
+
+            replay.Frames.Add(new TestReplayFrame(0));
+            replay.Frames.Add(new TestReplayFrame(1000));
+
+            // should always play from beginning
+            setTime(1000, 0);
+            confirmCurrentFrame(0);
+            Assert.IsFalse(handler.WaitingNextFrame, "Should not be waiting yet");
+            setTime(1000, 1000);
+            confirmCurrentFrame(1);
+            confirmNextFrame(1);
+            Assert.IsTrue(handler.WaitingNextFrame, "Should be waiting");
+
+            // cannot seek beyond the last frame
+            setTime(1500, null);
+            confirmCurrentFrame(1);
+
+            setTime(-100, 0);
+            confirmCurrentFrame(0);
+
+            // can seek to the point before the first frame, however
+            setTime(-100, -100);
+            confirmCurrentFrame(0);
+            confirmNextFrame(0);
+
+            fastForwardToPoint(1000);
+            setTime(3000, null);
+            replay.Frames.Add(new TestReplayFrame(2000));
+            confirmCurrentFrame(1);
+            setTime(1000, 1000);
+            setTime(3000, 2000);
+        }
+
+        [Test]
+        public void TestMultipleFramesSameTime()
+        {
+            replay.Frames.Add(new TestReplayFrame(0));
+            replay.Frames.Add(new TestReplayFrame(0));
+            replay.Frames.Add(new TestReplayFrame(1000));
+            replay.Frames.Add(new TestReplayFrame(1000));
+            replay.Frames.Add(new TestReplayFrame(2000));
+
+            // forward direction is prioritized when multiple frames have the same time.
+            setTime(0, 0);
+            setTime(0, 0);
+
+            setTime(2000, 1000);
+            setTime(2000, 1000);
+
+            setTime(1000, 1000);
+            setTime(1000, 1000);
+            setTime(-100, 1000);
+            setTime(-100, 0);
+            setTime(-100, 0);
+            setTime(-100, -100);
+        }
+
+        private void setReplayFrames()
+        {
+            replay.Frames = new List<ReplayFrame>
+            {
+                new TestReplayFrame(0),
+                new TestReplayFrame(1000),
+                new TestReplayFrame(2000),
+                new TestReplayFrame(3000, true),
+                new TestReplayFrame(4000, true),
+                new TestReplayFrame(5000, true),
+                new TestReplayFrame(7000, true),
+                new TestReplayFrame(8000),
+            };
+            replay.HasReceivedAllFrames = true;
+        }
+
         private void fastForwardToPoint(double destination)
         {
             for (int i = 0; i < 1000; i++)

From 0eab9daf13bb406d2b82c1f624dbb7e483f0ab40 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Apr 2021 16:41:36 +0900
Subject: [PATCH 2345/3722] Update existing overlay containers to not block
 scroll input

---
 osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs      | 2 ++
 .../Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs | 2 ++
 osu.Game/Screens/Play/GameplayMenuOverlay.cs                    | 2 ++
 osu.Game/Screens/Play/SongProgress.cs                           | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
index fbf2ffd4bd..e168f265dd 100644
--- a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
+++ b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
@@ -23,6 +23,8 @@ namespace osu.Game.Graphics.Containers
         protected virtual string PopInSampleName => "UI/overlay-pop-in";
         protected virtual string PopOutSampleName => "UI/overlay-pop-out";
 
+        protected override bool BlockScrollInput => false;
+
         protected override bool BlockNonPositionalInput => true;
 
         /// <summary>
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs
index ea3951fc3b..5699da740c 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs
@@ -19,6 +19,8 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
 
         protected OnlinePlayComposite Settings { get; set; }
 
+        protected override bool BlockScrollInput => false;
+
         [BackgroundDependencyLoader]
         private void load()
         {
diff --git a/osu.Game/Screens/Play/GameplayMenuOverlay.cs b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
index f938839be3..4a28da0dde 100644
--- a/osu.Game/Screens/Play/GameplayMenuOverlay.cs
+++ b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
@@ -31,6 +31,8 @@ namespace osu.Game.Screens.Play
 
         protected override bool BlockNonPositionalInput => true;
 
+        protected override bool BlockScrollInput => false;
+
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
 
         public Action OnRetry;
diff --git a/osu.Game/Screens/Play/SongProgress.cs b/osu.Game/Screens/Play/SongProgress.cs
index acf4640aa4..6c7cb9376c 100644
--- a/osu.Game/Screens/Play/SongProgress.cs
+++ b/osu.Game/Screens/Play/SongProgress.cs
@@ -45,6 +45,8 @@ namespace osu.Game.Screens.Play
         public override bool HandleNonPositionalInput => AllowSeeking.Value;
         public override bool HandlePositionalInput => AllowSeeking.Value;
 
+        protected override bool BlockScrollInput => false;
+
         private double firstHitTime => objects.First().StartTime;
 
         private IEnumerable<HitObject> objects;

From 65ebdd8f7a48c57f31e46acd21ac3369f8521be9 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 12 Apr 2021 10:08:08 +0200
Subject: [PATCH 2346/3722] Move check origin from `IssueTemplate` to `Issue`

As a result we can also make check an interface, and need to provide the check itself when constructing an issue.
---
 .../Edit/Checks/CheckOffscreenObjects.cs      | 14 +++++------
 .../Edit/OsuBeatmapVerifier.cs                |  2 +-
 osu.Game/Rulesets/Edit/BeatmapVerifier.cs     |  2 +-
 .../Rulesets/Edit/Checks/CheckBackground.cs   | 12 +++++-----
 .../Rulesets/Edit/Checks/Components/Check.cs  | 14 ++++-------
 .../Rulesets/Edit/Checks/Components/Issue.cs  | 23 +++++++++++--------
 .../Edit/Checks/Components/IssueTemplate.cs   |  5 ----
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs  |  2 +-
 8 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index 252f65ab5a..b34c9966a4 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -9,7 +9,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Edit.Checks
 {
-    public class CheckOffscreenObjects : Check
+    public class CheckOffscreenObjects : ICheck
     {
         // These are close approximates to the edges of the screen
         // in gameplay on a 4:3 aspect ratio for osu!stable.
@@ -22,13 +22,13 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
         // (higher = more performant, but higher false-negative chance).
         private const int path_step_size = 5;
 
-        public override CheckMetadata Metadata { get; } = new CheckMetadata
+        public CheckMetadata Metadata { get; } = new CheckMetadata
         (
             category: CheckCategory.Compose,
             description: "Offscreen hitobjects."
         );
 
-        public override IEnumerable<IssueTemplate> PossibleTemplates => new[]
+        public IEnumerable<IssueTemplate> PossibleTemplates => new[]
         {
             templateOffscreen,
             templateOffscreenSliderPath
@@ -46,7 +46,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
             unformattedMessage: "This slider goes offscreen here on a 4:3 aspect ratio."
         );
 
-        public override IEnumerable<Issue> Run(IBeatmap beatmap)
+        public IEnumerable<Issue> Run(IBeatmap beatmap)
         {
             foreach (var hitobject in beatmap.HitObjects)
             {
@@ -63,7 +63,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
                     case HitCircle circle:
                     {
                         if (isOffscreen(circle.StackedPosition, circle.Radius))
-                            yield return new Issue(circle, templateOffscreen);
+                            yield return new Issue(this, circle, templateOffscreen);
 
                         break;
                     }
@@ -89,7 +89,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
 
                 // `SpanDuration` ensures we don't include reverses.
                 double time = slider.StartTime + progress * slider.SpanDuration;
-                yield return new Issue(slider, templateOffscreenSliderPath) { Time = time };
+                yield return new Issue(this, slider, templateOffscreenSliderPath) { Time = time };
 
                 yield break;
             }
@@ -98,7 +98,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
             if (!isOffscreen(slider.StackedEndPosition, slider.Radius))
                 yield break;
 
-            yield return new Issue(slider, templateOffscreenSliderPath) { Time = slider.EndTime };
+            yield return new Issue(this, slider, templateOffscreenSliderPath) { Time = slider.EndTime };
         }
 
         private bool isOffscreen(Vector2 position, double radius)
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
index 272612dbaf..2faa239720 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 {
     public class OsuBeatmapVerifier : BeatmapVerifier
     {
-        private readonly List<Check> checks = new List<Check>
+        private readonly List<ICheck> checks = new List<ICheck>
         {
             new CheckOffscreenObjects()
         };
diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index f67a068525..1d0508705a 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Edit
         /// Checks which are performed regardless of ruleset.
         /// These handle things like beatmap metadata, timing, and other ruleset agnostic elements.
         /// </summary>
-        private readonly IReadOnlyList<Check> generalChecks = new List<Check>
+        private readonly IReadOnlyList<ICheck> generalChecks = new List<ICheck>
         {
             new CheckBackground()
         };
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
index 22f98b6fd7..c922aa03c0 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
@@ -8,15 +8,15 @@ using osu.Game.Rulesets.Edit.Checks.Components;
 
 namespace osu.Game.Rulesets.Edit.Checks
 {
-    public class CheckBackground : Check
+    public class CheckBackground : ICheck
     {
-        public override CheckMetadata Metadata { get; } = new CheckMetadata
+        public CheckMetadata Metadata { get; } = new CheckMetadata
         (
             category: CheckCategory.Resources,
             description: "Missing background."
         );
 
-        public override IEnumerable<IssueTemplate> PossibleTemplates => new[]
+        public IEnumerable<IssueTemplate> PossibleTemplates => new[]
         {
             templateNoneSet,
             templateDoesNotExist
@@ -34,11 +34,11 @@ namespace osu.Game.Rulesets.Edit.Checks
             unformattedMessage: "The background file \"{0}\" is does not exist."
         );
 
-        public override IEnumerable<Issue> Run(IBeatmap beatmap)
+        public IEnumerable<Issue> Run(IBeatmap beatmap)
         {
             if (beatmap.Metadata.BackgroundFile == null)
             {
-                yield return new Issue(templateNoneSet);
+                yield return new Issue(this, templateNoneSet);
 
                 yield break;
             }
@@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             if (file != null)
                 yield break;
 
-            yield return new Issue(templateDoesNotExist, beatmap.Metadata.BackgroundFile);
+            yield return new Issue(this, templateDoesNotExist, beatmap.Metadata.BackgroundFile);
         }
     }
 }
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/Check.cs b/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
index 7c039d1572..f355ae734e 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
@@ -6,28 +6,22 @@ using osu.Game.Beatmaps;
 
 namespace osu.Game.Rulesets.Edit.Checks.Components
 {
-    public abstract class Check
+    public interface ICheck
     {
         /// <summary>
         /// The metadata for this check.
         /// </summary>
-        public abstract CheckMetadata Metadata { get; }
+        public CheckMetadata Metadata { get; }
 
         /// <summary>
         /// All possible templates for issues that this check may return.
         /// </summary>
-        public abstract IEnumerable<IssueTemplate> PossibleTemplates { get; }
+        public IEnumerable<IssueTemplate> PossibleTemplates { get; }
 
         /// <summary>
         /// Runs this check and returns any issues detected for the provided beatmap.
         /// </summary>
         /// <param name="beatmap">The beatmap to run the check on.</param>
-        public abstract IEnumerable<Issue> Run(IBeatmap beatmap);
-
-        protected Check()
-        {
-            foreach (var template in PossibleTemplates)
-                template.Origin = this;
-        }
+        public IEnumerable<Issue> Run(IBeatmap beatmap);
     }
 }
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs b/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
index 7241fabf5b..d0f7df857b 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
@@ -26,38 +26,41 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// </summary>
         public IssueTemplate Template;
 
+        /// <summary>
+        /// The check that this issue originates from.
+        /// </summary>
+        public ICheck Check;
+
         /// <summary>
         /// The arguments that give this issue its context, based on the <see cref="IssueTemplate"/>. These are then substituted into the <see cref="IssueTemplate.UnformattedMessage"/>.
         /// This could for instance include timestamps, which diff is being compared to, what some volume is, etc.
         /// </summary>
         public object[] Arguments;
 
-        public Issue(IssueTemplate template, params object[] args)
+        public Issue(ICheck check, IssueTemplate template, params object[] args)
         {
+            Check = check;
             Time = null;
             HitObjects = Array.Empty<HitObject>();
             Template = template;
             Arguments = args;
-
-            if (template.Origin == null)
-                throw new ArgumentException("A template had no origin. Make sure the `Templates()` method contains all templates used.");
         }
 
-        public Issue(double? time, IssueTemplate template, params object[] args)
-            : this(template, args)
+        public Issue(ICheck check, double? time, IssueTemplate template, params object[] args)
+            : this(check, template, args)
         {
             Time = time;
         }
 
-        public Issue(HitObject hitObject, IssueTemplate template, params object[] args)
-            : this(template, args)
+        public Issue(ICheck check, HitObject hitObject, IssueTemplate template, params object[] args)
+            : this(check, template, args)
         {
             Time = hitObject.StartTime;
             HitObjects = new[] { hitObject };
         }
 
-        public Issue(IEnumerable<HitObject> hitObjects, IssueTemplate template, params object[] args)
-            : this(template, args)
+        public Issue(ICheck check, IEnumerable<HitObject> hitObjects, IssueTemplate template, params object[] args)
+            : this(check, template, args)
         {
             var hitObjectList = hitObjects.ToList();
 
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
index a1156c7c72..4a5f98ca5f 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
@@ -14,11 +14,6 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         private static readonly Color4 negligible_green = new Colour4(0.33f, 0.8f, 0.5f, 1.0f);
         private static readonly Color4 error_gray = new Colour4(0.5f, 0.5f, 0.5f, 1.0f);
 
-        /// <summary>
-        /// The check that this template originates from.
-        /// </summary>
-        public Check Origin;
-
         /// <summary>
         /// The type of the issue.
         /// </summary>
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index 0c4aa04ff3..c0c4a040f6 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -130,7 +130,7 @@ namespace osu.Game.Screens.Edit.Verify
             {
                 table.Issues = beatmapVerifier.Run(Beatmap)
                                               .OrderByDescending(issue => issue.Template.Type)
-                                              .ThenByDescending(issue => issue.Template.Origin.Metadata.Category);
+                                              .ThenByDescending(issue => issue.Check.Metadata.Category);
             }
         }
     }

From a2fc9c398fc731e36c3472bc37a5c153af7d5378 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 12 Apr 2021 10:08:30 +0200
Subject: [PATCH 2347/3722] Rename `CreateChecker` -> `CreateBeatmapVerifier`

---
 osu.Game.Rulesets.Osu/OsuRuleset.cs          | 2 +-
 osu.Game/Rulesets/Ruleset.cs                 | 2 +-
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 1658846e98..63da100a04 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -206,7 +206,7 @@ namespace osu.Game.Rulesets.Osu
 
         public override HitObjectComposer CreateHitObjectComposer() => new OsuHitObjectComposer(this);
 
-        public override BeatmapVerifier CreateChecker() => new OsuBeatmapVerifier();
+        public override BeatmapVerifier CreateBeatmapVerifier() => new OsuBeatmapVerifier();
 
         public override string Description => "osu!";
 
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 088bcc7712..2a29d88c89 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -202,7 +202,7 @@ namespace osu.Game.Rulesets
 
         public virtual HitObjectComposer CreateHitObjectComposer() => null;
 
-        public virtual BeatmapVerifier CreateChecker() => null;
+        public virtual BeatmapVerifier CreateBeatmapVerifier() => null;
 
         public virtual Drawable CreateIcon() => new SpriteIcon { Icon = FontAwesome.Solid.QuestionCircle };
 
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index c0c4a040f6..806029df4d 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Screens.Edit.Verify
             var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
 
             ruleset = parent.Get<IBindable<WorkingBeatmap>>().Value.BeatmapInfo.Ruleset?.CreateInstance();
-            beatmapVerifier = ruleset?.CreateChecker();
+            beatmapVerifier = ruleset?.CreateBeatmapVerifier();
 
             return dependencies;
         }

From f1b8171e389e5df4eb67b567d4e48586a3001c73 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 12 Apr 2021 17:13:48 +0900
Subject: [PATCH 2348/3722] Remove `#nullable true` for now to suppress
 inspector

---
 osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
index f527c0e105..45bcd0bc19 100644
--- a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
+++ b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
@@ -1,8 +1,6 @@
 // Copyright (c) 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
-
 using System;
 using System.Collections.Generic;
 using JetBrains.Annotations;

From b5954a55adc3af47c27ea4c2b354e320d9b6cf4c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Apr 2021 17:46:14 +0900
Subject: [PATCH 2349/3722] Remove empty <returns> xmldoc

---
 osu.Desktop/Program.cs                                          | 1 -
 .../Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs  | 1 -
 osu.Game.Tournament/TournamentGameBase.cs                       | 1 -
 osu.Game/Beatmaps/IBeatmap.cs                                   | 1 -
 osu.Game/Configuration/SettingsStore.cs                         | 1 -
 osu.Game/Graphics/Backgrounds/Triangles.cs                      | 1 -
 osu.Game/IO/Serialization/IJsonSerializable.cs                  | 1 -
 osu.Game/Input/KeyBindingStore.cs                               | 1 -
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs        | 1 -
 osu.Game/Rulesets/Objects/SliderPath.cs                         | 2 --
 osu.Game/Rulesets/Ruleset.cs                                    | 1 -
 osu.Game/Rulesets/Scoring/HitWindows.cs                         | 1 -
 osu.Game/Screens/Edit/Components/RadioButtons/RadioButton.cs    | 1 -
 osu.Game/Screens/Ranking/ScorePanelList.cs                      | 1 -
 osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs                | 1 -
 osu.Game/Tests/Beatmaps/LegacyModConversionTest.cs              | 1 -
 osu.Game/Utils/Optional.cs                                      | 1 -
 17 files changed, 18 deletions(-)

diff --git a/osu.Desktop/Program.cs b/osu.Desktop/Program.cs
index d06c4b6746..5fb09c0cef 100644
--- a/osu.Desktop/Program.cs
+++ b/osu.Desktop/Program.cs
@@ -69,7 +69,6 @@ namespace osu.Desktop
         /// Allow a maximum of one unhandled exception, per second of execution.
         /// </summary>
         /// <param name="arg"></param>
-        /// <returns></returns>
         private static bool handleException(Exception arg)
         {
             bool continueExecution = Interlocked.Decrement(ref allowableExceptions) >= 0;
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index c81710ed18..26e5d381e2 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -482,7 +482,6 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
         /// Retrieves the sample info list at a point in time.
         /// </summary>
         /// <param name="time">The time to retrieve the sample info list from.</param>
-        /// <returns></returns>
         private IList<HitSampleInfo> sampleInfoListAt(int time) => nodeSamplesAt(time)?.First() ?? HitObject.Samples;
 
         /// <summary>
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 2ee52c35aa..92eb7ac713 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -141,7 +141,6 @@ namespace osu.Game.Tournament
         /// <summary>
         /// Add missing player info based on user IDs.
         /// </summary>
-        /// <returns></returns>
         private bool addPlayers()
         {
             bool addedInfo = false;
diff --git a/osu.Game/Beatmaps/IBeatmap.cs b/osu.Game/Beatmaps/IBeatmap.cs
index 9847ea020a..769b33009a 100644
--- a/osu.Game/Beatmaps/IBeatmap.cs
+++ b/osu.Game/Beatmaps/IBeatmap.cs
@@ -44,7 +44,6 @@ namespace osu.Game.Beatmaps
         /// <summary>
         /// Returns statistics for the <see cref="HitObjects"/> contained in this beatmap.
         /// </summary>
-        /// <returns></returns>
         IEnumerable<BeatmapStatistic> GetStatistics();
 
         /// <summary>
diff --git a/osu.Game/Configuration/SettingsStore.cs b/osu.Game/Configuration/SettingsStore.cs
index f8c9bdeaf8..86e84b0732 100644
--- a/osu.Game/Configuration/SettingsStore.cs
+++ b/osu.Game/Configuration/SettingsStore.cs
@@ -22,7 +22,6 @@ namespace osu.Game.Configuration
         /// </summary>
         /// <param name="rulesetId">The ruleset's internal ID.</param>
         /// <param name="variant">An optional variant.</param>
-        /// <returns></returns>
         public List<DatabasedSetting> Query(int? rulesetId = null, int? variant = null) =>
             ContextFactory.Get().DatabasedSetting.Where(b => b.RulesetID == rulesetId && b.Variant == variant).ToList();
 
diff --git a/osu.Game/Graphics/Backgrounds/Triangles.cs b/osu.Game/Graphics/Backgrounds/Triangles.cs
index 0e9382279a..67cee883c8 100644
--- a/osu.Game/Graphics/Backgrounds/Triangles.cs
+++ b/osu.Game/Graphics/Backgrounds/Triangles.cs
@@ -346,7 +346,6 @@ namespace osu.Game.Graphics.Backgrounds
             /// such that the smaller triangles appear on top.
             /// </summary>
             /// <param name="other"></param>
-            /// <returns></returns>
             public int CompareTo(TriangleParticle other) => other.Scale.CompareTo(Scale);
         }
     }
diff --git a/osu.Game/IO/Serialization/IJsonSerializable.cs b/osu.Game/IO/Serialization/IJsonSerializable.cs
index ba188963ea..c8d5ce39a6 100644
--- a/osu.Game/IO/Serialization/IJsonSerializable.cs
+++ b/osu.Game/IO/Serialization/IJsonSerializable.cs
@@ -22,7 +22,6 @@ namespace osu.Game.IO.Serialization
         /// <summary>
         /// Creates the default <see cref="JsonSerializerSettings"/> that should be used for all <see cref="IJsonSerializable"/>s.
         /// </summary>
-        /// <returns></returns>
         public static JsonSerializerSettings CreateGlobalSettings() => new JsonSerializerSettings
         {
             ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
diff --git a/osu.Game/Input/KeyBindingStore.cs b/osu.Game/Input/KeyBindingStore.cs
index b25b00eb84..9d0cfedc03 100644
--- a/osu.Game/Input/KeyBindingStore.cs
+++ b/osu.Game/Input/KeyBindingStore.cs
@@ -85,7 +85,6 @@ namespace osu.Game.Input
         /// </summary>
         /// <param name="rulesetId">The ruleset's internal ID.</param>
         /// <param name="variant">An optional variant.</param>
-        /// <returns></returns>
         public List<DatabasedKeyBinding> Query(int? rulesetId = null, int? variant = null) =>
             ContextFactory.Get().DatabasedKeyBinding.Where(b => b.RulesetID == rulesetId && b.Variant == variant).ToList();
 
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 6da9f12b50..d95b246c96 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -574,7 +574,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// Calculate the position to be used for sample playback at a specified X position (0..1).
         /// </summary>
         /// <param name="position">The lookup X position. Generally should be <see cref="SamplePlaybackPosition"/>.</param>
-        /// <returns></returns>
         protected double CalculateSamplePlaybackBalance(double position)
         {
             const float balance_adjust_amount = 0.4f;
diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 61f5f94142..e64298f98d 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -147,7 +147,6 @@ namespace osu.Game.Rulesets.Objects
         /// to 1 (end of the path).
         /// </summary>
         /// <param name="progress">Ranges from 0 (beginning of the path) to 1 (end of the path).</param>
-        /// <returns></returns>
         public Vector2 PositionAt(double progress)
         {
             ensureValid();
@@ -161,7 +160,6 @@ namespace osu.Game.Rulesets.Objects
         /// The first point has a PathType which all other points inherit.
         /// </summary>
         /// <param name="controlPoint">One of the control points in the segment.</param>
-        /// <returns></returns>
         public List<PathControlPoint> PointsInSegment(PathControlPoint controlPoint)
         {
             bool found = false;
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 38d30a2e31..efc8b50e3c 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -146,7 +146,6 @@ namespace osu.Game.Rulesets
         /// <param name="beatmap">The beatmap to create the hit renderer for.</param>
         /// <param name="mods">The <see cref="Mod"/>s to apply.</param>
         /// <exception cref="BeatmapInvalidForRulesetException">Unable to successfully load the beatmap to be usable with this ruleset.</exception>
-        /// <returns></returns>
         public abstract DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null);
 
         /// <summary>
diff --git a/osu.Game/Rulesets/Scoring/HitWindows.cs b/osu.Game/Rulesets/Scoring/HitWindows.cs
index 018b50bd3d..410614de07 100644
--- a/osu.Game/Rulesets/Scoring/HitWindows.cs
+++ b/osu.Game/Rulesets/Scoring/HitWindows.cs
@@ -62,7 +62,6 @@ namespace osu.Game.Rulesets.Scoring
         /// <summary>
         /// Retrieves a mapping of <see cref="HitResult"/>s to their timing windows for all allowed <see cref="HitResult"/>s.
         /// </summary>
-        /// <returns></returns>
         public IEnumerable<(HitResult result, double length)> GetAllAvailableWindows()
         {
             for (var result = HitResult.Meh; result <= HitResult.Perfect; ++result)
diff --git a/osu.Game/Screens/Edit/Components/RadioButtons/RadioButton.cs b/osu.Game/Screens/Edit/Components/RadioButtons/RadioButton.cs
index a7b0fb05e3..dcf5f8a788 100644
--- a/osu.Game/Screens/Edit/Components/RadioButtons/RadioButton.cs
+++ b/osu.Game/Screens/Edit/Components/RadioButtons/RadioButton.cs
@@ -12,7 +12,6 @@ namespace osu.Game.Screens.Edit.Components.RadioButtons
         /// <summary>
         /// Whether this <see cref="RadioButton"/> is selected.
         /// </summary>
-        /// <returns></returns>
         public readonly BindableBool Selected;
 
         /// <summary>
diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index 77b3d8fc3b..441c9e048a 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -226,7 +226,6 @@ namespace osu.Game.Screens.Ranking
         /// <summary>
         /// Enumerates all <see cref="ScorePanel"/>s contained in this <see cref="ScorePanelList"/>.
         /// </summary>
-        /// <returns></returns>
         public IEnumerable<ScorePanel> GetScorePanels() => flow.Select(t => t.Panel);
 
         /// <summary>
diff --git a/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs b/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
index fcf20a2eb2..5ef2458919 100644
--- a/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
+++ b/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
@@ -189,7 +189,6 @@ namespace osu.Game.Tests.Beatmaps
         /// <summary>
         /// Creates the <see cref="Ruleset"/> applicable to this <see cref="BeatmapConversionTest{TConvertMapping,TConvertValue}"/>.
         /// </summary>
-        /// <returns></returns>
         protected abstract Ruleset CreateRuleset();
 
         private class ConvertResult
diff --git a/osu.Game/Tests/Beatmaps/LegacyModConversionTest.cs b/osu.Game/Tests/Beatmaps/LegacyModConversionTest.cs
index 76f97db59f..54a83f4305 100644
--- a/osu.Game/Tests/Beatmaps/LegacyModConversionTest.cs
+++ b/osu.Game/Tests/Beatmaps/LegacyModConversionTest.cs
@@ -17,7 +17,6 @@ namespace osu.Game.Tests.Beatmaps
         /// <summary>
         /// Creates the <see cref="Ruleset"/> whose legacy mod conversion is to be tested.
         /// </summary>
-        /// <returns></returns>
         protected abstract Ruleset CreateRuleset();
 
         protected void TestFromLegacy(LegacyMods legacyMods, Type[] expectedMods)
diff --git a/osu.Game/Utils/Optional.cs b/osu.Game/Utils/Optional.cs
index 9f8a1c2e62..fdb7623be5 100644
--- a/osu.Game/Utils/Optional.cs
+++ b/osu.Game/Utils/Optional.cs
@@ -37,7 +37,6 @@ namespace osu.Game.Utils
         /// Shortcase for: <c>optional.HasValue ? optional.Value : fallback</c>.
         /// </remarks>
         /// <param name="fallback">The fallback value to return if <see cref="HasValue"/> is <c>false</c>.</param>
-        /// <returns></returns>
         public T GetOr(T fallback) => HasValue ? Value : fallback;
 
         public static implicit operator Optional<T>(T value) => new Optional<T>(value);

From 6d18b3db00a5f3f045dc35cdc6a740bae7156f90 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 12 Apr 2021 18:49:38 +0900
Subject: [PATCH 2350/3722] Avoid empty list allocation

---
 osu.Game/Rulesets/UI/RulesetInputManager.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index fb56a5d93d..1c0d820a3d 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -102,10 +102,13 @@ namespace osu.Game.Rulesets.UI
 
         #endregion
 
+        // to avoid allocation
+        private readonly List<IInput> emptyInputList = new List<IInput>();
+
         protected override List<IInput> GetPendingInputs()
         {
             if (replayInputHandler != null && !replayInputHandler.IsActive)
-                return new List<IInput>();
+                return emptyInputList;
 
             return base.GetPendingInputs();
         }

From 359fae895f843ff7b8775917d443a89556705d07 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 12 Apr 2021 18:50:25 +0900
Subject: [PATCH 2351/3722] Rename property

---
 osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs | 6 +++---
 osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs     | 4 ++--
 osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs    | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
index 64af4b6db6..954871595e 100644
--- a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
+++ b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
@@ -220,7 +220,7 @@ namespace osu.Game.Tests.NonVisual
             // no frames are arrived yet
             setTime(0, null);
             setTime(1000, null);
-            Assert.IsTrue(handler.WaitingNextFrame, "Should be waiting for the first frame");
+            Assert.IsTrue(handler.WaitingForFrame, "Should be waiting for the first frame");
 
             replay.Frames.Add(new TestReplayFrame(0));
             replay.Frames.Add(new TestReplayFrame(1000));
@@ -228,11 +228,11 @@ namespace osu.Game.Tests.NonVisual
             // should always play from beginning
             setTime(1000, 0);
             confirmCurrentFrame(0);
-            Assert.IsFalse(handler.WaitingNextFrame, "Should not be waiting yet");
+            Assert.IsFalse(handler.WaitingForFrame, "Should not be waiting yet");
             setTime(1000, 1000);
             confirmCurrentFrame(1);
             confirmNextFrame(1);
-            Assert.IsTrue(handler.WaitingNextFrame, "Should be waiting");
+            Assert.IsTrue(handler.WaitingForFrame, "Should be waiting");
 
             // cannot seek beyond the last frame
             setTime(1500, null);
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 9f1faa8e26..397b37718d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -83,7 +83,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             waitForPlayer();
             AddAssert("ensure frames arrived", () => replayHandler.HasFrames);
 
-            AddUntilStep("wait for frame starvation", () => replayHandler.WaitingNextFrame);
+            AddUntilStep("wait for frame starvation", () => replayHandler.WaitingForFrame);
             checkPaused(true);
 
             double? pausedTime = null;
@@ -92,7 +92,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             sendFrames();
 
-            AddUntilStep("wait for frame starvation", () => replayHandler.WaitingNextFrame);
+            AddUntilStep("wait for frame starvation", () => replayHandler.WaitingForFrame);
             checkPaused(true);
 
             AddAssert("time advanced", () => currentFrameStableTime > pausedTime);
diff --git a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
index 45bcd0bc19..23cc311d79 100644
--- a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
+++ b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Replays
         /// <summary>
         /// Whether we are waiting for new frames to be received.
         /// </summary>
-        public bool WaitingNextFrame => !replay.HasReceivedAllFrames && currentFrameIndex == Frames.Count - 1;
+        public bool WaitingForFrame => !replay.HasReceivedAllFrames && currentFrameIndex == Frames.Count - 1;
 
         /// <summary>
         /// The current frame of the replay.
@@ -140,7 +140,7 @@ namespace osu.Game.Rulesets.Replays
             frameEnd = getFrameTime(currentFrameIndex + 1);
 
             // Pause until more frames are arrived.
-            if (WaitingNextFrame && frameStart < time)
+            if (WaitingForFrame && frameStart < time)
             {
                 CurrentTime = frameStart;
                 return null;

From 31d36071052bf72f9a82256242cbb6fa7c2b0e38 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 12 Apr 2021 18:50:54 +0900
Subject: [PATCH 2352/3722] Add TODO comment

---
 osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
index 23cc311d79..c3cd957f0d 100644
--- a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
+++ b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Replays
 
         /// <summary>
         /// The next frame of the replay.
-        /// The start time is always greater or equals to the start time of <see cref="CurrentFrame"/> regardless of the seeking direction.
+        /// The start time is always greater or equal to the start time of <see cref="CurrentFrame"/> regardless of the seeking direction.
         /// If it is before the first frame of the replay or the after the last frame of the replay, <see cref="CurrentFrame"/> and <see cref="NextFrame"/> agree.
         /// </summary>
         /// <exception cref="InvalidOperationException">The replay is empty.</exception>
@@ -83,7 +83,8 @@ namespace osu.Game.Rulesets.Replays
 
         protected FramedReplayInputHandler(Replay replay)
         {
-            // This replay frame ordering should be enforced on the Replay type
+            // TODO: This replay frame ordering should be enforced on the Replay type.
+            // Currently, the ordering can be broken if the frames are added after this construction.
             replay.Frames.Sort((x, y) => x.Time.CompareTo(y.Time));
 
             this.replay = replay;

From cc2acf5e548fb11873f1d20d480b27e35ced57fb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Apr 2021 19:05:23 +0900
Subject: [PATCH 2353/3722] Fix ctrl-dragging on an existing selection causing
 deselection of the hovered object

---
 .../Compose/Components/BlueprintContainer.cs  | 38 ++++++++++++++-----
 .../Compose/Components/SelectionHandler.cs    | 37 +++++++++++++++---
 2 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 5699be4560..64cf0e7512 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -135,11 +135,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected override bool OnMouseDown(MouseDownEvent e)
         {
-            if (!beginClickSelection(e)) return true;
+            bool selectionPerformed = beginClickSelection(e);
 
+            // even if a selection didn't occur, a drag event may still move the selection.
             prepareSelectionMovement();
 
-            return e.Button == MouseButton.Left;
+            return selectionPerformed || e.Button == MouseButton.Left;
         }
 
         private SelectionBlueprint clickedBlueprint;
@@ -154,7 +155,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             // Deselection should only occur if no selected blueprints are hovered
             // A special case for when a blueprint was selected via this click is added since OnClick() may occur outside the hitobject and should not trigger deselection
-            if (endClickSelection() || clickedBlueprint != null)
+            if (endClickSelection(e) || clickedBlueprint != null)
                 return true;
 
             deselectAll();
@@ -177,7 +178,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
         protected override void OnMouseUp(MouseUpEvent e)
         {
             // Special case for when a drag happened instead of a click
-            Schedule(() => endClickSelection());
+            Schedule(() =>
+            {
+                endClickSelection(e);
+                clickSelectionBegan = false;
+                isDraggingBlueprint = false;
+            });
 
             finishSelectionMovement();
         }
@@ -226,7 +232,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
                     Beatmap.Update(obj);
 
                 changeHandler?.EndChange();
-                isDraggingBlueprint = false;
             }
 
             if (DragBox.State == Visibility.Visible)
@@ -355,13 +360,28 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <summary>
         /// Finishes the current blueprint selection.
         /// </summary>
+        /// <param name="e">The mouse event which triggered end of selection.</param>
         /// <returns>Whether a click selection was active.</returns>
-        private bool endClickSelection()
+        private bool endClickSelection(MouseButtonEvent e)
         {
-            if (!clickSelectionBegan)
-                return false;
+            if (!clickSelectionBegan && !isDraggingBlueprint)
+            {
+                // if a selection didn't occur, we may want to trigger a deselection.
+                if (e.ControlPressed && e.Button == MouseButton.Left)
+                {
+                    // 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 blueprint in SelectionBlueprints.AliveChildren.Reverse().OrderByDescending(b => b.IsSelected))
+                    {
+                        if (!blueprint.IsHovered) continue;
+
+                        return clickSelectionBegan = SelectionHandler.HandleDeselectionRequested(blueprint, e);
+                    }
+                }
+
+                return false;
+            }
 
-            clickSelectionBegan = false;
             return true;
         }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 018d4d081c..e5e1100797 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -228,12 +228,31 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 return false;
             }
 
-            if (e.ControlPressed && e.Button == MouseButton.Left)
+            // while holding control, we only want to add to selection, not replace an existing selection.
+            if (e.ControlPressed && e.Button == MouseButton.Left && !blueprint.IsSelected)
+            {
                 blueprint.ToggleSelection();
-            else
-                ensureSelected(blueprint);
+                return true;
+            }
 
-            return true;
+            return ensureSelected(blueprint);
+        }
+
+        /// <summary>
+        /// Handle a blueprint requesting selection.
+        /// </summary>
+        /// <param name="blueprint">The blueprint.</param>
+        /// <param name="e">The mouse event responsible for deselection.</param>
+        /// <returns>Whether a deselection was performed.</returns>
+        internal bool HandleDeselectionRequested(SelectionBlueprint blueprint, MouseButtonEvent e)
+        {
+            if (blueprint.IsSelected)
+            {
+                blueprint.ToggleSelection();
+                return true;
+            }
+
+            return false;
         }
 
         private void handleQuickDeletion(SelectionBlueprint blueprint)
@@ -247,13 +266,19 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 deleteSelected();
         }
 
-        private void ensureSelected(SelectionBlueprint blueprint)
+        /// <summary>
+        /// Ensure the blueprint is in a selected state.
+        /// </summary>
+        /// <param name="blueprint">The blueprint to select.</param>
+        /// <returns>Whether selection state was changed.</returns>
+        private bool ensureSelected(SelectionBlueprint blueprint)
         {
             if (blueprint.IsSelected)
-                return;
+                return false;
 
             DeselectAll?.Invoke();
             blueprint.Select();
+            return true;
         }
 
         private void deleteSelected()

From b4c75ba3c6eb81a8cf88f36edc8738ee7e2e09df Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Apr 2021 19:19:25 +0900
Subject: [PATCH 2354/3722] Fix TestQuickDeleteRemovesObject failing on second
 run

---
 .../Visual/Editing/TestSceneEditorQuickDelete.cs         | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs
index 9efd299fba..8a0f27b851 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Tests.Visual.Editing
         [Test]
         public void TestQuickDeleteRemovesSliderControlPoint()
         {
-            Slider slider = new Slider { StartTime = 1000 };
+            Slider slider = null;
 
             PathControlPoint[] points =
             {
@@ -62,7 +62,12 @@ namespace osu.Game.Tests.Visual.Editing
 
             AddStep("add slider", () =>
             {
-                slider.Path = new SliderPath(points);
+                slider = new Slider
+                {
+                    StartTime = 1000,
+                    Path = new SliderPath(points)
+                };
+
                 EditorBeatmap.Add(slider);
             });
 

From 905cd7c8eb9e7c3785ffa88e63cce5b4b7f2c024 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Apr 2021 19:22:07 +0900
Subject: [PATCH 2355/3722] Update resources

---
 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 196d122a2a..c78dfb6a55 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -51,7 +51,7 @@
     <Reference Include="Java.Interop" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.410.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2021.410.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 71a6f0e5cd..92e05cb4a6 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -30,7 +30,7 @@
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.410.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.410.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index a389cc13dd..11124730c9 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.410.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.410.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
   <PropertyGroup>

From d2d7f77430181ce55d76eb7e2ef24613cfe69ca4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 12 Apr 2021 19:50:24 +0900
Subject: [PATCH 2356/3722] Fix mods not being serialised correctly in
 ScoreInfo

---
 .../Online/TestAPIModJsonSerialization.cs     | 33 +++++++++++++
 osu.Game/Scoring/ScoreInfo.cs                 | 49 +++++++++----------
 2 files changed, 57 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs b/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
index 77f910c144..3afb7481b1 100644
--- a/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
+++ b/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
@@ -11,7 +11,10 @@ using osu.Game.Online.API;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.UI;
+using osu.Game.Scoring;
 
 namespace osu.Game.Tests.Online
 {
@@ -84,6 +87,36 @@ namespace osu.Game.Tests.Online
             Assert.That(converted?.OverallDifficulty.Value, Is.EqualTo(11));
         }
 
+        [Test]
+        public void TestDeserialiseScoreInfoWithEmptyMods()
+        {
+            var score = new ScoreInfo { Ruleset = new OsuRuleset().RulesetInfo };
+
+            var deserialised = JsonConvert.DeserializeObject<ScoreInfo>(JsonConvert.SerializeObject(score));
+
+            if (deserialised != null)
+                deserialised.Ruleset = new OsuRuleset().RulesetInfo;
+
+            Assert.That(deserialised?.Mods.Length, Is.Zero);
+        }
+
+        [Test]
+        public void TestDeserialiseScoreInfoWithCustomModSetting()
+        {
+            var score = new ScoreInfo
+            {
+                Ruleset = new OsuRuleset().RulesetInfo,
+                Mods = new Mod[] { new OsuModDoubleTime { SpeedChange = { Value = 2 } } }
+            };
+
+            var deserialised = JsonConvert.DeserializeObject<ScoreInfo>(JsonConvert.SerializeObject(score));
+
+            if (deserialised != null)
+                deserialised.Ruleset = new OsuRuleset().RulesetInfo;
+
+            Assert.That(((OsuModDoubleTime)deserialised?.Mods[0])?.SpeedChange.Value, Is.EqualTo(2));
+        }
+
         private class TestRuleset : Ruleset
         {
             public override IEnumerable<Mod> GetModsFor(ModType type) => new Mod[]
diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index ef11c19e3f..df8f309ee0 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -10,6 +10,7 @@ using Newtonsoft.Json.Converters;
 using osu.Framework.Extensions;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
+using osu.Game.Online.API;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
@@ -55,9 +56,10 @@ namespace osu.Game.Scoring
         [JsonIgnore]
         public virtual RulesetInfo Ruleset { get; set; }
 
+        private APIMod[] localAPIMods;
         private Mod[] mods;
 
-        [JsonProperty("mods")]
+        [JsonIgnore]
         [NotMapped]
         public Mod[] Mods
         {
@@ -66,45 +68,50 @@ namespace osu.Game.Scoring
                 if (mods != null)
                     return mods;
 
-                if (modsJson == null)
+                if (apiMods == null)
                     return Array.Empty<Mod>();
 
-                return getModsFromRuleset(JsonConvert.DeserializeObject<DeserializedMod[]>(modsJson));
+                var rulesetInstance = Ruleset.CreateInstance();
+                return apiMods.Select(m => m.ToMod(rulesetInstance)).ToArray();
             }
             set
             {
-                modsJson = null;
+                localAPIMods = null;
                 mods = value;
             }
         }
 
-        private Mod[] getModsFromRuleset(DeserializedMod[] mods) => Ruleset.CreateInstance().GetAllMods().Where(mod => mods.Any(d => d.Acronym == mod.Acronym)).ToArray();
-
-        private string modsJson;
-
-        [JsonIgnore]
-        [Column("Mods")]
-        public string ModsJson
+        // Used for API serialisation/deserialisation.
+        [JsonProperty("mods")]
+        private APIMod[] apiMods
         {
             get
             {
-                if (modsJson != null)
-                    return modsJson;
+                if (localAPIMods != null)
+                    return localAPIMods;
 
                 if (mods == null)
-                    return null;
+                    return Array.Empty<APIMod>();
 
-                return modsJson = JsonConvert.SerializeObject(mods.Select(m => new DeserializedMod { Acronym = m.Acronym }));
+                return localAPIMods = mods.Select(m => new APIMod(m)).ToArray();
             }
             set
             {
-                modsJson = value;
+                localAPIMods = value;
 
-                // we potentially can't update this yet due to Ruleset being late-bound, so instead update on read as necessary.
+                // We potentially can't update this yet due to Ruleset being late-bound, so instead update on read as necessary.
                 mods = null;
             }
         }
 
+        // Used for database serialisation/deserialisation.
+        [Column("Mods")]
+        private string modsString
+        {
+            get => JsonConvert.SerializeObject(apiMods);
+            set => apiMods = JsonConvert.DeserializeObject<APIMod[]>(value);
+        }
+
         [NotMapped]
         [JsonProperty("user")]
         public User User { get; set; }
@@ -251,14 +258,6 @@ namespace osu.Game.Scoring
             }
         }
 
-        [Serializable]
-        protected class DeserializedMod : IMod
-        {
-            public string Acronym { get; set; }
-
-            public bool Equals(IMod other) => Acronym == other?.Acronym;
-        }
-
         public override string ToString() => $"{User} playing {Beatmap}";
 
         public bool Equals(ScoreInfo other)

From 982d8fa8b1ef8ce69a4456b8a31192f948314f09 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 12 Apr 2021 20:49:26 +0900
Subject: [PATCH 2357/3722] Fix incorrect reference

---
 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 df8f309ee0..1e438edeea 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Scoring
                 if (mods != null)
                     return mods;
 
-                if (apiMods == null)
+                if (localAPIMods == null)
                     return Array.Empty<Mod>();
 
                 var rulesetInstance = Ruleset.CreateInstance();

From 625484468e4ba788e04b73b0c6b55614d8e30bdf Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 12 Apr 2021 20:49:37 +0900
Subject: [PATCH 2358/3722] Fix DB serialisation

---
 osu.Game/Scoring/ScoreInfo.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 1e438edeea..01b62f8b4f 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -105,8 +105,9 @@ namespace osu.Game.Scoring
         }
 
         // Used for database serialisation/deserialisation.
+        [JsonIgnore]
         [Column("Mods")]
-        private string modsString
+        public string ModsString
         {
             get => JsonConvert.SerializeObject(apiMods);
             set => apiMods = JsonConvert.DeserializeObject<APIMod[]>(value);

From 8413b0a5d32a7aa159bfc971f10b2b11bd058c5c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 12 Apr 2021 20:49:44 +0900
Subject: [PATCH 2359/3722] Don't map api mods to DB

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

diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 01b62f8b4f..312b5f46f4 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -83,6 +83,7 @@ namespace osu.Game.Scoring
 
         // Used for API serialisation/deserialisation.
         [JsonProperty("mods")]
+        [NotMapped]
         private APIMod[] apiMods
         {
             get

From e9a114a15c37bf498ff7e1e8b24775964f01a4b8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 12 Apr 2021 20:50:18 +0900
Subject: [PATCH 2360/3722] Rename property back

---
 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 312b5f46f4..222f69b025 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -108,7 +108,7 @@ namespace osu.Game.Scoring
         // Used for database serialisation/deserialisation.
         [JsonIgnore]
         [Column("Mods")]
-        public string ModsString
+        public string ModsJson
         {
             get => JsonConvert.SerializeObject(apiMods);
             set => apiMods = JsonConvert.DeserializeObject<APIMod[]>(value);

From c531e38a369452f3be8664e0c2b6ff4bb079e64c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 12 Apr 2021 22:00:27 +0900
Subject: [PATCH 2361/3722] Rework to create a derived tracked user data
 instead

---
 ...TestSceneMultiplayerGameplayLeaderboard.cs |   2 +-
 .../MultiplayerSpectatorLeaderboard.cs        |  85 +++++------
 .../HUD/MultiplayerGameplayLeaderboard.cs     | 137 +++++++++---------
 3 files changed, 107 insertions(+), 117 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
index 1ee848b902..272d547505 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -163,7 +163,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                             break;
                     }
 
-                    ((ISpectatorClient)this).UserSentFrames(userId, new FrameDataBundle(header, Array.Empty<LegacyReplayFrame>()));
+                    ((ISpectatorClient)this).UserSentFrames(userId, new FrameDataBundle(header, new[] { new LegacyReplayFrame(Time.Current, 0, 0, ReplayButtonState.None) }));
                 }
             }
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs
index aa9f162036..1b9e2bda2d 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs
@@ -2,10 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Timing;
-using osu.Game.Online.Spectator;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD;
 
@@ -13,73 +11,62 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     public class MultiplayerSpectatorLeaderboard : MultiplayerGameplayLeaderboard
     {
-        private readonly Dictionary<int, TrackedUserData> trackedData = new Dictionary<int, TrackedUserData>();
-
         public MultiplayerSpectatorLeaderboard(ScoreProcessor scoreProcessor, int[] userIds)
             : base(scoreProcessor, userIds)
         {
         }
 
-        public void AddClock(int userId, IClock source) => trackedData[userId] = new TrackedUserData(source);
-
-        public void RemoveClock(int userId) => trackedData.Remove(userId);
-
-        protected override void OnIncomingFrames(int userId, FrameDataBundle bundle)
+        public void AddClock(int userId, IClock clock)
         {
-            if (!trackedData.TryGetValue(userId, out var data))
+            if (!UserScores.TryGetValue(userId, out var data))
                 return;
 
-            data.Frames.Add(new TimedFrameHeader(bundle.Frames.First().Time, bundle.Header));
+            ((SpectatingTrackedUserData)data).Clock = clock;
         }
 
+        public void RemoveClock(int userId)
+        {
+            if (!UserScores.TryGetValue(userId, out var data))
+                return;
+
+            ((SpectatingTrackedUserData)data).Clock = null;
+        }
+
+        protected override TrackedUserData CreateUserData(int userId, ScoreProcessor scoreProcessor) => new SpectatingTrackedUserData(userId, scoreProcessor);
+
         protected override void Update()
         {
             base.Update();
 
-            foreach (var (userId, data) in trackedData)
+            foreach (var (_, data) in UserScores)
+                data.UpdateScore();
+        }
+
+        private class SpectatingTrackedUserData : TrackedUserData
+        {
+            [CanBeNull]
+            public IClock Clock;
+
+            public SpectatingTrackedUserData(int userId, ScoreProcessor scoreProcessor)
+                : base(userId, scoreProcessor)
             {
-                var targetTime = data.Clock.CurrentTime;
+            }
 
-                if (data.Frames.Count == 0)
-                    continue;
+            public override void UpdateScore()
+            {
+                if (Frames.Count == 0)
+                    return;
 
-                int frameIndex = data.Frames.BinarySearch(new TimedFrameHeader(targetTime));
+                if (Clock == null)
+                    return;
+
+                int frameIndex = Frames.BinarySearch(new TimedFrame(Clock.CurrentTime));
                 if (frameIndex < 0)
                     frameIndex = ~frameIndex;
-                frameIndex = Math.Clamp(frameIndex - 1, 0, data.Frames.Count - 1);
+                frameIndex = Math.Clamp(frameIndex - 1, 0, Frames.Count - 1);
 
-                SetCurrentFrame(userId, data.Frames[frameIndex].Header);
+                SetFrame(Frames[frameIndex]);
             }
         }
-
-        private class TrackedUserData
-        {
-            public readonly IClock Clock;
-            public readonly List<TimedFrameHeader> Frames = new List<TimedFrameHeader>();
-
-            public TrackedUserData(IClock clock)
-            {
-                Clock = clock;
-            }
-        }
-
-        private class TimedFrameHeader : IComparable<TimedFrameHeader>
-        {
-            public readonly double Time;
-            public readonly FrameHeader Header;
-
-            public TimedFrameHeader(double time)
-            {
-                Time = time;
-            }
-
-            public TimedFrameHeader(double time, FrameHeader header)
-            {
-                Time = time;
-                Header = header;
-            }
-
-            public int CompareTo(TimedFrameHeader other) => Time.CompareTo(other.Time);
-        }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index f0d2ac4b7f..70de067784 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.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.Collections.Specialized;
 using System.Linq;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Configuration;
@@ -19,8 +19,7 @@ namespace osu.Game.Screens.Play.HUD
     [LongRunningLoad]
     public class MultiplayerGameplayLeaderboard : GameplayLeaderboard
     {
-        private readonly ScoreProcessor scoreProcessor;
-        private readonly Dictionary<int, TrackedUserData> userScores = new Dictionary<int, TrackedUserData>();
+        protected readonly Dictionary<int, TrackedUserData> UserScores = new Dictionary<int, TrackedUserData>();
 
         [Resolved]
         private SpectatorStreamingClient streamingClient { get; set; }
@@ -31,9 +30,9 @@ namespace osu.Game.Screens.Play.HUD
         [Resolved]
         private UserLookupCache userLookupCache { get; set; }
 
-        private Bindable<ScoringMode> scoringMode;
-
+        private readonly ScoreProcessor scoreProcessor;
         private readonly BindableList<int> playingUsers;
+        private Bindable<ScoringMode> scoringMode;
 
         /// <summary>
         /// Construct a new leaderboard.
@@ -52,6 +51,8 @@ namespace osu.Game.Screens.Play.HUD
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config, IAPIProvider api)
         {
+            scoringMode = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode);
+
             foreach (var userId in playingUsers)
             {
                 streamingClient.WatchUser(userId);
@@ -59,19 +60,17 @@ namespace osu.Game.Screens.Play.HUD
                 // probably won't be required in the final implementation.
                 var resolvedUser = userLookupCache.GetUserAsync(userId).Result;
 
-                var trackedUser = new TrackedUserData();
+                var trackedUser = CreateUserData(userId, scoreProcessor);
+                trackedUser.ScoringMode.BindTo(scoringMode);
 
-                userScores[userId] = trackedUser;
                 var leaderboardScore = AddPlayer(resolvedUser, resolvedUser?.Id == api.LocalUser.Value.Id);
+                leaderboardScore.Accuracy.BindTo(trackedUser.Accuracy);
+                leaderboardScore.TotalScore.BindTo(trackedUser.Score);
+                leaderboardScore.Combo.BindTo(trackedUser.CurrentCombo);
+                leaderboardScore.HasQuit.BindTo(trackedUser.UserQuit);
 
-                ((IBindable<double>)leaderboardScore.Accuracy).BindTo(trackedUser.Accuracy);
-                ((IBindable<double>)leaderboardScore.TotalScore).BindTo(trackedUser.Score);
-                ((IBindable<int>)leaderboardScore.Combo).BindTo(trackedUser.CurrentCombo);
-                ((IBindable<bool>)leaderboardScore.HasQuit).BindTo(trackedUser.UserQuit);
+                UserScores[userId] = trackedUser;
             }
-
-            scoringMode = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode);
-            scoringMode.BindValueChanged(updateAllScores, true);
         }
 
         protected override void LoadComplete()
@@ -101,7 +100,7 @@ namespace osu.Game.Screens.Play.HUD
                     {
                         streamingClient.StopWatchingUser(userId);
 
-                        if (userScores.TryGetValue(userId, out var trackedData))
+                        if (UserScores.TryGetValue(userId, out var trackedData))
                             trackedData.MarkUserQuit();
                     }
 
@@ -109,39 +108,16 @@ namespace osu.Game.Screens.Play.HUD
             }
         }
 
-        private void updateAllScores(ValueChangedEvent<ScoringMode> mode)
-        {
-            foreach (var trackedData in userScores.Values)
-                trackedData.UpdateScore(scoreProcessor, mode.NewValue);
-        }
-
         private void handleIncomingFrames(int userId, FrameDataBundle bundle) => Schedule(() =>
         {
-            if (userScores.ContainsKey(userId))
-                OnIncomingFrames(userId, bundle);
+            if (!UserScores.TryGetValue(userId, out var trackedData))
+                return;
+
+            trackedData.Frames.Add(new TimedFrame(bundle.Frames.First().Time, bundle.Header));
+            trackedData.UpdateScore();
         });
 
-        /// <summary>
-        /// Invoked when new frames have arrived for a user.
-        /// </summary>
-        /// <remarks>
-        /// By default, this immediately sets the current frame to be displayed for the user.
-        /// </remarks>
-        /// <param name="userId">The user which the frames arrived for.</param>
-        /// <param name="bundle">The bundle of frames.</param>
-        protected virtual void OnIncomingFrames(int userId, FrameDataBundle bundle) => SetCurrentFrame(userId, bundle.Header);
-
-        /// <summary>
-        /// Sets the current frame to be displayed for a user.
-        /// </summary>
-        /// <param name="userId">The user to set the frame of.</param>
-        /// <param name="header">The frame to set.</param>
-        protected void SetCurrentFrame(int userId, FrameHeader header)
-        {
-            var trackedScore = userScores[userId];
-            trackedScore.LastHeader = header;
-            trackedScore.UpdateScore(scoreProcessor, scoringMode.Value);
-        }
+        protected virtual TrackedUserData CreateUserData(int userId, ScoreProcessor scoreProcessor) => new TrackedUserData(userId, scoreProcessor);
 
         protected override void Dispose(bool isDisposing)
         {
@@ -158,38 +134,65 @@ namespace osu.Game.Screens.Play.HUD
             }
         }
 
-        private class TrackedUserData
+        protected class TrackedUserData
         {
-            public IBindableNumber<double> Score => score;
+            public readonly int UserId;
+            public readonly ScoreProcessor ScoreProcessor;
 
-            private readonly BindableDouble score = new BindableDouble();
+            public readonly BindableDouble Score = new BindableDouble();
+            public readonly BindableDouble Accuracy = new BindableDouble(1);
+            public readonly BindableInt CurrentCombo = new BindableInt();
+            public readonly BindableBool UserQuit = new BindableBool();
 
-            public IBindableNumber<double> Accuracy => accuracy;
+            public readonly IBindable<ScoringMode> ScoringMode = new Bindable<ScoringMode>();
 
-            private readonly BindableDouble accuracy = new BindableDouble(1);
+            public readonly List<TimedFrame> Frames = new List<TimedFrame>();
 
-            public IBindableNumber<int> CurrentCombo => currentCombo;
-
-            private readonly BindableInt currentCombo = new BindableInt();
-
-            public IBindable<bool> UserQuit => userQuit;
-
-            private readonly BindableBool userQuit = new BindableBool();
-
-            [CanBeNull]
-            public FrameHeader LastHeader;
-
-            public void MarkUserQuit() => userQuit.Value = true;
-
-            public void UpdateScore(ScoreProcessor processor, ScoringMode mode)
+            public TrackedUserData(int userId, ScoreProcessor scoreProcessor)
             {
-                if (LastHeader == null)
+                UserId = userId;
+                ScoreProcessor = scoreProcessor;
+
+                ScoringMode.BindValueChanged(_ => UpdateScore());
+            }
+
+            public void MarkUserQuit() => UserQuit.Value = true;
+
+            public virtual void UpdateScore()
+            {
+                if (Frames.Count == 0)
                     return;
 
-                score.Value = processor.GetImmediateScore(mode, LastHeader.MaxCombo, LastHeader.Statistics);
-                accuracy.Value = LastHeader.Accuracy;
-                currentCombo.Value = LastHeader.Combo;
+                SetFrame(Frames.Last());
             }
+
+            protected void SetFrame(TimedFrame frame)
+            {
+                var header = frame.Header;
+
+                Score.Value = ScoreProcessor.GetImmediateScore(ScoringMode.Value, header.MaxCombo, header.Statistics);
+                Accuracy.Value = header.Accuracy;
+                CurrentCombo.Value = header.Combo;
+            }
+        }
+
+        protected class TimedFrame : IComparable<TimedFrame>
+        {
+            public readonly double Time;
+            public readonly FrameHeader Header;
+
+            public TimedFrame(double time)
+            {
+                Time = time;
+            }
+
+            public TimedFrame(double time, FrameHeader header)
+            {
+                Time = time;
+                Header = header;
+            }
+
+            public int CompareTo(TimedFrame other) => Time.CompareTo(other.Time);
         }
     }
 }

From 1e002841cff4ffeac18a58c57c6a0769e33b05c9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 12 Apr 2021 22:03:45 +0900
Subject: [PATCH 2362/3722] Add test for scoring mode changes

---
 .../TestSceneMultiplayerGameplayLeaderboard.cs  | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
index 272d547505..b6c06bb149 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
+using osu.Game.Configuration;
 using osu.Game.Database;
 using osu.Game.Online;
 using osu.Game.Online.API;
@@ -38,6 +39,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         protected override Container<Drawable> Content { get; } = new Container { RelativeSizeAxes = Axes.Both };
 
+        private OsuConfigManager config;
+
         public TestSceneMultiplayerGameplayLeaderboard()
         {
             base.Content.Children = new Drawable[]
@@ -48,6 +51,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
             };
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Dependencies.Cache(config = new OsuConfigManager(LocalStorage));
+        }
+
         [SetUpSteps]
         public override void SetUpSteps()
         {
@@ -97,6 +106,14 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddRepeatStep("mark user quit", () => Client.CurrentMatchPlayingUserIds.RemoveAt(0), users);
         }
 
+        [Test]
+        public void TestChangeScoringMode()
+        {
+            AddRepeatStep("update state", () => streamingClient.RandomlyUpdateState(), 5);
+            AddStep("change to classic", () => config.SetValue(OsuSetting.ScoreDisplayMode, ScoringMode.Classic));
+            AddStep("change to standardised", () => config.SetValue(OsuSetting.ScoreDisplayMode, ScoringMode.Standardised));
+        }
+
         public class TestMultiplayerStreaming : SpectatorStreamingClient
         {
             public new BindableList<int> PlayingUsers => (BindableList<int>)base.PlayingUsers;

From 7c4f6d2b62635ef38c95754484f7bb82b2d2122d Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 12 Apr 2021 15:47:26 +0200
Subject: [PATCH 2363/3722] Rework template usage

Includes moving the origin check back to templates, constructing nested template classes in each check, and making parameterized template usage.
---
 .../Edit/Checks/CheckOffscreenObjects.cs      | 57 ++++++++++++-------
 .../Rulesets/Edit/Checks/CheckBackground.cs   | 55 +++++++++++-------
 .../Rulesets/Edit/Checks/Components/Issue.cs  | 17 +++---
 .../Edit/Checks/Components/IssueTemplate.cs   |  8 ++-
 4 files changed, 88 insertions(+), 49 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index b34c9966a4..c4f38e6d09 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -22,29 +22,46 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
         // (higher = more performant, but higher false-negative chance).
         private const int path_step_size = 5;
 
+        private readonly IssueTemplateOffscreenCircle templateOffscreenCircle;
+        private readonly IssueTemplateOffscreenSlider templateOffscreenSlider;
+        private readonly IssueTemplate[] templates;
+
+        private class IssueTemplateOffscreenCircle : IssueTemplate
+        {
+            public IssueTemplateOffscreenCircle(ICheck checkOrigin)
+                : base(checkOrigin, IssueType.Problem, "This circle goes offscreen on a 4:3 aspect ratio.")
+            {
+            }
+
+            public Issue Create(HitCircle circle) => new Issue(circle, this);
+        }
+
+        private class IssueTemplateOffscreenSlider : IssueTemplate
+        {
+            public IssueTemplateOffscreenSlider(ICheck checkOrigin)
+                : base(checkOrigin, IssueType.Problem, "This slider goes offscreen here on a 4:3 aspect ratio.")
+            {
+            }
+
+            public Issue Create(Slider slider, double offscreenTime) => new Issue(slider, this) { Time = offscreenTime };
+        }
+
+        public CheckOffscreenObjects()
+        {
+            templates = new IssueTemplate[]
+            {
+                templateOffscreenCircle = new IssueTemplateOffscreenCircle(this),
+                templateOffscreenSlider = new IssueTemplateOffscreenSlider(this)
+            };
+        }
+
         public CheckMetadata Metadata { get; } = new CheckMetadata
         (
             category: CheckCategory.Compose,
             description: "Offscreen hitobjects."
         );
 
-        public IEnumerable<IssueTemplate> PossibleTemplates => new[]
-        {
-            templateOffscreen,
-            templateOffscreenSliderPath
-        };
-
-        private readonly IssueTemplate templateOffscreen = new IssueTemplate
-        (
-            type: IssueType.Problem,
-            unformattedMessage: "This object goes offscreen on a 4:3 aspect ratio."
-        );
-
-        private readonly IssueTemplate templateOffscreenSliderPath = new IssueTemplate
-        (
-            type: IssueType.Problem,
-            unformattedMessage: "This slider goes offscreen here on a 4:3 aspect ratio."
-        );
+        public IEnumerable<IssueTemplate> PossibleTemplates => templates;
 
         public IEnumerable<Issue> Run(IBeatmap beatmap)
         {
@@ -63,7 +80,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
                     case HitCircle circle:
                     {
                         if (isOffscreen(circle.StackedPosition, circle.Radius))
-                            yield return new Issue(this, circle, templateOffscreen);
+                            yield return templateOffscreenCircle.Create(circle);
 
                         break;
                     }
@@ -89,7 +106,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
 
                 // `SpanDuration` ensures we don't include reverses.
                 double time = slider.StartTime + progress * slider.SpanDuration;
-                yield return new Issue(this, slider, templateOffscreenSliderPath) { Time = time };
+                yield return templateOffscreenSlider.Create(slider, time);
 
                 yield break;
             }
@@ -98,7 +115,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
             if (!isOffscreen(slider.StackedEndPosition, slider.Radius))
                 yield break;
 
-            yield return new Issue(this, slider, templateOffscreenSliderPath) { Time = slider.EndTime };
+            yield return templateOffscreenSlider.Create(slider, slider.EndTime);
         }
 
         private bool isOffscreen(Vector2 position, double radius)
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
index c922aa03c0..1e45ea261c 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
@@ -10,35 +10,52 @@ namespace osu.Game.Rulesets.Edit.Checks
 {
     public class CheckBackground : ICheck
     {
+        private readonly IssueTemplateNoneSet templateNoneSet;
+        private readonly IssueTemplateDoesNotExist templateDoesNotExist;
+        private readonly IssueTemplate[] templates;
+
+        private class IssueTemplateNoneSet : IssueTemplate
+        {
+            public IssueTemplateNoneSet(ICheck checkOrigin)
+                : base(checkOrigin, IssueType.Problem, "No background has been set")
+            {
+            }
+
+            public Issue Create() => new Issue(this);
+        }
+
+        private class IssueTemplateDoesNotExist : IssueTemplate
+        {
+            public IssueTemplateDoesNotExist(ICheck checkOrigin)
+                : base(checkOrigin, IssueType.Problem, "The background file \"{0}\" does not exist.")
+            {
+            }
+
+            public Issue Create(string filename) => new Issue(this, filename);
+        }
+
+        public CheckBackground()
+        {
+            templates = new IssueTemplate[]
+            {
+                templateNoneSet = new IssueTemplateNoneSet(this),
+                templateDoesNotExist = new IssueTemplateDoesNotExist(this)
+            };
+        }
+
         public CheckMetadata Metadata { get; } = new CheckMetadata
         (
             category: CheckCategory.Resources,
             description: "Missing background."
         );
 
-        public IEnumerable<IssueTemplate> PossibleTemplates => new[]
-        {
-            templateNoneSet,
-            templateDoesNotExist
-        };
-
-        private readonly IssueTemplate templateNoneSet = new IssueTemplate
-        (
-            type: IssueType.Problem,
-            unformattedMessage: "No background has been set."
-        );
-
-        private readonly IssueTemplate templateDoesNotExist = new IssueTemplate
-        (
-            type: IssueType.Problem,
-            unformattedMessage: "The background file \"{0}\" is does not exist."
-        );
+        public IEnumerable<IssueTemplate> PossibleTemplates => templates;
 
         public IEnumerable<Issue> Run(IBeatmap beatmap)
         {
             if (beatmap.Metadata.BackgroundFile == null)
             {
-                yield return new Issue(this, templateNoneSet);
+                yield return templateNoneSet.Create();
 
                 yield break;
             }
@@ -51,7 +68,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             if (file != null)
                 yield break;
 
-            yield return new Issue(this, templateDoesNotExist, beatmap.Metadata.BackgroundFile);
+            yield return templateDoesNotExist.Create(beatmap.Metadata.BackgroundFile);
         }
     }
 }
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs b/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
index d0f7df857b..2bc9930e8f 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/Issue.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// <summary>
         /// The check that this issue originates from.
         /// </summary>
-        public ICheck Check;
+        public ICheck Check => Template.Check;
 
         /// <summary>
         /// The arguments that give this issue its context, based on the <see cref="IssueTemplate"/>. These are then substituted into the <see cref="IssueTemplate.UnformattedMessage"/>.
@@ -37,30 +37,29 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// </summary>
         public object[] Arguments;
 
-        public Issue(ICheck check, IssueTemplate template, params object[] args)
+        public Issue(IssueTemplate template, params object[] args)
         {
-            Check = check;
             Time = null;
             HitObjects = Array.Empty<HitObject>();
             Template = template;
             Arguments = args;
         }
 
-        public Issue(ICheck check, double? time, IssueTemplate template, params object[] args)
-            : this(check, template, args)
+        public Issue(double? time, IssueTemplate template, params object[] args)
+            : this(template, args)
         {
             Time = time;
         }
 
-        public Issue(ICheck check, HitObject hitObject, IssueTemplate template, params object[] args)
-            : this(check, template, args)
+        public Issue(HitObject hitObject, IssueTemplate template, params object[] args)
+            : this(template, args)
         {
             Time = hitObject.StartTime;
             HitObjects = new[] { hitObject };
         }
 
-        public Issue(ICheck check, IEnumerable<HitObject> hitObjects, IssueTemplate template, params object[] args)
-            : this(check, template, args)
+        public Issue(IEnumerable<HitObject> hitObjects, IssueTemplate template, params object[] args)
+            : this(template, args)
         {
             var hitObjectList = hitObjects.ToList();
 
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
index 4a5f98ca5f..e746844879 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
@@ -14,6 +14,11 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         private static readonly Color4 negligible_green = new Colour4(0.33f, 0.8f, 0.5f, 1.0f);
         private static readonly Color4 error_gray = new Colour4(0.5f, 0.5f, 0.5f, 1.0f);
 
+        /// <summary>
+        /// The check that this template originates from.
+        /// </summary>
+        public ICheck Check;
+
         /// <summary>
         /// The type of the issue.
         /// </summary>
@@ -26,8 +31,9 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// </summary>
         public readonly string UnformattedMessage;
 
-        public IssueTemplate(IssueType type, string unformattedMessage)
+        public IssueTemplate(ICheck check, IssueType type, string unformattedMessage)
         {
+            Check = check;
             Type = type;
             UnformattedMessage = unformattedMessage;
         }

From 1c69829ad488edf10b2aaaa347c5b3be28aeabc0 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 12 Apr 2021 15:47:58 +0200
Subject: [PATCH 2364/3722] Fix `Template.Origin` -> `Check`

---
 osu.Game/Screens/Edit/Verify/IssueTable.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Verify/IssueTable.cs b/osu.Game/Screens/Edit/Verify/IssueTable.cs
index 84dbabf300..516e1adf44 100644
--- a/osu.Game/Screens/Edit/Verify/IssueTable.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueTable.cs
@@ -112,7 +112,7 @@ namespace osu.Game.Screens.Edit.Verify
             },
             new OsuSpriteText
             {
-                Text = issue.Template.Origin.Metadata.Category.ToString(),
+                Text = issue.Check.Metadata.Category.ToString(),
                 Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold),
                 Margin = new MarginPadding(10)
             }

From 008dbc7dd6f841ea245ec8b732696ebbbb2a73b4 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 12 Apr 2021 15:49:13 +0200
Subject: [PATCH 2365/3722] Reverse `IssueType` ordering

Reversed both in the enum and where it's displayed, so ends up the same in the end.
---
 osu.Game/Rulesets/Edit/Checks/Components/IssueType.cs | 10 +++++-----
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs          |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/Components/IssueType.cs b/osu.Game/Rulesets/Edit/Checks/Components/IssueType.cs
index be43060cfc..1241e058ad 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/IssueType.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/IssueType.cs
@@ -4,22 +4,22 @@
 namespace osu.Game.Rulesets.Edit.Checks.Components
 {
     /// <summary>
-    /// The type, or severity, of an issue. This decides its priority.
+    /// The type, or severity, of an issue.
     /// </summary>
     public enum IssueType
     {
         /// <summary> A must-fix in the vast majority of cases. </summary>
-        Problem = 3,
+        Problem,
 
         /// <summary> A possible mistake. Often requires critical thinking.  </summary>
-        Warning = 2,
+        Warning,
 
         // TODO: Try/catch all checks run and return error templates if exceptions occur.
         /// <summary> An error occurred and a complete check could not be made. </summary>
-        Error = 1,
+        Error,
 
         // TODO: Negligible issues should be hidden by default.
         /// <summary> A possible mistake so minor/unlikely that it can often be safely ignored. </summary>
-        Negligible = 0,
+        Negligible,
     }
 }
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index 806029df4d..a3d808ce62 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -129,8 +129,8 @@ namespace osu.Game.Screens.Edit.Verify
             private void refresh()
             {
                 table.Issues = beatmapVerifier.Run(Beatmap)
-                                              .OrderByDescending(issue => issue.Template.Type)
-                                              .ThenByDescending(issue => issue.Check.Metadata.Category);
+                                              .OrderBy(issue => issue.Template.Type)
+                                              .ThenBy(issue => issue.Check.Metadata.Category);
             }
         }
     }

From caaaba59505f19f999a593a3c35f460c598c9065 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 12 Apr 2021 16:20:53 +0200
Subject: [PATCH 2366/3722] Rename `Check` -> `ICheck`

---
 osu.Game/Rulesets/Edit/Checks/Components/{Check.cs => ICheck.cs} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename osu.Game/Rulesets/Edit/Checks/Components/{Check.cs => ICheck.cs} (100%)

diff --git a/osu.Game/Rulesets/Edit/Checks/Components/Check.cs b/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
similarity index 100%
rename from osu.Game/Rulesets/Edit/Checks/Components/Check.cs
rename to osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs

From 6d50d01186f24c342b0fc406803b2486cebbbf4b Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 12 Apr 2021 16:23:05 +0200
Subject: [PATCH 2367/3722] Make `IssueTemplate.Check` readonly

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

diff --git a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
index e746844879..97df79ecd8 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// <summary>
         /// The check that this template originates from.
         /// </summary>
-        public ICheck Check;
+        public readonly ICheck Check;
 
         /// <summary>
         /// The type of the issue.

From 36bd235021d08202dd0c489b1bc664b91a31aca1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Apr 2021 23:36:10 +0900
Subject: [PATCH 2368/3722] Move nested classes to bottom of file

---
 .../Edit/Checks/CheckOffscreenObjects.cs      | 40 +++++++++----------
 .../Rulesets/Edit/Checks/CheckBackground.cs   | 40 +++++++++----------
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index c4f38e6d09..f2a062b6d7 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -26,26 +26,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
         private readonly IssueTemplateOffscreenSlider templateOffscreenSlider;
         private readonly IssueTemplate[] templates;
 
-        private class IssueTemplateOffscreenCircle : IssueTemplate
-        {
-            public IssueTemplateOffscreenCircle(ICheck checkOrigin)
-                : base(checkOrigin, IssueType.Problem, "This circle goes offscreen on a 4:3 aspect ratio.")
-            {
-            }
-
-            public Issue Create(HitCircle circle) => new Issue(circle, this);
-        }
-
-        private class IssueTemplateOffscreenSlider : IssueTemplate
-        {
-            public IssueTemplateOffscreenSlider(ICheck checkOrigin)
-                : base(checkOrigin, IssueType.Problem, "This slider goes offscreen here on a 4:3 aspect ratio.")
-            {
-            }
-
-            public Issue Create(Slider slider, double offscreenTime) => new Issue(slider, this) { Time = offscreenTime };
-        }
-
         public CheckOffscreenObjects()
         {
             templates = new IssueTemplate[]
@@ -123,5 +103,25 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
             return position.X - radius < min_x || position.X + radius > max_x ||
                    position.Y - radius < min_y || position.Y + radius > max_y;
         }
+
+        private class IssueTemplateOffscreenCircle : IssueTemplate
+        {
+            public IssueTemplateOffscreenCircle(ICheck checkOrigin)
+                : base(checkOrigin, IssueType.Problem, "This circle goes offscreen on a 4:3 aspect ratio.")
+            {
+            }
+
+            public Issue Create(HitCircle circle) => new Issue(circle, this);
+        }
+
+        private class IssueTemplateOffscreenSlider : IssueTemplate
+        {
+            public IssueTemplateOffscreenSlider(ICheck checkOrigin)
+                : base(checkOrigin, IssueType.Problem, "This slider goes offscreen here on a 4:3 aspect ratio.")
+            {
+            }
+
+            public Issue Create(Slider slider, double offscreenTime) => new Issue(slider, this) { Time = offscreenTime };
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
index 1e45ea261c..b48d19ae29 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
@@ -14,26 +14,6 @@ namespace osu.Game.Rulesets.Edit.Checks
         private readonly IssueTemplateDoesNotExist templateDoesNotExist;
         private readonly IssueTemplate[] templates;
 
-        private class IssueTemplateNoneSet : IssueTemplate
-        {
-            public IssueTemplateNoneSet(ICheck checkOrigin)
-                : base(checkOrigin, IssueType.Problem, "No background has been set")
-            {
-            }
-
-            public Issue Create() => new Issue(this);
-        }
-
-        private class IssueTemplateDoesNotExist : IssueTemplate
-        {
-            public IssueTemplateDoesNotExist(ICheck checkOrigin)
-                : base(checkOrigin, IssueType.Problem, "The background file \"{0}\" does not exist.")
-            {
-            }
-
-            public Issue Create(string filename) => new Issue(this, filename);
-        }
-
         public CheckBackground()
         {
             templates = new IssueTemplate[]
@@ -70,5 +50,25 @@ namespace osu.Game.Rulesets.Edit.Checks
 
             yield return templateDoesNotExist.Create(beatmap.Metadata.BackgroundFile);
         }
+
+        private class IssueTemplateNoneSet : IssueTemplate
+        {
+            public IssueTemplateNoneSet(ICheck checkOrigin)
+                : base(checkOrigin, IssueType.Problem, "No background has been set")
+            {
+            }
+
+            public Issue Create() => new Issue(this);
+        }
+
+        private class IssueTemplateDoesNotExist : IssueTemplate
+        {
+            public IssueTemplateDoesNotExist(ICheck checkOrigin)
+                : base(checkOrigin, IssueType.Problem, "The background file \"{0}\" does not exist.")
+            {
+            }
+
+            public Issue Create(string filename) => new Issue(this, filename);
+        }
     }
 }

From 62c181228284f034168b87c27879fa72b87369b9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Apr 2021 23:37:47 +0900
Subject: [PATCH 2369/3722] Remove redundant parameter naming

---
 osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs | 6 +-----
 osu.Game/Rulesets/Edit/Checks/CheckBackground.cs           | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index f2a062b6d7..8d4cf2f4f0 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -35,11 +35,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
             };
         }
 
-        public CheckMetadata Metadata { get; } = new CheckMetadata
-        (
-            category: CheckCategory.Compose,
-            description: "Offscreen hitobjects."
-        );
+        public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Compose, "Offscreen hitobjects");
 
         public IEnumerable<IssueTemplate> PossibleTemplates => templates;
 
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
index b48d19ae29..1a766798cb 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
@@ -23,11 +23,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             };
         }
 
-        public CheckMetadata Metadata { get; } = new CheckMetadata
-        (
-            category: CheckCategory.Resources,
-            description: "Missing background."
-        );
+        public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Resources, "Missing background");
 
         public IEnumerable<IssueTemplate> PossibleTemplates => templates;
 

From 43b97fe0ad738854f1ef795bfd386db615c75458 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Mon, 12 Apr 2021 10:52:12 -0400
Subject: [PATCH 2370/3722] Refactor PowerStatus (now called BatteryInfo)

---
 osu.Android/OsuGameAndroid.cs                      |  6 ++----
 osu.Android/osu.Android.csproj                     |  1 -
 .../Visual/Gameplay/TestScenePlayerLoader.cs       | 14 ++++++--------
 osu.Game/OsuGameBase.cs                            |  4 ++--
 osu.Game/Screens/Play/PlayerLoader.cs              |  6 +++---
 osu.Game/Utils/{PowerStatus.cs => BatteryInfo.cs}  | 12 +++---------
 osu.iOS/OsuGameIOS.cs                              |  6 ++----
 osu.iOS/osu.iOS.csproj                             |  1 -
 8 files changed, 18 insertions(+), 32 deletions(-)
 rename osu.Game/Utils/{PowerStatus.cs => BatteryInfo.cs} (68%)

diff --git a/osu.Android/OsuGameAndroid.cs b/osu.Android/OsuGameAndroid.cs
index 02f4fa1ad6..050bf2b787 100644
--- a/osu.Android/OsuGameAndroid.cs
+++ b/osu.Android/OsuGameAndroid.cs
@@ -75,12 +75,10 @@ namespace osu.Android
 
         protected override UpdateManager CreateUpdateManager() => new SimpleUpdateManager();
 
-        protected override PowerStatus CreatePowerStatus() => new AndroidPowerStatus();
+        protected override BatteryInfo CreateBatteryInfo() => new AndroidBatteryInfo();
 
-        private class AndroidPowerStatus : PowerStatus
+        private class AndroidBatteryInfo : BatteryInfo
         {
-            public override double BatteryCutoff => 0.20;
-
             public override double ChargeLevel => Battery.ChargeLevel;
 
             public override bool IsCharging => Battery.PowerSource != BatteryPowerSource.Battery;
diff --git a/osu.Android/osu.Android.csproj b/osu.Android/osu.Android.csproj
index 64d5e5b1c8..582c856a47 100644
--- a/osu.Android/osu.Android.csproj
+++ b/osu.Android/osu.Android.csproj
@@ -64,7 +64,6 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <!-- Used for obtaining battery info. -->
     <PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index 657c1dd47e..311448a284 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -49,8 +49,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached]
         private readonly VolumeOverlay volumeOverlay;
 
-        [Cached(typeof(PowerStatus))]
-        private readonly LocalPowerStatus powerStatus = new LocalPowerStatus();
+        [Cached(typeof(BatteryInfo))]
+        private readonly LocalBatteryInfo batteryInfo = new LocalBatteryInfo();
 
         private readonly ChangelogOverlay changelogOverlay;
 
@@ -302,8 +302,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             // set charge status and level
             AddStep("load player", () => resetPlayer(false, () =>
             {
-                powerStatus.SetCharging(isCharging);
-                powerStatus.SetChargeLevel(chargeLevel);
+                batteryInfo.SetCharging(isCharging);
+                batteryInfo.SetChargeLevel(chargeLevel);
             }));
             AddUntilStep("wait for player", () => player?.LoadState == LoadState.Ready);
             AddAssert($"notification {(shouldWarn ? "triggered" : "not triggered")}", () => notificationOverlay.UnreadCount.Value == (shouldWarn ? 1 : 0));
@@ -381,16 +381,14 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         /// <summary>
-        /// Mutable dummy PowerStatus class for <see cref="TestScenePlayerLoader.TestLowBatteryNotification"/>
+        /// Mutable dummy BatteryInfo class for <see cref="TestScenePlayerLoader.TestLowBatteryNotification"/>
         /// </summary>
         /// <inheritdoc/>
-        private class LocalPowerStatus : PowerStatus
+        private class LocalBatteryInfo : BatteryInfo
         {
             private bool isCharging = true;
             private double chargeLevel = 1;
 
-            public override double BatteryCutoff => 0.2;
-
             public override bool IsCharging => isCharging;
 
             public override double ChargeLevel => chargeLevel;
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 96aabf0024..de8ba93106 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -157,7 +157,7 @@ namespace osu.Game
 
         protected override UserInputManager CreateUserInputManager() => new OsuUserInputManager();
 
-        protected virtual PowerStatus CreatePowerStatus() => null;
+        protected virtual BatteryInfo CreateBatteryInfo() => null;
 
         /// <summary>
         /// The maximum volume at which audio tracks should playback. This can be set lower than 1 to create some head-room for sound effects.
@@ -285,7 +285,7 @@ namespace osu.Game
             dependencies.Cache(SettingsStore = new SettingsStore(contextFactory));
             dependencies.Cache(RulesetConfigCache = new RulesetConfigCache(SettingsStore));
 
-            var powerStatus = CreatePowerStatus();
+            var powerStatus = CreateBatteryInfo();
             if (powerStatus != null)
                 dependencies.CacheAs(powerStatus);
 
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index d342bf8273..964410f838 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -114,7 +114,7 @@ namespace osu.Game.Screens.Play
         private AudioManager audioManager { get; set; }
 
         [Resolved(CanBeNull = true)]
-        private PowerStatus powerStatus { get; set; }
+        private BatteryInfo batteryInfo { get; set; }
 
         public PlayerLoader(Func<Player> createPlayer)
         {
@@ -483,11 +483,11 @@ namespace osu.Game.Screens.Play
 
         private void showBatteryWarningIfNeeded()
         {
-            if (powerStatus == null) return;
+            if (batteryInfo == null) return;
 
             if (!batteryWarningShownOnce.Value)
             {
-                if (powerStatus.IsLowBattery)
+                if (batteryInfo.IsLowBattery)
                 {
                     notificationOverlay?.Post(new BatteryWarningNotification());
                     batteryWarningShownOnce.Value = true;
diff --git a/osu.Game/Utils/PowerStatus.cs b/osu.Game/Utils/BatteryInfo.cs
similarity index 68%
rename from osu.Game/Utils/PowerStatus.cs
rename to osu.Game/Utils/BatteryInfo.cs
index 46f7e32b9e..1a64213d8e 100644
--- a/osu.Game/Utils/PowerStatus.cs
+++ b/osu.Game/Utils/BatteryInfo.cs
@@ -5,15 +5,9 @@ namespace osu.Game.Utils
 {
     /// <summary>
     /// Provides access to the system's power status.
-    /// Currently implemented on iOS and Android only.
     /// </summary>
-    public abstract class PowerStatus
+    public abstract class BatteryInfo
     {
-        /// <summary>
-        /// The maximum battery level considered as low, from 0 to 1.
-        /// </summary>
-        public abstract double BatteryCutoff { get; }
-
         /// <summary>
         /// The charge level of the battery, from 0 to 1.
         /// </summary>
@@ -23,8 +17,8 @@ namespace osu.Game.Utils
 
         /// <summary>
         /// Whether the battery is currently low in charge.
-        /// Returns true if not charging and current charge level is lower than or equal to <see cref="BatteryCutoff"/>.
+        /// Returns true if not charging and current charge level is lower than or equal to 25%.
         /// </summary>
-        public bool IsLowBattery => !IsCharging && ChargeLevel <= BatteryCutoff;
+        public bool IsLowBattery => !IsCharging && ChargeLevel <= 0.25;
     }
 }
diff --git a/osu.iOS/OsuGameIOS.cs b/osu.iOS/OsuGameIOS.cs
index b53b594eae..702aef45f5 100644
--- a/osu.iOS/OsuGameIOS.cs
+++ b/osu.iOS/OsuGameIOS.cs
@@ -16,12 +16,10 @@ namespace osu.iOS
 
         protected override UpdateManager CreateUpdateManager() => new SimpleUpdateManager();
 
-        protected override PowerStatus CreatePowerStatus() => new IOSPowerStatus();
+        protected override BatteryInfo CreateBatteryInfo() => new IOSBatteryInfo();
 
-        private class IOSPowerStatus : PowerStatus
+        private class IOSBatteryInfo : BatteryInfo
         {
-            public override double BatteryCutoff => 0.25;
-
             public override double ChargeLevel => Battery.ChargeLevel;
 
             public override bool IsCharging => Battery.PowerSource != BatteryPowerSource.Battery;
diff --git a/osu.iOS/osu.iOS.csproj b/osu.iOS/osu.iOS.csproj
index ed6f52c60e..1cbe4422cc 100644
--- a/osu.iOS/osu.iOS.csproj
+++ b/osu.iOS/osu.iOS.csproj
@@ -117,7 +117,6 @@
     </ImageAsset>
   </ItemGroup>
   <ItemGroup>
-  <!-- Used for obtaining battery info. -->
     <PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />

From bb720c23a01e6f27b376491abf29e578f4db5bc6 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 12 Apr 2021 17:12:37 +0200
Subject: [PATCH 2371/3722] Remove check ctors and locals

---
 .../Edit/Checks/CheckOffscreenObjects.cs      | 25 ++++++-------------
 .../Rulesets/Edit/Checks/CheckBackground.cs   | 23 ++++++-----------
 2 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index 8d4cf2f4f0..adaabc0a1d 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -22,22 +22,13 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
         // (higher = more performant, but higher false-negative chance).
         private const int path_step_size = 5;
 
-        private readonly IssueTemplateOffscreenCircle templateOffscreenCircle;
-        private readonly IssueTemplateOffscreenSlider templateOffscreenSlider;
-        private readonly IssueTemplate[] templates;
-
-        public CheckOffscreenObjects()
-        {
-            templates = new IssueTemplate[]
-            {
-                templateOffscreenCircle = new IssueTemplateOffscreenCircle(this),
-                templateOffscreenSlider = new IssueTemplateOffscreenSlider(this)
-            };
-        }
-
         public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Compose, "Offscreen hitobjects");
 
-        public IEnumerable<IssueTemplate> PossibleTemplates => templates;
+        public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
+        {
+            new IssueTemplateOffscreenCircle(this),
+            new IssueTemplateOffscreenSlider(this)
+        };
 
         public IEnumerable<Issue> Run(IBeatmap beatmap)
         {
@@ -56,7 +47,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
                     case HitCircle circle:
                     {
                         if (isOffscreen(circle.StackedPosition, circle.Radius))
-                            yield return templateOffscreenCircle.Create(circle);
+                            yield return new IssueTemplateOffscreenCircle(this).Create(circle);
 
                         break;
                     }
@@ -82,7 +73,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
 
                 // `SpanDuration` ensures we don't include reverses.
                 double time = slider.StartTime + progress * slider.SpanDuration;
-                yield return templateOffscreenSlider.Create(slider, time);
+                yield return new IssueTemplateOffscreenSlider(this).Create(slider, time);
 
                 yield break;
             }
@@ -91,7 +82,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
             if (!isOffscreen(slider.StackedEndPosition, slider.Radius))
                 yield break;
 
-            yield return templateOffscreenSlider.Create(slider, slider.EndTime);
+            yield return new IssueTemplateOffscreenSlider(this).Create(slider, slider.EndTime);
         }
 
         private bool isOffscreen(Vector2 position, double radius)
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
index 1a766798cb..b0c1d6eb4b 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
@@ -10,28 +10,19 @@ namespace osu.Game.Rulesets.Edit.Checks
 {
     public class CheckBackground : ICheck
     {
-        private readonly IssueTemplateNoneSet templateNoneSet;
-        private readonly IssueTemplateDoesNotExist templateDoesNotExist;
-        private readonly IssueTemplate[] templates;
-
-        public CheckBackground()
-        {
-            templates = new IssueTemplate[]
-            {
-                templateNoneSet = new IssueTemplateNoneSet(this),
-                templateDoesNotExist = new IssueTemplateDoesNotExist(this)
-            };
-        }
-
         public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Resources, "Missing background");
 
-        public IEnumerable<IssueTemplate> PossibleTemplates => templates;
+        public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
+        {
+            new IssueTemplateNoneSet(this),
+            new IssueTemplateDoesNotExist(this)
+        };
 
         public IEnumerable<Issue> Run(IBeatmap beatmap)
         {
             if (beatmap.Metadata.BackgroundFile == null)
             {
-                yield return templateNoneSet.Create();
+                yield return new IssueTemplateNoneSet(this).Create();
 
                 yield break;
             }
@@ -44,7 +35,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             if (file != null)
                 yield break;
 
-            yield return templateDoesNotExist.Create(beatmap.Metadata.BackgroundFile);
+            yield return new IssueTemplateDoesNotExist(this).Create(beatmap.Metadata.BackgroundFile);
         }
 
         private class IssueTemplateNoneSet : IssueTemplate

From f66306a81ad70868c29bc2a56d471a08f6bebbe5 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Mon, 12 Apr 2021 11:11:22 -0400
Subject: [PATCH 2372/3722] Remove IsLowBattery

---
 osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs | 2 +-
 osu.Game/Screens/Play/PlayerLoader.cs                   | 2 +-
 osu.Game/Utils/BatteryInfo.cs                           | 6 ------
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index 311448a284..c56f2db0d0 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -294,7 +294,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         [TestCase(false, 1.0, false)] // not charging, above cutoff --> no warning
         [TestCase(true, 0.1, false)] // charging, below cutoff --> no warning
-        [TestCase(false, 0.2, true)] // not charging, at cutoff --> warning
+        [TestCase(false, 0.25, true)] // not charging, at cutoff --> warning
         public void TestLowBatteryNotification(bool isCharging, double chargeLevel, bool shouldWarn)
         {
             AddStep("reset notification lock", () => sessionStatics.GetBindable<bool>(Static.LowBatteryNotificationShownOnce).Value = false);
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 964410f838..fc4659da97 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -487,7 +487,7 @@ namespace osu.Game.Screens.Play
 
             if (!batteryWarningShownOnce.Value)
             {
-                if (batteryInfo.IsLowBattery)
+                if (!batteryInfo.IsCharging && batteryInfo.ChargeLevel <= 0.25)
                 {
                     notificationOverlay?.Post(new BatteryWarningNotification());
                     batteryWarningShownOnce.Value = true;
diff --git a/osu.Game/Utils/BatteryInfo.cs b/osu.Game/Utils/BatteryInfo.cs
index 1a64213d8e..dd9b695e1f 100644
--- a/osu.Game/Utils/BatteryInfo.cs
+++ b/osu.Game/Utils/BatteryInfo.cs
@@ -14,11 +14,5 @@ namespace osu.Game.Utils
         public abstract double ChargeLevel { get; }
 
         public abstract bool IsCharging { get; }
-
-        /// <summary>
-        /// Whether the battery is currently low in charge.
-        /// Returns true if not charging and current charge level is lower than or equal to 25%.
-        /// </summary>
-        public bool IsLowBattery => !IsCharging && ChargeLevel <= 0.25;
     }
 }

From 19a154ddf15684f8a3429a642e3f71e555e0d27f Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 12 Apr 2021 17:28:12 +0200
Subject: [PATCH 2373/3722] Rename `checkOrigin` -> `check`

More consistent with `Issue.ctor`'s "template".
---
 .../Edit/Checks/CheckOffscreenObjects.cs                  | 8 ++++----
 osu.Game/Rulesets/Edit/Checks/CheckBackground.cs          | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index adaabc0a1d..0a682c4a83 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -93,8 +93,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
 
         private class IssueTemplateOffscreenCircle : IssueTemplate
         {
-            public IssueTemplateOffscreenCircle(ICheck checkOrigin)
-                : base(checkOrigin, IssueType.Problem, "This circle goes offscreen on a 4:3 aspect ratio.")
+            public IssueTemplateOffscreenCircle(ICheck check)
+                : base(check, IssueType.Problem, "This circle goes offscreen on a 4:3 aspect ratio.")
             {
             }
 
@@ -103,8 +103,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
 
         private class IssueTemplateOffscreenSlider : IssueTemplate
         {
-            public IssueTemplateOffscreenSlider(ICheck checkOrigin)
-                : base(checkOrigin, IssueType.Problem, "This slider goes offscreen here on a 4:3 aspect ratio.")
+            public IssueTemplateOffscreenSlider(ICheck check)
+                : base(check, IssueType.Problem, "This slider goes offscreen here on a 4:3 aspect ratio.")
             {
             }
 
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
index b0c1d6eb4b..463b596120 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
@@ -40,8 +40,8 @@ namespace osu.Game.Rulesets.Edit.Checks
 
         private class IssueTemplateNoneSet : IssueTemplate
         {
-            public IssueTemplateNoneSet(ICheck checkOrigin)
-                : base(checkOrigin, IssueType.Problem, "No background has been set")
+            public IssueTemplateNoneSet(ICheck check)
+                : base(check, IssueType.Problem, "No background has been set")
             {
             }
 
@@ -50,8 +50,8 @@ namespace osu.Game.Rulesets.Edit.Checks
 
         private class IssueTemplateDoesNotExist : IssueTemplate
         {
-            public IssueTemplateDoesNotExist(ICheck checkOrigin)
-                : base(checkOrigin, IssueType.Problem, "The background file \"{0}\" does not exist.")
+            public IssueTemplateDoesNotExist(ICheck check)
+                : base(check, IssueType.Problem, "The background file \"{0}\" does not exist.")
             {
             }
 

From d9e3276d0edb2f163efd5dcd5894a2881b89ab78 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 12 Apr 2021 19:18:22 +0200
Subject: [PATCH 2374/3722] Don't update path type once immediately

---
 .../Blueprints/Sliders/Components/PathControlPointPiece.cs     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index 6b78cff33e..7686043c43 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -58,12 +58,13 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         {
             this.slider = slider;
             ControlPoint = controlPoint;
+            PointsInSegment = slider.Path.PointsInSegment(ControlPoint);
 
             slider.Path.Version.BindValueChanged(_ =>
             {
                 PointsInSegment = slider.Path.PointsInSegment(ControlPoint);
                 updatePathType();
-            }, runOnceImmediately: true);
+            });
 
             controlPoint.Type.BindValueChanged(_ => updateMarkerDisplay());
 

From 92fab653e175b594327cbce5a7702a6068cf6a58 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 12 Apr 2021 20:10:22 +0300
Subject: [PATCH 2375/3722] Take current mod settings value into account on
 equality comparsion

---
 osu.Game/Online/API/APIMod.cs | 26 +++++++++++++++++++++++++-
 osu.Game/Rulesets/Mods/Mod.cs | 14 +++++++++++++-
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/API/APIMod.cs b/osu.Game/Online/API/APIMod.cs
index bad7e0af38..4427c82a8b 100644
--- a/osu.Game/Online/API/APIMod.cs
+++ b/osu.Game/Online/API/APIMod.cs
@@ -11,6 +11,7 @@ using osu.Framework.Bindables;
 using osu.Game.Configuration;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Utils;
 
 namespace osu.Game.Online.API
 {
@@ -64,7 +65,15 @@ namespace osu.Game.Online.API
         }
 
         public bool Equals(IMod other) => other is APIMod them && Equals(them);
-        public bool Equals(APIMod other) => Acronym == other?.Acronym;
+
+        public bool Equals(APIMod other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+
+            return Acronym == other.Acronym &&
+                   Settings.SequenceEqual(other.Settings, ModSettingsEqualityComparer.Default);
+        }
 
         public override string ToString()
         {
@@ -73,5 +82,20 @@ namespace osu.Game.Online.API
 
             return $"{Acronym}";
         }
+
+        private class ModSettingsEqualityComparer : IEqualityComparer<KeyValuePair<string, object>>
+        {
+            public static ModSettingsEqualityComparer Default { get; } = new ModSettingsEqualityComparer();
+
+            public bool Equals(KeyValuePair<string, object> x, KeyValuePair<string, object> y)
+            {
+                object xValue = ModUtils.GetSettingUnderlyingValue(x.Value);
+                object yValue = ModUtils.GetSettingUnderlyingValue(y.Value);
+
+                return x.Key == y.Key && EqualityComparer<object>.Default.Equals(xValue, yValue);
+            }
+
+            public int GetHashCode(KeyValuePair<string, object> obj) => HashCode.Combine(obj.Key, ModUtils.GetSettingUnderlyingValue(obj.Value));
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 93a11e70f8..832a14ee1e 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -12,6 +12,7 @@ using osu.Framework.Testing;
 using osu.Game.Configuration;
 using osu.Game.IO.Serialization;
 using osu.Game.Rulesets.UI;
+using osu.Game.Utils;
 
 namespace osu.Game.Rulesets.Mods
 {
@@ -173,7 +174,18 @@ namespace osu.Game.Rulesets.Mods
         }
 
         public bool Equals(IMod other) => other is Mod them && Equals(them);
-        public bool Equals(Mod other) => GetType() == other?.GetType();
+
+        public bool Equals(Mod other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+
+            return GetType() == other.GetType() &&
+                   this.GetSettingsSourceProperties().All(pair =>
+                       EqualityComparer<object>.Default.Equals(
+                           ModUtils.GetSettingUnderlyingValue(pair.Item2.GetValue(this)),
+                           ModUtils.GetSettingUnderlyingValue(pair.Item2.GetValue(other))));
+        }
 
         /// <summary>
         /// Reset all custom settings for this mod back to their defaults.

From 589e1a2a471ef69c49d24d42d5b56df9362f7b6c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 12 Apr 2021 20:51:24 +0300
Subject: [PATCH 2376/3722] Add mod settings equality test

---
 .../Mods/ModSettingsEqualityComparsion.cs     | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 osu.Game.Tests/Mods/ModSettingsEqualityComparsion.cs

diff --git a/osu.Game.Tests/Mods/ModSettingsEqualityComparsion.cs b/osu.Game.Tests/Mods/ModSettingsEqualityComparsion.cs
new file mode 100644
index 0000000000..7a5789f01a
--- /dev/null
+++ b/osu.Game.Tests/Mods/ModSettingsEqualityComparsion.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 NUnit.Framework;
+using osu.Game.Online.API;
+using osu.Game.Rulesets.Osu.Mods;
+
+namespace osu.Game.Tests.Mods
+{
+    [TestFixture]
+    public class ModSettingsEqualityComparison
+    {
+        [Test]
+        public void Test()
+        {
+            var mod1 = new OsuModDoubleTime { SpeedChange = { Value = 1.25 } };
+            var mod2 = new OsuModDoubleTime { SpeedChange = { Value = 1.26 } };
+            var mod3 = new OsuModDoubleTime { SpeedChange = { Value = 1.26 } };
+            var apiMod1 = new APIMod(mod1);
+            var apiMod2 = new APIMod(mod2);
+            var apiMod3 = new APIMod(mod3);
+
+            Assert.That(mod1, Is.Not.EqualTo(mod2));
+            Assert.That(apiMod1, Is.Not.EqualTo(apiMod2));
+
+            Assert.That(mod2, Is.EqualTo(mod2));
+            Assert.That(apiMod2, Is.EqualTo(apiMod2));
+
+            Assert.That(mod2, Is.EqualTo(mod3));
+            Assert.That(apiMod2, Is.EqualTo(apiMod3));
+
+            Assert.That(mod3, Is.EqualTo(mod2));
+            Assert.That(apiMod3, Is.EqualTo(apiMod2));
+        }
+    }
+}

From 8f84abf34807bae9679b2f70cdfd8c082eb25e03 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 12 Apr 2021 21:51:04 +0300
Subject: [PATCH 2377/3722] Display "replays watched" tooltip for replays
 subsection

---
 .../Visual/Online/TestSceneUserHistoryGraph.cs       |  3 +--
 .../Sections/Historical/ChartProfileSubsection.cs    |  7 ++++++-
 .../Sections/Historical/PlayHistorySubsection.cs     |  2 ++
 .../Profile/Sections/Historical/ProfileLineChart.cs  |  4 ++--
 .../Profile/Sections/Historical/ReplaysSubsection.cs |  2 ++
 .../Profile/Sections/Historical/UserHistoryGraph.cs  | 12 +++++++-----
 6 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserHistoryGraph.cs b/osu.Game.Tests/Visual/Online/TestSceneUserHistoryGraph.cs
index 57ce4c41e7..484c59695e 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserHistoryGraph.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserHistoryGraph.cs
@@ -19,13 +19,12 @@ namespace osu.Game.Tests.Visual.Online
         {
             UserHistoryGraph graph;
 
-            Add(graph = new UserHistoryGraph
+            Add(graph = new UserHistoryGraph("Test")
             {
                 RelativeSizeAxes = Axes.X,
                 Height = 200,
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-                TooltipCounterName = "Test"
             });
 
             var values = new[]
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs b/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs
index b82773155d..a48036dcbb 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ChartProfileSubsection.cs
@@ -15,6 +15,11 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
     {
         private ProfileLineChart chart;
 
+        /// <summary>
+        /// Text describing the value being plotted on the graph, which will be displayed as a prefix to the value in the history graph tooltip.
+        /// </summary>
+        protected abstract string GraphCounterName { get; }
+
         protected ChartProfileSubsection(Bindable<User> user, string headerText)
             : base(user, headerText)
         {
@@ -30,7 +35,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
                 Left = 20,
                 Right = 40
             },
-            Child = chart = new ProfileLineChart()
+            Child = chart = new ProfileLineChart(GraphCounterName)
         };
 
         protected override void LoadComplete()
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/PlayHistorySubsection.cs b/osu.Game/Overlays/Profile/Sections/Historical/PlayHistorySubsection.cs
index 2f15886c3a..dfd29db693 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/PlayHistorySubsection.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/PlayHistorySubsection.cs
@@ -9,6 +9,8 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
 {
     public class PlayHistorySubsection : ChartProfileSubsection
     {
+        protected override string GraphCounterName => "Plays";
+
         public PlayHistorySubsection(Bindable<User> user)
             : base(user, "Play History")
         {
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
index f02aa36b6c..eb5deb2802 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ProfileLineChart.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
         private readonly Container<TickLine> rowLinesContainer;
         private readonly Container<TickLine> columnLinesContainer;
 
-        public ProfileLineChart()
+        public ProfileLineChart(string graphCounterName)
         {
             RelativeSizeAxes = Axes.X;
             Height = 250;
@@ -88,7 +88,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
                                         }
                                     }
                                 },
-                                graph = new UserHistoryGraph
+                                graph = new UserHistoryGraph(graphCounterName)
                                 {
                                     RelativeSizeAxes = Axes.Both
                                 }
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/ReplaysSubsection.cs b/osu.Game/Overlays/Profile/Sections/Historical/ReplaysSubsection.cs
index e594e8d020..1c28306f17 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/ReplaysSubsection.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/ReplaysSubsection.cs
@@ -9,6 +9,8 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
 {
     public class ReplaysSubsection : ChartProfileSubsection
     {
+        protected override string GraphCounterName => "Replays Watched";
+
         public ReplaysSubsection(Bindable<User> user)
             : base(user, "Replays Watched History")
         {
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs b/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
index b1e8c8f0ca..f9e5ccf618 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
@@ -11,20 +11,22 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
 {
     public class UserHistoryGraph : UserGraph<DateTime, long>
     {
+        private readonly string tooltipCounterName;
+
         [CanBeNull]
         public UserHistoryCount[] Values
         {
             set => Data = value?.Select(v => new KeyValuePair<DateTime, long>(v.Date, v.Count)).ToArray();
         }
 
-        /// <summary>
-        /// Text describing the value being plotted on the graph, which will be displayed as a prefix to the value in the <see cref="HistoryGraphTooltip"/>.
-        /// </summary>
-        public string TooltipCounterName { get; set; } = "Plays";
+        public UserHistoryGraph(string tooltipCounterName)
+        {
+            this.tooltipCounterName = tooltipCounterName;
+        }
 
         protected override float GetDataPointHeight(long playCount) => playCount;
 
-        protected override UserGraphTooltip GetTooltip() => new HistoryGraphTooltip(TooltipCounterName);
+        protected override UserGraphTooltip GetTooltip() => new HistoryGraphTooltip(tooltipCounterName);
 
         protected override object GetTooltipContent(DateTime date, long playCount)
         {

From d8088777ea0a1177fb3e205530fdab7e04165458 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 13 Apr 2021 01:21:34 +0200
Subject: [PATCH 2378/3722] Add `Equals` method to `IssueTemplate`

This will be useful in tests.
---
 osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
index 97df79ecd8..e21f14f4bc 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
@@ -70,5 +70,7 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
                 }
             }
         }
+
+        public bool Equals(IssueTemplate other) => other.Type == Type && other.UnformattedMessage == UnformattedMessage;
     }
 }

From 47cf4bcf2595c672c0f70a85da4c55a36beea182 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 13 Apr 2021 01:22:24 +0200
Subject: [PATCH 2379/3722] Add `CheckBackground` tests

---
 .../Editing/Checks/CheckBackgroundTest.cs     | 73 +++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs

diff --git a/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs b/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs
new file mode 100644
index 0000000000..54d1a116c7
--- /dev/null
+++ b/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.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.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit.Checks;
+using osu.Game.Rulesets.Objects;
+
+namespace osu.Game.Tests.Editing.Checks
+{
+    [TestFixture]
+    public class CheckBackgroundTest
+    {
+        private CheckBackground check;
+        private IBeatmap beatmap;
+
+        [SetUp]
+        public void Setup()
+        {
+            check = new CheckBackground();
+            beatmap = new Beatmap<HitObject>
+            {
+                BeatmapInfo = new BeatmapInfo
+                {
+                    Metadata = new BeatmapMetadata { BackgroundFile = "abc123.jpg" },
+                    BeatmapSet = new BeatmapSetInfo
+                    {
+                        Files = new List<BeatmapSetFileInfo>(new []
+                        {
+                            new BeatmapSetFileInfo { Filename = "abc123.jpg" }
+                        })
+                    }
+                }
+            };
+        }
+
+        [Test]
+        public void TestBackgroundSetAndInFiles()
+        {
+            var issues = check.Run(beatmap);
+
+            Assert.That(!issues.Any());
+        }
+
+        [Test]
+        public void TestBackgroundSetAndNotInFiles()
+        {
+            beatmap.BeatmapInfo.BeatmapSet.Files.Clear();
+
+            var issues = check.Run(beatmap).ToList();
+            var issue = issues.FirstOrDefault();
+
+            Assert.That(issues.Count == 1);
+            Assert.That(issue != null);
+            Assert.That(issue.Template.Equals(check.PossibleTemplates.ElementAt(1)));
+        }
+
+        [Test]
+        public void TestBackgroundNotSet()
+        {
+            beatmap.Metadata.BackgroundFile = null;
+
+            var issues = check.Run(beatmap).ToList();
+            var issue = issues.FirstOrDefault();
+
+            Assert.That(issues.Count == 1);
+            Assert.That(issue != null);
+            Assert.That(issue.Template.Equals(check.PossibleTemplates.ElementAt(0)));
+        }
+    }
+}

From 8a6dfcfae1cb9c8b50e04777648098ef271a8d56 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 13 Apr 2021 01:22:36 +0200
Subject: [PATCH 2380/3722] Add `CheckOffscreenObjects` tests

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

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
new file mode 100644
index 0000000000..fa7854765f
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
@@ -0,0 +1,263 @@
+// Copyright (c) ppy 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.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.Edit.Checks;
+using osu.Game.Rulesets.Osu.Objects;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
+{
+    [TestFixture]
+    public class CheckOffscreenObjectsTest
+    {
+        private CheckOffscreenObjects check;
+
+        [SetUp]
+        public void Setup()
+        {
+            check = new CheckOffscreenObjects();
+        }
+
+        [Test]
+        public void TestCircleInCenter()
+        {
+            var beatmap = new Beatmap<HitObject>
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new HitCircle
+                    {
+                        StartTime = 3000,
+                        Position = new Vector2(320, 240) // Playfield is 640 x 480.
+                    }
+                }
+            };
+
+            var issues = check.Run(beatmap);
+
+            Assert.That(!issues.Any());
+        }
+
+        [Test]
+        public void TestCircleNearEdge()
+        {
+            var beatmap = new Beatmap<HitObject>
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new HitCircle
+                    {
+                        StartTime = 3000,
+                        Position = new Vector2(5, 5)
+                    }
+                }
+            };
+
+            var issues = check.Run(beatmap);
+
+            Assert.That(!issues.Any());
+        }
+
+        [Test]
+        public void TestCircleNearEdgeStackedOffscreen()
+        {
+            var beatmap = new Beatmap<HitObject>
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new HitCircle
+                    {
+                        StartTime = 3000,
+                        Position = new Vector2(5, 5),
+                        StackHeight = 5
+                    }
+                }
+            };
+
+            assertOffscreenCircle(beatmap);
+        }
+
+        [Test]
+        public void TestCircleOffscreen()
+        {
+            var beatmap = new Beatmap<HitObject>
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new HitCircle
+                    {
+                        StartTime = 3000,
+                        Position = new Vector2(0, 0)
+                    }
+                }
+            };
+
+            assertOffscreenCircle(beatmap);
+        }
+
+        [Test]
+        public void TestSliderInCenter()
+        {
+            var beatmap = new Beatmap<HitObject>
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new Slider
+                    {
+                        StartTime = 3000,
+                        Position = new Vector2(420, 240),
+                        Path = new SliderPath(new[]
+                        {
+                            new PathControlPoint(new Vector2(0, 0), PathType.Linear),
+                            new PathControlPoint(new Vector2(-100, 0))
+                        }),
+                    }
+                }
+            };
+
+            var issues = check.Run(beatmap);
+
+            Assert.That(!issues.Any());
+        }
+
+        [Test]
+        public void TestSliderNearEdge()
+        {
+            var beatmap = new Beatmap<HitObject>
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new Slider
+                    {
+                        StartTime = 3000,
+                        Position = new Vector2(320, 240),
+                        Path = new SliderPath(new[]
+                        {
+                            new PathControlPoint(new Vector2(0, 0), PathType.Linear),
+                            new PathControlPoint(new Vector2(0, -235))
+                        }),
+                    }
+                }
+            };
+
+            var issues = check.Run(beatmap);
+
+            Assert.That(!issues.Any());
+        }
+
+        [Test]
+        public void TestSliderNearEdgeStackedOffscreen()
+        {
+            var beatmap = new Beatmap<HitObject>
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new Slider
+                    {
+                        StartTime = 3000,
+                        Position = new Vector2(320, 240),
+                        Path = new SliderPath(new[]
+                        {
+                            new PathControlPoint(new Vector2(0, 0), PathType.Linear),
+                            new PathControlPoint(new Vector2(0, -235))
+                        }),
+                        StackHeight = 5
+                    }
+                }
+            };
+
+            assertOffscreenSlider(beatmap);
+        }
+
+        [Test]
+        public void TestSliderOffscreenStart()
+        {
+            var beatmap = new Beatmap<HitObject>
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new Slider
+                    {
+                        StartTime = 3000,
+                        Position = new Vector2(0, 0),
+                        Path = new SliderPath(new[]
+                        {
+                            new PathControlPoint(new Vector2(0, 0), PathType.Linear),
+                            new PathControlPoint(new Vector2(320, 240))
+                        }),
+                    }
+                }
+            };
+
+            assertOffscreenSlider(beatmap);
+        }
+
+        [Test]
+        public void TestSliderOffscreenEnd()
+        {
+            var beatmap = new Beatmap<HitObject>
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new Slider
+                    {
+                        StartTime = 3000,
+                        Position = new Vector2(320, 240),
+                        Path = new SliderPath(new[]
+                        {
+                            new PathControlPoint(new Vector2(0, 0), PathType.Linear),
+                            new PathControlPoint(new Vector2(-320, -240))
+                        }),
+                    }
+                }
+            };
+
+            assertOffscreenSlider(beatmap);
+        }
+
+        [Test]
+        public void TestSliderOffscreenPath()
+        {
+            var beatmap = new Beatmap<HitObject>
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new Slider
+                    {
+                        StartTime = 3000,
+                        Position = new Vector2(320, 240),
+                        Path = new SliderPath(new[]
+                        {
+                            // Circular arc shoots over the top of the screen.
+                            new PathControlPoint(new Vector2(0, 0), PathType.PerfectCurve),
+                            new PathControlPoint(new Vector2(-100, -200)),
+                            new PathControlPoint(new Vector2(100, -200))
+                        }),
+                    }
+                }
+            };
+
+            assertOffscreenSlider(beatmap);
+        }
+
+        private void assertOneIssue(IBeatmap beatmap, int templateIndex)
+        {
+            var issues = check.Run(beatmap).ToList();
+            var issue = issues.FirstOrDefault();
+
+            Assert.That(issues.Count == 1);
+            Assert.That(issue != null);
+            Assert.That(issue.Template.Equals(check.PossibleTemplates.ElementAt(templateIndex)));
+        }
+
+        private void assertOffscreenCircle(IBeatmap beatmap) => assertOneIssue(beatmap, 0);
+
+        private void assertOffscreenSlider(IBeatmap beatmap) => assertOneIssue(beatmap, 1);
+    }
+}

From 0bcc39bd36a9a5893f57fcaa8b94f9d3e31356e9 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 13 Apr 2021 02:17:35 +0200
Subject: [PATCH 2381/3722] Remove redundant space

---
 osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs b/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs
index 54d1a116c7..2f309afb6c 100644
--- a/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Editing.Checks
                     Metadata = new BeatmapMetadata { BackgroundFile = "abc123.jpg" },
                     BeatmapSet = new BeatmapSetInfo
                     {
-                        Files = new List<BeatmapSetFileInfo>(new []
+                        Files = new List<BeatmapSetFileInfo>(new[]
                         {
                             new BeatmapSetFileInfo { Filename = "abc123.jpg" }
                         })

From 6d3f9fa9cefdd776d937e0c6b809df8624457e50 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 13 Apr 2021 02:29:25 +0200
Subject: [PATCH 2382/3722] Use `is` class instead of `Equals` with template
 index

Ensures ordering of `PossibleTemplates` does not affect tests.
---
 .../Editor/Checks/CheckOffscreenObjectsTest.cs     | 14 ++++++++++----
 .../Edit/Checks/CheckOffscreenObjects.cs           |  4 ++--
 .../Editing/Checks/CheckBackgroundTest.cs          |  4 ++--
 osu.Game/Rulesets/Edit/Checks/CheckBackground.cs   |  4 ++--
 .../Edit/Checks/Components/IssueTemplate.cs        |  2 --
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
index fa7854765f..33b839650f 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
@@ -246,18 +246,24 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
             assertOffscreenSlider(beatmap);
         }
 
-        private void assertOneIssue(IBeatmap beatmap, int templateIndex)
+        private void assertOffscreenCircle(IBeatmap beatmap)
         {
             var issues = check.Run(beatmap).ToList();
             var issue = issues.FirstOrDefault();
 
             Assert.That(issues.Count == 1);
             Assert.That(issue != null);
-            Assert.That(issue.Template.Equals(check.PossibleTemplates.ElementAt(templateIndex)));
+            Assert.That(issue.Template is CheckOffscreenObjects.IssueTemplateOffscreenCircle);
         }
 
-        private void assertOffscreenCircle(IBeatmap beatmap) => assertOneIssue(beatmap, 0);
+        private void assertOffscreenSlider(IBeatmap beatmap)
+        {
+            var issues = check.Run(beatmap).ToList();
+            var issue = issues.FirstOrDefault();
 
-        private void assertOffscreenSlider(IBeatmap beatmap) => assertOneIssue(beatmap, 1);
+            Assert.That(issues.Count == 1);
+            Assert.That(issue != null);
+            Assert.That(issue.Template is CheckOffscreenObjects.IssueTemplateOffscreenSlider);
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index 0a682c4a83..c241db7e06 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
                    position.Y - radius < min_y || position.Y + radius > max_y;
         }
 
-        private class IssueTemplateOffscreenCircle : IssueTemplate
+        public class IssueTemplateOffscreenCircle : IssueTemplate
         {
             public IssueTemplateOffscreenCircle(ICheck check)
                 : base(check, IssueType.Problem, "This circle goes offscreen on a 4:3 aspect ratio.")
@@ -101,7 +101,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
             public Issue Create(HitCircle circle) => new Issue(circle, this);
         }
 
-        private class IssueTemplateOffscreenSlider : IssueTemplate
+        public class IssueTemplateOffscreenSlider : IssueTemplate
         {
             public IssueTemplateOffscreenSlider(ICheck check)
                 : base(check, IssueType.Problem, "This slider goes offscreen here on a 4:3 aspect ratio.")
diff --git a/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs b/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs
index 2f309afb6c..327abcab6c 100644
--- a/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Tests.Editing.Checks
 
             Assert.That(issues.Count == 1);
             Assert.That(issue != null);
-            Assert.That(issue.Template.Equals(check.PossibleTemplates.ElementAt(1)));
+            Assert.That(issue.Template is CheckBackground.IssueTemplateDoesNotExist);
         }
 
         [Test]
@@ -67,7 +67,7 @@ namespace osu.Game.Tests.Editing.Checks
 
             Assert.That(issues.Count == 1);
             Assert.That(issue != null);
-            Assert.That(issue.Template.Equals(check.PossibleTemplates.ElementAt(0)));
+            Assert.That(issue.Template is CheckBackground.IssueTemplateNoneSet);
         }
     }
 }
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
index 463b596120..4d5069f446 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             yield return new IssueTemplateDoesNotExist(this).Create(beatmap.Metadata.BackgroundFile);
         }
 
-        private class IssueTemplateNoneSet : IssueTemplate
+        public class IssueTemplateNoneSet : IssueTemplate
         {
             public IssueTemplateNoneSet(ICheck check)
                 : base(check, IssueType.Problem, "No background has been set")
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             public Issue Create() => new Issue(this);
         }
 
-        private class IssueTemplateDoesNotExist : IssueTemplate
+        public class IssueTemplateDoesNotExist : IssueTemplate
         {
             public IssueTemplateDoesNotExist(ICheck check)
                 : base(check, IssueType.Problem, "The background file \"{0}\" does not exist.")
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
index e21f14f4bc..97df79ecd8 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/IssueTemplate.cs
@@ -70,7 +70,5 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
                 }
             }
         }
-
-        public bool Equals(IssueTemplate other) => other.Type == Type && other.UnformattedMessage == UnformattedMessage;
     }
 }

From 17c2c4e885b63761fa179ddc2ee193b6078a4b03 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 13 Apr 2021 05:31:56 +0300
Subject: [PATCH 2383/3722] Fix test case filename not matching

---
 ...ingsEqualityComparsion.cs => ModSettingsEqualityComparison.cs} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename osu.Game.Tests/Mods/{ModSettingsEqualityComparsion.cs => ModSettingsEqualityComparison.cs} (100%)

diff --git a/osu.Game.Tests/Mods/ModSettingsEqualityComparsion.cs b/osu.Game.Tests/Mods/ModSettingsEqualityComparison.cs
similarity index 100%
rename from osu.Game.Tests/Mods/ModSettingsEqualityComparsion.cs
rename to osu.Game.Tests/Mods/ModSettingsEqualityComparison.cs

From 16d34bcc0a04b319a53d86f20a863a837eb8d73d Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Mon, 12 Apr 2021 16:02:19 -0400
Subject: [PATCH 2384/3722] Expose the latest end time of storyboard elements

Co-authored-by: Marlina Bowring <marlina@umich.edu>
---
 osu.Game/Storyboards/IStoryboardElement.cs | 2 ++
 osu.Game/Storyboards/Storyboard.cs         | 9 +++++++++
 osu.Game/Storyboards/StoryboardSample.cs   | 2 ++
 osu.Game/Storyboards/StoryboardVideo.cs    | 2 ++
 4 files changed, 15 insertions(+)

diff --git a/osu.Game/Storyboards/IStoryboardElement.cs b/osu.Game/Storyboards/IStoryboardElement.cs
index c4c150a8a4..03f8b97212 100644
--- a/osu.Game/Storyboards/IStoryboardElement.cs
+++ b/osu.Game/Storyboards/IStoryboardElement.cs
@@ -12,6 +12,8 @@ namespace osu.Game.Storyboards
 
         double StartTime { get; }
 
+        double EndTime { get; }
+
         Drawable CreateDrawable();
     }
 }
diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index 1ba25cc11e..41058d9cb3 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -36,6 +36,15 @@ namespace osu.Game.Storyboards
         /// </remarks>
         public double? EarliestEventTime => Layers.SelectMany(l => l.Elements).OrderBy(e => e.StartTime).FirstOrDefault()?.StartTime;
 
+        /// <summary>
+        /// Across all layers, find the latest point in time that a storyboard element ends at.
+        /// Will return null if there are no elements.
+        /// </summary>
+        /// <remarks>
+        /// This iterates all elements and as such should be used sparingly or stored locally.
+        /// Videos and samples return StartTime as their EndTIme.
+        /// </remarks>
+        public double? LatestEventTime => Layers.SelectMany(l => l.Elements).OrderByDescending(e => e.EndTime).FirstOrDefault()?.EndTime;
         /// <summary>
         /// Depth of the currently front-most storyboard layer, excluding the overlay layer.
         /// </summary>
diff --git a/osu.Game/Storyboards/StoryboardSample.cs b/osu.Game/Storyboards/StoryboardSample.cs
index 5d6ce215f5..d0949c93a7 100644
--- a/osu.Game/Storyboards/StoryboardSample.cs
+++ b/osu.Game/Storyboards/StoryboardSample.cs
@@ -15,6 +15,8 @@ namespace osu.Game.Storyboards
 
         public double StartTime { get; }
 
+        public double EndTime => StartTime;
+
         public int Volume { get; }
 
         public IEnumerable<string> LookupNames => new[]
diff --git a/osu.Game/Storyboards/StoryboardVideo.cs b/osu.Game/Storyboards/StoryboardVideo.cs
index 4652e45852..1314bd7cb9 100644
--- a/osu.Game/Storyboards/StoryboardVideo.cs
+++ b/osu.Game/Storyboards/StoryboardVideo.cs
@@ -14,6 +14,8 @@ namespace osu.Game.Storyboards
 
         public double StartTime { get; }
 
+        public double EndTime => StartTime;
+
         public StoryboardVideo(string path, int offset)
         {
             Path = path;

From 66e74da2b74a10ed695b073bf1a92c5c1b7b7d32 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 13:03:14 +0900
Subject: [PATCH 2385/3722] Fix regression in quick delete mouse action
 blocking

---
 .../Visual/Editing/TestSceneEditorQuickDelete.cs          | 3 ++-
 .../Screens/Edit/Compose/Components/BlueprintContainer.cs | 8 ++++----
 .../Screens/Edit/Compose/Components/SelectionHandler.cs   | 6 +++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs
index 8a0f27b851..25e12b7a88 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs
@@ -83,8 +83,9 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("right click", () => InputManager.Click(MouseButton.Right));
             AddAssert("slider has 2 points", () => slider.Path.ControlPoints.Count == 2);
 
-            // second click should nuke the object completely.
             AddStep("right click", () => InputManager.Click(MouseButton.Right));
+
+            // second click should nuke the object completely.
             AddAssert("no hitobjects in beatmap", () => EditorBeatmap.HitObjects.Count == 0);
 
             AddStep("release shift", () => InputManager.ReleaseKey(Key.ShiftLeft));
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 64cf0e7512..b5a28dc022 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -135,7 +135,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected override bool OnMouseDown(MouseDownEvent e)
         {
-            bool selectionPerformed = beginClickSelection(e);
+            bool selectionPerformed = performMouseDownActions(e);
 
             // even if a selection didn't occur, a drag event may still move the selection.
             prepareSelectionMovement();
@@ -343,7 +343,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         /// <param name="e">The input event that triggered this selection.</param>
         /// <returns>Whether a selection was performed.</returns>
-        private bool beginClickSelection(MouseButtonEvent e)
+        private bool performMouseDownActions(MouseButtonEvent e)
         {
             // Iterate from the top of the input stack (blueprints closest to the front of the screen first).
             // Priority is given to already-selected blueprints.
@@ -351,7 +351,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             {
                 if (!blueprint.IsHovered) continue;
 
-                return clickSelectionBegan = SelectionHandler.HandleSelectionRequested(blueprint, e);
+                return clickSelectionBegan = SelectionHandler.MouseDownSelectionRequested(blueprint, e);
             }
 
             return false;
@@ -375,7 +375,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                     {
                         if (!blueprint.IsHovered) continue;
 
-                        return clickSelectionBegan = SelectionHandler.HandleDeselectionRequested(blueprint, e);
+                        return clickSelectionBegan = SelectionHandler.MouseUpSelectionRequested(blueprint, e);
                     }
                 }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index e5e1100797..389ef78ed5 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -220,12 +220,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="blueprint">The blueprint.</param>
         /// <param name="e">The mouse event responsible for selection.</param>
         /// <returns>Whether a selection was performed.</returns>
-        internal bool HandleSelectionRequested(SelectionBlueprint blueprint, MouseButtonEvent e)
+        internal bool MouseDownSelectionRequested(SelectionBlueprint blueprint, MouseButtonEvent e)
         {
             if (e.ShiftPressed && e.Button == MouseButton.Right)
             {
                 handleQuickDeletion(blueprint);
-                return false;
+                return true;
             }
 
             // while holding control, we only want to add to selection, not replace an existing selection.
@@ -244,7 +244,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="blueprint">The blueprint.</param>
         /// <param name="e">The mouse event responsible for deselection.</param>
         /// <returns>Whether a deselection was performed.</returns>
-        internal bool HandleDeselectionRequested(SelectionBlueprint blueprint, MouseButtonEvent e)
+        internal bool MouseUpSelectionRequested(SelectionBlueprint blueprint, MouseButtonEvent e)
         {
             if (blueprint.IsSelected)
             {

From 05d7fe289f3e6a48b855edc629e163fe7ea26fff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 13:09:18 +0900
Subject: [PATCH 2386/3722] Rename test scene in preparation for increasing
 scope

---
 ...estSceneEditorQuickDelete.cs => TestSceneEditorSelection.cs} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename osu.Game.Tests/Visual/Editing/{TestSceneEditorQuickDelete.cs => TestSceneEditorSelection.cs} (98%)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
similarity index 98%
rename from osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs
rename to osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
index 25e12b7a88..36c4357432 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorQuickDelete.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
@@ -18,7 +18,7 @@ using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Editing
 {
-    public class TestSceneEditorQuickDelete : EditorTestScene
+    public class TestSceneEditorSelection : EditorTestScene
     {
         protected override Ruleset CreateEditorRuleset() => new OsuRuleset();
 

From 7c975359d9b6b06a797a7121c38700e09c2f08b8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 13:29:37 +0900
Subject: [PATCH 2387/3722] Add basic select/deselect tests

---
 .../Editing/TestSceneEditorSelection.cs       | 98 ++++++++++++++++++-
 1 file changed, 93 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
index 36c4357432..4f386972fa 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
@@ -27,6 +27,97 @@ namespace osu.Game.Tests.Visual.Editing
         private BlueprintContainer blueprintContainer
             => Editor.ChildrenOfType<BlueprintContainer>().First();
 
+        private void moveMouseToObject(HitObject obj)
+        {
+            AddStep("move mouse to object", () =>
+            {
+                var pos = blueprintContainer.SelectionBlueprints
+                                            .First(s => s.HitObject == obj)
+                                            .ChildrenOfType<HitCirclePiece>()
+                                            .First().ScreenSpaceDrawQuad.Centre;
+
+                InputManager.MoveMouseTo(pos);
+            });
+        }
+
+        [Test]
+        public void TestBasicSelect()
+        {
+            var addedObject = new HitCircle { StartTime = 100 };
+            AddStep("add hitobject", () => EditorBeatmap.Add(addedObject));
+
+            moveMouseToObject(addedObject);
+            AddStep("left click", () => InputManager.Click(MouseButton.Left));
+
+            AddAssert("hitobject selected", () => EditorBeatmap.SelectedHitObjects.Single() == addedObject);
+
+            var addedObject2 = new HitCircle
+            {
+                StartTime = 100,
+                Position = new Vector2(100),
+            };
+
+            AddStep("add one more hitobject", () => EditorBeatmap.Add(addedObject2));
+            AddAssert("selection unchanged", () => EditorBeatmap.SelectedHitObjects.Single() == addedObject);
+
+            moveMouseToObject(addedObject2);
+            AddStep("left click", () => InputManager.Click(MouseButton.Left));
+            AddAssert("hitobject selected", () => EditorBeatmap.SelectedHitObjects.Single() == addedObject2);
+        }
+
+        [Test]
+        public void TestMultiSelect()
+        {
+            var addedObjects = new[]
+            {
+                new HitCircle { StartTime = 100 },
+                new HitCircle { StartTime = 200, Position = new Vector2(50) },
+                new HitCircle { StartTime = 300, Position = new Vector2(100) },
+                new HitCircle { StartTime = 400, Position = new Vector2(150) },
+            };
+
+            AddStep("add hitobjects", () => EditorBeatmap.AddRange(addedObjects));
+
+            moveMouseToObject(addedObjects[0]);
+            AddStep("click first", () => InputManager.Click(MouseButton.Left));
+
+            AddAssert("hitobject selected", () => EditorBeatmap.SelectedHitObjects.Single() == addedObjects[0]);
+
+            AddStep("hold control", () => InputManager.PressKey(Key.ControlLeft));
+
+            moveMouseToObject(addedObjects[1]);
+            AddStep("click second", () => InputManager.Click(MouseButton.Left));
+            AddAssert("2 hitobjects selected", () => EditorBeatmap.SelectedHitObjects.Count == 2 && EditorBeatmap.SelectedHitObjects.Contains(addedObjects[1]));
+
+            moveMouseToObject(addedObjects[2]);
+            AddStep("click third", () => InputManager.Click(MouseButton.Left));
+            AddAssert("3 hitobjects selected", () => EditorBeatmap.SelectedHitObjects.Count == 3 && EditorBeatmap.SelectedHitObjects.Contains(addedObjects[2]));
+
+            moveMouseToObject(addedObjects[1]);
+            AddStep("click second", () => InputManager.Click(MouseButton.Left));
+            AddAssert("2 hitobjects selected", () => EditorBeatmap.SelectedHitObjects.Count == 2 && !EditorBeatmap.SelectedHitObjects.Contains(addedObjects[1]));
+        }
+
+        [Test]
+        public void TestBasicDeselect()
+        {
+            var addedObject = new HitCircle { StartTime = 100 };
+            AddStep("add hitobject", () => EditorBeatmap.Add(addedObject));
+
+            moveMouseToObject(addedObject);
+            AddStep("left click", () => InputManager.Click(MouseButton.Left));
+
+            AddAssert("hitobject selected", () => EditorBeatmap.SelectedHitObjects.Single() == addedObject);
+
+            AddStep("click away", () =>
+            {
+                InputManager.MoveMouseTo(blueprintContainer.ScreenSpaceDrawQuad.Centre);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddAssert("selection lost", () => EditorBeatmap.SelectedHitObjects.Count == 0);
+        }
+
         [Test]
         public void TestQuickDeleteRemovesObject()
         {
@@ -36,11 +127,8 @@ namespace osu.Game.Tests.Visual.Editing
 
             AddStep("select added object", () => EditorBeatmap.SelectedHitObjects.Add(addedObject));
 
-            AddStep("move mouse to object", () =>
-            {
-                var pos = blueprintContainer.ChildrenOfType<HitCirclePiece>().First().ScreenSpaceDrawQuad.Centre;
-                InputManager.MoveMouseTo(pos);
-            });
+            moveMouseToObject(addedObject);
+
             AddStep("hold shift", () => InputManager.PressKey(Key.ShiftLeft));
             AddStep("right click", () => InputManager.Click(MouseButton.Right));
             AddStep("release shift", () => InputManager.ReleaseKey(Key.ShiftLeft));

From 516bd138e32ba1bd3e4ae35a150d4ae1e9b0d8ab Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 13:46:38 +0900
Subject: [PATCH 2388/3722] Add (previously failing) test coverage of drag from
 selection

---
 .../Editing/TestSceneEditorSelection.cs       | 57 +++++++++++++++----
 1 file changed, 47 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
index 4f386972fa..99f31b0c2a 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.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.Linq;
 using NUnit.Framework;
 using osu.Framework.Testing;
@@ -27,12 +28,12 @@ namespace osu.Game.Tests.Visual.Editing
         private BlueprintContainer blueprintContainer
             => Editor.ChildrenOfType<BlueprintContainer>().First();
 
-        private void moveMouseToObject(HitObject obj)
+        private void moveMouseToObject(Func<HitObject> targetFunc)
         {
             AddStep("move mouse to object", () =>
             {
                 var pos = blueprintContainer.SelectionBlueprints
-                                            .First(s => s.HitObject == obj)
+                                            .First(s => s.HitObject == targetFunc())
                                             .ChildrenOfType<HitCirclePiece>()
                                             .First().ScreenSpaceDrawQuad.Centre;
 
@@ -46,7 +47,7 @@ namespace osu.Game.Tests.Visual.Editing
             var addedObject = new HitCircle { StartTime = 100 };
             AddStep("add hitobject", () => EditorBeatmap.Add(addedObject));
 
-            moveMouseToObject(addedObject);
+            moveMouseToObject(() => addedObject);
             AddStep("left click", () => InputManager.Click(MouseButton.Left));
 
             AddAssert("hitobject selected", () => EditorBeatmap.SelectedHitObjects.Single() == addedObject);
@@ -60,7 +61,7 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("add one more hitobject", () => EditorBeatmap.Add(addedObject2));
             AddAssert("selection unchanged", () => EditorBeatmap.SelectedHitObjects.Single() == addedObject);
 
-            moveMouseToObject(addedObject2);
+            moveMouseToObject(() => addedObject2);
             AddStep("left click", () => InputManager.Click(MouseButton.Left));
             AddAssert("hitobject selected", () => EditorBeatmap.SelectedHitObjects.Single() == addedObject2);
         }
@@ -78,33 +79,69 @@ namespace osu.Game.Tests.Visual.Editing
 
             AddStep("add hitobjects", () => EditorBeatmap.AddRange(addedObjects));
 
-            moveMouseToObject(addedObjects[0]);
+            moveMouseToObject(() => addedObjects[0]);
             AddStep("click first", () => InputManager.Click(MouseButton.Left));
 
             AddAssert("hitobject selected", () => EditorBeatmap.SelectedHitObjects.Single() == addedObjects[0]);
 
             AddStep("hold control", () => InputManager.PressKey(Key.ControlLeft));
 
-            moveMouseToObject(addedObjects[1]);
+            moveMouseToObject(() => addedObjects[1]);
             AddStep("click second", () => InputManager.Click(MouseButton.Left));
             AddAssert("2 hitobjects selected", () => EditorBeatmap.SelectedHitObjects.Count == 2 && EditorBeatmap.SelectedHitObjects.Contains(addedObjects[1]));
 
-            moveMouseToObject(addedObjects[2]);
+            moveMouseToObject(() => addedObjects[2]);
             AddStep("click third", () => InputManager.Click(MouseButton.Left));
             AddAssert("3 hitobjects selected", () => EditorBeatmap.SelectedHitObjects.Count == 3 && EditorBeatmap.SelectedHitObjects.Contains(addedObjects[2]));
 
-            moveMouseToObject(addedObjects[1]);
+            moveMouseToObject(() => addedObjects[1]);
             AddStep("click second", () => InputManager.Click(MouseButton.Left));
             AddAssert("2 hitobjects selected", () => EditorBeatmap.SelectedHitObjects.Count == 2 && !EditorBeatmap.SelectedHitObjects.Contains(addedObjects[1]));
         }
 
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestMultiSelectFromDrag(bool alreadySelectedBeforeDrag)
+        {
+            HitCircle[] addedObjects = null;
+
+            AddStep("add hitobjects", () => EditorBeatmap.AddRange(addedObjects = new[]
+            {
+                new HitCircle { StartTime = 100 },
+                new HitCircle { StartTime = 200, Position = new Vector2(50) },
+                new HitCircle { StartTime = 300, Position = new Vector2(100) },
+                new HitCircle { StartTime = 400, Position = new Vector2(150) },
+            }));
+
+            moveMouseToObject(() => addedObjects[0]);
+            AddStep("click first", () => InputManager.Click(MouseButton.Left));
+
+            AddStep("hold control", () => InputManager.PressKey(Key.ControlLeft));
+
+            moveMouseToObject(() => addedObjects[1]);
+
+            if (alreadySelectedBeforeDrag)
+                AddStep("click second", () => InputManager.Click(MouseButton.Left));
+
+            AddStep("mouse down on second", () => InputManager.PressButton(MouseButton.Left));
+
+            AddAssert("2 hitobjects selected", () => EditorBeatmap.SelectedHitObjects.Count == 2 && EditorBeatmap.SelectedHitObjects.Contains(addedObjects[1]));
+
+            AddStep("drag to centre", () => InputManager.MoveMouseTo(blueprintContainer.ScreenSpaceDrawQuad.Centre));
+
+            AddAssert("positions changed", () => addedObjects[0].Position != Vector2.Zero && addedObjects[1].Position != new Vector2(50));
+
+            AddStep("release control", () => InputManager.ReleaseKey(Key.ControlLeft));
+            AddStep("mouse up", () => InputManager.ReleaseButton(MouseButton.Left));
+        }
+
         [Test]
         public void TestBasicDeselect()
         {
             var addedObject = new HitCircle { StartTime = 100 };
             AddStep("add hitobject", () => EditorBeatmap.Add(addedObject));
 
-            moveMouseToObject(addedObject);
+            moveMouseToObject(() => addedObject);
             AddStep("left click", () => InputManager.Click(MouseButton.Left));
 
             AddAssert("hitobject selected", () => EditorBeatmap.SelectedHitObjects.Single() == addedObject);
@@ -127,7 +164,7 @@ namespace osu.Game.Tests.Visual.Editing
 
             AddStep("select added object", () => EditorBeatmap.SelectedHitObjects.Add(addedObject));
 
-            moveMouseToObject(addedObject);
+            moveMouseToObject(() => addedObject);
 
             AddStep("hold shift", () => InputManager.PressKey(Key.ShiftLeft));
             AddStep("right click", () => InputManager.Click(MouseButton.Right));

From a664efe12bc4e0fb38d71a43b25e59335cb8c7c1 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 13 Apr 2021 07:59:13 +0300
Subject: [PATCH 2389/3722] Fix history graph tooltips leaking to others

Since there was no check about which tooltip content came from which graph, all history graphs use the "Replays Watched" tooltip, as it is the latest created one.
---
 .../Profile/Sections/Historical/UserHistoryGraph.cs        | 7 ++++++-
 osu.Game/Overlays/Profile/UserGraph.cs                     | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs b/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
index f9e5ccf618..52831b4243 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
@@ -32,6 +32,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
         {
             return new TooltipDisplayContent
             {
+                Name = tooltipCounterName,
                 Count = playCount.ToString("N0"),
                 Date = date.ToString("MMMM yyyy")
             };
@@ -39,14 +40,17 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
 
         protected class HistoryGraphTooltip : UserGraphTooltip
         {
+            private readonly string tooltipCounterName;
+
             public HistoryGraphTooltip(string tooltipCounterName)
                 : base(tooltipCounterName)
             {
+                this.tooltipCounterName = tooltipCounterName;
             }
 
             public override bool SetContent(object content)
             {
-                if (!(content is TooltipDisplayContent info))
+                if (!(content is TooltipDisplayContent info) || info.Name != tooltipCounterName)
                     return false;
 
                 Counter.Text = info.Count;
@@ -57,6 +61,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
 
         private class TooltipDisplayContent
         {
+            public string Name;
             public string Count;
             public string Date;
         }
diff --git a/osu.Game/Overlays/Profile/UserGraph.cs b/osu.Game/Overlays/Profile/UserGraph.cs
index cdfd722d68..e2eb5d5180 100644
--- a/osu.Game/Overlays/Profile/UserGraph.cs
+++ b/osu.Game/Overlays/Profile/UserGraph.cs
@@ -208,6 +208,7 @@ namespace osu.Game.Overlays.Profile
 
         protected abstract class UserGraphTooltip : VisibilityContainer, ITooltip
         {
+            protected new readonly OsuSpriteText Name;
             protected readonly OsuSpriteText Counter, BottomText;
             private readonly Box background;
 
@@ -237,7 +238,7 @@ namespace osu.Game.Overlays.Profile
                                 Spacing = new Vector2(3, 0),
                                 Children = new Drawable[]
                                 {
-                                    new OsuSpriteText
+                                    Name = new OsuSpriteText
                                     {
                                         Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
                                         Text = tooltipCounterName

From 4852630c93564dd7af90ab18ea67c55b416e2655 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 14:03:42 +0900
Subject: [PATCH 2390/3722] Fix import multiple file types via drag potentially
 reaching the wrong importer

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

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index ca132df552..e285faab11 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -433,12 +433,15 @@ namespace osu.Game
             if (paths.Length == 0)
                 return;
 
-            var extension = Path.GetExtension(paths.First())?.ToLowerInvariant();
+            var filesPerExtension = paths.GroupBy(p => Path.GetExtension(p).ToLowerInvariant());
 
-            foreach (var importer in fileImporters)
+            foreach (var groups in filesPerExtension)
             {
-                if (importer.HandledExtensions.Contains(extension))
-                    await importer.Import(paths).ConfigureAwait(false);
+                foreach (var importer in fileImporters)
+                {
+                    if (importer.HandledExtensions.Contains(groups.Key))
+                        await importer.Import(groups.ToArray()).ConfigureAwait(false);
+                }
             }
         }
 

From d0f30b7b422afe385fd1fc0de7a28684bf0ab7ef Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 13 Apr 2021 14:29:47 +0900
Subject: [PATCH 2391/3722] Delay map completion one frame after the last
 judgment

This is a workaround of a timing issue.
KeyCounter is disabled while break time (`HasCompleted == true`).
When the last keypress is exactly at the same time the map ends, the last frame was considered in a break time while forward play but considered not in a break time while rewinding. This inconsistency made the last keypress not decremented in the key counter when a replay is rewound.
The situation regularly happens in osu!standard because the map ends right after the player hits the last hit circle. It was caught by `TestSceneGameplayRewinding`.

This commit makes the update of the map completion delayed one frame. The problematic keypress frame is now processed strictly before the map completion, and the map completion status is correctly rewound before the keypress frame.
---
 osu.Game/Rulesets/Scoring/JudgementProcessor.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Scoring/JudgementProcessor.cs b/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
index 8aef615b5f..201a05e569 100644
--- a/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
@@ -28,6 +28,8 @@ namespace osu.Game.Rulesets.Scoring
         /// </summary>
         public int JudgedHits { get; private set; }
 
+        private JudgementResult lastAppliedResult;
+
         private readonly BindableBool hasCompleted = new BindableBool();
 
         /// <summary>
@@ -53,12 +55,11 @@ namespace osu.Game.Rulesets.Scoring
         public void ApplyResult(JudgementResult result)
         {
             JudgedHits++;
+            lastAppliedResult = result;
 
             ApplyResultInternal(result);
 
             NewJudgement?.Invoke(result);
-
-            updateHasCompleted();
         }
 
         /// <summary>
@@ -69,8 +70,6 @@ namespace osu.Game.Rulesets.Scoring
         {
             JudgedHits--;
 
-            updateHasCompleted();
-
             RevertResultInternal(result);
         }
 
@@ -134,6 +133,10 @@ namespace osu.Game.Rulesets.Scoring
             }
         }
 
-        private void updateHasCompleted() => hasCompleted.Value = JudgedHits == MaxHits;
+        protected override void Update()
+        {
+            base.Update();
+            hasCompleted.Value = JudgedHits == MaxHits && (JudgedHits == 0 || lastAppliedResult.TimeAbsolute < Clock.CurrentTime);
+        }
     }
 }

From 273099d53c6b0dfab4a694055fc12bf45d5611f2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 14:31:41 +0900
Subject: [PATCH 2392/3722] Don't store online IDs from score submission
 responses for now

Closes remaining portion of https://github.com/ppy/osu/issues/12372.
---
 osu.Game/Screens/Play/SubmittingPlayer.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index d22199447d..b64d835c58 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -109,7 +109,12 @@ namespace osu.Game.Screens.Play
 
             request.Success += s =>
             {
-                score.ScoreInfo.OnlineScoreID = s.ID;
+                // 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).
+                // score.ScoreInfo.OnlineScoreID = s.ID;
                 tcs.SetResult(true);
             };
 

From 4837cef095558c2ed301881471f3eaf76d6eb209 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 14:44:52 +0900
Subject: [PATCH 2393/3722] Use static for playfield centre positioning

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

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
index 33b839650f..4a5e4e18c0 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
@@ -9,6 +9,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Edit.Checks;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.UI;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
@@ -16,6 +17,8 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
     [TestFixture]
     public class CheckOffscreenObjectsTest
     {
+        private static readonly Vector2 playfield_centre = OsuPlayfield.BASE_SIZE * 0.5f;
+
         private CheckOffscreenObjects check;
 
         [SetUp]
@@ -34,7 +37,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                     new HitCircle
                     {
                         StartTime = 3000,
-                        Position = new Vector2(320, 240) // Playfield is 640 x 480.
+                        Position = playfield_centre // Playfield is 640 x 480.
                     }
                 }
             };
@@ -136,11 +139,11 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                     new Slider
                     {
                         StartTime = 3000,
-                        Position = new Vector2(320, 240),
+                        Position = playfield_centre,
                         Path = new SliderPath(new[]
                         {
                             new PathControlPoint(new Vector2(0, 0), PathType.Linear),
-                            new PathControlPoint(new Vector2(0, -235))
+                            new PathControlPoint(new Vector2(0, -playfield_centre.Y + 5))
                         }),
                     }
                 }
@@ -161,11 +164,11 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                     new Slider
                     {
                         StartTime = 3000,
-                        Position = new Vector2(320, 240),
+                        Position = playfield_centre,
                         Path = new SliderPath(new[]
                         {
                             new PathControlPoint(new Vector2(0, 0), PathType.Linear),
-                            new PathControlPoint(new Vector2(0, -235))
+                            new PathControlPoint(new Vector2(0, -playfield_centre.Y + 5))
                         }),
                         StackHeight = 5
                     }
@@ -189,7 +192,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                         Path = new SliderPath(new[]
                         {
                             new PathControlPoint(new Vector2(0, 0), PathType.Linear),
-                            new PathControlPoint(new Vector2(320, 240))
+                            new PathControlPoint(playfield_centre)
                         }),
                     }
                 }
@@ -208,11 +211,11 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                     new Slider
                     {
                         StartTime = 3000,
-                        Position = new Vector2(320, 240),
+                        Position = playfield_centre,
                         Path = new SliderPath(new[]
                         {
                             new PathControlPoint(new Vector2(0, 0), PathType.Linear),
-                            new PathControlPoint(new Vector2(-320, -240))
+                            new PathControlPoint(-playfield_centre)
                         }),
                     }
                 }
@@ -231,7 +234,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                     new Slider
                     {
                         StartTime = 3000,
-                        Position = new Vector2(320, 240),
+                        Position = playfield_centre,
                         Path = new SliderPath(new[]
                         {
                             // Circular arc shoots over the top of the screen.

From b45d7de4eccbd9aecbf621afefc6661ca986fa9e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 15:04:01 +0900
Subject: [PATCH 2394/3722] Update asserts to use better nunit specifications

---
 .../Checks/CheckOffscreenObjectsTest.cs       | 29 ++++++-------------
 .../Editing/Checks/CheckBackgroundTest.cs     | 16 ++++------
 2 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
index 4a5e4e18c0..9f9ba0e8db 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit.Checks.Components;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Edit.Checks;
@@ -42,9 +43,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                 }
             };
 
-            var issues = check.Run(beatmap);
-
-            Assert.That(!issues.Any());
+            Assert.That(check.Run(beatmap), Is.Empty);
         }
 
         [Test]
@@ -62,9 +61,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                 }
             };
 
-            var issues = check.Run(beatmap);
-
-            Assert.That(!issues.Any());
+            Assert.That(check.Run(beatmap), Is.Empty);
         }
 
         [Test]
@@ -124,9 +121,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                 }
             };
 
-            var issues = check.Run(beatmap);
-
-            Assert.That(!issues.Any());
+            Assert.That(check.Run(beatmap), Is.Empty);
         }
 
         [Test]
@@ -149,9 +144,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                 }
             };
 
-            var issues = check.Run(beatmap);
-
-            Assert.That(!issues.Any());
+            Assert.That(check.Run(beatmap), Is.Empty);
         }
 
         [Test]
@@ -252,21 +245,17 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
         private void assertOffscreenCircle(IBeatmap beatmap)
         {
             var issues = check.Run(beatmap).ToList();
-            var issue = issues.FirstOrDefault();
 
-            Assert.That(issues.Count == 1);
-            Assert.That(issue != null);
-            Assert.That(issue.Template is CheckOffscreenObjects.IssueTemplateOffscreenCircle);
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckOffscreenObjects.IssueTemplateOffscreenCircle);
         }
 
         private void assertOffscreenSlider(IBeatmap beatmap)
         {
             var issues = check.Run(beatmap).ToList();
-            var issue = issues.FirstOrDefault();
 
-            Assert.That(issues.Count == 1);
-            Assert.That(issue != null);
-            Assert.That(issue.Template is CheckOffscreenObjects.IssueTemplateOffscreenSlider);
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckOffscreenObjects.IssueTemplateOffscreenSlider);
         }
     }
 }
diff --git a/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs b/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs
index 327abcab6c..635e3bb0f3 100644
--- a/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs
@@ -39,9 +39,7 @@ namespace osu.Game.Tests.Editing.Checks
         [Test]
         public void TestBackgroundSetAndInFiles()
         {
-            var issues = check.Run(beatmap);
-
-            Assert.That(!issues.Any());
+            Assert.That(check.Run(beatmap), Is.Empty);
         }
 
         [Test]
@@ -50,11 +48,9 @@ namespace osu.Game.Tests.Editing.Checks
             beatmap.BeatmapInfo.BeatmapSet.Files.Clear();
 
             var issues = check.Run(beatmap).ToList();
-            var issue = issues.FirstOrDefault();
 
-            Assert.That(issues.Count == 1);
-            Assert.That(issue != null);
-            Assert.That(issue.Template is CheckBackground.IssueTemplateDoesNotExist);
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckBackground.IssueTemplateDoesNotExist);
         }
 
         [Test]
@@ -63,11 +59,9 @@ namespace osu.Game.Tests.Editing.Checks
             beatmap.Metadata.BackgroundFile = null;
 
             var issues = check.Run(beatmap).ToList();
-            var issue = issues.FirstOrDefault();
 
-            Assert.That(issues.Count == 1);
-            Assert.That(issue != null);
-            Assert.That(issue.Template is CheckBackground.IssueTemplateNoneSet);
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckBackground.IssueTemplateNoneSet);
         }
     }
 }

From 9f8af03a70633d32fa11842c69ea73b1ccf72f11 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 13 Apr 2021 09:28:58 +0300
Subject: [PATCH 2395/3722] Remove irrelevant change

---
 osu.Game/Overlays/Profile/UserGraph.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Profile/UserGraph.cs b/osu.Game/Overlays/Profile/UserGraph.cs
index e2eb5d5180..cdfd722d68 100644
--- a/osu.Game/Overlays/Profile/UserGraph.cs
+++ b/osu.Game/Overlays/Profile/UserGraph.cs
@@ -208,7 +208,6 @@ namespace osu.Game.Overlays.Profile
 
         protected abstract class UserGraphTooltip : VisibilityContainer, ITooltip
         {
-            protected new readonly OsuSpriteText Name;
             protected readonly OsuSpriteText Counter, BottomText;
             private readonly Box background;
 
@@ -238,7 +237,7 @@ namespace osu.Game.Overlays.Profile
                                 Spacing = new Vector2(3, 0),
                                 Children = new Drawable[]
                                 {
-                                    Name = new OsuSpriteText
+                                    new OsuSpriteText
                                     {
                                         Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
                                         Text = tooltipCounterName

From fbc6fb8fc55ad431173ad61072a84e26629469e7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 15:35:57 +0900
Subject: [PATCH 2396/3722] Split out common logic into private method and add
 inline comment for future visitors

---
 .../Sliders/Components/PathControlPointPiece.cs           | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index 7686043c43..ce9580d0f4 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -58,11 +58,13 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         {
             this.slider = slider;
             ControlPoint = controlPoint;
-            PointsInSegment = slider.Path.PointsInSegment(ControlPoint);
+
+            // we don't want to run the path type update on construction as it may inadvertently change the slider.
+            cachePoints(slider);
 
             slider.Path.Version.BindValueChanged(_ =>
             {
-                PointsInSegment = slider.Path.PointsInSegment(ControlPoint);
+                cachePoints(slider);
                 updatePathType();
             });
 
@@ -206,6 +208,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 
         protected override void OnDragEnd(DragEndEvent e) => changeHandler?.EndChange();
 
+        private void cachePoints(Slider slider) => PointsInSegment = slider.Path.PointsInSegment(ControlPoint);
+
         /// <summary>
         /// Handles correction of invalid path types.
         /// </summary>

From 57ba7b7cbbbd93870978d047b6edb957cd49d8cf Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 13 Apr 2021 15:55:23 +0900
Subject: [PATCH 2397/3722] Partially revert the changes of `CurrentFrame` and
 `NextFrame` for compatibility

Making those always non-null is postponed as when a replay's frame contains keypress the behavior is changed.
Previously, the key is pressed at the time of the first frame. But using non-null frames means the key is pressed at negative infinity.
However, I think the new way of always using non-null frames makes the client code so I plan to bundle the change to more breaking changes.
---
 .../NonVisual/FramedReplayInputHandlerTest.cs | 22 +++++++++----------
 .../Replays/FramedReplayInputHandler.cs       |  9 ++++----
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
index 954871595e..a42b7d54ee 100644
--- a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
+++ b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
@@ -84,11 +84,11 @@ namespace osu.Game.Tests.NonVisual
             // exited important section
             setTime(8200, 8000);
             confirmCurrentFrame(7);
-            confirmNextFrame(7);
+            confirmNextFrame(null);
 
             setTime(8200, 8200);
             confirmCurrentFrame(7);
-            confirmNextFrame(7);
+            confirmNextFrame(null);
         }
 
         [Test]
@@ -97,11 +97,11 @@ namespace osu.Game.Tests.NonVisual
             setReplayFrames();
 
             setTime(-1000, -1000);
-            confirmCurrentFrame(0);
+            confirmCurrentFrame(null);
             confirmNextFrame(0);
 
             setTime(-500, -500);
-            confirmCurrentFrame(0);
+            confirmCurrentFrame(null);
             confirmNextFrame(0);
 
             setTime(0, 0);
@@ -145,7 +145,7 @@ namespace osu.Game.Tests.NonVisual
             confirmNextFrame(1);
 
             setTime(-500, -500);
-            confirmCurrentFrame(0);
+            confirmCurrentFrame(null);
             confirmNextFrame(0);
         }
 
@@ -231,7 +231,7 @@ namespace osu.Game.Tests.NonVisual
             Assert.IsFalse(handler.WaitingForFrame, "Should not be waiting yet");
             setTime(1000, 1000);
             confirmCurrentFrame(1);
-            confirmNextFrame(1);
+            confirmNextFrame(null);
             Assert.IsTrue(handler.WaitingForFrame, "Should be waiting");
 
             // cannot seek beyond the last frame
@@ -243,7 +243,7 @@ namespace osu.Game.Tests.NonVisual
 
             // can seek to the point before the first frame, however
             setTime(-100, -100);
-            confirmCurrentFrame(0);
+            confirmCurrentFrame(null);
             confirmNextFrame(0);
 
             fastForwardToPoint(1000);
@@ -311,14 +311,14 @@ namespace osu.Game.Tests.NonVisual
             Assert.AreEqual(expect, handler.SetFrameFromTime(set), "Unexpected return value");
         }
 
-        private void confirmCurrentFrame(int frame)
+        private void confirmCurrentFrame(int? frame)
         {
-            Assert.AreEqual(replay.Frames[frame].Time, handler.CurrentFrame.Time, "Unexpected current frame");
+            Assert.AreEqual(frame is int x ? replay.Frames[x].Time : (double?)null, handler.CurrentFrame?.Time, "Unexpected current frame");
         }
 
-        private void confirmNextFrame(int frame)
+        private void confirmNextFrame(int? frame)
         {
-            Assert.AreEqual(replay.Frames[frame].Time, handler.NextFrame.Time, "Unexpected next frame");
+            Assert.AreEqual(frame is int x ? replay.Frames[x].Time : (double?)null, handler.NextFrame?.Time, "Unexpected next frame");
         }
 
         private class TestReplayFrame : ReplayFrame
diff --git a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
index c3cd957f0d..a7f11b1e6f 100644
--- a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
+++ b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
@@ -30,6 +30,7 @@ namespace osu.Game.Rulesets.Replays
         /// The current frame of the replay.
         /// The current time is always between the start and the end time of the current frame.
         /// </summary>
+        /// <remarks>Returns null if the current time is strictly before the first frame.</remarks>
         /// <exception cref="InvalidOperationException">The replay is empty.</exception>
         public TFrame CurrentFrame
         {
@@ -38,15 +39,15 @@ namespace osu.Game.Rulesets.Replays
                 if (!HasFrames)
                     throw new InvalidOperationException($"Attempted to get {nameof(CurrentFrame)} of an empty replay");
 
-                return (TFrame)Frames[Math.Max(0, currentFrameIndex)];
+                return currentFrameIndex == -1 ? null : (TFrame)Frames[currentFrameIndex];
             }
         }
 
         /// <summary>
         /// The next frame of the replay.
         /// The start time is always greater or equal to the start time of <see cref="CurrentFrame"/> regardless of the seeking direction.
-        /// If it is before the first frame of the replay or the after the last frame of the replay, <see cref="CurrentFrame"/> and <see cref="NextFrame"/> agree.
         /// </summary>
+        /// <remarks>Returns null if the current frame is the last frame.</remarks>
         /// <exception cref="InvalidOperationException">The replay is empty.</exception>
         public TFrame NextFrame
         {
@@ -55,7 +56,7 @@ namespace osu.Game.Rulesets.Replays
                 if (!HasFrames)
                     throw new InvalidOperationException($"Attempted to get {nameof(NextFrame)} of an empty replay");
 
-                return (TFrame)Frames[Math.Min(currentFrameIndex + 1, Frames.Count - 1)];
+                return currentFrameIndex == Frames.Count - 1 ? null : (TFrame)Frames[currentFrameIndex + 1];
             }
         }
 
@@ -96,7 +97,7 @@ namespace osu.Game.Rulesets.Replays
         {
             get
             {
-                if (!HasFrames || !FrameAccuratePlayback)
+                if (!HasFrames || !FrameAccuratePlayback || CurrentFrame == null)
                     return false;
 
                 return IsImportant(CurrentFrame) && // a button is in a pressed state

From a9652b7b259b2921648c220e1d7f2ccf98276afa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 16:05:12 +0900
Subject: [PATCH 2398/3722] Start TimelineTestScene in a more visible place

---
 osu.Game.Tests/Visual/Editing/TimelineTestScene.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
index 1da6433707..88b4614791 100644
--- a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
+++ b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
@@ -64,6 +64,13 @@ namespace osu.Game.Tests.Visual.Editing
             });
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Clock.Seek(2500);
+        }
+
         public abstract Drawable CreateTestComponent();
 
         private class AudioVisualiser : CompositeDrawable

From ebf97ff48ff43a5879b19fcb9365c84c8369fe21 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 16:25:43 +0900
Subject: [PATCH 2399/3722] Update timeline ticks to use width as a
 differentiation method, rather than height

---
 .../Visualisations/PointVisualisation.cs      | 10 ++--
 .../Timeline/TimelineTickDisplay.cs           | 56 +++++++++++--------
 2 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs
index b0ecffdd24..b5c4cd6dda 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs
@@ -3,7 +3,6 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
-using osuTK;
 
 namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations
 {
@@ -12,7 +11,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations
     /// </summary>
     public class PointVisualisation : Box
     {
-        public const float WIDTH = 1;
+        public const float MAX_WIDTH = 5;
 
         public PointVisualisation(double startTime)
             : this()
@@ -27,8 +26,11 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations
             RelativePositionAxes = Axes.X;
             RelativeSizeAxes = Axes.Y;
 
-            Width = WIDTH;
-            EdgeSmoothness = new Vector2(WIDTH, 0);
+            Anchor = Anchor.CentreLeft;
+            Origin = Anchor.Centre;
+
+            Width = MAX_WIDTH;
+            Height = 0.75f;
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
index c070c833f8..7ec5bb7197 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
@@ -6,9 +6,7 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Caching;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Colour;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
@@ -33,6 +31,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [Resolved]
         private OsuColour colours { get; set; }
 
+        private static readonly int highest_divisor = BindableBeatDivisor.VALID_DIVISORS.Last();
+
         public TimelineTickDisplay()
         {
             RelativeSizeAxes = Axes.Both;
@@ -80,8 +80,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             if (timeline != null)
             {
                 var newRange = (
-                    (ToLocalSpace(timeline.ScreenSpaceDrawQuad.TopLeft).X - PointVisualisation.WIDTH * 2) / DrawWidth * Content.RelativeChildSize.X,
-                    (ToLocalSpace(timeline.ScreenSpaceDrawQuad.TopRight).X + PointVisualisation.WIDTH * 2) / DrawWidth * Content.RelativeChildSize.X);
+                    (ToLocalSpace(timeline.ScreenSpaceDrawQuad.TopLeft).X - PointVisualisation.MAX_WIDTH * 2) / DrawWidth * Content.RelativeChildSize.X,
+                    (ToLocalSpace(timeline.ScreenSpaceDrawQuad.TopRight).X + PointVisualisation.MAX_WIDTH * 2) / DrawWidth * Content.RelativeChildSize.X);
 
                 if (visibleRange != newRange)
                 {
@@ -100,7 +100,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private void createTicks()
         {
             int drawableIndex = 0;
-            int highestDivisor = BindableBeatDivisor.VALID_DIVISORS.Last();
 
             nextMinTick = null;
             nextMaxTick = null;
@@ -131,25 +130,12 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         var divisor = BindableBeatDivisor.GetDivisorForBeatIndex(beat, beatDivisor.Value);
                         var colour = BindableBeatDivisor.GetColourFor(divisor, colours);
 
-                        bool isMainBeat = indexInBar == 0;
-
                         // even though "bar lines" take up the full vertical space, we render them in two pieces because it allows for less anchor/origin churn.
-                        float height = isMainBeat ? 0.5f : 0.4f - (float)divisor / highestDivisor * 0.2f;
-                        float gradientOpacity = isMainBeat ? 1 : 0;
 
-                        var topPoint = getNextUsablePoint();
-                        topPoint.X = xPos;
-                        topPoint.Height = height;
-                        topPoint.Colour = ColourInfo.GradientVertical(colour, colour.Opacity(gradientOpacity));
-                        topPoint.Anchor = Anchor.TopLeft;
-                        topPoint.Origin = Anchor.TopCentre;
-
-                        var bottomPoint = getNextUsablePoint();
-                        bottomPoint.X = xPos;
-                        bottomPoint.Anchor = Anchor.BottomLeft;
-                        bottomPoint.Colour = ColourInfo.GradientVertical(colour.Opacity(gradientOpacity), colour);
-                        bottomPoint.Origin = Anchor.BottomCentre;
-                        bottomPoint.Height = height;
+                        var line = getNextUsableLine();
+                        line.X = xPos;
+                        line.Width = PointVisualisation.MAX_WIDTH * getWidth(indexInBar, divisor);
+                        line.Colour = colour;
                     }
 
                     beat++;
@@ -168,7 +154,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             tickCache.Validate();
 
-            Drawable getNextUsablePoint()
+            Drawable getNextUsableLine()
             {
                 PointVisualisation point;
                 if (drawableIndex >= Count)
@@ -183,6 +169,30 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             }
         }
 
+        private static float getWidth(int indexInBar, int divisor)
+        {
+            if (indexInBar == 0)
+                return 1;
+
+            switch (divisor)
+            {
+                case 1:
+                case 2:
+                    return 0.6f;
+
+                case 3:
+                case 4:
+                    return 0.5f;
+
+                case 6:
+                case 8:
+                    return 0.4f;
+
+                default:
+                    return 0.3f;
+            }
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);

From 27e851c2eed2b0edc1833a620e7ec4e9e85973f0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 16:41:29 +0900
Subject: [PATCH 2400/3722] Also adjust height

---
 .../Visualisations/PointVisualisation.cs      |  2 +-
 .../Timeline/TimelineTickDisplay.cs           | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs
index b5c4cd6dda..53a1f94731 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations
     /// </summary>
     public class PointVisualisation : Box
     {
-        public const float MAX_WIDTH = 5;
+        public const float MAX_WIDTH = 4;
 
         public PointVisualisation(double startTime)
             : this()
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
index 7ec5bb7197..3aaf0451c8 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
@@ -135,6 +135,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         var line = getNextUsableLine();
                         line.X = xPos;
                         line.Width = PointVisualisation.MAX_WIDTH * getWidth(indexInBar, divisor);
+                        line.Height = 0.9f * getHeight(indexInBar, divisor);
                         line.Colour = colour;
                     }
 
@@ -193,6 +194,30 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             }
         }
 
+        private static float getHeight(int indexInBar, int divisor)
+        {
+            if (indexInBar == 0)
+                return 1;
+
+            switch (divisor)
+            {
+                case 1:
+                case 2:
+                    return 0.9f;
+
+                case 3:
+                case 4:
+                    return 0.8f;
+
+                case 6:
+                case 8:
+                    return 0.7f;
+
+                default:
+                    return 0.6f;
+            }
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);

From 5a06db8a113dfd012a46b304f9967508f0ca609e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 16:48:05 +0900
Subject: [PATCH 2401/3722] Change default editor waveform opacity to 25%

The previous setting felt way too high.
---
 osu.Game/Configuration/OsuConfigManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 387cfbb193..0525e84077 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -143,7 +143,7 @@ namespace osu.Game.Configuration
 
             SetDefault(OsuSetting.DiscordRichPresence, DiscordRichPresenceMode.Full);
 
-            SetDefault(OsuSetting.EditorWaveformOpacity, 1f);
+            SetDefault(OsuSetting.EditorWaveformOpacity, 0.25f);
         }
 
         public OsuConfigManager(Storage storage)

From 0932daeaa8564fe9fd9e25560abe1bfa5a8b20b3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 16:50:03 +0900
Subject: [PATCH 2402/3722] Force the new default on update

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

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 0525e84077..21a1a1d430 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -169,14 +169,9 @@ namespace osu.Game.Configuration
 
             int combined = (year * 10000) + monthDay;
 
-            if (combined < 20200305)
+            if (combined < 20210413)
             {
-                // the maximum value of this setting was changed.
-                // if we don't manually increase this, it causes song select to filter out beatmaps the user expects to see.
-                var maxStars = (BindableDouble)GetOriginalBindable<double>(OsuSetting.DisplayStarsMaximum);
-
-                if (maxStars.Value == 10)
-                    maxStars.Value = maxStars.MaxValue;
+                SetValue(OsuSetting.EditorWaveformOpacity, 0.25f);
             }
         }
 

From 36510309d10105ddcdbea2b45f36e941f6be5415 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 13 Apr 2021 09:24:35 +0300
Subject: [PATCH 2403/3722] Merge `EnableUserDim` and `IgnoreUserSettings` to
 one bindable

---
 .../Visual/Background/TestSceneUserDimBackgrounds.cs | 12 ++++++------
 osu.Game/Graphics/Containers/UserDimContainer.cs     |  8 +-------
 osu.Game/Rulesets/Mods/ModCinema.cs                  |  3 +--
 .../Screens/Backgrounds/BackgroundScreenBeatmap.cs   |  8 ++++----
 osu.Game/Screens/Edit/Editor.cs                      |  2 +-
 osu.Game/Screens/Play/Player.cs                      |  4 ++--
 osu.Game/Screens/Play/PlayerLoader.cs                |  6 +++---
 7 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
index ba4d12b19f..a4c28651df 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
@@ -142,9 +142,9 @@ namespace osu.Game.Tests.Visual.Background
         {
             performFullSetup();
             AddUntilStep("Screen is dimmed and blur applied", () => songSelect.IsBackgroundDimmed() && songSelect.IsUserBlurApplied());
-            AddStep("Enable user dim", () => songSelect.DimEnabled.Value = false);
+            AddStep("Disable user dim", () => songSelect.IgnoreUserSettings.Value = true);
             AddUntilStep("Screen is undimmed and user blur removed", () => songSelect.IsBackgroundUndimmed() && songSelect.IsUserBlurDisabled());
-            AddStep("Disable user dim", () => songSelect.DimEnabled.Value = true);
+            AddStep("Enable user dim", () => songSelect.IgnoreUserSettings.Value = false);
             AddUntilStep("Screen is dimmed and blur applied", () => songSelect.IsBackgroundDimmed() && songSelect.IsUserBlurApplied());
         }
 
@@ -161,10 +161,10 @@ namespace osu.Game.Tests.Visual.Background
                 player.ReplacesBackground.Value = true;
                 player.StoryboardEnabled.Value = true;
             });
-            AddStep("Enable user dim", () => player.DimmableStoryboard.EnableUserDim.Value = true);
+            AddStep("Enable user dim", () => player.DimmableStoryboard.IgnoreUserSettings.Value = false);
             AddStep("Set dim level to 1", () => songSelect.DimLevel.Value = 1f);
             AddUntilStep("Storyboard is invisible", () => !player.IsStoryboardVisible);
-            AddStep("Disable user dim", () => player.DimmableStoryboard.EnableUserDim.Value = false);
+            AddStep("Disable user dim", () => player.DimmableStoryboard.IgnoreUserSettings.Value = true);
             AddUntilStep("Storyboard is visible", () => player.IsStoryboardVisible);
         }
 
@@ -281,11 +281,11 @@ namespace osu.Game.Tests.Visual.Background
             protected override BackgroundScreen CreateBackground()
             {
                 background = new FadeAccessibleBackground(Beatmap.Value);
-                DimEnabled.BindTo(background.EnableUserDim);
+                IgnoreUserSettings.BindTo(background.IgnoreUserSettings);
                 return background;
             }
 
-            public readonly Bindable<bool> DimEnabled = new Bindable<bool>();
+            public readonly Bindable<bool> IgnoreUserSettings = new Bindable<bool>();
             public readonly Bindable<double> DimLevel = new BindableDouble();
             public readonly Bindable<double> BlurLevel = new BindableDouble();
 
diff --git a/osu.Game/Graphics/Containers/UserDimContainer.cs b/osu.Game/Graphics/Containers/UserDimContainer.cs
index 39c1fdad52..4e555ac1eb 100644
--- a/osu.Game/Graphics/Containers/UserDimContainer.cs
+++ b/osu.Game/Graphics/Containers/UserDimContainer.cs
@@ -23,11 +23,6 @@ namespace osu.Game.Graphics.Containers
 
         protected const double BACKGROUND_FADE_DURATION = 800;
 
-        /// <summary>
-        /// Whether or not user-configured dim levels should be applied to the container.
-        /// </summary>
-        public readonly Bindable<bool> EnableUserDim = new Bindable<bool>(true);
-
         /// <summary>
         /// Whether or not user-configured settings relating to brightness of elements should be ignored
         /// </summary>
@@ -57,7 +52,7 @@ namespace osu.Game.Graphics.Containers
 
         private float breakLightening => LightenDuringBreaks.Value && IsBreakTime.Value ? BREAK_LIGHTEN_AMOUNT : 0;
 
-        protected float DimLevel => Math.Max(EnableUserDim.Value && !IgnoreUserSettings.Value ? (float)UserDimLevel.Value - breakLightening : 0, 0);
+        protected float DimLevel => Math.Max(!IgnoreUserSettings.Value ? (float)UserDimLevel.Value - breakLightening : 0, 0);
 
         protected override Container<Drawable> Content => dimContent;
 
@@ -78,7 +73,6 @@ namespace osu.Game.Graphics.Containers
             LightenDuringBreaks = config.GetBindable<bool>(OsuSetting.LightenDuringBreaks);
             ShowStoryboard = config.GetBindable<bool>(OsuSetting.ShowStoryboard);
 
-            EnableUserDim.ValueChanged += _ => UpdateVisuals();
             UserDimLevel.ValueChanged += _ => UpdateVisuals();
             LightenDuringBreaks.ValueChanged += _ => UpdateVisuals();
             IsBreakTime.ValueChanged += _ => UpdateVisuals();
diff --git a/osu.Game/Rulesets/Mods/ModCinema.cs b/osu.Game/Rulesets/Mods/ModCinema.cs
index eb0473016a..c78088ba2d 100644
--- a/osu.Game/Rulesets/Mods/ModCinema.cs
+++ b/osu.Game/Rulesets/Mods/ModCinema.cs
@@ -37,8 +37,7 @@ namespace osu.Game.Rulesets.Mods
 
         public void ApplyToPlayer(Player player)
         {
-            player.ApplyToBackground(b => b.EnableUserDim.Value = false);
-
+            player.ApplyToBackground(b => b.IgnoreUserSettings.Value = true);
             player.DimmableStoryboard.IgnoreUserSettings.Value = true;
 
             player.BreakOverlay.Hide();
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
index b08455be95..d27211144e 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
@@ -27,9 +27,9 @@ namespace osu.Game.Screens.Backgrounds
         private WorkingBeatmap beatmap;
 
         /// <summary>
-        /// Whether or not user dim settings should be applied to this Background.
+        /// Whether or not user-configured settings relating to brightness of elements should be ignored
         /// </summary>
-        public readonly Bindable<bool> EnableUserDim = new Bindable<bool>();
+        public readonly Bindable<bool> IgnoreUserSettings = new Bindable<bool>();
 
         public readonly Bindable<bool> StoryboardReplacesBackground = new Bindable<bool>();
 
@@ -50,7 +50,7 @@ namespace osu.Game.Screens.Backgrounds
 
             InternalChild = dimmable = CreateFadeContainer();
 
-            dimmable.EnableUserDim.BindTo(EnableUserDim);
+            dimmable.IgnoreUserSettings.BindTo(IgnoreUserSettings);
             dimmable.IsBreakTime.BindTo(IsBreakTime);
             dimmable.BlurAmount.BindTo(BlurAmount);
 
@@ -148,7 +148,7 @@ namespace osu.Game.Screens.Backgrounds
             /// <summary>
             /// As an optimisation, we add the two blur portions to be applied rather than actually applying two separate blurs.
             /// </summary>
-            private Vector2 blurTarget => EnableUserDim.Value
+            private Vector2 blurTarget => !IgnoreUserSettings.Value
                 ? new Vector2(BlurAmount.Value + (float)userBlurLevel.Value * USER_BLUR_FACTOR)
                 : new Vector2(BlurAmount.Value);
 
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 0759e21382..64350fb56e 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -462,7 +462,7 @@ namespace osu.Game.Screens.Edit
                 // todo: temporary. we want to be applying dim using the UserDimContainer eventually.
                 b.FadeColour(Color4.DarkGray, 500);
 
-                b.EnableUserDim.Value = false;
+                b.IgnoreUserSettings.Value = true;
                 b.BlurAmount.Value = 0;
             });
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index efe5d26409..dd3f58439b 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -764,7 +764,7 @@ namespace osu.Game.Screens.Play
 
             ApplyToBackground(b =>
             {
-                b.EnableUserDim.Value = true;
+                b.IgnoreUserSettings.Value = false;
                 b.BlurAmount.Value = 0;
 
                 // bind component bindables.
@@ -913,7 +913,7 @@ namespace osu.Game.Screens.Play
             float fadeOutDuration = instant ? 0 : 250;
             this.FadeOut(fadeOutDuration);
 
-            ApplyToBackground(b => b.EnableUserDim.Value = false);
+            ApplyToBackground(b => b.IgnoreUserSettings.Value = true);
             storyboardReplacesBackground.Value = false;
         }
 
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 679b3c7313..cf15104809 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -229,7 +229,7 @@ namespace osu.Game.Screens.Play
             content.ScaleTo(0.7f, 150, Easing.InQuint);
             this.FadeOut(150);
 
-            ApplyToBackground(b => b.EnableUserDim.Value = false);
+            ApplyToBackground(b => b.IgnoreUserSettings.Value = true);
 
             BackgroundBrightnessReduction = false;
             Beatmap.Value.Track.RemoveAdjustment(AdjustableProperty.Volume, volumeAdjustment);
@@ -277,7 +277,7 @@ namespace osu.Game.Screens.Play
                 // Preview user-defined background dim and blur when hovered on the visual settings panel.
                 ApplyToBackground(b =>
                 {
-                    b.EnableUserDim.Value = true;
+                    b.IgnoreUserSettings.Value = false;
                     b.BlurAmount.Value = 0;
                 });
 
@@ -288,7 +288,7 @@ namespace osu.Game.Screens.Play
                 ApplyToBackground(b =>
                 {
                     // Returns background dim and blur to the values specified by PlayerLoader.
-                    b.EnableUserDim.Value = false;
+                    b.IgnoreUserSettings.Value = true;
                     b.BlurAmount.Value = BACKGROUND_BLUR;
                 });
 

From 98c25b2e71c1aef8ad2973c0cb7ce96b33faff42 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 13 Apr 2021 10:33:08 +0200
Subject: [PATCH 2404/3722] Remove unused import

---
 .../Editor/Checks/CheckOffscreenObjectsTest.cs                   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
index 9f9ba0e8db..f9445a9a96 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
@@ -5,7 +5,6 @@ using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Edit.Checks.Components;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Edit.Checks;

From c8cb4286f6e61eeba14b4b0256d5a17d781f6bd9 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 13 Apr 2021 10:35:06 +0200
Subject: [PATCH 2405/3722] Add reference for screen bounding box numbers

---
 osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index c241db7e06..27cae2ecc1 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -11,8 +11,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
 {
     public class CheckOffscreenObjects : ICheck
     {
-        // These are close approximates to the edges of the screen
-        // in gameplay on a 4:3 aspect ratio for osu!stable.
+        // A close approximation for the bounding box of the screen in gameplay on 4:3 aspect ratio.
+        // Uses gameplay space coordinates (512 x 384 playfield / 640 x 480 screen area).
+        // See https://github.com/ppy/osu/pull/12361#discussion_r612199777 for reference.
         private const int min_x = -67;
         private const int min_y = -60;
         private const int max_x = 579;

From b41e3a2e7a84046981007ebc6a6d2ecd85d1b42b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 17:38:13 +0900
Subject: [PATCH 2406/3722] Remove unused using statement

---
 osu.Game/Configuration/OsuConfigManager.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 21a1a1d430..f9b1c9618b 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Diagnostics;
-using osu.Framework.Bindables;
 using osu.Framework.Configuration;
 using osu.Framework.Configuration.Tracking;
 using osu.Framework.Extensions;

From 60c2494b316827c691327a55793750871753a190 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 13 Apr 2021 10:40:56 +0200
Subject: [PATCH 2407/3722] Make `BeatmapVerifier` an interface

---
 .../Edit/OsuBeatmapVerifier.cs                 | 12 ++----------
 osu.Game.Rulesets.Osu/OsuRuleset.cs            |  2 +-
 osu.Game/Rulesets/Edit/BeatmapVerifier.cs      | 18 ++----------------
 osu.Game/Rulesets/Ruleset.cs                   |  2 +-
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs   |  2 +-
 5 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
index 2faa239720..1c7ab00bbb 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
@@ -10,21 +10,13 @@ using osu.Game.Rulesets.Osu.Edit.Checks;
 
 namespace osu.Game.Rulesets.Osu.Edit
 {
-    public class OsuBeatmapVerifier : BeatmapVerifier
+    public class OsuBeatmapVerifier : IBeatmapVerifier
     {
         private readonly List<ICheck> checks = new List<ICheck>
         {
             new CheckOffscreenObjects()
         };
 
-        public override IEnumerable<Issue> Run(IBeatmap beatmap)
-        {
-            // Also run mode-invariant checks.
-            foreach (var issue in base.Run(beatmap))
-                yield return issue;
-
-            foreach (var issue in checks.SelectMany(check => check.Run(beatmap)))
-                yield return issue;
-        }
+        public IEnumerable<Issue> Run(IBeatmap beatmap) => checks.SelectMany(check => check.Run(beatmap));
     }
 }
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 63da100a04..d6375fa6e3 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -206,7 +206,7 @@ namespace osu.Game.Rulesets.Osu
 
         public override HitObjectComposer CreateHitObjectComposer() => new OsuHitObjectComposer(this);
 
-        public override BeatmapVerifier CreateBeatmapVerifier() => new OsuBeatmapVerifier();
+        public override IBeatmapVerifier CreateBeatmapVerifier() => new OsuBeatmapVerifier();
 
         public override string Description => "osu!";
 
diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index 1d0508705a..2bafacefa3 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -2,27 +2,13 @@
 // 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.Edit.Checks;
 using osu.Game.Rulesets.Edit.Checks.Components;
 
 namespace osu.Game.Rulesets.Edit
 {
-    public abstract class BeatmapVerifier
+    public interface IBeatmapVerifier
     {
-        /// <summary>
-        /// Checks which are performed regardless of ruleset.
-        /// These handle things like beatmap metadata, timing, and other ruleset agnostic elements.
-        /// </summary>
-        private readonly IReadOnlyList<ICheck> generalChecks = new List<ICheck>
-        {
-            new CheckBackground()
-        };
-
-        public virtual IEnumerable<Issue> Run(IBeatmap beatmap)
-        {
-            return generalChecks.SelectMany(check => check.Run(beatmap));
-        }
+        public IEnumerable<Issue> Run(IBeatmap beatmap);
     }
 }
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 2a29d88c89..b501c55aef 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -202,7 +202,7 @@ namespace osu.Game.Rulesets
 
         public virtual HitObjectComposer CreateHitObjectComposer() => null;
 
-        public virtual BeatmapVerifier CreateBeatmapVerifier() => null;
+        public virtual IBeatmapVerifier CreateBeatmapVerifier() => null;
 
         public virtual Drawable CreateIcon() => new SpriteIcon { Icon = FontAwesome.Solid.QuestionCircle };
 
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index a3d808ce62..a733c9c176 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Screens.Edit.Verify
     public class VerifyScreen : EditorScreen
     {
         private Ruleset ruleset;
-        private static BeatmapVerifier beatmapVerifier;
+        private static IBeatmapVerifier beatmapVerifier;
 
         [Cached]
         private Bindable<Issue> selectedIssue = new Bindable<Issue>();

From 304fe5cd341027b19da18b82f394e5fc444a2883 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 13 Apr 2021 10:41:02 +0200
Subject: [PATCH 2408/3722] Add `CheckBackground` to `OsuBeatmapVerifier`

---
 osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
index 1c7ab00bbb..66ef74ab08 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Edit.Checks;
 using osu.Game.Rulesets.Edit.Checks.Components;
 using osu.Game.Rulesets.Osu.Edit.Checks;
 
@@ -14,6 +15,10 @@ namespace osu.Game.Rulesets.Osu.Edit
     {
         private readonly List<ICheck> checks = new List<ICheck>
         {
+            // General checks
+            new CheckBackground(),
+
+            // Ruleset-specific checks
             new CheckOffscreenObjects()
         };
 

From 15658eda554f0574dd85f8d9e4b557ace3229c2d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 13 Apr 2021 09:56:43 +0300
Subject: [PATCH 2409/3722] Add failing test case

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

diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
index a4c28651df..655b426e43 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
@@ -168,6 +168,29 @@ namespace osu.Game.Tests.Visual.Background
             AddUntilStep("Storyboard is visible", () => player.IsStoryboardVisible);
         }
 
+        [Test]
+        public void TestStoryboardIgnoreUserSettings()
+        {
+            performFullSetup();
+            createFakeStoryboard();
+            AddStep("Enable replacing background", () => player.ReplacesBackground.Value = true);
+
+            AddUntilStep("Storyboard is invisible", () => !player.IsStoryboardVisible);
+            AddUntilStep("Background is visible", () => songSelect.IsBackgroundVisible());
+
+            AddStep("Ignore user settings", () =>
+            {
+                player.ApplyToBackground(b => b.IgnoreUserSettings.Value = true);
+                player.DimmableStoryboard.IgnoreUserSettings.Value = true;
+            });
+            AddUntilStep("Storyboard is visible", () => player.IsStoryboardVisible);
+            AddUntilStep("Background is invisible", () => songSelect.IsBackgroundInvisible());
+
+            AddStep("Disable background replacement", () => player.ReplacesBackground.Value = false);
+            AddUntilStep("Storyboard is visible", () => player.IsStoryboardVisible);
+            AddUntilStep("Background is visible", () => songSelect.IsBackgroundVisible());
+        }
+
         /// <summary>
         /// Check if the visual settings container retains dim and blur when pausing
         /// </summary>

From 7c53bebfd4a5e1ac99b62ec12f0521616b6994dd Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 13 Apr 2021 09:25:08 +0300
Subject: [PATCH 2410/3722] Fix beatmap background not hiding when user
 settings ignored and storyboard replaces background

---
 osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
index d27211144e..10d381b8b7 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
@@ -166,7 +166,9 @@ namespace osu.Game.Screens.Backgrounds
                 BlurAmount.ValueChanged += _ => UpdateVisuals();
             }
 
-            protected override bool ShowDimContent => !ShowStoryboard.Value || !StoryboardReplacesBackground.Value; // The background needs to be hidden in the case of it being replaced by the storyboard
+            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 void UpdateVisuals()
             {

From aa5fe2e9fcdbe3f2dd6ac1d63328c4f5f4af477d Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 13 Apr 2021 11:02:01 +0200
Subject: [PATCH 2411/3722] Rename `BeatmapVerifier` -> `IBeatmapVerifier`

---
 .../Rulesets/Edit/{BeatmapVerifier.cs => IBeatmapVerifier.cs}     | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename osu.Game/Rulesets/Edit/{BeatmapVerifier.cs => IBeatmapVerifier.cs} (100%)

diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
similarity index 100%
rename from osu.Game/Rulesets/Edit/BeatmapVerifier.cs
rename to osu.Game/Rulesets/Edit/IBeatmapVerifier.cs

From 4618728bf016fc3253d0cce337c230a2ed0f2fac Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 13 Apr 2021 11:35:12 +0200
Subject: [PATCH 2412/3722] Add test case

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

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditorSelectInvalidPath.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditorSelectInvalidPath.cs
new file mode 100644
index 0000000000..d0348c1b6b
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuEditorSelectInvalidPath.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 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.Tests.Beatmaps;
+using osu.Game.Tests.Visual;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Tests.Editor
+{
+    public class TestSceneOsuEditorSelectInvalidPath : EditorTestScene
+    {
+        protected override Ruleset CreateEditorRuleset() => new OsuRuleset();
+
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TestBeatmap(ruleset, false);
+
+        [Test]
+        public void TestSelectDoesNotModify()
+        {
+            Slider slider = new Slider { StartTime = 0, Position = new Vector2(320, 40) };
+
+            PathControlPoint[] points =
+            {
+                new PathControlPoint(new Vector2(0), PathType.PerfectCurve),
+                new PathControlPoint(new Vector2(-100, 0)),
+                new PathControlPoint(new Vector2(100, 20))
+            };
+
+            int preSelectVersion = -1;
+            AddStep("add slider", () =>
+            {
+                slider.Path = new SliderPath(points);
+                EditorBeatmap.Add(slider);
+                preSelectVersion = slider.Path.Version.Value;
+            });
+
+            AddStep("select added slider", () => EditorBeatmap.SelectedHitObjects.Add(slider));
+
+            AddAssert("slider same path", () => slider.Path.Version.Value == preSelectVersion);
+        }
+    }
+}

From fca9c70c1b47bd986fe089e675f85ea44d9b6690 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 17:39:12 +0900
Subject: [PATCH 2413/3722] Move timeline hit object test to immediately
 viewable area

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

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
index 35f394fe1d..88246381bf 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Tests.Visual.Editing
                 EditorBeatmap.Add(new Spinner
                 {
                     Position = new Vector2(256, 256),
-                    StartTime = 150,
+                    StartTime = 2700,
                     Duration = 500
                 });
             });

From 00f235760d237e6902162c4f1675cbedbc0063ba Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 18:12:46 +0900
Subject: [PATCH 2414/3722] Update visual appearance of timeline blueprints to
 close match new designs

---
 .../TestSceneTimelineHitObjectBlueprint.cs    |   6 +-
 .../Timeline/TimelineBlueprintContainer.cs    |   3 +-
 .../Timeline/TimelineHitObjectBlueprint.cs    | 166 +++++++++---------
 3 files changed, 92 insertions(+), 83 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs b/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
index 88246381bf..e6fad33a51 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneTimelineHitObjectBlueprint.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Tests.Visual.Editing
         [Test]
         public void TestDisallowZeroDurationObjects()
         {
-            DragBar dragBar;
+            DragArea dragArea;
 
             AddStep("add spinner", () =>
             {
@@ -37,8 +37,8 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("hold down drag bar", () =>
             {
                 // distinguishes between the actual drag bar and its "underlay shadow".
-                dragBar = this.ChildrenOfType<DragBar>().Single(bar => bar.HandlePositionalInput);
-                InputManager.MoveMouseTo(dragBar);
+                dragArea = this.ChildrenOfType<DragArea>().Single(bar => bar.HandlePositionalInput);
+                InputManager.MoveMouseTo(dragArea);
                 InputManager.PressButton(MouseButton.Left);
             });
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index be34c8d57e..7427473a35 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -63,7 +63,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         {
             AddInternal(backgroundBox = new SelectableAreaBackground
             {
-                Colour = Color4.Black
+                Colour = Color4.Black,
+                Depth = float.MaxValue,
             });
         }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index d24614299c..179abd0a26 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using JetBrains.Annotations;
 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;
@@ -28,9 +29,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
     public class TimelineHitObjectBlueprint : SelectionBlueprint
     {
-        private const float thickness = 5;
         private const float shadow_radius = 5;
-        private const float circle_size = 34;
+        private const float circle_size = 38;
 
         public Action<DragEvent> OnDragHandled;
 
@@ -40,8 +40,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private Bindable<int> indexInCurrentComboBindable;
         private Bindable<int> comboIndexBindable;
 
-        private readonly Circle circle;
-        private readonly DragBar dragBar;
+        private readonly Container circle;
+        private readonly DragArea dragArea;
         private readonly List<Container> shadowComponents = new List<Container>();
         private readonly Container mainComponents;
         private readonly OsuSpriteText comboIndexText;
@@ -76,71 +76,27 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 {
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.Centre,
-                    Font = OsuFont.Numeric.With(size: circle_size / 2, weight: FontWeight.Black),
+                    Y = -1,
+                    Font = OsuFont.Default.With(size: circle_size * 0.5f, weight: FontWeight.Regular),
                 },
             });
 
-            circle = new Circle
+            circle = new ExtendableCircle
             {
-                Size = new Vector2(circle_size),
+                RelativeSizeAxes = Axes.X,
+                Size = new Vector2(1, circle_size),
                 Anchor = Anchor.CentreLeft,
-                Origin = Anchor.Centre,
-                EdgeEffect = new EdgeEffectParameters
-                {
-                    Type = EdgeEffectType.Shadow,
-                    Radius = shadow_radius,
-                    Colour = Color4.Black
-                },
+                Origin = Anchor.CentreLeft,
             };
 
-            shadowComponents.Add(circle);
+            mainComponents.Add(circle);
 
             if (hitObject is IHasDuration)
             {
-                DragBar dragBarUnderlay;
-                Container extensionBar;
-
-                mainComponents.AddRange(new Drawable[]
+                mainComponents.Add(dragArea = new DragArea(hitObject)
                 {
-                    extensionBar = new Container
-                    {
-                        Masking = true,
-                        Size = new Vector2(1, thickness),
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                        RelativePositionAxes = Axes.X,
-                        RelativeSizeAxes = Axes.X,
-                        EdgeEffect = new EdgeEffectParameters
-                        {
-                            Type = EdgeEffectType.Shadow,
-                            Radius = shadow_radius,
-                            Colour = Color4.Black
-                        },
-                        Child = new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                        }
-                    },
-                    circle,
-                    // only used for drawing the shadow
-                    dragBarUnderlay = new DragBar(null),
-                    // cover up the shadow on the join
-                    new Box
-                    {
-                        Height = thickness,
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                        RelativeSizeAxes = Axes.X,
-                    },
-                    dragBar = new DragBar(hitObject) { OnDragHandled = e => OnDragHandled?.Invoke(e) },
+                    OnDragHandled = e => OnDragHandled?.Invoke(e)
                 });
-
-                shadowComponents.Add(dragBarUnderlay);
-                shadowComponents.Add(extensionBar);
-            }
-            else
-            {
-                mainComponents.Add(circle);
             }
 
             updateShadows();
@@ -173,7 +129,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             var comboColour = combo.GetComboColour(comboColours);
 
             if (HitObject is IHasDuration)
-                mainComponents.Colour = ColourInfo.GradientHorizontal(comboColour, Color4.White);
+                mainComponents.Colour = ColourInfo.GradientHorizontal(comboColour, comboColour.Lighten(0.4f));
             else
                 mainComponents.Colour = comboColour;
 
@@ -227,10 +183,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         protected override bool ShouldBeConsideredForInput(Drawable child) => true;
 
-        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
-            base.ReceivePositionalInputAt(screenSpacePos) ||
-            circle.ReceivePositionalInputAt(screenSpacePos) ||
-            dragBar?.ReceivePositionalInputAt(screenSpacePos) == true;
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => circle.Contains(screenSpacePos);
 
         protected override void OnSelected()
         {
@@ -256,7 +209,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                     {
                         Type = EdgeEffectType.Shadow,
                         Radius = shadow_radius,
-                        Colour = State == SelectionState.Selected ? Color4.Orange : Color4.Black
+                        Colour = Color4.Black.Opacity(0.4f)
                     };
                 }
             }
@@ -267,22 +220,11 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             updateShadows();
         }
 
-        public override Quad SelectionQuad
-        {
-            get
-            {
-                // correctly include the circle in the selection quad region, as it is usually outside the blueprint itself.
-                var leftQuad = circle.ScreenSpaceDrawQuad;
-                var rightQuad = dragBar?.ScreenSpaceDrawQuad ?? ScreenSpaceDrawQuad;
-
-                return new Quad(leftQuad.TopLeft, Vector2.ComponentMax(rightQuad.TopRight, leftQuad.TopRight),
-                    leftQuad.BottomLeft, Vector2.ComponentMax(rightQuad.BottomRight, leftQuad.BottomRight));
-            }
-        }
+        public override Quad SelectionQuad => circle.ScreenSpaceDrawQuad;
 
         public override Vector2 ScreenSpaceSelectionPoint => ScreenSpaceDrawQuad.TopLeft;
 
-        public class DragBar : Container
+        public class DragArea : Container
         {
             private readonly HitObject hitObject;
 
@@ -293,13 +235,13 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             public override bool HandlePositionalInput => hitObject != null;
 
-            public DragBar(HitObject hitObject)
+            public DragArea(HitObject hitObject)
             {
                 this.hitObject = hitObject;
 
-                CornerRadius = 2;
+                CornerRadius = circle_size / 2;
                 Masking = true;
-                Size = new Vector2(5, 1);
+                Size = new Vector2(circle_size, 1);
                 Anchor = Anchor.CentreRight;
                 Origin = Anchor.Centre;
                 RelativePositionAxes = Axes.X;
@@ -406,5 +348,71 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 changeHandler?.EndChange();
             }
         }
+
+        /// <summary>
+        /// A circle with externalised end caps so it can take up the full width of a relative width area.
+        /// </summary>
+        public class ExtendableCircle : Container
+        {
+            private readonly Circle rightCircle;
+            private readonly Circle leftCircle;
+
+            public override Quad ScreenSpaceDrawQuad
+            {
+                get
+                {
+                    var leftQuad = leftCircle.ScreenSpaceDrawQuad;
+
+                    if (Width == 0)
+                    {
+                        return leftQuad;
+                    }
+
+                    var rightQuad = rightCircle.ScreenSpaceDrawQuad;
+
+                    return new Quad(leftQuad.TopLeft, rightQuad.TopRight, leftQuad.BottomLeft, rightQuad.BottomRight);
+                }
+            }
+
+            public ExtendableCircle()
+            {
+                var effect = new EdgeEffectParameters
+                {
+                    Type = EdgeEffectType.Shadow,
+                    Radius = shadow_radius,
+                    Colour = Color4.Black.Opacity(0.4f)
+                };
+
+                InternalChildren = new Drawable[]
+                {
+                    new Container
+                    {
+                        Height = circle_size,
+                        RelativeSizeAxes = Axes.X,
+                        Masking = true,
+                        AlwaysPresent = true,
+                        EdgeEffect = effect,
+                    },
+                    leftCircle = new Circle
+                    {
+                        EdgeEffect = effect,
+                        Origin = Anchor.TopCentre,
+                        Size = new Vector2(circle_size)
+                    },
+                    rightCircle = new Circle
+                    {
+                        EdgeEffect = effect,
+                        Anchor = Anchor.TopRight,
+                        Origin = Anchor.TopCentre,
+                        Size = new Vector2(circle_size)
+                    },
+                    new Box
+                    {
+                        Height = circle_size,
+                        RelativeSizeAxes = Axes.X,
+                    },
+                };
+            }
+        }
     }
 }

From 109ee395bf397fc73b13e10f70bf8dedae67b20f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 18:47:07 +0900
Subject: [PATCH 2415/3722] Fix input and remove outdated hover logic

---
 .../Timeline/TimelineHitObjectBlueprint.cs    | 42 +++++++------------
 1 file changed, 14 insertions(+), 28 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 179abd0a26..89a9095d22 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -17,7 +17,6 @@ using osu.Framework.Input.Events;
 using osu.Framework.Utils;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
@@ -40,9 +39,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private Bindable<int> indexInCurrentComboBindable;
         private Bindable<int> comboIndexBindable;
 
-        private readonly Container circle;
-        private readonly DragArea dragArea;
-        private readonly List<Container> shadowComponents = new List<Container>();
+        private readonly Drawable circle;
+
         private readonly Container mainComponents;
         private readonly OsuSpriteText comboIndexText;
 
@@ -93,7 +91,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             if (hitObject is IHasDuration)
             {
-                mainComponents.Add(dragArea = new DragArea(hitObject)
+                mainComponents.Add(new DragArea(hitObject)
                 {
                     OnDragHandled = e => OnDragHandled?.Invoke(e)
                 });
@@ -183,8 +181,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         protected override bool ShouldBeConsideredForInput(Drawable child) => true;
 
-        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => circle.Contains(screenSpacePos);
-
         protected override void OnSelected()
         {
             updateShadows();
@@ -192,27 +188,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private void updateShadows()
         {
-            foreach (var s in shadowComponents)
-            {
-                if (State == SelectionState.Selected)
-                {
-                    s.EdgeEffect = new EdgeEffectParameters
-                    {
-                        Type = EdgeEffectType.Shadow,
-                        Radius = shadow_radius / 2,
-                        Colour = Color4.Orange,
-                    };
-                }
-                else
-                {
-                    s.EdgeEffect = new EdgeEffectParameters
-                    {
-                        Type = EdgeEffectType.Shadow,
-                        Radius = shadow_radius,
-                        Colour = Color4.Black.Opacity(0.4f)
-                    };
-                }
-            }
         }
 
         protected override void OnDeselected()
@@ -220,6 +195,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             updateShadows();
         }
 
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
+            circle.ReceivePositionalInputAt(screenSpacePos);
+
         public override Quad SelectionQuad => circle.ScreenSpaceDrawQuad;
 
         public override Vector2 ScreenSpaceSelectionPoint => ScreenSpaceDrawQuad.TopLeft;
@@ -351,12 +329,20 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         /// <summary>
         /// A circle with externalised end caps so it can take up the full width of a relative width area.
+        /// TODO: figure how to do this with a single circle to avoid pixel-misaligned edges.
         /// </summary>
         public class ExtendableCircle : Container
         {
             private readonly Circle rightCircle;
             private readonly Circle leftCircle;
 
+            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos)
+            {
+                return base.ReceivePositionalInputAt(screenSpacePos)
+                       || leftCircle.ReceivePositionalInputAt(screenSpacePos)
+                       || rightCircle.ReceivePositionalInputAt(screenSpacePos);
+            }
+
             public override Quad ScreenSpaceDrawQuad
             {
                 get

From 495fdd8d65d99d7818726e29829fcd6ff8fed660 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 18:58:51 +0900
Subject: [PATCH 2416/3722] Update drag area display to match new design logic

---
 .../Timeline/TimelineHitObjectBlueprint.cs    | 40 ++++++++++++++++---
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 89a9095d22..493f62921b 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -202,7 +202,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         public override Vector2 ScreenSpaceSelectionPoint => ScreenSpaceDrawQuad.TopLeft;
 
-        public class DragArea : Container
+        public class DragArea : Circle
         {
             private readonly HitObject hitObject;
 
@@ -224,6 +224,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 Origin = Anchor.Centre;
                 RelativePositionAxes = Axes.X;
                 RelativeSizeAxes = Axes.Y;
+                Colour = OsuColour.Gray(0.2f);
 
                 InternalChildren = new Drawable[]
                 {
@@ -234,6 +235,14 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 };
             }
 
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                updateState();
+                FinishTransforms();
+            }
+
             protected override bool OnHover(HoverEvent e)
             {
                 updateState();
@@ -265,7 +274,20 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             private void updateState()
             {
-                Colour = IsHovered || hasMouseDown ? Color4.OrangeRed : Color4.White;
+                if (hasMouseDown)
+                {
+                    this.ScaleTo(0.7f, 200, Easing.OutQuint);
+                }
+                else if (IsHovered)
+                {
+                    this.ScaleTo(0.8f, 200, Easing.OutQuint);
+                }
+                else
+                {
+                    this.ScaleTo(0.6f, 200, Easing.OutQuint);
+                }
+
+                this.FadeTo(IsHovered || hasMouseDown ? 0.8f : 0.2f, 200, Easing.OutQuint);
             }
 
             [Resolved]
@@ -369,12 +391,16 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                     Colour = Color4.Black.Opacity(0.4f)
                 };
 
+                const float fudge = 0.97f;
+
                 InternalChildren = new Drawable[]
                 {
                     new Container
                     {
-                        Height = circle_size,
-                        RelativeSizeAxes = Axes.X,
+                        RelativeSizeAxes = Axes.Both,
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Height = fudge,
                         Masking = true,
                         AlwaysPresent = true,
                         EdgeEffect = effect,
@@ -394,8 +420,10 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                     },
                     new Box
                     {
-                        Height = circle_size,
-                        RelativeSizeAxes = Axes.X,
+                        RelativeSizeAxes = Axes.Both,
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Height = fudge,
                     },
                 };
             }

From b2c17979defca0bd018244129c9b9e1d029fdc84 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 19:24:20 +0900
Subject: [PATCH 2417/3722] Update colours of all overlay components in one
 swoop (based off combo colour)

---
 .../Timeline/TimelineHitObjectBlueprint.cs    | 79 ++++++++++---------
 1 file changed, 41 insertions(+), 38 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 493f62921b..6463f1a200 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -31,6 +31,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private const float shadow_radius = 5;
         private const float circle_size = 38;
 
+        private Container repeatsContainer;
+
         public Action<DragEvent> OnDragHandled;
 
         [UsedImplicitly]
@@ -41,7 +43,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private readonly Drawable circle;
 
-        private readonly Container mainComponents;
+        private readonly Container colouredComponents;
         private readonly OsuSpriteText comboIndexText;
 
         [Resolved]
@@ -59,39 +61,37 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             RelativePositionAxes = Axes.X;
 
             RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Axes.Y;
+            Height = circle_size;
 
-            AddRangeInternal(new Drawable[]
+            AddRangeInternal(new[]
             {
-                mainComponents = new Container
+                circle = new ExtendableCircle
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                },
+                colouredComponents = new Container
                 {
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreLeft,
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                },
-                comboIndexText = new OsuSpriteText
-                {
-                    Anchor = Anchor.CentreLeft,
-                    Origin = Anchor.Centre,
-                    Y = -1,
-                    Font = OsuFont.Default.With(size: circle_size * 0.5f, weight: FontWeight.Regular),
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        comboIndexText = new OsuSpriteText
+                        {
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.Centre,
+                            Y = -1,
+                            Font = OsuFont.Default.With(size: circle_size * 0.5f, weight: FontWeight.Regular),
+                        },
+                    }
                 },
             });
 
-            circle = new ExtendableCircle
-            {
-                RelativeSizeAxes = Axes.X,
-                Size = new Vector2(1, circle_size),
-                Anchor = Anchor.CentreLeft,
-                Origin = Anchor.CentreLeft,
-            };
-
-            mainComponents.Add(circle);
-
             if (hitObject is IHasDuration)
             {
-                mainComponents.Add(new DragArea(hitObject)
+                colouredComponents.Add(new DragArea(hitObject)
                 {
                     OnDragHandled = e => OnDragHandled?.Invoke(e)
                 });
@@ -127,15 +127,15 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             var comboColour = combo.GetComboColour(comboColours);
 
             if (HitObject is IHasDuration)
-                mainComponents.Colour = ColourInfo.GradientHorizontal(comboColour, comboColour.Lighten(0.4f));
+                circle.Colour = ColourInfo.GradientHorizontal(comboColour, comboColour.Lighten(0.4f));
             else
-                mainComponents.Colour = comboColour;
+                circle.Colour = comboColour;
 
-            var col = mainComponents.Colour.TopLeft.Linear;
+            var col = circle.Colour.TopLeft.Linear;
             float brightness = col.R + col.G + col.B;
 
             // decide the combo index colour based on brightness?
-            comboIndexText.Colour = brightness > 0.5f ? Color4.Black : Color4.White;
+            colouredComponents.Colour = OsuColour.Gray(brightness > 0.5f ? 0.2f : 0.9f);
         }
 
         protected override void Update()
@@ -155,13 +155,11 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             }
         }
 
-        private Container repeatsContainer;
-
         private void updateRepeats(IHasRepeats repeats)
         {
             repeatsContainer?.Expire();
 
-            mainComponents.Add(repeatsContainer = new Container
+            colouredComponents.Add(repeatsContainer = new Container
             {
                 RelativeSizeAxes = Axes.Both,
             });
@@ -170,7 +168,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             {
                 repeatsContainer.Add(new Circle
                 {
-                    Size = new Vector2(circle_size / 2),
+                    Size = new Vector2(circle_size / 3),
+                    Alpha = 0.2f,
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.Centre,
                     RelativePositionAxes = Axes.X,
@@ -224,7 +223,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 Origin = Anchor.Centre;
                 RelativePositionAxes = Axes.X;
                 RelativeSizeAxes = Axes.Y;
-                Colour = OsuColour.Gray(0.2f);
 
                 InternalChildren = new Drawable[]
                 {
@@ -351,7 +349,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         /// <summary>
         /// A circle with externalised end caps so it can take up the full width of a relative width area.
-        /// TODO: figure how to do this with a single circle to avoid pixel-misaligned edges.
         /// </summary>
         public class ExtendableCircle : Container
         {
@@ -391,7 +388,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                     Colour = Color4.Black.Opacity(0.4f)
                 };
 
-                const float fudge = 0.97f;
+                // TODO: figure how to do this whole thing with a single circle to avoid pixel-misaligned edges.
+                // just working with what i can make work for the time being..
+                const float fudge = 0.4f;
 
                 InternalChildren = new Drawable[]
                 {
@@ -400,7 +399,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         RelativeSizeAxes = Axes.Both,
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
-                        Height = fudge,
+                        Padding = new MarginPadding { Vertical = fudge },
                         Masking = true,
                         AlwaysPresent = true,
                         EdgeEffect = effect,
@@ -418,12 +417,16 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         Origin = Anchor.TopCentre,
                         Size = new Vector2(circle_size)
                     },
-                    new Box
+                    new Container
                     {
                         RelativeSizeAxes = Axes.Both,
+                        Padding = new MarginPadding { Vertical = fudge },
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
-                        Height = fudge,
+                        Children = new Drawable[]
+                        {
+                            new Box { RelativeSizeAxes = Axes.Both, }
+                        }
                     },
                 };
             }

From e7b0042a608d09e1f6a01e53860a01595905177f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 19:25:03 +0900
Subject: [PATCH 2418/3722] Remove unnecessary hover / shadow logic

---
 .../Timeline/TimelineHitObjectBlueprint.cs    | 29 +++++++------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 6463f1a200..67be298567 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -28,7 +28,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
     public class TimelineHitObjectBlueprint : SelectionBlueprint
     {
-        private const float shadow_radius = 5;
         private const float circle_size = 38;
 
         private Container repeatsContainer;
@@ -96,8 +95,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                     OnDragHandled = e => OnDragHandled?.Invoke(e)
                 });
             }
-
-            updateShadows();
         }
 
         protected override void LoadComplete()
@@ -116,6 +113,16 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             }
         }
 
+        protected override void OnSelected()
+        {
+            // base logic hides selected blueprints when not selected, but timeline doesn't do that.
+        }
+
+        protected override void OnDeselected()
+        {
+            // base logic hides selected blueprints when not selected, but timeline doesn't do that.
+        }
+
         private void updateComboIndex() => comboIndexText.Text = (indexInCurrentComboBindable.Value + 1).ToString();
 
         private void updateComboColour()
@@ -180,20 +187,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         protected override bool ShouldBeConsideredForInput(Drawable child) => true;
 
-        protected override void OnSelected()
-        {
-            updateShadows();
-        }
-
-        private void updateShadows()
-        {
-        }
-
-        protected override void OnDeselected()
-        {
-            updateShadows();
-        }
-
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
             circle.ReceivePositionalInputAt(screenSpacePos);
 
@@ -384,7 +377,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 var effect = new EdgeEffectParameters
                 {
                     Type = EdgeEffectType.Shadow,
-                    Radius = shadow_radius,
+                    Radius = 5,
                     Colour = Color4.Black.Opacity(0.4f)
                 };
 

From bcd41417b3cb7701985d8db8614ded82cc9c7034 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 19:36:29 +0900
Subject: [PATCH 2419/3722] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index c78dfb6a55..b5315c3616 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.410.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.413.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 92e05cb4a6..45b3d5c161 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.410.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.413.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 11124730c9..105a6e59c2 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.410.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.413.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.410.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.413.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 03ba04e8cec2b335355916d477712e84305ce00e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 19:50:22 +0900
Subject: [PATCH 2420/3722] Split out general checks into its own verifier
 class (and remove `static` usage)

---
 .../Edit/OsuBeatmapVerifier.cs                |  5 ---
 osu.Game/Rulesets/Edit/BeatmapVerifier.cs     | 24 ++++++++++++++
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs  | 32 ++++++++-----------
 3 files changed, 38 insertions(+), 23 deletions(-)
 create mode 100644 osu.Game/Rulesets/Edit/BeatmapVerifier.cs

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
index 66ef74ab08..1c7ab00bbb 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
@@ -5,7 +5,6 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
-using osu.Game.Rulesets.Edit.Checks;
 using osu.Game.Rulesets.Edit.Checks.Components;
 using osu.Game.Rulesets.Osu.Edit.Checks;
 
@@ -15,10 +14,6 @@ namespace osu.Game.Rulesets.Osu.Edit
     {
         private readonly List<ICheck> checks = new List<ICheck>
         {
-            // General checks
-            new CheckBackground(),
-
-            // Ruleset-specific checks
             new CheckOffscreenObjects()
         };
 
diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
new file mode 100644
index 0000000000..b1d538bf04
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.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.Beatmaps;
+using osu.Game.Rulesets.Edit.Checks;
+using osu.Game.Rulesets.Edit.Checks.Components;
+
+namespace osu.Game.Rulesets.Edit
+{
+    /// <summary>
+    /// A ruleset-agnostic beatmap converter that identifies issues in common metadata or mapping standards.
+    /// </summary>
+    public class BeatmapVerifier : IBeatmapVerifier
+    {
+        private readonly List<ICheck> checks = new List<ICheck>
+        {
+            new CheckBackground(),
+        };
+
+        public IEnumerable<Issue> Run(IBeatmap beatmap) => checks.SelectMany(check => check.Run(beatmap));
+    }
+}
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index a733c9c176..550fbe2950 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -7,11 +7,9 @@ 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.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Rulesets;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Checks.Components;
 using osuTK;
@@ -20,9 +18,6 @@ namespace osu.Game.Screens.Edit.Verify
 {
     public class VerifyScreen : EditorScreen
     {
-        private Ruleset ruleset;
-        private static IBeatmapVerifier beatmapVerifier;
-
         [Cached]
         private Bindable<Issue> selectedIssue = new Bindable<Issue>();
 
@@ -31,16 +26,6 @@ namespace osu.Game.Screens.Edit.Verify
         {
         }
 
-        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
-        {
-            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
-
-            ruleset = parent.Get<IBindable<WorkingBeatmap>>().Value.BeatmapInfo.Ruleset?.CreateInstance();
-            beatmapVerifier = ruleset?.CreateBeatmapVerifier();
-
-            return dependencies;
-        }
-
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -81,9 +66,15 @@ namespace osu.Game.Screens.Edit.Verify
             [Resolved]
             private Bindable<Issue> selectedIssue { get; set; }
 
+            private IBeatmapVerifier rulesetVerifier;
+            private BeatmapVerifier generalVerifier;
+
             [BackgroundDependencyLoader]
             private void load(OsuColour colours)
             {
+                generalVerifier = new BeatmapVerifier();
+                rulesetVerifier = Beatmap.BeatmapInfo.Ruleset?.CreateInstance()?.CreateBeatmapVerifier();
+
                 RelativeSizeAxes = Axes.Both;
 
                 InternalChildren = new Drawable[]
@@ -128,9 +119,14 @@ namespace osu.Game.Screens.Edit.Verify
 
             private void refresh()
             {
-                table.Issues = beatmapVerifier.Run(Beatmap)
-                                              .OrderBy(issue => issue.Template.Type)
-                                              .ThenBy(issue => issue.Check.Metadata.Category);
+                var issues = generalVerifier.Run(Beatmap);
+
+                if (rulesetVerifier != null)
+                    issues = issues.Concat(rulesetVerifier.Run(Beatmap));
+
+                table.Issues = issues
+                               .OrderBy(issue => issue.Template.Type)
+                               .ThenBy(issue => issue.Check.Metadata.Category);
             }
         }
     }

From 464fc02875f067aef4bd55f3244aa1df97cc774b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 19:55:17 +0900
Subject: [PATCH 2421/3722] Fix some styling issues with the verify screen
 layout

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

diff --git a/osu.Game/Screens/Edit/Verify/IssueTable.cs b/osu.Game/Screens/Edit/Verify/IssueTable.cs
index 516e1adf44..042d6d84e3 100644
--- a/osu.Game/Screens/Edit/Verify/IssueTable.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueTable.cs
@@ -38,9 +38,6 @@ namespace osu.Game.Screens.Edit.Verify
             Padding = new MarginPadding { Horizontal = horizontal_inset };
             RowSize = new Dimension(GridSizeMode.Absolute, row_height);
 
-            Masking = true;
-            CornerRadius = 6;
-
             AddInternal(backgroundFlow = new FillFlowContainer
             {
                 RelativeSizeAxes = Axes.Both,
@@ -118,6 +115,17 @@ namespace osu.Game.Screens.Edit.Verify
             }
         };
 
+        protected override Drawable CreateHeader(int index, TableColumn column) => new HeaderText(column?.Header ?? string.Empty);
+
+        private class HeaderText : OsuSpriteText
+        {
+            public HeaderText(string text)
+            {
+                Text = text.ToUpper();
+                Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold);
+            }
+        }
+
         public class RowBackground : OsuClickableContainer
         {
             private readonly Issue issue;

From 0d6890243fc7b6308ffdd87e7f87c1551d4ae2fd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 20:18:18 +0900
Subject: [PATCH 2422/3722] Fix typo in xmldoc

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

diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index b1d538bf04..f9bced7beb 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Edit.Checks.Components;
 namespace osu.Game.Rulesets.Edit
 {
     /// <summary>
-    /// A ruleset-agnostic beatmap converter that identifies issues in common metadata or mapping standards.
+    /// A ruleset-agnostic beatmap verifier that identifies issues in common metadata or mapping standards.
     /// </summary>
     public class BeatmapVerifier : IBeatmapVerifier
     {

From 627dd960b07198135b941c1a82a70338058fd21d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 13 Apr 2021 20:52:20 +0900
Subject: [PATCH 2423/3722] Disable player input for now

---
 .../Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
index f0994ec375..32cc3b48d6 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
@@ -123,5 +123,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
             player.GameplayClockContainer.Stop();
         }
+
+        // Player interferes with global input, so disable input for now.
+        public override bool PropagatePositionalInputSubTree => false;
+        public override bool PropagateNonPositionalInputSubTree => false;
     }
 }

From e601141be2a70e1a1f004c205b360212a9fe2605 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 13 Apr 2021 14:57:02 +0300
Subject: [PATCH 2424/3722] Simplify ExtendableCircle component

---
 .../Timeline/TimelineHitObjectBlueprint.cs    | 83 ++++---------------
 1 file changed, 15 insertions(+), 68 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 67be298567..1c0d6e5ab6 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -343,84 +343,31 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         /// <summary>
         /// A circle with externalised end caps so it can take up the full width of a relative width area.
         /// </summary>
-        public class ExtendableCircle : Container
+        public class ExtendableCircle : CompositeDrawable
         {
-            private readonly Circle rightCircle;
-            private readonly Circle leftCircle;
+            private readonly CircularContainer content;
 
-            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos)
-            {
-                return base.ReceivePositionalInputAt(screenSpacePos)
-                       || leftCircle.ReceivePositionalInputAt(screenSpacePos)
-                       || rightCircle.ReceivePositionalInputAt(screenSpacePos);
-            }
+            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => content.ReceivePositionalInputAt(screenSpacePos);
 
-            public override Quad ScreenSpaceDrawQuad
-            {
-                get
-                {
-                    var leftQuad = leftCircle.ScreenSpaceDrawQuad;
-
-                    if (Width == 0)
-                    {
-                        return leftQuad;
-                    }
-
-                    var rightQuad = rightCircle.ScreenSpaceDrawQuad;
-
-                    return new Quad(leftQuad.TopLeft, rightQuad.TopRight, leftQuad.BottomLeft, rightQuad.BottomRight);
-                }
-            }
+            public override Quad ScreenSpaceDrawQuad => content.ScreenSpaceDrawQuad;
 
             public ExtendableCircle()
             {
-                var effect = new EdgeEffectParameters
+                Padding = new MarginPadding { Horizontal = -circle_size / 2f };
+                InternalChild = content = new CircularContainer
                 {
-                    Type = EdgeEffectType.Shadow,
-                    Radius = 5,
-                    Colour = Color4.Black.Opacity(0.4f)
-                };
-
-                // TODO: figure how to do this whole thing with a single circle to avoid pixel-misaligned edges.
-                // just working with what i can make work for the time being..
-                const float fudge = 0.4f;
-
-                InternalChildren = new Drawable[]
-                {
-                    new Container
+                    RelativeSizeAxes = Axes.Both,
+                    Masking = true,
+                    EdgeEffect = new EdgeEffectParameters
                     {
-                        RelativeSizeAxes = Axes.Both,
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                        Padding = new MarginPadding { Vertical = fudge },
-                        Masking = true,
-                        AlwaysPresent = true,
-                        EdgeEffect = effect,
+                        Type = EdgeEffectType.Shadow,
+                        Radius = 5,
+                        Colour = Color4.Black.Opacity(0.4f)
                     },
-                    leftCircle = new Circle
+                    Child = new Box
                     {
-                        EdgeEffect = effect,
-                        Origin = Anchor.TopCentre,
-                        Size = new Vector2(circle_size)
-                    },
-                    rightCircle = new Circle
-                    {
-                        EdgeEffect = effect,
-                        Anchor = Anchor.TopRight,
-                        Origin = Anchor.TopCentre,
-                        Size = new Vector2(circle_size)
-                    },
-                    new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Padding = new MarginPadding { Vertical = fudge },
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                        Children = new Drawable[]
-                        {
-                            new Box { RelativeSizeAxes = Axes.Both, }
-                        }
-                    },
+                        RelativeSizeAxes = Axes.Both
+                    }
                 };
             }
         }

From 69da804f817dac304b7bc36587070d5f129b5eae Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 13 Apr 2021 13:57:56 +0200
Subject: [PATCH 2425/3722] Add missing period

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

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
index 4d5069f446..93da42425c 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Edit.Checks
         public class IssueTemplateNoneSet : IssueTemplate
         {
             public IssueTemplateNoneSet(ICheck check)
-                : base(check, IssueType.Problem, "No background has been set")
+                : base(check, IssueType.Problem, "No background has been set.")
             {
             }
 

From 20823abb309ac0fd908bdd03b532abfbdbd22afd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 13 Apr 2021 22:10:35 +0900
Subject: [PATCH 2426/3722] Make resyncing a bit more resilient

---
 .../TestSceneMultiplayerSpectator.cs          | 33 ++++++++++++++++-
 .../Multiplayer/Spectate/PlayerInstance.cs    | 35 +++++++++++++++----
 2 files changed, 61 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
index 897219dbad..1090f1d10e 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
@@ -1,12 +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 System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
@@ -153,6 +156,27 @@ namespace osu.Game.Tests.Visual.Multiplayer
             checkPausedInstant(55, false);
         }
 
+        [Test]
+        public void TestPlayerStartsCatchingUpOnlyAfterExceedingMaxOffset()
+        {
+            start(new[] { 55, 56 });
+            loadSpectateScreen();
+
+            sendFrames(55, 1000);
+            sendFrames(56, 1000);
+
+            Bindable<double> slowDownAdjustment;
+
+            AddStep("slow down player 2", () =>
+            {
+                slowDownAdjustment = new Bindable<double>(0.99);
+                getInstance(56).Beatmap.Track.AddAdjustment(AdjustableProperty.Frequency, slowDownAdjustment);
+            });
+
+            AddUntilStep("exceeded min offset but not catching up", () => getGameplayOffset(55, 56) > PlayerInstance.MAX_OFFSET && !getInstance(56).IsCatchingUp);
+            AddUntilStep("catching up or caught up", () => getInstance(56).IsCatchingUp || Math.Abs(getGameplayOffset(55, 56)) < PlayerInstance.SYNC_TARGET * 2);
+        }
+
         [Test]
         public void TestPlayersCatchUpAfterFallingBehind()
         {
@@ -174,7 +198,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
             checkPausedInstant(56, false);
 
             // Player 2 should catch up to player 1 after unpausing.
-            AddUntilStep("player 1 time == player 2 time", () => Precision.AlmostEquals(getGameplayTime(55), getGameplayTime(56), 16));
+            AddUntilStep("player 2 not catching up", () => !getInstance(56).IsCatchingUp);
+            AddAssert("player 1 time == player 2 time", () => Math.Abs(getGameplayOffset(55, 56)) <= 2 * PlayerInstance.SYNC_TARGET);
+            AddWaitStep("wait a bit", 5);
         }
 
         private void loadSpectateScreen()
@@ -236,6 +262,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
         private void checkPausedInstant(int userId, bool state) =>
             AddAssert($"{userId} is {(state ? "paused" : "playing")}", () => getPlayer(userId).ChildrenOfType<GameplayClockContainer>().First().IsPaused.Value == state);
 
+        /// <summary>
+        /// Returns time(user1) - time(user2).
+        /// </summary>
+        private double getGameplayOffset(int user1, int user2) => getGameplayTime(user1) - getGameplayTime(user2);
+
         private double getGameplayTime(int userId) => getPlayer(userId).ChildrenOfType<GameplayClockContainer>().Single().GameplayClock.CurrentTime;
 
         private Player getPlayer(int userId) => getInstance(userId).ChildrenOfType<Player>().Single();
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
index 32cc3b48d6..a4a3a0c133 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
@@ -6,6 +6,7 @@ using osu.Framework.Audio;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
@@ -15,8 +16,20 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     public class PlayerInstance : CompositeDrawable
     {
+        /// <summary>
+        /// The rate at which a user catches up after becoming desynchronised.
+        /// </summary>
         private const double catchup_rate = 2;
-        private const double max_sync_offset = 50;
+
+        /// <summary>
+        /// The offset from the expected time at which to START synchronisation.
+        /// </summary>
+        public const double MAX_OFFSET = 50;
+
+        /// <summary>
+        /// The maximum offset from the expected time at which to STOP synchronisation.
+        /// </summary>
+        public const double SYNC_TARGET = 16;
 
         public bool PlayerLoaded => stack?.CurrentScreen is Player;
 
@@ -26,6 +39,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         public readonly Score Score;
 
+        public bool IsCatchingUp { get; private set; }
+
         private OsuScreenStack stack;
         private MultiplayerSpectatorPlayer player;
 
@@ -63,7 +78,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         private readonly BindableDouble catchupFrequencyAdjustment = new BindableDouble(catchup_rate);
         private double targetTrackTime;
-        private bool isCatchingUp;
 
         private void updateCatchup()
         {
@@ -77,18 +91,27 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 return;
 
             double currentTime = Beatmap.Track.CurrentTime;
-            bool catchupRequired = targetTrackTime > currentTime + max_sync_offset;
+            double timeBehind = targetTrackTime - currentTime;
 
-            // Skip catchup if nothing needs to be done.
-            if (catchupRequired == isCatchingUp)
+            double offsetForCatchup = IsCatchingUp ? SYNC_TARGET : MAX_OFFSET;
+            bool catchupRequired = timeBehind > offsetForCatchup;
+
+            // Skip catchup if no work needs to be done.
+            if (catchupRequired == IsCatchingUp)
                 return;
 
             if (catchupRequired)
+            {
                 Beatmap.Track.AddAdjustment(AdjustableProperty.Frequency, catchupFrequencyAdjustment);
+                Logger.Log($"{User.Id} catchup started (behind: {timeBehind})");
+            }
             else
+            {
                 Beatmap.Track.RemoveAdjustment(AdjustableProperty.Frequency, catchupFrequencyAdjustment);
+                Logger.Log($"{User.Id} catchup finished (behind: {timeBehind})");
+            }
 
-            isCatchingUp = catchupRequired;
+            IsCatchingUp = catchupRequired;
         }
 
         public double GetCurrentGameplayTime()

From 3039b7b0f9731e881dc79f23a741d7b3b29df18d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 13 Apr 2021 22:40:10 +0900
Subject: [PATCH 2427/3722] Make tests a bit more resilient

---
 .../Visual/Multiplayer/TestSceneMultiplayerSpectator.cs    | 3 +--
 .../Multiplayer/Spectate/MultiplayerSpectator.cs           | 7 ++++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
index 1090f1d10e..1ac012c0b5 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
@@ -199,8 +199,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             // Player 2 should catch up to player 1 after unpausing.
             AddUntilStep("player 2 not catching up", () => !getInstance(56).IsCatchingUp);
-            AddAssert("player 1 time == player 2 time", () => Math.Abs(getGameplayOffset(55, 56)) <= 2 * PlayerInstance.SYNC_TARGET);
-            AddWaitStep("wait a bit", 5);
+            AddWaitStep("wait a bit", 10);
         }
 
         private void loadSpectateScreen()
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index db5de45f72..636e7b9a49 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         private readonly PlayerInstance[] instances;
         private PlayerGrid grid;
         private MultiplayerSpectatorLeaderboard leaderboard;
-        private double? loadStartTime;
+        private double? loadFinishTime;
 
         public MultiplayerSpectator(int[] userIds)
             : base(userIds.AsSpan().Slice(0, Math.Min(16, userIds.Length)).ToArray())
@@ -76,7 +76,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         {
             base.UpdateAfterChildren();
 
-            loadStartTime ??= Time.Current;
+            if (AllPlayersLoaded)
+                loadFinishTime ??= Time.Current;
 
             updateGameplayPlayingState();
         }
@@ -88,7 +89,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 // All players have frames...
                 instances.All(i => i.Score.Replay.Frames.Count > 0)
                 // Or any player has frames and the maximum start delay has been exceeded.
-                || (Time.Current - loadStartTime > maximum_start_delay
+                || (Time.Current - loadFinishTime > maximum_start_delay
                     && instances.Any(i => i.Score.Replay.Frames.Count > 0))
             );
 

From 0edc1a850d95c1c8bd94c873f12be8b40bcb33d5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 23:05:58 +0900
Subject: [PATCH 2428/3722] Split out common EditorTable base class

---
 osu.Game/Screens/Edit/EditorTable.cs          | 49 +++++++++++++++++
 .../Screens/Edit/Timing/ControlPointTable.cs  | 44 ++--------------
 osu.Game/Screens/Edit/Verify/IssueTable.cs    | 52 ++++---------------
 3 files changed, 63 insertions(+), 82 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/EditorTable.cs

diff --git a/osu.Game/Screens/Edit/EditorTable.cs b/osu.Game/Screens/Edit/EditorTable.cs
new file mode 100644
index 0000000000..e5e2add384
--- /dev/null
+++ b/osu.Game/Screens/Edit/EditorTable.cs
@@ -0,0 +1,49 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+
+namespace osu.Game.Screens.Edit
+{
+    public abstract class EditorTable : TableContainer
+    {
+        private const float horizontal_inset = 20;
+
+        protected const float ROW_HEIGHT = 25;
+
+        protected const int TEXT_SIZE = 14;
+
+        protected readonly FillFlowContainer BackgroundFlow;
+
+        protected EditorTable()
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+
+            Padding = new MarginPadding { Horizontal = horizontal_inset };
+            RowSize = new Dimension(GridSizeMode.Absolute, ROW_HEIGHT);
+
+            AddInternal(BackgroundFlow = new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Depth = 1f,
+                Padding = new MarginPadding { Horizontal = -horizontal_inset },
+                Margin = new MarginPadding { Top = ROW_HEIGHT }
+            });
+        }
+
+        protected override Drawable CreateHeader(int index, TableColumn column) => new HeaderText(column?.Header ?? string.Empty);
+
+        private class HeaderText : OsuSpriteText
+        {
+            public HeaderText(string text)
+            {
+                Text = text.ToUpper();
+                Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold);
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index a17b431fcc..75e2bb1f5c 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -20,47 +20,24 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Timing
 {
-    public class ControlPointTable : TableContainer
+    public class ControlPointTable : EditorTable
     {
-        private const float horizontal_inset = 20;
-        private const float row_height = 25;
-        private const int text_size = 14;
-
-        private readonly FillFlowContainer backgroundFlow;
-
         [Resolved]
         private Bindable<ControlPointGroup> selectedGroup { get; set; }
 
-        public ControlPointTable()
-        {
-            RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Axes.Y;
-
-            Padding = new MarginPadding { Horizontal = horizontal_inset };
-            RowSize = new Dimension(GridSizeMode.Absolute, row_height);
-
-            AddInternal(backgroundFlow = new FillFlowContainer
-            {
-                RelativeSizeAxes = Axes.Both,
-                Depth = 1f,
-                Padding = new MarginPadding { Horizontal = -horizontal_inset },
-                Margin = new MarginPadding { Top = row_height }
-            });
-        }
-
         public IEnumerable<ControlPointGroup> ControlGroups
         {
             set
             {
                 Content = null;
-                backgroundFlow.Clear();
+                BackgroundFlow.Clear();
 
                 if (value?.Any() != true)
                     return;
 
                 foreach (var group in value)
                 {
-                    backgroundFlow.Add(new RowBackground(group));
+                    BackgroundFlow.Add(new RowBackground(group));
                 }
 
                 Columns = createHeaders();
@@ -86,13 +63,13 @@ namespace osu.Game.Screens.Edit.Timing
             new OsuSpriteText
             {
                 Text = $"#{index + 1}",
-                Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold),
+                Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Bold),
                 Margin = new MarginPadding(10)
             },
             new OsuSpriteText
             {
                 Text = group.Time.ToEditorFormattedString(),
-                Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold)
+                Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Bold)
             },
             null,
             new ControlGroupAttributes(group),
@@ -164,17 +141,6 @@ namespace osu.Game.Screens.Edit.Timing
             }
         }
 
-        protected override Drawable CreateHeader(int index, TableColumn column) => new HeaderText(column?.Header ?? string.Empty);
-
-        private class HeaderText : OsuSpriteText
-        {
-            public HeaderText(string text)
-            {
-                Text = text.ToUpper();
-                Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold);
-            }
-        }
-
         public class RowBackground : OsuClickableContainer
         {
             private readonly ControlPointGroup controlGroup;
diff --git a/osu.Game/Screens/Edit/Verify/IssueTable.cs b/osu.Game/Screens/Edit/Verify/IssueTable.cs
index 042d6d84e3..00570d363b 100644
--- a/osu.Game/Screens/Edit/Verify/IssueTable.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueTable.cs
@@ -19,47 +19,24 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Verify
 {
-    public class IssueTable : TableContainer
+    public class IssueTable : EditorTable
     {
-        private const float horizontal_inset = 20;
-        private const float row_height = 25;
-        private const int text_size = 14;
-
-        private readonly FillFlowContainer backgroundFlow;
-
         [Resolved]
         private Bindable<Issue> selectedIssue { get; set; }
 
-        public IssueTable()
-        {
-            RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Axes.Y;
-
-            Padding = new MarginPadding { Horizontal = horizontal_inset };
-            RowSize = new Dimension(GridSizeMode.Absolute, row_height);
-
-            AddInternal(backgroundFlow = new FillFlowContainer
-            {
-                RelativeSizeAxes = Axes.Both,
-                Depth = 1f,
-                Padding = new MarginPadding { Horizontal = -horizontal_inset },
-                Margin = new MarginPadding { Top = row_height }
-            });
-        }
-
         public IEnumerable<Issue> Issues
         {
             set
             {
                 Content = null;
-                backgroundFlow.Clear();
+                BackgroundFlow.Clear();
 
                 if (value == null)
                     return;
 
                 foreach (var issue in value)
                 {
-                    backgroundFlow.Add(new RowBackground(issue));
+                    BackgroundFlow.Add(new RowBackground(issue));
                 }
 
                 Columns = createHeaders();
@@ -86,46 +63,35 @@ namespace osu.Game.Screens.Edit.Verify
             new OsuSpriteText
             {
                 Text = $"#{index + 1}",
-                Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Medium),
+                Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Medium),
                 Margin = new MarginPadding { Right = 10 }
             },
             new OsuSpriteText
             {
                 Text = issue.Template.Type.ToString(),
-                Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold),
+                Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Bold),
                 Margin = new MarginPadding { Right = 10 },
                 Colour = issue.Template.Colour
             },
             new OsuSpriteText
             {
                 Text = issue.GetEditorTimestamp(),
-                Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold),
+                Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Bold),
                 Margin = new MarginPadding { Right = 10 },
             },
             new OsuSpriteText
             {
                 Text = issue.ToString(),
-                Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Medium)
+                Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Medium)
             },
             new OsuSpriteText
             {
                 Text = issue.Check.Metadata.Category.ToString(),
-                Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold),
+                Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Bold),
                 Margin = new MarginPadding(10)
             }
         };
 
-        protected override Drawable CreateHeader(int index, TableColumn column) => new HeaderText(column?.Header ?? string.Empty);
-
-        private class HeaderText : OsuSpriteText
-        {
-            public HeaderText(string text)
-            {
-                Text = text.ToUpper();
-                Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold);
-            }
-        }
-
         public class RowBackground : OsuClickableContainer
         {
             private readonly Issue issue;
@@ -150,7 +116,7 @@ namespace osu.Game.Screens.Edit.Verify
                 this.issue = issue;
 
                 RelativeSizeAxes = Axes.X;
-                Height = row_height;
+                Height = ROW_HEIGHT;
                 AlwaysPresent = true;
                 CornerRadius = 3;
                 Masking = true;

From d49b90877e906960cfc081894cc3ecd8687f35db Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 13 Apr 2021 23:21:35 +0900
Subject: [PATCH 2429/3722] Fix operation remaining in progress

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 035eba4f30..9a68ff908d 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -420,6 +420,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 && ParentScreen.IsCurrentScreen())
             {
                 PushTopLevelScreen(() => new MultiplayerSpectator(client.CurrentMatchPlayingUserIds.ToArray()));
+
+                // If the current user was host, they started the match and the in-progres operation needs to be stopped now.
+                readyClickOperation?.Dispose();
+                readyClickOperation = null;
             }
         });
 

From 21e8e5fbcacf799b0485ab0203e66473a5d6e881 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 23:26:19 +0900
Subject: [PATCH 2430/3722] Move common table layout logic into `EditorTable`
 abstract class

---
 osu.Game/Screens/Edit/EditorTable.cs          |  95 ++++++++++-
 .../Screens/Edit/Timing/ControlPointTable.cs  | 120 +++-----------
 osu.Game/Screens/Edit/Verify/IssueTable.cs    | 154 +++++-------------
 3 files changed, 152 insertions(+), 217 deletions(-)

diff --git a/osu.Game/Screens/Edit/EditorTable.cs b/osu.Game/Screens/Edit/EditorTable.cs
index e5e2add384..ef1c88db9a 100644
--- a/osu.Game/Screens/Edit/EditorTable.cs
+++ b/osu.Game/Screens/Edit/EditorTable.cs
@@ -1,10 +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.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input.Events;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
+using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit
 {
@@ -16,7 +21,7 @@ namespace osu.Game.Screens.Edit
 
         protected const int TEXT_SIZE = 14;
 
-        protected readonly FillFlowContainer BackgroundFlow;
+        protected readonly FillFlowContainer<RowBackground> BackgroundFlow;
 
         protected EditorTable()
         {
@@ -26,7 +31,7 @@ namespace osu.Game.Screens.Edit
             Padding = new MarginPadding { Horizontal = horizontal_inset };
             RowSize = new Dimension(GridSizeMode.Absolute, ROW_HEIGHT);
 
-            AddInternal(BackgroundFlow = new FillFlowContainer
+            AddInternal(BackgroundFlow = new FillFlowContainer<RowBackground>
             {
                 RelativeSizeAxes = Axes.Both,
                 Depth = 1f,
@@ -45,5 +50,91 @@ namespace osu.Game.Screens.Edit
                 Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold);
             }
         }
+
+        public class RowBackground : OsuClickableContainer
+        {
+            public readonly object Item;
+
+            private const int fade_duration = 100;
+
+            private readonly Box hoveredBackground;
+
+            [Resolved]
+            private EditorClock clock { get; set; }
+
+            public RowBackground(object item)
+            {
+                Item = item;
+
+                RelativeSizeAxes = Axes.X;
+                Height = 25;
+
+                AlwaysPresent = true;
+
+                CornerRadius = 3;
+                Masking = true;
+
+                Children = new Drawable[]
+                {
+                    hoveredBackground = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Alpha = 0,
+                    },
+                };
+
+                // todo delete
+                Action = () =>
+                {
+                };
+            }
+
+            private Color4 colourHover;
+            private Color4 colourSelected;
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                hoveredBackground.Colour = colourHover = colours.BlueDarker;
+                colourSelected = colours.YellowDarker;
+            }
+
+            private bool selected;
+
+            public bool Selected
+            {
+                get => selected;
+                set
+                {
+                    if (value == selected)
+                        return;
+
+                    selected = value;
+                    updateState();
+                }
+            }
+
+            protected override bool OnHover(HoverEvent e)
+            {
+                updateState();
+                return base.OnHover(e);
+            }
+
+            protected override void OnHoverLost(HoverLostEvent e)
+            {
+                updateState();
+                base.OnHoverLost(e);
+            }
+
+            private void updateState()
+            {
+                hoveredBackground.FadeColour(selected ? colourSelected : colourHover, 450, Easing.OutQuint);
+
+                if (selected || IsHovered)
+                    hoveredBackground.FadeIn(fade_duration, Easing.OutQuint);
+                else
+                    hoveredBackground.FadeOut(fade_duration, Easing.OutQuint);
+            }
+        }
     }
 }
diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index 75e2bb1f5c..dd51056bf1 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -8,12 +8,9 @@ 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.Events;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Extensions;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osuTK;
 using osuTK.Graphics;
@@ -25,6 +22,9 @@ namespace osu.Game.Screens.Edit.Timing
         [Resolved]
         private Bindable<ControlPointGroup> selectedGroup { get; set; }
 
+        [Resolved]
+        private EditorClock clock { get; set; }
+
         public IEnumerable<ControlPointGroup> ControlGroups
         {
             set
@@ -37,7 +37,14 @@ namespace osu.Game.Screens.Edit.Timing
 
                 foreach (var group in value)
                 {
-                    BackgroundFlow.Add(new RowBackground(group));
+                    BackgroundFlow.Add(new RowBackground(group)
+                    {
+                        Action = () =>
+                        {
+                            selectedGroup.Value = group;
+                            clock.SeekSmoothlyTo(group.Time);
+                        }
+                    });
                 }
 
                 Columns = createHeaders();
@@ -45,6 +52,16 @@ namespace osu.Game.Screens.Edit.Timing
             }
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            selectedGroup.BindValueChanged(group =>
+            {
+                foreach (var b in BackgroundFlow) b.Selected = b.Item == group.NewValue;
+            }, true);
+        }
+
         private TableColumn[] createHeaders()
         {
             var columns = new List<TableColumn>
@@ -140,100 +157,5 @@ namespace osu.Game.Screens.Edit.Timing
                 return null;
             }
         }
-
-        public class RowBackground : OsuClickableContainer
-        {
-            private readonly ControlPointGroup controlGroup;
-            private const int fade_duration = 100;
-
-            private readonly Box hoveredBackground;
-
-            [Resolved]
-            private EditorClock clock { get; set; }
-
-            [Resolved]
-            private Bindable<ControlPointGroup> selectedGroup { get; set; }
-
-            public RowBackground(ControlPointGroup controlGroup)
-            {
-                this.controlGroup = controlGroup;
-                RelativeSizeAxes = Axes.X;
-                Height = 25;
-
-                AlwaysPresent = true;
-
-                CornerRadius = 3;
-                Masking = true;
-
-                Children = new Drawable[]
-                {
-                    hoveredBackground = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Alpha = 0,
-                    },
-                };
-
-                Action = () =>
-                {
-                    selectedGroup.Value = controlGroup;
-                    clock.SeekSmoothlyTo(controlGroup.Time);
-                };
-            }
-
-            private Color4 colourHover;
-            private Color4 colourSelected;
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                hoveredBackground.Colour = colourHover = colours.BlueDarker;
-                colourSelected = colours.YellowDarker;
-            }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-
-                selectedGroup.BindValueChanged(group => { Selected = controlGroup == group.NewValue; }, true);
-            }
-
-            private bool selected;
-
-            protected bool Selected
-            {
-                get => selected;
-                set
-                {
-                    if (value == selected)
-                        return;
-
-                    selected = value;
-                    updateState();
-                }
-            }
-
-            protected override bool OnHover(HoverEvent e)
-            {
-                updateState();
-                return base.OnHover(e);
-            }
-
-            protected override void OnHoverLost(HoverLostEvent e)
-            {
-                updateState();
-                base.OnHoverLost(e);
-            }
-
-            private void updateState()
-            {
-                hoveredBackground.FadeColour(selected ? colourSelected : colourHover, 450, Easing.OutQuint);
-
-                if (selected || IsHovered)
-                    hoveredBackground.FadeIn(fade_duration, Easing.OutQuint);
-                else
-                    hoveredBackground.FadeOut(fade_duration, Easing.OutQuint);
-            }
-        }
     }
 }
diff --git a/osu.Game/Screens/Edit/Verify/IssueTable.cs b/osu.Game/Screens/Edit/Verify/IssueTable.cs
index 00570d363b..44244028c9 100644
--- a/osu.Game/Screens/Edit/Verify/IssueTable.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueTable.cs
@@ -8,14 +8,10 @@ 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.Events;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Input.Bindings;
 using osu.Game.Rulesets.Edit.Checks.Components;
-using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Verify
 {
@@ -24,6 +20,15 @@ namespace osu.Game.Screens.Edit.Verify
         [Resolved]
         private Bindable<Issue> selectedIssue { get; set; }
 
+        [Resolved]
+        private EditorClock clock { get; set; }
+
+        [Resolved]
+        private EditorBeatmap editorBeatmap { get; set; }
+
+        [Resolved]
+        private Editor editor { get; set; }
+
         public IEnumerable<Issue> Issues
         {
             set
@@ -36,7 +41,25 @@ namespace osu.Game.Screens.Edit.Verify
 
                 foreach (var issue in value)
                 {
-                    BackgroundFlow.Add(new RowBackground(issue));
+                    BackgroundFlow.Add(new RowBackground(issue)
+                    {
+                        Action = () =>
+                        {
+                            selectedIssue.Value = issue;
+
+                            if (issue.Time != null)
+                            {
+                                clock.Seek(issue.Time.Value);
+                                editor.OnPressed(GlobalAction.EditorComposeMode);
+                            }
+
+                            if (!issue.HitObjects.Any())
+                                return;
+
+                            editorBeatmap.SelectedHitObjects.Clear();
+                            editorBeatmap.SelectedHitObjects.AddRange(issue.HitObjects);
+                        },
+                    });
                 }
 
                 Columns = createHeaders();
@@ -44,6 +67,16 @@ namespace osu.Game.Screens.Edit.Verify
             }
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            selectedIssue.BindValueChanged(issue =>
+            {
+                foreach (var b in BackgroundFlow) b.Selected = b.Item == issue.NewValue;
+            }, true);
+        }
+
         private TableColumn[] createHeaders()
         {
             var columns = new List<TableColumn>
@@ -91,116 +124,5 @@ namespace osu.Game.Screens.Edit.Verify
                 Margin = new MarginPadding(10)
             }
         };
-
-        public class RowBackground : OsuClickableContainer
-        {
-            private readonly Issue issue;
-            private const int fade_duration = 100;
-
-            private readonly Box hoveredBackground;
-
-            [Resolved]
-            private EditorClock clock { get; set; }
-
-            [Resolved]
-            private Editor editor { get; set; }
-
-            [Resolved]
-            private EditorBeatmap editorBeatmap { get; set; }
-
-            [Resolved]
-            private Bindable<Issue> selectedIssue { get; set; }
-
-            public RowBackground(Issue issue)
-            {
-                this.issue = issue;
-
-                RelativeSizeAxes = Axes.X;
-                Height = ROW_HEIGHT;
-                AlwaysPresent = true;
-                CornerRadius = 3;
-                Masking = true;
-
-                Children = new Drawable[]
-                {
-                    hoveredBackground = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Alpha = 0,
-                    },
-                };
-
-                Action = () =>
-                {
-                    selectedIssue.Value = issue;
-
-                    if (issue.Time != null)
-                    {
-                        clock.Seek(issue.Time.Value);
-                        editor.OnPressed(GlobalAction.EditorComposeMode);
-                    }
-
-                    if (!issue.HitObjects.Any())
-                        return;
-
-                    editorBeatmap.SelectedHitObjects.Clear();
-                    editorBeatmap.SelectedHitObjects.AddRange(issue.HitObjects);
-                };
-            }
-
-            private Color4 colourHover;
-            private Color4 colourSelected;
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                hoveredBackground.Colour = colourHover = colours.BlueDarker;
-                colourSelected = colours.YellowDarker;
-            }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-
-                selectedIssue.BindValueChanged(change => { Selected = issue == change.NewValue; }, true);
-            }
-
-            private bool selected;
-
-            protected bool Selected
-            {
-                get => selected;
-                set
-                {
-                    if (value == selected)
-                        return;
-
-                    selected = value;
-                    updateState();
-                }
-            }
-
-            protected override bool OnHover(HoverEvent e)
-            {
-                updateState();
-                return base.OnHover(e);
-            }
-
-            protected override void OnHoverLost(HoverLostEvent e)
-            {
-                updateState();
-                base.OnHoverLost(e);
-            }
-
-            private void updateState()
-            {
-                hoveredBackground.FadeColour(selected ? colourSelected : colourHover, 450, Easing.OutQuint);
-
-                if (selected || IsHovered)
-                    hoveredBackground.FadeIn(fade_duration, Easing.OutQuint);
-                else
-                    hoveredBackground.FadeOut(fade_duration, Easing.OutQuint);
-            }
-        }
     }
 }

From cb4f64133eedde15134e64b9b0a0c584256df3aa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 23:30:20 +0900
Subject: [PATCH 2431/3722] Add xmldoc to interfaces

---
 osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs | 3 +++
 osu.Game/Rulesets/Edit/IBeatmapVerifier.cs         | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs b/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
index f355ae734e..f284240092 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
@@ -6,6 +6,9 @@ using osu.Game.Beatmaps;
 
 namespace osu.Game.Rulesets.Edit.Checks.Components
 {
+    /// <summary>
+    /// A specific check that can be run on a beatmap to verify or find issues.
+    /// </summary>
     public interface ICheck
     {
         /// <summary>
diff --git a/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs b/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
index 2bafacefa3..61d8119635 100644
--- a/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
@@ -7,6 +7,9 @@ using osu.Game.Rulesets.Edit.Checks.Components;
 
 namespace osu.Game.Rulesets.Edit
 {
+    /// <summary>
+    /// A class which can run against a beatmap and surface issues to the user which could go against known criteria or hinder gameplay.
+    /// </summary>
     public interface IBeatmapVerifier
     {
         public IEnumerable<Issue> Run(IBeatmap beatmap);

From 56e1bffdfd237ceb45db074982b912e27612640e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 13 Apr 2021 23:40:10 +0900
Subject: [PATCH 2432/3722] Populate initial user states

---
 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 2ddc10db0f..fe1201ef89 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -144,6 +144,9 @@ namespace osu.Game.Online.Multiplayer
                     Room = joinedRoom;
                     apiRoom = room;
                     defaultPlaylistItemId = apiRoom.Playlist.FirstOrDefault()?.ID ?? 0;
+
+                    foreach (var user in joinedRoom.Users)
+                        updateUserPlayingState(user.UserID, user.State);
                 }, cancellationSource.Token).ConfigureAwait(false);
 
                 // Update room settings.

From 77830527e7e06df39fbf8b8ae341b9847bef2795 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 13 Apr 2021 23:49:23 +0900
Subject: [PATCH 2433/3722] Fix spectate button being disabled during play

---
 .../OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs
index 4b3fb5d00f..465af037e2 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                     break;
             }
 
-            button.Enabled.Value = Client.Room?.State == MultiplayerRoomState.Open && !operationInProgress.Value;
+            button.Enabled.Value = !operationInProgress.Value;
         }
 
         private class ButtonWithTrianglesExposed : TriangleButton

From 69b01e727008bb8dd7d15bce834e72aee9ae3ca1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 14 Apr 2021 00:58:03 +0900
Subject: [PATCH 2434/3722] Add some debugging

---
 .../OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs   | 4 ++++
 .../Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index 636e7b9a49..a56104439d 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -8,6 +8,7 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Logging;
 using osu.Framework.Utils;
 using osu.Game.Online.Spectator;
 using osu.Game.Screens.Spectate;
@@ -108,6 +109,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
             double targetTrackTime = validInstances.Select(i => i.GetCurrentTrackTime()).Max();
 
+            var instanceTimes = string.Join(',', validInstances.Select(i => $" {i.User.Id}: {(int)i.GetCurrentTrackTime()}"));
+            Logger.Log($"target: {(int)targetTrackTime},{instanceTimes}");
+
             foreach (var inst in validInstances)
             {
                 Debug.Assert(inst != null);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
index a4a3a0c133..12a710e9f0 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
@@ -103,12 +103,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             if (catchupRequired)
             {
                 Beatmap.Track.AddAdjustment(AdjustableProperty.Frequency, catchupFrequencyAdjustment);
-                Logger.Log($"{User.Id} catchup started (behind: {timeBehind})");
+                Logger.Log($"{User.Id} catchup started (behind: {(int)timeBehind})");
             }
             else
             {
                 Beatmap.Track.RemoveAdjustment(AdjustableProperty.Frequency, catchupFrequencyAdjustment);
-                Logger.Log($"{User.Id} catchup finished (behind: {timeBehind})");
+                Logger.Log($"{User.Id} catchup finished (behind: {(int)timeBehind})");
             }
 
             IsCatchingUp = catchupRequired;

From bf5ed12b757663216d7e5c1a92aa4e26e8371f2a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 14 Apr 2021 06:33:53 +0300
Subject: [PATCH 2435/3722] Add support for legacy skin `CursorCentre` setting

---
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursor.cs  | 5 +++--
 osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursor.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursor.cs
index 314139d02a..8fe40f801b 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursor.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursor.cs
@@ -24,6 +24,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin)
         {
+            bool centre = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.CursorCentre)?.Value ?? false;
             spin = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.CursorRotate)?.Value ?? true;
 
             InternalChildren = new[]
@@ -32,13 +33,13 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                 {
                     Texture = skin.GetTexture("cursor"),
                     Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
+                    Origin = centre ? Anchor.Centre : Anchor.TopLeft,
                 },
                 new NonPlayfieldSprite
                 {
                     Texture = skin.GetTexture("cursormiddle"),
                     Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
+                    Origin = centre ? Anchor.Centre : Anchor.TopLeft,
                 },
             };
         }
diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs b/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
index 75a62a6f8e..6953e66b5c 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuSkinConfiguration.cs
@@ -8,6 +8,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         SliderBorderSize,
         SliderPathRadius,
         AllowSliderBallTint,
+        CursorCentre,
         CursorExpand,
         CursorRotate,
         HitCircleOverlayAboveNumber,

From df991bc0affa64d7a0deaf680e57b24cb03cbc26 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 14 Apr 2021 06:36:31 +0300
Subject: [PATCH 2436/3722] Refactor gameplay cursor test scene and add visual
 coverage

---
 .../TestSceneGameplayCursor.cs                | 62 +++++++++++++++----
 1 file changed, 49 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
index e3ccf83715..ed44bc7309 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
@@ -4,13 +4,22 @@
 using System;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Audio.Sample;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.Input;
 using osu.Framework.Testing.Input;
 using osu.Framework.Utils;
+using osu.Game.Audio;
 using osu.Game.Configuration;
+using osu.Game.Rulesets.Osu.Skinning;
 using osu.Game.Rulesets.Osu.UI.Cursor;
 using osu.Game.Screens.Play;
+using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
@@ -21,7 +30,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [Cached]
         private GameplayBeatmap gameplayBeatmap;
 
-        private ClickingCursorContainer lastContainer;
+        private OsuCursorContainer lastContainer;
 
         [Resolved]
         private OsuConfigManager config { get; set; }
@@ -48,12 +57,10 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 config.SetValue(OsuSetting.AutoCursorSize, true);
                 gameplayBeatmap.BeatmapInfo.BaseDifficulty.CircleSize = val;
-                Scheduler.AddOnce(recreate);
+                Scheduler.AddOnce(() => loadContent(false));
             });
 
-            AddStep("test cursor container", recreate);
-
-            void recreate() => SetContents(() => new OsuInputManager(new OsuRuleset().RulesetInfo) { Child = new OsuCursorContainer() });
+            AddStep("test cursor container", () => loadContent(false));
         }
 
         [TestCase(1, 1)]
@@ -68,7 +75,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddStep($"adjust cs to {circleSize}", () => gameplayBeatmap.BeatmapInfo.BaseDifficulty.CircleSize = circleSize);
             AddStep("turn on autosizing", () => config.SetValue(OsuSetting.AutoCursorSize, true));
 
-            AddStep("load content", loadContent);
+            AddStep("load content", () => loadContent());
 
             AddUntilStep("cursor size correct", () => lastContainer.ActiveCursor.Scale.X == OsuCursorContainer.GetScaleForCircleSize(circleSize) * userScale);
 
@@ -82,18 +89,47 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddUntilStep("cursor size correct", () => lastContainer.ActiveCursor.Scale.X == userScale);
         }
 
-        private void loadContent()
+        [Test]
+        public void TestTopLeftOrigin()
         {
-            SetContents(() => new MovingCursorInputManager
+            AddStep("load content", () => loadContent(false, () => new SkinProvidingContainer(new TopLeftCursorSkin())));
+            AddAssert("cursor top left", () => lastContainer.ActiveCursor.Origin == Anchor.TopLeft);
+        }
+
+        private void loadContent(bool automated = true, Func<SkinProvidingContainer> skinProvider = null)
+        {
+            SetContents(() =>
             {
-                Child = lastContainer = new ClickingCursorContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Masking = true,
-                }
+                var inputManager = automated ? (InputManager)new MovingCursorInputManager() : new OsuInputManager(new OsuRuleset().RulesetInfo);
+                var skinContainer = skinProvider?.Invoke() ?? new SkinProvidingContainer(null);
+
+                lastContainer = automated ? new ClickingCursorContainer() : new OsuCursorContainer();
+
+                return inputManager.WithChild(skinContainer.WithChild(lastContainer));
             });
         }
 
+        private class TopLeftCursorSkin : ISkin
+        {
+            public Drawable GetDrawableComponent(ISkinComponent component) => 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)
+            {
+                switch (lookup)
+                {
+                    case OsuSkinConfiguration osuLookup:
+                        if (osuLookup == OsuSkinConfiguration.CursorCentre)
+                            return SkinUtils.As<TValue>(new BindableBool(false));
+
+                        break;
+                }
+
+                return null;
+            }
+        }
+
         private class ClickingCursorContainer : OsuCursorContainer
         {
             private bool pressed;

From 89ce8f290f3e074d6b762cbd6e30aeae5d35cf9c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 12:28:37 +0900
Subject: [PATCH 2437/3722] Add simple acceleration to volume metre adjustments

---
 osu.Game/Overlays/Volume/VolumeMeter.cs | 34 +++++++++++++++++++++----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Volume/VolumeMeter.cs b/osu.Game/Overlays/Volume/VolumeMeter.cs
index 5b997bbd05..57485946c1 100644
--- a/osu.Game/Overlays/Volume/VolumeMeter.cs
+++ b/osu.Game/Overlays/Volume/VolumeMeter.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Framework.Threading;
 using osu.Framework.Utils;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
@@ -225,7 +226,7 @@ namespace osu.Game.Overlays.Volume
             private set => Bindable.Value = value;
         }
 
-        private const double adjust_step = 0.05;
+        private const double adjust_step = 0.01;
 
         public void Increase(double amount = 1, bool isPrecise = false) => adjust(amount, isPrecise);
         public void Decrease(double amount = 1, bool isPrecise = false) => adjust(-amount, isPrecise);
@@ -233,16 +234,39 @@ namespace osu.Game.Overlays.Volume
         // because volume precision is set to 0.01, this local is required to keep track of more precise adjustments and only apply when possible.
         private double scrollAccumulation;
 
+        private double accelerationModifier = 1;
+
+        private const double max_acceleration = 5;
+
+        private ScheduledDelegate accelerationDebounce;
+
+        private void resetAcceleration() => accelerationModifier = 1;
+
         private void adjust(double delta, bool isPrecise)
         {
-            scrollAccumulation += delta * adjust_step * (isPrecise ? 0.1 : 1);
+            // every adjust increment increases the rate at which adjustments happen up to a cutoff.
+            // this debounce will reset on inactivity.
+            accelerationDebounce?.Cancel();
+            accelerationDebounce = Scheduler.AddDelayed(resetAcceleration, 150);
+
+            delta *= accelerationModifier;
+            accelerationModifier = Math.Min(max_acceleration, accelerationModifier * 1.2f);
 
             var precision = Bindable.Precision;
 
-            while (Precision.AlmostBigger(Math.Abs(scrollAccumulation), precision))
+            if (isPrecise)
             {
-                Volume += Math.Sign(scrollAccumulation) * precision;
-                scrollAccumulation = scrollAccumulation < 0 ? Math.Min(0, scrollAccumulation + precision) : Math.Max(0, scrollAccumulation - precision);
+                scrollAccumulation += delta * adjust_step * 0.1;
+
+                while (Precision.AlmostBigger(Math.Abs(scrollAccumulation), precision))
+                {
+                    Volume += Math.Sign(scrollAccumulation) * precision;
+                    scrollAccumulation = scrollAccumulation < 0 ? Math.Min(0, scrollAccumulation + precision) : Math.Max(0, scrollAccumulation - precision);
+                }
+            }
+            else
+            {
+                Volume += Math.Sign(delta) * Math.Max(precision, Math.Abs(delta * adjust_step));
             }
         }
 

From 8282f38eb708884e765e14148aa254b21db5f4fd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 13:10:45 +0900
Subject: [PATCH 2438/3722] Fix volume controls not supporting key repeat

---
 osu.Game/Extensions/DrawableExtensions.cs     |  8 +++--
 .../Overlays/Volume/VolumeControlReceptor.cs  | 32 +++++++++++++++----
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Extensions/DrawableExtensions.cs b/osu.Game/Extensions/DrawableExtensions.cs
index 1790eb608e..67b9e727a5 100644
--- a/osu.Game/Extensions/DrawableExtensions.cs
+++ b/osu.Game/Extensions/DrawableExtensions.cs
@@ -9,6 +9,9 @@ namespace osu.Game.Extensions
 {
     public static class DrawableExtensions
     {
+        public const double REPEAT_INTERVAL = 70;
+        public const double INITIAL_DELAY = 250;
+
         /// <summary>
         /// Helper method that is used while <see cref="IKeyBindingHandler"/> doesn't support repetitions of <see cref="IKeyBindingHandler{T}.OnPressed"/>.
         /// Simulates repetitions by continually invoking a delegate according to the default key repeat rate.
@@ -19,12 +22,13 @@ namespace osu.Game.Extensions
         /// <param name="handler">The <see cref="IKeyBindingHandler{T}"/> which is handling the repeat.</param>
         /// <param name="scheduler">The <see cref="Scheduler"/> to schedule repetitions on.</param>
         /// <param name="action">The <see cref="Action"/> to be invoked once immediately and with every repetition.</param>
+        /// <param name="initialRepeatDelay">The delay imposed on the first repeat. Defaults to <see cref="INITIAL_DELAY"/>.</param>
         /// <returns>A <see cref="ScheduledDelegate"/> which can be cancelled to stop the repeat events from firing.</returns>
-        public static ScheduledDelegate BeginKeyRepeat(this IKeyBindingHandler handler, Scheduler scheduler, Action action)
+        public static ScheduledDelegate BeginKeyRepeat(this IKeyBindingHandler handler, Scheduler scheduler, Action action, double initialRepeatDelay = INITIAL_DELAY)
         {
             action();
 
-            ScheduledDelegate repeatDelegate = new ScheduledDelegate(action, handler.Time.Current + 250, 70);
+            ScheduledDelegate repeatDelegate = new ScheduledDelegate(action, handler.Time.Current + initialRepeatDelay, REPEAT_INTERVAL);
             scheduler.Add(repeatDelegate);
             return repeatDelegate;
         }
diff --git a/osu.Game/Overlays/Volume/VolumeControlReceptor.cs b/osu.Game/Overlays/Volume/VolumeControlReceptor.cs
index 3b39b74e00..34b86b2f81 100644
--- a/osu.Game/Overlays/Volume/VolumeControlReceptor.cs
+++ b/osu.Game/Overlays/Volume/VolumeControlReceptor.cs
@@ -6,6 +6,8 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Framework.Threading;
+using osu.Game.Extensions;
 using osu.Game.Input.Bindings;
 
 namespace osu.Game.Overlays.Volume
@@ -15,8 +17,30 @@ namespace osu.Game.Overlays.Volume
         public Func<GlobalAction, bool> ActionRequested;
         public Func<GlobalAction, float, bool, bool> ScrollActionRequested;
 
-        public bool OnPressed(GlobalAction action) =>
-            ActionRequested?.Invoke(action) ?? false;
+        private ScheduledDelegate keyRepeat;
+
+        public bool OnPressed(GlobalAction action)
+        {
+            switch (action)
+            {
+                case GlobalAction.DecreaseVolume:
+                case GlobalAction.IncreaseVolume:
+                    keyRepeat?.Cancel();
+                    keyRepeat = this.BeginKeyRepeat(Scheduler, () => ActionRequested?.Invoke(action), 150);
+                    return true;
+
+                case GlobalAction.ToggleMute:
+                    ActionRequested?.Invoke(action);
+                    return true;
+            }
+
+            return false;
+        }
+
+        public void OnReleased(GlobalAction action)
+        {
+            keyRepeat?.Cancel();
+        }
 
         protected override bool OnScroll(ScrollEvent e)
         {
@@ -27,9 +51,5 @@ namespace osu.Game.Overlays.Volume
 
         public bool OnScroll(GlobalAction action, float amount, bool isPrecise) =>
             ScrollActionRequested?.Invoke(action, amount, isPrecise) ?? false;
-
-        public void OnReleased(GlobalAction action)
-        {
-        }
     }
 }

From 65a1270f9a4dc5d6ba1680dad869736e8714f31f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 14:16:18 +0900
Subject: [PATCH 2439/3722] Hide top-right HUD overlay elements as part of HUD
 visibility

---
 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 3dffab8102..31b49dfbe9 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Screens.Play
 
         private bool holdingForHUD;
 
-        private IEnumerable<Drawable> hideTargets => new Drawable[] { visibilityContainer, KeyCounter };
+        private IEnumerable<Drawable> hideTargets => new Drawable[] { visibilityContainer, KeyCounter, topRightElements };
 
         public HUDOverlay(ScoreProcessor scoreProcessor, HealthProcessor healthProcessor, DrawableRuleset drawableRuleset, IReadOnlyList<Mod> mods)
         {

From ad53ababe89f49a2650a4bcd4eb5368052f9413f Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 14 Apr 2021 08:16:45 +0300
Subject: [PATCH 2440/3722] Fix wrong default

Ah, soz
---
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursor.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursor.cs
index 8fe40f801b..7a8555d991 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursor.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursor.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin)
         {
-            bool centre = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.CursorCentre)?.Value ?? false;
+            bool centre = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.CursorCentre)?.Value ?? true;
             spin = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.CursorRotate)?.Value ?? true;
 
             InternalChildren = new[]

From b060b59dcf0c2f0bf73979b398aa2000007d6fd7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 14 Apr 2021 08:17:35 +0300
Subject: [PATCH 2441/3722] Return null values instead of throwing NIE

---
 osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneCursorTrail.cs
index 8fd13c7417..0ba97fac54 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;
             }
 
-            public Drawable GetDrawableComponent(ISkinComponent component) => throw new NotImplementedException();
+            public Drawable GetDrawableComponent(ISkinComponent component) => null;
 
             public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT)
             {
@@ -98,9 +98,9 @@ namespace osu.Game.Rulesets.Osu.Tests
                 return null;
             }
 
-            public ISample GetSample(ISampleInfo sampleInfo) => throw new NotImplementedException();
+            public ISample GetSample(ISampleInfo sampleInfo) => null;
 
-            public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotImplementedException();
+            public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => null;
 
             public event Action SourceChanged
             {

From daf198fa77f18a6872213477c37abcc66f933ad2 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 14 Apr 2021 08:18:24 +0300
Subject: [PATCH 2442/3722] Add osu! 2007 skin cursor for testing purposes

---
 .../Resources/old-skin/cursor.png               | Bin 0 -> 10496 bytes
 .../Resources/old-skin/cursortrail.png          | Bin 0 -> 3763 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100755 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/cursor.png
 create mode 100755 osu.Game.Rulesets.Osu.Tests/Resources/old-skin/cursortrail.png

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/cursor.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/cursor.png
new file mode 100755
index 0000000000000000000000000000000000000000..fe305468fe9efc47be6e9e793baabdab04aab4da
GIT binary patch
literal 10496
zcmV+bDgV}qP)<h;3K|Lk000e1NJLTq002J#002J-1^@s6S6>j{00004XF*Lt006O$
zeEU(80000WV@Og>004&%004{+008|`004nN004b?008NW002DY000@xb3BE2000U(
zX+uL$P-t&-Z*ypGa3D!TLm+T+Z)Rz1WdHz3$DNjUR8-d%htIutdZEoQ(iwV_E---f
zE+8EQQ5a?h7|H;{3{7l^s6a#!5dlSzpnw6Rp-8NVVj(D~U=K(TP+~BOsHkK{)=GSN
zdGF=r_s6~8+Gp=`_t|@&wJrc8PaiHX1(pIJnJ3@}dN|Wpg-6h_{Qw4dfB~ieFj?uT
zzCrH6KqN0W7kawL3H*!R3;{^|zGdj?Pp5<bPtvSZz5oEoU&Q8YPC84(`65or6r_sn
zGa{zOB#IeEiJ31-P{eX#j$7oVpM4hDQOxXQ9$UoXoKxA!Y%%wUczcGBBVxoy#042#
zPNs-&i&!&Bn9LRNTXAeMhnWrliX^rRIIMUPn~0di4-Rw@@p1rgq_{6Q<_i{ZvIOEo
zxum3K^SN>H0=h0sk8Wyh&7ga7GLtw0fuTQ>mB{3?=`JbBsZ3rr0E=h-EE#ca>7pWA
znp#_08k!lIeo?6Zy7)IG?(HJI3i#YJh}QRq?XUb&>HuKOifXg#4_nNB06Mk;Ab0-{
zo8}<^Bt?B|zwyO+XySQ^7YI^qjEyrhGmW?$mXWxizw3WG{0)8aJtOgUzn6#Z%86wP
zlLT~e-B>9}DMCIyJ(bDg&<+1Q#Q!+(uk%<M$cg3fIXqEBsA$T#yf{(2d2FtLo5G`W
zdH<=2|1j)NTAXW<DD|HJHOdG`-Jk;G=RSa<5CIZ-P~7$3`{siW1>&0*raG}W_n!s*
z`>t?__>s<y`yA&I7))mg`5B9A;%f=efB+-`703e>paFD&Aut10z!o?HH?RWufnX30
z)&drY2g!gBGC?lb3<^LI*ah~2N>BspK_h4ZCqM@{4K9Go;5xVo?tlki1dM~{U<SMa
z^AH4KAu>dP<RMi^3o?MrAO>U)xj{ZqAQTQoLvauf5<<Dq7N`g+g({(1s1f=WIt5*T
zu0jLQJ!lk~f_{bG!w5`*sjxDv4I9G@*a`NAgW)xB9GnK{!1?e_xB{+&kHPKm1^7CA
z2Ofc+!?OrLhzJc)LktlH;)3`g5lAe;M>ZgZNI6o6v>;tbFLDbRL8g&+C=7~%qN5B^
zwkS_j2#SSDLv276qbgBHQSGQ6)GgE~Y6kTQO-3uB4bV1dFZ3#O96A$SfG$Tjpxe-w
z(09<|=r<S)hKA9>SYbRd;g|%>I!rO<0Hzgl9y5R$!^~o_Sb3}g)(-23Wnu-`0_=Y5
zG3+_)Aa)%47DvRX;>>XFxCk5%mxn9IHQ~<U25}R(dAt-}3vYw>!?W?(_!4|Qz6*Z?
zKaQU#NE37jc7$L;0%0?ug3v;^M0iMeMI;i{iPppbBA2*{SV25ayh0o$z9Y$y^hqwH
zNRp7WlXQf1o^+4&icBVJlO4$sWC3|6xsiO4{FwY!f+Arg;U&SA*eFpY(JnD4@j?<W
zsU_(oxmGeqvRv|{<PFJbDZG@nl#3KoYJ*gj)G4W9saa`?w5hb8bh31@bd&T|=}8%^
zjJAxM3|l5&=CI5~nK24N(V)0cSd=Z4ddelrI2A+Hp?Xmhs72IosQuI#SsB@7vZ1nB
zvQ@HYWJhQSO`GOLOQMy~PSA#E@0TbqaazJzvSUfhlEEc&a*A?}avZrrxmLM5a_{Bo
z@^12p^1J0b<R2-Z6!aAW6fzYKDqK>SR-`K0DzX#{6;CMMSAv!Fl>(L4DIHeoQ<_y)
zQT9+yRo<_BQF&U0rsAlQpi-uCR%J?+qH3?oRV`CJr}~U8OLw9t(JSaZ^cgiJHBU96
zTCG~Y+Pu1sdWd?SdaL>)4T1(kBUYnKqg!J}Q&rPfGgq@&^S%~di=h>-wNI;8Yff87
zJ4}0<c8B()j+~B{PL58q&O=?Yu7hrxZk_IJJ&YbhFH!G+-c5a2-$FlLze@jx0c>Dt
zz%@8vFt8N8)OsmzY2DIcLz1DBVTNI|;iwVK$j2zpsKe-mv8Hi^@owW@<4-0QCP^ms
zCJ#(yOjnrZnRc1}YNl_-GOIGXZB90KH{WR9Y5sDV!7|RWgUjw(P%L~cwpnyre6+N(
z<Xg5_PFZPMMO#%{4Kt_=e?~FmiZ$BW*?Ob(Y3p}3mNo*L6E?rt8rmk>HrY-t*ICY4
zUcY?IPTh`aS8F$7Pq&Y@KV(1Rpyt4IsB?JYsNu+VY;c@#(sN31I_C7k*~FRe+~z#z
zV&k&j<-9B6>fu`G+V3Xg7UEXv_SjwBJ<h$^ea6GWW1Yu&Pqe4E=WfqoFJ&*5SEJX=
z3ab_CSM+$3yo0<ey`T8#`|y3bd|}@ezI%KhuGCt|TiM|U{Ji}3_&xI1@lW&rJ^&No
zA5azWG|)6KH?TK|5)>8G6!a$8Ik+VFL5OaMFr+(FGBh%@F?24>HLNsjWR>x%^{cLj
zD}-~yJ0q|Wp%D!cv#Z@!?_E6}X%SfvIkZM+P1c&LYZcZetvwSZ8O4k`8I6t(i*Abk
z!1QC*F=u1EVya_iST3x6tmkY;b{Tt$W5+4wOvKv7mc~xT*~RUNn~HacFOQ$*x^OGG
zFB3cyY7*uW{SuEPE+mB|wI<_|qmxhZWO#|Zo)ndotdxONgVci5ku;mMy=gOiZ+=5M
zl)fgtQ$Q8{O!WzMg<FNA8TJ`f8E-Q~Gf!qoXYsQ7vh}lfWKZO{=X|{mwT`u}J6A1t
zbMEMRr}ecPpbaq_x;JWU%-=Y^$z#*e&4kT~n}5hN$t%r!y(Mf*SH5!oru?z39$T9W
zBntQi!`p1P)oe#?=Wg%cVZLMkj!%W`!fQn)Mdd{widn_izB2u);;V(7u{--qEK3gV
z!tCPh8rto!`)H|jX-?_b9^XCfW%RPbve$c~_FgStR$jA@uur&eq{647bHC>PUHd;&
z##i2{a;|EvR;u1nJ$Hb8VDO;h!Im23nxdNbhq#CC)_T;o*J;<4AI2QcIQ+Cew7&Oi
z#@CGv3JpaKACK^kj2sO-+S6#&*x01hRMHGL3!A5oMIO8Pjq5j^Eru<%t+dvn<KVdP
z__J@Lza2W^eWLp$<7CTsTHjT-QQ8XIq4w<dnU465k<ReWfm16^b$8izwS8~&{gKmZ
zr>oA$o+&v?IGcZV;atwS+4HIAr!T}^80(JeesFQs#oIjrJ^h!wFI~Cpe)(drQ}4Me
zc2`bcwYhrg8sl2Wb<6AReHMLfKUn<G)^FM0e#7cU=S}OIT?5Mp&JH>ZUby9Y>+)@{
z+t=@`yfZKqGIV!1a(Lt}`|jkuq<b&#XWXBEu<0TCVc{dGN9B)|9@qV-_hajb<;a;)
z*U`QwK~ElxvBsYNl>XC)@%*Rcr{xo>6OEH*lc%TLr*1x5{cQYs>ht;Of}f>-u708W
z;=5lQf9ac9H8cK_|8n8i;#cyoj=Wy>x_j1t_VJtKH}i9aZ{^<}eaCp$`#$Xb#C+xl
z?1zevdLO$!d4GDiki4+)8~23s`{L#u!T<mO32;bRa{vGf5C8xR5CN?ty>$Qp02p*d
zSaefwW^{L9a%BK;VQFr3E^cLXAT%y8E;js(W8VM(9t}xEK~!i%?OO*}RM)mX(<oCI
zn8pkYO^PspQ~^<>ND+`O3Zh~`6ct59MFc?wQ4~dqM(h<Uhy_b90!BqFF&Z_|#QR>Z
zX(ln2X!NRa-oGZ0OY(UWljuv{_r3Fd%fl&qt^eO^?X}n5XJr2WcpZnYmZcM)cCoHz
zGm>OBW1<rdBOAeH6xkd`IsHd5D`GR26>P?CC#zk<j|b`aKXVXR%_%lxyNS)17jYTs
z5Ix2y%z!2A$!7_Cg<PSh5m)GC#1Z+6Iij9oj#01?$GESEBMud?M8SNPQLq6c?1?sg
zxacenbg&tl>c43Rba>dQ=|}HcF61)mVttlr7M~^UFJ_xW%X!9uDm~+#R(eK0wtPts
zd%ncKE5wm64RYX1dfVe{%a;aQ>4^g@^u&HDp4dmu5&0OiL_R{67@c9<S5Maw@=WT`
zzez_BY4VItig_&6Gy|4AOT?BAm+HyV%=M-H?F8~zSD|T?pRsv#pv*ElOlBDwsj`jh
zr*=r}XKvp=+T3A4U!`4QxYQ~p7|#Pt%)@;|iXeBPthbYaaZeiqV}B(_=r2L!2v|me
z`i!s#ml1feA%9^fP$-%gVZ2V{k(W8jF=DPVQ^}JJvEiGhI|~)V{3NRMP*ba631;@g
zhFCdgWOi}O%y#h3nym2~KgB(8%2dywsW|86X#6Hj!2K*+w~?9F&O?T(?UR$utm68~
zR1v{qd9b%g+RG79W5E-9Nw^{p0gLaV$LL#g7=63{<qjZkQ{pm?<}s2)Lyj!Xm@6Bi
z)K{e23C%Ly#TJ=?YR#lrJNMkdp1tzN`uCYRtyk!j*&$I=7Nn0^vSiMpeO24`eo(dJ
z!1XtFHhjEn`~K^dxUR(gMZ>Zx=7&a4oZCBWY(dZ9aZ@~dWQ?(Q8JKG65Fcrx3icB#
z{2dL&?q+&IjhM@~HDL6uxC~dyZb$Z-4@okM5e2dtQGg!HI8wxx#G3LX@d)ifo?^3%
z5V>_uQWy8a5$?eixnapGi$+bUUATV7l{c<jzqjW81MP<I9%?t=f2gf#mu+;u_dvS^
zvI&3F^K}m%YS&!*$Gz&UwHKC-npnLcJfX0_yLWbWSGTlOGwaAOsj`=cNaALtFLaP{
z46XPq18Xj0=mboGuQ3XUxWJ3U@ZI!TLLXzEagc?fET)^pA}vJSb=*K3&Dhb-UK6JW
zMb0f<_~wPm!zUiCY`vsif9(@(&E4;`yPiLPzUS%Fr~95fd7_iYk00;F^?o|zx*k%8
z>sq{5hmP9$-(P6AT)v@Q*LLaq<*PThE{uqonD6O3aFnBKOuUs{sJ~3*;~+3`HPsW?
z3t5I;dBDYaJ$ZnL8*0$Qjs{$jmqgFFmyJ*s=_@r)j<s<fJKC++oPyx!!t&kqt;@gs
z`iHe&exu#|<!$YbukSps`|9?iefREvzxV$A`*q)b`|a-Aw{O>e_0?B(IM+RV`0x;&
zaZUGk({sGH2k+N^bLUb0o%_#se|ukB^X)zD>O1#-SbE^#$vF`*Sra_{ho#zSVuBTB
zy_`i74|6?{ixF4krpE}}IgHT%6?Q;}$3dJUaFObXeeJ}`uwG_1{RcU@kIU^5QcylV
zuYTo)tB*H5daT{9)oRJZd%yqw`+AV6y>;u>j!!@Rbo2G=*VkUTa%J_!ix*d2x^!vv
zM<0E(4$tawUQgG!UybLh@ZNg7zXi`~s578vH}vg*-i`lyqOJP)lgFibMVqDt^cgkO
z*}Z?5nN^UxvBFQSCvp>WgdPSA9~~eLdj%ap$xTPx*?=o_ljs?F*^6XBK_H&)(PR9q
z$fN};x7L2J^^?!FyKmpsB9xyV0@wzCuKVn>&$eE>c5UtX^XHep^UgcvhYlT@vwQdM
z!aaNT6g4z7%xi9LUW9k{(HYls={}wp;Jvx@KH62G{c60k5&E`5Z_U5{^_23$im$%a
z&fk0RQeI?S?g$Uxv?z1y2u~xaAL<AXV??Hb4)dQL0+ie^#<@Zl6A<rWB=6nZ(k@|y
zyU&<834_Yl9e(Fd-G6<iZFu_hS>vNej~W5;0Ko3}@WT(+o<4ng$$<k0=4{xoVaC#>
zODE2nHEYzwi4)Tc3kx%sEnAjTQ&Us$`RAWE;yjbCaep*D$9tLdKH5!3`y%LB2z|?;
zcMbG!fSnD`o;_Rn#W&jdC(qx`PfDGY>ESap#?mgbyIAgz4)8(;c<2N7pGbmKNbp_t
zScXnw17mL+u_7=)Z5unhd#^ENgGMgdbngA{_kDUxd-U6T&yRoi-FHnGxBC&YThE?7
zTeWZBzS*l*t(uabpPxB$<j5i6;o(V+j*k6|jg2EhLPC<pj2SbmtgLL}&6_um;+%u)
z;dGy#(|hzj+NGiWDCn60eKVoA4En2JXASJFzyIL*N<={UmFwRZrVTI6^7bDVZ_y>v
zM=bAYWgzwtv-rpXd{<ge{LT(&PjD>0M!*xfScv5QzDmpJ!7iS|OA-f_Zfd*qpyBhc
zwM`g{r;wnI!z=qQU%tGyv9WRCx^?UF0D4SHN=mAyr)Qi%AP9%XAV^P$AFd;!qM}l!
zPMtdDpa1;lF`Tn-ol5ud+!xXd5=iaPJ{EcgLSF{-=0JZD>@0!3YS>*1`>W6ai{HKa
zU14HM!B`iMv^b?@xHs@x@I>w+mcWC@i2J@|N!(GV>)WxB;P@PYyHa4{=b=!CCA)YJ
zn-vjXu<>y7Cx?*DTfV*fv<(1GfWSVC&$aMQX=P>QM0hOS$Hyn3opd0?AL0k;4)KPB
zM?^#r`LSr*g7Y|Br{X@5r+0iH^nMRWFX#z{zF3L`=pO?+`LI`xwku(O{oVUd*L;0P
zyQJylCq;eZa>u%OrS(&&L*0Sfj3e|GFh)VNKzd2<Q=&k)bA_%FJ&}i_SQZ#<>y$h-
zEOy44^*hd!$6GKLpM~Mm0MKyZ!i9Bpb#-$~OH0QmB_$0~tJVFWB^VL_AreG}NOedD
z`SECfg3iAn-yswQ)SmPNL2qB^?+-f}us02MsRJkiHUZDtTer1KHtjrH6c&@4Y3tNK
z9Jn=lMt*XRaS#?pF&xG;`!_m(ye<yovJ72>2pdb0JgB$1ZG4uS@5p5ZbGPjK^ecG$
z-m`Paylr28`Q=;izy<&*L6RC58ylO7F&hOf<ZbdAf$vPFL%=m+(0?FL9rer3>ga^t
zloMbl3HGQ1@?d`vaI6KM&3EoUTMx%n7M5%*aQ7WH6u1LKijXcmaj+4~D1yhxNBjnP
zTAk^<?xipg_wbOZBU2naMwIr6oxbzGKYP^l{JHilvh4*Vo#PmL+Yo}~@WccF8q`jl
z#&+j0?<^g}`nHqL2Kke8rfa(2>78HefN<EO2*`x}0^nE*Jez=P8}P0D<nu=rp|MkQ
z9Xy8jm#L$?48$R39HUS}Mv5izukH(o0y!*^AH43<MJx{qGqaAK<kNfj+8uk&97T!R
zh6Hm7(@h()?p`Dx%t%Y84;(mfu&JqOG+K8M@9go;WICiX`BT3_zC(W50fDd=0lNcW
ze;jbk1)f#FwFCHeVx6#h*WR`TKE2b&scd2*jO3AyJmWAEmLx%sQBGm&c9mXu@V)f7
zB2PKi(4G=y#9#;Kg!yra8TF4I|8VNrGwnr$*L%pcjhJ@UBl{L+WMquAv$Kmu%Mgez
zn?qhiptE!)-}(~dNji5X4XHrbjfVXpz>y0)Gy_l}R0o{ffp=wm;_z7x&WULz%2<B`
zNnbTb(oeuhhj3m@o|dVGZhW4|!_r96yN}vFX|i|E;p_JuINpTP^861!{O~?{_Y?|_
zT7=soOg|Hmh5Msr7=)4%f%+xr7s($X-yt0lKph<d`|(su0MBgTS`B=4z_}NAx9&gK
zvJCih)DEf9B4vz*XA&)8B<VcHvf>5gDdY`3#Ck#xjm#oE*}*ftETrG0y3fCQ)Cy&n
z+P(gEYisLT6dnZ#yCIl{BGIxV!MzCVi{#Ic?+}VGng%KSQ-LQJxGI5fCvYAF-uf@T
zdb9!f=Q(&~4wG3X^x%mj)GToVUzgW@c2JfV`s;D|u5tsBub;VX^l0y(ac@p4Sl@_M
z)j5o%%jng!SFc{(hmvzKd0nH?B%&ovX*AAX1n@t}s~}H8b_0Qfyq^VJrNFltI1dBw
zkvrdMcTXx<_h$EyNx5qK0a5x!;SL;eKQW`o;{H_6=nh?BW3A6IbhQwf^a!<gNtzmw
zkhi7b*o_t>x(mppmr;iw$JDYFHTUfF^z>ovUhh1YzpT6}@*Upq3q0w-H52$&1LuC=
zJ$CnjwxQwJKQ>48FDmWomOfZ0iS}ZPqU4M`L+_{UblpLJ7&;4h0%tp8c|eTDJ$Y6_
z%Jf|y{^P;P2j6QiqL#jZW#$pAwyKd~^H7HmKr2dezt`&|uZlbg*$14EWZ=pLzNNsq
z2Y8zwKGMGZ!9O0>C8ZTsxp<8jW28t3<cXs#80k<x)4el!lVmoF?_#7Ua@Ck9g9kWv
zi<_4;a7;axk0<~2<oSE|?%kv5Z6B7Kl?btHM@PqawCWA{y<R7ImE_5OZ^8py6M%0K
zaP9`)<|j{{p9KDfq?EC1ySk-JH8x9*<eBudV@U=H8Hc7$Q=T!%8@iYn8oRs6Ecy<1
zaE&RSkdwC$iQ^Q;&wF2g{q;!{6FX5=m0{UAs=c83JxQ*!yh`#U{=gFrT$#XE3Y^=4
zw*|P{fdA-}+`?^+h-8UXYNEa@Uc)j;5i>SBJ571QKn_>nD&<RkJfxOU!!(|W6&p6~
zCh{kqJb7~d_U+rp-+lMpnjJfKlwsYSjW8RCu|^$0B`JY^X+hi6?Ck8UB}<m%V|<>Y
zGhNgD7rp;m0vyqVr?|LyQf+PRLXh7D^6vomS>SKlytQ_>qi5<o6YIf)3{B(RIFbPp
zM!l5#Z}OrrE?3|t<IDWLmG=Edbn{KEc<X2@kv|S4XHY&iUAlB>dqYD*#j<6~repn`
zfo13*cr3MD=<k=3oSdAj#ful`ZQHi3?29kHxJYNZru#2?|F;A<1_RHis;a7)hYufK
zij2R9oCVzH2>;v7ZS@|#MwTnOjv8*LO!DNI43IL)BCc-S>ke@;m&5mv3gm&_s;(&`
zyaPv6w4S-V2aQ`EKYrW>Wi20l^wF;7=H@qQYHDVem6c6FxQ>O4gN&!peOVz-Lq{2=
zrZ=GXDxK+??!V~$ml5EZhEAM|xqj7+8#fNzy?gf*a9;raQ)ka#-R~csy;!9gGlH+|
z@69$IAZL_iyq}X7_LK`0VczCW>BD_PvMSELdyUA`hQ-;34<DYnb?eqK6cI-es_)#q
zdGk2ND+#UVPeM+$OY3h5+MfI7n{O@>ad_tro#~qHzv%tn5VA>lP6FRK%<=Cb(_e<(
zt61i~PvkFL`shGV^pr|7=dmLNs)5}>Ucs1E=>40#ESt*~g-Hdb(O%}x8N<8-$1H^B
zYtgtFJ=h9>P4N6qc)ki=D*Bsxz7(Ec1JCb==UajMJtBYR{0IAchUY9XbIH!okvAD8
zXUwZQd0sx9#}P+M1*-nuN~f%J*B+zhA355(8;y^l7uzuA-^Q5VhB3boV}2UO*vP-x
zn9szR&u<^|_2|@-z<m+;TaPuj9q<UqTBOuW7|AzF_vT1ObRtjxs1|UM2xNS-R8OhH
z*dZF<QDy5k){^Im{AnmVhHSqD*?vB<{di>80qqqYW&7Wi@n2K6Per!RLAI|zwy#6B
zZv}3h=QnPt+pqD>D3>@)7|J&v>B*L5$r!7hoyc47<g!dgNc2_1JWL$2)9k%QmgM9X
z??Pi5^KDSp1f?~!YlHbTgXUEjrg^?&nfZI<b<FcIz%?59=C_ll`h+}xVp48VorBl#
z5)+4<G<~zt?kw3f31i#Xp6zMA>w1pElINQ6Of$QQY;sbqU56FL#1Gy^o=4(1hl;5c
zmD3(nP_(F_3NH>uslub><%<CQn!M@?FA#VVfh!02mI3E};5`T2mw^9xOnll7YuBMg
zqAoefJmolNmT9pu<Mcs$kwgD@YB`K)ftYJLQ6sdRoM_>co*x{Vu;Iaj2fDR9GU)kF
zKKbMzYUdTGp{G&U!)PDKAF1+Qb!{ICJSo7H4}7bD^C<9A$X^2fmXOf64VF%6Q^6~m
zYno$+AuiJK{fWF6E-c<OV#{;w43)Y4EH&eDLn245K6U2m(SJSBo}qm^jL#;lnl@wg
zRE$N`i1so6SFh><Xv_o8NLp<I-*(_U1-$P+d8$2o`s~%l;E41UR!$?c4V5`TY{hgd
z#&WGd$M+}l-Em>F*^sT6YsHgH4|4D*93MMq@rvRF+YjD*psVjMVh%n1;fEjAVQQjX
zoNTP4lVH4K-|j`={*$~a^12lra3llIB;cw9KKf309(XTfQPWyHf6M;p0VS38?o&tb
zOeXoV6?04(+gbx1-=E0);KJdc0V7|e;EHE@+k2G_iAvkBFm?3uT{pjc+=38#mv(Xh
z_AQ!AtE;PLw(sN+;J;!ghwRZ;ooL`l2cAOUS`U54fRo1hr7ymI)RdC3s3v0I8?)^^
z3KO{EDNc;M+=S_Rgx2%ztGXX|HQ0<(6OU1?6LTc9?UkC+X!nQ}(}Lp5s_XWjYJ{@3
zAAb1Z0<!4I_C36X<b59>pJafbvH!B0mn46dJlP?8VV<6z<n<ijSqxnDz;^~XuK@4a
zy$4Sm3W}Yz#H~;HSktaEdUH%>S}@8Ld`9yQ?c{XY%KEVbFz&bU*^0#~QI}F*bFU@o
zPCW}s5>v)+gTiJgynsaVF74i)K7D%4>eZ`fjl`i=t7-R^wzFR6?rn#35D$Ufc$m)w
zj$+{11YFI)r}H}Swj`xwZPN6}nPKKu94E5QcVf%tU^TZ<Pe=S`+gNnah3ye8W4_u*
z-=f^!*si><s_TStJpvLcTUuIZQ;^2~1&pcIk3asnzOk`!S!HGA)TE@OG|aP<{5tmY
zeyaoiD0$MW8|O5y!|u@X^784xu^e~~wU2eG=TDwEaiXqAK-@ethm64{U1s{|n-wS-
zRfPd#dys?nKOR3LPh-IK2Ak=!RiCX|s^G~>-NmY`1V`7XX)&?M8y`G)bd<u0GC#`Q
z78DcP5pD}gN=kB2Vy3i@|Cfn?KSKT|kJC7(k`{JzDcpf$H}JFp7kT|%;Cw44Ht9_#
z*YGT3ReFG)bh<TLQ7mMv*K!z_4>}S4<v|_baEQy8y(#3#%B_TEc>xyA<41V(%qTA|
zSw^*f)3ayK&LO<cBFyMp-KJf;c9mk>ji(NPM}GOq>P194lYf~nHk90S#L44CoU%LY
zE~KdqI8Ff172u+|y}7t#=?;&c>G_tL%ow36+leD7FkzGnd5mq%uMqDzoSN8-#b!OW
zyi#JQp66`pvM|oJd;XMw(4ouQ+S(4lzzM4Q+P~5s!o79W0r13x_OG-t&_YR&DnJ7M
z%PR0?$#;Y~%_d<q#-Tr*JPvycV7KPePd{w|j*IQf*H+xC4+tGH-_|>CsKU9#*U&uQ
zlr5dB&zQgYlE2maaqM##v*iMw*?cpR)m$HQO<sz3;N)3x117D%e&g057@|G0GcZhR
z`387kJwk9E#^7Wmq2b8FiS5IHqJVyEK%LML37yH)hss}mrR^Y11(Yt#p>F{6j)wjj
zuu}nhJ3+h&_AdhmW%t%=H*W2Z8<_iscTjGYxn^dN$g<d)r<yH**Z)1vU+QpqkHvIB
zW>hW~b0tN#iZ1zq?tybN`^3*KOBp%^<NpCgKr;-V1_1hHMgzv)W+b1*$i9fm{IQsS
z(@=mUa5x+yMcdrENC25ggl-y<2KjgBOxL*Iu_;RL^+CHxwC_*zI8A4i)uDeS?CgcT
z)=tDv6P}dx87sq+D{{U1EQvO?D|O&Xij9Du3mz{K?wt?vzGEYYF<)-Tk`~K^=F>D*
zF8O`kdghG|>^re!<d}kuUw-|N_V|t><W6GD9Y@kRjI6sI)6NQbrxb<9bb!vH4+^vv
zz~Up0asvHLdw^wSWm9k7ym^Aov<FA^IiB~UMGE~*B`exbgq|YkTLQgXp#KQ$oPj;s
zsnHSt{MN&UQR7P9>=QF<vS;w(7#q*U8j(e*l#wmcXVfeIz)w?&JV}?GTt-<e;F{(s
z4dvOcD%<QZ-;fzuu_?1khK`uJ`qr&mwAFP4$)*L__Bf`Sqwq>S3XUzPxR#^joR6A&
z7JX0vk#V%`jq~{B%a_y6O9|Sap&b}pQ%B+P#L+nC&>{ux=Aivj=-C2&hoJW)^uG@~
z*I<u`x1s(1VVT8MDVeJ#2gR<6Q)?=n4b2wGxaP}1yqe9}ANieL?>KbcNAk0*;xY0W
z0=DsZrARs2*|yunaNpqRBLc$4<;NzCS=w~`{8j*|hrER_JO;14jY{hXLV6EC*I<0E
z!)mLFJ}6+lJ-4>Dw*2tn!<8Ua4Kf#SUWMyrxW5?B7vQ}ryuSwR=qGK5pyvei(cauO
z=>G_Iu0l?}-F%@we!!%PkeIpI!Ex)NU3#r{7F)d`WhqvG_&Sv9Z~Z~y9S3y)Wq(x>
zkC9FgaHUxap)$i!)g`O9bN8G9!Ts`cB4bC-t*BVM5+2zCP<4<asIZQr#(o>*8nMbc
zh-Ky;th0Avyw*^CaP{idT{mvr*b73JY0nMUb+}&(sl$8peiPcAL3{d5z=zOx1A4DR
z-h-W{#fum3h)tee7L`(+=^auXVd1i-tJwNYDNnslA5|)wu{-c5iFX`+=m7e^FQ$1s
zMlzPqG0Bn|%0}5(I!*R=?^O`x;XigrcmJeG{o;nqJO0jzY5=89ph!3ZPtlJPDH@L5
zyLYb%9;B#v`}XbIEqCwUr4J%kXtNR5r*Qu?<P6>;FJDEwkI<e-UxQqR-nQe%PaKJk
zORw(UGi`=<Q1PIi(c6RVeYe>2)$2`I%B^~g<=)ry^K<%-KPvh^Gvf`|vI#~)RgRh5
zda9$^aas?1ue^S)-G>eh=pCAqn3y;Z<t0VJMu6Vg-Vq0pppJq}GYAuD+FhmHmiK6X
z9oH8jm+<@w?tR!!n8x)*=s5#@P0(8d{R>=uM`bzqE{w74w%kkQxY<(NWvda#qE?Tw
zKJc1|cO29K7E2KYGxabF@Hxgs5+lnJ3$t!ZUCkVG{48xlLp9yPQ~d+`PmGEiKC5u{
z(u&h(udMj??t}FpLfc|AEE*tGDj$cOgq()ZceOJR`pR<t&fN!XZD+5Xnl*dL+flLU
zyZr-`mO^i?rES<iGbdD?UfZ3G?P}y~`E~)LI>2RYn_p3w|JFezuw6ZiQLjQ7yh>l+
za<xEcT`d!sFSHaW^PJ?i`918qmqhvYoj<VOpo&q+>9Z%q#1EMc&&|!t%d6b9Y168U
z7cXw5G5)~^AMC~XAg&v6|1CT}i1+sNi%Z>+kUDLBWdGvj-9rmz+j`}Xk=ss<5h(LL
z1?nnGk?nR9{Vx0USyq^i?c4sBh<84^VUa+yfpsIMLjW<Y6|oh&6h`*jZPY%yTs@<9
z`9=+`3yw;u3hf>+q_3m1Z(=u(UPC>*2aoF&7(F92BB8Wzbn>FGi1^BYz^G-O-2)eO
z^XNIx(YgC9Prrm|Au)xMLXuXD?G~~k#oTjckdf_bSGHoaily8mWK>6ZOqW(R<MRGr
zK)mCiD9~JIG4@y3jO_&;V|~I<-|j6VvF3nO<-SYh;Jek*&a28sVV`R+Qm4B}ZHD;D
z?FNOYx(<p}I}J)TcS=cDI}OZGIV5K&Y?Fq|tP|73W-$p0o1u}`F4IG-yUp`cI4yBD
zvR`ARXS3aeu{>nR*tBwC?=K|%%Y&vwuX}8!+ouS_D?G;HoIYdPV#t!z^I6i3LXPqc
zG1q*)Oy8>5jBhj3R$w#5RcMp#Ewmo%2k9lS$_n6Hjq}$xAM4FC&356)Cfl*a1(s~_
zLOCN{W6Y@b@R=?r^%<9sIgID+zY+1y2Ym?epe?a)P+i^RFxFQ%jO7VPJ%_Q_$YraS
z7;@EfL_G666P{|aoTnVGgs6C`Y$aEfqhOm(ld?<;jTz-4A){Ptz?knt7C!|~U*_oa
z>OM65-4BWcI%rsU>pBF(<8vg+_t=aTR*dQzB+E@a#%!&gPE^%;jC!XYW7EiEy0#Og
zcGRA9b?Ey)f4GB)+s}lp6S_~G<O%VDyml`$%>MwG^ZCvhQu%lQ0000<MNUMnLSTZ5
Cnc(sO

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/cursortrail.png b/osu.Game.Rulesets.Osu.Tests/Resources/old-skin/cursortrail.png
new file mode 100755
index 0000000000000000000000000000000000000000..f3327dc92ffd234f28faba3e4b4dc28dbc9d1b35
GIT binary patch
literal 3763
zcmV;k4ovZhP)<h;3K|Lk000e1NJLTq001)p001)x1^@s6I-xKs00004XF*Lt006O$
zeEU(80000WV@Og>004&%004{+008|`004nN004b?008NW002DY000@xb3BE2000U(
zX+uL$P-t&-Z*ypGa3D!TLm+T+Z)Rz1WdHz3$DNjUR8-d%htIutdZEoQ0#b(FyTAa_
zdy`&8VVD_UC<6{NG_fI~0ue<-nj%P0#DLLIBvwSR5EN9f2P6n6F&ITuEN@2Ei>|D^
z_ww@l<E(G(v-i3C?7h!g7XXr{FPE1FO97C|6YzsPoaqsfQFQD8fB_z0fGGe>Rz|vC
zuzLs)$;-`!o*{AqUjza0dRV*yaMRE;fKCVhpQKsoe1Yhg01=zBIT<Vw7l=3|OOP(M
z&x)8Dmn>!&C1$=TK@rP|Ibo3vKKm@PqnO#LJhq6%Ij6Hz*<$V$@wQAMN5qJ)hzm2h
zoGcOF60t^#FqJFfH{#e-4l@G)6iI9sa9D{VHW4w29}?su;^hF~NC{tY+*d5%WDCTX
za!E_i;d2ub1#}&jF5T4HnnCyEWTkKf0>c0%E1Ah>(_PY1)0w;+02c53Su*0<(nUqK
zG_|(0G&D0Z{i;y^b@OjZ+}lNZ8Th$p5Uu}<?XUdO8USF-iE6X+i!H7SfX*!d$ld#5
z(>MTtq^NHl*T1?CO*}7&0ztZsv2j*bmJyf3G7=Z`5B*PvzoD<bXCyxEkMhu6Iq^(k
zihwSz8!Ig(O~|Kbq%&C@y5XOP_#X%Ubsh#moOlkO!xKe>iKdLpOAxi2$L0#SX*@cY
z_n(^h55xYX#km%V()bZjV~l{*bt*u9?FT3d5g^g~#a;iSZ@&02Abxq_DwB(I|L-^b
zXThc7C4-yrInE_0gw7K3GZ**7&k~>k0Z0NWkO#^@9q0f<U<Ry!EpP;Gz#I635D*Dg
z0~SaGseli%Kpxlx3PCa03HE?$PzM@8GiU|JK_@r`&Vx(f8n^*&gZp3<On_%#7Q6-v
z5CmZ%GDLyoAr(jy(ud3-24oMpLB3EB6bZ#b2@nqwLV3_;s2D1Ps-b$Q8TuYN37v<o
zK!ea-XbhT$euv({2uy;huoA2V8^a9P3HE_Q;8kz}yavvN3*a4aCENfXg*)K$@HO~0
zJPJR9=MaDp5gMY37$OYB1@T9ska&cTtVfEF3ZwyPMY@qb<R&tT%ph-37!(CXM;W4Q
zQJ$z!6brQmwH{T1szx0~b)b4tH&J7#S=2`~8Lf!cN86yi&=KeabQZc0U4d>wx1%qj
zZ=)yBuQ3=54Wo^*!gyjLF-e%Um=erBOdIALW)L%unZshS@>qSW9o8Sq#0s#5*edK%
z>{;v(b^`kbN5rY%%y90wC>#%$kE_5P!JWYk;U;klcqzOl-UjcFXXA75rT9jCH~u<)
z0>40zCTJ7v2qA<d!X`o`p_Oov@PP1=NF=Het%-p|E^#BVl6Z`GnK(v#OOhe!kz7d8
zBq3=B=@980=`QIdnM~FqJCdWw0`d-WGx-Af5&4Y-MZ!qJOM)%2L83;YLt;qcxg=gv
zQ_@LtwPdbjh2#mz>yk54cquI@7b&LHdZ`+zlTss6bJ7%PQ)z$cROu4wBhpu-r)01)
zS~6}jY?%U?gEALn#wiFzo#H}aQ8rT=DHkadR18&{>P1bW7E`~Y4p3)hWn`DhhRJ5j
z*2tcg9i<^OEt(fCg;q*CP8+7ZTcWhYX$fb^_9d-LhL+6BEtPYW<H!}swaML<dnZqq
zcau++-zDEE|4;#?pr;V1kfpF+;iAIKQtDFMrL3hzOOG$TrwA+RDF!L7RXnKJuQ;cq
ztmL7Tu2iLTL1{*rrtGMkq+G6iMtNF=qGGSYRVi0FtMZgCOLwBD&@1V^^jTF!RZmr+
zYQ5@!>VlfKTBusSTASKKb%HuWJzl+By+?gkLq)?+BTu76<DMp7lcAZYxmUAKb6!hZ
zD_m=<R;SjKww$(?cCL1d_5&TVj)Tq`od%s-x)@!CZnEw^-5Ywao`qhbUX9*$eOTX8
zpR2!5f6xGJU~RxNXfPNtBpEsxW*W8_jv3L6e2wyrI*pziYZylv?=tQ){%B%hl48<m
za^F<O)Y~-QwA=J|Gd(kwS&i8(bF#U+`3CbY^B2qXmvNTuUv|fWV&P}8)uPAZgQb-v
z-?G(m+DgMJ)~eQOgh6ElFiIGgt<l!b)*Gx(S--Whv=P`GxB1Q1&^Foji0#yJ?d6>1
zjmyXF)a;mc^>(B7bo*HQ1NNg1st!zt28YLv>W*y3CdWx9U8f|cqfXDAO`Q48?auQq
zHZJR2&bcD49<D{M18y>Ip>EY~kKEPV6Wm+eXFV)D)_R=tM0@&p?(!V*Qu1PXHG9o^
zTY0bZ?)4%01p8F`JoeS|<@<K~!G7L;yZs)l&|JY=(diHTz5I9kKMc?gSQGGLASN&%
zuqN<HkZDj}P+u@5I41Z=@aqugkkXL*p*o?$(4H{Ku;{Snu=#M;@UrmH2;+!#5!WIW
zBDs-WQP`-ksHUj7m2NBdtel9ph%SsCUZuS%d)1ZI3ae9ApN^4?VaA+@MaPE69*KR=
z^k+6O=i<ELYU5^EF08$*XKY7yIeVI8$0_4X#@of0#ZM*JCG1X^PIO4DNSxuiaI3j5
zl01{@lID~BlMf|-N(oPCOU0$erk>=<@RE7GY07EYX@lwd>4oW|Yi!o+Su@M`;WuSK
z8LKk71XR(_RKHM1xJ5XYX`fk>`6eqY>qNG6HZQwBM=xi4&Sb88?zd}EYguc1@>KIS
z<&CX#T35dwS|7K*XM_5Nf(;WJJvJWRMA($P>8E^?{IdL4o5MGE7bq2MEEwP7v8AO@
zqL5!WvekBL-8R%V?zVyL=G&{be=K4bT`e{#t|)$A!YaA?jp;X)-+bB;zhj`(vULAW
z%ue3U;av{94wp%n<(7@__S@Z2PA@Mif3+uO&y|X06?J<Fdxd*PD}5`wsx+#0R=uxI
ztiE02T+>#oSi8M;ejj_^(0<4Lt#wLu#dYrva1Y$6_o(k^&}yhSh&h;f@JVA>W8b%o
zZ=0JGnu?n~9O4}sJsfnnx7n(>`H13?(iXTy*fM=I`sj`CT)*pTHEgYKqqP+u1IL8N
zo_-(u{qS+0<2@%BCt82d{Gqm;(q7a7b>wu+b|!X?c13m#p7cK1({0<`{-e>4hfb-U
zsyQuty7Ua;Ou?B?XLHZaol8GAb3Wnxcu!2v{R<HnZuJKC4qWuPc=?k1r3-ydeP=J*
zT|RZi=E}*djH{j3EU$I+TlBa8Wbsq`faO5Pb*t-LH>_`T4=x`(GvqLI{-*2AOSimk
zUAw*F_TX^n@STz9k<mNsJ5zU4?!LH}d2iwV#s}yJMGvJORy<OC)bO+J&uycYqo>DQ
z$NC=!KfXWC8h`dn#xL(D3Z9UkR7|Q&Hcy#Notk!^zVUSB(}`#4&lYA1f0h2V_PNgU
zAAWQEt$#LRcH#y9#i!p(Udq2b^lI6wp1FXzN3T;~FU%Lck$-deE#qz9yYP3D3t8{6
z?<+s(e(3(_^YOu_)K8!O1p}D#{JO;G(*OVf32;bRa{vGf5dZ)S5dnW>Uy%R+02p*d
zSaefwW^{L9a%BK;VQFr3E^cLXAT%y8E;js(W8VM(1Hef{K~!i%-I`5n6hRb4gNq>I
zLb5PO2;xpeL=i#Uh=?MJD58j>h~oeM3uB#-H{5=?^}2eJAoSuurn>6YJyV(LkD0yA
zW^)<rH*PeJ4779HjXM{%aR;t6ZZ_^Wo;O|%KtK93j`6PUB5dOV4jYdeFB=4Wy#tJ6
zJawq&<{82^4#1>O8&2TO0`geuQFkXP+gNbD@wkyCG~n9>=s2xM{U;6Pb2%)wu>&98
z7Y!BZ3A`I1kI7QZ!+gx^@|?joCirmPZOln%(Dwsqf34%Bn16PYu#Ex*9yThGp1_BK
z+&4=(A##*Lwo!P{$Rd@53;t1X$924uQX%rVoF~}EQ|>e>5e=c?G(3C~@-ZE!^(rB9
zxx8H&PGs!;b0SVa!_T4PvQ$rqT;w~G`%FXQT7z9=sYnF;ynrk<DnveVPO?v4oWlMd
z|6Y|yPvXl0Dyd3{eB_*DpS);r=2el984=NtUkA|sqe77>geF%CD#Et+tU*Uzl}aSu
zSts$WK>MjsNX-dFM)GdAYn92X!a$XwaLDvTa_H}d+@}(XIaNl5Caa?|TyuqSwJJ;$
zGEPK;|1jwBo>0s&vO46R$Xsp2R@_?^3hSy=B2FSRA{290t3z(`Z)J`f`CqKJDwT+a
z{aK*>Mue)>AvgKAGF<m?z{ya^$@D~W@LxhcRtaU95Xv$@{;dqRuqu*es#PIK$Y@ZN
z$Y{Ti38A^w2^ke4|A`C_7nc5uF`>%DJDf#+8?sQ0RhbZSGAa}@<ljf;;Pi!)p+HZD
ziB+Z&`IBBdp^yn7Clf+W<^UOYei@bNt%^!yR7ho1Xcw77WVkJ@WI|*_Cf@NZ^H=^>
znGl+jQK6p95i-@bd>$DU2~_B!WsX<3GOPN`tZFw~)p-V1a|Hmax;9(YRr9LuXJ9pV
zny{*80IPaB19^2ughDDpWvL$8KO{y(LWZ2T8r%FT60GKlCh!b5cD6a8N@@frF((4#
z8+z6ZdL_L?NTo*5aib#SvR@6JX%O63e@;lHvKaKjgO1aBl?b_9-cp8Lg74-lp-L*~
zg%5Om)a;3nXS;i4Y@@(Hu6wf3oD{g=LGJ4$7KwmuOi<unqY_dnC+5)pTE~ene<=dC
zu>&7Ec9A(L(4al?7$?De_QUS5jRpK-LeE24%86CzIITy0=DD<AXegX{xs=FKpaJK|
zW2r~o$(el=+qeKGjo;EZu@Pb{b#{^nY~v1aKXJRk&c`im1gxMR{TX+1KXP7d;|1^^
dehIkQ`v-C6z^9!k@m2r;002ovPDHLkV1fku2=D*^

literal 0
HcmV?d00001


From 367dafab56d3ea77804b95e42f41332d991f0603 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 14 Apr 2021 08:20:18 +0300
Subject: [PATCH 2443/3722] Apply `CursorCentre` to old-style legacy cursor
 trail

---
 .../Skinning/Legacy/LegacyCursorTrail.cs      | 12 ++++++++-
 .../UI/Cursor/CursorTrail.cs                  | 25 ++++++++++++++++---
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursorTrail.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursorTrail.cs
index af9ea99232..0025576325 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursorTrail.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyCursorTrail.cs
@@ -26,7 +26,17 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             Texture = skin.GetTexture("cursortrail");
             disjointTrail = skin.GetTexture("cursormiddle") == null;
 
-            Blending = !disjointTrail ? BlendingParameters.Additive : BlendingParameters.Inherit;
+            if (disjointTrail)
+            {
+                bool centre = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.CursorCentre)?.Value ?? true;
+
+                TrailOrigin = centre ? Anchor.Centre : Anchor.TopLeft;
+                Blending = BlendingParameters.Inherit;
+            }
+            else
+            {
+                Blending = BlendingParameters.Additive;
+            }
 
             if (Texture != null)
             {
diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs b/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
index 0b30c28b8d..b55575696e 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
@@ -5,6 +5,7 @@ using System;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Batches;
 using osu.Framework.Graphics.OpenGL.Vertices;
@@ -31,6 +32,8 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
         private double timeOffset;
         private float time;
 
+        protected Anchor TrailOrigin = Anchor.Centre;
+
         public CursorTrail()
         {
             // as we are currently very dependent on having a running clock, let's make our own clock for the time being.
@@ -197,6 +200,8 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
             private readonly TrailPart[] parts = new TrailPart[max_sprites];
             private Vector2 size;
 
+            private Vector2 originPosition;
+
             private readonly QuadBatch<TexturedTrailVertex> vertexBatch = new QuadBatch<TexturedTrailVertex>(max_sprites, 1);
 
             public TrailDrawNode(CursorTrail source)
@@ -213,6 +218,18 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                 size = Source.partSize;
                 time = Source.time;
 
+                originPosition = Vector2.Zero;
+
+                if (Source.TrailOrigin.HasFlagFast(Anchor.x1))
+                    originPosition.X = 0.5f;
+                else if (Source.TrailOrigin.HasFlagFast(Anchor.x2))
+                    originPosition.X = 1f;
+
+                if (Source.TrailOrigin.HasFlagFast(Anchor.y1))
+                    originPosition.Y = 0.5f;
+                else if (Source.TrailOrigin.HasFlagFast(Anchor.y2))
+                    originPosition.Y = 1f;
+
                 Source.parts.CopyTo(parts, 0);
             }
 
@@ -237,7 +254,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
 
                     vertexBatch.Add(new TexturedTrailVertex
                     {
-                        Position = new Vector2(part.Position.X - size.X / 2, part.Position.Y + size.Y / 2),
+                        Position = new Vector2(part.Position.X - size.X * originPosition.X, part.Position.Y + size.Y * (1 - originPosition.Y)),
                         TexturePosition = textureRect.BottomLeft,
                         TextureRect = new Vector4(0, 0, 1, 1),
                         Colour = DrawColourInfo.Colour.BottomLeft.Linear,
@@ -246,7 +263,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
 
                     vertexBatch.Add(new TexturedTrailVertex
                     {
-                        Position = new Vector2(part.Position.X + size.X / 2, part.Position.Y + size.Y / 2),
+                        Position = new Vector2(part.Position.X + size.X * (1 - originPosition.X), part.Position.Y + size.Y * (1 - originPosition.Y)),
                         TexturePosition = textureRect.BottomRight,
                         TextureRect = new Vector4(0, 0, 1, 1),
                         Colour = DrawColourInfo.Colour.BottomRight.Linear,
@@ -255,7 +272,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
 
                     vertexBatch.Add(new TexturedTrailVertex
                     {
-                        Position = new Vector2(part.Position.X + size.X / 2, part.Position.Y - size.Y / 2),
+                        Position = new Vector2(part.Position.X + size.X * (1 - originPosition.X), part.Position.Y - size.Y * originPosition.Y),
                         TexturePosition = textureRect.TopRight,
                         TextureRect = new Vector4(0, 0, 1, 1),
                         Colour = DrawColourInfo.Colour.TopRight.Linear,
@@ -264,7 +281,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
 
                     vertexBatch.Add(new TexturedTrailVertex
                     {
-                        Position = new Vector2(part.Position.X - size.X / 2, part.Position.Y - size.Y / 2),
+                        Position = new Vector2(part.Position.X - size.X * originPosition.X, part.Position.Y - size.Y * originPosition.Y),
                         TexturePosition = textureRect.TopLeft,
                         TextureRect = new Vector4(0, 0, 1, 1),
                         Colour = DrawColourInfo.Colour.TopLeft.Linear,

From 6044083cf71405f9fa0a67b0d105e32ef15861d9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 14:25:16 +0900
Subject: [PATCH 2444/3722] Speed up the fade of the HUD a touch

---
 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 31b49dfbe9..669c920017 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -24,9 +24,9 @@ namespace osu.Game.Screens.Play
     [Cached]
     public class HUDOverlay : Container, IKeyBindingHandler<GlobalAction>
     {
-        public const float FADE_DURATION = 400;
+        public const float FADE_DURATION = 300;
 
-        public const Easing FADE_EASING = Easing.Out;
+        public const Easing FADE_EASING = Easing.OutQuint;
 
         /// <summary>
         /// The total height of all the top of screen scoring elements.

From b7d2821b5514f0b3e4b76064696354a0f56ae48a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 14:51:52 +0900
Subject: [PATCH 2445/3722] Display the centre marker above the waveform

Gives it a bit more visibility. This is where it was meant to sit, but
didn't consider using a proxy drawable to make it work previously.
---
 .../Edit/Compose/Components/Timeline/Timeline.cs      | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 86a30b7e2d..aa5cc46e37 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -74,13 +74,18 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [BackgroundDependencyLoader]
         private void load(IBindable<WorkingBeatmap> beatmap, OsuColour colours, OsuConfigManager config)
         {
+            CentreMarker centreMarker;
+
+            // We don't want the centre marker to scroll
+            AddInternal(centreMarker = new CentreMarker());
+
             AddRange(new Drawable[]
             {
                 new Container
                 {
                     RelativeSizeAxes = Axes.Both,
                     Depth = float.MaxValue,
-                    Children = new Drawable[]
+                    Children = new[]
                     {
                         waveform = new WaveformGraph
                         {
@@ -90,6 +95,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                             MidColour = colours.BlueDark,
                             HighColour = colours.BlueDarker,
                         },
+                        centreMarker.CreateProxy(),
                         ticks = new TimelineTickDisplay(),
                         controlPoints = new TimelineControlPointDisplay(),
                         new Box
@@ -104,9 +110,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 },
             });
 
-            // We don't want the centre marker to scroll
-            AddInternal(new CentreMarker { Depth = float.MaxValue });
-
             waveformOpacity = config.GetBindable<float>(OsuSetting.EditorWaveformOpacity);
             waveformOpacity.BindValueChanged(_ => updateWaveformOpacity(), true);
 

From e543db9bee68f8d733b62f24a4c4ad8f1c046e8f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 14:56:27 +0900
Subject: [PATCH 2446/3722] Use additive blending for background box

Doesn't make a huge difference but this was intended.
---
 .../Compose/Components/Timeline/TimelineBlueprintContainer.cs    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index 7427473a35..7a3781a981 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -65,6 +65,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             {
                 Colour = Color4.Black,
                 Depth = float.MaxValue,
+                Blending = BlendingParameters.Additive,
             });
         }
 

From 4538e4b50357ea2b0d4f113e55b6fa3d491c32f2 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 14 Apr 2021 08:58:25 +0300
Subject: [PATCH 2447/3722] Remove wrong assert

---
 osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
index ed44bc7309..9a77292aff 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
@@ -93,7 +93,6 @@ namespace osu.Game.Rulesets.Osu.Tests
         public void TestTopLeftOrigin()
         {
             AddStep("load content", () => loadContent(false, () => new SkinProvidingContainer(new TopLeftCursorSkin())));
-            AddAssert("cursor top left", () => lastContainer.ActiveCursor.Origin == Anchor.TopLeft);
         }
 
         private void loadContent(bool automated = true, Func<SkinProvidingContainer> skinProvider = null)

From a2094159421cc98d47b4af23a53ae8c4358091fe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 16:52:29 +0900
Subject: [PATCH 2448/3722] Add "Barrel Roll" mod

---
 .../Mods/OsuModBarrelRoll.cs                  | 30 +++++++++++++++++++
 osu.Game.Rulesets.Osu/OsuRuleset.cs           |  1 +
 osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs      |  3 ++
 3 files changed, 34 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
new file mode 100644
index 0000000000..1ba6c47f4c
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.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 osu.Framework.Bindables;
+using osu.Game.Configuration;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.Osu.Mods
+{
+    public class OsuModBarrelRoll : Mod, IUpdatableByPlayfield
+    {
+        [SettingSource("Roll speed", "Speed at which things rotate")]
+        public BindableNumber<double> SpinSpeed { get; } = new BindableDouble(1)
+        {
+            MinValue = 0.1,
+            MaxValue = 20,
+            Precision = 0.1,
+        };
+
+        public override string Name => "Barrel Roll";
+        public override string Acronym => "BR";
+        public override double ScoreMultiplier => 1;
+
+        public void Update(Playfield playfield)
+        {
+            playfield.Rotation = (float)(playfield.Time.Current / 1000 * SpinSpeed.Value);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index d6375fa6e3..465d6d7155 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -185,6 +185,7 @@ namespace osu.Game.Rulesets.Osu
                         new MultiMod(new OsuModGrow(), new OsuModDeflate()),
                         new MultiMod(new ModWindUp(), new ModWindDown()),
                         new OsuModTraceable(),
+                        new OsuModBarrelRoll(),
                     };
 
                 case ModType.System:
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index b1069149f3..ea3eb5eb5c 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -42,6 +42,9 @@ namespace osu.Game.Rulesets.Osu.UI
 
         public OsuPlayfield()
         {
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+
             InternalChildren = new Drawable[]
             {
                 playfieldBorder = new PlayfieldBorder { RelativeSizeAxes = Axes.Both },

From 1aa36818df11577979863233dd0a149de582504b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 14 Apr 2021 17:47:11 +0900
Subject: [PATCH 2449/3722] Abstractify GameplayClockContainer

---
 .../TestSceneSpinnerRotation.cs               |   3 +-
 .../TestSceneGameplayClockContainer.cs        |   2 +-
 .../Gameplay/TestSceneStoryboardSamples.cs    |   4 +-
 .../Visual/Gameplay/TestSceneSkipOverlay.cs   |   4 +-
 .../Screens/Play/GameplayClockContainer.cs    | 277 +++++++++---------
 osu.Game/Screens/Play/Player.cs               |  11 +-
 osu.Game/Screens/Play/SkipOverlay.cs          |   2 +-
 osu.Game/Screens/Play/SpectatorPlayer.cs      |   2 +-
 8 files changed, 156 insertions(+), 149 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
index 14c709cae1..8ff21057b5 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
@@ -21,6 +21,7 @@ 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.Storyboards;
 using osu.Game.Tests.Visual;
 using osuTK;
@@ -193,7 +194,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             addSeekStep(0);
 
-            AddStep("adjust track rate", () => Player.GameplayClockContainer.UserPlaybackRate.Value = rate);
+            AddStep("adjust track rate", () => ((MasterGameplayClockContainer)Player.GameplayClockContainer).UserPlaybackRate.Value = rate);
 
             addSeekStep(1000);
             AddAssert("progress almost same", () => Precision.AlmostEquals(expectedProgress, drawableSpinner.Progress, 0.05));
diff --git a/osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs b/osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs
index 891537c4ad..4d5dcabbba 100644
--- a/osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Tests.Gameplay
                 var working = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
                 working.LoadTrack();
 
-                Add(gcc = new GameplayClockContainer(working, 0));
+                Add(gcc = new MasterGameplayClockContainer(working, 0));
             });
 
             AddStep("start track", () => gcc.Start());
diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index cae5f20332..7394458482 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Tests.Gameplay
                 var working = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
                 working.LoadTrack();
 
-                Add(gameplayContainer = new GameplayClockContainer(working, 0));
+                Add(gameplayContainer = new MasterGameplayClockContainer(working, 0));
 
                 gameplayContainer.Add(sample = new DrawableStoryboardSample(new StoryboardSampleInfo(string.Empty, 0, 1))
                 {
@@ -114,7 +114,7 @@ namespace osu.Game.Tests.Gameplay
 
                 var beatmapSkinSourceContainer = new BeatmapSkinProvidingContainer(Beatmap.Value.Skin);
 
-                Add(gameplayContainer = new GameplayClockContainer(Beatmap.Value, 0)
+                Add(gameplayContainer = new MasterGameplayClockContainer(Beatmap.Value, 0)
                 {
                     Child = beatmapSkinSourceContainer
                 });
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs
index 841722a8f1..e08e03b789 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             var working = CreateWorkingBeatmap(CreateBeatmap(new OsuRuleset().RulesetInfo));
             working.LoadTrack();
 
-            Child = gameplayClockContainer = new GameplayClockContainer(working, 0)
+            Child = gameplayClockContainer = new MasterGameplayClockContainer(working, 0)
             {
                 RelativeSizeAxes = Axes.Both,
                 Children = new Drawable[]
@@ -80,7 +80,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("move mouse", () => InputManager.MoveMouseTo(skip.ScreenSpaceDrawQuad.Centre));
             AddStep("click", () =>
             {
-                increment = skip_time - gameplayClock.CurrentTime - GameplayClockContainer.MINIMUM_SKIP_TIME / 2;
+                increment = skip_time - gameplayClock.CurrentTime - MasterGameplayClockContainer.MINIMUM_SKIP_TIME / 2;
                 InputManager.Click(MouseButton.Left);
             });
             AddStep("click", () => InputManager.Click(MouseButton.Left));
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index ddbb087962..163ed9444f 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -3,9 +3,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using System.Threading.Tasks;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
@@ -19,27 +17,90 @@ using osu.Game.Configuration;
 
 namespace osu.Game.Screens.Play
 {
-    /// <summary>
-    /// Encapsulates gameplay timing logic and provides a <see cref="Play.GameplayClock"/> for children.
-    /// </summary>
-    public class GameplayClockContainer : Container
+    public abstract class GameplayClockContainer : Container
     {
-        private readonly WorkingBeatmap beatmap;
-
-        [NotNull]
-        private ITrack track;
+        /// <summary>
+        /// The final clock which is exposed to underlying components.
+        /// </summary>
+        public GameplayClock GameplayClock { get; private set; }
 
         public readonly BindableBool IsPaused = new BindableBool();
 
         /// <summary>
         /// The decoupled clock used for gameplay. Should be used for seeks and clock control.
         /// </summary>
-        private readonly DecoupleableInterpolatingFramedClock adjustableClock;
+        protected readonly DecoupleableInterpolatingFramedClock AdjustableClock;
 
-        private readonly double gameplayStartTime;
-        private readonly bool startAtGameplayStart;
+        protected readonly IClock SourceClock;
 
-        private readonly double firstHitObjectTime;
+        protected GameplayClockContainer(IClock sourceClock)
+        {
+            SourceClock = sourceClock;
+
+            RelativeSizeAxes = Axes.Both;
+
+            AdjustableClock = new DecoupleableInterpolatingFramedClock { IsCoupled = false };
+            AdjustableClock.ChangeSource(SourceClock);
+
+            IsPaused.BindValueChanged(OnPauseChanged);
+        }
+
+        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
+        {
+            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+
+            dependencies.CacheAs(GameplayClock = CreateGameplayClock(AdjustableClock));
+
+            return dependencies;
+        }
+
+        public virtual void Start()
+        {
+            if (!AdjustableClock.IsRunning)
+            {
+                // Seeking the decoupled clock to its current time ensures that its source clock will be seeked to the same time
+                // This accounts for the clock source potentially taking time to enter a completely stopped state
+                Seek(GameplayClock.CurrentTime);
+
+                AdjustableClock.Start();
+            }
+
+            IsPaused.Value = false;
+        }
+
+        /// <summary>
+        /// Seek to a specific time in gameplay.
+        /// <remarks>
+        /// Adjusts for any offsets which have been applied (so the seek may not be the expected point in time on the underlying audio track).
+        /// </remarks>
+        /// </summary>
+        /// <param name="time">The destination time to seek to.</param>
+        public virtual void Seek(double time) => AdjustableClock.Seek(time);
+
+        public virtual void Stop() => IsPaused.Value = true;
+
+        public virtual void Restart()
+        {
+            AdjustableClock.Seek(0);
+            AdjustableClock.Stop();
+
+            if (!IsPaused.Value)
+                Start();
+        }
+
+        protected abstract void OnPauseChanged(ValueChangedEvent<bool> isPaused);
+
+        protected abstract GameplayClock CreateGameplayClock(IClock source);
+    }
+
+    public class MasterGameplayClockContainer : GameplayClockContainer
+    {
+        /// <summary>
+        /// Duration before gameplay start time required before skip button displays.
+        /// </summary>
+        public const double MINIMUM_SKIP_TIME = 1000;
+
+        protected new DecoupleableInterpolatingFramedClock SourceClock => (DecoupleableInterpolatingFramedClock)base.SourceClock;
 
         public readonly BindableNumber<double> UserPlaybackRate = new BindableDouble(1)
         {
@@ -49,73 +110,32 @@ namespace osu.Game.Screens.Play
             Precision = 0.1,
         };
 
-        /// <summary>
-        /// The final clock which is exposed to underlying components.
-        /// </summary>
-        public GameplayClock GameplayClock => localGameplayClock;
+        private double totalOffset => userOffsetClock.Offset + platformOffsetClock.Offset;
 
-        [Cached(typeof(GameplayClock))]
-        private readonly LocalGameplayClock localGameplayClock;
+        private readonly BindableDouble pauseFreqAdjust = new BindableDouble(1);
 
+        private readonly WorkingBeatmap beatmap;
+        private readonly double gameplayStartTime;
+        private readonly bool startAtGameplayStart;
+        private readonly double firstHitObjectTime;
+
+        private FramedOffsetClock userOffsetClock;
+        private FramedOffsetClock platformOffsetClock;
+        private LocalGameplayClock localGameplayClock;
         private Bindable<double> userAudioOffset;
 
-        private readonly FramedOffsetClock userOffsetClock;
-
-        private readonly FramedOffsetClock platformOffsetClock;
-
-        /// <summary>
-        /// Creates a new <see cref="GameplayClockContainer"/>.
-        /// </summary>
-        /// <param name="beatmap">The beatmap being played.</param>
-        /// <param name="gameplayStartTime">The suggested time to start gameplay at.</param>
-        /// <param name="startAtGameplayStart">
-        /// Whether <paramref name="gameplayStartTime"/> should be used regardless of when storyboard events and hitobjects are supposed to start.
-        /// </param>
-        public GameplayClockContainer(WorkingBeatmap beatmap, double gameplayStartTime, bool startAtGameplayStart = false)
+        public MasterGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStartTime, bool startAtGameplayStart = false)
+            : base(new DecoupleableInterpolatingFramedClock())
         {
             this.beatmap = beatmap;
             this.gameplayStartTime = gameplayStartTime;
             this.startAtGameplayStart = startAtGameplayStart;
-            track = beatmap.Track;
 
             firstHitObjectTime = beatmap.Beatmap.HitObjects.First().StartTime;
 
-            RelativeSizeAxes = Axes.Both;
-
-            adjustableClock = new DecoupleableInterpolatingFramedClock { IsCoupled = false };
-
-            // Lazer's audio timings in general doesn't match stable. This is the result of user testing, albeit limited.
-            // This only seems to be required on windows. We need to eventually figure out why, with a bit of luck.
-            platformOffsetClock = new HardwareCorrectionOffsetClock(adjustableClock) { Offset = RuntimeInfo.OS == RuntimeInfo.Platform.Windows ? 15 : 0 };
-
-            // the final usable gameplay clock with user-set offsets applied.
-            userOffsetClock = new HardwareCorrectionOffsetClock(platformOffsetClock);
-
-            // the clock to be exposed via DI to children.
-            localGameplayClock = new LocalGameplayClock(userOffsetClock);
-
-            GameplayClock.IsPaused.BindTo(IsPaused);
-
-            IsPaused.BindValueChanged(onPauseChanged);
+            SourceClock.ChangeSource(beatmap.Track);
         }
 
-        private void onPauseChanged(ValueChangedEvent<bool> isPaused)
-        {
-            if (isPaused.NewValue)
-                this.TransformBindableTo(pauseFreqAdjust, 0, 200, Easing.Out).OnComplete(_ => adjustableClock.Stop());
-            else
-                this.TransformBindableTo(pauseFreqAdjust, 1, 200, Easing.In);
-        }
-
-        private double totalOffset => userOffsetClock.Offset + platformOffsetClock.Offset;
-
-        /// <summary>
-        /// Duration before gameplay start time required before skip button displays.
-        /// </summary>
-        public const double MINIMUM_SKIP_TIME = 1000;
-
-        private readonly BindableDouble pauseFreqAdjust = new BindableDouble(1);
-
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
@@ -143,39 +163,31 @@ namespace osu.Game.Screens.Play
 
             Seek(startTime);
 
-            adjustableClock.ProcessFrame();
+            AdjustableClock.ProcessFrame();
         }
 
-        public void Restart()
+        protected override void OnPauseChanged(ValueChangedEvent<bool> isPaused)
         {
-            Task.Run(() =>
-            {
-                track.Seek(0);
-                track.Stop();
-
-                Schedule(() =>
-                {
-                    adjustableClock.ChangeSource(track);
-                    updateRate();
-
-                    if (!IsPaused.Value)
-                        Start();
-                });
-            });
+            if (isPaused.NewValue)
+                this.TransformBindableTo(pauseFreqAdjust, 0, 200, Easing.Out).OnComplete(_ => AdjustableClock.Stop());
+            else
+                this.TransformBindableTo(pauseFreqAdjust, 1, 200, Easing.In);
         }
 
-        public void Start()
+        public override void Seek(double time)
         {
-            if (!adjustableClock.IsRunning)
-            {
-                // Seeking the decoupled clock to its current time ensures that its source clock will be seeked to the same time
-                // This accounts for the audio clock source potentially taking time to enter a completely stopped state
-                Seek(GameplayClock.CurrentTime);
+            // remove the offset component here because most of the time we want the seek to be aligned to gameplay, not the audio track.
+            // we may want to consider reversing the application of offsets in the future as it may feel more correct.
+            base.Seek(time - totalOffset);
 
-                adjustableClock.Start();
-            }
+            // manually process frame to ensure GameplayClock is correctly updated after a seek.
+            userOffsetClock.ProcessFrame();
+        }
 
-            IsPaused.Value = false;
+        public override void Restart()
+        {
+            updateRate();
+            base.Restart();
         }
 
         /// <summary>
@@ -195,26 +207,24 @@ namespace osu.Game.Screens.Play
             Seek(skipTarget);
         }
 
-        /// <summary>
-        /// Seek to a specific time in gameplay.
-        /// <remarks>
-        /// Adjusts for any offsets which have been applied (so the seek may not be the expected point in time on the underlying audio track).
-        /// </remarks>
-        /// </summary>
-        /// <param name="time">The destination time to seek to.</param>
-        public void Seek(double time)
+        protected override GameplayClock CreateGameplayClock(IClock source)
         {
-            // remove the offset component here because most of the time we want the seek to be aligned to gameplay, not the audio track.
-            // we may want to consider reversing the application of offsets in the future as it may feel more correct.
-            adjustableClock.Seek(time - totalOffset);
+            // Lazer's audio timings in general doesn't match stable. This is the result of user testing, albeit limited.
+            // This only seems to be required on windows. We need to eventually figure out why, with a bit of luck.
+            platformOffsetClock = new HardwareCorrectionOffsetClock(source) { Offset = RuntimeInfo.OS == RuntimeInfo.Platform.Windows ? 15 : 0 };
 
-            // manually process frame to ensure GameplayClock is correctly updated after a seek.
-            userOffsetClock.ProcessFrame();
+            // the final usable gameplay clock with user-set offsets applied.
+            userOffsetClock = new HardwareCorrectionOffsetClock(platformOffsetClock);
+
+            return localGameplayClock = new LocalGameplayClock(userOffsetClock);
         }
 
-        public void Stop()
+        protected override void Update()
         {
-            IsPaused.Value = true;
+            if (!IsPaused.Value)
+                userOffsetClock.ProcessFrame();
+
+            base.Update();
         }
 
         /// <summary>
@@ -223,19 +233,7 @@ namespace osu.Game.Screens.Play
         public void StopUsingBeatmapClock()
         {
             removeSourceClockAdjustments();
-
-            track = new TrackVirtual(track.Length);
-            adjustableClock.ChangeSource(track);
-        }
-
-        protected override void Update()
-        {
-            if (!IsPaused.Value)
-            {
-                userOffsetClock.ProcessFrame();
-            }
-
-            base.Update();
+            SourceClock.ChangeSource(new TrackVirtual(beatmap.Track.Length));
         }
 
         private bool speedAdjustmentsApplied;
@@ -245,6 +243,8 @@ namespace osu.Game.Screens.Play
             if (speedAdjustmentsApplied)
                 return;
 
+            var track = (Track)SourceClock.Source;
+
             track.AddAdjustment(AdjustableProperty.Frequency, pauseFreqAdjust);
             track.AddAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
 
@@ -254,15 +254,12 @@ namespace osu.Game.Screens.Play
             speedAdjustmentsApplied = true;
         }
 
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-            removeSourceClockAdjustments();
-        }
-
         private void removeSourceClockAdjustments()
         {
-            if (!speedAdjustmentsApplied) return;
+            if (!speedAdjustmentsApplied)
+                return;
+
+            var track = (Track)SourceClock.Source;
 
             track.RemoveAdjustment(AdjustableProperty.Frequency, pauseFreqAdjust);
             track.RemoveAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
@@ -273,16 +270,10 @@ namespace osu.Game.Screens.Play
             speedAdjustmentsApplied = false;
         }
 
-        private class LocalGameplayClock : GameplayClock
+        protected override void Dispose(bool isDisposing)
         {
-            public readonly List<Bindable<double>> MutableNonGameplayAdjustments = new List<Bindable<double>>();
-
-            public override IEnumerable<Bindable<double>> NonGameplayAdjustments => MutableNonGameplayAdjustments;
-
-            public LocalGameplayClock(FramedOffsetClock underlyingClock)
-                : base(underlyingClock)
-            {
-            }
+            base.Dispose(isDisposing);
+            removeSourceClockAdjustments();
         }
 
         private class HardwareCorrectionOffsetClock : FramedOffsetClock
@@ -296,5 +287,17 @@ namespace osu.Game.Screens.Play
             {
             }
         }
+
+        private class LocalGameplayClock : GameplayClock
+        {
+            public readonly List<Bindable<double>> MutableNonGameplayAdjustments = new List<Bindable<double>>();
+
+            public override IEnumerable<Bindable<double>> NonGameplayAdjustments => MutableNonGameplayAdjustments;
+
+            public LocalGameplayClock(FramedOffsetClock underlyingClock)
+                : base(underlyingClock)
+            {
+            }
+        }
     }
 }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index efe5d26409..e07c40e8ff 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -295,7 +295,7 @@ namespace osu.Game.Screens.Play
             IsBreakTime.BindValueChanged(onBreakTimeChanged, true);
         }
 
-        protected virtual GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart) => new GameplayClockContainer(beatmap, gameplayStart);
+        protected virtual GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart) => new MasterGameplayClockContainer(beatmap, gameplayStart);
 
         private Drawable createUnderlayComponents() =>
             DimmableStoryboard = new DimmableStoryboard(Beatmap.Value.Storyboard) { RelativeSizeAxes = Axes.Both };
@@ -342,7 +342,6 @@ namespace osu.Game.Screens.Play
                             Action = () => PerformExit(true),
                             IsPaused = { BindTarget = GameplayClockContainer.IsPaused }
                         },
-                        PlayerSettingsOverlay = { PlaybackSettings = { UserPlaybackRate = { BindTarget = GameplayClockContainer.UserPlaybackRate } } },
                         KeyCounter =
                         {
                             AlwaysVisible = { BindTarget = DrawableRuleset.HasReplayLoaded },
@@ -386,6 +385,9 @@ namespace osu.Game.Screens.Play
                 }
             };
 
+            if (GameplayClockContainer is MasterGameplayClockContainer master)
+                HUDOverlay.PlayerSettingsOverlay.PlaybackSettings.UserPlaybackRate.BindTarget = master.UserPlaybackRate;
+
             if (!Configuration.AllowSkippingIntro)
                 skipOverlay.Expire();
 
@@ -533,7 +535,8 @@ namespace osu.Game.Screens.Play
             // user requested skip
             // disable sample playback to stop currently playing samples and perform skip
             samplePlaybackDisabled.Value = true;
-            GameplayClockContainer.Skip();
+
+            (GameplayClockContainer as MasterGameplayClockContainer)?.Skip();
 
             // return samplePlaybackDisabled.Value to what is defined by the beatmap's current state
             updateSampleDisabledState();
@@ -832,7 +835,7 @@ namespace osu.Game.Screens.Play
 
             // GameplayClockContainer performs seeks / start / stop operations on the beatmap's track.
             // as we are no longer the current screen, we cannot guarantee the track is still usable.
-            GameplayClockContainer?.StopUsingBeatmapClock();
+            (GameplayClockContainer as MasterGameplayClockContainer)?.StopUsingBeatmapClock();
 
             musicController.ResetTrackAdjustments();
 
diff --git a/osu.Game/Screens/Play/SkipOverlay.cs b/osu.Game/Screens/Play/SkipOverlay.cs
index 3f214e49d9..ddb78dfb67 100644
--- a/osu.Game/Screens/Play/SkipOverlay.cs
+++ b/osu.Game/Screens/Play/SkipOverlay.cs
@@ -90,7 +90,7 @@ namespace osu.Game.Screens.Play
 
         private const double fade_time = 300;
 
-        private double fadeOutBeginTime => startTime - GameplayClockContainer.MINIMUM_SKIP_TIME;
+        private double fadeOutBeginTime => startTime - MasterGameplayClockContainer.MINIMUM_SKIP_TIME;
 
         protected override void LoadComplete()
         {
diff --git a/osu.Game/Screens/Play/SpectatorPlayer.cs b/osu.Game/Screens/Play/SpectatorPlayer.cs
index fdf996150f..9822f62dd8 100644
--- a/osu.Game/Screens/Play/SpectatorPlayer.cs
+++ b/osu.Game/Screens/Play/SpectatorPlayer.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Screens.Play
             if (firstFrameTime == null || firstFrameTime <= gameplayStart + 5000)
                 return base.CreateGameplayClockContainer(beatmap, gameplayStart);
 
-            return new GameplayClockContainer(beatmap, firstFrameTime.Value, true);
+            return new MasterGameplayClockContainer(beatmap, firstFrameTime.Value, true);
         }
 
         public override bool OnExiting(IScreen next)

From a314f90d3732a0852edcd89fc8c1970012a6071f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 16:00:49 +0900
Subject: [PATCH 2450/3722] Allow timeline to govern the size of the rest of
 the editor content

---
 .../Compose/Components/Timeline/Timeline.cs   |   5 +
 .../Components/Timeline/TimelineArea.cs       |  11 +-
 .../Screens/Edit/EditorScreenWithTimeline.cs  | 117 +++++++++++-------
 3 files changed, 82 insertions(+), 51 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index aa5cc46e37..d06f977fc9 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -56,8 +56,13 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private Track track;
 
+        private const float timeline_height = 90;
+
         public Timeline()
         {
+            RelativeSizeAxes = Axes.X;
+            Height = timeline_height;
+
             ZoomDuration = 200;
             ZoomEasing = Easing.OutQuint;
             ScrollbarVisible = false;
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
index 0ec48e04c6..f144fd3a65 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
     public class TimelineArea : Container
     {
-        public readonly Timeline Timeline = new Timeline { RelativeSizeAxes = Axes.Both };
+        public readonly Timeline Timeline = new Timeline();
 
         protected override Container<Drawable> Content => Timeline;
 
@@ -37,7 +37,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 },
                 new GridContainer
                 {
-                    RelativeSizeAxes = Axes.Both,
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
                     Content = new[]
                     {
                         new Drawable[]
@@ -126,11 +127,15 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                             Timeline
                         },
                     },
+                    RowDimensions = new[]
+                    {
+                        new Dimension(GridSizeMode.AutoSize),
+                    },
                     ColumnDimensions = new[]
                     {
                         new Dimension(GridSizeMode.AutoSize),
                         new Dimension(GridSizeMode.AutoSize),
-                        new Dimension(GridSizeMode.Distributed),
+                        new Dimension(),
                     }
                 }
             };
diff --git a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
index 2d623a200c..b4b3aafc68 100644
--- a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
+++ b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
@@ -19,8 +19,6 @@ namespace osu.Game.Screens.Edit
         private const float vertical_margins = 10;
         private const float horizontal_margins = 20;
 
-        private const float timeline_height = 110;
-
         private readonly BindableBeatDivisor beatDivisor = new BindableBeatDivisor();
 
         private Container timelineContainer;
@@ -40,64 +38,86 @@ namespace osu.Game.Screens.Edit
             if (beatDivisor != null)
                 this.beatDivisor.BindTo(beatDivisor);
 
-            Children = new Drawable[]
+            Child = new GridContainer
             {
-                mainContent = new Container
+                RelativeSizeAxes = Axes.Both,
+                RowDimensions = new[]
                 {
-                    Name = "Main content",
-                    RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding
-                    {
-                        Horizontal = horizontal_margins,
-                        Top = vertical_margins + timeline_height,
-                        Bottom = vertical_margins
-                    },
-                    Child = spinner = new LoadingSpinner(true)
-                    {
-                        State = { Value = Visibility.Visible },
-                    },
+                    new Dimension(GridSizeMode.AutoSize),
+                    new Dimension(),
                 },
-                new Container
+                Content = new[]
                 {
-                    Name = "Timeline",
-                    RelativeSizeAxes = Axes.X,
-                    Height = timeline_height,
-                    Children = new Drawable[]
+                    new Drawable[]
                     {
-                        new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Colour = Color4.Black.Opacity(0.5f)
-                        },
                         new Container
                         {
-                            Name = "Timeline content",
-                            RelativeSizeAxes = Axes.Both,
-                            Padding = new MarginPadding { Horizontal = horizontal_margins, Vertical = vertical_margins },
-                            Child = new GridContainer
+                            Name = "Timeline",
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Children = new Drawable[]
                             {
-                                RelativeSizeAxes = Axes.Both,
-                                Content = new[]
+                                new Box
                                 {
-                                    new Drawable[]
-                                    {
-                                        timelineContainer = new Container
-                                        {
-                                            RelativeSizeAxes = Axes.Both,
-                                            Padding = new MarginPadding { Right = 5 },
-                                        },
-                                        new BeatDivisorControl(beatDivisor) { RelativeSizeAxes = Axes.Both }
-                                    },
+                                    RelativeSizeAxes = Axes.Both,
+                                    Colour = Color4.Black.Opacity(0.5f)
                                 },
-                                ColumnDimensions = new[]
+                                new Container
                                 {
-                                    new Dimension(),
-                                    new Dimension(GridSizeMode.Absolute, 90),
+                                    Name = "Timeline content",
+                                    RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
+                                    Padding = new MarginPadding { Horizontal = horizontal_margins, Vertical = vertical_margins },
+                                    Child = new GridContainer
+                                    {
+                                        RelativeSizeAxes = Axes.X,
+                                        AutoSizeAxes = Axes.Y,
+                                        Content = new[]
+                                        {
+                                            new Drawable[]
+                                            {
+                                                timelineContainer = new Container
+                                                {
+                                                    RelativeSizeAxes = Axes.X,
+                                                    AutoSizeAxes = Axes.Y,
+                                                    Padding = new MarginPadding { Right = 5 },
+                                                },
+                                                new BeatDivisorControl(beatDivisor) { RelativeSizeAxes = Axes.Both }
+                                            },
+                                        },
+                                        RowDimensions = new[]
+                                        {
+                                            new Dimension(GridSizeMode.AutoSize),
+                                        },
+                                        ColumnDimensions = new[]
+                                        {
+                                            new Dimension(),
+                                            new Dimension(GridSizeMode.Absolute, 90),
+                                        }
+                                    },
                                 }
+                            }
+                        },
+                    },
+                    new Drawable[]
+                    {
+                        mainContent = new Container
+                        {
+                            Name = "Main content",
+                            RelativeSizeAxes = Axes.Both,
+                            Padding = new MarginPadding
+                            {
+                                Horizontal = horizontal_margins,
+                                Top = vertical_margins,
+                                Bottom = vertical_margins
                             },
-                        }
-                    }
-                },
+                            Child = spinner = new LoadingSpinner(true)
+                            {
+                                State = { Value = Visibility.Visible },
+                            },
+                        },
+                    },
+                }
             };
         }
 
@@ -114,7 +134,8 @@ namespace osu.Game.Screens.Edit
 
                 LoadComponentAsync(new TimelineArea
                 {
-                    RelativeSizeAxes = Axes.Both,
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
                     Children = new[]
                     {
                         CreateTimelineContent(),

From 26110cd777e3c4880adc2a10c2bb49e1b64c7947 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 18:15:11 +0900
Subject: [PATCH 2451/3722] Fix timeline not receiving input (being eaten by
 composer)

---
 osu.Game/Screens/Edit/EditorScreenWithTimeline.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
index b4b3aafc68..26083e6a82 100644
--- a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
+++ b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
@@ -105,6 +105,7 @@ namespace osu.Game.Screens.Edit
                         {
                             Name = "Main content",
                             RelativeSizeAxes = Axes.Both,
+                            Depth = float.MaxValue,
                             Padding = new MarginPadding
                             {
                                 Horizontal = horizontal_margins,

From 2935f87e7082bd603c9a09aecda6ba51628a184b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 14 Apr 2021 18:29:34 +0900
Subject: [PATCH 2452/3722] Fix IsPaused not being bound

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

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 163ed9444f..a97a87d73f 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -50,6 +50,7 @@ namespace osu.Game.Screens.Play
             var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
 
             dependencies.CacheAs(GameplayClock = CreateGameplayClock(AdjustableClock));
+            GameplayClock.IsPaused.BindTo(IsPaused);
 
             return dependencies;
         }

From b53b30c1a97a71822359016e87d1334ce8097476 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 14 Apr 2021 19:32:48 +0900
Subject: [PATCH 2453/3722] Fix incorrect offset due to another intermediate
 Decoupleable clock

---
 .../Screens/Play/GameplayClockContainer.cs    | 26 ++++++-------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index a97a87d73f..36ca7415d0 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -31,16 +31,12 @@ namespace osu.Game.Screens.Play
         /// </summary>
         protected readonly DecoupleableInterpolatingFramedClock AdjustableClock;
 
-        protected readonly IClock SourceClock;
-
         protected GameplayClockContainer(IClock sourceClock)
         {
-            SourceClock = sourceClock;
-
             RelativeSizeAxes = Axes.Both;
 
             AdjustableClock = new DecoupleableInterpolatingFramedClock { IsCoupled = false };
-            AdjustableClock.ChangeSource(SourceClock);
+            AdjustableClock.ChangeSource(sourceClock);
 
             IsPaused.BindValueChanged(OnPauseChanged);
         }
@@ -101,7 +97,7 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public const double MINIMUM_SKIP_TIME = 1000;
 
-        protected new DecoupleableInterpolatingFramedClock SourceClock => (DecoupleableInterpolatingFramedClock)base.SourceClock;
+        protected Track Track => (Track)AdjustableClock.Source;
 
         public readonly BindableNumber<double> UserPlaybackRate = new BindableDouble(1)
         {
@@ -126,15 +122,13 @@ namespace osu.Game.Screens.Play
         private Bindable<double> userAudioOffset;
 
         public MasterGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStartTime, bool startAtGameplayStart = false)
-            : base(new DecoupleableInterpolatingFramedClock())
+            : base(beatmap.Track)
         {
             this.beatmap = beatmap;
             this.gameplayStartTime = gameplayStartTime;
             this.startAtGameplayStart = startAtGameplayStart;
 
             firstHitObjectTime = beatmap.Beatmap.HitObjects.First().StartTime;
-
-            SourceClock.ChangeSource(beatmap.Track);
         }
 
         [BackgroundDependencyLoader]
@@ -234,7 +228,7 @@ namespace osu.Game.Screens.Play
         public void StopUsingBeatmapClock()
         {
             removeSourceClockAdjustments();
-            SourceClock.ChangeSource(new TrackVirtual(beatmap.Track.Length));
+            AdjustableClock.ChangeSource(new TrackVirtual(beatmap.Track.Length));
         }
 
         private bool speedAdjustmentsApplied;
@@ -244,10 +238,8 @@ namespace osu.Game.Screens.Play
             if (speedAdjustmentsApplied)
                 return;
 
-            var track = (Track)SourceClock.Source;
-
-            track.AddAdjustment(AdjustableProperty.Frequency, pauseFreqAdjust);
-            track.AddAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
+            Track.AddAdjustment(AdjustableProperty.Frequency, pauseFreqAdjust);
+            Track.AddAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
 
             localGameplayClock.MutableNonGameplayAdjustments.Add(pauseFreqAdjust);
             localGameplayClock.MutableNonGameplayAdjustments.Add(UserPlaybackRate);
@@ -260,10 +252,8 @@ namespace osu.Game.Screens.Play
             if (!speedAdjustmentsApplied)
                 return;
 
-            var track = (Track)SourceClock.Source;
-
-            track.RemoveAdjustment(AdjustableProperty.Frequency, pauseFreqAdjust);
-            track.RemoveAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
+            Track.RemoveAdjustment(AdjustableProperty.Frequency, pauseFreqAdjust);
+            Track.RemoveAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
 
             localGameplayClock.MutableNonGameplayAdjustments.Remove(pauseFreqAdjust);
             localGameplayClock.MutableNonGameplayAdjustments.Remove(UserPlaybackRate);

From 18c69cdaf7bb536d22c704171ba9bd03c00689cd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 14 Apr 2021 19:50:22 +0900
Subject: [PATCH 2454/3722] Split out files

---
 .../Screens/Play/GameplayClockContainer.cs    | 214 +----------------
 .../Play/MasterGameplayClockContainer.cs      | 220 ++++++++++++++++++
 2 files changed, 222 insertions(+), 212 deletions(-)
 create mode 100644 osu.Game/Screens/Play/MasterGameplayClockContainer.cs

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 36ca7415d0..d8e6fda87e 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -1,19 +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;
-using System.Collections.Generic;
-using System.Linq;
-using osu.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Audio;
-using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Timing;
-using osu.Game.Beatmaps;
-using osu.Game.Configuration;
 
 namespace osu.Game.Screens.Play
 {
@@ -38,7 +30,7 @@ namespace osu.Game.Screens.Play
             AdjustableClock = new DecoupleableInterpolatingFramedClock { IsCoupled = false };
             AdjustableClock.ChangeSource(sourceClock);
 
-            IsPaused.BindValueChanged(OnPauseChanged);
+            IsPaused.BindValueChanged(OnIsPausedChanged);
         }
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
@@ -85,210 +77,8 @@ namespace osu.Game.Screens.Play
                 Start();
         }
 
-        protected abstract void OnPauseChanged(ValueChangedEvent<bool> isPaused);
+        protected abstract void OnIsPausedChanged(ValueChangedEvent<bool> isPaused);
 
         protected abstract GameplayClock CreateGameplayClock(IClock source);
     }
-
-    public class MasterGameplayClockContainer : GameplayClockContainer
-    {
-        /// <summary>
-        /// Duration before gameplay start time required before skip button displays.
-        /// </summary>
-        public const double MINIMUM_SKIP_TIME = 1000;
-
-        protected Track Track => (Track)AdjustableClock.Source;
-
-        public readonly BindableNumber<double> UserPlaybackRate = new BindableDouble(1)
-        {
-            Default = 1,
-            MinValue = 0.5,
-            MaxValue = 2,
-            Precision = 0.1,
-        };
-
-        private double totalOffset => userOffsetClock.Offset + platformOffsetClock.Offset;
-
-        private readonly BindableDouble pauseFreqAdjust = new BindableDouble(1);
-
-        private readonly WorkingBeatmap beatmap;
-        private readonly double gameplayStartTime;
-        private readonly bool startAtGameplayStart;
-        private readonly double firstHitObjectTime;
-
-        private FramedOffsetClock userOffsetClock;
-        private FramedOffsetClock platformOffsetClock;
-        private LocalGameplayClock localGameplayClock;
-        private Bindable<double> userAudioOffset;
-
-        public MasterGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStartTime, bool startAtGameplayStart = false)
-            : base(beatmap.Track)
-        {
-            this.beatmap = beatmap;
-            this.gameplayStartTime = gameplayStartTime;
-            this.startAtGameplayStart = startAtGameplayStart;
-
-            firstHitObjectTime = beatmap.Beatmap.HitObjects.First().StartTime;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
-        {
-            userAudioOffset = config.GetBindable<double>(OsuSetting.AudioOffset);
-            userAudioOffset.BindValueChanged(offset => userOffsetClock.Offset = offset.NewValue, true);
-
-            // sane default provided by ruleset.
-            double startTime = gameplayStartTime;
-
-            if (!startAtGameplayStart)
-            {
-                startTime = Math.Min(0, startTime);
-
-                // if a storyboard is present, it may dictate the appropriate start time by having events in negative time space.
-                // this is commonly used to display an intro before the audio track start.
-                double? firstStoryboardEvent = beatmap.Storyboard.EarliestEventTime;
-                if (firstStoryboardEvent != null)
-                    startTime = Math.Min(startTime, firstStoryboardEvent.Value);
-
-                // some beatmaps specify a current lead-in time which should be used instead of the ruleset-provided value when available.
-                // this is not available as an option in the live editor but can still be applied via .osu editing.
-                if (beatmap.BeatmapInfo.AudioLeadIn > 0)
-                    startTime = Math.Min(startTime, firstHitObjectTime - beatmap.BeatmapInfo.AudioLeadIn);
-            }
-
-            Seek(startTime);
-
-            AdjustableClock.ProcessFrame();
-        }
-
-        protected override void OnPauseChanged(ValueChangedEvent<bool> isPaused)
-        {
-            if (isPaused.NewValue)
-                this.TransformBindableTo(pauseFreqAdjust, 0, 200, Easing.Out).OnComplete(_ => AdjustableClock.Stop());
-            else
-                this.TransformBindableTo(pauseFreqAdjust, 1, 200, Easing.In);
-        }
-
-        public override void Seek(double time)
-        {
-            // remove the offset component here because most of the time we want the seek to be aligned to gameplay, not the audio track.
-            // we may want to consider reversing the application of offsets in the future as it may feel more correct.
-            base.Seek(time - totalOffset);
-
-            // manually process frame to ensure GameplayClock is correctly updated after a seek.
-            userOffsetClock.ProcessFrame();
-        }
-
-        public override void Restart()
-        {
-            updateRate();
-            base.Restart();
-        }
-
-        /// <summary>
-        /// Skip forward to the next valid skip point.
-        /// </summary>
-        public void Skip()
-        {
-            if (GameplayClock.CurrentTime > gameplayStartTime - MINIMUM_SKIP_TIME)
-                return;
-
-            double skipTarget = gameplayStartTime - MINIMUM_SKIP_TIME;
-
-            if (GameplayClock.CurrentTime < 0 && skipTarget > 6000)
-                // double skip exception for storyboards with very long intros
-                skipTarget = 0;
-
-            Seek(skipTarget);
-        }
-
-        protected override GameplayClock CreateGameplayClock(IClock source)
-        {
-            // Lazer's audio timings in general doesn't match stable. This is the result of user testing, albeit limited.
-            // This only seems to be required on windows. We need to eventually figure out why, with a bit of luck.
-            platformOffsetClock = new HardwareCorrectionOffsetClock(source) { Offset = RuntimeInfo.OS == RuntimeInfo.Platform.Windows ? 15 : 0 };
-
-            // the final usable gameplay clock with user-set offsets applied.
-            userOffsetClock = new HardwareCorrectionOffsetClock(platformOffsetClock);
-
-            return localGameplayClock = new LocalGameplayClock(userOffsetClock);
-        }
-
-        protected override void Update()
-        {
-            if (!IsPaused.Value)
-                userOffsetClock.ProcessFrame();
-
-            base.Update();
-        }
-
-        /// <summary>
-        /// Changes the backing clock to avoid using the originally provided track.
-        /// </summary>
-        public void StopUsingBeatmapClock()
-        {
-            removeSourceClockAdjustments();
-            AdjustableClock.ChangeSource(new TrackVirtual(beatmap.Track.Length));
-        }
-
-        private bool speedAdjustmentsApplied;
-
-        private void updateRate()
-        {
-            if (speedAdjustmentsApplied)
-                return;
-
-            Track.AddAdjustment(AdjustableProperty.Frequency, pauseFreqAdjust);
-            Track.AddAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
-
-            localGameplayClock.MutableNonGameplayAdjustments.Add(pauseFreqAdjust);
-            localGameplayClock.MutableNonGameplayAdjustments.Add(UserPlaybackRate);
-
-            speedAdjustmentsApplied = true;
-        }
-
-        private void removeSourceClockAdjustments()
-        {
-            if (!speedAdjustmentsApplied)
-                return;
-
-            Track.RemoveAdjustment(AdjustableProperty.Frequency, pauseFreqAdjust);
-            Track.RemoveAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
-
-            localGameplayClock.MutableNonGameplayAdjustments.Remove(pauseFreqAdjust);
-            localGameplayClock.MutableNonGameplayAdjustments.Remove(UserPlaybackRate);
-
-            speedAdjustmentsApplied = false;
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-            removeSourceClockAdjustments();
-        }
-
-        private class HardwareCorrectionOffsetClock : FramedOffsetClock
-        {
-            // we always want to apply the same real-time offset, so it should be adjusted by the difference in playback rate (from realtime) to achieve this.
-            // base implementation already adds offset at 1.0 rate, so we only add the difference from that here.
-            public override double CurrentTime => base.CurrentTime + Offset * (Rate - 1);
-
-            public HardwareCorrectionOffsetClock(IClock source, bool processSource = true)
-                : base(source, processSource)
-            {
-            }
-        }
-
-        private class LocalGameplayClock : GameplayClock
-        {
-            public readonly List<Bindable<double>> MutableNonGameplayAdjustments = new List<Bindable<double>>();
-
-            public override IEnumerable<Bindable<double>> NonGameplayAdjustments => MutableNonGameplayAdjustments;
-
-            public LocalGameplayClock(FramedOffsetClock underlyingClock)
-                : base(underlyingClock)
-            {
-            }
-        }
-    }
 }
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
new file mode 100644
index 0000000000..efc8ca732e
--- /dev/null
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -0,0 +1,220 @@
+// Copyright (c) ppy 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;
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Track;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Timing;
+using osu.Game.Beatmaps;
+using osu.Game.Configuration;
+
+namespace osu.Game.Screens.Play
+{
+    public class MasterGameplayClockContainer : GameplayClockContainer
+    {
+        /// <summary>
+        /// Duration before gameplay start time required before skip button displays.
+        /// </summary>
+        public const double MINIMUM_SKIP_TIME = 1000;
+
+        protected Track Track => (Track)AdjustableClock.Source;
+
+        public readonly BindableNumber<double> UserPlaybackRate = new BindableDouble(1)
+        {
+            Default = 1,
+            MinValue = 0.5,
+            MaxValue = 2,
+            Precision = 0.1,
+        };
+
+        private double totalOffset => userOffsetClock.Offset + platformOffsetClock.Offset;
+
+        private readonly BindableDouble pauseFreqAdjust = new BindableDouble(1);
+
+        private readonly WorkingBeatmap beatmap;
+        private readonly double gameplayStartTime;
+        private readonly bool startAtGameplayStart;
+        private readonly double firstHitObjectTime;
+
+        private FramedOffsetClock userOffsetClock;
+        private FramedOffsetClock platformOffsetClock;
+        private LocalGameplayClock localGameplayClock;
+        private Bindable<double> userAudioOffset;
+
+        public MasterGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStartTime, bool startAtGameplayStart = false)
+            : base(beatmap.Track)
+        {
+            this.beatmap = beatmap;
+            this.gameplayStartTime = gameplayStartTime;
+            this.startAtGameplayStart = startAtGameplayStart;
+
+            firstHitObjectTime = beatmap.Beatmap.HitObjects.First().StartTime;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            userAudioOffset = config.GetBindable<double>(OsuSetting.AudioOffset);
+            userAudioOffset.BindValueChanged(offset => userOffsetClock.Offset = offset.NewValue, true);
+
+            // sane default provided by ruleset.
+            double startTime = gameplayStartTime;
+
+            if (!startAtGameplayStart)
+            {
+                startTime = Math.Min(0, startTime);
+
+                // if a storyboard is present, it may dictate the appropriate start time by having events in negative time space.
+                // this is commonly used to display an intro before the audio track start.
+                double? firstStoryboardEvent = beatmap.Storyboard.EarliestEventTime;
+                if (firstStoryboardEvent != null)
+                    startTime = Math.Min(startTime, firstStoryboardEvent.Value);
+
+                // some beatmaps specify a current lead-in time which should be used instead of the ruleset-provided value when available.
+                // this is not available as an option in the live editor but can still be applied via .osu editing.
+                if (beatmap.BeatmapInfo.AudioLeadIn > 0)
+                    startTime = Math.Min(startTime, firstHitObjectTime - beatmap.BeatmapInfo.AudioLeadIn);
+            }
+
+            Seek(startTime);
+
+            AdjustableClock.ProcessFrame();
+        }
+
+        protected override void OnIsPausedChanged(ValueChangedEvent<bool> isPaused)
+        {
+            if (isPaused.NewValue)
+                this.TransformBindableTo(pauseFreqAdjust, 0, 200, Easing.Out).OnComplete(_ => AdjustableClock.Stop());
+            else
+                this.TransformBindableTo(pauseFreqAdjust, 1, 200, Easing.In);
+        }
+
+        public override void Seek(double time)
+        {
+            // remove the offset component here because most of the time we want the seek to be aligned to gameplay, not the audio track.
+            // we may want to consider reversing the application of offsets in the future as it may feel more correct.
+            base.Seek(time - totalOffset);
+
+            // manually process frame to ensure GameplayClock is correctly updated after a seek.
+            userOffsetClock.ProcessFrame();
+        }
+
+        public override void Restart()
+        {
+            updateRate();
+            base.Restart();
+        }
+
+        /// <summary>
+        /// Skip forward to the next valid skip point.
+        /// </summary>
+        public void Skip()
+        {
+            if (GameplayClock.CurrentTime > gameplayStartTime - MINIMUM_SKIP_TIME)
+                return;
+
+            double skipTarget = gameplayStartTime - MINIMUM_SKIP_TIME;
+
+            if (GameplayClock.CurrentTime < 0 && skipTarget > 6000)
+                // double skip exception for storyboards with very long intros
+                skipTarget = 0;
+
+            Seek(skipTarget);
+        }
+
+        protected override GameplayClock CreateGameplayClock(IClock source)
+        {
+            // Lazer's audio timings in general doesn't match stable. This is the result of user testing, albeit limited.
+            // This only seems to be required on windows. We need to eventually figure out why, with a bit of luck.
+            platformOffsetClock = new HardwareCorrectionOffsetClock(source) { Offset = RuntimeInfo.OS == RuntimeInfo.Platform.Windows ? 15 : 0 };
+
+            // the final usable gameplay clock with user-set offsets applied.
+            userOffsetClock = new HardwareCorrectionOffsetClock(platformOffsetClock);
+
+            return localGameplayClock = new LocalGameplayClock(userOffsetClock);
+        }
+
+        protected override void Update()
+        {
+            if (!IsPaused.Value)
+                userOffsetClock.ProcessFrame();
+
+            base.Update();
+        }
+
+        /// <summary>
+        /// Changes the backing clock to avoid using the originally provided track.
+        /// </summary>
+        public void StopUsingBeatmapClock()
+        {
+            removeSourceClockAdjustments();
+            AdjustableClock.ChangeSource(new TrackVirtual(beatmap.Track.Length));
+        }
+
+        private bool speedAdjustmentsApplied;
+
+        private void updateRate()
+        {
+            if (speedAdjustmentsApplied)
+                return;
+
+            Track.AddAdjustment(AdjustableProperty.Frequency, pauseFreqAdjust);
+            Track.AddAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
+
+            localGameplayClock.MutableNonGameplayAdjustments.Add(pauseFreqAdjust);
+            localGameplayClock.MutableNonGameplayAdjustments.Add(UserPlaybackRate);
+
+            speedAdjustmentsApplied = true;
+        }
+
+        private void removeSourceClockAdjustments()
+        {
+            if (!speedAdjustmentsApplied)
+                return;
+
+            Track.RemoveAdjustment(AdjustableProperty.Frequency, pauseFreqAdjust);
+            Track.RemoveAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
+
+            localGameplayClock.MutableNonGameplayAdjustments.Remove(pauseFreqAdjust);
+            localGameplayClock.MutableNonGameplayAdjustments.Remove(UserPlaybackRate);
+
+            speedAdjustmentsApplied = false;
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            removeSourceClockAdjustments();
+        }
+
+        private class HardwareCorrectionOffsetClock : FramedOffsetClock
+        {
+            // we always want to apply the same real-time offset, so it should be adjusted by the difference in playback rate (from realtime) to achieve this.
+            // base implementation already adds offset at 1.0 rate, so we only add the difference from that here.
+            public override double CurrentTime => base.CurrentTime + Offset * (Rate - 1);
+
+            public HardwareCorrectionOffsetClock(IClock source, bool processSource = true)
+                : base(source, processSource)
+            {
+            }
+        }
+
+        private class LocalGameplayClock : GameplayClock
+        {
+            public readonly List<Bindable<double>> MutableNonGameplayAdjustments = new List<Bindable<double>>();
+
+            public override IEnumerable<Bindable<double>> NonGameplayAdjustments => MutableNonGameplayAdjustments;
+
+            public LocalGameplayClock(FramedOffsetClock underlyingClock)
+                : base(underlyingClock)
+            {
+            }
+        }
+    }
+}

From ff2a37b7f492b16f135c026865e410b55c1095c7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 19:38:25 +0900
Subject: [PATCH 2455/3722] Add new colours for editor designs

---
 osu.Game/Graphics/OsuColour.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Graphics/OsuColour.cs b/osu.Game/Graphics/OsuColour.cs
index 466d59b08b..c3b9b6006c 100644
--- a/osu.Game/Graphics/OsuColour.cs
+++ b/osu.Game/Graphics/OsuColour.cs
@@ -186,6 +186,13 @@ namespace osu.Game.Graphics
         public readonly Color4 GrayE = Color4Extensions.FromHex(@"eee");
         public readonly Color4 GrayF = Color4Extensions.FromHex(@"fff");
 
+        // in latest editor design logic, need to figure out where these sit...
+        public readonly Color4 Lime1 = Color4Extensions.FromHex(@"b2ff66");
+        public readonly Color4 Orange1 = Color4Extensions.FromHex(@"ffd966");
+
+        // Content Background
+        public readonly Color4 B5 = Color4Extensions.FromHex(@"222a28");
+
         public readonly Color4 RedLighter = Color4Extensions.FromHex(@"ffeded");
         public readonly Color4 RedLight = Color4Extensions.FromHex(@"ed7787");
         public readonly Color4 Red = Color4Extensions.FromHex(@"ed1121");

From 1209c9fa32e0c0c98497748bb54f39760007408c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 19:39:12 +0900
Subject: [PATCH 2456/3722] Allow timeline to expand in height when control
 points are to be displayed

---
 .../Compose/Components/Timeline/Timeline.cs   | 39 ++++++++++++++++---
 .../Timeline/TimelineControlPointDisplay.cs   |  6 ---
 2 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index d06f977fc9..bd7b426044 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -57,11 +57,11 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private Track track;
 
         private const float timeline_height = 90;
+        private const float timeline_expanded_height = 180;
 
         public Timeline()
         {
             RelativeSizeAxes = Axes.X;
-            Height = timeline_height;
 
             ZoomDuration = 200;
             ZoomEasing = Easing.OutQuint;
@@ -86,9 +86,17 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             AddRange(new Drawable[]
             {
+                controlPoints = new TimelineControlPointDisplay
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Height = timeline_expanded_height,
+                },
                 new Container
                 {
-                    RelativeSizeAxes = Axes.Both,
+                    RelativeSizeAxes = Axes.X,
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Height = timeline_height,
                     Depth = float.MaxValue,
                     Children = new[]
                     {
@@ -102,7 +110,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         },
                         centreMarker.CreateProxy(),
                         ticks = new TimelineTickDisplay(),
-                        controlPoints = new TimelineControlPointDisplay(),
                         new Box
                         {
                             Name = "zero marker",
@@ -116,13 +123,35 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             });
 
             waveformOpacity = config.GetBindable<float>(OsuSetting.EditorWaveformOpacity);
+            Beatmap.BindTo(beatmap);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
             waveformOpacity.BindValueChanged(_ => updateWaveformOpacity(), true);
 
             WaveformVisible.ValueChanged += _ => updateWaveformOpacity();
-            ControlPointsVisible.ValueChanged += visible => controlPoints.FadeTo(visible.NewValue ? 1 : 0, 200, Easing.OutQuint);
             TicksVisible.ValueChanged += visible => ticks.FadeTo(visible.NewValue ? 1 : 0, 200, Easing.OutQuint);
+            ControlPointsVisible.BindValueChanged(visible =>
+            {
+                if (visible.NewValue)
+                {
+                    this.ResizeHeightTo(timeline_expanded_height, 200, Easing.OutQuint);
+
+                    // delay the fade in else masking looks weird.
+                    controlPoints.Delay(180).FadeIn(400, Easing.OutQuint);
+                }
+                else
+                {
+                    controlPoints.FadeOut(200, Easing.OutQuint);
+
+                    // likewise, delay the resize until the fade is complete.
+                    this.Delay(180).ResizeHeightTo(timeline_height, 200, Easing.OutQuint);
+                }
+            }, true);
 
-            Beatmap.BindTo(beatmap);
             Beatmap.BindValueChanged(b =>
             {
                 waveform.Waveform = b.NewValue.Waveform;
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs
index 18600bcdee..8520567fa9 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs
@@ -4,7 +4,6 @@
 using System.Collections.Specialized;
 using System.Linq;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
 
@@ -17,11 +16,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
     {
         private readonly IBindableList<ControlPointGroup> controlPointGroups = new BindableList<ControlPointGroup>();
 
-        public TimelineControlPointDisplay()
-        {
-            RelativeSizeAxes = Axes.Both;
-        }
-
         protected override void LoadBeatmap(EditorBeatmap beatmap)
         {
             base.LoadBeatmap(beatmap);

From a8df2388eb184c8abb47f4e841a954587d4fef25 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 19:39:27 +0900
Subject: [PATCH 2457/3722] Update design for TimingControlPoint

---
 .../ControlPoints/TimingControlPoint.cs       |  2 +-
 .../Timeline/TimelineControlPointGroup.cs     |  2 ++
 .../Components/Timeline/TimingPointPiece.cs   | 20 +++++++++----------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
index 580642f593..ec20328fab 100644
--- a/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/TimingControlPoint.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// </summary>
         private const double default_beat_length = 60000.0 / 60.0;
 
-        public override Color4 GetRepresentingColour(OsuColour colours) => colours.YellowDark;
+        public override Color4 GetRepresentingColour(OsuColour colours) => colours.Orange1;
 
         public static readonly TimingControlPoint DEFAULT = new TimingControlPoint
         {
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs
index fb69f16792..c4beb40f92 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs
@@ -27,6 +27,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             RelativeSizeAxes = Axes.Y;
             AutoSizeAxes = Axes.X;
 
+            Origin = Anchor.TopCentre;
+
             X = (float)group.Time;
         }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimingPointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimingPointPiece.cs
index ba94916458..cd1470aa0a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimingPointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimingPointPiece.cs
@@ -3,15 +3,12 @@
 
 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.Shapes;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
@@ -31,26 +28,27 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            Origin = Anchor.CentreLeft;
-            Anchor = Anchor.CentreLeft;
+            Margin = new MarginPadding { Vertical = 10 };
+
+            const float corner_radius = 5;
 
             AutoSizeAxes = Axes.Both;
-
-            Color4 colour = point.GetRepresentingColour(colours);
+            Masking = true;
+            CornerRadius = corner_radius;
 
             InternalChildren = new Drawable[]
             {
                 new Box
                 {
-                    Alpha = 0.9f,
-                    Colour = ColourInfo.GradientHorizontal(colour, colour.Opacity(0.5f)),
+                    Colour = point.GetRepresentingColour(colours),
                     RelativeSizeAxes = Axes.Both,
                 },
                 bpmText = new OsuSpriteText
                 {
                     Alpha = 0.9f,
-                    Padding = new MarginPadding(3),
-                    Font = OsuFont.Default.With(size: 40)
+                    Padding = new MarginPadding { Vertical = 3, Horizontal = 6 },
+                    Font = OsuFont.Default.With(size: 20, weight: FontWeight.SemiBold),
+                    Colour = colours.B5,
                 }
             };
 

From 774cca38c4c66627c3f501712f9e40cba1ef8474 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 14 Apr 2021 20:39:14 +0900
Subject: [PATCH 2458/3722] Make spectating instances use custom GCC

---
 .../Spectate/MultiplayerSpectator.cs          | 48 ++++++++++++-------
 .../Spectate/MultiplayerSpectatorPlayer.cs    | 33 ++++++++++++-
 .../Multiplayer/Spectate/PlayerInstance.cs    | 29 ++++++-----
 3 files changed, 75 insertions(+), 35 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index a56104439d..931d13942b 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Logging;
 using osu.Framework.Utils;
 using osu.Game.Online.Spectator;
+using osu.Game.Screens.Play;
 using osu.Game.Screens.Spectate;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
@@ -29,6 +30,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         private SpectatorStreamingClient spectatorClient { get; set; }
 
         private readonly PlayerInstance[] instances;
+        private GameplayClockContainer gameplayClockContainer;
         private PlayerGrid grid;
         private MultiplayerSpectatorLeaderboard leaderboard;
         private double? loadFinishTime;
@@ -44,23 +46,26 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         {
             Container leaderboardContainer;
 
-            InternalChild = new GridContainer
+            InternalChild = gameplayClockContainer = new MasterGameplayClockContainer(Beatmap.Value, 0)
             {
-                RelativeSizeAxes = Axes.Both,
-                ColumnDimensions = new[]
+                Child = new GridContainer
                 {
-                    new Dimension(GridSizeMode.AutoSize)
-                },
-                Content = new[]
-                {
-                    new Drawable[]
+                    RelativeSizeAxes = Axes.Both,
+                    ColumnDimensions = new[]
                     {
-                        leaderboardContainer = new Container
+                        new Dimension(GridSizeMode.AutoSize)
+                    },
+                    Content = new[]
+                    {
+                        new Drawable[]
                         {
-                            RelativeSizeAxes = Axes.Y,
-                            AutoSizeAxes = Axes.X
-                        },
-                        grid = new PlayerGrid { RelativeSizeAxes = Axes.Both }
+                            leaderboardContainer = new Container
+                            {
+                                RelativeSizeAxes = Axes.Y,
+                                AutoSizeAxes = Axes.X
+                            },
+                            grid = new PlayerGrid { RelativeSizeAxes = Axes.Both }
+                        }
                     }
                 }
             };
@@ -94,6 +99,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                     && instances.Any(i => i.Score.Replay.Frames.Count > 0))
             );
 
+        private bool firstStartFrame = true;
+
         private void updateGameplayPlayingState()
         {
             // Make sure all players are loaded and have frames before starting any.
@@ -104,13 +111,16 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 return;
             }
 
+            if (firstStartFrame)
+                gameplayClockContainer.Restart();
+
             // Not all instances may be in a valid gameplay state (see canStartGameplay). Only control the ones that are.
             IEnumerable<PlayerInstance> validInstances = instances.Where(i => i.Score.Replay.Frames.Count > 0);
 
-            double targetTrackTime = validInstances.Select(i => i.GetCurrentTrackTime()).Max();
+            double targetGameplayTime = gameplayClockContainer.GameplayClock.CurrentTime;
 
-            var instanceTimes = string.Join(',', validInstances.Select(i => $" {i.User.Id}: {(int)i.GetCurrentTrackTime()}"));
-            Logger.Log($"target: {(int)targetTrackTime},{instanceTimes}");
+            var instanceTimes = string.Join(',', validInstances.Select(i => $" {i.User.Id}: {(int)i.GetCurrentGameplayTime()}"));
+            Logger.Log($"target: {(int)targetGameplayTime},{instanceTimes}");
 
             foreach (var inst in validInstances)
             {
@@ -123,8 +133,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 if (!canContinuePlayback)
                     continue;
 
-                inst.ContinueGameplay(targetTrackTime);
+                inst.ContinueGameplay(targetGameplayTime);
             }
+
+            firstStartFrame = false;
         }
 
         protected override void OnUserStateChanged(int userId, SpectatorState spectatorState)
@@ -142,7 +154,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 leaderboard.RemoveClock(existingInstance.User.Id);
             }
 
-            LoadComponentAsync(instances[userIndex] = new PlayerInstance(gameplayState.Score), d =>
+            LoadComponentAsync(instances[userIndex] = new PlayerInstance(gameplayState.Score, gameplayClockContainer.GameplayClock), d =>
             {
                 if (instances[userIndex] == d)
                 {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
index 1634438850..abb7ec83d8 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.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.Framework.Bindables;
+using osu.Framework.Timing;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
@@ -11,11 +14,37 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
     {
         public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
 
-        public new GameplayClockContainer GameplayClockContainer => base.GameplayClockContainer;
+        public new SubGameplayClockContainer GameplayClockContainer => (SubGameplayClockContainer)base.GameplayClockContainer;
 
-        public MultiplayerSpectatorPlayer(Score score)
+        private readonly GameplayClock gameplayClock;
+
+        public MultiplayerSpectatorPlayer(Score score, GameplayClock gameplayClock)
             : base(score)
         {
+            this.gameplayClock = gameplayClock;
         }
+
+        protected override GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart)
+            => new SubGameplayClockContainer(gameplayClock);
+    }
+
+    public class SubGameplayClockContainer : GameplayClockContainer
+    {
+        public new DecoupleableInterpolatingFramedClock AdjustableClock => base.AdjustableClock;
+
+        public SubGameplayClockContainer(IClock sourceClock)
+            : base(sourceClock)
+        {
+        }
+
+        protected override void OnIsPausedChanged(ValueChangedEvent<bool> isPaused)
+        {
+            if (isPaused.NewValue)
+                AdjustableClock.Stop();
+            else
+                AdjustableClock.Start();
+        }
+
+        protected override GameplayClock CreateGameplayClock(IFrameBasedClock source) => new GameplayClock(source);
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
index 12a710e9f0..724a685cb7 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
@@ -2,8 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Framework.Audio;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Logging;
@@ -38,15 +36,17 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         public WorkingBeatmap Beatmap { get; private set; }
 
         public readonly Score Score;
+        private readonly GameplayClock gameplayClock;
 
         public bool IsCatchingUp { get; private set; }
 
         private OsuScreenStack stack;
         private MultiplayerSpectatorPlayer player;
 
-        public PlayerInstance(Score score)
+        public PlayerInstance(Score score, GameplayClock gameplayClock)
         {
             Score = score;
+            this.gameplayClock = gameplayClock;
 
             RelativeSizeAxes = Axes.Both;
             Masking = true;
@@ -67,7 +67,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 }
             };
 
-            stack.Push(new MultiplayerSpectatorPlayerLoader(Score, () => player = new MultiplayerSpectatorPlayer(Score)));
+            stack.Push(new MultiplayerSpectatorPlayerLoader(Score, () => player = new MultiplayerSpectatorPlayer(Score, gameplayClock)));
         }
 
         protected override void UpdateAfterChildren()
@@ -76,8 +76,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             updateCatchup();
         }
 
-        private readonly BindableDouble catchupFrequencyAdjustment = new BindableDouble(catchup_rate);
-        private double targetTrackTime;
+        private double targetGameplayTime;
 
         private void updateCatchup()
         {
@@ -91,7 +90,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 return;
 
             double currentTime = Beatmap.Track.CurrentTime;
-            double timeBehind = targetTrackTime - currentTime;
+            double timeBehind = targetGameplayTime - currentTime;
 
             double offsetForCatchup = IsCatchingUp ? SYNC_TARGET : MAX_OFFSET;
             bool catchupRequired = timeBehind > offsetForCatchup;
@@ -102,12 +101,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
             if (catchupRequired)
             {
-                Beatmap.Track.AddAdjustment(AdjustableProperty.Frequency, catchupFrequencyAdjustment);
+                // player.GameplayClockContainer.AdjustableClock.Rate = catchup_rate;
                 Logger.Log($"{User.Id} catchup started (behind: {(int)timeBehind})");
             }
             else
             {
-                Beatmap.Track.RemoveAdjustment(AdjustableProperty.Frequency, catchupFrequencyAdjustment);
+                // player.GameplayClockContainer.AdjustableClock.Rate = 1;
                 Logger.Log($"{User.Id} catchup finished (behind: {(int)timeBehind})");
             }
 
@@ -122,21 +121,21 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             return player.GameplayClockContainer.GameplayClock.CurrentTime;
         }
 
-        public double GetCurrentTrackTime()
+        public bool IsPlaying()
         {
-            if (player?.IsLoaded != true)
-                return 0;
+            if (player.IsLoaded != true)
+                return false;
 
-            return Beatmap.Track.CurrentTime;
+            return player.GameplayClockContainer.GameplayClock.IsRunning;
         }
 
-        public void ContinueGameplay(double targetTrackTime)
+        public void ContinueGameplay(double targetGameplayTime)
         {
             if (player?.IsLoaded != true)
                 return;
 
             player.GameplayClockContainer.Start();
-            this.targetTrackTime = targetTrackTime;
+            this.targetGameplayTime = targetGameplayTime;
         }
 
         public void PauseGameplay()

From f9b1b7fe255370fb502aebaea0fb5c5327e569b1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 20:10:58 +0900
Subject: [PATCH 2459/3722] Update SamplePointPiece design

---
 .../Components/Timeline/SamplePointPiece.cs   | 61 ++++++++++---------
 1 file changed, 33 insertions(+), 28 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
index 0f11fb1126..9461f5e885 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
@@ -3,9 +3,7 @@
 
 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.Shapes;
 using osu.Game.Beatmaps.ControlPoints;
@@ -23,7 +21,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private readonly BindableNumber<int> volume;
 
         private OsuSpriteText text;
-        private Box volumeBox;
+        private Container volumeBox;
+
+        private const int max_volume_height = 22;
 
         public SamplePointPiece(SampleControlPoint samplePoint)
         {
@@ -35,8 +35,10 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            Origin = Anchor.TopLeft;
-            Anchor = Anchor.TopLeft;
+            Margin = new MarginPadding { Vertical = 5 };
+
+            Origin = Anchor.BottomCentre;
+            Anchor = Anchor.BottomCentre;
 
             AutoSizeAxes = Axes.X;
             RelativeSizeAxes = Axes.Y;
@@ -45,40 +47,43 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             InternalChildren = new Drawable[]
             {
+                volumeBox = new Circle
+                {
+                    CornerRadius = 5,
+                    Anchor = Anchor.BottomCentre,
+                    Origin = Anchor.BottomCentre,
+                    Y = -20,
+                    Width = 10,
+                    Colour = colour,
+                },
                 new Container
                 {
-                    RelativeSizeAxes = Axes.Y,
-                    Width = 20,
+                    AutoSizeAxes = Axes.X,
+                    Height = 16,
+                    Masking = true,
+                    CornerRadius = 8,
+                    Anchor = Anchor.BottomCentre,
+                    Origin = Anchor.BottomCentre,
                     Children = new Drawable[]
                     {
-                        volumeBox = new Box
-                        {
-                            X = 2,
-                            Anchor = Anchor.BottomLeft,
-                            Origin = Anchor.BottomLeft,
-                            Colour = ColourInfo.GradientVertical(colour, Color4.Black),
-                            RelativeSizeAxes = Axes.Both,
-                        },
                         new Box
                         {
-                            Colour = colour.Lighten(0.2f),
-                            Width = 2,
-                            RelativeSizeAxes = Axes.Y,
+                            Colour = colour,
+                            RelativeSizeAxes = Axes.Both,
                         },
+                        text = new OsuSpriteText
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Padding = new MarginPadding(5),
+                            Font = OsuFont.Default.With(size: 12, weight: FontWeight.SemiBold),
+                            Colour = colours.B5,
+                        }
                     }
                 },
-                text = new OsuSpriteText
-                {
-                    X = 2,
-                    Y = -5,
-                    Anchor = Anchor.BottomLeft,
-                    Alpha = 0.9f,
-                    Rotation = -90,
-                    Font = OsuFont.Default.With(weight: FontWeight.SemiBold)
-                }
             };
 
-            volume.BindValueChanged(volume => volumeBox.Height = volume.NewValue / 100f, true);
+            volume.BindValueChanged(volume => volumeBox.Height = max_volume_height * volume.NewValue / 100f, true);
             bank.BindValueChanged(bank => text.Text = bank.NewValue, true);
         }
     }

From 99f05253fd2f0cc7634e06571666af28b24b3e2a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 20:11:16 +0900
Subject: [PATCH 2460/3722] Adjust timeline sizing to closer match designs (but
 not 1:1 yet)

---
 .../Edit/Compose/Components/Timeline/Timeline.cs     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index bd7b426044..d688ad511f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -56,8 +56,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private Track track;
 
-        private const float timeline_height = 90;
-        private const float timeline_expanded_height = 180;
+        private const float timeline_height = 72;
+        private const float timeline_expanded_height = 150;
 
         public Timeline()
         {
@@ -74,6 +74,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private TimelineControlPointDisplay controlPoints;
 
+        private Container mainContent;
+
         private Bindable<float> waveformOpacity;
 
         [BackgroundDependencyLoader]
@@ -91,11 +93,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                     RelativeSizeAxes = Axes.X,
                     Height = timeline_expanded_height,
                 },
-                new Container
+                mainContent = new Container
                 {
                     RelativeSizeAxes = Axes.X,
-                    Anchor = Anchor.CentreLeft,
-                    Origin = Anchor.CentreLeft,
                     Height = timeline_height,
                     Depth = float.MaxValue,
                     Children = new[]
@@ -139,6 +139,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 if (visible.NewValue)
                 {
                     this.ResizeHeightTo(timeline_expanded_height, 200, Easing.OutQuint);
+                    mainContent.MoveToY(36, 200, Easing.OutQuint);
 
                     // delay the fade in else masking looks weird.
                     controlPoints.Delay(180).FadeIn(400, Easing.OutQuint);
@@ -149,6 +150,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
                     // likewise, delay the resize until the fade is complete.
                     this.Delay(180).ResizeHeightTo(timeline_height, 200, Easing.OutQuint);
+                    mainContent.Delay(180).MoveToY(0, 200, Easing.OutQuint);
                 }
             }, true);
 

From afbb674e526a12148e4c328e5b5a5618720fe081 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 20:11:32 +0900
Subject: [PATCH 2461/3722] TopLeft align check buttons so they don't move
 while interacting with them

---
 .../Screens/Edit/Compose/Components/Timeline/TimelineArea.cs  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
index f144fd3a65..ee3543354f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
@@ -56,11 +56,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                                     },
                                     new FillFlowContainer
                                     {
-                                        Anchor = Anchor.CentreLeft,
-                                        Origin = Anchor.CentreLeft,
                                         AutoSizeAxes = Axes.Y,
                                         Width = 160,
-                                        Padding = new MarginPadding { Horizontal = 10 },
+                                        Padding = new MarginPadding(10),
                                         Direction = FillDirection.Vertical,
                                         Spacing = new Vector2(0, 4),
                                         Children = new[]

From be08b9d1eff63dd7ec47c9e26323b90c3e63d208 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 20:54:29 +0900
Subject: [PATCH 2462/3722] Combine logic of Difficulty and Timing pieces where
 feasible

---
 .../ControlPoints/DifficultyControlPoint.cs   |  2 +-
 .../Timeline/DifficultyPointPiece.cs          | 58 +++----------------
 .../Components/Timeline/TimingPointPiece.cs   | 37 +-----------
 .../Components/Timeline/TopPointPiece.cs      | 55 ++++++++++++++++++
 4 files changed, 68 insertions(+), 84 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/Compose/Components/Timeline/TopPointPiece.cs

diff --git a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
index 73337ab6f5..8a6cfaf688 100644
--- a/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
+++ b/osu.Game/Beatmaps/ControlPoints/DifficultyControlPoint.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Beatmaps.ControlPoints
             MaxValue = 10
         };
 
-        public override Color4 GetRepresentingColour(OsuColour colours) => colours.GreenDark;
+        public override Color4 GetRepresentingColour(OsuColour colours) => colours.Lime1;
 
         /// <summary>
         /// The speed multiplier at this control point.
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
index 510ba8c094..3248936765 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
@@ -1,67 +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.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
-    public class DifficultyPointPiece : CompositeDrawable
+    public class DifficultyPointPiece : TopPointPiece
     {
-        private readonly DifficultyControlPoint difficultyPoint;
-
-        private OsuSpriteText speedMultiplierText;
         private readonly BindableNumber<double> speedMultiplier;
 
-        public DifficultyPointPiece(DifficultyControlPoint difficultyPoint)
+        public DifficultyPointPiece(DifficultyControlPoint point)
+            : base(point)
         {
-            this.difficultyPoint = difficultyPoint;
-            speedMultiplier = difficultyPoint.SpeedMultiplierBindable.GetBoundCopy();
+            speedMultiplier = point.SpeedMultiplierBindable.GetBoundCopy();
+
+            Y = Height;
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        protected override void LoadComplete()
         {
-            RelativeSizeAxes = Axes.Y;
-            AutoSizeAxes = Axes.X;
-
-            Color4 colour = difficultyPoint.GetRepresentingColour(colours);
-
-            InternalChildren = new Drawable[]
-            {
-                new Box
-                {
-                    Colour = colour,
-                    Width = 2,
-                    RelativeSizeAxes = Axes.Y,
-                },
-                new Container
-                {
-                    AutoSizeAxes = Axes.Both,
-                    Children = new Drawable[]
-                    {
-                        new Box
-                        {
-                            Colour = colour,
-                            RelativeSizeAxes = Axes.Both,
-                        },
-                        speedMultiplierText = new OsuSpriteText
-                        {
-                            Font = OsuFont.Default.With(weight: FontWeight.Bold),
-                            Colour = Color4.White,
-                        }
-                    }
-                },
-            };
-
-            speedMultiplier.BindValueChanged(multiplier => speedMultiplierText.Text = $"{multiplier.NewValue:n2}x", true);
+            base.LoadComplete();
+            speedMultiplier.BindValueChanged(multiplier => Label.Text = $"{multiplier.NewValue:n2}x", true);
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimingPointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimingPointPiece.cs
index cd1470aa0a..fa51281c55 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimingPointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimingPointPiece.cs
@@ -3,58 +3,27 @@
 
 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.ControlPoints;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
-    public class TimingPointPiece : CompositeDrawable
+    public class TimingPointPiece : TopPointPiece
     {
-        private readonly TimingControlPoint point;
-
         private readonly BindableNumber<double> beatLength;
-        private OsuSpriteText bpmText;
 
         public TimingPointPiece(TimingControlPoint point)
+            : base(point)
         {
-            this.point = point;
             beatLength = point.BeatLengthBindable.GetBoundCopy();
         }
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            Margin = new MarginPadding { Vertical = 10 };
-
-            const float corner_radius = 5;
-
-            AutoSizeAxes = Axes.Both;
-            Masking = true;
-            CornerRadius = corner_radius;
-
-            InternalChildren = new Drawable[]
-            {
-                new Box
-                {
-                    Colour = point.GetRepresentingColour(colours),
-                    RelativeSizeAxes = Axes.Both,
-                },
-                bpmText = new OsuSpriteText
-                {
-                    Alpha = 0.9f,
-                    Padding = new MarginPadding { Vertical = 3, Horizontal = 6 },
-                    Font = OsuFont.Default.With(size: 20, weight: FontWeight.SemiBold),
-                    Colour = colours.B5,
-                }
-            };
-
             beatLength.BindValueChanged(beatLength =>
             {
-                bpmText.Text = $"{60000 / beatLength.NewValue:n1} BPM";
+                Label.Text = $"{60000 / beatLength.NewValue:n1} BPM";
             }, true);
         }
     }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TopPointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TopPointPiece.cs
new file mode 100644
index 0000000000..60a9e1ed66
--- /dev/null
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TopPointPiece.cs
@@ -0,0 +1,55 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+
+namespace osu.Game.Screens.Edit.Compose.Components.Timeline
+{
+    public class TopPointPiece : CompositeDrawable
+    {
+        private readonly ControlPoint point;
+
+        protected OsuSpriteText Label { get; private set; }
+
+        public TopPointPiece(ControlPoint point)
+        {
+            this.point = point;
+            AutoSizeAxes = Axes.X;
+            Height = 16;
+            Margin = new MarginPadding(4);
+
+            Masking = true;
+            CornerRadius = Height / 2;
+
+            Origin = Anchor.TopCentre;
+            Anchor = Anchor.TopCentre;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            InternalChildren = new Drawable[]
+            {
+                new Box
+                {
+                    Colour = point.GetRepresentingColour(colours),
+                    RelativeSizeAxes = Axes.Both,
+                },
+                Label = new OsuSpriteText
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Padding = new MarginPadding(3),
+                    Font = OsuFont.Default.With(size: 14, weight: FontWeight.SemiBold),
+                    Colour = colours.B5,
+                }
+            };
+        }
+    }
+}

From d1c68cb92b0efe025fcaadd28f9c61ea4f4a17bf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 20:55:12 +0900
Subject: [PATCH 2463/3722] Simplify content creation of Timeline /
 TimelineArea

---
 .../Edit/Compose/Components/Timeline/Timeline.cs |  8 ++++++--
 .../Compose/Components/Timeline/TimelineArea.cs  | 16 ++++++++++++----
 .../Screens/Edit/EditorScreenWithTimeline.cs     | 10 +---------
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index d688ad511f..55fb557474 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -23,6 +23,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
     [Cached]
     public class Timeline : ZoomableScrollContainer, IPositionSnapProvider
     {
+        private readonly Drawable userContent;
         public readonly Bindable<bool> WaveformVisible = new Bindable<bool>();
 
         public readonly Bindable<bool> ControlPointsVisible = new Bindable<bool>();
@@ -57,10 +58,12 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private Track track;
 
         private const float timeline_height = 72;
-        private const float timeline_expanded_height = 150;
+        private const float timeline_expanded_height = 156;
 
-        public Timeline()
+        public Timeline(Drawable userContent)
         {
+            this.userContent = userContent;
+
             RelativeSizeAxes = Axes.X;
 
             ZoomDuration = 200;
@@ -118,6 +121,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                             Origin = Anchor.TopCentre,
                             Colour = colours.YellowDarker,
                         },
+                        userContent,
                     }
                 },
             });
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
index ee3543354f..1541ceade5 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
@@ -12,11 +12,19 @@ using osuTK;
 
 namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
-    public class TimelineArea : Container
+    public class TimelineArea : CompositeDrawable
     {
-        public readonly Timeline Timeline = new Timeline();
+        public Timeline Timeline;
 
-        protected override Container<Drawable> Content => Timeline;
+        private readonly Drawable userContent;
+
+        public TimelineArea(Drawable content = null)
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+
+            userContent = content ?? Drawable.Empty();
+        }
 
         [BackgroundDependencyLoader]
         private void load()
@@ -122,7 +130,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                                     }
                                 }
                             },
-                            Timeline
+                            Timeline = new Timeline(userContent),
                         },
                     },
                     RowDimensions = new[]
diff --git a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
index 26083e6a82..0d59a7a1a8 100644
--- a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
+++ b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
@@ -133,15 +133,7 @@ namespace osu.Game.Screens.Edit
                 mainContent.Add(content);
                 content.FadeInFromZero(300, Easing.OutQuint);
 
-                LoadComponentAsync(new TimelineArea
-                {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Children = new[]
-                    {
-                        CreateTimelineContent(),
-                    }
-                }, t =>
+                LoadComponentAsync(new TimelineArea(CreateTimelineContent()), t =>
                 {
                     timelineContainer.Add(t);
                     OnTimelineLoaded(t);

From 9dea0ae935ac4d4464bfc31a49ac42a4fe86f817 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 20:55:23 +0900
Subject: [PATCH 2464/3722] Update test scene to be able to see a bit more

---
 osu.Game.Tests/Visual/Editing/TimelineTestScene.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
index 88b4614791..4aed445d9d 100644
--- a/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
+++ b/osu.Game.Tests/Visual/Editing/TimelineTestScene.cs
@@ -53,13 +53,10 @@ namespace osu.Game.Tests.Visual.Editing
                         new AudioVisualiser(),
                     }
                 },
-                TimelineArea = new TimelineArea
+                TimelineArea = new TimelineArea(CreateTestComponent())
                 {
-                    Child = CreateTestComponent(),
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    RelativeSizeAxes = Axes.X,
-                    Size = new Vector2(0.8f, 100),
                 }
             });
         }

From f56125bd682b68df3c3a6a20e3c24b6d758486ee Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 14 Apr 2021 21:15:14 +0900
Subject: [PATCH 2465/3722] Update clock from base class

---
 osu.Game/Screens/Play/GameplayClockContainer.cs      | 12 +++++++++++-
 .../Screens/Play/MasterGameplayClockContainer.cs     | 12 +++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index d8e6fda87e..6d863f0094 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -77,8 +77,18 @@ namespace osu.Game.Screens.Play
                 Start();
         }
 
+        protected override void Update()
+        {
+            if (!IsPaused.Value)
+                ClockToProcess.ProcessFrame();
+
+            base.Update();
+        }
+
         protected abstract void OnIsPausedChanged(ValueChangedEvent<bool> isPaused);
 
-        protected abstract GameplayClock CreateGameplayClock(IClock source);
+        protected virtual IFrameBasedClock ClockToProcess => AdjustableClock;
+
+        protected abstract GameplayClock CreateGameplayClock(IFrameBasedClock source);
     }
 }
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index efc8ca732e..83e21f3c1d 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -128,7 +128,9 @@ namespace osu.Game.Screens.Play
             Seek(skipTarget);
         }
 
-        protected override GameplayClock CreateGameplayClock(IClock source)
+        protected override IFrameBasedClock ClockToProcess => userOffsetClock;
+
+        protected override GameplayClock CreateGameplayClock(IFrameBasedClock source)
         {
             // Lazer's audio timings in general doesn't match stable. This is the result of user testing, albeit limited.
             // This only seems to be required on windows. We need to eventually figure out why, with a bit of luck.
@@ -140,14 +142,6 @@ namespace osu.Game.Screens.Play
             return localGameplayClock = new LocalGameplayClock(userOffsetClock);
         }
 
-        protected override void Update()
-        {
-            if (!IsPaused.Value)
-                userOffsetClock.ProcessFrame();
-
-            base.Update();
-        }
-
         /// <summary>
         /// Changes the backing clock to avoid using the originally provided track.
         /// </summary>

From 505dc15e0389efb9586ac655f682b727e991dd30 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 14 Apr 2021 23:22:38 +0300
Subject: [PATCH 2466/3722] Add failing test case

---
 .../Background/TestSceneUserDimBackgrounds.cs | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
index 655b426e43..c0aab1b7ef 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
@@ -65,6 +65,21 @@ namespace osu.Game.Tests.Visual.Background
             stack.Push(songSelect = new DummySongSelect());
         });
 
+        /// <summary>
+        /// User settings should always be ignored on song select screen.
+        /// </summary>
+        [Test]
+        public void TestUserSettingsIgnoredOnSongSelect()
+        {
+            setupUserSettings();
+            AddAssert("Screen is undimmed", () => songSelect.IsBackgroundUndimmed());
+            AddAssert("Screen using background blur", () => songSelect.IsBackgroundBlur());
+            performFullSetup();
+            AddStep("Exit to song select", () => player.Exit());
+            AddUntilStep("Screen is undimmed", () => songSelect.IsBackgroundUndimmed());
+            AddUntilStep("Screen using background blur", () => songSelect.IsBackgroundBlur());
+        }
+
         /// <summary>
         /// Check if <see cref="PlayerLoader"/> properly triggers the visual settings preview when a user hovers over the visual settings panel.
         /// </summary>
@@ -227,17 +242,6 @@ namespace osu.Game.Tests.Visual.Background
                 songSelect.IsBackgroundUndimmed() && songSelect.IsBackgroundCurrent() && songSelect.CheckBackgroundBlur(results.ExpectedBackgroundBlur));
         }
 
-        /// <summary>
-        /// Check if background gets undimmed and unblurred when leaving <see cref="Player"/>  for <see cref="PlaySongSelect"/>
-        /// </summary>
-        [Test]
-        public void TestTransitionOut()
-        {
-            performFullSetup();
-            AddStep("Exit to song select", () => player.Exit());
-            AddUntilStep("Screen is undimmed and user blur removed", () => songSelect.IsBackgroundUndimmed() && songSelect.IsBlurCorrect());
-        }
-
         /// <summary>
         /// Check if hovering on the visual settings dialogue after resuming from player still previews the background dim.
         /// </summary>
@@ -333,7 +337,7 @@ namespace osu.Game.Tests.Visual.Background
 
             public bool IsBackgroundVisible() => background.CurrentAlpha == 1;
 
-            public bool IsBlurCorrect() => background.CurrentBlur == new Vector2(BACKGROUND_BLUR);
+            public bool IsBackgroundBlur() => background.CurrentBlur == new Vector2(BACKGROUND_BLUR);
 
             public bool CheckBackgroundBlur(Vector2 expected) => background.CurrentBlur == expected;
 

From a5fa14ac4ae010b77a66edd79fe394aeddbad022 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 14 Apr 2021 23:17:06 +0300
Subject: [PATCH 2467/3722] Ignore user settings on background screen beatmap
 by default

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

diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
index 10d381b8b7..02166644ab 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
@@ -50,6 +50,9 @@ namespace osu.Game.Screens.Backgrounds
 
             InternalChild = dimmable = CreateFadeContainer();
 
+            // Beatmap background screens should not apply user settings by default.
+            IgnoreUserSettings.Value = true;
+
             dimmable.IgnoreUserSettings.BindTo(IgnoreUserSettings);
             dimmable.IsBreakTime.BindTo(IsBreakTime);
             dimmable.BlurAmount.BindTo(BlurAmount);

From 7a9ff2ab380030871d434a1af6b0ae5c34ad9436 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 15 Apr 2021 00:48:15 +0300
Subject: [PATCH 2468/3722] Use until steps instead

Ah..
---
 .../Visual/Background/TestSceneUserDimBackgrounds.cs          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
index c0aab1b7ef..f89988cd1a 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
@@ -72,8 +72,8 @@ namespace osu.Game.Tests.Visual.Background
         public void TestUserSettingsIgnoredOnSongSelect()
         {
             setupUserSettings();
-            AddAssert("Screen is undimmed", () => songSelect.IsBackgroundUndimmed());
-            AddAssert("Screen using background blur", () => songSelect.IsBackgroundBlur());
+            AddUntilStep("Screen is undimmed", () => songSelect.IsBackgroundUndimmed());
+            AddUntilStep("Screen using background blur", () => songSelect.IsBackgroundBlur());
             performFullSetup();
             AddStep("Exit to song select", () => player.Exit());
             AddUntilStep("Screen is undimmed", () => songSelect.IsBackgroundUndimmed());

From 362a5a39d0068d3a143fd245ef80a053995c6a8c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 13:06:52 +0900
Subject: [PATCH 2469/3722] Scale the playfield to avoid off-screen objects

---
 osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
index 1ba6c47f4c..d646f41588 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
@@ -4,11 +4,14 @@
 using osu.Framework.Bindables;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.UI;
+using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    public class OsuModBarrelRoll : Mod, IUpdatableByPlayfield
+    public class OsuModBarrelRoll : Mod, IUpdatableByPlayfield, IApplicableToDrawableRuleset<OsuHitObject>
     {
         [SettingSource("Roll speed", "Speed at which things rotate")]
         public BindableNumber<double> SpinSpeed { get; } = new BindableDouble(1)
@@ -26,5 +29,11 @@ namespace osu.Game.Rulesets.Osu.Mods
         {
             playfield.Rotation = (float)(playfield.Time.Current / 1000 * SpinSpeed.Value);
         }
+
+        public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
+        {
+            // scale the playfield to allow all hitobjects to stay within the visible region.
+            drawableRuleset.Playfield.Scale = new Vector2(OsuPlayfield.BASE_SIZE.Y / OsuPlayfield.BASE_SIZE.X);
+        }
     }
 }

From 0d32290cd529cceb63e0fed31b3d46aeb4b2bca4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 13:15:52 +0900
Subject: [PATCH 2470/3722] Show roll speed in rotations-per-minute

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

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
index d646f41588..7cdfdb3c4a 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
@@ -13,12 +13,12 @@ namespace osu.Game.Rulesets.Osu.Mods
 {
     public class OsuModBarrelRoll : Mod, IUpdatableByPlayfield, IApplicableToDrawableRuleset<OsuHitObject>
     {
-        [SettingSource("Roll speed", "Speed at which things rotate")]
-        public BindableNumber<double> SpinSpeed { get; } = new BindableDouble(1)
+        [SettingSource("Roll speed", "Rotations per minute")]
+        public BindableNumber<double> SpinSpeed { get; } = new BindableDouble(0.5)
         {
-            MinValue = 0.1,
-            MaxValue = 20,
-            Precision = 0.1,
+            MinValue = 0.02,
+            MaxValue = 4,
+            Precision = 0.01,
         };
 
         public override string Name => "Barrel Roll";
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public void Update(Playfield playfield)
         {
-            playfield.Rotation = (float)(playfield.Time.Current / 1000 * SpinSpeed.Value);
+            playfield.Rotation = 360 * (float)(playfield.Time.Current / 60000 * SpinSpeed.Value);
         }
 
         public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)

From 175b8da2b27002c262d53cfa5c8f44d46034abbf Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 15 Apr 2021 00:04:38 +0300
Subject: [PATCH 2471/3722] Inverse ignore user settings bindable to "apply
 user settings" instead

---
 .../Background/TestSceneUserDimBackgrounds.cs    | 16 ++++++++--------
 .../Background/TestSceneUserDimContainer.cs      |  2 +-
 osu.Game/Graphics/Containers/UserDimContainer.cs |  8 ++++----
 osu.Game/Rulesets/Mods/ModCinema.cs              |  4 ++--
 .../Backgrounds/BackgroundScreenBeatmap.cs       | 15 ++++++---------
 osu.Game/Screens/Edit/Editor.cs                  |  2 +-
 osu.Game/Screens/Play/DimmableStoryboard.cs      |  4 ++--
 osu.Game/Screens/Play/Player.cs                  |  4 ++--
 osu.Game/Screens/Play/PlayerLoader.cs            |  6 +++---
 9 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
index f89988cd1a..d915442570 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
@@ -157,9 +157,9 @@ namespace osu.Game.Tests.Visual.Background
         {
             performFullSetup();
             AddUntilStep("Screen is dimmed and blur applied", () => songSelect.IsBackgroundDimmed() && songSelect.IsUserBlurApplied());
-            AddStep("Disable user dim", () => songSelect.IgnoreUserSettings.Value = true);
+            AddStep("Disable user dim", () => songSelect.ApplyUserSettings.Value = false);
             AddUntilStep("Screen is undimmed and user blur removed", () => songSelect.IsBackgroundUndimmed() && songSelect.IsUserBlurDisabled());
-            AddStep("Enable user dim", () => songSelect.IgnoreUserSettings.Value = false);
+            AddStep("Enable user dim", () => songSelect.ApplyUserSettings.Value = true);
             AddUntilStep("Screen is dimmed and blur applied", () => songSelect.IsBackgroundDimmed() && songSelect.IsUserBlurApplied());
         }
 
@@ -176,10 +176,10 @@ namespace osu.Game.Tests.Visual.Background
                 player.ReplacesBackground.Value = true;
                 player.StoryboardEnabled.Value = true;
             });
-            AddStep("Enable user dim", () => player.DimmableStoryboard.IgnoreUserSettings.Value = false);
+            AddStep("Enable user dim", () => player.DimmableStoryboard.ApplyUserSettings.Value = true);
             AddStep("Set dim level to 1", () => songSelect.DimLevel.Value = 1f);
             AddUntilStep("Storyboard is invisible", () => !player.IsStoryboardVisible);
-            AddStep("Disable user dim", () => player.DimmableStoryboard.IgnoreUserSettings.Value = true);
+            AddStep("Disable user dim", () => player.DimmableStoryboard.ApplyUserSettings.Value = false);
             AddUntilStep("Storyboard is visible", () => player.IsStoryboardVisible);
         }
 
@@ -195,8 +195,8 @@ namespace osu.Game.Tests.Visual.Background
 
             AddStep("Ignore user settings", () =>
             {
-                player.ApplyToBackground(b => b.IgnoreUserSettings.Value = true);
-                player.DimmableStoryboard.IgnoreUserSettings.Value = true;
+                player.ApplyToBackground(b => b.ApplyUserSettings.Value = false);
+                player.DimmableStoryboard.ApplyUserSettings.Value = false;
             });
             AddUntilStep("Storyboard is visible", () => player.IsStoryboardVisible);
             AddUntilStep("Background is invisible", () => songSelect.IsBackgroundInvisible());
@@ -308,11 +308,11 @@ namespace osu.Game.Tests.Visual.Background
             protected override BackgroundScreen CreateBackground()
             {
                 background = new FadeAccessibleBackground(Beatmap.Value);
-                IgnoreUserSettings.BindTo(background.IgnoreUserSettings);
+                ApplyUserSettings.BindTo(background.ApplyUserSettings);
                 return background;
             }
 
-            public readonly Bindable<bool> IgnoreUserSettings = new Bindable<bool>();
+            public readonly Bindable<bool> ApplyUserSettings = new Bindable<bool>();
             public readonly Bindable<double> DimLevel = new BindableDouble();
             public readonly Bindable<double> BlurLevel = new BindableDouble();
 
diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimContainer.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimContainer.cs
index fede99f450..9c3a044f18 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimContainer.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimContainer.cs
@@ -94,7 +94,7 @@ namespace osu.Game.Tests.Visual.Background
             AddStep("set dim level 0.6", () => userDimContainer.UserDimLevel.Value = test_user_dim);
             AddUntilStep("dim reached", () => userDimContainer.DimEqual(test_user_dim));
 
-            AddStep("ignore settings", () => userDimContainer.IgnoreUserSettings.Value = true);
+            AddStep("ignore settings", () => userDimContainer.ApplyUserSettings.Value = false);
             AddUntilStep("no dim", () => userDimContainer.DimEqual(0));
             AddStep("set break", () => isBreakTime.Value = true);
             AddAssert("no dim", () => userDimContainer.DimEqual(0));
diff --git a/osu.Game/Graphics/Containers/UserDimContainer.cs b/osu.Game/Graphics/Containers/UserDimContainer.cs
index 4e555ac1eb..a3d59da961 100644
--- a/osu.Game/Graphics/Containers/UserDimContainer.cs
+++ b/osu.Game/Graphics/Containers/UserDimContainer.cs
@@ -24,9 +24,9 @@ namespace osu.Game.Graphics.Containers
         protected 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 effect settings should be applied to this container.
         /// </summary>
-        public readonly Bindable<bool> IgnoreUserSettings = new Bindable<bool>();
+        public readonly Bindable<bool> ApplyUserSettings = new Bindable<bool>(true);
 
         /// <summary>
         /// Whether or not the storyboard loaded should completely hide the background behind it.
@@ -52,7 +52,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 : 0, 0);
+        protected float DimLevel => Math.Max(ApplyUserSettings.Value ? (float)UserDimLevel.Value - breakLightening : 0, 0);
 
         protected override Container<Drawable> Content => dimContent;
 
@@ -78,7 +78,7 @@ namespace osu.Game.Graphics.Containers
             IsBreakTime.ValueChanged += _ => UpdateVisuals();
             ShowStoryboard.ValueChanged += _ => UpdateVisuals();
             StoryboardReplacesBackground.ValueChanged += _ => UpdateVisuals();
-            IgnoreUserSettings.ValueChanged += _ => UpdateVisuals();
+            ApplyUserSettings.ValueChanged += _ => UpdateVisuals();
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Rulesets/Mods/ModCinema.cs b/osu.Game/Rulesets/Mods/ModCinema.cs
index c78088ba2d..93062218fe 100644
--- a/osu.Game/Rulesets/Mods/ModCinema.cs
+++ b/osu.Game/Rulesets/Mods/ModCinema.cs
@@ -37,8 +37,8 @@ namespace osu.Game.Rulesets.Mods
 
         public void ApplyToPlayer(Player player)
         {
-            player.ApplyToBackground(b => b.IgnoreUserSettings.Value = true);
-            player.DimmableStoryboard.IgnoreUserSettings.Value = true;
+            player.ApplyToBackground(b => b.ApplyUserSettings.Value = false);
+            player.DimmableStoryboard.ApplyUserSettings.Value = false;
 
             player.BreakOverlay.Hide();
         }
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
index 02166644ab..553a8f3689 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
@@ -27,9 +27,9 @@ namespace osu.Game.Screens.Backgrounds
         private WorkingBeatmap beatmap;
 
         /// <summary>
-        /// Whether or not user-configured settings relating to brightness of elements should be ignored
+        /// Whether or not user-configured effect settings should be applied to this background screen.
         /// </summary>
-        public readonly Bindable<bool> IgnoreUserSettings = new Bindable<bool>();
+        public readonly Bindable<bool> ApplyUserSettings = new Bindable<bool>();
 
         public readonly Bindable<bool> StoryboardReplacesBackground = new Bindable<bool>();
 
@@ -50,10 +50,7 @@ namespace osu.Game.Screens.Backgrounds
 
             InternalChild = dimmable = CreateFadeContainer();
 
-            // Beatmap background screens should not apply user settings by default.
-            IgnoreUserSettings.Value = true;
-
-            dimmable.IgnoreUserSettings.BindTo(IgnoreUserSettings);
+            dimmable.ApplyUserSettings.BindTo(ApplyUserSettings);
             dimmable.IsBreakTime.BindTo(IsBreakTime);
             dimmable.BlurAmount.BindTo(BlurAmount);
 
@@ -151,7 +148,7 @@ namespace osu.Game.Screens.Backgrounds
             /// <summary>
             /// As an optimisation, we add the two blur portions to be applied rather than actually applying two separate blurs.
             /// </summary>
-            private Vector2 blurTarget => !IgnoreUserSettings.Value
+            private Vector2 blurTarget => ApplyUserSettings.Value
                 ? new Vector2(BlurAmount.Value + (float)userBlurLevel.Value * USER_BLUR_FACTOR)
                 : new Vector2(BlurAmount.Value);
 
@@ -170,8 +167,8 @@ namespace osu.Game.Screens.Backgrounds
             }
 
             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;
+                // The background needs to be hidden in the case of it being replaced by the storyboard.
+                => (ApplyUserSettings.Value && !ShowStoryboard.Value) || !StoryboardReplacesBackground.Value;
 
             protected override void UpdateVisuals()
             {
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index fffea65456..99c6cce26f 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -467,7 +467,7 @@ namespace osu.Game.Screens.Edit
                 // todo: temporary. we want to be applying dim using the UserDimContainer eventually.
                 b.FadeColour(Color4.DarkGray, 500);
 
-                b.IgnoreUserSettings.Value = true;
+                b.ApplyUserSettings.Value = false;
                 b.BlurAmount.Value = 0;
             });
 
diff --git a/osu.Game/Screens/Play/DimmableStoryboard.cs b/osu.Game/Screens/Play/DimmableStoryboard.cs
index 58eb95b7c6..105f672847 100644
--- a/osu.Game/Screens/Play/DimmableStoryboard.cs
+++ b/osu.Game/Screens/Play/DimmableStoryboard.cs
@@ -38,14 +38,14 @@ namespace osu.Game.Screens.Play
             base.LoadComplete();
         }
 
-        protected override bool ShowDimContent => IgnoreUserSettings.Value || (ShowStoryboard.Value && DimLevel < 1);
+        protected override bool ShowDimContent => !ApplyUserSettings.Value || (ShowStoryboard.Value && DimLevel < 1);
 
         private void initializeStoryboard(bool async)
         {
             if (drawableStoryboard != null)
                 return;
 
-            if (!ShowStoryboard.Value && !IgnoreUserSettings.Value)
+            if (ApplyUserSettings.Value && !ShowStoryboard.Value)
                 return;
 
             drawableStoryboard = storyboard.CreateDrawable();
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index dd3f58439b..1c71305baf 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -764,7 +764,7 @@ namespace osu.Game.Screens.Play
 
             ApplyToBackground(b =>
             {
-                b.IgnoreUserSettings.Value = false;
+                b.ApplyUserSettings.Value = true;
                 b.BlurAmount.Value = 0;
 
                 // bind component bindables.
@@ -913,7 +913,7 @@ namespace osu.Game.Screens.Play
             float fadeOutDuration = instant ? 0 : 250;
             this.FadeOut(fadeOutDuration);
 
-            ApplyToBackground(b => b.IgnoreUserSettings.Value = true);
+            ApplyToBackground(b => b.ApplyUserSettings.Value = false);
             storyboardReplacesBackground.Value = false;
         }
 
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index cf15104809..8627432c11 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -229,7 +229,7 @@ namespace osu.Game.Screens.Play
             content.ScaleTo(0.7f, 150, Easing.InQuint);
             this.FadeOut(150);
 
-            ApplyToBackground(b => b.IgnoreUserSettings.Value = true);
+            ApplyToBackground(b => b.ApplyUserSettings.Value = false);
 
             BackgroundBrightnessReduction = false;
             Beatmap.Value.Track.RemoveAdjustment(AdjustableProperty.Volume, volumeAdjustment);
@@ -277,7 +277,7 @@ namespace osu.Game.Screens.Play
                 // Preview user-defined background dim and blur when hovered on the visual settings panel.
                 ApplyToBackground(b =>
                 {
-                    b.IgnoreUserSettings.Value = false;
+                    b.ApplyUserSettings.Value = true;
                     b.BlurAmount.Value = 0;
                 });
 
@@ -288,7 +288,7 @@ namespace osu.Game.Screens.Play
                 ApplyToBackground(b =>
                 {
                     // Returns background dim and blur to the values specified by PlayerLoader.
-                    b.IgnoreUserSettings.Value = true;
+                    b.ApplyUserSettings.Value = false;
                     b.BlurAmount.Value = BACKGROUND_BLUR;
                 });
 

From 92fd34cea99c659155089ef828f54a65e620989b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 15 Apr 2021 08:02:12 +0300
Subject: [PATCH 2472/3722] Revert "Inverse ignore user settings bindable to
 "apply user settings" instead"

This reverts commit 175b8da2b27002c262d53cfa5c8f44d46034abbf.
---
 .../Background/TestSceneUserDimBackgrounds.cs    | 16 ++++++++--------
 .../Background/TestSceneUserDimContainer.cs      |  2 +-
 osu.Game/Graphics/Containers/UserDimContainer.cs |  8 ++++----
 osu.Game/Rulesets/Mods/ModCinema.cs              |  4 ++--
 .../Backgrounds/BackgroundScreenBeatmap.cs       | 15 +++++++++------
 osu.Game/Screens/Edit/Editor.cs                  |  2 +-
 osu.Game/Screens/Play/DimmableStoryboard.cs      |  4 ++--
 osu.Game/Screens/Play/Player.cs                  |  4 ++--
 osu.Game/Screens/Play/PlayerLoader.cs            |  6 +++---
 9 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
index d915442570..f89988cd1a 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
@@ -157,9 +157,9 @@ namespace osu.Game.Tests.Visual.Background
         {
             performFullSetup();
             AddUntilStep("Screen is dimmed and blur applied", () => songSelect.IsBackgroundDimmed() && songSelect.IsUserBlurApplied());
-            AddStep("Disable user dim", () => songSelect.ApplyUserSettings.Value = false);
+            AddStep("Disable user dim", () => songSelect.IgnoreUserSettings.Value = true);
             AddUntilStep("Screen is undimmed and user blur removed", () => songSelect.IsBackgroundUndimmed() && songSelect.IsUserBlurDisabled());
-            AddStep("Enable user dim", () => songSelect.ApplyUserSettings.Value = true);
+            AddStep("Enable user dim", () => songSelect.IgnoreUserSettings.Value = false);
             AddUntilStep("Screen is dimmed and blur applied", () => songSelect.IsBackgroundDimmed() && songSelect.IsUserBlurApplied());
         }
 
@@ -176,10 +176,10 @@ namespace osu.Game.Tests.Visual.Background
                 player.ReplacesBackground.Value = true;
                 player.StoryboardEnabled.Value = true;
             });
-            AddStep("Enable user dim", () => player.DimmableStoryboard.ApplyUserSettings.Value = true);
+            AddStep("Enable user dim", () => player.DimmableStoryboard.IgnoreUserSettings.Value = false);
             AddStep("Set dim level to 1", () => songSelect.DimLevel.Value = 1f);
             AddUntilStep("Storyboard is invisible", () => !player.IsStoryboardVisible);
-            AddStep("Disable user dim", () => player.DimmableStoryboard.ApplyUserSettings.Value = false);
+            AddStep("Disable user dim", () => player.DimmableStoryboard.IgnoreUserSettings.Value = true);
             AddUntilStep("Storyboard is visible", () => player.IsStoryboardVisible);
         }
 
@@ -195,8 +195,8 @@ namespace osu.Game.Tests.Visual.Background
 
             AddStep("Ignore user settings", () =>
             {
-                player.ApplyToBackground(b => b.ApplyUserSettings.Value = false);
-                player.DimmableStoryboard.ApplyUserSettings.Value = false;
+                player.ApplyToBackground(b => b.IgnoreUserSettings.Value = true);
+                player.DimmableStoryboard.IgnoreUserSettings.Value = true;
             });
             AddUntilStep("Storyboard is visible", () => player.IsStoryboardVisible);
             AddUntilStep("Background is invisible", () => songSelect.IsBackgroundInvisible());
@@ -308,11 +308,11 @@ namespace osu.Game.Tests.Visual.Background
             protected override BackgroundScreen CreateBackground()
             {
                 background = new FadeAccessibleBackground(Beatmap.Value);
-                ApplyUserSettings.BindTo(background.ApplyUserSettings);
+                IgnoreUserSettings.BindTo(background.IgnoreUserSettings);
                 return background;
             }
 
-            public readonly Bindable<bool> ApplyUserSettings = new Bindable<bool>();
+            public readonly Bindable<bool> IgnoreUserSettings = new Bindable<bool>();
             public readonly Bindable<double> DimLevel = new BindableDouble();
             public readonly Bindable<double> BlurLevel = new BindableDouble();
 
diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimContainer.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimContainer.cs
index 9c3a044f18..fede99f450 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimContainer.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimContainer.cs
@@ -94,7 +94,7 @@ namespace osu.Game.Tests.Visual.Background
             AddStep("set dim level 0.6", () => userDimContainer.UserDimLevel.Value = test_user_dim);
             AddUntilStep("dim reached", () => userDimContainer.DimEqual(test_user_dim));
 
-            AddStep("ignore settings", () => userDimContainer.ApplyUserSettings.Value = false);
+            AddStep("ignore settings", () => userDimContainer.IgnoreUserSettings.Value = true);
             AddUntilStep("no dim", () => userDimContainer.DimEqual(0));
             AddStep("set break", () => isBreakTime.Value = true);
             AddAssert("no dim", () => userDimContainer.DimEqual(0));
diff --git a/osu.Game/Graphics/Containers/UserDimContainer.cs b/osu.Game/Graphics/Containers/UserDimContainer.cs
index a3d59da961..4e555ac1eb 100644
--- a/osu.Game/Graphics/Containers/UserDimContainer.cs
+++ b/osu.Game/Graphics/Containers/UserDimContainer.cs
@@ -24,9 +24,9 @@ namespace osu.Game.Graphics.Containers
         protected const double BACKGROUND_FADE_DURATION = 800;
 
         /// <summary>
-        /// Whether or not user-configured effect settings should be applied to this container.
+        /// Whether or not user-configured settings relating to brightness of elements should be ignored
         /// </summary>
-        public readonly Bindable<bool> ApplyUserSettings = new Bindable<bool>(true);
+        public readonly Bindable<bool> IgnoreUserSettings = new Bindable<bool>();
 
         /// <summary>
         /// Whether or not the storyboard loaded should completely hide the background behind it.
@@ -52,7 +52,7 @@ namespace osu.Game.Graphics.Containers
 
         private float breakLightening => LightenDuringBreaks.Value && IsBreakTime.Value ? BREAK_LIGHTEN_AMOUNT : 0;
 
-        protected float DimLevel => Math.Max(ApplyUserSettings.Value ? (float)UserDimLevel.Value - breakLightening : 0, 0);
+        protected float DimLevel => Math.Max(!IgnoreUserSettings.Value ? (float)UserDimLevel.Value - breakLightening : 0, 0);
 
         protected override Container<Drawable> Content => dimContent;
 
@@ -78,7 +78,7 @@ namespace osu.Game.Graphics.Containers
             IsBreakTime.ValueChanged += _ => UpdateVisuals();
             ShowStoryboard.ValueChanged += _ => UpdateVisuals();
             StoryboardReplacesBackground.ValueChanged += _ => UpdateVisuals();
-            ApplyUserSettings.ValueChanged += _ => UpdateVisuals();
+            IgnoreUserSettings.ValueChanged += _ => UpdateVisuals();
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Rulesets/Mods/ModCinema.cs b/osu.Game/Rulesets/Mods/ModCinema.cs
index 93062218fe..c78088ba2d 100644
--- a/osu.Game/Rulesets/Mods/ModCinema.cs
+++ b/osu.Game/Rulesets/Mods/ModCinema.cs
@@ -37,8 +37,8 @@ namespace osu.Game.Rulesets.Mods
 
         public void ApplyToPlayer(Player player)
         {
-            player.ApplyToBackground(b => b.ApplyUserSettings.Value = false);
-            player.DimmableStoryboard.ApplyUserSettings.Value = false;
+            player.ApplyToBackground(b => b.IgnoreUserSettings.Value = true);
+            player.DimmableStoryboard.IgnoreUserSettings.Value = true;
 
             player.BreakOverlay.Hide();
         }
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
index 553a8f3689..02166644ab 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
@@ -27,9 +27,9 @@ namespace osu.Game.Screens.Backgrounds
         private WorkingBeatmap beatmap;
 
         /// <summary>
-        /// Whether or not user-configured effect settings should be applied to this background screen.
+        /// Whether or not user-configured settings relating to brightness of elements should be ignored
         /// </summary>
-        public readonly Bindable<bool> ApplyUserSettings = new Bindable<bool>();
+        public readonly Bindable<bool> IgnoreUserSettings = new Bindable<bool>();
 
         public readonly Bindable<bool> StoryboardReplacesBackground = new Bindable<bool>();
 
@@ -50,7 +50,10 @@ namespace osu.Game.Screens.Backgrounds
 
             InternalChild = dimmable = CreateFadeContainer();
 
-            dimmable.ApplyUserSettings.BindTo(ApplyUserSettings);
+            // Beatmap background screens should not apply user settings by default.
+            IgnoreUserSettings.Value = true;
+
+            dimmable.IgnoreUserSettings.BindTo(IgnoreUserSettings);
             dimmable.IsBreakTime.BindTo(IsBreakTime);
             dimmable.BlurAmount.BindTo(BlurAmount);
 
@@ -148,7 +151,7 @@ namespace osu.Game.Screens.Backgrounds
             /// <summary>
             /// As an optimisation, we add the two blur portions to be applied rather than actually applying two separate blurs.
             /// </summary>
-            private Vector2 blurTarget => ApplyUserSettings.Value
+            private Vector2 blurTarget => !IgnoreUserSettings.Value
                 ? new Vector2(BlurAmount.Value + (float)userBlurLevel.Value * USER_BLUR_FACTOR)
                 : new Vector2(BlurAmount.Value);
 
@@ -167,8 +170,8 @@ namespace osu.Game.Screens.Backgrounds
             }
 
             protected override bool ShowDimContent
-                // The background needs to be hidden in the case of it being replaced by the storyboard.
-                => (ApplyUserSettings.Value && !ShowStoryboard.Value) || !StoryboardReplacesBackground.Value;
+                // The background needs to be hidden in the case of it being replaced by the storyboard
+                => (!ShowStoryboard.Value && !IgnoreUserSettings.Value) || !StoryboardReplacesBackground.Value;
 
             protected override void UpdateVisuals()
             {
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 99c6cce26f..fffea65456 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -467,7 +467,7 @@ namespace osu.Game.Screens.Edit
                 // todo: temporary. we want to be applying dim using the UserDimContainer eventually.
                 b.FadeColour(Color4.DarkGray, 500);
 
-                b.ApplyUserSettings.Value = false;
+                b.IgnoreUserSettings.Value = true;
                 b.BlurAmount.Value = 0;
             });
 
diff --git a/osu.Game/Screens/Play/DimmableStoryboard.cs b/osu.Game/Screens/Play/DimmableStoryboard.cs
index 105f672847..58eb95b7c6 100644
--- a/osu.Game/Screens/Play/DimmableStoryboard.cs
+++ b/osu.Game/Screens/Play/DimmableStoryboard.cs
@@ -38,14 +38,14 @@ namespace osu.Game.Screens.Play
             base.LoadComplete();
         }
 
-        protected override bool ShowDimContent => !ApplyUserSettings.Value || (ShowStoryboard.Value && DimLevel < 1);
+        protected override bool ShowDimContent => IgnoreUserSettings.Value || (ShowStoryboard.Value && DimLevel < 1);
 
         private void initializeStoryboard(bool async)
         {
             if (drawableStoryboard != null)
                 return;
 
-            if (ApplyUserSettings.Value && !ShowStoryboard.Value)
+            if (!ShowStoryboard.Value && !IgnoreUserSettings.Value)
                 return;
 
             drawableStoryboard = storyboard.CreateDrawable();
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 1c71305baf..dd3f58439b 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -764,7 +764,7 @@ namespace osu.Game.Screens.Play
 
             ApplyToBackground(b =>
             {
-                b.ApplyUserSettings.Value = true;
+                b.IgnoreUserSettings.Value = false;
                 b.BlurAmount.Value = 0;
 
                 // bind component bindables.
@@ -913,7 +913,7 @@ namespace osu.Game.Screens.Play
             float fadeOutDuration = instant ? 0 : 250;
             this.FadeOut(fadeOutDuration);
 
-            ApplyToBackground(b => b.ApplyUserSettings.Value = false);
+            ApplyToBackground(b => b.IgnoreUserSettings.Value = true);
             storyboardReplacesBackground.Value = false;
         }
 
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 8627432c11..cf15104809 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -229,7 +229,7 @@ namespace osu.Game.Screens.Play
             content.ScaleTo(0.7f, 150, Easing.InQuint);
             this.FadeOut(150);
 
-            ApplyToBackground(b => b.ApplyUserSettings.Value = false);
+            ApplyToBackground(b => b.IgnoreUserSettings.Value = true);
 
             BackgroundBrightnessReduction = false;
             Beatmap.Value.Track.RemoveAdjustment(AdjustableProperty.Volume, volumeAdjustment);
@@ -277,7 +277,7 @@ namespace osu.Game.Screens.Play
                 // Preview user-defined background dim and blur when hovered on the visual settings panel.
                 ApplyToBackground(b =>
                 {
-                    b.ApplyUserSettings.Value = true;
+                    b.IgnoreUserSettings.Value = false;
                     b.BlurAmount.Value = 0;
                 });
 
@@ -288,7 +288,7 @@ namespace osu.Game.Screens.Play
                 ApplyToBackground(b =>
                 {
                     // Returns background dim and blur to the values specified by PlayerLoader.
-                    b.ApplyUserSettings.Value = false;
+                    b.IgnoreUserSettings.Value = true;
                     b.BlurAmount.Value = BACKGROUND_BLUR;
                 });
 

From 6c5234f8daa605ffb936b492edd0e247ee71351a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 15 Apr 2021 08:04:03 +0300
Subject: [PATCH 2473/3722] Move default `IgnoreUserSettings` value to
 construction

---
 .../Screens/Backgrounds/BackgroundScreenBeatmap.cs     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
index 02166644ab..65bc9cfaea 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
@@ -27,9 +27,12 @@ namespace osu.Game.Screens.Backgrounds
         private WorkingBeatmap beatmap;
 
         /// <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>
-        public readonly Bindable<bool> IgnoreUserSettings = new Bindable<bool>();
+        /// <remarks>
+        /// Beatmap background screens should not apply user settings by default.
+        /// </remarks>
+        public readonly Bindable<bool> IgnoreUserSettings = new Bindable<bool>(true);
 
         public readonly Bindable<bool> StoryboardReplacesBackground = new Bindable<bool>();
 
@@ -50,9 +53,6 @@ namespace osu.Game.Screens.Backgrounds
 
             InternalChild = dimmable = CreateFadeContainer();
 
-            // Beatmap background screens should not apply user settings by default.
-            IgnoreUserSettings.Value = true;
-
             dimmable.IgnoreUserSettings.BindTo(IgnoreUserSettings);
             dimmable.IsBreakTime.BindTo(IsBreakTime);
             dimmable.BlurAmount.BindTo(BlurAmount);

From 5eaf3ea5765e21a0137b983fa586651d0228ffc5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 14:19:06 +0900
Subject: [PATCH 2474/3722] Reorganise and reword comments to make time
 override behaviour a bit clearer

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

diff --git a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
index a7f11b1e6f..279087ead9 100644
--- a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
+++ b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
@@ -128,13 +128,13 @@ namespace osu.Game.Rulesets.Replays
             double frameStart = getFrameTime(currentFrameIndex);
             double frameEnd = getFrameTime(currentFrameIndex + 1);
 
-            // If the proposed time is after the current frame end time, we progress forwards.
-            // If the proposed time is before the current frame start time, and we are at the frame boundary, we progress backwards.
+            // If the proposed time is after the current frame end time, we progress forwards to precisely the new frame's time (regardless of incoming time).
             if (frameEnd <= time)
             {
                 time = frameEnd;
                 currentFrameIndex++;
             }
+            // If the proposed time is before the current frame start time, and we are at the frame boundary, we progress backwards.
             else if (time < frameStart && CurrentTime == frameStart)
                 currentFrameIndex--;
 

From ba325de5959bb83828fc222b359fcb9f9c846236 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 14:19:59 +0900
Subject: [PATCH 2475/3722] Merge conditionals for readability

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

diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 1c0d820a3d..5ab09f9516 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -107,7 +107,7 @@ namespace osu.Game.Rulesets.UI
 
         protected override List<IInput> GetPendingInputs()
         {
-            if (replayInputHandler != null && !replayInputHandler.IsActive)
+            if (replayInputHandler?.IsActive == false)
                 return emptyInputList;
 
             return base.GetPendingInputs();

From 346e36d32a09ebdafb1c902f4eb0b03e45fddf42 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 14:32:01 +0900
Subject: [PATCH 2476/3722] Make `Mod.Description` abstract and add missing
 descriptions

---
 osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs               | 1 +
 osu.Game.Rulesets.Osu/Mods/OsuModTouchDevice.cs              | 1 +
 .../NonVisual/DifficultyAdjustmentModCombinationsTest.cs     | 5 +++++
 osu.Game.Tests/Online/TestAPIModJsonSerialization.cs         | 2 ++
 osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs  | 3 +++
 osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs      | 1 +
 osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs    | 2 ++
 osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs  | 2 ++
 osu.Game/Rulesets/Mods/Mod.cs                                | 2 +-
 osu.Game/Rulesets/Mods/ModNoMod.cs                           | 1 +
 10 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs
index 485595cea9..fa1eb10f5e 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs
@@ -15,6 +15,7 @@ namespace osu.Game.Rulesets.Mania.Mods
         public override string Name => "Mirror";
         public override string Acronym => "MR";
         public override ModType Type => ModType.Conversion;
+        public override string Description => "Notes are flipped horizontally";
         public override double ScoreMultiplier => 1;
         public override bool Ranked => true;
 
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModTouchDevice.cs b/osu.Game.Rulesets.Osu/Mods/OsuModTouchDevice.cs
index f0db548e74..3b16e9d2b7 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModTouchDevice.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModTouchDevice.cs
@@ -9,6 +9,7 @@ namespace osu.Game.Rulesets.Osu.Mods
     {
         public override string Name => "Touch Device";
         public override string Acronym => "TD";
+        public override string Description => "Automatically applied to plays on devices with a touchscreen.";
         public override double ScoreMultiplier => 1;
 
         public override ModType Type => ModType.System;
diff --git a/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs b/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs
index 1c0bfd56dd..16c1004f37 100644
--- a/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs
+++ b/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs
@@ -144,6 +144,7 @@ namespace osu.Game.Tests.NonVisual
         {
             public override string Name => nameof(ModA);
             public override string Acronym => nameof(ModA);
+            public override string Description => string.Empty;
             public override double ScoreMultiplier => 1;
 
             public override Type[] IncompatibleMods => new[] { typeof(ModIncompatibleWithA), typeof(ModIncompatibleWithAAndB) };
@@ -152,6 +153,7 @@ namespace osu.Game.Tests.NonVisual
         private class ModB : Mod
         {
             public override string Name => nameof(ModB);
+            public override string Description => string.Empty;
             public override string Acronym => nameof(ModB);
             public override double ScoreMultiplier => 1;
 
@@ -162,6 +164,7 @@ namespace osu.Game.Tests.NonVisual
         {
             public override string Name => nameof(ModC);
             public override string Acronym => nameof(ModC);
+            public override string Description => string.Empty;
             public override double ScoreMultiplier => 1;
         }
 
@@ -169,6 +172,7 @@ namespace osu.Game.Tests.NonVisual
         {
             public override string Name => $"Incompatible With {nameof(ModA)}";
             public override string Acronym => $"Incompatible With {nameof(ModA)}";
+            public override string Description => string.Empty;
             public override double ScoreMultiplier => 1;
 
             public override Type[] IncompatibleMods => new[] { typeof(ModA) };
@@ -187,6 +191,7 @@ namespace osu.Game.Tests.NonVisual
         {
             public override string Name => $"Incompatible With {nameof(ModA)} and {nameof(ModB)}";
             public override string Acronym => $"Incompatible With {nameof(ModA)} and {nameof(ModB)}";
+            public override string Description => string.Empty;
             public override double ScoreMultiplier => 1;
 
             public override Type[] IncompatibleMods => new[] { typeof(ModA), typeof(ModB) };
diff --git a/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs b/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
index 3afb7481b1..ad2007f202 100644
--- a/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
+++ b/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
@@ -140,6 +140,7 @@ namespace osu.Game.Tests.Online
         {
             public override string Name => "Test Mod";
             public override string Acronym => "TM";
+            public override string Description => "This is a test mod.";
             public override double ScoreMultiplier => 1;
 
             [SettingSource("Test")]
@@ -156,6 +157,7 @@ namespace osu.Game.Tests.Online
         {
             public override string Name => "Test Mod";
             public override string Acronym => "TMTR";
+            public override string Description => "This is a test mod.";
             public override double ScoreMultiplier => 1;
 
             [SettingSource("Initial rate", "The starting speed of the track")]
diff --git a/osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs b/osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs
index 74db477cfc..0462e9feb5 100644
--- a/osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs
+++ b/osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs
@@ -100,6 +100,7 @@ namespace osu.Game.Tests.Online
         {
             public override string Name => "Test Mod";
             public override string Acronym => "TM";
+            public override string Description => "This is a test mod.";
             public override double ScoreMultiplier => 1;
 
             [SettingSource("Test")]
@@ -116,6 +117,7 @@ namespace osu.Game.Tests.Online
         {
             public override string Name => "Test Mod";
             public override string Acronym => "TMTR";
+            public override string Description => "This is a test mod.";
             public override double ScoreMultiplier => 1;
 
             [SettingSource("Initial rate", "The starting speed of the track")]
@@ -150,6 +152,7 @@ namespace osu.Game.Tests.Online
         {
             public override string Name => "Test Mod";
             public override string Acronym => "TM";
+            public override string Description => "This is a test mod.";
             public override double ScoreMultiplier => 1;
 
             [SettingSource("Test")]
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index 88fbf09ef4..280c182259 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -321,6 +321,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             public override string Name => string.Empty;
             public override string Acronym => string.Empty;
             public override double ScoreMultiplier => 1;
+            public override string Description => string.Empty;
 
             public bool Applied { get; private set; }
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs
index 443cf59003..fdc21d80ff 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs
@@ -57,6 +57,8 @@ namespace osu.Game.Tests.Visual.UserInterface
         private abstract class TestMod : Mod, IApplicableMod
         {
             public override double ScoreMultiplier => 1.0;
+
+            public override string Description => "This is a test mod.";
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
index 89f9b7381b..2158cf77e5 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
@@ -226,6 +226,8 @@ namespace osu.Game.Tests.Visual.UserInterface
         {
             public override double ScoreMultiplier => 1.0;
 
+            public override string Description => "This is a customisable test mod.";
+
             public override ModType Type => ModType.Conversion;
 
             [SettingSource("Sample float", "Change something for a mod")]
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 832a14ee1e..4879590e24 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Mods
         /// The user readable description of this mod.
         /// </summary>
         [JsonIgnore]
-        public virtual string Description => string.Empty;
+        public abstract string Description { get; }
 
         /// <summary>
         /// The tooltip to display for this mod when used in a <see cref="ModIcon"/>.
diff --git a/osu.Game/Rulesets/Mods/ModNoMod.cs b/osu.Game/Rulesets/Mods/ModNoMod.cs
index 379a2122f2..1009c5bc42 100644
--- a/osu.Game/Rulesets/Mods/ModNoMod.cs
+++ b/osu.Game/Rulesets/Mods/ModNoMod.cs
@@ -12,6 +12,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public override string Name => "No Mod";
         public override string Acronym => "NM";
+        public override string Description => "No mods applied.";
         public override double ScoreMultiplier => 1;
         public override IconUsage? Icon => FontAwesome.Solid.Ban;
         public override ModType Type => ModType.System;

From 23eb1c655ce3b2dd5f6bea7e5f68bdc4d111fe8e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 14:37:47 +0900
Subject: [PATCH 2477/3722] Add missing description

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

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
index 7cdfdb3c4a..3a61968075 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
@@ -23,6 +23,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public override string Name => "Barrel Roll";
         public override string Acronym => "BR";
+        public override string Description => "The whole playfield is on a wheel!";
         public override double ScoreMultiplier => 1;
 
         public void Update(Playfield playfield)

From 698a9d3feddddbb80fc9a483f02160446b985993 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 14:40:03 +0900
Subject: [PATCH 2478/3722] Add rotation direction setting

---
 osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
index 3a61968075..b6cfa514a1 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.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 osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Objects;
@@ -21,6 +22,9 @@ namespace osu.Game.Rulesets.Osu.Mods
             Precision = 0.01,
         };
 
+        [SettingSource("Direction", "The direction of rotation")]
+        public Bindable<RotationDirection> Direction { get; } = new Bindable<RotationDirection>(RotationDirection.Clockwise);
+
         public override string Name => "Barrel Roll";
         public override string Acronym => "BR";
         public override string Description => "The whole playfield is on a wheel!";
@@ -28,7 +32,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public void Update(Playfield playfield)
         {
-            playfield.Rotation = 360 * (float)(playfield.Time.Current / 60000 * SpinSpeed.Value);
+            playfield.Rotation = (Direction.Value == RotationDirection.CounterClockwise ? -1 : 1) * 360 * (float)(playfield.Time.Current / 60000 * SpinSpeed.Value);
         }
 
         public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)

From 55421b0065a8e22b66e260ae594463a04d1bdbf5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 14:41:10 +0900
Subject: [PATCH 2479/3722] Add missing full stop

Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
---
 osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs
index fa1eb10f5e..12f379bddb 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Mania.Mods
         public override string Name => "Mirror";
         public override string Acronym => "MR";
         public override ModType Type => ModType.Conversion;
-        public override string Description => "Notes are flipped horizontally";
+        public override string Description => "Notes are flipped horizontally.";
         public override double ScoreMultiplier => 1;
         public override bool Ranked => true;
 

From bc3b2af39d5d391e3bf0c95a5514193e6853faf2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 15:29:22 +0900
Subject: [PATCH 2480/3722] Add rounded corners to timeline ticks display

---
 .../Timelines/Summary/Visualisations/PointVisualisation.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs
index 53a1f94731..d647c6bfe8 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations
     /// <summary>
     /// Represents a singular point on a timeline part.
     /// </summary>
-    public class PointVisualisation : Box
+    public class PointVisualisation : Circle
     {
         public const float MAX_WIDTH = 4;
 

From 6fc7488a67ddf580358369327c78ddea5d7aab8d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 15 Apr 2021 16:33:59 +0900
Subject: [PATCH 2481/3722] Reimplement syncing logic as a new component

---
 .../OnlinePlay/MultiplayerSyncManagerTest.cs  | 213 ++++++++++++++++++
 .../Spectate/IMultiplayerSlaveClock.cs        |  17 ++
 .../Spectate/IMultiplayerSyncManager.cs       |  16 ++
 .../Spectate/MultiplayerSyncManager.cs        | 162 +++++++++++++
 4 files changed, 408 insertions(+)
 create mode 100644 osu.Game.Tests/OnlinePlay/MultiplayerSyncManagerTest.cs
 create mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSlaveClock.cs
 create mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSyncManager.cs
 create mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSyncManager.cs

diff --git a/osu.Game.Tests/OnlinePlay/MultiplayerSyncManagerTest.cs b/osu.Game.Tests/OnlinePlay/MultiplayerSyncManagerTest.cs
new file mode 100644
index 0000000000..2a6dfa9c8d
--- /dev/null
+++ b/osu.Game.Tests/OnlinePlay/MultiplayerSyncManagerTest.cs
@@ -0,0 +1,213 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using NUnit.Framework;
+using osu.Framework.Bindables;
+using osu.Framework.Testing;
+using osu.Framework.Timing;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Tests.OnlinePlay
+{
+    [HeadlessTest]
+    public class MultiplayerSyncManagerTest : OsuTestScene
+    {
+        private TestManualClock master;
+        private MultiplayerSyncManager syncManager;
+
+        private TestSlaveClock slave1;
+        private TestSlaveClock slave2;
+
+        [SetUp]
+        public void Setup()
+        {
+            syncManager = new MultiplayerSyncManager(master = new TestManualClock());
+            syncManager.AddSlave(slave1 = new TestSlaveClock(1));
+            syncManager.AddSlave(slave2 = new TestSlaveClock(2));
+
+            Schedule(() => Child = syncManager);
+        }
+
+        [Test]
+        public void TestMasterClockStartsWhenAllSlavesHaveFrames()
+        {
+            setWaiting(() => slave1, false);
+            assertMasterState(false);
+            assertSlaveState(() => slave1, false);
+            assertSlaveState(() => slave2, false);
+
+            setWaiting(() => slave2, false);
+            assertMasterState(true);
+            assertSlaveState(() => slave1, true);
+            assertSlaveState(() => slave2, true);
+        }
+
+        [Test]
+        public void TestMasterClockDoesNotStartWhenNoneReadyForMaximumDelayTime()
+        {
+            AddWaitStep($"wait {MultiplayerSyncManager.MAXIMUM_START_DELAY} milliseconds", (int)Math.Ceiling(MultiplayerSyncManager.MAXIMUM_START_DELAY / TimePerAction));
+            assertMasterState(false);
+        }
+
+        [Test]
+        public void TestMasterClockStartsWhenAnyReadyForMaximumDelayTime()
+        {
+            setWaiting(() => slave1, false);
+            AddWaitStep($"wait {MultiplayerSyncManager.MAXIMUM_START_DELAY} milliseconds", (int)Math.Ceiling(MultiplayerSyncManager.MAXIMUM_START_DELAY / TimePerAction));
+            assertMasterState(true);
+        }
+
+        [Test]
+        public void TestSlaveDoesNotCatchUpWhenSlightlyOutOfSync()
+        {
+            setAllWaiting(false);
+
+            setMasterTime(MultiplayerSyncManager.SYNC_TARGET + 1);
+            assertCatchingUp(() => slave1, false);
+        }
+
+        [Test]
+        public void TestSlaveStartsCatchingUpWhenTooFarBehind()
+        {
+            setAllWaiting(false);
+
+            setMasterTime(MultiplayerSyncManager.MAX_SYNC_OFFSET + 1);
+            assertCatchingUp(() => slave1, true);
+            assertCatchingUp(() => slave2, true);
+        }
+
+        [Test]
+        public void TestSlaveKeepsCatchingUpWhenSlightlyOutOfSync()
+        {
+            setAllWaiting(false);
+
+            setMasterTime(MultiplayerSyncManager.MAX_SYNC_OFFSET + 1);
+            setSlaveTime(() => slave1, MultiplayerSyncManager.SYNC_TARGET + 1);
+            assertCatchingUp(() => slave1, true);
+        }
+
+        [Test]
+        public void TestSlaveStopsCatchingUpWhenInSync()
+        {
+            setAllWaiting(false);
+
+            setMasterTime(MultiplayerSyncManager.MAX_SYNC_OFFSET + 2);
+            setSlaveTime(() => slave1, MultiplayerSyncManager.SYNC_TARGET);
+            assertCatchingUp(() => slave1, false);
+            assertCatchingUp(() => slave2, true);
+        }
+
+        [Test]
+        public void TestSlaveDoesNotStopWhenSlightlyAhead()
+        {
+            setAllWaiting(false);
+
+            setSlaveTime(() => slave1, -MultiplayerSyncManager.SYNC_TARGET);
+            assertCatchingUp(() => slave1, false);
+            assertSlaveState(() => slave1, true);
+        }
+
+        [Test]
+        public void TestSlaveStopsWhenTooFarAheadAndStartsWhenBackInSync()
+        {
+            setAllWaiting(false);
+
+            setSlaveTime(() => slave1, -MultiplayerSyncManager.SYNC_TARGET - 1);
+
+            // This is a silent catchup, where IsCatchingUp = false but IsRunning = false also.
+            assertCatchingUp(() => slave1, false);
+            assertSlaveState(() => slave1, false);
+
+            setMasterTime(1);
+            assertCatchingUp(() => slave1, false);
+            assertSlaveState(() => slave1, true);
+        }
+
+        [Test]
+        public void TestInSyncSlaveDoesNotStartIfWaitingOnFrames()
+        {
+            setAllWaiting(false);
+
+            assertSlaveState(() => slave1, true);
+            setWaiting(() => slave1, true);
+            assertSlaveState(() => slave1, false);
+        }
+
+        private void setWaiting(Func<TestSlaveClock> slave, bool waiting)
+            => AddStep($"set slave {slave().Id} waiting = {waiting}", () => slave().WaitingOnFrames.Value = waiting);
+
+        private void setAllWaiting(bool waiting) => AddStep($"set all slaves waiting = {waiting}", () =>
+        {
+            slave1.WaitingOnFrames.Value = waiting;
+            slave2.WaitingOnFrames.Value = waiting;
+        });
+
+        private void setMasterTime(double time)
+            => AddStep($"set master = {time}", () => master.Seek(time));
+
+        /// <summary>
+        /// slave.Time = master.Time - offsetFromMaster
+        /// </summary>
+        private void setSlaveTime(Func<TestSlaveClock> slave, double offsetFromMaster)
+            => AddStep($"set slave {slave().Id} = master - {offsetFromMaster}", () => slave().Seek(master.CurrentTime - offsetFromMaster));
+
+        private void assertMasterState(bool running)
+            => AddAssert($"master clock {(running ? "is" : "is not")} running", () => master.IsRunning == running);
+
+        private void assertCatchingUp(Func<TestSlaveClock> slave, bool catchingUp) =>
+            AddAssert($"slave {slave().Id} {(catchingUp ? "is" : "is not")} catching up", () => slave().IsCatchingUp == catchingUp);
+
+        private void assertSlaveState(Func<TestSlaveClock> slave, bool running)
+            => AddAssert($"slave {slave().Id} {(running ? "is" : "is not")} running", () => slave().IsRunning == running);
+
+        private class TestSlaveClock : TestManualClock, IMultiplayerSlaveClock
+        {
+            public readonly Bindable<bool> WaitingOnFrames = new Bindable<bool>(true);
+            IBindable<bool> IMultiplayerSlaveClock.WaitingOnFrames => WaitingOnFrames;
+
+            public double LastFrameTime => 0;
+
+            double IMultiplayerSlaveClock.LastFrameTime => LastFrameTime;
+
+            public bool IsCatchingUp { get; set; }
+
+            public readonly int Id;
+
+            public TestSlaveClock(int id)
+            {
+                Id = id;
+
+                WaitingOnFrames.BindValueChanged(waiting =>
+                {
+                    if (waiting.NewValue)
+                        Stop();
+                    else
+                        Start();
+                });
+            }
+        }
+
+        private class TestManualClock : ManualClock, IAdjustableClock
+        {
+            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()
+            {
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSlaveClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSlaveClock.cs
new file mode 100644
index 0000000000..e0fca45bdd
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSlaveClock.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Bindables;
+using osu.Framework.Timing;
+
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
+{
+    public interface IMultiplayerSlaveClock : IAdjustableClock
+    {
+        IBindable<bool> WaitingOnFrames { get; }
+
+        double LastFrameTime { get; }
+
+        bool IsCatchingUp { get; set; }
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSyncManager.cs
new file mode 100644
index 0000000000..2c50596823
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSyncManager.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.Timing;
+
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
+{
+    public interface IMultiplayerSyncManager
+    {
+        IAdjustableClock Master { get; }
+
+        void AddSlave(IMultiplayerSlaveClock clock);
+
+        void RemoveSlave(IMultiplayerSlaveClock clock);
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSyncManager.cs
new file mode 100644
index 0000000000..42f6536e90
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSyncManager.cs
@@ -0,0 +1,162 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using System.Linq;
+using osu.Framework.Graphics;
+using osu.Framework.Logging;
+using osu.Framework.Timing;
+
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
+{
+    public class MultiplayerSyncManager : Component, IMultiplayerSyncManager
+    {
+        /// <summary>
+        /// The offset from the master clock to which slaves should be synchronised to.
+        /// </summary>
+        public const double SYNC_TARGET = 16;
+
+        /// <summary>
+        /// The offset from the master clock at which slaves begin resynchronising.
+        /// </summary>
+        public const double MAX_SYNC_OFFSET = 50;
+
+        /// <summary>
+        /// The maximum delay to start gameplay, if any (but not all) slaves are ready.
+        /// </summary>
+        public const double MAXIMUM_START_DELAY = 15000;
+
+        /// <summary>
+        /// The catchup rate.
+        /// </summary>
+        public const double CATCHUP_RATE = 2;
+
+        /// <summary>
+        /// The master clock which is used to control the timing of all slave clocks.
+        /// </summary>
+        public IAdjustableClock Master { get; }
+
+        /// <summary>
+        /// The slave clocks.
+        /// </summary>
+        private readonly List<IMultiplayerSlaveClock> slaves = new List<IMultiplayerSlaveClock>();
+
+        private bool hasStarted;
+        private double? firstStartAttemptTime;
+
+        public MultiplayerSyncManager(IAdjustableClock master)
+        {
+            Master = master;
+        }
+
+        public void AddSlave(IMultiplayerSlaveClock clock) => slaves.Add(clock);
+
+        public void RemoveSlave(IMultiplayerSlaveClock clock) => slaves.Remove(clock);
+
+        protected override void Update()
+        {
+            base.Update();
+
+            if (!attemptStart())
+            {
+                // Ensure all slaves are stopped until the start succeeds.
+                foreach (var slave in slaves)
+                    slave.Stop();
+                return;
+            }
+
+            updateCatchup();
+            updateMasterClock();
+        }
+
+        /// <summary>
+        /// Attempts to start playback. Awaits for all slaves to have available frames for up to <see cref="MAXIMUM_START_DELAY"/> milliseconds.
+        /// </summary>
+        /// <returns>Whether playback was started and syncing should occur.</returns>
+        private bool attemptStart()
+        {
+            if (hasStarted)
+                return true;
+
+            if (slaves.Count == 0)
+                return false;
+
+            firstStartAttemptTime ??= Time.Current;
+
+            int readyCount = slaves.Count(s => !s.WaitingOnFrames.Value);
+
+            if (readyCount == slaves.Count)
+            {
+                Logger.Log("Gameplay started (all ready).");
+                return hasStarted = true;
+            }
+
+            if (readyCount > 0 && (Time.Current - firstStartAttemptTime) > MAXIMUM_START_DELAY)
+            {
+                Logger.Log($"Gameplay started (maximum delay exceeded, {readyCount}/{slaves.Count} ready).");
+                return hasStarted = true;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Updates the catchup states of all slave clocks.
+        /// </summary>
+        private void updateCatchup()
+        {
+            for (int i = 0; i < slaves.Count; i++)
+            {
+                var slave = slaves[i];
+                double timeDelta = Master.CurrentTime - slave.CurrentTime;
+
+                // Check that the slave isn't too far ahead.
+                // This is a quiet case in which the catchup is done by the master clock, so IsCatchingUp is not set on the slave.
+                if (timeDelta < -SYNC_TARGET)
+                {
+                    slave.Stop();
+                    continue;
+                }
+
+                // Make sure the slave is running if it can.
+                if (!slave.WaitingOnFrames.Value)
+                    slave.Start();
+
+                if (slave.IsCatchingUp)
+                {
+                    // Stop the slave from catching up if it's within the sync target.
+                    if (timeDelta <= SYNC_TARGET)
+                    {
+                        slave.IsCatchingUp = false;
+                        Logger.Log($"Slave {i} catchup finished (delta = {timeDelta})");
+                    }
+                }
+                else
+                {
+                    // Make the slave start catching up if it's exceeded the maximum allowable sync offset.
+                    if (timeDelta > MAX_SYNC_OFFSET)
+                    {
+                        slave.IsCatchingUp = true;
+                        Logger.Log($"Slave {i} catchup started (too far behind, delta = {timeDelta})");
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Updates the master clock's running state.
+        /// </summary>
+        private void updateMasterClock()
+        {
+            bool anyInSync = slaves.Any(s => !s.IsCatchingUp);
+
+            if (Master.IsRunning != anyInSync)
+            {
+                if (anyInSync)
+                    Master.Start();
+                else
+                    Master.Stop();
+            }
+        }
+    }
+}

From 66bb5766b9486bd06b6059007cde79680e4fcc2c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 14:32:01 +0900
Subject: [PATCH 2482/3722] Make `Mod.Description` abstract and add missing
 descriptions

---
 osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs               | 1 +
 osu.Game.Rulesets.Osu/Mods/OsuModTouchDevice.cs              | 1 +
 .../NonVisual/DifficultyAdjustmentModCombinationsTest.cs     | 5 +++++
 osu.Game.Tests/Online/TestAPIModJsonSerialization.cs         | 2 ++
 osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs  | 3 +++
 osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs      | 1 +
 osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs    | 2 ++
 osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs  | 2 ++
 osu.Game/Rulesets/Mods/Mod.cs                                | 2 +-
 osu.Game/Rulesets/Mods/ModNoMod.cs                           | 1 +
 10 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs
index 485595cea9..fa1eb10f5e 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs
@@ -15,6 +15,7 @@ namespace osu.Game.Rulesets.Mania.Mods
         public override string Name => "Mirror";
         public override string Acronym => "MR";
         public override ModType Type => ModType.Conversion;
+        public override string Description => "Notes are flipped horizontally";
         public override double ScoreMultiplier => 1;
         public override bool Ranked => true;
 
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModTouchDevice.cs b/osu.Game.Rulesets.Osu/Mods/OsuModTouchDevice.cs
index f0db548e74..3b16e9d2b7 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModTouchDevice.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModTouchDevice.cs
@@ -9,6 +9,7 @@ namespace osu.Game.Rulesets.Osu.Mods
     {
         public override string Name => "Touch Device";
         public override string Acronym => "TD";
+        public override string Description => "Automatically applied to plays on devices with a touchscreen.";
         public override double ScoreMultiplier => 1;
 
         public override ModType Type => ModType.System;
diff --git a/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs b/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs
index 1c0bfd56dd..16c1004f37 100644
--- a/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs
+++ b/osu.Game.Tests/NonVisual/DifficultyAdjustmentModCombinationsTest.cs
@@ -144,6 +144,7 @@ namespace osu.Game.Tests.NonVisual
         {
             public override string Name => nameof(ModA);
             public override string Acronym => nameof(ModA);
+            public override string Description => string.Empty;
             public override double ScoreMultiplier => 1;
 
             public override Type[] IncompatibleMods => new[] { typeof(ModIncompatibleWithA), typeof(ModIncompatibleWithAAndB) };
@@ -152,6 +153,7 @@ namespace osu.Game.Tests.NonVisual
         private class ModB : Mod
         {
             public override string Name => nameof(ModB);
+            public override string Description => string.Empty;
             public override string Acronym => nameof(ModB);
             public override double ScoreMultiplier => 1;
 
@@ -162,6 +164,7 @@ namespace osu.Game.Tests.NonVisual
         {
             public override string Name => nameof(ModC);
             public override string Acronym => nameof(ModC);
+            public override string Description => string.Empty;
             public override double ScoreMultiplier => 1;
         }
 
@@ -169,6 +172,7 @@ namespace osu.Game.Tests.NonVisual
         {
             public override string Name => $"Incompatible With {nameof(ModA)}";
             public override string Acronym => $"Incompatible With {nameof(ModA)}";
+            public override string Description => string.Empty;
             public override double ScoreMultiplier => 1;
 
             public override Type[] IncompatibleMods => new[] { typeof(ModA) };
@@ -187,6 +191,7 @@ namespace osu.Game.Tests.NonVisual
         {
             public override string Name => $"Incompatible With {nameof(ModA)} and {nameof(ModB)}";
             public override string Acronym => $"Incompatible With {nameof(ModA)} and {nameof(ModB)}";
+            public override string Description => string.Empty;
             public override double ScoreMultiplier => 1;
 
             public override Type[] IncompatibleMods => new[] { typeof(ModA), typeof(ModB) };
diff --git a/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs b/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
index 3afb7481b1..ad2007f202 100644
--- a/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
+++ b/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
@@ -140,6 +140,7 @@ namespace osu.Game.Tests.Online
         {
             public override string Name => "Test Mod";
             public override string Acronym => "TM";
+            public override string Description => "This is a test mod.";
             public override double ScoreMultiplier => 1;
 
             [SettingSource("Test")]
@@ -156,6 +157,7 @@ namespace osu.Game.Tests.Online
         {
             public override string Name => "Test Mod";
             public override string Acronym => "TMTR";
+            public override string Description => "This is a test mod.";
             public override double ScoreMultiplier => 1;
 
             [SettingSource("Initial rate", "The starting speed of the track")]
diff --git a/osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs b/osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs
index 74db477cfc..0462e9feb5 100644
--- a/osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs
+++ b/osu.Game.Tests/Online/TestAPIModMessagePackSerialization.cs
@@ -100,6 +100,7 @@ namespace osu.Game.Tests.Online
         {
             public override string Name => "Test Mod";
             public override string Acronym => "TM";
+            public override string Description => "This is a test mod.";
             public override double ScoreMultiplier => 1;
 
             [SettingSource("Test")]
@@ -116,6 +117,7 @@ namespace osu.Game.Tests.Online
         {
             public override string Name => "Test Mod";
             public override string Acronym => "TMTR";
+            public override string Description => "This is a test mod.";
             public override double ScoreMultiplier => 1;
 
             [SettingSource("Initial rate", "The starting speed of the track")]
@@ -150,6 +152,7 @@ namespace osu.Game.Tests.Online
         {
             public override string Name => "Test Mod";
             public override string Acronym => "TM";
+            public override string Description => "This is a test mod.";
             public override double ScoreMultiplier => 1;
 
             [SettingSource("Test")]
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index 88fbf09ef4..280c182259 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -321,6 +321,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             public override string Name => string.Empty;
             public override string Acronym => string.Empty;
             public override double ScoreMultiplier => 1;
+            public override string Description => string.Empty;
 
             public bool Applied { get; private set; }
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs
index 443cf59003..fdc21d80ff 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModButton.cs
@@ -57,6 +57,8 @@ namespace osu.Game.Tests.Visual.UserInterface
         private abstract class TestMod : Mod, IApplicableMod
         {
             public override double ScoreMultiplier => 1.0;
+
+            public override string Description => "This is a test mod.";
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
index 89f9b7381b..2158cf77e5 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
@@ -226,6 +226,8 @@ namespace osu.Game.Tests.Visual.UserInterface
         {
             public override double ScoreMultiplier => 1.0;
 
+            public override string Description => "This is a customisable test mod.";
+
             public override ModType Type => ModType.Conversion;
 
             [SettingSource("Sample float", "Change something for a mod")]
diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 832a14ee1e..4879590e24 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Mods
         /// The user readable description of this mod.
         /// </summary>
         [JsonIgnore]
-        public virtual string Description => string.Empty;
+        public abstract string Description { get; }
 
         /// <summary>
         /// The tooltip to display for this mod when used in a <see cref="ModIcon"/>.
diff --git a/osu.Game/Rulesets/Mods/ModNoMod.cs b/osu.Game/Rulesets/Mods/ModNoMod.cs
index 379a2122f2..1009c5bc42 100644
--- a/osu.Game/Rulesets/Mods/ModNoMod.cs
+++ b/osu.Game/Rulesets/Mods/ModNoMod.cs
@@ -12,6 +12,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public override string Name => "No Mod";
         public override string Acronym => "NM";
+        public override string Description => "No mods applied.";
         public override double ScoreMultiplier => 1;
         public override IconUsage? Icon => FontAwesome.Solid.Ban;
         public override ModType Type => ModType.System;

From ed14e014015042a2527210fab3af73c060677f88 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 14:41:10 +0900
Subject: [PATCH 2483/3722] Add missing full stop

Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
---
 osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs
index fa1eb10f5e..12f379bddb 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Mania.Mods
         public override string Name => "Mirror";
         public override string Acronym => "MR";
         public override ModType Type => ModType.Conversion;
-        public override string Description => "Notes are flipped horizontally";
+        public override string Description => "Notes are flipped horizontally.";
         public override double ScoreMultiplier => 1;
         public override bool Ranked => true;
 

From dd9a142e899030c6a53d0fd0275af6a57efd34f6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 16:30:02 +0900
Subject: [PATCH 2484/3722] Fix `TestSceneEditorSummaryTimeline` not displaying
 actual beatmap content

---
 .../Editing/TestSceneEditorSummaryTimeline.cs | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs
index 94a9fd7b35..ba57eeacbe 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs
@@ -4,6 +4,7 @@
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Screens.Edit;
@@ -16,18 +17,28 @@ namespace osu.Game.Tests.Visual.Editing
     public class TestSceneEditorSummaryTimeline : EditorClockTestScene
     {
         [Cached(typeof(EditorBeatmap))]
-        private readonly EditorBeatmap editorBeatmap = new EditorBeatmap(new OsuBeatmap());
+        private readonly EditorBeatmap editorBeatmap;
 
-        [BackgroundDependencyLoader]
-        private void load()
+        public TestSceneEditorSummaryTimeline()
         {
-            Beatmap.Value = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
+            editorBeatmap = new EditorBeatmap(CreateBeatmap(new OsuRuleset().RulesetInfo));
+        }
 
-            Add(new SummaryTimeline
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            AddStep("create timeline", () =>
             {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Size = new Vector2(500, 50)
+                // required for track
+                Beatmap.Value = CreateWorkingBeatmap(editorBeatmap.PlayableBeatmap);
+
+                Add(new SummaryTimeline
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(500, 50)
+                });
             });
         }
     }

From 73821beb1d8d127be59f77c9fa980259b3081a5d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 16:30:20 +0900
Subject: [PATCH 2485/3722] Fix break display looking bad on very long beatmaps
 due to fixed corner radius

---
 .../Edit/Components/Timelines/Summary/SummaryTimeline.cs  | 2 +-
 .../Summary/Visualisations/DurationVisualisation.cs       | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs
index 02cd4bccb4..e1a1eff0cb 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     RelativeSizeAxes = Axes.Both,
-                    Height = 0.25f
+                    Height = 0.10f
                 }
             };
         }
diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/DurationVisualisation.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/DurationVisualisation.cs
index de63df5463..86e6446555 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/DurationVisualisation.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/DurationVisualisation.cs
@@ -10,19 +10,15 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations
     /// <summary>
     /// Represents a spanning point on a timeline part.
     /// </summary>
-    public class DurationVisualisation : Container
+    public class DurationVisualisation : Circle
     {
         protected DurationVisualisation(double startTime, double endTime)
         {
-            Masking = true;
-            CornerRadius = 5;
-
             RelativePositionAxes = Axes.X;
             RelativeSizeAxes = Axes.Both;
+
             X = (float)startTime;
             Width = (float)(endTime - startTime);
-
-            AddInternal(new Box { RelativeSizeAxes = Axes.Both });
         }
     }
 }

From da6f9060fa2eb98c982367ec2a0ef00fcf1edf26 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 16:30:56 +0900
Subject: [PATCH 2486/3722] Centre end circles to avoid visual gaps

---
 .../Edit/Components/Timelines/Summary/SummaryTimeline.cs      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs
index e1a1eff0cb..ada7810599 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary
                         new Circle
                         {
                             Anchor = Anchor.CentreLeft,
-                            Origin = Anchor.CentreRight,
+                            Origin = Anchor.Centre,
                             Size = new Vector2(5)
                         },
                         new Box
@@ -59,7 +59,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary
                         new Circle
                         {
                             Anchor = Anchor.CentreRight,
-                            Origin = Anchor.CentreLeft,
+                            Origin = Anchor.Centre,
                             Size = new Vector2(5)
                         },
                     }

From 757475e6d4c3f300684d46f5f3c860f73ecd66e5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 16:33:29 +0900
Subject: [PATCH 2487/3722] Use correct representation colours

---
 .../Components/Timelines/Summary/Parts/GroupVisualisation.cs    | 2 +-
 .../Edit/Components/Timelines/Summary/SummaryTimeline.cs        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/GroupVisualisation.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/GroupVisualisation.cs
index 93fe6f9989..8bc8618479 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/GroupVisualisation.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/GroupVisualisation.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
                     return;
                 }
 
-                Colour = controlPoints.Any(c => c is TimingControlPoint) ? colours.YellowDark : colours.Green;
+                Colour = Group.ControlPoints.First().GetRepresentingColour(colours);
             }, true);
         }
     }
diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs
index ada7810599..ae60cd4dd3 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs
@@ -38,6 +38,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary
                 },
                 new Container
                 {
+                    Name = "centre line",
                     RelativeSizeAxes = Axes.Both,
                     Colour = colours.Gray5,
                     Children = new Drawable[]

From 33ad7850cb432a2f2d7cfbbe60ae302f353443a4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 15 Apr 2021 16:45:59 +0900
Subject: [PATCH 2488/3722] Remove LastFrameTime

---
 osu.Game.Tests/OnlinePlay/MultiplayerSyncManagerTest.cs       | 4 ----
 .../OnlinePlay/Multiplayer/Spectate/IMultiplayerSlaveClock.cs | 2 --
 2 files changed, 6 deletions(-)

diff --git a/osu.Game.Tests/OnlinePlay/MultiplayerSyncManagerTest.cs b/osu.Game.Tests/OnlinePlay/MultiplayerSyncManagerTest.cs
index 2a6dfa9c8d..6ee867c6f8 100644
--- a/osu.Game.Tests/OnlinePlay/MultiplayerSyncManagerTest.cs
+++ b/osu.Game.Tests/OnlinePlay/MultiplayerSyncManagerTest.cs
@@ -167,10 +167,6 @@ namespace osu.Game.Tests.OnlinePlay
             public readonly Bindable<bool> WaitingOnFrames = new Bindable<bool>(true);
             IBindable<bool> IMultiplayerSlaveClock.WaitingOnFrames => WaitingOnFrames;
 
-            public double LastFrameTime => 0;
-
-            double IMultiplayerSlaveClock.LastFrameTime => LastFrameTime;
-
             public bool IsCatchingUp { get; set; }
 
             public readonly int Id;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSlaveClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSlaveClock.cs
index e0fca45bdd..e90eed68ab 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSlaveClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSlaveClock.cs
@@ -10,8 +10,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
     {
         IBindable<bool> WaitingOnFrames { get; }
 
-        double LastFrameTime { get; }
-
         bool IsCatchingUp { get; set; }
     }
 }

From 18e8682f391ea78fa40487af2d813fe6b6fe77b2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 17:01:25 +0900
Subject: [PATCH 2489/3722] Remove unused using statements

---
 osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs | 2 --
 .../Timelines/Summary/Visualisations/DurationVisualisation.cs   | 1 -
 2 files changed, 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs
index ba57eeacbe..da0c83bb11 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSummaryTimeline.cs
@@ -4,9 +4,7 @@
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Osu;
-using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Components.Timelines.Summary;
 using osuTK;
diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/DurationVisualisation.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/DurationVisualisation.cs
index 86e6446555..ec68bf9c00 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/DurationVisualisation.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/DurationVisualisation.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 
 namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations

From bf5af3310aa1d643e08a0135531fff7b9aff9416 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 17:04:11 +0900
Subject: [PATCH 2490/3722] Update break colour to not look like kiai time

---
 .../Edit/Components/Timelines/Summary/Parts/BreakPart.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/BreakPart.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/BreakPart.cs
index e8a4b5c8c7..3d535ec915 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/BreakPart.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/BreakPart.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
             }
 
             [BackgroundDependencyLoader]
-            private void load(OsuColour colours) => Colour = colours.Yellow;
+            private void load(OsuColour colours) => Colour = colours.GreyCarmineLight;
         }
     }
 }

From 50fad47ebc45d744dcd2f0005a9a66aa80639e63 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 15 Apr 2021 18:06:45 +0900
Subject: [PATCH 2491/3722] Remove usage of Lazy<List<...>> for
 NestedHitObjects

---
 .../Objects/Drawables/DrawableHitObject.cs    | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index d95b246c96..669e4cecbe 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -56,8 +56,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         public virtual IEnumerable<HitSampleInfo> GetSamples() => HitObject.Samples;
 
-        private readonly Lazy<List<DrawableHitObject>> nestedHitObjects = new Lazy<List<DrawableHitObject>>();
-        public IReadOnlyList<DrawableHitObject> NestedHitObjects => nestedHitObjects.IsValueCreated ? nestedHitObjects.Value : (IReadOnlyList<DrawableHitObject>)Array.Empty<DrawableHitObject>();
+        private readonly List<DrawableHitObject> nestedHitObjects = new List<DrawableHitObject>();
+        public IReadOnlyList<DrawableHitObject> NestedHitObjects => nestedHitObjects;
 
         /// <summary>
         /// Whether this object should handle any user input events.
@@ -249,7 +249,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
                 // Must be done before the nested DHO is added to occur before the nested Apply()!
                 drawableNested.ParentHitObject = this;
 
-                nestedHitObjects.Value.Add(drawableNested);
+                nestedHitObjects.Add(drawableNested);
                 AddNestedHitObject(drawableNested);
             }
 
@@ -305,19 +305,16 @@ namespace osu.Game.Rulesets.Objects.Drawables
             if (Samples != null)
                 Samples.Samples = null;
 
-            if (nestedHitObjects.IsValueCreated)
+            foreach (var obj in nestedHitObjects)
             {
-                foreach (var obj in nestedHitObjects.Value)
-                {
-                    obj.OnNewResult -= onNewResult;
-                    obj.OnRevertResult -= onRevertResult;
-                    obj.ApplyCustomUpdateState -= onApplyCustomUpdateState;
-                }
-
-                nestedHitObjects.Value.Clear();
-                ClearNestedHitObjects();
+                obj.OnNewResult -= onNewResult;
+                obj.OnRevertResult -= onRevertResult;
+                obj.ApplyCustomUpdateState -= onApplyCustomUpdateState;
             }
 
+            nestedHitObjects.Clear();
+            ClearNestedHitObjects();
+
             HitObject.DefaultsApplied -= onDefaultsApplied;
 
             OnFree();

From d8aa436e81a1f70160983c882cf2b94d83063677 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 15 Apr 2021 18:11:47 +0900
Subject: [PATCH 2492/3722] Remove usage of Lazy<List<...>> in NestedPlayfields

---
 osu.Game/Rulesets/UI/Playfield.cs | 35 ++++++++-----------------------
 1 file changed, 9 insertions(+), 26 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index c40ab4bd94..d55005363c 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Rulesets.UI
 
                 var enumerable = HitObjectContainer.Objects;
 
-                if (nestedPlayfields.IsValueCreated)
+                if (nestedPlayfields.Count != 0)
                     enumerable = enumerable.Concat(NestedPlayfields.SelectMany(p => p.AllHitObjects));
 
                 return enumerable;
@@ -76,9 +76,9 @@ namespace osu.Game.Rulesets.UI
         /// <summary>
         /// All <see cref="Playfield"/>s nested inside this <see cref="Playfield"/>.
         /// </summary>
-        public IEnumerable<Playfield> NestedPlayfields => nestedPlayfields.IsValueCreated ? nestedPlayfields.Value : Enumerable.Empty<Playfield>();
+        public IEnumerable<Playfield> NestedPlayfields => nestedPlayfields;
 
-        private readonly Lazy<List<Playfield>> nestedPlayfields = new Lazy<List<Playfield>>();
+        private readonly List<Playfield> nestedPlayfields = new List<Playfield>();
 
         /// <summary>
         /// Whether judgements should be displayed by this and and all nested <see cref="Playfield"/>s.
@@ -217,7 +217,7 @@ namespace osu.Game.Rulesets.UI
             otherPlayfield.HitObjectUsageBegan += h => HitObjectUsageBegan?.Invoke(h);
             otherPlayfield.HitObjectUsageFinished += h => HitObjectUsageFinished?.Invoke(h);
 
-            nestedPlayfields.Value.Add(otherPlayfield);
+            nestedPlayfields.Add(otherPlayfield);
         }
 
         protected override void LoadComplete()
@@ -279,12 +279,7 @@ namespace osu.Game.Rulesets.UI
                 return true;
             }
 
-            bool removedFromNested = false;
-
-            if (nestedPlayfields.IsValueCreated)
-                removedFromNested = nestedPlayfields.Value.Any(p => p.Remove(hitObject));
-
-            return removedFromNested;
+            return nestedPlayfields.Any(p => p.Remove(hitObject));
         }
 
         /// <summary>
@@ -429,10 +424,7 @@ namespace osu.Game.Rulesets.UI
                 return;
             }
 
-            if (!nestedPlayfields.IsValueCreated)
-                return;
-
-            foreach (var p in nestedPlayfields.Value)
+            foreach (var p in nestedPlayfields)
                 p.SetKeepAlive(hitObject, keepAlive);
         }
 
@@ -444,10 +436,7 @@ namespace osu.Game.Rulesets.UI
             foreach (var (_, entry) in lifetimeEntryMap)
                 entry.KeepAlive = true;
 
-            if (!nestedPlayfields.IsValueCreated)
-                return;
-
-            foreach (var p in nestedPlayfields.Value)
+            foreach (var p in nestedPlayfields)
                 p.KeepAllAlive();
         }
 
@@ -461,10 +450,7 @@ namespace osu.Game.Rulesets.UI
             {
                 HitObjectContainer.PastLifetimeExtension = value;
 
-                if (!nestedPlayfields.IsValueCreated)
-                    return;
-
-                foreach (var nested in nestedPlayfields.Value)
+                foreach (var nested in nestedPlayfields)
                     nested.PastLifetimeExtension = value;
             }
         }
@@ -479,10 +465,7 @@ namespace osu.Game.Rulesets.UI
             {
                 HitObjectContainer.FutureLifetimeExtension = value;
 
-                if (!nestedPlayfields.IsValueCreated)
-                    return;
-
-                foreach (var nested in nestedPlayfields.Value)
+                foreach (var nested in nestedPlayfields)
                     nested.FutureLifetimeExtension = value;
             }
         }

From 153ee2551048cbbd25bf1c83856adb3adaa154f1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 18:42:07 +0900
Subject: [PATCH 2493/3722] Update base specifications to a more sane default

---
 .../Timelines/Summary/Visualisations/PointVisualisation.cs    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs
index d647c6bfe8..a4b6b0c392 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Visualisations/PointVisualisation.cs
@@ -21,9 +21,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations
 
         public PointVisualisation()
         {
-            Origin = Anchor.TopCentre;
-
-            RelativePositionAxes = Axes.X;
+            RelativePositionAxes = Axes.Both;
             RelativeSizeAxes = Axes.Y;
 
             Anchor = Anchor.CentreLeft;

From 0dc1577f6804a0b7c3863abfe3db39411ab2b980 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 18:42:30 +0900
Subject: [PATCH 2494/3722] Split out control point visualisation logic and add
 special kiai duration handling

---
 .../Parts/ControlPointVisualisation.cs        | 30 ++++++++
 .../Summary/Parts/EffectPointVisualisation.cs | 72 +++++++++++++++++++
 .../Summary/Parts/GroupVisualisation.cs       | 51 +++++++++----
 .../Timelines/Summary/SummaryTimeline.cs      |  1 +
 4 files changed, 140 insertions(+), 14 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/ControlPointVisualisation.cs
 create mode 100644 osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/EffectPointVisualisation.cs

diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/ControlPointVisualisation.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/ControlPointVisualisation.cs
new file mode 100644
index 0000000000..a8e41d220a
--- /dev/null
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/ControlPointVisualisation.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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics;
+using osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations;
+
+namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
+{
+    public class ControlPointVisualisation : PointVisualisation
+    {
+        protected readonly ControlPoint Point;
+
+        public ControlPointVisualisation(ControlPoint point)
+        {
+            Point = point;
+
+            Height = 0.25f;
+            Origin = Anchor.TopCentre;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            Colour = Point.GetRepresentingColour(colours);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/EffectPointVisualisation.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/EffectPointVisualisation.cs
new file mode 100644
index 0000000000..801372305b
--- /dev/null
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/EffectPointVisualisation.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 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.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics;
+using osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations;
+
+namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
+{
+    public class EffectPointVisualisation : CompositeDrawable
+    {
+        private readonly EffectControlPoint effect;
+        private Bindable<bool> kiai;
+
+        [Resolved]
+        private EditorBeatmap beatmap { get; set; }
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        public EffectPointVisualisation(EffectControlPoint point)
+        {
+            RelativePositionAxes = Axes.Both;
+            RelativeSizeAxes = Axes.Y;
+
+            effect = point;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            kiai = effect.KiaiModeBindable.GetBoundCopy();
+            kiai.BindValueChanged(_ =>
+            {
+                ClearInternal();
+
+                AddInternal(new ControlPointVisualisation(effect));
+
+                if (!kiai.Value)
+                    return;
+
+                var endControlPoint = beatmap.ControlPointInfo.EffectPoints.FirstOrDefault(c => c.Time > effect.Time && !c.KiaiMode);
+
+                // handle kiai duration
+                // eventually this will be simpler when we have control points with durations.
+                if (endControlPoint != null)
+                {
+                    RelativeSizeAxes = Axes.Both;
+                    Origin = Anchor.TopLeft;
+
+                    Width = (float)(endControlPoint.Time - effect.Time);
+
+                    AddInternal(new PointVisualisation
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Origin = Anchor.TopLeft,
+                        Width = 1,
+                        Height = 0.25f,
+                        Depth = float.MaxValue,
+                        Colour = effect.GetRepresentingColour(colours).Darken(0.5f),
+                    });
+                }
+            }, true);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/GroupVisualisation.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/GroupVisualisation.cs
index 8bc8618479..4629f9b540 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/GroupVisualisation.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/GroupVisualisation.cs
@@ -1,29 +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 System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
-using osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations;
-using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
 {
-    public class GroupVisualisation : PointVisualisation
+    public class GroupVisualisation : CompositeDrawable
     {
+        [Resolved]
+        private OsuColour colours { get; set; }
+
         public readonly ControlPointGroup Group;
 
         private readonly IBindableList<ControlPoint> controlPoints = new BindableList<ControlPoint>();
 
-        [Resolved]
-        private OsuColour colours { get; set; }
-
         public GroupVisualisation(ControlPointGroup group)
-            : base(group.Time)
         {
+            RelativePositionAxes = Axes.X;
+
+            RelativeSizeAxes = Axes.Both;
+            Origin = Anchor.TopLeft;
+
             Group = group;
+            X = (float)group.Time;
         }
 
         protected override void LoadComplete()
@@ -33,13 +37,32 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
             controlPoints.BindTo(Group.ControlPoints);
             controlPoints.BindCollectionChanged((_, __) =>
             {
-                if (controlPoints.Count == 0)
-                {
-                    Colour = Color4.Transparent;
-                    return;
-                }
+                ClearInternal();
 
-                Colour = Group.ControlPoints.First().GetRepresentingColour(colours);
+                if (controlPoints.Count == 0)
+                    return;
+
+                foreach (var point in Group.ControlPoints)
+                {
+                    switch (point)
+                    {
+                        case TimingControlPoint _:
+                            AddInternal(new ControlPointVisualisation(point) { Y = 0, });
+                            break;
+
+                        case DifficultyControlPoint _:
+                            AddInternal(new ControlPointVisualisation(point) { Y = 0.25f, });
+                            break;
+
+                        case SampleControlPoint _:
+                            AddInternal(new ControlPointVisualisation(point) { Y = 0.5f, });
+                            break;
+
+                        case EffectControlPoint effect:
+                            AddInternal(new EffectPointVisualisation(effect) { Y = 0.75f });
+                            break;
+                    }
+                }
             }, true);
         }
     }
diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs
index ae60cd4dd3..e90ae411de 100644
--- a/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs
+++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs
@@ -27,6 +27,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary
                     Anchor = Anchor.Centre,
                     Origin = Anchor.BottomCentre,
                     RelativeSizeAxes = Axes.Both,
+                    Y = -10,
                     Height = 0.35f
                 },
                 new BookmarkPart

From 17e021c549f424e9151eefe2351395925e08d365 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 15 Apr 2021 18:45:52 +0900
Subject: [PATCH 2495/3722] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index b5315c3616..32e236ccd5 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.413.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.415.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 45b3d5c161..954cf511b6 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.413.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.415.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 105a6e59c2..09f6033bfe 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.413.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.415.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.413.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.415.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From fe3ba2b80ee1ad0034217ec1693646a6f5d31d95 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 15 Apr 2021 19:07:25 +0900
Subject: [PATCH 2496/3722] Implement IAdjustableClock on
 GameplayClockContainer

---
 .../Screens/Play/GameplayClockContainer.cs    | 35 ++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 6d863f0094..bbffdc2325 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.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;
@@ -9,7 +10,7 @@ using osu.Framework.Timing;
 
 namespace osu.Game.Screens.Play
 {
-    public abstract class GameplayClockContainer : Container
+    public abstract class GameplayClockContainer : Container, IAdjustableClock
     {
         /// <summary>
         /// The final clock which is exposed to underlying components.
@@ -90,5 +91,37 @@ namespace osu.Game.Screens.Play
         protected virtual IFrameBasedClock ClockToProcess => AdjustableClock;
 
         protected abstract GameplayClock CreateGameplayClock(IFrameBasedClock source);
+
+        #region IAdjustableClock
+
+        bool IAdjustableClock.Seek(double position)
+        {
+            Seek(position);
+            return true;
+        }
+
+        void IAdjustableClock.Reset()
+        {
+            Restart();
+            Stop();
+        }
+
+        public void ResetSpeedAdjustments()
+        {
+        }
+
+        double IAdjustableClock.Rate
+        {
+            get => GameplayClock.Rate;
+            set => throw new NotSupportedException();
+        }
+
+        double IClock.Rate => GameplayClock.Rate;
+
+        public double CurrentTime => GameplayClock.CurrentTime;
+
+        public bool IsRunning => GameplayClock.IsRunning;
+
+        #endregion
     }
 }

From 1705d472b5ff9a6194e0b18ddae14f01c1b91286 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 15 Apr 2021 19:12:52 +0900
Subject: [PATCH 2497/3722] Reimplement multiplayer syncing using new
 master/slave clocks

---
 .../TestSceneMultiplayerSpectator.cs          |  30 +----
 .../Spectate/MultiplayerSlaveClock.cs         |  78 +++++++++++++
 .../Spectate/MultiplayerSpectator.cs          |  86 +++------------
 .../Spectate/MultiplayerSpectatorPlayer.cs    |   9 +-
 .../Spectate/MultiplayerSyncManager.cs        |   5 -
 .../Multiplayer/Spectate/PlayerInstance.cs    | 103 +-----------------
 6 files changed, 104 insertions(+), 207 deletions(-)
 create mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSlaveClock.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
index 1ac012c0b5..ab6324df2d 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.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.
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Audio;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
@@ -156,27 +153,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
             checkPausedInstant(55, false);
         }
 
-        [Test]
-        public void TestPlayerStartsCatchingUpOnlyAfterExceedingMaxOffset()
-        {
-            start(new[] { 55, 56 });
-            loadSpectateScreen();
-
-            sendFrames(55, 1000);
-            sendFrames(56, 1000);
-
-            Bindable<double> slowDownAdjustment;
-
-            AddStep("slow down player 2", () =>
-            {
-                slowDownAdjustment = new Bindable<double>(0.99);
-                getInstance(56).Beatmap.Track.AddAdjustment(AdjustableProperty.Frequency, slowDownAdjustment);
-            });
-
-            AddUntilStep("exceeded min offset but not catching up", () => getGameplayOffset(55, 56) > PlayerInstance.MAX_OFFSET && !getInstance(56).IsCatchingUp);
-            AddUntilStep("catching up or caught up", () => getInstance(56).IsCatchingUp || Math.Abs(getGameplayOffset(55, 56)) < PlayerInstance.SYNC_TARGET * 2);
-        }
-
         [Test]
         public void TestPlayersCatchUpAfterFallingBehind()
         {
@@ -184,7 +160,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             loadSpectateScreen();
 
             // Send initial frames for both players. A few more for player 1.
-            sendFrames(55, 100);
+            sendFrames(55, 1000);
             sendFrames(56, 10);
             checkPausedInstant(55, false);
             checkPausedInstant(56, false);
@@ -194,11 +170,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddWaitStep("wait a few more frames", 10);
 
             // Send more frames for player 2. It should unpause.
-            sendFrames(56, 100);
+            sendFrames(56, 1000);
             checkPausedInstant(56, false);
 
             // Player 2 should catch up to player 1 after unpausing.
-            AddUntilStep("player 2 not catching up", () => !getInstance(56).IsCatchingUp);
+            AddUntilStep("player 2 not catching up", () => !getInstance(56).GameplayClock.IsCatchingUp);
             AddWaitStep("wait a bit", 10);
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSlaveClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSlaveClock.cs
new file mode 100644
index 0000000000..84a87271a2
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSlaveClock.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 System;
+using osu.Framework.Bindables;
+using osu.Framework.Timing;
+
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
+{
+    public class MultiplayerSlaveClock : IFrameBasedClock, IMultiplayerSlaveClock
+    {
+        /// <summary>
+        /// The catchup rate.
+        /// </summary>
+        public const double CATCHUP_RATE = 2;
+
+        private readonly IFrameBasedClock masterClock;
+
+        public MultiplayerSlaveClock(IFrameBasedClock masterClock)
+        {
+            this.masterClock = masterClock;
+        }
+
+        public double CurrentTime { get; private set; }
+
+        public bool IsRunning { get; private set; }
+
+        public void Reset() => CurrentTime = 0;
+
+        public void Start() => IsRunning = true;
+
+        public void Stop() => IsRunning = false;
+
+        public bool Seek(double position) => true;
+
+        public void ResetSpeedAdjustments()
+        {
+        }
+
+        public double Rate => IsCatchingUp ? CATCHUP_RATE : 1;
+
+        double IAdjustableClock.Rate
+        {
+            get => Rate;
+            set => throw new NotSupportedException();
+        }
+
+        double IClock.Rate => Rate;
+
+        public void ProcessFrame()
+        {
+            masterClock.ProcessFrame();
+
+            ElapsedFrameTime = 0;
+            FramesPerSecond = 0;
+
+            if (IsRunning)
+            {
+                double elapsedSource = masterClock.ElapsedFrameTime;
+                double elapsed = elapsedSource * Rate;
+
+                CurrentTime += elapsed;
+                ElapsedFrameTime = elapsed;
+                FramesPerSecond = masterClock.FramesPerSecond;
+            }
+        }
+
+        public double ElapsedFrameTime { get; private set; }
+
+        public double FramesPerSecond { get; private set; }
+
+        public FrameTimeInfo TimeInfo => new FrameTimeInfo { Elapsed = ElapsedFrameTime, Current = CurrentTime };
+
+        public IBindable<bool> WaitingOnFrames { get; } = new Bindable<bool>();
+
+        public bool IsCatchingUp { get; set; }
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index 931d13942b..be5a8cf8c0 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -2,14 +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.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Logging;
-using osu.Framework.Utils;
 using osu.Game.Online.Spectator;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Spectate;
@@ -18,9 +14,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     public class MultiplayerSpectator : SpectatorScreen
     {
-        private const double min_duration_to_allow_playback = 50;
-        private const double maximum_start_delay = 15000;
-
         // Isolates beatmap/ruleset to this screen.
         public override bool DisallowExternalBeatmapRulesetChanges => true;
 
@@ -30,10 +23,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         private SpectatorStreamingClient spectatorClient { get; set; }
 
         private readonly PlayerInstance[] instances;
-        private GameplayClockContainer gameplayClockContainer;
+        private MasterGameplayClockContainer masterClockContainer;
+        private IMultiplayerSyncManager syncManager;
         private PlayerGrid grid;
         private MultiplayerSpectatorLeaderboard leaderboard;
-        private double? loadFinishTime;
 
         public MultiplayerSpectator(int[] userIds)
             : base(userIds.AsSpan().Slice(0, Math.Min(16, userIds.Length)).ToArray())
@@ -46,7 +39,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         {
             Container leaderboardContainer;
 
-            InternalChild = gameplayClockContainer = new MasterGameplayClockContainer(Beatmap.Value, 0)
+            masterClockContainer = new MasterGameplayClockContainer(Beatmap.Value, 0)
             {
                 Child = new GridContainer
                 {
@@ -70,6 +63,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 }
             };
 
+            InternalChildren = new[]
+            {
+                (Drawable)(syncManager = new MultiplayerSyncManager(masterClockContainer)),
+                masterClockContainer
+            };
+
             // Todo: This is not quite correct - it should be per-user to adjust for other mod combinations.
             var playableBeatmap = Beatmap.Value.GetPlayableBeatmap(Ruleset.Value);
             var scoreProcessor = Ruleset.Value.CreateInstance().CreateScoreProcessor();
@@ -78,65 +77,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             LoadComponentAsync(leaderboard = new MultiplayerSpectatorLeaderboard(scoreProcessor, UserIds) { Expanded = { Value = true } }, leaderboardContainer.Add);
         }
 
-        protected override void UpdateAfterChildren()
+        protected override void LoadComplete()
         {
-            base.UpdateAfterChildren();
+            base.LoadComplete();
 
-            if (AllPlayersLoaded)
-                loadFinishTime ??= Time.Current;
-
-            updateGameplayPlayingState();
-        }
-
-        private bool canStartGameplay =>
-            // All players must be loaded, and...
-            AllPlayersLoaded
-            && (
-                // All players have frames...
-                instances.All(i => i.Score.Replay.Frames.Count > 0)
-                // Or any player has frames and the maximum start delay has been exceeded.
-                || (Time.Current - loadFinishTime > maximum_start_delay
-                    && instances.Any(i => i.Score.Replay.Frames.Count > 0))
-            );
-
-        private bool firstStartFrame = true;
-
-        private void updateGameplayPlayingState()
-        {
-            // Make sure all players are loaded and have frames before starting any.
-            if (!canStartGameplay)
-            {
-                foreach (var inst in instances)
-                    inst?.PauseGameplay();
-                return;
-            }
-
-            if (firstStartFrame)
-                gameplayClockContainer.Restart();
-
-            // Not all instances may be in a valid gameplay state (see canStartGameplay). Only control the ones that are.
-            IEnumerable<PlayerInstance> validInstances = instances.Where(i => i.Score.Replay.Frames.Count > 0);
-
-            double targetGameplayTime = gameplayClockContainer.GameplayClock.CurrentTime;
-
-            var instanceTimes = string.Join(',', validInstances.Select(i => $" {i.User.Id}: {(int)i.GetCurrentGameplayTime()}"));
-            Logger.Log($"target: {(int)targetGameplayTime},{instanceTimes}");
-
-            foreach (var inst in validInstances)
-            {
-                Debug.Assert(inst != null);
-
-                double lastFrameTime = inst.Score.Replay.Frames.Select(f => f.Time).Last();
-                double currentTime = inst.GetCurrentGameplayTime();
-
-                bool canContinuePlayback = Precision.DefinitelyBigger(lastFrameTime, currentTime, min_duration_to_allow_playback);
-                if (!canContinuePlayback)
-                    continue;
-
-                inst.ContinueGameplay(targetGameplayTime);
-            }
-
-            firstStartFrame = false;
+            masterClockContainer.Stop();
+            masterClockContainer.Restart();
         }
 
         protected override void OnUserStateChanged(int userId, SpectatorState spectatorState)
@@ -151,15 +97,17 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             if (existingInstance != null)
             {
                 grid.Remove(existingInstance);
+                syncManager.RemoveSlave(existingInstance.GameplayClock);
                 leaderboard.RemoveClock(existingInstance.User.Id);
             }
 
-            LoadComponentAsync(instances[userIndex] = new PlayerInstance(gameplayState.Score, gameplayClockContainer.GameplayClock), d =>
+            LoadComponentAsync(instances[userIndex] = new PlayerInstance(gameplayState.Score, new MultiplayerSlaveClock(masterClockContainer.GameplayClock)), d =>
             {
                 if (instances[userIndex] == d)
                 {
                     grid.Add(d);
-                    leaderboard.AddClock(d.User.Id, d.Beatmap.Track);
+                    syncManager.AddSlave(d.GameplayClock);
+                    leaderboard.AddClock(d.User.Id, d.GameplayClock);
                 }
             });
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
index abb7ec83d8..c82c407c2c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
@@ -4,7 +4,6 @@
 using osu.Framework.Bindables;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 
@@ -12,13 +11,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     public class MultiplayerSpectatorPlayer : SpectatorPlayer
     {
-        public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
+        private readonly MultiplayerSlaveClock gameplayClock;
 
-        public new SubGameplayClockContainer GameplayClockContainer => (SubGameplayClockContainer)base.GameplayClockContainer;
-
-        private readonly GameplayClock gameplayClock;
-
-        public MultiplayerSpectatorPlayer(Score score, GameplayClock gameplayClock)
+        public MultiplayerSpectatorPlayer(Score score, MultiplayerSlaveClock gameplayClock)
             : base(score)
         {
             this.gameplayClock = gameplayClock;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSyncManager.cs
index 42f6536e90..8cbfa823cf 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSyncManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSyncManager.cs
@@ -26,11 +26,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         /// </summary>
         public const double MAXIMUM_START_DELAY = 15000;
 
-        /// <summary>
-        /// The catchup rate.
-        /// </summary>
-        public const double CATCHUP_RATE = 2;
-
         /// <summary>
         /// The master clock which is used to control the timing of all slave clocks.
         /// </summary>
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
index 724a685cb7..631ac2d52e 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
@@ -4,7 +4,6 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
@@ -14,21 +13,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     public class PlayerInstance : CompositeDrawable
     {
-        /// <summary>
-        /// The rate at which a user catches up after becoming desynchronised.
-        /// </summary>
-        private const double catchup_rate = 2;
-
-        /// <summary>
-        /// The offset from the expected time at which to START synchronisation.
-        /// </summary>
-        public const double MAX_OFFSET = 50;
-
-        /// <summary>
-        /// The maximum offset from the expected time at which to STOP synchronisation.
-        /// </summary>
-        public const double SYNC_TARGET = 16;
-
         public bool PlayerLoaded => stack?.CurrentScreen is Player;
 
         public User User => Score.ScoreInfo.User;
@@ -36,17 +20,14 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         public WorkingBeatmap Beatmap { get; private set; }
 
         public readonly Score Score;
-        private readonly GameplayClock gameplayClock;
-
-        public bool IsCatchingUp { get; private set; }
+        public readonly MultiplayerSlaveClock GameplayClock;
 
         private OsuScreenStack stack;
-        private MultiplayerSpectatorPlayer player;
 
-        public PlayerInstance(Score score, GameplayClock gameplayClock)
+        public PlayerInstance(Score score, MultiplayerSlaveClock gameplayClock)
         {
             Score = score;
-            this.gameplayClock = gameplayClock;
+            GameplayClock = gameplayClock;
 
             RelativeSizeAxes = Axes.Both;
             Masking = true;
@@ -67,83 +48,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 }
             };
 
-            stack.Push(new MultiplayerSpectatorPlayerLoader(Score, () => player = new MultiplayerSpectatorPlayer(Score, gameplayClock)));
-        }
-
-        protected override void UpdateAfterChildren()
-        {
-            base.UpdateAfterChildren();
-            updateCatchup();
-        }
-
-        private double targetGameplayTime;
-
-        private void updateCatchup()
-        {
-            if (player?.IsLoaded != true)
-                return;
-
-            if (Score.Replay.Frames.Count == 0)
-                return;
-
-            if (player.GameplayClockContainer.IsPaused.Value)
-                return;
-
-            double currentTime = Beatmap.Track.CurrentTime;
-            double timeBehind = targetGameplayTime - currentTime;
-
-            double offsetForCatchup = IsCatchingUp ? SYNC_TARGET : MAX_OFFSET;
-            bool catchupRequired = timeBehind > offsetForCatchup;
-
-            // Skip catchup if no work needs to be done.
-            if (catchupRequired == IsCatchingUp)
-                return;
-
-            if (catchupRequired)
-            {
-                // player.GameplayClockContainer.AdjustableClock.Rate = catchup_rate;
-                Logger.Log($"{User.Id} catchup started (behind: {(int)timeBehind})");
-            }
-            else
-            {
-                // player.GameplayClockContainer.AdjustableClock.Rate = 1;
-                Logger.Log($"{User.Id} catchup finished (behind: {(int)timeBehind})");
-            }
-
-            IsCatchingUp = catchupRequired;
-        }
-
-        public double GetCurrentGameplayTime()
-        {
-            if (player?.IsLoaded != true)
-                return 0;
-
-            return player.GameplayClockContainer.GameplayClock.CurrentTime;
-        }
-
-        public bool IsPlaying()
-        {
-            if (player.IsLoaded != true)
-                return false;
-
-            return player.GameplayClockContainer.GameplayClock.IsRunning;
-        }
-
-        public void ContinueGameplay(double targetGameplayTime)
-        {
-            if (player?.IsLoaded != true)
-                return;
-
-            player.GameplayClockContainer.Start();
-            this.targetGameplayTime = targetGameplayTime;
-        }
-
-        public void PauseGameplay()
-        {
-            if (player?.IsLoaded != true)
-                return;
-
-            player.GameplayClockContainer.Stop();
+            stack.Push(new MultiplayerSpectatorPlayerLoader(Score, () => new MultiplayerSpectatorPlayer(Score, GameplayClock)));
         }
 
         // Player interferes with global input, so disable input for now.

From df4fce2c570b885176cb70f1f2232610ad2a7848 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 15 Apr 2021 19:16:00 +0900
Subject: [PATCH 2498/3722] Rename classes

---
 ...s => MultiplayerCatchupSyncManagerTest.cs} | 50 +++++++++----------
 ....cs => IMultiplayerSpectatorSlaveClock.cs} |  2 +-
 ...cs => IMultiplayerSpectatorSyncManager.cs} |  6 +--
 ...er.cs => MultiplayerCatchupSyncManager.cs} | 10 ++--
 .../Spectate/MultiplayerSpectator.cs          |  6 +--
 .../Spectate/MultiplayerSpectatorPlayer.cs    |  4 +-
 ...k.cs => MultiplayerSpectatorSlaveClock.cs} |  4 +-
 .../Multiplayer/Spectate/PlayerInstance.cs    |  4 +-
 8 files changed, 43 insertions(+), 43 deletions(-)
 rename osu.Game.Tests/OnlinePlay/{MultiplayerSyncManagerTest.cs => MultiplayerCatchupSyncManagerTest.cs} (70%)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/{IMultiplayerSlaveClock.cs => IMultiplayerSpectatorSlaveClock.cs} (83%)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/{IMultiplayerSyncManager.cs => IMultiplayerSpectatorSyncManager.cs} (62%)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/{MultiplayerSyncManager.cs => MultiplayerCatchupSyncManager.cs} (91%)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/{MultiplayerSlaveClock.cs => MultiplayerSpectatorSlaveClock.cs} (91%)

diff --git a/osu.Game.Tests/OnlinePlay/MultiplayerSyncManagerTest.cs b/osu.Game.Tests/OnlinePlay/MultiplayerCatchupSyncManagerTest.cs
similarity index 70%
rename from osu.Game.Tests/OnlinePlay/MultiplayerSyncManagerTest.cs
rename to osu.Game.Tests/OnlinePlay/MultiplayerCatchupSyncManagerTest.cs
index 6ee867c6f8..f15fb5cfd1 100644
--- a/osu.Game.Tests/OnlinePlay/MultiplayerSyncManagerTest.cs
+++ b/osu.Game.Tests/OnlinePlay/MultiplayerCatchupSyncManagerTest.cs
@@ -12,22 +12,22 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Tests.OnlinePlay
 {
     [HeadlessTest]
-    public class MultiplayerSyncManagerTest : OsuTestScene
+    public class MultiplayerCatchupSyncManagerTest : OsuTestScene
     {
         private TestManualClock master;
-        private MultiplayerSyncManager syncManager;
+        private MultiplayerCatchupSyncManager catchupSyncManager;
 
-        private TestSlaveClock slave1;
-        private TestSlaveClock slave2;
+        private TestSpectatorSlaveClock slave1;
+        private TestSpectatorSlaveClock slave2;
 
         [SetUp]
         public void Setup()
         {
-            syncManager = new MultiplayerSyncManager(master = new TestManualClock());
-            syncManager.AddSlave(slave1 = new TestSlaveClock(1));
-            syncManager.AddSlave(slave2 = new TestSlaveClock(2));
+            catchupSyncManager = new MultiplayerCatchupSyncManager(master = new TestManualClock());
+            catchupSyncManager.AddSlave(slave1 = new TestSpectatorSlaveClock(1));
+            catchupSyncManager.AddSlave(slave2 = new TestSpectatorSlaveClock(2));
 
-            Schedule(() => Child = syncManager);
+            Schedule(() => Child = catchupSyncManager);
         }
 
         [Test]
@@ -47,7 +47,7 @@ namespace osu.Game.Tests.OnlinePlay
         [Test]
         public void TestMasterClockDoesNotStartWhenNoneReadyForMaximumDelayTime()
         {
-            AddWaitStep($"wait {MultiplayerSyncManager.MAXIMUM_START_DELAY} milliseconds", (int)Math.Ceiling(MultiplayerSyncManager.MAXIMUM_START_DELAY / TimePerAction));
+            AddWaitStep($"wait {MultiplayerCatchupSyncManager.MAXIMUM_START_DELAY} milliseconds", (int)Math.Ceiling(MultiplayerCatchupSyncManager.MAXIMUM_START_DELAY / TimePerAction));
             assertMasterState(false);
         }
 
@@ -55,7 +55,7 @@ namespace osu.Game.Tests.OnlinePlay
         public void TestMasterClockStartsWhenAnyReadyForMaximumDelayTime()
         {
             setWaiting(() => slave1, false);
-            AddWaitStep($"wait {MultiplayerSyncManager.MAXIMUM_START_DELAY} milliseconds", (int)Math.Ceiling(MultiplayerSyncManager.MAXIMUM_START_DELAY / TimePerAction));
+            AddWaitStep($"wait {MultiplayerCatchupSyncManager.MAXIMUM_START_DELAY} milliseconds", (int)Math.Ceiling(MultiplayerCatchupSyncManager.MAXIMUM_START_DELAY / TimePerAction));
             assertMasterState(true);
         }
 
@@ -64,7 +64,7 @@ namespace osu.Game.Tests.OnlinePlay
         {
             setAllWaiting(false);
 
-            setMasterTime(MultiplayerSyncManager.SYNC_TARGET + 1);
+            setMasterTime(MultiplayerCatchupSyncManager.SYNC_TARGET + 1);
             assertCatchingUp(() => slave1, false);
         }
 
@@ -73,7 +73,7 @@ namespace osu.Game.Tests.OnlinePlay
         {
             setAllWaiting(false);
 
-            setMasterTime(MultiplayerSyncManager.MAX_SYNC_OFFSET + 1);
+            setMasterTime(MultiplayerCatchupSyncManager.MAX_SYNC_OFFSET + 1);
             assertCatchingUp(() => slave1, true);
             assertCatchingUp(() => slave2, true);
         }
@@ -83,8 +83,8 @@ namespace osu.Game.Tests.OnlinePlay
         {
             setAllWaiting(false);
 
-            setMasterTime(MultiplayerSyncManager.MAX_SYNC_OFFSET + 1);
-            setSlaveTime(() => slave1, MultiplayerSyncManager.SYNC_TARGET + 1);
+            setMasterTime(MultiplayerCatchupSyncManager.MAX_SYNC_OFFSET + 1);
+            setSlaveTime(() => slave1, MultiplayerCatchupSyncManager.SYNC_TARGET + 1);
             assertCatchingUp(() => slave1, true);
         }
 
@@ -93,8 +93,8 @@ namespace osu.Game.Tests.OnlinePlay
         {
             setAllWaiting(false);
 
-            setMasterTime(MultiplayerSyncManager.MAX_SYNC_OFFSET + 2);
-            setSlaveTime(() => slave1, MultiplayerSyncManager.SYNC_TARGET);
+            setMasterTime(MultiplayerCatchupSyncManager.MAX_SYNC_OFFSET + 2);
+            setSlaveTime(() => slave1, MultiplayerCatchupSyncManager.SYNC_TARGET);
             assertCatchingUp(() => slave1, false);
             assertCatchingUp(() => slave2, true);
         }
@@ -104,7 +104,7 @@ namespace osu.Game.Tests.OnlinePlay
         {
             setAllWaiting(false);
 
-            setSlaveTime(() => slave1, -MultiplayerSyncManager.SYNC_TARGET);
+            setSlaveTime(() => slave1, -MultiplayerCatchupSyncManager.SYNC_TARGET);
             assertCatchingUp(() => slave1, false);
             assertSlaveState(() => slave1, true);
         }
@@ -114,7 +114,7 @@ namespace osu.Game.Tests.OnlinePlay
         {
             setAllWaiting(false);
 
-            setSlaveTime(() => slave1, -MultiplayerSyncManager.SYNC_TARGET - 1);
+            setSlaveTime(() => slave1, -MultiplayerCatchupSyncManager.SYNC_TARGET - 1);
 
             // This is a silent catchup, where IsCatchingUp = false but IsRunning = false also.
             assertCatchingUp(() => slave1, false);
@@ -135,7 +135,7 @@ namespace osu.Game.Tests.OnlinePlay
             assertSlaveState(() => slave1, false);
         }
 
-        private void setWaiting(Func<TestSlaveClock> slave, bool waiting)
+        private void setWaiting(Func<TestSpectatorSlaveClock> slave, bool waiting)
             => AddStep($"set slave {slave().Id} waiting = {waiting}", () => slave().WaitingOnFrames.Value = waiting);
 
         private void setAllWaiting(bool waiting) => AddStep($"set all slaves waiting = {waiting}", () =>
@@ -150,28 +150,28 @@ namespace osu.Game.Tests.OnlinePlay
         /// <summary>
         /// slave.Time = master.Time - offsetFromMaster
         /// </summary>
-        private void setSlaveTime(Func<TestSlaveClock> slave, double offsetFromMaster)
+        private void setSlaveTime(Func<TestSpectatorSlaveClock> slave, double offsetFromMaster)
             => AddStep($"set slave {slave().Id} = master - {offsetFromMaster}", () => slave().Seek(master.CurrentTime - offsetFromMaster));
 
         private void assertMasterState(bool running)
             => AddAssert($"master clock {(running ? "is" : "is not")} running", () => master.IsRunning == running);
 
-        private void assertCatchingUp(Func<TestSlaveClock> slave, bool catchingUp) =>
+        private void assertCatchingUp(Func<TestSpectatorSlaveClock> slave, bool catchingUp) =>
             AddAssert($"slave {slave().Id} {(catchingUp ? "is" : "is not")} catching up", () => slave().IsCatchingUp == catchingUp);
 
-        private void assertSlaveState(Func<TestSlaveClock> slave, bool running)
+        private void assertSlaveState(Func<TestSpectatorSlaveClock> slave, bool running)
             => AddAssert($"slave {slave().Id} {(running ? "is" : "is not")} running", () => slave().IsRunning == running);
 
-        private class TestSlaveClock : TestManualClock, IMultiplayerSlaveClock
+        private class TestSpectatorSlaveClock : TestManualClock, IMultiplayerSpectatorSlaveClock
         {
             public readonly Bindable<bool> WaitingOnFrames = new Bindable<bool>(true);
-            IBindable<bool> IMultiplayerSlaveClock.WaitingOnFrames => WaitingOnFrames;
+            IBindable<bool> IMultiplayerSpectatorSlaveClock.WaitingOnFrames => WaitingOnFrames;
 
             public bool IsCatchingUp { get; set; }
 
             public readonly int Id;
 
-            public TestSlaveClock(int id)
+            public TestSpectatorSlaveClock(int id)
             {
                 Id = id;
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSlaveClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSpectatorSlaveClock.cs
similarity index 83%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSlaveClock.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSpectatorSlaveClock.cs
index e90eed68ab..fe2c2dfec9 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSlaveClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSpectatorSlaveClock.cs
@@ -6,7 +6,7 @@ using osu.Framework.Timing;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
-    public interface IMultiplayerSlaveClock : IAdjustableClock
+    public interface IMultiplayerSpectatorSlaveClock : IAdjustableClock
     {
         IBindable<bool> WaitingOnFrames { get; }
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSpectatorSyncManager.cs
similarity index 62%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSyncManager.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSpectatorSyncManager.cs
index 2c50596823..5643bde68f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSyncManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSpectatorSyncManager.cs
@@ -5,12 +5,12 @@ using osu.Framework.Timing;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
-    public interface IMultiplayerSyncManager
+    public interface IMultiplayerSpectatorSyncManager
     {
         IAdjustableClock Master { get; }
 
-        void AddSlave(IMultiplayerSlaveClock clock);
+        void AddSlave(IMultiplayerSpectatorSlaveClock clock);
 
-        void RemoveSlave(IMultiplayerSlaveClock clock);
+        void RemoveSlave(IMultiplayerSpectatorSlaveClock clock);
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerCatchupSyncManager.cs
similarity index 91%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSyncManager.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerCatchupSyncManager.cs
index 8cbfa823cf..873f34626d 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSyncManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerCatchupSyncManager.cs
@@ -9,7 +9,7 @@ using osu.Framework.Timing;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
-    public class MultiplayerSyncManager : Component, IMultiplayerSyncManager
+    public class MultiplayerCatchupSyncManager : Component, IMultiplayerSpectatorSyncManager
     {
         /// <summary>
         /// The offset from the master clock to which slaves should be synchronised to.
@@ -34,19 +34,19 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         /// <summary>
         /// The slave clocks.
         /// </summary>
-        private readonly List<IMultiplayerSlaveClock> slaves = new List<IMultiplayerSlaveClock>();
+        private readonly List<IMultiplayerSpectatorSlaveClock> slaves = new List<IMultiplayerSpectatorSlaveClock>();
 
         private bool hasStarted;
         private double? firstStartAttemptTime;
 
-        public MultiplayerSyncManager(IAdjustableClock master)
+        public MultiplayerCatchupSyncManager(IAdjustableClock master)
         {
             Master = master;
         }
 
-        public void AddSlave(IMultiplayerSlaveClock clock) => slaves.Add(clock);
+        public void AddSlave(IMultiplayerSpectatorSlaveClock clock) => slaves.Add(clock);
 
-        public void RemoveSlave(IMultiplayerSlaveClock clock) => slaves.Remove(clock);
+        public void RemoveSlave(IMultiplayerSpectatorSlaveClock clock) => slaves.Remove(clock);
 
         protected override void Update()
         {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index be5a8cf8c0..3dade4d32c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         private readonly PlayerInstance[] instances;
         private MasterGameplayClockContainer masterClockContainer;
-        private IMultiplayerSyncManager syncManager;
+        private IMultiplayerSpectatorSyncManager syncManager;
         private PlayerGrid grid;
         private MultiplayerSpectatorLeaderboard leaderboard;
 
@@ -65,7 +65,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
             InternalChildren = new[]
             {
-                (Drawable)(syncManager = new MultiplayerSyncManager(masterClockContainer)),
+                (Drawable)(syncManager = new MultiplayerCatchupSyncManager(masterClockContainer)),
                 masterClockContainer
             };
 
@@ -101,7 +101,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 leaderboard.RemoveClock(existingInstance.User.Id);
             }
 
-            LoadComponentAsync(instances[userIndex] = new PlayerInstance(gameplayState.Score, new MultiplayerSlaveClock(masterClockContainer.GameplayClock)), d =>
+            LoadComponentAsync(instances[userIndex] = new PlayerInstance(gameplayState.Score, new MultiplayerSpectatorSlaveClock(masterClockContainer.GameplayClock)), d =>
             {
                 if (instances[userIndex] == d)
                 {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
index c82c407c2c..7fe1416224 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
@@ -11,9 +11,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     public class MultiplayerSpectatorPlayer : SpectatorPlayer
     {
-        private readonly MultiplayerSlaveClock gameplayClock;
+        private readonly MultiplayerSpectatorSlaveClock gameplayClock;
 
-        public MultiplayerSpectatorPlayer(Score score, MultiplayerSlaveClock gameplayClock)
+        public MultiplayerSpectatorPlayer(Score score, MultiplayerSpectatorSlaveClock gameplayClock)
             : base(score)
         {
             this.gameplayClock = gameplayClock;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSlaveClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorSlaveClock.cs
similarity index 91%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSlaveClock.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorSlaveClock.cs
index 84a87271a2..6960d24295 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSlaveClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorSlaveClock.cs
@@ -7,7 +7,7 @@ using osu.Framework.Timing;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
-    public class MultiplayerSlaveClock : IFrameBasedClock, IMultiplayerSlaveClock
+    public class MultiplayerSpectatorSlaveClock : IFrameBasedClock, IMultiplayerSpectatorSlaveClock
     {
         /// <summary>
         /// The catchup rate.
@@ -16,7 +16,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         private readonly IFrameBasedClock masterClock;
 
-        public MultiplayerSlaveClock(IFrameBasedClock masterClock)
+        public MultiplayerSpectatorSlaveClock(IFrameBasedClock masterClock)
         {
             this.masterClock = masterClock;
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
index 631ac2d52e..384c1f1f2b 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
@@ -20,11 +20,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         public WorkingBeatmap Beatmap { get; private set; }
 
         public readonly Score Score;
-        public readonly MultiplayerSlaveClock GameplayClock;
+        public readonly MultiplayerSpectatorSlaveClock GameplayClock;
 
         private OsuScreenStack stack;
 
-        public PlayerInstance(Score score, MultiplayerSlaveClock gameplayClock)
+        public PlayerInstance(Score score, MultiplayerSpectatorSlaveClock gameplayClock)
         {
             Score = score;
             GameplayClock = gameplayClock;

From 82fcabb8f0d94b083b25306d1647c1925c598f5c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 15 Apr 2021 19:32:55 +0900
Subject: [PATCH 2499/3722] More refactorings/renamespacings/xmldocs

---
 ...s => MultiplayerCatchUpSyncManagerTest.cs} | 48 +++++++++++--------
 .../IMultiplayerSpectatorSlaveClock.cs        | 15 ------
 .../IMultiplayerSpectatorSyncManager.cs       | 16 -------
 .../Spectate/MultiplayerSpectator.cs          |  7 +--
 .../Spectate/MultiplayerSpectatorPlayer.cs    |  5 +-
 .../Multiplayer/Spectate/PlayerInstance.cs    |  5 +-
 .../Spectate/Sync/ISpectatorSlaveClock.cs     | 24 ++++++++++
 .../Spectate/Sync/ISpectatorSyncManager.cs    | 30 ++++++++++++
 .../SpectatorCatchUpSlaveClock.cs}            |  6 +--
 .../SpectatorCatchUpSyncManager.cs}           | 15 +++---
 10 files changed, 105 insertions(+), 66 deletions(-)
 rename osu.Game.Tests/OnlinePlay/{MultiplayerCatchupSyncManagerTest.cs => MultiplayerCatchUpSyncManagerTest.cs} (76%)
 delete mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSpectatorSlaveClock.cs
 delete mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSpectatorSyncManager.cs
 create mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorSlaveClock.cs
 create mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorSyncManager.cs
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/{MultiplayerSpectatorSlaveClock.cs => Sync/SpectatorCatchUpSlaveClock.cs} (89%)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/{MultiplayerCatchupSyncManager.cs => Sync/SpectatorCatchUpSyncManager.cs} (88%)

diff --git a/osu.Game.Tests/OnlinePlay/MultiplayerCatchupSyncManagerTest.cs b/osu.Game.Tests/OnlinePlay/MultiplayerCatchUpSyncManagerTest.cs
similarity index 76%
rename from osu.Game.Tests/OnlinePlay/MultiplayerCatchupSyncManagerTest.cs
rename to osu.Game.Tests/OnlinePlay/MultiplayerCatchUpSyncManagerTest.cs
index f15fb5cfd1..6aa1219d53 100644
--- a/osu.Game.Tests/OnlinePlay/MultiplayerCatchupSyncManagerTest.cs
+++ b/osu.Game.Tests/OnlinePlay/MultiplayerCatchUpSyncManagerTest.cs
@@ -6,16 +6,16 @@ using NUnit.Framework;
 using osu.Framework.Bindables;
 using osu.Framework.Testing;
 using osu.Framework.Timing;
-using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Tests.OnlinePlay
 {
     [HeadlessTest]
-    public class MultiplayerCatchupSyncManagerTest : OsuTestScene
+    public class MultiplayerCatchUpSyncManagerTest : OsuTestScene
     {
         private TestManualClock master;
-        private MultiplayerCatchupSyncManager catchupSyncManager;
+        private SpectatorCatchUpSyncManager syncManager;
 
         private TestSpectatorSlaveClock slave1;
         private TestSpectatorSlaveClock slave2;
@@ -23,11 +23,11 @@ namespace osu.Game.Tests.OnlinePlay
         [SetUp]
         public void Setup()
         {
-            catchupSyncManager = new MultiplayerCatchupSyncManager(master = new TestManualClock());
-            catchupSyncManager.AddSlave(slave1 = new TestSpectatorSlaveClock(1));
-            catchupSyncManager.AddSlave(slave2 = new TestSpectatorSlaveClock(2));
+            syncManager = new SpectatorCatchUpSyncManager(master = new TestManualClock());
+            syncManager.AddSlave(slave1 = new TestSpectatorSlaveClock(1));
+            syncManager.AddSlave(slave2 = new TestSpectatorSlaveClock(2));
 
-            Schedule(() => Child = catchupSyncManager);
+            Schedule(() => Child = syncManager);
         }
 
         [Test]
@@ -47,7 +47,7 @@ namespace osu.Game.Tests.OnlinePlay
         [Test]
         public void TestMasterClockDoesNotStartWhenNoneReadyForMaximumDelayTime()
         {
-            AddWaitStep($"wait {MultiplayerCatchupSyncManager.MAXIMUM_START_DELAY} milliseconds", (int)Math.Ceiling(MultiplayerCatchupSyncManager.MAXIMUM_START_DELAY / TimePerAction));
+            AddWaitStep($"wait {SpectatorCatchUpSyncManager.MAXIMUM_START_DELAY} milliseconds", (int)Math.Ceiling(SpectatorCatchUpSyncManager.MAXIMUM_START_DELAY / TimePerAction));
             assertMasterState(false);
         }
 
@@ -55,7 +55,7 @@ namespace osu.Game.Tests.OnlinePlay
         public void TestMasterClockStartsWhenAnyReadyForMaximumDelayTime()
         {
             setWaiting(() => slave1, false);
-            AddWaitStep($"wait {MultiplayerCatchupSyncManager.MAXIMUM_START_DELAY} milliseconds", (int)Math.Ceiling(MultiplayerCatchupSyncManager.MAXIMUM_START_DELAY / TimePerAction));
+            AddWaitStep($"wait {SpectatorCatchUpSyncManager.MAXIMUM_START_DELAY} milliseconds", (int)Math.Ceiling(SpectatorCatchUpSyncManager.MAXIMUM_START_DELAY / TimePerAction));
             assertMasterState(true);
         }
 
@@ -64,7 +64,7 @@ namespace osu.Game.Tests.OnlinePlay
         {
             setAllWaiting(false);
 
-            setMasterTime(MultiplayerCatchupSyncManager.SYNC_TARGET + 1);
+            setMasterTime(SpectatorCatchUpSyncManager.SYNC_TARGET + 1);
             assertCatchingUp(() => slave1, false);
         }
 
@@ -73,7 +73,7 @@ namespace osu.Game.Tests.OnlinePlay
         {
             setAllWaiting(false);
 
-            setMasterTime(MultiplayerCatchupSyncManager.MAX_SYNC_OFFSET + 1);
+            setMasterTime(SpectatorCatchUpSyncManager.MAX_SYNC_OFFSET + 1);
             assertCatchingUp(() => slave1, true);
             assertCatchingUp(() => slave2, true);
         }
@@ -83,8 +83,8 @@ namespace osu.Game.Tests.OnlinePlay
         {
             setAllWaiting(false);
 
-            setMasterTime(MultiplayerCatchupSyncManager.MAX_SYNC_OFFSET + 1);
-            setSlaveTime(() => slave1, MultiplayerCatchupSyncManager.SYNC_TARGET + 1);
+            setMasterTime(SpectatorCatchUpSyncManager.MAX_SYNC_OFFSET + 1);
+            setSlaveTime(() => slave1, SpectatorCatchUpSyncManager.SYNC_TARGET + 1);
             assertCatchingUp(() => slave1, true);
         }
 
@@ -93,8 +93,8 @@ namespace osu.Game.Tests.OnlinePlay
         {
             setAllWaiting(false);
 
-            setMasterTime(MultiplayerCatchupSyncManager.MAX_SYNC_OFFSET + 2);
-            setSlaveTime(() => slave1, MultiplayerCatchupSyncManager.SYNC_TARGET);
+            setMasterTime(SpectatorCatchUpSyncManager.MAX_SYNC_OFFSET + 2);
+            setSlaveTime(() => slave1, SpectatorCatchUpSyncManager.SYNC_TARGET);
             assertCatchingUp(() => slave1, false);
             assertCatchingUp(() => slave2, true);
         }
@@ -104,7 +104,7 @@ namespace osu.Game.Tests.OnlinePlay
         {
             setAllWaiting(false);
 
-            setSlaveTime(() => slave1, -MultiplayerCatchupSyncManager.SYNC_TARGET);
+            setSlaveTime(() => slave1, -SpectatorCatchUpSyncManager.SYNC_TARGET);
             assertCatchingUp(() => slave1, false);
             assertSlaveState(() => slave1, true);
         }
@@ -114,7 +114,7 @@ namespace osu.Game.Tests.OnlinePlay
         {
             setAllWaiting(false);
 
-            setSlaveTime(() => slave1, -MultiplayerCatchupSyncManager.SYNC_TARGET - 1);
+            setSlaveTime(() => slave1, -SpectatorCatchUpSyncManager.SYNC_TARGET - 1);
 
             // This is a silent catchup, where IsCatchingUp = false but IsRunning = false also.
             assertCatchingUp(() => slave1, false);
@@ -162,10 +162,10 @@ namespace osu.Game.Tests.OnlinePlay
         private void assertSlaveState(Func<TestSpectatorSlaveClock> slave, bool running)
             => AddAssert($"slave {slave().Id} {(running ? "is" : "is not")} running", () => slave().IsRunning == running);
 
-        private class TestSpectatorSlaveClock : TestManualClock, IMultiplayerSpectatorSlaveClock
+        private class TestSpectatorSlaveClock : TestManualClock, ISpectatorSlaveClock
         {
             public readonly Bindable<bool> WaitingOnFrames = new Bindable<bool>(true);
-            IBindable<bool> IMultiplayerSpectatorSlaveClock.WaitingOnFrames => WaitingOnFrames;
+            IBindable<bool> ISpectatorSlaveClock.WaitingOnFrames => WaitingOnFrames;
 
             public bool IsCatchingUp { get; set; }
 
@@ -183,6 +183,16 @@ namespace osu.Game.Tests.OnlinePlay
                         Start();
                 });
             }
+
+            public void ProcessFrame()
+            {
+            }
+
+            public double ElapsedFrameTime => 0;
+
+            public double FramesPerSecond => 0;
+
+            public FrameTimeInfo TimeInfo => default;
         }
 
         private class TestManualClock : ManualClock, IAdjustableClock
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSpectatorSlaveClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSpectatorSlaveClock.cs
deleted file mode 100644
index fe2c2dfec9..0000000000
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSpectatorSlaveClock.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 osu.Framework.Bindables;
-using osu.Framework.Timing;
-
-namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
-{
-    public interface IMultiplayerSpectatorSlaveClock : IAdjustableClock
-    {
-        IBindable<bool> WaitingOnFrames { get; }
-
-        bool IsCatchingUp { get; set; }
-    }
-}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSpectatorSyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSpectatorSyncManager.cs
deleted file mode 100644
index 5643bde68f..0000000000
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/IMultiplayerSpectatorSyncManager.cs
+++ /dev/null
@@ -1,16 +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.Timing;
-
-namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
-{
-    public interface IMultiplayerSpectatorSyncManager
-    {
-        IAdjustableClock Master { get; }
-
-        void AddSlave(IMultiplayerSpectatorSlaveClock clock);
-
-        void RemoveSlave(IMultiplayerSpectatorSlaveClock clock);
-    }
-}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index 3dade4d32c..441839b401 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -7,6 +7,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Online.Spectator;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Spectate;
 
@@ -24,7 +25,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         private readonly PlayerInstance[] instances;
         private MasterGameplayClockContainer masterClockContainer;
-        private IMultiplayerSpectatorSyncManager syncManager;
+        private ISpectatorSyncManager syncManager;
         private PlayerGrid grid;
         private MultiplayerSpectatorLeaderboard leaderboard;
 
@@ -65,7 +66,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
             InternalChildren = new[]
             {
-                (Drawable)(syncManager = new MultiplayerCatchupSyncManager(masterClockContainer)),
+                (Drawable)(syncManager = new SpectatorCatchUpSyncManager(masterClockContainer)),
                 masterClockContainer
             };
 
@@ -101,7 +102,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 leaderboard.RemoveClock(existingInstance.User.Id);
             }
 
-            LoadComponentAsync(instances[userIndex] = new PlayerInstance(gameplayState.Score, new MultiplayerSpectatorSlaveClock(masterClockContainer.GameplayClock)), d =>
+            LoadComponentAsync(instances[userIndex] = new PlayerInstance(gameplayState.Score, new SpectatorCatchUpSlaveClock(masterClockContainer.GameplayClock)), d =>
             {
                 if (instances[userIndex] == d)
                 {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
index 7fe1416224..1a7e0dd36a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
@@ -5,15 +5,16 @@ using osu.Framework.Bindables;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Scoring;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync;
 using osu.Game.Screens.Play;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     public class MultiplayerSpectatorPlayer : SpectatorPlayer
     {
-        private readonly MultiplayerSpectatorSlaveClock gameplayClock;
+        private readonly SpectatorCatchUpSlaveClock gameplayClock;
 
-        public MultiplayerSpectatorPlayer(Score score, MultiplayerSpectatorSlaveClock gameplayClock)
+        public MultiplayerSpectatorPlayer(Score score, SpectatorCatchUpSlaveClock gameplayClock)
             : base(score)
         {
             this.gameplayClock = gameplayClock;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
index 384c1f1f2b..401732f7fb 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
@@ -6,6 +6,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 using osu.Game.Scoring;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync;
 using osu.Game.Screens.Play;
 using osu.Game.Users;
 
@@ -20,11 +21,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         public WorkingBeatmap Beatmap { get; private set; }
 
         public readonly Score Score;
-        public readonly MultiplayerSpectatorSlaveClock GameplayClock;
+        public readonly SpectatorCatchUpSlaveClock GameplayClock;
 
         private OsuScreenStack stack;
 
-        public PlayerInstance(Score score, MultiplayerSpectatorSlaveClock gameplayClock)
+        public PlayerInstance(Score score, SpectatorCatchUpSlaveClock gameplayClock)
         {
             Score = score;
             GameplayClock = gameplayClock;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorSlaveClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorSlaveClock.cs
new file mode 100644
index 0000000000..d8733d4322
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorSlaveClock.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.Bindables;
+using osu.Framework.Timing;
+
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
+{
+    /// <summary>
+    /// A clock which is used by <see cref="MultiplayerSpectatorPlayer"/>s and managed by an <see cref="ISpectatorSyncManager"/>.
+    /// </summary>
+    public interface ISpectatorSlaveClock : IFrameBasedClock, IAdjustableClock
+    {
+        /// <summary>
+        /// Whether this clock is waiting on frames to continue playback.
+        /// </summary>
+        IBindable<bool> WaitingOnFrames { get; }
+
+        /// <summary>
+        /// Whether this clock is resynchronising to the master clock.
+        /// </summary>
+        bool IsCatchingUp { get; set; }
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorSyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorSyncManager.cs
new file mode 100644
index 0000000000..107f9637a3
--- /dev/null
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorSyncManager.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 osu.Framework.Timing;
+
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
+{
+    /// <summary>
+    /// Manages the synchronisation between one or more slave clocks in relation to a master clock.
+    /// </summary>
+    public interface ISpectatorSyncManager
+    {
+        /// <summary>
+        /// The master clock which slaves should synchronise to.
+        /// </summary>
+        IAdjustableClock Master { get; }
+
+        /// <summary>
+        /// Adds a slave clock.
+        /// </summary>
+        /// <param name="clock">The clock to add.</param>
+        void AddSlave(ISpectatorSlaveClock clock);
+
+        /// <summary>
+        /// Removes a slave clock.
+        /// </summary>
+        /// <param name="clock">The clock to remove.</param>
+        void RemoveSlave(ISpectatorSlaveClock clock);
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorSlaveClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/SpectatorCatchUpSlaveClock.cs
similarity index 89%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorSlaveClock.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/SpectatorCatchUpSlaveClock.cs
index 6960d24295..e4d25894c8 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorSlaveClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/SpectatorCatchUpSlaveClock.cs
@@ -5,9 +5,9 @@ using System;
 using osu.Framework.Bindables;
 using osu.Framework.Timing;
 
-namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
 {
-    public class MultiplayerSpectatorSlaveClock : IFrameBasedClock, IMultiplayerSpectatorSlaveClock
+    public class SpectatorCatchUpSlaveClock : ISpectatorSlaveClock
     {
         /// <summary>
         /// The catchup rate.
@@ -16,7 +16,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         private readonly IFrameBasedClock masterClock;
 
-        public MultiplayerSpectatorSlaveClock(IFrameBasedClock masterClock)
+        public SpectatorCatchUpSlaveClock(IFrameBasedClock masterClock)
         {
             this.masterClock = masterClock;
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerCatchupSyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/SpectatorCatchUpSyncManager.cs
similarity index 88%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerCatchupSyncManager.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/SpectatorCatchUpSyncManager.cs
index 873f34626d..46e86177ca 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerCatchupSyncManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/SpectatorCatchUpSyncManager.cs
@@ -7,9 +7,12 @@ using osu.Framework.Graphics;
 using osu.Framework.Logging;
 using osu.Framework.Timing;
 
-namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
 {
-    public class MultiplayerCatchupSyncManager : Component, IMultiplayerSpectatorSyncManager
+    /// <summary>
+    /// A <see cref="ISpectatorSyncManager"/> which synchronises de-synced slave clocks through catchup.
+    /// </summary>
+    public class SpectatorCatchUpSyncManager : Component, ISpectatorSyncManager
     {
         /// <summary>
         /// The offset from the master clock to which slaves should be synchronised to.
@@ -34,19 +37,19 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         /// <summary>
         /// The slave clocks.
         /// </summary>
-        private readonly List<IMultiplayerSpectatorSlaveClock> slaves = new List<IMultiplayerSpectatorSlaveClock>();
+        private readonly List<ISpectatorSlaveClock> slaves = new List<ISpectatorSlaveClock>();
 
         private bool hasStarted;
         private double? firstStartAttemptTime;
 
-        public MultiplayerCatchupSyncManager(IAdjustableClock master)
+        public SpectatorCatchUpSyncManager(IAdjustableClock master)
         {
             Master = master;
         }
 
-        public void AddSlave(IMultiplayerSpectatorSlaveClock clock) => slaves.Add(clock);
+        public void AddSlave(ISpectatorSlaveClock clock) => slaves.Add(clock);
 
-        public void RemoveSlave(IMultiplayerSpectatorSlaveClock clock) => slaves.Remove(clock);
+        public void RemoveSlave(ISpectatorSlaveClock clock) => slaves.Remove(clock);
 
         protected override void Update()
         {

From 33cc5c5cb36456479bacf67ccdb4e585ce8e7ca5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 15 Apr 2021 19:35:57 +0900
Subject: [PATCH 2500/3722] A few more xmldocs

---
 .../Multiplayer/Spectate/Sync/ISpectatorSyncManager.cs | 10 +++++-----
 .../Spectate/Sync/SpectatorCatchUpSlaveClock.cs        |  5 ++++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorSyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorSyncManager.cs
index 107f9637a3..5edbb3bc2c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorSyncManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorSyncManager.cs
@@ -6,7 +6,7 @@ using osu.Framework.Timing;
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
 {
     /// <summary>
-    /// Manages the synchronisation between one or more slave clocks in relation to a master clock.
+    /// Manages the synchronisation between one or more <see cref="ISpectatorSlaveClock"/>s in relation to a master clock.
     /// </summary>
     public interface ISpectatorSyncManager
     {
@@ -16,15 +16,15 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
         IAdjustableClock Master { get; }
 
         /// <summary>
-        /// Adds a slave clock.
+        /// Adds an <see cref="ISpectatorSlaveClock"/> to manage.
         /// </summary>
-        /// <param name="clock">The clock to add.</param>
+        /// <param name="clock">The <see cref="ISpectatorSlaveClock"/> to add.</param>
         void AddSlave(ISpectatorSlaveClock clock);
 
         /// <summary>
-        /// Removes a slave clock.
+        /// Removes an <see cref="ISpectatorSlaveClock"/>, stopping it from being managed by this <see cref="ISpectatorSyncManager"/>.
         /// </summary>
-        /// <param name="clock">The clock to remove.</param>
+        /// <param name="clock">The <see cref="ISpectatorSlaveClock"/> to remove.</param>
         void RemoveSlave(ISpectatorSlaveClock clock);
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/SpectatorCatchUpSlaveClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/SpectatorCatchUpSlaveClock.cs
index e4d25894c8..4b529021de 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/SpectatorCatchUpSlaveClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/SpectatorCatchUpSlaveClock.cs
@@ -7,10 +7,13 @@ using osu.Framework.Timing;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
 {
+    /// <summary>
+    /// A <see cref="ISpectatorSlaveClock"/> which catches up using rate adjustment.
+    /// </summary>
     public class SpectatorCatchUpSlaveClock : ISpectatorSlaveClock
     {
         /// <summary>
-        /// The catchup rate.
+        /// The catch up rate.
         /// </summary>
         public const double CATCHUP_RATE = 2;
 

From b391a8f94e23b66a82825fc180a8fd10db0ffba3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 15 Apr 2021 19:37:45 +0900
Subject: [PATCH 2501/3722] Properly bind WaitingOnFrames

---
 .../Spectate/MultiplayerSpectatorPlayer.cs            | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
index 1a7e0dd36a..19cc9f18ad 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.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.Timing;
 using osu.Game.Beatmaps;
@@ -12,14 +13,20 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     public class MultiplayerSpectatorPlayer : SpectatorPlayer
     {
-        private readonly SpectatorCatchUpSlaveClock gameplayClock;
+        private readonly ISpectatorSlaveClock gameplayClock;
 
-        public MultiplayerSpectatorPlayer(Score score, SpectatorCatchUpSlaveClock gameplayClock)
+        public MultiplayerSpectatorPlayer(Score score, ISpectatorSlaveClock gameplayClock)
             : base(score)
         {
             this.gameplayClock = gameplayClock;
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            gameplayClock.WaitingOnFrames.BindTo(DrawableRuleset.FrameStableClock.WaitingOnFrames);
+        }
+
         protected override GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart)
             => new SubGameplayClockContainer(gameplayClock);
     }

From 1a987dfbc0712b5ee54ba35de6a88a54fb0aa20e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 15 Apr 2021 21:16:38 +0900
Subject: [PATCH 2502/3722] Fix gameplay cursor showing offscreen

---
 osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs b/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
index ec7751d2b4..44ca5e850f 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
@@ -33,7 +33,6 @@ namespace osu.Game.Rulesets.Osu.UI
         {
             Add(cursorScaleContainer = new Container
             {
-                RelativePositionAxes = Axes.Both,
                 Child = clickToResumeCursor = new OsuClickToResumeCursor { ResumeRequested = Resume }
             });
         }

From 71b06d7e61024503a7e983860ecfd07412d8585f Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 15 Apr 2021 15:53:21 +0300
Subject: [PATCH 2503/3722] Simplify ExtendableCircle even more

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

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 1c0d6e5ab6..23069f6079 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -345,7 +345,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         /// </summary>
         public class ExtendableCircle : CompositeDrawable
         {
-            private readonly CircularContainer content;
+            private readonly Circle content;
 
             public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => content.ReceivePositionalInputAt(screenSpacePos);
 
@@ -354,19 +354,14 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             public ExtendableCircle()
             {
                 Padding = new MarginPadding { Horizontal = -circle_size / 2f };
-                InternalChild = content = new CircularContainer
+                InternalChild = content = new Circle
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Masking = true,
                     EdgeEffect = new EdgeEffectParameters
                     {
                         Type = EdgeEffectType.Shadow,
                         Radius = 5,
                         Colour = Color4.Black.Opacity(0.4f)
-                    },
-                    Child = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both
                     }
                 };
             }

From 6f3158e8c88b0d82541b9990965756ddc74cdaf6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 15 Apr 2021 23:24:13 +0900
Subject: [PATCH 2504/3722] Increase multiplier to 1.8

---
 osu.Game/Overlays/Volume/VolumeMeter.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Volume/VolumeMeter.cs b/osu.Game/Overlays/Volume/VolumeMeter.cs
index 57485946c1..202eac93ea 100644
--- a/osu.Game/Overlays/Volume/VolumeMeter.cs
+++ b/osu.Game/Overlays/Volume/VolumeMeter.cs
@@ -237,6 +237,7 @@ namespace osu.Game.Overlays.Volume
         private double accelerationModifier = 1;
 
         private const double max_acceleration = 5;
+        private const double acceleration_multiplier = 1.8;
 
         private ScheduledDelegate accelerationDebounce;
 
@@ -250,7 +251,7 @@ namespace osu.Game.Overlays.Volume
             accelerationDebounce = Scheduler.AddDelayed(resetAcceleration, 150);
 
             delta *= accelerationModifier;
-            accelerationModifier = Math.Min(max_acceleration, accelerationModifier * 1.2f);
+            accelerationModifier = Math.Min(max_acceleration, accelerationModifier * acceleration_multiplier);
 
             var precision = Bindable.Precision;
 

From 34859a476012ca6895a4e0216ff06f85f48a074f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 15 Apr 2021 23:37:05 +0900
Subject: [PATCH 2505/3722] Invalidate drawnode on change

---
 osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs b/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
index b55575696e..7f86e9daf7 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
@@ -32,7 +32,17 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
         private double timeOffset;
         private float time;
 
-        protected Anchor TrailOrigin = Anchor.Centre;
+        private Anchor trailOrigin = Anchor.Centre;
+
+        protected Anchor TrailOrigin
+        {
+            get => trailOrigin;
+            set
+            {
+                trailOrigin = value;
+                Invalidate(Invalidation.DrawNode);
+            }
+        }
 
         public CursorTrail()
         {

From 15d48a924b996871ac51e4b23f1a555f343e281e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Apr 2021 00:58:28 +0900
Subject: [PATCH 2506/3722] Set the timeline's height to a sane non-zero
 default

This isn't required but makes the initial appearance animation nicer.
---
 osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 55fb557474..7e11cfb271 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -65,6 +65,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             this.userContent = userContent;
 
             RelativeSizeAxes = Axes.X;
+            Height = timeline_height;
 
             ZoomDuration = 200;
             ZoomEasing = Easing.OutQuint;

From c2340f1fe886ef77f3afa5a72f0b18c675f5807c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Apr 2021 00:59:01 +0900
Subject: [PATCH 2507/3722] Move zoom settings back to run in a non-loaded
 state

---
 .../Compose/Components/Timeline/Timeline.cs   | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 7e11cfb271..621a24c67d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -128,7 +128,21 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             });
 
             waveformOpacity = config.GetBindable<float>(OsuSetting.EditorWaveformOpacity);
+
             Beatmap.BindTo(beatmap);
+            Beatmap.BindValueChanged(b =>
+            {
+                waveform.Waveform = b.NewValue.Waveform;
+                track = b.NewValue.Track;
+
+                // todo: i don't think this is safe, the track may not be loaded yet.
+                if (track.Length > 0)
+                {
+                    MaxZoom = getZoomLevelForVisibleMilliseconds(500);
+                    MinZoom = getZoomLevelForVisibleMilliseconds(10000);
+                    Zoom = getZoomLevelForVisibleMilliseconds(2000);
+                }
+            }, true);
         }
 
         protected override void LoadComplete()
@@ -158,20 +172,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                     mainContent.Delay(180).MoveToY(0, 200, Easing.OutQuint);
                 }
             }, true);
-
-            Beatmap.BindValueChanged(b =>
-            {
-                waveform.Waveform = b.NewValue.Waveform;
-                track = b.NewValue.Track;
-
-                // todo: i don't think this is safe, the track may not be loaded yet.
-                if (track.Length > 0)
-                {
-                    MaxZoom = getZoomLevelForVisibleMilliseconds(500);
-                    MinZoom = getZoomLevelForVisibleMilliseconds(10000);
-                    Zoom = getZoomLevelForVisibleMilliseconds(2000);
-                }
-            }, true);
         }
 
         private void updateWaveformOpacity() =>

From 25b8c2f257f8a52aba5761b819ea0ee7f62b86a4 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Wed, 14 Apr 2021 00:04:03 -0400
Subject: [PATCH 2508/3722] Allow skipping storyboard outro
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reuses SkipOverlay by calculating the endtime of the storyboard and using that as a "start point". Upon skipping the outro the score is instantly shown.
When the end of the storyboard is reached the score screen automatically shows up. If the player holds ESC (pause) during the outro, the score is displayed

The storyboard endtime is calculated by getting the latest endtime of the storyboard's elements, or simply returning 0 if there is no storyboard.

Co-Authored-By: Marlina José <marlina@umich.edu>
---
 .../Gameplay/TestSceneStoryboardWithOutro.cs  | 100 ++++++++++++++++++
 .../Multiplayer/MultiplayerPlayer.cs          |   1 +
 .../Screens/Play/GameplayClockContainer.cs    |  25 +++++
 osu.Game/Screens/Play/Player.cs               |  34 ++++++
 osu.Game/Screens/Play/PlayerConfiguration.cs  |   5 +
 osu.Game/Storyboards/Storyboard.cs            |   1 +
 6 files changed, 166 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
new file mode 100644
index 0000000000..1c8b33bb09
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.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.Threading.Tasks;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Screens;
+using osu.Game.Beatmaps;
+using osu.Game.Configuration;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Scoring;
+using osu.Game.Screens.Ranking;
+using osu.Game.Storyboards;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public class TestSceneStoryboardWithOutro : PlayerTestScene
+    {
+        protected new OutroPlayer Player => (OutroPlayer)base.Player;
+
+        private Storyboard storyboard;
+
+        private const double storyboard_duration = 2000;
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            config.SetValue(OsuSetting.ShowStoryboard, true);
+            storyboard = new Storyboard();
+            var sprite = new StoryboardSprite("unknown", Anchor.TopLeft, Vector2.Zero);
+            sprite.TimelineGroup.Alpha.Add(Easing.None, 0, storyboard_duration, 1, 0);
+            storyboard.GetLayer("Background").Add(sprite);
+        }
+
+        [Test]
+        public void TestStoryboardSkipOutro()
+        {
+            AddUntilStep("storyboard loaded", () => Player.Beatmap.Value.StoryboardLoaded);
+            AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
+            AddStep("skip outro", () => InputManager.Key(osuTK.Input.Key.Space));
+            AddAssert("score shown", () => Player.IsScoreShown);
+        }
+
+        [Test]
+        public void TestStoryboardNoSkipOutro()
+        {
+            AddUntilStep("storyboard loaded", () => Player.Beatmap.Value.StoryboardLoaded);
+            AddUntilStep("storyboard ends", () => Player.HUDOverlay.Progress.ReferenceClock.CurrentTime >= storyboard_duration);
+            AddWaitStep("wait for score", 10);
+            AddAssert("score shown", () => Player.IsScoreShown);
+        }
+
+        [Test]
+        public void TestStoryboardExitToSkipOutro()
+        {
+            AddUntilStep("storyboard loaded", () => Player.Beatmap.Value.StoryboardLoaded);
+            AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
+            AddStep("exit via pause", () => Player.ExitViaPause());
+            AddAssert("score shown", () => Player.IsScoreShown);
+        }
+
+        protected override bool AllowFail => false;
+
+        protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
+
+        protected override TestPlayer CreatePlayer(Ruleset ruleset) => new OutroPlayer();
+
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
+        {
+            var beatmap = new Beatmap();
+            beatmap.HitObjects.Add(new HitCircle());
+            return beatmap;
+        }
+
+        protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null) =>
+            new ClockBackedTestWorkingBeatmap(beatmap, storyboard ?? this.storyboard, Clock, Audio);
+
+        protected class OutroPlayer : TestPlayer
+        {
+            public void ExitViaPause() => PerformExit(true);
+
+            public bool IsScoreShown => !this.IsCurrentScreen() && this.GetChildScreen() is ResultsScreen;
+
+            public OutroPlayer()
+                : base(false)
+            {
+            }
+
+            protected override Task ImportScore(Score score)
+            {
+                // avoid database errors from trying to store the score
+                return Task.CompletedTask;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index aaacf891bb..b4e8c13e83 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -49,6 +49,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 AllowPause = false,
                 AllowRestart = false,
                 AllowSkippingIntro = false,
+                AllowSkippingOutro = false,
             })
         {
             this.userIds = userIds;
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index ddbb087962..fc45d661cf 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -228,6 +228,11 @@ namespace osu.Game.Screens.Play
             adjustableClock.ChangeSource(track);
         }
 
+        /// <summary>
+        /// Gets the endtime of the last element in the storyboard in ms, or start time of the last hitobject if there's no storyboard.
+        /// </summary>
+        public double StoryboardEndTime => beatmap.Storyboard.LatestEventTime ?? 0;
+
         protected override void Update()
         {
             if (!IsPaused.Value)
@@ -235,6 +240,8 @@ namespace osu.Game.Screens.Play
                 userOffsetClock.ProcessFrame();
             }
 
+            updateHasStoryboardEnded();
+
             base.Update();
         }
 
@@ -296,5 +303,23 @@ namespace osu.Game.Screens.Play
             {
             }
         }
+
+        # region Storyboard outro logic
+
+        public IBindable<bool> HasStoryboardEnded => hasStoryboardEnded;
+
+        public bool HasTimeLeftInStoryboard => GameplayClock.CurrentTime <= StoryboardEndTime;
+
+        private readonly BindableBool hasStoryboardEnded = new BindableBool(true);
+
+        private void updateHasStoryboardEnded()
+        {
+            if (StoryboardEndTime == 0)
+                return;
+
+            hasStoryboardEnded.Value = GameplayClock.CurrentTime >= StoryboardEndTime;
+        }
+
+        # endregion
     }
 }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index efe5d26409..13820738c7 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -74,6 +74,8 @@ namespace osu.Game.Screens.Play
 
         private Bindable<bool> mouseWheelDisabled;
 
+        private Bindable<bool> storyboardEnabled;
+
         private readonly Bindable<bool> storyboardReplacesBackground = new Bindable<bool>();
 
         protected readonly Bindable<bool> LocalUserPlaying = new Bindable<bool>();
@@ -106,6 +108,8 @@ namespace osu.Game.Screens.Play
 
         private SkipOverlay skipOverlay;
 
+        private SkipOverlay skipOutroOverlay;
+
         protected ScoreProcessor ScoreProcessor { get; private set; }
 
         protected HealthProcessor HealthProcessor { get; private set; }
@@ -190,6 +194,8 @@ namespace osu.Game.Screens.Play
 
             mouseWheelDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableWheel);
 
+            storyboardEnabled = config.GetBindable<bool>(OsuSetting.ShowStoryboard);
+
             if (game != null)
                 gameActive.BindTo(game.IsActive);
 
@@ -285,6 +291,9 @@ namespace osu.Game.Screens.Play
             ScoreProcessor.HasCompleted.ValueChanged += updateCompletionState;
             HealthProcessor.Failed += onFail;
 
+            // Keep track of whether the storyboard ended after the playable portion
+            GameplayClockContainer.HasStoryboardEnded.ValueChanged += updateCompletionState;
+
             foreach (var mod in Mods.Value.OfType<IApplicableToScoreProcessor>())
                 mod.ApplyToScoreProcessor(ScoreProcessor);
 
@@ -360,6 +369,10 @@ namespace osu.Game.Screens.Play
                     {
                         RequestSkip = performUserRequestedSkip
                     },
+                    skipOutroOverlay = new SkipOverlay(GameplayClockContainer.StoryboardEndTime)
+                    {
+                        RequestSkip = scheduleCompletion
+                    },
                     FailOverlay = new FailOverlay
                     {
                         OnRetry = Restart,
@@ -389,6 +402,9 @@ namespace osu.Game.Screens.Play
             if (!Configuration.AllowSkippingIntro)
                 skipOverlay.Expire();
 
+            if (!Configuration.AllowSkippingOutro)
+                skipOutroOverlay.Expire();
+
             if (Configuration.AllowRestart)
             {
                 container.Add(new HotkeyRetryOverlay
@@ -403,6 +419,8 @@ namespace osu.Game.Screens.Play
                 });
             }
 
+            skipOutroOverlay.Hide();
+
             return container;
         }
 
@@ -523,6 +541,14 @@ namespace osu.Game.Screens.Play
                     Pause();
                     return;
                 }
+
+                // show the score if in storyboard outro (score has been set)
+                bool scoreReady = prepareScoreForDisplayTask != null && prepareScoreForDisplayTask.IsCompleted;
+
+                if (scoreReady)
+                {
+                    scheduleCompletion();
+                }
             }
 
             this.Exit();
@@ -611,6 +637,14 @@ namespace osu.Game.Screens.Play
                 return score.ScoreInfo;
             });
 
+            // show skip overlay if storyboard is enabled and has an outro
+            if (storyboardEnabled.Value && GameplayClockContainer.HasTimeLeftInStoryboard)
+            {
+                skipOutroOverlay.Show();
+                completionProgressDelegate = null;
+                return;
+            }
+
             using (BeginDelayedSequence(RESULTS_DISPLAY_DELAY))
                 scheduleCompletion();
         }
diff --git a/osu.Game/Screens/Play/PlayerConfiguration.cs b/osu.Game/Screens/Play/PlayerConfiguration.cs
index cd30ead638..ad29563d54 100644
--- a/osu.Game/Screens/Play/PlayerConfiguration.cs
+++ b/osu.Game/Screens/Play/PlayerConfiguration.cs
@@ -24,5 +24,10 @@ namespace osu.Game.Screens.Play
         /// Whether the player should be allowed to skip the intro, advancing to the start of gameplay.
         /// </summary>
         public bool AllowSkippingIntro { get; set; } = true;
+
+        /// <summary>
+        /// Whether the player should be allowed to skip the outro, advancing to the end of a storyboard.
+        /// </summary>
+        public bool AllowSkippingOutro { get; set; } = true;
     }
 }
diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index 41058d9cb3..e22c586048 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -45,6 +45,7 @@ namespace osu.Game.Storyboards
         /// Videos and samples return StartTime as their EndTIme.
         /// </remarks>
         public double? LatestEventTime => Layers.SelectMany(l => l.Elements).OrderByDescending(e => e.EndTime).FirstOrDefault()?.EndTime;
+
         /// <summary>
         /// Depth of the currently front-most storyboard layer, excluding the overlay layer.
         /// </summary>

From 0e545e1ed9df1d33e0d6506a9edc3a053d6aeb7a Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Thu, 15 Apr 2021 17:17:02 -0400
Subject: [PATCH 2509/3722] Add IHasDuration interface with EndTime for
 storyboard elements to implement

---
 osu.Game/Storyboards/IHasDuration.cs       | 10 ++++++++++
 osu.Game/Storyboards/IStoryboardElement.cs |  2 --
 osu.Game/Storyboards/Storyboard.cs         |  6 +-----
 osu.Game/Storyboards/StoryboardSample.cs   |  2 --
 osu.Game/Storyboards/StoryboardSprite.cs   |  2 +-
 osu.Game/Storyboards/StoryboardVideo.cs    |  2 --
 6 files changed, 12 insertions(+), 12 deletions(-)
 create mode 100644 osu.Game/Storyboards/IHasDuration.cs

diff --git a/osu.Game/Storyboards/IHasDuration.cs b/osu.Game/Storyboards/IHasDuration.cs
new file mode 100644
index 0000000000..98f75b8ee2
--- /dev/null
+++ b/osu.Game/Storyboards/IHasDuration.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.Storyboards
+{
+    public interface IHasDuration
+    {
+        double EndTime { get; }
+    }
+}
diff --git a/osu.Game/Storyboards/IStoryboardElement.cs b/osu.Game/Storyboards/IStoryboardElement.cs
index 03f8b97212..c4c150a8a4 100644
--- a/osu.Game/Storyboards/IStoryboardElement.cs
+++ b/osu.Game/Storyboards/IStoryboardElement.cs
@@ -12,8 +12,6 @@ namespace osu.Game.Storyboards
 
         double StartTime { get; }
 
-        double EndTime { get; }
-
         Drawable CreateDrawable();
     }
 }
diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index e22c586048..669f6ccc43 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -40,11 +40,7 @@ namespace osu.Game.Storyboards
         /// Across all layers, find the latest point in time that a storyboard element ends at.
         /// Will return null if there are no elements.
         /// </summary>
-        /// <remarks>
-        /// This iterates all elements and as such should be used sparingly or stored locally.
-        /// Videos and samples return StartTime as their EndTIme.
-        /// </remarks>
-        public double? LatestEventTime => Layers.SelectMany(l => l.Elements).OrderByDescending(e => e.EndTime).FirstOrDefault()?.EndTime;
+        public double? LatestEventTime => Layers.SelectMany(l => l.Elements.OfType<IHasDuration>()).OrderByDescending(e => e.EndTime).FirstOrDefault()?.EndTime;
 
         /// <summary>
         /// Depth of the currently front-most storyboard layer, excluding the overlay layer.
diff --git a/osu.Game/Storyboards/StoryboardSample.cs b/osu.Game/Storyboards/StoryboardSample.cs
index d0949c93a7..5d6ce215f5 100644
--- a/osu.Game/Storyboards/StoryboardSample.cs
+++ b/osu.Game/Storyboards/StoryboardSample.cs
@@ -15,8 +15,6 @@ namespace osu.Game.Storyboards
 
         public double StartTime { get; }
 
-        public double EndTime => StartTime;
-
         public int Volume { get; }
 
         public IEnumerable<string> LookupNames => new[]
diff --git a/osu.Game/Storyboards/StoryboardSprite.cs b/osu.Game/Storyboards/StoryboardSprite.cs
index fdaa59d7d9..8f2c1e9e0c 100644
--- a/osu.Game/Storyboards/StoryboardSprite.cs
+++ b/osu.Game/Storyboards/StoryboardSprite.cs
@@ -11,7 +11,7 @@ using JetBrains.Annotations;
 
 namespace osu.Game.Storyboards
 {
-    public class StoryboardSprite : IStoryboardElement
+    public class StoryboardSprite : IStoryboardElement, IHasDuration
     {
         private readonly List<CommandLoop> loops = new List<CommandLoop>();
         private readonly List<CommandTrigger> triggers = new List<CommandTrigger>();
diff --git a/osu.Game/Storyboards/StoryboardVideo.cs b/osu.Game/Storyboards/StoryboardVideo.cs
index 1314bd7cb9..4652e45852 100644
--- a/osu.Game/Storyboards/StoryboardVideo.cs
+++ b/osu.Game/Storyboards/StoryboardVideo.cs
@@ -14,8 +14,6 @@ namespace osu.Game.Storyboards
 
         public double StartTime { get; }
 
-        public double EndTime => StartTime;
-
         public StoryboardVideo(string path, int offset)
         {
             Path = path;

From 5ac0eb02cd0bffd1c7876178c5b8ad50bad3b165 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 12:25:29 +0900
Subject: [PATCH 2510/3722] Always add player instances at first, populate
 later

---
 .../TestSceneMultiplayerSpectator.cs          | 46 ++++++++++++++-----
 .../Spectate/MultiplayerSpectator.cs          | 27 ++++-------
 .../Multiplayer/Spectate/PlayerInstance.cs    | 23 +++++-----
 3 files changed, 56 insertions(+), 40 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
index ab6324df2d..4026258830 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
     public class TestSceneMultiplayerSpectator : MultiplayerTestScene
     {
         [Cached(typeof(SpectatorStreamingClient))]
-        private TestSpectatorStreamingClient testSpectatorStreamingClient = new TestSpectatorStreamingClient();
+        private TestSpectatorStreamingClient streamingClient = new TestSpectatorStreamingClient();
 
         [Cached(typeof(UserLookupCache))]
         private UserLookupCache lookupCache = new TestUserLookupCache();
@@ -62,18 +62,42 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             AddStep("add streaming client", () =>
             {
-                Remove(testSpectatorStreamingClient);
-                Add(testSpectatorStreamingClient);
+                Remove(streamingClient);
+                Add(streamingClient);
             });
 
             AddStep("finish previous gameplay", () =>
             {
                 foreach (var id in playingUserIds)
-                    testSpectatorStreamingClient.EndPlay(id, importedBeatmapId);
+                    streamingClient.EndPlay(id, importedBeatmapId);
                 playingUserIds.Clear();
             });
         }
 
+        [Test]
+        public void TestDelayedStart()
+        {
+            AddStep("start players silently", () =>
+            {
+                Client.CurrentMatchPlayingUserIds.Add(55);
+                Client.CurrentMatchPlayingUserIds.Add(56);
+                playingUserIds.Add(55);
+                playingUserIds.Add(56);
+                nextFrame[55] = 0;
+                nextFrame[56] = 0;
+            });
+
+            loadSpectateScreen(false);
+
+            AddWaitStep("wait a bit", 10);
+            AddStep("load player 55", () => streamingClient.StartPlay(55, importedBeatmapId));
+            AddUntilStep("one player added", () => spectator.ChildrenOfType<Player>().Count() == 1);
+
+            AddWaitStep("wait a bit", 10);
+            AddStep("load player 56", () => streamingClient.StartPlay(56, importedBeatmapId));
+            AddUntilStep("two players added", () => spectator.ChildrenOfType<Player>().Count() == 2);
+        }
+
         [Test]
         public void TestGeneral()
         {
@@ -178,7 +202,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddWaitStep("wait a bit", 10);
         }
 
-        private void loadSpectateScreen()
+        private void loadSpectateScreen(bool waitForPlayerLoad = true)
         {
             AddStep("load screen", () =>
             {
@@ -188,7 +212,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 LoadScreen(spectator = new MultiplayerSpectator(playingUserIds.ToArray()));
             });
 
-            AddUntilStep("wait for screen load", () => spectator.LoadState == LoadState.Loaded && spectator.AllPlayersLoaded);
+            AddUntilStep("wait for screen load", () => spectator.LoadState == LoadState.Loaded && (!waitForPlayerLoad || spectator.AllPlayersLoaded));
         }
 
         private void start(int userId, int? beatmapId = null) => start(new[] { userId }, beatmapId);
@@ -200,7 +224,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 foreach (int id in userIds)
                 {
                     Client.CurrentMatchPlayingUserIds.Add(id);
-                    testSpectatorStreamingClient.StartPlay(id, beatmapId ?? importedBeatmapId);
+                    streamingClient.StartPlay(id, beatmapId ?? importedBeatmapId);
                     playingUserIds.Add(id);
                     nextFrame[id] = 0;
                 }
@@ -211,7 +235,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             AddStep("end play", () =>
             {
-                testSpectatorStreamingClient.EndPlay(userId, beatmapId ?? importedBeatmapId);
+                streamingClient.EndPlay(userId, beatmapId ?? importedBeatmapId);
                 playingUserIds.Remove(userId);
                 nextFrame.Remove(userId);
             });
@@ -225,7 +249,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             {
                 foreach (int id in userIds)
                 {
-                    testSpectatorStreamingClient.SendFrames(id, nextFrame[id], count);
+                    streamingClient.SendFrames(id, nextFrame[id], count);
                     nextFrame[id] += count;
                 }
             });
@@ -246,7 +270,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         private Player getPlayer(int userId) => getInstance(userId).ChildrenOfType<Player>().Single();
 
-        private PlayerInstance getInstance(int userId) => spectator.ChildrenOfType<PlayerInstance>().Single(p => p.User.Id == userId);
+        private PlayerInstance getInstance(int userId) => spectator.ChildrenOfType<PlayerInstance>().Single(p => p.UserId == userId);
 
         public class TestSpectatorStreamingClient : SpectatorStreamingClient
         {
@@ -297,7 +321,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             public override void WatchUser(int userId)
             {
-                if (userSentStateDictionary[userId])
+                if (userSentStateDictionary.TryGetValue(userId, out var sent) && sent)
                 {
                     // usually the server would do this.
                     sendState(userId, userBeatmapDictionary[userId]);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index 441839b401..08b9938e79 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         public MultiplayerSpectator(int[] userIds)
             : base(userIds.AsSpan().Slice(0, Math.Min(16, userIds.Length)).ToArray())
         {
-            instances = new PlayerInstance[userIds.Length];
+            instances = new PlayerInstance[UserIds.Length];
         }
 
         [BackgroundDependencyLoader]
@@ -70,6 +70,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 masterClockContainer
             };
 
+            for (int i = 0; i < UserIds.Length; i++)
+                grid.Add(instances[i] = new PlayerInstance(UserIds[i], new SpectatorCatchUpSlaveClock(masterClockContainer.GameplayClock)));
+
             // Todo: This is not quite correct - it should be per-user to adjust for other mod combinations.
             var playableBeatmap = Beatmap.Value.GetPlayableBeatmap(Ruleset.Value);
             var scoreProcessor = Ruleset.Value.CreateInstance().CreateScoreProcessor();
@@ -93,24 +96,14 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         protected override void StartGameplay(int userId, GameplayState gameplayState)
         {
             int userIndex = getIndexForUser(userId);
-            var existingInstance = instances[userIndex];
 
-            if (existingInstance != null)
-            {
-                grid.Remove(existingInstance);
-                syncManager.RemoveSlave(existingInstance.GameplayClock);
-                leaderboard.RemoveClock(existingInstance.User.Id);
-            }
+            var instance = instances[userIndex];
+            syncManager.RemoveSlave(instance.GameplayClock);
+            leaderboard.RemoveClock(instance.UserId);
 
-            LoadComponentAsync(instances[userIndex] = new PlayerInstance(gameplayState.Score, new SpectatorCatchUpSlaveClock(masterClockContainer.GameplayClock)), d =>
-            {
-                if (instances[userIndex] == d)
-                {
-                    grid.Add(d);
-                    syncManager.AddSlave(d.GameplayClock);
-                    leaderboard.AddClock(d.User.Id, d.GameplayClock);
-                }
-            });
+            instance.LoadPlayer(gameplayState.Score);
+            syncManager.AddSlave(instance.GameplayClock);
+            leaderboard.AddClock(instance.UserId, instance.GameplayClock);
         }
 
         protected override void EndGameplay(int userId)
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
index 401732f7fb..8c54fc9ec2 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
@@ -8,7 +8,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Scoring;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync;
 using osu.Game.Screens.Play;
-using osu.Game.Users;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
@@ -16,30 +15,30 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
     {
         public bool PlayerLoaded => stack?.CurrentScreen is Player;
 
-        public User User => Score.ScoreInfo.User;
-
-        public WorkingBeatmap Beatmap { get; private set; }
-
-        public readonly Score Score;
+        public readonly int UserId;
         public readonly SpectatorCatchUpSlaveClock GameplayClock;
 
+        public Score Score { get; private set; }
+
+        [Resolved]
+        private BeatmapManager beatmapManager { get; set; }
+
         private OsuScreenStack stack;
 
-        public PlayerInstance(Score score, SpectatorCatchUpSlaveClock gameplayClock)
+        public PlayerInstance(int userId, SpectatorCatchUpSlaveClock gameplayClock)
         {
-            Score = score;
+            UserId = userId;
             GameplayClock = gameplayClock;
 
             RelativeSizeAxes = Axes.Both;
             Masking = true;
         }
 
-        [BackgroundDependencyLoader]
-        private void load(BeatmapManager beatmapManager)
+        public void LoadPlayer(Score score)
         {
-            Beatmap = beatmapManager.GetWorkingBeatmap(Score.ScoreInfo.Beatmap, bypassCache: true);
+            Score = score;
 
-            InternalChild = new GameplayIsolationContainer(Beatmap, Score.ScoreInfo.Ruleset, Score.ScoreInfo.Mods)
+            InternalChild = new GameplayIsolationContainer(beatmapManager.GetWorkingBeatmap(Score.ScoreInfo.Beatmap, bypassCache: true), Score.ScoreInfo.Ruleset, Score.ScoreInfo.Mods)
             {
                 RelativeSizeAxes = Axes.Both,
                 Child = new DrawSizePreservingFillContainer

From 1c086d99deae8c03b1412b13ec6f5c00e0abfe94 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 13:28:32 +0900
Subject: [PATCH 2511/3722] Add loading spinner

---
 .../Spectate/MultiplayerSpectator.cs          |  8 ++-----
 .../Multiplayer/Spectate/PlayerInstance.cs    | 24 +++++++++++++------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index 08b9938e79..e1af95b870 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -95,13 +95,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         protected override void StartGameplay(int userId, GameplayState gameplayState)
         {
-            int userIndex = getIndexForUser(userId);
+            var instance = instances[getIndexForUser(userId)];
+            instance.LoadScore(gameplayState.Score);
 
-            var instance = instances[userIndex];
-            syncManager.RemoveSlave(instance.GameplayClock);
-            leaderboard.RemoveClock(instance.UserId);
-
-            instance.LoadPlayer(gameplayState.Score);
             syncManager.AddSlave(instance.GameplayClock);
             leaderboard.AddClock(instance.UserId, instance.GameplayClock);
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
index 8c54fc9ec2..31d2d458df 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
@@ -1,10 +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;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Scoring;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync;
 using osu.Game.Screens.Play;
@@ -23,6 +25,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
 
+        private readonly Container content;
+        private readonly LoadingLayer loadingLayer;
         private OsuScreenStack stack;
 
         public PlayerInstance(int userId, SpectatorCatchUpSlaveClock gameplayClock)
@@ -32,23 +36,29 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
             RelativeSizeAxes = Axes.Both;
             Masking = true;
+
+            InternalChildren = new Drawable[]
+            {
+                content = new DrawSizePreservingFillContainer { RelativeSizeAxes = Axes.Both },
+                loadingLayer = new LoadingLayer(true) { State = { Value = Visibility.Visible } }
+            };
         }
 
-        public void LoadPlayer(Score score)
+        public void LoadScore(Score score)
         {
+            if (Score != null)
+                throw new InvalidOperationException($"Cannot load a new score on a {nameof(PlayerInstance)} with an existing score.");
+
             Score = score;
 
-            InternalChild = new GameplayIsolationContainer(beatmapManager.GetWorkingBeatmap(Score.ScoreInfo.Beatmap, bypassCache: true), Score.ScoreInfo.Ruleset, Score.ScoreInfo.Mods)
+            content.Child = new GameplayIsolationContainer(beatmapManager.GetWorkingBeatmap(Score.ScoreInfo.Beatmap, bypassCache: true), Score.ScoreInfo.Ruleset, Score.ScoreInfo.Mods)
             {
                 RelativeSizeAxes = Axes.Both,
-                Child = new DrawSizePreservingFillContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Child = stack = new OsuScreenStack()
-                }
+                Child = stack = new OsuScreenStack()
             };
 
             stack.Push(new MultiplayerSpectatorPlayerLoader(Score, () => new MultiplayerSpectatorPlayer(Score, GameplayClock)));
+            loadingLayer.Hide();
         }
 
         // Player interferes with global input, so disable input for now.

From 42c066e6f2491f539534c02ef44e2760f9e19f19 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Apr 2021 13:38:55 +0900
Subject: [PATCH 2512/3722] Fix slider not displaying in timeline during
 zero-duration placement

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

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 23069f6079..bea1aa2e3a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -133,7 +133,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             var comboColours = skin.GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value ?? Array.Empty<Color4>();
             var comboColour = combo.GetComboColour(comboColours);
 
-            if (HitObject is IHasDuration)
+            if (HitObject is IHasDuration duration && duration.Duration > 0)
                 circle.Colour = ColourInfo.GradientHorizontal(comboColour, comboColour.Lighten(0.4f));
             else
                 circle.Colour = comboColour;

From b15838b22027746fd9174e5fb72e10ade6a68cd2 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Fri, 16 Apr 2021 00:59:10 -0400
Subject: [PATCH 2513/3722] Move storyboard outro logic to DrawableStoryboard

---
 .../Gameplay/TestSceneStoryboardWithOutro.cs  | 17 +++++++++++--
 .../Multiplayer/MultiplayerPlayer.cs          |  3 +--
 osu.Game/Screens/Play/DimmableStoryboard.cs   |  3 +++
 .../Screens/Play/GameplayClockContainer.cs    | 20 ---------------
 osu.Game/Screens/Play/Player.cs               | 25 ++++++++-----------
 osu.Game/Screens/Play/PlayerConfiguration.cs  |  9 ++-----
 .../Drawables/DrawableStoryboard.cs           | 23 +++++++++++++++++
 ...on.cs => IStoryboardElementHasDuration.cs} |  2 +-
 osu.Game/Storyboards/Storyboard.cs            |  2 +-
 osu.Game/Storyboards/StoryboardSprite.cs      |  2 +-
 10 files changed, 57 insertions(+), 49 deletions(-)
 rename osu.Game/Storyboards/{IHasDuration.cs => IStoryboardElementHasDuration.cs} (81%)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
index 1c8b33bb09..27d203d5d6 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
@@ -6,12 +6,14 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Screens;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Scoring;
+using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
 using osu.Game.Storyboards;
 using osuTK;
@@ -36,6 +38,16 @@ namespace osu.Game.Tests.Visual.Gameplay
             storyboard.GetLayer("Background").Add(sprite);
         }
 
+        [SetUpSteps]
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
+            AddStep("ignore user settings", () =>
+            {
+                Player.DimmableStoryboard.IgnoreUserSettings.Value = true;
+            });
+        }
+
         [Test]
         public void TestStoryboardSkipOutro()
         {
@@ -50,8 +62,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddUntilStep("storyboard loaded", () => Player.Beatmap.Value.StoryboardLoaded);
             AddUntilStep("storyboard ends", () => Player.HUDOverlay.Progress.ReferenceClock.CurrentTime >= storyboard_duration);
-            AddWaitStep("wait for score", 10);
-            AddAssert("score shown", () => Player.IsScoreShown);
+            AddUntilStep("wait for score shown", () => Player.IsScoreShown);
         }
 
         [Test]
@@ -85,6 +96,8 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public bool IsScoreShown => !this.IsCurrentScreen() && this.GetChildScreen() is ResultsScreen;
 
+            public new DimmableStoryboard DimmableStoryboard => base.DimmableStoryboard;
+
             public OutroPlayer()
                 : base(false)
             {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index b4e8c13e83..ae2042fbe8 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -48,8 +48,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             {
                 AllowPause = false,
                 AllowRestart = false,
-                AllowSkippingIntro = false,
-                AllowSkippingOutro = false,
+                AllowSkipping = false,
             })
         {
             this.userIds = userIds;
diff --git a/osu.Game/Screens/Play/DimmableStoryboard.cs b/osu.Game/Screens/Play/DimmableStoryboard.cs
index 58eb95b7c6..bebde1b15b 100644
--- a/osu.Game/Screens/Play/DimmableStoryboard.cs
+++ b/osu.Game/Screens/Play/DimmableStoryboard.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.Containers;
 using osu.Game.Graphics.Containers;
 using osu.Game.Storyboards;
@@ -61,5 +62,7 @@ namespace osu.Game.Screens.Play
             Add(storyboard);
             OverlayLayerContainer.Add(storyboard.OverlayLayer.CreateProxy());
         }
+
+        public IBindable<bool> HasStoryboardEnded => drawableStoryboard?.HasStoryboardEnded;
     }
 }
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index fc45d661cf..95419c0b35 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -240,8 +240,6 @@ namespace osu.Game.Screens.Play
                 userOffsetClock.ProcessFrame();
             }
 
-            updateHasStoryboardEnded();
-
             base.Update();
         }
 
@@ -303,23 +301,5 @@ namespace osu.Game.Screens.Play
             {
             }
         }
-
-        # region Storyboard outro logic
-
-        public IBindable<bool> HasStoryboardEnded => hasStoryboardEnded;
-
-        public bool HasTimeLeftInStoryboard => GameplayClock.CurrentTime <= StoryboardEndTime;
-
-        private readonly BindableBool hasStoryboardEnded = new BindableBool(true);
-
-        private void updateHasStoryboardEnded()
-        {
-            if (StoryboardEndTime == 0)
-                return;
-
-            hasStoryboardEnded.Value = GameplayClock.CurrentTime >= StoryboardEndTime;
-        }
-
-        # endregion
     }
 }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 14ba9e7e02..81d2621647 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -74,8 +74,6 @@ namespace osu.Game.Screens.Play
 
         private Bindable<bool> mouseWheelDisabled;
 
-        private Bindable<bool> storyboardEnabled;
-
         private readonly Bindable<bool> storyboardReplacesBackground = new Bindable<bool>();
 
         protected readonly Bindable<bool> LocalUserPlaying = new Bindable<bool>();
@@ -106,7 +104,7 @@ namespace osu.Game.Screens.Play
 
         private BreakTracker breakTracker;
 
-        private SkipOverlay skipOverlay;
+        private SkipOverlay skipIntroOverlay;
 
         private SkipOverlay skipOutroOverlay;
 
@@ -194,8 +192,6 @@ namespace osu.Game.Screens.Play
 
             mouseWheelDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableWheel);
 
-            storyboardEnabled = config.GetBindable<bool>(OsuSetting.ShowStoryboard);
-
             if (game != null)
                 gameActive.BindTo(game.IsActive);
 
@@ -250,7 +246,7 @@ namespace osu.Game.Screens.Play
                 HUDOverlay.ShowHud.Value = false;
                 HUDOverlay.ShowHud.Disabled = true;
                 BreakOverlay.Hide();
-                skipOverlay.Hide();
+                skipIntroOverlay.Hide();
             }
 
             DrawableRuleset.FrameStableClock.WaitingOnFrames.BindValueChanged(waiting =>
@@ -292,7 +288,8 @@ namespace osu.Game.Screens.Play
             HealthProcessor.Failed += onFail;
 
             // Keep track of whether the storyboard ended after the playable portion
-            GameplayClockContainer.HasStoryboardEnded.ValueChanged += updateCompletionState;
+            if (DimmableStoryboard.HasStoryboardEnded != null)
+                DimmableStoryboard.HasStoryboardEnded.ValueChanged += updateCompletionState;
 
             foreach (var mod in Mods.Value.OfType<IApplicableToScoreProcessor>())
                 mod.ApplyToScoreProcessor(ScoreProcessor);
@@ -365,7 +362,7 @@ namespace osu.Game.Screens.Play
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre
                     },
-                    skipOverlay = new SkipOverlay(DrawableRuleset.GameplayStartTime)
+                    skipIntroOverlay = new SkipOverlay(DrawableRuleset.GameplayStartTime)
                     {
                         RequestSkip = performUserRequestedSkip
                     },
@@ -399,11 +396,8 @@ namespace osu.Game.Screens.Play
                 }
             };
 
-            if (!Configuration.AllowSkippingIntro)
-                skipOverlay.Expire();
-
-            if (!Configuration.AllowSkippingOutro)
-                skipOutroOverlay.Expire();
+            if (!Configuration.AllowSkipping)
+                skipIntroOverlay.Expire();
 
             if (Configuration.AllowRestart)
             {
@@ -637,8 +631,9 @@ namespace osu.Game.Screens.Play
                 return score.ScoreInfo;
             });
 
-            // show skip overlay if storyboard is enabled and has an outro
-            if (storyboardEnabled.Value && GameplayClockContainer.HasTimeLeftInStoryboard)
+            var storyboardHasOutro = DimmableStoryboard.ContentDisplayed && (!DimmableStoryboard.HasStoryboardEnded?.Value ?? false);
+
+            if (storyboardHasOutro)
             {
                 skipOutroOverlay.Show();
                 completionProgressDelegate = null;
diff --git a/osu.Game/Screens/Play/PlayerConfiguration.cs b/osu.Game/Screens/Play/PlayerConfiguration.cs
index ad29563d54..18ee73374f 100644
--- a/osu.Game/Screens/Play/PlayerConfiguration.cs
+++ b/osu.Game/Screens/Play/PlayerConfiguration.cs
@@ -21,13 +21,8 @@ namespace osu.Game.Screens.Play
         public bool AllowRestart { get; set; } = true;
 
         /// <summary>
-        /// Whether the player should be allowed to skip the intro, advancing to the start of gameplay.
+        /// Whether the player should be allowed to skip intros/outros, advancing to the start of gameplay or the end of a storyboard.
         /// </summary>
-        public bool AllowSkippingIntro { get; set; } = true;
-
-        /// <summary>
-        /// Whether the player should be allowed to skip the outro, advancing to the end of a storyboard.
-        /// </summary>
-        public bool AllowSkippingOutro { get; set; } = true;
+        public bool AllowSkipping { get; set; } = true;
     }
 }
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
index af4615c895..08c2bf1b4a 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Threading;
 using osuTK;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Textures;
@@ -82,5 +83,27 @@ namespace osu.Game.Storyboards.Drawables
             foreach (var layer in Children)
                 layer.Enabled = passing ? layer.Layer.VisibleWhenPassing : layer.Layer.VisibleWhenFailing;
         }
+
+        protected override void Update()
+        {
+            base.Update();
+            updateHasStoryboardEnded();
+        }
+
+        /// <summary>
+        /// Whether the storyboard has ended after the gameplay portion of the beatmap.
+        /// </summary>
+        public IBindable<bool> HasStoryboardEnded => hasStoryboardEnded;
+
+        private readonly BindableBool hasStoryboardEnded = new BindableBool(true);
+
+        private void updateHasStoryboardEnded()
+        {
+            if (Storyboard.LatestEventTime == null)
+                return;
+
+            var time = Clock.CurrentTime;
+            hasStoryboardEnded.Value = time >= Storyboard.LatestEventTime;
+        }
     }
 }
diff --git a/osu.Game/Storyboards/IHasDuration.cs b/osu.Game/Storyboards/IStoryboardElementHasDuration.cs
similarity index 81%
rename from osu.Game/Storyboards/IHasDuration.cs
rename to osu.Game/Storyboards/IStoryboardElementHasDuration.cs
index 98f75b8ee2..e6ee373812 100644
--- a/osu.Game/Storyboards/IHasDuration.cs
+++ b/osu.Game/Storyboards/IStoryboardElementHasDuration.cs
@@ -3,7 +3,7 @@
 
 namespace osu.Game.Storyboards
 {
-    public interface IHasDuration
+    public interface IStoryboardElementHasDuration
     {
         double EndTime { get; }
     }
diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index 669f6ccc43..4fa64b7c34 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Storyboards
         /// Across all layers, find the latest point in time that a storyboard element ends at.
         /// Will return null if there are no elements.
         /// </summary>
-        public double? LatestEventTime => Layers.SelectMany(l => l.Elements.OfType<IHasDuration>()).OrderByDescending(e => e.EndTime).FirstOrDefault()?.EndTime;
+        public double? LatestEventTime => Layers.SelectMany(l => l.Elements.OfType<IStoryboardElementHasDuration>()).OrderByDescending(e => e.EndTime).FirstOrDefault()?.EndTime;
 
         /// <summary>
         /// Depth of the currently front-most storyboard layer, excluding the overlay layer.
diff --git a/osu.Game/Storyboards/StoryboardSprite.cs b/osu.Game/Storyboards/StoryboardSprite.cs
index 8f2c1e9e0c..51bdce3321 100644
--- a/osu.Game/Storyboards/StoryboardSprite.cs
+++ b/osu.Game/Storyboards/StoryboardSprite.cs
@@ -11,7 +11,7 @@ using JetBrains.Annotations;
 
 namespace osu.Game.Storyboards
 {
-    public class StoryboardSprite : IStoryboardElement, IHasDuration
+    public class StoryboardSprite : IStoryboardElement, IStoryboardElementHasDuration
     {
         private readonly List<CommandLoop> loops = new List<CommandLoop>();
         private readonly List<CommandTrigger> triggers = new List<CommandTrigger>();

From 33a665224e6c1f77846e9f03927fa72b4cd3859f Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Fri, 16 Apr 2021 01:03:15 -0400
Subject: [PATCH 2514/3722] Clean up skipOutroOverlay if skipping is disabled

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 81d2621647..7ad9c1a8af 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -397,7 +397,10 @@ namespace osu.Game.Screens.Play
             };
 
             if (!Configuration.AllowSkipping)
+            {
                 skipIntroOverlay.Expire();
+                skipOutroOverlay.Expire();
+            }
 
             if (Configuration.AllowRestart)
             {

From 5c0ef55691f4debd21c0b2c1c094ec9a73ad7642 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Apr 2021 14:09:35 +0900
Subject: [PATCH 2515/3722] Rename `SliderPlacementState` to make way for more
 generic version

---
 .../Sliders/SliderPlacementBlueprint.cs       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 16e2a52279..efa249694a 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
         private InputManager inputManager;
 
-        private PlacementState state;
+        private SliderPlacementState state;
         private PathControlPoint segmentStart;
         private PathControlPoint cursor;
         private int currentSegmentLength;
@@ -58,7 +58,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
                 controlPointVisualiser = new PathControlPointVisualiser(HitObject, false)
             };
 
-            setState(PlacementState.Initial);
+            setState(SliderPlacementState.Initial);
         }
 
         protected override void LoadComplete()
@@ -73,12 +73,12 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
             switch (state)
             {
-                case PlacementState.Initial:
+                case SliderPlacementState.Initial:
                     BeginPlacement();
                     HitObject.Position = ToLocalSpace(result.ScreenSpacePosition);
                     break;
 
-                case PlacementState.Body:
+                case SliderPlacementState.Body:
                     updateCursor();
                     break;
             }
@@ -91,11 +91,11 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
             switch (state)
             {
-                case PlacementState.Initial:
+                case SliderPlacementState.Initial:
                     beginCurve();
                     break;
 
-                case PlacementState.Body:
+                case SliderPlacementState.Body:
                     if (canPlaceNewControlPoint(out var lastPoint))
                     {
                         // Place a new point by detatching the current cursor.
@@ -121,7 +121,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
         protected override void OnMouseUp(MouseUpEvent e)
         {
-            if (state == PlacementState.Body && e.Button == MouseButton.Right)
+            if (state == SliderPlacementState.Body && e.Button == MouseButton.Right)
                 endCurve();
             base.OnMouseUp(e);
         }
@@ -129,7 +129,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         private void beginCurve()
         {
             BeginPlacement(commitStart: true);
-            setState(PlacementState.Body);
+            setState(SliderPlacementState.Body);
         }
 
         private void endCurve()
@@ -219,12 +219,12 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             tailCirclePiece.UpdateFrom(HitObject.TailCircle);
         }
 
-        private void setState(PlacementState newState)
+        private void setState(SliderPlacementState newState)
         {
             state = newState;
         }
 
-        private enum PlacementState
+        private enum SliderPlacementState
         {
             Initial,
             Body,

From 119c9b4294a2b5574b6f57bec7620562b4ae19ef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Apr 2021 14:10:21 +0900
Subject: [PATCH 2516/3722] Fix placement blueprints not being correctly
 removed after a rolled back placement

---
 .../Blueprints/HoldNotePlacementBlueprint.cs  |  2 +-
 .../Blueprints/ManiaPlacementBlueprint.cs     |  2 +-
 .../Blueprints/TaikoSpanPlacementBlueprint.cs |  2 +-
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs  | 29 +++++++++++++++----
 .../Components/ComposeBlueprintContainer.cs   | 27 ++++++++++++-----
 5 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
index 1f92929392..a13afdfffe 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         {
             base.UpdateTimeAndPosition(result);
 
-            if (PlacementActive)
+            if (PlacementActive == PlacementState.Active)
             {
                 if (result.Time is double endTime)
                 {
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
index 5e09054667..8f25668dd0 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         {
             base.UpdateTimeAndPosition(result);
 
-            if (!PlacementActive)
+            if (PlacementActive == PlacementState.Waiting)
                 Column = result.Playfield as Column;
         }
     }
diff --git a/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.cs b/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.cs
index e53b331f46..59249e6bf4 100644
--- a/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSpanPlacementBlueprint.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Rulesets.Taiko.Edit.Blueprints
         {
             base.UpdateTimeAndPosition(result);
 
-            if (PlacementActive)
+            if (PlacementActive == PlacementState.Active)
             {
                 if (result.Time is double dragTime)
                 {
diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index bfff93e7c5..6c1cd01796 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Edit
         /// <summary>
         /// Whether the <see cref="HitObject"/> is currently mid-placement, but has not necessarily finished being placed.
         /// </summary>
-        public bool PlacementActive { get; private set; }
+        public PlacementState PlacementActive { get; private set; }
 
         /// <summary>
         /// The <see cref="HitObject"/> that is being placed.
@@ -72,7 +72,8 @@ namespace osu.Game.Rulesets.Edit
         protected void BeginPlacement(bool commitStart = false)
         {
             placementHandler.BeginPlacement(HitObject);
-            PlacementActive |= commitStart;
+            if (commitStart)
+                PlacementActive = PlacementState.Active;
         }
 
         /// <summary>
@@ -82,10 +83,19 @@ namespace osu.Game.Rulesets.Edit
         /// <param name="commit">Whether the object should be committed.</param>
         public void EndPlacement(bool commit)
         {
-            if (!PlacementActive)
-                BeginPlacement();
+            switch (PlacementActive)
+            {
+                case PlacementState.Finished:
+                    return;
+
+                case PlacementState.Waiting:
+                    // ensure placement was started before ending to make state handling simpler.
+                    BeginPlacement();
+                    break;
+            }
+
             placementHandler.EndPlacement(HitObject, commit);
-            PlacementActive = false;
+            PlacementActive = PlacementState.Finished;
         }
 
         /// <summary>
@@ -94,7 +104,7 @@ namespace osu.Game.Rulesets.Edit
         /// <param name="result">The snap result information.</param>
         public virtual void UpdateTimeAndPosition(SnapResult result)
         {
-            if (!PlacementActive)
+            if (PlacementActive == PlacementState.Waiting)
                 HitObject.StartTime = result.Time ?? EditorClock?.CurrentTime ?? Time.Current;
         }
 
@@ -125,5 +135,12 @@ namespace osu.Game.Rulesets.Edit
                     return false;
             }
         }
+
+        public enum PlacementState
+        {
+            Waiting,
+            Active,
+            Finished
+        }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 5ab557804e..b0a6a091f0 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -196,7 +196,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         private void refreshTool()
         {
             removePlacement();
-            createPlacement();
+            ensurePlacementCreated();
         }
 
         private void updatePlacementPosition()
@@ -215,15 +215,26 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             base.Update();
 
-            if (Composer.CursorInPlacementArea)
-                createPlacement();
-            else if (currentPlacement?.PlacementActive == false)
-                removePlacement();
-
             if (currentPlacement != null)
             {
-                updatePlacementPosition();
+                switch (currentPlacement.PlacementActive)
+                {
+                    case PlacementBlueprint.PlacementState.Waiting:
+                        if (!Composer.CursorInPlacementArea)
+                            removePlacement();
+                        break;
+
+                    case PlacementBlueprint.PlacementState.Finished:
+                        removePlacement();
+                        break;
+                }
             }
+
+            if (Composer.CursorInPlacementArea)
+                ensurePlacementCreated();
+
+            if (currentPlacement != null)
+                updatePlacementPosition();
         }
 
         protected sealed override SelectionBlueprint CreateBlueprintFor(HitObject hitObject)
@@ -249,7 +260,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 NewCombo.Value = TernaryState.False;
         }
 
-        private void createPlacement()
+        private void ensurePlacementCreated()
         {
             if (currentPlacement != null) return;
 

From 5652490d61c4ee2c5b046e8baf7e5524303a1a31 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 14:11:55 +0900
Subject: [PATCH 2517/3722] Fix OnUserBeganPlaying not being invoked if already
 watching

---
 .../Visual/Gameplay/TestSceneSpectator.cs     | 24 ++++++++++++++++
 .../Spectator/SpectatorStreamingClient.cs     | 28 +++++++++++++++++--
 2 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 397b37718d..ea66144b21 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.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 System.Threading;
@@ -204,6 +205,29 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("screen didn't change", () => Stack.CurrentScreen is SoloSpectator);
         }
 
+        [Test]
+        public void OnUserBeganPlayingCallbackInvokedOnNewAdd()
+        {
+            bool callbackInvoked = false;
+            Action<int, SpectatorState> callbackAction = (_, __) => callbackInvoked = true;
+
+            AddStep("bind first event", () => testSpectatorStreamingClient.OnUserBeganPlaying += callbackAction);
+            start();
+            AddAssert("callback invoked", () => callbackInvoked);
+
+            AddStep("reset", () =>
+            {
+                testSpectatorStreamingClient.OnUserBeganPlaying -= callbackAction;
+                callbackInvoked = false;
+            });
+
+            AddStep("bind event again", () => testSpectatorStreamingClient.OnUserBeganPlaying += callbackAction);
+            AddAssert("callback invoked", () => callbackInvoked);
+
+            // Don't leave the event bound if test run succeeded.
+            AddStep("reset", () => testSpectatorStreamingClient.OnUserBeganPlaying -= callbackAction);
+        }
+
         private OsuFramedReplayInputHandler replayHandler =>
             (OsuFramedReplayInputHandler)Stack.ChildrenOfType<OsuInputManager>().First().ReplayInputHandler;
 
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 3a586874fe..7bea49e102 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -60,6 +60,7 @@ namespace osu.Game.Online.Spectator
         private IBindable<IReadOnlyList<Mod>> currentMods { get; set; }
 
         private readonly SpectatorState currentState = new SpectatorState();
+        private readonly Dictionary<int, SpectatorState> currentUserStates = new Dictionary<int, SpectatorState>();
 
         private bool isPlaying;
 
@@ -68,10 +69,25 @@ namespace osu.Game.Online.Spectator
         /// </summary>
         public event Action<int, FrameDataBundle> OnNewFrames;
 
+        private event Action<int, SpectatorState> onUserBeganPlaying;
+
         /// <summary>
-        /// Called whenever a user starts a play session.
+        /// Called whenever a user starts a play session, or immediately if the user is being watched and currently in a play session.
         /// </summary>
-        public event Action<int, SpectatorState> OnUserBeganPlaying;
+        public event Action<int, SpectatorState> OnUserBeganPlaying
+        {
+            add
+            {
+                onUserBeganPlaying += value;
+
+                lock (userLock)
+                {
+                    foreach (var (userId, state) in currentUserStates)
+                        value?.Invoke(userId, state);
+                }
+            }
+            remove => onUserBeganPlaying -= value;
+        }
 
         /// <summary>
         /// Called whenever a user finishes a play session.
@@ -134,7 +150,10 @@ namespace osu.Game.Online.Spectator
             if (!playingUsers.Contains(userId))
                 playingUsers.Add(userId);
 
-            OnUserBeganPlaying?.Invoke(userId, state);
+            lock (userLock)
+                currentUserStates[userId] = state;
+
+            onUserBeganPlaying?.Invoke(userId, state);
 
             return Task.CompletedTask;
         }
@@ -143,6 +162,9 @@ namespace osu.Game.Online.Spectator
         {
             playingUsers.Remove(userId);
 
+            lock (userLock)
+                currentUserStates.Remove(userId);
+
             OnUserFinishedPlaying?.Invoke(userId, state);
 
             return Task.CompletedTask;

From 936bde28a35ef8ea0ba9f4af801c09e8ea6b4bcc Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 16 Apr 2021 13:59:11 +0900
Subject: [PATCH 2518/3722] Remove manual handling of IsActive in
 RulesetInputManager

Now it is supported in framework
---
 osu.Game/Rulesets/UI/RulesetInputManager.cs | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 5ab09f9516..d6f002ea2c 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.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.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -11,7 +10,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
-using osu.Framework.Input.StateChanges;
 using osu.Framework.Input.StateChanges.Events;
 using osu.Framework.Input.States;
 using osu.Game.Configuration;
@@ -102,17 +100,6 @@ namespace osu.Game.Rulesets.UI
 
         #endregion
 
-        // to avoid allocation
-        private readonly List<IInput> emptyInputList = new List<IInput>();
-
-        protected override List<IInput> GetPendingInputs()
-        {
-            if (replayInputHandler?.IsActive == false)
-                return emptyInputList;
-
-            return base.GetPendingInputs();
-        }
-
         #region Setting application (disables etc.)
 
         private Bindable<bool> mouseDisabled;

From 84bc81a6deda614ce407730d62750c7a52195671 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 16 Apr 2021 12:31:32 +0900
Subject: [PATCH 2519/3722] Make FramedReplayInputHandler.CurrentTime non-null

---
 .../EmptyFreeformFramedReplayInputHandler.cs        |  5 +----
 .../Replays/PippidonFramedReplayInputHandler.cs     |  5 +----
 .../Replays/CatchFramedReplayInputHandler.cs        |  5 +----
 .../Replays/OsuFramedReplayInputHandler.cs          |  5 +----
 .../Rulesets/Replays/FramedReplayInputHandler.cs    | 13 +++++++------
 5 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformFramedReplayInputHandler.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformFramedReplayInputHandler.cs
index f25ea6ec62..b7e2031bb9 100644
--- a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformFramedReplayInputHandler.cs
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformFramedReplayInputHandler.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.Framework.Input.StateChanges;
 using osu.Framework.Utils;
@@ -30,9 +29,7 @@ namespace osu.Game.Rulesets.EmptyFreeform.Replays
                 if (frame == null)
                     return Vector2.Zero;
 
-                Debug.Assert(CurrentTime != null);
-
-                return Interpolation.ValueAt(CurrentTime.Value, frame.Position, NextFrame.Position, frame.Time, NextFrame.Time);
+                return Interpolation.ValueAt(CurrentTime, frame.Position, NextFrame.Position, frame.Time, NextFrame.Time);
             }
         }
 
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonFramedReplayInputHandler.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonFramedReplayInputHandler.cs
index 18efa6b885..69c7df5fac 100644
--- a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonFramedReplayInputHandler.cs
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonFramedReplayInputHandler.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 osu.Framework.Input.StateChanges;
 using osu.Framework.Utils;
 using osu.Game.Replays;
@@ -29,9 +28,7 @@ namespace osu.Game.Rulesets.Pippidon.Replays
                 if (frame == null)
                     return Vector2.Zero;
 
-                Debug.Assert(CurrentTime != null);
-
-                return NextFrame != null ? Interpolation.ValueAt(CurrentTime.Value, frame.Position, NextFrame.Position, frame.Time, NextFrame.Time) : frame.Position;
+                return NextFrame != null ? Interpolation.ValueAt(CurrentTime, frame.Position, NextFrame.Position, frame.Time, NextFrame.Time) : frame.Position;
             }
         }
 
diff --git a/osu.Game.Rulesets.Catch/Replays/CatchFramedReplayInputHandler.cs b/osu.Game.Rulesets.Catch/Replays/CatchFramedReplayInputHandler.cs
index 99d899db80..5fea855a16 100644
--- a/osu.Game.Rulesets.Catch/Replays/CatchFramedReplayInputHandler.cs
+++ b/osu.Game.Rulesets.Catch/Replays/CatchFramedReplayInputHandler.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.Framework.Input.StateChanges;
 using osu.Framework.Utils;
@@ -29,9 +28,7 @@ namespace osu.Game.Rulesets.Catch.Replays
                 if (frame == null)
                     return null;
 
-                Debug.Assert(CurrentTime != null);
-
-                return NextFrame != null ? Interpolation.ValueAt(CurrentTime.Value, frame.Position, NextFrame.Position, frame.Time, NextFrame.Time) : frame.Position;
+                return NextFrame != null ? Interpolation.ValueAt(CurrentTime, frame.Position, NextFrame.Position, frame.Time, NextFrame.Time) : frame.Position;
             }
         }
 
diff --git a/osu.Game.Rulesets.Osu/Replays/OsuFramedReplayInputHandler.cs b/osu.Game.Rulesets.Osu/Replays/OsuFramedReplayInputHandler.cs
index cf48dc053f..6ac0bbd045 100644
--- a/osu.Game.Rulesets.Osu/Replays/OsuFramedReplayInputHandler.cs
+++ b/osu.Game.Rulesets.Osu/Replays/OsuFramedReplayInputHandler.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.Framework.Input.StateChanges;
 using osu.Framework.Utils;
@@ -30,9 +29,7 @@ namespace osu.Game.Rulesets.Osu.Replays
                 if (frame == null)
                     return null;
 
-                Debug.Assert(CurrentTime != null);
-
-                return NextFrame != null ? Interpolation.ValueAt(CurrentTime.Value, frame.Position, NextFrame.Position, frame.Time, NextFrame.Time) : frame.Position;
+                return NextFrame != null ? Interpolation.ValueAt(CurrentTime, frame.Position, NextFrame.Position, frame.Time, NextFrame.Time) : frame.Position;
             }
         }
 
diff --git a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
index 279087ead9..0442acebe5 100644
--- a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
+++ b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.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 enable
+
 using System;
 using System.Collections.Generic;
 using JetBrains.Annotations;
@@ -32,7 +34,7 @@ namespace osu.Game.Rulesets.Replays
         /// </summary>
         /// <remarks>Returns null if the current time is strictly before the first frame.</remarks>
         /// <exception cref="InvalidOperationException">The replay is empty.</exception>
-        public TFrame CurrentFrame
+        public TFrame? CurrentFrame
         {
             get
             {
@@ -49,7 +51,7 @@ namespace osu.Game.Rulesets.Replays
         /// </summary>
         /// <remarks>Returns null if the current frame is the last frame.</remarks>
         /// <exception cref="InvalidOperationException">The replay is empty.</exception>
-        public TFrame NextFrame
+        public TFrame? NextFrame
         {
             get
             {
@@ -69,8 +71,7 @@ namespace osu.Game.Rulesets.Replays
         // This input handler should be enabled only if there is at least one replay frame.
         public override bool IsActive => HasFrames;
 
-        // Can make it non-null but that is a breaking change.
-        protected double? CurrentTime { get; private set; }
+        protected double CurrentTime { get; private set; }
 
         protected virtual double AllowedImportantTimeSpan => sixty_frame_time * 1.2;
 
@@ -101,7 +102,7 @@ namespace osu.Game.Rulesets.Replays
                     return false;
 
                 return IsImportant(CurrentFrame) && // a button is in a pressed state
-                       Math.Abs(CurrentTime - NextFrame.Time ?? 0) <= AllowedImportantTimeSpan; // the next frame is within an allowable time span
+                       Math.Abs(CurrentTime - NextFrame?.Time ?? 0) <= AllowedImportantTimeSpan; // the next frame is within an allowable time span
             }
         }
 
@@ -151,7 +152,7 @@ namespace osu.Game.Rulesets.Replays
             CurrentTime = Math.Clamp(time, frameStart, frameEnd);
 
             // In an important section, a mid-frame time cannot be used and a null is returned instead.
-            return inImportantSection && frameStart < time && time < frameEnd ? null : CurrentTime;
+            return inImportantSection && frameStart < time && time < frameEnd ? null : (double?)CurrentTime;
         }
 
         private double getFrameTime(int index)

From 91c7d8d26cf2143cb85c53cf9770676947ab57e4 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 16 Apr 2021 12:53:58 +0900
Subject: [PATCH 2520/3722] Introduce `StartFrame` and `EndFrame` to simplify
 the replay interpolation code

---
 .../EmptyFreeformFramedReplayInputHandler.cs  | 18 ++--------
 .../PippidonFramedReplayInputHandler.cs       | 18 ++--------
 .../Replays/CatchFramedReplayInputHandler.cs  | 17 ++--------
 .../Replays/OsuFramedReplayInputHandler.cs    | 18 ++--------
 .../Replays/FramedReplayInputHandler.cs       | 34 ++++++++++++-------
 5 files changed, 33 insertions(+), 72 deletions(-)

diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformFramedReplayInputHandler.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformFramedReplayInputHandler.cs
index b7e2031bb9..cc4483de31 100644
--- a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformFramedReplayInputHandler.cs
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformFramedReplayInputHandler.cs
@@ -7,7 +7,6 @@ using osu.Framework.Input.StateChanges;
 using osu.Framework.Utils;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Replays;
-using osuTK;
 
 namespace osu.Game.Rulesets.EmptyFreeform.Replays
 {
@@ -20,24 +19,13 @@ namespace osu.Game.Rulesets.EmptyFreeform.Replays
 
         protected override bool IsImportant(EmptyFreeformReplayFrame frame) => frame.Actions.Any();
 
-        protected Vector2 Position
-        {
-            get
-            {
-                var frame = CurrentFrame;
-
-                if (frame == null)
-                    return Vector2.Zero;
-
-                return Interpolation.ValueAt(CurrentTime, frame.Position, NextFrame.Position, frame.Time, NextFrame.Time);
-            }
-        }
-
         public override void CollectPendingInputs(List<IInput> inputs)
         {
+            var position = Interpolation.ValueAt(CurrentTime, StartFrame.Position, EndFrame.Position, StartFrame.Time, EndFrame.Time);
+
             inputs.Add(new MousePositionAbsoluteInput
             {
-                Position = GamefieldToScreenSpace(Position),
+                Position = GamefieldToScreenSpace(position),
             });
             inputs.Add(new ReplayState<EmptyFreeformAction>
             {
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonFramedReplayInputHandler.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonFramedReplayInputHandler.cs
index 69c7df5fac..e005346e1e 100644
--- a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonFramedReplayInputHandler.cs
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonFramedReplayInputHandler.cs
@@ -6,7 +6,6 @@ using osu.Framework.Input.StateChanges;
 using osu.Framework.Utils;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Replays;
-using osuTK;
 
 namespace osu.Game.Rulesets.Pippidon.Replays
 {
@@ -19,24 +18,13 @@ namespace osu.Game.Rulesets.Pippidon.Replays
 
         protected override bool IsImportant(PippidonReplayFrame frame) => true;
 
-        protected Vector2 Position
-        {
-            get
-            {
-                var frame = CurrentFrame;
-
-                if (frame == null)
-                    return Vector2.Zero;
-
-                return NextFrame != null ? Interpolation.ValueAt(CurrentTime, frame.Position, NextFrame.Position, frame.Time, NextFrame.Time) : frame.Position;
-            }
-        }
-
         public override void CollectPendingInputs(List<IInput> inputs)
         {
+            var position = Interpolation.ValueAt(CurrentTime, StartFrame.Position, EndFrame.Position, StartFrame.Time, EndFrame.Time);
+
             inputs.Add(new MousePositionAbsoluteInput
             {
-                Position = GamefieldToScreenSpace(Position)
+                Position = GamefieldToScreenSpace(position)
             });
         }
     }
diff --git a/osu.Game.Rulesets.Catch/Replays/CatchFramedReplayInputHandler.cs b/osu.Game.Rulesets.Catch/Replays/CatchFramedReplayInputHandler.cs
index 5fea855a16..137328b1c3 100644
--- a/osu.Game.Rulesets.Catch/Replays/CatchFramedReplayInputHandler.cs
+++ b/osu.Game.Rulesets.Catch/Replays/CatchFramedReplayInputHandler.cs
@@ -19,27 +19,14 @@ namespace osu.Game.Rulesets.Catch.Replays
 
         protected override bool IsImportant(CatchReplayFrame frame) => frame.Actions.Any();
 
-        protected float? Position
-        {
-            get
-            {
-                var frame = CurrentFrame;
-
-                if (frame == null)
-                    return null;
-
-                return NextFrame != null ? Interpolation.ValueAt(CurrentTime, frame.Position, NextFrame.Position, frame.Time, NextFrame.Time) : frame.Position;
-            }
-        }
-
         public override void CollectPendingInputs(List<IInput> inputs)
         {
-            if (!Position.HasValue) return;
+            var position = Interpolation.ValueAt(CurrentTime, StartFrame.Position, EndFrame.Position, StartFrame.Time, EndFrame.Time);
 
             inputs.Add(new CatchReplayState
             {
                 PressedActions = CurrentFrame?.Actions ?? new List<CatchAction>(),
-                CatcherX = Position.Value
+                CatcherX = position
             });
         }
 
diff --git a/osu.Game.Rulesets.Osu/Replays/OsuFramedReplayInputHandler.cs b/osu.Game.Rulesets.Osu/Replays/OsuFramedReplayInputHandler.cs
index 6ac0bbd045..7d696dfb79 100644
--- a/osu.Game.Rulesets.Osu/Replays/OsuFramedReplayInputHandler.cs
+++ b/osu.Game.Rulesets.Osu/Replays/OsuFramedReplayInputHandler.cs
@@ -7,7 +7,6 @@ using osu.Framework.Input.StateChanges;
 using osu.Framework.Utils;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Replays;
-using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Replays
 {
@@ -20,22 +19,11 @@ namespace osu.Game.Rulesets.Osu.Replays
 
         protected override bool IsImportant(OsuReplayFrame frame) => frame.Actions.Any();
 
-        protected Vector2? Position
-        {
-            get
-            {
-                var frame = CurrentFrame;
-
-                if (frame == null)
-                    return null;
-
-                return NextFrame != null ? Interpolation.ValueAt(CurrentTime, frame.Position, NextFrame.Position, frame.Time, NextFrame.Time) : frame.Position;
-            }
-        }
-
         public override void CollectPendingInputs(List<IInput> inputs)
         {
-            inputs.Add(new MousePositionAbsoluteInput { Position = GamefieldToScreenSpace(Position ?? Vector2.Zero) });
+            var position = Interpolation.ValueAt(CurrentTime, StartFrame.Position, EndFrame.Position, StartFrame.Time, EndFrame.Time);
+
+            inputs.Add(new MousePositionAbsoluteInput { Position = GamefieldToScreenSpace(position) });
             inputs.Add(new ReplayState<OsuAction> { PressedActions = CurrentFrame?.Actions ?? new List<OsuAction>() });
         }
     }
diff --git a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
index 0442acebe5..0f25a45177 100644
--- a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
+++ b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
@@ -33,32 +33,42 @@ namespace osu.Game.Rulesets.Replays
         /// The current time is always between the start and the end time of the current frame.
         /// </summary>
         /// <remarks>Returns null if the current time is strictly before the first frame.</remarks>
+        public TFrame? CurrentFrame => currentFrameIndex == -1 ? null : (TFrame)Frames[currentFrameIndex];
+
+        /// <summary>
+        /// The next frame of the replay.
+        /// The start time of <see cref="NextFrame"/> is always greater or equal to the start time of <see cref="CurrentFrame"/> regardless of the seeking direction.
+        /// </summary>
+        /// <remarks>Returns null if the current frame is the last frame.</remarks>
+        public TFrame? NextFrame => currentFrameIndex == Frames.Count - 1 ? null : (TFrame)Frames[currentFrameIndex + 1];
+
+        /// <summary>
+        /// The frame for the start value of the interpolation of the replay movement.
+        /// </summary>
         /// <exception cref="InvalidOperationException">The replay is empty.</exception>
-        public TFrame? CurrentFrame
+        public TFrame StartFrame
         {
             get
             {
                 if (!HasFrames)
-                    throw new InvalidOperationException($"Attempted to get {nameof(CurrentFrame)} of an empty replay");
+                    throw new InvalidOperationException($"Attempted to get {nameof(StartFrame)} of an empty replay");
 
-                return currentFrameIndex == -1 ? null : (TFrame)Frames[currentFrameIndex];
+                return (TFrame)Frames[Math.Max(0, currentFrameIndex)];
             }
         }
 
         /// <summary>
-        /// The next frame of the replay.
-        /// The start time is always greater or equal to the start time of <see cref="CurrentFrame"/> regardless of the seeking direction.
+        /// The frame for the end value of the interpolation of the replay movement.
         /// </summary>
-        /// <remarks>Returns null if the current frame is the last frame.</remarks>
         /// <exception cref="InvalidOperationException">The replay is empty.</exception>
-        public TFrame? NextFrame
+        public TFrame EndFrame
         {
             get
             {
                 if (!HasFrames)
-                    throw new InvalidOperationException($"Attempted to get {nameof(NextFrame)} of an empty replay");
+                    throw new InvalidOperationException($"Attempted to get {nameof(EndFrame)} of an empty replay");
 
-                return currentFrameIndex == Frames.Count - 1 ? null : (TFrame)Frames[currentFrameIndex + 1];
+                return (TFrame)Frames[Math.Min(currentFrameIndex + 1, Frames.Count - 1)];
             }
         }
 
@@ -98,11 +108,11 @@ namespace osu.Game.Rulesets.Replays
         {
             get
             {
-                if (!HasFrames || !FrameAccuratePlayback || CurrentFrame == null)
+                if (!HasFrames || !FrameAccuratePlayback || currentFrameIndex == -1)
                     return false;
 
-                return IsImportant(CurrentFrame) && // a button is in a pressed state
-                       Math.Abs(CurrentTime - NextFrame?.Time ?? 0) <= AllowedImportantTimeSpan; // the next frame is within an allowable time span
+                return IsImportant(StartFrame) && // a button is in a pressed state
+                       Math.Abs(CurrentTime - EndFrame.Time) <= AllowedImportantTimeSpan; // the next frame is within an allowable time span
             }
         }
 

From a965e8a75d1ae770d6e3d1a4548132e3b6abc2ce Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 16 Apr 2021 13:06:02 +0900
Subject: [PATCH 2521/3722] Remove AutoGenerator workaround of now-fixed issue

---
 .../Replays/CatchAutoGenerator.cs                |  4 ----
 .../TestSceneAutoGeneration.cs                   | 16 ++++++++--------
 .../Replays/ManiaAutoGenerator.cs                |  4 ----
 .../Replays/OsuAutoGenerator.cs                  |  2 --
 .../Replays/TaikoAutoGenerator.cs                |  1 -
 5 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs b/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
index 64ded8e94f..10230b6b78 100644
--- a/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
+++ b/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
@@ -125,10 +125,6 @@ namespace osu.Game.Rulesets.Catch.Replays
 
         private void addFrame(double time, float? position = null, bool dashing = false)
         {
-            // todo: can be removed once FramedReplayInputHandler correctly handles rewinding before first frame.
-            if (Replay.Frames.Count == 0)
-                Replay.Frames.Add(new CatchReplayFrame(time - 1, position, false, null));
-
             var last = currentFrame;
             currentFrame = new CatchReplayFrame(time, position, dashing, last);
             Replay.Frames.Add(currentFrame);
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs
index 399a46aa77..cffec3dfd5 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Mania.Tests
         /// <summary>
         /// The number of frames which are generated at the start of a replay regardless of hitobject content.
         /// </summary>
-        private const int frame_offset = 1;
+        private const int frame_offset = 0;
 
         [Test]
         public void TestSingleNote()
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
-            Assert.IsTrue(generated.Frames.Count == frame_offset + 2, "Replay must have 3 frames");
+            Assert.AreEqual(generated.Frames.Count, frame_offset + 2, "Incorrect number of frames");
             Assert.AreEqual(1000, generated.Frames[frame_offset].Time, "Incorrect hit time");
             Assert.AreEqual(1000 + ManiaAutoGenerator.RELEASE_DELAY, generated.Frames[frame_offset + 1].Time, "Incorrect release time");
             Assert.IsTrue(checkContains(generated.Frames[frame_offset], ManiaAction.Special1), "Special1 has not been pressed");
@@ -54,7 +54,7 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
-            Assert.IsTrue(generated.Frames.Count == frame_offset + 2, "Replay must have 3 frames");
+            Assert.AreEqual(generated.Frames.Count, frame_offset + 2, "Incorrect number of frames");
             Assert.AreEqual(1000, generated.Frames[frame_offset].Time, "Incorrect hit time");
             Assert.AreEqual(3000, generated.Frames[frame_offset + 1].Time, "Incorrect release time");
             Assert.IsTrue(checkContains(generated.Frames[frame_offset], ManiaAction.Special1), "Special1 has not been pressed");
@@ -74,7 +74,7 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
-            Assert.IsTrue(generated.Frames.Count == frame_offset + 2, "Replay must have 3 frames");
+            Assert.AreEqual(generated.Frames.Count, frame_offset + 2, "Incorrect number of frames");
             Assert.AreEqual(1000, generated.Frames[frame_offset].Time, "Incorrect hit time");
             Assert.AreEqual(1000 + ManiaAutoGenerator.RELEASE_DELAY, generated.Frames[frame_offset + 1].Time, "Incorrect release time");
             Assert.IsTrue(checkContains(generated.Frames[frame_offset], ManiaAction.Key1, ManiaAction.Key2), "Key1 & Key2 have not been pressed");
@@ -96,7 +96,7 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
-            Assert.IsTrue(generated.Frames.Count == frame_offset + 2, "Replay must have 3 frames");
+            Assert.AreEqual(generated.Frames.Count, frame_offset + 2, "Incorrect number of frames");
 
             Assert.AreEqual(1000, generated.Frames[frame_offset].Time, "Incorrect hit time");
             Assert.AreEqual(3000, generated.Frames[frame_offset + 1].Time, "Incorrect release time");
@@ -119,7 +119,7 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
-            Assert.IsTrue(generated.Frames.Count == frame_offset + 4, "Replay must have 4 generated frames");
+            Assert.AreEqual(generated.Frames.Count, frame_offset + 4, "Incorrect number of frames");
             Assert.AreEqual(1000, generated.Frames[frame_offset].Time, "Incorrect first note hit time");
             Assert.AreEqual(1000 + ManiaAutoGenerator.RELEASE_DELAY, generated.Frames[frame_offset + 1].Time, "Incorrect first note release time");
             Assert.AreEqual(2000, generated.Frames[frame_offset + 2].Time, "Incorrect second note hit time");
@@ -146,7 +146,7 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
-            Assert.IsTrue(generated.Frames.Count == frame_offset + 4, "Replay must have 4 generated frames");
+            Assert.AreEqual(generated.Frames.Count, frame_offset + 4, "Incorrect number of frames");
             Assert.AreEqual(1000, generated.Frames[frame_offset].Time, "Incorrect first note hit time");
             Assert.AreEqual(3000, generated.Frames[frame_offset + 2].Time, "Incorrect first note release time");
             Assert.AreEqual(2000, generated.Frames[frame_offset + 1].Time, "Incorrect second note hit time");
@@ -173,7 +173,7 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
-            Assert.IsTrue(generated.Frames.Count == frame_offset + 3, "Replay must have 3 generated frames");
+            Assert.AreEqual(generated.Frames.Count, frame_offset + 3, "Incorrect number of frames");
             Assert.AreEqual(1000, generated.Frames[frame_offset].Time, "Incorrect first note hit time");
             Assert.AreEqual(3000, generated.Frames[frame_offset + 1].Time, "Incorrect second note press time + first note release time");
             Assert.AreEqual(3000 + ManiaAutoGenerator.RELEASE_DELAY, generated.Frames[frame_offset + 2].Time, "Incorrect second note release time");
diff --git a/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs b/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
index 7c51d58b74..ada84dfac2 100644
--- a/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
@@ -70,10 +70,6 @@ namespace osu.Game.Rulesets.Mania.Replays
                     }
                 }
 
-                // todo: can be removed once FramedReplayInputHandler correctly handles rewinding before first frame.
-                if (Replay.Frames.Count == 0)
-                    Replay.Frames.Add(new ManiaReplayFrame(group.First().Time - 1));
-
                 Replay.Frames.Add(new ManiaReplayFrame(group.First().Time, actions.ToArray()));
             }
 
diff --git a/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs b/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
index 693943a08a..7b0cf651c8 100644
--- a/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
+++ b/osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
@@ -71,8 +71,6 @@ namespace osu.Game.Rulesets.Osu.Replays
 
             buttonIndex = 0;
 
-            AddFrameToReplay(new OsuReplayFrame(-100000, new Vector2(256, 500)));
-            AddFrameToReplay(new OsuReplayFrame(Beatmap.HitObjects[0].StartTime - 1500, new Vector2(256, 500)));
             AddFrameToReplay(new OsuReplayFrame(Beatmap.HitObjects[0].StartTime - 1500, new Vector2(256, 500)));
 
             for (int i = 0; i < Beatmap.HitObjects.Count; i++)
diff --git a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
index a3dbe672a4..fa0134aa94 100644
--- a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
+++ b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
@@ -35,7 +35,6 @@ namespace osu.Game.Rulesets.Taiko.Replays
 
             bool hitButton = true;
 
-            Frames.Add(new TaikoReplayFrame(-100000));
             Frames.Add(new TaikoReplayFrame(Beatmap.HitObjects[0].StartTime - 1000));
 
             for (int i = 0; i < Beatmap.HitObjects.Count; i++)

From 965a1ead36c845a332ed03113717e3a116e0d0a3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Apr 2021 14:38:30 +0900
Subject: [PATCH 2522/3722] Disallow zero-length slider blueprint placements

---
 .../Editor/TestSceneSliderPlacementBlueprint.cs               | 4 +---
 .../Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs       | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
index d2c37061f0..8235e1bc79 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderPlacementBlueprint.cs
@@ -41,9 +41,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             addClickStep(MouseButton.Left);
             addClickStep(MouseButton.Right);
 
-            assertPlaced(true);
-            assertLength(0);
-            assertControlPointType(0, PathType.Linear);
+            assertPlaced(false);
         }
 
         [Test]
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index efa249694a..07166a4b74 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -135,7 +135,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         private void endCurve()
         {
             updateSlider();
-            EndPlacement(true);
+            EndPlacement(HitObject.Path.ExpectedDistance?.Value > 0);
         }
 
         protected override void Update()

From d1c72f5e133cad392580c9dcd80f8fe2c9987816 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 15:10:53 +0900
Subject: [PATCH 2523/3722] Apply changes resulting from IBindable interface
 updates

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

diff --git a/osu.Game/Rulesets/Mods/Mod.cs b/osu.Game/Rulesets/Mods/Mod.cs
index 4879590e24..eab886c86e 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using System.Reflection;
 using Newtonsoft.Json;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Testing;
 using osu.Game.Configuration;
@@ -170,7 +171,12 @@ namespace osu.Game.Rulesets.Mods
                 target.UnbindFrom(sourceBindable);
             }
             else
-                target.Parse(source);
+            {
+                if (!(target is IParseable parseable))
+                    throw new InvalidOperationException($"Bindable type {target.GetType().ReadableName()} is not IParseable.");
+
+                parseable.Parse(source);
+            }
         }
 
         public bool Equals(IMod other) => other is Mod them && Equals(them);

From 8c4804dd7a63e69540dcb22c1e800d9dc9917d39 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 15:40:06 +0900
Subject: [PATCH 2524/3722] Use nameof

---
 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 eab886c86e..7f48888abe 100644
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@@ -173,7 +173,7 @@ namespace osu.Game.Rulesets.Mods
             else
             {
                 if (!(target is IParseable parseable))
-                    throw new InvalidOperationException($"Bindable type {target.GetType().ReadableName()} is not IParseable.");
+                    throw new InvalidOperationException($"Bindable type {target.GetType().ReadableName()} is not {nameof(IParseable)}.");
 
                 parseable.Parse(source);
             }

From d38e294d96e8a887ab188578925195f159c52ed6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Apr 2021 15:22:32 +0900
Subject: [PATCH 2525/3722] Centralise length validation function

---
 .../Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs         | 2 +-
 osu.Game/Rulesets/Objects/SliderPath.cs                         | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 07166a4b74..77ea3b05dc 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -135,7 +135,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         private void endCurve()
         {
             updateSlider();
-            EndPlacement(HitObject.Path.ExpectedDistance?.Value > 0);
+            EndPlacement(HitObject.Path.HasValidLength);
         }
 
         protected override void Update()
diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index e64298f98d..55ef0bc5f6 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Rulesets.Objects
         /// </summary>
         public readonly Bindable<double?> ExpectedDistance = new Bindable<double?>();
 
+        public bool HasValidLength => Distance > 0;
+
         /// <summary>
         /// The control points of the path.
         /// </summary>

From 2949a6bbdc1574473aee2d86eabd3534e46c32e5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Apr 2021 15:22:58 +0900
Subject: [PATCH 2526/3722] Handle control point drag revert

---
 .../Sliders/Components/PathControlPointPiece.cs    | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
index ce9580d0f4..48e4db11ca 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
@@ -185,6 +185,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 
         protected override void OnDrag(DragEvent e)
         {
+            Vector2[] oldControlPoints = slider.Path.ControlPoints.Select(cp => cp.Position.Value).ToArray();
+            var oldPosition = slider.Position;
+            var oldStartTime = slider.StartTime;
+
             if (ControlPoint == slider.Path.ControlPoints[0])
             {
                 // Special handling for the head control point - the position of the slider changes which means the snapped position and time have to be taken into account
@@ -202,6 +206,16 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             else
                 ControlPoint.Position.Value = dragStartPosition + (e.MousePosition - e.MouseDownPosition);
 
+            if (!slider.Path.HasValidLength)
+            {
+                for (var i = 0; i < slider.Path.ControlPoints.Count; i++)
+                    slider.Path.ControlPoints[i].Position.Value = oldControlPoints[i];
+
+                slider.Position = oldPosition;
+                slider.StartTime = oldStartTime;
+                return;
+            }
+
             // Maintain the path type in case it got defaulted to bezier at some point during the drag.
             PointsInSegment[0].Type.Value = dragPathType;
         }

From 89373638be7c1b17e119e0a5a43d8c83a3798e65 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Apr 2021 15:23:16 +0900
Subject: [PATCH 2527/3722] Handle control point deletion when the resulting
 slider would be too short to be useful

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

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index ba9bb3c485..88fcb1e715 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -215,7 +215,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             }
 
             // If there are 0 or 1 remaining control points, the slider is in a degenerate (single point) form and should be deleted
-            if (controlPoints.Count <= 1)
+            if (controlPoints.Count <= 1 || !slider.HitObject.Path.HasValidLength)
             {
                 placementHandler?.Delete(HitObject);
                 return;

From ff408b852e6f616c8ee1a1ead405f1b76489e713 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Apr 2021 15:23:27 +0900
Subject: [PATCH 2528/3722] Handle scaling a slider below minimum length

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

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 5a84bd6163..941cde5540 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -226,7 +226,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             Quad scaledQuad = getSurroundingQuad(new OsuHitObject[] { slider });
             (bool xInBounds, bool yInBounds) = isQuadInBounds(scaledQuad);
 
-            if (xInBounds && yInBounds)
+            if (xInBounds && yInBounds && slider.Path.HasValidLength)
                 return;
 
             foreach (var point in slider.Path.ControlPoints)

From c59906e9253fefed8c72c17b8434c3089c3cb44f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Apr 2021 15:55:33 +0900
Subject: [PATCH 2529/3722] Fix an occasional crash when deleting a HitObject
 via internal means

---
 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 b5a28dc022..b1afbe0d61 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -438,8 +438,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private void onBlueprintDeselected(SelectionBlueprint blueprint)
         {
-            SelectionHandler.HandleDeselected(blueprint);
             SelectionBlueprints.ChangeChildDepth(blueprint, 0);
+            SelectionHandler.HandleDeselected(blueprint);
 
             Composer.Playfield.SetKeepAlive(blueprint.HitObject, false);
         }

From 25f0f17766bffceb205a6f162aa621d7e35970ed Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 16:16:28 +0900
Subject: [PATCH 2530/3722] Attempt to fix match subscreen test failure

---
 .../Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
index caa731f985..7c6c158b5a 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
@@ -13,6 +13,7 @@ using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Screens.OnlinePlay.Multiplayer;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
 using osu.Game.Tests.Beatmaps;
@@ -128,6 +129,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 InputManager.Click(MouseButton.Left);
             });
 
+            AddUntilStep("wait for ready button to be enabled", () => this.ChildrenOfType<MultiplayerReadyButton>().Single().ChildrenOfType<ReadyButton>().Single().Enabled.Value);
+
             AddStep("click ready button", () =>
             {
                 InputManager.MoveMouseTo(this.ChildrenOfType<MultiplayerReadyButton>().Single());

From ab1a1a1df4da3504a215b4acd22e39e88dca3b60 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Apr 2021 16:55:17 +0900
Subject: [PATCH 2531/3722] Add failing test case due to div by zero

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

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSliderScaling.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSliderScaling.cs
new file mode 100644
index 0000000000..e29a67c770
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSliderScaling.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 System.Linq;
+using NUnit.Framework;
+using osu.Framework.Testing;
+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.Screens.Edit.Compose.Components;
+using osu.Game.Tests.Beatmaps;
+using osuTK;
+using osuTK.Input;
+
+namespace osu.Game.Rulesets.Osu.Tests.Editor
+{
+    [TestFixture]
+    public class TestSliderScaling : TestSceneOsuEditor
+    {
+        private OsuPlayfield playfield;
+
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TestBeatmap(Ruleset.Value, false);
+
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
+            AddStep("get playfield", () => playfield = Editor.ChildrenOfType<OsuPlayfield>().First());
+            AddStep("seek to first timing point", () => EditorClock.Seek(Beatmap.Value.Beatmap.ControlPointInfo.TimingPoints.First().Time));
+        }
+
+        [Test]
+        public void TestScalingLinearSlider()
+        {
+            Slider slider = null;
+
+            AddStep("Add slider", () =>
+            {
+                slider = new Slider { StartTime = EditorClock.CurrentTime, Position = new Vector2(300) };
+
+                PathControlPoint[] points =
+                {
+                    new PathControlPoint(new Vector2(0), PathType.Linear),
+                    new PathControlPoint(new Vector2(100, 0)),
+                };
+
+                slider.Path = new SliderPath(points);
+                EditorBeatmap.Add(slider);
+            });
+
+            AddAssert("ensure object placed", () => EditorBeatmap.HitObjects.Count == 1);
+
+            moveMouse(new Vector2(300));
+            AddStep("select slider", () => InputManager.Click(MouseButton.Left));
+
+            double distanceBefore = 0;
+
+            AddStep("store distance", () => distanceBefore = slider.Path.Distance);
+
+            AddStep("move mouse to handle", () => InputManager.MoveMouseTo(Editor.ChildrenOfType<SelectionBoxDragHandle>().Skip(1).First()));
+            AddStep("begin drag", () => InputManager.PressButton(MouseButton.Left));
+            moveMouse(new Vector2(300, 300));
+            AddStep("end drag", () => InputManager.ReleaseButton(MouseButton.Left));
+
+            AddAssert("slider length shrunk", () => slider.Path.Distance < distanceBefore);
+        }
+
+        private void moveMouse(Vector2 pos) =>
+            AddStep($"move mouse to {pos}", () => InputManager.MoveMouseTo(playfield.ToScreenSpace(pos)));
+    }
+}

From 8de68e0ebf11ba4c39438e4c7ff051ff53bfbb53 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Apr 2021 16:55:24 +0900
Subject: [PATCH 2532/3722] Fix div-by-zero when scaling a 1-dimensional slider

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

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 5a84bd6163..047634a3ab 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -205,10 +205,12 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             Quad sliderQuad = getSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position.Value));
 
-            // 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.
+            // 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;
 
-            Vector2 pathRelativeDeltaScale = new Vector2(1 + scale.X / sliderQuad.Width, 1 + scale.Y / sliderQuad.Height);
+            Vector2 pathRelativeDeltaScale = new Vector2(
+                sliderQuad.Width == 0 ? 0 : 1 + scale.X / sliderQuad.Width,
+                sliderQuad.Height == 0 ? 0 : 1 + scale.Y / sliderQuad.Height);
 
             Queue<Vector2> oldControlPoints = new Queue<Vector2>();
 

From 30e00cc4aa8228e458979b135c8c2aa8213143b2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Apr 2021 16:38:20 +0900
Subject: [PATCH 2533/3722] Add test coverage of selection / scaling scenarios

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

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderLengthValidity.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderLengthValidity.cs
new file mode 100644
index 0000000000..74560ad15d
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderLengthValidity.cs
@@ -0,0 +1,198 @@
+// Copyright (c) ppy 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.Testing;
+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.Screens.Edit.Compose.Components;
+using osu.Game.Tests.Beatmaps;
+using osuTK;
+using osuTK.Input;
+
+namespace osu.Game.Rulesets.Osu.Tests.Editor
+{
+    [TestFixture]
+    public class TestSceneSliderLengthValidity : TestSceneOsuEditor
+    {
+        private OsuPlayfield playfield;
+
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TestBeatmap(Ruleset.Value, false);
+
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
+            AddStep("get playfield", () => playfield = Editor.ChildrenOfType<OsuPlayfield>().First());
+            AddStep("seek to first timing point", () => EditorClock.Seek(Beatmap.Value.Beatmap.ControlPointInfo.TimingPoints.First().Time));
+        }
+
+        [Test]
+        public void TestDraggingStartingPointRemainsValid()
+        {
+            Slider slider = null;
+
+            AddStep("Add slider", () =>
+            {
+                slider = new Slider { StartTime = EditorClock.CurrentTime, Position = new Vector2(300) };
+
+                PathControlPoint[] points =
+                {
+                    new PathControlPoint(new Vector2(0), PathType.Linear),
+                    new PathControlPoint(new Vector2(100, 0)),
+                };
+
+                slider.Path = new SliderPath(points);
+                EditorBeatmap.Add(slider);
+            });
+
+            AddAssert("ensure object placed", () => EditorBeatmap.HitObjects.Count == 1);
+
+            moveMouse(new Vector2(300));
+            AddStep("select slider", () => InputManager.Click(MouseButton.Left));
+
+            double distanceBefore = 0;
+
+            AddStep("store distance", () => distanceBefore = slider.Path.Distance);
+
+            moveMouse(new Vector2(300, 300));
+
+            AddStep("begin drag", () => InputManager.PressButton(MouseButton.Left));
+            moveMouse(new Vector2(350, 300));
+            moveMouse(new Vector2(400, 300));
+            AddStep("end drag", () => InputManager.ReleaseButton(MouseButton.Left));
+
+            AddAssert("slider length shrunk", () => slider.Path.Distance < distanceBefore);
+            AddAssert("ensure slider still has valid length", () => slider.Path.Distance > 0);
+        }
+
+        [Test]
+        public void TestDraggingEndingPointRemainsValid()
+        {
+            Slider slider = null;
+
+            AddStep("Add slider", () =>
+            {
+                slider = new Slider { StartTime = EditorClock.CurrentTime, Position = new Vector2(300) };
+
+                PathControlPoint[] points =
+                {
+                    new PathControlPoint(new Vector2(0), PathType.Linear),
+                    new PathControlPoint(new Vector2(100, 0)),
+                };
+
+                slider.Path = new SliderPath(points);
+                EditorBeatmap.Add(slider);
+            });
+
+            AddAssert("ensure object placed", () => EditorBeatmap.HitObjects.Count == 1);
+
+            moveMouse(new Vector2(300));
+            AddStep("select slider", () => InputManager.Click(MouseButton.Left));
+
+            double distanceBefore = 0;
+
+            AddStep("store distance", () => distanceBefore = slider.Path.Distance);
+
+            moveMouse(new Vector2(400, 300));
+
+            AddStep("begin drag", () => InputManager.PressButton(MouseButton.Left));
+            moveMouse(new Vector2(350, 300));
+            moveMouse(new Vector2(300, 300));
+            AddStep("end drag", () => InputManager.ReleaseButton(MouseButton.Left));
+
+            AddAssert("slider length shrunk", () => slider.Path.Distance < distanceBefore);
+            AddAssert("ensure slider still has valid length", () => slider.Path.Distance > 0);
+        }
+
+        /// <summary>
+        /// If a control point is deleted which results in the slider becoming so short it can't exist,
+        /// for simplicity delete the slider rather than having it in an invalid state.
+        ///
+        /// Eventually we may need to change this, based on user feedback. I think it's likely enough of
+        /// an edge case that we won't get many complaints, though (and there's always the undo button).
+        /// </summary>
+        [Test]
+        public void TestDeletingPointCausesSliderDeletion()
+        {
+            AddStep("Add slider", () =>
+            {
+                Slider slider = new Slider { StartTime = EditorClock.CurrentTime, Position = new Vector2(300) };
+
+                PathControlPoint[] points =
+                {
+                    new PathControlPoint(new Vector2(0), PathType.PerfectCurve),
+                    new PathControlPoint(new Vector2(100, 0)),
+                    new PathControlPoint(new Vector2(0, 10))
+                };
+
+                slider.Path = new SliderPath(points);
+                EditorBeatmap.Add(slider);
+            });
+
+            AddAssert("ensure object placed", () => EditorBeatmap.HitObjects.Count == 1);
+
+            AddStep("select slider", () => InputManager.Click(MouseButton.Left));
+
+            moveMouse(new Vector2(400, 300));
+            AddStep("delete second point", () =>
+            {
+                InputManager.PressKey(Key.ShiftLeft);
+                InputManager.Click(MouseButton.Right);
+                InputManager.ReleaseKey(Key.ShiftLeft);
+            });
+
+            AddAssert("ensure object deleted", () => EditorBeatmap.HitObjects.Count == 0);
+        }
+
+        /// <summary>
+        /// If a scale operation is performed where a single slider is the only thing selected, the path's shape will change.
+        /// If the scale results in the path becoming too short, further mouse movement in the same direction will not change the shape.
+        /// </summary>
+        [Test]
+        public void TestScalingSliderTooSmallRemainsValid()
+        {
+            Slider slider = null;
+
+            AddStep("Add slider", () =>
+            {
+                slider = new Slider { StartTime = EditorClock.CurrentTime, Position = new Vector2(300) };
+
+                PathControlPoint[] points =
+                {
+                    new PathControlPoint(new Vector2(0), PathType.Linear),
+                    new PathControlPoint(new Vector2(0, 50)),
+                    new PathControlPoint(new Vector2(0, 100))
+                };
+
+                slider.Path = new SliderPath(points);
+                EditorBeatmap.Add(slider);
+            });
+
+            AddAssert("ensure object placed", () => EditorBeatmap.HitObjects.Count == 1);
+
+            moveMouse(new Vector2(300));
+            AddStep("select slider", () => InputManager.Click(MouseButton.Left));
+
+            double distanceBefore = 0;
+
+            AddStep("store distance", () => distanceBefore = slider.Path.Distance);
+
+            AddStep("move mouse to handle", () => InputManager.MoveMouseTo(Editor.ChildrenOfType<SelectionBoxDragHandle>().Skip(1).First()));
+            AddStep("begin drag", () => InputManager.PressButton(MouseButton.Left));
+            moveMouse(new Vector2(350, 400));
+            moveMouse(new Vector2(350, 350));
+            moveMouse(new Vector2(350, 300));
+            AddStep("end drag", () => InputManager.ReleaseButton(MouseButton.Left));
+
+            AddAssert("slider length shrunk", () => slider.Path.Distance < distanceBefore);
+            AddAssert("ensure slider still has valid length", () => slider.Path.Distance > 0);
+        }
+
+        private void moveMouse(Vector2 pos) =>
+            AddStep($"move mouse to {pos}", () => InputManager.MoveMouseTo(playfield.ToScreenSpace(pos)));
+    }
+}

From fbf7d838da12f3a2b6d0c576b64558ec30a114d6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Apr 2021 17:30:39 +0900
Subject: [PATCH 2534/3722] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 32e236ccd5..0bb0bf171c 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.415.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.416.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index b5405f6262..e0a267241d 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.415.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.416.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 09f6033bfe..bcd953c0bd 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.415.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.416.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.415.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.416.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From ca74f413cd10ccaee2dd1e51c5190019262b76c8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 17:29:42 +0900
Subject: [PATCH 2535/3722] Change to explicit method instead

---
 .../Visual/Gameplay/TestSceneSpectator.cs     |  2 +-
 .../Spectator/SpectatorStreamingClient.cs     | 38 ++++++++++---------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index ea66144b21..def662d3ea 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -221,7 +221,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 callbackInvoked = false;
             });
 
-            AddStep("bind event again", () => testSpectatorStreamingClient.OnUserBeganPlaying += callbackAction);
+            AddStep("bind event with run once immediately", () => testSpectatorStreamingClient.BindUserBeganPlaying(callbackAction, true));
             AddAssert("callback invoked", () => callbackInvoked);
 
             // Don't leave the event bound if test run succeeded.
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 7bea49e102..4bbc420223 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -69,25 +69,10 @@ namespace osu.Game.Online.Spectator
         /// </summary>
         public event Action<int, FrameDataBundle> OnNewFrames;
 
-        private event Action<int, SpectatorState> onUserBeganPlaying;
-
         /// <summary>
         /// Called whenever a user starts a play session, or immediately if the user is being watched and currently in a play session.
         /// </summary>
-        public event Action<int, SpectatorState> OnUserBeganPlaying
-        {
-            add
-            {
-                onUserBeganPlaying += value;
-
-                lock (userLock)
-                {
-                    foreach (var (userId, state) in currentUserStates)
-                        value?.Invoke(userId, state);
-                }
-            }
-            remove => onUserBeganPlaying -= value;
-        }
+        public event Action<int, SpectatorState> OnUserBeganPlaying;
 
         /// <summary>
         /// Called whenever a user finishes a play session.
@@ -153,7 +138,7 @@ namespace osu.Game.Online.Spectator
             lock (userLock)
                 currentUserStates[userId] = state;
 
-            onUserBeganPlaying?.Invoke(userId, state);
+            OnUserBeganPlaying?.Invoke(userId, state);
 
             return Task.CompletedTask;
         }
@@ -290,5 +275,24 @@ namespace osu.Game.Online.Spectator
 
             lastSendTime = Time.Current;
         }
+
+        /// <summary>
+        /// Bind an action to <see cref="OnUserBeganPlaying"/> with the option of running the bound action once immediately.
+        /// </summary>
+        /// <param name="callback">The action to perform when a user begins playing.</param>
+        /// <param name="runOnceImmediately">Whether the action provided in <paramref name="callback"/> should be run once immediately for all users currently playing.</param>
+        public void BindUserBeganPlaying(Action<int, SpectatorState> callback, bool runOnceImmediately = false)
+        {
+            OnUserBeganPlaying += callback;
+
+            if (!runOnceImmediately)
+                return;
+
+            lock (userLock)
+            {
+                foreach (var (userId, state) in currentUserStates)
+                    callback(userId, state);
+            }
+        }
     }
 }

From 7d23973ef8aa53c77b09201b829800060c61f401 Mon Sep 17 00:00:00 2001
From: jvyden <jvyden@jvyden.xyz>
Date: Fri, 16 Apr 2021 05:01:58 -0400
Subject: [PATCH 2536/3722] Reset SessionStatics on activity

Closes #12424
---
 .../Visual/Components/TestSceneIdleTracker.cs | 39 +++++++++++++++----
 osu.Game/Configuration/SessionStatics.cs      |  8 ++++
 osu.Game/Input/GameIdleTracker.cs             | 11 +++++-
 osu.Game/OsuGame.cs                           |  2 +-
 4 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs b/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
index 4d64c7d35d..794f6ae83f 100644
--- a/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
+++ b/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
@@ -5,6 +5,7 @@ using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Configuration;
 using osu.Game.Input;
 using osuTK;
 using osuTK.Graphics;
@@ -21,14 +22,17 @@ namespace osu.Game.Tests.Visual.Components
 
         private IdleTrackingBox[] boxes;
 
+        public SessionStatics sessionStatics;
+
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
+            sessionStatics = new SessionStatics();
             InputManager.MoveMouseTo(Vector2.Zero);
 
             Children = boxes = new[]
             {
-                box1 = new IdleTrackingBox(2000)
+                box1 = new IdleTrackingBox(2000, sessionStatics)
                 {
                     Name = "TopLeft",
                     RelativeSizeAxes = Axes.Both,
@@ -36,7 +40,7 @@ namespace osu.Game.Tests.Visual.Components
                     Anchor = Anchor.TopLeft,
                     Origin = Anchor.TopLeft,
                 },
-                box2 = new IdleTrackingBox(4000)
+                box2 = new IdleTrackingBox(4000, sessionStatics)
                 {
                     Name = "TopRight",
                     RelativeSizeAxes = Axes.Both,
@@ -44,7 +48,7 @@ namespace osu.Game.Tests.Visual.Components
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
                 },
-                box3 = new IdleTrackingBox(6000)
+                box3 = new IdleTrackingBox(6000, sessionStatics)
                 {
                     Name = "BottomLeft",
                     RelativeSizeAxes = Axes.Both,
@@ -52,7 +56,7 @@ namespace osu.Game.Tests.Visual.Components
                     Anchor = Anchor.BottomLeft,
                     Origin = Anchor.BottomLeft,
                 },
-                box4 = new IdleTrackingBox(8000)
+                box4 = new IdleTrackingBox(8000, sessionStatics)
                 {
                     Name = "BottomRight",
                     RelativeSizeAxes = Axes.Both,
@@ -61,6 +65,7 @@ namespace osu.Game.Tests.Visual.Components
                     Origin = Anchor.BottomRight,
                 },
             };
+
         });
 
         [Test]
@@ -133,6 +138,26 @@ namespace osu.Game.Tests.Visual.Components
             waitForAllIdle();
         }
 
+        [Test]
+        public void TestSessionStaticsReset()
+        {
+            AddStep("move to top left", () => InputManager.MoveMouseTo(box1));
+            AddStep("set session statics", () =>
+            {
+                sessionStatics.SetValue(Static.LoginOverlayDisplayed, true);
+                sessionStatics.SetValue(Static.MutedAudioNotificationShownOnce, true);
+                sessionStatics.SetValue(Static.LowBatteryNotificationShownOnce, true);
+                sessionStatics.SetValue(Static.LastHoverSoundPlaybackTime, (double?)1d);
+            });
+
+            AddStep("move away from box1", () => InputManager.MoveMouseTo(box4));
+            AddUntilStep("Wait for idle", () => box1.IsIdle);
+            AddAssert("LoginOverlayDisplayed is default", () => sessionStatics.Get<bool>(Static.LoginOverlayDisplayed) == false);
+            AddAssert("MutedAudioNotificationShownOnce is default", () => sessionStatics.Get<bool>(Static.MutedAudioNotificationShownOnce) == false);
+            AddAssert("LowBatteryNotificationShownOnce is default", () => sessionStatics.Get<bool>(Static.LowBatteryNotificationShownOnce) == false);
+            AddAssert("LastHoverSoundPlaybackTime is default", () => sessionStatics.Get<double?>(Static.LastHoverSoundPlaybackTime) == null);
+        }
+
         private void checkIdleStatus(int box, bool expectedIdle)
         {
             AddAssert($"box {box} is {(expectedIdle ? "idle" : "active")}", () => boxes[box - 1].IsIdle == expectedIdle);
@@ -140,7 +165,7 @@ namespace osu.Game.Tests.Visual.Components
 
         private void waitForAllIdle()
         {
-            AddUntilStep("Wait for all idle", () => box1.IsIdle && box2.IsIdle && box3.IsIdle && box4.IsIdle);
+            AddUntilStep("wait for all idle", () => box1.IsIdle && box2.IsIdle && box3.IsIdle && box4.IsIdle);
         }
 
         private class IdleTrackingBox : CompositeDrawable
@@ -149,7 +174,7 @@ namespace osu.Game.Tests.Visual.Components
 
             public bool IsIdle => idleTracker.IsIdle.Value;
 
-            public IdleTrackingBox(double timeToIdle)
+            public IdleTrackingBox(int timeToIdle, SessionStatics statics)
             {
                 Box box;
 
@@ -158,7 +183,7 @@ namespace osu.Game.Tests.Visual.Components
 
                 InternalChildren = new Drawable[]
                 {
-                    idleTracker = new IdleTracker(timeToIdle),
+                    idleTracker = new GameIdleTracker(timeToIdle, statics),
                     box = new Box
                     {
                         Colour = Color4.White,
diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index 71e1a1efcc..c960409de8 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.cs
@@ -20,6 +20,14 @@ namespace osu.Game.Configuration
             SetDefault(Static.LastHoverSoundPlaybackTime, (double?)null);
             SetDefault<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null);
         }
+
+        public void ResetValues()
+        {
+            SetValue(Static.LoginOverlayDisplayed, false);
+            SetValue(Static.MutedAudioNotificationShownOnce, false);
+            SetValue(Static.LowBatteryNotificationShownOnce, false);
+            SetValue(Static.LastHoverSoundPlaybackTime, (double?)null);
+        }
     }
 
     public enum Static
diff --git a/osu.Game/Input/GameIdleTracker.cs b/osu.Game/Input/GameIdleTracker.cs
index 260be7e5c9..53dab0c07b 100644
--- a/osu.Game/Input/GameIdleTracker.cs
+++ b/osu.Game/Input/GameIdleTracker.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 osu.Framework.Bindables;
 using osu.Framework.Input;
+using osu.Game.Configuration;
 
 namespace osu.Game.Input
 {
@@ -9,9 +11,16 @@ namespace osu.Game.Input
     {
         private InputManager inputManager;
 
-        public GameIdleTracker(int time)
+        public GameIdleTracker(int time, SessionStatics statics)
             : base(time)
         {
+            IsIdle.ValueChanged += _ => UpdateStatics(_, statics);
+        }
+
+        protected static void UpdateStatics(ValueChangedEvent<bool> e, SessionStatics statics)
+        {
+            if (e.OldValue != e.NewValue && e.NewValue)
+                statics.ResetValues();
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 809e5d3c1b..97d4011607 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -575,7 +575,7 @@ namespace osu.Game
             Container logoContainer;
             BackButton.Receptor receptor;
 
-            dependencies.CacheAs(idleTracker = new GameIdleTracker(6000));
+            dependencies.CacheAs(idleTracker = new GameIdleTracker(6000, Dependencies.Get<SessionStatics>()));
 
             AddRange(new Drawable[]
             {

From 43e6e5e049a99ef85678cc4953a3f08335a6afdf Mon Sep 17 00:00:00 2001
From: jvyden <jvyden@jvyden.xyz>
Date: Fri, 16 Apr 2021 05:15:58 -0400
Subject: [PATCH 2537/3722] increase GameIdleTracker time to 5 minutes

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 97d4011607..3930db01b9 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -575,7 +575,7 @@ namespace osu.Game
             Container logoContainer;
             BackButton.Receptor receptor;
 
-            dependencies.CacheAs(idleTracker = new GameIdleTracker(6000, Dependencies.Get<SessionStatics>()));
+            dependencies.CacheAs(idleTracker = new GameIdleTracker(300_000, Dependencies.Get<SessionStatics>()));
 
             AddRange(new Drawable[]
             {

From d9d50f0e88abae5d25c694036ae3ec9dc717dcc2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Apr 2021 18:16:22 +0900
Subject: [PATCH 2538/3722] Add border showing selected blueprints in timeline

---
 .../Timeline/TimelineHitObjectBlueprint.cs    | 47 ++++++++++++++++---
 1 file changed, 41 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index bea1aa2e3a..105e04d441 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -40,7 +40,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private Bindable<int> indexInCurrentComboBindable;
         private Bindable<int> comboIndexBindable;
 
-        private readonly Drawable circle;
+        private readonly ExtendableCircle circle;
+        private readonly Border border;
 
         private readonly Container colouredComponents;
         private readonly OsuSpriteText comboIndexText;
@@ -62,7 +63,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             RelativeSizeAxes = Axes.X;
             Height = circle_size;
 
-            AddRangeInternal(new[]
+            AddRangeInternal(new Drawable[]
             {
                 circle = new ExtendableCircle
                 {
@@ -70,6 +71,12 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreLeft,
                 },
+                border = new Border
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                },
                 colouredComponents = new Container
                 {
                     Anchor = Anchor.CentreLeft,
@@ -116,11 +123,13 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         protected override void OnSelected()
         {
             // base logic hides selected blueprints when not selected, but timeline doesn't do that.
+            updateComboColour();
         }
 
         protected override void OnDeselected()
         {
             // base logic hides selected blueprints when not selected, but timeline doesn't do that.
+            updateComboColour();
         }
 
         private void updateComboIndex() => comboIndexText.Text = (indexInCurrentComboBindable.Value + 1).ToString();
@@ -133,6 +142,16 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             var comboColours = skin.GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value ?? Array.Empty<Color4>();
             var comboColour = combo.GetComboColour(comboColours);
 
+            if (IsSelected)
+            {
+                border.Show();
+                comboColour = comboColour.Lighten(0.3f);
+            }
+            else
+            {
+                border.Hide();
+            }
+
             if (HitObject is IHasDuration duration && duration.Duration > 0)
                 circle.Colour = ColourInfo.GradientHorizontal(comboColour, comboColour.Lighten(0.4f));
             else
@@ -340,22 +359,38 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             }
         }
 
+        public class Border : ExtendableCircle
+        {
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                Content.Child.Alpha = 0;
+                Content.Child.AlwaysPresent = true;
+
+                Content.BorderColour = colours.Yellow;
+                Content.EdgeEffect = new EdgeEffectParameters();
+            }
+        }
+
         /// <summary>
         /// A circle with externalised end caps so it can take up the full width of a relative width area.
         /// </summary>
         public class ExtendableCircle : CompositeDrawable
         {
-            private readonly Circle content;
+            protected readonly Circle Content;
 
-            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => content.ReceivePositionalInputAt(screenSpacePos);
+            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Content.ReceivePositionalInputAt(screenSpacePos);
 
-            public override Quad ScreenSpaceDrawQuad => content.ScreenSpaceDrawQuad;
+            public override Quad ScreenSpaceDrawQuad => Content.ScreenSpaceDrawQuad;
 
             public ExtendableCircle()
             {
                 Padding = new MarginPadding { Horizontal = -circle_size / 2f };
-                InternalChild = content = new Circle
+                InternalChild = Content = new Circle
                 {
+                    BorderColour = OsuColour.Gray(0.75f),
+                    BorderThickness = 4,
+                    Masking = true,
                     RelativeSizeAxes = Axes.Both,
                     EdgeEffect = new EdgeEffectParameters
                     {

From 377e5ce6b396c585a0652cf63253966c59c06948 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 18:21:35 +0900
Subject: [PATCH 2539/3722] Fix test incorrect sending state too often

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index def662d3ea..392419649b 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -312,7 +312,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public override void WatchUser(int userId)
             {
-                if (sentState)
+                if (!PlayingUsers.Contains(userId) && sentState)
                 {
                     // usually the server would do this.
                     sendState(beatmapId);

From 46d2181d42930ac61f6da22f8146ba2b74357929 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 18:21:56 +0900
Subject: [PATCH 2540/3722] Remove now unnecessary (duplicating) test

---
 .../Visual/Gameplay/TestSceneSpectator.cs     | 24 -------------------
 1 file changed, 24 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 392419649b..74ce66096e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.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;
@@ -205,29 +204,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("screen didn't change", () => Stack.CurrentScreen is SoloSpectator);
         }
 
-        [Test]
-        public void OnUserBeganPlayingCallbackInvokedOnNewAdd()
-        {
-            bool callbackInvoked = false;
-            Action<int, SpectatorState> callbackAction = (_, __) => callbackInvoked = true;
-
-            AddStep("bind first event", () => testSpectatorStreamingClient.OnUserBeganPlaying += callbackAction);
-            start();
-            AddAssert("callback invoked", () => callbackInvoked);
-
-            AddStep("reset", () =>
-            {
-                testSpectatorStreamingClient.OnUserBeganPlaying -= callbackAction;
-                callbackInvoked = false;
-            });
-
-            AddStep("bind event with run once immediately", () => testSpectatorStreamingClient.BindUserBeganPlaying(callbackAction, true));
-            AddAssert("callback invoked", () => callbackInvoked);
-
-            // Don't leave the event bound if test run succeeded.
-            AddStep("reset", () => testSpectatorStreamingClient.OnUserBeganPlaying -= callbackAction);
-        }
-
         private OsuFramedReplayInputHandler replayHandler =>
             (OsuFramedReplayInputHandler)Stack.ChildrenOfType<OsuInputManager>().First().ReplayInputHandler;
 

From 274e33184b8afb9d10ef8b2d380edc8b742ee2ab Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 18:22:22 +0900
Subject: [PATCH 2541/3722] Fix SpectatorScreen potentially missing user
 playing callbacks

---
 osu.Game/Screens/Spectate/SpectatorScreen.cs | 42 ++++++++++++++------
 1 file changed, 29 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/Spectate/SpectatorScreen.cs b/osu.Game/Screens/Spectate/SpectatorScreen.cs
index 6dd3144fc8..7be6c6183b 100644
--- a/osu.Game/Screens/Spectate/SpectatorScreen.cs
+++ b/osu.Game/Screens/Spectate/SpectatorScreen.cs
@@ -62,26 +62,42 @@ namespace osu.Game.Screens.Spectate
         {
             base.LoadComplete();
 
-            spectatorClient.OnUserBeganPlaying += userBeganPlaying;
-            spectatorClient.OnUserFinishedPlaying += userFinishedPlaying;
-            spectatorClient.OnNewFrames += userSentFrames;
-
-            foreach (var id in userIds)
+            populateAllUsers().ContinueWith(_ => Schedule(() =>
             {
-                userLookupCache.GetUserAsync(id).ContinueWith(u => Schedule(() =>
+                spectatorClient.BindUserBeganPlaying(userBeganPlaying, true);
+                spectatorClient.OnUserFinishedPlaying += userFinishedPlaying;
+                spectatorClient.OnNewFrames += userSentFrames;
+
+                managerUpdated = beatmaps.ItemUpdated.GetBoundCopy();
+                managerUpdated.BindValueChanged(beatmapUpdated);
+
+                lock (stateLock)
                 {
-                    if (u.Result == null)
+                    foreach (var (id, _) in userMap)
+                        spectatorClient.WatchUser(id);
+                }
+            }));
+        }
+
+        private Task populateAllUsers()
+        {
+            var userLookupTasks = new Task[userIds.Length];
+
+            for (int i = 0; i < userIds.Length; i++)
+            {
+                var userId = userIds[i];
+
+                userLookupTasks[i] = userLookupCache.GetUserAsync(userId).ContinueWith(task =>
+                {
+                    if (!task.IsCompletedSuccessfully)
                         return;
 
                     lock (stateLock)
-                        userMap[id] = u.Result;
-
-                    spectatorClient.WatchUser(id);
-                }), TaskContinuationOptions.OnlyOnRanToCompletion);
+                        userMap[userId] = task.Result;
+                });
             }
 
-            managerUpdated = beatmaps.ItemUpdated.GetBoundCopy();
-            managerUpdated.BindValueChanged(beatmapUpdated);
+            return Task.WhenAll(userLookupTasks);
         }
 
         private void beatmapUpdated(ValueChangedEvent<WeakReference<BeatmapSetInfo>> e)

From d760e81a9130e5e9ea484e9a77225e743d4c900f Mon Sep 17 00:00:00 2001
From: jvyden <jvyden@jvyden.xyz>
Date: Fri, 16 Apr 2021 05:22:41 -0400
Subject: [PATCH 2542/3722] Fix lint

---
 osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs b/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
index 794f6ae83f..61efc61537 100644
--- a/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
+++ b/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
@@ -65,7 +65,6 @@ namespace osu.Game.Tests.Visual.Components
                     Origin = Anchor.BottomRight,
                 },
             };
-
         });
 
         [Test]

From ec0211809f145e203408523de7b7f94f0d4ca6fd Mon Sep 17 00:00:00 2001
From: jvyden <jvyden@jvyden.xyz>
Date: Fri, 16 Apr 2021 05:53:27 -0400
Subject: [PATCH 2543/3722] Apply peppy's suggestions

---
 .../Visual/Components/TestSceneIdleTracker.cs         | 11 ++++++++---
 osu.Game/Configuration/SessionStatics.cs              |  6 ++----
 osu.Game/Input/GameIdleTracker.cs                     | 11 +----------
 osu.Game/OsuGame.cs                                   | 11 ++++++++++-
 4 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs b/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
index 61efc61537..be8e50d649 100644
--- a/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
+++ b/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Tests.Visual.Components
 
         private IdleTrackingBox[] boxes;
 
-        public SessionStatics sessionStatics;
+        private SessionStatics sessionStatics;
 
         [SetUp]
         public void SetUp() => Schedule(() =>
@@ -175,6 +175,7 @@ namespace osu.Game.Tests.Visual.Components
 
             public IdleTrackingBox(int timeToIdle, SessionStatics statics)
             {
+
                 Box box;
 
                 Alpha = 0.6f;
@@ -182,7 +183,7 @@ namespace osu.Game.Tests.Visual.Components
 
                 InternalChildren = new Drawable[]
                 {
-                    idleTracker = new GameIdleTracker(timeToIdle, statics),
+                    idleTracker = new GameIdleTracker(timeToIdle),
                     box = new Box
                     {
                         Colour = Color4.White,
@@ -190,7 +191,11 @@ namespace osu.Game.Tests.Visual.Components
                     },
                 };
 
-                idleTracker.IsIdle.BindValueChanged(idle => box.Colour = idle.NewValue ? Color4.White : Color4.Black, true);
+                idleTracker.IsIdle.BindValueChanged(idle =>
+                {
+                    box.Colour = idle.NewValue ? Color4.White : Color4.Black;
+                    if (idle.NewValue) statics.ResetValues();
+                }, true);
             }
         }
     }
diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index c960409de8..99089dd076 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.cs
@@ -23,10 +23,8 @@ namespace osu.Game.Configuration
 
         public void ResetValues()
         {
-            SetValue(Static.LoginOverlayDisplayed, false);
-            SetValue(Static.MutedAudioNotificationShownOnce, false);
-            SetValue(Static.LowBatteryNotificationShownOnce, false);
-            SetValue(Static.LastHoverSoundPlaybackTime, (double?)null);
+            ConfigStore.Clear();
+            InitialiseDefaults();
         }
     }
 
diff --git a/osu.Game/Input/GameIdleTracker.cs b/osu.Game/Input/GameIdleTracker.cs
index 53dab0c07b..260be7e5c9 100644
--- a/osu.Game/Input/GameIdleTracker.cs
+++ b/osu.Game/Input/GameIdleTracker.cs
@@ -1,9 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Bindables;
 using osu.Framework.Input;
-using osu.Game.Configuration;
 
 namespace osu.Game.Input
 {
@@ -11,16 +9,9 @@ namespace osu.Game.Input
     {
         private InputManager inputManager;
 
-        public GameIdleTracker(int time, SessionStatics statics)
+        public GameIdleTracker(int time)
             : base(time)
         {
-            IsIdle.ValueChanged += _ => UpdateStatics(_, statics);
-        }
-
-        protected static void UpdateStatics(ValueChangedEvent<bool> e, SessionStatics statics)
-        {
-            if (e.OldValue != e.NewValue && e.NewValue)
-                statics.ResetValues();
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 3930db01b9..0abb0373fa 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -575,7 +575,16 @@ namespace osu.Game
             Container logoContainer;
             BackButton.Receptor receptor;
 
-            dependencies.CacheAs(idleTracker = new GameIdleTracker(300_000, Dependencies.Get<SessionStatics>()));
+            dependencies.CacheAs(idleTracker = new GameIdleTracker(6000));
+
+            GameIdleTracker sessionIdleTracker = new GameIdleTracker(300_000);
+            Add(sessionIdleTracker);
+
+            sessionIdleTracker.IsIdle.BindValueChanged((e) =>
+            {
+                if (e.NewValue)
+                    Dependencies.Get<SessionStatics>().ResetValues();
+            });
 
             AddRange(new Drawable[]
             {

From b413ffae3e883384b236b0a3c9a1c27e5ff0f843 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Apr 2021 18:54:33 +0900
Subject: [PATCH 2544/3722] Fix test going offscreen in headless execution

---
 .../Editor/TestSceneSliderLengthValidity.cs               | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderLengthValidity.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderLengthValidity.cs
index 74560ad15d..ce529f2a88 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderLengthValidity.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderLengthValidity.cs
@@ -159,7 +159,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             AddStep("Add slider", () =>
             {
-                slider = new Slider { StartTime = EditorClock.CurrentTime, Position = new Vector2(300) };
+                slider = new Slider { StartTime = EditorClock.CurrentTime, Position = new Vector2(300, 200) };
 
                 PathControlPoint[] points =
                 {
@@ -183,9 +183,9 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
 
             AddStep("move mouse to handle", () => InputManager.MoveMouseTo(Editor.ChildrenOfType<SelectionBoxDragHandle>().Skip(1).First()));
             AddStep("begin drag", () => InputManager.PressButton(MouseButton.Left));
-            moveMouse(new Vector2(350, 400));
-            moveMouse(new Vector2(350, 350));
-            moveMouse(new Vector2(350, 300));
+            moveMouse(new Vector2(300, 300));
+            moveMouse(new Vector2(300, 250));
+            moveMouse(new Vector2(300, 200));
             AddStep("end drag", () => InputManager.ReleaseButton(MouseButton.Left));
 
             AddAssert("slider length shrunk", () => slider.Path.Distance < distanceBefore);

From 8d6c30c73bb39b5383a9119ea351a760e3b48722 Mon Sep 17 00:00:00 2001
From: jvyden <jvyden@jvyden.xyz>
Date: Fri, 16 Apr 2021 05:57:36 -0400
Subject: [PATCH 2545/3722] Fix lint

---
 osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs b/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
index be8e50d649..0bc0fbf5d4 100644
--- a/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
+++ b/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
@@ -175,7 +175,6 @@ namespace osu.Game.Tests.Visual.Components
 
             public IdleTrackingBox(int timeToIdle, SessionStatics statics)
             {
-
                 Box box;
 
                 Alpha = 0.6f;

From 9c6914d29ded9af216b56e6bcacb19ec2c71f88e Mon Sep 17 00:00:00 2001
From: jvyden <jvyden@jvyden.xyz>
Date: Fri, 16 Apr 2021 06:26:45 -0400
Subject: [PATCH 2546/3722] Fix redundant lambda parentheses

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 0abb0373fa..898a2baccf 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -580,7 +580,7 @@ namespace osu.Game
             GameIdleTracker sessionIdleTracker = new GameIdleTracker(300_000);
             Add(sessionIdleTracker);
 
-            sessionIdleTracker.IsIdle.BindValueChanged((e) =>
+            sessionIdleTracker.IsIdle.BindValueChanged(e =>
             {
                 if (e.NewValue)
                     Dependencies.Get<SessionStatics>().ResetValues();

From a4e3e53a63788fdd09029836c779b94ff7389fd3 Mon Sep 17 00:00:00 2001
From: jvyden <jvyden@jvyden.xyz>
Date: Fri, 16 Apr 2021 06:34:57 -0400
Subject: [PATCH 2547/3722] Revert back to hardcoded SessionStatics reset
 values

---
 osu.Game/Configuration/SessionStatics.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index 99089dd076..872a910837 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.cs
@@ -23,8 +23,11 @@ namespace osu.Game.Configuration
 
         public void ResetValues()
         {
-            ConfigStore.Clear();
-            InitialiseDefaults();
+            SetValue(Static.LoginOverlayDisplayed, false);
+            SetValue(Static.MutedAudioNotificationShownOnce, false);
+            SetValue(Static.LowBatteryNotificationShownOnce, false);
+            SetValue(Static.LastHoverSoundPlaybackTime, (double?)null);
+            SetValue<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null);
         }
     }
 

From d26fa46ef2a9f80cfbd2c93d54b6572727f4d080 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 19:40:56 +0900
Subject: [PATCH 2548/3722] Record every 60fps interval

---
 osu.Game/Rulesets/UI/ReplayRecorder.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Rulesets/UI/ReplayRecorder.cs b/osu.Game/Rulesets/UI/ReplayRecorder.cs
index a4d46e3888..643ded4cad 100644
--- a/osu.Game/Rulesets/UI/ReplayRecorder.cs
+++ b/osu.Game/Rulesets/UI/ReplayRecorder.cs
@@ -58,6 +58,12 @@ namespace osu.Game.Rulesets.UI
             spectatorStreaming?.EndPlaying();
         }
 
+        protected override void Update()
+        {
+            base.Update();
+            recordFrame(false);
+        }
+
         protected override bool OnMouseMove(MouseMoveEvent e)
         {
             recordFrame(false);

From f98ffbb1b365294b424ee28938072ba59b9cf1e2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 20:15:42 +0900
Subject: [PATCH 2549/3722] Remove ClockToProcess, always process underlying
 clock

---
 osu.Game/Screens/Play/GameplayClock.cs         | 18 +++++++++---------
 .../Screens/Play/GameplayClockContainer.cs     |  4 +---
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClock.cs b/osu.Game/Screens/Play/GameplayClock.cs
index db4b5d300b..54aa395f5f 100644
--- a/osu.Game/Screens/Play/GameplayClock.cs
+++ b/osu.Game/Screens/Play/GameplayClock.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Screens.Play
     /// </summary>
     public class GameplayClock : IFrameBasedClock
     {
-        private readonly IFrameBasedClock underlyingClock;
+        internal readonly IFrameBasedClock UnderlyingClock;
 
         public readonly BindableBool IsPaused = new BindableBool();
 
@@ -30,12 +30,12 @@ namespace osu.Game.Screens.Play
 
         public GameplayClock(IFrameBasedClock underlyingClock)
         {
-            this.underlyingClock = underlyingClock;
+            UnderlyingClock = underlyingClock;
         }
 
-        public double CurrentTime => underlyingClock.CurrentTime;
+        public double CurrentTime => UnderlyingClock.CurrentTime;
 
-        public double Rate => underlyingClock.Rate;
+        public double Rate => UnderlyingClock.Rate;
 
         /// <summary>
         /// The rate of gameplay when playback is at 100%.
@@ -59,19 +59,19 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        public bool IsRunning => underlyingClock.IsRunning;
+        public bool IsRunning => UnderlyingClock.IsRunning;
 
         public void ProcessFrame()
         {
             // intentionally not updating the underlying clock (handled externally).
         }
 
-        public double ElapsedFrameTime => underlyingClock.ElapsedFrameTime;
+        public double ElapsedFrameTime => UnderlyingClock.ElapsedFrameTime;
 
-        public double FramesPerSecond => underlyingClock.FramesPerSecond;
+        public double FramesPerSecond => UnderlyingClock.FramesPerSecond;
 
-        public FrameTimeInfo TimeInfo => underlyingClock.TimeInfo;
+        public FrameTimeInfo TimeInfo => UnderlyingClock.TimeInfo;
 
-        public IClock Source => underlyingClock;
+        public IClock Source => UnderlyingClock;
     }
 }
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 6d863f0094..b7dc55277f 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -80,15 +80,13 @@ namespace osu.Game.Screens.Play
         protected override void Update()
         {
             if (!IsPaused.Value)
-                ClockToProcess.ProcessFrame();
+                GameplayClock.UnderlyingClock.ProcessFrame();
 
             base.Update();
         }
 
         protected abstract void OnIsPausedChanged(ValueChangedEvent<bool> isPaused);
 
-        protected virtual IFrameBasedClock ClockToProcess => AdjustableClock;
-
         protected abstract GameplayClock CreateGameplayClock(IFrameBasedClock source);
     }
 }

From 6301111fa3c1d274c68766d3c1456ebd74d95138 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 20:15:42 +0900
Subject: [PATCH 2550/3722] Remove ClockToProcess, always process underlying
 clock

---
 osu.Game/Screens/Play/GameplayClock.cs         | 18 +++++++++---------
 .../Screens/Play/GameplayClockContainer.cs     |  4 +---
 .../Play/MasterGameplayClockContainer.cs       |  2 --
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClock.cs b/osu.Game/Screens/Play/GameplayClock.cs
index db4b5d300b..54aa395f5f 100644
--- a/osu.Game/Screens/Play/GameplayClock.cs
+++ b/osu.Game/Screens/Play/GameplayClock.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Screens.Play
     /// </summary>
     public class GameplayClock : IFrameBasedClock
     {
-        private readonly IFrameBasedClock underlyingClock;
+        internal readonly IFrameBasedClock UnderlyingClock;
 
         public readonly BindableBool IsPaused = new BindableBool();
 
@@ -30,12 +30,12 @@ namespace osu.Game.Screens.Play
 
         public GameplayClock(IFrameBasedClock underlyingClock)
         {
-            this.underlyingClock = underlyingClock;
+            UnderlyingClock = underlyingClock;
         }
 
-        public double CurrentTime => underlyingClock.CurrentTime;
+        public double CurrentTime => UnderlyingClock.CurrentTime;
 
-        public double Rate => underlyingClock.Rate;
+        public double Rate => UnderlyingClock.Rate;
 
         /// <summary>
         /// The rate of gameplay when playback is at 100%.
@@ -59,19 +59,19 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        public bool IsRunning => underlyingClock.IsRunning;
+        public bool IsRunning => UnderlyingClock.IsRunning;
 
         public void ProcessFrame()
         {
             // intentionally not updating the underlying clock (handled externally).
         }
 
-        public double ElapsedFrameTime => underlyingClock.ElapsedFrameTime;
+        public double ElapsedFrameTime => UnderlyingClock.ElapsedFrameTime;
 
-        public double FramesPerSecond => underlyingClock.FramesPerSecond;
+        public double FramesPerSecond => UnderlyingClock.FramesPerSecond;
 
-        public FrameTimeInfo TimeInfo => underlyingClock.TimeInfo;
+        public FrameTimeInfo TimeInfo => UnderlyingClock.TimeInfo;
 
-        public IClock Source => underlyingClock;
+        public IClock Source => UnderlyingClock;
     }
 }
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 6d863f0094..b7dc55277f 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -80,15 +80,13 @@ namespace osu.Game.Screens.Play
         protected override void Update()
         {
             if (!IsPaused.Value)
-                ClockToProcess.ProcessFrame();
+                GameplayClock.UnderlyingClock.ProcessFrame();
 
             base.Update();
         }
 
         protected abstract void OnIsPausedChanged(ValueChangedEvent<bool> isPaused);
 
-        protected virtual IFrameBasedClock ClockToProcess => AdjustableClock;
-
         protected abstract GameplayClock CreateGameplayClock(IFrameBasedClock source);
     }
 }
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 83e21f3c1d..5eb82bf0fa 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -128,8 +128,6 @@ namespace osu.Game.Screens.Play
             Seek(skipTarget);
         }
 
-        protected override IFrameBasedClock ClockToProcess => userOffsetClock;
-
         protected override GameplayClock CreateGameplayClock(IFrameBasedClock source)
         {
             // Lazer's audio timings in general doesn't match stable. This is the result of user testing, albeit limited.

From 3a78c19f9695ad5519e8494e8e888f25d50998b9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 20:33:29 +0900
Subject: [PATCH 2551/3722] More refactoring/xmldocs

---
 .../Screens/Play/GameplayClockContainer.cs    | 64 ++++++++++++++-----
 .../Play/MasterGameplayClockContainer.cs      | 16 +++--
 2 files changed, 61 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index b7dc55277f..642ede5f1c 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -9,26 +9,36 @@ using osu.Framework.Timing;
 
 namespace osu.Game.Screens.Play
 {
+    /// <summary>
+    /// Encapsulates gameplay timing logic and provides a <see cref="GameplayClock"/> via DI for gameplay components to use.
+    /// </summary>
     public abstract class GameplayClockContainer : Container
     {
         /// <summary>
-        /// The final clock which is exposed to underlying components.
+        /// The final clock which is exposed to gameplay components.
         /// </summary>
         public GameplayClock GameplayClock { get; private set; }
 
+        /// <summary>
+        /// Whether gameplay is paused.
+        /// </summary>
         public readonly BindableBool IsPaused = new BindableBool();
 
         /// <summary>
-        /// The decoupled clock used for gameplay. Should be used for seeks and clock control.
+        /// The adjustable source clock used for gameplay. Should be used for seeks and clock control.
         /// </summary>
-        protected readonly DecoupleableInterpolatingFramedClock AdjustableClock;
+        protected readonly DecoupleableInterpolatingFramedClock AdjustableSource;
 
+        /// <summary>
+        /// Creates a new <see cref="GameplayClockContainer"/>.
+        /// </summary>
+        /// <param name="sourceClock">The source <see cref="IClock"/> used for timing.</param>
         protected GameplayClockContainer(IClock sourceClock)
         {
             RelativeSizeAxes = Axes.Both;
 
-            AdjustableClock = new DecoupleableInterpolatingFramedClock { IsCoupled = false };
-            AdjustableClock.ChangeSource(sourceClock);
+            AdjustableSource = new DecoupleableInterpolatingFramedClock { IsCoupled = false };
+            AdjustableSource.ChangeSource(sourceClock);
 
             IsPaused.BindValueChanged(OnIsPausedChanged);
         }
@@ -37,21 +47,24 @@ namespace osu.Game.Screens.Play
         {
             var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
 
-            dependencies.CacheAs(GameplayClock = CreateGameplayClock(AdjustableClock));
+            dependencies.CacheAs(GameplayClock = CreateGameplayClock(AdjustableSource));
             GameplayClock.IsPaused.BindTo(IsPaused);
 
             return dependencies;
         }
 
+        /// <summary>
+        /// Starts gameplay.
+        /// </summary>
         public virtual void Start()
         {
-            if (!AdjustableClock.IsRunning)
+            if (!AdjustableSource.IsRunning)
             {
                 // Seeking the decoupled clock to its current time ensures that its source clock will be seeked to the same time
                 // This accounts for the clock source potentially taking time to enter a completely stopped state
                 Seek(GameplayClock.CurrentTime);
 
-                AdjustableClock.Start();
+                AdjustableSource.Start();
             }
 
             IsPaused.Value = false;
@@ -59,19 +72,22 @@ namespace osu.Game.Screens.Play
 
         /// <summary>
         /// Seek to a specific time in gameplay.
-        /// <remarks>
-        /// Adjusts for any offsets which have been applied (so the seek may not be the expected point in time on the underlying audio track).
-        /// </remarks>
         /// </summary>
         /// <param name="time">The destination time to seek to.</param>
-        public virtual void Seek(double time) => AdjustableClock.Seek(time);
+        public virtual void Seek(double time) => AdjustableSource.Seek(time);
 
+        /// <summary>
+        /// Stops gameplay.
+        /// </summary>
         public virtual void Stop() => IsPaused.Value = true;
 
+        /// <summary>
+        /// Restarts gameplay.
+        /// </summary>
         public virtual void Restart()
         {
-            AdjustableClock.Seek(0);
-            AdjustableClock.Stop();
+            AdjustableSource.Seek(0);
+            AdjustableSource.Stop();
 
             if (!IsPaused.Value)
                 Start();
@@ -85,8 +101,26 @@ namespace osu.Game.Screens.Play
             base.Update();
         }
 
-        protected abstract void OnIsPausedChanged(ValueChangedEvent<bool> isPaused);
+        /// <summary>
+        /// Invoked when the value of <see cref="IsPaused"/> is changed to start or stop the <see cref="AdjustableSource"/> clock.
+        /// </summary>
+        /// <param name="isPaused">Whether the clock should now be paused.</param>
+        protected virtual void OnIsPausedChanged(ValueChangedEvent<bool> isPaused)
+        {
+            if (isPaused.NewValue)
+                AdjustableSource.Stop();
+            else
+                AdjustableSource.Start();
+        }
 
+        /// <summary>
+        /// Creates the final <see cref="GameplayClock"/> which is exposed via DI to be used by gameplay components.
+        /// </summary>
+        /// <remarks>
+        /// Any intermediate clocks such as platform offsets should be applied here.
+        /// </remarks>
+        /// <param name="source">The <see cref="IFrameBasedClock"/> providing the source time.</param>
+        /// <returns>The final <see cref="GameplayClock"/>.</returns>
         protected abstract GameplayClock CreateGameplayClock(IFrameBasedClock source);
     }
 }
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 5eb82bf0fa..e7b4645734 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public const double MINIMUM_SKIP_TIME = 1000;
 
-        protected Track Track => (Track)AdjustableClock.Source;
+        protected Track Track => (Track)AdjustableSource.Source;
 
         public readonly BindableNumber<double> UserPlaybackRate = new BindableDouble(1)
         {
@@ -84,17 +84,25 @@ namespace osu.Game.Screens.Play
 
             Seek(startTime);
 
-            AdjustableClock.ProcessFrame();
+            AdjustableSource.ProcessFrame();
         }
 
         protected override void OnIsPausedChanged(ValueChangedEvent<bool> isPaused)
         {
+            // The source is stopped by a frequency fade first.
             if (isPaused.NewValue)
-                this.TransformBindableTo(pauseFreqAdjust, 0, 200, Easing.Out).OnComplete(_ => AdjustableClock.Stop());
+                this.TransformBindableTo(pauseFreqAdjust, 0, 200, Easing.Out).OnComplete(_ => AdjustableSource.Stop());
             else
                 this.TransformBindableTo(pauseFreqAdjust, 1, 200, Easing.In);
         }
 
+        /// <summary>
+        /// Seek to a specific time in gameplay.
+        /// </summary>
+        /// <remarks>
+        /// Adjusts for any offsets which have been applied (so the seek may not be the expected point in time on the underlying audio track).
+        /// </remarks>
+        /// <param name="time">The destination time to seek to.</param>
         public override void Seek(double time)
         {
             // remove the offset component here because most of the time we want the seek to be aligned to gameplay, not the audio track.
@@ -146,7 +154,7 @@ namespace osu.Game.Screens.Play
         public void StopUsingBeatmapClock()
         {
             removeSourceClockAdjustments();
-            AdjustableClock.ChangeSource(new TrackVirtual(beatmap.Track.Length));
+            AdjustableSource.ChangeSource(new TrackVirtual(beatmap.Track.Length));
         }
 
         private bool speedAdjustmentsApplied;

From 314b1646bd22db171ecf35c805860dd578394b41 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 20:47:09 +0900
Subject: [PATCH 2552/3722] Add xmldoc to MasterGameplayClockContainer

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

diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index e7b4645734..db0aa23001 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -16,6 +16,16 @@ using osu.Game.Configuration;
 
 namespace osu.Game.Screens.Play
 {
+    /// <summary>
+    /// A <see cref="GameplayClockContainer"/> which uses a <see cref="WorkingBeatmap"/> as a source.
+    /// <para>
+    /// This is the most complete <see cref="GameplayClockContainer"/> which takes into account all user and platform offsets,
+    /// and provides implementations for user actions such as skipping or adjusting playback rates that may occur during gameplay.
+    /// </para>
+    /// </summary>
+    /// <remarks>
+    /// This is intended to be used as a single controller for gameplay, or as a reference source for other <see cref="GameplayClockContainer"/>s.
+    /// </remarks>
     public class MasterGameplayClockContainer : GameplayClockContainer
     {
         /// <summary>

From 7d5d7088cd4dd1be6a0c1ec5f7a8113a2ab68aa4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 20:51:07 +0900
Subject: [PATCH 2553/3722] Remove now unnecessary override

---
 .../Spectate/MultiplayerSpectatorPlayer.cs            | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
index 19cc9f18ad..d4ff65cd01 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.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.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Scoring;
@@ -33,21 +32,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
     public class SubGameplayClockContainer : GameplayClockContainer
     {
-        public new DecoupleableInterpolatingFramedClock AdjustableClock => base.AdjustableClock;
-
         public SubGameplayClockContainer(IClock sourceClock)
             : base(sourceClock)
         {
         }
 
-        protected override void OnIsPausedChanged(ValueChangedEvent<bool> isPaused)
-        {
-            if (isPaused.NewValue)
-                AdjustableClock.Stop();
-            else
-                AdjustableClock.Start();
-        }
-
         protected override GameplayClock CreateGameplayClock(IFrameBasedClock source) => new GameplayClock(source);
     }
 }

From 44e13a91ade2e0aa18fb8d159eebed51e9b30787 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 20:51:42 +0900
Subject: [PATCH 2554/3722] Rename test scene to match class

---
 ...ockContainer.cs => TestSceneMasterGameplayClockContainer.cs} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename osu.Game.Tests/Gameplay/{TestSceneGameplayClockContainer.cs => TestSceneMasterGameplayClockContainer.cs} (92%)

diff --git a/osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs b/osu.Game.Tests/Gameplay/TestSceneMasterGameplayClockContainer.cs
similarity index 92%
rename from osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs
rename to osu.Game.Tests/Gameplay/TestSceneMasterGameplayClockContainer.cs
index 4d5dcabbba..77ada958d7 100644
--- a/osu.Game.Tests/Gameplay/TestSceneGameplayClockContainer.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneMasterGameplayClockContainer.cs
@@ -10,7 +10,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Tests.Gameplay
 {
     [HeadlessTest]
-    public class TestSceneGameplayClockContainer : OsuTestScene
+    public class TestSceneMasterGameplayClockContainer : OsuTestScene
     {
         [Test]
         public void TestStartThenElapsedTime()

From 4c5d4752b13807081be44f17a736822f6f57e3dc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 22:47:52 +0900
Subject: [PATCH 2555/3722] Rename classes to reduce redundant naming

---
 ...rTest.cs => TestCaseCatchUpSyncManager.cs} | 48 +++++++++----------
 .../Spectate/MultiplayerSpectator.cs          |  6 +--
 .../Spectate/MultiplayerSpectatorPlayer.cs    |  4 +-
 .../Multiplayer/Spectate/PlayerInstance.cs    |  4 +-
 ...chUpSlaveClock.cs => CatchUpSlaveClock.cs} |  6 +--
 ...UpSyncManager.cs => CatchUpSyncManager.cs} | 12 ++---
 ...ISpectatorSlaveClock.cs => ISlaveClock.cs} |  4 +-
 ...pectatorSyncManager.cs => ISyncManager.cs} | 16 +++----
 8 files changed, 50 insertions(+), 50 deletions(-)
 rename osu.Game.Tests/OnlinePlay/{MultiplayerCatchUpSyncManagerTest.cs => TestCaseCatchUpSyncManager.cs} (73%)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/{SpectatorCatchUpSlaveClock.cs => CatchUpSlaveClock.cs} (90%)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/{SpectatorCatchUpSyncManager.cs => CatchUpSyncManager.cs} (90%)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/{ISpectatorSlaveClock.cs => ISlaveClock.cs} (83%)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/{ISpectatorSyncManager.cs => ISyncManager.cs} (50%)

diff --git a/osu.Game.Tests/OnlinePlay/MultiplayerCatchUpSyncManagerTest.cs b/osu.Game.Tests/OnlinePlay/TestCaseCatchUpSyncManager.cs
similarity index 73%
rename from osu.Game.Tests/OnlinePlay/MultiplayerCatchUpSyncManagerTest.cs
rename to osu.Game.Tests/OnlinePlay/TestCaseCatchUpSyncManager.cs
index 6aa1219d53..a8c0a763e9 100644
--- a/osu.Game.Tests/OnlinePlay/MultiplayerCatchUpSyncManagerTest.cs
+++ b/osu.Game.Tests/OnlinePlay/TestCaseCatchUpSyncManager.cs
@@ -12,20 +12,20 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Tests.OnlinePlay
 {
     [HeadlessTest]
-    public class MultiplayerCatchUpSyncManagerTest : OsuTestScene
+    public class TestCaseCatchUpSyncManager : OsuTestScene
     {
         private TestManualClock master;
-        private SpectatorCatchUpSyncManager syncManager;
+        private CatchUpSyncManager syncManager;
 
-        private TestSpectatorSlaveClock slave1;
-        private TestSpectatorSlaveClock slave2;
+        private TestSlaveClock slave1;
+        private TestSlaveClock slave2;
 
         [SetUp]
         public void Setup()
         {
-            syncManager = new SpectatorCatchUpSyncManager(master = new TestManualClock());
-            syncManager.AddSlave(slave1 = new TestSpectatorSlaveClock(1));
-            syncManager.AddSlave(slave2 = new TestSpectatorSlaveClock(2));
+            syncManager = new CatchUpSyncManager(master = new TestManualClock());
+            syncManager.AddSlave(slave1 = new TestSlaveClock(1));
+            syncManager.AddSlave(slave2 = new TestSlaveClock(2));
 
             Schedule(() => Child = syncManager);
         }
@@ -47,7 +47,7 @@ namespace osu.Game.Tests.OnlinePlay
         [Test]
         public void TestMasterClockDoesNotStartWhenNoneReadyForMaximumDelayTime()
         {
-            AddWaitStep($"wait {SpectatorCatchUpSyncManager.MAXIMUM_START_DELAY} milliseconds", (int)Math.Ceiling(SpectatorCatchUpSyncManager.MAXIMUM_START_DELAY / TimePerAction));
+            AddWaitStep($"wait {CatchUpSyncManager.MAXIMUM_START_DELAY} milliseconds", (int)Math.Ceiling(CatchUpSyncManager.MAXIMUM_START_DELAY / TimePerAction));
             assertMasterState(false);
         }
 
@@ -55,7 +55,7 @@ namespace osu.Game.Tests.OnlinePlay
         public void TestMasterClockStartsWhenAnyReadyForMaximumDelayTime()
         {
             setWaiting(() => slave1, false);
-            AddWaitStep($"wait {SpectatorCatchUpSyncManager.MAXIMUM_START_DELAY} milliseconds", (int)Math.Ceiling(SpectatorCatchUpSyncManager.MAXIMUM_START_DELAY / TimePerAction));
+            AddWaitStep($"wait {CatchUpSyncManager.MAXIMUM_START_DELAY} milliseconds", (int)Math.Ceiling(CatchUpSyncManager.MAXIMUM_START_DELAY / TimePerAction));
             assertMasterState(true);
         }
 
@@ -64,7 +64,7 @@ namespace osu.Game.Tests.OnlinePlay
         {
             setAllWaiting(false);
 
-            setMasterTime(SpectatorCatchUpSyncManager.SYNC_TARGET + 1);
+            setMasterTime(CatchUpSyncManager.SYNC_TARGET + 1);
             assertCatchingUp(() => slave1, false);
         }
 
@@ -73,7 +73,7 @@ namespace osu.Game.Tests.OnlinePlay
         {
             setAllWaiting(false);
 
-            setMasterTime(SpectatorCatchUpSyncManager.MAX_SYNC_OFFSET + 1);
+            setMasterTime(CatchUpSyncManager.MAX_SYNC_OFFSET + 1);
             assertCatchingUp(() => slave1, true);
             assertCatchingUp(() => slave2, true);
         }
@@ -83,8 +83,8 @@ namespace osu.Game.Tests.OnlinePlay
         {
             setAllWaiting(false);
 
-            setMasterTime(SpectatorCatchUpSyncManager.MAX_SYNC_OFFSET + 1);
-            setSlaveTime(() => slave1, SpectatorCatchUpSyncManager.SYNC_TARGET + 1);
+            setMasterTime(CatchUpSyncManager.MAX_SYNC_OFFSET + 1);
+            setSlaveTime(() => slave1, CatchUpSyncManager.SYNC_TARGET + 1);
             assertCatchingUp(() => slave1, true);
         }
 
@@ -93,8 +93,8 @@ namespace osu.Game.Tests.OnlinePlay
         {
             setAllWaiting(false);
 
-            setMasterTime(SpectatorCatchUpSyncManager.MAX_SYNC_OFFSET + 2);
-            setSlaveTime(() => slave1, SpectatorCatchUpSyncManager.SYNC_TARGET);
+            setMasterTime(CatchUpSyncManager.MAX_SYNC_OFFSET + 2);
+            setSlaveTime(() => slave1, CatchUpSyncManager.SYNC_TARGET);
             assertCatchingUp(() => slave1, false);
             assertCatchingUp(() => slave2, true);
         }
@@ -104,7 +104,7 @@ namespace osu.Game.Tests.OnlinePlay
         {
             setAllWaiting(false);
 
-            setSlaveTime(() => slave1, -SpectatorCatchUpSyncManager.SYNC_TARGET);
+            setSlaveTime(() => slave1, -CatchUpSyncManager.SYNC_TARGET);
             assertCatchingUp(() => slave1, false);
             assertSlaveState(() => slave1, true);
         }
@@ -114,7 +114,7 @@ namespace osu.Game.Tests.OnlinePlay
         {
             setAllWaiting(false);
 
-            setSlaveTime(() => slave1, -SpectatorCatchUpSyncManager.SYNC_TARGET - 1);
+            setSlaveTime(() => slave1, -CatchUpSyncManager.SYNC_TARGET - 1);
 
             // This is a silent catchup, where IsCatchingUp = false but IsRunning = false also.
             assertCatchingUp(() => slave1, false);
@@ -135,7 +135,7 @@ namespace osu.Game.Tests.OnlinePlay
             assertSlaveState(() => slave1, false);
         }
 
-        private void setWaiting(Func<TestSpectatorSlaveClock> slave, bool waiting)
+        private void setWaiting(Func<TestSlaveClock> slave, bool waiting)
             => AddStep($"set slave {slave().Id} waiting = {waiting}", () => slave().WaitingOnFrames.Value = waiting);
 
         private void setAllWaiting(bool waiting) => AddStep($"set all slaves waiting = {waiting}", () =>
@@ -150,28 +150,28 @@ namespace osu.Game.Tests.OnlinePlay
         /// <summary>
         /// slave.Time = master.Time - offsetFromMaster
         /// </summary>
-        private void setSlaveTime(Func<TestSpectatorSlaveClock> slave, double offsetFromMaster)
+        private void setSlaveTime(Func<TestSlaveClock> slave, double offsetFromMaster)
             => AddStep($"set slave {slave().Id} = master - {offsetFromMaster}", () => slave().Seek(master.CurrentTime - offsetFromMaster));
 
         private void assertMasterState(bool running)
             => AddAssert($"master clock {(running ? "is" : "is not")} running", () => master.IsRunning == running);
 
-        private void assertCatchingUp(Func<TestSpectatorSlaveClock> slave, bool catchingUp) =>
+        private void assertCatchingUp(Func<TestSlaveClock> slave, bool catchingUp) =>
             AddAssert($"slave {slave().Id} {(catchingUp ? "is" : "is not")} catching up", () => slave().IsCatchingUp == catchingUp);
 
-        private void assertSlaveState(Func<TestSpectatorSlaveClock> slave, bool running)
+        private void assertSlaveState(Func<TestSlaveClock> slave, bool running)
             => AddAssert($"slave {slave().Id} {(running ? "is" : "is not")} running", () => slave().IsRunning == running);
 
-        private class TestSpectatorSlaveClock : TestManualClock, ISpectatorSlaveClock
+        private class TestSlaveClock : TestManualClock, ISlaveClock
         {
             public readonly Bindable<bool> WaitingOnFrames = new Bindable<bool>(true);
-            IBindable<bool> ISpectatorSlaveClock.WaitingOnFrames => WaitingOnFrames;
+            IBindable<bool> ISlaveClock.WaitingOnFrames => WaitingOnFrames;
 
             public bool IsCatchingUp { get; set; }
 
             public readonly int Id;
 
-            public TestSpectatorSlaveClock(int id)
+            public TestSlaveClock(int id)
             {
                 Id = id;
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index e1af95b870..23cc787e20 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         private readonly PlayerInstance[] instances;
         private MasterGameplayClockContainer masterClockContainer;
-        private ISpectatorSyncManager syncManager;
+        private ISyncManager syncManager;
         private PlayerGrid grid;
         private MultiplayerSpectatorLeaderboard leaderboard;
 
@@ -66,12 +66,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
             InternalChildren = new[]
             {
-                (Drawable)(syncManager = new SpectatorCatchUpSyncManager(masterClockContainer)),
+                (Drawable)(syncManager = new CatchUpSyncManager(masterClockContainer)),
                 masterClockContainer
             };
 
             for (int i = 0; i < UserIds.Length; i++)
-                grid.Add(instances[i] = new PlayerInstance(UserIds[i], new SpectatorCatchUpSlaveClock(masterClockContainer.GameplayClock)));
+                grid.Add(instances[i] = new PlayerInstance(UserIds[i], new CatchUpSlaveClock(masterClockContainer.GameplayClock)));
 
             // Todo: This is not quite correct - it should be per-user to adjust for other mod combinations.
             var playableBeatmap = Beatmap.Value.GetPlayableBeatmap(Ruleset.Value);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
index d4ff65cd01..55f483586c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
@@ -12,9 +12,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     public class MultiplayerSpectatorPlayer : SpectatorPlayer
     {
-        private readonly ISpectatorSlaveClock gameplayClock;
+        private readonly ISlaveClock gameplayClock;
 
-        public MultiplayerSpectatorPlayer(Score score, ISpectatorSlaveClock gameplayClock)
+        public MultiplayerSpectatorPlayer(Score score, ISlaveClock gameplayClock)
             : base(score)
         {
             this.gameplayClock = gameplayClock;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
index 31d2d458df..407732ee2e 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         public bool PlayerLoaded => stack?.CurrentScreen is Player;
 
         public readonly int UserId;
-        public readonly SpectatorCatchUpSlaveClock GameplayClock;
+        public readonly CatchUpSlaveClock GameplayClock;
 
         public Score Score { get; private set; }
 
@@ -29,7 +29,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         private readonly LoadingLayer loadingLayer;
         private OsuScreenStack stack;
 
-        public PlayerInstance(int userId, SpectatorCatchUpSlaveClock gameplayClock)
+        public PlayerInstance(int userId, CatchUpSlaveClock gameplayClock)
         {
             UserId = userId;
             GameplayClock = gameplayClock;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/SpectatorCatchUpSlaveClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSlaveClock.cs
similarity index 90%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/SpectatorCatchUpSlaveClock.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSlaveClock.cs
index 4b529021de..f128ea619b 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/SpectatorCatchUpSlaveClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSlaveClock.cs
@@ -8,9 +8,9 @@ using osu.Framework.Timing;
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
 {
     /// <summary>
-    /// A <see cref="ISpectatorSlaveClock"/> which catches up using rate adjustment.
+    /// A <see cref="ISlaveClock"/> which catches up using rate adjustment.
     /// </summary>
-    public class SpectatorCatchUpSlaveClock : ISpectatorSlaveClock
+    public class CatchUpSlaveClock : ISlaveClock
     {
         /// <summary>
         /// The catch up rate.
@@ -19,7 +19,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
 
         private readonly IFrameBasedClock masterClock;
 
-        public SpectatorCatchUpSlaveClock(IFrameBasedClock masterClock)
+        public CatchUpSlaveClock(IFrameBasedClock masterClock)
         {
             this.masterClock = masterClock;
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/SpectatorCatchUpSyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSyncManager.cs
similarity index 90%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/SpectatorCatchUpSyncManager.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSyncManager.cs
index 46e86177ca..68bfef6500 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/SpectatorCatchUpSyncManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSyncManager.cs
@@ -10,9 +10,9 @@ using osu.Framework.Timing;
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
 {
     /// <summary>
-    /// A <see cref="ISpectatorSyncManager"/> which synchronises de-synced slave clocks through catchup.
+    /// A <see cref="ISyncManager"/> which synchronises de-synced slave clocks through catchup.
     /// </summary>
-    public class SpectatorCatchUpSyncManager : Component, ISpectatorSyncManager
+    public class CatchUpSyncManager : Component, ISyncManager
     {
         /// <summary>
         /// The offset from the master clock to which slaves should be synchronised to.
@@ -37,19 +37,19 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
         /// <summary>
         /// The slave clocks.
         /// </summary>
-        private readonly List<ISpectatorSlaveClock> slaves = new List<ISpectatorSlaveClock>();
+        private readonly List<ISlaveClock> slaves = new List<ISlaveClock>();
 
         private bool hasStarted;
         private double? firstStartAttemptTime;
 
-        public SpectatorCatchUpSyncManager(IAdjustableClock master)
+        public CatchUpSyncManager(IAdjustableClock master)
         {
             Master = master;
         }
 
-        public void AddSlave(ISpectatorSlaveClock clock) => slaves.Add(clock);
+        public void AddSlave(ISlaveClock clock) => slaves.Add(clock);
 
-        public void RemoveSlave(ISpectatorSlaveClock clock) => slaves.Remove(clock);
+        public void RemoveSlave(ISlaveClock clock) => slaves.Remove(clock);
 
         protected override void Update()
         {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorSlaveClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISlaveClock.cs
similarity index 83%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorSlaveClock.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISlaveClock.cs
index d8733d4322..f45cb1fde6 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorSlaveClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISlaveClock.cs
@@ -7,9 +7,9 @@ using osu.Framework.Timing;
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
 {
     /// <summary>
-    /// A clock which is used by <see cref="MultiplayerSpectatorPlayer"/>s and managed by an <see cref="ISpectatorSyncManager"/>.
+    /// A clock which is used by <see cref="MultiplayerSpectatorPlayer"/>s and managed by an <see cref="ISyncManager"/>.
     /// </summary>
-    public interface ISpectatorSlaveClock : IFrameBasedClock, IAdjustableClock
+    public interface ISlaveClock : IFrameBasedClock, IAdjustableClock
     {
         /// <summary>
         /// Whether this clock is waiting on frames to continue playback.
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorSyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISyncManager.cs
similarity index 50%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorSyncManager.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISyncManager.cs
index 5edbb3bc2c..d63ac7e1ca 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorSyncManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISyncManager.cs
@@ -6,9 +6,9 @@ using osu.Framework.Timing;
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
 {
     /// <summary>
-    /// Manages the synchronisation between one or more <see cref="ISpectatorSlaveClock"/>s in relation to a master clock.
+    /// Manages the synchronisation between one or more <see cref="ISlaveClock"/>s in relation to a master clock.
     /// </summary>
-    public interface ISpectatorSyncManager
+    public interface ISyncManager
     {
         /// <summary>
         /// The master clock which slaves should synchronise to.
@@ -16,15 +16,15 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
         IAdjustableClock Master { get; }
 
         /// <summary>
-        /// Adds an <see cref="ISpectatorSlaveClock"/> to manage.
+        /// Adds an <see cref="ISlaveClock"/> to manage.
         /// </summary>
-        /// <param name="clock">The <see cref="ISpectatorSlaveClock"/> to add.</param>
-        void AddSlave(ISpectatorSlaveClock clock);
+        /// <param name="clock">The <see cref="ISlaveClock"/> to add.</param>
+        void AddSlave(ISlaveClock clock);
 
         /// <summary>
-        /// Removes an <see cref="ISpectatorSlaveClock"/>, stopping it from being managed by this <see cref="ISpectatorSyncManager"/>.
+        /// Removes an <see cref="ISlaveClock"/>, stopping it from being managed by this <see cref="ISyncManager"/>.
         /// </summary>
-        /// <param name="clock">The <see cref="ISpectatorSlaveClock"/> to remove.</param>
-        void RemoveSlave(ISpectatorSlaveClock clock);
+        /// <param name="clock">The <see cref="ISlaveClock"/> to remove.</param>
+        void RemoveSlave(ISlaveClock clock);
     }
 }

From 72ebcb157f585869b5b41593d0d262561ffa7369 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 22:57:27 +0900
Subject: [PATCH 2556/3722] Dispose track on dispose

---
 .../Spectate/GameplayIsolationContainer.cs            | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/GameplayIsolationContainer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/GameplayIsolationContainer.cs
index 3ccb67d342..7b6a544084 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/GameplayIsolationContainer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/GameplayIsolationContainer.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using osu.Framework.Allocation;
+using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
@@ -22,13 +23,15 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         [Cached]
         private readonly Bindable<IReadOnlyList<Mod>> mods = new Bindable<IReadOnlyList<Mod>>();
 
+        private readonly Track track;
+
         public GameplayIsolationContainer(WorkingBeatmap beatmap, RulesetInfo ruleset, IReadOnlyList<Mod> mods)
         {
             this.beatmap.Value = beatmap;
             this.ruleset.Value = ruleset;
             this.mods.Value = mods;
 
-            beatmap.LoadTrack();
+            track = beatmap.LoadTrack();
         }
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
@@ -39,5 +42,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             dependencies.CacheAs(mods.BeginLease(false));
             return dependencies;
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            track?.Dispose();
+        }
     }
 }

From 724fe3d37847ee70044e90c21c219ff79da03cc4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 22:57:34 +0900
Subject: [PATCH 2557/3722] Remove unnecessary method

---
 .../OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs   | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
index b2d114d9cc..830378f129 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
@@ -75,19 +75,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             cellContainer.Add(cell);
         }
 
-        public void Remove(Drawable content)
-        {
-            var cell = cellContainer.FirstOrDefault(c => c.Content == content);
-            if (cell == null)
-                return;
-
-            if (cell.IsMaximised)
-                toggleMaximisationState(cell);
-
-            cellContainer.Remove(cell);
-            facadeContainer.Remove(facadeContainer[cell.FacadeIndex]);
-        }
-
         /// <summary>
         /// The content added to this grid.
         /// </summary>

From d5b26b0ab506a62ececcf94781df307023ca0362 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 16 Apr 2021 23:01:34 +0900
Subject: [PATCH 2558/3722] Fix incorrect test spectator client implementation

---
 .../Visual/Multiplayer/TestSceneMultiplayerSpectator.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
index 4026258830..e395ebd29d 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
@@ -321,7 +321,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             public override void WatchUser(int userId)
             {
-                if (userSentStateDictionary.TryGetValue(userId, out var sent) && sent)
+                if (!PlayingUsers.Contains(userId) && userSentStateDictionary.TryGetValue(userId, out var sent) && sent)
                 {
                     // usually the server would do this.
                     sendState(userId, userBeatmapDictionary[userId]);

From dc899515ec7ffd460edd3a148a651c344daaf74f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 17 Apr 2021 00:56:53 +0900
Subject: [PATCH 2559/3722] Empty commit


From d5a1e00feb34dbfe3ec6a67ba5a64d51df47c905 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 17 Apr 2021 03:32:47 +0300
Subject: [PATCH 2560/3722] Improve "barrel roll" mod settings description

---
 osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
index b6cfa514a1..edf846e6ec 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.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.Linq;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
@@ -30,6 +32,8 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override string Description => "The whole playfield is on a wheel!";
         public override double ScoreMultiplier => 1;
 
+        public override string SettingDescription => $"{SpinSpeed.Value}rpm, {Direction.Value.GetDescription().ToLowerInvariant()}";
+
         public void Update(Playfield playfield)
         {
             playfield.Rotation = (Direction.Value == RotationDirection.CounterClockwise ? -1 : 1) * 360 * (float)(playfield.Time.Current / 60000 * SpinSpeed.Value);

From 78c850878486280548694a5641b29bbf59e50a71 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 17 Apr 2021 03:52:07 +0300
Subject: [PATCH 2561/3722] Remove unused using directive

gotta git gud
---
 osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
index edf846e6ec..af3986aceb 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.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 osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;

From 892a8a7cd2e2305dbfa159b0044333aa61e34507 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 17 Apr 2021 04:23:48 +0300
Subject: [PATCH 2562/3722] Remove unnecessary comma

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

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
index af3986aceb..00596e1486 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override string Description => "The whole playfield is on a wheel!";
         public override double ScoreMultiplier => 1;
 
-        public override string SettingDescription => $"{SpinSpeed.Value}rpm, {Direction.Value.GetDescription().ToLowerInvariant()}";
+        public override string SettingDescription => $"{SpinSpeed.Value}rpm {Direction.Value.GetDescription().ToLowerInvariant()}";
 
         public void Update(Playfield playfield)
         {

From c1082ddb9a7e03ac420a4cb7aa5e468dde614b22 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 17 Apr 2021 06:28:07 +0300
Subject: [PATCH 2563/3722] Add space before the unit

Co-authored-by: Joseph Madamba <madamba.joehu@outlook.com>
---
 osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
index 00596e1486..bcbb0f4366 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override string Description => "The whole playfield is on a wheel!";
         public override double ScoreMultiplier => 1;
 
-        public override string SettingDescription => $"{SpinSpeed.Value}rpm {Direction.Value.GetDescription().ToLowerInvariant()}";
+        public override string SettingDescription => $"{SpinSpeed.Value} rpm {Direction.Value.GetDescription().ToLowerInvariant()}";
 
         public void Update(Playfield playfield)
         {

From 250c7403e87f88c65139a55792902dc8d173a995 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 17 Apr 2021 13:50:00 +0200
Subject: [PATCH 2564/3722] Fix idle tracker assuming time starts at 0

`IdleTracker` in its construction quietly assumed that the clock it
receives from its parent starts ticking from 0 at the point at which it
is passed down. This is not necessarily the case when headless
executions are involved, which means that the initial state of the
tracker could be computed as idle incorrectly.

Resolve by explicitly reading the clock time at the point of
`LoadComplete()`.
---
 osu.Game/Input/IdleTracker.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Input/IdleTracker.cs b/osu.Game/Input/IdleTracker.cs
index 63a6348b57..2d6a21d1cf 100644
--- a/osu.Game/Input/IdleTracker.cs
+++ b/osu.Game/Input/IdleTracker.cs
@@ -42,6 +42,12 @@ namespace osu.Game.Input
             RelativeSizeAxes = Axes.Both;
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            updateLastInteractionTime();
+        }
+
         protected override void Update()
         {
             base.Update();

From f3ea51eeedc8113ac83c79e5f0daaa241e755f20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 17 Apr 2021 14:23:32 +0200
Subject: [PATCH 2565/3722] Adjust tests to not rely on invalid assumption

---
 osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs b/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
index 4d64c7d35d..fdee53f0be 100644
--- a/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
+++ b/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
@@ -81,6 +81,13 @@ namespace osu.Game.Tests.Visual.Components
         [Test]
         public void TestMovement()
         {
+            checkIdleStatus(1, false);
+            checkIdleStatus(2, false);
+            checkIdleStatus(3, false);
+            checkIdleStatus(4, false);
+
+            waitForAllIdle();
+
             AddStep("move to top right", () => InputManager.MoveMouseTo(box2));
 
             checkIdleStatus(1, true);
@@ -102,6 +109,8 @@ namespace osu.Game.Tests.Visual.Components
         [Test]
         public void TestTimings()
         {
+            waitForAllIdle();
+
             AddStep("move to centre", () => InputManager.MoveMouseTo(Content));
 
             checkIdleStatus(1, false);

From 6773162f17bab34cb88272d915d07b19bfab7f47 Mon Sep 17 00:00:00 2001
From: jvyden <jvyden@jvyden.xyz>
Date: Sat, 17 Apr 2021 08:47:27 -0400
Subject: [PATCH 2566/3722] Implicitly set defaults when resetting values

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

diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index 872a910837..e57b1c2fdf 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.cs
@@ -23,11 +23,11 @@ namespace osu.Game.Configuration
 
         public void ResetValues()
         {
-            SetValue(Static.LoginOverlayDisplayed, false);
-            SetValue(Static.MutedAudioNotificationShownOnce, false);
-            SetValue(Static.LowBatteryNotificationShownOnce, false);
-            SetValue(Static.LastHoverSoundPlaybackTime, (double?)null);
-            SetValue<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null);
+            GetOriginalBindable<bool>(Static.LoginOverlayDisplayed).SetDefault();
+            GetOriginalBindable<bool>(Static.MutedAudioNotificationShownOnce).SetDefault();
+            GetOriginalBindable<bool>(Static.LowBatteryNotificationShownOnce).SetDefault();
+            GetOriginalBindable<double?>(Static.LastHoverSoundPlaybackTime).SetDefault();
+            GetOriginalBindable<APISeasonalBackgrounds>(Static.SeasonalBackgrounds).SetDefault();
         }
     }
 

From cf3aaff7bd1bf796f826d18f8a56c7a07d1359c6 Mon Sep 17 00:00:00 2001
From: Fabian <lindgrenfabian@gmail.com>
Date: Sat, 17 Apr 2021 16:01:23 +0200
Subject: [PATCH 2567/3722] Add floating fruits mod

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs       |  3 ++-
 .../Mods/CatchModFloatingFruits.cs            | 23 +++++++++++++++++++
 osu.Game/Screens/Play/Player.cs               |  2 +-
 3 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index f4ddbd3021..6206815728 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -126,7 +126,8 @@ namespace osu.Game.Rulesets.Catch
                 case ModType.Fun:
                     return new Mod[]
                     {
-                        new MultiMod(new ModWindUp(), new ModWindDown())
+                        new MultiMod(new ModWindUp(), new ModWindDown()),
+                        new CatchModFloatingFruits()
                     };
 
                 default:
diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs b/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
new file mode 100644
index 0000000000..4e25739521
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
@@ -0,0 +1,23 @@
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Screens.Play;
+
+namespace osu.Game.Rulesets.Catch.Mods
+{
+    public class CatchModFloatingFruits : Mod, IApplicableToPlayer
+    {
+        public override string Name => "Floating Fruits";
+        public override string Acronym => "FF";
+        public override string Description => "The fruits are... floating?";
+        public override double ScoreMultiplier => 1;
+        public override IconUsage? Icon => FontAwesome.Brands.Fly;
+
+        public void ApplyToPlayer(Player player)
+        {
+            player.DrawableRuleset.Anchor = Anchor.Centre;
+            player.DrawableRuleset.Origin = Anchor.Centre;
+            player.DrawableRuleset.Scale = new osuTK.Vector2(1, -1);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index dd3f58439b..59231a1c30 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -110,7 +110,7 @@ namespace osu.Game.Screens.Play
 
         protected HealthProcessor HealthProcessor { get; private set; }
 
-        protected DrawableRuleset DrawableRuleset { get; private set; }
+        public DrawableRuleset DrawableRuleset { get; set; }
 
         protected HUDOverlay HUDOverlay { get; private set; }
 

From 5d274dbce86b3b8b03abb72f176e57a4209c4576 Mon Sep 17 00:00:00 2001
From: Fabian <lindgrenfabian@gmail.com>
Date: Sat, 17 Apr 2021 16:38:28 +0200
Subject: [PATCH 2568/3722] replace IApplicableToPlayer with
 IApplicableToDrawableRuleset

---
 .../Mods/CatchModFloatingFruits.cs                  | 13 ++++++++-----
 osu.Game/Screens/Play/Player.cs                     |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs b/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
index 4e25739521..4e34cbe9e2 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
@@ -1,11 +1,13 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Play;
 
 namespace osu.Game.Rulesets.Catch.Mods
 {
-    public class CatchModFloatingFruits : Mod, IApplicableToPlayer
+    public class CatchModFloatingFruits : Mod, IApplicableToDrawableRuleset<CatchHitObject>
     {
         public override string Name => "Floating Fruits";
         public override string Acronym => "FF";
@@ -13,11 +15,12 @@ namespace osu.Game.Rulesets.Catch.Mods
         public override double ScoreMultiplier => 1;
         public override IconUsage? Icon => FontAwesome.Brands.Fly;
 
-        public void ApplyToPlayer(Player player)
+        public void ApplyToDrawableRuleset(DrawableRuleset<CatchHitObject> drawableRuleset)
         {
-            player.DrawableRuleset.Anchor = Anchor.Centre;
-            player.DrawableRuleset.Origin = Anchor.Centre;
-            player.DrawableRuleset.Scale = new osuTK.Vector2(1, -1);
+            drawableRuleset.Anchor = Anchor.Centre;
+            drawableRuleset.Origin = Anchor.Centre;
+            drawableRuleset.Scale = new osuTK.Vector2(1, -1);
         }
+
     }
 }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 59231a1c30..dd3f58439b 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -110,7 +110,7 @@ namespace osu.Game.Screens.Play
 
         protected HealthProcessor HealthProcessor { get; private set; }
 
-        public DrawableRuleset DrawableRuleset { get; set; }
+        protected DrawableRuleset DrawableRuleset { get; private set; }
 
         protected HUDOverlay HUDOverlay { get; private set; }
 

From 448574e7e67cba8ead7bf1c27e0b892d9fec3754 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sat, 17 Apr 2021 17:33:53 +0200
Subject: [PATCH 2569/3722] Use `WorkingBeatmap` instead of `IBeatmap`

This lets us access things like the background, track, etc. which are necessary for quality and filesize checks.

Also improves the structure of the `CheckBackgroundTest` class in the process.
---
 .../Checks/CheckOffscreenObjectsTest.cs       | 70 ++++++++-----------
 .../Edit/Checks/CheckOffscreenObjects.cs      |  4 +-
 .../Edit/OsuBeatmapVerifier.cs                |  2 +-
 .../Editing/Checks/CheckBackgroundTest.cs     |  7 +-
 osu.Game/Rulesets/Edit/BeatmapVerifier.cs     |  2 +-
 .../Rulesets/Edit/Checks/CheckBackground.cs   | 10 +--
 .../Rulesets/Edit/Checks/Components/ICheck.cs |  4 +-
 osu.Game/Rulesets/Edit/IBeatmapVerifier.cs    |  2 +-
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs  |  3 +-
 9 files changed, 46 insertions(+), 58 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
index f9445a9a96..db347960ef 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
@@ -10,6 +10,7 @@ using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Edit.Checks;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Tests.Beatmaps;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
@@ -30,25 +31,23 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
         [Test]
         public void TestCircleInCenter()
         {
-            var beatmap = new Beatmap<HitObject>
+            assertOk(new Beatmap<HitObject>
             {
                 HitObjects = new List<HitObject>
                 {
                     new HitCircle
                     {
                         StartTime = 3000,
-                        Position = playfield_centre // Playfield is 640 x 480.
+                        Position = playfield_centre
                     }
                 }
-            };
-
-            Assert.That(check.Run(beatmap), Is.Empty);
+            });
         }
 
         [Test]
         public void TestCircleNearEdge()
         {
-            var beatmap = new Beatmap<HitObject>
+            assertOk(new Beatmap<HitObject>
             {
                 HitObjects = new List<HitObject>
                 {
@@ -58,15 +57,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                         Position = new Vector2(5, 5)
                     }
                 }
-            };
-
-            Assert.That(check.Run(beatmap), Is.Empty);
+            });
         }
 
         [Test]
         public void TestCircleNearEdgeStackedOffscreen()
         {
-            var beatmap = new Beatmap<HitObject>
+            assertOffscreenCircle(new Beatmap<HitObject>
             {
                 HitObjects = new List<HitObject>
                 {
@@ -77,15 +74,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                         StackHeight = 5
                     }
                 }
-            };
-
-            assertOffscreenCircle(beatmap);
+            });
         }
 
         [Test]
         public void TestCircleOffscreen()
         {
-            var beatmap = new Beatmap<HitObject>
+            assertOffscreenCircle(new Beatmap<HitObject>
             {
                 HitObjects = new List<HitObject>
                 {
@@ -95,15 +90,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                         Position = new Vector2(0, 0)
                     }
                 }
-            };
-
-            assertOffscreenCircle(beatmap);
+            });
         }
 
         [Test]
         public void TestSliderInCenter()
         {
-            var beatmap = new Beatmap<HitObject>
+            assertOk(new Beatmap<HitObject>
             {
                 HitObjects = new List<HitObject>
                 {
@@ -118,15 +111,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                         }),
                     }
                 }
-            };
-
-            Assert.That(check.Run(beatmap), Is.Empty);
+            });
         }
 
         [Test]
         public void TestSliderNearEdge()
         {
-            var beatmap = new Beatmap<HitObject>
+            assertOk(new Beatmap<HitObject>
             {
                 HitObjects = new List<HitObject>
                 {
@@ -141,15 +132,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                         }),
                     }
                 }
-            };
-
-            Assert.That(check.Run(beatmap), Is.Empty);
+            });
         }
 
         [Test]
         public void TestSliderNearEdgeStackedOffscreen()
         {
-            var beatmap = new Beatmap<HitObject>
+            assertOk(new Beatmap<HitObject>
             {
                 HitObjects = new List<HitObject>
                 {
@@ -165,15 +154,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                         StackHeight = 5
                     }
                 }
-            };
-
-            assertOffscreenSlider(beatmap);
+            });
         }
 
         [Test]
         public void TestSliderOffscreenStart()
         {
-            var beatmap = new Beatmap<HitObject>
+            assertOffscreenSlider(new Beatmap<HitObject>
             {
                 HitObjects = new List<HitObject>
                 {
@@ -188,15 +175,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                         }),
                     }
                 }
-            };
-
-            assertOffscreenSlider(beatmap);
+            });
         }
 
         [Test]
         public void TestSliderOffscreenEnd()
         {
-            var beatmap = new Beatmap<HitObject>
+            assertOffscreenSlider(new Beatmap<HitObject>
             {
                 HitObjects = new List<HitObject>
                 {
@@ -211,15 +196,13 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                         }),
                     }
                 }
-            };
-
-            assertOffscreenSlider(beatmap);
+            });
         }
 
         [Test]
         public void TestSliderOffscreenPath()
         {
-            var beatmap = new Beatmap<HitObject>
+            assertOffscreenSlider(new Beatmap<HitObject>
             {
                 HitObjects = new List<HitObject>
                 {
@@ -236,14 +219,17 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                         }),
                     }
                 }
-            };
+            });
+        }
 
-            assertOffscreenSlider(beatmap);
+        private void assertOk(IBeatmap beatmap)
+        {
+            Assert.That(check.Run(new TestWorkingBeatmap(beatmap)), Is.Empty);
         }
 
         private void assertOffscreenCircle(IBeatmap beatmap)
         {
-            var issues = check.Run(beatmap).ToList();
+            var issues = check.Run(new TestWorkingBeatmap(beatmap)).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckOffscreenObjects.IssueTemplateOffscreenCircle);
@@ -251,7 +237,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
 
         private void assertOffscreenSlider(IBeatmap beatmap)
         {
-            var issues = check.Run(beatmap).ToList();
+            var issues = check.Run(new TestWorkingBeatmap(beatmap)).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckOffscreenObjects.IssueTemplateOffscreenSlider);
diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index 27cae2ecc1..54b167aaf3 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -31,9 +31,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
             new IssueTemplateOffscreenSlider(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap beatmap)
+        public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap)
         {
-            foreach (var hitobject in beatmap.HitObjects)
+            foreach (var hitobject in workingBeatmap.Beatmap.HitObjects)
             {
                 switch (hitobject)
                 {
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
index 1c7ab00bbb..9b9383d547 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
@@ -17,6 +17,6 @@ namespace osu.Game.Rulesets.Osu.Edit
             new CheckOffscreenObjects()
         };
 
-        public IEnumerable<Issue> Run(IBeatmap beatmap) => checks.SelectMany(check => check.Run(beatmap));
+        public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap) => checks.SelectMany(check => check.Run(workingBeatmap));
     }
 }
diff --git a/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs b/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs
index 635e3bb0f3..d61f0989a6 100644
--- a/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs
@@ -7,6 +7,7 @@ using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit.Checks;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Tests.Beatmaps;
 
 namespace osu.Game.Tests.Editing.Checks
 {
@@ -14,13 +15,13 @@ namespace osu.Game.Tests.Editing.Checks
     public class CheckBackgroundTest
     {
         private CheckBackground check;
-        private IBeatmap beatmap;
+        private WorkingBeatmap beatmap;
 
         [SetUp]
         public void Setup()
         {
             check = new CheckBackground();
-            beatmap = new Beatmap<HitObject>
+            beatmap = new TestWorkingBeatmap(new Beatmap<HitObject>
             {
                 BeatmapInfo = new BeatmapInfo
                 {
@@ -33,7 +34,7 @@ namespace osu.Game.Tests.Editing.Checks
                         })
                     }
                 }
-            };
+            });
         }
 
         [Test]
diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index f9bced7beb..40714e8c7e 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -19,6 +19,6 @@ namespace osu.Game.Rulesets.Edit
             new CheckBackground(),
         };
 
-        public IEnumerable<Issue> Run(IBeatmap beatmap) => checks.SelectMany(check => check.Run(beatmap));
+        public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap) => checks.SelectMany(check => check.Run(workingBeatmap));
     }
 }
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
index 93da42425c..d2fffeea4e 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
@@ -18,9 +18,9 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateDoesNotExist(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap beatmap)
+        public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap)
         {
-            if (beatmap.Metadata.BackgroundFile == null)
+            if (workingBeatmap.Metadata?.BackgroundFile == null)
             {
                 yield return new IssueTemplateNoneSet(this).Create();
 
@@ -29,13 +29,13 @@ namespace osu.Game.Rulesets.Edit.Checks
 
             // If the background is set, also make sure it still exists.
 
-            var set = beatmap.BeatmapInfo.BeatmapSet;
-            var file = set.Files.FirstOrDefault(f => f.Filename == beatmap.Metadata.BackgroundFile);
+            var set = workingBeatmap.BeatmapInfo.BeatmapSet;
+            var file = set.Files.FirstOrDefault(f => f.Filename == workingBeatmap.Metadata.BackgroundFile);
 
             if (file != null)
                 yield break;
 
-            yield return new IssueTemplateDoesNotExist(this).Create(beatmap.Metadata.BackgroundFile);
+            yield return new IssueTemplateDoesNotExist(this).Create(workingBeatmap.Metadata.BackgroundFile);
         }
 
         public class IssueTemplateNoneSet : IssueTemplate
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs b/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
index f284240092..a2814ee603 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// <summary>
         /// Runs this check and returns any issues detected for the provided beatmap.
         /// </summary>
-        /// <param name="beatmap">The beatmap to run the check on.</param>
-        public IEnumerable<Issue> Run(IBeatmap beatmap);
+        /// <param name="workingBeatmap">The beatmap to run the check on.</param>
+        public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap);
     }
 }
diff --git a/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs b/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
index 61d8119635..12be8815e1 100644
--- a/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
@@ -12,6 +12,6 @@ namespace osu.Game.Rulesets.Edit
     /// </summary>
     public interface IBeatmapVerifier
     {
-        public IEnumerable<Issue> Run(IBeatmap beatmap);
+        public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap);
     }
 }
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index 550fbe2950..160a14caac 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.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.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
@@ -61,7 +62,7 @@ namespace osu.Game.Screens.Edit.Verify
             private EditorClock clock { get; set; }
 
             [Resolved]
-            protected EditorBeatmap Beatmap { get; private set; }
+            protected WorkingBeatmap Beatmap { get; private set; }
 
             [Resolved]
             private Bindable<Issue> selectedIssue { get; set; }

From 400f8b3938428d22ca25d5760214045f42b3328d Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sat, 17 Apr 2021 17:47:13 +0200
Subject: [PATCH 2570/3722] Add `GetStream` to `IWorkingBeatmap`

This is necessary to obtain the filesize of the audio and background files.
---
 osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs | 2 ++
 osu.Game.Tests/WaveformTestBeatmap.cs                       | 2 ++
 osu.Game/Beatmaps/BeatmapManager.cs                         | 1 +
 osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs          | 3 +++
 osu.Game/Beatmaps/DummyWorkingBeatmap.cs                    | 3 +++
 osu.Game/Beatmaps/WorkingBeatmap.cs                         | 3 +++
 osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs         | 2 ++
 osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs            | 2 ++
 osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs               | 3 +++
 9 files changed, 21 insertions(+)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
index 920cc36776..a18f82fe4a 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
@@ -168,6 +168,8 @@ namespace osu.Game.Tests.Beatmaps.Formats
             protected override Texture GetBackground() => throw new NotImplementedException();
 
             protected override Track GetBeatmapTrack() => throw new NotImplementedException();
+
+            public override Stream GetStream(string storagePath) => throw new NotImplementedException();
         }
     }
 }
diff --git a/osu.Game.Tests/WaveformTestBeatmap.cs b/osu.Game.Tests/WaveformTestBeatmap.cs
index 8c8c827404..cbed28641c 100644
--- a/osu.Game.Tests/WaveformTestBeatmap.cs
+++ b/osu.Game.Tests/WaveformTestBeatmap.cs
@@ -52,6 +52,8 @@ namespace osu.Game.Tests
 
         protected override Waveform GetWaveform() => new Waveform(trackStore.GetStream(firstAudioFile));
 
+        public override Stream GetStream(string storagePath) => null;
+
         protected override Track GetBeatmapTrack() => trackStore.Get(firstAudioFile);
 
         private string firstAudioFile
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index b4ea898b7d..5e975de77c 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -526,6 +526,7 @@ namespace osu.Game.Beatmaps
             protected override IBeatmap GetBeatmap() => beatmap;
             protected override Texture GetBackground() => null;
             protected override Track GetBeatmapTrack() => null;
+            public override Stream GetStream(string storagePath) => null;
         }
     }
 
diff --git a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
index 62cf29dc03..c1fc7a72e2 100644
--- a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using System.IO;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Logging;
@@ -142,6 +143,8 @@ namespace osu.Game.Beatmaps
                     return null;
                 }
             }
+
+            public override Stream GetStream(string storagePath) => resources.Files.GetStream(storagePath);
         }
     }
 }
diff --git a/osu.Game/Beatmaps/DummyWorkingBeatmap.cs b/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
index c114358771..6922d1c286 100644
--- a/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/DummyWorkingBeatmap.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Threading;
 using JetBrains.Annotations;
 using osu.Framework.Audio;
@@ -48,6 +49,8 @@ namespace osu.Game.Beatmaps
 
         protected override Track GetBeatmapTrack() => GetVirtualTrack();
 
+        public override Stream GetStream(string storagePath) => null;
+
         private class DummyRulesetInfo : RulesetInfo
         {
             public override Ruleset CreateInstance() => new DummyRuleset();
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index f7f276230f..e0eeaf6db0 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -326,6 +327,8 @@ namespace osu.Game.Beatmaps
         protected virtual ISkin GetSkin() => new DefaultSkin();
         private readonly RecyclableLazy<ISkin> skin;
 
+        public abstract Stream GetStream(string storagePath);
+
         public class RecyclableLazy<T>
         {
             private Lazy<T> lazy;
diff --git a/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs b/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
index f2e0320ce3..66784fda54 100644
--- a/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
+++ b/osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
@@ -116,6 +116,8 @@ namespace osu.Game.Screens.Edit
             protected override Texture GetBackground() => throw new NotImplementedException();
 
             protected override Track GetBeatmapTrack() => throw new NotImplementedException();
+
+            public override Stream GetStream(string storagePath) => throw new NotImplementedException();
         }
     }
 }
diff --git a/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs b/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
index 5ef2458919..1c5e551042 100644
--- a/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
+++ b/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
@@ -215,6 +215,8 @@ namespace osu.Game.Tests.Beatmaps
 
             protected override Track GetBeatmapTrack() => throw new NotImplementedException();
 
+            public override Stream GetStream(string storagePath) => throw new NotImplementedException();
+
             protected override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap, Ruleset ruleset)
             {
                 var converter = base.CreateBeatmapConverter(beatmap, ruleset);
diff --git a/osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs b/osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs
index bfcb2403c1..852006bc9b 100644
--- a/osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs
+++ b/osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.IO;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
@@ -35,6 +36,8 @@ namespace osu.Game.Tests.Beatmaps
 
         protected override Storyboard GetStoryboard() => storyboard ?? base.GetStoryboard();
 
+        public override Stream GetStream(string storagePath) => null;
+
         protected override Texture GetBackground() => null;
 
         protected override Track GetBeatmapTrack() => null;

From b36da2664c2be2e9be6a2c69383dc3b95d459080 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sat, 17 Apr 2021 17:49:10 +0200
Subject: [PATCH 2571/3722] Add `GetPathForFile` to `BeatmapSetInfo`

This is used in several places, and so should probably have a function rather than remaining as duplicated code.

Also applies this together with the previous commit to `BeatmapManagerWorkingBeatmap`.
---
 .../Beatmaps/BeatmapManager_WorkingBeatmap.cs     | 15 ++++++---------
 osu.Game/Beatmaps/BeatmapSetInfo.cs               |  2 ++
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
index c1fc7a72e2..d78ffbbfb6 100644
--- a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Diagnostics.CodeAnalysis;
-using System.Linq;
 using System.IO;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
@@ -37,7 +36,7 @@ namespace osu.Game.Beatmaps
 
                 try
                 {
-                    using (var stream = new LineBufferedReader(resources.Files.GetStream(getPathForFile(BeatmapInfo.Path))))
+                    using (var stream = new LineBufferedReader(GetStream(BeatmapSetInfo.GetPathForFile(BeatmapInfo.Path))))
                         return Decoder.GetDecoder<Beatmap>(stream).Decode(stream);
                 }
                 catch (Exception e)
@@ -47,8 +46,6 @@ namespace osu.Game.Beatmaps
                 }
             }
 
-            private string getPathForFile(string filename) => BeatmapSetInfo.Files.SingleOrDefault(f => string.Equals(f.Filename, filename, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;
-
             protected override bool BackgroundStillValid(Texture b) => false; // bypass lazy logic. we want to return a new background each time for refcounting purposes.
 
             protected override Texture GetBackground()
@@ -58,7 +55,7 @@ namespace osu.Game.Beatmaps
 
                 try
                 {
-                    return resources.LargeTextureStore.Get(getPathForFile(Metadata.BackgroundFile));
+                    return resources.LargeTextureStore.Get(BeatmapSetInfo.GetPathForFile(Metadata.BackgroundFile));
                 }
                 catch (Exception e)
                 {
@@ -74,7 +71,7 @@ namespace osu.Game.Beatmaps
 
                 try
                 {
-                    return resources.Tracks.Get(getPathForFile(Metadata.AudioFile));
+                    return resources.Tracks.Get(BeatmapSetInfo.GetPathForFile(Metadata.AudioFile));
                 }
                 catch (Exception e)
                 {
@@ -90,7 +87,7 @@ namespace osu.Game.Beatmaps
 
                 try
                 {
-                    var trackData = resources.Files.GetStream(getPathForFile(Metadata.AudioFile));
+                    var trackData = GetStream(BeatmapSetInfo.GetPathForFile(Metadata.AudioFile));
                     return trackData == null ? null : new Waveform(trackData);
                 }
                 catch (Exception e)
@@ -106,7 +103,7 @@ namespace osu.Game.Beatmaps
 
                 try
                 {
-                    using (var stream = new LineBufferedReader(resources.Files.GetStream(getPathForFile(BeatmapInfo.Path))))
+                    using (var stream = new LineBufferedReader(GetStream(BeatmapSetInfo.GetPathForFile(BeatmapInfo.Path))))
                     {
                         var decoder = Decoder.GetDecoder<Storyboard>(stream);
 
@@ -115,7 +112,7 @@ namespace osu.Game.Beatmaps
                             storyboard = decoder.Decode(stream);
                         else
                         {
-                            using (var secondaryStream = new LineBufferedReader(resources.Files.GetStream(getPathForFile(BeatmapSetInfo.StoryboardFile))))
+                            using (var secondaryStream = new LineBufferedReader(GetStream(BeatmapSetInfo.GetPathForFile(BeatmapSetInfo.StoryboardFile))))
                                 storyboard = decoder.Decode(stream, secondaryStream);
                         }
                     }
diff --git a/osu.Game/Beatmaps/BeatmapSetInfo.cs b/osu.Game/Beatmaps/BeatmapSetInfo.cs
index 7bc1c8c7b9..774bd0bc62 100644
--- a/osu.Game/Beatmaps/BeatmapSetInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapSetInfo.cs
@@ -59,6 +59,8 @@ namespace osu.Game.Beatmaps
 
         public string StoryboardFile => Files?.Find(f => f.Filename.EndsWith(".osb", StringComparison.OrdinalIgnoreCase))?.Filename;
 
+        public string GetPathForFile(string filename) => Files?.SingleOrDefault(f => string.Equals(f.Filename, filename, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;
+
         public List<BeatmapSetFileInfo> Files { get; set; }
 
         public override string ToString() => Metadata?.ToString() ?? base.ToString();

From 62c54e00cb7eee3b424e965a09462431ab03cf9c Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sat, 17 Apr 2021 18:01:04 +0200
Subject: [PATCH 2572/3722] Add check for background resolution and filesize

---
 osu.Game/Rulesets/Edit/BeatmapVerifier.cs     |  1 +
 .../Edit/Checks/CheckBackgroundQuality.cs     | 98 +++++++++++++++++++
 2 files changed, 99 insertions(+)
 create mode 100644 osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs

diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index 40714e8c7e..24a4f473de 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -17,6 +17,7 @@ namespace osu.Game.Rulesets.Edit
         private readonly List<ICheck> checks = new List<ICheck>
         {
             new CheckBackground(),
+            new CheckBackgroundQuality()
         };
 
         public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap) => checks.SelectMany(check => check.Run(workingBeatmap));
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
new file mode 100644
index 0000000000..ed504f52ed
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.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.Collections.Generic;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit.Checks.Components;
+
+namespace osu.Game.Rulesets.Edit.Checks
+{
+    public class CheckBackgroundQuality : ICheck
+    {
+        // These are the requirements as stated in the Ranking Criteria.
+        // See https://osu.ppy.sh/wiki/en/Ranking_Criteria#rules.5
+        private const int min_width = 160;
+        private const int max_width = 2560;
+        private const int min_height = 120;
+        private const int max_height = 1440;
+        private const double max_filesize_mb = 2.5d;
+
+        // It's usually possible to find a higher resolution of the same image if lower than these.
+        private const int low_width = 960;
+        private const int low_height = 540;
+
+        public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Resources, "Too high or low background resolution");
+
+        public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
+        {
+            new IssueTemplateTooHighResolution(this),
+            new IssueTemplateTooLowResolution(this),
+            new IssueTemplateTooUncompressed(this)
+        };
+
+        public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap)
+        {
+            if (workingBeatmap.Metadata?.BackgroundFile == null)
+                yield break;
+
+            var texture = workingBeatmap.Background;
+            if (texture == null)
+                yield break;
+
+            if (texture.Width > max_width || texture.Height > max_height)
+                yield return new IssueTemplateTooHighResolution(this).Create(texture.Width, texture.Height);
+
+            if (texture.Width < min_width || texture.Height < min_height)
+                yield return new IssueTemplateTooLowResolution(this).Create(texture.Width, texture.Height);
+
+            if (texture.Width < low_width || texture.Height < low_height)
+                yield return new IssueTemplateLowResolution(this).Create(texture.Width, texture.Height);
+
+            string storagePath = workingBeatmap.BeatmapInfo.BeatmapSet.GetPathForFile(workingBeatmap.Metadata.BackgroundFile);
+            double filesizeMb = workingBeatmap.GetStream(storagePath).Length / (1024d * 1024d);
+
+            if (filesizeMb > max_filesize_mb)
+                yield return new IssueTemplateTooUncompressed(this).Create(filesizeMb);
+        }
+
+        public class IssueTemplateTooHighResolution : IssueTemplate
+        {
+            public IssueTemplateTooHighResolution(ICheck check)
+                : base(check, IssueType.Problem, "The background resolution ({0} x {1}) exceeds {2} x {3}.")
+            {
+            }
+
+            public Issue Create(double width, double height) => new Issue(this, width, height, max_width, max_height);
+        }
+
+        public class IssueTemplateTooLowResolution : IssueTemplate
+        {
+            public IssueTemplateTooLowResolution(ICheck check)
+                : base(check, IssueType.Problem, "The background resolution ({0} x {1}) is lower than {2} x {3}.")
+            {
+            }
+
+            public Issue Create(double width, double height) => new Issue(this, width, height, min_width, min_height);
+        }
+
+        public class IssueTemplateLowResolution : IssueTemplate
+        {
+            public IssueTemplateLowResolution(ICheck check)
+                : base(check, IssueType.Warning, "The background resolution ({0} x {1}) is lower than {2} x {3}.")
+            {
+            }
+
+            public Issue Create(double width, double height) => new Issue(this, width, height, low_width, low_height);
+        }
+
+        public class IssueTemplateTooUncompressed : IssueTemplate
+        {
+            public IssueTemplateTooUncompressed(ICheck check)
+                : base(check, IssueType.Problem, "The background filesize ({0:0.#} MB) exceeds {1} MB.")
+            {
+            }
+
+            public Issue Create(double actualMb) => new Issue(this, actualMb, max_filesize_mb);
+        }
+    }
+}

From 512cec3458f53c29b135d65d49a4af8b86be8fe2 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sun, 18 Apr 2021 00:08:16 +0800
Subject: [PATCH 2573/3722] Use unicode for playlists

---
 .../Screens/OnlinePlay/DrawableRoomPlaylistItem.cs   | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index 23c713a2c1..4fccf45fda 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -13,11 +13,13 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Framework.Threading;
 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.Chat;
@@ -105,10 +107,18 @@ namespace osu.Game.Screens.OnlinePlay
 
         private void refresh()
         {
+            var beatmapMetadata = Item.Beatmap.Value.Metadata ?? Item.Beatmap.Value.BeatmapSet?.Metadata;
             difficultyIconContainer.Child = new DifficultyIcon(beatmap.Value, ruleset.Value, requiredMods) { Size = new Vector2(32) };
 
             beatmapText.Clear();
-            beatmapText.AddLink(Item.Beatmap.ToString(), LinkAction.OpenBeatmap, Item.Beatmap.Value.OnlineBeatmapID.ToString());
+            var text = new List<SpriteText>
+            {
+                new OsuSpriteText { Text = new RomanisableString(beatmapMetadata.ArtistUnicode, beatmapMetadata.Artist) },
+                new OsuSpriteText { Text = " - " },
+                new OsuSpriteText { Text = new RomanisableString(beatmapMetadata.TitleUnicode, beatmapMetadata.Title) },
+                new OsuSpriteText { Text = $" ({beatmapMetadata.Author}) [{Item.Beatmap.Value.Version}]" }
+            };
+            beatmapText.AddLink(text, LinkAction.OpenBeatmap, Item.Beatmap.Value.OnlineBeatmapID.ToString());
 
             authorText.Clear();
 

From 81be562379d5bb60023be3f20ecb1f8990993ef9 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Sat, 17 Apr 2021 12:28:31 -0400
Subject: [PATCH 2574/3722] Read StoryboardEndTime directly from Beatmap

---
 osu.Game/Screens/Play/GameplayClockContainer.cs | 5 -----
 osu.Game/Screens/Play/Player.cs                 | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 95419c0b35..ddbb087962 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -228,11 +228,6 @@ namespace osu.Game.Screens.Play
             adjustableClock.ChangeSource(track);
         }
 
-        /// <summary>
-        /// Gets the endtime of the last element in the storyboard in ms, or start time of the last hitobject if there's no storyboard.
-        /// </summary>
-        public double StoryboardEndTime => beatmap.Storyboard.LatestEventTime ?? 0;
-
         protected override void Update()
         {
             if (!IsPaused.Value)
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 7ad9c1a8af..e998f33cc1 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -366,7 +366,7 @@ namespace osu.Game.Screens.Play
                     {
                         RequestSkip = performUserRequestedSkip
                     },
-                    skipOutroOverlay = new SkipOverlay(GameplayClockContainer.StoryboardEndTime)
+                    skipOutroOverlay = new SkipOverlay(Beatmap.Value.Storyboard.LatestEventTime ?? 0)
                     {
                         RequestSkip = scheduleCompletion
                     },

From 5a015290b9721e151a689abd29162d2deab1ad18 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Sat, 17 Apr 2021 12:34:38 -0400
Subject: [PATCH 2575/3722] Add remarks back to LatestEventTime

---
 osu.Game/Storyboards/Storyboard.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index 4fa64b7c34..0b02a4921b 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -40,6 +40,10 @@ namespace osu.Game.Storyboards
         /// Across all layers, find the latest point in time that a storyboard element ends at.
         /// Will return null if there are no elements.
         /// </summary>
+        /// <remarks>
+        /// This iterates all elements and as such should be used sparingly or stored locally.
+        /// Videos and samples return StartTime as their EndTIme.
+        /// </remarks>
         public double? LatestEventTime => Layers.SelectMany(l => l.Elements.OfType<IStoryboardElementHasDuration>()).OrderByDescending(e => e.EndTime).FirstOrDefault()?.EndTime;
 
         /// <summary>

From 7f5b1e84a16d42763f20ecb69359213e4d6868c9 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Sat, 17 Apr 2021 13:57:32 -0400
Subject: [PATCH 2576/3722] Update TestSceneStoryboardWithOutro.cs

- Construct storyboard in CreateWorkingBeatmap()
- Use GameplayClockContainer.GameplayClock.CurrentTime
- Remove unnecessary lines
---
 .../Gameplay/TestSceneStoryboardWithOutro.cs  | 39 +++++++------------
 1 file changed, 15 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
index 27d203d5d6..16474d23ea 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
@@ -3,7 +3,6 @@
 
 using System.Threading.Tasks;
 using NUnit.Framework;
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
@@ -13,7 +12,6 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Scoring;
-using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
 using osu.Game.Storyboards;
 using osuTK;
@@ -24,28 +22,14 @@ namespace osu.Game.Tests.Visual.Gameplay
     {
         protected new OutroPlayer Player => (OutroPlayer)base.Player;
 
-        private Storyboard storyboard;
-
         private const double storyboard_duration = 2000;
 
-        [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
-        {
-            config.SetValue(OsuSetting.ShowStoryboard, true);
-            storyboard = new Storyboard();
-            var sprite = new StoryboardSprite("unknown", Anchor.TopLeft, Vector2.Zero);
-            sprite.TimelineGroup.Alpha.Add(Easing.None, 0, storyboard_duration, 1, 0);
-            storyboard.GetLayer("Background").Add(sprite);
-        }
-
         [SetUpSteps]
         public override void SetUpSteps()
         {
             base.SetUpSteps();
-            AddStep("ignore user settings", () =>
-            {
-                Player.DimmableStoryboard.IgnoreUserSettings.Value = true;
-            });
+            AddStep("enable storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, true));
+            AddStep("set dim level to 0", () => LocalConfig.SetValue<double>(OsuSetting.DimLevel, 0));
         }
 
         [Test]
@@ -61,7 +45,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestStoryboardNoSkipOutro()
         {
             AddUntilStep("storyboard loaded", () => Player.Beatmap.Value.StoryboardLoaded);
-            AddUntilStep("storyboard ends", () => Player.HUDOverlay.Progress.ReferenceClock.CurrentTime >= storyboard_duration);
+            AddUntilStep("storyboard ends", () => Player.GameplayClockContainer.GameplayClock.CurrentTime >= storyboard_duration);
             AddUntilStep("wait for score shown", () => Player.IsScoreShown);
         }
 
@@ -87,8 +71,18 @@ namespace osu.Game.Tests.Visual.Gameplay
             return beatmap;
         }
 
-        protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null) =>
-            new ClockBackedTestWorkingBeatmap(beatmap, storyboard ?? this.storyboard, Clock, Audio);
+        protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
+        {
+            if (storyboard == null)
+            {
+                storyboard = new Storyboard();
+                var sprite = new StoryboardSprite("unknown", Anchor.TopLeft, Vector2.Zero);
+                sprite.TimelineGroup.Alpha.Add(Easing.None, 0, storyboard_duration, 1, 0);
+                storyboard.GetLayer("Background").Add(sprite);
+            }
+
+            return base.CreateWorkingBeatmap(beatmap, storyboard);
+        }
 
         protected class OutroPlayer : TestPlayer
         {
@@ -96,8 +90,6 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public bool IsScoreShown => !this.IsCurrentScreen() && this.GetChildScreen() is ResultsScreen;
 
-            public new DimmableStoryboard DimmableStoryboard => base.DimmableStoryboard;
-
             public OutroPlayer()
                 : base(false)
             {
@@ -105,7 +97,6 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             protected override Task ImportScore(Score score)
             {
-                // avoid database errors from trying to store the score
                 return Task.CompletedTask;
             }
         }

From cb41c89935a4e7b0e76865efd6e8dd36ceb22124 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sat, 17 Apr 2021 20:10:07 +0200
Subject: [PATCH 2577/3722] Don't return low res and too low res at the same
 time

---
 osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
index ed504f52ed..a3f363554e 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
@@ -44,8 +44,7 @@ namespace osu.Game.Rulesets.Edit.Checks
 
             if (texture.Width < min_width || texture.Height < min_height)
                 yield return new IssueTemplateTooLowResolution(this).Create(texture.Width, texture.Height);
-
-            if (texture.Width < low_width || texture.Height < low_height)
+            else if (texture.Width < low_width || texture.Height < low_height)
                 yield return new IssueTemplateLowResolution(this).Create(texture.Width, texture.Height);
 
             string storagePath = workingBeatmap.BeatmapInfo.BeatmapSet.GetPathForFile(workingBeatmap.Metadata.BackgroundFile);

From e40cb6797df3896d6179dc0f85edef8168c5ee09 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Sat, 17 Apr 2021 15:27:22 -0400
Subject: [PATCH 2578/3722] Use GetEndTime() to get storyboard endtime

---
 osu.Game/Storyboards/IStoryboardElement.cs          | 13 +++++++++++++
 .../Storyboards/IStoryboardElementHasDuration.cs    |  3 +++
 osu.Game/Storyboards/Storyboard.cs                  |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Storyboards/IStoryboardElement.cs b/osu.Game/Storyboards/IStoryboardElement.cs
index c4c150a8a4..377ad57ab2 100644
--- a/osu.Game/Storyboards/IStoryboardElement.cs
+++ b/osu.Game/Storyboards/IStoryboardElement.cs
@@ -14,4 +14,17 @@ namespace osu.Game.Storyboards
 
         Drawable CreateDrawable();
     }
+
+    public static class StoryboardElementExtensions
+    {
+        /// <summary>
+        /// Returns the end time of this object.
+        /// </summary>
+        /// <remarks>
+        /// This returns the <see cref="IStoryboardElementHasDuration.EndTime"/> where available, falling back to <see cref="IStoryboardElement.StartTime"/> otherwise.
+        /// </remarks>
+        /// <param name="storyboardElement">The object.</param>
+        /// <returns>The end time of this object.</returns>
+        public static double GetEndTime(this IStoryboardElement storyboardElement) => (storyboardElement as IStoryboardElementHasDuration)?.EndTime ?? storyboardElement.StartTime;
+    }
 }
diff --git a/osu.Game/Storyboards/IStoryboardElementHasDuration.cs b/osu.Game/Storyboards/IStoryboardElementHasDuration.cs
index e6ee373812..daa0c55704 100644
--- a/osu.Game/Storyboards/IStoryboardElementHasDuration.cs
+++ b/osu.Game/Storyboards/IStoryboardElementHasDuration.cs
@@ -3,6 +3,9 @@
 
 namespace osu.Game.Storyboards
 {
+    /// <summary>
+    /// A StoryboardElement that ends at a different time than its start time.
+    /// </summary>
     public interface IStoryboardElementHasDuration
     {
         double EndTime { get; }
diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index 0b02a4921b..bc61f704dd 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Storyboards
         /// This iterates all elements and as such should be used sparingly or stored locally.
         /// Videos and samples return StartTime as their EndTIme.
         /// </remarks>
-        public double? LatestEventTime => Layers.SelectMany(l => l.Elements.OfType<IStoryboardElementHasDuration>()).OrderByDescending(e => e.EndTime).FirstOrDefault()?.EndTime;
+        public double? LatestEventTime => Layers.SelectMany(l => l.Elements).OrderBy(e => e.GetEndTime()).LastOrDefault()?.GetEndTime();
 
         /// <summary>
         /// Depth of the currently front-most storyboard layer, excluding the overlay layer.

From fdcb5e924c9153de2065731689d902d887652bca Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Sat, 17 Apr 2021 17:45:38 -0400
Subject: [PATCH 2579/3722] Initialize skipOutroOverlay with alpha 0, other
 small changes

---
 osu.Game/Screens/Play/Player.cs | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index e998f33cc1..ef0caa2fa3 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -247,6 +247,7 @@ namespace osu.Game.Screens.Play
                 HUDOverlay.ShowHud.Disabled = true;
                 BreakOverlay.Hide();
                 skipIntroOverlay.Hide();
+                skipOutroOverlay.Hide();
             }
 
             DrawableRuleset.FrameStableClock.WaitingOnFrames.BindValueChanged(waiting =>
@@ -368,7 +369,8 @@ namespace osu.Game.Screens.Play
                     },
                     skipOutroOverlay = new SkipOverlay(Beatmap.Value.Storyboard.LatestEventTime ?? 0)
                     {
-                        RequestSkip = scheduleCompletion
+                        RequestSkip = scheduleCompletion,
+                        Alpha = 0
                     },
                     FailOverlay = new FailOverlay
                     {
@@ -416,8 +418,6 @@ namespace osu.Game.Screens.Play
                 });
             }
 
-            skipOutroOverlay.Hide();
-
             return container;
         }
 
@@ -539,13 +539,9 @@ namespace osu.Game.Screens.Play
                     return;
                 }
 
-                // show the score if in storyboard outro (score has been set)
-                bool scoreReady = prepareScoreForDisplayTask != null && prepareScoreForDisplayTask.IsCompleted;
-
-                if (scoreReady)
-                {
+                // if the score is ready for display but results screen has not been pushed yet (e.g. storyboard is still playing beyond gameplay), then transition to results screen instead of exiting.
+                if (prepareScoreForDisplayTask != null)
                     scheduleCompletion();
-                }
             }
 
             this.Exit();
@@ -639,7 +635,6 @@ namespace osu.Game.Screens.Play
             if (storyboardHasOutro)
             {
                 skipOutroOverlay.Show();
-                completionProgressDelegate = null;
                 return;
             }
 

From eec77b052790f720fa716d10b96aad540b9cb083 Mon Sep 17 00:00:00 2001
From: Fabian <lindgrenfabian@gmail.com>
Date: Sat, 17 Apr 2021 23:55:39 +0200
Subject: [PATCH 2580/3722] replace icon

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

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs b/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
index 4e34cbe9e2..4c46e24f1b 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Catch.Mods
         public override string Acronym => "FF";
         public override string Description => "The fruits are... floating?";
         public override double ScoreMultiplier => 1;
-        public override IconUsage? Icon => FontAwesome.Brands.Fly;
+        public override IconUsage? Icon => FontAwesome.Solid.Cloud;
 
         public void ApplyToDrawableRuleset(DrawableRuleset<CatchHitObject> drawableRuleset)
         {

From 97bacbdc760942ccb7052441b249f6a1c87ce2bd Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Sat, 17 Apr 2021 17:55:46 -0400
Subject: [PATCH 2581/3722] Show score after the end of the storyboard after it
 was toggled

---
 osu.Game/Screens/Play/DimmableStoryboard.cs          |  3 ++-
 osu.Game/Storyboards/Drawables/DrawableStoryboard.cs | 10 ++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Play/DimmableStoryboard.cs b/osu.Game/Screens/Play/DimmableStoryboard.cs
index bebde1b15b..73b4153601 100644
--- a/osu.Game/Screens/Play/DimmableStoryboard.cs
+++ b/osu.Game/Screens/Play/DimmableStoryboard.cs
@@ -50,6 +50,7 @@ namespace osu.Game.Screens.Play
                 return;
 
             drawableStoryboard = storyboard.CreateDrawable();
+            HasStoryboardEnded.BindTo(drawableStoryboard.HasStoryboardEnded);
 
             if (async)
                 LoadComponentAsync(drawableStoryboard, onStoryboardCreated);
@@ -63,6 +64,6 @@ namespace osu.Game.Screens.Play
             OverlayLayerContainer.Add(storyboard.OverlayLayer.CreateProxy());
         }
 
-        public IBindable<bool> HasStoryboardEnded => drawableStoryboard?.HasStoryboardEnded;
+        public IBindable<bool> HasStoryboardEnded = new BindableBool(true);
     }
 }
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
index 08c2bf1b4a..abfb4598ec 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
@@ -95,15 +95,13 @@ namespace osu.Game.Storyboards.Drawables
         /// </summary>
         public IBindable<bool> HasStoryboardEnded => hasStoryboardEnded;
 
-        private readonly BindableBool hasStoryboardEnded = new BindableBool(true);
+        private readonly BindableBool hasStoryboardEnded = new BindableBool();
 
         private void updateHasStoryboardEnded()
         {
-            if (Storyboard.LatestEventTime == null)
-                return;
-
-            var time = Clock.CurrentTime;
-            hasStoryboardEnded.Value = time >= Storyboard.LatestEventTime;
+            hasStoryboardEnded.Value =
+                Storyboard.LatestEventTime == null ||
+                Time.Current >= Storyboard.LatestEventTime;
         }
     }
 }

From bf8789528ae81cd332416ab0ed11572c53693a4a Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sun, 18 Apr 2021 01:13:57 +0200
Subject: [PATCH 2582/3722] Add `GetStream` to `IWorkingBeatmap`

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

diff --git a/osu.Game/Beatmaps/IWorkingBeatmap.cs b/osu.Game/Beatmaps/IWorkingBeatmap.cs
index bcd94d76fd..f1bf6f48ef 100644
--- a/osu.Game/Beatmaps/IWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/IWorkingBeatmap.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Rulesets;
@@ -67,5 +68,7 @@ namespace osu.Game.Beatmaps
         /// </remarks>
         /// <returns>A fresh track instance, which will also be available via <see cref="Track"/>.</returns>
         Track LoadTrack();
+
+        Stream GetStream(string storagePath);
     }
 }

From ef65c8910f0a6a9d76327810c70733630aed8c25 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sun, 18 Apr 2021 01:15:13 +0200
Subject: [PATCH 2583/3722] Fix resolved fields

---
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index 160a14caac..6aa479b38d 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -62,7 +62,10 @@ namespace osu.Game.Screens.Edit.Verify
             private EditorClock clock { get; set; }
 
             [Resolved]
-            protected WorkingBeatmap Beatmap { get; private set; }
+            private BeatmapManager beatmapManager { get; set; }
+
+            [Resolved]
+            private EditorBeatmap beatmap { get; set; }
 
             [Resolved]
             private Bindable<Issue> selectedIssue { get; set; }
@@ -74,7 +77,7 @@ namespace osu.Game.Screens.Edit.Verify
             private void load(OsuColour colours)
             {
                 generalVerifier = new BeatmapVerifier();
-                rulesetVerifier = Beatmap.BeatmapInfo.Ruleset?.CreateInstance()?.CreateBeatmapVerifier();
+                rulesetVerifier = beatmap.BeatmapInfo.Ruleset?.CreateInstance()?.CreateBeatmapVerifier();
 
                 RelativeSizeAxes = Axes.Both;
 
@@ -120,10 +123,11 @@ namespace osu.Game.Screens.Edit.Verify
 
             private void refresh()
             {
-                var issues = generalVerifier.Run(Beatmap);
+                var workingBeatmap = beatmapManager.GetWorkingBeatmap(beatmap.BeatmapInfo);
+                var issues = generalVerifier.Run(workingBeatmap);
 
                 if (rulesetVerifier != null)
-                    issues = issues.Concat(rulesetVerifier.Run(Beatmap));
+                    issues = issues.Concat(rulesetVerifier.Run(workingBeatmap));
 
                 table.Issues = issues
                                .OrderBy(issue => issue.Template.Type)

From abf512532e2f8d7e79d8b8fafe419b651fb1f896 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sun, 18 Apr 2021 01:19:25 +0200
Subject: [PATCH 2584/3722] Clean up check logic

Makes use of the new `BeatmapSet.GetPathForFile` method and removes dependency on `WorkingBeatmap` specifically, allowing us to switch to `IWorkingBeatmap` later.
---
 osu.Game/Rulesets/Edit/Checks/CheckBackground.cs   | 14 ++++++--------
 .../Rulesets/Edit/Checks/CheckBackgroundQuality.cs |  5 +++--
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
index d2fffeea4e..637e603e17 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackground.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.Game.Beatmaps;
 using osu.Game.Rulesets.Edit.Checks.Components;
 
@@ -20,7 +19,9 @@ namespace osu.Game.Rulesets.Edit.Checks
 
         public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap)
         {
-            if (workingBeatmap.Metadata?.BackgroundFile == null)
+            string backgroundFile = workingBeatmap.Beatmap.Metadata?.BackgroundFile;
+
+            if (backgroundFile == null)
             {
                 yield return new IssueTemplateNoneSet(this).Create();
 
@@ -28,14 +29,11 @@ namespace osu.Game.Rulesets.Edit.Checks
             }
 
             // If the background is set, also make sure it still exists.
-
-            var set = workingBeatmap.BeatmapInfo.BeatmapSet;
-            var file = set.Files.FirstOrDefault(f => f.Filename == workingBeatmap.Metadata.BackgroundFile);
-
-            if (file != null)
+            var storagePath = workingBeatmap.Beatmap.BeatmapInfo.BeatmapSet.GetPathForFile(backgroundFile);
+            if (storagePath != null)
                 yield break;
 
-            yield return new IssueTemplateDoesNotExist(this).Create(workingBeatmap.Metadata.BackgroundFile);
+            yield return new IssueTemplateDoesNotExist(this).Create(backgroundFile);
         }
 
         public class IssueTemplateNoneSet : IssueTemplate
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
index a3f363554e..48d536079a 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
@@ -32,7 +32,8 @@ namespace osu.Game.Rulesets.Edit.Checks
 
         public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap)
         {
-            if (workingBeatmap.Metadata?.BackgroundFile == null)
+            var backgroundFile = workingBeatmap.Beatmap.Metadata?.BackgroundFile;
+            if (backgroundFile == null)
                 yield break;
 
             var texture = workingBeatmap.Background;
@@ -47,7 +48,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             else if (texture.Width < low_width || texture.Height < low_height)
                 yield return new IssueTemplateLowResolution(this).Create(texture.Width, texture.Height);
 
-            string storagePath = workingBeatmap.BeatmapInfo.BeatmapSet.GetPathForFile(workingBeatmap.Metadata.BackgroundFile);
+            string storagePath = workingBeatmap.Beatmap.BeatmapInfo.BeatmapSet.GetPathForFile(backgroundFile);
             double filesizeMb = workingBeatmap.GetStream(storagePath).Length / (1024d * 1024d);
 
             if (filesizeMb > max_filesize_mb)

From 56bf49c85c525547c6ebe8bb1656b69e1cd2b0ec Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sun, 18 Apr 2021 01:21:20 +0200
Subject: [PATCH 2585/3722] Take `IWorkingBeatmap` instead of `WorkingBeatmap`

This makes testing much easier, and allows for checking of any class deriving from that interface, including `WorkingBeatmap`.
---
 osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs | 2 +-
 osu.Game/Rulesets/Edit/Checks/CheckBackground.cs           | 2 +-
 osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs    | 2 +-
 osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index 54b167aaf3..c210f73b5f 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
             new IssueTemplateOffscreenSlider(this)
         };
 
-        public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap)
+        public IEnumerable<Issue> Run(IWorkingBeatmap workingBeatmap)
         {
             foreach (var hitobject in workingBeatmap.Beatmap.HitObjects)
             {
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
index 637e603e17..71821b8073 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateDoesNotExist(this)
         };
 
-        public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap)
+        public IEnumerable<Issue> Run(IWorkingBeatmap workingBeatmap)
         {
             string backgroundFile = workingBeatmap.Beatmap.Metadata?.BackgroundFile;
 
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
index 48d536079a..1494ae5da4 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateTooUncompressed(this)
         };
 
-        public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap)
+        public IEnumerable<Issue> Run(IWorkingBeatmap workingBeatmap)
         {
             var backgroundFile = workingBeatmap.Beatmap.Metadata?.BackgroundFile;
             if (backgroundFile == null)
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs b/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
index a2814ee603..c3a64b58e9 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
@@ -25,6 +25,6 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// Runs this check and returns any issues detected for the provided beatmap.
         /// </summary>
         /// <param name="workingBeatmap">The beatmap to run the check on.</param>
-        public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap);
+        public IEnumerable<Issue> Run(IWorkingBeatmap workingBeatmap);
     }
 }

From 0502fbb4296e103d4841ce86becb57aef38e73a1 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sun, 18 Apr 2021 01:21:51 +0200
Subject: [PATCH 2586/3722] Add background quality check tests

---
 .../Checks/CheckBackgroundQualityTest.cs      | 130 ++++++++++++++++++
 1 file changed, 130 insertions(+)
 create mode 100644 osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs

diff --git a/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs b/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
new file mode 100644
index 0000000000..8dad5bbf34
--- /dev/null
+++ b/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
@@ -0,0 +1,130 @@
+// Copyright (c) ppy 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;
+using System.Linq;
+using JetBrains.Annotations;
+using Moq;
+using NUnit.Framework;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit.Checks;
+using osu.Game.Rulesets.Objects;
+using FileInfo = osu.Game.IO.FileInfo;
+
+namespace osu.Game.Tests.Editing.Checks
+{
+    [TestFixture]
+    public class CheckBackgroundQualityTest
+    {
+        private CheckBackgroundQuality check;
+        private IBeatmap beatmap;
+
+        [SetUp]
+        public void Setup()
+        {
+            check = new CheckBackgroundQuality();
+            beatmap = new Beatmap<HitObject>
+            {
+                BeatmapInfo = new BeatmapInfo
+                {
+                    Metadata = new BeatmapMetadata { BackgroundFile = "abc123.jpg" },
+                    BeatmapSet = new BeatmapSetInfo
+                    {
+                        Files = new List<BeatmapSetFileInfo>(new[]
+                        {
+                            new BeatmapSetFileInfo
+                            {
+                                Filename = "abc123.jpg",
+                                FileInfo = new FileInfo
+                                {
+                                    Hash = "abcdef"
+                                }
+                            }
+                        })
+                    }
+                }
+            };
+        }
+
+        [Test]
+        public void TestBackgroundMissing()
+        {
+            // While this is a problem, it is out of scope for this check and is caught by a different one.
+            beatmap.Metadata.BackgroundFile = null;
+            var mock = getMockWorkingBeatmap(null, System.Array.Empty<byte>());
+
+            Assert.That(check.Run(mock.Object), Is.Empty);
+        }
+
+        [Test]
+        public void TestBackgroundAcceptable()
+        {
+            var mock = getMockWorkingBeatmap(new Texture(1920, 1080));
+
+            Assert.That(check.Run(mock.Object), Is.Empty);
+        }
+
+        [Test]
+        public void TestBackgroundTooHighResolution()
+        {
+            var mock = getMockWorkingBeatmap(new Texture(3840, 2160));
+
+            var issues = check.Run(mock.Object).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateTooHighResolution);
+        }
+
+        [Test]
+        public void TestBackgroundLowResolution()
+        {
+            var mock = getMockWorkingBeatmap(new Texture(640, 480));
+
+            var issues = check.Run(mock.Object).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateLowResolution);
+        }
+
+        [Test]
+        public void TestBackgroundTooLowResolution()
+        {
+            var mock = getMockWorkingBeatmap(new Texture(100, 100));
+
+            var issues = check.Run(mock.Object).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateTooLowResolution);
+        }
+
+        [Test]
+        public void TestBackgroundTooUncompressed()
+        {
+            var mock = getMockWorkingBeatmap(new Texture(1920, 1080), new byte[1024 * 1024 * 3]);
+
+            var issues = check.Run(mock.Object).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateTooUncompressed);
+        }
+
+        /// <summary>
+        /// Returns the mock of the working beatmap with the given background and filesize.
+        /// </summary>
+        /// <param name="background">The texture of the background.</param>
+        /// <param name="fileBytes">The bytes that represent the background file.</param>
+        private Mock<IWorkingBeatmap> getMockWorkingBeatmap(Texture background, [CanBeNull] byte[] fileBytes = null)
+        {
+            var stream = new MemoryStream(fileBytes ?? new byte[1024 * 1024]);
+
+            var mock = new Mock<IWorkingBeatmap>();
+            mock.SetupGet(_ => _.Beatmap).Returns(beatmap);
+            mock.SetupGet(_ => _.Background).Returns(background);
+            mock.Setup(_ => _.GetStream(It.IsAny<string>())).Returns(stream);
+
+            return mock;
+        }
+    }
+}

From 010720de74c67df74f140aa2263cb85c4054b563 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sun, 18 Apr 2021 02:07:33 +0200
Subject: [PATCH 2587/3722] Factor out general file presence checking

This allows us to use the same method of checking for other files that should exist, for example the audio file.

By using the same method, they all share test cases too.
---
 ...groundTest.cs => CheckFilePresenceTest.cs} | 10 +++----
 osu.Game/Rulesets/Edit/BeatmapVerifier.cs     |  7 +++--
 .../Edit/Checks/CheckBackgroundPresence.cs    | 15 ++++++++++
 ...heckBackground.cs => CheckFilePresence.cs} | 28 +++++++++++--------
 4 files changed, 41 insertions(+), 19 deletions(-)
 rename osu.Game.Tests/Editing/Checks/{CheckBackgroundTest.cs => CheckFilePresenceTest.cs} (84%)
 create mode 100644 osu.Game/Rulesets/Edit/Checks/CheckBackgroundPresence.cs
 rename osu.Game/Rulesets/Edit/Checks/{CheckBackground.cs => CheckFilePresence.cs} (57%)

diff --git a/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs b/osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs
similarity index 84%
rename from osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs
rename to osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs
index d61f0989a6..1149115b55 100644
--- a/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs
@@ -12,15 +12,15 @@ using osu.Game.Tests.Beatmaps;
 namespace osu.Game.Tests.Editing.Checks
 {
     [TestFixture]
-    public class CheckBackgroundTest
+    public class CheckFilePresenceTest
     {
-        private CheckBackground check;
+        private CheckBackgroundPresence check;
         private WorkingBeatmap beatmap;
 
         [SetUp]
         public void Setup()
         {
-            check = new CheckBackground();
+            check = new CheckBackgroundPresence();
             beatmap = new TestWorkingBeatmap(new Beatmap<HitObject>
             {
                 BeatmapInfo = new BeatmapInfo
@@ -51,7 +51,7 @@ namespace osu.Game.Tests.Editing.Checks
             var issues = check.Run(beatmap).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
-            Assert.That(issues.Single().Template is CheckBackground.IssueTemplateDoesNotExist);
+            Assert.That(issues.Single().Template is CheckFilePresence.IssueTemplateDoesNotExist);
         }
 
         [Test]
@@ -62,7 +62,7 @@ namespace osu.Game.Tests.Editing.Checks
             var issues = check.Run(beatmap).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
-            Assert.That(issues.Single().Template is CheckBackground.IssueTemplateNoneSet);
+            Assert.That(issues.Single().Template is CheckFilePresence.IssueTemplateNoneSet);
         }
     }
 }
diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index 24a4f473de..90447049f8 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -16,8 +16,11 @@ namespace osu.Game.Rulesets.Edit
     {
         private readonly List<ICheck> checks = new List<ICheck>
         {
-            new CheckBackground(),
-            new CheckBackgroundQuality()
+            // Resources
+            new CheckBackgroundPresence(),
+            new CheckBackgroundQuality(),
+            // Audio
+            new CheckAudioPresence(),
         };
 
         public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap) => checks.SelectMany(check => check.Run(workingBeatmap));
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundPresence.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundPresence.cs
new file mode 100644
index 0000000000..3a229b889b
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundPresence.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.Game.Beatmaps;
+using osu.Game.Rulesets.Edit.Checks.Components;
+
+namespace osu.Game.Rulesets.Edit.Checks
+{
+    public class CheckBackgroundPresence : CheckFilePresence
+    {
+        protected override CheckCategory Category => CheckCategory.Resources;
+        protected override string TypeOfFile => "background";
+        protected override string GetFilename(IWorkingBeatmap workingBeatmap) => workingBeatmap.Beatmap.Metadata?.BackgroundFile;
+    }
+}
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
similarity index 57%
rename from osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
rename to osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
index 71821b8073..37fa79568f 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
@@ -7,9 +7,13 @@ using osu.Game.Rulesets.Edit.Checks.Components;
 
 namespace osu.Game.Rulesets.Edit.Checks
 {
-    public class CheckBackground : ICheck
+    public abstract class CheckFilePresence : ICheck
     {
-        public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Resources, "Missing background");
+        protected abstract CheckCategory Category { get; }
+        protected abstract string TypeOfFile { get; }
+        protected abstract string GetFilename(IWorkingBeatmap workingBeatmap);
+
+        public CheckMetadata Metadata => new CheckMetadata(Category, $"Missing {TypeOfFile}");
 
         public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
         {
@@ -19,41 +23,41 @@ namespace osu.Game.Rulesets.Edit.Checks
 
         public IEnumerable<Issue> Run(IWorkingBeatmap workingBeatmap)
         {
-            string backgroundFile = workingBeatmap.Beatmap.Metadata?.BackgroundFile;
+            var filename = GetFilename(workingBeatmap);
 
-            if (backgroundFile == null)
+            if (filename == null)
             {
-                yield return new IssueTemplateNoneSet(this).Create();
+                yield return new IssueTemplateNoneSet(this).Create(TypeOfFile);
 
                 yield break;
             }
 
-            // If the background is set, also make sure it still exists.
-            var storagePath = workingBeatmap.Beatmap.BeatmapInfo.BeatmapSet.GetPathForFile(backgroundFile);
+            // If the file is set, also make sure it still exists.
+            var storagePath = workingBeatmap.Beatmap.BeatmapInfo.BeatmapSet.GetPathForFile(filename);
             if (storagePath != null)
                 yield break;
 
-            yield return new IssueTemplateDoesNotExist(this).Create(backgroundFile);
+            yield return new IssueTemplateDoesNotExist(this).Create(TypeOfFile, filename);
         }
 
         public class IssueTemplateNoneSet : IssueTemplate
         {
             public IssueTemplateNoneSet(ICheck check)
-                : base(check, IssueType.Problem, "No background has been set.")
+                : base(check, IssueType.Problem, "No {0} has been set.")
             {
             }
 
-            public Issue Create() => new Issue(this);
+            public Issue Create(string typeOfFile) => new Issue(this, typeOfFile);
         }
 
         public class IssueTemplateDoesNotExist : IssueTemplate
         {
             public IssueTemplateDoesNotExist(ICheck check)
-                : base(check, IssueType.Problem, "The background file \"{0}\" does not exist.")
+                : base(check, IssueType.Problem, "The {0} file \"{1}\" does not exist.")
             {
             }
 
-            public Issue Create(string filename) => new Issue(this, filename);
+            public Issue Create(string typeOfFile, string filename) => new Issue(this, typeOfFile, filename);
         }
     }
 }

From 9a69ca34a6ec004e6b336826f5623cbcd1c33a35 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sun, 18 Apr 2021 02:07:57 +0200
Subject: [PATCH 2588/3722] Add audio presence check

---
 .../Rulesets/Edit/Checks/CheckAudioPresence.cs    | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 osu.Game/Rulesets/Edit/Checks/CheckAudioPresence.cs

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckAudioPresence.cs b/osu.Game/Rulesets/Edit/Checks/CheckAudioPresence.cs
new file mode 100644
index 0000000000..55e53ef519
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/Checks/CheckAudioPresence.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.Game.Beatmaps;
+using osu.Game.Rulesets.Edit.Checks.Components;
+
+namespace osu.Game.Rulesets.Edit.Checks
+{
+    public class CheckAudioPresence : CheckFilePresence
+    {
+        protected override CheckCategory Category => CheckCategory.Audio;
+        protected override string TypeOfFile => "audio";
+        protected override string GetFilename(IWorkingBeatmap workingBeatmap) => workingBeatmap.Beatmap.Metadata?.AudioFile;
+    }
+}

From c77f838fb051a4edaf2de036438045d489c10db2 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Sat, 17 Apr 2021 21:49:07 -0400
Subject: [PATCH 2589/3722] HasStoryboardEnded doesn't trigger
 updateCompletionState()

Scores won't be shown prematurely if the storyboard ends before the playable portion of the beatmap.
---
 osu.Game/Screens/Play/Player.cs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index ef0caa2fa3..622d99f078 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -284,14 +284,16 @@ namespace osu.Game.Screens.Play
                 ScoreProcessor.RevertResult(r);
             };
 
+            DimmableStoryboard.HasStoryboardEnded.ValueChanged += _ =>
+            {
+                if (ScoreProcessor.HasCompleted.Value)
+                    scheduleCompletion();
+            };
+
             // Bind the judgement processors to ourselves
             ScoreProcessor.HasCompleted.ValueChanged += updateCompletionState;
             HealthProcessor.Failed += onFail;
 
-            // Keep track of whether the storyboard ended after the playable portion
-            if (DimmableStoryboard.HasStoryboardEnded != null)
-                DimmableStoryboard.HasStoryboardEnded.ValueChanged += updateCompletionState;
-
             foreach (var mod in Mods.Value.OfType<IApplicableToScoreProcessor>())
                 mod.ApplyToScoreProcessor(ScoreProcessor);
 
@@ -630,7 +632,7 @@ namespace osu.Game.Screens.Play
                 return score.ScoreInfo;
             });
 
-            var storyboardHasOutro = DimmableStoryboard.ContentDisplayed && (!DimmableStoryboard.HasStoryboardEnded?.Value ?? false);
+            var storyboardHasOutro = DimmableStoryboard.ContentDisplayed && !DimmableStoryboard.HasStoryboardEnded.Value;
 
             if (storyboardHasOutro)
             {

From e9f8fa64b88b49c50c2ac9284e8d048034269e4d Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Sat, 17 Apr 2021 21:49:29 -0400
Subject: [PATCH 2590/3722] Added a test for toggling the storyboard after the
 map is loaded

---
 .../Visual/Gameplay/TestSceneStoryboardWithOutro.cs    | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
index 16474d23ea..e86b7591c6 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
@@ -58,6 +58,16 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("score shown", () => Player.IsScoreShown);
         }
 
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestStoryboardToggle(bool enabledAtBeginning)
+        {
+            AddStep($"{(enabledAtBeginning ? "enable" : "disable")} storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, enabledAtBeginning));
+            AddUntilStep("storyboard loaded", () => Player.Beatmap.Value.StoryboardLoaded);
+            AddStep($"toggle storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, !enabledAtBeginning));
+            AddUntilStep("wait for score shown", () => Player.IsScoreShown);
+        }
+
         protected override bool AllowFail => false;
 
         protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();

From cfaaf2e83e3112ea16e786c9a7487a58e794cd17 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sun, 18 Apr 2021 09:52:25 +0800
Subject: [PATCH 2591/3722] Add ToRomanisableString()

---
 osu.Game/Beatmaps/BeatmapInfo.cs                     | 12 ++++++++----
 osu.Game/Beatmaps/BeatmapMetadata.cs                 |  7 +++++++
 .../Screens/OnlinePlay/DrawableRoomPlaylistItem.cs   | 11 ++---------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapInfo.cs b/osu.Game/Beatmaps/BeatmapInfo.cs
index bf7906bd5c..c5c5bd208c 100644
--- a/osu.Game/Beatmaps/BeatmapInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapInfo.cs
@@ -7,6 +7,7 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using Newtonsoft.Json;
+using osu.Framework.Localisation;
 using osu.Framework.Testing;
 using osu.Game.Database;
 using osu.Game.IO.Serialization;
@@ -127,6 +128,8 @@ namespace osu.Game.Beatmaps
         // Metadata
         public string Version { get; set; }
 
+        public string VersionString => string.IsNullOrEmpty(Version) ? string.Empty : $"[{Version}]";
+
         [JsonProperty("difficulty_rating")]
         public double StarDifficulty { get; set; }
 
@@ -143,11 +146,12 @@ namespace osu.Game.Beatmaps
             Version
         }.Concat(Metadata?.SearchableTerms ?? Enumerable.Empty<string>()).Where(s => !string.IsNullOrEmpty(s)).ToArray();
 
-        public override string ToString()
-        {
-            string version = string.IsNullOrEmpty(Version) ? string.Empty : $"[{Version}]";
+        public override string ToString() => $"{Metadata ?? BeatmapSet?.Metadata} {VersionString}".Trim();
 
-            return $"{Metadata ?? BeatmapSet?.Metadata} {version}".Trim();
+        public RomanisableString ToRomanisableString()
+        {
+            var metadata = (Metadata ?? BeatmapSet?.Metadata).ToRomanisableString() ?? new RomanisableString(null, null);
+            return new RomanisableString($"{metadata.GetPreferred(true)} {VersionString}".Trim(), $"{metadata.GetPreferred(false)} {VersionString}".Trim());
         }
 
         public bool Equals(BeatmapInfo other)
diff --git a/osu.Game/Beatmaps/BeatmapMetadata.cs b/osu.Game/Beatmaps/BeatmapMetadata.cs
index 858da8e602..02d1349794 100644
--- a/osu.Game/Beatmaps/BeatmapMetadata.cs
+++ b/osu.Game/Beatmaps/BeatmapMetadata.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using Newtonsoft.Json;
+using osu.Framework.Localisation;
 using osu.Framework.Testing;
 using osu.Game.Database;
 using osu.Game.Users;
@@ -71,6 +72,12 @@ namespace osu.Game.Beatmaps
             return $"{Artist} - {Title} {author}".Trim();
         }
 
+        public RomanisableString ToRomanisableString()
+        {
+            string author = Author == null ? string.Empty : $"({Author})";
+            return new RomanisableString($"{ArtistUnicode} - {TitleUnicode} {author}".Trim(), $"{Artist} - {Title} {author}".Trim());
+        }
+
         [JsonIgnore]
         public string[] SearchableTerms => new[]
         {
diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index 4fccf45fda..69173bd53b 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -107,18 +107,11 @@ namespace osu.Game.Screens.OnlinePlay
 
         private void refresh()
         {
-            var beatmapMetadata = Item.Beatmap.Value.Metadata ?? Item.Beatmap.Value.BeatmapSet?.Metadata;
             difficultyIconContainer.Child = new DifficultyIcon(beatmap.Value, ruleset.Value, requiredMods) { Size = new Vector2(32) };
 
             beatmapText.Clear();
-            var text = new List<SpriteText>
-            {
-                new OsuSpriteText { Text = new RomanisableString(beatmapMetadata.ArtistUnicode, beatmapMetadata.Artist) },
-                new OsuSpriteText { Text = " - " },
-                new OsuSpriteText { Text = new RomanisableString(beatmapMetadata.TitleUnicode, beatmapMetadata.Title) },
-                new OsuSpriteText { Text = $" ({beatmapMetadata.Author}) [{Item.Beatmap.Value.Version}]" }
-            };
-            beatmapText.AddLink(text, LinkAction.OpenBeatmap, Item.Beatmap.Value.OnlineBeatmapID.ToString());
+            beatmapText.AddLink(new List<SpriteText>{ new OsuSpriteText { Text = Item.Beatmap.Value.ToRomanisableString() } }
+            , LinkAction.OpenBeatmap, Item.Beatmap.Value.OnlineBeatmapID.ToString());
 
             authorText.Clear();
 

From 1339c126a49d9d52def6ef031959812f3ea48794 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sun, 18 Apr 2021 09:54:50 +0800
Subject: [PATCH 2592/3722] Remove unused using

---
 osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index 69173bd53b..ca8e13d10a 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -13,7 +13,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
-using osu.Framework.Localisation;
 using osu.Framework.Threading;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;

From 7b1d40db7de4fc6544ebc1f4070d600a024df488 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Sat, 17 Apr 2021 22:13:28 -0400
Subject: [PATCH 2593/3722] Remove redundant string interpolation

---
 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 e86b7591c6..59d543d686 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep($"{(enabledAtBeginning ? "enable" : "disable")} storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, enabledAtBeginning));
             AddUntilStep("storyboard loaded", () => Player.Beatmap.Value.StoryboardLoaded);
-            AddStep($"toggle storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, !enabledAtBeginning));
+            AddStep("toggle storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, !enabledAtBeginning));
             AddUntilStep("wait for score shown", () => Player.IsScoreShown);
         }
 

From 646403b826da7d5b3e2600ea93ac2ab2c01e9346 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sun, 18 Apr 2021 10:00:17 +0800
Subject: [PATCH 2594/3722] Fix CI errors

---
 osu.Game/Beatmaps/BeatmapInfo.cs                        | 2 +-
 osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapInfo.cs b/osu.Game/Beatmaps/BeatmapInfo.cs
index c5c5bd208c..d5a1e2491b 100644
--- a/osu.Game/Beatmaps/BeatmapInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapInfo.cs
@@ -150,7 +150,7 @@ namespace osu.Game.Beatmaps
 
         public RomanisableString ToRomanisableString()
         {
-            var metadata = (Metadata ?? BeatmapSet?.Metadata).ToRomanisableString() ?? new RomanisableString(null, null);
+            var metadata = (Metadata ?? BeatmapSet?.Metadata)?.ToRomanisableString() ?? new RomanisableString(null, null);
             return new RomanisableString($"{metadata.GetPreferred(true)} {VersionString}".Trim(), $"{metadata.GetPreferred(false)} {VersionString}".Trim());
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index ca8e13d10a..fe5876e732 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -109,8 +109,8 @@ namespace osu.Game.Screens.OnlinePlay
             difficultyIconContainer.Child = new DifficultyIcon(beatmap.Value, ruleset.Value, requiredMods) { Size = new Vector2(32) };
 
             beatmapText.Clear();
-            beatmapText.AddLink(new List<SpriteText>{ new OsuSpriteText { Text = Item.Beatmap.Value.ToRomanisableString() } }
-            , LinkAction.OpenBeatmap, Item.Beatmap.Value.OnlineBeatmapID.ToString());
+            beatmapText.AddLink(new List<SpriteText> { new OsuSpriteText { Text = Item.Beatmap.Value.ToRomanisableString() } },
+                LinkAction.OpenBeatmap, Item.Beatmap.Value.OnlineBeatmapID.ToString());
 
             authorText.Clear();
 

From a73bae7a66889f22f8a321745baf25eafafd3efe Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 18 Apr 2021 06:35:43 +0300
Subject: [PATCH 2595/3722] Schedule completion when storyboard has actually
 ended

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 622d99f078..cb8ebdcce7 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -284,9 +284,9 @@ namespace osu.Game.Screens.Play
                 ScoreProcessor.RevertResult(r);
             };
 
-            DimmableStoryboard.HasStoryboardEnded.ValueChanged += _ =>
+            DimmableStoryboard.HasStoryboardEnded.ValueChanged += storyboardEnded =>
             {
-                if (ScoreProcessor.HasCompleted.Value)
+                if (storyboardEnded.NewValue && ScoreProcessor.HasCompleted.Value)
                     scheduleCompletion();
             };
 

From f6a09be62d4a88ec2f15a4040c3b1e1d9e0e2329 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 18 Apr 2021 06:35:54 +0300
Subject: [PATCH 2596/3722] Add further xmldoc

---
 osu.Game/Screens/Play/DimmableStoryboard.cs           | 10 ++++++++--
 osu.Game/Storyboards/Drawables/DrawableStoryboard.cs  |  2 +-
 osu.Game/Storyboards/IStoryboardElement.cs            |  8 ++++----
 osu.Game/Storyboards/IStoryboardElementHasDuration.cs |  5 ++++-
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Play/DimmableStoryboard.cs b/osu.Game/Screens/Play/DimmableStoryboard.cs
index 73b4153601..f8cedddfbe 100644
--- a/osu.Game/Screens/Play/DimmableStoryboard.cs
+++ b/osu.Game/Screens/Play/DimmableStoryboard.cs
@@ -20,6 +20,14 @@ namespace osu.Game.Screens.Play
         private readonly Storyboard storyboard;
         private DrawableStoryboard drawableStoryboard;
 
+        /// <summary>
+        /// Whether the storyboard is considered finished.
+        /// </summary>
+        /// <remarks>
+        /// This is true by default in here, until an actual drawable storyboard is loaded, in which case it'll bind to it.
+        /// </remarks>
+        public IBindable<bool> HasStoryboardEnded = new BindableBool(true);
+
         public DimmableStoryboard(Storyboard storyboard)
         {
             this.storyboard = storyboard;
@@ -63,7 +71,5 @@ namespace osu.Game.Screens.Play
             Add(storyboard);
             OverlayLayerContainer.Add(storyboard.OverlayLayer.CreateProxy());
         }
-
-        public IBindable<bool> HasStoryboardEnded = new BindableBool(true);
     }
 }
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
index abfb4598ec..a9a8b8a4ac 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Storyboards.Drawables
         }
 
         /// <summary>
-        /// Whether the storyboard has ended after the gameplay portion of the beatmap.
+        /// Whether the storyboard is considered finished.
         /// </summary>
         public IBindable<bool> HasStoryboardEnded => hasStoryboardEnded;
 
diff --git a/osu.Game/Storyboards/IStoryboardElement.cs b/osu.Game/Storyboards/IStoryboardElement.cs
index 377ad57ab2..2f05e92070 100644
--- a/osu.Game/Storyboards/IStoryboardElement.cs
+++ b/osu.Game/Storyboards/IStoryboardElement.cs
@@ -18,13 +18,13 @@ namespace osu.Game.Storyboards
     public static class StoryboardElementExtensions
     {
         /// <summary>
-        /// Returns the end time of this object.
+        /// Returns the end time of this storyboard element.
         /// </summary>
         /// <remarks>
         /// This returns the <see cref="IStoryboardElementHasDuration.EndTime"/> where available, falling back to <see cref="IStoryboardElement.StartTime"/> otherwise.
         /// </remarks>
-        /// <param name="storyboardElement">The object.</param>
-        /// <returns>The end time of this object.</returns>
-        public static double GetEndTime(this IStoryboardElement storyboardElement) => (storyboardElement as IStoryboardElementHasDuration)?.EndTime ?? storyboardElement.StartTime;
+        /// <param name="element">The storyboard element.</param>
+        /// <returns>The end time of this element.</returns>
+        public static double GetEndTime(this IStoryboardElement element) => (element as IStoryboardElementHasDuration)?.EndTime ?? element.StartTime;
     }
 }
diff --git a/osu.Game/Storyboards/IStoryboardElementHasDuration.cs b/osu.Game/Storyboards/IStoryboardElementHasDuration.cs
index daa0c55704..b8d3b66694 100644
--- a/osu.Game/Storyboards/IStoryboardElementHasDuration.cs
+++ b/osu.Game/Storyboards/IStoryboardElementHasDuration.cs
@@ -4,10 +4,13 @@
 namespace osu.Game.Storyboards
 {
     /// <summary>
-    /// A StoryboardElement that ends at a different time than its start time.
+    /// A <see cref="IStoryboardElement"/> that ends at a different time than its start time.
     /// </summary>
     public interface IStoryboardElementHasDuration
     {
+        /// <summary>
+        /// The time at which the <see cref="IStoryboardElement"/> ends.
+        /// </summary>
         double EndTime { get; }
     }
 }

From f45aed125903673a1eaa27484bce71c5026d61e8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 18 Apr 2021 07:16:00 +0300
Subject: [PATCH 2597/3722] Remove new line between skip overlay fields

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index cb8ebdcce7..da877fcd22 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -105,7 +105,6 @@ namespace osu.Game.Screens.Play
         private BreakTracker breakTracker;
 
         private SkipOverlay skipIntroOverlay;
-
         private SkipOverlay skipOutroOverlay;
 
         protected ScoreProcessor ScoreProcessor { get; private set; }

From 2678089e0b0610ea78afb373a36f81d54af171cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 18 Apr 2021 20:18:30 +0900
Subject: [PATCH 2598/3722] Add test case failing on selection after paste

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

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs
index 29046c82a6..01d9966736 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs
@@ -3,12 +3,16 @@
 
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Screens.Edit.Compose.Components;
+using osu.Game.Screens.Edit.Compose.Components.Timeline;
 using osu.Game.Tests.Beatmaps;
 using osuTK;
 
@@ -110,8 +114,9 @@ namespace osu.Game.Tests.Visual.Editing
             AddAssert("duration matches", () => ((Spinner)EditorBeatmap.HitObjects.Single()).Duration == 5000);
         }
 
-        [Test]
-        public void TestCopyPaste()
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestCopyPaste(bool deselectAfterCopy)
         {
             var addedObject = new HitCircle { StartTime = 1000 };
 
@@ -123,11 +128,22 @@ namespace osu.Game.Tests.Visual.Editing
 
             AddStep("move forward in time", () => EditorClock.Seek(2000));
 
+            if (deselectAfterCopy)
+            {
+                AddStep("deselect", () => EditorBeatmap.SelectedHitObjects.Clear());
+
+                AddUntilStep("timeline selection box is not visible", () => Editor.ChildrenOfType<Timeline>().First().ChildrenOfType<SelectionHandler>().First().Alpha == 0);
+                AddUntilStep("composer selection box is not visible", () => Editor.ChildrenOfType<HitObjectComposer>().First().ChildrenOfType<SelectionHandler>().First().Alpha == 0);
+            }
+
             AddStep("paste hitobject", () => Editor.Paste());
 
             AddAssert("are two objects", () => EditorBeatmap.HitObjects.Count == 2);
 
             AddAssert("new object selected", () => EditorBeatmap.SelectedHitObjects.Single().StartTime == 2000);
+
+            AddUntilStep("timeline selection box is visible", () => Editor.ChildrenOfType<Timeline>().First().ChildrenOfType<SelectionHandler>().First().Alpha > 0);
+            AddUntilStep("composer selection box is visible", () => Editor.ChildrenOfType<HitObjectComposer>().First().ChildrenOfType<SelectionHandler>().First().Alpha > 0);
         }
 
         [Test]

From e76565dbc57f874fd4143d5d8717aeeb99e5a5eb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 18 Apr 2021 20:11:05 +0900
Subject: [PATCH 2599/3722] Fix selection box not displaying after pasting a
 selection in the editor

Closes #12471.
---
 .../Edit/Compose/Components/SelectionHandler.cs        | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 389ef78ed5..40641ee41f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -33,10 +33,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
     /// </summary>
     public class SelectionHandler : CompositeDrawable, IKeyBindingHandler<PlatformAction>, IHasContextMenu
     {
+        /// <summary>
+        /// The currently selected blueprints.
+        /// Should be used when operations are dealing directly with the visible blueprints.
+        /// For more general selection operations, use EditorBeatmap.SelectedHitObjects instead.
+        /// </summary>
         public IEnumerable<SelectionBlueprint> SelectedBlueprints => selectedBlueprints;
-        private readonly List<SelectionBlueprint> selectedBlueprints;
 
-        public int SelectedCount => selectedBlueprints.Count;
+        private readonly List<SelectionBlueprint> selectedBlueprints;
 
         private Drawable content;
 
@@ -295,7 +299,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         private void updateVisibility()
         {
-            int count = selectedBlueprints.Count;
+            int count = EditorBeatmap.SelectedHitObjects.Count;
 
             selectionDetailsText.Text = count > 0 ? count.ToString() : string.Empty;
 

From cfc76640941f5dcb41dc4e5b319b207be7e85214 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 18 Apr 2021 21:05:23 +0900
Subject: [PATCH 2600/3722] Use full path

---
 osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 40641ee41f..b06e982859 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <summary>
         /// The currently selected blueprints.
         /// Should be used when operations are dealing directly with the visible blueprints.
-        /// For more general selection operations, use EditorBeatmap.SelectedHitObjects instead.
+        /// For more general selection operations, use <see cref="osu.Game.Screens.Edit.EditorBeatmap.SelectedHitObjects"/> instead.
         /// </summary>
         public IEnumerable<SelectionBlueprint> SelectedBlueprints => selectedBlueprints;
 

From 38a7c590c4d07ac17c9746c8feac2aa4a59c63af Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sun, 18 Apr 2021 20:57:25 +0800
Subject: [PATCH 2601/3722] Make versionString private

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

diff --git a/osu.Game/Beatmaps/BeatmapInfo.cs b/osu.Game/Beatmaps/BeatmapInfo.cs
index d5a1e2491b..36cb97e8d7 100644
--- a/osu.Game/Beatmaps/BeatmapInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapInfo.cs
@@ -128,7 +128,7 @@ namespace osu.Game.Beatmaps
         // Metadata
         public string Version { get; set; }
 
-        public string VersionString => string.IsNullOrEmpty(Version) ? string.Empty : $"[{Version}]";
+        private string versionString => string.IsNullOrEmpty(Version) ? string.Empty : $"[{Version}]";
 
         [JsonProperty("difficulty_rating")]
         public double StarDifficulty { get; set; }
@@ -146,12 +146,12 @@ namespace osu.Game.Beatmaps
             Version
         }.Concat(Metadata?.SearchableTerms ?? Enumerable.Empty<string>()).Where(s => !string.IsNullOrEmpty(s)).ToArray();
 
-        public override string ToString() => $"{Metadata ?? BeatmapSet?.Metadata} {VersionString}".Trim();
+        public override string ToString() => $"{Metadata ?? BeatmapSet?.Metadata} {versionString}".Trim();
 
         public RomanisableString ToRomanisableString()
         {
             var metadata = (Metadata ?? BeatmapSet?.Metadata)?.ToRomanisableString() ?? new RomanisableString(null, null);
-            return new RomanisableString($"{metadata.GetPreferred(true)} {VersionString}".Trim(), $"{metadata.GetPreferred(false)} {VersionString}".Trim());
+            return new RomanisableString($"{metadata.GetPreferred(true)} {versionString}".Trim(), $"{metadata.GetPreferred(false)} {versionString}".Trim());
         }
 
         public bool Equals(BeatmapInfo other)

From 488001d5701b51db7405e5ebd7c3ab4174e9a699 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sun, 18 Apr 2021 20:58:08 +0800
Subject: [PATCH 2602/3722] Support SpriteText for LinkFlowContainer

---
 .../Graphics/Containers/LinkFlowContainer.cs  | 23 +++++++++++++++++++
 osu.Game/Online/Chat/DrawableLinkCompiler.cs  |  5 ++++
 .../OnlinePlay/DrawableRoomPlaylistItem.cs    |  2 +-
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Containers/LinkFlowContainer.cs b/osu.Game/Graphics/Containers/LinkFlowContainer.cs
index 914c8ff78d..32efcce80c 100644
--- a/osu.Game/Graphics/Containers/LinkFlowContainer.cs
+++ b/osu.Game/Graphics/Containers/LinkFlowContainer.cs
@@ -67,6 +67,13 @@ namespace osu.Game.Graphics.Containers
             createLink(text, new LinkDetails(action, linkArgument), tooltipText);
         }
 
+        public void AddLink(SpriteText text, LinkAction action = LinkAction.External, string linkArgument = null, string tooltipText = null)
+        {
+            AddArbitraryDrawable(text);
+
+            createLink(text, new LinkDetails(action, linkArgument), tooltipText);
+        }
+
         public void AddUserLink(User user, Action<SpriteText> creationParameters = null)
             => createLink(AddText(user.Username, creationParameters), new LinkDetails(LinkAction.OpenUserProfile, user.Id.ToString()), "view profile");
 
@@ -86,6 +93,22 @@ namespace osu.Game.Graphics.Containers
             });
         }
 
+        private void createLink(Drawable drawable, LinkDetails link, string tooltipText, Action action = null)
+        {
+            AddInternal(new DrawableLinkCompiler(drawable)
+            {
+                RelativeSizeAxes = Axes.Both,
+                TooltipText = tooltipText,
+                Action = () =>
+                {
+                    if (action != null)
+                        action();
+                    else
+                        game?.HandleLink(link);
+                },
+            });
+        }
+
         // We want the compilers to always be visible no matter where they are, so RelativeSizeAxes is used.
         // However due to https://github.com/ppy/osu-framework/issues/2073, it's possible for the compilers to be relative size in the flow's auto-size axes - an unsupported operation.
         // Since the compilers don't display any content and don't affect the layout, it's simplest to exclude them from the flow.
diff --git a/osu.Game/Online/Chat/DrawableLinkCompiler.cs b/osu.Game/Online/Chat/DrawableLinkCompiler.cs
index d27a3fbffe..7675eab4c0 100644
--- a/osu.Game/Online/Chat/DrawableLinkCompiler.cs
+++ b/osu.Game/Online/Chat/DrawableLinkCompiler.cs
@@ -31,6 +31,11 @@ namespace osu.Game.Online.Chat
             Parts = parts.ToList();
         }
 
+        public DrawableLinkCompiler(Drawable part)
+        {
+            Parts = new List<Drawable> { part };
+        }
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index fe5876e732..a92ca610f3 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -109,7 +109,7 @@ namespace osu.Game.Screens.OnlinePlay
             difficultyIconContainer.Child = new DifficultyIcon(beatmap.Value, ruleset.Value, requiredMods) { Size = new Vector2(32) };
 
             beatmapText.Clear();
-            beatmapText.AddLink(new List<SpriteText> { new OsuSpriteText { Text = Item.Beatmap.Value.ToRomanisableString() } },
+            beatmapText.AddLink(new OsuSpriteText { Text = Item.Beatmap.Value.ToRomanisableString() },
                 LinkAction.OpenBeatmap, Item.Beatmap.Value.OnlineBeatmapID.ToString());
 
             authorText.Clear();

From e63edf5b4914ec04f55b2de779709e2120d93315 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 18 Apr 2021 23:50:09 +0900
Subject: [PATCH 2603/3722] Fix volume control displaying on non-vertical
 scroll events

Closes #12475.
---
 osu.Game/Overlays/Volume/VolumeControlReceptor.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Overlays/Volume/VolumeControlReceptor.cs b/osu.Game/Overlays/Volume/VolumeControlReceptor.cs
index 34b86b2f81..ae9c2eb394 100644
--- a/osu.Game/Overlays/Volume/VolumeControlReceptor.cs
+++ b/osu.Game/Overlays/Volume/VolumeControlReceptor.cs
@@ -44,6 +44,9 @@ namespace osu.Game.Overlays.Volume
 
         protected override bool OnScroll(ScrollEvent e)
         {
+            if (e.ScrollDelta.Y == 0)
+                return false;
+
             // forward any unhandled mouse scroll events to the volume control.
             ScrollActionRequested?.Invoke(GlobalAction.IncreaseVolume, e.ScrollDelta.Y, e.IsPrecise);
             return true;

From af79ad537c048891659eaabadaa3a1877b7aae89 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 18 Apr 2021 23:51:37 +0900
Subject: [PATCH 2604/3722] Avoid unnecessary debounce triggers on zero-delta
 scrolls

---
 osu.Game/Overlays/Volume/VolumeMeter.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Overlays/Volume/VolumeMeter.cs b/osu.Game/Overlays/Volume/VolumeMeter.cs
index 202eac93ea..f1f21bec49 100644
--- a/osu.Game/Overlays/Volume/VolumeMeter.cs
+++ b/osu.Game/Overlays/Volume/VolumeMeter.cs
@@ -245,6 +245,9 @@ namespace osu.Game.Overlays.Volume
 
         private void adjust(double delta, bool isPrecise)
         {
+            if (delta == 0)
+                return;
+
             // every adjust increment increases the rate at which adjustments happen up to a cutoff.
             // this debounce will reset on inactivity.
             accelerationDebounce?.Cancel();

From 1b2c43b92cab2badef24f03755e3d8b282cfc04d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 18 Apr 2021 19:29:04 +0200
Subject: [PATCH 2605/3722] Add basic structure of colour palette

---
 .../TestSceneLabelledColourPalette.cs         |  49 +++++++++
 .../Graphics/UserInterfaceV2/ColourDisplay.cs | 103 ++++++++++++++++++
 .../Graphics/UserInterfaceV2/ColourPalette.cs |  67 ++++++++++++
 .../UserInterfaceV2/LabelledColourPalette.cs  |  20 ++++
 4 files changed, 239 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs
 create mode 100644 osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs
 create mode 100644 osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs
 create mode 100644 osu.Game/Graphics/UserInterfaceV2/LabelledColourPalette.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs
new file mode 100644
index 0000000000..afe95a3745
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.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 NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.UserInterfaceV2;
+using osuTK.Graphics;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneLabelledColourPalette : OsuTestScene
+    {
+        private LabelledColourPalette component;
+
+        [Test]
+        public void TestPalette([Values] bool hasDescription) => createColourPalette(hasDescription);
+
+        private void createColourPalette(bool hasDescription = false)
+        {
+            AddStep("create component", () =>
+            {
+                Child = new Container
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Width = 500,
+                    AutoSizeAxes = Axes.Y,
+                    Child = component = new LabelledColourPalette
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                    }
+                };
+
+                component.Label = "a sample component";
+                component.Description = hasDescription ? "this text describes the component" : string.Empty;
+
+                component.Colours.AddRange(new[]
+                {
+                    Color4.DarkRed,
+                    Color4.Aquamarine,
+                    Color4.Goldenrod,
+                    Color4.Gainsboro
+                });
+            });
+        }
+    }
+}
diff --git a/osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs b/osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs
new file mode 100644
index 0000000000..ef5be62a37
--- /dev/null
+++ b/osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs
@@ -0,0 +1,103 @@
+// Copyright (c) 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.UserInterface;
+using osu.Framework.Localisation;
+using osu.Game.Graphics.Sprites;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Graphics.UserInterfaceV2
+{
+    public class ColourDisplay : CompositeDrawable, IHasCurrentValue<Color4>
+    {
+        private readonly BindableWithCurrent<Color4> current = new BindableWithCurrent<Color4>();
+
+        private Box fill;
+        private OsuSpriteText colourHexCode;
+        private OsuSpriteText colourName;
+
+        public Bindable<Color4> Current
+        {
+            get => current.Current;
+            set => current.Current = value;
+        }
+
+        private LocalisableString name;
+
+        public LocalisableString ColourName
+        {
+            get => name;
+            set
+            {
+                if (name == value)
+                    return;
+
+                name = value;
+
+                colourName.Text = name;
+            }
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AutoSizeAxes = Axes.Y;
+            Width = 100;
+
+            InternalChild = new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(0, 10),
+                Children = new Drawable[]
+                {
+                    new CircularContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Height = 100,
+                        Masking = true,
+                        Children = new Drawable[]
+                        {
+                            fill = new Box
+                            {
+                                RelativeSizeAxes = Axes.Both
+                            },
+                            colourHexCode = new OsuSpriteText
+                            {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Font = OsuFont.Default.With(size: 12)
+                            }
+                        }
+                    },
+                    colourName = new OsuSpriteText
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre
+                    }
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            current.BindValueChanged(_ => updateColour(), true);
+        }
+
+        private void updateColour()
+        {
+            fill.Colour = current.Value;
+            colourHexCode.Text = current.Value.ToHex();
+        }
+    }
+}
diff --git a/osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs b/osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs
new file mode 100644
index 0000000000..8fa76a017c
--- /dev/null
+++ b/osu.Game/Graphics/UserInterfaceV2/ColourPalette.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 osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Graphics.UserInterfaceV2
+{
+    public class ColourPalette : CompositeDrawable
+    {
+        public BindableList<Color4> Colours { get; } = new BindableList<Color4>();
+
+        private FillFlowContainer<ColourDisplay> palette;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+
+            InternalChild = palette = new FillFlowContainer<ColourDisplay>
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Spacing = new Vector2(10),
+                Direction = FillDirection.Full
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Colours.BindCollectionChanged((_, __) => updatePalette(), true);
+        }
+
+        private void updatePalette()
+        {
+            palette.Clear();
+
+            foreach (var item in Colours)
+            {
+                palette.Add(new ColourDisplay
+                {
+                    Current = { Value = item }
+                });
+            }
+
+            reindexItems();
+        }
+
+        private void reindexItems()
+        {
+            int index = 1;
+
+            foreach (var colour in palette)
+            {
+                colour.ColourName = $"Colour {index}";
+                index += 1;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Graphics/UserInterfaceV2/LabelledColourPalette.cs b/osu.Game/Graphics/UserInterfaceV2/LabelledColourPalette.cs
new file mode 100644
index 0000000000..f6f2d92d01
--- /dev/null
+++ b/osu.Game/Graphics/UserInterfaceV2/LabelledColourPalette.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.Bindables;
+using osuTK.Graphics;
+
+namespace osu.Game.Graphics.UserInterfaceV2
+{
+    public class LabelledColourPalette : LabelledDrawable<ColourPalette>
+    {
+        public LabelledColourPalette()
+            : base(true)
+        {
+        }
+
+        public BindableList<Color4> Colours => Component.Colours;
+
+        protected override ColourPalette CreateComponent() => new ColourPalette();
+    }
+}

From 67c19df00050c9d0f6fef7f69e9dc98edb2f4c75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 18 Apr 2021 19:35:42 +0200
Subject: [PATCH 2606/3722] Add test coverage for adding/removing colours

---
 .../TestSceneLabelledColourPalette.cs         | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs
index afe95a3745..77d313e6ee 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs
@@ -4,6 +4,7 @@
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Utils;
 using osu.Game.Graphics.UserInterfaceV2;
 using osuTK.Graphics;
 
@@ -14,7 +15,17 @@ namespace osu.Game.Tests.Visual.UserInterface
         private LabelledColourPalette component;
 
         [Test]
-        public void TestPalette([Values] bool hasDescription) => createColourPalette(hasDescription);
+        public void TestPalette([Values] bool hasDescription)
+        {
+            createColourPalette(hasDescription);
+
+            AddRepeatStep("add random colour", () => component.Colours.Add(randomColour()), 4);
+            AddRepeatStep("remove random colour", () =>
+            {
+                if (component.Colours.Count > 0)
+                    component.Colours.RemoveAt(RNG.Next(component.Colours.Count));
+            }, 5);
+        }
 
         private void createColourPalette(bool hasDescription = false)
         {
@@ -45,5 +56,11 @@ namespace osu.Game.Tests.Visual.UserInterface
                 });
             });
         }
+
+        private Color4 randomColour() => new Color4(
+            RNG.NextSingle(),
+            RNG.NextSingle(),
+            RNG.NextSingle(),
+            1);
     }
 }

From a8027d87b6c9bd31c895d1eb243fdf6af689567e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 18 Apr 2021 19:46:54 +0200
Subject: [PATCH 2607/3722] Fix unreadable colour hex code text due to low
 contrast

Logic is shared with the timeline blueprints which also have the same
problem of displaying text on top of a combo colour.

Slightly modified the formula. Seems to yield better results on a
subjective check.
---
 .../Graphics/UserInterfaceV2/ColourDisplay.cs |  2 ++
 .../Timeline/TimelineHitObjectBlueprint.cs    |  6 ++---
 osu.Game/Utils/ColourUtils.cs                 | 23 +++++++++++++++++++
 3 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game/Utils/ColourUtils.cs

diff --git a/osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs b/osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs
index ef5be62a37..5d9d2521cb 100644
--- a/osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Localisation;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Utils;
 using osuTK;
 using osuTK.Graphics;
 
@@ -98,6 +99,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
         {
             fill.Colour = current.Value;
             colourHexCode.Text = current.Value.ToHex();
+            colourHexCode.Colour = ColourUtils.ForegroundTextColourFor(current.Value);
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 105e04d441..dc67009d08 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -21,6 +21,7 @@ using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Skinning;
+using osu.Game.Utils;
 using osuTK;
 using osuTK.Graphics;
 
@@ -158,10 +159,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 circle.Colour = comboColour;
 
             var col = circle.Colour.TopLeft.Linear;
-            float brightness = col.R + col.G + col.B;
-
-            // decide the combo index colour based on brightness?
-            colouredComponents.Colour = OsuColour.Gray(brightness > 0.5f ? 0.2f : 0.9f);
+            colouredComponents.Colour = ColourUtils.ForegroundTextColourFor(col);
         }
 
         protected override void Update()
diff --git a/osu.Game/Utils/ColourUtils.cs b/osu.Game/Utils/ColourUtils.cs
new file mode 100644
index 0000000000..33f6f5981f
--- /dev/null
+++ b/osu.Game/Utils/ColourUtils.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.
+
+using osu.Game.Graphics;
+using osuTK.Graphics;
+
+namespace osu.Game.Utils
+{
+    public static class ColourUtils
+    {
+        /// <summary>
+        /// Returns a foreground text colour that is supposed to contrast well on top of
+        /// the supplied <paramref name="backgroundColour"/>.
+        /// </summary>
+        public static Color4 ForegroundTextColourFor(Color4 backgroundColour)
+        {
+            // formula taken from the RGB->YIQ conversions: https://en.wikipedia.org/wiki/YIQ
+            // brightness here is equivalent to the Y component in the above colour model, which is a rough estimate of lightness.
+            float brightness = 0.299f * backgroundColour.R + 0.587f * backgroundColour.G + 0.114f * backgroundColour.B;
+            return OsuColour.Gray(brightness > 0.5f ? 0.2f : 0.9f);
+        }
+    }
+}

From 0cd1aa8c1cca9a984968a6c84ae25a5b55ee2cff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 18 Apr 2021 19:56:03 +0200
Subject: [PATCH 2608/3722] Add support for custom colour prefixes

---
 .../TestSceneLabelledColourPalette.cs         |  3 +++
 .../Graphics/UserInterfaceV2/ColourPalette.cs | 19 ++++++++++++++++++-
 .../UserInterfaceV2/LabelledColourPalette.cs  |  6 ++++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs
index 77d313e6ee..325e71f76a 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Tests.Visual.UserInterface
                 if (component.Colours.Count > 0)
                     component.Colours.RemoveAt(RNG.Next(component.Colours.Count));
             }, 5);
+
+            AddStep("set custom prefix", () => component.ColourNamePrefix = "Combo");
         }
 
         private void createColourPalette(bool hasDescription = false)
@@ -41,6 +43,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
+                        ColourNamePrefix = "My colour #"
                     }
                 };
 
diff --git a/osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs b/osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs
index 8fa76a017c..38ac51b955 100644
--- a/osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs
@@ -14,6 +14,23 @@ namespace osu.Game.Graphics.UserInterfaceV2
     {
         public BindableList<Color4> Colours { get; } = new BindableList<Color4>();
 
+        private string colourNamePrefix = "Colour";
+
+        public string ColourNamePrefix
+        {
+            get => colourNamePrefix;
+            set
+            {
+                if (colourNamePrefix == value)
+                    return;
+
+                colourNamePrefix = value;
+
+                if (IsLoaded)
+                    reindexItems();
+            }
+        }
+
         private FillFlowContainer<ColourDisplay> palette;
 
         [BackgroundDependencyLoader]
@@ -59,7 +76,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
 
             foreach (var colour in palette)
             {
-                colour.ColourName = $"Colour {index}";
+                colour.ColourName = $"{colourNamePrefix} {index}";
                 index += 1;
             }
         }
diff --git a/osu.Game/Graphics/UserInterfaceV2/LabelledColourPalette.cs b/osu.Game/Graphics/UserInterfaceV2/LabelledColourPalette.cs
index f6f2d92d01..58443953bc 100644
--- a/osu.Game/Graphics/UserInterfaceV2/LabelledColourPalette.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/LabelledColourPalette.cs
@@ -15,6 +15,12 @@ namespace osu.Game.Graphics.UserInterfaceV2
 
         public BindableList<Color4> Colours => Component.Colours;
 
+        public string ColourNamePrefix
+        {
+            get => Component.ColourNamePrefix;
+            set => Component.ColourNamePrefix = value;
+        }
+
         protected override ColourPalette CreateComponent() => new ColourPalette();
     }
 }

From 577755ee1943c65b4e26dfa7cef7c39a43896a3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 18 Apr 2021 20:15:30 +0200
Subject: [PATCH 2609/3722] Add placeholder when no colours are visible

Will be removed once combo colours are mutable.
---
 .../TestSceneLabelledColourPalette.cs         |  7 ++--
 .../Graphics/UserInterfaceV2/ColourPalette.cs | 42 ++++++++++++++++---
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs
index 325e71f76a..826da17ca8 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs
@@ -20,13 +20,14 @@ namespace osu.Game.Tests.Visual.UserInterface
             createColourPalette(hasDescription);
 
             AddRepeatStep("add random colour", () => component.Colours.Add(randomColour()), 4);
+
+            AddStep("set custom prefix", () => component.ColourNamePrefix = "Combo");
+
             AddRepeatStep("remove random colour", () =>
             {
                 if (component.Colours.Count > 0)
                     component.Colours.RemoveAt(RNG.Next(component.Colours.Count));
-            }, 5);
-
-            AddStep("set custom prefix", () => component.ColourNamePrefix = "Combo");
+            }, 8);
         }
 
         private void createColourPalette(bool hasDescription = false)
diff --git a/osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs b/osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs
index 38ac51b955..3ca5c2d8d1 100644
--- a/osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs
@@ -1,10 +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.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
 using osuTK;
 using osuTK.Graphics;
 
@@ -32,6 +34,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
         }
 
         private FillFlowContainer<ColourDisplay> palette;
+        private Container placeholder;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -39,12 +42,27 @@ namespace osu.Game.Graphics.UserInterfaceV2
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
 
-            InternalChild = palette = new FillFlowContainer<ColourDisplay>
+            InternalChildren = new Drawable[]
             {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
-                Spacing = new Vector2(10),
-                Direction = FillDirection.Full
+                palette = new FillFlowContainer<ColourDisplay>
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Spacing = new Vector2(10),
+                    Direction = FillDirection.Full
+                },
+                placeholder = new Container
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Child = new OsuSpriteText
+                    {
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.CentreRight,
+                        Text = "(none)",
+                        Font = OsuFont.Default.With(weight: FontWeight.Bold)
+                    }
+                }
             };
         }
 
@@ -53,12 +71,26 @@ namespace osu.Game.Graphics.UserInterfaceV2
             base.LoadComplete();
 
             Colours.BindCollectionChanged((_, __) => updatePalette(), true);
+            FinishTransforms(true);
         }
 
+        private const int fade_duration = 200;
+
         private void updatePalette()
         {
             palette.Clear();
 
+            if (Colours.Any())
+            {
+                palette.FadeIn(fade_duration, Easing.OutQuint);
+                placeholder.FadeOut(fade_duration, Easing.OutQuint);
+            }
+            else
+            {
+                palette.FadeOut(fade_duration, Easing.OutQuint);
+                placeholder.FadeIn(fade_duration, Easing.OutQuint);
+            }
+
             foreach (var item in Colours)
             {
                 palette.Add(new ColourDisplay

From 07a00cd68130e973de37e68f119191c8bc971f53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 18 Apr 2021 20:16:17 +0200
Subject: [PATCH 2610/3722] Add colours section with combo colour display

---
 osu.Game/Screens/Edit/Setup/ColoursSection.cs | 37 +++++++++++++++++++
 osu.Game/Screens/Edit/Setup/SetupScreen.cs    |  1 +
 2 files changed, 38 insertions(+)
 create mode 100644 osu.Game/Screens/Edit/Setup/ColoursSection.cs

diff --git a/osu.Game/Screens/Edit/Setup/ColoursSection.cs b/osu.Game/Screens/Edit/Setup/ColoursSection.cs
new file mode 100644
index 0000000000..91dfd74a78
--- /dev/null
+++ b/osu.Game/Screens/Edit/Setup/ColoursSection.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.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Localisation;
+using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Skinning;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Edit.Setup
+{
+    internal class ColoursSection : SetupSection
+    {
+        public override LocalisableString Title => "Colours";
+
+        private LabelledColourPalette comboColours;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Children = new Drawable[]
+            {
+                comboColours = new LabelledColourPalette
+                {
+                    Label = "Hitcircle / Slider Combos",
+                    ColourNamePrefix = "Combo"
+                }
+            };
+
+            var colours = Beatmap.BeatmapSkin.GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value;
+            if (colours != null)
+                comboColours.Colours.AddRange(colours);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index 70671b487c..dc81b31f65 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -61,6 +61,7 @@ namespace osu.Game.Screens.Edit.Setup
                                 new ResourcesSection(),
                                 new MetadataSection(),
                                 new DifficultySection(),
+                                new ColoursSection()
                             }
                         },
                     }

From 6f2ebb20a7fedc0d02037540b3610e7e64288239 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 18 Apr 2021 20:29:09 +0200
Subject: [PATCH 2611/3722] Fix test failing due to null beatmap skin

Also annotate the field on `EditorBeatmap` as nullable for future
travelers.
---
 osu.Game/Screens/Edit/EditorBeatmap.cs        | 1 +
 osu.Game/Screens/Edit/Setup/ColoursSection.cs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 4f1b0484d2..4bf4a3b8f3 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -46,6 +46,7 @@ namespace osu.Game.Screens.Edit
 
         public readonly IBeatmap PlayableBeatmap;
 
+        [CanBeNull]
         public readonly ISkin BeatmapSkin;
 
         [Resolved]
diff --git a/osu.Game/Screens/Edit/Setup/ColoursSection.cs b/osu.Game/Screens/Edit/Setup/ColoursSection.cs
index 91dfd74a78..cb7deadcb7 100644
--- a/osu.Game/Screens/Edit/Setup/ColoursSection.cs
+++ b/osu.Game/Screens/Edit/Setup/ColoursSection.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Screens.Edit.Setup
                 }
             };
 
-            var colours = Beatmap.BeatmapSkin.GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value;
+            var colours = Beatmap.BeatmapSkin?.GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value;
             if (colours != null)
                 comboColours.Colours.AddRange(colours);
         }

From 98460c8febc37c17acb949a864f528c32ef637cb Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Sun, 18 Apr 2021 00:45:24 -0400
Subject: [PATCH 2612/3722] Rename IStoryboardElementHasDuration, remove
 unnecessary step in tests, add Duration field

---
 .../Visual/Gameplay/TestSceneStoryboardWithOutro.cs        | 4 ----
 osu.Game/Storyboards/IStoryboardElement.cs                 | 4 ++--
 ...entHasDuration.cs => IStoryboardElementWithDuration.cs} | 7 ++++++-
 osu.Game/Storyboards/StoryboardSprite.cs                   | 4 +++-
 4 files changed, 11 insertions(+), 8 deletions(-)
 rename osu.Game/Storyboards/{IStoryboardElementHasDuration.cs => IStoryboardElementWithDuration.cs} (70%)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
index 59d543d686..fa1c4aa0d1 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
@@ -35,7 +35,6 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestStoryboardSkipOutro()
         {
-            AddUntilStep("storyboard loaded", () => Player.Beatmap.Value.StoryboardLoaded);
             AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
             AddStep("skip outro", () => InputManager.Key(osuTK.Input.Key.Space));
             AddAssert("score shown", () => Player.IsScoreShown);
@@ -44,7 +43,6 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestStoryboardNoSkipOutro()
         {
-            AddUntilStep("storyboard loaded", () => Player.Beatmap.Value.StoryboardLoaded);
             AddUntilStep("storyboard ends", () => Player.GameplayClockContainer.GameplayClock.CurrentTime >= storyboard_duration);
             AddUntilStep("wait for score shown", () => Player.IsScoreShown);
         }
@@ -52,7 +50,6 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestStoryboardExitToSkipOutro()
         {
-            AddUntilStep("storyboard loaded", () => Player.Beatmap.Value.StoryboardLoaded);
             AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
             AddStep("exit via pause", () => Player.ExitViaPause());
             AddAssert("score shown", () => Player.IsScoreShown);
@@ -63,7 +60,6 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestStoryboardToggle(bool enabledAtBeginning)
         {
             AddStep($"{(enabledAtBeginning ? "enable" : "disable")} storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, enabledAtBeginning));
-            AddUntilStep("storyboard loaded", () => Player.Beatmap.Value.StoryboardLoaded);
             AddStep("toggle storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, !enabledAtBeginning));
             AddUntilStep("wait for score shown", () => Player.IsScoreShown);
         }
diff --git a/osu.Game/Storyboards/IStoryboardElement.cs b/osu.Game/Storyboards/IStoryboardElement.cs
index 2f05e92070..9a059991e6 100644
--- a/osu.Game/Storyboards/IStoryboardElement.cs
+++ b/osu.Game/Storyboards/IStoryboardElement.cs
@@ -21,10 +21,10 @@ namespace osu.Game.Storyboards
         /// Returns the end time of this storyboard element.
         /// </summary>
         /// <remarks>
-        /// This returns the <see cref="IStoryboardElementHasDuration.EndTime"/> where available, falling back to <see cref="IStoryboardElement.StartTime"/> otherwise.
+        /// This returns the <see cref="IStoryboardElementWithDuration.EndTime"/> where available, falling back to <see cref="IStoryboardElement.StartTime"/> otherwise.
         /// </remarks>
         /// <param name="element">The storyboard element.</param>
         /// <returns>The end time of this element.</returns>
-        public static double GetEndTime(this IStoryboardElement element) => (element as IStoryboardElementHasDuration)?.EndTime ?? element.StartTime;
+        public static double GetEndTime(this IStoryboardElement element) => (element as IStoryboardElementWithDuration)?.EndTime ?? element.StartTime;
     }
 }
diff --git a/osu.Game/Storyboards/IStoryboardElementHasDuration.cs b/osu.Game/Storyboards/IStoryboardElementWithDuration.cs
similarity index 70%
rename from osu.Game/Storyboards/IStoryboardElementHasDuration.cs
rename to osu.Game/Storyboards/IStoryboardElementWithDuration.cs
index b8d3b66694..02b438cb76 100644
--- a/osu.Game/Storyboards/IStoryboardElementHasDuration.cs
+++ b/osu.Game/Storyboards/IStoryboardElementWithDuration.cs
@@ -6,11 +6,16 @@ namespace osu.Game.Storyboards
     /// <summary>
     /// A <see cref="IStoryboardElement"/> that ends at a different time than its start time.
     /// </summary>
-    public interface IStoryboardElementHasDuration
+    public interface IStoryboardElementWithDuration : IStoryboardElement
     {
         /// <summary>
         /// The time at which the <see cref="IStoryboardElement"/> ends.
         /// </summary>
         double EndTime { get; }
+
+        /// <summary>
+        /// The duration of the StoryboardElement.
+        /// </summary>
+        double Duration { get; }
     }
 }
diff --git a/osu.Game/Storyboards/StoryboardSprite.cs b/osu.Game/Storyboards/StoryboardSprite.cs
index 51bdce3321..0aaf264341 100644
--- a/osu.Game/Storyboards/StoryboardSprite.cs
+++ b/osu.Game/Storyboards/StoryboardSprite.cs
@@ -11,7 +11,7 @@ using JetBrains.Annotations;
 
 namespace osu.Game.Storyboards
 {
-    public class StoryboardSprite : IStoryboardElement, IStoryboardElementHasDuration
+    public class StoryboardSprite : IStoryboardElementWithDuration
     {
         private readonly List<CommandLoop> loops = new List<CommandLoop>();
         private readonly List<CommandTrigger> triggers = new List<CommandTrigger>();
@@ -65,6 +65,8 @@ namespace osu.Game.Storyboards
             }
         }
 
+        public double Duration => EndTime - StartTime;
+
         public bool HasCommands => TimelineGroup.HasCommands || loops.Any(l => l.HasCommands);
 
         private delegate void DrawablePropertyInitializer<in T>(Drawable drawable, T value);

From 89940e7bb9fc9330eb3ad3e13a4602f04b4912d8 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sun, 18 Apr 2021 18:35:44 -0700
Subject: [PATCH 2613/3722] Fix download button check icon not scaling on mouse
 down

---
 osu.Game/Graphics/UserInterface/DownloadButton.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/UserInterface/DownloadButton.cs b/osu.Game/Graphics/UserInterface/DownloadButton.cs
index 7a8db158c1..af270f30ae 100644
--- a/osu.Game/Graphics/UserInterface/DownloadButton.cs
+++ b/osu.Game/Graphics/UserInterface/DownloadButton.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Graphics.UserInterface
         [BackgroundDependencyLoader]
         private void load()
         {
-            AddInternal(checkmark = new SpriteIcon
+            Add(checkmark = new SpriteIcon
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,

From 2b6caf9b650fd5cfc5af4e168d1d794322ceb4a8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 11:25:43 +0900
Subject: [PATCH 2614/3722] Fix duplicate code in setting default logic

---
 osu.Game/Configuration/SessionStatics.cs | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Configuration/SessionStatics.cs b/osu.Game/Configuration/SessionStatics.cs
index e57b1c2fdf..ac94c39bd2 100644
--- a/osu.Game/Configuration/SessionStatics.cs
+++ b/osu.Game/Configuration/SessionStatics.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.Graphics.UserInterface;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
@@ -12,23 +13,18 @@ namespace osu.Game.Configuration
     /// </summary>
     public class SessionStatics : InMemoryConfigManager<Static>
     {
-        protected override void InitialiseDefaults()
-        {
-            SetDefault(Static.LoginOverlayDisplayed, false);
-            SetDefault(Static.MutedAudioNotificationShownOnce, false);
-            SetDefault(Static.LowBatteryNotificationShownOnce, false);
-            SetDefault(Static.LastHoverSoundPlaybackTime, (double?)null);
-            SetDefault<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null);
-        }
+        protected override void InitialiseDefaults() => ResetValues();
 
         public void ResetValues()
         {
-            GetOriginalBindable<bool>(Static.LoginOverlayDisplayed).SetDefault();
-            GetOriginalBindable<bool>(Static.MutedAudioNotificationShownOnce).SetDefault();
-            GetOriginalBindable<bool>(Static.LowBatteryNotificationShownOnce).SetDefault();
-            GetOriginalBindable<double?>(Static.LastHoverSoundPlaybackTime).SetDefault();
-            GetOriginalBindable<APISeasonalBackgrounds>(Static.SeasonalBackgrounds).SetDefault();
+            ensureDefault(SetDefault(Static.LoginOverlayDisplayed, false));
+            ensureDefault(SetDefault(Static.MutedAudioNotificationShownOnce, false));
+            ensureDefault(SetDefault(Static.LowBatteryNotificationShownOnce, false));
+            ensureDefault(SetDefault(Static.LastHoverSoundPlaybackTime, (double?)null));
+            ensureDefault(SetDefault<APISeasonalBackgrounds>(Static.SeasonalBackgrounds, null));
         }
+
+        private void ensureDefault<T>(Bindable<T> bindable) => bindable.SetDefault();
     }
 
     public enum Static

From dbb8f7f4a95523e7770391f9a6c8578d39eae84a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 11:30:55 +0900
Subject: [PATCH 2615/3722] Tidy up initialisation code and avoid using DI on
 inherited class

---
 osu.Game/OsuGame.cs     | 12 ++++++------
 osu.Game/OsuGameBase.cs |  4 +++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 898a2baccf..1a2555f3f1 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -577,15 +577,15 @@ namespace osu.Game
 
             dependencies.CacheAs(idleTracker = new GameIdleTracker(6000));
 
-            GameIdleTracker sessionIdleTracker = new GameIdleTracker(300_000);
-            Add(sessionIdleTracker);
-
-            sessionIdleTracker.IsIdle.BindValueChanged(e =>
+            var sessionIdleTracker = new GameIdleTracker(300000);
+            sessionIdleTracker.IsIdle.BindValueChanged(idle =>
             {
-                if (e.NewValue)
-                    Dependencies.Get<SessionStatics>().ResetValues();
+                if (idle.NewValue)
+                    SessionStatics.ResetValues();
             });
 
+            Add(new GameIdleTracker(300000));
+
             AddRange(new Drawable[]
             {
                 new VolumeControlReceptor
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 406819cbd2..fbe4022cc1 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -61,6 +61,8 @@ namespace osu.Game
 
         protected OsuConfigManager LocalConfig;
 
+        protected SessionStatics SessionStatics { get; private set; }
+
         protected BeatmapManager BeatmapManager;
 
         protected ScoreManager ScoreManager;
@@ -289,7 +291,7 @@ namespace osu.Game
             if (powerStatus != null)
                 dependencies.CacheAs(powerStatus);
 
-            dependencies.Cache(new SessionStatics());
+            dependencies.Cache(SessionStatics = new SessionStatics());
             dependencies.Cache(new OsuColour());
 
             RegisterImportHandler(BeatmapManager);

From b727faace38e51a056c4131443fbf3a5356fbd71 Mon Sep 17 00:00:00 2001
From: jvyden <jvyden@jvyden.xyz>
Date: Sun, 18 Apr 2021 23:03:43 -0400
Subject: [PATCH 2616/3722] Revert changes to IdleTracker

---
 .../Visual/Components/TestSceneIdleTracker.cs | 41 +++----------------
 1 file changed, 5 insertions(+), 36 deletions(-)

diff --git a/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs b/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
index c3ea63ea65..d888f6a01e 100644
--- a/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
+++ b/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
@@ -5,7 +5,6 @@ using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Configuration;
 using osu.Game.Input;
 using osuTK;
 using osuTK.Graphics;
@@ -22,17 +21,14 @@ namespace osu.Game.Tests.Visual.Components
 
         private IdleTrackingBox[] boxes;
 
-        private SessionStatics sessionStatics;
-
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
-            sessionStatics = new SessionStatics();
             InputManager.MoveMouseTo(Vector2.Zero);
 
             Children = boxes = new[]
             {
-                box1 = new IdleTrackingBox(2000, sessionStatics)
+                box1 = new IdleTrackingBox(2000)
                 {
                     Name = "TopLeft",
                     RelativeSizeAxes = Axes.Both,
@@ -40,7 +36,7 @@ namespace osu.Game.Tests.Visual.Components
                     Anchor = Anchor.TopLeft,
                     Origin = Anchor.TopLeft,
                 },
-                box2 = new IdleTrackingBox(4000, sessionStatics)
+                box2 = new IdleTrackingBox(4000)
                 {
                     Name = "TopRight",
                     RelativeSizeAxes = Axes.Both,
@@ -48,7 +44,7 @@ namespace osu.Game.Tests.Visual.Components
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
                 },
-                box3 = new IdleTrackingBox(6000, sessionStatics)
+                box3 = new IdleTrackingBox(6000)
                 {
                     Name = "BottomLeft",
                     RelativeSizeAxes = Axes.Both,
@@ -56,7 +52,7 @@ namespace osu.Game.Tests.Visual.Components
                     Anchor = Anchor.BottomLeft,
                     Origin = Anchor.BottomLeft,
                 },
-                box4 = new IdleTrackingBox(8000, sessionStatics)
+                box4 = new IdleTrackingBox(8000)
                 {
                     Name = "BottomRight",
                     RelativeSizeAxes = Axes.Both,
@@ -145,27 +141,6 @@ namespace osu.Game.Tests.Visual.Components
 
             waitForAllIdle();
         }
-
-        [Test]
-        public void TestSessionStaticsReset()
-        {
-            AddStep("move to top left", () => InputManager.MoveMouseTo(box1));
-            AddStep("set session statics", () =>
-            {
-                sessionStatics.SetValue(Static.LoginOverlayDisplayed, true);
-                sessionStatics.SetValue(Static.MutedAudioNotificationShownOnce, true);
-                sessionStatics.SetValue(Static.LowBatteryNotificationShownOnce, true);
-                sessionStatics.SetValue(Static.LastHoverSoundPlaybackTime, (double?)1d);
-            });
-
-            AddStep("move away from box1", () => InputManager.MoveMouseTo(box4));
-            AddUntilStep("Wait for idle", () => box1.IsIdle);
-            AddAssert("LoginOverlayDisplayed is default", () => sessionStatics.Get<bool>(Static.LoginOverlayDisplayed) == false);
-            AddAssert("MutedAudioNotificationShownOnce is default", () => sessionStatics.Get<bool>(Static.MutedAudioNotificationShownOnce) == false);
-            AddAssert("LowBatteryNotificationShownOnce is default", () => sessionStatics.Get<bool>(Static.LowBatteryNotificationShownOnce) == false);
-            AddAssert("LastHoverSoundPlaybackTime is default", () => sessionStatics.Get<double?>(Static.LastHoverSoundPlaybackTime) == null);
-        }
-
         private void checkIdleStatus(int box, bool expectedIdle)
         {
             AddAssert($"box {box} is {(expectedIdle ? "idle" : "active")}", () => boxes[box - 1].IsIdle == expectedIdle);
@@ -182,7 +157,7 @@ namespace osu.Game.Tests.Visual.Components
 
             public bool IsIdle => idleTracker.IsIdle.Value;
 
-            public IdleTrackingBox(int timeToIdle, SessionStatics statics)
+            public IdleTrackingBox(int timeToIdle)
             {
                 Box box;
 
@@ -198,12 +173,6 @@ namespace osu.Game.Tests.Visual.Components
                         RelativeSizeAxes = Axes.Both,
                     },
                 };
-
-                idleTracker.IsIdle.BindValueChanged(idle =>
-                {
-                    box.Colour = idle.NewValue ? Color4.White : Color4.Black;
-                    if (idle.NewValue) statics.ResetValues();
-                }, true);
             }
         }
     }

From c39ab2c69219ff8d47337993597d56fc51fd01ab Mon Sep 17 00:00:00 2001
From: jvyden <jvyden@jvyden.xyz>
Date: Sun, 18 Apr 2021 23:04:28 -0400
Subject: [PATCH 2617/3722] Add SessionStaticsTest

---
 .../NonVisual/SessionStaticsTest.cs           | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 osu.Game.Tests/NonVisual/SessionStaticsTest.cs

diff --git a/osu.Game.Tests/NonVisual/SessionStaticsTest.cs b/osu.Game.Tests/NonVisual/SessionStaticsTest.cs
new file mode 100644
index 0000000000..d5fd803986
--- /dev/null
+++ b/osu.Game.Tests/NonVisual/SessionStaticsTest.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 NUnit.Framework;
+using osu.Game.Configuration;
+using osu.Game.Input;
+
+namespace osu.Game.Tests.NonVisual
+{
+    [TestFixture]
+    public class SessionStaticsTest
+    {
+        private SessionStatics sessionStatics;
+        private IdleTracker sessionIdleTracker;
+
+        [SetUp]
+        public void SetUp()
+        {
+            sessionStatics = new SessionStatics();
+            sessionIdleTracker = new GameIdleTracker(1000);
+
+            sessionStatics.SetValue(Static.LoginOverlayDisplayed, true);
+            sessionStatics.SetValue(Static.MutedAudioNotificationShownOnce, true);
+            sessionStatics.SetValue(Static.LowBatteryNotificationShownOnce, true);
+            sessionStatics.SetValue(Static.LastHoverSoundPlaybackTime, (double?)1d);
+
+            sessionIdleTracker.IsIdle.BindValueChanged(e =>
+            {
+                if (e.NewValue)
+                    sessionStatics.ResetValues();
+            });
+        }
+
+        [Test]
+        [Timeout(2000)]
+        public void TestSessionStaticsReset()
+        {
+            sessionIdleTracker.IsIdle.BindValueChanged(e =>
+            {
+                Assert.IsTrue(sessionStatics.GetBindable<bool>(Static.LoginOverlayDisplayed).IsDefault);
+                Assert.IsTrue(sessionStatics.GetBindable<bool>(Static.MutedAudioNotificationShownOnce).IsDefault);
+                Assert.IsTrue(sessionStatics.GetBindable<bool>(Static.LowBatteryNotificationShownOnce).IsDefault);
+                Assert.IsTrue(sessionStatics.GetBindable<double?>(Static.LastHoverSoundPlaybackTime).IsDefault);
+            });
+        }
+    }
+}

From 99fab456b57adb11d4bbb6a92b959633fb33c21c Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Sun, 18 Apr 2021 23:25:20 -0400
Subject: [PATCH 2618/3722] Storyboard completion calls updateCompletionState
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- If the storyboard ends after the beatmap, call updateCompletionState as if the score processor has completed at that time. (completionProgressDelegate is null here since earlier when the score processor actually completed, updateCompletionState returned after showing the skip overlay.)

- If the storyboard ends before the beatmap does, updateCompletionState simply returns and waits until the score processor is completed.

- If the storyboard and beatmap end at the exact same time, make sure updateCompletionState() is called only once by the score processor completion.

Co-Authored-By: Marlina José <marlina@umich.edu>
---
 osu.Game/Screens/Play/Player.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index da877fcd22..231fcbc174 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -285,8 +285,8 @@ namespace osu.Game.Screens.Play
 
             DimmableStoryboard.HasStoryboardEnded.ValueChanged += storyboardEnded =>
             {
-                if (storyboardEnded.NewValue && ScoreProcessor.HasCompleted.Value)
-                    scheduleCompletion();
+                if (storyboardEnded.NewValue && completionProgressDelegate == null)
+                    updateCompletionState(new ValueChangedEvent<bool>(true, ScoreProcessor.HasCompleted.Value));
             };
 
             // Bind the judgement processors to ourselves

From fd1241cc8513c72674f723a4c8767d9d5672430d Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Sun, 18 Apr 2021 23:26:50 -0400
Subject: [PATCH 2619/3722] Added tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

New tests:
- storyboard ending during the failing animation
- showResults = false
- storyboard ending before score processor completion

Co-Authored-By: Marlina José <marlina@umich.edu>
---
 .../Gameplay/TestSceneStoryboardWithOutro.cs  | 92 ++++++++++++++++---
 1 file changed, 78 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
index fa1c4aa0d1..8326063f81 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
@@ -1,17 +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.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
+using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
 using osu.Game.Storyboards;
 using osuTK;
@@ -20,9 +25,15 @@ namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneStoryboardWithOutro : PlayerTestScene
     {
+        protected override bool HasCustomSteps => true;
+
         protected new OutroPlayer Player => (OutroPlayer)base.Player;
 
-        private const double storyboard_duration = 2000;
+        private double currentStoryboardDuration;
+
+        private bool showResults = true;
+
+        private event Func<HealthProcessor, JudgementResult, bool> currentFailConditions;
 
         [SetUpSteps]
         public override void SetUpSteps()
@@ -30,11 +41,15 @@ namespace osu.Game.Tests.Visual.Gameplay
             base.SetUpSteps();
             AddStep("enable storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, true));
             AddStep("set dim level to 0", () => LocalConfig.SetValue<double>(OsuSetting.DimLevel, 0));
+            AddStep("reset fail conditions", () => currentFailConditions = (_, __) => false);
+            AddStep("set storyboard duration to 2s", () => currentStoryboardDuration = 2000);
+            AddStep("set ShowResults = true", () => showResults = true);
         }
 
         [Test]
         public void TestStoryboardSkipOutro()
         {
+            CreateTest(null);
             AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
             AddStep("skip outro", () => InputManager.Key(osuTK.Input.Key.Space));
             AddAssert("score shown", () => Player.IsScoreShown);
@@ -43,13 +58,15 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestStoryboardNoSkipOutro()
         {
-            AddUntilStep("storyboard ends", () => Player.GameplayClockContainer.GameplayClock.CurrentTime >= storyboard_duration);
+            CreateTest(null);
+            AddUntilStep("storyboard ends", () => Player.GameplayClockContainer.GameplayClock.CurrentTime >= currentStoryboardDuration);
             AddUntilStep("wait for score shown", () => Player.IsScoreShown);
         }
 
         [Test]
         public void TestStoryboardExitToSkipOutro()
         {
+            CreateTest(null);
             AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
             AddStep("exit via pause", () => Player.ExitViaPause());
             AddAssert("score shown", () => Player.IsScoreShown);
@@ -59,16 +76,51 @@ namespace osu.Game.Tests.Visual.Gameplay
         [TestCase(true)]
         public void TestStoryboardToggle(bool enabledAtBeginning)
         {
+            CreateTest(null);
             AddStep($"{(enabledAtBeginning ? "enable" : "disable")} storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, enabledAtBeginning));
             AddStep("toggle storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, !enabledAtBeginning));
             AddUntilStep("wait for score shown", () => Player.IsScoreShown);
         }
 
-        protected override bool AllowFail => false;
+        [Test]
+        public void TestOutroEndsDuringFailAnimation()
+        {
+            CreateTest(() =>
+            {
+                AddStep("fail on first judgement", () => currentFailConditions = (_, __) => true);
+                AddStep("set storyboard duration to 1.3s", () => currentStoryboardDuration = 1300);
+            });
+            AddUntilStep("wait for fail", () => Player.HasFailed);
+            AddUntilStep("storyboard ends", () => Player.GameplayClockContainer.GameplayClock.CurrentTime >= currentStoryboardDuration);
+            AddUntilStep("wait for fail overlay", () => Player.FailOverlay.State.Value == Visibility.Visible);
+        }
+
+        [Test]
+        public void TestShowResultsFalse()
+        {
+            CreateTest(() =>
+            {
+                AddStep("set ShowResults = false", () => showResults = false);
+            });
+            AddUntilStep("storyboard ends", () => Player.GameplayClockContainer.GameplayClock.CurrentTime >= currentStoryboardDuration);
+            AddWaitStep("wait", 10);
+            AddAssert("no score shown", () => !Player.IsScoreShown);
+        }
+
+        [Test]
+        public void TestStoryboardEndsBeforeCompletion()
+        {
+            CreateTest(() => AddStep("set storyboard duration to .1s", () => currentStoryboardDuration = 100));
+            AddUntilStep("storyboard ends", () => Player.GameplayClockContainer.GameplayClock.CurrentTime >= currentStoryboardDuration);
+            AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
+            AddUntilStep("wait for score shown", () => Player.IsScoreShown);
+        }
+
+        protected override bool AllowFail => true;
 
         protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
 
-        protected override TestPlayer CreatePlayer(Ruleset ruleset) => new OutroPlayer();
+        protected override TestPlayer CreatePlayer(Ruleset ruleset) => new OutroPlayer(currentFailConditions, showResults);
 
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
         {
@@ -79,26 +131,38 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
         {
-            if (storyboard == null)
-            {
-                storyboard = new Storyboard();
-                var sprite = new StoryboardSprite("unknown", Anchor.TopLeft, Vector2.Zero);
-                sprite.TimelineGroup.Alpha.Add(Easing.None, 0, storyboard_duration, 1, 0);
-                storyboard.GetLayer("Background").Add(sprite);
-            }
+            return base.CreateWorkingBeatmap(beatmap, createStoryboard(currentStoryboardDuration));
+        }
 
-            return base.CreateWorkingBeatmap(beatmap, storyboard);
+        private Storyboard createStoryboard(double duration)
+        {
+            var storyboard = new Storyboard();
+            var sprite = new StoryboardSprite("unknown", Anchor.TopLeft, Vector2.Zero);
+            sprite.TimelineGroup.Alpha.Add(Easing.None, 0, duration, 1, 0);
+            storyboard.GetLayer("Background").Add(sprite);
+            return storyboard;
         }
 
         protected class OutroPlayer : TestPlayer
         {
             public void ExitViaPause() => PerformExit(true);
 
+            public new FailOverlay FailOverlay => base.FailOverlay;
+
             public bool IsScoreShown => !this.IsCurrentScreen() && this.GetChildScreen() is ResultsScreen;
 
-            public OutroPlayer()
-                : base(false)
+            private event Func<HealthProcessor, JudgementResult, bool> failConditions;
+
+            public OutroPlayer(Func<HealthProcessor, JudgementResult, bool> failConditions, bool showResults = true)
+                : base(false, showResults)
             {
+                this.failConditions = failConditions;
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                HealthProcessor.FailConditions += failConditions;
             }
 
             protected override Task ImportScore(Score score)

From 999f2d810caba2e15d720aebcfdc1e2e47fcdf8b Mon Sep 17 00:00:00 2001
From: jvyden <jvyden@jvyden.xyz>
Date: Sun, 18 Apr 2021 23:30:07 -0400
Subject: [PATCH 2620/3722] Fix accidentally removed code

---
 osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs b/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
index d888f6a01e..77eadc14be 100644
--- a/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
+++ b/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
@@ -173,6 +173,8 @@ namespace osu.Game.Tests.Visual.Components
                         RelativeSizeAxes = Axes.Both,
                     },
                 };
+
+                idleTracker.IsIdle.BindValueChanged(idle => box.Colour = idle.NewValue ? Color4.White : Color4.Black, true);
             }
         }
     }

From f9f514ffec646a245d8c310594c4bae619b4a0c8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 12:37:56 +0900
Subject: [PATCH 2621/3722] Add basic xmldoc to show how the two colour classes
 interact

---
 osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs | 3 +++
 osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs b/osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs
index 5d9d2521cb..c07e5d5bf7 100644
--- a/osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs
@@ -16,6 +16,9 @@ using osuTK.Graphics;
 
 namespace osu.Game.Graphics.UserInterfaceV2
 {
+    /// <summary>
+    /// A component which displays a colour along with related description text.
+    /// </summary>
     public class ColourDisplay : CompositeDrawable, IHasCurrentValue<Color4>
     {
         private readonly BindableWithCurrent<Color4> current = new BindableWithCurrent<Color4>();
diff --git a/osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs b/osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs
index 3ca5c2d8d1..ba950048dc 100644
--- a/osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/ColourPalette.cs
@@ -12,6 +12,9 @@ using osuTK.Graphics;
 
 namespace osu.Game.Graphics.UserInterfaceV2
 {
+    /// <summary>
+    /// A component which displays a collection of colours in individual <see cref="ColourDisplay"/>s.
+    /// </summary>
     public class ColourPalette : CompositeDrawable
     {
         public BindableList<Color4> Colours { get; } = new BindableList<Color4>();

From a854ce429a8a30f042d98521248a0b7b99456f19 Mon Sep 17 00:00:00 2001
From: jvyden <jvyden@jvyden.xyz>
Date: Sun, 18 Apr 2021 23:49:13 -0400
Subject: [PATCH 2622/3722] add blank line between method

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

diff --git a/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs b/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
index 77eadc14be..86a9d555a3 100644
--- a/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
+++ b/osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
@@ -141,6 +141,7 @@ namespace osu.Game.Tests.Visual.Components
 
             waitForAllIdle();
         }
+
         private void checkIdleStatus(int box, bool expectedIdle)
         {
             AddAssert($"box {box} is {(expectedIdle ? "idle" : "active")}", () => boxes[box - 1].IsIdle == expectedIdle);

From 658c23c92522cc634063b012062ffad85b8e5b6c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 13:15:17 +0900
Subject: [PATCH 2623/3722] Give more space to the parameter adjustment area

---
 osu.Game/Screens/Edit/Timing/TimingScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Timing/TimingScreen.cs b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
index c5d2dd756a..74ca6bc6f9 100644
--- a/osu.Game/Screens/Edit/Timing/TimingScreen.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Edit.Timing
             ColumnDimensions = new[]
             {
                 new Dimension(),
-                new Dimension(GridSizeMode.Absolute, 200),
+                new Dimension(GridSizeMode.Absolute, 350),
             },
             Content = new[]
             {

From 0c918410d07026a9b9bfd145ce1eb6ef0ed30a0a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 13:15:24 +0900
Subject: [PATCH 2624/3722] Make "add" button more visible

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

diff --git a/osu.Game/Screens/Edit/Timing/TimingScreen.cs b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
index 74ca6bc6f9..d7a5442de1 100644
--- a/osu.Game/Screens/Edit/Timing/TimingScreen.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
@@ -106,9 +106,9 @@ namespace osu.Game.Screens.Edit.Timing
                             },
                             new OsuButton
                             {
-                                Text = "+",
+                                Text = "+ Add at current time",
                                 Action = addNew,
-                                Size = new Vector2(30, 30),
+                                Size = new Vector2(160, 30),
                                 Anchor = Anchor.BottomRight,
                                 Origin = Anchor.BottomRight,
                             },

From 513e470b525c4948d793555beb0df0928b3b9019 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 13:24:53 +0900
Subject: [PATCH 2625/3722] Adjust grid spacing to allow attributes to use more
 width

---
 osu.Game/Screens/Edit/Timing/ControlPointTable.cs | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index dd51056bf1..6d4f3d1b3a 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -66,9 +66,7 @@ namespace osu.Game.Screens.Edit.Timing
         {
             var columns = new List<TableColumn>
             {
-                new TableColumn(string.Empty, Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
-                new TableColumn("Time", Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
-                new TableColumn(),
+                new TableColumn("Time", Anchor.CentreLeft, new Dimension(GridSizeMode.Absolute, 120)),
                 new TableColumn("Attributes", Anchor.CentreLeft),
             };
 
@@ -77,18 +75,11 @@ namespace osu.Game.Screens.Edit.Timing
 
         private Drawable[] createContent(int index, ControlPointGroup group) => new Drawable[]
         {
-            new OsuSpriteText
-            {
-                Text = $"#{index + 1}",
-                Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Bold),
-                Margin = new MarginPadding(10)
-            },
             new OsuSpriteText
             {
                 Text = group.Time.ToEditorFormattedString(),
                 Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Bold)
             },
-            null,
             new ControlGroupAttributes(group),
         };
 

From ffc1e841e045270e0d28c670778b516264f7db08 Mon Sep 17 00:00:00 2001
From: jvyden <jvyden@jvyden.xyz>
Date: Mon, 19 Apr 2021 01:06:26 -0400
Subject: [PATCH 2626/3722] Fix sessionIdleTracker not being properly added to
 OsuGame

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 1a2555f3f1..28f32ba455 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -584,7 +584,7 @@ namespace osu.Game
                     SessionStatics.ResetValues();
             });
 
-            Add(new GameIdleTracker(300000));
+            Add(sessionIdleTracker);
 
             AddRange(new Drawable[]
             {

From 0b36dd9bce6e4f958b51e91d52c7fd650abf2673 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Mon, 19 Apr 2021 01:23:21 -0400
Subject: [PATCH 2627/3722] Skip outro overlay and PerformExit() call
 updateCompletionState() instead of scheduleCompletion()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Marlina José <marlina@umich.edu>
---
 osu.Game/Screens/Play/Player.cs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 231fcbc174..ef2e042260 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -290,7 +290,7 @@ namespace osu.Game.Screens.Play
             };
 
             // Bind the judgement processors to ourselves
-            ScoreProcessor.HasCompleted.ValueChanged += updateCompletionState;
+            ScoreProcessor.HasCompleted.BindValueChanged(e => updateCompletionState(e));
             HealthProcessor.Failed += onFail;
 
             foreach (var mod in Mods.Value.OfType<IApplicableToScoreProcessor>())
@@ -370,7 +370,7 @@ namespace osu.Game.Screens.Play
                     },
                     skipOutroOverlay = new SkipOverlay(Beatmap.Value.Storyboard.LatestEventTime ?? 0)
                     {
-                        RequestSkip = scheduleCompletion,
+                        RequestSkip = () => updateCompletionState(new ValueChangedEvent<bool>(true, true), true),
                         Alpha = 0
                     },
                     FailOverlay = new FailOverlay
@@ -542,7 +542,7 @@ namespace osu.Game.Screens.Play
 
                 // if the score is ready for display but results screen has not been pushed yet (e.g. storyboard is still playing beyond gameplay), then transition to results screen instead of exiting.
                 if (prepareScoreForDisplayTask != null)
-                    scheduleCompletion();
+                    updateCompletionState(new ValueChangedEvent<bool>(true, true), true);
             }
 
             this.Exit();
@@ -581,7 +581,7 @@ namespace osu.Game.Screens.Play
         private ScheduledDelegate completionProgressDelegate;
         private Task<ScoreInfo> prepareScoreForDisplayTask;
 
-        private void updateCompletionState(ValueChangedEvent<bool> completionState)
+        private void updateCompletionState(ValueChangedEvent<bool> completionState, bool skipStoryboardOutro = false)
         {
             // screen may be in the exiting transition phase.
             if (!this.IsCurrentScreen())
@@ -631,6 +631,12 @@ namespace osu.Game.Screens.Play
                 return score.ScoreInfo;
             });
 
+            if (skipStoryboardOutro)
+            {
+                scheduleCompletion();
+                return;
+            }
+
             var storyboardHasOutro = DimmableStoryboard.ContentDisplayed && !DimmableStoryboard.HasStoryboardEnded.Value;
 
             if (storyboardHasOutro)

From e143afb598c3d3c8c688f2341ef8320d03e91018 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 13:57:46 +0900
Subject: [PATCH 2628/3722] Split out rounded content screen from SetupScreen
 for use in other places

---
 .../Edit/RoundedContentEditorScreen.cs        | 61 +++++++++++++++++++
 osu.Game/Screens/Edit/Setup/SetupScreen.cs    | 49 +++------------
 .../Screens/Edit/Setup/SetupScreenHeader.cs   |  2 +-
 osu.Game/Screens/Edit/Setup/SetupSection.cs   |  2 +-
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs  |  9 ++-
 5 files changed, 77 insertions(+), 46 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/RoundedContentEditorScreen.cs

diff --git a/osu.Game/Screens/Edit/RoundedContentEditorScreen.cs b/osu.Game/Screens/Edit/RoundedContentEditorScreen.cs
new file mode 100644
index 0000000000..a55ae3f635
--- /dev/null
+++ b/osu.Game/Screens/Edit/RoundedContentEditorScreen.cs
@@ -0,0 +1,61 @@
+// Copyright (c) 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.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Overlays;
+
+namespace osu.Game.Screens.Edit
+{
+    public class RoundedContentEditorScreen : EditorScreen
+    {
+        public const int HORIZONTAL_PADDING = 100;
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        [Cached]
+        protected readonly OverlayColourProvider ColourProvider;
+
+        private Container roundedContent;
+
+        protected override Container<Drawable> Content => roundedContent;
+
+        public RoundedContentEditorScreen(EditorScreenMode mode)
+            : base(mode)
+        {
+            ColourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            base.Content.Add(new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Padding = new MarginPadding(50),
+                Child = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Masking = true,
+                    CornerRadius = 10,
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            Colour = ColourProvider.Dark4,
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        roundedContent = new Container
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                    }
+                }
+            });
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index 70671b487c..15cb384573 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -3,24 +3,12 @@
 
 using osu.Framework.Allocation;
 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.Overlays;
 
 namespace osu.Game.Screens.Edit.Setup
 {
-    public class SetupScreen : EditorScreen
+    public class SetupScreen : RoundedContentEditorScreen
     {
-        public const int HORIZONTAL_PADDING = 100;
-
-        [Resolved]
-        private OsuColour colours { get; set; }
-
-        [Cached]
-        protected readonly OverlayColourProvider ColourProvider;
-
         [Cached]
         private SectionsContainer<SetupSection> sections = new SectionsContainer<SetupSection>();
 
@@ -30,42 +18,25 @@ namespace osu.Game.Screens.Edit.Setup
         public SetupScreen()
             : base(EditorScreenMode.SongSetup)
         {
-            ColourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            Child = new Container
+            AddRange(new Drawable[]
             {
-                RelativeSizeAxes = Axes.Both,
-                Padding = new MarginPadding(50),
-                Child = new Container
+                sections = new SectionsContainer<SetupSection>
                 {
+                    FixedHeader = header,
                     RelativeSizeAxes = Axes.Both,
-                    Masking = true,
-                    CornerRadius = 10,
-                    Children = new Drawable[]
+                    Children = new SetupSection[]
                     {
-                        new Box
-                        {
-                            Colour = ColourProvider.Dark4,
-                            RelativeSizeAxes = Axes.Both,
-                        },
-                        sections = new SectionsContainer<SetupSection>
-                        {
-                            FixedHeader = header,
-                            RelativeSizeAxes = Axes.Both,
-                            Children = new SetupSection[]
-                            {
-                                new ResourcesSection(),
-                                new MetadataSection(),
-                                new DifficultySection(),
-                            }
-                        },
+                        new ResourcesSection(),
+                        new MetadataSection(),
+                        new DifficultySection(),
                     }
-                }
-            };
+                },
+            });
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs b/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
index 06aad69afa..10daacc359 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
@@ -93,7 +93,7 @@ namespace osu.Game.Screens.Edit.Setup
 
             public SetupScreenTabControl()
             {
-                TabContainer.Margin = new MarginPadding { Horizontal = SetupScreen.HORIZONTAL_PADDING };
+                TabContainer.Margin = new MarginPadding { Horizontal = RoundedContentEditorScreen.HORIZONTAL_PADDING };
 
                 AddInternal(background = new Box
                 {
diff --git a/osu.Game/Screens/Edit/Setup/SetupSection.cs b/osu.Game/Screens/Edit/Setup/SetupSection.cs
index de62c3a468..b3ae15900f 100644
--- a/osu.Game/Screens/Edit/Setup/SetupSection.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupSection.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Screens.Edit.Setup
             Padding = new MarginPadding
             {
                 Vertical = 10,
-                Horizontal = SetupScreen.HORIZONTAL_PADDING
+                Horizontal = RoundedContentEditorScreen.HORIZONTAL_PADDING
             };
 
             InternalChild = new FillFlowContainer
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index 550fbe2950..a2ee153951 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -7,16 +7,16 @@ 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.Containers;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Checks.Components;
 using osuTK;
 
 namespace osu.Game.Screens.Edit.Verify
 {
-    public class VerifyScreen : EditorScreen
+    public class VerifyScreen : RoundedContentEditorScreen
     {
         [Cached]
         private Bindable<Issue> selectedIssue = new Bindable<Issue>();
@@ -32,7 +32,6 @@ namespace osu.Game.Screens.Edit.Verify
             Child = new Container
             {
                 RelativeSizeAxes = Axes.Both,
-                Padding = new MarginPadding(20),
                 Child = new GridContainer
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -70,7 +69,7 @@ namespace osu.Game.Screens.Edit.Verify
             private BeatmapVerifier generalVerifier;
 
             [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
+            private void load(OverlayColourProvider colours)
             {
                 generalVerifier = new BeatmapVerifier();
                 rulesetVerifier = Beatmap.BeatmapInfo.Ruleset?.CreateInstance()?.CreateBeatmapVerifier();
@@ -81,7 +80,7 @@ namespace osu.Game.Screens.Edit.Verify
                 {
                     new Box
                     {
-                        Colour = colours.Gray0,
+                        Colour = colours.Background2,
                         RelativeSizeAxes = Axes.Both,
                     },
                     new OsuScrollContainer

From f4baff9e0495b3939b5970bdcdbc6f32fc114088 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 14:11:26 +0900
Subject: [PATCH 2629/3722] Make `TimingScreen` use rounded screen and adjust
 spacing/padding

---
 osu.Game/Screens/Edit/EditorTable.cs          |  7 +--
 .../Edit/Timing/ControlPointSettings.cs       |  6 +--
 osu.Game/Screens/Edit/Timing/Section.cs       | 20 ++++-----
 osu.Game/Screens/Edit/Timing/TimingScreen.cs  | 43 +++++++++----------
 4 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/osu.Game/Screens/Edit/EditorTable.cs b/osu.Game/Screens/Edit/EditorTable.cs
index ef1c88db9a..9a793c8c97 100644
--- a/osu.Game/Screens/Edit/EditorTable.cs
+++ b/osu.Game/Screens/Edit/EditorTable.cs
@@ -9,6 +9,7 @@ using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Overlays;
 using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit
@@ -93,10 +94,10 @@ namespace osu.Game.Screens.Edit
             private Color4 colourSelected;
 
             [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
+            private void load(OverlayColourProvider colours)
             {
-                hoveredBackground.Colour = colourHover = colours.BlueDarker;
-                colourSelected = colours.YellowDarker;
+                hoveredBackground.Colour = colourHover = colours.Background3;
+                colourSelected = colours.Background1;
             }
 
             private bool selected;
diff --git a/osu.Game/Screens/Edit/Timing/ControlPointSettings.cs b/osu.Game/Screens/Edit/Timing/ControlPointSettings.cs
index c40061b97c..921fa675b3 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointSettings.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointSettings.cs
@@ -6,15 +6,15 @@ using osu.Framework.Allocation;
 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.Overlays;
 
 namespace osu.Game.Screens.Edit.Timing
 {
     public class ControlPointSettings : CompositeDrawable
     {
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OverlayColourProvider colours)
         {
             RelativeSizeAxes = Axes.Both;
 
@@ -22,7 +22,7 @@ namespace osu.Game.Screens.Edit.Timing
             {
                 new Box
                 {
-                    Colour = colours.Gray3,
+                    Colour = colours.Background4,
                     RelativeSizeAxes = Axes.Both,
                 },
                 new OsuScrollContainer
diff --git a/osu.Game/Screens/Edit/Timing/Section.cs b/osu.Game/Screens/Edit/Timing/Section.cs
index 5269fa9774..8659b7aff6 100644
--- a/osu.Game/Screens/Edit/Timing/Section.cs
+++ b/osu.Game/Screens/Edit/Timing/Section.cs
@@ -8,8 +8,9 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays;
+using osuTK;
 
 namespace osu.Game.Screens.Edit.Timing
 {
@@ -23,7 +24,7 @@ namespace osu.Game.Screens.Edit.Timing
 
         protected Bindable<T> ControlPoint { get; } = new Bindable<T>();
 
-        private const float header_height = 20;
+        private const float header_height = 50;
 
         [Resolved]
         protected EditorBeatmap Beatmap { get; private set; }
@@ -35,7 +36,7 @@ namespace osu.Game.Screens.Edit.Timing
         protected IEditorChangeHandler ChangeHandler { get; private set; }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OverlayColourProvider colours)
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeDuration = 200;
@@ -46,19 +47,17 @@ namespace osu.Game.Screens.Edit.Timing
 
             InternalChildren = new Drawable[]
             {
-                new Box
-                {
-                    Colour = colours.Gray1,
-                    RelativeSizeAxes = Axes.Both,
-                },
                 new Container
                 {
                     RelativeSizeAxes = Axes.X,
                     Height = header_height,
+                    Padding = new MarginPadding { Horizontal = 10 },
                     Children = new Drawable[]
                     {
                         checkbox = new OsuCheckbox
                         {
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
                             LabelText = typeof(T).Name.Replace(nameof(Beatmaps.ControlPoints.ControlPoint), string.Empty)
                         }
                     }
@@ -72,12 +71,13 @@ namespace osu.Game.Screens.Edit.Timing
                     {
                         new Box
                         {
-                            Colour = colours.Gray2,
+                            Colour = colours.Background3,
                             RelativeSizeAxes = Axes.Both,
                         },
                         Flow = new FillFlowContainer
                         {
-                            Padding = new MarginPadding(10),
+                            Padding = new MarginPadding(20),
+                            Spacing = new Vector2(20),
                             RelativeSizeAxes = Axes.X,
                             AutoSizeAxes = Axes.Y,
                             Direction = FillDirection.Vertical,
diff --git a/osu.Game/Screens/Edit/Timing/TimingScreen.cs b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
index d7a5442de1..0b446314e8 100644
--- a/osu.Game/Screens/Edit/Timing/TimingScreen.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
@@ -8,15 +8,14 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Screens.Edit.Compose.Components.Timeline;
+using osu.Game.Overlays;
 using osuTK;
 
 namespace osu.Game.Screens.Edit.Timing
 {
-    public class TimingScreen : EditorScreenWithTimeline
+    public class TimingScreen : RoundedContentEditorScreen
     {
         [Cached]
         private Bindable<ControlPointGroup> selectedGroup = new Bindable<ControlPointGroup>();
@@ -26,28 +25,26 @@ namespace osu.Game.Screens.Edit.Timing
         {
         }
 
-        protected override Drawable CreateMainContent() => new GridContainer
+        [BackgroundDependencyLoader]
+        private void load()
         {
-            RelativeSizeAxes = Axes.Both,
-            ColumnDimensions = new[]
+            Add(new GridContainer
             {
-                new Dimension(),
-                new Dimension(GridSizeMode.Absolute, 350),
-            },
-            Content = new[]
-            {
-                new Drawable[]
+                RelativeSizeAxes = Axes.Both,
+                ColumnDimensions = new[]
                 {
-                    new ControlPointList(),
-                    new ControlPointSettings(),
+                    new Dimension(),
+                    new Dimension(GridSizeMode.Absolute, 350),
                 },
-            }
-        };
-
-        protected override void OnTimelineLoaded(TimelineArea timelineArea)
-        {
-            base.OnTimelineLoaded(timelineArea);
-            timelineArea.Timeline.Zoom = timelineArea.Timeline.MinZoom;
+                Content = new[]
+                {
+                    new Drawable[]
+                    {
+                        new ControlPointList(),
+                        new ControlPointSettings(),
+                    },
+                }
+            });
         }
 
         public class ControlPointList : CompositeDrawable
@@ -70,7 +67,7 @@ namespace osu.Game.Screens.Edit.Timing
             private IEditorChangeHandler changeHandler { get; set; }
 
             [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
+            private void load(OverlayColourProvider colours)
             {
                 RelativeSizeAxes = Axes.Both;
 
@@ -78,7 +75,7 @@ namespace osu.Game.Screens.Edit.Timing
                 {
                     new Box
                     {
-                        Colour = colours.Gray0,
+                        Colour = colours.Background2,
                         RelativeSizeAxes = Axes.Both,
                     },
                     new OsuScrollContainer

From abfa6aec87047027380c54f75fcba502da3941df Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Mon, 19 Apr 2021 01:58:19 -0400
Subject: [PATCH 2630/3722] Remove completionState parameter

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index ef2e042260..dd7cf944f7 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -286,11 +286,11 @@ namespace osu.Game.Screens.Play
             DimmableStoryboard.HasStoryboardEnded.ValueChanged += storyboardEnded =>
             {
                 if (storyboardEnded.NewValue && completionProgressDelegate == null)
-                    updateCompletionState(new ValueChangedEvent<bool>(true, ScoreProcessor.HasCompleted.Value));
+                    updateCompletionState();
             };
 
             // Bind the judgement processors to ourselves
-            ScoreProcessor.HasCompleted.BindValueChanged(e => updateCompletionState(e));
+            ScoreProcessor.HasCompleted.BindValueChanged(_ => updateCompletionState());
             HealthProcessor.Failed += onFail;
 
             foreach (var mod in Mods.Value.OfType<IApplicableToScoreProcessor>())
@@ -370,7 +370,7 @@ namespace osu.Game.Screens.Play
                     },
                     skipOutroOverlay = new SkipOverlay(Beatmap.Value.Storyboard.LatestEventTime ?? 0)
                     {
-                        RequestSkip = () => updateCompletionState(new ValueChangedEvent<bool>(true, true), true),
+                        RequestSkip = () => updateCompletionState(true),
                         Alpha = 0
                     },
                     FailOverlay = new FailOverlay
@@ -542,7 +542,7 @@ namespace osu.Game.Screens.Play
 
                 // if the score is ready for display but results screen has not been pushed yet (e.g. storyboard is still playing beyond gameplay), then transition to results screen instead of exiting.
                 if (prepareScoreForDisplayTask != null)
-                    updateCompletionState(new ValueChangedEvent<bool>(true, true), true);
+                    updateCompletionState(true);
             }
 
             this.Exit();
@@ -581,13 +581,13 @@ namespace osu.Game.Screens.Play
         private ScheduledDelegate completionProgressDelegate;
         private Task<ScoreInfo> prepareScoreForDisplayTask;
 
-        private void updateCompletionState(ValueChangedEvent<bool> completionState, bool skipStoryboardOutro = false)
+        private void updateCompletionState(bool skipStoryboardOutro = false)
         {
             // screen may be in the exiting transition phase.
             if (!this.IsCurrentScreen())
                 return;
 
-            if (!completionState.NewValue)
+            if (!ScoreProcessor.HasCompleted.Value)
             {
                 completionProgressDelegate?.Cancel();
                 completionProgressDelegate = null;

From ef3801b5dd619d1fb0c5edf32c4d683ad26bd4ed Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 19 Apr 2021 15:29:26 +0900
Subject: [PATCH 2631/3722] Add helper method supporting RomanisableString

---
 .../Graphics/Containers/LinkFlowContainer.cs  | 34 ++++++-------------
 .../OnlinePlay/DrawableRoomPlaylistItem.cs    |  4 +--
 2 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/osu.Game/Graphics/Containers/LinkFlowContainer.cs b/osu.Game/Graphics/Containers/LinkFlowContainer.cs
index 32efcce80c..3a2f9d5a78 100644
--- a/osu.Game/Graphics/Containers/LinkFlowContainer.cs
+++ b/osu.Game/Graphics/Containers/LinkFlowContainer.cs
@@ -7,7 +7,10 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
 using System.Collections.Generic;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
+using osu.Framework.Localisation;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Users;
 
 namespace osu.Game.Graphics.Containers
@@ -59,6 +62,14 @@ namespace osu.Game.Graphics.Containers
         public void AddLink(string text, LinkAction action, string argument, string tooltipText = null, Action<SpriteText> creationParameters = null)
             => createLink(AddText(text, creationParameters), new LinkDetails(action, argument), tooltipText);
 
+        public void AddLink(RomanisableString text, LinkAction action, string argument, string tooltipText = null, Action<SpriteText> creationParameters = null)
+        {
+            var spriteText = new OsuSpriteText { Text = text };
+
+            AddText(spriteText, creationParameters);
+            createLink(spriteText.Yield(), new LinkDetails(action, argument), tooltipText);
+        }
+
         public void AddLink(IEnumerable<SpriteText> text, LinkAction action = LinkAction.External, string linkArgument = null, string tooltipText = null)
         {
             foreach (var t in text)
@@ -67,13 +78,6 @@ namespace osu.Game.Graphics.Containers
             createLink(text, new LinkDetails(action, linkArgument), tooltipText);
         }
 
-        public void AddLink(SpriteText text, LinkAction action = LinkAction.External, string linkArgument = null, string tooltipText = null)
-        {
-            AddArbitraryDrawable(text);
-
-            createLink(text, new LinkDetails(action, linkArgument), tooltipText);
-        }
-
         public void AddUserLink(User user, Action<SpriteText> creationParameters = null)
             => createLink(AddText(user.Username, creationParameters), new LinkDetails(LinkAction.OpenUserProfile, user.Id.ToString()), "view profile");
 
@@ -93,22 +97,6 @@ namespace osu.Game.Graphics.Containers
             });
         }
 
-        private void createLink(Drawable drawable, LinkDetails link, string tooltipText, Action action = null)
-        {
-            AddInternal(new DrawableLinkCompiler(drawable)
-            {
-                RelativeSizeAxes = Axes.Both,
-                TooltipText = tooltipText,
-                Action = () =>
-                {
-                    if (action != null)
-                        action();
-                    else
-                        game?.HandleLink(link);
-                },
-            });
-        }
-
         // We want the compilers to always be visible no matter where they are, so RelativeSizeAxes is used.
         // However due to https://github.com/ppy/osu-framework/issues/2073, it's possible for the compilers to be relative size in the flow's auto-size axes - an unsupported operation.
         // Since the compilers don't display any content and don't affect the layout, it's simplest to exclude them from the flow.
diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index a92ca610f3..38a9ace619 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -18,7 +18,6 @@ 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.Chat;
@@ -109,8 +108,7 @@ namespace osu.Game.Screens.OnlinePlay
             difficultyIconContainer.Child = new DifficultyIcon(beatmap.Value, ruleset.Value, requiredMods) { Size = new Vector2(32) };
 
             beatmapText.Clear();
-            beatmapText.AddLink(new OsuSpriteText { Text = Item.Beatmap.Value.ToRomanisableString() },
-                LinkAction.OpenBeatmap, Item.Beatmap.Value.OnlineBeatmapID.ToString());
+            beatmapText.AddLink(Item.Beatmap.Value.ToRomanisableString(), LinkAction.OpenBeatmap, Item.Beatmap.Value.OnlineBeatmapID.ToString());
 
             authorText.Clear();
 

From 25c7dc9ef0f7716a08878733b9cba18063cfef48 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 19 Apr 2021 15:30:11 +0900
Subject: [PATCH 2632/3722] Revert unnecessary change

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

diff --git a/osu.Game/Online/Chat/DrawableLinkCompiler.cs b/osu.Game/Online/Chat/DrawableLinkCompiler.cs
index 7675eab4c0..d27a3fbffe 100644
--- a/osu.Game/Online/Chat/DrawableLinkCompiler.cs
+++ b/osu.Game/Online/Chat/DrawableLinkCompiler.cs
@@ -31,11 +31,6 @@ namespace osu.Game.Online.Chat
             Parts = parts.ToList();
         }
 
-        public DrawableLinkCompiler(Drawable part)
-        {
-            Parts = new List<Drawable> { part };
-        }
-
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {

From 5885c24e003bd02c2ad1d1d01756e2dc513b9850 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 19 Apr 2021 16:00:56 +0900
Subject: [PATCH 2633/3722] Clear current user states on disconnect

---
 osu.Game/Online/Spectator/SpectatorStreamingClient.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 4bbc420223..03387cfb9f 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -125,6 +125,7 @@ namespace osu.Game.Online.Spectator
                     else
                     {
                         playingUsers.Clear();
+                        currentUserStates.Clear();
                     }
                 }, true);
             }

From de9e37857ee380e203668841daecd4c11ae1d839 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 19 Apr 2021 16:06:40 +0900
Subject: [PATCH 2634/3722] Lock around playingUsers

---
 .../Spectator/SpectatorStreamingClient.cs     | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 03387cfb9f..10a707a4ce 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -47,6 +47,8 @@ namespace osu.Game.Online.Spectator
 
         private readonly BindableList<int> playingUsers = new BindableList<int>();
 
+        private readonly Dictionary<int, SpectatorState> currentUserStates = new Dictionary<int, SpectatorState>();
+
         [CanBeNull]
         private IBeatmap currentBeatmap;
 
@@ -60,7 +62,6 @@ namespace osu.Game.Online.Spectator
         private IBindable<IReadOnlyList<Mod>> currentMods { get; set; }
 
         private readonly SpectatorState currentState = new SpectatorState();
-        private readonly Dictionary<int, SpectatorState> currentUserStates = new Dictionary<int, SpectatorState>();
 
         private bool isPlaying;
 
@@ -124,8 +125,11 @@ namespace osu.Game.Online.Spectator
                     }
                     else
                     {
-                        playingUsers.Clear();
-                        currentUserStates.Clear();
+                        lock (userLock)
+                        {
+                            playingUsers.Clear();
+                            currentUserStates.Clear();
+                        }
                     }
                 }, true);
             }
@@ -133,11 +137,13 @@ namespace osu.Game.Online.Spectator
 
         Task ISpectatorClient.UserBeganPlaying(int userId, SpectatorState state)
         {
-            if (!playingUsers.Contains(userId))
-                playingUsers.Add(userId);
-
             lock (userLock)
+            {
+                if (!playingUsers.Contains(userId))
+                    playingUsers.Add(userId);
+
                 currentUserStates[userId] = state;
+            }
 
             OnUserBeganPlaying?.Invoke(userId, state);
 
@@ -146,10 +152,11 @@ namespace osu.Game.Online.Spectator
 
         Task ISpectatorClient.UserFinishedPlaying(int userId, SpectatorState state)
         {
-            playingUsers.Remove(userId);
-
             lock (userLock)
+            {
+                playingUsers.Remove(userId);
                 currentUserStates.Remove(userId);
+            }
 
             OnUserFinishedPlaying?.Invoke(userId, state);
 

From 83716ddb089a2e9ac43026aa6440998ccbc0e6ad Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 19 Apr 2021 16:07:00 +0900
Subject: [PATCH 2635/3722] Rename currentUserStates -> playingUserStates

---
 osu.Game/Online/Spectator/SpectatorStreamingClient.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 10a707a4ce..9def009469 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Online.Spectator
 
         private readonly BindableList<int> playingUsers = new BindableList<int>();
 
-        private readonly Dictionary<int, SpectatorState> currentUserStates = new Dictionary<int, SpectatorState>();
+        private readonly Dictionary<int, SpectatorState> playingUserStates = new Dictionary<int, SpectatorState>();
 
         [CanBeNull]
         private IBeatmap currentBeatmap;
@@ -128,7 +128,7 @@ namespace osu.Game.Online.Spectator
                         lock (userLock)
                         {
                             playingUsers.Clear();
-                            currentUserStates.Clear();
+                            playingUserStates.Clear();
                         }
                     }
                 }, true);
@@ -142,7 +142,7 @@ namespace osu.Game.Online.Spectator
                 if (!playingUsers.Contains(userId))
                     playingUsers.Add(userId);
 
-                currentUserStates[userId] = state;
+                playingUserStates[userId] = state;
             }
 
             OnUserBeganPlaying?.Invoke(userId, state);
@@ -155,7 +155,7 @@ namespace osu.Game.Online.Spectator
             lock (userLock)
             {
                 playingUsers.Remove(userId);
-                currentUserStates.Remove(userId);
+                playingUserStates.Remove(userId);
             }
 
             OnUserFinishedPlaying?.Invoke(userId, state);
@@ -298,7 +298,7 @@ namespace osu.Game.Online.Spectator
 
             lock (userLock)
             {
-                foreach (var (userId, state) in currentUserStates)
+                foreach (var (userId, state) in playingUserStates)
                     callback(userId, state);
             }
         }

From a10a8680d0cedbb71666c6883f6ea4082997c48c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 15:06:07 +0900
Subject: [PATCH 2636/3722] Add new display for timing row attributes

---
 osu.Game/Beatmaps/Timing/TimeSignatures.cs    |  5 ++
 osu.Game/Screens/Edit/EditorTable.cs          |  2 +-
 .../Screens/Edit/Timing/ControlPointTable.cs  | 17 +++--
 osu.Game/Screens/Edit/Timing/RowAttribute.cs  | 68 ++++++++++++-------
 .../Timing/RowAttributes/EmptyRowAttribute.cs | 63 +++++++++++++++++
 .../RowAttributes/TimingRowAttribute.cs       | 45 ++++++++++++
 6 files changed, 170 insertions(+), 30 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/Timing/RowAttributes/EmptyRowAttribute.cs
 create mode 100644 osu.Game/Screens/Edit/Timing/RowAttributes/TimingRowAttribute.cs

diff --git a/osu.Game/Beatmaps/Timing/TimeSignatures.cs b/osu.Game/Beatmaps/Timing/TimeSignatures.cs
index 147f6239b4..33e6342ae6 100644
--- a/osu.Game/Beatmaps/Timing/TimeSignatures.cs
+++ b/osu.Game/Beatmaps/Timing/TimeSignatures.cs
@@ -1,11 +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.ComponentModel;
+
 namespace osu.Game.Beatmaps.Timing
 {
     public enum TimeSignatures
     {
+        [Description("4/4")]
         SimpleQuadruple = 4,
+
+        [Description("3/4")]
         SimpleTriple = 3
     }
 }
diff --git a/osu.Game/Screens/Edit/EditorTable.cs b/osu.Game/Screens/Edit/EditorTable.cs
index 9a793c8c97..5a34a79726 100644
--- a/osu.Game/Screens/Edit/EditorTable.cs
+++ b/osu.Game/Screens/Edit/EditorTable.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Screens.Edit
 
         protected const float ROW_HEIGHT = 25;
 
-        protected const int TEXT_SIZE = 14;
+        public const int TEXT_SIZE = 14;
 
         protected readonly FillFlowContainer<RowBackground> BackgroundFlow;
 
diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index 6d4f3d1b3a..a680a087b8 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -12,6 +12,7 @@ using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Extensions;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Screens.Edit.Timing.RowAttributes;
 using osuTK;
 using osuTK.Graphics;
 
@@ -119,7 +120,12 @@ namespace osu.Game.Screens.Edit.Timing
 
             private void createChildren()
             {
-                fill.ChildrenEnumerable = controlPoints.Select(createAttribute).Where(c => c != null);
+                fill.ChildrenEnumerable = controlPoints
+                                          .Select(createAttribute)
+                                          .Where(c => c != null)
+                                          // arbitrary ordering to make timing points first.
+                                          // probably want to explicitly define order in the future.
+                                          .OrderByDescending(c => c.GetType().Name);
             }
 
             private Drawable createAttribute(ControlPoint controlPoint)
@@ -129,20 +135,19 @@ namespace osu.Game.Screens.Edit.Timing
                 switch (controlPoint)
                 {
                     case TimingControlPoint timing:
-                        return new RowAttribute("timing", () => $"{60000 / timing.BeatLength:n1}bpm {timing.TimeSignature}", colour);
+                        return new TimingRowAttribute(timing);
 
                     case DifficultyControlPoint difficulty:
-
-                        return new RowAttribute("difficulty", () => $"{difficulty.SpeedMultiplier:n2}x", colour);
+                        return new EmptyRowAttribute("difficulty", () => $"{difficulty.SpeedMultiplier:n2}x", colour);
 
                     case EffectControlPoint effect:
-                        return new RowAttribute("effect", () => string.Join(" ",
+                        return new EmptyRowAttribute("effect", () => string.Join(" ",
                             effect.KiaiMode ? "Kiai" : string.Empty,
                             effect.OmitFirstBarLine ? "NoBarLine" : string.Empty
                         ).Trim(), colour);
 
                     case SampleControlPoint sample:
-                        return new RowAttribute("sample", () => $"{sample.SampleBank} {sample.SampleVolume}%", colour);
+                        return new EmptyRowAttribute("sample", () => $"{sample.SampleBank} {sample.SampleVolume}%", colour);
                 }
 
                 return null;
diff --git a/osu.Game/Screens/Edit/Timing/RowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttribute.cs
index 2757e08026..55051a1bb2 100644
--- a/osu.Game/Screens/Edit/Timing/RowAttribute.cs
+++ b/osu.Game/Screens/Edit/Timing/RowAttribute.cs
@@ -1,33 +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 System;
 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.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osuTK.Graphics;
+using osu.Game.Overlays;
+using osuTK;
 
 namespace osu.Game.Screens.Edit.Timing
 {
-    public class RowAttribute : CompositeDrawable, IHasTooltip
+    public class RowAttribute : CompositeDrawable
     {
-        private readonly string header;
-        private readonly Func<string> content;
-        private readonly Color4 colour;
+        private readonly ControlPoint point;
 
-        public RowAttribute(string header, Func<string> content, Color4 colour)
+        protected FillFlowContainer Content { get; private set; }
+
+        public RowAttribute(ControlPoint point)
         {
-            this.header = header;
-            this.content = content;
-            this.colour = colour;
+            this.point = point;
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OsuColour colours, OverlayColourProvider overlayColours)
         {
             AutoSizeAxes = Axes.X;
 
@@ -43,21 +41,45 @@ namespace osu.Game.Screens.Edit.Timing
             {
                 new Box
                 {
-                    Colour = colour,
+                    Colour = overlayColours.Background4,
                     RelativeSizeAxes = Axes.Both,
                 },
-                new OsuSpriteText
+                Content = new FillFlowContainer
                 {
-                    Padding = new MarginPadding(2),
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Font = OsuFont.Default.With(weight: FontWeight.SemiBold, size: 12),
-                    Text = header,
-                    Colour = colours.Gray0
-                },
+                    RelativeSizeAxes = Axes.Y,
+                    AutoSizeAxes = Axes.X,
+                    Direction = FillDirection.Horizontal,
+                    Margin = new MarginPadding { Right = 5 },
+                    Spacing = new Vector2(5),
+                    Children = new Drawable[]
+                    {
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.Y,
+                            AutoSizeAxes = Axes.X,
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                            Children = new Drawable[]
+                            {
+                                new Box
+                                {
+                                    Colour = point.GetRepresentingColour(colours),
+                                    RelativeSizeAxes = Axes.Both,
+                                },
+                                new OsuSpriteText
+                                {
+                                    Anchor = Anchor.CentreLeft,
+                                    Origin = Anchor.CentreLeft,
+                                    Padding = new MarginPadding(3),
+                                    Font = OsuFont.Default.With(weight: FontWeight.SemiBold, size: 12),
+                                    Text = point.GetType().Name.Replace("ControlPoint", string.Empty).ToLowerInvariant(),
+                                    Colour = colours.Gray0
+                                },
+                            },
+                        },
+                    },
+                }
             };
         }
-
-        public string TooltipText => content();
     }
 }
diff --git a/osu.Game/Screens/Edit/Timing/RowAttributes/EmptyRowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttributes/EmptyRowAttribute.cs
new file mode 100644
index 0000000000..8a73853eb3
--- /dev/null
+++ b/osu.Game/Screens/Edit/Timing/RowAttributes/EmptyRowAttribute.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;
+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.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Edit.Timing.RowAttributes
+{
+    public class EmptyRowAttribute : CompositeDrawable, IHasTooltip
+    {
+        private readonly string header;
+        private readonly Func<string> content;
+        private readonly Color4 colour;
+
+        public EmptyRowAttribute(string header, Func<string> content, Color4 colour)
+        {
+            this.header = header;
+            this.content = content;
+            this.colour = colour;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            AutoSizeAxes = Axes.X;
+
+            Height = 20;
+
+            Anchor = Anchor.CentreLeft;
+            Origin = Anchor.CentreLeft;
+
+            Masking = true;
+            CornerRadius = 5;
+
+            InternalChildren = new Drawable[]
+            {
+                new Box
+                {
+                    Colour = colour,
+                    RelativeSizeAxes = Axes.Both,
+                },
+                new OsuSpriteText
+                {
+                    Padding = new MarginPadding(2),
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Font = OsuFont.Default.With(weight: FontWeight.SemiBold, size: 12),
+                    Text = header,
+                    Colour = colours.Gray0
+                },
+            };
+        }
+
+        public string TooltipText => content();
+    }
+}
diff --git a/osu.Game/Screens/Edit/Timing/RowAttributes/TimingRowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttributes/TimingRowAttribute.cs
new file mode 100644
index 0000000000..07e041650c
--- /dev/null
+++ b/osu.Game/Screens/Edit/Timing/RowAttributes/TimingRowAttribute.cs
@@ -0,0 +1,45 @@
+// Copyright (c) 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.Game.Beatmaps.ControlPoints;
+using osu.Game.Beatmaps.Timing;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+
+namespace osu.Game.Screens.Edit.Timing.RowAttributes
+{
+    internal class TimingRowAttribute : RowAttribute
+    {
+        private readonly BindableNumber<double> beatLength;
+        private readonly Bindable<TimeSignatures> timeSignature;
+        private OsuSpriteText text;
+
+        public TimingRowAttribute(TimingControlPoint timing)
+            : base(timing)
+        {
+            timeSignature = timing.TimeSignatureBindable.GetBoundCopy();
+            beatLength = timing.BeatLengthBindable.GetBoundCopy();
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Content.Add(text = new OsuSpriteText
+            {
+                Anchor = Anchor.CentreLeft,
+                Origin = Anchor.CentreLeft,
+                Font = OsuFont.GetFont(size: EditorTable.TEXT_SIZE, weight: FontWeight.Regular),
+            });
+
+            timeSignature.BindValueChanged(_ => updateText());
+            beatLength.BindValueChanged(_ => updateText(), true);
+        }
+
+        private void updateText() =>
+            text.Text = $"{60000 / beatLength.Value:n1}bpm {timeSignature.Value.GetDescription()}";
+    }
+}

From d3cebfb6fb63d0dabd62f695f58ce41e241b5b27 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 15:27:38 +0900
Subject: [PATCH 2637/3722] Use explicit label

---
 osu.Game/Screens/Edit/Timing/RowAttribute.cs                | 6 ++++--
 .../Screens/Edit/Timing/RowAttributes/TimingRowAttribute.cs | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Timing/RowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttribute.cs
index 55051a1bb2..4cfdeb06c3 100644
--- a/osu.Game/Screens/Edit/Timing/RowAttribute.cs
+++ b/osu.Game/Screens/Edit/Timing/RowAttribute.cs
@@ -16,12 +16,14 @@ namespace osu.Game.Screens.Edit.Timing
     public class RowAttribute : CompositeDrawable
     {
         private readonly ControlPoint point;
+        private readonly string label;
 
         protected FillFlowContainer Content { get; private set; }
 
-        public RowAttribute(ControlPoint point)
+        public RowAttribute(ControlPoint point, string label)
         {
             this.point = point;
+            this.label = label;
         }
 
         [BackgroundDependencyLoader]
@@ -72,7 +74,7 @@ namespace osu.Game.Screens.Edit.Timing
                                     Origin = Anchor.CentreLeft,
                                     Padding = new MarginPadding(3),
                                     Font = OsuFont.Default.With(weight: FontWeight.SemiBold, size: 12),
-                                    Text = point.GetType().Name.Replace("ControlPoint", string.Empty).ToLowerInvariant(),
+                                    Text = label,
                                     Colour = colours.Gray0
                                 },
                             },
diff --git a/osu.Game/Screens/Edit/Timing/RowAttributes/TimingRowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttributes/TimingRowAttribute.cs
index 07e041650c..c6e2649f8e 100644
--- a/osu.Game/Screens/Edit/Timing/RowAttributes/TimingRowAttribute.cs
+++ b/osu.Game/Screens/Edit/Timing/RowAttributes/TimingRowAttribute.cs
@@ -12,14 +12,14 @@ using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Screens.Edit.Timing.RowAttributes
 {
-    internal class TimingRowAttribute : RowAttribute
+    public class TimingRowAttribute : RowAttribute
     {
         private readonly BindableNumber<double> beatLength;
         private readonly Bindable<TimeSignatures> timeSignature;
         private OsuSpriteText text;
 
         public TimingRowAttribute(TimingControlPoint timing)
-            : base(timing)
+            : base(timing, "timing")
         {
             timeSignature = timing.TimeSignatureBindable.GetBoundCopy();
             beatLength = timing.BeatLengthBindable.GetBoundCopy();

From 3aad0a8b9c6df9efe7381a5050fbd42c34ce8d37 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 15:57:27 +0900
Subject: [PATCH 2638/3722] Add new display for difficulty row attribute

---
 .../Screens/Edit/Timing/ControlPointTable.cs  |  2 +-
 osu.Game/Screens/Edit/Timing/RowAttribute.cs  |  8 ++--
 .../RowAttributes/AttributeProgressBar.cs     | 41 ++++++++++++++++
 .../RowAttributes/DifficultyRowAttribute.cs   | 48 +++++++++++++++++++
 4 files changed, 95 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/Timing/RowAttributes/AttributeProgressBar.cs
 create mode 100644 osu.Game/Screens/Edit/Timing/RowAttributes/DifficultyRowAttribute.cs

diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index a680a087b8..f71f31acb7 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -138,7 +138,7 @@ namespace osu.Game.Screens.Edit.Timing
                         return new TimingRowAttribute(timing);
 
                     case DifficultyControlPoint difficulty:
-                        return new EmptyRowAttribute("difficulty", () => $"{difficulty.SpeedMultiplier:n2}x", colour);
+                        return new DifficultyRowAttribute(difficulty);
 
                     case EffectControlPoint effect:
                         return new EmptyRowAttribute("effect", () => string.Join(" ",
diff --git a/osu.Game/Screens/Edit/Timing/RowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttribute.cs
index 4cfdeb06c3..e46459892c 100644
--- a/osu.Game/Screens/Edit/Timing/RowAttribute.cs
+++ b/osu.Game/Screens/Edit/Timing/RowAttribute.cs
@@ -15,14 +15,16 @@ namespace osu.Game.Screens.Edit.Timing
 {
     public class RowAttribute : CompositeDrawable
     {
-        private readonly ControlPoint point;
+        protected readonly ControlPoint Point;
+
         private readonly string label;
 
         protected FillFlowContainer Content { get; private set; }
 
         public RowAttribute(ControlPoint point, string label)
         {
-            this.point = point;
+            Point = point;
+
             this.label = label;
         }
 
@@ -65,7 +67,7 @@ namespace osu.Game.Screens.Edit.Timing
                             {
                                 new Box
                                 {
-                                    Colour = point.GetRepresentingColour(colours),
+                                    Colour = Point.GetRepresentingColour(colours),
                                     RelativeSizeAxes = Axes.Both,
                                 },
                                 new OsuSpriteText
diff --git a/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeProgressBar.cs b/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeProgressBar.cs
new file mode 100644
index 0000000000..9d7def4c33
--- /dev/null
+++ b/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeProgressBar.cs
@@ -0,0 +1,41 @@
+// Copyright (c) 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.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays;
+using osuTK;
+
+namespace osu.Game.Screens.Edit.Timing.RowAttributes
+{
+    public class AttributeProgressBar : ProgressBar
+    {
+        private readonly ControlPoint controlPoint;
+
+        public AttributeProgressBar(ControlPoint controlPoint)
+            : base(false)
+        {
+            this.controlPoint = controlPoint;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours, OverlayColourProvider overlayColours)
+        {
+            Anchor = Anchor.CentreLeft;
+            Origin = Anchor.CentreLeft;
+
+            Masking = true;
+
+            RelativeSizeAxes = Axes.None;
+
+            Size = new Vector2(80, 8);
+            CornerRadius = Height / 2;
+
+            BackgroundColour = overlayColours.Background6;
+            Colour = controlPoint.GetRepresentingColour(colours);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Timing/RowAttributes/DifficultyRowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttributes/DifficultyRowAttribute.cs
new file mode 100644
index 0000000000..1fdd8c2708
--- /dev/null
+++ b/osu.Game/Screens/Edit/Timing/RowAttributes/DifficultyRowAttribute.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 osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+
+namespace osu.Game.Screens.Edit.Timing.RowAttributes
+{
+    public class DifficultyRowAttribute : RowAttribute
+    {
+        private readonly BindableNumber<double> speedMultiplier;
+
+        private OsuSpriteText text;
+
+        public DifficultyRowAttribute(DifficultyControlPoint difficulty)
+            : base(difficulty, "difficulty")
+        {
+            speedMultiplier = difficulty.SpeedMultiplierBindable.GetBoundCopy();
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Content.AddRange(new Drawable[]
+            {
+                text = new OsuSpriteText
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Width = 40,
+                    Font = OsuFont.GetFont(size: EditorTable.TEXT_SIZE, weight: FontWeight.Regular),
+                },
+                new AttributeProgressBar(Point)
+                {
+                    Current = speedMultiplier,
+                }
+            });
+
+            speedMultiplier.BindValueChanged(_ => updateText(), true);
+        }
+
+        private void updateText() => text.Text = $"{speedMultiplier.Value:n2}x";
+    }
+}

From 6465a72060ab9cf3b7515bc288f56576b415bd1f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 16:23:26 +0900
Subject: [PATCH 2639/3722] Add bubbled word class for use in attribute rows

---
 .../RowAttributes/AttributeBubbledWord.cs     | 71 +++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 osu.Game/Screens/Edit/Timing/RowAttributes/AttributeBubbledWord.cs

diff --git a/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeBubbledWord.cs b/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeBubbledWord.cs
new file mode 100644
index 0000000000..3e956cbe92
--- /dev/null
+++ b/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeBubbledWord.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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Overlays;
+
+namespace osu.Game.Screens.Edit.Timing.RowAttributes
+{
+    public class AttributeBubbledWord : CompositeDrawable
+    {
+        private readonly ControlPoint controlPoint;
+
+        private OsuSpriteText textDrawable;
+
+        private string text;
+
+        public string Text
+        {
+            get => text;
+            set
+            {
+                if (value == text)
+                    return;
+
+                text = value;
+                if (textDrawable != null)
+                    textDrawable.Text = text;
+            }
+        }
+
+        public AttributeBubbledWord(ControlPoint controlPoint)
+        {
+            this.controlPoint = controlPoint;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours, OverlayColourProvider overlayColours)
+        {
+            AutoSizeAxes = Axes.X;
+
+            Anchor = Anchor.CentreLeft;
+            Origin = Anchor.CentreLeft;
+
+            Height = 12;
+
+            InternalChildren = new Drawable[]
+            {
+                new Circle
+                {
+                    Colour = controlPoint.GetRepresentingColour(colours),
+                    RelativeSizeAxes = Axes.Both,
+                },
+                textDrawable = new OsuSpriteText
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Padding = new MarginPadding(3),
+                    Font = OsuFont.Default.With(weight: FontWeight.SemiBold, size: 12),
+                    Text = text,
+                    Colour = colours.Gray0
+                },
+            };
+        }
+    }
+}

From ec249a0edbf40c694f905539ddf03691a463d222 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 16:10:37 +0900
Subject: [PATCH 2640/3722] Add new display for sample row attribute

---
 .../Screens/Edit/Timing/ControlPointTable.cs  |  2 +-
 .../RowAttributes/SampleRowAttribute.cs       | 61 +++++++++++++++++++
 2 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Screens/Edit/Timing/RowAttributes/SampleRowAttribute.cs

diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index f71f31acb7..17aa5bbefa 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -147,7 +147,7 @@ namespace osu.Game.Screens.Edit.Timing
                         ).Trim(), colour);
 
                     case SampleControlPoint sample:
-                        return new EmptyRowAttribute("sample", () => $"{sample.SampleBank} {sample.SampleVolume}%", colour);
+                        return new SampleRowAttribute(sample);
                 }
 
                 return null;
diff --git a/osu.Game/Screens/Edit/Timing/RowAttributes/SampleRowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttributes/SampleRowAttribute.cs
new file mode 100644
index 0000000000..066b180423
--- /dev/null
+++ b/osu.Game/Screens/Edit/Timing/RowAttributes/SampleRowAttribute.cs
@@ -0,0 +1,61 @@
+// Copyright (c) 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.Beatmaps.ControlPoints;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+
+namespace osu.Game.Screens.Edit.Timing.RowAttributes
+{
+    public class SampleRowAttribute : RowAttribute
+    {
+        private AttributeBubbledWord sampleText;
+        private OsuSpriteText volumeText;
+
+        private readonly Bindable<string> sampleBank;
+        private readonly BindableNumber<int> volume;
+
+        public SampleRowAttribute(SampleControlPoint sample)
+            : base(sample, "sample")
+        {
+            sampleBank = sample.SampleBankBindable.GetBoundCopy();
+            volume = sample.SampleVolumeBindable.GetBoundCopy();
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AttributeProgressBar progress;
+
+            Content.AddRange(new Drawable[]
+            {
+                volumeText = new OsuSpriteText
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Width = 30,
+                    Font = OsuFont.GetFont(size: EditorTable.TEXT_SIZE, weight: FontWeight.Regular),
+                },
+                progress = new AttributeProgressBar(Point),
+                sampleText = new AttributeBubbledWord(Point),
+            });
+
+            volume.BindValueChanged(vol =>
+            {
+                progress.Current.Value = vol.NewValue / 100f;
+                updateText();
+            }, true);
+
+            sampleBank.BindValueChanged(_ => updateText(), true);
+        }
+
+        private void updateText()
+        {
+            volumeText.Text = $"{volume.Value}%";
+            sampleText.Text = $"{sampleBank.Value}";
+        }
+    }
+}

From f8b20ca8aa16a302c4cfaaeea318db7c4201c1aa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 16:28:18 +0900
Subject: [PATCH 2641/3722] Add new display for effect row attribute

---
 .../Screens/Edit/Timing/ControlPointTable.cs  |  8 +---
 .../RowAttributes/EffectRowAttribute.cs       | 38 +++++++++++++++++++
 2 files changed, 39 insertions(+), 7 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/Timing/RowAttributes/EffectRowAttribute.cs

diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index 17aa5bbefa..1f06bc5bc7 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -14,7 +14,6 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Screens.Edit.Timing.RowAttributes;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Timing
 {
@@ -130,8 +129,6 @@ namespace osu.Game.Screens.Edit.Timing
 
             private Drawable createAttribute(ControlPoint controlPoint)
             {
-                Color4 colour = controlPoint.GetRepresentingColour(colours);
-
                 switch (controlPoint)
                 {
                     case TimingControlPoint timing:
@@ -141,10 +138,7 @@ namespace osu.Game.Screens.Edit.Timing
                         return new DifficultyRowAttribute(difficulty);
 
                     case EffectControlPoint effect:
-                        return new EmptyRowAttribute("effect", () => string.Join(" ",
-                            effect.KiaiMode ? "Kiai" : string.Empty,
-                            effect.OmitFirstBarLine ? "NoBarLine" : string.Empty
-                        ).Trim(), colour);
+                        return new EffectRowAttribute(effect);
 
                     case SampleControlPoint sample:
                         return new SampleRowAttribute(sample);
diff --git a/osu.Game/Screens/Edit/Timing/RowAttributes/EffectRowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttributes/EffectRowAttribute.cs
new file mode 100644
index 0000000000..e7fc57e2c9
--- /dev/null
+++ b/osu.Game/Screens/Edit/Timing/RowAttributes/EffectRowAttribute.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 osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps.ControlPoints;
+
+namespace osu.Game.Screens.Edit.Timing.RowAttributes
+{
+    public class EffectRowAttribute : RowAttribute
+    {
+        private readonly Bindable<bool> kiaiMode;
+        private readonly Bindable<bool> omitBarLine;
+        private AttributeBubbledWord kiaiModeBubble;
+        private AttributeBubbledWord omitBarLineBubble;
+
+        public EffectRowAttribute(EffectControlPoint effect)
+            : base(effect, "effect")
+        {
+            kiaiMode = effect.KiaiModeBindable.GetBoundCopy();
+            omitBarLine = effect.OmitFirstBarLineBindable.GetBoundCopy();
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Content.AddRange(new Drawable[]
+            {
+                kiaiModeBubble = new AttributeBubbledWord(Point) { Text = "kiai" },
+                omitBarLineBubble = new AttributeBubbledWord(Point) { Text = "no barline" },
+            });
+
+            kiaiMode.BindValueChanged(enabled => kiaiModeBubble.FadeTo(enabled.NewValue ? 1 : 0), true);
+            omitBarLine.BindValueChanged(enabled => omitBarLineBubble.FadeTo(enabled.NewValue ? 1 : 0), true);
+        }
+    }
+}

From 8da561a2a637582248b3309f41b63cc0a61b2ca9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 16:35:13 +0900
Subject: [PATCH 2642/3722] Soften colours and adjust padding slightly

---
 osu.Game/Screens/Edit/Timing/RowAttribute.cs                  | 2 +-
 .../Screens/Edit/Timing/RowAttributes/AttributeBubbledWord.cs | 4 ++--
 .../Screens/Edit/Timing/RowAttributes/AttributeProgressBar.cs | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Timing/RowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttribute.cs
index e46459892c..e184907751 100644
--- a/osu.Game/Screens/Edit/Timing/RowAttribute.cs
+++ b/osu.Game/Screens/Edit/Timing/RowAttribute.cs
@@ -77,7 +77,7 @@ namespace osu.Game.Screens.Edit.Timing
                                     Padding = new MarginPadding(3),
                                     Font = OsuFont.Default.With(weight: FontWeight.SemiBold, size: 12),
                                     Text = label,
-                                    Colour = colours.Gray0
+                                    Colour = overlayColours.Background5,
                                 },
                             },
                         },
diff --git a/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeBubbledWord.cs b/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeBubbledWord.cs
index 3e956cbe92..7d7ad61de2 100644
--- a/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeBubbledWord.cs
+++ b/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeBubbledWord.cs
@@ -60,10 +60,10 @@ namespace osu.Game.Screens.Edit.Timing.RowAttributes
                 {
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreLeft,
-                    Padding = new MarginPadding(3),
+                    Padding = new MarginPadding(6),
                     Font = OsuFont.Default.With(weight: FontWeight.SemiBold, size: 12),
                     Text = text,
-                    Colour = colours.Gray0
+                    Colour = overlayColours.Background5,
                 },
             };
         }
diff --git a/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeProgressBar.cs b/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeProgressBar.cs
index 9d7def4c33..6f7e790489 100644
--- a/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeProgressBar.cs
+++ b/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeProgressBar.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Screens.Edit.Timing.RowAttributes
             CornerRadius = Height / 2;
 
             BackgroundColour = overlayColours.Background6;
-            Colour = controlPoint.GetRepresentingColour(colours);
+            FillColour = controlPoint.GetRepresentingColour(colours);
         }
     }
 }

From 1ebc5ac5cc2d33abb3233ca60e51f988f133d319 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 16:36:00 +0900
Subject: [PATCH 2643/3722] Remove unused legacy class

---
 .../Timing/RowAttributes/EmptyRowAttribute.cs | 63 -------------------
 1 file changed, 63 deletions(-)
 delete mode 100644 osu.Game/Screens/Edit/Timing/RowAttributes/EmptyRowAttribute.cs

diff --git a/osu.Game/Screens/Edit/Timing/RowAttributes/EmptyRowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttributes/EmptyRowAttribute.cs
deleted file mode 100644
index 8a73853eb3..0000000000
--- a/osu.Game/Screens/Edit/Timing/RowAttributes/EmptyRowAttribute.cs
+++ /dev/null
@@ -1,63 +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.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Cursor;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osuTK.Graphics;
-
-namespace osu.Game.Screens.Edit.Timing.RowAttributes
-{
-    public class EmptyRowAttribute : CompositeDrawable, IHasTooltip
-    {
-        private readonly string header;
-        private readonly Func<string> content;
-        private readonly Color4 colour;
-
-        public EmptyRowAttribute(string header, Func<string> content, Color4 colour)
-        {
-            this.header = header;
-            this.content = content;
-            this.colour = colour;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            AutoSizeAxes = Axes.X;
-
-            Height = 20;
-
-            Anchor = Anchor.CentreLeft;
-            Origin = Anchor.CentreLeft;
-
-            Masking = true;
-            CornerRadius = 5;
-
-            InternalChildren = new Drawable[]
-            {
-                new Box
-                {
-                    Colour = colour,
-                    RelativeSizeAxes = Axes.Both,
-                },
-                new OsuSpriteText
-                {
-                    Padding = new MarginPadding(2),
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Font = OsuFont.Default.With(weight: FontWeight.SemiBold, size: 12),
-                    Text = header,
-                    Colour = colours.Gray0
-                },
-            };
-        }
-
-        public string TooltipText => content();
-    }
-}

From c50b526ba09fa2fe98f2d1d43d822a38dc8237f2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 19 Apr 2021 16:48:55 +0900
Subject: [PATCH 2644/3722] Remove local state dictionary from SpectatorScreen

---
 .../Online/Spectator/SpectatorStreamingClient.cs   | 12 ++++++++++++
 osu.Game/Screens/Spectate/SpectatorScreen.cs       | 14 +++++++++-----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 9def009469..13b12d9add 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -284,6 +284,18 @@ namespace osu.Game.Online.Spectator
             lastSendTime = Time.Current;
         }
 
+        /// <summary>
+        /// Attempts to retrieve the <see cref="SpectatorState"/> for a currently-playing user.
+        /// </summary>
+        /// <param name="userId">The user.</param>
+        /// <param name="state">The current <see cref="SpectatorState"/> for the user, if they're playing. <c>null</c> if the user is not playing.</param>
+        /// <returns><c>true</c> if successful (the user is playing), <c>false</c> otherwise.</returns>
+        public bool TryGetPlayingUserState(int userId, out SpectatorState state)
+        {
+            lock (userLock)
+                return playingUserStates.TryGetValue(userId, out state);
+        }
+
         /// <summary>
         /// Bind an action to <see cref="OnUserBeganPlaying"/> with the option of running the bound action once immediately.
         /// </summary>
diff --git a/osu.Game/Screens/Spectate/SpectatorScreen.cs b/osu.Game/Screens/Spectate/SpectatorScreen.cs
index 7be6c6183b..f554b15abf 100644
--- a/osu.Game/Screens/Spectate/SpectatorScreen.cs
+++ b/osu.Game/Screens/Spectate/SpectatorScreen.cs
@@ -44,7 +44,6 @@ namespace osu.Game.Screens.Spectate
         private readonly object stateLock = new object();
 
         private readonly Dictionary<int, User> userMap = new Dictionary<int, User>();
-        private readonly Dictionary<int, SpectatorState> spectatorStates = new Dictionary<int, SpectatorState>();
         private readonly Dictionary<int, GameplayState> gameplayStates = new Dictionary<int, GameplayState>();
 
         private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
@@ -107,9 +106,12 @@ namespace osu.Game.Screens.Spectate
 
             lock (stateLock)
             {
-                foreach (var (userId, state) in spectatorStates)
+                foreach (var (userId, _) in userMap)
                 {
-                    if (beatmapSet.Beatmaps.Any(b => b.OnlineBeatmapID == state.BeatmapID))
+                    if (!spectatorClient.TryGetPlayingUserState(userId, out var userState))
+                        continue;
+
+                    if (beatmapSet.Beatmaps.Any(b => b.OnlineBeatmapID == userState.BeatmapID))
                         updateGameplayState(userId);
                 }
             }
@@ -125,7 +127,6 @@ namespace osu.Game.Screens.Spectate
                 if (!userMap.ContainsKey(userId))
                     return;
 
-                spectatorStates[userId] = state;
                 Schedule(() => OnUserStateChanged(userId, state));
 
                 updateGameplayState(userId);
@@ -138,7 +139,10 @@ namespace osu.Game.Screens.Spectate
             {
                 Debug.Assert(userMap.ContainsKey(userId));
 
-                var spectatorState = spectatorStates[userId];
+                // The user may have stopped playing.
+                if (!spectatorClient.TryGetPlayingUserState(userId, out var spectatorState))
+                    return;
+
                 var user = userMap[userId];
 
                 var resolvedRuleset = rulesets.AvailableRulesets.FirstOrDefault(r => r.ID == spectatorState.RulesetID)?.CreateInstance();

From c12848ce4dc62749a77cd0e927c0ad43020cfa08 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 19 Apr 2021 17:02:59 +0900
Subject: [PATCH 2645/3722] Apply fixes to tests

---
 osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
index 802dbf2021..b38f7a998d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayRecorder.cs
@@ -118,8 +118,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestBasic()
         {
             AddStep("move to center", () => InputManager.MoveMouseTo(recordingManager.ScreenSpaceDrawQuad.Centre));
-            AddUntilStep("one frame recorded", () => replay.Frames.Count == 1);
-            AddAssert("position matches", () => playbackManager.ChildrenOfType<Box>().First().Position == recordingManager.ChildrenOfType<Box>().First().Position);
+            AddUntilStep("at least one frame recorded", () => replay.Frames.Count > 0);
+            AddUntilStep("position matches", () => playbackManager.ChildrenOfType<Box>().First().Position == recordingManager.ChildrenOfType<Box>().First().Position);
         }
 
         [Test]
@@ -139,14 +139,16 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void TestLimitedFrameRate()
         {
             ScheduledDelegate moveFunction = null;
+            int initialFrameCount = 0;
 
             AddStep("lower rate", () => recorder.RecordFrameRate = 2);
+            AddStep("count frames", () => initialFrameCount = replay.Frames.Count);
             AddStep("move to center", () => InputManager.MoveMouseTo(recordingManager.ScreenSpaceDrawQuad.Centre));
             AddStep("much move", () => moveFunction = Scheduler.AddDelayed(() =>
                 InputManager.MoveMouseTo(InputManager.CurrentState.Mouse.Position + new Vector2(-1, 0)), 10, true));
             AddWaitStep("move", 10);
             AddStep("stop move", () => moveFunction.Cancel());
-            AddAssert("less than 10 frames recorded", () => replay.Frames.Count < 10);
+            AddAssert("less than 10 frames recorded", () => replay.Frames.Count - initialFrameCount < 10);
         }
 
         [Test]

From 5bce5d2057eebe74115edb5f1dbc53ceaf6e3738 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 17:57:07 +0900
Subject: [PATCH 2646/3722] Update design logic

---
 osu.Game/Screens/Edit/Timing/RowAttribute.cs  | 36 ++++------
 .../RowAttributes/AttributeBubbledWord.cs     | 71 -------------------
 .../Timing/RowAttributes/AttributeText.cs     | 32 +++++++++
 .../RowAttributes/DifficultyRowAttribute.cs   | 14 ++--
 .../RowAttributes/EffectRowAttribute.cs       |  8 +--
 .../RowAttributes/SampleRowAttribute.cs       | 16 ++---
 .../RowAttributes/TimingRowAttribute.cs       |  9 +--
 7 files changed, 62 insertions(+), 124 deletions(-)
 delete mode 100644 osu.Game/Screens/Edit/Timing/RowAttributes/AttributeBubbledWord.cs
 create mode 100644 osu.Game/Screens/Edit/Timing/RowAttributes/AttributeText.cs

diff --git a/osu.Game/Screens/Edit/Timing/RowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttribute.cs
index e184907751..74d43628e1 100644
--- a/osu.Game/Screens/Edit/Timing/RowAttribute.cs
+++ b/osu.Game/Screens/Edit/Timing/RowAttribute.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Screens.Edit.Timing
             Origin = Anchor.CentreLeft;
 
             Masking = true;
-            CornerRadius = 5;
+            CornerRadius = 3;
 
             InternalChildren = new Drawable[]
             {
@@ -53,33 +53,25 @@ namespace osu.Game.Screens.Edit.Timing
                     RelativeSizeAxes = Axes.Y,
                     AutoSizeAxes = Axes.X,
                     Direction = FillDirection.Horizontal,
-                    Margin = new MarginPadding { Right = 5 },
+                    Margin = new MarginPadding { Horizontal = 5 },
                     Spacing = new Vector2(5),
                     Children = new Drawable[]
                     {
-                        new Container
+                        new Circle
                         {
-                            RelativeSizeAxes = Axes.Y,
-                            AutoSizeAxes = Axes.X,
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
-                            Children = new Drawable[]
-                            {
-                                new Box
-                                {
-                                    Colour = Point.GetRepresentingColour(colours),
-                                    RelativeSizeAxes = Axes.Both,
-                                },
-                                new OsuSpriteText
-                                {
-                                    Anchor = Anchor.CentreLeft,
-                                    Origin = Anchor.CentreLeft,
-                                    Padding = new MarginPadding(3),
-                                    Font = OsuFont.Default.With(weight: FontWeight.SemiBold, size: 12),
-                                    Text = label,
-                                    Colour = overlayColours.Background5,
-                                },
-                            },
+                            Colour = Point.GetRepresentingColour(colours),
+                            RelativeSizeAxes = Axes.Y,
+                            Size = new Vector2(4, 0.6f),
+                        },
+                        new OsuSpriteText
+                        {
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                            Padding = new MarginPadding(3),
+                            Font = OsuFont.Default.With(weight: FontWeight.Bold, size: 12),
+                            Text = label,
                         },
                     },
                 }
diff --git a/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeBubbledWord.cs b/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeBubbledWord.cs
deleted file mode 100644
index 7d7ad61de2..0000000000
--- a/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeBubbledWord.cs
+++ /dev/null
@@ -1,71 +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.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Overlays;
-
-namespace osu.Game.Screens.Edit.Timing.RowAttributes
-{
-    public class AttributeBubbledWord : CompositeDrawable
-    {
-        private readonly ControlPoint controlPoint;
-
-        private OsuSpriteText textDrawable;
-
-        private string text;
-
-        public string Text
-        {
-            get => text;
-            set
-            {
-                if (value == text)
-                    return;
-
-                text = value;
-                if (textDrawable != null)
-                    textDrawable.Text = text;
-            }
-        }
-
-        public AttributeBubbledWord(ControlPoint controlPoint)
-        {
-            this.controlPoint = controlPoint;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours, OverlayColourProvider overlayColours)
-        {
-            AutoSizeAxes = Axes.X;
-
-            Anchor = Anchor.CentreLeft;
-            Origin = Anchor.CentreLeft;
-
-            Height = 12;
-
-            InternalChildren = new Drawable[]
-            {
-                new Circle
-                {
-                    Colour = controlPoint.GetRepresentingColour(colours),
-                    RelativeSizeAxes = Axes.Both,
-                },
-                textDrawable = new OsuSpriteText
-                {
-                    Anchor = Anchor.CentreLeft,
-                    Origin = Anchor.CentreLeft,
-                    Padding = new MarginPadding(6),
-                    Font = OsuFont.Default.With(weight: FontWeight.SemiBold, size: 12),
-                    Text = text,
-                    Colour = overlayColours.Background5,
-                },
-            };
-        }
-    }
-}
diff --git a/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeText.cs b/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeText.cs
new file mode 100644
index 0000000000..d0a51f9faa
--- /dev/null
+++ b/osu.Game/Screens/Edit/Timing/RowAttributes/AttributeText.cs
@@ -0,0 +1,32 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+
+namespace osu.Game.Screens.Edit.Timing.RowAttributes
+{
+    public class AttributeText : OsuSpriteText
+    {
+        private readonly ControlPoint controlPoint;
+
+        public AttributeText(ControlPoint controlPoint)
+        {
+            this.controlPoint = controlPoint;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            Anchor = Anchor.CentreLeft;
+            Origin = Anchor.CentreLeft;
+
+            Padding = new MarginPadding(6);
+            Font = OsuFont.Default.With(weight: FontWeight.Bold, size: 12);
+            Colour = controlPoint.GetRepresentingColour(colours);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Timing/RowAttributes/DifficultyRowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttributes/DifficultyRowAttribute.cs
index 1fdd8c2708..7b553ac7ad 100644
--- a/osu.Game/Screens/Edit/Timing/RowAttributes/DifficultyRowAttribute.cs
+++ b/osu.Game/Screens/Edit/Timing/RowAttributes/DifficultyRowAttribute.cs
@@ -5,7 +5,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Screens.Edit.Timing.RowAttributes
@@ -27,17 +26,14 @@ namespace osu.Game.Screens.Edit.Timing.RowAttributes
         {
             Content.AddRange(new Drawable[]
             {
-                text = new OsuSpriteText
-                {
-                    Anchor = Anchor.CentreLeft,
-                    Origin = Anchor.CentreLeft,
-                    Width = 40,
-                    Font = OsuFont.GetFont(size: EditorTable.TEXT_SIZE, weight: FontWeight.Regular),
-                },
                 new AttributeProgressBar(Point)
                 {
                     Current = speedMultiplier,
-                }
+                },
+                text = new AttributeText(Point)
+                {
+                    Width = 40,
+                },
             });
 
             speedMultiplier.BindValueChanged(_ => updateText(), true);
diff --git a/osu.Game/Screens/Edit/Timing/RowAttributes/EffectRowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttributes/EffectRowAttribute.cs
index e7fc57e2c9..812407d6da 100644
--- a/osu.Game/Screens/Edit/Timing/RowAttributes/EffectRowAttribute.cs
+++ b/osu.Game/Screens/Edit/Timing/RowAttributes/EffectRowAttribute.cs
@@ -12,8 +12,8 @@ namespace osu.Game.Screens.Edit.Timing.RowAttributes
     {
         private readonly Bindable<bool> kiaiMode;
         private readonly Bindable<bool> omitBarLine;
-        private AttributeBubbledWord kiaiModeBubble;
-        private AttributeBubbledWord omitBarLineBubble;
+        private AttributeText kiaiModeBubble;
+        private AttributeText omitBarLineBubble;
 
         public EffectRowAttribute(EffectControlPoint effect)
             : base(effect, "effect")
@@ -27,8 +27,8 @@ namespace osu.Game.Screens.Edit.Timing.RowAttributes
         {
             Content.AddRange(new Drawable[]
             {
-                kiaiModeBubble = new AttributeBubbledWord(Point) { Text = "kiai" },
-                omitBarLineBubble = new AttributeBubbledWord(Point) { Text = "no barline" },
+                kiaiModeBubble = new AttributeText(Point) { Text = "kiai" },
+                omitBarLineBubble = new AttributeText(Point) { Text = "no barline" },
             });
 
             kiaiMode.BindValueChanged(enabled => kiaiModeBubble.FadeTo(enabled.NewValue ? 1 : 0), true);
diff --git a/osu.Game/Screens/Edit/Timing/RowAttributes/SampleRowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttributes/SampleRowAttribute.cs
index 066b180423..ac0797dba1 100644
--- a/osu.Game/Screens/Edit/Timing/RowAttributes/SampleRowAttribute.cs
+++ b/osu.Game/Screens/Edit/Timing/RowAttributes/SampleRowAttribute.cs
@@ -5,14 +5,13 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Screens.Edit.Timing.RowAttributes
 {
     public class SampleRowAttribute : RowAttribute
     {
-        private AttributeBubbledWord sampleText;
+        private AttributeText sampleText;
         private OsuSpriteText volumeText;
 
         private readonly Bindable<string> sampleBank;
@@ -32,15 +31,12 @@ namespace osu.Game.Screens.Edit.Timing.RowAttributes
 
             Content.AddRange(new Drawable[]
             {
-                volumeText = new OsuSpriteText
-                {
-                    Anchor = Anchor.CentreLeft,
-                    Origin = Anchor.CentreLeft,
-                    Width = 30,
-                    Font = OsuFont.GetFont(size: EditorTable.TEXT_SIZE, weight: FontWeight.Regular),
-                },
+                sampleText = new AttributeText(Point),
                 progress = new AttributeProgressBar(Point),
-                sampleText = new AttributeBubbledWord(Point),
+                volumeText = new AttributeText(Point)
+                {
+                    Width = 40,
+                },
             });
 
             volume.BindValueChanged(vol =>
diff --git a/osu.Game/Screens/Edit/Timing/RowAttributes/TimingRowAttribute.cs b/osu.Game/Screens/Edit/Timing/RowAttributes/TimingRowAttribute.cs
index c6e2649f8e..ab840e56a7 100644
--- a/osu.Game/Screens/Edit/Timing/RowAttributes/TimingRowAttribute.cs
+++ b/osu.Game/Screens/Edit/Timing/RowAttributes/TimingRowAttribute.cs
@@ -4,10 +4,8 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
-using osu.Framework.Graphics;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Timing;
-using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Screens.Edit.Timing.RowAttributes
@@ -28,12 +26,7 @@ namespace osu.Game.Screens.Edit.Timing.RowAttributes
         [BackgroundDependencyLoader]
         private void load()
         {
-            Content.Add(text = new OsuSpriteText
-            {
-                Anchor = Anchor.CentreLeft,
-                Origin = Anchor.CentreLeft,
-                Font = OsuFont.GetFont(size: EditorTable.TEXT_SIZE, weight: FontWeight.Regular),
-            });
+            Content.Add(text = new AttributeText(Point));
 
             timeSignature.BindValueChanged(_ => updateText());
             beatLength.BindValueChanged(_ => updateText(), true);

From 097a3475337df9ae869bd576886b79c675b8f2c4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 18:25:30 +0900
Subject: [PATCH 2647/3722] Adjust Add different background colour for timing
 area

---
 osu.Game/Screens/Edit/EditorTable.cs          |  4 +-
 .../Screens/Edit/Timing/ControlPointTable.cs  | 53 +++++++++++++++----
 osu.Game/Screens/Edit/Timing/TimingScreen.cs  | 11 +++-
 3 files changed, 53 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Edit/EditorTable.cs b/osu.Game/Screens/Edit/EditorTable.cs
index 5a34a79726..815f3ed0ea 100644
--- a/osu.Game/Screens/Edit/EditorTable.cs
+++ b/osu.Game/Screens/Edit/EditorTable.cs
@@ -96,8 +96,8 @@ namespace osu.Game.Screens.Edit
             [BackgroundDependencyLoader]
             private void load(OverlayColourProvider colours)
             {
-                hoveredBackground.Colour = colourHover = colours.Background3;
-                colourSelected = colours.Background1;
+                hoveredBackground.Colour = colourHover = colours.Background1;
+                colourSelected = colours.Colour3;
             }
 
             private bool selected;
diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index 1f06bc5bc7..26efe0a5ea 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.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;
@@ -25,6 +26,8 @@ namespace osu.Game.Screens.Edit.Timing
         [Resolved]
         private EditorClock clock { get; set; }
 
+        public const float TIMING_COLUMN_WIDTH = 210;
+
         public IEnumerable<ControlPointGroup> ControlGroups
         {
             set
@@ -66,35 +69,62 @@ namespace osu.Game.Screens.Edit.Timing
         {
             var columns = new List<TableColumn>
             {
-                new TableColumn("Time", Anchor.CentreLeft, new Dimension(GridSizeMode.Absolute, 120)),
+                new TableColumn("Time", Anchor.CentreLeft, new Dimension(GridSizeMode.Absolute, TIMING_COLUMN_WIDTH)),
                 new TableColumn("Attributes", Anchor.CentreLeft),
             };
 
             return columns.ToArray();
         }
 
-        private Drawable[] createContent(int index, ControlPointGroup group) => new Drawable[]
+        private Drawable[] createContent(int index, ControlPointGroup group)
         {
-            new OsuSpriteText
+            return new Drawable[]
             {
-                Text = group.Time.ToEditorFormattedString(),
-                Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Bold)
-            },
-            new ControlGroupAttributes(group),
-        };
+                new FillFlowContainer
+                {
+                    RelativeSizeAxes = Axes.Y,
+                    Width = TIMING_COLUMN_WIDTH,
+                    Spacing = new Vector2(5),
+                    Children = new Drawable[]
+                    {
+                        new OsuSpriteText
+                        {
+                            Text = group.Time.ToEditorFormattedString(),
+                            Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Bold),
+                            Width = 60,
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                        },
+                        new ControlGroupAttributes(group, c => c is TimingControlPoint)
+                        {
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                        }
+                    }
+                },
+                new ControlGroupAttributes(group, c => !(c is TimingControlPoint))
+            };
+        }
 
         private class ControlGroupAttributes : CompositeDrawable
         {
+            private readonly Func<ControlPoint, bool> matchFunction;
+
             private readonly IBindableList<ControlPoint> controlPoints = new BindableList<ControlPoint>();
 
             private readonly FillFlowContainer fill;
 
-            public ControlGroupAttributes(ControlPointGroup group)
+            public ControlGroupAttributes(ControlPointGroup group, Func<ControlPoint, bool> matchFunction)
             {
-                RelativeSizeAxes = Axes.Both;
+                this.matchFunction = matchFunction;
+
+                AutoSizeAxes = Axes.X;
+                RelativeSizeAxes = Axes.Y;
+
                 InternalChild = fill = new FillFlowContainer
                 {
-                    RelativeSizeAxes = Axes.Both,
+                    AutoSizeAxes = Axes.X,
+                    RelativeSizeAxes = Axes.Y,
                     Direction = FillDirection.Horizontal,
                     Spacing = new Vector2(2)
                 };
@@ -120,6 +150,7 @@ namespace osu.Game.Screens.Edit.Timing
             private void createChildren()
             {
                 fill.ChildrenEnumerable = controlPoints
+                                          .Where(matchFunction)
                                           .Select(createAttribute)
                                           .Where(c => c != null)
                                           // arbitrary ordering to make timing points first.
diff --git a/osu.Game/Screens/Edit/Timing/TimingScreen.cs b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
index 0b446314e8..9f26dece08 100644
--- a/osu.Game/Screens/Edit/Timing/TimingScreen.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
@@ -71,13 +71,20 @@ namespace osu.Game.Screens.Edit.Timing
             {
                 RelativeSizeAxes = Axes.Both;
 
+                const float margins = 10;
                 InternalChildren = new Drawable[]
                 {
                     new Box
                     {
-                        Colour = colours.Background2,
+                        Colour = colours.Background3,
                         RelativeSizeAxes = Axes.Both,
                     },
+                    new Box
+                    {
+                        Colour = colours.Background2,
+                        RelativeSizeAxes = Axes.Y,
+                        Width = ControlPointTable.TIMING_COLUMN_WIDTH + margins,
+                    },
                     new OsuScrollContainer
                     {
                         RelativeSizeAxes = Axes.Both,
@@ -89,7 +96,7 @@ namespace osu.Game.Screens.Edit.Timing
                         Anchor = Anchor.BottomRight,
                         Origin = Anchor.BottomRight,
                         Direction = FillDirection.Horizontal,
-                        Margin = new MarginPadding(10),
+                        Margin = new MarginPadding(margins),
                         Spacing = new Vector2(5),
                         Children = new Drawable[]
                         {

From a40dcd4b8dd3a8403e208cc7de62dd66181386d5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 18:53:06 +0900
Subject: [PATCH 2648/3722] Add a touch more space in the timing column

---
 osu.Game/Screens/Edit/Timing/ControlPointTable.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index 26efe0a5ea..fe63138d28 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Screens.Edit.Timing
         [Resolved]
         private EditorClock clock { get; set; }
 
-        public const float TIMING_COLUMN_WIDTH = 210;
+        public const float TIMING_COLUMN_WIDTH = 220;
 
         public IEnumerable<ControlPointGroup> ControlGroups
         {

From 5afdc3ff66f39eb34bc8359e715f6719da8c038a Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 19 Apr 2021 19:56:17 +0900
Subject: [PATCH 2649/3722] Make DHO application logic clearer with
 Entry/HitObject separation

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

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 669e4cecbe..dfeb87de88 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -204,23 +204,27 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// <param name="lifetimeEntry">The <see cref="HitObjectLifetimeEntry"/> controlling the lifetime of <paramref name="hitObject"/>.</param>
         public void Apply([NotNull] HitObject hitObject, [CanBeNull] HitObjectLifetimeEntry lifetimeEntry)
         {
-            free();
-
-            HitObject = hitObject ?? throw new InvalidOperationException($"Cannot apply a null {nameof(HitObject)}.");
-
-            this.lifetimeEntry = lifetimeEntry;
+            if (hitObject == null)
+                throw new ArgumentNullException($"Cannot apply a null {nameof(HitObject)}.");
 
             if (lifetimeEntry != null)
             {
-                // Transfer lifetime from the entry.
-                LifetimeStart = lifetimeEntry.LifetimeStart;
-                LifetimeEnd = lifetimeEntry.LifetimeEnd;
-
-                // Copy any existing result from the entry (required for rewind / judgement revert).
-                Result = lifetimeEntry.Result;
+                applyEntry(lifetimeEntry);
             }
             else
-                LifetimeStart = HitObject.StartTime - InitialLifetimeOffset;
+            {
+                applyHitObject(hitObject);
+
+                // Set default lifetime for a non-pooled DHO
+                LifetimeStart = hitObject.StartTime - InitialLifetimeOffset;
+            }
+        }
+
+        private void applyHitObject([NotNull] HitObject hitObject)
+        {
+            freeHitObject();
+
+            HitObject = hitObject;
 
             // Ensure this DHO has a result.
             Result ??= CreateResult(HitObject.CreateJudgement())
@@ -281,10 +285,23 @@ namespace osu.Game.Rulesets.Objects.Drawables
             hasHitObjectApplied = true;
         }
 
+        private void applyEntry([NotNull] HitObjectLifetimeEntry entry)
+        {
+            freeEntry();
+
+            setLifetime(entry.LifetimeStart, entry.LifetimeEnd);
+            lifetimeEntry = entry;
+
+            // Copy any existing result from the entry (required for rewind / judgement revert).
+            Result = entry.Result;
+
+            applyHitObject(entry.HitObject);
+        }
+
         /// <summary>
         /// Removes the currently applied <see cref="HitObject"/>
         /// </summary>
-        private void free()
+        private void freeHitObject()
         {
             if (!hasHitObjectApplied)
                 return;
@@ -322,13 +339,23 @@ namespace osu.Game.Rulesets.Objects.Drawables
             HitObject = null;
             ParentHitObject = null;
             Result = null;
-            lifetimeEntry = null;
 
             clearExistingStateTransforms();
 
             hasHitObjectApplied = false;
         }
 
+        private void freeEntry()
+        {
+            freeHitObject();
+
+            if (lifetimeEntry == null) return;
+
+            lifetimeEntry = null;
+
+            setLifetime(double.MaxValue, double.MaxValue);
+        }
+
         protected sealed override void FreeAfterUse()
         {
             base.FreeAfterUse();
@@ -337,7 +364,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             if (!IsInPool)
                 return;
 
-            free();
+            freeEntry();
         }
 
         /// <summary>

From c7183f92f79efe7855fb4b4defacb9224659e3e3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 19 Apr 2021 19:53:55 +0900
Subject: [PATCH 2650/3722] Rename Restart() -> Reset()

---
 osu.Game/Screens/Play/GameplayClockContainer.cs       | 4 ++--
 osu.Game/Screens/Play/MasterGameplayClockContainer.cs | 4 ++--
 osu.Game/Screens/Play/Player.cs                       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 642ede5f1c..ee65384bc9 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -82,9 +82,9 @@ namespace osu.Game.Screens.Play
         public virtual void Stop() => IsPaused.Value = true;
 
         /// <summary>
-        /// Restarts gameplay.
+        /// Resets this <see cref="GameplayClockContainer"/> and the source to an initial state ready for gameplay.
         /// </summary>
-        public virtual void Restart()
+        public virtual void Reset()
         {
             AdjustableSource.Seek(0);
             AdjustableSource.Stop();
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index db0aa23001..5ea50cbdc7 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -123,10 +123,10 @@ namespace osu.Game.Screens.Play
             userOffsetClock.ProcessFrame();
         }
 
-        public override void Restart()
+        public override void Reset()
         {
             updateRate();
-            base.Restart();
+            base.Reset();
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 841f906b05..27a4fcc291 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -811,7 +811,7 @@ namespace osu.Game.Screens.Play
             if (GameplayClockContainer.GameplayClock.IsRunning)
                 throw new InvalidOperationException($"{nameof(StartGameplay)} should not be called when the gameplay clock is already running");
 
-            GameplayClockContainer.Restart();
+            GameplayClockContainer.Reset();
         }
 
         public override void OnSuspending(IScreen next)

From acbf4580a412772b6be6d8e3d60446bbe35b9003 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 19 Apr 2021 19:55:59 +0900
Subject: [PATCH 2651/3722] Only set initial source in Reset()

---
 osu.Game/Screens/Play/GameplayClockContainer.cs | 17 +++++++++++++++--
 .../Play/MasterGameplayClockContainer.cs        |  4 ++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index ee65384bc9..3da28f3560 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -29,17 +29,22 @@ namespace osu.Game.Screens.Play
         /// </summary>
         protected readonly DecoupleableInterpolatingFramedClock AdjustableSource;
 
+        /// <summary>
+        /// The source clock.
+        /// </summary>
+        protected IClock SourceClock { get; private set; }
+
         /// <summary>
         /// Creates a new <see cref="GameplayClockContainer"/>.
         /// </summary>
         /// <param name="sourceClock">The source <see cref="IClock"/> used for timing.</param>
         protected GameplayClockContainer(IClock sourceClock)
         {
+            SourceClock = sourceClock;
+
             RelativeSizeAxes = Axes.Both;
 
             AdjustableSource = new DecoupleableInterpolatingFramedClock { IsCoupled = false };
-            AdjustableSource.ChangeSource(sourceClock);
-
             IsPaused.BindValueChanged(OnIsPausedChanged);
         }
 
@@ -86,6 +91,8 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public virtual void Reset()
         {
+            ChangeSource(SourceClock);
+
             AdjustableSource.Seek(0);
             AdjustableSource.Stop();
 
@@ -93,6 +100,12 @@ namespace osu.Game.Screens.Play
                 Start();
         }
 
+        /// <summary>
+        /// Changes the source clock.
+        /// </summary>
+        /// <param name="sourceClock">The new source.</param>
+        protected void ChangeSource(IClock sourceClock) => AdjustableSource.ChangeSource(SourceClock = sourceClock);
+
         protected override void Update()
         {
             if (!IsPaused.Value)
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 5ea50cbdc7..f019e50b60 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public const double MINIMUM_SKIP_TIME = 1000;
 
-        protected Track Track => (Track)AdjustableSource.Source;
+        protected Track Track => (Track)SourceClock;
 
         public readonly BindableNumber<double> UserPlaybackRate = new BindableDouble(1)
         {
@@ -164,7 +164,7 @@ namespace osu.Game.Screens.Play
         public void StopUsingBeatmapClock()
         {
             removeSourceClockAdjustments();
-            AdjustableSource.ChangeSource(new TrackVirtual(beatmap.Track.Length));
+            ChangeSource(new TrackVirtual(beatmap.Track.Length));
         }
 
         private bool speedAdjustmentsApplied;

From 2c487ddb70bf4078422fba8e772e5e564e582d36 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 19 Apr 2021 20:37:06 +0900
Subject: [PATCH 2652/3722] Create synthetic LifetimeEntry for a DHO when not
 supplied

Now, a DHO is always associated with a HitObjectLifetimeEntry while used.
Result is always stored in the entry, and not in the DHO.
---
 .../Objects/Drawables/DrawableHitObject.cs    | 87 ++++++++-----------
 .../Objects/UnmanagedHitObjectEntry.cs        | 20 +++++
 2 files changed, 55 insertions(+), 52 deletions(-)
 create mode 100644 osu.Game/Rulesets/Objects/UnmanagedHitObjectEntry.cs

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index dfeb87de88..9b132ea932 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -39,7 +39,12 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// <summary>
         /// The <see cref="HitObject"/> currently represented by this <see cref="DrawableHitObject"/>.
         /// </summary>
-        public HitObject HitObject { get; private set; }
+        public HitObject HitObject => lifetimeEntry?.HitObject ?? initialHitObject;
+
+        /// <summary>
+        /// The <see cref="HitObject"/> given in the constructor that will be applied when loaded.
+        /// </summary>
+        private HitObject initialHitObject;
 
         /// <summary>
         /// The parenting <see cref="DrawableHitObject"/>, if any.
@@ -108,7 +113,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// <summary>
         /// The scoring result of this <see cref="DrawableHitObject"/>.
         /// </summary>
-        public JudgementResult Result { get; private set; }
+        public JudgementResult Result => lifetimeEntry?.Result;
 
         /// <summary>
         /// The relative X position of this hit object for sample playback balance adjustment.
@@ -140,11 +145,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </remarks>
         public IBindable<ArmedState> State => state;
 
-        /// <summary>
-        /// Whether <see cref="HitObject"/> is currently applied.
-        /// </summary>
-        private bool hasHitObjectApplied;
-
         /// <summary>
         /// The <see cref="HitObjectLifetimeEntry"/> controlling the lifetime of the currently-attached <see cref="HitObject"/>.
         /// </summary>
@@ -168,7 +168,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </param>
         protected DrawableHitObject([CanBeNull] HitObject initialHitObject = null)
         {
-            HitObject = initialHitObject;
+            this.initialHitObject = initialHitObject;
         }
 
         [BackgroundDependencyLoader]
@@ -184,8 +184,11 @@ namespace osu.Game.Rulesets.Objects.Drawables
         {
             base.LoadAsyncComplete();
 
-            if (HitObject != null)
-                Apply(HitObject, lifetimeEntry);
+            if (initialHitObject != null)
+            {
+                Apply(initialHitObject, null);
+                initialHitObject = null;
+            }
         }
 
         protected override void LoadComplete()
@@ -209,26 +212,36 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
             if (lifetimeEntry != null)
             {
-                applyEntry(lifetimeEntry);
+                if (lifetimeEntry.HitObject != hitObject)
+                    throw new InvalidOperationException($"{nameof(HitObjectLifetimeEntry)} has different {nameof(HitObject)} from the specified one.");
+
+                apply(lifetimeEntry);
             }
             else
             {
-                applyHitObject(hitObject);
+                var unmanagedEntry = new UnmanagedHitObjectEntry(hitObject, this);
+                apply(unmanagedEntry);
 
                 // Set default lifetime for a non-pooled DHO
                 LifetimeStart = hitObject.StartTime - InitialLifetimeOffset;
             }
         }
 
-        private void applyHitObject([NotNull] HitObject hitObject)
+        /// <summary>
+        /// Applies a new <see cref="HitObjectLifetimeEntry"/> to be represented by this <see cref="DrawableHitObject"/>.
+        /// </summary>
+        private void apply([NotNull] HitObjectLifetimeEntry entry)
         {
-            freeHitObject();
+            free();
 
-            HitObject = hitObject;
+            lifetimeEntry = entry;
+
+            LifetimeStart = entry.LifetimeStart;
+            LifetimeEnd = entry.LifetimeEnd;
 
             // Ensure this DHO has a result.
-            Result ??= CreateResult(HitObject.CreateJudgement())
-                       ?? throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");
+            entry.Result ??= CreateResult(HitObject.CreateJudgement())
+                             ?? throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");
 
             // Copy back the result to the entry for potential future retrieval.
             if (lifetimeEntry != null)
@@ -281,30 +294,14 @@ namespace osu.Game.Rulesets.Objects.Drawables
                 else
                     updateState(ArmedState.Idle, true);
             }
-
-            hasHitObjectApplied = true;
-        }
-
-        private void applyEntry([NotNull] HitObjectLifetimeEntry entry)
-        {
-            freeEntry();
-
-            setLifetime(entry.LifetimeStart, entry.LifetimeEnd);
-            lifetimeEntry = entry;
-
-            // Copy any existing result from the entry (required for rewind / judgement revert).
-            Result = entry.Result;
-
-            applyHitObject(entry.HitObject);
         }
 
         /// <summary>
-        /// Removes the currently applied <see cref="HitObject"/>
+        /// Removes the currently applied <see cref="lifetimeEntry"/>
         /// </summary>
-        private void freeHitObject()
+        private void free()
         {
-            if (!hasHitObjectApplied)
-                return;
+            if (lifetimeEntry == null) return;
 
             StartTimeBindable.UnbindFrom(HitObject.StartTimeBindable);
             if (HitObject is IHasComboInformation combo)
@@ -336,24 +333,10 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
             OnFree();
 
-            HitObject = null;
             ParentHitObject = null;
-            Result = null;
-
-            clearExistingStateTransforms();
-
-            hasHitObjectApplied = false;
-        }
-
-        private void freeEntry()
-        {
-            freeHitObject();
-
-            if (lifetimeEntry == null) return;
-
             lifetimeEntry = null;
 
-            setLifetime(double.MaxValue, double.MaxValue);
+            clearExistingStateTransforms();
         }
 
         protected sealed override void FreeAfterUse()
@@ -364,7 +347,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             if (!IsInPool)
                 return;
 
-            freeEntry();
+            free();
         }
 
         /// <summary>
diff --git a/osu.Game/Rulesets/Objects/UnmanagedHitObjectEntry.cs b/osu.Game/Rulesets/Objects/UnmanagedHitObjectEntry.cs
new file mode 100644
index 0000000000..507cad15d3
--- /dev/null
+++ b/osu.Game/Rulesets/Objects/UnmanagedHitObjectEntry.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.Rulesets.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Objects
+{
+    internal class UnmanagedHitObjectEntry : HitObjectLifetimeEntry
+    {
+        public readonly DrawableHitObject DrawableHitObject;
+
+        public UnmanagedHitObjectEntry(HitObject hitObject, DrawableHitObject drawableHitObject)
+            : base(hitObject)
+        {
+            DrawableHitObject = drawableHitObject;
+            LifetimeStart = DrawableHitObject.LifetimeStart;
+            LifetimeEnd = DrawableHitObject.LifetimeEnd;
+        }
+    }
+}

From 510e54ff5405a944344412fbd72b9c3418e4d28e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Apr 2021 23:29:14 +0900
Subject: [PATCH 2653/3722] Update framework

---
 osu.Android.props                              | 2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs | 2 +-
 osu.Game/osu.Game.csproj                       | 2 +-
 osu.iOS.props                                  | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 0bb0bf171c..ed2b27e1c7 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.416.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.419.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
index bcbb0f4366..aee431284e 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public void Update(Playfield playfield)
         {
-            playfield.Rotation = (Direction.Value == RotationDirection.CounterClockwise ? -1 : 1) * 360 * (float)(playfield.Time.Current / 60000 * SpinSpeed.Value);
+            playfield.Rotation = (Direction.Value == RotationDirection.Counterclockwise ? -1 : 1) * 360 * (float)(playfield.Time.Current / 60000 * SpinSpeed.Value);
         }
 
         public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index e0a267241d..509cb3ddad 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.416.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.419.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index bcd953c0bd..4b67bd78a1 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.416.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.419.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.416.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.419.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 9f24cdb355bff38f788c6b2cb6e1f8bfce0b7e5b Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Mon, 19 Apr 2021 16:53:44 +0200
Subject: [PATCH 2654/3722] Added Author Link in BeatmapInfoWedge

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 29 +++++++++------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 4069dc82ed..14e5831ef9 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -29,6 +29,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Ranking.Expanded;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Screens.Select
 {
@@ -307,7 +308,7 @@ namespace osu.Game.Screens.Select
                                 Margin = new MarginPadding { Top = 10 },
                                 Direction = FillDirection.Horizontal,
                                 AutoSizeAxes = Axes.Both,
-                                Children = getMapper(metadata)
+                                Children = new[] { getMapper(metadata) },
                             },
                             infoLabelContainer = new FillFlowContainer
                             {
@@ -430,24 +431,20 @@ namespace osu.Game.Screens.Select
                 ForceRedraw();
             }
 
-            private OsuSpriteText[] getMapper(BeatmapMetadata metadata)
+            private LinkFlowContainer getMapper(BeatmapMetadata metadata)
             {
-                if (string.IsNullOrEmpty(metadata.Author?.Username))
-                    return Array.Empty<OsuSpriteText>();
+                if (metadata.Author == null)
+                    return new LinkFlowContainer();
 
-                return new[]
+                return new LinkFlowContainer(s =>
                 {
-                    new OsuSpriteText
-                    {
-                        Text = "mapped by ",
-                        Font = OsuFont.GetFont(size: 15),
-                    },
-                    new OsuSpriteText
-                    {
-                        Text = metadata.Author.Username,
-                        Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 15),
-                    }
-                };
+                    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)

From eb977312ed71bee57676714afb2a81c0522bdd9d Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Mon, 19 Apr 2021 16:54:29 +0200
Subject: [PATCH 2655/3722] Added Author link in BeatmapSet Overlay

---
 osu.Game/Overlays/BeatmapSet/AuthorInfo.cs | 23 +++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs b/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs
index 31c1439c8f..1ffcf9722a 100644
--- a/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs
+++ b/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs
@@ -13,6 +13,8 @@ using osuTK.Graphics;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
+using osu.Game.Users;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays.BeatmapSet
 {
@@ -50,7 +52,7 @@ namespace osu.Game.Overlays.BeatmapSet
 
             fields.Children = new Drawable[]
             {
-                new Field("mapped by", BeatmapSet.Metadata.Author.Username, OsuFont.GetFont(weight: FontWeight.Regular, italics: true)),
+                new Field("mapped by", BeatmapSet.Metadata.Author, OsuFont.GetFont(weight: FontWeight.Regular, italics: true)),
                 new Field("submitted", online.Submitted, OsuFont.GetFont(weight: FontWeight.Bold))
                 {
                     Margin = new MarginPadding { Top = 5 },
@@ -146,6 +148,25 @@ namespace osu.Game.Overlays.BeatmapSet
                     }
                 };
             }
+
+            public Field(string first, User second, FontUsage secondFont)
+            {
+                AutoSizeAxes = Axes.Both;
+                Direction = FillDirection.Horizontal;
+
+                Children = new[]
+                {
+                    new LinkFlowContainer(s =>
+                    {
+                        s.Font = OsuFont.GetFont(size: 11);
+                    }).With(d =>
+                    {
+                        d.AutoSizeAxes = Axes.Both;
+                        d.AddText($"{first} ");
+                        d.AddUserLink(second, s => s.Font = secondFont.With(size: 11));
+                    }),
+                };
+            }
         }
     }
 }

From 0825fc57a9f50a86594b4090954366d47aa82725 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 19 Apr 2021 18:24:15 +0200
Subject: [PATCH 2656/3722] Move foreground colour helper into `OsuColour`

---
 osu.Game/Graphics/OsuColour.cs                | 12 ++++++++++
 .../Graphics/UserInterfaceV2/ColourDisplay.cs |  3 +--
 .../Timeline/TimelineHitObjectBlueprint.cs    |  3 +--
 osu.Game/Utils/ColourUtils.cs                 | 23 -------------------
 4 files changed, 14 insertions(+), 27 deletions(-)
 delete mode 100644 osu.Game/Utils/ColourUtils.cs

diff --git a/osu.Game/Graphics/OsuColour.cs b/osu.Game/Graphics/OsuColour.cs
index c3b9b6006c..15967c37c2 100644
--- a/osu.Game/Graphics/OsuColour.cs
+++ b/osu.Game/Graphics/OsuColour.cs
@@ -94,6 +94,18 @@ namespace osu.Game.Graphics
             }
         }
 
+        /// <summary>
+        /// Returns a foreground text colour that is supposed to contrast well with
+        /// the supplied <paramref name="backgroundColour"/>.
+        /// </summary>
+        public static Color4 ForegroundTextColourFor(Color4 backgroundColour)
+        {
+            // formula taken from the RGB->YIQ conversions: https://en.wikipedia.org/wiki/YIQ
+            // brightness here is equivalent to the Y component in the above colour model, which is a rough estimate of lightness.
+            float brightness = 0.299f * backgroundColour.R + 0.587f * backgroundColour.G + 0.114f * backgroundColour.B;
+            return Gray(brightness > 0.5f ? 0.2f : 0.9f);
+        }
+
         // See https://github.com/ppy/osu-web/blob/master/resources/assets/less/colors.less
         public readonly Color4 PurpleLighter = Color4Extensions.FromHex(@"eeeeff");
         public readonly Color4 PurpleLight = Color4Extensions.FromHex(@"aa88ff");
diff --git a/osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs b/osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs
index c07e5d5bf7..01d91f7cfd 100644
--- a/osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/ColourDisplay.cs
@@ -10,7 +10,6 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Localisation;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Utils;
 using osuTK;
 using osuTK.Graphics;
 
@@ -102,7 +101,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
         {
             fill.Colour = current.Value;
             colourHexCode.Text = current.Value.ToHex();
-            colourHexCode.Colour = ColourUtils.ForegroundTextColourFor(current.Value);
+            colourHexCode.Colour = OsuColour.ForegroundTextColourFor(current.Value);
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index dc67009d08..0425370ae5 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -21,7 +21,6 @@ using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Skinning;
-using osu.Game.Utils;
 using osuTK;
 using osuTK.Graphics;
 
@@ -159,7 +158,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 circle.Colour = comboColour;
 
             var col = circle.Colour.TopLeft.Linear;
-            colouredComponents.Colour = ColourUtils.ForegroundTextColourFor(col);
+            colouredComponents.Colour = OsuColour.ForegroundTextColourFor(col);
         }
 
         protected override void Update()
diff --git a/osu.Game/Utils/ColourUtils.cs b/osu.Game/Utils/ColourUtils.cs
deleted file mode 100644
index 33f6f5981f..0000000000
--- a/osu.Game/Utils/ColourUtils.cs
+++ /dev/null
@@ -1,23 +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.Graphics;
-using osuTK.Graphics;
-
-namespace osu.Game.Utils
-{
-    public static class ColourUtils
-    {
-        /// <summary>
-        /// Returns a foreground text colour that is supposed to contrast well on top of
-        /// the supplied <paramref name="backgroundColour"/>.
-        /// </summary>
-        public static Color4 ForegroundTextColourFor(Color4 backgroundColour)
-        {
-            // formula taken from the RGB->YIQ conversions: https://en.wikipedia.org/wiki/YIQ
-            // brightness here is equivalent to the Y component in the above colour model, which is a rough estimate of lightness.
-            float brightness = 0.299f * backgroundColour.R + 0.587f * backgroundColour.G + 0.114f * backgroundColour.B;
-            return OsuColour.Gray(brightness > 0.5f ? 0.2f : 0.9f);
-        }
-    }
-}

From 6bf6084ae9c3129d8a5672946e33205e8eabfcd3 Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Mon, 19 Apr 2021 19:24:46 +0200
Subject: [PATCH 2657/3722] fixed according to suggestions

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

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 14e5831ef9..deb77c27de 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -308,7 +308,7 @@ namespace osu.Game.Screens.Select
                                 Margin = new MarginPadding { Top = 10 },
                                 Direction = FillDirection.Horizontal,
                                 AutoSizeAxes = Axes.Both,
-                                Children = new[] { getMapper(metadata) },
+                                Child = getMapper(metadata),
                             },
                             infoLabelContainer = new FillFlowContainer
                             {
@@ -431,10 +431,10 @@ namespace osu.Game.Screens.Select
                 ForceRedraw();
             }
 
-            private LinkFlowContainer getMapper(BeatmapMetadata metadata)
+            private Drawable getMapper(BeatmapMetadata metadata)
             {
                 if (metadata.Author == null)
-                    return new LinkFlowContainer();
+                    return Empty();
 
                 return new LinkFlowContainer(s =>
                 {

From c73bbf0aa7566c1bf33784caacb91fc786a7a2cc Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Mon, 19 Apr 2021 19:24:58 +0200
Subject: [PATCH 2658/3722] Fixed Tests

---
 osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
index 7ea6373763..16afc5ace7 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
@@ -107,7 +107,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("check version", () => infoWedge.Info.VersionLabel.Current.Value == $"{ruleset.ShortName}Version");
             AddAssert("check title", () => infoWedge.Info.TitleLabel.Current.Value == $"{ruleset.ShortName}Source — {ruleset.ShortName}Title");
             AddAssert("check artist", () => infoWedge.Info.ArtistLabel.Current.Value == $"{ruleset.ShortName}Artist");
-            AddAssert("check author", () => infoWedge.Info.MapperContainer.Children.OfType<OsuSpriteText>().Any(s => s.Current.Value == $"{ruleset.ShortName}Author"));
+            AddAssert("check author", () => infoWedge.Info.MapperContainer.ChildrenOfType<OsuSpriteText>().Any(s => s.Current.Value == $"{ruleset.ShortName}Author"));
         }
 
         private void testInfoLabels(int expectedCount)
@@ -123,7 +123,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("check empty version", () => string.IsNullOrEmpty(infoWedge.Info.VersionLabel.Current.Value));
             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 empty author", () => !infoWedge.Info.MapperContainer.Children.Any());
+            AddAssert("check empty author", () => !infoWedge.Info.MapperContainer.ChildrenOfType<OsuSpriteText>().Any());
             AddAssert("check no info labels", () => !infoWedge.Info.ChildrenOfType<BeatmapInfoWedge.BufferedWedgeInfo.InfoLabel>().Any());
         }
 

From 2a7ef1f80f037cbf393acbf23f1bd06ee4cbc4d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 19 Apr 2021 19:27:35 +0200
Subject: [PATCH 2659/3722] Use more general type

---
 osu.Game/Graphics/Containers/LinkFlowContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Containers/LinkFlowContainer.cs b/osu.Game/Graphics/Containers/LinkFlowContainer.cs
index 3a2f9d5a78..054febeec3 100644
--- a/osu.Game/Graphics/Containers/LinkFlowContainer.cs
+++ b/osu.Game/Graphics/Containers/LinkFlowContainer.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Graphics.Containers
         public void AddLink(string text, LinkAction action, string argument, string tooltipText = null, Action<SpriteText> creationParameters = null)
             => createLink(AddText(text, creationParameters), new LinkDetails(action, argument), tooltipText);
 
-        public void AddLink(RomanisableString text, LinkAction action, string argument, string tooltipText = null, Action<SpriteText> creationParameters = null)
+        public void AddLink(LocalisableString text, LinkAction action, string argument, string tooltipText = null, Action<SpriteText> creationParameters = null)
         {
             var spriteText = new OsuSpriteText { Text = text };
 

From 8656176ab8e09b14737212846fdeed787a3f7bc4 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 20 Apr 2021 01:31:51 +0200
Subject: [PATCH 2660/3722] Add the playable beatmap as check argument

This is different from the working beatmap's `.Beatmap` property in that it is mutated by the ruleset/editor.

So hit objects, for example, are actually of type `Slider` and such instead of the legacy `ConvertSlider`.

This should be preferred over `workingBeatmap.Beatmap`.
---
 .../Editor/Checks/CheckOffscreenObjectsTest.cs       |  6 +++---
 .../Edit/Checks/CheckOffscreenObjects.cs             |  4 ++--
 osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs     |  5 ++++-
 .../Editing/Checks/CheckBackgroundQualityTest.cs     | 12 ++++++------
 .../Editing/Checks/CheckFilePresenceTest.cs          | 12 ++++++------
 osu.Game/Rulesets/Edit/BeatmapVerifier.cs            |  5 ++++-
 .../Rulesets/Edit/Checks/CheckBackgroundQuality.cs   |  6 +++---
 osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs   |  4 ++--
 osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs   |  5 +++--
 osu.Game/Rulesets/Edit/IBeatmapVerifier.cs           |  2 +-
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs         |  4 ++--
 11 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
index db347960ef..3a4817398c 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
@@ -224,12 +224,12 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
 
         private void assertOk(IBeatmap beatmap)
         {
-            Assert.That(check.Run(new TestWorkingBeatmap(beatmap)), Is.Empty);
+            Assert.That(check.Run(beatmap, new TestWorkingBeatmap(beatmap)), Is.Empty);
         }
 
         private void assertOffscreenCircle(IBeatmap beatmap)
         {
-            var issues = check.Run(new TestWorkingBeatmap(beatmap)).ToList();
+            var issues = check.Run(beatmap, new TestWorkingBeatmap(beatmap)).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckOffscreenObjects.IssueTemplateOffscreenCircle);
@@ -237,7 +237,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
 
         private void assertOffscreenSlider(IBeatmap beatmap)
         {
-            var issues = check.Run(new TestWorkingBeatmap(beatmap)).ToList();
+            var issues = check.Run(beatmap, new TestWorkingBeatmap(beatmap)).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckOffscreenObjects.IssueTemplateOffscreenSlider);
diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index c210f73b5f..4b0a7531a1 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -31,9 +31,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
             new IssueTemplateOffscreenSlider(this)
         };
 
-        public IEnumerable<Issue> Run(IWorkingBeatmap workingBeatmap)
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap)
         {
-            foreach (var hitobject in workingBeatmap.Beatmap.HitObjects)
+            foreach (var hitobject in playableBeatmap.HitObjects)
             {
                 switch (hitobject)
                 {
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
index 9b9383d547..dab6483179 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
@@ -17,6 +17,9 @@ namespace osu.Game.Rulesets.Osu.Edit
             new CheckOffscreenObjects()
         };
 
-        public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap) => checks.SelectMany(check => check.Run(workingBeatmap));
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, WorkingBeatmap workingBeatmap)
+        {
+            return checks.SelectMany(check => check.Run(playableBeatmap, workingBeatmap));
+        }
     }
 }
diff --git a/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs b/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
index 8dad5bbf34..42d143cc04 100644
--- a/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Tests.Editing.Checks
             beatmap.Metadata.BackgroundFile = null;
             var mock = getMockWorkingBeatmap(null, System.Array.Empty<byte>());
 
-            Assert.That(check.Run(mock.Object), Is.Empty);
+            Assert.That(check.Run(beatmap, mock.Object), Is.Empty);
         }
 
         [Test]
@@ -63,7 +63,7 @@ namespace osu.Game.Tests.Editing.Checks
         {
             var mock = getMockWorkingBeatmap(new Texture(1920, 1080));
 
-            Assert.That(check.Run(mock.Object), Is.Empty);
+            Assert.That(check.Run(beatmap, mock.Object), Is.Empty);
         }
 
         [Test]
@@ -71,7 +71,7 @@ namespace osu.Game.Tests.Editing.Checks
         {
             var mock = getMockWorkingBeatmap(new Texture(3840, 2160));
 
-            var issues = check.Run(mock.Object).ToList();
+            var issues = check.Run(beatmap, mock.Object).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateTooHighResolution);
@@ -82,7 +82,7 @@ namespace osu.Game.Tests.Editing.Checks
         {
             var mock = getMockWorkingBeatmap(new Texture(640, 480));
 
-            var issues = check.Run(mock.Object).ToList();
+            var issues = check.Run(beatmap, mock.Object).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateLowResolution);
@@ -93,7 +93,7 @@ namespace osu.Game.Tests.Editing.Checks
         {
             var mock = getMockWorkingBeatmap(new Texture(100, 100));
 
-            var issues = check.Run(mock.Object).ToList();
+            var issues = check.Run(beatmap, mock.Object).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateTooLowResolution);
@@ -104,7 +104,7 @@ namespace osu.Game.Tests.Editing.Checks
         {
             var mock = getMockWorkingBeatmap(new Texture(1920, 1080), new byte[1024 * 1024 * 3]);
 
-            var issues = check.Run(mock.Object).ToList();
+            var issues = check.Run(beatmap, mock.Object).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateTooUncompressed);
diff --git a/osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs b/osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs
index 1149115b55..fe2e16ffd8 100644
--- a/osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs
@@ -15,13 +15,13 @@ namespace osu.Game.Tests.Editing.Checks
     public class CheckFilePresenceTest
     {
         private CheckBackgroundPresence check;
-        private WorkingBeatmap beatmap;
+        private IBeatmap beatmap;
 
         [SetUp]
         public void Setup()
         {
             check = new CheckBackgroundPresence();
-            beatmap = new TestWorkingBeatmap(new Beatmap<HitObject>
+            beatmap = new Beatmap<HitObject>
             {
                 BeatmapInfo = new BeatmapInfo
                 {
@@ -34,13 +34,13 @@ namespace osu.Game.Tests.Editing.Checks
                         })
                     }
                 }
-            });
+            };
         }
 
         [Test]
         public void TestBackgroundSetAndInFiles()
         {
-            Assert.That(check.Run(beatmap), Is.Empty);
+            Assert.That(check.Run(beatmap, new TestWorkingBeatmap(beatmap)), Is.Empty);
         }
 
         [Test]
@@ -48,7 +48,7 @@ namespace osu.Game.Tests.Editing.Checks
         {
             beatmap.BeatmapInfo.BeatmapSet.Files.Clear();
 
-            var issues = check.Run(beatmap).ToList();
+            var issues = check.Run(beatmap, new TestWorkingBeatmap(beatmap)).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckFilePresence.IssueTemplateDoesNotExist);
@@ -59,7 +59,7 @@ namespace osu.Game.Tests.Editing.Checks
         {
             beatmap.Metadata.BackgroundFile = null;
 
-            var issues = check.Run(beatmap).ToList();
+            var issues = check.Run(beatmap, new TestWorkingBeatmap(beatmap)).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckFilePresence.IssueTemplateNoneSet);
diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index 90447049f8..9efaa94b40 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -23,6 +23,9 @@ namespace osu.Game.Rulesets.Edit
             new CheckAudioPresence(),
         };
 
-        public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap) => checks.SelectMany(check => check.Run(workingBeatmap));
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, WorkingBeatmap workingBeatmap)
+        {
+            return checks.SelectMany(check => check.Run(playableBeatmap, workingBeatmap));
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
index 1494ae5da4..767c2b94b5 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
@@ -30,9 +30,9 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateTooUncompressed(this)
         };
 
-        public IEnumerable<Issue> Run(IWorkingBeatmap workingBeatmap)
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap)
         {
-            var backgroundFile = workingBeatmap.Beatmap.Metadata?.BackgroundFile;
+            var backgroundFile = playableBeatmap.Metadata?.BackgroundFile;
             if (backgroundFile == null)
                 yield break;
 
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             else if (texture.Width < low_width || texture.Height < low_height)
                 yield return new IssueTemplateLowResolution(this).Create(texture.Width, texture.Height);
 
-            string storagePath = workingBeatmap.Beatmap.BeatmapInfo.BeatmapSet.GetPathForFile(backgroundFile);
+            string storagePath = playableBeatmap.BeatmapInfo.BeatmapSet.GetPathForFile(backgroundFile);
             double filesizeMb = workingBeatmap.GetStream(storagePath).Length / (1024d * 1024d);
 
             if (filesizeMb > max_filesize_mb)
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs b/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
index 37fa79568f..340b053fdb 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateDoesNotExist(this)
         };
 
-        public IEnumerable<Issue> Run(IWorkingBeatmap workingBeatmap)
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap)
         {
             var filename = GetFilename(workingBeatmap);
 
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             }
 
             // If the file is set, also make sure it still exists.
-            var storagePath = workingBeatmap.Beatmap.BeatmapInfo.BeatmapSet.GetPathForFile(filename);
+            var storagePath = playableBeatmap.BeatmapInfo.BeatmapSet.GetPathForFile(filename);
             if (storagePath != null)
                 yield break;
 
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs b/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
index c3a64b58e9..31a7583941 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
@@ -24,7 +24,8 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// <summary>
         /// Runs this check and returns any issues detected for the provided beatmap.
         /// </summary>
-        /// <param name="workingBeatmap">The beatmap to run the check on.</param>
-        public IEnumerable<Issue> Run(IWorkingBeatmap workingBeatmap);
+        /// <param name="playableBeatmap">The playable beatmap of the beatmap to run the check on.</param>
+        /// <param name="workingBeatmap">The working beatmap of the beatmap to run the check on.</param>
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap);
     }
 }
diff --git a/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs b/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
index 12be8815e1..b598176a35 100644
--- a/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
@@ -12,6 +12,6 @@ namespace osu.Game.Rulesets.Edit
     /// </summary>
     public interface IBeatmapVerifier
     {
-        public IEnumerable<Issue> Run(WorkingBeatmap workingBeatmap);
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, WorkingBeatmap workingBeatmap);
     }
 }
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index 6aa479b38d..393c89fe52 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -124,10 +124,10 @@ namespace osu.Game.Screens.Edit.Verify
             private void refresh()
             {
                 var workingBeatmap = beatmapManager.GetWorkingBeatmap(beatmap.BeatmapInfo);
-                var issues = generalVerifier.Run(workingBeatmap);
+                var issues = generalVerifier.Run(beatmap.PlayableBeatmap, workingBeatmap);
 
                 if (rulesetVerifier != null)
-                    issues = issues.Concat(rulesetVerifier.Run(workingBeatmap));
+                    issues = issues.Concat(rulesetVerifier.Run(beatmap.PlayableBeatmap, workingBeatmap));
 
                 table.Issues = issues
                                .OrderBy(issue => issue.Template.Type)

From be6a02a17e3f5621d7f6942678d278748cd88cec Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 20 Apr 2021 01:32:22 +0200
Subject: [PATCH 2661/3722] Simplify background quality test names

---
 .../Editing/Checks/CheckBackgroundQualityTest.cs     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs b/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
index 42d143cc04..b6970a99e4 100644
--- a/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Tests.Editing.Checks
         }
 
         [Test]
-        public void TestBackgroundMissing()
+        public void TestMissing()
         {
             // While this is a problem, it is out of scope for this check and is caught by a different one.
             beatmap.Metadata.BackgroundFile = null;
@@ -59,7 +59,7 @@ namespace osu.Game.Tests.Editing.Checks
         }
 
         [Test]
-        public void TestBackgroundAcceptable()
+        public void TestAcceptable()
         {
             var mock = getMockWorkingBeatmap(new Texture(1920, 1080));
 
@@ -67,7 +67,7 @@ namespace osu.Game.Tests.Editing.Checks
         }
 
         [Test]
-        public void TestBackgroundTooHighResolution()
+        public void TestTooHighResolution()
         {
             var mock = getMockWorkingBeatmap(new Texture(3840, 2160));
 
@@ -78,7 +78,7 @@ namespace osu.Game.Tests.Editing.Checks
         }
 
         [Test]
-        public void TestBackgroundLowResolution()
+        public void TestLowResolution()
         {
             var mock = getMockWorkingBeatmap(new Texture(640, 480));
 
@@ -89,7 +89,7 @@ namespace osu.Game.Tests.Editing.Checks
         }
 
         [Test]
-        public void TestBackgroundTooLowResolution()
+        public void TestTooLowResolution()
         {
             var mock = getMockWorkingBeatmap(new Texture(100, 100));
 
@@ -100,7 +100,7 @@ namespace osu.Game.Tests.Editing.Checks
         }
 
         [Test]
-        public void TestBackgroundTooUncompressed()
+        public void TestTooUncompressed()
         {
             var mock = getMockWorkingBeatmap(new Texture(1920, 1080), new byte[1024 * 1024 * 3]);
 

From 14c626ffcbff01f250a7008ebb8469181f5d6f95 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 20 Apr 2021 01:33:19 +0200
Subject: [PATCH 2662/3722] Use the playable beatmap for file presence checks

---
 osu.Game/Rulesets/Edit/Checks/CheckAudioPresence.cs      | 2 +-
 osu.Game/Rulesets/Edit/Checks/CheckBackgroundPresence.cs | 2 +-
 osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckAudioPresence.cs b/osu.Game/Rulesets/Edit/Checks/CheckAudioPresence.cs
index 55e53ef519..2d572a521e 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(IWorkingBeatmap workingBeatmap) => workingBeatmap.Beatmap.Metadata?.AudioFile;
+        protected override string GetFilename(IBeatmap playableBeatmap) => playableBeatmap.Metadata?.AudioFile;
     }
 }
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundPresence.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundPresence.cs
index 3a229b889b..233c708a25 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(IWorkingBeatmap workingBeatmap) => workingBeatmap.Beatmap.Metadata?.BackgroundFile;
+        protected override string GetFilename(IBeatmap playableBeatmap) => playableBeatmap.Metadata?.BackgroundFile;
     }
 }
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs b/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
index 340b053fdb..006fc57c04 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Edit.Checks
     {
         protected abstract CheckCategory Category { get; }
         protected abstract string TypeOfFile { get; }
-        protected abstract string GetFilename(IWorkingBeatmap workingBeatmap);
+        protected abstract string GetFilename(IBeatmap playableBeatmap);
 
         public CheckMetadata Metadata => new CheckMetadata(Category, $"Missing {TypeOfFile}");
 
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Edit.Checks
 
         public IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap)
         {
-            var filename = GetFilename(workingBeatmap);
+            var filename = GetFilename(playableBeatmap);
 
             if (filename == null)
             {

From 40ae856dfc4cb5006f43f10e3b1363e8434cb5ea Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 20 Apr 2021 01:34:05 +0200
Subject: [PATCH 2663/3722] Show 2 decimals for background filesize

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

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
index 767c2b94b5..59fee74023 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
@@ -88,7 +88,7 @@ namespace osu.Game.Rulesets.Edit.Checks
         public class IssueTemplateTooUncompressed : IssueTemplate
         {
             public IssueTemplateTooUncompressed(ICheck check)
-                : base(check, IssueType.Problem, "The background filesize ({0:0.#} MB) exceeds {1} MB.")
+                : base(check, IssueType.Problem, "The background filesize ({0:0.##} MB) exceeds {1} MB.")
             {
             }
 

From f168247254424bda53e90680bfc45e83b69e7f22 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 20 Apr 2021 01:35:41 +0200
Subject: [PATCH 2664/3722] Add `Track` as a property to `IWorkingBeatmap`

This is implemented by `WorkingBeatmap` already, and is much better to use than loading the track every time we need it.
---
 osu.Game/Beatmaps/IWorkingBeatmap.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Beatmaps/IWorkingBeatmap.cs b/osu.Game/Beatmaps/IWorkingBeatmap.cs
index f1bf6f48ef..b1cf6db6fc 100644
--- a/osu.Game/Beatmaps/IWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/IWorkingBeatmap.cs
@@ -42,6 +42,11 @@ namespace osu.Game.Beatmaps
         /// </summary>
         ISkin Skin { get; }
 
+        /// <summary>
+        /// Get the loaded audio track instance.
+        /// </summary>
+        Track Track { get; }
+
         /// <summary>
         /// Constructs a playable <see cref="IBeatmap"/> from <see cref="Beatmap"/> using the applicable converters for a specific <see cref="RulesetInfo"/>.
         /// <para>

From c633f155653ef109898471b489e2ef466f1a10fc Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 20 Apr 2021 01:36:03 +0200
Subject: [PATCH 2665/3722] Add audio quality check

---
 osu.Game/Rulesets/Edit/BeatmapVerifier.cs     |  2 +
 .../Rulesets/Edit/Checks/CheckAudioQuality.cs | 75 +++++++++++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs

diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index 9efaa94b40..f33feac971 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -19,8 +19,10 @@ namespace osu.Game.Rulesets.Edit
             // Resources
             new CheckBackgroundPresence(),
             new CheckBackgroundQuality(),
+
             // Audio
             new CheckAudioPresence(),
+            new CheckAudioQuality()
         };
 
         public IEnumerable<Issue> Run(IBeatmap playableBeatmap, WorkingBeatmap workingBeatmap)
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs b/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs
new file mode 100644
index 0000000000..b67374c023
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.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.Collections.Generic;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit.Checks.Components;
+
+namespace osu.Game.Rulesets.Edit.Checks
+{
+    public class CheckAudioQuality : ICheck
+    {
+        // This is a requirement as stated in the Ranking Criteria.
+        // See https://osu.ppy.sh/wiki/en/Ranking_Criteria#rules.4
+        private const int max_bitrate = 192;
+
+        // "A song's audio file /.../ must be of reasonable quality. Try to find the highest quality source file available"
+        // There not existing a version with a bitrate of 128 kbps or higher is extremely rare.
+        private const int min_bitrate = 128;
+
+        public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Resources, "Too high or low audio bitrate");
+
+        public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
+        {
+            new IssueTemplateTooHighBitrate(this),
+            new IssueTemplateTooLowBitrate(this),
+            new IssueTemplateNoBitrate(this)
+        };
+
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap)
+        {
+            var audioFile = playableBeatmap.Metadata?.AudioFile;
+            if (audioFile == null)
+                yield break;
+
+            var track = workingBeatmap.Track;
+
+            if (track?.Bitrate == null || track.Bitrate.Value == 0)
+                yield return new IssueTemplateNoBitrate(this).Create();
+            else if (track.Bitrate.Value > max_bitrate)
+                yield return new IssueTemplateTooHighBitrate(this).Create(track.Bitrate.Value);
+            else if (track.Bitrate.Value < min_bitrate)
+                yield return new IssueTemplateTooLowBitrate(this).Create(track.Bitrate.Value);
+        }
+
+        public class IssueTemplateTooHighBitrate : IssueTemplate
+        {
+            public IssueTemplateTooHighBitrate(ICheck check)
+                : base(check, IssueType.Problem, "The audio bitrate ({0} kbps) exceeds {1} kbps.")
+            {
+            }
+
+            public Issue Create(int bitrate) => new Issue(this, bitrate, max_bitrate);
+        }
+
+        public class IssueTemplateTooLowBitrate : IssueTemplate
+        {
+            public IssueTemplateTooLowBitrate(ICheck check)
+                : base(check, IssueType.Problem, "The audio bitrate ({0} kbps) is lower than {1} kbps.")
+            {
+            }
+
+            public Issue Create(int bitrate) => new Issue(this, bitrate, min_bitrate);
+        }
+
+        public class IssueTemplateNoBitrate : IssueTemplate
+        {
+            public IssueTemplateNoBitrate(ICheck check)
+                : base(check, IssueType.Error, "The audio bitrate could not be retrieved.")
+            {
+            }
+
+            public Issue Create() => new Issue(this);
+        }
+    }
+}

From 2bb079ea1403479e1bf513eb63fdc3f1d98bceb3 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 20 Apr 2021 01:36:15 +0200
Subject: [PATCH 2666/3722] Add audio quality check tests

---
 .../Editing/Checks/CheckAudioQualityTest.cs   | 114 ++++++++++++++++++
 1 file changed, 114 insertions(+)
 create mode 100644 osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs

diff --git a/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs b/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs
new file mode 100644
index 0000000000..e73d9adfb0
--- /dev/null
+++ b/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs
@@ -0,0 +1,114 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Linq;
+using Moq;
+using NUnit.Framework;
+using osu.Framework.Audio.Track;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit.Checks;
+using osu.Game.Rulesets.Objects;
+
+namespace osu.Game.Tests.Editing.Checks
+{
+    [TestFixture]
+    public class CheckAudioQualityTest
+    {
+        private CheckAudioQuality check;
+        private IBeatmap beatmap;
+
+        [SetUp]
+        public void Setup()
+        {
+            check = new CheckAudioQuality();
+            beatmap = new Beatmap<HitObject>
+            {
+                BeatmapInfo = new BeatmapInfo
+                {
+                    Metadata = new BeatmapMetadata { AudioFile = "abc123.jpg" }
+                }
+            };
+        }
+
+        [Test]
+        public void TestMissing()
+        {
+            // While this is a problem, it is out of scope for this check and is caught by a different one.
+            beatmap.Metadata.AudioFile = null;
+
+            var mock = new Mock<IWorkingBeatmap>();
+            mock.SetupGet(_ => _.Beatmap).Returns(beatmap);
+            mock.SetupGet(_ => _.Track).Returns((Track)null);
+
+            Assert.That(check.Run(beatmap, mock.Object), Is.Empty);
+        }
+
+        [Test]
+        public void TestAcceptable()
+        {
+            var mock = getMockWorkingBeatmap(192);
+
+            Assert.That(check.Run(beatmap, mock.Object), Is.Empty);
+        }
+
+        [Test]
+        public void TestNullBitrate()
+        {
+            var mock = getMockWorkingBeatmap(null);
+
+            var issues = check.Run(beatmap, mock.Object).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckAudioQuality.IssueTemplateNoBitrate);
+        }
+
+        [Test]
+        public void TestZeroBitrate()
+        {
+            var mock = getMockWorkingBeatmap(0);
+
+            var issues = check.Run(beatmap, mock.Object).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckAudioQuality.IssueTemplateNoBitrate);
+        }
+
+        [Test]
+        public void TestTooHighBitrate()
+        {
+            var mock = getMockWorkingBeatmap(320);
+
+            var issues = check.Run(beatmap, mock.Object).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckAudioQuality.IssueTemplateTooHighBitrate);
+        }
+
+        [Test]
+        public void TestTooLowBitrate()
+        {
+            var mock = getMockWorkingBeatmap(64);
+
+            var issues = check.Run(beatmap, mock.Object).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckAudioQuality.IssueTemplateTooLowBitrate);
+        }
+
+        /// <summary>
+        /// Returns the mock of the working beatmap with the given audio properties.
+        /// </summary>
+        /// <param name="audioBitrate">The bitrate of the audio file the beatmap uses.</param>
+        private Mock<IWorkingBeatmap> getMockWorkingBeatmap(int? audioBitrate)
+        {
+            var mockTrack = new Mock<Track>();
+            mockTrack.SetupGet(_ => _.Bitrate).Returns(audioBitrate);
+
+            var mockWorkingBeatmap = new Mock<IWorkingBeatmap>();
+            mockWorkingBeatmap.SetupGet(_ => _.Beatmap).Returns(beatmap);
+            mockWorkingBeatmap.SetupGet(_ => _.Track).Returns(mockTrack.Object);
+
+            return mockWorkingBeatmap;
+        }
+    }
+}

From c1b4aaaa03334995f4a96f223b3ce446a8ffb0dc Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 20 Apr 2021 08:38:02 +0900
Subject: [PATCH 2667/3722] Add doc comment

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

diff --git a/osu.Game/Rulesets/Objects/UnmanagedHitObjectEntry.cs b/osu.Game/Rulesets/Objects/UnmanagedHitObjectEntry.cs
index 507cad15d3..86fa59f589 100644
--- a/osu.Game/Rulesets/Objects/UnmanagedHitObjectEntry.cs
+++ b/osu.Game/Rulesets/Objects/UnmanagedHitObjectEntry.cs
@@ -5,6 +5,10 @@ using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Objects
 {
+    /// <summary>
+    /// Created for a <see cref="DrawableHitObject"/> when only <see cref="HitObject"/> is given
+    /// to make sure a <see cref="DrawableHitObject"/> is always associated with a <see cref="HitObjectLifetimeEntry"/>.
+    /// </summary>
     internal class UnmanagedHitObjectEntry : HitObjectLifetimeEntry
     {
         public readonly DrawableHitObject DrawableHitObject;

From 4510e795e1326257168b1174a551ecf281a45563 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 20 Apr 2021 02:13:26 +0200
Subject: [PATCH 2668/3722] Fix category of audio quality check

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

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs b/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs
index b67374c023..c1074d7c74 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Edit.Checks
         // There not existing a version with a bitrate of 128 kbps or higher is extremely rare.
         private const int min_bitrate = 128;
 
-        public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Resources, "Too high or low audio bitrate");
+        public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Audio, "Too high or low audio bitrate");
 
         public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
         {

From 1bc63a4c611a99c9652743a9ba94eb6acc288e0a Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 20 Apr 2021 09:17:13 +0900
Subject: [PATCH 2669/3722] Now, DHO.lifetimeEntry can be non-null even it is
 not fully applied

---
 .../Objects/Drawables/DrawableHitObject.cs    | 46 ++++++++-----------
 .../Objects/UnmanagedHitObjectEntry.cs        |  7 +--
 2 files changed, 20 insertions(+), 33 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 9b132ea932..16f5ed9d17 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -39,12 +39,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// <summary>
         /// The <see cref="HitObject"/> currently represented by this <see cref="DrawableHitObject"/>.
         /// </summary>
-        public HitObject HitObject => lifetimeEntry?.HitObject ?? initialHitObject;
-
-        /// <summary>
-        /// The <see cref="HitObject"/> given in the constructor that will be applied when loaded.
-        /// </summary>
-        private HitObject initialHitObject;
+        public HitObject HitObject => lifetimeEntry?.HitObject;
 
         /// <summary>
         /// The parenting <see cref="DrawableHitObject"/>, if any.
@@ -145,9 +140,15 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </remarks>
         public IBindable<ArmedState> State => state;
 
+        /// <summary>
+        /// Whether a <see cref="HitObjectLifetimeEntry"/> is currently applied.
+        /// </summary>
+        private bool hasEntryApplied;
+
         /// <summary>
         /// The <see cref="HitObjectLifetimeEntry"/> controlling the lifetime of the currently-attached <see cref="HitObject"/>.
         /// </summary>
+        /// <remarks>Even if it is not null, it may not be fully applied until loaded (<see cref="hasEntryApplied"/> is false).</remarks>
         [CanBeNull]
         private HitObjectLifetimeEntry lifetimeEntry;
 
@@ -168,7 +169,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </param>
         protected DrawableHitObject([CanBeNull] HitObject initialHitObject = null)
         {
-            this.initialHitObject = initialHitObject;
+            if (initialHitObject != null)
+                lifetimeEntry = new UnmanagedHitObjectEntry(initialHitObject);
         }
 
         [BackgroundDependencyLoader]
@@ -184,11 +186,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
         {
             base.LoadAsyncComplete();
 
-            if (initialHitObject != null)
-            {
-                Apply(initialHitObject, null);
-                initialHitObject = null;
-            }
+            if (lifetimeEntry != null && !hasEntryApplied)
+                apply(lifetimeEntry);
         }
 
         protected override void LoadComplete()
@@ -210,21 +209,10 @@ namespace osu.Game.Rulesets.Objects.Drawables
             if (hitObject == null)
                 throw new ArgumentNullException($"Cannot apply a null {nameof(HitObject)}.");
 
-            if (lifetimeEntry != null)
-            {
-                if (lifetimeEntry.HitObject != hitObject)
-                    throw new InvalidOperationException($"{nameof(HitObjectLifetimeEntry)} has different {nameof(HitObject)} from the specified one.");
+            if (lifetimeEntry != null && lifetimeEntry.HitObject != hitObject)
+                throw new InvalidOperationException($"{nameof(HitObjectLifetimeEntry)} has different {nameof(HitObject)} from the specified one.");
 
-                apply(lifetimeEntry);
-            }
-            else
-            {
-                var unmanagedEntry = new UnmanagedHitObjectEntry(hitObject, this);
-                apply(unmanagedEntry);
-
-                // Set default lifetime for a non-pooled DHO
-                LifetimeStart = hitObject.StartTime - InitialLifetimeOffset;
-            }
+            apply(lifetimeEntry ?? new UnmanagedHitObjectEntry(hitObject));
         }
 
         /// <summary>
@@ -294,6 +282,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
                 else
                     updateState(ArmedState.Idle, true);
             }
+
+            hasEntryApplied = true;
         }
 
         /// <summary>
@@ -301,7 +291,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </summary>
         private void free()
         {
-            if (lifetimeEntry == null) return;
+            if (!hasEntryApplied) return;
 
             StartTimeBindable.UnbindFrom(HitObject.StartTimeBindable);
             if (HitObject is IHasComboInformation combo)
@@ -337,6 +327,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
             lifetimeEntry = null;
 
             clearExistingStateTransforms();
+
+            hasEntryApplied = false;
         }
 
         protected sealed override void FreeAfterUse()
diff --git a/osu.Game/Rulesets/Objects/UnmanagedHitObjectEntry.cs b/osu.Game/Rulesets/Objects/UnmanagedHitObjectEntry.cs
index 86fa59f589..3cfa3c4d3a 100644
--- a/osu.Game/Rulesets/Objects/UnmanagedHitObjectEntry.cs
+++ b/osu.Game/Rulesets/Objects/UnmanagedHitObjectEntry.cs
@@ -11,14 +11,9 @@ namespace osu.Game.Rulesets.Objects
     /// </summary>
     internal class UnmanagedHitObjectEntry : HitObjectLifetimeEntry
     {
-        public readonly DrawableHitObject DrawableHitObject;
-
-        public UnmanagedHitObjectEntry(HitObject hitObject, DrawableHitObject drawableHitObject)
+        public UnmanagedHitObjectEntry(HitObject hitObject)
             : base(hitObject)
         {
-            DrawableHitObject = drawableHitObject;
-            LifetimeStart = DrawableHitObject.LifetimeStart;
-            LifetimeEnd = DrawableHitObject.LifetimeEnd;
         }
     }
 }

From 67e4fe42847fab7f6cc47b422257971b13979e06 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 20 Apr 2021 02:28:38 +0200
Subject: [PATCH 2670/3722] Add xmldoc to `GetStream`

---
 osu.Game/Beatmaps/IWorkingBeatmap.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Beatmaps/IWorkingBeatmap.cs b/osu.Game/Beatmaps/IWorkingBeatmap.cs
index b1cf6db6fc..053c6d373f 100644
--- a/osu.Game/Beatmaps/IWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/IWorkingBeatmap.cs
@@ -74,6 +74,10 @@ namespace osu.Game.Beatmaps
         /// <returns>A fresh track instance, which will also be available via <see cref="Track"/>.</returns>
         Track LoadTrack();
 
+        /// <summary>
+        /// Returns the stream of the file from the given storage path.
+        /// </summary>
+        /// <param name="storagePath">The storage path to the file.</param>
         Stream GetStream(string storagePath);
     }
 }

From 1478bcfa8e774dcbb3e1b785b94bae10c2d8acbd Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 20 Apr 2021 02:30:27 +0200
Subject: [PATCH 2671/3722] Improve xmldoc consistency

---
 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 053c6d373f..a916b37b85 100644
--- a/osu.Game/Beatmaps/IWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/IWorkingBeatmap.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Beatmaps
         ISkin Skin { get; }
 
         /// <summary>
-        /// Get the loaded audio track instance.
+        /// Retrieves the <see cref="Track"/> which this <see cref="WorkingBeatmap"/> has loaded.
         /// </summary>
         Track Track { get; }
 

From 496df411a7e20485adf374233f5f4d93a292d6b7 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 20 Apr 2021 02:39:11 +0200
Subject: [PATCH 2672/3722] Remove now unused import

---
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index 2ab529cb27..530f24300b 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -8,7 +8,6 @@ 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.UserInterface;
 using osu.Game.Overlays;

From 8a8b9084efa04747e8147d7602fc277359c18b43 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 20 Apr 2021 10:11:36 +0900
Subject: [PATCH 2673/3722] Make single-argument overloead of DHO.Apply public

---
 .../Objects/Drawables/DrawableHitObject.cs    | 46 ++++++++++++-------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 16f5ed9d17..59088cffda 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.Diagnostics;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
@@ -165,7 +166,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </summary>
         /// <param name="initialHitObject">
         /// The <see cref="HitObject"/> to be initially applied to this <see cref="DrawableHitObject"/>.
-        /// If <c>null</c>, a hitobject is expected to be later applied via <see cref="Apply"/> (or automatically via pooling).
+        /// If <c>null</c>, a hitobject is expected to be later applied via <see cref="Apply(osu.Game.Rulesets.Objects.HitObjectLifetimeEntry)"/> (or automatically via pooling).
         /// </param>
         protected DrawableHitObject([CanBeNull] HitObject initialHitObject = null)
         {
@@ -187,7 +188,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             base.LoadAsyncComplete();
 
             if (lifetimeEntry != null && !hasEntryApplied)
-                apply(lifetimeEntry);
+                Apply(lifetimeEntry);
         }
 
         protected override void LoadComplete()
@@ -200,36 +201,47 @@ namespace osu.Game.Rulesets.Objects.Drawables
         }
 
         /// <summary>
-        /// Applies a new <see cref="HitObject"/> to be represented by this <see cref="DrawableHitObject"/>.
+        /// Applies a hit object to be represented by this <see cref="DrawableHitObject"/>.
         /// </summary>
-        /// <param name="hitObject">The <see cref="HitObject"/> to apply.</param>
-        /// <param name="lifetimeEntry">The <see cref="HitObjectLifetimeEntry"/> controlling the lifetime of <paramref name="hitObject"/>.</param>
+        /// <remarks>This overload is semi-deprecated. Use either <see cref="Apply(osu.Game.Rulesets.Objects.HitObject)"/> or <see cref="Apply(osu.Game.Rulesets.Objects.HitObjectLifetimeEntry)"/>.</remarks>
         public void Apply([NotNull] HitObject hitObject, [CanBeNull] HitObjectLifetimeEntry lifetimeEntry)
+        {
+            if (lifetimeEntry != null && lifetimeEntry.HitObject != hitObject)
+                throw new InvalidOperationException($"{nameof(HitObjectLifetimeEntry)} has different {nameof(HitObject)} from the specified one.");
+
+            if (lifetimeEntry != null)
+                Apply(lifetimeEntry);
+            else
+                Apply(hitObject);
+        }
+
+        /// <summary>
+        /// Applies a new <see cref="HitObject"/> to be represented by this <see cref="DrawableHitObject"/>.
+        /// A new <see cref="HitObjectLifetimeEntry"/> is automatically created and applied to this <see cref="DrawableHitObject"/>.
+        /// </summary>
+        public void Apply([NotNull] HitObject hitObject)
         {
             if (hitObject == null)
                 throw new ArgumentNullException($"Cannot apply a null {nameof(HitObject)}.");
 
-            if (lifetimeEntry != null && lifetimeEntry.HitObject != hitObject)
-                throw new InvalidOperationException($"{nameof(HitObjectLifetimeEntry)} has different {nameof(HitObject)} from the specified one.");
-
-            apply(lifetimeEntry ?? new UnmanagedHitObjectEntry(hitObject));
+            Apply(new UnmanagedHitObjectEntry(hitObject));
         }
 
         /// <summary>
         /// Applies a new <see cref="HitObjectLifetimeEntry"/> to be represented by this <see cref="DrawableHitObject"/>.
         /// </summary>
-        private void apply([NotNull] HitObjectLifetimeEntry entry)
+        public void Apply([NotNull] HitObjectLifetimeEntry newEntry)
         {
             free();
 
-            lifetimeEntry = entry;
+            lifetimeEntry = newEntry;
 
-            LifetimeStart = entry.LifetimeStart;
-            LifetimeEnd = entry.LifetimeEnd;
+            LifetimeStart = lifetimeEntry.LifetimeStart;
+            LifetimeEnd = lifetimeEntry.LifetimeEnd;
 
             // Ensure this DHO has a result.
-            entry.Result ??= CreateResult(HitObject.CreateJudgement())
-                             ?? throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");
+            lifetimeEntry.Result ??= CreateResult(HitObject.CreateJudgement())
+                                     ?? throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");
 
             // Copy back the result to the entry for potential future retrieval.
             if (lifetimeEntry != null)
@@ -387,7 +399,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         private void onDefaultsApplied(HitObject hitObject)
         {
-            Apply(hitObject, lifetimeEntry);
+            Debug.Assert(lifetimeEntry != null);
+            Apply(lifetimeEntry);
+
             DefaultsApplied?.Invoke(this);
         }
 

From a92ae8ce769aea4ff4d2c293ce3e825970985ba3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 20 Apr 2021 13:01:42 +0900
Subject: [PATCH 2674/3722] Fix Reset() potentially not resetting to the
 intended start position

---
 osu.Game/Screens/Play/GameplayClockContainer.cs   | 10 +++++++++-
 .../Screens/Play/MasterGameplayClockContainer.cs  | 15 +++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 3da28f3560..e84f34e0d5 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -29,6 +29,11 @@ namespace osu.Game.Screens.Play
         /// </summary>
         protected readonly DecoupleableInterpolatingFramedClock AdjustableSource;
 
+        /// <summary>
+        /// The offset at which to start playing. Affects the time which the clock is reset to via <see cref="Reset"/>.
+        /// </summary>
+        protected virtual double StartOffset => 0;
+
         /// <summary>
         /// The source clock.
         /// </summary>
@@ -93,9 +98,12 @@ namespace osu.Game.Screens.Play
         {
             ChangeSource(SourceClock);
 
-            AdjustableSource.Seek(0);
+            AdjustableSource.Seek(StartOffset);
             AdjustableSource.Stop();
 
+            // Make sure the gameplay clock takes on the new time, otherwise the adjustable source will be seeked to the gameplay clock time in Start().
+            GameplayClock.UnderlyingClock.ProcessFrame();
+
             if (!IsPaused.Value)
                 Start();
         }
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index f019e50b60..05d34fb8d4 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -47,6 +47,9 @@ namespace osu.Game.Screens.Play
 
         private readonly BindableDouble pauseFreqAdjust = new BindableDouble(1);
 
+        protected override double StartOffset => startOffset;
+        private double startOffset;
+
         private readonly WorkingBeatmap beatmap;
         private readonly double gameplayStartTime;
         private readonly bool startAtGameplayStart;
@@ -74,27 +77,23 @@ namespace osu.Game.Screens.Play
             userAudioOffset.BindValueChanged(offset => userOffsetClock.Offset = offset.NewValue, true);
 
             // sane default provided by ruleset.
-            double startTime = gameplayStartTime;
+            startOffset = gameplayStartTime;
 
             if (!startAtGameplayStart)
             {
-                startTime = Math.Min(0, startTime);
+                startOffset = Math.Min(0, startOffset);
 
                 // if a storyboard is present, it may dictate the appropriate start time by having events in negative time space.
                 // this is commonly used to display an intro before the audio track start.
                 double? firstStoryboardEvent = beatmap.Storyboard.EarliestEventTime;
                 if (firstStoryboardEvent != null)
-                    startTime = Math.Min(startTime, firstStoryboardEvent.Value);
+                    startOffset = Math.Min(startOffset, firstStoryboardEvent.Value);
 
                 // some beatmaps specify a current lead-in time which should be used instead of the ruleset-provided value when available.
                 // this is not available as an option in the live editor but can still be applied via .osu editing.
                 if (beatmap.BeatmapInfo.AudioLeadIn > 0)
-                    startTime = Math.Min(startTime, firstHitObjectTime - beatmap.BeatmapInfo.AudioLeadIn);
+                    startOffset = Math.Min(startOffset, firstHitObjectTime - beatmap.BeatmapInfo.AudioLeadIn);
             }
-
-            Seek(startTime);
-
-            AdjustableSource.ProcessFrame();
         }
 
         protected override void OnIsPausedChanged(ValueChangedEvent<bool> isPaused)

From 8dd9134e3d9b6304c3a3ad8d4f869ea73394d42e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 20 Apr 2021 13:09:49 +0900
Subject: [PATCH 2675/3722] Move source clock adjustment application to Start()

---
 .../Screens/Play/MasterGameplayClockContainer.cs  | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 05d34fb8d4..f1d303e245 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -105,6 +105,12 @@ namespace osu.Game.Screens.Play
                 this.TransformBindableTo(pauseFreqAdjust, 1, 200, Easing.In);
         }
 
+        public override void Start()
+        {
+            addSourceClockAdjustments();
+            base.Start();
+        }
+
         /// <summary>
         /// Seek to a specific time in gameplay.
         /// </summary>
@@ -122,12 +128,6 @@ namespace osu.Game.Screens.Play
             userOffsetClock.ProcessFrame();
         }
 
-        public override void Reset()
-        {
-            updateRate();
-            base.Reset();
-        }
-
         /// <summary>
         /// Skip forward to the next valid skip point.
         /// </summary>
@@ -164,11 +164,12 @@ namespace osu.Game.Screens.Play
         {
             removeSourceClockAdjustments();
             ChangeSource(new TrackVirtual(beatmap.Track.Length));
+            addSourceClockAdjustments();
         }
 
         private bool speedAdjustmentsApplied;
 
-        private void updateRate()
+        private void addSourceClockAdjustments()
         {
             if (speedAdjustmentsApplied)
                 return;

From 88ded95e7587c6345da8ecd186a46aba26600524 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 20 Apr 2021 13:56:13 +0900
Subject: [PATCH 2676/3722] Ensure clock is set in GCC.Start()

---
 .../TestSceneMasterGameplayClockContainer.cs  | 28 ++++++++++++++++++-
 .../Screens/Play/GameplayClockContainer.cs    |  7 +++--
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneMasterGameplayClockContainer.cs b/osu.Game.Tests/Gameplay/TestSceneMasterGameplayClockContainer.cs
index 77ada958d7..935bc07733 100644
--- a/osu.Game.Tests/Gameplay/TestSceneMasterGameplayClockContainer.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneMasterGameplayClockContainer.cs
@@ -25,8 +25,34 @@ namespace osu.Game.Tests.Gameplay
                 Add(gcc = new MasterGameplayClockContainer(working, 0));
             });
 
-            AddStep("start track", () => gcc.Start());
+            AddStep("start clock", () => gcc.Start());
             AddUntilStep("elapsed greater than zero", () => gcc.GameplayClock.ElapsedFrameTime > 0);
         }
+
+        [Test]
+        public void TestElapseThenReset()
+        {
+            GameplayClockContainer gcc = null;
+
+            AddStep("create container", () =>
+            {
+                var working = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
+                working.LoadTrack();
+
+                Add(gcc = new MasterGameplayClockContainer(working, 0));
+            });
+
+            AddStep("start clock", () => gcc.Start());
+            AddUntilStep("current time greater 2000", () => gcc.GameplayClock.CurrentTime > 2000);
+
+            double timeAtReset = 0;
+            AddStep("reset clock", () =>
+            {
+                timeAtReset = gcc.GameplayClock.CurrentTime;
+                gcc.Reset();
+            });
+
+            AddAssert("current time < time at reset", () => gcc.GameplayClock.CurrentTime < timeAtReset);
+        }
     }
 }
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index e84f34e0d5..75b27ed3f3 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -1,10 +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.Globalization;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Logging;
 using osu.Framework.Timing;
 
 namespace osu.Game.Screens.Play
@@ -68,6 +70,9 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public virtual void Start()
         {
+            // Ensure that the source clock is set.
+            ChangeSource(SourceClock);
+
             if (!AdjustableSource.IsRunning)
             {
                 // Seeking the decoupled clock to its current time ensures that its source clock will be seeked to the same time
@@ -96,8 +101,6 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public virtual void Reset()
         {
-            ChangeSource(SourceClock);
-
             AdjustableSource.Seek(StartOffset);
             AdjustableSource.Stop();
 

From 3d6d26039a0a1040964f532b57ac912fef9716c7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 20 Apr 2021 14:09:54 +0900
Subject: [PATCH 2677/3722] Remove unused usings

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

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 75b27ed3f3..0ada6613d7 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -1,12 +1,10 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Globalization;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Logging;
 using osu.Framework.Timing;
 
 namespace osu.Game.Screens.Play

From c6ee4e900e25201389ba194b768832e45322941f Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 20 Apr 2021 15:18:36 +0900
Subject: [PATCH 2678/3722] Ensure a non-null hitobject entry has a non-null
 Result

---
 .../Objects/Drawables/DrawableHitObject.cs     | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 59088cffda..d798eba4e1 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -171,7 +171,10 @@ namespace osu.Game.Rulesets.Objects.Drawables
         protected DrawableHitObject([CanBeNull] HitObject initialHitObject = null)
         {
             if (initialHitObject != null)
+            {
                 lifetimeEntry = new UnmanagedHitObjectEntry(initialHitObject);
+                ensureEntryHasResult();
+            }
         }
 
         [BackgroundDependencyLoader]
@@ -239,13 +242,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             LifetimeStart = lifetimeEntry.LifetimeStart;
             LifetimeEnd = lifetimeEntry.LifetimeEnd;
 
-            // Ensure this DHO has a result.
-            lifetimeEntry.Result ??= CreateResult(HitObject.CreateJudgement())
-                                     ?? throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");
-
-            // Copy back the result to the entry for potential future retrieval.
-            if (lifetimeEntry != null)
-                lifetimeEntry.Result = Result;
+            ensureEntryHasResult();
 
             foreach (var h in HitObject.NestedHitObjects)
             {
@@ -799,6 +796,13 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// <param name="judgement">The <see cref="Judgement"/> that provides the scoring information.</param>
         protected virtual JudgementResult CreateResult(Judgement judgement) => new JudgementResult(HitObject, judgement);
 
+        private void ensureEntryHasResult()
+        {
+            Debug.Assert(lifetimeEntry != null);
+            lifetimeEntry.Result ??= CreateResult(HitObject.CreateJudgement())
+                                     ?? throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);

From 281c2041b23bdbce8859f9027220eb4b06fb908d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 20 Apr 2021 16:51:00 +0900
Subject: [PATCH 2679/3722] Add failing test

---
 .../Gameplay/TestSceneStoryboardSamples.cs    | 28 ++++++++++++++++++-
 osu.Game/Skinning/PausableSkinnableSound.cs   |  2 +-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index cae5f20332..f2cb5f75d8 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -77,7 +77,33 @@ namespace osu.Game.Tests.Gameplay
 
             AddStep("start time", () => gameplayContainer.Start());
 
-            AddUntilStep("sample playback succeeded", () => sample.LifetimeEnd < double.MaxValue);
+            AddUntilStep("sample played", () => sample.RequestedPlaying);
+            AddUntilStep("sample has lifetime end", () => sample.LifetimeEnd < double.MaxValue);
+        }
+
+        [Test]
+        public void TestSampleHasLifetimeEndWithInitialClockTime()
+        {
+            GameplayClockContainer gameplayContainer = null;
+            DrawableStoryboardSample sample = null;
+
+            AddStep("create container", () =>
+            {
+                var working = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
+                working.LoadTrack();
+
+                Add(gameplayContainer = new GameplayClockContainer(working, 1000, true));
+
+                gameplayContainer.Add(sample = new DrawableStoryboardSample(new StoryboardSampleInfo(string.Empty, 0, 1))
+                {
+                    Clock = gameplayContainer.GameplayClock
+                });
+            });
+
+            AddStep("start time", () => gameplayContainer.Start());
+
+            AddUntilStep("sample not played", () => !sample.RequestedPlaying);
+            AddUntilStep("sample has lifetime end", () => sample.LifetimeEnd < double.MaxValue);
         }
 
         [TestCase(typeof(OsuModDoubleTime), 1.5)]
diff --git a/osu.Game/Skinning/PausableSkinnableSound.cs b/osu.Game/Skinning/PausableSkinnableSound.cs
index b3c7c5d6b2..10b8c47028 100644
--- a/osu.Game/Skinning/PausableSkinnableSound.cs
+++ b/osu.Game/Skinning/PausableSkinnableSound.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Skinning
     {
         public double Length => !DrawableSamples.Any() ? 0 : DrawableSamples.Max(sample => sample.Length);
 
-        protected bool RequestedPlaying { get; private set; }
+        public bool RequestedPlaying { get; private set; }
 
         public PausableSkinnableSound()
         {

From 623eae15762f4cf796dfbd2fbab26b64a3aaa142 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Apr 2021 17:06:01 +0900
Subject: [PATCH 2680/3722] Add basic language switching ability

---
 .../ResourceManagerLocalisationStore.cs       | 57 +++++++++++++++++++
 osu.Game/OsuGame.cs                           |  7 +++
 .../Sections/General/LanguageSettings.cs      | 18 ++++++
 3 files changed, 82 insertions(+)
 create mode 100644 osu.Game/Localisation/ResourceManagerLocalisationStore.cs

diff --git a/osu.Game/Localisation/ResourceManagerLocalisationStore.cs b/osu.Game/Localisation/ResourceManagerLocalisationStore.cs
new file mode 100644
index 0000000000..dd84eff55f
--- /dev/null
+++ b/osu.Game/Localisation/ResourceManagerLocalisationStore.cs
@@ -0,0 +1,57 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Resources;
+using System.Threading.Tasks;
+using osu.Framework.Localisation;
+
+namespace osu.Game.Localisation
+{
+    public class ResourceManagerLocalisationStore : ILocalisationStore
+    {
+        private readonly Dictionary<string, ResourceManager> resourceManagers = new Dictionary<string, ResourceManager>();
+
+        public ResourceManagerLocalisationStore(string cultureCode)
+        {
+            EffectiveCulture = new CultureInfo(cultureCode);
+        }
+
+        public void Dispose()
+        {
+        }
+
+        public string Get(string lookup)
+        {
+            var split = lookup.Split(':');
+
+            string ns = split[0];
+            string key = split[1];
+
+            if (!resourceManagers.TryGetValue(ns, out var manager))
+                resourceManagers[ns] = manager = new ResourceManager(ns, GetType().Assembly);
+
+            return manager.GetString(key, EffectiveCulture);
+        }
+
+        public Task<string> GetAsync(string lookup)
+        {
+            return Task.FromResult(Get(lookup));
+        }
+
+        public Stream GetStream(string name)
+        {
+            throw new NotImplementedException();
+        }
+
+        public IEnumerable<string> GetAvailableResources()
+        {
+            throw new NotImplementedException();
+        }
+
+        public CultureInfo EffectiveCulture { get; }
+    }
+}
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 28f32ba455..9af9a34b46 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -51,6 +51,7 @@ using osu.Game.Utils;
 using LogLevel = osu.Framework.Logging.LogLevel;
 using osu.Game.Database;
 using osu.Game.IO;
+using osu.Game.Localisation;
 
 namespace osu.Game
 {
@@ -541,6 +542,12 @@ namespace osu.Game
         {
             base.LoadComplete();
 
+            foreach (var language in Enum.GetValues(typeof(Language)).OfType<Language>())
+            {
+                var cultureCode = language.ToString();
+                Localisation.AddLanguage(cultureCode, new ResourceManagerLocalisationStore(cultureCode));
+            }
+
             // The next time this is updated is in UpdateAfterChildren, which occurs too late and results
             // in the cursor being shown for a few frames during the intro.
             // This prevents the cursor from showing until we have a screen with CursorVisible = true
diff --git a/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs b/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs
index 44e42ecbfe..c2767f61b4 100644
--- a/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/LanguageSettings.cs
@@ -1,27 +1,45 @@
 // Copyright (c) ppy 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.Configuration;
 using osu.Framework.Graphics;
+using osu.Game.Localisation;
 
 namespace osu.Game.Overlays.Settings.Sections.General
 {
     public class LanguageSettings : SettingsSubsection
     {
+        private SettingsDropdown<Language> languageSelection;
+        private Bindable<string> frameworkLocale;
+
         protected override string Header => "Language";
 
         [BackgroundDependencyLoader]
         private void load(FrameworkConfigManager frameworkConfig)
         {
+            frameworkLocale = frameworkConfig.GetBindable<string>(FrameworkSetting.Locale);
+
             Children = new Drawable[]
             {
+                languageSelection = new SettingsEnumDropdown<Language>
+                {
+                    LabelText = "Language",
+                },
                 new SettingsCheckbox
                 {
                     LabelText = "Prefer metadata in original language",
                     Current = frameworkConfig.GetBindable<bool>(FrameworkSetting.ShowUnicode)
                 },
             };
+
+            if (!Enum.TryParse<Language>(frameworkLocale.Value, out var locale))
+                locale = Language.en;
+            languageSelection.Current.Value = locale;
+
+            languageSelection.Current.BindValueChanged(val => frameworkLocale.Value = val.NewValue.ToString());
         }
     }
 }

From db524e2395b375e6882eaef9b5424380f70eaa23 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Apr 2021 17:06:12 +0900
Subject: [PATCH 2681/3722] Add localisation support to DialogButton's text

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

diff --git a/osu.Game/Graphics/UserInterface/DialogButton.cs b/osu.Game/Graphics/UserInterface/DialogButton.cs
index 9b53ee7b2d..1047aa4255 100644
--- a/osu.Game/Graphics/UserInterface/DialogButton.cs
+++ b/osu.Game/Graphics/UserInterface/DialogButton.cs
@@ -15,6 +15,7 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics.Effects;
 using osu.Game.Graphics.Containers;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 
 namespace osu.Game.Graphics.UserInterface
 {
@@ -180,9 +181,9 @@ namespace osu.Game.Graphics.UserInterface
             }
         }
 
-        private string text;
+        private LocalisableString text;
 
-        public string Text
+        public LocalisableString Text
         {
             get => text;
             set

From d28eb399a4539c776464e99fa322a33ebf1fa654 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 20 Apr 2021 16:51:24 +0900
Subject: [PATCH 2682/3722] Fix storyboard sample lifetimes not set if seeked
 past

---
 .../Drawables/DrawableStoryboardSample.cs     | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
index 7b16009859..fbdd27e762 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
@@ -61,28 +61,32 @@ namespace osu.Game.Storyboards.Drawables
         {
             base.Update();
 
+            // Check if we've yet to pass the sample start time.
             if (Time.Current < sampleInfo.StartTime)
             {
-                // We've rewound before the start time of the sample
                 Stop();
 
-                // In the case that the user fast-forwards to a point far beyond the start time of the sample,
-                // we want to be able to fall into the if-conditional below (therefore we must not have a life time end)
+                // Playback has stopped, but if the user fast-forwards to a point after the start time of the sample then
+                // we must not have a lifetime end in order to continue receiving updates and start the sample below.
                 LifetimeStart = sampleInfo.StartTime;
                 LifetimeEnd = double.MaxValue;
+
+                return;
             }
-            else if (Time.Current - Time.Elapsed <= sampleInfo.StartTime)
+
+            // Ensure that we've elapsed from a point before the sample's start time before playing.
+            if (Time.Current - Time.Elapsed <= sampleInfo.StartTime)
             {
                 // We've passed the start time of the sample. We only play the sample if we're within an allowable range
                 // from the sample's start, to reduce layering if we've been fast-forwarded far into the future
                 if (!RequestedPlaying && Time.Current - sampleInfo.StartTime < allowable_late_start)
                     Play();
-
-                // In the case that the user rewinds to a point far behind the start time of the sample,
-                // we want to be able to fall into the if-conditional above (therefore we must not have a life time start)
-                LifetimeStart = double.MinValue;
-                LifetimeEnd = sampleInfo.StartTime;
             }
+
+            // Playback has started, but if the user rewinds to a point before the start time of the sample then
+            // we must not have a lifetime start in order to continue receiving updates and stop the sample above.
+            LifetimeStart = double.MinValue;
+            LifetimeEnd = sampleInfo.StartTime;
         }
     }
 }

From 5da18c51a49bb3669dae12f18b9af89668bf873f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 20 Apr 2021 17:27:37 +0900
Subject: [PATCH 2683/3722] Fix compile error

---
 osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index 57b3687d3a..5b8abddd3f 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Tests.Gameplay
                 var working = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
                 working.LoadTrack();
 
-                Add(gameplayContainer = new GameplayClockContainer(working, 1000, true));
+                Add(gameplayContainer = new MasterGameplayClockContainer(working, 1000, true));
 
                 gameplayContainer.Add(sample = new DrawableStoryboardSample(new StoryboardSampleInfo(string.Empty, 0, 1))
                 {

From 60acd824cbc0c1ce6d7d3ff95bd9759e943f2dd3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Apr 2021 17:06:26 +0900
Subject: [PATCH 2684/3722] Add two sample implementations

---
 osu.Game/Localisation/Common.ja.resx      | 17 ++++++++++++++++
 osu.Game/Localisation/Common.resx         | 17 ++++++++++++++++
 osu.Game/Localisation/CommonStrings.cs    | 19 ++++++++++++++++++
 osu.Game/Localisation/Language.cs         | 16 +++++++++++++++
 osu.Game/Localisation/MainMenu.ja.resx    | 17 ++++++++++++++++
 osu.Game/Localisation/MainMenu.resx       | 17 ++++++++++++++++
 osu.Game/Localisation/MainMenuStrings.cs  | 24 +++++++++++++++++++++++
 osu.Game/Overlays/Dialog/ConfirmDialog.cs |  2 +-
 osu.Game/Screens/Menu/Button.cs           |  3 ++-
 osu.Game/Screens/Menu/ButtonSystem.cs     |  8 +++++---
 10 files changed, 135 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game/Localisation/Common.ja.resx
 create mode 100644 osu.Game/Localisation/Common.resx
 create mode 100644 osu.Game/Localisation/CommonStrings.cs
 create mode 100644 osu.Game/Localisation/Language.cs
 create mode 100644 osu.Game/Localisation/MainMenu.ja.resx
 create mode 100644 osu.Game/Localisation/MainMenu.resx
 create mode 100644 osu.Game/Localisation/MainMenuStrings.cs

diff --git a/osu.Game/Localisation/Common.ja.resx b/osu.Game/Localisation/Common.ja.resx
new file mode 100644
index 0000000000..174751c455
--- /dev/null
+++ b/osu.Game/Localisation/Common.ja.resx
@@ -0,0 +1,17 @@
+<root>
+    <resheader name="resmimetype">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="version">
+        <value>1.3</value>
+    </resheader>
+    <resheader name="reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <resheader name="writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <data name="cancel" xml:space="preserve">
+        <value>やめとくわ</value>
+    </data>
+</root>
diff --git a/osu.Game/Localisation/Common.resx b/osu.Game/Localisation/Common.resx
new file mode 100644
index 0000000000..f63fb90086
--- /dev/null
+++ b/osu.Game/Localisation/Common.resx
@@ -0,0 +1,17 @@
+<root>
+    <resheader name="resmimetype">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="version">
+        <value>1.3</value>
+    </resheader>
+    <resheader name="reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <resheader name="writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <data name="cancel" xml:space="preserve">
+        <value>Cancel</value>
+    </data>
+</root>
diff --git a/osu.Game/Localisation/CommonStrings.cs b/osu.Game/Localisation/CommonStrings.cs
new file mode 100644
index 0000000000..f448158191
--- /dev/null
+++ b/osu.Game/Localisation/CommonStrings.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 CommonStrings
+    {
+        private const string prefix = "osu.Game.Localisation.Common";
+
+        /// <summary>
+        /// "Cancel"
+        /// </summary>
+        public static LocalisableString Cancel => new TranslatableString(getKey("cancel"), "Cancel");
+
+        private static string getKey(string key) => $"{prefix}:{key}";
+    }
+}
diff --git a/osu.Game/Localisation/Language.cs b/osu.Game/Localisation/Language.cs
new file mode 100644
index 0000000000..edcf264c7f
--- /dev/null
+++ b/osu.Game/Localisation/Language.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 System.ComponentModel;
+
+namespace osu.Game.Localisation
+{
+    public enum Language
+    {
+        [Description("English")]
+        en,
+
+        [Description("日本語")]
+        ja
+    }
+}
diff --git a/osu.Game/Localisation/MainMenu.ja.resx b/osu.Game/Localisation/MainMenu.ja.resx
new file mode 100644
index 0000000000..20c85110ad
--- /dev/null
+++ b/osu.Game/Localisation/MainMenu.ja.resx
@@ -0,0 +1,17 @@
+<root>
+    <resheader name="resmimetype">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="version">
+        <value>1.3</value>
+    </resheader>
+    <resheader name="reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <resheader name="writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <data name="solo" xml:space="preserve">
+        <value>ソロ</value>
+    </data>
+</root>
\ No newline at end of file
diff --git a/osu.Game/Localisation/MainMenu.resx b/osu.Game/Localisation/MainMenu.resx
new file mode 100644
index 0000000000..845b412d88
--- /dev/null
+++ b/osu.Game/Localisation/MainMenu.resx
@@ -0,0 +1,17 @@
+<root>
+    <resheader name="resmimetype">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="version">
+        <value>1.3</value>
+    </resheader>
+    <resheader name="reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <resheader name="writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <data name="solo" xml:space="preserve">
+        <value>solo</value>
+    </data>
+</root>
diff --git a/osu.Game/Localisation/MainMenuStrings.cs b/osu.Game/Localisation/MainMenuStrings.cs
new file mode 100644
index 0000000000..fd9647467a
--- /dev/null
+++ b/osu.Game/Localisation/MainMenuStrings.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;
+
+namespace osu.Game.Localisation
+{
+    public static class MainMenuStrings
+    {
+        private const string prefix = "osu.Game.Localisation.MainMenu";
+
+        /// <summary>
+        /// "solo"
+        /// </summary>
+        public static LocalisableString Solo => new TranslatableString(getKey("solo"), "solo");
+
+        /// <summary>
+        /// "multi"
+        /// </summary>
+        public static LocalisableString Multi => new TranslatableString(getKey("multi"), "multi");
+
+        private static string getKey(string key) => $"{prefix}:{key}";
+    }
+}
diff --git a/osu.Game/Overlays/Dialog/ConfirmDialog.cs b/osu.Game/Overlays/Dialog/ConfirmDialog.cs
index a87c06ffdf..d1c0d746d1 100644
--- a/osu.Game/Overlays/Dialog/ConfirmDialog.cs
+++ b/osu.Game/Overlays/Dialog/ConfirmDialog.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Overlays.Dialog
                 },
                 new PopupDialogCancelButton
                 {
-                    Text = @"Cancel",
+                    Text = Localisation.CommonStrings.Cancel,
                     Action = onCancel
                 },
             };
diff --git a/osu.Game/Screens/Menu/Button.cs b/osu.Game/Screens/Menu/Button.cs
index d956394ebb..26f26d1304 100644
--- a/osu.Game/Screens/Menu/Button.cs
+++ b/osu.Game/Screens/Menu/Button.cs
@@ -19,6 +19,7 @@ using osu.Game.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Game.Beatmaps.ControlPoints;
 
 namespace osu.Game.Screens.Menu
@@ -50,7 +51,7 @@ namespace osu.Game.Screens.Menu
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => box.ReceivePositionalInputAt(screenSpacePos);
 
-        public Button(string text, string sampleName, IconUsage symbol, Color4 colour, Action clickAction = null, float extraWidth = 0, Key triggerKey = Key.Unknown)
+        public Button(LocalisableString text, string sampleName, IconUsage symbol, Color4 colour, Action clickAction = null, float extraWidth = 0, Key triggerKey = Key.Unknown)
         {
             this.sampleName = sampleName;
             this.clickAction = clickAction;
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 81b1cb0bf1..ff5ad37b9d 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -15,6 +15,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Framework.Threading;
@@ -22,6 +23,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Input;
 using osu.Game.Input.Bindings;
+using osu.Game.Localisation;
 using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
@@ -121,10 +123,10 @@ namespace osu.Game.Screens.Menu
         private LoginOverlay loginOverlay { get; set; }
 
         [BackgroundDependencyLoader(true)]
-        private void load(AudioManager audio, IdleTracker idleTracker, GameHost host)
+        private void load(AudioManager audio, IdleTracker idleTracker, GameHost host, LocalisationManager strings)
         {
-            buttonsPlay.Add(new Button(@"solo", @"button-solo-select", FontAwesome.Solid.User, new Color4(102, 68, 204, 255), () => OnSolo?.Invoke(), WEDGE_WIDTH, Key.P));
-            buttonsPlay.Add(new Button(@"multi", @"button-generic-select", FontAwesome.Solid.Users, new Color4(94, 63, 186, 255), onMultiplayer, 0, Key.M));
+            buttonsPlay.Add(new Button(MainMenuStrings.Solo, @"button-solo-select", FontAwesome.Solid.User, new Color4(102, 68, 204, 255), () => OnSolo?.Invoke(), WEDGE_WIDTH, Key.P));
+            buttonsPlay.Add(new Button(MainMenuStrings.Multi, @"button-generic-select", FontAwesome.Solid.Users, new Color4(94, 63, 186, 255), onMultiplayer, 0, Key.M));
             buttonsPlay.Add(new Button(@"playlists", @"button-generic-select", OsuIcon.Charts, new Color4(94, 63, 186, 255), onPlaylists, 0, Key.L));
             buttonsPlay.ForEach(b => b.VisibleState = ButtonSystemState.Play);
 

From 97fb90d9f45c660e4420fbf05477846e010eea35 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 20 Apr 2021 17:35:59 +0900
Subject: [PATCH 2685/3722] Move clock processing to base.Seek()

---
 osu.Game/Screens/Play/GameplayClockContainer.cs       | 10 +++++++---
 osu.Game/Screens/Play/MasterGameplayClockContainer.cs |  3 ---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 0ada6613d7..f6b99c094f 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -87,7 +87,13 @@ namespace osu.Game.Screens.Play
         /// Seek to a specific time in gameplay.
         /// </summary>
         /// <param name="time">The destination time to seek to.</param>
-        public virtual void Seek(double time) => AdjustableSource.Seek(time);
+        public virtual void Seek(double time)
+        {
+            AdjustableSource.Seek(time);
+
+            // Manually process to make sure the gameplay clock is correctly updated after a seek.
+            GameplayClock.UnderlyingClock.ProcessFrame();
+        }
 
         /// <summary>
         /// Stops gameplay.
@@ -102,8 +108,6 @@ namespace osu.Game.Screens.Play
             AdjustableSource.Seek(StartOffset);
             AdjustableSource.Stop();
 
-            // Make sure the gameplay clock takes on the new time, otherwise the adjustable source will be seeked to the gameplay clock time in Start().
-            GameplayClock.UnderlyingClock.ProcessFrame();
 
             if (!IsPaused.Value)
                 Start();
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index f1d303e245..1b893a76c5 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -123,9 +123,6 @@ namespace osu.Game.Screens.Play
             // remove the offset component here because most of the time we want the seek to be aligned to gameplay, not the audio track.
             // we may want to consider reversing the application of offsets in the future as it may feel more correct.
             base.Seek(time - totalOffset);
-
-            // manually process frame to ensure GameplayClock is correctly updated after a seek.
-            userOffsetClock.ProcessFrame();
         }
 
         /// <summary>

From 505a117862cce9818970a71833736c7a294b84c2 Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Mon, 19 Apr 2021 23:41:51 +0200
Subject: [PATCH 2686/3722] splitted updateable part of wedge

---
 .../SongSelect/TestSceneBeatmapInfoWedge.cs   |  16 +-
 osu.Game/Screens/Select/BeatmapInfoWedge.cs   | 261 ++++++++++--------
 2 files changed, 152 insertions(+), 125 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
index 7ea6373763..9c10c9751c 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
@@ -112,8 +112,8 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private void testInfoLabels(int expectedCount)
         {
-            AddAssert("check info labels exists", () => infoWedge.Info.ChildrenOfType<BeatmapInfoWedge.BufferedWedgeInfo.InfoLabel>().Any());
-            AddAssert("check info labels count", () => infoWedge.Info.ChildrenOfType<BeatmapInfoWedge.BufferedWedgeInfo.InfoLabel>().Count() == expectedCount);
+            AddAssert("check info labels exists", () => infoWedge.Info.ChildrenOfType<BeatmapInfoWedge.WedgeInfoText.InfoLabel>().Any());
+            AddAssert("check info labels count", () => infoWedge.Info.ChildrenOfType<BeatmapInfoWedge.WedgeInfoText.InfoLabel>().Count() == expectedCount);
         }
 
         [Test]
@@ -124,7 +124,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             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 empty author", () => !infoWedge.Info.MapperContainer.Children.Any());
-            AddAssert("check no info labels", () => !infoWedge.Info.ChildrenOfType<BeatmapInfoWedge.BufferedWedgeInfo.InfoLabel>().Any());
+            AddAssert("check no info labels", () => !infoWedge.Info.ChildrenOfType<BeatmapInfoWedge.WedgeInfoText.InfoLabel>().Any());
         }
 
         [Test]
@@ -135,15 +135,15 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private void selectBeatmap([CanBeNull] IBeatmap b)
         {
-            BeatmapInfoWedge.BufferedWedgeInfo infoBefore = null;
+            BeatmapInfoWedge.BufferedWedgeBackground backgroundBefore = null;
 
             AddStep($"select {b?.Metadata.Title ?? "null"} beatmap", () =>
             {
-                infoBefore = infoWedge.Info;
+                backgroundBefore = infoWedge.Background;
                 infoWedge.Beatmap = Beatmap.Value = b == null ? Beatmap.Default : CreateWorkingBeatmap(b);
             });
 
-            AddUntilStep("wait for async load", () => infoWedge.Info != infoBefore);
+            AddUntilStep("wait for async load", () => infoWedge.Background != backgroundBefore);
         }
 
         private IBeatmap createTestBeatmap(RulesetInfo ruleset)
@@ -193,7 +193,9 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private class TestBeatmapInfoWedge : BeatmapInfoWedge
         {
-            public new BufferedWedgeInfo Info => base.Info;
+            public new BufferedWedgeBackground Background => base.Background;
+
+            public new WedgeInfoText Info => base.Info;
         }
 
         private class TestHitObject : ConvertHitObject, IHasPosition
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 4069dc82ed..0b72970bb0 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -49,7 +49,8 @@ namespace osu.Game.Screens.Select
 
         private IBindable<StarDifficulty?> beatmapDifficulty;
 
-        protected BufferedWedgeInfo Info;
+        protected BufferedWedgeBackground Background;
+        protected WedgeInfoText Info;
 
         public BeatmapInfoWedge()
         {
@@ -110,9 +111,9 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        public override bool IsPresent => base.IsPresent || Info == null; // Visibility is updated in the LoadComponentAsync callback
+        public override bool IsPresent => base.IsPresent || Background == null; // Visibility is updated in the LoadComponentAsync callback
 
-        private BufferedWedgeInfo loadingInfo;
+        private BufferedWedgeBackground loadingInfo;
 
         private void updateDisplay()
         {
@@ -127,6 +128,10 @@ namespace osu.Game.Screens.Select
                     Info?.FadeOut(250);
                     Info?.Expire();
                     Info = null;
+
+                    Background?.FadeOut(250);
+                    Background?.Expire();
+                    Background = null;
                 }
 
                 if (beatmap == null)
@@ -135,17 +140,21 @@ namespace osu.Game.Screens.Select
                     return;
                 }
 
-                LoadComponentAsync(loadingInfo = new BufferedWedgeInfo(beatmap, ruleset.Value, mods.Value, beatmapDifficulty.Value ?? new StarDifficulty())
+                LoadComponentAsync(loadingInfo = new BufferedWedgeBackground(beatmap)
                 {
                     Shear = -Shear,
-                    Depth = Info?.Depth + 1 ?? 0
+                    Depth = Background?.Depth + 1 ?? 0
                 }, loaded =>
                 {
                     // ensure we are the most recent loaded wedge.
                     if (loaded != loadingInfo) return;
 
                     removeOldInfo();
-                    Add(Info = loaded);
+                    Add(Background = loaded);
+                    Add(Info = new WedgeInfoText(beatmap, ruleset.Value, mods.Value, beatmapDifficulty.Value ?? new StarDifficulty())
+                    {
+                        Shear = -Shear
+                    });
                 });
             }
         }
@@ -156,28 +165,26 @@ namespace osu.Game.Screens.Select
             cancellationSource?.Cancel();
         }
 
-        public class BufferedWedgeInfo : BufferedContainer
+        public class WedgeInfoText : Container
         {
-            public OsuSpriteText VersionLabel { get; private set; }
+            public FillFlowContainer MapperContainer { get; private set; }
             public OsuSpriteText TitleLabel { get; private set; }
             public OsuSpriteText ArtistLabel { get; private set; }
+            public OsuSpriteText VersionLabel { get; private set; }
             public BeatmapSetOnlineStatusPill StatusPill { get; private set; }
-            public FillFlowContainer MapperContainer { get; private set; }
 
             private ILocalisedBindableString titleBinding;
             private ILocalisedBindableString artistBinding;
             private FillFlowContainer infoLabelContainer;
             private Container bpmLabelContainer;
+            private ModSettingChangeTracker settingChangeTracker;
 
             private readonly WorkingBeatmap beatmap;
             private readonly RulesetInfo ruleset;
             private readonly IReadOnlyList<Mod> mods;
             private readonly StarDifficulty starDifficulty;
 
-            private ModSettingChangeTracker settingChangeTracker;
-
-            public BufferedWedgeInfo(WorkingBeatmap beatmap, RulesetInfo userRuleset, IReadOnlyList<Mod> mods, StarDifficulty difficulty)
-                : base(pixelSnapping: true)
+            public WedgeInfoText(WorkingBeatmap beatmap, RulesetInfo userRuleset, IReadOnlyList<Mod> mods, StarDifficulty difficulty)
             {
                 this.beatmap = beatmap;
                 ruleset = userRuleset ?? beatmap.BeatmapInfo.Ruleset;
@@ -191,7 +198,6 @@ namespace osu.Game.Screens.Select
                 var beatmapInfo = beatmap.BeatmapInfo;
                 var metadata = beatmapInfo.Metadata ?? beatmap.BeatmapSetInfo?.Metadata ?? new BeatmapMetadata();
 
-                CacheDrawnFrameBuffer = true;
                 RelativeSizeAxes = Axes.Both;
 
                 titleBinding = localisation.GetLocalisedString(new RomanisableString(metadata.TitleUnicode, metadata.Title));
@@ -199,32 +205,6 @@ namespace osu.Game.Screens.Select
 
                 Children = new Drawable[]
                 {
-                    // We will create the white-to-black gradient by modulating transparency and having
-                    // a black backdrop. This results in an sRGB-space gradient and not linear space,
-                    // transitioning from white to black more perceptually uniformly.
-                    new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = Color4.Black,
-                    },
-                    // We use a container, such that we can set the colour gradient to go across the
-                    // vertices of the masked container instead of the vertices of the (larger) sprite.
-                    new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = ColourInfo.GradientVertical(Color4.White, Color4.White.Opacity(0.3f)),
-                        Children = new[]
-                        {
-                            // Zoomed-in and cropped beatmap background
-                            new BeatmapBackgroundSprite(beatmap)
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
-                                FillMode = FillMode.Fill,
-                            },
-                        },
-                    },
                     new DifficultyColourBar(starDifficulty)
                     {
                         RelativeSizeAxes = Axes.Y,
@@ -329,51 +309,6 @@ namespace osu.Game.Screens.Select
                 addInfoLabels();
             }
 
-            private static Drawable createStarRatingDisplay(StarDifficulty difficulty) => difficulty.Stars > 0
-                ? new StarRatingDisplay(difficulty)
-                {
-                    Margin = new MarginPadding { Bottom = 5 }
-                }
-                : Empty();
-
-            private void setMetadata(string source)
-            {
-                ArtistLabel.Text = artistBinding.Value;
-                TitleLabel.Text = string.IsNullOrEmpty(source) ? titleBinding.Value : source + " — " + titleBinding.Value;
-                ForceRedraw();
-            }
-
-            private void addInfoLabels()
-            {
-                if (beatmap.Beatmap?.HitObjects?.Any() != true)
-                    return;
-
-                infoLabelContainer.Children = new Drawable[]
-                {
-                    new InfoLabel(new BeatmapStatistic
-                    {
-                        Name = "Length",
-                        CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Length),
-                        Content = TimeSpan.FromMilliseconds(beatmap.BeatmapInfo.Length).ToString(@"m\:ss"),
-                    }),
-                    bpmLabelContainer = new Container
-                    {
-                        AutoSizeAxes = Axes.Both,
-                    },
-                    new FillFlowContainer
-                    {
-                        AutoSizeAxes = Axes.Both,
-                        Spacing = new Vector2(20, 0),
-                        Children = getRulesetInfoLabels()
-                    }
-                };
-
-                settingChangeTracker = new ModSettingChangeTracker(mods);
-                settingChangeTracker.SettingChanged += _ => refreshBPMLabel();
-
-                refreshBPMLabel();
-            }
-
             private InfoLabel[] getRulesetInfoLabels()
             {
                 try
@@ -426,8 +361,43 @@ namespace osu.Game.Screens.Select
                     CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Bpm),
                     Content = labelText
                 });
+            }
 
-                ForceRedraw();
+            private void setMetadata(string source)
+            {
+                ArtistLabel.Text = artistBinding.Value;
+                TitleLabel.Text = string.IsNullOrEmpty(source) ? titleBinding.Value : source + " — " + titleBinding.Value;
+            }
+
+            private void addInfoLabels()
+            {
+                if (beatmap.Beatmap?.HitObjects?.Any() != true)
+                    return;
+
+                infoLabelContainer.Children = new Drawable[]
+                {
+                    new InfoLabel(new BeatmapStatistic
+                    {
+                        Name = "Length",
+                        CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Length),
+                        Content = TimeSpan.FromMilliseconds(beatmap.BeatmapInfo.Length).ToString(@"m\:ss"),
+                    }),
+                    bpmLabelContainer = new Container
+                    {
+                        AutoSizeAxes = Axes.Both,
+                    },
+                    new FillFlowContainer
+                    {
+                        AutoSizeAxes = Axes.Both,
+                        Spacing = new Vector2(20, 0),
+                        Children = getRulesetInfoLabels()
+                    }
+                };
+
+                settingChangeTracker = new ModSettingChangeTracker(mods);
+                settingChangeTracker.SettingChanged += _ => refreshBPMLabel();
+
+                refreshBPMLabel();
             }
 
             private OsuSpriteText[] getMapper(BeatmapMetadata metadata)
@@ -450,10 +420,48 @@ namespace osu.Game.Screens.Select
                 };
             }
 
-            protected override void Dispose(bool isDisposing)
+            private static Drawable createStarRatingDisplay(StarDifficulty difficulty) => difficulty.Stars > 0
+                ? new StarRatingDisplay(difficulty)
+                {
+                    Margin = new MarginPadding { Bottom = 5 }
+                }
+                : Empty();
+
+            private class DifficultyColourBar : Container
             {
-                base.Dispose(isDisposing);
-                settingChangeTracker?.Dispose();
+                private readonly StarDifficulty difficulty;
+
+                public DifficultyColourBar(StarDifficulty difficulty)
+                {
+                    this.difficulty = difficulty;
+                }
+
+                [BackgroundDependencyLoader]
+                private void load(OsuColour colours)
+                {
+                    const float full_opacity_ratio = 0.7f;
+
+                    var difficultyColour = colours.ForDifficultyRating(difficulty.DifficultyRating);
+
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = difficultyColour,
+                            Width = full_opacity_ratio,
+                        },
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            RelativePositionAxes = Axes.Both,
+                            Colour = difficultyColour,
+                            Alpha = 0.5f,
+                            X = full_opacity_ratio,
+                            Width = 1 - full_opacity_ratio,
+                        }
+                    };
+                }
             }
 
             public class InfoLabel : Container, IHasTooltip
@@ -515,41 +523,58 @@ namespace osu.Game.Screens.Select
                 }
             }
 
-            private class DifficultyColourBar : Container
+            protected override void Dispose(bool isDisposing)
             {
-                private readonly StarDifficulty difficulty;
+                base.Dispose(isDisposing);
+                settingChangeTracker?.Dispose();
+            }
+        }
 
-                public DifficultyColourBar(StarDifficulty difficulty)
+        public class BufferedWedgeBackground : BufferedContainer
+        {
+            private readonly WorkingBeatmap beatmap;
+
+            public BufferedWedgeBackground(WorkingBeatmap beatmap)
+                : base(pixelSnapping: true)
+            {
+                this.beatmap = beatmap;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(LocalisationManager localisation)
+            {
+                CacheDrawnFrameBuffer = true;
+                RelativeSizeAxes = Axes.Both;
+
+                Children = new Drawable[]
                 {
-                    this.difficulty = difficulty;
-                }
-
-                [BackgroundDependencyLoader]
-                private void load(OsuColour colours)
-                {
-                    const float full_opacity_ratio = 0.7f;
-
-                    var difficultyColour = colours.ForDifficultyRating(difficulty.DifficultyRating);
-
-                    Children = new Drawable[]
+                    // We will create the white-to-black gradient by modulating transparency and having
+                    // a black backdrop. This results in an sRGB-space gradient and not linear space,
+                    // transitioning from white to black more perceptually uniformly.
+                    new Box
                     {
-                        new Box
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4.Black,
+                    },
+                    // We use a container, such that we can set the colour gradient to go across the
+                    // vertices of the masked container instead of the vertices of the (larger) sprite.
+                    new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = ColourInfo.GradientVertical(Color4.White, Color4.White.Opacity(0.3f)),
+                        Children = new[]
                         {
-                            RelativeSizeAxes = Axes.Both,
-                            Colour = difficultyColour,
-                            Width = full_opacity_ratio,
+                            // Zoomed-in and cropped beatmap background
+                            new BeatmapBackgroundSprite(beatmap)
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                FillMode = FillMode.Fill,
+                            },
                         },
-                        new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            RelativePositionAxes = Axes.Both,
-                            Colour = difficultyColour,
-                            Alpha = 0.5f,
-                            X = full_opacity_ratio,
-                            Width = 1 - full_opacity_ratio,
-                        }
-                    };
-                }
+                    },
+                };                
             }
         }
     }

From 6e72ee5f7647eb77b2cc1447e32baeb3d4c990c4 Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Tue, 20 Apr 2021 10:25:12 +0200
Subject: [PATCH 2687/3722] Added bindable stardifficulty to StarRatingDisplay

---
 .../Ranking/Expanded/StarRatingDisplay.cs     | 79 +++++++++++++------
 osu.Game/Screens/Select/BeatmapInfoWedge.cs   | 64 +++++++++------
 2 files changed, 95 insertions(+), 48 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
index f7e50fdc8a..081b782034 100644
--- a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.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 System.Globalization;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
@@ -22,7 +24,11 @@ namespace osu.Game.Screens.Ranking.Expanded
     /// </summary>
     public class StarRatingDisplay : CompositeDrawable
     {
-        private readonly StarDifficulty difficulty;
+        private CircularContainer colorContainer;
+        private OsuTextFlowContainer textContainer;
+
+        private readonly StarDifficulty starDifficulty;
+        private readonly IBindable<StarDifficulty?> bindableStarDifficulty;
 
         /// <summary>
         /// Creates a new <see cref="StarRatingDisplay"/> using an already computed <see cref="StarDifficulty"/>.
@@ -30,14 +36,21 @@ namespace osu.Game.Screens.Ranking.Expanded
         /// <param name="starDifficulty">The already computed <see cref="StarDifficulty"/> to display the star difficulty of.</param>
         public StarRatingDisplay(StarDifficulty starDifficulty)
         {
-            difficulty = starDifficulty;
+            this.starDifficulty = starDifficulty;
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours, BeatmapDifficultyCache difficultyCache)
+        /// <summary>
+        /// Creates a new <see cref="StarRatingDisplay"/> using a binded nullable <see cref="StarDifficulty"/>.
+        /// </summary>
+        /// <param name="starDifficulty">The binded nullable <see cref="StarDifficulty"/> to display the star difficulty of. If <c>null</c>, a new instance of <see cref="StarDifficulty"/> will be created </param>
+        public StarRatingDisplay(IBindable<StarDifficulty?> starDifficulty)
         {
-            AutoSizeAxes = Axes.Both;
+            bindableStarDifficulty = starDifficulty;
+        }
 
+        private void setDifficulty(OsuColour colours)
+        {
+            var difficulty = bindableStarDifficulty == null ? starDifficulty : bindableStarDifficulty.Value ?? new StarDifficulty();
             var starRatingParts = difficulty.Stars.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
             string wholePart = starRatingParts[0];
             string fractionPart = starRatingParts[1];
@@ -47,9 +60,36 @@ namespace osu.Game.Screens.Ranking.Expanded
                 ? ColourInfo.GradientVertical(Color4Extensions.FromHex("#C1C1C1"), Color4Extensions.FromHex("#595959"))
                 : (ColourInfo)colours.ForDifficultyRating(difficulty.DifficultyRating);
 
+            colorContainer.Colour = backgroundColour;
+
+            textContainer.Text = string.Empty;
+
+            textContainer.With(t =>
+            {
+                t.AddText($"{wholePart}", s =>
+                {
+                    s.Colour = Color4.Black;
+                    s.Font = s.Font.With(size: 14);
+                    s.UseFullGlyphHeight = false;
+                });
+
+                t.AddText($"{separator}{fractionPart}", s =>
+                {
+                    s.Colour = Color4.Black;
+                    s.Font = s.Font.With(size: 7);
+                    s.UseFullGlyphHeight = false;
+                });
+            });
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours, BeatmapDifficultyCache difficultyCache)
+        {
+            AutoSizeAxes = Axes.Both;
+
             InternalChildren = new Drawable[]
             {
-                new CircularContainer
+                colorContainer = new CircularContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     Masking = true,
@@ -58,7 +98,6 @@ namespace osu.Game.Screens.Ranking.Expanded
                         new Box
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Colour = backgroundColour
                         },
                     }
                 },
@@ -78,32 +117,24 @@ namespace osu.Game.Screens.Ranking.Expanded
                             Icon = FontAwesome.Solid.Star,
                             Colour = Color4.Black
                         },
-                        new OsuTextFlowContainer(s => s.Font = OsuFont.Numeric.With(weight: FontWeight.Black))
+                        textContainer = new OsuTextFlowContainer(s => s.Font = OsuFont.Numeric.With(weight: FontWeight.Black))
                         {
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
                             AutoSizeAxes = Axes.Both,
                             Direction = FillDirection.Horizontal,
                             TextAnchor = Anchor.BottomLeft,
-                        }.With(t =>
-                        {
-                            t.AddText($"{wholePart}", s =>
-                            {
-                                s.Colour = Color4.Black;
-                                s.Font = s.Font.With(size: 14);
-                                s.UseFullGlyphHeight = false;
-                            });
-
-                            t.AddText($"{separator}{fractionPart}", s =>
-                            {
-                                s.Colour = Color4.Black;
-                                s.Font = s.Font.With(size: 7);
-                                s.UseFullGlyphHeight = false;
-                            });
-                        })
+                        },
                     }
                 }
             };
+
+            if (bindableStarDifficulty != null)
+            {
+                bindableStarDifficulty.BindValueChanged(_ => setDifficulty(colours));
+            }
+
+            setDifficulty(colours);
         }
     }
 }
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 0b72970bb0..9dccdd2897 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -105,7 +105,6 @@ namespace osu.Game.Screens.Select
 
                 beatmapDifficulty?.UnbindAll();
                 beatmapDifficulty = difficultyCache.GetBindableDifficulty(beatmap.BeatmapInfo, cancellationSource.Token);
-                beatmapDifficulty.BindValueChanged(_ => updateDisplay());
 
                 updateDisplay();
             }
@@ -151,7 +150,7 @@ namespace osu.Game.Screens.Select
 
                     removeOldInfo();
                     Add(Background = loaded);
-                    Add(Info = new WedgeInfoText(beatmap, ruleset.Value, mods.Value, beatmapDifficulty.Value ?? new StarDifficulty())
+                    Add(Info = new WedgeInfoText(beatmap, ruleset.Value, mods.Value, beatmapDifficulty)
                     {
                         Shear = -Shear
                     });
@@ -176,15 +175,16 @@ namespace osu.Game.Screens.Select
             private ILocalisedBindableString titleBinding;
             private ILocalisedBindableString artistBinding;
             private FillFlowContainer infoLabelContainer;
+            private Drawable starRatingDisplay;
             private Container bpmLabelContainer;
             private ModSettingChangeTracker settingChangeTracker;
 
             private readonly WorkingBeatmap beatmap;
             private readonly RulesetInfo ruleset;
             private readonly IReadOnlyList<Mod> mods;
-            private readonly StarDifficulty starDifficulty;
+            private readonly IBindable<StarDifficulty?> starDifficulty;
 
-            public WedgeInfoText(WorkingBeatmap beatmap, RulesetInfo userRuleset, IReadOnlyList<Mod> mods, StarDifficulty difficulty)
+            public WedgeInfoText(WorkingBeatmap beatmap, RulesetInfo userRuleset, IReadOnlyList<Mod> mods, IBindable<StarDifficulty?> difficulty)
             {
                 this.beatmap = beatmap;
                 ruleset = userRuleset ?? beatmap.BeatmapInfo.Ruleset;
@@ -241,12 +241,13 @@ namespace osu.Game.Screens.Select
                         Shear = wedged_container_shear,
                         Children = new[]
                         {
-                            createStarRatingDisplay(starDifficulty).With(display =>
+                            starRatingDisplay = new StarRatingDisplay(starDifficulty)
                             {
-                                display.Anchor = Anchor.TopRight;
-                                display.Origin = Anchor.TopRight;
-                                display.Shear = -wedged_container_shear;
-                            }),
+                                Anchor = Anchor.TopRight,
+                                Origin = Anchor.TopRight,
+                                Shear = -wedged_container_shear,
+                                Margin = new MarginPadding { Bottom = 5 }
+                            },
                             StatusPill = new BeatmapSetOnlineStatusPill
                             {
                                 Anchor = Anchor.TopRight,
@@ -309,6 +310,18 @@ namespace osu.Game.Screens.Select
                 addInfoLabels();
             }
 
+            private void setStarRatingDisplayVisibility()
+            {
+                if (starDifficulty.Value.HasValue && starDifficulty.Value.Value.Stars > 0)
+                {
+                    starRatingDisplay.Show();
+                }
+                else
+                {
+                    starRatingDisplay.Hide();
+                }
+            }
+
             private InfoLabel[] getRulesetInfoLabels()
             {
                 try
@@ -420,18 +433,14 @@ namespace osu.Game.Screens.Select
                 };
             }
 
-            private static Drawable createStarRatingDisplay(StarDifficulty difficulty) => difficulty.Stars > 0
-                ? new StarRatingDisplay(difficulty)
-                {
-                    Margin = new MarginPadding { Bottom = 5 }
-                }
-                : Empty();
-
             private class DifficultyColourBar : Container
             {
-                private readonly StarDifficulty difficulty;
+                private Box solidDifficultyBox;
+                private Box transparentDifficultyBox;
 
-                public DifficultyColourBar(StarDifficulty difficulty)
+                private readonly IBindable<StarDifficulty?> difficulty;
+
+                public DifficultyColourBar(IBindable<StarDifficulty?> difficulty)
                 {
                     this.difficulty = difficulty;
                 }
@@ -441,26 +450,33 @@ namespace osu.Game.Screens.Select
                 {
                     const float full_opacity_ratio = 0.7f;
 
-                    var difficultyColour = colours.ForDifficultyRating(difficulty.DifficultyRating);
-
                     Children = new Drawable[]
                     {
-                        new Box
+                        solidDifficultyBox = new Box
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Colour = difficultyColour,
                             Width = full_opacity_ratio,
                         },
-                        new Box
+                        transparentDifficultyBox = new Box
                         {
                             RelativeSizeAxes = Axes.Both,
                             RelativePositionAxes = Axes.Both,
-                            Colour = difficultyColour,
                             Alpha = 0.5f,
                             X = full_opacity_ratio,
                             Width = 1 - full_opacity_ratio,
                         }
                     };
+
+                    difficulty.BindValueChanged(_ => setColour(colours));
+                    setColour(colours);
+                }
+
+                private void setColour(OsuColour colours)
+                {
+                    var difficultyColour = colours.ForDifficultyRating(difficulty.Value?.DifficultyRating ?? (new StarDifficulty()).DifficultyRating);
+
+                    solidDifficultyBox.Colour = difficultyColour;
+                    transparentDifficultyBox.Colour = difficultyColour;
                 }
             }
 

From a683e5ec34cbbbf1fe08a4eafc1cbaeac7d0969a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 20 Apr 2021 17:36:24 +0900
Subject: [PATCH 2688/3722] Seek using local method

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

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index f6b99c094f..e9a9c83119 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -105,9 +105,10 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public virtual void Reset()
         {
-            AdjustableSource.Seek(StartOffset);
-            AdjustableSource.Stop();
+            Seek(StartOffset);
 
+            // Manually stop the source in order to not affect the IsPaused state.
+            AdjustableSource.Stop();
 
             if (!IsPaused.Value)
                 Start();

From ddf1b560f3d4ba22884020838e59c40c50d1b4a6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Apr 2021 18:18:50 +0900
Subject: [PATCH 2689/3722] Remove catcher fade during hyperdash

Closes https://github.com/ppy/osu/issues/12472.
---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 5d57e84b75..d045dcf16a 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -384,16 +384,7 @@ namespace osu.Game.Rulesets.Catch.UI
         {
             updateTrailVisibility();
 
-            if (hyperDashing)
-            {
-                this.FadeColour(hyperDashColour, HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
-                this.FadeTo(0.2f, HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
-            }
-            else
-            {
-                this.FadeColour(Color4.White, HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
-                this.FadeTo(1f, HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
-            }
+            this.FadeColour(hyperDashing ? hyperDashColour : Color4.White, HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
         }
 
         private void updateTrailVisibility() => trails.DisplayTrail = Dashing || HyperDashing;

From f11b068dee2b58a0160c138cfcb811e6f18a2ec0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Apr 2021 18:22:58 +0900
Subject: [PATCH 2690/3722] Allow faster roll speed selection in "Barrel Roll"
 mod

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

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
index aee431284e..1587f97f46 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public BindableNumber<double> SpinSpeed { get; } = new BindableDouble(0.5)
         {
             MinValue = 0.02,
-            MaxValue = 4,
+            MaxValue = 12,
             Precision = 0.01,
         };
 

From ec080fcb32fdf2fa1ca7fd4b2d8db1c7a4d2ffc7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 20 Apr 2021 18:25:46 +0900
Subject: [PATCH 2691/3722] Move seekOffset back to
 MasterGameplayClockContainer

---
 osu.Game/Screens/Play/GameplayClockContainer.cs      |  7 +------
 .../Screens/Play/MasterGameplayClockContainer.cs     | 12 +++++++++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index e9a9c83119..5cd17d92c4 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -29,11 +29,6 @@ namespace osu.Game.Screens.Play
         /// </summary>
         protected readonly DecoupleableInterpolatingFramedClock AdjustableSource;
 
-        /// <summary>
-        /// The offset at which to start playing. Affects the time which the clock is reset to via <see cref="Reset"/>.
-        /// </summary>
-        protected virtual double StartOffset => 0;
-
         /// <summary>
         /// The source clock.
         /// </summary>
@@ -105,7 +100,7 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public virtual void Reset()
         {
-            Seek(StartOffset);
+            Seek(0);
 
             // Manually stop the source in order to not affect the IsPaused state.
             AdjustableSource.Stop();
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index 1b893a76c5..affe24069d 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -47,9 +47,6 @@ namespace osu.Game.Screens.Play
 
         private readonly BindableDouble pauseFreqAdjust = new BindableDouble(1);
 
-        protected override double StartOffset => startOffset;
-        private double startOffset;
-
         private readonly WorkingBeatmap beatmap;
         private readonly double gameplayStartTime;
         private readonly bool startAtGameplayStart;
@@ -59,6 +56,7 @@ namespace osu.Game.Screens.Play
         private FramedOffsetClock platformOffsetClock;
         private LocalGameplayClock localGameplayClock;
         private Bindable<double> userAudioOffset;
+        private double startOffset;
 
         public MasterGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStartTime, bool startAtGameplayStart = false)
             : base(beatmap.Track)
@@ -94,6 +92,8 @@ namespace osu.Game.Screens.Play
                 if (beatmap.BeatmapInfo.AudioLeadIn > 0)
                     startOffset = Math.Min(startOffset, firstHitObjectTime - beatmap.BeatmapInfo.AudioLeadIn);
             }
+
+            Seek(startOffset);
         }
 
         protected override void OnIsPausedChanged(ValueChangedEvent<bool> isPaused)
@@ -142,6 +142,12 @@ namespace osu.Game.Screens.Play
             Seek(skipTarget);
         }
 
+        public override void Reset()
+        {
+            base.Reset();
+            Seek(startOffset);
+        }
+
         protected override GameplayClock CreateGameplayClock(IFrameBasedClock source)
         {
             // Lazer's audio timings in general doesn't match stable. This is the result of user testing, albeit limited.

From f144661c31a729b6874fad1b720035e3e95d4d23 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 20 Apr 2021 18:26:30 +0900
Subject: [PATCH 2692/3722] Fix storyboard sample test scene

---
 .../Gameplay/TestSceneStoryboardSamples.cs    | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index 5b8abddd3f..bbab9ae94d 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -20,6 +20,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Play;
 using osu.Game.Skinning;
 using osu.Game.Storyboards;
@@ -67,15 +68,17 @@ namespace osu.Game.Tests.Gameplay
                 var working = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
                 working.LoadTrack();
 
-                Add(gameplayContainer = new MasterGameplayClockContainer(working, 0));
-
-                gameplayContainer.Add(sample = new DrawableStoryboardSample(new StoryboardSampleInfo(string.Empty, 0, 1))
+                Add(gameplayContainer = new MasterGameplayClockContainer(working, 0)
                 {
-                    Clock = gameplayContainer.GameplayClock
+                    IsPaused = { Value = true },
+                    Child = new FrameStabilityContainer
+                    {
+                        Child = sample = new DrawableStoryboardSample(new StoryboardSampleInfo(string.Empty, 0, 1))
+                    }
                 });
             });
 
-            AddStep("start time", () => gameplayContainer.Start());
+            AddStep("reset clock", () => gameplayContainer.Start());
 
             AddUntilStep("sample played", () => sample.RequestedPlaying);
             AddUntilStep("sample has lifetime end", () => sample.LifetimeEnd < double.MaxValue);
@@ -92,11 +95,13 @@ namespace osu.Game.Tests.Gameplay
                 var working = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
                 working.LoadTrack();
 
-                Add(gameplayContainer = new MasterGameplayClockContainer(working, 1000, true));
-
-                gameplayContainer.Add(sample = new DrawableStoryboardSample(new StoryboardSampleInfo(string.Empty, 0, 1))
+                Add(gameplayContainer = new MasterGameplayClockContainer(working, 1000, true)
                 {
-                    Clock = gameplayContainer.GameplayClock
+                    IsPaused = { Value = true },
+                    Child = new FrameStabilityContainer
+                    {
+                        Child = sample = new DrawableStoryboardSample(new StoryboardSampleInfo(string.Empty, 0, 1))
+                    }
                 });
             });
 

From ac0ed72d043d339a856637a0a3675fe06f5280ee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Apr 2021 18:36:11 +0900
Subject: [PATCH 2693/3722] Keep hitcircles aligned with view in "Barrel Roll"
 mod

---
 .../Mods/OsuModBarrelRoll.cs                  | 25 +++++++++++++++++--
 .../Objects/Drawables/DrawableHitCircle.cs    |  6 ++++-
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
index aee431284e..64b87f3977 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
@@ -1,20 +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.Collections.Generic;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.UI;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    public class OsuModBarrelRoll : Mod, IUpdatableByPlayfield, IApplicableToDrawableRuleset<OsuHitObject>
+    public class OsuModBarrelRoll : Mod, IUpdatableByPlayfield, IApplicableToDrawableRuleset<OsuHitObject>, IApplicableToDrawableHitObjects
     {
+        private float currentRotation;
+
         [SettingSource("Roll speed", "Rotations per minute")]
         public BindableNumber<double> SpinSpeed { get; } = new BindableDouble(0.5)
         {
@@ -35,7 +40,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public void Update(Playfield playfield)
         {
-            playfield.Rotation = (Direction.Value == RotationDirection.Counterclockwise ? -1 : 1) * 360 * (float)(playfield.Time.Current / 60000 * SpinSpeed.Value);
+            playfield.Rotation = currentRotation = (Direction.Value == RotationDirection.Counterclockwise ? -1 : 1) * 360 * (float)(playfield.Time.Current / 60000 * SpinSpeed.Value);
         }
 
         public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
@@ -43,5 +48,21 @@ namespace osu.Game.Rulesets.Osu.Mods
             // scale the playfield to allow all hitobjects to stay within the visible region.
             drawableRuleset.Playfield.Scale = new Vector2(OsuPlayfield.BASE_SIZE.Y / OsuPlayfield.BASE_SIZE.X);
         }
+
+        public void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
+        {
+            foreach (var d in drawables)
+            {
+                d.OnUpdate += _ =>
+                {
+                    switch (d)
+                    {
+                        case DrawableHitCircle circle:
+                            circle.CirclePiece.Rotation = -currentRotation;
+                            break;
+                    }
+                };
+            }
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index 189003875d..df77ec2693 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -66,7 +66,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                                 return true;
                             },
                         },
-                        CirclePiece = new SkinnableDrawable(new OsuSkinComponent(CirclePieceComponent), _ => new MainCirclePiece()),
+                        CirclePiece = new SkinnableDrawable(new OsuSkinComponent(CirclePieceComponent), _ => new MainCirclePiece())
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                        },
                         ApproachCircle = new ApproachCircle
                         {
                             Alpha = 0,

From c5d6b6ea8d05578cfac4ae8697f15e37d8d84da3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 20 Apr 2021 18:41:09 +0900
Subject: [PATCH 2694/3722] Fix tests failing intermittently

This was due to this code happening in UpdateAfterChildren(), after the
GCC has processed one frame. During this time, the clock could have
advanced an arbitrary amount.

The cause of this is the removal of the Task.Run() to set the clock in
Restart() (now called Reset()) which changed the timing, so it only worked before due to pure
luck.
---
 osu.Game.Tests/Visual/Gameplay/TestSceneLeadIn.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneLeadIn.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneLeadIn.cs
index dccde366c2..f5f17a0bc1 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneLeadIn.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneLeadIn.cs
@@ -130,9 +130,9 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public double GameplayClockTime => GameplayClockContainer.GameplayClock.CurrentTime;
 
-            protected override void UpdateAfterChildren()
+            protected override void Update()
             {
-                base.UpdateAfterChildren();
+                base.Update();
 
                 if (!FirstFrameClockTime.HasValue)
                 {

From 4e6cd8082ea784ee4223f2f36e7c05f1253aeac5 Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Tue, 20 Apr 2021 12:00:04 +0200
Subject: [PATCH 2695/3722] WIP refresh BPM-Label on mod change

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 27 +++++++++++++--------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 9dccdd2897..b3aa4f0ba5 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -150,7 +150,7 @@ namespace osu.Game.Screens.Select
 
                     removeOldInfo();
                     Add(Background = loaded);
-                    Add(Info = new WedgeInfoText(beatmap, ruleset.Value, mods.Value, beatmapDifficulty)
+                    Add(Info = new WedgeInfoText(beatmap, ruleset.Value, mods, beatmapDifficulty)
                     {
                         Shear = -Shear
                     });
@@ -181,10 +181,10 @@ namespace osu.Game.Screens.Select
 
             private readonly WorkingBeatmap beatmap;
             private readonly RulesetInfo ruleset;
-            private readonly IReadOnlyList<Mod> mods;
+            private readonly IBindable<IReadOnlyList<Mod>> mods;
             private readonly IBindable<StarDifficulty?> starDifficulty;
 
-            public WedgeInfoText(WorkingBeatmap beatmap, RulesetInfo userRuleset, IReadOnlyList<Mod> mods, IBindable<StarDifficulty?> difficulty)
+            public WedgeInfoText(WorkingBeatmap beatmap, RulesetInfo userRuleset, IBindable<IReadOnlyList<Mod>> mods, IBindable<StarDifficulty?> difficulty)
             {
                 this.beatmap = beatmap;
                 ruleset = userRuleset ?? beatmap.BeatmapInfo.Ruleset;
@@ -300,14 +300,16 @@ namespace osu.Game.Screens.Select
                     }
                 };
 
+                addInfoLabels();
+
                 titleBinding.BindValueChanged(_ => setMetadata(metadata.Source));
                 artistBinding.BindValueChanged(_ => setMetadata(metadata.Source), true);
+                starDifficulty.BindValueChanged(_ => setStarRatingDisplayVisibility(), true);
 
                 // no difficulty means it can't have a status to show
                 if (beatmapInfo.Version == null)
                     StatusPill.Hide();
 
-                addInfoLabels();
             }
 
             private void setStarRatingDisplayVisibility()
@@ -349,7 +351,7 @@ namespace osu.Game.Screens.Select
                 return Array.Empty<InfoLabel>();
             }
 
-            private void refreshBPMLabel()
+            private void refreshBPMLabel(IReadOnlyList<Mod> mods)
             {
                 var b = beatmap.Beatmap;
                 if (b == null)
@@ -407,10 +409,16 @@ namespace osu.Game.Screens.Select
                     }
                 };
 
-                settingChangeTracker = new ModSettingChangeTracker(mods);
-                settingChangeTracker.SettingChanged += _ => refreshBPMLabel();
+                // this is currently not triggering when a mod gets (de)selected
+                mods.BindValueChanged(mods => refreshModInformation(mods), true);
+            }
 
-                refreshBPMLabel();
+            private void refreshModInformation(ValueChangedEvent<IReadOnlyList<Mod>> modsChangedEvent)
+            {
+                settingChangeTracker?.Dispose();
+                settingChangeTracker = new ModSettingChangeTracker(modsChangedEvent.NewValue);
+                settingChangeTracker.SettingChanged += _ => refreshBPMLabel(modsChangedEvent.NewValue);
+                refreshBPMLabel(mods.Value);
             }
 
             private OsuSpriteText[] getMapper(BeatmapMetadata metadata)
@@ -467,8 +475,7 @@ namespace osu.Game.Screens.Select
                         }
                     };
 
-                    difficulty.BindValueChanged(_ => setColour(colours));
-                    setColour(colours);
+                    difficulty.BindValueChanged(_ => setColour(colours), true);
                 }
 
                 private void setColour(OsuColour colours)

From c5d35ab78733cdd64322467e378474e526096a83 Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Tue, 20 Apr 2021 12:35:31 +0200
Subject: [PATCH 2696/3722] removed mods binding passthrough

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index b3aa4f0ba5..c308f14f74 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -41,9 +41,6 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; }
 
-        [Resolved]
-        private IBindable<IReadOnlyList<Mod>> mods { get; set; }
-
         [Resolved]
         private BeatmapDifficultyCache difficultyCache { get; set; }
 
@@ -150,7 +147,7 @@ namespace osu.Game.Screens.Select
 
                     removeOldInfo();
                     Add(Background = loaded);
-                    Add(Info = new WedgeInfoText(beatmap, ruleset.Value, mods, beatmapDifficulty)
+                    Add(Info = new WedgeInfoText(beatmap, ruleset.Value, beatmapDifficulty)
                     {
                         Shear = -Shear
                     });
@@ -172,6 +169,9 @@ namespace osu.Game.Screens.Select
             public OsuSpriteText VersionLabel { get; private set; }
             public BeatmapSetOnlineStatusPill StatusPill { get; private set; }
 
+            [Resolved]
+            private IBindable<IReadOnlyList<Mod>> mods { get; set; }
+
             private ILocalisedBindableString titleBinding;
             private ILocalisedBindableString artistBinding;
             private FillFlowContainer infoLabelContainer;
@@ -181,14 +181,12 @@ namespace osu.Game.Screens.Select
 
             private readonly WorkingBeatmap beatmap;
             private readonly RulesetInfo ruleset;
-            private readonly IBindable<IReadOnlyList<Mod>> mods;
             private readonly IBindable<StarDifficulty?> starDifficulty;
 
-            public WedgeInfoText(WorkingBeatmap beatmap, RulesetInfo userRuleset, IBindable<IReadOnlyList<Mod>> mods, IBindable<StarDifficulty?> difficulty)
+            public WedgeInfoText(WorkingBeatmap beatmap, RulesetInfo userRuleset, IBindable<StarDifficulty?> difficulty)
             {
                 this.beatmap = beatmap;
                 ruleset = userRuleset ?? beatmap.BeatmapInfo.Ruleset;
-                this.mods = mods;
                 starDifficulty = difficulty;
             }
 
@@ -409,7 +407,6 @@ namespace osu.Game.Screens.Select
                     }
                 };
 
-                // this is currently not triggering when a mod gets (de)selected
                 mods.BindValueChanged(mods => refreshModInformation(mods), true);
             }
 
@@ -418,7 +415,7 @@ namespace osu.Game.Screens.Select
                 settingChangeTracker?.Dispose();
                 settingChangeTracker = new ModSettingChangeTracker(modsChangedEvent.NewValue);
                 settingChangeTracker.SettingChanged += _ => refreshBPMLabel(modsChangedEvent.NewValue);
-                refreshBPMLabel(mods.Value);
+                refreshBPMLabel(modsChangedEvent.NewValue);
             }
 
             private OsuSpriteText[] getMapper(BeatmapMetadata metadata)

From 5262d94e21e630c794c8a6356d12f44f38ce33a0 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 20 Apr 2021 13:21:57 +0200
Subject: [PATCH 2697/3722] Fix wrong assert in offscreen test

---
 .../Editor/Checks/CheckOffscreenObjectsTest.cs                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
index 3a4817398c..6139b0e676 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
@@ -138,7 +138,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
         [Test]
         public void TestSliderNearEdgeStackedOffscreen()
         {
-            assertOk(new Beatmap<HitObject>
+            assertOffscreenSlider(new Beatmap<HitObject>
             {
                 HitObjects = new List<HitObject>
                 {

From 6a1e4ff99f41091d04f82bb721525af410eb10b7 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 20 Apr 2021 13:28:32 +0200
Subject: [PATCH 2698/3722] Add file hash to file presence test

Necessary because we now find the storage path of the file rather than just the file itself.
---
 osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs b/osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs
index fe2e16ffd8..f6e875a8fc 100644
--- a/osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
+using osu.Game.IO;
 using osu.Game.Rulesets.Edit.Checks;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Tests.Beatmaps;
@@ -30,7 +31,11 @@ namespace osu.Game.Tests.Editing.Checks
                     {
                         Files = new List<BeatmapSetFileInfo>(new[]
                         {
-                            new BeatmapSetFileInfo { Filename = "abc123.jpg" }
+                            new BeatmapSetFileInfo
+                            {
+                                Filename = "abc123.jpg",
+                                FileInfo = new FileInfo { Hash = "abcdef" }
+                            }
                         })
                     }
                 }

From c0318a4d3ef401f4b3288d14ac4188f995a5f0d1 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 20 Apr 2021 13:29:14 +0200
Subject: [PATCH 2699/3722] Fix usage of _ in Moq lambdas

---
 osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs | 10 +++++-----
 .../Editing/Checks/CheckBackgroundQualityTest.cs       |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs b/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs
index e73d9adfb0..7658ca728d 100644
--- a/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs
@@ -37,8 +37,8 @@ namespace osu.Game.Tests.Editing.Checks
             beatmap.Metadata.AudioFile = null;
 
             var mock = new Mock<IWorkingBeatmap>();
-            mock.SetupGet(_ => _.Beatmap).Returns(beatmap);
-            mock.SetupGet(_ => _.Track).Returns((Track)null);
+            mock.SetupGet(w => w.Beatmap).Returns(beatmap);
+            mock.SetupGet(w => w.Track).Returns((Track)null);
 
             Assert.That(check.Run(beatmap, mock.Object), Is.Empty);
         }
@@ -102,11 +102,11 @@ namespace osu.Game.Tests.Editing.Checks
         private Mock<IWorkingBeatmap> getMockWorkingBeatmap(int? audioBitrate)
         {
             var mockTrack = new Mock<Track>();
-            mockTrack.SetupGet(_ => _.Bitrate).Returns(audioBitrate);
+            mockTrack.SetupGet(t => t.Bitrate).Returns(audioBitrate);
 
             var mockWorkingBeatmap = new Mock<IWorkingBeatmap>();
-            mockWorkingBeatmap.SetupGet(_ => _.Beatmap).Returns(beatmap);
-            mockWorkingBeatmap.SetupGet(_ => _.Track).Returns(mockTrack.Object);
+            mockWorkingBeatmap.SetupGet(w => w.Beatmap).Returns(beatmap);
+            mockWorkingBeatmap.SetupGet(w => w.Track).Returns(mockTrack.Object);
 
             return mockWorkingBeatmap;
         }
diff --git a/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs b/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
index b6970a99e4..f0f972d2fa 100644
--- a/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
@@ -120,9 +120,9 @@ namespace osu.Game.Tests.Editing.Checks
             var stream = new MemoryStream(fileBytes ?? new byte[1024 * 1024]);
 
             var mock = new Mock<IWorkingBeatmap>();
-            mock.SetupGet(_ => _.Beatmap).Returns(beatmap);
-            mock.SetupGet(_ => _.Background).Returns(background);
-            mock.Setup(_ => _.GetStream(It.IsAny<string>())).Returns(stream);
+            mock.SetupGet(w => w.Beatmap).Returns(beatmap);
+            mock.SetupGet(w => w.Background).Returns(background);
+            mock.Setup(w => w.GetStream(It.IsAny<string>())).Returns(stream);
 
             return mock;
         }

From 3e1b6b3b346ea449a3504eb71961f7446bf84379 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 20 Apr 2021 13:34:12 +0200
Subject: [PATCH 2700/3722] Simplify verifier run call args

Uses the resolved working beatmap instead of resolving it every time.

Also uses the EditorBeatmap itself as playable beatmap, as it is of type `IBeatmap` already, and `.PlayableBeatmap` forwards everything anyway.
---
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index 530f24300b..9de1f04271 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Screens.Edit.Verify
             private EditorClock clock { get; set; }
 
             [Resolved]
-            private BeatmapManager beatmapManager { get; set; }
+            private IBindable<WorkingBeatmap> workingBeatmap { get; set; }
 
             [Resolved]
             private EditorBeatmap beatmap { get; set; }
@@ -122,11 +122,10 @@ namespace osu.Game.Screens.Edit.Verify
 
             private void refresh()
             {
-                var workingBeatmap = beatmapManager.GetWorkingBeatmap(beatmap.BeatmapInfo);
-                var issues = generalVerifier.Run(beatmap.PlayableBeatmap, workingBeatmap);
+                var issues = generalVerifier.Run(beatmap, workingBeatmap.Value);
 
                 if (rulesetVerifier != null)
-                    issues = issues.Concat(rulesetVerifier.Run(beatmap.PlayableBeatmap, workingBeatmap));
+                    issues = issues.Concat(rulesetVerifier.Run(beatmap, workingBeatmap.Value));
 
                 table.Issues = issues
                                .OrderBy(issue => issue.Template.Type)

From d7a81471c85a4aff21279974092847c4331355aa Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 20 Apr 2021 13:40:38 +0200
Subject: [PATCH 2701/3722] Add xmldoc to `GetPathForFile`

---
 osu.Game/Beatmaps/BeatmapSetInfo.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Beatmaps/BeatmapSetInfo.cs b/osu.Game/Beatmaps/BeatmapSetInfo.cs
index 774bd0bc62..d90ede5d4b 100644
--- a/osu.Game/Beatmaps/BeatmapSetInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapSetInfo.cs
@@ -59,6 +59,10 @@ namespace osu.Game.Beatmaps
 
         public string StoryboardFile => Files?.Find(f => f.Filename.EndsWith(".osb", StringComparison.OrdinalIgnoreCase))?.Filename;
 
+        /// <summary>
+        /// Returns the storage path for the file in this beatmapset with the given filename, if any exists, otherwise null.
+        /// </summary>
+        /// <param name="filename">The name of the file to get the storage path of.</param>
         public string GetPathForFile(string filename) => Files?.SingleOrDefault(f => string.Equals(f.Filename, filename, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;
 
         public List<BeatmapSetFileInfo> Files { get; set; }

From e9dfa2860a4fd63f61f0ad2a26d9677d6b4498fb Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 20 Apr 2021 13:44:06 +0200
Subject: [PATCH 2702/3722] Add xmldoc note about path being relative

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

diff --git a/osu.Game/Beatmaps/BeatmapSetInfo.cs b/osu.Game/Beatmaps/BeatmapSetInfo.cs
index d90ede5d4b..1ce42535a0 100644
--- a/osu.Game/Beatmaps/BeatmapSetInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapSetInfo.cs
@@ -61,6 +61,7 @@ namespace osu.Game.Beatmaps
 
         /// <summary>
         /// Returns the storage path for the file in this beatmapset with the given filename, if any exists, otherwise null.
+        /// The path returned is relative to the user file storage.
         /// </summary>
         /// <param name="filename">The name of the file to get the storage path of.</param>
         public string GetPathForFile(string filename) => Files?.SingleOrDefault(f => string.Equals(f.Filename, filename, StringComparison.OrdinalIgnoreCase))?.FileInfo.StoragePath;

From f799a6e733e0d2075f7feafd9333cfaf5c604fad Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Tue, 20 Apr 2021 14:18:41 +0200
Subject: [PATCH 2703/3722] Removed StarDifficulty binding passthrough

---
 .../Ranking/Expanded/StarRatingDisplay.cs     | 42 +++++++----
 osu.Game/Screens/Select/BeatmapInfoWedge.cs   | 69 ++++++++++---------
 2 files changed, 67 insertions(+), 44 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
index 081b782034..1aa8f5ca73 100644
--- a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Globalization;
+using System.Threading;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -24,11 +25,16 @@ namespace osu.Game.Screens.Ranking.Expanded
     /// </summary>
     public class StarRatingDisplay : CompositeDrawable
     {
+        [Resolved]
+        private OsuColour colours { get; set; }
+
         private CircularContainer colorContainer;
         private OsuTextFlowContainer textContainer;
+        private CancellationTokenSource cancellationTokenSource;
+        private IBindable<StarDifficulty?> bindableStarDifficulty;
 
         private readonly StarDifficulty starDifficulty;
-        private readonly IBindable<StarDifficulty?> bindableStarDifficulty;
+        private readonly BeatmapInfo beatmapInfo;
 
         /// <summary>
         /// Creates a new <see cref="StarRatingDisplay"/> using an already computed <see cref="StarDifficulty"/>.
@@ -40,17 +46,16 @@ namespace osu.Game.Screens.Ranking.Expanded
         }
 
         /// <summary>
-        /// Creates a new <see cref="StarRatingDisplay"/> using a binded nullable <see cref="StarDifficulty"/>.
+        /// Creates a new <see cref="StarRatingDisplay"/> using a <see cref="BeatmapInfo"/> to use a bindable for the difficulty. 
         /// </summary>
-        /// <param name="starDifficulty">The binded nullable <see cref="StarDifficulty"/> to display the star difficulty of. If <c>null</c>, a new instance of <see cref="StarDifficulty"/> will be created </param>
-        public StarRatingDisplay(IBindable<StarDifficulty?> starDifficulty)
+        /// <param name="beatmapInfo">The <see cref="BeatmapInfo"/> to use to create a bindable for <see cref="StarDifficulty"/></param>
+        public StarRatingDisplay(BeatmapInfo beatmapInfo)
         {
-            bindableStarDifficulty = starDifficulty;
+            this.beatmapInfo = beatmapInfo;
         }
 
-        private void setDifficulty(OsuColour colours)
+        private void setDifficulty(StarDifficulty difficulty)
         {
-            var difficulty = bindableStarDifficulty == null ? starDifficulty : bindableStarDifficulty.Value ?? new StarDifficulty();
             var starRatingParts = difficulty.Stars.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
             string wholePart = starRatingParts[0];
             string fractionPart = starRatingParts[1];
@@ -83,8 +88,17 @@ namespace osu.Game.Screens.Ranking.Expanded
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, BeatmapDifficultyCache difficultyCache)
+        private void load(BeatmapDifficultyCache difficultyCache)
         {
+            if (beatmapInfo != null)
+            {
+                cancellationTokenSource?.Cancel();
+                cancellationTokenSource = new CancellationTokenSource();
+
+                bindableStarDifficulty?.UnbindAll();
+                bindableStarDifficulty = difficultyCache.GetBindableDifficulty(beatmapInfo, cancellationTokenSource.Token);
+            }
+
             AutoSizeAxes = Axes.Both;
 
             InternalChildren = new Drawable[]
@@ -130,11 +144,15 @@ namespace osu.Game.Screens.Ranking.Expanded
             };
 
             if (bindableStarDifficulty != null)
-            {
-                bindableStarDifficulty.BindValueChanged(_ => setDifficulty(colours));
-            }
+                bindableStarDifficulty.BindValueChanged(valueChanged => setDifficulty(valueChanged.NewValue ?? new StarDifficulty()), true);
+            else
+                setDifficulty(starDifficulty);
+        }
 
-            setDifficulty(colours);
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            cancellationTokenSource?.Cancel();
         }
     }
 }
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index c308f14f74..e3afd53210 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -41,11 +41,6 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; }
 
-        [Resolved]
-        private BeatmapDifficultyCache difficultyCache { get; set; }
-
-        private IBindable<StarDifficulty?> beatmapDifficulty;
-
         protected BufferedWedgeBackground Background;
         protected WedgeInfoText Info;
 
@@ -87,8 +82,6 @@ namespace osu.Game.Screens.Select
 
         private WorkingBeatmap beatmap;
 
-        private CancellationTokenSource cancellationSource;
-
         public WorkingBeatmap Beatmap
         {
             get => beatmap;
@@ -97,12 +90,6 @@ namespace osu.Game.Screens.Select
                 if (beatmap == value) return;
 
                 beatmap = value;
-                cancellationSource?.Cancel();
-                cancellationSource = new CancellationTokenSource();
-
-                beatmapDifficulty?.UnbindAll();
-                beatmapDifficulty = difficultyCache.GetBindableDifficulty(beatmap.BeatmapInfo, cancellationSource.Token);
-
                 updateDisplay();
             }
         }
@@ -147,7 +134,7 @@ namespace osu.Game.Screens.Select
 
                     removeOldInfo();
                     Add(Background = loaded);
-                    Add(Info = new WedgeInfoText(beatmap, ruleset.Value, beatmapDifficulty)
+                    Add(Info = new WedgeInfoText(beatmap, ruleset.Value)
                     {
                         Shear = -Shear
                     });
@@ -158,7 +145,6 @@ namespace osu.Game.Screens.Select
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            cancellationSource?.Cancel();
         }
 
         public class WedgeInfoText : Container
@@ -178,24 +164,30 @@ namespace osu.Game.Screens.Select
             private Drawable starRatingDisplay;
             private Container bpmLabelContainer;
             private ModSettingChangeTracker settingChangeTracker;
+            private CancellationTokenSource cancellationTokenSource;
+            private IBindable<StarDifficulty?> starDifficulty;
 
             private readonly WorkingBeatmap beatmap;
             private readonly RulesetInfo ruleset;
-            private readonly IBindable<StarDifficulty?> starDifficulty;
 
-            public WedgeInfoText(WorkingBeatmap beatmap, RulesetInfo userRuleset, IBindable<StarDifficulty?> difficulty)
+            public WedgeInfoText(WorkingBeatmap beatmap, RulesetInfo userRuleset)
             {
                 this.beatmap = beatmap;
                 ruleset = userRuleset ?? beatmap.BeatmapInfo.Ruleset;
-                starDifficulty = difficulty;
             }
 
             [BackgroundDependencyLoader]
-            private void load(LocalisationManager localisation)
+            private void load(LocalisationManager localisation, BeatmapDifficultyCache difficultyCache)
             {
                 var beatmapInfo = beatmap.BeatmapInfo;
                 var metadata = beatmapInfo.Metadata ?? beatmap.BeatmapSetInfo?.Metadata ?? new BeatmapMetadata();
 
+                cancellationTokenSource?.Cancel();
+                cancellationTokenSource = new CancellationTokenSource();
+
+                starDifficulty?.UnbindAll();
+                starDifficulty = difficultyCache.GetBindableDifficulty(beatmapInfo, cancellationTokenSource.Token);
+
                 RelativeSizeAxes = Axes.Both;
 
                 titleBinding = localisation.GetLocalisedString(new RomanisableString(metadata.TitleUnicode, metadata.Title));
@@ -203,7 +195,7 @@ namespace osu.Game.Screens.Select
 
                 Children = new Drawable[]
                 {
-                    new DifficultyColourBar(starDifficulty)
+                    new DifficultyColourBar(beatmapInfo)
                     {
                         RelativeSizeAxes = Axes.Y,
                         Width = 20,
@@ -239,7 +231,7 @@ namespace osu.Game.Screens.Select
                         Shear = wedged_container_shear,
                         Children = new[]
                         {
-                            starRatingDisplay = new StarRatingDisplay(starDifficulty)
+                            starRatingDisplay = new StarRatingDisplay(beatmapInfo)
                             {
                                 Anchor = Anchor.TopRight,
                                 Origin = Anchor.TopRight,
@@ -313,13 +305,9 @@ namespace osu.Game.Screens.Select
             private void setStarRatingDisplayVisibility()
             {
                 if (starDifficulty.Value.HasValue && starDifficulty.Value.Value.Stars > 0)
-                {
                     starRatingDisplay.Show();
-                }
                 else
-                {
                     starRatingDisplay.Hide();
-                }
             }
 
             private InfoLabel[] getRulesetInfoLabels()
@@ -440,21 +428,32 @@ namespace osu.Game.Screens.Select
 
             private class DifficultyColourBar : Container
             {
+                [Resolved]
+                private OsuColour colours { get; set; }
+
                 private Box solidDifficultyBox;
                 private Box transparentDifficultyBox;
+                private CancellationTokenSource cancellationTokenSource;
+                private IBindable<StarDifficulty?> starDifficulty;
 
-                private readonly IBindable<StarDifficulty?> difficulty;
+                private readonly BeatmapInfo beatmapInfo;
 
-                public DifficultyColourBar(IBindable<StarDifficulty?> difficulty)
+                public DifficultyColourBar(BeatmapInfo beatmapInfo)
                 {
-                    this.difficulty = difficulty;
+                    this.beatmapInfo = beatmapInfo;
                 }
 
                 [BackgroundDependencyLoader]
-                private void load(OsuColour colours)
+                private void load(BeatmapDifficultyCache difficultyCache)
                 {
                     const float full_opacity_ratio = 0.7f;
 
+                    cancellationTokenSource?.Cancel();
+                    cancellationTokenSource = new CancellationTokenSource();
+
+                    starDifficulty?.UnbindAll();
+                    starDifficulty = difficultyCache.GetBindableDifficulty(beatmapInfo, cancellationTokenSource.Token);
+
                     Children = new Drawable[]
                     {
                         solidDifficultyBox = new Box
@@ -472,16 +471,22 @@ namespace osu.Game.Screens.Select
                         }
                     };
 
-                    difficulty.BindValueChanged(_ => setColour(colours), true);
+                    starDifficulty.BindValueChanged(valueChangedEvent => setColour(valueChangedEvent), true);
                 }
 
-                private void setColour(OsuColour colours)
+                private void setColour(ValueChangedEvent<StarDifficulty?> valueChanged)
                 {
-                    var difficultyColour = colours.ForDifficultyRating(difficulty.Value?.DifficultyRating ?? (new StarDifficulty()).DifficultyRating);
+                    var difficultyColour = colours.ForDifficultyRating(valueChanged.NewValue?.DifficultyRating ?? (new StarDifficulty()).DifficultyRating);
 
                     solidDifficultyBox.Colour = difficultyColour;
                     transparentDifficultyBox.Colour = difficultyColour;
                 }
+
+                protected override void Dispose(bool isDisposing)
+                {
+                    base.Dispose(isDisposing);
+                    cancellationTokenSource?.Cancel();
+                }
             }
 
             public class InfoLabel : Container, IHasTooltip

From a9e4a0ed50dcfbd81487afbc14ba10fd8cd7463f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 20 Apr 2021 21:17:24 +0900
Subject: [PATCH 2704/3722] Fix potentially starting play when finished

The UserFinishedPlaying event may trigger before the event is subscribed
to by SpectatorScreen. For such cases, an extra check is done to make
sure the user is _actually_ playing.
---
 osu.Game/Screens/Spectate/SpectatorScreen.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/Spectate/SpectatorScreen.cs b/osu.Game/Screens/Spectate/SpectatorScreen.cs
index f554b15abf..ed01d56801 100644
--- a/osu.Game/Screens/Spectate/SpectatorScreen.cs
+++ b/osu.Game/Screens/Spectate/SpectatorScreen.cs
@@ -127,6 +127,10 @@ namespace osu.Game.Screens.Spectate
                 if (!userMap.ContainsKey(userId))
                     return;
 
+                // The user may have stopped playing.
+                if (!spectatorClient.TryGetPlayingUserState(userId, out _))
+                    return;
+
                 Schedule(() => OnUserStateChanged(userId, state));
 
                 updateGameplayState(userId);

From 4cc3321d54b2e2e57ebb09b1cb240135d421ec4d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 20 Apr 2021 21:20:08 +0900
Subject: [PATCH 2705/3722] Fix potential doubling of events

---
 osu.Game/Online/Spectator/SpectatorStreamingClient.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 13b12d9add..378096c7fb 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -303,13 +303,14 @@ namespace osu.Game.Online.Spectator
         /// <param name="runOnceImmediately">Whether the action provided in <paramref name="callback"/> should be run once immediately for all users currently playing.</param>
         public void BindUserBeganPlaying(Action<int, SpectatorState> callback, bool runOnceImmediately = false)
         {
-            OnUserBeganPlaying += callback;
-
-            if (!runOnceImmediately)
-                return;
-
+            // The lock is taken before the event is subscribed to to prevent doubling of events.
             lock (userLock)
             {
+                OnUserBeganPlaying += callback;
+
+                if (!runOnceImmediately)
+                    return;
+
                 foreach (var (userId, state) in playingUserStates)
                     callback(userId, state);
             }

From df29e61147fd45f0f310453c19393266d10609dd Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Tue, 20 Apr 2021 14:22:49 +0200
Subject: [PATCH 2706/3722] Fix CodeFactor error

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index e3afd53210..44dbd5a5c6 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -299,7 +299,6 @@ namespace osu.Game.Screens.Select
                 // no difficulty means it can't have a status to show
                 if (beatmapInfo.Version == null)
                     StatusPill.Hide();
-
             }
 
             private void setStarRatingDisplayVisibility()

From 583754b22a430dba73db9688d106dd7d734d6be4 Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Tue, 20 Apr 2021 14:29:53 +0200
Subject: [PATCH 2707/3722] Removed unnecessary whitespaces

---
 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 44dbd5a5c6..7cb6f2caf3 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -598,7 +598,7 @@ namespace osu.Game.Screens.Select
                             },
                         },
                     },
-                };                
+                };
             }
         }
     }

From e9571b72cf149a1941717bd1a1e9a22015feca20 Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Tue, 20 Apr 2021 14:53:35 +0200
Subject: [PATCH 2708/3722] Fixed InspectCode

---
 osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs | 3 +--
 osu.Game/Screens/Select/BeatmapInfoWedge.cs            | 9 ++-------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
index 1aa8f5ca73..a3e9336648 100644
--- a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.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.Globalization;
 using System.Threading;
 using osu.Framework.Allocation;
@@ -46,7 +45,7 @@ namespace osu.Game.Screens.Ranking.Expanded
         }
 
         /// <summary>
-        /// Creates a new <see cref="StarRatingDisplay"/> using a <see cref="BeatmapInfo"/> to use a bindable for the difficulty. 
+        /// Creates a new <see cref="StarRatingDisplay"/> using a <see cref="BeatmapInfo"/> to use a bindable for the difficulty.
         /// </summary>
         /// <param name="beatmapInfo">The <see cref="BeatmapInfo"/> to use to create a bindable for <see cref="StarDifficulty"/></param>
         public StarRatingDisplay(BeatmapInfo beatmapInfo)
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 7cb6f2caf3..9077c115d4 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -142,11 +142,6 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-        }
-
         public class WedgeInfoText : Container
         {
             public FillFlowContainer MapperContainer { get; private set; }
@@ -394,7 +389,7 @@ namespace osu.Game.Screens.Select
                     }
                 };
 
-                mods.BindValueChanged(mods => refreshModInformation(mods), true);
+                mods.BindValueChanged(refreshModInformation, true);
             }
 
             private void refreshModInformation(ValueChangedEvent<IReadOnlyList<Mod>> modsChangedEvent)
@@ -470,7 +465,7 @@ namespace osu.Game.Screens.Select
                         }
                     };
 
-                    starDifficulty.BindValueChanged(valueChangedEvent => setColour(valueChangedEvent), true);
+                    starDifficulty.BindValueChanged(setColour, true);
                 }
 
                 private void setColour(ValueChangedEvent<StarDifficulty?> valueChanged)

From 7fc450c620eba103fc96a716edd149c9e15e790a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Apr 2021 23:42:53 +0900
Subject: [PATCH 2709/3722] Fix mod settings blocking input outside its visible
 area

Closes #12502.
---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 26b8632d7f..754b260bf0 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -245,15 +245,21 @@ namespace osu.Game.Overlays.Mods
                                             },
                                         }
                                     },
-                                    ModSettingsContainer = new ModSettingsContainer
+                                    new Container
                                     {
                                         RelativeSizeAxes = Axes.Both,
                                         Anchor = Anchor.BottomRight,
                                         Origin = Anchor.BottomRight,
-                                        Width = 0.3f,
-                                        Alpha = 0,
                                         Padding = new MarginPadding(30),
-                                        SelectedMods = { BindTarget = SelectedMods },
+                                        Width = 0.3f,
+                                        Children = new Drawable[]
+                                        {
+                                            ModSettingsContainer = new ModSettingsContainer
+                                            {
+                                                Alpha = 0,
+                                                SelectedMods = { BindTarget = SelectedMods },
+                                            },
+                                        }
                                     },
                                 }
                             },

From 4910d8f56cd04339773ec2ae4ca288dcc9324839 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 20 Apr 2021 23:57:12 +0900
Subject: [PATCH 2710/3722] Fix click-to-resume cursor location being incorrect
 when playfield is transformed

Closes #12501.
---
 osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs b/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
index 44ca5e850f..27d48d1296 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Osu.UI
             base.PopIn();
 
             GameplayCursor.ActiveCursor.Hide();
-            cursorScaleContainer.MoveTo(GameplayCursor.ActiveCursor.Position);
+            cursorScaleContainer.Position = ToLocalSpace(GameplayCursor.ActiveCursor.ScreenSpaceDrawQuad.Centre);
             clickToResumeCursor.Appear();
 
             if (localCursorContainer == null)

From 881043bc5d8d8a76d3fd54c9a389adc83472ee61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 20 Apr 2021 19:05:43 +0200
Subject: [PATCH 2711/3722] Fix failing test after mod settings layout changes

The slight hack which was used in the test to ensure that the mod
settings overlay covered the entire width of the mod overlay broke after
adjustments to the layout in the previous commit.

Locally adjust the hack to use the parent of the `ModSettingsContainer`
rather than the container itself.
---
 osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
index 2158cf77e5..bda1973354 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
@@ -167,7 +167,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                 GetModButton(mod).SelectNext(1);
 
             public void SetModSettingsWidth(float newWidth) =>
-                ModSettingsContainer.Width = newWidth;
+                ModSettingsContainer.Parent.Width = newWidth;
         }
 
         public class TestRulesetInfo : RulesetInfo

From e80c3c317a34b989dc18a9d904d39da724c828f3 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 21 Apr 2021 09:14:22 +0900
Subject: [PATCH 2712/3722] Rename UnmanagedHitObjectEntry ->
 SyntheticHitObjectEntry

"Unmanaged" was confusing because its lifetime is still managed by the HitObjectContainer.
---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs      | 4 ++--
 ...{UnmanagedHitObjectEntry.cs => SyntheticHitObjectEntry.cs} | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename osu.Game/Rulesets/Objects/{UnmanagedHitObjectEntry.cs => SyntheticHitObjectEntry.cs} (81%)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index d798eba4e1..ca1c601c1d 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -172,7 +172,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         {
             if (initialHitObject != null)
             {
-                lifetimeEntry = new UnmanagedHitObjectEntry(initialHitObject);
+                lifetimeEntry = new SyntheticHitObjectEntry(initialHitObject);
                 ensureEntryHasResult();
             }
         }
@@ -227,7 +227,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             if (hitObject == null)
                 throw new ArgumentNullException($"Cannot apply a null {nameof(HitObject)}.");
 
-            Apply(new UnmanagedHitObjectEntry(hitObject));
+            Apply(new SyntheticHitObjectEntry(hitObject));
         }
 
         /// <summary>
diff --git a/osu.Game/Rulesets/Objects/UnmanagedHitObjectEntry.cs b/osu.Game/Rulesets/Objects/SyntheticHitObjectEntry.cs
similarity index 81%
rename from osu.Game/Rulesets/Objects/UnmanagedHitObjectEntry.cs
rename to osu.Game/Rulesets/Objects/SyntheticHitObjectEntry.cs
index 3cfa3c4d3a..76f9eaf25a 100644
--- a/osu.Game/Rulesets/Objects/UnmanagedHitObjectEntry.cs
+++ b/osu.Game/Rulesets/Objects/SyntheticHitObjectEntry.cs
@@ -9,9 +9,9 @@ namespace osu.Game.Rulesets.Objects
     /// Created for a <see cref="DrawableHitObject"/> when only <see cref="HitObject"/> is given
     /// to make sure a <see cref="DrawableHitObject"/> is always associated with a <see cref="HitObjectLifetimeEntry"/>.
     /// </summary>
-    internal class UnmanagedHitObjectEntry : HitObjectLifetimeEntry
+    internal class SyntheticHitObjectEntry : HitObjectLifetimeEntry
     {
-        public UnmanagedHitObjectEntry(HitObject hitObject)
+        public SyntheticHitObjectEntry(HitObject hitObject)
             : base(hitObject)
         {
         }

From 67fcfd9dbc243a8ffe976410729efeb94c06336d Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 21 Apr 2021 09:48:16 +0900
Subject: [PATCH 2713/3722] Fix wrong InitialLifetimeOffset is used for a
 non-pooled DHO.

HitObjectLifetimeEntry's InitialLifetimeOffset is different from DrawableHitObject's InitialLifetimeOffset.
---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 4 ++--
 osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs      | 9 +++++++--
 osu.Game/Rulesets/Objects/SyntheticHitObjectEntry.cs     | 6 ++++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index ca1c601c1d..4eea058163 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -172,7 +172,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         {
             if (initialHitObject != null)
             {
-                lifetimeEntry = new SyntheticHitObjectEntry(initialHitObject);
+                lifetimeEntry = new SyntheticHitObjectEntry(initialHitObject, initialHitObject.StartTime - InitialLifetimeOffset);
                 ensureEntryHasResult();
             }
         }
@@ -227,7 +227,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             if (hitObject == null)
                 throw new ArgumentNullException($"Cannot apply a null {nameof(HitObject)}.");
 
-            Apply(new SyntheticHitObjectEntry(hitObject));
+            Apply(new SyntheticHitObjectEntry(hitObject, hitObject.StartTime - InitialLifetimeOffset));
         }
 
         /// <summary>
diff --git a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
index 1954d7e6d2..d1d459a8f6 100644
--- a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
+++ b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
@@ -30,12 +30,17 @@ namespace osu.Game.Rulesets.Objects
         /// Creates a new <see cref="HitObjectLifetimeEntry"/>.
         /// </summary>
         /// <param name="hitObject">The <see cref="HitObject"/> to store the lifetime of.</param>
-        public HitObjectLifetimeEntry(HitObject hitObject)
+        /// <param name="lifetimeStart">The <see cref="LifetimeStart"/>.</param>
+        /// <param name="lifetimeEnd">The <see cref="LifetimeEnd"/>.</param>
+        public HitObjectLifetimeEntry(HitObject hitObject, double lifetimeStart = double.MinValue, double lifetimeEnd = double.MaxValue)
         {
             HitObject = hitObject;
 
             startTimeBindable.BindTo(HitObject.StartTimeBindable);
-            startTimeBindable.BindValueChanged(onStartTimeChanged, true);
+            // Only set initial lifetime if it is not provided
+            startTimeBindable.BindValueChanged(onStartTimeChanged, lifetimeStart == double.MinValue);
+
+            setLifetime(lifetimeStart, lifetimeEnd);
         }
 
         // The lifetime start, as set by the hitobject.
diff --git a/osu.Game/Rulesets/Objects/SyntheticHitObjectEntry.cs b/osu.Game/Rulesets/Objects/SyntheticHitObjectEntry.cs
index 76f9eaf25a..c064f3ff10 100644
--- a/osu.Game/Rulesets/Objects/SyntheticHitObjectEntry.cs
+++ b/osu.Game/Rulesets/Objects/SyntheticHitObjectEntry.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 enable
+
 using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Objects
@@ -11,8 +13,8 @@ namespace osu.Game.Rulesets.Objects
     /// </summary>
     internal class SyntheticHitObjectEntry : HitObjectLifetimeEntry
     {
-        public SyntheticHitObjectEntry(HitObject hitObject)
-            : base(hitObject)
+        public SyntheticHitObjectEntry(HitObject hitObject, double initialLifetimeStart)
+            : base(hitObject, initialLifetimeStart)
         {
         }
     }

From 44ff08cce4675e40492364633a1917608f7c908b Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 21 Apr 2021 10:02:50 +0900
Subject: [PATCH 2714/3722] Revert "Fix wrong InitialLifetimeOffset is used for
 a non-pooled DHO."

This reverts commit 67fcfd9d
---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 4 ++--
 osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs      | 9 ++-------
 osu.Game/Rulesets/Objects/SyntheticHitObjectEntry.cs     | 6 ++----
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 4eea058163..ca1c601c1d 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -172,7 +172,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         {
             if (initialHitObject != null)
             {
-                lifetimeEntry = new SyntheticHitObjectEntry(initialHitObject, initialHitObject.StartTime - InitialLifetimeOffset);
+                lifetimeEntry = new SyntheticHitObjectEntry(initialHitObject);
                 ensureEntryHasResult();
             }
         }
@@ -227,7 +227,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             if (hitObject == null)
                 throw new ArgumentNullException($"Cannot apply a null {nameof(HitObject)}.");
 
-            Apply(new SyntheticHitObjectEntry(hitObject, hitObject.StartTime - InitialLifetimeOffset));
+            Apply(new SyntheticHitObjectEntry(hitObject));
         }
 
         /// <summary>
diff --git a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
index d1d459a8f6..1954d7e6d2 100644
--- a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
+++ b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
@@ -30,17 +30,12 @@ namespace osu.Game.Rulesets.Objects
         /// Creates a new <see cref="HitObjectLifetimeEntry"/>.
         /// </summary>
         /// <param name="hitObject">The <see cref="HitObject"/> to store the lifetime of.</param>
-        /// <param name="lifetimeStart">The <see cref="LifetimeStart"/>.</param>
-        /// <param name="lifetimeEnd">The <see cref="LifetimeEnd"/>.</param>
-        public HitObjectLifetimeEntry(HitObject hitObject, double lifetimeStart = double.MinValue, double lifetimeEnd = double.MaxValue)
+        public HitObjectLifetimeEntry(HitObject hitObject)
         {
             HitObject = hitObject;
 
             startTimeBindable.BindTo(HitObject.StartTimeBindable);
-            // Only set initial lifetime if it is not provided
-            startTimeBindable.BindValueChanged(onStartTimeChanged, lifetimeStart == double.MinValue);
-
-            setLifetime(lifetimeStart, lifetimeEnd);
+            startTimeBindable.BindValueChanged(onStartTimeChanged, true);
         }
 
         // The lifetime start, as set by the hitobject.
diff --git a/osu.Game/Rulesets/Objects/SyntheticHitObjectEntry.cs b/osu.Game/Rulesets/Objects/SyntheticHitObjectEntry.cs
index c064f3ff10..76f9eaf25a 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.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable enable
-
 using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Objects
@@ -13,8 +11,8 @@ namespace osu.Game.Rulesets.Objects
     /// </summary>
     internal class SyntheticHitObjectEntry : HitObjectLifetimeEntry
     {
-        public SyntheticHitObjectEntry(HitObject hitObject, double initialLifetimeStart)
-            : base(hitObject, initialLifetimeStart)
+        public SyntheticHitObjectEntry(HitObject hitObject)
+            : base(hitObject)
         {
         }
     }

From 9d423201edb4eebdc23fe141830773db5b2729f8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 21 Apr 2021 10:29:18 +0900
Subject: [PATCH 2715/3722] Fix slider tails wiggling independently

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

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs b/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs
index 9c5e41f245..123bbe12de 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             // Wiggle the repeat points with the slider instead of independently.
             // Also fixes an issue with repeat points being positioned incorrectly.
-            if (osuObject is SliderRepeat)
+            if (osuObject is SliderRepeat || osuObject is SliderTailCircle)
                 return;
 
             Random objRand = new Random((int)osuObject.StartTime);

From e454037d82e5883e2419203ccb98a983e333cece Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 21 Apr 2021 10:32:08 +0900
Subject: [PATCH 2716/3722] Add to comment

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

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs b/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs
index 123bbe12de..a01cec4bb3 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModWiggle.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             var osuObject = (OsuHitObject)drawable.HitObject;
             Vector2 origin = drawable.Position;
 
-            // Wiggle the repeat points with the slider instead of independently.
+            // Wiggle the repeat points and the tail with the slider instead of independently.
             // Also fixes an issue with repeat points being positioned incorrectly.
             if (osuObject is SliderRepeat || osuObject is SliderTailCircle)
                 return;

From 73d3da168769bf884ec876cdf888aa6f118a8dcb Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 21 Apr 2021 11:32:01 +0900
Subject: [PATCH 2717/3722] Fix wrong InitialLifetimeOffset is used for a
 non-pooled DHO.

HitObjectLifetimeEntry's InitialLifetimeOffset is different from DrawableHitObject's InitialLifetimeOffset.
---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index ca1c601c1d..d0fa7eb22f 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -239,6 +239,11 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
             lifetimeEntry = newEntry;
 
+            // LifetimeStart is already computed using HitObjectLifetimeEntry's InitialLifetimeOffset.
+            // We override this with DHO's InitialLifetimeOffset for a non-pooled DHO.
+            if (newEntry is SyntheticHitObjectEntry)
+                lifetimeEntry.LifetimeStart = HitObject.StartTime - InitialLifetimeOffset;
+
             LifetimeStart = lifetimeEntry.LifetimeStart;
             LifetimeEnd = lifetimeEntry.LifetimeEnd;
 

From 3fbeadf31847cd87aef622e7ddba08cbb253f9ec Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 21 Apr 2021 14:32:37 +0900
Subject: [PATCH 2718/3722] Deprecate old overload of Apply

---
 osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleApplication.cs | 2 +-
 osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs    | 2 +-
 osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerApplication.cs   | 2 +-
 osu.Game.Rulesets.Taiko.Tests/TestSceneBarLineApplication.cs | 4 ++--
 .../TestSceneDrumRollApplication.cs                          | 4 ++--
 osu.Game.Rulesets.Taiko.Tests/TestSceneHitApplication.cs     | 4 ++--
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs     | 5 +----
 osu.Game/Rulesets/UI/Playfield.cs                            | 2 +-
 8 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleApplication.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleApplication.cs
index 5fc1082743..8b3fead366 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleApplication.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleApplication.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 Position = new Vector2(128, 128),
                 ComboIndex = 1,
-            }), null));
+            })));
         }
 
         private HitCircle prepareObject(HitCircle circle)
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs
index aac6db60fe..e698766aac 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderApplication.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                     new Vector2(300, 0),
                 }),
                 RepeatCount = 1
-            }), null));
+            })));
         }
 
         [Test]
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerApplication.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerApplication.cs
index d7fbc7ac48..8c97c02049 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerApplication.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerApplication.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 Position = new Vector2(256, 192),
                 ComboIndex = 1,
                 Duration = 1000,
-            }), null));
+            })));
 
             AddAssert("rotation is reset", () => dho.Result.RateAdjustedRotation == 0);
         }
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneBarLineApplication.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneBarLineApplication.cs
index a970965141..f33c738b04 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneBarLineApplication.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneBarLineApplication.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
             {
                 StartTime = 400,
                 Major = true
-            }), null));
+            })));
             AddHitObject(barLine);
             RemoveHitObject(barLine);
 
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
             {
                 StartTime = 200,
                 Major = false
-            }), null));
+            })));
             AddHitObject(barLine);
         }
     }
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumRollApplication.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumRollApplication.cs
index 54450e27db..c389a05566 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumRollApplication.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrumRollApplication.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
                 Duration = 500,
                 IsStrong = false,
                 TickRate = 2
-            }), null));
+            })));
 
             AddHitObject(drumRoll);
             RemoveHitObject(drumRoll);
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
                 Duration = 400,
                 IsStrong = true,
                 TickRate = 16
-            }), null));
+            })));
 
             AddHitObject(drumRoll);
         }
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneHitApplication.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneHitApplication.cs
index 52fd440857..c2f251fcb6 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneHitApplication.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneHitApplication.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
                 Type = HitType.Rim,
                 IsStrong = false,
                 StartTime = 300
-            }), null));
+            })));
 
             AddHitObject(hit);
             RemoveHitObject(hit);
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
                 Type = HitType.Centre,
                 IsStrong = true,
                 StartTime = 500
-            }), null));
+            })));
 
             AddHitObject(hit);
         }
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index d0fa7eb22f..ba2b8423d0 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -206,12 +206,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// <summary>
         /// Applies a hit object to be represented by this <see cref="DrawableHitObject"/>.
         /// </summary>
-        /// <remarks>This overload is semi-deprecated. Use either <see cref="Apply(osu.Game.Rulesets.Objects.HitObject)"/> or <see cref="Apply(osu.Game.Rulesets.Objects.HitObjectLifetimeEntry)"/>.</remarks>
+        [Obsolete("Use either overload of Apply that takes a single argument of type HitObject or HitObjectLifetimeEntry")]
         public void Apply([NotNull] HitObject hitObject, [CanBeNull] HitObjectLifetimeEntry lifetimeEntry)
         {
-            if (lifetimeEntry != null && lifetimeEntry.HitObject != hitObject)
-                throw new InvalidOperationException($"{nameof(HitObjectLifetimeEntry)} has different {nameof(HitObject)} from the specified one.");
-
             if (lifetimeEntry != null)
                 Apply(lifetimeEntry);
             else
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index d55005363c..17d3cf01a4 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -362,7 +362,7 @@ namespace osu.Game.Rulesets.UI
                     lifetimeEntryMap[hitObject] = entry = CreateLifetimeEntry(hitObject);
 
                 dho.ParentHitObject = parent;
-                dho.Apply(hitObject, entry);
+                dho.Apply(entry);
             });
         }
 

From 5c8f5624724095c7c98961cb9a857be778aee3c8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Apr 2021 14:37:28 +0900
Subject: [PATCH 2719/3722] Don't bail if the underlying localisation resourced
 is not embedded

---
 .../Localisation/ResourceManagerLocalisationStore.cs  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Localisation/ResourceManagerLocalisationStore.cs b/osu.Game/Localisation/ResourceManagerLocalisationStore.cs
index dd84eff55f..e0f110aba9 100644
--- a/osu.Game/Localisation/ResourceManagerLocalisationStore.cs
+++ b/osu.Game/Localisation/ResourceManagerLocalisationStore.cs
@@ -34,7 +34,16 @@ namespace osu.Game.Localisation
             if (!resourceManagers.TryGetValue(ns, out var manager))
                 resourceManagers[ns] = manager = new ResourceManager(ns, GetType().Assembly);
 
-            return manager.GetString(key, EffectiveCulture);
+            try
+            {
+                return manager.GetString(key, EffectiveCulture);
+            }
+            catch (MissingManifestResourceException)
+            {
+                // in the case the manifest is missing, it is likely that the user is adding code-first implementations of new localisation namespaces.
+                // it's fine to ignore this as localisation will fallback to default values.
+                return null;
+            }
         }
 
         public Task<string> GetAsync(string lookup)

From 31c8586dacb5b5234c61d8e83f5546937df903cd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Apr 2021 14:37:11 +0900
Subject: [PATCH 2720/3722] Add localisation support to overlay header
 title/description

---
 osu.Game/Localisation/ChatStrings.cs          | 24 +++++++++++++++++++
 osu.Game/Localisation/NotificationsStrings.cs | 24 +++++++++++++++++++
 osu.Game/Localisation/NowPlayingStrings.cs    | 24 +++++++++++++++++++
 osu.Game/Localisation/SettingsStrings.cs      | 24 +++++++++++++++++++
 osu.Game/Overlays/ChatOverlay.cs              |  6 +++--
 osu.Game/Overlays/FullscreenOverlay.cs        |  5 ++--
 osu.Game/Overlays/INamedOverlayComponent.cs   |  6 +++--
 osu.Game/Overlays/NotificationOverlay.cs      |  6 +++--
 osu.Game/Overlays/NowPlayingOverlay.cs        |  5 ++--
 osu.Game/Overlays/OverlayTitle.cs             |  7 +++---
 osu.Game/Overlays/Settings/SettingsHeader.cs  |  7 +++---
 osu.Game/Overlays/SettingsOverlay.cs          |  6 +++--
 12 files changed, 126 insertions(+), 18 deletions(-)
 create mode 100644 osu.Game/Localisation/ChatStrings.cs
 create mode 100644 osu.Game/Localisation/NotificationsStrings.cs
 create mode 100644 osu.Game/Localisation/NowPlayingStrings.cs
 create mode 100644 osu.Game/Localisation/SettingsStrings.cs

diff --git a/osu.Game/Localisation/ChatStrings.cs b/osu.Game/Localisation/ChatStrings.cs
new file mode 100644
index 0000000000..daddb602ad
--- /dev/null
+++ b/osu.Game/Localisation/ChatStrings.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;
+
+namespace osu.Game.Localisation
+{
+    public static class ChatStrings
+    {
+        private const string prefix = "osu.Game.Localisation.Chat";
+
+        /// <summary>
+        /// "chat"
+        /// </summary>
+        public static LocalisableString HeaderTitle => new TranslatableString(getKey("header_title"), "chat");
+
+        /// <summary>
+        /// "join the real-time discussion"
+        /// </summary>
+        public static LocalisableString HeaderDescription => new TranslatableString(getKey("header_description"), "join the real-time discussion");
+
+        private static string getKey(string key) => $"{prefix}:{key}";
+    }
+}
diff --git a/osu.Game/Localisation/NotificationsStrings.cs b/osu.Game/Localisation/NotificationsStrings.cs
new file mode 100644
index 0000000000..092eec3a6b
--- /dev/null
+++ b/osu.Game/Localisation/NotificationsStrings.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;
+
+namespace osu.Game.Localisation
+{
+    public static class NotificationsStrings
+    {
+        private const string prefix = "osu.Game.Localisation.Notifications";
+
+        /// <summary>
+        /// "notifications"
+        /// </summary>
+        public static LocalisableString HeaderTitle => new TranslatableString(getKey("header_title"), "notifications");
+
+        /// <summary>
+        /// "waiting for 'ya"
+        /// </summary>
+        public static LocalisableString HeaderDescription => new TranslatableString(getKey("header_description"), "waiting for 'ya");
+
+        private static string getKey(string key) => $"{prefix}:{key}";
+    }
+}
diff --git a/osu.Game/Localisation/NowPlayingStrings.cs b/osu.Game/Localisation/NowPlayingStrings.cs
new file mode 100644
index 0000000000..d742a56895
--- /dev/null
+++ b/osu.Game/Localisation/NowPlayingStrings.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;
+
+namespace osu.Game.Localisation
+{
+    public static class NowPlayingStrings
+    {
+        private const string prefix = "osu.Game.Localisation.NowPlaying";
+
+        /// <summary>
+        /// "now playing"
+        /// </summary>
+        public static LocalisableString HeaderTitle => new TranslatableString(getKey("header_title"), "now playing");
+
+        /// <summary>
+        /// "manage the currently playing track"
+        /// </summary>
+        public static LocalisableString HeaderDescription => new TranslatableString(getKey("header_description"), "manage the currently playing track");
+
+        private static string getKey(string key) => $"{prefix}:{key}";
+    }
+}
diff --git a/osu.Game/Localisation/SettingsStrings.cs b/osu.Game/Localisation/SettingsStrings.cs
new file mode 100644
index 0000000000..cfbd392691
--- /dev/null
+++ b/osu.Game/Localisation/SettingsStrings.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;
+
+namespace osu.Game.Localisation
+{
+    public static class SettingsStrings
+    {
+        private const string prefix = "osu.Game.Localisation.Settings";
+
+        /// <summary>
+        /// "settings"
+        /// </summary>
+        public static LocalisableString HeaderTitle => new TranslatableString(getKey("header_title"), "settings");
+
+        /// <summary>
+        /// "change the way osu! behaves"
+        /// </summary>
+        public static LocalisableString HeaderDescription => new TranslatableString(getKey("header_description"), "change the way osu! behaves");
+
+        private static string getKey(string key) => $"{prefix}:{key}";
+    }
+}
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 28f2287514..285041800a 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -24,6 +24,8 @@ using osu.Game.Overlays.Chat.Tabs;
 using osuTK.Input;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
+using osu.Framework.Localisation;
+using osu.Game.Localisation;
 using osu.Game.Online;
 
 namespace osu.Game.Overlays
@@ -31,8 +33,8 @@ namespace osu.Game.Overlays
     public class ChatOverlay : OsuFocusedOverlayContainer, INamedOverlayComponent
     {
         public string IconTexture => "Icons/Hexacons/messaging";
-        public string Title => "chat";
-        public string Description => "join the real-time discussion";
+        public LocalisableString Title => ChatStrings.HeaderTitle;
+        public LocalisableString Description => ChatStrings.HeaderDescription;
 
         private const float textbox_height = 60;
         private const float channel_selection_min_height = 0.3f;
diff --git a/osu.Game/Overlays/FullscreenOverlay.cs b/osu.Game/Overlays/FullscreenOverlay.cs
index 735f0bcbd4..58c41c4a4b 100644
--- a/osu.Game/Overlays/FullscreenOverlay.cs
+++ b/osu.Game/Overlays/FullscreenOverlay.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Localisation;
 using osu.Game.Graphics.Containers;
 using osu.Game.Online.API;
 using osuTK.Graphics;
@@ -18,8 +19,8 @@ namespace osu.Game.Overlays
         where T : OverlayHeader
     {
         public virtual string IconTexture => Header.Title.IconTexture ?? string.Empty;
-        public virtual string Title => Header.Title.Title ?? string.Empty;
-        public virtual string Description => Header.Title.Description ?? string.Empty;
+        public virtual LocalisableString Title => Header.Title.Title;
+        public virtual LocalisableString Description => Header.Title.Description;
 
         public T Header { get; }
 
diff --git a/osu.Game/Overlays/INamedOverlayComponent.cs b/osu.Game/Overlays/INamedOverlayComponent.cs
index 38fb8679a0..ca0aea041e 100644
--- a/osu.Game/Overlays/INamedOverlayComponent.cs
+++ b/osu.Game/Overlays/INamedOverlayComponent.cs
@@ -1,14 +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.Localisation;
+
 namespace osu.Game.Overlays
 {
     public interface INamedOverlayComponent
     {
         string IconTexture { get; }
 
-        string Title { get; }
+        LocalisableString Title { get; }
 
-        string Description { get; }
+        LocalisableString Description { get; }
     }
 }
diff --git a/osu.Game/Overlays/NotificationOverlay.cs b/osu.Game/Overlays/NotificationOverlay.cs
index d51d964fc4..b26e17b34c 100644
--- a/osu.Game/Overlays/NotificationOverlay.cs
+++ b/osu.Game/Overlays/NotificationOverlay.cs
@@ -11,16 +11,18 @@ using osu.Game.Graphics.Containers;
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Localisation;
 using osu.Framework.Threading;
 using osu.Game.Graphics;
+using osu.Game.Localisation;
 
 namespace osu.Game.Overlays
 {
     public class NotificationOverlay : OsuFocusedOverlayContainer, INamedOverlayComponent
     {
         public string IconTexture => "Icons/Hexacons/notification";
-        public string Title => "notifications";
-        public string Description => "waiting for 'ya";
+        public LocalisableString Title => NotificationsStrings.HeaderTitle;
+        public LocalisableString Description => NotificationsStrings.HeaderDescription;
 
         private const float width = 320;
 
diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 81bf71cdec..f88be91c01 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -19,6 +19,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.Overlays.Music;
 using osuTK;
 using osuTK.Graphics;
@@ -28,8 +29,8 @@ namespace osu.Game.Overlays
     public class NowPlayingOverlay : OsuFocusedOverlayContainer, INamedOverlayComponent
     {
         public string IconTexture => "Icons/Hexacons/music";
-        public string Title => "now playing";
-        public string Description => "manage the currently playing track";
+        public LocalisableString Title => NowPlayingStrings.HeaderTitle;
+        public LocalisableString Description => NowPlayingStrings.HeaderDescription;
 
         private const float player_height = 130;
         private const float transition_length = 800;
diff --git a/osu.Game/Overlays/OverlayTitle.cs b/osu.Game/Overlays/OverlayTitle.cs
index c3ea35adfc..d92979e8d4 100644
--- a/osu.Game/Overlays/OverlayTitle.cs
+++ b/osu.Game/Overlays/OverlayTitle.cs
@@ -6,6 +6,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
+using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osuTK;
@@ -19,15 +20,15 @@ namespace osu.Game.Overlays
         private readonly OsuSpriteText titleText;
         private readonly Container icon;
 
-        private string title;
+        private LocalisableString title;
 
-        public string Title
+        public LocalisableString Title
         {
             get => title;
             protected set => titleText.Text = title = value;
         }
 
-        public string Description { get; protected set; }
+        public LocalisableString Description { get; protected set; }
 
         private string iconTexture;
 
diff --git a/osu.Game/Overlays/Settings/SettingsHeader.cs b/osu.Game/Overlays/Settings/SettingsHeader.cs
index d8ec00bd99..a7f1cef74c 100644
--- a/osu.Game/Overlays/Settings/SettingsHeader.cs
+++ b/osu.Game/Overlays/Settings/SettingsHeader.cs
@@ -4,6 +4,7 @@
 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.Sprites;
 
@@ -11,10 +12,10 @@ namespace osu.Game.Overlays.Settings
 {
     public class SettingsHeader : Container
     {
-        private readonly string heading;
-        private readonly string subheading;
+        private readonly LocalisableString heading;
+        private readonly LocalisableString subheading;
 
-        public SettingsHeader(string heading, string subheading)
+        public SettingsHeader(LocalisableString heading, LocalisableString subheading)
         {
             this.heading = heading;
             this.subheading = subheading;
diff --git a/osu.Game/Overlays/SettingsOverlay.cs b/osu.Game/Overlays/SettingsOverlay.cs
index 7bd84dbc6c..8c21880cc6 100644
--- a/osu.Game/Overlays/SettingsOverlay.cs
+++ b/osu.Game/Overlays/SettingsOverlay.cs
@@ -10,14 +10,16 @@ using osuTK.Graphics;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Bindables;
+using osu.Framework.Localisation;
+using osu.Game.Localisation;
 
 namespace osu.Game.Overlays
 {
     public class SettingsOverlay : SettingsPanel, INamedOverlayComponent
     {
         public string IconTexture => "Icons/Hexacons/settings";
-        public string Title => "settings";
-        public string Description => "change the way osu! behaves";
+        public LocalisableString Title => SettingsStrings.HeaderTitle;
+        public LocalisableString Description => SettingsStrings.HeaderDescription;
 
         protected override IEnumerable<SettingsSection> CreateSections() => new SettingsSection[]
         {

From e536f1ad6d3bd1d00968eeddba4997ebda85218c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Apr 2021 14:39:36 +0900
Subject: [PATCH 2721/3722] Add simple locking of resourceManagers dictionary
 for thread safety

---
 .../ResourceManagerLocalisationStore.cs       | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Localisation/ResourceManagerLocalisationStore.cs b/osu.Game/Localisation/ResourceManagerLocalisationStore.cs
index e0f110aba9..7b21e1af42 100644
--- a/osu.Game/Localisation/ResourceManagerLocalisationStore.cs
+++ b/osu.Game/Localisation/ResourceManagerLocalisationStore.cs
@@ -31,18 +31,21 @@ namespace osu.Game.Localisation
             string ns = split[0];
             string key = split[1];
 
-            if (!resourceManagers.TryGetValue(ns, out var manager))
-                resourceManagers[ns] = manager = new ResourceManager(ns, GetType().Assembly);
+            lock (resourceManagers)
+            {
+                if (!resourceManagers.TryGetValue(ns, out var manager))
+                    resourceManagers[ns] = manager = new ResourceManager(ns, GetType().Assembly);
 
-            try
-            {
-                return manager.GetString(key, EffectiveCulture);
-            }
-            catch (MissingManifestResourceException)
-            {
-                // in the case the manifest is missing, it is likely that the user is adding code-first implementations of new localisation namespaces.
-                // it's fine to ignore this as localisation will fallback to default values.
-                return null;
+                try
+                {
+                    return manager.GetString(key, EffectiveCulture);
+                }
+                catch (MissingManifestResourceException)
+                {
+                    // in the case the manifest is missing, it is likely that the user is adding code-first implementations of new localisation namespaces.
+                    // it's fine to ignore this as localisation will fallback to default values.
+                    return null;
+                }
             }
         }
 

From e90d791754776b5b5c51d42083145a665b9912c6 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 21 Apr 2021 09:14:19 +0300
Subject: [PATCH 2722/3722] Add base "classic" mod

---
 osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs | 17 +--------------
 osu.Game/Rulesets/Mods/ModClassic.cs        | 24 +++++++++++++++++++++
 2 files changed, 25 insertions(+), 16 deletions(-)
 create mode 100644 osu.Game/Rulesets/Mods/ModClassic.cs

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
index 882f848190..77dea5b0dc 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModClassic.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
@@ -16,22 +15,8 @@ using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    public class OsuModClassic : Mod, IApplicableToHitObject, IApplicableToDrawableHitObjects, IApplicableToDrawableRuleset<OsuHitObject>
+    public class OsuModClassic : ModClassic, IApplicableToHitObject, IApplicableToDrawableHitObjects, IApplicableToDrawableRuleset<OsuHitObject>
     {
-        public override string Name => "Classic";
-
-        public override string Acronym => "CL";
-
-        public override double ScoreMultiplier => 1;
-
-        public override IconUsage? Icon => FontAwesome.Solid.History;
-
-        public override string Description => "Feeling nostalgic?";
-
-        public override bool Ranked => false;
-
-        public override ModType Type => ModType.Conversion;
-
         [SettingSource("No slider head accuracy requirement", "Scores sliders proportionally to the number of ticks hit.")]
         public Bindable<bool> NoSliderHeadAccuracy { get; } = new BindableBool(true);
 
diff --git a/osu.Game/Rulesets/Mods/ModClassic.cs b/osu.Game/Rulesets/Mods/ModClassic.cs
new file mode 100644
index 0000000000..f1207ec188
--- /dev/null
+++ b/osu.Game/Rulesets/Mods/ModClassic.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.Graphics.Sprites;
+
+namespace osu.Game.Rulesets.Mods
+{
+    public abstract class ModClassic : Mod
+    {
+        public override string Name => "Classic";
+
+        public override string Acronym => "CL";
+
+        public override double ScoreMultiplier => 1;
+
+        public override IconUsage? Icon => FontAwesome.Solid.History;
+
+        public override string Description => "Feeling nostalgic?";
+
+        public override bool Ranked => false;
+
+        public override ModType Type => ModType.Conversion;
+    }
+}

From e3398d8f1fdfbbc57b6a3ae38e4ec9648f8505f6 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 21 Apr 2021 09:14:31 +0300
Subject: [PATCH 2723/3722] Implement "classic" mod for all other legacy
 rulesets

Currently empty, automatically handled in game to not be selectable (see `Mod.HasImplementation`)
---
 osu.Game.Rulesets.Catch/CatchRuleset.cs         |  1 +
 osu.Game.Rulesets.Catch/Mods/CatchModClassic.cs | 11 +++++++++++
 osu.Game.Rulesets.Mania/ManiaRuleset.cs         |  1 +
 osu.Game.Rulesets.Mania/Mods/ManiaModClassic.cs | 11 +++++++++++
 osu.Game.Rulesets.Taiko/Mods/TaikoModClassic.cs | 11 +++++++++++
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs         |  1 +
 6 files changed, 36 insertions(+)
 create mode 100644 osu.Game.Rulesets.Catch/Mods/CatchModClassic.cs
 create mode 100644 osu.Game.Rulesets.Mania/Mods/ManiaModClassic.cs
 create mode 100644 osu.Game.Rulesets.Taiko/Mods/TaikoModClassic.cs

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index f4ddbd3021..ab877c21c1 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -114,6 +114,7 @@ namespace osu.Game.Rulesets.Catch
                     return new Mod[]
                     {
                         new CatchModDifficultyAdjust(),
+                        new CatchModClassic(),
                     };
 
                 case ModType.Automation:
diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModClassic.cs b/osu.Game.Rulesets.Catch/Mods/CatchModClassic.cs
new file mode 100644
index 0000000000..9624e84018
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModClassic.cs
@@ -0,0 +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.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Catch.Mods
+{
+    public class CatchModClassic : ModClassic
+    {
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index 88b63606b9..b3889bc7d3 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -239,6 +239,7 @@ namespace osu.Game.Rulesets.Mania
                         new ManiaModDualStages(),
                         new ManiaModMirror(),
                         new ManiaModDifficultyAdjust(),
+                        new ManiaModClassic(),
                         new ManiaModInvert(),
                         new ManiaModConstantSpeed()
                     };
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModClassic.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModClassic.cs
new file mode 100644
index 0000000000..073dda9de8
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModClassic.cs
@@ -0,0 +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.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public class ManiaModClassic : ModClassic
+    {
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModClassic.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModClassic.cs
new file mode 100644
index 0000000000..5a4d18be98
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModClassic.cs
@@ -0,0 +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.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Taiko.Mods
+{
+    public class TaikoModClassic : ModClassic
+    {
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 56f58f404b..f4e158ec32 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -135,6 +135,7 @@ namespace osu.Game.Rulesets.Taiko
                     {
                         new TaikoModRandom(),
                         new TaikoModDifficultyAdjust(),
+                        new TaikoModClassic(),
                     };
 
                 case ModType.Automation:

From 1a715b2926de6c3a9e3322474c4fe1f20ec11a5e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 21 Apr 2021 09:16:28 +0300
Subject: [PATCH 2724/3722] Append "classic" mod to legacy scores

---
 osu.Game/Scoring/ScoreInfo.cs | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 222f69b025..bf131658ea 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -65,14 +65,19 @@ namespace osu.Game.Scoring
         {
             get
             {
-                if (mods != null)
-                    return mods;
-
-                if (localAPIMods == null)
-                    return Array.Empty<Mod>();
+                Mod[] scoreMods = Array.Empty<Mod>();
 
                 var rulesetInstance = Ruleset.CreateInstance();
-                return apiMods.Select(m => m.ToMod(rulesetInstance)).ToArray();
+
+                if (mods != null)
+                    scoreMods = mods;
+                else if (localAPIMods != null)
+                    scoreMods = apiMods.Select(m => m.ToMod(rulesetInstance)).ToArray();
+
+                if (IsLegacyScore)
+                    scoreMods = scoreMods.Append(rulesetInstance.GetAllMods().OfType<ModClassic>().Single()).ToArray();
+
+                return scoreMods;
             }
             set
             {

From eb20865c02898b77c2ad583e80c5108ae662d177 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Apr 2021 15:55:13 +0900
Subject: [PATCH 2725/3722] Show tablet preview with physical tablet
 counter-rotated for supplied user area selection

Closes https://github.com/ppy/osu/issues/12399.

Rotation animation is intentionally delayed slightly to give a better sense of what is going on (or maybe just look cool).
---
 .../Settings/Sections/Input/TabletAreaSelection.cs         | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
index f61742093c..b670e3558c 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
@@ -129,6 +129,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             rotation.BindTo(handler.Rotation);
             rotation.BindValueChanged(val =>
             {
+                tabletContainer.RotateTo(-val.NewValue, 800, Easing.OutQuint);
                 usableAreaContainer.RotateTo(val.NewValue, 100, Easing.OutQuint)
                                    .OnComplete(_ => checkBounds()); // required as we are using SSDQ.
             });
@@ -183,8 +184,10 @@ namespace osu.Game.Overlays.Settings.Sections.Input
             if (!(tablet.Value?.Size is Vector2 size))
                 return;
 
-            float fitX = size.X / (DrawWidth - Padding.Left - Padding.Right);
-            float fitY = size.Y / DrawHeight;
+            float maxDimension = size.LengthFast;
+
+            float fitX = maxDimension / (DrawWidth - Padding.Left - Padding.Right);
+            float fitY = maxDimension / DrawHeight;
 
             float adjust = MathF.Max(fitX, fitY);
 

From ab2a8b5c898b2f212c670ee6a3f9dd89e8fd1b53 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Apr 2021 16:12:09 +0900
Subject: [PATCH 2726/3722] Fix initial rotation not being set

---
 .../Overlays/Settings/Sections/Input/TabletAreaSelection.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
index b670e3558c..412889d210 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/TabletAreaSelection.cs
@@ -132,7 +132,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 tabletContainer.RotateTo(-val.NewValue, 800, Easing.OutQuint);
                 usableAreaContainer.RotateTo(val.NewValue, 100, Easing.OutQuint)
                                    .OnComplete(_ => checkBounds()); // required as we are using SSDQ.
-            });
+            }, true);
 
             tablet.BindTo(handler.Tablet);
             tablet.BindValueChanged(_ => Scheduler.AddOnce(updateTabletDetails));

From fb848f7544435470f330aec600b2fc14e5313936 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 21 Apr 2021 16:33:14 +0900
Subject: [PATCH 2727/3722] Rename to MasterGameplayClock

---
 .../Screens/Play/MasterGameplayClockContainer.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index affe24069d..fcbc6fae15 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Screens.Play
 
         private FramedOffsetClock userOffsetClock;
         private FramedOffsetClock platformOffsetClock;
-        private LocalGameplayClock localGameplayClock;
+        private MasterGameplayClock masterGameplayClock;
         private Bindable<double> userAudioOffset;
         private double startOffset;
 
@@ -157,7 +157,7 @@ namespace osu.Game.Screens.Play
             // the final usable gameplay clock with user-set offsets applied.
             userOffsetClock = new HardwareCorrectionOffsetClock(platformOffsetClock);
 
-            return localGameplayClock = new LocalGameplayClock(userOffsetClock);
+            return masterGameplayClock = new MasterGameplayClock(userOffsetClock);
         }
 
         /// <summary>
@@ -180,8 +180,8 @@ namespace osu.Game.Screens.Play
             Track.AddAdjustment(AdjustableProperty.Frequency, pauseFreqAdjust);
             Track.AddAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
 
-            localGameplayClock.MutableNonGameplayAdjustments.Add(pauseFreqAdjust);
-            localGameplayClock.MutableNonGameplayAdjustments.Add(UserPlaybackRate);
+            masterGameplayClock.MutableNonGameplayAdjustments.Add(pauseFreqAdjust);
+            masterGameplayClock.MutableNonGameplayAdjustments.Add(UserPlaybackRate);
 
             speedAdjustmentsApplied = true;
         }
@@ -194,8 +194,8 @@ namespace osu.Game.Screens.Play
             Track.RemoveAdjustment(AdjustableProperty.Frequency, pauseFreqAdjust);
             Track.RemoveAdjustment(AdjustableProperty.Tempo, UserPlaybackRate);
 
-            localGameplayClock.MutableNonGameplayAdjustments.Remove(pauseFreqAdjust);
-            localGameplayClock.MutableNonGameplayAdjustments.Remove(UserPlaybackRate);
+            masterGameplayClock.MutableNonGameplayAdjustments.Remove(pauseFreqAdjust);
+            masterGameplayClock.MutableNonGameplayAdjustments.Remove(UserPlaybackRate);
 
             speedAdjustmentsApplied = false;
         }
@@ -218,13 +218,13 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        private class LocalGameplayClock : GameplayClock
+        private class MasterGameplayClock : GameplayClock
         {
             public readonly List<Bindable<double>> MutableNonGameplayAdjustments = new List<Bindable<double>>();
 
             public override IEnumerable<Bindable<double>> NonGameplayAdjustments => MutableNonGameplayAdjustments;
 
-            public LocalGameplayClock(FramedOffsetClock underlyingClock)
+            public MasterGameplayClock(FramedOffsetClock underlyingClock)
                 : base(underlyingClock)
             {
             }

From f32d00c0d99ecccdbf1452c210f0a75769932298 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 21 Apr 2021 17:13:01 +0900
Subject: [PATCH 2728/3722] Fix post-merge errors

---
 .../OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs | 2 +-
 osu.Game/Screens/Play/GameplayClockContainer.cs             | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index 23cc787e20..a5bd449e7e 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             base.LoadComplete();
 
             masterClockContainer.Stop();
-            masterClockContainer.Restart();
+            masterClockContainer.Reset();
         }
 
         protected override void OnUserStateChanged(int userId, SpectatorState spectatorState)
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index dac3dad5d2..4109fd32bc 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -154,11 +154,7 @@ namespace osu.Game.Screens.Play
             return true;
         }
 
-        void IAdjustableClock.Reset()
-        {
-            Restart();
-            Stop();
-        }
+        void IAdjustableClock.Reset() => Reset();
 
         public void ResetSpeedAdjustments()
         {

From deeb9e3765294cdaa656a664b1eee0f31a73f8f2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Apr 2021 17:27:00 +0900
Subject: [PATCH 2729/3722] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index ed2b27e1c7..3324af7c51 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.419.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.421.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 509cb3ddad..fcd1ed6987 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.419.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.421.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 4b67bd78a1..34810a3106 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.419.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.421.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.419.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.421.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From bbf2ec369b748dcb424f370178ec5402a5c46493 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 20 Apr 2021 17:13:59 +0900
Subject: [PATCH 2730/3722] Remove SkinReloadableDrawable inheritance from DHO

---
 .../Objects/Drawables/DrawableHitObject.cs    | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index ba2b8423d0..1369623a62 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -11,6 +11,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Pooling;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Threading;
 using osu.Game.Audio;
@@ -25,7 +26,7 @@ using osuTK.Graphics;
 namespace osu.Game.Rulesets.Objects.Drawables
 {
     [Cached(typeof(DrawableHitObject))]
-    public abstract class DrawableHitObject : SkinReloadableDrawable
+    public abstract class DrawableHitObject : PoolableDrawable
     {
         /// <summary>
         /// Invoked after this <see cref="DrawableHitObject"/>'s applied <see cref="HitObject"/> has had its defaults applied.
@@ -178,12 +179,15 @@ namespace osu.Game.Rulesets.Objects.Drawables
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
+        private void load(OsuConfigManager config, ISkinSource skinSource)
         {
             config.BindWith(OsuSetting.PositionalHitSounds, userPositionalHitSounds);
 
             // Explicit non-virtual function call.
             base.AddInternal(Samples = new PausableSkinnableSound());
+
+            CurrentSkin = skinSource;
+            CurrentSkin.SourceChanged += onSkinSourceChanged;
         }
 
         protected override void LoadAsyncComplete()
@@ -536,17 +540,19 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         #endregion
 
-        protected sealed override void SkinChanged(ISkinSource skin, bool allowFallback)
-        {
-            base.SkinChanged(skin, allowFallback);
+        #region Skinning
 
+        protected ISkinSource CurrentSkin { get; private set; }
+
+        private void onSkinSourceChanged() => Scheduler.AddOnce(() =>
+        {
             UpdateComboColour();
 
-            ApplySkin(skin, allowFallback);
+            ApplySkin(CurrentSkin, true);
 
             if (IsLoaded)
                 updateState(State.Value, true);
-        }
+        });
 
         protected void UpdateComboColour()
         {
@@ -616,6 +622,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
                 Samples.Stop();
         }
 
+        #endregion
+
         protected override void Update()
         {
             base.Update();
@@ -811,6 +819,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
             if (HitObject != null)
                 HitObject.DefaultsApplied -= onDefaultsApplied;
+
+            CurrentSkin.SourceChanged -= onSkinSourceChanged;
         }
     }
 

From b877a2973739c4cb8a32393bbb021392f536be82 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 20 Apr 2021 17:55:01 +0900
Subject: [PATCH 2731/3722] Factor out pooling and lifetime management logic of
 DHO to a base class

---
 .../Objects/Drawables/DrawableHitObject.cs    | 116 +++--------------
 .../Objects/Pooling/DrawableObject.cs         | 121 ++++++++++++++++++
 2 files changed, 141 insertions(+), 96 deletions(-)
 create mode 100644 osu.Game/Rulesets/Objects/Pooling/DrawableObject.cs

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 1369623a62..312ed93e45 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -11,7 +11,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Pooling;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Threading;
 using osu.Game.Audio;
@@ -20,13 +19,14 @@ using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 using osu.Game.Configuration;
+using osu.Game.Rulesets.Objects.Pooling;
 using osu.Game.Rulesets.UI;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Objects.Drawables
 {
     [Cached(typeof(DrawableHitObject))]
-    public abstract class DrawableHitObject : PoolableDrawable
+    public abstract class DrawableHitObject : DrawableObject<HitObjectLifetimeEntry>
     {
         /// <summary>
         /// Invoked after this <see cref="DrawableHitObject"/>'s applied <see cref="HitObject"/> has had its defaults applied.
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// <summary>
         /// The <see cref="HitObject"/> currently represented by this <see cref="DrawableHitObject"/>.
         /// </summary>
-        public HitObject HitObject => lifetimeEntry?.HitObject;
+        public HitObject HitObject => Entry?.HitObject;
 
         /// <summary>
         /// The parenting <see cref="DrawableHitObject"/>, if any.
@@ -110,7 +110,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// <summary>
         /// The scoring result of this <see cref="DrawableHitObject"/>.
         /// </summary>
-        public JudgementResult Result => lifetimeEntry?.Result;
+        public JudgementResult Result => Entry?.Result;
 
         /// <summary>
         /// The relative X position of this hit object for sample playback balance adjustment.
@@ -126,8 +126,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
         private readonly Bindable<bool> userPositionalHitSounds = new Bindable<bool>();
         private readonly Bindable<int> comboIndexBindable = new Bindable<int>();
 
-        public override bool RemoveWhenNotAlive => false;
-        public override bool RemoveCompletedTransforms => false;
         protected override bool RequiresChildrenUpdate => true;
 
         public override bool IsPresent => base.IsPresent || (State.Value == ArmedState.Idle && Clock?.CurrentTime >= LifetimeStart);
@@ -142,18 +140,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </remarks>
         public IBindable<ArmedState> State => state;
 
-        /// <summary>
-        /// Whether a <see cref="HitObjectLifetimeEntry"/> is currently applied.
-        /// </summary>
-        private bool hasEntryApplied;
-
-        /// <summary>
-        /// The <see cref="HitObjectLifetimeEntry"/> controlling the lifetime of the currently-attached <see cref="HitObject"/>.
-        /// </summary>
-        /// <remarks>Even if it is not null, it may not be fully applied until loaded (<see cref="hasEntryApplied"/> is false).</remarks>
-        [CanBeNull]
-        private HitObjectLifetimeEntry lifetimeEntry;
-
         [Resolved(CanBeNull = true)]
         private IPooledHitObjectProvider pooledObjectProvider { get; set; }
 
@@ -167,15 +153,13 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </summary>
         /// <param name="initialHitObject">
         /// The <see cref="HitObject"/> to be initially applied to this <see cref="DrawableHitObject"/>.
-        /// If <c>null</c>, a hitobject is expected to be later applied via <see cref="Apply(osu.Game.Rulesets.Objects.HitObjectLifetimeEntry)"/> (or automatically via pooling).
+        /// If <c>null</c>, a hitobject is expected to be later applied via <see cref="DrawableObject{TEntry}.Apply"/> (or automatically via pooling).
         /// </param>
         protected DrawableHitObject([CanBeNull] HitObject initialHitObject = null)
+            : base(initialHitObject != null ? new SyntheticHitObjectEntry(initialHitObject) : null)
         {
-            if (initialHitObject != null)
-            {
-                lifetimeEntry = new SyntheticHitObjectEntry(initialHitObject);
+            if (Entry != null)
                 ensureEntryHasResult();
-            }
         }
 
         [BackgroundDependencyLoader]
@@ -190,14 +174,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
             CurrentSkin.SourceChanged += onSkinSourceChanged;
         }
 
-        protected override void LoadAsyncComplete()
-        {
-            base.LoadAsyncComplete();
-
-            if (lifetimeEntry != null && !hasEntryApplied)
-                Apply(lifetimeEntry);
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -231,22 +207,15 @@ namespace osu.Game.Rulesets.Objects.Drawables
             Apply(new SyntheticHitObjectEntry(hitObject));
         }
 
-        /// <summary>
-        /// Applies a new <see cref="HitObjectLifetimeEntry"/> to be represented by this <see cref="DrawableHitObject"/>.
-        /// </summary>
-        public void Apply([NotNull] HitObjectLifetimeEntry newEntry)
+        protected sealed override void OnApply(HitObjectLifetimeEntry entry)
         {
-            free();
-
-            lifetimeEntry = newEntry;
-
             // LifetimeStart is already computed using HitObjectLifetimeEntry's InitialLifetimeOffset.
             // We override this with DHO's InitialLifetimeOffset for a non-pooled DHO.
-            if (newEntry is SyntheticHitObjectEntry)
-                lifetimeEntry.LifetimeStart = HitObject.StartTime - InitialLifetimeOffset;
+            if (entry is SyntheticHitObjectEntry)
+                entry.LifetimeStart = HitObject.StartTime - InitialLifetimeOffset;
 
-            LifetimeStart = lifetimeEntry.LifetimeStart;
-            LifetimeEnd = lifetimeEntry.LifetimeEnd;
+            LifetimeStart = entry.LifetimeStart;
+            LifetimeEnd = entry.LifetimeEnd;
 
             ensureEntryHasResult();
 
@@ -297,17 +266,10 @@ namespace osu.Game.Rulesets.Objects.Drawables
                 else
                     updateState(ArmedState.Idle, true);
             }
-
-            hasEntryApplied = true;
         }
 
-        /// <summary>
-        /// Removes the currently applied <see cref="lifetimeEntry"/>
-        /// </summary>
-        private void free()
+        protected sealed override void OnFree(HitObjectLifetimeEntry entry)
         {
-            if (!hasEntryApplied) return;
-
             StartTimeBindable.UnbindFrom(HitObject.StartTimeBindable);
             if (HitObject is IHasComboInformation combo)
                 comboIndexBindable.UnbindFrom(combo.ComboIndexBindable);
@@ -339,22 +301,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
             OnFree();
 
             ParentHitObject = null;
-            lifetimeEntry = null;
 
             clearExistingStateTransforms();
-
-            hasEntryApplied = false;
-        }
-
-        protected sealed override void FreeAfterUse()
-        {
-            base.FreeAfterUse();
-
-            // Freeing while not in a pool would cause the DHO to not be usable elsewhere in the hierarchy without being re-applied.
-            if (!IsInPool)
-                return;
-
-            free();
         }
 
         /// <summary>
@@ -402,8 +350,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         private void onDefaultsApplied(HitObject hitObject)
         {
-            Debug.Assert(lifetimeEntry != null);
-            Apply(lifetimeEntry);
+            Debug.Assert(Entry != null);
+            Apply(Entry);
 
             DefaultsApplied?.Invoke(this);
         }
@@ -486,7 +434,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         /// <summary>
         /// Apply (generally fade-in) transforms leading into the <see cref="HitObject"/> start time.
-        /// The local drawable hierarchy is recursively delayed to <see cref="LifetimeStart"/> for convenience.
+        /// The local drawable hierarchy is recursively delayed to <see cref="HitObjectLifetimeEntry.LifetimeStart"/> for convenience.
         ///
         /// By default this will fade in the object from zero with no duration.
         /// </summary>
@@ -661,30 +609,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </remarks>
         protected internal new ScheduledDelegate Schedule(Action action) => base.Schedule(action);
 
-        public override double LifetimeStart
-        {
-            get => base.LifetimeStart;
-            set => setLifetime(value, LifetimeEnd);
-        }
-
-        public override double LifetimeEnd
-        {
-            get => base.LifetimeEnd;
-            set => setLifetime(LifetimeStart, value);
-        }
-
-        private void setLifetime(double lifetimeStart, double lifetimeEnd)
-        {
-            base.LifetimeStart = lifetimeStart;
-            base.LifetimeEnd = lifetimeEnd;
-
-            if (lifetimeEntry != null)
-            {
-                lifetimeEntry.LifetimeStart = lifetimeStart;
-                lifetimeEntry.LifetimeEnd = lifetimeEnd;
-            }
-        }
-
         /// <summary>
         /// A safe offset prior to the start time of <see cref="HitObject"/> at which this <see cref="DrawableHitObject"/> may begin displaying contents.
         /// By default, <see cref="DrawableHitObject"/>s are assumed to display their contents within 10 seconds prior to the start time of <see cref="HitObject"/>.
@@ -692,7 +616,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// <remarks>
         /// This is only used as an optimisation to delay the initial update of this <see cref="DrawableHitObject"/> and may be tuned more aggressively if required.
         /// It is indirectly used to decide the automatic transform offset provided to <see cref="UpdateInitialTransforms"/>.
-        /// A more accurate <see cref="LifetimeStart"/> should be set for further optimisation (in <see cref="LoadComplete"/>, for example).
+        /// A more accurate <see cref="HitObjectLifetimeEntry.LifetimeStart"/> should be set for further optimisation (in <see cref="LoadComplete"/>, for example).
         /// <para>
         /// Only has an effect if this <see cref="DrawableHitObject"/> is not being pooled.
         /// For pooled <see cref="DrawableHitObject"/>s, use <see cref="HitObjectLifetimeEntry.InitialLifetimeOffset"/> instead.
@@ -808,9 +732,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         private void ensureEntryHasResult()
         {
-            Debug.Assert(lifetimeEntry != null);
-            lifetimeEntry.Result ??= CreateResult(HitObject.CreateJudgement())
-                                     ?? throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");
+            Debug.Assert(Entry != null);
+            Entry.Result ??= CreateResult(HitObject.CreateJudgement())
+                             ?? throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Rulesets/Objects/Pooling/DrawableObject.cs b/osu.Game/Rulesets/Objects/Pooling/DrawableObject.cs
new file mode 100644
index 0000000000..b29e6a6c3c
--- /dev/null
+++ b/osu.Game/Rulesets/Objects/Pooling/DrawableObject.cs
@@ -0,0 +1,121 @@
+// Copyright (c) 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
+
+using System.Diagnostics;
+using osu.Framework.Graphics.Performance;
+using osu.Framework.Graphics.Pooling;
+
+namespace osu.Game.Rulesets.Objects.Pooling
+{
+    /// <summary>
+    /// A <see cref="PoolableDrawable"/> that is controlled by <see cref="Entry"/> to implement drawable pooling and replay rewinding.
+    /// </summary>
+    /// <typeparam name="TEntry">The <see cref="LifetimeEntry"/> type storing state and controlling this drawable.</typeparam>
+    public abstract class DrawableObject<TEntry> : PoolableDrawable where TEntry : LifetimeEntry
+    {
+        /// <summary>
+        /// The entry holding essential state of this <see cref="DrawableObject{TEntry}"/>.
+        /// </summary>
+        protected TEntry? Entry { get; private set; }
+
+        /// <summary>
+        /// Whether <see cref="Entry"/> is applied to this <see cref="DrawableObject{TEntry}"/>.
+        /// When an initial entry is specified in the constructor, <see cref="Entry"/> is set but not applied until loading is completed.
+        /// </summary>
+        protected bool HasEntryApplied { get; private set; }
+
+        public override double LifetimeStart
+        {
+            get => base.LifetimeStart;
+            set => setLifetime(value, LifetimeEnd);
+        }
+
+        public override double LifetimeEnd
+        {
+            get => base.LifetimeEnd;
+            set => setLifetime(LifetimeStart, value);
+        }
+
+        public override bool RemoveWhenNotAlive => false;
+        public override bool RemoveCompletedTransforms => false;
+
+        protected DrawableObject(TEntry? initialEntry = null)
+        {
+            Entry = initialEntry;
+        }
+
+        protected override void LoadAsyncComplete()
+        {
+            base.LoadAsyncComplete();
+
+            if (Entry != null && !HasEntryApplied)
+                Apply(Entry);
+        }
+
+        /// <summary>
+        /// Applies a new entry to be represented by this drawable.
+        /// If there is an existing entry applied, the entry will be replaced.
+        /// </summary>
+        public void Apply(TEntry entry)
+        {
+            freeIfInUse();
+
+            setLifetime(entry.LifetimeStart, entry.LifetimeEnd);
+            Entry = entry;
+
+            OnApply(entry);
+
+            HasEntryApplied = true;
+        }
+
+        protected sealed override void FreeAfterUse()
+        {
+            base.FreeAfterUse();
+
+            if (IsInPool)
+                freeIfInUse();
+        }
+
+        /// <summary>
+        /// Invoked to apply a new entry to this drawable.
+        /// </summary>
+        protected virtual void OnApply(TEntry entry)
+        {
+        }
+
+        /// <summary>
+        /// Invoked to revert application of the entry to this drawable.
+        /// </summary>
+        protected virtual void OnFree(TEntry entry)
+        {
+        }
+
+        private void setLifetime(double start, double end)
+        {
+            base.LifetimeStart = start;
+            base.LifetimeEnd = end;
+
+            if (Entry != null)
+            {
+                Entry.LifetimeStart = start;
+                Entry.LifetimeEnd = end;
+            }
+        }
+
+        private void freeIfInUse()
+        {
+            if (!HasEntryApplied) return;
+
+            Debug.Assert(Entry != null);
+
+            OnFree(Entry);
+
+            Entry = null;
+            setLifetime(double.MaxValue, double.MaxValue);
+
+            HasEntryApplied = false;
+        }
+    }
+}

From c6c91cd9a5ce76554b277b0e7520e0aeb4312cef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Apr 2021 18:05:26 +0900
Subject: [PATCH 2732/3722] Refactor `WaveformOpacityMenuItem` to not receive
 whole config

---
 osu.Game/Screens/Edit/Editor.cs                            | 2 +-
 .../{WaveformOpacityMenu.cs => WaveformOpacityMenuItem.cs} | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)
 rename osu.Game/Screens/Edit/{WaveformOpacityMenu.cs => WaveformOpacityMenuItem.cs} (85%)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index fffea65456..360fbb36db 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -226,7 +226,7 @@ namespace osu.Game.Screens.Edit
                                 {
                                     Items = new[]
                                     {
-                                        new WaveformOpacityMenu(config)
+                                        new WaveformOpacityMenuItem(config.GetBindable<float>(OsuSetting.EditorWaveformOpacity)),
                                     }
                                 }
                             }
diff --git a/osu.Game/Screens/Edit/WaveformOpacityMenu.cs b/osu.Game/Screens/Edit/WaveformOpacityMenuItem.cs
similarity index 85%
rename from osu.Game/Screens/Edit/WaveformOpacityMenu.cs
rename to osu.Game/Screens/Edit/WaveformOpacityMenuItem.cs
index 5d209ae141..053c2fa4b0 100644
--- a/osu.Game/Screens/Edit/WaveformOpacityMenu.cs
+++ b/osu.Game/Screens/Edit/WaveformOpacityMenuItem.cs
@@ -4,18 +4,17 @@
 using System.Collections.Generic;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.UserInterface;
-using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Screens.Edit
 {
-    internal class WaveformOpacityMenu : MenuItem
+    internal class WaveformOpacityMenuItem : MenuItem
     {
         private readonly Bindable<float> waveformOpacity;
 
         private readonly Dictionary<float, ToggleMenuItem> menuItemLookup = new Dictionary<float, ToggleMenuItem>();
 
-        public WaveformOpacityMenu(OsuConfigManager config)
+        public WaveformOpacityMenuItem(Bindable<float> waveformOpacity)
             : base("Waveform opacity")
         {
             Items = new[]
@@ -26,7 +25,7 @@ namespace osu.Game.Screens.Edit
                 createMenuItem(1f),
             };
 
-            waveformOpacity = config.GetBindable<float>(OsuSetting.EditorWaveformOpacity);
+            this.waveformOpacity = waveformOpacity;
             waveformOpacity.BindValueChanged(opacity =>
             {
                 foreach (var kvp in menuItemLookup)

From 9d8f0c854d1bce0763c1e7e4113321a8e0646944 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Apr 2021 18:05:40 +0900
Subject: [PATCH 2733/3722] Setup configuration item for editor hit animations

---
 osu.Game/Configuration/OsuConfigManager.cs    |  2 ++
 osu.Game/Screens/Edit/Editor.cs               |  3 ++-
 .../Screens/Edit/HitAnimationsMenuItem.cs     | 21 +++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Screens/Edit/HitAnimationsMenuItem.cs

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index f9b1c9618b..09412b1f1b 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -143,6 +143,7 @@ namespace osu.Game.Configuration
             SetDefault(OsuSetting.DiscordRichPresence, DiscordRichPresenceMode.Full);
 
             SetDefault(OsuSetting.EditorWaveformOpacity, 0.25f);
+            SetDefault(OsuSetting.EditorHitAnimations, false);
         }
 
         public OsuConfigManager(Storage storage)
@@ -266,6 +267,7 @@ namespace osu.Game.Configuration
         GameplayDisableWinKey,
         SeasonalBackgroundMode,
         EditorWaveformOpacity,
+        EditorHitAnimations,
         DiscordRichPresence,
         AutomaticallyDownloadWhenSpectating,
         ShowOnlineExplicitContent,
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 360fbb36db..da0e9ebbaf 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -224,9 +224,10 @@ namespace osu.Game.Screens.Edit
                                 },
                                 new MenuItem("View")
                                 {
-                                    Items = new[]
+                                    Items = new MenuItem[]
                                     {
                                         new WaveformOpacityMenuItem(config.GetBindable<float>(OsuSetting.EditorWaveformOpacity)),
+                                        new HitAnimationsMenuItem(config.GetBindable<bool>(OsuSetting.EditorHitAnimations))
                                     }
                                 }
                             }
diff --git a/osu.Game/Screens/Edit/HitAnimationsMenuItem.cs b/osu.Game/Screens/Edit/HitAnimationsMenuItem.cs
new file mode 100644
index 0000000000..fb7ab39f7a
--- /dev/null
+++ b/osu.Game/Screens/Edit/HitAnimationsMenuItem.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 JetBrains.Annotations;
+using osu.Framework.Bindables;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Screens.Edit
+{
+    internal class HitAnimationsMenuItem : ToggleMenuItem
+    {
+        [UsedImplicitly]
+        private readonly Bindable<bool> hitAnimations;
+
+        public HitAnimationsMenuItem(Bindable<bool> hitAnimations)
+            : base("Hit animations")
+        {
+            State.BindTo(this.hitAnimations = hitAnimations);
+        }
+    }
+}

From 47a4a07024b6557d475b92f1356ee15c0828376c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Apr 2021 19:15:10 +0900
Subject: [PATCH 2734/3722] Split out animation triggering of `MainCirclePiece`
 to be interface driven

---
 .../Objects/Drawables/DrawableHitCircle.cs      |  2 ++
 .../Skinning/Default/IMainCirclePiece.cs        | 17 +++++++++++++++++
 .../Skinning/Default/MainCirclePiece.cs         |  7 ++-----
 .../Skinning/Legacy/LegacyMainCirclePiece.cs    |  8 +++-----
 4 files changed, 24 insertions(+), 10 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/Skinning/Default/IMainCirclePiece.cs

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index df77ec2693..fb6c110b3c 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -182,6 +182,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             // todo: temporary / arbitrary, used for lifetime optimisation.
             this.Delay(800).FadeOut();
 
+            (CirclePiece.Drawable as IMainCirclePiece)?.Animate(state);
+
             switch (state)
             {
                 case ArmedState.Idle:
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/IMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/IMainCirclePiece.cs
new file mode 100644
index 0000000000..17a1e29094
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/IMainCirclePiece.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Osu.Skinning.Default
+{
+    public interface IMainCirclePiece
+    {
+        /// <summary>
+        /// Begins animating this <see cref="IMainCirclePiece"/>.
+        /// </summary>
+        /// <param name="state">The <see cref="ArmedState"/> of the related <see cref="DrawableHitCircle"/>.</param>
+        void Animate(ArmedState state);
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/MainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/MainCirclePiece.cs
index 46aeadc59b..b46baa00ba 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/MainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/MainCirclePiece.cs
@@ -13,7 +13,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
-    public class MainCirclePiece : CompositeDrawable
+    public class MainCirclePiece : CompositeDrawable, IMainCirclePiece
     {
         private readonly CirclePiece circle;
         private readonly RingPiece ring;
@@ -67,12 +67,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             }, true);
 
             indexInCurrentCombo.BindValueChanged(index => number.Text = (index.NewValue + 1).ToString(), true);
-
-            drawableObject.ApplyCustomUpdateState += updateState;
-            updateState(drawableObject, drawableObject.State.Value);
         }
 
-        private void updateState(DrawableHitObject drawableObject, ArmedState state)
+        public void Animate(ArmedState state)
         {
             using (BeginAbsoluteSequence(drawableObject.StateUpdateTime))
                 glow.FadeOut(400);
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
index 545e80a709..cf62165929 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyMainCirclePiece.cs
@@ -12,6 +12,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Skinning.Default;
 using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
@@ -19,7 +20,7 @@ using static osu.Game.Skinning.LegacySkinConfiguration;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Legacy
 {
-    public class LegacyMainCirclePiece : CompositeDrawable
+    public class LegacyMainCirclePiece : CompositeDrawable, IMainCirclePiece
     {
         private readonly string priorityLookup;
         private readonly bool hasNumber;
@@ -138,12 +139,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             accentColour.BindValueChanged(colour => hitCircleSprite.Colour = LegacyColourCompatibility.DisallowZeroAlpha(colour.NewValue), true);
             if (hasNumber)
                 indexInCurrentCombo.BindValueChanged(index => hitCircleText.Text = (index.NewValue + 1).ToString(), true);
-
-            drawableObject.ApplyCustomUpdateState += updateState;
-            updateState(drawableObject, drawableObject.State.Value);
         }
 
-        private void updateState(DrawableHitObject drawableObject, ArmedState state)
+        public void Animate(ArmedState state)
         {
             const double legacy_fade_duration = 240;
 

From f2824a222a13f924df12f4479ccf3b8d68e5f6b9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Apr 2021 19:41:15 +0900
Subject: [PATCH 2735/3722] Adjust existing fades to close match stable editor

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

diff --git a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
index 5fdb79cbbd..dfb71d1d22 100644
--- a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
+++ b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 
                     case DrawableHitCircle circle: // also handles slider heads
                         circle.ApproachCircle
-                              .FadeOutFromOne(editor_hit_object_fade_out_extension)
+                              .FadeOutFromOne(editor_hit_object_fade_out_extension * 4)
                               .Expire();
                         break;
                 }
@@ -71,7 +71,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 
                 hitObject.RemoveTransform(existing);
 
-                using (hitObject.BeginAbsoluteSequence(existing.StartTime))
+                using (hitObject.BeginAbsoluteSequence(hitObject.HitStateUpdateTime))
                     hitObject.FadeOut(editor_hit_object_fade_out_extension).Expire();
             }
         }

From 0f70469d1c33f392def6ae1070f51cdad941643c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 21 Apr 2021 19:44:17 +0900
Subject: [PATCH 2736/3722] Only apply custom editor overrides if hit
 animations is disabled

---
 .../Edit/DrawableOsuEditRuleset.cs            | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
index dfb71d1d22..b8d0637e90 100644
--- a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
+++ b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
@@ -3,8 +3,11 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
@@ -27,8 +30,16 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         private class OsuEditPlayfield : OsuPlayfield
         {
+            private Bindable<bool> hitAnimations;
+
             protected override GameplayCursorContainer CreateCursor() => null;
 
+            [BackgroundDependencyLoader]
+            private void load(OsuConfigManager config)
+            {
+                hitAnimations = config.GetBindable<bool>(OsuSetting.EditorHitAnimations);
+            }
+
             protected override void OnNewDrawableHitObject(DrawableHitObject d)
             {
                 d.ApplyCustomUpdateState += updateState;
@@ -42,7 +53,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             private void updateState(DrawableHitObject hitObject, ArmedState state)
             {
-                if (state == ArmedState.Idle)
+                if (state == ArmedState.Idle || hitAnimations.Value)
                     return;
 
                 // adjust the visuals of certain object types to make them stay on screen for longer than usual.
@@ -60,6 +71,15 @@ namespace osu.Game.Rulesets.Osu.Edit
                         circle.ApproachCircle
                               .FadeOutFromOne(editor_hit_object_fade_out_extension * 4)
                               .Expire();
+
+                        circle.ApproachCircle.ScaleTo(1.1f, 300, Easing.OutQuint);
+
+                        var circlePieceDrawable = circle.CirclePiece.Drawable;
+
+                        // clear any explode animation logic.
+                        circlePieceDrawable.ApplyTransformsAt(circle.HitStateUpdateTime, true);
+                        circlePieceDrawable.ClearTransformsAfter(circle.HitStateUpdateTime, true);
+
                         break;
                 }
 

From de04caeace220426ed615efa6d3cabe4f76c88af Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Wed, 21 Apr 2021 13:53:08 +0200
Subject: [PATCH 2737/3722] Fixed race condition in StarRatingDisplay

---
 .../Ranking/Expanded/StarRatingDisplay.cs     | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
index a3e9336648..8367b1fc6d 100644
--- a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
@@ -14,6 +14,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
 using osuTK;
 using osuTK.Graphics;
 
@@ -28,9 +29,10 @@ namespace osu.Game.Screens.Ranking.Expanded
         private OsuColour colours { get; set; }
 
         private CircularContainer colorContainer;
-        private OsuTextFlowContainer textContainer;
         private CancellationTokenSource cancellationTokenSource;
         private IBindable<StarDifficulty?> bindableStarDifficulty;
+        private OsuSpriteText wholePartText;
+        private OsuSpriteText fractionPartText;
 
         private readonly StarDifficulty starDifficulty;
         private readonly BeatmapInfo beatmapInfo;
@@ -66,24 +68,10 @@ namespace osu.Game.Screens.Ranking.Expanded
 
             colorContainer.Colour = backgroundColour;
 
-            textContainer.Text = string.Empty;
+            wholePartText.Text = $"{wholePart}";
+            fractionPartText.Text = $"{separator}{fractionPart}";
 
-            textContainer.With(t =>
-            {
-                t.AddText($"{wholePart}", s =>
-                {
-                    s.Colour = Color4.Black;
-                    s.Font = s.Font.With(size: 14);
-                    s.UseFullGlyphHeight = false;
-                });
-
-                t.AddText($"{separator}{fractionPart}", s =>
-                {
-                    s.Colour = Color4.Black;
-                    s.Font = s.Font.With(size: 7);
-                    s.UseFullGlyphHeight = false;
-                });
-            });
+            
         }
 
         [BackgroundDependencyLoader]
@@ -130,14 +118,28 @@ namespace osu.Game.Screens.Ranking.Expanded
                             Icon = FontAwesome.Solid.Star,
                             Colour = Color4.Black
                         },
-                        textContainer = new OsuTextFlowContainer(s => s.Font = OsuFont.Numeric.With(weight: FontWeight.Black))
+                        new OsuTextFlowContainer(s => s.Font = OsuFont.Numeric.With(weight: FontWeight.Black))
                         {
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
                             AutoSizeAxes = Axes.Both,
                             Direction = FillDirection.Horizontal,
                             TextAnchor = Anchor.BottomLeft,
-                        },
+                        }.With(t =>
+                        {
+                            t.AddText(wholePartText = new OsuSpriteText(), s =>
+                            {
+                                s.Colour = Color4.Black;
+                                s.Font = s.Font.With(size:14);
+                                s.UseFullGlyphHeight = false;
+                            });
+                            t.AddText(fractionPartText = new OsuSpriteText(), s =>
+                            {
+                                s.Colour = Color4.Black;
+                                s.Font = s.Font.With(size: 7);
+                                s.UseFullGlyphHeight = false;
+                            });
+                        }),
                     }
                 }
             };

From 9fba87f67ace6c74bb452d8b8720a78dfc97b82c Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Wed, 21 Apr 2021 13:53:25 +0200
Subject: [PATCH 2738/3722] Moved Info and Background into own container

---
 .../SongSelect/TestSceneBeatmapInfoWedge.cs   |  8 ++-
 osu.Game/Screens/Select/BeatmapInfoWedge.cs   | 58 +++++++++++++------
 2 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
index 9c10c9751c..90bd4ceb88 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
@@ -135,15 +135,15 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private void selectBeatmap([CanBeNull] IBeatmap b)
         {
-            BeatmapInfoWedge.BufferedWedgeBackground backgroundBefore = null;
+            BeatmapInfoWedge.BeatmapInfoWedgeContainer containerBefore = null;
 
             AddStep($"select {b?.Metadata.Title ?? "null"} beatmap", () =>
             {
-                backgroundBefore = infoWedge.Background;
+                containerBefore = infoWedge.Container;
                 infoWedge.Beatmap = Beatmap.Value = b == null ? Beatmap.Default : CreateWorkingBeatmap(b);
             });
 
-            AddUntilStep("wait for async load", () => infoWedge.Background != backgroundBefore);
+            AddUntilStep("wait for async load", () => infoWedge.Container != containerBefore);
         }
 
         private IBeatmap createTestBeatmap(RulesetInfo ruleset)
@@ -196,6 +196,8 @@ namespace osu.Game.Tests.Visual.SongSelect
             public new BufferedWedgeBackground Background => base.Background;
 
             public new WedgeInfoText Info => base.Info;
+
+            public new BeatmapInfoWedgeContainer Container => base.Container;
         }
 
         private class TestHitObject : ConvertHitObject, IHasPosition
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 9077c115d4..5bb7bbe9fd 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -41,8 +41,9 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; }
 
-        protected BufferedWedgeBackground Background;
-        protected WedgeInfoText Info;
+        protected BeatmapInfoWedgeContainer Container;
+        protected WedgeInfoText Info => Container.Info;
+        protected BufferedWedgeBackground Background => Container.Background;
 
         public BeatmapInfoWedge()
         {
@@ -94,9 +95,9 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        public override bool IsPresent => base.IsPresent || Background == null; // Visibility is updated in the LoadComponentAsync callback
+        public override bool IsPresent => base.IsPresent || Container == null; // Visibility is updated in the LoadComponentAsync callback
 
-        private BufferedWedgeBackground loadingInfo;
+        private BeatmapInfoWedgeContainer loadingInfo;
 
         private void updateDisplay()
         {
@@ -108,13 +109,9 @@ namespace osu.Game.Screens.Select
                 {
                     State.Value = beatmap == null ? Visibility.Hidden : Visibility.Visible;
 
-                    Info?.FadeOut(250);
-                    Info?.Expire();
-                    Info = null;
-
-                    Background?.FadeOut(250);
-                    Background?.Expire();
-                    Background = null;
+                    Container?.FadeOut(250);
+                    Container?.Expire();
+                    Container = null;
                 }
 
                 if (beatmap == null)
@@ -123,25 +120,50 @@ namespace osu.Game.Screens.Select
                     return;
                 }
 
-                LoadComponentAsync(loadingInfo = new BufferedWedgeBackground(beatmap)
+                LoadComponentAsync(loadingInfo = new BeatmapInfoWedgeContainer(beatmap, ruleset.Value)
                 {
                     Shear = -Shear,
-                    Depth = Background?.Depth + 1 ?? 0
                 }, loaded =>
                 {
                     // ensure we are the most recent loaded wedge.
                     if (loaded != loadingInfo) return;
 
                     removeOldInfo();
-                    Add(Background = loaded);
-                    Add(Info = new WedgeInfoText(beatmap, ruleset.Value)
-                    {
-                        Shear = -Shear
-                    });
+                    Add(Container = loaded);
                 });
             }
         }
 
+        public class BeatmapInfoWedgeContainer : Container
+        {
+            private readonly WorkingBeatmap beatmap;
+            private readonly RulesetInfo ruleset;
+
+            internal BufferedWedgeBackground Background;
+            internal WedgeInfoText Info;
+
+            public BeatmapInfoWedgeContainer(WorkingBeatmap beatmap, RulesetInfo ruleset)
+            {
+                this.beatmap = beatmap;
+                this.ruleset = ruleset;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                RelativeSizeAxes = Axes.Both;
+
+                Children = new Drawable[]
+                {
+                    Background = new BufferedWedgeBackground(beatmap)
+                    {
+                        Depth = Background?.Depth + 1 ?? 0,
+                    },
+                    Info = new WedgeInfoText(beatmap, ruleset),
+                };
+            }
+        }
+
         public class WedgeInfoText : Container
         {
             public FillFlowContainer MapperContainer { get; private set; }

From d6928e91fd1046373476a3ba3a53d16ce55563b4 Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Wed, 21 Apr 2021 14:02:09 +0200
Subject: [PATCH 2739/3722] Removed BeatmapInfo in StarRatingDisplay

---
 .../Ranking/Expanded/StarRatingDisplay.cs     | 45 +++++--------------
 osu.Game/Screens/Select/BeatmapInfoWedge.cs   | 14 +++---
 2 files changed, 20 insertions(+), 39 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
index 8367b1fc6d..ea4936bd82 100644
--- a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
@@ -29,13 +29,19 @@ namespace osu.Game.Screens.Ranking.Expanded
         private OsuColour colours { get; set; }
 
         private CircularContainer colorContainer;
-        private CancellationTokenSource cancellationTokenSource;
-        private IBindable<StarDifficulty?> bindableStarDifficulty;
         private OsuSpriteText wholePartText;
         private OsuSpriteText fractionPartText;
+        private StarDifficulty starDifficulty;
 
-        private readonly StarDifficulty starDifficulty;
-        private readonly BeatmapInfo beatmapInfo;
+        public StarDifficulty StarDifficulty
+        {
+            get => starDifficulty;
+            set
+            {
+                starDifficulty = value;
+                setDifficulty(starDifficulty);
+            }
+        }
 
         /// <summary>
         /// Creates a new <see cref="StarRatingDisplay"/> using an already computed <see cref="StarDifficulty"/>.
@@ -46,15 +52,6 @@ namespace osu.Game.Screens.Ranking.Expanded
             this.starDifficulty = starDifficulty;
         }
 
-        /// <summary>
-        /// Creates a new <see cref="StarRatingDisplay"/> using a <see cref="BeatmapInfo"/> to use a bindable for the difficulty.
-        /// </summary>
-        /// <param name="beatmapInfo">The <see cref="BeatmapInfo"/> to use to create a bindable for <see cref="StarDifficulty"/></param>
-        public StarRatingDisplay(BeatmapInfo beatmapInfo)
-        {
-            this.beatmapInfo = beatmapInfo;
-        }
-
         private void setDifficulty(StarDifficulty difficulty)
         {
             var starRatingParts = difficulty.Stars.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
@@ -71,21 +68,12 @@ namespace osu.Game.Screens.Ranking.Expanded
             wholePartText.Text = $"{wholePart}";
             fractionPartText.Text = $"{separator}{fractionPart}";
 
-            
+
         }
 
         [BackgroundDependencyLoader]
         private void load(BeatmapDifficultyCache difficultyCache)
         {
-            if (beatmapInfo != null)
-            {
-                cancellationTokenSource?.Cancel();
-                cancellationTokenSource = new CancellationTokenSource();
-
-                bindableStarDifficulty?.UnbindAll();
-                bindableStarDifficulty = difficultyCache.GetBindableDifficulty(beatmapInfo, cancellationTokenSource.Token);
-            }
-
             AutoSizeAxes = Axes.Both;
 
             InternalChildren = new Drawable[]
@@ -144,16 +132,7 @@ namespace osu.Game.Screens.Ranking.Expanded
                 }
             };
 
-            if (bindableStarDifficulty != null)
-                bindableStarDifficulty.BindValueChanged(valueChanged => setDifficulty(valueChanged.NewValue ?? new StarDifficulty()), true);
-            else
-                setDifficulty(starDifficulty);
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-            cancellationTokenSource?.Cancel();
+            setDifficulty(starDifficulty);
         }
     }
 }
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 5bb7bbe9fd..7803b190e6 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -178,7 +178,7 @@ namespace osu.Game.Screens.Select
             private ILocalisedBindableString titleBinding;
             private ILocalisedBindableString artistBinding;
             private FillFlowContainer infoLabelContainer;
-            private Drawable starRatingDisplay;
+            private StarRatingDisplay starRatingDisplay;
             private Container bpmLabelContainer;
             private ModSettingChangeTracker settingChangeTracker;
             private CancellationTokenSource cancellationTokenSource;
@@ -246,9 +246,9 @@ namespace osu.Game.Screens.Select
                         Padding = new MarginPadding { Top = 14, Right = shear_width / 2 },
                         AutoSizeAxes = Axes.Both,
                         Shear = wedged_container_shear,
-                        Children = new[]
+                        Children = new Drawable[]
                         {
-                            starRatingDisplay = new StarRatingDisplay(beatmapInfo)
+                            starRatingDisplay = new StarRatingDisplay(starDifficulty.Value ?? new StarDifficulty())
                             {
                                 Anchor = Anchor.TopRight,
                                 Origin = Anchor.TopRight,
@@ -311,19 +311,21 @@ namespace osu.Game.Screens.Select
 
                 titleBinding.BindValueChanged(_ => setMetadata(metadata.Source));
                 artistBinding.BindValueChanged(_ => setMetadata(metadata.Source), true);
-                starDifficulty.BindValueChanged(_ => setStarRatingDisplayVisibility(), true);
+                starDifficulty.BindValueChanged(updateStarRatingDisplay, true);
 
                 // no difficulty means it can't have a status to show
                 if (beatmapInfo.Version == null)
                     StatusPill.Hide();
             }
 
-            private void setStarRatingDisplayVisibility()
+            private void updateStarRatingDisplay(ValueChangedEvent<StarDifficulty?> valueChanged)
             {
-                if (starDifficulty.Value.HasValue && starDifficulty.Value.Value.Stars > 0)
+                if (valueChanged.NewValue.HasValue && valueChanged.NewValue.Value.Stars > 0)
                     starRatingDisplay.Show();
                 else
                     starRatingDisplay.Hide();
+
+                starRatingDisplay.StarDifficulty = valueChanged.NewValue ?? new StarDifficulty();
             }
 
             private InfoLabel[] getRulesetInfoLabels()

From 0dfd0bb59d731a46419f4840883ff433b88ce5d1 Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Wed, 21 Apr 2021 14:16:16 +0200
Subject: [PATCH 2740/3722] Refactored background of BeatmapInfoWedge

---
 .../SongSelect/TestSceneBeatmapInfoWedge.cs   |  2 -
 osu.Game/Screens/Select/BeatmapInfoWedge.cs   | 57 +---------------
 .../Select/BeatmapInfoWedgeBackground.cs      | 66 +++++++++++++++++++
 3 files changed, 68 insertions(+), 57 deletions(-)
 create mode 100644 osu.Game/Screens/Select/BeatmapInfoWedgeBackground.cs

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
index 90bd4ceb88..688cc9a035 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
@@ -193,8 +193,6 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private class TestBeatmapInfoWedge : BeatmapInfoWedge
         {
-            public new BufferedWedgeBackground Background => base.Background;
-
             public new WedgeInfoText Info => base.Info;
 
             public new BeatmapInfoWedgeContainer Container => base.Container;
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 7803b190e6..b499423412 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -11,7 +11,6 @@ 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.Utils;
 using osu.Game.Beatmaps;
@@ -43,7 +42,6 @@ namespace osu.Game.Screens.Select
 
         protected BeatmapInfoWedgeContainer Container;
         protected WedgeInfoText Info => Container.Info;
-        protected BufferedWedgeBackground Background => Container.Background;
 
         public BeatmapInfoWedge()
         {
@@ -123,6 +121,7 @@ namespace osu.Game.Screens.Select
                 LoadComponentAsync(loadingInfo = new BeatmapInfoWedgeContainer(beatmap, ruleset.Value)
                 {
                     Shear = -Shear,
+                    Depth = Container?.Depth + 1 ?? 0,
                 }, loaded =>
                 {
                     // ensure we are the most recent loaded wedge.
@@ -139,7 +138,6 @@ namespace osu.Game.Screens.Select
             private readonly WorkingBeatmap beatmap;
             private readonly RulesetInfo ruleset;
 
-            internal BufferedWedgeBackground Background;
             internal WedgeInfoText Info;
 
             public BeatmapInfoWedgeContainer(WorkingBeatmap beatmap, RulesetInfo ruleset)
@@ -155,10 +153,7 @@ namespace osu.Game.Screens.Select
 
                 Children = new Drawable[]
                 {
-                    Background = new BufferedWedgeBackground(beatmap)
-                    {
-                        Depth = Background?.Depth + 1 ?? 0,
-                    },
+                    new BeatmapInfoWedgeBackground(beatmap),
                     Info = new WedgeInfoText(beatmap, ruleset),
                 };
             }
@@ -572,53 +567,5 @@ namespace osu.Game.Screens.Select
                 settingChangeTracker?.Dispose();
             }
         }
-
-        public class BufferedWedgeBackground : BufferedContainer
-        {
-            private readonly WorkingBeatmap beatmap;
-
-            public BufferedWedgeBackground(WorkingBeatmap beatmap)
-                : base(pixelSnapping: true)
-            {
-                this.beatmap = beatmap;
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(LocalisationManager localisation)
-            {
-                CacheDrawnFrameBuffer = true;
-                RelativeSizeAxes = Axes.Both;
-
-                Children = new Drawable[]
-                {
-                    // We will create the white-to-black gradient by modulating transparency and having
-                    // a black backdrop. This results in an sRGB-space gradient and not linear space,
-                    // transitioning from white to black more perceptually uniformly.
-                    new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = Color4.Black,
-                    },
-                    // We use a container, such that we can set the colour gradient to go across the
-                    // vertices of the masked container instead of the vertices of the (larger) sprite.
-                    new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = ColourInfo.GradientVertical(Color4.White, Color4.White.Opacity(0.3f)),
-                        Children = new[]
-                        {
-                            // Zoomed-in and cropped beatmap background
-                            new BeatmapBackgroundSprite(beatmap)
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
-                                FillMode = FillMode.Fill,
-                            },
-                        },
-                    },
-                };
-            }
-        }
     }
 }
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeBackground.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeBackground.cs
new file mode 100644
index 0000000000..566f49a799
--- /dev/null
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeBackground.cs
@@ -0,0 +1,66 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osuTK.Graphics;
+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.Game.Beatmaps;
+using osu.Game.Beatmaps.Drawables;
+using osu.Framework.Graphics.Shapes;
+
+namespace osu.Game.Screens.Select
+{
+    internal class BeatmapInfoWedgeBackground : CompositeDrawable
+    {
+        private readonly WorkingBeatmap beatmap;
+
+        public BeatmapInfoWedgeBackground(WorkingBeatmap beatmap)
+        {
+            this.beatmap = beatmap;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            InternalChild = new BufferedContainer(pixelSnapping: true)
+            {
+                CacheDrawnFrameBuffer = true,
+                RelativeSizeAxes = Axes.Both,
+                Children = new Drawable[]
+                {
+                    // We will create the white-to-black gradient by modulating transparency and having
+                    // a black backdrop. This results in an sRGB-space gradient and not linear space,
+                    // transitioning from white to black more perceptually uniformly.
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4.Black,
+                    },
+                    // We use a container, such that we can set the colour gradient to go across the
+                    // vertices of the masked container instead of the vertices of the (larger) sprite.
+                    new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = ColourInfo.GradientVertical(Color4.White, Color4.White.Opacity(0.3f)),
+                        Children = new[]
+                        {
+                            // Zoomed-in and cropped beatmap background
+                            new BeatmapBackgroundSprite(beatmap)
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                FillMode = FillMode.Fill,
+                            },
+                        },
+                    },
+                }
+            };
+        }
+    }
+}

From 56a69ed95682e9096f2b8e4b518346b7a66b9308 Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Wed, 21 Apr 2021 15:53:28 +0200
Subject: [PATCH 2741/3722] Codestyle fixes

---
 osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
index ea4936bd82..bfc336a677 100644
--- a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
@@ -2,9 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Globalization;
-using System.Threading;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
@@ -67,8 +65,6 @@ namespace osu.Game.Screens.Ranking.Expanded
 
             wholePartText.Text = $"{wholePart}";
             fractionPartText.Text = $"{separator}{fractionPart}";
-
-
         }
 
         [BackgroundDependencyLoader]
@@ -118,7 +114,7 @@ namespace osu.Game.Screens.Ranking.Expanded
                             t.AddText(wholePartText = new OsuSpriteText(), s =>
                             {
                                 s.Colour = Color4.Black;
-                                s.Font = s.Font.With(size:14);
+                                s.Font = s.Font.With(size: 14);
                                 s.UseFullGlyphHeight = false;
                             });
                             t.AddText(fractionPartText = new OsuSpriteText(), s =>

From 2bea6256137a82375ac2e0f05a39f95b4f286503 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 21 Apr 2021 23:21:03 +0900
Subject: [PATCH 2742/3722] Fix initial playback states not being correct

---
 .../TestSceneMultiplayerSpectator.cs          | 11 ++-----
 .../Spectate/MultiplayerSpectator.cs          | 14 +++------
 .../Spectate/MultiplayerSpectatorPlayer.cs    | 31 ++++++++++++++++---
 .../Spectate/Sync/CatchUpSlaveClock.cs        |  2 +-
 4 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
index e395ebd29d..9ec7bfb60b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
@@ -256,17 +256,10 @@ namespace osu.Game.Tests.Visual.Multiplayer
         }
 
         private void checkPaused(int userId, bool state) =>
-            AddUntilStep($"{userId} is {(state ? "paused" : "playing")}", () => getPlayer(userId).ChildrenOfType<GameplayClockContainer>().First().IsPaused.Value == state);
+            AddUntilStep($"{userId} is {(state ? "paused" : "playing")}", () => getPlayer(userId).ChildrenOfType<GameplayClockContainer>().First().GameplayClock.IsRunning != state);
 
         private void checkPausedInstant(int userId, bool state) =>
-            AddAssert($"{userId} is {(state ? "paused" : "playing")}", () => getPlayer(userId).ChildrenOfType<GameplayClockContainer>().First().IsPaused.Value == state);
-
-        /// <summary>
-        /// Returns time(user1) - time(user2).
-        /// </summary>
-        private double getGameplayOffset(int user1, int user2) => getGameplayTime(user1) - getGameplayTime(user2);
-
-        private double getGameplayTime(int userId) => getPlayer(userId).ChildrenOfType<GameplayClockContainer>().Single().GameplayClock.CurrentTime;
+            AddAssert($"{userId} is {(state ? "paused" : "playing")}", () => getPlayer(userId).ChildrenOfType<GameplayClockContainer>().First().GameplayClock.IsRunning != state);
 
         private Player getPlayer(int userId) => getInstance(userId).ChildrenOfType<Player>().Single();
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index a5bd449e7e..2db470da67 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -39,10 +39,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         private void load()
         {
             Container leaderboardContainer;
+            masterClockContainer = new MasterGameplayClockContainer(Beatmap.Value, 0);
 
-            masterClockContainer = new MasterGameplayClockContainer(Beatmap.Value, 0)
+            InternalChildren = new[]
             {
-                Child = new GridContainer
+                (Drawable)(syncManager = new CatchUpSyncManager(masterClockContainer)),
+                masterClockContainer.WithChild(new GridContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     ColumnDimensions = new[]
@@ -61,13 +63,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                             grid = new PlayerGrid { RelativeSizeAxes = Axes.Both }
                         }
                     }
-                }
-            };
-
-            InternalChildren = new[]
-            {
-                (Drawable)(syncManager = new CatchUpSyncManager(masterClockContainer)),
-                masterClockContainer
+                })
             };
 
             for (int i = 0; i < UserIds.Length; i++)
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
index 55f483586c..5af0d19a4d 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.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.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Scoring;
@@ -12,22 +13,31 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     public class MultiplayerSpectatorPlayer : SpectatorPlayer
     {
-        private readonly ISlaveClock gameplayClock;
+        private readonly Bindable<bool> waitingOnFrames = new Bindable<bool>(true);
+        private readonly Score score;
+        private readonly ISlaveClock slaveClock;
 
-        public MultiplayerSpectatorPlayer(Score score, ISlaveClock gameplayClock)
+        public MultiplayerSpectatorPlayer(Score score, ISlaveClock slaveClock)
             : base(score)
         {
-            this.gameplayClock = gameplayClock;
+            this.score = score;
+            this.slaveClock = slaveClock;
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            gameplayClock.WaitingOnFrames.BindTo(DrawableRuleset.FrameStableClock.WaitingOnFrames);
+            slaveClock.WaitingOnFrames.BindTo(waitingOnFrames);
+        }
+
+        protected override void UpdateAfterChildren()
+        {
+            base.UpdateAfterChildren();
+            waitingOnFrames.Value = DrawableRuleset.FrameStableClock.WaitingOnFrames.Value || score.Replay.Frames.Count == 0;
         }
 
         protected override GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart)
-            => new SubGameplayClockContainer(gameplayClock);
+            => new SubGameplayClockContainer(slaveClock);
     }
 
     public class SubGameplayClockContainer : GameplayClockContainer
@@ -37,6 +47,17 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         {
         }
 
+        protected override void Update()
+        {
+            // The slave clock's running state is controlled by the sync manager, but the local pausing state needs to be updated to stop gameplay.
+            if (SourceClock.IsRunning)
+                Start();
+            else
+                Stop();
+
+            base.Update();
+        }
+
         protected override GameplayClock CreateGameplayClock(IFrameBasedClock source) => new GameplayClock(source);
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSlaveClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSlaveClock.cs
index f128ea619b..cefe5ff04f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSlaveClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSlaveClock.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
 
         public FrameTimeInfo TimeInfo => new FrameTimeInfo { Elapsed = ElapsedFrameTime, Current = CurrentTime };
 
-        public IBindable<bool> WaitingOnFrames { get; } = new Bindable<bool>();
+        public IBindable<bool> WaitingOnFrames { get; } = new Bindable<bool>(true);
 
         public bool IsCatchingUp { get; set; }
     }

From 1ca2152e6191e0da98abdf034f1d50c20734fe7b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 21 Apr 2021 23:22:36 +0900
Subject: [PATCH 2743/3722] Privatise + rename to SlaveGameplayClockContainer

---
 .../Spectate/MultiplayerSpectatorPlayer.cs    | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
index 5af0d19a4d..69b38c61f7 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
@@ -37,27 +37,27 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         }
 
         protected override GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart)
-            => new SubGameplayClockContainer(slaveClock);
-    }
+            => new SlaveGameplayClockContainer(slaveClock);
 
-    public class SubGameplayClockContainer : GameplayClockContainer
-    {
-        public SubGameplayClockContainer(IClock sourceClock)
-            : base(sourceClock)
+        private class SlaveGameplayClockContainer : GameplayClockContainer
         {
+            public SlaveGameplayClockContainer(IClock sourceClock)
+                : base(sourceClock)
+            {
+            }
+
+            protected override void Update()
+            {
+                // The slave clock's running state is controlled by the sync manager, but the local pausing state needs to be updated to stop gameplay.
+                if (SourceClock.IsRunning)
+                    Start();
+                else
+                    Stop();
+
+                base.Update();
+            }
+
+            protected override GameplayClock CreateGameplayClock(IFrameBasedClock source) => new GameplayClock(source);
         }
-
-        protected override void Update()
-        {
-            // The slave clock's running state is controlled by the sync manager, but the local pausing state needs to be updated to stop gameplay.
-            if (SourceClock.IsRunning)
-                Start();
-            else
-                Stop();
-
-            base.Update();
-        }
-
-        protected override GameplayClock CreateGameplayClock(IFrameBasedClock source) => new GameplayClock(source);
     }
 }

From 60b702549dd2bfc42f21a73831396edf9c7dedac Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Apr 2021 14:20:49 +0900
Subject: [PATCH 2744/3722] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 3324af7c51..7b97103851 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.421.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.422.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index fcd1ed6987..b27e00f59d 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.421.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.422.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 34810a3106..d07e16ea56 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.421.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.422.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.421.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.422.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 21f34be19fe58a3cfaca1f2182dc1054aed0aca4 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 22 Apr 2021 14:42:10 +0900
Subject: [PATCH 2745/3722] Add support for per-ruleset sample playback when
 switching rulesets (via toolbar)

---
 .../Overlays/Toolbar/ToolbarRulesetSelector.cs     | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs b/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs
index 905d5b44c6..eb235632e8 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.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.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
@@ -13,6 +14,8 @@ using osu.Framework.Input.Events;
 using osuTK.Input;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 
 namespace osu.Game.Overlays.Toolbar
 {
@@ -20,6 +23,8 @@ namespace osu.Game.Overlays.Toolbar
     {
         protected Drawable ModeButtonLine { get; private set; }
 
+        private readonly Dictionary<string, Sample> selectionSamples = new Dictionary<string, Sample>();
+
         public ToolbarRulesetSelector()
         {
             RelativeSizeAxes = Axes.Y;
@@ -27,7 +32,7 @@ namespace osu.Game.Overlays.Toolbar
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(AudioManager audio)
         {
             AddRangeInternal(new[]
             {
@@ -54,6 +59,9 @@ namespace osu.Game.Overlays.Toolbar
                     }
                 }
             });
+
+            foreach (var ruleset in Rulesets.AvailableRulesets)
+                selectionSamples[ruleset.ShortName] = audio.Samples.Get($"UI/ruleset-select-{ruleset.ShortName}");
         }
 
         protected override void LoadComplete()
@@ -72,6 +80,10 @@ namespace osu.Game.Overlays.Toolbar
             if (SelectedTab != null)
             {
                 ModeButtonLine.MoveToX(SelectedTab.DrawPosition.X, !hasInitialPosition ? 0 : 200, Easing.OutQuint);
+
+                if (hasInitialPosition)
+                    selectionSamples[SelectedTab.Value.ShortName]?.Play();
+
                 hasInitialPosition = true;
             }
         });

From ea3bb07924f6be8126dc8bc1894478db9f00ba82 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Apr 2021 14:51:14 +0900
Subject: [PATCH 2746/3722] Add test that fails on incorrect system/info
 message ordering

---
 .../Online/TestSceneStandAloneChatDisplay.cs  | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
index 01e67b1681..165fff99dd 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
@@ -83,6 +83,28 @@ namespace osu.Game.Tests.Visual.Online
             };
         });
 
+        [Test]
+        public void TestSystemMessageOrdering()
+        {
+            var standardMessage = new Message(messageIdSequence++)
+            {
+                Sender = admin,
+                Content = "I am a wang!"
+            };
+
+            var infoMessage1 = new InfoMessage($"the system is calling {messageIdSequence++}");
+            var infoMessage2 = new InfoMessage($"the system is calling {messageIdSequence++}");
+
+            AddStep("message from admin", () => testChannel.AddNewMessages(standardMessage));
+            AddStep("message from system", () => testChannel.AddNewMessages(infoMessage1));
+            AddStep("message from system", () => testChannel.AddNewMessages(infoMessage2));
+
+            AddAssert("message order is correct", () => testChannel.Messages.Count == 3
+                                                        && testChannel.Messages[0] == standardMessage
+                                                        && testChannel.Messages[1] == infoMessage1
+                                                        && testChannel.Messages[2] == infoMessage2);
+        }
+
         [Test]
         public void TestManyMessages()
         {

From 3befb49ea9e5ed6420c053ba4b07bd58f56fac75 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Apr 2021 14:51:57 +0900
Subject: [PATCH 2747/3722] Fix system messages always being displayed above
 standard messages

Closes https://github.com/ppy/osu/issues/12509.
---
 osu.Game/Online/Chat/InfoMessage.cs | 4 +---
 osu.Game/Online/Chat/Message.cs     | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/Chat/InfoMessage.cs b/osu.Game/Online/Chat/InfoMessage.cs
index 8dce188804..cea336aae2 100644
--- a/osu.Game/Online/Chat/InfoMessage.cs
+++ b/osu.Game/Online/Chat/InfoMessage.cs
@@ -8,10 +8,8 @@ namespace osu.Game.Online.Chat
 {
     public class InfoMessage : LocalMessage
     {
-        private static int infoID = -1;
-
         public InfoMessage(string message)
-            : base(infoID--)
+            : base(null)
         {
             Timestamp = DateTimeOffset.Now;
             Content = message;
diff --git a/osu.Game/Online/Chat/Message.cs b/osu.Game/Online/Chat/Message.cs
index 2e41038a59..30753b3920 100644
--- a/osu.Game/Online/Chat/Message.cs
+++ b/osu.Game/Online/Chat/Message.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Online.Chat
             return Id.Value.CompareTo(other.Id.Value);
         }
 
-        public virtual bool Equals(Message other) => Id == other?.Id;
+        public virtual bool Equals(Message other) => Id.HasValue && Id == other?.Id;
 
         // ReSharper disable once ImpureMethodCallOnReadonlyValueField
         public override int GetHashCode() => Id.GetHashCode();

From b37c5a8749422ccdd93caeeea815aa5013f26353 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Apr 2021 14:59:57 +0900
Subject: [PATCH 2748/3722] Rollback hold note placement when length is zero

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

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
index a13afdfffe..093a8da24f 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
                 return;
 
             base.OnMouseUp(e);
-            EndPlacement(true);
+            EndPlacement(HitObject.Duration > 0);
         }
 
         private double originalStartTime;

From cf1e3ea98873897de95984f79846ca7282a7581f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Apr 2021 15:41:21 +0900
Subject: [PATCH 2749/3722] Add failing test covering quick shift-rightclick
 deletion in placement mode

---
 .../Editing/TestSceneEditorSelection.cs       | 31 +++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
index 99f31b0c2a..c9b6d2e376 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
@@ -12,6 +12,7 @@ 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.UI;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
@@ -156,9 +157,35 @@ namespace osu.Game.Tests.Visual.Editing
         }
 
         [Test]
-        public void TestQuickDeleteRemovesObject()
+        public void TestQuickDeleteRemovesObjectInPlacement()
         {
-            var addedObject = new HitCircle { StartTime = 1000 };
+            var addedObject = new HitCircle
+            {
+                StartTime = 0,
+                Position = OsuPlayfield.BASE_SIZE * 0.5f
+            };
+
+            AddStep("add hitobject", () => EditorBeatmap.Add(addedObject));
+
+            AddStep("enter placement mode", () => InputManager.PressKey(Key.Number2));
+
+            moveMouseToObject(() => addedObject);
+
+            AddStep("hold shift", () => InputManager.PressKey(Key.ShiftLeft));
+            AddStep("right click", () => InputManager.Click(MouseButton.Right));
+            AddStep("release shift", () => InputManager.ReleaseKey(Key.ShiftLeft));
+
+            AddAssert("no hitobjects in beatmap", () => EditorBeatmap.HitObjects.Count == 0);
+        }
+
+        [Test]
+        public void TestQuickDeleteRemovesObjectInSelection()
+        {
+            var addedObject = new HitCircle
+            {
+                StartTime = 0,
+                Position = OsuPlayfield.BASE_SIZE * 0.5f
+            };
 
             AddStep("add hitobject", () => EditorBeatmap.Add(addedObject));
 

From 9a7bf8109ff7029ad76e2d60b389d660d062ec57 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Apr 2021 15:27:08 +0900
Subject: [PATCH 2750/3722] Allow certain mouse input to pass through
 `PlacementBlueprints` to the selection logic

---
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index 6c1cd01796..4ad8c815fe 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -14,6 +14,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Compose;
 using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Rulesets.Edit
 {
@@ -128,8 +129,11 @@ namespace osu.Game.Rulesets.Edit
                 case DoubleClickEvent _:
                     return false;
 
-                case MouseButtonEvent _:
-                    return true;
+                case MouseButtonEvent mouse:
+                    // placement blueprints should generally block mouse from reaching underlying components (ie. performing clicks on interface buttons).
+                    // for now, the one exception we want to allow is when using a non-main mouse button when shift is pressed, which is used to trigger object deletion
+                    // while in placement mode.
+                    return mouse.Button == MouseButton.Left || !mouse.ShiftPressed;
 
                 default:
                     return false;

From 3e1002fbf36650b9a91a6a04df9d15c0d220f8f4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Apr 2021 17:06:08 +0900
Subject: [PATCH 2751/3722] Improve osu!catch caught fruit placement algorithm

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 29 +++++++++++++++++----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index d045dcf16a..8edc5d0eb2 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -53,6 +53,11 @@ namespace osu.Game.Rulesets.Catch.UI
         /// </summary>
         public const double BASE_SPEED = 1.0;
 
+        /// <summary>
+        /// The amount by which caught fruit should be scaled down to fit on the plate.
+        /// </summary>
+        private const float caught_fruit_scale_adjust = 0.5f;
+
         [NotNull]
         private readonly Container trailsTarget;
 
@@ -240,7 +245,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
             if (result.IsHit)
             {
-                var positionInStack = computePositionInStack(new Vector2(palpableObject.X - X, 0), palpableObject.DisplaySize.X / 2);
+                var positionInStack = computePositionInStack(new Vector2(palpableObject.X - X, 0), palpableObject.DisplaySize.X);
 
                 if (CatchFruitOnPlate)
                     placeCaughtObject(palpableObject, positionInStack);
@@ -470,7 +475,7 @@ namespace osu.Game.Rulesets.Catch.UI
             caughtObject.CopyStateFrom(drawableObject);
             caughtObject.Anchor = Anchor.TopCentre;
             caughtObject.Position = position;
-            caughtObject.Scale /= 2;
+            caughtObject.Scale *= caught_fruit_scale_adjust;
 
             caughtObjectContainer.Add(caughtObject);
 
@@ -480,19 +485,21 @@ namespace osu.Game.Rulesets.Catch.UI
 
         private Vector2 computePositionInStack(Vector2 position, float displayRadius)
         {
-            const float radius_div_2 = CatchHitObject.OBJECT_RADIUS / 2;
-            const float allowance = 10;
+            // this is taken from osu-stable (lenience should be 10 * 10 at standard scale).
+            const float lenience_adjust = 10 / CatchHitObject.OBJECT_RADIUS;
 
-            while (caughtObjectContainer.Any(f => Vector2Extensions.Distance(f.Position, position) < (displayRadius + radius_div_2) / (allowance / 2)))
+            float adjustedRadius = displayRadius * lenience_adjust;
+            float checkDistance = MathF.Pow(adjustedRadius, 2);
+
+            // offset fruit vertically to better place "above" the plate.
+            position.Y -= 5;
+
+            while (caughtObjectContainer.Any(f => Vector2Extensions.DistanceSquared(f.Position, position) < checkDistance))
             {
-                float diff = (displayRadius + radius_div_2) / allowance;
-
-                position.X += (RNG.NextSingle() - 0.5f) * diff * 2;
-                position.Y -= RNG.NextSingle() * diff;
+                position.X += RNG.NextSingle(-adjustedRadius, adjustedRadius);
+                position.Y -= RNG.NextSingle(0, 5);
             }
 
-            position.X = Math.Clamp(position.X, -CatcherArea.CATCHER_SIZE / 2, CatcherArea.CATCHER_SIZE / 2);
-
             return position;
         }
 

From 84a713822306f5a6dd4897b58e3894f6b669190f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Apr 2021 16:56:23 +0900
Subject: [PATCH 2752/3722] Update tests to better support stack regeneration
 cases

---
 .../TestSceneCatcher.cs                       | 33 ++++++++++++++-----
 osu.Game.Rulesets.Catch/UI/Catcher.cs         |  7 +++-
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index 48efd73222..f8e278a486 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -10,6 +10,7 @@ using osu.Game.Rulesets.Catch.UI;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Configuration;
@@ -170,16 +171,25 @@ namespace osu.Game.Rulesets.Catch.Tests
         }
 
         [Test]
-        public void TestCatcherStacking()
+        public void TestCatcherRandomStacking()
+        {
+            AddStep("catch more fruits", () => attemptCatch(() => new Fruit
+            {
+                X = (RNG.NextSingle() - 0.5f) * CatcherArea.CATCHER_SIZE
+            }, 50));
+        }
+
+        [Test]
+        public void TestCatcherStackingSameCaughtPosition()
         {
             AddStep("catch fruit", () => attemptCatch(new Fruit()));
             checkPlate(1);
-            AddStep("catch more fruits", () => attemptCatch(new Fruit(), 9));
+            AddStep("catch more fruits", () => attemptCatch(() => new Fruit(), 9));
             checkPlate(10);
             AddAssert("caught objects are stacked", () =>
-                catcher.CaughtObjects.All(obj => obj.Y <= 0) &&
-                catcher.CaughtObjects.Any(obj => obj.Y == 0) &&
-                catcher.CaughtObjects.Any(obj => obj.Y < -20));
+                catcher.CaughtObjects.All(obj => obj.Y <= Catcher.CAUGHT_FRUIT_VERTICAL_OFFSET) &&
+                catcher.CaughtObjects.Any(obj => obj.Y == Catcher.CAUGHT_FRUIT_VERTICAL_OFFSET) &&
+                catcher.CaughtObjects.Any(obj => obj.Y < -25));
         }
 
         [Test]
@@ -189,11 +199,11 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddStep("catch tiny droplet", () => attemptCatch(new TinyDroplet()));
             AddAssert("tiny droplet is exploded", () => catcher.CaughtObjects.Count() == 1 && droppedObjectContainer.Count == 1);
             AddUntilStep("wait explosion", () => !droppedObjectContainer.Any());
-            AddStep("catch more fruits", () => attemptCatch(new Fruit(), 9));
+            AddStep("catch more fruits", () => attemptCatch(() => new Fruit(), 9));
             AddStep("explode", () => catcher.Explode());
             AddAssert("fruits are exploded", () => !catcher.CaughtObjects.Any() && droppedObjectContainer.Count == 10);
             AddUntilStep("wait explosion", () => !droppedObjectContainer.Any());
-            AddStep("catch fruits", () => attemptCatch(new Fruit(), 10));
+            AddStep("catch fruits", () => attemptCatch(() => new Fruit(), 10));
             AddStep("drop", () => catcher.Drop());
             AddAssert("fruits are dropped", () => !catcher.CaughtObjects.Any() && droppedObjectContainer.Count == 10);
         }
@@ -222,10 +232,15 @@ namespace osu.Game.Rulesets.Catch.Tests
 
         private void checkHyperDash(bool state) => AddAssert($"catcher is {(state ? "" : "not ")}hyper dashing", () => catcher.HyperDashing == state);
 
-        private void attemptCatch(CatchHitObject hitObject, int count = 1)
+        private void attemptCatch(CatchHitObject hitObject)
+        {
+            attemptCatch(() => hitObject, 1);
+        }
+
+        private void attemptCatch(Func<CatchHitObject> hitObject, int count)
         {
             for (var i = 0; i < count; i++)
-                attemptCatch(hitObject, out _, out _);
+                attemptCatch(hitObject(), out _, out _);
         }
 
         private void attemptCatch(CatchHitObject hitObject, out DrawableCatchHitObject drawableObject, out JudgementResult result)
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 8edc5d0eb2..4fc9e32a73 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -53,6 +53,11 @@ namespace osu.Game.Rulesets.Catch.UI
         /// </summary>
         public const double BASE_SPEED = 1.0;
 
+        /// <summary>
+        /// The amount by which caught fruit should be offset from the plate surface to make them look visually "caught".
+        /// </summary>
+        public const float CAUGHT_FRUIT_VERTICAL_OFFSET = -5;
+
         /// <summary>
         /// The amount by which caught fruit should be scaled down to fit on the plate.
         /// </summary>
@@ -492,7 +497,7 @@ namespace osu.Game.Rulesets.Catch.UI
             float checkDistance = MathF.Pow(adjustedRadius, 2);
 
             // offset fruit vertically to better place "above" the plate.
-            position.Y -= 5;
+            position.Y += CAUGHT_FRUIT_VERTICAL_OFFSET;
 
             while (caughtObjectContainer.Any(f => Vector2Extensions.DistanceSquared(f.Position, position) < checkDistance))
             {

From dc2bc462b8c68b44b6e927ec84bbf87fc0586df3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Apr 2021 17:27:23 +0900
Subject: [PATCH 2753/3722] Expose internal catcher width calculation methods

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

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 4fc9e32a73..0d6a577d1e 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -212,13 +212,13 @@ namespace osu.Game.Rulesets.Catch.UI
         /// Calculates the width of the area used for attempting catches in gameplay.
         /// </summary>
         /// <param name="scale">The scale of the catcher.</param>
-        internal static float CalculateCatchWidth(Vector2 scale) => CatcherArea.CATCHER_SIZE * Math.Abs(scale.X) * ALLOWED_CATCH_RANGE;
+        public static float CalculateCatchWidth(Vector2 scale) => CatcherArea.CATCHER_SIZE * Math.Abs(scale.X) * ALLOWED_CATCH_RANGE;
 
         /// <summary>
         /// Calculates the width of the area used for attempting catches in gameplay.
         /// </summary>
         /// <param name="difficulty">The beatmap difficulty.</param>
-        internal static float CalculateCatchWidth(BeatmapDifficulty difficulty) => CalculateCatchWidth(calculateScale(difficulty));
+        public static float CalculateCatchWidth(BeatmapDifficulty difficulty) => CalculateCatchWidth(calculateScale(difficulty));
 
         /// <summary>
         /// Determine if this catcher can catch a <see cref="CatchHitObject"/> in the current position.

From 2203552e9e23528e79c63024d80186e4f5034bc2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Apr 2021 17:32:24 +0900
Subject: [PATCH 2754/3722] Add stacking test logic to `TestSceneCatcherArea`
 for skinned testing

---
 .../TestSceneCatcher.cs                       |  3 +-
 .../TestSceneCatcherArea.cs                   | 36 +++++++++++++++----
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index f8e278a486..517027a9fc 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -21,6 +21,7 @@ using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 using osu.Game.Tests.Visual;
+using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
@@ -175,7 +176,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             AddStep("catch more fruits", () => attemptCatch(() => new Fruit
             {
-                X = (RNG.NextSingle() - 0.5f) * CatcherArea.CATCHER_SIZE
+                X = (RNG.NextSingle() - 0.5f) * Catcher.CalculateCatchWidth(Vector2.One)
             }, 50));
         }
 
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
index 1cbfa6338e..3e4ee5ffa9 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
@@ -8,6 +8,8 @@ using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
+using osu.Framework.Threading;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Configuration;
@@ -31,12 +33,32 @@ namespace osu.Game.Rulesets.Catch.Tests
 
         private float circleSize;
 
+        private ScheduledDelegate addManyFruit;
+
+        private BeatmapDifficulty beatmapDifficulty;
+
         public TestSceneCatcherArea()
         {
             AddSliderStep<float>("circle size", 0, 8, 5, createCatcher);
             AddToggleStep("hyper dash", t => this.ChildrenOfType<TestCatcherArea>().ForEach(area => area.ToggleHyperDash(t)));
 
-            AddStep("catch fruit", () => attemptCatch(new Fruit()));
+            AddStep("catch centered fruit", () => attemptCatch(new Fruit()));
+            AddStep("catch many random fruit", () =>
+            {
+                int count = 50;
+
+                addManyFruit?.Cancel();
+                addManyFruit = Scheduler.AddDelayed(() =>
+                {
+                    attemptCatch(new Fruit
+                    {
+                        X = (RNG.NextSingle() - 0.5f) * Catcher.CalculateCatchWidth(beatmapDifficulty),
+                    });
+
+                    if (count-- == 0)
+                        addManyFruit?.Cancel();
+                }, 50, true);
+            });
             AddStep("catch fruit last in combo", () => attemptCatch(new Fruit { LastInCombo = true }));
             AddStep("catch kiai fruit", () => attemptCatch(new TestSceneCatcher.TestKiaiFruit()));
             AddStep("miss last in combo", () => attemptCatch(new Fruit { X = 100, LastInCombo = true }));
@@ -45,10 +67,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         private void attemptCatch(Fruit fruit)
         {
             fruit.X = fruit.OriginalX + catcher.X;
-            fruit.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty
-            {
-                CircleSize = circleSize
-            });
+            fruit.ApplyDefaults(new ControlPointInfo(), beatmapDifficulty);
 
             foreach (var area in this.ChildrenOfType<CatcherArea>())
             {
@@ -71,6 +90,11 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             circleSize = size;
 
+            beatmapDifficulty = new BeatmapDifficulty
+            {
+                CircleSize = circleSize
+            };
+
             SetContents(() =>
             {
                 var droppedObjectContainer = new Container<CaughtObject>
@@ -84,7 +108,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                     Children = new Drawable[]
                     {
                         droppedObjectContainer,
-                        new TestCatcherArea(droppedObjectContainer, new BeatmapDifficulty { CircleSize = size })
+                        new TestCatcherArea(droppedObjectContainer, beatmapDifficulty)
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.TopCentre,

From bdf07ad59a7cfc0abb796133001da52bd83f314b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Apr 2021 17:47:03 +0900
Subject: [PATCH 2755/3722] Limit catching towards the centre of the plate (to
 emulate actual gameplay)

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

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
index 3e4ee5ffa9..ad404e1f63 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                 {
                     attemptCatch(new Fruit
                     {
-                        X = (RNG.NextSingle() - 0.5f) * Catcher.CalculateCatchWidth(beatmapDifficulty),
+                        X = (RNG.NextSingle() - 0.5f) * Catcher.CalculateCatchWidth(beatmapDifficulty) * 0.6f,
                     });
 
                     if (count-- == 0)

From 1884c18a2cc3d169012f89da64a16d65c7cd267f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Apr 2021 18:12:03 +0900
Subject: [PATCH 2756/3722] Ignore movement operations which have no offset

---
 osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index b1afbe0d61..f70e063ba9 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -519,7 +519,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 // Apply the start time at the newly snapped-to position
                 double offset = result.Time.Value - movementBlueprints.First().HitObject.StartTime;
 
-                Beatmap.PerformOnSelection(obj => obj.StartTime += offset);
+                if (offset != 0)
+                    Beatmap.PerformOnSelection(obj => obj.StartTime += offset);
             }
 
             return true;

From 8a6267580a207fc63c88ed3a962037eeff7ad162 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 22 Apr 2021 18:44:14 +0900
Subject: [PATCH 2757/3722] Fix nullref

---
 osu.Game/Scoring/ScoreInfo.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index bf131658ea..a6faaf6379 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -65,9 +65,11 @@ namespace osu.Game.Scoring
         {
             get
             {
-                Mod[] scoreMods = Array.Empty<Mod>();
+                var rulesetInstance = Ruleset?.CreateInstance();
+                if (rulesetInstance == null)
+                    return mods ?? Array.Empty<Mod>();
 
-                var rulesetInstance = Ruleset.CreateInstance();
+                Mod[] scoreMods = Array.Empty<Mod>();
 
                 if (mods != null)
                     scoreMods = mods;

From a5364b224f083be5d55a31c95203f7a65069f3cd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Apr 2021 18:47:04 +0900
Subject: [PATCH 2758/3722] Add simple key based time nudging support to editor

---
 .../Editing/TestSceneEditorSelection.cs       | 22 ++++++++++
 .../Input/Bindings/GlobalActionContainer.cs   |  8 ++++
 .../Timeline/TimelineBlueprintContainer.cs    | 42 ++++++++++++++++++-
 3 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
index 99f31b0c2a..c783ea1448 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
@@ -41,6 +41,28 @@ namespace osu.Game.Tests.Visual.Editing
             });
         }
 
+        [Test]
+        public void TestNudgeSelection()
+        {
+            HitCircle[] addedObjects = null;
+
+            AddStep("add hitobjects", () => EditorBeatmap.AddRange(addedObjects = new[]
+            {
+                new HitCircle { StartTime = 100 },
+                new HitCircle { StartTime = 200, Position = new Vector2(50) },
+                new HitCircle { StartTime = 300, Position = new Vector2(100) },
+                new HitCircle { StartTime = 400, Position = new Vector2(150) },
+            }));
+
+            AddStep("select objects", () => EditorBeatmap.SelectedHitObjects.AddRange(addedObjects));
+
+            AddStep("nudge forwards", () => InputManager.Key(Key.K));
+            AddAssert("objects moved forwards in time", () => addedObjects[0].StartTime > 100);
+
+            AddStep("nudge backwards", () => InputManager.Key(Key.J));
+            AddAssert("objects reverted to original position", () => addedObjects[0].StartTime == 100);
+        }
+
         [Test]
         public void TestBasicSelect()
         {
diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index e414e12dd1..6717de5658 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -71,6 +71,8 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.F3 }, GlobalAction.EditorTimingMode),
             new KeyBinding(new[] { InputKey.F4 }, GlobalAction.EditorSetupMode),
             new KeyBinding(new[] { InputKey.Control, InputKey.Shift, InputKey.A }, GlobalAction.EditorVerifyMode),
+            new KeyBinding(new[] { InputKey.J }, GlobalAction.EditorNudgeLeft),
+            new KeyBinding(new[] { InputKey.K }, GlobalAction.EditorNudgeRight),
         };
 
         public IEnumerable<KeyBinding> InGameKeyBindings => new[]
@@ -251,5 +253,11 @@ namespace osu.Game.Input.Bindings
 
         [Description("Verify mode")]
         EditorVerifyMode,
+
+        [Description("Nudge selection left")]
+        EditorNudgeLeft,
+
+        [Description("Nudge selection right")]
+        EditorNudgeRight
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index 7a3781a981..3555bc2800 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -12,9 +12,11 @@ using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Utils;
 using osu.Game.Graphics;
+using osu.Game.Input.Bindings;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
@@ -237,10 +239,48 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             }
         }
 
-        internal class TimelineSelectionHandler : SelectionHandler
+        internal class TimelineSelectionHandler : SelectionHandler, IKeyBindingHandler<GlobalAction>
         {
             // for now we always allow movement. snapping is provided by the Timeline's "distance" snap implementation
             public override bool HandleMovement(MoveSelectionEvent moveEvent) => true;
+
+            public bool OnPressed(GlobalAction action)
+            {
+                switch (action)
+                {
+                    case GlobalAction.EditorNudgeLeft:
+                        nudgeSelection(-1);
+                        return true;
+
+                    case GlobalAction.EditorNudgeRight:
+                        nudgeSelection(1);
+                        return true;
+                }
+
+                return false;
+            }
+
+            public void OnReleased(GlobalAction action)
+            {
+            }
+
+            /// <summary>
+            /// Nudge the current selection by the specified multiple of beat divisor lengths,
+            /// based on the timing at the first object in the selection.
+            /// </summary>
+            /// <param name="amount">The direction and count of beat divisor lengths to adjust.</param>
+            private void nudgeSelection(int amount)
+            {
+                var selected = EditorBeatmap.SelectedHitObjects;
+
+                if (selected.Count == 0)
+                    return;
+
+                var timingPoint = EditorBeatmap.ControlPointInfo.TimingPointAt(selected.First().StartTime);
+                double adjustment = timingPoint.BeatLength / EditorBeatmap.BeatDivisor * amount;
+
+                EditorBeatmap.PerformOnSelection(h => h.StartTime += adjustment);
+            }
         }
 
         private class TimelineDragBox : DragBox

From 30e6ea4291dd95fb87108263df1f677e151d32f4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 22 Apr 2021 18:59:57 +0900
Subject: [PATCH 2759/3722] Add failing test

---
 .../TestSceneHoldNoteInput.cs                 | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index 42ea12214f..668487f673 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -324,6 +324,33 @@ namespace osu.Game.Rulesets.Mania.Tests
             assertTailJudgement(HitResult.Ok);
         }
 
+        [Test]
+        public void TestZeroLength()
+        {
+            var beatmap = new Beatmap<ManiaHitObject>
+            {
+                HitObjects =
+                {
+                    new HoldNote
+                    {
+                        StartTime = 1000,
+                        Duration = 0,
+                        Column = 0,
+                    },
+                },
+                BeatmapInfo = { Ruleset = new ManiaRuleset().RulesetInfo },
+            };
+
+            performTest(new List<ReplayFrame>
+            {
+                new ManiaReplayFrame(beatmap.HitObjects[0].StartTime, ManiaAction.Key1),
+                new ManiaReplayFrame(beatmap.HitObjects[0].GetEndTime() + 1),
+            }, beatmap);
+
+            AddAssert("hold note hit", () => judgementResults.Where(j => beatmap.HitObjects[0].NestedHitObjects.Contains(j.HitObject))
+                                                             .All(j => j.Type.IsHit()));
+        }
+
         private void assertHeadJudgement(HitResult result)
             => AddAssert($"head judged as {result}", () => judgementResults.First(j => j.HitObject is Note).Type == result);
 

From 4148d473e3d4c949b312abcbc915f2fd3e99e925 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 22 Apr 2021 19:51:33 +0900
Subject: [PATCH 2760/3722] Fix hold note crashing with 0 length

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

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index 828ee7b03e..02829d87bd 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -221,7 +221,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             // As the note is being held, adjust the size of the sizing container. This has two effects:
             // 1. The contained masking container will mask the body and ticks.
             // 2. The head note will move along with the new "head position" in the container.
-            if (Head.IsHit && releaseTime == null)
+            if (Head.IsHit && releaseTime == null && DrawHeight > 0)
             {
                 // How far past the hit target this hold note is. Always a positive value.
                 float yOffset = Math.Max(0, Direction.Value == ScrollingDirection.Up ? -Y : Y);

From d20a8694e47264a5d6363550d8f3582d70cb8d10 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Apr 2021 19:55:06 +0900
Subject: [PATCH 2761/3722] Update resources

---
 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 3324af7c51..5b779b803f 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -51,7 +51,7 @@
     <Reference Include="Java.Interop" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2021.421.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index fcd1ed6987..da8163a971 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -30,7 +30,7 @@
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.421.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 34810a3106..dc7a57f905 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.421.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
   <PropertyGroup>

From 6588859c32296e9538f819a49328382f314b62bc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 22 Apr 2021 22:29:18 +0900
Subject: [PATCH 2762/3722] Remove loggings

---
 .../Multiplayer/Spectate/Sync/CatchUpSyncManager.cs | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSyncManager.cs
index 68bfef6500..1d3fcd824c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSyncManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSyncManager.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Graphics;
-using osu.Framework.Logging;
 using osu.Framework.Timing;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
@@ -84,16 +83,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
             int readyCount = slaves.Count(s => !s.WaitingOnFrames.Value);
 
             if (readyCount == slaves.Count)
-            {
-                Logger.Log("Gameplay started (all ready).");
                 return hasStarted = true;
-            }
 
             if (readyCount > 0 && (Time.Current - firstStartAttemptTime) > MAXIMUM_START_DELAY)
-            {
-                Logger.Log($"Gameplay started (maximum delay exceeded, {readyCount}/{slaves.Count} ready).");
                 return hasStarted = true;
-            }
 
             return false;
         }
@@ -124,19 +117,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
                 {
                     // Stop the slave from catching up if it's within the sync target.
                     if (timeDelta <= SYNC_TARGET)
-                    {
                         slave.IsCatchingUp = false;
-                        Logger.Log($"Slave {i} catchup finished (delta = {timeDelta})");
-                    }
                 }
                 else
                 {
                     // Make the slave start catching up if it's exceeded the maximum allowable sync offset.
                     if (timeDelta > MAX_SYNC_OFFSET)
-                    {
                         slave.IsCatchingUp = true;
-                        Logger.Log($"Slave {i} catchup started (too far behind, delta = {timeDelta})");
-                    }
                 }
             }
         }

From 64579d50ac160215d5a8f60dc5f5fa8526b27fbc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 22 Apr 2021 22:59:47 +0900
Subject: [PATCH 2763/3722] Use only single PlayerInstance for hit sample
 playback

---
 .../TestSceneMultiplayerSpectator.cs          | 46 ++++++++++++--
 .../Spectate/MultiplayerSpectator.cs          | 20 +++++++
 .../Multiplayer/Spectate/PlayerInstance.cs    | 60 +++++++++++++++++--
 3 files changed, 117 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
index 9ec7bfb60b..cd89d3bcc1 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
@@ -198,10 +198,40 @@ namespace osu.Game.Tests.Visual.Multiplayer
             checkPausedInstant(56, false);
 
             // Player 2 should catch up to player 1 after unpausing.
-            AddUntilStep("player 2 not catching up", () => !getInstance(56).GameplayClock.IsCatchingUp);
+            waitForCatchup(56);
             AddWaitStep("wait a bit", 10);
         }
 
+        [Test]
+        public void TestMostInSyncUserIsAudioSource()
+        {
+            start(new[] { 55, 56 });
+            loadSpectateScreen();
+
+            assertVolume(55, 0);
+            assertVolume(56, 0);
+
+            sendFrames(55, 10);
+            sendFrames(56, 20);
+            assertVolume(55, 1);
+            assertVolume(56, 0);
+
+            checkPaused(55, true);
+            assertVolume(55, 0);
+            assertVolume(56, 1);
+
+            sendFrames(55, 100);
+            waitForCatchup(55);
+            checkPaused(56, true);
+            assertVolume(55, 1);
+            assertVolume(56, 0);
+
+            sendFrames(56, 100);
+            waitForCatchup(56);
+            assertVolume(55, 1);
+            assertVolume(56, 0);
+        }
+
         private void loadSpectateScreen(bool waitForPlayerLoad = true)
         {
             AddStep("load screen", () =>
@@ -255,11 +285,17 @@ namespace osu.Game.Tests.Visual.Multiplayer
             });
         }
 
-        private void checkPaused(int userId, bool state) =>
-            AddUntilStep($"{userId} is {(state ? "paused" : "playing")}", () => getPlayer(userId).ChildrenOfType<GameplayClockContainer>().First().GameplayClock.IsRunning != state);
+        private void checkPaused(int userId, bool state)
+            => AddUntilStep($"{userId} is {(state ? "paused" : "playing")}", () => getPlayer(userId).ChildrenOfType<GameplayClockContainer>().First().GameplayClock.IsRunning != state);
 
-        private void checkPausedInstant(int userId, bool state) =>
-            AddAssert($"{userId} is {(state ? "paused" : "playing")}", () => getPlayer(userId).ChildrenOfType<GameplayClockContainer>().First().GameplayClock.IsRunning != state);
+        private void checkPausedInstant(int userId, bool state)
+            => AddAssert($"{userId} is {(state ? "paused" : "playing")}", () => getPlayer(userId).ChildrenOfType<GameplayClockContainer>().First().GameplayClock.IsRunning != state);
+
+        private void assertVolume(int userId, double volume)
+            => AddAssert($"{userId} volume is {volume}", () => getInstance(userId).Volume.Value == volume);
+
+        private void waitForCatchup(int userId)
+            => AddUntilStep($"{userId} not catching up", () => !getInstance(userId).GameplayClock.IsCatchingUp);
 
         private Player getPlayer(int userId) => getInstance(userId).ChildrenOfType<Player>().Single();
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
index 2db470da67..33dd57586c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -28,6 +29,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         private ISyncManager syncManager;
         private PlayerGrid grid;
         private MultiplayerSpectatorLeaderboard leaderboard;
+        private PlayerInstance currentAudioSource;
 
         public MultiplayerSpectator(int[] userIds)
             : base(userIds.AsSpan().Slice(0, Math.Min(16, userIds.Length)).ToArray())
@@ -85,6 +87,24 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             masterClockContainer.Reset();
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            if (!isCandidateAudioSource(currentAudioSource?.GameplayClock))
+            {
+                currentAudioSource = instances.Where(i => isCandidateAudioSource(i.GameplayClock))
+                                              .OrderBy(i => Math.Abs(i.GameplayClock.CurrentTime - syncManager.Master.CurrentTime))
+                                              .FirstOrDefault();
+
+                foreach (var instance in instances)
+                    instance.Volume.Value = instance == currentAudioSource ? 1 : 0;
+            }
+        }
+
+        private bool isCandidateAudioSource([CanBeNull] ISlaveClock clock)
+            => clock?.IsRunning == true && !clock.IsCatchingUp && !clock.WaitingOnFrames.Value;
+
         protected override void OnUserStateChanged(int userId, SpectatorState spectatorState)
         {
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
index 407732ee2e..80d6727599 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
@@ -3,6 +3,8 @@
 
 using System;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
@@ -13,7 +15,7 @@ using osu.Game.Screens.Play;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
-    public class PlayerInstance : CompositeDrawable
+    public class PlayerInstance : CompositeDrawable, IAdjustableAudioComponent
     {
         public bool PlayerLoaded => stack?.CurrentScreen is Player;
 
@@ -25,8 +27,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
 
-        private readonly Container content;
+        private readonly Container gameplayContent;
         private readonly LoadingLayer loadingLayer;
+        private readonly AudioContainer audioContainer;
         private OsuScreenStack stack;
 
         public PlayerInstance(int userId, CatchUpSlaveClock gameplayClock)
@@ -39,7 +42,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
             InternalChildren = new Drawable[]
             {
-                content = new DrawSizePreservingFillContainer { RelativeSizeAxes = Axes.Both },
+                audioContainer = new AudioContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Child = gameplayContent = new DrawSizePreservingFillContainer { RelativeSizeAxes = Axes.Both },
+                },
                 loadingLayer = new LoadingLayer(true) { State = { Value = Visibility.Visible } }
             };
         }
@@ -51,7 +58,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
             Score = score;
 
-            content.Child = new GameplayIsolationContainer(beatmapManager.GetWorkingBeatmap(Score.ScoreInfo.Beatmap, bypassCache: true), Score.ScoreInfo.Ruleset, Score.ScoreInfo.Mods)
+            gameplayContent.Child = new GameplayIsolationContainer(beatmapManager.GetWorkingBeatmap(Score.ScoreInfo.Beatmap), Score.ScoreInfo.Ruleset, Score.ScoreInfo.Mods)
             {
                 RelativeSizeAxes = Axes.Both,
                 Child = stack = new OsuScreenStack()
@@ -64,5 +71,50 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         // Player interferes with global input, so disable input for now.
         public override bool PropagatePositionalInputSubTree => false;
         public override bool PropagateNonPositionalInputSubTree => false;
+
+        #region IAdjustableAudioComponent
+
+        public IBindable<double> AggregateVolume => audioContainer.AggregateVolume;
+
+        public IBindable<double> AggregateBalance => audioContainer.AggregateBalance;
+
+        public IBindable<double> AggregateFrequency => audioContainer.AggregateFrequency;
+
+        public IBindable<double> AggregateTempo => audioContainer.AggregateTempo;
+
+        public void BindAdjustments(IAggregateAudioAdjustment component)
+        {
+            audioContainer.BindAdjustments(component);
+        }
+
+        public void UnbindAdjustments(IAggregateAudioAdjustment component)
+        {
+            audioContainer.UnbindAdjustments(component);
+        }
+
+        public void AddAdjustment(AdjustableProperty type, IBindable<double> adjustBindable)
+        {
+            audioContainer.AddAdjustment(type, adjustBindable);
+        }
+
+        public void RemoveAdjustment(AdjustableProperty type, IBindable<double> adjustBindable)
+        {
+            audioContainer.RemoveAdjustment(type, adjustBindable);
+        }
+
+        public void RemoveAllAdjustments(AdjustableProperty type)
+        {
+            audioContainer.RemoveAllAdjustments(type);
+        }
+
+        public BindableNumber<double> Volume => audioContainer.Volume;
+
+        public BindableNumber<double> Balance => audioContainer.Balance;
+
+        public BindableNumber<double> Frequency => audioContainer.Frequency;
+
+        public BindableNumber<double> Tempo => audioContainer.Tempo;
+
+        #endregion
     }
 }

From 22a3f3ad3e9f022fb85e1258aa0a2184a58fe671 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 22 Apr 2021 23:04:54 +0900
Subject: [PATCH 2764/3722] Revert unnecessary BeatmapManager change

---
 osu.Game/Beatmaps/BeatmapManager.cs | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index abb1f5a93c..5e975de77c 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -281,9 +281,8 @@ namespace osu.Game.Beatmaps
         /// </summary>
         /// <param name="beatmapInfo">The beatmap to lookup.</param>
         /// <param name="previous">The currently loaded <see cref="WorkingBeatmap"/>. Allows for optimisation where elements are shared with the new beatmap. May be returned if beatmapInfo requested matches</param>
-        /// <param name="bypassCache">Whether to bypass the cache and return a new <see cref="WorkingBeatmap"/> instance.</param>
         /// <returns>A <see cref="WorkingBeatmap"/> instance correlating to the provided <see cref="BeatmapInfo"/>.</returns>
-        public WorkingBeatmap GetWorkingBeatmap(BeatmapInfo beatmapInfo, WorkingBeatmap previous = null, bool bypassCache = false)
+        public WorkingBeatmap GetWorkingBeatmap(BeatmapInfo beatmapInfo, WorkingBeatmap previous = null)
         {
             if (beatmapInfo?.ID > 0 && previous != null && previous.BeatmapInfo?.ID == beatmapInfo.ID)
                 return previous;
@@ -302,14 +301,9 @@ namespace osu.Game.Beatmaps
 
             lock (workingCache)
             {
-                BeatmapManagerWorkingBeatmap working;
-
-                if (!bypassCache)
-                {
-                    working = workingCache.FirstOrDefault(w => w.BeatmapInfo?.ID == beatmapInfo.ID);
-                    if (working != null)
-                        return working;
-                }
+                var working = workingCache.FirstOrDefault(w => w.BeatmapInfo?.ID == beatmapInfo.ID);
+                if (working != null)
+                    return working;
 
                 beatmapInfo.Metadata ??= beatmapInfo.BeatmapSet.Metadata;
 

From b4f492ca4ce6e171bd3ff9cfd02d5a98140f0666 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Apr 2021 23:06:46 +0900
Subject: [PATCH 2765/3722] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 7b97103851..140057f9cc 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.422.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.422.1" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index b27e00f59d..532dea7ace 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.422.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.422.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index d07e16ea56..edebefa70e 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.422.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.422.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.422.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.422.1" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 0ee73b8e536a37d94d56fcfe4f1878716f5687bf Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 22 Apr 2021 23:22:44 +0900
Subject: [PATCH 2766/3722] Add failing test

---
 .../StatefulMultiplayerClientTest.cs          | 26 +++++++++++++++++++
 .../Multiplayer/TestMultiplayerClient.cs      | 11 +++++---
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs b/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs
index a2ad37cf4a..377a33b527 100644
--- a/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs
+++ b/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs
@@ -41,6 +41,32 @@ namespace osu.Game.Tests.NonVisual.Multiplayer
             checkPlayingUserCount(0);
         }
 
+        [Test]
+        public void TestPlayingUsersUpdatedOnJoin()
+        {
+            AddStep("leave room", () => Client.LeaveRoom());
+            AddUntilStep("wait for room part", () => Client.Room == null);
+
+            AddStep("create room initially in gameplay", () =>
+            {
+                Room.RoomID.Value = null;
+                Client.RoomSetupAction = room =>
+                {
+                    room.State = MultiplayerRoomState.Playing;
+                    room.Users.Add(new MultiplayerRoomUser(55)
+                    {
+                        User = new User { Id = 55 },
+                        State = MultiplayerUserState.Playing
+                    });
+                };
+
+                RoomManager.CreateRoom(Room);
+            });
+
+            AddUntilStep("wait for room join", () => Client.Room != null);
+            checkPlayingUserCount(1);
+        }
+
         private void checkPlayingUserCount(int expectedCount)
             => AddAssert($"{"user".ToQuantity(expectedCount)} playing", () => Client.CurrentMatchPlayingUserIds.Count == expectedCount);
 
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index b5cd3dad02..de77a15da0 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
         public override IBindable<bool> IsConnected => isConnected;
         private readonly Bindable<bool> isConnected = new Bindable<bool>(true);
 
+        public Action<MultiplayerRoom>? RoomSetupAction;
+
         [Resolved]
         private IAPIProvider api { get; set; } = null!;
 
@@ -112,7 +114,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             var apiRoom = roomManager.Rooms.Single(r => r.RoomID.Value == roomId);
 
-            var user = new MultiplayerRoomUser(api.LocalUser.Value.Id)
+            var localUser = new MultiplayerRoomUser(api.LocalUser.Value.Id)
             {
                 User = api.LocalUser.Value
             };
@@ -129,10 +131,13 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     AllowedMods = apiRoom.Playlist.Last().AllowedMods.Select(m => new APIMod(m)).ToArray(),
                     PlaylistItemId = apiRoom.Playlist.Last().ID
                 },
-                Users = { user },
-                Host = user
+                Users = { localUser },
+                Host = localUser
             };
 
+            RoomSetupAction?.Invoke(room);
+            RoomSetupAction = null;
+
             return Task.FromResult(room);
         }
 

From f593d9e42c3efa144dc07df35f504bd15efc41c7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 22 Apr 2021 23:23:43 +0900
Subject: [PATCH 2767/3722] Fix playing users not being updated on room join

---
 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index 2ddc10db0f..c0706b082d 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -144,6 +144,8 @@ namespace osu.Game.Online.Multiplayer
                     Room = joinedRoom;
                     apiRoom = room;
                     defaultPlaylistItemId = apiRoom.Playlist.FirstOrDefault()?.ID ?? 0;
+                    foreach (var user in joinedRoom.Users)
+                        updateUserPlayingState(user.UserID, user.State);
                 }, cancellationSource.Token).ConfigureAwait(false);
 
                 // Update room settings.

From fd0b030cf431ecb0ab3ea45bbcac68ee0545a207 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 22 Apr 2021 23:37:33 +0900
Subject: [PATCH 2768/3722] Refactor gameplay screen creation

---
 .../Screens/OnlinePlay/Match/RoomSubScreen.cs | 13 +++++++-----
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 21 ++++++++++++-------
 .../Playlists/PlaylistsRoomSubScreen.cs       |  9 +++-----
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 0d1ed5d88e..68bdd9160e 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -17,7 +17,6 @@ using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Screens.Play;
 
 namespace osu.Game.Screens.OnlinePlay.Match
 {
@@ -148,14 +147,18 @@ namespace osu.Game.Screens.OnlinePlay.Match
             return base.OnExiting(next);
         }
 
-        protected void StartPlay(Func<Player> player) => PushTopLevelScreen(() => new PlayerLoader(player));
-
-        protected void PushTopLevelScreen(Func<Screen> screen)
+        protected void StartPlay()
         {
             sampleStart?.Play();
-            ParentScreen?.Push(screen());
+            ParentScreen?.Push(CreateGameplayScreen());
         }
 
+        /// <summary>
+        /// Creates the gameplay screen to be entered.
+        /// </summary>
+        /// <returns>The screen to enter.</returns>
+        protected abstract Screen CreateGameplayScreen();
+
         private void selectedItemChanged()
         {
             updateWorkingBeatmap();
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 9a68ff908d..c5d7610b53 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -416,10 +416,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             UpdateMods();
 
             if (client.LocalUser.State == MultiplayerUserState.Spectating
-                && (client.Room.State == MultiplayerRoomState.Playing || client.Room.State == MultiplayerRoomState.WaitingForLoad)
-                && ParentScreen.IsCurrentScreen())
+                && (client.Room.State == MultiplayerRoomState.Playing || client.Room.State == MultiplayerRoomState.WaitingForLoad))
             {
-                PushTopLevelScreen(() => new MultiplayerSpectator(client.CurrentMatchPlayingUserIds.ToArray()));
+                StartPlay();
 
                 // If the current user was host, they started the match and the in-progres operation needs to be stopped now.
                 readyClickOperation?.Dispose();
@@ -429,16 +428,22 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private void onLoadRequested()
         {
-            Debug.Assert(client.Room != null);
-
-            int[] userIds = client.CurrentMatchPlayingUserIds.ToArray();
-
-            StartPlay(() => new MultiplayerPlayer(SelectedItem.Value, userIds));
+            StartPlay();
 
             readyClickOperation?.Dispose();
             readyClickOperation = null;
         }
 
+        protected override Screen CreateGameplayScreen()
+        {
+            Debug.Assert(client.LocalUser != null);
+
+            if (client.LocalUser.State == MultiplayerUserState.Spectating)
+                return new MultiSpectatorScreen(client.CurrentMatchPlayingUserIds.ToArray());
+
+            return new MultiplayerPlayer(SelectedItem.Value, client.CurrentMatchPlayingUserIds.ToArray());
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
index 6542d01e64..11bc55823f 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
@@ -218,10 +218,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                         },
                         new Drawable[]
                         {
-                            new Footer
-                            {
-                                OnStart = onStart,
-                            }
+                            new Footer { OnStart = StartPlay }
                         }
                     },
                     RowDimensions = new[]
@@ -274,9 +271,9 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
             }, true);
         }
 
-        private void onStart() => StartPlay(() => new PlaylistsPlayer(SelectedItem.Value)
+        protected override Screen CreateGameplayScreen() => new PlaylistsPlayer(SelectedItem.Value)
         {
             Exited = () => leaderboard.RefreshScores()
-        });
+        };
     }
 }

From 4aceb75eb2f8c5c40ff796ecc8d8fd22c3a6ddf1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 22 Apr 2021 23:37:45 +0900
Subject: [PATCH 2769/3722] Disable spectate button on closed rooms

Doesn't have an effect normally - only for safety purposes in case we
allow entering the match subscreen after a match has finished in the
future.
---
 .../OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs
index 465af037e2..04150902bc 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerSpectateButton.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
                     break;
             }
 
-            button.Enabled.Value = !operationInProgress.Value;
+            button.Enabled.Value = Client.Room?.State != MultiplayerRoomState.Closed && !operationInProgress.Value;
         }
 
         private class ButtonWithTrianglesExposed : TriangleButton

From 8a0ba3a05557e3d1f20521e577bb61d7604c9a97 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 22 Apr 2021 23:38:51 +0900
Subject: [PATCH 2770/3722] Merge GameplayIsolationContainer into
 PlayerInstance, remove track

---
 .../Spectate/GameplayIsolationContainer.cs    | 52 -------------------
 .../Multiplayer/Spectate/PlayerInstance.cs    | 35 ++++++++++++-
 2 files changed, 33 insertions(+), 54 deletions(-)
 delete mode 100644 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/GameplayIsolationContainer.cs

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/GameplayIsolationContainer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/GameplayIsolationContainer.cs
deleted file mode 100644
index 7b6a544084..0000000000
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/GameplayIsolationContainer.cs
+++ /dev/null
@@ -1,52 +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.Framework.Allocation;
-using osu.Framework.Audio.Track;
-using osu.Framework.Bindables;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Beatmaps;
-using osu.Game.Rulesets;
-using osu.Game.Rulesets.Mods;
-
-namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
-{
-    public class GameplayIsolationContainer : Container
-    {
-        [Cached]
-        private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
-
-        [Cached]
-        private readonly Bindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
-
-        [Cached]
-        private readonly Bindable<IReadOnlyList<Mod>> mods = new Bindable<IReadOnlyList<Mod>>();
-
-        private readonly Track track;
-
-        public GameplayIsolationContainer(WorkingBeatmap beatmap, RulesetInfo ruleset, IReadOnlyList<Mod> mods)
-        {
-            this.beatmap.Value = beatmap;
-            this.ruleset.Value = ruleset;
-            this.mods.Value = mods;
-
-            track = beatmap.LoadTrack();
-        }
-
-        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
-        {
-            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
-            dependencies.CacheAs(ruleset.BeginLease(false));
-            dependencies.CacheAs(beatmap.BeginLease(false));
-            dependencies.CacheAs(mods.BeginLease(false));
-            return dependencies;
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-            track?.Dispose();
-        }
-    }
-}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
index 80d6727599..8007c9e068 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.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.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Bindables;
@@ -9,6 +10,8 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync;
 using osu.Game.Screens.Play;
@@ -58,13 +61,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
             Score = score;
 
-            gameplayContent.Child = new GameplayIsolationContainer(beatmapManager.GetWorkingBeatmap(Score.ScoreInfo.Beatmap), Score.ScoreInfo.Ruleset, Score.ScoreInfo.Mods)
+            gameplayContent.Child = new PlayerIsolationContainer(beatmapManager.GetWorkingBeatmap(Score.ScoreInfo.Beatmap), Score.ScoreInfo.Ruleset, Score.ScoreInfo.Mods)
             {
                 RelativeSizeAxes = Axes.Both,
                 Child = stack = new OsuScreenStack()
             };
 
-            stack.Push(new MultiplayerSpectatorPlayerLoader(Score, () => new MultiplayerSpectatorPlayer(Score, GameplayClock)));
+            stack.Push(new MultiSpectatorPlayerLoader(Score, () => new MultiSpectatorPlayer(Score, GameplayClock)));
             loadingLayer.Hide();
         }
 
@@ -116,5 +119,33 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         public BindableNumber<double> Tempo => audioContainer.Tempo;
 
         #endregion
+
+        private class PlayerIsolationContainer : Container
+        {
+            [Cached]
+            private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
+
+            [Cached]
+            private readonly Bindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
+
+            [Cached]
+            private readonly Bindable<IReadOnlyList<Mod>> mods = new Bindable<IReadOnlyList<Mod>>();
+
+            public PlayerIsolationContainer(WorkingBeatmap beatmap, RulesetInfo ruleset, IReadOnlyList<Mod> mods)
+            {
+                this.beatmap.Value = beatmap;
+                this.ruleset.Value = ruleset;
+                this.mods.Value = mods;
+            }
+
+            protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
+            {
+                var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+                dependencies.CacheAs(ruleset.BeginLease(false));
+                dependencies.CacheAs(beatmap.BeginLease(false));
+                dependencies.CacheAs(mods.BeginLease(false));
+                return dependencies;
+            }
+        }
     }
 }

From ee259497519f71d360616b6f2dc92247bfdfe43b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 22 Apr 2021 23:39:02 +0900
Subject: [PATCH 2771/3722] Rename classes

---
 .../Multiplayer/TestSceneMultiplayerSpectator.cs     | 12 ++++++------
 .../TestSceneMultiplayerSpectatorLeaderboard.cs      |  4 ++--
 ...orLeaderboard.cs => MultiSpectatorLeaderboard.cs} |  4 ++--
 ...yerSpectatorPlayer.cs => MultiSpectatorPlayer.cs} |  4 ++--
 ...PlayerLoader.cs => MultiSpectatorPlayerLoader.cs} |  4 ++--
 ...ltiplayerSpectator.cs => MultiSpectatorScreen.cs} |  8 ++++----
 .../Multiplayer/Spectate/Sync/ISlaveClock.cs         |  2 +-
 7 files changed, 19 insertions(+), 19 deletions(-)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/{MultiplayerSpectatorLeaderboard.cs => MultiSpectatorLeaderboard.cs} (92%)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/{MultiplayerSpectatorPlayer.cs => MultiSpectatorPlayer.cs} (93%)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/{MultiplayerSpectatorPlayerLoader.cs => MultiSpectatorPlayerLoader.cs} (75%)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/{MultiplayerSpectator.cs => MultiSpectatorScreen.cs} (93%)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
index cd89d3bcc1..0b77a1a9e2 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
 
-        private MultiplayerSpectator spectator;
+        private MultiSpectatorScreen spectatorScreen;
 
         private readonly List<int> playingUserIds = new List<int>();
         private readonly Dictionary<int, int> nextFrame = new Dictionary<int, int>();
@@ -91,11 +91,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             AddWaitStep("wait a bit", 10);
             AddStep("load player 55", () => streamingClient.StartPlay(55, importedBeatmapId));
-            AddUntilStep("one player added", () => spectator.ChildrenOfType<Player>().Count() == 1);
+            AddUntilStep("one player added", () => spectatorScreen.ChildrenOfType<Player>().Count() == 1);
 
             AddWaitStep("wait a bit", 10);
             AddStep("load player 56", () => streamingClient.StartPlay(56, importedBeatmapId));
-            AddUntilStep("two players added", () => spectator.ChildrenOfType<Player>().Count() == 2);
+            AddUntilStep("two players added", () => spectatorScreen.ChildrenOfType<Player>().Count() == 2);
         }
 
         [Test]
@@ -239,10 +239,10 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 Beatmap.Value = beatmapManager.GetWorkingBeatmap(importedBeatmap);
                 Ruleset.Value = importedBeatmap.Ruleset;
 
-                LoadScreen(spectator = new MultiplayerSpectator(playingUserIds.ToArray()));
+                LoadScreen(spectatorScreen = new MultiSpectatorScreen(playingUserIds.ToArray()));
             });
 
-            AddUntilStep("wait for screen load", () => spectator.LoadState == LoadState.Loaded && (!waitForPlayerLoad || spectator.AllPlayersLoaded));
+            AddUntilStep("wait for screen load", () => spectatorScreen.LoadState == LoadState.Loaded && (!waitForPlayerLoad || spectatorScreen.AllPlayersLoaded));
         }
 
         private void start(int userId, int? beatmapId = null) => start(new[] { userId }, beatmapId);
@@ -299,7 +299,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         private Player getPlayer(int userId) => getInstance(userId).ChildrenOfType<Player>().Single();
 
-        private PlayerInstance getInstance(int userId) => spectator.ChildrenOfType<PlayerInstance>().Single(p => p.UserId == userId);
+        private PlayerInstance getInstance(int userId) => spectatorScreen.ChildrenOfType<PlayerInstance>().Single(p => p.UserId == userId);
 
         public class TestSpectatorStreamingClient : SpectatorStreamingClient
         {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs
index 3b2cfb1c7b..8368186219 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [SetUpSteps]
         public new void SetUpSteps()
         {
-            MultiplayerSpectatorLeaderboard leaderboard = null;
+            MultiSpectatorLeaderboard leaderboard = null;
 
             AddStep("reset", () =>
             {
@@ -78,7 +78,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 var scoreProcessor = new OsuScoreProcessor();
                 scoreProcessor.ApplyBeatmap(playable);
 
-                LoadComponentAsync(leaderboard = new MultiplayerSpectatorLeaderboard(scoreProcessor, clocks.Keys.ToArray()) { Expanded = { Value = true } }, Add);
+                LoadComponentAsync(leaderboard = new MultiSpectatorLeaderboard(scoreProcessor, clocks.Keys.ToArray()) { Expanded = { Value = true } }, Add);
             });
 
             AddUntilStep("wait for load", () => leaderboard.IsLoaded);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorLeaderboard.cs
similarity index 92%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorLeaderboard.cs
index 1b9e2bda2d..96c7702048 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorLeaderboard.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorLeaderboard.cs
@@ -9,9 +9,9 @@ using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
-    public class MultiplayerSpectatorLeaderboard : MultiplayerGameplayLeaderboard
+    public class MultiSpectatorLeaderboard : MultiplayerGameplayLeaderboard
     {
-        public MultiplayerSpectatorLeaderboard(ScoreProcessor scoreProcessor, int[] userIds)
+        public MultiSpectatorLeaderboard(ScoreProcessor scoreProcessor, int[] userIds)
             : base(scoreProcessor, userIds)
         {
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
similarity index 93%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
index 69b38c61f7..0101c00041 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
@@ -11,13 +11,13 @@ using osu.Game.Screens.Play;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
-    public class MultiplayerSpectatorPlayer : SpectatorPlayer
+    public class MultiSpectatorPlayer : SpectatorPlayer
     {
         private readonly Bindable<bool> waitingOnFrames = new Bindable<bool>(true);
         private readonly Score score;
         private readonly ISlaveClock slaveClock;
 
-        public MultiplayerSpectatorPlayer(Score score, ISlaveClock slaveClock)
+        public MultiSpectatorPlayer(Score score, ISlaveClock slaveClock)
             : base(score)
         {
             this.score = score;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayerLoader.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayerLoader.cs
similarity index 75%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayerLoader.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayerLoader.cs
index c8f16b5e90..fce44296f3 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectatorPlayerLoader.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayerLoader.cs
@@ -8,9 +8,9 @@ using osu.Game.Screens.Play;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
-    public class MultiplayerSpectatorPlayerLoader : SpectatorPlayerLoader
+    public class MultiSpectatorPlayerLoader : SpectatorPlayerLoader
     {
-        public MultiplayerSpectatorPlayerLoader(Score score, Func<MultiplayerSpectatorPlayer> createPlayer)
+        public MultiSpectatorPlayerLoader(Score score, Func<MultiSpectatorPlayer> createPlayer)
             : base(score, createPlayer)
         {
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
similarity index 93%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index 33dd57586c..52b7898028 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiplayerSpectator.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -14,7 +14,7 @@ using osu.Game.Screens.Spectate;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
-    public class MultiplayerSpectator : SpectatorScreen
+    public class MultiSpectatorScreen : SpectatorScreen
     {
         // Isolates beatmap/ruleset to this screen.
         public override bool DisallowExternalBeatmapRulesetChanges => true;
@@ -28,10 +28,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         private MasterGameplayClockContainer masterClockContainer;
         private ISyncManager syncManager;
         private PlayerGrid grid;
-        private MultiplayerSpectatorLeaderboard leaderboard;
+        private MultiSpectatorLeaderboard leaderboard;
         private PlayerInstance currentAudioSource;
 
-        public MultiplayerSpectator(int[] userIds)
+        public MultiSpectatorScreen(int[] userIds)
             : base(userIds.AsSpan().Slice(0, Math.Min(16, userIds.Length)).ToArray())
         {
             instances = new PlayerInstance[UserIds.Length];
@@ -76,7 +76,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             var scoreProcessor = Ruleset.Value.CreateInstance().CreateScoreProcessor();
             scoreProcessor.ApplyBeatmap(playableBeatmap);
 
-            LoadComponentAsync(leaderboard = new MultiplayerSpectatorLeaderboard(scoreProcessor, UserIds) { Expanded = { Value = true } }, leaderboardContainer.Add);
+            LoadComponentAsync(leaderboard = new MultiSpectatorLeaderboard(scoreProcessor, UserIds) { Expanded = { Value = true } }, leaderboardContainer.Add);
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISlaveClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISlaveClock.cs
index f45cb1fde6..08d69f9560 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISlaveClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISlaveClock.cs
@@ -7,7 +7,7 @@ using osu.Framework.Timing;
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
 {
     /// <summary>
-    /// A clock which is used by <see cref="MultiplayerSpectatorPlayer"/>s and managed by an <see cref="ISyncManager"/>.
+    /// A clock which is used by <see cref="MultiSpectatorPlayer"/>s and managed by an <see cref="ISyncManager"/>.
     /// </summary>
     public interface ISlaveClock : IFrameBasedClock, IAdjustableClock
     {

From 4f0857f946e96d5c0c9da4440587e09488ca083e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 22 Apr 2021 23:52:22 +0900
Subject: [PATCH 2772/3722] Xmldocs and general refactorings

---
 .../TestSceneMultiplayerSpectator.cs          |  2 +-
 .../Spectate/MultiSpectatorLeaderboard.cs     |  2 +-
 .../Spectate/MultiSpectatorPlayer.cs          | 17 +++++++++--
 .../Spectate/MultiSpectatorPlayerLoader.cs    |  6 +++-
 .../Spectate/MultiSpectatorScreen.cs          | 18 +++++++++---
 .../{PlayerInstance.cs => PlayerArea.cs}      | 29 +++++++++++++++----
 6 files changed, 59 insertions(+), 15 deletions(-)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/{PlayerInstance.cs => PlayerArea.cs} (83%)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
index 0b77a1a9e2..a82dea5640 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
@@ -299,7 +299,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         private Player getPlayer(int userId) => getInstance(userId).ChildrenOfType<Player>().Single();
 
-        private PlayerInstance getInstance(int userId) => spectatorScreen.ChildrenOfType<PlayerInstance>().Single(p => p.UserId == userId);
+        private PlayerArea getInstance(int userId) => spectatorScreen.ChildrenOfType<PlayerArea>().Single(p => p.UserId == userId);
 
         public class TestSpectatorStreamingClient : SpectatorStreamingClient
         {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorLeaderboard.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorLeaderboard.cs
index 96c7702048..ab3ead68b5 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorLeaderboard.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorLeaderboard.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     public class MultiSpectatorLeaderboard : MultiplayerGameplayLeaderboard
     {
-        public MultiSpectatorLeaderboard(ScoreProcessor scoreProcessor, int[] userIds)
+        public MultiSpectatorLeaderboard([NotNull] ScoreProcessor scoreProcessor, int[] userIds)
             : base(scoreProcessor, userIds)
         {
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
index 0101c00041..4ed949893c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.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 JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Timing;
@@ -11,13 +12,21 @@ using osu.Game.Screens.Play;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
+    /// <summary>
+    /// A single spectated player within a <see cref="MultiSpectatorScreen"/>.
+    /// </summary>
     public class MultiSpectatorPlayer : SpectatorPlayer
     {
         private readonly Bindable<bool> waitingOnFrames = new Bindable<bool>(true);
         private readonly Score score;
         private readonly ISlaveClock slaveClock;
 
-        public MultiSpectatorPlayer(Score score, ISlaveClock slaveClock)
+        /// <summary>
+        /// Creates a new <see cref="MultiSpectatorPlayer"/>.
+        /// </summary>
+        /// <param name="score">The score containing the player's replay.</param>
+        /// <param name="slaveClock">The clock controlling the gameplay running state.</param>
+        public MultiSpectatorPlayer([NotNull] Score score, [NotNull] ISlaveClock slaveClock)
             : base(score)
         {
             this.score = score;
@@ -33,6 +42,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         protected override void UpdateAfterChildren()
         {
             base.UpdateAfterChildren();
+
+            // This is required because the frame stable clock is set to WaitingOnFrames = false for one frame.
             waitingOnFrames.Value = DrawableRuleset.FrameStableClock.WaitingOnFrames.Value || score.Replay.Frames.Count == 0;
         }
 
@@ -41,14 +52,14 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         private class SlaveGameplayClockContainer : GameplayClockContainer
         {
-            public SlaveGameplayClockContainer(IClock sourceClock)
+            public SlaveGameplayClockContainer([NotNull] IClock sourceClock)
                 : base(sourceClock)
             {
             }
 
             protected override void Update()
             {
-                // The slave clock's running state is controlled by the sync manager, but the local pausing state needs to be updated to stop gameplay.
+                // The slave clock's running state is controlled externally, but the local pausing state needs to be updated to stop gameplay.
                 if (SourceClock.IsRunning)
                     Start();
                 else
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayerLoader.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayerLoader.cs
index fce44296f3..5a1d28e9c4 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayerLoader.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayerLoader.cs
@@ -2,15 +2,19 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using JetBrains.Annotations;
 using osu.Game.Scoring;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.Play;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
+    /// <summary>
+    /// Used to load a single <see cref="MultiSpectatorPlayer"/> in a <see cref="MultiSpectatorScreen"/>.
+    /// </summary>
     public class MultiSpectatorPlayerLoader : SpectatorPlayerLoader
     {
-        public MultiSpectatorPlayerLoader(Score score, Func<MultiSpectatorPlayer> createPlayer)
+        public MultiSpectatorPlayerLoader([NotNull] Score score, [NotNull] Func<MultiSpectatorPlayer> createPlayer)
             : base(score, createPlayer)
         {
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index 52b7898028..609905a312 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -14,27 +14,37 @@ using osu.Game.Screens.Spectate;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
+    /// <summary>
+    /// A <see cref="SpectatorScreen"/> that spectates multiple users in a match.
+    /// </summary>
     public class MultiSpectatorScreen : SpectatorScreen
     {
         // Isolates beatmap/ruleset to this screen.
         public override bool DisallowExternalBeatmapRulesetChanges => true;
 
+        /// <summary>
+        /// Whether all spectating players have finished loading.
+        /// </summary>
         public bool AllPlayersLoaded => instances.All(p => p?.PlayerLoaded == true);
 
         [Resolved]
         private SpectatorStreamingClient spectatorClient { get; set; }
 
-        private readonly PlayerInstance[] instances;
+        private readonly PlayerArea[] instances;
         private MasterGameplayClockContainer masterClockContainer;
         private ISyncManager syncManager;
         private PlayerGrid grid;
         private MultiSpectatorLeaderboard leaderboard;
-        private PlayerInstance currentAudioSource;
+        private PlayerArea currentAudioSource;
 
+        /// <summary>
+        /// Creates a new <see cref="MultiSpectatorScreen"/>.
+        /// </summary>
+        /// <param name="userIds">The players to spectate.</param>
         public MultiSpectatorScreen(int[] userIds)
             : base(userIds.AsSpan().Slice(0, Math.Min(16, userIds.Length)).ToArray())
         {
-            instances = new PlayerInstance[UserIds.Length];
+            instances = new PlayerArea[UserIds.Length];
         }
 
         [BackgroundDependencyLoader]
@@ -69,7 +79,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             };
 
             for (int i = 0; i < UserIds.Length; i++)
-                grid.Add(instances[i] = new PlayerInstance(UserIds[i], new CatchUpSlaveClock(masterClockContainer.GameplayClock)));
+                grid.Add(instances[i] = new PlayerArea(UserIds[i], new CatchUpSlaveClock(masterClockContainer.GameplayClock)));
 
             // Todo: This is not quite correct - it should be per-user to adjust for other mod combinations.
             var playableBeatmap = Beatmap.Value.GetPlayableBeatmap(Ruleset.Value);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
similarity index 83%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
index 8007c9e068..494f182251 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerInstance.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Bindables;
@@ -18,13 +19,31 @@ using osu.Game.Screens.Play;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
-    public class PlayerInstance : CompositeDrawable, IAdjustableAudioComponent
+    /// <summary>
+    /// Provides an area for and manages the hierarchy of a spectated player within a <see cref="MultiSpectatorScreen"/>.
+    /// </summary>
+    public class PlayerArea : CompositeDrawable, IAdjustableAudioComponent
     {
+        /// <summary>
+        /// Whether a <see cref="Player"/> is loaded in the area.
+        /// </summary>
         public bool PlayerLoaded => stack?.CurrentScreen is Player;
 
+        /// <summary>
+        /// The user id this <see cref="PlayerArea"/> corresponds to.
+        /// </summary>
         public readonly int UserId;
-        public readonly CatchUpSlaveClock GameplayClock;
 
+        /// <summary>
+        /// The <see cref="ISlaveClock"/> used to control the gameplay running state of a loaded <see cref="Player"/>.
+        /// </summary>
+        [NotNull]
+        public readonly ISlaveClock GameplayClock;
+
+        /// <summary>
+        /// The currently-loaded score.
+        /// </summary>
+        [CanBeNull]
         public Score Score { get; private set; }
 
         [Resolved]
@@ -35,7 +54,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         private readonly AudioContainer audioContainer;
         private OsuScreenStack stack;
 
-        public PlayerInstance(int userId, CatchUpSlaveClock gameplayClock)
+        public PlayerArea(int userId, [NotNull] ISlaveClock gameplayClock)
         {
             UserId = userId;
             GameplayClock = gameplayClock;
@@ -54,10 +73,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             };
         }
 
-        public void LoadScore(Score score)
+        public void LoadScore([NotNull] Score score)
         {
             if (Score != null)
-                throw new InvalidOperationException($"Cannot load a new score on a {nameof(PlayerInstance)} with an existing score.");
+                throw new InvalidOperationException($"Cannot load a new score on a {nameof(PlayerArea)} that has an existing score.");
 
             Score = score;
 

From 90ecda91af351c248882469195f4a964dd2636bf Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 23 Apr 2021 00:06:54 +0900
Subject: [PATCH 2773/3722] Fix exception

---
 .../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 c5d7610b53..aac03622e3 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -416,7 +416,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             UpdateMods();
 
             if (client.LocalUser.State == MultiplayerUserState.Spectating
-                && (client.Room.State == MultiplayerRoomState.Playing || client.Room.State == MultiplayerRoomState.WaitingForLoad))
+                && (client.Room.State == MultiplayerRoomState.Playing || client.Room.State == MultiplayerRoomState.WaitingForLoad)
+                && ParentScreen.IsCurrentScreen())
             {
                 StartPlay();
 

From b25340653df7e657884cfd077c53eea43613f25b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 23 Apr 2021 00:49:14 +0900
Subject: [PATCH 2774/3722] Fix failing tests

---
 .../TestSceneMultiplayerSpectateButton.cs           | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
index e65e4a68a7..afbc9c32b3 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
@@ -120,9 +120,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
             };
         });
 
-        [Test]
-        public void TestEnabledWhenRoomOpen()
+        [TestCase(MultiplayerRoomState.Open)]
+        [TestCase(MultiplayerRoomState.WaitingForLoad)]
+        [TestCase(MultiplayerRoomState.Playing)]
+        public void TestEnabledWhenRoomOpenOrInGameplay(MultiplayerRoomState roomState)
         {
+            AddStep($"change room to {roomState}", () => Client.ChangeRoomState(roomState));
             assertSpectateButtonEnablement(true);
         }
 
@@ -137,12 +140,10 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("user is idle", () => Client.Room?.Users[0].State == MultiplayerUserState.Idle);
         }
 
-        [TestCase(MultiplayerRoomState.WaitingForLoad)]
-        [TestCase(MultiplayerRoomState.Playing)]
         [TestCase(MultiplayerRoomState.Closed)]
-        public void TestDisabledDuringGameplayOrClosed(MultiplayerRoomState roomState)
+        public void TestDisabledWhenClosed(MultiplayerRoomState roomState)
         {
-            AddStep($"change user to {roomState}", () => Client.ChangeRoomState(roomState));
+            AddStep($"change room to {roomState}", () => Client.ChangeRoomState(roomState));
             assertSpectateButtonEnablement(false);
         }
 

From fbb9cb3f6f6d0a9d6fe0d89aa66ca26b545ec982 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 23 Apr 2021 11:01:48 +0900
Subject: [PATCH 2775/3722] Fix broken merge resolution

---
 osu.Game/osu.Game.csproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index d3d2de4557..75a3e45941 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -30,7 +30,6 @@
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.422.1" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.412.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />

From bc0e1d8c37272acf7a75c048036c512d42777bcf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 23 Apr 2021 15:06:39 +0900
Subject: [PATCH 2776/3722] Remove dead newline

---
 osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs b/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
index 4c46e24f1b..e4c41bed6d 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
@@ -21,6 +21,5 @@ namespace osu.Game.Rulesets.Catch.Mods
             drawableRuleset.Origin = Anchor.Centre;
             drawableRuleset.Scale = new osuTK.Vector2(1, -1);
         }
-
     }
 }

From 713344ebadc752b16c83bab92331af3c5850be25 Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Fri, 23 Apr 2021 10:31:49 +0200
Subject: [PATCH 2777/3722] Reorganize methods

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 214 ++++++++++----------
 1 file changed, 107 insertions(+), 107 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index b499423412..cb5a276a5d 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -323,6 +323,48 @@ namespace osu.Game.Screens.Select
                 starRatingDisplay.StarDifficulty = valueChanged.NewValue ?? new StarDifficulty();
             }
 
+            private void refreshModInformation(ValueChangedEvent<IReadOnlyList<Mod>> modsChangedEvent)
+            {
+                settingChangeTracker?.Dispose();
+                settingChangeTracker = new ModSettingChangeTracker(modsChangedEvent.NewValue);
+                settingChangeTracker.SettingChanged += _ => refreshBPMLabel(modsChangedEvent.NewValue);
+                refreshBPMLabel(modsChangedEvent.NewValue);
+            }
+
+            private void setMetadata(string source)
+            {
+                ArtistLabel.Text = artistBinding.Value;
+                TitleLabel.Text = string.IsNullOrEmpty(source) ? titleBinding.Value : source + " — " + titleBinding.Value;
+            }
+
+            private void addInfoLabels()
+            {
+                if (beatmap.Beatmap?.HitObjects?.Any() != true)
+                    return;
+
+                infoLabelContainer.Children = new Drawable[]
+                {
+                    new InfoLabel(new BeatmapStatistic
+                    {
+                        Name = "Length",
+                        CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Length),
+                        Content = TimeSpan.FromMilliseconds(beatmap.BeatmapInfo.Length).ToString(@"m\:ss"),
+                    }),
+                    bpmLabelContainer = new Container
+                    {
+                        AutoSizeAxes = Axes.Both,
+                    },
+                    new FillFlowContainer
+                    {
+                        AutoSizeAxes = Axes.Both,
+                        Spacing = new Vector2(20, 0),
+                        Children = getRulesetInfoLabels()
+                    }
+                };
+
+                mods.BindValueChanged(refreshModInformation, true);
+            }
+
             private InfoLabel[] getRulesetInfoLabels()
             {
                 try
@@ -377,48 +419,6 @@ namespace osu.Game.Screens.Select
                 });
             }
 
-            private void setMetadata(string source)
-            {
-                ArtistLabel.Text = artistBinding.Value;
-                TitleLabel.Text = string.IsNullOrEmpty(source) ? titleBinding.Value : source + " — " + titleBinding.Value;
-            }
-
-            private void addInfoLabels()
-            {
-                if (beatmap.Beatmap?.HitObjects?.Any() != true)
-                    return;
-
-                infoLabelContainer.Children = new Drawable[]
-                {
-                    new InfoLabel(new BeatmapStatistic
-                    {
-                        Name = "Length",
-                        CreateIcon = () => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Length),
-                        Content = TimeSpan.FromMilliseconds(beatmap.BeatmapInfo.Length).ToString(@"m\:ss"),
-                    }),
-                    bpmLabelContainer = new Container
-                    {
-                        AutoSizeAxes = Axes.Both,
-                    },
-                    new FillFlowContainer
-                    {
-                        AutoSizeAxes = Axes.Both,
-                        Spacing = new Vector2(20, 0),
-                        Children = getRulesetInfoLabels()
-                    }
-                };
-
-                mods.BindValueChanged(refreshModInformation, true);
-            }
-
-            private void refreshModInformation(ValueChangedEvent<IReadOnlyList<Mod>> modsChangedEvent)
-            {
-                settingChangeTracker?.Dispose();
-                settingChangeTracker = new ModSettingChangeTracker(modsChangedEvent.NewValue);
-                settingChangeTracker.SettingChanged += _ => refreshBPMLabel(modsChangedEvent.NewValue);
-                refreshBPMLabel(modsChangedEvent.NewValue);
-            }
-
             private OsuSpriteText[] getMapper(BeatmapMetadata metadata)
             {
                 if (string.IsNullOrEmpty(metadata.Author?.Username))
@@ -439,6 +439,71 @@ namespace osu.Game.Screens.Select
                 };
             }
 
+            protected override void Dispose(bool isDisposing)
+            {
+                base.Dispose(isDisposing);
+                settingChangeTracker?.Dispose();
+            }
+
+            public class InfoLabel : Container, IHasTooltip
+            {
+                public string TooltipText { get; }
+
+                public InfoLabel(BeatmapStatistic statistic)
+                {
+                    TooltipText = statistic.Name;
+                    AutoSizeAxes = Axes.Both;
+
+                    Children = new Drawable[]
+                    {
+                        new Container
+                        {
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                            Size = new Vector2(20),
+                            Children = new[]
+                            {
+                                new SpriteIcon
+                                {
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    RelativeSizeAxes = Axes.Both,
+                                    Colour = Color4Extensions.FromHex(@"441288"),
+                                    Icon = FontAwesome.Solid.Square,
+                                    Rotation = 45,
+                                },
+                                new SpriteIcon
+                                {
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    RelativeSizeAxes = Axes.Both,
+                                    Colour = Color4Extensions.FromHex(@"f7dd55"),
+                                    Icon = FontAwesome.Regular.Circle,
+                                    Size = new Vector2(0.8f)
+                                },
+                                statistic.CreateIcon().With(i =>
+                                {
+                                    i.Anchor = Anchor.Centre;
+                                    i.Origin = Anchor.Centre;
+                                    i.RelativeSizeAxes = Axes.Both;
+                                    i.Colour = Color4Extensions.FromHex(@"f7dd55");
+                                    i.Size = new Vector2(0.64f);
+                                }),
+                            }
+                        },
+                        new OsuSpriteText
+                        {
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                            Colour = new Color4(255, 221, 85, 255),
+                            Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 17),
+                            Margin = new MarginPadding { Left = 30 },
+                            Text = statistic.Content,
+                        }
+                    };
+                }
+            }
+
             private class DifficultyColourBar : Container
             {
                 [Resolved]
@@ -501,71 +566,6 @@ namespace osu.Game.Screens.Select
                     cancellationTokenSource?.Cancel();
                 }
             }
-
-            public class InfoLabel : Container, IHasTooltip
-            {
-                public string TooltipText { get; }
-
-                public InfoLabel(BeatmapStatistic statistic)
-                {
-                    TooltipText = statistic.Name;
-                    AutoSizeAxes = Axes.Both;
-
-                    Children = new Drawable[]
-                    {
-                        new Container
-                        {
-                            Anchor = Anchor.CentreLeft,
-                            Origin = Anchor.CentreLeft,
-                            Size = new Vector2(20),
-                            Children = new[]
-                            {
-                                new SpriteIcon
-                                {
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                    RelativeSizeAxes = Axes.Both,
-                                    Colour = Color4Extensions.FromHex(@"441288"),
-                                    Icon = FontAwesome.Solid.Square,
-                                    Rotation = 45,
-                                },
-                                new SpriteIcon
-                                {
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                    RelativeSizeAxes = Axes.Both,
-                                    Colour = Color4Extensions.FromHex(@"f7dd55"),
-                                    Icon = FontAwesome.Regular.Circle,
-                                    Size = new Vector2(0.8f)
-                                },
-                                statistic.CreateIcon().With(i =>
-                                {
-                                    i.Anchor = Anchor.Centre;
-                                    i.Origin = Anchor.Centre;
-                                    i.RelativeSizeAxes = Axes.Both;
-                                    i.Colour = Color4Extensions.FromHex(@"f7dd55");
-                                    i.Size = new Vector2(0.64f);
-                                }),
-                            }
-                        },
-                        new OsuSpriteText
-                        {
-                            Anchor = Anchor.CentreLeft,
-                            Origin = Anchor.CentreLeft,
-                            Colour = new Color4(255, 221, 85, 255),
-                            Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 17),
-                            Margin = new MarginPadding { Left = 30 },
-                            Text = statistic.Content,
-                        }
-                    };
-                }
-            }
-
-            protected override void Dispose(bool isDisposing)
-            {
-                base.Dispose(isDisposing);
-                settingChangeTracker?.Dispose();
-            }
         }
     }
 }

From ae2fd2f2e1f4315d4c1b90a56d412fa7b54cc9f3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 23 Apr 2021 18:46:59 +0900
Subject: [PATCH 2778/3722] Ensure source is set on reset

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

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 5cd17d92c4..6677116399 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -100,6 +100,7 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public virtual void Reset()
         {
+            ChangeSource(SourceClock);
             Seek(0);
 
             // Manually stop the source in order to not affect the IsPaused state.

From 575ec7c528af97d00e7aa3e3fce940ae5e64350f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 23 Apr 2021 19:09:54 +0900
Subject: [PATCH 2779/3722] Document + refactor max player limitation

---
 .../Multiplayer/Spectate/MultiSpectatorScreen.cs     |  2 +-
 .../OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs    | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index 609905a312..eb59d090be 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         /// </summary>
         /// <param name="userIds">The players to spectate.</param>
         public MultiSpectatorScreen(int[] userIds)
-            : base(userIds.AsSpan().Slice(0, Math.Min(16, userIds.Length)).ToArray())
+            : base(userIds.Take(PlayerGrid.MAX_PLAYERS).ToArray())
         {
             instances = new PlayerArea[UserIds.Length];
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
index 830378f129..6638d47dca 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
@@ -15,6 +15,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
     /// </summary>
     public partial class PlayerGrid : CompositeDrawable
     {
+        /// <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;
 
         /// <summary>
@@ -58,11 +64,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         /// Adds a new cell with content to this grid.
         /// </summary>
         /// <param name="content">The content the cell should contain.</param>
-        /// <exception cref="InvalidOperationException">If more than 16 cells are added.</exception>
+        /// <exception cref="InvalidOperationException">If more than <see cref="MAX_PLAYERS"/> cells are added.</exception>
         public void Add(Drawable content)
         {
-            if (cellContainer.Count == 16)
-                throw new InvalidOperationException("Only 16 cells are supported.");
+            if (cellContainer.Count == MAX_PLAYERS)
+                throw new InvalidOperationException($"Only {MAX_PLAYERS} cells are supported.");
 
             int index = cellContainer.Count;
 

From 63a948425513a3bba7c660850a5d562bf3efc3ec Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 23 Apr 2021 19:11:47 +0900
Subject: [PATCH 2780/3722] Expose WaitingOnFrames as mutable bindable

---
 osu.Game.Tests/OnlinePlay/TestCaseCatchUpSyncManager.cs        | 3 +--
 .../OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSlaveClock.cs  | 2 +-
 .../OnlinePlay/Multiplayer/Spectate/Sync/ISlaveClock.cs        | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/OnlinePlay/TestCaseCatchUpSyncManager.cs b/osu.Game.Tests/OnlinePlay/TestCaseCatchUpSyncManager.cs
index a8c0a763e9..2c10be9c90 100644
--- a/osu.Game.Tests/OnlinePlay/TestCaseCatchUpSyncManager.cs
+++ b/osu.Game.Tests/OnlinePlay/TestCaseCatchUpSyncManager.cs
@@ -164,8 +164,7 @@ namespace osu.Game.Tests.OnlinePlay
 
         private class TestSlaveClock : TestManualClock, ISlaveClock
         {
-            public readonly Bindable<bool> WaitingOnFrames = new Bindable<bool>(true);
-            IBindable<bool> ISlaveClock.WaitingOnFrames => WaitingOnFrames;
+            public Bindable<bool> WaitingOnFrames { get; } = new Bindable<bool>(true);
 
             public bool IsCatchingUp { get; set; }
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSlaveClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSlaveClock.cs
index cefe5ff04f..21241f8158 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSlaveClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSlaveClock.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
 
         public FrameTimeInfo TimeInfo => new FrameTimeInfo { Elapsed = ElapsedFrameTime, Current = CurrentTime };
 
-        public IBindable<bool> WaitingOnFrames { get; } = new Bindable<bool>(true);
+        public Bindable<bool> WaitingOnFrames { get; } = new Bindable<bool>(true);
 
         public bool IsCatchingUp { get; set; }
     }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISlaveClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISlaveClock.cs
index 08d69f9560..6b7a4f5221 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISlaveClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISlaveClock.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
         /// <summary>
         /// Whether this clock is waiting on frames to continue playback.
         /// </summary>
-        IBindable<bool> WaitingOnFrames { get; }
+        Bindable<bool> WaitingOnFrames { get; }
 
         /// <summary>
         /// Whether this clock is resynchronising to the master clock.

From b18635341e7692dfbfcbc7e3b35b0efd23a409e3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 23 Apr 2021 19:12:30 +0900
Subject: [PATCH 2781/3722] Rename file

---
 ...CaseCatchUpSyncManager.cs => TestSceneCatchUpSyncManager.cs} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename osu.Game.Tests/OnlinePlay/{TestCaseCatchUpSyncManager.cs => TestSceneCatchUpSyncManager.cs} (99%)

diff --git a/osu.Game.Tests/OnlinePlay/TestCaseCatchUpSyncManager.cs b/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
similarity index 99%
rename from osu.Game.Tests/OnlinePlay/TestCaseCatchUpSyncManager.cs
rename to osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
index 2c10be9c90..93801bd5d7 100644
--- a/osu.Game.Tests/OnlinePlay/TestCaseCatchUpSyncManager.cs
+++ b/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
@@ -12,7 +12,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Tests.OnlinePlay
 {
     [HeadlessTest]
-    public class TestCaseCatchUpSyncManager : OsuTestScene
+    public class TestSceneCatchUpSyncManager : OsuTestScene
     {
         private TestManualClock master;
         private CatchUpSyncManager syncManager;

From b41897fd9b34e09ba252638c75d0173e61f7c94a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 23 Apr 2021 19:23:52 +0900
Subject: [PATCH 2782/3722] Rename testscene to match class

---
 ...MultiplayerSpectator.cs => TestSceneMultiSpectatorScreen.cs} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename osu.Game.Tests/Visual/Multiplayer/{TestSceneMultiplayerSpectator.cs => TestSceneMultiSpectatorScreen.cs} (99%)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
similarity index 99%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
index a82dea5640..9cc8eaf876 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectator.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
@@ -23,7 +23,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneMultiplayerSpectator : MultiplayerTestScene
+    public class TestSceneMultiSpectatorScreen : MultiplayerTestScene
     {
         [Cached(typeof(SpectatorStreamingClient))]
         private TestSpectatorStreamingClient streamingClient = new TestSpectatorStreamingClient();

From fdb5490e51f1edf5b09aed6ecaf428e7ff03e8a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 23 Apr 2021 21:56:08 +0200
Subject: [PATCH 2783/3722] Attempt to explain source initialisation better

---
 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 6677116399..6d60c09521 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -63,8 +63,7 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public virtual void Start()
         {
-            // Ensure that the source clock is set.
-            ChangeSource(SourceClock);
+            ensureSourceClockSet();
 
             if (!AdjustableSource.IsRunning)
             {
@@ -100,7 +99,7 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public virtual void Reset()
         {
-            ChangeSource(SourceClock);
+            ensureSourceClockSet();
             Seek(0);
 
             // Manually stop the source in order to not affect the IsPaused state.
@@ -116,6 +115,15 @@ namespace osu.Game.Screens.Play
         /// <param name="sourceClock">The new source.</param>
         protected void ChangeSource(IClock sourceClock) => AdjustableSource.ChangeSource(SourceClock = sourceClock);
 
+        /// <summary>
+        /// Ensures that the <see cref="AdjustableSource"/> is set to <see cref="SourceClock"/>.
+        /// 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() => ChangeSource(SourceClock);
+
         protected override void Update()
         {
             if (!IsPaused.Value)

From 04958a043f8ce1f5e24a65c438f0ad4c4305e4f3 Mon Sep 17 00:00:00 2001
From: subfluid <76847113+subfluid@users.noreply.github.com>
Date: Fri, 23 Apr 2021 20:54:06 -0700
Subject: [PATCH 2784/3722] Fix Spelling Error 'passses'

line 20
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0d6af2aeba..c539f9f4d8 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ The future of [osu!](https://osu.ppy.sh) and the beginning of an open era! Commo
 
 This project is under heavy development, but is in a stable state. Users are encouraged to try it out and keep it installed alongside the stable *osu!* client. It will continue to evolve to the point of eventually replacing the existing stable client as an update.
 
-**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 passses come at the end of development, preceeded by experimentation and changes which may potentially **reduce playability or usability**. This is done in order to allow us to move forward as developers and designers more efficiently. If this offends you, please consider sticking to the stable releases of osu! (found on the website). We are not yet open to heated discussion over game mechanics and will not be using github as a forum for such discussions just yet.
+**IMPORTANT:** Gameplay mechanics (and other features which you may have come to know and love) are in a constant state of flux. Game balance and final quality-of-life passes come at the end of development, preceeded by experimentation and changes which may potentially **reduce playability or usability**. This is done in order to allow us to move forward as developers and designers more efficiently. If this offends you, please consider sticking to the stable releases of osu! (found on the website). We are not yet open to heated discussion over game mechanics and will not be using github as a forum for such discussions just yet.
 
 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:
 

From decd8803bc6daa0669003e22115672dbda48033f Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 24 Apr 2021 07:44:33 +0300
Subject: [PATCH 2785/3722] Abstract base appearence and hover update from drag
 handles

---
 .../Compose/Components/SelectionBoxControl.cs | 96 +++++++++++++++++++
 .../Components/SelectionBoxDragHandle.cs      | 77 +--------------
 .../Components/SelectionBoxScaleHandle.cs     | 17 ++++
 3 files changed, 116 insertions(+), 74 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
 create mode 100644 osu.Game/Screens/Edit/Compose/Components/SelectionBoxScaleHandle.cs

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
new file mode 100644
index 0000000000..3432334deb
--- /dev/null
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.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;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input.Events;
+using osu.Game.Graphics;
+
+namespace osu.Game.Screens.Edit.Compose.Components
+{
+    /// <summary>
+    /// Represents the base appearance for UI controls of the <see cref="SelectionBox"/>,
+    /// such as scale handles, rotation handles, buttons, etc...
+    /// </summary>
+    public abstract class SelectionBoxControl : CompositeDrawable
+    {
+        public event Action OperationStarted;
+        public event Action OperationEnded;
+
+        internal event Action HoverGained;
+        internal event Action HoverLost;
+
+        private Circle circle;
+
+        [Resolved]
+        protected OsuColour Colours { get; private set; }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Origin = Anchor.Centre;
+
+            InternalChildren = new Drawable[]
+            {
+                circle = new Circle
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            UpdateHoverState();
+        }
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            UpdateHoverState();
+            HoverGained?.Invoke();
+            return true;
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            base.OnHoverLost(e);
+            HoverLost?.Invoke();
+            UpdateHoverState();
+        }
+
+        /// <summary>
+        /// Whether this control is currently handling mouse down input.
+        /// </summary>
+        protected bool HandlingMouse { get; set; }
+
+        protected override bool OnMouseDown(MouseDownEvent e)
+        {
+            HandlingMouse = true;
+            UpdateHoverState();
+            return true;
+        }
+
+        protected override void OnMouseUp(MouseUpEvent e)
+        {
+            HandlingMouse = false;
+            UpdateHoverState();
+            base.OnMouseUp(e);
+        }
+
+        protected virtual void UpdateHoverState()
+        {
+            circle.Colour = HandlingMouse ? Colours.GrayF : (IsHovered ? Colours.Red : Colours.YellowDark);
+            this.ScaleTo(HandlingMouse || IsHovered ? 1.5f : 1, 100, Easing.OutQuint);
+        }
+
+        protected void OnOperationStarted() => OperationStarted?.Invoke();
+
+        protected void OnOperationEnded() => OperationEnded?.Invoke();
+    }
+}
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
index 921b4eb042..ea4f9704ef 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
@@ -2,75 +2,17 @@
 // 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;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
-using osu.Game.Graphics;
-using osuTK;
 
 namespace osu.Game.Screens.Edit.Compose.Components
 {
-    public class SelectionBoxDragHandle : Container
+    public abstract class SelectionBoxDragHandle : SelectionBoxControl
     {
-        public Action OperationStarted;
-        public Action OperationEnded;
-
         public Action<DragEvent> HandleDrag { get; set; }
 
-        private Circle circle;
-
-        [Resolved]
-        private OsuColour colours { get; set; }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            Size = new Vector2(10);
-            Origin = Anchor.Centre;
-
-            InternalChildren = new Drawable[]
-            {
-                circle = new Circle
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                },
-            };
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            UpdateHoverState();
-        }
-
-        protected override bool OnHover(HoverEvent e)
-        {
-            UpdateHoverState();
-            return base.OnHover(e);
-        }
-
-        protected override void OnHoverLost(HoverLostEvent e)
-        {
-            base.OnHoverLost(e);
-            UpdateHoverState();
-        }
-
-        protected bool HandlingMouse;
-
-        protected override bool OnMouseDown(MouseDownEvent e)
-        {
-            HandlingMouse = true;
-            UpdateHoverState();
-            return true;
-        }
-
         protected override bool OnDragStart(DragStartEvent e)
         {
-            OperationStarted?.Invoke();
+            OnOperationStarted();
             return true;
         }
 
@@ -83,23 +25,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
         protected override void OnDragEnd(DragEndEvent e)
         {
             HandlingMouse = false;
-            OperationEnded?.Invoke();
+            OnOperationEnded();
 
             UpdateHoverState();
             base.OnDragEnd(e);
         }
-
-        protected override void OnMouseUp(MouseUpEvent e)
-        {
-            HandlingMouse = false;
-            UpdateHoverState();
-            base.OnMouseUp(e);
-        }
-
-        protected virtual void UpdateHoverState()
-        {
-            circle.Colour = HandlingMouse ? colours.GrayF : (IsHovered ? colours.Red : colours.YellowDark);
-            this.ScaleTo(HandlingMouse || IsHovered ? 1.5f : 1, 100, Easing.OutQuint);
-        }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxScaleHandle.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxScaleHandle.cs
new file mode 100644
index 0000000000..a87c661f45
--- /dev/null
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxScaleHandle.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osuTK;
+
+namespace osu.Game.Screens.Edit.Compose.Components
+{
+    public class SelectionBoxScaleHandle : SelectionBoxDragHandle
+    {
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Size = new Vector2(10);
+        }
+    }
+}

From 4bfa9cd6b6014a40666bf00492c95c8d888560f7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 24 Apr 2021 07:46:38 +0300
Subject: [PATCH 2786/3722] Change inheritance of selection box buttons to base
 control instead

---
 ...BoxDragHandleButton.cs => SelectionBoxButton.cs} | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)
 rename osu.Game/Screens/Edit/Compose/Components/{SelectionBoxDragHandleButton.cs => SelectionBoxButton.cs} (77%)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleButton.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxButton.cs
similarity index 77%
rename from osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleButton.cs
rename to osu.Game/Screens/Edit/Compose/Components/SelectionBoxButton.cs
index 74ae949389..917e5189b2 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleButton.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxButton.cs
@@ -12,10 +12,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Compose.Components
 {
-    /// <summary>
-    /// A drag "handle" which shares the visual appearance but behaves more like a clickable button.
-    /// </summary>
-    public sealed class SelectionBoxDragHandleButton : SelectionBoxDragHandle, IHasTooltip
+    public sealed class SelectionBoxButton : SelectionBoxControl, IHasTooltip
     {
         private SpriteIcon icon;
 
@@ -23,7 +20,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         public Action Action;
 
-        public SelectionBoxDragHandleButton(IconUsage iconUsage, string tooltip)
+        public SelectionBoxButton(IconUsage iconUsage, string tooltip)
         {
             this.iconUsage = iconUsage;
 
@@ -36,7 +33,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [BackgroundDependencyLoader]
         private void load()
         {
-            Size *= 2;
+            Size = new Vector2(20);
             AddInternal(icon = new SpriteIcon
             {
                 RelativeSizeAxes = Axes.Both,
@@ -49,9 +46,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected override bool OnClick(ClickEvent e)
         {
-            OperationStarted?.Invoke();
+            OnOperationStarted();
             Action?.Invoke();
-            OperationEnded?.Invoke();
+            OnOperationEnded();
             return true;
         }
 

From 206fc94b8c9e71be4dc3049003f63147bf735a22 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 24 Apr 2021 07:47:15 +0300
Subject: [PATCH 2787/3722] Add rotation drag handle component

---
 .../Components/SelectionBoxRotationHandle.cs  | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
new file mode 100644
index 0000000000..c4a4fafdc2
--- /dev/null
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.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 osu.Framework.Allocation;
+using osu.Framework.Extensions.EnumExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Edit.Compose.Components
+{
+    public class SelectionBoxRotationHandle : SelectionBoxDragHandle
+    {
+        private SpriteIcon icon;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Size = new Vector2(15f);
+            AddInternal(icon = new SpriteIcon
+            {
+                RelativeSizeAxes = Axes.Both,
+                Size = new Vector2(0.5f),
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Icon = FontAwesome.Solid.Redo,
+                Scale = new Vector2
+                {
+                    X = Anchor.HasFlagFast(Anchor.x0) ? 1f : -1f,
+                    Y = Anchor.HasFlagFast(Anchor.y0) ? 1f : -1f
+                }
+            });
+        }
+
+        protected override void UpdateHoverState()
+        {
+            icon.Colour = !HandlingMouse && IsHovered ? Color4.White : Color4.Black;
+            base.UpdateHoverState();
+        }
+    }
+}

From 0ccdfeea57f3a983e1735ce1d3c0aca7b7959da2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 24 Apr 2021 14:33:56 +0900
Subject: [PATCH 2788/3722] Fix code quality issues

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

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs b/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
index e4c41bed6d..63203dd57c 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
@@ -1,9 +1,12 @@
-using osu.Framework.Graphics;
+// Copyright (c) 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.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
-using osu.Game.Screens.Play;
+using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Mods
 {
@@ -19,7 +22,8 @@ namespace osu.Game.Rulesets.Catch.Mods
         {
             drawableRuleset.Anchor = Anchor.Centre;
             drawableRuleset.Origin = Anchor.Centre;
-            drawableRuleset.Scale = new osuTK.Vector2(1, -1);
+
+            drawableRuleset.Scale = new Vector2(1, -1);
         }
     }
 }

From 2ae144be8e035801a3131b90c92542f3c075c03f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 24 Apr 2021 14:38:00 +0900
Subject: [PATCH 2789/3722] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 721e13a759..e0b07549f4 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.422.1" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.424.1" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 75a3e45941..9a43d5f031 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.422.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.424.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 69676a1aed..2c41b3ef26 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.422.1" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.424.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.422.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.424.1" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 1ec99577ce48557e47ebcb510ac3894be81cd7db Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sat, 24 Apr 2021 14:05:11 +0800
Subject: [PATCH 2790/3722] Incorrect path on Android

---
 .github/ISSUE_TEMPLATE/01-bug-issues.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/01-bug-issues.md b/.github/ISSUE_TEMPLATE/01-bug-issues.md
index e45893b97a..7026179259 100644
--- a/.github/ISSUE_TEMPLATE/01-bug-issues.md
+++ b/.github/ISSUE_TEMPLATE/01-bug-issues.md
@@ -25,6 +25,6 @@ Please check:
 *please attach logs here, which are located at:*
 - `%AppData%/osu/logs` *(on Windows),*
 - `~/.local/share/osu/logs` *(on Linux & macOS).*
-- `Android/Data/sh.ppy.osulazer/logs` *(on Android)*,
+- `Android/data/sh.ppy.osulazer/files/logs` *(on Android)*,
 - on iOS they can be obtained by connecting your device to your desktop and copying the `logs` directory from the app's own document storage using iTunes. (https://support.apple.com/en-us/HT201301#copy-to-computer)
 -->

From 2e2f843e223ead183607062f4fbb43aa9b994a3e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 24 Apr 2021 09:26:49 +0300
Subject: [PATCH 2791/3722] Refine android game logs path in contributing
 guidelines

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6c327f01b3..e14be20642 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -24,7 +24,7 @@ Issues, bug reports and feature suggestions are welcomed, though please keep in
   * the in-game logs, which are located at:
     * `%AppData%/osu/logs` (on Windows),
     * `~/.local/share/osu/logs` (on Linux and macOS),
-    * `Android/Data/sh.ppy.osulazer/logs` (on Android),
+    * `Android/data/sh.ppy.osulazer/files/logs` (on Android),
     * on iOS they can be obtained by connecting your device to your desktop and [copying the `logs` directory from the app's own document storage using iTunes](https://support.apple.com/en-us/HT201301#copy-to-computer),
   * your system specifications (including the operating system and platform you are playing on),
   * a reproduction scenario (list of steps you have performed leading up to the occurrence of the bug),

From 7e3a611f95cf9a1ec5503d692bc919c6dc6fb71c Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Sat, 24 Apr 2021 16:23:52 +0800
Subject: [PATCH 2792/3722] Add snap color option for osu!mania

---
 .../ManiaPlacementBlueprintTestScene.cs       | 12 +++
 .../ManiaSelectionBlueprintTestScene.cs       | 12 +++
 .../TestSceneHoldNotePlacementBlueprint.cs    |  2 +-
 .../TestSceneHoldNoteSelectionBlueprint.cs    |  2 +-
 .../Editor/TestSceneManiaHitObjectComposer.cs |  7 +-
 .../Editor/TestSceneNotePlacementBlueprint.cs |  2 +-
 .../Editor/TestSceneNoteSelectionBlueprint.cs |  2 +-
 .../ManiaInputTestScene.cs                    | 13 +++
 .../Mods/TestSceneManiaModPerfect.cs          |  4 +-
 .../Skinning/ManiaSkinnableTestScene.cs       | 12 +++
 .../Skinning/TestSceneHoldNote.cs             |  2 +-
 .../Skinning/TestSceneNote.cs                 |  2 +-
 .../TestSceneAutoGeneration.cs                | 24 +++---
 .../TestSceneColumn.cs                        |  4 +-
 .../TestSceneHoldNoteInput.cs                 | 75 +++++++++---------
 .../TestSceneNotes.cs                         | 17 +++-
 .../TestSceneOutOfOrderHits.cs                | 10 +--
 .../TestSceneStage.cs                         |  4 +-
 .../Beatmaps/ManiaBeatmapConverter.cs         |  4 +-
 .../Legacy/DistanceObjectPatternGenerator.cs  |  4 +-
 .../Legacy/EndTimeObjectPatternGenerator.cs   |  4 +-
 .../Legacy/HitObjectPatternGenerator.cs       |  2 +-
 .../ManiaRulesetConfigManager.cs              |  4 +-
 .../Blueprints/HoldNotePlacementBlueprint.cs  |  5 +-
 .../Edit/Blueprints/NotePlacementBlueprint.cs |  5 +-
 .../Edit/HoldNoteCompositionTool.cs           |  7 +-
 .../Edit/ManiaHitObjectComposer.cs            |  4 +-
 .../Edit/NoteCompositionTool.cs               |  8 +-
 .../ManiaSettingsSubsection.cs                |  5 ++
 .../Mods/ManiaModInvert.cs                    |  2 +-
 .../Objects/Drawables/DrawableNote.cs         | 30 +++++++
 osu.Game.Rulesets.Mania/Objects/HoldNote.cs   | 11 ++-
 osu.Game.Rulesets.Mania/Objects/Note.cs       | 79 +++++++++++++++++++
 osu.Game.Rulesets.Mania/Objects/TailNote.cs   |  5 ++
 .../UI/DrawableManiaRuleset.cs                |  5 ++
 osu.Game.Rulesets.Mania/UI/ManiaColourCode.cs | 11 +++
 .../TestSceneManageCollectionsDialog.cs       | 12 +--
 37 files changed, 314 insertions(+), 99 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/UI/ManiaColourCode.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
index ece523e84c..8e94d6bbb6 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
@@ -4,10 +4,12 @@
 using System;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Timing;
 using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
@@ -28,6 +30,9 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         [Cached(typeof(IScrollingInfo))]
         private IScrollingInfo scrollingInfo;
 
+        [Cached]
+        protected readonly Bindable<ManiaColourCode> configColourCode = new Bindable<ManiaColourCode>();
+
         protected ManiaPlacementBlueprintTestScene()
         {
             scrollingInfo = ((ScrollingTestContainer)HitObjectContainer).ScrollingInfo;
@@ -41,6 +46,13 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
             });
         }
 
+        [BackgroundDependencyLoader]
+        private void load(RulesetConfigCache configCache)
+        {
+            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
+            config.BindWith(ManiaRulesetSetting.ColourCode, configColourCode);
+        }
+
         protected override SnapResult SnapForBlueprint(PlacementBlueprint blueprint)
         {
             var time = column.TimeAtScreenSpacePosition(InputManager.CurrentState.Mouse.Position);
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
index 176fbba921..453f8e36e6 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
@@ -2,8 +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.Timing;
+using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Tests.Visual;
 using osuTK.Graphics;
@@ -15,6 +17,9 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         [Cached(Type = typeof(IAdjustableClock))]
         private readonly IAdjustableClock clock = new StopwatchClock();
 
+        [Cached]
+        protected readonly Bindable<ManiaColourCode> configColourCode = new Bindable<ManiaColourCode>();
+
         protected ManiaSelectionBlueprintTestScene()
         {
             Add(new Column(0)
@@ -26,6 +31,13 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
             });
         }
 
+        [BackgroundDependencyLoader]
+        private void load(RulesetConfigCache configCache)
+        {
+            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
+            config.BindWith(ManiaRulesetSetting.ColourCode, configColourCode);
+        }
+
         public ManiaPlayfield Playfield => null;
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNotePlacementBlueprint.cs
index 87c74a12cf..eb36e19048 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNotePlacementBlueprint.cs
@@ -13,6 +13,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
     public class TestSceneHoldNotePlacementBlueprint : ManiaPlacementBlueprintTestScene
     {
         protected override DrawableHitObject CreateHitObject(HitObject hitObject) => new DrawableHoldNote((HoldNote)hitObject);
-        protected override PlacementBlueprint CreateBlueprint() => new HoldNotePlacementBlueprint();
+        protected override PlacementBlueprint CreateBlueprint() => new HoldNotePlacementBlueprint(null);
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNoteSelectionBlueprint.cs
index 24f4c6858e..9674985d09 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNoteSelectionBlueprint.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
 
         public TestSceneHoldNoteSelectionBlueprint()
         {
-            var holdNote = new HoldNote { Column = 0, Duration = 1000 };
+            var holdNote = new HoldNote(null) { Column = 0, Duration = 1000 };
             holdNote.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
             base.Content.Child = content = new ScrollingTestContainer(ScrollingDirection.Down)
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs
index aaf96c63a6..1f3f4842c7 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs
@@ -159,7 +159,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
             AddStep("setup beatmap", () =>
             {
                 composer.EditorBeatmap.Clear();
-                composer.EditorBeatmap.Add(new HoldNote
+                composer.EditorBeatmap.Add(new HoldNote(Beatmap.Value.Beatmap)
                 {
                     Column = 1,
                     EndTime = 200
@@ -201,9 +201,10 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
 
             public TestComposer()
             {
+                var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 4 });
                 InternalChildren = new Drawable[]
                 {
-                    EditorBeatmap = new EditorBeatmap(new ManiaBeatmap(new StageDefinition { Columns = 4 }))
+                    EditorBeatmap = new EditorBeatmap(beatmap)
                     {
                         BeatmapInfo = { Ruleset = new ManiaRuleset().RulesetInfo }
                     },
@@ -211,7 +212,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
                 };
 
                 for (int i = 0; i < 10; i++)
-                    EditorBeatmap.Add(new Note { StartTime = 125 * i });
+                    EditorBeatmap.Add(new Note(beatmap) { StartTime = 125 * i });
             }
         }
     }
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNotePlacementBlueprint.cs
index 36c34a8fb9..08a22ea28e 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNotePlacementBlueprint.cs
@@ -55,6 +55,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         private Note getNote() => this.ChildrenOfType<DrawableNote>().FirstOrDefault()?.HitObject;
 
         protected override DrawableHitObject CreateHitObject(HitObject hitObject) => new DrawableNote((Note)hitObject);
-        protected override PlacementBlueprint CreateBlueprint() => new NotePlacementBlueprint();
+        protected override PlacementBlueprint CreateBlueprint() => new NotePlacementBlueprint(null);
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNoteSelectionBlueprint.cs
index 0e47a12a8e..caf89599be 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNoteSelectionBlueprint.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
 
         public TestSceneNoteSelectionBlueprint()
         {
-            var note = new Note { Column = 0 };
+            var note = new Note(null) { Column = 0 };
             note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
             DrawableNote drawableObject;
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs b/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs
index 9049bb3a82..ea7432f3a7 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.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 osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Bindings;
+using osu.Game.Rulesets.Mania.Configuration;
+using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Mania.Tests
 {
     public abstract class ManiaInputTestScene : OsuTestScene
     {
+        [Cached]
+        protected readonly Bindable<ManiaColourCode> configColourCode = new Bindable<ManiaColourCode>();
         private readonly Container<Drawable> content;
         protected override Container<Drawable> Content => content ?? base.Content;
 
@@ -18,6 +24,13 @@ namespace osu.Game.Rulesets.Mania.Tests
             base.Content.Add(content = new LocalInputManager(keys));
         }
 
+        [BackgroundDependencyLoader]
+        private void load(RulesetConfigCache configCache)
+        {
+            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
+            config.BindWith(ManiaRulesetSetting.ColourCode, configColourCode);
+        }
+
         private class LocalInputManager : ManiaInputManager
         {
             public LocalInputManager(int variant)
diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
index 2e3b21aed7..23d0e82439 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
@@ -19,10 +19,10 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
 
         [TestCase(false)]
         [TestCase(true)]
-        public void TestNote(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new Note { StartTime = 1000 }), shouldMiss);
+        public void TestNote(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new Note(Beatmap.Value.Beatmap) { StartTime = 1000 }), shouldMiss);
 
         [TestCase(false)]
         [TestCase(true)]
-        public void TestHoldNote(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new HoldNote { StartTime = 1000, EndTime = 3000 }), shouldMiss);
+        public void TestHoldNote(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new HoldNote(Beatmap.Value.Beatmap) { StartTime = 1000, EndTime = 3000 }), shouldMiss);
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
index 1d84a2dfcb..3b19386da6 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
@@ -7,6 +7,8 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets.Mania.Configuration;
+using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Rulesets.UI.Scrolling.Algorithms;
 using osu.Game.Tests.Visual;
@@ -24,6 +26,9 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
         [Cached(Type = typeof(IScrollingInfo))]
         private readonly TestScrollingInfo scrollingInfo = new TestScrollingInfo();
 
+        [Cached]
+        protected readonly Bindable<ManiaColourCode> configColourCode = new Bindable<ManiaColourCode>();
+
         protected override Ruleset CreateRulesetForSkinProvider() => new ManiaRuleset();
 
         protected ManiaSkinnableTestScene()
@@ -38,6 +43,13 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
             });
         }
 
+        [BackgroundDependencyLoader]
+        private void load(RulesetConfigCache configCache)
+        {
+            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
+            config.BindWith(ManiaRulesetSetting.ColourCode, configColourCode);
+        }
+
         [Test]
         public void TestScrollingDown()
         {
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs
index e88ff8e2ac..e13d0bbd7f 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
 
         protected override DrawableManiaHitObject CreateHitObject()
         {
-            var note = new HoldNote { Duration = 1000 };
+            var note = new HoldNote(Beatmap.Value.Beatmap) { Duration = 1000 };
             note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
             return new DrawableHoldNote(note);
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneNote.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneNote.cs
index bc3bdf0bcb..eac288872a 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneNote.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneNote.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
     {
         protected override DrawableManiaHitObject CreateHitObject()
         {
-            var note = new Note();
+            var note = new Note(Beatmap.Value.Beatmap);
             note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
             return new DrawableNote(note);
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs
index cffec3dfd5..b2b9d607c6 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             // |   |
 
             var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 1 });
-            beatmap.HitObjects.Add(new Note { StartTime = 1000 });
+            beatmap.HitObjects.Add(new Note(beatmap) { StartTime = 1000 });
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
@@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             // |   |
 
             var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 1 });
-            beatmap.HitObjects.Add(new HoldNote { StartTime = 1000, Duration = 2000 });
+            beatmap.HitObjects.Add(new HoldNote(beatmap) { StartTime = 1000, Duration = 2000 });
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
@@ -69,8 +69,8 @@ namespace osu.Game.Rulesets.Mania.Tests
             // |   |   |
 
             var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 2 });
-            beatmap.HitObjects.Add(new Note { StartTime = 1000 });
-            beatmap.HitObjects.Add(new Note { StartTime = 1000, Column = 1 });
+            beatmap.HitObjects.Add(new Note(beatmap) { StartTime = 1000 });
+            beatmap.HitObjects.Add(new Note(beatmap) { StartTime = 1000, Column = 1 });
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
@@ -91,8 +91,8 @@ namespace osu.Game.Rulesets.Mania.Tests
             // |   |   |
 
             var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 2 });
-            beatmap.HitObjects.Add(new HoldNote { StartTime = 1000, Duration = 2000 });
-            beatmap.HitObjects.Add(new HoldNote { StartTime = 1000, Duration = 2000, Column = 1 });
+            beatmap.HitObjects.Add(new HoldNote(beatmap) { StartTime = 1000, Duration = 2000 });
+            beatmap.HitObjects.Add(new HoldNote(beatmap) { StartTime = 1000, Duration = 2000, Column = 1 });
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
@@ -114,8 +114,8 @@ namespace osu.Game.Rulesets.Mania.Tests
             // |   |   |
 
             var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 2 });
-            beatmap.HitObjects.Add(new Note { StartTime = 1000 });
-            beatmap.HitObjects.Add(new Note { StartTime = 2000, Column = 1 });
+            beatmap.HitObjects.Add(new Note(beatmap) { StartTime = 1000 });
+            beatmap.HitObjects.Add(new Note(beatmap) { StartTime = 2000, Column = 1 });
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
@@ -141,8 +141,8 @@ namespace osu.Game.Rulesets.Mania.Tests
             // |   |   |
 
             var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 2 });
-            beatmap.HitObjects.Add(new HoldNote { StartTime = 1000, Duration = 2000 });
-            beatmap.HitObjects.Add(new HoldNote { StartTime = 2000, Duration = 2000, Column = 1 });
+            beatmap.HitObjects.Add(new HoldNote(beatmap) { StartTime = 1000, Duration = 2000 });
+            beatmap.HitObjects.Add(new HoldNote(beatmap) { StartTime = 2000, Duration = 2000, Column = 1 });
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
@@ -168,8 +168,8 @@ namespace osu.Game.Rulesets.Mania.Tests
             // |   |   |
 
             var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 2 });
-            beatmap.HitObjects.Add(new HoldNote { StartTime = 1000, Duration = 2000 });
-            beatmap.HitObjects.Add(new Note { StartTime = 3000, Column = 1 });
+            beatmap.HitObjects.Add(new HoldNote(beatmap) { StartTime = 1000, Duration = 2000 });
+            beatmap.HitObjects.Add(new Note(beatmap) { StartTime = 3000, Column = 1 });
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
index d9b1ad22fa..59da73a540 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Rulesets.Mania.Tests
         {
             for (int i = 0; i < columns.Count; i++)
             {
-                var obj = new Note { Column = i, StartTime = Time.Current + 2000 };
+                var obj = new Note(null) { Column = i, StartTime = Time.Current + 2000 };
                 obj.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
                 columns[i].Add(new DrawableNote(obj));
@@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Mania.Tests
         {
             for (int i = 0; i < columns.Count; i++)
             {
-                var obj = new HoldNote { Column = i, StartTime = Time.Current + 2000, Duration = 500 };
+                var obj = new HoldNote(null) { Column = i, StartTime = Time.Current + 2000, Duration = 500 };
                 obj.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
                 columns[i].Add(new DrawableHoldNote(obj));
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index 668487f673..c92fe03483 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -249,21 +249,6 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             var beatmap = new Beatmap<ManiaHitObject>
             {
-                HitObjects =
-                {
-                    new HoldNote
-                    {
-                        StartTime = 1000,
-                        Duration = 500,
-                        Column = 0,
-                    },
-                    new HoldNote
-                    {
-                        StartTime = 1000 + 500 + windows.WindowFor(HitResult.Miss) + 10,
-                        Duration = 500,
-                        Column = 0,
-                    },
-                },
                 BeatmapInfo =
                 {
                     BaseDifficulty = new BeatmapDifficulty
@@ -274,6 +259,20 @@ namespace osu.Game.Rulesets.Mania.Tests
                     Ruleset = new ManiaRuleset().RulesetInfo
                 },
             };
+            beatmap.HitObjects = new List<ManiaHitObject> {
+                    new HoldNote(beatmap)
+                    {
+                        StartTime = 1000,
+                        Duration = 500,
+                        Column = 0,
+                    },
+                    new HoldNote(beatmap)
+                    {
+                        StartTime = 1000 + 500 + windows.WindowFor(HitResult.Miss) + 10,
+                        Duration = 500,
+                        Column = 0,
+                    },
+            };
 
             performTest(new List<ReplayFrame>
             {
@@ -297,21 +296,21 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             var beatmap = new Beatmap<ManiaHitObject>
             {
-                HitObjects =
-                {
-                    new HoldNote
-                    {
-                        StartTime = time_head,
-                        Duration = time_tail - time_head,
-                        Column = 0,
-                    }
-                },
                 BeatmapInfo =
                 {
                     BaseDifficulty = new BeatmapDifficulty { SliderTickRate = tick_rate },
                     Ruleset = new ManiaRuleset().RulesetInfo
                 },
             };
+            beatmap.HitObjects = new List<ManiaHitObject>
+                {
+                    new HoldNote(beatmap)
+                    {
+                        StartTime = time_head,
+                        Duration = time_tail - time_head,
+                        Column = 0,
+                    }
+                };
 
             performTest(new List<ReplayFrame>
             {
@@ -329,17 +328,17 @@ namespace osu.Game.Rulesets.Mania.Tests
         {
             var beatmap = new Beatmap<ManiaHitObject>
             {
-                HitObjects =
+                BeatmapInfo = { Ruleset = new ManiaRuleset().RulesetInfo },
+            };
+            beatmap.HitObjects = new List<ManiaHitObject>
                 {
-                    new HoldNote
+                    new HoldNote(beatmap)
                     {
                         StartTime = 1000,
                         Duration = 0,
                         Column = 0,
                     },
-                },
-                BeatmapInfo = { Ruleset = new ManiaRuleset().RulesetInfo },
-            };
+                };
 
             performTest(new List<ReplayFrame>
             {
@@ -374,21 +373,21 @@ namespace osu.Game.Rulesets.Mania.Tests
             {
                 beatmap = new Beatmap<ManiaHitObject>
                 {
-                    HitObjects =
-                    {
-                        new HoldNote
-                        {
-                            StartTime = time_head,
-                            Duration = time_tail - time_head,
-                            Column = 0,
-                        }
-                    },
                     BeatmapInfo =
                     {
                         BaseDifficulty = new BeatmapDifficulty { SliderTickRate = 4 },
                         Ruleset = new ManiaRuleset().RulesetInfo
                     },
                 };
+                beatmap.HitObjects = new List<ManiaHitObject>
+                    {
+                        new HoldNote(beatmap)
+                        {
+                            StartTime = time_head,
+                            Duration = time_tail - time_head,
+                            Column = 0,
+                        }
+                    };
 
                 beatmap.ControlPointInfo.Add(0, new DifficultyControlPoint { SpeedMultiplier = 0.1f });
             }
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
index 706268e478..3660895347 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
@@ -15,8 +15,10 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.UI.Scrolling;
@@ -29,6 +31,10 @@ namespace osu.Game.Rulesets.Mania.Tests
     [TestFixture]
     public class TestSceneNotes : OsuTestScene
     {
+
+        [Cached]
+        protected readonly Bindable<ManiaColourCode> configColourCode = new Bindable<ManiaColourCode>();
+
         [Test]
         public void TestVariousNotes()
         {
@@ -63,9 +69,16 @@ namespace osu.Game.Rulesets.Mania.Tests
             AddAssert("hold note 2 facing upwards", () => verifyAnchors(holdNote2, Anchor.y0));
         }
 
+        [BackgroundDependencyLoader]
+        private void load(RulesetConfigCache configCache)
+        {
+            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
+            config.BindWith(ManiaRulesetSetting.ColourCode, configColourCode);
+        }
+
         private Drawable createNoteDisplay(ScrollingDirection direction, int identifier, out DrawableNote hitObject)
         {
-            var note = new Note { StartTime = 0 };
+            var note = new Note(null) { StartTime = 0 };
             note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
             return new ScrollingTestContainer(direction)
@@ -80,7 +93,7 @@ namespace osu.Game.Rulesets.Mania.Tests
 
         private Drawable createHoldNoteDisplay(ScrollingDirection direction, int identifier, out DrawableHoldNote hitObject)
         {
-            var note = new HoldNote { StartTime = 0, Duration = 5000 };
+            var note = new HoldNote(null) { StartTime = 0, Duration = 5000 };
             note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
             return new ScrollingTestContainer(direction)
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
index 18891f8c58..65195fdd3f 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             {
                 double time = 1000 + i * 100;
 
-                objects.Add(new Note { StartTime = time });
+                objects.Add(new Note(Beatmap.Value.Beatmap) { StartTime = time });
 
                 // don't hit the first note
                 if (i > 0)
@@ -60,12 +60,12 @@ namespace osu.Game.Rulesets.Mania.Tests
         {
             var objects = new List<ManiaHitObject>
             {
-                new HoldNote
+                new HoldNote(Beatmap.Value.Beatmap)
                 {
                     StartTime = 1000,
                     EndTime = 1010,
                 },
-                new HoldNote
+                new HoldNote(Beatmap.Value.Beatmap)
                 {
                     StartTime = 1020,
                     EndTime = 1030
@@ -83,12 +83,12 @@ namespace osu.Game.Rulesets.Mania.Tests
         {
             var objects = new List<ManiaHitObject>
             {
-                new HoldNote
+                new HoldNote(Beatmap.Value.Beatmap)
                 {
                     StartTime = 1000,
                     EndTime = 1010,
                 },
-                new HoldNote
+                new HoldNote(Beatmap.Value.Beatmap)
                 {
                     StartTime = 1020,
                     EndTime = 1030
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs
index 7376a90f17..777163cca7 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             {
                 for (int i = 0; i < stage.Columns.Count; i++)
                 {
-                    var obj = new Note { Column = i, StartTime = Time.Current + 2000 };
+                    var obj = new Note(null) { Column = i, StartTime = Time.Current + 2000 };
                     obj.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
                     stage.Add(new DrawableNote(obj));
@@ -105,7 +105,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             {
                 for (int i = 0; i < stage.Columns.Count; i++)
                 {
-                    var obj = new HoldNote { Column = i, StartTime = Time.Current + 2000, Duration = 500 };
+                    var obj = new HoldNote(null) { Column = i, StartTime = Time.Current + 2000, Duration = 500 };
                     obj.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
                     stage.Add(new DrawableHoldNote(obj));
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
index 26393c8edb..5f03c93d55 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -247,7 +247,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
 
                 if (HitObject is IHasDuration endTimeData)
                 {
-                    pattern.Add(new HoldNote
+                    pattern.Add(new HoldNote(Beatmap)
                     {
                         StartTime = HitObject.StartTime,
                         Duration = endTimeData.Duration,
@@ -258,7 +258,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
                 }
                 else if (HitObject is IHasXPosition)
                 {
-                    pattern.Add(new Note
+                    pattern.Add(new Note(Beatmap)
                     {
                         StartTime = HitObject.StartTime,
                         Samples = HitObject.Samples,
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index 26e5d381e2..a936878a38 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -512,7 +512,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
             if (startTime == endTime)
             {
-                newObject = new Note
+                newObject = new Note(Beatmap)
                 {
                     StartTime = startTime,
                     Samples = sampleInfoListAt(startTime),
@@ -521,7 +521,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             }
             else
             {
-                newObject = new HoldNote
+                newObject = new HoldNote(Beatmap)
                 {
                     StartTime = startTime,
                     Duration = endTime - startTime,
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs
index f816a70ab3..9422146803 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs
@@ -76,7 +76,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
             if (holdNote)
             {
-                newObject = new HoldNote
+                newObject = new HoldNote(Beatmap)
                 {
                     StartTime = HitObject.StartTime,
                     Duration = endTime - HitObject.StartTime,
@@ -87,7 +87,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             }
             else
             {
-                newObject = new Note
+                newObject = new Note(Beatmap)
                 {
                     StartTime = HitObject.StartTime,
                     Samples = HitObject.Samples,
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
index 54c37e9742..bbb4d4b466 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
@@ -441,7 +441,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
         /// <param name="column">The column to add the note to.</param>
         private void addToPattern(Pattern pattern, int column)
         {
-            pattern.Add(new Note
+            pattern.Add(new Note(Beatmap)
             {
                 StartTime = HitObject.StartTime,
                 Samples = HitObject.Samples,
diff --git a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
index 39d0f4bae4..292d494d88 100644
--- a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
+++ b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
@@ -22,6 +22,7 @@ namespace osu.Game.Rulesets.Mania.Configuration
 
             SetDefault(ManiaRulesetSetting.ScrollTime, 1500.0, DrawableManiaRuleset.MIN_TIME_RANGE, DrawableManiaRuleset.MAX_TIME_RANGE, 5);
             SetDefault(ManiaRulesetSetting.ScrollDirection, ManiaScrollingDirection.Down);
+            SetDefault(ManiaRulesetSetting.ColourCode, ManiaColourCode.Off);
         }
 
         public override TrackedSettings CreateTrackedSettings() => new TrackedSettings
@@ -34,6 +35,7 @@ namespace osu.Game.Rulesets.Mania.Configuration
     public enum ManiaRulesetSetting
     {
         ScrollTime,
-        ScrollDirection
+        ScrollDirection,
+        ColourCode
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
index 093a8da24f..b3902524a0 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
@@ -5,6 +5,7 @@ using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
 using osu.Game.Rulesets.Mania.Objects;
@@ -23,8 +24,8 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; }
 
-        public HoldNotePlacementBlueprint()
-            : base(new HoldNote())
+        public HoldNotePlacementBlueprint(IBeatmap beatmap)
+            : base(new HoldNote(beatmap))
         {
             RelativeSizeAxes = Axes.Both;
 
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
index 3db89c8ae6..cc0ef5181a 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
 using osu.Game.Rulesets.Mania.Objects;
@@ -14,8 +15,8 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
     {
         private readonly EditNotePiece piece;
 
-        public NotePlacementBlueprint()
-            : base(new Note())
+        public NotePlacementBlueprint(IBeatmap beatmap)
+            : base(new Note(beatmap))
         {
             RelativeSizeAxes = Axes.Both;
 
diff --git a/osu.Game.Rulesets.Mania/Edit/HoldNoteCompositionTool.cs b/osu.Game.Rulesets.Mania/Edit/HoldNoteCompositionTool.cs
index a5f10ed436..696278de4d 100644
--- a/osu.Game.Rulesets.Mania/Edit/HoldNoteCompositionTool.cs
+++ b/osu.Game.Rulesets.Mania/Edit/HoldNoteCompositionTool.cs
@@ -5,19 +5,22 @@ using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
+using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Edit.Blueprints;
 
 namespace osu.Game.Rulesets.Mania.Edit
 {
     public class HoldNoteCompositionTool : HitObjectCompositionTool
     {
-        public HoldNoteCompositionTool()
+        private ManiaBeatmap Beatmap;
+        public HoldNoteCompositionTool(ManiaBeatmap beatmap)
             : base("Hold")
         {
+            Beatmap = beatmap;
         }
 
         public override Drawable CreateIcon() => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Sliders);
 
-        public override PlacementBlueprint CreatePlacementBlueprint() => new HoldNotePlacementBlueprint();
+        public override PlacementBlueprint CreatePlacementBlueprint() => new HoldNotePlacementBlueprint(Beatmap);
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index d9570bf8be..0defeb026d 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -93,8 +93,8 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         protected override IReadOnlyList<HitObjectCompositionTool> CompositionTools => new HitObjectCompositionTool[]
         {
-            new NoteCompositionTool(),
-            new HoldNoteCompositionTool()
+            new NoteCompositionTool(drawableRuleset.Beatmap),
+            new HoldNoteCompositionTool(drawableRuleset.Beatmap)
         };
 
         protected override void UpdateAfterChildren()
diff --git a/osu.Game.Rulesets.Mania/Edit/NoteCompositionTool.cs b/osu.Game.Rulesets.Mania/Edit/NoteCompositionTool.cs
index 9f54152596..c77c3722c6 100644
--- a/osu.Game.Rulesets.Mania/Edit/NoteCompositionTool.cs
+++ b/osu.Game.Rulesets.Mania/Edit/NoteCompositionTool.cs
@@ -5,6 +5,7 @@ using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
+using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Edit.Blueprints;
 using osu.Game.Rulesets.Mania.Objects;
 
@@ -12,13 +13,16 @@ namespace osu.Game.Rulesets.Mania.Edit
 {
     public class NoteCompositionTool : HitObjectCompositionTool
     {
-        public NoteCompositionTool()
+        private ManiaBeatmap Beatmap;
+
+        public NoteCompositionTool(ManiaBeatmap beatmap)
             : base(nameof(Note))
         {
+            Beatmap = beatmap;
         }
 
         public override Drawable CreateIcon() => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Circles);
 
-        public override PlacementBlueprint CreatePlacementBlueprint() => new NotePlacementBlueprint();
+        public override PlacementBlueprint CreatePlacementBlueprint() => new NotePlacementBlueprint(Beatmap);
     }
 }
diff --git a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
index de77af8306..d46076d3bc 100644
--- a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
@@ -37,6 +37,11 @@ namespace osu.Game.Rulesets.Mania
                     Current = config.GetBindable<double>(ManiaRulesetSetting.ScrollTime),
                     KeyboardStep = 5
                 },
+                new SettingsEnumDropdown<ManiaColourCode>
+                {
+                    LabelText = "Colour-coded notes",
+                    Current = config.GetBindable<ManiaColourCode>(ManiaRulesetSetting.ColourCode),
+                }
             };
         }
 
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
index 1ea45c295c..11310c6642 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Mania.Mods
                     // Decrease the duration by at most a 1/4 beat to ensure there's no instantaneous notes.
                     duration = Math.Max(duration / 2, duration - beatLength / 4);
 
-                    newColumnObjects.Add(new HoldNote
+                    newColumnObjects.Add(new HoldNote(maniaBeatmap)
                     {
                         Column = column.Key,
                         StartTime = locations[i].startTime,
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index b512986ccb..436e0923c4 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -2,12 +2,16 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Diagnostics;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Bindings;
+using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.Skinning.Default;
+using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Screens.Edit;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Mania.Objects.Drawables
@@ -17,6 +21,12 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
     /// </summary>
     public class DrawableNote : DrawableManiaHitObject<Note>, IKeyBindingHandler<ManiaAction>
     {
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        [Resolved]
+        private Bindable<ManiaColourCode> configColourCode { get; set; }
+
         protected virtual ManiaSkinComponents Component => ManiaSkinComponents.Note;
 
         private readonly Drawable headPiece;
@@ -34,6 +44,26 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             });
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            HitObject.SnapBindable.BindValueChanged(snap => UpdateSnapColour(configColourCode.Value, snap.NewValue), true);
+            configColourCode.BindValueChanged(colourCode => UpdateSnapColour(colourCode.NewValue, HitObject.Snap));
+        }
+
+        private void UpdateSnapColour(ManiaColourCode colourCode, int snap)
+        {
+            if (colourCode == ManiaColourCode.On)
+            {
+                Colour = BindableBeatDivisor.GetColourFor(HitObject.Snap, colours);
+            }
+            else
+            {
+                Colour = Colour4.White;
+            }
+        }
+
         protected override void OnDirectionChanged(ValueChangedEvent<ScrollingDirection> e)
         {
             base.OnDirectionChanged(e);
diff --git a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
index 6cc7ff92d3..bf0631170a 100644
--- a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
@@ -17,6 +17,8 @@ namespace osu.Game.Rulesets.Mania.Objects
     /// </summary>
     public class HoldNote : ManiaHitObject, IHasDuration
     {
+        public IBeatmap Beatmap;
+
         public double EndTime
         {
             get => StartTime + Duration;
@@ -84,6 +86,11 @@ namespace osu.Game.Rulesets.Mania.Objects
         /// </summary>
         private double tickSpacing = 50;
 
+        public HoldNote(IBeatmap beatmap) : base()
+        {
+            Beatmap = beatmap;
+        }
+
         protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
         {
             base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
@@ -98,14 +105,14 @@ namespace osu.Game.Rulesets.Mania.Objects
 
             createTicks(cancellationToken);
 
-            AddNested(Head = new Note
+            AddNested(Head = new Note(Beatmap)
             {
                 StartTime = StartTime,
                 Column = Column,
                 Samples = GetNodeSamples(0),
             });
 
-            AddNested(Tail = new TailNote
+            AddNested(Tail = new TailNote(Beatmap)
             {
                 StartTime = EndTime,
                 Column = Column,
diff --git a/osu.Game.Rulesets.Mania/Objects/Note.cs b/osu.Game.Rulesets.Mania/Objects/Note.cs
index 0035960c63..6ee0232c5b 100644
--- a/osu.Game.Rulesets.Mania/Objects/Note.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Note.cs
@@ -1,6 +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;
+using osu.Framework.Bindables;
+using osu.Framework.Utils;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Judgements;
 
@@ -12,5 +17,79 @@ namespace osu.Game.Rulesets.Mania.Objects
     public class Note : ManiaHitObject
     {
         public override Judgement CreateJudgement() => new ManiaJudgement();
+
+        private IBeatmap Beatmap;
+
+        public readonly Bindable<int> SnapBindable = new Bindable<int>();
+
+        public int Snap
+        {
+            get => SnapBindable.Value;
+            set => SnapBindable.Value = value;
+        }
+
+        public Note(IBeatmap beatmap) : base()
+        {
+            Beatmap = beatmap;
+            this.StartTimeBindable.BindValueChanged(_ => SnapToBeatmap(), true);
+        }
+
+        private void SnapToBeatmap()
+        {
+            if (Beatmap != null)
+            {
+                TimingControlPoint currentTimingPoint = Beatmap.ControlPointInfo.TimingPointAt(StartTime);
+                int timeSignature = (int)currentTimingPoint.TimeSignature;
+                double startTime = currentTimingPoint.Time;
+                double secondsPerFourCounts = currentTimingPoint.BeatLength * 4;
+
+                double offset = startTime % secondsPerFourCounts;
+                double snapResult = StartTime % secondsPerFourCounts - offset;
+
+                if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 4.0))
+                {
+                    Snap = 1;
+                }
+                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 8.0))
+                {
+                    Snap = 2;
+                }
+                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 12.0))
+                {
+                    Snap = 3;
+                }
+                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 16.0))
+                {
+                    Snap = 4;
+                }
+                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 24.0))
+                {
+                    Snap = 6;
+                }
+                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 32.0))
+                {
+                    Snap = 8;
+                }
+                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 48.0))
+                {
+                    Snap = 12;
+                }
+                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 64.0))
+                {
+                    Snap = 16;
+                }
+                else
+                {
+                    Snap = 0;
+                }
+            }
+        }
+
+        private const double LENIENCY_MS = 1.0;
+        private static bool AlmostDivisibleBy(double dividend, double divisor)
+        {
+            double remainder = Math.Abs(dividend) % divisor;
+            return Precision.AlmostEquals(remainder, 0, LENIENCY_MS) || Precision.AlmostEquals(remainder - divisor, 0, LENIENCY_MS);
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Objects/TailNote.cs b/osu.Game.Rulesets.Mania/Objects/TailNote.cs
index 5a30fd6a12..bc56408691 100644
--- a/osu.Game.Rulesets.Mania/Objects/TailNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/TailNote.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.Beatmaps;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Judgements;
 
@@ -8,6 +9,10 @@ namespace osu.Game.Rulesets.Mania.Objects
 {
     public class TailNote : Note
     {
+        public TailNote(IBeatmap beatmap) : base(beatmap)
+        {
+        }
+
         public override Judgement CreateJudgement() => new ManiaJudgement();
     }
 }
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 4ee060e91e..dc9c525cb0 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -51,6 +51,9 @@ namespace osu.Game.Rulesets.Mania.UI
 
         protected new ManiaRulesetConfigManager Config => (ManiaRulesetConfigManager)base.Config;
 
+        [Cached]
+        protected readonly Bindable<ManiaColourCode> configColourCode = new Bindable<ManiaColourCode>();
+
         public ScrollVisualisationMethod ScrollMethod
         {
             get => scrollMethod;
@@ -104,6 +107,8 @@ namespace osu.Game.Rulesets.Mania.UI
             configDirection.BindValueChanged(direction => Direction.Value = (ScrollingDirection)direction.NewValue, true);
 
             Config.BindWith(ManiaRulesetSetting.ScrollTime, configTimeRange);
+
+            Config.BindWith(ManiaRulesetSetting.ColourCode, configColourCode);
         }
 
         protected override void AdjustScrollSpeed(int amount)
diff --git a/osu.Game.Rulesets.Mania/UI/ManiaColourCode.cs b/osu.Game.Rulesets.Mania/UI/ManiaColourCode.cs
new file mode 100644
index 0000000000..91b637b71d
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/UI/ManiaColourCode.cs
@@ -0,0 +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.
+
+namespace osu.Game.Rulesets.Mania.UI
+{
+    public enum ManiaColourCode
+    {
+        Off,
+        On
+    }
+}
diff --git a/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs b/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
index eca857f9e5..d8d419bceb 100644
--- a/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
+++ b/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
@@ -140,12 +140,12 @@ namespace osu.Game.Tests.Visual.Collections
             AddStep("add dropdown", () =>
             {
                 Add(new CollectionFilterDropdown
-                    {
-                        Anchor = Anchor.TopRight,
-                        Origin = Anchor.TopRight,
-                        RelativeSizeAxes = Axes.X,
-                        Width = 0.4f,
-                    }
+                {
+                    Anchor = Anchor.TopRight,
+                    Origin = Anchor.TopRight,
+                    RelativeSizeAxes = Axes.X,
+                    Width = 0.4f,
+                }
                 );
             });
             AddStep("add two collections with same name", () => manager.Collections.AddRange(new[]

From 59ae5ab913f74d75677576e10d3b3a9484a713a7 Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Sat, 24 Apr 2021 13:25:29 +0200
Subject: [PATCH 2793/3722] Added transition in StarRatingDisplay

---
 .../Ranking/Expanded/StarRatingDisplay.cs     | 112 +++++++++---------
 1 file changed, 59 insertions(+), 53 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
index bfc336a677..748f58e430 100644
--- a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
@@ -12,7 +12,6 @@ using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
 using osuTK;
 using osuTK.Graphics;
 
@@ -27,9 +26,8 @@ namespace osu.Game.Screens.Ranking.Expanded
         private OsuColour colours { get; set; }
 
         private CircularContainer colorContainer;
-        private OsuSpriteText wholePartText;
-        private OsuSpriteText fractionPartText;
         private StarDifficulty starDifficulty;
+        private FillFlowContainer foregroundContainer;
 
         public StarDifficulty StarDifficulty
         {
@@ -52,23 +50,15 @@ namespace osu.Game.Screens.Ranking.Expanded
 
         private void setDifficulty(StarDifficulty difficulty)
         {
-            var starRatingParts = difficulty.Stars.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
-            string wholePart = starRatingParts[0];
-            string fractionPart = starRatingParts[1];
-            string separator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
+            colorContainer.FadeColour(getDifficultyColour(difficulty), 250);
 
-            ColourInfo backgroundColour = difficulty.DifficultyRating == DifficultyRating.ExpertPlus
-                ? ColourInfo.GradientVertical(Color4Extensions.FromHex("#C1C1C1"), Color4Extensions.FromHex("#595959"))
-                : (ColourInfo)colours.ForDifficultyRating(difficulty.DifficultyRating);
-
-            colorContainer.Colour = backgroundColour;
-
-            wholePartText.Text = $"{wholePart}";
-            fractionPartText.Text = $"{separator}{fractionPart}";
+            foregroundContainer.Expire();
+            foregroundContainer = null;
+            AddInternal(foregroundContainer = createForegroundContainer(difficulty));
         }
 
         [BackgroundDependencyLoader]
-        private void load(BeatmapDifficultyCache difficultyCache)
+        private void load()
         {
             AutoSizeAxes = Axes.Both;
 
@@ -78,6 +68,7 @@ namespace osu.Game.Screens.Ranking.Expanded
                 {
                     RelativeSizeAxes = Axes.Both,
                     Masking = true,
+                    Colour = getDifficultyColour(starDifficulty),
                     Children = new Drawable[]
                     {
                         new Box
@@ -86,49 +77,64 @@ namespace osu.Game.Screens.Ranking.Expanded
                         },
                     }
                 },
-                new FillFlowContainer
+                foregroundContainer = createForegroundContainer(starDifficulty),
+            };
+        }
+
+        private ColourInfo getDifficultyColour(StarDifficulty difficulty)
+        {
+            return difficulty.DifficultyRating == DifficultyRating.ExpertPlus
+                ? ColourInfo.GradientVertical(Color4Extensions.FromHex("#C1C1C1"), Color4Extensions.FromHex("#595959"))
+                : (ColourInfo)colours.ForDifficultyRating(difficulty.DifficultyRating);
+        }
+
+        private FillFlowContainer createForegroundContainer(StarDifficulty difficulty)
+        {
+            var starRatingParts = difficulty.Stars.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
+            string wholePart = starRatingParts[0];
+            string fractionPart = starRatingParts[1];
+            string separator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
+
+            return new FillFlowContainer
+            {
+                AutoSizeAxes = Axes.Both,
+                Padding = new MarginPadding { Horizontal = 8, Vertical = 4 },
+                Direction = FillDirection.Horizontal,
+                Spacing = new Vector2(2, 0),
+                Children = new Drawable[]
                 {
-                    AutoSizeAxes = Axes.Both,
-                    Padding = new MarginPadding { Horizontal = 8, Vertical = 4 },
-                    Direction = FillDirection.Horizontal,
-                    Spacing = new Vector2(2, 0),
-                    Children = new Drawable[]
+                    new SpriteIcon
                     {
-                        new SpriteIcon
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Size = new Vector2(7),
+                        Icon = FontAwesome.Solid.Star,
+                        Colour = Color4.Black
+                    },
+                    new OsuTextFlowContainer(s => s.Font = OsuFont.Numeric.With(weight: FontWeight.Black))
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        AutoSizeAxes = Axes.Both,
+                        Direction = FillDirection.Horizontal,
+                        TextAnchor = Anchor.BottomLeft,
+                    }.With(t =>
+                    {
+                        t.AddText($"{wholePart}", s =>
                         {
-                            Anchor = Anchor.CentreLeft,
-                            Origin = Anchor.CentreLeft,
-                            Size = new Vector2(7),
-                            Icon = FontAwesome.Solid.Star,
-                            Colour = Color4.Black
-                        },
-                        new OsuTextFlowContainer(s => s.Font = OsuFont.Numeric.With(weight: FontWeight.Black))
+                            s.Colour = Color4.Black;
+                            s.Font = s.Font.With(size: 14);
+                            s.UseFullGlyphHeight = false;
+                        });
+                        t.AddText($"{separator}{fractionPart}", s =>
                         {
-                            Anchor = Anchor.CentreLeft,
-                            Origin = Anchor.CentreLeft,
-                            AutoSizeAxes = Axes.Both,
-                            Direction = FillDirection.Horizontal,
-                            TextAnchor = Anchor.BottomLeft,
-                        }.With(t =>
-                        {
-                            t.AddText(wholePartText = new OsuSpriteText(), s =>
-                            {
-                                s.Colour = Color4.Black;
-                                s.Font = s.Font.With(size: 14);
-                                s.UseFullGlyphHeight = false;
-                            });
-                            t.AddText(fractionPartText = new OsuSpriteText(), s =>
-                            {
-                                s.Colour = Color4.Black;
-                                s.Font = s.Font.With(size: 7);
-                                s.UseFullGlyphHeight = false;
-                            });
-                        }),
-                    }
+                            s.Colour = Color4.Black;
+                            s.Font = s.Font.With(size: 7);
+                            s.UseFullGlyphHeight = false;
+                        });
+                    }),
                 }
             };
-
-            setDifficulty(starDifficulty);
         }
     }
 }

From f9905ebe68352f19f6fafa981369da2a4a4faeba Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Sat, 24 Apr 2021 19:30:16 +0800
Subject: [PATCH 2794/3722] Remove beatmap argument in Note

---
 .../ManiaPlacementBlueprintTestScene.cs       | 12 ---
 .../ManiaSelectionBlueprintTestScene.cs       | 12 ---
 .../TestSceneHoldNotePlacementBlueprint.cs    |  2 +-
 .../TestSceneHoldNoteSelectionBlueprint.cs    |  2 +-
 .../Editor/TestSceneManiaHitObjectComposer.cs |  7 +-
 .../Editor/TestSceneNotePlacementBlueprint.cs |  2 +-
 .../Editor/TestSceneNoteSelectionBlueprint.cs |  2 +-
 .../ManiaInputTestScene.cs                    | 13 ----
 .../Mods/TestSceneManiaModPerfect.cs          |  4 +-
 .../Skinning/ManiaSkinnableTestScene.cs       | 12 ---
 .../Skinning/TestSceneHoldNote.cs             |  2 +-
 .../Skinning/TestSceneNote.cs                 |  2 +-
 .../TestSceneAutoGeneration.cs                | 24 +++---
 .../TestSceneColumn.cs                        |  4 +-
 .../TestSceneHoldNoteInput.cs                 | 75 ++++++++++---------
 .../TestSceneNotes.cs                         | 17 +----
 .../TestSceneOutOfOrderHits.cs                | 10 +--
 .../TestSceneStage.cs                         |  4 +-
 .../Beatmaps/ManiaBeatmapConverter.cs         |  4 +-
 .../Legacy/DistanceObjectPatternGenerator.cs  |  4 +-
 .../Legacy/EndTimeObjectPatternGenerator.cs   |  4 +-
 .../Legacy/HitObjectPatternGenerator.cs       |  2 +-
 .../Blueprints/HoldNotePlacementBlueprint.cs  |  5 +-
 .../Edit/Blueprints/NotePlacementBlueprint.cs |  5 +-
 .../Edit/HoldNoteCompositionTool.cs           |  7 +-
 .../Edit/ManiaHitObjectComposer.cs            |  4 +-
 .../Edit/NoteCompositionTool.cs               |  8 +-
 .../Mods/ManiaModInvert.cs                    |  2 +-
 osu.Game.Rulesets.Mania/Objects/HoldNote.cs   | 11 +--
 osu.Game.Rulesets.Mania/Objects/Note.cs       |  3 +-
 osu.Game.Rulesets.Mania/Objects/TailNote.cs   |  5 --
 .../TestSceneManageCollectionsDialog.cs       | 12 +--
 32 files changed, 99 insertions(+), 183 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
index 8e94d6bbb6..ece523e84c 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
@@ -4,12 +4,10 @@
 using System;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Timing;
 using osu.Game.Rulesets.Edit;
-using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
@@ -30,9 +28,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         [Cached(typeof(IScrollingInfo))]
         private IScrollingInfo scrollingInfo;
 
-        [Cached]
-        protected readonly Bindable<ManiaColourCode> configColourCode = new Bindable<ManiaColourCode>();
-
         protected ManiaPlacementBlueprintTestScene()
         {
             scrollingInfo = ((ScrollingTestContainer)HitObjectContainer).ScrollingInfo;
@@ -46,13 +41,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
             });
         }
 
-        [BackgroundDependencyLoader]
-        private void load(RulesetConfigCache configCache)
-        {
-            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
-            config.BindWith(ManiaRulesetSetting.ColourCode, configColourCode);
-        }
-
         protected override SnapResult SnapForBlueprint(PlacementBlueprint blueprint)
         {
             var time = column.TimeAtScreenSpacePosition(InputManager.CurrentState.Mouse.Position);
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
index 453f8e36e6..176fbba921 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
@@ -2,10 +2,8 @@
 // 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.Timing;
-using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Tests.Visual;
 using osuTK.Graphics;
@@ -17,9 +15,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         [Cached(Type = typeof(IAdjustableClock))]
         private readonly IAdjustableClock clock = new StopwatchClock();
 
-        [Cached]
-        protected readonly Bindable<ManiaColourCode> configColourCode = new Bindable<ManiaColourCode>();
-
         protected ManiaSelectionBlueprintTestScene()
         {
             Add(new Column(0)
@@ -31,13 +26,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
             });
         }
 
-        [BackgroundDependencyLoader]
-        private void load(RulesetConfigCache configCache)
-        {
-            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
-            config.BindWith(ManiaRulesetSetting.ColourCode, configColourCode);
-        }
-
         public ManiaPlayfield Playfield => null;
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNotePlacementBlueprint.cs
index eb36e19048..87c74a12cf 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNotePlacementBlueprint.cs
@@ -13,6 +13,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
     public class TestSceneHoldNotePlacementBlueprint : ManiaPlacementBlueprintTestScene
     {
         protected override DrawableHitObject CreateHitObject(HitObject hitObject) => new DrawableHoldNote((HoldNote)hitObject);
-        protected override PlacementBlueprint CreateBlueprint() => new HoldNotePlacementBlueprint(null);
+        protected override PlacementBlueprint CreateBlueprint() => new HoldNotePlacementBlueprint();
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNoteSelectionBlueprint.cs
index 9674985d09..24f4c6858e 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNoteSelectionBlueprint.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
 
         public TestSceneHoldNoteSelectionBlueprint()
         {
-            var holdNote = new HoldNote(null) { Column = 0, Duration = 1000 };
+            var holdNote = new HoldNote { Column = 0, Duration = 1000 };
             holdNote.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
             base.Content.Child = content = new ScrollingTestContainer(ScrollingDirection.Down)
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs
index 1f3f4842c7..aaf96c63a6 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs
@@ -159,7 +159,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
             AddStep("setup beatmap", () =>
             {
                 composer.EditorBeatmap.Clear();
-                composer.EditorBeatmap.Add(new HoldNote(Beatmap.Value.Beatmap)
+                composer.EditorBeatmap.Add(new HoldNote
                 {
                     Column = 1,
                     EndTime = 200
@@ -201,10 +201,9 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
 
             public TestComposer()
             {
-                var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 4 });
                 InternalChildren = new Drawable[]
                 {
-                    EditorBeatmap = new EditorBeatmap(beatmap)
+                    EditorBeatmap = new EditorBeatmap(new ManiaBeatmap(new StageDefinition { Columns = 4 }))
                     {
                         BeatmapInfo = { Ruleset = new ManiaRuleset().RulesetInfo }
                     },
@@ -212,7 +211,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
                 };
 
                 for (int i = 0; i < 10; i++)
-                    EditorBeatmap.Add(new Note(beatmap) { StartTime = 125 * i });
+                    EditorBeatmap.Add(new Note { StartTime = 125 * i });
             }
         }
     }
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNotePlacementBlueprint.cs
index 08a22ea28e..36c34a8fb9 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNotePlacementBlueprint.cs
@@ -55,6 +55,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         private Note getNote() => this.ChildrenOfType<DrawableNote>().FirstOrDefault()?.HitObject;
 
         protected override DrawableHitObject CreateHitObject(HitObject hitObject) => new DrawableNote((Note)hitObject);
-        protected override PlacementBlueprint CreateBlueprint() => new NotePlacementBlueprint(null);
+        protected override PlacementBlueprint CreateBlueprint() => new NotePlacementBlueprint();
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNoteSelectionBlueprint.cs
index caf89599be..0e47a12a8e 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNoteSelectionBlueprint.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
 
         public TestSceneNoteSelectionBlueprint()
         {
-            var note = new Note(null) { Column = 0 };
+            var note = new Note { Column = 0 };
             note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
             DrawableNote drawableObject;
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs b/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs
index ea7432f3a7..9049bb3a82 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs
@@ -1,21 +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.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Bindings;
-using osu.Game.Rulesets.Mania.Configuration;
-using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Mania.Tests
 {
     public abstract class ManiaInputTestScene : OsuTestScene
     {
-        [Cached]
-        protected readonly Bindable<ManiaColourCode> configColourCode = new Bindable<ManiaColourCode>();
         private readonly Container<Drawable> content;
         protected override Container<Drawable> Content => content ?? base.Content;
 
@@ -24,13 +18,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             base.Content.Add(content = new LocalInputManager(keys));
         }
 
-        [BackgroundDependencyLoader]
-        private void load(RulesetConfigCache configCache)
-        {
-            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
-            config.BindWith(ManiaRulesetSetting.ColourCode, configColourCode);
-        }
-
         private class LocalInputManager : ManiaInputManager
         {
             public LocalInputManager(int variant)
diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
index 23d0e82439..2e3b21aed7 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
@@ -19,10 +19,10 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
 
         [TestCase(false)]
         [TestCase(true)]
-        public void TestNote(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new Note(Beatmap.Value.Beatmap) { StartTime = 1000 }), shouldMiss);
+        public void TestNote(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new Note { StartTime = 1000 }), shouldMiss);
 
         [TestCase(false)]
         [TestCase(true)]
-        public void TestHoldNote(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new HoldNote(Beatmap.Value.Beatmap) { StartTime = 1000, EndTime = 3000 }), shouldMiss);
+        public void TestHoldNote(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new HoldNote { StartTime = 1000, EndTime = 3000 }), shouldMiss);
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
index 3b19386da6..1d84a2dfcb 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
@@ -7,8 +7,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Rulesets.Mania.Configuration;
-using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Rulesets.UI.Scrolling.Algorithms;
 using osu.Game.Tests.Visual;
@@ -26,9 +24,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
         [Cached(Type = typeof(IScrollingInfo))]
         private readonly TestScrollingInfo scrollingInfo = new TestScrollingInfo();
 
-        [Cached]
-        protected readonly Bindable<ManiaColourCode> configColourCode = new Bindable<ManiaColourCode>();
-
         protected override Ruleset CreateRulesetForSkinProvider() => new ManiaRuleset();
 
         protected ManiaSkinnableTestScene()
@@ -43,13 +38,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
             });
         }
 
-        [BackgroundDependencyLoader]
-        private void load(RulesetConfigCache configCache)
-        {
-            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
-            config.BindWith(ManiaRulesetSetting.ColourCode, configColourCode);
-        }
-
         [Test]
         public void TestScrollingDown()
         {
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs
index e13d0bbd7f..e88ff8e2ac 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneHoldNote.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
 
         protected override DrawableManiaHitObject CreateHitObject()
         {
-            var note = new HoldNote(Beatmap.Value.Beatmap) { Duration = 1000 };
+            var note = new HoldNote { Duration = 1000 };
             note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
             return new DrawableHoldNote(note);
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneNote.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneNote.cs
index eac288872a..bc3bdf0bcb 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneNote.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneNote.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
     {
         protected override DrawableManiaHitObject CreateHitObject()
         {
-            var note = new Note(Beatmap.Value.Beatmap);
+            var note = new Note();
             note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
             return new DrawableNote(note);
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs
index b2b9d607c6..cffec3dfd5 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneAutoGeneration.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             // |   |
 
             var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 1 });
-            beatmap.HitObjects.Add(new Note(beatmap) { StartTime = 1000 });
+            beatmap.HitObjects.Add(new Note { StartTime = 1000 });
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
@@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             // |   |
 
             var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 1 });
-            beatmap.HitObjects.Add(new HoldNote(beatmap) { StartTime = 1000, Duration = 2000 });
+            beatmap.HitObjects.Add(new HoldNote { StartTime = 1000, Duration = 2000 });
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
@@ -69,8 +69,8 @@ namespace osu.Game.Rulesets.Mania.Tests
             // |   |   |
 
             var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 2 });
-            beatmap.HitObjects.Add(new Note(beatmap) { StartTime = 1000 });
-            beatmap.HitObjects.Add(new Note(beatmap) { StartTime = 1000, Column = 1 });
+            beatmap.HitObjects.Add(new Note { StartTime = 1000 });
+            beatmap.HitObjects.Add(new Note { StartTime = 1000, Column = 1 });
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
@@ -91,8 +91,8 @@ namespace osu.Game.Rulesets.Mania.Tests
             // |   |   |
 
             var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 2 });
-            beatmap.HitObjects.Add(new HoldNote(beatmap) { StartTime = 1000, Duration = 2000 });
-            beatmap.HitObjects.Add(new HoldNote(beatmap) { StartTime = 1000, Duration = 2000, Column = 1 });
+            beatmap.HitObjects.Add(new HoldNote { StartTime = 1000, Duration = 2000 });
+            beatmap.HitObjects.Add(new HoldNote { StartTime = 1000, Duration = 2000, Column = 1 });
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
@@ -114,8 +114,8 @@ namespace osu.Game.Rulesets.Mania.Tests
             // |   |   |
 
             var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 2 });
-            beatmap.HitObjects.Add(new Note(beatmap) { StartTime = 1000 });
-            beatmap.HitObjects.Add(new Note(beatmap) { StartTime = 2000, Column = 1 });
+            beatmap.HitObjects.Add(new Note { StartTime = 1000 });
+            beatmap.HitObjects.Add(new Note { StartTime = 2000, Column = 1 });
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
@@ -141,8 +141,8 @@ namespace osu.Game.Rulesets.Mania.Tests
             // |   |   |
 
             var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 2 });
-            beatmap.HitObjects.Add(new HoldNote(beatmap) { StartTime = 1000, Duration = 2000 });
-            beatmap.HitObjects.Add(new HoldNote(beatmap) { StartTime = 2000, Duration = 2000, Column = 1 });
+            beatmap.HitObjects.Add(new HoldNote { StartTime = 1000, Duration = 2000 });
+            beatmap.HitObjects.Add(new HoldNote { StartTime = 2000, Duration = 2000, Column = 1 });
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
@@ -168,8 +168,8 @@ namespace osu.Game.Rulesets.Mania.Tests
             // |   |   |
 
             var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 2 });
-            beatmap.HitObjects.Add(new HoldNote(beatmap) { StartTime = 1000, Duration = 2000 });
-            beatmap.HitObjects.Add(new Note(beatmap) { StartTime = 3000, Column = 1 });
+            beatmap.HitObjects.Add(new HoldNote { StartTime = 1000, Duration = 2000 });
+            beatmap.HitObjects.Add(new Note { StartTime = 3000, Column = 1 });
 
             var generated = new ManiaAutoGenerator(beatmap).Generate();
 
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
index 59da73a540..d9b1ad22fa 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneColumn.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Rulesets.Mania.Tests
         {
             for (int i = 0; i < columns.Count; i++)
             {
-                var obj = new Note(null) { Column = i, StartTime = Time.Current + 2000 };
+                var obj = new Note { Column = i, StartTime = Time.Current + 2000 };
                 obj.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
                 columns[i].Add(new DrawableNote(obj));
@@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Mania.Tests
         {
             for (int i = 0; i < columns.Count; i++)
             {
-                var obj = new HoldNote(null) { Column = i, StartTime = Time.Current + 2000, Duration = 500 };
+                var obj = new HoldNote { Column = i, StartTime = Time.Current + 2000, Duration = 500 };
                 obj.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
                 columns[i].Add(new DrawableHoldNote(obj));
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index c92fe03483..668487f673 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -249,6 +249,21 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             var beatmap = new Beatmap<ManiaHitObject>
             {
+                HitObjects =
+                {
+                    new HoldNote
+                    {
+                        StartTime = 1000,
+                        Duration = 500,
+                        Column = 0,
+                    },
+                    new HoldNote
+                    {
+                        StartTime = 1000 + 500 + windows.WindowFor(HitResult.Miss) + 10,
+                        Duration = 500,
+                        Column = 0,
+                    },
+                },
                 BeatmapInfo =
                 {
                     BaseDifficulty = new BeatmapDifficulty
@@ -259,20 +274,6 @@ namespace osu.Game.Rulesets.Mania.Tests
                     Ruleset = new ManiaRuleset().RulesetInfo
                 },
             };
-            beatmap.HitObjects = new List<ManiaHitObject> {
-                    new HoldNote(beatmap)
-                    {
-                        StartTime = 1000,
-                        Duration = 500,
-                        Column = 0,
-                    },
-                    new HoldNote(beatmap)
-                    {
-                        StartTime = 1000 + 500 + windows.WindowFor(HitResult.Miss) + 10,
-                        Duration = 500,
-                        Column = 0,
-                    },
-            };
 
             performTest(new List<ReplayFrame>
             {
@@ -296,21 +297,21 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             var beatmap = new Beatmap<ManiaHitObject>
             {
+                HitObjects =
+                {
+                    new HoldNote
+                    {
+                        StartTime = time_head,
+                        Duration = time_tail - time_head,
+                        Column = 0,
+                    }
+                },
                 BeatmapInfo =
                 {
                     BaseDifficulty = new BeatmapDifficulty { SliderTickRate = tick_rate },
                     Ruleset = new ManiaRuleset().RulesetInfo
                 },
             };
-            beatmap.HitObjects = new List<ManiaHitObject>
-                {
-                    new HoldNote(beatmap)
-                    {
-                        StartTime = time_head,
-                        Duration = time_tail - time_head,
-                        Column = 0,
-                    }
-                };
 
             performTest(new List<ReplayFrame>
             {
@@ -328,17 +329,17 @@ namespace osu.Game.Rulesets.Mania.Tests
         {
             var beatmap = new Beatmap<ManiaHitObject>
             {
-                BeatmapInfo = { Ruleset = new ManiaRuleset().RulesetInfo },
-            };
-            beatmap.HitObjects = new List<ManiaHitObject>
+                HitObjects =
                 {
-                    new HoldNote(beatmap)
+                    new HoldNote
                     {
                         StartTime = 1000,
                         Duration = 0,
                         Column = 0,
                     },
-                };
+                },
+                BeatmapInfo = { Ruleset = new ManiaRuleset().RulesetInfo },
+            };
 
             performTest(new List<ReplayFrame>
             {
@@ -373,21 +374,21 @@ namespace osu.Game.Rulesets.Mania.Tests
             {
                 beatmap = new Beatmap<ManiaHitObject>
                 {
+                    HitObjects =
+                    {
+                        new HoldNote
+                        {
+                            StartTime = time_head,
+                            Duration = time_tail - time_head,
+                            Column = 0,
+                        }
+                    },
                     BeatmapInfo =
                     {
                         BaseDifficulty = new BeatmapDifficulty { SliderTickRate = 4 },
                         Ruleset = new ManiaRuleset().RulesetInfo
                     },
                 };
-                beatmap.HitObjects = new List<ManiaHitObject>
-                    {
-                        new HoldNote(beatmap)
-                        {
-                            StartTime = time_head,
-                            Duration = time_tail - time_head,
-                            Column = 0,
-                        }
-                    };
 
                 beatmap.ControlPointInfo.Add(0, new DifficultyControlPoint { SpeedMultiplier = 0.1f });
             }
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
index 3660895347..706268e478 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
@@ -15,10 +15,8 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
-using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.UI.Scrolling;
@@ -31,10 +29,6 @@ namespace osu.Game.Rulesets.Mania.Tests
     [TestFixture]
     public class TestSceneNotes : OsuTestScene
     {
-
-        [Cached]
-        protected readonly Bindable<ManiaColourCode> configColourCode = new Bindable<ManiaColourCode>();
-
         [Test]
         public void TestVariousNotes()
         {
@@ -69,16 +63,9 @@ namespace osu.Game.Rulesets.Mania.Tests
             AddAssert("hold note 2 facing upwards", () => verifyAnchors(holdNote2, Anchor.y0));
         }
 
-        [BackgroundDependencyLoader]
-        private void load(RulesetConfigCache configCache)
-        {
-            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
-            config.BindWith(ManiaRulesetSetting.ColourCode, configColourCode);
-        }
-
         private Drawable createNoteDisplay(ScrollingDirection direction, int identifier, out DrawableNote hitObject)
         {
-            var note = new Note(null) { StartTime = 0 };
+            var note = new Note { StartTime = 0 };
             note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
             return new ScrollingTestContainer(direction)
@@ -93,7 +80,7 @@ namespace osu.Game.Rulesets.Mania.Tests
 
         private Drawable createHoldNoteDisplay(ScrollingDirection direction, int identifier, out DrawableHoldNote hitObject)
         {
-            var note = new HoldNote(null) { StartTime = 0, Duration = 5000 };
+            var note = new HoldNote { StartTime = 0, Duration = 5000 };
             note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
             return new ScrollingTestContainer(direction)
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
index 65195fdd3f..18891f8c58 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneOutOfOrderHits.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             {
                 double time = 1000 + i * 100;
 
-                objects.Add(new Note(Beatmap.Value.Beatmap) { StartTime = time });
+                objects.Add(new Note { StartTime = time });
 
                 // don't hit the first note
                 if (i > 0)
@@ -60,12 +60,12 @@ namespace osu.Game.Rulesets.Mania.Tests
         {
             var objects = new List<ManiaHitObject>
             {
-                new HoldNote(Beatmap.Value.Beatmap)
+                new HoldNote
                 {
                     StartTime = 1000,
                     EndTime = 1010,
                 },
-                new HoldNote(Beatmap.Value.Beatmap)
+                new HoldNote
                 {
                     StartTime = 1020,
                     EndTime = 1030
@@ -83,12 +83,12 @@ namespace osu.Game.Rulesets.Mania.Tests
         {
             var objects = new List<ManiaHitObject>
             {
-                new HoldNote(Beatmap.Value.Beatmap)
+                new HoldNote
                 {
                     StartTime = 1000,
                     EndTime = 1010,
                 },
-                new HoldNote(Beatmap.Value.Beatmap)
+                new HoldNote
                 {
                     StartTime = 1020,
                     EndTime = 1030
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs
index 777163cca7..7376a90f17 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneStage.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             {
                 for (int i = 0; i < stage.Columns.Count; i++)
                 {
-                    var obj = new Note(null) { Column = i, StartTime = Time.Current + 2000 };
+                    var obj = new Note { Column = i, StartTime = Time.Current + 2000 };
                     obj.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
                     stage.Add(new DrawableNote(obj));
@@ -105,7 +105,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             {
                 for (int i = 0; i < stage.Columns.Count; i++)
                 {
-                    var obj = new HoldNote(null) { Column = i, StartTime = Time.Current + 2000, Duration = 500 };
+                    var obj = new HoldNote { Column = i, StartTime = Time.Current + 2000, Duration = 500 };
                     obj.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
                     stage.Add(new DrawableHoldNote(obj));
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
index 5f03c93d55..26393c8edb 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
@@ -247,7 +247,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
 
                 if (HitObject is IHasDuration endTimeData)
                 {
-                    pattern.Add(new HoldNote(Beatmap)
+                    pattern.Add(new HoldNote
                     {
                         StartTime = HitObject.StartTime,
                         Duration = endTimeData.Duration,
@@ -258,7 +258,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
                 }
                 else if (HitObject is IHasXPosition)
                 {
-                    pattern.Add(new Note(Beatmap)
+                    pattern.Add(new Note
                     {
                         StartTime = HitObject.StartTime,
                         Samples = HitObject.Samples,
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
index a936878a38..26e5d381e2 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/DistanceObjectPatternGenerator.cs
@@ -512,7 +512,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
             if (startTime == endTime)
             {
-                newObject = new Note(Beatmap)
+                newObject = new Note
                 {
                     StartTime = startTime,
                     Samples = sampleInfoListAt(startTime),
@@ -521,7 +521,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             }
             else
             {
-                newObject = new HoldNote(Beatmap)
+                newObject = new HoldNote
                 {
                     StartTime = startTime,
                     Duration = endTime - startTime,
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs
index 9422146803..f816a70ab3 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/EndTimeObjectPatternGenerator.cs
@@ -76,7 +76,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 
             if (holdNote)
             {
-                newObject = new HoldNote(Beatmap)
+                newObject = new HoldNote
                 {
                     StartTime = HitObject.StartTime,
                     Duration = endTime - HitObject.StartTime,
@@ -87,7 +87,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             }
             else
             {
-                newObject = new Note(Beatmap)
+                newObject = new Note
                 {
                     StartTime = HitObject.StartTime,
                     Samples = HitObject.Samples,
diff --git a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
index bbb4d4b466..54c37e9742 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/HitObjectPatternGenerator.cs
@@ -441,7 +441,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
         /// <param name="column">The column to add the note to.</param>
         private void addToPattern(Pattern pattern, int column)
         {
-            pattern.Add(new Note(Beatmap)
+            pattern.Add(new Note
             {
                 StartTime = HitObject.StartTime,
                 Samples = HitObject.Samples,
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
index b3902524a0..093a8da24f 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
@@ -5,7 +5,6 @@ using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
-using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
 using osu.Game.Rulesets.Mania.Objects;
@@ -24,8 +23,8 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; }
 
-        public HoldNotePlacementBlueprint(IBeatmap beatmap)
-            : base(new HoldNote(beatmap))
+        public HoldNotePlacementBlueprint()
+            : base(new HoldNote())
         {
             RelativeSizeAxes = Axes.Both;
 
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
index cc0ef5181a..3db89c8ae6 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/NotePlacementBlueprint.cs
@@ -3,7 +3,6 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
-using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
 using osu.Game.Rulesets.Mania.Objects;
@@ -15,8 +14,8 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
     {
         private readonly EditNotePiece piece;
 
-        public NotePlacementBlueprint(IBeatmap beatmap)
-            : base(new Note(beatmap))
+        public NotePlacementBlueprint()
+            : base(new Note())
         {
             RelativeSizeAxes = Axes.Both;
 
diff --git a/osu.Game.Rulesets.Mania/Edit/HoldNoteCompositionTool.cs b/osu.Game.Rulesets.Mania/Edit/HoldNoteCompositionTool.cs
index 696278de4d..a5f10ed436 100644
--- a/osu.Game.Rulesets.Mania/Edit/HoldNoteCompositionTool.cs
+++ b/osu.Game.Rulesets.Mania/Edit/HoldNoteCompositionTool.cs
@@ -5,22 +5,19 @@ using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
-using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Edit.Blueprints;
 
 namespace osu.Game.Rulesets.Mania.Edit
 {
     public class HoldNoteCompositionTool : HitObjectCompositionTool
     {
-        private ManiaBeatmap Beatmap;
-        public HoldNoteCompositionTool(ManiaBeatmap beatmap)
+        public HoldNoteCompositionTool()
             : base("Hold")
         {
-            Beatmap = beatmap;
         }
 
         public override Drawable CreateIcon() => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Sliders);
 
-        public override PlacementBlueprint CreatePlacementBlueprint() => new HoldNotePlacementBlueprint(Beatmap);
+        public override PlacementBlueprint CreatePlacementBlueprint() => new HoldNotePlacementBlueprint();
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 0defeb026d..d9570bf8be 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -93,8 +93,8 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         protected override IReadOnlyList<HitObjectCompositionTool> CompositionTools => new HitObjectCompositionTool[]
         {
-            new NoteCompositionTool(drawableRuleset.Beatmap),
-            new HoldNoteCompositionTool(drawableRuleset.Beatmap)
+            new NoteCompositionTool(),
+            new HoldNoteCompositionTool()
         };
 
         protected override void UpdateAfterChildren()
diff --git a/osu.Game.Rulesets.Mania/Edit/NoteCompositionTool.cs b/osu.Game.Rulesets.Mania/Edit/NoteCompositionTool.cs
index c77c3722c6..9f54152596 100644
--- a/osu.Game.Rulesets.Mania/Edit/NoteCompositionTool.cs
+++ b/osu.Game.Rulesets.Mania/Edit/NoteCompositionTool.cs
@@ -5,7 +5,6 @@ using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
-using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Edit.Blueprints;
 using osu.Game.Rulesets.Mania.Objects;
 
@@ -13,16 +12,13 @@ namespace osu.Game.Rulesets.Mania.Edit
 {
     public class NoteCompositionTool : HitObjectCompositionTool
     {
-        private ManiaBeatmap Beatmap;
-
-        public NoteCompositionTool(ManiaBeatmap beatmap)
+        public NoteCompositionTool()
             : base(nameof(Note))
         {
-            Beatmap = beatmap;
         }
 
         public override Drawable CreateIcon() => new BeatmapStatisticIcon(BeatmapStatisticsIconType.Circles);
 
-        public override PlacementBlueprint CreatePlacementBlueprint() => new NotePlacementBlueprint(Beatmap);
+        public override PlacementBlueprint CreatePlacementBlueprint() => new NotePlacementBlueprint();
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
index 11310c6642..1ea45c295c 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Mania.Mods
                     // Decrease the duration by at most a 1/4 beat to ensure there's no instantaneous notes.
                     duration = Math.Max(duration / 2, duration - beatLength / 4);
 
-                    newColumnObjects.Add(new HoldNote(maniaBeatmap)
+                    newColumnObjects.Add(new HoldNote
                     {
                         Column = column.Key,
                         StartTime = locations[i].startTime,
diff --git a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
index bf0631170a..6cc7ff92d3 100644
--- a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
@@ -17,8 +17,6 @@ namespace osu.Game.Rulesets.Mania.Objects
     /// </summary>
     public class HoldNote : ManiaHitObject, IHasDuration
     {
-        public IBeatmap Beatmap;
-
         public double EndTime
         {
             get => StartTime + Duration;
@@ -86,11 +84,6 @@ namespace osu.Game.Rulesets.Mania.Objects
         /// </summary>
         private double tickSpacing = 50;
 
-        public HoldNote(IBeatmap beatmap) : base()
-        {
-            Beatmap = beatmap;
-        }
-
         protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
         {
             base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
@@ -105,14 +98,14 @@ namespace osu.Game.Rulesets.Mania.Objects
 
             createTicks(cancellationToken);
 
-            AddNested(Head = new Note(Beatmap)
+            AddNested(Head = new Note
             {
                 StartTime = StartTime,
                 Column = Column,
                 Samples = GetNodeSamples(0),
             });
 
-            AddNested(Tail = new TailNote(Beatmap)
+            AddNested(Tail = new TailNote
             {
                 StartTime = EndTime,
                 Column = Column,
diff --git a/osu.Game.Rulesets.Mania/Objects/Note.cs b/osu.Game.Rulesets.Mania/Objects/Note.cs
index 6ee0232c5b..36f32c78af 100644
--- a/osu.Game.Rulesets.Mania/Objects/Note.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Note.cs
@@ -28,9 +28,8 @@ namespace osu.Game.Rulesets.Mania.Objects
             set => SnapBindable.Value = value;
         }
 
-        public Note(IBeatmap beatmap) : base()
+        public Note()
         {
-            Beatmap = beatmap;
             this.StartTimeBindable.BindValueChanged(_ => SnapToBeatmap(), true);
         }
 
diff --git a/osu.Game.Rulesets.Mania/Objects/TailNote.cs b/osu.Game.Rulesets.Mania/Objects/TailNote.cs
index bc56408691..5a30fd6a12 100644
--- a/osu.Game.Rulesets.Mania/Objects/TailNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/TailNote.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.Game.Beatmaps;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Judgements;
 
@@ -9,10 +8,6 @@ namespace osu.Game.Rulesets.Mania.Objects
 {
     public class TailNote : Note
     {
-        public TailNote(IBeatmap beatmap) : base(beatmap)
-        {
-        }
-
         public override Judgement CreateJudgement() => new ManiaJudgement();
     }
 }
diff --git a/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs b/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
index d8d419bceb..eca857f9e5 100644
--- a/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
+++ b/osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
@@ -140,12 +140,12 @@ namespace osu.Game.Tests.Visual.Collections
             AddStep("add dropdown", () =>
             {
                 Add(new CollectionFilterDropdown
-                {
-                    Anchor = Anchor.TopRight,
-                    Origin = Anchor.TopRight,
-                    RelativeSizeAxes = Axes.X,
-                    Width = 0.4f,
-                }
+                    {
+                        Anchor = Anchor.TopRight,
+                        Origin = Anchor.TopRight,
+                        RelativeSizeAxes = Axes.X,
+                        Width = 0.4f,
+                    }
                 );
             });
             AddStep("add two collections with same name", () => manager.Collections.AddRange(new[]

From d6d81fb8e5a55db4f58aa4cc41d729f3e0ec3f27 Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Sat, 24 Apr 2021 19:53:21 +0800
Subject: [PATCH 2795/3722] Move color snap logic from Note to DrawableNote

---
 .../Objects/Drawables/DrawableNote.cs         | 102 +++++++++++++++---
 osu.Game.Rulesets.Mania/Objects/Note.cs       |  78 --------------
 .../UI/DrawableManiaRuleset.cs                |   5 +
 3 files changed, 93 insertions(+), 92 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 436e0923c4..3b2a9feee2 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -1,12 +1,16 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Diagnostics;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Bindings;
+using osu.Framework.Utils;
+using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
+using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Skinning.Default;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Scoring;
@@ -27,10 +31,21 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         [Resolved]
         private Bindable<ManiaColourCode> configColourCode { get; set; }
 
+        [Resolved(canBeNull: true)]
+        private ManiaBeatmap beatmap { get; set; }
+
         protected virtual ManiaSkinComponents Component => ManiaSkinComponents.Note;
 
         private readonly Drawable headPiece;
 
+        public readonly Bindable<int> SnapBindable = new Bindable<int>();
+
+        public int Snap
+        {
+            get => SnapBindable.Value;
+            set => SnapBindable.Value = value;
+        }
+
         public DrawableNote(Note hitObject)
             : base(hitObject)
         {
@@ -48,20 +63,10 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
             base.LoadComplete();
 
-            HitObject.SnapBindable.BindValueChanged(snap => UpdateSnapColour(configColourCode.Value, snap.NewValue), true);
-            configColourCode.BindValueChanged(colourCode => UpdateSnapColour(colourCode.NewValue, HitObject.Snap));
-        }
+            HitObject.StartTimeBindable.BindValueChanged(_ => SnapToBeatmap(), true);
 
-        private void UpdateSnapColour(ManiaColourCode colourCode, int snap)
-        {
-            if (colourCode == ManiaColourCode.On)
-            {
-                Colour = BindableBeatDivisor.GetColourFor(HitObject.Snap, colours);
-            }
-            else
-            {
-                Colour = Colour4.White;
-            }
+            SnapBindable.BindValueChanged(snap => UpdateSnapColour(configColourCode.Value, snap.NewValue), true);
+            configColourCode.BindValueChanged(colourCode => UpdateSnapColour(colourCode.NewValue, Snap));
         }
 
         protected override void OnDirectionChanged(ValueChangedEvent<ScrollingDirection> e)
@@ -103,5 +108,74 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         public virtual void OnReleased(ManiaAction action)
         {
         }
+        private void SnapToBeatmap()
+        {
+            if (beatmap != null)
+            {
+                TimingControlPoint currentTimingPoint = beatmap.ControlPointInfo.TimingPointAt(HitObject.StartTime);
+                int timeSignature = (int)currentTimingPoint.TimeSignature;
+                double startTime = currentTimingPoint.Time;
+                double secondsPerFourCounts = currentTimingPoint.BeatLength * 4;
+
+                double offset = startTime % secondsPerFourCounts;
+                double snapResult = HitObject.StartTime % secondsPerFourCounts - offset;
+
+                if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 4.0))
+                {
+                    Snap = 1;
+                }
+                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 8.0))
+                {
+                    Snap = 2;
+                }
+                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 12.0))
+                {
+                    Snap = 3;
+                }
+                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 16.0))
+                {
+                    Snap = 4;
+                }
+                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 24.0))
+                {
+                    Snap = 6;
+                }
+                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 32.0))
+                {
+                    Snap = 8;
+                }
+                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 48.0))
+                {
+                    Snap = 12;
+                }
+                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 64.0))
+                {
+                    Snap = 16;
+                }
+                else
+                {
+                    Snap = 0;
+                }
+            }
+        }
+
+        private const double LENIENCY_MS = 1.0;
+        private static bool AlmostDivisibleBy(double dividend, double divisor)
+        {
+            double remainder = Math.Abs(dividend) % divisor;
+            return Precision.AlmostEquals(remainder, 0, LENIENCY_MS) || Precision.AlmostEquals(remainder - divisor, 0, LENIENCY_MS);
+        }
+
+        private void UpdateSnapColour(ManiaColourCode colourCode, int snap)
+        {
+            if (colourCode == ManiaColourCode.On)
+            {
+                Colour = BindableBeatDivisor.GetColourFor(Snap, colours);
+            }
+            else
+            {
+                Colour = Colour4.White;
+            }
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Mania/Objects/Note.cs b/osu.Game.Rulesets.Mania/Objects/Note.cs
index 36f32c78af..0035960c63 100644
--- a/osu.Game.Rulesets.Mania/Objects/Note.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Note.cs
@@ -1,11 +1,6 @@
 // Copyright (c) ppy 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.Utils;
-using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Judgements;
 
@@ -17,78 +12,5 @@ namespace osu.Game.Rulesets.Mania.Objects
     public class Note : ManiaHitObject
     {
         public override Judgement CreateJudgement() => new ManiaJudgement();
-
-        private IBeatmap Beatmap;
-
-        public readonly Bindable<int> SnapBindable = new Bindable<int>();
-
-        public int Snap
-        {
-            get => SnapBindable.Value;
-            set => SnapBindable.Value = value;
-        }
-
-        public Note()
-        {
-            this.StartTimeBindable.BindValueChanged(_ => SnapToBeatmap(), true);
-        }
-
-        private void SnapToBeatmap()
-        {
-            if (Beatmap != null)
-            {
-                TimingControlPoint currentTimingPoint = Beatmap.ControlPointInfo.TimingPointAt(StartTime);
-                int timeSignature = (int)currentTimingPoint.TimeSignature;
-                double startTime = currentTimingPoint.Time;
-                double secondsPerFourCounts = currentTimingPoint.BeatLength * 4;
-
-                double offset = startTime % secondsPerFourCounts;
-                double snapResult = StartTime % secondsPerFourCounts - offset;
-
-                if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 4.0))
-                {
-                    Snap = 1;
-                }
-                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 8.0))
-                {
-                    Snap = 2;
-                }
-                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 12.0))
-                {
-                    Snap = 3;
-                }
-                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 16.0))
-                {
-                    Snap = 4;
-                }
-                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 24.0))
-                {
-                    Snap = 6;
-                }
-                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 32.0))
-                {
-                    Snap = 8;
-                }
-                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 48.0))
-                {
-                    Snap = 12;
-                }
-                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 64.0))
-                {
-                    Snap = 16;
-                }
-                else
-                {
-                    Snap = 0;
-                }
-            }
-        }
-
-        private const double LENIENCY_MS = 1.0;
-        private static bool AlmostDivisibleBy(double dividend, double divisor)
-        {
-            double remainder = Math.Abs(dividend) % divisor;
-            return Precision.AlmostEquals(remainder, 0, LENIENCY_MS) || Precision.AlmostEquals(remainder - divisor, 0, LENIENCY_MS);
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index dc9c525cb0..850d4800cd 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -45,6 +45,9 @@ namespace osu.Game.Rulesets.Mania.UI
 
         public new ManiaBeatmap Beatmap => (ManiaBeatmap)base.Beatmap;
 
+        [Cached(typeof(ManiaBeatmap))]
+        private ManiaBeatmap CachedBeatmap { get; }
+
         public IEnumerable<BarLine> BarLines;
 
         protected override bool RelativeScaleBeatLengths => true;
@@ -80,6 +83,8 @@ namespace osu.Game.Rulesets.Mania.UI
             : base(ruleset, beatmap, mods)
         {
             BarLines = new BarLineGenerator<BarLine>(Beatmap).BarLines;
+
+            CachedBeatmap = Beatmap;
         }
 
         [BackgroundDependencyLoader]

From e937b778f6a5ccb4840e9561467c81edfbfb4028 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 24 Apr 2021 14:19:39 +0200
Subject: [PATCH 2796/3722] Fix potential failure in `ensureSourceClockSet()`

`ensureSourceClockSet()` was intended to only run when the adjustable
source hasn't been set at all yet. As it turns out permitting it to run
unconditionally can break the state of the underlying interpolated
clock. This is caused by the following factors:

* While the decoupleable clock is running, its `CurrentTime` does not
  come from either the source clock, or the internal stopwatch; it is
  instead calculated using the base `InterpolatingFramedClock` logic.

* A source change of a decoupleable clock seeks the provided source
  clock to the decoupleable's current time.

* When an interpolating clock is seeked (decoupleable clock is also
  an interpolating one), its interpolation state
  (`{Last,Current}InterpolatedTime`) are reset to 0.

* If the interpolating clock determines that its current time is too
  far away from the source's time (which was set when the source is
  changed), it will ignore the source and instead continue to use
  its current time until the source clock has caught up.

Overall, the source change is not really necessary if a source is
already there. The only reason to ensure it was set was to make sure
the first seek of the gameplay clock wasn't performed in decoupled
mode. Therefore, add a guard to make sure the source is only set if
there isn't one already.
---
 osu.Game/Screens/Play/GameplayClockContainer.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 6d60c09521..1c8a3e51ac 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -116,13 +116,17 @@ namespace osu.Game.Screens.Play
         protected void ChangeSource(IClock sourceClock) => AdjustableSource.ChangeSource(SourceClock = sourceClock);
 
         /// <summary>
-        /// Ensures that the <see cref="AdjustableSource"/> is set to <see cref="SourceClock"/>.
+        /// Ensures that the <see cref="AdjustableSource"/> 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() => ChangeSource(SourceClock);
+        private void ensureSourceClockSet()
+        {
+            if (AdjustableSource.Source == null)
+                ChangeSource(SourceClock);
+        }
 
         protected override void Update()
         {

From a8b401522bf561d5a2d49567ec99a2048e56586a Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Sat, 24 Apr 2021 20:39:22 +0800
Subject: [PATCH 2797/3722] Remove ManiaColourCode in favor for boolean

---
 .../Configuration/ManiaRulesetConfigManager.cs        |  2 +-
 osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs    |  4 ++--
 .../Objects/Drawables/DrawableNote.cs                 |  6 +++---
 osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs    |  2 +-
 osu.Game.Rulesets.Mania/UI/ManiaColourCode.cs         | 11 -----------
 5 files changed, 7 insertions(+), 18 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Mania/UI/ManiaColourCode.cs

diff --git a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
index 292d494d88..f37937a736 100644
--- a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
+++ b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Mania.Configuration
 
             SetDefault(ManiaRulesetSetting.ScrollTime, 1500.0, DrawableManiaRuleset.MIN_TIME_RANGE, DrawableManiaRuleset.MAX_TIME_RANGE, 5);
             SetDefault(ManiaRulesetSetting.ScrollDirection, ManiaScrollingDirection.Down);
-            SetDefault(ManiaRulesetSetting.ColourCode, ManiaColourCode.Off);
+            SetDefault(ManiaRulesetSetting.ColourCode, false);
         }
 
         public override TrackedSettings CreateTrackedSettings() => new TrackedSettings
diff --git a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
index d46076d3bc..c0c587f67c 100644
--- a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
@@ -37,10 +37,10 @@ namespace osu.Game.Rulesets.Mania
                     Current = config.GetBindable<double>(ManiaRulesetSetting.ScrollTime),
                     KeyboardStep = 5
                 },
-                new SettingsEnumDropdown<ManiaColourCode>
+                new SettingsCheckbox
                 {
                     LabelText = "Colour-coded notes",
-                    Current = config.GetBindable<ManiaColourCode>(ManiaRulesetSetting.ColourCode),
+                    Current = config.GetBindable<bool>(ManiaRulesetSetting.ColourCode),
                 }
             };
         }
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 3b2a9feee2..7cda70f2af 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         private OsuColour colours { get; set; }
 
         [Resolved]
-        private Bindable<ManiaColourCode> configColourCode { get; set; }
+        private Bindable<bool> configColourCode { get; set; }
 
         [Resolved(canBeNull: true)]
         private ManiaBeatmap beatmap { get; set; }
@@ -166,9 +166,9 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             return Precision.AlmostEquals(remainder, 0, LENIENCY_MS) || Precision.AlmostEquals(remainder - divisor, 0, LENIENCY_MS);
         }
 
-        private void UpdateSnapColour(ManiaColourCode colourCode, int snap)
+        private void UpdateSnapColour(bool colourCode, int snap)
         {
-            if (colourCode == ManiaColourCode.On)
+            if (colourCode)
             {
                 Colour = BindableBeatDivisor.GetColourFor(Snap, colours);
             }
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 850d4800cd..94830adc33 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Mania.UI
         protected new ManiaRulesetConfigManager Config => (ManiaRulesetConfigManager)base.Config;
 
         [Cached]
-        protected readonly Bindable<ManiaColourCode> configColourCode = new Bindable<ManiaColourCode>();
+        protected readonly Bindable<bool> configColourCode = new Bindable<bool>();
 
         public ScrollVisualisationMethod ScrollMethod
         {
diff --git a/osu.Game.Rulesets.Mania/UI/ManiaColourCode.cs b/osu.Game.Rulesets.Mania/UI/ManiaColourCode.cs
deleted file mode 100644
index 91b637b71d..0000000000
--- a/osu.Game.Rulesets.Mania/UI/ManiaColourCode.cs
+++ /dev/null
@@ -1,11 +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.Mania.UI
-{
-    public enum ManiaColourCode
-    {
-        Off,
-        On
-    }
-}

From 91bf0d422d88fe519834cbe01771a20cc5a379d8 Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Sat, 24 Apr 2021 20:40:30 +0800
Subject: [PATCH 2798/3722] Rename ColourCode to ColourCodedNotes

---
 .../Configuration/ManiaRulesetConfigManager.cs                | 4 ++--
 osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs            | 2 +-
 osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
index f37937a736..87a4689689 100644
--- a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
+++ b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Mania.Configuration
 
             SetDefault(ManiaRulesetSetting.ScrollTime, 1500.0, DrawableManiaRuleset.MIN_TIME_RANGE, DrawableManiaRuleset.MAX_TIME_RANGE, 5);
             SetDefault(ManiaRulesetSetting.ScrollDirection, ManiaScrollingDirection.Down);
-            SetDefault(ManiaRulesetSetting.ColourCode, false);
+            SetDefault(ManiaRulesetSetting.ColourCodedNotes, false);
         }
 
         public override TrackedSettings CreateTrackedSettings() => new TrackedSettings
@@ -36,6 +36,6 @@ namespace osu.Game.Rulesets.Mania.Configuration
     {
         ScrollTime,
         ScrollDirection,
-        ColourCode
+        ColourCodedNotes
     }
 }
diff --git a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
index c0c587f67c..552c793096 100644
--- a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Mania
                 new SettingsCheckbox
                 {
                     LabelText = "Colour-coded notes",
-                    Current = config.GetBindable<bool>(ManiaRulesetSetting.ColourCode),
+                    Current = config.GetBindable<bool>(ManiaRulesetSetting.ColourCodedNotes),
                 }
             };
         }
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 94830adc33..60e9613b71 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -113,7 +113,7 @@ namespace osu.Game.Rulesets.Mania.UI
 
             Config.BindWith(ManiaRulesetSetting.ScrollTime, configTimeRange);
 
-            Config.BindWith(ManiaRulesetSetting.ColourCode, configColourCode);
+            Config.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCode);
         }
 
         protected override void AdjustScrollSpeed(int amount)

From 3103fd8343efa3d811605ffae382da0734097dd2 Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Sat, 24 Apr 2021 20:54:05 +0800
Subject: [PATCH 2799/3722] Move snapping logic into SnapFinder

---
 .../Objects/Drawables/DrawableNote.cs         | 68 +----------------
 .../UI/DrawableManiaRuleset.cs                |  7 +-
 osu.Game.Rulesets.Mania/Utils/SnapFinder.cs   | 75 +++++++++++++++++++
 3 files changed, 83 insertions(+), 67 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/Utils/SnapFinder.cs

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 7cda70f2af..998d9e625e 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -7,12 +7,9 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Bindings;
-using osu.Framework.Utils;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
-using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Skinning.Default;
-using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.Mania.Utils;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit;
@@ -31,8 +28,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         [Resolved]
         private Bindable<bool> configColourCode { get; set; }
 
-        [Resolved(canBeNull: true)]
-        private ManiaBeatmap beatmap { get; set; }
+        [Resolved]
+        private SnapFinder snapFinder { get; set; }
 
         protected virtual ManiaSkinComponents Component => ManiaSkinComponents.Note;
 
@@ -63,7 +60,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
             base.LoadComplete();
 
-            HitObject.StartTimeBindable.BindValueChanged(_ => SnapToBeatmap(), true);
+            HitObject.StartTimeBindable.BindValueChanged(_ => Snap = snapFinder.FindSnap(HitObject), true);
 
             SnapBindable.BindValueChanged(snap => UpdateSnapColour(configColourCode.Value, snap.NewValue), true);
             configColourCode.BindValueChanged(colourCode => UpdateSnapColour(colourCode.NewValue, Snap));
@@ -108,63 +105,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         public virtual void OnReleased(ManiaAction action)
         {
         }
-        private void SnapToBeatmap()
-        {
-            if (beatmap != null)
-            {
-                TimingControlPoint currentTimingPoint = beatmap.ControlPointInfo.TimingPointAt(HitObject.StartTime);
-                int timeSignature = (int)currentTimingPoint.TimeSignature;
-                double startTime = currentTimingPoint.Time;
-                double secondsPerFourCounts = currentTimingPoint.BeatLength * 4;
-
-                double offset = startTime % secondsPerFourCounts;
-                double snapResult = HitObject.StartTime % secondsPerFourCounts - offset;
-
-                if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 4.0))
-                {
-                    Snap = 1;
-                }
-                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 8.0))
-                {
-                    Snap = 2;
-                }
-                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 12.0))
-                {
-                    Snap = 3;
-                }
-                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 16.0))
-                {
-                    Snap = 4;
-                }
-                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 24.0))
-                {
-                    Snap = 6;
-                }
-                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 32.0))
-                {
-                    Snap = 8;
-                }
-                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 48.0))
-                {
-                    Snap = 12;
-                }
-                else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 64.0))
-                {
-                    Snap = 16;
-                }
-                else
-                {
-                    Snap = 0;
-                }
-            }
-        }
-
-        private const double LENIENCY_MS = 1.0;
-        private static bool AlmostDivisibleBy(double dividend, double divisor)
-        {
-            double remainder = Math.Abs(dividend) % divisor;
-            return Precision.AlmostEquals(remainder, 0, LENIENCY_MS) || Precision.AlmostEquals(remainder - divisor, 0, LENIENCY_MS);
-        }
 
         private void UpdateSnapColour(bool colourCode, int snap)
         {
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 60e9613b71..99fb32f81f 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -20,6 +20,7 @@ using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.Replays;
+using osu.Game.Rulesets.Mania.Utils;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -45,8 +46,8 @@ namespace osu.Game.Rulesets.Mania.UI
 
         public new ManiaBeatmap Beatmap => (ManiaBeatmap)base.Beatmap;
 
-        [Cached(typeof(ManiaBeatmap))]
-        private ManiaBeatmap CachedBeatmap { get; }
+        [Cached]
+        private SnapFinder snapFinder { get; set; }
 
         public IEnumerable<BarLine> BarLines;
 
@@ -84,7 +85,7 @@ namespace osu.Game.Rulesets.Mania.UI
         {
             BarLines = new BarLineGenerator<BarLine>(Beatmap).BarLines;
 
-            CachedBeatmap = Beatmap;
+            snapFinder = new SnapFinder(Beatmap);
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game.Rulesets.Mania/Utils/SnapFinder.cs b/osu.Game.Rulesets.Mania/Utils/SnapFinder.cs
new file mode 100644
index 0000000000..01a9339552
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Utils/SnapFinder.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.Utils;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Mania.Beatmaps;
+using osu.Game.Rulesets.Objects;
+
+namespace osu.Game.Rulesets.Mania.Utils
+{
+    public class SnapFinder
+    {
+        private ManiaBeatmap beatmap;
+        public SnapFinder(ManiaBeatmap beatmap)
+        {
+            this.beatmap = beatmap;
+        }
+
+        public int FindSnap(HitObject hitObject)
+        {
+            TimingControlPoint currentTimingPoint = beatmap.ControlPointInfo.TimingPointAt(hitObject.StartTime);
+            int timeSignature = (int)currentTimingPoint.TimeSignature;
+            double startTime = currentTimingPoint.Time;
+            double secondsPerFourCounts = currentTimingPoint.BeatLength * 4;
+
+            double offset = startTime % secondsPerFourCounts;
+            double snapResult = hitObject.StartTime % secondsPerFourCounts - offset;
+
+            if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 4.0))
+            {
+                return 1;
+            }
+            else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 8.0))
+            {
+                return 2;
+            }
+            else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 12.0))
+            {
+                return 3;
+            }
+            else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 16.0))
+            {
+                return 4;
+            }
+            else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 24.0))
+            {
+                return 6;
+            }
+            else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 32.0))
+            {
+                return 8;
+            }
+            else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 48.0))
+            {
+                return 12;
+            }
+            else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 64.0))
+            {
+                return 16;
+            }
+            else
+            {
+                return 0;
+            }
+        }
+
+        private const double LENIENCY_MS = 1.0;
+        private static bool AlmostDivisibleBy(double dividend, double divisor)
+        {
+            double remainder = Math.Abs(dividend) % divisor;
+            return Precision.AlmostEquals(remainder, 0, LENIENCY_MS) || Precision.AlmostEquals(remainder - divisor, 0, LENIENCY_MS);
+        }
+    }
+}

From 8b01082cbb3c257bd69ba6fb95cd173bce79f854 Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Sat, 24 Apr 2021 21:07:17 +0800
Subject: [PATCH 2800/3722] Fix visual tests missing dependency for
 ColourCodedNotes

---
 .../Editor/ManiaPlacementBlueprintTestScene.cs      | 12 ++++++++++++
 .../Editor/ManiaSelectionBlueprintTestScene.cs      | 12 ++++++++++++
 .../ManiaInputTestScene.cs                          | 13 +++++++++++++
 .../Skinning/ManiaSkinnableTestScene.cs             | 11 +++++++++++
 osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs     | 11 +++++++++++
 .../Objects/Drawables/DrawableNote.cs               | 13 ++++++++-----
 osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs  |  4 ++--
 7 files changed, 69 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
index ece523e84c..8a605a7ca3 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
@@ -4,10 +4,12 @@
 using System;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Timing;
 using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
@@ -28,6 +30,9 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         [Cached(typeof(IScrollingInfo))]
         private IScrollingInfo scrollingInfo;
 
+        [Cached]
+        protected readonly Bindable<bool> configColourCodedNotes = new Bindable<bool>();
+
         protected ManiaPlacementBlueprintTestScene()
         {
             scrollingInfo = ((ScrollingTestContainer)HitObjectContainer).ScrollingInfo;
@@ -41,6 +46,13 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
             });
         }
 
+        [BackgroundDependencyLoader]
+        private void load(RulesetConfigCache configCache)
+        {
+            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
+            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
+        }
+
         protected override SnapResult SnapForBlueprint(PlacementBlueprint blueprint)
         {
             var time = column.TimeAtScreenSpacePosition(InputManager.CurrentState.Mouse.Position);
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
index 176fbba921..854d0fb14e 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
@@ -2,8 +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.Timing;
+using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Tests.Visual;
 using osuTK.Graphics;
@@ -15,6 +17,9 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         [Cached(Type = typeof(IAdjustableClock))]
         private readonly IAdjustableClock clock = new StopwatchClock();
 
+        [Cached]
+        protected readonly Bindable<bool> configColourCodedNotes = new Bindable<bool>();
+
         protected ManiaSelectionBlueprintTestScene()
         {
             Add(new Column(0)
@@ -26,6 +31,13 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
             });
         }
 
+        [BackgroundDependencyLoader]
+        private void load(RulesetConfigCache configCache)
+        {
+            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
+            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
+        }
+
         public ManiaPlayfield Playfield => null;
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs b/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs
index 9049bb3a82..f54d90016c 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.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 osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Bindings;
+using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Mania.Tests
@@ -13,11 +16,21 @@ namespace osu.Game.Rulesets.Mania.Tests
         private readonly Container<Drawable> content;
         protected override Container<Drawable> Content => content ?? base.Content;
 
+        [Cached]
+        protected readonly Bindable<bool> configColourCodedNotes = new Bindable<bool>();
+
         protected ManiaInputTestScene(int keys)
         {
             base.Content.Add(content = new LocalInputManager(keys));
         }
 
+        [BackgroundDependencyLoader]
+        private void load(RulesetConfigCache configCache)
+        {
+            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
+            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
+        }
+
         private class LocalInputManager : ManiaInputManager
         {
             public LocalInputManager(int variant)
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
index 1d84a2dfcb..05f07bad12 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
@@ -7,6 +7,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Rulesets.UI.Scrolling.Algorithms;
 using osu.Game.Tests.Visual;
@@ -24,6 +25,9 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
         [Cached(Type = typeof(IScrollingInfo))]
         private readonly TestScrollingInfo scrollingInfo = new TestScrollingInfo();
 
+        [Cached]
+        protected readonly Bindable<bool> configColourCodedNotes = new Bindable<bool>();
+
         protected override Ruleset CreateRulesetForSkinProvider() => new ManiaRuleset();
 
         protected ManiaSkinnableTestScene()
@@ -38,6 +42,13 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
             });
         }
 
+        [BackgroundDependencyLoader]
+        private void load(RulesetConfigCache configCache)
+        {
+            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
+            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
+        }
+
         [Test]
         public void TestScrollingDown()
         {
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
index 706268e478..9828db7687 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
@@ -15,6 +15,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -29,6 +30,16 @@ namespace osu.Game.Rulesets.Mania.Tests
     [TestFixture]
     public class TestSceneNotes : OsuTestScene
     {
+        [Cached]
+        protected readonly Bindable<bool> configColourCodedNotes = new Bindable<bool>();
+
+        [BackgroundDependencyLoader]
+        private void load(RulesetConfigCache configCache)
+        {
+            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
+            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
+        }
+
         [Test]
         public void TestVariousNotes()
         {
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 998d9e625e..cfae01f5f2 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -26,9 +26,9 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         private OsuColour colours { get; set; }
 
         [Resolved]
-        private Bindable<bool> configColourCode { get; set; }
+        private Bindable<bool> configColourCodedNotes { get; set; }
 
-        [Resolved]
+        [Resolved(canBeNull: true)]
         private SnapFinder snapFinder { get; set; }
 
         protected virtual ManiaSkinComponents Component => ManiaSkinComponents.Note;
@@ -60,10 +60,13 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
             base.LoadComplete();
 
-            HitObject.StartTimeBindable.BindValueChanged(_ => Snap = snapFinder.FindSnap(HitObject), true);
+            if (snapFinder != null)
+            {
+                HitObject.StartTimeBindable.BindValueChanged(_ => Snap = snapFinder.FindSnap(HitObject), true);
 
-            SnapBindable.BindValueChanged(snap => UpdateSnapColour(configColourCode.Value, snap.NewValue), true);
-            configColourCode.BindValueChanged(colourCode => UpdateSnapColour(colourCode.NewValue, Snap));
+                SnapBindable.BindValueChanged(snap => UpdateSnapColour(configColourCodedNotes.Value, snap.NewValue), true);
+                configColourCodedNotes.BindValueChanged(colourCode => UpdateSnapColour(colourCode.NewValue, Snap));
+            }
         }
 
         protected override void OnDirectionChanged(ValueChangedEvent<ScrollingDirection> e)
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 99fb32f81f..818d6429e4 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Mania.UI
         protected new ManiaRulesetConfigManager Config => (ManiaRulesetConfigManager)base.Config;
 
         [Cached]
-        protected readonly Bindable<bool> configColourCode = new Bindable<bool>();
+        protected readonly Bindable<bool> configColourCodedNotes = new Bindable<bool>();
 
         public ScrollVisualisationMethod ScrollMethod
         {
@@ -114,7 +114,7 @@ namespace osu.Game.Rulesets.Mania.UI
 
             Config.BindWith(ManiaRulesetSetting.ScrollTime, configTimeRange);
 
-            Config.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCode);
+            Config.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
         }
 
         protected override void AdjustScrollSpeed(int amount)

From bedabc1ddf673aa94d7a38414cb0c710a4f9d4bb Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Sat, 24 Apr 2021 22:12:07 +0800
Subject: [PATCH 2801/3722] Fix cake errors

---
 .../ManiaPlacementBlueprintTestScene.cs       |  4 +--
 .../ManiaSelectionBlueprintTestScene.cs       |  4 +--
 .../ManiaInputTestScene.cs                    |  4 +--
 .../Skinning/ManiaSkinnableTestScene.cs       |  4 +--
 .../TestSceneNotes.cs                         |  4 +--
 .../Objects/Drawables/DrawableNote.cs         |  7 +++--
 .../UI/DrawableManiaRuleset.cs                |  4 +--
 osu.Game.Rulesets.Mania/Utils/SnapFinder.cs   | 27 ++++++++++---------
 8 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
index 8a605a7ca3..c04b875245 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         private IScrollingInfo scrollingInfo;
 
         [Cached]
-        protected readonly Bindable<bool> configColourCodedNotes = new Bindable<bool>();
+        protected readonly Bindable<bool> ConfigColourCodedNotes = new Bindable<bool>();
 
         protected ManiaPlacementBlueprintTestScene()
         {
@@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         private void load(RulesetConfigCache configCache)
         {
             var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
-            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
+            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, ConfigColourCodedNotes);
         }
 
         protected override SnapResult SnapForBlueprint(PlacementBlueprint blueprint)
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
index 854d0fb14e..1c11dc397e 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         private readonly IAdjustableClock clock = new StopwatchClock();
 
         [Cached]
-        protected readonly Bindable<bool> configColourCodedNotes = new Bindable<bool>();
+        protected readonly Bindable<bool> ConfigColourCodedNotes = new Bindable<bool>();
 
         protected ManiaSelectionBlueprintTestScene()
         {
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         private void load(RulesetConfigCache configCache)
         {
             var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
-            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
+            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, ConfigColourCodedNotes);
         }
 
         public ManiaPlayfield Playfield => null;
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs b/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs
index f54d90016c..2b2db8aa96 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Mania.Tests
         protected override Container<Drawable> Content => content ?? base.Content;
 
         [Cached]
-        protected readonly Bindable<bool> configColourCodedNotes = new Bindable<bool>();
+        protected readonly Bindable<bool> ConfigColourCodedNotes = new Bindable<bool>();
 
         protected ManiaInputTestScene(int keys)
         {
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Mania.Tests
         private void load(RulesetConfigCache configCache)
         {
             var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
-            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
+            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, ConfigColourCodedNotes);
         }
 
         private class LocalInputManager : ManiaInputManager
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
index 05f07bad12..941d01a1d6 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
         private readonly TestScrollingInfo scrollingInfo = new TestScrollingInfo();
 
         [Cached]
-        protected readonly Bindable<bool> configColourCodedNotes = new Bindable<bool>();
+        protected readonly Bindable<bool> ConfigColourCodedNotes = new Bindable<bool>();
 
         protected override Ruleset CreateRulesetForSkinProvider() => new ManiaRuleset();
 
@@ -46,7 +46,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
         private void load(RulesetConfigCache configCache)
         {
             var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
-            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
+            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, ConfigColourCodedNotes);
         }
 
         [Test]
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
index 9828db7687..1d053688a2 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
@@ -31,13 +31,13 @@ namespace osu.Game.Rulesets.Mania.Tests
     public class TestSceneNotes : OsuTestScene
     {
         [Cached]
-        protected readonly Bindable<bool> configColourCodedNotes = new Bindable<bool>();
+        protected readonly Bindable<bool> ConfigColourCodedNotes = new Bindable<bool>();
 
         [BackgroundDependencyLoader]
         private void load(RulesetConfigCache configCache)
         {
             var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
-            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
+            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, ConfigColourCodedNotes);
         }
 
         [Test]
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index cfae01f5f2..04c4b06c88 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.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 osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -64,8 +63,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             {
                 HitObject.StartTimeBindable.BindValueChanged(_ => Snap = snapFinder.FindSnap(HitObject), true);
 
-                SnapBindable.BindValueChanged(snap => UpdateSnapColour(configColourCodedNotes.Value, snap.NewValue), true);
-                configColourCodedNotes.BindValueChanged(colourCode => UpdateSnapColour(colourCode.NewValue, Snap));
+                SnapBindable.BindValueChanged(snap => updateSnapColour(configColourCodedNotes.Value, snap.NewValue), true);
+                configColourCodedNotes.BindValueChanged(colourCode => updateSnapColour(colourCode.NewValue, Snap));
             }
         }
 
@@ -109,7 +108,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
         }
 
-        private void UpdateSnapColour(bool colourCode, int snap)
+        private void updateSnapColour(bool colourCode, int snap)
         {
             if (colourCode)
             {
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 818d6429e4..17535c9bc9 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Mania.UI
         protected new ManiaRulesetConfigManager Config => (ManiaRulesetConfigManager)base.Config;
 
         [Cached]
-        protected readonly Bindable<bool> configColourCodedNotes = new Bindable<bool>();
+        protected readonly Bindable<bool> ConfigColourCodedNotes = new Bindable<bool>();
 
         public ScrollVisualisationMethod ScrollMethod
         {
@@ -114,7 +114,7 @@ namespace osu.Game.Rulesets.Mania.UI
 
             Config.BindWith(ManiaRulesetSetting.ScrollTime, configTimeRange);
 
-            Config.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
+            Config.BindWith(ManiaRulesetSetting.ColourCodedNotes, ConfigColourCodedNotes);
         }
 
         protected override void AdjustScrollSpeed(int amount)
diff --git a/osu.Game.Rulesets.Mania/Utils/SnapFinder.cs b/osu.Game.Rulesets.Mania/Utils/SnapFinder.cs
index 01a9339552..83df0eb756 100644
--- a/osu.Game.Rulesets.Mania/Utils/SnapFinder.cs
+++ b/osu.Game.Rulesets.Mania/Utils/SnapFinder.cs
@@ -11,7 +11,8 @@ namespace osu.Game.Rulesets.Mania.Utils
 {
     public class SnapFinder
     {
-        private ManiaBeatmap beatmap;
+        private readonly ManiaBeatmap beatmap;
+
         public SnapFinder(ManiaBeatmap beatmap)
         {
             this.beatmap = beatmap;
@@ -20,42 +21,41 @@ namespace osu.Game.Rulesets.Mania.Utils
         public int FindSnap(HitObject hitObject)
         {
             TimingControlPoint currentTimingPoint = beatmap.ControlPointInfo.TimingPointAt(hitObject.StartTime);
-            int timeSignature = (int)currentTimingPoint.TimeSignature;
             double startTime = currentTimingPoint.Time;
             double secondsPerFourCounts = currentTimingPoint.BeatLength * 4;
 
             double offset = startTime % secondsPerFourCounts;
             double snapResult = hitObject.StartTime % secondsPerFourCounts - offset;
 
-            if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 4.0))
+            if (almostDivisibleBy(snapResult, secondsPerFourCounts / 4.0))
             {
                 return 1;
             }
-            else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 8.0))
+            else if (almostDivisibleBy(snapResult, secondsPerFourCounts / 8.0))
             {
                 return 2;
             }
-            else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 12.0))
+            else if (almostDivisibleBy(snapResult, secondsPerFourCounts / 12.0))
             {
                 return 3;
             }
-            else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 16.0))
+            else if (almostDivisibleBy(snapResult, secondsPerFourCounts / 16.0))
             {
                 return 4;
             }
-            else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 24.0))
+            else if (almostDivisibleBy(snapResult, secondsPerFourCounts / 24.0))
             {
                 return 6;
             }
-            else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 32.0))
+            else if (almostDivisibleBy(snapResult, secondsPerFourCounts / 32.0))
             {
                 return 8;
             }
-            else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 48.0))
+            else if (almostDivisibleBy(snapResult, secondsPerFourCounts / 48.0))
             {
                 return 12;
             }
-            else if (AlmostDivisibleBy(snapResult, secondsPerFourCounts / 64.0))
+            else if (almostDivisibleBy(snapResult, secondsPerFourCounts / 64.0))
             {
                 return 16;
             }
@@ -65,11 +65,12 @@ namespace osu.Game.Rulesets.Mania.Utils
             }
         }
 
-        private const double LENIENCY_MS = 1.0;
-        private static bool AlmostDivisibleBy(double dividend, double divisor)
+        private const double leniency_ms = 1.0;
+
+        private static bool almostDivisibleBy(double dividend, double divisor)
         {
             double remainder = Math.Abs(dividend) % divisor;
-            return Precision.AlmostEquals(remainder, 0, LENIENCY_MS) || Precision.AlmostEquals(remainder - divisor, 0, LENIENCY_MS);
+            return Precision.AlmostEquals(remainder, 0, leniency_ms) || Precision.AlmostEquals(remainder - divisor, 0, leniency_ms);
         }
     }
 }

From 46c44c576d2c27218da69f4493d61ebffd8ab895 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sun, 18 Apr 2021 19:16:20 -0700
Subject: [PATCH 2802/3722] Fix beatmap info download button content not
 scaling on mouse down

---
 .../Buttons/HeaderDownloadButton.cs           | 66 ++++++++-----------
 1 file changed, 29 insertions(+), 37 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs b/osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs
index cffff86a64..6d27342049 100644
--- a/osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs
+++ b/osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs
@@ -47,52 +47,44 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
         {
             FillFlowContainer textSprites;
 
-            AddRangeInternal(new Drawable[]
+            AddInternal(shakeContainer = new ShakeContainer
             {
-                shakeContainer = new ShakeContainer
+                RelativeSizeAxes = Axes.Both,
+                Masking = true,
+                CornerRadius = 5,
+                Child = button = new HeaderButton { RelativeSizeAxes = Axes.Both },
+            });
+
+            button.AddRange(new Drawable[]
+            {
+                new Container
                 {
-                    Depth = -1,
+                    Padding = new MarginPadding { Horizontal = 10 },
                     RelativeSizeAxes = Axes.Both,
-                    Masking = true,
-                    CornerRadius = 5,
                     Children = new Drawable[]
                     {
-                        button = new HeaderButton { RelativeSizeAxes = Axes.Both },
-                        new Container
+                        textSprites = new FillFlowContainer
                         {
-                            // cannot nest inside here due to the structure of button (putting things in its own content).
-                            // requires framework fix.
-                            Padding = new MarginPadding { Horizontal = 10 },
-                            RelativeSizeAxes = Axes.Both,
-                            Children = new Drawable[]
-                            {
-                                textSprites = new FillFlowContainer
-                                {
-                                    Depth = -1,
-                                    Anchor = Anchor.CentreLeft,
-                                    Origin = Anchor.CentreLeft,
-                                    AutoSizeAxes = Axes.Both,
-                                    AutoSizeDuration = 500,
-                                    AutoSizeEasing = Easing.OutQuint,
-                                    Direction = FillDirection.Vertical,
-                                },
-                                new SpriteIcon
-                                {
-                                    Depth = -1,
-                                    Anchor = Anchor.CentreRight,
-                                    Origin = Anchor.CentreRight,
-                                    Icon = FontAwesome.Solid.Download,
-                                    Size = new Vector2(18),
-                                },
-                            }
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                            AutoSizeAxes = Axes.Both,
+                            AutoSizeDuration = 500,
+                            AutoSizeEasing = Easing.OutQuint,
+                            Direction = FillDirection.Vertical,
                         },
-                        new DownloadProgressBar(BeatmapSet.Value)
+                        new SpriteIcon
                         {
-                            Depth = -2,
-                            Anchor = Anchor.BottomLeft,
-                            Origin = Anchor.BottomLeft,
+                            Anchor = Anchor.CentreRight,
+                            Origin = Anchor.CentreRight,
+                            Icon = FontAwesome.Solid.Download,
+                            Size = new Vector2(18),
                         },
-                    },
+                    }
+                },
+                new DownloadProgressBar(BeatmapSet.Value)
+                {
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomLeft,
                 },
             });
 

From c9967f7b7486d5744aba911a144110811b76ef04 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sat, 24 Apr 2021 08:37:37 -0700
Subject: [PATCH 2803/3722] Fix button being recreated on importing state

---
 osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs
index a61640a02e..85ed3f8767 100644
--- a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs
+++ b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs
@@ -268,11 +268,13 @@ namespace osu.Game.Overlays.BeatmapSet
                     break;
 
                 case DownloadState.Downloading:
-                case DownloadState.Importing:
                     // temporary to avoid showing two buttons for maps with novideo. will be fixed in new beatmap overlay design.
                     downloadButtonsContainer.Child = new HeaderDownloadButton(BeatmapSet.Value);
                     break;
 
+                case DownloadState.Importing:
+                    break;
+
                 default:
                     downloadButtonsContainer.Child = new HeaderDownloadButton(BeatmapSet.Value);
                     if (BeatmapSet.Value.OnlineInfo.HasVideo)

From eaac4fe6c7b76bfef30d37bd7f15b6eb8d0cdccc Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Sun, 25 Apr 2021 06:38:15 +0800
Subject: [PATCH 2804/3722] Simplify FindSnap method

---
 osu.Game.Rulesets.Mania/Utils/SnapFinder.cs | 49 ++++-----------------
 1 file changed, 9 insertions(+), 40 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Utils/SnapFinder.cs b/osu.Game.Rulesets.Mania/Utils/SnapFinder.cs
index 83df0eb756..ed3bd4af05 100644
--- a/osu.Game.Rulesets.Mania/Utils/SnapFinder.cs
+++ b/osu.Game.Rulesets.Mania/Utils/SnapFinder.cs
@@ -18,51 +18,20 @@ namespace osu.Game.Rulesets.Mania.Utils
             this.beatmap = beatmap;
         }
 
+        private readonly static int[] snaps = { 1, 2, 3, 4, 6, 8, 12, 16 };
+
         public int FindSnap(HitObject hitObject)
         {
             TimingControlPoint currentTimingPoint = beatmap.ControlPointInfo.TimingPointAt(hitObject.StartTime);
-            double startTime = currentTimingPoint.Time;
-            double secondsPerFourCounts = currentTimingPoint.BeatLength * 4;
+            double snapResult = (hitObject.StartTime - currentTimingPoint.Time) % (currentTimingPoint.BeatLength * 4);
 
-            double offset = startTime % secondsPerFourCounts;
-            double snapResult = hitObject.StartTime % secondsPerFourCounts - offset;
+            foreach (var snap in snaps)
+            {
+                if (almostDivisibleBy(snapResult, currentTimingPoint.BeatLength / (double)snap))
+                    return snap;
+            }
 
-            if (almostDivisibleBy(snapResult, secondsPerFourCounts / 4.0))
-            {
-                return 1;
-            }
-            else if (almostDivisibleBy(snapResult, secondsPerFourCounts / 8.0))
-            {
-                return 2;
-            }
-            else if (almostDivisibleBy(snapResult, secondsPerFourCounts / 12.0))
-            {
-                return 3;
-            }
-            else if (almostDivisibleBy(snapResult, secondsPerFourCounts / 16.0))
-            {
-                return 4;
-            }
-            else if (almostDivisibleBy(snapResult, secondsPerFourCounts / 24.0))
-            {
-                return 6;
-            }
-            else if (almostDivisibleBy(snapResult, secondsPerFourCounts / 32.0))
-            {
-                return 8;
-            }
-            else if (almostDivisibleBy(snapResult, secondsPerFourCounts / 48.0))
-            {
-                return 12;
-            }
-            else if (almostDivisibleBy(snapResult, secondsPerFourCounts / 64.0))
-            {
-                return 16;
-            }
-            else
-            {
-                return 0;
-            }
+            return 0;
         }
 
         private const double leniency_ms = 1.0;

From e0ca44c908754b2766ac5dccce2d4d93ae2dacb0 Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Sun, 25 Apr 2021 07:34:17 +0800
Subject: [PATCH 2805/3722] Move SnapFinder from mania ruleset to osu.Game

---
 .../Objects/Drawables/DrawableNote.cs                    | 2 +-
 osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs       | 2 --
 .../Utils => osu.Game/Rulesets/Objects}/SnapFinder.cs    | 9 ++++-----
 3 files changed, 5 insertions(+), 8 deletions(-)
 rename {osu.Game.Rulesets.Mania/Utils => osu.Game/Rulesets/Objects}/SnapFinder.cs (85%)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 04c4b06c88..2a363606ab 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -8,7 +8,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Input.Bindings;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.Skinning.Default;
-using osu.Game.Rulesets.Mania.Utils;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit;
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 17535c9bc9..c1b61aaf31 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -20,7 +20,6 @@ using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.Replays;
-using osu.Game.Rulesets.Mania.Utils;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -84,7 +83,6 @@ namespace osu.Game.Rulesets.Mania.UI
             : base(ruleset, beatmap, mods)
         {
             BarLines = new BarLineGenerator<BarLine>(Beatmap).BarLines;
-
             snapFinder = new SnapFinder(Beatmap);
         }
 
diff --git a/osu.Game.Rulesets.Mania/Utils/SnapFinder.cs b/osu.Game/Rulesets/Objects/SnapFinder.cs
similarity index 85%
rename from osu.Game.Rulesets.Mania/Utils/SnapFinder.cs
rename to osu.Game/Rulesets/Objects/SnapFinder.cs
index ed3bd4af05..eb8f4110a2 100644
--- a/osu.Game.Rulesets.Mania/Utils/SnapFinder.cs
+++ b/osu.Game/Rulesets/Objects/SnapFinder.cs
@@ -3,17 +3,16 @@
 
 using System;
 using osu.Framework.Utils;
+using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Rulesets.Mania.Beatmaps;
-using osu.Game.Rulesets.Objects;
 
-namespace osu.Game.Rulesets.Mania.Utils
+namespace osu.Game.Rulesets.Objects
 {
     public class SnapFinder
     {
-        private readonly ManiaBeatmap beatmap;
+        private readonly IBeatmap beatmap;
 
-        public SnapFinder(ManiaBeatmap beatmap)
+        public SnapFinder(IBeatmap beatmap)
         {
             this.beatmap = beatmap;
         }

From d3db19c3ce9e0b8992be15684d9ffe3214965246 Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Sun, 25 Apr 2021 07:44:26 +0800
Subject: [PATCH 2806/3722] Simplify DrawableNote

---
 .../Objects/Drawables/DrawableNote.cs         | 30 +++++++------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 2a363606ab..c364b395e1 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -5,6 +5,7 @@ using System.Diagnostics;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
 using osu.Framework.Input.Bindings;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.Skinning.Default;
@@ -34,13 +35,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         private readonly Drawable headPiece;
 
-        public readonly Bindable<int> SnapBindable = new Bindable<int>();
-
-        public int Snap
-        {
-            get => SnapBindable.Value;
-            set => SnapBindable.Value = value;
-        }
+        private readonly Bindable<int> Snap = new Bindable<int>();
 
         public DrawableNote(Note hitObject)
             : base(hitObject)
@@ -61,10 +56,10 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
             if (snapFinder != null)
             {
-                HitObject.StartTimeBindable.BindValueChanged(_ => Snap = snapFinder.FindSnap(HitObject), true);
+                HitObject.StartTimeBindable.BindValueChanged(_ => Snap.Value = snapFinder.FindSnap(HitObject), true);
 
-                SnapBindable.BindValueChanged(snap => updateSnapColour(configColourCodedNotes.Value, snap.NewValue), true);
-                configColourCodedNotes.BindValueChanged(colourCode => updateSnapColour(colourCode.NewValue, Snap));
+                Snap.BindValueChanged(_ => updateSnapColour(), true);
+                configColourCodedNotes.BindValueChanged(_ => updateSnapColour());
             }
         }
 
@@ -106,18 +101,13 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         public virtual void OnReleased(ManiaAction action)
         {
-        }
+        } 
 
-        private void updateSnapColour(bool colourCode, int snap)
+        private void updateSnapColour()
         {
-            if (colourCode)
-            {
-                Colour = BindableBeatDivisor.GetColourFor(Snap, colours);
-            }
-            else
-            {
-                Colour = Colour4.White;
-            }
+            Colour = configColourCodedNotes.Value
+                ? (ColourInfo)BindableBeatDivisor.GetColourFor(Snap.Value, colours)
+                : (ColourInfo)Colour4.White;
         }
     }
 }
\ No newline at end of file

From 8b9d2a6cff41601d51f4a184ee08a5869479ffb7 Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Sun, 25 Apr 2021 08:32:21 +0800
Subject: [PATCH 2807/3722] Remove caching for ConfigColourCodedNotes

---
 .../Editor/ManiaPlacementBlueprintTestScene.cs      | 12 ------------
 .../Editor/ManiaSelectionBlueprintTestScene.cs      | 12 ------------
 .../ManiaInputTestScene.cs                          | 13 -------------
 .../Skinning/ManiaSkinnableTestScene.cs             | 11 -----------
 osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs     | 11 -----------
 .../Objects/Drawables/DrawableNote.cs               |  9 +++++++--
 osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs  |  5 -----
 7 files changed, 7 insertions(+), 66 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
index c04b875245..ece523e84c 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaPlacementBlueprintTestScene.cs
@@ -4,12 +4,10 @@
 using System;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Timing;
 using osu.Game.Rulesets.Edit;
-using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
@@ -30,9 +28,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         [Cached(typeof(IScrollingInfo))]
         private IScrollingInfo scrollingInfo;
 
-        [Cached]
-        protected readonly Bindable<bool> ConfigColourCodedNotes = new Bindable<bool>();
-
         protected ManiaPlacementBlueprintTestScene()
         {
             scrollingInfo = ((ScrollingTestContainer)HitObjectContainer).ScrollingInfo;
@@ -46,13 +41,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
             });
         }
 
-        [BackgroundDependencyLoader]
-        private void load(RulesetConfigCache configCache)
-        {
-            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
-            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, ConfigColourCodedNotes);
-        }
-
         protected override SnapResult SnapForBlueprint(PlacementBlueprint blueprint)
         {
             var time = column.TimeAtScreenSpacePosition(InputManager.CurrentState.Mouse.Position);
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
index 1c11dc397e..176fbba921 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/ManiaSelectionBlueprintTestScene.cs
@@ -2,10 +2,8 @@
 // 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.Timing;
-using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Tests.Visual;
 using osuTK.Graphics;
@@ -17,9 +15,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         [Cached(Type = typeof(IAdjustableClock))]
         private readonly IAdjustableClock clock = new StopwatchClock();
 
-        [Cached]
-        protected readonly Bindable<bool> ConfigColourCodedNotes = new Bindable<bool>();
-
         protected ManiaSelectionBlueprintTestScene()
         {
             Add(new Column(0)
@@ -31,13 +26,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
             });
         }
 
-        [BackgroundDependencyLoader]
-        private void load(RulesetConfigCache configCache)
-        {
-            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
-            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, ConfigColourCodedNotes);
-        }
-
         public ManiaPlayfield Playfield => null;
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs b/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs
index 2b2db8aa96..9049bb3a82 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaInputTestScene.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.
 
-using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Bindings;
-using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Mania.Tests
@@ -16,21 +13,11 @@ namespace osu.Game.Rulesets.Mania.Tests
         private readonly Container<Drawable> content;
         protected override Container<Drawable> Content => content ?? base.Content;
 
-        [Cached]
-        protected readonly Bindable<bool> ConfigColourCodedNotes = new Bindable<bool>();
-
         protected ManiaInputTestScene(int keys)
         {
             base.Content.Add(content = new LocalInputManager(keys));
         }
 
-        [BackgroundDependencyLoader]
-        private void load(RulesetConfigCache configCache)
-        {
-            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
-            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, ConfigColourCodedNotes);
-        }
-
         private class LocalInputManager : ManiaInputManager
         {
             public LocalInputManager(int variant)
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
index 941d01a1d6..1d84a2dfcb 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/ManiaSkinnableTestScene.cs
@@ -7,7 +7,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Rulesets.UI.Scrolling.Algorithms;
 using osu.Game.Tests.Visual;
@@ -25,9 +24,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
         [Cached(Type = typeof(IScrollingInfo))]
         private readonly TestScrollingInfo scrollingInfo = new TestScrollingInfo();
 
-        [Cached]
-        protected readonly Bindable<bool> ConfigColourCodedNotes = new Bindable<bool>();
-
         protected override Ruleset CreateRulesetForSkinProvider() => new ManiaRuleset();
 
         protected ManiaSkinnableTestScene()
@@ -42,13 +38,6 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
             });
         }
 
-        [BackgroundDependencyLoader]
-        private void load(RulesetConfigCache configCache)
-        {
-            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
-            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, ConfigColourCodedNotes);
-        }
-
         [Test]
         public void TestScrollingDown()
         {
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
index 1d053688a2..706268e478 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneNotes.cs
@@ -15,7 +15,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -30,16 +29,6 @@ namespace osu.Game.Rulesets.Mania.Tests
     [TestFixture]
     public class TestSceneNotes : OsuTestScene
     {
-        [Cached]
-        protected readonly Bindable<bool> ConfigColourCodedNotes = new Bindable<bool>();
-
-        [BackgroundDependencyLoader]
-        private void load(RulesetConfigCache configCache)
-        {
-            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
-            config.BindWith(ManiaRulesetSetting.ColourCodedNotes, ConfigColourCodedNotes);
-        }
-
         [Test]
         public void TestVariousNotes()
         {
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index c364b395e1..09dd0da5ac 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Input.Bindings;
 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.Scoring;
@@ -25,8 +26,10 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         [Resolved]
         private OsuColour colours { get; set; }
 
-        [Resolved]
-        private Bindable<bool> configColourCodedNotes { get; set; }
+        [Resolved(canBeNull: true)]
+        private ManiaRulesetConfigManager config { get; set; }
+
+        private readonly Bindable<bool> configColourCodedNotes = new Bindable<bool>();
 
         [Resolved(canBeNull: true)]
         private SnapFinder snapFinder { get; set; }
@@ -56,6 +59,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
             if (snapFinder != null)
             {
+                config?.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
+
                 HitObject.StartTimeBindable.BindValueChanged(_ => Snap.Value = snapFinder.FindSnap(HitObject), true);
 
                 Snap.BindValueChanged(_ => updateSnapColour(), true);
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index c1b61aaf31..174727cc2d 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -54,9 +54,6 @@ namespace osu.Game.Rulesets.Mania.UI
 
         protected new ManiaRulesetConfigManager Config => (ManiaRulesetConfigManager)base.Config;
 
-        [Cached]
-        protected readonly Bindable<bool> ConfigColourCodedNotes = new Bindable<bool>();
-
         public ScrollVisualisationMethod ScrollMethod
         {
             get => scrollMethod;
@@ -111,8 +108,6 @@ namespace osu.Game.Rulesets.Mania.UI
             configDirection.BindValueChanged(direction => Direction.Value = (ScrollingDirection)direction.NewValue, true);
 
             Config.BindWith(ManiaRulesetSetting.ScrollTime, configTimeRange);
-
-            Config.BindWith(ManiaRulesetSetting.ColourCodedNotes, ConfigColourCodedNotes);
         }
 
         protected override void AdjustScrollSpeed(int amount)

From 1f48378ce72b4036601eb09d0a6090ba51434d38 Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Sun, 25 Apr 2021 08:53:45 +0800
Subject: [PATCH 2808/3722] Add xmldoc to SnapFinder

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

diff --git a/osu.Game/Rulesets/Objects/SnapFinder.cs b/osu.Game/Rulesets/Objects/SnapFinder.cs
index eb8f4110a2..f915d41305 100644
--- a/osu.Game/Rulesets/Objects/SnapFinder.cs
+++ b/osu.Game/Rulesets/Objects/SnapFinder.cs
@@ -8,10 +8,17 @@ using osu.Game.Beatmaps.ControlPoints;
 
 namespace osu.Game.Rulesets.Objects
 {
+    /// <summary>
+    /// Used to find the lowest beat divisor that a <see cref="HitObject"/> aligns to in an <see cref="IBeatmap"/>
+    /// </summary>
     public class SnapFinder
     {
         private readonly IBeatmap beatmap;
 
+        /// <summary>
+        /// Creates a new SnapFinder instance.
+        /// </summary>
+        /// <param name="beatmap">The beatmap to align to when evaulating.</param>
         public SnapFinder(IBeatmap beatmap)
         {
             this.beatmap = beatmap;
@@ -19,6 +26,10 @@ namespace osu.Game.Rulesets.Objects
 
         private readonly static int[] snaps = { 1, 2, 3, 4, 6, 8, 12, 16 };
 
+        /// <summary>
+        /// Finds the lowest beat divisor that the given HitObject aligns to.
+        /// </summary>
+        /// <param name="hitObject">The <see cref="HitObject"/> to evaluate.</param>
         public int FindSnap(HitObject hitObject)
         {
             TimingControlPoint currentTimingPoint = beatmap.ControlPointInfo.TimingPointAt(hitObject.StartTime);

From 211bff6a8f09d8379b1574dfb80d97b76e318ae3 Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Sun, 25 Apr 2021 09:21:25 +0800
Subject: [PATCH 2809/3722] Fix cake errors

---
 .../Objects/Drawables/DrawableNote.cs                  | 10 +++++-----
 osu.Game/Rulesets/Objects/SnapFinder.cs                |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 09dd0da5ac..9f30221fde 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         private readonly Drawable headPiece;
 
-        private readonly Bindable<int> Snap = new Bindable<int>();
+        private readonly Bindable<int> snap = new Bindable<int>();
 
         public DrawableNote(Note hitObject)
             : base(hitObject)
@@ -61,9 +61,9 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             {
                 config?.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
 
-                HitObject.StartTimeBindable.BindValueChanged(_ => Snap.Value = snapFinder.FindSnap(HitObject), true);
+                HitObject.StartTimeBindable.BindValueChanged(_ => snap.Value = snapFinder.FindSnap(HitObject), true);
 
-                Snap.BindValueChanged(_ => updateSnapColour(), true);
+                snap.BindValueChanged(_ => updateSnapColour(), true);
                 configColourCodedNotes.BindValueChanged(_ => updateSnapColour());
             }
         }
@@ -106,12 +106,12 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         public virtual void OnReleased(ManiaAction action)
         {
-        } 
+        }
 
         private void updateSnapColour()
         {
             Colour = configColourCodedNotes.Value
-                ? (ColourInfo)BindableBeatDivisor.GetColourFor(Snap.Value, colours)
+                ? (ColourInfo)BindableBeatDivisor.GetColourFor(snap.Value, colours)
                 : (ColourInfo)Colour4.White;
         }
     }
diff --git a/osu.Game/Rulesets/Objects/SnapFinder.cs b/osu.Game/Rulesets/Objects/SnapFinder.cs
index f915d41305..3bc1d5cfb7 100644
--- a/osu.Game/Rulesets/Objects/SnapFinder.cs
+++ b/osu.Game/Rulesets/Objects/SnapFinder.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Objects
             this.beatmap = beatmap;
         }
 
-        private readonly static int[] snaps = { 1, 2, 3, 4, 6, 8, 12, 16 };
+        private static readonly int[] snaps = { 1, 2, 3, 4, 6, 8, 12, 16 };
 
         /// <summary>
         /// Finds the lowest beat divisor that the given HitObject aligns to.
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Objects
 
             foreach (var snap in snaps)
             {
-                if (almostDivisibleBy(snapResult, currentTimingPoint.BeatLength / (double)snap))
+                if (almostDivisibleBy(snapResult, currentTimingPoint.BeatLength / snap))
                     return snap;
             }
 

From 6fd77e536df6bfcab9a3c2ab8d8c19fdc822fb8b Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Sun, 25 Apr 2021 05:34:54 +0200
Subject: [PATCH 2810/3722] Add unsnap check

---
 osu.Game/Rulesets/Edit/BeatmapVerifier.cs     |   5 +-
 osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs | 119 ++++++++++++++++++
 2 files changed, 123 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs

diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index f33feac971..aa3459a01a 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -22,7 +22,10 @@ namespace osu.Game.Rulesets.Edit
 
             // Audio
             new CheckAudioPresence(),
-            new CheckAudioQuality()
+            new CheckAudioQuality(),
+
+            // Compose
+            new CheckUnsnaps()
         };
 
         public IEnumerable<Issue> Run(IBeatmap playableBeatmap, WorkingBeatmap workingBeatmap)
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs b/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs
new file mode 100644
index 0000000000..835c4bdb69
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs
@@ -0,0 +1,119 @@
+// Copyright (c) ppy 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.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Edit.Checks.Components;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+
+namespace osu.Game.Rulesets.Edit.Checks
+{
+    public class CheckUnsnaps : ICheck
+    {
+        private const double unsnap_ms_threshold = 2;
+
+        private static readonly int[] greatest_common_divisors = { 16, 12, 9, 7, 5 };
+
+        public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Compose, "Unsnapped hitobjects");
+
+        public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
+        {
+            new IssueTemplate2MsOrMore(this),
+            new IssueTemplate1MsOrMore(this)
+        };
+
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap)
+        {
+            foreach (var hitobject in playableBeatmap.HitObjects)
+            {
+                double startUnsnap = hitobject.StartTime - closestSnapTime(playableBeatmap, hitobject.StartTime);
+                string startPostfix = hitobject is IHasDuration ? "start" : "";
+                foreach (var issue in getUnsnapIssues(hitobject, startUnsnap, hitobject.StartTime, startPostfix))
+                    yield return issue;
+
+                if (hitobject is IHasRepeats hasRepeats)
+                {
+                    for (int repeatIndex = 0; repeatIndex < hasRepeats.RepeatCount; ++repeatIndex)
+                    {
+                        double spanDuration = hasRepeats.Duration / (hasRepeats.RepeatCount + 1);
+                        double repeatTime = hitobject.StartTime + spanDuration * (repeatIndex + 1);
+                        double repeatUnsnap = repeatTime - closestSnapTime(playableBeatmap, repeatTime);
+                        foreach (var issue in getUnsnapIssues(hitobject, repeatUnsnap, repeatTime, "repeat"))
+                            yield return issue;
+                    }
+                }
+
+                if (hitobject is IHasDuration hasDuration)
+                {
+                    double endUnsnap = hasDuration.EndTime - closestSnapTime(playableBeatmap, hasDuration.EndTime);
+                    foreach (var issue in getUnsnapIssues(hitobject, endUnsnap, hasDuration.EndTime, "end"))
+                        yield return issue;
+                }
+            }
+        }
+
+        private IEnumerable<Issue> getUnsnapIssues(HitObject hitobject, double unsnap, double time, string postfix = "")
+        {
+            if (Math.Abs(unsnap) >= unsnap_ms_threshold)
+                yield return new IssueTemplate2MsOrMore(this).Create(hitobject, unsnap, time, postfix);
+            else if (Math.Abs(unsnap) >= 1)
+                yield return new IssueTemplate1MsOrMore(this).Create(hitobject, unsnap, time, postfix);
+
+            // We don't care about unsnaps < 1 ms, as all object ends have these due to the way SV works.
+        }
+
+        private int closestSnapTime(IBeatmap playableBeatmap, double time)
+        {
+            var timingPoint = playableBeatmap.ControlPointInfo.TimingPointAt(time);
+            double smallestUnsnap = greatest_common_divisors.Select(divisor => Math.Abs(time - snapTime(timingPoint, time, divisor))).Min();
+
+            return (int)Math.Round(time + smallestUnsnap);
+        }
+
+        private int snapTime(TimingControlPoint timingPoint, double time, int beatDivisor)
+        {
+            double beatLength = timingPoint.BeatLength / beatDivisor;
+            int beatLengths = (int)Math.Round((time - timingPoint.Time) / beatLength, MidpointRounding.AwayFromZero);
+
+            // Casting to int matches the editor in both stable and lazer.
+            return (int)(timingPoint.Time + beatLengths * beatLength);
+        }
+
+        public abstract class IssueTemplateUnsnap : IssueTemplate
+        {
+            protected IssueTemplateUnsnap(ICheck check, IssueType type)
+                : base(check, type, "{0:0.##} is unsnapped by {1:0.##} ms.")
+            {
+            }
+
+            public Issue Create(HitObject hitobject, double unsnap, double time, string postfix = "")
+            {
+                string objectName = hitobject.GetType().Name;
+                if (!string.IsNullOrEmpty(postfix))
+                    objectName += " " + postfix;
+
+                return new Issue(hitobject, this, objectName, unsnap) { Time = time };
+            }
+        }
+
+        public class IssueTemplate2MsOrMore : IssueTemplateUnsnap
+        {
+            public IssueTemplate2MsOrMore(ICheck check)
+                : base(check, IssueType.Problem)
+            {
+            }
+        }
+
+        public class IssueTemplate1MsOrMore : IssueTemplateUnsnap
+        {
+            public IssueTemplate1MsOrMore(ICheck check)
+                : base(check, IssueType.Negligible)
+            {
+            }
+        }
+    }
+}

From fa8e8ed36f3b410fc91eb07a49bcb4413e52fbce Mon Sep 17 00:00:00 2001
From: plan-do-break-fix <jeffdswan@outlook.com>
Date: Sat, 24 Apr 2021 22:57:18 -0500
Subject: [PATCH 2811/3722] fix(docs): corrects typo in project README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c539f9f4d8..eb790ca18f 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ The future of [osu!](https://osu.ppy.sh) and the beginning of an open era! Commo
 
 This project is under heavy development, but is in a stable state. Users are encouraged to try it out and keep it installed alongside the stable *osu!* client. It will continue to evolve to the point of eventually replacing the existing stable client as an update.
 
-**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, preceeded by experimentation and changes which may potentially **reduce playability or usability**. This is done in order to allow us to move forward as developers and designers more efficiently. If this offends you, please consider sticking to the stable releases of osu! (found on the website). We are not yet open to heated discussion over game mechanics and will not be using github as a forum for such discussions just yet.
+**IMPORTANT:** Gameplay mechanics (and other features which you may have come to know and love) are in a constant state of flux. Game balance and final quality-of-life passes come at the end of development, preceded by experimentation and changes which may potentially **reduce playability or usability**. This is done in order to allow us to move forward as developers and designers more efficiently. If this offends you, please consider sticking to the stable releases of osu! (found on the website). We are not yet open to heated discussion over game mechanics and will not be using github as a forum for such discussions just yet.
 
 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:
 

From 62bcc5f76d891f45addc79500350be050f3b7fe9 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 25 Apr 2021 07:49:31 +0300
Subject: [PATCH 2812/3722] Add property for tracking whether control is during
 operation

---
 .../Compose/Components/SelectionBoxControl.cs   | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
index 3432334deb..081848f372 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
@@ -25,6 +25,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private Circle circle;
 
+        /// <summary>
+        /// Whether an operation has began from this control.
+        /// </summary>
+        public bool InOperation { get; private set; }
+
         [Resolved]
         protected OsuColour Colours { get; private set; }
 
@@ -89,8 +94,16 @@ namespace osu.Game.Screens.Edit.Compose.Components
             this.ScaleTo(HandlingMouse || IsHovered ? 1.5f : 1, 100, Easing.OutQuint);
         }
 
-        protected void OnOperationStarted() => OperationStarted?.Invoke();
+        protected void OnOperationStarted()
+        {
+            InOperation = true;
+            OperationStarted?.Invoke();
+        }
 
-        protected void OnOperationEnded() => OperationEnded?.Invoke();
+        protected void OnOperationEnded()
+        {
+            InOperation = false;
+            OperationEnded?.Invoke();
+        }
     }
 }

From ab7178267459a27b5a3a9896013cd09fe250dac9 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 25 Apr 2021 07:43:56 +0300
Subject: [PATCH 2813/3722] Use colour fade transform for selection box
 controls

To become harminous with the fade transforms of the rotation control
---
 .../Edit/Compose/Components/SelectionBoxButton.cs      |  2 +-
 .../Edit/Compose/Components/SelectionBoxControl.cs     | 10 ++++++++--
 .../Compose/Components/SelectionBoxRotationHandle.cs   |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxButton.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxButton.cs
index 917e5189b2..fbbebe3288 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxButton.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxButton.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         protected override void UpdateHoverState()
         {
             base.UpdateHoverState();
-            icon.Colour = !HandlingMouse && IsHovered ? Color4.White : Color4.Black;
+            icon.FadeColour(!HandlingMouse && IsHovered ? Color4.White : Color4.Black, TRANSFORM_DURATION, Easing.OutQuint);
         }
 
         public string TooltipText { get; }
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
index 081848f372..374af20742 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
@@ -17,6 +17,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
     /// </summary>
     public abstract class SelectionBoxControl : CompositeDrawable
     {
+        public const double TRANSFORM_DURATION = 100;
+
         public event Action OperationStarted;
         public event Action OperationEnded;
 
@@ -90,8 +92,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected virtual void UpdateHoverState()
         {
-            circle.Colour = HandlingMouse ? Colours.GrayF : (IsHovered ? Colours.Red : Colours.YellowDark);
-            this.ScaleTo(HandlingMouse || IsHovered ? 1.5f : 1, 100, Easing.OutQuint);
+            if (HandlingMouse)
+                circle.FadeColour(Colours.GrayF, TRANSFORM_DURATION, Easing.OutQuint);
+            else
+                circle.FadeColour(IsHovered ? Colours.Red : Colours.YellowDark, TRANSFORM_DURATION, Easing.OutQuint);
+
+            this.ScaleTo(HandlingMouse || IsHovered ? 1.5f : 1, TRANSFORM_DURATION, Easing.OutQuint);
         }
 
         protected void OnOperationStarted()
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
index c4a4fafdc2..6303caf9ed 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
@@ -35,8 +35,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected override void UpdateHoverState()
         {
-            icon.Colour = !HandlingMouse && IsHovered ? Color4.White : Color4.Black;
             base.UpdateHoverState();
+            icon.FadeColour(!HandlingMouse && IsHovered ? Color4.White : Color4.Black, TRANSFORM_DURATION, Easing.OutQuint);
         }
     }
 }

From 77f7d4c9632e281d8665a81c55252f12b181e163 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 24 Apr 2021 08:06:00 +0300
Subject: [PATCH 2814/3722] Add composite managing display of selection box
 drag handles

---
 .../SelectionBoxDragHandleDisplay.cs          | 103 ++++++++++++++++++
 1 file changed, 103 insertions(+)
 create mode 100644 osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleDisplay.cs

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleDisplay.cs
new file mode 100644
index 0000000000..1cba8ca6b3
--- /dev/null
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleDisplay.cs
@@ -0,0 +1,103 @@
+// Copyright (c) ppy 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 JetBrains.Annotations;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+
+namespace osu.Game.Screens.Edit.Compose.Components
+{
+    /// <summary>
+    /// Represents a display composite containing and managing the visibility state of the selection box's drag handles.
+    /// </summary>
+    public class SelectionBoxDragHandleDisplay : CompositeDrawable
+    {
+        private Container<SelectionBoxScaleHandle> scaleHandles;
+        private Container<SelectionBoxRotationHandle> rotationHandles;
+
+        private readonly List<SelectionBoxDragHandle> allDragHandles = new List<SelectionBoxDragHandle>();
+
+        public new MarginPadding Padding
+        {
+            get => base.Padding;
+            set => base.Padding = value;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChildren = new Drawable[]
+            {
+                scaleHandles = new Container<SelectionBoxScaleHandle>
+                {
+                    RelativeSizeAxes = Axes.Both,
+                },
+                rotationHandles = new Container<SelectionBoxRotationHandle>
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Padding = new MarginPadding(-12.5f),
+                },
+            };
+        }
+
+        public void AddScaleHandle(SelectionBoxScaleHandle handle)
+        {
+            bindDragHandle(handle);
+            scaleHandles.Add(handle);
+        }
+
+        public void AddRotationHandle(SelectionBoxRotationHandle handle)
+        {
+            handle.Alpha = 0;
+            handle.AlwaysPresent = true;
+
+            bindDragHandle(handle);
+            rotationHandles.Add(handle);
+        }
+
+        private void bindDragHandle(SelectionBoxDragHandle handle)
+        {
+            handle.HoverGained += updateRotationHandlesVisibility;
+            handle.HoverLost += updateRotationHandlesVisibility;
+            handle.OperationStarted += updateRotationHandlesVisibility;
+            handle.OperationEnded += updateRotationHandlesVisibility;
+            allDragHandles.Add(handle);
+        }
+
+        private SelectionBoxRotationHandle displayedRotationHandle;
+        private SelectionBoxDragHandle activeHandle;
+
+        private void updateRotationHandlesVisibility()
+        {
+            if (activeHandle?.InOperation == true || activeHandle?.IsHovered == true)
+                return;
+
+            displayedRotationHandle?.FadeOut(SelectionBoxControl.TRANSFORM_DURATION, Easing.OutQuint);
+            displayedRotationHandle = null;
+
+            activeHandle = allDragHandles.SingleOrDefault(h => h.InOperation);
+            activeHandle ??= allDragHandles.SingleOrDefault(h => h.IsHovered);
+
+            if (activeHandle != null)
+            {
+                displayedRotationHandle = getCorrespondingRotationHandle(activeHandle, rotationHandles);
+                displayedRotationHandle?.FadeIn(SelectionBoxControl.TRANSFORM_DURATION, Easing.OutQuint);
+            }
+        }
+
+        /// <summary>
+        /// Gets the rotation handle corresponding to the given handle.
+        /// </summary>
+        [CanBeNull]
+        private static SelectionBoxRotationHandle getCorrespondingRotationHandle(SelectionBoxDragHandle handle, IEnumerable<SelectionBoxRotationHandle> rotationHandles)
+        {
+            if (handle is SelectionBoxRotationHandle rotationHandle)
+                return rotationHandle;
+
+            return rotationHandles.SingleOrDefault(r => r.Anchor == handle.Anchor);
+        }
+    }
+}

From a8c460f7df0924830c3ad7c3b657a04eda8ed4c7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 24 Apr 2021 08:18:46 +0300
Subject: [PATCH 2815/3722] Replace separated top-centered rotation button with
 rotation drag handles

---
 .../Edit/Compose/Components/SelectionBox.cs   | 87 ++++++++++---------
 1 file changed, 44 insertions(+), 43 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index 9d6b44e207..d7db98f6a2 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
         }
 
-        private Container dragHandles;
+        private SelectionBoxDragHandleDisplay dragHandles;
         private FillFlowContainer buttons;
 
         public const float BORDER_RADIUS = 3;
@@ -161,7 +161,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                         },
                     }
                 },
-                dragHandles = new Container
+                dragHandles = new SelectionBoxDragHandleDisplay
                 {
                     RelativeSizeAxes = Axes.Both,
                     // ensures that the centres of all drag handles line up with the middle of the selection box border.
@@ -186,75 +186,76 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private void addRotationComponents()
         {
-            const float separation = 40;
-
             addButton(FontAwesome.Solid.Undo, "Rotate 90 degrees counter-clockwise", () => OnRotation?.Invoke(-90));
             addButton(FontAwesome.Solid.Redo, "Rotate 90 degrees clockwise", () => OnRotation?.Invoke(90));
 
-            AddRangeInternal(new Drawable[]
-            {
-                new Box
-                {
-                    Depth = float.MaxValue,
-                    Colour = colours.YellowLight,
-                    Blending = BlendingParameters.Additive,
-                    Alpha = 0.3f,
-                    Size = new Vector2(BORDER_RADIUS, separation),
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.BottomCentre,
-                },
-                new SelectionBoxDragHandleButton(FontAwesome.Solid.Redo, "Free rotate")
-                {
-                    Anchor = Anchor.TopCentre,
-                    Y = -separation,
-                    HandleDrag = e => OnRotation?.Invoke(convertDragEventToAngleOfRotation(e)),
-                    OperationStarted = operationStarted,
-                    OperationEnded = operationEnded
-                }
-            });
+            addRotateHandle(Anchor.TopLeft);
+            addRotateHandle(Anchor.TopRight);
+            addRotateHandle(Anchor.BottomLeft);
+            addRotateHandle(Anchor.BottomRight);
         }
 
         private void addYScaleComponents()
         {
             addButton(FontAwesome.Solid.ArrowsAltV, "Flip vertically (Ctrl-J)", () => OnFlip?.Invoke(Direction.Vertical));
 
-            addDragHandle(Anchor.TopCentre);
-            addDragHandle(Anchor.BottomCentre);
+            addScaleHandle(Anchor.TopCentre);
+            addScaleHandle(Anchor.BottomCentre);
         }
 
         private void addFullScaleComponents()
         {
-            addDragHandle(Anchor.TopLeft);
-            addDragHandle(Anchor.TopRight);
-            addDragHandle(Anchor.BottomLeft);
-            addDragHandle(Anchor.BottomRight);
+            addScaleHandle(Anchor.TopLeft);
+            addScaleHandle(Anchor.TopRight);
+            addScaleHandle(Anchor.BottomLeft);
+            addScaleHandle(Anchor.BottomRight);
         }
 
         private void addXScaleComponents()
         {
             addButton(FontAwesome.Solid.ArrowsAltH, "Flip horizontally (Ctrl-H)", () => OnFlip?.Invoke(Direction.Horizontal));
 
-            addDragHandle(Anchor.CentreLeft);
-            addDragHandle(Anchor.CentreRight);
+            addScaleHandle(Anchor.CentreLeft);
+            addScaleHandle(Anchor.CentreRight);
         }
 
         private void addButton(IconUsage icon, string tooltip, Action action)
         {
-            buttons.Add(new SelectionBoxDragHandleButton(icon, tooltip)
+            var button = new SelectionBoxButton(icon, tooltip)
             {
-                OperationStarted = operationStarted,
-                OperationEnded = operationEnded,
                 Action = action
-            });
+            };
+
+            button.OperationStarted += operationStarted;
+            button.OperationEnded += operationEnded;
+            buttons.Add(button);
         }
 
-        private void addDragHandle(Anchor anchor) => dragHandles.Add(new SelectionBoxDragHandle
+        private void addScaleHandle(Anchor anchor)
         {
-            Anchor = anchor,
-            HandleDrag = e => OnScale?.Invoke(e.Delta, anchor),
-            OperationStarted = operationStarted,
-            OperationEnded = operationEnded
-        });
+            var handle = new SelectionBoxScaleHandle
+            {
+                Anchor = anchor,
+                HandleDrag = e => OnScale?.Invoke(e.Delta, anchor)
+            };
+
+            handle.OperationStarted += operationStarted;
+            handle.OperationEnded += operationEnded;
+            dragHandles.AddScaleHandle(handle);
+        }
+
+        private void addRotateHandle(Anchor anchor)
+        {
+            var handle = new SelectionBoxRotationHandle
+            {
+                Anchor = anchor,
+                HandleDrag = e => OnRotation?.Invoke(convertDragEventToAngleOfRotation(e))
+            };
+
+            handle.OperationStarted += operationStarted;
+            handle.OperationEnded += operationEnded;
+            dragHandles.AddRotationHandle(handle);
+        }
 
         private int activeOperations;
 

From 11318fd9fcbf8ffc4b9830dd4285037237e0f7b8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 24 Apr 2021 09:35:02 +0300
Subject: [PATCH 2816/3722] Add test coverage

---
 .../Editing/TestSceneComposeSelectBox.cs      | 98 ++++++++++++++++++-
 1 file changed, 95 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
index cf5f1b8818..13b563619a 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
@@ -1,21 +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.Linq;
+using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
 using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Editing
 {
-    public class TestSceneComposeSelectBox : OsuTestScene
+    public class TestSceneComposeSelectBox : OsuManualInputManagerTestScene
     {
         private Container selectionArea;
+        private SelectionBox selectionBox;
 
         public TestSceneComposeSelectBox()
         {
-            SelectionBox selectionBox = null;
-
             AddStep("create box", () =>
                 Child = selectionArea = new Container
                 {
@@ -68,5 +71,94 @@ namespace osu.Game.Tests.Visual.Editing
             selectionArea.Rotation += angle;
             return true;
         }
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            InputManager.MoveMouseTo(selectionBox);
+            selectionBox.CanRotate = true;
+            selectionBox.CanScaleX = true;
+            selectionBox.CanScaleY = true;
+        });
+
+        [Test]
+        public void TestRotationHandleShownOnHover()
+        {
+            SelectionBoxRotationHandle rotationHandle = null;
+
+            AddStep("enable rotation", () => selectionBox.CanRotate = true);
+            AddStep("retrieve rotation handle", () => rotationHandle = this.ChildrenOfType<SelectionBoxRotationHandle>().First());
+
+            AddAssert("handle hidden", () => rotationHandle.Alpha == 0);
+            AddStep("hover over handle", () => InputManager.MoveMouseTo(rotationHandle));
+            AddUntilStep("rotation handle shown", () => rotationHandle.Alpha == 1);
+
+            AddStep("move mouse away", () => InputManager.MoveMouseTo(selectionBox));
+            AddUntilStep("handle hidden", () => rotationHandle.Alpha == 0);
+        }
+
+        [Test]
+        public void TestRotationHandleShownOnHoveringClosestScaleHandler()
+        {
+            SelectionBoxRotationHandle rotationHandle = null;
+
+            AddStep("retrieve rotation handle", () => rotationHandle = this.ChildrenOfType<SelectionBoxRotationHandle>().First());
+
+            AddAssert("rotation handle hidden", () => rotationHandle.Alpha == 0);
+            AddStep("hover over closest scale handle", () =>
+            {
+                InputManager.MoveMouseTo(this.ChildrenOfType<SelectionBoxScaleHandle>().Single(s => s.Anchor == rotationHandle.Anchor));
+            });
+            AddUntilStep("rotation handle shown", () => rotationHandle.Alpha == 1);
+
+            AddStep("move mouse away", () => InputManager.MoveMouseTo(selectionBox));
+            AddUntilStep("handle hidden", () => rotationHandle.Alpha == 0);
+        }
+
+        [Test]
+        public void TestHoverRotationHandleFromScaleHandle()
+        {
+            SelectionBoxRotationHandle rotationHandle = null;
+
+            AddStep("retrieve rotation handle", () => rotationHandle = this.ChildrenOfType<SelectionBoxRotationHandle>().First());
+
+            AddAssert("rotation handle hidden", () => rotationHandle.Alpha == 0);
+            AddStep("hover over closest scale handle", () =>
+            {
+                InputManager.MoveMouseTo(this.ChildrenOfType<SelectionBoxScaleHandle>().Single(s => s.Anchor == rotationHandle.Anchor));
+            });
+            AddUntilStep("rotation handle shown", () => rotationHandle.Alpha == 1);
+            AddAssert("rotation handle not hovered", () => !rotationHandle.IsHovered);
+
+            AddStep("hover over rotation handle", () => InputManager.MoveMouseTo(rotationHandle));
+            AddAssert("rotation handle still shown", () => rotationHandle.Alpha == 1);
+            AddAssert("rotation handle hovered", () => rotationHandle.IsHovered);
+
+            AddStep("move mouse away", () => InputManager.MoveMouseTo(selectionBox));
+            AddUntilStep("handle hidden", () => rotationHandle.Alpha == 0);
+        }
+
+        [Test]
+        public void TestDraggingScaleHandleKeepsCorrespondingRotationHandleShown()
+        {
+            SelectionBoxRotationHandle rotationHandle = null;
+
+            AddStep("retrieve rotation handle", () => rotationHandle = this.ChildrenOfType<SelectionBoxRotationHandle>().First());
+
+            AddAssert("rotation handle hidden", () => rotationHandle.Alpha == 0);
+            AddStep("hover over and hold closest scale handle", () =>
+            {
+                InputManager.MoveMouseTo(this.ChildrenOfType<SelectionBoxScaleHandle>().Single(s => s.Anchor == rotationHandle.Anchor));
+                InputManager.PressButton(MouseButton.Left);
+            });
+            AddUntilStep("rotation handle shown", () => rotationHandle.Alpha == 1);
+
+            AddStep("drag to centre", () => InputManager.MoveMouseTo(selectionBox));
+            AddAssert("rotation handle still shown", () => rotationHandle.Alpha > 0);
+
+            AddStep("unhold left", () => InputManager.ReleaseButton(MouseButton.Left));
+            AddStep("move mouse away", () => InputManager.MoveMouseTo(selectionBox, new Vector2(20)));
+            AddUntilStep("handle hidden", () => rotationHandle.Alpha == 0);
+        }
     }
 }

From f9e228d6bfb4e94ded823da5ceb6434c09db6b67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 25 Apr 2021 17:40:23 +0200
Subject: [PATCH 2817/3722] Use null-permitting BDL to reduce number of fields

---
 .../Objects/Drawables/DrawableNote.cs             | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 9f30221fde..52e343ba25 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -26,14 +26,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         [Resolved]
         private OsuColour colours { get; set; }
 
-        [Resolved(canBeNull: true)]
-        private ManiaRulesetConfigManager config { get; set; }
-
         private readonly Bindable<bool> configColourCodedNotes = new Bindable<bool>();
 
-        [Resolved(canBeNull: true)]
-        private SnapFinder snapFinder { get; set; }
-
         protected virtual ManiaSkinComponents Component => ManiaSkinComponents.Note;
 
         private readonly Drawable headPiece;
@@ -53,13 +47,12 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             });
         }
 
-        protected override void LoadComplete()
+        [BackgroundDependencyLoader(true)]
+        private void load(ManiaRulesetConfigManager rulesetConfig, SnapFinder snapFinder)
         {
-            base.LoadComplete();
-
             if (snapFinder != null)
             {
-                config?.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
+                rulesetConfig?.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
 
                 HitObject.StartTimeBindable.BindValueChanged(_ => snap.Value = snapFinder.FindSnap(HitObject), true);
 
@@ -115,4 +108,4 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                 : (ColourInfo)Colour4.White;
         }
     }
-}
\ No newline at end of file
+}

From afb67726f0057525b975bbd7b51d6e156e3316a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 25 Apr 2021 17:40:49 +0200
Subject: [PATCH 2818/3722] Reduce casting

---
 osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 52e343ba25..a5749408af 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -5,7 +5,6 @@ using System.Diagnostics;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Colour;
 using osu.Framework.Input.Bindings;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.Configuration;
@@ -15,6 +14,7 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit;
 using osu.Game.Skinning;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
@@ -104,8 +104,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         private void updateSnapColour()
         {
             Colour = configColourCodedNotes.Value
-                ? (ColourInfo)BindableBeatDivisor.GetColourFor(snap.Value, colours)
-                : (ColourInfo)Colour4.White;
+                ? BindableBeatDivisor.GetColourFor(snap.Value, colours)
+                : Color4.White;
         }
     }
 }

From e14255f39548b250d5c276663f4765cbc41d2596 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 25 Apr 2021 17:42:56 +0200
Subject: [PATCH 2819/3722] Rename {Snap -> BeatDivisor}Finder

---
 .../Objects/Drawables/DrawableNote.cs              |  6 +++---
 osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs |  4 ++--
 .../{SnapFinder.cs => BeatDivisorFinder.cs}        | 14 +++++++-------
 3 files changed, 12 insertions(+), 12 deletions(-)
 rename osu.Game/Rulesets/Objects/{SnapFinder.cs => BeatDivisorFinder.cs} (77%)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index a5749408af..2d2fba0ad5 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -48,13 +48,13 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(ManiaRulesetConfigManager rulesetConfig, SnapFinder snapFinder)
+        private void load(ManiaRulesetConfigManager rulesetConfig, BeatDivisorFinder beatDivisorFinder)
         {
-            if (snapFinder != null)
+            if (beatDivisorFinder != null)
             {
                 rulesetConfig?.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
 
-                HitObject.StartTimeBindable.BindValueChanged(_ => snap.Value = snapFinder.FindSnap(HitObject), true);
+                HitObject.StartTimeBindable.BindValueChanged(_ => snap.Value = beatDivisorFinder.FindDivisor(HitObject), true);
 
                 snap.BindValueChanged(_ => updateSnapColour(), true);
                 configColourCodedNotes.BindValueChanged(_ => updateSnapColour());
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 174727cc2d..0177c01240 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Rulesets.Mania.UI
         public new ManiaBeatmap Beatmap => (ManiaBeatmap)base.Beatmap;
 
         [Cached]
-        private SnapFinder snapFinder { get; set; }
+        private BeatDivisorFinder beatDivisorFinder { get; set; }
 
         public IEnumerable<BarLine> BarLines;
 
@@ -80,7 +80,7 @@ namespace osu.Game.Rulesets.Mania.UI
             : base(ruleset, beatmap, mods)
         {
             BarLines = new BarLineGenerator<BarLine>(Beatmap).BarLines;
-            snapFinder = new SnapFinder(Beatmap);
+            beatDivisorFinder = new BeatDivisorFinder(Beatmap);
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Rulesets/Objects/SnapFinder.cs b/osu.Game/Rulesets/Objects/BeatDivisorFinder.cs
similarity index 77%
rename from osu.Game/Rulesets/Objects/SnapFinder.cs
rename to osu.Game/Rulesets/Objects/BeatDivisorFinder.cs
index 3bc1d5cfb7..29b271a7e7 100644
--- a/osu.Game/Rulesets/Objects/SnapFinder.cs
+++ b/osu.Game/Rulesets/Objects/BeatDivisorFinder.cs
@@ -9,17 +9,17 @@ using osu.Game.Beatmaps.ControlPoints;
 namespace osu.Game.Rulesets.Objects
 {
     /// <summary>
-    /// Used to find the lowest beat divisor that a <see cref="HitObject"/> aligns to in an <see cref="IBeatmap"/>
+    /// Used to find the lowest beat divisor that a <see cref="HitObject"/> aligns to in an <see cref="IBeatmap"/>.
     /// </summary>
-    public class SnapFinder
+    public class BeatDivisorFinder
     {
         private readonly IBeatmap beatmap;
 
         /// <summary>
-        /// Creates a new SnapFinder instance.
+        /// Creates a new <see cref="BeatDivisorFinder"/> instance.
         /// </summary>
-        /// <param name="beatmap">The beatmap to align to when evaulating.</param>
-        public SnapFinder(IBeatmap beatmap)
+        /// <param name="beatmap">The beatmap to use when calculating beat divisor alignment.</param>
+        public BeatDivisorFinder(IBeatmap beatmap)
         {
             this.beatmap = beatmap;
         }
@@ -27,10 +27,10 @@ namespace osu.Game.Rulesets.Objects
         private static readonly int[] snaps = { 1, 2, 3, 4, 6, 8, 12, 16 };
 
         /// <summary>
-        /// Finds the lowest beat divisor that the given HitObject aligns to.
+        /// Finds the lowest beat divisor that the given <see cref="HitObject"/> aligns to.
         /// </summary>
         /// <param name="hitObject">The <see cref="HitObject"/> to evaluate.</param>
-        public int FindSnap(HitObject hitObject)
+        public int FindDivisor(HitObject hitObject)
         {
             TimingControlPoint currentTimingPoint = beatmap.ControlPointInfo.TimingPointAt(hitObject.StartTime);
             double snapResult = (hitObject.StartTime - currentTimingPoint.Time) % (currentTimingPoint.BeatLength * 4);

From 33a5c156a1e79e3ffe22f7199e9348f8f42b2464 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 25 Apr 2021 17:52:11 +0200
Subject: [PATCH 2820/3722] Use existing snap list from BindableBeatDivisor

---
 osu.Game/Rulesets/Objects/BeatDivisorFinder.cs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/BeatDivisorFinder.cs b/osu.Game/Rulesets/Objects/BeatDivisorFinder.cs
index 29b271a7e7..63a4ff2d34 100644
--- a/osu.Game/Rulesets/Objects/BeatDivisorFinder.cs
+++ b/osu.Game/Rulesets/Objects/BeatDivisorFinder.cs
@@ -5,6 +5,7 @@ using System;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Screens.Edit;
 
 namespace osu.Game.Rulesets.Objects
 {
@@ -24,8 +25,6 @@ namespace osu.Game.Rulesets.Objects
             this.beatmap = beatmap;
         }
 
-        private static readonly int[] snaps = { 1, 2, 3, 4, 6, 8, 12, 16 };
-
         /// <summary>
         /// Finds the lowest beat divisor that the given <see cref="HitObject"/> aligns to.
         /// </summary>
@@ -35,10 +34,10 @@ namespace osu.Game.Rulesets.Objects
             TimingControlPoint currentTimingPoint = beatmap.ControlPointInfo.TimingPointAt(hitObject.StartTime);
             double snapResult = (hitObject.StartTime - currentTimingPoint.Time) % (currentTimingPoint.BeatLength * 4);
 
-            foreach (var snap in snaps)
+            foreach (var divisor in BindableBeatDivisor.VALID_DIVISORS)
             {
-                if (almostDivisibleBy(snapResult, currentTimingPoint.BeatLength / snap))
-                    return snap;
+                if (almostDivisibleBy(snapResult, currentTimingPoint.BeatLength / divisor))
+                    return divisor;
             }
 
             return 0;

From 79e2b232d8a18775731bd3cca9c479d787ca64b8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 25 Apr 2021 19:26:53 +0300
Subject: [PATCH 2821/3722] Improve English
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/Edit/Compose/Components/SelectionBoxControl.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
index 374af20742..9ad30a366d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         private Circle circle;
 
         /// <summary>
-        /// Whether an operation has began from this control.
+        /// Whether this control is currently being operated on by the user.
         /// </summary>
         public bool InOperation { get; private set; }
 

From 7490511ebf4b869a1b98793ac773fb92b1f6714e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 25 Apr 2021 19:57:16 +0300
Subject: [PATCH 2822/3722] Instantiate selection box on SetUp

---
 .../Editing/TestSceneComposeSelectBox.cs      | 47 +++++++------------
 1 file changed, 18 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
index 13b563619a..7b939245a4 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
@@ -17,32 +17,30 @@ namespace osu.Game.Tests.Visual.Editing
         private Container selectionArea;
         private SelectionBox selectionBox;
 
-        public TestSceneComposeSelectBox()
+        [SetUp]
+        public void SetUp() => Schedule(() =>
         {
-            AddStep("create box", () =>
-                Child = selectionArea = new Container
+            Child = selectionArea = new Container
+            {
+                Size = new Vector2(400),
+                Position = -new Vector2(150),
+                Anchor = Anchor.Centre,
+                Children = new Drawable[]
                 {
-                    Size = new Vector2(400),
-                    Position = -new Vector2(150),
-                    Anchor = Anchor.Centre,
-                    Children = new Drawable[]
+                    selectionBox = new SelectionBox
                     {
-                        selectionBox = new SelectionBox
-                        {
-                            CanRotate = true,
-                            CanScaleX = true,
-                            CanScaleY = true,
+                        CanRotate = true,
+                        CanScaleX = true,
+                        CanScaleY = true,
 
-                            OnRotation = handleRotation,
-                            OnScale = handleScale
-                        }
+                        OnRotation = handleRotation,
+                        OnScale = handleScale
                     }
-                });
+                }
+            };
 
-            AddToggleStep("toggle rotation", state => selectionBox.CanRotate = state);
-            AddToggleStep("toggle x", state => selectionBox.CanScaleX = state);
-            AddToggleStep("toggle y", state => selectionBox.CanScaleY = state);
-        }
+            InputManager.MoveMouseTo(selectionBox);
+        });
 
         private bool handleScale(Vector2 amount, Anchor reference)
         {
@@ -72,15 +70,6 @@ namespace osu.Game.Tests.Visual.Editing
             return true;
         }
 
-        [SetUp]
-        public void SetUp() => Schedule(() =>
-        {
-            InputManager.MoveMouseTo(selectionBox);
-            selectionBox.CanRotate = true;
-            selectionBox.CanScaleX = true;
-            selectionBox.CanScaleY = true;
-        });
-
         [Test]
         public void TestRotationHandleShownOnHover()
         {

From c58ef4230da768aad729e4785a156c80e83bad54 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 25 Apr 2021 19:58:50 +0300
Subject: [PATCH 2823/3722] Inherit `VisibilityContainer` and make duration
 constant protected

---
 .../Edit/Compose/Components/SelectionBoxControl.cs        | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
index 9ad30a366d..501ce6381a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
@@ -15,9 +15,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
     /// Represents the base appearance for UI controls of the <see cref="SelectionBox"/>,
     /// such as scale handles, rotation handles, buttons, etc...
     /// </summary>
-    public abstract class SelectionBoxControl : CompositeDrawable
+    public abstract class SelectionBoxControl : VisibilityContainer
     {
-        public const double TRANSFORM_DURATION = 100;
+        protected const double TRANSFORM_DURATION = 100;
 
         public event Action OperationStarted;
         public event Action OperationEnded;
@@ -90,6 +90,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
             base.OnMouseUp(e);
         }
 
+        protected override void PopIn() => this.FadeIn(TRANSFORM_DURATION, Easing.OutQuint);
+
+        protected override void PopOut() => this.FadeOut(TRANSFORM_DURATION, Easing.OutQuint);
+
         protected virtual void UpdateHoverState()
         {
             if (HandlingMouse)

From 7390a12e4b9bda91f0d4f4d374094abaf3fece92 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 25 Apr 2021 19:59:08 +0300
Subject: [PATCH 2824/3722] SelectionBoxDragHandleDisplay ->
 SelectionBoxDragHandleContainer

---
 osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs    | 4 ++--
 ...gHandleDisplay.cs => SelectionBoxDragHandleContainer.cs} | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename osu.Game/Screens/Edit/Compose/Components/{SelectionBoxDragHandleDisplay.cs => SelectionBoxDragHandleContainer.cs} (92%)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index d7db98f6a2..774ea076a5 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
         }
 
-        private SelectionBoxDragHandleDisplay dragHandles;
+        private SelectionBoxDragHandleContainer dragHandles;
         private FillFlowContainer buttons;
 
         public const float BORDER_RADIUS = 3;
@@ -161,7 +161,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                         },
                     }
                 },
-                dragHandles = new SelectionBoxDragHandleDisplay
+                dragHandles = new SelectionBoxDragHandleContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     // ensures that the centres of all drag handles line up with the middle of the selection box border.
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
similarity index 92%
rename from osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleDisplay.cs
rename to osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
index 1cba8ca6b3..151c169a33 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
     /// <summary>
     /// Represents a display composite containing and managing the visibility state of the selection box's drag handles.
     /// </summary>
-    public class SelectionBoxDragHandleDisplay : CompositeDrawable
+    public class SelectionBoxDragHandleContainer : CompositeDrawable
     {
         private Container<SelectionBoxScaleHandle> scaleHandles;
         private Container<SelectionBoxRotationHandle> rotationHandles;
@@ -75,7 +75,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (activeHandle?.InOperation == true || activeHandle?.IsHovered == true)
                 return;
 
-            displayedRotationHandle?.FadeOut(SelectionBoxControl.TRANSFORM_DURATION, Easing.OutQuint);
+            displayedRotationHandle?.Hide();
             displayedRotationHandle = null;
 
             activeHandle = allDragHandles.SingleOrDefault(h => h.InOperation);
@@ -84,7 +84,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (activeHandle != null)
             {
                 displayedRotationHandle = getCorrespondingRotationHandle(activeHandle, rotationHandles);
-                displayedRotationHandle?.FadeIn(SelectionBoxControl.TRANSFORM_DURATION, Easing.OutQuint);
+                displayedRotationHandle?.Show();
             }
         }
 

From 334927ed35f3de3edae71467fafe69808c660008 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 25 Apr 2021 20:11:41 +0300
Subject: [PATCH 2825/3722] Remove leftover step

---
 osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
index 7b939245a4..914b8b6f27 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
@@ -75,7 +75,6 @@ namespace osu.Game.Tests.Visual.Editing
         {
             SelectionBoxRotationHandle rotationHandle = null;
 
-            AddStep("enable rotation", () => selectionBox.CanRotate = true);
             AddStep("retrieve rotation handle", () => rotationHandle = this.ChildrenOfType<SelectionBoxRotationHandle>().First());
 
             AddAssert("handle hidden", () => rotationHandle.Alpha == 0);

From b252485e1ab0dd5bfa38b35ce315219869fb45b0 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 25 Apr 2021 20:13:21 +0300
Subject: [PATCH 2826/3722] Remove protected expose of `HandlingMouse` setter

Regardless of `OnDragEnd()`, `OnMouseUp()` will still be called resetting the value of that state back.
---
 osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs | 2 +-
 .../Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
index 501ce6381a..3a2fc7f83a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <summary>
         /// Whether this control is currently handling mouse down input.
         /// </summary>
-        protected bool HandlingMouse { get; set; }
+        protected bool HandlingMouse { get; private set; }
 
         protected override bool OnMouseDown(MouseDownEvent e)
         {
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
index ea4f9704ef..d7e58df748 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
@@ -24,7 +24,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected override void OnDragEnd(DragEndEvent e)
         {
-            HandlingMouse = false;
             OnOperationEnded();
 
             UpdateHoverState();

From 485da47d89d9fa4786935fcbd64c9a1d3b6eaac4 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 26 Apr 2021 01:41:36 +0300
Subject: [PATCH 2827/3722] Revert "Inherit `VisibilityContainer` and make
 duration constant protected"

This reverts commit c58ef4230da768aad729e4785a156c80e83bad54. Uhh, how did I push this..
---
 .../Edit/Compose/Components/SelectionBoxControl.cs        | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
index 3a2fc7f83a..38ed23fa13 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
@@ -15,9 +15,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
     /// Represents the base appearance for UI controls of the <see cref="SelectionBox"/>,
     /// such as scale handles, rotation handles, buttons, etc...
     /// </summary>
-    public abstract class SelectionBoxControl : VisibilityContainer
+    public abstract class SelectionBoxControl : CompositeDrawable
     {
-        protected const double TRANSFORM_DURATION = 100;
+        public const double TRANSFORM_DURATION = 100;
 
         public event Action OperationStarted;
         public event Action OperationEnded;
@@ -90,10 +90,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
             base.OnMouseUp(e);
         }
 
-        protected override void PopIn() => this.FadeIn(TRANSFORM_DURATION, Easing.OutQuint);
-
-        protected override void PopOut() => this.FadeOut(TRANSFORM_DURATION, Easing.OutQuint);
-
         protected virtual void UpdateHoverState()
         {
             if (HandlingMouse)

From beee318acc92bd0831bcd19984807c7f029e54bf Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 26 Apr 2021 01:45:50 +0300
Subject: [PATCH 2828/3722] Add more distance between each hit object in editor
 selection test

To avoid potentially hovering over the rotation control instead of wherever the test desired to move the mouse to.
---
 .../Visual/Editing/TestSceneEditorSelection.cs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
index b82842e30d..4ce1d995a5 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
@@ -50,9 +50,9 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("add hitobjects", () => EditorBeatmap.AddRange(addedObjects = new[]
             {
                 new HitCircle { StartTime = 100 },
-                new HitCircle { StartTime = 200, Position = new Vector2(50) },
-                new HitCircle { StartTime = 300, Position = new Vector2(100) },
-                new HitCircle { StartTime = 400, Position = new Vector2(150) },
+                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));
@@ -95,9 +95,9 @@ namespace osu.Game.Tests.Visual.Editing
             var addedObjects = new[]
             {
                 new HitCircle { StartTime = 100 },
-                new HitCircle { StartTime = 200, Position = new Vector2(50) },
-                new HitCircle { StartTime = 300, Position = new Vector2(100) },
-                new HitCircle { StartTime = 400, Position = new Vector2(150) },
+                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("add hitobjects", () => EditorBeatmap.AddRange(addedObjects));
@@ -131,9 +131,9 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("add hitobjects", () => EditorBeatmap.AddRange(addedObjects = new[]
             {
                 new HitCircle { StartTime = 100 },
-                new HitCircle { StartTime = 200, Position = new Vector2(50) },
-                new HitCircle { StartTime = 300, Position = new Vector2(100) },
-                new HitCircle { StartTime = 400, Position = new Vector2(150) },
+                new HitCircle { StartTime = 200, Position = new Vector2(100) },
+                new HitCircle { StartTime = 300, Position = new Vector2(200) },
+                new HitCircle { StartTime = 400, Position = new Vector2(300) },
             }));
 
             moveMouseToObject(() => addedObjects[0]);

From 8bb1fcd39b29b55b693d9540777f96ecb0d8d3c6 Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Mon, 26 Apr 2021 07:07:32 +0800
Subject: [PATCH 2829/3722] Add tests for BeatDivisorFinder

---
 osu.Game.Tests/NonVisual/BeatDivisorFinder.cs | 116 ++++++++++++++++++
 .../Rulesets/Objects/BeatDivisorFinder.cs     |   3 +-
 2 files changed, 118 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Tests/NonVisual/BeatDivisorFinder.cs

diff --git a/osu.Game.Tests/NonVisual/BeatDivisorFinder.cs b/osu.Game.Tests/NonVisual/BeatDivisorFinder.cs
new file mode 100644
index 0000000000..742f5790d6
--- /dev/null
+++ b/osu.Game.Tests/NonVisual/BeatDivisorFinder.cs
@@ -0,0 +1,116 @@
+// Copyright (c) ppy 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.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Objects;
+
+namespace osu.Game.Tests.NonVisual
+{
+    public class BeatDivisorFinderTest
+    {
+        [Test]
+        public void TestFindDivisor()
+        {
+            const int beatLength = 1000;
+
+            var beatmap = new Beatmap
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new HitObject { StartTime = -beatLength / 3 },
+                    new HitObject { StartTime = 0 },
+                    new HitObject { StartTime = beatLength / 16 },
+                    new HitObject { StartTime = beatLength / 12 },
+                    new HitObject { StartTime = beatLength / 8 },
+                    new HitObject { StartTime = beatLength / 6 },
+                    new HitObject { StartTime = beatLength / 4 },
+                    new HitObject { StartTime = beatLength / 3 },
+                    new HitObject { StartTime = beatLength / 2 },
+                    new HitObject { StartTime = beatLength },
+                    new HitObject { StartTime = beatLength + beatLength / 7 }
+                },
+                ControlPointInfo = new ControlPointInfo()
+            };
+
+            beatmap.ControlPointInfo.Add(0, new TimingControlPoint()
+                {
+                    TimeSignature = Game.Beatmaps.Timing.TimeSignatures.SimpleQuadruple,
+                    BeatLength = beatLength
+                });
+
+            var beatDivisorFinder = new BeatDivisorFinder(beatmap);
+
+            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[0]), 3);
+            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[1]), 1);
+            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[2]), 16);
+            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[3]), 12);
+            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[4]), 8);
+            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[5]), 6);
+            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[6]), 4);
+            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[7]), 3);
+            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[8]), 2);
+            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[9]), 1);
+            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[10]), 0);
+        }
+
+        [Test]
+        public void TestFindDivisorWithTempoChanges()
+        {
+            const int firstBeatLength = 1000;
+            const int secondBeatLength = 700;
+            const int thirdBeatLength = 200;
+
+            const int firstBeatLengthStart = 0;
+            const int secondBeatLengthStart = 1000;
+            const int thirdBeatLengthStart = 2000;
+
+            var beatmap = new Beatmap
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new HitObject { StartTime = firstBeatLengthStart },
+                    new HitObject { StartTime = firstBeatLengthStart + firstBeatLength / 2 },
+                    new HitObject { StartTime = secondBeatLengthStart },
+                    new HitObject { StartTime = secondBeatLengthStart + secondBeatLength / 2 },
+                    new HitObject { StartTime = thirdBeatLengthStart },
+                    new HitObject { StartTime = thirdBeatLengthStart + thirdBeatLength / 2 },
+                },
+                ControlPointInfo = new ControlPointInfo()
+            };
+
+            var firstTimingControlPoint = new TimingControlPoint()
+            {
+                TimeSignature = Game.Beatmaps.Timing.TimeSignatures.SimpleQuadruple,
+                BeatLength = firstBeatLength
+            };
+            
+            var secondTimingControlPoint = new TimingControlPoint()
+            {
+                TimeSignature = Game.Beatmaps.Timing.TimeSignatures.SimpleQuadruple,
+                BeatLength = secondBeatLength
+            };
+            
+            var thirdTimingControlPoint = new TimingControlPoint()
+            {
+                TimeSignature = Game.Beatmaps.Timing.TimeSignatures.SimpleQuadruple,
+                BeatLength = thirdBeatLength
+            };
+
+            beatmap.ControlPointInfo.Add(firstBeatLengthStart, firstTimingControlPoint);
+            beatmap.ControlPointInfo.Add(secondBeatLengthStart, secondTimingControlPoint);
+            beatmap.ControlPointInfo.Add(thirdBeatLengthStart, thirdTimingControlPoint);
+
+            var beatDivisorFinder = new BeatDivisorFinder(beatmap);
+
+            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[0]), 1);
+            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[1]), 2);
+            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[2]), 1);
+            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[3]), 2);
+            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[4]), 1);
+            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[5]), 2);
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/Objects/BeatDivisorFinder.cs b/osu.Game/Rulesets/Objects/BeatDivisorFinder.cs
index 63a4ff2d34..1479b22942 100644
--- a/osu.Game/Rulesets/Objects/BeatDivisorFinder.cs
+++ b/osu.Game/Rulesets/Objects/BeatDivisorFinder.cs
@@ -27,12 +27,13 @@ namespace osu.Game.Rulesets.Objects
 
         /// <summary>
         /// Finds the lowest beat divisor that the given <see cref="HitObject"/> aligns to.
+        /// Returns 0 if it does not align to any divisor.
         /// </summary>
         /// <param name="hitObject">The <see cref="HitObject"/> to evaluate.</param>
         public int FindDivisor(HitObject hitObject)
         {
             TimingControlPoint currentTimingPoint = beatmap.ControlPointInfo.TimingPointAt(hitObject.StartTime);
-            double snapResult = (hitObject.StartTime - currentTimingPoint.Time) % (currentTimingPoint.BeatLength * 4);
+            double snapResult = hitObject.StartTime - currentTimingPoint.Time;
 
             foreach (var divisor in BindableBeatDivisor.VALID_DIVISORS)
             {

From 0b9172a1dc08dfa3e432b93aa48d0a3b7862fd31 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 26 Apr 2021 02:39:18 +0300
Subject: [PATCH 2830/3722] Animate back slider repeat and tail circle pieces

---
 .../Objects/Drawables/DrawableSliderRepeat.cs              | 7 +++++--
 .../Objects/Drawables/DrawableSliderTail.cs                | 3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index 76490e0de1..5af2a38559 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -26,7 +26,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private double animDuration;
 
-        public Drawable CirclePiece { get; private set; }
+        public SkinnableDrawable CirclePiece { get; private set; }
+
         private Drawable scaleContainer;
         private ReverseArrowPiece arrow;
 
@@ -53,7 +54,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 RelativeSizeAxes = Axes.Both,
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-                Children = new[]
+                Children = new Drawable[]
                 {
                     // no default for this; only visible in legacy skins.
                     CirclePiece = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SliderTailHitCircle), _ => Empty()),
@@ -91,6 +92,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.UpdateHitStateTransforms(state);
 
+            (CirclePiece.Drawable as IMainCirclePiece)?.Animate(state);
+
             switch (state)
             {
                 case ArmedState.Idle:
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index 87f098dd29..84b9b881a2 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -7,6 +7,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Skinning.Default;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -84,6 +85,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             Debug.Assert(HitObject.HitWindows != null);
 
+            (circlePiece.Drawable as IMainCirclePiece)?.Animate(state);
+
             switch (state)
             {
                 case ArmedState.Idle:

From e6474e6ff73b968970dc0c9e943130a6f865af06 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 26 Apr 2021 11:47:38 +0900
Subject: [PATCH 2831/3722] Remove redundant statement (lifetime is set in
 base)

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

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 312ed93e45..6ab6a4b984 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -212,10 +212,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             // LifetimeStart is already computed using HitObjectLifetimeEntry's InitialLifetimeOffset.
             // We override this with DHO's InitialLifetimeOffset for a non-pooled DHO.
             if (entry is SyntheticHitObjectEntry)
-                entry.LifetimeStart = HitObject.StartTime - InitialLifetimeOffset;
-
-            LifetimeStart = entry.LifetimeStart;
-            LifetimeEnd = entry.LifetimeEnd;
+                LifetimeStart = HitObject.StartTime - InitialLifetimeOffset;
 
             ensureEntryHasResult();
 

From 9178aa1d7d745f3057f0080ec704e86ced17f534 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 26 Apr 2021 04:48:56 +0200
Subject: [PATCH 2832/3722] Add unsnap check tests

---
 .../Editing/Checks/CheckUnsnapsTest.cs        | 160 ++++++++++++++++++
 1 file changed, 160 insertions(+)
 create mode 100644 osu.Game.Tests/Editing/Checks/CheckUnsnapsTest.cs

diff --git a/osu.Game.Tests/Editing/Checks/CheckUnsnapsTest.cs b/osu.Game.Tests/Editing/Checks/CheckUnsnapsTest.cs
new file mode 100644
index 0000000000..88939c43ce
--- /dev/null
+++ b/osu.Game.Tests/Editing/Checks/CheckUnsnapsTest.cs
@@ -0,0 +1,160 @@
+// Copyright (c) ppy 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 Moq;
+using NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Edit.Checks;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.Objects;
+
+namespace osu.Game.Tests.Editing.Checks
+{
+    [TestFixture]
+    public class CheckUnsnapsTest
+    {
+        private CheckUnsnaps check;
+        private ControlPointInfo cpi;
+
+        [SetUp]
+        public void Setup()
+        {
+            check = new CheckUnsnaps();
+
+            cpi = new ControlPointInfo();
+            cpi.Add(100, new TimingControlPoint { BeatLength = 100 });
+        }
+
+        [Test]
+        public void TestCircleSnapped()
+        {
+            assertOk(new List<HitObject>
+            {
+                new HitCircle { StartTime = 100 }
+            });
+        }
+
+        [Test]
+        public void TestCircleUnsnapped1Ms()
+        {
+            assert1Ms(new List<HitObject>
+            {
+                new HitCircle { StartTime = 101 }
+            });
+
+            assert1Ms(new List<HitObject>
+            {
+                new HitCircle { StartTime = 99 }
+            });
+        }
+
+        [Test]
+        public void TestCircleUnsnapped2Ms()
+        {
+            assert2Ms(new List<HitObject>
+            {
+                new HitCircle { StartTime = 102 }
+            });
+
+            assert2Ms(new List<HitObject>
+            {
+                new HitCircle { StartTime = 98 }
+            });
+        }
+
+        [Test]
+        public void TestSliderSnapped()
+        {
+            // Slider ends are naturally < 1 ms unsnapped because of how SV works.
+            var mockSlider = new Mock<Slider>();
+            mockSlider.SetupGet(s => s.StartTime).Returns(100);
+            mockSlider.As<IHasRepeats>().Setup(r => r.RepeatCount).Returns(0);
+            mockSlider.As<IHasDuration>().Setup(d => d.Duration).Returns(400.75d);
+
+            assertOk(new List<HitObject>
+            {
+                mockSlider.Object
+            });
+        }
+
+        [Test]
+        public void TestSliderUnsnapped1Ms()
+        {
+            assert1Ms(new List<HitObject>
+            {
+                getSliderMock(startTime: 101, endTime: 401.75d).Object
+            }, count: 2);
+
+            // End is only off by 0.25 ms, hence count 1.
+            assert1Ms(new List<HitObject>
+            {
+                getSliderMock(startTime: 99, endTime: 399.75d).Object
+            }, count: 1);
+        }
+
+        [Test]
+        public void TestSliderUnsnapped2Ms()
+        {
+            assert2Ms(new List<HitObject>
+            {
+                getSliderMock(startTime: 102, endTime: 402.75d).Object
+            }, count: 2);
+
+            // Start and end are 2 ms and 1.25 ms off respectively, hence two different issues in one object.
+            var hitobjects = new List<HitObject>
+            {
+                getSliderMock(startTime: 98, endTime: 398.75d).Object
+            };
+
+            var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(2));
+            Assert.That(issues.Any(issue => issue.Template is CheckUnsnaps.IssueTemplate1MsOrMore));
+            Assert.That(issues.Any(issue => issue.Template is CheckUnsnaps.IssueTemplate2MsOrMore));
+        }
+
+        private Mock<Slider> getSliderMock(double startTime, double endTime, int repeats = 0)
+        {
+            var mockSlider = new Mock<Slider>();
+            mockSlider.SetupGet(s => s.StartTime).Returns(startTime);
+            mockSlider.As<IHasRepeats>().Setup(r => r.RepeatCount).Returns(repeats);
+            mockSlider.As<IHasDuration>().Setup(d => d.EndTime).Returns(endTime);
+
+            return mockSlider;
+        }
+
+        private void assertOk(List<HitObject> hitobjects)
+        {
+            Assert.That(check.Run(getPlayableBeatmap(hitobjects), null), Is.Empty);
+        }
+
+        private void assert1Ms(List<HitObject> hitobjects, int count = 1)
+        {
+            var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(count));
+            Assert.That(issues.All(issue => issue.Template is CheckUnsnaps.IssueTemplate1MsOrMore));
+        }
+
+        private void assert2Ms(List<HitObject> hitobjects, int count = 1)
+        {
+            var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(count));
+            Assert.That(issues.All(issue => issue.Template is CheckUnsnaps.IssueTemplate2MsOrMore));
+        }
+
+        private IBeatmap getPlayableBeatmap(List<HitObject> hitobjects)
+        {
+            return new Beatmap<HitObject>
+            {
+                ControlPointInfo = cpi,
+                HitObjects = hitobjects
+            };
+        }
+    }
+}

From 20e3cadd30e6c2e9e49b0f880915646e7caa9624 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 26 Apr 2021 12:04:59 +0900
Subject: [PATCH 2833/3722] freeIfInUse -> free, and add comments

---
 .../Rulesets/Objects/Pooling/DrawableObject.cs    | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Pooling/DrawableObject.cs b/osu.Game/Rulesets/Objects/Pooling/DrawableObject.cs
index b29e6a6c3c..27ed4c04f2 100644
--- a/osu.Game/Rulesets/Objects/Pooling/DrawableObject.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/DrawableObject.cs
@@ -50,6 +50,7 @@ namespace osu.Game.Rulesets.Objects.Pooling
         {
             base.LoadAsyncComplete();
 
+            // Apply the initial entry given in the constructor.
             if (Entry != null && !HasEntryApplied)
                 Apply(Entry);
         }
@@ -60,7 +61,8 @@ namespace osu.Game.Rulesets.Objects.Pooling
         /// </summary>
         public void Apply(TEntry entry)
         {
-            freeIfInUse();
+            if (HasEntryApplied)
+                free();
 
             setLifetime(entry.LifetimeStart, entry.LifetimeEnd);
             Entry = entry;
@@ -74,8 +76,9 @@ namespace osu.Game.Rulesets.Objects.Pooling
         {
             base.FreeAfterUse();
 
-            if (IsInPool)
-                freeIfInUse();
+            // We preserve the existing entry in case we want to move a non-pooled drawable between different parent drawables.
+            if (HasEntryApplied && IsInPool)
+                free();
         }
 
         /// <summary>
@@ -104,11 +107,9 @@ namespace osu.Game.Rulesets.Objects.Pooling
             }
         }
 
-        private void freeIfInUse()
+        private void free()
         {
-            if (!HasEntryApplied) return;
-
-            Debug.Assert(Entry != null);
+            Debug.Assert(Entry != null && HasEntryApplied);
 
             OnFree(Entry);
 

From 6561a7c7d697dafd15d3f35b82d7ccd86552ca0b Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 26 Apr 2021 12:06:21 +0900
Subject: [PATCH 2834/3722] Rename DrawableObject ->
 PoolableDrawableWithLifetime

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs  | 4 ++--
 ...{DrawableObject.cs => PoolableDrawableWithLifetime.cs} | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename osu.Game/Rulesets/Objects/Pooling/{DrawableObject.cs => PoolableDrawableWithLifetime.cs} (92%)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 6ab6a4b984..7739994527 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -26,7 +26,7 @@ using osuTK.Graphics;
 namespace osu.Game.Rulesets.Objects.Drawables
 {
     [Cached(typeof(DrawableHitObject))]
-    public abstract class DrawableHitObject : DrawableObject<HitObjectLifetimeEntry>
+    public abstract class DrawableHitObject : PoolableDrawableWithLifetime<HitObjectLifetimeEntry>
     {
         /// <summary>
         /// Invoked after this <see cref="DrawableHitObject"/>'s applied <see cref="HitObject"/> has had its defaults applied.
@@ -153,7 +153,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </summary>
         /// <param name="initialHitObject">
         /// The <see cref="HitObject"/> to be initially applied to this <see cref="DrawableHitObject"/>.
-        /// If <c>null</c>, a hitobject is expected to be later applied via <see cref="DrawableObject{TEntry}.Apply"/> (or automatically via pooling).
+        /// If <c>null</c>, a hitobject is expected to be later applied via <see cref="PoolableDrawableWithLifetime{TEntry}.Apply"/> (or automatically via pooling).
         /// </param>
         protected DrawableHitObject([CanBeNull] HitObject initialHitObject = null)
             : base(initialHitObject != null ? new SyntheticHitObjectEntry(initialHitObject) : null)
diff --git a/osu.Game/Rulesets/Objects/Pooling/DrawableObject.cs b/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
similarity index 92%
rename from osu.Game/Rulesets/Objects/Pooling/DrawableObject.cs
rename to osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
index 27ed4c04f2..93e476be76 100644
--- a/osu.Game/Rulesets/Objects/Pooling/DrawableObject.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
@@ -13,15 +13,15 @@ namespace osu.Game.Rulesets.Objects.Pooling
     /// A <see cref="PoolableDrawable"/> that is controlled by <see cref="Entry"/> to implement drawable pooling and replay rewinding.
     /// </summary>
     /// <typeparam name="TEntry">The <see cref="LifetimeEntry"/> type storing state and controlling this drawable.</typeparam>
-    public abstract class DrawableObject<TEntry> : PoolableDrawable where TEntry : LifetimeEntry
+    public abstract class PoolableDrawableWithLifetime<TEntry> : PoolableDrawable where TEntry : LifetimeEntry
     {
         /// <summary>
-        /// The entry holding essential state of this <see cref="DrawableObject{TEntry}"/>.
+        /// The entry holding essential state of this <see cref="PoolableDrawableWithLifetime{TEntry}"/>.
         /// </summary>
         protected TEntry? Entry { get; private set; }
 
         /// <summary>
-        /// Whether <see cref="Entry"/> is applied to this <see cref="DrawableObject{TEntry}"/>.
+        /// Whether <see cref="Entry"/> is applied to this <see cref="PoolableDrawableWithLifetime{TEntry}"/>.
         /// When an initial entry is specified in the constructor, <see cref="Entry"/> is set but not applied until loading is completed.
         /// </summary>
         protected bool HasEntryApplied { get; private set; }
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Objects.Pooling
         public override bool RemoveWhenNotAlive => false;
         public override bool RemoveCompletedTransforms => false;
 
-        protected DrawableObject(TEntry? initialEntry = null)
+        protected PoolableDrawableWithLifetime(TEntry? initialEntry = null)
         {
             Entry = initialEntry;
         }

From 049e42fa854f2ec8bb0493246d34a8d43cb9209a Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 26 Apr 2021 05:07:24 +0200
Subject: [PATCH 2835/3722] Move snapping responsibility to `IBeatmap`

Seems `EditorBeatmap` already implements a different kind of `SnapTime` from `IBeatSnapProvider`, so method names here aren't great.

This is very similar to what https://github.com/ppy/osu/pull/12558 is doing, so may need to do some duplicate resolution later, especially surrounding `ClosestBeatSnapDivisor`.

Worth noting that this change makes 1/7, 1/5, etc unsupported for now, as we now rely on `BindableBeatDivisor.VALID_DIVISORS`.
---
 osu.Game/Beatmaps/Beatmap.cs                  | 26 ++++++++++++++++++
 osu.Game/Beatmaps/IBeatmap.cs                 | 22 +++++++++++++++
 osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs | 27 +++----------------
 osu.Game/Screens/Edit/EditorBeatmap.cs        | 13 +++++----
 osu.Game/Screens/Play/GameplayBeatmap.cs      |  9 +++++++
 5 files changed, 68 insertions(+), 29 deletions(-)

diff --git a/osu.Game/Beatmaps/Beatmap.cs b/osu.Game/Beatmaps/Beatmap.cs
index e5b6a4bc44..1ce01aee24 100644
--- a/osu.Game/Beatmaps/Beatmap.cs
+++ b/osu.Game/Beatmaps/Beatmap.cs
@@ -9,6 +9,7 @@ using System.Linq;
 using osu.Game.Beatmaps.ControlPoints;
 using Newtonsoft.Json;
 using osu.Game.IO.Serialization.Converters;
+using osu.Game.Screens.Edit;
 
 namespace osu.Game.Beatmaps
 {
@@ -74,6 +75,31 @@ namespace osu.Game.Beatmaps
             return mostCommon.beatLength;
         }
 
+        public int SnapTimeForDivisor(double time, int beatDivisor, double? referenceTime = null)
+        {
+            var timingPoint = ControlPointInfo.TimingPointAt(referenceTime ?? time);
+            var beatLength = timingPoint.BeatLength / beatDivisor;
+            var beatLengths = (int)Math.Round((time - timingPoint.Time) / beatLength, MidpointRounding.AwayFromZero);
+
+            return (int)(timingPoint.Time + beatLengths * beatLength);
+        }
+
+        public int SnapTimeAnyDivisor(double time, double? referenceTime = null)
+        {
+            return SnapTimeForDivisor(time, ClosestBeatSnapDivisor(time, referenceTime), referenceTime);
+        }
+
+        public int ClosestBeatSnapDivisor(double time, double? referenceTime = null)
+        {
+            double getUnsnap(int divisor) => Math.Abs(time - SnapTimeForDivisor(time, divisor, referenceTime));
+
+            int[] divisors = BindableBeatDivisor.VALID_DIVISORS;
+            double smallestUnsnap = divisors.Min(getUnsnap);
+            int closestDivisor = divisors.FirstOrDefault(divisor => getUnsnap(divisor) == smallestUnsnap);
+
+            return closestDivisor;
+        }
+
         IBeatmap IBeatmap.Clone() => Clone();
 
         public Beatmap<T> Clone() => (Beatmap<T>)MemberwiseClone();
diff --git a/osu.Game/Beatmaps/IBeatmap.cs b/osu.Game/Beatmaps/IBeatmap.cs
index 769b33009a..3b043cb59b 100644
--- a/osu.Game/Beatmaps/IBeatmap.cs
+++ b/osu.Game/Beatmaps/IBeatmap.cs
@@ -51,6 +51,28 @@ namespace osu.Game.Beatmaps
         /// </summary>
         double GetMostCommonBeatLength();
 
+        /// <summary>
+        /// Returns the time on the given beat divisor closest to the given time.
+        /// </summary>
+        /// <param name="time">The time to find the closest snapped time to.</param>
+        /// <param name="beatDivisor">The beat divisor to snap to.</param>
+        /// <param name="referenceTime">The time at which the timing point is retrieved, by default same as time.</param>
+        int SnapTimeForDivisor(double time, int beatDivisor, double? referenceTime = null);
+
+        /// <summary>
+        /// Returns the time on any valid beat divisor closest to the given time.
+        /// </summary>
+        /// <param name="time">The time to find the closest snapped time to.</param>
+        /// <param name="referenceTime">The time at which the timing point is retrieved, by default same as time.</param>
+        int SnapTimeAnyDivisor(double time, double? referenceTime = null);
+
+        /// <summary>
+        /// Returns the beat snap divisor closest to the given time. If two are equally close, the smallest is returned.
+        /// </summary>
+        /// <param name="time">The time to find the closest beat snap divisor to.</param>
+        /// <param name="referenceTime">The time at which the timing point is retrieved, by default same as time.</param>
+        int ClosestBeatSnapDivisor(double time, double? referenceTime = null);
+
         /// <summary>
         /// Creates a shallow-clone of this beatmap and returns it.
         /// </summary>
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs b/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs
index 835c4bdb69..d15dc6f179 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs
@@ -3,9 +3,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Edit.Checks.Components;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
@@ -16,8 +14,6 @@ namespace osu.Game.Rulesets.Edit.Checks
     {
         private const double unsnap_ms_threshold = 2;
 
-        private static readonly int[] greatest_common_divisors = { 16, 12, 9, 7, 5 };
-
         public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Compose, "Unsnapped hitobjects");
 
         public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
@@ -30,7 +26,7 @@ namespace osu.Game.Rulesets.Edit.Checks
         {
             foreach (var hitobject in playableBeatmap.HitObjects)
             {
-                double startUnsnap = hitobject.StartTime - closestSnapTime(playableBeatmap, hitobject.StartTime);
+                double startUnsnap = hitobject.StartTime - playableBeatmap.SnapTimeAnyDivisor(hitobject.StartTime);
                 string startPostfix = hitobject is IHasDuration ? "start" : "";
                 foreach (var issue in getUnsnapIssues(hitobject, startUnsnap, hitobject.StartTime, startPostfix))
                     yield return issue;
@@ -41,7 +37,7 @@ namespace osu.Game.Rulesets.Edit.Checks
                     {
                         double spanDuration = hasRepeats.Duration / (hasRepeats.RepeatCount + 1);
                         double repeatTime = hitobject.StartTime + spanDuration * (repeatIndex + 1);
-                        double repeatUnsnap = repeatTime - closestSnapTime(playableBeatmap, repeatTime);
+                        double repeatUnsnap = repeatTime - playableBeatmap.SnapTimeAnyDivisor(repeatTime);
                         foreach (var issue in getUnsnapIssues(hitobject, repeatUnsnap, repeatTime, "repeat"))
                             yield return issue;
                     }
@@ -49,7 +45,7 @@ namespace osu.Game.Rulesets.Edit.Checks
 
                 if (hitobject is IHasDuration hasDuration)
                 {
-                    double endUnsnap = hasDuration.EndTime - closestSnapTime(playableBeatmap, hasDuration.EndTime);
+                    double endUnsnap = hasDuration.EndTime - playableBeatmap.SnapTimeAnyDivisor(hasDuration.EndTime);
                     foreach (var issue in getUnsnapIssues(hitobject, endUnsnap, hasDuration.EndTime, "end"))
                         yield return issue;
                 }
@@ -66,23 +62,6 @@ namespace osu.Game.Rulesets.Edit.Checks
             // We don't care about unsnaps < 1 ms, as all object ends have these due to the way SV works.
         }
 
-        private int closestSnapTime(IBeatmap playableBeatmap, double time)
-        {
-            var timingPoint = playableBeatmap.ControlPointInfo.TimingPointAt(time);
-            double smallestUnsnap = greatest_common_divisors.Select(divisor => Math.Abs(time - snapTime(timingPoint, time, divisor))).Min();
-
-            return (int)Math.Round(time + smallestUnsnap);
-        }
-
-        private int snapTime(TimingControlPoint timingPoint, double time, int beatDivisor)
-        {
-            double beatLength = timingPoint.BeatLength / beatDivisor;
-            int beatLengths = (int)Math.Round((time - timingPoint.Time) / beatLength, MidpointRounding.AwayFromZero);
-
-            // Casting to int matches the editor in both stable and lazer.
-            return (int)(timingPoint.Time + beatLengths * beatLength);
-        }
-
         public abstract class IssueTemplateUnsnap : IssueTemplate
         {
             protected IssueTemplateUnsnap(ICheck check, IssueType type)
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 4bf4a3b8f3..9334814e2a 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -301,14 +301,17 @@ namespace osu.Game.Screens.Edit
             return list.Count - 1;
         }
 
-        public double SnapTime(double time, double? referenceTime)
+        public int SnapTimeForDivisor(double time, int beatDivisor, double? referenceTime = null)
         {
-            var timingPoint = ControlPointInfo.TimingPointAt(referenceTime ?? time);
-            var beatLength = timingPoint.BeatLength / BeatDivisor;
-
-            return timingPoint.Time + (int)Math.Round((time - timingPoint.Time) / beatLength, MidpointRounding.AwayFromZero) * beatLength;
+            return PlayableBeatmap.SnapTimeForDivisor(time, beatDivisor, referenceTime);
         }
 
+        public int SnapTimeAnyDivisor(double time, double? referenceTime = null) => PlayableBeatmap.SnapTimeAnyDivisor(time, referenceTime);
+
+        public int ClosestBeatSnapDivisor(double time, double? referenceTime = null) => PlayableBeatmap.ClosestBeatSnapDivisor(time, referenceTime);
+
+        public double SnapTime(double time, double? referenceTime) => SnapTimeForDivisor(time, BeatDivisor, referenceTime);
+
         public double GetBeatLengthAtTime(double referenceTime) => ControlPointInfo.TimingPointAt(referenceTime).BeatLength / BeatDivisor;
 
         public int BeatDivisor => beatDivisor?.Value ?? 1;
diff --git a/osu.Game/Screens/Play/GameplayBeatmap.cs b/osu.Game/Screens/Play/GameplayBeatmap.cs
index 74fbe540fa..a3a2bbd41b 100644
--- a/osu.Game/Screens/Play/GameplayBeatmap.cs
+++ b/osu.Game/Screens/Play/GameplayBeatmap.cs
@@ -45,6 +45,15 @@ namespace osu.Game.Screens.Play
 
         public double GetMostCommonBeatLength() => PlayableBeatmap.GetMostCommonBeatLength();
 
+        public int SnapTimeForDivisor(double time, int beatDivisor, double? referenceTime = null)
+        {
+            return PlayableBeatmap.SnapTimeForDivisor(time, beatDivisor, referenceTime);
+        }
+
+        public int SnapTimeAnyDivisor(double time, double? referenceTime = null) => PlayableBeatmap.SnapTimeAnyDivisor(time, referenceTime);
+
+        public int ClosestBeatSnapDivisor(double time, double? referenceTime = null) => PlayableBeatmap.ClosestBeatSnapDivisor(time, referenceTime);
+
         public IBeatmap Clone() => PlayableBeatmap.Clone();
 
         private readonly Bindable<JudgementResult> lastJudgementResult = new Bindable<JudgementResult>();

From e8d83f2f99887423d9be29ac5eea0cdb673e24b7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Apr 2021 14:33:30 +0900
Subject: [PATCH 2836/3722] Rename "EditRuleset" and "EditPlayfield" to use
 full "Editor" keyword

---
 ...eManiaEditRuleset.cs => DrawableManiaEditorRuleset.cs} | 6 +++---
 .../{ManiaEditPlayfield.cs => ManiaEditorPlayfield.cs}    | 4 ++--
 osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs    | 4 ++--
 ...wableOsuEditRuleset.cs => DrawableOsuEditorRuleset.cs} | 8 ++++----
 osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs        | 2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)
 rename osu.Game.Rulesets.Mania/Edit/{DrawableManiaEditRuleset.cs => DrawableManiaEditorRuleset.cs} (78%)
 rename osu.Game.Rulesets.Mania/Edit/{ManiaEditPlayfield.cs => ManiaEditorPlayfield.cs} (75%)
 rename osu.Game.Rulesets.Osu/Edit/{DrawableOsuEditRuleset.cs => DrawableOsuEditorRuleset.cs} (93%)

diff --git a/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditRuleset.cs b/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
similarity index 78%
rename from osu.Game.Rulesets.Mania/Edit/DrawableManiaEditRuleset.cs
rename to osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
index 445df79f6f..b0af8c503b 100644
--- a/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditRuleset.cs
+++ b/osu.Game.Rulesets.Mania/Edit/DrawableManiaEditorRuleset.cs
@@ -12,16 +12,16 @@ using osu.Game.Rulesets.UI.Scrolling;
 
 namespace osu.Game.Rulesets.Mania.Edit
 {
-    public class DrawableManiaEditRuleset : DrawableManiaRuleset
+    public class DrawableManiaEditorRuleset : DrawableManiaRuleset
     {
         public new IScrollingInfo ScrollingInfo => base.ScrollingInfo;
 
-        public DrawableManiaEditRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods)
+        public DrawableManiaEditorRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods)
             : base(ruleset, beatmap, mods)
         {
         }
 
-        protected override Playfield CreatePlayfield() => new ManiaEditPlayfield(Beatmap.Stages)
+        protected override Playfield CreatePlayfield() => new ManiaEditorPlayfield(Beatmap.Stages)
         {
             Anchor = Anchor.Centre,
             Origin = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaEditPlayfield.cs b/osu.Game.Rulesets.Mania/Edit/ManiaEditorPlayfield.cs
similarity index 75%
rename from osu.Game.Rulesets.Mania/Edit/ManiaEditPlayfield.cs
rename to osu.Game.Rulesets.Mania/Edit/ManiaEditorPlayfield.cs
index a42f793a77..186d50716e 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaEditPlayfield.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaEditorPlayfield.cs
@@ -7,9 +7,9 @@ using System.Collections.Generic;
 
 namespace osu.Game.Rulesets.Mania.Edit
 {
-    public class ManiaEditPlayfield : ManiaPlayfield
+    public class ManiaEditorPlayfield : ManiaPlayfield
     {
-        public ManiaEditPlayfield(List<StageDefinition> stages)
+        public ManiaEditorPlayfield(List<StageDefinition> stages)
             : base(stages)
         {
         }
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index d9570bf8be..2baec95c94 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Mania.Edit
 {
     public class ManiaHitObjectComposer : HitObjectComposer<ManiaHitObject>
     {
-        private DrawableManiaEditRuleset drawableRuleset;
+        private DrawableManiaEditorRuleset drawableRuleset;
         private ManiaBeatSnapGrid beatSnapGrid;
         private InputManager inputManager;
 
@@ -80,7 +80,7 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         protected override DrawableRuleset<ManiaHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
         {
-            drawableRuleset = new DrawableManiaEditRuleset(ruleset, beatmap, 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);
diff --git a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditorRuleset.cs
similarity index 93%
rename from osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
rename to osu.Game.Rulesets.Osu/Edit/DrawableOsuEditorRuleset.cs
index b8d0637e90..7227e2b511 100644
--- a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
+++ b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditorRuleset.cs
@@ -17,18 +17,18 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Edit
 {
-    public class DrawableOsuEditRuleset : DrawableOsuRuleset
+    public class DrawableOsuEditorRuleset : DrawableOsuRuleset
     {
-        public DrawableOsuEditRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods)
+        public DrawableOsuEditorRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods)
             : base(ruleset, beatmap, mods)
         {
         }
 
-        protected override Playfield CreatePlayfield() => new OsuEditPlayfield();
+        protected override Playfield CreatePlayfield() => new OsuEditorPlayfield();
 
         public override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new OsuPlayfieldAdjustmentContainer { Size = Vector2.One };
 
-        private class OsuEditPlayfield : OsuPlayfield
+        private class OsuEditorPlayfield : OsuPlayfield
         {
             private Bindable<bool> hitAnimations;
 
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 396fd41377..7b67d7aaf1 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         }
 
         protected override DrawableRuleset<OsuHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
-            => new DrawableOsuEditRuleset(ruleset, beatmap, mods);
+            => new DrawableOsuEditorRuleset(ruleset, beatmap, mods);
 
         protected override IReadOnlyList<HitObjectCompositionTool> CompositionTools => new HitObjectCompositionTool[]
         {

From bda8f68da45a8645a07abd6c5fc1d7e5a2478156 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 26 Apr 2021 15:03:43 +0900
Subject: [PATCH 2837/3722] Add failing test

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index 2cc031405e..590d159300 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -34,6 +34,18 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private List<JudgementResult> judgementResults;
 
+        [Test]
+        public void TestPressBothKeysSimultaneouslyAndReleaseOne()
+        {
+            performTest(new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Position = Vector2.Zero, Actions = { OsuAction.LeftButton, OsuAction.RightButton }, Time = time_slider_start },
+                new OsuReplayFrame { Position = Vector2.Zero, Actions = { OsuAction.RightButton }, Time = time_during_slide_1 },
+            });
+
+            AddAssert("Tracking retained", assertMaxJudge);
+        }
+
         /// <summary>
         /// Scenario:
         /// - Press a key before a slider starts

From 6182181ea1d3f1a6809d8631341ef2addbfbd3d4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 26 Apr 2021 15:20:29 +0900
Subject: [PATCH 2838/3722] Fix simultaneous slider input not allowing both
 keys

---
 .../Skinning/Default/SliderBall.cs                  | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs
index 82b677e12c..b85610491c 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.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;
@@ -134,6 +135,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
         /// </summary>
         private double? timeToAcceptAnyKeyAfter;
 
+        /// <summary>
+        /// The actions that were pressed in the previous frame.
+        /// </summary>
+        private readonly List<OsuAction> lastPressedActions = new List<OsuAction>();
+
         protected override void Update()
         {
             base.Update();
@@ -152,8 +158,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             {
                 var otherKey = headCircleHitAction == OsuAction.RightButton ? OsuAction.LeftButton : OsuAction.RightButton;
 
-                // we can return to accepting all keys if the initial head circle key is the *only* key pressed, or all keys have been released.
-                if (actions?.Contains(otherKey) != true)
+                // we can return to accepting all other keys if they were released in the previous frame.
+                if (!lastPressedActions.Contains(otherKey))
                     timeToAcceptAnyKeyAfter = Time.Current;
             }
 
@@ -164,6 +170,9 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
                 lastScreenSpaceMousePosition.HasValue && followCircle.ReceivePositionalInputAt(lastScreenSpaceMousePosition.Value) &&
                 // valid action
                 (actions?.Any(isValidTrackingAction) ?? false);
+
+            lastPressedActions.Clear();
+            lastPressedActions.AddRange(actions);
         }
 
         /// <summary>

From aa7ade8186df4033412bf93db2b970c5ae18a8fc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Apr 2021 15:22:17 +0900
Subject: [PATCH 2839/3722] Expose presence of `MainCirclePiece` via an
 interface

---
 .../Objects/Drawables/DrawableHitCircle.cs           |  2 +-
 .../Objects/Drawables/DrawableSliderRepeat.cs        |  2 +-
 .../Objects/Drawables/DrawableSliderTail.cs          | 11 ++++++-----
 .../Skinning/Default/IHasMainCirclePiece.cs          | 12 ++++++++++++
 4 files changed, 20 insertions(+), 7 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu/Skinning/Default/IHasMainCirclePiece.cs

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index fb6c110b3c..1bf9e76d7d 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -19,7 +19,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
-    public class DrawableHitCircle : DrawableOsuHitObject
+    public class DrawableHitCircle : DrawableOsuHitObject, IHasMainCirclePiece
     {
         public OsuAction? HitAction => HitArea.HitAction;
         protected virtual OsuSkinComponents CirclePieceComponent => OsuSkinComponents.HitCircle;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index 5af2a38559..cc7d9d1b23 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -15,7 +15,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
-    public class DrawableSliderRepeat : DrawableOsuHitObject, ITrackSnaking
+    public class DrawableSliderRepeat : DrawableOsuHitObject, ITrackSnaking, IHasMainCirclePiece
     {
         public new SliderRepeat HitObject => (SliderRepeat)base.HitObject;
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
index 84b9b881a2..d81af053d1 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
@@ -13,7 +13,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
-    public class DrawableSliderTail : DrawableOsuHitObject, IRequireTracking, ITrackSnaking
+    public class DrawableSliderTail : DrawableOsuHitObject, IRequireTracking, ITrackSnaking, IHasMainCirclePiece
     {
         public new SliderTailCircle HitObject => (SliderTailCircle)base.HitObject;
 
@@ -35,7 +35,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public bool Tracking { get; set; }
 
-        private SkinnableDrawable circlePiece;
+        public SkinnableDrawable CirclePiece { get; private set; }
+
         private Container scaleContainer;
 
         public DrawableSliderTail()
@@ -64,7 +65,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     Children = new Drawable[]
                     {
                         // no default for this; only visible in legacy skins.
-                        circlePiece = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SliderTailHitCircle), _ => Empty())
+                        CirclePiece = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SliderTailHitCircle), _ => Empty())
                     }
                 },
             };
@@ -76,7 +77,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.UpdateInitialTransforms();
 
-            circlePiece.FadeInFromZero(HitObject.TimeFadeIn);
+            CirclePiece.FadeInFromZero(HitObject.TimeFadeIn);
         }
 
         protected override void UpdateHitStateTransforms(ArmedState state)
@@ -85,7 +86,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             Debug.Assert(HitObject.HitWindows != null);
 
-            (circlePiece.Drawable as IMainCirclePiece)?.Animate(state);
+            (CirclePiece.Drawable as IMainCirclePiece)?.Animate(state);
 
             switch (state)
             {
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/IHasMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/Default/IHasMainCirclePiece.cs
new file mode 100644
index 0000000000..8bb7629542
--- /dev/null
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/IHasMainCirclePiece.cs
@@ -0,0 +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 osu.Game.Skinning;
+
+namespace osu.Game.Rulesets.Osu.Skinning.Default
+{
+    public interface IHasMainCirclePiece
+    {
+        SkinnableDrawable CirclePiece { get; }
+    }
+}

From 4da964c3f3235661b8f4b9c9d7c32cb60f3e711b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Apr 2021 15:22:42 +0900
Subject: [PATCH 2840/3722] Expose `DrawableSliderRepeat`'s arrow and move
 transforms to children

---
 .../Objects/Drawables/DrawableSliderRepeat.cs | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index cc7d9d1b23..5db012c4f8 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -28,8 +28,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public SkinnableDrawable CirclePiece { get; private set; }
 
+        public ReverseArrowPiece Arrow { get; private set; }
+
         private Drawable scaleContainer;
-        private ReverseArrowPiece arrow;
 
         public override bool DisplayResult => false;
 
@@ -57,8 +58,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 Children = new Drawable[]
                 {
                     // no default for this; only visible in legacy skins.
-                    CirclePiece = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SliderTailHitCircle), _ => Empty()),
-                    arrow = new ReverseArrowPiece(),
+                    CirclePiece = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SliderTailHitCircle), _ => Empty())
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                    },
+                    Arrow = new ReverseArrowPiece(),
                 }
             };
 
@@ -105,8 +110,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     break;
 
                 case ArmedState.Hit:
-                    this.FadeOut(animDuration, Easing.Out)
-                        .ScaleTo(Scale * 1.5f, animDuration, Easing.Out);
+                    this.FadeOut(animDuration, Easing.Out);
+
+                    Arrow.ScaleTo(Scale * 1.5f, animDuration, Easing.Out);
+                    CirclePiece.ScaleTo(Scale * 1.5f, animDuration, Easing.Out);
                     break;
             }
         }
@@ -142,18 +149,18 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
 
             float aimRotation = MathUtils.RadiansToDegrees(MathF.Atan2(aimRotationVector.Y - Position.Y, aimRotationVector.X - Position.X));
-            while (Math.Abs(aimRotation - arrow.Rotation) > 180)
-                aimRotation += aimRotation < arrow.Rotation ? 360 : -360;
+            while (Math.Abs(aimRotation - Arrow.Rotation) > 180)
+                aimRotation += aimRotation < Arrow.Rotation ? 360 : -360;
 
             if (!hasRotation)
             {
-                arrow.Rotation = aimRotation;
+                Arrow.Rotation = aimRotation;
                 hasRotation = true;
             }
             else
             {
                 // If we're already snaking, interpolate to smooth out sharp curves (linear sliders, mainly).
-                arrow.Rotation = Interpolation.ValueAt(Math.Clamp(Clock.ElapsedFrameTime, 0, 100), arrow.Rotation, aimRotation, 0, 50, Easing.OutQuint);
+                Arrow.Rotation = Interpolation.ValueAt(Math.Clamp(Clock.ElapsedFrameTime, 0, 100), Arrow.Rotation, aimRotation, 0, 50, Easing.OutQuint);
             }
         }
     }

From 8795c5f0824e1f1cd9b1aae00d429ac2968713f8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Apr 2021 15:23:21 +0900
Subject: [PATCH 2841/3722] Update osu! editor transform logic to allow
 adjustments to `DrawableSliderRepeat` and `DrawableSliderTail`

---
 .../Edit/DrawableOsuEditorRuleset.cs          | 63 ++++++++++---------
 1 file changed, 33 insertions(+), 30 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditorRuleset.cs b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditorRuleset.cs
index 7227e2b511..aeeae84d14 100644
--- a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditorRuleset.cs
+++ b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditorRuleset.cs
@@ -11,6 +11,7 @@ using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Skinning.Default;
 using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.UI;
 using osuTK;
@@ -56,43 +57,45 @@ namespace osu.Game.Rulesets.Osu.Edit
                 if (state == ArmedState.Idle || hitAnimations.Value)
                     return;
 
-                // adjust the visuals of certain object types to make them stay on screen for longer than usual.
-                switch (hitObject)
+                if (hitObject is DrawableHitCircle circle)
                 {
-                    default:
-                        // there are quite a few drawable hit types we don't want to extend (spinners, ticks etc.)
-                        return;
+                    circle.ApproachCircle
+                          .FadeOutFromOne(editor_hit_object_fade_out_extension * 4)
+                          .Expire();
 
-                    case DrawableSlider _:
-                        // no specifics to sliders but let them fade slower below.
-                        break;
-
-                    case DrawableHitCircle circle: // also handles slider heads
-                        circle.ApproachCircle
-                              .FadeOutFromOne(editor_hit_object_fade_out_extension * 4)
-                              .Expire();
-
-                        circle.ApproachCircle.ScaleTo(1.1f, 300, Easing.OutQuint);
-
-                        var circlePieceDrawable = circle.CirclePiece.Drawable;
-
-                        // clear any explode animation logic.
-                        circlePieceDrawable.ApplyTransformsAt(circle.HitStateUpdateTime, true);
-                        circlePieceDrawable.ClearTransformsAfter(circle.HitStateUpdateTime, true);
-
-                        break;
+                    circle.ApproachCircle.ScaleTo(1.1f, 300, Easing.OutQuint);
                 }
 
-                // Get the existing fade out transform
-                var existing = hitObject.Transforms.LastOrDefault(t => t.TargetMember == nameof(Alpha));
+                if (hitObject is IHasMainCirclePiece mainPieceContainer)
+                {
+                    // clear any explode animation logic.
+                    mainPieceContainer.CirclePiece.ApplyTransformsAt(hitObject.HitStateUpdateTime, true);
+                    mainPieceContainer.CirclePiece.ClearTransformsAfter(hitObject.HitStateUpdateTime, true);
+                }
 
-                if (existing == null)
-                    return;
+                if (hitObject is DrawableSliderRepeat repeat)
+                {
+                    repeat.Arrow.ApplyTransformsAt(hitObject.HitStateUpdateTime, true);
+                    repeat.Arrow.ClearTransformsAfter(hitObject.HitStateUpdateTime, true);
+                }
 
-                hitObject.RemoveTransform(existing);
+                // adjust the visuals of top-level object types to make them stay on screen for longer than usual.
+                switch (hitObject)
+                {
+                    case DrawableSlider _:
+                    case DrawableHitCircle _:
+                        // Get the existing fade out transform
+                        var existing = hitObject.Transforms.LastOrDefault(t => t.TargetMember == nameof(Alpha));
 
-                using (hitObject.BeginAbsoluteSequence(hitObject.HitStateUpdateTime))
-                    hitObject.FadeOut(editor_hit_object_fade_out_extension).Expire();
+                        if (existing == null)
+                            return;
+
+                        hitObject.RemoveTransform(existing);
+
+                        using (hitObject.BeginAbsoluteSequence(hitObject.HitStateUpdateTime))
+                            hitObject.FadeOut(editor_hit_object_fade_out_extension).Expire();
+                        break;
+                }
             }
         }
     }

From d10aac851debb1a7b185a855f76c491833e193ea Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Apr 2021 15:30:22 +0900
Subject: [PATCH 2842/3722] Extract scale constant

---
 .../Objects/Drawables/DrawableSliderRepeat.cs               | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
index 5db012c4f8..7b4188edab 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderRepeat.cs
@@ -112,8 +112,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 case ArmedState.Hit:
                     this.FadeOut(animDuration, Easing.Out);
 
-                    Arrow.ScaleTo(Scale * 1.5f, animDuration, Easing.Out);
-                    CirclePiece.ScaleTo(Scale * 1.5f, 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;
             }
         }

From f70e45b1998a97dd8421f0f046c7efcada54d40b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 26 Apr 2021 15:35:08 +0900
Subject: [PATCH 2843/3722] Prevent adding null enumerable

---
 osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs
index b85610491c..c5c95557e6 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs
@@ -172,7 +172,8 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
                 (actions?.Any(isValidTrackingAction) ?? false);
 
             lastPressedActions.Clear();
-            lastPressedActions.AddRange(actions);
+            if (actions != null)
+                lastPressedActions.AddRange(actions);
         }
 
         /// <summary>

From fd5fbaf0dbc5dcf7d5fe475f4ac7c88fe80edbb7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 26 Apr 2021 15:37:42 +0900
Subject: [PATCH 2844/3722] Rename ruleset wrapper class

---
 ...eEditRulesetWrapper.cs => DrawableEditorRulesetWrapper.cs} | 4 ++--
 osu.Game/Rulesets/Edit/HitObjectComposer.cs                   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename osu.Game/Rulesets/Edit/{DrawableEditRulesetWrapper.cs => DrawableEditorRulesetWrapper.cs} (94%)

diff --git a/osu.Game/Rulesets/Edit/DrawableEditRulesetWrapper.cs b/osu.Game/Rulesets/Edit/DrawableEditorRulesetWrapper.cs
similarity index 94%
rename from osu.Game/Rulesets/Edit/DrawableEditRulesetWrapper.cs
rename to osu.Game/Rulesets/Edit/DrawableEditorRulesetWrapper.cs
index c60d4c7834..62e2539c2a 100644
--- a/osu.Game/Rulesets/Edit/DrawableEditRulesetWrapper.cs
+++ b/osu.Game/Rulesets/Edit/DrawableEditorRulesetWrapper.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Edit
     /// <summary>
     /// A wrapper for a <see cref="DrawableRuleset{TObject}"/>. Handles adding visual representations of <see cref="HitObject"/>s to the underlying <see cref="DrawableRuleset{TObject}"/>.
     /// </summary>
-    internal class DrawableEditRulesetWrapper<TObject> : CompositeDrawable
+    internal class DrawableEditorRulesetWrapper<TObject> : CompositeDrawable
         where TObject : HitObject
     {
         public Playfield Playfield => drawableRuleset.Playfield;
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Edit
         [Resolved]
         private EditorBeatmap beatmap { get; set; }
 
-        public DrawableEditRulesetWrapper(DrawableRuleset<TObject> drawableRuleset)
+        public DrawableEditorRulesetWrapper(DrawableRuleset<TObject> drawableRuleset)
         {
             this.drawableRuleset = drawableRuleset;
 
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 736fc47dee..35896d4982 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Rulesets.Edit
 
         protected ComposeBlueprintContainer BlueprintContainer { get; private set; }
 
-        private DrawableEditRulesetWrapper<TObject> drawableRulesetWrapper;
+        private DrawableEditorRulesetWrapper<TObject> drawableRulesetWrapper;
 
         protected readonly Container LayerBelowRuleset = new Container { RelativeSizeAxes = Axes.Both };
 
@@ -76,7 +76,7 @@ namespace osu.Game.Rulesets.Edit
 
             try
             {
-                drawableRulesetWrapper = new DrawableEditRulesetWrapper<TObject>(CreateDrawableRuleset(Ruleset, EditorBeatmap.PlayableBeatmap, new[] { Ruleset.GetAutoplayMod() }))
+                drawableRulesetWrapper = new DrawableEditorRulesetWrapper<TObject>(CreateDrawableRuleset(Ruleset, EditorBeatmap.PlayableBeatmap, new[] { Ruleset.GetAutoplayMod() }))
                 {
                     Clock = EditorClock,
                     ProcessCustomClock = false

From 0d0b4ea78a8a07be1ac472641f8123e26f1a4bdf Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 26 Apr 2021 15:47:37 +0900
Subject: [PATCH 2845/3722] Rewrite comment to hopefully be more readable

---
 osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs
index c5c95557e6..8feeca56e8 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SliderBall.cs
@@ -158,7 +158,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
             {
                 var otherKey = headCircleHitAction == OsuAction.RightButton ? OsuAction.LeftButton : OsuAction.RightButton;
 
-                // we can return to accepting all other keys if they were released in the previous frame.
+                // we can start accepting any key once all other keys have been released in the previous frame.
                 if (!lastPressedActions.Contains(otherKey))
                     timeToAcceptAnyKeyAfter = Time.Current;
             }

From aa99c192d025240f6571eb87f856d3235e07e91c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Apr 2021 16:21:12 +0900
Subject: [PATCH 2846/3722] Fix type in inline comment

---
 .../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 aac03622e3..0cd3b448d2 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -421,7 +421,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             {
                 StartPlay();
 
-                // If the current user was host, they started the match and the in-progres operation needs to be stopped now.
+                // If the current user was host, they started the match and the in-progress operation needs to be stopped now.
                 readyClickOperation?.Dispose();
                 readyClickOperation = null;
             }

From 6d30a1a80f5f7e19893a6340c23aca44b0f20a47 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Apr 2021 16:45:20 +0900
Subject: [PATCH 2847/3722] Reference constant for test startup delay

---
 .../Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
index 9cc8eaf876..82bbc7b6d3 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
@@ -17,6 +17,7 @@ using osu.Game.Online.Spectator;
 using osu.Game.Replays.Legacy;
 using osu.Game.Scoring;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync;
 using osu.Game.Screens.Play;
 using osu.Game.Tests.Beatmaps.IO;
 using osu.Game.Users;
@@ -128,7 +129,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         }
 
         [Test]
-        public void TestPlayersDoNotStartSimultaneouslyIfBufferingFor15Seconds()
+        public void TestPlayersDoNotStartSimultaneouslyIfBufferingForMaximumStartDelay()
         {
             start(new[] { 55, 56 });
             loadSpectateScreen();
@@ -138,8 +139,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
             checkPausedInstant(55, true);
             checkPausedInstant(56, true);
 
-            // Wait 15 seconds...
-            AddWaitStep("wait 15 seconds", (int)(15000 / TimePerAction));
+            // Wait for the start delay seconds...
+            AddWaitStep("wait maximum start delay seconds", (int)(CatchUpSyncManager.MAXIMUM_START_DELAY / TimePerAction));
 
             // Player 1 should start playing by itself, player 2 should remain paused.
             checkPausedInstant(55, false);

From 55f383c71ea4577017c85b229bfc1127434b229a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Apr 2021 16:48:32 +0900
Subject: [PATCH 2848/3722] Rename test to match new
 `MultiSpectatorLeaderboard` class name

---
 ...orLeaderboard.cs => TestSceneMultiSpectatorLeaderboard.cs} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename osu.Game.Tests/Visual/Multiplayer/{TestSceneMultiplayerSpectatorLeaderboard.cs => TestSceneMultiSpectatorLeaderboard.cs} (98%)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
similarity index 98%
rename from osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs
rename to osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
index 8368186219..da76adf83f 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectatorLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
@@ -24,7 +24,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneMultiplayerSpectatorLeaderboard : MultiplayerTestScene
+    public class TestSceneMultiSpectatorLeaderboard : MultiplayerTestScene
     {
         [Cached(typeof(SpectatorStreamingClient))]
         private TestSpectatorStreamingClient streamingClient = new TestSpectatorStreamingClient();
@@ -41,7 +41,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             { 56, new ManualClock() }
         };
 
-        public TestSceneMultiplayerSpectatorLeaderboard()
+        public TestSceneMultiSpectatorLeaderboard()
         {
             base.Content.AddRange(new Drawable[]
             {

From 737a15c2d4c549423d763f29b93680a1391606a5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Apr 2021 17:04:39 +0900
Subject: [PATCH 2849/3722] Extract out test player IDs to constants

---
 .../TestSceneMultiSpectatorScreen.cs          | 133 +++++++++---------
 1 file changed, 68 insertions(+), 65 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
index 82bbc7b6d3..512311ff03 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
@@ -47,6 +47,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
         private BeatmapInfo importedBeatmap;
         private int importedBeatmapId;
 
+        private const int player_1_id = 55;
+        private const int player_2_id = 56;
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -80,29 +83,29 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             AddStep("start players silently", () =>
             {
-                Client.CurrentMatchPlayingUserIds.Add(55);
-                Client.CurrentMatchPlayingUserIds.Add(56);
-                playingUserIds.Add(55);
-                playingUserIds.Add(56);
-                nextFrame[55] = 0;
-                nextFrame[56] = 0;
+                Client.CurrentMatchPlayingUserIds.Add(player_1_id);
+                Client.CurrentMatchPlayingUserIds.Add(player_2_id);
+                playingUserIds.Add(player_1_id);
+                playingUserIds.Add(player_2_id);
+                nextFrame[player_1_id] = 0;
+                nextFrame[player_2_id] = 0;
             });
 
             loadSpectateScreen(false);
 
             AddWaitStep("wait a bit", 10);
-            AddStep("load player 55", () => streamingClient.StartPlay(55, importedBeatmapId));
+            AddStep("load player first_player_id", () => streamingClient.StartPlay(player_1_id, importedBeatmapId));
             AddUntilStep("one player added", () => spectatorScreen.ChildrenOfType<Player>().Count() == 1);
 
             AddWaitStep("wait a bit", 10);
-            AddStep("load player 56", () => streamingClient.StartPlay(56, importedBeatmapId));
+            AddStep("load player second_player_id", () => streamingClient.StartPlay(player_2_id, importedBeatmapId));
             AddUntilStep("two players added", () => spectatorScreen.ChildrenOfType<Player>().Count() == 2);
         }
 
         [Test]
         public void TestGeneral()
         {
-            int[] userIds = Enumerable.Range(0, 4).Select(i => 55 + i).ToArray();
+            int[] userIds = Enumerable.Range(0, 4).Select(i => player_1_id + i).ToArray();
 
             start(userIds);
             loadSpectateScreen();
@@ -114,123 +117,123 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Test]
         public void TestPlayersMustStartSimultaneously()
         {
-            start(new[] { 55, 56 });
+            start(new[] { player_1_id, player_2_id });
             loadSpectateScreen();
 
             // Send frames for one player only, both should remain paused.
-            sendFrames(55, 20);
-            checkPausedInstant(55, true);
-            checkPausedInstant(56, true);
+            sendFrames(player_1_id, 20);
+            checkPausedInstant(player_1_id, true);
+            checkPausedInstant(player_2_id, true);
 
             // Send frames for the other player, both should now start playing.
-            sendFrames(56, 20);
-            checkPausedInstant(55, false);
-            checkPausedInstant(56, false);
+            sendFrames(player_2_id, 20);
+            checkPausedInstant(player_1_id, false);
+            checkPausedInstant(player_2_id, false);
         }
 
         [Test]
         public void TestPlayersDoNotStartSimultaneouslyIfBufferingForMaximumStartDelay()
         {
-            start(new[] { 55, 56 });
+            start(new[] { player_1_id, player_2_id });
             loadSpectateScreen();
 
             // Send frames for one player only, both should remain paused.
-            sendFrames(55, 1000);
-            checkPausedInstant(55, true);
-            checkPausedInstant(56, true);
+            sendFrames(player_1_id, 1000);
+            checkPausedInstant(player_1_id, true);
+            checkPausedInstant(player_2_id, true);
 
             // Wait for the start delay seconds...
             AddWaitStep("wait maximum start delay seconds", (int)(CatchUpSyncManager.MAXIMUM_START_DELAY / TimePerAction));
 
             // Player 1 should start playing by itself, player 2 should remain paused.
-            checkPausedInstant(55, false);
-            checkPausedInstant(56, true);
+            checkPausedInstant(player_1_id, false);
+            checkPausedInstant(player_2_id, true);
         }
 
         [Test]
         public void TestPlayersContinueWhileOthersBuffer()
         {
-            start(new[] { 55, 56 });
+            start(new[] { player_1_id, player_2_id });
             loadSpectateScreen();
 
             // Send initial frames for both players. A few more for player 1.
-            sendFrames(55, 20);
-            sendFrames(56, 10);
-            checkPausedInstant(55, false);
-            checkPausedInstant(56, false);
+            sendFrames(player_1_id, 20);
+            sendFrames(player_2_id, 10);
+            checkPausedInstant(player_1_id, false);
+            checkPausedInstant(player_2_id, false);
 
             // Eventually player 2 will pause, player 1 must remain running.
-            checkPaused(56, true);
-            checkPausedInstant(55, false);
+            checkPaused(player_2_id, true);
+            checkPausedInstant(player_1_id, false);
 
             // Eventually both players will run out of frames and should pause.
-            checkPaused(55, true);
-            checkPausedInstant(56, true);
+            checkPaused(player_1_id, true);
+            checkPausedInstant(player_2_id, true);
 
             // Send more frames for the first player only. Player 1 should start playing with player 2 remaining paused.
-            sendFrames(55, 20);
-            checkPausedInstant(56, true);
-            checkPausedInstant(55, false);
+            sendFrames(player_1_id, 20);
+            checkPausedInstant(player_2_id, true);
+            checkPausedInstant(player_1_id, false);
 
             // Send more frames for the second player. Both should be playing
-            sendFrames(56, 20);
-            checkPausedInstant(56, false);
-            checkPausedInstant(55, false);
+            sendFrames(player_2_id, 20);
+            checkPausedInstant(player_2_id, false);
+            checkPausedInstant(player_1_id, false);
         }
 
         [Test]
         public void TestPlayersCatchUpAfterFallingBehind()
         {
-            start(new[] { 55, 56 });
+            start(new[] { player_1_id, player_2_id });
             loadSpectateScreen();
 
             // Send initial frames for both players. A few more for player 1.
-            sendFrames(55, 1000);
-            sendFrames(56, 10);
-            checkPausedInstant(55, false);
-            checkPausedInstant(56, false);
+            sendFrames(player_1_id, 1000);
+            sendFrames(player_2_id, 10);
+            checkPausedInstant(player_1_id, false);
+            checkPausedInstant(player_2_id, false);
 
             // Eventually player 2 will run out of frames and should pause.
-            checkPaused(56, true);
+            checkPaused(player_2_id, true);
             AddWaitStep("wait a few more frames", 10);
 
             // Send more frames for player 2. It should unpause.
-            sendFrames(56, 1000);
-            checkPausedInstant(56, false);
+            sendFrames(player_2_id, 1000);
+            checkPausedInstant(player_2_id, false);
 
             // Player 2 should catch up to player 1 after unpausing.
-            waitForCatchup(56);
+            waitForCatchup(player_2_id);
             AddWaitStep("wait a bit", 10);
         }
 
         [Test]
         public void TestMostInSyncUserIsAudioSource()
         {
-            start(new[] { 55, 56 });
+            start(new[] { player_1_id, player_2_id });
             loadSpectateScreen();
 
-            assertVolume(55, 0);
-            assertVolume(56, 0);
+            assertVolume(player_1_id, 0);
+            assertVolume(player_2_id, 0);
 
-            sendFrames(55, 10);
-            sendFrames(56, 20);
-            assertVolume(55, 1);
-            assertVolume(56, 0);
+            sendFrames(player_1_id, 10);
+            sendFrames(player_2_id, 20);
+            assertVolume(player_1_id, 1);
+            assertVolume(player_2_id, 0);
 
-            checkPaused(55, true);
-            assertVolume(55, 0);
-            assertVolume(56, 1);
+            checkPaused(player_1_id, true);
+            assertVolume(player_1_id, 0);
+            assertVolume(player_2_id, 1);
 
-            sendFrames(55, 100);
-            waitForCatchup(55);
-            checkPaused(56, true);
-            assertVolume(55, 1);
-            assertVolume(56, 0);
+            sendFrames(player_1_id, 100);
+            waitForCatchup(player_1_id);
+            checkPaused(player_2_id, true);
+            assertVolume(player_1_id, 1);
+            assertVolume(player_2_id, 0);
 
-            sendFrames(56, 100);
-            waitForCatchup(56);
-            assertVolume(55, 1);
-            assertVolume(56, 0);
+            sendFrames(player_2_id, 100);
+            waitForCatchup(player_2_id);
+            assertVolume(player_1_id, 1);
+            assertVolume(player_2_id, 0);
         }
 
         private void loadSpectateScreen(bool waitForPlayerLoad = true)

From 5b4cb71cc782e4f8ddc2d9e1d6872ef0787f4caf Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 26 Apr 2021 17:19:44 +0900
Subject: [PATCH 2850/3722] Change terminology from "slave" to "player clock"

---
 .../OnlinePlay/TestSceneCatchUpSyncManager.cs | 104 +++++++++---------
 .../Spectate/MultiSpectatorPlayer.cs          |  18 +--
 .../Spectate/MultiSpectatorScreen.cs          |   8 +-
 .../Multiplayer/Spectate/PlayerArea.cs        |   6 +-
 ...lock.cs => CatchUpSpectatorPlayerClock.cs} |   6 +-
 .../Spectate/Sync/CatchUpSyncManager.cs       |  74 ++++++-------
 ...SlaveClock.cs => ISpectatorPlayerClock.cs} |   2 +-
 .../Multiplayer/Spectate/Sync/ISyncManager.cs |  18 +--
 8 files changed, 118 insertions(+), 118 deletions(-)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/{CatchUpSlaveClock.cs => CatchUpSpectatorPlayerClock.cs} (90%)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/{ISlaveClock.cs => ISpectatorPlayerClock.cs} (90%)

diff --git a/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs b/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
index 93801bd5d7..73ec5fb934 100644
--- a/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
+++ b/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
@@ -17,31 +17,31 @@ namespace osu.Game.Tests.OnlinePlay
         private TestManualClock master;
         private CatchUpSyncManager syncManager;
 
-        private TestSlaveClock slave1;
-        private TestSlaveClock slave2;
+        private TestSpectatorPlayerClock player1;
+        private TestSpectatorPlayerClock player2;
 
         [SetUp]
         public void Setup()
         {
             syncManager = new CatchUpSyncManager(master = new TestManualClock());
-            syncManager.AddSlave(slave1 = new TestSlaveClock(1));
-            syncManager.AddSlave(slave2 = new TestSlaveClock(2));
+            syncManager.AddPlayerClock(player1 = new TestSpectatorPlayerClock(1));
+            syncManager.AddPlayerClock(player2 = new TestSpectatorPlayerClock(2));
 
             Schedule(() => Child = syncManager);
         }
 
         [Test]
-        public void TestMasterClockStartsWhenAllSlavesHaveFrames()
+        public void TestMasterClockStartsWhenAllPlayerClocksHaveFrames()
         {
-            setWaiting(() => slave1, false);
+            setWaiting(() => player1, false);
             assertMasterState(false);
-            assertSlaveState(() => slave1, false);
-            assertSlaveState(() => slave2, false);
+            assertPlayerClockState(() => player1, false);
+            assertPlayerClockState(() => player2, false);
 
-            setWaiting(() => slave2, false);
+            setWaiting(() => player2, false);
             assertMasterState(true);
-            assertSlaveState(() => slave1, true);
-            assertSlaveState(() => slave2, true);
+            assertPlayerClockState(() => player1, true);
+            assertPlayerClockState(() => player2, true);
         }
 
         [Test]
@@ -54,115 +54,115 @@ namespace osu.Game.Tests.OnlinePlay
         [Test]
         public void TestMasterClockStartsWhenAnyReadyForMaximumDelayTime()
         {
-            setWaiting(() => slave1, false);
+            setWaiting(() => player1, false);
             AddWaitStep($"wait {CatchUpSyncManager.MAXIMUM_START_DELAY} milliseconds", (int)Math.Ceiling(CatchUpSyncManager.MAXIMUM_START_DELAY / TimePerAction));
             assertMasterState(true);
         }
 
         [Test]
-        public void TestSlaveDoesNotCatchUpWhenSlightlyOutOfSync()
+        public void TestPlayerClockDoesNotCatchUpWhenSlightlyOutOfSync()
         {
             setAllWaiting(false);
 
             setMasterTime(CatchUpSyncManager.SYNC_TARGET + 1);
-            assertCatchingUp(() => slave1, false);
+            assertCatchingUp(() => player1, false);
         }
 
         [Test]
-        public void TestSlaveStartsCatchingUpWhenTooFarBehind()
+        public void TestPlayerClockStartsCatchingUpWhenTooFarBehind()
         {
             setAllWaiting(false);
 
             setMasterTime(CatchUpSyncManager.MAX_SYNC_OFFSET + 1);
-            assertCatchingUp(() => slave1, true);
-            assertCatchingUp(() => slave2, true);
+            assertCatchingUp(() => player1, true);
+            assertCatchingUp(() => player2, true);
         }
 
         [Test]
-        public void TestSlaveKeepsCatchingUpWhenSlightlyOutOfSync()
+        public void TestPlayerClockKeepsCatchingUpWhenSlightlyOutOfSync()
         {
             setAllWaiting(false);
 
             setMasterTime(CatchUpSyncManager.MAX_SYNC_OFFSET + 1);
-            setSlaveTime(() => slave1, CatchUpSyncManager.SYNC_TARGET + 1);
-            assertCatchingUp(() => slave1, true);
+            setPlayerClockTime(() => player1, CatchUpSyncManager.SYNC_TARGET + 1);
+            assertCatchingUp(() => player1, true);
         }
 
         [Test]
-        public void TestSlaveStopsCatchingUpWhenInSync()
+        public void TestPlayerClockStopsCatchingUpWhenInSync()
         {
             setAllWaiting(false);
 
             setMasterTime(CatchUpSyncManager.MAX_SYNC_OFFSET + 2);
-            setSlaveTime(() => slave1, CatchUpSyncManager.SYNC_TARGET);
-            assertCatchingUp(() => slave1, false);
-            assertCatchingUp(() => slave2, true);
+            setPlayerClockTime(() => player1, CatchUpSyncManager.SYNC_TARGET);
+            assertCatchingUp(() => player1, false);
+            assertCatchingUp(() => player2, true);
         }
 
         [Test]
-        public void TestSlaveDoesNotStopWhenSlightlyAhead()
+        public void TestPlayerClockDoesNotStopWhenSlightlyAhead()
         {
             setAllWaiting(false);
 
-            setSlaveTime(() => slave1, -CatchUpSyncManager.SYNC_TARGET);
-            assertCatchingUp(() => slave1, false);
-            assertSlaveState(() => slave1, true);
+            setPlayerClockTime(() => player1, -CatchUpSyncManager.SYNC_TARGET);
+            assertCatchingUp(() => player1, false);
+            assertPlayerClockState(() => player1, true);
         }
 
         [Test]
-        public void TestSlaveStopsWhenTooFarAheadAndStartsWhenBackInSync()
+        public void TestPlayerClockStopsWhenTooFarAheadAndStartsWhenBackInSync()
         {
             setAllWaiting(false);
 
-            setSlaveTime(() => slave1, -CatchUpSyncManager.SYNC_TARGET - 1);
+            setPlayerClockTime(() => player1, -CatchUpSyncManager.SYNC_TARGET - 1);
 
             // This is a silent catchup, where IsCatchingUp = false but IsRunning = false also.
-            assertCatchingUp(() => slave1, false);
-            assertSlaveState(() => slave1, false);
+            assertCatchingUp(() => player1, false);
+            assertPlayerClockState(() => player1, false);
 
             setMasterTime(1);
-            assertCatchingUp(() => slave1, false);
-            assertSlaveState(() => slave1, true);
+            assertCatchingUp(() => player1, false);
+            assertPlayerClockState(() => player1, true);
         }
 
         [Test]
-        public void TestInSyncSlaveDoesNotStartIfWaitingOnFrames()
+        public void TestInSyncPlayerClockDoesNotStartIfWaitingOnFrames()
         {
             setAllWaiting(false);
 
-            assertSlaveState(() => slave1, true);
-            setWaiting(() => slave1, true);
-            assertSlaveState(() => slave1, false);
+            assertPlayerClockState(() => player1, true);
+            setWaiting(() => player1, true);
+            assertPlayerClockState(() => player1, false);
         }
 
-        private void setWaiting(Func<TestSlaveClock> slave, bool waiting)
-            => AddStep($"set slave {slave().Id} waiting = {waiting}", () => slave().WaitingOnFrames.Value = waiting);
+        private void setWaiting(Func<TestSpectatorPlayerClock> playerClock, bool waiting)
+            => AddStep($"set player clock {playerClock().Id} waiting = {waiting}", () => playerClock().WaitingOnFrames.Value = waiting);
 
-        private void setAllWaiting(bool waiting) => AddStep($"set all slaves waiting = {waiting}", () =>
+        private void setAllWaiting(bool waiting) => AddStep($"set all player clocks waiting = {waiting}", () =>
         {
-            slave1.WaitingOnFrames.Value = waiting;
-            slave2.WaitingOnFrames.Value = waiting;
+            player1.WaitingOnFrames.Value = waiting;
+            player2.WaitingOnFrames.Value = waiting;
         });
 
         private void setMasterTime(double time)
             => AddStep($"set master = {time}", () => master.Seek(time));
 
         /// <summary>
-        /// slave.Time = master.Time - offsetFromMaster
+        /// clock.Time = master.Time - offsetFromMaster
         /// </summary>
-        private void setSlaveTime(Func<TestSlaveClock> slave, double offsetFromMaster)
-            => AddStep($"set slave {slave().Id} = master - {offsetFromMaster}", () => slave().Seek(master.CurrentTime - offsetFromMaster));
+        private void setPlayerClockTime(Func<TestSpectatorPlayerClock> playerClock, double offsetFromMaster)
+            => AddStep($"set player clock {playerClock().Id} = master - {offsetFromMaster}", () => playerClock().Seek(master.CurrentTime - offsetFromMaster));
 
         private void assertMasterState(bool running)
             => AddAssert($"master clock {(running ? "is" : "is not")} running", () => master.IsRunning == running);
 
-        private void assertCatchingUp(Func<TestSlaveClock> slave, bool catchingUp) =>
-            AddAssert($"slave {slave().Id} {(catchingUp ? "is" : "is not")} catching up", () => slave().IsCatchingUp == catchingUp);
+        private void assertCatchingUp(Func<TestSpectatorPlayerClock> playerClock, bool catchingUp) =>
+            AddAssert($"player clock {playerClock().Id} {(catchingUp ? "is" : "is not")} catching up", () => playerClock().IsCatchingUp == catchingUp);
 
-        private void assertSlaveState(Func<TestSlaveClock> slave, bool running)
-            => AddAssert($"slave {slave().Id} {(running ? "is" : "is not")} running", () => slave().IsRunning == running);
+        private void assertPlayerClockState(Func<TestSpectatorPlayerClock> playerClock, bool running)
+            => AddAssert($"player clock {playerClock().Id} {(running ? "is" : "is not")} running", () => playerClock().IsRunning == running);
 
-        private class TestSlaveClock : TestManualClock, ISlaveClock
+        private class TestSpectatorPlayerClock : TestManualClock, ISpectatorPlayerClock
         {
             public Bindable<bool> WaitingOnFrames { get; } = new Bindable<bool>(true);
 
@@ -170,7 +170,7 @@ namespace osu.Game.Tests.OnlinePlay
 
             public readonly int Id;
 
-            public TestSlaveClock(int id)
+            public TestSpectatorPlayerClock(int id)
             {
                 Id = id;
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
index 4ed949893c..a17519c3aa 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
@@ -19,24 +19,24 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
     {
         private readonly Bindable<bool> waitingOnFrames = new Bindable<bool>(true);
         private readonly Score score;
-        private readonly ISlaveClock slaveClock;
+        private readonly ISpectatorPlayerClock spectatorPlayerClock;
 
         /// <summary>
         /// Creates a new <see cref="MultiSpectatorPlayer"/>.
         /// </summary>
         /// <param name="score">The score containing the player's replay.</param>
-        /// <param name="slaveClock">The clock controlling the gameplay running state.</param>
-        public MultiSpectatorPlayer([NotNull] Score score, [NotNull] ISlaveClock slaveClock)
+        /// <param name="spectatorPlayerClock">The clock controlling the gameplay running state.</param>
+        public MultiSpectatorPlayer([NotNull] Score score, [NotNull] ISpectatorPlayerClock spectatorPlayerClock)
             : base(score)
         {
             this.score = score;
-            this.slaveClock = slaveClock;
+            this.spectatorPlayerClock = spectatorPlayerClock;
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            slaveClock.WaitingOnFrames.BindTo(waitingOnFrames);
+            spectatorPlayerClock.WaitingOnFrames.BindTo(waitingOnFrames);
         }
 
         protected override void UpdateAfterChildren()
@@ -48,18 +48,18 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         }
 
         protected override GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart)
-            => new SlaveGameplayClockContainer(slaveClock);
+            => new SpectatorGameplayClockContainer(spectatorPlayerClock);
 
-        private class SlaveGameplayClockContainer : GameplayClockContainer
+        private class SpectatorGameplayClockContainer : GameplayClockContainer
         {
-            public SlaveGameplayClockContainer([NotNull] IClock sourceClock)
+            public SpectatorGameplayClockContainer([NotNull] IClock sourceClock)
                 : base(sourceClock)
             {
             }
 
             protected override void Update()
             {
-                // The slave clock's running state is controlled externally, but the local pausing state needs to be updated to stop gameplay.
+                // The player clock's running state is controlled externally, but the local pausing state needs to be updated to stop gameplay.
                 if (SourceClock.IsRunning)
                     Start();
                 else
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index eb59d090be..6a8c10e336 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -79,7 +79,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             };
 
             for (int i = 0; i < UserIds.Length; i++)
-                grid.Add(instances[i] = new PlayerArea(UserIds[i], new CatchUpSlaveClock(masterClockContainer.GameplayClock)));
+                grid.Add(instances[i] = new PlayerArea(UserIds[i], new CatchUpSpectatorPlayerClock(masterClockContainer.GameplayClock)));
 
             // Todo: This is not quite correct - it should be per-user to adjust for other mod combinations.
             var playableBeatmap = Beatmap.Value.GetPlayableBeatmap(Ruleset.Value);
@@ -104,7 +104,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             if (!isCandidateAudioSource(currentAudioSource?.GameplayClock))
             {
                 currentAudioSource = instances.Where(i => isCandidateAudioSource(i.GameplayClock))
-                                              .OrderBy(i => Math.Abs(i.GameplayClock.CurrentTime - syncManager.Master.CurrentTime))
+                                              .OrderBy(i => Math.Abs(i.GameplayClock.CurrentTime - syncManager.MasterClock.CurrentTime))
                                               .FirstOrDefault();
 
                 foreach (var instance in instances)
@@ -112,7 +112,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             }
         }
 
-        private bool isCandidateAudioSource([CanBeNull] ISlaveClock clock)
+        private bool isCandidateAudioSource([CanBeNull] ISpectatorPlayerClock clock)
             => clock?.IsRunning == true && !clock.IsCatchingUp && !clock.WaitingOnFrames.Value;
 
         protected override void OnUserStateChanged(int userId, SpectatorState spectatorState)
@@ -124,7 +124,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             var instance = instances[getIndexForUser(userId)];
             instance.LoadScore(gameplayState.Score);
 
-            syncManager.AddSlave(instance.GameplayClock);
+            syncManager.AddPlayerClock(instance.GameplayClock);
             leaderboard.AddClock(instance.UserId, instance.GameplayClock);
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
index 494f182251..2accfaec0c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
@@ -35,10 +35,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         public readonly int UserId;
 
         /// <summary>
-        /// The <see cref="ISlaveClock"/> used to control the gameplay running state of a loaded <see cref="Player"/>.
+        /// The <see cref="ISpectatorPlayerClock"/> used to control the gameplay running state of a loaded <see cref="Player"/>.
         /// </summary>
         [NotNull]
-        public readonly ISlaveClock GameplayClock;
+        public readonly ISpectatorPlayerClock GameplayClock;
 
         /// <summary>
         /// The currently-loaded score.
@@ -54,7 +54,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         private readonly AudioContainer audioContainer;
         private OsuScreenStack stack;
 
-        public PlayerArea(int userId, [NotNull] ISlaveClock gameplayClock)
+        public PlayerArea(int userId, [NotNull] ISpectatorPlayerClock gameplayClock)
         {
             UserId = userId;
             GameplayClock = gameplayClock;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSlaveClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSpectatorPlayerClock.cs
similarity index 90%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSlaveClock.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSpectatorPlayerClock.cs
index 21241f8158..a8ed7b415f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSlaveClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSpectatorPlayerClock.cs
@@ -8,9 +8,9 @@ using osu.Framework.Timing;
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
 {
     /// <summary>
-    /// A <see cref="ISlaveClock"/> which catches up using rate adjustment.
+    /// A <see cref="ISpectatorPlayerClock"/> which catches up using rate adjustment.
     /// </summary>
-    public class CatchUpSlaveClock : ISlaveClock
+    public class CatchUpSpectatorPlayerClock : ISpectatorPlayerClock
     {
         /// <summary>
         /// The catch up rate.
@@ -19,7 +19,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
 
         private readonly IFrameBasedClock masterClock;
 
-        public CatchUpSlaveClock(IFrameBasedClock masterClock)
+        public CatchUpSpectatorPlayerClock(IFrameBasedClock masterClock)
         {
             this.masterClock = masterClock;
         }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSyncManager.cs
index 1d3fcd824c..f5c780e8b1 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSyncManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSyncManager.cs
@@ -9,46 +9,46 @@ using osu.Framework.Timing;
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
 {
     /// <summary>
-    /// A <see cref="ISyncManager"/> which synchronises de-synced slave clocks through catchup.
+    /// A <see cref="ISyncManager"/> which synchronises de-synced player clocks through catchup.
     /// </summary>
     public class CatchUpSyncManager : Component, ISyncManager
     {
         /// <summary>
-        /// The offset from the master clock to which slaves should be synchronised to.
+        /// The offset from the master clock to which player clocks should be synchronised to.
         /// </summary>
         public const double SYNC_TARGET = 16;
 
         /// <summary>
-        /// The offset from the master clock at which slaves begin resynchronising.
+        /// The offset from the master clock at which player clocks begin resynchronising.
         /// </summary>
         public const double MAX_SYNC_OFFSET = 50;
 
         /// <summary>
-        /// The maximum delay to start gameplay, if any (but not all) slaves are ready.
+        /// The maximum delay to start gameplay, if any (but not all) player clocks are ready.
         /// </summary>
         public const double MAXIMUM_START_DELAY = 15000;
 
         /// <summary>
-        /// The master clock which is used to control the timing of all slave clocks.
+        /// The master clock which is used to control the timing of all player clocks clocks.
         /// </summary>
-        public IAdjustableClock Master { get; }
+        public IAdjustableClock MasterClock { get; }
 
         /// <summary>
-        /// The slave clocks.
+        /// The player clocks.
         /// </summary>
-        private readonly List<ISlaveClock> slaves = new List<ISlaveClock>();
+        private readonly List<ISpectatorPlayerClock> playerClocks = new List<ISpectatorPlayerClock>();
 
         private bool hasStarted;
         private double? firstStartAttemptTime;
 
         public CatchUpSyncManager(IAdjustableClock master)
         {
-            Master = master;
+            MasterClock = master;
         }
 
-        public void AddSlave(ISlaveClock clock) => slaves.Add(clock);
+        public void AddPlayerClock(ISpectatorPlayerClock clock) => playerClocks.Add(clock);
 
-        public void RemoveSlave(ISlaveClock clock) => slaves.Remove(clock);
+        public void RemovePlayerClock(ISpectatorPlayerClock clock) => playerClocks.Remove(clock);
 
         protected override void Update()
         {
@@ -56,9 +56,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
 
             if (!attemptStart())
             {
-                // Ensure all slaves are stopped until the start succeeds.
-                foreach (var slave in slaves)
-                    slave.Stop();
+                // Ensure all player clocks are stopped until the start succeeds.
+                foreach (var clock in playerClocks)
+                    clock.Stop();
                 return;
             }
 
@@ -67,7 +67,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
         }
 
         /// <summary>
-        /// Attempts to start playback. Awaits for all slaves to have available frames for up to <see cref="MAXIMUM_START_DELAY"/> milliseconds.
+        /// Attempts to start playback. Waits for all player clocks to have available frames for up to <see cref="MAXIMUM_START_DELAY"/> milliseconds.
         /// </summary>
         /// <returns>Whether playback was started and syncing should occur.</returns>
         private bool attemptStart()
@@ -75,14 +75,14 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
             if (hasStarted)
                 return true;
 
-            if (slaves.Count == 0)
+            if (playerClocks.Count == 0)
                 return false;
 
             firstStartAttemptTime ??= Time.Current;
 
-            int readyCount = slaves.Count(s => !s.WaitingOnFrames.Value);
+            int readyCount = playerClocks.Count(s => !s.WaitingOnFrames.Value);
 
-            if (readyCount == slaves.Count)
+            if (readyCount == playerClocks.Count)
                 return hasStarted = true;
 
             if (readyCount > 0 && (Time.Current - firstStartAttemptTime) > MAXIMUM_START_DELAY)
@@ -92,38 +92,38 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
         }
 
         /// <summary>
-        /// Updates the catchup states of all slave clocks.
+        /// Updates the catchup states of all player clocks clocks.
         /// </summary>
         private void updateCatchup()
         {
-            for (int i = 0; i < slaves.Count; i++)
+            for (int i = 0; i < playerClocks.Count; i++)
             {
-                var slave = slaves[i];
-                double timeDelta = Master.CurrentTime - slave.CurrentTime;
+                var clock = playerClocks[i];
+                double timeDelta = MasterClock.CurrentTime - clock.CurrentTime;
 
-                // Check that the slave isn't too far ahead.
-                // This is a quiet case in which the catchup is done by the master clock, so IsCatchingUp is not set on the slave.
+                // Check that the player clock isn't too far ahead.
+                // This is a quiet case in which the catchup is done by the master clock, so IsCatchingUp is not set on the player clock.
                 if (timeDelta < -SYNC_TARGET)
                 {
-                    slave.Stop();
+                    clock.Stop();
                     continue;
                 }
 
-                // Make sure the slave is running if it can.
-                if (!slave.WaitingOnFrames.Value)
-                    slave.Start();
+                // Make sure the player clock is running if it can.
+                if (!clock.WaitingOnFrames.Value)
+                    clock.Start();
 
-                if (slave.IsCatchingUp)
+                if (clock.IsCatchingUp)
                 {
-                    // Stop the slave from catching up if it's within the sync target.
+                    // Stop the player clock from catching up if it's within the sync target.
                     if (timeDelta <= SYNC_TARGET)
-                        slave.IsCatchingUp = false;
+                        clock.IsCatchingUp = false;
                 }
                 else
                 {
-                    // Make the slave start catching up if it's exceeded the maximum allowable sync offset.
+                    // Make the player clock start catching up if it's exceeded the maximum allowable sync offset.
                     if (timeDelta > MAX_SYNC_OFFSET)
-                        slave.IsCatchingUp = true;
+                        clock.IsCatchingUp = true;
                 }
             }
         }
@@ -133,14 +133,14 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
         /// </summary>
         private void updateMasterClock()
         {
-            bool anyInSync = slaves.Any(s => !s.IsCatchingUp);
+            bool anyInSync = playerClocks.Any(s => !s.IsCatchingUp);
 
-            if (Master.IsRunning != anyInSync)
+            if (MasterClock.IsRunning != anyInSync)
             {
                 if (anyInSync)
-                    Master.Start();
+                    MasterClock.Start();
                 else
-                    Master.Stop();
+                    MasterClock.Stop();
             }
         }
     }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISlaveClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorPlayerClock.cs
similarity index 90%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISlaveClock.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorPlayerClock.cs
index 6b7a4f5221..46f80288c6 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISlaveClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorPlayerClock.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
     /// <summary>
     /// A clock which is used by <see cref="MultiSpectatorPlayer"/>s and managed by an <see cref="ISyncManager"/>.
     /// </summary>
-    public interface ISlaveClock : IFrameBasedClock, IAdjustableClock
+    public interface ISpectatorPlayerClock : IFrameBasedClock, IAdjustableClock
     {
         /// <summary>
         /// Whether this clock is waiting on frames to continue playback.
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISyncManager.cs
index d63ac7e1ca..1b83ea8cf3 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISyncManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISyncManager.cs
@@ -6,25 +6,25 @@ using osu.Framework.Timing;
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
 {
     /// <summary>
-    /// Manages the synchronisation between one or more <see cref="ISlaveClock"/>s in relation to a master clock.
+    /// Manages the synchronisation between one or more <see cref="ISpectatorPlayerClock"/>s in relation to a master clock.
     /// </summary>
     public interface ISyncManager
     {
         /// <summary>
-        /// The master clock which slaves should synchronise to.
+        /// The master clock which player clocks should synchronise to.
         /// </summary>
-        IAdjustableClock Master { get; }
+        IAdjustableClock MasterClock { get; }
 
         /// <summary>
-        /// Adds an <see cref="ISlaveClock"/> to manage.
+        /// Adds an <see cref="ISpectatorPlayerClock"/> to manage.
         /// </summary>
-        /// <param name="clock">The <see cref="ISlaveClock"/> to add.</param>
-        void AddSlave(ISlaveClock clock);
+        /// <param name="clock">The <see cref="ISpectatorPlayerClock"/> to add.</param>
+        void AddPlayerClock(ISpectatorPlayerClock clock);
 
         /// <summary>
-        /// Removes an <see cref="ISlaveClock"/>, stopping it from being managed by this <see cref="ISyncManager"/>.
+        /// Removes an <see cref="ISpectatorPlayerClock"/>, stopping it from being managed by this <see cref="ISyncManager"/>.
         /// </summary>
-        /// <param name="clock">The <see cref="ISlaveClock"/> to remove.</param>
-        void RemoveSlave(ISlaveClock clock);
+        /// <param name="clock">The <see cref="ISpectatorPlayerClock"/> to remove.</param>
+        void RemovePlayerClock(ISpectatorPlayerClock clock);
     }
 }

From 120fb8974df0c4a4fcf390e7aaf8ab94d021aa2a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Apr 2021 17:22:16 +0900
Subject: [PATCH 2851/3722] Combine more instances of test player IDs

---
 .../StatefulMultiplayerClientTest.cs          |   4 +-
 .../Visual/Gameplay/TestSceneSpectator.cs     |   3 +-
 .../TestSceneMultiSpectatorLeaderboard.cs     |  42 +++---
 .../TestSceneMultiSpectatorScreen.cs          | 133 +++++++++---------
 .../TestSceneMultiplayerMatchSubScreen.cs     |   4 +-
 .../TestSceneMultiplayerSpectateButton.cs     |  10 +-
 .../Multiplayer/MultiplayerTestScene.cs       |   3 +
 7 files changed, 100 insertions(+), 99 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs b/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs
index 377a33b527..14589f8e6c 100644
--- a/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs
+++ b/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs
@@ -53,9 +53,9 @@ namespace osu.Game.Tests.NonVisual.Multiplayer
                 Client.RoomSetupAction = room =>
                 {
                     room.State = MultiplayerRoomState.Playing;
-                    room.Users.Add(new MultiplayerRoomUser(55)
+                    room.Users.Add(new MultiplayerRoomUser(PLAYER_1_ID)
                     {
-                        User = new User { Id = 55 },
+                        User = new User { Id = PLAYER_1_ID },
                         State = MultiplayerUserState.Playing
                     });
                 };
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 74ce66096e..0777571d02 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -23,6 +23,7 @@ using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Tests.Beatmaps.IO;
+using osu.Game.Tests.Visual.Multiplayer;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -238,7 +239,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         public class TestSpectatorStreamingClient : SpectatorStreamingClient
         {
-            public readonly User StreamingUser = new User { Id = 55, Username = "Test user" };
+            public readonly User StreamingUser = new User { Id = MultiplayerTestScene.PLAYER_1_ID, Username = "Test user" };
 
             public new BindableList<int> PlayingUsers => (BindableList<int>)base.PlayingUsers;
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
index da76adf83f..d3a5daeac6 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
@@ -37,8 +37,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         private readonly Dictionary<int, ManualClock> clocks = new Dictionary<int, ManualClock>
         {
-            { 55, new ManualClock() },
-            { 56, new ManualClock() }
+            { PLAYER_1_ID, new ManualClock() },
+            { PLAYER_2_ID, new ManualClock() }
         };
 
         public TestSceneMultiSpectatorLeaderboard()
@@ -95,46 +95,46 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             AddStep("send frames", () =>
             {
-                // For user 55, send frames in sets of 1.
-                // For user 56, send frames in sets of 10.
+                // For player 1, send frames in sets of 1.
+                // For player 2, send frames in sets of 10.
                 for (int i = 0; i < 100; i++)
                 {
-                    streamingClient.SendFrames(55, i, 1);
+                    streamingClient.SendFrames(PLAYER_1_ID, i, 1);
 
                     if (i % 10 == 0)
-                        streamingClient.SendFrames(56, i, 10);
+                        streamingClient.SendFrames(PLAYER_2_ID, i, 10);
                 }
             });
 
-            assertCombo(55, 1);
-            assertCombo(56, 10);
+            assertCombo(PLAYER_1_ID, 1);
+            assertCombo(PLAYER_2_ID, 10);
 
-            // Advance to a point where only user 55's frame changes.
+            // Advance to a point where only user player 1's frame changes.
             setTime(500);
-            assertCombo(55, 5);
-            assertCombo(56, 10);
+            assertCombo(PLAYER_1_ID, 5);
+            assertCombo(PLAYER_2_ID, 10);
 
             // Advance to a point where both user's frame changes.
             setTime(1100);
-            assertCombo(55, 11);
-            assertCombo(56, 20);
+            assertCombo(PLAYER_1_ID, 11);
+            assertCombo(PLAYER_2_ID, 20);
 
-            // Advance user 56 only to a point where its frame changes.
-            setTime(56, 2100);
-            assertCombo(55, 11);
-            assertCombo(56, 30);
+            // Advance user player 2 only to a point where its frame changes.
+            setTime(PLAYER_2_ID, 2100);
+            assertCombo(PLAYER_1_ID, 11);
+            assertCombo(PLAYER_2_ID, 30);
 
             // Advance both users beyond their last frame
             setTime(101 * 100);
-            assertCombo(55, 100);
-            assertCombo(56, 100);
+            assertCombo(PLAYER_1_ID, 100);
+            assertCombo(PLAYER_2_ID, 100);
         }
 
         [Test]
         public void TestNoFrames()
         {
-            assertCombo(55, 0);
-            assertCombo(56, 0);
+            assertCombo(PLAYER_1_ID, 0);
+            assertCombo(PLAYER_2_ID, 0);
         }
 
         private void setTime(double time) => AddStep($"set time {time}", () =>
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
index 512311ff03..7abeed2cbf 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
@@ -47,9 +47,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
         private BeatmapInfo importedBeatmap;
         private int importedBeatmapId;
 
-        private const int player_1_id = 55;
-        private const int player_2_id = 56;
-
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -83,29 +80,29 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             AddStep("start players silently", () =>
             {
-                Client.CurrentMatchPlayingUserIds.Add(player_1_id);
-                Client.CurrentMatchPlayingUserIds.Add(player_2_id);
-                playingUserIds.Add(player_1_id);
-                playingUserIds.Add(player_2_id);
-                nextFrame[player_1_id] = 0;
-                nextFrame[player_2_id] = 0;
+                Client.CurrentMatchPlayingUserIds.Add(PLAYER_1_ID);
+                Client.CurrentMatchPlayingUserIds.Add(PLAYER_2_ID);
+                playingUserIds.Add(PLAYER_1_ID);
+                playingUserIds.Add(PLAYER_2_ID);
+                nextFrame[PLAYER_1_ID] = 0;
+                nextFrame[PLAYER_2_ID] = 0;
             });
 
             loadSpectateScreen(false);
 
             AddWaitStep("wait a bit", 10);
-            AddStep("load player first_player_id", () => streamingClient.StartPlay(player_1_id, importedBeatmapId));
+            AddStep("load player first_player_id", () => streamingClient.StartPlay(PLAYER_1_ID, importedBeatmapId));
             AddUntilStep("one player added", () => spectatorScreen.ChildrenOfType<Player>().Count() == 1);
 
             AddWaitStep("wait a bit", 10);
-            AddStep("load player second_player_id", () => streamingClient.StartPlay(player_2_id, importedBeatmapId));
+            AddStep("load player second_player_id", () => streamingClient.StartPlay(PLAYER_2_ID, importedBeatmapId));
             AddUntilStep("two players added", () => spectatorScreen.ChildrenOfType<Player>().Count() == 2);
         }
 
         [Test]
         public void TestGeneral()
         {
-            int[] userIds = Enumerable.Range(0, 4).Select(i => player_1_id + i).ToArray();
+            int[] userIds = Enumerable.Range(0, 4).Select(i => PLAYER_1_ID + i).ToArray();
 
             start(userIds);
             loadSpectateScreen();
@@ -117,123 +114,123 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Test]
         public void TestPlayersMustStartSimultaneously()
         {
-            start(new[] { player_1_id, player_2_id });
+            start(new[] { PLAYER_1_ID, PLAYER_2_ID });
             loadSpectateScreen();
 
             // Send frames for one player only, both should remain paused.
-            sendFrames(player_1_id, 20);
-            checkPausedInstant(player_1_id, true);
-            checkPausedInstant(player_2_id, true);
+            sendFrames(PLAYER_1_ID, 20);
+            checkPausedInstant(PLAYER_1_ID, true);
+            checkPausedInstant(PLAYER_2_ID, true);
 
             // Send frames for the other player, both should now start playing.
-            sendFrames(player_2_id, 20);
-            checkPausedInstant(player_1_id, false);
-            checkPausedInstant(player_2_id, false);
+            sendFrames(PLAYER_2_ID, 20);
+            checkPausedInstant(PLAYER_1_ID, false);
+            checkPausedInstant(PLAYER_2_ID, false);
         }
 
         [Test]
         public void TestPlayersDoNotStartSimultaneouslyIfBufferingForMaximumStartDelay()
         {
-            start(new[] { player_1_id, player_2_id });
+            start(new[] { PLAYER_1_ID, PLAYER_2_ID });
             loadSpectateScreen();
 
             // Send frames for one player only, both should remain paused.
-            sendFrames(player_1_id, 1000);
-            checkPausedInstant(player_1_id, true);
-            checkPausedInstant(player_2_id, true);
+            sendFrames(PLAYER_1_ID, 1000);
+            checkPausedInstant(PLAYER_1_ID, true);
+            checkPausedInstant(PLAYER_2_ID, true);
 
             // Wait for the start delay seconds...
             AddWaitStep("wait maximum start delay seconds", (int)(CatchUpSyncManager.MAXIMUM_START_DELAY / TimePerAction));
 
             // Player 1 should start playing by itself, player 2 should remain paused.
-            checkPausedInstant(player_1_id, false);
-            checkPausedInstant(player_2_id, true);
+            checkPausedInstant(PLAYER_1_ID, false);
+            checkPausedInstant(PLAYER_2_ID, true);
         }
 
         [Test]
         public void TestPlayersContinueWhileOthersBuffer()
         {
-            start(new[] { player_1_id, player_2_id });
+            start(new[] { PLAYER_1_ID, PLAYER_2_ID });
             loadSpectateScreen();
 
             // Send initial frames for both players. A few more for player 1.
-            sendFrames(player_1_id, 20);
-            sendFrames(player_2_id, 10);
-            checkPausedInstant(player_1_id, false);
-            checkPausedInstant(player_2_id, false);
+            sendFrames(PLAYER_1_ID, 20);
+            sendFrames(PLAYER_2_ID, 10);
+            checkPausedInstant(PLAYER_1_ID, false);
+            checkPausedInstant(PLAYER_2_ID, false);
 
             // Eventually player 2 will pause, player 1 must remain running.
-            checkPaused(player_2_id, true);
-            checkPausedInstant(player_1_id, false);
+            checkPaused(PLAYER_2_ID, true);
+            checkPausedInstant(PLAYER_1_ID, false);
 
             // Eventually both players will run out of frames and should pause.
-            checkPaused(player_1_id, true);
-            checkPausedInstant(player_2_id, true);
+            checkPaused(PLAYER_1_ID, true);
+            checkPausedInstant(PLAYER_2_ID, true);
 
             // Send more frames for the first player only. Player 1 should start playing with player 2 remaining paused.
-            sendFrames(player_1_id, 20);
-            checkPausedInstant(player_2_id, true);
-            checkPausedInstant(player_1_id, false);
+            sendFrames(PLAYER_1_ID, 20);
+            checkPausedInstant(PLAYER_2_ID, true);
+            checkPausedInstant(PLAYER_1_ID, false);
 
             // Send more frames for the second player. Both should be playing
-            sendFrames(player_2_id, 20);
-            checkPausedInstant(player_2_id, false);
-            checkPausedInstant(player_1_id, false);
+            sendFrames(PLAYER_2_ID, 20);
+            checkPausedInstant(PLAYER_2_ID, false);
+            checkPausedInstant(PLAYER_1_ID, false);
         }
 
         [Test]
         public void TestPlayersCatchUpAfterFallingBehind()
         {
-            start(new[] { player_1_id, player_2_id });
+            start(new[] { PLAYER_1_ID, PLAYER_2_ID });
             loadSpectateScreen();
 
             // Send initial frames for both players. A few more for player 1.
-            sendFrames(player_1_id, 1000);
-            sendFrames(player_2_id, 10);
-            checkPausedInstant(player_1_id, false);
-            checkPausedInstant(player_2_id, false);
+            sendFrames(PLAYER_1_ID, 1000);
+            sendFrames(PLAYER_2_ID, 10);
+            checkPausedInstant(PLAYER_1_ID, false);
+            checkPausedInstant(PLAYER_2_ID, false);
 
             // Eventually player 2 will run out of frames and should pause.
-            checkPaused(player_2_id, true);
+            checkPaused(PLAYER_2_ID, true);
             AddWaitStep("wait a few more frames", 10);
 
             // Send more frames for player 2. It should unpause.
-            sendFrames(player_2_id, 1000);
-            checkPausedInstant(player_2_id, false);
+            sendFrames(PLAYER_2_ID, 1000);
+            checkPausedInstant(PLAYER_2_ID, false);
 
             // Player 2 should catch up to player 1 after unpausing.
-            waitForCatchup(player_2_id);
+            waitForCatchup(PLAYER_2_ID);
             AddWaitStep("wait a bit", 10);
         }
 
         [Test]
         public void TestMostInSyncUserIsAudioSource()
         {
-            start(new[] { player_1_id, player_2_id });
+            start(new[] { PLAYER_1_ID, PLAYER_2_ID });
             loadSpectateScreen();
 
-            assertVolume(player_1_id, 0);
-            assertVolume(player_2_id, 0);
+            assertVolume(PLAYER_1_ID, 0);
+            assertVolume(PLAYER_2_ID, 0);
 
-            sendFrames(player_1_id, 10);
-            sendFrames(player_2_id, 20);
-            assertVolume(player_1_id, 1);
-            assertVolume(player_2_id, 0);
+            sendFrames(PLAYER_1_ID, 10);
+            sendFrames(PLAYER_2_ID, 20);
+            assertVolume(PLAYER_1_ID, 1);
+            assertVolume(PLAYER_2_ID, 0);
 
-            checkPaused(player_1_id, true);
-            assertVolume(player_1_id, 0);
-            assertVolume(player_2_id, 1);
+            checkPaused(PLAYER_1_ID, true);
+            assertVolume(PLAYER_1_ID, 0);
+            assertVolume(PLAYER_2_ID, 1);
 
-            sendFrames(player_1_id, 100);
-            waitForCatchup(player_1_id);
-            checkPaused(player_2_id, true);
-            assertVolume(player_1_id, 1);
-            assertVolume(player_2_id, 0);
+            sendFrames(PLAYER_1_ID, 100);
+            waitForCatchup(PLAYER_1_ID);
+            checkPaused(PLAYER_2_ID, true);
+            assertVolume(PLAYER_1_ID, 1);
+            assertVolume(PLAYER_2_ID, 0);
 
-            sendFrames(player_2_id, 100);
-            waitForCatchup(player_2_id);
-            assertVolume(player_1_id, 1);
-            assertVolume(player_2_id, 0);
+            sendFrames(PLAYER_2_ID, 100);
+            waitForCatchup(PLAYER_2_ID);
+            assertVolume(PLAYER_1_ID, 1);
+            assertVolume(PLAYER_2_ID, 0);
         }
 
         private void loadSpectateScreen(bool waitForPlayerLoad = true)
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
index 7c6c158b5a..f611d5fecf 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs
@@ -119,8 +119,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             AddStep("join other user (ready)", () =>
             {
-                Client.AddUser(new User { Id = 55 });
-                Client.ChangeUserState(55, MultiplayerUserState.Ready);
+                Client.AddUser(new User { Id = PLAYER_1_ID });
+                Client.ChangeUserState(PLAYER_1_ID, MultiplayerUserState.Ready);
             });
 
             AddStep("click spectate button", () =>
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
index afbc9c32b3..e59b342176 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerSpectateButton.cs
@@ -157,8 +157,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Test]
         public void TestReadyButtonEnabledWhenHostAndUsersReady()
         {
-            AddStep("add user", () => Client.AddUser(new User { Id = 55 }));
-            AddStep("set user ready", () => Client.ChangeUserState(55, MultiplayerUserState.Ready));
+            AddStep("add user", () => Client.AddUser(new User { Id = PLAYER_1_ID }));
+            AddStep("set user ready", () => Client.ChangeUserState(PLAYER_1_ID, MultiplayerUserState.Ready));
 
             addClickSpectateButtonStep();
             assertReadyButtonEnablement(true);
@@ -169,11 +169,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             AddStep("add user and transfer host", () =>
             {
-                Client.AddUser(new User { Id = 55 });
-                Client.TransferHost(55);
+                Client.AddUser(new User { Id = PLAYER_1_ID });
+                Client.TransferHost(PLAYER_1_ID);
             });
 
-            AddStep("set user ready", () => Client.ChangeUserState(55, MultiplayerUserState.Ready));
+            AddStep("set user ready", () => Client.ChangeUserState(PLAYER_1_ID, MultiplayerUserState.Ready));
 
             addClickSpectateButtonStep();
             assertReadyButtonEnablement(false);
diff --git a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
index 7775c2bd24..db344b28dd 100644
--- a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
@@ -16,6 +16,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
 {
     public abstract class MultiplayerTestScene : RoomTestScene
     {
+        public const int PLAYER_1_ID = 55;
+        public const int PLAYER_2_ID = 56;
+
         [Cached(typeof(StatefulMultiplayerClient))]
         public TestMultiplayerClient Client { get; }
 

From 6626e70c95557a17c07216b5514ae4d9440d92a3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 26 Apr 2021 17:30:27 +0900
Subject: [PATCH 2852/3722] Pass in master clock instead of slave clock

---
 .../OnlinePlay/TestSceneCatchUpSyncManager.cs |  5 ++++
 .../Spectate/MultiSpectatorScreen.cs          |  5 +++-
 .../Multiplayer/Spectate/PlayerArea.cs        |  8 ++++---
 .../Sync/CatchUpSpectatorPlayerClock.cs       | 23 +++++++++++--------
 .../Spectate/Sync/ISpectatorPlayerClock.cs    |  5 ++++
 5 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs b/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
index 73ec5fb934..75ba362146 100644
--- a/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
+++ b/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
@@ -168,6 +168,11 @@ namespace osu.Game.Tests.OnlinePlay
 
             public bool IsCatchingUp { get; set; }
 
+            public IFrameBasedClock Source
+            {
+                set => throw new NotImplementedException();
+            }
+
             public readonly int Id;
 
             public TestSpectatorPlayerClock(int id)
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index 6a8c10e336..86c975d12f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -79,7 +79,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             };
 
             for (int i = 0; i < UserIds.Length; i++)
-                grid.Add(instances[i] = new PlayerArea(UserIds[i], new CatchUpSpectatorPlayerClock(masterClockContainer.GameplayClock)));
+            {
+                grid.Add(instances[i] = new PlayerArea(UserIds[i], masterClockContainer.GameplayClock));
+                syncManager.AddPlayerClock(instances[i].GameplayClock);
+            }
 
             // Todo: This is not quite correct - it should be per-user to adjust for other mod combinations.
             var playableBeatmap = Beatmap.Value.GetPlayableBeatmap(Ruleset.Value);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
index 2accfaec0c..3ef1693ca6 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
@@ -9,6 +9,7 @@ using osu.Framework.Audio;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets;
@@ -38,7 +39,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         /// The <see cref="ISpectatorPlayerClock"/> used to control the gameplay running state of a loaded <see cref="Player"/>.
         /// </summary>
         [NotNull]
-        public readonly ISpectatorPlayerClock GameplayClock;
+        public readonly ISpectatorPlayerClock GameplayClock = new CatchUpSpectatorPlayerClock();
 
         /// <summary>
         /// The currently-loaded score.
@@ -54,10 +55,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         private readonly AudioContainer audioContainer;
         private OsuScreenStack stack;
 
-        public PlayerArea(int userId, [NotNull] ISpectatorPlayerClock gameplayClock)
+        public PlayerArea(int userId, IFrameBasedClock masterClock)
         {
             UserId = userId;
-            GameplayClock = gameplayClock;
 
             RelativeSizeAxes = Axes.Both;
             Masking = true;
@@ -71,6 +71,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 },
                 loadingLayer = new LoadingLayer(true) { State = { Value = Visibility.Visible } }
             };
+
+            GameplayClock.Source = masterClock;
         }
 
         public void LoadScore([NotNull] Score score)
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSpectatorPlayerClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSpectatorPlayerClock.cs
index a8ed7b415f..e2a6b7c9ae 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSpectatorPlayerClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSpectatorPlayerClock.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 enable
+
 using System;
 using osu.Framework.Bindables;
 using osu.Framework.Timing;
@@ -17,12 +19,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
         /// </summary>
         public const double CATCHUP_RATE = 2;
 
-        private readonly IFrameBasedClock masterClock;
-
-        public CatchUpSpectatorPlayerClock(IFrameBasedClock masterClock)
-        {
-            this.masterClock = masterClock;
-        }
+        /// <summary>
+        /// The source clock.
+        /// </summary>
+        public IFrameBasedClock? Source { get; set; }
 
         public double CurrentTime { get; private set; }
 
@@ -52,19 +52,22 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
 
         public void ProcessFrame()
         {
-            masterClock.ProcessFrame();
-
             ElapsedFrameTime = 0;
             FramesPerSecond = 0;
 
+            if (Source == null)
+                return;
+
+            Source.ProcessFrame();
+
             if (IsRunning)
             {
-                double elapsedSource = masterClock.ElapsedFrameTime;
+                double elapsedSource = Source.ElapsedFrameTime;
                 double elapsed = elapsedSource * Rate;
 
                 CurrentTime += elapsed;
                 ElapsedFrameTime = elapsed;
-                FramesPerSecond = masterClock.FramesPerSecond;
+                FramesPerSecond = Source.FramesPerSecond;
             }
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorPlayerClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorPlayerClock.cs
index 46f80288c6..311969c92c 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorPlayerClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorPlayerClock.cs
@@ -20,5 +20,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
         /// Whether this clock is resynchronising to the master clock.
         /// </summary>
         bool IsCatchingUp { get; set; }
+
+        /// <summary>
+        /// The source clock
+        /// </summary>
+        IFrameBasedClock Source { set; }
     }
 }

From d7618b63fa38512a7449c65eb6d92bbca140cb54 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 26 Apr 2021 17:35:13 +0900
Subject: [PATCH 2853/3722] Fix test failure

---
 .../Multiplayer/Spectate/Sync/CatchUpSyncManager.cs   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSyncManager.cs
index f5c780e8b1..5912c0803b 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSyncManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSyncManager.cs
@@ -78,15 +78,18 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
             if (playerClocks.Count == 0)
                 return false;
 
-            firstStartAttemptTime ??= Time.Current;
-
             int readyCount = playerClocks.Count(s => !s.WaitingOnFrames.Value);
 
             if (readyCount == playerClocks.Count)
                 return hasStarted = true;
 
-            if (readyCount > 0 && (Time.Current - firstStartAttemptTime) > MAXIMUM_START_DELAY)
-                return hasStarted = true;
+            if (readyCount > 0)
+            {
+                firstStartAttemptTime ??= Time.Current;
+
+                if (Time.Current - firstStartAttemptTime > MAXIMUM_START_DELAY)
+                    return hasStarted = true;
+            }
 
             return false;
         }

From 94d0b064931736c7e6947a13b35ec0f39a67889e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 26 Apr 2021 19:01:30 +0900
Subject: [PATCH 2854/3722] Expose mute adjustment instead

---
 .../TestSceneMultiSpectatorScreen.cs          | 24 +++----
 .../Spectate/MultiSpectatorScreen.cs          |  2 +-
 .../Multiplayer/Spectate/PlayerArea.cs        | 64 +++++--------------
 3 files changed, 30 insertions(+), 60 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
index 7abeed2cbf..a4856d1ee8 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
@@ -209,28 +209,28 @@ namespace osu.Game.Tests.Visual.Multiplayer
             start(new[] { PLAYER_1_ID, PLAYER_2_ID });
             loadSpectateScreen();
 
-            assertVolume(PLAYER_1_ID, 0);
-            assertVolume(PLAYER_2_ID, 0);
+            assertMuted(PLAYER_1_ID, true);
+            assertMuted(PLAYER_2_ID, true);
 
             sendFrames(PLAYER_1_ID, 10);
             sendFrames(PLAYER_2_ID, 20);
-            assertVolume(PLAYER_1_ID, 1);
-            assertVolume(PLAYER_2_ID, 0);
+            assertMuted(PLAYER_1_ID, false);
+            assertMuted(PLAYER_2_ID, true);
 
             checkPaused(PLAYER_1_ID, true);
-            assertVolume(PLAYER_1_ID, 0);
-            assertVolume(PLAYER_2_ID, 1);
+            assertMuted(PLAYER_1_ID, true);
+            assertMuted(PLAYER_2_ID, false);
 
             sendFrames(PLAYER_1_ID, 100);
             waitForCatchup(PLAYER_1_ID);
             checkPaused(PLAYER_2_ID, true);
-            assertVolume(PLAYER_1_ID, 1);
-            assertVolume(PLAYER_2_ID, 0);
+            assertMuted(PLAYER_1_ID, false);
+            assertMuted(PLAYER_2_ID, true);
 
             sendFrames(PLAYER_2_ID, 100);
             waitForCatchup(PLAYER_2_ID);
-            assertVolume(PLAYER_1_ID, 1);
-            assertVolume(PLAYER_2_ID, 0);
+            assertMuted(PLAYER_1_ID, false);
+            assertMuted(PLAYER_2_ID, true);
         }
 
         private void loadSpectateScreen(bool waitForPlayerLoad = true)
@@ -292,8 +292,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
         private void checkPausedInstant(int userId, bool state)
             => AddAssert($"{userId} is {(state ? "paused" : "playing")}", () => getPlayer(userId).ChildrenOfType<GameplayClockContainer>().First().GameplayClock.IsRunning != state);
 
-        private void assertVolume(int userId, double volume)
-            => AddAssert($"{userId} volume is {volume}", () => getInstance(userId).Volume.Value == volume);
+        private void assertMuted(int userId, bool muted)
+            => AddAssert($"{userId} {(muted ? "is" : "is not")} muted", () => getInstance(userId).Mute == muted);
 
         private void waitForCatchup(int userId)
             => AddUntilStep($"{userId} not catching up", () => !getInstance(userId).GameplayClock.IsCatchingUp);
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index 86c975d12f..2bd0ad8748 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                                               .FirstOrDefault();
 
                 foreach (var instance in instances)
-                    instance.Volume.Value = instance == currentAudioSource ? 1 : 0;
+                    instance.Mute = instance != currentAudioSource;
             }
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
index 3ef1693ca6..89c69cc666 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
     /// <summary>
     /// Provides an area for and manages the hierarchy of a spectated player within a <see cref="MultiSpectatorScreen"/>.
     /// </summary>
-    public class PlayerArea : CompositeDrawable, IAdjustableAudioComponent
+    public class PlayerArea : CompositeDrawable
     {
         /// <summary>
         /// Whether a <see cref="Player"/> is loaded in the area.
@@ -50,9 +50,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
 
+        private readonly BindableDouble volumeAdjustment = new BindableDouble();
         private readonly Container gameplayContent;
         private readonly LoadingLayer loadingLayer;
-        private readonly AudioContainer audioContainer;
         private OsuScreenStack stack;
 
         public PlayerArea(int userId, IFrameBasedClock masterClock)
@@ -62,6 +62,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             RelativeSizeAxes = Axes.Both;
             Masking = true;
 
+            AudioContainer audioContainer;
             InternalChildren = new Drawable[]
             {
                 audioContainer = new AudioContainer
@@ -72,6 +73,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 loadingLayer = new LoadingLayer(true) { State = { Value = Visibility.Visible } }
             };
 
+            audioContainer.AddAdjustment(AdjustableProperty.Volume, volumeAdjustment);
+
             GameplayClock.Source = masterClock;
         }
 
@@ -92,55 +95,22 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             loadingLayer.Hide();
         }
 
+        private bool mute = true;
+
+        public bool Mute
+        {
+            get => mute;
+            set
+            {
+                mute = value;
+                volumeAdjustment.Value = value ? 0 : 1;
+            }
+        }
+
         // Player interferes with global input, so disable input for now.
         public override bool PropagatePositionalInputSubTree => false;
         public override bool PropagateNonPositionalInputSubTree => false;
 
-        #region IAdjustableAudioComponent
-
-        public IBindable<double> AggregateVolume => audioContainer.AggregateVolume;
-
-        public IBindable<double> AggregateBalance => audioContainer.AggregateBalance;
-
-        public IBindable<double> AggregateFrequency => audioContainer.AggregateFrequency;
-
-        public IBindable<double> AggregateTempo => audioContainer.AggregateTempo;
-
-        public void BindAdjustments(IAggregateAudioAdjustment component)
-        {
-            audioContainer.BindAdjustments(component);
-        }
-
-        public void UnbindAdjustments(IAggregateAudioAdjustment component)
-        {
-            audioContainer.UnbindAdjustments(component);
-        }
-
-        public void AddAdjustment(AdjustableProperty type, IBindable<double> adjustBindable)
-        {
-            audioContainer.AddAdjustment(type, adjustBindable);
-        }
-
-        public void RemoveAdjustment(AdjustableProperty type, IBindable<double> adjustBindable)
-        {
-            audioContainer.RemoveAdjustment(type, adjustBindable);
-        }
-
-        public void RemoveAllAdjustments(AdjustableProperty type)
-        {
-            audioContainer.RemoveAllAdjustments(type);
-        }
-
-        public BindableNumber<double> Volume => audioContainer.Volume;
-
-        public BindableNumber<double> Balance => audioContainer.Balance;
-
-        public BindableNumber<double> Frequency => audioContainer.Frequency;
-
-        public BindableNumber<double> Tempo => audioContainer.Tempo;
-
-        #endregion
-
         private class PlayerIsolationContainer : Container
         {
             [Cached]

From 58ebec48037499b162fb5045c767812a22f82fb5 Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Mon, 26 Apr 2021 19:00:40 +0800
Subject: [PATCH 2855/3722] Move BindValueChanged hooks to LoadComplete()

---
 .../Objects/Drawables/DrawableNote.cs          | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 2d2fba0ad5..49536080ab 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -26,6 +26,9 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         [Resolved]
         private OsuColour colours { get; set; }
 
+        [Resolved]
+        private BeatDivisorFinder beatDivisorFinder { get; set; }
+
         private readonly Bindable<bool> configColourCodedNotes = new Bindable<bool>();
 
         protected virtual ManiaSkinComponents Component => ManiaSkinComponents.Note;
@@ -48,17 +51,20 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(ManiaRulesetConfigManager rulesetConfig, BeatDivisorFinder beatDivisorFinder)
+        private void load(ManiaRulesetConfigManager rulesetConfig)
+        {
+            rulesetConfig?.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
+        }
+
+        protected override void LoadComplete()
         {
             if (beatDivisorFinder != null)
             {
-                rulesetConfig?.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
-
                 HitObject.StartTimeBindable.BindValueChanged(_ => snap.Value = beatDivisorFinder.FindDivisor(HitObject), true);
-
-                snap.BindValueChanged(_ => updateSnapColour(), true);
-                configColourCodedNotes.BindValueChanged(_ => updateSnapColour());
             }
+
+            snap.BindValueChanged(_ => updateSnapColour());
+            configColourCodedNotes.BindValueChanged(_ => updateSnapColour(), true);
         }
 
         protected override void OnDirectionChanged(ValueChangedEvent<ScrollingDirection> e)

From 559d403abec8046cd8331fbc45523676ae2452f0 Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Mon, 26 Apr 2021 19:05:12 +0800
Subject: [PATCH 2856/3722] Rename ColourCodedNotes to TimingBasedNoteColouring

---
 .../Configuration/ManiaRulesetConfigManager.cs            | 4 ++--
 osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs        | 4 ++--
 osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
index 87a4689689..ac8168dfc9 100644
--- a/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
+++ b/osu.Game.Rulesets.Mania/Configuration/ManiaRulesetConfigManager.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Mania.Configuration
 
             SetDefault(ManiaRulesetSetting.ScrollTime, 1500.0, DrawableManiaRuleset.MIN_TIME_RANGE, DrawableManiaRuleset.MAX_TIME_RANGE, 5);
             SetDefault(ManiaRulesetSetting.ScrollDirection, ManiaScrollingDirection.Down);
-            SetDefault(ManiaRulesetSetting.ColourCodedNotes, false);
+            SetDefault(ManiaRulesetSetting.TimingBasedNoteColouring, false);
         }
 
         public override TrackedSettings CreateTrackedSettings() => new TrackedSettings
@@ -36,6 +36,6 @@ namespace osu.Game.Rulesets.Mania.Configuration
     {
         ScrollTime,
         ScrollDirection,
-        ColourCodedNotes
+        TimingBasedNoteColouring
     }
 }
diff --git a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
index 552c793096..1c89d9cd00 100644
--- a/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSettingsSubsection.cs
@@ -39,8 +39,8 @@ namespace osu.Game.Rulesets.Mania
                 },
                 new SettingsCheckbox
                 {
-                    LabelText = "Colour-coded notes",
-                    Current = config.GetBindable<bool>(ManiaRulesetSetting.ColourCodedNotes),
+                    LabelText = "Timing-based note colouring",
+                    Current = config.GetBindable<bool>(ManiaRulesetSetting.TimingBasedNoteColouring),
                 }
             };
         }
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 49536080ab..102cd485dc 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         [Resolved]
         private BeatDivisorFinder beatDivisorFinder { get; set; }
 
-        private readonly Bindable<bool> configColourCodedNotes = new Bindable<bool>();
+        private readonly Bindable<bool> configTimingBasedNoteColouring = new Bindable<bool>();
 
         protected virtual ManiaSkinComponents Component => ManiaSkinComponents.Note;
 
@@ -53,7 +53,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         [BackgroundDependencyLoader(true)]
         private void load(ManiaRulesetConfigManager rulesetConfig)
         {
-            rulesetConfig?.BindWith(ManiaRulesetSetting.ColourCodedNotes, configColourCodedNotes);
+            rulesetConfig?.BindWith(ManiaRulesetSetting.TimingBasedNoteColouring, configTimingBasedNoteColouring);
         }
 
         protected override void LoadComplete()
@@ -64,7 +64,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             }
 
             snap.BindValueChanged(_ => updateSnapColour());
-            configColourCodedNotes.BindValueChanged(_ => updateSnapColour(), true);
+            configTimingBasedNoteColouring.BindValueChanged(_ => updateSnapColour(), true);
         }
 
         protected override void OnDirectionChanged(ValueChangedEvent<ScrollingDirection> e)
@@ -109,7 +109,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         private void updateSnapColour()
         {
-            Colour = configColourCodedNotes.Value
+            Colour = configTimingBasedNoteColouring.Value
                 ? BindableBeatDivisor.GetColourFor(snap.Value, colours)
                 : Color4.White;
         }

From 6560dc2d1f579947218d1fa88853775efb0d1792 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 26 Apr 2021 20:46:44 +0900
Subject: [PATCH 2857/3722] Fix exported replays being wrapped in zip packages

---
 osu.Game/Database/ArchiveModelManager.cs | 20 +++++++++++++++-----
 osu.Game/Scoring/ScoreManager.cs         | 10 ++++++++++
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index d809dbcb01..6719351530 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -422,15 +422,25 @@ namespace osu.Game.Database
             if (retrievedItem == null)
                 throw new ArgumentException("Specified model could not be found", nameof(item));
 
+            using (var outputStream = exportStorage.GetStream($"{getValidFilename(item.ToString())}{HandledExtensions.First()}", FileAccess.Write, FileMode.Create))
+                ExportModelTo(retrievedItem, outputStream);
+
+            exportStorage.OpenInNativeExplorer();
+        }
+
+        /// <summary>
+        /// Exports an item to the given output stream.
+        /// </summary>
+        /// <param name="model">The item to export.</param>
+        /// <param name="outputStream">The output stream to export to.</param>
+        protected virtual void ExportModelTo(TModel model, Stream outputStream)
+        {
             using (var archive = ZipArchive.Create())
             {
-                foreach (var file in retrievedItem.Files)
+                foreach (var file in model.Files)
                     archive.AddEntry(file.Filename, Files.Storage.GetStream(file.FileInfo.StoragePath));
 
-                using (var outputStream = exportStorage.GetStream($"{getValidFilename(item.ToString())}{HandledExtensions.First()}", FileAccess.Write, FileMode.Create))
-                    archive.SaveTo(outputStream);
-
-                exportStorage.OpenInNativeExplorer();
+                archive.SaveTo(outputStream);
             }
         }
 
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index c7ee26c248..9d3b952ada 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -72,6 +72,16 @@ namespace osu.Game.Scoring
             }
         }
 
+        protected override void ExportModelTo(ScoreInfo model, Stream outputStream)
+        {
+            var file = model.Files.SingleOrDefault();
+            if (file == null)
+                return;
+
+            using (var inputStream = Files.Storage.GetStream(file.FileInfo.StoragePath))
+                inputStream.CopyTo(outputStream);
+        }
+
         protected override IEnumerable<string> GetStableImportPaths(Storage storage)
             => storage.GetFiles(ImportFromStablePath).Where(p => HandledExtensions.Any(ext => Path.GetExtension(p)?.Equals(ext, StringComparison.OrdinalIgnoreCase) ?? false))
                       .Select(path => storage.GetFullPath(path));

From 213ac88a8b34b7d1caa57183945b501b3c828e1a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 26 Apr 2021 20:52:20 +0900
Subject: [PATCH 2858/3722] Fix exported scores not being compatible with
 osu-stable

---
 osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
index db7e51e833..56c4e75864 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Scoring.Legacy
 
                     foreach (var f in score.Replay.Frames.OfType<IConvertibleReplayFrame>().Select(f => f.ToLegacy(beatmap)))
                     {
-                        replayData.Append(FormattableString.Invariant($"{f.Time - lastF.Time}|{f.MouseX ?? 0}|{f.MouseY ?? 0}|{(int)f.ButtonState},"));
+                        replayData.Append(FormattableString.Invariant($"{(int)Math.Round(f.Time - lastF.Time)}|{f.MouseX ?? 0}|{f.MouseY ?? 0}|{(int)f.ButtonState},"));
                         lastF = f;
                     }
                 }

From 7e11d520d587a905f64bf25d023c5515c046b812 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 26 Apr 2021 21:25:34 +0900
Subject: [PATCH 2859/3722] Remove finished players from multi spectator screen

---
 .../Spectate/MultiSpectatorScreen.cs          | 15 ++++----
 osu.Game/Screens/Spectate/SpectatorScreen.cs  | 35 ++++++++++++++-----
 2 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index 2bd0ad8748..c3917e321d 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -27,6 +27,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         /// </summary>
         public bool AllPlayersLoaded => instances.All(p => p?.PlayerLoaded == true);
 
+        private readonly int[] userIds;
+
         [Resolved]
         private SpectatorStreamingClient spectatorClient { get; set; }
 
@@ -44,7 +46,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         public MultiSpectatorScreen(int[] userIds)
             : base(userIds.Take(PlayerGrid.MAX_PLAYERS).ToArray())
         {
-            instances = new PlayerArea[UserIds.Length];
+            this.userIds = GetUserIds().ToArray();
+            instances = new PlayerArea[this.userIds.Length];
         }
 
         [BackgroundDependencyLoader]
@@ -78,9 +81,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 })
             };
 
-            for (int i = 0; i < UserIds.Length; i++)
+            for (int i = 0; i < userIds.Length; i++)
             {
-                grid.Add(instances[i] = new PlayerArea(UserIds[i], masterClockContainer.GameplayClock));
+                grid.Add(instances[i] = new PlayerArea(userIds[i], masterClockContainer.GameplayClock));
                 syncManager.AddPlayerClock(instances[i].GameplayClock);
             }
 
@@ -89,7 +92,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             var scoreProcessor = Ruleset.Value.CreateInstance().CreateScoreProcessor();
             scoreProcessor.ApplyBeatmap(playableBeatmap);
 
-            LoadComponentAsync(leaderboard = new MultiSpectatorLeaderboard(scoreProcessor, UserIds) { Expanded = { Value = true } }, leaderboardContainer.Add);
+            LoadComponentAsync(leaderboard = new MultiSpectatorLeaderboard(scoreProcessor, userIds) { Expanded = { Value = true } }, leaderboardContainer.Add);
         }
 
         protected override void LoadComplete()
@@ -133,10 +136,10 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         protected override void EndGameplay(int userId)
         {
-            spectatorClient.StopWatchingUser(userId);
+            RemoveUser(userId);
             leaderboard.RemoveClock(userId);
         }
 
-        private int getIndexForUser(int userId) => Array.IndexOf(UserIds, userId);
+        private int getIndexForUser(int userId) => Array.IndexOf(userIds, userId);
     }
 }
diff --git a/osu.Game/Screens/Spectate/SpectatorScreen.cs b/osu.Game/Screens/Spectate/SpectatorScreen.cs
index 36768a512d..4aca379ebe 100644
--- a/osu.Game/Screens/Spectate/SpectatorScreen.cs
+++ b/osu.Game/Screens/Spectate/SpectatorScreen.cs
@@ -7,6 +7,7 @@ using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
+using NuGet.Packaging;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
@@ -26,7 +27,8 @@ namespace osu.Game.Screens.Spectate
     /// </summary>
     public abstract class SpectatorScreen : OsuScreen
     {
-        protected readonly int[] UserIds;
+        protected IEnumerable<int> GetUserIds() => userIds;
+        private readonly HashSet<int> userIds = new HashSet<int>();
 
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
@@ -54,7 +56,7 @@ namespace osu.Game.Screens.Spectate
         /// <param name="userIds">The users to spectate.</param>
         protected SpectatorScreen(params int[] userIds)
         {
-            UserIds = userIds;
+            this.userIds.AddRange(userIds);
         }
 
         protected override void LoadComplete()
@@ -80,20 +82,18 @@ namespace osu.Game.Screens.Spectate
 
         private Task populateAllUsers()
         {
-            var userLookupTasks = new Task[UserIds.Length];
+            var userLookupTasks = new List<Task>();
 
-            for (int i = 0; i < UserIds.Length; i++)
+            foreach (var u in userIds)
             {
-                var userId = UserIds[i];
-
-                userLookupTasks[i] = userLookupCache.GetUserAsync(userId).ContinueWith(task =>
+                userLookupTasks.Add(userLookupCache.GetUserAsync(u).ContinueWith(task =>
                 {
                     if (!task.IsCompletedSuccessfully)
                         return;
 
                     lock (stateLock)
-                        userMap[userId] = task.Result;
-                });
+                        userMap[u] = task.Result;
+                }));
             }
 
             return Task.WhenAll(userLookupTasks);
@@ -239,6 +239,23 @@ namespace osu.Game.Screens.Spectate
         /// <param name="userId">The user to end gameplay for.</param>
         protected abstract void EndGameplay(int userId);
 
+        /// <summary>
+        /// Stops spectating a user.
+        /// </summary>
+        /// <param name="userId">The user to stop spectating.</param>
+        protected void RemoveUser(int userId)
+        {
+            lock (stateLock)
+            {
+                userFinishedPlaying(userId, null);
+
+                userIds.Remove(userId);
+                userMap.Remove(userId);
+
+                spectatorClient.StopWatchingUser(userId);
+            }
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);

From ed93e26e52b70127ff3e34db5671b25fb6172299 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 26 Apr 2021 21:55:38 +0900
Subject: [PATCH 2860/3722] Use single method for starting/restarting spectator
 screen

---
 .../OnlinePlay/Multiplayer/Multiplayer.cs     |  2 +-
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 31 +++++++------------
 .../Spectate/MultiSpectatorScreen.cs          |  7 +++++
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
index ae22e1fcec..085c824bdc 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             base.OnResuming(last);
 
-            if (client.Room != null)
+            if (client.Room != null && client.LocalUser?.State != MultiplayerUserState.Spectating)
                 client.ChangeState(MultiplayerUserState.Idle);
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 0cd3b448d2..b8347d0537 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -406,29 +406,22 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             }
         }
 
-        private void onRoomUpdated() => Scheduler.Add(() =>
+        private void onRoomUpdated()
         {
-            if (client.Room == null)
-                return;
-
-            Debug.Assert(client.LocalUser != null);
-
-            UpdateMods();
-
-            if (client.LocalUser.State == MultiplayerUserState.Spectating
-                && (client.Room.State == MultiplayerRoomState.Playing || client.Room.State == MultiplayerRoomState.WaitingForLoad)
-                && ParentScreen.IsCurrentScreen())
-            {
-                StartPlay();
-
-                // If the current user was host, they started the match and the in-progress operation needs to be stopped now.
-                readyClickOperation?.Dispose();
-                readyClickOperation = null;
-            }
-        });
+            Scheduler.AddOnce(UpdateMods);
+        }
 
         private void onLoadRequested()
         {
+            // If the user is spectating, the multi-spectator screen may still be the current screen.
+            if (!ParentScreen.IsCurrentScreen())
+            {
+                ParentScreen.MakeCurrent();
+
+                Schedule(onLoadRequested);
+                return;
+            }
+
             StartPlay();
 
             readyClickOperation?.Dispose();
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index c3917e321d..85ef375fae 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -140,6 +140,13 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             leaderboard.RemoveClock(userId);
         }
 
+        public override bool OnBackButton()
+        {
+            // On a manual exit, set the player state back to idle.
+            multiplayerClient.ChangeState(MultiplayerUserState.Idle);
+            return base.OnBackButton();
+        }
+
         private int getIndexForUser(int userId) => Array.IndexOf(userIds, userId);
     }
 }

From 630a6dc46ac262742f9a8a6c1c68e98100c789dc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 26 Apr 2021 22:23:44 +0900
Subject: [PATCH 2861/3722] Fix missing dependency

---
 .../OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index 85ef375fae..ef31a5a7f0 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -7,6 +7,7 @@ using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Spectator;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync;
 using osu.Game.Screens.Play;
@@ -32,6 +33,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         [Resolved]
         private SpectatorStreamingClient spectatorClient { get; set; }
 
+        [Resolved]
+        private StatefulMultiplayerClient multiplayerClient { get; set; }
+
         private readonly PlayerArea[] instances;
         private MasterGameplayClockContainer masterClockContainer;
         private ISyncManager syncManager;

From 7b9ed924be4ab084101d24fa551ddaee8297f410 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 26 Apr 2021 16:07:30 +0200
Subject: [PATCH 2862/3722] Rename snapping methods

Further separates them from `IBeatSnapProvider`'s `SnapTime`, and groups them together more, to prevent confusion between the two interfaces.

Also changes the xmldoc of the reference time to that of `IBeatSnapProvider` for consistency.
---
 osu.Game/Beatmaps/Beatmap.cs                  | 10 +++++-----
 osu.Game/Beatmaps/IBeatmap.cs                 | 12 ++++++------
 osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs |  6 +++---
 osu.Game/Screens/Edit/EditorBeatmap.cs        | 10 +++++-----
 osu.Game/Screens/Play/GameplayBeatmap.cs      |  8 ++++----
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/osu.Game/Beatmaps/Beatmap.cs b/osu.Game/Beatmaps/Beatmap.cs
index 1ce01aee24..66b8f169ef 100644
--- a/osu.Game/Beatmaps/Beatmap.cs
+++ b/osu.Game/Beatmaps/Beatmap.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Beatmaps
             return mostCommon.beatLength;
         }
 
-        public int SnapTimeForDivisor(double time, int beatDivisor, double? referenceTime = null)
+        public int ClosestSnapTime(double time, int beatDivisor, double? referenceTime = null)
         {
             var timingPoint = ControlPointInfo.TimingPointAt(referenceTime ?? time);
             var beatLength = timingPoint.BeatLength / beatDivisor;
@@ -84,14 +84,14 @@ namespace osu.Game.Beatmaps
             return (int)(timingPoint.Time + beatLengths * beatLength);
         }
 
-        public int SnapTimeAnyDivisor(double time, double? referenceTime = null)
+        public int ClosestSnapTime(double time, double? referenceTime = null)
         {
-            return SnapTimeForDivisor(time, ClosestBeatSnapDivisor(time, referenceTime), referenceTime);
+            return ClosestSnapTime(time, ClosestBeatDivisor(time, referenceTime), referenceTime);
         }
 
-        public int ClosestBeatSnapDivisor(double time, double? referenceTime = null)
+        public int ClosestBeatDivisor(double time, double? referenceTime = null)
         {
-            double getUnsnap(int divisor) => Math.Abs(time - SnapTimeForDivisor(time, divisor, referenceTime));
+            double getUnsnap(int divisor) => Math.Abs(time - ClosestSnapTime(time, divisor, referenceTime));
 
             int[] divisors = BindableBeatDivisor.VALID_DIVISORS;
             double smallestUnsnap = divisors.Min(getUnsnap);
diff --git a/osu.Game/Beatmaps/IBeatmap.cs b/osu.Game/Beatmaps/IBeatmap.cs
index 3b043cb59b..679d639fd1 100644
--- a/osu.Game/Beatmaps/IBeatmap.cs
+++ b/osu.Game/Beatmaps/IBeatmap.cs
@@ -56,22 +56,22 @@ namespace osu.Game.Beatmaps
         /// </summary>
         /// <param name="time">The time to find the closest snapped time to.</param>
         /// <param name="beatDivisor">The beat divisor to snap to.</param>
-        /// <param name="referenceTime">The time at which the timing point is retrieved, by default same as time.</param>
-        int SnapTimeForDivisor(double time, int beatDivisor, double? referenceTime = null);
+        /// <param name="referenceTime">An optional reference point to use for timing point lookup.</param>
+        int ClosestSnapTime(double time, int beatDivisor, double? referenceTime = null);
 
         /// <summary>
         /// Returns the time on any valid beat divisor closest to the given time.
         /// </summary>
         /// <param name="time">The time to find the closest snapped time to.</param>
-        /// <param name="referenceTime">The time at which the timing point is retrieved, by default same as time.</param>
-        int SnapTimeAnyDivisor(double time, double? referenceTime = null);
+        /// <param name="referenceTime">An optional reference point to use for timing point lookup.</param>
+        int ClosestSnapTime(double time, double? referenceTime = null);
 
         /// <summary>
         /// Returns the beat snap divisor closest to the given time. If two are equally close, the smallest is returned.
         /// </summary>
         /// <param name="time">The time to find the closest beat snap divisor to.</param>
-        /// <param name="referenceTime">The time at which the timing point is retrieved, by default same as time.</param>
-        int ClosestBeatSnapDivisor(double time, double? referenceTime = null);
+        /// <param name="referenceTime">An optional reference point to use for timing point lookup.</param>
+        int ClosestBeatDivisor(double time, double? referenceTime = null);
 
         /// <summary>
         /// Creates a shallow-clone of this beatmap and returns it.
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs b/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs
index d15dc6f179..ca268652a9 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Edit.Checks
         {
             foreach (var hitobject in playableBeatmap.HitObjects)
             {
-                double startUnsnap = hitobject.StartTime - playableBeatmap.SnapTimeAnyDivisor(hitobject.StartTime);
+                double startUnsnap = hitobject.StartTime - playableBeatmap.ClosestSnapTime(hitobject.StartTime);
                 string startPostfix = hitobject is IHasDuration ? "start" : "";
                 foreach (var issue in getUnsnapIssues(hitobject, startUnsnap, hitobject.StartTime, startPostfix))
                     yield return issue;
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Edit.Checks
                     {
                         double spanDuration = hasRepeats.Duration / (hasRepeats.RepeatCount + 1);
                         double repeatTime = hitobject.StartTime + spanDuration * (repeatIndex + 1);
-                        double repeatUnsnap = repeatTime - playableBeatmap.SnapTimeAnyDivisor(repeatTime);
+                        double repeatUnsnap = repeatTime - playableBeatmap.ClosestSnapTime(repeatTime);
                         foreach (var issue in getUnsnapIssues(hitobject, repeatUnsnap, repeatTime, "repeat"))
                             yield return issue;
                     }
@@ -45,7 +45,7 @@ namespace osu.Game.Rulesets.Edit.Checks
 
                 if (hitobject is IHasDuration hasDuration)
                 {
-                    double endUnsnap = hasDuration.EndTime - playableBeatmap.SnapTimeAnyDivisor(hasDuration.EndTime);
+                    double endUnsnap = hasDuration.EndTime - playableBeatmap.ClosestSnapTime(hasDuration.EndTime);
                     foreach (var issue in getUnsnapIssues(hitobject, endUnsnap, hasDuration.EndTime, "end"))
                         yield return issue;
                 }
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 9334814e2a..72fb0ac9e9 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -301,16 +301,16 @@ namespace osu.Game.Screens.Edit
             return list.Count - 1;
         }
 
-        public int SnapTimeForDivisor(double time, int beatDivisor, double? referenceTime = null)
+        public int ClosestSnapTime(double time, int beatDivisor, double? referenceTime = null)
         {
-            return PlayableBeatmap.SnapTimeForDivisor(time, beatDivisor, referenceTime);
+            return PlayableBeatmap.ClosestSnapTime(time, beatDivisor, referenceTime);
         }
 
-        public int SnapTimeAnyDivisor(double time, double? referenceTime = null) => PlayableBeatmap.SnapTimeAnyDivisor(time, referenceTime);
+        public int ClosestSnapTime(double time, double? referenceTime = null) => PlayableBeatmap.ClosestSnapTime(time, referenceTime);
 
-        public int ClosestBeatSnapDivisor(double time, double? referenceTime = null) => PlayableBeatmap.ClosestBeatSnapDivisor(time, referenceTime);
+        public int ClosestBeatDivisor(double time, double? referenceTime = null) => PlayableBeatmap.ClosestBeatDivisor(time, referenceTime);
 
-        public double SnapTime(double time, double? referenceTime) => SnapTimeForDivisor(time, BeatDivisor, referenceTime);
+        public double SnapTime(double time, double? referenceTime) => ClosestSnapTime(time, BeatDivisor, referenceTime);
 
         public double GetBeatLengthAtTime(double referenceTime) => ControlPointInfo.TimingPointAt(referenceTime).BeatLength / BeatDivisor;
 
diff --git a/osu.Game/Screens/Play/GameplayBeatmap.cs b/osu.Game/Screens/Play/GameplayBeatmap.cs
index a3a2bbd41b..92f58c8759 100644
--- a/osu.Game/Screens/Play/GameplayBeatmap.cs
+++ b/osu.Game/Screens/Play/GameplayBeatmap.cs
@@ -45,14 +45,14 @@ namespace osu.Game.Screens.Play
 
         public double GetMostCommonBeatLength() => PlayableBeatmap.GetMostCommonBeatLength();
 
-        public int SnapTimeForDivisor(double time, int beatDivisor, double? referenceTime = null)
+        public int ClosestSnapTime(double time, int beatDivisor, double? referenceTime = null)
         {
-            return PlayableBeatmap.SnapTimeForDivisor(time, beatDivisor, referenceTime);
+            return PlayableBeatmap.ClosestSnapTime(time, beatDivisor, referenceTime);
         }
 
-        public int SnapTimeAnyDivisor(double time, double? referenceTime = null) => PlayableBeatmap.SnapTimeAnyDivisor(time, referenceTime);
+        public int ClosestSnapTime(double time, double? referenceTime = null) => PlayableBeatmap.ClosestSnapTime(time, referenceTime);
 
-        public int ClosestBeatSnapDivisor(double time, double? referenceTime = null) => PlayableBeatmap.ClosestBeatSnapDivisor(time, referenceTime);
+        public int ClosestBeatDivisor(double time, double? referenceTime = null) => PlayableBeatmap.ClosestBeatDivisor(time, referenceTime);
 
         public IBeatmap Clone() => PlayableBeatmap.Clone();
 

From 9b9c473616c6d29a550881e17b9f94cc6271ade8 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 26 Apr 2021 16:17:38 +0200
Subject: [PATCH 2863/3722] Remove redundant string formatting

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

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs b/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs
index ca268652a9..ff270b6d60 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Rulesets.Edit.Checks
         public abstract class IssueTemplateUnsnap : IssueTemplate
         {
             protected IssueTemplateUnsnap(ICheck check, IssueType type)
-                : base(check, type, "{0:0.##} is unsnapped by {1:0.##} ms.")
+                : base(check, type, "{0} is unsnapped by {1:0.##} ms.")
             {
             }
 

From 71f880aa94eaf3f9defd3b943c1f949293c32631 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 26 Apr 2021 17:44:46 +0200
Subject: [PATCH 2864/3722] Fix duplicate code in unsnap test

---
 osu.Game.Tests/Editing/Checks/CheckUnsnapsTest.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Editing/Checks/CheckUnsnapsTest.cs b/osu.Game.Tests/Editing/Checks/CheckUnsnapsTest.cs
index 88939c43ce..bac3c41cb0 100644
--- a/osu.Game.Tests/Editing/Checks/CheckUnsnapsTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckUnsnapsTest.cs
@@ -70,14 +70,9 @@ namespace osu.Game.Tests.Editing.Checks
         public void TestSliderSnapped()
         {
             // Slider ends are naturally < 1 ms unsnapped because of how SV works.
-            var mockSlider = new Mock<Slider>();
-            mockSlider.SetupGet(s => s.StartTime).Returns(100);
-            mockSlider.As<IHasRepeats>().Setup(r => r.RepeatCount).Returns(0);
-            mockSlider.As<IHasDuration>().Setup(d => d.Duration).Returns(400.75d);
-
             assertOk(new List<HitObject>
             {
-                mockSlider.Object
+                getSliderMock(startTime: 100, endTime: 400.75d).Object
             });
         }
 

From 08a232f7fad662384426f21b3131e36828b9de62 Mon Sep 17 00:00:00 2001
From: Derrick Timmermans <derrick.timmermans@outlook.com>
Date: Mon, 26 Apr 2021 20:08:40 +0200
Subject: [PATCH 2865/3722] Add method to safely refresh DrawableHitObject
 transforms

---
 .../Rulesets/Objects/Drawables/DrawableHitObject.cs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 7739994527..679c86072b 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -14,13 +14,13 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Threading;
 using osu.Game.Audio;
+using osu.Game.Configuration;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects.Pooling;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Skinning;
-using osu.Game.Configuration;
-using osu.Game.Rulesets.Objects.Pooling;
 using osu.Game.Rulesets.UI;
+using osu.Game.Skinning;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Objects.Drawables
@@ -429,6 +429,13 @@ namespace osu.Game.Rulesets.Objects.Drawables
             base.ClearTransformsAfter(double.MinValue, true);
         }
 
+        /// <summary>
+        /// Removes all previously applied transforms, then reapplies a new set of transforms with potentially different parameters.
+        /// The transforms will use the current <see cref="ArmedState"/>, and they will use the appropriate start times.
+        /// This also takes in account potential overrides defined in <see cref="ApplyCustomUpdateState"/>.
+        /// </summary>
+        protected void RefreshStateTransforms() => updateState(State.Value, true);
+
         /// <summary>
         /// Apply (generally fade-in) transforms leading into the <see cref="HitObject"/> start time.
         /// The local drawable hierarchy is recursively delayed to <see cref="HitObjectLifetimeEntry.LifetimeStart"/> for convenience.

From a3570e18dd3c860b0a3942d5c0ba3cf8593471c8 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 26 Apr 2021 20:17:18 +0200
Subject: [PATCH 2866/3722] Add concurrent objects check

Here we use `IHasColumn` to support rulesets with columns, and so I moved that interface out into `osu.Game` from `osu.Game.Rulesets.Mania`.

We also use the same threshold as the unsnap check to ensure that no problems slip through. Specifically where an object is simultaneously not concurrent and not unsnapped but still on the same tick.
---
 .../Objects/ManiaHitObject.cs                 |  1 -
 .../Edit/Checks/CheckConcurrentObjects.cs     | 88 +++++++++++++++++++
 osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs |  4 +-
 .../Rulesets}/Objects/Types/IHasColumn.cs     |  2 +-
 4 files changed, 91 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
 rename {osu.Game.Rulesets.Mania => osu.Game/Rulesets}/Objects/Types/IHasColumn.cs (90%)

diff --git a/osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs b/osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs
index 27bf50493d..6289744df1 100644
--- a/osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs
+++ b/osu.Game.Rulesets.Mania/Objects/ManiaHitObject.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Bindables;
-using osu.Game.Rulesets.Mania.Objects.Types;
 using osu.Game.Rulesets.Mania.Scoring;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs b/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
new file mode 100644
index 0000000000..7c41569fab
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.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.Collections.Generic;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit.Checks.Components;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+
+namespace osu.Game.Rulesets.Edit.Checks
+{
+    public class CheckConcurrentObjects : ICheck
+    {
+        // We guarantee that the objects are either treated as concurrent or unsnapped when near the same beat divisor.
+        private const double ms_leniency = CheckUnsnaps.UNSNAP_MS_THRESHOLD;
+
+        public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Compose, "Concurrent hitobjects");
+
+        public virtual IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
+        {
+            new IssueTemplateConcurrentSame(this),
+            new IssueTemplateConcurrentDifferent(this)
+        };
+
+        public virtual IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap)
+        {
+            for (int i = 0; i < playableBeatmap.HitObjects.Count - 1; ++i)
+            {
+                var hitobject = playableBeatmap.HitObjects[i];
+
+                for (int j = i + 1; j < playableBeatmap.HitObjects.Count; ++j)
+                {
+                    var nextHitobject = playableBeatmap.HitObjects[j];
+
+                    // Accounts for rulesets with hitobjects separated by columns, such as Mania.
+                    // In these cases we only care about concurrent objects within the same column.
+                    if ((hitobject as IHasColumn)?.Column != (nextHitobject as IHasColumn)?.Column)
+                        continue;
+
+                    // Two hitobjects cannot be concurrent without also being concurrent with all objects in between.
+                    // So if the next object is not concurrent, then we know no future objects will be either.
+                    if (!areConcurrent(hitobject, nextHitobject))
+                        break;
+
+                    if (hitobject.GetType() == nextHitobject.GetType())
+                        yield return new IssueTemplateConcurrentSame(this).Create(hitobject, nextHitobject);
+                    else
+                        yield return new IssueTemplateConcurrentDifferent(this).Create(hitobject, nextHitobject);
+                }
+            }
+        }
+
+        protected bool areConcurrent(HitObject hitobject, HitObject nextHitobject) => nextHitobject.StartTime <= hitobject.GetEndTime() + ms_leniency;
+
+        public abstract class IssueTemplateConcurrent : IssueTemplate
+        {
+            protected IssueTemplateConcurrent(ICheck check, string unformattedMessage)
+                : base(check, IssueType.Problem, unformattedMessage)
+            {
+            }
+
+            public Issue Create(HitObject hitobject, HitObject nextHitobject)
+            {
+                var hitobjects = new List<HitObject> { hitobject, nextHitobject };
+                return new Issue(hitobjects, this, hitobject.GetType().Name, nextHitobject.GetType().Name)
+                {
+                    Time = nextHitobject.StartTime
+                };
+            }
+        }
+
+        public class IssueTemplateConcurrentSame : IssueTemplateConcurrent
+        {
+            public IssueTemplateConcurrentSame(ICheck check)
+                : base(check, "{0}s are concurrent here.")
+            {
+            }
+        }
+
+        public class IssueTemplateConcurrentDifferent : IssueTemplateConcurrent
+        {
+            public IssueTemplateConcurrentDifferent(ICheck check)
+                : base(check, "{0} and {1} are concurrent here.")
+            {
+            }
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs b/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs
index ff270b6d60..564ef13d8f 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Edit.Checks
 {
     public class CheckUnsnaps : ICheck
     {
-        private const double unsnap_ms_threshold = 2;
+        public const double UNSNAP_MS_THRESHOLD = 2;
 
         public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Compose, "Unsnapped hitobjects");
 
@@ -54,7 +54,7 @@ namespace osu.Game.Rulesets.Edit.Checks
 
         private IEnumerable<Issue> getUnsnapIssues(HitObject hitobject, double unsnap, double time, string postfix = "")
         {
-            if (Math.Abs(unsnap) >= unsnap_ms_threshold)
+            if (Math.Abs(unsnap) >= UNSNAP_MS_THRESHOLD)
                 yield return new IssueTemplate2MsOrMore(this).Create(hitobject, unsnap, time, postfix);
             else if (Math.Abs(unsnap) >= 1)
                 yield return new IssueTemplate1MsOrMore(this).Create(hitobject, unsnap, time, postfix);
diff --git a/osu.Game.Rulesets.Mania/Objects/Types/IHasColumn.cs b/osu.Game/Rulesets/Objects/Types/IHasColumn.cs
similarity index 90%
rename from osu.Game.Rulesets.Mania/Objects/Types/IHasColumn.cs
rename to osu.Game/Rulesets/Objects/Types/IHasColumn.cs
index 1ea3138828..dc07cfbb6a 100644
--- a/osu.Game.Rulesets.Mania/Objects/Types/IHasColumn.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasColumn.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.
 
-namespace osu.Game.Rulesets.Mania.Objects.Types
+namespace osu.Game.Rulesets.Objects.Types
 {
     /// <summary>
     /// A type of hit object which lies in one of a number of predetermined columns.

From b8cdcf56c03ef5f4dc27e204c7efece3ffd4572f Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 26 Apr 2021 20:22:24 +0200
Subject: [PATCH 2867/3722] Add concurrent object check tests

---
 .../Checks/CheckConcurrentObjectsTest.cs      | 194 ++++++++++++++++++
 1 file changed, 194 insertions(+)
 create mode 100644 osu.Game.Tests/Editing/Checks/CheckConcurrentObjectsTest.cs

diff --git a/osu.Game.Tests/Editing/Checks/CheckConcurrentObjectsTest.cs b/osu.Game.Tests/Editing/Checks/CheckConcurrentObjectsTest.cs
new file mode 100644
index 0000000000..0f771427ee
--- /dev/null
+++ b/osu.Game.Tests/Editing/Checks/CheckConcurrentObjectsTest.cs
@@ -0,0 +1,194 @@
+// Copyright (c) ppy 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 Moq;
+using NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit.Checks;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.Objects;
+
+namespace osu.Game.Tests.Editing.Checks
+{
+    [TestFixture]
+    public class CheckConcurrentObjectsTest
+    {
+        private CheckConcurrentObjects check;
+
+        [SetUp]
+        public void Setup()
+        {
+            check = new CheckConcurrentObjects();
+        }
+
+        [Test]
+        public void TestCirclesSeparate()
+        {
+            assertOk(new List<HitObject>
+            {
+                new HitCircle { StartTime = 100 },
+                new HitCircle { StartTime = 150 }
+            });
+        }
+
+        [Test]
+        public void TestCirclesConcurrent()
+        {
+            assertConcurrentSame(new List<HitObject>
+            {
+                new HitCircle { StartTime = 100 },
+                new HitCircle { StartTime = 100 }
+            });
+        }
+
+        [Test]
+        public void TestCirclesAlmostConcurrent()
+        {
+            assertConcurrentSame(new List<HitObject>
+            {
+                new HitCircle { StartTime = 100 },
+                new HitCircle { StartTime = 101 }
+            });
+        }
+
+        [Test]
+        public void TestSlidersSeparate()
+        {
+            assertOk(new List<HitObject>
+            {
+                getSliderMock(startTime: 100, endTime: 400.75d).Object,
+                getSliderMock(startTime: 500, endTime: 900.75d).Object
+            });
+        }
+
+        [Test]
+        public void TestSlidersConcurrent()
+        {
+            assertConcurrentSame(new List<HitObject>
+            {
+                getSliderMock(startTime: 100, endTime: 400.75d).Object,
+                getSliderMock(startTime: 300, endTime: 700.75d).Object
+            });
+        }
+
+        [Test]
+        public void TestSlidersAlmostConcurrent()
+        {
+            assertConcurrentSame(new List<HitObject>
+            {
+                getSliderMock(startTime: 100, endTime: 400.75d).Object,
+                getSliderMock(startTime: 402, endTime: 902.75d).Object
+            });
+        }
+
+        [Test]
+        public void TestSliderAndCircleConcurrent()
+        {
+            assertConcurrentDifferent(new List<HitObject>
+            {
+                getSliderMock(startTime: 100, endTime: 400.75d).Object,
+                new HitCircle { StartTime = 300 }
+            });
+        }
+
+        [Test]
+        public void TestManyObjectsConcurrent()
+        {
+            var hitobjects = new List<HitObject>
+            {
+                getSliderMock(startTime: 100, endTime: 400.75d).Object,
+                new HitCircle { StartTime = 300 },
+                getSliderMock(startTime: 200, endTime: 500.75d).Object
+            };
+
+            var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(3));
+            Assert.That(issues.Where(issue => issue.Template is CheckConcurrentObjects.IssueTemplateConcurrentDifferent).ToList(), Has.Count.EqualTo(2));
+            Assert.That(issues.Any(issue => issue.Template is CheckConcurrentObjects.IssueTemplateConcurrentSame));
+        }
+
+        [Test]
+        public void TestHoldNotesSeparateOnSameColumn()
+        {
+            assertOk(new List<HitObject>
+            {
+                getHoldNoteMock(startTime: 100, endTime: 400.75d, column: 1).Object,
+                getHoldNoteMock(startTime: 500, endTime: 900.75d, column: 1).Object
+            });
+        }
+
+        [Test]
+        public void TestHoldNotesConcurrentOnDifferentColumns()
+        {
+            assertOk(new List<HitObject>
+            {
+                getHoldNoteMock(startTime: 100, endTime: 400.75d, column: 1).Object,
+                getHoldNoteMock(startTime: 300, endTime: 700.75d, column: 2).Object
+            });
+        }
+
+        [Test]
+        public void TestHoldNotesConcurrentOnSameColumn()
+        {
+            assertConcurrentSame(new List<HitObject>
+            {
+                getHoldNoteMock(startTime: 100, endTime: 400.75d, column: 1).Object,
+                getHoldNoteMock(startTime: 300, endTime: 700.75d, column: 1).Object
+            });
+        }
+
+        private Mock<Slider> getSliderMock(double startTime, double endTime, int repeats = 0)
+        {
+            var mock = new Mock<Slider>();
+            mock.SetupGet(s => s.StartTime).Returns(startTime);
+            mock.As<IHasRepeats>().Setup(r => r.RepeatCount).Returns(repeats);
+            mock.As<IHasDuration>().Setup(d => d.EndTime).Returns(endTime);
+
+            return mock;
+        }
+
+        private Mock<HoldNote> getHoldNoteMock(double startTime, double endTime, int column)
+        {
+            var mock = new Mock<HoldNote>();
+            mock.SetupGet(s => s.StartTime).Returns(startTime);
+            mock.As<IHasDuration>().Setup(d => d.EndTime).Returns(endTime);
+            mock.As<IHasColumn>().Setup(c => c.Column).Returns(column);
+
+            return mock;
+        }
+
+        private void assertOk(List<HitObject> hitobjects)
+        {
+            Assert.That(check.Run(getPlayableBeatmap(hitobjects), null), Is.Empty);
+        }
+
+        private void assertConcurrentSame(List<HitObject> hitobjects, int count = 1)
+        {
+            var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(count));
+            Assert.That(issues.All(issue => issue.Template is CheckConcurrentObjects.IssueTemplateConcurrentSame));
+        }
+
+        private void assertConcurrentDifferent(List<HitObject> hitobjects, int count = 1)
+        {
+            var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
+
+            Assert.That(issues, Has.Count.EqualTo(count));
+            Assert.That(issues.All(issue => issue.Template is CheckConcurrentObjects.IssueTemplateConcurrentDifferent));
+        }
+
+        private IBeatmap getPlayableBeatmap(List<HitObject> hitobjects)
+        {
+            return new Beatmap<HitObject>
+            {
+                HitObjects = hitobjects
+            };
+        }
+    }
+}

From b9e4f73f78fa5bf3cdacefdd10d3a186079913be Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 26 Apr 2021 20:28:59 +0200
Subject: [PATCH 2868/3722] Add concurrent objects check to `BeatmapVerifier`

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

diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index aa3459a01a..6754d62a11 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -25,7 +25,8 @@ namespace osu.Game.Rulesets.Edit
             new CheckAudioQuality(),
 
             // Compose
-            new CheckUnsnaps()
+            new CheckUnsnaps(),
+            new CheckConcurrentObjects()
         };
 
         public IEnumerable<Issue> Run(IBeatmap playableBeatmap, WorkingBeatmap workingBeatmap)

From ce258febf6de3ec3e3e1b53cdd240107ca46028c Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 26 Apr 2021 20:32:44 +0200
Subject: [PATCH 2869/3722] Rename `CheckUnsnaps` -> `CheckUnsnappedObjects`

Will potentially have `CheckUnsnappedKiai` or similar later, so this is worth specifying.

Also consistent with `CheckConcurrentObjects`, which will likely have a `CheckConcurrentLines` later.
---
 ...UnsnapsTest.cs => CheckUnsnappedObjectsTest.cs} | 14 +++++++-------
 osu.Game/Rulesets/Edit/BeatmapVerifier.cs          |  2 +-
 .../Rulesets/Edit/Checks/CheckConcurrentObjects.cs |  2 +-
 .../{CheckUnsnaps.cs => CheckUnsnappedObjects.cs}  |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename osu.Game.Tests/Editing/Checks/{CheckUnsnapsTest.cs => CheckUnsnappedObjectsTest.cs} (93%)
 rename osu.Game/Rulesets/Edit/Checks/{CheckUnsnaps.cs => CheckUnsnappedObjects.cs} (98%)

diff --git a/osu.Game.Tests/Editing/Checks/CheckUnsnapsTest.cs b/osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs
similarity index 93%
rename from osu.Game.Tests/Editing/Checks/CheckUnsnapsTest.cs
rename to osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs
index bac3c41cb0..f8cac331bc 100644
--- a/osu.Game.Tests/Editing/Checks/CheckUnsnapsTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs
@@ -15,15 +15,15 @@ using osu.Game.Rulesets.Osu.Objects;
 namespace osu.Game.Tests.Editing.Checks
 {
     [TestFixture]
-    public class CheckUnsnapsTest
+    public class CheckUnsnappedObjectsTest
     {
-        private CheckUnsnaps check;
+        private CheckUnsnappedObjects check;
         private ControlPointInfo cpi;
 
         [SetUp]
         public void Setup()
         {
-            check = new CheckUnsnaps();
+            check = new CheckUnsnappedObjects();
 
             cpi = new ControlPointInfo();
             cpi.Add(100, new TimingControlPoint { BeatLength = 100 });
@@ -108,8 +108,8 @@ namespace osu.Game.Tests.Editing.Checks
             var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(2));
-            Assert.That(issues.Any(issue => issue.Template is CheckUnsnaps.IssueTemplate1MsOrMore));
-            Assert.That(issues.Any(issue => issue.Template is CheckUnsnaps.IssueTemplate2MsOrMore));
+            Assert.That(issues.Any(issue => issue.Template is CheckUnsnappedObjects.IssueTemplate1MsOrMore));
+            Assert.That(issues.Any(issue => issue.Template is CheckUnsnappedObjects.IssueTemplate2MsOrMore));
         }
 
         private Mock<Slider> getSliderMock(double startTime, double endTime, int repeats = 0)
@@ -132,7 +132,7 @@ namespace osu.Game.Tests.Editing.Checks
             var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(count));
-            Assert.That(issues.All(issue => issue.Template is CheckUnsnaps.IssueTemplate1MsOrMore));
+            Assert.That(issues.All(issue => issue.Template is CheckUnsnappedObjects.IssueTemplate1MsOrMore));
         }
 
         private void assert2Ms(List<HitObject> hitobjects, int count = 1)
@@ -140,7 +140,7 @@ namespace osu.Game.Tests.Editing.Checks
             var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(count));
-            Assert.That(issues.All(issue => issue.Template is CheckUnsnaps.IssueTemplate2MsOrMore));
+            Assert.That(issues.All(issue => issue.Template is CheckUnsnappedObjects.IssueTemplate2MsOrMore));
         }
 
         private IBeatmap getPlayableBeatmap(List<HitObject> hitobjects)
diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index 6754d62a11..2f7b7b0ab8 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Edit
             new CheckAudioQuality(),
 
             // Compose
-            new CheckUnsnaps(),
+            new CheckUnsnappedObjects(),
             new CheckConcurrentObjects()
         };
 
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs b/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
index 7c41569fab..bcc8fead18 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Edit.Checks
     public class CheckConcurrentObjects : ICheck
     {
         // We guarantee that the objects are either treated as concurrent or unsnapped when near the same beat divisor.
-        private const double ms_leniency = CheckUnsnaps.UNSNAP_MS_THRESHOLD;
+        private const double ms_leniency = CheckUnsnappedObjects.UNSNAP_MS_THRESHOLD;
 
         public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Compose, "Concurrent hitobjects");
 
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs b/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
similarity index 98%
rename from osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs
rename to osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
index 564ef13d8f..cdcf8a6b80 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckUnsnaps.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Objects.Types;
 
 namespace osu.Game.Rulesets.Edit.Checks
 {
-    public class CheckUnsnaps : ICheck
+    public class CheckUnsnappedObjects : ICheck
     {
         public const double UNSNAP_MS_THRESHOLD = 2;
 

From 9ad30da72943d4bae44dc82e7438d8bb84e14ce0 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Mon, 26 Apr 2021 16:41:26 -0400
Subject: [PATCH 2870/3722] Show a notification if game is run as administrator

---
 osu.Desktop/OsuGameDesktop.cs  |  9 ++++++
 osu.Desktop/osu.Desktop.csproj |  1 +
 osu.Game/Admin/AdminChecker.cs | 57 ++++++++++++++++++++++++++++++++++
 osu.Game/OsuGame.cs            |  5 +++
 4 files changed, 72 insertions(+)
 create mode 100644 osu.Game/Admin/AdminChecker.cs

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index 0c21c75290..1ce79b3b49 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -7,6 +7,7 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.Versioning;
+using System.Security.Principal;
 using System.Threading.Tasks;
 using Microsoft.Win32;
 using osu.Desktop.Overlays;
@@ -20,6 +21,7 @@ using osu.Game.Screens.Menu;
 using osu.Game.Updater;
 using osu.Desktop.Windows;
 using osu.Framework.Threading;
+using osu.Game.Admin;
 using osu.Game.IO;
 
 namespace osu.Desktop
@@ -102,6 +104,8 @@ namespace osu.Desktop
             }
         }
 
+        protected override AdminChecker CreateAdminChecker() => new DesktopAdminChecker();
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -180,5 +184,10 @@ namespace osu.Desktop
                 Task.Factory.StartNew(() => Import(paths), TaskCreationOptions.LongRunning);
             }
         }
+
+        private class DesktopAdminChecker : AdminChecker
+        {
+            protected override bool IsAdmin() => OperatingSystem.IsWindows() ? new WindowsPrincipal(WindowsIdentity.GetCurrent()).IsInRole(WindowsBuiltInRole.Administrator) : Mono.Unix.Native.Syscall.geteuid() == 0;
+        }
     }
 }
diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index 3e0f0cb7f6..6bd0f64218 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -25,6 +25,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="Microsoft.NETCore.Targets" Version="5.0.0" />
+    <PackageReference Include="Mono.Posix.NETStandard" Version="5.20.1-preview" />
     <PackageReference Include="System.IO.Packaging" Version="5.0.0" />
     <PackageReference Include="ppy.squirrel.windows" Version="1.9.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
diff --git a/osu.Game/Admin/AdminChecker.cs b/osu.Game/Admin/AdminChecker.cs
new file mode 100644
index 0000000000..b81e34653e
--- /dev/null
+++ b/osu.Game/Admin/AdminChecker.cs
@@ -0,0 +1,57 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Notifications;
+
+namespace osu.Game.Admin
+{
+    /// <summary>
+    /// Checks if the game is running with elevated privileges (as admin in Windows, root in Unix) and displays a warning notification if so.
+    /// </summary>
+    public class AdminChecker : CompositeDrawable
+    {
+        [Resolved]
+        protected NotificationOverlay Notifications { get; private set; }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            if (IsAdmin())
+                Notifications.Post(new AdminNotification());
+        }
+
+        protected virtual bool IsAdmin() => false;
+
+        private class AdminNotification : SimpleNotification
+        {
+            public override bool IsImportant => true;
+
+            public AdminNotification()
+            {
+                bool isUnix = RuntimeInfo.IsUnix;
+                Text = $"Running osu! as {(isUnix ? "root" : "administrator")} does not improve performance and poses a security risk. Please run the game normally.";
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours, NotificationOverlay notificationOverlay)
+            {
+                Icon = FontAwesome.Solid.ShieldAlt;
+                IconBackgound.Colour = colours.YellowDark;
+
+                Activated = delegate
+                {
+                    notificationOverlay.Hide();
+                    return true;
+                };
+            }
+        }
+    }
+
+
+}
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 28f32ba455..358e85b247 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -28,6 +28,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Threading;
+using osu.Game.Admin;
 using osu.Game.Beatmaps;
 using osu.Game.Collections;
 using osu.Game.Graphics;
@@ -450,6 +451,8 @@ namespace osu.Game
 
         protected virtual UpdateManager CreateUpdateManager() => new UpdateManager();
 
+        protected virtual AdminChecker CreateAdminChecker() => new AdminChecker();
+
         protected override Container CreateScalingContainer() => new ScalingContainer(ScalingMode.Everything);
 
         #region Beatmap progression
@@ -673,6 +676,8 @@ namespace osu.Game
             // dependency on notification overlay, dependent by settings overlay
             loadComponentSingleFile(CreateUpdateManager(), Add, true);
 
+            loadComponentSingleFile(CreateAdminChecker(), Add, false);
+
             // overlay elements
             loadComponentSingleFile(new ManageCollectionsDialog(), overlayContent.Add, true);
             loadComponentSingleFile(beatmapListing = new BeatmapListingOverlay(), overlayContent.Add, true);

From 0f0870c8b875451c2f7ce3e724fb63ee05b776ec Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 27 Apr 2021 00:36:26 +0200
Subject: [PATCH 2871/3722] Sort objects by time in concurrent check test

---
 osu.Game.Tests/Editing/Checks/CheckConcurrentObjectsTest.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Editing/Checks/CheckConcurrentObjectsTest.cs b/osu.Game.Tests/Editing/Checks/CheckConcurrentObjectsTest.cs
index 0f771427ee..ffe5d34e67 100644
--- a/osu.Game.Tests/Editing/Checks/CheckConcurrentObjectsTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckConcurrentObjectsTest.cs
@@ -101,8 +101,8 @@ namespace osu.Game.Tests.Editing.Checks
             var hitobjects = new List<HitObject>
             {
                 getSliderMock(startTime: 100, endTime: 400.75d).Object,
-                new HitCircle { StartTime = 300 },
-                getSliderMock(startTime: 200, endTime: 500.75d).Object
+                getSliderMock(startTime: 200, endTime: 500.75d).Object,
+                new HitCircle { StartTime = 300 }
             };
 
             var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();

From 6d5883abcb6293c54a362c7e765e07a8441b70fd Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 27 Apr 2021 01:19:38 +0200
Subject: [PATCH 2872/3722] Return result of local variable instead

---
 osu.Game/Beatmaps/Beatmap.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Beatmaps/Beatmap.cs b/osu.Game/Beatmaps/Beatmap.cs
index 66b8f169ef..e3a11e2326 100644
--- a/osu.Game/Beatmaps/Beatmap.cs
+++ b/osu.Game/Beatmaps/Beatmap.cs
@@ -95,9 +95,8 @@ namespace osu.Game.Beatmaps
 
             int[] divisors = BindableBeatDivisor.VALID_DIVISORS;
             double smallestUnsnap = divisors.Min(getUnsnap);
-            int closestDivisor = divisors.FirstOrDefault(divisor => getUnsnap(divisor) == smallestUnsnap);
 
-            return closestDivisor;
+            return divisors.FirstOrDefault(divisor => getUnsnap(divisor) == smallestUnsnap);
         }
 
         IBeatmap IBeatmap.Clone() => Clone();

From 217ff8238ea50abeea0ccb62319cd785a91d39f3 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 27 Apr 2021 01:23:03 +0200
Subject: [PATCH 2873/3722] Add snapping time comment

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

diff --git a/osu.Game/Beatmaps/Beatmap.cs b/osu.Game/Beatmaps/Beatmap.cs
index e3a11e2326..6515540527 100644
--- a/osu.Game/Beatmaps/Beatmap.cs
+++ b/osu.Game/Beatmaps/Beatmap.cs
@@ -81,6 +81,7 @@ namespace osu.Game.Beatmaps
             var beatLength = timingPoint.BeatLength / beatDivisor;
             var beatLengths = (int)Math.Round((time - timingPoint.Time) / beatLength, MidpointRounding.AwayFromZero);
 
+            // Casting to int matches stable.
             return (int)(timingPoint.Time + beatLengths * beatLength);
         }
 

From a3c1b1fd52d1a74df5df536d05df6550852c9ab5 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 27 Apr 2021 01:24:38 +0200
Subject: [PATCH 2874/3722] Fix accessibility of `areConcurrent`

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

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs b/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
index bcc8fead18..6e8355024e 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             }
         }
 
-        protected bool areConcurrent(HitObject hitobject, HitObject nextHitobject) => nextHitobject.StartTime <= hitobject.GetEndTime() + ms_leniency;
+        private bool areConcurrent(HitObject hitobject, HitObject nextHitobject) => nextHitobject.StartTime <= hitobject.GetEndTime() + ms_leniency;
 
         public abstract class IssueTemplateConcurrent : IssueTemplate
         {

From 260dd06f4707f378ae2fd7a6fda4852d6160105a Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Mon, 26 Apr 2021 17:41:04 -0400
Subject: [PATCH 2875/3722] Move AdminChecker to osu.Desktop.Admin

---
 {osu.Game => osu.Desktop}/Admin/AdminChecker.cs | 13 ++++++-------
 osu.Desktop/OsuGameDesktop.cs                   | 12 +++---------
 osu.Game/OsuGame.cs                             |  5 -----
 3 files changed, 9 insertions(+), 21 deletions(-)
 rename {osu.Game => osu.Desktop}/Admin/AdminChecker.cs (75%)

diff --git a/osu.Game/Admin/AdminChecker.cs b/osu.Desktop/Admin/AdminChecker.cs
similarity index 75%
rename from osu.Game/Admin/AdminChecker.cs
rename to osu.Desktop/Admin/AdminChecker.cs
index b81e34653e..b9f0d68694 100644
--- a/osu.Game/Admin/AdminChecker.cs
+++ b/osu.Desktop/Admin/AdminChecker.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 System;
+using System.Security.Principal;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
@@ -9,7 +11,7 @@ using osu.Game.Graphics;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
 
-namespace osu.Game.Admin
+namespace osu.Desktop.Admin
 {
     /// <summary>
     /// Checks if the game is running with elevated privileges (as admin in Windows, root in Unix) and displays a warning notification if so.
@@ -22,11 +24,11 @@ namespace osu.Game.Admin
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            if (IsAdmin())
+            if (isAdmin())
                 Notifications.Post(new AdminNotification());
         }
 
-        protected virtual bool IsAdmin() => false;
+        private bool isAdmin() => OperatingSystem.IsWindows() ? new WindowsPrincipal(WindowsIdentity.GetCurrent()).IsInRole(WindowsBuiltInRole.Administrator) : Mono.Unix.Native.Syscall.geteuid() == 0;
 
         private class AdminNotification : SimpleNotification
         {
@@ -34,8 +36,7 @@ namespace osu.Game.Admin
 
             public AdminNotification()
             {
-                bool isUnix = RuntimeInfo.IsUnix;
-                Text = $"Running osu! as {(isUnix ? "root" : "administrator")} does not improve performance and poses a security risk. Please run the game normally.";
+                Text = $"Running osu! as {(RuntimeInfo.IsUnix ? "root" : "administrator")} does not improve performance and poses a security risk. Please run the game normally.";
             }
 
             [BackgroundDependencyLoader]
@@ -52,6 +53,4 @@ namespace osu.Game.Admin
             }
         }
     }
-
-
 }
diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index 1ce79b3b49..77f968e1b6 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -7,9 +7,9 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.Versioning;
-using System.Security.Principal;
 using System.Threading.Tasks;
 using Microsoft.Win32;
+using osu.Desktop.Admin;
 using osu.Desktop.Overlays;
 using osu.Framework.Platform;
 using osu.Game;
@@ -21,7 +21,6 @@ using osu.Game.Screens.Menu;
 using osu.Game.Updater;
 using osu.Desktop.Windows;
 using osu.Framework.Threading;
-using osu.Game.Admin;
 using osu.Game.IO;
 
 namespace osu.Desktop
@@ -104,8 +103,6 @@ namespace osu.Desktop
             }
         }
 
-        protected override AdminChecker CreateAdminChecker() => new DesktopAdminChecker();
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -117,6 +114,8 @@ namespace osu.Desktop
 
             if (RuntimeInfo.OS == RuntimeInfo.Platform.Windows)
                 LoadComponentAsync(new GameplayWinKeyBlocker(), Add);
+
+            LoadComponentAsync(new AdminChecker(), Add);
         }
 
         protected override void ScreenChanged(IScreen lastScreen, IScreen newScreen)
@@ -184,10 +183,5 @@ namespace osu.Desktop
                 Task.Factory.StartNew(() => Import(paths), TaskCreationOptions.LongRunning);
             }
         }
-
-        private class DesktopAdminChecker : AdminChecker
-        {
-            protected override bool IsAdmin() => OperatingSystem.IsWindows() ? new WindowsPrincipal(WindowsIdentity.GetCurrent()).IsInRole(WindowsBuiltInRole.Administrator) : Mono.Unix.Native.Syscall.geteuid() == 0;
-        }
     }
 }
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 358e85b247..28f32ba455 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -28,7 +28,6 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Threading;
-using osu.Game.Admin;
 using osu.Game.Beatmaps;
 using osu.Game.Collections;
 using osu.Game.Graphics;
@@ -451,8 +450,6 @@ namespace osu.Game
 
         protected virtual UpdateManager CreateUpdateManager() => new UpdateManager();
 
-        protected virtual AdminChecker CreateAdminChecker() => new AdminChecker();
-
         protected override Container CreateScalingContainer() => new ScalingContainer(ScalingMode.Everything);
 
         #region Beatmap progression
@@ -676,8 +673,6 @@ namespace osu.Game
             // dependency on notification overlay, dependent by settings overlay
             loadComponentSingleFile(CreateUpdateManager(), Add, true);
 
-            loadComponentSingleFile(CreateAdminChecker(), Add, false);
-
             // overlay elements
             loadComponentSingleFile(new ManageCollectionsDialog(), overlayContent.Add, true);
             loadComponentSingleFile(beatmapListing = new BeatmapListingOverlay(), overlayContent.Add, true);

From 9e49ecb57311b3d8e83c9c8655cca8e13e0342bb Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 27 Apr 2021 02:23:06 +0200
Subject: [PATCH 2876/3722] Remove unused `virtual` keywords

Added these in a previous iteration, where I had the mania variant inherit this class.

No longer necessary as `IHasColumn` was used to make this check more generic.
---
 osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs b/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
index 6e8355024e..ddebe2923a 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
@@ -16,13 +16,13 @@ namespace osu.Game.Rulesets.Edit.Checks
 
         public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Compose, "Concurrent hitobjects");
 
-        public virtual IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
+        public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
         {
             new IssueTemplateConcurrentSame(this),
             new IssueTemplateConcurrentDifferent(this)
         };
 
-        public virtual IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap)
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap)
         {
             for (int i = 0; i < playableBeatmap.HitObjects.Count - 1; ++i)
             {

From 7a6e9e5070b63d7b1563108f170ca676994e8b5f Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 27 Apr 2021 02:32:57 +0200
Subject: [PATCH 2877/3722] Change category of unsnap check to timing

Makes more sense, as this is typically the result of timing changes.
---
 osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs b/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
index cdcf8a6b80..74a2ce2fd7 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Edit.Checks
     {
         public const double UNSNAP_MS_THRESHOLD = 2;
 
-        public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Compose, "Unsnapped hitobjects");
+        public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Timing, "Unsnapped hitobjects");
 
         public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
         {

From c3bad1d4c599e43846c8f0e596b370bc082ef5ed Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Mon, 26 Apr 2021 21:05:18 -0400
Subject: [PATCH 2878/3722] Rename AdminChecker to ElevatedPrivilegesChecker,
 refactor elevated check

---
 ...hecker.cs => ElevatedPrivilegesChecker.cs} | 30 ++++++++++++++-----
 osu.Desktop/OsuGameDesktop.cs                 |  2 +-
 2 files changed, 23 insertions(+), 9 deletions(-)
 rename osu.Desktop/Admin/{AdminChecker.cs => ElevatedPrivilegesChecker.cs} (64%)

diff --git a/osu.Desktop/Admin/AdminChecker.cs b/osu.Desktop/Admin/ElevatedPrivilegesChecker.cs
similarity index 64%
rename from osu.Desktop/Admin/AdminChecker.cs
rename to osu.Desktop/Admin/ElevatedPrivilegesChecker.cs
index b9f0d68694..ea4aab0f85 100644
--- a/osu.Desktop/Admin/AdminChecker.cs
+++ b/osu.Desktop/Admin/ElevatedPrivilegesChecker.cs
@@ -5,7 +5,7 @@ using System;
 using System.Security.Principal;
 using osu.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Overlays;
@@ -16,7 +16,7 @@ namespace osu.Desktop.Admin
     /// <summary>
     /// Checks if the game is running with elevated privileges (as admin in Windows, root in Unix) and displays a warning notification if so.
     /// </summary>
-    public class AdminChecker : CompositeDrawable
+    public class ElevatedPrivilegesChecker : Component
     {
         [Resolved]
         protected NotificationOverlay Notifications { get; private set; }
@@ -24,17 +24,31 @@ namespace osu.Desktop.Admin
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            if (isAdmin())
-                Notifications.Post(new AdminNotification());
+
+            bool elevated = false;
+
+            if (OperatingSystem.IsWindows())
+            {
+                var windowsIdentity = WindowsIdentity.GetCurrent();
+                var windowsPrincipal = new WindowsPrincipal(windowsIdentity);
+                elevated = windowsPrincipal.IsInRole(WindowsBuiltInRole.Administrator);
+            }
+            else if (RuntimeInfo.IsUnix)
+            {
+                elevated = Mono.Unix.Native.Syscall.geteuid() == 0;
+            }
+
+            if (!elevated)
+                return;
+
+            Notifications.Post(new ElevatedPrivilegesNotification());
         }
 
-        private bool isAdmin() => OperatingSystem.IsWindows() ? new WindowsPrincipal(WindowsIdentity.GetCurrent()).IsInRole(WindowsBuiltInRole.Administrator) : Mono.Unix.Native.Syscall.geteuid() == 0;
-
-        private class AdminNotification : SimpleNotification
+        private class ElevatedPrivilegesNotification : SimpleNotification
         {
             public override bool IsImportant => true;
 
-            public AdminNotification()
+            public ElevatedPrivilegesNotification()
             {
                 Text = $"Running osu! as {(RuntimeInfo.IsUnix ? "root" : "administrator")} does not improve performance and poses a security risk. Please run the game normally.";
             }
diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index 77f968e1b6..9f7854779e 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -115,7 +115,7 @@ namespace osu.Desktop
             if (RuntimeInfo.OS == RuntimeInfo.Platform.Windows)
                 LoadComponentAsync(new GameplayWinKeyBlocker(), Add);
 
-            LoadComponentAsync(new AdminChecker(), Add);
+            LoadComponentAsync(new ElevatedPrivilegesChecker(), Add);
         }
 
         protected override void ScreenChanged(IScreen lastScreen, IScreen newScreen)

From a2723f3f579565b2aca0e1c6159362838c9c559b Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Mon, 26 Apr 2021 22:37:08 -0400
Subject: [PATCH 2879/3722] Perform elevated check asynchronously, use a
 separate function w/ switch statement

---
 osu.Desktop/OsuGameDesktop.cs                 |  2 +-
 .../ElevatedPrivilegesChecker.cs              | 48 +++++++++++++------
 osu.Desktop/osu.Desktop.csproj                |  2 +-
 3 files changed, 35 insertions(+), 17 deletions(-)
 rename osu.Desktop/{Admin => Security}/ElevatedPrivilegesChecker.cs (66%)

diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index 9f7854779e..4a28ab3722 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -9,7 +9,7 @@ using System.Reflection;
 using System.Runtime.Versioning;
 using System.Threading.Tasks;
 using Microsoft.Win32;
-using osu.Desktop.Admin;
+using osu.Desktop.Security;
 using osu.Desktop.Overlays;
 using osu.Framework.Platform;
 using osu.Game;
diff --git a/osu.Desktop/Admin/ElevatedPrivilegesChecker.cs b/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
similarity index 66%
rename from osu.Desktop/Admin/ElevatedPrivilegesChecker.cs
rename to osu.Desktop/Security/ElevatedPrivilegesChecker.cs
index ea4aab0f85..a719dbf952 100644
--- a/osu.Desktop/Admin/ElevatedPrivilegesChecker.cs
+++ b/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
@@ -11,7 +11,7 @@ using osu.Game.Graphics;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
 
-namespace osu.Desktop.Admin
+namespace osu.Desktop.Security
 {
     /// <summary>
     /// Checks if the game is running with elevated privileges (as admin in Windows, root in Unix) and displays a warning notification if so.
@@ -21,36 +21,54 @@ namespace osu.Desktop.Admin
         [Resolved]
         protected NotificationOverlay Notifications { get; private set; }
 
+        private bool elevated;
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            bool elevated = false;
-
-            if (OperatingSystem.IsWindows())
-            {
-                var windowsIdentity = WindowsIdentity.GetCurrent();
-                var windowsPrincipal = new WindowsPrincipal(windowsIdentity);
-                elevated = windowsPrincipal.IsInRole(WindowsBuiltInRole.Administrator);
-            }
-            else if (RuntimeInfo.IsUnix)
-            {
-                elevated = Mono.Unix.Native.Syscall.geteuid() == 0;
-            }
-
             if (!elevated)
                 return;
 
             Notifications.Post(new ElevatedPrivilegesNotification());
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            elevated = isElevated();
+        }
+
+        private bool isElevated()
+        {
+            switch (RuntimeInfo.OS)
+            {
+                case RuntimeInfo.Platform.Windows:
+                {
+                    if (!OperatingSystem.IsWindows()) return false;
+
+                    var windowsIdentity = WindowsIdentity.GetCurrent();
+                    var windowsPrincipal = new WindowsPrincipal(windowsIdentity);
+
+                    return windowsPrincipal.IsInRole(WindowsBuiltInRole.Administrator);
+                }
+
+                case RuntimeInfo.Platform.macOS:
+                case RuntimeInfo.Platform.Linux:
+                    return Mono.Unix.Native.Syscall.geteuid() == 0;
+
+                default:
+                    return false;
+            }
+        }
+
         private class ElevatedPrivilegesNotification : SimpleNotification
         {
             public override bool IsImportant => true;
 
             public ElevatedPrivilegesNotification()
             {
-                Text = $"Running osu! as {(RuntimeInfo.IsUnix ? "root" : "administrator")} does not improve performance and poses a security risk. Please run the game normally.";
+                Text = $"Running osu! as {(RuntimeInfo.IsUnix ? "root" : "administrator")} does not improve performance and poses a security risk. Please run the game as a normal user.";
             }
 
             [BackgroundDependencyLoader]
diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index 6bd0f64218..ad5c323e9b 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -25,7 +25,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="Microsoft.NETCore.Targets" Version="5.0.0" />
-    <PackageReference Include="Mono.Posix.NETStandard" Version="5.20.1-preview" />
+    <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
     <PackageReference Include="System.IO.Packaging" Version="5.0.0" />
     <PackageReference Include="ppy.squirrel.windows" Version="1.9.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />

From e0f54f58424f6fc77d79fe12ef6f6a511e4b6f71 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Mon, 26 Apr 2021 22:51:03 -0400
Subject: [PATCH 2880/3722] Move load() before LoadComplete()

---
 osu.Desktop/Security/ElevatedPrivilegesChecker.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Desktop/Security/ElevatedPrivilegesChecker.cs b/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
index a719dbf952..5fb8263516 100644
--- a/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
+++ b/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
@@ -23,6 +23,12 @@ namespace osu.Desktop.Security
 
         private bool elevated;
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            elevated = isElevated();
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -33,12 +39,6 @@ namespace osu.Desktop.Security
             Notifications.Post(new ElevatedPrivilegesNotification());
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            elevated = isElevated();
-        }
-
         private bool isElevated()
         {
             switch (RuntimeInfo.OS)

From 5a3fbef5ace66e56b2f5312aacf74a4e2ff26793 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Tue, 27 Apr 2021 00:23:08 -0400
Subject: [PATCH 2881/3722] Use a try-catch, notification activation does
 nothing

---
 .../Security/ElevatedPrivilegesChecker.cs     | 45 +++++++++----------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/osu.Desktop/Security/ElevatedPrivilegesChecker.cs b/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
index 5fb8263516..47705eb929 100644
--- a/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
+++ b/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
@@ -19,7 +19,7 @@ namespace osu.Desktop.Security
     public class ElevatedPrivilegesChecker : Component
     {
         [Resolved]
-        protected NotificationOverlay Notifications { get; private set; }
+        private NotificationOverlay notifications { get; set; }
 
         private bool elevated;
 
@@ -33,32 +33,35 @@ namespace osu.Desktop.Security
         {
             base.LoadComplete();
 
-            if (!elevated)
-                return;
-
-            Notifications.Post(new ElevatedPrivilegesNotification());
+            if (elevated)
+                notifications.Post(new ElevatedPrivilegesNotification());
         }
 
         private bool isElevated()
         {
-            switch (RuntimeInfo.OS)
+            try
             {
-                case RuntimeInfo.Platform.Windows:
+                switch (RuntimeInfo.OS)
                 {
-                    if (!OperatingSystem.IsWindows()) return false;
+                    case RuntimeInfo.Platform.Windows:
+                        if (!OperatingSystem.IsWindows()) return false;
 
-                    var windowsIdentity = WindowsIdentity.GetCurrent();
-                    var windowsPrincipal = new WindowsPrincipal(windowsIdentity);
+                        var windowsIdentity = WindowsIdentity.GetCurrent();
+                        var windowsPrincipal = new WindowsPrincipal(windowsIdentity);
 
-                    return windowsPrincipal.IsInRole(WindowsBuiltInRole.Administrator);
+                        return windowsPrincipal.IsInRole(WindowsBuiltInRole.Administrator);
+
+                    case RuntimeInfo.Platform.macOS:
+                    case RuntimeInfo.Platform.Linux:
+                        return Mono.Unix.Native.Syscall.geteuid() == 0;
+
+                    default:
+                        return false;
                 }
-
-                case RuntimeInfo.Platform.macOS:
-                case RuntimeInfo.Platform.Linux:
-                    return Mono.Unix.Native.Syscall.geteuid() == 0;
-
-                default:
-                    return false;
+            }
+            catch
+            {
+                return false;
             }
         }
 
@@ -77,11 +80,7 @@ namespace osu.Desktop.Security
                 Icon = FontAwesome.Solid.ShieldAlt;
                 IconBackgound.Colour = colours.YellowDark;
 
-                Activated = delegate
-                {
-                    notificationOverlay.Hide();
-                    return true;
-                };
+                Activated = () => true;
             }
         }
     }

From ec1c336b0aca43376e853e0a4d0826368924a95d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Apr 2021 13:23:14 +0900
Subject: [PATCH 2882/3722] Fix a couple of inspections

---
 .../Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs       | 2 +-
 osu.Game/Rulesets/Edit/SelectionBlueprint.cs                  | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 77ea3b05dc..8b20df9a68 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -207,7 +207,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             var lastPiece = controlPointVisualiser.Pieces.Single(p => p.ControlPoint == last);
 
             lastPoint = last;
-            return lastPiece?.IsHovered != true;
+            return lastPiece.IsHovered != true;
         }
 
         private void updateSlider()
diff --git a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
index 99cdca045b..337a806b6e 100644
--- a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
@@ -3,7 +3,6 @@
 
 using System;
 using osu.Framework;
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
@@ -35,9 +34,6 @@ namespace osu.Game.Rulesets.Edit
         public override bool HandlePositionalInput => ShouldBeAlive;
         public override bool RemoveWhenNotAlive => false;
 
-        [Resolved(CanBeNull = true)]
-        private HitObjectComposer composer { get; set; }
-
         protected SelectionBlueprint(HitObject hitObject)
         {
             HitObject = hitObject;

From 7980d16b4c202bcb063c0569112ad76463e8a9c6 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 27 Apr 2021 14:26:12 +0900
Subject: [PATCH 2883/3722] Add failing test showing the issue of DHO lifetime

---
 .../Gameplay/TestSceneDrawableHitObject.cs    | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs

diff --git a/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs b/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs
new file mode 100644
index 0000000000..d42802db91
--- /dev/null
+++ b/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.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 NUnit.Framework;
+using osu.Framework.Testing;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Tests.Gameplay
+{
+    [HeadlessTest]
+    public class TestSceneDrawableHitObject : OsuTestScene
+    {
+        [Test]
+        public void TestEntryLifetime()
+        {
+            TestDrawableHitObject dho = null;
+            var initialHitObject = new HitObject
+            {
+                StartTime = 1000
+            };
+            var entry = new TestLifetimeEntry(new HitObject
+            {
+                StartTime = 2000
+            });
+
+            AddStep("Create DHO", () => Child = dho = new TestDrawableHitObject(initialHitObject));
+
+            AddAssert("Correct initial lifetime", () => dho.LifetimeStart == initialHitObject.StartTime - TestDrawableHitObject.INITIAL_LIFETIME_OFFSET);
+
+            AddStep("Apply entry", () => dho.Apply(entry));
+
+            AddAssert("Correct initial lifetime", () => dho.LifetimeStart == entry.HitObject.StartTime - TestLifetimeEntry.INITIAL_LIFETIME_OFFSET);
+
+            AddStep("Set lifetime", () => dho.LifetimeEnd = 3000);
+            AddAssert("Entry lifetime is updated", () => entry.LifetimeEnd == 3000);
+        }
+
+        private class TestDrawableHitObject : DrawableHitObject
+        {
+            public const double INITIAL_LIFETIME_OFFSET = 100;
+            protected override double InitialLifetimeOffset => INITIAL_LIFETIME_OFFSET;
+
+            public TestDrawableHitObject(HitObject hitObject)
+                : base(hitObject)
+            {
+            }
+        }
+
+        private class TestLifetimeEntry : HitObjectLifetimeEntry
+        {
+            public const double INITIAL_LIFETIME_OFFSET = 200;
+            protected override double InitialLifetimeOffset => INITIAL_LIFETIME_OFFSET;
+
+            public TestLifetimeEntry(HitObject hitObject)
+                : base(hitObject)
+            {
+            }
+        }
+    }
+}

From 2303d108bb56b8214c788c18b59424d3fe69858e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Apr 2021 14:35:14 +0900
Subject: [PATCH 2884/3722] Simplify false return path

---
 osu.Desktop/Security/ElevatedPrivilegesChecker.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Desktop/Security/ElevatedPrivilegesChecker.cs b/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
index 47705eb929..92885ad855 100644
--- a/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
+++ b/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
@@ -54,15 +54,13 @@ namespace osu.Desktop.Security
                     case RuntimeInfo.Platform.macOS:
                     case RuntimeInfo.Platform.Linux:
                         return Mono.Unix.Native.Syscall.geteuid() == 0;
-
-                    default:
-                        return false;
                 }
             }
             catch
             {
-                return false;
             }
+
+            return false;
         }
 
         private class ElevatedPrivilegesNotification : SimpleNotification

From 13de571b3c690b2def91c4331b3b70bff00c4719 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Apr 2021 14:35:57 +0900
Subject: [PATCH 2885/3722] Rename private method

---
 osu.Desktop/Security/ElevatedPrivilegesChecker.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Desktop/Security/ElevatedPrivilegesChecker.cs b/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
index 92885ad855..82e7d2a141 100644
--- a/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
+++ b/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
@@ -26,7 +26,7 @@ namespace osu.Desktop.Security
         [BackgroundDependencyLoader]
         private void load()
         {
-            elevated = isElevated();
+            elevated = checkElevated();
         }
 
         protected override void LoadComplete()
@@ -37,7 +37,7 @@ namespace osu.Desktop.Security
                 notifications.Post(new ElevatedPrivilegesNotification());
         }
 
-        private bool isElevated()
+        private bool checkElevated()
         {
             try
             {

From 2673cd3d9935025232453d9b371d516bc6b7de8b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Apr 2021 14:36:11 +0900
Subject: [PATCH 2886/3722] Remove unnecessary noop action

---
 osu.Desktop/Security/ElevatedPrivilegesChecker.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Desktop/Security/ElevatedPrivilegesChecker.cs b/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
index 82e7d2a141..edd4906421 100644
--- a/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
+++ b/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
@@ -77,8 +77,6 @@ namespace osu.Desktop.Security
             {
                 Icon = FontAwesome.Solid.ShieldAlt;
                 IconBackgound.Colour = colours.YellowDark;
-
-                Activated = () => true;
             }
         }
     }

From dbcb1259e2c07a726b8be0b1d12aca362c43df7f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Apr 2021 14:38:19 +0900
Subject: [PATCH 2887/3722] Add a note about elevated privileges also breaking
 integrations

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

diff --git a/osu.Desktop/Security/ElevatedPrivilegesChecker.cs b/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
index edd4906421..01458b4c37 100644
--- a/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
+++ b/osu.Desktop/Security/ElevatedPrivilegesChecker.cs
@@ -69,7 +69,7 @@ namespace osu.Desktop.Security
 
             public ElevatedPrivilegesNotification()
             {
-                Text = $"Running osu! as {(RuntimeInfo.IsUnix ? "root" : "administrator")} does not improve performance and poses a security risk. Please run the game as a normal user.";
+                Text = $"Running osu! as {(RuntimeInfo.IsUnix ? "root" : "administrator")} does not improve performance, may break integrations and poses a security risk. Please run the game as a normal user.";
             }
 
             [BackgroundDependencyLoader]

From a2c0951d94102cee2660e65412ffb4c4850114f1 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 27 Apr 2021 15:23:33 +0900
Subject: [PATCH 2888/3722] Use overriding instead of hiding in
 HitObjectLifetimeEntry

Hidden properties are used when the type is the base class. It caused issues when `DrawableHitObject` logic is factored out to `PoolableDrawableWithLifetime` because it is using the base `LifetimeEntry`, not `HitObjectLifetimeEntry`.
---
 .../Objects/Drawables/DrawableHitObject.cs    |  5 ++-
 .../Objects/HitObjectLifetimeEntry.cs         | 41 +++++--------------
 2 files changed, 13 insertions(+), 33 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 7739994527..6431ec8980 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -11,6 +11,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Performance;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Threading;
 using osu.Game.Audio;
@@ -431,7 +432,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         /// <summary>
         /// Apply (generally fade-in) transforms leading into the <see cref="HitObject"/> start time.
-        /// The local drawable hierarchy is recursively delayed to <see cref="HitObjectLifetimeEntry.LifetimeStart"/> for convenience.
+        /// The local drawable hierarchy is recursively delayed to <see cref="LifetimeEntry.LifetimeStart"/> for convenience.
         ///
         /// By default this will fade in the object from zero with no duration.
         /// </summary>
@@ -613,7 +614,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// <remarks>
         /// This is only used as an optimisation to delay the initial update of this <see cref="DrawableHitObject"/> and may be tuned more aggressively if required.
         /// It is indirectly used to decide the automatic transform offset provided to <see cref="UpdateInitialTransforms"/>.
-        /// A more accurate <see cref="HitObjectLifetimeEntry.LifetimeStart"/> should be set for further optimisation (in <see cref="LoadComplete"/>, for example).
+        /// A more accurate <see cref="LifetimeEntry.LifetimeStart"/> should be set for further optimisation (in <see cref="LoadComplete"/>, for example).
         /// <para>
         /// Only has an effect if this <see cref="DrawableHitObject"/> is not being pooled.
         /// For pooled <see cref="DrawableHitObject"/>s, use <see cref="HitObjectLifetimeEntry.InitialLifetimeOffset"/> instead.
diff --git a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
index 1954d7e6d2..23e991d00e 100644
--- a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
+++ b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
@@ -38,40 +38,19 @@ namespace osu.Game.Rulesets.Objects
             startTimeBindable.BindValueChanged(onStartTimeChanged, true);
         }
 
-        // The lifetime start, as set by the hitobject.
+        // The lifetime, as set by the hitobject.
         private double realLifetimeStart = double.MinValue;
-
-        /// <summary>
-        /// The time at which the <see cref="HitObject"/> should become alive.
-        /// </summary>
-        public new double LifetimeStart
-        {
-            get => realLifetimeStart;
-            set => setLifetime(realLifetimeStart = value, LifetimeEnd);
-        }
-
-        // The lifetime end, as set by the hitobject.
         private double realLifetimeEnd = double.MaxValue;
 
-        /// <summary>
-        /// The time at which the <see cref="HitObject"/> should become dead.
-        /// </summary>
-        public new double LifetimeEnd
+        public override void SetLifetime(double start, double end)
         {
-            get => realLifetimeEnd;
-            set => setLifetime(LifetimeStart, realLifetimeEnd = value);
-        }
+            realLifetimeStart = start;
+            realLifetimeEnd = end;
 
-        private void setLifetime(double start, double end)
-        {
             if (keepAlive)
-            {
-                start = double.MinValue;
-                end = double.MaxValue;
-            }
-
-            base.LifetimeStart = start;
-            base.LifetimeEnd = end;
+                base.SetLifetime(double.MinValue, double.MaxValue);
+            else
+                base.SetLifetime(start, end);
         }
 
         private bool keepAlive;
@@ -87,7 +66,7 @@ namespace osu.Game.Rulesets.Objects
                     return;
 
                 keepAlive = value;
-                setLifetime(realLifetimeStart, realLifetimeEnd);
+                SetLifetime(realLifetimeStart, realLifetimeEnd);
             }
         }
 
@@ -98,12 +77,12 @@ namespace osu.Game.Rulesets.Objects
         /// <remarks>
         /// This is only used as an optimisation to delay the initial update of the <see cref="HitObject"/> and may be tuned more aggressively if required.
         /// It is indirectly used to decide the automatic transform offset provided to <see cref="DrawableHitObject.UpdateInitialTransforms"/>.
-        /// A more accurate <see cref="LifetimeStart"/> should be set for further optimisation (in <see cref="DrawableHitObject.LoadComplete"/>, for example).
+        /// A more accurate <see cref="LifetimeEntry.LifetimeStart"/> should be set for further optimisation (in <see cref="DrawableHitObject.LoadComplete"/>, for example).
         /// </remarks>
         protected virtual double InitialLifetimeOffset => 10000;
 
         /// <summary>
-        /// Resets <see cref="LifetimeStart"/> according to the change in start time of the <see cref="HitObject"/>.
+        /// Resets <see cref="LifetimeEntry.LifetimeStart"/> according to the change in start time of the <see cref="HitObject"/>.
         /// </summary>
         private void onStartTimeChanged(ValueChangedEvent<double> startTime) => LifetimeStart = HitObject.StartTime - InitialLifetimeOffset;
     }

From c9e6ca537896fd7a099d2b4a4338b1ecfcda9001 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 27 Apr 2021 15:24:52 +0900
Subject: [PATCH 2889/3722] Use now-public Entry.SetLifetime method

---
 .../Objects/Pooling/PoolableDrawableWithLifetime.cs         | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs b/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
index 93e476be76..049ff9d446 100644
--- a/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
@@ -100,11 +100,7 @@ namespace osu.Game.Rulesets.Objects.Pooling
             base.LifetimeStart = start;
             base.LifetimeEnd = end;
 
-            if (Entry != null)
-            {
-                Entry.LifetimeStart = start;
-                Entry.LifetimeEnd = end;
-            }
+            Entry?.SetLifetime(start, end);
         }
 
         private void free()

From b75b9a97edfcf27dd2d47dfa95cb34a1a159ae04 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Tue, 27 Apr 2021 14:09:58 +0700
Subject: [PATCH 2890/3722] add OsuMarkdownContainer

All of the markdown file in osu-wiki have YAML frontmatter. This YAML is
parsed as common markdown paragraph. So we add `UseYamlFrontMatter()` in
markdown pipeline builder to parse YAML as `YamlFrontMatterBlock`.
---
 .../Markdown/OsuMarkdownContainer.cs          | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
new file mode 100644
index 0000000000..589c27f0a0
--- /dev/null
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -0,0 +1,35 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using Markdig;
+using Markdig.Extensions.AutoIdentifiers;
+using Markdig.Extensions.Yaml;
+using Markdig.Syntax;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Containers.Markdown;
+
+namespace osu.Game.Graphics.Containers.Markdown
+{
+    public class OsuMarkdownContainer : MarkdownContainer
+    {
+        protected override void AddMarkdownComponent(IMarkdownObject markdownObject, FillFlowContainer container, int level)
+        {
+            switch (markdownObject)
+            {
+                case YamlFrontMatterBlock _:
+                    // Don't parse YAML Frontmatter
+                    break;
+
+                default:
+                    base.AddMarkdownComponent(markdownObject, container, level);
+                    break;
+            }
+        }
+
+        protected override MarkdownPipeline CreateBuilder()
+            => new MarkdownPipelineBuilder().UseAutoIdentifiers(AutoIdentifierOptions.GitHub)
+                                            .UseEmojiAndSmiley()
+                                            .UseYamlFrontMatter()
+                                            .UseAdvancedExtensions().Build();
+    }
+}

From aa07482cbb2f48a193e9afd1dda3ccbea2140170 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Tue, 27 Apr 2021 14:15:19 +0700
Subject: [PATCH 2891/3722] Add OsuMarkdownLinkText

Color from
https://github.com/ppy/osu-web/blob/d56352aeefc412507c3dab7c16e3e3118421b436/resources/assets/less/functions.less#L159-L165
---
 .../Markdown/OsuMarkdownLinkText.cs           | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 osu.Game/Graphics/Containers/Markdown/OsuMarkdownLinkText.cs

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownLinkText.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownLinkText.cs
new file mode 100644
index 0000000000..39b35fd84b
--- /dev/null
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownLinkText.cs
@@ -0,0 +1,32 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using Markdig.Syntax.Inlines;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.Containers.Markdown;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Overlays;
+
+namespace osu.Game.Graphics.Containers.Markdown
+{
+    public class OsuMarkdownLinkText : MarkdownLinkText
+    {
+        private SpriteText spriteText;
+
+        public OsuMarkdownLinkText(string text, LinkInline linkInline)
+            : base(text, linkInline)
+        {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            spriteText.Colour = colourProvider.Light2;
+        }
+
+        public override SpriteText CreateSpriteText()
+        {
+            return spriteText = base.CreateSpriteText();
+        }
+    }
+}

From c686c5224bdd8050f45c25fcf511dee0ac06f96a Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Tue, 27 Apr 2021 14:17:51 +0700
Subject: [PATCH 2892/3722] add OsuMarkdownTextFlowContainer

---
 .../Markdown/OsuMarkdownTextFlowContainer.cs       | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs
new file mode 100644
index 0000000000..7a6818b4c2
--- /dev/null
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs
@@ -0,0 +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 Markdig.Syntax.Inlines;
+using osu.Framework.Graphics.Containers.Markdown;
+
+namespace osu.Game.Graphics.Containers.Markdown
+{
+    public class OsuMarkdownTextFlowContainer : MarkdownTextFlowContainer
+    {
+        protected override void AddLinkText(string text, LinkInline linkInline)
+            => AddDrawable(new OsuMarkdownLinkText(text, linkInline));
+    }
+}

From 6cccbabad83cd5743d51f63c088db7d68ecf3cf5 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Tue, 27 Apr 2021 14:19:16 +0700
Subject: [PATCH 2893/3722] override CreateTextFlow in OsuMarkdownContainer

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

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index 589c27f0a0..fc7ced8ea7 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -12,6 +12,8 @@ namespace osu.Game.Graphics.Containers.Markdown
 {
     public class OsuMarkdownContainer : MarkdownContainer
     {
+        public override MarkdownTextFlowContainer CreateTextFlow() => new OsuMarkdownTextFlowContainer();
+
         protected override void AddMarkdownComponent(IMarkdownObject markdownObject, FillFlowContainer container, int level)
         {
             switch (markdownObject)

From 65aa01866ee8fb6d14ef78ce3873e7bbad4692a8 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Tue, 27 Apr 2021 14:38:21 +0700
Subject: [PATCH 2894/3722] add test scene for OsuMarkdownContainer

---
 .../TestSceneOsuMarkdownContainer.cs          | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
new file mode 100644
index 0000000000..9352404c07
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
@@ -0,0 +1,53 @@
+// Copyright (c) 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.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics.Containers.Markdown;
+using osu.Game.Overlays;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneOsuMarkdownContainer : OsuTestScene
+    {
+        private OsuMarkdownContainer markdownContainer;
+
+        [Cached]
+        private readonly OverlayColourProvider overlayColour = new OverlayColourProvider(OverlayColourScheme.Orange);
+
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            Children = new Drawable[]
+            {
+                new Box
+                {
+                    Colour = overlayColour.Background5,
+                    RelativeSizeAxes = Axes.Both,
+                },
+                new BasicScrollContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Padding = new MarginPadding(20),
+                    Child = markdownContainer = new OsuMarkdownContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y
+                    }
+                }
+            };
+        });
+
+        [Test]
+        public void TestLink()
+        {
+            AddStep("Add Link", () =>
+            {
+                markdownContainer.Text = "[Welcome to osu!](https://osu.ppy.sh)";
+            });
+        }
+    }
+}

From 3899e500d3edf2b15622ed4e5ace339ab68fbdc0 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 27 Apr 2021 17:54:18 +0900
Subject: [PATCH 2895/3722] Adopt framework change of LifetimeEntry

Override SetLifetimeStart/SetLifetimeEnd separately to track individual assignment. It is necessary to ensure real lifetime is not lost when lifetime is partially updated.
---
 .../Rulesets/Objects/HitObjectLifetimeEntry.cs    | 15 +++++++++++++--
 .../Pooling/PoolableDrawableWithLifetime.cs       |  6 +++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
index 23e991d00e..0181d6241b 100644
--- a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
+++ b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
@@ -42,11 +42,22 @@ namespace osu.Game.Rulesets.Objects
         private double realLifetimeStart = double.MinValue;
         private double realLifetimeEnd = double.MaxValue;
 
-        public override void SetLifetime(double start, double end)
+        // This method is called even if `start == LifetimeStart` when `KeepAlive` is true (necessary to update `realLifetimeStart`).
+        protected override void SetLifetimeStart(double start)
         {
+            // This assignment cannot be done in `SetLifetime` because otherwise setting only `LifetimeStart` will make `realLifetimeEnd` to be lost.
             realLifetimeStart = start;
-            realLifetimeEnd = end;
+            base.SetLifetimeStart(start);
+        }
 
+        protected override void SetLifetimeEnd(double end)
+        {
+            realLifetimeEnd = end;
+            base.SetLifetimeEnd(end);
+        }
+
+        protected override void SetLifetime(double start, double end)
+        {
             if (keepAlive)
                 base.SetLifetime(double.MinValue, double.MaxValue);
             else
diff --git a/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs b/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
index 049ff9d446..93e476be76 100644
--- a/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
@@ -100,7 +100,11 @@ namespace osu.Game.Rulesets.Objects.Pooling
             base.LifetimeStart = start;
             base.LifetimeEnd = end;
 
-            Entry?.SetLifetime(start, end);
+            if (Entry != null)
+            {
+                Entry.LifetimeStart = start;
+                Entry.LifetimeEnd = end;
+            }
         }
 
         private void free()

From 6959f2a8ccf182d2362553806f5e687a216237cd Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Tue, 27 Apr 2021 16:01:32 +0700
Subject: [PATCH 2896/3722] add OsuMarkdownFencedCodeBlock

Reference :
https://github.com/ppy/osu-web/blob/d56352aeefc412507c3dab7c16e3e3118421b436/resources/assets/less/bem/osu-md.less#L41-L45
---
 .../TestSceneOsuMarkdownContainer.cs          | 13 ++++++
 .../Markdown/OsuMarkdownContainer.cs          |  6 ++-
 .../Markdown/OsuMarkdownFencedCodeBlock.cs    | 44 +++++++++++++++++++
 3 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game/Graphics/Containers/Markdown/OsuMarkdownFencedCodeBlock.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
index 9352404c07..3d782ee184 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
@@ -49,5 +49,18 @@ namespace osu.Game.Tests.Visual.UserInterface
                 markdownContainer.Text = "[Welcome to osu!](https://osu.ppy.sh)";
             });
         }
+
+        [Test]
+        public void TestFencedCodeBlock()
+        {
+            AddStep("Add Code Block", () =>
+            {
+                markdownContainer.Text = @"```markdown
+# Markdown code block
+
+This is markdown code block.
+```";
+            });
+        }
     }
 }
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index fc7ced8ea7..95f538eab7 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -12,8 +12,6 @@ namespace osu.Game.Graphics.Containers.Markdown
 {
     public class OsuMarkdownContainer : MarkdownContainer
     {
-        public override MarkdownTextFlowContainer CreateTextFlow() => new OsuMarkdownTextFlowContainer();
-
         protected override void AddMarkdownComponent(IMarkdownObject markdownObject, FillFlowContainer container, int level)
         {
             switch (markdownObject)
@@ -28,6 +26,10 @@ namespace osu.Game.Graphics.Containers.Markdown
             }
         }
 
+        public override MarkdownTextFlowContainer CreateTextFlow() => new OsuMarkdownTextFlowContainer();
+
+        protected override MarkdownFencedCodeBlock CreateFencedCodeBlock(FencedCodeBlock fencedCodeBlock) => new OsuMarkdownFencedCodeBlock(fencedCodeBlock);
+
         protected override MarkdownPipeline CreateBuilder()
             => new MarkdownPipelineBuilder().UseAutoIdentifiers(AutoIdentifierOptions.GitHub)
                                             .UseEmojiAndSmiley()
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownFencedCodeBlock.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownFencedCodeBlock.cs
new file mode 100644
index 0000000000..ddd88dd915
--- /dev/null
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownFencedCodeBlock.cs
@@ -0,0 +1,44 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using Markdig.Syntax;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers.Markdown;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Overlays;
+
+namespace osu.Game.Graphics.Containers.Markdown
+{
+    public class OsuMarkdownFencedCodeBlock : MarkdownFencedCodeBlock
+    {
+        private Box background;
+        private MarkdownTextFlowContainer textFlow;
+
+        public OsuMarkdownFencedCodeBlock(FencedCodeBlock fencedCodeBlock)
+            : base(fencedCodeBlock)
+        {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            // TODO : Change to monospace font to match with osu-web
+            background.Colour = colourProvider.Background6;
+            textFlow.Colour = colourProvider.Light1;
+        }
+
+        protected override Drawable CreateBackground()
+        {
+            return background = new Box
+            {
+                RelativeSizeAxes = Axes.Both,
+            };
+        }
+
+        public override MarkdownTextFlowContainer CreateTextFlow()
+        {
+            return textFlow = base.CreateTextFlow();
+        }
+    }
+}

From 003553aba32d5af6a9decf2a7f2b8c307857ac9b Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 27 Apr 2021 18:10:44 +0900
Subject: [PATCH 2897/3722] Add test of HitObjectLifetimeEntry.KeepAlive
 behavior

---
 .../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 d42802db91..2e3f192f1b 100644
--- a/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs
@@ -37,6 +37,38 @@ namespace osu.Game.Tests.Gameplay
             AddAssert("Entry lifetime is updated", () => entry.LifetimeEnd == 3000);
         }
 
+        [Test]
+        public void TestKeepAlive()
+        {
+            TestDrawableHitObject dho = null;
+            TestLifetimeEntry entry = null;
+            AddStep("Create DHO", () =>
+            {
+                dho = new TestDrawableHitObject(null);
+                dho.Apply(entry = new TestLifetimeEntry(new HitObject())
+                {
+                    LifetimeStart = 0,
+                    LifetimeEnd = 1000,
+                });
+                Child = dho;
+            });
+
+            AddStep("KeepAlive = true", () => entry.KeepAlive = true);
+            AddAssert("Lifetime is overriden", () => entry.LifetimeStart == double.MinValue && entry.LifetimeEnd == double.MaxValue);
+
+            AddStep("Set LifetimeStart", () => dho.LifetimeStart = 500);
+            AddStep("KeepAlive = false", () => entry.KeepAlive = false);
+            AddAssert("Lifetime is correct", () => entry.LifetimeStart == 500 && entry.LifetimeEnd == 1000);
+
+            AddStep("Set LifetimeStart while KeepAlive", () =>
+            {
+                entry.KeepAlive = true;
+                dho.LifetimeStart = double.MinValue;
+                entry.KeepAlive = false;
+            });
+            AddAssert("Lifetime is changed", () => entry.LifetimeStart == double.MinValue && entry.LifetimeEnd == 1000);
+        }
+
         private class TestDrawableHitObject : DrawableHitObject
         {
             public const double INITIAL_LIFETIME_OFFSET = 100;

From 3ea55314f2f11c53dc2232e4152beacf7dc7f779 Mon Sep 17 00:00:00 2001
From: Derrick Timmermans <derrick.timmermans@outlook.com>
Date: Tue, 27 Apr 2021 11:29:16 +0200
Subject: [PATCH 2898/3722] Update
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 679c86072b..e715e4aac6 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -430,9 +430,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         }
 
         /// <summary>
-        /// Removes all previously applied transforms, then reapplies a new set of transforms with potentially different parameters.
-        /// The transforms will use the current <see cref="ArmedState"/>, and they will use the appropriate start times.
-        /// This also takes in account potential overrides defined in <see cref="ApplyCustomUpdateState"/>.
+        /// Reapplies the current <see cref="ArmedState"/>.
         /// </summary>
         protected void RefreshStateTransforms() => updateState(State.Value, true);
 

From f2e56bd3060438b70105e0cdb4a630f43ea31151 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Apr 2021 15:40:35 +0900
Subject: [PATCH 2899/3722] Refactor editor selection/blueprint components to
 be generic

---
 .../Edit/ManiaBlueprintContainer.cs           |   3 +-
 .../Edit/ManiaSelectionHandler.cs             |   7 +-
 .../Edit/Blueprints/OsuSelectionBlueprint.cs  |   2 +-
 .../Edit/OsuBlueprintContainer.cs             |   3 +-
 .../Edit/OsuHitObjectComposer.cs              |   2 +-
 .../Edit/OsuSelectionHandler.cs               |   4 +-
 .../Edit/TaikoBlueprintContainer.cs           |   3 +-
 .../Edit/TaikoSelectionHandler.cs             |  11 +-
 .../Editing/TestSceneBlueprintSelection.cs    |   4 +-
 .../Editing/TestSceneEditorClipboard.cs       |   8 +-
 .../Editing/TestSceneEditorSelection.cs       |   6 +-
 .../Edit/OverlaySelectionBlueprint.cs         |   3 +-
 osu.Game/Rulesets/Edit/SelectionBlueprint.cs  |  17 +-
 .../Compose/Components/BlueprintContainer.cs  | 211 +++++----------
 .../Components/ComposeBlueprintContainer.cs   |  12 +-
 .../Components/EditorBlueprintContainer.cs    | 176 +++++++++++++
 .../Components/EditorSelectionHandler.cs      | 233 +++++++++++++++++
 .../HitObjectOrderedSelectionContainer.cs     |  24 +-
 .../Compose/Components/MoveSelectionEvent.cs  |   8 +-
 .../Compose/Components/SelectionHandler.cs    | 247 ++----------------
 .../Timeline/TimelineBlueprintContainer.cs    |  31 +--
 .../Timeline/TimelineHitObjectBlueprint.cs    |  22 +-
 22 files changed, 588 insertions(+), 449 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
 create mode 100644 osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs
index 2fa3f378ff..c4429176d1 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs
@@ -4,6 +4,7 @@
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Screens.Edit.Compose.Components;
 
@@ -30,6 +31,6 @@ namespace osu.Game.Rulesets.Mania.Edit
             return base.CreateBlueprintFor(hitObject);
         }
 
-        protected override SelectionHandler CreateSelectionHandler() => new ManiaSelectionHandler();
+        protected override SelectionHandler<HitObject> CreateSelectionHandler() => new ManiaSelectionHandler();
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
index 2689ed4112..dd059c967c 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
@@ -7,12 +7,13 @@ using osu.Framework.Allocation;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints;
 using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit.Compose.Components;
 
 namespace osu.Game.Rulesets.Mania.Edit
 {
-    public class ManiaSelectionHandler : SelectionHandler
+    public class ManiaSelectionHandler : EditorSelectionHandler
     {
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; }
@@ -20,7 +21,7 @@ namespace osu.Game.Rulesets.Mania.Edit
         [Resolved]
         private HitObjectComposer composer { get; set; }
 
-        public override bool HandleMovement(MoveSelectionEvent moveEvent)
+        public override bool HandleMovement(MoveSelectionEvent<HitObject> moveEvent)
         {
             var maniaBlueprint = (ManiaSelectionBlueprint)moveEvent.Blueprint;
             int lastColumn = maniaBlueprint.DrawableObject.HitObject.Column;
@@ -30,7 +31,7 @@ namespace osu.Game.Rulesets.Mania.Edit
             return true;
         }
 
-        private void performColumnMovement(int lastColumn, MoveSelectionEvent moveEvent)
+        private void performColumnMovement(int lastColumn, MoveSelectionEvent<HitObject> moveEvent)
         {
             var maniaPlayfield = ((ManiaHitObjectComposer)composer).Playfield;
 
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs
index 8dd550bb96..299f8fc43a 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints
     public abstract class OsuSelectionBlueprint<T> : OverlaySelectionBlueprint
         where T : OsuHitObject
     {
-        protected new T HitObject => (T)DrawableObject.HitObject;
+        protected T HitObject => (T)DrawableObject.HitObject;
 
         protected override bool AlwaysShowWhenSelected => true;
 
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs b/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs
index a68ed34e6b..abac5eb56e 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders;
@@ -18,7 +19,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
         }
 
-        protected override SelectionHandler CreateSelectionHandler() => new OsuSelectionHandler();
+        protected override SelectionHandler<HitObject> CreateSelectionHandler() => new OsuSelectionHandler();
 
         public override OverlaySelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject)
         {
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index 7b67d7aaf1..806b7e6051 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -147,7 +147,7 @@ namespace osu.Game.Rulesets.Osu.Edit
                 if (b.IsSelected)
                     continue;
 
-                var hitObject = (OsuHitObject)b.HitObject;
+                var hitObject = (OsuHitObject)b.Item;
 
                 Vector2? snap = checkSnap(hitObject.Position);
                 if (snap == null && hitObject.Position != hitObject.EndPosition)
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index de0a4682a3..92f5254182 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -15,7 +15,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Edit
 {
-    public class OsuSelectionHandler : SelectionHandler
+    public class OsuSelectionHandler : EditorSelectionHandler
     {
         protected override void OnSelectionChanged()
         {
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             referencePathTypes = null;
         }
 
-        public override bool HandleMovement(MoveSelectionEvent moveEvent)
+        public override bool HandleMovement(MoveSelectionEvent<HitObject> moveEvent)
         {
             var hitObjects = selectedMovableObjects;
 
diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.cs
index 8b41448c9d..b1b08a9461 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.Edit.Blueprints;
 using osu.Game.Screens.Edit.Compose.Components;
@@ -15,7 +16,7 @@ namespace osu.Game.Rulesets.Taiko.Edit
         {
         }
 
-        protected override SelectionHandler CreateSelectionHandler() => new TaikoSelectionHandler();
+        protected override SelectionHandler<HitObject> CreateSelectionHandler() => new TaikoSelectionHandler();
 
         public override OverlaySelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject) =>
             new TaikoSelectionBlueprint(hitObject);
diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
index ac2dd4bdb6..20366e5b3a 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
@@ -8,12 +8,13 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Screens.Edit.Compose.Components;
 
 namespace osu.Game.Rulesets.Taiko.Edit
 {
-    public class TaikoSelectionHandler : SelectionHandler
+    public class TaikoSelectionHandler : EditorSelectionHandler
     {
         private readonly Bindable<TernaryState> selectionRimState = new Bindable<TernaryState>();
         private readonly Bindable<TernaryState> selectionStrongState = new Bindable<TernaryState>();
@@ -72,16 +73,16 @@ namespace osu.Game.Rulesets.Taiko.Edit
             });
         }
 
-        protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint> selection)
+        protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint<HitObject>> selection)
         {
-            if (selection.All(s => s.HitObject is Hit))
+            if (selection.All(s => s.Item is Hit))
                 yield return new TernaryStateMenuItem("Rim") { State = { BindTarget = selectionRimState } };
 
-            if (selection.All(s => s.HitObject is TaikoHitObject))
+            if (selection.All(s => s.Item is TaikoHitObject))
                 yield return new TernaryStateMenuItem("Strong") { State = { BindTarget = selectionStrongState } };
         }
 
-        public override bool HandleMovement(MoveSelectionEvent moveEvent) => true;
+        public override bool HandleMovement(MoveSelectionEvent<HitObject> moveEvent) => true;
 
         protected override void UpdateTernaryStates()
         {
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneBlueprintSelection.cs b/osu.Game.Tests/Visual/Editing/TestSceneBlueprintSelection.cs
index fd9c09fd5f..976bf93c15 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneBlueprintSelection.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneBlueprintSelection.cs
@@ -23,8 +23,8 @@ namespace osu.Game.Tests.Visual.Editing
 
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TestBeatmap(ruleset, false);
 
-        private BlueprintContainer blueprintContainer
-            => Editor.ChildrenOfType<BlueprintContainer>().First();
+        private EditorBlueprintContainer blueprintContainer
+            => Editor.ChildrenOfType<EditorBlueprintContainer>().First();
 
         [Test]
         public void TestSelectedObjectHasPriorityWhenOverlapping()
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs
index 01d9966736..3a063af843 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs
@@ -132,8 +132,8 @@ namespace osu.Game.Tests.Visual.Editing
             {
                 AddStep("deselect", () => EditorBeatmap.SelectedHitObjects.Clear());
 
-                AddUntilStep("timeline selection box is not visible", () => Editor.ChildrenOfType<Timeline>().First().ChildrenOfType<SelectionHandler>().First().Alpha == 0);
-                AddUntilStep("composer selection box is not visible", () => Editor.ChildrenOfType<HitObjectComposer>().First().ChildrenOfType<SelectionHandler>().First().Alpha == 0);
+                AddUntilStep("timeline selection box is not visible", () => Editor.ChildrenOfType<Timeline>().First().ChildrenOfType<EditorSelectionHandler>().First().Alpha == 0);
+                AddUntilStep("composer selection box is not visible", () => Editor.ChildrenOfType<HitObjectComposer>().First().ChildrenOfType<EditorSelectionHandler>().First().Alpha == 0);
             }
 
             AddStep("paste hitobject", () => Editor.Paste());
@@ -142,8 +142,8 @@ namespace osu.Game.Tests.Visual.Editing
 
             AddAssert("new object selected", () => EditorBeatmap.SelectedHitObjects.Single().StartTime == 2000);
 
-            AddUntilStep("timeline selection box is visible", () => Editor.ChildrenOfType<Timeline>().First().ChildrenOfType<SelectionHandler>().First().Alpha > 0);
-            AddUntilStep("composer selection box is visible", () => Editor.ChildrenOfType<HitObjectComposer>().First().ChildrenOfType<SelectionHandler>().First().Alpha > 0);
+            AddUntilStep("timeline selection box is visible", () => Editor.ChildrenOfType<Timeline>().First().ChildrenOfType<EditorSelectionHandler>().First().Alpha > 0);
+            AddUntilStep("composer selection box is visible", () => Editor.ChildrenOfType<HitObjectComposer>().First().ChildrenOfType<EditorSelectionHandler>().First().Alpha > 0);
         }
 
         [Test]
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
index b82842e30d..0758d73c2a 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSelection.cs
@@ -26,15 +26,15 @@ namespace osu.Game.Tests.Visual.Editing
 
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TestBeatmap(ruleset, false);
 
-        private BlueprintContainer blueprintContainer
-            => Editor.ChildrenOfType<BlueprintContainer>().First();
+        private EditorBlueprintContainer blueprintContainer
+            => Editor.ChildrenOfType<EditorBlueprintContainer>().First();
 
         private void moveMouseToObject(Func<HitObject> targetFunc)
         {
             AddStep("move mouse to object", () =>
             {
                 var pos = blueprintContainer.SelectionBlueprints
-                                            .First(s => s.HitObject == targetFunc())
+                                            .First(s => s.Item == targetFunc())
                                             .ChildrenOfType<HitCirclePiece>()
                                             .First().ScreenSpaceDrawQuad.Centre;
 
diff --git a/osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs b/osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs
index 75200e3027..6369112d80 100644
--- a/osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs
@@ -3,12 +3,13 @@
 
 using osu.Framework.Graphics.Primitives;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osuTK;
 
 namespace osu.Game.Rulesets.Edit
 {
-    public abstract class OverlaySelectionBlueprint : SelectionBlueprint
+    public abstract class OverlaySelectionBlueprint : SelectionBlueprint<HitObject>
     {
         /// <summary>
         /// The <see cref="DrawableHitObject"/> which this <see cref="OverlaySelectionBlueprint"/> applies to.
diff --git a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
index 337a806b6e..905e433731 100644
--- a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osuTK;
 
@@ -17,26 +16,26 @@ namespace osu.Game.Rulesets.Edit
     /// <summary>
     /// A blueprint placed above a <see cref="DrawableHitObject"/> adding editing functionality.
     /// </summary>
-    public abstract class SelectionBlueprint : CompositeDrawable, IStateful<SelectionState>
+    public abstract class SelectionBlueprint<T> : CompositeDrawable, IStateful<SelectionState>
     {
-        public readonly HitObject HitObject;
+        public readonly T Item;
 
         /// <summary>
-        /// Invoked when this <see cref="SelectionBlueprint"/> has been selected.
+        /// Invoked when this <see cref="SelectionBlueprint{T}"/> has been selected.
         /// </summary>
-        public event Action<SelectionBlueprint> Selected;
+        public event Action<SelectionBlueprint<T>> Selected;
 
         /// <summary>
-        /// Invoked when this <see cref="SelectionBlueprint"/> has been deselected.
+        /// Invoked when this <see cref="SelectionBlueprint{T}"/> has been deselected.
         /// </summary>
-        public event Action<SelectionBlueprint> Deselected;
+        public event Action<SelectionBlueprint<T>> Deselected;
 
         public override bool HandlePositionalInput => ShouldBeAlive;
         public override bool RemoveWhenNotAlive => false;
 
-        protected SelectionBlueprint(HitObject hitObject)
+        protected SelectionBlueprint(T item)
         {
-            HitObject = hitObject;
+            Item = item;
 
             RelativeSizeAxes = Axes.Both;
             AlwaysPresent = true;
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index f70e063ba9..a0bb4feadc 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -3,11 +3,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
@@ -25,37 +23,26 @@ namespace osu.Game.Screens.Edit.Compose.Components
 {
     /// <summary>
     /// A container which provides a "blueprint" display of hitobjects.
-    /// Includes selection and manipulation support via a <see cref="Components.SelectionHandler"/>.
+    /// Includes selection and manipulation support via a <see cref="Components.SelectionHandler{T}"/>.
     /// </summary>
-    public abstract class BlueprintContainer : CompositeDrawable, IKeyBindingHandler<PlatformAction>
+    public abstract class BlueprintContainer<T> : CompositeDrawable, IKeyBindingHandler<PlatformAction>
     {
         protected DragBox DragBox { get; private set; }
 
-        public Container<SelectionBlueprint> SelectionBlueprints { get; private set; }
+        public Container<SelectionBlueprint<T>> SelectionBlueprints { get; private set; }
 
-        protected SelectionHandler SelectionHandler { get; private set; }
+        protected SelectionHandler<T> SelectionHandler { get; private set; }
 
-        protected readonly HitObjectComposer Composer;
-
-        [Resolved(CanBeNull = true)]
-        private IEditorChangeHandler changeHandler { get; set; }
-
-        [Resolved]
-        protected EditorClock EditorClock { get; private set; }
-
-        [Resolved]
-        protected EditorBeatmap Beatmap { get; private set; }
-
-        private readonly BindableList<HitObject> selectedHitObjects = new BindableList<HitObject>();
-        private readonly Dictionary<HitObject, SelectionBlueprint> blueprintMap = new Dictionary<HitObject, SelectionBlueprint>();
+        private readonly Dictionary<T, SelectionBlueprint<T>> blueprintMap = new Dictionary<T, SelectionBlueprint<T>>();
 
         [Resolved(canBeNull: true)]
         private IPositionSnapProvider snapProvider { get; set; }
 
-        protected BlueprintContainer(HitObjectComposer composer)
-        {
-            Composer = composer;
+        [Resolved(CanBeNull = true)]
+        private IEditorChangeHandler changeHandler { get; set; }
 
+        protected BlueprintContainer()
+        {
             RelativeSizeAxes = Axes.Both;
         }
 
@@ -73,66 +60,28 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 SelectionHandler.CreateProxy(),
                 DragBox.CreateProxy().With(p => p.Depth = float.MinValue)
             });
-
-            // For non-pooled rulesets, hitobjects are already present in the playfield which allows the blueprints to be loaded in the async context.
-            if (Composer != null)
-            {
-                foreach (var obj in Composer.HitObjects)
-                    addBlueprintFor(obj.HitObject);
-            }
-
-            selectedHitObjects.BindTo(Beatmap.SelectedHitObjects);
-            selectedHitObjects.CollectionChanged += (selectedObjects, args) =>
-            {
-                switch (args.Action)
-                {
-                    case NotifyCollectionChangedAction.Add:
-                        foreach (var o in args.NewItems)
-                            SelectionBlueprints.FirstOrDefault(b => b.HitObject == o)?.Select();
-                        break;
-
-                    case NotifyCollectionChangedAction.Remove:
-                        foreach (var o in args.OldItems)
-                            SelectionBlueprints.FirstOrDefault(b => b.HitObject == o)?.Deselect();
-
-                        break;
-                }
-            };
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            Beatmap.HitObjectAdded += addBlueprintFor;
-            Beatmap.HitObjectRemoved += removeBlueprintFor;
-
-            if (Composer != null)
-            {
-                // For pooled rulesets, blueprints must be added for hitobjects already "current" as they would've not been "current" during the async load addition process above.
-                foreach (var obj in Composer.HitObjects)
-                    addBlueprintFor(obj.HitObject);
-
-                Composer.Playfield.HitObjectUsageBegan += addBlueprintFor;
-                Composer.Playfield.HitObjectUsageFinished += removeBlueprintFor;
-            }
-        }
-
-        protected virtual Container<SelectionBlueprint> CreateSelectionBlueprintContainer() => new HitObjectOrderedSelectionContainer { RelativeSizeAxes = Axes.Both };
+        protected virtual Container<SelectionBlueprint<T>> CreateSelectionBlueprintContainer() => new Container<SelectionBlueprint<T>> { RelativeSizeAxes = Axes.Both };
 
         /// <summary>
-        /// Creates a <see cref="Components.SelectionHandler"/> which outlines <see cref="DrawableHitObject"/>s and handles movement of selections.
+        /// Creates a <see cref="Components.SelectionHandler{T}"/> which outlines <see cref="DrawableHitObject"/>s and handles movement of selections.
         /// </summary>
-        protected virtual SelectionHandler CreateSelectionHandler() => new SelectionHandler();
+        protected virtual SelectionHandler<T> CreateSelectionHandler() => new SelectionHandler<T>();
 
         /// <summary>
-        /// Creates a <see cref="SelectionBlueprint"/> for a specific <see cref="DrawableHitObject"/>.
+        /// Creates a <see cref="SelectionBlueprint{T}"/> for a specific <see cref="DrawableHitObject"/>.
         /// </summary>
         /// <param name="hitObject">The <see cref="DrawableHitObject"/> to create the overlay for.</param>
-        protected virtual SelectionBlueprint CreateBlueprintFor(HitObject hitObject) => null;
+        protected virtual SelectionBlueprint<T> CreateBlueprintFor(T hitObject) => null;
 
         protected virtual DragBox CreateDragBox(Action<RectangleF> performSelect) => new DragBox(performSelect);
 
+        /// <summary>
+        /// Whether this component is in a state where deselection should be allowed. If false, selection will only be added to.
+        /// </summary>
+        protected virtual bool AllowDeselection => true;
+
         protected override bool OnMouseDown(MouseDownEvent e)
         {
             bool selectionPerformed = performMouseDownActions(e);
@@ -143,7 +92,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             return selectionPerformed || e.Button == MouseButton.Left;
         }
 
-        private SelectionBlueprint clickedBlueprint;
+        protected SelectionBlueprint<T> ClickedBlueprint { get; private set; }
 
         protected override bool OnClick(ClickEvent e)
         {
@@ -151,11 +100,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 return false;
 
             // store for double-click handling
-            clickedBlueprint = SelectionHandler.SelectedBlueprints.FirstOrDefault(b => b.IsHovered);
+            ClickedBlueprint = SelectionHandler.SelectedBlueprints.FirstOrDefault(b => b.IsHovered);
 
             // Deselection should only occur if no selected blueprints are hovered
             // A special case for when a blueprint was selected via this click is added since OnClick() may occur outside the hitobject and should not trigger deselection
-            if (endClickSelection(e) || clickedBlueprint != null)
+            if (endClickSelection(e) || ClickedBlueprint != null)
                 return true;
 
             deselectAll();
@@ -168,10 +117,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 return false;
 
             // ensure the blueprint which was hovered for the first click is still the hovered blueprint.
-            if (clickedBlueprint == null || SelectionHandler.SelectedBlueprints.FirstOrDefault(b => b.IsHovered) != clickedBlueprint)
+            if (ClickedBlueprint == null || SelectionHandler.SelectedBlueprints.FirstOrDefault(b => b.IsHovered) != ClickedBlueprint)
                 return false;
 
-            EditorClock?.SeekSmoothlyTo(clickedBlueprint.HitObject.StartTime);
             return true;
         }
 
@@ -227,9 +175,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             if (isDraggingBlueprint)
             {
-                // handle positional change etc.
-                foreach (var obj in selectedHitObjects)
-                    Beatmap.Update(obj);
+                UpdateSelection();
 
                 changeHandler?.EndChange();
             }
@@ -238,6 +184,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 DragBox.Hide();
         }
 
+        protected virtual void UpdateSelection()
+        {
+        }
+
         protected override bool OnKeyDown(KeyDownEvent e)
         {
             switch (e.Key)
@@ -258,7 +208,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             switch (action.ActionType)
             {
                 case PlatformActionType.SelectAll:
-                    selectAll();
+                    SelectAll();
                     return true;
             }
 
@@ -271,61 +221,55 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         #region Blueprint Addition/Removal
 
-        private void addBlueprintFor(HitObject hitObject)
+        protected virtual void AddBlueprintFor(T item)
         {
-            if (hitObject is IBarLine)
+            if (blueprintMap.ContainsKey(item))
                 return;
 
-            if (blueprintMap.ContainsKey(hitObject))
-                return;
-
-            var blueprint = CreateBlueprintFor(hitObject);
+            var blueprint = CreateBlueprintFor(item);
             if (blueprint == null)
                 return;
 
-            blueprintMap[hitObject] = blueprint;
+            blueprintMap[item] = blueprint;
 
-            blueprint.Selected += onBlueprintSelected;
-            blueprint.Deselected += onBlueprintDeselected;
-
-            if (Beatmap.SelectedHitObjects.Contains(hitObject))
-                blueprint.Select();
+            blueprint.Selected += OnBlueprintSelected;
+            blueprint.Deselected += OnBlueprintDeselected;
 
             SelectionBlueprints.Add(blueprint);
 
-            OnBlueprintAdded(hitObject);
+            OnBlueprintAdded(blueprint);
         }
 
-        private void removeBlueprintFor(HitObject hitObject)
+        protected void RemoveBlueprintFor(T item)
         {
-            if (!blueprintMap.Remove(hitObject, out var blueprint))
+            if (!blueprintMap.Remove(item, out var blueprint))
                 return;
 
             blueprint.Deselect();
-            blueprint.Selected -= onBlueprintSelected;
-            blueprint.Deselected -= onBlueprintDeselected;
+            blueprint.Selected -= OnBlueprintSelected;
+            blueprint.Deselected -= OnBlueprintDeselected;
 
             SelectionBlueprints.Remove(blueprint);
 
             if (movementBlueprints?.Contains(blueprint) == true)
                 finishSelectionMovement();
 
-            OnBlueprintRemoved(hitObject);
+            OnBlueprintRemoved(blueprint);
         }
 
         /// <summary>
         /// Called after a <see cref="HitObject"/> blueprint has been added.
         /// </summary>
-        /// <param name="hitObject">The <see cref="HitObject"/> for which the blueprint has been added.</param>
-        protected virtual void OnBlueprintAdded(HitObject hitObject)
+        /// <param name="blueprint">The <see cref="HitObject"/> for which the blueprint has been added.</param>
+        protected virtual void OnBlueprintAdded(SelectionBlueprint<T> blueprint)
         {
         }
 
         /// <summary>
         /// Called after a <see cref="HitObject"/> blueprint has been removed.
         /// </summary>
-        /// <param name="hitObject">The <see cref="HitObject"/> for which the blueprint has been removed.</param>
-        protected virtual void OnBlueprintRemoved(HitObject hitObject)
+        /// <param name="item">The <see cref="HitObject"/> for which the blueprint has been removed.</param>
+        protected virtual void OnBlueprintRemoved(SelectionBlueprint<T> item)
         {
         }
 
@@ -347,7 +291,7 @@ 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 blueprint in SelectionBlueprints.AliveChildren.Reverse().OrderByDescending(b => b.IsSelected))
+            foreach (SelectionBlueprint<T> blueprint in SelectionBlueprints.AliveChildren.Reverse().OrderByDescending(b => b.IsSelected))
             {
                 if (!blueprint.IsHovered) continue;
 
@@ -371,7 +315,7 @@ 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 blueprint in SelectionBlueprints.AliveChildren.Reverse().OrderByDescending(b => b.IsSelected))
+                    foreach (SelectionBlueprint<T> blueprint in SelectionBlueprints.AliveChildren.Reverse().OrderByDescending(b => b.IsSelected))
                     {
                         if (!blueprint.IsHovered) continue;
 
@@ -405,7 +349,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
                     case SelectionState.Selected:
                         // if the editor is playing, we generally don't want to deselect objects even if outside the selection area.
-                        if (!EditorClock.IsRunning && !isValidForSelection())
+                        if (AllowDeselection && !isValidForSelection())
                             blueprint.Deselect();
                         break;
                 }
@@ -413,35 +357,29 @@ namespace osu.Game.Screens.Edit.Compose.Components
         }
 
         /// <summary>
-        /// Selects all <see cref="SelectionBlueprint"/>s.
+        /// Selects all <see cref="SelectionBlueprint{T}"/>s.
         /// </summary>
-        private void selectAll()
+        protected virtual void SelectAll()
         {
-            Composer.Playfield.KeepAllAlive();
-
             // Scheduled to allow the change in lifetime to take place.
             Schedule(() => SelectionBlueprints.ToList().ForEach(m => m.Select()));
         }
 
         /// <summary>
-        /// Deselects all selected <see cref="SelectionBlueprint"/>s.
+        /// Deselects all selected <see cref="SelectionBlueprint{T}"/>s.
         /// </summary>
         private void deselectAll() => SelectionHandler.SelectedBlueprints.ToList().ForEach(m => m.Deselect());
 
-        private void onBlueprintSelected(SelectionBlueprint blueprint)
+        protected virtual void OnBlueprintSelected(SelectionBlueprint<T> blueprint)
         {
             SelectionHandler.HandleSelected(blueprint);
             SelectionBlueprints.ChangeChildDepth(blueprint, 1);
-
-            Composer.Playfield.SetKeepAlive(blueprint.HitObject, true);
         }
 
-        private void onBlueprintDeselected(SelectionBlueprint blueprint)
+        protected virtual void OnBlueprintDeselected(SelectionBlueprint<T> blueprint)
         {
             SelectionBlueprints.ChangeChildDepth(blueprint, 0);
             SelectionHandler.HandleDeselected(blueprint);
-
-            Composer.Playfield.SetKeepAlive(blueprint.HitObject, false);
         }
 
         #endregion
@@ -449,7 +387,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         #region Selection Movement
 
         private Vector2[] movementBlueprintOriginalPositions;
-        private SelectionBlueprint[] movementBlueprints;
+        private SelectionBlueprint<T>[] movementBlueprints;
         private bool isDraggingBlueprint;
 
         /// <summary>
@@ -466,10 +404,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 return;
 
             // Movement is tracked from the blueprint of the earliest hitobject, since it only makes sense to distance snap from that hitobject
-            movementBlueprints = SelectionHandler.SelectedBlueprints.OrderBy(b => b.HitObject.StartTime).ToArray();
+            movementBlueprints = SortForMovement(SelectionHandler.SelectedBlueprints).ToArray();
             movementBlueprintOriginalPositions = movementBlueprints.Select(m => m.ScreenSpaceSelectionPoint).ToArray();
         }
 
+        protected virtual IEnumerable<SelectionBlueprint<T>> SortForMovement(IReadOnlyList<SelectionBlueprint<T>> blueprints) => blueprints;
+
         /// <summary>
         /// Moves the current selected blueprints.
         /// </summary>
@@ -497,7 +437,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 if (positionalResult.ScreenSpacePosition == testPosition) continue;
 
                 // attempt to move the objects, and abort any time based snapping if we can.
-                if (SelectionHandler.HandleMovement(new MoveSelectionEvent(movementBlueprints[i], positionalResult.ScreenSpacePosition)))
+                if (SelectionHandler.HandleMovement(new MoveSelectionEvent<T>(movementBlueprints[i], positionalResult.ScreenSpacePosition)))
                     return true;
             }
 
@@ -510,20 +450,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
             // Retrieve a snapped position.
             var result = snapProvider.SnapScreenSpacePositionToValidTime(movePosition);
 
-            // Move the hitobjects.
-            if (!SelectionHandler.HandleMovement(new MoveSelectionEvent(movementBlueprints.First(), result.ScreenSpacePosition)))
-                return true;
+            return ApplySnapResult(movementBlueprints, result);
+        }
 
-            if (result.Time.HasValue)
-            {
-                // Apply the start time at the newly snapped-to position
-                double offset = result.Time.Value - movementBlueprints.First().HitObject.StartTime;
-
-                if (offset != 0)
-                    Beatmap.PerformOnSelection(obj => obj.StartTime += offset);
-            }
-
-            return true;
+        protected virtual bool ApplySnapResult(SelectionBlueprint<T>[] blueprints, SnapResult result)
+        {
+            return !SelectionHandler.HandleMovement(new MoveSelectionEvent<T>(blueprints.First(), result.ScreenSpacePosition));
         }
 
         /// <summary>
@@ -542,22 +474,5 @@ namespace osu.Game.Screens.Edit.Compose.Components
         }
 
         #endregion
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-
-            if (Beatmap != null)
-            {
-                Beatmap.HitObjectAdded -= addBlueprintFor;
-                Beatmap.HitObjectRemoved -= removeBlueprintFor;
-            }
-
-            if (Composer != null)
-            {
-                Composer.Playfield.HitObjectUsageBegan -= addBlueprintFor;
-                Composer.Playfield.HitObjectUsageFinished -= removeBlueprintFor;
-            }
-        }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index b0a6a091f0..994e862946 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -27,12 +27,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
     /// <summary>
     /// A blueprint container generally displayed as an overlay to a ruleset's playfield.
     /// </summary>
-    public class ComposeBlueprintContainer : BlueprintContainer
+    public class ComposeBlueprintContainer : EditorBlueprintContainer
     {
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
 
         private readonly Container<PlacementBlueprint> placementBlueprintContainer;
 
+        protected new EditorSelectionHandler SelectionHandler => (EditorSelectionHandler)base.SelectionHandler;
+
         private PlacementBlueprint currentPlacement;
         private InputManager inputManager;
 
@@ -113,7 +115,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             // convert to game space coordinates
             delta = firstBlueprint.ToScreenSpace(delta) - firstBlueprint.ToScreenSpace(Vector2.Zero);
 
-            SelectionHandler.HandleMovement(new MoveSelectionEvent(firstBlueprint, firstBlueprint.ScreenSpaceSelectionPoint + delta));
+            SelectionHandler.HandleMovement(new MoveSelectionEvent<HitObject>(firstBlueprint, firstBlueprint.ScreenSpaceSelectionPoint + delta));
         }
 
         private void updatePlacementNewCombo()
@@ -237,7 +239,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 updatePlacementPosition();
         }
 
-        protected sealed override SelectionBlueprint CreateBlueprintFor(HitObject hitObject)
+        protected sealed override SelectionBlueprint<HitObject> CreateBlueprintFor(HitObject hitObject)
         {
             var drawable = Composer.HitObjects.FirstOrDefault(d => d.HitObject == hitObject);
 
@@ -249,9 +251,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         public virtual OverlaySelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject) => null;
 
-        protected override void OnBlueprintAdded(HitObject hitObject)
+        protected override void OnBlueprintAdded(SelectionBlueprint<HitObject> item)
         {
-            base.OnBlueprintAdded(hitObject);
+            base.OnBlueprintAdded(item);
 
             refreshTool();
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
new file mode 100644
index 0000000000..aef02d5ffd
--- /dev/null
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
@@ -0,0 +1,176 @@
+// Copyright (c) ppy 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 System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Events;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects;
+
+namespace osu.Game.Screens.Edit.Compose.Components
+{
+    public class EditorBlueprintContainer : BlueprintContainer<HitObject>
+    {
+        [Resolved]
+        protected EditorClock EditorClock { get; private set; }
+
+        [Resolved]
+        protected EditorBeatmap Beatmap { get; private set; }
+
+        protected readonly HitObjectComposer Composer;
+
+        private readonly BindableList<HitObject> selectedHitObjects = new BindableList<HitObject>();
+
+        protected EditorBlueprintContainer(HitObjectComposer composer)
+        {
+            Composer = composer;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            // For non-pooled rulesets, hitobjects are already present in the playfield which allows the blueprints to be loaded in the async context.
+            if (Composer != null)
+            {
+                foreach (var obj in Composer.HitObjects)
+                    AddBlueprintFor(obj.HitObject);
+            }
+
+            selectedHitObjects.BindTo(Beatmap.SelectedHitObjects);
+            selectedHitObjects.CollectionChanged += (selectedObjects, args) =>
+            {
+                switch (args.Action)
+                {
+                    case NotifyCollectionChangedAction.Add:
+                        foreach (var o in args.NewItems)
+                            SelectionBlueprints.FirstOrDefault(b => b.Item == o)?.Select();
+                        break;
+
+                    case NotifyCollectionChangedAction.Remove:
+                        foreach (var o in args.OldItems)
+                            SelectionBlueprints.FirstOrDefault(b => b.Item == o)?.Deselect();
+
+                        break;
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Beatmap.HitObjectAdded += AddBlueprintFor;
+            Beatmap.HitObjectRemoved += RemoveBlueprintFor;
+
+            if (Composer != null)
+            {
+                // For pooled rulesets, blueprints must be added for hitobjects already "current" as they would've not been "current" during the async load addition process above.
+                foreach (var obj in Composer.HitObjects)
+                    AddBlueprintFor(obj.HitObject);
+
+                Composer.Playfield.HitObjectUsageBegan += AddBlueprintFor;
+                Composer.Playfield.HitObjectUsageFinished += RemoveBlueprintFor;
+            }
+        }
+
+        protected override IEnumerable<SelectionBlueprint<HitObject>> SortForMovement(IReadOnlyList<SelectionBlueprint<HitObject>> blueprints)
+            => blueprints.OrderBy(b => b.Item.StartTime);
+
+        protected override bool AllowDeselection => !EditorClock.IsRunning;
+
+        protected override bool ApplySnapResult(SelectionBlueprint<HitObject>[] blueprints, SnapResult result)
+        {
+            if (!base.ApplySnapResult(blueprints, result))
+                return false;
+
+            if (result.Time.HasValue)
+            {
+                // Apply the start time at the newly snapped-to position
+                double offset = result.Time.Value - blueprints.First().Item.StartTime;
+
+                if (offset != 0)
+                    Beatmap.PerformOnSelection(obj => obj.StartTime += offset);
+            }
+
+            return true;
+        }
+
+        protected override void AddBlueprintFor(HitObject item)
+        {
+            if (item is IBarLine)
+                return;
+
+            base.AddBlueprintFor(item);
+        }
+
+        protected override void OnBlueprintAdded(SelectionBlueprint<HitObject> blueprint)
+        {
+            base.OnBlueprintAdded(blueprint);
+            if (Beatmap.SelectedHitObjects.Contains(blueprint.Item))
+                blueprint.Select();
+        }
+
+        protected override void UpdateSelection()
+        {
+            base.UpdateSelection();
+
+            // handle positional change etc.
+            foreach (var blueprint in SelectionBlueprints)
+                Beatmap.Update(blueprint.Item);
+        }
+
+        protected override bool OnDoubleClick(DoubleClickEvent e)
+        {
+            if (!base.OnDoubleClick(e))
+                return false;
+
+            EditorClock?.SeekSmoothlyTo(ClickedBlueprint.Item.StartTime);
+            return true;
+        }
+
+        protected override Container<SelectionBlueprint<HitObject>> CreateSelectionBlueprintContainer() => new HitObjectOrderedSelectionContainer { RelativeSizeAxes = Axes.Both };
+
+        protected override void SelectAll()
+        {
+            Composer.Playfield.KeepAllAlive();
+
+            base.SelectAll();
+        }
+
+        protected override void OnBlueprintSelected(SelectionBlueprint<HitObject> blueprint)
+        {
+            base.OnBlueprintSelected(blueprint);
+
+            Composer.Playfield.SetKeepAlive(blueprint.Item, true);
+        }
+
+        protected override void OnBlueprintDeselected(SelectionBlueprint<HitObject> blueprint)
+        {
+            base.OnBlueprintDeselected(blueprint);
+
+            Composer.Playfield.SetKeepAlive(blueprint.Item, false);
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (Beatmap != null)
+            {
+                Beatmap.HitObjectAdded -= AddBlueprintFor;
+                Beatmap.HitObjectRemoved -= RemoveBlueprintFor;
+            }
+
+            if (Composer != null)
+            {
+                Composer.Playfield.HitObjectUsageBegan -= AddBlueprintFor;
+                Composer.Playfield.HitObjectUsageFinished -= RemoveBlueprintFor;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
new file mode 100644
index 0000000000..a117d42574
--- /dev/null
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
@@ -0,0 +1,233 @@
+// Copyright (c) ppy 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 Humanizer;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Audio;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+
+namespace osu.Game.Screens.Edit.Compose.Components
+{
+    public class EditorSelectionHandler : SelectionHandler<HitObject>, IHasContextMenu
+    {
+        [Resolved]
+        protected EditorBeatmap EditorBeatmap { get; private set; }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            createStateBindables();
+
+            // bring in updates from selection changes
+            EditorBeatmap.HitObjectUpdated += _ => Scheduler.AddOnce(UpdateTernaryStates);
+            EditorBeatmap.SelectedHitObjects.BindTo(SelectedItems);
+
+            SelectedItems.CollectionChanged += (sender, args) =>
+            {
+                Scheduler.AddOnce(UpdateTernaryStates);
+            };
+        }
+
+        internal override void HandleSelected(SelectionBlueprint<HitObject> blueprint)
+        {
+            base.HandleSelected(blueprint);
+
+            // there are potentially multiple SelectionHandlers active, but we only want to add hitobjects to the selected list once.
+            if (!EditorBeatmap.SelectedHitObjects.Contains(blueprint.Item))
+                EditorBeatmap.SelectedHitObjects.Add(blueprint.Item);
+        }
+
+        internal override void HandleDeselected(SelectionBlueprint<HitObject> blueprint)
+        {
+            base.HandleDeselected(blueprint);
+
+            EditorBeatmap.SelectedHitObjects.Remove(blueprint.Item);
+        }
+
+        protected override void DeleteItems(IEnumerable<HitObject> items) => EditorBeatmap.RemoveRange(items);
+
+        #region Selection State
+
+        /// <summary>
+        /// The state of "new combo" for all selected hitobjects.
+        /// </summary>
+        public readonly Bindable<TernaryState> SelectionNewComboState = new Bindable<TernaryState>();
+
+        /// <summary>
+        /// The state of each sample type for all selected hitobjects. Keys match with <see cref="HitSampleInfo"/> constant specifications.
+        /// </summary>
+        public readonly Dictionary<string, Bindable<TernaryState>> SelectionSampleStates = new Dictionary<string, Bindable<TernaryState>>();
+
+        /// <summary>
+        /// Set up ternary state bindables and bind them to selection/hitobject changes (in both directions)
+        /// </summary>
+        private void createStateBindables()
+        {
+            foreach (var sampleName in HitSampleInfo.AllAdditions)
+            {
+                var bindable = new Bindable<TernaryState>
+                {
+                    Description = sampleName.Replace("hit", string.Empty).Titleize()
+                };
+
+                bindable.ValueChanged += state =>
+                {
+                    switch (state.NewValue)
+                    {
+                        case TernaryState.False:
+                            RemoveHitSample(sampleName);
+                            break;
+
+                        case TernaryState.True:
+                            AddHitSample(sampleName);
+                            break;
+                    }
+                };
+
+                SelectionSampleStates[sampleName] = bindable;
+            }
+
+            // new combo
+            SelectionNewComboState.ValueChanged += state =>
+            {
+                switch (state.NewValue)
+                {
+                    case TernaryState.False:
+                        SetNewCombo(false);
+                        break;
+
+                    case TernaryState.True:
+                        SetNewCombo(true);
+                        break;
+                }
+            };
+        }
+
+        /// <summary>
+        /// Called when context menu ternary states may need to be recalculated (selection changed or hitobject updated).
+        /// </summary>
+        protected virtual void UpdateTernaryStates()
+        {
+            SelectionNewComboState.Value = GetStateFromSelection(EditorBeatmap.SelectedHitObjects.OfType<IHasComboInformation>(), h => h.NewCombo);
+
+            foreach (var (sampleName, bindable) in SelectionSampleStates)
+            {
+                bindable.Value = GetStateFromSelection(EditorBeatmap.SelectedHitObjects, h => h.Samples.Any(s => s.Name == sampleName));
+            }
+        }
+
+        /// <summary>
+        /// Given a selection target and a function of truth, retrieve the correct ternary state for display.
+        /// </summary>
+        protected TernaryState GetStateFromSelection<T>(IEnumerable<T> selection, Func<T, bool> func)
+        {
+            if (selection.Any(func))
+                return selection.All(func) ? TernaryState.True : TernaryState.Indeterminate;
+
+            return TernaryState.False;
+        }
+
+        #endregion
+
+        #region Sample Changes
+
+        /// <summary>
+        /// Adds a hit sample to all selected <see cref="HitObject"/>s.
+        /// </summary>
+        /// <param name="sampleName">The name of the hit sample.</param>
+        public void AddHitSample(string sampleName)
+        {
+            EditorBeatmap.PerformOnSelection(h =>
+            {
+                // Make sure there isn't already an existing sample
+                if (h.Samples.Any(s => s.Name == sampleName))
+                    return;
+
+                h.Samples.Add(new HitSampleInfo(sampleName));
+            });
+        }
+
+        /// <summary>
+        /// Set the new combo state of all selected <see cref="HitObject"/>s.
+        /// </summary>
+        /// <param name="state">Whether to set or unset.</param>
+        /// <exception cref="InvalidOperationException">Throws if any selected object doesn't implement <see cref="IHasComboInformation"/></exception>
+        public void SetNewCombo(bool state)
+        {
+            EditorBeatmap.PerformOnSelection(h =>
+            {
+                var comboInfo = h as IHasComboInformation;
+
+                if (comboInfo == null || comboInfo.NewCombo == state) return;
+
+                comboInfo.NewCombo = state;
+                EditorBeatmap.Update(h);
+            });
+        }
+
+        /// <summary>
+        /// Removes a hit sample from all selected <see cref="HitObject"/>s.
+        /// </summary>
+        /// <param name="sampleName">The name of the hit sample.</param>
+        public void RemoveHitSample(string sampleName)
+        {
+            EditorBeatmap.PerformOnSelection(h => h.SamplesBindable.RemoveAll(s => s.Name == sampleName));
+        }
+
+        #endregion
+
+        #region Context Menu
+
+        public MenuItem[] ContextMenuItems
+        {
+            get
+            {
+                if (!SelectedBlueprints.Any(b => b.IsHovered))
+                    return Array.Empty<MenuItem>();
+
+                var items = new List<MenuItem>();
+
+                items.AddRange(GetContextMenuItemsForSelection(SelectedBlueprints));
+
+                if (SelectedBlueprints.All(b => b.Item is IHasComboInformation))
+                {
+                    items.Add(new TernaryStateMenuItem("New combo") { State = { BindTarget = SelectionNewComboState } });
+                }
+
+                if (SelectedBlueprints.Count == 1)
+                    items.AddRange(SelectedBlueprints[0].ContextMenuItems);
+
+                items.AddRange(new[]
+                {
+                    new OsuMenuItem("Sound")
+                    {
+                        Items = SelectionSampleStates.Select(kvp =>
+                            new TernaryStateMenuItem(kvp.Value.Description) { State = { BindTarget = kvp.Value } }).ToArray()
+                    },
+                    new OsuMenuItem("Delete", MenuItemType.Destructive, DeleteSelected),
+                });
+
+                return items.ToArray();
+            }
+        }
+
+        /// <summary>
+        /// Provide context menu items relevant to current selection. Calling base is not required.
+        /// </summary>
+        /// <param name="selection">The current selection.</param>
+        /// <returns>The relevant menu items.</returns>
+        protected virtual IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint<HitObject>> selection)
+            => Enumerable.Empty<MenuItem>();
+
+        #endregion
+    }
+}
diff --git a/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs b/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs
index d612cf3fe0..4078661a26 100644
--- a/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/HitObjectOrderedSelectionContainer.cs
@@ -11,17 +11,17 @@ using osu.Game.Rulesets.Objects;
 namespace osu.Game.Screens.Edit.Compose.Components
 {
     /// <summary>
-    /// A container for <see cref="SelectionBlueprint"/> ordered by their <see cref="HitObject"/> start times.
+    /// A container for <see cref="SelectionBlueprint{HitObject}"/> ordered by their <see cref="HitObject"/> start times.
     /// </summary>
-    public sealed class HitObjectOrderedSelectionContainer : Container<SelectionBlueprint>
+    public sealed class HitObjectOrderedSelectionContainer : Container<SelectionBlueprint<HitObject>>
     {
-        public override void Add(SelectionBlueprint drawable)
+        public override void Add(SelectionBlueprint<HitObject> drawable)
         {
             base.Add(drawable);
             bindStartTime(drawable);
         }
 
-        public override bool Remove(SelectionBlueprint drawable)
+        public override bool Remove(SelectionBlueprint<HitObject> drawable)
         {
             if (!base.Remove(drawable))
                 return false;
@@ -36,11 +36,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
             unbindAllStartTimes();
         }
 
-        private readonly Dictionary<SelectionBlueprint, IBindable> startTimeMap = new Dictionary<SelectionBlueprint, IBindable>();
+        private readonly Dictionary<SelectionBlueprint<HitObject>, IBindable> startTimeMap = new Dictionary<SelectionBlueprint<HitObject>, IBindable>();
 
-        private void bindStartTime(SelectionBlueprint blueprint)
+        private void bindStartTime(SelectionBlueprint<HitObject> blueprint)
         {
-            var bindable = blueprint.HitObject.StartTimeBindable.GetBoundCopy();
+            var bindable = blueprint.Item.StartTimeBindable.GetBoundCopy();
 
             bindable.BindValueChanged(_ =>
             {
@@ -51,7 +51,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             startTimeMap[blueprint] = bindable;
         }
 
-        private void unbindStartTime(SelectionBlueprint blueprint)
+        private void unbindStartTime(SelectionBlueprint<HitObject> blueprint)
         {
             startTimeMap[blueprint].UnbindAll();
             startTimeMap.Remove(blueprint);
@@ -66,16 +66,16 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected override int Compare(Drawable x, Drawable y)
         {
-            var xObj = (SelectionBlueprint)x;
-            var yObj = (SelectionBlueprint)y;
+            var xObj = (SelectionBlueprint<HitObject>)x;
+            var yObj = (SelectionBlueprint<HitObject>)y;
 
             // Put earlier blueprints towards the end of the list, so they handle input first
-            int i = yObj.HitObject.StartTime.CompareTo(xObj.HitObject.StartTime);
+            int i = yObj.Item.StartTime.CompareTo(xObj.Item.StartTime);
 
             if (i != 0) return i;
 
             // Fall back to end time if the start time is equal.
-            i = yObj.HitObject.GetEndTime().CompareTo(xObj.HitObject.GetEndTime());
+            i = yObj.Item.GetEndTime().CompareTo(xObj.Item.GetEndTime());
 
             return i == 0 ? CompareReverseChildID(y, x) : i;
         }
diff --git a/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs b/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
index 0792d0f80e..a07b434011 100644
--- a/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
@@ -9,12 +9,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
     /// <summary>
     /// An event which occurs when a <see cref="OverlaySelectionBlueprint"/> is moved.
     /// </summary>
-    public class MoveSelectionEvent
+    public class MoveSelectionEvent<T>
     {
         /// <summary>
-        /// The <see cref="SelectionBlueprint"/> that triggered this <see cref="MoveSelectionEvent"/>.
+        /// The <see cref="SelectionBlueprint{T}"/> that triggered this <see cref="MoveSelectionEvent{T}"/>.
         /// </summary>
-        public readonly SelectionBlueprint Blueprint;
+        public readonly SelectionBlueprint<T> Blueprint;
 
         /// <summary>
         /// The expected screen-space position of the hitobject at the current cursor position.
@@ -26,7 +26,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         public readonly Vector2 InstantDelta;
 
-        public MoveSelectionEvent(SelectionBlueprint blueprint, Vector2 screenSpacePosition)
+        public MoveSelectionEvent(SelectionBlueprint<T> blueprint, Vector2 screenSpacePosition)
         {
             Blueprint = blueprint;
             ScreenSpacePosition = screenSpacePosition;
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index b06e982859..1ee1de7d43 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -4,25 +4,19 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Humanizer;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
-using osu.Game.Audio;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Objects.Types;
 using osuTK;
 using osuTK.Input;
 
@@ -31,16 +25,18 @@ namespace osu.Game.Screens.Edit.Compose.Components
     /// <summary>
     /// A component which outlines <see cref="DrawableHitObject"/>s and handles movement of selections.
     /// </summary>
-    public class SelectionHandler : CompositeDrawable, IKeyBindingHandler<PlatformAction>, IHasContextMenu
+    public class SelectionHandler<T> : CompositeDrawable, IKeyBindingHandler<PlatformAction>
     {
         /// <summary>
         /// The currently selected blueprints.
         /// Should be used when operations are dealing directly with the visible blueprints.
         /// For more general selection operations, use <see cref="osu.Game.Screens.Edit.EditorBeatmap.SelectedHitObjects"/> instead.
         /// </summary>
-        public IEnumerable<SelectionBlueprint> SelectedBlueprints => selectedBlueprints;
+        public IReadOnlyList<SelectionBlueprint<T>> SelectedBlueprints => selectedBlueprints;
 
-        private readonly List<SelectionBlueprint> selectedBlueprints;
+        protected BindableList<T> SelectedItems = new BindableList<T>();
+
+        private readonly List<SelectionBlueprint<T>> selectedBlueprints;
 
         private Drawable content;
 
@@ -48,15 +44,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected SelectionBox SelectionBox { get; private set; }
 
-        [Resolved]
-        protected EditorBeatmap EditorBeatmap { get; private set; }
-
         [Resolved(CanBeNull = true)]
         protected IEditorChangeHandler ChangeHandler { get; private set; }
 
         public SelectionHandler()
         {
-            selectedBlueprints = new List<SelectionBlueprint>();
+            selectedBlueprints = new List<SelectionBlueprint<T>>();
 
             RelativeSizeAxes = Axes.Both;
             AlwaysPresent = true;
@@ -66,8 +59,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            createStateBindables();
-
             InternalChild = content = new Container
             {
                 Children = new Drawable[]
@@ -95,6 +86,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
                     SelectionBox = CreateSelectionBox(),
                 }
             };
+
+            SelectedItems.CollectionChanged += (sender, args) =>
+            {
+                Scheduler.AddOnce(updateVisibility);
+            };
         }
 
         public SelectionBox CreateSelectionBox()
@@ -139,7 +135,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// Whether any <see cref="DrawableHitObject"/>s could be moved.
         /// Returning true will also propagate StartTime changes provided by the closest <see cref="IPositionSnapProvider.SnapScreenSpacePositionToValidTime"/>.
         /// </returns>
-        public virtual bool HandleMovement(MoveSelectionEvent moveEvent) => false;
+        public virtual bool HandleMovement(MoveSelectionEvent<T> moveEvent) => false;
 
         /// <summary>
         /// Handles the selected <see cref="DrawableHitObject"/>s being rotated.
@@ -174,7 +170,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             switch (action.ActionMethod)
             {
                 case PlatformActionMethod.Delete:
-                    deleteSelected();
+                    DeleteSelected();
                     return true;
             }
 
@@ -198,24 +194,18 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// Handle a blueprint becoming selected.
         /// </summary>
         /// <param name="blueprint">The blueprint.</param>
-        internal void HandleSelected(SelectionBlueprint blueprint)
+        internal virtual void HandleSelected(SelectionBlueprint<T> blueprint)
         {
             selectedBlueprints.Add(blueprint);
-
-            // there are potentially multiple SelectionHandlers active, but we only want to add hitobjects to the selected list once.
-            if (!EditorBeatmap.SelectedHitObjects.Contains(blueprint.HitObject))
-                EditorBeatmap.SelectedHitObjects.Add(blueprint.HitObject);
         }
 
         /// <summary>
         /// Handle a blueprint becoming deselected.
         /// </summary>
         /// <param name="blueprint">The blueprint.</param>
-        internal void HandleDeselected(SelectionBlueprint blueprint)
+        internal virtual void HandleDeselected(SelectionBlueprint<T> blueprint)
         {
             selectedBlueprints.Remove(blueprint);
-
-            EditorBeatmap.SelectedHitObjects.Remove(blueprint.HitObject);
         }
 
         /// <summary>
@@ -224,7 +214,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="blueprint">The blueprint.</param>
         /// <param name="e">The mouse event responsible for selection.</param>
         /// <returns>Whether a selection was performed.</returns>
-        internal bool MouseDownSelectionRequested(SelectionBlueprint blueprint, MouseButtonEvent e)
+        internal bool MouseDownSelectionRequested(SelectionBlueprint<T> blueprint, MouseButtonEvent e)
         {
             if (e.ShiftPressed && e.Button == MouseButton.Right)
             {
@@ -248,7 +238,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="blueprint">The blueprint.</param>
         /// <param name="e">The mouse event responsible for deselection.</param>
         /// <returns>Whether a deselection was performed.</returns>
-        internal bool MouseUpSelectionRequested(SelectionBlueprint blueprint, MouseButtonEvent e)
+        internal bool MouseUpSelectionRequested(SelectionBlueprint<T> blueprint, MouseButtonEvent e)
         {
             if (blueprint.IsSelected)
             {
@@ -259,15 +249,19 @@ namespace osu.Game.Screens.Edit.Compose.Components
             return false;
         }
 
-        private void handleQuickDeletion(SelectionBlueprint blueprint)
+        private void handleQuickDeletion(SelectionBlueprint<T> blueprint)
         {
             if (blueprint.HandleQuickDeletion())
                 return;
 
             if (!blueprint.IsSelected)
-                EditorBeatmap.Remove(blueprint.HitObject);
+                DeleteItems(new[] { blueprint.Item });
             else
-                deleteSelected();
+                DeleteSelected();
+        }
+
+        protected virtual void DeleteItems(IEnumerable<T> items)
+        {
         }
 
         /// <summary>
@@ -275,7 +269,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         /// <param name="blueprint">The blueprint to select.</param>
         /// <returns>Whether selection state was changed.</returns>
-        private bool ensureSelected(SelectionBlueprint blueprint)
+        private bool ensureSelected(SelectionBlueprint<T> blueprint)
         {
             if (blueprint.IsSelected)
                 return false;
@@ -285,9 +279,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
             return true;
         }
 
-        private void deleteSelected()
+        protected void DeleteSelected()
         {
-            EditorBeatmap.RemoveRange(selectedBlueprints.Select(b => b.HitObject));
+            DeleteItems(selectedBlueprints.Select(b => b.Item));
         }
 
         #endregion
@@ -295,11 +289,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
         #region Outline Display
 
         /// <summary>
-        /// Updates whether this <see cref="SelectionHandler"/> is visible.
+        /// Updates whether this <see cref="SelectionHandler{T}"/> is visible.
         /// </summary>
         private void updateVisibility()
         {
-            int count = EditorBeatmap.SelectedHitObjects.Count;
+            int count = SelectedItems.Count;
 
             selectionDetailsText.Text = count > 0 ? count.ToString() : string.Empty;
 
@@ -340,188 +334,5 @@ namespace osu.Game.Screens.Edit.Compose.Components
         }
 
         #endregion
-
-        #region Sample Changes
-
-        /// <summary>
-        /// Adds a hit sample to all selected <see cref="HitObject"/>s.
-        /// </summary>
-        /// <param name="sampleName">The name of the hit sample.</param>
-        public void AddHitSample(string sampleName)
-        {
-            EditorBeatmap.PerformOnSelection(h =>
-            {
-                // Make sure there isn't already an existing sample
-                if (h.Samples.Any(s => s.Name == sampleName))
-                    return;
-
-                h.Samples.Add(new HitSampleInfo(sampleName));
-            });
-        }
-
-        /// <summary>
-        /// Set the new combo state of all selected <see cref="HitObject"/>s.
-        /// </summary>
-        /// <param name="state">Whether to set or unset.</param>
-        /// <exception cref="InvalidOperationException">Throws if any selected object doesn't implement <see cref="IHasComboInformation"/></exception>
-        public void SetNewCombo(bool state)
-        {
-            EditorBeatmap.PerformOnSelection(h =>
-            {
-                var comboInfo = h as IHasComboInformation;
-
-                if (comboInfo == null || comboInfo.NewCombo == state) return;
-
-                comboInfo.NewCombo = state;
-                EditorBeatmap.Update(h);
-            });
-        }
-
-        /// <summary>
-        /// Removes a hit sample from all selected <see cref="HitObject"/>s.
-        /// </summary>
-        /// <param name="sampleName">The name of the hit sample.</param>
-        public void RemoveHitSample(string sampleName)
-        {
-            EditorBeatmap.PerformOnSelection(h => h.SamplesBindable.RemoveAll(s => s.Name == sampleName));
-        }
-
-        #endregion
-
-        #region Selection State
-
-        /// <summary>
-        /// The state of "new combo" for all selected hitobjects.
-        /// </summary>
-        public readonly Bindable<TernaryState> SelectionNewComboState = new Bindable<TernaryState>();
-
-        /// <summary>
-        /// The state of each sample type for all selected hitobjects. Keys match with <see cref="HitSampleInfo"/> constant specifications.
-        /// </summary>
-        public readonly Dictionary<string, Bindable<TernaryState>> SelectionSampleStates = new Dictionary<string, Bindable<TernaryState>>();
-
-        /// <summary>
-        /// Set up ternary state bindables and bind them to selection/hitobject changes (in both directions)
-        /// </summary>
-        private void createStateBindables()
-        {
-            foreach (var sampleName in HitSampleInfo.AllAdditions)
-            {
-                var bindable = new Bindable<TernaryState>
-                {
-                    Description = sampleName.Replace("hit", string.Empty).Titleize()
-                };
-
-                bindable.ValueChanged += state =>
-                {
-                    switch (state.NewValue)
-                    {
-                        case TernaryState.False:
-                            RemoveHitSample(sampleName);
-                            break;
-
-                        case TernaryState.True:
-                            AddHitSample(sampleName);
-                            break;
-                    }
-                };
-
-                SelectionSampleStates[sampleName] = bindable;
-            }
-
-            // new combo
-            SelectionNewComboState.ValueChanged += state =>
-            {
-                switch (state.NewValue)
-                {
-                    case TernaryState.False:
-                        SetNewCombo(false);
-                        break;
-
-                    case TernaryState.True:
-                        SetNewCombo(true);
-                        break;
-                }
-            };
-
-            // bring in updates from selection changes
-            EditorBeatmap.HitObjectUpdated += _ => Scheduler.AddOnce(UpdateTernaryStates);
-            EditorBeatmap.SelectedHitObjects.CollectionChanged += (sender, args) =>
-            {
-                Scheduler.AddOnce(updateVisibility);
-                Scheduler.AddOnce(UpdateTernaryStates);
-            };
-        }
-
-        /// <summary>
-        /// Called when context menu ternary states may need to be recalculated (selection changed or hitobject updated).
-        /// </summary>
-        protected virtual void UpdateTernaryStates()
-        {
-            SelectionNewComboState.Value = GetStateFromSelection(EditorBeatmap.SelectedHitObjects.OfType<IHasComboInformation>(), h => h.NewCombo);
-
-            foreach (var (sampleName, bindable) in SelectionSampleStates)
-            {
-                bindable.Value = GetStateFromSelection(EditorBeatmap.SelectedHitObjects, h => h.Samples.Any(s => s.Name == sampleName));
-            }
-        }
-
-        /// <summary>
-        /// Given a selection target and a function of truth, retrieve the correct ternary state for display.
-        /// </summary>
-        protected TernaryState GetStateFromSelection<T>(IEnumerable<T> selection, Func<T, bool> func)
-        {
-            if (selection.Any(func))
-                return selection.All(func) ? TernaryState.True : TernaryState.Indeterminate;
-
-            return TernaryState.False;
-        }
-
-        #endregion
-
-        #region Context Menu
-
-        public MenuItem[] ContextMenuItems
-        {
-            get
-            {
-                if (!selectedBlueprints.Any(b => b.IsHovered))
-                    return Array.Empty<MenuItem>();
-
-                var items = new List<MenuItem>();
-
-                items.AddRange(GetContextMenuItemsForSelection(selectedBlueprints));
-
-                if (selectedBlueprints.All(b => b.HitObject is IHasComboInformation))
-                {
-                    items.Add(new TernaryStateMenuItem("New combo") { State = { BindTarget = SelectionNewComboState } });
-                }
-
-                if (selectedBlueprints.Count == 1)
-                    items.AddRange(selectedBlueprints[0].ContextMenuItems);
-
-                items.AddRange(new[]
-                {
-                    new OsuMenuItem("Sound")
-                    {
-                        Items = SelectionSampleStates.Select(kvp =>
-                            new TernaryStateMenuItem(kvp.Value.Description) { State = { BindTarget = kvp.Value } }).ToArray()
-                    },
-                    new OsuMenuItem("Delete", MenuItemType.Destructive, deleteSelected),
-                });
-
-                return items.ToArray();
-            }
-        }
-
-        /// <summary>
-        /// Provide context menu items relevant to current selection. Calling base is not required.
-        /// </summary>
-        /// <param name="selection">The current selection.</param>
-        /// <returns>The relevant menu items.</returns>
-        protected virtual IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint> selection)
-            => Enumerable.Empty<MenuItem>();
-
-        #endregion
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index 3555bc2800..2bb80bc27b 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -25,20 +25,17 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
-    internal class TimelineBlueprintContainer : BlueprintContainer
+    internal class TimelineBlueprintContainer : EditorBlueprintContainer
     {
         [Resolved(CanBeNull = true)]
         private Timeline timeline { get; set; }
 
-        [Resolved]
-        private EditorBeatmap beatmap { get; set; }
-
         [Resolved]
         private OsuColour colours { get; set; }
 
         private DragEvent lastDragEvent;
         private Bindable<HitObject> placement;
-        private SelectionBlueprint placementBlueprint;
+        private SelectionBlueprint<HitObject> placementBlueprint;
 
         private SelectableAreaBackground backgroundBox;
 
@@ -76,7 +73,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             base.LoadComplete();
             DragBox.Alpha = 0;
 
-            placement = beatmap.PlacementObject.GetBoundCopy();
+            placement = Beatmap.PlacementObject.GetBoundCopy();
             placement.ValueChanged += placementChanged;
         }
 
@@ -100,7 +97,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             }
         }
 
-        protected override Container<SelectionBlueprint> CreateSelectionBlueprintContainer() => new TimelineSelectionBlueprintContainer { RelativeSizeAxes = Axes.Both };
+        protected override Container<SelectionBlueprint<HitObject>> CreateSelectionBlueprintContainer() => new TimelineSelectionBlueprintContainer { RelativeSizeAxes = Axes.Both };
 
         protected override bool OnHover(HoverEvent e)
         {
@@ -160,7 +157,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 // remove objects from the stack as long as their end time is in the past.
                 while (currentConcurrentObjects.TryPeek(out HitObject hitObject))
                 {
-                    if (Precision.AlmostBigger(hitObject.GetEndTime(), b.HitObject.StartTime, 1))
+                    if (Precision.AlmostBigger(hitObject.GetEndTime(), b.Item.StartTime, 1))
                         break;
 
                     currentConcurrentObjects.Pop();
@@ -168,7 +165,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
                 // if the stack gets too high, we should have space below it to display the next batch of objects.
                 // importantly, we only do this if time has incremented, else a stack of hitobjects all at the same time value would start to overlap themselves.
-                if (currentConcurrentObjects.TryPeek(out HitObject h) && !Precision.AlmostEquals(h.StartTime, b.HitObject.StartTime, 1))
+                if (currentConcurrentObjects.TryPeek(out HitObject h) && !Precision.AlmostEquals(h.StartTime, b.Item.StartTime, 1))
                 {
                     if (currentConcurrentObjects.Count >= stack_reset_count)
                         currentConcurrentObjects.Clear();
@@ -176,13 +173,13 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
                 b.Y = -(stack_offset * currentConcurrentObjects.Count);
 
-                currentConcurrentObjects.Push(b.HitObject);
+                currentConcurrentObjects.Push(b.Item);
             }
         }
 
-        protected override SelectionHandler CreateSelectionHandler() => new TimelineSelectionHandler();
+        protected override SelectionHandler<HitObject> CreateSelectionHandler() => new TimelineSelectionHandler();
 
-        protected override SelectionBlueprint CreateBlueprintFor(HitObject hitObject)
+        protected override SelectionBlueprint<HitObject> CreateBlueprintFor(HitObject hitObject)
         {
             return new TimelineHitObjectBlueprint(hitObject)
             {
@@ -239,10 +236,10 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             }
         }
 
-        internal class TimelineSelectionHandler : SelectionHandler, IKeyBindingHandler<GlobalAction>
+        internal class TimelineSelectionHandler : EditorSelectionHandler, IKeyBindingHandler<GlobalAction>
         {
             // for now we always allow movement. snapping is provided by the Timeline's "distance" snap implementation
-            public override bool HandleMovement(MoveSelectionEvent moveEvent) => true;
+            public override bool HandleMovement(MoveSelectionEvent<HitObject> moveEvent) => true;
 
             public bool OnPressed(GlobalAction action)
             {
@@ -344,13 +341,13 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             }
         }
 
-        protected class TimelineSelectionBlueprintContainer : Container<SelectionBlueprint>
+        protected class TimelineSelectionBlueprintContainer : Container<SelectionBlueprint<HitObject>>
         {
-            protected override Container<SelectionBlueprint> Content { get; }
+            protected override Container<SelectionBlueprint<HitObject>> Content { get; }
 
             public TimelineSelectionBlueprintContainer()
             {
-                AddInternal(new TimelinePart<SelectionBlueprint>(Content = new HitObjectOrderedSelectionContainer { RelativeSizeAxes = Axes.Both }) { RelativeSizeAxes = Axes.Both });
+                AddInternal(new TimelinePart<SelectionBlueprint<HitObject>>(Content = new HitObjectOrderedSelectionContainer { RelativeSizeAxes = Axes.Both }) { RelativeSizeAxes = Axes.Both });
             }
         }
     }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 0425370ae5..dbe689be2f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -26,7 +26,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
-    public class TimelineHitObjectBlueprint : SelectionBlueprint
+    public class TimelineHitObjectBlueprint : SelectionBlueprint<HitObject>
     {
         private const float circle_size = 38;
 
@@ -49,13 +49,13 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [Resolved]
         private ISkinSource skin { get; set; }
 
-        public TimelineHitObjectBlueprint(HitObject hitObject)
-            : base(hitObject)
+        public TimelineHitObjectBlueprint(HitObject item)
+            : base(item)
         {
             Anchor = Anchor.CentreLeft;
             Origin = Anchor.CentreLeft;
 
-            startTime = hitObject.StartTimeBindable.GetBoundCopy();
+            startTime = item.StartTimeBindable.GetBoundCopy();
             startTime.BindValueChanged(time => X = (float)time.NewValue, true);
 
             RelativePositionAxes = Axes.X;
@@ -95,9 +95,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 },
             });
 
-            if (hitObject is IHasDuration)
+            if (item is IHasDuration)
             {
-                colouredComponents.Add(new DragArea(hitObject)
+                colouredComponents.Add(new DragArea(item)
                 {
                     OnDragHandled = e => OnDragHandled?.Invoke(e)
                 });
@@ -108,7 +108,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         {
             base.LoadComplete();
 
-            if (HitObject is IHasComboInformation comboInfo)
+            if (Item is IHasComboInformation comboInfo)
             {
                 indexInCurrentComboBindable = comboInfo.IndexInCurrentComboBindable.GetBoundCopy();
                 indexInCurrentComboBindable.BindValueChanged(_ => updateComboIndex(), true);
@@ -136,7 +136,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private void updateComboColour()
         {
-            if (!(HitObject is IHasComboInformation combo))
+            if (!(Item is IHasComboInformation combo))
                 return;
 
             var comboColours = skin.GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value ?? Array.Empty<Color4>();
@@ -152,7 +152,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 border.Hide();
             }
 
-            if (HitObject is IHasDuration duration && duration.Duration > 0)
+            if (Item is IHasDuration duration && duration.Duration > 0)
                 circle.Colour = ColourInfo.GradientHorizontal(comboColour, comboColour.Lighten(0.4f));
             else
                 circle.Colour = comboColour;
@@ -166,14 +166,14 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             base.Update();
 
             // no bindable so we perform this every update
-            float duration = (float)(HitObject.GetEndTime() - HitObject.StartTime);
+            float duration = (float)(Item.GetEndTime() - Item.StartTime);
 
             if (Width != duration)
             {
                 Width = duration;
 
                 // kind of haphazard but yeah, no bindables.
-                if (HitObject is IHasRepeats repeats)
+                if (Item is IHasRepeats repeats)
                     updateRepeats(repeats);
             }
         }

From eac139ca0e0a1747199c3ac1110a434d25fa5429 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Apr 2021 17:41:46 +0900
Subject: [PATCH 2900/3722] Allow BlueprintContainer to perform movement
 without an `ISnapProvider`

---
 .../Compose/Components/BlueprintContainer.cs  | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index a0bb4feadc..bd22c7329a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -420,25 +420,25 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (movementBlueprints == null)
                 return false;
 
-            if (snapProvider == null)
-                return true;
-
             Debug.Assert(movementBlueprintOriginalPositions != null);
 
             Vector2 distanceTravelled = e.ScreenSpaceMousePosition - e.ScreenSpaceMouseDownPosition;
 
-            // check for positional snap for every object in selection (for things like object-object snapping)
-            for (var i = 0; i < movementBlueprintOriginalPositions.Length; i++)
+            if (snapProvider != null)
             {
-                var testPosition = movementBlueprintOriginalPositions[i] + distanceTravelled;
+                // check for positional snap for every object in selection (for things like object-object snapping)
+                for (var i = 0; i < movementBlueprintOriginalPositions.Length; i++)
+                {
+                    var testPosition = movementBlueprintOriginalPositions[i] + distanceTravelled;
 
-                var positionalResult = snapProvider.SnapScreenSpacePositionToValidPosition(testPosition);
+                    var positionalResult = snapProvider.SnapScreenSpacePositionToValidPosition(testPosition);
 
-                if (positionalResult.ScreenSpacePosition == testPosition) continue;
+                    if (positionalResult.ScreenSpacePosition == testPosition) continue;
 
-                // attempt to move the objects, and abort any time based snapping if we can.
-                if (SelectionHandler.HandleMovement(new MoveSelectionEvent<T>(movementBlueprints[i], positionalResult.ScreenSpacePosition)))
-                    return true;
+                    // attempt to move the objects, and abort any time based snapping if we can.
+                    if (SelectionHandler.HandleMovement(new MoveSelectionEvent<T>(movementBlueprints[i], positionalResult.ScreenSpacePosition)))
+                        return true;
+                }
             }
 
             // if no positional snapping could be performed, try unrestricted snapping from the earliest
@@ -448,15 +448,18 @@ namespace osu.Game.Screens.Edit.Compose.Components
             Vector2 movePosition = movementBlueprintOriginalPositions.First() + distanceTravelled;
 
             // Retrieve a snapped position.
-            var result = snapProvider.SnapScreenSpacePositionToValidTime(movePosition);
+            var result = snapProvider?.SnapScreenSpacePositionToValidTime(movePosition);
+
+            if (result == null)
+            {
+                return SelectionHandler.HandleMovement(new MoveSelectionEvent<T>(movementBlueprints.First(), movePosition));
+            }
 
             return ApplySnapResult(movementBlueprints, result);
         }
 
-        protected virtual bool ApplySnapResult(SelectionBlueprint<T>[] blueprints, SnapResult result)
-        {
-            return !SelectionHandler.HandleMovement(new MoveSelectionEvent<T>(blueprints.First(), result.ScreenSpacePosition));
-        }
+        protected virtual bool ApplySnapResult(SelectionBlueprint<T>[] blueprints, SnapResult result) =>
+            SelectionHandler.HandleMovement(new MoveSelectionEvent<T>(blueprints.First(), result.ScreenSpacePosition));
 
         /// <summary>
         /// Finishes the current movement of selected blueprints.

From 32416e4e313eb818464355124415d661e23b8b2b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Apr 2021 17:42:10 +0900
Subject: [PATCH 2901/3722] Move model selection handling to base
 `SelectionHandler` class

---
 .../Compose/Components/EditorSelectionHandler.cs | 16 ----------------
 .../Edit/Compose/Components/SelectionHandler.cs  |  5 +++++
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
index a117d42574..4c6833cc4a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
@@ -37,22 +37,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
             };
         }
 
-        internal override void HandleSelected(SelectionBlueprint<HitObject> blueprint)
-        {
-            base.HandleSelected(blueprint);
-
-            // there are potentially multiple SelectionHandlers active, but we only want to add hitobjects to the selected list once.
-            if (!EditorBeatmap.SelectedHitObjects.Contains(blueprint.Item))
-                EditorBeatmap.SelectedHitObjects.Add(blueprint.Item);
-        }
-
-        internal override void HandleDeselected(SelectionBlueprint<HitObject> blueprint)
-        {
-            base.HandleDeselected(blueprint);
-
-            EditorBeatmap.SelectedHitObjects.Remove(blueprint.Item);
-        }
-
         protected override void DeleteItems(IEnumerable<HitObject> items) => EditorBeatmap.RemoveRange(items);
 
         #region Selection State
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 1ee1de7d43..59ade746a9 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -196,6 +196,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="blueprint">The blueprint.</param>
         internal virtual void HandleSelected(SelectionBlueprint<T> blueprint)
         {
+            // there are potentially multiple SelectionHandlers active, but we only want to add hitobjects to the selected list once.
+            if (!SelectedItems.Contains(blueprint.Item))
+                SelectedItems.Add(blueprint.Item);
+
             selectedBlueprints.Add(blueprint);
         }
 
@@ -205,6 +209,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="blueprint">The blueprint.</param>
         internal virtual void HandleDeselected(SelectionBlueprint<T> blueprint)
         {
+            SelectedItems.Remove(blueprint.Item);
             selectedBlueprints.Remove(blueprint);
         }
 

From f586bc46e624257e8e8c8438c644d4dfdcb240d8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Apr 2021 18:03:34 +0900
Subject: [PATCH 2902/3722] Avoid using `EditorBeatmap.SelectedHitObjects`

---
 osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 92f5254182..5164c7f204 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -374,8 +374,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         /// <summary>
         /// All osu! hitobjects which can be moved/rotated/scaled.
         /// </summary>
-        private OsuHitObject[] selectedMovableObjects => EditorBeatmap.SelectedHitObjects
-                                                                      .OfType<OsuHitObject>()
+        private OsuHitObject[] selectedMovableObjects => SelectedItems.OfType<OsuHitObject>()
                                                                       .Where(h => !(h is Spinner))
                                                                       .ToArray();
 

From dd3d8e5d0388974191d4907e449814ec25b1576c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Apr 2021 18:06:27 +0900
Subject: [PATCH 2903/3722] Make `SelectionHandler` abstract to ensure things
 get implemented

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs          |  3 +--
 .../Edit/Compose/Components/BlueprintContainer.cs    |  2 +-
 .../Compose/Components/EditorBlueprintContainer.cs   |  2 ++
 .../Compose/Components/EditorSelectionHandler.cs     |  4 ++--
 .../Edit/Compose/Components/SelectionHandler.cs      | 12 +++++++-----
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 35896d4982..b47cf97a4d 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -182,8 +182,7 @@ namespace osu.Game.Rulesets.Edit
         /// <summary>
         /// Construct a relevant blueprint container. This will manage hitobject selection/placement input handling and display logic.
         /// </summary>
-        protected virtual ComposeBlueprintContainer CreateBlueprintContainer()
-            => new ComposeBlueprintContainer(this);
+        protected virtual ComposeBlueprintContainer CreateBlueprintContainer() => new ComposeBlueprintContainer(this);
 
         /// <summary>
         /// Construct a drawable ruleset for the provided ruleset.
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index bd22c7329a..7f81629f80 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <summary>
         /// Creates a <see cref="Components.SelectionHandler{T}"/> which outlines <see cref="DrawableHitObject"/>s and handles movement of selections.
         /// </summary>
-        protected virtual SelectionHandler<T> CreateSelectionHandler() => new SelectionHandler<T>();
+        protected abstract SelectionHandler<T> CreateSelectionHandler();
 
         /// <summary>
         /// Creates a <see cref="SelectionBlueprint{T}"/> for a specific <see cref="DrawableHitObject"/>.
diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
index aef02d5ffd..0cb9cf930c 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
@@ -135,6 +135,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected override Container<SelectionBlueprint<HitObject>> CreateSelectionBlueprintContainer() => new HitObjectOrderedSelectionContainer { RelativeSizeAxes = Axes.Both };
 
+        protected override SelectionHandler<HitObject> CreateSelectionHandler() => new EditorSelectionHandler();
+
         protected override void SelectAll()
         {
             Composer.Playfield.KeepAllAlive();
diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
index 4c6833cc4a..4b85b5cc0e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
@@ -101,11 +101,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         protected virtual void UpdateTernaryStates()
         {
-            SelectionNewComboState.Value = GetStateFromSelection(EditorBeatmap.SelectedHitObjects.OfType<IHasComboInformation>(), h => h.NewCombo);
+            SelectionNewComboState.Value = GetStateFromSelection(SelectedItems.OfType<IHasComboInformation>(), h => h.NewCombo);
 
             foreach (var (sampleName, bindable) in SelectionSampleStates)
             {
-                bindable.Value = GetStateFromSelection(EditorBeatmap.SelectedHitObjects, h => h.Samples.Any(s => s.Name == sampleName));
+                bindable.Value = GetStateFromSelection(SelectedItems, h => h.Samples.Any(s => s.Name == sampleName));
             }
         }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 59ade746a9..4b99aa5da7 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
     /// <summary>
     /// A component which outlines <see cref="DrawableHitObject"/>s and handles movement of selections.
     /// </summary>
-    public class SelectionHandler<T> : CompositeDrawable, IKeyBindingHandler<PlatformAction>
+    public abstract class SelectionHandler<T> : CompositeDrawable, IKeyBindingHandler<PlatformAction>
     {
         /// <summary>
         /// The currently selected blueprints.
@@ -47,7 +47,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [Resolved(CanBeNull = true)]
         protected IEditorChangeHandler ChangeHandler { get; private set; }
 
-        public SelectionHandler()
+        protected SelectionHandler()
         {
             selectedBlueprints = new List<SelectionBlueprint<T>>();
 
@@ -265,9 +265,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 DeleteSelected();
         }
 
-        protected virtual void DeleteItems(IEnumerable<T> items)
-        {
-        }
+        /// <summary>
+        /// Called whenever the deletion of items has been requested.
+        /// </summary>
+        /// <param name="items">The items to be deleted.</param>
+        protected abstract void DeleteItems(IEnumerable<T> items);
 
         /// <summary>
         /// Ensure the blueprint is in a selected state.

From f97b14a20aeb786a03fe200e78a61376a5a23b56 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Apr 2021 18:15:24 +0900
Subject: [PATCH 2904/3722] Fix binding direction of selected items

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

diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
index 4b85b5cc0e..d26a2946c1 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
@@ -29,8 +29,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             // bring in updates from selection changes
             EditorBeatmap.HitObjectUpdated += _ => Scheduler.AddOnce(UpdateTernaryStates);
-            EditorBeatmap.SelectedHitObjects.BindTo(SelectedItems);
 
+            SelectedItems.BindTo(EditorBeatmap.SelectedHitObjects);
             SelectedItems.CollectionChanged += (sender, args) =>
             {
                 Scheduler.AddOnce(UpdateTernaryStates);

From ff06a27a1237bc71febd6b4027449346c7c07ccd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Apr 2021 18:33:39 +0900
Subject: [PATCH 2905/3722] Revert changes to `OnBlueprint` methods and handle
 select-on-addition locally

---
 .../Edit/Compose/Components/ComposeBlueprintContainer.cs   | 2 +-
 .../Edit/Compose/Components/EditorBlueprintContainer.cs    | 7 -------
 .../Screens/Edit/Compose/Components/SelectionHandler.cs    | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 994e862946..f22404e77d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -251,7 +251,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         public virtual OverlaySelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject) => null;
 
-        protected override void OnBlueprintAdded(SelectionBlueprint<HitObject> item)
+        protected override void OnBlueprintAdded(HitObject item)
         {
             base.OnBlueprintAdded(item);
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
index 0cb9cf930c..d17892d6ba 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
@@ -108,13 +108,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
             base.AddBlueprintFor(item);
         }
 
-        protected override void OnBlueprintAdded(SelectionBlueprint<HitObject> blueprint)
-        {
-            base.OnBlueprintAdded(blueprint);
-            if (Beatmap.SelectedHitObjects.Contains(blueprint.Item))
-                blueprint.Select();
-        }
-
         protected override void UpdateSelection()
         {
             base.UpdateSelection();
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 4b99aa5da7..52c148f852 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         public IReadOnlyList<SelectionBlueprint<T>> SelectedBlueprints => selectedBlueprints;
 
-        protected BindableList<T> SelectedItems = new BindableList<T>();
+        public BindableList<T> SelectedItems = new BindableList<T>();
 
         private readonly List<SelectionBlueprint<T>> selectedBlueprints;
 

From 7ec5ea1eb5a761760da2133dc03a4b9bce1882aa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Apr 2021 18:33:47 +0900
Subject: [PATCH 2906/3722] Remove hitobject terminology from base classes

---
 osu.Game/Rulesets/Edit/SelectionBlueprint.cs  |  5 +-
 .../Compose/Components/BlueprintContainer.cs  | 46 +++++++++++--------
 .../Components/ComposeBlueprintContainer.cs   |  4 +-
 .../Compose/Components/SelectionHandler.cs    | 37 +++++++--------
 .../Timeline/TimelineBlueprintContainer.cs    |  4 +-
 5 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
index 905e433731..b176ecb148 100644
--- a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
@@ -8,13 +8,12 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Rulesets.Objects.Drawables;
 using osuTK;
 
 namespace osu.Game.Rulesets.Edit
 {
     /// <summary>
-    /// A blueprint placed above a <see cref="DrawableHitObject"/> adding editing functionality.
+    /// A blueprint placed above a displaying item adding editing functionality.
     /// </summary>
     public abstract class SelectionBlueprint<T> : CompositeDrawable, IStateful<SelectionState>
     {
@@ -86,7 +85,7 @@ namespace osu.Game.Rulesets.Edit
 
         protected virtual void OnDeselected()
         {
-            // selection blueprints are AlwaysPresent while the related DrawableHitObject is visible
+            // selection blueprints are AlwaysPresent while the related item is visible
             // set the body piece's alpha directly to avoid arbitrarily rendering frame buffers etc. of children.
             foreach (var d in InternalChildren)
                 d.Hide();
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 7f81629f80..c2ba627df4 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -14,15 +14,13 @@ using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
-using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Drawables;
 using osuTK;
 using osuTK.Input;
 
 namespace osu.Game.Screens.Edit.Compose.Components
 {
     /// <summary>
-    /// A container which provides a "blueprint" display of hitobjects.
+    /// A container which provides a "blueprint" display of items.
     /// Includes selection and manipulation support via a <see cref="Components.SelectionHandler{T}"/>.
     /// </summary>
     public abstract class BlueprintContainer<T> : CompositeDrawable, IKeyBindingHandler<PlatformAction>
@@ -65,15 +63,15 @@ namespace osu.Game.Screens.Edit.Compose.Components
         protected virtual Container<SelectionBlueprint<T>> CreateSelectionBlueprintContainer() => new Container<SelectionBlueprint<T>> { RelativeSizeAxes = Axes.Both };
 
         /// <summary>
-        /// Creates a <see cref="Components.SelectionHandler{T}"/> which outlines <see cref="DrawableHitObject"/>s and handles movement of selections.
+        /// Creates a <see cref="Components.SelectionHandler{T}"/> which outlines items and handles movement of selections.
         /// </summary>
         protected abstract SelectionHandler<T> CreateSelectionHandler();
 
         /// <summary>
-        /// Creates a <see cref="SelectionBlueprint{T}"/> for a specific <see cref="DrawableHitObject"/>.
+        /// Creates a <see cref="SelectionBlueprint{T}"/> for a specific item.
         /// </summary>
-        /// <param name="hitObject">The <see cref="DrawableHitObject"/> to create the overlay for.</param>
-        protected virtual SelectionBlueprint<T> CreateBlueprintFor(T hitObject) => null;
+        /// <param name="item">The item to create the overlay for.</param>
+        protected virtual SelectionBlueprint<T> CreateBlueprintFor(T item) => null;
 
         protected virtual DragBox CreateDragBox(Action<RectangleF> performSelect) => new DragBox(performSelect);
 
@@ -103,7 +101,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             ClickedBlueprint = SelectionHandler.SelectedBlueprints.FirstOrDefault(b => b.IsHovered);
 
             // Deselection should only occur if no selected blueprints are hovered
-            // A special case for when a blueprint was selected via this click is added since OnClick() may occur outside the hitobject and should not trigger deselection
+            // A special case for when a blueprint was selected via this click is added since OnClick() may occur outside the item and should not trigger deselection
             if (endClickSelection(e) || ClickedBlueprint != null)
                 return true;
 
@@ -237,7 +235,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             SelectionBlueprints.Add(blueprint);
 
-            OnBlueprintAdded(blueprint);
+            if (SelectionHandler.SelectedItems.Contains(item))
+                blueprint.Select();
+
+            OnBlueprintAdded(blueprint.Item);
         }
 
         protected void RemoveBlueprintFor(T item)
@@ -254,22 +255,24 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (movementBlueprints?.Contains(blueprint) == true)
                 finishSelectionMovement();
 
-            OnBlueprintRemoved(blueprint);
+            OnBlueprintRemoved(blueprint.Item);
         }
 
         /// <summary>
-        /// Called after a <see cref="HitObject"/> blueprint has been added.
+        /// Called after an item's blueprint has been added.
         /// </summary>
-        /// <param name="blueprint">The <see cref="HitObject"/> for which the blueprint has been added.</param>
-        protected virtual void OnBlueprintAdded(SelectionBlueprint<T> blueprint)
+        /// <param name="item">The item for which the blueprint has been added.</param>
+        protected virtual void OnBlueprintAdded(T item)
         {
+            if (SelectionHandler.SelectedItems.Contains(item))
+                blueprintMap[item].Select();
         }
 
         /// <summary>
-        /// Called after a <see cref="HitObject"/> blueprint has been removed.
+        /// Called after an item's blueprint has been removed.
         /// </summary>
-        /// <param name="item">The <see cref="HitObject"/> for which the blueprint has been removed.</param>
-        protected virtual void OnBlueprintRemoved(SelectionBlueprint<T> item)
+        /// <param name="item">The item for which the blueprint has been removed.</param>
+        protected virtual void OnBlueprintRemoved(T item)
         {
         }
 
@@ -398,16 +401,21 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (!SelectionHandler.SelectedBlueprints.Any())
                 return;
 
-            // Any selected blueprint that is hovered can begin the movement of the group, however only the earliest hitobject is used for movement
+            // Any selected blueprint that is hovered can begin the movement of the group, however only the first item (according to SortForMovement) is used for movement.
             // A special case is added for when a click selection occurred before the drag
             if (!clickSelectionBegan && !SelectionHandler.SelectedBlueprints.Any(b => b.IsHovered))
                 return;
 
-            // Movement is tracked from the blueprint of the earliest hitobject, since it only makes sense to distance snap from that hitobject
+            // Movement is tracked from the blueprint of the earliest item, since it only makes sense to distance snap from that item
             movementBlueprints = SortForMovement(SelectionHandler.SelectedBlueprints).ToArray();
             movementBlueprintOriginalPositions = movementBlueprints.Select(m => m.ScreenSpaceSelectionPoint).ToArray();
         }
 
+        /// <summary>
+        /// Apply sorting of selected blueprints before performing movement. Generally used to surface the "main" item to the beginning of the collection.
+        /// </summary>
+        /// <param name="blueprints">The blueprints to be moved.</param>
+        /// <returns>Sorted blueprints.</returns>
         protected virtual IEnumerable<SelectionBlueprint<T>> SortForMovement(IReadOnlyList<SelectionBlueprint<T>> blueprints) => blueprints;
 
         /// <summary>
@@ -442,7 +450,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
 
             // if no positional snapping could be performed, try unrestricted snapping from the earliest
-            // hitobject in the selection.
+            // item in the selection.
 
             // The final movement position, relative to movementBlueprintOriginalPosition.
             Vector2 movePosition = movementBlueprintOriginalPositions.First() + distanceTravelled;
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index f22404e77d..f8ac0552ae 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -239,9 +239,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 updatePlacementPosition();
         }
 
-        protected sealed override SelectionBlueprint<HitObject> CreateBlueprintFor(HitObject hitObject)
+        protected sealed override SelectionBlueprint<HitObject> CreateBlueprintFor(HitObject item)
         {
-            var drawable = Composer.HitObjects.FirstOrDefault(d => d.HitObject == hitObject);
+            var drawable = Composer.HitObjects.FirstOrDefault(d => d.HitObject == item);
 
             if (drawable == null)
                 return null;
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 52c148f852..8f2f1d65b8 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -15,26 +15,27 @@ using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Edit;
-using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Drawables;
 using osuTK;
 using osuTK.Input;
 
 namespace osu.Game.Screens.Edit.Compose.Components
 {
     /// <summary>
-    /// A component which outlines <see cref="DrawableHitObject"/>s and handles movement of selections.
+    /// A component which outlines items and handles movement of selections.
     /// </summary>
     public abstract class SelectionHandler<T> : CompositeDrawable, IKeyBindingHandler<PlatformAction>
     {
         /// <summary>
         /// The currently selected blueprints.
         /// Should be used when operations are dealing directly with the visible blueprints.
-        /// For more general selection operations, use <see cref="osu.Game.Screens.Edit.EditorBeatmap.SelectedHitObjects"/> instead.
+        /// For more general selection operations, use <see cref="SelectedItems"/> instead.
         /// </summary>
         public IReadOnlyList<SelectionBlueprint<T>> SelectedBlueprints => selectedBlueprints;
 
-        public BindableList<T> SelectedItems = new BindableList<T>();
+        /// <summary>
+        /// The currently selected items.
+        /// </summary>
+        public readonly BindableList<T> SelectedItems = new BindableList<T>();
 
         private readonly List<SelectionBlueprint<T>> selectedBlueprints;
 
@@ -124,45 +125,45 @@ namespace osu.Game.Screens.Edit.Compose.Components
         #region User Input Handling
 
         /// <summary>
-        /// Handles the selected <see cref="DrawableHitObject"/>s being moved.
+        /// Handles the selected items being moved.
         /// </summary>
         /// <remarks>
-        /// Just returning true is enough to allow <see cref="HitObject.StartTime"/> updates to take place.
+        /// Just returning true is enough to allow default movement to take place.
         /// Custom implementation is only required if other attributes are to be considered, like changing columns.
         /// </remarks>
         /// <param name="moveEvent">The move event.</param>
         /// <returns>
-        /// Whether any <see cref="DrawableHitObject"/>s could be moved.
+        /// Whether any items could be moved.
         /// Returning true will also propagate StartTime changes provided by the closest <see cref="IPositionSnapProvider.SnapScreenSpacePositionToValidTime"/>.
         /// </returns>
         public virtual bool HandleMovement(MoveSelectionEvent<T> moveEvent) => false;
 
         /// <summary>
-        /// Handles the selected <see cref="DrawableHitObject"/>s being rotated.
+        /// Handles the selected items being rotated.
         /// </summary>
         /// <param name="angle">The delta angle to apply to the selection.</param>
-        /// <returns>Whether any <see cref="DrawableHitObject"/>s could be rotated.</returns>
+        /// <returns>Whether any items could be rotated.</returns>
         public virtual bool HandleRotation(float angle) => false;
 
         /// <summary>
-        /// Handles the selected <see cref="DrawableHitObject"/>s being scaled.
+        /// Handles the selected items being scaled.
         /// </summary>
         /// <param name="scale">The delta scale to apply, in playfield local coordinates.</param>
         /// <param name="anchor">The point of reference where the scale is originating from.</param>
-        /// <returns>Whether any <see cref="DrawableHitObject"/>s could be scaled.</returns>
+        /// <returns>Whether any items could be scaled.</returns>
         public virtual bool HandleScale(Vector2 scale, Anchor anchor) => false;
 
         /// <summary>
-        /// Handles the selected <see cref="DrawableHitObject"/>s being flipped.
+        /// Handles the selected items being flipped.
         /// </summary>
         /// <param name="direction">The direction to flip</param>
-        /// <returns>Whether any <see cref="DrawableHitObject"/>s could be flipped.</returns>
+        /// <returns>Whether any items could be flipped.</returns>
         public virtual bool HandleFlip(Direction direction) => false;
 
         /// <summary>
-        /// Handles the selected <see cref="DrawableHitObject"/>s being reversed pattern-wise.
+        /// Handles the selected items being reversed pattern-wise.
         /// </summary>
-        /// <returns>Whether any <see cref="DrawableHitObject"/>s could be reversed.</returns>
+        /// <returns>Whether any items could be reversed.</returns>
         public virtual bool HandleReverse() => false;
 
         public bool OnPressed(PlatformAction action)
@@ -196,7 +197,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="blueprint">The blueprint.</param>
         internal virtual void HandleSelected(SelectionBlueprint<T> blueprint)
         {
-            // there are potentially multiple SelectionHandlers active, but we only want to add hitobjects to the selected list once.
+            // there are potentially multiple SelectionHandlers active, but we only want to add items to the selected list once.
             if (!SelectedItems.Contains(blueprint.Item))
                 SelectedItems.Add(blueprint.Item);
 
@@ -323,7 +324,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (selectedBlueprints.Count == 0)
                 return;
 
-            // Move the rectangle to cover the hitobjects
+            // Move the rectangle to cover the items
             var topLeft = new Vector2(float.MaxValue, float.MaxValue);
             var bottomRight = new Vector2(float.MinValue, float.MinValue);
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index 2bb80bc27b..7c1bbd65f9 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -179,9 +179,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         protected override SelectionHandler<HitObject> CreateSelectionHandler() => new TimelineSelectionHandler();
 
-        protected override SelectionBlueprint<HitObject> CreateBlueprintFor(HitObject hitObject)
+        protected override SelectionBlueprint<HitObject> CreateBlueprintFor(HitObject item)
         {
-            return new TimelineHitObjectBlueprint(hitObject)
+            return new TimelineHitObjectBlueprint(item)
             {
                 OnDragHandled = handleScrollViaDrag
             };

From 42255f8d3350673f085835da8eca68a6a3df382c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Apr 2021 18:57:51 +0900
Subject: [PATCH 2907/3722] Rename and xmldoc selection completed method

---
 .../Screens/Edit/Compose/Components/BlueprintContainer.cs  | 7 +++++--
 .../Edit/Compose/Components/EditorBlueprintContainer.cs    | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index c2ba627df4..392b375d12 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -173,7 +173,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             if (isDraggingBlueprint)
             {
-                UpdateSelection();
+                DragOperationCompleted();
 
                 changeHandler?.EndChange();
             }
@@ -182,7 +182,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 DragBox.Hide();
         }
 
-        protected virtual void UpdateSelection()
+        /// <summary>
+        /// Called whenever a drag operation completes, before any change transaction is committed.
+        /// </summary>
+        protected virtual void DragOperationCompleted()
         {
         }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
index d17892d6ba..9eee680bda 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
@@ -108,9 +108,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
             base.AddBlueprintFor(item);
         }
 
-        protected override void UpdateSelection()
+        protected override void DragOperationCompleted()
         {
-            base.UpdateSelection();
+            base.DragOperationCompleted();
 
             // handle positional change etc.
             foreach (var blueprint in SelectionBlueprints)

From b87446a5778ee76c96f02cd163beebdc44476e24 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 27 Apr 2021 19:37:01 +0900
Subject: [PATCH 2908/3722] Simplify HitObjectLifetimeEntry logic a bit

---
 .../Objects/HitObjectLifetimeEntry.cs         | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
index 0181d6241b..0d1eb68f07 100644
--- a/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
+++ b/osu.Game/Rulesets/Objects/HitObjectLifetimeEntry.cs
@@ -45,23 +45,16 @@ namespace osu.Game.Rulesets.Objects
         // This method is called even if `start == LifetimeStart` when `KeepAlive` is true (necessary to update `realLifetimeStart`).
         protected override void SetLifetimeStart(double start)
         {
-            // This assignment cannot be done in `SetLifetime` because otherwise setting only `LifetimeStart` will make `realLifetimeEnd` to be lost.
             realLifetimeStart = start;
-            base.SetLifetimeStart(start);
+            if (!keepAlive)
+                base.SetLifetimeStart(start);
         }
 
         protected override void SetLifetimeEnd(double end)
         {
             realLifetimeEnd = end;
-            base.SetLifetimeEnd(end);
-        }
-
-        protected override void SetLifetime(double start, double end)
-        {
-            if (keepAlive)
-                base.SetLifetime(double.MinValue, double.MaxValue);
-            else
-                base.SetLifetime(start, end);
+            if (!keepAlive)
+                base.SetLifetimeEnd(end);
         }
 
         private bool keepAlive;
@@ -77,7 +70,10 @@ namespace osu.Game.Rulesets.Objects
                     return;
 
                 keepAlive = value;
-                SetLifetime(realLifetimeStart, realLifetimeEnd);
+                if (keepAlive)
+                    SetLifetime(double.MinValue, double.MaxValue);
+                else
+                    SetLifetime(realLifetimeStart, realLifetimeEnd);
             }
         }
 

From c4d28110d641c9d121d88e4559c783cfc2094218 Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Tue, 27 Apr 2021 19:02:57 +0800
Subject: [PATCH 2909/3722] Add visual tests for timing based note coloring

---
 .../TestSceneTimingBasedNoteColouring.cs      | 88 +++++++++++++++++++
 .../Objects/Drawables/DrawableNote.cs         |  2 +-
 2 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/TestSceneTimingBasedNoteColouring.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneTimingBasedNoteColouring.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneTimingBasedNoteColouring.cs
new file mode 100644
index 0000000000..3a9ddb6a9d
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneTimingBasedNoteColouring.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 NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Tests.Visual;
+using osu.Framework.Timing;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.Beatmaps;
+using osu.Game.Rulesets.Mania.Configuration;
+using osu.Framework.Bindables;
+
+namespace osu.Game.Rulesets.Mania.Tests
+{
+    [TestFixture]
+    public class TestSceneTimingBasedNoteColouring : OsuTestScene
+    {
+        [Resolved]
+        private RulesetConfigCache configCache { get; set; }
+        private readonly Bindable<bool> configTimingBasedNoteColouring = new Bindable<bool>();
+
+        protected override void LoadComplete()
+        {
+            const int beatLength = 500;
+
+            var ruleset = new ManiaRuleset();
+
+            var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 1 })
+            {
+                HitObjects = {
+                    new Note { StartTime = 0 },
+                    new Note { StartTime = beatLength / 16 },
+                    new Note { StartTime = beatLength / 12 },
+                    new Note { StartTime = beatLength / 8 },
+                    new Note { StartTime = beatLength / 6 },
+                    new Note { StartTime = beatLength / 4 },
+                    new Note { StartTime = beatLength / 3 },
+                    new Note { StartTime = beatLength / 2 },
+                    new Note { StartTime = beatLength }
+                },
+                ControlPointInfo = new ControlPointInfo(),
+                BeatmapInfo =
+                {
+                    BaseDifficulty = new BeatmapDifficulty
+                    {
+                        SliderTickRate = 4,
+                        OverallDifficulty = 10,
+                    },
+                    Ruleset = ruleset.RulesetInfo
+                },
+            };
+
+            foreach (var note in beatmap.HitObjects)
+            {
+                note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+            }
+
+            beatmap.ControlPointInfo.Add(0, new TimingControlPoint()
+                {
+                    TimeSignature = Game.Beatmaps.Timing.TimeSignatures.SimpleQuadruple,
+                    BeatLength = beatLength
+                }
+            );
+
+            Child = new Container
+            {
+                Clock = new FramedClock(new ManualClock()),
+                RelativeSizeAxes = Axes.Both,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Children = new[]
+                {
+                    ruleset.CreateDrawableRulesetWith(beatmap)
+                }
+            };
+
+            var config = (ManiaRulesetConfigManager)configCache.GetConfigFor(Ruleset.Value.CreateInstance());
+            config.BindWith(ManiaRulesetSetting.TimingBasedNoteColouring, configTimingBasedNoteColouring);
+
+            AddStep("Enable", () => configTimingBasedNoteColouring.Value = true);
+            AddStep("Disable", () => configTimingBasedNoteColouring.Value = false);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 102cd485dc..942a32936c 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         [Resolved]
         private OsuColour colours { get; set; }
 
-        [Resolved]
+        [Resolved(canBeNull: true)]
         private BeatDivisorFinder beatDivisorFinder { get; set; }
 
         private readonly Bindable<bool> configTimingBasedNoteColouring = new Bindable<bool>();

From 4752a0201ad2373c2bfefb9ae8328e5de8609298 Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Tue, 27 Apr 2021 19:25:46 +0800
Subject: [PATCH 2910/3722] Fix cake errors

---
 .../TestSceneTimingBasedNoteColouring.cs      | 26 +++---
 osu.Game.Tests/NonVisual/BeatDivisorFinder.cs | 90 +++++++++----------
 2 files changed, 59 insertions(+), 57 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneTimingBasedNoteColouring.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneTimingBasedNoteColouring.cs
index 3a9ddb6a9d..5cfd7ff389 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneTimingBasedNoteColouring.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneTimingBasedNoteColouring.cs
@@ -21,26 +21,28 @@ namespace osu.Game.Rulesets.Mania.Tests
     {
         [Resolved]
         private RulesetConfigCache configCache { get; set; }
+
         private readonly Bindable<bool> configTimingBasedNoteColouring = new Bindable<bool>();
 
         protected override void LoadComplete()
         {
-            const int beatLength = 500;
+            const double beat_length = 500;
 
             var ruleset = new ManiaRuleset();
 
             var beatmap = new ManiaBeatmap(new StageDefinition { Columns = 1 })
             {
-                HitObjects = {
+                HitObjects =
+                {
                     new Note { StartTime = 0 },
-                    new Note { StartTime = beatLength / 16 },
-                    new Note { StartTime = beatLength / 12 },
-                    new Note { StartTime = beatLength / 8 },
-                    new Note { StartTime = beatLength / 6 },
-                    new Note { StartTime = beatLength / 4 },
-                    new Note { StartTime = beatLength / 3 },
-                    new Note { StartTime = beatLength / 2 },
-                    new Note { StartTime = beatLength }
+                    new Note { StartTime = beat_length / 16 },
+                    new Note { StartTime = beat_length / 12 },
+                    new Note { StartTime = beat_length / 8 },
+                    new Note { StartTime = beat_length / 6 },
+                    new Note { StartTime = beat_length / 4 },
+                    new Note { StartTime = beat_length / 3 },
+                    new Note { StartTime = beat_length / 2 },
+                    new Note { StartTime = beat_length }
                 },
                 ControlPointInfo = new ControlPointInfo(),
                 BeatmapInfo =
@@ -59,10 +61,10 @@ namespace osu.Game.Rulesets.Mania.Tests
                 note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
             }
 
-            beatmap.ControlPointInfo.Add(0, new TimingControlPoint()
+            beatmap.ControlPointInfo.Add(0, new TimingControlPoint
                 {
                     TimeSignature = Game.Beatmaps.Timing.TimeSignatures.SimpleQuadruple,
-                    BeatLength = beatLength
+                    BeatLength = beat_length
                 }
             );
 
diff --git a/osu.Game.Tests/NonVisual/BeatDivisorFinder.cs b/osu.Game.Tests/NonVisual/BeatDivisorFinder.cs
index 742f5790d6..720d8e8ecd 100644
--- a/osu.Game.Tests/NonVisual/BeatDivisorFinder.cs
+++ b/osu.Game.Tests/NonVisual/BeatDivisorFinder.cs
@@ -14,32 +14,32 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestFindDivisor()
         {
-            const int beatLength = 1000;
+            const double beat_length = 1000;
 
             var beatmap = new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
-                    new HitObject { StartTime = -beatLength / 3 },
+                    new HitObject { StartTime = -beat_length / 3 },
                     new HitObject { StartTime = 0 },
-                    new HitObject { StartTime = beatLength / 16 },
-                    new HitObject { StartTime = beatLength / 12 },
-                    new HitObject { StartTime = beatLength / 8 },
-                    new HitObject { StartTime = beatLength / 6 },
-                    new HitObject { StartTime = beatLength / 4 },
-                    new HitObject { StartTime = beatLength / 3 },
-                    new HitObject { StartTime = beatLength / 2 },
-                    new HitObject { StartTime = beatLength },
-                    new HitObject { StartTime = beatLength + beatLength / 7 }
+                    new HitObject { StartTime = beat_length / 16 },
+                    new HitObject { StartTime = beat_length / 12 },
+                    new HitObject { StartTime = beat_length / 8 },
+                    new HitObject { StartTime = beat_length / 6 },
+                    new HitObject { StartTime = beat_length / 4 },
+                    new HitObject { StartTime = beat_length / 3 },
+                    new HitObject { StartTime = beat_length / 2 },
+                    new HitObject { StartTime = beat_length },
+                    new HitObject { StartTime = beat_length + beat_length / 7 }
                 },
                 ControlPointInfo = new ControlPointInfo()
             };
 
-            beatmap.ControlPointInfo.Add(0, new TimingControlPoint()
-                {
-                    TimeSignature = Game.Beatmaps.Timing.TimeSignatures.SimpleQuadruple,
-                    BeatLength = beatLength
-                });
+            beatmap.ControlPointInfo.Add(0, new TimingControlPoint
+            {
+                TimeSignature = Game.Beatmaps.Timing.TimeSignatures.SimpleQuadruple,
+                BeatLength = beat_length
+            });
 
             var beatDivisorFinder = new BeatDivisorFinder(beatmap);
 
@@ -59,49 +59,49 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestFindDivisorWithTempoChanges()
         {
-            const int firstBeatLength = 1000;
-            const int secondBeatLength = 700;
-            const int thirdBeatLength = 200;
+            const double first_beat_length = 1000;
+            const double second_beat_length = 700;
+            const double third_beat_length = 200;
 
-            const int firstBeatLengthStart = 0;
-            const int secondBeatLengthStart = 1000;
-            const int thirdBeatLengthStart = 2000;
+            const double first_beat_length_start = 0;
+            const double second_beat_length_start = 1000;
+            const double third_beat_length_start = 2000;
 
             var beatmap = new Beatmap
             {
                 HitObjects = new List<HitObject>
                 {
-                    new HitObject { StartTime = firstBeatLengthStart },
-                    new HitObject { StartTime = firstBeatLengthStart + firstBeatLength / 2 },
-                    new HitObject { StartTime = secondBeatLengthStart },
-                    new HitObject { StartTime = secondBeatLengthStart + secondBeatLength / 2 },
-                    new HitObject { StartTime = thirdBeatLengthStart },
-                    new HitObject { StartTime = thirdBeatLengthStart + thirdBeatLength / 2 },
+                    new HitObject { StartTime = first_beat_length_start },
+                    new HitObject { StartTime = first_beat_length_start + first_beat_length / 2 },
+                    new HitObject { StartTime = second_beat_length_start },
+                    new HitObject { StartTime = second_beat_length_start + second_beat_length / 2 },
+                    new HitObject { StartTime = third_beat_length_start },
+                    new HitObject { StartTime = third_beat_length_start + third_beat_length / 2 },
                 },
                 ControlPointInfo = new ControlPointInfo()
             };
 
-            var firstTimingControlPoint = new TimingControlPoint()
+            var firstTimingControlPoint = new TimingControlPoint
             {
                 TimeSignature = Game.Beatmaps.Timing.TimeSignatures.SimpleQuadruple,
-                BeatLength = firstBeatLength
-            };
-            
-            var secondTimingControlPoint = new TimingControlPoint()
-            {
-                TimeSignature = Game.Beatmaps.Timing.TimeSignatures.SimpleQuadruple,
-                BeatLength = secondBeatLength
-            };
-            
-            var thirdTimingControlPoint = new TimingControlPoint()
-            {
-                TimeSignature = Game.Beatmaps.Timing.TimeSignatures.SimpleQuadruple,
-                BeatLength = thirdBeatLength
+                BeatLength = first_beat_length
             };
 
-            beatmap.ControlPointInfo.Add(firstBeatLengthStart, firstTimingControlPoint);
-            beatmap.ControlPointInfo.Add(secondBeatLengthStart, secondTimingControlPoint);
-            beatmap.ControlPointInfo.Add(thirdBeatLengthStart, thirdTimingControlPoint);
+            var secondTimingControlPoint = new TimingControlPoint
+            {
+                TimeSignature = Game.Beatmaps.Timing.TimeSignatures.SimpleQuadruple,
+                BeatLength = second_beat_length
+            };
+
+            var thirdTimingControlPoint = new TimingControlPoint
+            {
+                TimeSignature = Game.Beatmaps.Timing.TimeSignatures.SimpleQuadruple,
+                BeatLength = third_beat_length
+            };
+
+            beatmap.ControlPointInfo.Add(first_beat_length_start, firstTimingControlPoint);
+            beatmap.ControlPointInfo.Add(second_beat_length_start, secondTimingControlPoint);
+            beatmap.ControlPointInfo.Add(third_beat_length_start, thirdTimingControlPoint);
 
             var beatDivisorFinder = new BeatDivisorFinder(beatmap);
 

From 200352b7507cb234f6fce5f287e06492caf87606 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 27 Apr 2021 13:56:05 +0200
Subject: [PATCH 2911/3722] Rename unsnap check templates

---
 .../Editing/Checks/CheckUnsnappedObjectsTest.cs  |  8 ++++----
 .../Edit/Checks/CheckUnsnappedObjects.cs         | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs b/osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs
index f8cac331bc..5e65b263f2 100644
--- a/osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs
@@ -108,8 +108,8 @@ namespace osu.Game.Tests.Editing.Checks
             var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(2));
-            Assert.That(issues.Any(issue => issue.Template is CheckUnsnappedObjects.IssueTemplate1MsOrMore));
-            Assert.That(issues.Any(issue => issue.Template is CheckUnsnappedObjects.IssueTemplate2MsOrMore));
+            Assert.That(issues.Any(issue => issue.Template is CheckUnsnappedObjects.IssueTemplateSmallUnsnap));
+            Assert.That(issues.Any(issue => issue.Template is CheckUnsnappedObjects.IssueTemplateLargeUnsnap));
         }
 
         private Mock<Slider> getSliderMock(double startTime, double endTime, int repeats = 0)
@@ -132,7 +132,7 @@ namespace osu.Game.Tests.Editing.Checks
             var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(count));
-            Assert.That(issues.All(issue => issue.Template is CheckUnsnappedObjects.IssueTemplate1MsOrMore));
+            Assert.That(issues.All(issue => issue.Template is CheckUnsnappedObjects.IssueTemplateSmallUnsnap));
         }
 
         private void assert2Ms(List<HitObject> hitobjects, int count = 1)
@@ -140,7 +140,7 @@ namespace osu.Game.Tests.Editing.Checks
             var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(count));
-            Assert.That(issues.All(issue => issue.Template is CheckUnsnappedObjects.IssueTemplate2MsOrMore));
+            Assert.That(issues.All(issue => issue.Template is CheckUnsnappedObjects.IssueTemplateLargeUnsnap));
         }
 
         private IBeatmap getPlayableBeatmap(List<HitObject> hitobjects)
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs b/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
index 74a2ce2fd7..8b6bb7d461 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
@@ -18,8 +18,8 @@ namespace osu.Game.Rulesets.Edit.Checks
 
         public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
         {
-            new IssueTemplate2MsOrMore(this),
-            new IssueTemplate1MsOrMore(this)
+            new IssueTemplateLargeUnsnap(this),
+            new IssueTemplateSmallUnsnap(this)
         };
 
         public IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap)
@@ -55,9 +55,9 @@ namespace osu.Game.Rulesets.Edit.Checks
         private IEnumerable<Issue> getUnsnapIssues(HitObject hitobject, double unsnap, double time, string postfix = "")
         {
             if (Math.Abs(unsnap) >= UNSNAP_MS_THRESHOLD)
-                yield return new IssueTemplate2MsOrMore(this).Create(hitobject, unsnap, time, postfix);
+                yield return new IssueTemplateLargeUnsnap(this).Create(hitobject, unsnap, time, postfix);
             else if (Math.Abs(unsnap) >= 1)
-                yield return new IssueTemplate1MsOrMore(this).Create(hitobject, unsnap, time, postfix);
+                yield return new IssueTemplateSmallUnsnap(this).Create(hitobject, unsnap, time, postfix);
 
             // We don't care about unsnaps < 1 ms, as all object ends have these due to the way SV works.
         }
@@ -79,17 +79,17 @@ namespace osu.Game.Rulesets.Edit.Checks
             }
         }
 
-        public class IssueTemplate2MsOrMore : IssueTemplateUnsnap
+        public class IssueTemplateLargeUnsnap : IssueTemplateUnsnap
         {
-            public IssueTemplate2MsOrMore(ICheck check)
+            public IssueTemplateLargeUnsnap(ICheck check)
                 : base(check, IssueType.Problem)
             {
             }
         }
 
-        public class IssueTemplate1MsOrMore : IssueTemplateUnsnap
+        public class IssueTemplateSmallUnsnap : IssueTemplateUnsnap
         {
-            public IssueTemplate1MsOrMore(ICheck check)
+            public IssueTemplateSmallUnsnap(ICheck check)
                 : base(check, IssueType.Negligible)
             {
             }

From 5dadfd04e7c11f0e69982401fe5647ba67621067 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Apr 2021 22:36:25 +0900
Subject: [PATCH 2912/3722] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index e0b07549f4..5aee9e15cc 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.424.1" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.427.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 9a43d5f031..986bd8e7ba 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.424.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.427.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 2c41b3ef26..c32109d6db 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.424.1" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.427.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.424.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.427.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 3b04aed491abef2278c34f497ead995a839c6f52 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 27 Apr 2021 22:31:23 +0900
Subject: [PATCH 2913/3722] Add failing test

---
 .../Rulesets/Scoring/ScoreProcessorTest.cs      | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index 20fa0732b9..2c862fe8a8 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -287,6 +287,23 @@ namespace osu.Game.Tests.Rulesets.Scoring
             Assert.AreEqual(expectedReturnValue, hitResult.IsScorable());
         }
 
+        [TestCase(HitResult.Perfect, 1_000_000)]
+        [TestCase(HitResult.SmallTickHit, 1_000_000)]
+        [TestCase(HitResult.LargeTickHit, 1_000_000)]
+        [TestCase(HitResult.SmallBonus, 700_000 + Judgement.SMALL_BONUS_SCORE)]
+        [TestCase(HitResult.LargeBonus, 700_000 + Judgement.LARGE_BONUS_SCORE)]
+        public void TestGetScoreWithExternalStatistics(HitResult result, int expectedScore)
+        {
+            var statistic = new Dictionary<HitResult, int> { { result, 1 } };
+
+            scoreProcessor.ApplyBeatmap(new Beatmap
+            {
+                HitObjects = { new TestHitObject(result) }
+            });
+
+            Assert.That(scoreProcessor.GetImmediateScore(ScoringMode.Standardised, result.AffectsCombo() ? 1 : 0, statistic), Is.EqualTo(expectedScore).Within(0.5d));
+        }
+
         private class TestJudgement : Judgement
         {
             public override HitResult MaxResult { get; }

From 1281993f1f9b106c6e77c05cf59b96e85590feda Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 27 Apr 2021 22:35:31 +0900
Subject: [PATCH 2914/3722] Fix bonus score not calculated from the correct
 statistics

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

diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 0fb5c2f4b5..a16a6a6c9b 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -252,7 +252,7 @@ namespace osu.Game.Rulesets.Scoring
                 computedBaseScore += Judgement.ToNumericResult(pair.Key) * pair.Value;
             }
 
-            return GetScore(mode, maxAchievableCombo, calculateAccuracyRatio(computedBaseScore), calculateComboRatio(maxCombo), scoreResultCounts);
+            return GetScore(mode, maxAchievableCombo, calculateAccuracyRatio(computedBaseScore), calculateComboRatio(maxCombo), statistics);
         }
 
         /// <summary>

From baa6e845aa812d91a15c655b459de4fbaa203c09 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 27 Apr 2021 22:38:37 +0900
Subject: [PATCH 2915/3722] Change to fluent assertions

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

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index 2c862fe8a8..ac26f4723e 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
-using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Judgements;
@@ -51,7 +50,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
             };
             scoreProcessor.ApplyResult(judgementResult);
 
-            Assert.IsTrue(Precision.AlmostEquals(expectedScore, scoreProcessor.TotalScore.Value));
+            Assert.That(scoreProcessor.TotalScore.Value, Is.EqualTo(expectedScore).Within(0.5d));
         }
 
         /// <summary>
@@ -118,7 +117,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
                 scoreProcessor.ApplyResult(judgementResult);
             }
 
-            Assert.IsTrue(Precision.AlmostEquals(expectedScore, scoreProcessor.TotalScore.Value, 0.5));
+            Assert.That(scoreProcessor.TotalScore.Value, Is.EqualTo(expectedScore).Within(0.5d));
         }
 
         /// <remarks>
@@ -158,7 +157,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
             };
             scoreProcessor.ApplyResult(lastJudgementResult);
 
-            Assert.IsTrue(Precision.AlmostEquals(expectedScore, scoreProcessor.TotalScore.Value, 0.5));
+            Assert.That(scoreProcessor.TotalScore.Value, Is.EqualTo(expectedScore).Within(0.5d));
         }
 
         [Test]
@@ -169,7 +168,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
             scoreProcessor.Mode.Value = scoringMode;
             scoreProcessor.ApplyBeatmap(new TestBeatmap(new RulesetInfo()));
 
-            Assert.IsTrue(Precision.AlmostEquals(0, scoreProcessor.TotalScore.Value));
+            Assert.That(scoreProcessor.TotalScore.Value, Is.Zero);
         }
 
         [TestCase(HitResult.IgnoreHit, HitResult.IgnoreMiss)]

From b8b6d0e861bd0269b841ceacfaab3c361128bc3b Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Tue, 27 Apr 2021 16:54:47 +0200
Subject: [PATCH 2916/3722] Add tests for `ClosestBeatDivisor`

Used https://github.com/ppy/osu/pull/12558/files#diff-5c1f04c5b262ca3abbaf867aa91b62a60b66691323c286ad5aa0b75c153cc6ca as reference.
---
 .../NonVisual/ClosestBeatDivisorTest.cs       | 91 +++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 osu.Game.Tests/NonVisual/ClosestBeatDivisorTest.cs

diff --git a/osu.Game.Tests/NonVisual/ClosestBeatDivisorTest.cs b/osu.Game.Tests/NonVisual/ClosestBeatDivisorTest.cs
new file mode 100644
index 0000000000..4d6986f5d2
--- /dev/null
+++ b/osu.Game.Tests/NonVisual/ClosestBeatDivisorTest.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.Collections.Generic;
+using NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Objects;
+
+namespace osu.Game.Tests.NonVisual
+{
+    public class ClosestBeatDivisorTest
+    {
+        [Test]
+        public void TestExactDivisors()
+        {
+            var cpi = new ControlPointInfo();
+            cpi.Add(-1000, new TimingControlPoint { BeatLength = 1000 });
+
+            double[] divisors = { 3, 1, 16, 12, 8, 6, 4, 3, 2, 1 };
+
+            assertClosestDivisors(divisors, divisors, cpi);
+        }
+
+        [Test]
+        public void TestExactDivisorWithTempoChanges()
+        {
+            int offset = 0;
+            int[] beatLengths = { 1000, 200, 100, 50 };
+
+            var cpi = new ControlPointInfo();
+
+            foreach (int beatLength in beatLengths)
+            {
+                cpi.Add(offset, new TimingControlPoint { BeatLength = beatLength });
+                offset += beatLength * 2;
+            }
+
+            double[] divisors = { 3, 1, 16, 12, 8, 6, 4, 3 };
+
+            assertClosestDivisors(divisors, divisors, cpi);
+        }
+
+        [Test]
+        public void TestExactDivisorsHighBPMStream()
+        {
+            var cpi = new ControlPointInfo();
+            cpi.Add(-50, new TimingControlPoint { BeatLength = 50 }); // 1200 BPM 1/4 (limit testing)
+
+            // A 1/4 stream should land on 1/1, 1/2 and 1/4 divisors.
+            double[] divisors = { 4, 4, 4, 4, 4, 4, 4, 4 };
+            double[] closestDivisors = { 4, 2, 4, 1, 4, 2, 4, 1 };
+
+            assertClosestDivisors(divisors, closestDivisors, cpi, step: 1 / 4d);
+        }
+
+        [Test]
+        public void TestApproximateDivisors()
+        {
+            var cpi = new ControlPointInfo();
+            cpi.Add(-1000, new TimingControlPoint { BeatLength = 1000 });
+
+            double[] divisors = { 3.03d, 0.97d, 14, 13, 7.94d, 6.08d, 3.93d, 2.96d, 2.02d, 64 };
+            double[] closestDivisors = { 3, 1, 16, 12, 8, 6, 4, 3, 2, 1 };
+
+            assertClosestDivisors(divisors, closestDivisors, cpi);
+        }
+
+        private void assertClosestDivisors(IReadOnlyList<double> divisors, IReadOnlyList<double> closestDivisors, ControlPointInfo cpi, double step = 1)
+        {
+            List<HitObject> hitobjects = new List<HitObject>();
+            double offset = cpi.TimingPoints[0].Time;
+
+            for (int i = 0; i < divisors.Count; ++i)
+            {
+                double beatLength = cpi.TimingPointAt(offset).BeatLength;
+                hitobjects.Add(new HitObject { StartTime = offset + beatLength / divisors[i] });
+                offset += beatLength * step;
+            }
+
+            var beatmap = new Beatmap
+            {
+                HitObjects = hitobjects,
+                ControlPointInfo = cpi
+            };
+
+            for (int i = 0; i < divisors.Count; ++i)
+                Assert.AreEqual(closestDivisors[i], beatmap.ClosestBeatDivisor(beatmap.HitObjects[i].StartTime), $"at index {i}");
+        }
+    }
+}

From 4e3ee773968e52788ccf73bca74fe883d72da113 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 28 Apr 2021 02:46:34 +0900
Subject: [PATCH 2917/3722] Add support for custom controls to
 SettingSourceAttribute

---
 .../Mods/SettingsSourceAttributeTest.cs       | 29 +++++++++++++++++++
 .../Configuration/SettingSourceAttribute.cs   | 29 ++++++++++++++++++-
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Mods/SettingsSourceAttributeTest.cs b/osu.Game.Tests/Mods/SettingsSourceAttributeTest.cs
index 883c9d1ac2..dd105787fa 100644
--- a/osu.Game.Tests/Mods/SettingsSourceAttributeTest.cs
+++ b/osu.Game.Tests/Mods/SettingsSourceAttributeTest.cs
@@ -4,7 +4,10 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.UserInterface;
 using osu.Game.Configuration;
+using osu.Game.Overlays.Settings;
 
 namespace osu.Game.Tests.Mods
 {
@@ -26,6 +29,16 @@ namespace osu.Game.Tests.Mods
             Assert.That(orderedSettings[3].Item2.Name, Is.EqualTo(nameof(ClassWithSettings.UnorderedSetting)));
         }
 
+        [Test]
+        public void TestCustomControl()
+        {
+            var objectWithCustomSettingControl = new ClassWithCustomSettingControl();
+            var settings = objectWithCustomSettingControl.CreateSettingsControls().ToArray();
+
+            Assert.That(settings, Has.Length.EqualTo(1));
+            Assert.That(settings[0], Is.TypeOf<CustomSettingsControl>());
+        }
+
         private class ClassWithSettings
         {
             [SettingSource("Unordered setting", "Should be last")]
@@ -40,5 +53,21 @@ namespace osu.Game.Tests.Mods
             [SettingSource("Third setting", "Yet another description", 3)]
             public BindableInt ThirdSetting { get; set; } = new BindableInt();
         }
+
+        private class ClassWithCustomSettingControl
+        {
+            [SettingSource("Custom setting", "Should be a custom control", SettingControlType = typeof(CustomSettingsControl))]
+            public BindableInt UnorderedSetting { get; set; } = new BindableInt();
+        }
+
+        private class CustomSettingsControl : SettingsItem<int>
+        {
+            protected override Drawable CreateControl() => new CustomControl();
+
+            private class CustomControl : Drawable, IHasCurrentValue<int>
+            {
+                public Bindable<int> Current { get; set; } = new Bindable<int>();
+            }
+        }
     }
 }
diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index cfce615130..13cf0a9f0c 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -1,12 +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 enable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using JetBrains.Annotations;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
 using osu.Game.Overlays.Settings;
@@ -31,7 +34,15 @@ namespace osu.Game.Configuration
 
         public int? OrderPosition { get; }
 
-        public SettingSourceAttribute(string label, string description = null)
+        /// <summary>
+        /// The type of the settings control which handles this setting source.
+        /// </summary>
+        /// <remarks>
+        /// Must be a type deriving <see cref="SettingsItem{T}"/> with a public constructor.
+        /// </remarks>
+        public Type? SettingControlType { get; set; }
+
+        public SettingSourceAttribute(string? label, string? description = null)
         {
             Label = label ?? string.Empty;
             Description = description ?? string.Empty;
@@ -67,6 +78,22 @@ namespace osu.Game.Configuration
             {
                 object value = property.GetValue(obj);
 
+                if (attr.SettingControlType != null)
+                {
+                    var controlType = attr.SettingControlType;
+                    if (controlType.EnumerateBaseTypes().All(t => !t.IsGenericType || t.GetGenericTypeDefinition() != typeof(SettingsItem<>)))
+                        throw new InvalidOperationException($"{nameof(SettingSourceAttribute)} had an unsupported custom control type ({controlType.ReadableName()})");
+
+                    var control = (Drawable)Activator.CreateInstance(controlType);
+                    controlType.GetProperty(nameof(SettingsItem<object>.LabelText))?.SetValue(control, attr.Label);
+                    controlType.GetProperty(nameof(SettingsItem<object>.TooltipText))?.SetValue(control, attr.Description);
+                    controlType.GetProperty(nameof(SettingsItem<object>.Current))?.SetValue(control, value);
+
+                    yield return control;
+
+                    continue;
+                }
+
                 switch (value)
                 {
                     case BindableNumber<float> bNumber:

From 61b7dc1e0601feea555c2841249714a9bc684f68 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 28 Apr 2021 03:42:29 +0900
Subject: [PATCH 2918/3722] Fix bonus-only maps having 700K base score

---
 .../Rulesets/Scoring/ScoreProcessorTest.cs           | 12 ++++++------
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs          |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index ac26f4723e..baa10663d5 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -83,8 +83,8 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(ScoringMode.Standardised, HitResult.SmallTickHit, HitResult.SmallTickHit, 925_000)] // (3 * 10) / (4 * 10) * 300_000 + 700_000 (max combo 0)
         [TestCase(ScoringMode.Standardised, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)] // (3 * 0) / (4 * 30) * 300_000 + (0 / 4) * 700_000
         [TestCase(ScoringMode.Standardised, HitResult.LargeTickHit, HitResult.LargeTickHit, 575_000)] // (3 * 30) / (4 * 30) * 300_000 + (0 / 4) * 700_000
-        [TestCase(ScoringMode.Standardised, HitResult.SmallBonus, HitResult.SmallBonus, 700_030)] // 0 * 300_000 + 700_000 (max combo 0) + 3 * 10 (bonus points)
-        [TestCase(ScoringMode.Standardised, HitResult.LargeBonus, HitResult.LargeBonus, 700_150)] // 0 * 300_000 + 700_000 (max combo 0) + 3 * 50 (bonus points)
+        [TestCase(ScoringMode.Standardised, HitResult.SmallBonus, HitResult.SmallBonus, 1_000_030)] // 0 * 300_000 + 700_000 (max combo 0) + 3 * 10 (bonus points)
+        [TestCase(ScoringMode.Standardised, HitResult.LargeBonus, HitResult.LargeBonus, 1_000_150)] // 0 * 300_000 + 700_000 (max combo 0) + 3 * 50 (bonus points)
         [TestCase(ScoringMode.Classic, HitResult.Miss, HitResult.Great, 0)] // (0 * 4 * 300) * (1 + 0 / 25)
         [TestCase(ScoringMode.Classic, HitResult.Meh, HitResult.Great, 156)] // (((3 * 50) / (4 * 300)) * 4 * 300) * (1 + 1 / 25)
         [TestCase(ScoringMode.Classic, HitResult.Ok, HitResult.Great, 312)] // (((3 * 100) / (4 * 300)) * 4 * 300) * (1 + 1 / 25)
@@ -95,8 +95,8 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(ScoringMode.Classic, HitResult.SmallTickHit, HitResult.SmallTickHit, 225)] // (((3 * 10) / (4 * 10)) * 1 * 300) * (1 + 0 / 25)
         [TestCase(ScoringMode.Classic, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)] // (0 * 4 * 300) * (1 + 0 / 25)
         [TestCase(ScoringMode.Classic, HitResult.LargeTickHit, HitResult.LargeTickHit, 936)] // (((3 * 50) / (4 * 50)) * 4 * 300) * (1 + 1 / 25)
-        [TestCase(ScoringMode.Classic, HitResult.SmallBonus, HitResult.SmallBonus, 30)] // (0 * 1 * 300) * (1 + 0 / 25) + 3 * 10 (bonus points)
-        [TestCase(ScoringMode.Classic, HitResult.LargeBonus, HitResult.LargeBonus, 150)] // (0 * 1 * 300) * (1 + 0 / 25) * 3 * 50 (bonus points)
+        [TestCase(ScoringMode.Classic, HitResult.SmallBonus, HitResult.SmallBonus, 330)] // (0 * 1 * 300) * (1 + 0 / 25) + 3 * 10 (bonus points)
+        [TestCase(ScoringMode.Classic, HitResult.LargeBonus, HitResult.LargeBonus, 450)] // (1 * 1 * 300) * (1 + 0 / 25) * 3 * 50 (bonus points)
         public void TestFourVariousResultsOneMiss(ScoringMode scoringMode, HitResult hitResult, HitResult maxResult, int expectedScore)
         {
             var minResult = new TestJudgement(hitResult).MinResult;
@@ -289,8 +289,8 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(HitResult.Perfect, 1_000_000)]
         [TestCase(HitResult.SmallTickHit, 1_000_000)]
         [TestCase(HitResult.LargeTickHit, 1_000_000)]
-        [TestCase(HitResult.SmallBonus, 700_000 + Judgement.SMALL_BONUS_SCORE)]
-        [TestCase(HitResult.LargeBonus, 700_000 + Judgement.LARGE_BONUS_SCORE)]
+        [TestCase(HitResult.SmallBonus, 1_000_000 + Judgement.SMALL_BONUS_SCORE)]
+        [TestCase(HitResult.LargeBonus, 1_000_000 + Judgement.LARGE_BONUS_SCORE)]
         public void TestGetScoreWithExternalStatistics(HitResult result, int expectedScore)
         {
             var statistic = new Dictionary<HitResult, int> { { result, 1 } };
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index a16a6a6c9b..f32f70d4ba 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -266,7 +266,7 @@ namespace osu.Game.Rulesets.Scoring
             if (preferRolling && rollingMaxBaseScore != 0)
                 return baseScore / rollingMaxBaseScore;
 
-            return maxBaseScore > 0 ? baseScore / maxBaseScore : 0;
+            return maxBaseScore > 0 ? baseScore / maxBaseScore : 1;
         }
 
         private double calculateComboRatio(int maxCombo) => maxAchievableCombo > 0 ? (double)maxCombo / maxAchievableCombo : 1;

From 04454062b7dad5cd47b6bd066c23a018e5290f06 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 28 Apr 2021 03:52:59 +0900
Subject: [PATCH 2919/3722] Fix up xmldoc

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

diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index 13cf0a9f0c..a9436aac89 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Configuration
         /// The type of the settings control which handles this setting source.
         /// </summary>
         /// <remarks>
-        /// Must be a type deriving <see cref="SettingsItem{T}"/> with a public constructor.
+        /// Must be a type deriving <see cref="SettingsItem{T}"/>.
         /// </remarks>
         public Type? SettingControlType { get; set; }
 

From 05bd6ee50cc20a014c958c86752152ca80e3e553 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 28 Apr 2021 03:54:42 +0900
Subject: [PATCH 2920/3722] Add back ctor doc

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

diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index a9436aac89..3e50613093 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Configuration
         /// The type of the settings control which handles this setting source.
         /// </summary>
         /// <remarks>
-        /// Must be a type deriving <see cref="SettingsItem{T}"/>.
+        /// Must be a type deriving <see cref="SettingsItem{T}"/> with a public parameterless constructor.
         /// </remarks>
         public Type? SettingControlType { get; set; }
 

From 6a921af08555a0b868cacc04a623f07b69e4211d Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Wed, 28 Apr 2021 09:23:05 +0700
Subject: [PATCH 2921/3722] add OsuMarkdownSeparator

Reference
https://github.com/ppy/osu-web/blob/d56352aeefc412507c3dab7c16e3e3118421b436/resources/assets/less/bem/osu-md.less#L19-L21
---
 .../TestSceneOsuMarkdownContainer.cs          | 13 ++++++++++
 .../Markdown/OsuMarkdownContainer.cs          |  2 ++
 .../Markdown/OsuMarkdownSeparator.cs          | 26 +++++++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 osu.Game/Graphics/Containers/Markdown/OsuMarkdownSeparator.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
index 3d782ee184..966b5095f9 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
@@ -62,5 +62,18 @@ This is markdown code block.
 ```";
             });
         }
+
+        [Test]
+        public void TestSeparator()
+        {
+            AddStep("Add Seperator", () =>
+            {
+                markdownContainer.Text = @"Line above
+
+---
+
+Line below";
+            });
+        }
     }
 }
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index 95f538eab7..6885e3d60b 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Graphics.Containers.Markdown
 
         protected override MarkdownFencedCodeBlock CreateFencedCodeBlock(FencedCodeBlock fencedCodeBlock) => new OsuMarkdownFencedCodeBlock(fencedCodeBlock);
 
+        protected override MarkdownSeparator CreateSeparator(ThematicBreakBlock thematicBlock) => new OsuMarkdownSeparator();
+
         protected override MarkdownPipeline CreateBuilder()
             => new MarkdownPipelineBuilder().UseAutoIdentifiers(AutoIdentifierOptions.GitHub)
                                             .UseEmojiAndSmiley()
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownSeparator.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownSeparator.cs
new file mode 100644
index 0000000000..9b28200452
--- /dev/null
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownSeparator.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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers.Markdown;
+using osu.Game.Overlays;
+
+namespace osu.Game.Graphics.Containers.Markdown
+{
+    public class OsuMarkdownSeparator : MarkdownSeparator
+    {
+        private Drawable separator;
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            separator.Colour = colourProvider.Background3;
+        }
+
+        protected override Drawable CreateSeparator()
+        {
+            return separator = base.CreateSeparator();
+        }
+    }
+}

From aa1cb65eaad96ebdc07d1a5e626284b91957af33 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 11:42:10 +0900
Subject: [PATCH 2922/3722] Rename region to be more inclusive

---
 .../Components/EditorSelectionHandler.cs      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
index d26a2946c1..bb7abd8d8f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
@@ -122,7 +122,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         #endregion
 
-        #region Sample Changes
+        #region Ternary state changes
 
         /// <summary>
         /// Adds a hit sample to all selected <see cref="HitObject"/>s.
@@ -140,6 +140,15 @@ namespace osu.Game.Screens.Edit.Compose.Components
             });
         }
 
+        /// <summary>
+        /// Removes a hit sample from all selected <see cref="HitObject"/>s.
+        /// </summary>
+        /// <param name="sampleName">The name of the hit sample.</param>
+        public void RemoveHitSample(string sampleName)
+        {
+            EditorBeatmap.PerformOnSelection(h => h.SamplesBindable.RemoveAll(s => s.Name == sampleName));
+        }
+
         /// <summary>
         /// Set the new combo state of all selected <see cref="HitObject"/>s.
         /// </summary>
@@ -158,15 +167,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
             });
         }
 
-        /// <summary>
-        /// Removes a hit sample from all selected <see cref="HitObject"/>s.
-        /// </summary>
-        /// <param name="sampleName">The name of the hit sample.</param>
-        public void RemoveHitSample(string sampleName)
-        {
-            EditorBeatmap.PerformOnSelection(h => h.SamplesBindable.RemoveAll(s => s.Name == sampleName));
-        }
-
         #endregion
 
         #region Context Menu

From 61d4eb177710e44f3e17586f01da6f23048b360c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 11:44:19 +0900
Subject: [PATCH 2923/3722] Remove unnecessary and out-of-place xmldoc

---
 osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 8f2f1d65b8..0a1f313407 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -134,7 +134,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="moveEvent">The move event.</param>
         /// <returns>
         /// Whether any items could be moved.
-        /// Returning true will also propagate StartTime changes provided by the closest <see cref="IPositionSnapProvider.SnapScreenSpacePositionToValidTime"/>.
         /// </returns>
         public virtual bool HandleMovement(MoveSelectionEvent<T> moveEvent) => false;
 

From bc455005a5ef1dcd739518ec4e1dec86f3838457 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 11:44:50 +0900
Subject: [PATCH 2924/3722] Fix incorrect coordinate space mention in xmldoc

---
 osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 0a1f313407..a19798ed9a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -147,7 +147,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <summary>
         /// Handles the selected items being scaled.
         /// </summary>
-        /// <param name="scale">The delta scale to apply, in playfield local coordinates.</param>
+        /// <param name="scale">The delta scale to apply, in local coordinates.</param>
         /// <param name="anchor">The point of reference where the scale is originating from.</param>
         /// <returns>Whether any items could be scaled.</returns>
         public virtual bool HandleScale(Vector2 scale, Anchor anchor) => false;

From d0be8f9fb31e6794e68523f2be42c8cfe70223c8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 11:45:36 +0900
Subject: [PATCH 2925/3722] Remove one more out-of-date comment

---
 osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 392b375d12..7c1b488163 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -354,7 +354,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
                         break;
 
                     case SelectionState.Selected:
-                        // if the editor is playing, we generally don't want to deselect objects even if outside the selection area.
                         if (AllowDeselection && !isValidForSelection())
                             blueprint.Deselect();
                         break;

From a9a5809e940f2f424958533d6f6e46e133b985f1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 11:46:52 +0900
Subject: [PATCH 2926/3722] Fix incorrect xmldoc in `MoveSelectionEvent`

---
 .../Screens/Edit/Compose/Components/MoveSelectionEvent.cs     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs b/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
index a07b434011..a32c30b579 100644
--- a/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
@@ -17,12 +17,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
         public readonly SelectionBlueprint<T> Blueprint;
 
         /// <summary>
-        /// The expected screen-space position of the hitobject at the current cursor position.
+        /// The expected screen-space position of the blueprint's item at the current cursor position.
         /// </summary>
         public readonly Vector2 ScreenSpacePosition;
 
         /// <summary>
-        /// The distance between <see cref="ScreenSpacePosition"/> and the hitobject's current position, in the coordinate-space of the hitobject's parent.
+        /// The distance between <see cref="ScreenSpacePosition"/> and the blueprint's current position, in the coordinate-space of the blueprint item's parent.
         /// </summary>
         public readonly Vector2 InstantDelta;
 

From e4f2e0131c94afbfb95f8b680dfb8c8d37144a8e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 12:02:55 +0900
Subject: [PATCH 2927/3722] Rename `AllowDeselection` to better match use case

---
 .../Screens/Edit/Compose/Components/BlueprintContainer.cs   | 6 +++---
 .../Edit/Compose/Components/EditorBlueprintContainer.cs     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 7c1b488163..7f31afb9ba 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -76,9 +76,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
         protected virtual DragBox CreateDragBox(Action<RectangleF> performSelect) => new DragBox(performSelect);
 
         /// <summary>
-        /// Whether this component is in a state where deselection should be allowed. If false, selection will only be added to.
+        /// Whether this component is in a state where items outside a drag selection should be deselected. If false, selection will only be added to.
         /// </summary>
-        protected virtual bool AllowDeselection => true;
+        protected virtual bool AllowDeselectionDuringDrag => true;
 
         protected override bool OnMouseDown(MouseDownEvent e)
         {
@@ -354,7 +354,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                         break;
 
                     case SelectionState.Selected:
-                        if (AllowDeselection && !isValidForSelection())
+                        if (AllowDeselectionDuringDrag && !isValidForSelection())
                             blueprint.Deselect();
                         break;
                 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
index 9eee680bda..2a605f75d8 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         protected override IEnumerable<SelectionBlueprint<HitObject>> SortForMovement(IReadOnlyList<SelectionBlueprint<HitObject>> blueprints)
             => blueprints.OrderBy(b => b.Item.StartTime);
 
-        protected override bool AllowDeselection => !EditorClock.IsRunning;
+        protected override bool AllowDeselectionDuringDrag => !EditorClock.IsRunning;
 
         protected override bool ApplySnapResult(SelectionBlueprint<HitObject>[] blueprints, SnapResult result)
         {

From 43772f4303aedcec12b075899b09873db3f766f2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 12:03:41 +0900
Subject: [PATCH 2928/3722] Remove duplicated call to initially select
 blueprint

---
 osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 7f31afb9ba..a7076bf40e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -267,8 +267,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="item">The item for which the blueprint has been added.</param>
         protected virtual void OnBlueprintAdded(T item)
         {
-            if (SelectionHandler.SelectedItems.Contains(item))
-                blueprintMap[item].Select();
         }
 
         /// <summary>

From 532ec403951c0efdce9abdd4c29c085133079baf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 12:04:48 +0900
Subject: [PATCH 2929/3722] Remove unnecessary newline

---
 osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index a7076bf40e..1f9cd0258e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -174,7 +174,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (isDraggingBlueprint)
             {
                 DragOperationCompleted();
-
                 changeHandler?.EndChange();
             }
 

From 736eace00ac68dd56dd86103e7a62a0eb17d13ee Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Wed, 28 Apr 2021 10:11:29 +0700
Subject: [PATCH 2930/3722] add OsuMarkdownQuoteBlock

Reference:
https://github.com/ppy/osu-web/blob/d56352aeefc412507c3dab7c16e3e3118421b436/resources/assets/less/base.less#L7-L10
---
 .../TestSceneOsuMarkdownContainer.cs          | 10 +++++
 .../Markdown/OsuMarkdownContainer.cs          |  2 +
 .../Markdown/OsuMarkdownQuoteBlock.cs         | 45 +++++++++++++++++++
 3 files changed, 57 insertions(+)
 create mode 100644 osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
index 966b5095f9..d78716bede 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
@@ -75,5 +75,15 @@ This is markdown code block.
 Line below";
             });
         }
+
+        [Test]
+        public void TestQuote()
+        {
+            AddStep("Add quote", () =>
+            {
+                markdownContainer.Text =
+                    @"> Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.";
+            });
+        }
     }
 }
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index 6885e3d60b..9f0000777d 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -32,6 +32,8 @@ namespace osu.Game.Graphics.Containers.Markdown
 
         protected override MarkdownSeparator CreateSeparator(ThematicBreakBlock thematicBlock) => new OsuMarkdownSeparator();
 
+        protected override MarkdownQuoteBlock CreateQuoteBlock(QuoteBlock quoteBlock) => new OsuMarkdownQuoteBlock(quoteBlock);
+
         protected override MarkdownPipeline CreateBuilder()
             => new MarkdownPipelineBuilder().UseAutoIdentifiers(AutoIdentifierOptions.GitHub)
                                             .UseEmojiAndSmiley()
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs
new file mode 100644
index 0000000000..869cba82f2
--- /dev/null
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs
@@ -0,0 +1,45 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using Markdig.Syntax;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers.Markdown;
+using osu.Game.Overlays;
+
+namespace osu.Game.Graphics.Containers.Markdown
+{
+    public class OsuMarkdownQuoteBlock : MarkdownQuoteBlock
+    {
+        private Drawable background;
+
+        public OsuMarkdownQuoteBlock(QuoteBlock quoteBlock)
+            : base(quoteBlock)
+        {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            background.Colour = colourProvider.Content2;
+        }
+
+        protected override Drawable CreateBackground()
+        {
+            return background = base.CreateBackground();
+        }
+
+        public override MarkdownTextFlowContainer CreateTextFlow()
+        {
+            var textFlow = base.CreateTextFlow();
+            textFlow.Margin = new MarginPadding
+            {
+                Top = 10,
+                Bottom = 10,
+                Left = 20,
+                Right = 20,
+            };
+            return textFlow;
+        }
+    }
+}

From 2252d308c8a67e82c81d6b76e116f00cf6f0ea95 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Wed, 28 Apr 2021 10:53:00 +0700
Subject: [PATCH 2931/3722] add OsuMarkdownTableCell

Reference :
https://github.com/ppy/osu-web/blob/d56352aeefc412507c3dab7c16e3e3118421b436/resources/assets/less/bem/osu-md.less#L254-L277
---
 .../Markdown/OsuMarkdownTableCell.cs          | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs
new file mode 100644
index 0000000000..d8b9145228
--- /dev/null
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.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 Markdig.Extensions.Tables;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers.Markdown;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Overlays;
+
+namespace osu.Game.Graphics.Containers.Markdown
+{
+    public class OsuMarkdownTableCell : MarkdownTableCell
+    {
+        private readonly bool isHeading;
+
+        public OsuMarkdownTableCell(TableCell cell, TableColumnDefinition definition, bool isHeading)
+            : base(cell, definition)
+        {
+            this.isHeading = isHeading;
+            Masking = false;
+            BorderThickness = 0;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            var border = new Box
+            {
+                RelativeSizeAxes = Axes.X,
+            };
+
+            // TODO : Change font weight to 700 for heading
+            if (isHeading)
+            {
+                border.Colour = colourProvider.Background3;
+                border.Height = 2;
+                border.Anchor = Anchor.BottomLeft;
+                border.Origin = Anchor.BottomLeft;
+            }
+            else
+            {
+                border.Colour = colourProvider.Background4;
+                border.Height = 1;
+                border.Anchor = Anchor.TopLeft;
+                border.Origin = Anchor.TopLeft;
+            }
+
+            AddInternal(border);
+        }
+    }
+}

From c09067c3d558d5a45dade3efb0aebcbb0d7dcefc Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Wed, 28 Apr 2021 10:53:12 +0700
Subject: [PATCH 2932/3722] add OsuMarkdownTable

---
 .../TestSceneOsuMarkdownContainer.cs           | 14 ++++++++++++++
 .../Markdown/OsuMarkdownContainer.cs           |  3 +++
 .../Containers/Markdown/OsuMarkdownTable.cs    | 18 ++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 osu.Game/Graphics/Containers/Markdown/OsuMarkdownTable.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
index d78716bede..d80d2362b9 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
@@ -85,5 +85,19 @@ Line below";
                     @"> Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.";
             });
         }
+
+        [Test]
+        public void TestTable()
+        {
+            AddStep("Add Table", () =>
+            {
+                markdownContainer.Text =
+                    @"| Left Aligned  | Center Aligned | Right Aligned |
+| :------------------- | :--------------------: | ---------------------:|
+| Long Align Left Text | Long Align Center Text | Long Align Right Text |
+| Align Left           |      Align Center      |           Align Right |
+| Left                 |         Center         |                 Right |";
+            });
+        }
     }
 }
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index 9f0000777d..56bf72656a 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -3,6 +3,7 @@
 
 using Markdig;
 using Markdig.Extensions.AutoIdentifiers;
+using Markdig.Extensions.Tables;
 using Markdig.Extensions.Yaml;
 using Markdig.Syntax;
 using osu.Framework.Graphics.Containers;
@@ -34,6 +35,8 @@ namespace osu.Game.Graphics.Containers.Markdown
 
         protected override MarkdownQuoteBlock CreateQuoteBlock(QuoteBlock quoteBlock) => new OsuMarkdownQuoteBlock(quoteBlock);
 
+        protected override MarkdownTable CreateTable(Table table) => new OsuMarkdownTable(table);
+
         protected override MarkdownPipeline CreateBuilder()
             => new MarkdownPipelineBuilder().UseAutoIdentifiers(AutoIdentifierOptions.GitHub)
                                             .UseEmojiAndSmiley()
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTable.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTable.cs
new file mode 100644
index 0000000000..e0a1ab1220
--- /dev/null
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTable.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 Markdig.Extensions.Tables;
+using osu.Framework.Graphics.Containers.Markdown;
+
+namespace osu.Game.Graphics.Containers.Markdown
+{
+    public class OsuMarkdownTable : MarkdownTable
+    {
+        public OsuMarkdownTable(Table table)
+            : base(table)
+        {
+        }
+
+        protected override MarkdownTableCell CreateTableCell(TableCell cell, TableColumnDefinition definition, bool isHeading) => new OsuMarkdownTableCell(cell, definition, isHeading);
+    }
+}

From 4e691ce4b06fb59a5a953a236a607cae2e53ebf7 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Wed, 28 Apr 2021 11:01:54 +0700
Subject: [PATCH 2933/3722] add test link with inline text markdown

---
 .../UserInterface/TestSceneOsuMarkdownContainer.cs       | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
index d80d2362b9..4add9f22a5 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
@@ -50,6 +50,15 @@ namespace osu.Game.Tests.Visual.UserInterface
             });
         }
 
+        [Test]
+        public void TestLinkWithInlineText()
+        {
+            AddStep("Add Link with inline text", () =>
+            {
+                markdownContainer.Text = "Hey, [welcome to osu!](https://osu.ppy.sh) Please enjoy the game.";
+            });
+        }
+
         [Test]
         public void TestFencedCodeBlock()
         {

From 4c9e94da2b05b5c5679848258223767b7927b8a3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 13:43:16 +0900
Subject: [PATCH 2934/3722] Move context menu logic to base class

---
 .../Edit/TaikoSelectionHandler.cs             |  3 ++
 .../Components/EditorSelectionHandler.cs      | 51 +++++--------------
 .../Compose/Components/SelectionHandler.cs    | 37 +++++++++++++-
 3 files changed, 53 insertions(+), 38 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
index 20366e5b3a..48ee0d4cf4 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
@@ -80,6 +80,9 @@ namespace osu.Game.Rulesets.Taiko.Edit
 
             if (selection.All(s => s.Item is TaikoHitObject))
                 yield return new TernaryStateMenuItem("Strong") { State = { BindTarget = selectionStrongState } };
+
+            foreach (var item in base.GetContextMenuItemsForSelection(selection))
+                yield return item;
         }
 
         public override bool HandleMovement(MoveSelectionEvent<HitObject> moveEvent) => true;
diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
index bb7abd8d8f..0fc305dcc4 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
@@ -7,7 +7,6 @@ using System.Linq;
 using Humanizer;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Audio;
 using osu.Game.Graphics.UserInterface;
@@ -17,7 +16,7 @@ using osu.Game.Rulesets.Objects.Types;
 
 namespace osu.Game.Screens.Edit.Compose.Components
 {
-    public class EditorSelectionHandler : SelectionHandler<HitObject>, IHasContextMenu
+    public class EditorSelectionHandler : SelectionHandler<HitObject>
     {
         [Resolved]
         protected EditorBeatmap EditorBeatmap { get; private set; }
@@ -171,46 +170,24 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         #region Context Menu
 
-        public MenuItem[] ContextMenuItems
-        {
-            get
-            {
-                if (!SelectedBlueprints.Any(b => b.IsHovered))
-                    return Array.Empty<MenuItem>();
-
-                var items = new List<MenuItem>();
-
-                items.AddRange(GetContextMenuItemsForSelection(SelectedBlueprints));
-
-                if (SelectedBlueprints.All(b => b.Item is IHasComboInformation))
-                {
-                    items.Add(new TernaryStateMenuItem("New combo") { State = { BindTarget = SelectionNewComboState } });
-                }
-
-                if (SelectedBlueprints.Count == 1)
-                    items.AddRange(SelectedBlueprints[0].ContextMenuItems);
-
-                items.AddRange(new[]
-                {
-                    new OsuMenuItem("Sound")
-                    {
-                        Items = SelectionSampleStates.Select(kvp =>
-                            new TernaryStateMenuItem(kvp.Value.Description) { State = { BindTarget = kvp.Value } }).ToArray()
-                    },
-                    new OsuMenuItem("Delete", MenuItemType.Destructive, DeleteSelected),
-                });
-
-                return items.ToArray();
-            }
-        }
-
         /// <summary>
         /// Provide context menu items relevant to current selection. Calling base is not required.
         /// </summary>
         /// <param name="selection">The current selection.</param>
         /// <returns>The relevant menu items.</returns>
-        protected virtual IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint<HitObject>> selection)
-            => Enumerable.Empty<MenuItem>();
+        protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint<HitObject>> selection)
+        {
+            if (SelectedBlueprints.All(b => b.Item is IHasComboInformation))
+            {
+                yield return new TernaryStateMenuItem("New combo") { State = { BindTarget = SelectionNewComboState } };
+            }
+
+            yield return new OsuMenuItem("Sound")
+            {
+                Items = SelectionSampleStates.Select(kvp =>
+                    new TernaryStateMenuItem(kvp.Value.Description) { State = { BindTarget = kvp.Value } }).ToArray()
+            };
+        }
 
         #endregion
     }
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index a19798ed9a..02df004129 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -8,12 +8,15 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.UserInterface;
 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.Rulesets.Edit;
 using osuTK;
 using osuTK.Input;
@@ -23,7 +26,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
     /// <summary>
     /// A component which outlines items and handles movement of selections.
     /// </summary>
-    public abstract class SelectionHandler<T> : CompositeDrawable, IKeyBindingHandler<PlatformAction>
+    public abstract class SelectionHandler<T> : CompositeDrawable, IKeyBindingHandler<PlatformAction>, IHasContextMenu
     {
         /// <summary>
         /// The currently selected blueprints.
@@ -341,5 +344,37 @@ namespace osu.Game.Screens.Edit.Compose.Components
         }
 
         #endregion
+
+        #region Context Menu
+
+        public MenuItem[] ContextMenuItems
+        {
+            get
+            {
+                if (!SelectedBlueprints.Any(b => b.IsHovered))
+                    return Array.Empty<MenuItem>();
+
+                var items = new List<MenuItem>();
+
+                items.AddRange(GetContextMenuItemsForSelection(SelectedBlueprints));
+
+                if (SelectedBlueprints.Count == 1)
+                    items.AddRange(SelectedBlueprints[0].ContextMenuItems);
+
+                items.Add(new OsuMenuItem("Delete", MenuItemType.Destructive, DeleteSelected));
+
+                return items.ToArray();
+            }
+        }
+
+        /// <summary>
+        /// Provide context menu items relevant to current selection. Calling base is not required.
+        /// </summary>
+        /// <param name="selection">The current selection.</param>
+        /// <returns>The relevant menu items.</returns>
+        protected virtual IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint<T>> selection)
+            => Enumerable.Empty<MenuItem>();
+
+        #endregion
     }
 }

From e0906daebf9f17dfca21fa87f776df29e9d568bb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 13:49:41 +0900
Subject: [PATCH 2935/3722] Change one remaining instance of incorrect
 terminology in xmldoc

---
 osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 02df004129..cb3424a250 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -312,7 +312,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         }
 
         /// <summary>
-        /// Triggered whenever the set of selected objects changes.
+        /// Triggered whenever the set of selected items changes.
         /// Should update the selection box's state to match supported operations.
         /// </summary>
         protected virtual void OnSelectionChanged()

From ac1534cda2fb51afad43bcc4e4f4fe945a232cde Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 15:54:40 +0900
Subject: [PATCH 2936/3722] Add test covering existing button actually changing
 to `LocallyAvailable` state

---
 osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs b/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs
index 0c199bfb62..3fc894da0d 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs
@@ -43,7 +43,10 @@ namespace osu.Game.Tests.Visual.Online
             createButtonWithBeatmap(createSoleily());
             AddAssert("button state not downloaded", () => downloadButton.DownloadState == DownloadState.NotDownloaded);
             AddStep("import soleily", () => beatmaps.Import(TestResources.GetQuickTestBeatmapForImport()));
+
             AddUntilStep("wait for beatmap import", () => beatmaps.GetAllUsableBeatmapSets().Any(b => b.OnlineBeatmapSetID == 241526));
+            AddAssert("button state downloaded", () => downloadButton.DownloadState == DownloadState.LocallyAvailable);
+
             createButtonWithBeatmap(createSoleily());
             AddAssert("button state downloaded", () => downloadButton.DownloadState == DownloadState.LocallyAvailable);
             ensureSoleilyRemoved();

From 05e3a73a7d24acf00431405b96234498f830ddcb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 15:54:58 +0900
Subject: [PATCH 2937/3722] Fix import cancellation not correctly being
 forwarded to import notification

---
 osu.Game/Database/ArchiveModelManager.cs | 49 +++++++++++++++---------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 6719351530..dbeaebb1cd 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -156,33 +156,44 @@ namespace osu.Game.Database
 
             bool isLowPriorityImport = tasks.Length > low_priority_import_batch_size;
 
-            await Task.WhenAll(tasks.Select(async task =>
+            try
             {
-                notification.CancellationToken.ThrowIfCancellationRequested();
-
-                try
+                await Task.WhenAll(tasks.Select(async task =>
                 {
-                    var model = await Import(task, isLowPriorityImport, notification.CancellationToken).ConfigureAwait(false);
+                    notification.CancellationToken.ThrowIfCancellationRequested();
 
-                    lock (imported)
+                    try
                     {
-                        if (model != null)
-                            imported.Add(model);
-                        current++;
+                        var model = await Import(task, isLowPriorityImport, notification.CancellationToken).ConfigureAwait(false);
 
-                        notification.Text = $"Imported {current} of {tasks.Length} {HumanisedModelName}s";
-                        notification.Progress = (float)current / tasks.Length;
+                        lock (imported)
+                        {
+                            if (model != null)
+                                imported.Add(model);
+                            current++;
+
+                            notification.Text = $"Imported {current} of {tasks.Length} {HumanisedModelName}s";
+                            notification.Progress = (float)current / tasks.Length;
+                        }
                     }
-                }
-                catch (TaskCanceledException)
+                    catch (TaskCanceledException)
+                    {
+                        throw;
+                    }
+                    catch (Exception e)
+                    {
+                        Logger.Error(e, $@"Could not import ({task})", LoggingTarget.Database);
+                    }
+                })).ConfigureAwait(false);
+            }
+            catch (OperationCanceledException)
+            {
+                if (imported.Count == 0)
                 {
-                    throw;
+                    notification.State = ProgressNotificationState.Cancelled;
+                    return imported;
                 }
-                catch (Exception e)
-                {
-                    Logger.Error(e, $@"Could not import ({task})", LoggingTarget.Database);
-                }
-            })).ConfigureAwait(false);
+            }
 
             if (imported.Count == 0)
             {

From 8598a0968f17c0733ec38e030abceeddc8dca37a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 16:29:23 +0900
Subject: [PATCH 2938/3722] Update calculations in comments to match new logic

Mostly look to be errors that existed before this PR.

Co-authored-by: Endrik <enduslittlecomputer@gmail.com>
---
 osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index baa10663d5..41e16ebeaf 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -83,8 +83,8 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(ScoringMode.Standardised, HitResult.SmallTickHit, HitResult.SmallTickHit, 925_000)] // (3 * 10) / (4 * 10) * 300_000 + 700_000 (max combo 0)
         [TestCase(ScoringMode.Standardised, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)] // (3 * 0) / (4 * 30) * 300_000 + (0 / 4) * 700_000
         [TestCase(ScoringMode.Standardised, HitResult.LargeTickHit, HitResult.LargeTickHit, 575_000)] // (3 * 30) / (4 * 30) * 300_000 + (0 / 4) * 700_000
-        [TestCase(ScoringMode.Standardised, HitResult.SmallBonus, HitResult.SmallBonus, 1_000_030)] // 0 * 300_000 + 700_000 (max combo 0) + 3 * 10 (bonus points)
-        [TestCase(ScoringMode.Standardised, HitResult.LargeBonus, HitResult.LargeBonus, 1_000_150)] // 0 * 300_000 + 700_000 (max combo 0) + 3 * 50 (bonus points)
+        [TestCase(ScoringMode.Standardised, HitResult.SmallBonus, HitResult.SmallBonus, 1_000_030)] // 1 * 300_000 + 700_000 (max combo 0) + 3 * 10 (bonus points)
+        [TestCase(ScoringMode.Standardised, HitResult.LargeBonus, HitResult.LargeBonus, 1_000_150)] // 1 * 300_000 + 700_000 (max combo 0) + 3 * 50 (bonus points)
         [TestCase(ScoringMode.Classic, HitResult.Miss, HitResult.Great, 0)] // (0 * 4 * 300) * (1 + 0 / 25)
         [TestCase(ScoringMode.Classic, HitResult.Meh, HitResult.Great, 156)] // (((3 * 50) / (4 * 300)) * 4 * 300) * (1 + 1 / 25)
         [TestCase(ScoringMode.Classic, HitResult.Ok, HitResult.Great, 312)] // (((3 * 100) / (4 * 300)) * 4 * 300) * (1 + 1 / 25)
@@ -95,8 +95,8 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(ScoringMode.Classic, HitResult.SmallTickHit, HitResult.SmallTickHit, 225)] // (((3 * 10) / (4 * 10)) * 1 * 300) * (1 + 0 / 25)
         [TestCase(ScoringMode.Classic, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)] // (0 * 4 * 300) * (1 + 0 / 25)
         [TestCase(ScoringMode.Classic, HitResult.LargeTickHit, HitResult.LargeTickHit, 936)] // (((3 * 50) / (4 * 50)) * 4 * 300) * (1 + 1 / 25)
-        [TestCase(ScoringMode.Classic, HitResult.SmallBonus, HitResult.SmallBonus, 330)] // (0 * 1 * 300) * (1 + 0 / 25) + 3 * 10 (bonus points)
-        [TestCase(ScoringMode.Classic, HitResult.LargeBonus, HitResult.LargeBonus, 450)] // (1 * 1 * 300) * (1 + 0 / 25) * 3 * 50 (bonus points)
+        [TestCase(ScoringMode.Classic, HitResult.SmallBonus, HitResult.SmallBonus, 330)] // (1 * 1 * 300) * (1 + 0 / 25) + 3 * 10 (bonus points)
+        [TestCase(ScoringMode.Classic, HitResult.LargeBonus, HitResult.LargeBonus, 450)] // (1 * 1 * 300) * (1 + 0 / 25) + 3 * 50 (bonus points)
         public void TestFourVariousResultsOneMiss(ScoringMode scoringMode, HitResult hitResult, HitResult maxResult, int expectedScore)
         {
             var minResult = new TestJudgement(hitResult).MinResult;

From e71dbfd730df6a2909deb9b3b53ba027f9f45e29 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 16:37:48 +0900
Subject: [PATCH 2939/3722] Add inline comment regarding remaining issues with
 classic scoring

---
 osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
index 41e16ebeaf..184a94912a 100644
--- a/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
+++ b/osu.Game.Tests/Rulesets/Scoring/ScoreProcessorTest.cs
@@ -95,6 +95,7 @@ namespace osu.Game.Tests.Rulesets.Scoring
         [TestCase(ScoringMode.Classic, HitResult.SmallTickHit, HitResult.SmallTickHit, 225)] // (((3 * 10) / (4 * 10)) * 1 * 300) * (1 + 0 / 25)
         [TestCase(ScoringMode.Classic, HitResult.LargeTickMiss, HitResult.LargeTickHit, 0)] // (0 * 4 * 300) * (1 + 0 / 25)
         [TestCase(ScoringMode.Classic, HitResult.LargeTickHit, HitResult.LargeTickHit, 936)] // (((3 * 50) / (4 * 50)) * 4 * 300) * (1 + 1 / 25)
+        // TODO: The following two cases don't match expectations currently (a single hit is registered in acc portion when it shouldn't be). See https://github.com/ppy/osu/issues/12604.
         [TestCase(ScoringMode.Classic, HitResult.SmallBonus, HitResult.SmallBonus, 330)] // (1 * 1 * 300) * (1 + 0 / 25) + 3 * 10 (bonus points)
         [TestCase(ScoringMode.Classic, HitResult.LargeBonus, HitResult.LargeBonus, 450)] // (1 * 1 * 300) * (1 + 0 / 25) + 3 * 50 (bonus points)
         public void TestFourVariousResultsOneMiss(ScoringMode scoringMode, HitResult hitResult, HitResult maxResult, int expectedScore)

From 48d6c9ac4bee70169ac982611545c9d276126988 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 16:47:30 +0900
Subject: [PATCH 2940/3722] Move snap/divisor helper methods to inside
 `ControlPointInfo`

---
 .../NonVisual/ClosestBeatDivisorTest.cs       |  2 +-
 osu.Game/Beatmaps/Beatmap.cs                  | 26 ------------
 .../ControlPoints/ControlPointInfo.cs         | 42 +++++++++++++++++++
 osu.Game/Beatmaps/IBeatmap.cs                 | 22 ----------
 .../Edit/Checks/CheckUnsnappedObjects.cs      |  8 ++--
 osu.Game/Screens/Edit/EditorBeatmap.cs        | 11 +----
 osu.Game/Screens/Play/GameplayBeatmap.cs      |  9 ----
 7 files changed, 49 insertions(+), 71 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/ClosestBeatDivisorTest.cs b/osu.Game.Tests/NonVisual/ClosestBeatDivisorTest.cs
index 4d6986f5d2..5ac121f5bc 100644
--- a/osu.Game.Tests/NonVisual/ClosestBeatDivisorTest.cs
+++ b/osu.Game.Tests/NonVisual/ClosestBeatDivisorTest.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Tests.NonVisual
             };
 
             for (int i = 0; i < divisors.Count; ++i)
-                Assert.AreEqual(closestDivisors[i], beatmap.ClosestBeatDivisor(beatmap.HitObjects[i].StartTime), $"at index {i}");
+                Assert.AreEqual(closestDivisors[i], beatmap.ControlPointInfo.ClosestBeatDivisor(beatmap.HitObjects[i].StartTime), $"at index {i}");
         }
     }
 }
diff --git a/osu.Game/Beatmaps/Beatmap.cs b/osu.Game/Beatmaps/Beatmap.cs
index 6515540527..e5b6a4bc44 100644
--- a/osu.Game/Beatmaps/Beatmap.cs
+++ b/osu.Game/Beatmaps/Beatmap.cs
@@ -9,7 +9,6 @@ using System.Linq;
 using osu.Game.Beatmaps.ControlPoints;
 using Newtonsoft.Json;
 using osu.Game.IO.Serialization.Converters;
-using osu.Game.Screens.Edit;
 
 namespace osu.Game.Beatmaps
 {
@@ -75,31 +74,6 @@ namespace osu.Game.Beatmaps
             return mostCommon.beatLength;
         }
 
-        public int ClosestSnapTime(double time, int beatDivisor, double? referenceTime = null)
-        {
-            var timingPoint = ControlPointInfo.TimingPointAt(referenceTime ?? time);
-            var beatLength = timingPoint.BeatLength / beatDivisor;
-            var beatLengths = (int)Math.Round((time - timingPoint.Time) / beatLength, MidpointRounding.AwayFromZero);
-
-            // Casting to int matches stable.
-            return (int)(timingPoint.Time + beatLengths * beatLength);
-        }
-
-        public int ClosestSnapTime(double time, double? referenceTime = null)
-        {
-            return ClosestSnapTime(time, ClosestBeatDivisor(time, referenceTime), referenceTime);
-        }
-
-        public int ClosestBeatDivisor(double time, double? referenceTime = null)
-        {
-            double getUnsnap(int divisor) => Math.Abs(time - ClosestSnapTime(time, divisor, referenceTime));
-
-            int[] divisors = BindableBeatDivisor.VALID_DIVISORS;
-            double smallestUnsnap = divisors.Min(getUnsnap);
-
-            return divisors.FirstOrDefault(divisor => getUnsnap(divisor) == smallestUnsnap);
-        }
-
         IBeatmap IBeatmap.Clone() => Clone();
 
         public Beatmap<T> Clone() => (Beatmap<T>)MemberwiseClone();
diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
index 5cc60a5758..d1a04061b9 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using Newtonsoft.Json;
 using osu.Framework.Bindables;
 using osu.Framework.Lists;
+using osu.Game.Screens.Edit;
 
 namespace osu.Game.Beatmaps.ControlPoints
 {
@@ -160,6 +161,47 @@ namespace osu.Game.Beatmaps.ControlPoints
             groups.Remove(group);
         }
 
+        /// <summary>
+        /// Returns the time on the given beat divisor closest to the given time.
+        /// </summary>
+        /// <param name="time">The time to find the closest snapped time to.</param>
+        /// <param name="beatDivisor">The beat divisor to snap to.</param>
+        /// <param name="referenceTime">An optional reference point to use for timing point lookup.</param>
+        public int ClosestSnapTime(double time, int beatDivisor, double? referenceTime = null)
+        {
+            var timingPoint = TimingPointAt(referenceTime ?? time);
+            var beatLength = timingPoint.BeatLength / beatDivisor;
+            var beatLengths = (int)Math.Round((time - timingPoint.Time) / beatLength, MidpointRounding.AwayFromZero);
+
+            // Casting to int matches stable.
+            return (int)(timingPoint.Time + beatLengths * beatLength);
+        }
+
+        /// <summary>
+        /// Returns the time on any valid beat divisor closest to the given time.
+        /// </summary>
+        /// <param name="time">The time to find the closest snapped time to.</param>
+        /// <param name="referenceTime">An optional reference point to use for timing point lookup.</param>
+        public int ClosestSnapTime(double time, double? referenceTime = null)
+        {
+            return ClosestSnapTime(time, ClosestBeatDivisor(time, referenceTime), referenceTime);
+        }
+
+        /// <summary>
+        /// Returns the beat snap divisor closest to the given time. If two are equally close, the smallest is returned.
+        /// </summary>
+        /// <param name="time">The time to find the closest beat snap divisor to.</param>
+        /// <param name="referenceTime">An optional reference point to use for timing point lookup.</param>
+        public int ClosestBeatDivisor(double time, double? referenceTime = null)
+        {
+            double getUnsnap(int divisor) => Math.Abs(time - ClosestSnapTime(time, divisor, referenceTime));
+
+            int[] divisors = BindableBeatDivisor.VALID_DIVISORS;
+            double smallestUnsnap = divisors.Min(getUnsnap);
+
+            return divisors.FirstOrDefault(divisor => getUnsnap(divisor) == smallestUnsnap);
+        }
+
         /// <summary>
         /// Binary searches one of the control point lists to find the active control point at <paramref name="time"/>.
         /// Includes logic for returning a specific point when no matching point is found.
diff --git a/osu.Game/Beatmaps/IBeatmap.cs b/osu.Game/Beatmaps/IBeatmap.cs
index 679d639fd1..769b33009a 100644
--- a/osu.Game/Beatmaps/IBeatmap.cs
+++ b/osu.Game/Beatmaps/IBeatmap.cs
@@ -51,28 +51,6 @@ namespace osu.Game.Beatmaps
         /// </summary>
         double GetMostCommonBeatLength();
 
-        /// <summary>
-        /// Returns the time on the given beat divisor closest to the given time.
-        /// </summary>
-        /// <param name="time">The time to find the closest snapped time to.</param>
-        /// <param name="beatDivisor">The beat divisor to snap to.</param>
-        /// <param name="referenceTime">An optional reference point to use for timing point lookup.</param>
-        int ClosestSnapTime(double time, int beatDivisor, double? referenceTime = null);
-
-        /// <summary>
-        /// Returns the time on any valid beat divisor closest to the given time.
-        /// </summary>
-        /// <param name="time">The time to find the closest snapped time to.</param>
-        /// <param name="referenceTime">An optional reference point to use for timing point lookup.</param>
-        int ClosestSnapTime(double time, double? referenceTime = null);
-
-        /// <summary>
-        /// Returns the beat snap divisor closest to the given time. If two are equally close, the smallest is returned.
-        /// </summary>
-        /// <param name="time">The time to find the closest beat snap divisor to.</param>
-        /// <param name="referenceTime">An optional reference point to use for timing point lookup.</param>
-        int ClosestBeatDivisor(double time, double? referenceTime = null);
-
         /// <summary>
         /// Creates a shallow-clone of this beatmap and returns it.
         /// </summary>
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs b/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
index 8b6bb7d461..cc5ea2a988 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
@@ -24,9 +24,11 @@ namespace osu.Game.Rulesets.Edit.Checks
 
         public IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap)
         {
+            var controlPointInfo = playableBeatmap.ControlPointInfo;
+
             foreach (var hitobject in playableBeatmap.HitObjects)
             {
-                double startUnsnap = hitobject.StartTime - playableBeatmap.ClosestSnapTime(hitobject.StartTime);
+                double startUnsnap = hitobject.StartTime - controlPointInfo.ClosestSnapTime(hitobject.StartTime);
                 string startPostfix = hitobject is IHasDuration ? "start" : "";
                 foreach (var issue in getUnsnapIssues(hitobject, startUnsnap, hitobject.StartTime, startPostfix))
                     yield return issue;
@@ -37,7 +39,7 @@ namespace osu.Game.Rulesets.Edit.Checks
                     {
                         double spanDuration = hasRepeats.Duration / (hasRepeats.RepeatCount + 1);
                         double repeatTime = hitobject.StartTime + spanDuration * (repeatIndex + 1);
-                        double repeatUnsnap = repeatTime - playableBeatmap.ClosestSnapTime(repeatTime);
+                        double repeatUnsnap = repeatTime - controlPointInfo.ClosestSnapTime(repeatTime);
                         foreach (var issue in getUnsnapIssues(hitobject, repeatUnsnap, repeatTime, "repeat"))
                             yield return issue;
                     }
@@ -45,7 +47,7 @@ namespace osu.Game.Rulesets.Edit.Checks
 
                 if (hitobject is IHasDuration hasDuration)
                 {
-                    double endUnsnap = hasDuration.EndTime - playableBeatmap.ClosestSnapTime(hasDuration.EndTime);
+                    double endUnsnap = hasDuration.EndTime - controlPointInfo.ClosestSnapTime(hasDuration.EndTime);
                     foreach (var issue in getUnsnapIssues(hitobject, endUnsnap, hasDuration.EndTime, "end"))
                         yield return issue;
                 }
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 72fb0ac9e9..f1262daab3 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -301,16 +301,7 @@ namespace osu.Game.Screens.Edit
             return list.Count - 1;
         }
 
-        public int ClosestSnapTime(double time, int beatDivisor, double? referenceTime = null)
-        {
-            return PlayableBeatmap.ClosestSnapTime(time, beatDivisor, referenceTime);
-        }
-
-        public int ClosestSnapTime(double time, double? referenceTime = null) => PlayableBeatmap.ClosestSnapTime(time, referenceTime);
-
-        public int ClosestBeatDivisor(double time, double? referenceTime = null) => PlayableBeatmap.ClosestBeatDivisor(time, referenceTime);
-
-        public double SnapTime(double time, double? referenceTime) => ClosestSnapTime(time, BeatDivisor, referenceTime);
+        public double SnapTime(double time, double? referenceTime) => ControlPointInfo.ClosestSnapTime(time, BeatDivisor, referenceTime);
 
         public double GetBeatLengthAtTime(double referenceTime) => ControlPointInfo.TimingPointAt(referenceTime).BeatLength / BeatDivisor;
 
diff --git a/osu.Game/Screens/Play/GameplayBeatmap.cs b/osu.Game/Screens/Play/GameplayBeatmap.cs
index 92f58c8759..74fbe540fa 100644
--- a/osu.Game/Screens/Play/GameplayBeatmap.cs
+++ b/osu.Game/Screens/Play/GameplayBeatmap.cs
@@ -45,15 +45,6 @@ namespace osu.Game.Screens.Play
 
         public double GetMostCommonBeatLength() => PlayableBeatmap.GetMostCommonBeatLength();
 
-        public int ClosestSnapTime(double time, int beatDivisor, double? referenceTime = null)
-        {
-            return PlayableBeatmap.ClosestSnapTime(time, beatDivisor, referenceTime);
-        }
-
-        public int ClosestSnapTime(double time, double? referenceTime = null) => PlayableBeatmap.ClosestSnapTime(time, referenceTime);
-
-        public int ClosestBeatDivisor(double time, double? referenceTime = null) => PlayableBeatmap.ClosestBeatDivisor(time, referenceTime);
-
         public IBeatmap Clone() => PlayableBeatmap.Clone();
 
         private readonly Bindable<JudgementResult> lastJudgementResult = new Bindable<JudgementResult>();

From f3c7694eeb8f78cd6368fd5701e22ed291e000ca Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 16:57:52 +0900
Subject: [PATCH 2941/3722] Rename methods to match generally how these
 find-methods are named elsewhere

---
 osu.Game.Tests/NonVisual/ClosestBeatDivisorTest.cs     |  2 +-
 osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs    | 10 +++++-----
 osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs |  6 +++---
 osu.Game/Screens/Edit/EditorBeatmap.cs                 |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/ClosestBeatDivisorTest.cs b/osu.Game.Tests/NonVisual/ClosestBeatDivisorTest.cs
index 5ac121f5bc..08cd80dcfa 100644
--- a/osu.Game.Tests/NonVisual/ClosestBeatDivisorTest.cs
+++ b/osu.Game.Tests/NonVisual/ClosestBeatDivisorTest.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Tests.NonVisual
             };
 
             for (int i = 0; i < divisors.Count; ++i)
-                Assert.AreEqual(closestDivisors[i], beatmap.ControlPointInfo.ClosestBeatDivisor(beatmap.HitObjects[i].StartTime), $"at index {i}");
+                Assert.AreEqual(closestDivisors[i], beatmap.ControlPointInfo.GetClosestBeatDivisor(beatmap.HitObjects[i].StartTime), $"at index {i}");
         }
     }
 }
diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
index d1a04061b9..60a8a40f06 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
@@ -167,7 +167,7 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// <param name="time">The time to find the closest snapped time to.</param>
         /// <param name="beatDivisor">The beat divisor to snap to.</param>
         /// <param name="referenceTime">An optional reference point to use for timing point lookup.</param>
-        public int ClosestSnapTime(double time, int beatDivisor, double? referenceTime = null)
+        public int GetClosestSnappedTime(double time, int beatDivisor, double? referenceTime = null)
         {
             var timingPoint = TimingPointAt(referenceTime ?? time);
             var beatLength = timingPoint.BeatLength / beatDivisor;
@@ -182,9 +182,9 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// </summary>
         /// <param name="time">The time to find the closest snapped time to.</param>
         /// <param name="referenceTime">An optional reference point to use for timing point lookup.</param>
-        public int ClosestSnapTime(double time, double? referenceTime = null)
+        public int GetClosestSnappedTime(double time, double? referenceTime = null)
         {
-            return ClosestSnapTime(time, ClosestBeatDivisor(time, referenceTime), referenceTime);
+            return GetClosestSnappedTime(time, GetClosestBeatDivisor(time, referenceTime), referenceTime);
         }
 
         /// <summary>
@@ -192,9 +192,9 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// </summary>
         /// <param name="time">The time to find the closest beat snap divisor to.</param>
         /// <param name="referenceTime">An optional reference point to use for timing point lookup.</param>
-        public int ClosestBeatDivisor(double time, double? referenceTime = null)
+        public int GetClosestBeatDivisor(double time, double? referenceTime = null)
         {
-            double getUnsnap(int divisor) => Math.Abs(time - ClosestSnapTime(time, divisor, referenceTime));
+            double getUnsnap(int divisor) => Math.Abs(time - GetClosestSnappedTime(time, divisor, referenceTime));
 
             int[] divisors = BindableBeatDivisor.VALID_DIVISORS;
             double smallestUnsnap = divisors.Min(getUnsnap);
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs b/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
index cc5ea2a988..cdf3f05465 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Edit.Checks
 
             foreach (var hitobject in playableBeatmap.HitObjects)
             {
-                double startUnsnap = hitobject.StartTime - controlPointInfo.ClosestSnapTime(hitobject.StartTime);
+                double startUnsnap = hitobject.StartTime - controlPointInfo.GetClosestSnappedTime(hitobject.StartTime);
                 string startPostfix = hitobject is IHasDuration ? "start" : "";
                 foreach (var issue in getUnsnapIssues(hitobject, startUnsnap, hitobject.StartTime, startPostfix))
                     yield return issue;
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Edit.Checks
                     {
                         double spanDuration = hasRepeats.Duration / (hasRepeats.RepeatCount + 1);
                         double repeatTime = hitobject.StartTime + spanDuration * (repeatIndex + 1);
-                        double repeatUnsnap = repeatTime - controlPointInfo.ClosestSnapTime(repeatTime);
+                        double repeatUnsnap = repeatTime - controlPointInfo.GetClosestSnappedTime(repeatTime);
                         foreach (var issue in getUnsnapIssues(hitobject, repeatUnsnap, repeatTime, "repeat"))
                             yield return issue;
                     }
@@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Edit.Checks
 
                 if (hitobject is IHasDuration hasDuration)
                 {
-                    double endUnsnap = hasDuration.EndTime - controlPointInfo.ClosestSnapTime(hasDuration.EndTime);
+                    double endUnsnap = hasDuration.EndTime - controlPointInfo.GetClosestSnappedTime(hasDuration.EndTime);
                     foreach (var issue in getUnsnapIssues(hitobject, endUnsnap, hasDuration.EndTime, "end"))
                         yield return issue;
                 }
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index f1262daab3..be53abbd55 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -301,7 +301,7 @@ namespace osu.Game.Screens.Edit
             return list.Count - 1;
         }
 
-        public double SnapTime(double time, double? referenceTime) => ControlPointInfo.ClosestSnapTime(time, BeatDivisor, referenceTime);
+        public double SnapTime(double time, double? referenceTime) => ControlPointInfo.GetClosestSnappedTime(time, BeatDivisor, referenceTime);
 
         public double GetBeatLengthAtTime(double referenceTime) => ControlPointInfo.TimingPointAt(referenceTime).BeatLength / BeatDivisor;
 

From c5186b6a693e7ff3ff1b7737a5b4f81ba0cf1124 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 16:59:49 +0900
Subject: [PATCH 2942/3722] Revert return values to non-rounded doubles

---
 osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
index 60a8a40f06..fa1c59bb08 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
@@ -167,14 +167,13 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// <param name="time">The time to find the closest snapped time to.</param>
         /// <param name="beatDivisor">The beat divisor to snap to.</param>
         /// <param name="referenceTime">An optional reference point to use for timing point lookup.</param>
-        public int GetClosestSnappedTime(double time, int beatDivisor, double? referenceTime = null)
+        public double GetClosestSnappedTime(double time, int beatDivisor, double? referenceTime = null)
         {
             var timingPoint = TimingPointAt(referenceTime ?? time);
             var beatLength = timingPoint.BeatLength / beatDivisor;
             var beatLengths = (int)Math.Round((time - timingPoint.Time) / beatLength, MidpointRounding.AwayFromZero);
 
-            // Casting to int matches stable.
-            return (int)(timingPoint.Time + beatLengths * beatLength);
+            return timingPoint.Time + beatLengths * beatLength;
         }
 
         /// <summary>
@@ -182,7 +181,7 @@ namespace osu.Game.Beatmaps.ControlPoints
         /// </summary>
         /// <param name="time">The time to find the closest snapped time to.</param>
         /// <param name="referenceTime">An optional reference point to use for timing point lookup.</param>
-        public int GetClosestSnappedTime(double time, double? referenceTime = null)
+        public double GetClosestSnappedTime(double time, double? referenceTime = null)
         {
             return GetClosestSnappedTime(time, GetClosestBeatDivisor(time, referenceTime), referenceTime);
         }

From 859898d98f09b9f10e928eca51206be5519b3fbd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 17:16:05 +0900
Subject: [PATCH 2943/3722] Refactor lookup methods to avoid linq and reduce
 `TimingPointAt` calls

---
 .../ControlPoints/ControlPointInfo.cs         | 42 ++++++++++++-------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
index fa1c59bb08..e47d48edcf 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
@@ -170,35 +170,47 @@ namespace osu.Game.Beatmaps.ControlPoints
         public double GetClosestSnappedTime(double time, int beatDivisor, double? referenceTime = null)
         {
             var timingPoint = TimingPointAt(referenceTime ?? time);
-            var beatLength = timingPoint.BeatLength / beatDivisor;
-            var beatLengths = (int)Math.Round((time - timingPoint.Time) / beatLength, MidpointRounding.AwayFromZero);
-
-            return timingPoint.Time + beatLengths * beatLength;
+            return getClosestSnappedTime(timingPoint, time, beatDivisor);
         }
 
         /// <summary>
-        /// Returns the time on any valid beat divisor closest to the given time.
+        /// Returns the time on *ANY* valid beat divisor, favouring the divisor closest to the given time.
         /// </summary>
         /// <param name="time">The time to find the closest snapped time to.</param>
-        /// <param name="referenceTime">An optional reference point to use for timing point lookup.</param>
-        public double GetClosestSnappedTime(double time, double? referenceTime = null)
-        {
-            return GetClosestSnappedTime(time, GetClosestBeatDivisor(time, referenceTime), referenceTime);
-        }
+        public double GetClosestSnappedTime(double time) => GetClosestSnappedTime(time, GetClosestBeatDivisor(time));
 
         /// <summary>
-        /// Returns the beat snap divisor closest to the given time. If two are equally close, the smallest is returned.
+        /// Returns the beat snap divisor closest to the given time. If two are equally close, the smallest divisor is returned.
         /// </summary>
         /// <param name="time">The time to find the closest beat snap divisor to.</param>
         /// <param name="referenceTime">An optional reference point to use for timing point lookup.</param>
         public int GetClosestBeatDivisor(double time, double? referenceTime = null)
         {
-            double getUnsnap(int divisor) => Math.Abs(time - GetClosestSnappedTime(time, divisor, referenceTime));
+            TimingControlPoint timingPoint = TimingPointAt(referenceTime ?? time);
 
-            int[] divisors = BindableBeatDivisor.VALID_DIVISORS;
-            double smallestUnsnap = divisors.Min(getUnsnap);
+            int closestDivisor = 0;
+            double closestTime = double.MaxValue;
 
-            return divisors.FirstOrDefault(divisor => getUnsnap(divisor) == smallestUnsnap);
+            foreach (int divisor in BindableBeatDivisor.VALID_DIVISORS)
+            {
+                double distanceFromSnap = Math.Abs(time - getClosestSnappedTime(timingPoint, time, divisor));
+
+                if (distanceFromSnap < closestTime)
+                {
+                    closestDivisor = divisor;
+                    closestTime = distanceFromSnap;
+                }
+            }
+
+            return closestDivisor;
+        }
+
+        private static double getClosestSnappedTime(TimingControlPoint timingPoint, double time, int beatDivisor)
+        {
+            var beatLength = timingPoint.BeatLength / beatDivisor;
+            var beatLengths = (int)Math.Round((time - timingPoint.Time) / beatLength, MidpointRounding.AwayFromZero);
+
+            return timingPoint.Time + beatLengths * beatLength;
         }
 
         /// <summary>

From 126056c43626cfbe5fcb9906ceb8d8e8425029a9 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Wed, 28 Apr 2021 19:27:18 +0800
Subject: [PATCH 2944/3722] Fix precision loss on exporting legacy 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 56c4e75864..144aeeebce 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
@@ -95,8 +95,9 @@ namespace osu.Game.Scoring.Legacy
 
                     foreach (var f in score.Replay.Frames.OfType<IConvertibleReplayFrame>().Select(f => f.ToLegacy(beatmap)))
                     {
-                        replayData.Append(FormattableString.Invariant($"{(int)Math.Round(f.Time - lastF.Time)}|{f.MouseX ?? 0}|{f.MouseY ?? 0}|{(int)f.ButtonState},"));
+                        replayData.Append(FormattableString.Invariant($"{Math.Round(f.Time - lastF.Time)}|{f.MouseX ?? 0}|{f.MouseY ?? 0}|{(int)f.ButtonState},"));
                         lastF = f;
+                        lastF.Time = Math.Round(f.Time);
                     }
                 }
 

From 4fe1497f63ec6f65badc27505821a311690226db Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Wed, 28 Apr 2021 20:23:56 +0800
Subject: [PATCH 2945/3722] Add comment & remove lastF

---
 osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
index 144aeeebce..13876f1648 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
@@ -91,13 +91,13 @@ namespace osu.Game.Scoring.Legacy
 
                 if (score.Replay != null)
                 {
-                    LegacyReplayFrame lastF = new LegacyReplayFrame(0, 0, 0, ReplayButtonState.None);
-
+                    int lastTimeRounded = 0;
                     foreach (var f in score.Replay.Frames.OfType<IConvertibleReplayFrame>().Select(f => f.ToLegacy(beatmap)))
                     {
-                        replayData.Append(FormattableString.Invariant($"{Math.Round(f.Time - lastF.Time)}|{f.MouseX ?? 0}|{f.MouseY ?? 0}|{(int)f.ButtonState},"));
-                        lastF = f;
-                        lastF.Time = Math.Round(f.Time);
+                        // Rounding because stable could only parse integral values
+                        int timeRounded = (int)Math.Round(f.Time);
+                        replayData.Append(FormattableString.Invariant($"{timeRounded - lastTimeRounded}|{f.MouseX ?? 0}|{f.MouseY ?? 0}|{(int)f.ButtonState},"));
+                        lastTimeRounded = timeRounded;
                     }
                 }
 

From 6d7eef3f5a437e1886908f3440138700e0dcd9e2 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 28 Apr 2021 16:45:57 +0000
Subject: [PATCH 2946/3722] Upgrade to GitHub-native Dependabot

---
 .github/dependabot.yml | 46 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000000..9e9af23b27
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,46 @@
+version: 2
+updates:
+- package-ecosystem: nuget
+  directory: "/"
+  schedule:
+    interval: monthly
+    time: "17:00"
+  open-pull-requests-limit: 99
+  ignore:
+  - dependency-name: Microsoft.EntityFrameworkCore.Design
+    versions:
+    - "> 2.2.6"
+  - dependency-name: Microsoft.EntityFrameworkCore.Sqlite
+    versions:
+    - "> 2.2.6"
+  - dependency-name: Microsoft.EntityFrameworkCore.Sqlite.Core
+    versions:
+    - "> 2.2.6"
+  - dependency-name: Microsoft.Extensions.DependencyInjection
+    versions:
+    - ">= 5.a, < 6"
+  - dependency-name: NUnit3TestAdapter
+    versions:
+    - ">= 3.16.a, < 3.17"
+  - dependency-name: Microsoft.NET.Test.Sdk
+    versions:
+    - 16.9.1
+  - dependency-name: Microsoft.Extensions.DependencyInjection
+    versions:
+    - 3.1.11
+    - 3.1.12
+  - dependency-name: Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson
+    versions:
+    - 3.1.11
+  - dependency-name: Microsoft.NETCore.Targets
+    versions:
+    - 5.0.0
+  - dependency-name: Microsoft.AspNetCore.SignalR.Protocols.MessagePack
+    versions:
+    - 5.0.2
+  - dependency-name: NUnit
+    versions:
+    - 3.13.1
+  - dependency-name: Microsoft.AspNetCore.SignalR.Client
+    versions:
+    - 3.1.11

From 243605728d5f167680caa5bbb0dee1225960075d Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Wed, 28 Apr 2021 11:44:05 -0700
Subject: [PATCH 2947/3722] Fix approved maps not displaying pp column on score
 table

---
 osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
index b598b7d97f..3e95d125de 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
@@ -59,8 +59,10 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
 
                 var scoreInfos = value.Scores.Select(s => s.CreateScoreInfo(rulesets)).ToList();
                 var topScore = scoreInfos.First();
+                var status = topScore.Beatmap?.Status;
+                var showPerformanceColumn = status == BeatmapSetOnlineStatus.Ranked || status == BeatmapSetOnlineStatus.Approved;
 
-                scoreTable.DisplayScores(scoreInfos, topScore.Beatmap?.Status == BeatmapSetOnlineStatus.Ranked);
+                scoreTable.DisplayScores(scoreInfos, showPerformanceColumn);
                 scoreTable.Show();
 
                 var userScore = value.UserScore;

From 921d4510478943f5b6c195044d30102f2a9f2fe2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Apr 2021 03:50:49 +0000
Subject: [PATCH 2948/3722] Bump Microsoft.AspNetCore.SignalR.Client from 5.0.4
 to 5.0.5

Bumps [Microsoft.AspNetCore.SignalR.Client](https://github.com/dotnet/aspnetcore) from 5.0.4 to 5.0.5.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v5.0.4...v5.0.5)

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 986bd8e7ba..c61c59e589 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -21,7 +21,7 @@
     <PackageReference Include="DiffPlex" Version="1.7.0" />
     <PackageReference Include="Humanizer" Version="2.8.26" />
     <PackageReference Include="MessagePack" Version="2.2.85" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="5.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="5.0.5" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.4" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="5.0.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />

From 5720e255c9b3ed3c1d466db57ca4eac65fae0a09 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Apr 2021 03:50:53 +0000
Subject: [PATCH 2949/3722] Bump Sentry from 3.2.0 to 3.3.4

Bumps [Sentry](https://github.com/getsentry/sentry-dotnet) from 3.2.0 to 3.3.4.
- [Release notes](https://github.com/getsentry/sentry-dotnet/releases)
- [Changelog](https://github.com/getsentry/sentry-dotnet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-dotnet/compare/3.2.0...3.3.4)

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 986bd8e7ba..abb1e40b64 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -31,7 +31,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.427.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
-    <PackageReference Include="Sentry" Version="3.2.0" />
+    <PackageReference Include="Sentry" Version="3.3.4" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

From 6c51bf523ca0740feae42ade648b7bbffa49192d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Apr 2021 03:50:56 +0000
Subject: [PATCH 2950/3722] Bump SharpCompress from 0.28.1 to 0.28.2

Bumps [SharpCompress](https://github.com/adamhathcock/sharpcompress) from 0.28.1 to 0.28.2.
- [Release notes](https://github.com/adamhathcock/sharpcompress/releases)
- [Commits](https://github.com/adamhathcock/sharpcompress/compare/0.28.1...0.28.2)

Signed-off-by: dependabot[bot] <support@github.com>
---
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 986bd8e7ba..189bc724fc 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -32,7 +32,7 @@
     <PackageReference Include="ppy.osu.Framework" Version="2021.427.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
     <PackageReference Include="Sentry" Version="3.2.0" />
-    <PackageReference Include="SharpCompress" Version="0.28.1" />
+    <PackageReference Include="SharpCompress" Version="0.28.2" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
diff --git a/osu.iOS.props b/osu.iOS.props
index c32109d6db..1a9f945ec8 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -94,7 +94,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.427.0" />
-    <PackageReference Include="SharpCompress" Version="0.28.1" />
+    <PackageReference Include="SharpCompress" Version="0.28.2" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

From 437e9201ba844fb6d7baac65ea679647d439b370 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Apr 2021 03:51:00 +0000
Subject: [PATCH 2951/3722] Bump
 Microsoft.AspNetCore.SignalR.Protocols.MessagePack

Bumps [Microsoft.AspNetCore.SignalR.Protocols.MessagePack](https://github.com/dotnet/aspnetcore) from 5.0.4 to 5.0.5.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v5.0.4...v5.0.5)

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 986bd8e7ba..e2c8e2cf1b 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -22,7 +22,7 @@
     <PackageReference Include="Humanizer" Version="2.8.26" />
     <PackageReference Include="MessagePack" Version="2.2.85" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="5.0.4" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.5" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="5.0.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />

From 5b071c68e7ab85f7e7faab2e2ae79762140ba6ca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Apr 2021 03:51:04 +0000
Subject: [PATCH 2952/3722] Bump
 Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson

Bumps [Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson](https://github.com/dotnet/aspnetcore) from 5.0.4 to 5.0.5.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v5.0.4...v5.0.5)

Signed-off-by: dependabot[bot] <support@github.com>
---
 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 986bd8e7ba..c9de4dd28a 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="MessagePack" Version="2.2.85" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="5.0.4" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.4" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="5.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="5.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />

From 1e7feff49d57fc2f0575a8a423083e0ff9a44d65 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Apr 2021 03:51:08 +0000
Subject: [PATCH 2953/3722] Bump Humanizer from 2.8.26 to 2.9.9

Bumps [Humanizer](https://github.com/Humanizr/Humanizer) from 2.8.26 to 2.9.9.
- [Release notes](https://github.com/Humanizr/Humanizer/releases)
- [Changelog](https://github.com/Humanizr/Humanizer/blob/main/release_notes.md)
- [Commits](https://github.com/Humanizr/Humanizer/compare/v2.8.26...v2.9.9)

Signed-off-by: dependabot[bot] <support@github.com>
---
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 986bd8e7ba..aa1599e69a 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="DiffPlex" Version="1.7.0" />
-    <PackageReference Include="Humanizer" Version="2.8.26" />
+    <PackageReference Include="Humanizer" Version="2.9.9" />
     <PackageReference Include="MessagePack" Version="2.2.85" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="5.0.4" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.4" />
diff --git a/osu.iOS.props b/osu.iOS.props
index c32109d6db..7061bb5e84 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -89,7 +89,7 @@
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
     <PackageReference Include="DiffPlex" Version="1.6.3" />
-    <PackageReference Include="Humanizer" Version="2.8.26" />
+    <PackageReference Include="Humanizer" Version="2.9.9" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />

From 1b3b07d6a9f0ccb9e595a1c6ae69456254356b96 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Apr 2021 03:51:12 +0000
Subject: [PATCH 2954/3722] Bump NUnit from 3.13.1 to 3.13.2

Bumps [NUnit](https://github.com/nunit/nunit) from 3.13.1 to 3.13.2.
- [Release notes](https://github.com/nunit/nunit/releases)
- [Changelog](https://github.com/nunit/nunit/blob/v3.13.2/CHANGES.md)
- [Commits](https://github.com/nunit/nunit/compare/v3.13.1...v3.13.2)

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../osu.Game.Rulesets.EmptyFreeform.Tests.csproj                | 2 +-
 .../osu.Game.Rulesets.Pippidon.Tests.csproj                     | 2 +-
 .../osu.Game.Rulesets.EmptyScrolling.Tests.csproj               | 2 +-
 .../osu.Game.Rulesets.Pippidon.Tests.csproj                     | 2 +-
 osu.Game.Benchmarks/osu.Game.Benchmarks.csproj                  | 2 +-
 .../osu.Game.Rulesets.Catch.Tests.csproj                        | 2 +-
 .../osu.Game.Rulesets.Mania.Tests.csproj                        | 2 +-
 osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj  | 2 +-
 .../osu.Game.Rulesets.Taiko.Tests.csproj                        | 2 +-
 osu.Game.Tests/osu.Game.Tests.csproj                            | 2 +-
 osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj      | 2 +-
 osu.Game/osu.Game.csproj                                        | 2 +-
 osu.iOS.props                                                   | 2 +-
 13 files changed, 13 insertions(+), 13 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 98a32f9b3a..992f954a3a 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
@@ -11,7 +11,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
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 afa7b03536..7571d1827a 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
@@ -11,7 +11,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
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 c9f87a8551..1c8ed54440 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
@@ -11,7 +11,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
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 afa7b03536..7571d1827a 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
@@ -11,7 +11,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
diff --git a/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj b/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
index ea43d9a54c..bfcf4ef35e 100644
--- a/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
+++ b/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
-    <PackageReference Include="nunit" Version="3.13.1" />
+    <PackageReference Include="nunit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
   </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 c2d9a923d9..77e9d672e3 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
@@ -3,7 +3,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
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 64e934efd2..8f8b99b092 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
@@ -3,7 +3,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
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 f743d65db3..e01e858873 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
@@ -3,7 +3,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
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 eab144592f..2dfa1dfbb7 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
@@ -3,7 +3,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index df6d17f615..895518e1b9 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -4,7 +4,7 @@
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="DeepEqual" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
     <PackageReference Include="Moq" Version="4.16.1" />
diff --git a/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj b/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
index a4e52f8cd4..d5dda39aa5 100644
--- a/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
+++ b/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
@@ -6,7 +6,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
   </ItemGroup>
   <PropertyGroup Label="Project">
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 986bd8e7ba..b242811939 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -33,7 +33,7 @@
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
-    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.iOS.props b/osu.iOS.props
index c32109d6db..423f87923b 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -95,7 +95,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.427.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageReference Include="ppy.osu.Framework.NativeLibs" Version="2021.115.0" ExcludeAssets="all" />

From d2629561469e4dfd0efba561b757d4da10aac481 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 28 Apr 2021 18:27:40 +0900
Subject: [PATCH 2955/3722] Always use LifetimeEntry to manage hit objects in
 HitObjectContainer

Previously, non-pooled DHOs were immediately added as children of the HOC when Add is called. Also, non-pooled DHOs were always attached to the HOC as children.
New behavior is that non-pooled DHOs are only added after CheckChildLifetime, and only attached to the HOC while the DHOs are alive.

- LifetimeManagementContainer inheritance of HOC is removed, as it is now all DHOs are "unmanaged" (previously `AddInternal(false)`).
- The signature of `Clear` is changed, and it is now always not disposing the children immediately.
---
 .../Edit/ManiaBeatSnapGrid.cs                 |  2 +-
 .../HitObjectApplicationTestScene.cs          |  2 +-
 .../Pooling/PoolableDrawableWithLifetime.cs   |  2 +-
 osu.Game/Rulesets/UI/HitObjectContainer.cs    | 66 +++++++++----------
 .../Scrolling/ScrollingHitObjectContainer.cs  |  4 +-
 5 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
index afc08dcc96..9d1f5429a1 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
@@ -101,7 +101,7 @@ namespace osu.Game.Rulesets.Mania.Edit
                 foreach (var line in grid.Objects.OfType<DrawableGridLine>())
                     availableLines.Push(line);
 
-                grid.Clear(false);
+                grid.Clear();
             }
 
             if (selectionTimeRange == null)
diff --git a/osu.Game.Rulesets.Taiko.Tests/HitObjectApplicationTestScene.cs b/osu.Game.Rulesets.Taiko.Tests/HitObjectApplicationTestScene.cs
index a1d000386f..ac01508081 100644
--- a/osu.Game.Rulesets.Taiko.Tests/HitObjectApplicationTestScene.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/HitObjectApplicationTestScene.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
         [SetUpSteps]
         public void SetUp()
-            => AddStep("clear SHOC", () => hitObjectContainer.Clear(false));
+            => AddStep("clear SHOC", () => hitObjectContainer.Clear());
 
         protected void AddHitObject(DrawableHitObject hitObject)
             => AddStep("add to SHOC", () => hitObjectContainer.Add(hitObject));
diff --git a/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs b/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
index 93e476be76..31f1768044 100644
--- a/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Objects.Pooling
         /// <summary>
         /// The entry holding essential state of this <see cref="PoolableDrawableWithLifetime{TEntry}"/>.
         /// </summary>
-        protected TEntry? Entry { get; private set; }
+        public TEntry? Entry { get; private set; }
 
         /// <summary>
         /// Whether <see cref="Entry"/> is applied to this <see cref="PoolableDrawableWithLifetime{TEntry}"/>.
diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 11312a46df..3d74cdedd6 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -17,7 +17,7 @@ using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.UI
 {
-    public class HitObjectContainer : LifetimeManagementContainer, IHitObjectContainer
+    public class HitObjectContainer : CompositeDrawable, IHitObjectContainer
     {
         public IEnumerable<DrawableHitObject> Objects => InternalChildren.Cast<DrawableHitObject>().OrderBy(h => h.HitObject.StartTime);
 
@@ -62,6 +62,7 @@ namespace osu.Game.Rulesets.UI
         private readonly Dictionary<DrawableHitObject, IBindable> startTimeMap = new Dictionary<DrawableHitObject, IBindable>();
         private readonly Dictionary<HitObjectLifetimeEntry, DrawableHitObject> drawableMap = new Dictionary<HitObjectLifetimeEntry, DrawableHitObject>();
         private readonly LifetimeEntryManager lifetimeManager = new LifetimeEntryManager();
+        private readonly Dictionary<HitObjectLifetimeEntry, DrawableHitObject> nonPooledDrawableMap = new Dictionary<HitObjectLifetimeEntry, DrawableHitObject>();
 
         [Resolved(CanBeNull = true)]
         private IPooledHitObjectProvider pooledObjectProvider { get; set; }
@@ -72,6 +73,7 @@ namespace osu.Game.Rulesets.UI
 
             lifetimeManager.EntryBecameAlive += entryBecameAlive;
             lifetimeManager.EntryBecameDead += entryBecameDead;
+            lifetimeManager.EntryCrossedBoundary += entryCrossedBoundary;
         }
 
         protected override void LoadAsyncComplete()
@@ -86,7 +88,13 @@ namespace osu.Game.Rulesets.UI
 
         public void Add(HitObjectLifetimeEntry entry) => lifetimeManager.AddEntry(entry);
 
-        public bool Remove(HitObjectLifetimeEntry entry) => lifetimeManager.RemoveEntry(entry);
+        public bool Remove(HitObjectLifetimeEntry entry)
+        {
+            if (!lifetimeManager.RemoveEntry(entry)) return false;
+            // It has to be done here because non-pooled entry may be removed by specifying its entry.
+            nonPooledDrawableMap.Remove(entry);
+            return true;
+        }
 
         private void entryBecameAlive(LifetimeEntry entry) => addDrawable((HitObjectLifetimeEntry)entry);
 
@@ -96,7 +104,8 @@ namespace osu.Game.Rulesets.UI
         {
             Debug.Assert(!drawableMap.ContainsKey(entry));
 
-            var drawable = pooledObjectProvider?.GetPooledDrawableRepresentation(entry.HitObject, null);
+            nonPooledDrawableMap.TryGetValue(entry, out var drawable);
+            drawable ??= pooledObjectProvider?.GetPooledDrawableRepresentation(entry.HitObject, null);
             if (drawable == null)
                 throw new InvalidOperationException($"A drawable representation could not be retrieved for hitobject type: {entry.HitObject.GetType().ReadableName()}.");
 
@@ -104,7 +113,7 @@ namespace osu.Game.Rulesets.UI
             drawable.OnRevertResult += onRevertResult;
 
             bindStartTime(drawable);
-            AddInternal(drawableMap[entry] = drawable, false);
+            AddInternal(drawableMap[entry] = drawable);
             OnAdd(drawable);
 
             HitObjectUsageBegan?.Invoke(entry.HitObject);
@@ -127,50 +136,42 @@ namespace osu.Game.Rulesets.UI
             unbindStartTime(drawable);
             RemoveInternal(drawable);
 
-            HitObjectUsageFinished?.Invoke(entry.HitObject);
+            // The hit object is not freed when the DHO was not pooled.
+            if (!nonPooledDrawableMap.ContainsKey(entry))
+                HitObjectUsageFinished?.Invoke(entry.HitObject);
         }
 
         #endregion
 
         #region Non-pooling support
 
-        public virtual void Add(DrawableHitObject hitObject)
+        public virtual void Add(DrawableHitObject drawable)
         {
-            bindStartTime(hitObject);
+            if (drawable.Entry == null)
+                throw new InvalidOperationException($"May not add a {nameof(DrawableHitObject)} without {nameof(HitObject)} associated");
 
-            hitObject.OnNewResult += onNewResult;
-            hitObject.OnRevertResult += onRevertResult;
-
-            AddInternal(hitObject);
-            OnAdd(hitObject);
+            nonPooledDrawableMap.Add(drawable.Entry, drawable);
+            Add(drawable.Entry);
         }
 
-        public virtual bool Remove(DrawableHitObject hitObject)
+        public virtual bool Remove(DrawableHitObject drawable)
         {
-            OnRemove(hitObject);
-            if (!RemoveInternal(hitObject))
+            if (drawable.Entry == null)
                 return false;
 
-            hitObject.OnNewResult -= onNewResult;
-            hitObject.OnRevertResult -= onRevertResult;
-
-            unbindStartTime(hitObject);
-
-            return true;
+            return Remove(drawable.Entry);
         }
 
         public int IndexOf(DrawableHitObject hitObject) => IndexOfInternal(hitObject);
 
-        protected override void OnChildLifetimeBoundaryCrossed(LifetimeBoundaryCrossedEvent e)
+        private void entryCrossedBoundary(LifetimeEntry entry, LifetimeBoundaryKind kind, LifetimeBoundaryCrossingDirection direction)
         {
-            if (!(e.Child is DrawableHitObject hitObject))
-                return;
+            if (nonPooledDrawableMap.TryGetValue((HitObjectLifetimeEntry)entry, out var drawable))
+                OnChildLifetimeBoundaryCrossed(new LifetimeBoundaryCrossedEvent(drawable, kind, direction));
+        }
 
-            if ((e.Kind == LifetimeBoundaryKind.End && e.Direction == LifetimeBoundaryCrossingDirection.Forward)
-                || (e.Kind == LifetimeBoundaryKind.Start && e.Direction == LifetimeBoundaryCrossingDirection.Backward))
-            {
-                hitObject.OnKilled();
-            }
+        protected virtual void OnChildLifetimeBoundaryCrossed(LifetimeBoundaryCrossedEvent e)
+        {
         }
 
         #endregion
@@ -195,12 +196,11 @@ namespace osu.Game.Rulesets.UI
         {
         }
 
-        public virtual void Clear(bool disposeChildren = true)
+        public virtual void Clear()
         {
             lifetimeManager.ClearEntries();
-
-            ClearInternal(disposeChildren);
-            unbindAllStartTimes();
+            nonPooledDrawableMap.Clear();
+            Debug.Assert(InternalChildren.Count == 0 && startTimeMap.Count == 0 && drawableMap.Count == 0, "All hit objects should have been removed");
         }
 
         protected override bool CheckChildrenLife()
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index 289578f3d8..a9eaf3da68 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -50,9 +50,9 @@ namespace osu.Game.Rulesets.UI.Scrolling
             timeRange.ValueChanged += _ => layoutCache.Invalidate();
         }
 
-        public override void Clear(bool disposeChildren = true)
+        public override void Clear()
         {
-            base.Clear(disposeChildren);
+            base.Clear();
 
             toComputeLifetime.Clear();
             layoutComputed.Clear();

From f55aa016bec4acd26e5525754a50661398da52b5 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 26 Apr 2021 15:53:07 +0900
Subject: [PATCH 2956/3722] Adopt HitObjectContainer change in a test

Non-pooled objects are attached as children only while alive
---
 osu.Game.Tests/Gameplay/TestSceneHitObjectContainer.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectContainer.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectContainer.cs
index f2bfccb6de..8f3d3f1276 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectContainer.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectContainer.cs
@@ -4,6 +4,7 @@
 using JetBrains.Annotations;
 using NUnit.Framework;
 using osu.Framework.Testing;
+using osu.Framework.Timing;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
@@ -19,7 +20,14 @@ namespace osu.Game.Tests.Gameplay
         [SetUp]
         public void Setup() => Schedule(() =>
         {
-            Child = container = new HitObjectContainer();
+            Child = container = new HitObjectContainer
+            {
+                Clock = new FramedClock(new ManualClock
+                {
+                    // Make sure hit objects with `StartTime == 0` are alive
+                    CurrentTime = -1
+                })
+            };
         });
 
         [Test]

From 799d2a3300dce4b833a2ca7e9e176d1079aa6038 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 21 Apr 2021 13:00:46 +0900
Subject: [PATCH 2957/3722] Replace failed mania test (pooling not accounted)
 with a more robust test

Also fix null reference in Playfield
---
 .../TestSceneDrawableNote.cs                  | 67 +++++++++++++++++++
 .../TestSceneHoldNoteInput.cs                 | 15 +----
 osu.Game/Rulesets/UI/Playfield.cs             |  7 +-
 3 files changed, 73 insertions(+), 16 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania.Tests/TestSceneDrawableNote.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableNote.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableNote.cs
new file mode 100644
index 0000000000..4a6c59e297
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableNote.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 NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Timing;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Tests.Visual;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Mania.Tests
+{
+    public class TestSceneDrawableManiaHitObject : OsuTestScene
+    {
+        private readonly ManualClock clock = new ManualClock();
+
+        private Column column;
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            Child = new ScrollingTestContainer(ScrollingDirection.Down)
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                AutoSizeAxes = Axes.X,
+                RelativeSizeAxes = Axes.Y,
+                TimeRange = 2000,
+                Clock = new FramedClock(clock),
+                Child = column = new Column(0)
+                {
+                    Action = { Value = ManiaAction.Key1 },
+                    Height = 0.85f,
+                    AccentColour = Color4.Gray
+                },
+            };
+        });
+
+        [Test]
+        public void TestHoldNoteHeadVisibility()
+        {
+            DrawableHoldNote note = null;
+            AddStep("Add hold note", () =>
+            {
+                var h = new HoldNote
+                {
+                    StartTime = 0,
+                    Duration = 1000
+                };
+                h.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+                column.Add(note = new DrawableHoldNote(h));
+            });
+            AddStep("Hold key", () =>
+            {
+                clock.CurrentTime = 0;
+                note.OnPressed(ManiaAction.Key1);
+            });
+            AddStep("progress time", () => clock.CurrentTime = 500);
+            AddAssert("head is visible", () => note.Head.Alpha == 1);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index 668487f673..387c5f4195 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -4,14 +4,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
-using osu.Framework.Screens;
-using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Objects;
-using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.Replays;
 using osu.Game.Rulesets.Mania.Scoring;
 using osu.Game.Rulesets.Objects;
@@ -411,17 +408,7 @@ namespace osu.Game.Rulesets.Mania.Tests
                 judgementResults = new List<JudgementResult>();
             });
 
-            AddUntilStep("Beatmap at 0", () => Beatmap.Value.Track.CurrentTime == 0);
-            AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
-
-            AddUntilStep("wait for head", () => currentPlayer.GameplayClockContainer.GameplayClock.CurrentTime >= time_head);
-            AddAssert("head is visible",
-                () => currentPlayer.ChildrenOfType<DrawableHoldNote>()
-                                   .Single(note => note.HitObject == beatmap.HitObjects[0])
-                                   .Head
-                                   .Alpha == 1);
-
-            AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor.HasCompleted.Value);
+            AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor?.HasCompleted.Value == true);
         }
 
         private class ScoreAccessibleReplayPlayer : ReplayPlayer
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 17d3cf01a4..b154288dba 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -354,8 +354,11 @@ namespace osu.Game.Rulesets.UI
 
                     // If this is the first time this DHO is being used, then apply the DHO mods.
                     // This is done before Apply() so that the state is updated once when the hitobject is applied.
-                    foreach (var m in mods.OfType<IApplicableToDrawableHitObjects>())
-                        m.ApplyToDrawableHitObjects(dho.Yield());
+                    if (mods != null)
+                    {
+                        foreach (var m in mods.OfType<IApplicableToDrawableHitObjects>())
+                            m.ApplyToDrawableHitObjects(dho.Yield());
+                    }
                 }
 
                 if (!lifetimeEntryMap.TryGetValue(hitObject, out var entry))

From 971ca398260275c52fb16be82bfb38993777c504 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Sun, 18 Apr 2021 21:46:30 +0900
Subject: [PATCH 2958/3722] Fix failing taiko tests

Non-pooled DHO is now not eagerly loaded
---
 .../TestSceneFlyingHits.cs                    | 20 +++++++++----------
 .../TestSceneHits.cs                          |  8 ++++++--
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneFlyingHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneFlyingHits.cs
index 63854e7ead..5738be05d7 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneFlyingHits.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneFlyingHits.cs
@@ -20,20 +20,19 @@ namespace osu.Game.Rulesets.Taiko.Tests
         [TestCase(HitType.Rim)]
         public void TestFlyingHits(HitType hitType)
         {
-            DrawableFlyingHit flyingHit = null;
-
             AddStep("add flying hit", () =>
             {
                 addFlyingHit(hitType);
-
-                // flying hits all land in one common scrolling container (and stay there for rewind purposes),
-                // so we need to manually get the latest one.
-                flyingHit = this.ChildrenOfType<DrawableFlyingHit>()
-                                .OrderByDescending(h => h.HitObject.StartTime)
-                                .FirstOrDefault();
             });
 
-            AddAssert("hit type is correct", () => flyingHit.HitObject.Type == hitType);
+            AddAssert("hit type is correct", () =>
+            {
+                // flying hits all land in one common scrolling container (and stay there for rewind purposes),
+                // so we need to manually get the latest one.
+                return this.ChildrenOfType<DrawableFlyingHit>()
+                           .OrderByDescending(h => h.HitObject.StartTime)
+                           .FirstOrDefault()?.HitObject.Type == hitType;
+            });
         }
 
         private void addFlyingHit(HitType hitType)
@@ -42,7 +41,8 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
             DrawableDrumRollTick h;
             DrawableRuleset.Playfield.Add(h = new DrawableDrumRollTick(tick) { JudgementType = hitType });
-            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h, new JudgementResult(tick, new TaikoDrumRollTickJudgement()) { Type = HitResult.Great });
+            h.OnLoadComplete += _ =>
+                ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h, new JudgementResult(tick, new TaikoDrumRollTickJudgement()) { Type = HitResult.Great });
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
index 87c936d386..06acdad3d6 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
@@ -129,8 +129,12 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
             DrawableRuleset.Playfield.Add(h);
 
-            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h, new JudgementResult(hit, new TaikoJudgement()) { Type = hitResult });
-            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h.NestedHitObjects.Single(), new JudgementResult(hit.NestedHitObjects.Single(), new TaikoStrongJudgement()) { Type = HitResult.Great });
+            h.OnLoadComplete += _ =>
+            {
+                ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h, new JudgementResult(hit, new TaikoJudgement()) { Type = hitResult });
+                ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h.NestedHitObjects.Single(),
+                    new JudgementResult(hit.NestedHitObjects.Single(), new TaikoStrongJudgement()) { Type = HitResult.Great });
+            };
         }
 
         private void addMissJudgement()

From b88e5a31ea838406b25dfb2e57e992fbb14f89f8 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 28 Apr 2021 12:55:04 +0900
Subject: [PATCH 2959/3722] Add failing test showing lifetime not recomputed
 with pooled objects

---
 .../Gameplay/TestSceneDrawableScrollingRuleset.cs  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
index 9931ee4a45..75a5eec6f7 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
@@ -90,6 +90,20 @@ namespace osu.Game.Tests.Visual.Gameplay
             assertChildPosition(5);
         }
 
+        [TestCase("pooled")]
+        [TestCase("non-pooled")]
+        public void TestLifetimeRecomputedWhenTimeRangeChanges(string pooled)
+        {
+            var beatmap = createBeatmap(_ => pooled == "pooled" ? new TestPooledHitObject() : new TestHitObject());
+            beatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = time_range });
+            createTest(beatmap);
+
+            assertDead(3);
+
+            AddStep("increase time range", () => drawableRuleset.TimeRange.Value = 3 * time_range);
+            assertPosition(3, 1);
+        }
+
         [Test]
         public void TestRelativeBeatLengthScaleSingleTimingPoint()
         {

From 5aa522b1c28cb500ac1985595234b8cd0acacb69 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 28 Apr 2021 20:23:52 +0900
Subject: [PATCH 2960/3722] Completely delegate DHO lifetime to Entry lifetime

A downside is lifetime update is not caught by LifetimeManagementContainer if used.
---
 .../Gameplay/TestSceneDrawableHitObject.cs    | 13 ++++----
 .../Pooling/PoolableDrawableWithLifetime.cs   | 32 ++++++-------------
 2 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs b/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs
index 2e3f192f1b..0bec02c488 100644
--- a/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs
@@ -45,15 +45,16 @@ namespace osu.Game.Tests.Gameplay
             AddStep("Create DHO", () =>
             {
                 dho = new TestDrawableHitObject(null);
-                dho.Apply(entry = new TestLifetimeEntry(new HitObject())
-                {
-                    LifetimeStart = 0,
-                    LifetimeEnd = 1000,
-                });
+                dho.Apply(entry = new TestLifetimeEntry(new HitObject()));
                 Child = dho;
             });
 
-            AddStep("KeepAlive = true", () => entry.KeepAlive = true);
+            AddStep("KeepAlive = true", () =>
+            {
+                entry.LifetimeStart = 0;
+                entry.LifetimeEnd = 1000;
+                entry.KeepAlive = true;
+            });
             AddAssert("Lifetime is overriden", () => entry.LifetimeStart == double.MinValue && entry.LifetimeEnd == double.MaxValue);
 
             AddStep("Set LifetimeStart", () => dho.LifetimeStart = 500);
diff --git a/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs b/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
index 31f1768044..e94b6dca9d 100644
--- a/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
@@ -28,14 +28,20 @@ namespace osu.Game.Rulesets.Objects.Pooling
 
         public override double LifetimeStart
         {
-            get => base.LifetimeStart;
-            set => setLifetime(value, LifetimeEnd);
+            get => Entry?.LifetimeStart ?? double.MinValue;
+            set
+            {
+                if (Entry != null) Entry.LifetimeStart = value;
+            }
         }
 
         public override double LifetimeEnd
         {
-            get => base.LifetimeEnd;
-            set => setLifetime(LifetimeStart, value);
+            get => Entry?.LifetimeEnd ?? double.MaxValue;
+            set
+            {
+                if (Entry != null) Entry.LifetimeEnd = value;
+            }
         }
 
         public override bool RemoveWhenNotAlive => false;
@@ -64,11 +70,8 @@ namespace osu.Game.Rulesets.Objects.Pooling
             if (HasEntryApplied)
                 free();
 
-            setLifetime(entry.LifetimeStart, entry.LifetimeEnd);
             Entry = entry;
-
             OnApply(entry);
-
             HasEntryApplied = true;
         }
 
@@ -95,27 +98,12 @@ namespace osu.Game.Rulesets.Objects.Pooling
         {
         }
 
-        private void setLifetime(double start, double end)
-        {
-            base.LifetimeStart = start;
-            base.LifetimeEnd = end;
-
-            if (Entry != null)
-            {
-                Entry.LifetimeStart = start;
-                Entry.LifetimeEnd = end;
-            }
-        }
-
         private void free()
         {
             Debug.Assert(Entry != null && HasEntryApplied);
 
             OnFree(Entry);
-
             Entry = null;
-            setLifetime(double.MaxValue, double.MaxValue);
-
             HasEntryApplied = false;
         }
     }

From 1d023dcedbb64fcac9d4956c73de22407e51b035 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Mon, 26 Apr 2021 19:53:38 +0900
Subject: [PATCH 2961/3722] Fix mania editor null reference

---
 .../Edit/Blueprints/ManiaSelectionBlueprint.cs                 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
index 384f49d9b2..8f8f45c0dd 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
@@ -18,6 +18,9 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; }
 
+        // Overriding the base because this method is called right after `Column` is changed and `DrawableObject` is not yet loaded and Parent is not set.
+        public override Vector2 GetInstantDelta(Vector2 screenSpacePosition) => Parent.ToLocalSpace(screenSpacePosition) - Position;
+
         protected ManiaSelectionBlueprint(DrawableHitObject drawableObject)
             : base(drawableObject)
         {

From 4cc94efb06258cc7cf5c445e6318f3ac5cf6d852 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Wed, 28 Apr 2021 20:38:44 +0900
Subject: [PATCH 2962/3722] Fix failing mania test

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

diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNotePlacementBlueprint.cs
index 36c34a8fb9..a162c5ec44 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNotePlacementBlueprint.cs
@@ -15,7 +15,6 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Tests.Visual;
-using osuTK;
 using osuTK.Input;
 
 namespace osu.Game.Rulesets.Mania.Tests.Editor
@@ -35,7 +34,11 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         [Test]
         public void TestPlaceBeforeCurrentTimeDownwards()
         {
-            AddStep("move mouse before current time", () => InputManager.MoveMouseTo(this.ChildrenOfType<Column>().Single().ScreenSpaceDrawQuad.BottomLeft - new Vector2(0, 10)));
+            AddStep("move mouse before current time", () =>
+            {
+                var column = this.ChildrenOfType<Column>().Single();
+                InputManager.MoveMouseTo(column.ScreenSpacePositionAtTime(-100));
+            });
 
             AddStep("click", () => InputManager.Click(MouseButton.Left));
 
@@ -45,7 +48,11 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
         [Test]
         public void TestPlaceAfterCurrentTimeDownwards()
         {
-            AddStep("move mouse after current time", () => InputManager.MoveMouseTo(this.ChildrenOfType<Column>().Single()));
+            AddStep("move mouse after current time", () =>
+            {
+                var column = this.ChildrenOfType<Column>().Single();
+                InputManager.MoveMouseTo(column.ScreenSpacePositionAtTime(100));
+            });
 
             AddStep("click", () => InputManager.Click(MouseButton.Left));
 

From c83c8040573ad0cdd3c650487b1aa9a28d756d71 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 29 Apr 2021 14:42:41 +0900
Subject: [PATCH 2963/3722] Expose lifetime entries from HOC

---
 osu.Game/Rulesets/UI/HitObjectContainer.cs | 24 +++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 3d74cdedd6..1d32313f2b 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -19,6 +19,16 @@ namespace osu.Game.Rulesets.UI
 {
     public class HitObjectContainer : CompositeDrawable, IHitObjectContainer
     {
+        /// <summary>
+        /// All entries in this <see cref="HitObjectContainer"/> including dead entries.
+        /// </summary>
+        public IEnumerable<HitObjectLifetimeEntry> Entries => allEntries;
+
+        /// <summary>
+        /// All alive entries and <see cref="DrawableHitObject"/>s used by the entries.
+        /// </summary>
+        public IEnumerable<(HitObjectLifetimeEntry Entry, DrawableHitObject Drawable)> AliveEntries => drawableMap.Select(x => (x.Key, x.Value));
+
         public IEnumerable<DrawableHitObject> Objects => InternalChildren.Cast<DrawableHitObject>().OrderBy(h => h.HitObject.StartTime);
 
         public IEnumerable<DrawableHitObject> AliveObjects => AliveInternalChildren.Cast<DrawableHitObject>().OrderBy(h => h.HitObject.StartTime);
@@ -60,10 +70,13 @@ namespace osu.Game.Rulesets.UI
         internal double FutureLifetimeExtension { get; set; }
 
         private readonly Dictionary<DrawableHitObject, IBindable> startTimeMap = new Dictionary<DrawableHitObject, IBindable>();
+
         private readonly Dictionary<HitObjectLifetimeEntry, DrawableHitObject> drawableMap = new Dictionary<HitObjectLifetimeEntry, DrawableHitObject>();
-        private readonly LifetimeEntryManager lifetimeManager = new LifetimeEntryManager();
         private readonly Dictionary<HitObjectLifetimeEntry, DrawableHitObject> nonPooledDrawableMap = new Dictionary<HitObjectLifetimeEntry, DrawableHitObject>();
 
+        private readonly LifetimeEntryManager lifetimeManager = new LifetimeEntryManager();
+        private readonly HashSet<HitObjectLifetimeEntry> allEntries = new HashSet<HitObjectLifetimeEntry>();
+
         [Resolved(CanBeNull = true)]
         private IPooledHitObjectProvider pooledObjectProvider { get; set; }
 
@@ -86,13 +99,18 @@ namespace osu.Game.Rulesets.UI
 
         #region Pooling support
 
-        public void Add(HitObjectLifetimeEntry entry) => lifetimeManager.AddEntry(entry);
+        public void Add(HitObjectLifetimeEntry entry)
+        {
+            allEntries.Add(entry);
+            lifetimeManager.AddEntry(entry);
+        }
 
         public bool Remove(HitObjectLifetimeEntry entry)
         {
             if (!lifetimeManager.RemoveEntry(entry)) return false;
-            // It has to be done here because non-pooled entry may be removed by specifying its entry.
+            // The entry has to be removed from the non-pooled map here because non-pooled entry may be removed by specifying its entry.
             nonPooledDrawableMap.Remove(entry);
+            allEntries.Remove(entry);
             return true;
         }
 

From 632bb70e0f7d051c1ee82502122ce5946227cd95 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 29 Apr 2021 15:04:32 +0900
Subject: [PATCH 2964/3722] Use entry to calculate lifetime in ScrollingHOC

DHOs cannot be used to calculate lifetime, it is not created before the entry became alive.
---
 .../Scrolling/ScrollingHitObjectContainer.cs  | 60 ++++++++-----------
 1 file changed, 24 insertions(+), 36 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index a9eaf3da68..915bab9a51 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -5,7 +5,9 @@ using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Primitives;
 using osu.Framework.Layout;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osuTK;
@@ -17,16 +19,18 @@ namespace osu.Game.Rulesets.UI.Scrolling
         private readonly IBindable<double> timeRange = new BindableDouble();
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
-        /// <summary>
-        /// Hit objects which require lifetime computation in the next update call.
-        /// </summary>
-        private readonly HashSet<DrawableHitObject> toComputeLifetime = new HashSet<DrawableHitObject>();
-
         /// <summary>
         /// A set containing all <see cref="HitObjectContainer.AliveObjects"/> which have an up-to-date layout.
         /// </summary>
         private readonly HashSet<DrawableHitObject> layoutComputed = new HashSet<DrawableHitObject>();
 
+        /// <summary>
+        /// A conservative estimate of maximum bounding box of a <see cref="DrawableHitObject"/>
+        /// with respect to the start time position of the hit object.
+        /// It is used to calculate when the object appears inbound.
+        /// </summary>
+        protected virtual RectangleF GetDrawRectangle(HitObjectLifetimeEntry entry) => new RectangleF().Inflate(100);
+
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; }
 
@@ -54,7 +58,6 @@ namespace osu.Game.Rulesets.UI.Scrolling
         {
             base.Clear();
 
-            toComputeLifetime.Clear();
             layoutComputed.Clear();
         }
 
@@ -166,7 +169,6 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
         private void onRemoveRecursive(DrawableHitObject hitObject)
         {
-            toComputeLifetime.Remove(hitObject);
             layoutComputed.Remove(hitObject);
 
             hitObject.DefaultsApplied -= invalidateHitObject;
@@ -175,14 +177,11 @@ namespace osu.Game.Rulesets.UI.Scrolling
                 onRemoveRecursive(nested);
         }
 
-        /// <summary>
-        /// Make this <see cref="DrawableHitObject"/> lifetime and layout computed in next update.
-        /// </summary>
         private void invalidateHitObject(DrawableHitObject hitObject)
         {
-            // Lifetime computation is delayed until next update because
-            // when the hit object is not pooled this container is not loaded here and `scrollLength` cannot be computed.
-            toComputeLifetime.Add(hitObject);
+            if (hitObject.ParentHitObject == null)
+                updateLifetime(hitObject.Entry);
+
             layoutComputed.Remove(hitObject);
         }
 
@@ -194,13 +193,8 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
             if (!layoutCache.IsValid)
             {
-                toComputeLifetime.Clear();
-
-                foreach (var hitObject in Objects)
-                {
-                    if (hitObject.HitObject != null)
-                        toComputeLifetime.Add(hitObject);
-                }
+                foreach (var entry in Entries)
+                    updateLifetime(entry);
 
                 layoutComputed.Clear();
 
@@ -220,11 +214,6 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
                 layoutCache.Validate();
             }
-
-            foreach (var hitObject in toComputeLifetime)
-                hitObject.LifetimeStart = computeOriginAdjustedLifetimeStart(hitObject);
-
-            toComputeLifetime.Clear();
         }
 
         protected override void UpdateAfterChildrenLife()
@@ -247,32 +236,31 @@ namespace osu.Game.Rulesets.UI.Scrolling
             }
         }
 
-        private double computeOriginAdjustedLifetimeStart(DrawableHitObject hitObject)
+        private void updateLifetime(HitObjectLifetimeEntry entry)
         {
-            float originAdjustment = 0.0f;
+            var rectangle = GetDrawRectangle(entry);
+            float startOffset = 0;
 
-            // calculate the dimension of the part of the hitobject that should already be visible
-            // when the hitobject origin first appears inside the scrolling container
             switch (direction.Value)
             {
-                case ScrollingDirection.Up:
-                    originAdjustment = hitObject.OriginPosition.Y;
+                case ScrollingDirection.Right:
+                    startOffset = rectangle.Right;
                     break;
 
                 case ScrollingDirection.Down:
-                    originAdjustment = hitObject.DrawHeight - hitObject.OriginPosition.Y;
+                    startOffset = rectangle.Bottom;
                     break;
 
                 case ScrollingDirection.Left:
-                    originAdjustment = hitObject.OriginPosition.X;
+                    startOffset = -rectangle.Left;
                     break;
 
-                case ScrollingDirection.Right:
-                    originAdjustment = hitObject.DrawWidth - hitObject.OriginPosition.X;
+                case ScrollingDirection.Up:
+                    startOffset = -rectangle.Top;
                     break;
             }
 
-            return scrollingInfo.Algorithm.GetDisplayStartTime(hitObject.HitObject.StartTime, originAdjustment, timeRange.Value, scrollLength);
+            entry.LifetimeStart = scrollingInfo.Algorithm.GetDisplayStartTime(entry.HitObject.StartTime, startOffset, timeRange.Value, scrollLength);
         }
 
         private void updateLayoutRecursive(DrawableHitObject hitObject)

From 73dfb04df8ba3b45ab9fbdd5bb1934d55f61defc Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 29 Apr 2021 15:17:30 +0900
Subject: [PATCH 2965/3722] Fix uninitialized scrollLength value is used

---
 .../Scrolling/ScrollingHitObjectContainer.cs  | 33 +++++--------------
 1 file changed, 9 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index 915bab9a51..538d4d1d11 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -185,8 +185,6 @@ namespace osu.Game.Rulesets.UI.Scrolling
             layoutComputed.Remove(hitObject);
         }
 
-        private float scrollLength;
-
         protected override void Update()
         {
             base.Update();
@@ -199,29 +197,16 @@ namespace osu.Game.Rulesets.UI.Scrolling
                 layoutComputed.Clear();
 
                 scrollingInfo.Algorithm.Reset();
-
-                switch (direction.Value)
-                {
-                    case ScrollingDirection.Up:
-                    case ScrollingDirection.Down:
-                        scrollLength = DrawSize.Y;
-                        break;
-
-                    default:
-                        scrollLength = DrawSize.X;
-                        break;
-                }
-
                 layoutCache.Validate();
             }
         }
 
+        // We need to calculate hit object positions (including nested hit objects) as soon as possible after lifetimes
+        // to prevent hit objects displayed in a wrong position for one frame.
         protected override void UpdateAfterChildrenLife()
         {
             base.UpdateAfterChildrenLife();
 
-            // We need to calculate hit object positions (including nested hit objects) as soon as possible after lifetimes
-            // to prevent hit objects displayed in a wrong position for one frame.
             // Only AliveObjects need to be considered for layout (reduces overhead in the case of scroll speed changes).
             foreach (var obj in AliveObjects)
             {
@@ -260,7 +245,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
                     break;
             }
 
-            entry.LifetimeStart = scrollingInfo.Algorithm.GetDisplayStartTime(entry.HitObject.StartTime, startOffset, timeRange.Value, scrollLength);
+            entry.LifetimeStart = scrollingInfo.Algorithm.GetDisplayStartTime(entry.HitObject.StartTime, startOffset, timeRange.Value, getLength());
         }
 
         private void updateLayoutRecursive(DrawableHitObject hitObject)
@@ -271,12 +256,12 @@ namespace osu.Game.Rulesets.UI.Scrolling
                 {
                     case ScrollingDirection.Up:
                     case ScrollingDirection.Down:
-                        hitObject.Height = scrollingInfo.Algorithm.GetLength(hitObject.HitObject.StartTime, e.EndTime, timeRange.Value, scrollLength);
+                        hitObject.Height = scrollingInfo.Algorithm.GetLength(hitObject.HitObject.StartTime, e.EndTime, timeRange.Value, getLength());
                         break;
 
                     case ScrollingDirection.Left:
                     case ScrollingDirection.Right:
-                        hitObject.Width = scrollingInfo.Algorithm.GetLength(hitObject.HitObject.StartTime, e.EndTime, timeRange.Value, scrollLength);
+                        hitObject.Width = scrollingInfo.Algorithm.GetLength(hitObject.HitObject.StartTime, e.EndTime, timeRange.Value, getLength());
                         break;
                 }
             }
@@ -295,19 +280,19 @@ namespace osu.Game.Rulesets.UI.Scrolling
             switch (direction.Value)
             {
                 case ScrollingDirection.Up:
-                    hitObject.Y = scrollingInfo.Algorithm.PositionAt(hitObject.HitObject.StartTime, currentTime, timeRange.Value, scrollLength);
+                    hitObject.Y = scrollingInfo.Algorithm.PositionAt(hitObject.HitObject.StartTime, currentTime, timeRange.Value, getLength());
                     break;
 
                 case ScrollingDirection.Down:
-                    hitObject.Y = -scrollingInfo.Algorithm.PositionAt(hitObject.HitObject.StartTime, currentTime, timeRange.Value, scrollLength);
+                    hitObject.Y = -scrollingInfo.Algorithm.PositionAt(hitObject.HitObject.StartTime, currentTime, timeRange.Value, getLength());
                     break;
 
                 case ScrollingDirection.Left:
-                    hitObject.X = scrollingInfo.Algorithm.PositionAt(hitObject.HitObject.StartTime, currentTime, timeRange.Value, scrollLength);
+                    hitObject.X = scrollingInfo.Algorithm.PositionAt(hitObject.HitObject.StartTime, currentTime, timeRange.Value, getLength());
                     break;
 
                 case ScrollingDirection.Right:
-                    hitObject.X = -scrollingInfo.Algorithm.PositionAt(hitObject.HitObject.StartTime, currentTime, timeRange.Value, scrollLength);
+                    hitObject.X = -scrollingInfo.Algorithm.PositionAt(hitObject.HitObject.StartTime, currentTime, timeRange.Value, getLength());
                     break;
             }
         }

From 171e954e89b7e378f599e30d8525850b4aece2ff Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Thu, 29 Apr 2021 13:48:00 +0700
Subject: [PATCH 2966/3722] add unordered list test

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

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
index 4add9f22a5..11c06abee7 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
@@ -108,5 +108,25 @@ Line below";
 | Left                 |         Center         |                 Right |";
             });
         }
+
+        [Test]
+        public void TestUnorderedList()
+        {
+            AddStep("Add Unordered List", () =>
+            {
+                markdownContainer.Text = @"- First item level 1
+- Second item level 1
+    - First item level 2
+        - First item level 3
+        - Second item level 3
+        - Third item level 3
+            - First item level 4
+            - Second item level 4
+            - Third item level 4
+    - Second item level 2
+    - Third item level 2
+- Third item level 1";
+            });
+        }
     }
 }

From 9c62c90cfc441a2688afbefb636f430aeea534b5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Apr 2021 15:29:25 +0900
Subject: [PATCH 2967/3722] Refactor `SelectionBlueprint` and
 `MoveSelectionEvent` to work in screen-space coordinates

Until now, the implementation of the overrides in `SelectionBlueprint`
have been confusing to the point where I would just implement by
trial-and-error (or copying from an existing implementation). This was
due to a combination of using "object" space coordinates
(ie. the thing the `Blueprint` is operating on) and screen-space coordinates.

This change switches all event related coordinates to screen-space,
which is how we already handle rotation/scale operations. With the
introduction of other editor types where the related objects are
drawables, this also makes a lot more sense.
---
 .../Edit/ManiaSelectionHandler.cs                 |  2 +-
 osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs |  3 ++-
 osu.Game/Extensions/DrawableExtensions.cs         | 11 +++++++++++
 .../Rulesets/Edit/OverlaySelectionBlueprint.cs    |  2 --
 osu.Game/Rulesets/Edit/SelectionBlueprint.cs      |  4 +---
 .../Edit/Compose/Components/BlueprintContainer.cs | 11 +++++++----
 .../Components/ComposeBlueprintContainer.cs       |  2 +-
 .../Edit/Compose/Components/MoveSelectionEvent.cs | 15 ++++-----------
 8 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
index dd059c967c..7042110423 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Mania.Edit
         {
             var maniaPlayfield = ((ManiaHitObjectComposer)composer).Playfield;
 
-            var currentColumn = maniaPlayfield.GetColumnByPosition(moveEvent.ScreenSpacePosition);
+            var currentColumn = maniaPlayfield.GetColumnByPosition(moveEvent.Blueprint.ScreenSpaceSelectionPoint + moveEvent.ScreenSpaceDelta);
             if (currentColumn == null)
                 return;
 
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 5164c7f204..c2c1f6d602 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Utils;
+using osu.Game.Extensions;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
@@ -42,7 +43,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             // this will potentially move the selection out of bounds...
             foreach (var h in hitObjects)
-                h.Position += moveEvent.InstantDelta;
+                h.Position += this.ScreenSpaceDeltaToParentSpace(moveEvent.ScreenSpaceDelta);
 
             // but this will be corrected.
             moveSelectionInBounds();
diff --git a/osu.Game/Extensions/DrawableExtensions.cs b/osu.Game/Extensions/DrawableExtensions.cs
index 67b9e727a5..a8de3f6407 100644
--- a/osu.Game/Extensions/DrawableExtensions.cs
+++ b/osu.Game/Extensions/DrawableExtensions.cs
@@ -2,8 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Framework.Graphics;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Threading;
+using osuTK;
 
 namespace osu.Game.Extensions
 {
@@ -32,5 +34,14 @@ namespace osu.Game.Extensions
             scheduler.Add(repeatDelegate);
             return repeatDelegate;
         }
+
+        /// <summary>
+        /// Accepts a delta vector in screen-space coordinates and converts it to one which can be applied to this drawable's position.
+        /// </summary>
+        /// <param name="drawable">The drawable.</param>
+        /// <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);
     }
 }
diff --git a/osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs b/osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs
index 6369112d80..7911cf874b 100644
--- a/osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs
@@ -34,7 +34,5 @@ namespace osu.Game.Rulesets.Edit
         public override Vector2 ScreenSpaceSelectionPoint => DrawableObject.ScreenSpaceDrawQuad.Centre;
 
         public override Quad SelectionQuad => DrawableObject.ScreenSpaceDrawQuad;
-
-        public override Vector2 GetInstantDelta(Vector2 screenSpacePosition) => DrawableObject.Parent.ToLocalSpace(screenSpacePosition) - DrawableObject.Position;
     }
 }
diff --git a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
index b176ecb148..55703a2cd3 100644
--- a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
@@ -127,7 +127,7 @@ namespace osu.Game.Rulesets.Edit
         public virtual MenuItem[] ContextMenuItems => Array.Empty<MenuItem>();
 
         /// <summary>
-        /// The screen-space point that causes this <see cref="OverlaySelectionBlueprint"/> to be selected.
+        /// The screen-space point that causes this <see cref="OverlaySelectionBlueprint"/> to be selected via a drag.
         /// </summary>
         public virtual Vector2 ScreenSpaceSelectionPoint => ScreenSpaceDrawQuad.Centre;
 
@@ -136,8 +136,6 @@ namespace osu.Game.Rulesets.Edit
         /// </summary>
         public virtual Quad SelectionQuad => ScreenSpaceDrawQuad;
 
-        public virtual Vector2 GetInstantDelta(Vector2 screenSpacePosition) => Parent.ToLocalSpace(screenSpacePosition) - Position;
-
         /// <summary>
         /// Handle to perform a partial deletion when the user requests a quick delete (Shift+Right Click).
         /// </summary>
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 1f9cd0258e..361e98e0dd 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -436,14 +436,17 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 // check for positional snap for every object in selection (for things like object-object snapping)
                 for (var i = 0; i < movementBlueprintOriginalPositions.Length; i++)
                 {
-                    var testPosition = movementBlueprintOriginalPositions[i] + distanceTravelled;
+                    Vector2 originalPosition = movementBlueprintOriginalPositions[i];
+                    var testPosition = originalPosition + distanceTravelled;
 
                     var positionalResult = snapProvider.SnapScreenSpacePositionToValidPosition(testPosition);
 
                     if (positionalResult.ScreenSpacePosition == testPosition) continue;
 
+                    var delta = positionalResult.ScreenSpacePosition - movementBlueprints[i].ScreenSpaceSelectionPoint;
+
                     // attempt to move the objects, and abort any time based snapping if we can.
-                    if (SelectionHandler.HandleMovement(new MoveSelectionEvent<T>(movementBlueprints[i], positionalResult.ScreenSpacePosition)))
+                    if (SelectionHandler.HandleMovement(new MoveSelectionEvent<T>(movementBlueprints[i], delta)))
                         return true;
                 }
             }
@@ -459,14 +462,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             if (result == null)
             {
-                return SelectionHandler.HandleMovement(new MoveSelectionEvent<T>(movementBlueprints.First(), movePosition));
+                return SelectionHandler.HandleMovement(new MoveSelectionEvent<T>(movementBlueprints.First(), movePosition - movementBlueprints.First().ScreenSpaceSelectionPoint));
             }
 
             return ApplySnapResult(movementBlueprints, result);
         }
 
         protected virtual bool ApplySnapResult(SelectionBlueprint<T>[] blueprints, SnapResult result) =>
-            SelectionHandler.HandleMovement(new MoveSelectionEvent<T>(blueprints.First(), result.ScreenSpacePosition));
+            SelectionHandler.HandleMovement(new MoveSelectionEvent<T>(blueprints.First(), result.ScreenSpacePosition - blueprints.First().ScreenSpaceSelectionPoint));
 
         /// <summary>
         /// Finishes the current movement of selected blueprints.
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index f8ac0552ae..6c174e563e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -115,7 +115,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             // convert to game space coordinates
             delta = firstBlueprint.ToScreenSpace(delta) - firstBlueprint.ToScreenSpace(Vector2.Zero);
 
-            SelectionHandler.HandleMovement(new MoveSelectionEvent<HitObject>(firstBlueprint, firstBlueprint.ScreenSpaceSelectionPoint + delta));
+            SelectionHandler.HandleMovement(new MoveSelectionEvent<HitObject>(firstBlueprint, delta));
         }
 
         private void updatePlacementNewCombo()
diff --git a/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs b/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
index a32c30b579..4d4f4b76c6 100644
--- a/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
@@ -17,21 +17,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
         public readonly SelectionBlueprint<T> Blueprint;
 
         /// <summary>
-        /// The expected screen-space position of the blueprint's item at the current cursor position.
+        /// The screen-space delta of this move event.
         /// </summary>
-        public readonly Vector2 ScreenSpacePosition;
+        public readonly Vector2 ScreenSpaceDelta;
 
-        /// <summary>
-        /// The distance between <see cref="ScreenSpacePosition"/> and the blueprint's current position, in the coordinate-space of the blueprint item's parent.
-        /// </summary>
-        public readonly Vector2 InstantDelta;
-
-        public MoveSelectionEvent(SelectionBlueprint<T> blueprint, Vector2 screenSpacePosition)
+        public MoveSelectionEvent(SelectionBlueprint<T> blueprint, Vector2 screenSpaceDelta)
         {
             Blueprint = blueprint;
-            ScreenSpacePosition = screenSpacePosition;
-
-            InstantDelta = Blueprint.GetInstantDelta(ScreenSpacePosition);
+            ScreenSpaceDelta = screenSpaceDelta;
         }
     }
 }

From 2d17219c8fa8dd28de771604a12fd618e3cab6e2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Apr 2021 19:56:49 +0900
Subject: [PATCH 2968/3722] Setup basic test and classes for scale adjustment

---
 .../Gameplay/TestSceneSkinnableHUDOverlay.cs  | 42 +++++++++++++++++++
 .../Play/HUD/SkinnableAccuracyCounter.cs      |  2 +-
 .../Screens/Play/HUD/SkinnableHUDComponent.cs | 32 ++++++++++++++
 .../Screens/Play/HUD/SkinnableScoreCounter.cs |  2 +-
 4 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
index fec1610160..029bf129c8 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
@@ -4,17 +4,21 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Testing;
 using osu.Game.Configuration;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Play;
+using osu.Game.Screens.Play.HUD;
+using osuTK.Graphics;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -32,6 +36,32 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Resolved]
         private OsuConfigManager config { get; set; }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Add(new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Width = 0.3f,
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        Colour = Color4.Black,
+                        RelativeSizeAxes = Axes.Both,
+                        Alpha = 0.7f,
+                    },
+                    new FillFlowContainer
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Direction = FillDirection.Vertical,
+                        Children = createSkinSourceComponents(),
+                    },
+                }
+            });
+        }
+
         [Test]
         public void TestComboCounterIncrementing()
         {
@@ -74,6 +104,18 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("key counter flow not affected", () => keyCounterFlow.IsPresent);
         }
 
+        private IReadOnlyList<Drawable> createSkinSourceComponents()
+        {
+            var hudComponents = typeof(SkinnableHUDComponent).Assembly.GetTypes().Where(t => typeof(SkinnableHUDComponent).IsAssignableFrom(t)).ToArray();
+
+            List<Drawable> drawables = new List<Drawable>();
+
+            foreach (var component in hudComponents)
+                drawables.AddRange(component.CreateSettingsControls());
+
+            return drawables;
+        }
+
         private void createNew(Action<HUDOverlay> action = null)
         {
             AddStep("create overlay", () =>
diff --git a/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
index 76c9c30813..ebb3bcd148 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
@@ -6,7 +6,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class SkinnableAccuracyCounter : SkinnableDrawable, IAccuracyCounter
+    public class SkinnableAccuracyCounter : SkinnableHUDComponent, IAccuracyCounter
     {
         public Bindable<double> Current { get; } = new Bindable<double>();
 
diff --git a/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs b/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs
new file mode 100644
index 0000000000..ea14a15348
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs
@@ -0,0 +1,32 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Configuration;
+using osu.Game.Skinning;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    /// <summary>
+    /// A skinnable HUD component which can be scaled and repositioned at a skinner/user's will.
+    /// </summary>
+    public abstract class SkinnableHUDComponent : SkinnableDrawable
+    {
+        [SettingSource("Scale", "The scale at which this component should be displayed.")]
+        public BindableNumber<float> SkinScale { get; } = new BindableFloat(1)
+        {
+            Precision = 0.1f,
+            MinValue = 0.1f,
+            MaxValue = 10,
+            Default = 1,
+            Value = 1,
+        };
+
+        protected SkinnableHUDComponent(ISkinComponent component, Func<ISkinComponent, Drawable> defaultImplementation, Func<ISkinSource, bool> allowFallback = null, ConfineMode confineMode = ConfineMode.NoScaling)
+            : base(component, defaultImplementation, allowFallback, confineMode)
+        {
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs
index b46f5684b1..9165b2c7f0 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs
@@ -10,7 +10,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class SkinnableScoreCounter : SkinnableDrawable, IScoreCounter
+    public class SkinnableScoreCounter : SkinnableHUDComponent, IScoreCounter
     {
         public Bindable<double> Current { get; } = new Bindable<double>();
 

From fca173225a2a8e8bf032f2e1019d197a64af1023 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Apr 2021 15:40:35 +0900
Subject: [PATCH 2969/3722] Refactor editor selection/blueprint components to
 be generic

---
 .../Gameplay/TestSceneSkinnableHUDOverlay.cs    | 17 ++++++++++++++---
 .../Screens/Play/HUD/SkinnableComboCounter.cs   |  2 +-
 .../Screens/Play/HUD/SkinnableHealthDisplay.cs  |  2 +-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
index 029bf129c8..4f8a78368e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.IEnumerableExtensions;
@@ -13,6 +12,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Testing;
 using osu.Game.Configuration;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
@@ -50,7 +50,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     {
                         Colour = Color4.Black,
                         RelativeSizeAxes = Axes.Both,
-                        Alpha = 0.7f,
+                        Alpha = 0.9f,
                     },
                     new FillFlowContainer
                     {
@@ -106,12 +106,23 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private IReadOnlyList<Drawable> createSkinSourceComponents()
         {
-            var hudComponents = typeof(SkinnableHUDComponent).Assembly.GetTypes().Where(t => typeof(SkinnableHUDComponent).IsAssignableFrom(t)).ToArray();
+            Drawable[] hudComponents = typeof(SkinnableHUDComponent).Assembly
+                                                                    .GetTypes()
+                                                                    .Where(t => typeof(SkinnableHUDComponent).IsAssignableFrom(t))
+                                                                    .Where(t => !t.IsAbstract)
+                                                                    .Select(t => Activator.CreateInstance(t) as Drawable)
+                                                                    .ToArray();
 
             List<Drawable> drawables = new List<Drawable>();
 
             foreach (var component in hudComponents)
+            {
+                drawables.Add(new OsuSpriteText
+                {
+                    Text = component.GetType().Name
+                });
                 drawables.AddRange(component.CreateSettingsControls());
+            }
 
             return drawables;
         }
diff --git a/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
index c04c50141a..629bb467bc 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
@@ -6,7 +6,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class SkinnableComboCounter : SkinnableDrawable, IComboCounter
+    public class SkinnableComboCounter : SkinnableHUDComponent, IComboCounter
     {
         public Bindable<int> Current { get; } = new Bindable<int>();
 
diff --git a/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs b/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
index 1f91f5e50f..f8a8696dae 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
@@ -9,7 +9,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class SkinnableHealthDisplay : SkinnableDrawable, IHealthDisplay
+    public class SkinnableHealthDisplay : SkinnableHUDComponent, IHealthDisplay
     {
         public Bindable<double> Current { get; } = new BindableDouble(1)
         {

From 99b428ee4b853033abfac1e0ee08a57c185d7a91 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Apr 2021 18:03:49 +0900
Subject: [PATCH 2970/3722] Add very basic skin editor test

---
 .../Visual/Gameplay/TestSceneSkinEditor.cs    | 222 ++++++++++++++++++
 1 file changed, 222 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
new file mode 100644
index 0000000000..2391945b91
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
@@ -0,0 +1,222 @@
+// Copyright (c) ppy 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;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Primitives;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Logging;
+using osu.Framework.Testing;
+using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Screens.Edit.Compose.Components;
+using osu.Game.Screens.Play;
+using osu.Game.Screens.Play.HUD;
+using osuTK;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public class TestSceneSkinEditor : OsuTestScene
+    {
+        private HUDOverlay hudOverlay;
+
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("create hud", () =>
+            {
+                hudOverlay = new HUDOverlay(null, null, null, Array.Empty<Mod>());
+
+                // Add any key just to display the key counter visually.
+                hudOverlay.KeyCounter.Add(new KeyCounterKeyboard(Key.Space));
+
+                hudOverlay.ComboCounter.Current.Value = 1;
+            });
+
+            AddStep("create editor overlay", () => Add(new SkinEditor(hudOverlay)));
+        }
+
+        public class SkinEditor : CompositeDrawable
+        {
+            private readonly Drawable target;
+
+            public SkinEditor(Drawable target)
+            {
+                this.target = target;
+
+                RelativeSizeAxes = Axes.Both;
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                InternalChildren = new[]
+                {
+                    target,
+                    new SkinBlueprintContainer(target),
+                };
+            }
+
+            public class SkinBlueprintContainer : BlueprintContainer<SkinnableHUDComponent>
+            {
+                private readonly Drawable target;
+
+                public SkinBlueprintContainer(Drawable target)
+                {
+                    this.target = target;
+                }
+
+                protected override void LoadComplete()
+                {
+                    base.LoadComplete();
+
+                    SkinnableHUDComponent[] components = target.ChildrenOfType<SkinnableHUDComponent>().ToArray();
+
+                    foreach (var c in components)
+                    {
+                        Logger.Log($"Adding blueprint for {c.GetType()}");
+                        AddBlueprintFor(c);
+                    }
+                }
+
+                protected override SelectionHandler<SkinnableHUDComponent> CreateSelectionHandler() => new SkinSelectionHandler();
+
+                public class SkinSelectionHandler : SelectionHandler<SkinnableHUDComponent>
+                {
+                    protected override void DeleteItems(IEnumerable<SkinnableHUDComponent> items)
+                    {
+                        foreach (var i in items)
+                            i.Drawable.Expire();
+                    }
+
+                    protected override void OnSelectionChanged()
+                    {
+                        base.OnSelectionChanged();
+
+                        SelectionBox.CanRotate = true;
+                        SelectionBox.CanScaleX = true;
+                        SelectionBox.CanScaleY = true;
+                        SelectionBox.CanReverse = false;
+                    }
+
+                    public override bool HandleRotation(float angle)
+                    {
+                        foreach (var c in SelectedBlueprints)
+                            c.Item.Rotation += angle;
+
+                        return base.HandleRotation(angle);
+                    }
+
+                    public override bool HandleScale(Vector2 scale, Anchor anchor)
+                    {
+                        adjustScaleFromAnchor(ref scale, anchor);
+
+                        foreach (var c in SelectedBlueprints)
+                            c.Item.Scale += scale * 0.01f;
+
+                        return true;
+                    }
+
+                    private static void adjustScaleFromAnchor(ref Vector2 scale, Anchor reference)
+                    {
+                        // cancel out scale in axes we don't care about (based on which drag handle was used).
+                        if ((reference & Anchor.x1) > 0) scale.X = 0;
+                        if ((reference & Anchor.y1) > 0) scale.Y = 0;
+
+                        // reverse the scale direction if dragging from top or left.
+                        if ((reference & Anchor.x0) > 0) scale.X = -scale.X;
+                        if ((reference & Anchor.y0) > 0) scale.Y = -scale.Y;
+                    }
+
+                    public override bool HandleMovement(MoveSelectionEvent<SkinnableHUDComponent> moveEvent)
+                    {
+                        foreach (var c in SelectedBlueprints)
+                            c.Item.Position += moveEvent.InstantDelta;
+                        return true;
+                    }
+                }
+
+                protected override SelectionBlueprint<SkinnableHUDComponent> CreateBlueprintFor(SkinnableHUDComponent component)
+                    => new SkinBlueprint(component);
+
+                public class SkinBlueprint : SelectionBlueprint<SkinnableHUDComponent>
+                {
+                    /// <summary>
+                    /// The <see cref="DrawableHitObject"/> which this <see cref="OverlaySelectionBlueprint"/> applies to.
+                    /// </summary>
+                    public readonly SkinnableHUDComponent Component;
+
+                    private Container box;
+                    private Drawable drawable => Component.Drawable;
+
+                    /// <summary>
+                    /// Whether the blueprint should be shown even when the <see cref="Component"/> is not alive.
+                    /// </summary>
+                    protected virtual bool AlwaysShowWhenSelected => false;
+
+                    protected override bool ShouldBeAlive => (Component.IsAlive && Component.IsPresent) || (AlwaysShowWhenSelected && State == SelectionState.Selected);
+
+                    public SkinBlueprint(SkinnableHUDComponent component)
+                        : base(component)
+                    {
+                        Component = component;
+                    }
+
+                    [BackgroundDependencyLoader]
+                    private void load(OsuColour colours)
+                    {
+                        InternalChildren = new Drawable[]
+                        {
+                            box = new Container
+                            {
+                                Colour = colours.Yellow,
+                                Children = new Drawable[]
+                                {
+                                    new Box
+                                    {
+                                        RelativeSizeAxes = Axes.Both,
+                                        Alpha = 0.2f,
+                                        AlwaysPresent = true,
+                                    },
+                                }
+                            },
+                        };
+                    }
+
+                    private Quad drawableQuad;
+
+                    public override Quad ScreenSpaceDrawQuad => drawableQuad;
+
+                    protected override void Update()
+                    {
+                        base.Update();
+
+                        drawableQuad = drawable.ScreenSpaceDrawQuad;
+                        var quad = ToLocalSpace(drawable.ScreenSpaceDrawQuad);
+
+                        box.Position = quad.TopLeft;
+                        box.Size = quad.Size;
+                        box.Rotation = Component.Rotation;
+                    }
+
+                    public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => drawable.ReceivePositionalInputAt(screenSpacePos);
+
+                    public override Vector2 ScreenSpaceSelectionPoint => Component.ToScreenSpace(Vector2.Zero);
+
+                    public override Quad SelectionQuad => drawable.ScreenSpaceDrawQuad;
+
+                    public override Vector2 GetInstantDelta(Vector2 screenSpacePosition) => Component.Parent.ToLocalSpace(screenSpacePosition) - Component.Position;
+                }
+            }
+        }
+    }
+}

From 74fb7cd180051a928cb714e291de09188beec55c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 14:21:07 +0900
Subject: [PATCH 2971/3722] Extract storable attributes to bindables

---
 .../Visual/Gameplay/TestSceneSkinEditor.cs    | 18 +++++-----
 .../Screens/Play/HUD/SkinnableHUDComponent.cs | 33 ++++++++++++++-----
 2 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
index 2391945b91..4594db36ae 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                     public override bool HandleRotation(float angle)
                     {
                         foreach (var c in SelectedBlueprints)
-                            c.Item.Rotation += angle;
+                            c.Item.SkinRotation.Value += angle;
 
                         return base.HandleRotation(angle);
                     }
@@ -121,11 +121,18 @@ namespace osu.Game.Tests.Visual.Gameplay
                         adjustScaleFromAnchor(ref scale, anchor);
 
                         foreach (var c in SelectedBlueprints)
-                            c.Item.Scale += scale * 0.01f;
+                            c.Item.SkinScale.Value += scale.X * 0.01f;
 
                         return true;
                     }
 
+                    public override bool HandleMovement(MoveSelectionEvent<SkinnableHUDComponent> moveEvent)
+                    {
+                        foreach (var c in SelectedBlueprints)
+                            c.Item.SkinPosition.Value += moveEvent.InstantDelta.X;
+                        return true;
+                    }
+
                     private static void adjustScaleFromAnchor(ref Vector2 scale, Anchor reference)
                     {
                         // cancel out scale in axes we don't care about (based on which drag handle was used).
@@ -136,13 +143,6 @@ namespace osu.Game.Tests.Visual.Gameplay
                         if ((reference & Anchor.x0) > 0) scale.X = -scale.X;
                         if ((reference & Anchor.y0) > 0) scale.Y = -scale.Y;
                     }
-
-                    public override bool HandleMovement(MoveSelectionEvent<SkinnableHUDComponent> moveEvent)
-                    {
-                        foreach (var c in SelectedBlueprints)
-                            c.Item.Position += moveEvent.InstantDelta;
-                        return true;
-                    }
                 }
 
                 protected override SelectionBlueprint<SkinnableHUDComponent> CreateBlueprintFor(SkinnableHUDComponent component)
diff --git a/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs b/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs
index ea14a15348..5b8d313400 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs
@@ -4,8 +4,10 @@
 using System;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Layout;
 using osu.Game.Configuration;
 using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
 {
@@ -15,18 +17,33 @@ namespace osu.Game.Screens.Play.HUD
     public abstract class SkinnableHUDComponent : SkinnableDrawable
     {
         [SettingSource("Scale", "The scale at which this component should be displayed.")]
-        public BindableNumber<float> SkinScale { get; } = new BindableFloat(1)
-        {
-            Precision = 0.1f,
-            MinValue = 0.1f,
-            MaxValue = 10,
-            Default = 1,
-            Value = 1,
-        };
+        public BindableNumber<float> SkinScale { get; } = new BindableFloat(1);
+
+        [SettingSource("Position", "The position at which this component should be displayed.")]
+        public BindableNumber<float> SkinPosition { get; } = new BindableFloat();
+
+        [SettingSource("Rotation", "The rotation at which this component should be displayed.")]
+        public BindableNumber<float> SkinRotation { get; } = new BindableFloat();
+
+        [SettingSource("Anchor", "The screen edge this component should align to.")]
+        public Bindable<Anchor> SkinAnchor { get; } = new Bindable<Anchor>();
 
         protected SkinnableHUDComponent(ISkinComponent component, Func<ISkinComponent, Drawable> defaultImplementation, Func<ISkinSource, bool> allowFallback = null, ConfineMode confineMode = ConfineMode.NoScaling)
             : base(component, defaultImplementation, allowFallback, confineMode)
         {
+            SkinScale.BindValueChanged(scale => Drawable.Scale = new Vector2(scale.NewValue));
+            SkinPosition.BindValueChanged(position => Position = new Vector2(position.NewValue));
+            SkinRotation.BindValueChanged(rotation => Drawable.Rotation = rotation.NewValue);
+            SkinAnchor.BindValueChanged(anchor => Anchor = anchor.NewValue);
+        }
+
+        protected override bool OnInvalidate(Invalidation invalidation, InvalidationSource source)
+        {
+            SkinScale.Value = Drawable.Scale.X;
+            SkinPosition.Value = Position.X;
+            SkinRotation.Value = Drawable.Rotation;
+            SkinAnchor.Value = Anchor;
+            return base.OnInvalidate(invalidation, source);
         }
     }
 }

From 1cb8fc9a241a2d07d43019c67f2b7312cc3aa69b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 15:14:48 +0900
Subject: [PATCH 2972/3722] Extract editor classes out of test namespace and
 add anchor support

---
 .../Visual/Gameplay/TestSceneSkinEditor.cs    | 213 ++----------------
 .../Screens/Play/HUD/SkinnableHUDComponent.cs |   5 +-
 osu.Game/Skinning/Editor/SkinBlueprint.cs     |  86 +++++++
 .../Skinning/Editor/SkinBlueprintContainer.cs |  36 +++
 osu.Game/Skinning/Editor/SkinEditor.cs        |  36 +++
 .../Skinning/Editor/SkinSelectionHandler.cs   | 139 ++++++++++++
 6 files changed, 315 insertions(+), 200 deletions(-)
 create mode 100644 osu.Game/Skinning/Editor/SkinBlueprint.cs
 create mode 100644 osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
 create mode 100644 osu.Game/Skinning/Editor/SkinEditor.cs
 create mode 100644 osu.Game/Skinning/Editor/SkinSelectionHandler.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
index 4594db36ae..e46cd70667 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
@@ -2,221 +2,36 @@
 // 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;
-using osu.Game.Rulesets.Objects.Drawables;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Primitives;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Logging;
 using osu.Framework.Testing;
-using osu.Game.Graphics;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Screens.Edit.Compose.Components;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Play;
-using osu.Game.Screens.Play.HUD;
-using osuTK;
+using osu.Game.Skinning.Editor;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestSceneSkinEditor : OsuTestScene
+    public class TestSceneSkinEditor : SkinnableTestScene
     {
-        private HUDOverlay hudOverlay;
-
         [SetUpSteps]
         public void SetUpSteps()
         {
-            AddStep("create hud", () =>
+            AddStep("create editor overlay", () =>
             {
-                hudOverlay = new HUDOverlay(null, null, null, Array.Empty<Mod>());
+                SetContents(() =>
+                {
+                    var hudOverlay = new HUDOverlay(null, null, null, Array.Empty<Mod>());
 
-                // Add any key just to display the key counter visually.
-                hudOverlay.KeyCounter.Add(new KeyCounterKeyboard(Key.Space));
+                    // Add any key just to display the key counter visually.
+                    hudOverlay.KeyCounter.Add(new KeyCounterKeyboard(Key.Space));
+                    hudOverlay.ComboCounter.Current.Value = 1;
 
-                hudOverlay.ComboCounter.Current.Value = 1;
+                    return new SkinEditor(hudOverlay);
+                });
             });
-
-            AddStep("create editor overlay", () => Add(new SkinEditor(hudOverlay)));
         }
 
-        public class SkinEditor : CompositeDrawable
-        {
-            private readonly Drawable target;
-
-            public SkinEditor(Drawable target)
-            {
-                this.target = target;
-
-                RelativeSizeAxes = Axes.Both;
-            }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-
-                InternalChildren = new[]
-                {
-                    target,
-                    new SkinBlueprintContainer(target),
-                };
-            }
-
-            public class SkinBlueprintContainer : BlueprintContainer<SkinnableHUDComponent>
-            {
-                private readonly Drawable target;
-
-                public SkinBlueprintContainer(Drawable target)
-                {
-                    this.target = target;
-                }
-
-                protected override void LoadComplete()
-                {
-                    base.LoadComplete();
-
-                    SkinnableHUDComponent[] components = target.ChildrenOfType<SkinnableHUDComponent>().ToArray();
-
-                    foreach (var c in components)
-                    {
-                        Logger.Log($"Adding blueprint for {c.GetType()}");
-                        AddBlueprintFor(c);
-                    }
-                }
-
-                protected override SelectionHandler<SkinnableHUDComponent> CreateSelectionHandler() => new SkinSelectionHandler();
-
-                public class SkinSelectionHandler : SelectionHandler<SkinnableHUDComponent>
-                {
-                    protected override void DeleteItems(IEnumerable<SkinnableHUDComponent> items)
-                    {
-                        foreach (var i in items)
-                            i.Drawable.Expire();
-                    }
-
-                    protected override void OnSelectionChanged()
-                    {
-                        base.OnSelectionChanged();
-
-                        SelectionBox.CanRotate = true;
-                        SelectionBox.CanScaleX = true;
-                        SelectionBox.CanScaleY = true;
-                        SelectionBox.CanReverse = false;
-                    }
-
-                    public override bool HandleRotation(float angle)
-                    {
-                        foreach (var c in SelectedBlueprints)
-                            c.Item.SkinRotation.Value += angle;
-
-                        return base.HandleRotation(angle);
-                    }
-
-                    public override bool HandleScale(Vector2 scale, Anchor anchor)
-                    {
-                        adjustScaleFromAnchor(ref scale, anchor);
-
-                        foreach (var c in SelectedBlueprints)
-                            c.Item.SkinScale.Value += scale.X * 0.01f;
-
-                        return true;
-                    }
-
-                    public override bool HandleMovement(MoveSelectionEvent<SkinnableHUDComponent> moveEvent)
-                    {
-                        foreach (var c in SelectedBlueprints)
-                            c.Item.SkinPosition.Value += moveEvent.InstantDelta.X;
-                        return true;
-                    }
-
-                    private static void adjustScaleFromAnchor(ref Vector2 scale, Anchor reference)
-                    {
-                        // cancel out scale in axes we don't care about (based on which drag handle was used).
-                        if ((reference & Anchor.x1) > 0) scale.X = 0;
-                        if ((reference & Anchor.y1) > 0) scale.Y = 0;
-
-                        // reverse the scale direction if dragging from top or left.
-                        if ((reference & Anchor.x0) > 0) scale.X = -scale.X;
-                        if ((reference & Anchor.y0) > 0) scale.Y = -scale.Y;
-                    }
-                }
-
-                protected override SelectionBlueprint<SkinnableHUDComponent> CreateBlueprintFor(SkinnableHUDComponent component)
-                    => new SkinBlueprint(component);
-
-                public class SkinBlueprint : SelectionBlueprint<SkinnableHUDComponent>
-                {
-                    /// <summary>
-                    /// The <see cref="DrawableHitObject"/> which this <see cref="OverlaySelectionBlueprint"/> applies to.
-                    /// </summary>
-                    public readonly SkinnableHUDComponent Component;
-
-                    private Container box;
-                    private Drawable drawable => Component.Drawable;
-
-                    /// <summary>
-                    /// Whether the blueprint should be shown even when the <see cref="Component"/> is not alive.
-                    /// </summary>
-                    protected virtual bool AlwaysShowWhenSelected => false;
-
-                    protected override bool ShouldBeAlive => (Component.IsAlive && Component.IsPresent) || (AlwaysShowWhenSelected && State == SelectionState.Selected);
-
-                    public SkinBlueprint(SkinnableHUDComponent component)
-                        : base(component)
-                    {
-                        Component = component;
-                    }
-
-                    [BackgroundDependencyLoader]
-                    private void load(OsuColour colours)
-                    {
-                        InternalChildren = new Drawable[]
-                        {
-                            box = new Container
-                            {
-                                Colour = colours.Yellow,
-                                Children = new Drawable[]
-                                {
-                                    new Box
-                                    {
-                                        RelativeSizeAxes = Axes.Both,
-                                        Alpha = 0.2f,
-                                        AlwaysPresent = true,
-                                    },
-                                }
-                            },
-                        };
-                    }
-
-                    private Quad drawableQuad;
-
-                    public override Quad ScreenSpaceDrawQuad => drawableQuad;
-
-                    protected override void Update()
-                    {
-                        base.Update();
-
-                        drawableQuad = drawable.ScreenSpaceDrawQuad;
-                        var quad = ToLocalSpace(drawable.ScreenSpaceDrawQuad);
-
-                        box.Position = quad.TopLeft;
-                        box.Size = quad.Size;
-                        box.Rotation = Component.Rotation;
-                    }
-
-                    public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => drawable.ReceivePositionalInputAt(screenSpacePos);
-
-                    public override Vector2 ScreenSpaceSelectionPoint => Component.ToScreenSpace(Vector2.Zero);
-
-                    public override Quad SelectionQuad => drawable.ScreenSpaceDrawQuad;
-
-                    public override Vector2 GetInstantDelta(Vector2 screenSpacePosition) => Component.Parent.ToLocalSpace(screenSpacePosition) - Component.Position;
-                }
-            }
-        }
+        protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs b/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs
index 5b8d313400..2064f8589d 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs
@@ -34,7 +34,10 @@ namespace osu.Game.Screens.Play.HUD
             SkinScale.BindValueChanged(scale => Drawable.Scale = new Vector2(scale.NewValue));
             SkinPosition.BindValueChanged(position => Position = new Vector2(position.NewValue));
             SkinRotation.BindValueChanged(rotation => Drawable.Rotation = rotation.NewValue);
-            SkinAnchor.BindValueChanged(anchor => Anchor = anchor.NewValue);
+            SkinAnchor.BindValueChanged(anchor =>
+            {
+                Drawable.Anchor = anchor.NewValue;
+            });
         }
 
         protected override bool OnInvalidate(Invalidation invalidation, InvalidationSource source)
diff --git a/osu.Game/Skinning/Editor/SkinBlueprint.cs b/osu.Game/Skinning/Editor/SkinBlueprint.cs
new file mode 100644
index 0000000000..f9fffab579
--- /dev/null
+++ b/osu.Game/Skinning/Editor/SkinBlueprint.cs
@@ -0,0 +1,86 @@
+// Copyright (c) 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.Primitives;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Screens.Play.HUD;
+using osuTK;
+
+namespace osu.Game.Skinning.Editor
+{
+    public class SkinBlueprint : SelectionBlueprint<SkinnableHUDComponent>
+    {
+        /// <summary>
+        /// The <see cref="DrawableHitObject"/> which this <see cref="OverlaySelectionBlueprint"/> applies to.
+        /// </summary>
+        public readonly SkinnableHUDComponent Component;
+
+        private Container box;
+        private Drawable drawable => Component.Drawable;
+
+        /// <summary>
+        /// Whether the blueprint should be shown even when the <see cref="Component"/> is not alive.
+        /// </summary>
+        protected virtual bool AlwaysShowWhenSelected => false;
+
+        protected override bool ShouldBeAlive => (Component.IsAlive && Component.IsPresent) || (AlwaysShowWhenSelected && State == SelectionState.Selected);
+
+        public SkinBlueprint(SkinnableHUDComponent component)
+            : base(component)
+        {
+            Component = component;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            InternalChildren = new Drawable[]
+            {
+                box = new Container
+                {
+                    Colour = colours.Yellow,
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Alpha = 0.2f,
+                            AlwaysPresent = true,
+                        },
+                    }
+                },
+            };
+        }
+
+        private Quad drawableQuad;
+
+        public override Quad ScreenSpaceDrawQuad => drawableQuad;
+
+        protected override void Update()
+        {
+            base.Update();
+
+            drawableQuad = drawable.ScreenSpaceDrawQuad;
+            var quad = ToLocalSpace(drawable.ScreenSpaceDrawQuad);
+
+            box.Position = quad.TopLeft;
+            box.Size = quad.Size;
+            box.Rotation = Component.Rotation;
+        }
+
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => drawable.ReceivePositionalInputAt(screenSpacePos);
+
+        public override Vector2 ScreenSpaceSelectionPoint => Component.ToScreenSpace(Vector2.Zero);
+
+        public override Quad SelectionQuad => drawable.ScreenSpaceDrawQuad;
+
+        public override Vector2 GetInstantDelta(Vector2 screenSpacePosition) => Component.Parent.ToLocalSpace(screenSpacePosition) - Component.Position;
+    }
+}
diff --git a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
new file mode 100644
index 0000000000..ddf3fd28a7
--- /dev/null
+++ b/osu.Game/Skinning/Editor/SkinBlueprintContainer.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.Linq;
+using osu.Framework.Graphics;
+using osu.Framework.Testing;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Screens.Edit.Compose.Components;
+using osu.Game.Screens.Play.HUD;
+
+namespace osu.Game.Skinning.Editor
+{
+    public class SkinBlueprintContainer : BlueprintContainer<SkinnableHUDComponent>
+    {
+        private readonly Drawable target;
+
+        public SkinBlueprintContainer(Drawable target)
+        {
+            this.target = target;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            SkinnableHUDComponent[] components = target.ChildrenOfType<SkinnableHUDComponent>().ToArray();
+
+            foreach (var c in components) AddBlueprintFor(c);
+        }
+
+        protected override SelectionHandler<SkinnableHUDComponent> CreateSelectionHandler() => new SkinSelectionHandler();
+
+        protected override SelectionBlueprint<SkinnableHUDComponent> CreateBlueprintFor(SkinnableHUDComponent component)
+            => new SkinBlueprint(component);
+    }
+}
diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
new file mode 100644
index 0000000000..74d32bcb9f
--- /dev/null
+++ b/osu.Game/Skinning/Editor/SkinEditor.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.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.Cursor;
+
+namespace osu.Game.Skinning.Editor
+{
+    public class SkinEditor : CompositeDrawable
+    {
+        private readonly Drawable target;
+
+        public SkinEditor(Drawable target)
+        {
+            this.target = target;
+
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            InternalChild = new OsuContextMenuContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Children = new[]
+                {
+                    target,
+                    new SkinBlueprintContainer(target),
+                }
+            };
+        }
+    }
+}
diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
new file mode 100644
index 0000000000..4f28d4e0d2
--- /dev/null
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -0,0 +1,139 @@
+// Copyright (c) ppy 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.UserInterface;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Screens.Edit.Compose.Components;
+using osu.Game.Screens.Play.HUD;
+using osuTK;
+
+namespace osu.Game.Skinning.Editor
+{
+    public class SkinSelectionHandler : SelectionHandler<SkinnableHUDComponent>
+    {
+        protected override void DeleteItems(IEnumerable<SkinnableHUDComponent> items)
+        {
+            foreach (var i in items)
+                i.Drawable.Expire();
+        }
+
+        protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint<SkinnableHUDComponent>> selection)
+        {
+            yield return new OsuMenuItem("Anchor")
+            {
+                Items = createAnchorItems().ToArray()
+            };
+
+            foreach (var item in base.GetContextMenuItemsForSelection(selection))
+                yield return item;
+
+            IEnumerable<AnchorMenuItem> createAnchorItems()
+            {
+                var displayableAnchors = new[]
+                {
+                    Anchor.TopLeft,
+                    Anchor.TopCentre,
+                    Anchor.TopRight,
+                    Anchor.CentreLeft,
+                    Anchor.Centre,
+                    Anchor.CentreRight,
+                    Anchor.BottomLeft,
+                    Anchor.BottomCentre,
+                    Anchor.BottomRight,
+                };
+
+                return displayableAnchors.Select(a =>
+                {
+                    var countExisting = selection.Count(b => b.Item.SkinAnchor.Value == a);
+                    var countTotal = selection.Count();
+
+                    TernaryState state;
+
+                    if (countExisting == countTotal)
+                        state = TernaryState.True;
+                    else if (countExisting > 0)
+                        state = TernaryState.Indeterminate;
+                    else
+                        state = TernaryState.False;
+
+                    return new AnchorMenuItem(a, selection, _ => applyAnchor(a))
+                    {
+                        State = { Value = state }
+                    };
+                });
+            }
+        }
+
+        private void applyAnchor(Anchor anchor)
+        {
+            foreach (var item in SelectedItems)
+                item.SkinAnchor.Value = anchor;
+        }
+
+        protected override void OnSelectionChanged()
+        {
+            base.OnSelectionChanged();
+
+            SelectionBox.CanRotate = true;
+            SelectionBox.CanScaleX = true;
+            SelectionBox.CanScaleY = true;
+            SelectionBox.CanReverse = false;
+        }
+
+        public override bool HandleRotation(float angle)
+        {
+            foreach (var c in SelectedBlueprints)
+                c.Item.SkinRotation.Value += angle;
+
+            return base.HandleRotation(angle);
+        }
+
+        public override bool HandleScale(Vector2 scale, Anchor anchor)
+        {
+            adjustScaleFromAnchor(ref scale, anchor);
+
+            foreach (var c in SelectedBlueprints)
+                c.Item.SkinScale.Value += scale.X * 0.01f;
+
+            return true;
+        }
+
+        public override bool HandleMovement(MoveSelectionEvent<SkinnableHUDComponent> moveEvent)
+        {
+            foreach (var c in SelectedBlueprints)
+                c.Item.SkinPosition.Value += moveEvent.InstantDelta.X;
+            return true;
+        }
+
+        private static void adjustScaleFromAnchor(ref Vector2 scale, Anchor reference)
+        {
+            // cancel out scale in axes we don't care about (based on which drag handle was used).
+            if ((reference & Anchor.x1) > 0) scale.X = 0;
+            if ((reference & Anchor.y1) > 0) scale.Y = 0;
+
+            // reverse the scale direction if dragging from top or left.
+            if ((reference & Anchor.x0) > 0) scale.X = -scale.X;
+            if ((reference & Anchor.y0) > 0) scale.Y = -scale.Y;
+        }
+
+        public class AnchorMenuItem : TernaryStateMenuItem
+        {
+            public AnchorMenuItem(Anchor anchor, IEnumerable<SelectionBlueprint<SkinnableHUDComponent>> selection, Action<TernaryState> action)
+                : base(anchor.ToString(), getNextState, MenuItemType.Standard, action)
+            {
+            }
+
+            private void updateState(TernaryState obj)
+            {
+                throw new NotImplementedException();
+            }
+
+            private static TernaryState getNextState(TernaryState state) => TernaryState.True;
+        }
+    }
+}

From 59339aa4fd3e46485c83c0a1c73eec18e45bddf9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 15:28:32 +0900
Subject: [PATCH 2973/3722] Add support for x/y position and scale back in

---
 .../Screens/Play/HUD/SkinnableHUDComponent.cs | 28 +++++++++++++------
 .../Skinning/Editor/SkinSelectionHandler.cs   | 11 ++++++--
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs b/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs
index 2064f8589d..533573efd2 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs
@@ -16,11 +16,17 @@ namespace osu.Game.Screens.Play.HUD
     /// </summary>
     public abstract class SkinnableHUDComponent : SkinnableDrawable
     {
-        [SettingSource("Scale", "The scale at which this component should be displayed.")]
-        public BindableNumber<float> SkinScale { get; } = new BindableFloat(1);
+        [SettingSource("ScaleX", "The horizontal scale at which this component should be displayed.")]
+        public BindableNumber<float> SkinScaleX { get; } = new BindableFloat(1);
 
-        [SettingSource("Position", "The position at which this component should be displayed.")]
-        public BindableNumber<float> SkinPosition { get; } = new BindableFloat();
+        [SettingSource("ScaleY", "The vertical scale at which this component should be displayed.")]
+        public BindableNumber<float> SkinScaleY { get; } = new BindableFloat(1);
+
+        [SettingSource("PositionX", "The horizontal position at which this component should be displayed.")]
+        public BindableNumber<float> SkinPositionX { get; } = new BindableFloat();
+
+        [SettingSource("PositionY", "The vertical position at which this component should be displayed.")]
+        public BindableNumber<float> SkinPositionY { get; } = new BindableFloat();
 
         [SettingSource("Rotation", "The rotation at which this component should be displayed.")]
         public BindableNumber<float> SkinRotation { get; } = new BindableFloat();
@@ -31,8 +37,12 @@ namespace osu.Game.Screens.Play.HUD
         protected SkinnableHUDComponent(ISkinComponent component, Func<ISkinComponent, Drawable> defaultImplementation, Func<ISkinSource, bool> allowFallback = null, ConfineMode confineMode = ConfineMode.NoScaling)
             : base(component, defaultImplementation, allowFallback, confineMode)
         {
-            SkinScale.BindValueChanged(scale => Drawable.Scale = new Vector2(scale.NewValue));
-            SkinPosition.BindValueChanged(position => Position = new Vector2(position.NewValue));
+            SkinScaleX.BindValueChanged(x => Drawable.Scale = new Vector2(x.NewValue, Drawable.Scale.Y));
+            SkinScaleY.BindValueChanged(y => Drawable.Scale = new Vector2(Drawable.Scale.X, y.NewValue));
+
+            SkinPositionX.BindValueChanged(x => Position = new Vector2(x.NewValue, Position.Y));
+            SkinPositionY.BindValueChanged(y => Position = new Vector2(Position.X, y.NewValue));
+
             SkinRotation.BindValueChanged(rotation => Drawable.Rotation = rotation.NewValue);
             SkinAnchor.BindValueChanged(anchor =>
             {
@@ -42,8 +52,10 @@ namespace osu.Game.Screens.Play.HUD
 
         protected override bool OnInvalidate(Invalidation invalidation, InvalidationSource source)
         {
-            SkinScale.Value = Drawable.Scale.X;
-            SkinPosition.Value = Position.X;
+            SkinScaleX.Value = Drawable.Scale.X;
+            SkinScaleY.Value = Drawable.Scale.Y;
+            SkinPositionX.Value = Position.X;
+            SkinPositionY.Value = Position.Y;
             SkinRotation.Value = Drawable.Rotation;
             SkinAnchor.Value = Anchor;
             return base.OnInvalidate(invalidation, source);
diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 4f28d4e0d2..55f36c73d6 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -98,7 +98,10 @@ namespace osu.Game.Skinning.Editor
             adjustScaleFromAnchor(ref scale, anchor);
 
             foreach (var c in SelectedBlueprints)
-                c.Item.SkinScale.Value += scale.X * 0.01f;
+            {
+                c.Item.SkinScaleX.Value += scale.X * 0.01f;
+                c.Item.SkinScaleY.Value += scale.Y * 0.01f;
+            }
 
             return true;
         }
@@ -106,7 +109,11 @@ namespace osu.Game.Skinning.Editor
         public override bool HandleMovement(MoveSelectionEvent<SkinnableHUDComponent> moveEvent)
         {
             foreach (var c in SelectedBlueprints)
-                c.Item.SkinPosition.Value += moveEvent.InstantDelta.X;
+            {
+                c.Item.SkinPositionX.Value += moveEvent.InstantDelta.X;
+                c.Item.SkinPositionY.Value += moveEvent.InstantDelta.Y;
+            }
+
             return true;
         }
 

From 2540d6029c4d804dd2e0378c35b58319349c8ebb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 17:47:28 +0900
Subject: [PATCH 2974/3722] Use AutoSize for SkinnableHudComponents

---
 .../Screens/Play/HUD/SkinnableHUDComponent.cs | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs b/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs
index 533573efd2..f5333c940f 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs
@@ -37,26 +37,26 @@ namespace osu.Game.Screens.Play.HUD
         protected SkinnableHUDComponent(ISkinComponent component, Func<ISkinComponent, Drawable> defaultImplementation, Func<ISkinSource, bool> allowFallback = null, ConfineMode confineMode = ConfineMode.NoScaling)
             : base(component, defaultImplementation, allowFallback, confineMode)
         {
-            SkinScaleX.BindValueChanged(x => Drawable.Scale = new Vector2(x.NewValue, Drawable.Scale.Y));
-            SkinScaleY.BindValueChanged(y => Drawable.Scale = new Vector2(Drawable.Scale.X, y.NewValue));
+            SkinScaleX.BindValueChanged(x => Scale = new Vector2(x.NewValue, Scale.Y));
+            SkinScaleY.BindValueChanged(y => Scale = new Vector2(Scale.X, y.NewValue));
 
             SkinPositionX.BindValueChanged(x => Position = new Vector2(x.NewValue, Position.Y));
             SkinPositionY.BindValueChanged(y => Position = new Vector2(Position.X, y.NewValue));
 
-            SkinRotation.BindValueChanged(rotation => Drawable.Rotation = rotation.NewValue);
-            SkinAnchor.BindValueChanged(anchor =>
-            {
-                Drawable.Anchor = anchor.NewValue;
-            });
+            SkinRotation.BindValueChanged(rotation => Rotation = rotation.NewValue);
+            SkinAnchor.BindValueChanged(anchor => { Anchor = anchor.NewValue; });
+
+            RelativeSizeAxes = Axes.None;
+            AutoSizeAxes = Axes.Both;
         }
 
         protected override bool OnInvalidate(Invalidation invalidation, InvalidationSource source)
         {
-            SkinScaleX.Value = Drawable.Scale.X;
-            SkinScaleY.Value = Drawable.Scale.Y;
+            SkinScaleX.Value = Scale.X;
+            SkinScaleY.Value = Scale.Y;
             SkinPositionX.Value = Position.X;
             SkinPositionY.Value = Position.Y;
-            SkinRotation.Value = Drawable.Rotation;
+            SkinRotation.Value = Rotation;
             SkinAnchor.Value = Anchor;
             return base.OnInvalidate(invalidation, source);
         }

From defa350aa71cf07ffcee310fbfbde9dbc1c1c187 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 18:06:59 +0900
Subject: [PATCH 2975/3722] Set defaults on SkinnableHUDComponent to cancel out
 relative size default

Specifying locally on each HUD component looks to make more sense.
---
 .../Gameplay/TestSceneSkinnableHUDOverlay.cs  | 26 -------------------
 .../Play/HUD/SkinnableAccuracyCounter.cs      |  2 ++
 .../Screens/Play/HUD/SkinnableComboCounter.cs |  2 ++
 .../Screens/Play/HUD/SkinnableHUDComponent.cs |  6 ++++-
 .../Play/HUD/SkinnableHealthDisplay.cs        |  3 +++
 .../Screens/Play/HUD/SkinnableScoreCounter.cs |  2 ++
 6 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
index 4f8a78368e..5c3d3c03bf 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
@@ -36,32 +36,6 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Resolved]
         private OsuConfigManager config { get; set; }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            Add(new Container
-            {
-                RelativeSizeAxes = Axes.Both,
-                Width = 0.3f,
-                Children = new Drawable[]
-                {
-                    new Box
-                    {
-                        Colour = Color4.Black,
-                        RelativeSizeAxes = Axes.Both,
-                        Alpha = 0.9f,
-                    },
-                    new FillFlowContainer
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Direction = FillDirection.Vertical,
-                        Children = createSkinSourceComponents(),
-                    },
-                }
-            });
-        }
-
         [Test]
         public void TestComboCounterIncrementing()
         {
diff --git a/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
index ebb3bcd148..33132adf23 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.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 osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
@@ -14,6 +15,7 @@ namespace osu.Game.Screens.Play.HUD
             : base(new HUDSkinComponent(HUDSkinComponents.AccuracyCounter), _ => new DefaultAccuracyCounter())
         {
             CentreComponent = false;
+            AutoSizeAxes = Axes.Both;
         }
 
         private IAccuracyCounter skinnedCounter;
diff --git a/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
index 629bb467bc..8785eccfc3 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableComboCounter.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 osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
@@ -14,6 +15,7 @@ namespace osu.Game.Screens.Play.HUD
             : base(new HUDSkinComponent(HUDSkinComponents.ComboCounter), skinComponent => new DefaultComboCounter())
         {
             CentreComponent = false;
+            AutoSizeAxes = Axes.Both;
         }
 
         private IComboCounter skinnedCounter;
diff --git a/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs b/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs
index f5333c940f..7d23611718 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs
@@ -46,8 +46,11 @@ namespace osu.Game.Screens.Play.HUD
             SkinRotation.BindValueChanged(rotation => Rotation = rotation.NewValue);
             SkinAnchor.BindValueChanged(anchor => { Anchor = anchor.NewValue; });
 
+            // reset everything and require each component to specify what they want,
+            // as if they were just drawables. maybe we want to change SkinnableDrawable to not default
+            // to RelativeSizeAxes.Both...
             RelativeSizeAxes = Axes.None;
-            AutoSizeAxes = Axes.Both;
+            AutoSizeAxes = Axes.None;
         }
 
         protected override bool OnInvalidate(Invalidation invalidation, InvalidationSource source)
@@ -58,6 +61,7 @@ namespace osu.Game.Screens.Play.HUD
             SkinPositionY.Value = Position.Y;
             SkinRotation.Value = Rotation;
             SkinAnchor.Value = Anchor;
+
             return base.OnInvalidate(invalidation, source);
         }
     }
diff --git a/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs b/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
index f8a8696dae..ceac147b63 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
@@ -3,6 +3,7 @@
 
 using System;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
@@ -35,6 +36,8 @@ namespace osu.Game.Screens.Play.HUD
             : base(new HUDSkinComponent(HUDSkinComponents.HealthDisplay), _ => new DefaultHealthDisplay())
         {
             CentreComponent = false;
+            AutoSizeAxes = Axes.Y;
+            RelativeSizeAxes = Axes.X;
         }
 
         private IHealthDisplay skinnedCounter;
diff --git a/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs
index 9165b2c7f0..c47baf95ff 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
@@ -22,6 +23,7 @@ namespace osu.Game.Screens.Play.HUD
             : base(new HUDSkinComponent(HUDSkinComponents.ScoreCounter), _ => new DefaultScoreCounter())
         {
             CentreComponent = false;
+            AutoSizeAxes = Axes.Both;
         }
 
         [BackgroundDependencyLoader]

From fd587a82ffe2f73ac5302b528222b0d8f42ad78b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 18:34:34 +0900
Subject: [PATCH 2976/3722] Replace abstract class with interface, attached to
 the actual components (not skinnable wrapper)

---
 .../Gameplay/TestSceneSkinnableHUDOverlay.cs  | 27 --------
 .../Play/HUD/DefaultAccuracyCounter.cs        |  2 +-
 .../Screens/Play/HUD/DefaultComboCounter.cs   |  2 +-
 .../Screens/Play/HUD/DefaultHealthDisplay.cs  |  2 +-
 .../Screens/Play/HUD/DefaultScoreCounter.cs   |  2 +-
 .../HUD/HitErrorMeters/BarHitErrorMeter.cs    |  2 +-
 .../Screens/Play/HUD/ISkinnableComponent.cs   | 14 ++++
 .../Screens/Play/HUD/LegacyComboCounter.cs    |  2 +-
 .../Play/HUD/SkinnableAccuracyCounter.cs      |  4 +-
 .../Screens/Play/HUD/SkinnableComboCounter.cs |  4 +-
 .../Screens/Play/HUD/SkinnableHUDComponent.cs | 68 -------------------
 .../Play/HUD/SkinnableHealthDisplay.cs        |  5 +-
 .../Screens/Play/HUD/SkinnableScoreCounter.cs |  4 +-
 osu.Game/Skinning/Editor/SkinBlueprint.cs     | 17 ++---
 .../Skinning/Editor/SkinBlueprintContainer.cs |  8 +--
 .../Skinning/Editor/SkinSelectionHandler.cs   | 26 +++----
 osu.Game/Skinning/LegacyAccuracyCounter.cs    |  2 +-
 osu.Game/Skinning/LegacyHealthDisplay.cs      |  2 +-
 osu.Game/Skinning/LegacyScoreCounter.cs       |  3 +-
 19 files changed, 52 insertions(+), 144 deletions(-)
 create mode 100644 osu.Game/Screens/Play/HUD/ISkinnableComponent.cs
 delete mode 100644 osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
index 5c3d3c03bf..fec1610160 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
@@ -9,16 +9,12 @@ using osu.Framework.Allocation;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Testing;
 using osu.Game.Configuration;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Play;
-using osu.Game.Screens.Play.HUD;
-using osuTK.Graphics;
 using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -78,29 +74,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("key counter flow not affected", () => keyCounterFlow.IsPresent);
         }
 
-        private IReadOnlyList<Drawable> createSkinSourceComponents()
-        {
-            Drawable[] hudComponents = typeof(SkinnableHUDComponent).Assembly
-                                                                    .GetTypes()
-                                                                    .Where(t => typeof(SkinnableHUDComponent).IsAssignableFrom(t))
-                                                                    .Where(t => !t.IsAbstract)
-                                                                    .Select(t => Activator.CreateInstance(t) as Drawable)
-                                                                    .ToArray();
-
-            List<Drawable> drawables = new List<Drawable>();
-
-            foreach (var component in hudComponents)
-            {
-                drawables.Add(new OsuSpriteText
-                {
-                    Text = component.GetType().Name
-                });
-                drawables.AddRange(component.CreateSettingsControls());
-            }
-
-            return drawables;
-        }
-
         private void createNew(Action<HUDOverlay> action = null)
         {
             AddStep("create overlay", () =>
diff --git a/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
index d5d8ec570a..b8a43708b4 100644
--- a/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
@@ -9,7 +9,7 @@ using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class DefaultAccuracyCounter : PercentageCounter, IAccuracyCounter
+    public class DefaultAccuracyCounter : PercentageCounter, IAccuracyCounter, ISkinnableComponent
     {
         private readonly Vector2 offset = new Vector2(-20, 5);
 
diff --git a/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs b/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
index 63e7a88550..959766ecd1 100644
--- a/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
@@ -11,7 +11,7 @@ using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class DefaultComboCounter : RollingCounter<int>, IComboCounter
+    public class DefaultComboCounter : RollingCounter<int>, IComboCounter, ISkinnableComponent
     {
         private readonly Vector2 offset = new Vector2(20, 5);
 
diff --git a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
index b550b469e9..e3cd71691d 100644
--- a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
@@ -16,7 +16,7 @@ using osu.Framework.Utils;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class DefaultHealthDisplay : HealthDisplay, IHasAccentColour
+    public class DefaultHealthDisplay : HealthDisplay, IHasAccentColour, ISkinnableComponent
     {
         /// <summary>
         /// The base opacity of the glow.
diff --git a/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs b/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
index 1dcfe2e067..dde5c18b38 100644
--- a/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
@@ -8,7 +8,7 @@ using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class DefaultScoreCounter : ScoreCounter
+    public class DefaultScoreCounter : ScoreCounter, ISkinnableComponent
     {
         public DefaultScoreCounter()
             : base(6)
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
index 89f135de7f..3b24c8cc9e 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
@@ -18,7 +18,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 {
-    public class BarHitErrorMeter : HitErrorMeter
+    public class BarHitErrorMeter : HitErrorMeter, ISkinnableComponent
     {
         private readonly Anchor alignment;
 
diff --git a/osu.Game/Screens/Play/HUD/ISkinnableComponent.cs b/osu.Game/Screens/Play/HUD/ISkinnableComponent.cs
new file mode 100644
index 0000000000..6d4558443f
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/ISkinnableComponent.cs
@@ -0,0 +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.Framework.Graphics;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    /// <summary>
+    /// Denotes a drawable which, as a drawable, can be adjusted via skinning specifications.
+    /// </summary>
+    public interface ISkinnableComponent : IDrawable
+    {
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
index b4604c0d01..4ae722e44c 100644
--- a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Screens.Play.HUD
     /// <summary>
     /// Uses the 'x' symbol and has a pop-out effect while rolling over.
     /// </summary>
-    public class LegacyComboCounter : CompositeDrawable, IComboCounter
+    public class LegacyComboCounter : CompositeDrawable, IComboCounter, ISkinnableComponent
     {
         public Bindable<int> Current { get; } = new BindableInt { MinValue = 0, };
 
diff --git a/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
index 33132adf23..76c9c30813 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
@@ -2,12 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Bindables;
-using osu.Framework.Graphics;
 using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class SkinnableAccuracyCounter : SkinnableHUDComponent, IAccuracyCounter
+    public class SkinnableAccuracyCounter : SkinnableDrawable, IAccuracyCounter
     {
         public Bindable<double> Current { get; } = new Bindable<double>();
 
@@ -15,7 +14,6 @@ namespace osu.Game.Screens.Play.HUD
             : base(new HUDSkinComponent(HUDSkinComponents.AccuracyCounter), _ => new DefaultAccuracyCounter())
         {
             CentreComponent = false;
-            AutoSizeAxes = Axes.Both;
         }
 
         private IAccuracyCounter skinnedCounter;
diff --git a/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
index 8785eccfc3..c04c50141a 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
@@ -2,12 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Bindables;
-using osu.Framework.Graphics;
 using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class SkinnableComboCounter : SkinnableHUDComponent, IComboCounter
+    public class SkinnableComboCounter : SkinnableDrawable, IComboCounter
     {
         public Bindable<int> Current { get; } = new Bindable<int>();
 
@@ -15,7 +14,6 @@ namespace osu.Game.Screens.Play.HUD
             : base(new HUDSkinComponent(HUDSkinComponents.ComboCounter), skinComponent => new DefaultComboCounter())
         {
             CentreComponent = false;
-            AutoSizeAxes = Axes.Both;
         }
 
         private IComboCounter skinnedCounter;
diff --git a/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs b/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.cs
deleted file mode 100644
index 7d23611718..0000000000
--- a/osu.Game/Screens/Play/HUD/SkinnableHUDComponent.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;
-using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Layout;
-using osu.Game.Configuration;
-using osu.Game.Skinning;
-using osuTK;
-
-namespace osu.Game.Screens.Play.HUD
-{
-    /// <summary>
-    /// A skinnable HUD component which can be scaled and repositioned at a skinner/user's will.
-    /// </summary>
-    public abstract class SkinnableHUDComponent : SkinnableDrawable
-    {
-        [SettingSource("ScaleX", "The horizontal scale at which this component should be displayed.")]
-        public BindableNumber<float> SkinScaleX { get; } = new BindableFloat(1);
-
-        [SettingSource("ScaleY", "The vertical scale at which this component should be displayed.")]
-        public BindableNumber<float> SkinScaleY { get; } = new BindableFloat(1);
-
-        [SettingSource("PositionX", "The horizontal position at which this component should be displayed.")]
-        public BindableNumber<float> SkinPositionX { get; } = new BindableFloat();
-
-        [SettingSource("PositionY", "The vertical position at which this component should be displayed.")]
-        public BindableNumber<float> SkinPositionY { get; } = new BindableFloat();
-
-        [SettingSource("Rotation", "The rotation at which this component should be displayed.")]
-        public BindableNumber<float> SkinRotation { get; } = new BindableFloat();
-
-        [SettingSource("Anchor", "The screen edge this component should align to.")]
-        public Bindable<Anchor> SkinAnchor { get; } = new Bindable<Anchor>();
-
-        protected SkinnableHUDComponent(ISkinComponent component, Func<ISkinComponent, Drawable> defaultImplementation, Func<ISkinSource, bool> allowFallback = null, ConfineMode confineMode = ConfineMode.NoScaling)
-            : base(component, defaultImplementation, allowFallback, confineMode)
-        {
-            SkinScaleX.BindValueChanged(x => Scale = new Vector2(x.NewValue, Scale.Y));
-            SkinScaleY.BindValueChanged(y => Scale = new Vector2(Scale.X, y.NewValue));
-
-            SkinPositionX.BindValueChanged(x => Position = new Vector2(x.NewValue, Position.Y));
-            SkinPositionY.BindValueChanged(y => Position = new Vector2(Position.X, y.NewValue));
-
-            SkinRotation.BindValueChanged(rotation => Rotation = rotation.NewValue);
-            SkinAnchor.BindValueChanged(anchor => { Anchor = anchor.NewValue; });
-
-            // reset everything and require each component to specify what they want,
-            // as if they were just drawables. maybe we want to change SkinnableDrawable to not default
-            // to RelativeSizeAxes.Both...
-            RelativeSizeAxes = Axes.None;
-            AutoSizeAxes = Axes.None;
-        }
-
-        protected override bool OnInvalidate(Invalidation invalidation, InvalidationSource source)
-        {
-            SkinScaleX.Value = Scale.X;
-            SkinScaleY.Value = Scale.Y;
-            SkinPositionX.Value = Position.X;
-            SkinPositionY.Value = Position.Y;
-            SkinRotation.Value = Rotation;
-            SkinAnchor.Value = Anchor;
-
-            return base.OnInvalidate(invalidation, source);
-        }
-    }
-}
diff --git a/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs b/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
index ceac147b63..1f91f5e50f 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
@@ -3,14 +3,13 @@
 
 using System;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class SkinnableHealthDisplay : SkinnableHUDComponent, IHealthDisplay
+    public class SkinnableHealthDisplay : SkinnableDrawable, IHealthDisplay
     {
         public Bindable<double> Current { get; } = new BindableDouble(1)
         {
@@ -36,8 +35,6 @@ namespace osu.Game.Screens.Play.HUD
             : base(new HUDSkinComponent(HUDSkinComponents.HealthDisplay), _ => new DefaultHealthDisplay())
         {
             CentreComponent = false;
-            AutoSizeAxes = Axes.Y;
-            RelativeSizeAxes = Axes.X;
         }
 
         private IHealthDisplay skinnedCounter;
diff --git a/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs
index c47baf95ff..b46f5684b1 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs
@@ -4,14 +4,13 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class SkinnableScoreCounter : SkinnableHUDComponent, IScoreCounter
+    public class SkinnableScoreCounter : SkinnableDrawable, IScoreCounter
     {
         public Bindable<double> Current { get; } = new Bindable<double>();
 
@@ -23,7 +22,6 @@ namespace osu.Game.Screens.Play.HUD
             : base(new HUDSkinComponent(HUDSkinComponents.ScoreCounter), _ => new DefaultScoreCounter())
         {
             CentreComponent = false;
-            AutoSizeAxes = Axes.Both;
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Skinning/Editor/SkinBlueprint.cs b/osu.Game/Skinning/Editor/SkinBlueprint.cs
index f9fffab579..674153cb26 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprint.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprint.cs
@@ -15,24 +15,25 @@ using osuTK;
 
 namespace osu.Game.Skinning.Editor
 {
-    public class SkinBlueprint : SelectionBlueprint<SkinnableHUDComponent>
+    public class SkinBlueprint : SelectionBlueprint<ISkinnableComponent>
     {
         /// <summary>
         /// The <see cref="DrawableHitObject"/> which this <see cref="OverlaySelectionBlueprint"/> applies to.
         /// </summary>
-        public readonly SkinnableHUDComponent Component;
+        public readonly ISkinnableComponent Component;
 
         private Container box;
-        private Drawable drawable => Component.Drawable;
+
+        private Drawable drawable => (Drawable)Component;
 
         /// <summary>
         /// Whether the blueprint should be shown even when the <see cref="Component"/> is not alive.
         /// </summary>
         protected virtual bool AlwaysShowWhenSelected => false;
 
-        protected override bool ShouldBeAlive => (Component.IsAlive && Component.IsPresent) || (AlwaysShowWhenSelected && State == SelectionState.Selected);
+        protected override bool ShouldBeAlive => (drawable.IsAlive && Component.IsPresent) || (AlwaysShowWhenSelected && State == SelectionState.Selected);
 
-        public SkinBlueprint(SkinnableHUDComponent component)
+        public SkinBlueprint(ISkinnableComponent component)
             : base(component)
         {
             Component = component;
@@ -72,15 +73,15 @@ namespace osu.Game.Skinning.Editor
 
             box.Position = quad.TopLeft;
             box.Size = quad.Size;
-            box.Rotation = Component.Rotation;
+            box.Rotation = drawable.Rotation;
         }
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => drawable.ReceivePositionalInputAt(screenSpacePos);
 
-        public override Vector2 ScreenSpaceSelectionPoint => Component.ToScreenSpace(Vector2.Zero);
+        public override Vector2 ScreenSpaceSelectionPoint => drawable.ToScreenSpace(Vector2.Zero);
 
         public override Quad SelectionQuad => drawable.ScreenSpaceDrawQuad;
 
-        public override Vector2 GetInstantDelta(Vector2 screenSpacePosition) => Component.Parent.ToLocalSpace(screenSpacePosition) - Component.Position;
+        public override Vector2 GetInstantDelta(Vector2 screenSpacePosition) => Component.Parent.ToLocalSpace(screenSpacePosition) - drawable.Position;
     }
 }
diff --git a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
index ddf3fd28a7..f997e84355 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
@@ -10,7 +10,7 @@ using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Skinning.Editor
 {
-    public class SkinBlueprintContainer : BlueprintContainer<SkinnableHUDComponent>
+    public class SkinBlueprintContainer : BlueprintContainer<ISkinnableComponent>
     {
         private readonly Drawable target;
 
@@ -23,14 +23,14 @@ namespace osu.Game.Skinning.Editor
         {
             base.LoadComplete();
 
-            SkinnableHUDComponent[] components = target.ChildrenOfType<SkinnableHUDComponent>().ToArray();
+            ISkinnableComponent[] components = target.ChildrenOfType<ISkinnableComponent>().ToArray();
 
             foreach (var c in components) AddBlueprintFor(c);
         }
 
-        protected override SelectionHandler<SkinnableHUDComponent> CreateSelectionHandler() => new SkinSelectionHandler();
+        protected override SelectionHandler<ISkinnableComponent> CreateSelectionHandler() => new SkinSelectionHandler();
 
-        protected override SelectionBlueprint<SkinnableHUDComponent> CreateBlueprintFor(SkinnableHUDComponent component)
+        protected override SelectionBlueprint<ISkinnableComponent> CreateBlueprintFor(ISkinnableComponent component)
             => new SkinBlueprint(component);
     }
 }
diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 55f36c73d6..38404efd0c 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -14,15 +14,15 @@ using osuTK;
 
 namespace osu.Game.Skinning.Editor
 {
-    public class SkinSelectionHandler : SelectionHandler<SkinnableHUDComponent>
+    public class SkinSelectionHandler : SelectionHandler<ISkinnableComponent>
     {
-        protected override void DeleteItems(IEnumerable<SkinnableHUDComponent> items)
+        protected override void DeleteItems(IEnumerable<ISkinnableComponent> items)
         {
             foreach (var i in items)
-                i.Drawable.Expire();
+                i.Hide();
         }
 
-        protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint<SkinnableHUDComponent>> selection)
+        protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint<ISkinnableComponent>> selection)
         {
             yield return new OsuMenuItem("Anchor")
             {
@@ -49,7 +49,7 @@ namespace osu.Game.Skinning.Editor
 
                 return displayableAnchors.Select(a =>
                 {
-                    var countExisting = selection.Count(b => b.Item.SkinAnchor.Value == a);
+                    var countExisting = selection.Count(b => ((Drawable)b.Item).Anchor == a);
                     var countTotal = selection.Count();
 
                     TernaryState state;
@@ -72,7 +72,7 @@ namespace osu.Game.Skinning.Editor
         private void applyAnchor(Anchor anchor)
         {
             foreach (var item in SelectedItems)
-                item.SkinAnchor.Value = anchor;
+                ((Drawable)item).Anchor = anchor;
         }
 
         protected override void OnSelectionChanged()
@@ -88,7 +88,7 @@ namespace osu.Game.Skinning.Editor
         public override bool HandleRotation(float angle)
         {
             foreach (var c in SelectedBlueprints)
-                c.Item.SkinRotation.Value += angle;
+                ((Drawable)c.Item).Rotation += angle;
 
             return base.HandleRotation(angle);
         }
@@ -98,20 +98,16 @@ namespace osu.Game.Skinning.Editor
             adjustScaleFromAnchor(ref scale, anchor);
 
             foreach (var c in SelectedBlueprints)
-            {
-                c.Item.SkinScaleX.Value += scale.X * 0.01f;
-                c.Item.SkinScaleY.Value += scale.Y * 0.01f;
-            }
+                ((Drawable)c.Item).Scale += scale * 0.01f;
 
             return true;
         }
 
-        public override bool HandleMovement(MoveSelectionEvent<SkinnableHUDComponent> moveEvent)
+        public override bool HandleMovement(MoveSelectionEvent<ISkinnableComponent> moveEvent)
         {
             foreach (var c in SelectedBlueprints)
             {
-                c.Item.SkinPositionX.Value += moveEvent.InstantDelta.X;
-                c.Item.SkinPositionY.Value += moveEvent.InstantDelta.Y;
+                ((Drawable)c.Item).Position += moveEvent.InstantDelta;
             }
 
             return true;
@@ -130,7 +126,7 @@ namespace osu.Game.Skinning.Editor
 
         public class AnchorMenuItem : TernaryStateMenuItem
         {
-            public AnchorMenuItem(Anchor anchor, IEnumerable<SelectionBlueprint<SkinnableHUDComponent>> selection, Action<TernaryState> action)
+            public AnchorMenuItem(Anchor anchor, IEnumerable<SelectionBlueprint<ISkinnableComponent>> selection, Action<TernaryState> action)
                 : base(anchor.ToString(), getNextState, MenuItemType.Standard, action)
             {
             }
diff --git a/osu.Game/Skinning/LegacyAccuracyCounter.cs b/osu.Game/Skinning/LegacyAccuracyCounter.cs
index 7d6f1dc916..c592e06924 100644
--- a/osu.Game/Skinning/LegacyAccuracyCounter.cs
+++ b/osu.Game/Skinning/LegacyAccuracyCounter.cs
@@ -11,7 +11,7 @@ using osuTK;
 
 namespace osu.Game.Skinning
 {
-    public class LegacyAccuracyCounter : PercentageCounter, IAccuracyCounter
+    public class LegacyAccuracyCounter : PercentageCounter, IAccuracyCounter, ISkinnableComponent
     {
         private readonly ISkin skin;
 
diff --git a/osu.Game/Skinning/LegacyHealthDisplay.cs b/osu.Game/Skinning/LegacyHealthDisplay.cs
index 2921d46467..2e29abf453 100644
--- a/osu.Game/Skinning/LegacyHealthDisplay.cs
+++ b/osu.Game/Skinning/LegacyHealthDisplay.cs
@@ -16,7 +16,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Skinning
 {
-    public class LegacyHealthDisplay : CompositeDrawable, IHealthDisplay
+    public class LegacyHealthDisplay : CompositeDrawable, IHealthDisplay, ISkinnableComponent
     {
         private const double epic_cutoff = 0.5;
 
diff --git a/osu.Game/Skinning/LegacyScoreCounter.cs b/osu.Game/Skinning/LegacyScoreCounter.cs
index 1d330ef495..cae8044242 100644
--- a/osu.Game/Skinning/LegacyScoreCounter.cs
+++ b/osu.Game/Skinning/LegacyScoreCounter.cs
@@ -5,11 +5,12 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Screens.Play.HUD;
 using osuTK;
 
 namespace osu.Game.Skinning
 {
-    public class LegacyScoreCounter : ScoreCounter
+    public class LegacyScoreCounter : ScoreCounter, ISkinnableComponent
     {
         private readonly ISkin skin;
 

From 4f9e1e4945d002ea20a35855bd2bcdd160aa50eb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 18:59:55 +0900
Subject: [PATCH 2977/3722] Check for new components every one second to handle
 late loaders

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

diff --git a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
index f997e84355..f2bc8ecddf 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
@@ -23,9 +23,14 @@ namespace osu.Game.Skinning.Editor
         {
             base.LoadComplete();
 
-            ISkinnableComponent[] components = target.ChildrenOfType<ISkinnableComponent>().ToArray();
+            checkForComponents();
+        }
 
-            foreach (var c in components) AddBlueprintFor(c);
+        private void checkForComponents()
+        {
+            foreach (var c in target.ChildrenOfType<ISkinnableComponent>().ToArray()) AddBlueprintFor(c);
+
+            Scheduler.AddDelayed(checkForComponents, 1000);
         }
 
         protected override SelectionHandler<ISkinnableComponent> CreateSelectionHandler() => new SkinSelectionHandler();

From 74c6fdc4b8e52611b8e51645e19f27b9e042e5e8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Apr 2021 19:00:16 +0900
Subject: [PATCH 2978/3722] Add `DrawableRuleset` to the skin editor test to
 get a hit error meter to display

---
 .../Visual/Gameplay/TestSceneSkinEditor.cs    | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
index e46cd70667..eaa0c29616 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
@@ -2,10 +2,15 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Skinning.Editor;
 using osuTK.Input;
@@ -21,13 +26,32 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 SetContents(() =>
                 {
-                    var hudOverlay = new HUDOverlay(null, null, null, Array.Empty<Mod>());
+                    var ruleset = new OsuRuleset();
+                    var working = CreateWorkingBeatmap(ruleset.RulesetInfo);
+                    var beatmap = working.GetPlayableBeatmap(ruleset.RulesetInfo);
+
+                    ScoreProcessor scoreProcessor = new ScoreProcessor();
+
+                    var drawableRuleset = ruleset.CreateDrawableRulesetWith(beatmap);
+
+                    var hudOverlay = new HUDOverlay(scoreProcessor, null, drawableRuleset, Array.Empty<Mod>());
 
                     // Add any key just to display the key counter visually.
                     hudOverlay.KeyCounter.Add(new KeyCounterKeyboard(Key.Space));
                     hudOverlay.ComboCounter.Current.Value = 1;
 
-                    return new SkinEditor(hudOverlay);
+                    // Apply a miss judgement
+                    scoreProcessor.ApplyResult(new JudgementResult(new HitObject(), new Judgement()) { Type = HitResult.Good });
+
+                    return new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Children = new Drawable[]
+                        {
+                            drawableRuleset,
+                            new SkinEditor(hudOverlay),
+                        }
+                    };
                 });
             });
         }

From de73ac7ceccfa3d518baa6ec93190efda3ea2d24 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Apr 2021 13:53:01 +0900
Subject: [PATCH 2979/3722] Allow skin editor to be invoked from any context

This is kind of how I see things working going forward, where the editor
can be applied to anything in the game which supports it (ie. a results
screen, gameplay screen, etc.) and it will immediately allow changing
the interface.

This adds a test scene which shows this working with gameplay.
---
 .../Visual/Gameplay/TestSceneSkinEditor.cs    | 59 +++++------------
 .../TestSceneSkinEditorMultipleSkins.cs       | 61 +++++++++++++++++
 osu.Game/Skinning/Editor/SkinEditor.cs        | 66 +++++++++++++++++--
 3 files changed, 138 insertions(+), 48 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
index eaa0c29616..0c2c6ed454 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
@@ -1,61 +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.Graphics.Containers;
+using NUnit.Framework;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
-using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu;
-using osu.Game.Rulesets.Scoring;
-using osu.Game.Screens.Play;
 using osu.Game.Skinning.Editor;
-using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestSceneSkinEditor : SkinnableTestScene
+    public class TestSceneSkinEditor : PlayerTestScene
     {
+        private SkinEditor skinEditor;
+
         [SetUpSteps]
-        public void SetUpSteps()
+        public override void SetUpSteps()
         {
-            AddStep("create editor overlay", () =>
+            base.SetUpSteps();
+
+            AddStep("add editor overlay", () =>
             {
-                SetContents(() =>
-                {
-                    var ruleset = new OsuRuleset();
-                    var working = CreateWorkingBeatmap(ruleset.RulesetInfo);
-                    var beatmap = working.GetPlayableBeatmap(ruleset.RulesetInfo);
-
-                    ScoreProcessor scoreProcessor = new ScoreProcessor();
-
-                    var drawableRuleset = ruleset.CreateDrawableRulesetWith(beatmap);
-
-                    var hudOverlay = new HUDOverlay(scoreProcessor, null, drawableRuleset, Array.Empty<Mod>());
-
-                    // Add any key just to display the key counter visually.
-                    hudOverlay.KeyCounter.Add(new KeyCounterKeyboard(Key.Space));
-                    hudOverlay.ComboCounter.Current.Value = 1;
-
-                    // Apply a miss judgement
-                    scoreProcessor.ApplyResult(new JudgementResult(new HitObject(), new Judgement()) { Type = HitResult.Good });
-
-                    return new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Children = new Drawable[]
-                        {
-                            drawableRuleset,
-                            new SkinEditor(hudOverlay),
-                        }
-                    };
-                });
+                skinEditor?.Expire();
+                LoadComponentAsync(skinEditor = new SkinEditor(Player), Add);
             });
         }
 
-        protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
+        [Test]
+        public void TestToggleEditor()
+        {
+            AddToggleStep("toggle editor visibility", visible => skinEditor.ToggleVisibility());
+        }
+
+        protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
     }
 }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
new file mode 100644
index 0000000000..086bcb19c3
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
@@ -0,0 +1,61 @@
+// Copyright (c) ppy 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.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Screens.Play;
+using osu.Game.Skinning.Editor;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public class TestSceneSkinEditorMultipleSkins : SkinnableTestScene
+    {
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("create editor overlay", () =>
+            {
+                SetContents(() =>
+                {
+                    var ruleset = new OsuRuleset();
+                    var working = CreateWorkingBeatmap(ruleset.RulesetInfo);
+                    var beatmap = working.GetPlayableBeatmap(ruleset.RulesetInfo);
+
+                    ScoreProcessor scoreProcessor = new ScoreProcessor();
+
+                    var drawableRuleset = ruleset.CreateDrawableRulesetWith(beatmap);
+
+                    var hudOverlay = new HUDOverlay(scoreProcessor, null, drawableRuleset, Array.Empty<Mod>())
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                    };
+
+                    // Add any key just to display the key counter visually.
+                    hudOverlay.KeyCounter.Add(new KeyCounterKeyboard(Key.Space));
+                    hudOverlay.ComboCounter.Current.Value = 1;
+
+                    return new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Children = new Drawable[]
+                        {
+                            drawableRuleset,
+                            hudOverlay,
+                            new SkinEditor(hudOverlay),
+                        }
+                    };
+                });
+            });
+        }
+
+        protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
+    }
+}
diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 74d32bcb9f..4f81fad4ba 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.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 osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
 using osu.Game.Graphics.Cursor;
 
 namespace osu.Game.Skinning.Editor
 {
-    public class SkinEditor : CompositeDrawable
+    public class SkinEditor : VisibilityContainer
     {
         private readonly Drawable target;
+        private Container border;
+
+        protected override bool StartHidden => true;
 
         public SkinEditor(Drawable target)
         {
@@ -18,19 +24,67 @@ namespace osu.Game.Skinning.Editor
             RelativeSizeAxes = Axes.Both;
         }
 
-        protected override void LoadComplete()
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
         {
-            base.LoadComplete();
-
             InternalChild = new OsuContextMenuContainer
             {
                 RelativeSizeAxes = Axes.Both,
-                Children = new[]
+                Children = new Drawable[]
                 {
-                    target,
+                    border = new Container
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        RelativeSizeAxes = Axes.Both,
+                        Masking = true,
+                        BorderColour = colours.Yellow,
+                        BorderThickness = 5,
+                        CornerRadius = 5,
+                        Children = new Drawable[]
+                        {
+                            new Box
+                            {
+                                AlwaysPresent = true,
+                                Alpha = 0,
+                                RelativeSizeAxes = Axes.Both,
+                            },
+                        }
+                    },
                     new SkinBlueprintContainer(target),
                 }
             };
         }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            Show();
+        }
+
+        private const double transition_duration = 500;
+        private const float visible_target_scale = 0.8f;
+
+        protected override void PopIn()
+        {
+            if (IsLoaded)
+            {
+                target.ScaleTo(visible_target_scale, transition_duration, Easing.OutQuint);
+                border.ScaleTo(visible_target_scale, transition_duration, Easing.OutQuint);
+            }
+
+            this.FadeIn(transition_duration);
+        }
+
+        protected override void PopOut()
+        {
+            if (IsLoaded)
+            {
+                target.ScaleTo(1, transition_duration, Easing.OutQuint);
+                border.ScaleTo(1, transition_duration, Easing.OutQuint);
+            }
+
+            this.FadeOut(transition_duration, Easing.OutQuint);
+        }
     }
 }

From 3c84b0d8c624db113873e8b53a4f1f6cf491ba0c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Apr 2021 14:07:15 +0900
Subject: [PATCH 2980/3722] Fix selection screen point being wrong since recent
 refactors

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

diff --git a/osu.Game/Skinning/Editor/SkinBlueprint.cs b/osu.Game/Skinning/Editor/SkinBlueprint.cs
index 674153cb26..2cee94b2c6 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprint.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprint.cs
@@ -78,10 +78,10 @@ namespace osu.Game.Skinning.Editor
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => drawable.ReceivePositionalInputAt(screenSpacePos);
 
-        public override Vector2 ScreenSpaceSelectionPoint => drawable.ToScreenSpace(Vector2.Zero);
+        public override Vector2 ScreenSpaceSelectionPoint => drawable.Parent.ToScreenSpace(drawable.DrawPosition);
 
         public override Quad SelectionQuad => drawable.ScreenSpaceDrawQuad;
 
-        public override Vector2 GetInstantDelta(Vector2 screenSpacePosition) => Component.Parent.ToLocalSpace(screenSpacePosition) - drawable.Position;
+        public override Vector2 GetInstantDelta(Vector2 screenSpacePosition) => Component.Parent.ToLocalSpace(screenSpacePosition) - drawable.DrawPosition;
     }
 }

From 434e63d6297c9e6db9ed3a70562faa519c67ac8e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Apr 2021 14:14:04 +0900
Subject: [PATCH 2981/3722] Add skin customisation support to song progress
 display

---
 osu.Game/Screens/Play/SongProgress.cs | 57 +++++++++++++++++----------
 1 file changed, 36 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Screens/Play/SongProgress.cs b/osu.Game/Screens/Play/SongProgress.cs
index 6c7cb9376c..db81633aea 100644
--- a/osu.Game/Screens/Play/SongProgress.cs
+++ b/osu.Game/Screens/Play/SongProgress.cs
@@ -14,6 +14,7 @@ using osu.Framework.Timing;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI;
+using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Screens.Play
 {
@@ -71,30 +72,38 @@ namespace osu.Game.Screens.Play
 
         public SongProgress()
         {
-            Masking = true;
-
             Children = new Drawable[]
             {
-                info = new SongProgressInfo
+                new SongProgressDisplay
                 {
-                    Origin = Anchor.BottomLeft,
-                    Anchor = Anchor.BottomLeft,
-                    RelativeSizeAxes = Axes.X,
-                    Height = info_height,
-                },
-                graph = new SongProgressGraph
-                {
-                    RelativeSizeAxes = Axes.X,
-                    Origin = Anchor.BottomLeft,
-                    Anchor = Anchor.BottomLeft,
-                    Height = graph_height,
-                    Margin = new MarginPadding { Bottom = bottom_bar_height },
-                },
-                bar = new SongProgressBar(bottom_bar_height, graph_height, handle_size)
-                {
-                    Anchor = Anchor.BottomLeft,
-                    Origin = Anchor.BottomLeft,
-                    OnSeek = time => RequestSeek?.Invoke(time),
+                    Masking = true,
+                    RelativeSizeAxes = Axes.Both,
+                    Anchor = Anchor.BottomCentre,
+                    Origin = Anchor.BottomCentre,
+                    Children = new Drawable[]
+                    {
+                        info = new SongProgressInfo
+                        {
+                            Origin = Anchor.BottomLeft,
+                            Anchor = Anchor.BottomLeft,
+                            RelativeSizeAxes = Axes.X,
+                            Height = info_height,
+                        },
+                        graph = new SongProgressGraph
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            Origin = Anchor.BottomLeft,
+                            Anchor = Anchor.BottomLeft,
+                            Height = graph_height,
+                            Margin = new MarginPadding { Bottom = bottom_bar_height },
+                        },
+                        bar = new SongProgressBar(bottom_bar_height, graph_height, handle_size)
+                        {
+                            Anchor = Anchor.BottomLeft,
+                            Origin = Anchor.BottomLeft,
+                            OnSeek = time => RequestSeek?.Invoke(time),
+                        },
+                    }
                 },
             };
         }
@@ -175,5 +184,11 @@ namespace osu.Game.Screens.Play
             float finalMargin = bottom_bar_height + (AllowSeeking.Value ? handle_size.Y : 0) + (ShowGraph.Value ? graph_height : 0);
             info.TransformTo(nameof(info.Margin), new MarginPadding { Bottom = finalMargin }, transition_duration, Easing.In);
         }
+
+        public class SongProgressDisplay : Container, ISkinnableComponent
+        {
+            // TODO: move actual implementation into this.
+            // exists for skin customisation purposes.
+        }
     }
 }

From 1516e2ffef7228cff1f7d3c70ba7224dd9345a47 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Apr 2021 15:29:25 +0900
Subject: [PATCH 2982/3722] Update blueprint implementation in line with
 #12625.

---
 osu.Game/Skinning/Editor/SkinBlueprint.cs        | 4 +---
 osu.Game/Skinning/Editor/SkinSelectionHandler.cs | 4 +++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinBlueprint.cs b/osu.Game/Skinning/Editor/SkinBlueprint.cs
index 2cee94b2c6..491a403325 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprint.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprint.cs
@@ -78,10 +78,8 @@ namespace osu.Game.Skinning.Editor
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => drawable.ReceivePositionalInputAt(screenSpacePos);
 
-        public override Vector2 ScreenSpaceSelectionPoint => drawable.Parent.ToScreenSpace(drawable.DrawPosition);
+        public override Vector2 ScreenSpaceSelectionPoint => drawable.ScreenSpaceDrawQuad.Centre;
 
         public override Quad SelectionQuad => drawable.ScreenSpaceDrawQuad;
-
-        public override Vector2 GetInstantDelta(Vector2 screenSpacePosition) => Component.Parent.ToLocalSpace(screenSpacePosition) - drawable.DrawPosition;
     }
 }
diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 38404efd0c..466136f0a8 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.UserInterface;
+using osu.Game.Extensions;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Edit.Compose.Components;
@@ -107,7 +108,8 @@ namespace osu.Game.Skinning.Editor
         {
             foreach (var c in SelectedBlueprints)
             {
-                ((Drawable)c.Item).Position += moveEvent.InstantDelta;
+                Drawable drawable = (Drawable)c.Item;
+                drawable.Position += drawable.ScreenSpaceDeltaToParentSpace(moveEvent.ScreenSpaceDelta);
             }
 
             return true;

From b460181f15ea13569fdce9a557cda060b6775634 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Apr 2021 16:16:52 +0900
Subject: [PATCH 2983/3722] Add note about rotation not working as expected

---
 osu.Game/Skinning/Editor/SkinSelectionHandler.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 466136f0a8..17b459a916 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -88,6 +88,7 @@ namespace osu.Game.Skinning.Editor
 
         public override bool HandleRotation(float angle)
         {
+            // TODO: this doesn't correctly account for origin/anchor specs being different in a multi-selection.
             foreach (var c in SelectedBlueprints)
                 ((Drawable)c.Item).Rotation += angle;
 

From 141d3af302e1443af684b8658e8eca180d9e746a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Apr 2021 17:19:47 +0900
Subject: [PATCH 2984/3722] Add the ability to temporarily disable user scaling
 on a `ScalingContainer`

---
 .../Graphics/Containers/ScalingContainer.cs   | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Containers/ScalingContainer.cs b/osu.Game/Graphics/Containers/ScalingContainer.cs
index 8f07c3a656..b691e372c5 100644
--- a/osu.Game/Graphics/Containers/ScalingContainer.cs
+++ b/osu.Game/Graphics/Containers/ScalingContainer.cs
@@ -36,6 +36,24 @@ namespace osu.Game.Graphics.Containers
 
         private BackgroundScreenStack backgroundStack;
 
+        private bool allowScaling = true;
+
+        /// <summary>
+        /// Whether user scaling preferences should be applied. Enabled by default.
+        /// </summary>
+        public bool AllowScaling
+        {
+            get => allowScaling;
+            set
+            {
+                if (value == allowScaling)
+                    return;
+
+                allowScaling = value;
+                updateSize();
+            }
+        }
+
         /// <summary>
         /// Create a new instance.
         /// </summary>
@@ -139,7 +157,7 @@ namespace osu.Game.Graphics.Containers
                     backgroundStack?.FadeOut(fade_time);
             }
 
-            bool scaling = targetMode == null || scalingMode.Value == targetMode;
+            bool scaling = AllowScaling && (targetMode == null || scalingMode.Value == targetMode);
 
             var targetSize = scaling ? new Vector2(sizeX.Value, sizeY.Value) : Vector2.One;
             var targetPosition = scaling ? new Vector2(posX.Value, posY.Value) * (Vector2.One - targetSize) : Vector2.Zero;

From b93604395673af6dc74631f6601a241d06aac53f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Apr 2021 17:20:22 +0900
Subject: [PATCH 2985/3722] Add the skin editor to the game

---
 .../Input/Bindings/GlobalActionContainer.cs   |  6 +-
 osu.Game/OsuGame.cs                           |  8 ++
 osu.Game/Skinning/Editor/SkinEditor.cs        | 50 +++--------
 .../Skinning/Editor/SkinEditorContainer.cs    | 87 +++++++++++++++++++
 4 files changed, 110 insertions(+), 41 deletions(-)
 create mode 100644 osu.Game/Skinning/Editor/SkinEditorContainer.cs

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 6717de5658..ce945f3bf8 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -48,6 +48,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.Control, InputKey.O }, GlobalAction.ToggleSettings),
             new KeyBinding(new[] { InputKey.Control, InputKey.D }, GlobalAction.ToggleBeatmapListing),
             new KeyBinding(new[] { InputKey.Control, InputKey.N }, GlobalAction.ToggleNotifications),
+            new KeyBinding(new[] { InputKey.Shift, InputKey.F2 }, GlobalAction.ToggleSkinEditor),
 
             new KeyBinding(InputKey.Escape, GlobalAction.Back),
             new KeyBinding(InputKey.ExtraMouseButton1, GlobalAction.Back),
@@ -258,6 +259,9 @@ namespace osu.Game.Input.Bindings
         EditorNudgeLeft,
 
         [Description("Nudge selection right")]
-        EditorNudgeRight
+        EditorNudgeRight,
+
+        [Description("Toggle skin editor")]
+        ToggleSkinEditor,
     }
 }
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 28f32ba455..67e0e6a81c 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -51,6 +51,7 @@ using osu.Game.Utils;
 using LogLevel = osu.Framework.Logging.LogLevel;
 using osu.Game.Database;
 using osu.Game.IO;
+using osu.Game.Skinning.Editor;
 
 namespace osu.Game
 {
@@ -597,6 +598,8 @@ namespace osu.Game
                 screenContainer = new ScalingContainer(ScalingMode.ExcludeOverlays)
                 {
                     RelativeSizeAxes = Axes.Both,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
                     Children = new Drawable[]
                     {
                         receptor = new BackButton.Receptor(),
@@ -616,6 +619,7 @@ namespace osu.Game
                         logoContainer = new Container { RelativeSizeAxes = Axes.Both },
                     }
                 },
+                skinEditor = new SkinEditorContainer(screenContainer),
                 overlayContent = new Container { RelativeSizeAxes = Axes.Both },
                 rightFloatingOverlayContent = new Container { RelativeSizeAxes = Axes.Both },
                 leftFloatingOverlayContent = new Container { RelativeSizeAxes = Axes.Both },
@@ -942,6 +946,8 @@ namespace osu.Game
 
         private ScalingContainer screenContainer;
 
+        private SkinEditorContainer skinEditor;
+
         protected override bool OnExiting()
         {
             if (ScreenStack.CurrentScreen is Loader)
@@ -968,6 +974,8 @@ namespace osu.Game
 
         protected virtual void ScreenChanged(IScreen current, IScreen newScreen)
         {
+            skinEditor.Reset();
+
             switch (newScreen)
             {
                 case IntroScreen intro:
diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 4f81fad4ba..fdef4d0fce 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -4,16 +4,16 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics;
+using osu.Framework.Input.Events;
 using osu.Game.Graphics.Cursor;
 
 namespace osu.Game.Skinning.Editor
 {
-    public class SkinEditor : VisibilityContainer
+    public class SkinEditor : FocusedOverlayContainer
     {
+        public const double TRANSITION_DURATION = 500;
+
         private readonly Drawable target;
-        private Container border;
 
         protected override bool StartHidden => true;
 
@@ -25,32 +25,13 @@ namespace osu.Game.Skinning.Editor
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load()
         {
             InternalChild = new OsuContextMenuContainer
             {
                 RelativeSizeAxes = Axes.Both,
                 Children = new Drawable[]
                 {
-                    border = new Container
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        RelativeSizeAxes = Axes.Both,
-                        Masking = true,
-                        BorderColour = colours.Yellow,
-                        BorderThickness = 5,
-                        CornerRadius = 5,
-                        Children = new Drawable[]
-                        {
-                            new Box
-                            {
-                                AlwaysPresent = true,
-                                Alpha = 0,
-                                RelativeSizeAxes = Axes.Both,
-                            },
-                        }
-                    },
                     new SkinBlueprintContainer(target),
                 }
             };
@@ -62,29 +43,18 @@ namespace osu.Game.Skinning.Editor
             Show();
         }
 
-        private const double transition_duration = 500;
-        private const float visible_target_scale = 0.8f;
+        protected override bool OnHover(HoverEvent e) => true;
+
+        protected override bool OnMouseDown(MouseDownEvent e) => true;
 
         protected override void PopIn()
         {
-            if (IsLoaded)
-            {
-                target.ScaleTo(visible_target_scale, transition_duration, Easing.OutQuint);
-                border.ScaleTo(visible_target_scale, transition_duration, Easing.OutQuint);
-            }
-
-            this.FadeIn(transition_duration);
+            this.FadeIn(TRANSITION_DURATION, Easing.OutQuint);
         }
 
         protected override void PopOut()
         {
-            if (IsLoaded)
-            {
-                target.ScaleTo(1, transition_duration, Easing.OutQuint);
-                border.ScaleTo(1, transition_duration, Easing.OutQuint);
-            }
-
-            this.FadeOut(transition_duration, Easing.OutQuint);
+            this.FadeOut(TRANSITION_DURATION, Easing.OutQuint);
         }
     }
 }
diff --git a/osu.Game/Skinning/Editor/SkinEditorContainer.cs b/osu.Game/Skinning/Editor/SkinEditorContainer.cs
new file mode 100644
index 0000000000..f84b70d67a
--- /dev/null
+++ b/osu.Game/Skinning/Editor/SkinEditorContainer.cs
@@ -0,0 +1,87 @@
+// Copyright (c) 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.Input.Bindings;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Input.Bindings;
+
+namespace osu.Game.Skinning.Editor
+{
+    /// <summary>
+    /// A container which handles loading a skin editor on user request.
+    /// </summary>
+    public class SkinEditorContainer : CompositeDrawable, IKeyBindingHandler<GlobalAction>
+    {
+        private readonly ScalingContainer target;
+        private SkinEditor skinEditor;
+
+        private const float visible_target_scale = 0.8f;
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        public SkinEditorContainer(ScalingContainer target)
+        {
+            this.target = target;
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        public bool OnPressed(GlobalAction action)
+        {
+            switch (action)
+            {
+                case GlobalAction.ToggleSkinEditor:
+                    if (skinEditor == null)
+                    {
+                        LoadComponentAsync(skinEditor = new SkinEditor(target), AddInternal);
+                        skinEditor.State.BindValueChanged(editorVisibilityChanged);
+                    }
+                    else
+                        skinEditor.ToggleVisibility();
+
+                    return true;
+            }
+
+            return false;
+        }
+
+        private void editorVisibilityChanged(ValueChangedEvent<Visibility> visibility)
+        {
+            if (visibility.NewValue == Visibility.Visible)
+            {
+                target.ScaleTo(visible_target_scale, SkinEditor.TRANSITION_DURATION, Easing.OutQuint);
+
+                target.Masking = true;
+                target.BorderThickness = 5;
+                target.BorderColour = colours.Yellow;
+                target.AllowScaling = false;
+            }
+            else
+            {
+                target.BorderThickness = 0;
+                target.AllowScaling = true;
+
+                target.ScaleTo(1, SkinEditor.TRANSITION_DURATION, Easing.OutQuint).OnComplete(_ => target.Masking = false);
+            }
+        }
+
+        public void OnReleased(GlobalAction action)
+        {
+        }
+
+        /// <summary>
+        /// Exit any existing skin editor due to the game state changing.
+        /// </summary>
+        public void Reset()
+        {
+            skinEditor?.Hide();
+            skinEditor?.Expire();
+            skinEditor = null;
+        }
+    }
+}

From a7982787d446198a2aa95f18eab524fcd3a59d46 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Apr 2021 17:26:55 +0900
Subject: [PATCH 2986/3722] Add basic header text

---
 osu.Game/Skinning/Editor/SkinEditor.cs | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index fdef4d0fce..532c3de7fb 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -5,6 +5,8 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;
 
 namespace osu.Game.Skinning.Editor
@@ -15,6 +17,8 @@ namespace osu.Game.Skinning.Editor
 
         private readonly Drawable target;
 
+        private OsuTextFlowContainer headerText;
+
         protected override bool StartHidden => true;
 
         public SkinEditor(Drawable target)
@@ -25,16 +29,31 @@ namespace osu.Game.Skinning.Editor
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(OsuColour colours)
         {
             InternalChild = new OsuContextMenuContainer
             {
                 RelativeSizeAxes = Axes.Both,
                 Children = new Drawable[]
                 {
+                    headerText = new OsuTextFlowContainer()
+                    {
+                        TextAnchor = Anchor.TopCentre,
+                        Padding = new MarginPadding(20),
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        RelativeSizeAxes = Axes.X
+                    },
                     new SkinBlueprintContainer(target),
                 }
             };
+
+            headerText.AddParagraph("Skin editor (preview)", cp => cp.Font = OsuFont.Default.With(size: 24));
+            headerText.AddParagraph("This is a preview of what is to come. Changes are lost on changing screens.", cp =>
+            {
+                cp.Font = OsuFont.Default.With(size: 12);
+                cp.Colour = colours.Yellow;
+            });
         }
 
         protected override void LoadComplete()

From fb64f6faf205f8c3c5d46f52fabe016ac0782ea9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Apr 2021 17:40:58 +0900
Subject: [PATCH 2987/3722] Add ability to exit using game "back" binding

---
 osu.Game/Skinning/Editor/SkinEditorContainer.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Skinning/Editor/SkinEditorContainer.cs b/osu.Game/Skinning/Editor/SkinEditorContainer.cs
index f84b70d67a..adb1abefd1 100644
--- a/osu.Game/Skinning/Editor/SkinEditorContainer.cs
+++ b/osu.Game/Skinning/Editor/SkinEditorContainer.cs
@@ -35,6 +35,15 @@ namespace osu.Game.Skinning.Editor
         {
             switch (action)
             {
+                case GlobalAction.Back:
+                    if (skinEditor?.State.Value == Visibility.Visible)
+                    {
+                        skinEditor.ToggleVisibility();
+                        return true;
+                    }
+
+                    break;
+
                 case GlobalAction.ToggleSkinEditor:
                     if (skinEditor == null)
                     {

From 63435ba5482b8c832ea5f1eab612054c5b9b1e6f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Apr 2021 17:41:07 +0900
Subject: [PATCH 2988/3722] Ensure toolbar doesn't overlap editor content

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 67e0e6a81c..77fb9c3b63 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -619,7 +619,6 @@ namespace osu.Game
                         logoContainer = new Container { RelativeSizeAxes = Axes.Both },
                     }
                 },
-                skinEditor = new SkinEditorContainer(screenContainer),
                 overlayContent = new Container { RelativeSizeAxes = Axes.Both },
                 rightFloatingOverlayContent = new Container { RelativeSizeAxes = Axes.Both },
                 leftFloatingOverlayContent = new Container { RelativeSizeAxes = Axes.Both },
@@ -689,6 +688,7 @@ namespace osu.Game
             var changelogOverlay = loadComponentSingleFile(new ChangelogOverlay(), overlayContent.Add, true);
             loadComponentSingleFile(userProfile = new UserProfileOverlay(), overlayContent.Add, true);
             loadComponentSingleFile(beatmapSetOverlay = new BeatmapSetOverlay(), overlayContent.Add, true);
+            loadComponentSingleFile(skinEditor = new SkinEditorContainer(screenContainer), overlayContent.Add);
 
             loadComponentSingleFile(new LoginOverlay
             {

From e716162ac242a5a36f2b435339a54472707e9ffd Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Wed, 28 Apr 2021 20:55:20 +0800
Subject: [PATCH 2989/3722] Fix formatting

---
 osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
index 13876f1648..f8dd6953ad 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
@@ -8,7 +8,6 @@ using System.Text;
 using osu.Framework.Extensions;
 using osu.Game.Beatmaps;
 using osu.Game.IO.Legacy;
-using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets.Replays.Types;
 using SharpCompress.Compressors.LZMA;
 
@@ -91,13 +90,14 @@ namespace osu.Game.Scoring.Legacy
 
                 if (score.Replay != null)
                 {
-                    int lastTimeRounded = 0;
+                    int lastTime = 0;
+
                     foreach (var f in score.Replay.Frames.OfType<IConvertibleReplayFrame>().Select(f => f.ToLegacy(beatmap)))
                     {
                         // Rounding because stable could only parse integral values
-                        int timeRounded = (int)Math.Round(f.Time);
-                        replayData.Append(FormattableString.Invariant($"{timeRounded - lastTimeRounded}|{f.MouseX ?? 0}|{f.MouseY ?? 0}|{(int)f.ButtonState},"));
-                        lastTimeRounded = timeRounded;
+                        int time = (int)Math.Round(f.Time);
+                        replayData.Append(FormattableString.Invariant($"{time - lastTime}|{f.MouseX ?? 0}|{f.MouseY ?? 0}|{(int)f.ButtonState},"));
+                        lastTime = time;
                     }
                 }
 

From 8d056ff38f6685ada5be49654838be7be4ad49d4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Apr 2021 18:23:22 +0900
Subject: [PATCH 2990/3722] Remove redundant parenthesis

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

diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 532c3de7fb..562dd23224 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Skinning.Editor
                 RelativeSizeAxes = Axes.Both,
                 Children = new Drawable[]
                 {
-                    headerText = new OsuTextFlowContainer()
+                    headerText = new OsuTextFlowContainer
                     {
                         TextAnchor = Anchor.TopCentre,
                         Padding = new MarginPadding(20),

From fd8e552a8bb12d2aa854adef2ab0d66ed7d5ea9b Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 29 Apr 2021 19:36:52 +0900
Subject: [PATCH 2991/3722] Fix filename not matching class name

---
 ...estSceneDrawableNote.cs => TestSceneDrawableManiaHitObject.cs} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename osu.Game.Rulesets.Mania.Tests/{TestSceneDrawableNote.cs => TestSceneDrawableManiaHitObject.cs} (100%)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableNote.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableManiaHitObject.cs
similarity index 100%
rename from osu.Game.Rulesets.Mania.Tests/TestSceneDrawableNote.cs
rename to osu.Game.Rulesets.Mania.Tests/TestSceneDrawableManiaHitObject.cs

From cfbf95b4331c777a5dbd109fb57b3e5f76e2fc93 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Thu, 29 Apr 2021 14:11:35 -0700
Subject: [PATCH 2992/3722] Add HasPerformancePoints extension method

---
 ...tOnlineStatus.cs => BeatmapSetOnlineStatusExtensions.cs} | 6 ++++++
 osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs      | 4 +---
 .../Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs | 3 ++-
 3 files changed, 9 insertions(+), 4 deletions(-)
 rename osu.Game/Beatmaps/{BeatmapSetOnlineStatus.cs => BeatmapSetOnlineStatusExtensions.cs} (61%)

diff --git a/osu.Game/Beatmaps/BeatmapSetOnlineStatus.cs b/osu.Game/Beatmaps/BeatmapSetOnlineStatusExtensions.cs
similarity index 61%
rename from osu.Game/Beatmaps/BeatmapSetOnlineStatus.cs
rename to osu.Game/Beatmaps/BeatmapSetOnlineStatusExtensions.cs
index 5864975a2e..1de641f4f1 100644
--- a/osu.Game/Beatmaps/BeatmapSetOnlineStatus.cs
+++ b/osu.Game/Beatmaps/BeatmapSetOnlineStatusExtensions.cs
@@ -3,6 +3,12 @@
 
 namespace osu.Game.Beatmaps
 {
+    public static class BeatmapSetOnlineStatusExtensions
+    {
+        public static bool HasPerformancePoints(this BeatmapSetOnlineStatus status)
+            => status == BeatmapSetOnlineStatus.Ranked || status == BeatmapSetOnlineStatus.Approved;
+    }
+
     public enum BeatmapSetOnlineStatus
     {
         None = -3,
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
index 3e95d125de..8786cf0e63 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
@@ -59,10 +59,8 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
 
                 var scoreInfos = value.Scores.Select(s => s.CreateScoreInfo(rulesets)).ToList();
                 var topScore = scoreInfos.First();
-                var status = topScore.Beatmap?.Status;
-                var showPerformanceColumn = status == BeatmapSetOnlineStatus.Ranked || status == BeatmapSetOnlineStatus.Approved;
 
-                scoreTable.DisplayScores(scoreInfos, showPerformanceColumn);
+                scoreTable.DisplayScores(scoreInfos, topScore.Beatmap?.Status.HasPerformancePoints() ?? false);
                 scoreTable.Show();
 
                 var userScore = value.UserScore;
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index 5cb834b510..57df54d851 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -111,7 +111,8 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
 
                 accuracyColumn.Text = value.DisplayAccuracy;
                 maxComboColumn.Text = $@"{value.MaxCombo:N0}x";
-                ppColumn.Alpha = value.Beatmap?.Status == BeatmapSetOnlineStatus.Ranked ? 1 : 0;
+
+                ppColumn.Alpha = value.Beatmap?.Status.HasPerformancePoints() ?? false ? 1 : 0;
                 ppColumn.Text = $@"{value.PP:N0}";
 
                 statisticsColumns.ChildrenEnumerable = value.GetStatisticsForDisplay().Select(createStatisticsColumn);

From 9952a5bfdb25c5130d1fe1462b5578a860d1880c Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Thu, 29 Apr 2021 14:24:29 -0700
Subject: [PATCH 2993/3722] Revert "Fix button being recreated on importing
 state"

This reverts commit c9967f7b7486d5744aba911a144110811b76ef04.
---
 osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs
index 85ed3f8767..a61640a02e 100644
--- a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs
+++ b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs
@@ -268,13 +268,11 @@ namespace osu.Game.Overlays.BeatmapSet
                     break;
 
                 case DownloadState.Downloading:
+                case DownloadState.Importing:
                     // temporary to avoid showing two buttons for maps with novideo. will be fixed in new beatmap overlay design.
                     downloadButtonsContainer.Child = new HeaderDownloadButton(BeatmapSet.Value);
                     break;
 
-                case DownloadState.Importing:
-                    break;
-
                 default:
                     downloadButtonsContainer.Child = new HeaderDownloadButton(BeatmapSet.Value);
                     if (BeatmapSet.Value.OnlineInfo.HasVideo)

From 25e0fb1cf9de0e01d8225f97f737cadf43390572 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 30 Apr 2021 01:59:59 +0300
Subject: [PATCH 2994/3722] Refactor OsuModBarrelRoll to allow it's usage by
 other rulesets

---
 .../Mods/OsuModBarrelRoll.cs                  | 40 ++------------
 osu.Game/Rulesets/Mods/ModBarrelRoll.cs       | 52 +++++++++++++++++++
 2 files changed, 55 insertions(+), 37 deletions(-)
 create mode 100644 osu.Game/Rulesets/Mods/ModBarrelRoll.cs

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
index 37ba401d42..f63edbd99f 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
@@ -2,52 +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.Extensions;
-using osu.Framework.Graphics;
-using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Rulesets.Osu.UI;
-using osu.Game.Rulesets.UI;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
-    public class OsuModBarrelRoll : Mod, IUpdatableByPlayfield, IApplicableToDrawableRuleset<OsuHitObject>, IApplicableToDrawableHitObjects
+    public class OsuModBarrelRoll : ModBarrelRoll<OsuHitObject>, IApplicableToDrawableHitObjects
     {
-        private float currentRotation;
-
-        [SettingSource("Roll speed", "Rotations per minute")]
-        public BindableNumber<double> SpinSpeed { get; } = new BindableDouble(0.5)
-        {
-            MinValue = 0.02,
-            MaxValue = 12,
-            Precision = 0.01,
-        };
-
-        [SettingSource("Direction", "The direction of rotation")]
-        public Bindable<RotationDirection> Direction { get; } = new Bindable<RotationDirection>(RotationDirection.Clockwise);
-
-        public override string Name => "Barrel Roll";
-        public override string Acronym => "BR";
-        public override string Description => "The whole playfield is on a wheel!";
-        public override double ScoreMultiplier => 1;
-
-        public override string SettingDescription => $"{SpinSpeed.Value} rpm {Direction.Value.GetDescription().ToLowerInvariant()}";
-
-        public void Update(Playfield playfield)
-        {
-            playfield.Rotation = currentRotation = (Direction.Value == RotationDirection.Counterclockwise ? -1 : 1) * 360 * (float)(playfield.Time.Current / 60000 * SpinSpeed.Value);
-        }
-
-        public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
-        {
-            // scale the playfield to allow all hitobjects to stay within the visible region.
-            drawableRuleset.Playfield.Scale = new Vector2(OsuPlayfield.BASE_SIZE.Y / OsuPlayfield.BASE_SIZE.X);
-        }
+        protected override Vector2 PlayfieldScale => new Vector2(OsuPlayfield.BASE_SIZE.Y / OsuPlayfield.BASE_SIZE.X);
 
         public void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
         {
@@ -58,7 +24,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                     switch (d)
                     {
                         case DrawableHitCircle circle:
-                            circle.CirclePiece.Rotation = -currentRotation;
+                            circle.CirclePiece.Rotation = -CurrentRotation;
                             break;
                     }
                 };
diff --git a/osu.Game/Rulesets/Mods/ModBarrelRoll.cs b/osu.Game/Rulesets/Mods/ModBarrelRoll.cs
new file mode 100644
index 0000000000..d9424563c5
--- /dev/null
+++ b/osu.Game/Rulesets/Mods/ModBarrelRoll.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 osu.Framework.Bindables;
+using osu.Framework.Extensions;
+using osu.Framework.Graphics;
+using osu.Game.Configuration;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.UI;
+using osuTK;
+
+namespace osu.Game.Rulesets.Mods
+{
+    public abstract class ModBarrelRoll<TObject> : Mod, IUpdatableByPlayfield, IApplicableToDrawableRuleset<TObject>
+        where TObject : HitObject
+    {
+        protected float CurrentRotation { get; private set; }
+
+        [SettingSource("Roll speed", "Rotations per minute")]
+        public BindableNumber<double> SpinSpeed { get; } = new BindableDouble(0.5)
+        {
+            MinValue = 0.02,
+            MaxValue = 12,
+            Precision = 0.01,
+        };
+
+        [SettingSource("Direction", "The direction of rotation")]
+        public Bindable<RotationDirection> Direction { get; } = new Bindable<RotationDirection>(RotationDirection.Clockwise);
+
+        public override string Name => "Barrel Roll";
+        public override string Acronym => "BR";
+        public override string Description => "The whole playfield is on a wheel!";
+        public override double ScoreMultiplier => 1;
+
+        public override string SettingDescription => $"{SpinSpeed.Value} rpm {Direction.Value.GetDescription().ToLowerInvariant()}";
+
+        /// <summary>
+        /// Used to allow all hitobjects to stay within the visible region.
+        /// </summary>
+        protected abstract Vector2 PlayfieldScale { get; }
+
+        public void Update(Playfield playfield)
+        {
+            playfield.Rotation = CurrentRotation = (Direction.Value == RotationDirection.Counterclockwise ? -1 : 1) * 360 * (float)(playfield.Time.Current / 60000 * SpinSpeed.Value);
+        }
+
+        public void ApplyToDrawableRuleset(DrawableRuleset<TObject> drawableRuleset)
+        {
+            drawableRuleset.Playfield.Scale = PlayfieldScale;
+        }
+    }
+}

From 7bf3498e2add11f5b3590b2d76df409efce1e06d Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 30 Apr 2021 02:49:19 +0300
Subject: [PATCH 2995/3722] Calculate playfield scale locally

---
 osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs |  4 ----
 osu.Game/Rulesets/Mods/ModBarrelRoll.cs        | 13 +++++++------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
index f63edbd99f..9ae9653e9b 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
@@ -6,15 +6,11 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
-using osu.Game.Rulesets.Osu.UI;
-using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
     public class OsuModBarrelRoll : ModBarrelRoll<OsuHitObject>, IApplicableToDrawableHitObjects
     {
-        protected override Vector2 PlayfieldScale => new Vector2(OsuPlayfield.BASE_SIZE.Y / OsuPlayfield.BASE_SIZE.X);
-
         public void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
         {
             foreach (var d in drawables)
diff --git a/osu.Game/Rulesets/Mods/ModBarrelRoll.cs b/osu.Game/Rulesets/Mods/ModBarrelRoll.cs
index d9424563c5..4c28c730ec 100644
--- a/osu.Game/Rulesets/Mods/ModBarrelRoll.cs
+++ b/osu.Game/Rulesets/Mods/ModBarrelRoll.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;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
@@ -34,11 +35,6 @@ namespace osu.Game.Rulesets.Mods
 
         public override string SettingDescription => $"{SpinSpeed.Value} rpm {Direction.Value.GetDescription().ToLowerInvariant()}";
 
-        /// <summary>
-        /// Used to allow all hitobjects to stay within the visible region.
-        /// </summary>
-        protected abstract Vector2 PlayfieldScale { get; }
-
         public void Update(Playfield playfield)
         {
             playfield.Rotation = CurrentRotation = (Direction.Value == RotationDirection.Counterclockwise ? -1 : 1) * 360 * (float)(playfield.Time.Current / 60000 * SpinSpeed.Value);
@@ -46,7 +42,12 @@ namespace osu.Game.Rulesets.Mods
 
         public void ApplyToDrawableRuleset(DrawableRuleset<TObject> drawableRuleset)
         {
-            drawableRuleset.Playfield.Scale = PlayfieldScale;
+            // scale the playfield to allow all hitobjects to stay within the visible region.
+
+            var playfieldSize = drawableRuleset.Playfield.DrawSize;
+            var minSide = MathF.Min(playfieldSize.X, playfieldSize.Y);
+            var maxSide = MathF.Max(playfieldSize.X, playfieldSize.Y);
+            drawableRuleset.Playfield.Scale = new Vector2(minSide / maxSide);
         }
     }
 }

From e69ec91c072c7f4edac21eb944307a1999c8c485 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Apr 2021 11:25:39 +0900
Subject: [PATCH 2996/3722] Add xmldoc for `CurrentRotation`

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

diff --git a/osu.Game/Rulesets/Mods/ModBarrelRoll.cs b/osu.Game/Rulesets/Mods/ModBarrelRoll.cs
index 4c28c730ec..0d344b5269 100644
--- a/osu.Game/Rulesets/Mods/ModBarrelRoll.cs
+++ b/osu.Game/Rulesets/Mods/ModBarrelRoll.cs
@@ -15,6 +15,10 @@ namespace osu.Game.Rulesets.Mods
     public abstract class ModBarrelRoll<TObject> : Mod, IUpdatableByPlayfield, IApplicableToDrawableRuleset<TObject>
         where TObject : HitObject
     {
+        /// <summary>
+        /// The current angle of rotation being applied by this mod.
+        /// Generally should be used to apply inverse rotation to elements which should not be rotated.
+        /// </summary>
         protected float CurrentRotation { get; private set; }
 
         [SettingSource("Roll speed", "Rotations per minute")]

From 820408757a736d3ff3c9dc59cd933bcb1874990a Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 30 Apr 2021 09:43:05 +0700
Subject: [PATCH 2997/3722] add OsuMarkdownListItem

---
 .../Markdown/OsuMarkdownListItem.cs           | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
new file mode 100644
index 0000000000..7b92a2210d
--- /dev/null
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
@@ -0,0 +1,21 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osuTK;
+
+namespace osu.Game.Graphics.Containers.Markdown
+{
+    public class OsuMarkdownListItem : FillFlowContainer
+    {
+        public OsuMarkdownListItem()
+        {
+            AutoSizeAxes = Axes.Y;
+            RelativeSizeAxes = Axes.X;
+
+            Direction = FillDirection.Vertical;
+            Spacing = new Vector2(10, 10);
+        }
+    }
+}

From a24a27940408a6c6ddf082f9073b5b9db79c0eef Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 30 Apr 2021 09:43:21 +0700
Subject: [PATCH 2998/3722] use OsuMarkdownListItem for ListItemBlock

---
 .../Graphics/Containers/Markdown/OsuMarkdownContainer.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index 56bf72656a..c7e9f267bd 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -21,6 +21,13 @@ namespace osu.Game.Graphics.Containers.Markdown
                     // Don't parse YAML Frontmatter
                     break;
 
+                case ListItemBlock listItemBlock:
+                    var childContainer = CreateListItem(listItemBlock);
+                    container.Add(childContainer);
+                    foreach (var single in listItemBlock)
+                        base.AddMarkdownComponent(single, childContainer, level);
+                    break;
+
                 default:
                     base.AddMarkdownComponent(markdownObject, container, level);
                     break;
@@ -37,6 +44,8 @@ namespace osu.Game.Graphics.Containers.Markdown
 
         protected override MarkdownTable CreateTable(Table table) => new OsuMarkdownTable(table);
 
+        protected virtual OsuMarkdownListItem CreateListItem(ListItemBlock listItemBlock) => new OsuMarkdownListItem();
+
         protected override MarkdownPipeline CreateBuilder()
             => new MarkdownPipelineBuilder().UseAutoIdentifiers(AutoIdentifierOptions.GitHub)
                                             .UseEmojiAndSmiley()

From 1e8b3f3a8c81ab996d4875f9ca55e65bce64fcb4 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 30 Apr 2021 09:47:25 +0700
Subject: [PATCH 2999/3722] handle list padding in OsuMarkdownListItem

Reference : https://github.com/ppy/osu-web/blob/5b0e3ac3ffce6b1aff8c9a8794db56603e885ef8/resources/assets/less/bem/osu-md.less#L193-L194
---
 .../Graphics/Containers/Markdown/OsuMarkdownContainer.cs    | 6 ++++++
 .../Graphics/Containers/Markdown/OsuMarkdownListItem.cs     | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index c7e9f267bd..0638767414 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -6,6 +6,7 @@ using Markdig.Extensions.AutoIdentifiers;
 using Markdig.Extensions.Tables;
 using Markdig.Extensions.Yaml;
 using Markdig.Syntax;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Containers.Markdown;
 
@@ -44,6 +45,11 @@ namespace osu.Game.Graphics.Containers.Markdown
 
         protected override MarkdownTable CreateTable(Table table) => new OsuMarkdownTable(table);
 
+        protected override MarkdownList CreateList(ListBlock listBlock) => new MarkdownList
+        {
+            Padding = new MarginPadding(0)
+        };
+
         protected virtual OsuMarkdownListItem CreateListItem(ListItemBlock listItemBlock) => new OsuMarkdownListItem();
 
         protected override MarkdownPipeline CreateBuilder()
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
index 7b92a2210d..732817a1d5 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
@@ -9,6 +9,8 @@ namespace osu.Game.Graphics.Containers.Markdown
 {
     public class OsuMarkdownListItem : FillFlowContainer
     {
+        private const float default_left_padding = 20;
+
         public OsuMarkdownListItem()
         {
             AutoSizeAxes = Axes.Y;
@@ -16,6 +18,7 @@ namespace osu.Game.Graphics.Containers.Markdown
 
             Direction = FillDirection.Vertical;
             Spacing = new Vector2(10, 10);
+            Padding = new MarginPadding { Left = default_left_padding };
         }
     }
 }

From 010c51e6edea430569b1a15455880f9ec086f6af Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 30 Apr 2021 10:12:43 +0700
Subject: [PATCH 3000/3722] change OsuMarkdownListItem to composite drawable

---
 .../Markdown/OsuMarkdownContainer.cs           |  2 +-
 .../Containers/Markdown/OsuMarkdownListItem.cs | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index 0638767414..fc4eecf297 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Graphics.Containers.Markdown
                     var childContainer = CreateListItem(listItemBlock);
                     container.Add(childContainer);
                     foreach (var single in listItemBlock)
-                        base.AddMarkdownComponent(single, childContainer, level);
+                        base.AddMarkdownComponent(single, childContainer.Content, level);
                     break;
 
                 default:
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
index 732817a1d5..501da7721e 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
@@ -7,18 +7,28 @@ using osuTK;
 
 namespace osu.Game.Graphics.Containers.Markdown
 {
-    public class OsuMarkdownListItem : FillFlowContainer
+    public class OsuMarkdownListItem : CompositeDrawable
     {
         private const float default_left_padding = 20;
 
+        public FillFlowContainer Content { get; }
+
         public OsuMarkdownListItem()
         {
             AutoSizeAxes = Axes.Y;
             RelativeSizeAxes = Axes.X;
-
-            Direction = FillDirection.Vertical;
-            Spacing = new Vector2(10, 10);
             Padding = new MarginPadding { Left = default_left_padding };
+
+            InternalChildren = new Drawable[]
+            {
+                Content = new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Y,
+                    RelativeSizeAxes = Axes.X,
+                    Direction = FillDirection.Vertical,
+                    Spacing = new Vector2(10, 10),
+                }
+            };
         }
     }
 }

From e3cc4561abcc0b8a7ec9b0c53e36c3339cb8c6a9 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 30 Apr 2021 10:35:40 +0700
Subject: [PATCH 3001/3722] add bullet marker in OsuMarkdownListItem

---
 .../Containers/Markdown/OsuMarkdownListItem.cs | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
index 501da7721e..6b35321617 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.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.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Containers.Markdown;
 using osuTK;
 
 namespace osu.Game.Graphics.Containers.Markdown
@@ -11,6 +13,9 @@ namespace osu.Game.Graphics.Containers.Markdown
     {
         private const float default_left_padding = 20;
 
+        [Resolved]
+        private IMarkdownTextComponent parentTextComponent { get; set; }
+
         public FillFlowContainer Content { get; }
 
         public OsuMarkdownListItem()
@@ -30,5 +35,18 @@ namespace osu.Game.Graphics.Containers.Markdown
                 }
             };
         }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            var marker = parentTextComponent.CreateSpriteText();
+            marker.Text = "●";
+            marker.Font = OsuFont.GetFont(size: marker.Font.Size / 2);
+            marker.Origin = Anchor.Centre;
+            marker.X = -default_left_padding / 2;
+            marker.Y = marker.Font.Size;
+
+            AddInternal(marker);
+        }
     }
 }

From f676526cf49c270698499983098ed0eca80c5a2d Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 30 Apr 2021 10:39:48 +0700
Subject: [PATCH 3002/3722] add level in OsuMarkdownListItem

---
 .../Graphics/Containers/Markdown/OsuMarkdownContainer.cs     | 4 ++--
 osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index fc4eecf297..1db47d6978 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Graphics.Containers.Markdown
                     break;
 
                 case ListItemBlock listItemBlock:
-                    var childContainer = CreateListItem(listItemBlock);
+                    var childContainer = CreateListItem(listItemBlock, level);
                     container.Add(childContainer);
                     foreach (var single in listItemBlock)
                         base.AddMarkdownComponent(single, childContainer.Content, level);
@@ -50,7 +50,7 @@ namespace osu.Game.Graphics.Containers.Markdown
             Padding = new MarginPadding(0)
         };
 
-        protected virtual OsuMarkdownListItem CreateListItem(ListItemBlock listItemBlock) => new OsuMarkdownListItem();
+        protected virtual OsuMarkdownListItem CreateListItem(ListItemBlock listItemBlock, int level) => new OsuMarkdownListItem(level);
 
         protected override MarkdownPipeline CreateBuilder()
             => new MarkdownPipelineBuilder().UseAutoIdentifiers(AutoIdentifierOptions.GitHub)
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
index 6b35321617..f9800d9262 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
@@ -11,6 +11,7 @@ namespace osu.Game.Graphics.Containers.Markdown
 {
     public class OsuMarkdownListItem : CompositeDrawable
     {
+        private readonly int level;
         private const float default_left_padding = 20;
 
         [Resolved]
@@ -18,8 +19,10 @@ namespace osu.Game.Graphics.Containers.Markdown
 
         public FillFlowContainer Content { get; }
 
-        public OsuMarkdownListItem()
+        public OsuMarkdownListItem(int level)
         {
+            this.level = level;
+
             AutoSizeAxes = Axes.Y;
             RelativeSizeAxes = Axes.X;
             Padding = new MarginPadding { Left = default_left_padding };

From 781064ba9693c72adda2d84f8a81deba782f9888 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 30 Apr 2021 10:40:06 +0700
Subject: [PATCH 3003/3722] create list marker based on its level

---
 .../Containers/Markdown/OsuMarkdownListItem.cs  | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
index f9800d9262..7b7cb5837c 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Graphics.Containers.Markdown
         private void load()
         {
             var marker = parentTextComponent.CreateSpriteText();
-            marker.Text = "●";
+            marker.Text = createTextMarker();
             marker.Font = OsuFont.GetFont(size: marker.Font.Size / 2);
             marker.Origin = Anchor.Centre;
             marker.X = -default_left_padding / 2;
@@ -51,5 +51,20 @@ namespace osu.Game.Graphics.Containers.Markdown
 
             AddInternal(marker);
         }
+
+        private string createTextMarker()
+        {
+            switch (level)
+            {
+                case 1:
+                    return "●";
+
+                case 2:
+                    return "○";
+
+                default:
+                    return "■";
+            }
+        }
     }
 }

From 1582b0da881a0d7b308ab6730766a8d9457902ee Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 30 Apr 2021 10:43:19 +0700
Subject: [PATCH 3004/3722] add ordered list test

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

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
index 11c06abee7..3367fccbf1 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
@@ -128,5 +128,25 @@ Line below";
 - Third item level 1";
             });
         }
+
+        [Test]
+        public void TestOrderedList()
+        {
+            AddStep("Add Ordered List", () =>
+            {
+                markdownContainer.Text = @"1. First item level 1
+2. Second item level 1
+    1. First item level 2
+        1. First item level 3
+        2. Second item level 3
+        3. Third item level 3
+            1. First item level 4
+            2. Second item level 4
+            3. Third item level 4
+    2. Second item level 2
+    3. Third item level 2
+3. Third item level 1";
+            });
+        }
     }
 }

From 2a3479f30d845c1294fe3214da9fd4938da7f3f4 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 30 Apr 2021 10:47:51 +0700
Subject: [PATCH 3005/3722] add order in OsuMarkdownListItem for ordered list

---
 .../Graphics/Containers/Markdown/OsuMarkdownContainer.cs    | 2 +-
 .../Graphics/Containers/Markdown/OsuMarkdownListItem.cs     | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index 1db47d6978..b765378e4c 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Graphics.Containers.Markdown
             Padding = new MarginPadding(0)
         };
 
-        protected virtual OsuMarkdownListItem CreateListItem(ListItemBlock listItemBlock, int level) => new OsuMarkdownListItem(level);
+        protected virtual OsuMarkdownListItem CreateListItem(ListItemBlock listItemBlock, int level) => new OsuMarkdownListItem(level, listItemBlock.Order);
 
         protected override MarkdownPipeline CreateBuilder()
             => new MarkdownPipelineBuilder().UseAutoIdentifiers(AutoIdentifierOptions.GitHub)
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
index 7b7cb5837c..361e503cd4 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
@@ -12,6 +12,8 @@ namespace osu.Game.Graphics.Containers.Markdown
     public class OsuMarkdownListItem : CompositeDrawable
     {
         private readonly int level;
+        private readonly int order;
+        private readonly bool isOrdered;
         private const float default_left_padding = 20;
 
         [Resolved]
@@ -19,9 +21,11 @@ namespace osu.Game.Graphics.Containers.Markdown
 
         public FillFlowContainer Content { get; }
 
-        public OsuMarkdownListItem(int level)
+        public OsuMarkdownListItem(int level, int order)
         {
             this.level = level;
+            this.order = order;
+            isOrdered = order != 0;
 
             AutoSizeAxes = Axes.Y;
             RelativeSizeAxes = Axes.X;

From c0d9f9f8c687062d444a44edd02916b9a2ef5c2b Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 30 Apr 2021 10:48:12 +0700
Subject: [PATCH 3006/3722] use order number as marker for ordered list

---
 osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
index 361e503cd4..b091e9ac07 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
@@ -58,6 +58,11 @@ namespace osu.Game.Graphics.Containers.Markdown
 
         private string createTextMarker()
         {
+            if (isOrdered)
+            {
+                return $"{order}.";
+            }
+
             switch (level)
             {
                 case 1:

From e6579352f9a3dda275d6fc5f7c313bec11837235 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 30 Apr 2021 10:56:41 +0700
Subject: [PATCH 3007/3722] add left padding for ordered list

In osu-md.less, this rule style[1] removes padding left in ordered list.
But in this rule style[2], pseudo element `::before` is used as marker
or counter and has minimal width 30px. So we use this as left padding
size.

[1] https://github.com/ppy/osu-web/blob/5b0e3ac3ffce6b1aff8c9a8794db56603e885ef8/resources/assets/less/bem/osu-md.less#L196-L200
[2] https://github.com/ppy/osu-web/blob/5b0e3ac3ffce6b1aff8c9a8794db56603e885ef8/resources/assets/less/bem/osu-md.less#L210-L219
---
 .../Graphics/Containers/Markdown/OsuMarkdownListItem.cs     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
index b091e9ac07..b448ea154f 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
@@ -14,7 +14,9 @@ namespace osu.Game.Graphics.Containers.Markdown
         private readonly int level;
         private readonly int order;
         private readonly bool isOrdered;
-        private const float default_left_padding = 20;
+
+        private const float ordered_left_padding = 30;
+        private const float unordered_left_padding = 20;
 
         [Resolved]
         private IMarkdownTextComponent parentTextComponent { get; set; }
@@ -29,7 +31,7 @@ namespace osu.Game.Graphics.Containers.Markdown
 
             AutoSizeAxes = Axes.Y;
             RelativeSizeAxes = Axes.X;
-            Padding = new MarginPadding { Left = default_left_padding };
+            Padding = new MarginPadding { Left = isOrdered ? ordered_left_padding : unordered_left_padding };
 
             InternalChildren = new Drawable[]
             {

From cf53a05dfdfef6eb3c6b9f73cb12c7b20c01a802 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 30 Apr 2021 10:59:23 +0700
Subject: [PATCH 3008/3722] change marker size and position for ordered list

---
 .../Containers/Markdown/OsuMarkdownListItem.cs   | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
index b448ea154f..f020e3e2fc 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
@@ -50,10 +50,18 @@ namespace osu.Game.Graphics.Containers.Markdown
         {
             var marker = parentTextComponent.CreateSpriteText();
             marker.Text = createTextMarker();
-            marker.Font = OsuFont.GetFont(size: marker.Font.Size / 2);
-            marker.Origin = Anchor.Centre;
-            marker.X = -default_left_padding / 2;
-            marker.Y = marker.Font.Size;
+
+            if (isOrdered)
+            {
+                marker.X = -ordered_left_padding;
+            }
+            else
+            {
+                marker.Font = OsuFont.GetFont(size: marker.Font.Size / 2);
+                marker.Origin = Anchor.Centre;
+                marker.X = -unordered_left_padding / 2;
+                marker.Y = marker.Font.Size;
+            }
 
             AddInternal(marker);
         }

From cdef07b2eee4cb587fcda722febe81cd9b10366e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Apr 2021 13:09:57 +0900
Subject: [PATCH 3009/3722] Fix blueprints not hiding when deleting elements

---
 osu.Game/Skinning/Editor/SkinSelectionHandler.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 17b459a916..0408ce74a6 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -20,7 +20,10 @@ namespace osu.Game.Skinning.Editor
         protected override void DeleteItems(IEnumerable<ISkinnableComponent> items)
         {
             foreach (var i in items)
-                i.Hide();
+            {
+                ((Drawable)i).Expire();
+                SelectedItems.Remove(i);
+            }
         }
 
         protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint<ISkinnableComponent>> selection)

From 4770a64709e529479c69ad7a4ae024a9801f2fe0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 Apr 2021 18:47:22 +0900
Subject: [PATCH 3010/3722] Add proof of concept components list

---
 .../TestSceneSkinEditorComponentsList.cs      | 93 +++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs
new file mode 100644
index 0000000000..4aec91a81f
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs
@@ -0,0 +1,93 @@
+// Copyright (c) ppy 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;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Screens.Play.HUD;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    public class TestSceneSkinEditorComponentsList : SkinnableTestScene
+    {
+        [Test]
+        public void TestToggleEditor()
+        {
+            AddStep("show available components", () =>
+            {
+                SetContents(() =>
+                {
+                    FillFlowContainer fill;
+
+                    var scroll = new OsuScrollContainer
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Child = fill = new FillFlowContainer
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
+                            Width = 0.5f,
+                            Direction = FillDirection.Vertical,
+                            Spacing = new Vector2(20)
+                        }
+                    };
+
+                    var skinnableTypes = typeof(OsuGame).Assembly.GetTypes().Where(t => typeof(ISkinnableComponent).IsAssignableFrom(t)).ToArray();
+
+                    foreach (var type in skinnableTypes)
+                    {
+                        try
+                        {
+                            fill.Add(new OsuSpriteText { Text = type.Name });
+
+                            var instance = (Drawable)Activator.CreateInstance(type);
+
+                            Debug.Assert(instance != null);
+
+                            instance.Anchor = Anchor.TopCentre;
+                            instance.Origin = Anchor.TopCentre;
+
+                            var container = new Container
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                Height = 100,
+                                Children = new[]
+                                {
+                                    instance
+                                }
+                            };
+
+                            switch (instance)
+                            {
+                                case IScoreCounter score:
+                                    score.Current.Value = 133773;
+                                    break;
+
+                                case IComboCounter combo:
+                                    combo.Current.Value = 727;
+                                    break;
+                            }
+
+                            fill.Add(container);
+                        }
+                        catch { }
+                    }
+
+                    return scroll;
+                });
+            });
+        }
+
+        protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
+    }
+}

From 6442fb819f61dfebd2733cf4033260f8e57b3646 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Apr 2021 12:09:58 +0900
Subject: [PATCH 3011/3722] Split out component from test scene and fix
 SongProgress

---
 .../TestSceneSkinEditorComponentsList.cs      |  77 +---------
 osu.Game/Screens/Play/SongProgress.cs         |  16 ++-
 .../Skinning/Editor/SkinComponentToolbox.cs   | 134 ++++++++++++++++++
 3 files changed, 149 insertions(+), 78 deletions(-)
 create mode 100644 osu.Game/Skinning/Editor/SkinComponentToolbox.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs
index 4aec91a81f..2fd40f5d7c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs
@@ -1,18 +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;
-using System.Diagnostics;
-using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
-using osu.Game.Screens.Play.HUD;
-using osuTK;
+using osu.Game.Skinning.Editor;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -21,71 +14,11 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestToggleEditor()
         {
-            AddStep("show available components", () =>
+            AddStep("show available components", () => SetContents(() => new SkinComponentToolbox
             {
-                SetContents(() =>
-                {
-                    FillFlowContainer fill;
-
-                    var scroll = new OsuScrollContainer
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Child = fill = new FillFlowContainer
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopCentre,
-                            Width = 0.5f,
-                            Direction = FillDirection.Vertical,
-                            Spacing = new Vector2(20)
-                        }
-                    };
-
-                    var skinnableTypes = typeof(OsuGame).Assembly.GetTypes().Where(t => typeof(ISkinnableComponent).IsAssignableFrom(t)).ToArray();
-
-                    foreach (var type in skinnableTypes)
-                    {
-                        try
-                        {
-                            fill.Add(new OsuSpriteText { Text = type.Name });
-
-                            var instance = (Drawable)Activator.CreateInstance(type);
-
-                            Debug.Assert(instance != null);
-
-                            instance.Anchor = Anchor.TopCentre;
-                            instance.Origin = Anchor.TopCentre;
-
-                            var container = new Container
-                            {
-                                RelativeSizeAxes = Axes.X,
-                                Height = 100,
-                                Children = new[]
-                                {
-                                    instance
-                                }
-                            };
-
-                            switch (instance)
-                            {
-                                case IScoreCounter score:
-                                    score.Current.Value = 133773;
-                                    break;
-
-                                case IComboCounter combo:
-                                    combo.Current.Value = 727;
-                                    break;
-                            }
-
-                            fill.Add(container);
-                        }
-                        catch { }
-                    }
-
-                    return scroll;
-                });
-            });
+                Anchor = Anchor.TopCentre,
+                Origin = Anchor.TopCentre,
+            }));
         }
 
         protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
diff --git a/osu.Game/Screens/Play/SongProgress.cs b/osu.Game/Screens/Play/SongProgress.cs
index db81633aea..2e94421f36 100644
--- a/osu.Game/Screens/Play/SongProgress.cs
+++ b/osu.Game/Screens/Play/SongProgress.cs
@@ -76,10 +76,6 @@ namespace osu.Game.Screens.Play
             {
                 new SongProgressDisplay
                 {
-                    Masking = true,
-                    RelativeSizeAxes = Axes.Both,
-                    Anchor = Anchor.BottomCentre,
-                    Origin = Anchor.BottomCentre,
                     Children = new Drawable[]
                     {
                         info = new SongProgressInfo
@@ -187,8 +183,16 @@ namespace osu.Game.Screens.Play
 
         public class SongProgressDisplay : Container, ISkinnableComponent
         {
-            // TODO: move actual implementation into this.
-            // exists for skin customisation purposes.
+            public SongProgressDisplay()
+            {
+                // TODO: move actual implementation into this.
+                // exists for skin customisation purposes.
+
+                Masking = true;
+                RelativeSizeAxes = Axes.Both;
+                Anchor = Anchor.BottomCentre;
+                Origin = Anchor.BottomCentre;
+            }
         }
     }
 }
diff --git a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
new file mode 100644
index 0000000000..5b2b9a8608
--- /dev/null
+++ b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
@@ -0,0 +1,134 @@
+// Copyright (c) ppy 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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Screens.Play.HUD;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Skinning.Editor
+{
+    public class SkinComponentToolbox : CompositeDrawable
+    {
+        public SkinComponentToolbox()
+        {
+            RelativeSizeAxes = Axes.Y;
+            Width = 500;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            FillFlowContainer fill;
+
+            InternalChild = new OsuScrollContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Child = fill = new FillFlowContainer
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopCentre,
+                    Width = 0.5f,
+                    Direction = FillDirection.Vertical,
+                    Spacing = new Vector2(20)
+                }
+            };
+
+            var skinnableTypes = typeof(OsuGame).Assembly.GetTypes().Where(t => typeof(ISkinnableComponent).IsAssignableFrom(t)).ToArray();
+
+            foreach (var type in skinnableTypes)
+            {
+                var container = attemptAddComponent(type);
+                if (container != null)
+                    fill.Add(container);
+            }
+        }
+
+        private static Drawable attemptAddComponent(Type type)
+        {
+            try
+            {
+                var instance = (Drawable)Activator.CreateInstance(type);
+
+                Debug.Assert(instance != null);
+
+                return new ToolboxComponent(instance);
+            }
+            catch
+            {
+            }
+
+            return null;
+        }
+
+        private class ToolboxComponent : CompositeDrawable
+        {
+            public ToolboxComponent(Drawable instance)
+            {
+                Container innerContainer;
+
+                RelativeSizeAxes = Axes.X;
+                AutoSizeAxes = Axes.Y;
+
+                InternalChild = new FillFlowContainer
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Children = new Drawable[]
+                    {
+                        new OsuSpriteText { Text = instance.GetType().Name },
+                        innerContainer = new Container
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Masking = true,
+                            CornerRadius = 10,
+                            Children = new[]
+                            {
+                                new Box
+                                {
+                                    Colour = Color4.Black,
+                                    Alpha = 0.5f,
+                                    RelativeSizeAxes = Axes.Both,
+                                },
+                                instance
+                            }
+                        },
+                    }
+                };
+
+                // adjust provided component to fit / display in a known state.
+
+                instance.Anchor = Anchor.Centre;
+                instance.Origin = Anchor.Centre;
+
+                if (instance.RelativeSizeAxes != Axes.None)
+                {
+                    innerContainer.AutoSizeAxes = Axes.None;
+                    innerContainer.Height = 100;
+                }
+
+                switch (instance)
+                {
+                    case IScoreCounter score:
+                        score.Current.Value = 133773;
+                        break;
+
+                    case IComboCounter combo:
+                        combo.Current.Value = 727;
+                        break;
+                }
+            }
+        }
+    }
+}

From ae9d1dc40b800708e7f0f904f18acc2c4ecbf757 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Apr 2021 12:35:58 +0900
Subject: [PATCH 3012/3722] Add component list to main editor interface and
 enable basic placement

---
 .../Visual/Gameplay/TestSceneSkinEditor.cs    |  2 +
 .../Skinning/Editor/SkinComponentToolbox.cs   | 67 ++++++++++++++-----
 osu.Game/Skinning/Editor/SkinEditor.cs        | 19 ++++++
 .../Skinning/Editor/SkinEditorContainer.cs    |  9 ++-
 4 files changed, 76 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
index 0c2c6ed454..df481b0558 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
+using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
@@ -21,6 +22,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("add editor overlay", () =>
             {
                 skinEditor?.Expire();
+                Player.ScaleTo(SkinEditorContainer.VISIBLE_TARGET_SCALE);
                 LoadComponentAsync(skinEditor = new SkinEditor(Player), Add);
             });
         }
diff --git a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
index 5b2b9a8608..f616366336 100644
--- a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
+++ b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
@@ -8,6 +8,8 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input.Events;
+using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Screens.Play.HUD;
@@ -18,10 +20,12 @@ namespace osu.Game.Skinning.Editor
 {
     public class SkinComponentToolbox : CompositeDrawable
     {
+        public Action<Type> RequestPlacement;
+
         public SkinComponentToolbox()
         {
             RelativeSizeAxes = Axes.Y;
-            Width = 500;
+            Width = 200;
         }
 
         [BackgroundDependencyLoader]
@@ -36,9 +40,6 @@ namespace osu.Game.Skinning.Editor
                 {
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre,
-                    Width = 0.5f,
                     Direction = FillDirection.Vertical,
                     Spacing = new Vector2(20)
                 }
@@ -48,13 +49,17 @@ namespace osu.Game.Skinning.Editor
 
             foreach (var type in skinnableTypes)
             {
-                var container = attemptAddComponent(type);
-                if (container != null)
-                    fill.Add(container);
+                var component = attemptAddComponent(type);
+
+                if (component != null)
+                {
+                    component.RequestPlacement = t => RequestPlacement?.Invoke(t);
+                    fill.Add(component);
+                }
             }
         }
 
-        private static Drawable attemptAddComponent(Type type)
+        private static ToolboxComponent attemptAddComponent(Type type)
         {
             try
             {
@@ -66,15 +71,20 @@ namespace osu.Game.Skinning.Editor
             }
             catch
             {
+                return null;
             }
-
-            return null;
         }
 
         private class ToolboxComponent : CompositeDrawable
         {
-            public ToolboxComponent(Drawable instance)
+            private readonly Drawable component;
+            private readonly Box box;
+
+            public Action<Type> RequestPlacement;
+
+            public ToolboxComponent(Drawable component)
             {
+                this.component = component;
                 Container innerContainer;
 
                 RelativeSizeAxes = Axes.X;
@@ -86,7 +96,7 @@ namespace osu.Game.Skinning.Editor
                     AutoSizeAxes = Axes.Y,
                     Children = new Drawable[]
                     {
-                        new OsuSpriteText { Text = instance.GetType().Name },
+                        new OsuSpriteText { Text = component.GetType().Name },
                         innerContainer = new Container
                         {
                             RelativeSizeAxes = Axes.X,
@@ -95,13 +105,13 @@ namespace osu.Game.Skinning.Editor
                             CornerRadius = 10,
                             Children = new[]
                             {
-                                new Box
+                                box = new Box
                                 {
                                     Colour = Color4.Black,
                                     Alpha = 0.5f,
                                     RelativeSizeAxes = Axes.Both,
                                 },
-                                instance
+                                component
                             }
                         },
                     }
@@ -109,16 +119,16 @@ namespace osu.Game.Skinning.Editor
 
                 // adjust provided component to fit / display in a known state.
 
-                instance.Anchor = Anchor.Centre;
-                instance.Origin = Anchor.Centre;
+                component.Anchor = Anchor.Centre;
+                component.Origin = Anchor.Centre;
 
-                if (instance.RelativeSizeAxes != Axes.None)
+                if (component.RelativeSizeAxes != Axes.None)
                 {
                     innerContainer.AutoSizeAxes = Axes.None;
                     innerContainer.Height = 100;
                 }
 
-                switch (instance)
+                switch (component)
                 {
                     case IScoreCounter score:
                         score.Current.Value = 133773;
@@ -129,6 +139,27 @@ namespace osu.Game.Skinning.Editor
                         break;
                 }
             }
+
+            [Resolved]
+            private OsuColour colours { get; set; }
+
+            protected override bool OnClick(ClickEvent e)
+            {
+                RequestPlacement?.Invoke(component.GetType());
+                return true;
+            }
+
+            protected override bool OnHover(HoverEvent e)
+            {
+                box.FadeColour(colours.Yellow, 100);
+                return base.OnHover(e);
+            }
+
+            protected override void OnHoverLost(HoverLostEvent e)
+            {
+                box.FadeColour(Color4.Black, 100);
+                base.OnHoverLost(e);
+            }
         }
     }
 }
diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 562dd23224..885d41043c 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -1,13 +1,17 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
+using osu.Framework.Testing;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;
+using osu.Game.Screens.Play;
 
 namespace osu.Game.Skinning.Editor
 {
@@ -45,6 +49,12 @@ namespace osu.Game.Skinning.Editor
                         RelativeSizeAxes = Axes.X
                     },
                     new SkinBlueprintContainer(target),
+                    new SkinComponentToolbox
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        RequestPlacement = placeComponent
+                    }
                 }
             };
 
@@ -56,6 +66,15 @@ namespace osu.Game.Skinning.Editor
             });
         }
 
+        private void placeComponent(Type type)
+        {
+            var instance = (Drawable)Activator.CreateInstance(type);
+
+            var targetContainer = target.ChildrenOfType<HUDOverlay>().FirstOrDefault();
+
+            targetContainer?.Add(instance);
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
diff --git a/osu.Game/Skinning/Editor/SkinEditorContainer.cs b/osu.Game/Skinning/Editor/SkinEditorContainer.cs
index adb1abefd1..06bf278010 100644
--- a/osu.Game/Skinning/Editor/SkinEditorContainer.cs
+++ b/osu.Game/Skinning/Editor/SkinEditorContainer.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Skinning.Editor
         private readonly ScalingContainer target;
         private SkinEditor skinEditor;
 
-        private const float visible_target_scale = 0.8f;
+        public const float VISIBLE_TARGET_SCALE = 0.8f;
 
         [Resolved]
         private OsuColour colours { get; set; }
@@ -63,12 +63,14 @@ namespace osu.Game.Skinning.Editor
         {
             if (visibility.NewValue == Visibility.Visible)
             {
-                target.ScaleTo(visible_target_scale, SkinEditor.TRANSITION_DURATION, Easing.OutQuint);
-
                 target.Masking = true;
                 target.BorderThickness = 5;
                 target.BorderColour = colours.Yellow;
                 target.AllowScaling = false;
+                target.RelativePositionAxes = Axes.Both;
+
+                target.ScaleTo(VISIBLE_TARGET_SCALE, SkinEditor.TRANSITION_DURATION, Easing.OutQuint);
+                target.MoveToX(0.1f, SkinEditor.TRANSITION_DURATION, Easing.OutQuint);
             }
             else
             {
@@ -76,6 +78,7 @@ namespace osu.Game.Skinning.Editor
                 target.AllowScaling = true;
 
                 target.ScaleTo(1, SkinEditor.TRANSITION_DURATION, Easing.OutQuint).OnComplete(_ => target.Masking = false);
+                target.MoveToX(0f, SkinEditor.TRANSITION_DURATION, Easing.OutQuint);
             }
         }
 

From 5585a7d4380cb6a7070f7f8dbaa6a9fe3c0caaad Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Apr 2021 12:41:18 +0900
Subject: [PATCH 3013/3722] Add basic interfaces for skinnable target
 containers

---
 .../Screens/Play/HUD/IDefaultSkinnableTarget.cs   | 12 ++++++++++++
 osu.Game/Screens/Play/HUD/ISkinnableTarget.cs     | 15 +++++++++++++++
 osu.Game/Screens/Play/HUDOverlay.cs               |  2 +-
 osu.Game/Skinning/Editor/SkinEditor.cs            |  4 ++--
 4 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 osu.Game/Screens/Play/HUD/IDefaultSkinnableTarget.cs
 create mode 100644 osu.Game/Screens/Play/HUD/ISkinnableTarget.cs

diff --git a/osu.Game/Screens/Play/HUD/IDefaultSkinnableTarget.cs b/osu.Game/Screens/Play/HUD/IDefaultSkinnableTarget.cs
new file mode 100644
index 0000000000..208d920dec
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/IDefaultSkinnableTarget.cs
@@ -0,0 +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.
+
+namespace osu.Game.Screens.Play.HUD
+{
+    /// <summary>
+    /// The default placement location for new <see cref="ISkinnableComponent"/>s.
+    /// </summary>
+    public interface IDefaultSkinnableTarget : ISkinnableTarget
+    {
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/ISkinnableTarget.cs b/osu.Game/Screens/Play/HUD/ISkinnableTarget.cs
new file mode 100644
index 0000000000..61a173ed02
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/ISkinnableTarget.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.Graphics;
+using osu.Framework.Graphics.Containers;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    /// <summary>
+    /// Denotes a container which can house <see cref="ISkinnableComponent"/>s.
+    /// </summary>
+    public interface ISkinnableTarget : IContainerCollection<Drawable>
+    {
+    }
+}
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 669c920017..eb6e599a19 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -22,7 +22,7 @@ using osuTK;
 namespace osu.Game.Screens.Play
 {
     [Cached]
-    public class HUDOverlay : Container, IKeyBindingHandler<GlobalAction>
+    public class HUDOverlay : Container, IKeyBindingHandler<GlobalAction>, IDefaultSkinnableTarget
     {
         public const float FADE_DURATION = 300;
 
diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 885d41043c..6d189dc027 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -11,7 +11,7 @@ using osu.Framework.Testing;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;
-using osu.Game.Screens.Play;
+using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Skinning.Editor
 {
@@ -70,7 +70,7 @@ namespace osu.Game.Skinning.Editor
         {
             var instance = (Drawable)Activator.CreateInstance(type);
 
-            var targetContainer = target.ChildrenOfType<HUDOverlay>().FirstOrDefault();
+            var targetContainer = target.ChildrenOfType<IDefaultSkinnableTarget>().FirstOrDefault();
 
             targetContainer?.Add(instance);
         }

From 8b82a07914cfb531f01f2c75c8d0b27da83eb5c4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Apr 2021 12:42:32 +0900
Subject: [PATCH 3014/3722] Move skin-related interfaces out of HUD namespace

---
 osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs             | 1 +
 osu.Game/Screens/Play/HUD/DefaultComboCounter.cs                | 1 +
 osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs               | 1 +
 osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs                | 1 +
 osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs    | 1 +
 osu.Game/Screens/Play/HUDOverlay.cs                             | 1 +
 osu.Game/Screens/Play/SongProgress.cs                           | 2 +-
 osu.Game/Skinning/Editor/SkinBlueprint.cs                       | 1 -
 osu.Game/Skinning/Editor/SkinBlueprintContainer.cs              | 1 -
 osu.Game/Skinning/Editor/SkinEditor.cs                          | 1 -
 osu.Game/Skinning/Editor/SkinSelectionHandler.cs                | 1 -
 .../{Screens/Play/HUD => Skinning}/IDefaultSkinnableTarget.cs   | 2 +-
 osu.Game/{Screens/Play/HUD => Skinning}/ISkinnableComponent.cs  | 2 +-
 osu.Game/{Screens/Play/HUD => Skinning}/ISkinnableTarget.cs     | 2 +-
 osu.Game/Skinning/LegacyScoreCounter.cs                         | 1 -
 15 files changed, 10 insertions(+), 9 deletions(-)
 rename osu.Game/{Screens/Play/HUD => Skinning}/IDefaultSkinnableTarget.cs (90%)
 rename osu.Game/{Screens/Play/HUD => Skinning}/ISkinnableComponent.cs (91%)
 rename osu.Game/{Screens/Play/HUD => Skinning}/ISkinnableTarget.cs (92%)

diff --git a/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
index b8a43708b4..5db1e96dc9 100644
--- a/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
@@ -5,6 +5,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
diff --git a/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs b/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
index 959766ecd1..a6bd95b36c 100644
--- a/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
diff --git a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
index e3cd71691d..f99428d07e 100644
--- a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
@@ -13,6 +13,7 @@ using osuTK;
 using osuTK.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Utils;
+using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
diff --git a/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs b/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
index dde5c18b38..1f154fe168 100644
--- a/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
@@ -5,6 +5,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
index 3b24c8cc9e..26d5e622f7 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
 
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index eb6e599a19..621d604278 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -17,6 +17,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Play.HUD;
+using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Screens.Play
diff --git a/osu.Game/Screens/Play/SongProgress.cs b/osu.Game/Screens/Play/SongProgress.cs
index 2e94421f36..d85f3538e4 100644
--- a/osu.Game/Screens/Play/SongProgress.cs
+++ b/osu.Game/Screens/Play/SongProgress.cs
@@ -14,7 +14,7 @@ using osu.Framework.Timing;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI;
-using osu.Game.Screens.Play.HUD;
+using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play
 {
diff --git a/osu.Game/Skinning/Editor/SkinBlueprint.cs b/osu.Game/Skinning/Editor/SkinBlueprint.cs
index 491a403325..b82b861e3e 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprint.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprint.cs
@@ -10,7 +10,6 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Screens.Play.HUD;
 using osuTK;
 
 namespace osu.Game.Skinning.Editor
diff --git a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
index f2bc8ecddf..9c0327df00 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
@@ -6,7 +6,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Edit.Compose.Components;
-using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Skinning.Editor
 {
diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 6d189dc027..902cb389e6 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -11,7 +11,6 @@ using osu.Framework.Testing;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;
-using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Skinning.Editor
 {
diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 0408ce74a6..e95bd5f8a3 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -10,7 +10,6 @@ using osu.Game.Extensions;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Edit.Compose.Components;
-using osu.Game.Screens.Play.HUD;
 using osuTK;
 
 namespace osu.Game.Skinning.Editor
diff --git a/osu.Game/Screens/Play/HUD/IDefaultSkinnableTarget.cs b/osu.Game/Skinning/IDefaultSkinnableTarget.cs
similarity index 90%
rename from osu.Game/Screens/Play/HUD/IDefaultSkinnableTarget.cs
rename to osu.Game/Skinning/IDefaultSkinnableTarget.cs
index 208d920dec..24fb454af8 100644
--- a/osu.Game/Screens/Play/HUD/IDefaultSkinnableTarget.cs
+++ b/osu.Game/Skinning/IDefaultSkinnableTarget.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.
 
-namespace osu.Game.Screens.Play.HUD
+namespace osu.Game.Skinning
 {
     /// <summary>
     /// The default placement location for new <see cref="ISkinnableComponent"/>s.
diff --git a/osu.Game/Screens/Play/HUD/ISkinnableComponent.cs b/osu.Game/Skinning/ISkinnableComponent.cs
similarity index 91%
rename from osu.Game/Screens/Play/HUD/ISkinnableComponent.cs
rename to osu.Game/Skinning/ISkinnableComponent.cs
index 6d4558443f..f6b0a182b4 100644
--- a/osu.Game/Screens/Play/HUD/ISkinnableComponent.cs
+++ b/osu.Game/Skinning/ISkinnableComponent.cs
@@ -3,7 +3,7 @@
 
 using osu.Framework.Graphics;
 
-namespace osu.Game.Screens.Play.HUD
+namespace osu.Game.Skinning
 {
     /// <summary>
     /// Denotes a drawable which, as a drawable, can be adjusted via skinning specifications.
diff --git a/osu.Game/Screens/Play/HUD/ISkinnableTarget.cs b/osu.Game/Skinning/ISkinnableTarget.cs
similarity index 92%
rename from osu.Game/Screens/Play/HUD/ISkinnableTarget.cs
rename to osu.Game/Skinning/ISkinnableTarget.cs
index 61a173ed02..607e89fdec 100644
--- a/osu.Game/Screens/Play/HUD/ISkinnableTarget.cs
+++ b/osu.Game/Skinning/ISkinnableTarget.cs
@@ -4,7 +4,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 
-namespace osu.Game.Screens.Play.HUD
+namespace osu.Game.Skinning
 {
     /// <summary>
     /// Denotes a container which can house <see cref="ISkinnableComponent"/>s.
diff --git a/osu.Game/Skinning/LegacyScoreCounter.cs b/osu.Game/Skinning/LegacyScoreCounter.cs
index cae8044242..c270ce7e69 100644
--- a/osu.Game/Skinning/LegacyScoreCounter.cs
+++ b/osu.Game/Skinning/LegacyScoreCounter.cs
@@ -5,7 +5,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Screens.Play.HUD;
 using osuTK;
 
 namespace osu.Game.Skinning

From 20ff05c9ffacd5ebc129c1ffe4239a65c3a02bc3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Apr 2021 13:03:54 +0900
Subject: [PATCH 3015/3722] Fix crosstalk between notification/setting overlay
 nudge padding and skin overlay position adjust

---
 osu.Game/OsuGame.cs | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 77fb9c3b63..b7824a01a4 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -595,28 +595,35 @@ namespace osu.Game
                     ActionRequested = action => volume.Adjust(action),
                     ScrollActionRequested = (action, amount, isPrecise) => volume.Adjust(action, amount, isPrecise),
                 },
-                screenContainer = new ScalingContainer(ScalingMode.ExcludeOverlays)
+                screenOffsetContainer = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
                     Children = new Drawable[]
                     {
-                        receptor = new BackButton.Receptor(),
-                        ScreenStack = new OsuScreenStack { RelativeSizeAxes = Axes.Both },
-                        BackButton = new BackButton(receptor)
+                        screenContainer = new ScalingContainer(ScalingMode.ExcludeOverlays)
                         {
-                            Anchor = Anchor.BottomLeft,
-                            Origin = Anchor.BottomLeft,
-                            Action = () =>
+                            RelativeSizeAxes = Axes.Both,
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Children = new Drawable[]
                             {
-                                var currentScreen = ScreenStack.CurrentScreen as IOsuScreen;
+                                receptor = new BackButton.Receptor(),
+                                ScreenStack = new OsuScreenStack { RelativeSizeAxes = Axes.Both },
+                                BackButton = new BackButton(receptor)
+                                {
+                                    Anchor = Anchor.BottomLeft,
+                                    Origin = Anchor.BottomLeft,
+                                    Action = () =>
+                                    {
+                                        var currentScreen = ScreenStack.CurrentScreen as IOsuScreen;
 
-                                if (currentScreen?.AllowBackButton == true && !currentScreen.OnBackButton())
-                                    ScreenStack.Exit();
+                                        if (currentScreen?.AllowBackButton == true && !currentScreen.OnBackButton())
+                                            ScreenStack.Exit();
+                                    }
+                                },
+                                logoContainer = new Container { RelativeSizeAxes = Axes.Both },
                             }
                         },
-                        logoContainer = new Container { RelativeSizeAxes = Axes.Both },
                     }
                 },
                 overlayContent = new Container { RelativeSizeAxes = Axes.Both },
@@ -766,7 +773,7 @@ namespace osu.Game
                 if (notifications.State.Value == Visibility.Visible)
                     offset -= Toolbar.HEIGHT / 2;
 
-                screenContainer.MoveToX(offset, SettingsPanel.TRANSITION_LENGTH, Easing.OutQuint);
+                screenOffsetContainer.MoveToX(offset, SettingsPanel.TRANSITION_LENGTH, Easing.OutQuint);
             }
 
             Settings.State.ValueChanged += _ => updateScreenOffset();
@@ -946,6 +953,8 @@ namespace osu.Game
 
         private ScalingContainer screenContainer;
 
+        private Container screenOffsetContainer;
+
         private SkinEditorContainer skinEditor;
 
         protected override bool OnExiting()
@@ -966,7 +975,7 @@ namespace osu.Game
         {
             base.UpdateAfterChildren();
 
-            screenContainer.Padding = new MarginPadding { Top = ToolbarOffset };
+            screenOffsetContainer.Padding = new MarginPadding { Top = ToolbarOffset };
             overlayContent.Padding = new MarginPadding { Top = ToolbarOffset };
 
             MenuCursorContainer.CanShowCursor = (ScreenStack.CurrentScreen as IOsuScreen)?.CursorVisible ?? false;

From bde72faa7ccf81f74b9fbd16538f954ce9488edf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Apr 2021 13:04:10 +0900
Subject: [PATCH 3016/3722] Limit components list height to better align with
 actual viewport

---
 osu.Game/Skinning/Editor/SkinEditor.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 902cb389e6..298976c39b 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -52,6 +52,7 @@ namespace osu.Game.Skinning.Editor
                     {
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
+                        Height = SkinEditorContainer.VISIBLE_TARGET_SCALE,
                         RequestPlacement = placeComponent
                     }
                 }

From 3681db491caa5e03210c159682f3b3a921569447 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 30 Apr 2021 11:21:20 +0700
Subject: [PATCH 3017/3722] add long mixed list test

Copied from https://github.com/ppy/osu-wiki/blob/master/wiki/Tournaments/OWC/2020/en.md#tournament-rules
---
 .../TestSceneOsuMarkdownContainer.cs          | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
index 3367fccbf1..852a2e32e2 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
@@ -148,5 +148,44 @@ Line below";
 3. Third item level 1";
             });
         }
+
+        [Test]
+        public void TestLongMixedList()
+        {
+            AddStep("Add long mixed list", () =>
+            {
+                markdownContainer.Text = @"1. The osu! World Cup is a country-based team tournament played on the osu! game mode.
+   - While this competition is planned as a 4 versus 4 setup, this may change depending on the number of incoming registrations.
+2. Beatmap scoring is based on Score V2.
+3. The beatmaps for each round will be announced by the map selectors in advance on the Sunday before the actual matches take place. Only these beatmaps will be used during the respective matches.
+   - One beatmap will be a tiebreaker beatmap. This beatmap will only be played in case of a tie. **The only exception to this is the Qualifiers pool.**
+4. The match schedule will be settled by the Tournament Management (see the [scheduling instructions](#scheduling-instructions)).
+5. If no staff or referee is available, the match will be postponed.
+6. Use of the Visual Settings to alter background dim or disable beatmap elements like storyboards and skins are allowed.
+7. If the beatmap ends in a draw, the map will be nullified and replayed.
+8. If a player disconnects, their scores will not be counted towards their team's total.
+   - Disconnects within 30 seconds or 25% of the beatmap length (whichever happens first) after beatmap begin can be aborted and/or rematched. This is up to the referee's discretion.
+9. Beatmaps cannot be reused in the same match unless the map was nullified.
+10. If less than the minimum required players attend, the maximum time the match can be postponed is 10 minutes.
+11. Exchanging players during a match is allowed without limitations.
+    - **If a map rematch is required, exchanging players is not allowed. With the referee's discretion, an exception can be made if the previous roster is unavailable to play.**
+12. Lag is not a valid reason to nullify a beatmap.
+13. All players are supposed to keep the match running fluently and without delays. Penalties can be issued to the players if they cause excessive match delays.
+14. If a player disconnects between maps and the team cannot provide a replacement, the match can be delayed 10 minutes at maximum.
+15. All players and referees must be treated with respect. Instructions of the referees and tournament Management are to be followed. Decisions labeled as final are not to be objected.
+16. Disrupting the match by foul play, insulting and provoking other players or referees, delaying the match or other deliberate inappropriate misbehavior is strictly prohibited.
+17. The multiplayer chatrooms are subject to the [osu! community rules](/wiki/Rules).
+    - Breaking the chat rules will result in a silence. Silenced players can not participate in multiplayer matches and must be exchanged for the time being.
+18. **The seeding method will be revealed after all the teams have played their Qualifier rounds.**
+19. Unexpected incidents are handled by the tournament management. Referees may allow higher tolerance depending on the circumstances. This is up to their discretion.
+20. Penalties for violating the tournament rules may include:
+    - Exclusion of specific players for one beatmap
+    - Exclusion of specific players for an entire match
+    - Declaring the match as Lost by Default
+    - Disqualification from the entire tournament
+    - Disqualification from the current and future official tournaments until appealed
+    - Any modification of these rules will be announced.";
+            });
+        }
     }
 }

From 11d0f12455b1534efbd8edaef2c810e4dd61f2a2 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 30 Apr 2021 11:36:51 +0700
Subject: [PATCH 3018/3722] change create text marker to virtual

---
 osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
index f020e3e2fc..dce032d626 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Graphics.Containers.Markdown
         private void load()
         {
             var marker = parentTextComponent.CreateSpriteText();
-            marker.Text = createTextMarker();
+            marker.Text = CreateTextMarker();
 
             if (isOrdered)
             {
@@ -66,7 +66,7 @@ namespace osu.Game.Graphics.Containers.Markdown
             AddInternal(marker);
         }
 
-        private string createTextMarker()
+        protected virtual string CreateTextMarker()
         {
             if (isOrdered)
             {

From fc4fa4f696c3c8fcf168a819a902454a89232b36 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 30 Apr 2021 11:48:37 +0700
Subject: [PATCH 3019/3722] use ListBlock IsOrdered to determine ordered or
 unordered list

---
 .../Graphics/Containers/Markdown/OsuMarkdownContainer.cs   | 2 +-
 .../Graphics/Containers/Markdown/OsuMarkdownListItem.cs    | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index b765378e4c..02e674aaec 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Graphics.Containers.Markdown
             Padding = new MarginPadding(0)
         };
 
-        protected virtual OsuMarkdownListItem CreateListItem(ListItemBlock listItemBlock, int level) => new OsuMarkdownListItem(level, listItemBlock.Order);
+        protected virtual OsuMarkdownListItem CreateListItem(ListItemBlock listItemBlock, int level) => new OsuMarkdownListItem(listItemBlock, level);
 
         protected override MarkdownPipeline CreateBuilder()
             => new MarkdownPipelineBuilder().UseAutoIdentifiers(AutoIdentifierOptions.GitHub)
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
index dce032d626..98b1fd1381 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.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 Markdig.Syntax;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -23,11 +24,11 @@ namespace osu.Game.Graphics.Containers.Markdown
 
         public FillFlowContainer Content { get; }
 
-        public OsuMarkdownListItem(int level, int order)
+        public OsuMarkdownListItem(ListItemBlock listItemBlock, int level)
         {
             this.level = level;
-            this.order = order;
-            isOrdered = order != 0;
+            this.order = listItemBlock.Order;
+            isOrdered = ((ListBlock)listItemBlock.Parent).IsOrdered;
 
             AutoSizeAxes = Axes.Y;
             RelativeSizeAxes = Axes.X;

From a1e64f4e3cc9faae55d3891d6850e1fb17d0767f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Apr 2021 14:37:49 +0900
Subject: [PATCH 3020/3722] Use the existing toolbox design

---
 .../TestSceneSkinEditorComponentsList.cs      |  2 +-
 .../Rulesets/Edit/ScrollingToolboxGroup.cs    | 32 +++++++++++++++++++
 .../Skinning/Editor/SkinComponentToolbox.cs   | 23 ++++++-------
 osu.Game/Skinning/Editor/SkinEditor.cs        |  3 +-
 4 files changed, 44 insertions(+), 16 deletions(-)
 create mode 100644 osu.Game/Rulesets/Edit/ScrollingToolboxGroup.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs
index 2fd40f5d7c..14bd62b98a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorComponentsList.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestToggleEditor()
         {
-            AddStep("show available components", () => SetContents(() => new SkinComponentToolbox
+            AddStep("show available components", () => SetContents(() => new SkinComponentToolbox(300)
             {
                 Anchor = Anchor.TopCentre,
                 Origin = Anchor.TopCentre,
diff --git a/osu.Game/Rulesets/Edit/ScrollingToolboxGroup.cs b/osu.Game/Rulesets/Edit/ScrollingToolboxGroup.cs
new file mode 100644
index 0000000000..a54f574bff
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/ScrollingToolboxGroup.cs
@@ -0,0 +1,32 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.Containers;
+
+namespace osu.Game.Rulesets.Edit
+{
+    public class ScrollingToolboxGroup : ToolboxGroup
+    {
+        protected readonly OsuScrollContainer Scroll;
+
+        protected override Container<Drawable> Content { get; }
+
+        public ScrollingToolboxGroup(string title, float scrollAreaHeight)
+            : base(title)
+        {
+            base.Content.Add(Scroll = new OsuScrollContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                Height = scrollAreaHeight,
+                Child = Content = new FillFlowContainer
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Direction = FillDirection.Vertical,
+                },
+            });
+        }
+    }
+}
diff --git a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
index f616366336..6b7439c229 100644
--- a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
+++ b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
@@ -10,21 +10,22 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Play.HUD;
 using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Skinning.Editor
 {
-    public class SkinComponentToolbox : CompositeDrawable
+    public class SkinComponentToolbox : ScrollingToolboxGroup
     {
         public Action<Type> RequestPlacement;
 
-        public SkinComponentToolbox()
+        public SkinComponentToolbox(float height)
+            : base("Components", height)
         {
-            RelativeSizeAxes = Axes.Y;
+            RelativeSizeAxes = Axes.None;
             Width = 200;
         }
 
@@ -33,16 +34,12 @@ namespace osu.Game.Skinning.Editor
         {
             FillFlowContainer fill;
 
-            InternalChild = new OsuScrollContainer
+            Child = fill = new FillFlowContainer
             {
-                RelativeSizeAxes = Axes.Both,
-                Child = fill = new FillFlowContainer
-                {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Direction = FillDirection.Vertical,
-                    Spacing = new Vector2(20)
-                }
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(20)
             };
 
             var skinnableTypes = typeof(OsuGame).Assembly.GetTypes().Where(t => typeof(ISkinnableComponent).IsAssignableFrom(t)).ToArray();
diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 298976c39b..18a8b220df 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -48,11 +48,10 @@ namespace osu.Game.Skinning.Editor
                         RelativeSizeAxes = Axes.X
                     },
                     new SkinBlueprintContainer(target),
-                    new SkinComponentToolbox
+                    new SkinComponentToolbox(600)
                     {
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
-                        Height = SkinEditorContainer.VISIBLE_TARGET_SCALE,
                         RequestPlacement = placeComponent
                     }
                 }

From e4f895b49046948816dc3f260ba399aad816f153 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Apr 2021 14:48:37 +0900
Subject: [PATCH 3021/3722] Fix editor buttons inheriting from `TriangleButton`
 when they have no need to

---
 .../Edit/Components/RadioButtons/DrawableRadioButton.cs       | 4 +---
 .../Edit/Components/TernaryButtons/DrawableTernaryButton.cs   | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/Components/RadioButtons/DrawableRadioButton.cs b/osu.Game/Screens/Edit/Components/RadioButtons/DrawableRadioButton.cs
index 0cf7b83f3b..1f608d28fd 100644
--- a/osu.Game/Screens/Edit/Components/RadioButtons/DrawableRadioButton.cs
+++ b/osu.Game/Screens/Edit/Components/RadioButtons/DrawableRadioButton.cs
@@ -16,7 +16,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Components.RadioButtons
 {
-    public class DrawableRadioButton : TriangleButton
+    public class DrawableRadioButton : OsuButton
     {
         /// <summary>
         /// Invoked when this <see cref="DrawableRadioButton"/> has been selected.
@@ -49,8 +49,6 @@ namespace osu.Game.Screens.Edit.Components.RadioButtons
             selectedBackgroundColour = colours.BlueDark;
             selectedBubbleColour = selectedBackgroundColour.Lighten(0.5f);
 
-            Triangles.Alpha = 0;
-
             Content.EdgeEffect = new EdgeEffectParameters
             {
                 Type = EdgeEffectType.Shadow,
diff --git a/osu.Game/Screens/Edit/Components/TernaryButtons/DrawableTernaryButton.cs b/osu.Game/Screens/Edit/Components/TernaryButtons/DrawableTernaryButton.cs
index c72fff5c91..c43561eaa7 100644
--- a/osu.Game/Screens/Edit/Components/TernaryButtons/DrawableTernaryButton.cs
+++ b/osu.Game/Screens/Edit/Components/TernaryButtons/DrawableTernaryButton.cs
@@ -15,7 +15,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Components.TernaryButtons
 {
-    internal class DrawableTernaryButton : TriangleButton
+    internal class DrawableTernaryButton : OsuButton
     {
         private Color4 defaultBackgroundColour;
         private Color4 defaultBubbleColour;
@@ -43,8 +43,6 @@ namespace osu.Game.Screens.Edit.Components.TernaryButtons
             selectedBackgroundColour = colours.BlueDark;
             selectedBubbleColour = selectedBackgroundColour.Lighten(0.5f);
 
-            Triangles.Alpha = 0;
-
             Content.EdgeEffect = new EdgeEffectParameters
             {
                 Type = EdgeEffectType.Shadow,

From e663629bc64ceedb95fda5adbf26c2a6c1be99cd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 30 Apr 2021 15:22:51 +0900
Subject: [PATCH 3022/3722] Match button appearance to that of the beatmap
 editor

---
 .../Skinning/Editor/SkinComponentToolbox.cs   | 107 +++++++++---------
 1 file changed, 54 insertions(+), 53 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
index 6b7439c229..46b8d5d5ea 100644
--- a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
+++ b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
@@ -5,12 +5,14 @@ using System;
 using System.Diagnostics;
 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.Shapes;
+using osu.Framework.Graphics.Effects;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Play.HUD;
 using osuTK;
@@ -22,6 +24,8 @@ namespace osu.Game.Skinning.Editor
     {
         public Action<Type> RequestPlacement;
 
+        private const float component_display_scale = 0.8f;
+
         public SkinComponentToolbox(float height)
             : base("Components", height)
         {
@@ -56,7 +60,7 @@ namespace osu.Game.Skinning.Editor
             }
         }
 
-        private static ToolboxComponent attemptAddComponent(Type type)
+        private static ToolboxComponentButton attemptAddComponent(Type type)
         {
             try
             {
@@ -64,7 +68,7 @@ namespace osu.Game.Skinning.Editor
 
                 Debug.Assert(instance != null);
 
-                return new ToolboxComponent(instance);
+                return new ToolboxComponentButton(instance);
             }
             catch
             {
@@ -72,59 +76,60 @@ namespace osu.Game.Skinning.Editor
             }
         }
 
-        private class ToolboxComponent : CompositeDrawable
+        private class ToolboxComponentButton : OsuButton
         {
             private readonly Drawable component;
-            private readonly Box box;
 
             public Action<Type> RequestPlacement;
 
-            public ToolboxComponent(Drawable component)
+            private Container innerContainer;
+
+            public ToolboxComponentButton(Drawable component)
             {
                 this.component = component;
-                Container innerContainer;
+
+                Enabled.Value = true;
 
                 RelativeSizeAxes = Axes.X;
-                AutoSizeAxes = Axes.Y;
+                Height = 70;
+            }
 
-                InternalChild = new FillFlowContainer
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                BackgroundColour = colours.Gray3;
+                Content.EdgeEffect = new EdgeEffectParameters
                 {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Children = new Drawable[]
-                    {
-                        new OsuSpriteText { Text = component.GetType().Name },
-                        innerContainer = new Container
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                            Masking = true,
-                            CornerRadius = 10,
-                            Children = new[]
-                            {
-                                box = new Box
-                                {
-                                    Colour = Color4.Black,
-                                    Alpha = 0.5f,
-                                    RelativeSizeAxes = Axes.Both,
-                                },
-                                component
-                            }
-                        },
-                    }
+                    Type = EdgeEffectType.Shadow,
+                    Radius = 2,
+                    Offset = new Vector2(0, 1),
+                    Colour = Color4.Black.Opacity(0.5f)
                 };
 
-                // adjust provided component to fit / display in a known state.
+                AddRange(new Drawable[]
+                {
+                    new OsuSpriteText
+                    {
+                        Text = component.GetType().Name,
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                    },
+                    innerContainer = new Container
+                    {
+                        Y = 10,
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        RelativeSizeAxes = Axes.Both,
+                        Scale = new Vector2(component_display_scale),
+                        Masking = true,
+                        Child = component
+                    }
+                });
 
+                // adjust provided component to fit / display in a known state.
                 component.Anchor = Anchor.Centre;
                 component.Origin = Anchor.Centre;
 
-                if (component.RelativeSizeAxes != Axes.None)
-                {
-                    innerContainer.AutoSizeAxes = Axes.None;
-                    innerContainer.Height = 100;
-                }
-
                 switch (component)
                 {
                     case IScoreCounter score:
@@ -137,26 +142,22 @@ namespace osu.Game.Skinning.Editor
                 }
             }
 
-            [Resolved]
-            private OsuColour colours { get; set; }
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                if (component.RelativeSizeAxes != Axes.None)
+                {
+                    innerContainer.AutoSizeAxes = Axes.None;
+                    innerContainer.Height = 100;
+                }
+            }
 
             protected override bool OnClick(ClickEvent e)
             {
                 RequestPlacement?.Invoke(component.GetType());
                 return true;
             }
-
-            protected override bool OnHover(HoverEvent e)
-            {
-                box.FadeColour(colours.Yellow, 100);
-                return base.OnHover(e);
-            }
-
-            protected override void OnHoverLost(HoverLostEvent e)
-            {
-                box.FadeColour(Color4.Black, 100);
-                base.OnHoverLost(e);
-            }
         }
     }
 }

From 786ab163f622c0770c2b63a27e54db958881f499 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Fri, 30 Apr 2021 12:40:16 -0700
Subject: [PATCH 3023/3722] Rename extension and move to bottom of file

---
 ...StatusExtensions.cs => BeatmapSetOnlineStatus.cs} | 12 ++++++------
 .../Overlays/BeatmapSet/Scores/ScoresContainer.cs    |  2 +-
 .../BeatmapSet/Scores/TopScoreStatisticsSection.cs   |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename osu.Game/Beatmaps/{BeatmapSetOnlineStatusExtensions.cs => BeatmapSetOnlineStatus.cs} (86%)

diff --git a/osu.Game/Beatmaps/BeatmapSetOnlineStatusExtensions.cs b/osu.Game/Beatmaps/BeatmapSetOnlineStatus.cs
similarity index 86%
rename from osu.Game/Beatmaps/BeatmapSetOnlineStatusExtensions.cs
rename to osu.Game/Beatmaps/BeatmapSetOnlineStatus.cs
index 1de641f4f1..ae5a44cfcd 100644
--- a/osu.Game/Beatmaps/BeatmapSetOnlineStatusExtensions.cs
+++ b/osu.Game/Beatmaps/BeatmapSetOnlineStatus.cs
@@ -3,12 +3,6 @@
 
 namespace osu.Game.Beatmaps
 {
-    public static class BeatmapSetOnlineStatusExtensions
-    {
-        public static bool HasPerformancePoints(this BeatmapSetOnlineStatus status)
-            => status == BeatmapSetOnlineStatus.Ranked || status == BeatmapSetOnlineStatus.Approved;
-    }
-
     public enum BeatmapSetOnlineStatus
     {
         None = -3,
@@ -20,4 +14,10 @@ namespace osu.Game.Beatmaps
         Qualified = 3,
         Loved = 4,
     }
+
+    public static class BeatmapSetOnlineStatusExtensions
+    {
+        public static bool GrantsPerformancePoints(this BeatmapSetOnlineStatus status)
+            => status == BeatmapSetOnlineStatus.Ranked || status == BeatmapSetOnlineStatus.Approved;
+    }
 }
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
index 8786cf0e63..e9733bad20 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 var scoreInfos = value.Scores.Select(s => s.CreateScoreInfo(rulesets)).ToList();
                 var topScore = scoreInfos.First();
 
-                scoreTable.DisplayScores(scoreInfos, topScore.Beatmap?.Status.HasPerformancePoints() ?? false);
+                scoreTable.DisplayScores(scoreInfos, topScore.Beatmap?.Status.GrantsPerformancePoints() ?? false);
                 scoreTable.Show();
 
                 var userScore = value.UserScore;
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index 57df54d851..a4b58e74a6 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -112,7 +112,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 accuracyColumn.Text = value.DisplayAccuracy;
                 maxComboColumn.Text = $@"{value.MaxCombo:N0}x";
 
-                ppColumn.Alpha = value.Beatmap?.Status.HasPerformancePoints() ?? false ? 1 : 0;
+                ppColumn.Alpha = value.Beatmap?.Status.GrantsPerformancePoints() ?? false ? 1 : 0;
                 ppColumn.Text = $@"{value.PP:N0}";
 
                 statisticsColumns.ChildrenEnumerable = value.GetStatisticsForDisplay().Select(createStatisticsColumn);

From fdf8c129474893b46e7e76b6cc1c19f835c82bcc Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Sat, 1 May 2021 11:57:47 +0800
Subject: [PATCH 3024/3722] Replace BeatDivisorFinder with
 GetClosestBeatDivisor

---
 .../Objects/Drawables/DrawableNote.cs         |  13 +-
 .../UI/DrawableManiaRuleset.cs                |   6 +-
 osu.Game.Tests/NonVisual/BeatDivisorFinder.cs | 116 ------------------
 .../Rulesets/Objects/BeatDivisorFinder.cs     |  55 ---------
 4 files changed, 12 insertions(+), 178 deletions(-)
 delete mode 100644 osu.Game.Tests/NonVisual/BeatDivisorFinder.cs
 delete mode 100644 osu.Game/Rulesets/Objects/BeatDivisorFinder.cs

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 942a32936c..d67c360301 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -6,10 +6,10 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Bindings;
+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.Scoring;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit;
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         private OsuColour colours { get; set; }
 
         [Resolved(canBeNull: true)]
-        private BeatDivisorFinder beatDivisorFinder { get; set; }
+        private IBeatmap beatmap { get; set; }
 
         private readonly Bindable<bool> configTimingBasedNoteColouring = new Bindable<bool>();
 
@@ -58,9 +58,14 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         protected override void LoadComplete()
         {
-            if (beatDivisorFinder != null)
+            if (beatmap != null)
             {
-                HitObject.StartTimeBindable.BindValueChanged(_ => snap.Value = beatDivisorFinder.FindDivisor(HitObject), true);
+                HitObject.StartTimeBindable.BindValueChanged(startTime =>
+                    {
+                        snap.Value = beatmap.ControlPointInfo.GetClosestBeatDivisor(startTime.NewValue);
+                    },
+                    true
+                );
             }
 
             snap.BindValueChanged(_ => updateSnapColour());
diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 0177c01240..536d7b39b7 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -45,8 +45,8 @@ namespace osu.Game.Rulesets.Mania.UI
 
         public new ManiaBeatmap Beatmap => (ManiaBeatmap)base.Beatmap;
 
-        [Cached]
-        private BeatDivisorFinder beatDivisorFinder { get; set; }
+        [Cached(typeof(IBeatmap))]
+        private ManiaBeatmap cachedBeatmap { get; set; }
 
         public IEnumerable<BarLine> BarLines;
 
@@ -80,7 +80,7 @@ namespace osu.Game.Rulesets.Mania.UI
             : base(ruleset, beatmap, mods)
         {
             BarLines = new BarLineGenerator<BarLine>(Beatmap).BarLines;
-            beatDivisorFinder = new BeatDivisorFinder(Beatmap);
+            cachedBeatmap = Beatmap;
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game.Tests/NonVisual/BeatDivisorFinder.cs b/osu.Game.Tests/NonVisual/BeatDivisorFinder.cs
deleted file mode 100644
index 720d8e8ecd..0000000000
--- a/osu.Game.Tests/NonVisual/BeatDivisorFinder.cs
+++ /dev/null
@@ -1,116 +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 NUnit.Framework;
-using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Rulesets.Objects;
-
-namespace osu.Game.Tests.NonVisual
-{
-    public class BeatDivisorFinderTest
-    {
-        [Test]
-        public void TestFindDivisor()
-        {
-            const double beat_length = 1000;
-
-            var beatmap = new Beatmap
-            {
-                HitObjects = new List<HitObject>
-                {
-                    new HitObject { StartTime = -beat_length / 3 },
-                    new HitObject { StartTime = 0 },
-                    new HitObject { StartTime = beat_length / 16 },
-                    new HitObject { StartTime = beat_length / 12 },
-                    new HitObject { StartTime = beat_length / 8 },
-                    new HitObject { StartTime = beat_length / 6 },
-                    new HitObject { StartTime = beat_length / 4 },
-                    new HitObject { StartTime = beat_length / 3 },
-                    new HitObject { StartTime = beat_length / 2 },
-                    new HitObject { StartTime = beat_length },
-                    new HitObject { StartTime = beat_length + beat_length / 7 }
-                },
-                ControlPointInfo = new ControlPointInfo()
-            };
-
-            beatmap.ControlPointInfo.Add(0, new TimingControlPoint
-            {
-                TimeSignature = Game.Beatmaps.Timing.TimeSignatures.SimpleQuadruple,
-                BeatLength = beat_length
-            });
-
-            var beatDivisorFinder = new BeatDivisorFinder(beatmap);
-
-            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[0]), 3);
-            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[1]), 1);
-            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[2]), 16);
-            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[3]), 12);
-            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[4]), 8);
-            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[5]), 6);
-            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[6]), 4);
-            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[7]), 3);
-            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[8]), 2);
-            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[9]), 1);
-            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[10]), 0);
-        }
-
-        [Test]
-        public void TestFindDivisorWithTempoChanges()
-        {
-            const double first_beat_length = 1000;
-            const double second_beat_length = 700;
-            const double third_beat_length = 200;
-
-            const double first_beat_length_start = 0;
-            const double second_beat_length_start = 1000;
-            const double third_beat_length_start = 2000;
-
-            var beatmap = new Beatmap
-            {
-                HitObjects = new List<HitObject>
-                {
-                    new HitObject { StartTime = first_beat_length_start },
-                    new HitObject { StartTime = first_beat_length_start + first_beat_length / 2 },
-                    new HitObject { StartTime = second_beat_length_start },
-                    new HitObject { StartTime = second_beat_length_start + second_beat_length / 2 },
-                    new HitObject { StartTime = third_beat_length_start },
-                    new HitObject { StartTime = third_beat_length_start + third_beat_length / 2 },
-                },
-                ControlPointInfo = new ControlPointInfo()
-            };
-
-            var firstTimingControlPoint = new TimingControlPoint
-            {
-                TimeSignature = Game.Beatmaps.Timing.TimeSignatures.SimpleQuadruple,
-                BeatLength = first_beat_length
-            };
-
-            var secondTimingControlPoint = new TimingControlPoint
-            {
-                TimeSignature = Game.Beatmaps.Timing.TimeSignatures.SimpleQuadruple,
-                BeatLength = second_beat_length
-            };
-
-            var thirdTimingControlPoint = new TimingControlPoint
-            {
-                TimeSignature = Game.Beatmaps.Timing.TimeSignatures.SimpleQuadruple,
-                BeatLength = third_beat_length
-            };
-
-            beatmap.ControlPointInfo.Add(first_beat_length_start, firstTimingControlPoint);
-            beatmap.ControlPointInfo.Add(second_beat_length_start, secondTimingControlPoint);
-            beatmap.ControlPointInfo.Add(third_beat_length_start, thirdTimingControlPoint);
-
-            var beatDivisorFinder = new BeatDivisorFinder(beatmap);
-
-            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[0]), 1);
-            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[1]), 2);
-            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[2]), 1);
-            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[3]), 2);
-            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[4]), 1);
-            Assert.AreEqual(beatDivisorFinder.FindDivisor(beatmap.HitObjects[5]), 2);
-        }
-    }
-}
diff --git a/osu.Game/Rulesets/Objects/BeatDivisorFinder.cs b/osu.Game/Rulesets/Objects/BeatDivisorFinder.cs
deleted file mode 100644
index 1479b22942..0000000000
--- a/osu.Game/Rulesets/Objects/BeatDivisorFinder.cs
+++ /dev/null
@@ -1,55 +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.Utils;
-using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Screens.Edit;
-
-namespace osu.Game.Rulesets.Objects
-{
-    /// <summary>
-    /// Used to find the lowest beat divisor that a <see cref="HitObject"/> aligns to in an <see cref="IBeatmap"/>.
-    /// </summary>
-    public class BeatDivisorFinder
-    {
-        private readonly IBeatmap beatmap;
-
-        /// <summary>
-        /// Creates a new <see cref="BeatDivisorFinder"/> instance.
-        /// </summary>
-        /// <param name="beatmap">The beatmap to use when calculating beat divisor alignment.</param>
-        public BeatDivisorFinder(IBeatmap beatmap)
-        {
-            this.beatmap = beatmap;
-        }
-
-        /// <summary>
-        /// Finds the lowest beat divisor that the given <see cref="HitObject"/> aligns to.
-        /// Returns 0 if it does not align to any divisor.
-        /// </summary>
-        /// <param name="hitObject">The <see cref="HitObject"/> to evaluate.</param>
-        public int FindDivisor(HitObject hitObject)
-        {
-            TimingControlPoint currentTimingPoint = beatmap.ControlPointInfo.TimingPointAt(hitObject.StartTime);
-            double snapResult = hitObject.StartTime - currentTimingPoint.Time;
-
-            foreach (var divisor in BindableBeatDivisor.VALID_DIVISORS)
-            {
-                if (almostDivisibleBy(snapResult, currentTimingPoint.BeatLength / divisor))
-                    return divisor;
-            }
-
-            return 0;
-        }
-
-        private const double leniency_ms = 1.0;
-
-        private static bool almostDivisibleBy(double dividend, double divisor)
-        {
-            double remainder = Math.Abs(dividend) % divisor;
-            return Precision.AlmostEquals(remainder, 0, leniency_ms) || Precision.AlmostEquals(remainder - divisor, 0, leniency_ms);
-        }
-    }
-}

From 0d077b7a5deb9a5ec4f44c5a8335cb063080062b Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Sat, 1 May 2021 14:13:42 +0800
Subject: [PATCH 3025/3722] Fix GetClosestBeatDivisor returning the wrong
 divisor

---
 osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
index e47d48edcf..d3a4b635f5 100644
--- a/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
+++ b/osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using Newtonsoft.Json;
 using osu.Framework.Bindables;
 using osu.Framework.Lists;
+using osu.Framework.Utils;
 using osu.Game.Screens.Edit;
 
 namespace osu.Game.Beatmaps.ControlPoints
@@ -195,7 +196,7 @@ namespace osu.Game.Beatmaps.ControlPoints
             {
                 double distanceFromSnap = Math.Abs(time - getClosestSnappedTime(timingPoint, time, divisor));
 
-                if (distanceFromSnap < closestTime)
+                if (Precision.DefinitelyBigger(closestTime, distanceFromSnap))
                 {
                     closestDivisor = divisor;
                     closestTime = distanceFromSnap;

From 0b06c5bcb198aec5a587fa45e035ef76d0665116 Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Sat, 1 May 2021 15:00:18 +0800
Subject: [PATCH 3026/3722] Remove unneeded test data

---
 .../TestSceneTimingBasedNoteColouring.cs       | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneTimingBasedNoteColouring.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneTimingBasedNoteColouring.cs
index 5cfd7ff389..e14ad92842 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneTimingBasedNoteColouring.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneTimingBasedNoteColouring.cs
@@ -45,15 +45,7 @@ namespace osu.Game.Rulesets.Mania.Tests
                     new Note { StartTime = beat_length }
                 },
                 ControlPointInfo = new ControlPointInfo(),
-                BeatmapInfo =
-                {
-                    BaseDifficulty = new BeatmapDifficulty
-                    {
-                        SliderTickRate = 4,
-                        OverallDifficulty = 10,
-                    },
-                    Ruleset = ruleset.RulesetInfo
-                },
+                BeatmapInfo = { Ruleset = ruleset.RulesetInfo },
             };
 
             foreach (var note in beatmap.HitObjects)
@@ -62,11 +54,9 @@ namespace osu.Game.Rulesets.Mania.Tests
             }
 
             beatmap.ControlPointInfo.Add(0, new TimingControlPoint
-                {
-                    TimeSignature = Game.Beatmaps.Timing.TimeSignatures.SimpleQuadruple,
-                    BeatLength = beat_length
-                }
-            );
+            {
+                BeatLength = beat_length
+            });
 
             Child = new Container
             {

From db815f793038ca0c0f58a7a70d831a4ff21d8b63 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 1 May 2021 20:39:10 +0900
Subject: [PATCH 3027/3722] Tidy up implementation in `DrawableNote`

---
 .../Objects/Drawables/DrawableNote.cs         | 22 +++++--------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index d67c360301..36565e14aa 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -35,8 +35,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         private readonly Drawable headPiece;
 
-        private readonly Bindable<int> snap = new Bindable<int>();
-
         public DrawableNote(Note hitObject)
             : base(hitObject)
         {
@@ -58,17 +56,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         protected override void LoadComplete()
         {
-            if (beatmap != null)
-            {
-                HitObject.StartTimeBindable.BindValueChanged(startTime =>
-                    {
-                        snap.Value = beatmap.ControlPointInfo.GetClosestBeatDivisor(startTime.NewValue);
-                    },
-                    true
-                );
-            }
-
-            snap.BindValueChanged(_ => updateSnapColour());
+            HitObject.StartTimeBindable.BindValueChanged(_ => updateSnapColour());
             configTimingBasedNoteColouring.BindValueChanged(_ => updateSnapColour(), true);
         }
 
@@ -114,9 +102,11 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         private void updateSnapColour()
         {
-            Colour = configTimingBasedNoteColouring.Value
-                ? BindableBeatDivisor.GetColourFor(snap.Value, colours)
-                : Color4.White;
+            if (beatmap == null) return;
+
+            int snapDivisor = beatmap.ControlPointInfo.GetClosestBeatDivisor(HitObject.StartTime);
+
+            Colour = configTimingBasedNoteColouring.Value ? BindableBeatDivisor.GetColourFor(snapDivisor, colours) : Color4.White;
         }
     }
 }

From a551958eeb413e7e4a4b34b72cc8ed53b14f6d5c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 1 May 2021 21:32:45 +0900
Subject: [PATCH 3028/3722] Move caching of `IBeatmap` to base
 `DrawableRuleset`

---
 osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs | 4 ----
 osu.Game/Rulesets/UI/DrawableRuleset.cs            | 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 536d7b39b7..4ee060e91e 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -45,9 +45,6 @@ namespace osu.Game.Rulesets.Mania.UI
 
         public new ManiaBeatmap Beatmap => (ManiaBeatmap)base.Beatmap;
 
-        [Cached(typeof(IBeatmap))]
-        private ManiaBeatmap cachedBeatmap { get; set; }
-
         public IEnumerable<BarLine> BarLines;
 
         protected override bool RelativeScaleBeatLengths => true;
@@ -80,7 +77,6 @@ namespace osu.Game.Rulesets.Mania.UI
             : base(ruleset, beatmap, mods)
         {
             BarLines = new BarLineGenerator<BarLine>(Beatmap).BarLines;
-            cachedBeatmap = Beatmap;
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index ca27e6b21a..a2dade2627 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -85,6 +85,7 @@ namespace osu.Game.Rulesets.UI
         /// <summary>
         /// The beatmap.
         /// </summary>
+        [Cached(typeof(IBeatmap))]
         public readonly Beatmap<TObject> Beatmap;
 
         public override IEnumerable<HitObject> Objects => Beatmap.HitObjects;

From 137be5dc971b6f6fddc300ac9dafc0512a38295f Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sat, 1 May 2021 14:14:07 -0700
Subject: [PATCH 3029/3722] Use equality operator instead of null coalescing

Co-Authored-By: Salman Ahmed <frenzibyte@gmail.com>
---
 osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs          | 2 +-
 .../Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
index e9733bad20..aff48919b4 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 var scoreInfos = value.Scores.Select(s => s.CreateScoreInfo(rulesets)).ToList();
                 var topScore = scoreInfos.First();
 
-                scoreTable.DisplayScores(scoreInfos, topScore.Beatmap?.Status.GrantsPerformancePoints() ?? false);
+                scoreTable.DisplayScores(scoreInfos, topScore.Beatmap?.Status.GrantsPerformancePoints() == true);
                 scoreTable.Show();
 
                 var userScore = value.UserScore;
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index a4b58e74a6..262f321598 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -112,7 +112,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 accuracyColumn.Text = value.DisplayAccuracy;
                 maxComboColumn.Text = $@"{value.MaxCombo:N0}x";
 
-                ppColumn.Alpha = value.Beatmap?.Status.GrantsPerformancePoints() ?? false ? 1 : 0;
+                ppColumn.Alpha = value.Beatmap?.Status.GrantsPerformancePoints() == true ? 1 : 0;
                 ppColumn.Text = $@"{value.PP:N0}";
 
                 statisticsColumns.ChildrenEnumerable = value.GetStatisticsForDisplay().Select(createStatisticsColumn);

From 07fe99025f9e2493e86a91ac078c509675b010d2 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 1 May 2021 15:05:12 +0300
Subject: [PATCH 3030/3722] Use bounding box of blueprint for computing
 selection box area

---
 .../Screens/Edit/Compose/Components/SelectionHandler.cs     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index cb3424a250..c11c20df2a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -9,6 +9,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
@@ -332,8 +333,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             foreach (var blueprint in selectedBlueprints)
             {
-                topLeft = Vector2.ComponentMin(topLeft, ToLocalSpace(blueprint.SelectionQuad.TopLeft));
-                bottomRight = Vector2.ComponentMax(bottomRight, ToLocalSpace(blueprint.SelectionQuad.BottomRight));
+                var blueprintRect = blueprint.SelectionQuad.AABBFloat;
+                topLeft = Vector2.ComponentMin(topLeft, ToLocalSpace(blueprintRect.TopLeft));
+                bottomRight = Vector2.ComponentMax(bottomRight, ToLocalSpace(blueprintRect.BottomRight));
             }
 
             topLeft -= new Vector2(5);

From 0aa17e7c955b93e4b0b2283279ebdd16fcf9e7c7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 2 May 2021 02:51:06 +0300
Subject: [PATCH 3031/3722] Rewrite selection box computation logic with
 `RectangleF`'s helper methods

---
 .../Compose/Components/SelectionHandler.cs     | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index c11c20df2a..8335ece236 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -328,21 +328,15 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 return;
 
             // Move the rectangle to cover the items
-            var topLeft = new Vector2(float.MaxValue, float.MaxValue);
-            var bottomRight = new Vector2(float.MinValue, float.MinValue);
+            RectangleF selectionRect = ToLocalSpace(selectedBlueprints.First().SelectionQuad).AABBFloat;
 
-            foreach (var blueprint in selectedBlueprints)
-            {
-                var blueprintRect = blueprint.SelectionQuad.AABBFloat;
-                topLeft = Vector2.ComponentMin(topLeft, ToLocalSpace(blueprintRect.TopLeft));
-                bottomRight = Vector2.ComponentMax(bottomRight, ToLocalSpace(blueprintRect.BottomRight));
-            }
+            foreach (var blueprint in selectedBlueprints.Skip(1))
+                selectionRect = RectangleF.Union(selectionRect, ToLocalSpace(blueprint.SelectionQuad).AABBFloat);
 
-            topLeft -= new Vector2(5);
-            bottomRight += new Vector2(5);
+            selectionRect = selectionRect.Inflate(5f);
 
-            content.Size = bottomRight - topLeft;
-            content.Position = topLeft;
+            content.Position = selectionRect.Location;
+            content.Size = selectionRect.Size;
         }
 
         #endregion

From b83aa0bd76e59007e7e8063aefe34bc16ed58841 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 2 May 2021 06:21:14 +0300
Subject: [PATCH 3032/3722] Avoid LINQ in update

---
 .../Screens/Edit/Compose/Components/SelectionHandler.cs     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 8335ece236..917cbca4e1 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -328,10 +328,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 return;
 
             // Move the rectangle to cover the items
-            RectangleF selectionRect = ToLocalSpace(selectedBlueprints.First().SelectionQuad).AABBFloat;
+            RectangleF selectionRect = ToLocalSpace(selectedBlueprints[0].SelectionQuad).AABBFloat;
 
-            foreach (var blueprint in selectedBlueprints.Skip(1))
-                selectionRect = RectangleF.Union(selectionRect, ToLocalSpace(blueprint.SelectionQuad).AABBFloat);
+            for (int i = 1; i < selectedBlueprints.Count; i++)
+                selectionRect = RectangleF.Union(selectionRect, ToLocalSpace(selectedBlueprints[i].SelectionQuad).AABBFloat);
 
             selectionRect = selectionRect.Inflate(5f);
 

From 3aa18e19c93272515a293946b4b468deea3fb1e8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 2 May 2021 11:30:44 +0300
Subject: [PATCH 3033/3722] Revert "Bump Humanizer from 2.8.26 to 2.9.9"

This reverts commit 1e7feff49d57fc2f0575a8a423083e0ff9a44d65.
---
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index b25e462453..1e0eabfff7 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="DiffPlex" Version="1.7.0" />
-    <PackageReference Include="Humanizer" Version="2.9.9" />
+    <PackageReference Include="Humanizer" Version="2.8.26" />
     <PackageReference Include="MessagePack" Version="2.2.85" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="5.0.5" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.5" />
diff --git a/osu.iOS.props b/osu.iOS.props
index bbf0f6046c..e26e727e69 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -89,7 +89,7 @@
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
     <PackageReference Include="DiffPlex" Version="1.6.3" />
-    <PackageReference Include="Humanizer" Version="2.9.9" />
+    <PackageReference Include="Humanizer" Version="2.8.26" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />

From ce8b2c1e379de69697ca880a24be662ae726a120 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Mon, 17 May 2021 01:08:02 +0700
Subject: [PATCH 3034/3722] add WikiMarkdownContainer

---
 .../Wiki/Markdown/WikiMarkdownContainer.cs        | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs

diff --git a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs
new file mode 100644
index 0000000000..ac128d79dc
--- /dev/null
+++ b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.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.Game.Graphics.Containers.Markdown;
+
+namespace osu.Game.Overlays.Wiki.Markdown
+{
+    public class WikiMarkdownContainer : OsuMarkdownContainer
+    {
+        public string CurrentPath
+        {
+            set => Schedule(() => DocumentUrl += $"wiki/{value}");
+        }
+    }
+}

From a38c33841a8b4cb46f07acc16ad5bdc79b635a58 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Sun, 23 May 2021 16:30:41 +0700
Subject: [PATCH 3035/3722] add test scene wiki container

---
 .../Online/TestSceneWikiMarkdownContainer.cs  | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs
new file mode 100644
index 0000000000..fd4c2e2372
--- /dev/null
+++ b/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.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 NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Wiki.Markdown;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public class TestSceneWikiMarkdownContainer : OsuTestScene
+    {
+        private WikiMarkdownContainer markdownContainer;
+
+        [Cached]
+        private readonly OverlayColourProvider overlayColour = new OverlayColourProvider(OverlayColourScheme.Orange);
+
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            Children = new Drawable[]
+            {
+                new Box
+                {
+                    Colour = overlayColour.Background5,
+                    RelativeSizeAxes = Axes.Both,
+                },
+                new BasicScrollContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Padding = new MarginPadding(20),
+                    Child = markdownContainer = new WikiMarkdownContainer()
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                    }
+                }
+            };
+        });
+
+        [Test]
+        public void TestLink()
+        {
+            AddStep("set current path", () => markdownContainer.CurrentPath = "Article_styling_criteria/");
+
+            AddStep("set '/wiki/Main_Page''", () => markdownContainer.Text = "[wiki main page](/wiki/Main_Page)");
+
+            AddStep("set '../FAQ''", () => markdownContainer.Text = "[FAQ](../FAQ)");
+
+            AddStep("set './Writing''", () => markdownContainer.Text = "[wiki writing guidline](./Writing)");
+
+            AddStep("set 'Formatting''", () => markdownContainer.Text = "[wiki formatting guidline](Formatting)");
+        }
+    }
+}

From 98af998978c7f128733cda2dc97db0694a64fd10 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Tue, 25 May 2021 09:56:26 +0700
Subject: [PATCH 3036/3722] add test markdown class

---
 .../Online/TestSceneWikiMarkdownContainer.cs  | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs
index fd4c2e2372..993525e7db 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs
@@ -1,11 +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 Markdig.Syntax.Inlines;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Containers.Markdown;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics.Containers.Markdown;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Wiki.Markdown;
 
@@ -13,7 +17,7 @@ namespace osu.Game.Tests.Visual.Online
 {
     public class TestSceneWikiMarkdownContainer : OsuTestScene
     {
-        private WikiMarkdownContainer markdownContainer;
+        private TestMarkdownContainer markdownContainer;
 
         [Cached]
         private readonly OverlayColourProvider overlayColour = new OverlayColourProvider(OverlayColourScheme.Orange);
@@ -32,7 +36,7 @@ namespace osu.Game.Tests.Visual.Online
                 {
                     RelativeSizeAxes = Axes.Both,
                     Padding = new MarginPadding(20),
-                    Child = markdownContainer = new WikiMarkdownContainer()
+                    Child = markdownContainer = new TestMarkdownContainer
                     {
                         RelativeSizeAxes = Axes.X,
                         AutoSizeAxes = Axes.Y,
@@ -54,5 +58,27 @@ namespace osu.Game.Tests.Visual.Online
 
             AddStep("set 'Formatting''", () => markdownContainer.Text = "[wiki formatting guidline](Formatting)");
         }
+
+        private class TestMarkdownContainer : WikiMarkdownContainer
+        {
+            public LinkInline Link;
+
+            public override MarkdownTextFlowContainer CreateTextFlow() => new TestMarkdownTextFlowContainer
+            {
+                UrlAdded = link => Link = link,
+            };
+
+            private class TestMarkdownTextFlowContainer : OsuMarkdownTextFlowContainer
+            {
+                public Action<LinkInline> UrlAdded;
+
+                protected override void AddLinkText(string text, LinkInline linkInline)
+                {
+                    base.AddLinkText(text, linkInline);
+
+                    UrlAdded?.Invoke(linkInline);
+                }
+            }
+        }
     }
 }

From 5c1c43dea395211307b848bfa3dbdd218289814b Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Tue, 25 May 2021 10:44:22 +0700
Subject: [PATCH 3037/3722] add link assert

---
 .../Visual/Online/TestSceneWikiMarkdownContainer.cs       | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs
index 993525e7db..cadf876094 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Containers.Markdown;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics.Containers.Markdown;
+using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Wiki.Markdown;
 
@@ -22,6 +23,9 @@ namespace osu.Game.Tests.Visual.Online
         [Cached]
         private readonly OverlayColourProvider overlayColour = new OverlayColourProvider(OverlayColourScheme.Orange);
 
+        [Cached]
+        private readonly IAPIProvider api = new DummyAPIAccess();
+
         [SetUp]
         public void Setup() => Schedule(() =>
         {
@@ -51,12 +55,16 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("set current path", () => markdownContainer.CurrentPath = "Article_styling_criteria/");
 
             AddStep("set '/wiki/Main_Page''", () => markdownContainer.Text = "[wiki main page](/wiki/Main_Page)");
+            AddAssert("check url", () => markdownContainer.Link.Url == $"{api.WebsiteRootUrl}/wiki/Main_Page");
 
             AddStep("set '../FAQ''", () => markdownContainer.Text = "[FAQ](../FAQ)");
+            AddAssert("check url", () => markdownContainer.Link.Url == $"{api.WebsiteRootUrl}/wiki/FAQ");
 
             AddStep("set './Writing''", () => markdownContainer.Text = "[wiki writing guidline](./Writing)");
+            AddAssert("check url", () => markdownContainer.Link.Url == $"{api.WebsiteRootUrl}/wiki/Article_styling_criteria/Writing");
 
             AddStep("set 'Formatting''", () => markdownContainer.Text = "[wiki formatting guidline](Formatting)");
+            AddAssert("check url", () => markdownContainer.Link.Url == $"{api.WebsiteRootUrl}/wiki/Article_styling_criteria/Formatting");
         }
 
         private class TestMarkdownContainer : WikiMarkdownContainer

From 292f314feeba625149aa30b639503ca794b2a67f Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 21 May 2021 16:04:08 +0700
Subject: [PATCH 3038/3722] initial wiki notice container

---
 .../Wiki/Markdown/WikiMarkdownContainer.cs    | 19 +++++++++++++++++++
 .../Wiki/Markdown/WikiNoticeContainer.cs      | 19 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 osu.Game/Overlays/Wiki/Markdown/WikiNoticeContainer.cs

diff --git a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs
index ac128d79dc..3dfb9828cf 100644
--- a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs
+++ b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.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 Markdig.Extensions.Yaml;
+using Markdig.Syntax;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.Containers.Markdown;
 
 namespace osu.Game.Overlays.Wiki.Markdown
@@ -11,5 +14,21 @@ namespace osu.Game.Overlays.Wiki.Markdown
         {
             set => Schedule(() => DocumentUrl += $"wiki/{value}");
         }
+
+        protected override void AddMarkdownComponent(IMarkdownObject markdownObject, FillFlowContainer container, int level)
+        {
+            switch (markdownObject)
+            {
+                case YamlFrontMatterBlock yamlFrontMatterBlock:
+                    container.Add(CreateNotice(yamlFrontMatterBlock));
+                    break;
+
+                default:
+                    base.AddMarkdownComponent(markdownObject, container, level);
+                    break;
+            }
+        }
+
+        protected virtual FillFlowContainer CreateNotice(YamlFrontMatterBlock yamlFrontMatterBlock) => new WikiNoticeContainer(yamlFrontMatterBlock);
     }
 }
diff --git a/osu.Game/Overlays/Wiki/Markdown/WikiNoticeContainer.cs b/osu.Game/Overlays/Wiki/Markdown/WikiNoticeContainer.cs
new file mode 100644
index 0000000000..e42834cea7
--- /dev/null
+++ b/osu.Game/Overlays/Wiki/Markdown/WikiNoticeContainer.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 Markdig.Extensions.Yaml;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+
+namespace osu.Game.Overlays.Wiki.Markdown
+{
+    public class WikiNoticeContainer : FillFlowContainer
+    {
+        public WikiNoticeContainer(YamlFrontMatterBlock yamlFrontMatterBlock)
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+            Direction = FillDirection.Vertical;
+        }
+    }
+}

From 8f1b48d766ad31253a3a105c832120516d488b58 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Sun, 23 May 2021 17:29:48 +0700
Subject: [PATCH 3039/3722] add test for notice box

---
 .../Online/TestSceneWikiMarkdownContainer.cs  | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs
index cadf876094..018e1bf9f1 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs
@@ -67,6 +67,40 @@ namespace osu.Game.Tests.Visual.Online
             AddAssert("check url", () => markdownContainer.Link.Url == $"{api.WebsiteRootUrl}/wiki/Article_styling_criteria/Formatting");
         }
 
+        [Test]
+        public void TestOutdatedNoticeBox()
+        {
+            AddStep("Add outdated yaml header", () =>
+            {
+                markdownContainer.Text = @"---
+outdated: true
+---";
+            });
+        }
+
+        [Test]
+        public void TestNeedsCleanupNoticeBox()
+        {
+            AddStep("Add needs cleanup yaml header", () =>
+            {
+                markdownContainer.Text = @"---
+needs_cleanup: true
+---";
+            });
+        }
+
+        [Test]
+        public void TestOnlyShowOutdatedNoticeBox()
+        {
+            AddStep("Add outdated and needs cleanup yaml", () =>
+            {
+                markdownContainer.Text = @"---
+outdated: true
+needs_cleanup: true
+---";
+            });
+        }
+
         private class TestMarkdownContainer : WikiMarkdownContainer
         {
             public LinkInline Link;

From b3eff65a0cf70742e9dca2dae768015b988b06e5 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 21 May 2021 16:05:37 +0700
Subject: [PATCH 3040/3722] parse isOutdated and needsCleanup

---
 .../Wiki/Markdown/WikiNoticeContainer.cs        | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/osu.Game/Overlays/Wiki/Markdown/WikiNoticeContainer.cs b/osu.Game/Overlays/Wiki/Markdown/WikiNoticeContainer.cs
index e42834cea7..3070d20798 100644
--- a/osu.Game/Overlays/Wiki/Markdown/WikiNoticeContainer.cs
+++ b/osu.Game/Overlays/Wiki/Markdown/WikiNoticeContainer.cs
@@ -9,11 +9,28 @@ namespace osu.Game.Overlays.Wiki.Markdown
 {
     public class WikiNoticeContainer : FillFlowContainer
     {
+        private readonly bool isOutdated;
+        private readonly bool needsCleanup;
+
         public WikiNoticeContainer(YamlFrontMatterBlock yamlFrontMatterBlock)
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
             Direction = FillDirection.Vertical;
+
+            foreach (var line in yamlFrontMatterBlock.Lines)
+            {
+                switch (line.ToString())
+                {
+                    case "outdated: true":
+                        isOutdated = true;
+                        break;
+
+                    case "needs_cleanup: true":
+                        needsCleanup = true;
+                        break;
+                }
+            }
         }
     }
 }

From e23ea00197ff7eb0c6d2e719aa7f54b3c5625025 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 21 May 2021 16:06:43 +0700
Subject: [PATCH 3041/3722] add notice box

---
 .../Wiki/Markdown/WikiNoticeContainer.cs      | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/osu.Game/Overlays/Wiki/Markdown/WikiNoticeContainer.cs b/osu.Game/Overlays/Wiki/Markdown/WikiNoticeContainer.cs
index 3070d20798..f2821d14eb 100644
--- a/osu.Game/Overlays/Wiki/Markdown/WikiNoticeContainer.cs
+++ b/osu.Game/Overlays/Wiki/Markdown/WikiNoticeContainer.cs
@@ -2,8 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using Markdig.Extensions.Yaml;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Containers.Markdown;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
 
 namespace osu.Game.Overlays.Wiki.Markdown
 {
@@ -32,5 +36,41 @@ namespace osu.Game.Overlays.Wiki.Markdown
                 }
             }
         }
+
+        private class NoticeBox : Container
+        {
+            [Resolved]
+            private IMarkdownTextFlowComponent parentFlowComponent { get; set; }
+
+            public string Text { get; set; }
+
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider, OsuColour colour)
+            {
+                RelativeSizeAxes = Axes.X;
+                AutoSizeAxes = Axes.Y;
+                MarkdownTextFlowContainer textFlow;
+
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = colourProvider.Background4,
+                    },
+                    textFlow = parentFlowComponent.CreateTextFlow().With(t =>
+                    {
+                        t.Colour = colour.Orange1;
+                        t.Padding = new MarginPadding
+                        {
+                            Vertical = 10,
+                            Horizontal = 15,
+                        };
+                    })
+                };
+
+                textFlow.AddText(Text);
+            }
+        }
     }
 }

From 7a8a37f4a0e6536fdd659e447e820a37e746937a Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 21 May 2021 16:08:30 +0700
Subject: [PATCH 3042/3722] load notice box

---
 .../Wiki/Markdown/WikiNoticeContainer.cs      | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/osu.Game/Overlays/Wiki/Markdown/WikiNoticeContainer.cs b/osu.Game/Overlays/Wiki/Markdown/WikiNoticeContainer.cs
index f2821d14eb..421806eea8 100644
--- a/osu.Game/Overlays/Wiki/Markdown/WikiNoticeContainer.cs
+++ b/osu.Game/Overlays/Wiki/Markdown/WikiNoticeContainer.cs
@@ -37,6 +37,27 @@ namespace osu.Game.Overlays.Wiki.Markdown
             }
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            // Reference : https://github.com/ppy/osu-web/blob/master/resources/views/wiki/_notice.blade.php and https://github.com/ppy/osu-web/blob/master/resources/lang/en/wiki.php
+            // TODO : add notice box for fallback translation, legal translation and outdated translation after implement wiki locale in the future.
+            if (isOutdated)
+            {
+                Add(new NoticeBox
+                {
+                    Text = "The content on this page is incomplete or outdated. If you are able to help out, please consider updating the article!",
+                });
+            }
+            else if (needsCleanup)
+            {
+                Add(new NoticeBox
+                {
+                    Text = "This page does not meet the standards of the osu! wiki and needs to be cleaned up or rewritten. If you are able to help out, please consider updating the article!",
+                });
+            }
+        }
+
         private class NoticeBox : Container
         {
             [Resolved]

From 6585dd3a3e7eea2d7db371111b92a63434cab84a Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Sun, 23 May 2021 16:30:41 +0700
Subject: [PATCH 3043/3722] add image test

---
 .../Online/TestSceneWikiMarkdownContainer.cs  | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs
index 018e1bf9f1..3731e7a782 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs
@@ -101,6 +101,25 @@ needs_cleanup: true
             });
         }
 
+        [Test]
+        public void TestAbsoluteImage()
+        {
+            AddStep("Add absolute image", () =>
+            {
+                markdownContainer.Text = "![intro](/wiki/Interface/img/intro-screen.jpg)";
+            });
+        }
+
+        [Test]
+        public void TestRelativeImage()
+        {
+            AddStep("Add relative image", () =>
+            {
+                markdownContainer.CurrentPath = "Interface/";
+                markdownContainer.Text = "![intro](img/intro-screen.jpg)";
+            });
+        }
+
         private class TestMarkdownContainer : WikiMarkdownContainer
         {
             public LinkInline Link;

From ef707bd09951b88a39f75ce889cd0524f78c3e5a Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Sun, 2 May 2021 22:02:06 +0700
Subject: [PATCH 3044/3722] add WikiMarkdownImage

---
 .../Wiki/Markdown/WikiMarkdownContainer.cs    |  3 ++
 .../Wiki/Markdown/WikiMarkdownImage.cs        | 38 +++++++++++++++++++
 .../Markdown/WikiMarkdownTextFlowContainer.cs | 13 +++++++
 3 files changed, 54 insertions(+)
 create mode 100644 osu.Game/Overlays/Wiki/Markdown/WikiMarkdownImage.cs
 create mode 100644 osu.Game/Overlays/Wiki/Markdown/WikiMarkdownTextFlowContainer.cs

diff --git a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs
index 3dfb9828cf..994bab7d04 100644
--- a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs
+++ b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs
@@ -4,6 +4,7 @@
 using Markdig.Extensions.Yaml;
 using Markdig.Syntax;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Containers.Markdown;
 using osu.Game.Graphics.Containers.Markdown;
 
 namespace osu.Game.Overlays.Wiki.Markdown
@@ -29,6 +30,8 @@ namespace osu.Game.Overlays.Wiki.Markdown
             }
         }
 
+        public override MarkdownTextFlowContainer CreateTextFlow() => new WikiMarkdownTextFlowContainer();
+
         protected virtual FillFlowContainer CreateNotice(YamlFrontMatterBlock yamlFrontMatterBlock) => new WikiNoticeContainer(yamlFrontMatterBlock);
     }
 }
diff --git a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownImage.cs b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownImage.cs
new file mode 100644
index 0000000000..361aa2e95f
--- /dev/null
+++ b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownImage.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 Markdig.Syntax.Inlines;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Containers.Markdown;
+using osu.Framework.Graphics.Cursor;
+using osu.Game.Online.API;
+
+namespace osu.Game.Overlays.Wiki.Markdown
+{
+    public class WikiMarkdownImage : MarkdownImage, IHasTooltip
+    {
+        private readonly string url;
+
+        public string TooltipText { get; }
+
+        public WikiMarkdownImage(LinkInline linkInline)
+            : base(linkInline.Url)
+        {
+            url = linkInline.Url;
+            TooltipText = linkInline.Title;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(IAPIProvider api)
+        {
+            // The idea is replace "{api.WebsiteRootUrl}/wiki/{path-to-image}" to "{api.WebsiteRootUrl}/wiki/images/{path-to-image}"
+            // "/wiki/images/*" is route to fetch wiki image from osu!web server (see: https://github.com/ppy/osu-web/blob/4205eb66a4da86bdee7835045e4bf28c35456e04/routes/web.php#L289)
+            // Currently all image in dev server (https://dev.ppy.sh/wiki/image/*) is 404
+            // So for now just replace "{api.WebsiteRootUrl}/wiki/*" to "https://osu.ppy.sh/wiki/images/*" for simplicity
+            var imageUrl = url.Replace($"{api.WebsiteRootUrl}/wiki", "https://osu.ppy.sh/wiki/images");
+
+            InternalChild = new DelayedLoadWrapper(CreateImageContainer(imageUrl));
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownTextFlowContainer.cs b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownTextFlowContainer.cs
new file mode 100644
index 0000000000..1c2b37a219
--- /dev/null
+++ b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownTextFlowContainer.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 Markdig.Syntax.Inlines;
+using osu.Game.Graphics.Containers.Markdown;
+
+namespace osu.Game.Overlays.Wiki.Markdown
+{
+    public class WikiMarkdownTextFlowContainer : OsuMarkdownTextFlowContainer
+    {
+        protected override void AddImage(LinkInline linkInline) => AddDrawable(new WikiMarkdownImage(linkInline));
+    }
+}

From b78ec8307df7880f518626bf24160ece2d6dbd12 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Sun, 2 May 2021 22:22:22 +0700
Subject: [PATCH 3045/3722] add markdown paragraph with image block

---
 .../Wiki/Markdown/WikiMarkdownContainer.cs    |  2 +
 .../Wiki/Markdown/WikiMarkdownParagraph.cs    | 40 +++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 osu.Game/Overlays/Wiki/Markdown/WikiMarkdownParagraph.cs

diff --git a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs
index 994bab7d04..81115293d4 100644
--- a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs
+++ b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs
@@ -32,6 +32,8 @@ namespace osu.Game.Overlays.Wiki.Markdown
 
         public override MarkdownTextFlowContainer CreateTextFlow() => new WikiMarkdownTextFlowContainer();
 
+        protected override MarkdownParagraph CreateParagraph(ParagraphBlock paragraphBlock, int level) => new WikiMarkdownParagraph(paragraphBlock);
+
         protected virtual FillFlowContainer CreateNotice(YamlFrontMatterBlock yamlFrontMatterBlock) => new WikiNoticeContainer(yamlFrontMatterBlock);
     }
 }
diff --git a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownParagraph.cs b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownParagraph.cs
new file mode 100644
index 0000000000..4a7ce24aba
--- /dev/null
+++ b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownParagraph.cs
@@ -0,0 +1,40 @@
+// Copyright (c) ppy 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 Markdig.Syntax;
+using Markdig.Syntax.Inlines;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers.Markdown;
+using osuTK;
+
+namespace osu.Game.Overlays.Wiki.Markdown
+{
+    public class WikiMarkdownParagraph : MarkdownParagraph
+    {
+        private readonly ParagraphBlock paragraphBlock;
+
+        public WikiMarkdownParagraph(ParagraphBlock paragraphBlock)
+            : base(paragraphBlock)
+        {
+            this.paragraphBlock = paragraphBlock;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            MarkdownTextFlowContainer textFlow;
+            InternalChild = textFlow = CreateTextFlow();
+            textFlow.AddInlineText(paragraphBlock.Inline);
+
+            // Check if paragraph only contains an image.
+            if (paragraphBlock.Inline.Count() == 1 && paragraphBlock.Inline.FirstChild is LinkInline { IsImage: true } linkInline)
+            {
+                textFlow.TextAnchor = Anchor.TopCentre;
+                textFlow.Spacing = new Vector2(0, 5);
+                textFlow.AddText($"\n{linkInline.Title}");
+            }
+        }
+    }
+}

From 88aaa9b3320124203abbbef8169b82133956e5dd Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Sun, 2 May 2021 22:35:30 +0700
Subject: [PATCH 3046/3722] add inline code colour

Reference : https://github.com/ppy/osu-web/blob/31579d45aa464a439e943250ca0d5fa7e05a1eb6/resources/assets/less/bem/osu-md.less#L12-L17
---
 .../UserInterface/TestSceneOsuMarkdownContainer.cs       | 9 +++++++++
 .../Containers/Markdown/OsuMarkdownTextFlowContainer.cs  | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
index 852a2e32e2..99bbc22125 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
@@ -59,6 +59,15 @@ namespace osu.Game.Tests.Visual.UserInterface
             });
         }
 
+        [Test]
+        public void TestInlineCode()
+        {
+            AddStep("Add inline code", () =>
+            {
+                markdownContainer.Text = "This is `inline code` text";
+            });
+        }
+
         [Test]
         public void TestFencedCodeBlock()
         {
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs
index 7a6818b4c2..535e1fb9a0 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs
@@ -2,13 +2,22 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using Markdig.Syntax.Inlines;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers.Markdown;
+using osu.Game.Overlays;
 
 namespace osu.Game.Graphics.Containers.Markdown
 {
     public class OsuMarkdownTextFlowContainer : MarkdownTextFlowContainer
     {
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; }
+
         protected override void AddLinkText(string text, LinkInline linkInline)
             => AddDrawable(new OsuMarkdownLinkText(text, linkInline));
+
+        // TODO : Add background (colour B6) and change font to monospace
+        protected override void AddCodeInLine(CodeInline codeInline)
+            => AddText(codeInline.Content, t => { t.Colour = colourProvider.Light1; });
     }
 }

From 18bfcd7b222d9e13d9b6c07fdd20fed2aa30d8d0 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Sun, 2 May 2021 22:41:11 +0700
Subject: [PATCH 3047/3722] add hover colour to OsuMarkdownLinkText

---
 .../Containers/Markdown/OsuMarkdownLinkText.cs | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownLinkText.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownLinkText.cs
index 39b35fd84b..2efb60d125 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownLinkText.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownLinkText.cs
@@ -5,12 +5,16 @@ using Markdig.Syntax.Inlines;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers.Markdown;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Events;
 using osu.Game.Overlays;
 
 namespace osu.Game.Graphics.Containers.Markdown
 {
     public class OsuMarkdownLinkText : MarkdownLinkText
     {
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; }
+
         private SpriteText spriteText;
 
         public OsuMarkdownLinkText(string text, LinkInline linkInline)
@@ -19,7 +23,7 @@ namespace osu.Game.Graphics.Containers.Markdown
         }
 
         [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
+        private void load()
         {
             spriteText.Colour = colourProvider.Light2;
         }
@@ -28,5 +32,17 @@ namespace osu.Game.Graphics.Containers.Markdown
         {
             return spriteText = base.CreateSpriteText();
         }
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            spriteText.Colour = colourProvider.Light1;
+            return base.OnHover(e);
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            spriteText.Colour = colourProvider.Light2;
+            base.OnHoverLost(e);
+        }
     }
 }

From 59cb5f4679aab9b861fa3ca0b2c6ed473b22d330 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sat, 24 Apr 2021 09:26:43 -0700
Subject: [PATCH 3048/3722] Get recent count from api instead

---
 .../Profile/Sections/Ranks/PaginatedScoreContainer.cs       | 6 +++---
 osu.Game/Users/User.cs                                      | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
index 53f6d375ca..9ac9040a98 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
@@ -39,6 +39,9 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                 case ScoreType.Firsts:
                     return user.ScoresFirstCount;
 
+                case ScoreType.Recent:
+                    return user.ScoresRecentCount;
+
                 default:
                     return 0;
             }
@@ -50,9 +53,6 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                 drawableItemIndex = 0;
 
             base.OnItemsReceived(items);
-
-            if (type == ScoreType.Recent)
-                SetCount(items.Count);
         }
 
         protected override APIRequest<List<APILegacyScoreInfo>> CreateRequest() =>
diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index 74ffb7c457..beb41c3b06 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -147,6 +147,9 @@ namespace osu.Game.Users
         [JsonProperty(@"scores_first_count")]
         public int ScoresFirstCount;
 
+        [JsonProperty(@"scores_recent_count")]
+        public int ScoresRecentCount;
+
         [JsonProperty(@"beatmap_playcounts_count")]
         public int BeatmapPlaycountsCount;
 

From 3e74d61dab44ea25341aebd79cd02fe6792c1a05 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sat, 24 Apr 2021 09:27:32 -0700
Subject: [PATCH 3049/3722] Add best count from api

---
 .../Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs | 3 +++
 osu.Game/Users/User.cs                                         | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
index 9ac9040a98..d06e0c87fc 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
@@ -36,6 +36,9 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
         {
             switch (type)
             {
+                case ScoreType.Best:
+                    return user.ScoresBestCount;
+
                 case ScoreType.Firsts:
                     return user.ScoresFirstCount;
 
diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index beb41c3b06..2e04693e82 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -144,6 +144,9 @@ namespace osu.Game.Users
         [JsonProperty(@"unranked_beatmapset_count")]
         public int UnrankedBeatmapsetCount;
 
+        [JsonProperty(@"scores_best_count")]
+        public int ScoresBestCount;
+
         [JsonProperty(@"scores_first_count")]
         public int ScoresFirstCount;
 

From cc056088bdf0cbf988f7b8185addbedd669ebb95 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sun, 2 May 2021 14:31:06 -0700
Subject: [PATCH 3050/3722] Update profile subsections to use counters instead
 of missing text in line with web

---
 .../Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs    | 2 +-
 .../Historical/PaginatedMostPlayedBeatmapContainer.cs         | 2 +-
 osu.Game/Overlays/Profile/Sections/HistoricalSection.cs       | 2 +-
 .../Overlays/Profile/Sections/PaginatedProfileSubsection.cs   | 4 ++--
 .../Profile/Sections/Ranks/PaginatedScoreContainer.cs         | 4 ++--
 osu.Game/Overlays/Profile/Sections/RanksSection.cs            | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs b/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
index 780d7ea986..fe9c710bcc 100644
--- a/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Overlays.Profile.Sections.Beatmaps
         private readonly BeatmapSetType type;
 
         public PaginatedBeatmapContainer(BeatmapSetType type, Bindable<User> user, string headerText)
-            : base(user, headerText, "", CounterVisibilityState.AlwaysVisible)
+            : base(user, headerText)
         {
             this.type = type;
             ItemsPerPage = 6;
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs b/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
index e5bb1f8008..eeb14e5e4f 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
     public class PaginatedMostPlayedBeatmapContainer : PaginatedProfileSubsection<APIUserMostPlayedBeatmap>
     {
         public PaginatedMostPlayedBeatmapContainer(Bindable<User> user)
-            : base(user, "Most Played Beatmaps", "No records. :(", CounterVisibilityState.AlwaysVisible)
+            : base(user, "Most Played Beatmaps")
         {
             ItemsPerPage = 5;
         }
diff --git a/osu.Game/Overlays/Profile/Sections/HistoricalSection.cs b/osu.Game/Overlays/Profile/Sections/HistoricalSection.cs
index 6e2b9873cf..4fbb7fc7d7 100644
--- a/osu.Game/Overlays/Profile/Sections/HistoricalSection.cs
+++ b/osu.Game/Overlays/Profile/Sections/HistoricalSection.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Overlays.Profile.Sections
             {
                 new PlayHistorySubsection(User),
                 new PaginatedMostPlayedBeatmapContainer(User),
-                new PaginatedScoreContainer(ScoreType.Recent, User, "Recent Plays (24h)", CounterVisibilityState.VisibleWhenZero),
+                new PaginatedScoreContainer(ScoreType.Recent, User, "Recent Plays (24h)"),
                 new ReplaysSubsection(User)
             };
         }
diff --git a/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs b/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs
index 51e5622f68..e237b43b2e 100644
--- a/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs
+++ b/osu.Game/Overlays/Profile/Sections/PaginatedProfileSubsection.cs
@@ -38,8 +38,8 @@ namespace osu.Game.Overlays.Profile.Sections
         private OsuSpriteText missing;
         private readonly string missingText;
 
-        protected PaginatedProfileSubsection(Bindable<User> user, string headerText = "", string missingText = "", CounterVisibilityState counterVisibilityState = CounterVisibilityState.AlwaysHidden)
-            : base(user, headerText, counterVisibilityState)
+        protected PaginatedProfileSubsection(Bindable<User> user, string headerText = "", string missingText = "")
+            : base(user, headerText, CounterVisibilityState.AlwaysVisible)
         {
             this.missingText = missingText;
         }
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
index d06e0c87fc..720cd4a3db 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/PaginatedScoreContainer.cs
@@ -18,8 +18,8 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
     {
         private readonly ScoreType type;
 
-        public PaginatedScoreContainer(ScoreType type, Bindable<User> user, string headerText, CounterVisibilityState counterVisibilityState, string missingText = "")
-            : base(user, headerText, missingText, counterVisibilityState)
+        public PaginatedScoreContainer(ScoreType type, Bindable<User> user, string headerText)
+            : base(user, headerText)
         {
             this.type = type;
 
diff --git a/osu.Game/Overlays/Profile/Sections/RanksSection.cs b/osu.Game/Overlays/Profile/Sections/RanksSection.cs
index e41e414893..33f7c2f71a 100644
--- a/osu.Game/Overlays/Profile/Sections/RanksSection.cs
+++ b/osu.Game/Overlays/Profile/Sections/RanksSection.cs
@@ -16,8 +16,8 @@ namespace osu.Game.Overlays.Profile.Sections
         {
             Children = new[]
             {
-                new PaginatedScoreContainer(ScoreType.Best, User, "Best Performance", CounterVisibilityState.AlwaysHidden, "No performance records. :("),
-                new PaginatedScoreContainer(ScoreType.Firsts, User, "First Place Ranks", CounterVisibilityState.AlwaysVisible)
+                new PaginatedScoreContainer(ScoreType.Best, User, "Best Performance"),
+                new PaginatedScoreContainer(ScoreType.Firsts, User, "First Place Ranks")
             };
         }
     }

From b2130fc600d8cff184ba6e51bc3ef7dbeed2f44c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 3 May 2021 01:56:32 +0300
Subject: [PATCH 3051/3722] Fix replay frames sort instability

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

diff --git a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
index 0f25a45177..d6c9b9c6d9 100644
--- a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
+++ b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
@@ -4,7 +4,7 @@
 #nullable enable
 
 using System;
-using System.Collections.Generic;
+using System.Linq;
 using JetBrains.Annotations;
 using osu.Game.Input.Handlers;
 using osu.Game.Replays;
@@ -97,7 +97,7 @@ namespace osu.Game.Rulesets.Replays
         {
             // TODO: This replay frame ordering should be enforced on the Replay type.
             // Currently, the ordering can be broken if the frames are added after this construction.
-            replay.Frames.Sort((x, y) => x.Time.CompareTo(y.Time));
+            replay.Frames = replay.Frames.OrderBy(f => f.Time).ToList();
 
             this.replay = replay;
             currentFrameIndex = -1;

From 943c497397245fdf1924860b951c89940e3b235e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 3 May 2021 02:02:14 +0300
Subject: [PATCH 3052/3722] Return back removed using

---
 osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
index d6c9b9c6d9..bc8994bbe5 100644
--- a/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
+++ b/osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs
@@ -4,6 +4,7 @@
 #nullable enable
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Game.Input.Handlers;

From 8a2926c0b54e41f72cc1ba9c7110655dac392da6 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Mon, 3 May 2021 09:18:45 +0700
Subject: [PATCH 3053/3722] change default font size to 14

Reference :
- https://github.com/ppy/osu-web/blob/31579d45aa464a439e943250ca0d5fa7e05a1eb6/resources/assets/less/bem/osu-md.less#L9
- https://github.com/ppy/osu-web/blob/31579d45aa464a439e943250ca0d5fa7e05a1eb6/resources/assets/less/variables.less#L161
---
 .../Graphics/Containers/Markdown/OsuMarkdownContainer.cs   | 7 +++++++
 .../Containers/Markdown/OsuMarkdownTextFlowContainer.cs    | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index 02e674aaec..c4190d8c4f 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -9,6 +9,8 @@ using Markdig.Syntax;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Containers.Markdown;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Graphics.Containers.Markdown
 {
@@ -35,6 +37,11 @@ namespace osu.Game.Graphics.Containers.Markdown
             }
         }
 
+        public override SpriteText CreateSpriteText() => new OsuSpriteText
+        {
+            Font = OsuFont.GetFont(size: 14),
+        };
+
         public override MarkdownTextFlowContainer CreateTextFlow() => new OsuMarkdownTextFlowContainer();
 
         protected override MarkdownFencedCodeBlock CreateFencedCodeBlock(FencedCodeBlock fencedCodeBlock) => new OsuMarkdownFencedCodeBlock(fencedCodeBlock);
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs
index 535e1fb9a0..5165fe74a2 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs
@@ -4,6 +4,8 @@
 using Markdig.Syntax.Inlines;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers.Markdown;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 
 namespace osu.Game.Graphics.Containers.Markdown
@@ -13,6 +15,11 @@ namespace osu.Game.Graphics.Containers.Markdown
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; }
 
+        protected override SpriteText CreateSpriteText() => new OsuSpriteText
+        {
+            Font = OsuFont.GetFont(size: 14),
+        };
+
         protected override void AddLinkText(string text, LinkInline linkInline)
             => AddDrawable(new OsuMarkdownLinkText(text, linkInline));
 

From b97d3f2af1f64453a0ee0585d21e322b6dfc96fa Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Mon, 3 May 2021 09:35:26 +0700
Subject: [PATCH 3054/3722] add heading test scene

---
 .../UserInterface/TestSceneOsuMarkdownContainer.cs  | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
index 99bbc22125..d64c243005 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
@@ -41,6 +41,19 @@ namespace osu.Game.Tests.Visual.UserInterface
             };
         });
 
+        [Test]
+        public void TestHeading()
+        {
+            AddStep("Add Heading", () =>
+            {
+                markdownContainer.Text = @"# Header 1
+## Header 2
+### Header 3
+#### Header 4
+##### Header 5";
+            });
+        }
+
         [Test]
         public void TestLink()
         {

From b497785416df7d30523f11c37dd63f59766d370c Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Mon, 3 May 2021 09:35:55 +0700
Subject: [PATCH 3055/3722] add OsuMarkdownHeading

---
 .../Containers/Markdown/OsuMarkdownContainer.cs  |  2 ++
 .../Containers/Markdown/OsuMarkdownHeading.cs    | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index c4190d8c4f..3ad00e4df2 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -44,6 +44,8 @@ namespace osu.Game.Graphics.Containers.Markdown
 
         public override MarkdownTextFlowContainer CreateTextFlow() => new OsuMarkdownTextFlowContainer();
 
+        protected override MarkdownHeading CreateHeading(HeadingBlock headingBlock) => new OsuMarkdownHeading(headingBlock);
+
         protected override MarkdownFencedCodeBlock CreateFencedCodeBlock(FencedCodeBlock fencedCodeBlock) => new OsuMarkdownFencedCodeBlock(fencedCodeBlock);
 
         protected override MarkdownSeparator CreateSeparator(ThematicBreakBlock thematicBlock) => new OsuMarkdownSeparator();
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs
new file mode 100644
index 0000000000..bff0413e56
--- /dev/null
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.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 Markdig.Syntax;
+using osu.Framework.Graphics.Containers.Markdown;
+
+namespace osu.Game.Graphics.Containers.Markdown
+{
+    public class OsuMarkdownHeading : MarkdownHeading
+    {
+        public OsuMarkdownHeading(HeadingBlock headingBlock)
+            : base(headingBlock)
+        {
+        }
+    }
+}

From 3e7df3bf026b205d2922192e16567ebb05bdb02b Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Mon, 3 May 2021 09:35:59 +0700
Subject: [PATCH 3056/3722] change heading font size

Heading 1 : 30px
- https://github.com/ppy/osu-web/blob/31579d45aa464a439e943250ca0d5fa7e05a1eb6/resources/assets/less/base.less#L12-L16

Heading 2 : 26px
- https://github.com/ppy/osu-web/blob/31579d45aa464a439e943250ca0d5fa7e05a1eb6/resources/assets/less/bem/osu-md.less#L133-L134
- https://github.com/ppy/osu-web/blob/31579d45aa464a439e943250ca0d5fa7e05a1eb6/resources/assets/less/variables.less#L169

Heading 3 : 20px
- https://github.com/ppy/osu-web/blob/31579d45aa464a439e943250ca0d5fa7e05a1eb6/resources/assets/less/bem/osu-md.less#L147-L148
- https://github.com/ppy/osu-web/blob/31579d45aa464a439e943250ca0d5fa7e05a1eb6/resources/assets/less/variables.less#L170
- https://github.com/ppy/osu-web/blob/31579d45aa464a439e943250ca0d5fa7e05a1eb6/resources/assets/less/variables.less#L154

Heading 4 : 18px
- https://github.com/ppy/osu-web/blob/31579d45aa464a439e943250ca0d5fa7e05a1eb6/resources/assets/less/bem/osu-md.less#L160-L161
- https://github.com/ppy/osu-web/blob/31579d45aa464a439e943250ca0d5fa7e05a1eb6/resources/assets/less/variables.less#L171
- https://github.com/ppy/osu-web/blob/31579d45aa464a439e943250ca0d5fa7e05a1eb6/resources/assets/less/variables.less#L153

Heading 5 : 16px
- https://github.com/ppy/osu-web/blob/31579d45aa464a439e943250ca0d5fa7e05a1eb6/resources/assets/less/bem/osu-md.less#L174-L175
- https://github.com/ppy/osu-web/blob/31579d45aa464a439e943250ca0d5fa7e05a1eb6/resources/assets/less/variables.less#L172
- https://github.com/ppy/osu-web/blob/31579d45aa464a439e943250ca0d5fa7e05a1eb6/resources/assets/less/variables.less#L152

Heading 6 : 14px
- https://github.com/ppy/osu-web/blob/31579d45aa464a439e943250ca0d5fa7e05a1eb6/resources/assets/less/bem/osu-md.less#L183-L184
- https://github.com/ppy/osu-web/blob/31579d45aa464a439e943250ca0d5fa7e05a1eb6/resources/assets/less/variables.less#L173
- https://github.com/ppy/osu-web/blob/31579d45aa464a439e943250ca0d5fa7e05a1eb6/resources/assets/less/variables.less#L150
---
 .../Containers/Markdown/OsuMarkdownHeading.cs | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs
index bff0413e56..e7aa2b2512 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs
@@ -12,5 +12,31 @@ namespace osu.Game.Graphics.Containers.Markdown
             : base(headingBlock)
         {
         }
+
+        protected override float GetFontSizeByLevel(int level)
+        {
+            const float base_font_size = 14;
+
+            switch (level)
+            {
+                case 1:
+                    return 30 / base_font_size;
+
+                case 2:
+                    return 26 / base_font_size;
+
+                case 3:
+                    return 20 / base_font_size;
+
+                case 4:
+                    return 18 / base_font_size;
+
+                case 5:
+                    return 16 / base_font_size;
+
+                default:
+                    return 1;
+            }
+        }
     }
 }

From 6da4105da6c4b2bcf53f5b2dbc61cfe5b22533c5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 13:38:53 +0900
Subject: [PATCH 3057/3722] Remove Sync namespace (feels unnecessary)

---
 osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs        | 2 +-
 .../Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs         | 1 -
 .../Spectate/{Sync => }/CatchUpSpectatorPlayerClock.cs          | 2 +-
 .../Multiplayer/Spectate/{Sync => }/CatchUpSyncManager.cs       | 2 +-
 .../Multiplayer/Spectate/{Sync => }/ISpectatorPlayerClock.cs    | 2 +-
 .../OnlinePlay/Multiplayer/Spectate/{Sync => }/ISyncManager.cs  | 2 +-
 .../OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs     | 1 -
 .../OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs     | 1 -
 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs  | 1 -
 9 files changed, 5 insertions(+), 9 deletions(-)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/{Sync => }/CatchUpSpectatorPlayerClock.cs (97%)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/{Sync => }/CatchUpSyncManager.cs (98%)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/{Sync => }/ISpectatorPlayerClock.cs (93%)
 rename osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/{Sync => }/ISyncManager.cs (94%)

diff --git a/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs b/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
index 75ba362146..d4e591cf09 100644
--- a/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
+++ b/osu.Game.Tests/OnlinePlay/TestSceneCatchUpSyncManager.cs
@@ -6,7 +6,7 @@ using NUnit.Framework;
 using osu.Framework.Bindables;
 using osu.Framework.Testing;
 using osu.Framework.Timing;
-using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Tests.OnlinePlay
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
index a4856d1ee8..db431c0a82 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
@@ -17,7 +17,6 @@ using osu.Game.Online.Spectator;
 using osu.Game.Replays.Legacy;
 using osu.Game.Scoring;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate;
-using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync;
 using osu.Game.Screens.Play;
 using osu.Game.Tests.Beatmaps.IO;
 using osu.Game.Users;
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSpectatorPlayerClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/CatchUpSpectatorPlayerClock.cs
similarity index 97%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSpectatorPlayerClock.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/CatchUpSpectatorPlayerClock.cs
index e2a6b7c9ae..9e1a020eca 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSpectatorPlayerClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/CatchUpSpectatorPlayerClock.cs
@@ -7,7 +7,7 @@ using System;
 using osu.Framework.Bindables;
 using osu.Framework.Timing;
 
-namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     /// <summary>
     /// A <see cref="ISpectatorPlayerClock"/> which catches up using rate adjustment.
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/CatchUpSyncManager.cs
similarity index 98%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSyncManager.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/CatchUpSyncManager.cs
index 5912c0803b..6028bc84f7 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/CatchUpSyncManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/CatchUpSyncManager.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Timing;
 
-namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     /// <summary>
     /// A <see cref="ISyncManager"/> which synchronises de-synced player clocks through catchup.
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorPlayerClock.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/ISpectatorPlayerClock.cs
similarity index 93%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorPlayerClock.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/ISpectatorPlayerClock.cs
index 311969c92c..1a5231e602 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISpectatorPlayerClock.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/ISpectatorPlayerClock.cs
@@ -4,7 +4,7 @@
 using osu.Framework.Bindables;
 using osu.Framework.Timing;
 
-namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     /// <summary>
     /// A clock which is used by <see cref="MultiSpectatorPlayer"/>s and managed by an <see cref="ISyncManager"/>.
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/ISyncManager.cs
similarity index 94%
rename from osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISyncManager.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/ISyncManager.cs
index 1b83ea8cf3..bd698108f6 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/Sync/ISyncManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/ISyncManager.cs
@@ -3,7 +3,7 @@
 
 using osu.Framework.Timing;
 
-namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync
+namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 {
     /// <summary>
     /// Manages the synchronisation between one or more <see cref="ISpectatorPlayerClock"/>s in relation to a master clock.
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
index a17519c3aa..0fe9e01d9d 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
@@ -7,7 +7,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Scoring;
-using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync;
 using osu.Game.Screens.Play;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index ef31a5a7f0..fd2c79f8e4 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Spectator;
-using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Spectate;
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
index 89c69cc666..50b5fc2110 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
@@ -15,7 +15,6 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
-using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate.Sync;
 using osu.Game.Screens.Play;
 
 namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate

From 66ae6e58d18b8c1f5be9d73095c2ea9aac73791c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 14:01:10 +0900
Subject: [PATCH 3058/3722] Reword comment regarding LoadRequested special case
 to be easier to understand context

---
 .../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 b8347d0537..e6ce135660 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -413,7 +413,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         private void onLoadRequested()
         {
-            // If the user is spectating, the multi-spectator screen may still be the current screen.
+            // 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())
             {
                 ParentScreen.MakeCurrent();

From dc5ee31d946918c2cbb2d0727e6039544b3a38d3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 14:04:20 +0900
Subject: [PATCH 3059/3722] Use switch for screen construction

---
 .../Multiplayer/MultiplayerMatchSubScreen.cs         | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index e6ce135660..ab22d40181 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -433,10 +433,16 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         {
             Debug.Assert(client.LocalUser != null);
 
-            if (client.LocalUser.State == MultiplayerUserState.Spectating)
-                return new MultiSpectatorScreen(client.CurrentMatchPlayingUserIds.ToArray());
+            int[] userIds = client.CurrentMatchPlayingUserIds.ToArray();
 
-            return new MultiplayerPlayer(SelectedItem.Value, client.CurrentMatchPlayingUserIds.ToArray());
+            switch (client.LocalUser.State)
+            {
+                case MultiplayerUserState.Spectating:
+                    return new MultiSpectatorScreen(userIds);
+
+                default:
+                    return new MultiplayerPlayer(SelectedItem.Value, userIds);
+            }
         }
 
         protected override void Dispose(bool isDisposing)

From c065092e72f67e41d02e6d3a75637f7722c26b4d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 14:25:52 +0900
Subject: [PATCH 3060/3722] Fix weird access to userIds in
 `MultiplayerSpectatorScreen`

---
 .../Multiplayer/Spectate/MultiSpectatorScreen.cs | 16 ++++++----------
 osu.Game/Screens/Spectate/SpectatorScreen.cs     |  6 +++---
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index fd2c79f8e4..be4450787a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -27,8 +27,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         /// </summary>
         public bool AllPlayersLoaded => instances.All(p => p?.PlayerLoaded == true);
 
-        private readonly int[] userIds;
-
         [Resolved]
         private SpectatorStreamingClient spectatorClient { get; set; }
 
@@ -49,8 +47,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         public MultiSpectatorScreen(int[] userIds)
             : base(userIds.Take(PlayerGrid.MAX_PLAYERS).ToArray())
         {
-            this.userIds = GetUserIds().ToArray();
-            instances = new PlayerArea[this.userIds.Length];
+            instances = new PlayerArea[UserIds.Count];
         }
 
         [BackgroundDependencyLoader]
@@ -84,9 +81,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
                 })
             };
 
-            for (int i = 0; i < userIds.Length; i++)
+            for (int i = 0; i < UserIds.Count; i++)
             {
-                grid.Add(instances[i] = new PlayerArea(userIds[i], masterClockContainer.GameplayClock));
+                grid.Add(instances[i] = new PlayerArea(UserIds[i], masterClockContainer.GameplayClock));
                 syncManager.AddPlayerClock(instances[i].GameplayClock);
             }
 
@@ -95,7 +92,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             var scoreProcessor = Ruleset.Value.CreateInstance().CreateScoreProcessor();
             scoreProcessor.ApplyBeatmap(playableBeatmap);
 
-            LoadComponentAsync(leaderboard = new MultiSpectatorLeaderboard(scoreProcessor, userIds) { Expanded = { Value = true } }, leaderboardContainer.Add);
+            LoadComponentAsync(leaderboard = new MultiSpectatorLeaderboard(scoreProcessor, UserIds.ToArray()) { Expanded = { Value = true } }, leaderboardContainer.Add);
         }
 
         protected override void LoadComplete()
@@ -130,7 +127,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
 
         protected override void StartGameplay(int userId, GameplayState gameplayState)
         {
-            var instance = instances[getIndexForUser(userId)];
+            var instance = instances.Single(i => i.UserId == userId);
+
             instance.LoadScore(gameplayState.Score);
 
             syncManager.AddPlayerClock(instance.GameplayClock);
@@ -149,7 +147,5 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             multiplayerClient.ChangeState(MultiplayerUserState.Idle);
             return base.OnBackButton();
         }
-
-        private int getIndexForUser(int userId) => Array.IndexOf(userIds, userId);
     }
 }
diff --git a/osu.Game/Screens/Spectate/SpectatorScreen.cs b/osu.Game/Screens/Spectate/SpectatorScreen.cs
index 4aca379ebe..bcebd51954 100644
--- a/osu.Game/Screens/Spectate/SpectatorScreen.cs
+++ b/osu.Game/Screens/Spectate/SpectatorScreen.cs
@@ -7,7 +7,6 @@ using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
-using NuGet.Packaging;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
@@ -27,8 +26,9 @@ namespace osu.Game.Screens.Spectate
     /// </summary>
     public abstract class SpectatorScreen : OsuScreen
     {
-        protected IEnumerable<int> GetUserIds() => userIds;
-        private readonly HashSet<int> userIds = new HashSet<int>();
+        protected IReadOnlyList<int> UserIds => userIds;
+
+        private readonly List<int> userIds = new List<int>();
 
         [Resolved]
         private BeatmapManager beatmaps { get; set; }

From 8c9cfb63013df07e0942e07fdb10918299cc034d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 14:28:35 +0900
Subject: [PATCH 3061/3722] Remove unsafe access to Composer.HitObjects

---
 .../Edit/Compose/Components/EditorBlueprintContainer.cs    | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
index 2a605f75d8..29dfff0e96 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
@@ -34,13 +34,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [BackgroundDependencyLoader]
         private void load()
         {
-            // For non-pooled rulesets, hitobjects are already present in the playfield which allows the blueprints to be loaded in the async context.
-            if (Composer != null)
-            {
-                foreach (var obj in Composer.HitObjects)
-                    AddBlueprintFor(obj.HitObject);
-            }
-
             selectedHitObjects.BindTo(Beatmap.SelectedHitObjects);
             selectedHitObjects.CollectionChanged += (selectedObjects, args) =>
             {

From 2aa21e2affb3f9993ec42b87228236e768aa7e05 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 14:37:11 +0900
Subject: [PATCH 3062/3722] Adjust documentation in `CatchUpSyncManager`

---
 .../OnlinePlay/Multiplayer/Spectate/CatchUpSyncManager.cs    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/CatchUpSyncManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/CatchUpSyncManager.cs
index 6028bc84f7..efc12eaaa5 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/CatchUpSyncManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/CatchUpSyncManager.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
     public class CatchUpSyncManager : Component, ISyncManager
     {
         /// <summary>
-        /// The offset from the master clock to which player clocks should be synchronised to.
+        /// The offset from the master clock to which player clocks should remain within to be considered in-sync.
         /// </summary>
         public const double SYNC_TARGET = 16;
 
@@ -102,6 +102,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             for (int i = 0; i < playerClocks.Count; i++)
             {
                 var clock = playerClocks[i];
+
+                // How far this player's clock is out of sync, compared to the master clock.
+                // A negative value means the player is running fast (ahead); a positive value means the player is running behind (catching up).
                 double timeDelta = MasterClock.CurrentTime - clock.CurrentTime;
 
                 // Check that the player clock isn't too far ahead.

From b1a19b6dd6f6ea6782828fdd1cc23883bf9c947a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 14:41:55 +0900
Subject: [PATCH 3063/3722] Add xmldoc for `PlayerIsolationContainer`

---
 osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
index 50b5fc2110..fe79e5db72 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerArea.cs
@@ -110,6 +110,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         public override bool PropagatePositionalInputSubTree => false;
         public override bool PropagateNonPositionalInputSubTree => false;
 
+        /// <summary>
+        /// Isolates each player instance from the game-wide ruleset/beatmap/mods (to allow for different players having different settings).
+        /// </summary>
         private class PlayerIsolationContainer : Container
         {
             [Cached]

From 54abf8f6f685a31487579d5f5bde1db7d4d67479 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 14:48:04 +0900
Subject: [PATCH 3064/3722] Vertically centre leaderboard for now

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

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index be4450787a..8c7b7bab01 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -92,7 +92,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
             var scoreProcessor = Ruleset.Value.CreateInstance().CreateScoreProcessor();
             scoreProcessor.ApplyBeatmap(playableBeatmap);
 
-            LoadComponentAsync(leaderboard = new MultiSpectatorLeaderboard(scoreProcessor, UserIds.ToArray()) { Expanded = { Value = true } }, leaderboardContainer.Add);
+            LoadComponentAsync(leaderboard = new MultiSpectatorLeaderboard(scoreProcessor, UserIds.ToArray())
+            {
+                Expanded = { Value = true },
+                Anchor = Anchor.CentreLeft,
+                Origin = Anchor.CentreLeft,
+            }, leaderboardContainer.Add);
         }
 
         protected override void LoadComplete()

From f3b305bbe62f4501579cd36ca6e77c188fb344ab Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 14:58:23 +0900
Subject: [PATCH 3065/3722] Rename and improve xmldoc of `SkinEditorOverlay`

---
 osu.Game/OsuGame.cs                                        | 4 ++--
 .../{SkinEditorContainer.cs => SkinEditorOverlay.cs}       | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)
 rename osu.Game/Skinning/Editor/{SkinEditorContainer.cs => SkinEditorOverlay.cs} (91%)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 77fb9c3b63..d031a8e7fa 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -688,7 +688,7 @@ namespace osu.Game
             var changelogOverlay = loadComponentSingleFile(new ChangelogOverlay(), overlayContent.Add, true);
             loadComponentSingleFile(userProfile = new UserProfileOverlay(), overlayContent.Add, true);
             loadComponentSingleFile(beatmapSetOverlay = new BeatmapSetOverlay(), overlayContent.Add, true);
-            loadComponentSingleFile(skinEditor = new SkinEditorContainer(screenContainer), overlayContent.Add);
+            loadComponentSingleFile(skinEditor = new SkinEditorOverlay(screenContainer), overlayContent.Add);
 
             loadComponentSingleFile(new LoginOverlay
             {
@@ -946,7 +946,7 @@ namespace osu.Game
 
         private ScalingContainer screenContainer;
 
-        private SkinEditorContainer skinEditor;
+        private SkinEditorOverlay skinEditor;
 
         protected override bool OnExiting()
         {
diff --git a/osu.Game/Skinning/Editor/SkinEditorContainer.cs b/osu.Game/Skinning/Editor/SkinEditorOverlay.cs
similarity index 91%
rename from osu.Game/Skinning/Editor/SkinEditorContainer.cs
rename to osu.Game/Skinning/Editor/SkinEditorOverlay.cs
index adb1abefd1..06c6dffb60 100644
--- a/osu.Game/Skinning/Editor/SkinEditorContainer.cs
+++ b/osu.Game/Skinning/Editor/SkinEditorOverlay.cs
@@ -13,9 +13,10 @@ using osu.Game.Input.Bindings;
 namespace osu.Game.Skinning.Editor
 {
     /// <summary>
-    /// A container which handles loading a skin editor on user request.
+    /// A container which handles loading a skin editor on user request for a specified target.
+    /// This also handles the scaling / positioning adjustment of the target.
     /// </summary>
-    public class SkinEditorContainer : CompositeDrawable, IKeyBindingHandler<GlobalAction>
+    public class SkinEditorOverlay : CompositeDrawable, IKeyBindingHandler<GlobalAction>
     {
         private readonly ScalingContainer target;
         private SkinEditor skinEditor;
@@ -25,7 +26,7 @@ namespace osu.Game.Skinning.Editor
         [Resolved]
         private OsuColour colours { get; set; }
 
-        public SkinEditorContainer(ScalingContainer target)
+        public SkinEditorOverlay(ScalingContainer target)
         {
             this.target = target;
             RelativeSizeAxes = Axes.Both;

From 3dd4b7b746ab72532ec0e5db0777edcce99afc6f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 15:08:34 +0900
Subject: [PATCH 3066/3722] Fix use of non-existent word in
 `OsuFocusedOverlayContainer` xmldoc

---
 osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
index e168f265dd..c0518247a9 100644
--- a/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
+++ b/osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Graphics.Containers
         protected override bool BlockNonPositionalInput => true;
 
         /// <summary>
-        /// Temporary to allow for overlays in the main screen content to not dim theirselves.
+        /// Temporary to allow for overlays in the main screen content to not dim themselves.
         /// Should be eventually replaced by dimming which is aware of the target dim container (traverse parent for certain interface type?).
         /// </summary>
         protected virtual bool DimMainContent => true;

From 01984de9c7ce603e063f914942775d55fe8793e5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 15:13:32 +0900
Subject: [PATCH 3067/3722] Use existing `GetStateFromSelection` helper
 function

---
 .../Compose/Components/EditorSelectionHandler.cs   | 11 -----------
 .../Edit/Compose/Components/SelectionHandler.cs    | 11 +++++++++++
 osu.Game/Skinning/Editor/SkinSelectionHandler.cs   | 14 +-------------
 3 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
index 0fc305dcc4..6ab4ca8267 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
@@ -108,17 +108,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
         }
 
-        /// <summary>
-        /// Given a selection target and a function of truth, retrieve the correct ternary state for display.
-        /// </summary>
-        protected TernaryState GetStateFromSelection<T>(IEnumerable<T> selection, Func<T, bool> func)
-        {
-            if (selection.Any(func))
-                return selection.All(func) ? TernaryState.True : TernaryState.Indeterminate;
-
-            return TernaryState.False;
-        }
-
         #endregion
 
         #region Ternary state changes
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index cb3424a250..c0dbc5e7db 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -268,6 +268,17 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 DeleteSelected();
         }
 
+        /// <summary>
+        /// Given a selection target and a function of truth, retrieve the correct ternary state for display.
+        /// </summary>
+        protected static TernaryState GetStateFromSelection<TObject>(IEnumerable<TObject> selection, Func<TObject, bool> func)
+        {
+            if (selection.Any(func))
+                return selection.All(func) ? TernaryState.True : TernaryState.Indeterminate;
+
+            return TernaryState.False;
+        }
+
         /// <summary>
         /// Called whenever the deletion of items has been requested.
         /// </summary>
diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 0408ce74a6..044ad88333 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -53,21 +53,9 @@ namespace osu.Game.Skinning.Editor
 
                 return displayableAnchors.Select(a =>
                 {
-                    var countExisting = selection.Count(b => ((Drawable)b.Item).Anchor == a);
-                    var countTotal = selection.Count();
-
-                    TernaryState state;
-
-                    if (countExisting == countTotal)
-                        state = TernaryState.True;
-                    else if (countExisting > 0)
-                        state = TernaryState.Indeterminate;
-                    else
-                        state = TernaryState.False;
-
                     return new AnchorMenuItem(a, selection, _ => applyAnchor(a))
                     {
-                        State = { Value = state }
+                        State = { Value = GetStateFromSelection(selection, c => ((Drawable)c.Item).Anchor == a) }
                     };
                 });
             }

From a2faa0b74c5c10b89d5f06ded55abe6d68c9bfbc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 15:13:53 +0900
Subject: [PATCH 3068/3722] Remove dead code

---
 osu.Game/Skinning/Editor/SkinSelectionHandler.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 044ad88333..8792daef19 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -125,11 +125,6 @@ namespace osu.Game.Skinning.Editor
             {
             }
 
-            private void updateState(TernaryState obj)
-            {
-                throw new NotImplementedException();
-            }
-
             private static TernaryState getNextState(TernaryState state) => TernaryState.True;
         }
     }

From 51f4077b2714b61db68db48706546c86a1125238 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 15:15:00 +0900
Subject: [PATCH 3069/3722] Reorder methods in `SkinSelectionHandler` to follow
 standards

---
 .../Skinning/Editor/SkinSelectionHandler.cs   | 80 +++++++++----------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 8792daef19..c7c0f45cc0 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -17,6 +17,46 @@ namespace osu.Game.Skinning.Editor
 {
     public class SkinSelectionHandler : SelectionHandler<ISkinnableComponent>
     {
+        public override bool HandleRotation(float angle)
+        {
+            // TODO: this doesn't correctly account for origin/anchor specs being different in a multi-selection.
+            foreach (var c in SelectedBlueprints)
+                ((Drawable)c.Item).Rotation += angle;
+
+            return base.HandleRotation(angle);
+        }
+
+        public override bool HandleScale(Vector2 scale, Anchor anchor)
+        {
+            adjustScaleFromAnchor(ref scale, anchor);
+
+            foreach (var c in SelectedBlueprints)
+                ((Drawable)c.Item).Scale += scale * 0.01f;
+
+            return true;
+        }
+
+        public override bool HandleMovement(MoveSelectionEvent<ISkinnableComponent> moveEvent)
+        {
+            foreach (var c in SelectedBlueprints)
+            {
+                Drawable drawable = (Drawable)c.Item;
+                drawable.Position += drawable.ScreenSpaceDeltaToParentSpace(moveEvent.ScreenSpaceDelta);
+            }
+
+            return true;
+        }
+
+        protected override void OnSelectionChanged()
+        {
+            base.OnSelectionChanged();
+
+            SelectionBox.CanRotate = true;
+            SelectionBox.CanScaleX = true;
+            SelectionBox.CanScaleY = true;
+            SelectionBox.CanReverse = false;
+        }
+
         protected override void DeleteItems(IEnumerable<ISkinnableComponent> items)
         {
             foreach (var i in items)
@@ -67,46 +107,6 @@ namespace osu.Game.Skinning.Editor
                 ((Drawable)item).Anchor = anchor;
         }
 
-        protected override void OnSelectionChanged()
-        {
-            base.OnSelectionChanged();
-
-            SelectionBox.CanRotate = true;
-            SelectionBox.CanScaleX = true;
-            SelectionBox.CanScaleY = true;
-            SelectionBox.CanReverse = false;
-        }
-
-        public override bool HandleRotation(float angle)
-        {
-            // TODO: this doesn't correctly account for origin/anchor specs being different in a multi-selection.
-            foreach (var c in SelectedBlueprints)
-                ((Drawable)c.Item).Rotation += angle;
-
-            return base.HandleRotation(angle);
-        }
-
-        public override bool HandleScale(Vector2 scale, Anchor anchor)
-        {
-            adjustScaleFromAnchor(ref scale, anchor);
-
-            foreach (var c in SelectedBlueprints)
-                ((Drawable)c.Item).Scale += scale * 0.01f;
-
-            return true;
-        }
-
-        public override bool HandleMovement(MoveSelectionEvent<ISkinnableComponent> moveEvent)
-        {
-            foreach (var c in SelectedBlueprints)
-            {
-                Drawable drawable = (Drawable)c.Item;
-                drawable.Position += drawable.ScreenSpaceDeltaToParentSpace(moveEvent.ScreenSpaceDelta);
-            }
-
-            return true;
-        }
-
         private static void adjustScaleFromAnchor(ref Vector2 scale, Anchor reference)
         {
             // cancel out scale in axes we don't care about (based on which drag handle was used).

From f36684a070308f6068a709b68dba2d67906bb632 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 15:17:01 +0900
Subject: [PATCH 3070/3722] Guard against non-threadsafe transformation logic
 in `ScalingContainer`-

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

diff --git a/osu.Game/Graphics/Containers/ScalingContainer.cs b/osu.Game/Graphics/Containers/ScalingContainer.cs
index b691e372c5..2488fd14d0 100644
--- a/osu.Game/Graphics/Containers/ScalingContainer.cs
+++ b/osu.Game/Graphics/Containers/ScalingContainer.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Graphics.Containers
                     return;
 
                 allowScaling = value;
-                updateSize();
+                if (IsLoaded) updateSize();
             }
         }
 

From df8609b3dc6307a7d9e91b5f6a2df13a2b5d824d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 15:15:50 +0900
Subject: [PATCH 3071/3722] Move private field for skin editor overlay to where
 others exist

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

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index d031a8e7fa..b1173784b5 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -80,6 +80,8 @@ namespace osu.Game
 
         private BeatmapSetOverlay beatmapSetOverlay;
 
+        private SkinEditorOverlay skinEditor;
+
         [Cached]
         private readonly DifficultyRecommender difficultyRecommender = new DifficultyRecommender();
 
@@ -946,8 +948,6 @@ namespace osu.Game
 
         private ScalingContainer screenContainer;
 
-        private SkinEditorOverlay skinEditor;
-
         protected override bool OnExiting()
         {
             if (ScreenStack.CurrentScreen is Loader)

From a298a930701b337248823aa901364786c4ef19d7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 15:18:18 +0900
Subject: [PATCH 3072/3722] Remove redundant storage of blueprint's related
 item

---
 osu.Game/Skinning/Editor/SkinBlueprint.cs | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinBlueprint.cs b/osu.Game/Skinning/Editor/SkinBlueprint.cs
index 491a403325..11409c46ab 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprint.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprint.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Screens.Play.HUD;
 using osuTK;
 
@@ -17,26 +16,20 @@ namespace osu.Game.Skinning.Editor
 {
     public class SkinBlueprint : SelectionBlueprint<ISkinnableComponent>
     {
-        /// <summary>
-        /// The <see cref="DrawableHitObject"/> which this <see cref="OverlaySelectionBlueprint"/> applies to.
-        /// </summary>
-        public readonly ISkinnableComponent Component;
-
         private Container box;
 
-        private Drawable drawable => (Drawable)Component;
+        private Drawable drawable => (Drawable)Item;
 
         /// <summary>
-        /// Whether the blueprint should be shown even when the <see cref="Component"/> is not alive.
+        /// Whether the blueprint should be shown even when the <see cref="SelectionBlueprint{T}.Item"/> is not alive.
         /// </summary>
         protected virtual bool AlwaysShowWhenSelected => false;
 
-        protected override bool ShouldBeAlive => (drawable.IsAlive && Component.IsPresent) || (AlwaysShowWhenSelected && State == SelectionState.Selected);
+        protected override bool ShouldBeAlive => (drawable.IsAlive && Item.IsPresent) || (AlwaysShowWhenSelected && State == SelectionState.Selected);
 
         public SkinBlueprint(ISkinnableComponent component)
             : base(component)
         {
-            Component = component;
         }
 
         [BackgroundDependencyLoader]

From 7d8be8cd836dda2a401f4de40d70a680f7e6e958 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 15:20:00 +0900
Subject: [PATCH 3073/3722] Add comment about why we are running
 `checkForComponents` on a timer

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

diff --git a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
index f2bc8ecddf..d9bfefe5f2 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Skinning.Editor
         {
             foreach (var c in target.ChildrenOfType<ISkinnableComponent>().ToArray()) AddBlueprintFor(c);
 
+            // We'd hope to eventually be running this in a more sensible way, but this handles situations where new drawables become present (ie. during ongoing gameplay)
+            // or when drawables in the target are loaded asynchronously and may not be immediately available when this BlueprintContainer is loaded.
             Scheduler.AddDelayed(checkForComponents, 1000);
         }
 

From 15603de6e946c4570cb3c9befc68114e162a0c11 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 15:24:51 +0900
Subject: [PATCH 3074/3722] Change scale multiplier to be closer to
 expectations

---
 osu.Game/Skinning/Editor/SkinSelectionHandler.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index c7c0f45cc0..d09ba8af0e 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -31,7 +31,8 @@ namespace osu.Game.Skinning.Editor
             adjustScaleFromAnchor(ref scale, anchor);
 
             foreach (var c in SelectedBlueprints)
-                ((Drawable)c.Item).Scale += scale * 0.01f;
+                // TODO: this is temporary and will be fixed with a separate refactor of selection transform logic.
+                ((Drawable)c.Item).Scale += scale * 0.02f;
 
             return true;
         }

From 4cfa858dc4cd02cbf438ea9863d57a1c26568c63 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 15:37:15 +0900
Subject: [PATCH 3075/3722] Fix tooltips displaying for hidden
 `SelectionHandler` content

---
 osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index c0dbc5e7db..053e532137 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -57,7 +57,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             RelativeSizeAxes = Axes.Both;
             AlwaysPresent = true;
-            Alpha = 0;
         }
 
         [BackgroundDependencyLoader]
@@ -318,7 +317,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             selectionDetailsText.Text = count > 0 ? count.ToString() : string.Empty;
 
-            this.FadeTo(count > 0 ? 1 : 0);
+            content.FadeTo(count > 0 ? 1 : 0);
             OnSelectionChanged();
         }
 

From 839ac968a9623bbabaabf3ea1d5087ef78f0ad7f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 15:37:15 +0900
Subject: [PATCH 3076/3722] Fix tooltips displaying for hidden
 `SelectionHandler` content

---
 osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 917cbca4e1..f207e27a5e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -58,7 +58,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             RelativeSizeAxes = Axes.Both;
             AlwaysPresent = true;
-            Alpha = 0;
         }
 
         [BackgroundDependencyLoader]
@@ -308,7 +307,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             selectionDetailsText.Text = count > 0 ? count.ToString() : string.Empty;
 
-            this.FadeTo(count > 0 ? 1 : 0);
+            content.FadeTo(count > 0 ? 1 : 0);
             OnSelectionChanged();
         }
 

From 3268a75f05afc1515b3feb874a4aa72bfb1d0173 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 17:34:34 +0900
Subject: [PATCH 3077/3722] Remove intermediate container to fix tests

---
 .../Editing/TestSceneEditorClipboard.cs       |  4 +-
 .../Edit/Compose/Components/SelectionBox.cs   | 48 ++++++++++++++++---
 .../Compose/Components/SelectionHandler.cs    | 42 ++--------------
 3 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs
index 3a063af843..3aff74a0a8 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorClipboard.cs
@@ -132,8 +132,8 @@ namespace osu.Game.Tests.Visual.Editing
             {
                 AddStep("deselect", () => EditorBeatmap.SelectedHitObjects.Clear());
 
-                AddUntilStep("timeline selection box is not visible", () => Editor.ChildrenOfType<Timeline>().First().ChildrenOfType<EditorSelectionHandler>().First().Alpha == 0);
-                AddUntilStep("composer selection box is not visible", () => Editor.ChildrenOfType<HitObjectComposer>().First().ChildrenOfType<EditorSelectionHandler>().First().Alpha == 0);
+                AddUntilStep("timeline selection box is not visible", () => Editor.ChildrenOfType<Timeline>().First().ChildrenOfType<SelectionBox>().First().Alpha == 0);
+                AddUntilStep("composer selection box is not visible", () => Editor.ChildrenOfType<HitObjectComposer>().First().ChildrenOfType<SelectionBox>().First().Alpha == 0);
             }
 
             AddStep("paste hitobject", () => Editor.Paste());
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
index 9d6b44e207..0d6cfc0689 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
 using osuTK;
 using osuTK.Input;
 
@@ -16,6 +17,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 {
     public class SelectionBox : CompositeDrawable
     {
+        public const float BORDER_RADIUS = 3;
+
         public Func<float, bool> OnRotation;
         public Func<Vector2, Anchor, bool> OnScale;
         public Func<Direction, bool> OnFlip;
@@ -92,21 +95,32 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
         }
 
+        private string text;
+
+        public string Text
+        {
+            get => text;
+            set
+            {
+                if (value == text)
+                    return;
+
+                text = value;
+                if (selectionDetailsText != null)
+                    selectionDetailsText.Text = value;
+            }
+        }
+
         private Container dragHandles;
         private FillFlowContainer buttons;
 
-        public const float BORDER_RADIUS = 3;
+        private OsuSpriteText selectionDetailsText;
 
         [Resolved]
         private OsuColour colours { get; set; }
 
         [BackgroundDependencyLoader]
-        private void load()
-        {
-            RelativeSizeAxes = Axes.Both;
-
-            recreate();
-        }
+        private void load() => recreate();
 
         protected override bool OnKeyDown(KeyDownEvent e)
         {
@@ -144,6 +158,26 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             InternalChildren = new Drawable[]
             {
+                new Container
+                {
+                    Name = "info text",
+                    AutoSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            Colour = colours.YellowDark,
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        selectionDetailsText = new OsuSpriteText
+                        {
+                            Padding = new MarginPadding(2),
+                            Colour = colours.Gray0,
+                            Font = OsuFont.Default.With(size: 11),
+                            Text = text,
+                        }
+                    }
+                },
                 new Container
                 {
                     Masking = true,
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index f207e27a5e..ce0a72a012 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -10,13 +10,11 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Primitives;
-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.Game.Graphics;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osuTK;
@@ -43,10 +41,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private readonly List<SelectionBlueprint<T>> selectedBlueprints;
 
-        private Drawable content;
-
-        private OsuSpriteText selectionDetailsText;
-
         protected SelectionBox SelectionBox { get; private set; }
 
         [Resolved(CanBeNull = true)]
@@ -63,33 +57,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            InternalChild = content = new Container
-            {
-                Children = new Drawable[]
-                {
-                    // todo: should maybe be inside the SelectionBox?
-                    new Container
-                    {
-                        Name = "info text",
-                        AutoSizeAxes = Axes.Both,
-                        Children = new Drawable[]
-                        {
-                            new Box
-                            {
-                                Colour = colours.YellowDark,
-                                RelativeSizeAxes = Axes.Both,
-                            },
-                            selectionDetailsText = new OsuSpriteText
-                            {
-                                Padding = new MarginPadding(2),
-                                Colour = colours.Gray0,
-                                Font = OsuFont.Default.With(size: 11)
-                            }
-                        }
-                    },
-                    SelectionBox = CreateSelectionBox(),
-                }
-            };
+            InternalChild = SelectionBox = CreateSelectionBox();
 
             SelectedItems.CollectionChanged += (sender, args) =>
             {
@@ -305,9 +273,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             int count = SelectedItems.Count;
 
-            selectionDetailsText.Text = count > 0 ? count.ToString() : string.Empty;
+            SelectionBox.Text = count > 0 ? count.ToString() : string.Empty;
 
-            content.FadeTo(count > 0 ? 1 : 0);
+            SelectionBox.FadeTo(count > 0 ? 1 : 0);
             OnSelectionChanged();
         }
 
@@ -334,8 +302,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             selectionRect = selectionRect.Inflate(5f);
 
-            content.Position = selectionRect.Location;
-            content.Size = selectionRect.Size;
+            SelectionBox.Position = selectionRect.Location;
+            SelectionBox.Size = selectionRect.Size;
         }
 
         #endregion

From 625890381f306823600468a8e590241ab88694d6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 16:47:47 +0900
Subject: [PATCH 3078/3722] Update `ComboCounter` components to use DI to
 attach data source

---
 .../Visual/Gameplay/TestSceneComboCounter.cs  | 24 +++++++------------
 .../Visual/Gameplay/TestSceneHUDOverlay.cs    | 12 ++++++----
 .../Gameplay/TestSceneSkinnableHUDOverlay.cs  | 20 ++++++----------
 .../Screens/Play/HUD/DefaultComboCounter.cs   |  7 +++++-
 .../Screens/Play/HUD/LegacyComboCounter.cs    |  6 +++--
 .../Screens/Play/HUD/SkinnableComboCounter.cs | 15 +-----------
 osu.Game/Screens/Play/HUDOverlay.cs           | 12 ++++------
 osu.Game/Screens/Play/Player.cs               |  2 ++
 8 files changed, 41 insertions(+), 57 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneComboCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneComboCounter.cs
index d0c2fb5064..b0a0b5189f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneComboCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneComboCounter.cs
@@ -4,9 +4,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -17,31 +19,21 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
 
+        [Cached]
+        private ScoreProcessor scoreProcessor = new ScoreProcessor();
+
         [SetUpSteps]
         public void SetUpSteps()
         {
-            AddStep("Create combo counters", () => SetContents(() =>
-            {
-                var comboCounter = new SkinnableComboCounter();
-                comboCounter.Current.Value = 1;
-                return comboCounter;
-            }));
+            AddStep("Create combo counters", () => SetContents(() => new SkinnableComboCounter()));
         }
 
         [Test]
         public void TestComboCounterIncrementing()
         {
-            AddRepeatStep("increase combo", () =>
-            {
-                foreach (var counter in comboCounters)
-                    counter.Current.Value++;
-            }, 10);
+            AddRepeatStep("increase combo", () => scoreProcessor.Combo.Value++, 10);
 
-            AddStep("reset combo", () =>
-            {
-                foreach (var counter in comboCounters)
-                    counter.Current.Value = 0;
-            });
+            AddStep("reset combo", () => scoreProcessor.Combo.Value = 0);
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index 3cefb8623f..55c681b605 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play;
 using osuTK.Input;
 
@@ -19,6 +20,9 @@ namespace osu.Game.Tests.Visual.Gameplay
     {
         private HUDOverlay hudOverlay;
 
+        [Cached]
+        private ScoreProcessor scoreProcessor = new ScoreProcessor();
+
         // best way to check without exposing.
         private Drawable hideTarget => hudOverlay.KeyCounter;
         private FillFlowContainer<KeyCounter> keyCounterFlow => hudOverlay.KeyCounter.ChildrenOfType<FillFlowContainer<KeyCounter>>().First();
@@ -31,9 +35,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             createNew();
 
-            AddRepeatStep("increase combo", () => { hudOverlay.ComboCounter.Current.Value++; }, 10);
+            AddRepeatStep("increase combo", () => { scoreProcessor.Combo.Value++; }, 10);
 
-            AddStep("reset combo", () => { hudOverlay.ComboCounter.Current.Value = 0; });
+            AddStep("reset combo", () => { scoreProcessor.Combo.Value = 0; });
         }
 
         [Test]
@@ -139,12 +143,12 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("create overlay", () =>
             {
-                hudOverlay = new HUDOverlay(null, null, null, Array.Empty<Mod>());
+                hudOverlay = new HUDOverlay(scoreProcessor, null, null, Array.Empty<Mod>());
 
                 // Add any key just to display the key counter visually.
                 hudOverlay.KeyCounter.Add(new KeyCounterKeyboard(Key.Space));
 
-                hudOverlay.ComboCounter.Current.Value = 1;
+                scoreProcessor.Combo.Value = 1;
 
                 action?.Invoke(hudOverlay);
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
index fec1610160..8131c77b4b 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
@@ -14,6 +14,7 @@ using osu.Game.Configuration;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play;
 using osuTK.Input;
 
@@ -23,6 +24,9 @@ namespace osu.Game.Tests.Visual.Gameplay
     {
         private HUDOverlay hudOverlay;
 
+        [Cached]
+        private ScoreProcessor scoreProcessor = new ScoreProcessor();
+
         private IEnumerable<HUDOverlay> hudOverlays => CreatedDrawables.OfType<HUDOverlay>();
 
         // best way to check without exposing.
@@ -37,17 +41,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             createNew();
 
-            AddRepeatStep("increase combo", () =>
-            {
-                foreach (var hud in hudOverlays)
-                    hud.ComboCounter.Current.Value++;
-            }, 10);
+            AddRepeatStep("increase combo", () => scoreProcessor.Combo.Value++, 10);
 
-            AddStep("reset combo", () =>
-            {
-                foreach (var hud in hudOverlays)
-                    hud.ComboCounter.Current.Value = 0;
-            });
+            AddStep("reset combo", () => scoreProcessor.Combo.Value = 0);
         }
 
         [Test]
@@ -80,13 +76,11 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 SetContents(() =>
                 {
-                    hudOverlay = new HUDOverlay(null, null, null, Array.Empty<Mod>());
+                    hudOverlay = new HUDOverlay(scoreProcessor, null, null, Array.Empty<Mod>());
 
                     // Add any key just to display the key counter visually.
                     hudOverlay.KeyCounter.Add(new KeyCounterKeyboard(Key.Space));
 
-                    hudOverlay.ComboCounter.Current.Value = 1;
-
                     action?.Invoke(hudOverlay);
 
                     return hudOverlay;
diff --git a/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs b/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
index 63e7a88550..d0c26afe5e 100644
--- a/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets.Scoring;
 using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
@@ -24,7 +25,11 @@ namespace osu.Game.Screens.Play.HUD
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours) => Colour = colours.BlueLighter;
+        private void load(OsuColour colours, ScoreProcessor scoreProcessor)
+        {
+            Colour = colours.BlueLighter;
+            Current.BindTo(scoreProcessor.Combo);
+        }
 
         protected override void Update()
         {
diff --git a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
index b4604c0d01..58a30aea94 100644
--- a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/LegacyComboCounter.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.Rulesets.Scoring;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -79,7 +80,7 @@ namespace osu.Game.Screens.Play.HUD
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(ScoreProcessor scoreProcessor)
         {
             InternalChildren = new[]
             {
@@ -95,7 +96,8 @@ namespace osu.Game.Screens.Play.HUD
                 },
             };
 
-            Current.ValueChanged += combo => updateCount(combo.NewValue == 0);
+            Current.BindTo(scoreProcessor.Combo);
+            Current.BindValueChanged(combo => updateCount(combo.NewValue == 0), true);
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
index c04c50141a..c62f1460c9 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
@@ -1,29 +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.Bindables;
 using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class SkinnableComboCounter : SkinnableDrawable, IComboCounter
+    public class SkinnableComboCounter : SkinnableDrawable
     {
-        public Bindable<int> Current { get; } = new Bindable<int>();
-
         public SkinnableComboCounter()
             : base(new HUDSkinComponent(HUDSkinComponents.ComboCounter), skinComponent => new DefaultComboCounter())
         {
             CentreComponent = false;
         }
-
-        private IComboCounter skinnedCounter;
-
-        protected override void SkinChanged(ISkinSource skin, bool allowFallback)
-        {
-            base.SkinChanged(skin, allowFallback);
-
-            skinnedCounter = Drawable as IComboCounter;
-            skinnedCounter?.Current.BindTo(Current);
-        }
     }
 }
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 669c920017..83897c5167 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -34,7 +34,6 @@ namespace osu.Game.Screens.Play
         public float TopScoringElementsHeight { get; private set; }
 
         public readonly KeyCounterDisplay KeyCounter;
-        public readonly SkinnableComboCounter ComboCounter;
         public readonly SkinnableScoreCounter ScoreCounter;
         public readonly SkinnableAccuracyCounter AccuracyCounter;
         public readonly SkinnableHealthDisplay HealthDisplay;
@@ -106,7 +105,7 @@ namespace osu.Game.Screens.Play
                                         HealthDisplay = CreateHealthDisplay(),
                                         AccuracyCounter = CreateAccuracyCounter(),
                                         ScoreCounter = CreateScoreCounter(),
-                                        ComboCounter = CreateComboCounter(),
+                                        CreateComboCounter(),
                                         HitErrorDisplay = CreateHitErrorDisplayOverlay(),
                                     }
                                 },
@@ -276,13 +275,13 @@ namespace osu.Game.Screens.Play
             Progress.BindDrawableRuleset(drawableRuleset);
         }
 
-        protected virtual SkinnableAccuracyCounter CreateAccuracyCounter() => new SkinnableAccuracyCounter();
+        protected SkinnableAccuracyCounter CreateAccuracyCounter() => new SkinnableAccuracyCounter();
 
-        protected virtual SkinnableScoreCounter CreateScoreCounter() => new SkinnableScoreCounter();
+        protected SkinnableScoreCounter CreateScoreCounter() => new SkinnableScoreCounter();
 
-        protected virtual SkinnableComboCounter CreateComboCounter() => new SkinnableComboCounter();
+        protected SkinnableComboCounter CreateComboCounter() => new SkinnableComboCounter();
 
-        protected virtual SkinnableHealthDisplay CreateHealthDisplay() => new SkinnableHealthDisplay();
+        protected SkinnableHealthDisplay CreateHealthDisplay() => new SkinnableHealthDisplay();
 
         protected virtual FailingLayer CreateFailingLayer() => new FailingLayer
         {
@@ -323,7 +322,6 @@ namespace osu.Game.Screens.Play
         {
             ScoreCounter?.Current.BindTo(processor.TotalScore);
             AccuracyCounter?.Current.BindTo(processor.Accuracy);
-            ComboCounter?.Current.BindTo(processor.Combo);
 
             if (HealthDisplay is IHealthDisplay shd)
             {
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 27a4fcc291..c9d7bbf4c1 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -202,6 +202,8 @@ namespace osu.Game.Screens.Play
             ScoreProcessor.ApplyBeatmap(playableBeatmap);
             ScoreProcessor.Mods.BindTo(Mods);
 
+            dependencies.CacheAs(ScoreProcessor);
+
             HealthProcessor = ruleset.CreateHealthProcessor(playableBeatmap.HitObjects[0].StartTime);
             HealthProcessor.ApplyBeatmap(playableBeatmap);
 

From 840c22a3b17bd01dea5b79c4a6bdd0e124b04241 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 3 May 2021 12:16:40 +0300
Subject: [PATCH 3079/3722] Add back mis-removed fade transform

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

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
index 151c169a33..7db2cdbbf5 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (activeHandle?.InOperation == true || activeHandle?.IsHovered == true)
                 return;
 
-            displayedRotationHandle?.Hide();
+            displayedRotationHandle?.FadeOut(SelectionBoxControl.TRANSFORM_DURATION, Easing.OutQuint);
             displayedRotationHandle = null;
 
             activeHandle = allDragHandles.SingleOrDefault(h => h.InOperation);
@@ -84,7 +84,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (activeHandle != null)
             {
                 displayedRotationHandle = getCorrespondingRotationHandle(activeHandle, rotationHandles);
-                displayedRotationHandle?.Show();
+                displayedRotationHandle?.FadeIn(SelectionBoxControl.TRANSFORM_DURATION, Easing.OutQuint);
             }
         }
 

From b28e1569caad7b6a1781dc32129f57a9d74cc92c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 20:09:48 +0900
Subject: [PATCH 3080/3722] Remove no-longer-relevant matching comment

---
 .../Screens/Edit/Compose/Components/EditorBlueprintContainer.cs  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
index 29dfff0e96..db322faf65 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
@@ -62,7 +62,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             if (Composer != null)
             {
-                // For pooled rulesets, blueprints must be added for hitobjects already "current" as they would've not been "current" during the async load addition process above.
                 foreach (var obj in Composer.HitObjects)
                     AddBlueprintFor(obj.HitObject);
 

From ca4b860920c2bd7f1efe518e65347904ab8fd7a8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 May 2021 20:11:24 +0900
Subject: [PATCH 3081/3722] Move `BindValueChanged` call to `LoadComplete`

---
 osu.Game/Screens/Play/HUD/LegacyComboCounter.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
index 58a30aea94..0bccbd0338 100644
--- a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
@@ -97,7 +97,6 @@ namespace osu.Game.Screens.Play.HUD
             };
 
             Current.BindTo(scoreProcessor.Combo);
-            Current.BindValueChanged(combo => updateCount(combo.NewValue == 0), true);
         }
 
         protected override void LoadComplete()
@@ -111,7 +110,7 @@ namespace osu.Game.Screens.Play.HUD
             popOutCount.Origin = Origin;
             popOutCount.Anchor = Anchor;
 
-            updateCount(false);
+            Current.BindValueChanged(combo => updateCount(combo.NewValue == 0), true);
         }
 
         private void updateCount(bool rolling)

From b9220d4dc728f681a16d6d4e664d4ae26a133951 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 3 May 2021 15:57:57 +0200
Subject: [PATCH 3082/3722] Fix possible multiple enumeration

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

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
index ecb076d356..c928c0103f 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
@@ -57,11 +57,13 @@ namespace osu.Game.Tests.Visual.UserInterface
                     }
                 };
 
-                var coverTypes = Enum.GetValues(typeof(BeatmapSetCoverType)).Cast<BeatmapSetCoverType>();
+                var coverTypes = Enum.GetValues(typeof(BeatmapSetCoverType))
+                                     .Cast<BeatmapSetCoverType>()
+                                     .ToList();
 
                 for (int i = 0; i < 25; i++)
                 {
-                    var coverType = coverTypes.ElementAt(i % coverTypes.Count());
+                    var coverType = coverTypes[i % coverTypes.Count];
 
                     var cover = new UpdateableBeatmapSetCover(coverType)
                     {

From 356b1e9a2dd3492039fd7f0bd1e1112856ca2e55 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Tue, 4 May 2021 05:43:59 +0700
Subject: [PATCH 3083/3722] add emphases test

---
 .../UserInterface/TestSceneOsuMarkdownContainer.cs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
index d64c243005..9fb14efe4d 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
@@ -41,6 +41,20 @@ namespace osu.Game.Tests.Visual.UserInterface
             };
         });
 
+        [Test]
+        public void TestEmphases()
+        {
+            AddStep("Emphases", () =>
+            {
+                markdownContainer.Text = @"_italic with underscore_
+*italic with asterisk*
+__bold with underscore__
+**bold with asterisk**
+*__italic with asterisk, bold with underscore__*
+_**italic with underscore, bold with asterisk**_";
+            });
+        }
+
         [Test]
         public void TestHeading()
         {

From bfc328c5ab94eda41bfb5b81e84c66ca975373c0 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Tue, 4 May 2021 09:09:51 +0700
Subject: [PATCH 3084/3722] change font weight for bold text

---
 .../Containers/Markdown/OsuMarkdownTextFlowContainer.cs    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs
index 5165fe74a2..517143c2db 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs
@@ -26,5 +26,12 @@ namespace osu.Game.Graphics.Containers.Markdown
         // TODO : Add background (colour B6) and change font to monospace
         protected override void AddCodeInLine(CodeInline codeInline)
             => AddText(codeInline.Content, t => { t.Colour = colourProvider.Light1; });
+
+        protected override SpriteText CreateEmphasisedSpriteText(bool bold, bool italic)
+        {
+            var spriteText = CreateSpriteText();
+            spriteText.Font = spriteText.Font.With(weight: bold ? FontWeight.Bold : FontWeight.Regular, italics: italic);
+            return spriteText;
+        }
     }
 }

From 63381ff4f2a62335e851f266f84f8f422ec68e01 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Tue, 4 May 2021 09:34:21 +0700
Subject: [PATCH 3085/3722] change heading font weight

h1 and h2 : Semi Bold (600)
- https://github.com/ppy/osu-web/blob/376cac43a051b9c85ce95e2c446099be187b3e45/resources/assets/less/bem/osu-md.less#L111
- https://github.com/ppy/osu-web/blob/376cac43a051b9c85ce95e2c446099be187b3e45/resources/assets/less/bem/osu-md.less#L135

The rest of heading : Bold (700)
- https://github.com/ppy/osu-web/blob/376cac43a051b9c85ce95e2c446099be187b3e45/resources/assets/less/bem/osu-md.less#L97
---
 .../Containers/Markdown/OsuMarkdownHeading.cs | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs
index e7aa2b2512..f71c6753f4 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs
@@ -3,16 +3,25 @@
 
 using Markdig.Syntax;
 using osu.Framework.Graphics.Containers.Markdown;
+using osu.Framework.Graphics.Sprites;
 
 namespace osu.Game.Graphics.Containers.Markdown
 {
     public class OsuMarkdownHeading : MarkdownHeading
     {
+        private readonly int level;
+
         public OsuMarkdownHeading(HeadingBlock headingBlock)
             : base(headingBlock)
         {
+            level = headingBlock.Level;
         }
 
+        public override MarkdownTextFlowContainer CreateTextFlow() => new HeadingTextFlowContainer
+        {
+            Weight = GetFontWeightByLevel(level),
+        };
+
         protected override float GetFontSizeByLevel(int level)
         {
             const float base_font_size = 14;
@@ -38,5 +47,30 @@ namespace osu.Game.Graphics.Containers.Markdown
                     return 1;
             }
         }
+
+        protected virtual FontWeight GetFontWeightByLevel(int level)
+        {
+            switch (level)
+            {
+                case 1:
+                case 2:
+                    return FontWeight.SemiBold;
+
+                default:
+                    return FontWeight.Bold;
+            }
+        }
+
+        private class HeadingTextFlowContainer : OsuMarkdownTextFlowContainer
+        {
+            public FontWeight Weight { get; set; }
+
+            protected override SpriteText CreateSpriteText()
+            {
+                var spriteText = base.CreateSpriteText();
+                spriteText.Font = spriteText.Font.With(weight: Weight);
+                return spriteText;
+            }
+        }
     }
 }

From fd7a6b3a7c953c682154395abc517607dfff66bf Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 3 May 2021 12:19:34 +0300
Subject: [PATCH 3086/3722] Finish transforms on controls load complete

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

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
index 38ed23fa13..9cba07e267 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
@@ -54,7 +54,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
         protected override void LoadComplete()
         {
             base.LoadComplete();
+
             UpdateHoverState();
+            FinishTransforms(true);
         }
 
         protected override bool OnHover(HoverEvent e)

From 5f33c3514ec43a3df22ade1dc86e2a8b384c0c83 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 4 May 2021 06:37:18 +0300
Subject: [PATCH 3087/3722] Move selection box control internal events to drag
 handles

---
 .../Compose/Components/SelectionBoxControl.cs |  7 -------
 .../Components/SelectionBoxDragHandle.cs      | 20 +++++++++++++++++++
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
index 9cba07e267..4406cc055d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
@@ -22,9 +22,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
         public event Action OperationStarted;
         public event Action OperationEnded;
 
-        internal event Action HoverGained;
-        internal event Action HoverLost;
-
         private Circle circle;
 
         /// <summary>
@@ -62,14 +59,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
         protected override bool OnHover(HoverEvent e)
         {
             UpdateHoverState();
-            HoverGained?.Invoke();
             return true;
         }
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
-            base.OnHoverLost(e);
-            HoverLost?.Invoke();
             UpdateHoverState();
         }
 
@@ -89,7 +83,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             HandlingMouse = false;
             UpdateHoverState();
-            base.OnMouseUp(e);
         }
 
         protected virtual void UpdateHoverState()
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
index d7e58df748..ed7c451b7e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
@@ -29,5 +29,25 @@ namespace osu.Game.Screens.Edit.Compose.Components
             UpdateHoverState();
             base.OnDragEnd(e);
         }
+
+        #region Internal events for SelectionBoxDragHandleContainer
+
+        internal event Action HoverGained;
+        internal event Action HoverLost;
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            bool result = base.OnHover(e);
+            HoverGained?.Invoke();
+            return result;
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            base.OnHoverLost(e);
+            HoverLost?.Invoke();
+        }
+
+        #endregion
     }
 }

From b2a0c2b5631ac3a3e5d746909d141fafbf655ce3 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 4 May 2021 06:40:43 +0300
Subject: [PATCH 3088/3722] Consider drag handles active using mouse down
 instead of when dragged

---
 .../Compose/Components/SelectionBoxButton.cs  |  2 +-
 .../Compose/Components/SelectionBoxControl.cs | 29 +++++--------------
 .../Components/SelectionBoxDragHandle.cs      | 15 ++++++++++
 .../SelectionBoxDragHandleContainer.cs        |  8 ++---
 .../Components/SelectionBoxRotationHandle.cs  |  2 +-
 5 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxButton.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxButton.cs
index fbbebe3288..43cbbb617b 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxButton.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxButton.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         protected override void UpdateHoverState()
         {
             base.UpdateHoverState();
-            icon.FadeColour(!HandlingMouse && IsHovered ? Color4.White : Color4.Black, TRANSFORM_DURATION, Easing.OutQuint);
+            icon.FadeColour(!IsHeld && IsHovered ? Color4.White : Color4.Black, TRANSFORM_DURATION, Easing.OutQuint);
         }
 
         public string TooltipText { get; }
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
index 4406cc055d..159886648e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
@@ -25,9 +25,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
         private Circle circle;
 
         /// <summary>
-        /// Whether this control is currently being operated on by the user.
+        /// Whether the user is currently holding the control with mouse.
         /// </summary>
-        public bool InOperation { get; private set; }
+        public bool IsHeld { get; private set; }
 
         [Resolved]
         protected OsuColour Colours { get; private set; }
@@ -67,44 +67,31 @@ namespace osu.Game.Screens.Edit.Compose.Components
             UpdateHoverState();
         }
 
-        /// <summary>
-        /// Whether this control is currently handling mouse down input.
-        /// </summary>
-        protected bool HandlingMouse { get; private set; }
-
         protected override bool OnMouseDown(MouseDownEvent e)
         {
-            HandlingMouse = true;
+            IsHeld = true;
             UpdateHoverState();
             return true;
         }
 
         protected override void OnMouseUp(MouseUpEvent e)
         {
-            HandlingMouse = false;
+            IsHeld = false;
             UpdateHoverState();
         }
 
         protected virtual void UpdateHoverState()
         {
-            if (HandlingMouse)
+            if (IsHeld)
                 circle.FadeColour(Colours.GrayF, TRANSFORM_DURATION, Easing.OutQuint);
             else
                 circle.FadeColour(IsHovered ? Colours.Red : Colours.YellowDark, TRANSFORM_DURATION, Easing.OutQuint);
 
-            this.ScaleTo(HandlingMouse || IsHovered ? 1.5f : 1, TRANSFORM_DURATION, Easing.OutQuint);
+            this.ScaleTo(IsHeld || IsHovered ? 1.5f : 1, TRANSFORM_DURATION, Easing.OutQuint);
         }
 
-        protected void OnOperationStarted()
-        {
-            InOperation = true;
-            OperationStarted?.Invoke();
-        }
+        protected void OnOperationStarted() => OperationStarted?.Invoke();
 
-        protected void OnOperationEnded()
-        {
-            InOperation = false;
-            OperationEnded?.Invoke();
-        }
+        protected void OnOperationEnded() => OperationEnded?.Invoke();
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
index ed7c451b7e..3c1741e24d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
@@ -34,6 +34,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         internal event Action HoverGained;
         internal event Action HoverLost;
+        internal event Action MouseDown;
+        internal event Action MouseUp;
 
         protected override bool OnHover(HoverEvent e)
         {
@@ -48,6 +50,19 @@ namespace osu.Game.Screens.Edit.Compose.Components
             HoverLost?.Invoke();
         }
 
+        protected override bool OnMouseDown(MouseDownEvent e)
+        {
+            bool result = base.OnMouseDown(e);
+            MouseDown?.Invoke();
+            return result;
+        }
+
+        protected override void OnMouseUp(MouseUpEvent e)
+        {
+            base.OnMouseUp(e);
+            MouseUp?.Invoke();
+        }
+
         #endregion
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
index 7db2cdbbf5..c78514b7db 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
@@ -62,8 +62,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             handle.HoverGained += updateRotationHandlesVisibility;
             handle.HoverLost += updateRotationHandlesVisibility;
-            handle.OperationStarted += updateRotationHandlesVisibility;
-            handle.OperationEnded += updateRotationHandlesVisibility;
+            handle.MouseDown += updateRotationHandlesVisibility;
+            handle.MouseUp += updateRotationHandlesVisibility;
             allDragHandles.Add(handle);
         }
 
@@ -72,13 +72,13 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private void updateRotationHandlesVisibility()
         {
-            if (activeHandle?.InOperation == true || activeHandle?.IsHovered == true)
+            if (activeHandle?.IsHeld == true || activeHandle?.IsHovered == true)
                 return;
 
             displayedRotationHandle?.FadeOut(SelectionBoxControl.TRANSFORM_DURATION, Easing.OutQuint);
             displayedRotationHandle = null;
 
-            activeHandle = allDragHandles.SingleOrDefault(h => h.InOperation);
+            activeHandle = allDragHandles.SingleOrDefault(h => h.IsHeld);
             activeHandle ??= allDragHandles.SingleOrDefault(h => h.IsHovered);
 
             if (activeHandle != null)
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
index 6303caf9ed..65a54292ab 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         protected override void UpdateHoverState()
         {
             base.UpdateHoverState();
-            icon.FadeColour(!HandlingMouse && IsHovered ? Color4.White : Color4.Black, TRANSFORM_DURATION, Easing.OutQuint);
+            icon.FadeColour(!IsHeld && IsHovered ? Color4.White : Color4.Black, TRANSFORM_DURATION, Easing.OutQuint);
         }
     }
 }

From 8abff4881b731819535c9f603dc820c193abb010 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 4 May 2021 07:31:52 +0300
Subject: [PATCH 3089/3722] Hide the corresponding rotation handle when holding
 scale handle

---
 .../Editing/TestSceneComposeSelectBox.cs      | 29 +++++++++++++++----
 .../SelectionBoxDragHandleContainer.cs        | 10 +++++--
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
index 914b8b6f27..efcd7864d7 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
@@ -6,6 +6,7 @@ using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
+using osu.Framework.Threading;
 using osu.Game.Screens.Edit.Compose.Components;
 using osuTK;
 using osuTK.Input;
@@ -40,6 +41,7 @@ namespace osu.Game.Tests.Visual.Editing
             };
 
             InputManager.MoveMouseTo(selectionBox);
+            InputManager.ReleaseButton(MouseButton.Left);
         });
 
         private bool handleScale(Vector2 amount, Anchor reference)
@@ -127,26 +129,41 @@ namespace osu.Game.Tests.Visual.Editing
         }
 
         [Test]
-        public void TestDraggingScaleHandleKeepsCorrespondingRotationHandleShown()
+        public void TestHoldingScaleHandleHidesCorrespondingRotationHandle()
         {
             SelectionBoxRotationHandle rotationHandle = null;
 
             AddStep("retrieve rotation handle", () => rotationHandle = this.ChildrenOfType<SelectionBoxRotationHandle>().First());
 
             AddAssert("rotation handle hidden", () => rotationHandle.Alpha == 0);
-            AddStep("hover over and hold closest scale handle", () =>
+            AddStep("hover over closest scale handle", () =>
             {
                 InputManager.MoveMouseTo(this.ChildrenOfType<SelectionBoxScaleHandle>().Single(s => s.Anchor == rotationHandle.Anchor));
-                InputManager.PressButton(MouseButton.Left);
             });
             AddUntilStep("rotation handle shown", () => rotationHandle.Alpha == 1);
+            AddStep("hold scale handle", () => InputManager.PressButton(MouseButton.Left));
+            AddUntilStep("rotation handle hidden", () => rotationHandle.Alpha == 0);
 
-            AddStep("drag to centre", () => InputManager.MoveMouseTo(selectionBox));
-            AddAssert("rotation handle still shown", () => rotationHandle.Alpha > 0);
+            int i;
+            ScheduledDelegate mouseMove = null;
 
+            AddStep("start dragging", () =>
+            {
+                i = 0;
+
+                mouseMove = Scheduler.AddDelayed(() =>
+                {
+                    InputManager.MoveMouseTo(selectionBox.ScreenSpaceDrawQuad.TopLeft + Vector2.One * (5 * ++i));
+                }, 100, true);
+            });
+            AddAssert("rotation handle still hidden", () => rotationHandle.Alpha == 0);
+
+            AddStep("end dragging", () => mouseMove.Cancel());
+            AddAssert("rotation handle still hidden", () => rotationHandle.Alpha == 0);
             AddStep("unhold left", () => InputManager.ReleaseButton(MouseButton.Left));
+            AddUntilStep("rotation handle shown", () => rotationHandle.Alpha == 1);
             AddStep("move mouse away", () => InputManager.MoveMouseTo(selectionBox, new Vector2(20)));
-            AddUntilStep("handle hidden", () => rotationHandle.Alpha == 0);
+            AddUntilStep("rotation handle hidden", () => rotationHandle.Alpha == 0);
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
index c78514b7db..456f72878d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
@@ -72,13 +72,19 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private void updateRotationHandlesVisibility()
         {
-            if (activeHandle?.IsHeld == true || activeHandle?.IsHovered == true)
+            // if the active handle is a rotation handle and is held or hovered,
+            // then no need to perform any updates to the rotation handles visibility.
+            if (activeHandle is SelectionBoxRotationHandle && (activeHandle?.IsHeld == true || activeHandle?.IsHovered == true))
                 return;
 
             displayedRotationHandle?.FadeOut(SelectionBoxControl.TRANSFORM_DURATION, Easing.OutQuint);
             displayedRotationHandle = null;
 
-            activeHandle = allDragHandles.SingleOrDefault(h => h.IsHeld);
+            // if the active handle is not a rotation handle but is held, then keep the rotation handle hidden.
+            if (activeHandle?.IsHeld == true)
+                return;
+
+            activeHandle = rotationHandles.SingleOrDefault(h => h.IsHeld || h.IsHovered);
             activeHandle ??= allDragHandles.SingleOrDefault(h => h.IsHovered);
 
             if (activeHandle != null)

From e00af3e71d2f2f754e641698dede05e3ac089b5b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 4 May 2021 09:45:58 +0300
Subject: [PATCH 3090/3722] Add test coverage

---
 .../NonVisual/FramedReplayInputHandlerTest.cs | 38 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
index a42b7d54ee..2062c4b820 100644
--- a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
+++ b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
@@ -3,7 +3,9 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Utils;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Replays;
 
@@ -278,6 +280,38 @@ namespace osu.Game.Tests.NonVisual
             setTime(-100, -100);
         }
 
+        [Test]
+        public void TestReplayFrameSortStability()
+        {
+            const double repeating_time = 5000;
+
+            int data = 0;
+
+            // 1. add a range of frames in which some of them have the constant time 5000, all without any "data".
+            // 2. randomize the frames.
+            // 3. assign "data" to each frame in ascending order.
+            replay.Frames.AddRange(Enumerable.Range(1, 250).Select(i =>
+            {
+                if (RNG.NextBool())
+                    return new TestReplayFrame(repeating_time, true);
+                else
+                    return new TestReplayFrame(i * 1000, true);
+            }).OrderBy(_ => RNG.Next()).Select(f => new TestReplayFrame(f.Time, true, ++data)));
+
+            replay.HasReceivedAllFrames = true;
+
+            // create a new handler with the replay for the frames to be sorted.
+            handler = new TestInputHandler(replay);
+
+            // ensure sort stability by checking whether the "data" assigned to each time-repeated frame is in ascending order, as it was before sort.
+            var repeatingTimeFramesData = replay.Frames
+                                                .Cast<TestReplayFrame>()
+                                                .Where(f => f.Time == repeating_time)
+                                                .Select(f => f.Data);
+
+            Assert.That(repeatingTimeFramesData, Is.Ordered.Ascending);
+        }
+
         private void setReplayFrames()
         {
             replay.Frames = new List<ReplayFrame>
@@ -324,11 +358,13 @@ namespace osu.Game.Tests.NonVisual
         private class TestReplayFrame : ReplayFrame
         {
             public readonly bool IsImportant;
+            public readonly int Data;
 
-            public TestReplayFrame(double time, bool isImportant = false)
+            public TestReplayFrame(double time, bool isImportant = false, int data = 0)
                 : base(time)
             {
                 IsImportant = isImportant;
+                Data = data;
             }
         }
 

From 36438175a0f61efc7c990ad8cf0f127cd09078bc Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 4 May 2021 16:04:58 +0900
Subject: [PATCH 3091/3722] Throw an exception if try to modify lifetime of
 PoolableDrawableWithLifetime without lifetime

---
 .../Pooling/PoolableDrawableWithLifetime.cs       | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs b/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
index e94b6dca9d..d8565f4b30 100644
--- a/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
@@ -3,6 +3,7 @@
 
 #nullable enable
 
+using System;
 using System.Diagnostics;
 using osu.Framework.Graphics.Performance;
 using osu.Framework.Graphics.Pooling;
@@ -31,7 +32,12 @@ namespace osu.Game.Rulesets.Objects.Pooling
             get => Entry?.LifetimeStart ?? double.MinValue;
             set
             {
-                if (Entry != null) Entry.LifetimeStart = value;
+                if (LifetimeStart == value) return;
+
+                if (Entry == null)
+                    throw new InvalidOperationException($"Cannot modify lifetime of {nameof(PoolableDrawableWithLifetime<TEntry>)} when entry is not set");
+
+                Entry.LifetimeStart = value;
             }
         }
 
@@ -40,7 +46,12 @@ namespace osu.Game.Rulesets.Objects.Pooling
             get => Entry?.LifetimeEnd ?? double.MaxValue;
             set
             {
-                if (Entry != null) Entry.LifetimeEnd = value;
+                if (LifetimeEnd == value) return;
+
+                if (Entry == null)
+                    throw new InvalidOperationException($"Cannot modify lifetime of {nameof(PoolableDrawableWithLifetime<TEntry>)} when entry is not set");
+
+                Entry.LifetimeEnd = value;
             }
         }
 

From ffc88db47aa7377e78a6db933723a314a937e933 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 May 2021 16:04:59 +0900
Subject: [PATCH 3092/3722] Implement Duration via the interface

---
 osu.Game/Storyboards/IStoryboardElementWithDuration.cs | 2 +-
 osu.Game/Storyboards/StoryboardSprite.cs               | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Storyboards/IStoryboardElementWithDuration.cs b/osu.Game/Storyboards/IStoryboardElementWithDuration.cs
index 02b438cb76..55f163ee07 100644
--- a/osu.Game/Storyboards/IStoryboardElementWithDuration.cs
+++ b/osu.Game/Storyboards/IStoryboardElementWithDuration.cs
@@ -16,6 +16,6 @@ namespace osu.Game.Storyboards
         /// <summary>
         /// The duration of the StoryboardElement.
         /// </summary>
-        double Duration { get; }
+        double Duration => EndTime - StartTime;
     }
 }
diff --git a/osu.Game/Storyboards/StoryboardSprite.cs b/osu.Game/Storyboards/StoryboardSprite.cs
index 0aaf264341..bf87e7d10e 100644
--- a/osu.Game/Storyboards/StoryboardSprite.cs
+++ b/osu.Game/Storyboards/StoryboardSprite.cs
@@ -65,8 +65,6 @@ namespace osu.Game.Storyboards
             }
         }
 
-        public double Duration => EndTime - StartTime;
-
         public bool HasCommands => TimelineGroup.HasCommands || loops.Any(l => l.HasCommands);
 
         private delegate void DrawablePropertyInitializer<in T>(Drawable drawable, T value);

From b30145de40646e893d3123133fd46d67e52c23b6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 May 2021 16:35:50 +0900
Subject: [PATCH 3093/3722] Specify explicit primitive type

---
 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 1a11adad30..d424f90079 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -640,7 +640,7 @@ namespace osu.Game.Screens.Play
                 return;
             }
 
-            var storyboardHasOutro = DimmableStoryboard.ContentDisplayed && !DimmableStoryboard.HasStoryboardEnded.Value;
+            bool storyboardHasOutro = DimmableStoryboard.ContentDisplayed && !DimmableStoryboard.HasStoryboardEnded.Value;
 
             if (storyboardHasOutro)
             {

From 4c7a4239f818662055b08f610b7ab588a3520042 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 May 2021 16:36:05 +0900
Subject: [PATCH 3094/3722] Fix `AllowGameplayOverlays` potentially not working
 for outro skip overlay

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index d424f90079..6ed1a87d8a 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -245,8 +245,6 @@ namespace osu.Game.Screens.Play
                 HUDOverlay.ShowHud.Value = false;
                 HUDOverlay.ShowHud.Disabled = true;
                 BreakOverlay.Hide();
-                skipIntroOverlay.Hide();
-                skipOutroOverlay.Hide();
             }
 
             DrawableRuleset.FrameStableClock.WaitingOnFrames.BindValueChanged(waiting =>
@@ -398,7 +396,7 @@ namespace osu.Game.Screens.Play
                 }
             };
 
-            if (!Configuration.AllowSkipping)
+            if (!Configuration.AllowSkipping || !DrawableRuleset.AllowGameplayOverlays)
             {
                 skipIntroOverlay.Expire();
                 skipOutroOverlay.Expire();

From b380be7169de5b4e2ca066d27fd5970a624e5cfb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 May 2021 16:43:51 +0900
Subject: [PATCH 3095/3722] Add xmldoc for `updateCompletionState`

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 6ed1a87d8a..cf26bc479a 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -582,6 +582,11 @@ namespace osu.Game.Screens.Play
         private ScheduledDelegate completionProgressDelegate;
         private Task<ScoreInfo> prepareScoreForDisplayTask;
 
+        /// <summary>
+        /// Handles changes in player state which may progress the completion of gameplay / this screen's lifetime.
+        /// </summary>
+        /// <param name="skipStoryboardOutro">If in a state where a storyboard outro is to be played, offers the choice of skipping beyond it.</param>
+        /// <exception cref="InvalidOperationException">Thrown if this method is called more than once without changing state.</exception>
         private void updateCompletionState(bool skipStoryboardOutro = false)
         {
             // screen may be in the exiting transition phase.

From 913fc8c3bc9eb4c37a0ff66bdccb5e90754dcf8a Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 4 May 2021 16:44:48 +0900
Subject: [PATCH 3096/3722] Revert the change of not adding non-pooled DHO to
 HOC until alive

---
 osu.Game/Rulesets/UI/HitObjectContainer.cs | 78 +++++++++++++---------
 1 file changed, 48 insertions(+), 30 deletions(-)

diff --git a/osu.Game/Rulesets/UI/HitObjectContainer.cs b/osu.Game/Rulesets/UI/HitObjectContainer.cs
index 1d32313f2b..dcf350cbd4 100644
--- a/osu.Game/Rulesets/UI/HitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/HitObjectContainer.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.UI
         /// <summary>
         /// All alive entries and <see cref="DrawableHitObject"/>s used by the entries.
         /// </summary>
-        public IEnumerable<(HitObjectLifetimeEntry Entry, DrawableHitObject Drawable)> AliveEntries => drawableMap.Select(x => (x.Key, x.Value));
+        public IEnumerable<(HitObjectLifetimeEntry Entry, DrawableHitObject Drawable)> AliveEntries => aliveDrawableMap.Select(x => (x.Key, x.Value));
 
         public IEnumerable<DrawableHitObject> Objects => InternalChildren.Cast<DrawableHitObject>().OrderBy(h => h.HitObject.StartTime);
 
@@ -71,7 +71,7 @@ namespace osu.Game.Rulesets.UI
 
         private readonly Dictionary<DrawableHitObject, IBindable> startTimeMap = new Dictionary<DrawableHitObject, IBindable>();
 
-        private readonly Dictionary<HitObjectLifetimeEntry, DrawableHitObject> drawableMap = new Dictionary<HitObjectLifetimeEntry, DrawableHitObject>();
+        private readonly Dictionary<HitObjectLifetimeEntry, DrawableHitObject> aliveDrawableMap = new Dictionary<HitObjectLifetimeEntry, DrawableHitObject>();
         private readonly Dictionary<HitObjectLifetimeEntry, DrawableHitObject> nonPooledDrawableMap = new Dictionary<HitObjectLifetimeEntry, DrawableHitObject>();
 
         private readonly LifetimeEntryManager lifetimeManager = new LifetimeEntryManager();
@@ -108,55 +108,70 @@ namespace osu.Game.Rulesets.UI
         public bool Remove(HitObjectLifetimeEntry entry)
         {
             if (!lifetimeManager.RemoveEntry(entry)) return false;
-            // The entry has to be removed from the non-pooled map here because non-pooled entry may be removed by specifying its entry.
-            nonPooledDrawableMap.Remove(entry);
+
+            // This logic is not in `Remove(DrawableHitObject)` because a non-pooled drawable may be removed by specifying its entry.
+            if (nonPooledDrawableMap.Remove(entry, out var drawable))
+                removeDrawable(drawable);
+
             allEntries.Remove(entry);
             return true;
         }
 
-        private void entryBecameAlive(LifetimeEntry entry) => addDrawable((HitObjectLifetimeEntry)entry);
-
-        private void entryBecameDead(LifetimeEntry entry) => removeDrawable((HitObjectLifetimeEntry)entry);
-
-        private void addDrawable(HitObjectLifetimeEntry entry)
+        private void entryBecameAlive(LifetimeEntry lifetimeEntry)
         {
-            Debug.Assert(!drawableMap.ContainsKey(entry));
+            var entry = (HitObjectLifetimeEntry)lifetimeEntry;
+            Debug.Assert(!aliveDrawableMap.ContainsKey(entry));
 
-            nonPooledDrawableMap.TryGetValue(entry, out var drawable);
+            bool isNonPooled = nonPooledDrawableMap.TryGetValue(entry, out var drawable);
             drawable ??= pooledObjectProvider?.GetPooledDrawableRepresentation(entry.HitObject, null);
             if (drawable == null)
                 throw new InvalidOperationException($"A drawable representation could not be retrieved for hitobject type: {entry.HitObject.GetType().ReadableName()}.");
 
+            aliveDrawableMap[entry] = drawable;
+            OnAdd(drawable);
+
+            if (isNonPooled) return;
+
+            addDrawable(drawable);
+            HitObjectUsageBegan?.Invoke(entry.HitObject);
+        }
+
+        private void entryBecameDead(LifetimeEntry lifetimeEntry)
+        {
+            var entry = (HitObjectLifetimeEntry)lifetimeEntry;
+            Debug.Assert(aliveDrawableMap.ContainsKey(entry));
+
+            var drawable = aliveDrawableMap[entry];
+            bool isNonPooled = nonPooledDrawableMap.ContainsKey(entry);
+
+            drawable.OnKilled();
+            aliveDrawableMap.Remove(entry);
+            OnRemove(drawable);
+
+            if (isNonPooled) return;
+
+            removeDrawable(drawable);
+            // The hit object is not freed when the DHO was not pooled.
+            HitObjectUsageFinished?.Invoke(entry.HitObject);
+        }
+
+        private void addDrawable(DrawableHitObject drawable)
+        {
             drawable.OnNewResult += onNewResult;
             drawable.OnRevertResult += onRevertResult;
 
             bindStartTime(drawable);
-            AddInternal(drawableMap[entry] = drawable);
-            OnAdd(drawable);
-
-            HitObjectUsageBegan?.Invoke(entry.HitObject);
+            AddInternal(drawable);
         }
 
-        private void removeDrawable(HitObjectLifetimeEntry entry)
+        private void removeDrawable(DrawableHitObject drawable)
         {
-            Debug.Assert(drawableMap.ContainsKey(entry));
-
-            var drawable = drawableMap[entry];
-
-            // OnKilled can potentially change the hitobject's result, so it needs to run first before unbinding.
-            drawable.OnKilled();
             drawable.OnNewResult -= onNewResult;
             drawable.OnRevertResult -= onRevertResult;
 
-            drawableMap.Remove(entry);
-
-            OnRemove(drawable);
             unbindStartTime(drawable);
-            RemoveInternal(drawable);
 
-            // The hit object is not freed when the DHO was not pooled.
-            if (!nonPooledDrawableMap.ContainsKey(entry))
-                HitObjectUsageFinished?.Invoke(entry.HitObject);
+            RemoveInternal(drawable);
         }
 
         #endregion
@@ -169,6 +184,7 @@ namespace osu.Game.Rulesets.UI
                 throw new InvalidOperationException($"May not add a {nameof(DrawableHitObject)} without {nameof(HitObject)} associated");
 
             nonPooledDrawableMap.Add(drawable.Entry, drawable);
+            addDrawable(drawable);
             Add(drawable.Entry);
         }
 
@@ -217,8 +233,10 @@ namespace osu.Game.Rulesets.UI
         public virtual void Clear()
         {
             lifetimeManager.ClearEntries();
+            foreach (var drawable in nonPooledDrawableMap.Values)
+                removeDrawable(drawable);
             nonPooledDrawableMap.Clear();
-            Debug.Assert(InternalChildren.Count == 0 && startTimeMap.Count == 0 && drawableMap.Count == 0, "All hit objects should have been removed");
+            Debug.Assert(InternalChildren.Count == 0 && startTimeMap.Count == 0 && aliveDrawableMap.Count == 0, "All hit objects should have been removed");
         }
 
         protected override bool CheckChildrenLife()

From 39bccc50489cf502c367891dc0a4071cec4c1dfc Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 4 May 2021 16:45:24 +0900
Subject: [PATCH 3097/3722] Revert "Adopt HitObjectContainer change in a test"

This reverts commit f55aa016
---
 osu.Game.Tests/Gameplay/TestSceneHitObjectContainer.cs | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectContainer.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectContainer.cs
index 8f3d3f1276..f2bfccb6de 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectContainer.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectContainer.cs
@@ -4,7 +4,6 @@
 using JetBrains.Annotations;
 using NUnit.Framework;
 using osu.Framework.Testing;
-using osu.Framework.Timing;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
@@ -20,14 +19,7 @@ namespace osu.Game.Tests.Gameplay
         [SetUp]
         public void Setup() => Schedule(() =>
         {
-            Child = container = new HitObjectContainer
-            {
-                Clock = new FramedClock(new ManualClock
-                {
-                    // Make sure hit objects with `StartTime == 0` are alive
-                    CurrentTime = -1
-                })
-            };
+            Child = container = new HitObjectContainer();
         });
 
         [Test]

From 787bfd6bd08a4afaea8e937ab327445199572948 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 4 May 2021 16:45:39 +0900
Subject: [PATCH 3098/3722] Revert "Fix failing taiko tests"

This reverts commit 971ca398
---
 .../TestSceneFlyingHits.cs                       | 16 ++++++++--------
 osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs   |  8 ++------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneFlyingHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneFlyingHits.cs
index 5738be05d7..63854e7ead 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneFlyingHits.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneFlyingHits.cs
@@ -20,19 +20,20 @@ namespace osu.Game.Rulesets.Taiko.Tests
         [TestCase(HitType.Rim)]
         public void TestFlyingHits(HitType hitType)
         {
+            DrawableFlyingHit flyingHit = null;
+
             AddStep("add flying hit", () =>
             {
                 addFlyingHit(hitType);
-            });
 
-            AddAssert("hit type is correct", () =>
-            {
                 // flying hits all land in one common scrolling container (and stay there for rewind purposes),
                 // so we need to manually get the latest one.
-                return this.ChildrenOfType<DrawableFlyingHit>()
-                           .OrderByDescending(h => h.HitObject.StartTime)
-                           .FirstOrDefault()?.HitObject.Type == hitType;
+                flyingHit = this.ChildrenOfType<DrawableFlyingHit>()
+                                .OrderByDescending(h => h.HitObject.StartTime)
+                                .FirstOrDefault();
             });
+
+            AddAssert("hit type is correct", () => flyingHit.HitObject.Type == hitType);
         }
 
         private void addFlyingHit(HitType hitType)
@@ -41,8 +42,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
             DrawableDrumRollTick h;
             DrawableRuleset.Playfield.Add(h = new DrawableDrumRollTick(tick) { JudgementType = hitType });
-            h.OnLoadComplete += _ =>
-                ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h, new JudgementResult(tick, new TaikoDrumRollTickJudgement()) { Type = HitResult.Great });
+            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h, new JudgementResult(tick, new TaikoDrumRollTickJudgement()) { Type = HitResult.Great });
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
index 06acdad3d6..87c936d386 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneHits.cs
@@ -129,12 +129,8 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
             DrawableRuleset.Playfield.Add(h);
 
-            h.OnLoadComplete += _ =>
-            {
-                ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h, new JudgementResult(hit, new TaikoJudgement()) { Type = hitResult });
-                ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h.NestedHitObjects.Single(),
-                    new JudgementResult(hit.NestedHitObjects.Single(), new TaikoStrongJudgement()) { Type = HitResult.Great });
-            };
+            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h, new JudgementResult(hit, new TaikoJudgement()) { Type = hitResult });
+            ((TaikoPlayfield)DrawableRuleset.Playfield).OnNewResult(h.NestedHitObjects.Single(), new JudgementResult(hit.NestedHitObjects.Single(), new TaikoStrongJudgement()) { Type = HitResult.Great });
         }
 
         private void addMissJudgement()

From 4a93e27e8394ed5d347ca06989951319afb6e6c4 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 4 May 2021 16:46:30 +0900
Subject: [PATCH 3099/3722] Revert "Fix mania editor null reference"

This reverts commit 1d023dce
---
 .../Edit/Blueprints/ManiaSelectionBlueprint.cs                 | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
index 8f8f45c0dd..384f49d9b2 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
@@ -18,9 +18,6 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; }
 
-        // Overriding the base because this method is called right after `Column` is changed and `DrawableObject` is not yet loaded and Parent is not set.
-        public override Vector2 GetInstantDelta(Vector2 screenSpacePosition) => Parent.ToLocalSpace(screenSpacePosition) - Position;
-
         protected ManiaSelectionBlueprint(DrawableHitObject drawableObject)
             : base(drawableObject)
         {

From 18779b1d1e8fa6d6b9fdb4e0d389b8b7f0d08d54 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 May 2021 16:48:13 +0900
Subject: [PATCH 3100/3722] Cache last event time value to avoid super
 expensive LINQ

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

diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
index a9a8b8a4ac..4c42823779 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
@@ -20,6 +20,13 @@ namespace osu.Game.Storyboards.Drawables
         [Cached]
         public Storyboard Storyboard { get; }
 
+        /// <summary>
+        /// Whether the storyboard is considered finished.
+        /// </summary>
+        public IBindable<bool> HasStoryboardEnded => hasStoryboardEnded;
+
+        private readonly BindableBool hasStoryboardEnded = new BindableBool();
+
         protected override Container<DrawableStoryboardLayer> Content { get; }
 
         protected override Vector2 DrawScale => new Vector2(Parent.DrawHeight / 480);
@@ -40,6 +47,8 @@ namespace osu.Game.Storyboards.Drawables
 
         public override bool RemoveCompletedTransforms => false;
 
+        private double? lastEventEndTime;
+
         private DependencyContainer dependencies;
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) =>
@@ -74,6 +83,14 @@ namespace osu.Game.Storyboards.Drawables
 
                 Add(layer.CreateDrawable());
             }
+
+            lastEventEndTime = Storyboard.LatestEventTime;
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+            hasStoryboardEnded.Value = lastEventEndTime == null || Time.Current >= lastEventEndTime;
         }
 
         public DrawableStoryboardLayer OverlayLayer => Children.Single(layer => layer.Name == "Overlay");
@@ -83,25 +100,5 @@ namespace osu.Game.Storyboards.Drawables
             foreach (var layer in Children)
                 layer.Enabled = passing ? layer.Layer.VisibleWhenPassing : layer.Layer.VisibleWhenFailing;
         }
-
-        protected override void Update()
-        {
-            base.Update();
-            updateHasStoryboardEnded();
-        }
-
-        /// <summary>
-        /// Whether the storyboard is considered finished.
-        /// </summary>
-        public IBindable<bool> HasStoryboardEnded => hasStoryboardEnded;
-
-        private readonly BindableBool hasStoryboardEnded = new BindableBool();
-
-        private void updateHasStoryboardEnded()
-        {
-            hasStoryboardEnded.Value =
-                Storyboard.LatestEventTime == null ||
-                Time.Current >= Storyboard.LatestEventTime;
-        }
     }
 }

From aa42cf2fc055eeee7a01188fbf61ef3735651dd3 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 4 May 2021 16:56:48 +0900
Subject: [PATCH 3101/3722] Fix setting lifetime during KeepAlive is ignored

---
 .../Pooling/PoolableDrawableWithLifetime.cs        | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs b/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
index d8565f4b30..ed0430012a 100644
--- a/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
@@ -32,12 +32,11 @@ namespace osu.Game.Rulesets.Objects.Pooling
             get => Entry?.LifetimeStart ?? double.MinValue;
             set
             {
-                if (LifetimeStart == value) return;
-
-                if (Entry == null)
+                if (Entry == null && LifetimeStart != value)
                     throw new InvalidOperationException($"Cannot modify lifetime of {nameof(PoolableDrawableWithLifetime<TEntry>)} when entry is not set");
 
-                Entry.LifetimeStart = value;
+                if (Entry != null)
+                    Entry.LifetimeStart = value;
             }
         }
 
@@ -46,12 +45,11 @@ namespace osu.Game.Rulesets.Objects.Pooling
             get => Entry?.LifetimeEnd ?? double.MaxValue;
             set
             {
-                if (LifetimeEnd == value) return;
-
-                if (Entry == null)
+                if (Entry == null && LifetimeEnd != value)
                     throw new InvalidOperationException($"Cannot modify lifetime of {nameof(PoolableDrawableWithLifetime<TEntry>)} when entry is not set");
 
-                Entry.LifetimeEnd = value;
+                if (Entry != null)
+                    Entry.LifetimeEnd = value;
             }
         }
 

From acc9258eb217dfd04dfdc71f32498df3884caba6 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 4 May 2021 00:59:22 -0700
Subject: [PATCH 3102/3722] Implement notes for settings

---
 osu.Game/Overlays/Settings/SettingsItem.cs | 33 +++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index 0bd9750b0b..1d6535c289 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -19,6 +19,7 @@ using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osuTK;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays.Settings
 {
@@ -36,6 +37,8 @@ namespace osu.Game.Overlays.Settings
 
         private SpriteText labelText;
 
+        private readonly OsuTextFlowContainer noteText;
+
         public bool ShowsDefaultIndicator = true;
 
         public string TooltipText { get; set; }
@@ -57,6 +60,19 @@ namespace osu.Game.Overlays.Settings
             }
         }
 
+        /// <summary>
+        /// Text to be displayed at the bottom of this <see cref="SettingsItem{T}"/>.
+        /// Used for further explanation or indicating drawbacks of the current setting.
+        /// </summary>
+        public string NoteText
+        {
+            set
+            {
+                noteText.Alpha = 1;
+                noteText.Text = value;
+            }
+        }
+
         public virtual Bindable<T> Current
         {
             get => controlWithCurrent.Current;
@@ -92,7 +108,16 @@ namespace osu.Game.Overlays.Settings
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
                     Padding = new MarginPadding { Left = SettingsPanel.CONTENT_MARGINS },
-                    Child = Control = CreateControl()
+                    Children = new[]
+                    {
+                        Control = CreateControl(),
+                        noteText = new OsuTextFlowContainer
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Alpha = 0,
+                        },
+                    },
                 },
             };
 
@@ -108,6 +133,12 @@ namespace osu.Game.Overlays.Settings
             }
         }
 
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            noteText.Colour = colours.Yellow;
+        }
+
         private void updateDisabled()
         {
             if (labelText != null)

From 796bd8e47eab8b8268bcbecae9349539b99d85a3 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 4 May 2021 00:59:48 -0700
Subject: [PATCH 3103/3722] Add existing setting notes from stable

---
 .../Settings/Sections/Graphics/LayoutSettings.cs |  9 ++++++++-
 .../Sections/Graphics/RendererSettings.cs        | 16 +++++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index 4d5c2e06eb..a24dd1f64b 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -141,7 +141,14 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
 
             scalingSettings.ForEach(s => bindPreviewEvent(s.Current));
 
-            windowModeDropdown.Current.ValueChanged += _ => updateResolutionDropdown();
+            windowModeDropdown.Current.BindValueChanged(mode =>
+            {
+                updateResolutionDropdown();
+
+                const string not_fullscreen_note = "Running without fullscreen mode will increase your input latency!";
+
+                windowModeDropdown.NoteText = mode.NewValue != WindowMode.Fullscreen ? not_fullscreen_note : string.Empty;
+            }, true);
 
             windowModes.BindCollectionChanged((sender, args) =>
             {
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
index 8773e6763c..3ad201640d 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
@@ -13,6 +13,8 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
     {
         protected override string Header => "Renderer";
 
+        private SettingsEnumDropdown<FrameSync> frameLimiterDropdown;
+
         [BackgroundDependencyLoader]
         private void load(FrameworkConfigManager config, OsuConfigManager osuConfig)
         {
@@ -20,7 +22,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
             Children = new Drawable[]
             {
                 // TODO: this needs to be a custom dropdown at some point
-                new SettingsEnumDropdown<FrameSync>
+                frameLimiterDropdown = new SettingsEnumDropdown<FrameSync>
                 {
                     LabelText = "Frame limiter",
                     Current = config.GetBindable<FrameSync>(FrameworkSetting.FrameSync)
@@ -37,5 +39,17 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 },
             };
         }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            frameLimiterDropdown.Current.BindValueChanged(limit =>
+            {
+                const string unlimited_frames_note = "Using unlimited frame limiter can lead to stutters. \"2x refresh rate\" is recommended.";
+
+                frameLimiterDropdown.NoteText = limit.NewValue == FrameSync.Unlimited ? unlimited_frames_note : string.Empty;
+            }, true);
+        }
     }
 }

From 0a649227385b82fb95787e2fd8989fae1fca258a Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 4 May 2021 01:00:35 -0700
Subject: [PATCH 3104/3722] Add supporter note to background source setting

---
 .../UserInterface/MainMenuSettings.cs         | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs b/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
index 95e2e9da30..707f8cd314 100644
--- a/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
@@ -2,8 +2,11 @@
 // 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.Configuration;
+using osu.Game.Online.API;
+using osu.Game.Users;
 
 namespace osu.Game.Overlays.Settings.Sections.UserInterface
 {
@@ -11,9 +14,15 @@ namespace osu.Game.Overlays.Settings.Sections.UserInterface
     {
         protected override string Header => "Main Menu";
 
+        private IBindable<User> user;
+
+        private SettingsEnumDropdown<BackgroundSource> backgroundSourceDropdown;
+
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
+        private void load(OsuConfigManager config, IAPIProvider api)
         {
+            user = api.LocalUser.GetBoundCopy();
+
             Children = new Drawable[]
             {
                 new SettingsCheckbox
@@ -31,7 +40,7 @@ namespace osu.Game.Overlays.Settings.Sections.UserInterface
                     LabelText = "Intro sequence",
                     Current = config.GetBindable<IntroSequence>(OsuSetting.IntroSequence),
                 },
-                new SettingsEnumDropdown<BackgroundSource>
+                backgroundSourceDropdown = new SettingsEnumDropdown<BackgroundSource>
                 {
                     LabelText = "Background source",
                     Current = config.GetBindable<BackgroundSource>(OsuSetting.MenuBackgroundSource),
@@ -43,5 +52,17 @@ namespace osu.Game.Overlays.Settings.Sections.UserInterface
                 }
             };
         }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            backgroundSourceDropdown.Current.BindValueChanged(source =>
+            {
+                const string not_supporter_note = "Changes to this setting will only apply with an active osu!supporter tag.";
+
+                backgroundSourceDropdown.NoteText = user.Value?.IsSupporter == false ? not_supporter_note : string.Empty;
+            }, true);
+        }
     }
 }

From a5842130027d8e9560c9311e997c4916ebc35ba7 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 4 May 2021 09:11:33 -0700
Subject: [PATCH 3105/3722] Use vertical padding instead of relative height for
 default button

---
 osu.Game/Overlays/Settings/SettingsItem.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index 1d6535c289..6405431f6b 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -18,7 +18,6 @@ using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osuTK;
 using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays.Settings
@@ -172,6 +171,7 @@ namespace osu.Game.Overlays.Settings
             {
                 RelativeSizeAxes = Axes.Y;
                 Width = SettingsPanel.CONTENT_MARGINS;
+                Padding = new MarginPadding { Vertical = 1.5f };
                 Alpha = 0f;
             }
 
@@ -194,7 +194,7 @@ namespace osu.Game.Overlays.Settings
                         Type = EdgeEffectType.Glow,
                         Radius = 2,
                     },
-                    Size = new Vector2(0.33f, 0.8f),
+                    Width = 0.33f,
                     Child = new Box { RelativeSizeAxes = Axes.Both },
                 };
             }

From 040d393dd462931068601879ba7fc0b09f597136 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 4 May 2021 21:00:12 +0200
Subject: [PATCH 3106/3722] Add visual test case for crossfade behaviour

---
 .../TestSceneUpdateableBeatmapSetCover.cs     | 47 +++++++++++++++++--
 1 file changed, 44 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
index c928c0103f..4fef93e291 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapSetCover.cs
@@ -108,14 +108,52 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("no cover added", () => !updateableCover.ChildrenOfType<DelayedLoadUnloadWrapper>().Any());
         }
 
+        [Test]
+        public void TestCoverChangeOnNewBeatmap()
+        {
+            TestUpdateableBeatmapSetCover updateableCover = null;
+            BeatmapSetCover initialCover = null;
+
+            AddStep("setup cover", () => Child = updateableCover = new TestUpdateableBeatmapSetCover(0)
+            {
+                BeatmapSet = createBeatmapWithCover("https://assets.ppy.sh/beatmaps/1189904/covers/cover.jpg"),
+                RelativeSizeAxes = Axes.Both,
+                Masking = true,
+                Alpha = 0.4f
+            });
+
+            AddUntilStep("cover loaded", () => updateableCover.ChildrenOfType<BeatmapSetCover>().Any());
+            AddStep("store initial cover", () => initialCover = updateableCover.ChildrenOfType<BeatmapSetCover>().Single());
+            AddUntilStep("wait for fade complete", () => initialCover.Alpha == 1);
+
+            AddStep("switch beatmap",
+                () => updateableCover.BeatmapSet = createBeatmapWithCover("https://assets.ppy.sh/beatmaps/1079428/covers/cover.jpg"));
+            AddUntilStep("new cover loaded", () => updateableCover.ChildrenOfType<BeatmapSetCover>().Except(new[] { initialCover }).Any());
+        }
+
+        private static BeatmapSetInfo createBeatmapWithCover(string coverUrl) => new BeatmapSetInfo
+        {
+            OnlineInfo = new BeatmapSetOnlineInfo
+            {
+                Covers = new BeatmapSetOnlineCovers { Cover = coverUrl }
+            }
+        };
+
         private class TestUpdateableBeatmapSetCover : UpdateableBeatmapSetCover
         {
+            private readonly int loadDelay;
+
+            public TestUpdateableBeatmapSetCover(int loadDelay = 10000)
+            {
+                this.loadDelay = loadDelay;
+            }
+
             protected override Drawable CreateDrawable(BeatmapSetInfo model)
             {
                 if (model == null)
                     return null;
 
-                return new TestBeatmapSetCover(model)
+                return new TestBeatmapSetCover(model, loadDelay)
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -127,15 +165,18 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private class TestBeatmapSetCover : BeatmapSetCover
         {
-            public TestBeatmapSetCover(BeatmapSetInfo set)
+            private readonly int loadDelay;
+
+            public TestBeatmapSetCover(BeatmapSetInfo set, int loadDelay)
                 : base(set)
             {
+                this.loadDelay = loadDelay;
             }
 
             [BackgroundDependencyLoader]
             private void load()
             {
-                Thread.Sleep(10000);
+                Thread.Sleep(loadDelay);
             }
         }
     }

From 32b3ea70b966e4087d70d72f1306f55b4fa8b264 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 4 May 2021 21:12:50 +0200
Subject: [PATCH 3107/3722] Fix both covers showing if cover is not fully
 opaque

---
 osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
index 3a4423e42e..b376690436 100644
--- a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
+++ b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
@@ -41,6 +41,10 @@ namespace osu.Game.Beatmaps.Drawables
         protected override DelayedLoadWrapper CreateDelayedLoadWrapper(Func<Drawable> createContentFunc, double timeBeforeLoad)
             => new DelayedLoadUnloadWrapper(createContentFunc, timeBeforeLoad);
 
+        // by default, ModelBackedDrawable hides the old drawable only after the new one has been fully loaded.
+        // this can lead to weird appearance if the cover is not fully opaque, so fade out as soon as a new load is requested in this particular case.
+        protected override void OnLoadStarted() => ApplyHideTransforms(DisplayedDrawable);
+
         protected override Drawable CreateDrawable(BeatmapSetInfo model)
         {
             if (model == null)

From 4ceb9b1562e52475ba8da9652bd2d31501983ef3 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 4 May 2021 23:36:14 +0300
Subject: [PATCH 3108/3722] Avoid randomizing and overestimating logic with
 simple hardcoding

Not sure what was in my mind while I was pushing that..
---
 .../NonVisual/FramedReplayInputHandlerTest.cs | 40 ++++++++++++-------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
index 2062c4b820..fe1186bf95 100644
--- a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
+++ b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
-using osu.Framework.Utils;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Replays;
 
@@ -281,26 +280,39 @@ namespace osu.Game.Tests.NonVisual
         }
 
         [Test]
-        public void TestReplayFrameSortStability()
+        public void TestReplayFramesSortStability()
         {
             const double repeating_time = 5000;
 
-            int data = 0;
-
-            // 1. add a range of frames in which some of them have the constant time 5000, all without any "data".
-            // 2. randomize the frames.
-            // 3. assign "data" to each frame in ascending order.
-            replay.Frames.AddRange(Enumerable.Range(1, 250).Select(i =>
+            // add a range of frames randomized in time but have a "data" assigned to them in ascending order.
+            replay.Frames.AddRange(new[]
             {
-                if (RNG.NextBool())
-                    return new TestReplayFrame(repeating_time, true);
-                else
-                    return new TestReplayFrame(i * 1000, true);
-            }).OrderBy(_ => RNG.Next()).Select(f => new TestReplayFrame(f.Time, true, ++data)));
+                new TestReplayFrame(repeating_time, true, 0),
+                new TestReplayFrame(0, true, 1),
+                new TestReplayFrame(3000, true, 2),
+                new TestReplayFrame(repeating_time, true, 3),
+                new TestReplayFrame(repeating_time, true, 4),
+                new TestReplayFrame(6000, true, 5),
+                new TestReplayFrame(9000, true, 6),
+                new TestReplayFrame(repeating_time, true, 7),
+                new TestReplayFrame(repeating_time, true, 8),
+                new TestReplayFrame(1000, true, 9),
+                new TestReplayFrame(11000, true, 10),
+                new TestReplayFrame(21000, true, 11),
+                new TestReplayFrame(4000, true, 12),
+                new TestReplayFrame(repeating_time, true, 13),
+                new TestReplayFrame(repeating_time, true, 14),
+                new TestReplayFrame(8000, true, 15),
+                new TestReplayFrame(2000, true, 16),
+                new TestReplayFrame(7000, true, 17),
+                new TestReplayFrame(repeating_time, true, 18),
+                new TestReplayFrame(repeating_time, true, 19),
+                new TestReplayFrame(10000, true, 20),
+            });
 
             replay.HasReceivedAllFrames = true;
 
-            // create a new handler with the replay for the frames to be sorted.
+            // create a new handler with the replay for the sort to be performed.
             handler = new TestInputHandler(replay);
 
             // ensure sort stability by checking whether the "data" assigned to each time-repeated frame is in ascending order, as it was before sort.

From 45c0b74151c7f547838a98786c5859194ad3f442 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 4 May 2021 23:41:46 +0300
Subject: [PATCH 3109/3722] Use LINQ select for data assigning for simplicity

To avoid having to read through all of frames and ensure nothing is failing there
---
 .../NonVisual/FramedReplayInputHandlerTest.cs | 46 ++++++++++---------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
index fe1186bf95..a9f9dfdc83 100644
--- a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
+++ b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
@@ -284,31 +284,33 @@ namespace osu.Game.Tests.NonVisual
         {
             const double repeating_time = 5000;
 
+            int incrementingData = 0;
+
             // add a range of frames randomized in time but have a "data" assigned to them in ascending order.
             replay.Frames.AddRange(new[]
             {
-                new TestReplayFrame(repeating_time, true, 0),
-                new TestReplayFrame(0, true, 1),
-                new TestReplayFrame(3000, true, 2),
-                new TestReplayFrame(repeating_time, true, 3),
-                new TestReplayFrame(repeating_time, true, 4),
-                new TestReplayFrame(6000, true, 5),
-                new TestReplayFrame(9000, true, 6),
-                new TestReplayFrame(repeating_time, true, 7),
-                new TestReplayFrame(repeating_time, true, 8),
-                new TestReplayFrame(1000, true, 9),
-                new TestReplayFrame(11000, true, 10),
-                new TestReplayFrame(21000, true, 11),
-                new TestReplayFrame(4000, true, 12),
-                new TestReplayFrame(repeating_time, true, 13),
-                new TestReplayFrame(repeating_time, true, 14),
-                new TestReplayFrame(8000, true, 15),
-                new TestReplayFrame(2000, true, 16),
-                new TestReplayFrame(7000, true, 17),
-                new TestReplayFrame(repeating_time, true, 18),
-                new TestReplayFrame(repeating_time, true, 19),
-                new TestReplayFrame(10000, true, 20),
-            });
+                new TestReplayFrame(repeating_time, true),
+                new TestReplayFrame(0, true),
+                new TestReplayFrame(3000, true),
+                new TestReplayFrame(repeating_time, true),
+                new TestReplayFrame(repeating_time, true),
+                new TestReplayFrame(6000, true),
+                new TestReplayFrame(9000, true),
+                new TestReplayFrame(repeating_time, true),
+                new TestReplayFrame(repeating_time, true),
+                new TestReplayFrame(1000, true),
+                new TestReplayFrame(11000, true),
+                new TestReplayFrame(21000, true),
+                new TestReplayFrame(4000, true),
+                new TestReplayFrame(repeating_time, true),
+                new TestReplayFrame(repeating_time, true),
+                new TestReplayFrame(8000, true),
+                new TestReplayFrame(2000, true),
+                new TestReplayFrame(7000, true),
+                new TestReplayFrame(repeating_time, true),
+                new TestReplayFrame(repeating_time, true),
+                new TestReplayFrame(10000, true),
+            }.Select(f => new TestReplayFrame(f.Time, true, incrementingData++)));
 
             replay.HasReceivedAllFrames = true;
 

From 973475823735a94dce077f2b5e9005df9e689a69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 4 May 2021 22:48:57 +0200
Subject: [PATCH 3110/3722] Simplify test case further

---
 .../NonVisual/FramedReplayInputHandlerTest.cs | 54 +++++++++----------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
index a9f9dfdc83..a4fe2172e1 100644
--- a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
+++ b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
@@ -284,33 +284,31 @@ namespace osu.Game.Tests.NonVisual
         {
             const double repeating_time = 5000;
 
-            int incrementingData = 0;
-
             // add a range of frames randomized in time but have a "data" assigned to them in ascending order.
             replay.Frames.AddRange(new[]
             {
-                new TestReplayFrame(repeating_time, true),
-                new TestReplayFrame(0, true),
-                new TestReplayFrame(3000, true),
-                new TestReplayFrame(repeating_time, true),
-                new TestReplayFrame(repeating_time, true),
-                new TestReplayFrame(6000, true),
-                new TestReplayFrame(9000, true),
-                new TestReplayFrame(repeating_time, true),
-                new TestReplayFrame(repeating_time, true),
-                new TestReplayFrame(1000, true),
-                new TestReplayFrame(11000, true),
-                new TestReplayFrame(21000, true),
-                new TestReplayFrame(4000, true),
-                new TestReplayFrame(repeating_time, true),
-                new TestReplayFrame(repeating_time, true),
-                new TestReplayFrame(8000, true),
-                new TestReplayFrame(2000, true),
-                new TestReplayFrame(7000, true),
-                new TestReplayFrame(repeating_time, true),
-                new TestReplayFrame(repeating_time, true),
-                new TestReplayFrame(10000, true),
-            }.Select(f => new TestReplayFrame(f.Time, true, incrementingData++)));
+                repeating_time,
+                0,
+                3000,
+                repeating_time,
+                repeating_time,
+                6000,
+                9000,
+                repeating_time,
+                repeating_time,
+                1000,
+                11000,
+                21000,
+                4000,
+                repeating_time,
+                repeating_time,
+                8000,
+                2000,
+                7000,
+                repeating_time,
+                repeating_time,
+                10000
+            }.Select((time, index) => new TestReplayFrame(time, true, index)));
 
             replay.HasReceivedAllFrames = true;
 
@@ -321,7 +319,7 @@ namespace osu.Game.Tests.NonVisual
             var repeatingTimeFramesData = replay.Frames
                                                 .Cast<TestReplayFrame>()
                                                 .Where(f => f.Time == repeating_time)
-                                                .Select(f => f.Data);
+                                                .Select(f => f.FrameIndex);
 
             Assert.That(repeatingTimeFramesData, Is.Ordered.Ascending);
         }
@@ -372,13 +370,13 @@ namespace osu.Game.Tests.NonVisual
         private class TestReplayFrame : ReplayFrame
         {
             public readonly bool IsImportant;
-            public readonly int Data;
+            public readonly int FrameIndex;
 
-            public TestReplayFrame(double time, bool isImportant = false, int data = 0)
+            public TestReplayFrame(double time, bool isImportant = false, int frameIndex = 0)
                 : base(time)
             {
                 IsImportant = isImportant;
-                Data = data;
+                FrameIndex = frameIndex;
             }
         }
 

From f7d9fb094e8d764e01948a6a8104e6a5f8adc2d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 4 May 2021 22:59:10 +0200
Subject: [PATCH 3111/3722] Reword & clarify comments

---
 osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
index a4fe2172e1..407dec936b 100644
--- a/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
+++ b/osu.Game.Tests/NonVisual/FramedReplayInputHandlerTest.cs
@@ -284,7 +284,10 @@ namespace osu.Game.Tests.NonVisual
         {
             const double repeating_time = 5000;
 
-            // add a range of frames randomized in time but have a "data" assigned to them in ascending order.
+            // add a collection of frames in shuffled order time-wise; each frame also stores its original index to check stability later.
+            // data is hand-picked and breaks if the unstable List<T>.Sort() is used.
+            // in theory this can still return a false-positive with another unstable algorithm if extremely unlucky,
+            // but there is no conceivable fool-proof way to prevent that anyways.
             replay.Frames.AddRange(new[]
             {
                 repeating_time,
@@ -315,7 +318,7 @@ namespace osu.Game.Tests.NonVisual
             // create a new handler with the replay for the sort to be performed.
             handler = new TestInputHandler(replay);
 
-            // ensure sort stability by checking whether the "data" assigned to each time-repeated frame is in ascending order, as it was before sort.
+            // ensure sort stability by checking that the frames with time == repeating_time are sorted in ascending frame index order themselves.
             var repeatingTimeFramesData = replay.Frames
                                                 .Cast<TestReplayFrame>()
                                                 .Where(f => f.Time == repeating_time)

From 23b9d8c260058df9da31790b981ba50504b8aa5a Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 4 May 2021 14:02:12 -0700
Subject: [PATCH 3112/3722] Fix alpha not being zero when string is set to
 empty and use inequality on supporter condition
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>
---
 .../Settings/Sections/UserInterface/MainMenuSettings.cs         | 2 +-
 osu.Game/Overlays/Settings/SettingsItem.cs                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs b/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
index 707f8cd314..b5ab6d2f60 100644
--- a/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Overlays.Settings.Sections.UserInterface
             {
                 const string not_supporter_note = "Changes to this setting will only apply with an active osu!supporter tag.";
 
-                backgroundSourceDropdown.NoteText = user.Value?.IsSupporter == false ? not_supporter_note : string.Empty;
+                backgroundSourceDropdown.NoteText = user.Value?.IsSupporter != true ? not_supporter_note : string.Empty;
             }, true);
         }
     }
diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index 6405431f6b..c6f17cfc23 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Overlays.Settings
         {
             set
             {
-                noteText.Alpha = 1;
+                noteText.Alpha = string.IsNullOrWhiteSpace(value) ? 0 : 1;
                 noteText.Text = value;
             }
         }

From 12c1ded7a8f3c6c6e76cee5125d15a57530e70f7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 5 May 2021 00:28:49 +0300
Subject: [PATCH 3113/3722] Fix test scene broken on master

---
 osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
index efcd7864d7..e383aa8008 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Tests.Visual.Editing
                 {
                     selectionBox = new SelectionBox
                     {
+                        RelativeSizeAxes = Axes.Both,
+
                         CanRotate = true,
                         CanScaleX = true,
                         CanScaleY = true,

From 1472960319ecdd6f4627bdfd7aff9896b6bdcfe1 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Tue, 4 May 2021 21:35:36 -0400
Subject: [PATCH 3114/3722] Hide and disable skip outro overlay on rewind

---
 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 cf26bc479a..88e617245b 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -598,6 +598,7 @@ namespace osu.Game.Screens.Play
                 completionProgressDelegate?.Cancel();
                 completionProgressDelegate = null;
                 ValidForResume = true;
+                skipOutroOverlay.Hide();
                 return;
             }
 

From 1d4a8bc0ae9df6ea3b796974953c6b903ddb1f5c Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Tue, 4 May 2021 22:23:36 -0400
Subject: [PATCH 3115/3722] Add visual test for rewinding

---
 .../Visual/Gameplay/TestSceneStoryboardWithOutro.cs      | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
index 8326063f81..3229716b7e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
@@ -116,6 +116,15 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("wait for score shown", () => Player.IsScoreShown);
         }
 
+        [Test]
+        public void TestStoryboardRewind()
+        {
+            CreateTest(null);
+            AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
+            AddStep("rewind", () => Player.GameplayClockContainer.Seek(-1000));
+            AddUntilStep("storyboard ends", () => Player.GameplayClockContainer.GameplayClock.CurrentTime >= currentStoryboardDuration);
+        }
+
         protected override bool AllowFail => true;
 
         protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();

From 6178f38c95277c91e2a07cb0766d9a33318d24aa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 May 2021 16:15:06 +0900
Subject: [PATCH 3116/3722] Reword unlimited frame rate warning a bit

---
 .../Overlays/Settings/Sections/Graphics/RendererSettings.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
index 3ad201640d..c42db1706f 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
 
             frameLimiterDropdown.Current.BindValueChanged(limit =>
             {
-                const string unlimited_frames_note = "Using unlimited frame limiter can lead to stutters. \"2x refresh rate\" is recommended.";
+                const string unlimited_frames_note = "Using unlimited frame limiter can lead to stutters, bad performance and overheating. It will not improve perceived latency. \"2x refresh rate\" is recommended.";
 
                 frameLimiterDropdown.NoteText = limit.NewValue == FrameSync.Unlimited ? unlimited_frames_note : string.Empty;
             }, true);

From 1288f69fada2d8457b2e21bd9341ff517ab72c58 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 May 2021 16:16:02 +0900
Subject: [PATCH 3117/3722] Rename to `WarningText`

---
 .../Settings/Sections/Graphics/LayoutSettings.cs   |  2 +-
 .../Settings/Sections/Graphics/RendererSettings.cs |  2 +-
 .../Sections/UserInterface/MainMenuSettings.cs     |  2 +-
 osu.Game/Overlays/Settings/SettingsItem.cs         | 14 +++++++-------
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index a24dd1f64b..937bcc8abf 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -147,7 +147,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
 
                 const string not_fullscreen_note = "Running without fullscreen mode will increase your input latency!";
 
-                windowModeDropdown.NoteText = mode.NewValue != WindowMode.Fullscreen ? not_fullscreen_note : string.Empty;
+                windowModeDropdown.WarningText = mode.NewValue != WindowMode.Fullscreen ? not_fullscreen_note : string.Empty;
             }, true);
 
             windowModes.BindCollectionChanged((sender, args) =>
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
index c42db1706f..70225ff6b8 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
             {
                 const string unlimited_frames_note = "Using unlimited frame limiter can lead to stutters, bad performance and overheating. It will not improve perceived latency. \"2x refresh rate\" is recommended.";
 
-                frameLimiterDropdown.NoteText = limit.NewValue == FrameSync.Unlimited ? unlimited_frames_note : string.Empty;
+                frameLimiterDropdown.WarningText = limit.NewValue == FrameSync.Unlimited ? unlimited_frames_note : string.Empty;
             }, true);
         }
     }
diff --git a/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs b/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
index b5ab6d2f60..7c4c88f344 100644
--- a/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Overlays.Settings.Sections.UserInterface
             {
                 const string not_supporter_note = "Changes to this setting will only apply with an active osu!supporter tag.";
 
-                backgroundSourceDropdown.NoteText = user.Value?.IsSupporter != true ? not_supporter_note : string.Empty;
+                backgroundSourceDropdown.WarningText = user.Value?.IsSupporter != true ? not_supporter_note : string.Empty;
             }, true);
         }
     }
diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index c6f17cfc23..f4d7c72b7f 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Overlays.Settings
 
         private SpriteText labelText;
 
-        private readonly OsuTextFlowContainer noteText;
+        private readonly OsuTextFlowContainer warningText;
 
         public bool ShowsDefaultIndicator = true;
 
@@ -61,14 +61,14 @@ namespace osu.Game.Overlays.Settings
 
         /// <summary>
         /// Text to be displayed at the bottom of this <see cref="SettingsItem{T}"/>.
-        /// Used for further explanation or indicating drawbacks of the current setting.
+        /// Generally used to recommend the user change their setting as the current one is considered sub-optimal.
         /// </summary>
-        public string NoteText
+        public string WarningText
         {
             set
             {
-                noteText.Alpha = string.IsNullOrWhiteSpace(value) ? 0 : 1;
-                noteText.Text = value;
+                warningText.Alpha = string.IsNullOrWhiteSpace(value) ? 0 : 1;
+                warningText.Text = value;
             }
         }
 
@@ -110,7 +110,7 @@ namespace osu.Game.Overlays.Settings
                     Children = new[]
                     {
                         Control = CreateControl(),
-                        noteText = new OsuTextFlowContainer
+                        warningText = new OsuTextFlowContainer
                         {
                             RelativeSizeAxes = Axes.X,
                             AutoSizeAxes = Axes.Y,
@@ -135,7 +135,7 @@ namespace osu.Game.Overlays.Settings
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            noteText.Colour = colours.Yellow;
+            warningText.Colour = colours.Yellow;
         }
 
         private void updateDisabled()

From 19ffcd00c27d04ce184f16cd55f141c803dfd011 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 May 2021 16:19:06 +0900
Subject: [PATCH 3118/3722] Initialise warning text flow lazily as most items
 will not use it

---
 osu.Game/Overlays/Settings/SettingsItem.cs | 29 ++++++++++++----------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index f4d7c72b7f..09e458ad7e 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -36,12 +36,15 @@ namespace osu.Game.Overlays.Settings
 
         private SpriteText labelText;
 
-        private readonly OsuTextFlowContainer warningText;
+        private OsuTextFlowContainer warningText;
 
         public bool ShowsDefaultIndicator = true;
 
         public string TooltipText { get; set; }
 
+        [Resolved]
+        private OsuColour colours { get; set; }
+
         public virtual LocalisableString LabelText
         {
             get => labelText?.Text ?? string.Empty;
@@ -67,6 +70,18 @@ namespace osu.Game.Overlays.Settings
         {
             set
             {
+                if (warningText == null)
+                {
+                    // construct lazily for cases where the label is not needed (may be provided by the Control).
+                    FlowContent.Add(warningText = new OsuTextFlowContainer
+                    {
+                        Colour = colours.Yellow,
+                        Margin = new MarginPadding { Bottom = 5 },
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                    });
+                }
+
                 warningText.Alpha = string.IsNullOrWhiteSpace(value) ? 0 : 1;
                 warningText.Text = value;
             }
@@ -110,12 +125,6 @@ namespace osu.Game.Overlays.Settings
                     Children = new[]
                     {
                         Control = CreateControl(),
-                        warningText = new OsuTextFlowContainer
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                            Alpha = 0,
-                        },
                     },
                 },
             };
@@ -132,12 +141,6 @@ namespace osu.Game.Overlays.Settings
             }
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            warningText.Colour = colours.Yellow;
-        }
-
         private void updateDisabled()
         {
             if (labelText != null)

From 08a45e9fc29d37b686a8430db7c37aab39894c00 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 May 2021 16:26:34 +0900
Subject: [PATCH 3119/3722] Remove dead code

---
 osu.Game/Overlays/Settings/SettingsItem.cs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index 09e458ad7e..86a836d29b 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -230,12 +230,6 @@ namespace osu.Game.Overlays.Settings
                 UpdateState();
             }
 
-            public void SetButtonColour(Color4 buttonColour)
-            {
-                this.buttonColour = buttonColour;
-                UpdateState();
-            }
-
             public void UpdateState() => Scheduler.AddOnce(updateState);
 
             private void updateState()

From 3cc9bad97968f220fc475f657f0189eb524b3f8a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 May 2021 17:49:33 +0900
Subject: [PATCH 3120/3722] Actually check for correct state of fade content in
 rewind test

---
 .../Visual/Gameplay/TestSceneStoryboardWithOutro.cs       | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
index 3229716b7e..4138a81ebd 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Graphics;
@@ -119,9 +120,16 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestStoryboardRewind()
         {
+            SkipOverlay.FadeContainer fadeContainer() => Player.ChildrenOfType<SkipOverlay.FadeContainer>().First();
+
             CreateTest(null);
             AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
+            AddUntilStep("skip overlay content becomes visible", () => fadeContainer().State == Visibility.Visible);
+
             AddStep("rewind", () => Player.GameplayClockContainer.Seek(-1000));
+            AddUntilStep("skip overlay content not visible", () => fadeContainer().State == Visibility.Hidden);
+
+            AddUntilStep("skip overlay content becomes visible", () => fadeContainer().State == Visibility.Visible);
             AddUntilStep("storyboard ends", () => Player.GameplayClockContainer.GameplayClock.CurrentTime >= currentStoryboardDuration);
         }
 

From 9ec3255c505e99a826b3eba40f86f80829502562 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 May 2021 17:50:25 +0900
Subject: [PATCH 3121/3722] Fix `SkipOverlay`'s `FadeContent` not getting
 correct state from parent

---
 osu.Game/Screens/Play/SkipOverlay.cs | 30 +++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Play/SkipOverlay.cs b/osu.Game/Screens/Play/SkipOverlay.cs
index ddb78dfb67..ed49fc40b2 100644
--- a/osu.Game/Screens/Play/SkipOverlay.cs
+++ b/osu.Game/Screens/Play/SkipOverlay.cs
@@ -8,19 +8,19 @@ using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
 using osu.Framework.Threading;
+using osu.Framework.Utils;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Input.Bindings;
 using osu.Game.Screens.Ranking;
 using osuTK;
 using osuTK.Graphics;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.Sprites;
-using osu.Game.Graphics.Containers;
-using osu.Framework.Input.Bindings;
-using osu.Framework.Input.Events;
-using osu.Framework.Utils;
-using osu.Game.Input.Bindings;
 
 namespace osu.Game.Screens.Play
 {
@@ -92,6 +92,18 @@ namespace osu.Game.Screens.Play
 
         private double fadeOutBeginTime => startTime - MasterGameplayClockContainer.MINIMUM_SKIP_TIME;
 
+        public override void Hide()
+        {
+            base.Hide();
+            fadeContainer.Hide();
+        }
+
+        public override void Show()
+        {
+            base.Show();
+            fadeContainer.Show();
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -147,7 +159,7 @@ namespace osu.Game.Screens.Play
         {
         }
 
-        private class FadeContainer : Container, IStateful<Visibility>
+        public class FadeContainer : Container, IStateful<Visibility>
         {
             public event Action<Visibility> StateChanged;
 
@@ -170,7 +182,7 @@ namespace osu.Game.Screens.Play
                     switch (state)
                     {
                         case Visibility.Visible:
-                            // we may be triggered to become visible mnultiple times but we only want to transform once.
+                            // we may be triggered to become visible multiple times but we only want to transform once.
                             if (stateChanged)
                                 this.FadeIn(500, Easing.OutExpo);
 

From 377af38d94541c48cab0d7083cae089b28916f20 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 May 2021 17:59:49 +0900
Subject: [PATCH 3122/3722] Remove unnecessary pixelSnapping parameter

This was only required because there was text being rendered to the
`BufferedContainer` content until now. Removing this should allow for
better resolution in the background display (due to using a better
minify scale mode).
---
 osu.Game/Screens/Select/BeatmapInfoWedgeBackground.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeBackground.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeBackground.cs
index 566f49a799..0233112c69 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeBackground.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeBackground.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Screens.Select
         {
             RelativeSizeAxes = Axes.Both;
 
-            InternalChild = new BufferedContainer(pixelSnapping: true)
+            InternalChild = new BufferedContainer()
             {
                 CacheDrawnFrameBuffer = true,
                 RelativeSizeAxes = Axes.Both,

From 1410b8f36dce587d91b030bfe5b4736828bb074b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 May 2021 18:30:57 +0900
Subject: [PATCH 3123/3722] Fix follow points displaying at incorrect locations
 when dragging a slider out-of-bounds

---
 .../Objects/Drawables/Connections/FollowPointConnection.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
index 5541d0e790..cda4715280 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
             Entry = null;
         }
 
-        private void onEntryInvalidated() => refreshPoints();
+        private void onEntryInvalidated() => Scheduler.AddOnce(refreshPoints);
 
         private void refreshPoints()
         {

From cf6ed7a7cf5bac2d8d8d463a1672b7318bd0b3d1 Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Wed, 5 May 2021 13:13:37 +0200
Subject: [PATCH 3124/3722] Refactored out changes in StarRatingDisplay

---
 .../Ranking/Expanded/StarRatingDisplay.cs     | 145 +++++++-----------
 osu.Game/Screens/Select/BeatmapInfoWedge.cs   |  68 ++++----
 .../Select/BeatmapInfoWedgeBackground.cs      |   2 +-
 3 files changed, 97 insertions(+), 118 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
index 748f58e430..f7e50fdc8a 100644
--- a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
@@ -22,22 +22,7 @@ namespace osu.Game.Screens.Ranking.Expanded
     /// </summary>
     public class StarRatingDisplay : CompositeDrawable
     {
-        [Resolved]
-        private OsuColour colours { get; set; }
-
-        private CircularContainer colorContainer;
-        private StarDifficulty starDifficulty;
-        private FillFlowContainer foregroundContainer;
-
-        public StarDifficulty StarDifficulty
-        {
-            get => starDifficulty;
-            set
-            {
-                starDifficulty = value;
-                setDifficulty(starDifficulty);
-            }
-        }
+        private readonly StarDifficulty difficulty;
 
         /// <summary>
         /// Creates a new <see cref="StarRatingDisplay"/> using an already computed <see cref="StarDifficulty"/>.
@@ -45,94 +30,78 @@ namespace osu.Game.Screens.Ranking.Expanded
         /// <param name="starDifficulty">The already computed <see cref="StarDifficulty"/> to display the star difficulty of.</param>
         public StarRatingDisplay(StarDifficulty starDifficulty)
         {
-            this.starDifficulty = starDifficulty;
-        }
-
-        private void setDifficulty(StarDifficulty difficulty)
-        {
-            colorContainer.FadeColour(getDifficultyColour(difficulty), 250);
-
-            foregroundContainer.Expire();
-            foregroundContainer = null;
-            AddInternal(foregroundContainer = createForegroundContainer(difficulty));
+            difficulty = starDifficulty;
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(OsuColour colours, BeatmapDifficultyCache difficultyCache)
         {
             AutoSizeAxes = Axes.Both;
 
-            InternalChildren = new Drawable[]
-            {
-                colorContainer = new CircularContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Masking = true,
-                    Colour = getDifficultyColour(starDifficulty),
-                    Children = new Drawable[]
-                    {
-                        new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                        },
-                    }
-                },
-                foregroundContainer = createForegroundContainer(starDifficulty),
-            };
-        }
-
-        private ColourInfo getDifficultyColour(StarDifficulty difficulty)
-        {
-            return difficulty.DifficultyRating == DifficultyRating.ExpertPlus
-                ? ColourInfo.GradientVertical(Color4Extensions.FromHex("#C1C1C1"), Color4Extensions.FromHex("#595959"))
-                : (ColourInfo)colours.ForDifficultyRating(difficulty.DifficultyRating);
-        }
-
-        private FillFlowContainer createForegroundContainer(StarDifficulty difficulty)
-        {
             var starRatingParts = difficulty.Stars.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
             string wholePart = starRatingParts[0];
             string fractionPart = starRatingParts[1];
             string separator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
 
-            return new FillFlowContainer
+            ColourInfo backgroundColour = difficulty.DifficultyRating == DifficultyRating.ExpertPlus
+                ? ColourInfo.GradientVertical(Color4Extensions.FromHex("#C1C1C1"), Color4Extensions.FromHex("#595959"))
+                : (ColourInfo)colours.ForDifficultyRating(difficulty.DifficultyRating);
+
+            InternalChildren = new Drawable[]
             {
-                AutoSizeAxes = Axes.Both,
-                Padding = new MarginPadding { Horizontal = 8, Vertical = 4 },
-                Direction = FillDirection.Horizontal,
-                Spacing = new Vector2(2, 0),
-                Children = new Drawable[]
+                new CircularContainer
                 {
-                    new SpriteIcon
+                    RelativeSizeAxes = Axes.Both,
+                    Masking = true,
+                    Children = new Drawable[]
                     {
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                        Size = new Vector2(7),
-                        Icon = FontAwesome.Solid.Star,
-                        Colour = Color4.Black
-                    },
-                    new OsuTextFlowContainer(s => s.Font = OsuFont.Numeric.With(weight: FontWeight.Black))
-                    {
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                        AutoSizeAxes = Axes.Both,
-                        Direction = FillDirection.Horizontal,
-                        TextAnchor = Anchor.BottomLeft,
-                    }.With(t =>
-                    {
-                        t.AddText($"{wholePart}", s =>
+                        new Box
                         {
-                            s.Colour = Color4.Black;
-                            s.Font = s.Font.With(size: 14);
-                            s.UseFullGlyphHeight = false;
-                        });
-                        t.AddText($"{separator}{fractionPart}", s =>
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = backgroundColour
+                        },
+                    }
+                },
+                new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Padding = new MarginPadding { Horizontal = 8, Vertical = 4 },
+                    Direction = FillDirection.Horizontal,
+                    Spacing = new Vector2(2, 0),
+                    Children = new Drawable[]
+                    {
+                        new SpriteIcon
                         {
-                            s.Colour = Color4.Black;
-                            s.Font = s.Font.With(size: 7);
-                            s.UseFullGlyphHeight = false;
-                        });
-                    }),
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                            Size = new Vector2(7),
+                            Icon = FontAwesome.Solid.Star,
+                            Colour = Color4.Black
+                        },
+                        new OsuTextFlowContainer(s => s.Font = OsuFont.Numeric.With(weight: FontWeight.Black))
+                        {
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                            AutoSizeAxes = Axes.Both,
+                            Direction = FillDirection.Horizontal,
+                            TextAnchor = Anchor.BottomLeft,
+                        }.With(t =>
+                        {
+                            t.AddText($"{wholePart}", s =>
+                            {
+                                s.Colour = Color4.Black;
+                                s.Font = s.Font.With(size: 14);
+                                s.UseFullGlyphHeight = false;
+                            });
+
+                            t.AddText($"{separator}{fractionPart}", s =>
+                            {
+                                s.Colour = Color4.Black;
+                                s.Font = s.Font.With(size: 7);
+                                s.UseFullGlyphHeight = false;
+                            });
+                        })
+                    }
                 }
             };
         }
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index cb5a276a5d..04063d5819 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -173,7 +173,7 @@ namespace osu.Game.Screens.Select
             private ILocalisedBindableString titleBinding;
             private ILocalisedBindableString artistBinding;
             private FillFlowContainer infoLabelContainer;
-            private StarRatingDisplay starRatingDisplay;
+            private Container topRightMetadataContainer;
             private Container bpmLabelContainer;
             private ModSettingChangeTracker settingChangeTracker;
             private CancellationTokenSource cancellationTokenSource;
@@ -232,34 +232,15 @@ namespace osu.Game.Screens.Select
                             },
                         }
                     },
-                    new FillFlowContainer
+                    topRightMetadataContainer = new Container
                     {
                         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,
-                        Children = new Drawable[]
-                        {
-                            starRatingDisplay = new StarRatingDisplay(starDifficulty.Value ?? new StarDifficulty())
-                            {
-                                Anchor = Anchor.TopRight,
-                                Origin = Anchor.TopRight,
-                                Shear = -wedged_container_shear,
-                                Margin = new MarginPadding { Bottom = 5 }
-                            },
-                            StatusPill = new BeatmapSetOnlineStatusPill
-                            {
-                                Anchor = Anchor.TopRight,
-                                Origin = Anchor.TopRight,
-                                Shear = -wedged_container_shear,
-                                TextSize = 11,
-                                TextPadding = new MarginPadding { Horizontal = 8, Vertical = 2 },
-                                Status = beatmapInfo.Status,
-                            }
-                        }
+                        Child = createTopRightMetadataContainer(beatmapInfo, starDifficulty.Value ?? new StarDifficulty())
                     },
                     new FillFlowContainer
                     {
@@ -306,21 +287,50 @@ namespace osu.Game.Screens.Select
 
                 titleBinding.BindValueChanged(_ => setMetadata(metadata.Source));
                 artistBinding.BindValueChanged(_ => setMetadata(metadata.Source), true);
-                starDifficulty.BindValueChanged(updateStarRatingDisplay, true);
+                starDifficulty.BindValueChanged(updateTopRightMetadata, true);
 
                 // no difficulty means it can't have a status to show
                 if (beatmapInfo.Version == null)
                     StatusPill.Hide();
             }
 
-            private void updateStarRatingDisplay(ValueChangedEvent<StarDifficulty?> valueChanged)
+            private void updateTopRightMetadata(ValueChangedEvent<StarDifficulty?> valueChanged)
             {
-                if (valueChanged.NewValue.HasValue && valueChanged.NewValue.Value.Stars > 0)
-                    starRatingDisplay.Show();
-                else
-                    starRatingDisplay.Hide();
+                topRightMetadataContainer.Child.FadeOut(250);
+                topRightMetadataContainer.Child.Expire();
+                topRightMetadataContainer.Child = createTopRightMetadataContainer(beatmap.BeatmapInfo, valueChanged.NewValue ?? new StarDifficulty());
+            }
 
-                starRatingDisplay.StarDifficulty = valueChanged.NewValue ?? new StarDifficulty();
+            private FillFlowContainer createTopRightMetadataContainer(BeatmapInfo beatmapInfo, StarDifficulty difficulty)
+            {
+                var container = new FillFlowContainer
+                {
+                    Direction = FillDirection.Vertical,
+                    AutoSizeAxes = Axes.Both,
+                };
+
+                if (difficulty.Stars > 0)
+                {
+                    container.Add(new StarRatingDisplay(difficulty)
+                    {
+                        Anchor = Anchor.TopRight,
+                        Origin = Anchor.TopRight,
+                        Shear = -wedged_container_shear,
+                        Margin = new MarginPadding { Bottom = 5 }
+                    });
+                }
+
+                container.Add(StatusPill = new BeatmapSetOnlineStatusPill
+                {
+                    Anchor = Anchor.TopRight,
+                    Origin = Anchor.TopRight,
+                    Shear = -wedged_container_shear,
+                    TextSize = 11,
+                    TextPadding = new MarginPadding { Horizontal = 8, Vertical = 2 },
+                    Status = beatmapInfo.Status,
+                });
+
+                return container;
             }
 
             private void refreshModInformation(ValueChangedEvent<IReadOnlyList<Mod>> modsChangedEvent)
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedgeBackground.cs b/osu.Game/Screens/Select/BeatmapInfoWedgeBackground.cs
index 0233112c69..f50fb4dc8a 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedgeBackground.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedgeBackground.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Screens.Select
         {
             RelativeSizeAxes = Axes.Both;
 
-            InternalChild = new BufferedContainer()
+            InternalChild = new BufferedContainer
             {
                 CacheDrawnFrameBuffer = true,
                 RelativeSizeAxes = Axes.Both,

From 4ef901d08d51e586e447f831821463150d14229c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 May 2021 21:07:49 +0900
Subject: [PATCH 3125/3722] Remove unnecessary redirection property to
 `Container.Info`

---
 osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs | 4 ++--
 osu.Game/Screens/Select/BeatmapInfoWedge.cs                   | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
index 688cc9a035..ec19f00087 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
@@ -193,9 +193,9 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private class TestBeatmapInfoWedge : BeatmapInfoWedge
         {
-            public new WedgeInfoText Info => base.Info;
-
             public new BeatmapInfoWedgeContainer Container => base.Container;
+
+            public WedgeInfoText Info => base.Container.Info;
         }
 
         private class TestHitObject : ConvertHitObject, IHasPosition
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 04063d5819..c86bdc99ff 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -41,7 +41,6 @@ namespace osu.Game.Screens.Select
         private IBindable<RulesetInfo> ruleset { get; set; }
 
         protected BeatmapInfoWedgeContainer Container;
-        protected WedgeInfoText Info => Container.Info;
 
         public BeatmapInfoWedge()
         {

From 5049e2fbf9bf709df1f4b2614ef80c11e8f5d31e Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Wed, 5 May 2021 15:11:38 +0200
Subject: [PATCH 3126/3722] Refactored out changes in DifficultyColourBar

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 66 +++++++++------------
 1 file changed, 27 insertions(+), 39 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index c86bdc99ff..448bf088dc 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -174,6 +174,7 @@ namespace osu.Game.Screens.Select
             private FillFlowContainer infoLabelContainer;
             private Container topRightMetadataContainer;
             private Container bpmLabelContainer;
+            private Container difficultyColourBarContainer;
             private ModSettingChangeTracker settingChangeTracker;
             private CancellationTokenSource cancellationTokenSource;
             private IBindable<StarDifficulty?> starDifficulty;
@@ -206,10 +207,11 @@ namespace osu.Game.Screens.Select
 
                 Children = new Drawable[]
                 {
-                    new DifficultyColourBar(beatmapInfo)
+                    difficultyColourBarContainer = new Container
                     {
                         RelativeSizeAxes = Axes.Y,
                         Width = 20,
+                        Child = createDifficultyColourBar(starDifficulty.Value ?? new StarDifficulty()),
                     },
                     new FillFlowContainer
                     {
@@ -286,20 +288,32 @@ namespace osu.Game.Screens.Select
 
                 titleBinding.BindValueChanged(_ => setMetadata(metadata.Source));
                 artistBinding.BindValueChanged(_ => setMetadata(metadata.Source), true);
-                starDifficulty.BindValueChanged(updateTopRightMetadata, true);
+                starDifficulty.BindValueChanged(updateDifficulty, true);
 
                 // no difficulty means it can't have a status to show
                 if (beatmapInfo.Version == null)
                     StatusPill.Hide();
             }
 
-            private void updateTopRightMetadata(ValueChangedEvent<StarDifficulty?> valueChanged)
+            private void updateDifficulty(ValueChangedEvent<StarDifficulty?> valueChanged)
             {
+                var difficulty = valueChanged.NewValue ?? new StarDifficulty();
+
                 topRightMetadataContainer.Child.FadeOut(250);
                 topRightMetadataContainer.Child.Expire();
-                topRightMetadataContainer.Child = createTopRightMetadataContainer(beatmap.BeatmapInfo, valueChanged.NewValue ?? new StarDifficulty());
+                topRightMetadataContainer.Child = createTopRightMetadataContainer(beatmap.BeatmapInfo, difficulty);
+
+                difficultyColourBarContainer.Child.Expire();
+                difficultyColourBarContainer.Child = createDifficultyColourBar(difficulty);
             }
 
+            private DifficultyColourBar createDifficultyColourBar(StarDifficulty difficulty)
+                => new DifficultyColourBar(difficulty)
+                {
+                    RelativeSizeAxes = Axes.Y,
+                    Width = 20,
+                };
+
             private FillFlowContainer createTopRightMetadataContainer(BeatmapInfo beatmapInfo, StarDifficulty difficulty)
             {
                 var container = new FillFlowContainer
@@ -515,64 +529,38 @@ namespace osu.Game.Screens.Select
 
             private class DifficultyColourBar : Container
             {
-                [Resolved]
-                private OsuColour colours { get; set; }
+                private readonly StarDifficulty difficulty;
 
-                private Box solidDifficultyBox;
-                private Box transparentDifficultyBox;
-                private CancellationTokenSource cancellationTokenSource;
-                private IBindable<StarDifficulty?> starDifficulty;
-
-                private readonly BeatmapInfo beatmapInfo;
-
-                public DifficultyColourBar(BeatmapInfo beatmapInfo)
+                public DifficultyColourBar(StarDifficulty difficulty)
                 {
-                    this.beatmapInfo = beatmapInfo;
+                    this.difficulty = difficulty;
                 }
 
                 [BackgroundDependencyLoader]
-                private void load(BeatmapDifficultyCache difficultyCache)
+                private void load(OsuColour colours)
                 {
                     const float full_opacity_ratio = 0.7f;
 
-                    cancellationTokenSource?.Cancel();
-                    cancellationTokenSource = new CancellationTokenSource();
-
-                    starDifficulty?.UnbindAll();
-                    starDifficulty = difficultyCache.GetBindableDifficulty(beatmapInfo, cancellationTokenSource.Token);
+                    var difficultyColour = colours.ForDifficultyRating(difficulty.DifficultyRating);
 
                     Children = new Drawable[]
                     {
-                        solidDifficultyBox = new Box
+                        new Box
                         {
                             RelativeSizeAxes = Axes.Both,
+                            Colour = difficultyColour,
                             Width = full_opacity_ratio,
                         },
-                        transparentDifficultyBox = new Box
+                        new Box
                         {
                             RelativeSizeAxes = Axes.Both,
                             RelativePositionAxes = Axes.Both,
+                            Colour = difficultyColour,
                             Alpha = 0.5f,
                             X = full_opacity_ratio,
                             Width = 1 - full_opacity_ratio,
                         }
                     };
-
-                    starDifficulty.BindValueChanged(setColour, true);
-                }
-
-                private void setColour(ValueChangedEvent<StarDifficulty?> valueChanged)
-                {
-                    var difficultyColour = colours.ForDifficultyRating(valueChanged.NewValue?.DifficultyRating ?? (new StarDifficulty()).DifficultyRating);
-
-                    solidDifficultyBox.Colour = difficultyColour;
-                    transparentDifficultyBox.Colour = difficultyColour;
-                }
-
-                protected override void Dispose(bool isDisposing)
-                {
-                    base.Dispose(isDisposing);
-                    cancellationTokenSource?.Cancel();
                 }
             }
         }

From 88506a51dd95ec070457889ad6c89b96ca777720 Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Wed, 5 May 2021 17:51:29 +0200
Subject: [PATCH 3127/3722] reduced complexity

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 75 ++++++++++-----------
 1 file changed, 34 insertions(+), 41 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 448bf088dc..475a547c27 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -233,15 +233,35 @@ namespace osu.Game.Screens.Select
                             },
                         }
                     },
-                    topRightMetadataContainer = new Container
+                    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,
-                        Child = createTopRightMetadataContainer(beatmapInfo, starDifficulty.Value ?? new StarDifficulty())
+                        Children = new Drawable[]
+                        {
+                            starRatingContainer = new Container
+                            {
+                                AutoSizeAxes = Axes.Both,
+                                Anchor = Anchor.TopRight,
+                                Origin = Anchor.TopRight,
+                                Shear = -wedged_container_shear,
+                                Margin = new MarginPadding { Bottom = 5 }
+                            },
+                            StatusPill = new BeatmapSetOnlineStatusPill
+                            {
+                                Anchor = Anchor.TopRight,
+                                Origin = Anchor.TopRight,
+                                Shear = -wedged_container_shear,
+                                TextSize = 11,
+                                TextPadding = new MarginPadding { Horizontal = 8, Vertical = 2 },
+                                Status = beatmapInfo.Status,
+                            }
+                        }
                     },
                     new FillFlowContainer
                     {
@@ -299,51 +319,24 @@ namespace osu.Game.Screens.Select
             {
                 var difficulty = valueChanged.NewValue ?? new StarDifficulty();
 
-                topRightMetadataContainer.Child.FadeOut(250);
-                topRightMetadataContainer.Child.Expire();
-                topRightMetadataContainer.Child = createTopRightMetadataContainer(beatmap.BeatmapInfo, difficulty);
+                if (starRatingContainer.Children.Count > 0)
+                {
+                    starRatingContainer.Child.FadeOut(250);
+                    starRatingContainer.Child.Expire();
+                }
 
-                difficultyColourBarContainer.Child.Expire();
-                difficultyColourBarContainer.Child = createDifficultyColourBar(difficulty);
-            }
+                starRatingContainer.Child = difficulty.Stars > 0 ? new StarRatingDisplay(difficulty) : Empty();
 
-            private DifficultyColourBar createDifficultyColourBar(StarDifficulty difficulty)
-                => new DifficultyColourBar(difficulty)
+                if (difficultyColourBarContainer.Children.Count > 0)
+                {
+                    difficultyColourBarContainer.Child.Expire();
+                }
+
+                difficultyColourBarContainer.Child = new DifficultyColourBar(difficulty)
                 {
                     RelativeSizeAxes = Axes.Y,
                     Width = 20,
                 };
-
-            private FillFlowContainer createTopRightMetadataContainer(BeatmapInfo beatmapInfo, StarDifficulty difficulty)
-            {
-                var container = new FillFlowContainer
-                {
-                    Direction = FillDirection.Vertical,
-                    AutoSizeAxes = Axes.Both,
-                };
-
-                if (difficulty.Stars > 0)
-                {
-                    container.Add(new StarRatingDisplay(difficulty)
-                    {
-                        Anchor = Anchor.TopRight,
-                        Origin = Anchor.TopRight,
-                        Shear = -wedged_container_shear,
-                        Margin = new MarginPadding { Bottom = 5 }
-                    });
-                }
-
-                container.Add(StatusPill = new BeatmapSetOnlineStatusPill
-                {
-                    Anchor = Anchor.TopRight,
-                    Origin = Anchor.TopRight,
-                    Shear = -wedged_container_shear,
-                    TextSize = 11,
-                    TextPadding = new MarginPadding { Horizontal = 8, Vertical = 2 },
-                    Status = beatmapInfo.Status,
-                });
-
-                return container;
             }
 
             private void refreshModInformation(ValueChangedEvent<IReadOnlyList<Mod>> modsChangedEvent)

From 279750775848a7f6536ecbff54e69773d01c2464 Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Wed, 5 May 2021 17:56:07 +0200
Subject: [PATCH 3128/3722] Reorganized elements for readability

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 128 ++++++++++----------
 1 file changed, 64 insertions(+), 64 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 475a547c27..15e484e24c 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -132,39 +132,13 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        public class BeatmapInfoWedgeContainer : Container
-        {
-            private readonly WorkingBeatmap beatmap;
-            private readonly RulesetInfo ruleset;
-
-            internal WedgeInfoText Info;
-
-            public BeatmapInfoWedgeContainer(WorkingBeatmap beatmap, RulesetInfo ruleset)
-            {
-                this.beatmap = beatmap;
-                this.ruleset = ruleset;
-            }
-
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                RelativeSizeAxes = Axes.Both;
-
-                Children = new Drawable[]
-                {
-                    new BeatmapInfoWedgeBackground(beatmap),
-                    Info = new WedgeInfoText(beatmap, ruleset),
-                };
-            }
-        }
-
         public class WedgeInfoText : Container
         {
-            public FillFlowContainer MapperContainer { get; private set; }
+            public OsuSpriteText VersionLabel { get; private set; }
             public OsuSpriteText TitleLabel { get; private set; }
             public OsuSpriteText ArtistLabel { get; private set; }
-            public OsuSpriteText VersionLabel { get; private set; }
             public BeatmapSetOnlineStatusPill StatusPill { get; private set; }
+            public FillFlowContainer MapperContainer { get; private set; }
 
             [Resolved]
             private IBindable<IReadOnlyList<Mod>> mods { get; set; }
@@ -172,16 +146,17 @@ namespace osu.Game.Screens.Select
             private ILocalisedBindableString titleBinding;
             private ILocalisedBindableString artistBinding;
             private FillFlowContainer infoLabelContainer;
-            private Container topRightMetadataContainer;
+            private Container starRatingContainer;
             private Container bpmLabelContainer;
             private Container difficultyColourBarContainer;
-            private ModSettingChangeTracker settingChangeTracker;
             private CancellationTokenSource cancellationTokenSource;
             private IBindable<StarDifficulty?> starDifficulty;
 
             private readonly WorkingBeatmap beatmap;
             private readonly RulesetInfo ruleset;
 
+            private ModSettingChangeTracker settingChangeTracker;
+
             public WedgeInfoText(WorkingBeatmap beatmap, RulesetInfo userRuleset)
             {
                 this.beatmap = beatmap;
@@ -211,7 +186,6 @@ namespace osu.Game.Screens.Select
                     {
                         RelativeSizeAxes = Axes.Y,
                         Width = 20,
-                        Child = createDifficultyColourBar(starDifficulty.Value ?? new StarDifficulty()),
                     },
                     new FillFlowContainer
                     {
@@ -304,8 +278,6 @@ namespace osu.Game.Screens.Select
                     }
                 };
 
-                addInfoLabels();
-
                 titleBinding.BindValueChanged(_ => setMetadata(metadata.Source));
                 artistBinding.BindValueChanged(_ => setMetadata(metadata.Source), true);
                 starDifficulty.BindValueChanged(updateDifficulty, true);
@@ -313,38 +285,8 @@ namespace osu.Game.Screens.Select
                 // no difficulty means it can't have a status to show
                 if (beatmapInfo.Version == null)
                     StatusPill.Hide();
-            }
 
-            private void updateDifficulty(ValueChangedEvent<StarDifficulty?> valueChanged)
-            {
-                var difficulty = valueChanged.NewValue ?? new StarDifficulty();
-
-                if (starRatingContainer.Children.Count > 0)
-                {
-                    starRatingContainer.Child.FadeOut(250);
-                    starRatingContainer.Child.Expire();
-                }
-
-                starRatingContainer.Child = difficulty.Stars > 0 ? new StarRatingDisplay(difficulty) : Empty();
-
-                if (difficultyColourBarContainer.Children.Count > 0)
-                {
-                    difficultyColourBarContainer.Child.Expire();
-                }
-
-                difficultyColourBarContainer.Child = new DifficultyColourBar(difficulty)
-                {
-                    RelativeSizeAxes = Axes.Y,
-                    Width = 20,
-                };
-            }
-
-            private void refreshModInformation(ValueChangedEvent<IReadOnlyList<Mod>> modsChangedEvent)
-            {
-                settingChangeTracker?.Dispose();
-                settingChangeTracker = new ModSettingChangeTracker(modsChangedEvent.NewValue);
-                settingChangeTracker.SettingChanged += _ => refreshBPMLabel(modsChangedEvent.NewValue);
-                refreshBPMLabel(modsChangedEvent.NewValue);
+                addInfoLabels();
             }
 
             private void setMetadata(string source)
@@ -455,6 +397,38 @@ namespace osu.Game.Screens.Select
                 };
             }
 
+            private void updateDifficulty(ValueChangedEvent<StarDifficulty?> valueChanged)
+            {
+                var difficulty = valueChanged.NewValue ?? new StarDifficulty();
+
+                if (starRatingContainer.Children.Count > 0)
+                {
+                    starRatingContainer.Child.FadeOut(250);
+                    starRatingContainer.Child.Expire();
+                }
+
+                starRatingContainer.Child = difficulty.Stars > 0 ? new StarRatingDisplay(difficulty) : Empty();
+
+                if (difficultyColourBarContainer.Children.Count > 0)
+                {
+                    difficultyColourBarContainer.Child.Expire();
+                }
+
+                difficultyColourBarContainer.Child = new DifficultyColourBar(difficulty)
+                {
+                    RelativeSizeAxes = Axes.Y,
+                    Width = 20,
+                };
+            }
+
+            private void refreshModInformation(ValueChangedEvent<IReadOnlyList<Mod>> modsChangedEvent)
+            {
+                settingChangeTracker?.Dispose();
+                settingChangeTracker = new ModSettingChangeTracker(modsChangedEvent.NewValue);
+                settingChangeTracker.SettingChanged += _ => refreshBPMLabel(modsChangedEvent.NewValue);
+                refreshBPMLabel(modsChangedEvent.NewValue);
+            }
+
             protected override void Dispose(bool isDisposing)
             {
                 base.Dispose(isDisposing);
@@ -557,5 +531,31 @@ namespace osu.Game.Screens.Select
                 }
             }
         }
+
+        public class BeatmapInfoWedgeContainer : Container
+        {
+            private readonly WorkingBeatmap beatmap;
+            private readonly RulesetInfo ruleset;
+
+            internal WedgeInfoText Info;
+
+            public BeatmapInfoWedgeContainer(WorkingBeatmap beatmap, RulesetInfo ruleset)
+            {
+                this.beatmap = beatmap;
+                this.ruleset = ruleset;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                RelativeSizeAxes = Axes.Both;
+
+                Children = new Drawable[]
+                {
+                    new BeatmapInfoWedgeBackground(beatmap),
+                    Info = new WedgeInfoText(beatmap, ruleset),
+                };
+            }
+        }
     }
 }

From bb385f425531c1efdf37fd258df9057edaf10fc9 Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Wed, 5 May 2021 18:15:59 +0200
Subject: [PATCH 3129/3722] Reverted difficulty and mod updates

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 117 +++++++++-----------
 1 file changed, 55 insertions(+), 62 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 15e484e24c..4be7d3b0f4 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -40,6 +40,14 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; }
 
+        [Resolved]
+        private IBindable<IReadOnlyList<Mod>> mods { get; set; }
+
+        [Resolved]
+        private BeatmapDifficultyCache difficultyCache { get; set; }
+
+        private IBindable<StarDifficulty?> beatmapDifficulty;
+
         protected BeatmapInfoWedgeContainer Container;
 
         public BeatmapInfoWedge()
@@ -80,6 +88,8 @@ namespace osu.Game.Screens.Select
 
         private WorkingBeatmap beatmap;
 
+        private CancellationTokenSource cancellationSource;
+
         public WorkingBeatmap Beatmap
         {
             get => beatmap;
@@ -88,6 +98,13 @@ namespace osu.Game.Screens.Select
                 if (beatmap == value) return;
 
                 beatmap = value;
+                cancellationSource?.Cancel();
+                cancellationSource = new CancellationTokenSource();
+
+                beatmapDifficulty?.UnbindAll();
+                beatmapDifficulty = difficultyCache.GetBindableDifficulty(beatmap.BeatmapInfo, cancellationSource.Token);
+                beatmapDifficulty.BindValueChanged(_ => updateDisplay());
+
                 updateDisplay();
             }
         }
@@ -117,7 +134,7 @@ namespace osu.Game.Screens.Select
                     return;
                 }
 
-                LoadComponentAsync(loadingInfo = new BeatmapInfoWedgeContainer(beatmap, ruleset.Value)
+                LoadComponentAsync(loadingInfo = new BeatmapInfoWedgeContainer(beatmap, ruleset.Value, mods.Value, beatmapDifficulty.Value ?? new StarDifficulty())
                 {
                     Shear = -Shear,
                     Depth = Container?.Depth + 1 ?? 0,
@@ -132,6 +149,12 @@ namespace osu.Game.Screens.Select
             }
         }
 
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            cancellationSource?.Cancel();
+        }
+
         public class WedgeInfoText : Container
         {
             public OsuSpriteText VersionLabel { get; private set; }
@@ -140,41 +163,32 @@ namespace osu.Game.Screens.Select
             public BeatmapSetOnlineStatusPill StatusPill { get; private set; }
             public FillFlowContainer MapperContainer { get; private set; }
 
-            [Resolved]
-            private IBindable<IReadOnlyList<Mod>> mods { get; set; }
-
             private ILocalisedBindableString titleBinding;
             private ILocalisedBindableString artistBinding;
             private FillFlowContainer infoLabelContainer;
-            private Container starRatingContainer;
             private Container bpmLabelContainer;
-            private Container difficultyColourBarContainer;
-            private CancellationTokenSource cancellationTokenSource;
-            private IBindable<StarDifficulty?> starDifficulty;
 
             private readonly WorkingBeatmap beatmap;
             private readonly RulesetInfo ruleset;
+            private readonly IReadOnlyList<Mod> mods;
+            private readonly StarDifficulty starDifficulty;
 
             private ModSettingChangeTracker settingChangeTracker;
 
-            public WedgeInfoText(WorkingBeatmap beatmap, RulesetInfo userRuleset)
+            public WedgeInfoText(WorkingBeatmap beatmap, RulesetInfo userRuleset, IReadOnlyList<Mod> mods, StarDifficulty difficulty)
             {
                 this.beatmap = beatmap;
                 ruleset = userRuleset ?? beatmap.BeatmapInfo.Ruleset;
+                this.mods = mods;
+                starDifficulty = difficulty;
             }
 
             [BackgroundDependencyLoader]
-            private void load(LocalisationManager localisation, BeatmapDifficultyCache difficultyCache)
+            private void load(LocalisationManager localisation)
             {
                 var beatmapInfo = beatmap.BeatmapInfo;
                 var metadata = beatmapInfo.Metadata ?? beatmap.BeatmapSetInfo?.Metadata ?? new BeatmapMetadata();
 
-                cancellationTokenSource?.Cancel();
-                cancellationTokenSource = new CancellationTokenSource();
-
-                starDifficulty?.UnbindAll();
-                starDifficulty = difficultyCache.GetBindableDifficulty(beatmapInfo, cancellationTokenSource.Token);
-
                 RelativeSizeAxes = Axes.Both;
 
                 titleBinding = localisation.GetLocalisedString(new RomanisableString(metadata.TitleUnicode, metadata.Title));
@@ -182,7 +196,7 @@ namespace osu.Game.Screens.Select
 
                 Children = new Drawable[]
                 {
-                    difficultyColourBarContainer = new Container
+                    new DifficultyColourBar(starDifficulty)
                     {
                         RelativeSizeAxes = Axes.Y,
                         Width = 20,
@@ -216,16 +230,14 @@ namespace osu.Game.Screens.Select
                         Padding = new MarginPadding { Top = 14, Right = shear_width / 2 },
                         AutoSizeAxes = Axes.Both,
                         Shear = wedged_container_shear,
-                        Children = new Drawable[]
+                        Children = new[]
                         {
-                            starRatingContainer = new Container
+                            createStarRatingDisplay(starDifficulty).With(display =>
                             {
-                                AutoSizeAxes = Axes.Both,
-                                Anchor = Anchor.TopRight,
-                                Origin = Anchor.TopRight,
-                                Shear = -wedged_container_shear,
-                                Margin = new MarginPadding { Bottom = 5 }
-                            },
+                                display.Anchor = Anchor.TopRight;
+                                display.Origin = Anchor.TopRight;
+                                display.Shear = -wedged_container_shear;
+                            }),
                             StatusPill = new BeatmapSetOnlineStatusPill
                             {
                                 Anchor = Anchor.TopRight,
@@ -280,7 +292,6 @@ namespace osu.Game.Screens.Select
 
                 titleBinding.BindValueChanged(_ => setMetadata(metadata.Source));
                 artistBinding.BindValueChanged(_ => setMetadata(metadata.Source), true);
-                starDifficulty.BindValueChanged(updateDifficulty, true);
 
                 // no difficulty means it can't have a status to show
                 if (beatmapInfo.Version == null)
@@ -289,6 +300,13 @@ namespace osu.Game.Screens.Select
                 addInfoLabels();
             }
 
+            private static Drawable createStarRatingDisplay(StarDifficulty difficulty) => difficulty.Stars > 0
+                ? new StarRatingDisplay(difficulty)
+                {
+                    Margin = new MarginPadding { Bottom = 5 }
+                }
+                : Empty();
+
             private void setMetadata(string source)
             {
                 ArtistLabel.Text = artistBinding.Value;
@@ -320,7 +338,10 @@ namespace osu.Game.Screens.Select
                     }
                 };
 
-                mods.BindValueChanged(refreshModInformation, true);
+                settingChangeTracker = new ModSettingChangeTracker(mods);
+                settingChangeTracker.SettingChanged += _ => refreshBPMLabel();
+
+                refreshBPMLabel();
             }
 
             private InfoLabel[] getRulesetInfoLabels()
@@ -350,7 +371,7 @@ namespace osu.Game.Screens.Select
                 return Array.Empty<InfoLabel>();
             }
 
-            private void refreshBPMLabel(IReadOnlyList<Mod> mods)
+            private void refreshBPMLabel()
             {
                 var b = beatmap.Beatmap;
                 if (b == null)
@@ -397,38 +418,6 @@ namespace osu.Game.Screens.Select
                 };
             }
 
-            private void updateDifficulty(ValueChangedEvent<StarDifficulty?> valueChanged)
-            {
-                var difficulty = valueChanged.NewValue ?? new StarDifficulty();
-
-                if (starRatingContainer.Children.Count > 0)
-                {
-                    starRatingContainer.Child.FadeOut(250);
-                    starRatingContainer.Child.Expire();
-                }
-
-                starRatingContainer.Child = difficulty.Stars > 0 ? new StarRatingDisplay(difficulty) : Empty();
-
-                if (difficultyColourBarContainer.Children.Count > 0)
-                {
-                    difficultyColourBarContainer.Child.Expire();
-                }
-
-                difficultyColourBarContainer.Child = new DifficultyColourBar(difficulty)
-                {
-                    RelativeSizeAxes = Axes.Y,
-                    Width = 20,
-                };
-            }
-
-            private void refreshModInformation(ValueChangedEvent<IReadOnlyList<Mod>> modsChangedEvent)
-            {
-                settingChangeTracker?.Dispose();
-                settingChangeTracker = new ModSettingChangeTracker(modsChangedEvent.NewValue);
-                settingChangeTracker.SettingChanged += _ => refreshBPMLabel(modsChangedEvent.NewValue);
-                refreshBPMLabel(modsChangedEvent.NewValue);
-            }
-
             protected override void Dispose(bool isDisposing)
             {
                 base.Dispose(isDisposing);
@@ -536,13 +525,17 @@ namespace osu.Game.Screens.Select
         {
             private readonly WorkingBeatmap beatmap;
             private readonly RulesetInfo ruleset;
+            private readonly StarDifficulty starDifficulty;
+            private readonly IReadOnlyList<Mod> mods;
 
             internal WedgeInfoText Info;
 
-            public BeatmapInfoWedgeContainer(WorkingBeatmap beatmap, RulesetInfo ruleset)
+            public BeatmapInfoWedgeContainer(WorkingBeatmap beatmap, RulesetInfo ruleset, IReadOnlyList<Mod> mods, StarDifficulty difficulty)
             {
                 this.beatmap = beatmap;
                 this.ruleset = ruleset;
+                this.mods = mods;
+                starDifficulty = difficulty;
             }
 
             [BackgroundDependencyLoader]
@@ -553,7 +546,7 @@ namespace osu.Game.Screens.Select
                 Children = new Drawable[]
                 {
                     new BeatmapInfoWedgeBackground(beatmap),
-                    Info = new WedgeInfoText(beatmap, ruleset),
+                    Info = new WedgeInfoText(beatmap, ruleset, mods, starDifficulty),
                 };
             }
         }

From b6b9a696017ca41dd9befb1ca5b63c2fa129f008 Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Wed, 5 May 2021 18:50:49 +0200
Subject: [PATCH 3130/3722] Removed unnecessary class for wrapping

---
 .../SongSelect/TestSceneBeatmapInfoWedge.cs   |  7 +--
 osu.Game/Screens/Select/BeatmapInfoWedge.cs   | 43 +++++--------------
 2 files changed, 14 insertions(+), 36 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
index ec19f00087..b9e92cba62 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
@@ -7,6 +7,7 @@ using JetBrains.Annotations;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Sprites;
@@ -135,7 +136,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private void selectBeatmap([CanBeNull] IBeatmap b)
         {
-            BeatmapInfoWedge.BeatmapInfoWedgeContainer containerBefore = null;
+            Container containerBefore = null;
 
             AddStep($"select {b?.Metadata.Title ?? "null"} beatmap", () =>
             {
@@ -193,9 +194,9 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private class TestBeatmapInfoWedge : BeatmapInfoWedge
         {
-            public new BeatmapInfoWedgeContainer Container => base.Container;
+            public new Container Container => base.Container;
 
-            public WedgeInfoText Info => base.Container.Info;
+            public new WedgeInfoText Info => base.Info;
         }
 
         private class TestHitObject : ConvertHitObject, IHasPosition
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 4be7d3b0f4..53ac97cc7d 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -48,7 +48,8 @@ namespace osu.Game.Screens.Select
 
         private IBindable<StarDifficulty?> beatmapDifficulty;
 
-        protected BeatmapInfoWedgeContainer Container;
+        protected Container Container;
+        protected WedgeInfoText Info;
 
         public BeatmapInfoWedge()
         {
@@ -111,7 +112,7 @@ namespace osu.Game.Screens.Select
 
         public override bool IsPresent => base.IsPresent || Container == null; // Visibility is updated in the LoadComponentAsync callback
 
-        private BeatmapInfoWedgeContainer loadingInfo;
+        private Container loadingInfo;
 
         private void updateDisplay()
         {
@@ -134,10 +135,16 @@ namespace osu.Game.Screens.Select
                     return;
                 }
 
-                LoadComponentAsync(loadingInfo = new BeatmapInfoWedgeContainer(beatmap, ruleset.Value, mods.Value, beatmapDifficulty.Value ?? new StarDifficulty())
+                LoadComponentAsync(loadingInfo = new Container
                 {
+                    RelativeSizeAxes = Axes.Both,
                     Shear = -Shear,
                     Depth = Container?.Depth + 1 ?? 0,
+                    Children = new Drawable[]
+                    {
+                        new BeatmapInfoWedgeBackground(beatmap),
+                        Info = new WedgeInfoText(beatmap, ruleset.Value, mods.Value, beatmapDifficulty.Value ?? new StarDifficulty()),
+                    }
                 }, loaded =>
                 {
                     // ensure we are the most recent loaded wedge.
@@ -520,35 +527,5 @@ namespace osu.Game.Screens.Select
                 }
             }
         }
-
-        public class BeatmapInfoWedgeContainer : Container
-        {
-            private readonly WorkingBeatmap beatmap;
-            private readonly RulesetInfo ruleset;
-            private readonly StarDifficulty starDifficulty;
-            private readonly IReadOnlyList<Mod> mods;
-
-            internal WedgeInfoText Info;
-
-            public BeatmapInfoWedgeContainer(WorkingBeatmap beatmap, RulesetInfo ruleset, IReadOnlyList<Mod> mods, StarDifficulty difficulty)
-            {
-                this.beatmap = beatmap;
-                this.ruleset = ruleset;
-                this.mods = mods;
-                starDifficulty = difficulty;
-            }
-
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                RelativeSizeAxes = Axes.Both;
-
-                Children = new Drawable[]
-                {
-                    new BeatmapInfoWedgeBackground(beatmap),
-                    Info = new WedgeInfoText(beatmap, ruleset, mods, starDifficulty),
-                };
-            }
-        }
     }
 }

From fe9ade6754360eb1e36c41f46c7d386d9b8565c4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 May 2021 02:14:04 +0900
Subject: [PATCH 3131/3722] Rename Container to DisplayedContent

---
 .../SongSelect/TestSceneBeatmapInfoWedge.cs       |  6 +++---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs       | 15 ++++++++-------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
index b9e92cba62..67c85a1120 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
@@ -140,11 +140,11 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddStep($"select {b?.Metadata.Title ?? "null"} beatmap", () =>
             {
-                containerBefore = infoWedge.Container;
+                containerBefore = infoWedge.DisplayedContent;
                 infoWedge.Beatmap = Beatmap.Value = b == null ? Beatmap.Default : CreateWorkingBeatmap(b);
             });
 
-            AddUntilStep("wait for async load", () => infoWedge.Container != containerBefore);
+            AddUntilStep("wait for async load", () => infoWedge.DisplayedContent != containerBefore);
         }
 
         private IBeatmap createTestBeatmap(RulesetInfo ruleset)
@@ -194,7 +194,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private class TestBeatmapInfoWedge : BeatmapInfoWedge
         {
-            public new Container Container => base.Container;
+            public new Container DisplayedContent => base.DisplayedContent;
 
             public new WedgeInfoText Info => base.Info;
         }
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 53ac97cc7d..d84052b94d 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -48,7 +48,8 @@ namespace osu.Game.Screens.Select
 
         private IBindable<StarDifficulty?> beatmapDifficulty;
 
-        protected Container Container;
+        protected Container DisplayedContent;
+
         protected WedgeInfoText Info;
 
         public BeatmapInfoWedge()
@@ -110,7 +111,7 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        public override bool IsPresent => base.IsPresent || Container == null; // Visibility is updated in the LoadComponentAsync callback
+        public override bool IsPresent => base.IsPresent || DisplayedContent == null; // Visibility is updated in the LoadComponentAsync callback
 
         private Container loadingInfo;
 
@@ -124,9 +125,9 @@ namespace osu.Game.Screens.Select
                 {
                     State.Value = beatmap == null ? Visibility.Hidden : Visibility.Visible;
 
-                    Container?.FadeOut(250);
-                    Container?.Expire();
-                    Container = null;
+                    DisplayedContent?.FadeOut(250);
+                    DisplayedContent?.Expire();
+                    DisplayedContent = null;
                 }
 
                 if (beatmap == null)
@@ -139,7 +140,7 @@ namespace osu.Game.Screens.Select
                 {
                     RelativeSizeAxes = Axes.Both,
                     Shear = -Shear,
-                    Depth = Container?.Depth + 1 ?? 0,
+                    Depth = DisplayedContent?.Depth + 1 ?? 0,
                     Children = new Drawable[]
                     {
                         new BeatmapInfoWedgeBackground(beatmap),
@@ -151,7 +152,7 @@ namespace osu.Game.Screens.Select
                     if (loaded != loadingInfo) return;
 
                     removeOldInfo();
-                    Add(Container = loaded);
+                    Add(DisplayedContent = loaded);
                 });
             }
         }

From cffeb8641f484a860580bbcce38f977563e68674 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 May 2021 02:14:57 +0900
Subject: [PATCH 3132/3722] Make setters private for protected containers

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

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index d84052b94d..18615d9192 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -48,9 +48,9 @@ namespace osu.Game.Screens.Select
 
         private IBindable<StarDifficulty?> beatmapDifficulty;
 
-        protected Container DisplayedContent;
+        protected Container DisplayedContent { get; private set; }
 
-        protected WedgeInfoText Info;
+        protected WedgeInfoText Info { get; private set; }
 
         public BeatmapInfoWedge()
         {

From 2a67361dc01963e10e850ac5523858578c613f67 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 5 May 2021 21:50:11 +0300
Subject: [PATCH 3133/3722] OnOperation -> TriggerOperation

---
 .../Screens/Edit/Compose/Components/SelectionBoxButton.cs     | 4 ++--
 .../Screens/Edit/Compose/Components/SelectionBoxControl.cs    | 4 ++--
 .../Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxButton.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxButton.cs
index 43cbbb617b..3b1dae6c3d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxButton.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxButton.cs
@@ -46,9 +46,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected override bool OnClick(ClickEvent e)
         {
-            OnOperationStarted();
+            TriggerOperationStarted();
             Action?.Invoke();
-            OnOperationEnded();
+            TriggerOperatoinEnded();
             return true;
         }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
index 159886648e..40d367bb80 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxControl.cs
@@ -90,8 +90,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
             this.ScaleTo(IsHeld || IsHovered ? 1.5f : 1, TRANSFORM_DURATION, Easing.OutQuint);
         }
 
-        protected void OnOperationStarted() => OperationStarted?.Invoke();
+        protected void TriggerOperationStarted() => OperationStarted?.Invoke();
 
-        protected void OnOperationEnded() => OperationEnded?.Invoke();
+        protected void TriggerOperatoinEnded() => OperationEnded?.Invoke();
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
index 3c1741e24d..65a95951cf 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandle.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected override bool OnDragStart(DragStartEvent e)
         {
-            OnOperationStarted();
+            TriggerOperationStarted();
             return true;
         }
 
@@ -24,7 +24,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected override void OnDragEnd(DragEndEvent e)
         {
-            OnOperationEnded();
+            TriggerOperatoinEnded();
 
             UpdateHoverState();
             base.OnDragEnd(e);

From 266d8d828297b9381520023a47bbe670ffce548e Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Thu, 6 May 2021 05:13:39 +0700
Subject: [PATCH 3134/3722] move list item constant position

---
 .../Graphics/Containers/Markdown/OsuMarkdownListItem.cs     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
index 98b1fd1381..84565a577a 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
@@ -12,13 +12,13 @@ namespace osu.Game.Graphics.Containers.Markdown
 {
     public class OsuMarkdownListItem : CompositeDrawable
     {
+        private const float ordered_left_padding = 30;
+        private const float unordered_left_padding = 20;
+
         private readonly int level;
         private readonly int order;
         private readonly bool isOrdered;
 
-        private const float ordered_left_padding = 30;
-        private const float unordered_left_padding = 20;
-
         [Resolved]
         private IMarkdownTextComponent parentTextComponent { get; set; }
 

From 3ddf551b0360322fb15d9802949ed35997624b94 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Thu, 6 May 2021 05:13:54 +0700
Subject: [PATCH 3135/3722] remove unused this

---
 osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
index 84565a577a..a6274de3da 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Graphics.Containers.Markdown
         public OsuMarkdownListItem(ListItemBlock listItemBlock, int level)
         {
             this.level = level;
-            this.order = listItemBlock.Order;
+            order = listItemBlock.Order;
             isOrdered = ((ListBlock)listItemBlock.Parent).IsOrdered;
 
             AutoSizeAxes = Axes.Y;

From 99e0cc9bbe4106362a854caae272c929a4ac6e88 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Thu, 6 May 2021 05:15:32 +0700
Subject: [PATCH 3136/3722] rename CreateTextMarker to GetTextMarker

---
 osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
index a6274de3da..a4941ef785 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Graphics.Containers.Markdown
         private void load()
         {
             var marker = parentTextComponent.CreateSpriteText();
-            marker.Text = CreateTextMarker();
+            marker.Text = GetTextMarker();
 
             if (isOrdered)
             {
@@ -67,7 +67,7 @@ namespace osu.Game.Graphics.Containers.Markdown
             AddInternal(marker);
         }
 
-        protected virtual string CreateTextMarker()
+        protected virtual string GetTextMarker()
         {
             if (isOrdered)
             {

From 9bb80492c534bc162cb28085bb6631c07e9fc6bf Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Thu, 6 May 2021 05:29:29 +0700
Subject: [PATCH 3137/3722] add level and isOrdered parameter

---
 osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
index a4941ef785..a7582cb4b3 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Graphics.Containers.Markdown
         private void load()
         {
             var marker = parentTextComponent.CreateSpriteText();
-            marker.Text = GetTextMarker();
+            marker.Text = GetTextMarker(level, isOrdered);
 
             if (isOrdered)
             {
@@ -67,7 +67,7 @@ namespace osu.Game.Graphics.Containers.Markdown
             AddInternal(marker);
         }
 
-        protected virtual string GetTextMarker()
+        protected virtual string GetTextMarker(int level, bool isOrdered)
         {
             if (isOrdered)
             {

From 4567abe3dbd39c1f26ce42003edd7b021a7c385d Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Thu, 6 May 2021 05:32:07 +0700
Subject: [PATCH 3138/3722] add xmldoc for GetTextMarker

---
 .../Graphics/Containers/Markdown/OsuMarkdownListItem.cs     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
index a7582cb4b3..b586bb7f30 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
@@ -67,6 +67,12 @@ namespace osu.Game.Graphics.Containers.Markdown
             AddInternal(marker);
         }
 
+        /// <summary>
+        /// Get text marker based on <paramref name="level"/> and <paramref name="isOrdered"/>.
+        /// </summary>
+        /// <param name="level">The markdown level of current list item.</param>
+        /// <param name="isOrdered">Is true if the list item is an ordered list.</param>
+        /// <returns></returns>
         protected virtual string GetTextMarker(int level, bool isOrdered)
         {
             if (isOrdered)

From cfd28c51bbbb827c0394282ec144ebdf3a9557f6 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Thu, 6 May 2021 05:35:16 +0700
Subject: [PATCH 3139/3722] change block quote backgroudn width

Reference : https://github.com/ppy/osu-web/blob/376cac43a051b9c85ce95e2c446099be187b3e45/resources/assets/less/base.less#L7-L10
---
 .../Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs
index 869cba82f2..d9b516892b 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs
@@ -26,7 +26,9 @@ namespace osu.Game.Graphics.Containers.Markdown
 
         protected override Drawable CreateBackground()
         {
-            return background = base.CreateBackground();
+            background = base.CreateBackground();
+            background.Width = 2;
+            return background;
         }
 
         public override MarkdownTextFlowContainer CreateTextFlow()

From 550e6c0fbb5e670d77dcc384c5dfbe3aba07f99b Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Thu, 6 May 2021 05:36:46 +0700
Subject: [PATCH 3140/3722] change quote block margin padding to use vertical
 and horizontal

---
 .../Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs
index d9b516892b..07bb72c2e6 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs
@@ -36,10 +36,8 @@ namespace osu.Game.Graphics.Containers.Markdown
             var textFlow = base.CreateTextFlow();
             textFlow.Margin = new MarginPadding
             {
-                Top = 10,
-                Bottom = 10,
-                Left = 20,
-                Right = 20,
+                Vertical = 10,
+                Horizontal = 20,
             };
             return textFlow;
         }

From 0d3ca8dde197428a2eef2ec2bc4d49d614ccea28 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Thu, 6 May 2021 08:43:38 +0700
Subject: [PATCH 3141/3722] change font weight of table header

---
 .../Markdown/OsuMarkdownTableCell.cs          | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs
index d8b9145228..fca85e02a8 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs
@@ -6,6 +6,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers.Markdown;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Overlays;
 
 namespace osu.Game.Graphics.Containers.Markdown
@@ -30,7 +31,6 @@ namespace osu.Game.Graphics.Containers.Markdown
                 RelativeSizeAxes = Axes.X,
             };
 
-            // TODO : Change font weight to 700 for heading
             if (isHeading)
             {
                 border.Colour = colourProvider.Background3;
@@ -48,5 +48,23 @@ namespace osu.Game.Graphics.Containers.Markdown
 
             AddInternal(border);
         }
+
+        public override MarkdownTextFlowContainer CreateTextFlow() => new TableCellTextFlowContainer
+        {
+            Weight = isHeading ? FontWeight.Bold : FontWeight.Regular,
+            Padding = new MarginPadding(10),
+        };
+
+        private class TableCellTextFlowContainer : OsuMarkdownTextFlowContainer
+        {
+            public FontWeight Weight { get; set; }
+
+            protected override SpriteText CreateSpriteText()
+            {
+                var spriteText = base.CreateSpriteText();
+                spriteText.Font = spriteText.Font.With(weight: Weight);
+                return spriteText;
+            }
+        }
     }
 }

From d4658c609b61d3f15cccbe840023bb6003efc91c Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Wed, 5 May 2021 22:43:16 -0700
Subject: [PATCH 3142/3722] Fix warning text of bg source setting not being
 updated when user with supporter signs in/out

---
 .../Settings/Sections/UserInterface/MainMenuSettings.cs       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs b/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
index 7c4c88f344..5f703ed5a4 100644
--- a/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/UserInterface/MainMenuSettings.cs
@@ -57,11 +57,11 @@ namespace osu.Game.Overlays.Settings.Sections.UserInterface
         {
             base.LoadComplete();
 
-            backgroundSourceDropdown.Current.BindValueChanged(source =>
+            user.BindValueChanged(u =>
             {
                 const string not_supporter_note = "Changes to this setting will only apply with an active osu!supporter tag.";
 
-                backgroundSourceDropdown.WarningText = user.Value?.IsSupporter != true ? not_supporter_note : string.Empty;
+                backgroundSourceDropdown.WarningText = u.NewValue?.IsSupporter != true ? not_supporter_note : string.Empty;
             }, true);
         }
     }

From ee23124bb14409ac6c4833df20b1259ecca888d1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 May 2021 15:17:53 +0900
Subject: [PATCH 3143/3722] Remove no-longer-used interface

---
 .../Screens/Play/HUD/DefaultComboCounter.cs   |  2 +-
 osu.Game/Screens/Play/HUD/IComboCounter.cs    | 19 -------------------
 .../Screens/Play/HUD/LegacyComboCounter.cs    |  2 +-
 3 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 100644 osu.Game/Screens/Play/HUD/IComboCounter.cs

diff --git a/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs b/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
index d0c26afe5e..5a975c1b80 100644
--- a/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
@@ -12,7 +12,7 @@ using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class DefaultComboCounter : RollingCounter<int>, IComboCounter
+    public class DefaultComboCounter : RollingCounter<int>
     {
         private readonly Vector2 offset = new Vector2(20, 5);
 
diff --git a/osu.Game/Screens/Play/HUD/IComboCounter.cs b/osu.Game/Screens/Play/HUD/IComboCounter.cs
deleted file mode 100644
index ff235bf04e..0000000000
--- a/osu.Game/Screens/Play/HUD/IComboCounter.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.Bindables;
-using osu.Framework.Graphics;
-
-namespace osu.Game.Screens.Play.HUD
-{
-    /// <summary>
-    /// An interface providing a set of methods to update a combo counter.
-    /// </summary>
-    public interface IComboCounter : IDrawable
-    {
-        /// <summary>
-        /// The current combo to be displayed.
-        /// </summary>
-        Bindable<int> Current { get; }
-    }
-}
diff --git a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
index 0bccbd0338..8ecd960de1 100644
--- a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Screens.Play.HUD
     /// <summary>
     /// Uses the 'x' symbol and has a pop-out effect while rolling over.
     /// </summary>
-    public class LegacyComboCounter : CompositeDrawable, IComboCounter
+    public class LegacyComboCounter : CompositeDrawable
     {
         public Bindable<int> Current { get; } = new BindableInt { MinValue = 0, };
 

From af75c9ac82ab73f43188284eef35a67b7bf1dbfd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 May 2021 16:08:28 +0900
Subject: [PATCH 3144/3722] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 5aee9e15cc..99cda7693d 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.427.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.506.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 1e0eabfff7..e448972066 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.427.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.506.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
     <PackageReference Include="Sentry" Version="3.3.4" />
     <PackageReference Include="SharpCompress" Version="0.28.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index e26e727e69..43ed2d7dc8 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.427.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.506.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.427.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.506.0" />
     <PackageReference Include="SharpCompress" Version="0.28.2" />
     <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From b6560a616a22f07e248f2063cd0d78f1fbbac180 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Thu, 6 May 2021 15:00:12 +0700
Subject: [PATCH 3145/3722] add comment for base font size heading

---
 osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs
index f71c6753f4..a7fecc6e25 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs
@@ -24,6 +24,9 @@ namespace osu.Game.Graphics.Containers.Markdown
 
         protected override float GetFontSizeByLevel(int level)
         {
+            // Reference for this font size
+            // https://github.com/ppy/osu-web/blob/376cac43a051b9c85ce95e2c446099be187b3e45/resources/assets/less/bem/osu-md.less#L9
+            // https://github.com/ppy/osu-web/blob/376cac43a051b9c85ce95e2c446099be187b3e45/resources/assets/less/variables.less#L161
             const float base_font_size = 14;
 
             switch (level)

From e7c563fb671f8c2eee44de363e6c04971dad6cd3 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Thu, 6 May 2021 15:11:45 +0700
Subject: [PATCH 3146/3722] simplify `CreateTextFlow` in quote block

---
 .../Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs
index 07bb72c2e6..f8b8a1c2a2 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs
@@ -33,13 +33,11 @@ namespace osu.Game.Graphics.Containers.Markdown
 
         public override MarkdownTextFlowContainer CreateTextFlow()
         {
-            var textFlow = base.CreateTextFlow();
-            textFlow.Margin = new MarginPadding
+            return base.CreateTextFlow().With(f => f.Margin = new MarginPadding
             {
                 Vertical = 10,
                 Horizontal = 20,
-            };
-            return textFlow;
+            });
         }
     }
 }

From 91283d41ceef2c9564d024b20d3ea893e38198e6 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Thu, 6 May 2021 15:13:43 +0700
Subject: [PATCH 3147/3722] add paragraph test

---
 .../UserInterface/TestSceneOsuMarkdownContainer.cs  | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
index 9fb14efe4d..dc41f184f2 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
@@ -95,6 +95,19 @@ _**italic with underscore, bold with asterisk**_";
             });
         }
 
+        [Test]
+        public void TestParagraph()
+        {
+            AddStep("Add paragraph", () =>
+            {
+                markdownContainer.Text = @"first paragraph
+
+second paragraph
+
+third paragraph";
+            });
+        }
+
         [Test]
         public void TestFencedCodeBlock()
         {

From ba634cbf11174ad90003405b0ff4a3c49cad7016 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Thu, 6 May 2021 15:13:59 +0700
Subject: [PATCH 3148/3722] change line spacing to 21

We use margin bottom in osu-web markdown paragraph[1] as reference for
this line spacing value.

The value from osu-web itself is 1.5em[2]. Because the base font size of
the paragraph is 14px[3][4], the actual value is 14 * 1.5 = 21px

[1] https://github.com/ppy/osu-web/blob/376cac43a051b9c85ce95e2c446099be187b3e45/resources/assets/less/bem/osu-md.less#L230
[2] https://github.com/ppy/osu-web/blob/376cac43a051b9c85ce95e2c446099be187b3e45/resources/assets/less/variables.less#L58
[3] https://github.com/ppy/osu-web/blob/376cac43a051b9c85ce95e2c446099be187b3e45/resources/assets/less/bem/osu-md.less#L9
[4] https://github.com/ppy/osu-web/blob/376cac43a051b9c85ce95e2c446099be187b3e45/resources/assets/less/variables.less#L161
---
 .../Graphics/Containers/Markdown/OsuMarkdownContainer.cs     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index 3ad00e4df2..c66f3fbca2 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -16,6 +16,11 @@ namespace osu.Game.Graphics.Containers.Markdown
 {
     public class OsuMarkdownContainer : MarkdownContainer
     {
+        public OsuMarkdownContainer()
+        {
+            LineSpacing = 21;
+        }
+
         protected override void AddMarkdownComponent(IMarkdownObject markdownObject, FillFlowContainer container, int level)
         {
             switch (markdownObject)

From 39067e6926e0950303e137140dded1f2eb2f5dd7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 May 2021 17:19:18 +0900
Subject: [PATCH 3149/3722] Fix slider input handling potentially being offset
 after composer area resize

Closes https://github.com/ppy/osu/issues/12671.
---
 .../Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs     | 4 ++++
 1 file changed, 4 insertions(+)

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 1c3d270c95..6e22c35ab3 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
@@ -26,6 +26,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             {
                 AccentColour = Color4.Transparent
             };
+
+            // SliderSelectionBlueprint relies on calling ReceivePositionalInputAt on this drawable to determine whether selection should occur.
+            // Without AlwaysPresent, a movement in a parent container (ie. the editor composer area resizing) could cause incorrect input handling.
+            AlwaysPresent = true;
         }
 
         [BackgroundDependencyLoader]

From 010f6258705e86c47ad208c519362daa80e6c346 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Thu, 6 May 2021 17:05:41 +0700
Subject: [PATCH 3150/3722] use derived component in OsuMarkdownFencedCodeBlock

---
 .../Markdown/OsuMarkdownFencedCodeBlock.cs    | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownFencedCodeBlock.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownFencedCodeBlock.cs
index ddd88dd915..0d67849060 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownFencedCodeBlock.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownFencedCodeBlock.cs
@@ -12,33 +12,34 @@ namespace osu.Game.Graphics.Containers.Markdown
 {
     public class OsuMarkdownFencedCodeBlock : MarkdownFencedCodeBlock
     {
-        private Box background;
-        private MarkdownTextFlowContainer textFlow;
-
+        // TODO : change to monospace font for this component
         public OsuMarkdownFencedCodeBlock(FencedCodeBlock fencedCodeBlock)
             : base(fencedCodeBlock)
         {
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
-        {
-            // TODO : Change to monospace font to match with osu-web
-            background.Colour = colourProvider.Background6;
-            textFlow.Colour = colourProvider.Light1;
-        }
+        protected override Drawable CreateBackground() => new CodeBlockBackground();
 
-        protected override Drawable CreateBackground()
+        public override MarkdownTextFlowContainer CreateTextFlow() => new CodeBlockTextFlowContainer();
+
+        private class CodeBlockBackground : Box
         {
-            return background = new Box
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
             {
-                RelativeSizeAxes = Axes.Both,
-            };
+                RelativeSizeAxes = Axes.Both;
+                Colour = colourProvider.Background6;
+            }
         }
 
-        public override MarkdownTextFlowContainer CreateTextFlow()
+        private class CodeBlockTextFlowContainer : OsuMarkdownTextFlowContainer
         {
-            return textFlow = base.CreateTextFlow();
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                Colour = colourProvider.Light1;
+                Margin = new MarginPadding(10);
+            }
         }
     }
 }

From 7b43730fe61791017693d058a101487057d218a3 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Thu, 6 May 2021 17:13:46 +0700
Subject: [PATCH 3151/3722] add QuoteBackground in OsuMarkdownQuoteBlock

---
 .../Markdown/OsuMarkdownQuoteBlock.cs         | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs
index f8b8a1c2a2..9935c81537 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownQuoteBlock.cs
@@ -5,31 +5,19 @@ using Markdig.Syntax;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers.Markdown;
+using osu.Framework.Graphics.Shapes;
 using osu.Game.Overlays;
 
 namespace osu.Game.Graphics.Containers.Markdown
 {
     public class OsuMarkdownQuoteBlock : MarkdownQuoteBlock
     {
-        private Drawable background;
-
         public OsuMarkdownQuoteBlock(QuoteBlock quoteBlock)
             : base(quoteBlock)
         {
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
-        {
-            background.Colour = colourProvider.Content2;
-        }
-
-        protected override Drawable CreateBackground()
-        {
-            background = base.CreateBackground();
-            background.Width = 2;
-            return background;
-        }
+        protected override Drawable CreateBackground() => new QuoteBackground();
 
         public override MarkdownTextFlowContainer CreateTextFlow()
         {
@@ -39,5 +27,18 @@ namespace osu.Game.Graphics.Containers.Markdown
                 Horizontal = 20,
             });
         }
+
+        private class QuoteBackground : Box
+        {
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                Anchor = Anchor.CentreLeft;
+                Origin = Anchor.CentreLeft;
+                RelativeSizeAxes = Axes.Y;
+                Width = 2;
+                Colour = colourProvider.Content2;
+            }
+        }
     }
 }

From 92022f2cba0240a6fe25bc5607eeb2ff9e5e9225 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Thu, 6 May 2021 17:17:14 +0700
Subject: [PATCH 3152/3722] add Separator component in OsuMarkdownSeparator

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

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownSeparator.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownSeparator.cs
index 9b28200452..28a87c9f21 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownSeparator.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownSeparator.cs
@@ -4,23 +4,24 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers.Markdown;
+using osu.Framework.Graphics.Shapes;
 using osu.Game.Overlays;
 
 namespace osu.Game.Graphics.Containers.Markdown
 {
     public class OsuMarkdownSeparator : MarkdownSeparator
     {
-        private Drawable separator;
+        protected override Drawable CreateSeparator() => new Separator();
 
-        [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
+        private class Separator : Box
         {
-            separator.Colour = colourProvider.Background3;
-        }
-
-        protected override Drawable CreateSeparator()
-        {
-            return separator = base.CreateSeparator();
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                RelativeSizeAxes = Axes.X;
+                Height = 1;
+                Colour = colourProvider.Background3;
+            }
         }
     }
 }

From 9be36230f9bd5825aafc5b5f664480d76bdf43fb Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 6 May 2021 21:43:30 +0900
Subject: [PATCH 3153/3722] Introduce AutoGenerator subclass for frame based
 replay generation

---
 osu.Game/Rulesets/Replays/AutoGenerator.cs    | 27 +++++-------
 .../Rulesets/Replays/FramedAutoGenerator.cs   | 44 +++++++++++++++++++
 2 files changed, 54 insertions(+), 17 deletions(-)
 create mode 100644 osu.Game/Rulesets/Replays/FramedAutoGenerator.cs

diff --git a/osu.Game/Rulesets/Replays/AutoGenerator.cs b/osu.Game/Rulesets/Replays/AutoGenerator.cs
index b3c609f2f4..4bdd5b094d 100644
--- a/osu.Game/Rulesets/Replays/AutoGenerator.cs
+++ b/osu.Game/Rulesets/Replays/AutoGenerator.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.Game.Beatmaps;
@@ -7,34 +7,27 @@ using osu.Game.Rulesets.Objects;
 
 namespace osu.Game.Rulesets.Replays
 {
-    public abstract class AutoGenerator : IAutoGenerator
+    public abstract class AutoGenerator
     {
         /// <summary>
-        /// Creates the auto replay and returns it.
-        /// Every subclass of OsuAutoGeneratorBase should implement this!
+        /// The default duration of a key press in milliseconds.
         /// </summary>
-        public abstract Replay Generate();
-
-        #region Parameters
+        public const double KEY_UP_DELAY = 50;
 
         /// <summary>
-        /// The beatmap we're making.
+        /// The beatmap the autoplay is generated for.
         /// </summary>
-        protected IBeatmap Beatmap;
-
-        #endregion
+        protected IBeatmap Beatmap { get; }
 
         protected AutoGenerator(IBeatmap beatmap)
         {
             Beatmap = beatmap;
         }
 
-        #region Constants
-
-        // Shared amongst all modes
-        public const double KEY_UP_DELAY = 50;
-
-        #endregion
+        /// <summary>
+        /// Generate the replay of the autoplay.
+        /// </summary>
+        public abstract Replay Generate();
 
         protected virtual HitObject GetNextObject(int currentIndex)
         {
diff --git a/osu.Game/Rulesets/Replays/FramedAutoGenerator.cs b/osu.Game/Rulesets/Replays/FramedAutoGenerator.cs
new file mode 100644
index 0000000000..091eb00232
--- /dev/null
+++ b/osu.Game/Rulesets/Replays/FramedAutoGenerator.cs
@@ -0,0 +1,44 @@
+// Copyright (c) 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
+
+using System.Collections.Generic;
+using System.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Replays;
+
+namespace osu.Game.Rulesets.Replays
+{
+    public abstract class FramedAutoGenerator<TFrame> : AutoGenerator
+        where TFrame : ReplayFrame
+    {
+        /// <summary>
+        /// The replay frames of the autoplay.
+        /// </summary>
+        protected readonly List<TFrame> Frames = new List<TFrame>();
+
+        protected TFrame? LastFrame => Frames.Count == 0 ? null : Frames[^1];
+
+        protected FramedAutoGenerator(IBeatmap beatmap)
+            : base(beatmap)
+        {
+        }
+
+        public sealed override Replay Generate()
+        {
+            Frames.Clear();
+            GenerateFrames();
+
+            return new Replay
+            {
+                Frames = Frames.OrderBy(frame => frame.Time).Cast<ReplayFrame>().ToList()
+            };
+        }
+
+        /// <summary>
+        /// Generate the replay frames of the autoplay and populate <see cref="Frames"/>.
+        /// </summary>
+        protected abstract void GenerateFrames();
+    }
+}

From ea35b72436d6c38a477d3ae3e8dfb11b15653248 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 6 May 2021 22:56:21 +0900
Subject: [PATCH 3154/3722] Remove unused IAutoGenerator interface

---
 osu.Game/Rulesets/Replays/IAutoGenerator.cs | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 osu.Game/Rulesets/Replays/IAutoGenerator.cs

diff --git a/osu.Game/Rulesets/Replays/IAutoGenerator.cs b/osu.Game/Rulesets/Replays/IAutoGenerator.cs
deleted file mode 100644
index b1905e2b6f..0000000000
--- a/osu.Game/Rulesets/Replays/IAutoGenerator.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.Replays;
-
-namespace osu.Game.Rulesets.Replays
-{
-    public interface IAutoGenerator
-    {
-        Replay Generate();
-    }
-}

From cf39178099c9178e5ef9136bfdabc6dbcdf5cc02 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 6 May 2021 21:53:34 +0900
Subject: [PATCH 3155/3722] Use FramedAutoGenerator in Taiko, Catch, Mania

OsuAutoGenerator is not included in this change because it uses SortedList-like thing
---
 .../Replays/CatchAutoGenerator.cs             | 20 ++++---------------
 .../Replays/ManiaAutoGenerator.cs             | 15 ++++----------
 .../Replays/TaikoAutoGenerator.cs             | 14 +++----------
 3 files changed, 11 insertions(+), 38 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs b/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
index 10230b6b78..2e1e4f7e77 100644
--- a/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
+++ b/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
@@ -5,7 +5,6 @@ using System;
 using System.Linq;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
-using osu.Game.Replays;
 using osu.Game.Rulesets.Catch.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.UI;
@@ -13,26 +12,19 @@ using osu.Game.Rulesets.Replays;
 
 namespace osu.Game.Rulesets.Catch.Replays
 {
-    internal class CatchAutoGenerator : AutoGenerator
+    internal class CatchAutoGenerator : FramedAutoGenerator<CatchReplayFrame>
     {
-        public const double RELEASE_DELAY = 20;
-
         public new CatchBeatmap Beatmap => (CatchBeatmap)base.Beatmap;
 
         public CatchAutoGenerator(IBeatmap beatmap)
             : base(beatmap)
         {
-            Replay = new Replay();
         }
 
-        protected Replay Replay;
-
-        private CatchReplayFrame currentFrame;
-
-        public override Replay Generate()
+        protected override void GenerateFrames()
         {
             if (Beatmap.HitObjects.Count == 0)
-                return Replay;
+                return;
 
             // todo: add support for HT DT
             const double dash_speed = Catcher.BASE_SPEED;
@@ -119,15 +111,11 @@ namespace osu.Game.Rulesets.Catch.Replays
                     }
                 }
             }
-
-            return Replay;
         }
 
         private void addFrame(double time, float? position = null, bool dashing = false)
         {
-            var last = currentFrame;
-            currentFrame = new CatchReplayFrame(time, position, dashing, last);
-            Replay.Frames.Add(currentFrame);
+            Frames.Add(new CatchReplayFrame(time, position, dashing, LastFrame));
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs b/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
index ada84dfac2..4fd105025c 100644
--- a/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using osu.Game.Replays;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Objects;
@@ -11,7 +10,7 @@ using osu.Game.Rulesets.Replays;
 
 namespace osu.Game.Rulesets.Mania.Replays
 {
-    internal class ManiaAutoGenerator : AutoGenerator
+    internal class ManiaAutoGenerator : FramedAutoGenerator<ManiaReplayFrame>
     {
         public const double RELEASE_DELAY = 20;
 
@@ -22,8 +21,6 @@ namespace osu.Game.Rulesets.Mania.Replays
         public ManiaAutoGenerator(ManiaBeatmap beatmap)
             : base(beatmap)
         {
-            Replay = new Replay();
-
             columnActions = new ManiaAction[Beatmap.TotalColumns];
 
             var normalAction = ManiaAction.Key1;
@@ -43,12 +40,10 @@ namespace osu.Game.Rulesets.Mania.Replays
             }
         }
 
-        protected Replay Replay;
-
-        public override Replay Generate()
+        protected override void GenerateFrames()
         {
             if (Beatmap.HitObjects.Count == 0)
-                return Replay;
+                return;
 
             var pointGroups = generateActionPoints().GroupBy(a => a.Time).OrderBy(g => g.First().Time);
 
@@ -70,10 +65,8 @@ namespace osu.Game.Rulesets.Mania.Replays
                     }
                 }
 
-                Replay.Frames.Add(new ManiaReplayFrame(group.First().Time, actions.ToArray()));
+                Frames.Add(new ManiaReplayFrame(group.First().Time, actions.ToArray()));
             }
-
-            return Replay;
         }
 
         private IEnumerable<IActionPoint> generateActionPoints()
diff --git a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
index fa0134aa94..bd2b7338de 100644
--- a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
+++ b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
@@ -2,10 +2,8 @@
 // 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.Replays;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Taiko.Beatmaps;
@@ -13,7 +11,7 @@ using osu.Game.Rulesets.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Replays
 {
-    public class TaikoAutoGenerator : AutoGenerator
+    public class TaikoAutoGenerator : FramedAutoGenerator<TaikoReplayFrame>
     {
         public new TaikoBeatmap Beatmap => (TaikoBeatmap)base.Beatmap;
 
@@ -22,16 +20,12 @@ namespace osu.Game.Rulesets.Taiko.Replays
         public TaikoAutoGenerator(IBeatmap beatmap)
             : base(beatmap)
         {
-            Replay = new Replay();
         }
 
-        protected Replay Replay;
-        protected List<ReplayFrame> Frames => Replay.Frames;
-
-        public override Replay Generate()
+        protected override void GenerateFrames()
         {
             if (Beatmap.HitObjects.Count == 0)
-                return Replay;
+                return;
 
             bool hitButton = true;
 
@@ -128,8 +122,6 @@ namespace osu.Game.Rulesets.Taiko.Replays
 
                 hitButton = !hitButton;
             }
-
-            return Replay;
         }
     }
 }

From 95c74c906a33084142a71bd16b58d4063f237bfb Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 6 May 2021 21:57:03 +0900
Subject: [PATCH 3156/3722] Use FramedAutoGenerator in template projects

---
 .../Replays/EmptyFreeformAutoGenerator.cs            | 12 ++----------
 .../Replays/PippidonAutoGenerator.cs                 | 12 ++----------
 .../Replays/EmptyScrollingAutoGenerator.cs           | 12 ++----------
 .../Replays/PippidonAutoGenerator.cs                 | 12 ++----------
 4 files changed, 8 insertions(+), 40 deletions(-)

diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformAutoGenerator.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformAutoGenerator.cs
index 6d8d4215a2..5d61136f54 100644
--- a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformAutoGenerator.cs
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformAutoGenerator.cs
@@ -1,28 +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.Collections.Generic;
 using osu.Game.Beatmaps;
-using osu.Game.Replays;
 using osu.Game.Rulesets.EmptyFreeform.Objects;
 using osu.Game.Rulesets.Replays;
 
 namespace osu.Game.Rulesets.EmptyFreeform.Replays
 {
-    public class EmptyFreeformAutoGenerator : AutoGenerator
+    public class EmptyFreeformAutoGenerator : FramedAutoGenerator<EmptyFreeformReplayFrame>
     {
-        protected Replay Replay;
-        protected List<ReplayFrame> Frames => Replay.Frames;
-
         public new Beatmap<EmptyFreeformHitObject> Beatmap => (Beatmap<EmptyFreeformHitObject>)base.Beatmap;
 
         public EmptyFreeformAutoGenerator(IBeatmap beatmap)
             : base(beatmap)
         {
-            Replay = new Replay();
         }
 
-        public override Replay Generate()
+        protected override void GenerateFrames()
         {
             Frames.Add(new EmptyFreeformReplayFrame());
 
@@ -35,8 +29,6 @@ namespace osu.Game.Rulesets.EmptyFreeform.Replays
                     // todo: add required inputs and extra frames.
                 });
             }
-
-            return Replay;
         }
     }
 }
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs
index 9c54b82e38..f795d7ef21 100644
--- a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs
@@ -1,28 +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.Collections.Generic;
 using osu.Game.Beatmaps;
-using osu.Game.Replays;
 using osu.Game.Rulesets.Pippidon.Objects;
 using osu.Game.Rulesets.Replays;
 
 namespace osu.Game.Rulesets.Pippidon.Replays
 {
-    public class PippidonAutoGenerator : AutoGenerator
+    public class PippidonAutoGenerator : FramedAutoGenerator<PippidonReplayFrame>
     {
-        protected Replay Replay;
-        protected List<ReplayFrame> Frames => Replay.Frames;
-
         public new Beatmap<PippidonHitObject> Beatmap => (Beatmap<PippidonHitObject>)base.Beatmap;
 
         public PippidonAutoGenerator(IBeatmap beatmap)
             : base(beatmap)
         {
-            Replay = new Replay();
         }
 
-        public override Replay Generate()
+        protected override void GenerateFrames()
         {
             Frames.Add(new PippidonReplayFrame());
 
@@ -34,8 +28,6 @@ namespace osu.Game.Rulesets.Pippidon.Replays
                     Position = hitObject.Position,
                 });
             }
-
-            return Replay;
         }
     }
 }
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingAutoGenerator.cs b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingAutoGenerator.cs
index 7923918842..ab27fd4dcd 100644
--- a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingAutoGenerator.cs
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingAutoGenerator.cs
@@ -1,28 +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.Collections.Generic;
 using osu.Game.Beatmaps;
-using osu.Game.Replays;
 using osu.Game.Rulesets.EmptyScrolling.Objects;
 using osu.Game.Rulesets.Replays;
 
 namespace osu.Game.Rulesets.EmptyScrolling.Replays
 {
-    public class EmptyScrollingAutoGenerator : AutoGenerator
+    public class EmptyScrollingAutoGenerator : FramedAutoGenerator<EmptyScrollingReplayFrame>
     {
-        protected Replay Replay;
-        protected List<ReplayFrame> Frames => Replay.Frames;
-
         public new Beatmap<EmptyScrollingHitObject> Beatmap => (Beatmap<EmptyScrollingHitObject>)base.Beatmap;
 
         public EmptyScrollingAutoGenerator(IBeatmap beatmap)
             : base(beatmap)
         {
-            Replay = new Replay();
         }
 
-        public override Replay Generate()
+        protected override void GenerateFrames()
         {
             Frames.Add(new EmptyScrollingReplayFrame());
 
@@ -34,8 +28,6 @@ namespace osu.Game.Rulesets.EmptyScrolling.Replays
                     // todo: add required inputs and extra frames.
                 });
             }
-
-            return Replay;
         }
     }
 }
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs
index bd99cdcdbd..df2cfb8731 100644
--- a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs
@@ -2,29 +2,23 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
 using osu.Game.Beatmaps;
-using osu.Game.Replays;
 using osu.Game.Rulesets.Pippidon.Objects;
 using osu.Game.Rulesets.Pippidon.UI;
 using osu.Game.Rulesets.Replays;
 
 namespace osu.Game.Rulesets.Pippidon.Replays
 {
-    public class PippidonAutoGenerator : AutoGenerator
+    public class PippidonAutoGenerator : FramedAutoGenerator<PippidonReplayFrame>
     {
-        protected Replay Replay;
-        protected List<ReplayFrame> Frames => Replay.Frames;
-
         public new Beatmap<PippidonHitObject> Beatmap => (Beatmap<PippidonHitObject>)base.Beatmap;
 
         public PippidonAutoGenerator(IBeatmap beatmap)
             : base(beatmap)
         {
-            Replay = new Replay();
         }
 
-        public override Replay Generate()
+        protected override void GenerateFrames()
         {
             int currentLane = 0;
 
@@ -55,8 +49,6 @@ namespace osu.Game.Rulesets.Pippidon.Replays
 
                 currentLane = hitObject.Lane;
             }
-
-            return Replay;
         }
 
         private void addFrame(double time, PippidonAction direction)

From 207f7f1e563ce252eb88affc19cdd09544d80212 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 7 May 2021 00:31:12 +0900
Subject: [PATCH 3157/3722] Rename FramedAutoGenerator<T> -> AutoGenerator<T>

---
 .../Replays/EmptyFreeformAutoGenerator.cs     |  2 +-
 .../Replays/PippidonAutoGenerator.cs          |  2 +-
 .../Replays/EmptyScrollingAutoGenerator.cs    |  2 +-
 .../Replays/PippidonAutoGenerator.cs          |  2 +-
 .../Replays/CatchAutoGenerator.cs             |  2 +-
 .../Replays/ManiaAutoGenerator.cs             |  2 +-
 .../Replays/TaikoAutoGenerator.cs             |  2 +-
 osu.Game/Rulesets/Replays/AutoGenerator.cs    | 36 +++++++++++++++
 .../Rulesets/Replays/FramedAutoGenerator.cs   | 44 -------------------
 9 files changed, 43 insertions(+), 51 deletions(-)
 delete mode 100644 osu.Game/Rulesets/Replays/FramedAutoGenerator.cs

diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformAutoGenerator.cs b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformAutoGenerator.cs
index 5d61136f54..62f394d1ce 100644
--- a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformAutoGenerator.cs
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Replays/EmptyFreeformAutoGenerator.cs
@@ -7,7 +7,7 @@ using osu.Game.Rulesets.Replays;
 
 namespace osu.Game.Rulesets.EmptyFreeform.Replays
 {
-    public class EmptyFreeformAutoGenerator : FramedAutoGenerator<EmptyFreeformReplayFrame>
+    public class EmptyFreeformAutoGenerator : AutoGenerator<EmptyFreeformReplayFrame>
     {
         public new Beatmap<EmptyFreeformHitObject> Beatmap => (Beatmap<EmptyFreeformHitObject>)base.Beatmap;
 
diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs
index f795d7ef21..612288257d 100644
--- a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs
@@ -7,7 +7,7 @@ using osu.Game.Rulesets.Replays;
 
 namespace osu.Game.Rulesets.Pippidon.Replays
 {
-    public class PippidonAutoGenerator : FramedAutoGenerator<PippidonReplayFrame>
+    public class PippidonAutoGenerator : AutoGenerator<PippidonReplayFrame>
     {
         public new Beatmap<PippidonHitObject> Beatmap => (Beatmap<PippidonHitObject>)base.Beatmap;
 
diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingAutoGenerator.cs b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingAutoGenerator.cs
index ab27fd4dcd..1058f756f3 100644
--- a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingAutoGenerator.cs
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Replays/EmptyScrollingAutoGenerator.cs
@@ -7,7 +7,7 @@ using osu.Game.Rulesets.Replays;
 
 namespace osu.Game.Rulesets.EmptyScrolling.Replays
 {
-    public class EmptyScrollingAutoGenerator : FramedAutoGenerator<EmptyScrollingReplayFrame>
+    public class EmptyScrollingAutoGenerator : AutoGenerator<EmptyScrollingReplayFrame>
     {
         public new Beatmap<EmptyScrollingHitObject> Beatmap => (Beatmap<EmptyScrollingHitObject>)base.Beatmap;
 
diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs
index df2cfb8731..724026273d 100644
--- a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Replays/PippidonAutoGenerator.cs
@@ -9,7 +9,7 @@ using osu.Game.Rulesets.Replays;
 
 namespace osu.Game.Rulesets.Pippidon.Replays
 {
-    public class PippidonAutoGenerator : FramedAutoGenerator<PippidonReplayFrame>
+    public class PippidonAutoGenerator : AutoGenerator<PippidonReplayFrame>
     {
         public new Beatmap<PippidonHitObject> Beatmap => (Beatmap<PippidonHitObject>)base.Beatmap;
 
diff --git a/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs b/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
index 2e1e4f7e77..a81703119a 100644
--- a/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
+++ b/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
@@ -12,7 +12,7 @@ using osu.Game.Rulesets.Replays;
 
 namespace osu.Game.Rulesets.Catch.Replays
 {
-    internal class CatchAutoGenerator : FramedAutoGenerator<CatchReplayFrame>
+    internal class CatchAutoGenerator : AutoGenerator<CatchReplayFrame>
     {
         public new CatchBeatmap Beatmap => (CatchBeatmap)base.Beatmap;
 
diff --git a/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs b/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
index 4fd105025c..517b708691 100644
--- a/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
+++ b/osu.Game.Rulesets.Mania/Replays/ManiaAutoGenerator.cs
@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Replays;
 
 namespace osu.Game.Rulesets.Mania.Replays
 {
-    internal class ManiaAutoGenerator : FramedAutoGenerator<ManiaReplayFrame>
+    internal class ManiaAutoGenerator : AutoGenerator<ManiaReplayFrame>
     {
         public const double RELEASE_DELAY = 20;
 
diff --git a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
index bd2b7338de..5fd281f9fa 100644
--- a/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
+++ b/osu.Game.Rulesets.Taiko/Replays/TaikoAutoGenerator.cs
@@ -11,7 +11,7 @@ using osu.Game.Rulesets.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Replays
 {
-    public class TaikoAutoGenerator : FramedAutoGenerator<TaikoReplayFrame>
+    public class TaikoAutoGenerator : AutoGenerator<TaikoReplayFrame>
     {
         public new TaikoBeatmap Beatmap => (TaikoBeatmap)base.Beatmap;
 
diff --git a/osu.Game/Rulesets/Replays/AutoGenerator.cs b/osu.Game/Rulesets/Replays/AutoGenerator.cs
index 4bdd5b094d..6ce857b14b 100644
--- a/osu.Game/Rulesets/Replays/AutoGenerator.cs
+++ b/osu.Game/Rulesets/Replays/AutoGenerator.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 System.Collections.Generic;
+using System.Linq;
+using JetBrains.Annotations;
 using osu.Game.Beatmaps;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Objects;
@@ -37,4 +40,37 @@ namespace osu.Game.Rulesets.Replays
             return Beatmap.HitObjects[currentIndex + 1];
         }
     }
+
+    public abstract class AutoGenerator<TFrame> : AutoGenerator
+        where TFrame : ReplayFrame
+    {
+        /// <summary>
+        /// The replay frames of the autoplay.
+        /// </summary>
+        protected readonly List<TFrame> Frames = new List<TFrame>();
+
+        [CanBeNull]
+        protected TFrame LastFrame => Frames.Count == 0 ? null : Frames[^1];
+
+        protected AutoGenerator(IBeatmap beatmap)
+            : base(beatmap)
+        {
+        }
+
+        public sealed override Replay Generate()
+        {
+            Frames.Clear();
+            GenerateFrames();
+
+            return new Replay
+            {
+                Frames = Frames.OrderBy(frame => frame.Time).Cast<ReplayFrame>().ToList()
+            };
+        }
+
+        /// <summary>
+        /// Generate the replay frames of the autoplay and populate <see cref="Frames"/>.
+        /// </summary>
+        protected abstract void GenerateFrames();
+    }
 }
diff --git a/osu.Game/Rulesets/Replays/FramedAutoGenerator.cs b/osu.Game/Rulesets/Replays/FramedAutoGenerator.cs
deleted file mode 100644
index 091eb00232..0000000000
--- a/osu.Game/Rulesets/Replays/FramedAutoGenerator.cs
+++ /dev/null
@@ -1,44 +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 enable
-
-using System.Collections.Generic;
-using System.Linq;
-using osu.Game.Beatmaps;
-using osu.Game.Replays;
-
-namespace osu.Game.Rulesets.Replays
-{
-    public abstract class FramedAutoGenerator<TFrame> : AutoGenerator
-        where TFrame : ReplayFrame
-    {
-        /// <summary>
-        /// The replay frames of the autoplay.
-        /// </summary>
-        protected readonly List<TFrame> Frames = new List<TFrame>();
-
-        protected TFrame? LastFrame => Frames.Count == 0 ? null : Frames[^1];
-
-        protected FramedAutoGenerator(IBeatmap beatmap)
-            : base(beatmap)
-        {
-        }
-
-        public sealed override Replay Generate()
-        {
-            Frames.Clear();
-            GenerateFrames();
-
-            return new Replay
-            {
-                Frames = Frames.OrderBy(frame => frame.Time).Cast<ReplayFrame>().ToList()
-            };
-        }
-
-        /// <summary>
-        /// Generate the replay frames of the autoplay and populate <see cref="Frames"/>.
-        /// </summary>
-        protected abstract void GenerateFrames();
-    }
-}

From 283488ea53f3c240ca1c856bb294ab8247a476d1 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 7 May 2021 03:36:30 +0300
Subject: [PATCH 3158/3722] Use `TransformImmediately` instead at beatmap
 listing search control

Applies two changes:
 - Use `TransformImmediately` which achieves the same wanted transition behaviour without any issues.
 - Move the transition behaviour override into `BeatmapListingSearchControl` in a nested subclass of `UpdateableBeatmapSetCover`.
---
 osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs   | 4 ----
 .../Overlays/BeatmapListing/BeatmapListingSearchControl.cs | 7 ++++++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
index b376690436..3a4423e42e 100644
--- a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
+++ b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
@@ -41,10 +41,6 @@ namespace osu.Game.Beatmaps.Drawables
         protected override DelayedLoadWrapper CreateDelayedLoadWrapper(Func<Drawable> createContentFunc, double timeBeforeLoad)
             => new DelayedLoadUnloadWrapper(createContentFunc, timeBeforeLoad);
 
-        // by default, ModelBackedDrawable hides the old drawable only after the new one has been fully loaded.
-        // this can lead to weird appearance if the cover is not fully opaque, so fade out as soon as a new load is requested in this particular case.
-        protected override void OnLoadStarted() => ApplyHideTransforms(DisplayedDrawable);
-
         protected override Drawable CreateDrawable(BeatmapSetInfo model)
         {
             if (model == null)
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
index 1576431d40..97ccb66599 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
@@ -90,7 +90,7 @@ namespace osu.Game.Overlays.BeatmapListing
                 {
                     RelativeSizeAxes = Axes.Both,
                     Masking = true,
-                    Child = beatmapCover = new UpdateableBeatmapSetCover
+                    Child = beatmapCover = new TopSearchBeatmapSetCover
                     {
                         RelativeSizeAxes = Axes.Both,
                         Alpha = 0,
@@ -184,5 +184,10 @@ namespace osu.Game.Overlays.BeatmapListing
                 return true;
             }
         }
+
+        private class TopSearchBeatmapSetCover : UpdateableBeatmapSetCover
+        {
+            protected override bool TransformImmediately => true;
+        }
     }
 }

From 54fe10c82a855a16c88f8781a9ae12dc42df7b0e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 May 2021 10:36:03 +0900
Subject: [PATCH 3159/3722] Refactor `SliderSelectionBlueprint` to not
 reference blueprint pieces for input handling

---
 .../Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs   | 6 ------
 .../Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs     | 4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)

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 6e22c35ab3..ece9c7a757 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
@@ -26,10 +26,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             {
                 AccentColour = Color4.Transparent
             };
-
-            // SliderSelectionBlueprint relies on calling ReceivePositionalInputAt on this drawable to determine whether selection should occur.
-            // Without AlwaysPresent, a movement in a parent container (ie. the editor composer area resizing) could cause incorrect input handling.
-            AlwaysPresent = true;
         }
 
         [BackgroundDependencyLoader]
@@ -54,7 +50,5 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         }
 
         public void RecyclePath() => body.RecyclePath();
-
-        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => body.ReceivePositionalInputAt(screenSpacePos);
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 88fcb1e715..32d2fba25e 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -240,10 +240,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             new OsuMenuItem("Add control point", MenuItemType.Standard, () => addControlPoint(rightClickPosition)),
         };
 
-        public override Vector2 ScreenSpaceSelectionPoint => BodyPiece.ToScreenSpace(BodyPiece.PathStartLocation);
+        public override Vector2 ScreenSpaceSelectionPoint => this.ToScreenSpace(slider.HitObject.StackedPosition);
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
-            BodyPiece.ReceivePositionalInputAt(screenSpacePos) || ControlPointVisualiser?.Pieces.Any(p => p.ReceivePositionalInputAt(screenSpacePos)) == true;
+            slider.ReceivePositionalInputAt(screenSpacePos) || ControlPointVisualiser?.Pieces.Any(p => p.ReceivePositionalInputAt(screenSpacePos)) == true;
 
         protected virtual SliderCircleSelectionBlueprint CreateCircleSelectionBlueprint(DrawableSlider slider, SliderPosition position) => new SliderCircleSelectionBlueprint(slider, position);
     }

From 84da24700204724cde9a8b90506b078add49c964 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 7 May 2021 05:32:55 +0300
Subject: [PATCH 3160/3722] Fix editor clock using the wrong beatmap track on
 creation

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

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index da0e9ebbaf..138d8cfaff 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -145,7 +145,7 @@ namespace osu.Game.Screens.Edit
             // Todo: should probably be done at a DrawableRuleset level to share logic with Player.
             clock = new EditorClock(playableBeatmap, beatDivisor) { IsCoupled = false };
 
-            UpdateClockSource();
+            updateClockSource(loadableBeatmap);
 
             dependencies.CacheAs(clock);
             AddInternal(clock);
@@ -308,9 +308,11 @@ namespace osu.Game.Screens.Edit
         /// <summary>
         /// If the beatmap's track has changed, this method must be called to keep the editor in a valid state.
         /// </summary>
-        public void UpdateClockSource()
+        public void UpdateClockSource() => updateClockSource(Beatmap.Value);
+
+        private void updateClockSource(WorkingBeatmap beatmap)
         {
-            var sourceClock = (IAdjustableClock)Beatmap.Value.Track ?? new StopwatchClock();
+            var sourceClock = (IAdjustableClock)beatmap.Track ?? new StopwatchClock();
             clock.ChangeSource(sourceClock);
         }
 

From 539643c72b390b1c40b8fb8340b37f33ef91d7d5 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 7 May 2021 07:18:43 +0300
Subject: [PATCH 3161/3722] Set loadable beatmap track to clock immediately in
 BDL

This reverts commit 84da24700204724cde9a8b90506b078add49c964.

Use loadable beatmap track for clock directly in BDL
---
 osu.Game/Screens/Edit/Editor.cs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 138d8cfaff..a4c331c4e0 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -144,8 +144,7 @@ namespace osu.Game.Screens.Edit
 
             // Todo: should probably be done at a DrawableRuleset level to share logic with Player.
             clock = new EditorClock(playableBeatmap, beatDivisor) { IsCoupled = false };
-
-            updateClockSource(loadableBeatmap);
+            clock.ChangeSource(loadableBeatmap.Track);
 
             dependencies.CacheAs(clock);
             AddInternal(clock);
@@ -308,11 +307,9 @@ namespace osu.Game.Screens.Edit
         /// <summary>
         /// If the beatmap's track has changed, this method must be called to keep the editor in a valid state.
         /// </summary>
-        public void UpdateClockSource() => updateClockSource(Beatmap.Value);
-
-        private void updateClockSource(WorkingBeatmap beatmap)
+        public void UpdateClockSource()
         {
-            var sourceClock = (IAdjustableClock)beatmap.Track ?? new StopwatchClock();
+            var sourceClock = (IAdjustableClock)Beatmap.Value.Track ?? new StopwatchClock();
             clock.ChangeSource(sourceClock);
         }
 

From f9d99a98826525b58d8a076f772da6a9a77329ec Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 7 May 2021 07:25:14 +0300
Subject: [PATCH 3162/3722] Mark `WorkingBeatmap.Track` as not null

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

diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index e0eeaf6db0..bef258753e 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -298,6 +298,7 @@ namespace osu.Game.Beatmaps
         /// Get the loaded audio track instance. <see cref="LoadTrack"/> must have first been called.
         /// This generally happens via MusicController when changing the global beatmap.
         /// </summary>
+        [NotNull]
         public Track Track
         {
             get

From 71547bece0dcd99cfbe6ba95bd2e42066b6eb686 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 7 May 2021 07:43:06 +0300
Subject: [PATCH 3163/3722] Remove any null-coalescing/conditionals in
 `WorkingBeatmap.Track` usages

---
 osu.Game/Screens/Edit/Editor.cs               | 9 ++-------
 osu.Game/Tests/Visual/EditorClockTestScene.cs | 3 +--
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index a4c331c4e0..434683a016 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -17,7 +17,6 @@ using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
-using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
@@ -307,11 +306,7 @@ namespace osu.Game.Screens.Edit
         /// <summary>
         /// If the beatmap's track has changed, this method must be called to keep the editor in a valid state.
         /// </summary>
-        public void UpdateClockSource()
-        {
-            var sourceClock = (IAdjustableClock)Beatmap.Value.Track ?? new StopwatchClock();
-            clock.ChangeSource(sourceClock);
-        }
+        public void UpdateClockSource() => clock.ChangeSource(Beatmap.Value.Track);
 
         protected void Save()
         {
@@ -582,7 +577,7 @@ namespace osu.Game.Screens.Edit
 
         private void resetTrack(bool seekToStart = false)
         {
-            Beatmap.Value.Track?.Stop();
+            Beatmap.Value.Track.Stop();
 
             if (seekToStart)
             {
diff --git a/osu.Game/Tests/Visual/EditorClockTestScene.cs b/osu.Game/Tests/Visual/EditorClockTestScene.cs
index 79cfee8518..34393fba7d 100644
--- a/osu.Game/Tests/Visual/EditorClockTestScene.cs
+++ b/osu.Game/Tests/Visual/EditorClockTestScene.cs
@@ -4,7 +4,6 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Input.Events;
-using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Screens.Edit;
@@ -46,7 +45,7 @@ namespace osu.Game.Tests.Visual
         private void beatmapChanged(ValueChangedEvent<WorkingBeatmap> e)
         {
             Clock.ControlPointInfo = e.NewValue.Beatmap.ControlPointInfo;
-            Clock.ChangeSource((IAdjustableClock)e.NewValue.Track ?? new StopwatchClock());
+            Clock.ChangeSource(e.NewValue.Track);
             Clock.ProcessFrame();
         }
 

From c7325f0f775357a51f8d1c9963c825f8fc32cd2a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 7 May 2021 08:07:12 +0300
Subject: [PATCH 3164/3722] Add missing load delay

That was a bad one... `ModelBackedDrawable` has a default of 0ms load delay, while previously the wrapper created for beatmap set cover used default 500ms, this change is bringing the load delay back, to avoid firing hundreds of web requests just when doing a quick long scroll on beatmap listing.
---
 osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
index 3a4423e42e..7248c9213c 100644
--- a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
+++ b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
@@ -36,7 +36,9 @@ namespace osu.Game.Beatmaps.Drawables
             };
         }
 
-        protected override double TransformDuration => 400.0;
+        protected override double LoadDelay => 500;
+
+        protected override double TransformDuration => 400;
 
         protected override DelayedLoadWrapper CreateDelayedLoadWrapper(Func<Drawable> createContentFunc, double timeBeforeLoad)
             => new DelayedLoadUnloadWrapper(createContentFunc, timeBeforeLoad);

From 37f44d2e37602ec557ed7fda6ca7afced0bfec81 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 7 May 2021 08:27:56 +0300
Subject: [PATCH 3165/3722] Revert wrong not-null track changes

This reverts commit f9d99a98826525b58d8a076f772da6a9a77329ec.
This reverts commit 71547bece0dcd99cfbe6ba95bd2e42066b6eb686.
---
 osu.Game/Beatmaps/WorkingBeatmap.cs           | 1 -
 osu.Game/Screens/Edit/Editor.cs               | 9 +++++++--
 osu.Game/Tests/Visual/EditorClockTestScene.cs | 3 ++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index bef258753e..e0eeaf6db0 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -298,7 +298,6 @@ namespace osu.Game.Beatmaps
         /// Get the loaded audio track instance. <see cref="LoadTrack"/> must have first been called.
         /// This generally happens via MusicController when changing the global beatmap.
         /// </summary>
-        [NotNull]
         public Track Track
         {
             get
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 434683a016..a4c331c4e0 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -17,6 +17,7 @@ using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
+using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
@@ -306,7 +307,11 @@ namespace osu.Game.Screens.Edit
         /// <summary>
         /// If the beatmap's track has changed, this method must be called to keep the editor in a valid state.
         /// </summary>
-        public void UpdateClockSource() => clock.ChangeSource(Beatmap.Value.Track);
+        public void UpdateClockSource()
+        {
+            var sourceClock = (IAdjustableClock)Beatmap.Value.Track ?? new StopwatchClock();
+            clock.ChangeSource(sourceClock);
+        }
 
         protected void Save()
         {
@@ -577,7 +582,7 @@ namespace osu.Game.Screens.Edit
 
         private void resetTrack(bool seekToStart = false)
         {
-            Beatmap.Value.Track.Stop();
+            Beatmap.Value.Track?.Stop();
 
             if (seekToStart)
             {
diff --git a/osu.Game/Tests/Visual/EditorClockTestScene.cs b/osu.Game/Tests/Visual/EditorClockTestScene.cs
index 34393fba7d..79cfee8518 100644
--- a/osu.Game/Tests/Visual/EditorClockTestScene.cs
+++ b/osu.Game/Tests/Visual/EditorClockTestScene.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Input.Events;
+using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Screens.Edit;
@@ -45,7 +46,7 @@ namespace osu.Game.Tests.Visual
         private void beatmapChanged(ValueChangedEvent<WorkingBeatmap> e)
         {
             Clock.ControlPointInfo = e.NewValue.Beatmap.ControlPointInfo;
-            Clock.ChangeSource(e.NewValue.Track);
+            Clock.ChangeSource((IAdjustableClock)e.NewValue.Track ?? new StopwatchClock());
             Clock.ProcessFrame();
         }
 

From b1134c3857980e5f473dc3ba3f57d1ab7bdcabdb Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 7 May 2021 08:30:50 +0300
Subject: [PATCH 3166/3722] Guard against potentially null track if ever

---
 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 a4c331c4e0..78d5c24108 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -144,7 +144,7 @@ namespace osu.Game.Screens.Edit
 
             // Todo: should probably be done at a DrawableRuleset level to share logic with Player.
             clock = new EditorClock(playableBeatmap, beatDivisor) { IsCoupled = false };
-            clock.ChangeSource(loadableBeatmap.Track);
+            clock.ChangeSource((IAdjustableClock)loadableBeatmap.Track ?? new StopwatchClock());
 
             dependencies.CacheAs(clock);
             AddInternal(clock);

From bdfe44ddca7235cd7a42bac8015f2e55b13bf905 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 7 May 2021 13:19:30 +0700
Subject: [PATCH 3167/3722] change OsuMarkdownListItem to abstract class

---
 .../Markdown/OsuMarkdownListItem.cs           | 72 +++----------------
 1 file changed, 10 insertions(+), 62 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
index b586bb7f30..8c4c3e1da2 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownListItem.cs
@@ -1,41 +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 Markdig.Syntax;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Containers.Markdown;
+using osu.Framework.Graphics.Sprites;
 using osuTK;
 
 namespace osu.Game.Graphics.Containers.Markdown
 {
-    public class OsuMarkdownListItem : CompositeDrawable
+    public abstract class OsuMarkdownListItem : CompositeDrawable
     {
-        private const float ordered_left_padding = 30;
-        private const float unordered_left_padding = 20;
-
-        private readonly int level;
-        private readonly int order;
-        private readonly bool isOrdered;
-
         [Resolved]
         private IMarkdownTextComponent parentTextComponent { get; set; }
 
-        public FillFlowContainer Content { get; }
+        public FillFlowContainer Content { get; private set; }
 
-        public OsuMarkdownListItem(ListItemBlock listItemBlock, int level)
+        protected OsuMarkdownListItem()
         {
-            this.level = level;
-            order = listItemBlock.Order;
-            isOrdered = ((ListBlock)listItemBlock.Parent).IsOrdered;
-
             AutoSizeAxes = Axes.Y;
             RelativeSizeAxes = Axes.X;
-            Padding = new MarginPadding { Left = isOrdered ? ordered_left_padding : unordered_left_padding };
+        }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
             InternalChildren = new Drawable[]
             {
+                CreateMarker(),
                 Content = new FillFlowContainer
                 {
                     AutoSizeAxes = Axes.Y,
@@ -46,51 +39,6 @@ namespace osu.Game.Graphics.Containers.Markdown
             };
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            var marker = parentTextComponent.CreateSpriteText();
-            marker.Text = GetTextMarker(level, isOrdered);
-
-            if (isOrdered)
-            {
-                marker.X = -ordered_left_padding;
-            }
-            else
-            {
-                marker.Font = OsuFont.GetFont(size: marker.Font.Size / 2);
-                marker.Origin = Anchor.Centre;
-                marker.X = -unordered_left_padding / 2;
-                marker.Y = marker.Font.Size;
-            }
-
-            AddInternal(marker);
-        }
-
-        /// <summary>
-        /// Get text marker based on <paramref name="level"/> and <paramref name="isOrdered"/>.
-        /// </summary>
-        /// <param name="level">The markdown level of current list item.</param>
-        /// <param name="isOrdered">Is true if the list item is an ordered list.</param>
-        /// <returns></returns>
-        protected virtual string GetTextMarker(int level, bool isOrdered)
-        {
-            if (isOrdered)
-            {
-                return $"{order}.";
-            }
-
-            switch (level)
-            {
-                case 1:
-                    return "●";
-
-                case 2:
-                    return "○";
-
-                default:
-                    return "■";
-            }
-        }
+        protected virtual SpriteText CreateMarker() => parentTextComponent.CreateSpriteText();
     }
 }

From dfcf760b7be0592eb4212e3fdc9bc21073eaaa59 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 7 May 2021 13:20:06 +0700
Subject: [PATCH 3168/3722] add OsuMarkdownOrderedListItem

---
 .../Markdown/OsuMarkdownOrderedListItem.cs    | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 osu.Game/Graphics/Containers/Markdown/OsuMarkdownOrderedListItem.cs

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownOrderedListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownOrderedListItem.cs
new file mode 100644
index 0000000000..8fedb189b2
--- /dev/null
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownOrderedListItem.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.Sprites;
+
+namespace osu.Game.Graphics.Containers.Markdown
+{
+    public class OsuMarkdownOrderedListItem : OsuMarkdownListItem
+    {
+        private const float left_padding = 30;
+
+        private readonly int order;
+
+        public OsuMarkdownOrderedListItem(int order)
+        {
+            this.order = order;
+            Padding = new MarginPadding { Left = left_padding };
+        }
+
+        protected override SpriteText CreateMarker() => base.CreateMarker().With(t =>
+        {
+            t.X = -left_padding;
+            t.Text = $"{order}.";
+        });
+    }
+}

From 9233248a0ba84919802e8dbae203a5a95b2fceaa Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 7 May 2021 13:20:20 +0700
Subject: [PATCH 3169/3722] add OsuMarkdownUnorderedListItem

---
 .../Markdown/OsuMarkdownUnorderedListItem.cs  | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 osu.Game/Graphics/Containers/Markdown/OsuMarkdownUnorderedListItem.cs

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownUnorderedListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownUnorderedListItem.cs
new file mode 100644
index 0000000000..8bfaf8ad21
--- /dev/null
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownUnorderedListItem.cs
@@ -0,0 +1,51 @@
+// Copyright (c) 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;
+
+namespace osu.Game.Graphics.Containers.Markdown
+{
+    public class OsuMarkdownUnorderedListItem : OsuMarkdownListItem
+    {
+        private const float left_padding = 20;
+
+        private readonly int level;
+
+        public OsuMarkdownUnorderedListItem(int level)
+        {
+            this.level = level;
+
+            Padding = new MarginPadding { Left = left_padding };
+        }
+
+        protected override SpriteText CreateMarker() => base.CreateMarker().With(t =>
+        {
+            t.Text = GetTextMarker(level);
+            t.Font = t.Font.With(size: t.Font.Size / 2);
+            t.Origin = Anchor.Centre;
+            t.X = -left_padding / 2;
+            t.Y = t.Font.Size;
+        });
+
+        /// <summary>
+        /// Get text marker based on <paramref name="level"/>
+        /// </summary>
+        /// <param name="level">The markdown level of current list item.</param>
+        /// <returns></returns>
+        protected virtual string GetTextMarker(int level)
+        {
+            switch (level)
+            {
+                case 1:
+                    return "●";
+
+                case 2:
+                    return "○";
+
+                default:
+                    return "■";
+            }
+        }
+    }
+}

From 5b003750f87044d16288b7b992023cc8011bf832 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 7 May 2021 13:20:48 +0700
Subject: [PATCH 3170/3722] change CreateListItem method in
 OsuMarkdownContainer

---
 .../Containers/Markdown/OsuMarkdownContainer.cs       | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index c66f3fbca2..6facf4e26c 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -30,7 +30,8 @@ namespace osu.Game.Graphics.Containers.Markdown
                     break;
 
                 case ListItemBlock listItemBlock:
-                    var childContainer = CreateListItem(listItemBlock, level);
+                    var isOrdered = ((ListBlock)listItemBlock.Parent).IsOrdered;
+                    var childContainer = CreateListItem(listItemBlock, level, isOrdered);
                     container.Add(childContainer);
                     foreach (var single in listItemBlock)
                         base.AddMarkdownComponent(single, childContainer.Content, level);
@@ -64,7 +65,13 @@ namespace osu.Game.Graphics.Containers.Markdown
             Padding = new MarginPadding(0)
         };
 
-        protected virtual OsuMarkdownListItem CreateListItem(ListItemBlock listItemBlock, int level) => new OsuMarkdownListItem(listItemBlock, level);
+        protected virtual OsuMarkdownListItem CreateListItem(ListItemBlock listItemBlock, int level, bool isOrdered)
+        {
+            if (isOrdered)
+                return new OsuMarkdownOrderedListItem(listItemBlock.Order);
+
+            return new OsuMarkdownUnorderedListItem(level);
+        }
 
         protected override MarkdownPipeline CreateBuilder()
             => new MarkdownPipelineBuilder().UseAutoIdentifiers(AutoIdentifierOptions.GitHub)

From 7c4e54a1d43990996e015affd03911514dc18952 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 7 May 2021 09:53:54 +0300
Subject: [PATCH 3171/3722] Unrevert null-colaescing/conditionals removal

---
 osu.Game/Screens/Edit/Editor.cs               | 8 ++------
 osu.Game/Tests/Visual/EditorClockTestScene.cs | 3 +--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 78d5c24108..50dcb84235 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -307,11 +307,7 @@ namespace osu.Game.Screens.Edit
         /// <summary>
         /// If the beatmap's track has changed, this method must be called to keep the editor in a valid state.
         /// </summary>
-        public void UpdateClockSource()
-        {
-            var sourceClock = (IAdjustableClock)Beatmap.Value.Track ?? new StopwatchClock();
-            clock.ChangeSource(sourceClock);
-        }
+        public void UpdateClockSource() => clock.ChangeSource(Beatmap.Value.Track);
 
         protected void Save()
         {
@@ -582,7 +578,7 @@ namespace osu.Game.Screens.Edit
 
         private void resetTrack(bool seekToStart = false)
         {
-            Beatmap.Value.Track?.Stop();
+            Beatmap.Value.Track.Stop();
 
             if (seekToStart)
             {
diff --git a/osu.Game/Tests/Visual/EditorClockTestScene.cs b/osu.Game/Tests/Visual/EditorClockTestScene.cs
index 79cfee8518..34393fba7d 100644
--- a/osu.Game/Tests/Visual/EditorClockTestScene.cs
+++ b/osu.Game/Tests/Visual/EditorClockTestScene.cs
@@ -4,7 +4,6 @@
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Input.Events;
-using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Screens.Edit;
@@ -46,7 +45,7 @@ namespace osu.Game.Tests.Visual
         private void beatmapChanged(ValueChangedEvent<WorkingBeatmap> e)
         {
             Clock.ControlPointInfo = e.NewValue.Beatmap.ControlPointInfo;
-            Clock.ChangeSource((IAdjustableClock)e.NewValue.Track ?? new StopwatchClock());
+            Clock.ChangeSource(e.NewValue.Track);
             Clock.ProcessFrame();
         }
 

From fc2a527e9d419040697cd4e075c7ae04d1cd2c82 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 7 May 2021 09:54:58 +0300
Subject: [PATCH 3172/3722] Revert "Guard against potentially null track if
 ever"

This reverts commit b1134c3857980e5f473dc3ba3f57d1ab7bdcabdb.
---
 osu.Game/Screens/Edit/Editor.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 50dcb84235..434683a016 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -17,7 +17,6 @@ using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
-using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
@@ -144,7 +143,7 @@ namespace osu.Game.Screens.Edit
 
             // Todo: should probably be done at a DrawableRuleset level to share logic with Player.
             clock = new EditorClock(playableBeatmap, beatDivisor) { IsCoupled = false };
-            clock.ChangeSource((IAdjustableClock)loadableBeatmap.Track ?? new StopwatchClock());
+            clock.ChangeSource(loadableBeatmap.Track);
 
             dependencies.CacheAs(clock);
             AddInternal(clock);

From a2e4fb5b6b0cc7cd97fa439a9e2e1b13dcb6f10e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 May 2021 16:10:57 +0900
Subject: [PATCH 3173/3722] Update `ScoreCounter` components to bind outwards

---
 .../TestSceneSkinnableScoreCounter.cs         | 26 ++++------
 .../Graphics/UserInterface/ScoreCounter.cs    |  3 +-
 .../Screens/Play/HUD/DefaultScoreCounter.cs   |  3 +-
 .../Screens/Play/HUD/GameplayScoreCounter.cs  | 46 ++++++++++++++++++
 osu.Game/Screens/Play/HUD/IScoreCounter.cs    | 25 ----------
 .../Screens/Play/HUD/SkinnableScoreCounter.cs | 47 +------------------
 osu.Game/Screens/Play/HUDOverlay.cs           |  1 -
 osu.Game/Skinning/LegacyScoreCounter.cs       |  4 +-
 8 files changed, 60 insertions(+), 95 deletions(-)
 create mode 100644 osu.Game/Screens/Play/HUD/GameplayScoreCounter.cs
 delete mode 100644 osu.Game/Screens/Play/HUD/IScoreCounter.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs
index e212ceeba7..4f2183711e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs
@@ -4,10 +4,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -18,37 +20,27 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
 
+        [Cached]
+        private ScoreProcessor scoreProcessor = new ScoreProcessor();
+
         [SetUpSteps]
         public void SetUpSteps()
         {
-            AddStep("Create combo counters", () => SetContents(() =>
-            {
-                var comboCounter = new SkinnableScoreCounter();
-                comboCounter.Current.Value = 1;
-                return comboCounter;
-            }));
+            AddStep("Create score counters", () => SetContents(() => new SkinnableScoreCounter()));
         }
 
         [Test]
         public void TestScoreCounterIncrementing()
         {
-            AddStep(@"Reset all", delegate
-            {
-                foreach (var s in scoreCounters)
-                    s.Current.Value = 0;
-            });
+            AddStep(@"Reset all", () => scoreProcessor.TotalScore.Value = 0);
 
-            AddStep(@"Hit! :D", delegate
-            {
-                foreach (var s in scoreCounters)
-                    s.Current.Value += 300;
-            });
+            AddStep(@"Hit! :D", () => scoreProcessor.TotalScore.Value += 300);
         }
 
         [Test]
         public void TestVeryLargeScore()
         {
-            AddStep("set large score", () => scoreCounters.ForEach(counter => counter.Current.Value = 1_000_000_000));
+            AddStep("set large score", () => scoreCounters.ForEach(counter => scoreProcessor.TotalScore.Value = 1_000_000_000));
         }
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/ScoreCounter.cs b/osu.Game/Graphics/UserInterface/ScoreCounter.cs
index d75e49a4ce..5747c846eb 100644
--- a/osu.Game/Graphics/UserInterface/ScoreCounter.cs
+++ b/osu.Game/Graphics/UserInterface/ScoreCounter.cs
@@ -4,11 +4,10 @@
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Graphics.UserInterface
 {
-    public abstract class ScoreCounter : RollingCounter<double>, IScoreCounter
+    public abstract class ScoreCounter : RollingCounter<double>
     {
         protected override double RollingDuration => 1000;
         protected override Easing RollingEasing => Easing.Out;
diff --git a/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs b/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
index 1dcfe2e067..84db605d53 100644
--- a/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
@@ -4,11 +4,10 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
-using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class DefaultScoreCounter : ScoreCounter
+    public class DefaultScoreCounter : GameplayScoreCounter
     {
         public DefaultScoreCounter()
             : base(6)
diff --git a/osu.Game/Screens/Play/HUD/GameplayScoreCounter.cs b/osu.Game/Screens/Play/HUD/GameplayScoreCounter.cs
new file mode 100644
index 0000000000..e09630d2c4
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/GameplayScoreCounter.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;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public abstract class GameplayScoreCounter : ScoreCounter
+    {
+        private Bindable<ScoringMode> scoreDisplayMode;
+
+        protected GameplayScoreCounter(int leading = 0, bool useCommaSeparator = false)
+            : base(leading, useCommaSeparator)
+        {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config, ScoreProcessor scoreProcessor)
+        {
+            scoreDisplayMode = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode);
+            scoreDisplayMode.BindValueChanged(scoreMode =>
+            {
+                switch (scoreMode.NewValue)
+                {
+                    case ScoringMode.Standardised:
+                        RequiredDisplayDigits.Value = 6;
+                        break;
+
+                    case ScoringMode.Classic:
+                        RequiredDisplayDigits.Value = 8;
+                        break;
+
+                    default:
+                        throw new ArgumentOutOfRangeException(nameof(scoreMode));
+                }
+            }, true);
+
+            Current.BindTo(scoreProcessor.TotalScore);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/IScoreCounter.cs b/osu.Game/Screens/Play/HUD/IScoreCounter.cs
deleted file mode 100644
index 7f5e81d5ef..0000000000
--- a/osu.Game/Screens/Play/HUD/IScoreCounter.cs
+++ /dev/null
@@ -1,25 +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.Bindables;
-using osu.Framework.Graphics;
-
-namespace osu.Game.Screens.Play.HUD
-{
-    /// <summary>
-    /// An interface providing a set of methods to update a score counter.
-    /// </summary>
-    public interface IScoreCounter : IDrawable
-    {
-        /// <summary>
-        /// The current score to be displayed.
-        /// </summary>
-        Bindable<double> Current { get; }
-
-        /// <summary>
-        /// The number of digits required to display most sane scores.
-        /// This may be exceeded in very rare cases, but is useful to pad or space the display to avoid it jumping around.
-        /// </summary>
-        Bindable<int> RequiredDisplayDigits { get; }
-    }
-}
diff --git a/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs
index b46f5684b1..cc9a712e97 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs
@@ -1,61 +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 osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Game.Configuration;
-using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class SkinnableScoreCounter : SkinnableDrawable, IScoreCounter
+    public class SkinnableScoreCounter : SkinnableDrawable
     {
-        public Bindable<double> Current { get; } = new Bindable<double>();
-
-        private Bindable<ScoringMode> scoreDisplayMode;
-
-        public Bindable<int> RequiredDisplayDigits { get; } = new Bindable<int>();
-
         public SkinnableScoreCounter()
             : base(new HUDSkinComponent(HUDSkinComponents.ScoreCounter), _ => new DefaultScoreCounter())
         {
             CentreComponent = false;
         }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
-        {
-            scoreDisplayMode = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode);
-            scoreDisplayMode.BindValueChanged(scoreMode =>
-            {
-                switch (scoreMode.NewValue)
-                {
-                    case ScoringMode.Standardised:
-                        RequiredDisplayDigits.Value = 6;
-                        break;
-
-                    case ScoringMode.Classic:
-                        RequiredDisplayDigits.Value = 8;
-                        break;
-
-                    default:
-                        throw new ArgumentOutOfRangeException(nameof(scoreMode));
-                }
-            }, true);
-        }
-
-        private IScoreCounter skinnedCounter;
-
-        protected override void SkinChanged(ISkinSource skin, bool allowFallback)
-        {
-            base.SkinChanged(skin, allowFallback);
-
-            skinnedCounter = Drawable as IScoreCounter;
-
-            skinnedCounter?.Current.BindTo(Current);
-            skinnedCounter?.RequiredDisplayDigits.BindTo(RequiredDisplayDigits);
-        }
     }
 }
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 83897c5167..c887fb78e0 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -320,7 +320,6 @@ namespace osu.Game.Screens.Play
 
         protected virtual void BindScoreProcessor(ScoreProcessor processor)
         {
-            ScoreCounter?.Current.BindTo(processor.TotalScore);
             AccuracyCounter?.Current.BindTo(processor.Accuracy);
 
             if (HealthDisplay is IHealthDisplay shd)
diff --git a/osu.Game/Skinning/LegacyScoreCounter.cs b/osu.Game/Skinning/LegacyScoreCounter.cs
index 1d330ef495..e385caf304 100644
--- a/osu.Game/Skinning/LegacyScoreCounter.cs
+++ b/osu.Game/Skinning/LegacyScoreCounter.cs
@@ -4,12 +4,12 @@
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
+using osu.Game.Screens.Play.HUD;
 using osuTK;
 
 namespace osu.Game.Skinning
 {
-    public class LegacyScoreCounter : ScoreCounter
+    public class LegacyScoreCounter : GameplayScoreCounter
     {
         private readonly ISkin skin;
 

From ad398165a2d38870173df9b82034691d8c9c8d4c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 May 2021 16:26:54 +0900
Subject: [PATCH 3174/3722] Update `AccuracyCounter` components to use DI to
 attach data source

---
 .../TestSceneSkinnableAccuracyCounter.cs      | 26 ++++++-------------
 .../Play/HUD/DefaultAccuracyCounter.cs        |  3 +--
 .../Play/HUD/GameplayAccuracyCounter.cs       | 18 +++++++++++++
 osu.Game/Screens/Play/HUD/IAccuracyCounter.cs | 19 --------------
 .../Play/HUD/SkinnableAccuracyCounter.cs      | 12 +--------
 osu.Game/Skinning/LegacyAccuracyCounter.cs    |  3 +--
 6 files changed, 29 insertions(+), 52 deletions(-)
 create mode 100644 osu.Game/Screens/Play/HUD/GameplayAccuracyCounter.cs
 delete mode 100644 osu.Game/Screens/Play/HUD/IAccuracyCounter.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs
index 709929dcb0..34356184a2 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs
@@ -4,9 +4,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -17,33 +19,21 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
 
+        [Cached]
+        private ScoreProcessor scoreProcessor = new ScoreProcessor();
+
         [SetUpSteps]
         public void SetUpSteps()
         {
-            AddStep("Create combo counters", () => SetContents(() =>
-            {
-                var accuracyCounter = new SkinnableAccuracyCounter();
-
-                accuracyCounter.Current.Value = 1;
-
-                return accuracyCounter;
-            }));
+            AddStep("Create combo counters", () => SetContents(() => new SkinnableAccuracyCounter()));
         }
 
         [Test]
         public void TestChangingAccuracy()
         {
-            AddStep(@"Reset all", delegate
-            {
-                foreach (var s in accuracyCounters)
-                    s.Current.Value = 1;
-            });
+            AddStep(@"Reset all", () => scoreProcessor.Accuracy.Value = 1);
 
-            AddStep(@"Hit! :D", delegate
-            {
-                foreach (var s in accuracyCounters)
-                    s.Current.Value -= 0.023f;
-            });
+            AddStep(@"Hit! :D", () => scoreProcessor.Accuracy.Value -= 0.23);
         }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
index d5d8ec570a..be1a4ad6b3 100644
--- a/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
@@ -4,12 +4,11 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
-using osu.Game.Graphics.UserInterface;
 using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class DefaultAccuracyCounter : PercentageCounter, IAccuracyCounter
+    public class DefaultAccuracyCounter : GameplayAccuracyCounter
     {
         private readonly Vector2 offset = new Vector2(-20, 5);
 
diff --git a/osu.Game/Screens/Play/HUD/GameplayAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/GameplayAccuracyCounter.cs
new file mode 100644
index 0000000000..7a63084812
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/GameplayAccuracyCounter.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.Allocation;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public abstract class GameplayAccuracyCounter : PercentageCounter
+    {
+        [BackgroundDependencyLoader]
+        private void load(ScoreProcessor scoreProcessor)
+        {
+            Current.BindTo(scoreProcessor.Accuracy);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/IAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/IAccuracyCounter.cs
deleted file mode 100644
index 0199250a08..0000000000
--- a/osu.Game/Screens/Play/HUD/IAccuracyCounter.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.Bindables;
-using osu.Framework.Graphics;
-
-namespace osu.Game.Screens.Play.HUD
-{
-    /// <summary>
-    /// An interface providing a set of methods to update a accuracy counter.
-    /// </summary>
-    public interface IAccuracyCounter : IDrawable
-    {
-        /// <summary>
-        /// The current accuracy to be displayed.
-        /// </summary>
-        Bindable<double> Current { get; }
-    }
-}
diff --git a/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
index 76c9c30813..17c2493d2d 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
@@ -6,7 +6,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class SkinnableAccuracyCounter : SkinnableDrawable, IAccuracyCounter
+    public class SkinnableAccuracyCounter : SkinnableDrawable
     {
         public Bindable<double> Current { get; } = new Bindable<double>();
 
@@ -15,15 +15,5 @@ namespace osu.Game.Screens.Play.HUD
         {
             CentreComponent = false;
         }
-
-        private IAccuracyCounter skinnedCounter;
-
-        protected override void SkinChanged(ISkinSource skin, bool allowFallback)
-        {
-            base.SkinChanged(skin, allowFallback);
-
-            skinnedCounter = Drawable as IAccuracyCounter;
-            skinnedCounter?.Current.BindTo(Current);
-        }
     }
 }
diff --git a/osu.Game/Skinning/LegacyAccuracyCounter.cs b/osu.Game/Skinning/LegacyAccuracyCounter.cs
index 7d6f1dc916..638faa8f2b 100644
--- a/osu.Game/Skinning/LegacyAccuracyCounter.cs
+++ b/osu.Game/Skinning/LegacyAccuracyCounter.cs
@@ -4,14 +4,13 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD;
 using osuTK;
 
 namespace osu.Game.Skinning
 {
-    public class LegacyAccuracyCounter : PercentageCounter, IAccuracyCounter
+    public class LegacyAccuracyCounter : GameplayAccuracyCounter
     {
         private readonly ISkin skin;
 

From 3524cb792444dd1f400a8e54bb0d4ce425d48b4f Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 7 May 2021 14:36:35 +0700
Subject: [PATCH 3175/3722] simplify CreateSpriteText in markdown heading

---
 .../Graphics/Containers/Markdown/OsuMarkdownHeading.cs    | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs
index a7fecc6e25..40eb4cad15 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using Markdig.Syntax;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers.Markdown;
 using osu.Framework.Graphics.Sprites;
 
@@ -68,12 +69,7 @@ namespace osu.Game.Graphics.Containers.Markdown
         {
             public FontWeight Weight { get; set; }
 
-            protected override SpriteText CreateSpriteText()
-            {
-                var spriteText = base.CreateSpriteText();
-                spriteText.Font = spriteText.Font.With(weight: Weight);
-                return spriteText;
-            }
+            protected override SpriteText CreateSpriteText() => base.CreateSpriteText().With(t => t.Font = t.Font.With(weight: Weight));
         }
     }
 }

From 17b8963cf8db3f908359905bded8907f49398503 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 7 May 2021 14:38:19 +0700
Subject: [PATCH 3176/3722] simplify CreateSpriteText in markdown table cell

---
 .../Graphics/Containers/Markdown/OsuMarkdownTableCell.cs   | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs
index fca85e02a8..763c9d7536 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs
@@ -59,12 +59,7 @@ namespace osu.Game.Graphics.Containers.Markdown
         {
             public FontWeight Weight { get; set; }
 
-            protected override SpriteText CreateSpriteText()
-            {
-                var spriteText = base.CreateSpriteText();
-                spriteText.Font = spriteText.Font.With(weight: Weight);
-                return spriteText;
-            }
+            protected override SpriteText CreateSpriteText() => base.CreateSpriteText().With(t => t.Font = t.Font.With(weight: Weight));
         }
     }
 }

From 79a1d7b2b39d018b231abc2508ab1c1494acd39d Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 7 May 2021 14:40:01 +0700
Subject: [PATCH 3177/3722] simplify CreateEmphasisedSpriteText

---
 .../Containers/Markdown/OsuMarkdownTextFlowContainer.cs    | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs
index 517143c2db..1550b8401d 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs
@@ -3,6 +3,7 @@
 
 using Markdig.Syntax.Inlines;
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers.Markdown;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics.Sprites;
@@ -28,10 +29,6 @@ namespace osu.Game.Graphics.Containers.Markdown
             => AddText(codeInline.Content, t => { t.Colour = colourProvider.Light1; });
 
         protected override SpriteText CreateEmphasisedSpriteText(bool bold, bool italic)
-        {
-            var spriteText = CreateSpriteText();
-            spriteText.Font = spriteText.Font.With(weight: bold ? FontWeight.Bold : FontWeight.Regular, italics: italic);
-            return spriteText;
-        }
+            => CreateSpriteText().With(t => t.Font = t.Font.With(weight: bold ? FontWeight.Bold : FontWeight.Regular, italics: italic));
     }
 }

From 64e9c5e9ba50924903ec6e280b68552d878e00f5 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 7 May 2021 14:41:27 +0700
Subject: [PATCH 3178/3722] add return xmldoc in markdown unordered list

---
 .../Containers/Markdown/OsuMarkdownUnorderedListItem.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownUnorderedListItem.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownUnorderedListItem.cs
index 8bfaf8ad21..5d1e114781 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownUnorderedListItem.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownUnorderedListItem.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Graphics.Containers.Markdown
         /// Get text marker based on <paramref name="level"/>
         /// </summary>
         /// <param name="level">The markdown level of current list item.</param>
-        /// <returns></returns>
+        /// <returns>The marker string of this list item</returns>
         protected virtual string GetTextMarker(int level)
         {
             switch (level)

From d92e593ddddd425c4984e25346581af3d6da50f1 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 7 May 2021 14:47:46 +0700
Subject: [PATCH 3179/3722] extract out table head and body border into
 separate component

---
 .../Markdown/OsuMarkdownTableCell.cs          | 45 +++++++++++--------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs
index 763c9d7536..5949bf074b 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs
@@ -26,27 +26,10 @@ namespace osu.Game.Graphics.Containers.Markdown
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider)
         {
-            var border = new Box
-            {
-                RelativeSizeAxes = Axes.X,
-            };
-
             if (isHeading)
-            {
-                border.Colour = colourProvider.Background3;
-                border.Height = 2;
-                border.Anchor = Anchor.BottomLeft;
-                border.Origin = Anchor.BottomLeft;
-            }
+                AddInternal(new TableHeadBorder());
             else
-            {
-                border.Colour = colourProvider.Background4;
-                border.Height = 1;
-                border.Anchor = Anchor.TopLeft;
-                border.Origin = Anchor.TopLeft;
-            }
-
-            AddInternal(border);
+                AddInternal(new TableBodyBorder());
         }
 
         public override MarkdownTextFlowContainer CreateTextFlow() => new TableCellTextFlowContainer
@@ -55,6 +38,30 @@ namespace osu.Game.Graphics.Containers.Markdown
             Padding = new MarginPadding(10),
         };
 
+        private class TableHeadBorder : Box
+        {
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                Colour = colourProvider.Background3;
+                RelativeSizeAxes = Axes.X;
+                Height = 2;
+                Anchor = Anchor.BottomLeft;
+                Origin = Anchor.BottomLeft;
+            }
+        }
+
+        private class TableBodyBorder : Box
+        {
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                Colour = colourProvider.Background4;
+                RelativeSizeAxes = Axes.X;
+                Height = 1;
+            }
+        }
+
         private class TableCellTextFlowContainer : OsuMarkdownTextFlowContainer
         {
             public FontWeight Weight { get; set; }

From 22677cfeaf7aea4657a1040d80eecdf12b3b1746 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 7 May 2021 14:54:46 +0700
Subject: [PATCH 3180/3722] add CreateBorder method in markdown table cell

---
 .../Containers/Markdown/OsuMarkdownTableCell.cs   | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs
index 5949bf074b..ac7d07e283 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTableCell.cs
@@ -24,12 +24,9 @@ namespace osu.Game.Graphics.Containers.Markdown
         }
 
         [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
+        private void load()
         {
-            if (isHeading)
-                AddInternal(new TableHeadBorder());
-            else
-                AddInternal(new TableBodyBorder());
+            AddInternal(CreateBorder(isHeading));
         }
 
         public override MarkdownTextFlowContainer CreateTextFlow() => new TableCellTextFlowContainer
@@ -38,6 +35,14 @@ namespace osu.Game.Graphics.Containers.Markdown
             Padding = new MarginPadding(10),
         };
 
+        protected virtual Box CreateBorder(bool isHeading)
+        {
+            if (isHeading)
+                return new TableHeadBorder();
+
+            return new TableBodyBorder();
+        }
+
         private class TableHeadBorder : Box
         {
             [BackgroundDependencyLoader]

From 9d27b11e499e634cf3276b1023bb8ac9db9cdf18 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 May 2021 17:10:31 +0900
Subject: [PATCH 3181/3722] Update skin editor test scene to cache a
 `ScoreProcessor`

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
index 086bcb19c3..2424d24bc6 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
@@ -2,6 +2,7 @@
 // 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;
 using osu.Framework.Testing;
@@ -17,6 +18,9 @@ namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneSkinEditorMultipleSkins : SkinnableTestScene
     {
+        [Cached]
+        private readonly ScoreProcessor scoreProcessor = new ScoreProcessor();
+
         [SetUpSteps]
         public void SetUpSteps()
         {
@@ -28,8 +32,6 @@ namespace osu.Game.Tests.Visual.Gameplay
                     var working = CreateWorkingBeatmap(ruleset.RulesetInfo);
                     var beatmap = working.GetPlayableBeatmap(ruleset.RulesetInfo);
 
-                    ScoreProcessor scoreProcessor = new ScoreProcessor();
-
                     var drawableRuleset = ruleset.CreateDrawableRulesetWith(beatmap);
 
                     var hudOverlay = new HUDOverlay(scoreProcessor, null, drawableRuleset, Array.Empty<Mod>())
@@ -40,7 +42,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
                     // Add any key just to display the key counter visually.
                     hudOverlay.KeyCounter.Add(new KeyCounterKeyboard(Key.Space));
-                    hudOverlay.ComboCounter.Current.Value = 1;
+                    scoreProcessor.Combo.Value = 1;
 
                     return new Container
                     {

From 755588258e90883f22a89cee219d6e44373b5887 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 May 2021 16:56:24 +0900
Subject: [PATCH 3182/3722] Update `HealthDisplay` components to use DI to
 attach data source

---
 .../Visual/Gameplay/TestSceneFailingLayer.cs  | 35 ++++++++++++++++---
 .../Visual/Gameplay/TestSceneHUDOverlay.cs    |  5 ++-
 .../TestSceneSkinEditorMultipleSkins.cs       |  3 +-
 .../Gameplay/TestSceneSkinnableHUDOverlay.cs  |  2 +-
 .../TestSceneSkinnableHealthDisplay.cs        | 21 ++++++-----
 .../Screens/Play/HUD/DefaultHealthDisplay.cs  |  2 +-
 osu.Game/Screens/Play/HUD/FailingLayer.cs     | 11 +-----
 osu.Game/Screens/Play/HUD/HealthDisplay.cs    | 33 ++++++++++++-----
 osu.Game/Screens/Play/HUD/IHealthDisplay.cs   | 26 --------------
 .../Play/HUD/SkinnableHealthDisplay.cs        | 15 +-------
 osu.Game/Screens/Play/HUDOverlay.cs           | 22 +-----------
 osu.Game/Screens/Play/Player.cs               |  4 ++-
 osu.Game/Skinning/LegacyHealthDisplay.cs      | 12 ++-----
 13 files changed, 81 insertions(+), 110 deletions(-)
 delete mode 100644 osu.Game/Screens/Play/HUD/IHealthDisplay.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
index 5a1a9d3d87..e426726def 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
@@ -4,6 +4,7 @@
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Scoring;
@@ -22,22 +23,30 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         [SetUpSteps]
         public void SetUpSteps()
+        {
+        }
+
+        private void create(HealthProcessor healthProcessor)
         {
             AddStep("create layer", () =>
             {
-                Child = layer = new FailingLayer();
-                layer.BindHealthProcessor(new DrainingHealthProcessor(1));
+                Child = new HealthProcessorContainer(healthProcessor)
+                {
+                    Child = layer = new FailingLayer()
+                };
+
                 layer.ShowHealth.BindTo(showHealth);
             });
 
             AddStep("show health", () => showHealth.Value = true);
             AddStep("enable layer", () => config.SetValue(OsuSetting.FadePlayfieldWhenHealthLow, true));
-            AddUntilStep("layer is visible", () => layer.IsPresent);
         }
 
         [Test]
         public void TestLayerFading()
         {
+            create(new DrainingHealthProcessor(1));
+
             AddSliderStep("current health", 0.0, 1.0, 1.0, val =>
             {
                 if (layer != null)
@@ -53,6 +62,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestLayerDisabledViaConfig()
         {
+            create(new DrainingHealthProcessor(1));
+            AddUntilStep("layer is visible", () => layer.IsPresent);
             AddStep("disable layer", () => config.SetValue(OsuSetting.FadePlayfieldWhenHealthLow, false));
             AddStep("set health to 0.10", () => layer.Current.Value = 0.1);
             AddUntilStep("layer is not visible", () => !layer.IsPresent);
@@ -61,7 +72,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestLayerVisibilityWithAccumulatingProcessor()
         {
-            AddStep("bind accumulating processor", () => layer.BindHealthProcessor(new AccumulatingHealthProcessor(1)));
+            create(new AccumulatingHealthProcessor(1));
+            AddUntilStep("layer is not visible", () => !layer.IsPresent);
             AddStep("set health to 0.10", () => layer.Current.Value = 0.1);
             AddUntilStep("layer is not visible", () => !layer.IsPresent);
         }
@@ -69,7 +81,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestLayerVisibilityWithDrainingProcessor()
         {
-            AddStep("bind accumulating processor", () => layer.BindHealthProcessor(new DrainingHealthProcessor(1)));
+            create(new DrainingHealthProcessor(1));
             AddStep("set health to 0.10", () => layer.Current.Value = 0.1);
             AddWaitStep("wait for potential fade", 10);
             AddAssert("layer is still visible", () => layer.IsPresent);
@@ -78,6 +90,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestLayerVisibilityWithDifferentOptions()
         {
+            create(new DrainingHealthProcessor(1));
+
             AddStep("set health to 0.10", () => layer.Current.Value = 0.1);
 
             AddStep("don't show health", () => showHealth.Value = false);
@@ -96,5 +110,16 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("enable FadePlayfieldWhenHealthLow", () => config.SetValue(OsuSetting.FadePlayfieldWhenHealthLow, true));
             AddUntilStep("layer fade is visible", () => layer.IsPresent);
         }
+
+        private class HealthProcessorContainer : Container
+        {
+            [Cached(typeof(HealthProcessor))]
+            private readonly HealthProcessor healthProcessor;
+
+            public HealthProcessorContainer(HealthProcessor healthProcessor)
+            {
+                this.healthProcessor = healthProcessor;
+            }
+        }
     }
 }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index 55c681b605..a451df026b 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -23,6 +23,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached]
         private ScoreProcessor scoreProcessor = new ScoreProcessor();
 
+        [Cached]
+        private HealthProcessor healthProcessor = new DrainingHealthProcessor(1);
+
         // best way to check without exposing.
         private Drawable hideTarget => hudOverlay.KeyCounter;
         private FillFlowContainer<KeyCounter> keyCounterFlow => hudOverlay.KeyCounter.ChildrenOfType<FillFlowContainer<KeyCounter>>().First();
@@ -143,7 +146,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("create overlay", () =>
             {
-                hudOverlay = new HUDOverlay(scoreProcessor, null, null, Array.Empty<Mod>());
+                hudOverlay = new HUDOverlay(scoreProcessor, null, Array.Empty<Mod>());
 
                 // Add any key just to display the key counter visually.
                 hudOverlay.KeyCounter.Add(new KeyCounterKeyboard(Key.Space));
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
index 086bcb19c3..270216564f 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
 
                     var drawableRuleset = ruleset.CreateDrawableRulesetWith(beatmap);
 
-                    var hudOverlay = new HUDOverlay(scoreProcessor, null, drawableRuleset, Array.Empty<Mod>())
+                    var hudOverlay = new HUDOverlay(scoreProcessor, drawableRuleset, Array.Empty<Mod>())
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
@@ -40,7 +40,6 @@ namespace osu.Game.Tests.Visual.Gameplay
 
                     // Add any key just to display the key counter visually.
                     hudOverlay.KeyCounter.Add(new KeyCounterKeyboard(Key.Space));
-                    hudOverlay.ComboCounter.Current.Value = 1;
 
                     return new Container
                     {
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
index 8131c77b4b..12ce20f58e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
@@ -76,7 +76,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 SetContents(() =>
                 {
-                    hudOverlay = new HUDOverlay(scoreProcessor, null, null, Array.Empty<Mod>());
+                    hudOverlay = new HUDOverlay(scoreProcessor, null, Array.Empty<Mod>());
 
                     // Add any key just to display the key counter visually.
                     hudOverlay.KeyCounter.Add(new KeyCounterKeyboard(Key.Space));
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
index 5bac8582d7..f06236d0a8 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
@@ -4,11 +4,13 @@
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Judgements;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -19,6 +21,9 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
 
+        [Cached]
+        private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);
+
         [SetUpSteps]
         public void SetUpSteps()
         {
@@ -28,8 +33,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             });
             AddStep(@"Reset all", delegate
             {
-                foreach (var s in healthDisplays)
-                    s.Current.Value = 1;
+                healthProcessor.Health.Value = 1;
             });
         }
 
@@ -38,23 +42,18 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddRepeatStep(@"decrease hp", delegate
             {
-                foreach (var healthDisplay in healthDisplays)
-                    healthDisplay.Current.Value -= 0.08f;
+                healthProcessor.Health.Value = 0.08f;
             }, 10);
 
             AddRepeatStep(@"increase hp without flash", delegate
             {
-                foreach (var healthDisplay in healthDisplays)
-                    healthDisplay.Current.Value += 0.1f;
+                healthProcessor.Health.Value = 0.1f;
             }, 3);
 
             AddRepeatStep(@"increase hp with flash", delegate
             {
-                foreach (var healthDisplay in healthDisplays)
-                {
-                    healthDisplay.Current.Value += 0.1f;
-                    healthDisplay.Flash(new JudgementResult(null, new OsuJudgement()));
-                }
+                healthProcessor.Health.Value = 0.1f;
+                healthProcessor.ApplyResult(new JudgementResult(null, new OsuJudgement()));
             }, 3);
         }
     }
diff --git a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
index e3cd71691d..27f81467cb 100644
--- a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
@@ -107,7 +107,7 @@ namespace osu.Game.Screens.Play.HUD
             GlowColour = colours.BlueDarker;
         }
 
-        public override void Flash(JudgementResult result) => Scheduler.AddOnce(flash);
+        protected override void Flash(JudgementResult result) => Scheduler.AddOnce(flash);
 
         private void flash()
         {
diff --git a/osu.Game/Screens/Play/HUD/FailingLayer.cs b/osu.Game/Screens/Play/HUD/FailingLayer.cs
index 847b8a53cf..e071337f34 100644
--- a/osu.Game/Screens/Play/HUD/FailingLayer.cs
+++ b/osu.Game/Screens/Play/HUD/FailingLayer.cs
@@ -39,7 +39,6 @@ namespace osu.Game.Screens.Play.HUD
         private readonly Container boxes;
 
         private Bindable<bool> fadePlayfieldWhenHealthLow;
-        private HealthProcessor healthProcessor;
 
         public FailingLayer()
         {
@@ -88,18 +87,10 @@ namespace osu.Game.Screens.Play.HUD
             updateState();
         }
 
-        public override void BindHealthProcessor(HealthProcessor processor)
-        {
-            base.BindHealthProcessor(processor);
-
-            healthProcessor = processor;
-            updateState();
-        }
-
         private void updateState()
         {
             // Don't display ever if the ruleset is not using a draining health display.
-            var showLayer = healthProcessor is DrainingHealthProcessor && fadePlayfieldWhenHealthLow.Value && ShowHealth.Value;
+            var showLayer = HealthProcessor is DrainingHealthProcessor && fadePlayfieldWhenHealthLow.Value && ShowHealth.Value;
             this.FadeTo(showLayer ? 1 : 0, fade_time, Easing.OutQuint);
         }
 
diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index 5c43e00192..2292f64989 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 osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Judgements;
@@ -11,26 +12,42 @@ namespace osu.Game.Screens.Play.HUD
 {
     /// <summary>
     /// A container for components displaying the current player health.
-    /// Gets bound automatically to the <see cref="HealthProcessor"/> when inserted to <see cref="DrawableRuleset.Overlays"/> hierarchy.
+    /// Gets bound automatically to the <see cref="Rulesets.Scoring.HealthProcessor"/> when inserted to <see cref="DrawableRuleset.Overlays"/> hierarchy.
     /// </summary>
-    public abstract class HealthDisplay : Container, IHealthDisplay
+    public abstract class HealthDisplay : Container
     {
+        [Resolved]
+        protected HealthProcessor HealthProcessor { get; private set; }
+
         public Bindable<double> Current { get; } = new BindableDouble(1)
         {
             MinValue = 0,
             MaxValue = 1
         };
 
-        public virtual void Flash(JudgementResult result)
+        protected virtual void Flash(JudgementResult result)
         {
         }
 
-        /// <summary>
-        /// Bind the tracked fields of <see cref="HealthProcessor"/> to this health display.
-        /// </summary>
-        public virtual void BindHealthProcessor(HealthProcessor processor)
+        [BackgroundDependencyLoader]
+        private void load()
         {
-            Current.BindTo(processor.Health);
+            Current.BindTo(HealthProcessor.Health);
+
+            HealthProcessor.NewJudgement += onNewJudgement;
+        }
+
+        private void onNewJudgement(JudgementResult judgement)
+        {
+            if (judgement.IsHit && judgement.Type != HitResult.IgnoreHit) Flash(judgement);
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (HealthProcessor != null)
+                HealthProcessor.NewJudgement -= onNewJudgement;
         }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/IHealthDisplay.cs b/osu.Game/Screens/Play/HUD/IHealthDisplay.cs
deleted file mode 100644
index b1a64bd844..0000000000
--- a/osu.Game/Screens/Play/HUD/IHealthDisplay.cs
+++ /dev/null
@@ -1,26 +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.Bindables;
-using osu.Framework.Graphics;
-using osu.Game.Rulesets.Judgements;
-
-namespace osu.Game.Screens.Play.HUD
-{
-    /// <summary>
-    /// An interface providing a set of methods to update a health display.
-    /// </summary>
-    public interface IHealthDisplay : IDrawable
-    {
-        /// <summary>
-        /// The current health to be displayed.
-        /// </summary>
-        Bindable<double> Current { get; }
-
-        /// <summary>
-        /// Flash the display for a specified result type.
-        /// </summary>
-        /// <param name="result">The result type.</param>
-        void Flash(JudgementResult result);
-    }
-}
diff --git a/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs b/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
index 1f91f5e50f..ef0affa417 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
@@ -3,13 +3,12 @@
 
 using System;
 using osu.Framework.Bindables;
-using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class SkinnableHealthDisplay : SkinnableDrawable, IHealthDisplay
+    public class SkinnableHealthDisplay : SkinnableDrawable
     {
         public Bindable<double> Current { get; } = new BindableDouble(1)
         {
@@ -17,8 +16,6 @@ namespace osu.Game.Screens.Play.HUD
             MaxValue = 1
         };
 
-        public void Flash(JudgementResult result) => skinnedCounter?.Flash(result);
-
         private HealthProcessor processor;
 
         public void BindHealthProcessor(HealthProcessor processor)
@@ -36,15 +33,5 @@ namespace osu.Game.Screens.Play.HUD
         {
             CentreComponent = false;
         }
-
-        private IHealthDisplay skinnedCounter;
-
-        protected override void SkinChanged(ISkinSource skin, bool allowFallback)
-        {
-            base.SkinChanged(skin, allowFallback);
-
-            skinnedCounter = Drawable as IHealthDisplay;
-            skinnedCounter?.Current.BindTo(Current);
-        }
     }
 }
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 83897c5167..31a6bc7678 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -47,7 +47,6 @@ namespace osu.Game.Screens.Play
         public Bindable<bool> ShowHealthbar = new Bindable<bool>(true);
 
         private readonly ScoreProcessor scoreProcessor;
-        private readonly HealthProcessor healthProcessor;
         private readonly DrawableRuleset drawableRuleset;
         private readonly IReadOnlyList<Mod> mods;
 
@@ -75,10 +74,9 @@ namespace osu.Game.Screens.Play
 
         private IEnumerable<Drawable> hideTargets => new Drawable[] { visibilityContainer, KeyCounter, topRightElements };
 
-        public HUDOverlay(ScoreProcessor scoreProcessor, HealthProcessor healthProcessor, DrawableRuleset drawableRuleset, IReadOnlyList<Mod> mods)
+        public HUDOverlay(ScoreProcessor scoreProcessor, DrawableRuleset drawableRuleset, IReadOnlyList<Mod> mods)
         {
             this.scoreProcessor = scoreProcessor;
-            this.healthProcessor = healthProcessor;
             this.drawableRuleset = drawableRuleset;
             this.mods = mods;
 
@@ -161,9 +159,6 @@ namespace osu.Game.Screens.Play
             if (scoreProcessor != null)
                 BindScoreProcessor(scoreProcessor);
 
-            if (healthProcessor != null)
-                BindHealthProcessor(healthProcessor);
-
             if (drawableRuleset != null)
             {
                 BindDrawableRuleset(drawableRuleset);
@@ -322,21 +317,6 @@ namespace osu.Game.Screens.Play
         {
             ScoreCounter?.Current.BindTo(processor.TotalScore);
             AccuracyCounter?.Current.BindTo(processor.Accuracy);
-
-            if (HealthDisplay is IHealthDisplay shd)
-            {
-                processor.NewJudgement += judgement =>
-                {
-                    if (judgement.IsHit && judgement.Type != HitResult.IgnoreHit)
-                        shd.Flash(judgement);
-                };
-            }
-        }
-
-        protected virtual void BindHealthProcessor(HealthProcessor processor)
-        {
-            HealthDisplay?.BindHealthProcessor(processor);
-            FailingLayer?.BindHealthProcessor(processor);
         }
 
         public bool OnPressed(GlobalAction action)
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 951ce334f6..1538899281 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -208,6 +208,8 @@ namespace osu.Game.Screens.Play
             HealthProcessor = ruleset.CreateHealthProcessor(playableBeatmap.HitObjects[0].StartTime);
             HealthProcessor.ApplyBeatmap(playableBeatmap);
 
+            dependencies.CacheAs(HealthProcessor);
+
             if (!ScoreProcessor.Mode.Disabled)
                 config.BindWith(OsuSetting.ScoreDisplayMode, ScoreProcessor.Mode);
 
@@ -343,7 +345,7 @@ namespace osu.Game.Screens.Play
                     // display the cursor above some HUD elements.
                     DrawableRuleset.Cursor?.CreateProxy() ?? new Container(),
                     DrawableRuleset.ResumeOverlay?.CreateProxy() ?? new Container(),
-                    HUDOverlay = new HUDOverlay(ScoreProcessor, HealthProcessor, DrawableRuleset, Mods.Value)
+                    HUDOverlay = new HUDOverlay(ScoreProcessor, DrawableRuleset, Mods.Value)
                     {
                         HoldToQuit =
                         {
diff --git a/osu.Game/Skinning/LegacyHealthDisplay.cs b/osu.Game/Skinning/LegacyHealthDisplay.cs
index 2e29abf453..c1979efbc2 100644
--- a/osu.Game/Skinning/LegacyHealthDisplay.cs
+++ b/osu.Game/Skinning/LegacyHealthDisplay.cs
@@ -16,7 +16,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Skinning
 {
-    public class LegacyHealthDisplay : CompositeDrawable, IHealthDisplay, ISkinnableComponent
+    public class LegacyHealthDisplay : HealthDisplay
     {
         private const double epic_cutoff = 0.5;
 
@@ -28,12 +28,6 @@ namespace osu.Game.Skinning
 
         private bool isNewStyle;
 
-        public Bindable<double> Current { get; } = new BindableDouble(1)
-        {
-            MinValue = 0,
-            MaxValue = 1
-        };
-
         public LegacyHealthDisplay(Skin skin)
         {
             this.skin = skin;
@@ -83,7 +77,7 @@ namespace osu.Game.Skinning
             marker.Position = fill.Position + new Vector2(fill.DrawWidth, isNewStyle ? fill.DrawHeight / 2 : 0);
         }
 
-        public void Flash(JudgementResult result) => marker.Flash(result);
+        protected override void Flash(JudgementResult result) => marker.Flash(result);
 
         private static Texture getTexture(Skin skin, string name) => skin.GetTexture($"scorebar-{name}");
 
@@ -254,7 +248,7 @@ namespace osu.Game.Skinning
                 Main.ScaleTo(1.4f).Then().ScaleTo(1, 200, Easing.Out);
         }
 
-        public class LegacyHealthPiece : CompositeDrawable, IHealthDisplay
+        public class LegacyHealthPiece : CompositeDrawable
         {
             public Bindable<double> Current { get; } = new Bindable<double>();
 

From 84a4ff333eec332a3c5dbd9b167f15b17fc6db7a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 May 2021 17:10:31 +0900
Subject: [PATCH 3183/3722] Update skin editor test scene to cache a
 `ScoreProcessor`

---
 .../Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
index 270216564f..d50d4aa920 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
@@ -2,6 +2,7 @@
 // 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;
 using osu.Framework.Testing;
@@ -17,6 +18,9 @@ namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneSkinEditorMultipleSkins : SkinnableTestScene
     {
+        [Cached]
+        private readonly ScoreProcessor scoreProcessor = new ScoreProcessor();
+
         [SetUpSteps]
         public void SetUpSteps()
         {
@@ -28,8 +32,6 @@ namespace osu.Game.Tests.Visual.Gameplay
                     var working = CreateWorkingBeatmap(ruleset.RulesetInfo);
                     var beatmap = working.GetPlayableBeatmap(ruleset.RulesetInfo);
 
-                    ScoreProcessor scoreProcessor = new ScoreProcessor();
-
                     var drawableRuleset = ruleset.CreateDrawableRulesetWith(beatmap);
 
                     var hudOverlay = new HUDOverlay(scoreProcessor, drawableRuleset, Array.Empty<Mod>())
@@ -40,6 +42,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
                     // Add any key just to display the key counter visually.
                     hudOverlay.KeyCounter.Add(new KeyCounterKeyboard(Key.Space));
+                    scoreProcessor.Combo.Value = 1;
 
                     return new Container
                     {

From 8e78cac05826b2e01959e3971a8043d0f53cf9df Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 May 2021 17:31:29 +0900
Subject: [PATCH 3184/3722] Fix `HealthProcessor` cached as derived type in
 test

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index a451df026b..accb2ba1d9 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached]
         private ScoreProcessor scoreProcessor = new ScoreProcessor();
 
-        [Cached]
+        [Cached(typeof(HealthProcessor))]
         private HealthProcessor healthProcessor = new DrainingHealthProcessor(1);
 
         // best way to check without exposing.

From 6c255a05726faed8e6244ded666cee31966a5f72 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 May 2021 17:47:33 +0900
Subject: [PATCH 3185/3722] Fix drain start time being weirdly incorrect

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

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
index e426726def..99facb2731 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestLayerFading()
         {
-            create(new DrainingHealthProcessor(1));
+            create(new DrainingHealthProcessor(0));
 
             AddSliderStep("current health", 0.0, 1.0, 1.0, val =>
             {
@@ -62,7 +62,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestLayerDisabledViaConfig()
         {
-            create(new DrainingHealthProcessor(1));
+            create(new DrainingHealthProcessor(0));
             AddUntilStep("layer is visible", () => layer.IsPresent);
             AddStep("disable layer", () => config.SetValue(OsuSetting.FadePlayfieldWhenHealthLow, false));
             AddStep("set health to 0.10", () => layer.Current.Value = 0.1);
@@ -81,7 +81,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestLayerVisibilityWithDrainingProcessor()
         {
-            create(new DrainingHealthProcessor(1));
+            create(new DrainingHealthProcessor(0));
             AddStep("set health to 0.10", () => layer.Current.Value = 0.1);
             AddWaitStep("wait for potential fade", 10);
             AddAssert("layer is still visible", () => layer.IsPresent);
@@ -90,7 +90,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestLayerVisibilityWithDifferentOptions()
         {
-            create(new DrainingHealthProcessor(1));
+            create(new DrainingHealthProcessor(0));
 
             AddStep("set health to 0.10", () => layer.Current.Value = 0.1);
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index accb2ba1d9..861d4a4f7f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private ScoreProcessor scoreProcessor = new ScoreProcessor();
 
         [Cached(typeof(HealthProcessor))]
-        private HealthProcessor healthProcessor = new DrainingHealthProcessor(1);
+        private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);
 
         // best way to check without exposing.
         private Drawable hideTarget => hudOverlay.KeyCounter;

From 3044b1c432621823fb9bd25b5190b38988ff8696 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 May 2021 17:47:38 +0900
Subject: [PATCH 3186/3722] Add missing cache rules

---
 .../Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs      | 3 +++
 .../Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs          | 3 +++
 .../Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs       | 5 +++--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
index d50d4aa920..ac5599cc27 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
@@ -21,6 +21,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached]
         private readonly ScoreProcessor scoreProcessor = new ScoreProcessor();
 
+        [Cached(typeof(HealthProcessor))]
+        private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);
+
         [SetUpSteps]
         public void SetUpSteps()
         {
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
index 12ce20f58e..7a960a09fc 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
@@ -27,6 +27,9 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached]
         private ScoreProcessor scoreProcessor = new ScoreProcessor();
 
+        [Cached(typeof(HealthProcessor))]
+        private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);
+
         private IEnumerable<HUDOverlay> hudOverlays => CreatedDrawables.OfType<HUDOverlay>();
 
         // best way to check without exposing.
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
index f06236d0a8..2d6a6d95c7 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
@@ -10,6 +10,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Judgements;
+using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD;
 
@@ -21,7 +22,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
 
-        [Cached]
+        [Cached(typeof(HealthProcessor))]
         private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);
 
         [SetUpSteps]
@@ -53,7 +54,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddRepeatStep(@"increase hp with flash", delegate
             {
                 healthProcessor.Health.Value = 0.1f;
-                healthProcessor.ApplyResult(new JudgementResult(null, new OsuJudgement()));
+                healthProcessor.ApplyResult(new JudgementResult(new HitCircle(), new OsuJudgement()));
             }, 3);
         }
     }

From 1cb10c2a2243bde4f0fcc85a5d6de338a34f28bd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 May 2021 17:27:34 +0900
Subject: [PATCH 3187/3722] Remove unnecessary binding logic from `HUDOverlay`

---
 .../Visual/Gameplay/TestSceneHUDOverlay.cs    |  2 +-
 .../TestSceneSkinEditorMultipleSkins.cs       |  2 +-
 .../Gameplay/TestSceneSkinnableHUDOverlay.cs  |  2 +-
 osu.Game/Screens/Play/HUD/HitErrorDisplay.cs  |  6 +++---
 osu.Game/Screens/Play/HUDOverlay.cs           | 21 ++++---------------
 osu.Game/Screens/Play/Player.cs               |  2 +-
 6 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index 861d4a4f7f..b7e92a79a0 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -146,7 +146,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("create overlay", () =>
             {
-                hudOverlay = new HUDOverlay(scoreProcessor, null, Array.Empty<Mod>());
+                hudOverlay = new HUDOverlay(null, Array.Empty<Mod>());
 
                 // Add any key just to display the key counter visually.
                 hudOverlay.KeyCounter.Add(new KeyCounterKeyboard(Key.Space));
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
index ac5599cc27..c7c93b8892 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
                     var drawableRuleset = ruleset.CreateDrawableRulesetWith(beatmap);
 
-                    var hudOverlay = new HUDOverlay(scoreProcessor, drawableRuleset, Array.Empty<Mod>())
+                    var hudOverlay = new HUDOverlay(drawableRuleset, Array.Empty<Mod>())
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
index 7a960a09fc..c92e9dcfd5 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
@@ -79,7 +79,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 SetContents(() =>
                 {
-                    hudOverlay = new HUDOverlay(scoreProcessor, null, Array.Empty<Mod>());
+                    hudOverlay = new HUDOverlay(null, Array.Empty<Mod>());
 
                     // Add any key just to display the key counter visually.
                     hudOverlay.KeyCounter.Add(new KeyCounterKeyboard(Key.Space));
diff --git a/osu.Game/Screens/Play/HUD/HitErrorDisplay.cs b/osu.Game/Screens/Play/HUD/HitErrorDisplay.cs
index 37d10a5320..998a9fb7e7 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorDisplay.cs
@@ -22,11 +22,11 @@ namespace osu.Game.Screens.Play.HUD
 
         private readonly HitWindows hitWindows;
 
-        private readonly ScoreProcessor processor;
+        [Resolved]
+        private ScoreProcessor processor { get; set; }
 
-        public HitErrorDisplay(ScoreProcessor processor, HitWindows hitWindows)
+        public HitErrorDisplay(HitWindows hitWindows)
         {
-            this.processor = processor;
             this.hitWindows = hitWindows;
 
             RelativeSizeAxes = Axes.Both;
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index fd1aea016b..22812b779f 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -14,7 +14,6 @@ using osu.Game.Input.Bindings;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Play.HUD;
 using osuTK;
@@ -39,14 +38,11 @@ namespace osu.Game.Screens.Play
         public readonly SkinnableHealthDisplay HealthDisplay;
         public readonly SongProgress Progress;
         public readonly ModDisplay ModDisplay;
-        public readonly HitErrorDisplay HitErrorDisplay;
         public readonly HoldForMenuButton HoldToQuit;
         public readonly PlayerSettingsOverlay PlayerSettingsOverlay;
-        public readonly FailingLayer FailingLayer;
 
         public Bindable<bool> ShowHealthbar = new Bindable<bool>(true);
 
-        private readonly ScoreProcessor scoreProcessor;
         private readonly DrawableRuleset drawableRuleset;
         private readonly IReadOnlyList<Mod> mods;
 
@@ -74,9 +70,8 @@ namespace osu.Game.Screens.Play
 
         private IEnumerable<Drawable> hideTargets => new Drawable[] { visibilityContainer, KeyCounter, topRightElements };
 
-        public HUDOverlay(ScoreProcessor scoreProcessor, DrawableRuleset drawableRuleset, IReadOnlyList<Mod> mods)
+        public HUDOverlay(DrawableRuleset drawableRuleset, IReadOnlyList<Mod> mods)
         {
-            this.scoreProcessor = scoreProcessor;
             this.drawableRuleset = drawableRuleset;
             this.mods = mods;
 
@@ -84,7 +79,7 @@ namespace osu.Game.Screens.Play
 
             Children = new Drawable[]
             {
-                FailingLayer = CreateFailingLayer(),
+                CreateFailingLayer(),
                 visibilityContainer = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -104,7 +99,7 @@ namespace osu.Game.Screens.Play
                                         AccuracyCounter = CreateAccuracyCounter(),
                                         ScoreCounter = CreateScoreCounter(),
                                         CreateComboCounter(),
-                                        HitErrorDisplay = CreateHitErrorDisplayOverlay(),
+                                        CreateHitErrorDisplayOverlay(),
                                     }
                                 },
                             },
@@ -156,9 +151,6 @@ namespace osu.Game.Screens.Play
         [BackgroundDependencyLoader(true)]
         private void load(OsuConfigManager config, NotificationOverlay notificationOverlay)
         {
-            if (scoreProcessor != null)
-                BindScoreProcessor(scoreProcessor);
-
             if (drawableRuleset != null)
             {
                 BindDrawableRuleset(drawableRuleset);
@@ -309,15 +301,10 @@ namespace osu.Game.Screens.Play
             AutoSizeAxes = Axes.Both,
         };
 
-        protected virtual HitErrorDisplay CreateHitErrorDisplayOverlay() => new HitErrorDisplay(scoreProcessor, drawableRuleset?.FirstAvailableHitWindows);
+        protected virtual HitErrorDisplay CreateHitErrorDisplayOverlay() => new HitErrorDisplay(drawableRuleset?.FirstAvailableHitWindows);
 
         protected virtual PlayerSettingsOverlay CreatePlayerSettingsOverlay() => new PlayerSettingsOverlay();
 
-        protected virtual void BindScoreProcessor(ScoreProcessor processor)
-        {
-            AccuracyCounter?.Current.BindTo(processor.Accuracy);
-        }
-
         public bool OnPressed(GlobalAction action)
         {
             switch (action)
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 1538899281..116cf3cc99 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -345,7 +345,7 @@ namespace osu.Game.Screens.Play
                     // display the cursor above some HUD elements.
                     DrawableRuleset.Cursor?.CreateProxy() ?? new Container(),
                     DrawableRuleset.ResumeOverlay?.CreateProxy() ?? new Container(),
-                    HUDOverlay = new HUDOverlay(ScoreProcessor, DrawableRuleset, Mods.Value)
+                    HUDOverlay = new HUDOverlay(DrawableRuleset, Mods.Value)
                     {
                         HoldToQuit =
                         {

From 111b501ced835f83a4001fc3948eb26816c08364 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 7 May 2021 18:04:38 +0900
Subject: [PATCH 3188/3722] Revert accidental removal of UTF-8 BOM

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

diff --git a/osu.Game/Rulesets/Replays/AutoGenerator.cs b/osu.Game/Rulesets/Replays/AutoGenerator.cs
index 6ce857b14b..83e85146d4 100644
--- a/osu.Game/Rulesets/Replays/AutoGenerator.cs
+++ b/osu.Game/Rulesets/Replays/AutoGenerator.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.Collections.Generic;

From 9fe6e1096ab9d9264f97f52ba8ed7ae504983d0b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 May 2021 18:11:08 +0900
Subject: [PATCH 3189/3722] Remove cruft from `SkinnableHealthDisplay`

---
 .../Play/HUD/SkinnableHealthDisplay.cs        | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs b/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
index ef0affa417..3ba6a33276 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
@@ -1,33 +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;
-using osu.Framework.Bindables;
-using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
     public class SkinnableHealthDisplay : SkinnableDrawable
     {
-        public Bindable<double> Current { get; } = new BindableDouble(1)
-        {
-            MinValue = 0,
-            MaxValue = 1
-        };
-
-        private HealthProcessor processor;
-
-        public void BindHealthProcessor(HealthProcessor processor)
-        {
-            if (this.processor != null)
-                throw new InvalidOperationException("Can't bind to a processor more than once");
-
-            this.processor = processor;
-
-            Current.BindTo(processor.Health);
-        }
-
         public SkinnableHealthDisplay()
             : base(new HUDSkinComponent(HUDSkinComponents.HealthDisplay), _ => new DefaultHealthDisplay())
         {

From a1aeac567710b95f27b07daede58b9a1ad56ab45 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 May 2021 18:11:59 +0900
Subject: [PATCH 3190/3722] Remove remaining cruft from
 `SkinnableAccuracyCounter`

---
 osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
index 17c2493d2d..fcb8fca35d 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.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.
 
-using osu.Framework.Bindables;
 using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
     public class SkinnableAccuracyCounter : SkinnableDrawable
     {
-        public Bindable<double> Current { get; } = new Bindable<double>();
-
         public SkinnableAccuracyCounter()
             : base(new HUDSkinComponent(HUDSkinComponents.AccuracyCounter), _ => new DefaultAccuracyCounter())
         {

From 5b2f786f971ef65100be176ebc828b87e87f8c3f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 May 2021 19:16:00 +0900
Subject: [PATCH 3191/3722] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 99cda7693d..80b1c5b52f 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.506.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.507.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index e448972066..29189781a7 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.506.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.507.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
     <PackageReference Include="Sentry" Version="3.3.4" />
     <PackageReference Include="SharpCompress" Version="0.28.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 43ed2d7dc8..c4eb7aefba 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.506.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.507.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.506.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.507.0" />
     <PackageReference Include="SharpCompress" Version="0.28.2" />
     <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 8c564a69ed1978e2e11be2d93806c57a759c5800 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Fri, 7 May 2021 20:59:20 -0400
Subject: [PATCH 3192/3722] Fix InvalidOperationException when exiting a map at
 the end

---
 .../Visual/Gameplay/TestSceneStoryboardWithOutro.cs    | 10 ++++++++++
 osu.Game/Screens/Play/Player.cs                        |  4 ++++
 2 files changed, 14 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
index 4138a81ebd..e1dc6e3b42 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
@@ -133,6 +133,16 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("storyboard ends", () => Player.GameplayClockContainer.GameplayClock.CurrentTime >= currentStoryboardDuration);
         }
 
+        [Test]
+        public void TestPerformExitNoOutro()
+        {
+            CreateTest(null);
+            AddStep("disable storyboard", () => LocalConfig.SetValue(OsuSetting.ShowStoryboard, false));
+            AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
+            AddStep("exit via pause", () => Player.ExitViaPause());
+            AddAssert("score shown", () => Player.IsScoreShown);
+        }
+
         protected override bool AllowFail => true;
 
         protected override Ruleset CreatePlayerRuleset() => new OsuRuleset();
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 88e617245b..0a2f9f0d18 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -542,7 +542,11 @@ namespace osu.Game.Screens.Play
 
                 // if the score is ready for display but results screen has not been pushed yet (e.g. storyboard is still playing beyond gameplay), then transition to results screen instead of exiting.
                 if (prepareScoreForDisplayTask != null)
+                {
+                    completionProgressDelegate?.Cancel();
+                    completionProgressDelegate = null;
                     updateCompletionState(true);
+                }
             }
 
             this.Exit();

From 0f08c2a4799d3002861b199205c0e20e4498ff23 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 11:44:29 +0300
Subject: [PATCH 3193/3722] Add star rating display underneath the beatmap
 metadata

---
 .../Screens/Play/BeatmapMetadataDisplay.cs    | 36 ++++++++++++++-----
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index c56344a8fb..7ad634afed 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -12,8 +12,10 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Play.HUD;
+using osu.Game.Screens.Ranking.Expanded;
 using osuTK;
 
 namespace osu.Game.Screens.Play
@@ -30,6 +32,9 @@ namespace osu.Game.Screens.Play
 
         public IBindable<IReadOnlyList<Mod>> Mods => mods;
 
+        [Resolved]
+        private IBindable<RulesetInfo> ruleset { get; set; }
+
         public bool Loading
         {
             set
@@ -51,10 +56,12 @@ namespace osu.Game.Screens.Play
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(BeatmapDifficultyCache difficultyCache)
         {
             var metadata = beatmap.BeatmapInfo?.Metadata ?? new BeatmapMetadata();
 
+            var starDifficulty = difficultyCache.GetDifficultyAsync(beatmap.BeatmapInfo, ruleset.Value, mods.Value).Result;
+
             AutoSizeAxes = Axes.Both;
             Children = new Drawable[]
             {
@@ -107,16 +114,29 @@ namespace osu.Game.Screens.Play
                                 loading = new LoadingLayer(true)
                             }
                         },
-                        new OsuSpriteText
+                        new FillFlowContainer
                         {
-                            Text = beatmap?.BeatmapInfo?.Version,
-                            Font = OsuFont.GetFont(size: 26, italics: true),
-                            Origin = Anchor.TopCentre,
+                            AutoSizeAxes = Axes.Both,
                             Anchor = Anchor.TopCentre,
-                            Margin = new MarginPadding
+                            Origin = Anchor.TopCentre,
+                            Direction = FillDirection.Vertical,
+                            Spacing = new Vector2(5f),
+                            Margin = new MarginPadding { Bottom = 40 },
+                            Children = new Drawable[]
                             {
-                                Bottom = 40
-                            },
+                                new OsuSpriteText
+                                {
+                                    Text = beatmap?.BeatmapInfo?.Version,
+                                    Font = OsuFont.GetFont(size: 26, italics: true),
+                                    Anchor = Anchor.TopCentre,
+                                    Origin = Anchor.TopCentre,
+                                },
+                                new StarRatingDisplay(starDifficulty)
+                                {
+                                    Anchor = Anchor.TopCentre,
+                                    Origin = Anchor.TopCentre,
+                                }
+                            }
                         },
                         new GridContainer
                         {

From 7b7e7a86bf70423464fa078b10b52301790ad5dc Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 11:46:28 +0300
Subject: [PATCH 3194/3722] Allow null logo facade

---
 osu.Game/Screens/Play/BeatmapMetadataDisplay.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index 7ad634afed..8e760c38ba 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -27,7 +28,7 @@ namespace osu.Game.Screens.Play
     {
         private readonly WorkingBeatmap beatmap;
         private readonly Bindable<IReadOnlyList<Mod>> mods;
-        private readonly Drawable facade;
+        private readonly Drawable logoFacade;
         private LoadingSpinner loading;
 
         public IBindable<IReadOnlyList<Mod>> Mods => mods;
@@ -46,10 +47,10 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        public BeatmapMetadataDisplay(WorkingBeatmap beatmap, Bindable<IReadOnlyList<Mod>> mods, Drawable facade)
+        public BeatmapMetadataDisplay(WorkingBeatmap beatmap, Bindable<IReadOnlyList<Mod>> mods, [CanBeNull] Drawable logoFacade)
         {
             this.beatmap = beatmap;
-            this.facade = facade;
+            this.logoFacade = logoFacade;
 
             this.mods = new Bindable<IReadOnlyList<Mod>>();
             this.mods.BindTo(mods);
@@ -73,11 +74,11 @@ namespace osu.Game.Screens.Play
                     Direction = FillDirection.Vertical,
                     Children = new[]
                     {
-                        facade.With(d =>
+                        logoFacade?.With(d =>
                         {
                             d.Anchor = Anchor.TopCentre;
                             d.Origin = Anchor.TopCentre;
-                        }),
+                        }) ?? Drawable.Empty(),
                         new OsuSpriteText
                         {
                             Text = new RomanisableString(metadata.TitleUnicode, metadata.Title),

From 169a28340286aeca24e73f47ce76c190c3f7c87d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 11:46:42 +0300
Subject: [PATCH 3195/3722] Add visual test scene

---
 .../TestSceneBeatmapMetadataDisplay.cs        | 78 +++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
new file mode 100644
index 0000000000..02c9c6b7a3
--- /dev/null
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.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 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.Utils;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Screens.Play;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.SongSelect
+{
+    [System.ComponentModel.Description("player loader beatmap metadata")]
+    public class TestSceneBeatmapMetadataDisplay : OsuTestScene
+    {
+        private BeatmapMetadataDisplay display;
+
+        [Resolved]
+        private BeatmapManager manager { get; set; }
+
+        private IReadOnlyList<Mod> randomMods => Ruleset.Value.CreateInstance()
+                                                        .GetAllMods()
+                                                        .OrderBy(_ => RNG.Next())
+                                                        .Take(5)
+                                                        .ToList();
+
+        private void createDisplay(Func<WorkingBeatmap> getBeatmap)
+        {
+            AddStep("setup display", () => Child = display = new BeatmapMetadataDisplay(getBeatmap(), new Bindable<IReadOnlyList<Mod>>(randomMods), null)
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Scale = new Vector2(1.5f),
+            });
+
+            AddToggleStep("trigger loading", v => display.Loading = v);
+        }
+
+        [Test]
+        public void TestLocal([Values("Beatmap", "Some long title and stuff")]
+                              string title,
+                              [Values("Trial", "Some1's very hardest difficulty")]
+                              string version)
+        {
+            createDisplay(() => CreateWorkingBeatmap(new Beatmap
+            {
+                BeatmapInfo =
+                {
+                    Metadata = new BeatmapMetadata
+                    {
+                        Title = title,
+                    },
+                    Version = version,
+                    StarDifficulty = RNG.NextDouble(0, 10),
+                }
+            }));
+        }
+
+        [Test]
+        public void TestRandomFromDatabase()
+        {
+            createDisplay(() =>
+            {
+                var allBeatmapSets = manager.GetAllUsableBeatmapSets(IncludedDetails.Minimal);
+                var randomBeatmapSet = allBeatmapSets[RNG.Next(0, allBeatmapSets.Count - 1)];
+                var randomBeatmap = randomBeatmapSet.Beatmaps[RNG.Next(0, randomBeatmapSet.Beatmaps.Count - 1)];
+
+                return manager.GetWorkingBeatmap(randomBeatmap);
+            });
+        }
+    }
+}

From b4801faf32bed6a2bc279305d4237930f60a683d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 11:57:12 +0300
Subject: [PATCH 3196/3722] Pass ruleset info to constructor instead

Follows the way working beatmap is passed, not sure why mods are passed as a bindable though, don't wanna bother too much with that.
---
 .../Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs | 2 +-
 osu.Game/Screens/Play/BeatmapMetadataDisplay.cs          | 9 ++++-----
 osu.Game/Screens/Play/PlayerLoader.cs                    | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
index 02c9c6b7a3..ee87877860 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private void createDisplay(Func<WorkingBeatmap> getBeatmap)
         {
-            AddStep("setup display", () => Child = display = new BeatmapMetadataDisplay(getBeatmap(), new Bindable<IReadOnlyList<Mod>>(randomMods), null)
+            AddStep("setup display", () => Child = display = new BeatmapMetadataDisplay(getBeatmap(), Ruleset.Value, new Bindable<IReadOnlyList<Mod>>(randomMods), null)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index 8e760c38ba..daaf3b73cb 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -27,15 +27,13 @@ namespace osu.Game.Screens.Play
     public class BeatmapMetadataDisplay : Container
     {
         private readonly WorkingBeatmap beatmap;
+        private readonly RulesetInfo ruleset;
         private readonly Bindable<IReadOnlyList<Mod>> mods;
         private readonly Drawable logoFacade;
         private LoadingSpinner loading;
 
         public IBindable<IReadOnlyList<Mod>> Mods => mods;
 
-        [Resolved]
-        private IBindable<RulesetInfo> ruleset { get; set; }
-
         public bool Loading
         {
             set
@@ -47,9 +45,10 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        public BeatmapMetadataDisplay(WorkingBeatmap beatmap, Bindable<IReadOnlyList<Mod>> mods, [CanBeNull] Drawable logoFacade)
+        public BeatmapMetadataDisplay(WorkingBeatmap beatmap, RulesetInfo ruleset, Bindable<IReadOnlyList<Mod>> mods, [CanBeNull] Drawable logoFacade)
         {
             this.beatmap = beatmap;
+            this.ruleset = ruleset;
             this.logoFacade = logoFacade;
 
             this.mods = new Bindable<IReadOnlyList<Mod>>();
@@ -61,7 +60,7 @@ namespace osu.Game.Screens.Play
         {
             var metadata = beatmap.BeatmapInfo?.Metadata ?? new BeatmapMetadata();
 
-            var starDifficulty = difficultyCache.GetDifficultyAsync(beatmap.BeatmapInfo, ruleset.Value, mods.Value).Result;
+            var starDifficulty = difficultyCache.GetDifficultyAsync(beatmap.BeatmapInfo, ruleset, mods.Value).Result;
 
             AutoSizeAxes = Axes.Both;
             Children = new Drawable[]
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index ce580e2b53..066ca25790 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -134,7 +134,7 @@ namespace osu.Game.Screens.Play
                 RelativeSizeAxes = Axes.Both,
             }).WithChildren(new Drawable[]
             {
-                MetadataInfo = new BeatmapMetadataDisplay(Beatmap.Value, Mods, content.LogoFacade)
+                MetadataInfo = new BeatmapMetadataDisplay(Beatmap.Value, Ruleset.Value, Mods, content.LogoFacade)
                 {
                     Alpha = 0,
                     Anchor = Anchor.Centre,

From 0410edecaff273d81d023af07044bbd46a88b9a5 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 12:55:07 +0300
Subject: [PATCH 3197/3722] Refactor `StarRatingDisplay` to be mutable with a
 current bindable

---
 .../Ranking/TestSceneStarRatingDisplay.cs     | 15 +++-
 .../Ranking/Expanded/StarRatingDisplay.cs     | 87 ++++++++++++-------
 2 files changed, 68 insertions(+), 34 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
index d0067c3396..a043f506c1 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.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 NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Screens.Ranking.Expanded;
 
@@ -10,8 +12,11 @@ namespace osu.Game.Tests.Visual.Ranking
 {
     public class TestSceneStarRatingDisplay : OsuTestScene
     {
-        public TestSceneStarRatingDisplay()
+        [SetUp]
+        public void SetUp() => Schedule(() =>
         {
+            StarRatingDisplay changingStarRating;
+
             Child = new FillFlowContainer
             {
                 Anchor = Anchor.Centre,
@@ -25,8 +30,14 @@ namespace osu.Game.Tests.Visual.Ranking
                     new StarRatingDisplay(new StarDifficulty(5.67, 0)),
                     new StarRatingDisplay(new StarDifficulty(6.78, 0)),
                     new StarRatingDisplay(new StarDifficulty(10.11, 0)),
+                    changingStarRating = new StarRatingDisplay(),
                 }
             };
-        }
+
+            Scheduler.AddDelayed(() =>
+            {
+                changingStarRating.Current.Value = new StarDifficulty(RNG.NextDouble(0, 10), RNG.Next());
+            }, 500, true);
+        });
     }
 }
diff --git a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
index f7e50fdc8a..a1f48fa811 100644
--- a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
@@ -3,12 +3,14 @@
 
 using System.Globalization;
 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.Shapes;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.UserInterface;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -20,17 +22,29 @@ namespace osu.Game.Screens.Ranking.Expanded
     /// <summary>
     /// A pill that displays the star rating of a <see cref="BeatmapInfo"/>.
     /// </summary>
-    public class StarRatingDisplay : CompositeDrawable
+    public class StarRatingDisplay : CompositeDrawable, IHasCurrentValue<StarDifficulty>
     {
-        private readonly StarDifficulty difficulty;
+        private Box background;
+        private OsuTextFlowContainer textFlow;
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        private readonly BindableWithCurrent<StarDifficulty> current = new BindableWithCurrent<StarDifficulty>();
+
+        public Bindable<StarDifficulty> Current
+        {
+            get => current.Current;
+            set => current.Current = value;
+        }
 
         /// <summary>
         /// Creates a new <see cref="StarRatingDisplay"/> using an already computed <see cref="StarDifficulty"/>.
         /// </summary>
         /// <param name="starDifficulty">The already computed <see cref="StarDifficulty"/> to display the star difficulty of.</param>
-        public StarRatingDisplay(StarDifficulty starDifficulty)
+        public StarRatingDisplay(StarDifficulty starDifficulty = default)
         {
-            difficulty = starDifficulty;
+            Current.Value = starDifficulty;
         }
 
         [BackgroundDependencyLoader]
@@ -38,15 +52,6 @@ namespace osu.Game.Screens.Ranking.Expanded
         {
             AutoSizeAxes = Axes.Both;
 
-            var starRatingParts = difficulty.Stars.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
-            string wholePart = starRatingParts[0];
-            string fractionPart = starRatingParts[1];
-            string separator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
-
-            ColourInfo backgroundColour = difficulty.DifficultyRating == DifficultyRating.ExpertPlus
-                ? ColourInfo.GradientVertical(Color4Extensions.FromHex("#C1C1C1"), Color4Extensions.FromHex("#595959"))
-                : (ColourInfo)colours.ForDifficultyRating(difficulty.DifficultyRating);
-
             InternalChildren = new Drawable[]
             {
                 new CircularContainer
@@ -55,10 +60,9 @@ namespace osu.Game.Screens.Ranking.Expanded
                     Masking = true,
                     Children = new Drawable[]
                     {
-                        new Box
+                        background = new Box
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Colour = backgroundColour
                         },
                     }
                 },
@@ -78,32 +82,51 @@ namespace osu.Game.Screens.Ranking.Expanded
                             Icon = FontAwesome.Solid.Star,
                             Colour = Color4.Black
                         },
-                        new OsuTextFlowContainer(s => s.Font = OsuFont.Numeric.With(weight: FontWeight.Black))
+                        textFlow = new OsuTextFlowContainer(s => s.Font = OsuFont.Numeric.With(weight: FontWeight.Black))
                         {
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
                             AutoSizeAxes = Axes.Both,
                             Direction = FillDirection.Horizontal,
                             TextAnchor = Anchor.BottomLeft,
-                        }.With(t =>
-                        {
-                            t.AddText($"{wholePart}", s =>
-                            {
-                                s.Colour = Color4.Black;
-                                s.Font = s.Font.With(size: 14);
-                                s.UseFullGlyphHeight = false;
-                            });
-
-                            t.AddText($"{separator}{fractionPart}", s =>
-                            {
-                                s.Colour = Color4.Black;
-                                s.Font = s.Font.With(size: 7);
-                                s.UseFullGlyphHeight = false;
-                            });
-                        })
+                        }
                     }
                 }
             };
         }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            Current.BindValueChanged(difficulty => updateDisplay(difficulty.NewValue), true);
+        }
+
+        private void updateDisplay(StarDifficulty difficulty)
+        {
+            var starRatingParts = difficulty.Stars.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
+            string wholePart = starRatingParts[0];
+            string fractionPart = starRatingParts[1];
+            string separator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
+
+            background.Colour = difficulty.DifficultyRating == DifficultyRating.ExpertPlus
+                ? ColourInfo.GradientVertical(Color4Extensions.FromHex("#C1C1C1"), Color4Extensions.FromHex("#595959"))
+                : (ColourInfo)colours.ForDifficultyRating(difficulty.DifficultyRating);
+
+            textFlow.Clear();
+
+            textFlow.AddText($"{wholePart}", s =>
+            {
+                s.Colour = Color4.Black;
+                s.Font = s.Font.With(size: 14);
+                s.UseFullGlyphHeight = false;
+            });
+
+            textFlow.AddText($"{separator}{fractionPart}", s =>
+            {
+                s.Colour = Color4.Black;
+                s.Font = s.Font.With(size: 7);
+                s.UseFullGlyphHeight = false;
+            });
+        }
     }
 }

From 43090067da8a199eca6e2d4202d0bef1eae7fe5c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 12:59:59 +0300
Subject: [PATCH 3198/3722] Use
 `BeatmapDifficultyCache.GetBindableDifficulty(...)` instead

---
 osu.Game/Screens/Play/BeatmapMetadataDisplay.cs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index daaf3b73cb..54c739bd9f 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -55,12 +55,14 @@ namespace osu.Game.Screens.Play
             this.mods.BindTo(mods);
         }
 
+        private IBindable<StarDifficulty?> starDifficulty;
+
         [BackgroundDependencyLoader]
         private void load(BeatmapDifficultyCache difficultyCache)
         {
-            var metadata = beatmap.BeatmapInfo?.Metadata ?? new BeatmapMetadata();
+            StarRatingDisplay starRatingDisplay;
 
-            var starDifficulty = difficultyCache.GetDifficultyAsync(beatmap.BeatmapInfo, ruleset, mods.Value).Result;
+            var metadata = beatmap.BeatmapInfo?.Metadata ?? new BeatmapMetadata();
 
             AutoSizeAxes = Axes.Both;
             Children = new Drawable[]
@@ -131,7 +133,7 @@ namespace osu.Game.Screens.Play
                                     Anchor = Anchor.TopCentre,
                                     Origin = Anchor.TopCentre,
                                 },
-                                new StarRatingDisplay(starDifficulty)
+                                starRatingDisplay = new StarRatingDisplay
                                 {
                                     Anchor = Anchor.TopCentre,
                                     Origin = Anchor.TopCentre,
@@ -179,6 +181,13 @@ namespace osu.Game.Screens.Play
                 }
             };
 
+            starDifficulty = difficultyCache.GetBindableDifficulty(beatmap.BeatmapInfo);
+            starDifficulty.BindValueChanged(difficulty =>
+            {
+                if (difficulty.NewValue is StarDifficulty diff)
+                    starRatingDisplay.Current.Value = diff;
+            }, true);
+
             Loading = true;
         }
 

From dca5efc59afc5876b794e6cb3610e4cb18f3a64d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 13:00:39 +0300
Subject: [PATCH 3199/3722] Remove no longer necessary ruleset info requirement

---
 .../Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs     | 2 +-
 osu.Game/Screens/Play/BeatmapMetadataDisplay.cs              | 5 +----
 osu.Game/Screens/Play/PlayerLoader.cs                        | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
index ee87877860..02c9c6b7a3 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private void createDisplay(Func<WorkingBeatmap> getBeatmap)
         {
-            AddStep("setup display", () => Child = display = new BeatmapMetadataDisplay(getBeatmap(), Ruleset.Value, new Bindable<IReadOnlyList<Mod>>(randomMods), null)
+            AddStep("setup display", () => Child = display = new BeatmapMetadataDisplay(getBeatmap(), new Bindable<IReadOnlyList<Mod>>(randomMods), null)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index 54c739bd9f..670d99c462 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -13,7 +13,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Ranking.Expanded;
@@ -27,7 +26,6 @@ namespace osu.Game.Screens.Play
     public class BeatmapMetadataDisplay : Container
     {
         private readonly WorkingBeatmap beatmap;
-        private readonly RulesetInfo ruleset;
         private readonly Bindable<IReadOnlyList<Mod>> mods;
         private readonly Drawable logoFacade;
         private LoadingSpinner loading;
@@ -45,10 +43,9 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        public BeatmapMetadataDisplay(WorkingBeatmap beatmap, RulesetInfo ruleset, Bindable<IReadOnlyList<Mod>> mods, [CanBeNull] Drawable logoFacade)
+        public BeatmapMetadataDisplay(WorkingBeatmap beatmap, Bindable<IReadOnlyList<Mod>> mods, [CanBeNull] Drawable logoFacade)
         {
             this.beatmap = beatmap;
-            this.ruleset = ruleset;
             this.logoFacade = logoFacade;
 
             this.mods = new Bindable<IReadOnlyList<Mod>>();
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 066ca25790..ce580e2b53 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -134,7 +134,7 @@ namespace osu.Game.Screens.Play
                 RelativeSizeAxes = Axes.Both,
             }).WithChildren(new Drawable[]
             {
-                MetadataInfo = new BeatmapMetadataDisplay(Beatmap.Value, Ruleset.Value, Mods, content.LogoFacade)
+                MetadataInfo = new BeatmapMetadataDisplay(Beatmap.Value, Mods, content.LogoFacade)
                 {
                     Alpha = 0,
                     Anchor = Anchor.Centre,

From 26c0010fe659915ebebb152be37032b6003b4ff3 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 13:03:50 +0300
Subject: [PATCH 3200/3722] Fix test not handling 0 beatmap sets

---
 .../Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
index 02c9c6b7a3..5ea7a0e83b 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
@@ -68,6 +68,9 @@ namespace osu.Game.Tests.Visual.SongSelect
             createDisplay(() =>
             {
                 var allBeatmapSets = manager.GetAllUsableBeatmapSets(IncludedDetails.Minimal);
+                if (allBeatmapSets.Count == 0)
+                    return manager.DefaultBeatmap;
+
                 var randomBeatmapSet = allBeatmapSets[RNG.Next(0, allBeatmapSets.Count - 1)];
                 var randomBeatmap = randomBeatmapSet.Beatmaps[RNG.Next(0, randomBeatmapSet.Beatmaps.Count - 1)];
 

From df630d94282250064ba396d06b518b3ab369447d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 8 May 2021 14:53:19 +0200
Subject: [PATCH 3201/3722] Trim redundant `this` qualifier

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

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 32d2fba25e..d57acd005b 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -240,7 +240,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             new OsuMenuItem("Add control point", MenuItemType.Standard, () => addControlPoint(rightClickPosition)),
         };
 
-        public override Vector2 ScreenSpaceSelectionPoint => this.ToScreenSpace(slider.HitObject.StackedPosition);
+        public override Vector2 ScreenSpaceSelectionPoint => ToScreenSpace(slider.HitObject.StackedPosition);
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
             slider.ReceivePositionalInputAt(screenSpacePos) || ControlPointVisualiser?.Pieces.Any(p => p.ReceivePositionalInputAt(screenSpacePos)) == true;

From 63e267a3beefbb0c7344521af93d1a340a5a454c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 8 May 2021 23:32:52 +0900
Subject: [PATCH 3202/3722] Revert "Trim redundant `this` qualifier"

This reverts commit df630d94282250064ba396d06b518b3ab369447d.
---
 .../Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index d57acd005b..32d2fba25e 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -240,7 +240,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             new OsuMenuItem("Add control point", MenuItemType.Standard, () => addControlPoint(rightClickPosition)),
         };
 
-        public override Vector2 ScreenSpaceSelectionPoint => ToScreenSpace(slider.HitObject.StackedPosition);
+        public override Vector2 ScreenSpaceSelectionPoint => this.ToScreenSpace(slider.HitObject.StackedPosition);
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
             slider.ReceivePositionalInputAt(screenSpacePos) || ControlPointVisualiser?.Pieces.Any(p => p.ReceivePositionalInputAt(screenSpacePos)) == true;

From 01d732bb65202f66737d478457d62f1af1cd1884 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 8 May 2021 23:33:03 +0900
Subject: [PATCH 3203/3722] Revert "Refactor `SliderSelectionBlueprint` to not
 reference blueprint pieces for input handling"

This reverts commit 54fe10c82a855a16c88f8781a9ae12dc42df7b0e.
---
 .../Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs   | 6 ++++++
 .../Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs     | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

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 ece9c7a757..6e22c35ab3 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderBodyPiece.cs
@@ -26,6 +26,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             {
                 AccentColour = Color4.Transparent
             };
+
+            // SliderSelectionBlueprint relies on calling ReceivePositionalInputAt on this drawable to determine whether selection should occur.
+            // Without AlwaysPresent, a movement in a parent container (ie. the editor composer area resizing) could cause incorrect input handling.
+            AlwaysPresent = true;
         }
 
         [BackgroundDependencyLoader]
@@ -50,5 +54,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
         }
 
         public void RecyclePath() => body.RecyclePath();
+
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => body.ReceivePositionalInputAt(screenSpacePos);
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 32d2fba25e..88fcb1e715 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -240,10 +240,10 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             new OsuMenuItem("Add control point", MenuItemType.Standard, () => addControlPoint(rightClickPosition)),
         };
 
-        public override Vector2 ScreenSpaceSelectionPoint => this.ToScreenSpace(slider.HitObject.StackedPosition);
+        public override Vector2 ScreenSpaceSelectionPoint => BodyPiece.ToScreenSpace(BodyPiece.PathStartLocation);
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
-            slider.ReceivePositionalInputAt(screenSpacePos) || ControlPointVisualiser?.Pieces.Any(p => p.ReceivePositionalInputAt(screenSpacePos)) == true;
+            BodyPiece.ReceivePositionalInputAt(screenSpacePos) || ControlPointVisualiser?.Pieces.Any(p => p.ReceivePositionalInputAt(screenSpacePos)) == true;
 
         protected virtual SliderCircleSelectionBlueprint CreateCircleSelectionBlueprint(DrawableSlider slider, SliderPosition position) => new SliderCircleSelectionBlueprint(slider, position);
     }

From fe86ee629ed8b7a7a36eb7048064192cf9584672 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 8 May 2021 16:30:08 +0200
Subject: [PATCH 3204/3722] Fix temp files from beatmap listing imports not
 being cleaned up

As reported in #12718, it turns out that temporary files from beatmap
set downloads performed via the beatmap listing overlay could remain in
the user's filesystem even after the download has concluded.

The reason for the issue is a failure in component integration.
In the case of online downloads, files are first downloaded to a
temporary directory (`C:/Temp` or `/tmp`), with a randomly generated
filename, which ends in an extension of `.tmp`.

On the other side, `ArchiveModelManager`s have a `ShouldDeleteArchive()`
method, which determines whether a file should be deleted after
importing. At the time of writing, in the case of beatmap imports the
file is only automatically cleaned up if the extension of the file is
equal to `.osz`, which was not the case for temporary files.

As it turns out, `APIDownloadRequest` has a facility for adjusting the
file's extension, via the protected `FileExtension` property. Therefore,
use it in the case of `DownloadBeatmapSetRequest` to specify `.osz`,
which then will make sure that the `ShouldDeleteArchive()` check in
`BeatmapManager` picks it up for clean-up.
---
 osu.Game/Online/API/Requests/DownloadBeatmapSetRequest.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Online/API/Requests/DownloadBeatmapSetRequest.cs b/osu.Game/Online/API/Requests/DownloadBeatmapSetRequest.cs
index e8871bef05..2898955de7 100644
--- a/osu.Game/Online/API/Requests/DownloadBeatmapSetRequest.cs
+++ b/osu.Game/Online/API/Requests/DownloadBeatmapSetRequest.cs
@@ -23,6 +23,8 @@ namespace osu.Game.Online.API.Requests
             return req;
         }
 
+        protected override string FileExtension => ".osz";
+
         protected override string Target => $@"beatmapsets/{Model.OnlineBeatmapSetID}/download{(noVideo ? "?noVideo=1" : "")}";
     }
 }

From d9605e807049ceabb9af5a53568738a1a424c341 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 18:18:23 +0300
Subject: [PATCH 3205/3722] Remove test scene description

---
 .../Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
index 5ea7a0e83b..381ccd2dd3 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
@@ -16,7 +16,6 @@ using osuTK;
 
 namespace osu.Game.Tests.Visual.SongSelect
 {
-    [System.ComponentModel.Description("player loader beatmap metadata")]
     public class TestSceneBeatmapMetadataDisplay : OsuTestScene
     {
         private BeatmapMetadataDisplay display;

From 3575d9847cd120941ad3737ff140c01184edd4e5 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 18:21:29 +0300
Subject: [PATCH 3206/3722] Use regular test steps rather than one-time set up
 and scheduling

---
 .../Visual/Ranking/TestSceneStarRatingDisplay.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
index a043f506c1..2ff664a0d9 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
@@ -12,12 +12,12 @@ namespace osu.Game.Tests.Visual.Ranking
 {
     public class TestSceneStarRatingDisplay : OsuTestScene
     {
-        [SetUp]
-        public void SetUp() => Schedule(() =>
+        [Test]
+        public void TestDisplay()
         {
-            StarRatingDisplay changingStarRating;
+            StarRatingDisplay changingStarRating = null;
 
-            Child = new FillFlowContainer
+            AddStep("load displays", () => Child = new FillFlowContainer
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
@@ -32,12 +32,12 @@ namespace osu.Game.Tests.Visual.Ranking
                     new StarRatingDisplay(new StarDifficulty(10.11, 0)),
                     changingStarRating = new StarRatingDisplay(),
                 }
-            };
+            });
 
-            Scheduler.AddDelayed(() =>
+            AddRepeatStep("change bottom rating", () =>
             {
                 changingStarRating.Current.Value = new StarDifficulty(RNG.NextDouble(0, 10), RNG.Next());
-            }, 500, true);
-        });
+            }, 10);
+        }
     }
 }

From a75347cb2a5dc933b9f2952d3449208379eee935 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 18:43:17 +0300
Subject: [PATCH 3207/3722] Remove nullable facade logic

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

diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index 670d99c462..98829d079b 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.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 osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -43,7 +42,7 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        public BeatmapMetadataDisplay(WorkingBeatmap beatmap, Bindable<IReadOnlyList<Mod>> mods, [CanBeNull] Drawable logoFacade)
+        public BeatmapMetadataDisplay(WorkingBeatmap beatmap, Bindable<IReadOnlyList<Mod>> mods, Drawable logoFacade)
         {
             this.beatmap = beatmap;
             this.logoFacade = logoFacade;
@@ -72,11 +71,11 @@ namespace osu.Game.Screens.Play
                     Direction = FillDirection.Vertical,
                     Children = new[]
                     {
-                        logoFacade?.With(d =>
+                        logoFacade.With(d =>
                         {
                             d.Anchor = Anchor.TopCentre;
                             d.Origin = Anchor.TopCentre;
-                        }) ?? Drawable.Empty(),
+                        }),
                         new OsuSpriteText
                         {
                             Text = new RomanisableString(metadata.TitleUnicode, metadata.Title),

From ca55287dd07a9d958e35c738d331dad21b8295ec Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 18:43:45 +0300
Subject: [PATCH 3208/3722] Pass empty facade and replace random property with
 method instead

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

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
index 381ccd2dd3..552d19ac26 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
@@ -23,15 +23,9 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Resolved]
         private BeatmapManager manager { get; set; }
 
-        private IReadOnlyList<Mod> randomMods => Ruleset.Value.CreateInstance()
-                                                        .GetAllMods()
-                                                        .OrderBy(_ => RNG.Next())
-                                                        .Take(5)
-                                                        .ToList();
-
         private void createDisplay(Func<WorkingBeatmap> getBeatmap)
         {
-            AddStep("setup display", () => Child = display = new BeatmapMetadataDisplay(getBeatmap(), new Bindable<IReadOnlyList<Mod>>(randomMods), null)
+            AddStep("setup display", () => Child = display = new BeatmapMetadataDisplay(getBeatmap(), new Bindable<IReadOnlyList<Mod>>(getRandomMods()), Empty())
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
@@ -76,5 +70,11 @@ namespace osu.Game.Tests.Visual.SongSelect
                 return manager.GetWorkingBeatmap(randomBeatmap);
             });
         }
+
+        private IReadOnlyList<Mod> getRandomMods() => Ruleset.Value.CreateInstance()
+                                                             .GetAllMods()
+                                                             .OrderBy(_ => RNG.Next())
+                                                             .Take(5)
+                                                             .ToList();
     }
 }

From 655e8d3d867c5a2956caeea928e0704c98b580e6 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 18:44:28 +0300
Subject: [PATCH 3209/3722] Remove pattern-matching on nullable with simple
 `.HasValue`/`.Value`

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

diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index 98829d079b..d31033ef15 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -180,8 +180,8 @@ namespace osu.Game.Screens.Play
             starDifficulty = difficultyCache.GetBindableDifficulty(beatmap.BeatmapInfo);
             starDifficulty.BindValueChanged(difficulty =>
             {
-                if (difficulty.NewValue is StarDifficulty diff)
-                    starRatingDisplay.Current.Value = diff;
+                if (difficulty.NewValue.HasValue)
+                    starRatingDisplay.Current.Value = difficulty.NewValue.Value;
             }, true);
 
             Loading = true;

From 25312b3e88d47b2cbc9ce327d2c6d05954b39d72 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Sat, 8 May 2021 11:45:31 -0400
Subject: [PATCH 3210/3722] Don't restart completion delegate on exit, revert
 exit behavior to lazer

---
 .../Visual/Gameplay/TestSceneStoryboardWithOutro.cs           | 2 +-
 osu.Game/Screens/Play/Player.cs                               | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
index e1dc6e3b42..70b1d3ef85 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
@@ -140,7 +140,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("score shown", () => Player.IsScoreShown);
+            AddAssert("score not shown", () => !Player.IsScoreShown);
         }
 
         protected override bool AllowFail => true;
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 0a2f9f0d18..557dd2a78a 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -541,10 +541,8 @@ namespace osu.Game.Screens.Play
                 }
 
                 // if the score is ready for display but results screen has not been pushed yet (e.g. storyboard is still playing beyond gameplay), then transition to results screen instead of exiting.
-                if (prepareScoreForDisplayTask != null)
+                if (prepareScoreForDisplayTask != null && completionProgressDelegate == null)
                 {
-                    completionProgressDelegate?.Cancel();
-                    completionProgressDelegate = null;
                     updateCompletionState(true);
                 }
             }

From c52f1733be73b49af4f3dea4257fd0b9eaa5610a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 21:13:18 +0300
Subject: [PATCH 3211/3722] Apply further refactoring to star rating display
 UX-wise

---
 .../Screens/Play/BeatmapMetadataDisplay.cs    |   6 +-
 .../Ranking/Expanded/StarRatingDisplay.cs     | 106 +++++++++++++-----
 2 files changed, 77 insertions(+), 35 deletions(-)

diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index d31033ef15..0164fe9179 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -178,11 +178,7 @@ namespace osu.Game.Screens.Play
             };
 
             starDifficulty = difficultyCache.GetBindableDifficulty(beatmap.BeatmapInfo);
-            starDifficulty.BindValueChanged(difficulty =>
-            {
-                if (difficulty.NewValue.HasValue)
-                    starRatingDisplay.Current.Value = difficulty.NewValue.Value;
-            }, true);
+            starDifficulty.BindValueChanged(d => starRatingDisplay.Current.Value = d.NewValue, true);
 
             Loading = true;
         }
diff --git a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
index a1f48fa811..77c43ad863 100644
--- a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
@@ -13,7 +13,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
 using osuTK;
 using osuTK.Graphics;
 
@@ -22,27 +22,50 @@ namespace osu.Game.Screens.Ranking.Expanded
     /// <summary>
     /// A pill that displays the star rating of a <see cref="BeatmapInfo"/>.
     /// </summary>
-    public class StarRatingDisplay : CompositeDrawable, IHasCurrentValue<StarDifficulty>
+    public class StarRatingDisplay : CompositeDrawable, IHasCurrentValue<StarDifficulty?>
     {
         private Box background;
-        private OsuTextFlowContainer textFlow;
+        private OsuSpriteText wholePart;
+        private OsuSpriteText fractionPart;
+
+        private double displayedStarRating;
+
+        protected double DisplayedStarRating
+        {
+            get => displayedStarRating;
+            set
+            {
+                displayedStarRating = value;
+
+                var starRatingParts = value.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
+                wholePart.Text = starRatingParts[0];
+                fractionPart.Text = starRatingParts[1];
+            }
+        }
 
         [Resolved]
         private OsuColour colours { get; set; }
 
-        private readonly BindableWithCurrent<StarDifficulty> current = new BindableWithCurrent<StarDifficulty>();
+        private readonly BindableWithCurrent<StarDifficulty?> current = new BindableWithCurrent<StarDifficulty?>();
 
-        public Bindable<StarDifficulty> Current
+        public Bindable<StarDifficulty?> Current
         {
             get => current.Current;
             set => current.Current = value;
         }
 
+        /// <summary>
+        /// Creates a new <see cref="StarRatingDisplay"/> without any <see cref="StarDifficulty"/> set, displaying a placeholder until <see cref="Current"/> is changed.
+        /// </summary>
+        public StarRatingDisplay()
+        {
+        }
+
         /// <summary>
         /// Creates a new <see cref="StarRatingDisplay"/> using an already computed <see cref="StarDifficulty"/>.
         /// </summary>
         /// <param name="starDifficulty">The already computed <see cref="StarDifficulty"/> to display the star difficulty of.</param>
-        public StarRatingDisplay(StarDifficulty starDifficulty = default)
+        public StarRatingDisplay(StarDifficulty starDifficulty)
         {
             Current.Value = starDifficulty;
         }
@@ -82,13 +105,40 @@ namespace osu.Game.Screens.Ranking.Expanded
                             Icon = FontAwesome.Solid.Star,
                             Colour = Color4.Black
                         },
-                        textFlow = new OsuTextFlowContainer(s => s.Font = OsuFont.Numeric.With(weight: FontWeight.Black))
+                        new FillFlowContainer
                         {
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
                             AutoSizeAxes = Axes.Both,
                             Direction = FillDirection.Horizontal,
-                            TextAnchor = Anchor.BottomLeft,
+                            Children = new[]
+                            {
+                                wholePart = new OsuSpriteText
+                                {
+                                    Anchor = Anchor.BottomLeft,
+                                    Origin = Anchor.BottomLeft,
+                                    Colour = Color4.Black,
+                                    Font = OsuFont.Numeric.With(size: 14, weight: FontWeight.Black),
+                                    UseFullGlyphHeight = false,
+                                },
+                                new OsuSpriteText
+                                {
+                                    Anchor = Anchor.BottomLeft,
+                                    Origin = Anchor.BottomLeft,
+                                    Colour = Color4.Black,
+                                    Text = NumberFormatInfo.CurrentInfo.NumberDecimalSeparator,
+                                    Font = OsuFont.Numeric.With(size: 7, weight: FontWeight.Black),
+                                    UseFullGlyphHeight = false,
+                                },
+                                fractionPart = new OsuSpriteText
+                                {
+                                    Anchor = Anchor.BottomLeft,
+                                    Origin = Anchor.BottomLeft,
+                                    Colour = Color4.Black,
+                                    Font = OsuFont.Numeric.With(size: 7, weight: FontWeight.Black),
+                                    UseFullGlyphHeight = false,
+                                }
+                            }
                         }
                     }
                 }
@@ -98,35 +148,31 @@ namespace osu.Game.Screens.Ranking.Expanded
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            Current.BindValueChanged(difficulty => updateDisplay(difficulty.NewValue), true);
+
+            Current.BindValueChanged(_ => updateDisplay(), true);
+            FinishTransforms(true);
         }
 
-        private void updateDisplay(StarDifficulty difficulty)
+        private void updateDisplay()
         {
-            var starRatingParts = difficulty.Stars.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
-            string wholePart = starRatingParts[0];
-            string fractionPart = starRatingParts[1];
-            string separator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
+            const double duration = 400;
+            const Easing easing = Easing.OutQuint;
 
-            background.Colour = difficulty.DifficultyRating == DifficultyRating.ExpertPlus
-                ? ColourInfo.GradientVertical(Color4Extensions.FromHex("#C1C1C1"), Color4Extensions.FromHex("#595959"))
-                : (ColourInfo)colours.ForDifficultyRating(difficulty.DifficultyRating);
+            ColourInfo backgroundColour;
 
-            textFlow.Clear();
-
-            textFlow.AddText($"{wholePart}", s =>
+            if (Current.Value == null)
+                backgroundColour = Color4.SlateGray.Opacity(0.3f);
+            else
             {
-                s.Colour = Color4.Black;
-                s.Font = s.Font.With(size: 14);
-                s.UseFullGlyphHeight = false;
-            });
+                var rating = Current.Value.Value.DifficultyRating;
 
-            textFlow.AddText($"{separator}{fractionPart}", s =>
-            {
-                s.Colour = Color4.Black;
-                s.Font = s.Font.With(size: 7);
-                s.UseFullGlyphHeight = false;
-            });
+                backgroundColour = rating == DifficultyRating.ExpertPlus
+                    ? ColourInfo.GradientVertical(Color4Extensions.FromHex("#C1C1C1"), Color4Extensions.FromHex("#595959"))
+                    : (ColourInfo)colours.ForDifficultyRating(rating);
+            }
+
+            background.FadeColour(backgroundColour, duration, easing);
+            this.TransformTo(nameof(DisplayedStarRating), Current.Value?.Stars ?? 0.0f, duration, easing);
         }
     }
 }

From f701c331f285834f4814b4e070384a54637214f4 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 21:15:15 +0300
Subject: [PATCH 3212/3722] Add initial fade in to the metadata display

Avoids first frame discrepancies from appearing in the test scene, those can be delt with later on, if needed.
---
 .../Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
index 552d19ac26..f41180acf2 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
@@ -30,8 +30,10 @@ namespace osu.Game.Tests.Visual.SongSelect
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 Scale = new Vector2(1.5f),
+                Alpha = 0f,
             });
 
+            AddStep("fade in", () => display.FadeIn(400, Easing.OutQuint));
             AddToggleStep("trigger loading", v => display.Loading = v);
         }
 

From c3bf6a0287c16682e71a750728c40cfc2a99b06f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 8 May 2021 21:01:37 +0200
Subject: [PATCH 3213/3722] Remove weird vestigial `Current` reimplementation

Has no functional purpose anymore since the changes in the HUD element
data binding flow.
---
 osu.Game/Skinning/LegacyScoreCounter.cs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/osu.Game/Skinning/LegacyScoreCounter.cs b/osu.Game/Skinning/LegacyScoreCounter.cs
index 21112aa107..ecb907e601 100644
--- a/osu.Game/Skinning/LegacyScoreCounter.cs
+++ b/osu.Game/Skinning/LegacyScoreCounter.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.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Screens.Play.HUD;
@@ -16,8 +15,6 @@ namespace osu.Game.Skinning
         protected override double RollingDuration => 1000;
         protected override Easing RollingEasing => Easing.Out;
 
-        public new Bindable<double> Current { get; } = new Bindable<double>();
-
         public LegacyScoreCounter(ISkin skin)
             : base(6)
         {
@@ -26,9 +23,6 @@ namespace osu.Game.Skinning
 
             this.skin = skin;
 
-            // base class uses int for display, but externally we bind to ScoreProcessor as a double for now.
-            Current.BindValueChanged(v => base.Current.Value = (int)v.NewValue);
-
             Scale = new Vector2(0.96f);
             Margin = new MarginPadding(10);
         }

From efb9164658a127093cf39672466bafbb89268e4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 8 May 2021 21:35:12 +0200
Subject: [PATCH 3214/3722] Restore previous test scene logic

---
 .../Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs
index 34356184a2..6a8a2187f9 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.
 // 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.Testing;
@@ -15,8 +13,6 @@ namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneSkinnableAccuracyCounter : SkinnableTestScene
     {
-        private IEnumerable<SkinnableAccuracyCounter> accuracyCounters => CreatedDrawables.OfType<SkinnableAccuracyCounter>();
-
         protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
 
         [Cached]
@@ -25,7 +21,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         [SetUpSteps]
         public void SetUpSteps()
         {
-            AddStep("Create combo counters", () => SetContents(() => new SkinnableAccuracyCounter()));
+            AddStep("Set initial accuracy", () => scoreProcessor.Accuracy.Value = 1);
+            AddStep("Create accuracy counters", () => SetContents(() => new SkinnableAccuracyCounter()));
         }
 
         [Test]
@@ -33,7 +30,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep(@"Reset all", () => scoreProcessor.Accuracy.Value = 1);
 
-            AddStep(@"Hit! :D", () => scoreProcessor.Accuracy.Value -= 0.23);
+            AddStep(@"Miss :(", () => scoreProcessor.Accuracy.Value -= 0.023);
         }
     }
 }

From 67cea6e762f8dd2ff0e886bc2fc1ea6c79c56ce0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 8 May 2021 21:38:03 +0200
Subject: [PATCH 3215/3722] Remove explicit binding to accuracy counter from
 overlay

---
 osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs | 3 ---
 osu.Game/Screens/Play/HUDOverlay.cs                   | 2 --
 2 files changed, 5 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
index 17c2493d2d..fcb8fca35d 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.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.
 
-using osu.Framework.Bindables;
 using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
     public class SkinnableAccuracyCounter : SkinnableDrawable
     {
-        public Bindable<double> Current { get; } = new Bindable<double>();
-
         public SkinnableAccuracyCounter()
             : base(new HUDSkinComponent(HUDSkinComponents.AccuracyCounter), _ => new DefaultAccuracyCounter())
         {
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index c887fb78e0..e9b376c433 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -320,8 +320,6 @@ namespace osu.Game.Screens.Play
 
         protected virtual void BindScoreProcessor(ScoreProcessor processor)
         {
-            AccuracyCounter?.Current.BindTo(processor.Accuracy);
-
             if (HealthDisplay is IHealthDisplay shd)
             {
                 processor.NewJudgement += judgement =>

From 8fba655d2e9007449f19b67abf2876ce61656b67 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 21:20:17 +0300
Subject: [PATCH 3216/3722] Allow changing ruleset during test

---
 .../TestSceneBeatmapMetadataDisplay.cs         | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
index f41180acf2..0fbf42da6f 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
@@ -10,6 +10,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Play;
 using osuTK;
@@ -23,7 +24,18 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Resolved]
         private BeatmapManager manager { get; set; }
 
-        private void createDisplay(Func<WorkingBeatmap> getBeatmap)
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            foreach (var ruleset in rulesets.AvailableRulesets)
+                AddStep($"switch to {ruleset.Name}", () => Ruleset.Value = ruleset);
+        }
+
+        private void createTest(Func<WorkingBeatmap> getBeatmap)
         {
             AddStep("setup display", () => Child = display = new BeatmapMetadataDisplay(getBeatmap(), new Bindable<IReadOnlyList<Mod>>(getRandomMods()), Empty())
             {
@@ -43,7 +55,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                               [Values("Trial", "Some1's very hardest difficulty")]
                               string version)
         {
-            createDisplay(() => CreateWorkingBeatmap(new Beatmap
+            createTest(() => CreateWorkingBeatmap(new Beatmap
             {
                 BeatmapInfo =
                 {
@@ -60,7 +72,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestRandomFromDatabase()
         {
-            createDisplay(() =>
+            createTest(() =>
             {
                 var allBeatmapSets = manager.GetAllUsableBeatmapSets(IncludedDetails.Minimal);
                 if (allBeatmapSets.Count == 0)

From 342c5a5938253c961bfc97d2e1239f74ba20f4d9 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 9 May 2021 04:49:40 +0300
Subject: [PATCH 3217/3722] Add tests to indicate the issue

---
 .../Visual/Online/TestSceneNewsOverlay.cs     | 62 ++++++++++++++++---
 1 file changed, 55 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
index 6ebe8fcc07..f10b385c61 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
@@ -2,7 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Testing;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
@@ -14,21 +17,34 @@ namespace osu.Game.Tests.Visual.Online
     {
         private DummyAPIAccess dummyAPI => (DummyAPIAccess)API;
 
-        private NewsOverlay news;
+        private NewsOverlay overlay;
 
         [SetUp]
-        public void SetUp() => Schedule(() => Child = news = new NewsOverlay());
+        public void SetUp() => Schedule(() => Child = overlay = new NewsOverlay());
 
         [Test]
         public void TestRequest()
         {
             setUpNewsResponse(responseExample);
-            AddStep("Show", () => news.Show());
-            AddStep("Show article", () => news.ShowArticle("article"));
+            AddStep("Show", () => overlay.Show());
+            AddStep("Show article", () => overlay.ShowArticle("article"));
         }
 
-        private void setUpNewsResponse(GetNewsResponse r)
-            => AddStep("set up response", () =>
+        [Test]
+        public void TestCursorRequest()
+        {
+            setUpNewsResponse(responseWithCursor, "Set up cursor response");
+            AddStep("Show", () => overlay.Show());
+            AddAssert("Show More button is visible", () => showMoreButton.Alpha == 1);
+            setUpNewsResponse(responseWithNoCursor, "Set up no cursor response");
+            AddStep("Click Show More", () => showMoreButton.Click());
+            AddAssert("Show More button is hidden", () => showMoreButton.Alpha == 0);
+        }
+
+        private ShowMoreButton showMoreButton => overlay.ChildrenOfType<ShowMoreButton>().First();
+
+        private void setUpNewsResponse(GetNewsResponse r, string testName = "Set up response")
+            => AddStep(testName, () =>
             {
                 dummyAPI.HandleRequest = request =>
                 {
@@ -40,7 +56,7 @@ namespace osu.Game.Tests.Visual.Online
                 };
             });
 
-        private GetNewsResponse responseExample => new GetNewsResponse
+        private static GetNewsResponse responseExample => new GetNewsResponse
         {
             NewsPosts = new[]
             {
@@ -62,5 +78,37 @@ namespace osu.Game.Tests.Visual.Online
                 }
             }
         };
+
+        private static GetNewsResponse responseWithCursor => new GetNewsResponse
+        {
+            NewsPosts = new[]
+            {
+                new APINewsPost
+                {
+                    Title = "This post has an image which starts with \"/\" and has many authors!",
+                    Preview = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+                    Author = "someone, someone1, someone2, someone3, someone4",
+                    FirstImage = "/help/wiki/shared/news/banners/monthly-beatmapping-contest.png",
+                    PublishedAt = DateTimeOffset.Now
+                }
+            },
+            Cursor = new Cursor()
+        };
+
+        private static GetNewsResponse responseWithNoCursor => new GetNewsResponse
+        {
+            NewsPosts = new[]
+            {
+                new APINewsPost
+                {
+                    Title = "This post has a full-url image! (HTML entity: &amp;)",
+                    Preview = "boom (HTML entity: &amp;)",
+                    Author = "user (HTML entity: &amp;)",
+                    FirstImage = "https://assets.ppy.sh/artists/88/header.jpg",
+                    PublishedAt = DateTimeOffset.Now
+                }
+            },
+            Cursor = null
+        };
     }
 }

From dde9fd28e6872e2afe41670861ffb7ec510b74b9 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 9 May 2021 04:57:24 +0300
Subject: [PATCH 3218/3722] Hide ShowMore button if there's nothing to load

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

diff --git a/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs b/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs
index 0f177f151a..a1bc6c650b 100644
--- a/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs
+++ b/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs
@@ -100,7 +100,7 @@ namespace osu.Game.Overlays.News.Displays
             {
                 content.Add(loaded);
                 showMore.IsLoading = false;
-                showMore.Show();
+                showMore.Alpha = lastCursor == null ? 0 : 1;
             }, (cancellationToken = new CancellationTokenSource()).Token);
         }
 

From ae2b5a0806c3b0cad6dba614f1273d9d121cf0f6 Mon Sep 17 00:00:00 2001
From: Christine Chen <chenchr@umich.edu>
Date: Sat, 8 May 2021 22:42:14 -0400
Subject: [PATCH 3219/3722] Actually test that player was exited

---
 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 70b1d3ef85..0ac8e01482 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
@@ -140,7 +140,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("score not shown", () => !Player.IsScoreShown);
+            AddAssert("player exited", () => Stack.CurrentScreen == null);
         }
 
         protected override bool AllowFail => true;

From 0818deac17110c65ae22005c5616c55e67913847 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 9 May 2021 06:06:34 +0300
Subject: [PATCH 3220/3722] Fix potential test scene failure due to
 showMoreButton not being loaded in time

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

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
index f10b385c61..46454879da 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
@@ -35,6 +35,7 @@ namespace osu.Game.Tests.Visual.Online
         {
             setUpNewsResponse(responseWithCursor, "Set up cursor response");
             AddStep("Show", () => overlay.Show());
+            AddUntilStep("Show more button is ready", () => showMoreButton != null);
             AddAssert("Show More button is visible", () => showMoreButton.Alpha == 1);
             setUpNewsResponse(responseWithNoCursor, "Set up no cursor response");
             AddStep("Click Show More", () => showMoreButton.Click());

From 8868439ce46b042b2eae1bd7fc48614ac30d9197 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 9 May 2021 06:49:12 +0300
Subject: [PATCH 3221/3722] Another approach to fix test scene failure

---
 osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
index 46454879da..0be09d1fcc 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
@@ -36,10 +36,10 @@ namespace osu.Game.Tests.Visual.Online
             setUpNewsResponse(responseWithCursor, "Set up cursor response");
             AddStep("Show", () => overlay.Show());
             AddUntilStep("Show more button is ready", () => showMoreButton != null);
-            AddAssert("Show More button is visible", () => showMoreButton.Alpha == 1);
+            AddAssert("Show More button is visible", () => showMoreButton?.Alpha == 1);
             setUpNewsResponse(responseWithNoCursor, "Set up no cursor response");
-            AddStep("Click Show More", () => showMoreButton.Click());
-            AddAssert("Show More button is hidden", () => showMoreButton.Alpha == 0);
+            AddStep("Click Show More", () => showMoreButton?.Click());
+            AddAssert("Show More button is hidden", () => showMoreButton?.Alpha == 0);
         }
 
         private ShowMoreButton showMoreButton => overlay.ChildrenOfType<ShowMoreButton>().First();

From f0c1784d05a56dea2082473ca02063c1721bdad1 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 9 May 2021 09:12:37 +0300
Subject: [PATCH 3222/3722] Use FirstOrDefault instead of First

---
 osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
index 0be09d1fcc..ba692a7769 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Tests.Visual.Online
             AddAssert("Show More button is hidden", () => showMoreButton?.Alpha == 0);
         }
 
-        private ShowMoreButton showMoreButton => overlay.ChildrenOfType<ShowMoreButton>().First();
+        private ShowMoreButton showMoreButton => overlay.ChildrenOfType<ShowMoreButton>().FirstOrDefault();
 
         private void setUpNewsResponse(GetNewsResponse r, string testName = "Set up response")
             => AddStep(testName, () =>

From 879c08e6667024694dde3b8bb095b00185a3f3c3 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 9 May 2021 10:06:36 +0300
Subject: [PATCH 3223/3722] Use UntilStep instead of Assert to check button
 visibility

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

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
index ba692a7769..93a5b6fc59 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
@@ -35,11 +35,10 @@ namespace osu.Game.Tests.Visual.Online
         {
             setUpNewsResponse(responseWithCursor, "Set up cursor response");
             AddStep("Show", () => overlay.Show());
-            AddUntilStep("Show more button is ready", () => showMoreButton != null);
-            AddAssert("Show More button is visible", () => showMoreButton?.Alpha == 1);
+            AddUntilStep("Show More button is visible", () => showMoreButton?.Alpha == 1);
             setUpNewsResponse(responseWithNoCursor, "Set up no cursor response");
             AddStep("Click Show More", () => showMoreButton?.Click());
-            AddAssert("Show More button is hidden", () => showMoreButton?.Alpha == 0);
+            AddUntilStep("Show More button is hidden", () => showMoreButton?.Alpha == 0);
         }
 
         private ShowMoreButton showMoreButton => overlay.ChildrenOfType<ShowMoreButton>().FirstOrDefault();

From 8964d51de984f3089f5016d184e58b5ba222654e Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sun, 9 May 2021 14:10:38 -0700
Subject: [PATCH 3224/3722] Add ability to sort by source in song select

---
 osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs | 1 +
 osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs      | 3 +++
 osu.Game/Screens/Select/Filter/SortMode.cs                  | 5 ++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 5731b1ac2c..643f4131dc 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -304,6 +304,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddStep(@"Sort by BPM", () => config.SetValue(OsuSetting.SongSelectSortingMode, SortMode.BPM));
             AddStep(@"Sort by Length", () => config.SetValue(OsuSetting.SongSelectSortingMode, SortMode.Length));
             AddStep(@"Sort by Difficulty", () => config.SetValue(OsuSetting.SongSelectSortingMode, SortMode.Difficulty));
+            AddStep(@"Sort by Source", () => config.SetValue(OsuSetting.SongSelectSortingMode, SortMode.Source));
         }
 
         [Test]
diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
index bf045ed612..635f1d8e1e 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
@@ -82,6 +82,9 @@ namespace osu.Game.Screens.Select.Carousel
 
                 case SortMode.Difficulty:
                     return compareUsingAggregateMax(otherSet, b => b.StarDifficulty);
+
+                case SortMode.Source:
+                    return string.Compare(BeatmapSet.Metadata.Source, otherSet.BeatmapSet.Metadata.Source, StringComparison.OrdinalIgnoreCase);
             }
         }
 
diff --git a/osu.Game/Screens/Select/Filter/SortMode.cs b/osu.Game/Screens/Select/Filter/SortMode.cs
index be76fbc3ba..db0e6812b8 100644
--- a/osu.Game/Screens/Select/Filter/SortMode.cs
+++ b/osu.Game/Screens/Select/Filter/SortMode.cs
@@ -29,6 +29,9 @@ namespace osu.Game.Screens.Select.Filter
         RankAchieved,
 
         [Description("Title")]
-        Title
+        Title,
+
+        [Description("Source")]
+        Source,
     }
 }

From a21718f1cd89139f684835de8d2dd7d432da2de6 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sun, 9 May 2021 14:26:45 -0700
Subject: [PATCH 3225/3722] Move source case to a better spot

---
 osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
index 635f1d8e1e..00c2c2cb4a 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
@@ -71,6 +71,9 @@ namespace osu.Game.Screens.Select.Carousel
                 case SortMode.Author:
                     return string.Compare(BeatmapSet.Metadata.Author.Username, otherSet.BeatmapSet.Metadata.Author.Username, StringComparison.OrdinalIgnoreCase);
 
+                case SortMode.Source:
+                    return string.Compare(BeatmapSet.Metadata.Source, otherSet.BeatmapSet.Metadata.Source, StringComparison.OrdinalIgnoreCase);
+
                 case SortMode.DateAdded:
                     return otherSet.BeatmapSet.DateAdded.CompareTo(BeatmapSet.DateAdded);
 
@@ -82,9 +85,6 @@ namespace osu.Game.Screens.Select.Carousel
 
                 case SortMode.Difficulty:
                     return compareUsingAggregateMax(otherSet, b => b.StarDifficulty);
-
-                case SortMode.Source:
-                    return string.Compare(BeatmapSet.Metadata.Source, otherSet.BeatmapSet.Metadata.Source, StringComparison.OrdinalIgnoreCase);
             }
         }
 

From a71e52da4caf53c88b772263d4b7fb89090a34ec Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sun, 9 May 2021 15:39:59 -0700
Subject: [PATCH 3226/3722] Fix enum ordering after adding source

---
 osu.Game/Screens/Select/Filter/SortMode.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/Filter/SortMode.cs b/osu.Game/Screens/Select/Filter/SortMode.cs
index db0e6812b8..18c5d713e1 100644
--- a/osu.Game/Screens/Select/Filter/SortMode.cs
+++ b/osu.Game/Screens/Select/Filter/SortMode.cs
@@ -28,10 +28,10 @@ namespace osu.Game.Screens.Select.Filter
         [Description("Rank Achieved")]
         RankAchieved,
 
-        [Description("Title")]
-        Title,
-
         [Description("Source")]
         Source,
+
+        [Description("Title")]
+        Title,
     }
 }

From ab6239fd5f4545077162a2adec8352c789426cf0 Mon Sep 17 00:00:00 2001
From: Susko3 <16479013+Susko3@users.noreply.github.com>
Date: Mon, 10 May 2021 00:51:58 +0200
Subject: [PATCH 3227/3722] change math for displaying volume "MAX"

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

diff --git a/osu.Game/Overlays/Volume/VolumeMeter.cs b/osu.Game/Overlays/Volume/VolumeMeter.cs
index f1f21bec49..a15076581e 100644
--- a/osu.Game/Overlays/Volume/VolumeMeter.cs
+++ b/osu.Game/Overlays/Volume/VolumeMeter.cs
@@ -204,7 +204,7 @@ namespace osu.Game.Overlays.Volume
             {
                 displayVolume = value;
 
-                if (displayVolume > 0.99f)
+                if (displayVolume >= 0.995f)
                 {
                     text.Text = "MAX";
                     maxGlow.EffectColour = meterColour.Opacity(2f);

From 132bb7832d31e2c30719c65dd4da18d8fbbc2691 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 12:06:33 +0900
Subject: [PATCH 3228/3722] Fix some regressions when updating test scenes

---
 .../Visual/Gameplay/TestSceneFailingLayer.cs          |  7 ++-----
 .../Gameplay/TestSceneSkinnableHealthDisplay.cs       | 11 +++++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
index 99facb2731..ebc431a78b 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
@@ -4,6 +4,7 @@
 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.Configuration;
@@ -21,17 +22,13 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Resolved]
         private OsuConfigManager config { get; set; }
 
-        [SetUpSteps]
-        public void SetUpSteps()
-        {
-        }
-
         private void create(HealthProcessor healthProcessor)
         {
             AddStep("create layer", () =>
             {
                 Child = new HealthProcessorContainer(healthProcessor)
                 {
+                    RelativeSizeAxes = Axes.Both,
                     Child = layer = new FailingLayer()
                 };
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
index 2d6a6d95c7..4f50613416 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
@@ -43,18 +43,21 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddRepeatStep(@"decrease hp", delegate
             {
-                healthProcessor.Health.Value = 0.08f;
+                healthProcessor.Health.Value -= 0.08f;
             }, 10);
 
             AddRepeatStep(@"increase hp without flash", delegate
             {
-                healthProcessor.Health.Value = 0.1f;
+                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()));
+                healthProcessor.Health.Value += 0.1f;
+                healthProcessor.ApplyResult(new JudgementResult(new HitCircle(), new OsuJudgement())
+                {
+                    Type = HitResult.Perfect
+                });
             }, 3);
         }
     }

From 1bbbe8042099a5b1c3b659b1b899e2970651425c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 12:20:22 +0900
Subject: [PATCH 3229/3722] Fix missing instances of `HealthProcessor` caching

---
 .../Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs         | 1 +
 osu.Game/Screens/Play/Player.cs                                 | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
index 7c65601d50..ac5599cc27 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
@@ -18,6 +18,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneSkinEditorMultipleSkins : SkinnableTestScene
     {
+        [Cached]
         private readonly ScoreProcessor scoreProcessor = new ScoreProcessor();
 
         [Cached(typeof(HealthProcessor))]
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 396a9f841d..ba34ed4750 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -208,6 +208,8 @@ namespace osu.Game.Screens.Play
             HealthProcessor = ruleset.CreateHealthProcessor(playableBeatmap.HitObjects[0].StartTime);
             HealthProcessor.ApplyBeatmap(playableBeatmap);
 
+            dependencies.CacheAs(HealthProcessor);
+
             if (!ScoreProcessor.Mode.Disabled)
                 config.BindWith(OsuSetting.ScoreDisplayMode, ScoreProcessor.Mode);
 

From 1d38fa29b5a853a2be449ff00e3732359b0fbe00 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 12:23:04 +0900
Subject: [PATCH 3230/3722] Remove unused using statement

---
 osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
index ebc431a78b..fb4c9d713a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
@@ -6,7 +6,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Testing;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD;

From 0c973feb53f1e76a593994340d522e1afb439e46 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 12:34:21 +0900
Subject: [PATCH 3231/3722] Tidy up test scene

---
 .../TestSceneBeatmapMetadataDisplay.cs        | 41 +++++++++----------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
index 0fbf42da6f..e80c453da9 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
@@ -35,27 +35,13 @@ namespace osu.Game.Tests.Visual.SongSelect
                 AddStep($"switch to {ruleset.Name}", () => Ruleset.Value = ruleset);
         }
 
-        private void createTest(Func<WorkingBeatmap> getBeatmap)
-        {
-            AddStep("setup display", () => Child = display = new BeatmapMetadataDisplay(getBeatmap(), new Bindable<IReadOnlyList<Mod>>(getRandomMods()), Empty())
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Scale = new Vector2(1.5f),
-                Alpha = 0f,
-            });
-
-            AddStep("fade in", () => display.FadeIn(400, Easing.OutQuint));
-            AddToggleStep("trigger loading", v => display.Loading = v);
-        }
-
         [Test]
         public void TestLocal([Values("Beatmap", "Some long title and stuff")]
                               string title,
                               [Values("Trial", "Some1's very hardest difficulty")]
                               string version)
         {
-            createTest(() => CreateWorkingBeatmap(new Beatmap
+            showMetadataForBeatmap(() => CreateWorkingBeatmap(new Beatmap
             {
                 BeatmapInfo =
                 {
@@ -72,7 +58,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestRandomFromDatabase()
         {
-            createTest(() =>
+            showMetadataForBeatmap(() =>
             {
                 var allBeatmapSets = manager.GetAllUsableBeatmapSets(IncludedDetails.Minimal);
                 if (allBeatmapSets.Count == 0)
@@ -85,10 +71,23 @@ namespace osu.Game.Tests.Visual.SongSelect
             });
         }
 
-        private IReadOnlyList<Mod> getRandomMods() => Ruleset.Value.CreateInstance()
-                                                             .GetAllMods()
-                                                             .OrderBy(_ => RNG.Next())
-                                                             .Take(5)
-                                                             .ToList();
+        private void showMetadataForBeatmap(Func<WorkingBeatmap> getBeatmap)
+        {
+            AddStep("setup display", () =>
+            {
+                var randomMods = Ruleset.Value.CreateInstance().GetAllMods().OrderBy(_ => RNG.Next()).Take(5).ToList();
+
+                Child = display = new BeatmapMetadataDisplay(getBeatmap(), new Bindable<IReadOnlyList<Mod>>(randomMods), Empty())
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Scale = new Vector2(1.5f),
+                    Alpha = 0f,
+                };
+            });
+
+            AddStep("fade in", () => display.FadeIn(400, Easing.OutQuint));
+            AddToggleStep("trigger loading", v => display.Loading = v);
+        }
     }
 }

From 2b90bc4f1f85e35d1610e3e1e993e97dd5df643b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 12:35:23 +0900
Subject: [PATCH 3232/3722] Remove unnecessary ruleset switching steps

---
 .../SongSelect/TestSceneBeatmapMetadataDisplay.cs    | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
index e80c453da9..0fd9197ab4 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
@@ -10,7 +10,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
-using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Play;
 using osuTK;
@@ -24,17 +23,6 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Resolved]
         private BeatmapManager manager { get; set; }
 
-        [Resolved]
-        private RulesetStore rulesets { get; set; }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            foreach (var ruleset in rulesets.AvailableRulesets)
-                AddStep($"switch to {ruleset.Name}", () => Ruleset.Value = ruleset);
-        }
-
         [Test]
         public void TestLocal([Values("Beatmap", "Some long title and stuff")]
                               string title,

From b7acf9de52606a8a3bc87983d5deb096a773e6ca Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 12:36:56 +0900
Subject: [PATCH 3233/3722] Make test work without manually clicking things

---
 .../Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
index 0fd9197ab4..49aec02aa0 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
@@ -72,10 +72,13 @@ namespace osu.Game.Tests.Visual.SongSelect
                     Scale = new Vector2(1.5f),
                     Alpha = 0f,
                 };
+
+                display.FadeIn(400, Easing.OutQuint);
             });
 
-            AddStep("fade in", () => display.FadeIn(400, Easing.OutQuint));
-            AddToggleStep("trigger loading", v => display.Loading = v);
+            AddWaitStep("wait a bit", 5);
+
+            AddStep("finish loading", () => display.Loading = false);
         }
     }
 }

From 9ba412d27e9fe2161530a133efe2d74d329cdb8e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 12:41:22 +0900
Subject: [PATCH 3234/3722] Add the osu! logo to the test scene

Makes no sense to add a test intended to test visual behaviour with one
of the main elements missing. Not sure how you would be able to test the
flow with the logo's presence.
---
 .../SongSelect/TestSceneBeatmapMetadataDisplay.cs | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
index 49aec02aa0..230822e070 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Screens.Menu;
 using osu.Game.Screens.Play;
 using osuTK;
 
@@ -65,12 +66,16 @@ namespace osu.Game.Tests.Visual.SongSelect
             {
                 var randomMods = Ruleset.Value.CreateInstance().GetAllMods().OrderBy(_ => RNG.Next()).Take(5).ToList();
 
-                Child = display = new BeatmapMetadataDisplay(getBeatmap(), new Bindable<IReadOnlyList<Mod>>(randomMods), Empty())
+                OsuLogo logo = new OsuLogo { Scale = new Vector2(0.15f) };
+
+                Children = new Drawable[]
                 {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Scale = new Vector2(1.5f),
-                    Alpha = 0f,
+                    display = new BeatmapMetadataDisplay(getBeatmap(), new Bindable<IReadOnlyList<Mod>>(randomMods), logo)
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Alpha = 0f,
+                    }
                 };
 
                 display.FadeIn(400, Easing.OutQuint);

From 35a7226cd82120207014a652567a5e87febc25e2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 10 May 2021 13:41:04 +0900
Subject: [PATCH 3235/3722] Add newline

---
 osu.Game/Screens/Play/HUD/HealthDisplay.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index 2292f64989..6c2571cc28 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -39,7 +39,8 @@ namespace osu.Game.Screens.Play.HUD
 
         private void onNewJudgement(JudgementResult judgement)
         {
-            if (judgement.IsHit && judgement.Type != HitResult.IgnoreHit) Flash(judgement);
+            if (judgement.IsHit && judgement.Type != HitResult.IgnoreHit)
+                Flash(judgement);
         }
 
         protected override void Dispose(bool isDisposing)

From 7ca3e13712b974ce4cee0b431602ddf2fa654eed Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 10 May 2021 07:43:01 +0300
Subject: [PATCH 3236/3722] Implement basic years panel

---
 .../Visual/Online/TestSceneNewsYearsPanel.cs  |  34 ++++++
 osu.Game/Overlays/News/Sidebar/YearsPanel.cs  | 108 ++++++++++++++++++
 2 files changed, 142 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
 create mode 100644 osu.Game/Overlays/News/Sidebar/YearsPanel.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
new file mode 100644
index 0000000000..75975f04f8
--- /dev/null
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.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.Graphics;
+using osu.Game.Overlays.News.Sidebar;
+using osu.Framework.Allocation;
+using osu.Game.Overlays;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public class TestSceneNewsYearsPanel : OsuTestScene
+    {
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
+
+        private readonly YearsPanel panel;
+
+        public TestSceneNewsYearsPanel()
+        {
+            Add(panel = new YearsPanel()
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre
+            });
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            AddStep("Load years", () => panel.Years = new[] { 1000, 2000, 3000, 4000 });
+            AddStep("Load different years", () => panel.Years = new[] { 1001, 2001, 3001, 4001, 5001, 6001, 7001, 8001 });
+        }
+    }
+}
diff --git a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
new file mode 100644
index 0000000000..d71c7ba48e
--- /dev/null
+++ b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
@@ -0,0 +1,108 @@
+// Copyright (c) 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;
+using osu.Framework.Graphics.Shapes;
+using osuTK;
+using System.Linq;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using System.Collections.Generic;
+using osu.Game.Graphics;
+using osu.Framework.Bindables;
+using System.Collections.Specialized;
+
+namespace osu.Game.Overlays.News.Sidebar
+{
+    public class YearsPanel : CompositeDrawable
+    {
+        public int[] Years
+        {
+            set
+            {
+                years.Clear();
+                years.AddRange(value);
+            }
+        }
+
+        private readonly BindableList<int> years = new BindableList<int>();
+
+        private FillFlowContainer<YearButton> flow;
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            Width = 160;
+            AutoSizeAxes = Axes.Y;
+            Masking = true;
+            CornerRadius = 6;
+            InternalChildren = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = colourProvider.Background3
+                },
+                new Container
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Padding = new MarginPadding(5),
+                    Child = flow = new FillFlowContainer<YearButton>
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Spacing = new Vector2(5)
+                    }
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            years.BindCollectionChanged((u, v) =>
+            {
+                switch (v.Action)
+                {
+                    case NotifyCollectionChangedAction.Add:
+                        flow.Children = years.Select(y => new YearButton(y)).ToArray();
+                        break;
+                }
+            }, true);
+        }
+
+        private class YearButton : OsuHoverContainer
+        {
+            protected override IEnumerable<Drawable> EffectTargets => new[] { text };
+
+            private readonly int year;
+            private readonly OsuSpriteText text;
+
+            public YearButton(int year)
+            {
+                this.year = year;
+
+                Size = new Vector2(33.75f, 15);
+                Child = text = new OsuSpriteText
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Font = OsuFont.GetFont(size: 12),
+                    Text = year.ToString()
+                };
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                IdleColour = colourProvider.Light2;
+                HoverColour = colourProvider.Light1;
+                Action = () => { }; // TODO
+            }
+        }
+    }
+}

From 332cb74cad9f3adf3934432c344ce275be3405ee Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 10 May 2021 13:58:13 +0900
Subject: [PATCH 3237/3722] Fix toolbar queuing ruleset sounds

---
 osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs b/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs
index eb235632e8..9ca105ee7f 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs
@@ -69,13 +69,15 @@ namespace osu.Game.Overlays.Toolbar
             base.LoadComplete();
 
             Current.BindDisabledChanged(disabled => this.FadeColour(disabled ? Color4.Gray : Color4.White, 300), true);
-            Current.BindValueChanged(_ => moveLineToCurrent(), true);
+            Current.BindValueChanged(_ => moveLineToCurrent());
+
+            // Scheduled to allow the button flow layout to be computed before the line position is updated
+            ScheduleAfterChildren(moveLineToCurrent);
         }
 
         private bool hasInitialPosition;
 
-        // Scheduled to allow the flow layout to be computed before the line position is updated
-        private void moveLineToCurrent() => ScheduleAfterChildren(() =>
+        private void moveLineToCurrent()
         {
             if (SelectedTab != null)
             {
@@ -86,7 +88,7 @@ namespace osu.Game.Overlays.Toolbar
 
                 hasInitialPosition = true;
             }
-        });
+        }
 
         public override bool HandleNonPositionalInput => !Current.Disabled && base.HandleNonPositionalInput;
 

From 7971a2ef485bf8e80104a2032c378da069acdb7f Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 10 May 2021 08:47:00 +0300
Subject: [PATCH 3238/3722] Implement MonthPanel component

---
 .../Visual/Online/TestSceneNewsMonthPanel.cs  |  80 +++++++++
 osu.Game/Overlays/News/Sidebar/MonthPanel.cs  | 155 ++++++++++++++++++
 2 files changed, 235 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Online/TestSceneNewsMonthPanel.cs
 create mode 100644 osu.Game/Overlays/News/Sidebar/MonthPanel.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsMonthPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsMonthPanel.cs
new file mode 100644
index 0000000000..75e02b66e1
--- /dev/null
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsMonthPanel.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 System;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Overlays;
+using osu.Game.Overlays.News.Sidebar;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public class TestSceneNewsMonthPanel : OsuTestScene
+    {
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
+
+        [Test]
+        public void CreateClosedMonthPanel()
+        {
+            AddStep("Create", () => Child = new Container
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.TopCentre,
+                AutoSizeAxes = Axes.Both,
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = colourProvider.Background2,
+                    },
+                    new MonthPanel(DateTime.Now, posts),
+                }
+            });
+        }
+
+        [Test]
+        public void CreateOpenMonthPanel()
+        {
+            AddStep("Create", () => Child = new Container
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.TopCentre,
+                AutoSizeAxes = Axes.Both,
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = colourProvider.Background2,
+                    },
+                    new MonthPanel(DateTime.Now, posts)
+                    {
+                        IsOpen = { Value = true }
+                    },
+                }
+            });
+        }
+
+        private static APINewsPost[] posts => new[]
+        {
+            new APINewsPost
+            {
+                Title = "Short title"
+            },
+            new APINewsPost
+            {
+                Title = "Oh boy that's a long post title I wonder if it will break anything"
+            },
+            new APINewsPost
+            {
+                Title = "Medium title, nothing to see here"
+            }
+        };
+    }
+}
diff --git a/osu.Game/Overlays/News/Sidebar/MonthPanel.cs b/osu.Game/Overlays/News/Sidebar/MonthPanel.cs
new file mode 100644
index 0000000000..1dd1c561ab
--- /dev/null
+++ b/osu.Game/Overlays/News/Sidebar/MonthPanel.cs
@@ -0,0 +1,155 @@
+// Copyright (c) ppy 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.Graphics.Containers;
+using osu.Framework.Graphics;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Graphics.Containers;
+using osuTK;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics;
+using System.Linq;
+using System.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.Sprites;
+
+namespace osu.Game.Overlays.News.Sidebar
+{
+    public class MonthPanel : CompositeDrawable
+    {
+        public readonly BindableBool IsOpen = new BindableBool();
+
+        private readonly FillFlowContainer postsFlow;
+
+        public MonthPanel(DateTime date, APINewsPost[] posts)
+        {
+            Width = 160;
+            AutoSizeDuration = 250;
+            AutoSizeEasing = Easing.OutQuint;
+            InternalChild = new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(0, 5),
+                Children = new Drawable[]
+                {
+                    new DropdownButton(date)
+                    {
+                        IsOpen = { BindTarget = IsOpen }
+                    },
+                    postsFlow = new FillFlowContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Direction = FillDirection.Vertical,
+                        Spacing = new Vector2(0, 5),
+                        Children = posts.Select(p => new PostButton(p)).ToArray()
+                    }
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            IsOpen.BindValueChanged(open =>
+            {
+                ClearTransforms();
+
+                if (open.NewValue)
+                {
+                    AutoSizeAxes = Axes.Y;
+                    postsFlow.FadeIn(250, Easing.OutQuint);
+                }
+                else
+                {
+                    AutoSizeAxes = Axes.None;
+                    this.ResizeHeightTo(15, 250, Easing.OutQuint);
+
+                    postsFlow.FadeOut(250, Easing.OutQuint);
+                }
+            }, true);
+
+            // First state change should be instant.
+            FinishTransforms();
+            postsFlow.FinishTransforms();
+        }
+
+        private class DropdownButton : OsuHoverContainer
+        {
+            public readonly BindableBool IsOpen = new BindableBool();
+
+            protected override IEnumerable<Drawable> EffectTargets => null;
+
+            private readonly SpriteIcon icon;
+
+            public DropdownButton(DateTime date)
+            {
+                Size = new Vector2(160, 15);
+                Action = IsOpen.Toggle;
+                Children = new Drawable[]
+                {
+                    new OsuSpriteText
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
+                        Text = date.ToString("MMM yyyy")
+                    },
+                    icon = new SpriteIcon
+                    {
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.CentreRight,
+                        Size = new Vector2(10),
+                        Icon = FontAwesome.Solid.ChevronDown
+                    }
+                };
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                IsOpen.BindValueChanged(open =>
+                {
+                    icon.Scale = new Vector2(1, open.NewValue ? -1 : 1);
+                }, true);
+            }
+        }
+
+        private class PostButton : OsuHoverContainer
+        {
+            protected override IEnumerable<Drawable> EffectTargets => new[] { text };
+
+            private readonly APINewsPost post;
+            private readonly TextFlowContainer text;
+
+            public PostButton(APINewsPost post)
+            {
+                this.post = post;
+
+                RelativeSizeAxes = Axes.X;
+                AutoSizeAxes = Axes.Y;
+
+                Child = text = new TextFlowContainer(t => t.Font = OsuFont.GetFont(size: 12))
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Text = post.Title
+                };
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                IdleColour = colourProvider.Light2;
+                HoverColour = colourProvider.Light1;
+                Action = () => { }; // TODO
+            }
+        }
+    }
+}

From 301dab1ce8d8eb481a4180f63a7aa213919279c2 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 12:55:07 +0300
Subject: [PATCH 3239/3722] Refactor `StarRatingDisplay` to be mutable with a
 current bindable

---
 .../Ranking/TestSceneStarRatingDisplay.cs     | 15 +++-
 .../Ranking/Expanded/StarRatingDisplay.cs     | 87 ++++++++++++-------
 2 files changed, 68 insertions(+), 34 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
index d0067c3396..a043f506c1 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.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 NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Screens.Ranking.Expanded;
 
@@ -10,8 +12,11 @@ namespace osu.Game.Tests.Visual.Ranking
 {
     public class TestSceneStarRatingDisplay : OsuTestScene
     {
-        public TestSceneStarRatingDisplay()
+        [SetUp]
+        public void SetUp() => Schedule(() =>
         {
+            StarRatingDisplay changingStarRating;
+
             Child = new FillFlowContainer
             {
                 Anchor = Anchor.Centre,
@@ -25,8 +30,14 @@ namespace osu.Game.Tests.Visual.Ranking
                     new StarRatingDisplay(new StarDifficulty(5.67, 0)),
                     new StarRatingDisplay(new StarDifficulty(6.78, 0)),
                     new StarRatingDisplay(new StarDifficulty(10.11, 0)),
+                    changingStarRating = new StarRatingDisplay(),
                 }
             };
-        }
+
+            Scheduler.AddDelayed(() =>
+            {
+                changingStarRating.Current.Value = new StarDifficulty(RNG.NextDouble(0, 10), RNG.Next());
+            }, 500, true);
+        });
     }
 }
diff --git a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
index f7e50fdc8a..a1f48fa811 100644
--- a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
@@ -3,12 +3,14 @@
 
 using System.Globalization;
 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.Shapes;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.UserInterface;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -20,17 +22,29 @@ namespace osu.Game.Screens.Ranking.Expanded
     /// <summary>
     /// A pill that displays the star rating of a <see cref="BeatmapInfo"/>.
     /// </summary>
-    public class StarRatingDisplay : CompositeDrawable
+    public class StarRatingDisplay : CompositeDrawable, IHasCurrentValue<StarDifficulty>
     {
-        private readonly StarDifficulty difficulty;
+        private Box background;
+        private OsuTextFlowContainer textFlow;
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        private readonly BindableWithCurrent<StarDifficulty> current = new BindableWithCurrent<StarDifficulty>();
+
+        public Bindable<StarDifficulty> Current
+        {
+            get => current.Current;
+            set => current.Current = value;
+        }
 
         /// <summary>
         /// Creates a new <see cref="StarRatingDisplay"/> using an already computed <see cref="StarDifficulty"/>.
         /// </summary>
         /// <param name="starDifficulty">The already computed <see cref="StarDifficulty"/> to display the star difficulty of.</param>
-        public StarRatingDisplay(StarDifficulty starDifficulty)
+        public StarRatingDisplay(StarDifficulty starDifficulty = default)
         {
-            difficulty = starDifficulty;
+            Current.Value = starDifficulty;
         }
 
         [BackgroundDependencyLoader]
@@ -38,15 +52,6 @@ namespace osu.Game.Screens.Ranking.Expanded
         {
             AutoSizeAxes = Axes.Both;
 
-            var starRatingParts = difficulty.Stars.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
-            string wholePart = starRatingParts[0];
-            string fractionPart = starRatingParts[1];
-            string separator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
-
-            ColourInfo backgroundColour = difficulty.DifficultyRating == DifficultyRating.ExpertPlus
-                ? ColourInfo.GradientVertical(Color4Extensions.FromHex("#C1C1C1"), Color4Extensions.FromHex("#595959"))
-                : (ColourInfo)colours.ForDifficultyRating(difficulty.DifficultyRating);
-
             InternalChildren = new Drawable[]
             {
                 new CircularContainer
@@ -55,10 +60,9 @@ namespace osu.Game.Screens.Ranking.Expanded
                     Masking = true,
                     Children = new Drawable[]
                     {
-                        new Box
+                        background = new Box
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Colour = backgroundColour
                         },
                     }
                 },
@@ -78,32 +82,51 @@ namespace osu.Game.Screens.Ranking.Expanded
                             Icon = FontAwesome.Solid.Star,
                             Colour = Color4.Black
                         },
-                        new OsuTextFlowContainer(s => s.Font = OsuFont.Numeric.With(weight: FontWeight.Black))
+                        textFlow = new OsuTextFlowContainer(s => s.Font = OsuFont.Numeric.With(weight: FontWeight.Black))
                         {
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
                             AutoSizeAxes = Axes.Both,
                             Direction = FillDirection.Horizontal,
                             TextAnchor = Anchor.BottomLeft,
-                        }.With(t =>
-                        {
-                            t.AddText($"{wholePart}", s =>
-                            {
-                                s.Colour = Color4.Black;
-                                s.Font = s.Font.With(size: 14);
-                                s.UseFullGlyphHeight = false;
-                            });
-
-                            t.AddText($"{separator}{fractionPart}", s =>
-                            {
-                                s.Colour = Color4.Black;
-                                s.Font = s.Font.With(size: 7);
-                                s.UseFullGlyphHeight = false;
-                            });
-                        })
+                        }
                     }
                 }
             };
         }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            Current.BindValueChanged(difficulty => updateDisplay(difficulty.NewValue), true);
+        }
+
+        private void updateDisplay(StarDifficulty difficulty)
+        {
+            var starRatingParts = difficulty.Stars.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
+            string wholePart = starRatingParts[0];
+            string fractionPart = starRatingParts[1];
+            string separator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
+
+            background.Colour = difficulty.DifficultyRating == DifficultyRating.ExpertPlus
+                ? ColourInfo.GradientVertical(Color4Extensions.FromHex("#C1C1C1"), Color4Extensions.FromHex("#595959"))
+                : (ColourInfo)colours.ForDifficultyRating(difficulty.DifficultyRating);
+
+            textFlow.Clear();
+
+            textFlow.AddText($"{wholePart}", s =>
+            {
+                s.Colour = Color4.Black;
+                s.Font = s.Font.With(size: 14);
+                s.UseFullGlyphHeight = false;
+            });
+
+            textFlow.AddText($"{separator}{fractionPart}", s =>
+            {
+                s.Colour = Color4.Black;
+                s.Font = s.Font.With(size: 7);
+                s.UseFullGlyphHeight = false;
+            });
+        }
     }
 }

From ca772b60b183e33d0c42896f5340088c5f3206b8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 18:21:29 +0300
Subject: [PATCH 3240/3722] Use regular test steps rather than one-time set up
 and scheduling

---
 .../Visual/Ranking/TestSceneStarRatingDisplay.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
index a043f506c1..2ff664a0d9 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
@@ -12,12 +12,12 @@ namespace osu.Game.Tests.Visual.Ranking
 {
     public class TestSceneStarRatingDisplay : OsuTestScene
     {
-        [SetUp]
-        public void SetUp() => Schedule(() =>
+        [Test]
+        public void TestDisplay()
         {
-            StarRatingDisplay changingStarRating;
+            StarRatingDisplay changingStarRating = null;
 
-            Child = new FillFlowContainer
+            AddStep("load displays", () => Child = new FillFlowContainer
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
@@ -32,12 +32,12 @@ namespace osu.Game.Tests.Visual.Ranking
                     new StarRatingDisplay(new StarDifficulty(10.11, 0)),
                     changingStarRating = new StarRatingDisplay(),
                 }
-            };
+            });
 
-            Scheduler.AddDelayed(() =>
+            AddRepeatStep("change bottom rating", () =>
             {
                 changingStarRating.Current.Value = new StarDifficulty(RNG.NextDouble(0, 10), RNG.Next());
-            }, 500, true);
-        });
+            }, 10);
+        }
     }
 }

From 1c49590ba2e37ca79e03f7de0599e20f8be3a2f3 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 8 May 2021 21:13:18 +0300
Subject: [PATCH 3241/3722] Apply further refactoring to star rating display
 UX-wise

---
 .../Ranking/Expanded/StarRatingDisplay.cs     | 106 +++++++++++++-----
 1 file changed, 76 insertions(+), 30 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
index a1f48fa811..77c43ad863 100644
--- a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
@@ -13,7 +13,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
 using osuTK;
 using osuTK.Graphics;
 
@@ -22,27 +22,50 @@ namespace osu.Game.Screens.Ranking.Expanded
     /// <summary>
     /// A pill that displays the star rating of a <see cref="BeatmapInfo"/>.
     /// </summary>
-    public class StarRatingDisplay : CompositeDrawable, IHasCurrentValue<StarDifficulty>
+    public class StarRatingDisplay : CompositeDrawable, IHasCurrentValue<StarDifficulty?>
     {
         private Box background;
-        private OsuTextFlowContainer textFlow;
+        private OsuSpriteText wholePart;
+        private OsuSpriteText fractionPart;
+
+        private double displayedStarRating;
+
+        protected double DisplayedStarRating
+        {
+            get => displayedStarRating;
+            set
+            {
+                displayedStarRating = value;
+
+                var starRatingParts = value.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
+                wholePart.Text = starRatingParts[0];
+                fractionPart.Text = starRatingParts[1];
+            }
+        }
 
         [Resolved]
         private OsuColour colours { get; set; }
 
-        private readonly BindableWithCurrent<StarDifficulty> current = new BindableWithCurrent<StarDifficulty>();
+        private readonly BindableWithCurrent<StarDifficulty?> current = new BindableWithCurrent<StarDifficulty?>();
 
-        public Bindable<StarDifficulty> Current
+        public Bindable<StarDifficulty?> Current
         {
             get => current.Current;
             set => current.Current = value;
         }
 
+        /// <summary>
+        /// Creates a new <see cref="StarRatingDisplay"/> without any <see cref="StarDifficulty"/> set, displaying a placeholder until <see cref="Current"/> is changed.
+        /// </summary>
+        public StarRatingDisplay()
+        {
+        }
+
         /// <summary>
         /// Creates a new <see cref="StarRatingDisplay"/> using an already computed <see cref="StarDifficulty"/>.
         /// </summary>
         /// <param name="starDifficulty">The already computed <see cref="StarDifficulty"/> to display the star difficulty of.</param>
-        public StarRatingDisplay(StarDifficulty starDifficulty = default)
+        public StarRatingDisplay(StarDifficulty starDifficulty)
         {
             Current.Value = starDifficulty;
         }
@@ -82,13 +105,40 @@ namespace osu.Game.Screens.Ranking.Expanded
                             Icon = FontAwesome.Solid.Star,
                             Colour = Color4.Black
                         },
-                        textFlow = new OsuTextFlowContainer(s => s.Font = OsuFont.Numeric.With(weight: FontWeight.Black))
+                        new FillFlowContainer
                         {
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
                             AutoSizeAxes = Axes.Both,
                             Direction = FillDirection.Horizontal,
-                            TextAnchor = Anchor.BottomLeft,
+                            Children = new[]
+                            {
+                                wholePart = new OsuSpriteText
+                                {
+                                    Anchor = Anchor.BottomLeft,
+                                    Origin = Anchor.BottomLeft,
+                                    Colour = Color4.Black,
+                                    Font = OsuFont.Numeric.With(size: 14, weight: FontWeight.Black),
+                                    UseFullGlyphHeight = false,
+                                },
+                                new OsuSpriteText
+                                {
+                                    Anchor = Anchor.BottomLeft,
+                                    Origin = Anchor.BottomLeft,
+                                    Colour = Color4.Black,
+                                    Text = NumberFormatInfo.CurrentInfo.NumberDecimalSeparator,
+                                    Font = OsuFont.Numeric.With(size: 7, weight: FontWeight.Black),
+                                    UseFullGlyphHeight = false,
+                                },
+                                fractionPart = new OsuSpriteText
+                                {
+                                    Anchor = Anchor.BottomLeft,
+                                    Origin = Anchor.BottomLeft,
+                                    Colour = Color4.Black,
+                                    Font = OsuFont.Numeric.With(size: 7, weight: FontWeight.Black),
+                                    UseFullGlyphHeight = false,
+                                }
+                            }
                         }
                     }
                 }
@@ -98,35 +148,31 @@ namespace osu.Game.Screens.Ranking.Expanded
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            Current.BindValueChanged(difficulty => updateDisplay(difficulty.NewValue), true);
+
+            Current.BindValueChanged(_ => updateDisplay(), true);
+            FinishTransforms(true);
         }
 
-        private void updateDisplay(StarDifficulty difficulty)
+        private void updateDisplay()
         {
-            var starRatingParts = difficulty.Stars.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
-            string wholePart = starRatingParts[0];
-            string fractionPart = starRatingParts[1];
-            string separator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
+            const double duration = 400;
+            const Easing easing = Easing.OutQuint;
 
-            background.Colour = difficulty.DifficultyRating == DifficultyRating.ExpertPlus
-                ? ColourInfo.GradientVertical(Color4Extensions.FromHex("#C1C1C1"), Color4Extensions.FromHex("#595959"))
-                : (ColourInfo)colours.ForDifficultyRating(difficulty.DifficultyRating);
+            ColourInfo backgroundColour;
 
-            textFlow.Clear();
-
-            textFlow.AddText($"{wholePart}", s =>
+            if (Current.Value == null)
+                backgroundColour = Color4.SlateGray.Opacity(0.3f);
+            else
             {
-                s.Colour = Color4.Black;
-                s.Font = s.Font.With(size: 14);
-                s.UseFullGlyphHeight = false;
-            });
+                var rating = Current.Value.Value.DifficultyRating;
 
-            textFlow.AddText($"{separator}{fractionPart}", s =>
-            {
-                s.Colour = Color4.Black;
-                s.Font = s.Font.With(size: 7);
-                s.UseFullGlyphHeight = false;
-            });
+                backgroundColour = rating == DifficultyRating.ExpertPlus
+                    ? ColourInfo.GradientVertical(Color4Extensions.FromHex("#C1C1C1"), Color4Extensions.FromHex("#595959"))
+                    : (ColourInfo)colours.ForDifficultyRating(rating);
+            }
+
+            background.FadeColour(backgroundColour, duration, easing);
+            this.TransformTo(nameof(DisplayedStarRating), Current.Value?.Stars ?? 0.0f, duration, easing);
         }
     }
 }

From 97e72849af46241de4acbe4e955c5e6a72db9434 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 15:19:27 +0900
Subject: [PATCH 3242/3722] Fix regressed `HitErrorDisplay` behaviour (and
 localise binding to meter implementations)

---
 .../Visual/Gameplay/TestSceneHitErrorMeter.cs | 39 +++++++------------
 osu.Game/Screens/Play/HUD/HitErrorDisplay.cs  | 24 ------------
 .../HUD/HitErrorMeters/BarHitErrorMeter.cs    |  2 +-
 .../HUD/HitErrorMeters/ColourHitErrorMeter.cs |  2 +-
 .../Play/HUD/HitErrorMeters/HitErrorMeter.cs  | 29 +++++++++++++-
 5 files changed, 45 insertions(+), 51 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
index 1021ac3760..6cefd01aab 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
@@ -2,15 +2,16 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
-using osu.Game.Rulesets.Judgements;
-using osu.Framework.Utils;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Threading;
+using osu.Framework.Utils;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Catch.Scoring;
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Scoring;
-using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Scoring;
@@ -20,14 +21,11 @@ namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneHitErrorMeter : OsuTestScene
     {
-        private BarHitErrorMeter barMeter;
-        private BarHitErrorMeter barMeter2;
-        private BarHitErrorMeter barMeter3;
-        private ColourHitErrorMeter colourMeter;
-        private ColourHitErrorMeter colourMeter2;
-        private ColourHitErrorMeter colourMeter3;
         private HitWindows hitWindows;
 
+        [Cached]
+        private ScoreProcessor scoreProcessor = new ScoreProcessor();
+
         public TestSceneHitErrorMeter()
         {
             recreateDisplay(new OsuHitWindows(), 5);
@@ -105,40 +103,40 @@ namespace osu.Game.Tests.Visual.Gameplay
                 }
             });
 
-            Add(barMeter = new BarHitErrorMeter(hitWindows, true)
+            Add(new BarHitErrorMeter(hitWindows, true)
             {
                 Anchor = Anchor.CentreRight,
                 Origin = Anchor.CentreRight,
             });
 
-            Add(barMeter2 = new BarHitErrorMeter(hitWindows, false)
+            Add(new BarHitErrorMeter(hitWindows, false)
             {
                 Anchor = Anchor.CentreLeft,
                 Origin = Anchor.CentreLeft,
             });
 
-            Add(barMeter3 = new BarHitErrorMeter(hitWindows, true)
+            Add(new BarHitErrorMeter(hitWindows, true)
             {
                 Anchor = Anchor.BottomCentre,
                 Origin = Anchor.CentreLeft,
                 Rotation = 270,
             });
 
-            Add(colourMeter = new ColourHitErrorMeter(hitWindows)
+            Add(new ColourHitErrorMeter(hitWindows)
             {
                 Anchor = Anchor.CentreRight,
                 Origin = Anchor.CentreRight,
                 Margin = new MarginPadding { Right = 50 }
             });
 
-            Add(colourMeter2 = new ColourHitErrorMeter(hitWindows)
+            Add(new ColourHitErrorMeter(hitWindows)
             {
                 Anchor = Anchor.CentreLeft,
                 Origin = Anchor.CentreLeft,
                 Margin = new MarginPadding { Left = 50 }
             });
 
-            Add(colourMeter3 = new ColourHitErrorMeter(hitWindows)
+            Add(new ColourHitErrorMeter(hitWindows)
             {
                 Anchor = Anchor.BottomCentre,
                 Origin = Anchor.CentreLeft,
@@ -149,18 +147,11 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void newJudgement(double offset = 0)
         {
-            var judgement = new JudgementResult(new HitObject(), new Judgement())
+            scoreProcessor.ApplyResult(new JudgementResult(new HitCircle { HitWindows = hitWindows }, new Judgement())
             {
                 TimeOffset = offset == 0 ? RNG.Next(-150, 150) : offset,
                 Type = HitResult.Perfect,
-            };
-
-            barMeter.OnNewJudgement(judgement);
-            barMeter2.OnNewJudgement(judgement);
-            barMeter3.OnNewJudgement(judgement);
-            colourMeter.OnNewJudgement(judgement);
-            colourMeter2.OnNewJudgement(judgement);
-            colourMeter3.OnNewJudgement(judgement);
+            });
         }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/HitErrorDisplay.cs b/osu.Game/Screens/Play/HUD/HitErrorDisplay.cs
index 998a9fb7e7..a24d9c10cb 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorDisplay.cs
@@ -7,7 +7,6 @@ using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Configuration;
-using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD.HitErrorMeters;
 
@@ -22,17 +21,11 @@ namespace osu.Game.Screens.Play.HUD
 
         private readonly HitWindows hitWindows;
 
-        [Resolved]
-        private ScoreProcessor processor { get; set; }
-
         public HitErrorDisplay(HitWindows hitWindows)
         {
             this.hitWindows = hitWindows;
 
             RelativeSizeAxes = Axes.Both;
-
-            if (processor != null)
-                processor.NewJudgement += onNewJudgement;
         }
 
         [BackgroundDependencyLoader]
@@ -47,15 +40,6 @@ namespace osu.Game.Screens.Play.HUD
             type.BindValueChanged(typeChanged, true);
         }
 
-        private void onNewJudgement(JudgementResult result)
-        {
-            if (result.HitObject.HitWindows.WindowFor(HitResult.Miss) == 0)
-                return;
-
-            foreach (var c in Children)
-                c.OnNewJudgement(result);
-        }
-
         private void typeChanged(ValueChangedEvent<ScoreMeterType> type)
         {
             Children.ForEach(c => c.FadeOut(fade_duration, Easing.OutQuint));
@@ -139,13 +123,5 @@ namespace osu.Game.Screens.Play.HUD
             Add(display);
             display.FadeInFromZero(fade_duration, Easing.OutQuint);
         }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-
-            if (processor != null)
-                processor.NewJudgement -= onNewJudgement;
-        }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
index 3b24c8cc9e..c5a21ade03 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
@@ -214,7 +214,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 
         private const int max_concurrent_judgements = 50;
 
-        public override void OnNewJudgement(JudgementResult judgement)
+        protected override void OnNewJudgement(JudgementResult judgement)
         {
             if (!judgement.IsHit)
                 return;
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
index 657235bfd4..465439cf19 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             InternalChild = judgementsFlow = new JudgementFlow();
         }
 
-        public override void OnNewJudgement(JudgementResult judgement) => judgementsFlow.Push(GetColourForHitResult(HitWindows.ResultFor(judgement.TimeOffset)));
+        protected override void OnNewJudgement(JudgementResult judgement) => judgementsFlow.Push(GetColourForHitResult(HitWindows.ResultFor(judgement.TimeOffset)));
 
         private class JudgementFlow : FillFlowContainer<HitErrorCircle>
         {
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
index b3edfdedec..8b53a9676d 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
@@ -14,6 +14,9 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
     {
         protected readonly HitWindows HitWindows;
 
+        [Resolved]
+        private ScoreProcessor processor { get; set; }
+
         [Resolved]
         private OsuColour colours { get; set; }
 
@@ -22,7 +25,23 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             HitWindows = hitWindows;
         }
 
-        public abstract void OnNewJudgement(JudgementResult judgement);
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            if (processor != null)
+                processor.NewJudgement += onNewJudgement;
+        }
+
+        private void onNewJudgement(JudgementResult result)
+        {
+            if (result.HitObject.HitWindows?.WindowFor(HitResult.Miss) == 0)
+                return;
+
+            OnNewJudgement(result);
+        }
+
+        protected abstract void OnNewJudgement(JudgementResult judgement);
 
         protected Color4 GetColourForHitResult(HitResult result)
         {
@@ -47,5 +66,13 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
                     return colours.BlueLight;
             }
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (processor != null)
+                processor.NewJudgement -= onNewJudgement;
+        }
     }
 }

From 4b972249320ad7832619a999679e1a6558a9e7bf Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 10 May 2021 09:53:52 +0300
Subject: [PATCH 3243/3722] Implement NewsSideBar component

---
 .../Visual/Online/TestSceneNewsSideBar.cs     | 114 ++++++++++++++++++
 .../Online/API/Requests/GetNewsResponse.cs    |   3 +
 .../API/Requests/Responses/APINewsSidebar.cs  |  20 +++
 osu.Game/Overlays/News/Sidebar/NewsSideBar.cs | 114 ++++++++++++++++++
 4 files changed, 251 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
 create mode 100644 osu.Game/Online/API/Requests/Responses/APINewsSidebar.cs
 create mode 100644 osu.Game/Overlays/News/Sidebar/NewsSideBar.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
new file mode 100644
index 0000000000..931341f837
--- /dev/null
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
@@ -0,0 +1,114 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Overlays;
+using osu.Game.Overlays.News.Sidebar;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public class TestSceneNewsSideBar : OsuTestScene
+    {
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
+
+        private NewsSideBar sidebar;
+
+        [Test]
+        public void TestCreateEmpty()
+        {
+            createSidebar(null);
+        }
+
+        [Test]
+        public void TestCreateWithData()
+        {
+            createSidebar(metadata);
+        }
+
+        [Test]
+        public void TestDataChange()
+        {
+            createSidebar(null);
+            AddStep("Add data", () =>
+            {
+                if (sidebar != null)
+                    sidebar.Metadata.Value = metadata;
+            });
+        }
+
+        private void createSidebar(APINewsSidebar metadata) => AddStep("Create", () => Child = sidebar = new NewsSideBar
+        {
+            Metadata = { Value = metadata }
+        });
+
+        private static APINewsSidebar metadata = new APINewsSidebar
+        {
+            CurrentYear = 2021,
+            Years = new[]
+            {
+                2021,
+                2020,
+                2019,
+                2018,
+                2017,
+                2016,
+                2015,
+                2014,
+                2013
+            },
+            NewsPosts = new List<APINewsPost>
+            {
+                new APINewsPost
+                {
+                    Title = "(Mar) Short title",
+                    PublishedAt = new DateTime(2021, 3, 1)
+                },
+                new APINewsPost
+                {
+                    Title = "(Mar) Oh boy that's a long post title I wonder if it will break anything",
+                    PublishedAt = new DateTime(2021, 3, 1)
+                },
+                new APINewsPost
+                {
+                    Title = "(Mar) Medium title, nothing to see here",
+                    PublishedAt = new DateTime(2021, 3, 1)
+                },
+                new APINewsPost
+                {
+                    Title = "(Feb) Short title",
+                    PublishedAt = new DateTime(2021, 2, 1)
+                },
+                new APINewsPost
+                {
+                    Title = "(Feb) Oh boy that's a long post title I wonder if it will break anything",
+                    PublishedAt = new DateTime(2021, 2, 1)
+                },
+                new APINewsPost
+                {
+                    Title = "(Feb) Medium title, nothing to see here",
+                    PublishedAt = new DateTime(2021, 2, 1)
+                },
+                new APINewsPost
+                {
+                    Title = "Short title",
+                    PublishedAt = new DateTime(2021, 1, 1)
+                },
+                new APINewsPost
+                {
+                    Title = "Oh boy that's a long post title I wonder if it will break anything",
+                    PublishedAt = new DateTime(2021, 1, 1)
+                },
+                new APINewsPost
+                {
+                    Title = "Medium title, nothing to see here",
+                    PublishedAt = new DateTime(2021, 1, 1)
+                }
+            }
+        };
+    }
+}
diff --git a/osu.Game/Online/API/Requests/GetNewsResponse.cs b/osu.Game/Online/API/Requests/GetNewsResponse.cs
index 835289a51d..98f76d105c 100644
--- a/osu.Game/Online/API/Requests/GetNewsResponse.cs
+++ b/osu.Game/Online/API/Requests/GetNewsResponse.cs
@@ -11,5 +11,8 @@ namespace osu.Game.Online.API.Requests
     {
         [JsonProperty("news_posts")]
         public IEnumerable<APINewsPost> NewsPosts;
+
+        [JsonProperty("news_sidebar")]
+        public APINewsSidebar SidebarMetadata;
     }
 }
diff --git a/osu.Game/Online/API/Requests/Responses/APINewsSidebar.cs b/osu.Game/Online/API/Requests/Responses/APINewsSidebar.cs
new file mode 100644
index 0000000000..b8d6469a1d
--- /dev/null
+++ b/osu.Game/Online/API/Requests/Responses/APINewsSidebar.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 Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace osu.Game.Online.API.Requests.Responses
+{
+    public class APINewsSidebar
+    {
+        [JsonProperty("current_year")]
+        public int CurrentYear { get; set; }
+
+        [JsonProperty("news_posts")]
+        public IEnumerable<APINewsPost> NewsPosts { get; set; }
+
+        [JsonProperty("years")]
+        public int[] Years { get; set; }
+    }
+}
diff --git a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
new file mode 100644
index 0000000000..34c995cab6
--- /dev/null
+++ b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
@@ -0,0 +1,114 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Framework.Graphics.Shapes;
+using osuTK;
+using System.Collections.Generic;
+using System;
+
+namespace osu.Game.Overlays.News.Sidebar
+{
+    public class NewsSideBar : CompositeDrawable
+    {
+        public readonly Bindable<APINewsSidebar> Metadata = new Bindable<APINewsSidebar>();
+
+        private YearsPanel yearsPanel;
+        private FillFlowContainer<MonthPanel> monthsFlow;
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            RelativeSizeAxes = Axes.Y;
+            Width = 250;
+            InternalChildren = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = colourProvider.Background4
+                },
+                new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Padding = new MarginPadding
+                    {
+                        Top = 20,
+                        Left = 50,
+                        Right = 30
+                    },
+                    Child = new FillFlowContainer
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        Direction = FillDirection.Vertical,
+                        AutoSizeAxes = Axes.Both,
+                        Spacing = new Vector2(0, 20),
+                        Children = new Drawable[]
+                        {
+                            yearsPanel = new YearsPanel(),
+                            monthsFlow = new FillFlowContainer<MonthPanel>
+                            {
+                                AutoSizeAxes = Axes.Both,
+                                Direction = FillDirection.Vertical,
+                                Spacing = new Vector2(0, 10)
+                            }
+                        }
+                    }
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Metadata.BindValueChanged(metadata =>
+            {
+                monthsFlow.Clear();
+
+                if (metadata.NewValue == null)
+                {
+                    yearsPanel.Hide();
+                    return;
+                }
+
+                yearsPanel.Years = metadata.NewValue.Years;
+                yearsPanel.Show();
+
+                if (metadata.NewValue != null)
+                {
+                    var dict = new Dictionary<int, List<APINewsPost>>();
+
+                    foreach (var p in metadata.NewValue.NewsPosts)
+                    {
+                        var month = p.PublishedAt.Month;
+
+                        if (dict.ContainsKey(month))
+                            dict[month].Add(p);
+                        else
+                        {
+                            dict.Add(month, new List<APINewsPost>(new[] { p }));
+                        }
+                    }
+
+                    bool isFirst = true;
+
+                    foreach (var keyValuePair in dict)
+                    {
+                        monthsFlow.Add(new MonthPanel(new DateTime(metadata.NewValue.CurrentYear, keyValuePair.Key, 1), keyValuePair.Value.ToArray())
+                        {
+                            IsOpen = { Value = isFirst }
+                        });
+
+                        isFirst = false;
+                    }
+                }
+            }, true);
+        }
+    }
+}

From 0d243be457f514eab35edd8a3499f51fd0f573c7 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 10 May 2021 10:07:43 +0300
Subject: [PATCH 3244/3722] CI fixes

---
 osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs    | 2 +-
 osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs | 2 +-
 osu.Game/Overlays/News/Sidebar/MonthPanel.cs            | 3 ---
 osu.Game/Overlays/News/Sidebar/YearsPanel.cs            | 3 ---
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
index 931341f837..96161c28ed 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Tests.Visual.Online
             Metadata = { Value = metadata }
         });
 
-        private static APINewsSidebar metadata = new APINewsSidebar
+        private static readonly APINewsSidebar metadata = new APINewsSidebar
         {
             CurrentYear = 2021,
             Years = new[]
diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
index 75975f04f8..446cd06eea 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Tests.Visual.Online
 
         public TestSceneNewsYearsPanel()
         {
-            Add(panel = new YearsPanel()
+            Add(panel = new YearsPanel
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre
diff --git a/osu.Game/Overlays/News/Sidebar/MonthPanel.cs b/osu.Game/Overlays/News/Sidebar/MonthPanel.cs
index 1dd1c561ab..8b405eae10 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthPanel.cs
@@ -125,13 +125,10 @@ namespace osu.Game.Overlays.News.Sidebar
         {
             protected override IEnumerable<Drawable> EffectTargets => new[] { text };
 
-            private readonly APINewsPost post;
             private readonly TextFlowContainer text;
 
             public PostButton(APINewsPost post)
             {
-                this.post = post;
-
                 RelativeSizeAxes = Axes.X;
                 AutoSizeAxes = Axes.Y;
 
diff --git a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
index d71c7ba48e..046e1804bd 100644
--- a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
@@ -79,13 +79,10 @@ namespace osu.Game.Overlays.News.Sidebar
         {
             protected override IEnumerable<Drawable> EffectTargets => new[] { text };
 
-            private readonly int year;
             private readonly OsuSpriteText text;
 
             public YearButton(int year)
             {
-                this.year = year;
-
                 Size = new Vector2(33.75f, 15);
                 Child = text = new OsuSpriteText
                 {

From afc9a1bf235ef9c3026292254d788ce98072158d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 10 May 2021 10:16:52 +0300
Subject: [PATCH 3245/3722] Remove rolling support and apply few adjustments

---
 .../Ranking/Expanded/StarRatingDisplay.cs     | 81 +++++++------------
 1 file changed, 28 insertions(+), 53 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
index 77c43ad863..422833555f 100644
--- a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
@@ -13,7 +13,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.Containers;
 using osuTK;
 using osuTK.Graphics;
 
@@ -25,23 +25,7 @@ namespace osu.Game.Screens.Ranking.Expanded
     public class StarRatingDisplay : CompositeDrawable, IHasCurrentValue<StarDifficulty?>
     {
         private Box background;
-        private OsuSpriteText wholePart;
-        private OsuSpriteText fractionPart;
-
-        private double displayedStarRating;
-
-        protected double DisplayedStarRating
-        {
-            get => displayedStarRating;
-            set
-            {
-                displayedStarRating = value;
-
-                var starRatingParts = value.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
-                wholePart.Text = starRatingParts[0];
-                fractionPart.Text = starRatingParts[1];
-            }
-        }
+        private OsuTextFlowContainer textFlow;
 
         [Resolved]
         private OsuColour colours { get; set; }
@@ -105,40 +89,13 @@ namespace osu.Game.Screens.Ranking.Expanded
                             Icon = FontAwesome.Solid.Star,
                             Colour = Color4.Black
                         },
-                        new FillFlowContainer
+                        textFlow = new OsuTextFlowContainer(s => s.Font = OsuFont.Numeric.With(weight: FontWeight.Black))
                         {
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
                             AutoSizeAxes = Axes.Both,
                             Direction = FillDirection.Horizontal,
-                            Children = new[]
-                            {
-                                wholePart = new OsuSpriteText
-                                {
-                                    Anchor = Anchor.BottomLeft,
-                                    Origin = Anchor.BottomLeft,
-                                    Colour = Color4.Black,
-                                    Font = OsuFont.Numeric.With(size: 14, weight: FontWeight.Black),
-                                    UseFullGlyphHeight = false,
-                                },
-                                new OsuSpriteText
-                                {
-                                    Anchor = Anchor.BottomLeft,
-                                    Origin = Anchor.BottomLeft,
-                                    Colour = Color4.Black,
-                                    Text = NumberFormatInfo.CurrentInfo.NumberDecimalSeparator,
-                                    Font = OsuFont.Numeric.With(size: 7, weight: FontWeight.Black),
-                                    UseFullGlyphHeight = false,
-                                },
-                                fractionPart = new OsuSpriteText
-                                {
-                                    Anchor = Anchor.BottomLeft,
-                                    Origin = Anchor.BottomLeft,
-                                    Colour = Color4.Black,
-                                    Font = OsuFont.Numeric.With(size: 7, weight: FontWeight.Black),
-                                    UseFullGlyphHeight = false,
-                                }
-                            }
+                            TextAnchor = Anchor.BottomLeft,
                         }
                     }
                 }
@@ -158,21 +115,39 @@ namespace osu.Game.Screens.Ranking.Expanded
             const double duration = 400;
             const Easing easing = Easing.OutQuint;
 
-            ColourInfo backgroundColour;
+            double stars = Current.Value?.Stars ?? 0.00f;
+
+            var starRatingParts = stars.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
+            string wholePart = starRatingParts[0];
+            string fractionPart = starRatingParts[1];
+            string separator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
 
             if (Current.Value == null)
-                backgroundColour = Color4.SlateGray.Opacity(0.3f);
+                background.FadeColour(Color4.SlateGray.Opacity(0.3f));
             else
             {
                 var rating = Current.Value.Value.DifficultyRating;
 
-                backgroundColour = rating == DifficultyRating.ExpertPlus
+                background.FadeColour(rating == DifficultyRating.ExpertPlus
                     ? ColourInfo.GradientVertical(Color4Extensions.FromHex("#C1C1C1"), Color4Extensions.FromHex("#595959"))
-                    : (ColourInfo)colours.ForDifficultyRating(rating);
+                    : (ColourInfo)colours.ForDifficultyRating(rating), duration, easing);
             }
 
-            background.FadeColour(backgroundColour, duration, easing);
-            this.TransformTo(nameof(DisplayedStarRating), Current.Value?.Stars ?? 0.0f, duration, easing);
+            textFlow.Clear();
+
+            textFlow.AddText($"{wholePart}", s =>
+            {
+                s.Colour = Color4.Black;
+                s.Font = s.Font.With(size: 14);
+                s.UseFullGlyphHeight = false;
+            });
+
+            textFlow.AddText($"{separator}{fractionPart}", s =>
+            {
+                s.Colour = Color4.Black;
+                s.Font = s.Font.With(size: 7);
+                s.UseFullGlyphHeight = false;
+            });
         }
     }
 }

From fa872858b592278b7672c16fbd840825d8ac7a24 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 10 May 2021 16:40:06 +0900
Subject: [PATCH 3246/3722] Remove unnecessary check

---
 osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
index 8b53a9676d..37e9ea43c5 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
@@ -29,8 +29,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
         {
             base.LoadComplete();
 
-            if (processor != null)
-                processor.NewJudgement += onNewJudgement;
+            processor.NewJudgement += onNewJudgement;
         }
 
         private void onNewJudgement(JudgementResult result)

From 1b701adfef5a20c1cd008449fe4a4eed503f2be6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 18:15:39 +0900
Subject: [PATCH 3247/3722] Add score/health processors to fill in default
 values

---
 osu.Game/Skinning/Editor/SkinComponentToolbox.cs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
index 1953fdc8fe..a000204062 100644
--- a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
+++ b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
@@ -14,6 +14,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Scoring;
 using osuTK;
 using osuTK.Graphics;
 
@@ -25,6 +26,16 @@ namespace osu.Game.Skinning.Editor
 
         private const float component_display_scale = 0.8f;
 
+        [Cached]
+        private ScoreProcessor scoreProcessor = new ScoreProcessor
+        {
+            Combo = { Value = 727 },
+            TotalScore = { Value = 1337377 }
+        };
+
+        [Cached(typeof(HealthProcessor))]
+        private HealthProcessor healthProcessor = new DrainingHealthProcessor(0);
+
         public SkinComponentToolbox(float height)
             : base("Components", height)
         {

From bca5bee72eb22df8f9885c8962efe2a9125417fa Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Mon, 10 May 2021 19:28:32 +0700
Subject: [PATCH 3248/3722] remove duplicate CreateSpriteText in
 OsuMarkdownTextFlowContainer

---
 .../Containers/Markdown/OsuMarkdownTextFlowContainer.cs     | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs
index 1550b8401d..c3527fa99a 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownTextFlowContainer.cs
@@ -6,7 +6,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers.Markdown;
 using osu.Framework.Graphics.Sprites;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 
 namespace osu.Game.Graphics.Containers.Markdown
@@ -16,11 +15,6 @@ namespace osu.Game.Graphics.Containers.Markdown
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; }
 
-        protected override SpriteText CreateSpriteText() => new OsuSpriteText
-        {
-            Font = OsuFont.GetFont(size: 14),
-        };
-
         protected override void AddLinkText(string text, LinkInline linkInline)
             => AddDrawable(new OsuMarkdownLinkText(text, linkInline));
 

From 220eef035181e3d08b0fde4430b966b3f69c3cb7 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 10 May 2021 17:00:18 +0300
Subject: [PATCH 3249/3722] Remove overcomplicated date logic in MonthPanel

---
 .../Visual/Online/TestSceneNewsMonthPanel.cs           | 10 ++++++----
 osu.Game/Overlays/News/Sidebar/MonthPanel.cs           |  6 +++---
 osu.Game/Overlays/News/Sidebar/NewsSideBar.cs          |  3 +--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsMonthPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsMonthPanel.cs
index 75e02b66e1..ee7fb8b407 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsMonthPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsMonthPanel.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -33,7 +34,7 @@ namespace osu.Game.Tests.Visual.Online
                         RelativeSizeAxes = Axes.Both,
                         Colour = colourProvider.Background2,
                     },
-                    new MonthPanel(DateTime.Now, posts),
+                    new MonthPanel(posts),
                 }
             });
         }
@@ -53,7 +54,7 @@ namespace osu.Game.Tests.Visual.Online
                         RelativeSizeAxes = Axes.Both,
                         Colour = colourProvider.Background2,
                     },
-                    new MonthPanel(DateTime.Now, posts)
+                    new MonthPanel(posts)
                     {
                         IsOpen = { Value = true }
                     },
@@ -61,11 +62,12 @@ namespace osu.Game.Tests.Visual.Online
             });
         }
 
-        private static APINewsPost[] posts => new[]
+        private static List<APINewsPost> posts => new List<APINewsPost>
         {
             new APINewsPost
             {
-                Title = "Short title"
+                Title = "Short title",
+                PublishedAt = DateTimeOffset.Now
             },
             new APINewsPost
             {
diff --git a/osu.Game/Overlays/News/Sidebar/MonthPanel.cs b/osu.Game/Overlays/News/Sidebar/MonthPanel.cs
index 8b405eae10..5f2acd63d1 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthPanel.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Overlays.News.Sidebar
 
         private readonly FillFlowContainer postsFlow;
 
-        public MonthPanel(DateTime date, APINewsPost[] posts)
+        public MonthPanel(List<APINewsPost> posts)
         {
             Width = 160;
             AutoSizeDuration = 250;
@@ -36,7 +36,7 @@ namespace osu.Game.Overlays.News.Sidebar
                 Spacing = new Vector2(0, 5),
                 Children = new Drawable[]
                 {
-                    new DropdownButton(date)
+                    new DropdownButton(posts[0].PublishedAt)
                     {
                         IsOpen = { BindTarget = IsOpen }
                     },
@@ -87,7 +87,7 @@ namespace osu.Game.Overlays.News.Sidebar
 
             private readonly SpriteIcon icon;
 
-            public DropdownButton(DateTime date)
+            public DropdownButton(DateTimeOffset date)
             {
                 Size = new Vector2(160, 15);
                 Action = IsOpen.Toggle;
diff --git a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
index 34c995cab6..9a2fdf2d97 100644
--- a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
+++ b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
@@ -9,7 +9,6 @@ using osu.Game.Online.API.Requests.Responses;
 using osu.Framework.Graphics.Shapes;
 using osuTK;
 using System.Collections.Generic;
-using System;
 
 namespace osu.Game.Overlays.News.Sidebar
 {
@@ -100,7 +99,7 @@ namespace osu.Game.Overlays.News.Sidebar
 
                     foreach (var keyValuePair in dict)
                     {
-                        monthsFlow.Add(new MonthPanel(new DateTime(metadata.NewValue.CurrentYear, keyValuePair.Key, 1), keyValuePair.Value.ToArray())
+                        monthsFlow.Add(new MonthPanel(keyValuePair.Value)
                         {
                             IsOpen = { Value = isFirst }
                         });

From f1aa47f6df50456892f2c7da4d4281f5e288714f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 23:15:38 +0900
Subject: [PATCH 3250/3722] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 80b1c5b52f..8c24df5c2e 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.507.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.510.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 29189781a7..3eb5050e1a 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.507.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.510.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
     <PackageReference Include="Sentry" Version="3.3.4" />
     <PackageReference Include="SharpCompress" Version="0.28.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index c4eb7aefba..f00e20a66e 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.507.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.510.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.507.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.510.0" />
     <PackageReference Include="SharpCompress" Version="0.28.2" />
     <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 7c8dd91674481b209d383cda463b423534f7722e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 11 May 2021 09:29:15 +0900
Subject: [PATCH 3251/3722] Rename test to better match tested class

---
 ...apDifficultyManagerTest.cs => BeatmapDifficultyCacheTest.cs} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename osu.Game.Tests/Beatmaps/{BeatmapDifficultyManagerTest.cs => BeatmapDifficultyCacheTest.cs} (98%)

diff --git a/osu.Game.Tests/Beatmaps/BeatmapDifficultyManagerTest.cs b/osu.Game.Tests/Beatmaps/BeatmapDifficultyCacheTest.cs
similarity index 98%
rename from osu.Game.Tests/Beatmaps/BeatmapDifficultyManagerTest.cs
rename to osu.Game.Tests/Beatmaps/BeatmapDifficultyCacheTest.cs
index 70503bec7a..d407c0663f 100644
--- a/osu.Game.Tests/Beatmaps/BeatmapDifficultyManagerTest.cs
+++ b/osu.Game.Tests/Beatmaps/BeatmapDifficultyCacheTest.cs
@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Osu.Mods;
 namespace osu.Game.Tests.Beatmaps
 {
     [TestFixture]
-    public class BeatmapDifficultyManagerTest
+    public class BeatmapDifficultyCacheTest
     {
         [Test]
         public void TestKeyEqualsWithDifferentModInstances()

From 32f7691349dd449593a8664ac191dcb84d56a8b2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 11 May 2021 11:24:35 +0900
Subject: [PATCH 3252/3722] Fix token failure preventing
 base.LoadAsyncComplete()

---
 osu.Game/Screens/Play/SubmittingPlayer.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index b64d835c58..79c1d1a274 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -33,9 +33,8 @@ namespace osu.Game.Screens.Play
 
         protected override void LoadAsyncComplete()
         {
-            if (!handleTokenRetrieval()) return;
-
             base.LoadAsyncComplete();
+            handleTokenRetrieval();
         }
 
         private bool handleTokenRetrieval()

From 6db9e26d48a490b6c3bf9912877bd8f22220b492 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 11 May 2021 11:24:55 +0900
Subject: [PATCH 3253/3722] Fix score submission failures with autoplay

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

diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index 79c1d1a274..ece1a589cd 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
@@ -9,6 +10,7 @@ using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 
 namespace osu.Game.Screens.Play
@@ -42,6 +44,12 @@ namespace osu.Game.Screens.Play
             // Token request construction should happen post-load to allow derived classes to potentially prepare DI backings that are used to create the request.
             var tcs = new TaskCompletionSource<bool>();
 
+            if (DrawableRuleset.HasReplayLoaded.Value || Mods.Value.Any(m => m is ModAutoplay))
+            {
+                handleTokenFailure(new InvalidOperationException("Replay loaded."));
+                return false;
+            }
+
             if (!api.IsLoggedIn)
             {
                 handleTokenFailure(new InvalidOperationException("API is not online."));

From 8c9390dc75fd819b65f164c141bbf02420efec29 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 11 May 2021 11:33:21 +0900
Subject: [PATCH 3254/3722] Remove replay condition

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

diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index ece1a589cd..68c6282fe0 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Screens.Play
             // Token request construction should happen post-load to allow derived classes to potentially prepare DI backings that are used to create the request.
             var tcs = new TaskCompletionSource<bool>();
 
-            if (DrawableRuleset.HasReplayLoaded.Value || Mods.Value.Any(m => m is ModAutoplay))
+            if (Mods.Value.Any(m => m is ModAutoplay))
             {
                 handleTokenFailure(new InvalidOperationException("Replay loaded."));
                 return false;

From 0f00ee8640e332453bd0131824360b594fe685a0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 11 May 2021 11:35:07 +0900
Subject: [PATCH 3255/3722] Change failure text

Although this is not visible anywhere.
---
 osu.Game/Screens/Play/SubmittingPlayer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index 68c6282fe0..d5ad87c70c 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Screens.Play
 
             if (Mods.Value.Any(m => m is ModAutoplay))
             {
-                handleTokenFailure(new InvalidOperationException("Replay loaded."));
+                handleTokenFailure(new InvalidOperationException("Autoplay loaded."));
                 return false;
             }
 

From 4bee8c23f0f8b6d502d31d877cda12261790d881 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Mon, 10 May 2021 21:40:29 -0700
Subject: [PATCH 3256/3722] Fix idle tracker not accounting global actions

---
 osu.Game/Input/IdleTracker.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Input/IdleTracker.cs b/osu.Game/Input/IdleTracker.cs
index 2d6a21d1cf..f3d531cf6c 100644
--- a/osu.Game/Input/IdleTracker.cs
+++ b/osu.Game/Input/IdleTracker.cs
@@ -6,13 +6,14 @@ using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Game.Input.Bindings;
 
 namespace osu.Game.Input
 {
     /// <summary>
     /// Track whether the end-user is in an idle state, based on their last interaction with the game.
     /// </summary>
-    public class IdleTracker : Component, IKeyBindingHandler<PlatformAction>, IHandleGlobalKeyboardInput
+    public class IdleTracker : Component, IKeyBindingHandler<PlatformAction>, IKeyBindingHandler<GlobalAction>, IHandleGlobalKeyboardInput
     {
         private readonly double timeToIdle;
 
@@ -58,6 +59,10 @@ namespace osu.Game.Input
 
         public void OnReleased(PlatformAction action) => updateLastInteractionTime();
 
+        public bool OnPressed(GlobalAction action) => updateLastInteractionTime();
+
+        public void OnReleased(GlobalAction action) => updateLastInteractionTime();
+
         protected override bool Handle(UIEvent e)
         {
             switch (e)

From 713c169332dacbd7b63b0948ade3290c614004dd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 11 May 2021 16:08:25 +0900
Subject: [PATCH 3257/3722] Fix mania crashing on playing samples after skin
 change

---
 .../Drawables/DrawableManiaHitObject.cs       |  6 +++++
 osu.Game.Rulesets.Mania/UI/Column.cs          | 27 ++++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
index 1550faee50..003646d654 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
@@ -6,6 +6,7 @@ using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Game.Audio;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Rulesets.Mania.UI;
@@ -24,6 +25,11 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         [Resolved(canBeNull: true)]
         private ManiaPlayfield playfield { get; set; }
 
+        /// <summary>
+        /// Gets the samples that are played by this object during gameplay.
+        /// </summary>
+        public ISampleInfo[] GetGameplaySamples() => Samples.Samples;
+
         protected override float SamplePlaybackPosition
         {
             get
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index d2a9b69b60..fcbbd8a01c 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -27,6 +27,15 @@ namespace osu.Game.Rulesets.Mania.UI
         public const float COLUMN_WIDTH = 80;
         public const float SPECIAL_COLUMN_WIDTH = 70;
 
+        /// <summary>
+        /// For hitsounds played by this <see cref="Column"/> (i.e. not as a result of hitting a hitobject),
+        /// a certain number of samples are allowed to be played concurrently so that it feels better when spam-pressing the key.
+        /// </summary>
+        /// <remarks>
+        ///
+        /// </remarks>
+        private const int max_concurrent_hitsounds = OsuGameBase.SAMPLE_CONCURRENCY;
+
         /// <summary>
         /// The index of this column as part of the whole playfield.
         /// </summary>
@@ -38,6 +47,7 @@ namespace osu.Game.Rulesets.Mania.UI
         internal readonly Container TopLevelContainer;
         private readonly DrawablePool<PoolableHitExplosion> hitExplosionPool;
         private readonly OrderedHitPolicy hitPolicy;
+        private readonly SkinnableSound[] hitSounds;
 
         public Container UnderlayElements => HitObjectArea.UnderlayElements;
 
@@ -64,6 +74,11 @@ namespace osu.Game.Rulesets.Mania.UI
                     RelativeSizeAxes = Axes.Both
                 },
                 background,
+                new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    ChildrenEnumerable = hitSounds = Enumerable.Range(0, max_concurrent_hitsounds).Select(_ => new SkinnableSound()).ToArray()
+                },
                 TopLevelContainer = new Container { RelativeSizeAxes = Axes.Both }
             };
 
@@ -120,6 +135,8 @@ namespace osu.Game.Rulesets.Mania.UI
             HitObjectArea.Explosions.Add(hitExplosionPool.Get(e => e.Apply(result)));
         }
 
+        private int nextHitSound;
+
         public bool OnPressed(ManiaAction action)
         {
             if (action != Action.Value)
@@ -131,7 +148,15 @@ namespace osu.Game.Rulesets.Mania.UI
                 HitObjectContainer.Objects.FirstOrDefault(h => h.HitObject.StartTime > Time.Current) ??
                 HitObjectContainer.Objects.LastOrDefault();
 
-            nextObject?.PlaySamples();
+            if (nextObject is DrawableManiaHitObject maniaObject)
+            {
+                var hitSound = hitSounds[nextHitSound];
+
+                hitSound.Samples = maniaObject.GetGameplaySamples();
+                hitSound.Play();
+
+                nextHitSound = (nextHitSound + 1) % max_concurrent_hitsounds;
+            }
 
             return true;
         }

From b9ab9342faeee26c54903beb326109698c8525b1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 May 2021 15:16:16 +0900
Subject: [PATCH 3258/3722] Setup basics to allow extracting serializable
 content from skinnable `Drawable`s

---
 osu.Game/Extensions/DrawableExtensions.cs     |  3 ++
 osu.Game/Screens/Play/HUD/ISkinnableInfo.cs   | 32 ++++++++++++++
 .../HUD/SkinnableElementTargetContainer.cs    | 11 +++++
 .../Screens/Play/HUD/StoredSkinnableInfo.cs   | 43 +++++++++++++++++++
 osu.Game/Screens/Play/HUDOverlay.cs           | 38 +++++++---------
 .../Skinning/Editor/SkinBlueprintContainer.cs | 13 +++++-
 osu.Game/Skinning/ISkin.cs                    |  2 +
 7 files changed, 119 insertions(+), 23 deletions(-)
 create mode 100644 osu.Game/Screens/Play/HUD/ISkinnableInfo.cs
 create mode 100644 osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
 create mode 100644 osu.Game/Screens/Play/HUD/StoredSkinnableInfo.cs

diff --git a/osu.Game/Extensions/DrawableExtensions.cs b/osu.Game/Extensions/DrawableExtensions.cs
index a8de3f6407..3d2ffe0ea1 100644
--- a/osu.Game/Extensions/DrawableExtensions.cs
+++ b/osu.Game/Extensions/DrawableExtensions.cs
@@ -5,6 +5,7 @@ using System;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Threading;
+using osu.Game.Screens.Play.HUD;
 using osuTK;
 
 namespace osu.Game.Extensions
@@ -43,5 +44,7 @@ namespace osu.Game.Extensions
         /// <returns>The delta vector in Parent's coordinates.</returns>
         public static Vector2 ScreenSpaceDeltaToParentSpace(this Drawable drawable, Vector2 delta) =>
             drawable.Parent.ToLocalSpace(drawable.Parent.ToScreenSpace(Vector2.Zero) + delta);
+
+        public static StoredSkinnableInfo CreateSerialisedInformation(this Drawable component) => new StoredSkinnableInfo(component);
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/ISkinnableInfo.cs b/osu.Game/Screens/Play/HUD/ISkinnableInfo.cs
new file mode 100644
index 0000000000..0e571b5cb4
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/ISkinnableInfo.cs
@@ -0,0 +1,32 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using osu.Framework.Graphics;
+using osu.Game.IO.Serialization;
+using osuTK;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public interface ISkinnableInfo : IJsonSerializable
+    {
+        public Type Type { get; set; }
+
+        public Type Target { get; set; }
+
+        public Vector2 Position { get; set; }
+
+        public float Rotation { get; set; }
+
+        public Vector2 Scale { get; set; }
+
+        public Anchor Anchor { get; set; }
+    }
+
+    /// <summary>
+    /// A container which supports skinnable components being added to it.
+    /// </summary>
+    public interface ISkinnableTarget
+    {
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs b/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
new file mode 100644
index 0000000000..7ba32e2d46
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
@@ -0,0 +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.Graphics.Containers;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    public class SkinnableElementTargetContainer : Container, ISkinnableTarget
+    {
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/StoredSkinnableInfo.cs b/osu.Game/Screens/Play/HUD/StoredSkinnableInfo.cs
new file mode 100644
index 0000000000..e4ec035e68
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/StoredSkinnableInfo.cs
@@ -0,0 +1,43 @@
+// Copyright (c) ppy 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 osuTK;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    /// <summary>
+    /// Serialised information governing custom changes to an <see cref="ISkinnableComponent"/>.
+    /// </summary>
+    public class StoredSkinnableInfo : ISkinnableInfo
+    {
+        public StoredSkinnableInfo(Drawable component)
+        {
+            Type = component.GetType();
+
+            var target = component.Parent as ISkinnableTarget
+                         // todo: this is temporary until we serialise the default layouts out of SkinnableDrawables.
+                         ?? component.Parent?.Parent as ISkinnableTarget;
+
+            Target = target?.GetType();
+
+            Position = component.Position;
+            Rotation = component.Rotation;
+            Scale = component.Scale;
+            Anchor = component.Anchor;
+        }
+
+        public Type Type { get; set; }
+
+        public Type Target { get; set; }
+
+        public Vector2 Position { get; set; }
+
+        public float Rotation { get; set; }
+
+        public Vector2 Scale { get; set; }
+
+        public Anchor Anchor { get; set; }
+    }
+}
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 6ddaa338cc..13449e3a2b 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -91,16 +91,16 @@ namespace osu.Game.Screens.Play
                         {
                             new Drawable[]
                             {
-                                new Container
+                                new MainHUDElements
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                     Children = new Drawable[]
                                     {
-                                        HealthDisplay = CreateHealthDisplay(),
-                                        AccuracyCounter = CreateAccuracyCounter(),
-                                        ScoreCounter = CreateScoreCounter(),
-                                        CreateComboCounter(),
-                                        CreateHitErrorDisplayOverlay(),
+                                        HealthDisplay = new SkinnableHealthDisplay(),
+                                        AccuracyCounter = new SkinnableAccuracyCounter(),
+                                        ScoreCounter = new SkinnableScoreCounter(),
+                                        new SkinnableComboCounter(),
+                                        new HitErrorDisplay(this.drawableRuleset?.FirstAvailableHitWindows),
                                     }
                                 },
                             },
@@ -263,48 +263,38 @@ namespace osu.Game.Screens.Play
             Progress.BindDrawableRuleset(drawableRuleset);
         }
 
-        protected SkinnableAccuracyCounter CreateAccuracyCounter() => new SkinnableAccuracyCounter();
-
-        protected SkinnableScoreCounter CreateScoreCounter() => new SkinnableScoreCounter();
-
-        protected SkinnableComboCounter CreateComboCounter() => new SkinnableComboCounter();
-
-        protected SkinnableHealthDisplay CreateHealthDisplay() => new SkinnableHealthDisplay();
-
-        protected virtual FailingLayer CreateFailingLayer() => new FailingLayer
+        protected FailingLayer CreateFailingLayer() => new FailingLayer
         {
             ShowHealth = { BindTarget = ShowHealthbar }
         };
 
-        protected virtual KeyCounterDisplay CreateKeyCounter() => new KeyCounterDisplay
+        protected KeyCounterDisplay CreateKeyCounter() => new KeyCounterDisplay
         {
             Anchor = Anchor.BottomRight,
             Origin = Anchor.BottomRight,
         };
 
-        protected virtual SongProgress CreateProgress() => new SongProgress
+        protected SongProgress CreateProgress() => new SongProgress
         {
             Anchor = Anchor.BottomLeft,
             Origin = Anchor.BottomLeft,
             RelativeSizeAxes = Axes.X,
         };
 
-        protected virtual HoldForMenuButton CreateHoldForMenuButton() => new HoldForMenuButton
+        protected HoldForMenuButton CreateHoldForMenuButton() => new HoldForMenuButton
         {
             Anchor = Anchor.BottomRight,
             Origin = Anchor.BottomRight,
         };
 
-        protected virtual ModDisplay CreateModsContainer() => new ModDisplay
+        protected ModDisplay CreateModsContainer() => new ModDisplay
         {
             Anchor = Anchor.TopRight,
             Origin = Anchor.TopRight,
             AutoSizeAxes = Axes.Both,
         };
 
-        protected virtual HitErrorDisplay CreateHitErrorDisplayOverlay() => new HitErrorDisplay(drawableRuleset?.FirstAvailableHitWindows);
-
-        protected virtual PlayerSettingsOverlay CreatePlayerSettingsOverlay() => new PlayerSettingsOverlay();
+        protected PlayerSettingsOverlay CreatePlayerSettingsOverlay() => new PlayerSettingsOverlay();
 
         public bool OnPressed(GlobalAction action)
         {
@@ -347,5 +337,9 @@ namespace osu.Game.Screens.Play
                     break;
             }
         }
+
+        public class MainHUDElements : SkinnableElementTargetContainer
+        {
+        }
     }
 }
diff --git a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
index 35e93d9aff..a6f60afd90 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprintContainer.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.IO;
 using System.Linq;
+using Newtonsoft.Json;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
+using osu.Game.Extensions;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Edit.Compose.Components;
 
@@ -27,7 +30,15 @@ namespace osu.Game.Skinning.Editor
 
         private void checkForComponents()
         {
-            foreach (var c in target.ChildrenOfType<ISkinnableComponent>().ToArray()) AddBlueprintFor(c);
+            ISkinnableComponent[] skinnableComponents = target.ChildrenOfType<ISkinnableComponent>().ToArray();
+
+            // todo: the OfType() call can be removed with better IDrawable support.
+            string json = JsonConvert.SerializeObject(skinnableComponents.OfType<Drawable>().Select(d => d.CreateSerialisedInformation()), new JsonSerializerSettings { Formatting = Formatting.Indented });
+
+            File.WriteAllText("/Users/Dean/json-out.json", json);
+
+            foreach (var c in skinnableComponents)
+                AddBlueprintFor(c);
 
             // We'd hope to eventually be running this in a more sensible way, but this handles situations where new drawables become present (ie. during ongoing gameplay)
             // or when drawables in the target are loaded asynchronously and may not be immediately available when this BlueprintContainer is loaded.
diff --git a/osu.Game/Skinning/ISkin.cs b/osu.Game/Skinning/ISkin.cs
index 73f7cf6d39..9fa781fa5d 100644
--- a/osu.Game/Skinning/ISkin.cs
+++ b/osu.Game/Skinning/ISkin.cs
@@ -57,5 +57,7 @@ namespace osu.Game.Skinning
         /// <returns>A matching value boxed in an <see cref="IBindable{TValue}"/>, or null if unavailable.</returns>
         [CanBeNull]
         IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup);
+
+        // IEnumerable<ISkinnableInfo> ComponentInfo { get; }
     }
 }

From 67ea4a7e97bce85d0f5f861d021b7113809bc16b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 May 2021 18:18:29 +0900
Subject: [PATCH 3259/3722] Read from skin config

---
 .../Play/HUD/SkinnableElementTargetContainer.cs | 17 +++++++++++++++--
 osu.Game/Skinning/ISkin.cs                      |  4 ++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs b/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
index 7ba32e2d46..8da7950c57 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
@@ -1,11 +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.Graphics.Containers;
+using System;
+using System.Collections.Generic;
+using osu.Framework.Graphics;
+using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class SkinnableElementTargetContainer : Container, ISkinnableTarget
+    public class SkinnableElementTargetContainer : SkinReloadableDrawable, ISkinnableTarget
     {
+        protected override void SkinChanged(ISkinSource skin, bool allowFallback)
+        {
+            base.SkinChanged(skin, allowFallback);
+
+            var loadable = skin.GetConfig<Type, IEnumerable<Drawable>>(this.GetType());
+
+            ClearInternal();
+            if (loadable != null)
+                LoadComponentsAsync(loadable.Value, AddRangeInternal);
+        }
     }
 }
diff --git a/osu.Game/Skinning/ISkin.cs b/osu.Game/Skinning/ISkin.cs
index 9fa781fa5d..5371893882 100644
--- a/osu.Game/Skinning/ISkin.cs
+++ b/osu.Game/Skinning/ISkin.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 System;
+using System.Collections.Generic;
 using JetBrains.Annotations;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
@@ -57,7 +59,5 @@ namespace osu.Game.Skinning
         /// <returns>A matching value boxed in an <see cref="IBindable{TValue}"/>, or null if unavailable.</returns>
         [CanBeNull]
         IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup);
-
-        // IEnumerable<ISkinnableInfo> ComponentInfo { get; }
     }
 }

From 95a8f21ab26065f1bccc4d8cfa2ad83051da27a6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 May 2021 19:13:38 +0900
Subject: [PATCH 3260/3722] Add the concept of skinnable target containers and
 mark a basic one for HUD elements

---
 osu.Game/Extensions/DrawableExtensions.cs     | 11 +++++-
 .../HUD/HitErrorMeters/BarHitErrorMeter.cs    |  3 +-
 osu.Game/Screens/Play/HUD/ISkinnableInfo.cs   | 10 +----
 osu.Game/Screens/Play/HUD/ISkinnableTarget.cs | 15 +++++++
 .../HUD/SkinnableElementTargetContainer.cs    | 14 ++++---
 ...toredSkinnableInfo.cs => SkinnableInfo.cs} | 32 +++++++++++----
 osu.Game/Screens/Play/HUDOverlay.cs           | 37 +++++++++++++-----
 osu.Game/Skinning/DefaultSkin.cs              | 39 ++++++++++++++++++-
 osu.Game/Skinning/ISkin.cs                    |  2 -
 osu.Game/Skinning/SkinnableTarget.cs          | 10 +++++
 osu.Game/Skinning/SkinnableTargetComponent.cs | 17 ++++++++
 11 files changed, 154 insertions(+), 36 deletions(-)
 create mode 100644 osu.Game/Screens/Play/HUD/ISkinnableTarget.cs
 rename osu.Game/Screens/Play/HUD/{StoredSkinnableInfo.cs => SkinnableInfo.cs} (51%)
 create mode 100644 osu.Game/Skinning/SkinnableTarget.cs
 create mode 100644 osu.Game/Skinning/SkinnableTargetComponent.cs

diff --git a/osu.Game/Extensions/DrawableExtensions.cs b/osu.Game/Extensions/DrawableExtensions.cs
index 3d2ffe0ea1..289b305c27 100644
--- a/osu.Game/Extensions/DrawableExtensions.cs
+++ b/osu.Game/Extensions/DrawableExtensions.cs
@@ -45,6 +45,15 @@ namespace osu.Game.Extensions
         public static Vector2 ScreenSpaceDeltaToParentSpace(this Drawable drawable, Vector2 delta) =>
             drawable.Parent.ToLocalSpace(drawable.Parent.ToScreenSpace(Vector2.Zero) + delta);
 
-        public static StoredSkinnableInfo CreateSerialisedInformation(this Drawable component) => new StoredSkinnableInfo(component);
+        public static SkinnableInfo CreateSerialisedInformation(this Drawable component) => new SkinnableInfo(component);
+
+        public static void ApplySerialisedInformation(this Drawable component, ISkinnableInfo info)
+        {
+            // todo: can probably make this better via deserialisation directly using a common interface.
+            component.Position = info.Position;
+            component.Rotation = info.Rotation;
+            component.Scale = info.Scale;
+            component.Anchor = info.Anchor;
+        }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
index 2e84c9c97d..0e147f9238 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
@@ -13,13 +13,12 @@ using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 {
-    public class BarHitErrorMeter : HitErrorMeter, ISkinnableComponent
+    public class BarHitErrorMeter : HitErrorMeter
     {
         private readonly Anchor alignment;
 
diff --git a/osu.Game/Screens/Play/HUD/ISkinnableInfo.cs b/osu.Game/Screens/Play/HUD/ISkinnableInfo.cs
index 0e571b5cb4..fc4e9680a8 100644
--- a/osu.Game/Screens/Play/HUD/ISkinnableInfo.cs
+++ b/osu.Game/Screens/Play/HUD/ISkinnableInfo.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Framework.Graphics;
 using osu.Game.IO.Serialization;
+using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
@@ -12,7 +13,7 @@ namespace osu.Game.Screens.Play.HUD
     {
         public Type Type { get; set; }
 
-        public Type Target { get; set; }
+        public SkinnableTarget? Target { get; set; }
 
         public Vector2 Position { get; set; }
 
@@ -22,11 +23,4 @@ namespace osu.Game.Screens.Play.HUD
 
         public Anchor Anchor { get; set; }
     }
-
-    /// <summary>
-    /// A container which supports skinnable components being added to it.
-    /// </summary>
-    public interface ISkinnableTarget
-    {
-    }
 }
diff --git a/osu.Game/Screens/Play/HUD/ISkinnableTarget.cs b/osu.Game/Screens/Play/HUD/ISkinnableTarget.cs
new file mode 100644
index 0000000000..6cd269333a
--- /dev/null
+++ b/osu.Game/Screens/Play/HUD/ISkinnableTarget.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.Game.Skinning;
+
+namespace osu.Game.Screens.Play.HUD
+{
+    /// <summary>
+    /// A container which supports skinnable components being added to it.
+    /// </summary>
+    public interface ISkinnableTarget
+    {
+        public SkinnableTarget Target { get; }
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs b/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
index 8da7950c57..bd82533823 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
@@ -1,24 +1,28 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
-using System.Collections.Generic;
-using osu.Framework.Graphics;
 using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
     public class SkinnableElementTargetContainer : SkinReloadableDrawable, ISkinnableTarget
     {
+        public SkinnableTarget Target { get; }
+
+        public SkinnableElementTargetContainer(SkinnableTarget target)
+        {
+            Target = target;
+        }
+
         protected override void SkinChanged(ISkinSource skin, bool allowFallback)
         {
             base.SkinChanged(skin, allowFallback);
 
-            var loadable = skin.GetConfig<Type, IEnumerable<Drawable>>(this.GetType());
+            var loadable = skin.GetDrawableComponent(new SkinnableTargetComponent(Target));
 
             ClearInternal();
             if (loadable != null)
-                LoadComponentsAsync(loadable.Value, AddRangeInternal);
+                LoadComponentAsync(loadable, AddInternal);
         }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/StoredSkinnableInfo.cs b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
similarity index 51%
rename from osu.Game/Screens/Play/HUD/StoredSkinnableInfo.cs
rename to osu.Game/Screens/Play/HUD/SkinnableInfo.cs
index e4ec035e68..5b1f840efd 100644
--- a/osu.Game/Screens/Play/HUD/StoredSkinnableInfo.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
@@ -2,7 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 using osu.Framework.Graphics;
+using osu.Game.Extensions;
+using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
@@ -10,17 +14,20 @@ namespace osu.Game.Screens.Play.HUD
     /// <summary>
     /// Serialised information governing custom changes to an <see cref="ISkinnableComponent"/>.
     /// </summary>
-    public class StoredSkinnableInfo : ISkinnableInfo
+    [Serializable]
+    public class SkinnableInfo : ISkinnableInfo
     {
-        public StoredSkinnableInfo(Drawable component)
+        public SkinnableInfo()
+        {
+        }
+
+        public SkinnableInfo(Drawable component)
         {
             Type = component.GetType();
 
-            var target = component.Parent as ISkinnableTarget
-                         // todo: this is temporary until we serialise the default layouts out of SkinnableDrawables.
-                         ?? component.Parent?.Parent as ISkinnableTarget;
+            ISkinnableTarget target = component.Parent as ISkinnableTarget;
 
-            Target = target?.GetType();
+            Target = target?.Target;
 
             Position = component.Position;
             Rotation = component.Rotation;
@@ -30,7 +37,8 @@ namespace osu.Game.Screens.Play.HUD
 
         public Type Type { get; set; }
 
-        public Type Target { get; set; }
+        [JsonConverter(typeof(StringEnumConverter))]
+        public SkinnableTarget? Target { get; set; }
 
         public Vector2 Position { get; set; }
 
@@ -40,4 +48,14 @@ namespace osu.Game.Screens.Play.HUD
 
         public Anchor Anchor { get; set; }
     }
+
+    public static class SkinnableInfoExtensions
+    {
+        public static Drawable CreateInstance(this ISkinnableInfo info)
+        {
+            Drawable d = (Drawable)Activator.CreateInstance(info.Type);
+            d.ApplySerialisedInformation(info);
+            return d;
+        }
+    }
 }
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 13449e3a2b..1a12ca4cbd 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -91,16 +91,37 @@ namespace osu.Game.Screens.Play
                         {
                             new Drawable[]
                             {
-                                new MainHUDElements
+                                new Container
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                     Children = new Drawable[]
                                     {
-                                        HealthDisplay = new SkinnableHealthDisplay(),
-                                        AccuracyCounter = new SkinnableAccuracyCounter(),
-                                        ScoreCounter = new SkinnableScoreCounter(),
-                                        new SkinnableComboCounter(),
-                                        new HitErrorDisplay(this.drawableRuleset?.FirstAvailableHitWindows),
+                                        new SkinnableElementTargetContainer(SkinnableTarget.MainHUDComponents)
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                        },
+                                        new Container
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                            Alpha = 0,
+                                            Children = new Drawable[]
+                                            {
+                                                // remaining cross-dependencies need tidying.
+                                                // kept to ensure non-null, but hidden for testing.
+                                                HealthDisplay = new SkinnableHealthDisplay(),
+                                                AccuracyCounter = new SkinnableAccuracyCounter(),
+                                                ScoreCounter = new SkinnableScoreCounter(),
+                                            }
+                                        },
+                                        new Container
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                            Children = new Drawable[]
+                                            {
+                                                // still need to be migrated; a bit more involved.
+                                                new HitErrorDisplay(this.drawableRuleset?.FirstAvailableHitWindows),
+                                            }
+                                        },
                                     }
                                 },
                             },
@@ -337,9 +358,5 @@ namespace osu.Game.Screens.Play
                     break;
             }
         }
-
-        public class MainHUDElements : SkinnableElementTargetContainer
-        {
-        }
     }
 }
diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index 0b3f5f3cde..48da841c45 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -2,12 +2,17 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Newtonsoft.Json;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
+using osu.Game.Screens.Play.HUD;
 using osuTK.Graphics;
 
 namespace osu.Game.Skinning
@@ -20,7 +25,29 @@ namespace osu.Game.Skinning
             Configuration = new DefaultSkinConfiguration();
         }
 
-        public override Drawable GetDrawableComponent(ISkinComponent component) => null;
+        public override Drawable GetDrawableComponent(ISkinComponent component)
+        {
+            switch (component)
+            {
+                case SkinnableTargetComponent target:
+                    switch (target.Target)
+                    {
+                        case SkinnableTarget.MainHUDComponents:
+                            var infos = JsonConvert.DeserializeObject<IEnumerable<SkinnableInfo>>(File.ReadAllText("/Users/Dean/json-out.json")).Where(i => i.Target == SkinnableTarget.MainHUDComponents);
+
+                            var container = new SkinnableTargetWrapper(target.Target)
+                            {
+                                ChildrenEnumerable = infos.Select(i => i.CreateInstance())
+                            };
+
+                            return container;
+                    }
+
+                    break;
+            }
+
+            return null;
+        }
 
         public override Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => null;
 
@@ -45,4 +72,14 @@ namespace osu.Game.Skinning
             return null;
         }
     }
+
+    public class SkinnableTargetWrapper : Container, ISkinnableTarget
+    {
+        public SkinnableTarget Target { get; }
+
+        public SkinnableTargetWrapper(SkinnableTarget target)
+        {
+            Target = target;
+        }
+    }
 }
diff --git a/osu.Game/Skinning/ISkin.cs b/osu.Game/Skinning/ISkin.cs
index 5371893882..73f7cf6d39 100644
--- a/osu.Game/Skinning/ISkin.cs
+++ b/osu.Game/Skinning/ISkin.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy 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 JetBrains.Annotations;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
diff --git a/osu.Game/Skinning/SkinnableTarget.cs b/osu.Game/Skinning/SkinnableTarget.cs
new file mode 100644
index 0000000000..7b1eae126c
--- /dev/null
+++ b/osu.Game/Skinning/SkinnableTarget.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.Skinning
+{
+    public enum SkinnableTarget
+    {
+        MainHUDComponents
+    }
+}
diff --git a/osu.Game/Skinning/SkinnableTargetComponent.cs b/osu.Game/Skinning/SkinnableTargetComponent.cs
new file mode 100644
index 0000000000..a17aafe6e7
--- /dev/null
+++ b/osu.Game/Skinning/SkinnableTargetComponent.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace osu.Game.Skinning
+{
+    public class SkinnableTargetComponent : ISkinComponent
+    {
+        public readonly SkinnableTarget Target;
+
+        public string LookupName => Target.ToString();
+
+        public SkinnableTargetComponent(SkinnableTarget target)
+        {
+            Target = target;
+        }
+    }
+}

From 95a497e9df7313ed1e6ae0513c1a623fba63c7cf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 15:31:14 +0900
Subject: [PATCH 3261/3722] Remove unused interface class for simplicity

---
 osu.Game/Extensions/DrawableExtensions.cs   |  2 +-
 osu.Game/Screens/Play/HUD/ISkinnableInfo.cs | 26 ---------------------
 osu.Game/Screens/Play/HUD/SkinnableInfo.cs  | 12 ++++------
 3 files changed, 6 insertions(+), 34 deletions(-)
 delete mode 100644 osu.Game/Screens/Play/HUD/ISkinnableInfo.cs

diff --git a/osu.Game/Extensions/DrawableExtensions.cs b/osu.Game/Extensions/DrawableExtensions.cs
index 289b305c27..e84c9e5a98 100644
--- a/osu.Game/Extensions/DrawableExtensions.cs
+++ b/osu.Game/Extensions/DrawableExtensions.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Extensions
 
         public static SkinnableInfo CreateSerialisedInformation(this Drawable component) => new SkinnableInfo(component);
 
-        public static void ApplySerialisedInformation(this Drawable component, ISkinnableInfo info)
+        public static void ApplySerialisedInformation(this Drawable component, SkinnableInfo info)
         {
             // todo: can probably make this better via deserialisation directly using a common interface.
             component.Position = info.Position;
diff --git a/osu.Game/Screens/Play/HUD/ISkinnableInfo.cs b/osu.Game/Screens/Play/HUD/ISkinnableInfo.cs
deleted file mode 100644
index fc4e9680a8..0000000000
--- a/osu.Game/Screens/Play/HUD/ISkinnableInfo.cs
+++ /dev/null
@@ -1,26 +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.Game.IO.Serialization;
-using osu.Game.Skinning;
-using osuTK;
-
-namespace osu.Game.Screens.Play.HUD
-{
-    public interface ISkinnableInfo : IJsonSerializable
-    {
-        public Type Type { get; set; }
-
-        public SkinnableTarget? Target { get; set; }
-
-        public Vector2 Position { get; set; }
-
-        public float Rotation { get; set; }
-
-        public Vector2 Scale { get; set; }
-
-        public Anchor Anchor { get; set; }
-    }
-}
diff --git a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
index 5b1f840efd..2edc99781f 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
@@ -6,6 +6,7 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using osu.Framework.Graphics;
 using osu.Game.Extensions;
+using osu.Game.IO.Serialization;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -15,7 +16,7 @@ namespace osu.Game.Screens.Play.HUD
     /// Serialised information governing custom changes to an <see cref="ISkinnableComponent"/>.
     /// </summary>
     [Serializable]
-    public class SkinnableInfo : ISkinnableInfo
+    public class SkinnableInfo : IJsonSerializable
     {
         public SkinnableInfo()
         {
@@ -47,14 +48,11 @@ namespace osu.Game.Screens.Play.HUD
         public Vector2 Scale { get; set; }
 
         public Anchor Anchor { get; set; }
-    }
 
-    public static class SkinnableInfoExtensions
-    {
-        public static Drawable CreateInstance(this ISkinnableInfo info)
+        public Drawable CreateInstance()
         {
-            Drawable d = (Drawable)Activator.CreateInstance(info.Type);
-            d.ApplySerialisedInformation(info);
+            Drawable d = (Drawable)Activator.CreateInstance(Type);
+            d.ApplySerialisedInformation(this);
             return d;
         }
     }

From df72656aa1238a337550ed1b114a45300c2455a3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 15:40:33 +0900
Subject: [PATCH 3262/3722] Remove downwards dependency from `HUDOverlay` to
 `HealthDisplay`

---
 osu.Game/Screens/Play/HUD/HealthDisplay.cs | 13 +++++++++++--
 osu.Game/Screens/Play/HUDOverlay.cs        |  3 ---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index 6c2571cc28..e0ddde026b 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.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
@@ -16,6 +17,8 @@ namespace osu.Game.Screens.Play.HUD
     /// </summary>
     public abstract class HealthDisplay : Container
     {
+        private Bindable<bool> showHealthbar;
+
         [Resolved]
         protected HealthProcessor HealthProcessor { get; private set; }
 
@@ -29,12 +32,18 @@ namespace osu.Game.Screens.Play.HUD
         {
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
+        [BackgroundDependencyLoader(true)]
+        private void load(HUDOverlay hud)
         {
             Current.BindTo(HealthProcessor.Health);
 
             HealthProcessor.NewJudgement += onNewJudgement;
+
+            if (hud != null)
+            {
+                showHealthbar = hud.ShowHealthbar.GetBoundCopy();
+                showHealthbar.BindValueChanged(healthBar => this.FadeTo(healthBar.NewValue ? 1 : 0, HUDOverlay.FADE_DURATION, HUDOverlay.FADE_EASING), true);
+            }
         }
 
         private void onNewJudgement(JudgementResult judgement)
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 1a12ca4cbd..7220365673 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -36,7 +36,6 @@ namespace osu.Game.Screens.Play
         public readonly KeyCounterDisplay KeyCounter;
         public readonly SkinnableScoreCounter ScoreCounter;
         public readonly SkinnableAccuracyCounter AccuracyCounter;
-        public readonly SkinnableHealthDisplay HealthDisplay;
         public readonly SongProgress Progress;
         public readonly ModDisplay ModDisplay;
         public readonly HoldForMenuButton HoldToQuit;
@@ -108,7 +107,6 @@ namespace osu.Game.Screens.Play
                                             {
                                                 // remaining cross-dependencies need tidying.
                                                 // kept to ensure non-null, but hidden for testing.
-                                                HealthDisplay = new SkinnableHealthDisplay(),
                                                 AccuracyCounter = new SkinnableAccuracyCounter(),
                                                 ScoreCounter = new SkinnableScoreCounter(),
                                             }
@@ -206,7 +204,6 @@ namespace osu.Game.Screens.Play
         {
             base.LoadComplete();
 
-            ShowHealthbar.BindValueChanged(healthBar => HealthDisplay.FadeTo(healthBar.NewValue ? 1 : 0, FADE_DURATION, FADE_EASING), true);
             ShowHud.BindValueChanged(visible => hideTargets.ForEach(d => d.FadeTo(visible.NewValue ? 1 : 0, FADE_DURATION, FADE_EASING)));
 
             IsBreakTime.BindValueChanged(_ => updateVisibility());

From 1742ee89e0680662cd5d12348ddceef4c5df2be9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 22:32:56 +0900
Subject: [PATCH 3263/3722] Fix incorrect xmldoc for `DeleteFile`

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

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index dbeaebb1cd..e0f80d2743 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -472,7 +472,7 @@ namespace osu.Game.Database
         }
 
         /// <summary>
-        /// Delete new file.
+        /// Delete an existing file.
         /// </summary>
         /// <param name="model">The item to operate on.</param>
         /// <param name="file">The existing file to be deleted.</param>

From 6a88b8888b1be641d203ed598998b7f0e985c410 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 22:33:45 +0900
Subject: [PATCH 3264/3722] Add basic support for child serialisation

---
 osu.Game/Extensions/DrawableExtensions.cs  |  7 ++++
 osu.Game/Screens/Play/HUD/SkinnableInfo.cs | 37 ++++++++++++++--------
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Extensions/DrawableExtensions.cs b/osu.Game/Extensions/DrawableExtensions.cs
index e84c9e5a98..6837a802f2 100644
--- a/osu.Game/Extensions/DrawableExtensions.cs
+++ b/osu.Game/Extensions/DrawableExtensions.cs
@@ -3,6 +3,7 @@
 
 using System;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Threading;
 using osu.Game.Screens.Play.HUD;
@@ -54,6 +55,12 @@ namespace osu.Game.Extensions
             component.Rotation = info.Rotation;
             component.Scale = info.Scale;
             component.Anchor = info.Anchor;
+
+            if (component is Container container)
+            {
+                foreach (var child in info.Children)
+                    container.Add(child.CreateInstance());
+            }
         }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
index 2edc99781f..ec4eaa0e59 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
@@ -2,9 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Extensions;
 using osu.Game.IO.Serialization;
 using osu.Game.Skinning;
@@ -18,6 +21,21 @@ namespace osu.Game.Screens.Play.HUD
     [Serializable]
     public class SkinnableInfo : IJsonSerializable
     {
+        public Type Type { get; set; }
+
+        [JsonConverter(typeof(StringEnumConverter))]
+        public SkinnableTarget? Target { get; set; }
+
+        public Vector2 Position { get; set; }
+
+        public float Rotation { get; set; }
+
+        public Vector2 Scale { get; set; }
+
+        public Anchor Anchor { get; set; }
+
+        public List<SkinnableInfo> Children { get; } = new List<SkinnableInfo>();
+
         public SkinnableInfo()
         {
         }
@@ -34,21 +52,14 @@ namespace osu.Game.Screens.Play.HUD
             Rotation = component.Rotation;
             Scale = component.Scale;
             Anchor = component.Anchor;
+
+            if (component is Container container)
+            {
+                foreach (var child in container.Children.OfType<ISkinnableComponent>().OfType<Drawable>())
+                    Children.Add(child.CreateSerialisedInformation());
+            }
         }
 
-        public Type Type { get; set; }
-
-        [JsonConverter(typeof(StringEnumConverter))]
-        public SkinnableTarget? Target { get; set; }
-
-        public Vector2 Position { get; set; }
-
-        public float Rotation { get; set; }
-
-        public Vector2 Scale { get; set; }
-
-        public Anchor Anchor { get; set; }
-
         public Drawable CreateInstance()
         {
             Drawable d = (Drawable)Activator.CreateInstance(Type);

From b54eb56169e08757e85abe78b1113e7425108717 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 22:34:24 +0900
Subject: [PATCH 3265/3722] Move new judgement binding to `LoadComplete` to
 ensure containers are loaded

---
 osu.Game/Screens/Play/HUD/HealthDisplay.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index e0ddde026b..e18a28eded 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -37,8 +37,6 @@ namespace osu.Game.Screens.Play.HUD
         {
             Current.BindTo(HealthProcessor.Health);
 
-            HealthProcessor.NewJudgement += onNewJudgement;
-
             if (hud != null)
             {
                 showHealthbar = hud.ShowHealthbar.GetBoundCopy();
@@ -46,6 +44,13 @@ namespace osu.Game.Screens.Play.HUD
             }
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            HealthProcessor.NewJudgement += onNewJudgement;
+        }
+
         private void onNewJudgement(JudgementResult judgement)
         {
             if (judgement.IsHit && judgement.Type != HitResult.IgnoreHit)

From 004798d61d44d88114acfd7c2861378261eab107 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 22:36:20 +0900
Subject: [PATCH 3266/3722] Update Legacy components to not require skin in
 ctor

---
 .../Legacy/LegacyCatchComboCounter.cs         |  4 ++--
 .../Skinning/Legacy/LegacySpinner.cs          |  4 ++--
 .../Legacy/OsuLegacySkinTransformer.cs        |  2 +-
 .../Visual/Gameplay/TestSceneSkinEditor.cs    | 14 ++++++++++++-
 .../Screens/Play/HUD/LegacyComboCounter.cs    |  4 ++--
 .../HUD/SkinnableElementTargetContainer.cs    | 15 ++++++++++---
 osu.Game/Skinning/LegacyAccuracyCounter.cs    | 11 +++++-----
 osu.Game/Skinning/LegacyHealthDisplay.cs      | 21 ++++++++-----------
 osu.Game/Skinning/LegacyRollingCounter.cs     |  7 ++-----
 osu.Game/Skinning/LegacyScoreCounter.cs       | 12 +++++------
 osu.Game/Skinning/LegacySkin.cs               |  6 +++---
 osu.Game/Skinning/LegacySpriteText.cs         | 14 ++++++++++---
 12 files changed, 68 insertions(+), 46 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatchComboCounter.cs b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatchComboCounter.cs
index 28ee7bd813..33c3867f5a 100644
--- a/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatchComboCounter.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/Legacy/LegacyCatchComboCounter.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
 
             InternalChildren = new Drawable[]
             {
-                explosion = new LegacyRollingCounter(skin, LegacyFont.Combo)
+                explosion = new LegacyRollingCounter(LegacyFont.Combo)
                 {
                     Alpha = 0.65f,
                     Blending = BlendingParameters.Additive,
@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Catch.Skinning.Legacy
                     Origin = Anchor.Centre,
                     Scale = new Vector2(1.5f),
                 },
-                counter = new LegacyRollingCounter(skin, LegacyFont.Combo)
+                counter = new LegacyRollingCounter(LegacyFont.Combo)
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index 7eb6898abc..959589620b 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -76,7 +76,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         Scale = new Vector2(SPRITE_SCALE),
                         Y = SPINNER_TOP_OFFSET + 115,
                     },
-                    bonusCounter = new LegacySpriteText(source, LegacyFont.Score)
+                    bonusCounter = new LegacySpriteText(LegacyFont.Score)
                     {
                         Alpha = 0f,
                         Anchor = Anchor.TopCentre,
@@ -92,7 +92,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                         Scale = new Vector2(SPRITE_SCALE),
                         Position = new Vector2(-87, 445 + spm_hide_offset),
                     },
-                    spmCounter = new LegacySpriteText(source, LegacyFont.Score)
+                    spmCounter = new LegacySpriteText(LegacyFont.Score)
                     {
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.TopRight,
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
index ffe238c507..88302ebc57 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/OsuLegacySkinTransformer.cs
@@ -100,7 +100,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
                     if (!this.HasFont(LegacyFont.HitCircle))
                         return null;
 
-                    return new LegacySpriteText(Source, LegacyFont.HitCircle)
+                    return new LegacySpriteText(LegacyFont.HitCircle)
                     {
                         // stable applies a blanket 0.8x scale to hitcircle fonts
                         Scale = new Vector2(0.8f),
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
index c53ac42d12..b0edc0dd68 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
@@ -2,10 +2,12 @@
 // 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.Rulesets;
 using osu.Game.Rulesets.Osu;
+using osu.Game.Skinning;
 using osu.Game.Skinning.Editor;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -14,12 +16,22 @@ namespace osu.Game.Tests.Visual.Gameplay
     {
         private SkinEditor skinEditor;
 
+        [Resolved]
+        private SkinManager skinManager { get; set; }
+
         [SetUpSteps]
         public override void SetUpSteps()
         {
+            AddStep("set empty legacy skin", () =>
+            {
+                var imported = skinManager.Import(new SkinInfo { Name = "test skin" }).Result;
+
+                skinManager.CurrentSkinInfo.Value = imported;
+            });
+
             base.SetUpSteps();
 
-            AddStep("add editor overlay", () =>
+            AddStep("reload skin editor", () =>
             {
                 skinEditor?.Expire();
                 Player.ScaleTo(SkinEditorOverlay.VISIBLE_TARGET_SCALE);
diff --git a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
index 73305ac93e..2565faf423 100644
--- a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
@@ -84,13 +84,13 @@ namespace osu.Game.Screens.Play.HUD
         {
             InternalChildren = new[]
             {
-                popOutCount = new LegacySpriteText(skin, LegacyFont.Combo)
+                popOutCount = new LegacySpriteText(LegacyFont.Combo)
                 {
                     Alpha = 0,
                     Margin = new MarginPadding(0.05f),
                     Blending = BlendingParameters.Additive,
                 },
-                displayedCountSpriteText = new LegacySpriteText(skin, LegacyFont.Combo)
+                displayedCountSpriteText = new LegacySpriteText(LegacyFont.Combo)
                 {
                     Alpha = 0,
                 },
diff --git a/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs b/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
index bd82533823..f1b282119b 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
@@ -1,12 +1,17 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
+using System.Linq;
+using osu.Game.Extensions;
 using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
     public class SkinnableElementTargetContainer : SkinReloadableDrawable, ISkinnableTarget
     {
+        private SkinnableTargetWrapper content;
+
         public SkinnableTarget Target { get; }
 
         public SkinnableElementTargetContainer(SkinnableTarget target)
@@ -14,15 +19,19 @@ namespace osu.Game.Screens.Play.HUD
             Target = target;
         }
 
+        public IEnumerable<SkinnableInfo> CreateSerialisedChildren() =>
+            content.Select(d => d.CreateSerialisedInformation());
+
         protected override void SkinChanged(ISkinSource skin, bool allowFallback)
         {
             base.SkinChanged(skin, allowFallback);
 
-            var loadable = skin.GetDrawableComponent(new SkinnableTargetComponent(Target));
+            content = skin.GetDrawableComponent(new SkinnableTargetComponent(Target)) as SkinnableTargetWrapper;
 
             ClearInternal();
-            if (loadable != null)
-                LoadComponentAsync(loadable, AddInternal);
+
+            if (content != null)
+                LoadComponentAsync(content, AddInternal);
         }
     }
 }
diff --git a/osu.Game/Skinning/LegacyAccuracyCounter.cs b/osu.Game/Skinning/LegacyAccuracyCounter.cs
index 3efcd5555e..e2fe01efe4 100644
--- a/osu.Game/Skinning/LegacyAccuracyCounter.cs
+++ b/osu.Game/Skinning/LegacyAccuracyCounter.cs
@@ -12,23 +12,22 @@ namespace osu.Game.Skinning
 {
     public class LegacyAccuracyCounter : GameplayAccuracyCounter, ISkinnableComponent
     {
-        private readonly ISkin skin;
+        [Resolved]
+        private ISkinSource skin { get; set; }
 
-        public LegacyAccuracyCounter(ISkin skin)
+        public LegacyAccuracyCounter()
         {
             Anchor = Anchor.TopRight;
             Origin = Anchor.TopRight;
 
             Scale = new Vector2(0.6f);
             Margin = new MarginPadding(10);
-
-            this.skin = skin;
         }
 
         [Resolved(canBeNull: true)]
         private HUDOverlay hud { get; set; }
 
-        protected sealed override OsuSpriteText CreateSpriteText() => new LegacySpriteText(skin, LegacyFont.Score)
+        protected sealed override OsuSpriteText CreateSpriteText() => new LegacySpriteText(LegacyFont.Score)
         {
             Anchor = Anchor.TopRight,
             Origin = Anchor.TopRight,
@@ -38,7 +37,7 @@ namespace osu.Game.Skinning
         {
             base.Update();
 
-            if (hud?.ScoreCounter.Drawable is LegacyScoreCounter score)
+            if (hud?.ScoreCounter?.Drawable is LegacyScoreCounter score)
             {
                 // for now align with the score counter. eventually this will be user customisable.
                 Y = Parent.ToLocalSpace(score.ScreenSpaceDrawQuad.BottomRight).Y;
diff --git a/osu.Game/Skinning/LegacyHealthDisplay.cs b/osu.Game/Skinning/LegacyHealthDisplay.cs
index c1979efbc2..717ca62da7 100644
--- a/osu.Game/Skinning/LegacyHealthDisplay.cs
+++ b/osu.Game/Skinning/LegacyHealthDisplay.cs
@@ -20,7 +20,9 @@ namespace osu.Game.Skinning
     {
         private const double epic_cutoff = 0.5;
 
-        private readonly Skin skin;
+        [Resolved]
+        private ISkinSource skin { get; set; }
+
         private LegacyHealthPiece fill;
         private LegacyHealthPiece marker;
 
@@ -28,11 +30,6 @@ namespace osu.Game.Skinning
 
         private bool isNewStyle;
 
-        public LegacyHealthDisplay(Skin skin)
-        {
-            this.skin = skin;
-        }
-
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -79,7 +76,7 @@ namespace osu.Game.Skinning
 
         protected override void Flash(JudgementResult result) => marker.Flash(result);
 
-        private static Texture getTexture(Skin skin, string name) => skin.GetTexture($"scorebar-{name}");
+        private static Texture getTexture(ISkinSource skin, string name) => skin.GetTexture($"scorebar-{name}");
 
         private static Color4 getFillColour(double hp)
         {
@@ -98,7 +95,7 @@ namespace osu.Game.Skinning
             private readonly Texture dangerTexture;
             private readonly Texture superDangerTexture;
 
-            public LegacyOldStyleMarker(Skin skin)
+            public LegacyOldStyleMarker(ISkinSource skin)
             {
                 normalTexture = getTexture(skin, "ki");
                 dangerTexture = getTexture(skin, "kidanger");
@@ -129,9 +126,9 @@ namespace osu.Game.Skinning
 
         public class LegacyNewStyleMarker : LegacyMarker
         {
-            private readonly Skin skin;
+            private readonly ISkinSource skin;
 
-            public LegacyNewStyleMarker(Skin skin)
+            public LegacyNewStyleMarker(ISkinSource skin)
             {
                 this.skin = skin;
             }
@@ -153,7 +150,7 @@ namespace osu.Game.Skinning
 
         internal class LegacyOldStyleFill : LegacyHealthPiece
         {
-            public LegacyOldStyleFill(Skin skin)
+            public LegacyOldStyleFill(ISkinSource skin)
             {
                 // required for sizing correctly..
                 var firstFrame = getTexture(skin, "colour-0");
@@ -176,7 +173,7 @@ namespace osu.Game.Skinning
 
         internal class LegacyNewStyleFill : LegacyHealthPiece
         {
-            public LegacyNewStyleFill(Skin skin)
+            public LegacyNewStyleFill(ISkinSource skin)
             {
                 InternalChild = new Sprite
                 {
diff --git a/osu.Game/Skinning/LegacyRollingCounter.cs b/osu.Game/Skinning/LegacyRollingCounter.cs
index 0261db0e64..b531ae1e6f 100644
--- a/osu.Game/Skinning/LegacyRollingCounter.cs
+++ b/osu.Game/Skinning/LegacyRollingCounter.cs
@@ -12,7 +12,6 @@ namespace osu.Game.Skinning
     /// </summary>
     public class LegacyRollingCounter : RollingCounter<int>
     {
-        private readonly ISkin skin;
         private readonly LegacyFont font;
 
         protected override bool IsRollingProportional => true;
@@ -20,11 +19,9 @@ namespace osu.Game.Skinning
         /// <summary>
         /// Creates a new <see cref="LegacyRollingCounter"/>.
         /// </summary>
-        /// <param name="skin">The <see cref="ISkin"/> from which to get counter number sprites.</param>
         /// <param name="font">The legacy font to use for the counter.</param>
-        public LegacyRollingCounter(ISkin skin, LegacyFont font)
+        public LegacyRollingCounter(LegacyFont font)
         {
-            this.skin = skin;
             this.font = font;
         }
 
@@ -33,6 +30,6 @@ namespace osu.Game.Skinning
             return Math.Abs(newValue - currentValue) * 75.0;
         }
 
-        protected sealed override OsuSpriteText CreateSpriteText() => new LegacySpriteText(skin, font);
+        protected sealed override OsuSpriteText CreateSpriteText() => new LegacySpriteText(font);
     }
 }
diff --git a/osu.Game/Skinning/LegacyScoreCounter.cs b/osu.Game/Skinning/LegacyScoreCounter.cs
index ecb907e601..0696d2bedd 100644
--- a/osu.Game/Skinning/LegacyScoreCounter.cs
+++ b/osu.Game/Skinning/LegacyScoreCounter.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.Game.Graphics.Sprites;
 using osu.Game.Screens.Play.HUD;
@@ -10,24 +11,23 @@ namespace osu.Game.Skinning
 {
     public class LegacyScoreCounter : GameplayScoreCounter, ISkinnableComponent
     {
-        private readonly ISkin skin;
-
         protected override double RollingDuration => 1000;
         protected override Easing RollingEasing => Easing.Out;
 
-        public LegacyScoreCounter(ISkin skin)
+        [Resolved]
+        private ISkinSource skin { get; set; }
+
+        public LegacyScoreCounter()
             : base(6)
         {
             Anchor = Anchor.TopRight;
             Origin = Anchor.TopRight;
 
-            this.skin = skin;
-
             Scale = new Vector2(0.96f);
             Margin = new MarginPadding(10);
         }
 
-        protected sealed override OsuSpriteText CreateSpriteText() => new LegacySpriteText(skin, LegacyFont.Score)
+        protected sealed override OsuSpriteText CreateSpriteText() => new LegacySpriteText(LegacyFont.Score)
         {
             Anchor = Anchor.TopRight,
             Origin = Anchor.TopRight,
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index eae3b69233..70f8d1d882 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -334,13 +334,13 @@ namespace osu.Game.Skinning
                             return new LegacyComboCounter();
 
                         case HUDSkinComponents.ScoreCounter:
-                            return new LegacyScoreCounter(this);
+                            return new LegacyScoreCounter();
 
                         case HUDSkinComponents.AccuracyCounter:
-                            return new LegacyAccuracyCounter(this);
+                            return new LegacyAccuracyCounter();
 
                         case HUDSkinComponents.HealthDisplay:
-                            return new LegacyHealthDisplay(this);
+                            return new LegacyHealthDisplay();
                     }
 
                     return null;
diff --git a/osu.Game/Skinning/LegacySpriteText.cs b/osu.Game/Skinning/LegacySpriteText.cs
index c55400e219..7895fcccca 100644
--- a/osu.Game/Skinning/LegacySpriteText.cs
+++ b/osu.Game/Skinning/LegacySpriteText.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Threading.Tasks;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Text;
 using osu.Game.Graphics.Sprites;
@@ -9,19 +10,26 @@ using osuTK;
 
 namespace osu.Game.Skinning
 {
-    public class LegacySpriteText : OsuSpriteText
+    public sealed class LegacySpriteText : OsuSpriteText
     {
-        private readonly LegacyGlyphStore glyphStore;
+        private readonly LegacyFont font;
+
+        private LegacyGlyphStore glyphStore;
 
         protected override char FixedWidthReferenceCharacter => '5';
 
         protected override char[] FixedWidthExcludeCharacters => new[] { ',', '.', '%', 'x' };
 
-        public LegacySpriteText(ISkin skin, LegacyFont font)
+        public LegacySpriteText(LegacyFont font)
         {
+            this.font = font;
             Shadow = false;
             UseFullGlyphHeight = false;
+        }
 
+        [BackgroundDependencyLoader]
+        private void load(ISkinSource skin)
+        {
             Font = new FontUsage(skin.GetFontPrefix(font), 1, fixedWidth: true);
             Spacing = new Vector2(-skin.GetFontOverlap(font), 0);
 

From b248b2e5e3bf8b62ea94b9e1d5eb85e3809d448e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 22:43:48 +0900
Subject: [PATCH 3267/3722] Hook up full save/load flow

---
 osu.Game/Screens/Play/HUD/ISkinnableTarget.cs | 15 ----
 osu.Game/Screens/Play/HUDOverlay.cs           |  2 +-
 osu.Game/Skinning/DefaultSkin.cs              | 42 +---------
 .../Skinning/Editor/SkinBlueprintContainer.cs |  8 --
 osu.Game/Skinning/Editor/SkinEditor.cs        | 43 +++++++++-
 osu.Game/Skinning/ISkinnableTarget.cs         |  4 +-
 osu.Game/Skinning/LegacySkin.cs               | 26 +++++-
 osu.Game/Skinning/Skin.cs                     | 81 ++++++++++++++++++-
 osu.Game/Skinning/SkinManager.cs              | 32 ++++++++
 9 files changed, 181 insertions(+), 72 deletions(-)
 delete mode 100644 osu.Game/Screens/Play/HUD/ISkinnableTarget.cs

diff --git a/osu.Game/Screens/Play/HUD/ISkinnableTarget.cs b/osu.Game/Screens/Play/HUD/ISkinnableTarget.cs
deleted file mode 100644
index 6cd269333a..0000000000
--- a/osu.Game/Screens/Play/HUD/ISkinnableTarget.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 osu.Game.Skinning;
-
-namespace osu.Game.Screens.Play.HUD
-{
-    /// <summary>
-    /// A container which supports skinnable components being added to it.
-    /// </summary>
-    public interface ISkinnableTarget
-    {
-        public SkinnableTarget Target { get; }
-    }
-}
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 7220365673..30b735d28a 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -22,7 +22,7 @@ using osuTK;
 namespace osu.Game.Screens.Play
 {
     [Cached]
-    public class HUDOverlay : Container, IKeyBindingHandler<GlobalAction>, IDefaultSkinnableTarget
+    public class HUDOverlay : Container, IKeyBindingHandler<GlobalAction>
     {
         public const float FADE_DURATION = 300;
 
diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index 48da841c45..bfb5b8ef56 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -2,17 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Newtonsoft.Json;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
-using osu.Game.Screens.Play.HUD;
 using osuTK.Graphics;
 
 namespace osu.Game.Skinning
@@ -20,35 +14,11 @@ namespace osu.Game.Skinning
     public class DefaultSkin : Skin
     {
         public DefaultSkin()
-            : base(SkinInfo.Default)
+            : base(SkinInfo.Default, null)
         {
             Configuration = new DefaultSkinConfiguration();
         }
 
-        public override Drawable GetDrawableComponent(ISkinComponent component)
-        {
-            switch (component)
-            {
-                case SkinnableTargetComponent target:
-                    switch (target.Target)
-                    {
-                        case SkinnableTarget.MainHUDComponents:
-                            var infos = JsonConvert.DeserializeObject<IEnumerable<SkinnableInfo>>(File.ReadAllText("/Users/Dean/json-out.json")).Where(i => i.Target == SkinnableTarget.MainHUDComponents);
-
-                            var container = new SkinnableTargetWrapper(target.Target)
-                            {
-                                ChildrenEnumerable = infos.Select(i => i.CreateInstance())
-                            };
-
-                            return container;
-                    }
-
-                    break;
-            }
-
-            return null;
-        }
-
         public override Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => null;
 
         public override ISample GetSample(ISampleInfo sampleInfo) => null;
@@ -72,14 +42,4 @@ namespace osu.Game.Skinning
             return null;
         }
     }
-
-    public class SkinnableTargetWrapper : Container, ISkinnableTarget
-    {
-        public SkinnableTarget Target { get; }
-
-        public SkinnableTargetWrapper(SkinnableTarget target)
-        {
-            Target = target;
-        }
-    }
 }
diff --git a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
index a6f60afd90..45e541abf0 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprintContainer.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.
 
-using System.IO;
 using System.Linq;
-using Newtonsoft.Json;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
-using osu.Game.Extensions;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Edit.Compose.Components;
 
@@ -32,11 +29,6 @@ namespace osu.Game.Skinning.Editor
         {
             ISkinnableComponent[] skinnableComponents = target.ChildrenOfType<ISkinnableComponent>().ToArray();
 
-            // todo: the OfType() call can be removed with better IDrawable support.
-            string json = JsonConvert.SerializeObject(skinnableComponents.OfType<Drawable>().Select(d => d.CreateSerialisedInformation()), new JsonSerializerSettings { Formatting = Formatting.Indented });
-
-            File.WriteAllText("/Users/Dean/json-out.json", json);
-
             foreach (var c in skinnableComponents)
                 AddBlueprintFor(c);
 
diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 18a8b220df..30ee3097d2 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -11,6 +11,8 @@ using osu.Framework.Testing;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Skinning.Editor
 {
@@ -24,6 +26,9 @@ namespace osu.Game.Skinning.Editor
 
         protected override bool StartHidden => true;
 
+        [Resolved]
+        private SkinManager skins { get; set; }
+
         public SkinEditor(Drawable target)
         {
             this.target = target;
@@ -53,7 +58,24 @@ namespace osu.Game.Skinning.Editor
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
                         RequestPlacement = placeComponent
-                    }
+                    },
+                    new TriangleButton
+                    {
+                        Text = "Save Changes",
+                        Width = 140,
+                        Height = 50,
+                        Padding = new MarginPadding
+                        {
+                            Top = 10,
+                            Left = 10,
+                        },
+                        Margin = new MarginPadding
+                        {
+                            Right = 10,
+                            Bottom = 10,
+                        },
+                        Action = save,
+                    },
                 }
             };
 
@@ -71,7 +93,7 @@ namespace osu.Game.Skinning.Editor
 
             var targetContainer = target.ChildrenOfType<IDefaultSkinnableTarget>().FirstOrDefault();
 
-            targetContainer?.Add(instance);
+            (targetContainer as Container)?.Add(instance);
         }
 
         protected override void LoadComplete()
@@ -80,6 +102,23 @@ namespace osu.Game.Skinning.Editor
             Show();
         }
 
+        private void save()
+        {
+            var currentSkin = skins.CurrentSkin.Value;
+
+            var legacySkin = currentSkin as LegacySkin;
+
+            if (legacySkin == null)
+                return;
+
+            SkinnableElementTargetContainer[] targetContainers = target.ChildrenOfType<SkinnableElementTargetContainer>().ToArray();
+
+            foreach (var t in targetContainers)
+                legacySkin.UpdateDrawableTarget(t);
+
+            skins.Save(skins.CurrentSkin.Value);
+        }
+
         protected override bool OnHover(HoverEvent e) => true;
 
         protected override bool OnMouseDown(MouseDownEvent e) => true;
diff --git a/osu.Game/Skinning/ISkinnableTarget.cs b/osu.Game/Skinning/ISkinnableTarget.cs
index 607e89fdec..90e48c8bba 100644
--- a/osu.Game/Skinning/ISkinnableTarget.cs
+++ b/osu.Game/Skinning/ISkinnableTarget.cs
@@ -2,14 +2,14 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 
 namespace osu.Game.Skinning
 {
     /// <summary>
     /// Denotes a container which can house <see cref="ISkinnableComponent"/>s.
     /// </summary>
-    public interface ISkinnableTarget : IContainerCollection<Drawable>
+    public interface ISkinnableTarget : IDrawable
     {
+        public SkinnableTarget Target { get; }
     }
 }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 70f8d1d882..fc03ce909c 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Skinning
         }
 
         protected LegacySkin(SkinInfo skin, [CanBeNull] IResourceStore<byte[]> storage, [CanBeNull] IStorageResourceProvider resources, string filename)
-            : base(skin)
+            : base(skin, resources)
         {
             using (var stream = storage?.GetStream(filename))
             {
@@ -321,8 +321,32 @@ namespace osu.Game.Skinning
 
         public override Drawable GetDrawableComponent(ISkinComponent component)
         {
+            if (base.GetDrawableComponent(component) is Drawable c)
+                return c;
+
             switch (component)
             {
+                case SkinnableTargetComponent target:
+
+                    switch (target.Target)
+                    {
+                        case SkinnableTarget.MainHUDComponents:
+                            return new SkinnableTargetWrapper(target.Target)
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Children = new[]
+                                {
+                                    // TODO: these should fallback to the osu!classic skin.
+                                    GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ComboCounter)) ?? new DefaultComboCounter(),
+                                    GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreCounter)) ?? new DefaultScoreCounter(),
+                                    GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.AccuracyCounter)) ?? new DefaultAccuracyCounter(),
+                                    GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.HealthDisplay)) ?? new DefaultHealthDisplay(),
+                                }
+                            };
+                    }
+
+                    return null;
+
                 case HUDSkinComponent hudComponent:
                 {
                     if (!this.HasFont(LegacyFont.Score))
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index 6d1bce2cb1..03ecabc886 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -2,12 +2,19 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Newtonsoft.Json;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
+using osu.Game.IO;
+using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Skinning
 {
@@ -15,9 +22,13 @@ namespace osu.Game.Skinning
     {
         public readonly SkinInfo SkinInfo;
 
+        private readonly IStorageResourceProvider resources;
+
         public SkinConfiguration Configuration { get; protected set; }
 
-        public abstract Drawable GetDrawableComponent(ISkinComponent componentName);
+        public IDictionary<SkinnableTarget, SkinnableInfo[]> DrawableComponentInfo => drawableComponentInfo;
+
+        private readonly Dictionary<SkinnableTarget, SkinnableInfo[]> drawableComponentInfo = new Dictionary<SkinnableTarget, SkinnableInfo[]>();
 
         public abstract ISample GetSample(ISampleInfo sampleInfo);
 
@@ -27,9 +38,62 @@ namespace osu.Game.Skinning
 
         public abstract IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup);
 
-        protected Skin(SkinInfo skin)
+        protected Skin(SkinInfo skin, IStorageResourceProvider resources)
         {
             SkinInfo = skin;
+
+            // may be null for default skin.
+            this.resources = resources;
+        }
+
+        public void UpdateDrawableTarget(SkinnableElementTargetContainer targetContainer)
+        {
+            DrawableComponentInfo[targetContainer.Target] = targetContainer.CreateSerialisedChildren().ToArray();
+        }
+
+        public virtual Drawable GetDrawableComponent(ISkinComponent component)
+        {
+            switch (component)
+            {
+                case SkinnableTargetComponent target:
+
+                    var skinnableTarget = target.Target;
+
+                    if (!DrawableComponentInfo.TryGetValue(skinnableTarget, out var skinnableInfo))
+                    {
+                        switch (skinnableTarget)
+                        {
+                            case SkinnableTarget.MainHUDComponents:
+
+                                // skininfo files may be null for default skin.
+                                var fileInfo = SkinInfo.Files?.FirstOrDefault(f => f.Filename == $"{skinnableTarget}.json");
+
+                                if (fileInfo == null)
+                                    return null;
+
+                                var bytes = resources?.Files.Get(fileInfo.FileInfo.StoragePath);
+
+                                if (bytes == null)
+                                    return null;
+
+                                string jsonContent = Encoding.UTF8.GetString(bytes);
+
+                                DrawableComponentInfo[skinnableTarget] = skinnableInfo =
+                                    JsonConvert.DeserializeObject<IEnumerable<SkinnableInfo>>(jsonContent).Where(i => i.Target == SkinnableTarget.MainHUDComponents).ToArray();
+                                break;
+                        }
+                    }
+
+                    if (skinnableInfo == null)
+                        return null;
+
+                    return new SkinnableTargetWrapper(skinnableTarget)
+                    {
+                        ChildrenEnumerable = skinnableInfo.Select(i => i.CreateInstance())
+                    };
+            }
+
+            return null;
         }
 
         #region Disposal
@@ -58,4 +122,17 @@ namespace osu.Game.Skinning
 
         #endregion
     }
+
+    public class SkinnableTargetWrapper : Container, IDefaultSkinnableTarget
+    {
+        // this is just here to implement the interface and allow a silly parent lookup to work (where the target is not the direct parent for reasons).
+        // TODO: need to fix this.
+        public SkinnableTarget Target { get; }
+
+        public SkinnableTargetWrapper(SkinnableTarget target)
+        {
+            Target = target;
+            RelativeSizeAxes = Axes.Both;
+        }
+    }
 }
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index ac4d63159a..f9e22c9c89 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -6,9 +6,11 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Linq.Expressions;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
+using Newtonsoft.Json;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
@@ -17,6 +19,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
+using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
@@ -158,6 +161,35 @@ namespace osu.Game.Skinning
             return new LegacySkin(skinInfo, this);
         }
 
+        public void Save(Skin skin)
+        {
+            // some skins don't support saving just yet.
+            // eventually we will want to create a copy of the skin to allow for customisation.
+            if (skin.SkinInfo.Files == null)
+                return;
+
+            foreach (var drawableInfo in skin.DrawableComponentInfo)
+            {
+                // todo: the OfType() call can be removed with better IDrawable support.
+                string json = JsonConvert.SerializeObject(drawableInfo.Value, new JsonSerializerSettings { Formatting = Formatting.Indented });
+
+                using (var streamContent = new MemoryStream(Encoding.UTF8.GetBytes(json)))
+                {
+                    string filename = $"{drawableInfo.Key}.json";
+
+                    var oldFile = skin.SkinInfo.Files.FirstOrDefault(f => f.Filename == filename);
+
+                    if (oldFile != null)
+                        ReplaceFile(skin.SkinInfo, oldFile, streamContent, oldFile.Filename);
+                    else
+                        AddFile(skin.SkinInfo, streamContent, filename);
+
+                    Logger.Log($"Saving out {filename} with {json.Length} bytes");
+                    Logger.Log(json);
+                }
+            }
+        }
+
         /// <summary>
         /// Perform a lookup query on available <see cref="SkinInfo"/>s.
         /// </summary>

From 1bb3c609aeec1c773aac2a7a28f4c21d52674052 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 11:00:57 +0900
Subject: [PATCH 3268/3722] Centralise implementation of cancel button logic

---
 .../UserInterface/DangerousTriangleButton.cs   | 18 ++++++++++++++++++
 osu.Game/Overlays/KeyBinding/KeyBindingRow.cs  | 11 +----------
 .../KeyBinding/KeyBindingsSubsection.cs        |  9 ++-------
 3 files changed, 21 insertions(+), 17 deletions(-)
 create mode 100644 osu.Game/Graphics/UserInterface/DangerousTriangleButton.cs

diff --git a/osu.Game/Graphics/UserInterface/DangerousTriangleButton.cs b/osu.Game/Graphics/UserInterface/DangerousTriangleButton.cs
new file mode 100644
index 0000000000..89a4c28c8c
--- /dev/null
+++ b/osu.Game/Graphics/UserInterface/DangerousTriangleButton.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.Allocation;
+
+namespace osu.Game.Graphics.UserInterface
+{
+    public class DangerousTriangleButton : TriangleButton
+    {
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            BackgroundColour = colours.PinkDark;
+            Triangles.ColourDark = colours.PinkDarker;
+            Triangles.ColourLight = colours.Pink;
+        }
+    }
+}
diff --git a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
index 300fce962a..43942d2d52 100644
--- a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
+++ b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
@@ -339,22 +339,13 @@ namespace osu.Game.Overlays.KeyBinding
             }
         }
 
-        public class ClearButton : TriangleButton
+        public class ClearButton : DangerousTriangleButton
         {
             public ClearButton()
             {
                 Text = "Clear";
                 Size = new Vector2(80, 20);
             }
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                BackgroundColour = colours.Pink;
-
-                Triangles.ColourDark = colours.PinkDark;
-                Triangles.ColourLight = colours.PinkLight;
-            }
         }
 
         public class KeyButton : Container
diff --git a/osu.Game/Overlays/KeyBinding/KeyBindingsSubsection.cs b/osu.Game/Overlays/KeyBinding/KeyBindingsSubsection.cs
index d784b7aec9..707176e63e 100644
--- a/osu.Game/Overlays/KeyBinding/KeyBindingsSubsection.cs
+++ b/osu.Game/Overlays/KeyBinding/KeyBindingsSubsection.cs
@@ -11,7 +11,6 @@ using osu.Game.Input;
 using osu.Game.Overlays.Settings;
 using osu.Game.Rulesets;
 using osuTK;
-using osu.Game.Graphics;
 
 namespace osu.Game.Overlays.KeyBinding
 {
@@ -55,10 +54,10 @@ namespace osu.Game.Overlays.KeyBinding
         }
     }
 
-    public class ResetButton : TriangleButton
+    public class ResetButton : DangerousTriangleButton
     {
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load()
         {
             Text = "Reset all bindings in section";
             RelativeSizeAxes = Axes.X;
@@ -66,10 +65,6 @@ namespace osu.Game.Overlays.KeyBinding
             Height = 20;
 
             Content.CornerRadius = 5;
-
-            BackgroundColour = colours.PinkDark;
-            Triangles.ColourDark = colours.PinkDarker;
-            Triangles.ColourLight = colours.Pink;
         }
     }
 }

From c957293ec3a580875f7961bcde4e47bfd20c2a27 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 11:54:45 +0900
Subject: [PATCH 3269/3722] Load json from disk store at skin construction for
 now

This allows for easier mutation without worrying about changes being
re-read from disk unexpectedly.
---
 osu.Game/Skinning/Skin.cs | 62 ++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 33 deletions(-)

diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index 03ecabc886..34571ec688 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -44,6 +44,32 @@ namespace osu.Game.Skinning
 
             // may be null for default skin.
             this.resources = resources;
+
+            // we may want to move this to some kind of async operation in the future.
+            foreach (SkinnableTarget skinnableTarget in Enum.GetValues(typeof(SkinnableTarget)))
+            {
+                string filename = $"{skinnableTarget}.json";
+
+                // skininfo files may be null for default skin.
+                var fileInfo = SkinInfo.Files?.FirstOrDefault(f => f.Filename == filename);
+
+                if (fileInfo == null)
+                    continue;
+
+                var bytes = resources?.Files.Get(fileInfo.FileInfo.StoragePath);
+
+                if (bytes == null)
+                    continue;
+
+                string jsonContent = Encoding.UTF8.GetString(bytes);
+
+                DrawableComponentInfo[skinnableTarget] = JsonConvert.DeserializeObject<IEnumerable<SkinnableInfo>>(jsonContent).ToArray();
+            }
+        }
+
+        public void ResetDrawableTarget(SkinnableElementTargetContainer targetContainer)
+        {
+            DrawableComponentInfo.Remove(targetContainer.Target);
         }
 
         public void UpdateDrawableTarget(SkinnableElementTargetContainer targetContainer)
@@ -60,34 +86,9 @@ namespace osu.Game.Skinning
                     var skinnableTarget = target.Target;
 
                     if (!DrawableComponentInfo.TryGetValue(skinnableTarget, out var skinnableInfo))
-                    {
-                        switch (skinnableTarget)
-                        {
-                            case SkinnableTarget.MainHUDComponents:
-
-                                // skininfo files may be null for default skin.
-                                var fileInfo = SkinInfo.Files?.FirstOrDefault(f => f.Filename == $"{skinnableTarget}.json");
-
-                                if (fileInfo == null)
-                                    return null;
-
-                                var bytes = resources?.Files.Get(fileInfo.FileInfo.StoragePath);
-
-                                if (bytes == null)
-                                    return null;
-
-                                string jsonContent = Encoding.UTF8.GetString(bytes);
-
-                                DrawableComponentInfo[skinnableTarget] = skinnableInfo =
-                                    JsonConvert.DeserializeObject<IEnumerable<SkinnableInfo>>(jsonContent).Where(i => i.Target == SkinnableTarget.MainHUDComponents).ToArray();
-                                break;
-                        }
-                    }
-
-                    if (skinnableInfo == null)
                         return null;
 
-                    return new SkinnableTargetWrapper(skinnableTarget)
+                    return new SkinnableTargetWrapper
                     {
                         ChildrenEnumerable = skinnableInfo.Select(i => i.CreateInstance())
                     };
@@ -123,15 +124,10 @@ namespace osu.Game.Skinning
         #endregion
     }
 
-    public class SkinnableTargetWrapper : Container, IDefaultSkinnableTarget
+    public class SkinnableTargetWrapper : Container, ISkinnableComponent
     {
-        // this is just here to implement the interface and allow a silly parent lookup to work (where the target is not the direct parent for reasons).
-        // TODO: need to fix this.
-        public SkinnableTarget Target { get; }
-
-        public SkinnableTargetWrapper(SkinnableTarget target)
+        public SkinnableTargetWrapper()
         {
-            Target = target;
             RelativeSizeAxes = Axes.Both;
         }
     }

From 4769a95b4994b032f64e446272ffed0051230f43 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 11:56:14 +0900
Subject: [PATCH 3270/3722] Fix encapsulation and remove target lookup overhead

---
 .../HUD/SkinnableElementTargetContainer.cs    | 23 ++++++++++++++-----
 osu.Game/Screens/Play/HUD/SkinnableInfo.cs    |  9 --------
 osu.Game/Skinning/IDefaultSkinnableTarget.cs  | 12 ----------
 osu.Game/Skinning/ISkinnableTarget.cs         | 12 +++++++++-
 osu.Game/Skinning/LegacySkin.cs               |  3 +--
 5 files changed, 29 insertions(+), 30 deletions(-)
 delete mode 100644 osu.Game/Skinning/IDefaultSkinnableTarget.cs

diff --git a/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs b/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
index f1b282119b..79a0db1751 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Graphics;
 using osu.Game.Extensions;
 using osu.Game.Skinning;
 
@@ -19,6 +20,21 @@ namespace osu.Game.Screens.Play.HUD
             Target = target;
         }
 
+        public void Reload()
+        {
+            content = CurrentSkin.GetDrawableComponent(new SkinnableTargetComponent(Target)) as SkinnableTargetWrapper;
+
+            ClearInternal();
+
+            if (content != null)
+                LoadComponentAsync(content, AddInternal);
+        }
+
+        public void Add(Drawable drawable)
+        {
+            content.Add(drawable);
+        }
+
         public IEnumerable<SkinnableInfo> CreateSerialisedChildren() =>
             content.Select(d => d.CreateSerialisedInformation());
 
@@ -26,12 +42,7 @@ namespace osu.Game.Screens.Play.HUD
         {
             base.SkinChanged(skin, allowFallback);
 
-            content = skin.GetDrawableComponent(new SkinnableTargetComponent(Target)) as SkinnableTargetWrapper;
-
-            ClearInternal();
-
-            if (content != null)
-                LoadComponentAsync(content, AddInternal);
+            Reload();
         }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
index ec4eaa0e59..abeb96f647 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
@@ -4,8 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Extensions;
@@ -23,9 +21,6 @@ namespace osu.Game.Screens.Play.HUD
     {
         public Type Type { get; set; }
 
-        [JsonConverter(typeof(StringEnumConverter))]
-        public SkinnableTarget? Target { get; set; }
-
         public Vector2 Position { get; set; }
 
         public float Rotation { get; set; }
@@ -44,10 +39,6 @@ namespace osu.Game.Screens.Play.HUD
         {
             Type = component.GetType();
 
-            ISkinnableTarget target = component.Parent as ISkinnableTarget;
-
-            Target = target?.Target;
-
             Position = component.Position;
             Rotation = component.Rotation;
             Scale = component.Scale;
diff --git a/osu.Game/Skinning/IDefaultSkinnableTarget.cs b/osu.Game/Skinning/IDefaultSkinnableTarget.cs
deleted file mode 100644
index 24fb454af8..0000000000
--- a/osu.Game/Skinning/IDefaultSkinnableTarget.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.
-
-namespace osu.Game.Skinning
-{
-    /// <summary>
-    /// The default placement location for new <see cref="ISkinnableComponent"/>s.
-    /// </summary>
-    public interface IDefaultSkinnableTarget : ISkinnableTarget
-    {
-    }
-}
diff --git a/osu.Game/Skinning/ISkinnableTarget.cs b/osu.Game/Skinning/ISkinnableTarget.cs
index 90e48c8bba..2379fd4247 100644
--- a/osu.Game/Skinning/ISkinnableTarget.cs
+++ b/osu.Game/Skinning/ISkinnableTarget.cs
@@ -8,8 +8,18 @@ namespace osu.Game.Skinning
     /// <summary>
     /// Denotes a container which can house <see cref="ISkinnableComponent"/>s.
     /// </summary>
-    public interface ISkinnableTarget : IDrawable
+    public interface ISkinnableTarget
     {
         public SkinnableTarget Target { get; }
+
+        /// <summary>
+        /// Reload this target from the current skin.
+        /// </summary>
+        public void Reload();
+
+        /// <summary>
+        /// Add the provided item to this target.
+        /// </summary>
+        public void Add(Drawable drawable);
     }
 }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index fc03ce909c..3ffd2245c2 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -331,9 +331,8 @@ namespace osu.Game.Skinning
                     switch (target.Target)
                     {
                         case SkinnableTarget.MainHUDComponents:
-                            return new SkinnableTargetWrapper(target.Target)
+                            return new SkinnableTargetWrapper
                             {
-                                RelativeSizeAxes = Axes.Both,
                                 Children = new[]
                                 {
                                     // TODO: these should fallback to the osu!classic skin.

From 81902ad6a688f2e143d06234006027889d8808be Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 11:57:12 +0900
Subject: [PATCH 3271/3722] Add the ability to revert all skin changes

---
 osu.Game/Skinning/Editor/SkinEditor.cs | 66 +++++++++++++++++++++-----
 1 file changed, 53 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 30ee3097d2..6b7d289284 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -13,6 +13,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Play.HUD;
+using osuTK;
 
 namespace osu.Game.Skinning.Editor
 {
@@ -20,7 +21,7 @@ namespace osu.Game.Skinning.Editor
     {
         public const double TRANSITION_DURATION = 500;
 
-        private readonly Drawable target;
+        private readonly Drawable targetScreen;
 
         private OsuTextFlowContainer headerText;
 
@@ -29,9 +30,9 @@ namespace osu.Game.Skinning.Editor
         [Resolved]
         private SkinManager skins { get; set; }
 
-        public SkinEditor(Drawable target)
+        public SkinEditor(Drawable targetScreen)
         {
-            this.target = target;
+            this.targetScreen = targetScreen;
 
             RelativeSizeAxes = Axes.Both;
         }
@@ -52,18 +53,20 @@ namespace osu.Game.Skinning.Editor
                         Origin = Anchor.TopCentre,
                         RelativeSizeAxes = Axes.X
                     },
-                    new SkinBlueprintContainer(target),
+                    new SkinBlueprintContainer(targetScreen),
                     new SkinComponentToolbox(600)
                     {
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
                         RequestPlacement = placeComponent
                     },
-                    new TriangleButton
+                    new FillFlowContainer
                     {
-                        Text = "Save Changes",
-                        Width = 140,
-                        Height = 50,
+                        Direction = FillDirection.Horizontal,
+                        AutoSizeAxes = Axes.Both,
+                        Anchor = Anchor.TopRight,
+                        Origin = Anchor.TopRight,
+                        Spacing = new Vector2(5),
                         Padding = new MarginPadding
                         {
                             Top = 10,
@@ -74,7 +77,21 @@ namespace osu.Game.Skinning.Editor
                             Right = 10,
                             Bottom = 10,
                         },
-                        Action = save,
+                        Children = new Drawable[]
+                        {
+                            new TriangleButton
+                            {
+                                Text = "Save Changes",
+                                Width = 140,
+                                Action = save,
+                            },
+                            new DangerousTriangleButton
+                            {
+                                Text = "Revert to default",
+                                Width = 140,
+                                Action = revert,
+                            },
+                        }
                     },
                 }
             };
@@ -89,11 +106,14 @@ namespace osu.Game.Skinning.Editor
 
         private void placeComponent(Type type)
         {
-            var instance = (Drawable)Activator.CreateInstance(type);
+            Drawable instance = (Drawable)Activator.CreateInstance(type);
 
-            var targetContainer = target.ChildrenOfType<IDefaultSkinnableTarget>().FirstOrDefault();
+            getTarget(SkinnableTarget.MainHUDComponents)?.Add(instance);
+        }
 
-            (targetContainer as Container)?.Add(instance);
+        private ISkinnableTarget getTarget(SkinnableTarget target)
+        {
+            return targetScreen.ChildrenOfType<ISkinnableTarget>().FirstOrDefault(c => c.Target == target);
         }
 
         protected override void LoadComplete()
@@ -102,6 +122,26 @@ namespace osu.Game.Skinning.Editor
             Show();
         }
 
+        private void revert()
+        {
+            var currentSkin = skins.CurrentSkin.Value;
+
+            var legacySkin = currentSkin as LegacySkin;
+
+            if (legacySkin == null)
+                return;
+
+            SkinnableElementTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableElementTargetContainer>().ToArray();
+
+            foreach (var t in targetContainers)
+            {
+                legacySkin.ResetDrawableTarget(t);
+
+                // add back default components
+                getTarget(t.Target).Reload();
+            }
+        }
+
         private void save()
         {
             var currentSkin = skins.CurrentSkin.Value;
@@ -111,7 +151,7 @@ namespace osu.Game.Skinning.Editor
             if (legacySkin == null)
                 return;
 
-            SkinnableElementTargetContainer[] targetContainers = target.ChildrenOfType<SkinnableElementTargetContainer>().ToArray();
+            SkinnableElementTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableElementTargetContainer>().ToArray();
 
             foreach (var t in targetContainers)
                 legacySkin.UpdateDrawableTarget(t);

From bf65547eec7419273bd106f30d4842dd19ea86fb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 12:04:25 +0900
Subject: [PATCH 3272/3722] Allow some serialised components to not be mutable
 by the user

---
 osu.Game/Screens/Play/HUD/SkinnableInfo.cs        |  4 ++--
 osu.Game/Skinning/IImmutableSkinnableComponent.cs | 15 +++++++++++++++
 osu.Game/Skinning/ISkinnableComponent.cs          |  4 +---
 osu.Game/Skinning/Skin.cs                         |  5 +----
 4 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 osu.Game/Skinning/IImmutableSkinnableComponent.cs

diff --git a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
index abeb96f647..988d73fed6 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
@@ -14,7 +14,7 @@ using osuTK;
 namespace osu.Game.Screens.Play.HUD
 {
     /// <summary>
-    /// Serialised information governing custom changes to an <see cref="ISkinnableComponent"/>.
+    /// Serialised information governing custom changes to an <see cref="ISkinSerialisable"/>.
     /// </summary>
     [Serializable]
     public class SkinnableInfo : IJsonSerializable
@@ -46,7 +46,7 @@ namespace osu.Game.Screens.Play.HUD
 
             if (component is Container container)
             {
-                foreach (var child in container.Children.OfType<ISkinnableComponent>().OfType<Drawable>())
+                foreach (var child in container.Children.OfType<ISkinSerialisable>().OfType<Drawable>())
                     Children.Add(child.CreateSerialisedInformation());
             }
         }
diff --git a/osu.Game/Skinning/IImmutableSkinnableComponent.cs b/osu.Game/Skinning/IImmutableSkinnableComponent.cs
new file mode 100644
index 0000000000..d1777512af
--- /dev/null
+++ b/osu.Game/Skinning/IImmutableSkinnableComponent.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.Graphics;
+
+namespace osu.Game.Skinning
+{
+    /// <summary>
+    /// Denotes a drawable component which should be serialised as part of a skin.
+    /// Use <see cref="ISkinnableComponent"/> for components which should be mutable by the user / editor.
+    /// </summary>
+    public interface ISkinSerialisable : IDrawable
+    {
+    }
+}
diff --git a/osu.Game/Skinning/ISkinnableComponent.cs b/osu.Game/Skinning/ISkinnableComponent.cs
index f6b0a182b4..e44c7be13d 100644
--- a/osu.Game/Skinning/ISkinnableComponent.cs
+++ b/osu.Game/Skinning/ISkinnableComponent.cs
@@ -1,14 +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 osu.Framework.Graphics;
-
 namespace osu.Game.Skinning
 {
     /// <summary>
     /// Denotes a drawable which, as a drawable, can be adjusted via skinning specifications.
     /// </summary>
-    public interface ISkinnableComponent : IDrawable
+    public interface ISkinnableComponent : ISkinSerialisable
     {
     }
 }
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index 34571ec688..cbbad4a607 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -22,8 +22,6 @@ namespace osu.Game.Skinning
     {
         public readonly SkinInfo SkinInfo;
 
-        private readonly IStorageResourceProvider resources;
-
         public SkinConfiguration Configuration { get; protected set; }
 
         public IDictionary<SkinnableTarget, SkinnableInfo[]> DrawableComponentInfo => drawableComponentInfo;
@@ -43,7 +41,6 @@ namespace osu.Game.Skinning
             SkinInfo = skin;
 
             // may be null for default skin.
-            this.resources = resources;
 
             // we may want to move this to some kind of async operation in the future.
             foreach (SkinnableTarget skinnableTarget in Enum.GetValues(typeof(SkinnableTarget)))
@@ -124,7 +121,7 @@ namespace osu.Game.Skinning
         #endregion
     }
 
-    public class SkinnableTargetWrapper : Container, ISkinnableComponent
+    public class SkinnableTargetWrapper : Container, ISkinSerialisable
     {
         public SkinnableTargetWrapper()
         {

From 2396ba42a6ec6c6e9f3e4b8d89513fec123706e2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 12:21:31 +0900
Subject: [PATCH 3273/3722] Change `HealthDisplay` to be a `CompositeDrawable`

---
 osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs | 6 ++++--
 osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs       | 2 +-
 osu.Game/Screens/Play/HUD/FailingLayer.cs               | 2 +-
 osu.Game/Screens/Play/HUD/HealthDisplay.cs              | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
index fb4c9d713a..c335f7c99e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
@@ -1,11 +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.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.Configuration;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD;
@@ -50,9 +52,9 @@ namespace osu.Game.Tests.Visual.Gameplay
             });
 
             AddStep("set health to 0.10", () => layer.Current.Value = 0.1);
-            AddUntilStep("layer fade is visible", () => layer.Child.Alpha > 0.1f);
+            AddUntilStep("layer fade is visible", () => layer.ChildrenOfType<Container>().First().Alpha > 0.1f);
             AddStep("set health to 1", () => layer.Current.Value = 1f);
-            AddUntilStep("layer fade is invisible", () => !layer.Child.IsPresent);
+            AddUntilStep("layer fade is invisible", () => !layer.ChildrenOfType<Container>().First().IsPresent);
         }
 
         [Test]
diff --git a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
index 37bd289aee..241777244b 100644
--- a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Screens.Play.HUD
             RelativeSizeAxes = Axes.X;
             Margin = new MarginPadding { Top = 20 };
 
-            Children = new Drawable[]
+            InternalChildren = new Drawable[]
             {
                 new Box
                 {
diff --git a/osu.Game/Screens/Play/HUD/FailingLayer.cs b/osu.Game/Screens/Play/HUD/FailingLayer.cs
index e071337f34..424ee55766 100644
--- a/osu.Game/Screens/Play/HUD/FailingLayer.cs
+++ b/osu.Game/Screens/Play/HUD/FailingLayer.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Screens.Play.HUD
         public FailingLayer()
         {
             RelativeSizeAxes = Axes.Both;
-            Children = new Drawable[]
+            InternalChildren = new Drawable[]
             {
                 boxes = new Container
                 {
diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index e18a28eded..5a2c764a1a 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Screens.Play.HUD
     /// A container for components displaying the current player health.
     /// Gets bound automatically to the <see cref="Rulesets.Scoring.HealthProcessor"/> when inserted to <see cref="DrawableRuleset.Overlays"/> hierarchy.
     /// </summary>
-    public abstract class HealthDisplay : Container
+    public abstract class HealthDisplay : CompositeDrawable
     {
         private Bindable<bool> showHealthbar;
 

From 4c4d75e6f9c341548b310a767cc15d6839559905 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 12:42:32 +0900
Subject: [PATCH 3274/3722] Remove `AccuracyCounter` sizing dependency in
 `HUDOverlay`

---
 .../HUD/SkinnableElementTargetContainer.cs    |  2 ++
 osu.Game/Screens/Play/HUDOverlay.cs           | 34 ++++++++++++++-----
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs b/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
index 79a0db1751..051ab9ad3c 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
@@ -20,6 +20,8 @@ namespace osu.Game.Screens.Play.HUD
             Target = target;
         }
 
+        public IReadOnlyList<Drawable> Children => content?.Children;
+
         public void Reload()
         {
             content = CurrentSkin.GetDrawableComponent(new SkinnableTargetComponent(Target)) as SkinnableTargetWrapper;
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 30b735d28a..033a280da2 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 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;
@@ -35,7 +36,6 @@ namespace osu.Game.Screens.Play
 
         public readonly KeyCounterDisplay KeyCounter;
         public readonly SkinnableScoreCounter ScoreCounter;
-        public readonly SkinnableAccuracyCounter AccuracyCounter;
         public readonly SongProgress Progress;
         public readonly ModDisplay ModDisplay;
         public readonly HoldForMenuButton HoldToQuit;
@@ -68,6 +68,8 @@ namespace osu.Game.Screens.Play
 
         private bool holdingForHUD;
 
+        private readonly SkinnableElementTargetContainer mainComponents;
+
         private IEnumerable<Drawable> hideTargets => new Drawable[] { visibilityContainer, KeyCounter, topRightElements };
 
         public HUDOverlay(DrawableRuleset drawableRuleset, IReadOnlyList<Mod> mods)
@@ -95,7 +97,7 @@ namespace osu.Game.Screens.Play
                                     RelativeSizeAxes = Axes.Both,
                                     Children = new Drawable[]
                                     {
-                                        new SkinnableElementTargetContainer(SkinnableTarget.MainHUDComponents)
+                                        mainComponents = new SkinnableElementTargetContainer(SkinnableTarget.MainHUDComponents)
                                         {
                                             RelativeSizeAxes = Axes.Both,
                                         },
@@ -107,7 +109,6 @@ namespace osu.Game.Screens.Play
                                             {
                                                 // remaining cross-dependencies need tidying.
                                                 // kept to ensure non-null, but hidden for testing.
-                                                AccuracyCounter = new SkinnableAccuracyCounter(),
                                                 ScoreCounter = new SkinnableScoreCounter(),
                                             }
                                         },
@@ -216,12 +217,29 @@ namespace osu.Game.Screens.Play
         {
             base.Update();
 
-            // HACK: for now align with the accuracy counter.
-            // this is done for the sake of hacky legacy skins which extend the health bar to take up the full screen area.
-            // it only works with the default skin due to padding offsetting it *just enough* to coexist.
-            topRightElements.Y = TopScoringElementsHeight = ToLocalSpace(AccuracyCounter.Drawable.ScreenSpaceDrawQuad.BottomRight).Y;
+            Vector2 lowestScreenSpace = Vector2.Zero;
 
-            bottomRightElements.Y = -Progress.Height;
+            // TODO: may be null during skin switching. not sure if there's a better way of exposing these children.
+            if (mainComponents.Children != null)
+            {
+                foreach (var element in mainComponents.Children)
+                {
+                    // for now align top-right components with the bottom-edge of the lowest top-anchored hud element.
+                    if (!element.Anchor.HasFlagFast(Anchor.TopRight))
+                        continue;
+
+                    // health bars are excluded for the sake of hacky legacy skins which extend the health bar to take up the full screen area.
+                    if (element is HealthDisplay)
+                        continue;
+
+                    var bottomRight = element.ScreenSpaceDrawQuad.BottomRight;
+                    if (bottomRight.Y > lowestScreenSpace.Y)
+                        lowestScreenSpace = bottomRight;
+                }
+
+                topRightElements.Y = TopScoringElementsHeight = ToLocalSpace(lowestScreenSpace).Y;
+                bottomRightElements.Y = -Progress.Height;
+            }
         }
 
         private void updateVisibility()

From 117d6d731d1a0f5de4648888cfd91f180b1cac2e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 13:12:24 +0900
Subject: [PATCH 3275/3722] Move cross-component layout dependencies for legacy
 skin to `LegacySkin`

---
 osu.Game/Skinning/LegacyAccuracyCounter.cs  | 11 ------
 osu.Game/Skinning/LegacySkin.cs             | 15 +++++++-
 osu.Game/Skinning/Skin.cs                   |  9 -----
 osu.Game/Skinning/SkinnableTargetWrapper.cs | 41 +++++++++++++++++++++
 4 files changed, 54 insertions(+), 22 deletions(-)
 create mode 100644 osu.Game/Skinning/SkinnableTargetWrapper.cs

diff --git a/osu.Game/Skinning/LegacyAccuracyCounter.cs b/osu.Game/Skinning/LegacyAccuracyCounter.cs
index e2fe01efe4..3eea5d22d5 100644
--- a/osu.Game/Skinning/LegacyAccuracyCounter.cs
+++ b/osu.Game/Skinning/LegacyAccuracyCounter.cs
@@ -32,16 +32,5 @@ namespace osu.Game.Skinning
             Anchor = Anchor.TopRight,
             Origin = Anchor.TopRight,
         };
-
-        protected override void Update()
-        {
-            base.Update();
-
-            if (hud?.ScoreCounter?.Drawable is LegacyScoreCounter score)
-            {
-                // for now align with the score counter. eventually this will be user customisable.
-                Y = Parent.ToLocalSpace(score.ScreenSpaceDrawQuad.BottomRight).Y;
-            }
-        }
     }
 }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 3ffd2245c2..85cfab8297 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -327,11 +327,20 @@ namespace osu.Game.Skinning
             switch (component)
             {
                 case SkinnableTargetComponent target:
-
                     switch (target.Target)
                     {
                         case SkinnableTarget.MainHUDComponents:
-                            return new SkinnableTargetWrapper
+
+                            var skinnableTargetWrapper = new SkinnableTargetWrapper(container =>
+                            {
+                                var score = container.OfType<LegacyScoreCounter>().FirstOrDefault();
+                                var accuracy = container.OfType<GameplayAccuracyCounter>().FirstOrDefault();
+
+                                if (score != null && accuracy != null)
+                                {
+                                    accuracy.Y = container.ToLocalSpace(score.ScreenSpaceDrawQuad.BottomRight).Y;
+                                }
+                            })
                             {
                                 Children = new[]
                                 {
@@ -342,6 +351,8 @@ namespace osu.Game.Skinning
                                     GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.HealthDisplay)) ?? new DefaultHealthDisplay(),
                                 }
                             };
+
+                            return skinnableTargetWrapper;
                     }
 
                     return null;
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index cbbad4a607..10481e4efd 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -9,7 +9,6 @@ using Newtonsoft.Json;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
@@ -120,12 +119,4 @@ namespace osu.Game.Skinning
 
         #endregion
     }
-
-    public class SkinnableTargetWrapper : Container, ISkinSerialisable
-    {
-        public SkinnableTargetWrapper()
-        {
-            RelativeSizeAxes = Axes.Both;
-        }
-    }
 }
diff --git a/osu.Game/Skinning/SkinnableTargetWrapper.cs b/osu.Game/Skinning/SkinnableTargetWrapper.cs
new file mode 100644
index 0000000000..a0df610488
--- /dev/null
+++ b/osu.Game/Skinning/SkinnableTargetWrapper.cs
@@ -0,0 +1,41 @@
+// Copyright (c) ppy 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.Graphics.Containers;
+
+namespace osu.Game.Skinning
+{
+    /// <summary>
+    /// A container which is serialised and can encapsulate multiple skinnable elements into a single return type.
+    /// Will also optionally apply default cross-element layout dependencies when initialised from a non-deserialised source.
+    /// </summary>
+    public class SkinnableTargetWrapper : Container, ISkinSerialisable
+    {
+        private readonly Action<Container> applyDefaults;
+
+        /// <summary>
+        /// Construct a wrapper with defaults that should be applied once.
+        /// </summary>
+        /// <param name="applyDefaults">A function with default to apply after the initial layout (ie. consuming autosize)</param>
+        public SkinnableTargetWrapper(Action<Container> applyDefaults)
+            : this()
+        {
+            this.applyDefaults = applyDefaults;
+        }
+
+        public SkinnableTargetWrapper()
+        {
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            // schedule is required to allow children to run their LoadComplete and take on their correct sizes.
+            Schedule(() => applyDefaults?.Invoke(this));
+        }
+    }
+}

From f53ce951dc1ee6594d5a6cc4e975fa9e9a15dee6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 13:13:40 +0900
Subject: [PATCH 3276/3722] Remove `DefaultScoreCounter` animation for the time
 being

May add this back in the future, but for now it's causing issues as it
operates on `this`. The default skin may be changing quite a bit in the
near future, so we can decide what to do about animation at that point
in time.
---
 osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs b/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
index 8e37797446..bd18050dfb 100644
--- a/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
@@ -24,12 +24,6 @@ namespace osu.Game.Screens.Play.HUD
         private void load(OsuColour colours)
         {
             Colour = colours.BlueLighter;
-
-            // todo: check if default once health display is skinnable
-            hud?.ShowHealthbar.BindValueChanged(healthBar =>
-            {
-                this.MoveToY(healthBar.NewValue ? 30 : 0, HUDOverlay.FADE_DURATION, HUDOverlay.FADE_EASING);
-            }, true);
         }
     }
 }

From c94df672e5f30c4d87738ca37a019685773c4df2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 13:39:32 +0900
Subject: [PATCH 3277/3722] Also serialise `Origin` out

---
 osu.Game/Extensions/DrawableExtensions.cs  | 1 +
 osu.Game/Screens/Play/HUD/SkinnableInfo.cs | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/osu.Game/Extensions/DrawableExtensions.cs b/osu.Game/Extensions/DrawableExtensions.cs
index 6837a802f2..0ec96a876e 100644
--- a/osu.Game/Extensions/DrawableExtensions.cs
+++ b/osu.Game/Extensions/DrawableExtensions.cs
@@ -55,6 +55,7 @@ namespace osu.Game.Extensions
             component.Rotation = info.Rotation;
             component.Scale = info.Scale;
             component.Anchor = info.Anchor;
+            component.Origin = info.Origin;
 
             if (component is Container container)
             {
diff --git a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
index 988d73fed6..2de3f1b729 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
@@ -29,6 +29,8 @@ namespace osu.Game.Screens.Play.HUD
 
         public Anchor Anchor { get; set; }
 
+        public Anchor Origin { get; set; }
+
         public List<SkinnableInfo> Children { get; } = new List<SkinnableInfo>();
 
         public SkinnableInfo()
@@ -43,6 +45,7 @@ namespace osu.Game.Screens.Play.HUD
             Rotation = component.Rotation;
             Scale = component.Scale;
             Anchor = component.Anchor;
+            Origin = component.Origin;
 
             if (component is Container container)
             {

From 12684de66eb76365a3f10d4bee629eb9f0ada1d5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 14:09:56 +0900
Subject: [PATCH 3278/3722] Add ability to adjust origin in skin editor

---
 .../Skinning/Editor/SkinSelectionHandler.cs   | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index ad783a9c0e..cf5ece03e9 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -70,13 +70,18 @@ namespace osu.Game.Skinning.Editor
         {
             yield return new OsuMenuItem("Anchor")
             {
-                Items = createAnchorItems().ToArray()
+                Items = createAnchorItems(d => d.Anchor, applyAnchor).ToArray()
+            };
+
+            yield return new OsuMenuItem("Origin")
+            {
+                Items = createAnchorItems(d => d.Origin, applyOrigin).ToArray()
             };
 
             foreach (var item in base.GetContextMenuItemsForSelection(selection))
                 yield return item;
 
-            IEnumerable<AnchorMenuItem> createAnchorItems()
+            IEnumerable<AnchorMenuItem> createAnchorItems(Func<Drawable, Anchor> checkFunction, Action<Anchor> applyFunction)
             {
                 var displayableAnchors = new[]
                 {
@@ -93,14 +98,20 @@ namespace osu.Game.Skinning.Editor
 
                 return displayableAnchors.Select(a =>
                 {
-                    return new AnchorMenuItem(a, selection, _ => applyAnchor(a))
+                    return new AnchorMenuItem(a, selection, _ => applyFunction(a))
                     {
-                        State = { Value = GetStateFromSelection(selection, c => ((Drawable)c.Item).Anchor == a) }
+                        State = { Value = GetStateFromSelection(selection, c => checkFunction((Drawable)c.Item) == a) }
                     };
                 });
             }
         }
 
+        private void applyOrigin(Anchor anchor)
+        {
+            foreach (var item in SelectedItems)
+                ((Drawable)item).Origin = anchor;
+        }
+
         private void applyAnchor(Anchor anchor)
         {
             foreach (var item in SelectedItems)

From 944f09ec98e54f296ee6fe04a0b183ab31bd4550 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 14:12:28 +0900
Subject: [PATCH 3279/3722] Move default skin cross-component dependencies out
 to default specifications

---
 .../Play/HUD/DefaultAccuracyCounter.cs        | 22 -------
 .../Screens/Play/HUD/DefaultComboCounter.cs   | 14 ----
 osu.Game/Screens/Play/HUDOverlay.cs           | 12 ----
 osu.Game/Skinning/DefaultSkin.cs              | 64 +++++++++++++++++++
 4 files changed, 64 insertions(+), 48 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
index e4c865803d..d8dff89b29 100644
--- a/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
@@ -2,23 +2,13 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Framework.Graphics;
 using osu.Game.Graphics;
 using osu.Game.Skinning;
-using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
 {
     public class DefaultAccuracyCounter : GameplayAccuracyCounter, ISkinnableComponent
     {
-        private readonly Vector2 offset = new Vector2(-20, 5);
-
-        public DefaultAccuracyCounter()
-        {
-            Origin = Anchor.TopRight;
-            Anchor = Anchor.TopRight;
-        }
-
         [Resolved(canBeNull: true)]
         private HUDOverlay hud { get; set; }
 
@@ -27,17 +17,5 @@ namespace osu.Game.Screens.Play.HUD
         {
             Colour = colours.BlueLighter;
         }
-
-        protected override void Update()
-        {
-            base.Update();
-
-            if (hud?.ScoreCounter.Drawable is DefaultScoreCounter score)
-            {
-                // for now align with the score counter. eventually this will be user customisable.
-                Anchor = Anchor.TopLeft;
-                Position = Parent.ToLocalSpace(score.ScreenSpaceDrawQuad.TopLeft) + offset;
-            }
-        }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs b/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
index 375ff293aa..13bd045fc0 100644
--- a/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
@@ -9,14 +9,11 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
-using osuTK;
 
 namespace osu.Game.Screens.Play.HUD
 {
     public class DefaultComboCounter : RollingCounter<int>, ISkinnableComponent
     {
-        private readonly Vector2 offset = new Vector2(20, 5);
-
         [Resolved(canBeNull: true)]
         private HUDOverlay hud { get; set; }
 
@@ -32,17 +29,6 @@ namespace osu.Game.Screens.Play.HUD
             Current.BindTo(scoreProcessor.Combo);
         }
 
-        protected override void Update()
-        {
-            base.Update();
-
-            if (hud?.ScoreCounter.Drawable is DefaultScoreCounter score)
-            {
-                // for now align with the score counter. eventually this will be user customisable.
-                Position = Parent.ToLocalSpace(score.ScreenSpaceDrawQuad.TopRight) + offset;
-            }
-        }
-
         protected override string FormatCount(int count)
         {
             return $@"{count}x";
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 033a280da2..88176e7ea2 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -35,7 +35,6 @@ namespace osu.Game.Screens.Play
         public float TopScoringElementsHeight { get; private set; }
 
         public readonly KeyCounterDisplay KeyCounter;
-        public readonly SkinnableScoreCounter ScoreCounter;
         public readonly SongProgress Progress;
         public readonly ModDisplay ModDisplay;
         public readonly HoldForMenuButton HoldToQuit;
@@ -102,17 +101,6 @@ namespace osu.Game.Screens.Play
                                             RelativeSizeAxes = Axes.Both,
                                         },
                                         new Container
-                                        {
-                                            RelativeSizeAxes = Axes.Both,
-                                            Alpha = 0,
-                                            Children = new Drawable[]
-                                            {
-                                                // remaining cross-dependencies need tidying.
-                                                // kept to ensure non-null, but hidden for testing.
-                                                ScoreCounter = new SkinnableScoreCounter(),
-                                            }
-                                        },
-                                        new Container
                                         {
                                             RelativeSizeAxes = Axes.Both,
                                             Children = new Drawable[]
diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index bfb5b8ef56..ef3dffe59c 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -2,11 +2,16 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
+using osu.Game.Extensions;
+using osu.Game.Screens.Play.HUD;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Skinning
@@ -23,6 +28,65 @@ namespace osu.Game.Skinning
 
         public override ISample GetSample(ISampleInfo sampleInfo) => null;
 
+        public override Drawable GetDrawableComponent(ISkinComponent component)
+        {
+            switch (component)
+            {
+                case SkinnableTargetComponent target:
+                    switch (target.Target)
+                    {
+                        case SkinnableTarget.MainHUDComponents:
+                            var skinnableTargetWrapper = new SkinnableTargetWrapper(container =>
+                            {
+                                var score = container.OfType<DefaultScoreCounter>().FirstOrDefault();
+                                var accuracy = container.OfType<DefaultAccuracyCounter>().FirstOrDefault();
+                                var combo = container.OfType<DefaultComboCounter>().FirstOrDefault();
+
+                                if (score != null)
+                                {
+                                    score.Anchor = Anchor.TopCentre;
+                                    score.Origin = Anchor.TopCentre;
+
+                                    // elements default to beneath the health bar
+                                    const float vertical_offset = 30;
+
+                                    const float horizontal_padding = 20;
+
+                                    score.Position = new Vector2(0, vertical_offset);
+
+                                    if (accuracy != null)
+                                    {
+                                        accuracy.Position = new Vector2(-accuracy.ScreenSpaceDeltaToParentSpace(score.ScreenSpaceDrawQuad.Size).X / 2 - horizontal_padding, vertical_offset + 5);
+                                        accuracy.Origin = Anchor.TopRight;
+                                        accuracy.Anchor = Anchor.TopCentre;
+                                    }
+
+                                    if (combo != null)
+                                    {
+                                        combo.Position = new Vector2(accuracy.ScreenSpaceDeltaToParentSpace(score.ScreenSpaceDrawQuad.Size).X / 2 + horizontal_padding, vertical_offset + 5);
+                                        combo.Anchor = Anchor.TopCentre;
+                                    }
+                                }
+                            })
+                            {
+                                Children = new Drawable[]
+                                {
+                                    new DefaultComboCounter(),
+                                    new DefaultScoreCounter(),
+                                    new DefaultAccuracyCounter(),
+                                    new DefaultHealthDisplay(),
+                                }
+                            };
+
+                            return skinnableTargetWrapper;
+                    }
+
+                    return null;
+            }
+
+            return base.GetDrawableComponent(component);
+        }
+
         public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
         {
             switch (lookup)

From 03d5f10744b91aa189d5bf1fe5a153a2117830b0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 14:22:19 +0900
Subject: [PATCH 3280/3722] Fix default health bar not being considered for
 top-right flow layout

---
 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 88176e7ea2..c4a8860bb6 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -213,11 +213,11 @@ namespace osu.Game.Screens.Play
                 foreach (var element in mainComponents.Children)
                 {
                     // for now align top-right components with the bottom-edge of the lowest top-anchored hud element.
-                    if (!element.Anchor.HasFlagFast(Anchor.TopRight))
+                    if (!element.Anchor.HasFlagFast(Anchor.TopRight) && !element.RelativeSizeAxes.HasFlagFast(Axes.X))
                         continue;
 
                     // health bars are excluded for the sake of hacky legacy skins which extend the health bar to take up the full screen area.
-                    if (element is HealthDisplay)
+                    if (element is LegacyHealthDisplay)
                         continue;
 
                     var bottomRight = element.ScreenSpaceDrawQuad.BottomRight;

From d5fe4f0f72e404f9527e2ccfe444dcd6645de0fc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 14:34:49 +0900
Subject: [PATCH 3281/3722] Remove unused skin resolution in
 `LegacyScoreCounter`

---
 osu.Game/Skinning/LegacyScoreCounter.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/osu.Game/Skinning/LegacyScoreCounter.cs b/osu.Game/Skinning/LegacyScoreCounter.cs
index 0696d2bedd..8aa48da453 100644
--- a/osu.Game/Skinning/LegacyScoreCounter.cs
+++ b/osu.Game/Skinning/LegacyScoreCounter.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.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Screens.Play.HUD;
@@ -14,9 +13,6 @@ namespace osu.Game.Skinning
         protected override double RollingDuration => 1000;
         protected override Easing RollingEasing => Easing.Out;
 
-        [Resolved]
-        private ISkinSource skin { get; set; }
-
         public LegacyScoreCounter()
             : base(6)
         {

From 0cf3efa16b9c20dccd26722e599ffa75bc5b9b72 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 16:56:23 +0900
Subject: [PATCH 3282/3722] Remove customisation support for
 `SongProgressDisplay`

---
 osu.Game/Screens/Play/SongProgress.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/SongProgress.cs b/osu.Game/Screens/Play/SongProgress.cs
index d85f3538e4..4a0787bfae 100644
--- a/osu.Game/Screens/Play/SongProgress.cs
+++ b/osu.Game/Screens/Play/SongProgress.cs
@@ -14,7 +14,6 @@ using osu.Framework.Timing;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI;
-using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play
 {
@@ -181,12 +180,12 @@ namespace osu.Game.Screens.Play
             info.TransformTo(nameof(info.Margin), new MarginPadding { Bottom = finalMargin }, transition_duration, Easing.In);
         }
 
-        public class SongProgressDisplay : Container, ISkinnableComponent
+        public class SongProgressDisplay : Container
         {
             public SongProgressDisplay()
             {
                 // TODO: move actual implementation into this.
-                // exists for skin customisation purposes.
+                // exists for skin customisation purposes (interface should be added to this container).
 
                 Masking = true;
                 RelativeSizeAxes = Axes.Both;

From f6f4b90d2bd71680a470d92c0aef5a98494e8580 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 16:56:55 +0900
Subject: [PATCH 3283/3722] Add customisation support for `LegacyHealthDisplay`

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

diff --git a/osu.Game/Skinning/LegacyHealthDisplay.cs b/osu.Game/Skinning/LegacyHealthDisplay.cs
index 717ca62da7..dfb6ca1a64 100644
--- a/osu.Game/Skinning/LegacyHealthDisplay.cs
+++ b/osu.Game/Skinning/LegacyHealthDisplay.cs
@@ -16,7 +16,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Skinning
 {
-    public class LegacyHealthDisplay : HealthDisplay
+    public class LegacyHealthDisplay : HealthDisplay, ISkinnableComponent
     {
         private const double epic_cutoff = 0.5;
 

From a67cead0b3adfce14608060d51131145ff653c81 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 17:00:24 +0900
Subject: [PATCH 3284/3722] Add `SkinInfo.InstantiationInfo` to allow creating
 different skin types

---
 .../TestSceneHitCircleArea.cs                 |   2 +-
 osu.Game/Beatmaps/WorkingBeatmap.cs           |   2 +-
 ...60743_AddSkinInstantiationInfo.Designer.cs | 508 ++++++++++++++++++
 ...20210511060743_AddSkinInstantiationInfo.cs |  22 +
 .../Migrations/OsuDbContextModelSnapshot.cs   |   6 +-
 osu.Game/Skinning/DefaultLegacySkin.cs        |  10 +-
 osu.Game/Skinning/DefaultSkin.cs              |  10 +-
 osu.Game/Skinning/SkinInfo.cs                 |  36 +-
 osu.Game/Skinning/SkinManager.cs              |  22 +-
 9 files changed, 597 insertions(+), 21 deletions(-)
 create mode 100644 osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.Designer.cs
 create mode 100644 osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs
index 0649989dc0..1fdcd73dde 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             hitCircle.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
-            Child = new SkinProvidingContainer(new DefaultSkin())
+            Child = new SkinProvidingContainer(new DefaultSkin(null))
             {
                 RelativeSizeAxes = Axes.Both,
                 Child = drawableHitCircle = new DrawableHitCircle(hitCircle)
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index e0eeaf6db0..3576b149bf 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -324,7 +324,7 @@ namespace osu.Game.Beatmaps
         public bool SkinLoaded => skin.IsResultAvailable;
         public ISkin Skin => skin.Value;
 
-        protected virtual ISkin GetSkin() => new DefaultSkin();
+        protected virtual ISkin GetSkin() => new DefaultSkin(null);
         private readonly RecyclableLazy<ISkin> skin;
 
         public abstract Stream GetStream(string storagePath);
diff --git a/osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.Designer.cs b/osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.Designer.cs
new file mode 100644
index 0000000000..b808c648da
--- /dev/null
+++ b/osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.Designer.cs
@@ -0,0 +1,508 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using osu.Game.Database;
+
+namespace osu.Game.Migrations
+{
+    [DbContext(typeof(OsuDbContext))]
+    [Migration("20210511060743_AddSkinInstantiationInfo")]
+    partial class AddSkinInstantiationInfo
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "2.2.6-servicing-10079");
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<float>("ApproachRate");
+
+                    b.Property<float>("CircleSize");
+
+                    b.Property<float>("DrainRate");
+
+                    b.Property<float>("OverallDifficulty");
+
+                    b.Property<double>("SliderMultiplier");
+
+                    b.Property<double>("SliderTickRate");
+
+                    b.HasKey("ID");
+
+                    b.ToTable("BeatmapDifficulty");
+                });
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<double>("AudioLeadIn");
+
+                    b.Property<double>("BPM");
+
+                    b.Property<int>("BaseDifficultyID");
+
+                    b.Property<int>("BeatDivisor");
+
+                    b.Property<int>("BeatmapSetInfoID");
+
+                    b.Property<bool>("Countdown");
+
+                    b.Property<double>("DistanceSpacing");
+
+                    b.Property<bool>("EpilepsyWarning");
+
+                    b.Property<int>("GridSize");
+
+                    b.Property<string>("Hash");
+
+                    b.Property<bool>("Hidden");
+
+                    b.Property<double>("Length");
+
+                    b.Property<bool>("LetterboxInBreaks");
+
+                    b.Property<string>("MD5Hash");
+
+                    b.Property<int?>("MetadataID");
+
+                    b.Property<int?>("OnlineBeatmapID");
+
+                    b.Property<string>("Path");
+
+                    b.Property<int>("RulesetID");
+
+                    b.Property<bool>("SpecialStyle");
+
+                    b.Property<float>("StackLeniency");
+
+                    b.Property<double>("StarDifficulty");
+
+                    b.Property<int>("Status");
+
+                    b.Property<string>("StoredBookmarks");
+
+                    b.Property<double>("TimelineZoom");
+
+                    b.Property<string>("Version");
+
+                    b.Property<bool>("WidescreenStoryboard");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("BaseDifficultyID");
+
+                    b.HasIndex("BeatmapSetInfoID");
+
+                    b.HasIndex("Hash");
+
+                    b.HasIndex("MD5Hash");
+
+                    b.HasIndex("MetadataID");
+
+                    b.HasIndex("OnlineBeatmapID")
+                        .IsUnique();
+
+                    b.HasIndex("RulesetID");
+
+                    b.ToTable("BeatmapInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Artist");
+
+                    b.Property<string>("ArtistUnicode");
+
+                    b.Property<string>("AudioFile");
+
+                    b.Property<string>("AuthorString")
+                        .HasColumnName("Author");
+
+                    b.Property<string>("BackgroundFile");
+
+                    b.Property<int>("PreviewTime");
+
+                    b.Property<string>("Source");
+
+                    b.Property<string>("Tags");
+
+                    b.Property<string>("Title");
+
+                    b.Property<string>("TitleUnicode");
+
+                    b.HasKey("ID");
+
+                    b.ToTable("BeatmapMetadata");
+                });
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("BeatmapSetInfoID");
+
+                    b.Property<int>("FileInfoID");
+
+                    b.Property<string>("Filename")
+                        .IsRequired();
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("BeatmapSetInfoID");
+
+                    b.HasIndex("FileInfoID");
+
+                    b.ToTable("BeatmapSetFileInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTimeOffset>("DateAdded");
+
+                    b.Property<bool>("DeletePending");
+
+                    b.Property<string>("Hash");
+
+                    b.Property<int?>("MetadataID");
+
+                    b.Property<int?>("OnlineBeatmapSetID");
+
+                    b.Property<bool>("Protected");
+
+                    b.Property<int>("Status");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("DeletePending");
+
+                    b.HasIndex("Hash")
+                        .IsUnique();
+
+                    b.HasIndex("MetadataID");
+
+                    b.HasIndex("OnlineBeatmapSetID")
+                        .IsUnique();
+
+                    b.ToTable("BeatmapSetInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Key")
+                        .HasColumnName("Key");
+
+                    b.Property<int?>("RulesetID");
+
+                    b.Property<int?>("SkinInfoID");
+
+                    b.Property<string>("StringValue")
+                        .HasColumnName("Value");
+
+                    b.Property<int?>("Variant");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("SkinInfoID");
+
+                    b.HasIndex("RulesetID", "Variant");
+
+                    b.ToTable("Settings");
+                });
+
+            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Hash");
+
+                    b.Property<int>("ReferenceCount");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("Hash")
+                        .IsUnique();
+
+                    b.HasIndex("ReferenceCount");
+
+                    b.ToTable("FileInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("IntAction")
+                        .HasColumnName("Action");
+
+                    b.Property<string>("KeysString")
+                        .HasColumnName("Keys");
+
+                    b.Property<int?>("RulesetID");
+
+                    b.Property<int?>("Variant");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("IntAction");
+
+                    b.HasIndex("RulesetID", "Variant");
+
+                    b.ToTable("KeyBinding");
+                });
+
+            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
+                {
+                    b.Property<int?>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("Available");
+
+                    b.Property<string>("InstantiationInfo");
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("ShortName");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("Available");
+
+                    b.HasIndex("ShortName")
+                        .IsUnique();
+
+                    b.ToTable("RulesetInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("FileInfoID");
+
+                    b.Property<string>("Filename")
+                        .IsRequired();
+
+                    b.Property<int?>("ScoreInfoID");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("FileInfoID");
+
+                    b.HasIndex("ScoreInfoID");
+
+                    b.ToTable("ScoreFileInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<double>("Accuracy")
+                        .HasColumnType("DECIMAL(1,4)");
+
+                    b.Property<int>("BeatmapInfoID");
+
+                    b.Property<int>("Combo");
+
+                    b.Property<DateTimeOffset>("Date");
+
+                    b.Property<bool>("DeletePending");
+
+                    b.Property<string>("Hash");
+
+                    b.Property<int>("MaxCombo");
+
+                    b.Property<string>("ModsJson")
+                        .HasColumnName("Mods");
+
+                    b.Property<long?>("OnlineScoreID");
+
+                    b.Property<double?>("PP");
+
+                    b.Property<int>("Rank");
+
+                    b.Property<int>("RulesetID");
+
+                    b.Property<string>("StatisticsJson")
+                        .HasColumnName("Statistics");
+
+                    b.Property<long>("TotalScore");
+
+                    b.Property<int?>("UserID")
+                        .HasColumnName("UserID");
+
+                    b.Property<string>("UserString")
+                        .HasColumnName("User");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("BeatmapInfoID");
+
+                    b.HasIndex("OnlineScoreID")
+                        .IsUnique();
+
+                    b.HasIndex("RulesetID");
+
+                    b.ToTable("ScoreInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("FileInfoID");
+
+                    b.Property<string>("Filename")
+                        .IsRequired();
+
+                    b.Property<int>("SkinInfoID");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("FileInfoID");
+
+                    b.HasIndex("SkinInfoID");
+
+                    b.ToTable("SkinFileInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Creator");
+
+                    b.Property<bool>("DeletePending");
+
+                    b.Property<string>("Hash");
+
+                    b.Property<string>("InstantiationInfo");
+
+                    b.Property<string>("Name");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("DeletePending");
+
+                    b.HasIndex("Hash")
+                        .IsUnique();
+
+                    b.ToTable("SkinInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
+                {
+                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
+                        .WithMany()
+                        .HasForeignKey("BaseDifficultyID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
+                        .WithMany("Beatmaps")
+                        .HasForeignKey("BeatmapSetInfoID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
+                        .WithMany("Beatmaps")
+                        .HasForeignKey("MetadataID");
+
+                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
+                        .WithMany()
+                        .HasForeignKey("RulesetID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
+                {
+                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
+                        .WithMany("Files")
+                        .HasForeignKey("BeatmapSetInfoID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
+                        .WithMany()
+                        .HasForeignKey("FileInfoID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
+                {
+                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
+                        .WithMany("BeatmapSets")
+                        .HasForeignKey("MetadataID");
+                });
+
+            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
+                {
+                    b.HasOne("osu.Game.Skinning.SkinInfo")
+                        .WithMany("Settings")
+                        .HasForeignKey("SkinInfoID");
+                });
+
+            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
+                {
+                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
+                        .WithMany()
+                        .HasForeignKey("FileInfoID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("osu.Game.Scoring.ScoreInfo")
+                        .WithMany("Files")
+                        .HasForeignKey("ScoreInfoID");
+                });
+
+            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
+                {
+                    b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "Beatmap")
+                        .WithMany("Scores")
+                        .HasForeignKey("BeatmapInfoID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
+                        .WithMany()
+                        .HasForeignKey("RulesetID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
+                {
+                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
+                        .WithMany()
+                        .HasForeignKey("FileInfoID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("osu.Game.Skinning.SkinInfo")
+                        .WithMany("Files")
+                        .HasForeignKey("SkinInfoID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.cs b/osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.cs
new file mode 100644
index 0000000000..1d5b0769a4
--- /dev/null
+++ b/osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.cs
@@ -0,0 +1,22 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace osu.Game.Migrations
+{
+    public partial class AddSkinInstantiationInfo : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "InstantiationInfo",
+                table: "SkinInfo",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "InstantiationInfo",
+                table: "SkinInfo");
+        }
+    }
+}
diff --git a/osu.Game/Migrations/OsuDbContextModelSnapshot.cs b/osu.Game/Migrations/OsuDbContextModelSnapshot.cs
index ec4461ca56..d4bde50b60 100644
--- a/osu.Game/Migrations/OsuDbContextModelSnapshot.cs
+++ b/osu.Game/Migrations/OsuDbContextModelSnapshot.cs
@@ -141,8 +141,6 @@ namespace osu.Game.Migrations
 
                     b.Property<string>("TitleUnicode");
 
-                    b.Property<string>("VideoFile");
-
                     b.HasKey("ID");
 
                     b.ToTable("BeatmapMetadata");
@@ -352,7 +350,7 @@ namespace osu.Game.Migrations
 
                     b.Property<long>("TotalScore");
 
-                    b.Property<long?>("UserID")
+                    b.Property<int?>("UserID")
                         .HasColumnName("UserID");
 
                     b.Property<string>("UserString")
@@ -402,6 +400,8 @@ namespace osu.Game.Migrations
 
                     b.Property<string>("Hash");
 
+                    b.Property<string>("InstantiationInfo");
+
                     b.Property<string>("Name");
 
                     b.HasKey("ID");
diff --git a/osu.Game/Skinning/DefaultLegacySkin.cs b/osu.Game/Skinning/DefaultLegacySkin.cs
index 4027cc650d..564be8630e 100644
--- a/osu.Game/Skinning/DefaultLegacySkin.cs
+++ b/osu.Game/Skinning/DefaultLegacySkin.cs
@@ -10,7 +10,12 @@ namespace osu.Game.Skinning
     public class DefaultLegacySkin : LegacySkin
     {
         public DefaultLegacySkin(IResourceStore<byte[]> storage, IStorageResourceProvider resources)
-            : base(Info, storage, resources, string.Empty)
+            : this(Info, storage, resources)
+        {
+        }
+
+        public DefaultLegacySkin(SkinInfo skin, IResourceStore<byte[]> storage, IStorageResourceProvider resources)
+            : base(skin, storage, resources, string.Empty)
         {
             Configuration.CustomColours["SliderBall"] = new Color4(2, 170, 255, 255);
             Configuration.AddComboColours(
@@ -27,7 +32,8 @@ namespace osu.Game.Skinning
         {
             ID = SkinInfo.CLASSIC_SKIN, // this is temporary until database storage is decided upon.
             Name = "osu!classic",
-            Creator = "team osu!"
+            Creator = "team osu!",
+            InstantiationInfo = typeof(DefaultLegacySkin).AssemblyQualifiedName,
         };
     }
 }
diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index ef3dffe59c..1c063b6ef2 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
 using osu.Game.Extensions;
+using osu.Game.IO;
 using osu.Game.Screens.Play.HUD;
 using osuTK;
 using osuTK.Graphics;
@@ -18,8 +19,13 @@ namespace osu.Game.Skinning
 {
     public class DefaultSkin : Skin
     {
-        public DefaultSkin()
-            : base(SkinInfo.Default, null)
+        public DefaultSkin(IStorageResourceProvider resources)
+            : this(SkinInfo.Default, resources)
+        {
+        }
+
+        public DefaultSkin(SkinInfo skin, IStorageResourceProvider resources)
+            : base(skin, resources)
         {
             Configuration = new DefaultSkinConfiguration();
         }
diff --git a/osu.Game/Skinning/SkinInfo.cs b/osu.Game/Skinning/SkinInfo.cs
index aaccbefb3d..2e29808cb4 100644
--- a/osu.Game/Skinning/SkinInfo.cs
+++ b/osu.Game/Skinning/SkinInfo.cs
@@ -3,8 +3,11 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using osu.Framework.IO.Stores;
 using osu.Game.Configuration;
 using osu.Game.Database;
+using osu.Game.IO;
 
 namespace osu.Game.Skinning
 {
@@ -22,7 +25,35 @@ namespace osu.Game.Skinning
 
         public string Creator { get; set; }
 
-        public List<SkinFileInfo> Files { get; set; }
+        private string instantiationInfo;
+
+        public string InstantiationInfo
+        {
+            get => instantiationInfo;
+            set => instantiationInfo = abbreviateInstantiationInfo(value);
+        }
+
+        private string abbreviateInstantiationInfo(string value)
+        {
+            // exclude version onwards, matching only on namespace and type.
+            // this is mainly to allow for new versions of already loaded rulesets to "upgrade" from old.
+            return string.Join(',', value.Split(',').Take(2));
+        }
+
+        public virtual Skin CreateInstance(IResourceStore<byte[]> legacyDefaultResources, IStorageResourceProvider resources)
+        {
+            var type = string.IsNullOrEmpty(InstantiationInfo)
+                // handle the case of skins imported before InstantiationInfo was added.
+                ? typeof(LegacySkin)
+                : Type.GetType(InstantiationInfo);
+
+            if (type == typeof(DefaultLegacySkin))
+                return (Skin)Activator.CreateInstance(type, this, legacyDefaultResources, resources);
+
+            return (Skin)Activator.CreateInstance(type, this, resources);
+        }
+
+        public List<SkinFileInfo> Files { get; set; } = new List<SkinFileInfo>();
 
         public List<DatabasedSetting> Settings { get; set; }
 
@@ -32,7 +63,8 @@ namespace osu.Game.Skinning
         {
             ID = DEFAULT_SKIN,
             Name = "osu!lazer",
-            Creator = "team osu!"
+            Creator = "team osu!",
+            InstantiationInfo = typeof(DefaultSkin).AssemblyQualifiedName,
         };
 
         public bool Equals(SkinInfo other) => other != null && ID == other.ID;
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index f9e22c9c89..2ea236e44f 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Skinning
 
         private readonly IResourceStore<byte[]> legacyDefaultResources;
 
-        public readonly Bindable<Skin> CurrentSkin = new Bindable<Skin>(new DefaultSkin());
+        public readonly Bindable<Skin> CurrentSkin = new Bindable<Skin>(new DefaultSkin(null));
         public readonly Bindable<SkinInfo> CurrentSkinInfo = new Bindable<SkinInfo>(SkinInfo.Default) { Default = SkinInfo.Default };
 
         public override IEnumerable<string> HandledExtensions => new[] { ".osk" };
@@ -108,7 +108,7 @@ namespace osu.Game.Skinning
         {
             // we need to populate early to create a hash based off skin.ini contents
             if (item.Name?.Contains(".osk", StringComparison.OrdinalIgnoreCase) == true)
-                populateMetadata(item);
+                populateMetadata(item, GetSkin(item));
 
             if (item.Creator != null && item.Creator != unknown_creator_string)
             {
@@ -125,18 +125,20 @@ namespace osu.Game.Skinning
         {
             await base.Populate(model, archive, cancellationToken).ConfigureAwait(false);
 
+            var instance = GetSkin(model);
+
+            model.InstantiationInfo ??= instance.GetType().AssemblyQualifiedName;
+
             if (model.Name?.Contains(".osk", StringComparison.OrdinalIgnoreCase) == true)
-                populateMetadata(model);
+                populateMetadata(model, instance);
         }
 
-        private void populateMetadata(SkinInfo item)
+        private void populateMetadata(SkinInfo item, Skin instance)
         {
-            Skin reference = GetSkin(item);
-
-            if (!string.IsNullOrEmpty(reference.Configuration.SkinInfo.Name))
+            if (!string.IsNullOrEmpty(instance.Configuration.SkinInfo.Name))
             {
-                item.Name = reference.Configuration.SkinInfo.Name;
-                item.Creator = reference.Configuration.SkinInfo.Creator;
+                item.Name = instance.Configuration.SkinInfo.Name;
+                item.Creator = instance.Configuration.SkinInfo.Creator;
             }
             else
             {
@@ -150,7 +152,7 @@ namespace osu.Game.Skinning
         /// </summary>
         /// <param name="skinInfo">The skin to lookup.</param>
         /// <returns>A <see cref="Skin"/> instance correlating to the provided <see cref="SkinInfo"/>.</returns>
-        public Skin GetSkin(SkinInfo skinInfo)
+        public Skin GetSkin(SkinInfo skinInfo) => skinInfo.CreateInstance(legacyDefaultResources, this);
         {
             if (skinInfo == SkinInfo.Default)
                 return new DefaultSkin();

From a7e83aacfb2b01201f7f8d87f584fbc871c30b3e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 17:00:56 +0900
Subject: [PATCH 3285/3722] Ensure default skins are copied before modifying

---
 osu.Game/Skinning/Editor/SkinEditor.cs | 30 ++++++++++++--------------
 osu.Game/Skinning/SkinManager.cs       | 26 ++++++++++++++--------
 2 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 6b7d289284..90b003153b 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -4,6 +4,7 @@
 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.Input.Events;
@@ -30,6 +31,8 @@ namespace osu.Game.Skinning.Editor
         [Resolved]
         private SkinManager skins { get; set; }
 
+        private Bindable<Skin> currentSkin;
+
         public SkinEditor(Drawable targetScreen)
         {
             this.targetScreen = targetScreen;
@@ -119,23 +122,25 @@ namespace osu.Game.Skinning.Editor
         protected override void LoadComplete()
         {
             base.LoadComplete();
+
             Show();
+
+            // as long as the skin editor is loaded, let's make sure we can modify the current skin.
+            currentSkin = skins.CurrentSkin.GetBoundCopy();
+
+            // schedule ensures this only happens when the skin editor is visible.
+            // also avoid some weird endless recursion / bindable feedback loop (something to do with tracking skins across three different bindable types).
+            // probably something which will be factored out in a future database refactor so not too concerning for now.
+            currentSkin.BindValueChanged(skin => Scheduler.AddOnce(skins.EnsureMutableSkin), true);
         }
 
         private void revert()
         {
-            var currentSkin = skins.CurrentSkin.Value;
-
-            var legacySkin = currentSkin as LegacySkin;
-
-            if (legacySkin == null)
-                return;
-
             SkinnableElementTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableElementTargetContainer>().ToArray();
 
             foreach (var t in targetContainers)
             {
-                legacySkin.ResetDrawableTarget(t);
+                currentSkin.Value.ResetDrawableTarget(t);
 
                 // add back default components
                 getTarget(t.Target).Reload();
@@ -144,17 +149,10 @@ namespace osu.Game.Skinning.Editor
 
         private void save()
         {
-            var currentSkin = skins.CurrentSkin.Value;
-
-            var legacySkin = currentSkin as LegacySkin;
-
-            if (legacySkin == null)
-                return;
-
             SkinnableElementTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableElementTargetContainer>().ToArray();
 
             foreach (var t in targetContainers)
-                legacySkin.UpdateDrawableTarget(t);
+                currentSkin.Value.UpdateDrawableTarget(t);
 
             skins.Save(skins.CurrentSkin.Value);
         }
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 2ea236e44f..63d7e4f86f 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -153,22 +153,30 @@ namespace osu.Game.Skinning
         /// <param name="skinInfo">The skin to lookup.</param>
         /// <returns>A <see cref="Skin"/> instance correlating to the provided <see cref="SkinInfo"/>.</returns>
         public Skin GetSkin(SkinInfo skinInfo) => skinInfo.CreateInstance(legacyDefaultResources, this);
+
+        /// <summary>
+        /// Ensure that the current skin is in a state it can accept user modifications.
+        /// This will create a copy of any internal skin and being tracking in the database if not already.
+        /// </summary>
+        public void EnsureMutableSkin()
         {
-            if (skinInfo == SkinInfo.Default)
-                return new DefaultSkin();
+            if (CurrentSkinInfo.Value.ID >= 1) return;
 
-            if (skinInfo == DefaultLegacySkin.Info)
-                return new DefaultLegacySkin(legacyDefaultResources, this);
+            var skin = CurrentSkin.Value;
 
-            return new LegacySkin(skinInfo, this);
+            // if the user is attempting to save one of the default skin implementations, create a copy first.
+            CurrentSkinInfo.Value = Import(new SkinInfo
+            {
+                Name = skin.SkinInfo.Name + " (modified)",
+                Creator = skin.SkinInfo.Creator,
+                InstantiationInfo = skin.SkinInfo.InstantiationInfo,
+            }).Result;
         }
 
         public void Save(Skin skin)
         {
-            // some skins don't support saving just yet.
-            // eventually we will want to create a copy of the skin to allow for customisation.
-            if (skin.SkinInfo.Files == null)
-                return;
+            if (skin.SkinInfo.ID <= 0)
+                throw new InvalidOperationException($"Attempting to save a skin which is not yet tracked. Call {nameof(EnsureMutableSkin)} first.");
 
             foreach (var drawableInfo in skin.DrawableComponentInfo)
             {

From 61ea3f2e6410980341803eb2c4548e917229ee3e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 17:08:32 +0900
Subject: [PATCH 3286/3722] Remove unnecessary test step creating needless
 skins

---
 osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
index b0edc0dd68..73da76df78 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
@@ -22,13 +22,6 @@ namespace osu.Game.Tests.Visual.Gameplay
         [SetUpSteps]
         public override void SetUpSteps()
         {
-            AddStep("set empty legacy skin", () =>
-            {
-                var imported = skinManager.Import(new SkinInfo { Name = "test skin" }).Result;
-
-                skinManager.CurrentSkinInfo.Value = imported;
-            });
-
             base.SetUpSteps();
 
             AddStep("reload skin editor", () =>

From a88a8b7d8d504cf981bbcd65c1d81ba9a69a6320 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 17:48:08 +0900
Subject: [PATCH 3287/3722] Use `ISkinnableComponent` wherever possible (and
 expose as `BindableList`)

---
 .../HUD/SkinnableElementTargetContainer.cs    | 32 +++++++++++++++----
 osu.Game/Screens/Play/HUDOverlay.cs           | 32 +++++++++----------
 osu.Game/Skinning/ISkinnableTarget.cs         |  4 +--
 osu.Game/Skinning/SkinnableTargetWrapper.cs   |  2 +-
 4 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs b/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
index 051ab9ad3c..b2f6d32927 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.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 System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Extensions;
 using osu.Game.Skinning;
@@ -15,30 +17,46 @@ namespace osu.Game.Screens.Play.HUD
 
         public SkinnableTarget Target { get; }
 
+        public IBindableList<ISkinnableComponent> Components => components;
+
+        private readonly BindableList<ISkinnableComponent> components = new BindableList<ISkinnableComponent>();
+
         public SkinnableElementTargetContainer(SkinnableTarget target)
         {
             Target = target;
         }
 
-        public IReadOnlyList<Drawable> Children => content?.Children;
-
         public void Reload()
         {
+            ClearInternal();
+            components.Clear();
+
             content = CurrentSkin.GetDrawableComponent(new SkinnableTargetComponent(Target)) as SkinnableTargetWrapper;
 
-            ClearInternal();
-
             if (content != null)
-                LoadComponentAsync(content, AddInternal);
+            {
+                LoadComponentAsync(content, wrapper =>
+                {
+                    AddInternal(wrapper);
+                    components.AddRange(wrapper.Children.OfType<ISkinnableComponent>());
+                });
+            }
         }
 
-        public void Add(Drawable drawable)
+        public void Add(ISkinnableComponent component)
         {
+            if (content == null)
+                throw new NotSupportedException("Attempting to add a new component to a target container which is not supported by the current skin.");
+
+            if (!(component is Drawable drawable))
+                throw new ArgumentException("Provided argument must be of type {nameof(ISkinnableComponent)}.", nameof(drawable));
+
             content.Add(drawable);
+            components.Add(component);
         }
 
         public IEnumerable<SkinnableInfo> CreateSerialisedChildren() =>
-            content.Select(d => d.CreateSerialisedInformation());
+            components.Select(d => ((Drawable)d).CreateSerialisedInformation());
 
         protected override void SkinChanged(ISkinSource skin, bool allowFallback)
         {
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index c4a8860bb6..887346b5df 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.EnumExtensions;
@@ -207,27 +208,24 @@ namespace osu.Game.Screens.Play
 
             Vector2 lowestScreenSpace = Vector2.Zero;
 
-            // TODO: may be null during skin switching. not sure if there's a better way of exposing these children.
-            if (mainComponents.Children != null)
+            // LINQ cast can be removed when IDrawable interface includes Anchor / RelativeSizeAxes.
+            foreach (var element in mainComponents.Components.Cast<Drawable>())
             {
-                foreach (var element in mainComponents.Children)
-                {
-                    // for now align top-right components with the bottom-edge of the lowest top-anchored hud element.
-                    if (!element.Anchor.HasFlagFast(Anchor.TopRight) && !element.RelativeSizeAxes.HasFlagFast(Axes.X))
-                        continue;
+                // for now align top-right components with the bottom-edge of the lowest top-anchored hud element.
+                if (!element.Anchor.HasFlagFast(Anchor.TopRight) && !element.RelativeSizeAxes.HasFlagFast(Axes.X))
+                    continue;
 
-                    // health bars are excluded for the sake of hacky legacy skins which extend the health bar to take up the full screen area.
-                    if (element is LegacyHealthDisplay)
-                        continue;
+                // health bars are excluded for the sake of hacky legacy skins which extend the health bar to take up the full screen area.
+                if (element is LegacyHealthDisplay)
+                    continue;
 
-                    var bottomRight = element.ScreenSpaceDrawQuad.BottomRight;
-                    if (bottomRight.Y > lowestScreenSpace.Y)
-                        lowestScreenSpace = bottomRight;
-                }
-
-                topRightElements.Y = TopScoringElementsHeight = ToLocalSpace(lowestScreenSpace).Y;
-                bottomRightElements.Y = -Progress.Height;
+                var bottomRight = element.ScreenSpaceDrawQuad.BottomRight;
+                if (bottomRight.Y > lowestScreenSpace.Y)
+                    lowestScreenSpace = bottomRight;
             }
+
+            topRightElements.Y = TopScoringElementsHeight = ToLocalSpace(lowestScreenSpace).Y;
+            bottomRightElements.Y = -Progress.Height;
         }
 
         private void updateVisibility()
diff --git a/osu.Game/Skinning/ISkinnableTarget.cs b/osu.Game/Skinning/ISkinnableTarget.cs
index 2379fd4247..4d97b42e8e 100644
--- a/osu.Game/Skinning/ISkinnableTarget.cs
+++ b/osu.Game/Skinning/ISkinnableTarget.cs
@@ -1,8 +1,6 @@
 // Copyright (c) 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.Skinning
 {
     /// <summary>
@@ -20,6 +18,6 @@ namespace osu.Game.Skinning
         /// <summary>
         /// Add the provided item to this target.
         /// </summary>
-        public void Add(Drawable drawable);
+        public void Add(ISkinnableComponent drawable);
     }
 }
diff --git a/osu.Game/Skinning/SkinnableTargetWrapper.cs b/osu.Game/Skinning/SkinnableTargetWrapper.cs
index a0df610488..0d16775f51 100644
--- a/osu.Game/Skinning/SkinnableTargetWrapper.cs
+++ b/osu.Game/Skinning/SkinnableTargetWrapper.cs
@@ -8,7 +8,7 @@ using osu.Framework.Graphics.Containers;
 namespace osu.Game.Skinning
 {
     /// <summary>
-    /// A container which is serialised and can encapsulate multiple skinnable elements into a single return type.
+    /// A container which is serialised and can encapsulate multiple skinnable elements into a single return type (for consumption via <see cref="ISkin.GetDrawableComponent"/>.
     /// Will also optionally apply default cross-element layout dependencies when initialised from a non-deserialised source.
     /// </summary>
     public class SkinnableTargetWrapper : Container, ISkinSerialisable

From a4e052961770c3eb98408393ad198287ebcb0766 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 17:49:00 +0900
Subject: [PATCH 3288/3722] Replace polling logic with direct bindable
 reactions

---
 .../Compose/Components/BlueprintContainer.cs  | 23 +++++++++
 .../Components/EditorBlueprintContainer.cs    | 22 +--------
 .../Skinning/Editor/SkinBlueprintContainer.cs | 49 ++++++++++++++++---
 osu.Game/Skinning/Editor/SkinEditor.cs        | 15 +++++-
 4 files changed, 78 insertions(+), 31 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 361e98e0dd..edd1acbd6c 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -3,9 +3,11 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
@@ -24,6 +26,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
     /// Includes selection and manipulation support via a <see cref="Components.SelectionHandler{T}"/>.
     /// </summary>
     public abstract class BlueprintContainer<T> : CompositeDrawable, IKeyBindingHandler<PlatformAction>
+        where T : class
     {
         protected DragBox DragBox { get; private set; }
 
@@ -39,6 +42,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [Resolved(CanBeNull = true)]
         private IEditorChangeHandler changeHandler { get; set; }
 
+        protected readonly BindableList<T> SelectedItems = new BindableList<T>();
+
         protected BlueprintContainer()
         {
             RelativeSizeAxes = Axes.Both;
@@ -47,6 +52,24 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [BackgroundDependencyLoader]
         private void load()
         {
+            SelectedItems.CollectionChanged += (selectedObjects, args) =>
+            {
+                switch (args.Action)
+                {
+                    case NotifyCollectionChangedAction.Add:
+                        foreach (var o in args.NewItems)
+                            SelectionBlueprints.FirstOrDefault(b => b.Item == o)?.Select();
+
+                        break;
+
+                    case NotifyCollectionChangedAction.Remove:
+                        foreach (var o in args.OldItems)
+                            SelectionBlueprints.FirstOrDefault(b => b.Item == o)?.Deselect();
+
+                        break;
+                }
+            };
+
             SelectionHandler = CreateSelectionHandler();
             SelectionHandler.DeselectAll = deselectAll;
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
index db322faf65..31a191c80c 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
@@ -2,10 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
@@ -24,8 +22,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected readonly HitObjectComposer Composer;
 
-        private readonly BindableList<HitObject> selectedHitObjects = new BindableList<HitObject>();
-
         protected EditorBlueprintContainer(HitObjectComposer composer)
         {
             Composer = composer;
@@ -34,23 +30,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [BackgroundDependencyLoader]
         private void load()
         {
-            selectedHitObjects.BindTo(Beatmap.SelectedHitObjects);
-            selectedHitObjects.CollectionChanged += (selectedObjects, args) =>
-            {
-                switch (args.Action)
-                {
-                    case NotifyCollectionChangedAction.Add:
-                        foreach (var o in args.NewItems)
-                            SelectionBlueprints.FirstOrDefault(b => b.Item == o)?.Select();
-                        break;
-
-                    case NotifyCollectionChangedAction.Remove:
-                        foreach (var o in args.OldItems)
-                            SelectionBlueprints.FirstOrDefault(b => b.Item == o)?.Deselect();
-
-                        break;
-                }
-            };
+            SelectedItems.BindTo(Beatmap.SelectedHitObjects);
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
index 45e541abf0..bc1ea02090 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
@@ -1,11 +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.Collections.Specialized;
 using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Edit.Compose.Components;
+using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Skinning.Editor
 {
@@ -18,23 +23,51 @@ namespace osu.Game.Skinning.Editor
             this.target = target;
         }
 
+        [BackgroundDependencyLoader(true)]
+        private void load(SkinEditor editor)
+        {
+            SelectedItems.BindTo(editor.SelectedComponents);
+        }
+
+        private readonly List<BindableList<ISkinnableComponent>> targetComponents = new List<BindableList<ISkinnableComponent>>();
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            checkForComponents();
+            // track each target container on the current screen.
+            foreach (var targetContainer in target.ChildrenOfType<SkinnableElementTargetContainer>())
+            {
+                var bindableList = new BindableList<ISkinnableComponent> { BindTarget = targetContainer.Components };
+                bindableList.BindCollectionChanged(componentsChanged, true);
+
+                targetComponents.Add(bindableList);
+            }
         }
 
-        private void checkForComponents()
+        private void componentsChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
-            ISkinnableComponent[] skinnableComponents = target.ChildrenOfType<ISkinnableComponent>().ToArray();
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    foreach (var item in e.NewItems.Cast<ISkinnableComponent>())
+                        AddBlueprintFor(item);
+                    break;
 
-            foreach (var c in skinnableComponents)
-                AddBlueprintFor(c);
+                case NotifyCollectionChangedAction.Remove:
+                case NotifyCollectionChangedAction.Reset:
+                    foreach (var item in e.OldItems.Cast<ISkinnableComponent>())
+                        RemoveBlueprintFor(item);
+                    break;
 
-            // We'd hope to eventually be running this in a more sensible way, but this handles situations where new drawables become present (ie. during ongoing gameplay)
-            // or when drawables in the target are loaded asynchronously and may not be immediately available when this BlueprintContainer is loaded.
-            Scheduler.AddDelayed(checkForComponents, 1000);
+                case NotifyCollectionChangedAction.Replace:
+                    foreach (var item in e.OldItems.Cast<ISkinnableComponent>())
+                        RemoveBlueprintFor(item);
+
+                    foreach (var item in e.NewItems.Cast<ISkinnableComponent>())
+                        AddBlueprintFor(item);
+                    break;
+            }
         }
 
         protected override SelectionHandler<ISkinnableComponent> CreateSelectionHandler() => new SkinSelectionHandler();
diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 90b003153b..b098136eda 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -18,6 +18,7 @@ using osuTK;
 
 namespace osu.Game.Skinning.Editor
 {
+    [Cached(typeof(SkinEditor))]
     public class SkinEditor : FocusedOverlayContainer
     {
         public const double TRANSITION_DURATION = 500;
@@ -28,11 +29,15 @@ namespace osu.Game.Skinning.Editor
 
         protected override bool StartHidden => true;
 
+        public readonly BindableList<ISkinnableComponent> SelectedComponents = new BindableList<ISkinnableComponent>();
+
         [Resolved]
         private SkinManager skins { get; set; }
 
         private Bindable<Skin> currentSkin;
 
+        private SkinBlueprintContainer blueprintContainer;
+
         public SkinEditor(Drawable targetScreen)
         {
             this.targetScreen = targetScreen;
@@ -56,7 +61,7 @@ namespace osu.Game.Skinning.Editor
                         Origin = Anchor.TopCentre,
                         RelativeSizeAxes = Axes.X
                     },
-                    new SkinBlueprintContainer(targetScreen),
+                    blueprintContainer = new SkinBlueprintContainer(targetScreen),
                     new SkinComponentToolbox(600)
                     {
                         Anchor = Anchor.CentreLeft,
@@ -109,9 +114,15 @@ namespace osu.Game.Skinning.Editor
 
         private void placeComponent(Type type)
         {
-            Drawable instance = (Drawable)Activator.CreateInstance(type);
+            var instance = (Drawable)Activator.CreateInstance(type) as ISkinnableComponent;
+
+            if (instance == null)
+                throw new InvalidOperationException("Attempted to instantiate a component for placement which was not an {typeof(ISkinnableComponent)}.");
 
             getTarget(SkinnableTarget.MainHUDComponents)?.Add(instance);
+
+            SelectedComponents.Clear();
+            SelectedComponents.Add(instance);
         }
 
         private ISkinnableTarget getTarget(SkinnableTarget target)

From 1831f581aa15f14f4cd01bf73122dedc5a5d804b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 18:07:58 +0900
Subject: [PATCH 3289/3722] Add basic metadata display and remove outdated
 message about not saving

---
 osu.Game/Skinning/Editor/SkinEditor.cs | 55 ++++++++++++++++----------
 1 file changed, 35 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index b098136eda..0e243d1a02 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -36,7 +36,8 @@ namespace osu.Game.Skinning.Editor
 
         private Bindable<Skin> currentSkin;
 
-        private SkinBlueprintContainer blueprintContainer;
+        [Resolved]
+        private OsuColour colours { get; set; }
 
         public SkinEditor(Drawable targetScreen)
         {
@@ -46,7 +47,7 @@ namespace osu.Game.Skinning.Editor
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load()
         {
             InternalChild = new OsuContextMenuContainer
             {
@@ -61,7 +62,7 @@ namespace osu.Game.Skinning.Editor
                         Origin = Anchor.TopCentre,
                         RelativeSizeAxes = Axes.X
                     },
-                    blueprintContainer = new SkinBlueprintContainer(targetScreen),
+                    new SkinBlueprintContainer(targetScreen),
                     new SkinComponentToolbox(600)
                     {
                         Anchor = Anchor.CentreLeft,
@@ -103,13 +104,42 @@ namespace osu.Game.Skinning.Editor
                     },
                 }
             };
+        }
 
-            headerText.AddParagraph("Skin editor (preview)", cp => cp.Font = OsuFont.Default.With(size: 24));
-            headerText.AddParagraph("This is a preview of what is to come. Changes are lost on changing screens.", cp =>
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Show();
+
+            // as long as the skin editor is loaded, let's make sure we can modify the current skin.
+            currentSkin = skins.CurrentSkin.GetBoundCopy();
+
+            // schedule ensures this only happens when the skin editor is visible.
+            // also avoid some weird endless recursion / bindable feedback loop (something to do with tracking skins across three different bindable types).
+            // probably something which will be factored out in a future database refactor so not too concerning for now.
+            currentSkin.BindValueChanged(skin => Scheduler.AddOnce(skinChanged), true);
+        }
+
+        private void skinChanged()
+        {
+            headerText.Clear();
+
+            headerText.AddParagraph("Skin editor", cp => cp.Font = OsuFont.Default.With(size: 24));
+            headerText.NewParagraph();
+            headerText.AddText("Currently editing ", cp =>
             {
                 cp.Font = OsuFont.Default.With(size: 12);
                 cp.Colour = colours.Yellow;
             });
+
+            headerText.AddText($"{currentSkin.Value.SkinInfo}", cp =>
+            {
+                cp.Font = OsuFont.Default.With(size: 12, weight: FontWeight.Bold);
+                cp.Colour = colours.Yellow;
+            });
+
+            skins.EnsureMutableSkin();
         }
 
         private void placeComponent(Type type)
@@ -130,21 +160,6 @@ namespace osu.Game.Skinning.Editor
             return targetScreen.ChildrenOfType<ISkinnableTarget>().FirstOrDefault(c => c.Target == target);
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            Show();
-
-            // as long as the skin editor is loaded, let's make sure we can modify the current skin.
-            currentSkin = skins.CurrentSkin.GetBoundCopy();
-
-            // schedule ensures this only happens when the skin editor is visible.
-            // also avoid some weird endless recursion / bindable feedback loop (something to do with tracking skins across three different bindable types).
-            // probably something which will be factored out in a future database refactor so not too concerning for now.
-            currentSkin.BindValueChanged(skin => Scheduler.AddOnce(skins.EnsureMutableSkin), true);
-        }
-
         private void revert()
         {
             SkinnableElementTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableElementTargetContainer>().ToArray();

From 6d587dc39229c8150e6f563ec5122b81115f5edc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 18:17:05 +0900
Subject: [PATCH 3290/3722] Adjust target size slightly to better align with
 the screen

---
 osu.Game/Skinning/Editor/SkinEditorOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/Editor/SkinEditorOverlay.cs b/osu.Game/Skinning/Editor/SkinEditorOverlay.cs
index cc989bb459..cbed498a38 100644
--- a/osu.Game/Skinning/Editor/SkinEditorOverlay.cs
+++ b/osu.Game/Skinning/Editor/SkinEditorOverlay.cs
@@ -71,7 +71,7 @@ namespace osu.Game.Skinning.Editor
                 target.RelativePositionAxes = Axes.Both;
 
                 target.ScaleTo(VISIBLE_TARGET_SCALE, SkinEditor.TRANSITION_DURATION, Easing.OutQuint);
-                target.MoveToX(0.1f, SkinEditor.TRANSITION_DURATION, Easing.OutQuint);
+                target.MoveToX(0.095f, SkinEditor.TRANSITION_DURATION, Easing.OutQuint);
             }
             else
             {

From f55407f871a94a5846270f947b1326ecdb9de8bf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 18:37:41 +0900
Subject: [PATCH 3291/3722] Show a message when attempting to customisse a
 screen which doesn't support it

---
 osu.Game/Screens/ScreenWhiteBox.cs            | 24 ++---
 .../Skinning/Editor/SkinBlueprintContainer.cs | 14 ++-
 osu.Game/Skinning/Editor/SkinEditor.cs        | 90 ++++++++++++-------
 3 files changed, 81 insertions(+), 47 deletions(-)

diff --git a/osu.Game/Screens/ScreenWhiteBox.cs b/osu.Game/Screens/ScreenWhiteBox.cs
index 3d8fd5dad7..cf0c183766 100644
--- a/osu.Game/Screens/ScreenWhiteBox.cs
+++ b/osu.Game/Screens/ScreenWhiteBox.cs
@@ -87,9 +87,9 @@ namespace osu.Game.Screens
         private static Color4 getColourFor(object type)
         {
             int hash = type.GetHashCode();
-            byte r = (byte)Math.Clamp(((hash & 0xFF0000) >> 16) * 0.8f, 20, 255);
-            byte g = (byte)Math.Clamp(((hash & 0x00FF00) >> 8) * 0.8f, 20, 255);
-            byte b = (byte)Math.Clamp((hash & 0x0000FF) * 0.8f, 20, 255);
+            byte r = (byte)Math.Clamp(((hash & 0xFF0000) >> 16) * 2, 128, 255);
+            byte g = (byte)Math.Clamp(((hash & 0x00FF00) >> 8) * 2, 128, 255);
+            byte b = (byte)Math.Clamp((hash & 0x0000FF) * 2, 128, 255);
             return new Color4(r, g, b, 255);
         }
 
@@ -109,10 +109,10 @@ namespace osu.Game.Screens
 
             private readonly Container boxContainer;
 
-            public UnderConstructionMessage(string name)
+            public UnderConstructionMessage(string name, string description = "is not yet ready for use!")
             {
-                RelativeSizeAxes = Axes.Both;
-                Size = new Vector2(0.3f);
+                AutoSizeAxes = Axes.Both;
+
                 Anchor = Anchor.Centre;
                 Origin = Anchor.Centre;
 
@@ -124,7 +124,7 @@ namespace osu.Game.Screens
                     {
                         CornerRadius = 20,
                         Masking = true,
-                        RelativeSizeAxes = Axes.Both,
+                        AutoSizeAxes = Axes.Both,
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                         Children = new Drawable[]
@@ -133,15 +133,15 @@ namespace osu.Game.Screens
                             {
                                 RelativeSizeAxes = Axes.Both,
 
-                                Colour = colour,
-                                Alpha = 0.2f,
-                                Blending = BlendingParameters.Additive,
+                                Colour = colour.Darken(0.8f),
+                                Alpha = 0.8f,
                             },
                             TextContainer = new FillFlowContainer
                             {
                                 AutoSizeAxes = Axes.Both,
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
+                                Padding = new MarginPadding(20),
                                 Direction = FillDirection.Vertical,
                                 Children = new Drawable[]
                                 {
@@ -157,14 +157,14 @@ namespace osu.Game.Screens
                                         Anchor = Anchor.TopCentre,
                                         Origin = Anchor.TopCentre,
                                         Text = name,
-                                        Colour = colour.Lighten(0.8f),
+                                        Colour = colour,
                                         Font = OsuFont.GetFont(size: 36),
                                     },
                                     new OsuSpriteText
                                     {
                                         Anchor = Anchor.TopCentre,
                                         Origin = Anchor.TopCentre,
-                                        Text = "is not yet ready for use!",
+                                        Text = description,
                                         Font = OsuFont.GetFont(size: 20),
                                     },
                                     new OsuSpriteText
diff --git a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
index bc1ea02090..ef189ed165 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
@@ -7,8 +7,10 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Rulesets.Edit;
+using osu.Game.Screens;
 using osu.Game.Screens.Edit.Compose.Components;
 using osu.Game.Screens.Play.HUD;
 
@@ -36,7 +38,17 @@ namespace osu.Game.Skinning.Editor
             base.LoadComplete();
 
             // track each target container on the current screen.
-            foreach (var targetContainer in target.ChildrenOfType<SkinnableElementTargetContainer>())
+            var targetContainers = target.ChildrenOfType<SkinnableElementTargetContainer>().ToArray();
+
+            if (targetContainers.Length == 0)
+            {
+                var targetScreen = target.ChildrenOfType<Screen>().LastOrDefault()?.GetType().Name ?? "this screen";
+
+                AddInternal(new ScreenWhiteBox.UnderConstructionMessage(targetScreen, "doesn't support skin customisation just yet."));
+                return;
+            }
+
+            foreach (var targetContainer in targetContainers)
             {
                 var bindableList = new BindableList<ISkinnableComponent> { BindTarget = targetContainer.Components };
                 bindableList.BindCollectionChanged(componentsChanged, true);
diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 0e243d1a02..08fc458b94 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -62,46 +62,68 @@ namespace osu.Game.Skinning.Editor
                         Origin = Anchor.TopCentre,
                         RelativeSizeAxes = Axes.X
                     },
-                    new SkinBlueprintContainer(targetScreen),
-                    new SkinComponentToolbox(600)
+                    new GridContainer
                     {
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                        RequestPlacement = placeComponent
-                    },
-                    new FillFlowContainer
-                    {
-                        Direction = FillDirection.Horizontal,
-                        AutoSizeAxes = Axes.Both,
-                        Anchor = Anchor.TopRight,
-                        Origin = Anchor.TopRight,
-                        Spacing = new Vector2(5),
-                        Padding = new MarginPadding
+                        RelativeSizeAxes = Axes.Both,
+                        ColumnDimensions = new[]
                         {
-                            Top = 10,
-                            Left = 10,
+                            new Dimension(GridSizeMode.AutoSize),
+                            new Dimension()
                         },
-                        Margin = new MarginPadding
+                        Content = new[]
                         {
-                            Right = 10,
-                            Bottom = 10,
-                        },
-                        Children = new Drawable[]
-                        {
-                            new TriangleButton
+                            new Drawable[]
                             {
-                                Text = "Save Changes",
-                                Width = 140,
-                                Action = save,
-                            },
-                            new DangerousTriangleButton
-                            {
-                                Text = "Revert to default",
-                                Width = 140,
-                                Action = revert,
-                            },
+                                new SkinComponentToolbox(600)
+                                {
+                                    Anchor = Anchor.CentreLeft,
+                                    Origin = Anchor.CentreLeft,
+                                    RequestPlacement = placeComponent
+                                },
+                                new Container
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Children = new Drawable[]
+                                    {
+                                        new SkinBlueprintContainer(targetScreen),
+                                        new FillFlowContainer
+                                        {
+                                            Direction = FillDirection.Horizontal,
+                                            AutoSizeAxes = Axes.Both,
+                                            Anchor = Anchor.TopRight,
+                                            Origin = Anchor.TopRight,
+                                            Spacing = new Vector2(5),
+                                            Padding = new MarginPadding
+                                            {
+                                                Top = 10,
+                                                Left = 10,
+                                            },
+                                            Margin = new MarginPadding
+                                            {
+                                                Right = 10,
+                                                Bottom = 10,
+                                            },
+                                            Children = new Drawable[]
+                                            {
+                                                new TriangleButton
+                                                {
+                                                    Text = "Save Changes",
+                                                    Width = 140,
+                                                    Action = save,
+                                                },
+                                                new DangerousTriangleButton
+                                                {
+                                                    Text = "Revert to default",
+                                                    Width = 140,
+                                                    Action = revert,
+                                                },
+                                            }
+                                        },
+                                    }
+                                },
+                            }
                         }
-                    },
+                    }
                 }
             };
         }

From 4bb933e4b111439ac022ed82c713b0197845c469 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 18:55:45 +0900
Subject: [PATCH 3292/3722] Add missing base lookup call to `DefaultSkin`

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

diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index 1c063b6ef2..3de3dc7702 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -36,6 +36,9 @@ namespace osu.Game.Skinning
 
         public override Drawable GetDrawableComponent(ISkinComponent component)
         {
+            if (base.GetDrawableComponent(component) is Drawable c)
+                return c;
+
             switch (component)
             {
                 case SkinnableTargetComponent target:

From 1231c08a0791ec9b739303f29ce3bc2aa9a36906 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 18:58:26 +0900
Subject: [PATCH 3293/3722] Rename mismatching file

---
 .../{IImmutableSkinnableComponent.cs => ISkinSerialisable.cs}     | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename osu.Game/Skinning/{IImmutableSkinnableComponent.cs => ISkinSerialisable.cs} (100%)

diff --git a/osu.Game/Skinning/IImmutableSkinnableComponent.cs b/osu.Game/Skinning/ISkinSerialisable.cs
similarity index 100%
rename from osu.Game/Skinning/IImmutableSkinnableComponent.cs
rename to osu.Game/Skinning/ISkinSerialisable.cs

From 811282a975ca48c91239599c0521dbe60a3811f8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 11 May 2021 19:01:41 +0900
Subject: [PATCH 3294/3722] Add failing test

---
 .../Multiplayer/TestSceneMultiplayer.cs       | 93 +++++++++++++++++++
 .../Multiplayer/TestMultiplayerClient.cs      | 10 +-
 2 files changed, 102 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
index 78bc51e47b..519d76fc93 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
@@ -1,9 +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.Linq;
+using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Platform;
+using osu.Framework.Screens;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Rooms;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.OnlinePlay.Components;
+using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
+using osu.Game.Tests.Beatmaps;
+using osu.Game.Tests.Resources;
+using osu.Game.Users;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
@@ -11,7 +26,85 @@ namespace osu.Game.Tests.Visual.Multiplayer
     {
         private TestMultiplayer multiplayerScreen;
 
+        private BeatmapManager beatmaps;
+        private RulesetStore rulesets;
+        private BeatmapSetInfo importedSet;
+
+        private TestMultiplayerClient client => multiplayerScreen.Client;
+        private Room room => client.APIRoom;
+
         public TestSceneMultiplayer()
+        {
+            loadMultiplayer();
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(GameHost host, AudioManager audio)
+        {
+            Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
+            Dependencies.Cache(beatmaps = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, host, Beatmap.Default));
+            beatmaps.Import(TestResources.GetQuickTestBeatmapForImport()).Wait();
+
+            importedSet = beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.All).First();
+        }
+
+        [Test]
+        public void TestMatchStartWhileSpectatingWithNoBeatmap()
+        {
+            loadMultiplayer();
+
+            AddStep("open room", () =>
+            {
+                multiplayerScreen.OpenNewRoom(new Room
+                {
+                    Name = { Value = "Test Room" },
+                    Playlist =
+                    {
+                        new PlaylistItem
+                        {
+                            Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
+                            Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                        }
+                    }
+                });
+            });
+
+            AddStep("create room", () =>
+            {
+                InputManager.MoveMouseTo(this.ChildrenOfType<MultiplayerMatchSettingsOverlay.CreateOrUpdateButton>().Single());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddUntilStep("wait for join", () => client.Room != null);
+
+            AddStep("join other user (ready, host)", () =>
+            {
+                client.AddUser(new User { Id = MultiplayerTestScene.PLAYER_1_ID, Username = "Other" });
+                client.TransferHost(MultiplayerTestScene.PLAYER_1_ID);
+                client.ChangeUserState(MultiplayerTestScene.PLAYER_1_ID, MultiplayerUserState.Ready);
+            });
+
+            AddStep("change playlist", () =>
+            {
+                room.Playlist.Add(new PlaylistItem
+                {
+                    Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
+                    Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                });
+            });
+
+            AddStep("click spectate button", () =>
+            {
+                InputManager.MoveMouseTo(this.ChildrenOfType<MultiplayerSpectateButton>().Single());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddStep("start match externally", () => client.StartMatch());
+
+            AddAssert("screen not changed", () => multiplayerScreen.IsCurrentScreen());
+        }
+
+        private void loadMultiplayer()
         {
             AddStep("show", () =>
             {
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index de77a15da0..167cf705a7 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
         public override IBindable<bool> IsConnected => isConnected;
         private readonly Bindable<bool> isConnected = new Bindable<bool>(true);
 
+        public Room? APIRoom { get; private set; }
+
         public Action<MultiplayerRoom>? RoomSetupAction;
 
         [Resolved]
@@ -138,10 +140,16 @@ namespace osu.Game.Tests.Visual.Multiplayer
             RoomSetupAction?.Invoke(room);
             RoomSetupAction = null;
 
+            APIRoom = apiRoom;
+
             return Task.FromResult(room);
         }
 
-        protected override Task LeaveRoomInternal() => Task.CompletedTask;
+        protected override Task LeaveRoomInternal()
+        {
+            APIRoom = null;
+            return Task.CompletedTask;
+        }
 
         public override Task TransferHost(int userId) => ((IMultiplayerClient)this).HostChanged(userId);
 

From 7fe8737d9437073a6c6137483d6c9be48cf3c9c4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 11 May 2021 19:21:44 +0900
Subject: [PATCH 3295/3722] Add failing tests

---
 .../Multiplayer/TestSceneMultiplayer.cs       | 92 ++++++++++++++-----
 1 file changed, 67 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
index 519d76fc93..a81927bec2 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
@@ -49,34 +49,23 @@ namespace osu.Game.Tests.Visual.Multiplayer
         }
 
         [Test]
-        public void TestMatchStartWhileSpectatingWithNoBeatmap()
+        public void TestLocalPlayDoesNotStartWhileSpectatingWithNoBeatmap()
         {
             loadMultiplayer();
 
-            AddStep("open room", () =>
+            createRoom(new Room
             {
-                multiplayerScreen.OpenNewRoom(new Room
+                Name = { Value = "Test Room" },
+                Playlist =
                 {
-                    Name = { Value = "Test Room" },
-                    Playlist =
+                    new PlaylistItem
                     {
-                        new PlaylistItem
-                        {
-                            Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
-                            Ruleset = { Value = new OsuRuleset().RulesetInfo },
-                        }
+                        Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.RulesetID == 0)).BeatmapInfo },
+                        Ruleset = { Value = new OsuRuleset().RulesetInfo },
                     }
-                });
+                }
             });
 
-            AddStep("create room", () =>
-            {
-                InputManager.MoveMouseTo(this.ChildrenOfType<MultiplayerMatchSettingsOverlay.CreateOrUpdateButton>().Single());
-                InputManager.Click(MouseButton.Left);
-            });
-
-            AddUntilStep("wait for join", () => client.Room != null);
-
             AddStep("join other user (ready, host)", () =>
             {
                 client.AddUser(new User { Id = MultiplayerTestScene.PLAYER_1_ID, Username = "Other" });
@@ -84,13 +73,44 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 client.ChangeUserState(MultiplayerTestScene.PLAYER_1_ID, MultiplayerUserState.Ready);
             });
 
-            AddStep("change playlist", () =>
+            AddStep("delete beatmap", () => beatmaps.Delete(importedSet));
+
+            AddStep("click spectate button", () =>
             {
-                room.Playlist.Add(new PlaylistItem
+                InputManager.MoveMouseTo(this.ChildrenOfType<MultiplayerSpectateButton>().Single());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddStep("start match externally", () => client.StartMatch());
+
+            AddAssert("play not started", () => multiplayerScreen.IsCurrentScreen());
+        }
+
+        [Test]
+        public void TestLocalPlayStartsWhileSpectatingWhenBeatmapBecomesAvailable()
+        {
+            loadMultiplayer();
+
+            createRoom(new Room
+            {
+                Name = { Value = "Test Room" },
+                Playlist =
                 {
-                    Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
-                    Ruleset = { Value = new OsuRuleset().RulesetInfo },
-                });
+                    new PlaylistItem
+                    {
+                        Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.RulesetID == 0)).BeatmapInfo },
+                        Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                    }
+                }
+            });
+
+            AddStep("delete beatmap", () => beatmaps.Delete(importedSet));
+
+            AddStep("join other user (ready, host)", () =>
+            {
+                client.AddUser(new User { Id = MultiplayerTestScene.PLAYER_1_ID, Username = "Other" });
+                client.TransferHost(MultiplayerTestScene.PLAYER_1_ID);
+                client.ChangeUserState(MultiplayerTestScene.PLAYER_1_ID, MultiplayerUserState.Ready);
             });
 
             AddStep("click spectate button", () =>
@@ -101,7 +121,29 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             AddStep("start match externally", () => client.StartMatch());
 
-            AddAssert("screen not changed", () => multiplayerScreen.IsCurrentScreen());
+            AddStep("restore beatmap", () =>
+            {
+                beatmaps.Import(TestResources.GetQuickTestBeatmapForImport()).Wait();
+                importedSet = beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.All).First();
+            });
+
+            AddUntilStep("play started", () => !multiplayerScreen.IsCurrentScreen());
+        }
+
+        private void createRoom(Room room)
+        {
+            AddStep("open room", () =>
+            {
+                multiplayerScreen.OpenNewRoom(room);
+            });
+
+            AddStep("create room", () =>
+            {
+                InputManager.MoveMouseTo(this.ChildrenOfType<MultiplayerMatchSettingsOverlay.CreateOrUpdateButton>().Single());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddUntilStep("wait for join", () => client.Room != null);
         }
 
         private void loadMultiplayer()

From 9ad1e5067e0494730446a34bc01e0222010e438a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 11 May 2021 19:22:09 +0900
Subject: [PATCH 3296/3722] Fix spectate being entered while not having the
 beatmap

---
 .../Multiplayer/MultiplayerMatchSubScreen.cs  | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index ab22d40181..fa18b792c3 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -14,6 +14,7 @@ using osu.Framework.Screens;
 using osu.Framework.Threading;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
+using osu.Game.Online;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
@@ -354,10 +355,17 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             client.ChangeBeatmapAvailability(availability.NewValue);
 
-            // 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 (availability.NewValue != Online.Rooms.BeatmapAvailability.LocallyAvailable()
-                && client.LocalUser?.State == MultiplayerUserState.Ready)
-                client.ChangeState(MultiplayerUserState.Idle);
+            if (availability.NewValue.State != DownloadState.LocallyAvailable)
+            {
+                // 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();
+            }
         }
 
         private void onReadyClick()
@@ -413,6 +421,9 @@ 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())

From bc4213eea1fd86a2184d1c0ba8d874025e9c3ce6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 11 May 2021 19:26:58 +0900
Subject: [PATCH 3297/3722] Add test for changing back to idle on deletion

---
 .../Multiplayer/TestSceneMultiplayer.cs       | 31 +++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
index a81927bec2..f2331542c6 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
@@ -15,7 +15,6 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
-using osu.Game.Tests.Beatmaps;
 using osu.Game.Tests.Resources;
 using osu.Game.Users;
 using osuTK.Input;
@@ -43,9 +42,37 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
             Dependencies.Cache(beatmaps = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, host, Beatmap.Default));
-            beatmaps.Import(TestResources.GetQuickTestBeatmapForImport()).Wait();
+        }
 
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            beatmaps.Import(TestResources.GetQuickTestBeatmapForImport()).Wait();
             importedSet = beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.All).First();
+        });
+
+        [Test]
+        public void TestUserSetToIdleWhenBeatmapDeleted()
+        {
+            loadMultiplayer();
+
+            createRoom(new Room
+            {
+                Name = { Value = "Test Room" },
+                Playlist =
+                {
+                    new PlaylistItem
+                    {
+                        Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.RulesetID == 0)).BeatmapInfo },
+                        Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                    }
+                }
+            });
+
+            AddStep("set user ready", () => client.ChangeState(MultiplayerUserState.Ready));
+            AddStep("delete beatmap", () => beatmaps.Delete(importedSet));
+
+            AddAssert("user state is idle", () => client.LocalUser?.State == MultiplayerUserState.Idle);
         }
 
         [Test]

From f5bc389998283eca1a7e4d0363945f1800840aa7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 11 May 2021 19:31:32 +0900
Subject: [PATCH 3298/3722] Fix flaky tests

---
 .../Visual/Multiplayer/TestSceneMultiplayer.cs    | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
index f2331542c6..69fbd56490 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.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.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
@@ -14,6 +15,7 @@ using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.OnlinePlay.Components;
+using osu.Game.Screens.OnlinePlay.Multiplayer;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
 using osu.Game.Tests.Resources;
 using osu.Game.Users;
@@ -56,7 +58,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             loadMultiplayer();
 
-            createRoom(new Room
+            createRoom(() => new Room
             {
                 Name = { Value = "Test Room" },
                 Playlist =
@@ -80,7 +82,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             loadMultiplayer();
 
-            createRoom(new Room
+            createRoom(() => new Room
             {
                 Name = { Value = "Test Room" },
                 Playlist =
@@ -118,7 +120,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             loadMultiplayer();
 
-            createRoom(new Room
+            createRoom(() => new Room
             {
                 Name = { Value = "Test Room" },
                 Playlist =
@@ -157,13 +159,16 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddUntilStep("play started", () => !multiplayerScreen.IsCurrentScreen());
         }
 
-        private void createRoom(Room room)
+        private void createRoom(Func<Room> room)
         {
             AddStep("open room", () =>
             {
-                multiplayerScreen.OpenNewRoom(room);
+                multiplayerScreen.OpenNewRoom(room());
             });
 
+            AddUntilStep("wait for room open", () => this.ChildrenOfType<MultiplayerMatchSubScreen>().FirstOrDefault()?.IsLoaded == true);
+            AddWaitStep("wait for transition", 2);
+
             AddStep("create room", () =>
             {
                 InputManager.MoveMouseTo(this.ChildrenOfType<MultiplayerMatchSettingsOverlay.CreateOrUpdateButton>().Single());

From 69f01e82db6cf14052f6fe05d063619042449b86 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 May 2021 14:42:56 +0300
Subject: [PATCH 3299/3722] Add bottom padding for NewsSideBar content

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

diff --git a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
index 9a2fdf2d97..4444cc79b8 100644
--- a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
+++ b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Overlays.News.Sidebar
                     RelativeSizeAxes = Axes.Both,
                     Padding = new MarginPadding
                     {
-                        Top = 20,
+                        Vertical = 20,
                         Left = 50,
                         Right = 30
                     },

From 711e7ba860cd0e3e2113fa09ed53b79c6e6a07e3 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 May 2021 14:43:23 +0300
Subject: [PATCH 3300/3722] Apply suggestions for MonthPanel

---
 osu.Game/Overlays/News/Sidebar/MonthPanel.cs | 37 ++++++++++++++------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/MonthPanel.cs b/osu.Game/Overlays/News/Sidebar/MonthPanel.cs
index 5f2acd63d1..4d7a5f18aa 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthPanel.cs
@@ -19,6 +19,9 @@ namespace osu.Game.Overlays.News.Sidebar
 {
     public class MonthPanel : CompositeDrawable
     {
+        private const int header_height = 15;
+        private const int animation_duration = 250;
+
         public readonly BindableBool IsOpen = new BindableBool();
 
         private readonly FillFlowContainer postsFlow;
@@ -26,8 +29,7 @@ namespace osu.Game.Overlays.News.Sidebar
         public MonthPanel(List<APINewsPost> posts)
         {
             Width = 160;
-            AutoSizeDuration = 250;
-            AutoSizeEasing = Easing.OutQuint;
+            Masking = true;
             InternalChild = new FillFlowContainer
             {
                 RelativeSizeAxes = Axes.X,
@@ -63,33 +65,46 @@ namespace osu.Game.Overlays.News.Sidebar
                 if (open.NewValue)
                 {
                     AutoSizeAxes = Axes.Y;
-                    postsFlow.FadeIn(250, Easing.OutQuint);
+                    postsFlow.FadeIn(animation_duration, Easing.OutQuint);
                 }
                 else
                 {
                     AutoSizeAxes = Axes.None;
-                    this.ResizeHeightTo(15, 250, Easing.OutQuint);
+                    this.ResizeHeightTo(header_height, animation_duration, Easing.OutQuint);
 
-                    postsFlow.FadeOut(250, Easing.OutQuint);
+                    postsFlow.FadeOut(animation_duration, Easing.OutQuint);
                 }
             }, true);
 
             // First state change should be instant.
-            FinishTransforms();
-            postsFlow.FinishTransforms();
+            FinishTransforms(true);
         }
 
-        private class DropdownButton : OsuHoverContainer
+        private bool shouldUpdateAutosize = true;
+
+        // Workaround to allow the dropdown to be opened immediately since FinishTransforms doesn't work for AutosizeDuration.
+        protected override void UpdateAfterAutoSize()
+        {
+            base.UpdateAfterAutoSize();
+
+            if (shouldUpdateAutosize)
+            {
+                AutoSizeDuration = animation_duration;
+                AutoSizeEasing = Easing.OutQuint;
+
+                shouldUpdateAutosize = false;
+            }
+        }
+
+        private class DropdownButton : OsuClickableContainer
         {
             public readonly BindableBool IsOpen = new BindableBool();
 
-            protected override IEnumerable<Drawable> EffectTargets => null;
-
             private readonly SpriteIcon icon;
 
             public DropdownButton(DateTimeOffset date)
             {
-                Size = new Vector2(160, 15);
+                Size = new Vector2(160, header_height);
                 Action = IsOpen.Toggle;
                 Children = new Drawable[]
                 {

From e736240a064020b4f7b767acfb278ca15d02f3c7 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 May 2021 15:12:04 +0300
Subject: [PATCH 3301/3722] Use lookup instead of dictionary to distribute
 posts

---
 osu.Game/Overlays/News/Sidebar/MonthPanel.cs  |  4 +--
 osu.Game/Overlays/News/Sidebar/NewsSideBar.cs | 29 +++++--------------
 2 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/MonthPanel.cs b/osu.Game/Overlays/News/Sidebar/MonthPanel.cs
index 4d7a5f18aa..5460ccce16 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthPanel.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Overlays.News.Sidebar
 
         private readonly FillFlowContainer postsFlow;
 
-        public MonthPanel(List<APINewsPost> posts)
+        public MonthPanel(IEnumerable<APINewsPost> posts)
         {
             Width = 160;
             Masking = true;
@@ -38,7 +38,7 @@ namespace osu.Game.Overlays.News.Sidebar
                 Spacing = new Vector2(0, 5),
                 Children = new Drawable[]
                 {
-                    new DropdownButton(posts[0].PublishedAt)
+                    new DropdownButton(posts.ElementAt(0).PublishedAt)
                     {
                         IsOpen = { BindTarget = IsOpen }
                     },
diff --git a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
index 4444cc79b8..4d2d3949bd 100644
--- a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
+++ b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
@@ -8,7 +8,7 @@ using osu.Framework.Graphics;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Framework.Graphics.Shapes;
 using osuTK;
-using System.Collections.Generic;
+using System.Linq;
 
 namespace osu.Game.Overlays.News.Sidebar
 {
@@ -81,30 +81,17 @@ namespace osu.Game.Overlays.News.Sidebar
 
                 if (metadata.NewValue != null)
                 {
-                    var dict = new Dictionary<int, List<APINewsPost>>();
+                    var lookup = metadata.NewValue.NewsPosts.ToLookup(post => post.PublishedAt.Month);
 
-                    foreach (var p in metadata.NewValue.NewsPosts)
+                    var keys = lookup.Select(kvp => kvp.Key);
+                    var sortedKeys = keys.OrderByDescending(k => k).ToList();
+
+                    for (int i = 0; i < sortedKeys.Count; i++)
                     {
-                        var month = p.PublishedAt.Month;
-
-                        if (dict.ContainsKey(month))
-                            dict[month].Add(p);
-                        else
+                        monthsFlow.Add(new MonthPanel(lookup[sortedKeys[i]])
                         {
-                            dict.Add(month, new List<APINewsPost>(new[] { p }));
-                        }
-                    }
-
-                    bool isFirst = true;
-
-                    foreach (var keyValuePair in dict)
-                    {
-                        monthsFlow.Add(new MonthPanel(keyValuePair.Value)
-                        {
-                            IsOpen = { Value = isFirst }
+                            IsOpen = { Value = i == 0 }
                         });
-
-                        isFirst = false;
                     }
                 }
             }, true);

From 9603712aa1a21b930179533f788e36448c9ec8a1 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 May 2021 15:33:27 +0300
Subject: [PATCH 3302/3722] Cache metadata in NewsSideBar

---
 .../Visual/Online/TestSceneNewsYearsPanel.cs  | 32 ++++++++++++++-----
 osu.Game/Overlays/News/Sidebar/NewsSideBar.cs | 13 ++------
 osu.Game/Overlays/News/Sidebar/YearsPanel.cs  | 29 +++++++----------
 3 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
index 446cd06eea..031a98dd8b 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
@@ -5,6 +5,9 @@ using osu.Framework.Graphics;
 using osu.Game.Overlays.News.Sidebar;
 using osu.Framework.Allocation;
 using osu.Game.Overlays;
+using osu.Framework.Bindables;
+using osu.Game.Online.API.Requests.Responses;
+using NUnit.Framework;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -13,22 +16,35 @@ namespace osu.Game.Tests.Visual.Online
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
 
-        private readonly YearsPanel panel;
+        [Cached]
+        private readonly Bindable<APINewsSidebar> metadataBindable = new Bindable<APINewsSidebar>();
 
-        public TestSceneNewsYearsPanel()
+        private YearsPanel panel;
+
+        [SetUp]
+        public void SetUp()
         {
-            Add(panel = new YearsPanel
+            Child = panel = new YearsPanel
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre
-            });
+            };
         }
 
-        protected override void LoadComplete()
+        [Test]
+        public void TestMetadata()
         {
-            base.LoadComplete();
-            AddStep("Load years", () => panel.Years = new[] { 1000, 2000, 3000, 4000 });
-            AddStep("Load different years", () => panel.Years = new[] { 1001, 2001, 3001, 4001, 5001, 6001, 7001, 8001 });
+            AddStep("Change metadata to null", () => metadataBindable.Value = null);
+            AddAssert("Panel is hidden", () => panel.IsPresent == false);
+            AddStep("Change metadata", () => metadataBindable.Value = metadata);
+            AddAssert("Panel is visible", () => panel.IsPresent == true);
+            AddStep("Change metadata to null", () => metadataBindable.Value = null);
+            AddAssert("Panel is hidden", () => panel.IsPresent == false);
         }
+
+        private static readonly APINewsSidebar metadata = new APINewsSidebar
+        {
+            Years = new[] { 1001, 2001, 3001, 4001, 5001, 6001, 7001, 8001, 9001 }
+        };
     }
 }
diff --git a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
index 4d2d3949bd..75726c5fed 100644
--- a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
+++ b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
@@ -14,9 +14,9 @@ namespace osu.Game.Overlays.News.Sidebar
 {
     public class NewsSideBar : CompositeDrawable
     {
+        [Cached]
         public readonly Bindable<APINewsSidebar> Metadata = new Bindable<APINewsSidebar>();
 
-        private YearsPanel yearsPanel;
         private FillFlowContainer<MonthPanel> monthsFlow;
 
         [BackgroundDependencyLoader]
@@ -49,7 +49,7 @@ namespace osu.Game.Overlays.News.Sidebar
                         Spacing = new Vector2(0, 20),
                         Children = new Drawable[]
                         {
-                            yearsPanel = new YearsPanel(),
+                            new YearsPanel(),
                             monthsFlow = new FillFlowContainer<MonthPanel>
                             {
                                 AutoSizeAxes = Axes.Both,
@@ -70,15 +70,6 @@ namespace osu.Game.Overlays.News.Sidebar
             {
                 monthsFlow.Clear();
 
-                if (metadata.NewValue == null)
-                {
-                    yearsPanel.Hide();
-                    return;
-                }
-
-                yearsPanel.Years = metadata.NewValue.Years;
-                yearsPanel.Show();
-
                 if (metadata.NewValue != null)
                 {
                     var lookup = metadata.NewValue.NewsPosts.ToLookup(post => post.PublishedAt.Month);
diff --git a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
index 046e1804bd..23dd8d8a5e 100644
--- a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
@@ -12,28 +12,21 @@ using osu.Game.Graphics.Sprites;
 using System.Collections.Generic;
 using osu.Game.Graphics;
 using osu.Framework.Bindables;
-using System.Collections.Specialized;
+using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Overlays.News.Sidebar
 {
     public class YearsPanel : CompositeDrawable
     {
-        public int[] Years
-        {
-            set
-            {
-                years.Clear();
-                years.AddRange(value);
-            }
-        }
-
-        private readonly BindableList<int> years = new BindableList<int>();
+        private readonly Bindable<APINewsSidebar> metadata = new Bindable<APINewsSidebar>();
 
         private FillFlowContainer<YearButton> flow;
 
         [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
+        private void load(OverlayColourProvider colourProvider, Bindable<APINewsSidebar> metadata)
         {
+            this.metadata.BindTo(metadata);
+
             Width = 160;
             AutoSizeAxes = Axes.Y;
             Masking = true;
@@ -64,14 +57,16 @@ namespace osu.Game.Overlays.News.Sidebar
         {
             base.LoadComplete();
 
-            years.BindCollectionChanged((u, v) =>
+            metadata.BindValueChanged(m =>
             {
-                switch (v.Action)
+                if (m.NewValue == null)
                 {
-                    case NotifyCollectionChangedAction.Add:
-                        flow.Children = years.Select(y => new YearButton(y)).ToArray();
-                        break;
+                    Hide();
+                    return;
                 }
+
+                flow.Children = m.NewValue.Years.Select(y => new YearButton(y)).ToArray();
+                Show();
             }, true);
         }
 

From 0a9c3c9413e89efaf183793fc781e3bcc7f4a5bc Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 May 2021 15:39:50 +0300
Subject: [PATCH 3303/3722] Move metadata change logic to it's own method

---
 .../Visual/Online/TestSceneNewsYearsPanel.cs  |  2 +-
 osu.Game/Overlays/News/Sidebar/NewsSideBar.cs | 43 +++++++++++--------
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
index 031a98dd8b..014a9ac7ed 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Visual.Online
         }
 
         [Test]
-        public void TestMetadata()
+        public void TestVisibility()
         {
             AddStep("Change metadata to null", () => metadataBindable.Value = null);
             AddAssert("Panel is hidden", () => panel.IsPresent == false);
diff --git a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
index 75726c5fed..d90b73aa82 100644
--- a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
+++ b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
@@ -66,26 +66,35 @@ namespace osu.Game.Overlays.News.Sidebar
         {
             base.LoadComplete();
 
-            Metadata.BindValueChanged(metadata =>
+            Metadata.BindValueChanged(onMetadataChanged, true);
+        }
+
+        private void onMetadataChanged(ValueChangedEvent<APINewsSidebar> metadata)
+        {
+            monthsFlow.Clear();
+
+            if (metadata.NewValue == null)
+                return;
+
+            var allPosts = metadata.NewValue.NewsPosts;
+
+            if (!allPosts?.Any() ?? false)
+                return;
+
+            var lookup = metadata.NewValue.NewsPosts.ToLookup(post => post.PublishedAt.Month);
+
+            var keys = lookup.Select(kvp => kvp.Key);
+            var sortedKeys = keys.OrderByDescending(k => k).ToList();
+
+            for (int i = 0; i < sortedKeys.Count; i++)
             {
-                monthsFlow.Clear();
+                var posts = lookup[sortedKeys[i]];
 
-                if (metadata.NewValue != null)
+                monthsFlow.Add(new MonthPanel(posts)
                 {
-                    var lookup = metadata.NewValue.NewsPosts.ToLookup(post => post.PublishedAt.Month);
-
-                    var keys = lookup.Select(kvp => kvp.Key);
-                    var sortedKeys = keys.OrderByDescending(k => k).ToList();
-
-                    for (int i = 0; i < sortedKeys.Count; i++)
-                    {
-                        monthsFlow.Add(new MonthPanel(lookup[sortedKeys[i]])
-                        {
-                            IsOpen = { Value = i == 0 }
-                        });
-                    }
-                }
-            }, true);
+                    IsOpen = { Value = i == 0 }
+                });
+            }
         }
     }
 }

From 705aad262aa8c2e4ea798a79306d2df820693a61 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 May 2021 15:42:40 +0300
Subject: [PATCH 3304/3722] Rename MonthPanel to MonthDropdown

---
 ...SceneNewsMonthPanel.cs => TestSceneNewsMonthDropdown.cs} | 6 +++---
 .../News/Sidebar/{MonthPanel.cs => MonthDropdown.cs}        | 4 ++--
 osu.Game/Overlays/News/Sidebar/NewsSideBar.cs               | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename osu.Game.Tests/Visual/Online/{TestSceneNewsMonthPanel.cs => TestSceneNewsMonthDropdown.cs} (94%)
 rename osu.Game/Overlays/News/Sidebar/{MonthPanel.cs => MonthDropdown.cs} (97%)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsMonthPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsMonthDropdown.cs
similarity index 94%
rename from osu.Game.Tests/Visual/Online/TestSceneNewsMonthPanel.cs
rename to osu.Game.Tests/Visual/Online/TestSceneNewsMonthDropdown.cs
index ee7fb8b407..c51e299f78 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsMonthPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsMonthDropdown.cs
@@ -14,7 +14,7 @@ using osu.Game.Overlays.News.Sidebar;
 
 namespace osu.Game.Tests.Visual.Online
 {
-    public class TestSceneNewsMonthPanel : OsuTestScene
+    public class TestSceneNewsMonthDropdown : OsuTestScene
     {
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
@@ -34,7 +34,7 @@ namespace osu.Game.Tests.Visual.Online
                         RelativeSizeAxes = Axes.Both,
                         Colour = colourProvider.Background2,
                     },
-                    new MonthPanel(posts),
+                    new MonthDropdown(posts),
                 }
             });
         }
@@ -54,7 +54,7 @@ namespace osu.Game.Tests.Visual.Online
                         RelativeSizeAxes = Axes.Both,
                         Colour = colourProvider.Background2,
                     },
-                    new MonthPanel(posts)
+                    new MonthDropdown(posts)
                     {
                         IsOpen = { Value = true }
                     },
diff --git a/osu.Game/Overlays/News/Sidebar/MonthPanel.cs b/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
similarity index 97%
rename from osu.Game/Overlays/News/Sidebar/MonthPanel.cs
rename to osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
index 5460ccce16..87a72a3eaf 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
@@ -17,7 +17,7 @@ using osu.Framework.Graphics.Sprites;
 
 namespace osu.Game.Overlays.News.Sidebar
 {
-    public class MonthPanel : CompositeDrawable
+    public class MonthDropdown : CompositeDrawable
     {
         private const int header_height = 15;
         private const int animation_duration = 250;
@@ -26,7 +26,7 @@ namespace osu.Game.Overlays.News.Sidebar
 
         private readonly FillFlowContainer postsFlow;
 
-        public MonthPanel(IEnumerable<APINewsPost> posts)
+        public MonthDropdown(IEnumerable<APINewsPost> posts)
         {
             Width = 160;
             Masking = true;
diff --git a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
index d90b73aa82..1518d61d59 100644
--- a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
+++ b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Overlays.News.Sidebar
         [Cached]
         public readonly Bindable<APINewsSidebar> Metadata = new Bindable<APINewsSidebar>();
 
-        private FillFlowContainer<MonthPanel> monthsFlow;
+        private FillFlowContainer<MonthDropdown> monthsFlow;
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider)
@@ -50,7 +50,7 @@ namespace osu.Game.Overlays.News.Sidebar
                         Children = new Drawable[]
                         {
                             new YearsPanel(),
-                            monthsFlow = new FillFlowContainer<MonthPanel>
+                            monthsFlow = new FillFlowContainer<MonthDropdown>
                             {
                                 AutoSizeAxes = Axes.Both,
                                 Direction = FillDirection.Vertical,
@@ -90,7 +90,7 @@ namespace osu.Game.Overlays.News.Sidebar
             {
                 var posts = lookup[sortedKeys[i]];
 
-                monthsFlow.Add(new MonthPanel(posts)
+                monthsFlow.Add(new MonthDropdown(posts)
                 {
                     IsOpen = { Value = i == 0 }
                 });

From 01f5c77dac4b5705e78ba6ec10b2d864ea92073f Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 May 2021 15:56:50 +0300
Subject: [PATCH 3305/3722] Add better comments explaining empty actions

---
 osu.Game/Overlays/News/Sidebar/MonthDropdown.cs | 2 +-
 osu.Game/Overlays/News/Sidebar/YearsPanel.cs    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs b/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
index 87a72a3eaf..ff50bfe4c2 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
@@ -160,7 +160,7 @@ namespace osu.Game.Overlays.News.Sidebar
             {
                 IdleColour = colourProvider.Light2;
                 HoverColour = colourProvider.Light1;
-                Action = () => { }; // TODO
+                Action = () => { };  // Avoid button being disabled since there's no proper action assigned.
             }
         }
     }
diff --git a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
index 23dd8d8a5e..c06a8424f6 100644
--- a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
@@ -93,7 +93,7 @@ namespace osu.Game.Overlays.News.Sidebar
             {
                 IdleColour = colourProvider.Light2;
                 HoverColour = colourProvider.Light1;
-                Action = () => { }; // TODO
+                Action = () => { }; // Avoid button being disabled since there's no proper action assigned.
             }
         }
     }

From 208224cc0deb0ae2d79c155f04073577332f322f Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 May 2021 16:08:09 +0300
Subject: [PATCH 3306/3722] CI fixes

---
 osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs | 6 +++---
 osu.Game/Overlays/News/Sidebar/MonthDropdown.cs         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
index 014a9ac7ed..39bb97fe98 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
@@ -35,11 +35,11 @@ namespace osu.Game.Tests.Visual.Online
         public void TestVisibility()
         {
             AddStep("Change metadata to null", () => metadataBindable.Value = null);
-            AddAssert("Panel is hidden", () => panel.IsPresent == false);
+            AddAssert("Panel is hidden", () => !panel.IsPresent);
             AddStep("Change metadata", () => metadataBindable.Value = metadata);
-            AddAssert("Panel is visible", () => panel.IsPresent == true);
+            AddAssert("Panel is visible", () => panel.IsPresent);
             AddStep("Change metadata to null", () => metadataBindable.Value = null);
-            AddAssert("Panel is hidden", () => panel.IsPresent == false);
+            AddAssert("Panel is hidden", () => !panel.IsPresent);
         }
 
         private static readonly APINewsSidebar metadata = new APINewsSidebar
diff --git a/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs b/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
index ff50bfe4c2..35092acdc1 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
@@ -160,7 +160,7 @@ namespace osu.Game.Overlays.News.Sidebar
             {
                 IdleColour = colourProvider.Light2;
                 HoverColour = colourProvider.Light1;
-                Action = () => { };  // Avoid button being disabled since there's no proper action assigned.
+                Action = () => { }; // Avoid button being disabled since there's no proper action assigned.
             }
         }
     }

From 1c0b0996cf43249e4127238f39965133d65c9d4f Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 May 2021 16:42:18 +0300
Subject: [PATCH 3307/3722] Rename DropdownButton to DropdownHeader

---
 osu.Game/Overlays/News/Sidebar/MonthDropdown.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs b/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
index 35092acdc1..cc06f48544 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Overlays.News.Sidebar
                 Spacing = new Vector2(0, 5),
                 Children = new Drawable[]
                 {
-                    new DropdownButton(posts.ElementAt(0).PublishedAt)
+                    new DropdownHeader(posts.ElementAt(0).PublishedAt)
                     {
                         IsOpen = { BindTarget = IsOpen }
                     },
@@ -96,15 +96,16 @@ namespace osu.Game.Overlays.News.Sidebar
             }
         }
 
-        private class DropdownButton : OsuClickableContainer
+        private class DropdownHeader : OsuClickableContainer
         {
             public readonly BindableBool IsOpen = new BindableBool();
 
             private readonly SpriteIcon icon;
 
-            public DropdownButton(DateTimeOffset date)
+            public DropdownHeader(DateTimeOffset date)
             {
-                Size = new Vector2(160, header_height);
+                RelativeSizeAxes = Axes.X;
+                Height = header_height;
                 Action = IsOpen.Toggle;
                 Children = new Drawable[]
                 {

From c2ba16f977ba8e3fb04d72f56bb81cd647def6d2 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 May 2021 16:51:59 +0300
Subject: [PATCH 3308/3722] Use relative sizing for MonthDropdown

---
 .../Online/TestSceneNewsMonthDropdown.cs      | 55 ++++++++-----------
 .../Overlays/News/Sidebar/MonthDropdown.cs    |  2 +-
 osu.Game/Overlays/News/Sidebar/NewsSideBar.cs |  8 +--
 3 files changed, 27 insertions(+), 38 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsMonthDropdown.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsMonthDropdown.cs
index c51e299f78..f03b7d3f58 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsMonthDropdown.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsMonthDropdown.cs
@@ -22,46 +22,35 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void CreateClosedMonthPanel()
         {
-            AddStep("Create", () => Child = new Container
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.TopCentre,
-                AutoSizeAxes = Axes.Both,
-                Children = new Drawable[]
-                {
-                    new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = colourProvider.Background2,
-                    },
-                    new MonthDropdown(posts),
-                }
-            });
+            create(false);
         }
 
         [Test]
         public void CreateOpenMonthPanel()
         {
-            AddStep("Create", () => Child = new Container
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.TopCentre,
-                AutoSizeAxes = Axes.Both,
-                Children = new Drawable[]
-                {
-                    new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = colourProvider.Background2,
-                    },
-                    new MonthDropdown(posts)
-                    {
-                        IsOpen = { Value = true }
-                    },
-                }
-            });
+            create(true);
         }
 
+        private void create(bool isOpen) => AddStep("Create", () => Child = new Container
+        {
+            Anchor = Anchor.Centre,
+            Origin = Anchor.TopCentre,
+            AutoSizeAxes = Axes.Y,
+            Width = 160,
+            Children = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = colourProvider.Background2,
+                },
+                new MonthDropdown(posts)
+                {
+                    IsOpen = { Value = isOpen }
+                }
+            }
+        });
+
         private static List<APINewsPost> posts => new List<APINewsPost>
         {
             new APINewsPost
diff --git a/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs b/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
index cc06f48544..11c0ce863f 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Overlays.News.Sidebar
 
         public MonthDropdown(IEnumerable<APINewsPost> posts)
         {
-            Width = 160;
+            RelativeSizeAxes = Axes.X;
             Masking = true;
             InternalChild = new FillFlowContainer
             {
diff --git a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
index 1518d61d59..7de7e4dd71 100644
--- a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
+++ b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
@@ -42,17 +42,17 @@ namespace osu.Game.Overlays.News.Sidebar
                     },
                     Child = new FillFlowContainer
                     {
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.TopCentre,
                         Direction = FillDirection.Vertical,
-                        AutoSizeAxes = Axes.Both,
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
                         Spacing = new Vector2(0, 20),
                         Children = new Drawable[]
                         {
                             new YearsPanel(),
                             monthsFlow = new FillFlowContainer<MonthDropdown>
                             {
-                                AutoSizeAxes = Axes.Both,
+                                AutoSizeAxes = Axes.Y,
+                                RelativeSizeAxes = Axes.X,
                                 Direction = FillDirection.Vertical,
                                 Spacing = new Vector2(0, 10)
                             }

From b79a0237a3b57104df4dfee944ad1d2033af49ce Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 May 2021 16:54:19 +0300
Subject: [PATCH 3309/3722] Fix TestSceneNewsYearsPanel error

---
 .../Visual/Online/TestSceneNewsYearsPanel.cs    | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
index 39bb97fe98..3199b83a7d 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
@@ -22,24 +22,21 @@ namespace osu.Game.Tests.Visual.Online
         private YearsPanel panel;
 
         [SetUp]
-        public void SetUp()
+        public void SetUp() => Schedule(() => Child = panel = new YearsPanel
         {
-            Child = panel = new YearsPanel
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre
-            };
-        }
+            Anchor = Anchor.Centre,
+            Origin = Anchor.Centre
+        });
 
         [Test]
         public void TestVisibility()
         {
             AddStep("Change metadata to null", () => metadataBindable.Value = null);
-            AddAssert("Panel is hidden", () => !panel.IsPresent);
+            AddUntilStep("Panel is hidden", () => panel?.Alpha == 0);
             AddStep("Change metadata", () => metadataBindable.Value = metadata);
-            AddAssert("Panel is visible", () => panel.IsPresent);
+            AddUntilStep("Panel is visible", () => panel?.Alpha == 1);
             AddStep("Change metadata to null", () => metadataBindable.Value = null);
-            AddAssert("Panel is hidden", () => !panel.IsPresent);
+            AddUntilStep("Panel is hidden", () => panel?.Alpha == 0);
         }
 
         private static readonly APINewsSidebar metadata = new APINewsSidebar

From 048677846bfd5cb7ef8a8e186b9821e03ebca5d1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 12:21:31 +0900
Subject: [PATCH 3310/3722] Change `HealthDisplay` to be a `CompositeDrawable`

---
 osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs | 6 ++++--
 osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs       | 2 +-
 osu.Game/Screens/Play/HUD/FailingLayer.cs               | 2 +-
 osu.Game/Screens/Play/HUD/HealthDisplay.cs              | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
index fb4c9d713a..c335f7c99e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneFailingLayer.cs
@@ -1,11 +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.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.Configuration;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD;
@@ -50,9 +52,9 @@ namespace osu.Game.Tests.Visual.Gameplay
             });
 
             AddStep("set health to 0.10", () => layer.Current.Value = 0.1);
-            AddUntilStep("layer fade is visible", () => layer.Child.Alpha > 0.1f);
+            AddUntilStep("layer fade is visible", () => layer.ChildrenOfType<Container>().First().Alpha > 0.1f);
             AddStep("set health to 1", () => layer.Current.Value = 1f);
-            AddUntilStep("layer fade is invisible", () => !layer.Child.IsPresent);
+            AddUntilStep("layer fade is invisible", () => !layer.ChildrenOfType<Container>().First().IsPresent);
         }
 
         [Test]
diff --git a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
index 37bd289aee..241777244b 100644
--- a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Screens.Play.HUD
             RelativeSizeAxes = Axes.X;
             Margin = new MarginPadding { Top = 20 };
 
-            Children = new Drawable[]
+            InternalChildren = new Drawable[]
             {
                 new Box
                 {
diff --git a/osu.Game/Screens/Play/HUD/FailingLayer.cs b/osu.Game/Screens/Play/HUD/FailingLayer.cs
index e071337f34..424ee55766 100644
--- a/osu.Game/Screens/Play/HUD/FailingLayer.cs
+++ b/osu.Game/Screens/Play/HUD/FailingLayer.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Screens.Play.HUD
         public FailingLayer()
         {
             RelativeSizeAxes = Axes.Both;
-            Children = new Drawable[]
+            InternalChildren = new Drawable[]
             {
                 boxes = new Container
                 {
diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index 6c2571cc28..b970ecd1c7 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Screens.Play.HUD
     /// A container for components displaying the current player health.
     /// Gets bound automatically to the <see cref="Rulesets.Scoring.HealthProcessor"/> when inserted to <see cref="DrawableRuleset.Overlays"/> hierarchy.
     /// </summary>
-    public abstract class HealthDisplay : Container
+    public abstract class HealthDisplay : CompositeDrawable
     {
         [Resolved]
         protected HealthProcessor HealthProcessor { get; private set; }

From 8e226319e2603b0fc8aae7c645c6709fcef19f85 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 May 2021 15:40:33 +0900
Subject: [PATCH 3311/3722] Remove downwards dependency from `HUDOverlay` to
 `HealthDisplay`

---
 osu.Game/Screens/Play/HUD/HealthDisplay.cs | 13 +++++++++++--
 osu.Game/Screens/Play/HUDOverlay.cs        |  4 +---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index 6c2571cc28..e0ddde026b 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.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
@@ -16,6 +17,8 @@ namespace osu.Game.Screens.Play.HUD
     /// </summary>
     public abstract class HealthDisplay : Container
     {
+        private Bindable<bool> showHealthbar;
+
         [Resolved]
         protected HealthProcessor HealthProcessor { get; private set; }
 
@@ -29,12 +32,18 @@ namespace osu.Game.Screens.Play.HUD
         {
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
+        [BackgroundDependencyLoader(true)]
+        private void load(HUDOverlay hud)
         {
             Current.BindTo(HealthProcessor.Health);
 
             HealthProcessor.NewJudgement += onNewJudgement;
+
+            if (hud != null)
+            {
+                showHealthbar = hud.ShowHealthbar.GetBoundCopy();
+                showHealthbar.BindValueChanged(healthBar => this.FadeTo(healthBar.NewValue ? 1 : 0, HUDOverlay.FADE_DURATION, HUDOverlay.FADE_EASING), true);
+            }
         }
 
         private void onNewJudgement(JudgementResult judgement)
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 6ddaa338cc..c9b80be3dc 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -36,7 +36,6 @@ namespace osu.Game.Screens.Play
         public readonly KeyCounterDisplay KeyCounter;
         public readonly SkinnableScoreCounter ScoreCounter;
         public readonly SkinnableAccuracyCounter AccuracyCounter;
-        public readonly SkinnableHealthDisplay HealthDisplay;
         public readonly SongProgress Progress;
         public readonly ModDisplay ModDisplay;
         public readonly HoldForMenuButton HoldToQuit;
@@ -96,7 +95,7 @@ namespace osu.Game.Screens.Play
                                     RelativeSizeAxes = Axes.Both,
                                     Children = new Drawable[]
                                     {
-                                        HealthDisplay = CreateHealthDisplay(),
+                                        CreateHealthDisplay(),
                                         AccuracyCounter = CreateAccuracyCounter(),
                                         ScoreCounter = CreateScoreCounter(),
                                         CreateComboCounter(),
@@ -185,7 +184,6 @@ namespace osu.Game.Screens.Play
         {
             base.LoadComplete();
 
-            ShowHealthbar.BindValueChanged(healthBar => HealthDisplay.FadeTo(healthBar.NewValue ? 1 : 0, FADE_DURATION, FADE_EASING), true);
             ShowHud.BindValueChanged(visible => hideTargets.ForEach(d => d.FadeTo(visible.NewValue ? 1 : 0, FADE_DURATION, FADE_EASING)));
 
             IsBreakTime.BindValueChanged(_ => updateVisibility());

From 77e422409cdc9e6b216724f778c2b32617878ebf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 May 2021 17:00:24 +0900
Subject: [PATCH 3312/3722] Add `SkinInfo.InstantiationInfo` to allow creating
 different skin types

---
 .../TestSceneHitCircleArea.cs                 |   2 +-
 osu.Game/Beatmaps/WorkingBeatmap.cs           |   2 +-
 ...60743_AddSkinInstantiationInfo.Designer.cs | 508 ++++++++++++++++++
 ...20210511060743_AddSkinInstantiationInfo.cs |  22 +
 .../Migrations/OsuDbContextModelSnapshot.cs   |   6 +-
 osu.Game/Skinning/DefaultLegacySkin.cs        |  10 +-
 osu.Game/Skinning/DefaultSkin.cs              |  10 +-
 osu.Game/Skinning/SkinInfo.cs                 |  36 +-
 osu.Game/Skinning/SkinManager.cs              |  31 +-
 9 files changed, 597 insertions(+), 30 deletions(-)
 create mode 100644 osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.Designer.cs
 create mode 100644 osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs
index 0649989dc0..1fdcd73dde 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Osu.Tests
 
             hitCircle.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
-            Child = new SkinProvidingContainer(new DefaultSkin())
+            Child = new SkinProvidingContainer(new DefaultSkin(null))
             {
                 RelativeSizeAxes = Axes.Both,
                 Child = drawableHitCircle = new DrawableHitCircle(hitCircle)
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index e0eeaf6db0..3576b149bf 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -324,7 +324,7 @@ namespace osu.Game.Beatmaps
         public bool SkinLoaded => skin.IsResultAvailable;
         public ISkin Skin => skin.Value;
 
-        protected virtual ISkin GetSkin() => new DefaultSkin();
+        protected virtual ISkin GetSkin() => new DefaultSkin(null);
         private readonly RecyclableLazy<ISkin> skin;
 
         public abstract Stream GetStream(string storagePath);
diff --git a/osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.Designer.cs b/osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.Designer.cs
new file mode 100644
index 0000000000..b808c648da
--- /dev/null
+++ b/osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.Designer.cs
@@ -0,0 +1,508 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using osu.Game.Database;
+
+namespace osu.Game.Migrations
+{
+    [DbContext(typeof(OsuDbContext))]
+    [Migration("20210511060743_AddSkinInstantiationInfo")]
+    partial class AddSkinInstantiationInfo
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "2.2.6-servicing-10079");
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<float>("ApproachRate");
+
+                    b.Property<float>("CircleSize");
+
+                    b.Property<float>("DrainRate");
+
+                    b.Property<float>("OverallDifficulty");
+
+                    b.Property<double>("SliderMultiplier");
+
+                    b.Property<double>("SliderTickRate");
+
+                    b.HasKey("ID");
+
+                    b.ToTable("BeatmapDifficulty");
+                });
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<double>("AudioLeadIn");
+
+                    b.Property<double>("BPM");
+
+                    b.Property<int>("BaseDifficultyID");
+
+                    b.Property<int>("BeatDivisor");
+
+                    b.Property<int>("BeatmapSetInfoID");
+
+                    b.Property<bool>("Countdown");
+
+                    b.Property<double>("DistanceSpacing");
+
+                    b.Property<bool>("EpilepsyWarning");
+
+                    b.Property<int>("GridSize");
+
+                    b.Property<string>("Hash");
+
+                    b.Property<bool>("Hidden");
+
+                    b.Property<double>("Length");
+
+                    b.Property<bool>("LetterboxInBreaks");
+
+                    b.Property<string>("MD5Hash");
+
+                    b.Property<int?>("MetadataID");
+
+                    b.Property<int?>("OnlineBeatmapID");
+
+                    b.Property<string>("Path");
+
+                    b.Property<int>("RulesetID");
+
+                    b.Property<bool>("SpecialStyle");
+
+                    b.Property<float>("StackLeniency");
+
+                    b.Property<double>("StarDifficulty");
+
+                    b.Property<int>("Status");
+
+                    b.Property<string>("StoredBookmarks");
+
+                    b.Property<double>("TimelineZoom");
+
+                    b.Property<string>("Version");
+
+                    b.Property<bool>("WidescreenStoryboard");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("BaseDifficultyID");
+
+                    b.HasIndex("BeatmapSetInfoID");
+
+                    b.HasIndex("Hash");
+
+                    b.HasIndex("MD5Hash");
+
+                    b.HasIndex("MetadataID");
+
+                    b.HasIndex("OnlineBeatmapID")
+                        .IsUnique();
+
+                    b.HasIndex("RulesetID");
+
+                    b.ToTable("BeatmapInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Artist");
+
+                    b.Property<string>("ArtistUnicode");
+
+                    b.Property<string>("AudioFile");
+
+                    b.Property<string>("AuthorString")
+                        .HasColumnName("Author");
+
+                    b.Property<string>("BackgroundFile");
+
+                    b.Property<int>("PreviewTime");
+
+                    b.Property<string>("Source");
+
+                    b.Property<string>("Tags");
+
+                    b.Property<string>("Title");
+
+                    b.Property<string>("TitleUnicode");
+
+                    b.HasKey("ID");
+
+                    b.ToTable("BeatmapMetadata");
+                });
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("BeatmapSetInfoID");
+
+                    b.Property<int>("FileInfoID");
+
+                    b.Property<string>("Filename")
+                        .IsRequired();
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("BeatmapSetInfoID");
+
+                    b.HasIndex("FileInfoID");
+
+                    b.ToTable("BeatmapSetFileInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTimeOffset>("DateAdded");
+
+                    b.Property<bool>("DeletePending");
+
+                    b.Property<string>("Hash");
+
+                    b.Property<int?>("MetadataID");
+
+                    b.Property<int?>("OnlineBeatmapSetID");
+
+                    b.Property<bool>("Protected");
+
+                    b.Property<int>("Status");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("DeletePending");
+
+                    b.HasIndex("Hash")
+                        .IsUnique();
+
+                    b.HasIndex("MetadataID");
+
+                    b.HasIndex("OnlineBeatmapSetID")
+                        .IsUnique();
+
+                    b.ToTable("BeatmapSetInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Key")
+                        .HasColumnName("Key");
+
+                    b.Property<int?>("RulesetID");
+
+                    b.Property<int?>("SkinInfoID");
+
+                    b.Property<string>("StringValue")
+                        .HasColumnName("Value");
+
+                    b.Property<int?>("Variant");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("SkinInfoID");
+
+                    b.HasIndex("RulesetID", "Variant");
+
+                    b.ToTable("Settings");
+                });
+
+            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Hash");
+
+                    b.Property<int>("ReferenceCount");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("Hash")
+                        .IsUnique();
+
+                    b.HasIndex("ReferenceCount");
+
+                    b.ToTable("FileInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("IntAction")
+                        .HasColumnName("Action");
+
+                    b.Property<string>("KeysString")
+                        .HasColumnName("Keys");
+
+                    b.Property<int?>("RulesetID");
+
+                    b.Property<int?>("Variant");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("IntAction");
+
+                    b.HasIndex("RulesetID", "Variant");
+
+                    b.ToTable("KeyBinding");
+                });
+
+            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
+                {
+                    b.Property<int?>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("Available");
+
+                    b.Property<string>("InstantiationInfo");
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("ShortName");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("Available");
+
+                    b.HasIndex("ShortName")
+                        .IsUnique();
+
+                    b.ToTable("RulesetInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("FileInfoID");
+
+                    b.Property<string>("Filename")
+                        .IsRequired();
+
+                    b.Property<int?>("ScoreInfoID");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("FileInfoID");
+
+                    b.HasIndex("ScoreInfoID");
+
+                    b.ToTable("ScoreFileInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<double>("Accuracy")
+                        .HasColumnType("DECIMAL(1,4)");
+
+                    b.Property<int>("BeatmapInfoID");
+
+                    b.Property<int>("Combo");
+
+                    b.Property<DateTimeOffset>("Date");
+
+                    b.Property<bool>("DeletePending");
+
+                    b.Property<string>("Hash");
+
+                    b.Property<int>("MaxCombo");
+
+                    b.Property<string>("ModsJson")
+                        .HasColumnName("Mods");
+
+                    b.Property<long?>("OnlineScoreID");
+
+                    b.Property<double?>("PP");
+
+                    b.Property<int>("Rank");
+
+                    b.Property<int>("RulesetID");
+
+                    b.Property<string>("StatisticsJson")
+                        .HasColumnName("Statistics");
+
+                    b.Property<long>("TotalScore");
+
+                    b.Property<int?>("UserID")
+                        .HasColumnName("UserID");
+
+                    b.Property<string>("UserString")
+                        .HasColumnName("User");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("BeatmapInfoID");
+
+                    b.HasIndex("OnlineScoreID")
+                        .IsUnique();
+
+                    b.HasIndex("RulesetID");
+
+                    b.ToTable("ScoreInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("FileInfoID");
+
+                    b.Property<string>("Filename")
+                        .IsRequired();
+
+                    b.Property<int>("SkinInfoID");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("FileInfoID");
+
+                    b.HasIndex("SkinInfoID");
+
+                    b.ToTable("SkinFileInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Creator");
+
+                    b.Property<bool>("DeletePending");
+
+                    b.Property<string>("Hash");
+
+                    b.Property<string>("InstantiationInfo");
+
+                    b.Property<string>("Name");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("DeletePending");
+
+                    b.HasIndex("Hash")
+                        .IsUnique();
+
+                    b.ToTable("SkinInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
+                {
+                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
+                        .WithMany()
+                        .HasForeignKey("BaseDifficultyID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
+                        .WithMany("Beatmaps")
+                        .HasForeignKey("BeatmapSetInfoID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
+                        .WithMany("Beatmaps")
+                        .HasForeignKey("MetadataID");
+
+                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
+                        .WithMany()
+                        .HasForeignKey("RulesetID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
+                {
+                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
+                        .WithMany("Files")
+                        .HasForeignKey("BeatmapSetInfoID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
+                        .WithMany()
+                        .HasForeignKey("FileInfoID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
+                {
+                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
+                        .WithMany("BeatmapSets")
+                        .HasForeignKey("MetadataID");
+                });
+
+            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
+                {
+                    b.HasOne("osu.Game.Skinning.SkinInfo")
+                        .WithMany("Settings")
+                        .HasForeignKey("SkinInfoID");
+                });
+
+            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
+                {
+                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
+                        .WithMany()
+                        .HasForeignKey("FileInfoID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("osu.Game.Scoring.ScoreInfo")
+                        .WithMany("Files")
+                        .HasForeignKey("ScoreInfoID");
+                });
+
+            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
+                {
+                    b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "Beatmap")
+                        .WithMany("Scores")
+                        .HasForeignKey("BeatmapInfoID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
+                        .WithMany()
+                        .HasForeignKey("RulesetID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
+                {
+                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
+                        .WithMany()
+                        .HasForeignKey("FileInfoID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("osu.Game.Skinning.SkinInfo")
+                        .WithMany("Files")
+                        .HasForeignKey("SkinInfoID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.cs b/osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.cs
new file mode 100644
index 0000000000..1d5b0769a4
--- /dev/null
+++ b/osu.Game/Migrations/20210511060743_AddSkinInstantiationInfo.cs
@@ -0,0 +1,22 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace osu.Game.Migrations
+{
+    public partial class AddSkinInstantiationInfo : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "InstantiationInfo",
+                table: "SkinInfo",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "InstantiationInfo",
+                table: "SkinInfo");
+        }
+    }
+}
diff --git a/osu.Game/Migrations/OsuDbContextModelSnapshot.cs b/osu.Game/Migrations/OsuDbContextModelSnapshot.cs
index ec4461ca56..d4bde50b60 100644
--- a/osu.Game/Migrations/OsuDbContextModelSnapshot.cs
+++ b/osu.Game/Migrations/OsuDbContextModelSnapshot.cs
@@ -141,8 +141,6 @@ namespace osu.Game.Migrations
 
                     b.Property<string>("TitleUnicode");
 
-                    b.Property<string>("VideoFile");
-
                     b.HasKey("ID");
 
                     b.ToTable("BeatmapMetadata");
@@ -352,7 +350,7 @@ namespace osu.Game.Migrations
 
                     b.Property<long>("TotalScore");
 
-                    b.Property<long?>("UserID")
+                    b.Property<int?>("UserID")
                         .HasColumnName("UserID");
 
                     b.Property<string>("UserString")
@@ -402,6 +400,8 @@ namespace osu.Game.Migrations
 
                     b.Property<string>("Hash");
 
+                    b.Property<string>("InstantiationInfo");
+
                     b.Property<string>("Name");
 
                     b.HasKey("ID");
diff --git a/osu.Game/Skinning/DefaultLegacySkin.cs b/osu.Game/Skinning/DefaultLegacySkin.cs
index 4027cc650d..564be8630e 100644
--- a/osu.Game/Skinning/DefaultLegacySkin.cs
+++ b/osu.Game/Skinning/DefaultLegacySkin.cs
@@ -10,7 +10,12 @@ namespace osu.Game.Skinning
     public class DefaultLegacySkin : LegacySkin
     {
         public DefaultLegacySkin(IResourceStore<byte[]> storage, IStorageResourceProvider resources)
-            : base(Info, storage, resources, string.Empty)
+            : this(Info, storage, resources)
+        {
+        }
+
+        public DefaultLegacySkin(SkinInfo skin, IResourceStore<byte[]> storage, IStorageResourceProvider resources)
+            : base(skin, storage, resources, string.Empty)
         {
             Configuration.CustomColours["SliderBall"] = new Color4(2, 170, 255, 255);
             Configuration.AddComboColours(
@@ -27,7 +32,8 @@ namespace osu.Game.Skinning
         {
             ID = SkinInfo.CLASSIC_SKIN, // this is temporary until database storage is decided upon.
             Name = "osu!classic",
-            Creator = "team osu!"
+            Creator = "team osu!",
+            InstantiationInfo = typeof(DefaultLegacySkin).AssemblyQualifiedName,
         };
     }
 }
diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index 0b3f5f3cde..fcd874d6ca 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -8,14 +8,20 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
+using osu.Game.IO;
 using osuTK.Graphics;
 
 namespace osu.Game.Skinning
 {
     public class DefaultSkin : Skin
     {
-        public DefaultSkin()
-            : base(SkinInfo.Default)
+        public DefaultSkin(IStorageResourceProvider resources)
+            : this(SkinInfo.Default, resources)
+        {
+        }
+
+        public DefaultSkin(SkinInfo skin, IStorageResourceProvider resources)
+            : base(skin)
         {
             Configuration = new DefaultSkinConfiguration();
         }
diff --git a/osu.Game/Skinning/SkinInfo.cs b/osu.Game/Skinning/SkinInfo.cs
index aaccbefb3d..2e29808cb4 100644
--- a/osu.Game/Skinning/SkinInfo.cs
+++ b/osu.Game/Skinning/SkinInfo.cs
@@ -3,8 +3,11 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using osu.Framework.IO.Stores;
 using osu.Game.Configuration;
 using osu.Game.Database;
+using osu.Game.IO;
 
 namespace osu.Game.Skinning
 {
@@ -22,7 +25,35 @@ namespace osu.Game.Skinning
 
         public string Creator { get; set; }
 
-        public List<SkinFileInfo> Files { get; set; }
+        private string instantiationInfo;
+
+        public string InstantiationInfo
+        {
+            get => instantiationInfo;
+            set => instantiationInfo = abbreviateInstantiationInfo(value);
+        }
+
+        private string abbreviateInstantiationInfo(string value)
+        {
+            // exclude version onwards, matching only on namespace and type.
+            // this is mainly to allow for new versions of already loaded rulesets to "upgrade" from old.
+            return string.Join(',', value.Split(',').Take(2));
+        }
+
+        public virtual Skin CreateInstance(IResourceStore<byte[]> legacyDefaultResources, IStorageResourceProvider resources)
+        {
+            var type = string.IsNullOrEmpty(InstantiationInfo)
+                // handle the case of skins imported before InstantiationInfo was added.
+                ? typeof(LegacySkin)
+                : Type.GetType(InstantiationInfo);
+
+            if (type == typeof(DefaultLegacySkin))
+                return (Skin)Activator.CreateInstance(type, this, legacyDefaultResources, resources);
+
+            return (Skin)Activator.CreateInstance(type, this, resources);
+        }
+
+        public List<SkinFileInfo> Files { get; set; } = new List<SkinFileInfo>();
 
         public List<DatabasedSetting> Settings { get; set; }
 
@@ -32,7 +63,8 @@ namespace osu.Game.Skinning
         {
             ID = DEFAULT_SKIN,
             Name = "osu!lazer",
-            Creator = "team osu!"
+            Creator = "team osu!",
+            InstantiationInfo = typeof(DefaultSkin).AssemblyQualifiedName,
         };
 
         public bool Equals(SkinInfo other) => other != null && ID == other.ID;
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index ac4d63159a..dbb9dcb7fc 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Skinning
 
         private readonly IResourceStore<byte[]> legacyDefaultResources;
 
-        public readonly Bindable<Skin> CurrentSkin = new Bindable<Skin>(new DefaultSkin());
+        public readonly Bindable<Skin> CurrentSkin = new Bindable<Skin>(new DefaultSkin(null));
         public readonly Bindable<SkinInfo> CurrentSkinInfo = new Bindable<SkinInfo>(SkinInfo.Default) { Default = SkinInfo.Default };
 
         public override IEnumerable<string> HandledExtensions => new[] { ".osk" };
@@ -105,7 +105,7 @@ namespace osu.Game.Skinning
         {
             // we need to populate early to create a hash based off skin.ini contents
             if (item.Name?.Contains(".osk", StringComparison.OrdinalIgnoreCase) == true)
-                populateMetadata(item);
+                populateMetadata(item, GetSkin(item));
 
             if (item.Creator != null && item.Creator != unknown_creator_string)
             {
@@ -122,18 +122,20 @@ namespace osu.Game.Skinning
         {
             await base.Populate(model, archive, cancellationToken).ConfigureAwait(false);
 
+            var instance = GetSkin(model);
+
+            model.InstantiationInfo ??= instance.GetType().AssemblyQualifiedName;
+
             if (model.Name?.Contains(".osk", StringComparison.OrdinalIgnoreCase) == true)
-                populateMetadata(model);
+                populateMetadata(model, instance);
         }
 
-        private void populateMetadata(SkinInfo item)
+        private void populateMetadata(SkinInfo item, Skin instance)
         {
-            Skin reference = GetSkin(item);
-
-            if (!string.IsNullOrEmpty(reference.Configuration.SkinInfo.Name))
+            if (!string.IsNullOrEmpty(instance.Configuration.SkinInfo.Name))
             {
-                item.Name = reference.Configuration.SkinInfo.Name;
-                item.Creator = reference.Configuration.SkinInfo.Creator;
+                item.Name = instance.Configuration.SkinInfo.Name;
+                item.Creator = instance.Configuration.SkinInfo.Creator;
             }
             else
             {
@@ -147,16 +149,7 @@ namespace osu.Game.Skinning
         /// </summary>
         /// <param name="skinInfo">The skin to lookup.</param>
         /// <returns>A <see cref="Skin"/> instance correlating to the provided <see cref="SkinInfo"/>.</returns>
-        public Skin GetSkin(SkinInfo skinInfo)
-        {
-            if (skinInfo == SkinInfo.Default)
-                return new DefaultSkin();
-
-            if (skinInfo == DefaultLegacySkin.Info)
-                return new DefaultLegacySkin(legacyDefaultResources, this);
-
-            return new LegacySkin(skinInfo, this);
-        }
+        public Skin GetSkin(SkinInfo skinInfo) => skinInfo.CreateInstance(legacyDefaultResources, this);
 
         /// <summary>
         /// Perform a lookup query on available <see cref="SkinInfo"/>s.

From 822d99e69f92f1ef07b04f242219210eaf0c9971 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 May 2021 20:42:13 +0300
Subject: [PATCH 3313/3722] Remove pointless test scenes

---
 .../Online/TestSceneNewsMonthDropdown.cs      | 71 -------------------
 .../Visual/Online/TestSceneNewsSideBar.cs     | 31 +++-----
 .../Visual/Online/TestSceneNewsYearsPanel.cs  | 47 ------------
 3 files changed, 9 insertions(+), 140 deletions(-)
 delete mode 100644 osu.Game.Tests/Visual/Online/TestSceneNewsMonthDropdown.cs
 delete mode 100644 osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsMonthDropdown.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsMonthDropdown.cs
deleted file mode 100644
index f03b7d3f58..0000000000
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsMonthDropdown.cs
+++ /dev/null
@@ -1,71 +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 NUnit.Framework;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Overlays;
-using osu.Game.Overlays.News.Sidebar;
-
-namespace osu.Game.Tests.Visual.Online
-{
-    public class TestSceneNewsMonthDropdown : OsuTestScene
-    {
-        [Cached]
-        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
-
-        [Test]
-        public void CreateClosedMonthPanel()
-        {
-            create(false);
-        }
-
-        [Test]
-        public void CreateOpenMonthPanel()
-        {
-            create(true);
-        }
-
-        private void create(bool isOpen) => AddStep("Create", () => Child = new Container
-        {
-            Anchor = Anchor.Centre,
-            Origin = Anchor.TopCentre,
-            AutoSizeAxes = Axes.Y,
-            Width = 160,
-            Children = new Drawable[]
-            {
-                new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = colourProvider.Background2,
-                },
-                new MonthDropdown(posts)
-                {
-                    IsOpen = { Value = isOpen }
-                }
-            }
-        });
-
-        private static List<APINewsPost> posts => new List<APINewsPost>
-        {
-            new APINewsPost
-            {
-                Title = "Short title",
-                PublishedAt = DateTimeOffset.Now
-            },
-            new APINewsPost
-            {
-                Title = "Oh boy that's a long post title I wonder if it will break anything"
-            },
-            new APINewsPost
-            {
-                Title = "Medium title, nothing to see here"
-            }
-        };
-    }
-}
diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
index 96161c28ed..8b09a3d176 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
@@ -3,8 +3,10 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Testing;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
 using osu.Game.Overlays.News.Sidebar;
@@ -18,33 +20,18 @@ namespace osu.Game.Tests.Visual.Online
 
         private NewsSideBar sidebar;
 
-        [Test]
-        public void TestCreateEmpty()
-        {
-            createSidebar(null);
-        }
+        [SetUp]
+        public void SetUp() => Schedule(() => Child = sidebar = new NewsSideBar());
 
         [Test]
-        public void TestCreateWithData()
+        public void TestMetadataChange()
         {
-            createSidebar(metadata);
+            AddUntilStep("Years panel is hidden", () => yearsPanel?.Alpha == 0);
+            AddStep("Add data", () => sidebar.Metadata.Value = metadata);
+            AddUntilStep("Years panel is visible", () => yearsPanel?.Alpha == 1);
         }
 
-        [Test]
-        public void TestDataChange()
-        {
-            createSidebar(null);
-            AddStep("Add data", () =>
-            {
-                if (sidebar != null)
-                    sidebar.Metadata.Value = metadata;
-            });
-        }
-
-        private void createSidebar(APINewsSidebar metadata) => AddStep("Create", () => Child = sidebar = new NewsSideBar
-        {
-            Metadata = { Value = metadata }
-        });
+        private YearsPanel yearsPanel => sidebar.ChildrenOfType<YearsPanel>().FirstOrDefault();
 
         private static readonly APINewsSidebar metadata = new APINewsSidebar
         {
diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
deleted file mode 100644
index 3199b83a7d..0000000000
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsYearsPanel.cs
+++ /dev/null
@@ -1,47 +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;
-using osu.Game.Overlays.News.Sidebar;
-using osu.Framework.Allocation;
-using osu.Game.Overlays;
-using osu.Framework.Bindables;
-using osu.Game.Online.API.Requests.Responses;
-using NUnit.Framework;
-
-namespace osu.Game.Tests.Visual.Online
-{
-    public class TestSceneNewsYearsPanel : OsuTestScene
-    {
-        [Cached]
-        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
-
-        [Cached]
-        private readonly Bindable<APINewsSidebar> metadataBindable = new Bindable<APINewsSidebar>();
-
-        private YearsPanel panel;
-
-        [SetUp]
-        public void SetUp() => Schedule(() => Child = panel = new YearsPanel
-        {
-            Anchor = Anchor.Centre,
-            Origin = Anchor.Centre
-        });
-
-        [Test]
-        public void TestVisibility()
-        {
-            AddStep("Change metadata to null", () => metadataBindable.Value = null);
-            AddUntilStep("Panel is hidden", () => panel?.Alpha == 0);
-            AddStep("Change metadata", () => metadataBindable.Value = metadata);
-            AddUntilStep("Panel is visible", () => panel?.Alpha == 1);
-            AddStep("Change metadata to null", () => metadataBindable.Value = null);
-            AddUntilStep("Panel is hidden", () => panel?.Alpha == 0);
-        }
-
-        private static readonly APINewsSidebar metadata = new APINewsSidebar
-        {
-            Years = new[] { 1001, 2001, 3001, 4001, 5001, 6001, 7001, 8001, 9001 }
-        };
-    }
-}

From b0297c6324cff8807952194154271261f4155b4a Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 May 2021 20:52:11 +0300
Subject: [PATCH 3314/3722] Fix incorrect no posts handling and add
 corresponding test

---
 .../Visual/Online/TestSceneNewsSideBar.cs     | 28 ++++++++++++++++++-
 osu.Game/Overlays/News/Sidebar/NewsSideBar.cs |  2 +-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
index 8b09a3d176..b5405a979e 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
@@ -24,13 +24,20 @@ namespace osu.Game.Tests.Visual.Online
         public void SetUp() => Schedule(() => Child = sidebar = new NewsSideBar());
 
         [Test]
-        public void TestMetadataChange()
+        public void TestYearsPanelVisibility()
         {
             AddUntilStep("Years panel is hidden", () => yearsPanel?.Alpha == 0);
             AddStep("Add data", () => sidebar.Metadata.Value = metadata);
             AddUntilStep("Years panel is visible", () => yearsPanel?.Alpha == 1);
         }
 
+        [Test]
+        public void TestMetadataWithNoPosts()
+        {
+            AddStep("Add data with no posts", () => sidebar.Metadata.Value = metadata_with_no_posts);
+            AddUntilStep("No dropdowns were created", () => !sidebar.ChildrenOfType<MonthDropdown>().Any());
+        }
+
         private YearsPanel yearsPanel => sidebar.ChildrenOfType<YearsPanel>().FirstOrDefault();
 
         private static readonly APINewsSidebar metadata = new APINewsSidebar
@@ -97,5 +104,24 @@ namespace osu.Game.Tests.Visual.Online
                 }
             }
         };
+
+        private static readonly APINewsSidebar metadata_with_no_posts = new APINewsSidebar
+        {
+            CurrentYear = 2022,
+            Years = new[]
+            {
+                2022,
+                2021,
+                2020,
+                2019,
+                2018,
+                2017,
+                2016,
+                2015,
+                2014,
+                2013
+            },
+            NewsPosts = Array.Empty<APINewsPost>()
+        };
     }
 }
diff --git a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
index 7de7e4dd71..baa1826185 100644
--- a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
+++ b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Overlays.News.Sidebar
 
             var allPosts = metadata.NewValue.NewsPosts;
 
-            if (!allPosts?.Any() ?? false)
+            if (!allPosts?.Any() ?? true)
                 return;
 
             var lookup = metadata.NewValue.NewsPosts.ToLookup(post => post.PublishedAt.Month);

From f4801c08ff9693c8e97a5252b96a38fe6f288760 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 May 2021 22:34:01 +0300
Subject: [PATCH 3315/3722] Refactor MonthDropdown to ensure all the posts are
 within a given month

---
 osu.Game/Overlays/News/Sidebar/MonthDropdown.cs | 11 ++++++++---
 osu.Game/Overlays/News/Sidebar/NewsSideBar.cs   |  7 +++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs b/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
index 11c0ce863f..91412d9527 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
@@ -14,6 +14,7 @@ using System.Linq;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
+using System.Diagnostics;
 
 namespace osu.Game.Overlays.News.Sidebar
 {
@@ -26,8 +27,10 @@ namespace osu.Game.Overlays.News.Sidebar
 
         private readonly FillFlowContainer postsFlow;
 
-        public MonthDropdown(IEnumerable<APINewsPost> posts)
+        public MonthDropdown(int month, int year, IEnumerable<APINewsPost> posts)
         {
+            Debug.Assert(posts.All(p => p.PublishedAt.Month == month && p.PublishedAt.Year == year));
+
             RelativeSizeAxes = Axes.X;
             Masking = true;
             InternalChild = new FillFlowContainer
@@ -38,7 +41,7 @@ namespace osu.Game.Overlays.News.Sidebar
                 Spacing = new Vector2(0, 5),
                 Children = new Drawable[]
                 {
-                    new DropdownHeader(posts.ElementAt(0).PublishedAt)
+                    new DropdownHeader(month, year)
                     {
                         IsOpen = { BindTarget = IsOpen }
                     },
@@ -102,8 +105,10 @@ namespace osu.Game.Overlays.News.Sidebar
 
             private readonly SpriteIcon icon;
 
-            public DropdownHeader(DateTimeOffset date)
+            public DropdownHeader(int month, int year)
             {
+                var date = new DateTime(year, month, 1);
+
                 RelativeSizeAxes = Axes.X;
                 Height = header_height;
                 Action = IsOpen.Toggle;
diff --git a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
index baa1826185..3851dea83a 100644
--- a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
+++ b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
@@ -86,11 +86,14 @@ namespace osu.Game.Overlays.News.Sidebar
             var keys = lookup.Select(kvp => kvp.Key);
             var sortedKeys = keys.OrderByDescending(k => k).ToList();
 
+            var year = metadata.NewValue.CurrentYear;
+
             for (int i = 0; i < sortedKeys.Count; i++)
             {
-                var posts = lookup[sortedKeys[i]];
+                var month = sortedKeys[i];
+                var posts = lookup[month];
 
-                monthsFlow.Add(new MonthDropdown(posts)
+                monthsFlow.Add(new MonthDropdown(month, year, posts)
                 {
                     IsOpen = { Value = i == 0 }
                 });

From 20a6903a40e1a59a253714780718192e1f195837 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 May 2021 23:43:01 +0300
Subject: [PATCH 3316/3722] Use GridContainer to distribute buttons in
 YearsPanel

---
 osu.Game/Overlays/News/Sidebar/YearsPanel.cs | 93 +++++++++++++++++---
 1 file changed, 79 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
index c06a8424f6..2a4e2024d2 100644
--- a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
@@ -5,14 +5,13 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
-using osuTK;
-using System.Linq;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using System.Collections.Generic;
 using osu.Game.Graphics;
 using osu.Framework.Bindables;
 using osu.Game.Online.API.Requests.Responses;
+using System;
 
 namespace osu.Game.Overlays.News.Sidebar
 {
@@ -20,15 +19,15 @@ namespace osu.Game.Overlays.News.Sidebar
     {
         private readonly Bindable<APINewsSidebar> metadata = new Bindable<APINewsSidebar>();
 
-        private FillFlowContainer<YearButton> flow;
+        private Container gridPlaceholder;
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider, Bindable<APINewsSidebar> metadata)
         {
             this.metadata.BindTo(metadata);
 
-            Width = 160;
             AutoSizeAxes = Axes.Y;
+            RelativeSizeAxes = Axes.X;
             Masking = true;
             CornerRadius = 6;
             InternalChildren = new Drawable[]
@@ -38,17 +37,11 @@ namespace osu.Game.Overlays.News.Sidebar
                     RelativeSizeAxes = Axes.Both,
                     Colour = colourProvider.Background3
                 },
-                new Container
+                gridPlaceholder = new Container
                 {
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
-                    Padding = new MarginPadding(5),
-                    Child = flow = new FillFlowContainer<YearButton>
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Spacing = new Vector2(5)
-                    }
+                    Padding = new MarginPadding(5)
                 }
             };
         }
@@ -65,7 +58,7 @@ namespace osu.Game.Overlays.News.Sidebar
                     return;
                 }
 
-                flow.Children = m.NewValue.Years.Select(y => new YearButton(y)).ToArray();
+                gridPlaceholder.Child = new YearsGridContainer(m.NewValue.Years);
                 Show();
             }, true);
         }
@@ -78,7 +71,8 @@ namespace osu.Game.Overlays.News.Sidebar
 
             public YearButton(int year)
             {
-                Size = new Vector2(33.75f, 15);
+                RelativeSizeAxes = Axes.X;
+                Height = 15;
                 Child = text = new OsuSpriteText
                 {
                     Anchor = Anchor.Centre,
@@ -96,5 +90,76 @@ namespace osu.Game.Overlays.News.Sidebar
                 Action = () => { }; // Avoid button being disabled since there's no proper action assigned.
             }
         }
+
+        private class YearsGridContainer : GridContainer
+        {
+            private const int column_count = 4;
+            private const float spacing = 5f;
+
+            private readonly int rowCount;
+            private readonly int[] years;
+
+            public YearsGridContainer(int[] years)
+            {
+                this.years = years;
+                rowCount = (int)Math.Ceiling((float)years.Length / column_count);
+
+                RelativeSizeAxes = Axes.X;
+                AutoSizeAxes = Axes.Y;
+                RowDimensions = getRowDimensions();
+                ColumnDimensions = getColumnDimensions();
+                Content = createContent();
+            }
+
+            private Dimension[] getRowDimensions()
+            {
+                var rowDimensions = new Dimension[rowCount];
+                for (int i = 0; i < rowCount; i++)
+                    rowDimensions[i] = new Dimension(GridSizeMode.AutoSize);
+
+                return rowDimensions;
+            }
+
+            private Dimension[] getColumnDimensions()
+            {
+                var columnDimensions = new Dimension[column_count];
+                for (int i = 0; i < column_count; i++)
+                    columnDimensions[i] = new Dimension(GridSizeMode.Relative, size: 1f / column_count);
+
+                return columnDimensions;
+            }
+
+            private Drawable[][] createContent()
+            {
+                var buttons = new Drawable[rowCount][];
+
+                for (int i = 0; i < rowCount; i++)
+                {
+                    buttons[i] = new Drawable[column_count];
+
+                    for (int j = 0; j < column_count; j++)
+                    {
+                        var index = i * column_count + j;
+                        buttons[i][j] = index >= years.Length
+                            ? Empty()
+                            : new Container
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y,
+                                Padding = new MarginPadding
+                                {
+                                    Top = i == 0 ? 0 : spacing / 2,
+                                    Bottom = i == rowCount - 1 ? 0 : spacing / 2,
+                                    Left = j == 0 ? 0 : spacing / 2,
+                                    Right = j == column_count - 1 ? 0 : spacing / 2
+                                },
+                                Child = new YearButton(years[index])
+                            };
+                    }
+                }
+
+                return buttons;
+            }
+        }
     }
 }

From d706073e014c1849cabf2b252a292188b26f8173 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 11 May 2021 23:08:50 +0200
Subject: [PATCH 3317/3722] Trim empty remarks xmldoc tag

---
 osu.Game.Rulesets.Mania/UI/Column.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index fcbbd8a01c..88c3bd5dbf 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -31,9 +31,6 @@ namespace osu.Game.Rulesets.Mania.UI
         /// For hitsounds played by this <see cref="Column"/> (i.e. not as a result of hitting a hitobject),
         /// a certain number of samples are allowed to be played concurrently so that it feels better when spam-pressing the key.
         /// </summary>
-        /// <remarks>
-        ///
-        /// </remarks>
         private const int max_concurrent_hitsounds = OsuGameBase.SAMPLE_CONCURRENCY;
 
         /// <summary>

From 97bd482d4dae632548438ec05315ac37aec8c8fa Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 12 May 2021 01:21:38 +0200
Subject: [PATCH 3318/3722] Factor out `load` from settings into new `Settings`
 class

---
 osu.Game/Screens/Edit/Settings.cs             | 44 +++++++++++++++++++
 .../Edit/Timing/ControlPointSettings.cs       | 35 +--------------
 osu.Game/Screens/Edit/Verify/IssueSettings.cs | 32 +-------------
 3 files changed, 48 insertions(+), 63 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/Settings.cs

diff --git a/osu.Game/Screens/Edit/Settings.cs b/osu.Game/Screens/Edit/Settings.cs
new file mode 100644
index 0000000000..758414333d
--- /dev/null
+++ b/osu.Game/Screens/Edit/Settings.cs
@@ -0,0 +1,44 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics.Containers;
+using osu.Game.Overlays;
+
+namespace osu.Game.Screens.Edit
+{
+    public abstract class Settings : CompositeDrawable
+    {
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colours)
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            InternalChildren = new Drawable[]
+            {
+                new Box
+                {
+                    Colour = colours.Background4,
+                    RelativeSizeAxes = Axes.Both,
+                },
+                new OsuScrollContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Child = new FillFlowContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Direction = FillDirection.Vertical,
+                        Children = CreateSections()
+                    },
+                }
+            };
+        }
+
+        protected abstract IReadOnlyList<Drawable> CreateSections();
+    }
+}
diff --git a/osu.Game/Screens/Edit/Timing/ControlPointSettings.cs b/osu.Game/Screens/Edit/Timing/ControlPointSettings.cs
index 921fa675b3..36f31d4be4 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointSettings.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointSettings.cs
@@ -2,44 +2,13 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics.Containers;
-using osu.Game.Overlays;
 
 namespace osu.Game.Screens.Edit.Timing
 {
-    public class ControlPointSettings : CompositeDrawable
+    public class ControlPointSettings : Settings
     {
-        [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colours)
-        {
-            RelativeSizeAxes = Axes.Both;
-
-            InternalChildren = new Drawable[]
-            {
-                new Box
-                {
-                    Colour = colours.Background4,
-                    RelativeSizeAxes = Axes.Both,
-                },
-                new OsuScrollContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Child = new FillFlowContainer
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Direction = FillDirection.Vertical,
-                        Children = createSections()
-                    },
-                }
-            };
-        }
-
-        private IReadOnlyList<Drawable> createSections() => new Drawable[]
+        protected override IReadOnlyList<Drawable> CreateSections() => new Drawable[]
         {
             new GroupSection(),
             new TimingSection(),
diff --git a/osu.Game/Screens/Edit/Verify/IssueSettings.cs b/osu.Game/Screens/Edit/Verify/IssueSettings.cs
index 4519231cd2..15fc54d64f 100644
--- a/osu.Game/Screens/Edit/Verify/IssueSettings.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueSettings.cs
@@ -2,44 +2,16 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Screens.Edit.Verify
 {
-    public class IssueSettings : CompositeDrawable
+    public class IssueSettings : Settings
     {
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            RelativeSizeAxes = Axes.Both;
 
-            InternalChildren = new Drawable[]
-            {
-                new Box
-                {
-                    Colour = colours.Gray3,
-                    RelativeSizeAxes = Axes.Both,
-                },
-                new OsuScrollContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Child = new FillFlowContainer
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Direction = FillDirection.Vertical,
-                        Children = createSections()
-                    },
-                }
-            };
         }
 
-        private IReadOnlyList<Drawable> createSections() => new Drawable[]
+        protected override IReadOnlyList<Drawable> CreateSections() => new Drawable[]
         {
         };
     }

From d3c1ec55eec7399ea8405d1f39ee92a6f9b2fca6 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 12 May 2021 01:22:32 +0200
Subject: [PATCH 3319/3722] Take `IssueList` in `IssueSettings` constructor

We'll be using this for bindables later.
---
 osu.Game/Screens/Edit/Verify/IssueSettings.cs | 4 ++++
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs  | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Verify/IssueSettings.cs b/osu.Game/Screens/Edit/Verify/IssueSettings.cs
index 15fc54d64f..be06700b28 100644
--- a/osu.Game/Screens/Edit/Verify/IssueSettings.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueSettings.cs
@@ -8,7 +8,11 @@ namespace osu.Game.Screens.Edit.Verify
 {
     public class IssueSettings : Settings
     {
+        private readonly IssueList issueList;
 
+        public IssueSettings(IssueList issueList)
+        {
+            this.issueList = issueList;
         }
 
         protected override IReadOnlyList<Drawable> CreateSections() => new Drawable[]
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index 9de1f04271..9fb81a6681 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Screens.Edit.Verify
         [BackgroundDependencyLoader]
         private void load()
         {
+            IssueList issueList;
+
             Child = new Container
             {
                 RelativeSizeAxes = Axes.Both,
@@ -45,8 +47,8 @@ namespace osu.Game.Screens.Edit.Verify
                     {
                         new Drawable[]
                         {
-                            new IssueList(),
-                            new IssueSettings(),
+                            issueList = new IssueList(),
+                            new IssueSettings(issueList),
                         },
                     }
                 }

From 1de35f880b8b571e7aa89c597c69a8dcd1dd8dde Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 12 May 2021 01:23:31 +0200
Subject: [PATCH 3320/3722] Separate `IssueList` into own class

---
 osu.Game/Screens/Edit/Verify/IssueList.cs    | 100 +++++++++++++++++++
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs |  88 ----------------
 2 files changed, 100 insertions(+), 88 deletions(-)
 create mode 100644 osu.Game/Screens/Edit/Verify/IssueList.cs

diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
new file mode 100644
index 0000000000..6d319eb09e
--- /dev/null
+++ b/osu.Game/Screens/Edit/Verify/IssueList.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.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.Game.Beatmaps;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays;
+using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Edit.Checks.Components;
+using osuTK;
+
+namespace osu.Game.Screens.Edit.Verify
+{
+    public class IssueList : CompositeDrawable
+    {
+        private IssueTable table;
+
+        [Resolved]
+        private EditorClock clock { get; set; }
+
+        [Resolved]
+        private IBindable<WorkingBeatmap> workingBeatmap { get; set; }
+
+        [Resolved]
+        private EditorBeatmap beatmap { get; set; }
+
+        [Resolved]
+        private Bindable<Issue> selectedIssue { get; set; }
+
+        private IBeatmapVerifier rulesetVerifier;
+        private BeatmapVerifier generalVerifier;
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colours)
+        {
+            generalVerifier = new BeatmapVerifier();
+            rulesetVerifier = beatmap.BeatmapInfo.Ruleset?.CreateInstance()?.CreateBeatmapVerifier();
+
+            RelativeSizeAxes = Axes.Both;
+
+            InternalChildren = new Drawable[]
+            {
+                new Box
+                {
+                    Colour = colours.Background2,
+                    RelativeSizeAxes = Axes.Both,
+                },
+                new OsuScrollContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Child = table = new IssueTable(),
+                },
+                new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Anchor = Anchor.BottomRight,
+                    Origin = Anchor.BottomRight,
+                    Margin = new MarginPadding(20),
+                    Children = new Drawable[]
+                    {
+                        new TriangleButton
+                        {
+                            Text = "Refresh",
+                            Action = refresh,
+                            Size = new Vector2(120, 40),
+                            Anchor = Anchor.BottomRight,
+                            Origin = Anchor.BottomRight,
+                        },
+                    }
+                },
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            refresh();
+        }
+
+        private void refresh()
+        {
+            var issues = generalVerifier.Run(beatmap, workingBeatmap.Value);
+
+            if (rulesetVerifier != null)
+                issues = issues.Concat(rulesetVerifier.Run(beatmap, workingBeatmap.Value));
+
+            table.Issues = issues
+                           .OrderBy(issue => issue.Template.Type)
+                           .ThenBy(issue => issue.Check.Metadata.Category);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index 9fb81a6681..ed4658da8e 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -1,19 +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 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.Graphics.Containers;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Overlays;
-using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Checks.Components;
-using osuTK;
 
 namespace osu.Game.Screens.Edit.Verify
 {
@@ -54,85 +46,5 @@ namespace osu.Game.Screens.Edit.Verify
                 }
             };
         }
-
-        public class IssueList : CompositeDrawable
-        {
-            private IssueTable table;
-
-            [Resolved]
-            private EditorClock clock { get; set; }
-
-            [Resolved]
-            private IBindable<WorkingBeatmap> workingBeatmap { get; set; }
-
-            [Resolved]
-            private EditorBeatmap beatmap { get; set; }
-
-            [Resolved]
-            private Bindable<Issue> selectedIssue { get; set; }
-
-            private IBeatmapVerifier rulesetVerifier;
-            private BeatmapVerifier generalVerifier;
-
-            [BackgroundDependencyLoader]
-            private void load(OverlayColourProvider colours)
-            {
-                generalVerifier = new BeatmapVerifier();
-                rulesetVerifier = beatmap.BeatmapInfo.Ruleset?.CreateInstance()?.CreateBeatmapVerifier();
-
-                RelativeSizeAxes = Axes.Both;
-
-                InternalChildren = new Drawable[]
-                {
-                    new Box
-                    {
-                        Colour = colours.Background2,
-                        RelativeSizeAxes = Axes.Both,
-                    },
-                    new OsuScrollContainer
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Child = table = new IssueTable(),
-                    },
-                    new FillFlowContainer
-                    {
-                        AutoSizeAxes = Axes.Both,
-                        Anchor = Anchor.BottomRight,
-                        Origin = Anchor.BottomRight,
-                        Margin = new MarginPadding(20),
-                        Children = new Drawable[]
-                        {
-                            new TriangleButton
-                            {
-                                Text = "Refresh",
-                                Action = refresh,
-                                Size = new Vector2(120, 40),
-                                Anchor = Anchor.BottomRight,
-                                Origin = Anchor.BottomRight,
-                            },
-                        }
-                    },
-                };
-            }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-
-                refresh();
-            }
-
-            private void refresh()
-            {
-                var issues = generalVerifier.Run(beatmap, workingBeatmap.Value);
-
-                if (rulesetVerifier != null)
-                    issues = issues.Concat(rulesetVerifier.Run(beatmap, workingBeatmap.Value));
-
-                table.Issues = issues
-                               .OrderBy(issue => issue.Template.Type)
-                               .ThenBy(issue => issue.Check.Metadata.Category);
-            }
-        }
     }
 }

From 01b87947579c417395458c2832ba730d331d6e6b Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 12 May 2021 01:26:12 +0200
Subject: [PATCH 3321/3722] Add abstract `Section` class

Similar to `Section` in the timing screen, but does not make use of checkboxes, nor specific to control points.

So there's a lot of things that differ, hence new class instead of factoring that out.
---
 osu.Game/Screens/Edit/Verify/Section.cs | 67 +++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 osu.Game/Screens/Edit/Verify/Section.cs

diff --git a/osu.Game/Screens/Edit/Verify/Section.cs b/osu.Game/Screens/Edit/Verify/Section.cs
new file mode 100644
index 0000000000..f6815a05a1
--- /dev/null
+++ b/osu.Game/Screens/Edit/Verify/Section.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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Overlays;
+using osuTK;
+
+namespace osu.Game.Screens.Edit.Verify
+{
+    public abstract class Section : CompositeDrawable
+    {
+        private const int header_height = 50;
+
+        protected readonly IssueList IssueList;
+
+        protected FillFlowContainer Flow;
+        protected abstract string Header { get; }
+
+        protected Section(IssueList issueList)
+        {
+            IssueList = issueList;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colours)
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+            Masking = true;
+
+            InternalChildren = new Drawable[]
+            {
+                new Container
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Height = header_height,
+                    Padding = new MarginPadding { Horizontal = 20 },
+                    Child = new OsuSpriteText
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Text = Header,
+                        Font = new FontUsage(size: 25, weight: "bold")
+                    }
+                },
+                new Container
+                {
+                    Y = header_height,
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Child = Flow = new FillFlowContainer
+                    {
+                        Padding = new MarginPadding { Horizontal = 20 },
+                        Spacing = new Vector2(10),
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Direction = FillDirection.Vertical,
+                    }
+                }
+            };
+        }
+    }
+}

From 2e4399f0c1f4bcb5cc66bf755f0e4954ab5c6b66 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 12 May 2021 01:27:21 +0200
Subject: [PATCH 3322/3722] Add `VisibilitySection` and its bindables in
 `IssueList`

---
 osu.Game/Screens/Edit/Verify/IssueList.cs     | 10 +++++
 osu.Game/Screens/Edit/Verify/IssueSettings.cs |  1 +
 .../Screens/Edit/Verify/VisibilitySection.cs  | 38 +++++++++++++++++++
 3 files changed, 49 insertions(+)
 create mode 100644 osu.Game/Screens/Edit/Verify/VisibilitySection.cs

diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
index 6d319eb09e..dd1dffcb42 100644
--- a/osu.Game/Screens/Edit/Verify/IssueList.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueList.cs
@@ -34,12 +34,22 @@ namespace osu.Game.Screens.Edit.Verify
         [Resolved]
         private Bindable<Issue> selectedIssue { get; set; }
 
+        public Dictionary<IssueType, Bindable<bool>> ShowType { get; set; }
+
         private IBeatmapVerifier rulesetVerifier;
         private BeatmapVerifier generalVerifier;
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colours)
         {
+            // Reflects the user interface. Only types in this dictionary have configurable visibility.
+            ShowType = new Dictionary<IssueType, Bindable<bool>>
+            {
+                { IssueType.Warning, new Bindable<bool>(true) },
+                { IssueType.Error, new Bindable<bool>(true) },
+                { IssueType.Negligible, new Bindable<bool>(false) }
+            };
+
             generalVerifier = new BeatmapVerifier();
             rulesetVerifier = beatmap.BeatmapInfo.Ruleset?.CreateInstance()?.CreateBeatmapVerifier();
 
diff --git a/osu.Game/Screens/Edit/Verify/IssueSettings.cs b/osu.Game/Screens/Edit/Verify/IssueSettings.cs
index be06700b28..0df3ab0dcb 100644
--- a/osu.Game/Screens/Edit/Verify/IssueSettings.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueSettings.cs
@@ -17,6 +17,7 @@ namespace osu.Game.Screens.Edit.Verify
 
         protected override IReadOnlyList<Drawable> CreateSections() => new Drawable[]
         {
+            new VisibilitySection(issueList)
         };
     }
 }
diff --git a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
new file mode 100644
index 0000000000..e9fa9b56ed
--- /dev/null
+++ b/osu.Game/Screens/Edit/Verify/VisibilitySection.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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Settings;
+using osu.Game.Rulesets.Edit.Checks.Components;
+
+namespace osu.Game.Screens.Edit.Verify
+{
+    internal class VisibilitySection : Section
+    {
+        public VisibilitySection(IssueList issueList)
+            : base(issueList)
+        {
+        }
+
+        protected override string Header => "Visibility";
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colours)
+        {
+            foreach (IssueType issueType in IssueList.ShowType.Keys)
+            {
+                var checkbox = new SettingsCheckbox
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    LabelText = issueType.ToString()
+                };
+
+                checkbox.Current.BindTo(IssueList.ShowType[issueType]);
+                Flow.Add(checkbox);
+            }
+        }
+    }
+}

From 1bb7d412daf2ad534dcb3a09161f459fb698e535 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 12 May 2021 01:29:46 +0200
Subject: [PATCH 3323/3722] Add `IssueList` filtering based on those bindables

---
 osu.Game/Screens/Edit/Verify/IssueList.cs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
index dd1dffcb42..7a2202c198 100644
--- a/osu.Game/Screens/Edit/Verify/IssueList.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueList.cs
@@ -102,9 +102,22 @@ namespace osu.Game.Screens.Edit.Verify
             if (rulesetVerifier != null)
                 issues = issues.Concat(rulesetVerifier.Run(beatmap, workingBeatmap.Value));
 
+            issues = filter(issues);
+
             table.Issues = issues
                            .OrderBy(issue => issue.Template.Type)
                            .ThenBy(issue => issue.Check.Metadata.Category);
         }
+
+        private IEnumerable<Issue> filter(IEnumerable<Issue> issues)
+        {
+            foreach (IssueType issueType in ShowType.Keys)
+            {
+                if (!ShowType[issueType].Value)
+                    issues = issues.Where(issue => issue.Template.Type != issueType);
+            }
+
+            return issues;
+        }
     }
 }

From ad78aec1ef8380db80d9e57eb495fa3be2aa2c38 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 12 May 2021 01:30:45 +0200
Subject: [PATCH 3324/3722] Refresh `IssueList` on changes in
 `VisibilitySection`

---
 osu.Game/Screens/Edit/Verify/IssueList.cs         | 6 +++---
 osu.Game/Screens/Edit/Verify/VisibilitySection.cs | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
index 7a2202c198..b7a6d769e3 100644
--- a/osu.Game/Screens/Edit/Verify/IssueList.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueList.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Screens.Edit.Verify
                         new TriangleButton
                         {
                             Text = "Refresh",
-                            Action = refresh,
+                            Action = Refresh,
                             Size = new Vector2(120, 40),
                             Anchor = Anchor.BottomRight,
                             Origin = Anchor.BottomRight,
@@ -92,10 +92,10 @@ namespace osu.Game.Screens.Edit.Verify
         {
             base.LoadComplete();
 
-            refresh();
+            Refresh();
         }
 
-        private void refresh()
+        public void Refresh()
         {
             var issues = generalVerifier.Run(beatmap, workingBeatmap.Value);
 
diff --git a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
index e9fa9b56ed..f849426800 100644
--- a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
+++ b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
@@ -31,6 +31,7 @@ namespace osu.Game.Screens.Edit.Verify
                 };
 
                 checkbox.Current.BindTo(IssueList.ShowType[issueType]);
+                checkbox.Current.BindValueChanged(_ => IssueList.Refresh());
                 Flow.Add(checkbox);
             }
         }

From 75adec57ebfa8aaefcb124d3c802e2e8f69ee0a4 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 12 May 2021 01:31:16 +0200
Subject: [PATCH 3325/3722] Remove negligible default hidden TODO

---
 osu.Game/Rulesets/Edit/Checks/Components/IssueType.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/Components/IssueType.cs b/osu.Game/Rulesets/Edit/Checks/Components/IssueType.cs
index 1241e058ad..1f708209fe 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/IssueType.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/IssueType.cs
@@ -18,7 +18,6 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// <summary> An error occurred and a complete check could not be made. </summary>
         Error,
 
-        // TODO: Negligible issues should be hidden by default.
         /// <summary> A possible mistake so minor/unlikely that it can often be safely ignored. </summary>
         Negligible,
     }

From 4aeaec6ecc610e4c043881451ff6495edea6bcbe Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 12 May 2021 01:32:18 +0200
Subject: [PATCH 3326/3722] Add `InterpretationSection` and its bindable in
 `IssueList`

We'll eventually connect that bindable so that checks can access it.
---
 .../Edit/Verify/InterpretationSection.cs      | 34 +++++++++++++++++++
 osu.Game/Screens/Edit/Verify/IssueList.cs     |  4 +++
 osu.Game/Screens/Edit/Verify/IssueSettings.cs |  1 +
 3 files changed, 39 insertions(+)
 create mode 100644 osu.Game/Screens/Edit/Verify/InterpretationSection.cs

diff --git a/osu.Game/Screens/Edit/Verify/InterpretationSection.cs b/osu.Game/Screens/Edit/Verify/InterpretationSection.cs
new file mode 100644
index 0000000000..fa0bde9ddc
--- /dev/null
+++ b/osu.Game/Screens/Edit/Verify/InterpretationSection.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;
+using osu.Game.Beatmaps;
+using osu.Game.Overlays.Settings;
+
+namespace osu.Game.Screens.Edit.Verify
+{
+    internal class InterpretationSection : Section
+    {
+        public InterpretationSection(IssueList issueList)
+            : base(issueList)
+        {
+        }
+
+        protected override string Header => "Interpretation";
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            var dropdown = new SettingsEnumDropdown<DifficultyRating>
+            {
+                Anchor = Anchor.CentreLeft,
+                Origin = Anchor.CentreLeft,
+                TooltipText = "Affects checks that depend on difficulty level"
+            };
+            dropdown.Current.BindTo(IssueList.InterpretedDifficulty);
+
+            Flow.Add(dropdown);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
index b7a6d769e3..3e836c4010 100644
--- a/osu.Game/Screens/Edit/Verify/IssueList.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueList.cs
@@ -36,6 +36,8 @@ namespace osu.Game.Screens.Edit.Verify
 
         public Dictionary<IssueType, Bindable<bool>> ShowType { get; set; }
 
+        public Bindable<DifficultyRating> InterpretedDifficulty { get; set; }
+
         private IBeatmapVerifier rulesetVerifier;
         private BeatmapVerifier generalVerifier;
 
@@ -53,6 +55,8 @@ namespace osu.Game.Screens.Edit.Verify
             generalVerifier = new BeatmapVerifier();
             rulesetVerifier = beatmap.BeatmapInfo.Ruleset?.CreateInstance()?.CreateBeatmapVerifier();
 
+            InterpretedDifficulty = new Bindable<DifficultyRating>(beatmap.BeatmapInfo.DifficultyRating);
+
             RelativeSizeAxes = Axes.Both;
 
             InternalChildren = new Drawable[]
diff --git a/osu.Game/Screens/Edit/Verify/IssueSettings.cs b/osu.Game/Screens/Edit/Verify/IssueSettings.cs
index 0df3ab0dcb..68ab51c3c8 100644
--- a/osu.Game/Screens/Edit/Verify/IssueSettings.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueSettings.cs
@@ -17,6 +17,7 @@ namespace osu.Game.Screens.Edit.Verify
 
         protected override IReadOnlyList<Drawable> CreateSections() => new Drawable[]
         {
+            new InterpretationSection(issueList),
             new VisibilitySection(issueList)
         };
     }

From c13b93e6f15254845e62046551b5e17802915826 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 12 May 2021 02:29:18 +0200
Subject: [PATCH 3327/3722] Replace `IWorkingBeatmap` arg with
 `BeatmapVerifierContext` in checks

This simplifies passing of contextual information by enabling addition without needing to refactor lots of classes.

See next commit for example.
---
 .../Checks/CheckOffscreenObjectsTest.cs       | 10 +++++--
 .../Edit/Checks/CheckOffscreenObjects.cs      |  3 +-
 .../Edit/OsuBeatmapVerifier.cs                |  4 +--
 .../Editing/Checks/CheckAudioQualityTest.cs   | 28 ++++++++++-------
 .../Checks/CheckBackgroundQualityTest.cs      | 30 +++++++++++--------
 .../Editing/Checks/CheckFilePresenceTest.cs   | 10 +++++--
 osu.Game/Rulesets/Edit/BeatmapVerifier.cs     |  4 +--
 .../Rulesets/Edit/BeatmapVerifierContext.cs   | 25 ++++++++++++++++
 .../Rulesets/Edit/Checks/CheckAudioQuality.cs |  4 +--
 .../Edit/Checks/CheckBackgroundQuality.cs     |  6 ++--
 .../Edit/Checks/CheckConcurrentObjects.cs     |  2 +-
 .../Rulesets/Edit/Checks/CheckFilePresence.cs |  2 +-
 .../Edit/Checks/CheckUnsnappedObjects.cs      |  2 +-
 .../Rulesets/Edit/Checks/Components/ICheck.cs |  4 +--
 osu.Game/Rulesets/Edit/IBeatmapVerifier.cs    |  2 +-
 osu.Game/Screens/Edit/Verify/IssueList.cs     |  7 +++--
 16 files changed, 96 insertions(+), 47 deletions(-)
 create mode 100644 osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
index 6139b0e676..5545273af2 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Edit.Checks;
@@ -224,12 +225,14 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
 
         private void assertOk(IBeatmap beatmap)
         {
-            Assert.That(check.Run(beatmap, new TestWorkingBeatmap(beatmap)), Is.Empty);
+            var context = new BeatmapVerifierContext(new TestWorkingBeatmap(beatmap));
+            Assert.That(check.Run(beatmap, context), Is.Empty);
         }
 
         private void assertOffscreenCircle(IBeatmap beatmap)
         {
-            var issues = check.Run(beatmap, new TestWorkingBeatmap(beatmap)).ToList();
+            var context = new BeatmapVerifierContext(new TestWorkingBeatmap(beatmap));
+            var issues = check.Run(beatmap, context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckOffscreenObjects.IssueTemplateOffscreenCircle);
@@ -237,7 +240,8 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
 
         private void assertOffscreenSlider(IBeatmap beatmap)
         {
-            var issues = check.Run(beatmap, new TestWorkingBeatmap(beatmap)).ToList();
+            var context = new BeatmapVerifierContext(new TestWorkingBeatmap(beatmap));
+            var issues = check.Run(beatmap, context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckOffscreenObjects.IssueTemplateOffscreenSlider);
diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index 4b0a7531a1..c25539201e 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Checks.Components;
 using osu.Game.Rulesets.Osu.Objects;
 using osuTK;
@@ -31,7 +32,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
             new IssueTemplateOffscreenSlider(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap)
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context)
         {
             foreach (var hitobject in playableBeatmap.HitObjects)
             {
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
index dab6483179..18faeb4f9f 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
@@ -17,9 +17,9 @@ namespace osu.Game.Rulesets.Osu.Edit
             new CheckOffscreenObjects()
         };
 
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, WorkingBeatmap workingBeatmap)
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context)
         {
-            return checks.SelectMany(check => check.Run(playableBeatmap, workingBeatmap));
+            return checks.SelectMany(check => check.Run(playableBeatmap, context));
         }
     }
 }
diff --git a/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs b/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs
index 7658ca728d..fbd02ea54e 100644
--- a/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs
@@ -6,6 +6,7 @@ using Moq;
 using NUnit.Framework;
 using osu.Framework.Audio.Track;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Checks;
 using osu.Game.Rulesets.Objects;
 
@@ -40,23 +41,23 @@ namespace osu.Game.Tests.Editing.Checks
             mock.SetupGet(w => w.Beatmap).Returns(beatmap);
             mock.SetupGet(w => w.Track).Returns((Track)null);
 
-            Assert.That(check.Run(beatmap, mock.Object), Is.Empty);
+            Assert.That(check.Run(beatmap, new BeatmapVerifierContext(mock.Object)), Is.Empty);
         }
 
         [Test]
         public void TestAcceptable()
         {
-            var mock = getMockWorkingBeatmap(192);
+            var context = getContext(192);
 
-            Assert.That(check.Run(beatmap, mock.Object), Is.Empty);
+            Assert.That(check.Run(beatmap, context), Is.Empty);
         }
 
         [Test]
         public void TestNullBitrate()
         {
-            var mock = getMockWorkingBeatmap(null);
+            var context = getContext(null);
 
-            var issues = check.Run(beatmap, mock.Object).ToList();
+            var issues = check.Run(beatmap, context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckAudioQuality.IssueTemplateNoBitrate);
@@ -65,9 +66,9 @@ namespace osu.Game.Tests.Editing.Checks
         [Test]
         public void TestZeroBitrate()
         {
-            var mock = getMockWorkingBeatmap(0);
+            var context = getContext(0);
 
-            var issues = check.Run(beatmap, mock.Object).ToList();
+            var issues = check.Run(beatmap, context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckAudioQuality.IssueTemplateNoBitrate);
@@ -76,9 +77,9 @@ namespace osu.Game.Tests.Editing.Checks
         [Test]
         public void TestTooHighBitrate()
         {
-            var mock = getMockWorkingBeatmap(320);
+            var context = getContext(320);
 
-            var issues = check.Run(beatmap, mock.Object).ToList();
+            var issues = check.Run(beatmap, context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckAudioQuality.IssueTemplateTooHighBitrate);
@@ -87,14 +88,19 @@ namespace osu.Game.Tests.Editing.Checks
         [Test]
         public void TestTooLowBitrate()
         {
-            var mock = getMockWorkingBeatmap(64);
+            var context = getContext(64);
 
-            var issues = check.Run(beatmap, mock.Object).ToList();
+            var issues = check.Run(beatmap, context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckAudioQuality.IssueTemplateTooLowBitrate);
         }
 
+        private BeatmapVerifierContext getContext(int? audioBitrate)
+        {
+            return new BeatmapVerifierContext(getMockWorkingBeatmap(audioBitrate).Object);
+        }
+
         /// <summary>
         /// Returns the mock of the working beatmap with the given audio properties.
         /// </summary>
diff --git a/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs b/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
index f0f972d2fa..e96ec5485d 100644
--- a/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
@@ -9,6 +9,7 @@ using Moq;
 using NUnit.Framework;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Checks;
 using osu.Game.Rulesets.Objects;
 using FileInfo = osu.Game.IO.FileInfo;
@@ -53,25 +54,25 @@ namespace osu.Game.Tests.Editing.Checks
         {
             // While this is a problem, it is out of scope for this check and is caught by a different one.
             beatmap.Metadata.BackgroundFile = null;
-            var mock = getMockWorkingBeatmap(null, System.Array.Empty<byte>());
+            var context = getContext(null, System.Array.Empty<byte>());
 
-            Assert.That(check.Run(beatmap, mock.Object), Is.Empty);
+            Assert.That(check.Run(beatmap, context), Is.Empty);
         }
 
         [Test]
         public void TestAcceptable()
         {
-            var mock = getMockWorkingBeatmap(new Texture(1920, 1080));
+            var context = getContext(new Texture(1920, 1080));
 
-            Assert.That(check.Run(beatmap, mock.Object), Is.Empty);
+            Assert.That(check.Run(beatmap, context), Is.Empty);
         }
 
         [Test]
         public void TestTooHighResolution()
         {
-            var mock = getMockWorkingBeatmap(new Texture(3840, 2160));
+            var context = getContext(new Texture(3840, 2160));
 
-            var issues = check.Run(beatmap, mock.Object).ToList();
+            var issues = check.Run(beatmap, context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateTooHighResolution);
@@ -80,9 +81,9 @@ namespace osu.Game.Tests.Editing.Checks
         [Test]
         public void TestLowResolution()
         {
-            var mock = getMockWorkingBeatmap(new Texture(640, 480));
+            var context = getContext(new Texture(640, 480));
 
-            var issues = check.Run(beatmap, mock.Object).ToList();
+            var issues = check.Run(beatmap, context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateLowResolution);
@@ -91,9 +92,9 @@ namespace osu.Game.Tests.Editing.Checks
         [Test]
         public void TestTooLowResolution()
         {
-            var mock = getMockWorkingBeatmap(new Texture(100, 100));
+            var context = getContext(new Texture(100, 100));
 
-            var issues = check.Run(beatmap, mock.Object).ToList();
+            var issues = check.Run(beatmap, context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateTooLowResolution);
@@ -102,14 +103,19 @@ namespace osu.Game.Tests.Editing.Checks
         [Test]
         public void TestTooUncompressed()
         {
-            var mock = getMockWorkingBeatmap(new Texture(1920, 1080), new byte[1024 * 1024 * 3]);
+            var context = getContext(new Texture(1920, 1080), new byte[1024 * 1024 * 3]);
 
-            var issues = check.Run(beatmap, mock.Object).ToList();
+            var issues = check.Run(beatmap, context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateTooUncompressed);
         }
 
+        private BeatmapVerifierContext getContext(Texture background, [CanBeNull] byte[] fileBytes = null)
+        {
+            return new BeatmapVerifierContext(getMockWorkingBeatmap(background, fileBytes).Object);
+        }
+
         /// <summary>
         /// Returns the mock of the working beatmap with the given background and filesize.
         /// </summary>
diff --git a/osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs b/osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs
index f6e875a8fc..424dffcbc2 100644
--- a/osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.IO;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Checks;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Tests.Beatmaps;
@@ -45,7 +46,8 @@ namespace osu.Game.Tests.Editing.Checks
         [Test]
         public void TestBackgroundSetAndInFiles()
         {
-            Assert.That(check.Run(beatmap, new TestWorkingBeatmap(beatmap)), Is.Empty);
+            var context = new BeatmapVerifierContext(new TestWorkingBeatmap(beatmap));
+            Assert.That(check.Run(beatmap, context), Is.Empty);
         }
 
         [Test]
@@ -53,7 +55,8 @@ namespace osu.Game.Tests.Editing.Checks
         {
             beatmap.BeatmapInfo.BeatmapSet.Files.Clear();
 
-            var issues = check.Run(beatmap, new TestWorkingBeatmap(beatmap)).ToList();
+            var context = new BeatmapVerifierContext(new TestWorkingBeatmap(beatmap));
+            var issues = check.Run(beatmap, context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckFilePresence.IssueTemplateDoesNotExist);
@@ -64,7 +67,8 @@ namespace osu.Game.Tests.Editing.Checks
         {
             beatmap.Metadata.BackgroundFile = null;
 
-            var issues = check.Run(beatmap, new TestWorkingBeatmap(beatmap)).ToList();
+            var context = new BeatmapVerifierContext(new TestWorkingBeatmap(beatmap));
+            var issues = check.Run(beatmap, context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckFilePresence.IssueTemplateNoneSet);
diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index 2f7b7b0ab8..50902d3ff1 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -29,9 +29,9 @@ namespace osu.Game.Rulesets.Edit
             new CheckConcurrentObjects()
         };
 
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, WorkingBeatmap workingBeatmap)
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context)
         {
-            return checks.SelectMany(check => check.Run(playableBeatmap, workingBeatmap));
+            return checks.SelectMany(check => check.Run(playableBeatmap, context));
         }
     }
 }
diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs b/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs
new file mode 100644
index 0000000000..86ca81491a
--- /dev/null
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifierContext.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.Bindables;
+using osu.Game.Beatmaps;
+
+namespace osu.Game.Rulesets.Edit
+{
+    /// <summary>
+    /// Represents the context provided by the beatmap verifier to the checks it runs.
+    /// Contains information about what is being checked and how it should be checked.
+    /// </summary>
+    public class BeatmapVerifierContext
+    {
+        /// <summary>
+        /// The working beatmap instance of the current beatmap.
+        /// </summary>
+        public readonly IWorkingBeatmap WorkingBeatmap;
+
+        public BeatmapVerifierContext(IWorkingBeatmap workingBeatmap)
+        {
+            WorkingBeatmap = workingBeatmap;
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs b/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs
index c1074d7c74..82e572f0b3 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs
@@ -26,13 +26,13 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateNoBitrate(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap)
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context)
         {
             var audioFile = playableBeatmap.Metadata?.AudioFile;
             if (audioFile == null)
                 yield break;
 
-            var track = workingBeatmap.Track;
+            var track = context.WorkingBeatmap.Track;
 
             if (track?.Bitrate == null || track.Bitrate.Value == 0)
                 yield return new IssueTemplateNoBitrate(this).Create();
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
index 59fee74023..2af1eca340 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
@@ -30,13 +30,13 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateTooUncompressed(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap)
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context)
         {
             var backgroundFile = playableBeatmap.Metadata?.BackgroundFile;
             if (backgroundFile == null)
                 yield break;
 
-            var texture = workingBeatmap.Background;
+            var texture = context.WorkingBeatmap.Background;
             if (texture == null)
                 yield break;
 
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Edit.Checks
                 yield return new IssueTemplateLowResolution(this).Create(texture.Width, texture.Height);
 
             string storagePath = playableBeatmap.BeatmapInfo.BeatmapSet.GetPathForFile(backgroundFile);
-            double filesizeMb = workingBeatmap.GetStream(storagePath).Length / (1024d * 1024d);
+            double filesizeMb = context.WorkingBeatmap.GetStream(storagePath).Length / (1024d * 1024d);
 
             if (filesizeMb > max_filesize_mb)
                 yield return new IssueTemplateTooUncompressed(this).Create(filesizeMb);
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs b/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
index ddebe2923a..d6e779d147 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateConcurrentDifferent(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap)
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context)
         {
             for (int i = 0; i < playableBeatmap.HitObjects.Count - 1; ++i)
             {
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs b/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
index 006fc57c04..cf990a2106 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateDoesNotExist(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap)
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context)
         {
             var filename = GetFilename(playableBeatmap);
 
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs b/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
index cdf3f05465..f073915a39 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateSmallUnsnap(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap)
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context)
         {
             var controlPointInfo = playableBeatmap.ControlPointInfo;
 
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs b/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
index 31a7583941..f669e2161c 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// Runs this check and returns any issues detected for the provided beatmap.
         /// </summary>
         /// <param name="playableBeatmap">The playable beatmap of the beatmap to run the check on.</param>
-        /// <param name="workingBeatmap">The working beatmap of the beatmap to run the check on.</param>
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, IWorkingBeatmap workingBeatmap);
+        /// <param name="context">The beatmap verifier context associated with the beatmap.</param>
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context);
     }
 }
diff --git a/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs b/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
index b598176a35..4e712351e0 100644
--- a/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
@@ -12,6 +12,6 @@ namespace osu.Game.Rulesets.Edit
     /// </summary>
     public interface IBeatmapVerifier
     {
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, WorkingBeatmap workingBeatmap);
+        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context);
     }
 }
diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
index 3e836c4010..96d056fba4 100644
--- a/osu.Game/Screens/Edit/Verify/IssueList.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueList.cs
@@ -40,6 +40,7 @@ namespace osu.Game.Screens.Edit.Verify
 
         private IBeatmapVerifier rulesetVerifier;
         private BeatmapVerifier generalVerifier;
+        private BeatmapVerifierContext context;
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colours)
@@ -57,6 +58,8 @@ namespace osu.Game.Screens.Edit.Verify
 
             InterpretedDifficulty = new Bindable<DifficultyRating>(beatmap.BeatmapInfo.DifficultyRating);
 
+            context = new BeatmapVerifierContext(workingBeatmap.Value);
+
             RelativeSizeAxes = Axes.Both;
 
             InternalChildren = new Drawable[]
@@ -101,10 +104,10 @@ namespace osu.Game.Screens.Edit.Verify
 
         public void Refresh()
         {
-            var issues = generalVerifier.Run(beatmap, workingBeatmap.Value);
+            var issues = generalVerifier.Run(beatmap, context);
 
             if (rulesetVerifier != null)
-                issues = issues.Concat(rulesetVerifier.Run(beatmap, workingBeatmap.Value));
+                issues = issues.Concat(rulesetVerifier.Run(beatmap, context));
 
             issues = filter(issues);
 

From 64d96b06a66c9f35026b925573b9f3fc7ebfb72d Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 12 May 2021 02:30:21 +0200
Subject: [PATCH 3328/3722] Add interpreted difficulty info to
 `BeatmapVerifierContext`

Enables checks to make use of the difficulty level as shown in the settings UI.
---
 osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs | 8 +++++++-
 osu.Game/Screens/Edit/Verify/IssueList.cs        | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs b/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs
index 86ca81491a..59d43ba3d6 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs
@@ -17,9 +17,15 @@ namespace osu.Game.Rulesets.Edit
         /// </summary>
         public readonly IWorkingBeatmap WorkingBeatmap;
 
-        public BeatmapVerifierContext(IWorkingBeatmap workingBeatmap)
+        /// <summary>
+        /// The difficulty level which the current beatmap is considered to be.
+        /// </summary>
+        public readonly Bindable<DifficultyRating> InterpretedDifficulty;
+
+        public BeatmapVerifierContext(IWorkingBeatmap workingBeatmap, DifficultyRating difficultyRating = DifficultyRating.ExpertPlus)
         {
             WorkingBeatmap = workingBeatmap;
+            InterpretedDifficulty = new Bindable<DifficultyRating>(difficultyRating);
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
index 96d056fba4..2ae86ed198 100644
--- a/osu.Game/Screens/Edit/Verify/IssueList.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueList.cs
@@ -59,6 +59,7 @@ namespace osu.Game.Screens.Edit.Verify
             InterpretedDifficulty = new Bindable<DifficultyRating>(beatmap.BeatmapInfo.DifficultyRating);
 
             context = new BeatmapVerifierContext(workingBeatmap.Value);
+            context.InterpretedDifficulty.BindTo(InterpretedDifficulty);
 
             RelativeSizeAxes = Axes.Both;
 

From b7bc42e0d37db4f5d5bfc201d70e036e25bf9ce7 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Wed, 12 May 2021 02:34:16 +0200
Subject: [PATCH 3329/3722] Rename "playableBeatmap" check arg to "beatmap"

The working beatmap is now in the context, so it's easier to distinguish beatmap type, hence no need for this prefix.
---
 .../Edit/Checks/CheckOffscreenObjects.cs               |  4 ++--
 osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs       |  4 ++--
 osu.Game/Rulesets/Edit/BeatmapVerifier.cs              |  4 ++--
 osu.Game/Rulesets/Edit/Checks/CheckAudioPresence.cs    |  2 +-
 osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs     |  4 ++--
 .../Rulesets/Edit/Checks/CheckBackgroundPresence.cs    |  2 +-
 .../Rulesets/Edit/Checks/CheckBackgroundQuality.cs     |  6 +++---
 .../Rulesets/Edit/Checks/CheckConcurrentObjects.cs     | 10 +++++-----
 osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs     |  8 ++++----
 osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs |  6 +++---
 osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs     |  4 ++--
 osu.Game/Rulesets/Edit/IBeatmapVerifier.cs             |  2 +-
 12 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index c25539201e..86bb7f203f 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -32,9 +32,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
             new IssueTemplateOffscreenSlider(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context)
+        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
         {
-            foreach (var hitobject in playableBeatmap.HitObjects)
+            foreach (var hitobject in beatmap.HitObjects)
             {
                 switch (hitobject)
                 {
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
index 18faeb4f9f..c62f472d75 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
@@ -17,9 +17,9 @@ namespace osu.Game.Rulesets.Osu.Edit
             new CheckOffscreenObjects()
         };
 
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context)
+        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
         {
-            return checks.SelectMany(check => check.Run(playableBeatmap, context));
+            return checks.SelectMany(check => check.Run(beatmap, context));
         }
     }
 }
diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index 50902d3ff1..1860d54b57 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -29,9 +29,9 @@ namespace osu.Game.Rulesets.Edit
             new CheckConcurrentObjects()
         };
 
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context)
+        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
         {
-            return checks.SelectMany(check => check.Run(playableBeatmap, context));
+            return checks.SelectMany(check => check.Run(beatmap, context));
         }
     }
 }
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckAudioPresence.cs b/osu.Game/Rulesets/Edit/Checks/CheckAudioPresence.cs
index 2d572a521e..94c48c300a 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 playableBeatmap) => playableBeatmap.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 82e572f0b3..1015f267aa 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs
@@ -26,9 +26,9 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateNoBitrate(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context)
+        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
         {
-            var audioFile = playableBeatmap.Metadata?.AudioFile;
+            var audioFile = beatmap.Metadata?.AudioFile;
             if (audioFile == null)
                 yield break;
 
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundPresence.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundPresence.cs
index 233c708a25..067800b409 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 playableBeatmap) => playableBeatmap.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 2af1eca340..87f5c80c89 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
@@ -30,9 +30,9 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateTooUncompressed(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context)
+        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
         {
-            var backgroundFile = playableBeatmap.Metadata?.BackgroundFile;
+            var backgroundFile = beatmap.Metadata?.BackgroundFile;
             if (backgroundFile == null)
                 yield break;
 
@@ -48,7 +48,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             else if (texture.Width < low_width || texture.Height < low_height)
                 yield return new IssueTemplateLowResolution(this).Create(texture.Width, texture.Height);
 
-            string storagePath = playableBeatmap.BeatmapInfo.BeatmapSet.GetPathForFile(backgroundFile);
+            string storagePath = beatmap.BeatmapInfo.BeatmapSet.GetPathForFile(backgroundFile);
             double filesizeMb = context.WorkingBeatmap.GetStream(storagePath).Length / (1024d * 1024d);
 
             if (filesizeMb > max_filesize_mb)
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs b/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
index d6e779d147..fd6ed664e6 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
@@ -22,15 +22,15 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateConcurrentDifferent(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context)
+        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
         {
-            for (int i = 0; i < playableBeatmap.HitObjects.Count - 1; ++i)
+            for (int i = 0; i < beatmap.HitObjects.Count - 1; ++i)
             {
-                var hitobject = playableBeatmap.HitObjects[i];
+                var hitobject = beatmap.HitObjects[i];
 
-                for (int j = i + 1; j < playableBeatmap.HitObjects.Count; ++j)
+                for (int j = i + 1; j < beatmap.HitObjects.Count; ++j)
                 {
-                    var nextHitobject = playableBeatmap.HitObjects[j];
+                    var nextHitobject = beatmap.HitObjects[j];
 
                     // Accounts for rulesets with hitobjects separated by columns, such as Mania.
                     // In these cases we only care about concurrent objects within the same column.
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs b/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
index cf990a2106..f04909d175 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Edit.Checks
     {
         protected abstract CheckCategory Category { get; }
         protected abstract string TypeOfFile { get; }
-        protected abstract string GetFilename(IBeatmap playableBeatmap);
+        protected abstract string GetFilename(IBeatmap beatmap);
 
         public CheckMetadata Metadata => new CheckMetadata(Category, $"Missing {TypeOfFile}");
 
@@ -21,9 +21,9 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateDoesNotExist(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context)
+        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
         {
-            var filename = GetFilename(playableBeatmap);
+            var filename = GetFilename(beatmap);
 
             if (filename == null)
             {
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             }
 
             // If the file is set, also make sure it still exists.
-            var storagePath = playableBeatmap.BeatmapInfo.BeatmapSet.GetPathForFile(filename);
+            var storagePath = beatmap.BeatmapInfo.BeatmapSet.GetPathForFile(filename);
             if (storagePath != null)
                 yield break;
 
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs b/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
index f073915a39..aa19f3df07 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
@@ -22,11 +22,11 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateSmallUnsnap(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context)
+        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
         {
-            var controlPointInfo = playableBeatmap.ControlPointInfo;
+            var controlPointInfo = beatmap.ControlPointInfo;
 
-            foreach (var hitobject in playableBeatmap.HitObjects)
+            foreach (var hitobject in beatmap.HitObjects)
             {
                 double startUnsnap = hitobject.StartTime - controlPointInfo.GetClosestSnappedTime(hitobject.StartTime);
                 string startPostfix = hitobject is IHasDuration ? "start" : "";
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs b/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
index f669e2161c..511d6aaa0f 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
@@ -24,8 +24,8 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// <summary>
         /// Runs this check and returns any issues detected for the provided beatmap.
         /// </summary>
-        /// <param name="playableBeatmap">The playable beatmap of the beatmap to run the check on.</param>
+        /// <param name="beatmap">The playable beatmap of the beatmap to run the check on.</param>
         /// <param name="context">The beatmap verifier context associated with the beatmap.</param>
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context);
+        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context);
     }
 }
diff --git a/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs b/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
index 4e712351e0..1dafc6938e 100644
--- a/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
@@ -12,6 +12,6 @@ namespace osu.Game.Rulesets.Edit
     /// </summary>
     public interface IBeatmapVerifier
     {
-        public IEnumerable<Issue> Run(IBeatmap playableBeatmap, BeatmapVerifierContext context);
+        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context);
     }
 }

From 9b09361cc9a5b3ef1fb9cecf34e28f6401ae9def Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 May 2021 12:16:41 +0900
Subject: [PATCH 3330/3722] Add testable spectator streaming client

---
 .../Spectator/TestSpectatorStreamingClient.cs | 84 +++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs

diff --git a/osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs b/osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs
new file mode 100644
index 0000000000..c177d3f399
--- /dev/null
+++ b/osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.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.Framework.Bindables;
+using osu.Framework.Utils;
+using osu.Game.Online;
+using osu.Game.Online.Spectator;
+using osu.Game.Replays.Legacy;
+using osu.Game.Scoring;
+
+namespace osu.Game.Tests.Visual.Spectator
+{
+    public class TestSpectatorStreamingClient : SpectatorStreamingClient
+    {
+        public new BindableList<int> PlayingUsers => (BindableList<int>)base.PlayingUsers;
+        private readonly HashSet<int> watchingUsers = new HashSet<int>();
+
+        private readonly Dictionary<int, int> userBeatmapDictionary = new Dictionary<int, int>();
+        private readonly Dictionary<int, bool> userSentStateDictionary = new Dictionary<int, bool>();
+
+        public TestSpectatorStreamingClient()
+            : base(new DevelopmentEndpointConfiguration())
+        {
+        }
+
+        public void StartPlay(int userId, int beatmapId)
+        {
+            userBeatmapDictionary[userId] = beatmapId;
+            sendState(userId, beatmapId);
+        }
+
+        public void EndPlay(int userId, int beatmapId)
+        {
+            ((ISpectatorClient)this).UserFinishedPlaying(userId, new SpectatorState
+            {
+                BeatmapID = beatmapId,
+                RulesetID = 0,
+            });
+
+            userSentStateDictionary[userId] = false;
+        }
+
+        public void SendFrames(int userId, int index, int count)
+        {
+            var frames = new List<LegacyReplayFrame>();
+
+            for (int i = index; i < index + count; i++)
+            {
+                var buttonState = i == index + count - 1 ? ReplayButtonState.None : ReplayButtonState.Left1;
+
+                frames.Add(new LegacyReplayFrame(i * 100, RNG.Next(0, 512), RNG.Next(0, 512), buttonState));
+            }
+
+            var bundle = new FrameDataBundle(new ScoreInfo(), frames);
+            ((ISpectatorClient)this).UserSentFrames(userId, bundle);
+
+            if (!userSentStateDictionary[userId])
+                sendState(userId, userBeatmapDictionary[userId]);
+        }
+
+        public override void WatchUser(int userId)
+        {
+            // When newly watching a user, the server sends the playing state immediately.
+            if (!watchingUsers.Contains(userId) && PlayingUsers.Contains(userId))
+                sendState(userId, userBeatmapDictionary[userId]);
+
+            base.WatchUser(userId);
+
+            watchingUsers.Add(userId);
+        }
+
+        private void sendState(int userId, int beatmapId)
+        {
+            ((ISpectatorClient)this).UserBeganPlaying(userId, new SpectatorState
+            {
+                BeatmapID = beatmapId,
+                RulesetID = 0,
+            });
+
+            userSentStateDictionary[userId] = true;
+        }
+    }
+}

From 184dbaf2029a4b123213b068c0c19484770e57d7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 12:53:30 +0900
Subject: [PATCH 3331/3722] Improve safety of bindings in `HealthDisplay`

---
 osu.Game/Screens/Play/HUD/HealthDisplay.cs | 23 ++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index e0ddde026b..d6b4934731 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Screens.Play.HUD
     /// </summary>
     public abstract class HealthDisplay : Container
     {
-        private Bindable<bool> showHealthbar;
+        private readonly Bindable<bool> showHealthbar = new Bindable<bool>(true);
 
         [Resolved]
         protected HealthProcessor HealthProcessor { get; private set; }
@@ -32,18 +32,21 @@ namespace osu.Game.Screens.Play.HUD
         {
         }
 
-        [BackgroundDependencyLoader(true)]
-        private void load(HUDOverlay hud)
-        {
-            Current.BindTo(HealthProcessor.Health);
+        [Resolved(canBeNull: true)]
+        private HUDOverlay hudOverlay { get; set; }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Current.BindTo(HealthProcessor.Health);
             HealthProcessor.NewJudgement += onNewJudgement;
 
-            if (hud != null)
-            {
-                showHealthbar = hud.ShowHealthbar.GetBoundCopy();
-                showHealthbar.BindValueChanged(healthBar => this.FadeTo(healthBar.NewValue ? 1 : 0, HUDOverlay.FADE_DURATION, HUDOverlay.FADE_EASING), true);
-            }
+            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);
         }
 
         private void onNewJudgement(JudgementResult judgement)

From bf44c09a9142d567878a27e2a30fc1b311201023 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 12:59:46 +0900
Subject: [PATCH 3332/3722] Add name identifying container and rename index
 variable

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

diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 88c3bd5dbf..827d8e2a0a 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -73,6 +73,7 @@ namespace osu.Game.Rulesets.Mania.UI
                 background,
                 new Container
                 {
+                    Name = "Column samples pool",
                     RelativeSizeAxes = Axes.Both,
                     ChildrenEnumerable = hitSounds = Enumerable.Range(0, max_concurrent_hitsounds).Select(_ => new SkinnableSound()).ToArray()
                 },
@@ -132,7 +133,7 @@ namespace osu.Game.Rulesets.Mania.UI
             HitObjectArea.Explosions.Add(hitExplosionPool.Get(e => e.Apply(result)));
         }
 
-        private int nextHitSound;
+        private int nextHitSoundIndex;
 
         public bool OnPressed(ManiaAction action)
         {
@@ -147,12 +148,12 @@ namespace osu.Game.Rulesets.Mania.UI
 
             if (nextObject is DrawableManiaHitObject maniaObject)
             {
-                var hitSound = hitSounds[nextHitSound];
+                var hitSound = hitSounds[nextHitSoundIndex];
 
                 hitSound.Samples = maniaObject.GetGameplaySamples();
                 hitSound.Play();
 
-                nextHitSound = (nextHitSound + 1) % max_concurrent_hitsounds;
+                nextHitSoundIndex = (nextHitSoundIndex + 1) % max_concurrent_hitsounds;
             }
 
             return true;

From 3428056113d4c8a2cdfd391af9c9e81d32d42241 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 13:00:02 +0900
Subject: [PATCH 3333/3722] Remove unnecessary usage of `ChildrenEnumerable`
 for array assignment

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

diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 827d8e2a0a..79a41ae19e 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Rulesets.Mania.UI
                 {
                     Name = "Column samples pool",
                     RelativeSizeAxes = Axes.Both,
-                    ChildrenEnumerable = hitSounds = Enumerable.Range(0, max_concurrent_hitsounds).Select(_ => new SkinnableSound()).ToArray()
+                    Children = hitSounds = Enumerable.Range(0, max_concurrent_hitsounds).Select(_ => new SkinnableSound()).ToArray()
                 },
                 TopLevelContainer = new Container { RelativeSizeAxes = Axes.Both }
             };

From 21fc0ba43baea6e0cb115952ab21df06f1d1c003 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 May 2021 12:17:42 +0900
Subject: [PATCH 3334/3722] Combine test spectator streaming client
 implementations

---
 .../Visual/Gameplay/TestSceneSpectator.cs     | 89 ++-----------------
 .../TestSceneMultiSpectatorLeaderboard.cs     | 70 +--------------
 .../TestSceneMultiSpectatorScreen.cs          | 75 +---------------
 .../TestSceneCurrentlyPlayingDisplay.cs       |  4 +-
 4 files changed, 11 insertions(+), 227 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 0777571d02..a7ed217b4d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -1,35 +1,32 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
-using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
-using osu.Game.Online;
 using osu.Game.Online.Spectator;
-using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Replays;
 using osu.Game.Rulesets.UI;
-using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Tests.Beatmaps.IO;
 using osu.Game.Tests.Visual.Multiplayer;
+using osu.Game.Tests.Visual.Spectator;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneSpectator : ScreenTestScene
     {
+        private readonly User streamingUser = new User { Id = MultiplayerTestScene.PLAYER_1_ID, Username = "Test user" };
+
         [Cached(typeof(SpectatorStreamingClient))]
         private TestSpectatorStreamingClient testSpectatorStreamingClient = new TestSpectatorStreamingClient();
 
@@ -215,9 +212,9 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void waitForPlayer() => AddUntilStep("wait for player", () => Stack.CurrentScreen is Player);
 
-        private void start(int? beatmapId = null) => AddStep("start play", () => testSpectatorStreamingClient.StartPlay(beatmapId ?? importedBeatmapId));
+        private void start(int? beatmapId = null) => AddStep("start play", () => testSpectatorStreamingClient.StartPlay(streamingUser.Id, beatmapId ?? importedBeatmapId));
 
-        private void finish(int? beatmapId = null) => AddStep("end play", () => testSpectatorStreamingClient.EndPlay(beatmapId ?? importedBeatmapId));
+        private void finish(int? beatmapId = null) => AddStep("end play", () => testSpectatorStreamingClient.EndPlay(streamingUser.Id, beatmapId ?? importedBeatmapId));
 
         private void checkPaused(bool state) =>
             AddUntilStep($"game is {(state ? "paused" : "playing")}", () => player.ChildrenOfType<DrawableRuleset>().First().IsPaused.Value == state);
@@ -226,89 +223,17 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("send frames", () =>
             {
-                testSpectatorStreamingClient.SendFrames(nextFrame, count);
+                testSpectatorStreamingClient.SendFrames(streamingUser.Id, nextFrame, count);
                 nextFrame += count;
             });
         }
 
         private void loadSpectatingScreen()
         {
-            AddStep("load screen", () => LoadScreen(spectatorScreen = new SoloSpectator(testSpectatorStreamingClient.StreamingUser)));
+            AddStep("load screen", () => LoadScreen(spectatorScreen = new SoloSpectator(streamingUser)));
             AddUntilStep("wait for screen load", () => spectatorScreen.LoadState == LoadState.Loaded);
         }
 
-        public class TestSpectatorStreamingClient : SpectatorStreamingClient
-        {
-            public readonly User StreamingUser = new User { Id = MultiplayerTestScene.PLAYER_1_ID, Username = "Test user" };
-
-            public new BindableList<int> PlayingUsers => (BindableList<int>)base.PlayingUsers;
-
-            private int beatmapId;
-
-            public TestSpectatorStreamingClient()
-                : base(new DevelopmentEndpointConfiguration())
-            {
-            }
-
-            public void StartPlay(int beatmapId)
-            {
-                this.beatmapId = beatmapId;
-                sendState(beatmapId);
-            }
-
-            public void EndPlay(int beatmapId)
-            {
-                ((ISpectatorClient)this).UserFinishedPlaying(StreamingUser.Id, new SpectatorState
-                {
-                    BeatmapID = beatmapId,
-                    RulesetID = 0,
-                });
-
-                sentState = false;
-            }
-
-            private bool sentState;
-
-            public void SendFrames(int index, int count)
-            {
-                var frames = new List<LegacyReplayFrame>();
-
-                for (int i = index; i < index + count; i++)
-                {
-                    var buttonState = i == index + count - 1 ? ReplayButtonState.None : ReplayButtonState.Left1;
-
-                    frames.Add(new LegacyReplayFrame(i * 100, RNG.Next(0, 512), RNG.Next(0, 512), buttonState));
-                }
-
-                var bundle = new FrameDataBundle(new ScoreInfo(), frames);
-                ((ISpectatorClient)this).UserSentFrames(StreamingUser.Id, bundle);
-
-                if (!sentState)
-                    sendState(beatmapId);
-            }
-
-            public override void WatchUser(int userId)
-            {
-                if (!PlayingUsers.Contains(userId) && sentState)
-                {
-                    // usually the server would do this.
-                    sendState(beatmapId);
-                }
-
-                base.WatchUser(userId);
-            }
-
-            private void sendState(int beatmapId)
-            {
-                sentState = true;
-                ((ISpectatorClient)this).UserBeganPlaying(StreamingUser.Id, new SpectatorState
-                {
-                    BeatmapID = beatmapId,
-                    RulesetID = 0,
-                });
-            }
-        }
-
         internal class TestUserLookupCache : UserLookupCache
         {
             protected override Task<User> ComputeValueAsync(int lookup, CancellationToken token = default) => Task.FromResult(new User
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
index d3a5daeac6..263adc07e1 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
@@ -11,15 +11,12 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Framework.Timing;
-using osu.Framework.Utils;
 using osu.Game.Database;
-using osu.Game.Online;
 using osu.Game.Online.Spectator;
-using osu.Game.Replays.Legacy;
 using osu.Game.Rulesets.Osu.Scoring;
-using osu.Game.Scoring;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate;
 using osu.Game.Screens.Play.HUD;
+using osu.Game.Tests.Visual.Spectator;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
@@ -149,71 +146,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
         private void assertCombo(int userId, int expectedCombo)
             => AddUntilStep($"player {userId} has {expectedCombo} combo", () => this.ChildrenOfType<GameplayLeaderboardScore>().Single(s => s.User?.Id == userId).Combo.Value == expectedCombo);
 
-        private class TestSpectatorStreamingClient : SpectatorStreamingClient
-        {
-            private readonly Dictionary<int, int> userBeatmapDictionary = new Dictionary<int, int>();
-            private readonly Dictionary<int, bool> userSentStateDictionary = new Dictionary<int, bool>();
-
-            public TestSpectatorStreamingClient()
-                : base(new DevelopmentEndpointConfiguration())
-            {
-            }
-
-            public void StartPlay(int userId, int beatmapId)
-            {
-                userBeatmapDictionary[userId] = beatmapId;
-                userSentStateDictionary[userId] = false;
-                sendState(userId, beatmapId);
-            }
-
-            public void EndPlay(int userId, int beatmapId)
-            {
-                ((ISpectatorClient)this).UserFinishedPlaying(userId, new SpectatorState
-                {
-                    BeatmapID = beatmapId,
-                    RulesetID = 0,
-                });
-                userSentStateDictionary[userId] = false;
-            }
-
-            public void SendFrames(int userId, int index, int count)
-            {
-                var frames = new List<LegacyReplayFrame>();
-
-                for (int i = index; i < index + count; i++)
-                {
-                    var buttonState = i == index + count - 1 ? ReplayButtonState.None : ReplayButtonState.Left1;
-                    frames.Add(new LegacyReplayFrame(i * 100, RNG.Next(0, 512), RNG.Next(0, 512), buttonState));
-                }
-
-                var bundle = new FrameDataBundle(new ScoreInfo { Combo = index + count }, frames);
-                ((ISpectatorClient)this).UserSentFrames(userId, bundle);
-                if (!userSentStateDictionary[userId])
-                    sendState(userId, userBeatmapDictionary[userId]);
-            }
-
-            public override void WatchUser(int userId)
-            {
-                if (userSentStateDictionary[userId])
-                {
-                    // usually the server would do this.
-                    sendState(userId, userBeatmapDictionary[userId]);
-                }
-
-                base.WatchUser(userId);
-            }
-
-            private void sendState(int userId, int beatmapId)
-            {
-                ((ISpectatorClient)this).UserBeganPlaying(userId, new SpectatorState
-                {
-                    BeatmapID = beatmapId,
-                    RulesetID = 0,
-                });
-                userSentStateDictionary[userId] = true;
-            }
-        }
-
         private class TestUserLookupCache : UserLookupCache
         {
             protected override Task<User> ComputeValueAsync(int lookup, CancellationToken token = default)
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
index db431c0a82..689c249d05 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
@@ -9,16 +9,13 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
-using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
-using osu.Game.Online;
 using osu.Game.Online.Spectator;
-using osu.Game.Replays.Legacy;
-using osu.Game.Scoring;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate;
 using osu.Game.Screens.Play;
 using osu.Game.Tests.Beatmaps.IO;
+using osu.Game.Tests.Visual.Spectator;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
@@ -301,76 +298,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         private PlayerArea getInstance(int userId) => spectatorScreen.ChildrenOfType<PlayerArea>().Single(p => p.UserId == userId);
 
-        public class TestSpectatorStreamingClient : SpectatorStreamingClient
-        {
-            private readonly Dictionary<int, int> userBeatmapDictionary = new Dictionary<int, int>();
-            private readonly Dictionary<int, bool> userSentStateDictionary = new Dictionary<int, bool>();
-
-            public TestSpectatorStreamingClient()
-                : base(new DevelopmentEndpointConfiguration())
-            {
-            }
-
-            public void StartPlay(int userId, int beatmapId)
-            {
-                userBeatmapDictionary[userId] = beatmapId;
-                userSentStateDictionary[userId] = false;
-
-                sendState(userId, beatmapId);
-            }
-
-            public void EndPlay(int userId, int beatmapId)
-            {
-                ((ISpectatorClient)this).UserFinishedPlaying(userId, new SpectatorState
-                {
-                    BeatmapID = beatmapId,
-                    RulesetID = 0,
-                });
-
-                userSentStateDictionary[userId] = false;
-            }
-
-            public void SendFrames(int userId, int index, int count)
-            {
-                var frames = new List<LegacyReplayFrame>();
-
-                for (int i = index; i < index + count; i++)
-                {
-                    var buttonState = i == index + count - 1 ? ReplayButtonState.None : ReplayButtonState.Left1;
-
-                    frames.Add(new LegacyReplayFrame(i * 100, RNG.Next(0, 512), RNG.Next(0, 512), buttonState));
-                }
-
-                var bundle = new FrameDataBundle(new ScoreInfo { Combo = index + count }, frames);
-                ((ISpectatorClient)this).UserSentFrames(userId, bundle);
-
-                if (!userSentStateDictionary[userId])
-                    sendState(userId, userBeatmapDictionary[userId]);
-            }
-
-            public override void WatchUser(int userId)
-            {
-                if (!PlayingUsers.Contains(userId) && userSentStateDictionary.TryGetValue(userId, out var sent) && sent)
-                {
-                    // usually the server would do this.
-                    sendState(userId, userBeatmapDictionary[userId]);
-                }
-
-                base.WatchUser(userId);
-            }
-
-            private void sendState(int userId, int beatmapId)
-            {
-                ((ISpectatorClient)this).UserBeganPlaying(userId, new SpectatorState
-                {
-                    BeatmapID = beatmapId,
-                    RulesetID = 0,
-                });
-
-                userSentStateDictionary[userId] = true;
-            }
-        }
-
         internal class TestUserLookupCache : UserLookupCache
         {
             protected override Task<User> ComputeValueAsync(int lookup, CancellationToken token = default)
diff --git a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
index 1baa07f208..8ae6398003 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
@@ -12,7 +12,7 @@ using osu.Framework.Testing;
 using osu.Game.Database;
 using osu.Game.Online.Spectator;
 using osu.Game.Overlays.Dashboard;
-using osu.Game.Tests.Visual.Gameplay;
+using osu.Game.Tests.Visual.Spectator;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Online
@@ -20,7 +20,7 @@ namespace osu.Game.Tests.Visual.Online
     public class TestSceneCurrentlyPlayingDisplay : OsuTestScene
     {
         [Cached(typeof(SpectatorStreamingClient))]
-        private TestSceneSpectator.TestSpectatorStreamingClient testSpectatorStreamingClient = new TestSceneSpectator.TestSpectatorStreamingClient();
+        private TestSpectatorStreamingClient testSpectatorStreamingClient = new TestSpectatorStreamingClient();
 
         private CurrentlyPlayingDisplay currentlyPlaying;
 

From ad11818868d50e704d98ec28ec12f7ee2a2df9b8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 May 2021 12:19:36 +0900
Subject: [PATCH 3335/3722] Remove watched users on stop watching

---
 osu.Game/Online/Spectator/SpectatorStreamingClient.cs  |  2 +-
 .../Visual/Spectator/TestSpectatorStreamingClient.cs   | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 378096c7fb..691ad5624a 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -230,7 +230,7 @@ namespace osu.Game.Online.Spectator
             connection.SendAsync(nameof(ISpectatorServer.StartWatchingUser), userId);
         }
 
-        public void StopWatchingUser(int userId)
+        public virtual void StopWatchingUser(int userId)
         {
             lock (userLock)
             {
diff --git a/osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs b/osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs
index c177d3f399..806d9b45ab 100644
--- a/osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs
+++ b/osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs
@@ -38,7 +38,8 @@ namespace osu.Game.Tests.Visual.Spectator
                 RulesetID = 0,
             });
 
-            userSentStateDictionary[userId] = false;
+            userBeatmapDictionary.Remove(userId);
+            userSentStateDictionary.Remove(userId);
         }
 
         public void SendFrames(int userId, int index, int count)
@@ -66,10 +67,15 @@ namespace osu.Game.Tests.Visual.Spectator
                 sendState(userId, userBeatmapDictionary[userId]);
 
             base.WatchUser(userId);
-
             watchingUsers.Add(userId);
         }
 
+        public override void StopWatchingUser(int userId)
+        {
+            base.StopWatchingUser(userId);
+            watchingUsers.Remove(userId);
+        }
+
         private void sendState(int userId, int beatmapId)
         {
             ((ISpectatorClient)this).UserBeganPlaying(userId, new SpectatorState

From e0e8f5ab80700db4113b5df45a7d91046cbe57ad Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 May 2021 13:06:28 +0900
Subject: [PATCH 3336/3722] Fix ordering + threading issues

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

diff --git a/osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs b/osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs
index 806d9b45ab..c2428ce415 100644
--- a/osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs
+++ b/osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.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.Concurrent;
 using System.Collections.Generic;
 using osu.Framework.Bindables;
 using osu.Framework.Utils;
@@ -14,7 +15,7 @@ namespace osu.Game.Tests.Visual.Spectator
     public class TestSpectatorStreamingClient : SpectatorStreamingClient
     {
         public new BindableList<int> PlayingUsers => (BindableList<int>)base.PlayingUsers;
-        private readonly HashSet<int> watchingUsers = new HashSet<int>();
+        private readonly ConcurrentDictionary<int, byte> watchingUsers = new ConcurrentDictionary<int, byte>();
 
         private readonly Dictionary<int, int> userBeatmapDictionary = new Dictionary<int, int>();
         private readonly Dictionary<int, bool> userSentStateDictionary = new Dictionary<int, bool>();
@@ -62,18 +63,17 @@ namespace osu.Game.Tests.Visual.Spectator
 
         public override void WatchUser(int userId)
         {
-            // When newly watching a user, the server sends the playing state immediately.
-            if (!watchingUsers.Contains(userId) && PlayingUsers.Contains(userId))
-                sendState(userId, userBeatmapDictionary[userId]);
-
             base.WatchUser(userId);
-            watchingUsers.Add(userId);
+
+            // When newly watching a user, the server sends the playing state immediately.
+            if (watchingUsers.TryAdd(userId, 0) && PlayingUsers.Contains(userId))
+                sendState(userId, userBeatmapDictionary[userId]);
         }
 
         public override void StopWatchingUser(int userId)
         {
             base.StopWatchingUser(userId);
-            watchingUsers.Remove(userId);
+            watchingUsers.TryRemove(userId, out _);
         }
 
         private void sendState(int userId, int beatmapId)

From f4c96b26750a9c1556a7c62b5f60e95b1a95e476 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 May 2021 13:10:59 +0900
Subject: [PATCH 3337/3722] Only update playing user states when users are
 watched

---
 osu.Game/Online/Spectator/SpectatorStreamingClient.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 691ad5624a..ec6d1bf9d8 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -142,7 +142,11 @@ namespace osu.Game.Online.Spectator
                 if (!playingUsers.Contains(userId))
                     playingUsers.Add(userId);
 
-                playingUserStates[userId] = state;
+                // UserBeganPlaying() is called by the server regardless of whether the local user is watching the remote user, and is called a further time when the remote user is watched.
+                // This may be a temporary thing (see: https://github.com/ppy/osu-server-spectator/blob/2273778e02cfdb4a9c6a934f2a46a8459cb5d29c/osu.Server.Spectator/Hubs/SpectatorHub.cs#L28-L29).
+                // We don't want the user states to update unless the player is being watched, otherwise calling BindUserBeganPlaying() can lead to double invocations.
+                if (watchingUsers.Contains(userId))
+                    playingUserStates[userId] = state;
             }
 
             OnUserBeganPlaying?.Invoke(userId, state);

From 672108edcf841b30d3f40a8bdb58695b206272c9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 May 2021 13:27:12 +0900
Subject: [PATCH 3338/3722] Use container instead of array for field

---
 osu.Game.Rulesets.Mania/UI/Column.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 79a41ae19e..0f02e2cd4b 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Mania.UI
         internal readonly Container TopLevelContainer;
         private readonly DrawablePool<PoolableHitExplosion> hitExplosionPool;
         private readonly OrderedHitPolicy hitPolicy;
-        private readonly SkinnableSound[] hitSounds;
+        private readonly Container<SkinnableSound> hitSounds;
 
         public Container UnderlayElements => HitObjectArea.UnderlayElements;
 
@@ -71,11 +71,11 @@ namespace osu.Game.Rulesets.Mania.UI
                     RelativeSizeAxes = Axes.Both
                 },
                 background,
-                new Container
+                hitSounds = new Container<SkinnableSound>
                 {
                     Name = "Column samples pool",
                     RelativeSizeAxes = Axes.Both,
-                    Children = hitSounds = Enumerable.Range(0, max_concurrent_hitsounds).Select(_ => new SkinnableSound()).ToArray()
+                    Children = Enumerable.Range(0, max_concurrent_hitsounds).Select(_ => new SkinnableSound()).ToArray()
                 },
                 TopLevelContainer = new Container { RelativeSizeAxes = Axes.Both }
             };

From 05c21fb5b39ba1f0b52db2df3f06aacee25f4e99 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 May 2021 13:27:30 +0900
Subject: [PATCH 3339/3722] Increase mania HP lenience

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

diff --git a/osu.Game.Rulesets.Mania/ManiaRuleset.cs b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
index b3889bc7d3..fbb9b3c466 100644
--- a/osu.Game.Rulesets.Mania/ManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/ManiaRuleset.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Mania
 
         public override ScoreProcessor CreateScoreProcessor() => new ManiaScoreProcessor();
 
-        public override HealthProcessor CreateHealthProcessor(double drainStartTime) => new DrainingHealthProcessor(drainStartTime, 0.2);
+        public override HealthProcessor CreateHealthProcessor(double drainStartTime) => new DrainingHealthProcessor(drainStartTime, 0.5);
 
         public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new ManiaBeatmapConverter(beatmap, this);
 

From 1d383024e226f72001902bb3c5587e472aedec9e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 13:51:29 +0900
Subject: [PATCH 3340/3722] Improve the visual appearance of skin editor
 blueprints

---
 osu.Game/Skinning/Editor/SkinBlueprint.cs | 67 ++++++++++++++++++++---
 1 file changed, 58 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinBlueprint.cs b/osu.Game/Skinning/Editor/SkinBlueprint.cs
index b8dfdbad0a..23411f2b3d 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprint.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprint.cs
@@ -2,14 +2,16 @@
 // 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.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
-using osu.Game.Graphics.UserInterface;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Edit;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Skinning.Editor
 {
@@ -17,14 +19,19 @@ namespace osu.Game.Skinning.Editor
     {
         private Container box;
 
+        private Container outlineBox;
+
         private Drawable drawable => (Drawable)Item;
 
         /// <summary>
         /// Whether the blueprint should be shown even when the <see cref="SelectionBlueprint{T}.Item"/> is not alive.
         /// </summary>
-        protected virtual bool AlwaysShowWhenSelected => false;
+        protected virtual bool AlwaysShowWhenSelected => true;
 
-        protected override bool ShouldBeAlive => (drawable.IsAlive && Item.IsPresent) || (AlwaysShowWhenSelected && State == SelectionState.Selected);
+        protected override bool ShouldBeAlive => drawable.IsAlive && Item.IsPresent;
+
+        [Resolved]
+        private OsuColour colours { get; set; }
 
         public SkinBlueprint(ISkinnableComponent component)
             : base(component)
@@ -32,26 +39,68 @@ namespace osu.Game.Skinning.Editor
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load()
         {
             InternalChildren = new Drawable[]
             {
                 box = new Container
                 {
-                    Colour = colours.Yellow,
                     Children = new Drawable[]
                     {
-                        new Box
+                        outlineBox = new Container
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Alpha = 0.2f,
-                            AlwaysPresent = true,
+                            Masking = true,
+                            BorderThickness = 3,
+                            BorderColour = Color4.White,
+                            Children = new Drawable[]
+                            {
+                                new Box
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Alpha = 0f,
+                                    AlwaysPresent = true,
+                                },
+                            }
                         },
-                    }
+                        new OsuSpriteText
+                        {
+                            Text = Item.GetType().Name,
+                            Font = OsuFont.Default.With(size: 10, weight: FontWeight.Bold),
+                            Anchor = Anchor.BottomRight,
+                            Origin = Anchor.TopRight,
+                        }
+                    },
                 },
             };
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            updateSelectedState();
+            box.FadeInFromZero(200, Easing.OutQuint);
+        }
+
+        protected override void OnSelected()
+        {
+            // base logic hides selected blueprints when not selected, but timeline doesn't do that.
+            updateSelectedState();
+        }
+
+        protected override void OnDeselected()
+        {
+            // base logic hides selected blueprints when not selected, but timeline doesn't do that.
+            updateSelectedState();
+        }
+
+        private void updateSelectedState()
+        {
+            outlineBox.FadeColour(colours.Pink.Opacity(IsSelected ? 1 : 0.5f), 200, Easing.OutQuint);
+            outlineBox.Child.FadeTo(IsSelected ? 0.2f : 0, 200, Easing.OutQuint);
+        }
+
         private Quad drawableQuad;
 
         public override Quad ScreenSpaceDrawQuad => drawableQuad;

From 96d4011de2927520121581413837f34e78657abe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 14:02:20 +0900
Subject: [PATCH 3341/3722] Use pattern matching to tidy up instance
 construction

---
 osu.Game/Skinning/Editor/SkinEditor.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 08fc458b94..b32d117a92 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -166,15 +166,13 @@ namespace osu.Game.Skinning.Editor
 
         private void placeComponent(Type type)
         {
-            var instance = (Drawable)Activator.CreateInstance(type) as ISkinnableComponent;
-
-            if (instance == null)
+            if (!(Activator.CreateInstance(type) is ISkinnableComponent component))
                 throw new InvalidOperationException("Attempted to instantiate a component for placement which was not an {typeof(ISkinnableComponent)}.");
 
-            getTarget(SkinnableTarget.MainHUDComponents)?.Add(instance);
+            getTarget(SkinnableTarget.MainHUDComponents)?.Add(component);
 
             SelectedComponents.Clear();
-            SelectedComponents.Add(instance);
+            SelectedComponents.Add(component);
         }
 
         private ISkinnableTarget getTarget(SkinnableTarget target)

From 42e67952517e43eef66f688099bd5490efe6ea36 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 14:11:40 +0900
Subject: [PATCH 3342/3722] Place new skin components at the centre of the
 screen by default

---
 osu.Game/Skinning/Editor/SkinEditor.cs | 14 +++++++++++++-
 osu.Game/Skinning/ISkinnableTarget.cs  |  4 +++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index b32d117a92..4e38caa806 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -166,10 +166,22 @@ namespace osu.Game.Skinning.Editor
 
         private void placeComponent(Type type)
         {
+            var targetContainer = getTarget(SkinnableTarget.MainHUDComponents);
+
+            if (targetContainer == null)
+                return;
+
             if (!(Activator.CreateInstance(type) is ISkinnableComponent component))
                 throw new InvalidOperationException("Attempted to instantiate a component for placement which was not an {typeof(ISkinnableComponent)}.");
 
-            getTarget(SkinnableTarget.MainHUDComponents)?.Add(component);
+            var drawableComponent = (Drawable)component;
+
+            // give newly added components a sane starting location.
+            drawableComponent.Origin = Anchor.TopCentre;
+            drawableComponent.Anchor = Anchor.TopCentre;
+            drawableComponent.Y = targetContainer.DrawSize.Y / 2;
+
+            targetContainer.Add(component);
 
             SelectedComponents.Clear();
             SelectedComponents.Add(component);
diff --git a/osu.Game/Skinning/ISkinnableTarget.cs b/osu.Game/Skinning/ISkinnableTarget.cs
index 4d97b42e8e..4f6e3e66c3 100644
--- a/osu.Game/Skinning/ISkinnableTarget.cs
+++ b/osu.Game/Skinning/ISkinnableTarget.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 osu.Framework.Graphics;
+
 namespace osu.Game.Skinning
 {
     /// <summary>
     /// Denotes a container which can house <see cref="ISkinnableComponent"/>s.
     /// </summary>
-    public interface ISkinnableTarget
+    public interface ISkinnableTarget : IDrawable
     {
         public SkinnableTarget Target { get; }
 

From 273cd18b8aac5d2b8593dac1e48bdd609957e7e1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 May 2021 14:19:36 +0900
Subject: [PATCH 3343/3722] Use test streaming client in gameplay leaderboard
 test

---
 ...TestSceneMultiplayerGameplayLeaderboard.cs | 32 +++----------------
 1 file changed, 5 insertions(+), 27 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
index b6c06bb149..6813a6e7dd 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -6,14 +6,12 @@ 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;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Configuration;
 using osu.Game.Database;
-using osu.Game.Online;
 using osu.Game.Online.API;
 using osu.Game.Online.Spectator;
 using osu.Game.Replays.Legacy;
@@ -22,6 +20,7 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Tests.Visual.Online;
+using osu.Game.Tests.Visual.Spectator;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
@@ -30,7 +29,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         private const int users = 16;
 
         [Cached(typeof(SpectatorStreamingClient))]
-        private TestMultiplayerStreaming streamingClient = new TestMultiplayerStreaming(users);
+        private TestMultiplayerStreaming streamingClient = new TestMultiplayerStreaming();
 
         [Cached(typeof(UserLookupCache))]
         private UserLookupCache lookupCache = new TestSceneCurrentlyPlayingDisplay.TestUserLookupCache();
@@ -71,7 +70,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
                 var playable = Beatmap.Value.GetPlayableBeatmap(Ruleset.Value);
 
-                streamingClient.Start(Beatmap.Value.BeatmapInfo.OnlineBeatmapID ?? 0);
+                for (int i = 0; i < users; i++)
+                    streamingClient.StartPlay(i, Beatmap.Value.BeatmapInfo.OnlineBeatmapID ?? 0);
 
                 Client.CurrentMatchPlayingUserIds.Clear();
                 Client.CurrentMatchPlayingUserIds.AddRange(streamingClient.PlayingUsers);
@@ -114,30 +114,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddStep("change to standardised", () => config.SetValue(OsuSetting.ScoreDisplayMode, ScoringMode.Standardised));
         }
 
-        public class TestMultiplayerStreaming : SpectatorStreamingClient
+        public class TestMultiplayerStreaming : TestSpectatorStreamingClient
         {
-            public new BindableList<int> PlayingUsers => (BindableList<int>)base.PlayingUsers;
-
-            private readonly int totalUsers;
-
-            public TestMultiplayerStreaming(int totalUsers)
-                : base(new DevelopmentEndpointConfiguration())
-            {
-                this.totalUsers = totalUsers;
-            }
-
-            public void Start(int beatmapId)
-            {
-                for (int i = 0; i < totalUsers; i++)
-                {
-                    ((ISpectatorClient)this).UserBeganPlaying(i, new SpectatorState
-                    {
-                        BeatmapID = beatmapId,
-                        RulesetID = 0,
-                    });
-                }
-            }
-
             private readonly Dictionary<int, FrameHeader> lastHeaders = new Dictionary<int, FrameHeader>();
 
             public void RandomlyUpdateState()

From e1dacde31456e2366226c64398b0dab1a116d3ab Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 May 2021 14:22:15 +0900
Subject: [PATCH 3344/3722] Add combo to test streaming client

---
 osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs b/osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs
index c2428ce415..cc8437479d 100644
--- a/osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs
+++ b/osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Tests.Visual.Spectator
                 frames.Add(new LegacyReplayFrame(i * 100, RNG.Next(0, 512), RNG.Next(0, 512), buttonState));
             }
 
-            var bundle = new FrameDataBundle(new ScoreInfo(), frames);
+            var bundle = new FrameDataBundle(new ScoreInfo { Combo = index + count }, frames);
             ((ISpectatorClient)this).UserSentFrames(userId, bundle);
 
             if (!userSentStateDictionary[userId])

From d55f42dc2eed23c66208bd906386c09ff0a8dcb4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 15:05:53 +0900
Subject: [PATCH 3345/3722] Show anchor and origin in skin blueprints when
 selected

---
 osu.Game/Skinning/Editor/SkinBlueprint.cs | 64 ++++++++++++++++++++++-
 1 file changed, 62 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinBlueprint.cs b/osu.Game/Skinning/Editor/SkinBlueprint.cs
index 23411f2b3d..7db5bc7ead 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprint.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprint.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.Color4Extensions;
 using osu.Framework.Graphics;
@@ -21,6 +22,8 @@ namespace osu.Game.Skinning.Editor
 
         private Container outlineBox;
 
+        private AnchorOriginVisualiser anchorOriginVisualiser;
+
         private Drawable drawable => (Drawable)Item;
 
         /// <summary>
@@ -69,9 +72,13 @@ namespace osu.Game.Skinning.Editor
                             Font = OsuFont.Default.With(size: 10, weight: FontWeight.Bold),
                             Anchor = Anchor.BottomRight,
                             Origin = Anchor.TopRight,
-                        }
+                        },
                     },
                 },
+                anchorOriginVisualiser = new AnchorOriginVisualiser(drawable)
+                {
+                    Alpha = 0,
+                }
             };
         }
 
@@ -80,7 +87,7 @@ namespace osu.Game.Skinning.Editor
             base.LoadComplete();
 
             updateSelectedState();
-            box.FadeInFromZero(200, Easing.OutQuint);
+            this.FadeInFromZero(200, Easing.OutQuint);
         }
 
         protected override void OnSelected()
@@ -99,6 +106,8 @@ namespace osu.Game.Skinning.Editor
         {
             outlineBox.FadeColour(colours.Pink.Opacity(IsSelected ? 1 : 0.5f), 200, Easing.OutQuint);
             outlineBox.Child.FadeTo(IsSelected ? 0.2f : 0, 200, Easing.OutQuint);
+
+            anchorOriginVisualiser.FadeTo(IsSelected ? 1 : 0, 200, Easing.OutQuint);
         }
 
         private Quad drawableQuad;
@@ -123,4 +132,55 @@ namespace osu.Game.Skinning.Editor
 
         public override Quad SelectionQuad => drawable.ScreenSpaceDrawQuad;
     }
+
+    internal class AnchorOriginVisualiser : CompositeDrawable
+    {
+        private readonly Drawable drawable;
+
+        private readonly Box originBox;
+
+        private readonly Box anchorBox;
+        private readonly Box anchorLine;
+
+        public AnchorOriginVisualiser(Drawable drawable)
+        {
+            this.drawable = drawable;
+
+            InternalChildren = new Drawable[]
+            {
+                anchorLine = new Box
+                {
+                    Colour = Color4.Yellow,
+                    Height = 2,
+                },
+                originBox = new Box
+                {
+                    Colour = Color4.Red,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(5),
+                },
+                anchorBox = new Box
+                {
+                    Colour = Color4.Red,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(5),
+                },
+            };
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            originBox.Position = drawable.ToSpaceOfOtherDrawable(drawable.OriginPosition, this);
+            anchorBox.Position = drawable.Parent.ToSpaceOfOtherDrawable(drawable.AnchorPosition, this);
+
+            var point1 = ToLocalSpace(anchorBox.ScreenSpaceDrawQuad.Centre);
+            var point2 = ToLocalSpace(originBox.ScreenSpaceDrawQuad.Centre);
+
+            anchorLine.Position = point1;
+            anchorLine.Width = (point2 - point1).Length;
+            anchorLine.Rotation = MathHelper.RadiansToDegrees(MathF.Atan2(point2.Y - point1.Y, point2.X - point1.X));
+        }
+    }
 }

From 05e0c57a6af3fd579abc9ea73fd4de33702f9284 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 15:30:52 +0900
Subject: [PATCH 3346/3722] Keep component positions stable when changing
 anchor/origin

---
 osu.Game/Skinning/Editor/SkinSelectionHandler.cs | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index cf5ece03e9..410ec7a272 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -109,13 +109,25 @@ namespace osu.Game.Skinning.Editor
         private void applyOrigin(Anchor anchor)
         {
             foreach (var item in SelectedItems)
-                ((Drawable)item).Origin = anchor;
+            {
+                var drawable = (Drawable)item;
+
+                var previousOrigin = drawable.OriginPosition;
+                drawable.Origin = anchor;
+                drawable.Position += drawable.OriginPosition - previousOrigin;
+            }
         }
 
         private void applyAnchor(Anchor anchor)
         {
             foreach (var item in SelectedItems)
-                ((Drawable)item).Anchor = anchor;
+            {
+                var drawable = (Drawable)item;
+
+                var previousAnchor = (drawable.AnchorPosition);
+                drawable.Anchor = anchor;
+                drawable.Position -= drawable.AnchorPosition - previousAnchor;
+            }
         }
 
         private static void adjustScaleFromAnchor(ref Vector2 scale, Anchor reference)

From 29e6f6b6b6cc1cc8931c13525da01f224ae8de89 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 15:58:21 +0900
Subject: [PATCH 3347/3722] Remove `public` prefixes from interface type and
 add `Components` list for future use

---
 .../Skinning/Editor/SkinBlueprintContainer.cs    |  3 +--
 osu.Game/Skinning/ISkinnableTarget.cs            | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
index ef189ed165..9890b8e8b6 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
@@ -12,7 +12,6 @@ using osu.Framework.Testing;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Screens;
 using osu.Game.Screens.Edit.Compose.Components;
-using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Skinning.Editor
 {
@@ -38,7 +37,7 @@ namespace osu.Game.Skinning.Editor
             base.LoadComplete();
 
             // track each target container on the current screen.
-            var targetContainers = target.ChildrenOfType<SkinnableElementTargetContainer>().ToArray();
+            var targetContainers = target.ChildrenOfType<ISkinnableTarget>().ToArray();
 
             if (targetContainers.Length == 0)
             {
diff --git a/osu.Game/Skinning/ISkinnableTarget.cs b/osu.Game/Skinning/ISkinnableTarget.cs
index 4d97b42e8e..ab3c24a1e2 100644
--- a/osu.Game/Skinning/ISkinnableTarget.cs
+++ b/osu.Game/Skinning/ISkinnableTarget.cs
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Framework.Bindables;
+
 namespace osu.Game.Skinning
 {
     /// <summary>
@@ -8,16 +10,24 @@ namespace osu.Game.Skinning
     /// </summary>
     public interface ISkinnableTarget
     {
-        public SkinnableTarget Target { get; }
+        /// <summary>
+        /// The definition of this target.
+        /// </summary>
+        SkinnableTarget Target { get; }
+
+        /// <summary>
+        /// A bindable list of components which are being tracked by this skinnable target.
+        /// </summary>
+        IBindableList<ISkinnableComponent> Components { get; }
 
         /// <summary>
         /// Reload this target from the current skin.
         /// </summary>
-        public void Reload();
+        void Reload();
 
         /// <summary>
         /// Add the provided item to this target.
         /// </summary>
-        public void Add(ISkinnableComponent drawable);
+        void Add(ISkinnableComponent drawable);
     }
 }

From 494a1b01a536d6470b2700d4879cd0a05dc13e7e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 15:59:33 +0900
Subject: [PATCH 3348/3722] Move `SkinnableElementTargetContainer` out of HUD
 namespace

---
 osu.Game/Skinning/Editor/SkinEditor.cs                        | 1 -
 .../Play/HUD => Skinning}/SkinnableElementTargetContainer.cs  | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)
 rename osu.Game/{Screens/Play/HUD => Skinning}/SkinnableElementTargetContainer.cs (97%)

diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index b32d117a92..a00557ee4e 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -13,7 +13,6 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Screens.Play.HUD;
 using osuTK;
 
 namespace osu.Game.Skinning.Editor
diff --git a/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs b/osu.Game/Skinning/SkinnableElementTargetContainer.cs
similarity index 97%
rename from osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
rename to osu.Game/Skinning/SkinnableElementTargetContainer.cs
index b2f6d32927..b900fdf3e0 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableElementTargetContainer.cs
+++ b/osu.Game/Skinning/SkinnableElementTargetContainer.cs
@@ -7,9 +7,9 @@ using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Extensions;
-using osu.Game.Skinning;
+using osu.Game.Screens.Play.HUD;
 
-namespace osu.Game.Screens.Play.HUD
+namespace osu.Game.Skinning
 {
     public class SkinnableElementTargetContainer : SkinReloadableDrawable, ISkinnableTarget
     {

From 9df08560b69519f94779e22e2ce6c49433b1808b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 16:07:00 +0900
Subject: [PATCH 3349/3722] Save skin editor changes on forced exit

---
 osu.Game/Skinning/Editor/SkinEditor.cs        | 4 ++--
 osu.Game/Skinning/Editor/SkinEditorOverlay.cs | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index a00557ee4e..5deebe9800 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -108,7 +108,7 @@ namespace osu.Game.Skinning.Editor
                                                 {
                                                     Text = "Save Changes",
                                                     Width = 140,
-                                                    Action = save,
+                                                    Action = Save,
                                                 },
                                                 new DangerousTriangleButton
                                                 {
@@ -192,7 +192,7 @@ namespace osu.Game.Skinning.Editor
             }
         }
 
-        private void save()
+        public void Save()
         {
             SkinnableElementTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableElementTargetContainer>().ToArray();
 
diff --git a/osu.Game/Skinning/Editor/SkinEditorOverlay.cs b/osu.Game/Skinning/Editor/SkinEditorOverlay.cs
index cbed498a38..2d7cae71ff 100644
--- a/osu.Game/Skinning/Editor/SkinEditorOverlay.cs
+++ b/osu.Game/Skinning/Editor/SkinEditorOverlay.cs
@@ -92,8 +92,10 @@ namespace osu.Game.Skinning.Editor
         /// </summary>
         public void Reset()
         {
+            skinEditor?.Save();
             skinEditor?.Hide();
             skinEditor?.Expire();
+
             skinEditor = null;
         }
     }

From 5692cecaa47e9e071fb6079d9f3847b8b1de0972 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 May 2021 16:35:05 +0900
Subject: [PATCH 3350/3722] Initial implementation of DHO pooling

---
 .../Skinning/TestSceneColumnBackground.cs     |  4 +-
 .../Skinning/TestSceneKeyArea.cs              |  4 +-
 osu.Game.Rulesets.Mania/ManiaSkinComponent.cs | 10 +---
 .../Objects/Drawables/DrawableHoldNote.cs     | 55 +++++++++----------
 .../Objects/Drawables/DrawableHoldNoteHead.cs | 12 +++-
 .../Objects/Drawables/DrawableHoldNoteTail.cs | 17 ++++--
 .../Objects/Drawables/DrawableHoldNoteTick.cs | 47 +++++++++++++---
 .../Drawables/DrawableManiaHitObject.cs       | 20 ++++++-
 .../Objects/Drawables/DrawableNote.cs         | 26 +++++----
 osu.Game.Rulesets.Mania/Objects/HeadNote.cs   |  9 +++
 osu.Game.Rulesets.Mania/Objects/HoldNote.cs   |  4 +-
 osu.Game.Rulesets.Mania/UI/Column.cs          | 11 +++-
 .../UI/Components/ColumnHitObjectArea.cs      |  2 +-
 .../UI/PoolableHitExplosion.cs                |  2 +-
 14 files changed, 146 insertions(+), 77 deletions(-)
 create mode 100644 osu.Game.Rulesets.Mania/Objects/HeadNote.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnBackground.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnBackground.cs
index bde323f187..ca323b5911 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneColumnBackground.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
                     {
                         RelativeSizeAxes = Axes.Both,
                         Width = 0.5f,
-                        Child = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.ColumnBackground, 0), _ => new DefaultColumnBackground())
+                        Child = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.ColumnBackground), _ => new DefaultColumnBackground())
                         {
                             RelativeSizeAxes = Axes.Both
                         }
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
                     {
                         RelativeSizeAxes = Axes.Both,
                         Width = 0.5f,
-                        Child = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.ColumnBackground, 1), _ => new DefaultColumnBackground())
+                        Child = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.ColumnBackground), _ => new DefaultColumnBackground())
                         {
                             RelativeSizeAxes = Axes.Both
                         }
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneKeyArea.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneKeyArea.cs
index 7e80419944..c58c07c83b 100644
--- a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneKeyArea.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneKeyArea.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
                     {
                         RelativeSizeAxes = Axes.Both,
                         Width = 0.5f,
-                        Child = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.KeyArea, 0), _ => new DefaultKeyArea())
+                        Child = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.KeyArea), _ => new DefaultKeyArea())
                         {
                             RelativeSizeAxes = Axes.Both
                         },
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Skinning
                     {
                         RelativeSizeAxes = Axes.Both,
                         Width = 0.5f,
-                        Child = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.KeyArea, 1), _ => new DefaultKeyArea())
+                        Child = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.KeyArea), _ => new DefaultKeyArea())
                         {
                             RelativeSizeAxes = Axes.Both
                         },
diff --git a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs b/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
index f078345fc1..9aebf51576 100644
--- a/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
+++ b/osu.Game.Rulesets.Mania/ManiaSkinComponent.cs
@@ -9,12 +9,6 @@ namespace osu.Game.Rulesets.Mania
 {
     public class ManiaSkinComponent : GameplaySkinComponent<ManiaSkinComponents>
     {
-        /// <summary>
-        /// The intended <see cref="Column"/> index for this component.
-        /// May be null if the component does not exist in a <see cref="Column"/>.
-        /// </summary>
-        public readonly int? TargetColumn;
-
         /// <summary>
         /// The intended <see cref="StageDefinition"/> for this component.
         /// May be null if the component is not a direct member of a <see cref="Stage"/>.
@@ -25,12 +19,10 @@ namespace osu.Game.Rulesets.Mania
         /// Creates a new <see cref="ManiaSkinComponent"/>.
         /// </summary>
         /// <param name="component">The component.</param>
-        /// <param name="targetColumn">The intended <see cref="Column"/> index for this component. May be null if the component does not exist in a <see cref="Column"/>.</param>
         /// <param name="stageDefinition">The intended <see cref="StageDefinition"/> for this component. May be null if the component is not a direct member of a <see cref="Stage"/>.</param>
-        public ManiaSkinComponent(ManiaSkinComponents component, int? targetColumn = null, StageDefinition? stageDefinition = null)
+        public ManiaSkinComponent(ManiaSkinComponents component, StageDefinition? stageDefinition = null)
             : base(component)
         {
-            TargetColumn = targetColumn;
             StageDefinition = stageDefinition;
         }
 
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index 02829d87bd..e1cf1851df 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -2,6 +2,7 @@
 // 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;
@@ -29,21 +30,21 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         public DrawableHoldNoteHead Head => headContainer.Child;
         public DrawableHoldNoteTail Tail => tailContainer.Child;
 
-        private readonly Container<DrawableHoldNoteHead> headContainer;
-        private readonly Container<DrawableHoldNoteTail> tailContainer;
-        private readonly Container<DrawableHoldNoteTick> tickContainer;
+        private Container<DrawableHoldNoteHead> headContainer;
+        private Container<DrawableHoldNoteTail> tailContainer;
+        private Container<DrawableHoldNoteTick> tickContainer;
 
         /// <summary>
         /// Contains the size of the hold note covering the whole head/tail bounds. The size of this container changes as the hold note is being pressed.
         /// </summary>
-        private readonly Container sizingContainer;
+        private Container sizingContainer;
 
         /// <summary>
         /// Contains the contents of the hold note that should be masked as the hold note is being pressed. Follows changes in the size of <see cref="sizingContainer"/>.
         /// </summary>
-        private readonly Container maskingContainer;
+        private Container maskingContainer;
 
-        private readonly SkinnableDrawable bodyPiece;
+        private SkinnableDrawable bodyPiece;
 
         /// <summary>
         /// Time at which the user started holding this hold note. Null if the user is not holding this hold note.
@@ -60,11 +61,19 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         /// </summary>
         private double? releaseTime;
 
+        public DrawableHoldNote()
+            : this(null)
+        {
+        }
+
         public DrawableHoldNote(HoldNote hitObject)
             : base(hitObject)
         {
-            RelativeSizeAxes = Axes.X;
+        }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
             Container maskedContents;
 
             AddRangeInternal(new Drawable[]
@@ -86,7 +95,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                         headContainer = new Container<DrawableHoldNoteHead> { RelativeSizeAxes = Axes.Both }
                     }
                 },
-                bodyPiece = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HoldNoteBody, hitObject.Column), _ => new DefaultBodyPiece
+                bodyPiece = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HoldNoteBody), _ => new DefaultBodyPiece
                 {
                     RelativeSizeAxes = Axes.Both,
                 })
@@ -128,37 +137,23 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         protected override void ClearNestedHitObjects()
         {
             base.ClearNestedHitObjects();
-            headContainer.Clear();
-            tailContainer.Clear();
-            tickContainer.Clear();
+            headContainer.Clear(false);
+            tailContainer.Clear(false);
+            tickContainer.Clear(false);
         }
 
         protected override DrawableHitObject CreateNestedHitObject(HitObject hitObject)
         {
             switch (hitObject)
             {
-                case TailNote _:
-                    return new DrawableHoldNoteTail(this)
-                    {
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.TopCentre,
-                        AccentColour = { BindTarget = AccentColour }
-                    };
+                case TailNote tail:
+                    return new DrawableHoldNoteTail(tail);
 
-                case Note _:
-                    return new DrawableHoldNoteHead(this)
-                    {
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.TopCentre,
-                        AccentColour = { BindTarget = AccentColour }
-                    };
+                case HeadNote head:
+                    return new DrawableHoldNoteHead(head);
 
                 case HoldNoteTick tick:
-                    return new DrawableHoldNoteTick(tick)
-                    {
-                        HoldStartTime = () => HoldStartTime,
-                        AccentColour = { BindTarget = AccentColour }
-                    };
+                    return new DrawableHoldNoteTick(tick);
             }
 
             return base.CreateNestedHitObject(hitObject);
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs
index 35ba2465fa..be600f0d47 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteHead.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.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Mania.Objects.Drawables
@@ -12,11 +13,18 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
     {
         protected override ManiaSkinComponents Component => ManiaSkinComponents.HoldNoteHead;
 
-        public DrawableHoldNoteHead(DrawableHoldNote holdNote)
-            : base(holdNote.HitObject.Head)
+        public DrawableHoldNoteHead()
+            : this(null)
         {
         }
 
+        public DrawableHoldNoteHead(HeadNote headNote)
+            : base(headNote)
+        {
+            Anchor = Anchor.TopCentre;
+            Origin = Anchor.TopCentre;
+        }
+
         public void UpdateResult() => base.UpdateResult(true);
 
         protected override void UpdateInitialTransforms()
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
index 3a00933e4d..18aa3f66d4 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTail.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Diagnostics;
+using osu.Framework.Graphics;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Mania.Objects.Drawables
@@ -20,12 +21,18 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         protected override ManiaSkinComponents Component => ManiaSkinComponents.HoldNoteTail;
 
-        private readonly DrawableHoldNote holdNote;
+        protected DrawableHoldNote HoldNote => (DrawableHoldNote)ParentHitObject;
 
-        public DrawableHoldNoteTail(DrawableHoldNote holdNote)
-            : base(holdNote.HitObject.Tail)
+        public DrawableHoldNoteTail()
+            : this(null)
         {
-            this.holdNote = holdNote;
+        }
+
+        public DrawableHoldNoteTail(TailNote tailNote)
+            : base(tailNote)
+        {
+            Anchor = Anchor.TopCentre;
+            Origin = Anchor.TopCentre;
         }
 
         public void UpdateResult() => base.UpdateResult(true);
@@ -54,7 +61,7 @@ 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))
+                if (result > HitResult.Meh && (!HoldNote.Head.IsHit || HoldNote.HoldBrokenTime != null))
                     result = HitResult.Meh;
 
                 r.Type = result;
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs
index 98931dceed..6a57849fb4 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs
@@ -2,7 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osuTK;
+using System.Diagnostics;
+using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -19,20 +20,28 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         /// <summary>
         /// References the time at which the user started holding the hold note.
         /// </summary>
-        public Func<double?> HoldStartTime;
+        private Func<double?> holdStartTime;
+
+        private Container glowContainer;
+
+        public DrawableHoldNoteTick()
+            : this(null)
+        {
+        }
 
         public DrawableHoldNoteTick(HoldNoteTick hitObject)
             : base(hitObject)
         {
-            Container glowContainer;
-
             Anchor = Anchor.TopCentre;
             Origin = Anchor.TopCentre;
 
             RelativeSizeAxes = Axes.X;
-            Size = new Vector2(1);
+        }
 
-            AddRangeInternal(new[]
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChildren = new[]
             {
                 glowContainer = new CircularContainer
                 {
@@ -50,7 +59,12 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                         }
                     }
                 }
-            });
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
 
             AccentColour.BindValueChanged(colour =>
             {
@@ -64,12 +78,29 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             }, 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;
 
-            var startTime = HoldStartTime?.Invoke();
+            var startTime = holdStartTime?.Invoke();
 
             if (startTime == null || startTime > HitObject.StartTime)
                 ApplyResult(r => r.Type = r.Judgement.MinResult);
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
index 003646d654..7323ae9df1 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
@@ -50,6 +50,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         protected DrawableManiaHitObject(ManiaHitObject hitObject)
             : base(hitObject)
         {
+            RelativeSizeAxes = Axes.X;
         }
 
         [BackgroundDependencyLoader(true)]
@@ -62,6 +63,22 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             Direction.BindValueChanged(OnDirectionChanged, true);
         }
 
+        protected override void OnApply()
+        {
+            base.OnApply();
+
+            if (ParentHitObject != null)
+                AccentColour.BindTo(ParentHitObject.AccentColour);
+        }
+
+        protected override void OnFree()
+        {
+            base.OnFree();
+
+            if (ParentHitObject != null)
+                AccentColour.UnbindFrom(ParentHitObject.AccentColour);
+        }
+
         private double computedLifetimeStart;
 
         public override double LifetimeStart
@@ -147,12 +164,11 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
     public abstract class DrawableManiaHitObject<TObject> : DrawableManiaHitObject
         where TObject : ManiaHitObject
     {
-        public new readonly TObject HitObject;
+        public new TObject HitObject => (TObject)base.HitObject;
 
         protected DrawableManiaHitObject(TObject hitObject)
             : base(hitObject)
         {
-            HitObject = hitObject;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 36565e14aa..16feec6b3a 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -33,31 +33,35 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         protected virtual ManiaSkinComponents Component => ManiaSkinComponents.Note;
 
-        private readonly Drawable headPiece;
+        private Drawable headPiece;
+
+        public DrawableNote()
+            : this(null)
+        {
+        }
 
         public DrawableNote(Note hitObject)
             : base(hitObject)
         {
-            RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
-
-            AddInternal(headPiece = new SkinnableDrawable(new ManiaSkinComponent(Component, hitObject.Column), _ => new DefaultNotePiece())
-            {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y
-            });
         }
 
         [BackgroundDependencyLoader(true)]
         private void load(ManiaRulesetConfigManager rulesetConfig)
         {
             rulesetConfig?.BindWith(ManiaRulesetSetting.TimingBasedNoteColouring, configTimingBasedNoteColouring);
+
+            InternalChild = headPiece = new SkinnableDrawable(new ManiaSkinComponent(Component), _ => new DefaultNotePiece())
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y
+            };
         }
 
         protected override void LoadComplete()
         {
-            HitObject.StartTimeBindable.BindValueChanged(_ => updateSnapColour());
-            configTimingBasedNoteColouring.BindValueChanged(_ => updateSnapColour(), true);
+            configTimingBasedNoteColouring.BindValueChanged(_ => updateSnapColour());
+            StartTimeBindable.BindValueChanged(_ => updateSnapColour(), true);
         }
 
         protected override void OnDirectionChanged(ValueChangedEvent<ScrollingDirection> e)
@@ -102,7 +106,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         private void updateSnapColour()
         {
-            if (beatmap == null) return;
+            if (beatmap == null || HitObject == null) return;
 
             int snapDivisor = beatmap.ControlPointInfo.GetClosestBeatDivisor(HitObject.StartTime);
 
diff --git a/osu.Game.Rulesets.Mania/Objects/HeadNote.cs b/osu.Game.Rulesets.Mania/Objects/HeadNote.cs
new file mode 100644
index 0000000000..e69cc62aed
--- /dev/null
+++ b/osu.Game.Rulesets.Mania/Objects/HeadNote.cs
@@ -0,0 +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.
+
+namespace osu.Game.Rulesets.Mania.Objects
+{
+    public class HeadNote : Note
+    {
+    }
+}
diff --git a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
index 6cc7ff92d3..43e876b7aa 100644
--- a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Rulesets.Mania.Objects
         /// <summary>
         /// The head note of the hold.
         /// </summary>
-        public Note Head { get; private set; }
+        public HeadNote Head { get; private set; }
 
         /// <summary>
         /// The tail note of the hold.
@@ -98,7 +98,7 @@ namespace osu.Game.Rulesets.Mania.Objects
 
             createTicks(cancellationToken);
 
-            AddNested(Head = new Note
+            AddNested(Head = new HeadNote
             {
                 StartTime = StartTime,
                 Column = Column,
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 0f02e2cd4b..8247a37881 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -17,6 +17,7 @@ using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
 using osuTK;
 using osu.Game.Rulesets.Mania.Beatmaps;
+using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Mania.UI
@@ -55,7 +56,7 @@ namespace osu.Game.Rulesets.Mania.UI
             RelativeSizeAxes = Axes.Y;
             Width = COLUMN_WIDTH;
 
-            Drawable background = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.ColumnBackground, Index), _ => new DefaultColumnBackground())
+            Drawable background = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.ColumnBackground), _ => new DefaultColumnBackground())
             {
                 RelativeSizeAxes = Axes.Both
             };
@@ -66,7 +67,7 @@ namespace osu.Game.Rulesets.Mania.UI
                 // For input purposes, the background is added at the highest depth, but is then proxied back below all other elements
                 background.CreateProxy(),
                 HitObjectArea = new ColumnHitObjectArea(Index, HitObjectContainer) { RelativeSizeAxes = Axes.Both },
-                new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.KeyArea, Index), _ => new DefaultKeyArea())
+                new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.KeyArea), _ => new DefaultKeyArea())
                 {
                     RelativeSizeAxes = Axes.Both
                 },
@@ -83,6 +84,12 @@ namespace osu.Game.Rulesets.Mania.UI
             hitPolicy = new OrderedHitPolicy(HitObjectContainer);
 
             TopLevelContainer.Add(HitObjectArea.Explosions.CreateProxy());
+
+            RegisterPool<Note, DrawableNote>(5, 20);
+            RegisterPool<HoldNote, DrawableHoldNote>(5, 20);
+            RegisterPool<HeadNote, DrawableHoldNoteHead>(5, 20);
+            RegisterPool<TailNote, DrawableHoldNoteTail>(5, 20);
+            RegisterPool<HoldNoteTick, DrawableHoldNoteTick>(50, 200);
         }
 
         public ColumnType ColumnType { get; set; }
diff --git a/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs b/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs
index b365ae45a9..f69d2aafdc 100644
--- a/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs
+++ b/osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Mania.UI.Components
                     RelativeSizeAxes = Axes.Both,
                     Depth = 2,
                 },
-                hitTarget = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HitTarget, columnIndex), _ => new DefaultHitTarget())
+                hitTarget = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HitTarget), _ => new DefaultHitTarget())
                 {
                     RelativeSizeAxes = Axes.X,
                     Depth = 1
diff --git a/osu.Game.Rulesets.Mania/UI/PoolableHitExplosion.cs b/osu.Game.Rulesets.Mania/UI/PoolableHitExplosion.cs
index 64b7d7d550..90d3c6c4c7 100644
--- a/osu.Game.Rulesets.Mania/UI/PoolableHitExplosion.cs
+++ b/osu.Game.Rulesets.Mania/UI/PoolableHitExplosion.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Mania.UI
         [BackgroundDependencyLoader]
         private void load()
         {
-            InternalChild = skinnableExplosion = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HitExplosion, column.Index), _ => new DefaultHitExplosion())
+            InternalChild = skinnableExplosion = new SkinnableDrawable(new ManiaSkinComponent(ManiaSkinComponents.HitExplosion), _ => new DefaultHitExplosion())
             {
                 RelativeSizeAxes = Axes.Both
             };

From 17e376457610652e9cfac1470eb8748114441022 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 16:38:04 +0900
Subject: [PATCH 3351/3722] Rename `Settings` to have a more localised name

---
 .../Edit/{Settings.cs => RoundedContentEditorScreenSettings.cs} | 2 +-
 osu.Game/Screens/Edit/Timing/ControlPointSettings.cs            | 2 +-
 osu.Game/Screens/Edit/Verify/IssueSettings.cs                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename osu.Game/Screens/Edit/{Settings.cs => RoundedContentEditorScreenSettings.cs} (94%)

diff --git a/osu.Game/Screens/Edit/Settings.cs b/osu.Game/Screens/Edit/RoundedContentEditorScreenSettings.cs
similarity index 94%
rename from osu.Game/Screens/Edit/Settings.cs
rename to osu.Game/Screens/Edit/RoundedContentEditorScreenSettings.cs
index 758414333d..06293fbaac 100644
--- a/osu.Game/Screens/Edit/Settings.cs
+++ b/osu.Game/Screens/Edit/RoundedContentEditorScreenSettings.cs
@@ -11,7 +11,7 @@ using osu.Game.Overlays;
 
 namespace osu.Game.Screens.Edit
 {
-    public abstract class Settings : CompositeDrawable
+    public abstract class RoundedContentEditorScreenSettings : CompositeDrawable
     {
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colours)
diff --git a/osu.Game/Screens/Edit/Timing/ControlPointSettings.cs b/osu.Game/Screens/Edit/Timing/ControlPointSettings.cs
index 36f31d4be4..13f81c75da 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointSettings.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointSettings.cs
@@ -6,7 +6,7 @@ using osu.Framework.Graphics;
 
 namespace osu.Game.Screens.Edit.Timing
 {
-    public class ControlPointSettings : Settings
+    public class ControlPointSettings : RoundedContentEditorScreenSettings
     {
         protected override IReadOnlyList<Drawable> CreateSections() => new Drawable[]
         {
diff --git a/osu.Game/Screens/Edit/Verify/IssueSettings.cs b/osu.Game/Screens/Edit/Verify/IssueSettings.cs
index 68ab51c3c8..506694aa46 100644
--- a/osu.Game/Screens/Edit/Verify/IssueSettings.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueSettings.cs
@@ -6,7 +6,7 @@ using osu.Framework.Graphics;
 
 namespace osu.Game.Screens.Edit.Verify
 {
-    public class IssueSettings : Settings
+    public class IssueSettings : RoundedContentEditorScreenSettings
     {
         private readonly IssueList issueList;
 

From 4e7551d50ef672362d11a9241b277617f47dac73 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 May 2021 16:40:46 +0900
Subject: [PATCH 3352/3722] Fix crashes

---
 .../Objects/Drawables/DrawableHoldNoteTick.cs | 25 ++++++++-----------
 .../Drawables/DrawableManiaHitObject.cs       |  6 +++++
 .../Objects/Drawables/DrawableNote.cs         |  4 +--
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs
index 6a57849fb4..f040dad135 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs
@@ -41,25 +41,22 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         [BackgroundDependencyLoader]
         private void load()
         {
-            InternalChildren = new[]
+            AddInternal(glowContainer = new CircularContainer
             {
-                glowContainer = new CircularContainer
+                Anchor = Anchor.TopCentre,
+                Origin = Anchor.TopCentre,
+                RelativeSizeAxes = Axes.Both,
+                Masking = true,
+                Children = new[]
                 {
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre,
-                    RelativeSizeAxes = Axes.Both,
-                    Masking = true,
-                    Children = new[]
+                    new Box
                     {
-                        new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Alpha = 0,
-                            AlwaysPresent = true
-                        }
+                        RelativeSizeAxes = Axes.Both,
+                        Alpha = 0,
+                        AlwaysPresent = true
                     }
                 }
-            };
+            });
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
index 7323ae9df1..380ab35339 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
@@ -60,6 +60,12 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                 Action.BindTo(action);
 
             Direction.BindTo(scrollingInfo.Direction);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
             Direction.BindValueChanged(OnDirectionChanged, true);
         }
 
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index 16feec6b3a..b711e67f25 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -51,11 +51,11 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
             rulesetConfig?.BindWith(ManiaRulesetSetting.TimingBasedNoteColouring, configTimingBasedNoteColouring);
 
-            InternalChild = headPiece = new SkinnableDrawable(new ManiaSkinComponent(Component), _ => new DefaultNotePiece())
+            AddInternal(headPiece = new SkinnableDrawable(new ManiaSkinComponent(Component), _ => new DefaultNotePiece())
             {
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y
-            };
+            });
         }
 
         protected override void LoadComplete()

From d2e0e8ad948aac6ef137abf81d50963ba8e55297 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 16:53:49 +0900
Subject: [PATCH 3353/3722] Reverse direction of binding to allow for better
 abstract class definitions

---
 ...tEditorScreen.cs => EditorRoundedScreen.cs} |  4 ++--
 ...tings.cs => EditorRoundedScreenSettings.cs} |  2 +-
 ...s => EditorRoundedScreenSettingsSection.cs} | 11 ++---------
 osu.Game/Screens/Edit/Setup/SetupScreen.cs     |  2 +-
 .../Screens/Edit/Setup/SetupScreenHeader.cs    |  2 +-
 osu.Game/Screens/Edit/Setup/SetupSection.cs    |  2 +-
 .../Edit/Timing/ControlPointSettings.cs        |  2 +-
 osu.Game/Screens/Edit/Timing/TimingScreen.cs   |  2 +-
 .../Edit/Verify/InterpretationSection.cs       | 11 +++++------
 osu.Game/Screens/Edit/Verify/IssueList.cs      |  5 +++--
 osu.Game/Screens/Edit/Verify/IssueSettings.cs  | 13 +++----------
 osu.Game/Screens/Edit/Verify/IssueTable.cs     |  5 ++++-
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs   | 18 +++++++++++-------
 .../Screens/Edit/Verify/VisibilitySection.cs   | 14 ++++++--------
 14 files changed, 42 insertions(+), 51 deletions(-)
 rename osu.Game/Screens/Edit/{RoundedContentEditorScreen.cs => EditorRoundedScreen.cs} (93%)
 rename osu.Game/Screens/Edit/{RoundedContentEditorScreenSettings.cs => EditorRoundedScreenSettings.cs} (94%)
 rename osu.Game/Screens/Edit/{Verify/Section.cs => EditorRoundedScreenSettingsSection.cs} (88%)

diff --git a/osu.Game/Screens/Edit/RoundedContentEditorScreen.cs b/osu.Game/Screens/Edit/EditorRoundedScreen.cs
similarity index 93%
rename from osu.Game/Screens/Edit/RoundedContentEditorScreen.cs
rename to osu.Game/Screens/Edit/EditorRoundedScreen.cs
index a55ae3f635..c6ced02021 100644
--- a/osu.Game/Screens/Edit/RoundedContentEditorScreen.cs
+++ b/osu.Game/Screens/Edit/EditorRoundedScreen.cs
@@ -10,7 +10,7 @@ using osu.Game.Overlays;
 
 namespace osu.Game.Screens.Edit
 {
-    public class RoundedContentEditorScreen : EditorScreen
+    public class EditorRoundedScreen : EditorScreen
     {
         public const int HORIZONTAL_PADDING = 100;
 
@@ -24,7 +24,7 @@ namespace osu.Game.Screens.Edit
 
         protected override Container<Drawable> Content => roundedContent;
 
-        public RoundedContentEditorScreen(EditorScreenMode mode)
+        public EditorRoundedScreen(EditorScreenMode mode)
             : base(mode)
         {
             ColourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
diff --git a/osu.Game/Screens/Edit/RoundedContentEditorScreenSettings.cs b/osu.Game/Screens/Edit/EditorRoundedScreenSettings.cs
similarity index 94%
rename from osu.Game/Screens/Edit/RoundedContentEditorScreenSettings.cs
rename to osu.Game/Screens/Edit/EditorRoundedScreenSettings.cs
index 06293fbaac..cb17484d27 100644
--- a/osu.Game/Screens/Edit/RoundedContentEditorScreenSettings.cs
+++ b/osu.Game/Screens/Edit/EditorRoundedScreenSettings.cs
@@ -11,7 +11,7 @@ using osu.Game.Overlays;
 
 namespace osu.Game.Screens.Edit
 {
-    public abstract class RoundedContentEditorScreenSettings : CompositeDrawable
+    public abstract class EditorRoundedScreenSettings : CompositeDrawable
     {
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colours)
diff --git a/osu.Game/Screens/Edit/Verify/Section.cs b/osu.Game/Screens/Edit/EditorRoundedScreenSettingsSection.cs
similarity index 88%
rename from osu.Game/Screens/Edit/Verify/Section.cs
rename to osu.Game/Screens/Edit/EditorRoundedScreenSettingsSection.cs
index f6815a05a1..87ed98a439 100644
--- a/osu.Game/Screens/Edit/Verify/Section.cs
+++ b/osu.Game/Screens/Edit/EditorRoundedScreenSettingsSection.cs
@@ -9,22 +9,15 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osuTK;
 
-namespace osu.Game.Screens.Edit.Verify
+namespace osu.Game.Screens.Edit
 {
-    public abstract class Section : CompositeDrawable
+    public abstract class EditorRoundedScreenSettingsSection : CompositeDrawable
     {
         private const int header_height = 50;
 
-        protected readonly IssueList IssueList;
-
         protected FillFlowContainer Flow;
         protected abstract string Header { get; }
 
-        protected Section(IssueList issueList)
-        {
-            IssueList = issueList;
-        }
-
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colours)
         {
diff --git a/osu.Game/Screens/Edit/Setup/SetupScreen.cs b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
index 0af7cf095b..5bbec2574f 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreen.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreen.cs
@@ -7,7 +7,7 @@ using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Screens.Edit.Setup
 {
-    public class SetupScreen : RoundedContentEditorScreen
+    public class SetupScreen : EditorRoundedScreen
     {
         [Cached]
         private SectionsContainer<SetupSection> sections = new SectionsContainer<SetupSection>();
diff --git a/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs b/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
index 10daacc359..2d0afda001 100644
--- a/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupScreenHeader.cs
@@ -93,7 +93,7 @@ namespace osu.Game.Screens.Edit.Setup
 
             public SetupScreenTabControl()
             {
-                TabContainer.Margin = new MarginPadding { Horizontal = RoundedContentEditorScreen.HORIZONTAL_PADDING };
+                TabContainer.Margin = new MarginPadding { Horizontal = EditorRoundedScreen.HORIZONTAL_PADDING };
 
                 AddInternal(background = new Box
                 {
diff --git a/osu.Game/Screens/Edit/Setup/SetupSection.cs b/osu.Game/Screens/Edit/Setup/SetupSection.cs
index b3ae15900f..8964e651df 100644
--- a/osu.Game/Screens/Edit/Setup/SetupSection.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupSection.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Screens.Edit.Setup
             Padding = new MarginPadding
             {
                 Vertical = 10,
-                Horizontal = RoundedContentEditorScreen.HORIZONTAL_PADDING
+                Horizontal = EditorRoundedScreen.HORIZONTAL_PADDING
             };
 
             InternalChild = new FillFlowContainer
diff --git a/osu.Game/Screens/Edit/Timing/ControlPointSettings.cs b/osu.Game/Screens/Edit/Timing/ControlPointSettings.cs
index 13f81c75da..48639789af 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointSettings.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointSettings.cs
@@ -6,7 +6,7 @@ using osu.Framework.Graphics;
 
 namespace osu.Game.Screens.Edit.Timing
 {
-    public class ControlPointSettings : RoundedContentEditorScreenSettings
+    public class ControlPointSettings : EditorRoundedScreenSettings
     {
         protected override IReadOnlyList<Drawable> CreateSections() => new Drawable[]
         {
diff --git a/osu.Game/Screens/Edit/Timing/TimingScreen.cs b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
index 9f26dece08..a4193d5084 100644
--- a/osu.Game/Screens/Edit/Timing/TimingScreen.cs
+++ b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
@@ -15,7 +15,7 @@ using osuTK;
 
 namespace osu.Game.Screens.Edit.Timing
 {
-    public class TimingScreen : RoundedContentEditorScreen
+    public class TimingScreen : EditorRoundedScreen
     {
         [Cached]
         private Bindable<ControlPointGroup> selectedGroup = new Bindable<ControlPointGroup>();
diff --git a/osu.Game/Screens/Edit/Verify/InterpretationSection.cs b/osu.Game/Screens/Edit/Verify/InterpretationSection.cs
index fa0bde9ddc..7991786542 100644
--- a/osu.Game/Screens/Edit/Verify/InterpretationSection.cs
+++ b/osu.Game/Screens/Edit/Verify/InterpretationSection.cs
@@ -8,12 +8,10 @@ using osu.Game.Overlays.Settings;
 
 namespace osu.Game.Screens.Edit.Verify
 {
-    internal class InterpretationSection : Section
+    internal class InterpretationSection : EditorRoundedScreenSettingsSection
     {
-        public InterpretationSection(IssueList issueList)
-            : base(issueList)
-        {
-        }
+        [Resolved]
+        private VerifyScreen verify { get; set; }
 
         protected override string Header => "Interpretation";
 
@@ -26,7 +24,8 @@ namespace osu.Game.Screens.Edit.Verify
                 Origin = Anchor.CentreLeft,
                 TooltipText = "Affects checks that depend on difficulty level"
             };
-            dropdown.Current.BindTo(IssueList.InterpretedDifficulty);
+
+            dropdown.Current.BindTo(verify.InterpretedDifficulty);
 
             Flow.Add(dropdown);
         }
diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
index 3e836c4010..befffdd9db 100644
--- a/osu.Game/Screens/Edit/Verify/IssueList.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueList.cs
@@ -18,6 +18,7 @@ using osuTK;
 
 namespace osu.Game.Screens.Edit.Verify
 {
+    [Cached]
     public class IssueList : CompositeDrawable
     {
         private IssueTable table;
@@ -32,7 +33,7 @@ namespace osu.Game.Screens.Edit.Verify
         private EditorBeatmap beatmap { get; set; }
 
         [Resolved]
-        private Bindable<Issue> selectedIssue { get; set; }
+        private VerifyScreen verify { get; set; }
 
         public Dictionary<IssueType, Bindable<bool>> ShowType { get; set; }
 
@@ -55,7 +56,7 @@ namespace osu.Game.Screens.Edit.Verify
             generalVerifier = new BeatmapVerifier();
             rulesetVerifier = beatmap.BeatmapInfo.Ruleset?.CreateInstance()?.CreateBeatmapVerifier();
 
-            InterpretedDifficulty = new Bindable<DifficultyRating>(beatmap.BeatmapInfo.DifficultyRating);
+            InterpretedDifficulty = verify.InterpretedDifficulty.GetBoundCopy();
 
             RelativeSizeAxes = Axes.Both;
 
diff --git a/osu.Game/Screens/Edit/Verify/IssueSettings.cs b/osu.Game/Screens/Edit/Verify/IssueSettings.cs
index 506694aa46..ae3ef7e0b0 100644
--- a/osu.Game/Screens/Edit/Verify/IssueSettings.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueSettings.cs
@@ -6,19 +6,12 @@ using osu.Framework.Graphics;
 
 namespace osu.Game.Screens.Edit.Verify
 {
-    public class IssueSettings : RoundedContentEditorScreenSettings
+    public class IssueSettings : EditorRoundedScreenSettings
     {
-        private readonly IssueList issueList;
-
-        public IssueSettings(IssueList issueList)
-        {
-            this.issueList = issueList;
-        }
-
         protected override IReadOnlyList<Drawable> CreateSections() => new Drawable[]
         {
-            new InterpretationSection(issueList),
-            new VisibilitySection(issueList)
+            new InterpretationSection(),
+            new VisibilitySection()
         };
     }
 }
diff --git a/osu.Game/Screens/Edit/Verify/IssueTable.cs b/osu.Game/Screens/Edit/Verify/IssueTable.cs
index 44244028c9..05a8fdd26d 100644
--- a/osu.Game/Screens/Edit/Verify/IssueTable.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueTable.cs
@@ -18,7 +18,9 @@ namespace osu.Game.Screens.Edit.Verify
     public class IssueTable : EditorTable
     {
         [Resolved]
-        private Bindable<Issue> selectedIssue { get; set; }
+        private VerifyScreen verify { get; set; }
+
+        private Bindable<Issue> selectedIssue;
 
         [Resolved]
         private EditorClock clock { get; set; }
@@ -71,6 +73,7 @@ namespace osu.Game.Screens.Edit.Verify
         {
             base.LoadComplete();
 
+            selectedIssue = verify.SelectedIssue.GetBoundCopy();
             selectedIssue.BindValueChanged(issue =>
             {
                 foreach (var b in BackgroundFlow) b.Selected = b.Item == issue.NewValue;
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index ed4658da8e..afd0c8760d 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -5,14 +5,19 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit.Checks.Components;
 
 namespace osu.Game.Screens.Edit.Verify
 {
-    public class VerifyScreen : RoundedContentEditorScreen
+    [Cached]
+    public class VerifyScreen : EditorRoundedScreen
     {
-        [Cached]
-        private Bindable<Issue> selectedIssue = new Bindable<Issue>();
+        public readonly Bindable<Issue> SelectedIssue = new Bindable<Issue>();
+
+        public readonly Bindable<DifficultyRating> InterpretedDifficulty = new Bindable<DifficultyRating>();
+
+        public IssueList IssueList { get; private set; }
 
         public VerifyScreen()
             : base(EditorScreenMode.Verify)
@@ -22,8 +27,7 @@ namespace osu.Game.Screens.Edit.Verify
         [BackgroundDependencyLoader]
         private void load()
         {
-            IssueList issueList;
-
+            IssueList = new IssueList();
             Child = new Container
             {
                 RelativeSizeAxes = Axes.Both,
@@ -39,8 +43,8 @@ namespace osu.Game.Screens.Edit.Verify
                     {
                         new Drawable[]
                         {
-                            issueList = new IssueList(),
-                            new IssueSettings(issueList),
+                            IssueList,
+                            new IssueSettings(),
                         },
                     }
                 }
diff --git a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
index f849426800..ce755bdcb4 100644
--- a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
+++ b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
@@ -9,19 +9,17 @@ using osu.Game.Rulesets.Edit.Checks.Components;
 
 namespace osu.Game.Screens.Edit.Verify
 {
-    internal class VisibilitySection : Section
+    internal class VisibilitySection : EditorRoundedScreenSettingsSection
     {
-        public VisibilitySection(IssueList issueList)
-            : base(issueList)
-        {
-        }
+        [Resolved]
+        private VerifyScreen verify { get; set; }
 
         protected override string Header => "Visibility";
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colours)
         {
-            foreach (IssueType issueType in IssueList.ShowType.Keys)
+            foreach (IssueType issueType in verify.IssueList.ShowType.Keys)
             {
                 var checkbox = new SettingsCheckbox
                 {
@@ -30,8 +28,8 @@ namespace osu.Game.Screens.Edit.Verify
                     LabelText = issueType.ToString()
                 };
 
-                checkbox.Current.BindTo(IssueList.ShowType[issueType]);
-                checkbox.Current.BindValueChanged(_ => IssueList.Refresh());
+                checkbox.Current.BindTo(verify.IssueList.ShowType[issueType]);
+                checkbox.Current.BindValueChanged(_ => verify.IssueList.Refresh());
                 Flow.Add(checkbox);
             }
         }

From 789025a7cea6f3621301f011dd182954f61ff806 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 May 2021 16:56:07 +0900
Subject: [PATCH 3354/3722] Update playfield/stage/column implementations for
 pooling

---
 osu.Game.Rulesets.Mania/UI/Column.cs         | 31 +++++++---------
 osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs |  5 +++
 osu.Game.Rulesets.Mania/UI/Stage.cs          | 37 ++++++++++++++++----
 3 files changed, 47 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 8247a37881..1ee3f8c668 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -92,6 +92,13 @@ namespace osu.Game.Rulesets.Mania.UI
             RegisterPool<HoldNoteTick, DrawableHoldNoteTick>(50, 200);
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            NewResult += OnNewResult;
+        }
+
         public ColumnType ColumnType { get; set; }
 
         public bool IsSpecial => ColumnType == ColumnType.Special;
@@ -105,28 +112,14 @@ namespace osu.Game.Rulesets.Mania.UI
             return dependencies;
         }
 
-        /// <summary>
-        /// Adds a DrawableHitObject to this Playfield.
-        /// </summary>
-        /// <param name="hitObject">The DrawableHitObject to add.</param>
-        public override void Add(DrawableHitObject hitObject)
+        protected override void OnNewDrawableHitObject(DrawableHitObject drawableHitObject)
         {
-            hitObject.AccentColour.Value = AccentColour;
-            hitObject.OnNewResult += OnNewResult;
+            base.OnNewDrawableHitObject(drawableHitObject);
 
-            DrawableManiaHitObject maniaObject = (DrawableManiaHitObject)hitObject;
+            drawableHitObject.AccentColour.Value = AccentColour;
+
+            DrawableManiaHitObject maniaObject = (DrawableManiaHitObject)drawableHitObject;
             maniaObject.CheckHittable = hitPolicy.IsHittable;
-
-            base.Add(hitObject);
-        }
-
-        public override bool Remove(DrawableHitObject h)
-        {
-            if (!base.Remove(h))
-                return false;
-
-            h.OnNewResult -= OnNewResult;
-            return true;
         }
 
         internal void OnNewResult(DrawableHitObject judgedObject, JudgementResult result)
diff --git a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
index 271e432e8d..8830c440c0 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
+++ b/osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
@@ -9,6 +9,7 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
 using osuTK;
@@ -56,6 +57,10 @@ namespace osu.Game.Rulesets.Mania.UI
             }
         }
 
+        public override void Add(HitObject hitObject) => getStageByColumn(((ManiaHitObject)hitObject).Column).Add(hitObject);
+
+        public override bool Remove(HitObject hitObject) => getStageByColumn(((ManiaHitObject)hitObject).Column).Remove(hitObject);
+
         public override void Add(DrawableHitObject h) => getStageByColumn(((ManiaHitObject)h.HitObject).Column).Add(h);
 
         public override bool Remove(DrawableHitObject h) => getStageByColumn(((ManiaHitObject)h.HitObject).Column).Remove(h);
diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index dc34bffab1..eee75f3200 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -11,6 +11,7 @@ using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.UI.Components;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
@@ -132,10 +133,37 @@ namespace osu.Game.Rulesets.Mania.UI
             }
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            NewResult += OnNewResult;
+        }
+
+        public override void Add(HitObject hitObject)
+        {
+            var maniaObject = (ManiaHitObject)hitObject;
+            int columnIndex = -1;
+
+            maniaObject.ColumnBindable.BindValueChanged(_ =>
+            {
+                if (columnIndex != -1)
+                    Columns.ElementAt(columnIndex).Remove(hitObject);
+
+                columnIndex = maniaObject.Column - firstColumnIndex;
+                Columns.ElementAt(columnIndex).Add(hitObject);
+            }, true);
+        }
+
+        public override bool Remove(HitObject hitObject)
+        {
+            var maniaObject = (ManiaHitObject)hitObject;
+            int columnIndex = maniaObject.Column - firstColumnIndex;
+            return Columns.ElementAt(columnIndex).Remove(hitObject);
+        }
+
         public override void Add(DrawableHitObject h)
         {
             var maniaObject = (ManiaHitObject)h.HitObject;
-
             int columnIndex = -1;
 
             maniaObject.ColumnBindable.BindValueChanged(_ =>
@@ -146,18 +174,13 @@ namespace osu.Game.Rulesets.Mania.UI
                 columnIndex = maniaObject.Column - firstColumnIndex;
                 Columns.ElementAt(columnIndex).Add(h);
             }, true);
-
-            h.OnNewResult += OnNewResult;
         }
 
         public override bool Remove(DrawableHitObject h)
         {
             var maniaObject = (ManiaHitObject)h.HitObject;
             int columnIndex = maniaObject.Column - firstColumnIndex;
-            Columns.ElementAt(columnIndex).Remove(h);
-
-            h.OnNewResult -= OnNewResult;
-            return true;
+            return Columns.ElementAt(columnIndex).Remove(h);
         }
 
         public void Add(BarLine barline) => base.Add(new DrawableBarLine(barline));

From 7913189aa911e814025e5083eddc7de5d74c5c51 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 May 2021 16:56:23 +0900
Subject: [PATCH 3355/3722] Turn on pooling

---
 .../UI/DrawableManiaRuleset.cs                   | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
index 4ee060e91e..e497646a13 100644
--- a/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
+++ b/osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs
@@ -18,7 +18,6 @@ using osu.Game.Replays;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Objects;
-using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.Replays;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
@@ -134,20 +133,7 @@ namespace osu.Game.Rulesets.Mania.UI
 
         protected override PassThroughInputManager CreateInputManager() => new ManiaInputManager(Ruleset.RulesetInfo, Variant);
 
-        public override DrawableHitObject<ManiaHitObject> CreateDrawableRepresentation(ManiaHitObject h)
-        {
-            switch (h)
-            {
-                case HoldNote holdNote:
-                    return new DrawableHoldNote(holdNote);
-
-                case Note note:
-                    return new DrawableNote(note);
-
-                default:
-                    return null;
-            }
-        }
+        public override DrawableHitObject<ManiaHitObject> CreateDrawableRepresentation(ManiaHitObject h) => null;
 
         protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new ManiaFramedReplayInputHandler(replay);
 

From 1af3bbf400d7267feac4627ef5d8e1ab2b87b855 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 May 2021 17:06:44 +0900
Subject: [PATCH 3356/3722] Fix base.OnLoadComplete() not being called

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

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index b711e67f25..33d872dfb6 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -60,6 +60,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         protected override void LoadComplete()
         {
+            base.LoadComplete();
+
             configTimingBasedNoteColouring.BindValueChanged(_ => updateSnapColour());
             StartTimeBindable.BindValueChanged(_ => updateSnapColour(), true);
         }

From f992b59b4f9b3ef5b8460704f3f878e818fe7367 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 May 2021 17:07:42 +0900
Subject: [PATCH 3357/3722] Fix DrawableHoldNote retaining hit states through
 applications

---
 .../Objects/Drawables/DrawableHoldNote.cs             | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index e1cf1851df..d1310d42eb 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -13,6 +13,7 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
@@ -114,6 +115,16 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             });
         }
 
+        protected override void OnApply()
+        {
+            base.OnApply();
+
+            sizingContainer.Size = Vector2.One;
+            HoldStartTime = null;
+            HoldBrokenTime = null;
+            releaseTime = null;
+        }
+
         protected override void AddNestedHitObject(DrawableHitObject hitObject)
         {
             base.AddNestedHitObject(hitObject);

From 0fa3027ab9eea096fc792a6a4bd9ff6a4944e130 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 May 2021 17:36:26 +0900
Subject: [PATCH 3358/3722] Increase pool sizes a bit

---
 osu.Game.Rulesets.Mania/UI/Column.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 1ee3f8c668..57d3f54716 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -85,11 +85,11 @@ namespace osu.Game.Rulesets.Mania.UI
 
             TopLevelContainer.Add(HitObjectArea.Explosions.CreateProxy());
 
-            RegisterPool<Note, DrawableNote>(5, 20);
-            RegisterPool<HoldNote, DrawableHoldNote>(5, 20);
-            RegisterPool<HeadNote, DrawableHoldNoteHead>(5, 20);
-            RegisterPool<TailNote, DrawableHoldNoteTail>(5, 20);
-            RegisterPool<HoldNoteTick, DrawableHoldNoteTick>(50, 200);
+            RegisterPool<Note, DrawableNote>(10, 50);
+            RegisterPool<HoldNote, DrawableHoldNote>(10, 50);
+            RegisterPool<HeadNote, DrawableHoldNoteHead>(10, 50);
+            RegisterPool<TailNote, DrawableHoldNoteTail>(10, 50);
+            RegisterPool<HoldNoteTick, DrawableHoldNoteTick>(50, 250);
         }
 
         protected override void LoadComplete()

From be187e8ebdd8d981b1c3c1620960e1aaca27d44b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 17:42:04 +0900
Subject: [PATCH 3359/3722] Avoid hard crash if `Save()` is called before
 preparing for mutation

---
 osu.Game/Skinning/Editor/SkinEditor.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 5deebe9800..fcb1392ed5 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -38,6 +38,8 @@ namespace osu.Game.Skinning.Editor
         [Resolved]
         private OsuColour colours { get; set; }
 
+        private bool hasBegunMutating;
+
         public SkinEditor(Drawable targetScreen)
         {
             this.targetScreen = targetScreen;
@@ -139,7 +141,11 @@ namespace osu.Game.Skinning.Editor
             // schedule ensures this only happens when the skin editor is visible.
             // also avoid some weird endless recursion / bindable feedback loop (something to do with tracking skins across three different bindable types).
             // probably something which will be factored out in a future database refactor so not too concerning for now.
-            currentSkin.BindValueChanged(skin => Scheduler.AddOnce(skinChanged), true);
+            currentSkin.BindValueChanged(skin =>
+            {
+                hasBegunMutating = false;
+                Scheduler.AddOnce(skinChanged);
+            }, true);
         }
 
         private void skinChanged()
@@ -161,6 +167,7 @@ namespace osu.Game.Skinning.Editor
             });
 
             skins.EnsureMutableSkin();
+            hasBegunMutating = true;
         }
 
         private void placeComponent(Type type)
@@ -194,6 +201,9 @@ namespace osu.Game.Skinning.Editor
 
         public void Save()
         {
+            if (!hasBegunMutating)
+                return;
+
             SkinnableElementTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableElementTargetContainer>().ToArray();
 
             foreach (var t in targetContainers)

From 2f55d1e5ab9c734bb07519849d6ca4c31f32b375 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 17:42:12 +0900
Subject: [PATCH 3360/3722] Also save on skin switch

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

diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index fcb1392ed5..9e50aab829 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -143,6 +143,8 @@ namespace osu.Game.Skinning.Editor
             // probably something which will be factored out in a future database refactor so not too concerning for now.
             currentSkin.BindValueChanged(skin =>
             {
+                Save();
+
                 hasBegunMutating = false;
                 Scheduler.AddOnce(skinChanged);
             }, true);

From 80e231d90ad9a25444b7a2e2c1d43413cbaf327e Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 12 May 2021 11:07:31 +0300
Subject: [PATCH 3361/3722] Add failing test case

---
 .../Visual/Editing/TestSceneComposeSelectBox.cs  | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
index e383aa8008..d5cfeb1878 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneComposeSelectBox.cs
@@ -167,5 +167,21 @@ namespace osu.Game.Tests.Visual.Editing
             AddStep("move mouse away", () => InputManager.MoveMouseTo(selectionBox, new Vector2(20)));
             AddUntilStep("rotation handle hidden", () => rotationHandle.Alpha == 0);
         }
+
+        /// <summary>
+        /// Tests that hovering over two handles instantaneously from one to another does not crash or cause issues to the visibility state.
+        /// </summary>
+        [Test]
+        public void TestHoverOverTwoHandlesInstantaneously()
+        {
+            AddStep("hover over top-left scale handle", () =>
+                InputManager.MoveMouseTo(this.ChildrenOfType<SelectionBoxScaleHandle>().Single(s => s.Anchor == Anchor.TopLeft)));
+            AddStep("hover over top-right scale handle", () =>
+                InputManager.MoveMouseTo(this.ChildrenOfType<SelectionBoxScaleHandle>().Single(s => s.Anchor == Anchor.TopRight)));
+            AddUntilStep("top-left rotation handle hidden", () =>
+                this.ChildrenOfType<SelectionBoxRotationHandle>().Single(r => r.Anchor == Anchor.TopLeft).Alpha == 0);
+            AddUntilStep("top-right rotation handle shown", () =>
+                this.ChildrenOfType<SelectionBoxRotationHandle>().Single(r => r.Anchor == Anchor.TopRight).Alpha == 1);
+        }
     }
 }

From 96d3586294dbfef0f9af5b7a9e70e00a868d0600 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 12 May 2021 11:30:12 +0300
Subject: [PATCH 3362/3722] Fix rotation handle visibility logic not handling
 two handles hovered at once

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

diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
index 456f72878d..397158b9f6 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
@@ -84,8 +84,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (activeHandle?.IsHeld == true)
                 return;
 
-            activeHandle = rotationHandles.SingleOrDefault(h => h.IsHeld || h.IsHovered);
-            activeHandle ??= allDragHandles.SingleOrDefault(h => h.IsHovered);
+            activeHandle = rotationHandles.FirstOrDefault(h => h.IsHeld || h.IsHovered);
+            activeHandle ??= allDragHandles.FirstOrDefault(h => h.IsHovered);
 
             if (activeHandle != null)
             {

From 088335a0359f73ecb10625c5bcccbaefff9edbd4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 17:45:51 +0900
Subject: [PATCH 3363/3722] Revert "Also save on skin switch"

This reverts commit 2f55d1e5ab9c734bb07519849d6ca4c31f32b375.
---
 osu.Game/Skinning/Editor/SkinEditor.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 9e50aab829..fcb1392ed5 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -143,8 +143,6 @@ namespace osu.Game.Skinning.Editor
             // probably something which will be factored out in a future database refactor so not too concerning for now.
             currentSkin.BindValueChanged(skin =>
             {
-                Save();
-
                 hasBegunMutating = false;
                 Scheduler.AddOnce(skinChanged);
             }, true);

From 0a895fff158ab57c8dc0e9a4ff9e6d9f5a7b218e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 18:53:25 +0900
Subject: [PATCH 3364/3722] Remove remaining test usage of `SkinnableXXX` HUD
 components

---
 .../Visual/Gameplay/TestSceneComboCounter.cs  |  8 ++------
 .../TestSceneSkinnableAccuracyCounter.cs      |  3 ++-
 .../TestSceneSkinnableHealthDisplay.cs        | 11 ++--------
 .../TestSceneSkinnableScoreCounter.cs         | 11 +++-------
 .../Play/HUD/SkinnableAccuracyCounter.cs      | 16 ---------------
 .../Screens/Play/HUD/SkinnableComboCounter.cs | 16 ---------------
 .../Play/HUD/SkinnableHealthDisplay.cs        | 16 ---------------
 .../Screens/Play/HUD/SkinnableScoreCounter.cs | 16 ---------------
 osu.Game/Skinning/DefaultSkin.cs              | 20 +++++++++++++++++++
 osu.Game/Skinning/SkinnableDrawable.cs        |  4 ++--
 10 files changed, 31 insertions(+), 90 deletions(-)
 delete mode 100644 osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
 delete mode 100644 osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
 delete mode 100644 osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
 delete mode 100644 osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneComboCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneComboCounter.cs
index b0a0b5189f..b22af0f7ac 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneComboCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneComboCounter.cs
@@ -1,22 +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.Collections.Generic;
-using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Screens.Play.HUD;
+using osu.Game.Skinning;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneComboCounter : SkinnableTestScene
     {
-        private IEnumerable<SkinnableComboCounter> comboCounters => CreatedDrawables.OfType<SkinnableComboCounter>();
-
         protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
 
         [Cached]
@@ -25,7 +21,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [SetUpSteps]
         public void SetUpSteps()
         {
-            AddStep("Create combo counters", () => SetContents(() => new SkinnableComboCounter()));
+            AddStep("Create combo counters", () => SetContents(() => new SkinnableDrawable(new HUDSkinComponent(HUDSkinComponents.ComboCounter))));
         }
 
         [Test]
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs
index 6a8a2187f9..d9139299ea 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs
@@ -8,6 +8,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play.HUD;
+using osu.Game.Skinning;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -22,7 +23,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void SetUpSteps()
         {
             AddStep("Set initial accuracy", () => scoreProcessor.Accuracy.Value = 1);
-            AddStep("Create accuracy counters", () => SetContents(() => new SkinnableAccuracyCounter()));
+            AddStep("Create accuracy counters", () => SetContents(() => new SkinnableDrawable(new HUDSkinComponent(HUDSkinComponents.AccuracyCounter))));
         }
 
         [Test]
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHealthDisplay.cs
index 4f50613416..ead27bf017 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.
 // 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.Testing;
@@ -12,14 +10,12 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Screens.Play.HUD;
+using osu.Game.Skinning;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneSkinnableHealthDisplay : SkinnableTestScene
     {
-        private IEnumerable<SkinnableHealthDisplay> healthDisplays => CreatedDrawables.OfType<SkinnableHealthDisplay>();
-
         protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
 
         [Cached(typeof(HealthProcessor))]
@@ -28,10 +24,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [SetUpSteps]
         public void SetUpSteps()
         {
-            AddStep("Create health displays", () =>
-            {
-                SetContents(() => new SkinnableHealthDisplay());
-            });
+            AddStep("Create health displays", () => SetContents(() => new SkinnableDrawable(new HUDSkinComponent(HUDSkinComponents.HealthDisplay))));
             AddStep(@"Reset all", delegate
             {
                 healthProcessor.Health.Value = 1;
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs
index 4f2183711e..8d633c3ca2 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableScoreCounter.cs
@@ -1,23 +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.Collections.Generic;
-using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Screens.Play.HUD;
+using osu.Game.Skinning;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneSkinnableScoreCounter : SkinnableTestScene
     {
-        private IEnumerable<SkinnableScoreCounter> scoreCounters => CreatedDrawables.OfType<SkinnableScoreCounter>();
-
         protected override Ruleset CreateRulesetForSkinProvider() => new OsuRuleset();
 
         [Cached]
@@ -26,7 +21,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [SetUpSteps]
         public void SetUpSteps()
         {
-            AddStep("Create score counters", () => SetContents(() => new SkinnableScoreCounter()));
+            AddStep("Create score counters", () => SetContents(() => new SkinnableDrawable(new HUDSkinComponent(HUDSkinComponents.ScoreCounter))));
         }
 
         [Test]
@@ -40,7 +35,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestVeryLargeScore()
         {
-            AddStep("set large score", () => scoreCounters.ForEach(counter => scoreProcessor.TotalScore.Value = 1_000_000_000));
+            AddStep("set large score", () => scoreProcessor.TotalScore.Value = 1_000_000_000);
         }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
deleted file mode 100644
index fcb8fca35d..0000000000
--- a/osu.Game/Screens/Play/HUD/SkinnableAccuracyCounter.cs
+++ /dev/null
@@ -1,16 +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.Skinning;
-
-namespace osu.Game.Screens.Play.HUD
-{
-    public class SkinnableAccuracyCounter : SkinnableDrawable
-    {
-        public SkinnableAccuracyCounter()
-            : base(new HUDSkinComponent(HUDSkinComponents.AccuracyCounter), _ => new DefaultAccuracyCounter())
-        {
-            CentreComponent = false;
-        }
-    }
-}
diff --git a/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
deleted file mode 100644
index c62f1460c9..0000000000
--- a/osu.Game/Screens/Play/HUD/SkinnableComboCounter.cs
+++ /dev/null
@@ -1,16 +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.Skinning;
-
-namespace osu.Game.Screens.Play.HUD
-{
-    public class SkinnableComboCounter : SkinnableDrawable
-    {
-        public SkinnableComboCounter()
-            : base(new HUDSkinComponent(HUDSkinComponents.ComboCounter), skinComponent => new DefaultComboCounter())
-        {
-            CentreComponent = false;
-        }
-    }
-}
diff --git a/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs b/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
deleted file mode 100644
index 3ba6a33276..0000000000
--- a/osu.Game/Screens/Play/HUD/SkinnableHealthDisplay.cs
+++ /dev/null
@@ -1,16 +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.Skinning;
-
-namespace osu.Game.Screens.Play.HUD
-{
-    public class SkinnableHealthDisplay : SkinnableDrawable
-    {
-        public SkinnableHealthDisplay()
-            : base(new HUDSkinComponent(HUDSkinComponents.HealthDisplay), _ => new DefaultHealthDisplay())
-        {
-            CentreComponent = false;
-        }
-    }
-}
diff --git a/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs b/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs
deleted file mode 100644
index cc9a712e97..0000000000
--- a/osu.Game/Screens/Play/HUD/SkinnableScoreCounter.cs
+++ /dev/null
@@ -1,16 +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.Skinning;
-
-namespace osu.Game.Screens.Play.HUD
-{
-    public class SkinnableScoreCounter : SkinnableDrawable
-    {
-        public SkinnableScoreCounter()
-            : base(new HUDSkinComponent(HUDSkinComponents.ScoreCounter), _ => new DefaultScoreCounter())
-        {
-            CentreComponent = false;
-        }
-    }
-}
diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index 3de3dc7702..a9ab4e53c8 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -91,6 +91,26 @@ namespace osu.Game.Skinning
                     }
 
                     return null;
+
+                case HUDSkinComponent hudComponent:
+                {
+                    switch (hudComponent.Component)
+                    {
+                        case HUDSkinComponents.ComboCounter:
+                            return new DefaultComboCounter();
+
+                        case HUDSkinComponents.ScoreCounter:
+                            return new DefaultScoreCounter();
+
+                        case HUDSkinComponents.AccuracyCounter:
+                            return new DefaultAccuracyCounter();
+
+                        case HUDSkinComponents.HealthDisplay:
+                            return new DefaultHealthDisplay();
+                    }
+
+                    return null;
+                }
             }
 
             return base.GetDrawableComponent(component);
diff --git a/osu.Game/Skinning/SkinnableDrawable.cs b/osu.Game/Skinning/SkinnableDrawable.cs
index 5a48bc4baf..77f7cf5c3f 100644
--- a/osu.Game/Skinning/SkinnableDrawable.cs
+++ b/osu.Game/Skinning/SkinnableDrawable.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Skinning
         /// <param name="defaultImplementation">A function to create the default skin implementation of this element.</param>
         /// <param name="allowFallback">A conditional to decide whether to allow fallback to the default implementation if a skinned element is not present.</param>
         /// <param name="confineMode">How (if at all) the <see cref="Drawable"/> should be resize to fit within our own bounds.</param>
-        public SkinnableDrawable(ISkinComponent component, Func<ISkinComponent, Drawable> defaultImplementation, Func<ISkinSource, bool> allowFallback = null, ConfineMode confineMode = ConfineMode.NoScaling)
+        public SkinnableDrawable(ISkinComponent component, Func<ISkinComponent, Drawable> defaultImplementation = null, Func<ISkinSource, bool> allowFallback = null, ConfineMode confineMode = ConfineMode.NoScaling)
             : this(component, allowFallback, confineMode)
         {
             createDefault = defaultImplementation;
@@ -68,7 +68,7 @@ namespace osu.Game.Skinning
 
         private bool isDefault;
 
-        protected virtual Drawable CreateDefault(ISkinComponent component) => createDefault(component);
+        protected virtual Drawable CreateDefault(ISkinComponent component) => createDefault?.Invoke(component) ?? Empty();
 
         /// <summary>
         /// Whether to apply size restrictions (specified via <see cref="confineMode"/>) to the default implementation.

From 75227e5a70f21cb941e249c6e5d80b15b62e956a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 18:55:48 +0900
Subject: [PATCH 3365/3722] Change default skin to use component lookup for
 conformity

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

diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index a9ab4e53c8..2715c9fce2 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -80,10 +80,10 @@ namespace osu.Game.Skinning
                             {
                                 Children = new Drawable[]
                                 {
-                                    new DefaultComboCounter(),
-                                    new DefaultScoreCounter(),
-                                    new DefaultAccuracyCounter(),
-                                    new DefaultHealthDisplay(),
+                                    GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ComboCounter)),
+                                    GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreCounter)),
+                                    GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.AccuracyCounter)),
+                                    GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.HealthDisplay)),
                                 }
                             };
 

From 55e1f97f5947dc8e1d65c14935b4a51eaae7c4ae Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 19:06:28 +0900
Subject: [PATCH 3366/3722] Remove unused using statement

---
 .../Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs        | 1 -
 osu.Game/Skinning/DefaultSkin.cs                                | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs
index d9139299ea..6f4e6a2420 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableAccuracyCounter.cs
@@ -7,7 +7,6 @@ using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Screens.Play.HUD;
 using osu.Game.Skinning;
 
 namespace osu.Game.Tests.Visual.Gameplay
diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index 2715c9fce2..3dcfbcda13 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Skinning
                                 }
                             })
                             {
-                                Children = new Drawable[]
+                                Children = new[]
                                 {
                                     GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ComboCounter)),
                                     GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreCounter)),

From 7bac81f39487c446d515e5454f49b402680e38ca Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 May 2021 19:37:00 +0900
Subject: [PATCH 3367/3722] Fix incorrect inline comments

Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
---
 osu.Game/Skinning/Editor/SkinBlueprint.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinBlueprint.cs b/osu.Game/Skinning/Editor/SkinBlueprint.cs
index 23411f2b3d..58fa255508 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprint.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprint.cs
@@ -85,13 +85,13 @@ namespace osu.Game.Skinning.Editor
 
         protected override void OnSelected()
         {
-            // base logic hides selected blueprints when not selected, but timeline doesn't do that.
+            // base logic hides selected blueprints when not selected, but skin blueprints don't do that.
             updateSelectedState();
         }
 
         protected override void OnDeselected()
         {
-            // base logic hides selected blueprints when not selected, but timeline doesn't do that.
+            // base logic hides selected blueprints when not selected, but skin blueprints don't do that.
             updateSelectedState();
         }
 

From 315a2b8314a044689eb607dfdced7bc24fc1f4c9 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 12 May 2021 20:50:20 +0300
Subject: [PATCH 3368/3722] Refactor MonthDropdown to decouple autosized logic

---
 .../Overlays/News/Sidebar/MonthDropdown.cs    | 122 ++++++++++--------
 1 file changed, 69 insertions(+), 53 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs b/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
index 91412d9527..d6d7527a6c 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
@@ -20,85 +20,37 @@ namespace osu.Game.Overlays.News.Sidebar
 {
     public class MonthDropdown : CompositeDrawable
     {
-        private const int header_height = 15;
         private const int animation_duration = 250;
 
         public readonly BindableBool IsOpen = new BindableBool();
 
-        private readonly FillFlowContainer postsFlow;
-
         public MonthDropdown(int month, int year, IEnumerable<APINewsPost> posts)
         {
             Debug.Assert(posts.All(p => p.PublishedAt.Month == month && p.PublishedAt.Year == year));
 
             RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
             Masking = true;
             InternalChild = new FillFlowContainer
             {
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y,
                 Direction = FillDirection.Vertical,
-                Spacing = new Vector2(0, 5),
                 Children = new Drawable[]
                 {
                     new DropdownHeader(month, year)
                     {
                         IsOpen = { BindTarget = IsOpen }
                     },
-                    postsFlow = new FillFlowContainer
+                    new PostsContainer
                     {
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Direction = FillDirection.Vertical,
-                        Spacing = new Vector2(0, 5),
+                        IsOpen = { BindTarget = IsOpen },
                         Children = posts.Select(p => new PostButton(p)).ToArray()
                     }
                 }
             };
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            IsOpen.BindValueChanged(open =>
-            {
-                ClearTransforms();
-
-                if (open.NewValue)
-                {
-                    AutoSizeAxes = Axes.Y;
-                    postsFlow.FadeIn(animation_duration, Easing.OutQuint);
-                }
-                else
-                {
-                    AutoSizeAxes = Axes.None;
-                    this.ResizeHeightTo(header_height, animation_duration, Easing.OutQuint);
-
-                    postsFlow.FadeOut(animation_duration, Easing.OutQuint);
-                }
-            }, true);
-
-            // First state change should be instant.
-            FinishTransforms(true);
-        }
-
-        private bool shouldUpdateAutosize = true;
-
-        // Workaround to allow the dropdown to be opened immediately since FinishTransforms doesn't work for AutosizeDuration.
-        protected override void UpdateAfterAutoSize()
-        {
-            base.UpdateAfterAutoSize();
-
-            if (shouldUpdateAutosize)
-            {
-                AutoSizeDuration = animation_duration;
-                AutoSizeEasing = Easing.OutQuint;
-
-                shouldUpdateAutosize = false;
-            }
-        }
-
         private class DropdownHeader : OsuClickableContainer
         {
             public readonly BindableBool IsOpen = new BindableBool();
@@ -110,7 +62,7 @@ namespace osu.Game.Overlays.News.Sidebar
                 var date = new DateTime(year, month, 1);
 
                 RelativeSizeAxes = Axes.X;
-                Height = header_height;
+                Height = 15;
                 Action = IsOpen.Toggle;
                 Children = new Drawable[]
                 {
@@ -152,7 +104,6 @@ namespace osu.Game.Overlays.News.Sidebar
             {
                 RelativeSizeAxes = Axes.X;
                 AutoSizeAxes = Axes.Y;
-
                 Child = text = new TextFlowContainer(t => t.Font = OsuFont.GetFont(size: 12))
                 {
                     RelativeSizeAxes = Axes.X,
@@ -169,5 +120,70 @@ namespace osu.Game.Overlays.News.Sidebar
                 Action = () => { }; // Avoid button being disabled since there's no proper action assigned.
             }
         }
+
+        private class PostsContainer : Container
+        {
+            public readonly BindableBool IsOpen = new BindableBool();
+
+            protected override Container<Drawable> Content => content;
+
+            private readonly FillFlowContainer content;
+
+            public PostsContainer()
+            {
+                RelativeSizeAxes = Axes.X;
+                AutoSizeAxes = Axes.Y;
+                InternalChild = content = new FillFlowContainer
+                {
+                    Margin = new MarginPadding { Top = 5 },
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Direction = FillDirection.Vertical,
+                    Spacing = new Vector2(0, 5)
+                };
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                IsOpen.BindValueChanged(open =>
+                {
+                    ClearTransforms();
+
+                    if (open.NewValue)
+                    {
+                        AutoSizeAxes = Axes.Y;
+                        content.FadeIn(animation_duration, Easing.OutQuint);
+                    }
+                    else
+                    {
+                        AutoSizeAxes = Axes.None;
+                        this.ResizeHeightTo(0, animation_duration, Easing.OutQuint);
+
+                        content.FadeOut(animation_duration, Easing.OutQuint);
+                    }
+                }, true);
+
+                // First state change should be instant.
+                FinishTransforms(true);
+            }
+
+            private bool shouldUpdateAutosize = true;
+
+            // Workaround to allow the dropdown to be opened immediately since FinishTransforms doesn't work for AutosizeDuration.
+            protected override void UpdateAfterAutoSize()
+            {
+                base.UpdateAfterAutoSize();
+
+                if (shouldUpdateAutosize)
+                {
+                    AutoSizeDuration = animation_duration;
+                    AutoSizeEasing = Easing.OutQuint;
+
+                    shouldUpdateAutosize = false;
+                }
+            }
+        }
     }
 }

From 4464204e336688bcfce0266c2014ec20a7978e99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 12 May 2021 22:18:15 +0200
Subject: [PATCH 3369/3722] Mark all skin ctors used via reflection in
 `SkinInfo.CreateInstance()`

---
 osu.Game/Skinning/DefaultLegacySkin.cs | 2 ++
 osu.Game/Skinning/DefaultSkin.cs       | 2 ++
 osu.Game/Skinning/LegacySkin.cs        | 1 +
 3 files changed, 5 insertions(+)

diff --git a/osu.Game/Skinning/DefaultLegacySkin.cs b/osu.Game/Skinning/DefaultLegacySkin.cs
index 564be8630e..7adf53e5e7 100644
--- a/osu.Game/Skinning/DefaultLegacySkin.cs
+++ b/osu.Game/Skinning/DefaultLegacySkin.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 JetBrains.Annotations;
 using osu.Framework.IO.Stores;
 using osu.Game.IO;
 using osuTK.Graphics;
@@ -9,6 +10,7 @@ namespace osu.Game.Skinning
 {
     public class DefaultLegacySkin : LegacySkin
     {
+        [UsedImplicitly(ImplicitUseKindFlags.InstantiatedWithFixedConstructorSignature)]
         public DefaultLegacySkin(IResourceStore<byte[]> storage, IStorageResourceProvider resources)
             : this(Info, storage, resources)
         {
diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index fcd874d6ca..745bdf0bb2 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using JetBrains.Annotations;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -20,6 +21,7 @@ namespace osu.Game.Skinning
         {
         }
 
+        [UsedImplicitly(ImplicitUseKindFlags.InstantiatedWithFixedConstructorSignature)]
         public DefaultSkin(SkinInfo skin, IStorageResourceProvider resources)
             : base(skin)
         {
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index eae3b69233..74250f9684 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -52,6 +52,7 @@ namespace osu.Game.Skinning
 
         private readonly Dictionary<int, LegacyManiaSkinConfiguration> maniaConfigurations = new Dictionary<int, LegacyManiaSkinConfiguration>();
 
+        [UsedImplicitly(ImplicitUseKindFlags.InstantiatedWithFixedConstructorSignature)]
         public LegacySkin(SkinInfo skin, IStorageResourceProvider resources)
             : this(skin, new LegacySkinResourceStore<SkinFileInfo>(skin, resources.Files), resources, "skin.ini")
         {

From 1b579dd83801849c33ce06a685eab48230cdd648 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 12 May 2021 22:42:26 +0200
Subject: [PATCH 3370/3722] Extract invariant instantiation info extension
 method

---
 osu.Game/Extensions/TypeExtensions.cs | 31 +++++++++++++++++++++++++++
 osu.Game/Rulesets/Ruleset.cs          |  3 ++-
 osu.Game/Rulesets/RulesetInfo.cs      | 16 +-------------
 osu.Game/Skinning/SkinInfo.cs         | 16 +-------------
 osu.Game/Skinning/SkinManager.cs      |  3 ++-
 5 files changed, 37 insertions(+), 32 deletions(-)
 create mode 100644 osu.Game/Extensions/TypeExtensions.cs

diff --git a/osu.Game/Extensions/TypeExtensions.cs b/osu.Game/Extensions/TypeExtensions.cs
new file mode 100644
index 0000000000..2e93c81758
--- /dev/null
+++ b/osu.Game/Extensions/TypeExtensions.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 System;
+using System.Linq;
+
+namespace osu.Game.Extensions
+{
+    internal static class TypeExtensions
+    {
+        /// <summary>
+        /// Returns <paramref name="type"/>'s <see cref="Type.AssemblyQualifiedName"/>
+        /// with the assembly version, culture and public key token values removed.
+        /// </summary>
+        /// <remarks>
+        /// This method is usually used in extensibility scenarios (i.e. for custom rulesets or skins)
+        /// when a version-agnostic identifier associated with a C# class - potentially originating from
+        /// an external assembly - is needed.
+        /// Leaving only the type and assembly names in such a scenario allows to preserve compatibility
+        /// across assembly versions.
+        /// </remarks>
+        internal static string GetInvariantInstantiationInfo(this Type type)
+        {
+            string assemblyQualifiedName = type.AssemblyQualifiedName;
+            if (assemblyQualifiedName == null)
+                throw new ArgumentException($"{type}'s assembly-qualified name is null. Ensure that it is a concrete type and not a generic type parameter.", nameof(type));
+
+            return string.Join(',', assemblyQualifiedName.Split(',').Take(2));
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 7f0c27adfc..7bdf84ace4 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -26,6 +26,7 @@ using JetBrains.Annotations;
 using osu.Framework.Extensions;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Testing;
+using osu.Game.Extensions;
 using osu.Game.Rulesets.Filter;
 using osu.Game.Screens.Ranking.Statistics;
 
@@ -135,7 +136,7 @@ namespace osu.Game.Rulesets
                 Name = Description,
                 ShortName = ShortName,
                 ID = (this as ILegacyRuleset)?.LegacyID,
-                InstantiationInfo = GetType().AssemblyQualifiedName,
+                InstantiationInfo = GetType().GetInvariantInstantiationInfo(),
                 Available = true,
             };
         }
diff --git a/osu.Game/Rulesets/RulesetInfo.cs b/osu.Game/Rulesets/RulesetInfo.cs
index d5aca8c650..702bf35fa8 100644
--- a/osu.Game/Rulesets/RulesetInfo.cs
+++ b/osu.Game/Rulesets/RulesetInfo.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Diagnostics.CodeAnalysis;
-using System.Linq;
 using Newtonsoft.Json;
 using osu.Framework.Testing;
 
@@ -18,20 +17,7 @@ namespace osu.Game.Rulesets
 
         public string ShortName { get; set; }
 
-        private string instantiationInfo;
-
-        public string InstantiationInfo
-        {
-            get => instantiationInfo;
-            set => instantiationInfo = abbreviateInstantiationInfo(value);
-        }
-
-        private string abbreviateInstantiationInfo(string value)
-        {
-            // exclude version onwards, matching only on namespace and type.
-            // this is mainly to allow for new versions of already loaded rulesets to "upgrade" from old.
-            return string.Join(',', value.Split(',').Take(2));
-        }
+        public string InstantiationInfo { get; set; }
 
         [JsonIgnore]
         public bool Available { get; set; }
diff --git a/osu.Game/Skinning/SkinInfo.cs b/osu.Game/Skinning/SkinInfo.cs
index 2e29808cb4..a61a6dd1ce 100644
--- a/osu.Game/Skinning/SkinInfo.cs
+++ b/osu.Game/Skinning/SkinInfo.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using osu.Framework.IO.Stores;
 using osu.Game.Configuration;
 using osu.Game.Database;
@@ -25,20 +24,7 @@ namespace osu.Game.Skinning
 
         public string Creator { get; set; }
 
-        private string instantiationInfo;
-
-        public string InstantiationInfo
-        {
-            get => instantiationInfo;
-            set => instantiationInfo = abbreviateInstantiationInfo(value);
-        }
-
-        private string abbreviateInstantiationInfo(string value)
-        {
-            // exclude version onwards, matching only on namespace and type.
-            // this is mainly to allow for new versions of already loaded rulesets to "upgrade" from old.
-            return string.Join(',', value.Split(',').Take(2));
-        }
+        public string InstantiationInfo { get; set; }
 
         public virtual Skin CreateInstance(IResourceStore<byte[]> legacyDefaultResources, IStorageResourceProvider resources)
         {
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index dbb9dcb7fc..b4051286aa 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -22,6 +22,7 @@ using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Audio;
 using osu.Game.Database;
+using osu.Game.Extensions;
 using osu.Game.IO;
 using osu.Game.IO.Archives;
 
@@ -124,7 +125,7 @@ namespace osu.Game.Skinning
 
             var instance = GetSkin(model);
 
-            model.InstantiationInfo ??= instance.GetType().AssemblyQualifiedName;
+            model.InstantiationInfo ??= instance.GetType().GetInvariantInstantiationInfo();
 
             if (model.Name?.Contains(".osk", StringComparison.OrdinalIgnoreCase) == true)
                 populateMetadata(model, instance);

From a6aec6e0074db91968c3526c4f9c556fba1c2329 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 12 May 2021 23:34:25 +0200
Subject: [PATCH 3371/3722] Fix missed `InstantiationInfo` setter usages

---
 osu.Game/Skinning/DefaultLegacySkin.cs | 3 ++-
 osu.Game/Skinning/SkinInfo.cs          | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/DefaultLegacySkin.cs b/osu.Game/Skinning/DefaultLegacySkin.cs
index 7adf53e5e7..b05c309e4e 100644
--- a/osu.Game/Skinning/DefaultLegacySkin.cs
+++ b/osu.Game/Skinning/DefaultLegacySkin.cs
@@ -3,6 +3,7 @@
 
 using JetBrains.Annotations;
 using osu.Framework.IO.Stores;
+using osu.Game.Extensions;
 using osu.Game.IO;
 using osuTK.Graphics;
 
@@ -35,7 +36,7 @@ namespace osu.Game.Skinning
             ID = SkinInfo.CLASSIC_SKIN, // this is temporary until database storage is decided upon.
             Name = "osu!classic",
             Creator = "team osu!",
-            InstantiationInfo = typeof(DefaultLegacySkin).AssemblyQualifiedName,
+            InstantiationInfo = typeof(DefaultLegacySkin).GetInvariantInstantiationInfo()
         };
     }
 }
diff --git a/osu.Game/Skinning/SkinInfo.cs b/osu.Game/Skinning/SkinInfo.cs
index a61a6dd1ce..bc57a8e71c 100644
--- a/osu.Game/Skinning/SkinInfo.cs
+++ b/osu.Game/Skinning/SkinInfo.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using osu.Framework.IO.Stores;
 using osu.Game.Configuration;
 using osu.Game.Database;
+using osu.Game.Extensions;
 using osu.Game.IO;
 
 namespace osu.Game.Skinning
@@ -50,7 +51,7 @@ namespace osu.Game.Skinning
             ID = DEFAULT_SKIN,
             Name = "osu!lazer",
             Creator = "team osu!",
-            InstantiationInfo = typeof(DefaultSkin).AssemblyQualifiedName,
+            InstantiationInfo = typeof(DefaultSkin).GetInvariantInstantiationInfo()
         };
 
         public bool Equals(SkinInfo other) => other != null && ID == other.ID;

From 27ca7d0f4fa24f8837607dab5f3009459e92b940 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 12 May 2021 23:53:39 +0200
Subject: [PATCH 3372/3722] Actually annotate the correct ctor

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

diff --git a/osu.Game/Skinning/DefaultLegacySkin.cs b/osu.Game/Skinning/DefaultLegacySkin.cs
index b05c309e4e..f30130b1fb 100644
--- a/osu.Game/Skinning/DefaultLegacySkin.cs
+++ b/osu.Game/Skinning/DefaultLegacySkin.cs
@@ -11,12 +11,12 @@ namespace osu.Game.Skinning
 {
     public class DefaultLegacySkin : LegacySkin
     {
-        [UsedImplicitly(ImplicitUseKindFlags.InstantiatedWithFixedConstructorSignature)]
         public DefaultLegacySkin(IResourceStore<byte[]> storage, IStorageResourceProvider resources)
             : this(Info, storage, resources)
         {
         }
 
+        [UsedImplicitly(ImplicitUseKindFlags.InstantiatedWithFixedConstructorSignature)]
         public DefaultLegacySkin(SkinInfo skin, IResourceStore<byte[]> storage, IStorageResourceProvider resources)
             : base(skin, storage, resources, string.Empty)
         {

From 56bd8976666ee49318ab22d4dcfa86f5f7b627ae Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 13 May 2021 04:29:27 +0200
Subject: [PATCH 3373/3722] Move `ShowIssueTypes` to `VerifyScreen`

---
 osu.Game/Screens/Edit/Verify/IssueList.cs         | 14 ++------------
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs      |  8 ++++++++
 osu.Game/Screens/Edit/Verify/VisibilitySection.cs |  4 ++--
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
index befffdd9db..f2d3ef9dda 100644
--- a/osu.Game/Screens/Edit/Verify/IssueList.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueList.cs
@@ -35,8 +35,6 @@ namespace osu.Game.Screens.Edit.Verify
         [Resolved]
         private VerifyScreen verify { get; set; }
 
-        public Dictionary<IssueType, Bindable<bool>> ShowType { get; set; }
-
         public Bindable<DifficultyRating> InterpretedDifficulty { get; set; }
 
         private IBeatmapVerifier rulesetVerifier;
@@ -45,14 +43,6 @@ namespace osu.Game.Screens.Edit.Verify
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colours)
         {
-            // Reflects the user interface. Only types in this dictionary have configurable visibility.
-            ShowType = new Dictionary<IssueType, Bindable<bool>>
-            {
-                { IssueType.Warning, new Bindable<bool>(true) },
-                { IssueType.Error, new Bindable<bool>(true) },
-                { IssueType.Negligible, new Bindable<bool>(false) }
-            };
-
             generalVerifier = new BeatmapVerifier();
             rulesetVerifier = beatmap.BeatmapInfo.Ruleset?.CreateInstance()?.CreateBeatmapVerifier();
 
@@ -116,9 +106,9 @@ namespace osu.Game.Screens.Edit.Verify
 
         private IEnumerable<Issue> filter(IEnumerable<Issue> issues)
         {
-            foreach (IssueType issueType in ShowType.Keys)
+            foreach (var issueType in verify.ShowIssueType.Keys)
             {
-                if (!ShowType[issueType].Value)
+                if (!verify.ShowIssueType[issueType].Value)
                     issues = issues.Where(issue => issue.Template.Type != issueType);
             }
 
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index afd0c8760d..cf1a471714 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.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.Bindables;
 using osu.Framework.Graphics;
@@ -17,6 +18,13 @@ namespace osu.Game.Screens.Edit.Verify
 
         public readonly Bindable<DifficultyRating> InterpretedDifficulty = new Bindable<DifficultyRating>();
 
+        public readonly Dictionary<IssueType, Bindable<bool>> ShowIssueType = new Dictionary<IssueType, Bindable<bool>>
+        {
+            { IssueType.Warning, new Bindable<bool>(true) },
+            { IssueType.Error, new Bindable<bool>(true) },
+            { IssueType.Negligible, new Bindable<bool>(false) }
+        };
+
         public IssueList IssueList { get; private set; }
 
         public VerifyScreen()
diff --git a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
index ce755bdcb4..71f3740d86 100644
--- a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
+++ b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Screens.Edit.Verify
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colours)
         {
-            foreach (IssueType issueType in verify.IssueList.ShowType.Keys)
+            foreach (IssueType issueType in verify.ShowIssueType.Keys)
             {
                 var checkbox = new SettingsCheckbox
                 {
@@ -28,7 +28,7 @@ namespace osu.Game.Screens.Edit.Verify
                     LabelText = issueType.ToString()
                 };
 
-                checkbox.Current.BindTo(verify.IssueList.ShowType[issueType]);
+                checkbox.Current.BindTo(verify.ShowIssueType[issueType]);
                 checkbox.Current.BindValueChanged(_ => verify.IssueList.Refresh());
                 Flow.Add(checkbox);
             }

From 6806e40ad99b1bb6b561765d05858d11e6f5223a Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 13 May 2021 04:30:40 +0200
Subject: [PATCH 3374/3722] Remove unnecessary local variable

This now exists in `VerifyScreen`, which we can access from here.
---
 osu.Game/Screens/Edit/Verify/IssueList.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
index f2d3ef9dda..19536401e9 100644
--- a/osu.Game/Screens/Edit/Verify/IssueList.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueList.cs
@@ -35,8 +35,6 @@ namespace osu.Game.Screens.Edit.Verify
         [Resolved]
         private VerifyScreen verify { get; set; }
 
-        public Bindable<DifficultyRating> InterpretedDifficulty { get; set; }
-
         private IBeatmapVerifier rulesetVerifier;
         private BeatmapVerifier generalVerifier;
 
@@ -46,8 +44,6 @@ namespace osu.Game.Screens.Edit.Verify
             generalVerifier = new BeatmapVerifier();
             rulesetVerifier = beatmap.BeatmapInfo.Ruleset?.CreateInstance()?.CreateBeatmapVerifier();
 
-            InterpretedDifficulty = verify.InterpretedDifficulty.GetBoundCopy();
-
             RelativeSizeAxes = Axes.Both;
 
             InternalChildren = new Drawable[]

From dd8423c4c4350b5db811c8338d80235b2fc8a432 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 13 May 2021 04:36:20 +0200
Subject: [PATCH 3375/3722] Set interpreted difficulty to correct default

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

diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index cf1a471714..963b77baa1 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -35,6 +35,9 @@ namespace osu.Game.Screens.Edit.Verify
         [BackgroundDependencyLoader]
         private void load()
         {
+            InterpretedDifficulty.Default = EditorBeatmap.BeatmapInfo.DifficultyRating;
+            InterpretedDifficulty.SetDefault();
+
             IssueList = new IssueList();
             Child = new Container
             {

From fbb76ba5989d10690411561dbec0d74b4c0151d6 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 13 May 2021 04:50:32 +0200
Subject: [PATCH 3376/3722] Split `ShowIssueTypes` dict into hidden and
 configurable lists

This way `VerifyScreen` is decoupled from which options `VisibilitySection` provides.

Bindings are a bit less neat, though.
---
 osu.Game/Screens/Edit/Verify/IssueList.cs     |  8 +------
 osu.Game/Screens/Edit/Verify/VerifyScreen.cs  |  8 +------
 .../Screens/Edit/Verify/VisibilitySection.cs  | 23 ++++++++++++++++---
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
index 19536401e9..22d410592e 100644
--- a/osu.Game/Screens/Edit/Verify/IssueList.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueList.cs
@@ -102,13 +102,7 @@ namespace osu.Game.Screens.Edit.Verify
 
         private IEnumerable<Issue> filter(IEnumerable<Issue> issues)
         {
-            foreach (var issueType in verify.ShowIssueType.Keys)
-            {
-                if (!verify.ShowIssueType[issueType].Value)
-                    issues = issues.Where(issue => issue.Template.Type != issueType);
-            }
-
-            return issues;
+            return issues.Where(issue => !verify.HiddenIssueTypes.Contains(issue.Template.Type));
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
index 963b77baa1..6d7a4a72e2 100644
--- a/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
+++ b/osu.Game/Screens/Edit/Verify/VerifyScreen.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -18,12 +17,7 @@ namespace osu.Game.Screens.Edit.Verify
 
         public readonly Bindable<DifficultyRating> InterpretedDifficulty = new Bindable<DifficultyRating>();
 
-        public readonly Dictionary<IssueType, Bindable<bool>> ShowIssueType = new Dictionary<IssueType, Bindable<bool>>
-        {
-            { IssueType.Warning, new Bindable<bool>(true) },
-            { IssueType.Error, new Bindable<bool>(true) },
-            { IssueType.Negligible, new Bindable<bool>(false) }
-        };
+        public readonly BindableList<IssueType> HiddenIssueTypes = new BindableList<IssueType> { IssueType.Negligible };
 
         public IssueList IssueList { get; private set; }
 
diff --git a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
index 71f3740d86..3698f51f66 100644
--- a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
+++ b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
@@ -14,12 +14,19 @@ namespace osu.Game.Screens.Edit.Verify
         [Resolved]
         private VerifyScreen verify { get; set; }
 
+        private readonly IssueType[] configurableIssueTypes =
+        {
+            IssueType.Warning,
+            IssueType.Error,
+            IssueType.Negligible
+        };
+
         protected override string Header => "Visibility";
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colours)
         {
-            foreach (IssueType issueType in verify.ShowIssueType.Keys)
+            foreach (IssueType issueType in configurableIssueTypes)
             {
                 var checkbox = new SettingsCheckbox
                 {
@@ -28,8 +35,18 @@ namespace osu.Game.Screens.Edit.Verify
                     LabelText = issueType.ToString()
                 };
 
-                checkbox.Current.BindTo(verify.ShowIssueType[issueType]);
-                checkbox.Current.BindValueChanged(_ => verify.IssueList.Refresh());
+                checkbox.Current.Default = !verify.HiddenIssueTypes.Contains(issueType);
+                checkbox.Current.SetDefault();
+                checkbox.Current.BindValueChanged(state =>
+                {
+                    if (!state.NewValue)
+                        verify.HiddenIssueTypes.Add(issueType);
+                    else
+                        verify.HiddenIssueTypes.Remove(issueType);
+
+                    verify.IssueList.Refresh();
+                });
+
                 Flow.Add(checkbox);
             }
         }

From 5b0309296812f93f50aef02444367f7698cddb8c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 13 May 2021 11:53:50 +0900
Subject: [PATCH 3377/3722] Fix possible test failure

---
 osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
index 69fbd56490..bba7e2b391 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddStep("set user ready", () => client.ChangeState(MultiplayerUserState.Ready));
             AddStep("delete beatmap", () => beatmaps.Delete(importedSet));
 
-            AddAssert("user state is idle", () => client.LocalUser?.State == MultiplayerUserState.Idle);
+            AddUntilStep("user state is idle", () => client.LocalUser?.State == MultiplayerUserState.Idle);
         }
 
         [Test]

From c8d21f2c3fe65f4c5add3e1429c907a370a61b6a Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 13 May 2021 05:25:02 +0200
Subject: [PATCH 3378/3722] Isolate refreshing to `IssueList`

---
 osu.Game/Screens/Edit/Verify/IssueList.cs         | 6 +++---
 osu.Game/Screens/Edit/Verify/VisibilitySection.cs | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
index 22d410592e..7eba50498c 100644
--- a/osu.Game/Screens/Edit/Verify/IssueList.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueList.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Screens.Edit.Verify
                         new TriangleButton
                         {
                             Text = "Refresh",
-                            Action = Refresh,
+                            Action = refresh,
                             Size = new Vector2(120, 40),
                             Anchor = Anchor.BottomRight,
                             Origin = Anchor.BottomRight,
@@ -83,10 +83,10 @@ namespace osu.Game.Screens.Edit.Verify
         {
             base.LoadComplete();
 
-            Refresh();
+            verify.HiddenIssueTypes.BindCollectionChanged((o, s) => refresh(), runOnceImmediately: true);
         }
 
-        public void Refresh()
+        private void refresh()
         {
             var issues = generalVerifier.Run(beatmap, workingBeatmap.Value);
 
diff --git a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
index 3698f51f66..7ec3ecee07 100644
--- a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
+++ b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
@@ -43,8 +43,6 @@ namespace osu.Game.Screens.Edit.Verify
                         verify.HiddenIssueTypes.Add(issueType);
                     else
                         verify.HiddenIssueTypes.Remove(issueType);
-
-                    verify.IssueList.Refresh();
                 });
 
                 Flow.Add(checkbox);

From e86834b74060d5fc7e2e9314142316b74ccf821b Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 13 May 2021 05:25:20 +0200
Subject: [PATCH 3379/3722] Use local bound copy for `HiddenIssueTypes`

---
 osu.Game/Screens/Edit/Verify/VisibilitySection.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
index 7ec3ecee07..48bf0523b1 100644
--- a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
+++ b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
@@ -26,6 +26,8 @@ namespace osu.Game.Screens.Edit.Verify
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colours)
         {
+            var hiddenIssueTypes = verify.HiddenIssueTypes.GetBoundCopy();
+
             foreach (IssueType issueType in configurableIssueTypes)
             {
                 var checkbox = new SettingsCheckbox
@@ -35,14 +37,14 @@ namespace osu.Game.Screens.Edit.Verify
                     LabelText = issueType.ToString()
                 };
 
-                checkbox.Current.Default = !verify.HiddenIssueTypes.Contains(issueType);
+                checkbox.Current.Default = !hiddenIssueTypes.Contains(issueType);
                 checkbox.Current.SetDefault();
                 checkbox.Current.BindValueChanged(state =>
                 {
                     if (!state.NewValue)
-                        verify.HiddenIssueTypes.Add(issueType);
+                        hiddenIssueTypes.Add(issueType);
                     else
-                        verify.HiddenIssueTypes.Remove(issueType);
+                        hiddenIssueTypes.Remove(issueType);
                 });
 
                 Flow.Add(checkbox);

From 04c1585eb24ef0fa07333bc354c7122dc728e8df Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 13 May 2021 05:38:45 +0200
Subject: [PATCH 3380/3722] Use more consistent lambda discards

---
 osu.Game/Screens/Edit/Verify/IssueList.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
index 7eba50498c..03cd22ad54 100644
--- a/osu.Game/Screens/Edit/Verify/IssueList.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueList.cs
@@ -83,7 +83,7 @@ namespace osu.Game.Screens.Edit.Verify
         {
             base.LoadComplete();
 
-            verify.HiddenIssueTypes.BindCollectionChanged((o, s) => refresh(), runOnceImmediately: true);
+            verify.HiddenIssueTypes.BindCollectionChanged((_, __) => refresh(), runOnceImmediately: true);
         }
 
         private void refresh()

From e80d8f69220509dc78a9fbdedd9eef797c27c7f1 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 13 May 2021 05:46:47 +0200
Subject: [PATCH 3381/3722] Keep track of local bound copy

---
 osu.Game/Screens/Edit/Verify/VisibilitySection.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
index 48bf0523b1..cb7deb8566 100644
--- a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
+++ b/osu.Game/Screens/Edit/Verify/VisibilitySection.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.Game.Overlays;
 using osu.Game.Overlays.Settings;
@@ -21,12 +22,14 @@ namespace osu.Game.Screens.Edit.Verify
             IssueType.Negligible
         };
 
+        private BindableList<IssueType> hiddenIssueTypes;
+
         protected override string Header => "Visibility";
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colours)
         {
-            var hiddenIssueTypes = verify.HiddenIssueTypes.GetBoundCopy();
+            hiddenIssueTypes = verify.HiddenIssueTypes.GetBoundCopy();
 
             foreach (IssueType issueType in configurableIssueTypes)
             {

From 6caf4e38790298f24837a0764fe5bfa778118674 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 12:57:28 +0900
Subject: [PATCH 3382/3722] Add xmldoc to `SkinnableInfo`

---
 osu.Game/Screens/Play/HUD/SkinnableInfo.cs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
index 2de3f1b729..2e9235df97 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Newtonsoft.Json;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Extensions;
@@ -33,10 +34,15 @@ namespace osu.Game.Screens.Play.HUD
 
         public List<SkinnableInfo> Children { get; } = new List<SkinnableInfo>();
 
+        [JsonConstructor]
         public SkinnableInfo()
         {
         }
 
+        /// <summary>
+        /// Construct a new instance populating all attributes from the provided drawable.
+        /// </summary>
+        /// <param name="component">The drawable which attributes should be sourced from.</param>
         public SkinnableInfo(Drawable component)
         {
             Type = component.GetType();
@@ -47,13 +53,17 @@ namespace osu.Game.Screens.Play.HUD
             Anchor = component.Anchor;
             Origin = component.Origin;
 
-            if (component is Container container)
+            if (component is Container<Drawable> container)
             {
-                foreach (var child in container.Children.OfType<ISkinSerialisable>().OfType<Drawable>())
+                foreach (var child in container.OfType<ISkinSerialisable>().OfType<Drawable>())
                     Children.Add(child.CreateSerialisedInformation());
             }
         }
 
+        /// <summary>
+        /// Construct an instance of the drawable with all attributes applied.
+        /// </summary>
+        /// <returns>The new instance.</returns>
         public Drawable CreateInstance()
         {
             Drawable d = (Drawable)Activator.CreateInstance(Type);

From ee0a6ba93e25df5425480f0427826b182055f6c4 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 13 May 2021 05:59:49 +0200
Subject: [PATCH 3383/3722] Use local bound copy in `InterpretationSection` as
 well

Else we're relying on the `VerifyScreen`'s bindable instance, and by extension the `VerifyScreen` instance itself.
---
 osu.Game/Screens/Edit/Verify/InterpretationSection.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Verify/InterpretationSection.cs b/osu.Game/Screens/Edit/Verify/InterpretationSection.cs
index 7991786542..1bdb528473 100644
--- a/osu.Game/Screens/Edit/Verify/InterpretationSection.cs
+++ b/osu.Game/Screens/Edit/Verify/InterpretationSection.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.Game.Beatmaps;
 using osu.Game.Overlays.Settings;
@@ -15,9 +16,13 @@ namespace osu.Game.Screens.Edit.Verify
 
         protected override string Header => "Interpretation";
 
+        private Bindable<DifficultyRating> interpretedDifficulty;
+
         [BackgroundDependencyLoader]
         private void load()
         {
+            interpretedDifficulty = verify.InterpretedDifficulty.GetBoundCopy();
+
             var dropdown = new SettingsEnumDropdown<DifficultyRating>
             {
                 Anchor = Anchor.CentreLeft,
@@ -25,7 +30,7 @@ namespace osu.Game.Screens.Edit.Verify
                 TooltipText = "Affects checks that depend on difficulty level"
             };
 
-            dropdown.Current.BindTo(verify.InterpretedDifficulty);
+            dropdown.Current.BindTo(interpretedDifficulty);
 
             Flow.Add(dropdown);
         }

From fb305130deb9ba12229f36bb436635a04ac646d5 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 13 May 2021 06:00:21 +0200
Subject: [PATCH 3384/3722] Also refresh when interpreted difficulty changes

---
 osu.Game/Screens/Edit/Verify/IssueList.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
index 03cd22ad54..407c1e3bc7 100644
--- a/osu.Game/Screens/Edit/Verify/IssueList.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueList.cs
@@ -83,7 +83,10 @@ namespace osu.Game.Screens.Edit.Verify
         {
             base.LoadComplete();
 
-            verify.HiddenIssueTypes.BindCollectionChanged((_, __) => refresh(), runOnceImmediately: true);
+            verify.InterpretedDifficulty.BindValueChanged(_ => refresh());
+            verify.HiddenIssueTypes.BindCollectionChanged((_, __) => refresh());
+
+            refresh();
         }
 
         private void refresh()

From a38cb61b085329cf1712899674ace8c8de68a2d0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 13:02:55 +0900
Subject: [PATCH 3385/3722] Remove duplicated call to
 `base.GetDrawableComponent`

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

diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index 55f34ba1c6..d6ca5e9009 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -92,10 +92,10 @@ namespace osu.Game.Skinning
                             return skinnableTargetWrapper;
                     }
 
-                    return null;
+                    break;
             }
 
-            return base.GetDrawableComponent(component);
+            return null;
         }
 
         public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)

From 2bf8635ffd5d44210b6d6638482c089bbd3f611a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 13:03:23 +0900
Subject: [PATCH 3386/3722] Move field upwards in class

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

diff --git a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
index 9890b8e8b6..09bbf7ffd5 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
@@ -19,6 +19,8 @@ namespace osu.Game.Skinning.Editor
     {
         private readonly Drawable target;
 
+        private readonly List<BindableList<ISkinnableComponent>> targetComponents = new List<BindableList<ISkinnableComponent>>();
+
         public SkinBlueprintContainer(Drawable target)
         {
             this.target = target;
@@ -30,8 +32,6 @@ namespace osu.Game.Skinning.Editor
             SelectedItems.BindTo(editor.SelectedComponents);
         }
 
-        private readonly List<BindableList<ISkinnableComponent>> targetComponents = new List<BindableList<ISkinnableComponent>>();
-
         protected override void LoadComplete()
         {
             base.LoadComplete();

From 469a7f5d2a07c434aface5cff1a1fdae987c5072 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 13:04:17 +0900
Subject: [PATCH 3387/3722] Reorder fields in `SkinEditor`

---
 osu.Game/Skinning/Editor/SkinEditor.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index a00557ee4e..72dacad310 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -22,19 +22,19 @@ namespace osu.Game.Skinning.Editor
     {
         public const double TRANSITION_DURATION = 500;
 
+        public readonly BindableList<ISkinnableComponent> SelectedComponents = new BindableList<ISkinnableComponent>();
+
+        protected override bool StartHidden => true;
+
         private readonly Drawable targetScreen;
 
         private OsuTextFlowContainer headerText;
 
-        protected override bool StartHidden => true;
-
-        public readonly BindableList<ISkinnableComponent> SelectedComponents = new BindableList<ISkinnableComponent>();
+        private Bindable<Skin> currentSkin;
 
         [Resolved]
         private SkinManager skins { get; set; }
 
-        private Bindable<Skin> currentSkin;
-
         [Resolved]
         private OsuColour colours { get; set; }
 

From 992a052426da407f794bb3d241d30338d51a8ce8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 13:07:06 +0900
Subject: [PATCH 3388/3722] Remove stray comment

---
 osu.Game/Skinning/Skin.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index 10481e4efd..1fb1e3b99f 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -39,8 +39,6 @@ namespace osu.Game.Skinning
         {
             SkinInfo = skin;
 
-            // may be null for default skin.
-
             // we may want to move this to some kind of async operation in the future.
             foreach (SkinnableTarget skinnableTarget in Enum.GetValues(typeof(SkinnableTarget)))
             {

From 47948d7b34c860e17d73579ac4ee6e91d69e3506 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 13 May 2021 06:08:48 +0200
Subject: [PATCH 3389/3722] Set default for bindable in object initializer

Fixes the CI failure.
---
 osu.Game/Screens/Edit/Verify/VisibilitySection.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
index cb7deb8566..f942621d2a 100644
--- a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
+++ b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
@@ -37,10 +37,10 @@ namespace osu.Game.Screens.Edit.Verify
                 {
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreLeft,
-                    LabelText = issueType.ToString()
+                    LabelText = issueType.ToString(),
+                    Current = { Default = !hiddenIssueTypes.Contains(issueType) }
                 };
 
-                checkbox.Current.Default = !hiddenIssueTypes.Contains(issueType);
                 checkbox.Current.SetDefault();
                 checkbox.Current.BindValueChanged(state =>
                 {

From c93ed541f3571aa3d9991949d75f29b74fa46def Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 13:09:33 +0900
Subject: [PATCH 3390/3722] Add xmldoc and tidy up logic in `Skin`

---
 osu.Game/Skinning/Skin.cs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index 1fb1e3b99f..64c848fbfa 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -61,11 +61,19 @@ namespace osu.Game.Skinning
             }
         }
 
+        /// <summary>
+        /// Remove all stored customisations for the provided target.
+        /// </summary>
+        /// <param name="targetContainer">The target container to reset.</param>
         public void ResetDrawableTarget(SkinnableElementTargetContainer targetContainer)
         {
             DrawableComponentInfo.Remove(targetContainer.Target);
         }
 
+        /// <summary>
+        /// Update serialised information for the provided target.
+        /// </summary>
+        /// <param name="targetContainer">The target container to serialise to this skin.</param>
         public void UpdateDrawableTarget(SkinnableElementTargetContainer targetContainer)
         {
             DrawableComponentInfo[targetContainer.Target] = targetContainer.CreateSerialisedChildren().ToArray();
@@ -76,10 +84,7 @@ namespace osu.Game.Skinning
             switch (component)
             {
                 case SkinnableTargetComponent target:
-
-                    var skinnableTarget = target.Target;
-
-                    if (!DrawableComponentInfo.TryGetValue(skinnableTarget, out var skinnableInfo))
+                    if (!DrawableComponentInfo.TryGetValue(target.Target, out var skinnableInfo))
                         return null;
 
                     return new SkinnableTargetWrapper

From 581e7940c7331ab89f45cc6234089417c1e5bdd6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 13:13:22 +0900
Subject: [PATCH 3391/3722] Add xmldoc to `SkinnableElementTargetContainer`

---
 osu.Game/Skinning/SkinnableElementTargetContainer.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Skinning/SkinnableElementTargetContainer.cs b/osu.Game/Skinning/SkinnableElementTargetContainer.cs
index b900fdf3e0..f447800a33 100644
--- a/osu.Game/Skinning/SkinnableElementTargetContainer.cs
+++ b/osu.Game/Skinning/SkinnableElementTargetContainer.cs
@@ -26,6 +26,9 @@ namespace osu.Game.Skinning
             Target = target;
         }
 
+        /// <summary>
+        /// Reload all components in this container from the current skin.
+        /// </summary>
         public void Reload()
         {
             ClearInternal();
@@ -43,6 +46,12 @@ namespace osu.Game.Skinning
             }
         }
 
+        /// <summary>
+        /// Add a new skinnable component to this target.
+        /// </summary>
+        /// <param name="component">The component to add.</param>
+        /// <exception cref="NotSupportedException">Thrown when attempting to add an element to a target which is not supported by the current skin.</exception>
+        /// <exception cref="ArgumentException">Thrown if the provided instance is not a <see cref="Drawable"/>.</exception>
         public void Add(ISkinnableComponent component)
         {
             if (content == null)

From 3b862798e985edc8ff51ba99b4d2961ccdede31b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 13:14:49 +0900
Subject: [PATCH 3392/3722] Standardise naming of methods related to
 SkinnableInfo

---
 osu.Game/Extensions/DrawableExtensions.cs            | 4 ++--
 osu.Game/Screens/Play/HUD/SkinnableInfo.cs           | 4 ++--
 osu.Game/Skinning/Skin.cs                            | 2 +-
 osu.Game/Skinning/SkinnableElementTargetContainer.cs | 7 +++++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Extensions/DrawableExtensions.cs b/osu.Game/Extensions/DrawableExtensions.cs
index 0ec96a876e..2ac6e6ff22 100644
--- a/osu.Game/Extensions/DrawableExtensions.cs
+++ b/osu.Game/Extensions/DrawableExtensions.cs
@@ -46,9 +46,9 @@ namespace osu.Game.Extensions
         public static Vector2 ScreenSpaceDeltaToParentSpace(this Drawable drawable, Vector2 delta) =>
             drawable.Parent.ToLocalSpace(drawable.Parent.ToScreenSpace(Vector2.Zero) + delta);
 
-        public static SkinnableInfo CreateSerialisedInformation(this Drawable component) => new SkinnableInfo(component);
+        public static SkinnableInfo CreateSkinnableInfo(this Drawable component) => new SkinnableInfo(component);
 
-        public static void ApplySerialisedInformation(this Drawable component, SkinnableInfo info)
+        public static void ApplySkinnableInfo(this Drawable component, SkinnableInfo info)
         {
             // todo: can probably make this better via deserialisation directly using a common interface.
             component.Position = info.Position;
diff --git a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
index 2e9235df97..678885d096 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Screens.Play.HUD
             if (component is Container<Drawable> container)
             {
                 foreach (var child in container.OfType<ISkinSerialisable>().OfType<Drawable>())
-                    Children.Add(child.CreateSerialisedInformation());
+                    Children.Add(child.CreateSkinnableInfo());
             }
         }
 
@@ -67,7 +67,7 @@ namespace osu.Game.Screens.Play.HUD
         public Drawable CreateInstance()
         {
             Drawable d = (Drawable)Activator.CreateInstance(Type);
-            d.ApplySerialisedInformation(this);
+            d.ApplySkinnableInfo(this);
             return d;
         }
     }
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index 64c848fbfa..4890524b90 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -76,7 +76,7 @@ namespace osu.Game.Skinning
         /// <param name="targetContainer">The target container to serialise to this skin.</param>
         public void UpdateDrawableTarget(SkinnableElementTargetContainer targetContainer)
         {
-            DrawableComponentInfo[targetContainer.Target] = targetContainer.CreateSerialisedChildren().ToArray();
+            DrawableComponentInfo[targetContainer.Target] = targetContainer.CreateSkinnableInfo().ToArray();
         }
 
         public virtual Drawable GetDrawableComponent(ISkinComponent component)
diff --git a/osu.Game/Skinning/SkinnableElementTargetContainer.cs b/osu.Game/Skinning/SkinnableElementTargetContainer.cs
index f447800a33..2aea8c0281 100644
--- a/osu.Game/Skinning/SkinnableElementTargetContainer.cs
+++ b/osu.Game/Skinning/SkinnableElementTargetContainer.cs
@@ -64,8 +64,11 @@ namespace osu.Game.Skinning
             components.Add(component);
         }
 
-        public IEnumerable<SkinnableInfo> CreateSerialisedChildren() =>
-            components.Select(d => ((Drawable)d).CreateSerialisedInformation());
+        /// <summary>
+        /// Serialise all children as <see cref="SkinnableInfo"/>.
+        /// </summary>
+        /// <returns>The serialised content.</returns>
+        public IEnumerable<SkinnableInfo> CreateSkinnableInfo() => components.Select(d => ((Drawable)d).CreateSkinnableInfo());
 
         protected override void SkinChanged(ISkinSource skin, bool allowFallback)
         {

From db19617b8b69a9b9102b8594ed34d881f36d5ede Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 13:16:20 +0900
Subject: [PATCH 3393/3722] Add `JsonConstructor` attribute to
 `SkinnableTargetWrapper`

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

diff --git a/osu.Game/Skinning/SkinnableTargetWrapper.cs b/osu.Game/Skinning/SkinnableTargetWrapper.cs
index 0d16775f51..2e2ce32a6f 100644
--- a/osu.Game/Skinning/SkinnableTargetWrapper.cs
+++ b/osu.Game/Skinning/SkinnableTargetWrapper.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using Newtonsoft.Json;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 
@@ -11,6 +12,7 @@ namespace osu.Game.Skinning
     /// A container which is serialised and can encapsulate multiple skinnable elements into a single return type (for consumption via <see cref="ISkin.GetDrawableComponent"/>.
     /// Will also optionally apply default cross-element layout dependencies when initialised from a non-deserialised source.
     /// </summary>
+    [Serializable]
     public class SkinnableTargetWrapper : Container, ISkinSerialisable
     {
         private readonly Action<Container> applyDefaults;
@@ -25,6 +27,7 @@ namespace osu.Game.Skinning
             this.applyDefaults = applyDefaults;
         }
 
+        [JsonConstructor]
         public SkinnableTargetWrapper()
         {
             RelativeSizeAxes = Axes.Both;

From 23e284b8b31cc59189382d16cb06a72cf16fb00d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 13:34:03 +0900
Subject: [PATCH 3394/3722] Change default skin editor shortcut to Ctrl+Shift+S

Avoids a conflict with song select's random rewind functionality. As
mentioned in #12776.
---
 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 ce945f3bf8..c8227c0887 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.Control, InputKey.O }, GlobalAction.ToggleSettings),
             new KeyBinding(new[] { InputKey.Control, InputKey.D }, GlobalAction.ToggleBeatmapListing),
             new KeyBinding(new[] { InputKey.Control, InputKey.N }, GlobalAction.ToggleNotifications),
-            new KeyBinding(new[] { InputKey.Shift, InputKey.F2 }, GlobalAction.ToggleSkinEditor),
+            new KeyBinding(new[] { InputKey.Control, InputKey.Shift, InputKey.S }, GlobalAction.ToggleSkinEditor),
 
             new KeyBinding(InputKey.Escape, GlobalAction.Back),
             new KeyBinding(InputKey.ExtraMouseButton1, GlobalAction.Back),

From cdcbaf4291e4bbf20b552a305244be92336dbe80 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 13:45:10 +0900
Subject: [PATCH 3395/3722] Tidy up specification of `SettingsSection`

---
 .../Screens/Edit/EditorRoundedScreenSettingsSection.cs     | 7 ++++---
 osu.Game/Screens/Edit/Verify/InterpretationSection.cs      | 2 +-
 osu.Game/Screens/Edit/Verify/VisibilitySection.cs          | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Edit/EditorRoundedScreenSettingsSection.cs b/osu.Game/Screens/Edit/EditorRoundedScreenSettingsSection.cs
index 87ed98a439..e17114ebcb 100644
--- a/osu.Game/Screens/Edit/EditorRoundedScreenSettingsSection.cs
+++ b/osu.Game/Screens/Edit/EditorRoundedScreenSettingsSection.cs
@@ -15,8 +15,9 @@ namespace osu.Game.Screens.Edit
     {
         private const int header_height = 50;
 
-        protected FillFlowContainer Flow;
-        protected abstract string Header { get; }
+        protected abstract string HeaderText { get; }
+
+        protected FillFlowContainer Flow { get; private set; }
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colours)
@@ -36,7 +37,7 @@ namespace osu.Game.Screens.Edit
                     {
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
-                        Text = Header,
+                        Text = HeaderText,
                         Font = new FontUsage(size: 25, weight: "bold")
                     }
                 },
diff --git a/osu.Game/Screens/Edit/Verify/InterpretationSection.cs b/osu.Game/Screens/Edit/Verify/InterpretationSection.cs
index 1bdb528473..4dca94aacf 100644
--- a/osu.Game/Screens/Edit/Verify/InterpretationSection.cs
+++ b/osu.Game/Screens/Edit/Verify/InterpretationSection.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Screens.Edit.Verify
         [Resolved]
         private VerifyScreen verify { get; set; }
 
-        protected override string Header => "Interpretation";
+        protected override string HeaderText => "Interpretation";
 
         private Bindable<DifficultyRating> interpretedDifficulty;
 
diff --git a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
index f942621d2a..7ebfe586a7 100644
--- a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
+++ b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Screens.Edit.Verify
 
         private BindableList<IssueType> hiddenIssueTypes;
 
-        protected override string Header => "Visibility";
+        protected override string HeaderText => "Visibility";
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colours)

From c6648112e59f8a5c3429af35f72b99d8ceceb2c2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 13:51:41 +0900
Subject: [PATCH 3396/3722] Simplify binding flow in `InterpretationSection`

---
 .../Screens/Edit/Verify/InterpretationSection.cs | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Edit/Verify/InterpretationSection.cs b/osu.Game/Screens/Edit/Verify/InterpretationSection.cs
index 4dca94aacf..7de87737f5 100644
--- a/osu.Game/Screens/Edit/Verify/InterpretationSection.cs
+++ b/osu.Game/Screens/Edit/Verify/InterpretationSection.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.Game.Beatmaps;
 using osu.Game.Overlays.Settings;
@@ -16,23 +15,16 @@ namespace osu.Game.Screens.Edit.Verify
 
         protected override string HeaderText => "Interpretation";
 
-        private Bindable<DifficultyRating> interpretedDifficulty;
-
         [BackgroundDependencyLoader]
         private void load()
         {
-            interpretedDifficulty = verify.InterpretedDifficulty.GetBoundCopy();
-
-            var dropdown = new SettingsEnumDropdown<DifficultyRating>
+            Flow.Add(new SettingsEnumDropdown<DifficultyRating>
             {
                 Anchor = Anchor.CentreLeft,
                 Origin = Anchor.CentreLeft,
-                TooltipText = "Affects checks that depend on difficulty level"
-            };
-
-            dropdown.Current.BindTo(interpretedDifficulty);
-
-            Flow.Add(dropdown);
+                TooltipText = "Affects checks that depend on difficulty level",
+                Current = verify.InterpretedDifficulty.GetBoundCopy()
+            });
         }
     }
 }

From b81f86bd4d9c088dce4a7c49fb16b768ccc3e669 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 13:53:27 +0900
Subject: [PATCH 3397/3722] Move DI resolution to inside BDL parameters

---
 osu.Game/Screens/Edit/Verify/InterpretationSection.cs | 5 +----
 osu.Game/Screens/Edit/Verify/VisibilitySection.cs     | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Edit/Verify/InterpretationSection.cs b/osu.Game/Screens/Edit/Verify/InterpretationSection.cs
index 7de87737f5..9548f8aaa9 100644
--- a/osu.Game/Screens/Edit/Verify/InterpretationSection.cs
+++ b/osu.Game/Screens/Edit/Verify/InterpretationSection.cs
@@ -10,13 +10,10 @@ namespace osu.Game.Screens.Edit.Verify
 {
     internal class InterpretationSection : EditorRoundedScreenSettingsSection
     {
-        [Resolved]
-        private VerifyScreen verify { get; set; }
-
         protected override string HeaderText => "Interpretation";
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(VerifyScreen verify)
         {
             Flow.Add(new SettingsEnumDropdown<DifficultyRating>
             {
diff --git a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
index 7ebfe586a7..d049436376 100644
--- a/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
+++ b/osu.Game/Screens/Edit/Verify/VisibilitySection.cs
@@ -12,9 +12,6 @@ namespace osu.Game.Screens.Edit.Verify
 {
     internal class VisibilitySection : EditorRoundedScreenSettingsSection
     {
-        [Resolved]
-        private VerifyScreen verify { get; set; }
-
         private readonly IssueType[] configurableIssueTypes =
         {
             IssueType.Warning,
@@ -27,7 +24,7 @@ namespace osu.Game.Screens.Edit.Verify
         protected override string HeaderText => "Visibility";
 
         [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colours)
+        private void load(OverlayColourProvider colours, VerifyScreen verify)
         {
             hiddenIssueTypes = verify.HiddenIssueTypes.GetBoundCopy();
 

From e0e9106921fc1b4c30c19c56645e19cd696f455f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 14:54:52 +0900
Subject: [PATCH 3398/3722] Enable autoplay in skin editor tests

---
 osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs    | 2 ++
 .../Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs  | 9 ++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
index 73da76df78..a0b27755b7 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
@@ -19,6 +19,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Resolved]
         private SkinManager skinManager { get; set; }
 
+        protected override bool Autoplay => true;
+
         [SetUpSteps]
         public override void SetUpSteps()
         {
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
index c7c93b8892..245e190b1f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
@@ -1,13 +1,11 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
-using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play;
@@ -32,12 +30,13 @@ namespace osu.Game.Tests.Visual.Gameplay
                 SetContents(() =>
                 {
                     var ruleset = new OsuRuleset();
+                    var mods = new[] { ruleset.GetAutoplayMod() };
                     var working = CreateWorkingBeatmap(ruleset.RulesetInfo);
-                    var beatmap = working.GetPlayableBeatmap(ruleset.RulesetInfo);
+                    var beatmap = working.GetPlayableBeatmap(ruleset.RulesetInfo, mods);
 
-                    var drawableRuleset = ruleset.CreateDrawableRulesetWith(beatmap);
+                    var drawableRuleset = ruleset.CreateDrawableRulesetWith(beatmap, mods);
 
-                    var hudOverlay = new HUDOverlay(drawableRuleset, Array.Empty<Mod>())
+                    var hudOverlay = new HUDOverlay(drawableRuleset, mods)
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,

From 4eeeaf6a1aa9588932c2c096c40232d6bb5527d4 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 13 May 2021 07:57:32 +0200
Subject: [PATCH 3399/3722] Keep track of local bound copy

---
 osu.Game/Screens/Edit/Verify/IssueList.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
index 2a90834537..f150f4175b 100644
--- a/osu.Game/Screens/Edit/Verify/IssueList.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueList.cs
@@ -35,6 +35,8 @@ namespace osu.Game.Screens.Edit.Verify
         [Resolved]
         private VerifyScreen verify { get; set; }
 
+        private Bindable<DifficultyRating> interpretedDifficulty;
+
         private IBeatmapVerifier rulesetVerifier;
         private BeatmapVerifier generalVerifier;
         private BeatmapVerifierContext context;
@@ -45,8 +47,10 @@ namespace osu.Game.Screens.Edit.Verify
             generalVerifier = new BeatmapVerifier();
             rulesetVerifier = beatmap.BeatmapInfo.Ruleset?.CreateInstance()?.CreateBeatmapVerifier();
 
+            interpretedDifficulty = verify.InterpretedDifficulty.GetBoundCopy();
+
             context = new BeatmapVerifierContext(workingBeatmap.Value);
-            context.InterpretedDifficulty.BindTo(verify.InterpretedDifficulty.GetBoundCopy());
+            context.InterpretedDifficulty.BindTo(interpretedDifficulty);
 
             RelativeSizeAxes = Axes.Both;
 

From b37cb3bdbeadefb2bba7a71575e8be9c535c54d3 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 13 May 2021 09:00:30 +0200
Subject: [PATCH 3400/3722] Change interpreted difficulty from bindable to
 regular value

There's no reason for why checks would need this to be bindable. A 1-directional binding is more appropriate.
---
 osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs |  5 ++---
 osu.Game/Screens/Edit/Verify/IssueList.cs        | 11 +++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs b/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs
index 59d43ba3d6..76b74cb993 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifierContext.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.Bindables;
 using osu.Game.Beatmaps;
 
 namespace osu.Game.Rulesets.Edit
@@ -20,12 +19,12 @@ namespace osu.Game.Rulesets.Edit
         /// <summary>
         /// The difficulty level which the current beatmap is considered to be.
         /// </summary>
-        public readonly Bindable<DifficultyRating> InterpretedDifficulty;
+        public DifficultyRating InterpretedDifficulty;
 
         public BeatmapVerifierContext(IWorkingBeatmap workingBeatmap, DifficultyRating difficultyRating = DifficultyRating.ExpertPlus)
         {
             WorkingBeatmap = workingBeatmap;
-            InterpretedDifficulty = new Bindable<DifficultyRating>(difficultyRating);
+            InterpretedDifficulty = difficultyRating;
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
index f150f4175b..abf22ead10 100644
--- a/osu.Game/Screens/Edit/Verify/IssueList.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueList.cs
@@ -35,8 +35,6 @@ namespace osu.Game.Screens.Edit.Verify
         [Resolved]
         private VerifyScreen verify { get; set; }
 
-        private Bindable<DifficultyRating> interpretedDifficulty;
-
         private IBeatmapVerifier rulesetVerifier;
         private BeatmapVerifier generalVerifier;
         private BeatmapVerifierContext context;
@@ -47,10 +45,11 @@ namespace osu.Game.Screens.Edit.Verify
             generalVerifier = new BeatmapVerifier();
             rulesetVerifier = beatmap.BeatmapInfo.Ruleset?.CreateInstance()?.CreateBeatmapVerifier();
 
-            interpretedDifficulty = verify.InterpretedDifficulty.GetBoundCopy();
-
-            context = new BeatmapVerifierContext(workingBeatmap.Value);
-            context.InterpretedDifficulty.BindTo(interpretedDifficulty);
+            context = new BeatmapVerifierContext(workingBeatmap.Value, verify.InterpretedDifficulty.Value);
+            verify.InterpretedDifficulty.BindValueChanged(change =>
+            {
+                context.InterpretedDifficulty = change.NewValue;
+            });
 
             RelativeSizeAxes = Axes.Both;
 

From 5818ed4c8c66bb749a83e700c16fde831ba56b4c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 16:41:36 +0900
Subject: [PATCH 3401/3722] Remove unused DI resolution

---
 osu.Game/Skinning/LegacyAccuracyCounter.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Skinning/LegacyAccuracyCounter.cs b/osu.Game/Skinning/LegacyAccuracyCounter.cs
index 3eea5d22d5..493107172f 100644
--- a/osu.Game/Skinning/LegacyAccuracyCounter.cs
+++ b/osu.Game/Skinning/LegacyAccuracyCounter.cs
@@ -12,9 +12,6 @@ namespace osu.Game.Skinning
 {
     public class LegacyAccuracyCounter : GameplayAccuracyCounter, ISkinnableComponent
     {
-        [Resolved]
-        private ISkinSource skin { get; set; }
-
         public LegacyAccuracyCounter()
         {
             Anchor = Anchor.TopRight;

From 19223ba01359b87ebb55b838d47fe6846fd58db4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 16:42:13 +0900
Subject: [PATCH 3402/3722] Remove left-over debug logging

---
 osu.Game/Skinning/SkinManager.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 91f3d0c7cf..fbe23482d7 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -194,9 +194,6 @@ namespace osu.Game.Skinning
                         ReplaceFile(skin.SkinInfo, oldFile, streamContent, oldFile.Filename);
                     else
                         AddFile(skin.SkinInfo, streamContent, filename);
-
-                    Logger.Log($"Saving out {filename} with {json.Length} bytes");
-                    Logger.Log(json);
                 }
             }
         }

From 9dfa48b22ed523f67bc4b29e7a497127b28d6280 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 16:42:43 +0900
Subject: [PATCH 3403/3722] Fix incorrect exception text

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

diff --git a/osu.Game/Skinning/SkinnableElementTargetContainer.cs b/osu.Game/Skinning/SkinnableElementTargetContainer.cs
index 2aea8c0281..c68dce4109 100644
--- a/osu.Game/Skinning/SkinnableElementTargetContainer.cs
+++ b/osu.Game/Skinning/SkinnableElementTargetContainer.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Skinning
                 throw new NotSupportedException("Attempting to add a new component to a target container which is not supported by the current skin.");
 
             if (!(component is Drawable drawable))
-                throw new ArgumentException("Provided argument must be of type {nameof(ISkinnableComponent)}.", nameof(drawable));
+                throw new ArgumentException($"Provided argument must be of type {nameof(Drawable)}.", nameof(drawable));
 
             content.Add(drawable);
             components.Add(component);

From dd6a06a302a7f38c3889829068589b1260cf944c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 16:43:42 +0900
Subject: [PATCH 3404/3722] Reword xmldoc to read better

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

diff --git a/osu.Game/Skinning/SkinnableTargetWrapper.cs b/osu.Game/Skinning/SkinnableTargetWrapper.cs
index 2e2ce32a6f..d8ad008448 100644
--- a/osu.Game/Skinning/SkinnableTargetWrapper.cs
+++ b/osu.Game/Skinning/SkinnableTargetWrapper.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Skinning
         /// <summary>
         /// Construct a wrapper with defaults that should be applied once.
         /// </summary>
-        /// <param name="applyDefaults">A function with default to apply after the initial layout (ie. consuming autosize)</param>
+        /// <param name="applyDefaults">A function to apply the default layout.</param>
         public SkinnableTargetWrapper(Action<Container> applyDefaults)
             : this()
         {

From cdcd31b546ac41806c0f7559d65dd9b24e6323d1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 17:03:17 +0900
Subject: [PATCH 3405/3722] Replace `ISkinSerialisable` with `IsEditable`
 property

---
 osu.Game/Screens/Play/HUD/SkinnableInfo.cs        |  4 ++--
 .../Skinning/Editor/SkinBlueprintContainer.cs     |  8 ++++++++
 osu.Game/Skinning/Editor/SkinComponentToolbox.cs  |  3 +++
 osu.Game/Skinning/ISkinSerialisable.cs            | 15 ---------------
 osu.Game/Skinning/ISkinnableComponent.cs          |  8 +++++++-
 osu.Game/Skinning/SkinManager.cs                  |  1 -
 osu.Game/Skinning/SkinnableTargetWrapper.cs       |  4 +++-
 7 files changed, 23 insertions(+), 20 deletions(-)
 delete mode 100644 osu.Game/Skinning/ISkinSerialisable.cs

diff --git a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
index 678885d096..a7c5c33f7d 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
@@ -15,7 +15,7 @@ using osuTK;
 namespace osu.Game.Screens.Play.HUD
 {
     /// <summary>
-    /// Serialised information governing custom changes to an <see cref="ISkinSerialisable"/>.
+    /// Serialised information governing custom changes to an <see cref="ISkinnableComponent"/>.
     /// </summary>
     [Serializable]
     public class SkinnableInfo : IJsonSerializable
@@ -55,7 +55,7 @@ namespace osu.Game.Screens.Play.HUD
 
             if (component is Container<Drawable> container)
             {
-                foreach (var child in container.OfType<ISkinSerialisable>().OfType<Drawable>())
+                foreach (var child in container.OfType<ISkinnableComponent>().OfType<Drawable>())
                     Children.Add(child.CreateSkinnableInfo());
             }
         }
diff --git a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
index 09bbf7ffd5..31f89ad0c2 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
@@ -81,6 +81,14 @@ namespace osu.Game.Skinning.Editor
             }
         }
 
+        protected override void AddBlueprintFor(ISkinnableComponent item)
+        {
+            if (!item.IsEditable)
+                return;
+
+            base.AddBlueprintFor(item);
+        }
+
         protected override SelectionHandler<ISkinnableComponent> CreateSelectionHandler() => new SkinSelectionHandler();
 
         protected override SelectionBlueprint<ISkinnableComponent> CreateBlueprintFor(ISkinnableComponent component)
diff --git a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
index a000204062..068b2058a6 100644
--- a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
+++ b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
@@ -78,6 +78,9 @@ namespace osu.Game.Skinning.Editor
 
                 Debug.Assert(instance != null);
 
+                if (!((ISkinnableComponent)instance).IsEditable)
+                    return null;
+
                 return new ToolboxComponentButton(instance);
             }
             catch
diff --git a/osu.Game/Skinning/ISkinSerialisable.cs b/osu.Game/Skinning/ISkinSerialisable.cs
deleted file mode 100644
index d1777512af..0000000000
--- a/osu.Game/Skinning/ISkinSerialisable.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 osu.Framework.Graphics;
-
-namespace osu.Game.Skinning
-{
-    /// <summary>
-    /// Denotes a drawable component which should be serialised as part of a skin.
-    /// Use <see cref="ISkinnableComponent"/> for components which should be mutable by the user / editor.
-    /// </summary>
-    public interface ISkinSerialisable : IDrawable
-    {
-    }
-}
diff --git a/osu.Game/Skinning/ISkinnableComponent.cs b/osu.Game/Skinning/ISkinnableComponent.cs
index e44c7be13d..65ac2d5849 100644
--- a/osu.Game/Skinning/ISkinnableComponent.cs
+++ b/osu.Game/Skinning/ISkinnableComponent.cs
@@ -1,12 +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.Graphics;
+
 namespace osu.Game.Skinning
 {
     /// <summary>
     /// Denotes a drawable which, as a drawable, can be adjusted via skinning specifications.
     /// </summary>
-    public interface ISkinnableComponent : ISkinSerialisable
+    public interface ISkinnableComponent : IDrawable
     {
+        /// <summary>
+        /// Whether this component should be editable by an end user.
+        /// </summary>
+        bool IsEditable => true;
     }
 }
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index fbe23482d7..7b27a7a816 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -19,7 +19,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
-using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
diff --git a/osu.Game/Skinning/SkinnableTargetWrapper.cs b/osu.Game/Skinning/SkinnableTargetWrapper.cs
index d8ad008448..28e8d585fc 100644
--- a/osu.Game/Skinning/SkinnableTargetWrapper.cs
+++ b/osu.Game/Skinning/SkinnableTargetWrapper.cs
@@ -13,8 +13,10 @@ namespace osu.Game.Skinning
     /// Will also optionally apply default cross-element layout dependencies when initialised from a non-deserialised source.
     /// </summary>
     [Serializable]
-    public class SkinnableTargetWrapper : Container, ISkinSerialisable
+    public class SkinnableTargetWrapper : Container, ISkinnableComponent
     {
+        public bool IsEditable => false;
+
         private readonly Action<Container> applyDefaults;
 
         /// <summary>

From 7921dc7ece64f04d37e8e96630a4d0f677d29fe9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 17:06:00 +0900
Subject: [PATCH 3406/3722] Rename `ISkinnableComponent` to
 `ISkinnableDrawable`

---
 .../Play/HUD/DefaultAccuracyCounter.cs        |  2 +-
 .../Screens/Play/HUD/DefaultComboCounter.cs   |  2 +-
 .../Screens/Play/HUD/DefaultHealthDisplay.cs  |  2 +-
 .../Screens/Play/HUD/DefaultScoreCounter.cs   |  2 +-
 .../Screens/Play/HUD/LegacyComboCounter.cs    |  2 +-
 osu.Game/Screens/Play/HUD/SkinnableInfo.cs    |  4 ++--
 osu.Game/Skinning/Editor/SkinBlueprint.cs     |  4 ++--
 .../Skinning/Editor/SkinBlueprintContainer.cs | 20 +++++++++----------
 .../Skinning/Editor/SkinComponentToolbox.cs   |  4 ++--
 osu.Game/Skinning/Editor/SkinEditor.cs        |  4 ++--
 .../Skinning/Editor/SkinSelectionHandler.cs   | 10 +++++-----
 ...ableComponent.cs => ISkinnableDrawable.cs} |  2 +-
 osu.Game/Skinning/ISkinnableTarget.cs         |  6 +++---
 osu.Game/Skinning/LegacyAccuracyCounter.cs    |  2 +-
 osu.Game/Skinning/LegacyHealthDisplay.cs      |  2 +-
 osu.Game/Skinning/LegacyScoreCounter.cs       |  2 +-
 .../SkinnableElementTargetContainer.cs        |  8 ++++----
 osu.Game/Skinning/SkinnableTargetWrapper.cs   |  2 +-
 18 files changed, 40 insertions(+), 40 deletions(-)
 rename osu.Game/Skinning/{ISkinnableComponent.cs => ISkinnableDrawable.cs} (90%)

diff --git a/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs b/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
index d8dff89b29..45ba05e036 100644
--- a/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs
@@ -7,7 +7,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class DefaultAccuracyCounter : GameplayAccuracyCounter, ISkinnableComponent
+    public class DefaultAccuracyCounter : GameplayAccuracyCounter, ISkinnableDrawable
     {
         [Resolved(canBeNull: true)]
         private HUDOverlay hud { get; set; }
diff --git a/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs b/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
index 13bd045fc0..c4575c5ad0 100644
--- a/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultComboCounter.cs
@@ -12,7 +12,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class DefaultComboCounter : RollingCounter<int>, ISkinnableComponent
+    public class DefaultComboCounter : RollingCounter<int>, ISkinnableDrawable
     {
         [Resolved(canBeNull: true)]
         private HUDOverlay hud { get; set; }
diff --git a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
index 241777244b..ed297f0ffc 100644
--- a/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultHealthDisplay.cs
@@ -17,7 +17,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class DefaultHealthDisplay : HealthDisplay, IHasAccentColour, ISkinnableComponent
+    public class DefaultHealthDisplay : HealthDisplay, IHasAccentColour, ISkinnableDrawable
     {
         /// <summary>
         /// The base opacity of the glow.
diff --git a/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs b/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
index bd18050dfb..16e3642181 100644
--- a/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs
@@ -8,7 +8,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play.HUD
 {
-    public class DefaultScoreCounter : GameplayScoreCounter, ISkinnableComponent
+    public class DefaultScoreCounter : GameplayScoreCounter, ISkinnableDrawable
     {
         public DefaultScoreCounter()
             : base(6)
diff --git a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
index 2565faf423..d64513d41e 100644
--- a/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/LegacyComboCounter.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Screens.Play.HUD
     /// <summary>
     /// Uses the 'x' symbol and has a pop-out effect while rolling over.
     /// </summary>
-    public class LegacyComboCounter : CompositeDrawable, ISkinnableComponent
+    public class LegacyComboCounter : CompositeDrawable, ISkinnableDrawable
     {
         public Bindable<int> Current { get; } = new BindableInt { MinValue = 0, };
 
diff --git a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
index a7c5c33f7d..e08044b14c 100644
--- a/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
+++ b/osu.Game/Screens/Play/HUD/SkinnableInfo.cs
@@ -15,7 +15,7 @@ using osuTK;
 namespace osu.Game.Screens.Play.HUD
 {
     /// <summary>
-    /// Serialised information governing custom changes to an <see cref="ISkinnableComponent"/>.
+    /// Serialised information governing custom changes to an <see cref="ISkinnableDrawable"/>.
     /// </summary>
     [Serializable]
     public class SkinnableInfo : IJsonSerializable
@@ -55,7 +55,7 @@ namespace osu.Game.Screens.Play.HUD
 
             if (component is Container<Drawable> container)
             {
-                foreach (var child in container.OfType<ISkinnableComponent>().OfType<Drawable>())
+                foreach (var child in container.OfType<ISkinnableDrawable>().OfType<Drawable>())
                     Children.Add(child.CreateSkinnableInfo());
             }
         }
diff --git a/osu.Game/Skinning/Editor/SkinBlueprint.cs b/osu.Game/Skinning/Editor/SkinBlueprint.cs
index b8dfdbad0a..4be9299699 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprint.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprint.cs
@@ -13,7 +13,7 @@ using osuTK;
 
 namespace osu.Game.Skinning.Editor
 {
-    public class SkinBlueprint : SelectionBlueprint<ISkinnableComponent>
+    public class SkinBlueprint : SelectionBlueprint<ISkinnableDrawable>
     {
         private Container box;
 
@@ -26,7 +26,7 @@ namespace osu.Game.Skinning.Editor
 
         protected override bool ShouldBeAlive => (drawable.IsAlive && Item.IsPresent) || (AlwaysShowWhenSelected && State == SelectionState.Selected);
 
-        public SkinBlueprint(ISkinnableComponent component)
+        public SkinBlueprint(ISkinnableDrawable component)
             : base(component)
         {
         }
diff --git a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
index 31f89ad0c2..c0cc2ab40e 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprintContainer.cs
@@ -15,11 +15,11 @@ using osu.Game.Screens.Edit.Compose.Components;
 
 namespace osu.Game.Skinning.Editor
 {
-    public class SkinBlueprintContainer : BlueprintContainer<ISkinnableComponent>
+    public class SkinBlueprintContainer : BlueprintContainer<ISkinnableDrawable>
     {
         private readonly Drawable target;
 
-        private readonly List<BindableList<ISkinnableComponent>> targetComponents = new List<BindableList<ISkinnableComponent>>();
+        private readonly List<BindableList<ISkinnableDrawable>> targetComponents = new List<BindableList<ISkinnableDrawable>>();
 
         public SkinBlueprintContainer(Drawable target)
         {
@@ -49,7 +49,7 @@ namespace osu.Game.Skinning.Editor
 
             foreach (var targetContainer in targetContainers)
             {
-                var bindableList = new BindableList<ISkinnableComponent> { BindTarget = targetContainer.Components };
+                var bindableList = new BindableList<ISkinnableDrawable> { BindTarget = targetContainer.Components };
                 bindableList.BindCollectionChanged(componentsChanged, true);
 
                 targetComponents.Add(bindableList);
@@ -61,27 +61,27 @@ namespace osu.Game.Skinning.Editor
             switch (e.Action)
             {
                 case NotifyCollectionChangedAction.Add:
-                    foreach (var item in e.NewItems.Cast<ISkinnableComponent>())
+                    foreach (var item in e.NewItems.Cast<ISkinnableDrawable>())
                         AddBlueprintFor(item);
                     break;
 
                 case NotifyCollectionChangedAction.Remove:
                 case NotifyCollectionChangedAction.Reset:
-                    foreach (var item in e.OldItems.Cast<ISkinnableComponent>())
+                    foreach (var item in e.OldItems.Cast<ISkinnableDrawable>())
                         RemoveBlueprintFor(item);
                     break;
 
                 case NotifyCollectionChangedAction.Replace:
-                    foreach (var item in e.OldItems.Cast<ISkinnableComponent>())
+                    foreach (var item in e.OldItems.Cast<ISkinnableDrawable>())
                         RemoveBlueprintFor(item);
 
-                    foreach (var item in e.NewItems.Cast<ISkinnableComponent>())
+                    foreach (var item in e.NewItems.Cast<ISkinnableDrawable>())
                         AddBlueprintFor(item);
                     break;
             }
         }
 
-        protected override void AddBlueprintFor(ISkinnableComponent item)
+        protected override void AddBlueprintFor(ISkinnableDrawable item)
         {
             if (!item.IsEditable)
                 return;
@@ -89,9 +89,9 @@ namespace osu.Game.Skinning.Editor
             base.AddBlueprintFor(item);
         }
 
-        protected override SelectionHandler<ISkinnableComponent> CreateSelectionHandler() => new SkinSelectionHandler();
+        protected override SelectionHandler<ISkinnableDrawable> CreateSelectionHandler() => new SkinSelectionHandler();
 
-        protected override SelectionBlueprint<ISkinnableComponent> CreateBlueprintFor(ISkinnableComponent component)
+        protected override SelectionBlueprint<ISkinnableDrawable> CreateBlueprintFor(ISkinnableDrawable component)
             => new SkinBlueprint(component);
     }
 }
diff --git a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
index 068b2058a6..8536cba139 100644
--- a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
+++ b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Skinning.Editor
                 Spacing = new Vector2(20)
             };
 
-            var skinnableTypes = typeof(OsuGame).Assembly.GetTypes().Where(t => typeof(ISkinnableComponent).IsAssignableFrom(t)).ToArray();
+            var skinnableTypes = typeof(OsuGame).Assembly.GetTypes().Where(t => typeof(ISkinnableDrawable).IsAssignableFrom(t)).ToArray();
 
             foreach (var type in skinnableTypes)
             {
@@ -78,7 +78,7 @@ namespace osu.Game.Skinning.Editor
 
                 Debug.Assert(instance != null);
 
-                if (!((ISkinnableComponent)instance).IsEditable)
+                if (!((ISkinnableDrawable)instance).IsEditable)
                     return null;
 
                 return new ToolboxComponentButton(instance);
diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 72dacad310..bf9a6464d0 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Skinning.Editor
     {
         public const double TRANSITION_DURATION = 500;
 
-        public readonly BindableList<ISkinnableComponent> SelectedComponents = new BindableList<ISkinnableComponent>();
+        public readonly BindableList<ISkinnableDrawable> SelectedComponents = new BindableList<ISkinnableDrawable>();
 
         protected override bool StartHidden => true;
 
@@ -165,7 +165,7 @@ namespace osu.Game.Skinning.Editor
 
         private void placeComponent(Type type)
         {
-            if (!(Activator.CreateInstance(type) is ISkinnableComponent component))
+            if (!(Activator.CreateInstance(type) is ISkinnableDrawable component))
                 throw new InvalidOperationException("Attempted to instantiate a component for placement which was not an {typeof(ISkinnableComponent)}.");
 
             getTarget(SkinnableTarget.MainHUDComponents)?.Add(component);
diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index cf5ece03e9..8ca98c794f 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -14,7 +14,7 @@ using osuTK;
 
 namespace osu.Game.Skinning.Editor
 {
-    public class SkinSelectionHandler : SelectionHandler<ISkinnableComponent>
+    public class SkinSelectionHandler : SelectionHandler<ISkinnableDrawable>
     {
         public override bool HandleRotation(float angle)
         {
@@ -36,7 +36,7 @@ namespace osu.Game.Skinning.Editor
             return true;
         }
 
-        public override bool HandleMovement(MoveSelectionEvent<ISkinnableComponent> moveEvent)
+        public override bool HandleMovement(MoveSelectionEvent<ISkinnableDrawable> moveEvent)
         {
             foreach (var c in SelectedBlueprints)
             {
@@ -57,7 +57,7 @@ namespace osu.Game.Skinning.Editor
             SelectionBox.CanReverse = false;
         }
 
-        protected override void DeleteItems(IEnumerable<ISkinnableComponent> items)
+        protected override void DeleteItems(IEnumerable<ISkinnableDrawable> items)
         {
             foreach (var i in items)
             {
@@ -66,7 +66,7 @@ namespace osu.Game.Skinning.Editor
             }
         }
 
-        protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint<ISkinnableComponent>> selection)
+        protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint<ISkinnableDrawable>> selection)
         {
             yield return new OsuMenuItem("Anchor")
             {
@@ -131,7 +131,7 @@ namespace osu.Game.Skinning.Editor
 
         public class AnchorMenuItem : TernaryStateMenuItem
         {
-            public AnchorMenuItem(Anchor anchor, IEnumerable<SelectionBlueprint<ISkinnableComponent>> selection, Action<TernaryState> action)
+            public AnchorMenuItem(Anchor anchor, IEnumerable<SelectionBlueprint<ISkinnableDrawable>> selection, Action<TernaryState> action)
                 : base(anchor.ToString(), getNextState, MenuItemType.Standard, action)
             {
             }
diff --git a/osu.Game/Skinning/ISkinnableComponent.cs b/osu.Game/Skinning/ISkinnableDrawable.cs
similarity index 90%
rename from osu.Game/Skinning/ISkinnableComponent.cs
rename to osu.Game/Skinning/ISkinnableDrawable.cs
index 65ac2d5849..d42b6f71b0 100644
--- a/osu.Game/Skinning/ISkinnableComponent.cs
+++ b/osu.Game/Skinning/ISkinnableDrawable.cs
@@ -8,7 +8,7 @@ namespace osu.Game.Skinning
     /// <summary>
     /// Denotes a drawable which, as a drawable, can be adjusted via skinning specifications.
     /// </summary>
-    public interface ISkinnableComponent : IDrawable
+    public interface ISkinnableDrawable : IDrawable
     {
         /// <summary>
         /// Whether this component should be editable by an end user.
diff --git a/osu.Game/Skinning/ISkinnableTarget.cs b/osu.Game/Skinning/ISkinnableTarget.cs
index ab3c24a1e2..3773b5be24 100644
--- a/osu.Game/Skinning/ISkinnableTarget.cs
+++ b/osu.Game/Skinning/ISkinnableTarget.cs
@@ -6,7 +6,7 @@ using osu.Framework.Bindables;
 namespace osu.Game.Skinning
 {
     /// <summary>
-    /// Denotes a container which can house <see cref="ISkinnableComponent"/>s.
+    /// Denotes a container which can house <see cref="ISkinnableDrawable"/>s.
     /// </summary>
     public interface ISkinnableTarget
     {
@@ -18,7 +18,7 @@ namespace osu.Game.Skinning
         /// <summary>
         /// A bindable list of components which are being tracked by this skinnable target.
         /// </summary>
-        IBindableList<ISkinnableComponent> Components { get; }
+        IBindableList<ISkinnableDrawable> Components { get; }
 
         /// <summary>
         /// Reload this target from the current skin.
@@ -28,6 +28,6 @@ namespace osu.Game.Skinning
         /// <summary>
         /// Add the provided item to this target.
         /// </summary>
-        void Add(ISkinnableComponent drawable);
+        void Add(ISkinnableDrawable drawable);
     }
 }
diff --git a/osu.Game/Skinning/LegacyAccuracyCounter.cs b/osu.Game/Skinning/LegacyAccuracyCounter.cs
index 493107172f..16562d9571 100644
--- a/osu.Game/Skinning/LegacyAccuracyCounter.cs
+++ b/osu.Game/Skinning/LegacyAccuracyCounter.cs
@@ -10,7 +10,7 @@ using osuTK;
 
 namespace osu.Game.Skinning
 {
-    public class LegacyAccuracyCounter : GameplayAccuracyCounter, ISkinnableComponent
+    public class LegacyAccuracyCounter : GameplayAccuracyCounter, ISkinnableDrawable
     {
         public LegacyAccuracyCounter()
         {
diff --git a/osu.Game/Skinning/LegacyHealthDisplay.cs b/osu.Game/Skinning/LegacyHealthDisplay.cs
index dfb6ca1a64..c601adc3a0 100644
--- a/osu.Game/Skinning/LegacyHealthDisplay.cs
+++ b/osu.Game/Skinning/LegacyHealthDisplay.cs
@@ -16,7 +16,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Skinning
 {
-    public class LegacyHealthDisplay : HealthDisplay, ISkinnableComponent
+    public class LegacyHealthDisplay : HealthDisplay, ISkinnableDrawable
     {
         private const double epic_cutoff = 0.5;
 
diff --git a/osu.Game/Skinning/LegacyScoreCounter.cs b/osu.Game/Skinning/LegacyScoreCounter.cs
index 8aa48da453..64ea03d59c 100644
--- a/osu.Game/Skinning/LegacyScoreCounter.cs
+++ b/osu.Game/Skinning/LegacyScoreCounter.cs
@@ -8,7 +8,7 @@ using osuTK;
 
 namespace osu.Game.Skinning
 {
-    public class LegacyScoreCounter : GameplayScoreCounter, ISkinnableComponent
+    public class LegacyScoreCounter : GameplayScoreCounter, ISkinnableDrawable
     {
         protected override double RollingDuration => 1000;
         protected override Easing RollingEasing => Easing.Out;
diff --git a/osu.Game/Skinning/SkinnableElementTargetContainer.cs b/osu.Game/Skinning/SkinnableElementTargetContainer.cs
index c68dce4109..2a76d3bf7c 100644
--- a/osu.Game/Skinning/SkinnableElementTargetContainer.cs
+++ b/osu.Game/Skinning/SkinnableElementTargetContainer.cs
@@ -17,9 +17,9 @@ namespace osu.Game.Skinning
 
         public SkinnableTarget Target { get; }
 
-        public IBindableList<ISkinnableComponent> Components => components;
+        public IBindableList<ISkinnableDrawable> Components => components;
 
-        private readonly BindableList<ISkinnableComponent> components = new BindableList<ISkinnableComponent>();
+        private readonly BindableList<ISkinnableDrawable> components = new BindableList<ISkinnableDrawable>();
 
         public SkinnableElementTargetContainer(SkinnableTarget target)
         {
@@ -41,7 +41,7 @@ namespace osu.Game.Skinning
                 LoadComponentAsync(content, wrapper =>
                 {
                     AddInternal(wrapper);
-                    components.AddRange(wrapper.Children.OfType<ISkinnableComponent>());
+                    components.AddRange(wrapper.Children.OfType<ISkinnableDrawable>());
                 });
             }
         }
@@ -52,7 +52,7 @@ namespace osu.Game.Skinning
         /// <param name="component">The component to add.</param>
         /// <exception cref="NotSupportedException">Thrown when attempting to add an element to a target which is not supported by the current skin.</exception>
         /// <exception cref="ArgumentException">Thrown if the provided instance is not a <see cref="Drawable"/>.</exception>
-        public void Add(ISkinnableComponent component)
+        public void Add(ISkinnableDrawable component)
         {
             if (content == null)
                 throw new NotSupportedException("Attempting to add a new component to a target container which is not supported by the current skin.");
diff --git a/osu.Game/Skinning/SkinnableTargetWrapper.cs b/osu.Game/Skinning/SkinnableTargetWrapper.cs
index 28e8d585fc..58ecac71ab 100644
--- a/osu.Game/Skinning/SkinnableTargetWrapper.cs
+++ b/osu.Game/Skinning/SkinnableTargetWrapper.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Skinning
     /// Will also optionally apply default cross-element layout dependencies when initialised from a non-deserialised source.
     /// </summary>
     [Serializable]
-    public class SkinnableTargetWrapper : Container, ISkinnableComponent
+    public class SkinnableTargetWrapper : Container, ISkinnableDrawable
     {
         public bool IsEditable => false;
 

From 106fa97a11080329a6097430590866d827dfe1a5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 17:07:38 +0900
Subject: [PATCH 3407/3722] Rename `SkinnableElementTargetContainer` to
 `SkinnableTargetContainer`

---
 osu.Game/Screens/Play/HUDOverlay.cs                           | 4 ++--
 osu.Game/Skinning/Editor/SkinEditor.cs                        | 4 ++--
 osu.Game/Skinning/Skin.cs                                     | 4 ++--
 ...eElementTargetContainer.cs => SkinnableTargetContainer.cs} | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename osu.Game/Skinning/{SkinnableElementTargetContainer.cs => SkinnableTargetContainer.cs} (94%)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 887346b5df..a10e91dae8 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Screens.Play
 
         private bool holdingForHUD;
 
-        private readonly SkinnableElementTargetContainer mainComponents;
+        private readonly SkinnableTargetContainer mainComponents;
 
         private IEnumerable<Drawable> hideTargets => new Drawable[] { visibilityContainer, KeyCounter, topRightElements };
 
@@ -97,7 +97,7 @@ namespace osu.Game.Screens.Play
                                     RelativeSizeAxes = Axes.Both,
                                     Children = new Drawable[]
                                     {
-                                        mainComponents = new SkinnableElementTargetContainer(SkinnableTarget.MainHUDComponents)
+                                        mainComponents = new SkinnableTargetContainer(SkinnableTarget.MainHUDComponents)
                                         {
                                             RelativeSizeAxes = Axes.Both,
                                         },
diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index bf9a6464d0..67285987ef 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -181,7 +181,7 @@ namespace osu.Game.Skinning.Editor
 
         private void revert()
         {
-            SkinnableElementTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableElementTargetContainer>().ToArray();
+            SkinnableTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableTargetContainer>().ToArray();
 
             foreach (var t in targetContainers)
             {
@@ -194,7 +194,7 @@ namespace osu.Game.Skinning.Editor
 
         private void save()
         {
-            SkinnableElementTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableElementTargetContainer>().ToArray();
+            SkinnableTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableTargetContainer>().ToArray();
 
             foreach (var t in targetContainers)
                 currentSkin.Value.UpdateDrawableTarget(t);
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index 4890524b90..3a16cb5818 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Skinning
         /// Remove all stored customisations for the provided target.
         /// </summary>
         /// <param name="targetContainer">The target container to reset.</param>
-        public void ResetDrawableTarget(SkinnableElementTargetContainer targetContainer)
+        public void ResetDrawableTarget(SkinnableTargetContainer targetContainer)
         {
             DrawableComponentInfo.Remove(targetContainer.Target);
         }
@@ -74,7 +74,7 @@ namespace osu.Game.Skinning
         /// Update serialised information for the provided target.
         /// </summary>
         /// <param name="targetContainer">The target container to serialise to this skin.</param>
-        public void UpdateDrawableTarget(SkinnableElementTargetContainer targetContainer)
+        public void UpdateDrawableTarget(SkinnableTargetContainer targetContainer)
         {
             DrawableComponentInfo[targetContainer.Target] = targetContainer.CreateSkinnableInfo().ToArray();
         }
diff --git a/osu.Game/Skinning/SkinnableElementTargetContainer.cs b/osu.Game/Skinning/SkinnableTargetContainer.cs
similarity index 94%
rename from osu.Game/Skinning/SkinnableElementTargetContainer.cs
rename to osu.Game/Skinning/SkinnableTargetContainer.cs
index 2a76d3bf7c..daf54277fd 100644
--- a/osu.Game/Skinning/SkinnableElementTargetContainer.cs
+++ b/osu.Game/Skinning/SkinnableTargetContainer.cs
@@ -11,7 +11,7 @@ using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Skinning
 {
-    public class SkinnableElementTargetContainer : SkinReloadableDrawable, ISkinnableTarget
+    public class SkinnableTargetContainer : SkinReloadableDrawable, ISkinnableTarget
     {
         private SkinnableTargetWrapper content;
 
@@ -21,7 +21,7 @@ namespace osu.Game.Skinning
 
         private readonly BindableList<ISkinnableDrawable> components = new BindableList<ISkinnableDrawable>();
 
-        public SkinnableElementTargetContainer(SkinnableTarget target)
+        public SkinnableTargetContainer(SkinnableTarget target)
         {
             Target = target;
         }

From 0959e7156a27a29b4a7a8fa041e418e4cc84f577 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 17:22:05 +0900
Subject: [PATCH 3408/3722] Remove outdated TODO

---
 osu.Game/Skinning/SkinManager.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 7b27a7a816..5793edda30 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -180,7 +180,6 @@ namespace osu.Game.Skinning
 
             foreach (var drawableInfo in skin.DrawableComponentInfo)
             {
-                // todo: the OfType() call can be removed with better IDrawable support.
                 string json = JsonConvert.SerializeObject(drawableInfo.Value, new JsonSerializerSettings { Formatting = Formatting.Indented });
 
                 using (var streamContent = new MemoryStream(Encoding.UTF8.GetBytes(json)))

From 3ea469813c8cc95396d020a1f145cf0d2c67040e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 17:25:51 +0900
Subject: [PATCH 3409/3722] Use interface in place of
 `SkinnableTargetContainer`

---
 osu.Game/Skinning/ISkinnableTarget.cs         | 11 +++++++++++
 osu.Game/Skinning/Skin.cs                     |  4 ++--
 osu.Game/Skinning/SkinnableTargetContainer.cs |  9 ---------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Skinning/ISkinnableTarget.cs b/osu.Game/Skinning/ISkinnableTarget.cs
index 3773b5be24..ba3a9fe228 100644
--- a/osu.Game/Skinning/ISkinnableTarget.cs
+++ b/osu.Game/Skinning/ISkinnableTarget.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.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Extensions;
+using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Skinning
 {
@@ -20,6 +25,12 @@ namespace osu.Game.Skinning
         /// </summary>
         IBindableList<ISkinnableDrawable> Components { get; }
 
+        /// <summary>
+        /// Serialise all children as <see cref="SkinnableInfo"/>.
+        /// </summary>
+        /// <returns>The serialised content.</returns>
+        IEnumerable<SkinnableInfo> CreateSkinnableInfo() => Components.Select(d => ((Drawable)d).CreateSkinnableInfo());
+
         /// <summary>
         /// Reload this target from the current skin.
         /// </summary>
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index 3a16cb5818..0ceca3925e 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Skinning
         /// Remove all stored customisations for the provided target.
         /// </summary>
         /// <param name="targetContainer">The target container to reset.</param>
-        public void ResetDrawableTarget(SkinnableTargetContainer targetContainer)
+        public void ResetDrawableTarget(ISkinnableTarget targetContainer)
         {
             DrawableComponentInfo.Remove(targetContainer.Target);
         }
@@ -74,7 +74,7 @@ namespace osu.Game.Skinning
         /// Update serialised information for the provided target.
         /// </summary>
         /// <param name="targetContainer">The target container to serialise to this skin.</param>
-        public void UpdateDrawableTarget(SkinnableTargetContainer targetContainer)
+        public void UpdateDrawableTarget(ISkinnableTarget targetContainer)
         {
             DrawableComponentInfo[targetContainer.Target] = targetContainer.CreateSkinnableInfo().ToArray();
         }
diff --git a/osu.Game/Skinning/SkinnableTargetContainer.cs b/osu.Game/Skinning/SkinnableTargetContainer.cs
index daf54277fd..52e86f5d86 100644
--- a/osu.Game/Skinning/SkinnableTargetContainer.cs
+++ b/osu.Game/Skinning/SkinnableTargetContainer.cs
@@ -2,12 +2,9 @@
 // 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.Graphics;
-using osu.Game.Extensions;
-using osu.Game.Screens.Play.HUD;
 
 namespace osu.Game.Skinning
 {
@@ -64,12 +61,6 @@ namespace osu.Game.Skinning
             components.Add(component);
         }
 
-        /// <summary>
-        /// Serialise all children as <see cref="SkinnableInfo"/>.
-        /// </summary>
-        /// <returns>The serialised content.</returns>
-        public IEnumerable<SkinnableInfo> CreateSkinnableInfo() => components.Select(d => ((Drawable)d).CreateSkinnableInfo());
-
         protected override void SkinChanged(ISkinSource skin, bool allowFallback)
         {
             base.SkinChanged(skin, allowFallback);

From ebce3fd3c7d408541b39b2fa37df45d82d057a08 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 17:29:11 +0900
Subject: [PATCH 3410/3722] Use `ScheduleAfterChildren` to better match comment

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

diff --git a/osu.Game/Skinning/SkinnableTargetWrapper.cs b/osu.Game/Skinning/SkinnableTargetWrapper.cs
index 58ecac71ab..664e8da480 100644
--- a/osu.Game/Skinning/SkinnableTargetWrapper.cs
+++ b/osu.Game/Skinning/SkinnableTargetWrapper.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Skinning
             base.LoadComplete();
 
             // schedule is required to allow children to run their LoadComplete and take on their correct sizes.
-            Schedule(() => applyDefaults?.Invoke(this));
+            ScheduleAfterChildren(() => applyDefaults?.Invoke(this));
         }
     }
 }

From 1cda55393ed7b25874c8a3fe7bf77dc33b136035 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 17:51:57 +0900
Subject: [PATCH 3411/3722] Add aspect ratio locking and flip support to skin
 editor

---
 .../Skinning/Editor/SkinSelectionHandler.cs   | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index ad783a9c0e..3dc0ca340b 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Extensions;
@@ -36,6 +37,20 @@ namespace osu.Game.Skinning.Editor
             return true;
         }
 
+        public override bool HandleFlip(Direction direction)
+        {
+            // TODO: this is temporary as well.
+            foreach (var c in SelectedBlueprints)
+            {
+                ((Drawable)c.Item).Scale *= new Vector2(
+                    direction == Direction.Horizontal ? -1 : 1,
+                    direction == Direction.Vertical ? -1 : 1
+                );
+            }
+
+            return true;
+        }
+
         public override bool HandleMovement(MoveSelectionEvent<ISkinnableComponent> moveEvent)
         {
             foreach (var c in SelectedBlueprints)
@@ -116,6 +131,15 @@ namespace osu.Game.Skinning.Editor
             // reverse the scale direction if dragging from top or left.
             if ((reference & Anchor.x0) > 0) scale.X = -scale.X;
             if ((reference & Anchor.y0) > 0) scale.Y = -scale.Y;
+
+            // for now aspect lock scale adjustments that occur at corners.
+            if (!reference.HasFlagFast(Anchor.x1) && !reference.HasFlagFast(Anchor.y1))
+            {
+                if (reference.HasFlagFast(Anchor.x0) || reference.HasFlagFast(Anchor.x2))
+                    scale.Y = scale.X;
+                else
+                    scale.X = scale.Y;
+            }
         }
 
         public class AnchorMenuItem : TernaryStateMenuItem

From 9f8e6979dd90e23bf5b7936bb536eeb312fbb3f1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 18:00:25 +0900
Subject: [PATCH 3412/3722] Fix display of skin blueprints when flipped

---
 osu.Game/Skinning/Editor/SkinBlueprint.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/Editor/SkinBlueprint.cs b/osu.Game/Skinning/Editor/SkinBlueprint.cs
index 58fa255508..1d029c39d6 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprint.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprint.cs
@@ -112,8 +112,13 @@ namespace osu.Game.Skinning.Editor
             drawableQuad = drawable.ScreenSpaceDrawQuad;
             var quad = ToLocalSpace(drawable.ScreenSpaceDrawQuad);
 
-            box.Position = quad.TopLeft;
+            box.Position = new Vector2(
+                drawable.Scale.X < 0 ? quad.TopRight.X : quad.TopLeft.X,
+                drawable.Scale.Y < 0 ? quad.BottomLeft.Y : quad.TopLeft.Y
+            );
+
             box.Size = quad.Size;
+
             box.Rotation = drawable.Rotation;
         }
 

From 9a061ad80b38eea677eed6bb235951c8f035bb6b Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 5 May 2021 20:27:28 +0200
Subject: [PATCH 3413/3722] Extract directory selection logic of migration
 screen to DirectorySelectScreen.

---
 .../Maintenance/DirectorySelectScreen.cs      | 115 ++++++++++++++++++
 .../Maintenance/MigrationSelectScreen.cs      | 105 +++-------------
 2 files changed, 130 insertions(+), 90 deletions(-)
 create mode 100644 osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
new file mode 100644
index 0000000000..278c1ab20d
--- /dev/null
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
@@ -0,0 +1,115 @@
+// Copyright (c) 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 System.IO;
+using osu.Framework.Allocation;
+using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Screens;
+using osuTK;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Framework.Screens;
+
+namespace osu.Game.Overlays.Settings.Sections.Maintenance
+{
+    public abstract class DirectorySelectScreen : OsuScreen
+    {
+        private TriangleButton selectionButton;
+
+        protected DirectorySelector DirectorySelector { get; private set; }
+
+        protected override OverlayActivation InitialOverlayActivationMode => OverlayActivation.Disabled;
+
+        protected abstract OsuSpriteText CreateHeader();
+
+        /// <summary>
+        /// Called upon selection of a directory by the user.
+        /// </summary>
+        /// <param name="directory">The selected directory</param>
+        protected abstract void OnSelection(DirectoryInfo directory);
+
+        protected virtual bool IsValidDirectory(DirectoryInfo info) => info != null;
+
+        public override bool AllowExternalScreenChange => false;
+
+        public override bool DisallowExternalBeatmapRulesetChanges => true;
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            InternalChild = new Container
+            {
+                Masking = true,
+                CornerRadius = 10,
+                RelativeSizeAxes = Axes.Both,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Size = new Vector2(0.5f, 0.8f),
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = colours.GreySeafoamDark
+                    },
+                    new GridContainer
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        RowDimensions = new[]
+                        {
+                            new Dimension(),
+                            new Dimension(GridSizeMode.Relative, 0.8f),
+                            new Dimension(),
+                        },
+                        Content = new[]
+                        {
+                            new Drawable[]
+                            {
+                                CreateHeader().With(header =>
+                                {
+                                    header.Origin = Anchor.Centre;
+                                    header.Anchor = Anchor.Centre;
+                                })
+                            },
+                            new Drawable[]
+                            {
+                                DirectorySelector = new DirectorySelector
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                }
+                            },
+                            new Drawable[]
+                            {
+                                selectionButton = new TriangleButton
+                                {
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    Width = 300,
+                                    Text = "Select directory",
+                                    Action = () => OnSelection(DirectorySelector.CurrentPath.Value)
+                                },
+                            }
+                        }
+                    }
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            DirectorySelector.CurrentPath.BindValueChanged(e => selectionButton.Enabled.Value = IsValidDirectory(e.NewValue), true);
+            base.LoadComplete();
+        }
+
+        public override void OnSuspending(IScreen next)
+        {
+            base.OnSuspending(next);
+
+            this.FadeOut(250);
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
index ad540e3691..1f14d0991d 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
@@ -4,109 +4,28 @@
 using System;
 using System.IO;
 using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Graphics.UserInterfaceV2;
-using osu.Game.Screens;
-using osuTK;
 
 namespace osu.Game.Overlays.Settings.Sections.Maintenance
 {
-    public class MigrationSelectScreen : OsuScreen
+    public class MigrationSelectScreen : DirectorySelectScreen
     {
-        private DirectorySelector directorySelector;
+        [Resolved]
+        private Storage storage { get; set; }
 
-        public override bool AllowExternalScreenChange => false;
-
-        public override bool DisallowExternalBeatmapRulesetChanges => true;
-
-        public override bool HideOverlaysOnEnter => true;
-
-        [BackgroundDependencyLoader(true)]
-        private void load(OsuGame game, Storage storage, OsuColour colours)
+        protected override OsuSpriteText CreateHeader() => new OsuSpriteText
         {
-            game?.Toolbar.Hide();
+            Text = "Please select a new location",
+            Font = OsuFont.Default.With(size: 40)
+        };
 
-            // begin selection in the parent directory of the current storage location
-            var initialPath = new DirectoryInfo(storage.GetFullPath(string.Empty)).Parent?.FullName;
-
-            InternalChild = new Container
-            {
-                Masking = true,
-                CornerRadius = 10,
-                RelativeSizeAxes = Axes.Both,
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Size = new Vector2(0.5f, 0.8f),
-                Children = new Drawable[]
-                {
-                    new Box
-                    {
-                        Colour = colours.GreySeafoamDark,
-                        RelativeSizeAxes = Axes.Both,
-                    },
-                    new GridContainer
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        RowDimensions = new[]
-                        {
-                            new Dimension(),
-                            new Dimension(GridSizeMode.Relative, 0.8f),
-                            new Dimension(),
-                        },
-                        Content = new[]
-                        {
-                            new Drawable[]
-                            {
-                                new OsuSpriteText
-                                {
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                    Text = "Please select a new location",
-                                    Font = OsuFont.Default.With(size: 40)
-                                },
-                            },
-                            new Drawable[]
-                            {
-                                directorySelector = new DirectorySelector(initialPath)
-                                {
-                                    RelativeSizeAxes = Axes.Both,
-                                }
-                            },
-                            new Drawable[]
-                            {
-                                new TriangleButton
-                                {
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                    Width = 300,
-                                    Text = "Begin folder migration",
-                                    Action = start
-                                },
-                            }
-                        }
-                    }
-                }
-            };
-        }
-
-        public override void OnSuspending(IScreen next)
+        protected override void OnSelection(DirectoryInfo directory)
         {
-            base.OnSuspending(next);
-
-            this.FadeOut(250);
-        }
-
-        private void start()
-        {
-            var target = directorySelector.CurrentPath.Value;
+            var target = directory;
 
             try
             {
@@ -123,6 +42,12 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
             BeginMigration(target);
         }
 
+        protected override void LoadComplete()
+        {
+            DirectorySelector.CurrentPath.Value = new DirectoryInfo(storage.GetFullPath(string.Empty)).Parent;
+            base.LoadComplete();
+        }
+
         protected virtual void BeginMigration(DirectoryInfo target) => this.Push(new MigrationRunScreen(target));
     }
 }

From 4bb0e6b7d53bca6188470600b5ca3d6d1b007e65 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 5 May 2021 22:13:25 +0200
Subject: [PATCH 3414/3722] Create InitialPath property.

---
 .../Sections/Maintenance/DirectorySelectScreen.cs         | 5 +++++
 .../Sections/Maintenance/MigrationSelectScreen.cs         | 8 ++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
index 278c1ab20d..a6ae3d6132 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
@@ -34,6 +34,8 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
         protected virtual bool IsValidDirectory(DirectoryInfo info) => info != null;
 
+        protected virtual DirectoryInfo InitialPath => null;
+
         public override bool AllowExternalScreenChange => false;
 
         public override bool DisallowExternalBeatmapRulesetChanges => true;
@@ -101,6 +103,9 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
         protected override void LoadComplete()
         {
+            if (InitialPath != null)
+                DirectorySelector.CurrentPath.Value = InitialPath;
+
             DirectorySelector.CurrentPath.BindValueChanged(e => selectionButton.Enabled.Value = IsValidDirectory(e.NewValue), true);
             base.LoadComplete();
         }
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
index 1f14d0991d..cfbb7d6593 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
@@ -17,6 +17,8 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
         [Resolved]
         private Storage storage { get; set; }
 
+        protected override DirectoryInfo InitialPath => new DirectoryInfo(storage.GetFullPath(string.Empty)).Parent;
+
         protected override OsuSpriteText CreateHeader() => new OsuSpriteText
         {
             Text = "Please select a new location",
@@ -42,12 +44,6 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
             BeginMigration(target);
         }
 
-        protected override void LoadComplete()
-        {
-            DirectorySelector.CurrentPath.Value = new DirectoryInfo(storage.GetFullPath(string.Empty)).Parent;
-            base.LoadComplete();
-        }
-
         protected virtual void BeginMigration(DirectoryInfo target) => this.Push(new MigrationRunScreen(target));
     }
 }

From d3cc418961462f9961ba8551e18671c7046c92ed Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Thu, 6 May 2021 11:12:19 +0200
Subject: [PATCH 3415/3722] Privatize DirectorySelector.

---
 .../Sections/Maintenance/DirectorySelectScreen.cs      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
index a6ae3d6132..c08323e67c 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
     {
         private TriangleButton selectionButton;
 
-        protected DirectorySelector DirectorySelector { get; private set; }
+        private DirectorySelector directorySelector;
 
         protected override OverlayActivation InitialOverlayActivationMode => OverlayActivation.Disabled;
 
@@ -79,7 +79,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                             },
                             new Drawable[]
                             {
-                                DirectorySelector = new DirectorySelector
+                                directorySelector = new DirectorySelector
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                 }
@@ -92,7 +92,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                                     Origin = Anchor.Centre,
                                     Width = 300,
                                     Text = "Select directory",
-                                    Action = () => OnSelection(DirectorySelector.CurrentPath.Value)
+                                    Action = () => OnSelection(directorySelector.CurrentPath.Value)
                                 },
                             }
                         }
@@ -104,9 +104,9 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
         protected override void LoadComplete()
         {
             if (InitialPath != null)
-                DirectorySelector.CurrentPath.Value = InitialPath;
+                directorySelector.CurrentPath.Value = InitialPath;
 
-            DirectorySelector.CurrentPath.BindValueChanged(e => selectionButton.Enabled.Value = IsValidDirectory(e.NewValue), true);
+            directorySelector.CurrentPath.BindValueChanged(e => selectionButton.Enabled.Value = IsValidDirectory(e.NewValue), true);
             base.LoadComplete();
         }
 

From eee3cd7c5770c1e4e42383980ad9b8d65b6381e6 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Thu, 13 May 2021 11:14:05 +0200
Subject: [PATCH 3416/3722] Disallow selecting storage root as a valid
 directory.

---
 .../Settings/Sections/Maintenance/DirectorySelectScreen.cs    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
index c08323e67c..582d14fbb6 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
         /// <param name="directory">The selected directory</param>
         protected abstract void OnSelection(DirectoryInfo directory);
 
-        protected virtual bool IsValidDirectory(DirectoryInfo info) => info != null;
+        protected virtual bool IsValidDirectory(DirectoryInfo info) => true;
 
         protected virtual DirectoryInfo InitialPath => null;
 
@@ -106,7 +106,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
             if (InitialPath != null)
                 directorySelector.CurrentPath.Value = InitialPath;
 
-            directorySelector.CurrentPath.BindValueChanged(e => selectionButton.Enabled.Value = IsValidDirectory(e.NewValue), true);
+            directorySelector.CurrentPath.BindValueChanged(e => selectionButton.Enabled.Value = e.NewValue != null ? IsValidDirectory(e.NewValue) : false, true);
             base.LoadComplete();
         }
 

From 19800f5f7f22d81bc0784796b78dc811e4a8458b Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 13 May 2021 11:24:22 +0200
Subject: [PATCH 3417/3722] Move `IBeatmap` arg into context

---
 .../Editor/Checks/CheckOffscreenObjectsTest.cs    | 12 ++++++------
 .../Edit/Checks/CheckOffscreenObjects.cs          |  5 ++---
 osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs  |  5 ++---
 .../Editing/Checks/CheckAudioQualityTest.cs       | 14 +++++++-------
 .../Editing/Checks/CheckBackgroundQualityTest.cs  | 14 +++++++-------
 .../Editing/Checks/CheckConcurrentObjectsTest.cs  | 15 ++++++++-------
 .../Editing/Checks/CheckFilePresenceTest.cs       | 12 ++++++------
 .../Editing/Checks/CheckUnsnappedObjectsTest.cs   | 15 ++++++++-------
 osu.Game/Rulesets/Edit/BeatmapVerifier.cs         |  5 ++---
 osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs  |  8 +++++++-
 .../Rulesets/Edit/Checks/CheckAudioQuality.cs     |  5 ++---
 .../Edit/Checks/CheckBackgroundQuality.cs         |  7 +++----
 .../Edit/Checks/CheckConcurrentObjects.cs         | 11 +++++------
 .../Rulesets/Edit/Checks/CheckFilePresence.cs     |  6 +++---
 .../Rulesets/Edit/Checks/CheckUnsnappedObjects.cs |  7 +++----
 .../Rulesets/Edit/Checks/Components/ICheck.cs     |  4 +---
 osu.Game/Rulesets/Edit/IBeatmapVerifier.cs        |  3 +--
 osu.Game/Screens/Edit/Verify/IssueList.cs         |  6 +++---
 18 files changed, 76 insertions(+), 78 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
index 5545273af2..a6873c6de9 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
@@ -225,14 +225,14 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
 
         private void assertOk(IBeatmap beatmap)
         {
-            var context = new BeatmapVerifierContext(new TestWorkingBeatmap(beatmap));
-            Assert.That(check.Run(beatmap, context), Is.Empty);
+            var context = new BeatmapVerifierContext(beatmap, new TestWorkingBeatmap(beatmap));
+            Assert.That(check.Run(context), Is.Empty);
         }
 
         private void assertOffscreenCircle(IBeatmap beatmap)
         {
-            var context = new BeatmapVerifierContext(new TestWorkingBeatmap(beatmap));
-            var issues = check.Run(beatmap, context).ToList();
+            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 CheckOffscreenObjects.IssueTemplateOffscreenCircle);
@@ -240,8 +240,8 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
 
         private void assertOffscreenSlider(IBeatmap beatmap)
         {
-            var context = new BeatmapVerifierContext(new TestWorkingBeatmap(beatmap));
-            var issues = check.Run(beatmap, context).ToList();
+            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 CheckOffscreenObjects.IssueTemplateOffscreenSlider);
diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index 86bb7f203f..a342c2a821 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -2,7 +2,6 @@
 // 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.Checks.Components;
 using osu.Game.Rulesets.Osu.Objects;
@@ -32,9 +31,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
             new IssueTemplateOffscreenSlider(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
+        public IEnumerable<Issue> Run(BeatmapVerifierContext context)
         {
-            foreach (var hitobject in beatmap.HitObjects)
+            foreach (var hitobject in context.Beatmap.HitObjects)
             {
                 switch (hitobject)
                 {
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
index c62f472d75..04e881fbf3 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuBeatmapVerifier.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Checks.Components;
 using osu.Game.Rulesets.Osu.Edit.Checks;
@@ -17,9 +16,9 @@ namespace osu.Game.Rulesets.Osu.Edit
             new CheckOffscreenObjects()
         };
 
-        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
+        public IEnumerable<Issue> Run(BeatmapVerifierContext context)
         {
-            return checks.SelectMany(check => check.Run(beatmap, context));
+            return checks.SelectMany(check => check.Run(context));
         }
     }
 }
diff --git a/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs b/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs
index fbd02ea54e..1cbdc43140 100644
--- a/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Tests.Editing.Checks
             mock.SetupGet(w => w.Beatmap).Returns(beatmap);
             mock.SetupGet(w => w.Track).Returns((Track)null);
 
-            Assert.That(check.Run(beatmap, new BeatmapVerifierContext(mock.Object)), Is.Empty);
+            Assert.That(check.Run(new BeatmapVerifierContext(beatmap, mock.Object)), Is.Empty);
         }
 
         [Test]
@@ -49,7 +49,7 @@ namespace osu.Game.Tests.Editing.Checks
         {
             var context = getContext(192);
 
-            Assert.That(check.Run(beatmap, context), Is.Empty);
+            Assert.That(check.Run(context), Is.Empty);
         }
 
         [Test]
@@ -57,7 +57,7 @@ namespace osu.Game.Tests.Editing.Checks
         {
             var context = getContext(null);
 
-            var issues = check.Run(beatmap, context).ToList();
+            var issues = check.Run(context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckAudioQuality.IssueTemplateNoBitrate);
@@ -68,7 +68,7 @@ namespace osu.Game.Tests.Editing.Checks
         {
             var context = getContext(0);
 
-            var issues = check.Run(beatmap, context).ToList();
+            var issues = check.Run(context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckAudioQuality.IssueTemplateNoBitrate);
@@ -79,7 +79,7 @@ namespace osu.Game.Tests.Editing.Checks
         {
             var context = getContext(320);
 
-            var issues = check.Run(beatmap, context).ToList();
+            var issues = check.Run(context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckAudioQuality.IssueTemplateTooHighBitrate);
@@ -90,7 +90,7 @@ namespace osu.Game.Tests.Editing.Checks
         {
             var context = getContext(64);
 
-            var issues = check.Run(beatmap, context).ToList();
+            var issues = check.Run( context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckAudioQuality.IssueTemplateTooLowBitrate);
@@ -98,7 +98,7 @@ namespace osu.Game.Tests.Editing.Checks
 
         private BeatmapVerifierContext getContext(int? audioBitrate)
         {
-            return new BeatmapVerifierContext(getMockWorkingBeatmap(audioBitrate).Object);
+            return new BeatmapVerifierContext(beatmap, getMockWorkingBeatmap(audioBitrate).Object);
         }
 
         /// <summary>
diff --git a/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs b/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
index e96ec5485d..3424cfe732 100644
--- a/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Tests.Editing.Checks
             beatmap.Metadata.BackgroundFile = null;
             var context = getContext(null, System.Array.Empty<byte>());
 
-            Assert.That(check.Run(beatmap, context), Is.Empty);
+            Assert.That(check.Run(context), Is.Empty);
         }
 
         [Test]
@@ -64,7 +64,7 @@ namespace osu.Game.Tests.Editing.Checks
         {
             var context = getContext(new Texture(1920, 1080));
 
-            Assert.That(check.Run(beatmap, context), Is.Empty);
+            Assert.That(check.Run(context), Is.Empty);
         }
 
         [Test]
@@ -72,7 +72,7 @@ namespace osu.Game.Tests.Editing.Checks
         {
             var context = getContext(new Texture(3840, 2160));
 
-            var issues = check.Run(beatmap, context).ToList();
+            var issues = check.Run(context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateTooHighResolution);
@@ -83,7 +83,7 @@ namespace osu.Game.Tests.Editing.Checks
         {
             var context = getContext(new Texture(640, 480));
 
-            var issues = check.Run(beatmap, context).ToList();
+            var issues = check.Run(context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateLowResolution);
@@ -94,7 +94,7 @@ namespace osu.Game.Tests.Editing.Checks
         {
             var context = getContext(new Texture(100, 100));
 
-            var issues = check.Run(beatmap, context).ToList();
+            var issues = check.Run(context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateTooLowResolution);
@@ -105,7 +105,7 @@ namespace osu.Game.Tests.Editing.Checks
         {
             var context = getContext(new Texture(1920, 1080), new byte[1024 * 1024 * 3]);
 
-            var issues = check.Run(beatmap, context).ToList();
+            var issues = check.Run(context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateTooUncompressed);
@@ -113,7 +113,7 @@ namespace osu.Game.Tests.Editing.Checks
 
         private BeatmapVerifierContext getContext(Texture background, [CanBeNull] byte[] fileBytes = null)
         {
-            return new BeatmapVerifierContext(getMockWorkingBeatmap(background, fileBytes).Object);
+            return new BeatmapVerifierContext(beatmap, getMockWorkingBeatmap(background, fileBytes).Object);
         }
 
         /// <summary>
diff --git a/osu.Game.Tests/Editing/Checks/CheckConcurrentObjectsTest.cs b/osu.Game.Tests/Editing/Checks/CheckConcurrentObjectsTest.cs
index ffe5d34e67..ba0a130a25 100644
--- a/osu.Game.Tests/Editing/Checks/CheckConcurrentObjectsTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckConcurrentObjectsTest.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using Moq;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Checks;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Objects;
@@ -105,7 +106,7 @@ namespace osu.Game.Tests.Editing.Checks
                 new HitCircle { StartTime = 300 }
             };
 
-            var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
+            var issues = check.Run(getContext(hitobjects)).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(3));
             Assert.That(issues.Where(issue => issue.Template is CheckConcurrentObjects.IssueTemplateConcurrentDifferent).ToList(), Has.Count.EqualTo(2));
@@ -164,12 +165,12 @@ namespace osu.Game.Tests.Editing.Checks
 
         private void assertOk(List<HitObject> hitobjects)
         {
-            Assert.That(check.Run(getPlayableBeatmap(hitobjects), null), Is.Empty);
+            Assert.That(check.Run(getContext(hitobjects)), Is.Empty);
         }
 
         private void assertConcurrentSame(List<HitObject> hitobjects, int count = 1)
         {
-            var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
+            var issues = check.Run(getContext(hitobjects)).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(count));
             Assert.That(issues.All(issue => issue.Template is CheckConcurrentObjects.IssueTemplateConcurrentSame));
@@ -177,18 +178,18 @@ namespace osu.Game.Tests.Editing.Checks
 
         private void assertConcurrentDifferent(List<HitObject> hitobjects, int count = 1)
         {
-            var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
+            var issues = check.Run(getContext(hitobjects)).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(count));
             Assert.That(issues.All(issue => issue.Template is CheckConcurrentObjects.IssueTemplateConcurrentDifferent));
         }
 
-        private IBeatmap getPlayableBeatmap(List<HitObject> hitobjects)
+        private BeatmapVerifierContext getContext(List<HitObject> hitobjects)
         {
-            return new Beatmap<HitObject>
+            return new BeatmapVerifierContext(new Beatmap<HitObject>
             {
                 HitObjects = hitobjects
-            };
+            }, null);
         }
     }
 }
diff --git a/osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs b/osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs
index 424dffcbc2..39a1d76d83 100644
--- a/osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs
@@ -46,8 +46,8 @@ namespace osu.Game.Tests.Editing.Checks
         [Test]
         public void TestBackgroundSetAndInFiles()
         {
-            var context = new BeatmapVerifierContext(new TestWorkingBeatmap(beatmap));
-            Assert.That(check.Run(beatmap, context), Is.Empty);
+            var context = new BeatmapVerifierContext(beatmap, new TestWorkingBeatmap(beatmap));
+            Assert.That(check.Run(context), Is.Empty);
         }
 
         [Test]
@@ -55,8 +55,8 @@ namespace osu.Game.Tests.Editing.Checks
         {
             beatmap.BeatmapInfo.BeatmapSet.Files.Clear();
 
-            var context = new BeatmapVerifierContext(new TestWorkingBeatmap(beatmap));
-            var issues = check.Run(beatmap, context).ToList();
+            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 CheckFilePresence.IssueTemplateDoesNotExist);
@@ -67,8 +67,8 @@ namespace osu.Game.Tests.Editing.Checks
         {
             beatmap.Metadata.BackgroundFile = null;
 
-            var context = new BeatmapVerifierContext(new TestWorkingBeatmap(beatmap));
-            var issues = check.Run(beatmap, context).ToList();
+            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 CheckFilePresence.IssueTemplateNoneSet);
diff --git a/osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs b/osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs
index 5e65b263f2..02159fa57b 100644
--- a/osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs
@@ -7,6 +7,7 @@ using Moq;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Checks;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
@@ -105,7 +106,7 @@ namespace osu.Game.Tests.Editing.Checks
                 getSliderMock(startTime: 98, endTime: 398.75d).Object
             };
 
-            var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
+            var issues = check.Run(getContext(hitobjects)).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(2));
             Assert.That(issues.Any(issue => issue.Template is CheckUnsnappedObjects.IssueTemplateSmallUnsnap));
@@ -124,12 +125,12 @@ namespace osu.Game.Tests.Editing.Checks
 
         private void assertOk(List<HitObject> hitobjects)
         {
-            Assert.That(check.Run(getPlayableBeatmap(hitobjects), null), Is.Empty);
+            Assert.That(check.Run(getContext(hitobjects)), Is.Empty);
         }
 
         private void assert1Ms(List<HitObject> hitobjects, int count = 1)
         {
-            var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
+            var issues = check.Run(getContext(hitobjects)).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(count));
             Assert.That(issues.All(issue => issue.Template is CheckUnsnappedObjects.IssueTemplateSmallUnsnap));
@@ -137,19 +138,19 @@ namespace osu.Game.Tests.Editing.Checks
 
         private void assert2Ms(List<HitObject> hitobjects, int count = 1)
         {
-            var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
+            var issues = check.Run(getContext(hitobjects)).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(count));
             Assert.That(issues.All(issue => issue.Template is CheckUnsnappedObjects.IssueTemplateLargeUnsnap));
         }
 
-        private IBeatmap getPlayableBeatmap(List<HitObject> hitobjects)
+        private BeatmapVerifierContext getContext(List<HitObject> hitobjects)
         {
-            return new Beatmap<HitObject>
+            return new BeatmapVerifierContext(new Beatmap<HitObject>
             {
                 ControlPointInfo = cpi,
                 HitObjects = hitobjects
-            };
+            }, null);
         }
     }
 }
diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
index 1860d54b57..d208c7fe07 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifier.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit.Checks;
 using osu.Game.Rulesets.Edit.Checks.Components;
 
@@ -29,9 +28,9 @@ namespace osu.Game.Rulesets.Edit
             new CheckConcurrentObjects()
         };
 
-        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
+        public IEnumerable<Issue> Run(BeatmapVerifierContext context)
         {
-            return checks.SelectMany(check => check.Run(beatmap, context));
+            return checks.SelectMany(check => check.Run(context));
         }
     }
 }
diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs b/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs
index 76b74cb993..53bdf3140c 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs
@@ -11,6 +11,11 @@ namespace osu.Game.Rulesets.Edit
     /// </summary>
     public class BeatmapVerifierContext
     {
+        /// <summary>
+        /// The playable beatmap instance of the current beatmap.
+        /// </summary>
+        public readonly IBeatmap Beatmap;
+
         /// <summary>
         /// The working beatmap instance of the current beatmap.
         /// </summary>
@@ -21,8 +26,9 @@ namespace osu.Game.Rulesets.Edit
         /// </summary>
         public DifficultyRating InterpretedDifficulty;
 
-        public BeatmapVerifierContext(IWorkingBeatmap workingBeatmap, DifficultyRating difficultyRating = DifficultyRating.ExpertPlus)
+        public BeatmapVerifierContext(IBeatmap beatmap, IWorkingBeatmap workingBeatmap, DifficultyRating difficultyRating = DifficultyRating.ExpertPlus)
         {
+            Beatmap = beatmap;
             WorkingBeatmap = workingBeatmap;
             InterpretedDifficulty = difficultyRating;
         }
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs b/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs
index 1015f267aa..70d11883b7 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs
@@ -2,7 +2,6 @@
 // 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
@@ -26,9 +25,9 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateNoBitrate(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
+        public IEnumerable<Issue> Run(BeatmapVerifierContext context)
         {
-            var audioFile = beatmap.Metadata?.AudioFile;
+            var audioFile = context.Beatmap.Metadata?.AudioFile;
             if (audioFile == null)
                 yield break;
 
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
index 87f5c80c89..085c558eaf 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
@@ -2,7 +2,6 @@
 // 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
@@ -30,9 +29,9 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateTooUncompressed(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
+        public IEnumerable<Issue> Run(BeatmapVerifierContext context)
         {
-            var backgroundFile = beatmap.Metadata?.BackgroundFile;
+            var backgroundFile = context.Beatmap.Metadata?.BackgroundFile;
             if (backgroundFile == null)
                 yield break;
 
@@ -48,7 +47,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             else if (texture.Width < low_width || texture.Height < low_height)
                 yield return new IssueTemplateLowResolution(this).Create(texture.Width, texture.Height);
 
-            string storagePath = beatmap.BeatmapInfo.BeatmapSet.GetPathForFile(backgroundFile);
+            string storagePath = context.Beatmap.BeatmapInfo.BeatmapSet.GetPathForFile(backgroundFile);
             double filesizeMb = context.WorkingBeatmap.GetStream(storagePath).Length / (1024d * 1024d);
 
             if (filesizeMb > max_filesize_mb)
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs b/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
index fd6ed664e6..51277298ab 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
@@ -2,7 +2,6 @@
 // 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;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
@@ -22,15 +21,15 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateConcurrentDifferent(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
+        public IEnumerable<Issue> Run(BeatmapVerifierContext context)
         {
-            for (int i = 0; i < beatmap.HitObjects.Count - 1; ++i)
+            for (int i = 0; i < context.Beatmap.HitObjects.Count - 1; ++i)
             {
-                var hitobject = beatmap.HitObjects[i];
+                var hitobject = context.Beatmap.HitObjects[i];
 
-                for (int j = i + 1; j < beatmap.HitObjects.Count; ++j)
+                for (int j = i + 1; j < context.Beatmap.HitObjects.Count; ++j)
                 {
-                    var nextHitobject = beatmap.HitObjects[j];
+                    var nextHitobject = context.Beatmap.HitObjects[j];
 
                     // Accounts for rulesets with hitobjects separated by columns, such as Mania.
                     // In these cases we only care about concurrent objects within the same column.
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs b/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
index f04909d175..36a0bf8c5d 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
@@ -21,9 +21,9 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateDoesNotExist(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
+        public IEnumerable<Issue> Run(BeatmapVerifierContext context)
         {
-            var filename = GetFilename(beatmap);
+            var filename = GetFilename(context.Beatmap);
 
             if (filename == null)
             {
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             }
 
             // If the file is set, also make sure it still exists.
-            var storagePath = beatmap.BeatmapInfo.BeatmapSet.GetPathForFile(filename);
+            var storagePath = context.Beatmap.BeatmapInfo.BeatmapSet.GetPathForFile(filename);
             if (storagePath != null)
                 yield break;
 
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs b/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
index aa19f3df07..ded1bb54ca 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit.Checks.Components;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
@@ -22,11 +21,11 @@ namespace osu.Game.Rulesets.Edit.Checks
             new IssueTemplateSmallUnsnap(this)
         };
 
-        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
+        public IEnumerable<Issue> Run(BeatmapVerifierContext context)
         {
-            var controlPointInfo = beatmap.ControlPointInfo;
+            var controlPointInfo = context.Beatmap.ControlPointInfo;
 
-            foreach (var hitobject in beatmap.HitObjects)
+            foreach (var hitobject in context.Beatmap.HitObjects)
             {
                 double startUnsnap = hitobject.StartTime - controlPointInfo.GetClosestSnappedTime(hitobject.StartTime);
                 string startPostfix = hitobject is IHasDuration ? "start" : "";
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs b/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
index 511d6aaa0f..141de55f1d 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
-using osu.Game.Beatmaps;
 
 namespace osu.Game.Rulesets.Edit.Checks.Components
 {
@@ -24,8 +23,7 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// <summary>
         /// Runs this check and returns any issues detected for the provided beatmap.
         /// </summary>
-        /// <param name="beatmap">The playable beatmap of the beatmap to run the check on.</param>
         /// <param name="context">The beatmap verifier context associated with the beatmap.</param>
-        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context);
+        public IEnumerable<Issue> Run(BeatmapVerifierContext context);
     }
 }
diff --git a/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs b/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
index 1dafc6938e..06f0abedb0 100644
--- a/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
+++ b/osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
@@ -2,7 +2,6 @@
 // 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
@@ -12,6 +11,6 @@ namespace osu.Game.Rulesets.Edit
     /// </summary>
     public interface IBeatmapVerifier
     {
-        public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context);
+        public IEnumerable<Issue> Run(BeatmapVerifierContext context);
     }
 }
diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
index abf22ead10..fc9d4c7526 100644
--- a/osu.Game/Screens/Edit/Verify/IssueList.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueList.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Screens.Edit.Verify
             generalVerifier = new BeatmapVerifier();
             rulesetVerifier = beatmap.BeatmapInfo.Ruleset?.CreateInstance()?.CreateBeatmapVerifier();
 
-            context = new BeatmapVerifierContext(workingBeatmap.Value, verify.InterpretedDifficulty.Value);
+            context = new BeatmapVerifierContext(beatmap, workingBeatmap.Value, verify.InterpretedDifficulty.Value);
             verify.InterpretedDifficulty.BindValueChanged(change =>
             {
                 context.InterpretedDifficulty = change.NewValue;
@@ -98,10 +98,10 @@ namespace osu.Game.Screens.Edit.Verify
 
         private void refresh()
         {
-            var issues = generalVerifier.Run(beatmap, context);
+            var issues = generalVerifier.Run(context);
 
             if (rulesetVerifier != null)
-                issues = issues.Concat(rulesetVerifier.Run(beatmap, context));
+                issues = issues.Concat(rulesetVerifier.Run(context));
 
             issues = filter(issues);
 

From df77b28b48b8a58a92380c458251efcaf73773c2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 18:39:21 +0900
Subject: [PATCH 3418/3722] Add a flimsy guard against null parent to avoid
 crashes on exit sequence

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

diff --git a/osu.Game/Skinning/Editor/SkinBlueprint.cs b/osu.Game/Skinning/Editor/SkinBlueprint.cs
index 7db5bc7ead..b337aa53c4 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprint.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprint.cs
@@ -172,6 +172,9 @@ namespace osu.Game.Skinning.Editor
         {
             base.Update();
 
+            if (drawable.Parent == null)
+                return;
+
             originBox.Position = drawable.ToSpaceOfOtherDrawable(drawable.OriginPosition, this);
             anchorBox.Position = drawable.Parent.ToSpaceOfOtherDrawable(drawable.AnchorPosition, this);
 

From 01bc71acd2a24c3fa5993aab6487f4fdee7d7062 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 18:40:28 +0900
Subject: [PATCH 3419/3722] Improve ability to parse xmldoc of
 `SkinnableTargetWrapper`

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
---
 osu.Game/Skinning/SkinnableTargetWrapper.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/SkinnableTargetWrapper.cs b/osu.Game/Skinning/SkinnableTargetWrapper.cs
index 664e8da480..395de590cf 100644
--- a/osu.Game/Skinning/SkinnableTargetWrapper.cs
+++ b/osu.Game/Skinning/SkinnableTargetWrapper.cs
@@ -9,8 +9,8 @@ using osu.Framework.Graphics.Containers;
 namespace osu.Game.Skinning
 {
     /// <summary>
-    /// A container which is serialised and can encapsulate multiple skinnable elements into a single return type (for consumption via <see cref="ISkin.GetDrawableComponent"/>.
-    /// Will also optionally apply default cross-element layout dependencies when initialised from a non-deserialised source.
+    /// A container which groups the elements of a <see cref="SkinnableTargetContainer"/> into a single object.
+    /// Optionally also applies a default layout to the elements.
     /// </summary>
     [Serializable]
     public class SkinnableTargetWrapper : Container, ISkinnableDrawable

From 2f025f196723c0711e1573962515cabb892daae7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 13 May 2021 18:51:23 +0900
Subject: [PATCH 3420/3722] SkinnableTargetWrapper ->
 SkinnableTargetComponentsContainer

---
 osu.Game/Skinning/DefaultSkin.cs                       |  2 +-
 osu.Game/Skinning/LegacySkin.cs                        |  2 +-
 osu.Game/Skinning/Skin.cs                              |  2 +-
 ...rapper.cs => SkinnableTargetComponentsContainer.cs} | 10 +++++-----
 osu.Game/Skinning/SkinnableTargetContainer.cs          |  4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)
 rename osu.Game/Skinning/{SkinnableTargetWrapper.cs => SkinnableTargetComponentsContainer.cs} (73%)

diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index d6ca5e9009..65e8fd1b82 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Skinning
                     switch (target.Target)
                     {
                         case SkinnableTarget.MainHUDComponents:
-                            var skinnableTargetWrapper = new SkinnableTargetWrapper(container =>
+                            var skinnableTargetWrapper = new SkinnableTargetComponentsContainer(container =>
                             {
                                 var score = container.OfType<DefaultScoreCounter>().FirstOrDefault();
                                 var accuracy = container.OfType<DefaultAccuracyCounter>().FirstOrDefault();
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 27f6fcdf97..a6f8f45c0f 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -332,7 +332,7 @@ namespace osu.Game.Skinning
                     {
                         case SkinnableTarget.MainHUDComponents:
 
-                            var skinnableTargetWrapper = new SkinnableTargetWrapper(container =>
+                            var skinnableTargetWrapper = new SkinnableTargetComponentsContainer(container =>
                             {
                                 var score = container.OfType<LegacyScoreCounter>().FirstOrDefault();
                                 var accuracy = container.OfType<GameplayAccuracyCounter>().FirstOrDefault();
diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index 0ceca3925e..2944c7a8ec 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Skinning
                     if (!DrawableComponentInfo.TryGetValue(target.Target, out var skinnableInfo))
                         return null;
 
-                    return new SkinnableTargetWrapper
+                    return new SkinnableTargetComponentsContainer
                     {
                         ChildrenEnumerable = skinnableInfo.Select(i => i.CreateInstance())
                     };
diff --git a/osu.Game/Skinning/SkinnableTargetWrapper.cs b/osu.Game/Skinning/SkinnableTargetComponentsContainer.cs
similarity index 73%
rename from osu.Game/Skinning/SkinnableTargetWrapper.cs
rename to osu.Game/Skinning/SkinnableTargetComponentsContainer.cs
index 395de590cf..2107ca7a8b 100644
--- a/osu.Game/Skinning/SkinnableTargetWrapper.cs
+++ b/osu.Game/Skinning/SkinnableTargetComponentsContainer.cs
@@ -9,11 +9,11 @@ using osu.Framework.Graphics.Containers;
 namespace osu.Game.Skinning
 {
     /// <summary>
-    /// A container which groups the elements of a <see cref="SkinnableTargetContainer"/> into a single object.
-    /// Optionally also applies a default layout to the elements.
+    /// A container which groups the components of a <see cref="SkinnableTargetContainer"/> into a single object.
+    /// Optionally also applies a default layout to the components.
     /// </summary>
     [Serializable]
-    public class SkinnableTargetWrapper : Container, ISkinnableDrawable
+    public class SkinnableTargetComponentsContainer : Container, ISkinnableDrawable
     {
         public bool IsEditable => false;
 
@@ -23,14 +23,14 @@ namespace osu.Game.Skinning
         /// Construct a wrapper with defaults that should be applied once.
         /// </summary>
         /// <param name="applyDefaults">A function to apply the default layout.</param>
-        public SkinnableTargetWrapper(Action<Container> applyDefaults)
+        public SkinnableTargetComponentsContainer(Action<Container> applyDefaults)
             : this()
         {
             this.applyDefaults = applyDefaults;
         }
 
         [JsonConstructor]
-        public SkinnableTargetWrapper()
+        public SkinnableTargetComponentsContainer()
         {
             RelativeSizeAxes = Axes.Both;
         }
diff --git a/osu.Game/Skinning/SkinnableTargetContainer.cs b/osu.Game/Skinning/SkinnableTargetContainer.cs
index 52e86f5d86..a4d7f621eb 100644
--- a/osu.Game/Skinning/SkinnableTargetContainer.cs
+++ b/osu.Game/Skinning/SkinnableTargetContainer.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Skinning
 {
     public class SkinnableTargetContainer : SkinReloadableDrawable, ISkinnableTarget
     {
-        private SkinnableTargetWrapper content;
+        private SkinnableTargetComponentsContainer content;
 
         public SkinnableTarget Target { get; }
 
@@ -31,7 +31,7 @@ namespace osu.Game.Skinning
             ClearInternal();
             components.Clear();
 
-            content = CurrentSkin.GetDrawableComponent(new SkinnableTargetComponent(Target)) as SkinnableTargetWrapper;
+            content = CurrentSkin.GetDrawableComponent(new SkinnableTargetComponent(Target)) as SkinnableTargetComponentsContainer;
 
             if (content != null)
             {

From 07e475cd132cde77478a45ac976173bb4abfdf67 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 18:54:40 +0900
Subject: [PATCH 3421/3722] Fix skin blueprint box drawing incorrectly when
 both scale and rotation are applied

---
 osu.Game/Skinning/Editor/SkinBlueprint.cs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinBlueprint.cs b/osu.Game/Skinning/Editor/SkinBlueprint.cs
index 1d029c39d6..b2a1b1c9d8 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprint.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprint.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.Color4Extensions;
 using osu.Framework.Graphics;
@@ -112,14 +113,10 @@ namespace osu.Game.Skinning.Editor
             drawableQuad = drawable.ScreenSpaceDrawQuad;
             var quad = ToLocalSpace(drawable.ScreenSpaceDrawQuad);
 
-            box.Position = new Vector2(
-                drawable.Scale.X < 0 ? quad.TopRight.X : quad.TopLeft.X,
-                drawable.Scale.Y < 0 ? quad.BottomLeft.Y : quad.TopLeft.Y
-            );
-
+            box.Position = drawable.ToSpaceOfOtherDrawable(Vector2.Zero, this);
             box.Size = quad.Size;
-
             box.Rotation = drawable.Rotation;
+            box.Scale = new Vector2(MathF.Sign(drawable.Scale.X), MathF.Sign(drawable.Scale.Y));
         }
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => drawable.ReceivePositionalInputAt(screenSpacePos);

From e5f765d1a8ef42e9a12fe94dbe23f3d464d1972d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 19:06:58 +0900
Subject: [PATCH 3422/3722] Fix broken exception message

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

diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 67285987ef..cb27a84a75 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -166,7 +166,7 @@ namespace osu.Game.Skinning.Editor
         private void placeComponent(Type type)
         {
             if (!(Activator.CreateInstance(type) is ISkinnableDrawable component))
-                throw new InvalidOperationException("Attempted to instantiate a component for placement which was not an {typeof(ISkinnableComponent)}.");
+                throw new InvalidOperationException($"Attempted to instantiate a component for placement which was not an {typeof(ISkinnableDrawable)}.");
 
             getTarget(SkinnableTarget.MainHUDComponents)?.Add(component);
 

From ffb6135a1bd0dd531d86ff238c62ed0dfecda5b8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 13 May 2021 19:53:32 +0900
Subject: [PATCH 3423/3722] Rework hitobject blueprints to take in hitobject
 models

---
 .../TestSceneHoldNoteSelectionBlueprint.cs    |  2 +-
 .../Editor/TestSceneNoteSelectionBlueprint.cs |  2 +-
 .../HoldNoteNoteSelectionBlueprint.cs         |  5 +++--
 .../Blueprints/HoldNoteSelectionBlueprint.cs  |  9 ++++----
 .../Blueprints/ManiaSelectionBlueprint.cs     |  9 ++++----
 .../Edit/Blueprints/NoteSelectionBlueprint.cs |  6 ++---
 .../Edit/ManiaBlueprintContainer.cs           | 11 +++++-----
 .../Edit/ManiaSelectionHandler.cs             |  5 ++---
 .../TestSceneHitCircleSelectionBlueprint.cs   |  6 ++---
 .../TestSceneSliderControlPointPiece.cs       |  8 +++----
 .../TestSceneSliderSelectionBlueprint.cs      |  8 +++----
 .../TestSceneSpinnerSelectionBlueprint.cs     |  2 +-
 .../HitCircles/HitCircleSelectionBlueprint.cs |  4 ++--
 .../Edit/Blueprints/OsuSelectionBlueprint.cs  | 10 ++++-----
 .../Sliders/SliderCircleSelectionBlueprint.cs |  3 +--
 .../Sliders/SliderSelectionBlueprint.cs       | 16 +++++---------
 .../Spinners/SpinnerSelectionBlueprint.cs     |  3 +--
 .../Edit/OsuBlueprintContainer.cs             | 13 +++++------
 .../Blueprints/TaikoSelectionBlueprint.cs     |  6 ++---
 .../Edit/TaikoBlueprintContainer.cs           |  3 +--
 ...rint.cs => HitObjectSelectionBlueprint.cs} | 22 ++++++++++++++-----
 osu.Game/Rulesets/Edit/SelectionBlueprint.cs  | 12 +++++-----
 .../Components/ComposeBlueprintContainer.cs   |  5 ++---
 .../Compose/Components/MoveSelectionEvent.cs  |  2 +-
 .../Visual/SelectionBlueprintTestScene.cs     |  4 +++-
 25 files changed, 90 insertions(+), 86 deletions(-)
 rename osu.Game/Rulesets/Edit/{OverlaySelectionBlueprint.cs => HitObjectSelectionBlueprint.cs} (68%)

diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNoteSelectionBlueprint.cs
index 24f4c6858e..5e99264d7d 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneHoldNoteSelectionBlueprint.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
                 }
             };
 
-            AddBlueprint(new HoldNoteSelectionBlueprint(drawableObject));
+            AddBlueprint(new HoldNoteSelectionBlueprint(holdNote), drawableObject);
         }
 
         protected override void Update()
diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNoteSelectionBlueprint.cs
index 0e47a12a8e..9c3ad0b4ff 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneNoteSelectionBlueprint.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
                 Child = drawableObject = new DrawableNote(note)
             };
 
-            AddBlueprint(new NoteSelectionBlueprint(drawableObject));
+            AddBlueprint(new NoteSelectionBlueprint(note), drawableObject);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteNoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteNoteSelectionBlueprint.cs
index 4e73883de0..14c8d488a9 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteNoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteNoteSelectionBlueprint.cs
@@ -3,17 +3,18 @@
 
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
+using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 {
-    public class HoldNoteNoteSelectionBlueprint : ManiaSelectionBlueprint
+    public class HoldNoteNoteSelectionBlueprint : ManiaSelectionBlueprint<HoldNote>
     {
         protected new DrawableHoldNote DrawableObject => (DrawableHoldNote)base.DrawableObject;
 
         private readonly HoldNotePosition position;
 
-        public HoldNoteNoteSelectionBlueprint(DrawableHoldNote holdNote, HoldNotePosition position)
+        public HoldNoteNoteSelectionBlueprint(HoldNote holdNote, HoldNotePosition position)
             : base(holdNote)
         {
             this.position = position;
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs
index 1737c4d2e5..c7ee6097c6 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs
@@ -8,13 +8,14 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
+using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
 using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 {
-    public class HoldNoteSelectionBlueprint : ManiaSelectionBlueprint
+    public class HoldNoteSelectionBlueprint : ManiaSelectionBlueprint<HoldNote>
     {
         public new DrawableHoldNote DrawableObject => (DrawableHoldNote)base.DrawableObject;
 
@@ -23,7 +24,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         [Resolved]
         private OsuColour colours { get; set; }
 
-        public HoldNoteSelectionBlueprint(DrawableHoldNote hold)
+        public HoldNoteSelectionBlueprint(HoldNote hold)
             : base(hold)
         {
         }
@@ -40,8 +41,8 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 
             InternalChildren = new Drawable[]
             {
-                new HoldNoteNoteSelectionBlueprint(DrawableObject, HoldNotePosition.Start),
-                new HoldNoteNoteSelectionBlueprint(DrawableObject, HoldNotePosition.End),
+                new HoldNoteNoteSelectionBlueprint(HitObject, HoldNotePosition.Start),
+                new HoldNoteNoteSelectionBlueprint(HitObject, HoldNotePosition.End),
                 new Container
                 {
                     RelativeSizeAxes = Axes.Both,
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
index 384f49d9b2..e744bd3c83 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
@@ -4,22 +4,23 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
 using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 {
-    public abstract class ManiaSelectionBlueprint : OverlaySelectionBlueprint
+    public abstract class ManiaSelectionBlueprint<T> : HitObjectSelectionBlueprint<T>
+        where T : ManiaHitObject
     {
         public new DrawableManiaHitObject DrawableObject => (DrawableManiaHitObject)base.DrawableObject;
 
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; }
 
-        protected ManiaSelectionBlueprint(DrawableHitObject drawableObject)
-            : base(drawableObject)
+        protected ManiaSelectionBlueprint(T hitObject)
+            : base(hitObject)
         {
             RelativeSizeAxes = Axes.None;
         }
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/NoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/NoteSelectionBlueprint.cs
index 2bff33c4cf..e2b6ee0048 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/NoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/NoteSelectionBlueprint.cs
@@ -3,13 +3,13 @@
 
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
-using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Mania.Objects;
 
 namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 {
-    public class NoteSelectionBlueprint : ManiaSelectionBlueprint
+    public class NoteSelectionBlueprint : ManiaSelectionBlueprint<Note>
     {
-        public NoteSelectionBlueprint(DrawableNote note)
+        public NoteSelectionBlueprint(Note note)
             : base(note)
         {
             AddInternal(new EditNotePiece { RelativeSizeAxes = Axes.X });
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs
index c4429176d1..c5a109a6d1 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaBlueprintContainer.cs
@@ -3,9 +3,8 @@
 
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Edit.Blueprints;
-using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Screens.Edit.Compose.Components;
 
 namespace osu.Game.Rulesets.Mania.Edit
@@ -17,18 +16,18 @@ namespace osu.Game.Rulesets.Mania.Edit
         {
         }
 
-        public override OverlaySelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject)
+        public override HitObjectSelectionBlueprint CreateHitObjectBlueprintFor(HitObject hitObject)
         {
             switch (hitObject)
             {
-                case DrawableNote note:
+                case Note note:
                     return new NoteSelectionBlueprint(note);
 
-                case DrawableHoldNote holdNote:
+                case HoldNote holdNote:
                     return new HoldNoteSelectionBlueprint(holdNote);
             }
 
-            return base.CreateBlueprintFor(hitObject);
+            return base.CreateHitObjectBlueprintFor(hitObject);
         }
 
         protected override SelectionHandler<HitObject> CreateSelectionHandler() => new ManiaSelectionHandler();
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
index 7042110423..8a1446db32 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
@@ -5,7 +5,6 @@ using System;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Game.Rulesets.Edit;
-using osu.Game.Rulesets.Mania.Edit.Blueprints;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI.Scrolling;
@@ -23,8 +22,8 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         public override bool HandleMovement(MoveSelectionEvent<HitObject> moveEvent)
         {
-            var maniaBlueprint = (ManiaSelectionBlueprint)moveEvent.Blueprint;
-            int lastColumn = maniaBlueprint.DrawableObject.HitObject.Column;
+            var maniaBlueprint = (HitObjectSelectionBlueprint<ManiaHitObject>)moveEvent.Blueprint;
+            int lastColumn = maniaBlueprint.HitObject.Column;
 
             performColumnMovement(lastColumn, moveEvent);
 
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneHitCircleSelectionBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneHitCircleSelectionBlueprint.cs
index 66cd405195..315493318d 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneHitCircleSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneHitCircleSelectionBlueprint.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             hitCircle.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { CircleSize = 2 });
 
             Add(drawableObject = new DrawableHitCircle(hitCircle));
-            AddBlueprint(blueprint = new TestBlueprint(drawableObject));
+            AddBlueprint(blueprint = new TestBlueprint(hitCircle), drawableObject);
         });
 
         [Test]
@@ -63,8 +63,8 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         {
             public new HitCirclePiece CirclePiece => base.CirclePiece;
 
-            public TestBlueprint(DrawableHitCircle drawableCircle)
-                : base(drawableCircle)
+            public TestBlueprint(HitCircle circle)
+                : base(circle)
             {
             }
         }
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
index d7dfc3bd42..fe0f2f8a87 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             slider.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { CircleSize = 2 });
 
             Add(drawableObject = new DrawableSlider(slider));
-            AddBlueprint(new TestSliderBlueprint(drawableObject));
+            AddBlueprint(new TestSliderBlueprint(slider), drawableObject);
         });
 
         [Test]
@@ -154,19 +154,19 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             public new TestSliderCircleBlueprint TailBlueprint => (TestSliderCircleBlueprint)base.TailBlueprint;
             public new PathControlPointVisualiser ControlPointVisualiser => base.ControlPointVisualiser;
 
-            public TestSliderBlueprint(DrawableSlider slider)
+            public TestSliderBlueprint(Slider slider)
                 : base(slider)
             {
             }
 
-            protected override SliderCircleSelectionBlueprint CreateCircleSelectionBlueprint(DrawableSlider slider, SliderPosition position) => new TestSliderCircleBlueprint(slider, position);
+            protected override SliderCircleSelectionBlueprint CreateCircleSelectionBlueprint(Slider slider, SliderPosition position) => new TestSliderCircleBlueprint(slider, position);
         }
 
         private class TestSliderCircleBlueprint : SliderCircleSelectionBlueprint
         {
             public new HitCirclePiece CirclePiece => base.CirclePiece;
 
-            public TestSliderCircleBlueprint(DrawableSlider slider, SliderPosition position)
+            public TestSliderCircleBlueprint(Slider slider, SliderPosition position)
                 : base(slider, position)
             {
             }
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
index f6e1be693b..721bb1985d 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             slider.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty { CircleSize = 2 });
 
             Add(drawableObject = new DrawableSlider(slider));
-            AddBlueprint(blueprint = new TestSliderBlueprint(drawableObject));
+            AddBlueprint(blueprint = new TestSliderBlueprint(slider), drawableObject);
         });
 
         [Test]
@@ -199,19 +199,19 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             public new TestSliderCircleBlueprint TailBlueprint => (TestSliderCircleBlueprint)base.TailBlueprint;
             public new PathControlPointVisualiser ControlPointVisualiser => base.ControlPointVisualiser;
 
-            public TestSliderBlueprint(DrawableSlider slider)
+            public TestSliderBlueprint(Slider slider)
                 : base(slider)
             {
             }
 
-            protected override SliderCircleSelectionBlueprint CreateCircleSelectionBlueprint(DrawableSlider slider, SliderPosition position) => new TestSliderCircleBlueprint(slider, position);
+            protected override SliderCircleSelectionBlueprint CreateCircleSelectionBlueprint(Slider slider, SliderPosition position) => new TestSliderCircleBlueprint(slider, position);
         }
 
         private class TestSliderCircleBlueprint : SliderCircleSelectionBlueprint
         {
             public new HitCirclePiece CirclePiece => base.CirclePiece;
 
-            public TestSliderCircleBlueprint(DrawableSlider slider, SliderPosition position)
+            public TestSliderCircleBlueprint(Slider slider, SliderPosition position)
                 : base(slider, position)
             {
             }
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSpinnerSelectionBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSpinnerSelectionBlueprint.cs
index 4248f68a60..5007841805 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSpinnerSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSpinnerSelectionBlueprint.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
                 Child = drawableSpinner = new DrawableSpinner(spinner)
             });
 
-            AddBlueprint(new SpinnerSelectionBlueprint(drawableSpinner) { Size = new Vector2(0.5f) });
+            AddBlueprint(new SpinnerSelectionBlueprint(spinner) { Size = new Vector2(0.5f) }, drawableSpinner);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCircleSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCircleSelectionBlueprint.cs
index abbb54e3c1..b21a3e038e 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCircleSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCircleSelectionBlueprint.cs
@@ -15,8 +15,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles
 
         protected readonly HitCirclePiece CirclePiece;
 
-        public HitCircleSelectionBlueprint(DrawableHitCircle drawableCircle)
-            : base(drawableCircle)
+        public HitCircleSelectionBlueprint(HitCircle circle)
+            : base(circle)
         {
             InternalChild = CirclePiece = new HitCirclePiece();
         }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs
index 299f8fc43a..994c5cebeb 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/OsuSelectionBlueprint.cs
@@ -2,20 +2,20 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Rulesets.Edit;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints
 {
-    public abstract class OsuSelectionBlueprint<T> : OverlaySelectionBlueprint
+    public abstract class OsuSelectionBlueprint<T> : HitObjectSelectionBlueprint<T>
         where T : OsuHitObject
     {
-        protected T HitObject => (T)DrawableObject.HitObject;
+        protected new DrawableOsuHitObject DrawableObject => (DrawableOsuHitObject)base.DrawableObject;
 
         protected override bool AlwaysShowWhenSelected => true;
 
-        protected OsuSelectionBlueprint(DrawableHitObject drawableObject)
-            : base(drawableObject)
+        protected OsuSelectionBlueprint(T hitObject)
+            : base(hitObject)
         {
         }
     }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleSelectionBlueprint.cs
index dec9cd8622..ff01c7a442 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleSelectionBlueprint.cs
@@ -3,7 +3,6 @@
 
 using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Rulesets.Osu.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 {
@@ -13,7 +12,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
         private readonly SliderPosition position;
 
-        public SliderCircleSelectionBlueprint(DrawableSlider slider, SliderPosition position)
+        public SliderCircleSelectionBlueprint(Slider slider, SliderPosition position)
             : base(slider)
         {
             this.position = position;
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 88fcb1e715..939f4cdc3e 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -16,7 +16,6 @@ using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Compose;
 using osuTK;
@@ -33,8 +32,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         [CanBeNull]
         protected PathControlPointVisualiser ControlPointVisualiser { get; private set; }
 
-        private readonly DrawableSlider slider;
-
         [Resolved(CanBeNull = true)]
         private HitObjectComposer composer { get; set; }
 
@@ -52,10 +49,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         private readonly BindableList<PathControlPoint> controlPoints = new BindableList<PathControlPoint>();
         private readonly IBindable<int> pathVersion = new Bindable<int>();
 
-        public SliderSelectionBlueprint(DrawableSlider slider)
+        public SliderSelectionBlueprint(Slider slider)
             : base(slider)
         {
-            this.slider = slider;
         }
 
         [BackgroundDependencyLoader]
@@ -64,8 +60,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             InternalChildren = new Drawable[]
             {
                 BodyPiece = new SliderBodyPiece(),
-                HeadBlueprint = CreateCircleSelectionBlueprint(slider, SliderPosition.Start),
-                TailBlueprint = CreateCircleSelectionBlueprint(slider, SliderPosition.End),
+                HeadBlueprint = CreateCircleSelectionBlueprint(HitObject, SliderPosition.Start),
+                TailBlueprint = CreateCircleSelectionBlueprint(HitObject, SliderPosition.End),
             };
         }
 
@@ -103,7 +99,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
         protected override void OnSelected()
         {
-            AddInternal(ControlPointVisualiser = new PathControlPointVisualiser(slider.HitObject, true)
+            AddInternal(ControlPointVisualiser = new PathControlPointVisualiser(HitObject, true)
             {
                 RemoveControlPointsRequested = removeControlPoints
             });
@@ -215,7 +211,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             }
 
             // If there are 0 or 1 remaining control points, the slider is in a degenerate (single point) form and should be deleted
-            if (controlPoints.Count <= 1 || !slider.HitObject.Path.HasValidLength)
+            if (controlPoints.Count <= 1 || !HitObject.Path.HasValidLength)
             {
                 placementHandler?.Delete(HitObject);
                 return;
@@ -245,6 +241,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
             BodyPiece.ReceivePositionalInputAt(screenSpacePos) || ControlPointVisualiser?.Pieces.Any(p => p.ReceivePositionalInputAt(screenSpacePos)) == true;
 
-        protected virtual SliderCircleSelectionBlueprint CreateCircleSelectionBlueprint(DrawableSlider slider, SliderPosition position) => new SliderCircleSelectionBlueprint(slider, position);
+        protected virtual SliderCircleSelectionBlueprint CreateCircleSelectionBlueprint(Slider slider, SliderPosition position) => new SliderCircleSelectionBlueprint(slider, position);
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerSelectionBlueprint.cs
index f05d4f8435..ee573d1a01 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerSelectionBlueprint.cs
@@ -3,7 +3,6 @@
 
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners.Components;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners
@@ -12,7 +11,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners
     {
         private readonly SpinnerPiece piece;
 
-        public SpinnerSelectionBlueprint(DrawableSpinner spinner)
+        public SpinnerSelectionBlueprint(Spinner spinner)
             : base(spinner)
         {
             InternalChild = piece = new SpinnerPiece();
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs b/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs
index abac5eb56e..dc8c3d6107 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuBlueprintContainer.cs
@@ -3,11 +3,10 @@
 
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners;
-using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit.Compose.Components;
 
 namespace osu.Game.Rulesets.Osu.Edit
@@ -21,21 +20,21 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         protected override SelectionHandler<HitObject> CreateSelectionHandler() => new OsuSelectionHandler();
 
-        public override OverlaySelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject)
+        public override HitObjectSelectionBlueprint CreateHitObjectBlueprintFor(HitObject hitObject)
         {
             switch (hitObject)
             {
-                case DrawableHitCircle circle:
+                case HitCircle circle:
                     return new HitCircleSelectionBlueprint(circle);
 
-                case DrawableSlider slider:
+                case Slider slider:
                     return new SliderSelectionBlueprint(slider);
 
-                case DrawableSpinner spinner:
+                case Spinner spinner:
                     return new SpinnerSelectionBlueprint(spinner);
             }
 
-            return base.CreateBlueprintFor(hitObject);
+            return base.CreateHitObjectBlueprintFor(hitObject);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSelectionBlueprint.cs b/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSelectionBlueprint.cs
index 62f69122cc..01b90c4bca 100644
--- a/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/Blueprints/TaikoSelectionBlueprint.cs
@@ -3,14 +3,14 @@
 
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Edit;
-using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Objects;
 using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.Edit.Blueprints
 {
-    public class TaikoSelectionBlueprint : OverlaySelectionBlueprint
+    public class TaikoSelectionBlueprint : HitObjectSelectionBlueprint
     {
-        public TaikoSelectionBlueprint(DrawableHitObject hitObject)
+        public TaikoSelectionBlueprint(HitObject hitObject)
             : base(hitObject)
         {
             RelativeSizeAxes = Axes.None;
diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.cs
index b1b08a9461..a465638779 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoBlueprintContainer.cs
@@ -3,7 +3,6 @@
 
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.Edit.Blueprints;
 using osu.Game.Screens.Edit.Compose.Components;
 
@@ -18,7 +17,7 @@ namespace osu.Game.Rulesets.Taiko.Edit
 
         protected override SelectionHandler<HitObject> CreateSelectionHandler() => new TaikoSelectionHandler();
 
-        public override OverlaySelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject) =>
+        public override HitObjectSelectionBlueprint CreateHitObjectBlueprintFor(HitObject hitObject) =>
             new TaikoSelectionBlueprint(hitObject);
     }
 }
diff --git a/osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs b/osu.Game/Rulesets/Edit/HitObjectSelectionBlueprint.cs
similarity index 68%
rename from osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs
rename to osu.Game/Rulesets/Edit/HitObjectSelectionBlueprint.cs
index 7911cf874b..56434b1d82 100644
--- a/osu.Game/Rulesets/Edit/OverlaySelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectSelectionBlueprint.cs
@@ -9,12 +9,12 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Edit
 {
-    public abstract class OverlaySelectionBlueprint : SelectionBlueprint<HitObject>
+    public abstract class HitObjectSelectionBlueprint : SelectionBlueprint<HitObject>
     {
         /// <summary>
-        /// The <see cref="DrawableHitObject"/> which this <see cref="OverlaySelectionBlueprint"/> applies to.
+        /// The <see cref="DrawableHitObject"/> which this <see cref="HitObjectSelectionBlueprint"/> applies to.
         /// </summary>
-        public readonly DrawableHitObject DrawableObject;
+        public DrawableHitObject DrawableObject { get; internal set; }
 
         /// <summary>
         /// Whether the blueprint should be shown even when the <see cref="DrawableObject"/> is not alive.
@@ -23,10 +23,9 @@ namespace osu.Game.Rulesets.Edit
 
         protected override bool ShouldBeAlive => (DrawableObject.IsAlive && DrawableObject.IsPresent) || (AlwaysShowWhenSelected && State == SelectionState.Selected);
 
-        protected OverlaySelectionBlueprint(DrawableHitObject drawableObject)
-            : base(drawableObject.HitObject)
+        protected HitObjectSelectionBlueprint(HitObject hitObject)
+            : base(hitObject)
         {
-            DrawableObject = drawableObject;
         }
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => DrawableObject.ReceivePositionalInputAt(screenSpacePos);
@@ -35,4 +34,15 @@ namespace osu.Game.Rulesets.Edit
 
         public override Quad SelectionQuad => DrawableObject.ScreenSpaceDrawQuad;
     }
+
+    public abstract class HitObjectSelectionBlueprint<T> : HitObjectSelectionBlueprint
+        where T : HitObject
+    {
+        public T HitObject => (T)Item;
+
+        protected HitObjectSelectionBlueprint(T item)
+            : base(item)
+        {
+        }
+    }
 }
diff --git a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
index 55703a2cd3..f59ad8bfa2 100644
--- a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
@@ -105,34 +105,34 @@ namespace osu.Game.Rulesets.Edit
         protected override bool ShouldBeConsideredForInput(Drawable child) => State == SelectionState.Selected;
 
         /// <summary>
-        /// Selects this <see cref="OverlaySelectionBlueprint"/>, causing it to become visible.
+        /// Selects this <see cref="HitObjectSelectionBlueprint"/>, causing it to become visible.
         /// </summary>
         public void Select() => State = SelectionState.Selected;
 
         /// <summary>
-        /// Deselects this <see cref="OverlaySelectionBlueprint"/>, causing it to become invisible.
+        /// Deselects this <see cref="HitObjectSelectionBlueprint"/>, causing it to become invisible.
         /// </summary>
         public void Deselect() => State = SelectionState.NotSelected;
 
         /// <summary>
-        /// Toggles the selection state of this <see cref="OverlaySelectionBlueprint"/>.
+        /// Toggles the selection state of this <see cref="HitObjectSelectionBlueprint"/>.
         /// </summary>
         public void ToggleSelection() => State = IsSelected ? SelectionState.NotSelected : SelectionState.Selected;
 
         public bool IsSelected => State == SelectionState.Selected;
 
         /// <summary>
-        /// The <see cref="MenuItem"/>s to be displayed in the context menu for this <see cref="OverlaySelectionBlueprint"/>.
+        /// The <see cref="MenuItem"/>s to be displayed in the context menu for this <see cref="HitObjectSelectionBlueprint"/>.
         /// </summary>
         public virtual MenuItem[] ContextMenuItems => Array.Empty<MenuItem>();
 
         /// <summary>
-        /// The screen-space point that causes this <see cref="OverlaySelectionBlueprint"/> to be selected via a drag.
+        /// The screen-space point that causes this <see cref="HitObjectSelectionBlueprint"/> to be selected via a drag.
         /// </summary>
         public virtual Vector2 ScreenSpaceSelectionPoint => ScreenSpaceDrawQuad.Centre;
 
         /// <summary>
-        /// The screen-space quad that outlines this <see cref="OverlaySelectionBlueprint"/> for selections.
+        /// The screen-space quad that outlines this <see cref="HitObjectSelectionBlueprint"/> for selections.
         /// </summary>
         public virtual Quad SelectionQuad => ScreenSpaceDrawQuad;
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 6c174e563e..95f4069edb 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -16,7 +16,6 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Screens.Edit.Components.TernaryButtons;
 using osuTK;
@@ -246,10 +245,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (drawable == null)
                 return null;
 
-            return CreateBlueprintFor(drawable);
+            return CreateHitObjectBlueprintFor(item).With(b => b.DrawableObject = drawable);
         }
 
-        public virtual OverlaySelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject) => null;
+        public virtual HitObjectSelectionBlueprint CreateHitObjectBlueprintFor(HitObject hitObject) => null;
 
         protected override void OnBlueprintAdded(HitObject item)
         {
diff --git a/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs b/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
index 4d4f4b76c6..e32dcc81ee 100644
--- a/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
@@ -7,7 +7,7 @@ using osuTK;
 namespace osu.Game.Screens.Edit.Compose.Components
 {
     /// <summary>
-    /// An event which occurs when a <see cref="OverlaySelectionBlueprint"/> is moved.
+    /// An event which occurs when a <see cref="HitObjectSelectionBlueprint"/> is moved.
     /// </summary>
     public class MoveSelectionEvent<T>
     {
diff --git a/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs b/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs
index 1176361679..dc12a4999d 100644
--- a/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs
+++ b/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs
@@ -5,6 +5,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Timing;
 using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Tests.Visual
 {
@@ -22,10 +23,11 @@ namespace osu.Game.Tests.Visual
             });
         }
 
-        protected void AddBlueprint(OverlaySelectionBlueprint blueprint)
+        protected void AddBlueprint(HitObjectSelectionBlueprint blueprint, DrawableHitObject drawableObject)
         {
             Add(blueprint.With(d =>
             {
+                d.DrawableObject = drawableObject;
                 d.Depth = float.MinValue;
                 d.Select();
             }));

From 94538b38429f5d7a2447c44e0617f7c868e44437 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Thu, 13 May 2021 12:56:36 +0200
Subject: [PATCH 3424/3722] Remove accidental whitespace

---
 osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs b/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs
index 1cbdc43140..39fbf11d51 100644
--- a/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs
@@ -90,7 +90,7 @@ namespace osu.Game.Tests.Editing.Checks
         {
             var context = getContext(64);
 
-            var issues = check.Run( context).ToList();
+            var issues = check.Run(context).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(1));
             Assert.That(issues.Single().Template is CheckAudioQuality.IssueTemplateTooLowBitrate);

From 1ae57a6105b124bbfb39a8a2f9e980014385f6f0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 13 May 2021 20:11:04 +0900
Subject: [PATCH 3425/3722] Fix hold note input test

Not sure why this was checking visibility. If it needs to be tested, it
does not belong in an "Input" test.
---
 osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
index 668487f673..aa4eb77280 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs
@@ -5,13 +5,11 @@ using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Screens;
-using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Objects;
-using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.Replays;
 using osu.Game.Rulesets.Mania.Scoring;
 using osu.Game.Rulesets.Objects;
@@ -414,13 +412,6 @@ namespace osu.Game.Rulesets.Mania.Tests
             AddUntilStep("Beatmap at 0", () => Beatmap.Value.Track.CurrentTime == 0);
             AddUntilStep("Wait until player is loaded", () => currentPlayer.IsCurrentScreen());
 
-            AddUntilStep("wait for head", () => currentPlayer.GameplayClockContainer.GameplayClock.CurrentTime >= time_head);
-            AddAssert("head is visible",
-                () => currentPlayer.ChildrenOfType<DrawableHoldNote>()
-                                   .Single(note => note.HitObject == beatmap.HitObjects[0])
-                                   .Head
-                                   .Alpha == 1);
-
             AddUntilStep("Wait for completion", () => currentPlayer.ScoreProcessor.HasCompleted.Value);
         }
 

From 98e77a30d39910c35593ac89ea7369787b6b3fb6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 13 May 2021 20:13:50 +0900
Subject: [PATCH 3426/3722] Move column changing logic to ManiaSelectionHandler

---
 .../Edit/ManiaSelectionHandler.cs             |  5 ++-
 osu.Game.Rulesets.Mania/UI/Stage.cs           | 44 ++-----------------
 2 files changed, 7 insertions(+), 42 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
index 7042110423..83fafbc9d1 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
@@ -59,8 +59,9 @@ namespace osu.Game.Rulesets.Mania.Edit
 
             EditorBeatmap.PerformOnSelection(h =>
             {
-                if (h is ManiaHitObject maniaObj)
-                    maniaObj.Column += columnDelta;
+                maniaPlayfield.Remove(h);
+                ((ManiaHitObject)h).Column += columnDelta;
+                maniaPlayfield.Add(h);
             });
         }
     }
diff --git a/osu.Game.Rulesets.Mania/UI/Stage.cs b/osu.Game.Rulesets.Mania/UI/Stage.cs
index eee75f3200..8c703e7a8a 100644
--- a/osu.Game.Rulesets.Mania/UI/Stage.cs
+++ b/osu.Game.Rulesets.Mania/UI/Stage.cs
@@ -139,49 +139,13 @@ namespace osu.Game.Rulesets.Mania.UI
             NewResult += OnNewResult;
         }
 
-        public override void Add(HitObject hitObject)
-        {
-            var maniaObject = (ManiaHitObject)hitObject;
-            int columnIndex = -1;
+        public override void Add(HitObject hitObject) => Columns.ElementAt(((ManiaHitObject)hitObject).Column - firstColumnIndex).Add(hitObject);
 
-            maniaObject.ColumnBindable.BindValueChanged(_ =>
-            {
-                if (columnIndex != -1)
-                    Columns.ElementAt(columnIndex).Remove(hitObject);
+        public override bool Remove(HitObject hitObject) => Columns.ElementAt(((ManiaHitObject)hitObject).Column - firstColumnIndex).Remove(hitObject);
 
-                columnIndex = maniaObject.Column - firstColumnIndex;
-                Columns.ElementAt(columnIndex).Add(hitObject);
-            }, true);
-        }
+        public override void Add(DrawableHitObject h) => Columns.ElementAt(((ManiaHitObject)h.HitObject).Column - firstColumnIndex).Add(h);
 
-        public override bool Remove(HitObject hitObject)
-        {
-            var maniaObject = (ManiaHitObject)hitObject;
-            int columnIndex = maniaObject.Column - firstColumnIndex;
-            return Columns.ElementAt(columnIndex).Remove(hitObject);
-        }
-
-        public override void Add(DrawableHitObject h)
-        {
-            var maniaObject = (ManiaHitObject)h.HitObject;
-            int columnIndex = -1;
-
-            maniaObject.ColumnBindable.BindValueChanged(_ =>
-            {
-                if (columnIndex != -1)
-                    Columns.ElementAt(columnIndex).Remove(h);
-
-                columnIndex = maniaObject.Column - firstColumnIndex;
-                Columns.ElementAt(columnIndex).Add(h);
-            }, true);
-        }
-
-        public override bool Remove(DrawableHitObject h)
-        {
-            var maniaObject = (ManiaHitObject)h.HitObject;
-            int columnIndex = maniaObject.Column - firstColumnIndex;
-            return Columns.ElementAt(columnIndex).Remove(h);
-        }
+        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));
 

From 86042e176387aaf259d1ac4a378058af74f4c6cb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 13 May 2021 20:56:38 +0900
Subject: [PATCH 3427/3722] Implement HitObjectContainerEventQueue

---
 .../Compose/HitObjectContainerEventQueue.cs   | 102 ++++++++++++++++++
 1 file changed, 102 insertions(+)
 create mode 100644 osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs

diff --git a/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs b/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs
new file mode 100644
index 0000000000..b22d0a75e9
--- /dev/null
+++ b/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.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.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using osu.Framework.Graphics;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Screens.Edit.Compose
+{
+    /// <summary>
+    /// A queue which processes events from the many <see cref="HitObjectContainer"/>s in a nested <see cref="Playfield"/> hierarchy.
+    /// </summary>
+    internal class HitObjectContainerEventQueue : Component
+    {
+        /// <summary>
+        /// Invoked when a <see cref="HitObject"/> becomes used by a <see cref="DrawableHitObject"/>.
+        /// </summary>
+        /// <remarks>
+        /// If the ruleset uses pooled objects, this represents the time when the <see cref="HitObject"/>s become alive.
+        /// </remarks>
+        public event Action<HitObject, DrawableHitObject> HitObjectUsageBegan;
+
+        /// <summary>
+        /// Invoked when a <see cref="HitObject"/> becomes unused by a <see cref="DrawableHitObject"/>.
+        /// </summary>
+        /// <remarks>
+        /// If the ruleset uses pooled objects, this represents the time when the <see cref="HitObject"/>s become dead.
+        /// </remarks>
+        public event Action<HitObject> HitObjectUsageFinished;
+
+        /// <summary>
+        /// Invoked when a <see cref="HitObject"/> has been transferred to another <see cref="DrawableHitObject"/>.
+        /// </summary>
+        public event Action<HitObject, DrawableHitObject> HitObjectUsageTransferred;
+
+        private readonly Playfield playfield;
+
+        /// <summary>
+        /// Creates a new <see cref="HitObjectContainerEventQueue"/>.
+        /// </summary>
+        /// <param name="playfield">The most top-level <see cref="Playfield"/>.</param>
+        public HitObjectContainerEventQueue(Playfield playfield)
+        {
+            this.playfield = playfield;
+
+            bindPlayfieldRecursive(playfield);
+        }
+
+        private void bindPlayfieldRecursive(Playfield p)
+        {
+            p.HitObjectContainer.HitObjectUsageBegan += onHitObjectUsageBegan;
+            p.HitObjectContainer.HitObjectUsageFinished += onHitObjectUsageFinished;
+
+            foreach (var nested in p.NestedPlayfields)
+                bindPlayfieldRecursive(nested);
+        }
+
+        private readonly Dictionary<HitObject, int> pendingUsagesBegan = new Dictionary<HitObject, int>();
+        private readonly Dictionary<HitObject, int> pendingUsagesFinished = new Dictionary<HitObject, int>();
+
+        private void onHitObjectUsageBegan(HitObject hitObject) => pendingUsagesBegan[hitObject] = pendingUsagesBegan.GetValueOrDefault(hitObject, 0) + 1;
+
+        private void onHitObjectUsageFinished(HitObject hitObject) => pendingUsagesFinished[hitObject] = pendingUsagesFinished.GetValueOrDefault(hitObject, 0) + 1;
+
+        protected override void Update()
+        {
+            base.Update();
+
+            foreach (var (hitObject, countBegan) in pendingUsagesBegan)
+            {
+                if (pendingUsagesFinished.TryGetValue(hitObject, out int countFinished))
+                {
+                    Debug.Assert(countFinished > 0);
+
+                    if (countBegan > countFinished)
+                    {
+                        // The hitobject is still in use, but transferred to a different HOC.
+                        HitObjectUsageTransferred?.Invoke(hitObject, playfield.AllHitObjects.Single(d => d.HitObject == hitObject));
+                        pendingUsagesFinished.Remove(hitObject);
+                    }
+                }
+                else
+                {
+                    // This is a new usage of the hitobject.
+                    HitObjectUsageBegan?.Invoke(hitObject, playfield.AllHitObjects.Single(d => d.HitObject == hitObject));
+                }
+            }
+
+            // Go through any remaining pending finished usages.
+            foreach (var (hitObject, _) in pendingUsagesFinished)
+                HitObjectUsageFinished?.Invoke(hitObject);
+
+            pendingUsagesBegan.Clear();
+            pendingUsagesFinished.Clear();
+        }
+    }
+}

From aaf31af32668d4fd9560c7645c6139a3e021b9c6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 13 May 2021 21:16:19 +0900
Subject: [PATCH 3428/3722] Add blueprint transferral

---
 .../Compose/Components/BlueprintContainer.cs  |  7 +++++
 .../Components/ComposeBlueprintContainer.cs   |  9 +++++++
 .../Components/EditorBlueprintContainer.cs    | 18 +++++++------
 .../Compose/HitObjectContainerEventQueue.cs   | 27 ++++++++++---------
 4 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 361e98e0dd..951cc99c85 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -276,6 +276,13 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
         }
 
+        /// <summary>
+        /// Retrieves an item's blueprint.
+        /// </summary>
+        /// <param name="item">The item to retrieve the blueprint of.</param>
+        /// <returns>The blueprint.</returns>
+        protected SelectionBlueprint<T> GetBlueprintFor(T item) => blueprintMap[item];
+
         #endregion
 
         #region Selection
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 95f4069edb..e231f7f648 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -16,6 +16,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Screens.Edit.Components.TernaryButtons;
 using osuTK;
@@ -73,6 +74,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
             }
         }
 
+        protected override void TransferBlueprintFor(HitObject hitObject, DrawableHitObject drawableObject)
+        {
+            base.TransferBlueprintFor(hitObject, drawableObject);
+
+            var blueprint = (HitObjectSelectionBlueprint)GetBlueprintFor(hitObject);
+            blueprint.DrawableObject = drawableObject;
+        }
+
         protected override bool OnKeyDown(KeyDownEvent e)
         {
             if (e.ControlPressed)
diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
index db322faf65..063023c849 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Screens.Edit.Compose.Components
 {
@@ -65,8 +66,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 foreach (var obj in Composer.HitObjects)
                     AddBlueprintFor(obj.HitObject);
 
-                Composer.Playfield.HitObjectUsageBegan += AddBlueprintFor;
-                Composer.Playfield.HitObjectUsageFinished += RemoveBlueprintFor;
+                var eventQueue = new HitObjectContainerEventQueue(Composer.Playfield);
+                eventQueue.HitObjectUsageBegan += AddBlueprintFor;
+                eventQueue.HitObjectUsageFinished += RemoveBlueprintFor;
+                eventQueue.HitObjectUsageTransferred += TransferBlueprintFor;
+                AddInternal(eventQueue);
             }
         }
 
@@ -100,6 +104,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
             base.AddBlueprintFor(item);
         }
 
+        protected virtual void TransferBlueprintFor(HitObject hitObject, DrawableHitObject drawableObject)
+        {
+        }
+
         protected override void DragOperationCompleted()
         {
             base.DragOperationCompleted();
@@ -152,12 +160,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 Beatmap.HitObjectAdded -= AddBlueprintFor;
                 Beatmap.HitObjectRemoved -= RemoveBlueprintFor;
             }
-
-            if (Composer != null)
-            {
-                Composer.Playfield.HitObjectUsageBegan -= AddBlueprintFor;
-                Composer.Playfield.HitObjectUsageFinished -= RemoveBlueprintFor;
-            }
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs b/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs
index b22d0a75e9..26f5a28113 100644
--- a/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs
+++ b/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -23,7 +24,7 @@ namespace osu.Game.Screens.Edit.Compose
         /// <remarks>
         /// If the ruleset uses pooled objects, this represents the time when the <see cref="HitObject"/>s become alive.
         /// </remarks>
-        public event Action<HitObject, DrawableHitObject> HitObjectUsageBegan;
+        public event Action<HitObject> HitObjectUsageBegan;
 
         /// <summary>
         /// Invoked when a <see cref="HitObject"/> becomes unused by a <see cref="DrawableHitObject"/>.
@@ -44,20 +45,12 @@ namespace osu.Game.Screens.Edit.Compose
         /// Creates a new <see cref="HitObjectContainerEventQueue"/>.
         /// </summary>
         /// <param name="playfield">The most top-level <see cref="Playfield"/>.</param>
-        public HitObjectContainerEventQueue(Playfield playfield)
+        public HitObjectContainerEventQueue([NotNull] Playfield playfield)
         {
             this.playfield = playfield;
 
-            bindPlayfieldRecursive(playfield);
-        }
-
-        private void bindPlayfieldRecursive(Playfield p)
-        {
-            p.HitObjectContainer.HitObjectUsageBegan += onHitObjectUsageBegan;
-            p.HitObjectContainer.HitObjectUsageFinished += onHitObjectUsageFinished;
-
-            foreach (var nested in p.NestedPlayfields)
-                bindPlayfieldRecursive(nested);
+            playfield.HitObjectUsageBegan += onHitObjectUsageBegan;
+            playfield.HitObjectUsageFinished += onHitObjectUsageFinished;
         }
 
         private readonly Dictionary<HitObject, int> pendingUsagesBegan = new Dictionary<HitObject, int>();
@@ -87,7 +80,7 @@ namespace osu.Game.Screens.Edit.Compose
                 else
                 {
                     // This is a new usage of the hitobject.
-                    HitObjectUsageBegan?.Invoke(hitObject, playfield.AllHitObjects.Single(d => d.HitObject == hitObject));
+                    HitObjectUsageBegan?.Invoke(hitObject);
                 }
             }
 
@@ -98,5 +91,13 @@ namespace osu.Game.Screens.Edit.Compose
             pendingUsagesBegan.Clear();
             pendingUsagesFinished.Clear();
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            playfield.HitObjectUsageBegan -= onHitObjectUsageBegan;
+            playfield.HitObjectUsageFinished -= onHitObjectUsageFinished;
+        }
     }
 }

From 2307889bf81762d647718a17d0d4e326782dd4b5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 13 May 2021 21:41:06 +0900
Subject: [PATCH 3429/3722] Fix incorrect cast

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

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
index 8a1446db32..a0a43ed6ca 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs
@@ -22,8 +22,8 @@ namespace osu.Game.Rulesets.Mania.Edit
 
         public override bool HandleMovement(MoveSelectionEvent<HitObject> moveEvent)
         {
-            var maniaBlueprint = (HitObjectSelectionBlueprint<ManiaHitObject>)moveEvent.Blueprint;
-            int lastColumn = maniaBlueprint.HitObject.Column;
+            var hitObjectBlueprint = (HitObjectSelectionBlueprint)moveEvent.Blueprint;
+            int lastColumn = ((ManiaHitObject)hitObjectBlueprint.Item).Column;
 
             performColumnMovement(lastColumn, moveEvent);
 

From 362a09ca73d491890698e1f84c6de2239ee6b129 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 13 May 2021 21:41:18 +0900
Subject: [PATCH 3430/3722] Fix up + reduce complexity of HOCEventQueue

---
 .../Compose/HitObjectContainerEventQueue.cs   | 70 ++++++++++++-------
 1 file changed, 46 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs b/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs
index 26f5a28113..7c21573b18 100644
--- a/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs
+++ b/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Graphics;
@@ -53,43 +52,59 @@ namespace osu.Game.Screens.Edit.Compose
             playfield.HitObjectUsageFinished += onHitObjectUsageFinished;
         }
 
-        private readonly Dictionary<HitObject, int> pendingUsagesBegan = new Dictionary<HitObject, int>();
-        private readonly Dictionary<HitObject, int> pendingUsagesFinished = new Dictionary<HitObject, int>();
+        private readonly Dictionary<HitObject, EventType> pendingEvents = new Dictionary<HitObject, EventType>();
 
-        private void onHitObjectUsageBegan(HitObject hitObject) => pendingUsagesBegan[hitObject] = pendingUsagesBegan.GetValueOrDefault(hitObject, 0) + 1;
+        private void onHitObjectUsageBegan(HitObject hitObject) => updateEvent(hitObject, EventType.Began);
 
-        private void onHitObjectUsageFinished(HitObject hitObject) => pendingUsagesFinished[hitObject] = pendingUsagesFinished.GetValueOrDefault(hitObject, 0) + 1;
+        private void onHitObjectUsageFinished(HitObject hitObject) => updateEvent(hitObject, EventType.Finished);
+
+        private void updateEvent(HitObject hitObject, EventType newEvent)
+        {
+            if (!pendingEvents.TryGetValue(hitObject, out EventType existingEvent))
+            {
+                pendingEvents[hitObject] = newEvent;
+                return;
+            }
+
+            switch (existingEvent, newEvent)
+            {
+                case (EventType.Transferred, EventType.Finished):
+                    pendingEvents[hitObject] = EventType.Finished;
+                    break;
+
+                case (EventType.Began, EventType.Finished):
+                case (EventType.Finished, EventType.Began):
+                    pendingEvents[hitObject] = EventType.Transferred;
+                    break;
+
+                default:
+                    throw new ArgumentOutOfRangeException($"Unexpected event update ({existingEvent} => {newEvent}).");
+            }
+        }
 
         protected override void Update()
         {
             base.Update();
 
-            foreach (var (hitObject, countBegan) in pendingUsagesBegan)
+            foreach (var (hitObject, e) in pendingEvents)
             {
-                if (pendingUsagesFinished.TryGetValue(hitObject, out int countFinished))
+                switch (e)
                 {
-                    Debug.Assert(countFinished > 0);
+                    case EventType.Began:
+                        HitObjectUsageBegan?.Invoke(hitObject);
+                        break;
 
-                    if (countBegan > countFinished)
-                    {
-                        // The hitobject is still in use, but transferred to a different HOC.
+                    case EventType.Transferred:
                         HitObjectUsageTransferred?.Invoke(hitObject, playfield.AllHitObjects.Single(d => d.HitObject == hitObject));
-                        pendingUsagesFinished.Remove(hitObject);
-                    }
-                }
-                else
-                {
-                    // This is a new usage of the hitobject.
-                    HitObjectUsageBegan?.Invoke(hitObject);
+                        break;
+
+                    case EventType.Finished:
+                        HitObjectUsageFinished?.Invoke(hitObject);
+                        break;
                 }
             }
 
-            // Go through any remaining pending finished usages.
-            foreach (var (hitObject, _) in pendingUsagesFinished)
-                HitObjectUsageFinished?.Invoke(hitObject);
-
-            pendingUsagesBegan.Clear();
-            pendingUsagesFinished.Clear();
+            pendingEvents.Clear();
         }
 
         protected override void Dispose(bool isDisposing)
@@ -99,5 +114,12 @@ namespace osu.Game.Screens.Edit.Compose
             playfield.HitObjectUsageBegan -= onHitObjectUsageBegan;
             playfield.HitObjectUsageFinished -= onHitObjectUsageFinished;
         }
+
+        private enum EventType
+        {
+            Began,
+            Finished,
+            Transferred
+        }
     }
 }

From 1e23c535070102c326ca609f56b0d68765bcc25f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 13 May 2021 21:59:38 +0900
Subject: [PATCH 3431/3722] Fix inspection

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

diff --git a/osu.Game/Skinning/SkinnableDrawable.cs b/osu.Game/Skinning/SkinnableDrawable.cs
index 77f7cf5c3f..fc2730ca44 100644
--- a/osu.Game/Skinning/SkinnableDrawable.cs
+++ b/osu.Game/Skinning/SkinnableDrawable.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Skinning
         /// Whether the drawable component should be centered in available space.
         /// Defaults to true.
         /// </summary>
-        public bool CentreComponent { get; set; } = true;
+        public bool CentreComponent = true;
 
         public new Axes AutoSizeAxes
         {
@@ -42,7 +42,8 @@ namespace osu.Game.Skinning
         /// <param name="defaultImplementation">A function to create the default skin implementation of this element.</param>
         /// <param name="allowFallback">A conditional to decide whether to allow fallback to the default implementation if a skinned element is not present.</param>
         /// <param name="confineMode">How (if at all) the <see cref="Drawable"/> should be resize to fit within our own bounds.</param>
-        public SkinnableDrawable(ISkinComponent component, Func<ISkinComponent, Drawable> defaultImplementation = null, Func<ISkinSource, bool> allowFallback = null, ConfineMode confineMode = ConfineMode.NoScaling)
+        public SkinnableDrawable(ISkinComponent component, Func<ISkinComponent, Drawable> defaultImplementation = null, Func<ISkinSource, bool> allowFallback = null,
+                                 ConfineMode confineMode = ConfineMode.NoScaling)
             : this(component, allowFallback, confineMode)
         {
             createDefault = defaultImplementation;

From 4cf4817ad2abc61de9f754b7cd9e714bd19b74e0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 13 May 2021 22:11:58 +0900
Subject: [PATCH 3432/3722] Remove redundant parens

---
 osu.Game/Skinning/Editor/SkinSelectionHandler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index f7eec4d661..79dd45c07c 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -124,7 +124,7 @@ namespace osu.Game.Skinning.Editor
             {
                 var drawable = (Drawable)item;
 
-                var previousAnchor = (drawable.AnchorPosition);
+                var previousAnchor = drawable.AnchorPosition;
                 drawable.Anchor = anchor;
                 drawable.Position -= drawable.AnchorPosition - previousAnchor;
             }

From 38c0ba2d1034b756f5d6e8b1f007afee44c9e648 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 13 May 2021 16:16:19 +0300
Subject: [PATCH 3433/3722] Implement current year highlight in YearsPanel

---
 osu.Game/Overlays/News/Sidebar/YearsPanel.cs | 39 +++++++++++++-------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
index 2a4e2024d2..2d405e832b 100644
--- a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
@@ -12,6 +12,7 @@ using osu.Game.Graphics;
 using osu.Framework.Bindables;
 using osu.Game.Online.API.Requests.Responses;
 using System;
+using osuTK.Graphics;
 
 namespace osu.Game.Overlays.News.Sidebar
 {
@@ -58,7 +59,7 @@ namespace osu.Game.Overlays.News.Sidebar
                     return;
                 }
 
-                gridPlaceholder.Child = new YearsGridContainer(m.NewValue.Years);
+                gridPlaceholder.Child = new YearsGridContainer(m.NewValue.Years, m.NewValue.CurrentYear);
                 Show();
             }, true);
         }
@@ -68,16 +69,19 @@ namespace osu.Game.Overlays.News.Sidebar
             protected override IEnumerable<Drawable> EffectTargets => new[] { text };
 
             private readonly OsuSpriteText text;
+            private readonly bool isCurrent;
 
-            public YearButton(int year)
+            public YearButton(int year, bool isCurrent)
             {
+                this.isCurrent = isCurrent;
+
                 RelativeSizeAxes = Axes.X;
                 Height = 15;
                 Child = text = new OsuSpriteText
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Font = OsuFont.GetFont(size: 12),
+                    Font = OsuFont.GetFont(size: 12, weight: isCurrent ? FontWeight.SemiBold : FontWeight.Medium),
                     Text = year.ToString()
                 };
             }
@@ -85,8 +89,8 @@ namespace osu.Game.Overlays.News.Sidebar
             [BackgroundDependencyLoader]
             private void load(OverlayColourProvider colourProvider)
             {
-                IdleColour = colourProvider.Light2;
-                HoverColour = colourProvider.Light1;
+                IdleColour = isCurrent ? Color4.White : colourProvider.Light2;
+                HoverColour = isCurrent ? Color4.White : colourProvider.Light1;
                 Action = () => { }; // Avoid button being disabled since there's no proper action assigned.
             }
         }
@@ -97,18 +101,16 @@ namespace osu.Game.Overlays.News.Sidebar
             private const float spacing = 5f;
 
             private readonly int rowCount;
-            private readonly int[] years;
 
-            public YearsGridContainer(int[] years)
+            public YearsGridContainer(int[] years, int currentYear)
             {
-                this.years = years;
                 rowCount = (int)Math.Ceiling((float)years.Length / column_count);
 
                 RelativeSizeAxes = Axes.X;
                 AutoSizeAxes = Axes.Y;
                 RowDimensions = getRowDimensions();
                 ColumnDimensions = getColumnDimensions();
-                Content = createContent();
+                Content = createContent(years, currentYear);
             }
 
             private Dimension[] getRowDimensions()
@@ -129,7 +131,7 @@ namespace osu.Game.Overlays.News.Sidebar
                 return columnDimensions;
             }
 
-            private Drawable[][] createContent()
+            private Drawable[][] createContent(int[] years, int currentYear)
             {
                 var buttons = new Drawable[rowCount][];
 
@@ -140,9 +142,17 @@ namespace osu.Game.Overlays.News.Sidebar
                     for (int j = 0; j < column_count; j++)
                     {
                         var index = i * column_count + j;
-                        buttons[i][j] = index >= years.Length
-                            ? Empty()
-                            : new Container
+
+                        if (index >= years.Length)
+                        {
+                            buttons[i][j] = Empty();
+                        }
+                        else
+                        {
+                            var year = years[index];
+                            var isCurrent = year == currentYear;
+
+                            buttons[i][j] = new Container
                             {
                                 RelativeSizeAxes = Axes.X,
                                 AutoSizeAxes = Axes.Y,
@@ -153,8 +163,9 @@ namespace osu.Game.Overlays.News.Sidebar
                                     Left = j == 0 ? 0 : spacing / 2,
                                     Right = j == column_count - 1 ? 0 : spacing / 2
                                 },
-                                Child = new YearButton(years[index])
+                                Child = new YearButton(year, isCurrent)
                             };
+                        }
                     }
                 }
 

From 6c12cae105a98f0d313d16f00b2cdfa9c4960bfb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 May 2021 22:25:11 +0900
Subject: [PATCH 3434/3722] Remove unnecessary property

---
 osu.Game/Skinning/Editor/SkinBlueprint.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinBlueprint.cs b/osu.Game/Skinning/Editor/SkinBlueprint.cs
index f7509d7b8f..7a5547296b 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprint.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprint.cs
@@ -23,11 +23,6 @@ namespace osu.Game.Skinning.Editor
 
         private Drawable drawable => (Drawable)Item;
 
-        /// <summary>
-        /// Whether the blueprint should be shown even when the <see cref="SelectionBlueprint{T}.Item"/> is not alive.
-        /// </summary>
-        protected virtual bool AlwaysShowWhenSelected => true;
-
         protected override bool ShouldBeAlive => drawable.IsAlive && Item.IsPresent;
 
         [Resolved]

From 09a5b9c872eaee74470f9e3cbe9c3e789715e882 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Thu, 13 May 2021 16:28:03 +0200
Subject: [PATCH 3435/3722] Add XMLDoc to protected members.

---
 .../Sections/Maintenance/DirectorySelectScreen.cs         | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
index 582d14fbb6..c676e1391d 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
@@ -32,8 +32,16 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
         /// <param name="directory">The selected directory</param>
         protected abstract void OnSelection(DirectoryInfo directory);
 
+        /// <summary>
+        /// Whether the current directory is considered to be valid and can be selected.
+        /// </summary>
+        /// <param name="info">The current directory.</param>
+        /// <returns>Whether the selected directory is considered valid.</returns>
         protected virtual bool IsValidDirectory(DirectoryInfo info) => true;
 
+        /// <summary>
+        /// The path at which to start selection from.
+        /// </summary>
         protected virtual DirectoryInfo InitialPath => null;
 
         public override bool AllowExternalScreenChange => false;

From 25b1443c5011fb7c5e3144e05159a92434206cc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 13 May 2021 17:50:12 +0200
Subject: [PATCH 3436/3722] Remove dead branch and mark implementation as
 temporary

The previous implementation was checking if the `x0` or `x2` anchors
were selected to decide on which way to transfer the drawable's scale,
but that check actually ends up being always true for corner anchors. To
visualise, this is how the corner anchors correspond to `Anchor` flags:

    x0  x1  x2
    |   |   |
y0 -O---O---O-
    |   |   |
y1 -O---+---O-
    |   |   |
y2 -O---O---O-
    |   |   |

The Os indicate where the reference anchors are on a selection box.
The first conditional eliminates the middle ones, which makes sense.
But after excluding them from further deliberations (marking via X):

    x0  x1  x2
    |   |   |
y0 -O---X---O-
    |   |   |
y1 -X---+---X-
    |   |   |
y2 -O---X---O-
    |   |   |

The remaining anchors always have `x0` or `x2` set. So to avoid
confusion, just always transfer one way for now. At some point this
should be torn out in favour of an actual implementation of the desired
behaviour.
---
 osu.Game/Skinning/Editor/SkinSelectionHandler.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 485cd3fe93..9bcdc6e08b 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -158,10 +158,8 @@ namespace osu.Game.Skinning.Editor
             // for now aspect lock scale adjustments that occur at corners.
             if (!reference.HasFlagFast(Anchor.x1) && !reference.HasFlagFast(Anchor.y1))
             {
-                if (reference.HasFlagFast(Anchor.x0) || reference.HasFlagFast(Anchor.x2))
-                    scale.Y = scale.X;
-                else
-                    scale.X = scale.Y;
+                // TODO: temporary implementation - only dragging the corner handles across the X axis changes size.
+                scale.Y = scale.X;
             }
         }
 

From 0caba57945ba161274132260772580b8f747e9d2 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Thu, 13 May 2021 19:28:23 +0200
Subject: [PATCH 3437/3722] Make screen properties local to
 MigrationSelectScreen.

---
 .../Settings/Sections/Maintenance/DirectorySelectScreen.cs  | 6 ------
 .../Settings/Sections/Maintenance/MigrationSelectScreen.cs  | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
index c676e1391d..6e6df14a92 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
@@ -22,8 +22,6 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
         private DirectorySelector directorySelector;
 
-        protected override OverlayActivation InitialOverlayActivationMode => OverlayActivation.Disabled;
-
         protected abstract OsuSpriteText CreateHeader();
 
         /// <summary>
@@ -44,10 +42,6 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
         /// </summary>
         protected virtual DirectoryInfo InitialPath => null;
 
-        public override bool AllowExternalScreenChange => false;
-
-        public override bool DisallowExternalBeatmapRulesetChanges => true;
-
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
index cfbb7d6593..6334bffe94 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
@@ -19,6 +19,12 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
         protected override DirectoryInfo InitialPath => new DirectoryInfo(storage.GetFullPath(string.Empty)).Parent;
 
+        public override bool AllowExternalScreenChange => false;
+
+        public override bool DisallowExternalBeatmapRulesetChanges => true;
+
+        public override bool HideOverlaysOnEnter => true;
+
         protected override OsuSpriteText CreateHeader() => new OsuSpriteText
         {
             Text = "Please select a new location",

From 6f248db519146eace1face0eb55c96d4c6b3784c Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Thu, 13 May 2021 19:31:10 +0200
Subject: [PATCH 3438/3722] Merge conditional expression.

---
 .../Settings/Sections/Maintenance/DirectorySelectScreen.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
index 6e6df14a92..c2366ca209 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
@@ -108,7 +108,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
             if (InitialPath != null)
                 directorySelector.CurrentPath.Value = InitialPath;
 
-            directorySelector.CurrentPath.BindValueChanged(e => selectionButton.Enabled.Value = e.NewValue != null ? IsValidDirectory(e.NewValue) : false, true);
+            directorySelector.CurrentPath.BindValueChanged(e => selectionButton.Enabled.Value = e.NewValue != null && IsValidDirectory(e.NewValue), true);
             base.LoadComplete();
         }
 

From ddceafb1b041f0360446e251f9a4755f42f114d5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 May 2021 09:38:25 +0900
Subject: [PATCH 3439/3722] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 8c24df5c2e..90d131b117 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.510.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.513.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 3eb5050e1a..587bdaf622 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.510.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.513.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
     <PackageReference Include="Sentry" Version="3.3.4" />
     <PackageReference Include="SharpCompress" Version="0.28.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index f00e20a66e..7ba7a554d6 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.510.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.513.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.510.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.513.0" />
     <PackageReference Include="SharpCompress" Version="0.28.2" />
     <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 9e8c0a7e7037e6fa118f8d1b1c2c868ca25c286d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 14 May 2021 04:25:29 +0300
Subject: [PATCH 3440/3722] Fix online play subscreens not pushing player
 loaders when starting gameplay

---
 .../OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs      | 3 ++-
 .../Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs   | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index fa18b792c3..783b8b4bf2 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -27,6 +27,7 @@ using osu.Game.Screens.OnlinePlay.Match.Components;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Participants;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate;
+using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Users;
 using osuTK;
@@ -452,7 +453,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                     return new MultiSpectatorScreen(userIds);
 
                 default:
-                    return new MultiplayerPlayer(SelectedItem.Value, userIds);
+                    return new PlayerLoader(() => new MultiplayerPlayer(SelectedItem.Value, userIds));
             }
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
index 11bc55823f..26ee21a2c3 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
@@ -13,6 +13,7 @@ using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Screens.OnlinePlay.Match;
 using osu.Game.Screens.OnlinePlay.Match.Components;
+using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Users;
 using osuTK;
@@ -271,9 +272,9 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
             }, true);
         }
 
-        protected override Screen CreateGameplayScreen() => new PlaylistsPlayer(SelectedItem.Value)
+        protected override Screen CreateGameplayScreen() => new PlayerLoader(() => new PlaylistsPlayer(SelectedItem.Value)
         {
             Exited = () => leaderboard.RefreshScores()
-        };
+        });
     }
 }

From 90e0b3374e2a975e2df4e99cffebb520653d12c9 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Fri, 14 May 2021 03:34:50 +0200
Subject: [PATCH 3441/3722] Add `#nullable enable`

Co-authored-by: Dean Herbert <pe@ppy.sh>
---
 osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs b/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs
index 53bdf3140c..13a892def4 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs
@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Beatmaps;
-
+ #nullable enable
 namespace osu.Game.Rulesets.Edit
 {
     /// <summary>

From a447f200958977b86129d5159edb9891fc6e2031 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Fri, 14 May 2021 03:38:35 +0200
Subject: [PATCH 3442/3722] Fix formatting of `#nullable enable`

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

diff --git a/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs b/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs
index 13a892def4..6feee82bda 100644
--- a/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs
+++ b/osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs
@@ -2,7 +2,9 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Beatmaps;
- #nullable enable
+
+#nullable enable
+
 namespace osu.Game.Rulesets.Edit
 {
     /// <summary>

From 447371478ea6f4843b57a409ebbfab1db1d15e78 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 May 2021 12:03:06 +0900
Subject: [PATCH 3443/3722] Switch null assignment to non-nullable warnings on

---
 osu.sln.DotSettings | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index aa8f8739c1..4ac796ccd0 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -18,7 +18,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeModifiers/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignedValueIsNeverUsed/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignmentIsFullyDiscarded/@EntryIndexedValue">DO_NOT_SHOW</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignNullToNotNullAttribute/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignNullToNotNullAttribute/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002EGlobal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AutoPropertyCanBeMadeGetOnly_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=BadAttributeBracketsSpaces/@EntryIndexedValue">WARNING</s:String>

From b36c991ba1ca714d9b47e34e705fba071e477e22 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 May 2021 12:04:38 +0900
Subject: [PATCH 3444/3722] Fix single case of incorrect usage

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

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 434683a016..5ac3401720 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -635,6 +635,9 @@ namespace osu.Game.Screens.Edit
                     case EditorScreenMode.Verify:
                         currentScreen = new VerifyScreen();
                         break;
+
+                    default:
+                        throw new InvalidOperationException("Editor menu bar switched to an unsupported mode");
                 }
 
                 LoadComponentAsync(currentScreen, newScreen =>

From 46e7d9e0edbc18a48e93db72e616a7af67482c75 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 May 2021 12:15:56 +0900
Subject: [PATCH 3445/3722] Randomise the values displayed in the skinning
 toolbox

To stop the spam of "WYSI" comments everywhere. I guess I underestimated
the negative effect this would have.
---
 osu.Game/Skinning/Editor/SkinComponentToolbox.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
index 8536cba139..59420bfc87 100644
--- a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
+++ b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Input.Events;
+using osu.Framework.Utils;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
@@ -29,8 +30,8 @@ namespace osu.Game.Skinning.Editor
         [Cached]
         private ScoreProcessor scoreProcessor = new ScoreProcessor
         {
-            Combo = { Value = 727 },
-            TotalScore = { Value = 1337377 }
+            Combo = { Value = RNG.Next(1, 1000) },
+            TotalScore = { Value = RNG.Next(1000, 10000000) }
         };
 
         [Cached(typeof(HealthProcessor))]

From 9860e482afe591d5b68916fe594b77ff913ef85e Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Fri, 14 May 2021 05:32:52 +0200
Subject: [PATCH 3446/3722] Use `TestWorkingBeatmap` instead of null in tests

Fixes the warning that #12801 will give.
---
 .../Editing/Checks/CheckConcurrentObjectsTest.cs           | 7 +++----
 osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs | 7 +++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Editing/Checks/CheckConcurrentObjectsTest.cs b/osu.Game.Tests/Editing/Checks/CheckConcurrentObjectsTest.cs
index ba0a130a25..5adb91a22e 100644
--- a/osu.Game.Tests/Editing/Checks/CheckConcurrentObjectsTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckConcurrentObjectsTest.cs
@@ -12,6 +12,7 @@ using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Tests.Beatmaps;
 
 namespace osu.Game.Tests.Editing.Checks
 {
@@ -186,10 +187,8 @@ namespace osu.Game.Tests.Editing.Checks
 
         private BeatmapVerifierContext getContext(List<HitObject> hitobjects)
         {
-            return new BeatmapVerifierContext(new Beatmap<HitObject>
-            {
-                HitObjects = hitobjects
-            }, null);
+            var beatmap = new Beatmap<HitObject> { HitObjects = hitobjects };
+            return new BeatmapVerifierContext(beatmap, new TestWorkingBeatmap(beatmap));
         }
     }
 }
diff --git a/osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs b/osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs
index 02159fa57b..639f5b5ab4 100644
--- a/osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs
@@ -12,6 +12,7 @@ using osu.Game.Rulesets.Edit.Checks;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Tests.Beatmaps;
 
 namespace osu.Game.Tests.Editing.Checks
 {
@@ -146,11 +147,13 @@ namespace osu.Game.Tests.Editing.Checks
 
         private BeatmapVerifierContext getContext(List<HitObject> hitobjects)
         {
-            return new BeatmapVerifierContext(new Beatmap<HitObject>
+            var beatmap = new Beatmap<HitObject>
             {
                 ControlPointInfo = cpi,
                 HitObjects = hitobjects
-            }, null);
+            };
+
+            return new BeatmapVerifierContext(beatmap, new TestWorkingBeatmap(beatmap));
         }
     }
 }

From 48672f8afd156556f29628b3ae246013f72c297d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 May 2021 15:02:36 +0900
Subject: [PATCH 3447/3722] Add very basic test logic to ensure `PlayerLoader`
 is present for playlists

---
 .../TestScenePlaylistsRoomSubScreen.cs        | 20 +++++++++++++++++--
 .../Screens/OnlinePlay/Match/RoomSubScreen.cs |  6 +++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs
index 319c2bc6fd..264004b6c3 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs
@@ -11,11 +11,13 @@ using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
+using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.OnlinePlay;
 using osu.Game.Screens.OnlinePlay.Playlists;
+using osu.Game.Screens.Play;
 using osu.Game.Tests.Beatmaps;
 using osu.Game.Users;
 using osuTK.Input;
@@ -24,8 +26,6 @@ namespace osu.Game.Tests.Visual.Playlists
 {
     public class TestScenePlaylistsRoomSubScreen : RoomTestScene
     {
-        protected override bool UseOnlineAPI => true;
-
         [Cached(typeof(IRoomManager))]
         private readonly TestRoomManager roomManager = new TestRoomManager();
 
@@ -41,6 +41,18 @@ namespace osu.Game.Tests.Visual.Playlists
             Dependencies.Cache(manager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, host, Beatmap.Default));
 
             manager.Import(new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo.BeatmapSet).Wait();
+
+            ((DummyAPIAccess)API).HandleRequest = req =>
+            {
+                switch (req)
+                {
+                    case CreateRoomScoreRequest createRoomScoreRequest:
+                        createRoomScoreRequest.TriggerSuccess(new APIScoreToken { ID = 1 });
+                        return true;
+                }
+
+                return false;
+            };
         }
 
         [SetUpSteps]
@@ -59,12 +71,16 @@ namespace osu.Game.Tests.Visual.Playlists
                 Room.Name.Value = "my awesome room";
                 Room.Host.Value = new User { Id = 2, Username = "peppy" };
                 Room.RecentParticipants.Add(Room.Host.Value);
+                Room.EndDate.Value = DateTimeOffset.Now.AddMinutes(5);
                 Room.Playlist.Add(new PlaylistItem
                 {
                     Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
                     Ruleset = { Value = new OsuRuleset().RulesetInfo }
                 });
             });
+
+            AddStep("start match", () => match.ChildrenOfType<PlaylistsReadyButton>().First().Click());
+            AddUntilStep("player loader loaded", () => Stack.CurrentScreen is PlayerLoader);
         }
 
         [Test]
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 68bdd9160e..28156aecf3 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -150,7 +150,11 @@ namespace osu.Game.Screens.OnlinePlay.Match
         protected void StartPlay()
         {
             sampleStart?.Play();
-            ParentScreen?.Push(CreateGameplayScreen());
+
+            // fallback is to allow this class to operate when there is no parent OnlineScreen (testing purposes).
+            var targetScreen = (Screen)ParentScreen ?? this;
+
+            targetScreen?.Push(CreateGameplayScreen());
         }
 
         /// <summary>

From dc576c19b47fa64e74bfb9fd440dfccf345bd195 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 May 2021 15:10:02 +0900
Subject: [PATCH 3448/3722] Fix a potential nullref when starting `Player` with
 autoplay enabled and beatmap fails to load

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

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index ac0c921ccf..15983d1d62 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -154,6 +154,10 @@ namespace osu.Game.Screens.Play
         {
             base.LoadComplete();
 
+            // BDL load may have aborted early.
+            if (DrawableRuleset == null)
+                return;
+
             // replays should never be recorded or played back when autoplay is enabled
             if (!Mods.Value.Any(m => m is ModAutoplay))
                 PrepareReplay();

From 8338f702c3b260dbd01e8dac1b4c19ce01364fb6 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 14 May 2021 09:32:56 +0300
Subject: [PATCH 3449/3722] Remove not required null conditional

---
 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 28156aecf3..375aac729d 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -154,7 +154,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
             // fallback is to allow this class to operate when there is no parent OnlineScreen (testing purposes).
             var targetScreen = (Screen)ParentScreen ?? this;
 
-            targetScreen?.Push(CreateGameplayScreen());
+            targetScreen.Push(CreateGameplayScreen());
         }
 
         /// <summary>

From 32ff40628973ff325c213cd51a32f2324b722df6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 May 2021 15:40:29 +0900
Subject: [PATCH 3450/3722] Add database tracking of beatmap creator `user_id`s

---
 ...BeatmapManager_BeatmapOnlineLookupQueue.cs |  26 +-
 osu.Game/Beatmaps/BeatmapMetadata.cs          |  21 +-
 ...9_AddAuthorIdToBeatmapMetadata.Designer.cs | 511 ++++++++++++++++++
 ...0514062639_AddAuthorIdToBeatmapMetadata.cs |  23 +
 .../Migrations/OsuDbContextModelSnapshot.cs   |   3 +
 5 files changed, 570 insertions(+), 14 deletions(-)
 create mode 100644 osu.Game/Migrations/20210514062639_AddAuthorIdToBeatmapMetadata.Designer.cs
 create mode 100644 osu.Game/Migrations/20210514062639_AddAuthorIdToBeatmapMetadata.cs

diff --git a/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs b/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
index 7c4b344c9e..5dff4fe282 100644
--- a/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.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 System.Threading;
@@ -83,6 +82,12 @@ namespace osu.Game.Beatmaps
                         beatmap.BeatmapSet.OnlineBeatmapSetID = res.OnlineBeatmapSetID;
                         beatmap.OnlineBeatmapID = res.OnlineBeatmapID;
 
+                        if (beatmap.Metadata != null)
+                            beatmap.Metadata.AuthorID = res.AuthorID;
+
+                        if (beatmap.BeatmapSet.Metadata != null)
+                            beatmap.BeatmapSet.Metadata.AuthorID = res.AuthorID;
+
                         LogForModel(set, $"Online retrieval mapped {beatmap} to {res.OnlineBeatmapSetID} / {res.OnlineBeatmapID}.");
                     }
                 }
@@ -157,7 +162,7 @@ namespace osu.Game.Beatmaps
 
                         using (var cmd = db.CreateCommand())
                         {
-                            cmd.CommandText = "SELECT beatmapset_id, beatmap_id, approved FROM osu_beatmaps WHERE checksum = @MD5Hash OR beatmap_id = @OnlineBeatmapID OR filename = @Path";
+                            cmd.CommandText = "SELECT beatmapset_id, beatmap_id, approved, user_id FROM osu_beatmaps WHERE checksum = @MD5Hash OR beatmap_id = @OnlineBeatmapID OR filename = @Path";
 
                             cmd.Parameters.Add(new SqliteParameter("@MD5Hash", beatmap.MD5Hash));
                             cmd.Parameters.Add(new SqliteParameter("@OnlineBeatmapID", beatmap.OnlineBeatmapID ?? (object)DBNull.Value));
@@ -174,6 +179,12 @@ namespace osu.Game.Beatmaps
                                     beatmap.BeatmapSet.OnlineBeatmapSetID = reader.GetInt32(0);
                                     beatmap.OnlineBeatmapID = reader.GetInt32(1);
 
+                                    if (beatmap.Metadata != null)
+                                        beatmap.Metadata.AuthorID = reader.GetInt32(3);
+
+                                    if (beatmap.BeatmapSet.Metadata != null)
+                                        beatmap.BeatmapSet.Metadata.AuthorID = reader.GetInt32(3);
+
                                     LogForModel(set, $"Cached local retrieval for {beatmap}.");
                                     return true;
                                 }
@@ -194,17 +205,6 @@ namespace osu.Game.Beatmaps
                 cacheDownloadRequest?.Dispose();
                 updateScheduler?.Dispose();
             }
-
-            [Serializable]
-            [SuppressMessage("ReSharper", "InconsistentNaming")]
-            private class CachedOnlineBeatmapLookup
-            {
-                public int approved { get; set; }
-
-                public int? beatmapset_id { get; set; }
-
-                public int? beatmap_id { get; set; }
-            }
         }
     }
 }
diff --git a/osu.Game/Beatmaps/BeatmapMetadata.cs b/osu.Game/Beatmaps/BeatmapMetadata.cs
index 858da8e602..9540a216fc 100644
--- a/osu.Game/Beatmaps/BeatmapMetadata.cs
+++ b/osu.Game/Beatmaps/BeatmapMetadata.cs
@@ -34,6 +34,21 @@ namespace osu.Game.Beatmaps
         [JsonIgnore]
         public List<BeatmapSetInfo> BeatmapSets { get; set; }
 
+        /// <summary>
+        /// Helper property to deserialize a username to <see cref="User"/>.
+        /// </summary>
+        [JsonProperty(@"user_id")]
+        [Column("AuthorID")]
+        public int AuthorID
+        {
+            get => Author?.Id ?? 1;
+            set
+            {
+                Author ??= new User();
+                Author.Id = value;
+            }
+        }
+
         /// <summary>
         /// Helper property to deserialize a username to <see cref="User"/>.
         /// </summary>
@@ -42,7 +57,11 @@ namespace osu.Game.Beatmaps
         public string AuthorString
         {
             get => Author?.Username;
-            set => Author = new User { Username = value };
+            set
+            {
+                Author ??= new User();
+                Author.Username = value;
+            }
         }
 
         /// <summary>
diff --git a/osu.Game/Migrations/20210514062639_AddAuthorIdToBeatmapMetadata.Designer.cs b/osu.Game/Migrations/20210514062639_AddAuthorIdToBeatmapMetadata.Designer.cs
new file mode 100644
index 0000000000..89bab3a0fa
--- /dev/null
+++ b/osu.Game/Migrations/20210514062639_AddAuthorIdToBeatmapMetadata.Designer.cs
@@ -0,0 +1,511 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using osu.Game.Database;
+
+namespace osu.Game.Migrations
+{
+    [DbContext(typeof(OsuDbContext))]
+    [Migration("20210514062639_AddAuthorIdToBeatmapMetadata")]
+    partial class AddAuthorIdToBeatmapMetadata
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "2.2.6-servicing-10079");
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<float>("ApproachRate");
+
+                    b.Property<float>("CircleSize");
+
+                    b.Property<float>("DrainRate");
+
+                    b.Property<float>("OverallDifficulty");
+
+                    b.Property<double>("SliderMultiplier");
+
+                    b.Property<double>("SliderTickRate");
+
+                    b.HasKey("ID");
+
+                    b.ToTable("BeatmapDifficulty");
+                });
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<double>("AudioLeadIn");
+
+                    b.Property<double>("BPM");
+
+                    b.Property<int>("BaseDifficultyID");
+
+                    b.Property<int>("BeatDivisor");
+
+                    b.Property<int>("BeatmapSetInfoID");
+
+                    b.Property<bool>("Countdown");
+
+                    b.Property<double>("DistanceSpacing");
+
+                    b.Property<bool>("EpilepsyWarning");
+
+                    b.Property<int>("GridSize");
+
+                    b.Property<string>("Hash");
+
+                    b.Property<bool>("Hidden");
+
+                    b.Property<double>("Length");
+
+                    b.Property<bool>("LetterboxInBreaks");
+
+                    b.Property<string>("MD5Hash");
+
+                    b.Property<int?>("MetadataID");
+
+                    b.Property<int?>("OnlineBeatmapID");
+
+                    b.Property<string>("Path");
+
+                    b.Property<int>("RulesetID");
+
+                    b.Property<bool>("SpecialStyle");
+
+                    b.Property<float>("StackLeniency");
+
+                    b.Property<double>("StarDifficulty");
+
+                    b.Property<int>("Status");
+
+                    b.Property<string>("StoredBookmarks");
+
+                    b.Property<double>("TimelineZoom");
+
+                    b.Property<string>("Version");
+
+                    b.Property<bool>("WidescreenStoryboard");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("BaseDifficultyID");
+
+                    b.HasIndex("BeatmapSetInfoID");
+
+                    b.HasIndex("Hash");
+
+                    b.HasIndex("MD5Hash");
+
+                    b.HasIndex("MetadataID");
+
+                    b.HasIndex("OnlineBeatmapID")
+                        .IsUnique();
+
+                    b.HasIndex("RulesetID");
+
+                    b.ToTable("BeatmapInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Artist");
+
+                    b.Property<string>("ArtistUnicode");
+
+                    b.Property<string>("AudioFile");
+
+                    b.Property<int>("AuthorID")
+                        .HasColumnName("AuthorID");
+
+                    b.Property<string>("AuthorString")
+                        .HasColumnName("Author");
+
+                    b.Property<string>("BackgroundFile");
+
+                    b.Property<int>("PreviewTime");
+
+                    b.Property<string>("Source");
+
+                    b.Property<string>("Tags");
+
+                    b.Property<string>("Title");
+
+                    b.Property<string>("TitleUnicode");
+
+                    b.HasKey("ID");
+
+                    b.ToTable("BeatmapMetadata");
+                });
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("BeatmapSetInfoID");
+
+                    b.Property<int>("FileInfoID");
+
+                    b.Property<string>("Filename")
+                        .IsRequired();
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("BeatmapSetInfoID");
+
+                    b.HasIndex("FileInfoID");
+
+                    b.ToTable("BeatmapSetFileInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTimeOffset>("DateAdded");
+
+                    b.Property<bool>("DeletePending");
+
+                    b.Property<string>("Hash");
+
+                    b.Property<int?>("MetadataID");
+
+                    b.Property<int?>("OnlineBeatmapSetID");
+
+                    b.Property<bool>("Protected");
+
+                    b.Property<int>("Status");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("DeletePending");
+
+                    b.HasIndex("Hash")
+                        .IsUnique();
+
+                    b.HasIndex("MetadataID");
+
+                    b.HasIndex("OnlineBeatmapSetID")
+                        .IsUnique();
+
+                    b.ToTable("BeatmapSetInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Key")
+                        .HasColumnName("Key");
+
+                    b.Property<int?>("RulesetID");
+
+                    b.Property<int?>("SkinInfoID");
+
+                    b.Property<string>("StringValue")
+                        .HasColumnName("Value");
+
+                    b.Property<int?>("Variant");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("SkinInfoID");
+
+                    b.HasIndex("RulesetID", "Variant");
+
+                    b.ToTable("Settings");
+                });
+
+            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Hash");
+
+                    b.Property<int>("ReferenceCount");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("Hash")
+                        .IsUnique();
+
+                    b.HasIndex("ReferenceCount");
+
+                    b.ToTable("FileInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("IntAction")
+                        .HasColumnName("Action");
+
+                    b.Property<string>("KeysString")
+                        .HasColumnName("Keys");
+
+                    b.Property<int?>("RulesetID");
+
+                    b.Property<int?>("Variant");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("IntAction");
+
+                    b.HasIndex("RulesetID", "Variant");
+
+                    b.ToTable("KeyBinding");
+                });
+
+            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
+                {
+                    b.Property<int?>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("Available");
+
+                    b.Property<string>("InstantiationInfo");
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("ShortName");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("Available");
+
+                    b.HasIndex("ShortName")
+                        .IsUnique();
+
+                    b.ToTable("RulesetInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("FileInfoID");
+
+                    b.Property<string>("Filename")
+                        .IsRequired();
+
+                    b.Property<int?>("ScoreInfoID");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("FileInfoID");
+
+                    b.HasIndex("ScoreInfoID");
+
+                    b.ToTable("ScoreFileInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<double>("Accuracy")
+                        .HasColumnType("DECIMAL(1,4)");
+
+                    b.Property<int>("BeatmapInfoID");
+
+                    b.Property<int>("Combo");
+
+                    b.Property<DateTimeOffset>("Date");
+
+                    b.Property<bool>("DeletePending");
+
+                    b.Property<string>("Hash");
+
+                    b.Property<int>("MaxCombo");
+
+                    b.Property<string>("ModsJson")
+                        .HasColumnName("Mods");
+
+                    b.Property<long?>("OnlineScoreID");
+
+                    b.Property<double?>("PP");
+
+                    b.Property<int>("Rank");
+
+                    b.Property<int>("RulesetID");
+
+                    b.Property<string>("StatisticsJson")
+                        .HasColumnName("Statistics");
+
+                    b.Property<long>("TotalScore");
+
+                    b.Property<int?>("UserID")
+                        .HasColumnName("UserID");
+
+                    b.Property<string>("UserString")
+                        .HasColumnName("User");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("BeatmapInfoID");
+
+                    b.HasIndex("OnlineScoreID")
+                        .IsUnique();
+
+                    b.HasIndex("RulesetID");
+
+                    b.ToTable("ScoreInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("FileInfoID");
+
+                    b.Property<string>("Filename")
+                        .IsRequired();
+
+                    b.Property<int>("SkinInfoID");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("FileInfoID");
+
+                    b.HasIndex("SkinInfoID");
+
+                    b.ToTable("SkinFileInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Creator");
+
+                    b.Property<bool>("DeletePending");
+
+                    b.Property<string>("Hash");
+
+                    b.Property<string>("InstantiationInfo");
+
+                    b.Property<string>("Name");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("DeletePending");
+
+                    b.HasIndex("Hash")
+                        .IsUnique();
+
+                    b.ToTable("SkinInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
+                {
+                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
+                        .WithMany()
+                        .HasForeignKey("BaseDifficultyID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
+                        .WithMany("Beatmaps")
+                        .HasForeignKey("BeatmapSetInfoID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
+                        .WithMany("Beatmaps")
+                        .HasForeignKey("MetadataID");
+
+                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
+                        .WithMany()
+                        .HasForeignKey("RulesetID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
+                {
+                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
+                        .WithMany("Files")
+                        .HasForeignKey("BeatmapSetInfoID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
+                        .WithMany()
+                        .HasForeignKey("FileInfoID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
+                {
+                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
+                        .WithMany("BeatmapSets")
+                        .HasForeignKey("MetadataID");
+                });
+
+            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
+                {
+                    b.HasOne("osu.Game.Skinning.SkinInfo")
+                        .WithMany("Settings")
+                        .HasForeignKey("SkinInfoID");
+                });
+
+            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
+                {
+                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
+                        .WithMany()
+                        .HasForeignKey("FileInfoID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("osu.Game.Scoring.ScoreInfo")
+                        .WithMany("Files")
+                        .HasForeignKey("ScoreInfoID");
+                });
+
+            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
+                {
+                    b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "Beatmap")
+                        .WithMany("Scores")
+                        .HasForeignKey("BeatmapInfoID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
+                        .WithMany()
+                        .HasForeignKey("RulesetID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
+                {
+                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
+                        .WithMany()
+                        .HasForeignKey("FileInfoID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("osu.Game.Skinning.SkinInfo")
+                        .WithMany("Files")
+                        .HasForeignKey("SkinInfoID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/osu.Game/Migrations/20210514062639_AddAuthorIdToBeatmapMetadata.cs b/osu.Game/Migrations/20210514062639_AddAuthorIdToBeatmapMetadata.cs
new file mode 100644
index 0000000000..98fe9b5e13
--- /dev/null
+++ b/osu.Game/Migrations/20210514062639_AddAuthorIdToBeatmapMetadata.cs
@@ -0,0 +1,23 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace osu.Game.Migrations
+{
+    public partial class AddAuthorIdToBeatmapMetadata : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "AuthorID",
+                table: "BeatmapMetadata",
+                nullable: false,
+                defaultValue: 0);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "AuthorID",
+                table: "BeatmapMetadata");
+        }
+    }
+}
diff --git a/osu.Game/Migrations/OsuDbContextModelSnapshot.cs b/osu.Game/Migrations/OsuDbContextModelSnapshot.cs
index d4bde50b60..f518cfb42b 100644
--- a/osu.Game/Migrations/OsuDbContextModelSnapshot.cs
+++ b/osu.Game/Migrations/OsuDbContextModelSnapshot.cs
@@ -126,6 +126,9 @@ namespace osu.Game.Migrations
 
                     b.Property<string>("AudioFile");
 
+                    b.Property<int>("AuthorID")
+                        .HasColumnName("AuthorID");
+
                     b.Property<string>("AuthorString")
                         .HasColumnName("Author");
 

From d09da02673186d308e95da4482a06dade52a2a2f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 May 2021 16:03:22 +0900
Subject: [PATCH 3451/3722] Fix deleting skin elements not saving out to skin

Closes https://github.com/ppy/osu/issues/12786.
---
 osu.Game/Skinning/Editor/SkinEditor.cs        | 15 +++++++++++---
 .../Skinning/Editor/SkinSelectionHandler.cs   | 14 ++++++-------
 osu.Game/Skinning/ISkinnableTarget.cs         |  9 ++++++++-
 osu.Game/Skinning/SkinnableTargetContainer.cs | 20 +++++++++++++++----
 4 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 6427d6298b..c594f8d271 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.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;
@@ -193,14 +194,16 @@ namespace osu.Game.Skinning.Editor
             SelectedComponents.Add(component);
         }
 
+        private IEnumerable<ISkinnableTarget> availableTargets => targetScreen.ChildrenOfType<ISkinnableTarget>();
+
         private ISkinnableTarget getTarget(SkinnableTarget target)
         {
-            return targetScreen.ChildrenOfType<ISkinnableTarget>().FirstOrDefault(c => c.Target == target);
+            return availableTargets.FirstOrDefault(c => c.Target == target);
         }
 
         private void revert()
         {
-            SkinnableTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableTargetContainer>().ToArray();
+            ISkinnableTarget[] targetContainers = availableTargets.ToArray();
 
             foreach (var t in targetContainers)
             {
@@ -216,7 +219,7 @@ namespace osu.Game.Skinning.Editor
             if (!hasBegunMutating)
                 return;
 
-            SkinnableTargetContainer[] targetContainers = targetScreen.ChildrenOfType<SkinnableTargetContainer>().ToArray();
+            ISkinnableTarget[] targetContainers = availableTargets.ToArray();
 
             foreach (var t in targetContainers)
                 currentSkin.Value.UpdateDrawableTarget(t);
@@ -237,5 +240,11 @@ namespace osu.Game.Skinning.Editor
         {
             this.FadeOut(TRANSITION_DURATION, Easing.OutQuint);
         }
+
+        public void DeleteItems(ISkinnableDrawable[] items)
+        {
+            foreach (var item in items.ToArray())
+                availableTargets.FirstOrDefault(t => t.Components.Contains(item))?.Remove(item);
+        }
     }
 }
diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 9bcdc6e08b..7931a5ec41 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -4,6 +4,7 @@
 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.UserInterface;
@@ -17,6 +18,9 @@ namespace osu.Game.Skinning.Editor
 {
     public class SkinSelectionHandler : SelectionHandler<ISkinnableDrawable>
     {
+        [Resolved]
+        private SkinEditor skinEditor { get; set; }
+
         public override bool HandleRotation(float angle)
         {
             // TODO: this doesn't correctly account for origin/anchor specs being different in a multi-selection.
@@ -72,14 +76,8 @@ namespace osu.Game.Skinning.Editor
             SelectionBox.CanReverse = false;
         }
 
-        protected override void DeleteItems(IEnumerable<ISkinnableDrawable> items)
-        {
-            foreach (var i in items)
-            {
-                ((Drawable)i).Expire();
-                SelectedItems.Remove(i);
-            }
-        }
+        protected override void DeleteItems(IEnumerable<ISkinnableDrawable> items) =>
+            skinEditor.DeleteItems(items.ToArray());
 
         protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint<ISkinnableDrawable>> selection)
         {
diff --git a/osu.Game/Skinning/ISkinnableTarget.cs b/osu.Game/Skinning/ISkinnableTarget.cs
index 65b8ba7b17..15cad2c817 100644
--- a/osu.Game/Skinning/ISkinnableTarget.cs
+++ b/osu.Game/Skinning/ISkinnableTarget.cs
@@ -37,8 +37,15 @@ namespace osu.Game.Skinning
         void Reload();
 
         /// <summary>
-        /// Add the provided item to this target.
+        /// Add a new skinnable component to this target.
         /// </summary>
+        /// <param name="drawable">The component to add.</param>
         void Add(ISkinnableDrawable drawable);
+
+        /// <summary>
+        /// Remove an existing skinnable component to this target.
+        /// </summary>
+        /// <param name="component">The component to add.</param>
+        public void Remove(ISkinnableDrawable component);
     }
 }
diff --git a/osu.Game/Skinning/SkinnableTargetContainer.cs b/osu.Game/Skinning/SkinnableTargetContainer.cs
index a4d7f621eb..f055fb2533 100644
--- a/osu.Game/Skinning/SkinnableTargetContainer.cs
+++ b/osu.Game/Skinning/SkinnableTargetContainer.cs
@@ -43,10 +43,7 @@ namespace osu.Game.Skinning
             }
         }
 
-        /// <summary>
-        /// Add a new skinnable component to this target.
-        /// </summary>
-        /// <param name="component">The component to add.</param>
+        /// <inheritdoc cref="ISkinnableTarget"/>
         /// <exception cref="NotSupportedException">Thrown when attempting to add an element to a target which is not supported by the current skin.</exception>
         /// <exception cref="ArgumentException">Thrown if the provided instance is not a <see cref="Drawable"/>.</exception>
         public void Add(ISkinnableDrawable component)
@@ -61,6 +58,21 @@ namespace osu.Game.Skinning
             components.Add(component);
         }
 
+        /// <inheritdoc cref="ISkinnableTarget"/>
+        /// <exception cref="NotSupportedException">Thrown when attempting to add an element to a target which is not supported by the current skin.</exception>
+        /// <exception cref="ArgumentException">Thrown if the provided instance is not a <see cref="Drawable"/>.</exception>
+        public void Remove(ISkinnableDrawable component)
+        {
+            if (content == null)
+                throw new NotSupportedException("Attempting to add a new component to a target container which is not supported by the current skin.");
+
+            if (!(component is Drawable drawable))
+                throw new ArgumentException($"Provided argument must be of type {nameof(Drawable)}.", nameof(drawable));
+
+            content.Remove(drawable);
+            components.Remove(component);
+        }
+
         protected override void SkinChanged(ISkinSource skin, bool allowFallback)
         {
             base.SkinChanged(skin, allowFallback);

From 9069db07437154554fb6c1b55fa323dcac2c6c45 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 May 2021 16:22:19 +0900
Subject: [PATCH 3452/3722] Fix case of `hitObjects` variables

---
 .../Checks/CheckUnsnappedObjectsTest.cs       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs b/osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs
index 639f5b5ab4..882baba8fa 100644
--- a/osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs
@@ -102,12 +102,12 @@ namespace osu.Game.Tests.Editing.Checks
             }, count: 2);
 
             // Start and end are 2 ms and 1.25 ms off respectively, hence two different issues in one object.
-            var hitobjects = new List<HitObject>
+            var hitObjects = new List<HitObject>
             {
                 getSliderMock(startTime: 98, endTime: 398.75d).Object
             };
 
-            var issues = check.Run(getContext(hitobjects)).ToList();
+            var issues = check.Run(getContext(hitObjects)).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(2));
             Assert.That(issues.Any(issue => issue.Template is CheckUnsnappedObjects.IssueTemplateSmallUnsnap));
@@ -124,33 +124,33 @@ namespace osu.Game.Tests.Editing.Checks
             return mockSlider;
         }
 
-        private void assertOk(List<HitObject> hitobjects)
+        private void assertOk(List<HitObject> hitObjects)
         {
-            Assert.That(check.Run(getContext(hitobjects)), Is.Empty);
+            Assert.That(check.Run(getContext(hitObjects)), Is.Empty);
         }
 
-        private void assert1Ms(List<HitObject> hitobjects, int count = 1)
+        private void assert1Ms(List<HitObject> hitObjects, int count = 1)
         {
-            var issues = check.Run(getContext(hitobjects)).ToList();
+            var issues = check.Run(getContext(hitObjects)).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(count));
             Assert.That(issues.All(issue => issue.Template is CheckUnsnappedObjects.IssueTemplateSmallUnsnap));
         }
 
-        private void assert2Ms(List<HitObject> hitobjects, int count = 1)
+        private void assert2Ms(List<HitObject> hitObjects, int count = 1)
         {
-            var issues = check.Run(getContext(hitobjects)).ToList();
+            var issues = check.Run(getContext(hitObjects)).ToList();
 
             Assert.That(issues, Has.Count.EqualTo(count));
             Assert.That(issues.All(issue => issue.Template is CheckUnsnappedObjects.IssueTemplateLargeUnsnap));
         }
 
-        private BeatmapVerifierContext getContext(List<HitObject> hitobjects)
+        private BeatmapVerifierContext getContext(List<HitObject> hitObjects)
         {
             var beatmap = new Beatmap<HitObject>
             {
                 ControlPointInfo = cpi,
-                HitObjects = hitobjects
+                HitObjects = hitObjects
             };
 
             return new BeatmapVerifierContext(beatmap, new TestWorkingBeatmap(beatmap));

From fcb226bd206ed17e01de4aa18e0ed2ece8416f80 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 May 2021 16:23:45 +0900
Subject: [PATCH 3453/3722] Add local variable for regular access to
 `HitObjects`

---
 .../Rulesets/Edit/Checks/CheckConcurrentObjects.cs   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs b/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
index 51277298ab..ba5fbcf58d 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
@@ -23,13 +23,15 @@ namespace osu.Game.Rulesets.Edit.Checks
 
         public IEnumerable<Issue> Run(BeatmapVerifierContext context)
         {
-            for (int i = 0; i < context.Beatmap.HitObjects.Count - 1; ++i)
-            {
-                var hitobject = context.Beatmap.HitObjects[i];
+            var hitObjects = context.Beatmap.HitObjects;
 
-                for (int j = i + 1; j < context.Beatmap.HitObjects.Count; ++j)
+            for (int i = 0; i < hitObjects.Count - 1; ++i)
+            {
+                var hitobject = hitObjects[i];
+
+                for (int j = i + 1; j < hitObjects.Count; ++j)
                 {
-                    var nextHitobject = context.Beatmap.HitObjects[j];
+                    var nextHitobject = hitObjects[j];
 
                     // Accounts for rulesets with hitobjects separated by columns, such as Mania.
                     // In these cases we only care about concurrent objects within the same column.

From 67a99c83a35ab4e4cf5281faddce1b4b689f1f42 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 May 2021 16:24:52 +0900
Subject: [PATCH 3454/3722] Tidy bindable changed code up

---
 osu.Game/Screens/Edit/Verify/IssueList.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Verify/IssueList.cs b/osu.Game/Screens/Edit/Verify/IssueList.cs
index fc9d4c7526..0b1f988447 100644
--- a/osu.Game/Screens/Edit/Verify/IssueList.cs
+++ b/osu.Game/Screens/Edit/Verify/IssueList.cs
@@ -46,10 +46,7 @@ namespace osu.Game.Screens.Edit.Verify
             rulesetVerifier = beatmap.BeatmapInfo.Ruleset?.CreateInstance()?.CreateBeatmapVerifier();
 
             context = new BeatmapVerifierContext(beatmap, workingBeatmap.Value, verify.InterpretedDifficulty.Value);
-            verify.InterpretedDifficulty.BindValueChanged(change =>
-            {
-                context.InterpretedDifficulty = change.NewValue;
-            });
+            verify.InterpretedDifficulty.BindValueChanged(difficulty => context.InterpretedDifficulty = difficulty.NewValue);
 
             RelativeSizeAxes = Axes.Both;
 

From f5dd18f266a11ecc941b2ebd65c6ea40adb70cab Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 May 2021 16:53:51 +0900
Subject: [PATCH 3455/3722] Use existing `LoadedBeatmapSuccessfully` bool
 instead

Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
---
 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 15983d1d62..06dfd2fdb7 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -154,8 +154,7 @@ namespace osu.Game.Screens.Play
         {
             base.LoadComplete();
 
-            // BDL load may have aborted early.
-            if (DrawableRuleset == null)
+            if (!LoadedBeatmapSuccessfully)
                 return;
 
             // replays should never be recorded or played back when autoplay is enabled

From 0655825057cf47520211f5ac99021eb2730cf5e2 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 14 May 2021 14:24:56 +0300
Subject: [PATCH 3456/3722] Separate changing star rating display to own test

---
 .../Ranking/TestSceneStarRatingDisplay.cs     | 35 ++++++++++++-------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
index 2ff664a0d9..64f78b0802 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Screens.Ranking.Expanded;
+using osuTK;
 
 namespace osu.Game.Tests.Visual.Ranking
 {
@@ -15,28 +16,38 @@ namespace osu.Game.Tests.Visual.Ranking
         [Test]
         public void TestDisplay()
         {
-            StarRatingDisplay changingStarRating = null;
-
             AddStep("load displays", () => Child = new FillFlowContainer
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 Children = new Drawable[]
                 {
-                    new StarRatingDisplay(new StarDifficulty(1.23, 0)),
-                    new StarRatingDisplay(new StarDifficulty(2.34, 0)),
-                    new StarRatingDisplay(new StarDifficulty(3.45, 0)),
-                    new StarRatingDisplay(new StarDifficulty(4.56, 0)),
-                    new StarRatingDisplay(new StarDifficulty(5.67, 0)),
-                    new StarRatingDisplay(new StarDifficulty(6.78, 0)),
-                    new StarRatingDisplay(new StarDifficulty(10.11, 0)),
-                    changingStarRating = new StarRatingDisplay(),
+                    new StarRatingDisplay(new StarDifficulty(1.23, 0)) { Anchor = Anchor.Centre, Origin = Anchor.Centre },
+                    new StarRatingDisplay(new StarDifficulty(2.34, 0)) { Anchor = Anchor.Centre, Origin = Anchor.Centre },
+                    new StarRatingDisplay(new StarDifficulty(3.45, 0)) { Anchor = Anchor.Centre, Origin = Anchor.Centre },
+                    new StarRatingDisplay(new StarDifficulty(4.56, 0)) { Anchor = Anchor.Centre, Origin = Anchor.Centre },
+                    new StarRatingDisplay(new StarDifficulty(5.67, 0)) { Anchor = Anchor.Centre, Origin = Anchor.Centre },
+                    new StarRatingDisplay(new StarDifficulty(6.78, 0)) { Anchor = Anchor.Centre, Origin = Anchor.Centre },
+                    new StarRatingDisplay(new StarDifficulty(10.11, 0)) { Anchor = Anchor.Centre, Origin = Anchor.Centre },
                 }
             });
+        }
 
-            AddRepeatStep("change bottom rating", () =>
+        [Test]
+        public void TestChangingStarRatingDisplay()
+        {
+            StarRatingDisplay starRating = null;
+
+            AddStep("load display", () => Child = starRating = new StarRatingDisplay
             {
-                changingStarRating.Current.Value = new StarDifficulty(RNG.NextDouble(0, 10), RNG.Next());
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Scale = new Vector2(3f),
+            });
+
+            AddRepeatStep("change display value", () =>
+            {
+                starRating.Current.Value = new StarDifficulty(RNG.NextDouble(0.0, 11.0), RNG.Next(2000));
             }, 10);
         }
     }

From 34aab11ff3fc9e3f9c0370ff076bfd00e25d3cb8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 14 May 2021 14:25:46 +0300
Subject: [PATCH 3457/3722] Add null star rating display test case

---
 .../Visual/Ranking/TestSceneStarRatingDisplay.cs      | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
index 64f78b0802..7730d6868d 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
@@ -33,6 +33,17 @@ namespace osu.Game.Tests.Visual.Ranking
             });
         }
 
+        [Test]
+        public void TestNullStarRatingDisplay()
+        {
+            AddStep("load null", () => Child = new StarRatingDisplay
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Scale = new Vector2(3f),
+            });
+        }
+
         [Test]
         public void TestChangingStarRatingDisplay()
         {

From e0728a6e194297b55eb8f9f4502f919ba3907a0d Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 14 May 2021 15:52:36 +0300
Subject: [PATCH 3458/3722] Make `BeatmapDifficultyCache.GetDifficultyAsync`
 virtual

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

diff --git a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
index 53d82c385d..6ed623d0c0 100644
--- a/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
+++ b/osu.Game/Beatmaps/BeatmapDifficultyCache.cs
@@ -103,8 +103,8 @@ namespace osu.Game.Beatmaps
         /// <param name="mods">The <see cref="Mod"/>s to get the difficulty with.</param>
         /// <param name="cancellationToken">An optional <see cref="CancellationToken"/> which stops computing the star difficulty.</param>
         /// <returns>The <see cref="StarDifficulty"/>.</returns>
-        public Task<StarDifficulty> GetDifficultyAsync([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo = null, [CanBeNull] IEnumerable<Mod> mods = null,
-                                                       CancellationToken cancellationToken = default)
+        public virtual Task<StarDifficulty> GetDifficultyAsync([NotNull] BeatmapInfo beatmapInfo, [CanBeNull] RulesetInfo rulesetInfo = null,
+                                                               [CanBeNull] IEnumerable<Mod> mods = null, CancellationToken cancellationToken = default)
         {
             // In the case that the user hasn't given us a ruleset, use the beatmap's default ruleset.
             rulesetInfo ??= beatmapInfo.Ruleset;

From db361efecfacce01093783caa0031bee658cdd02 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 14 May 2021 15:52:51 +0300
Subject: [PATCH 3459/3722] Add test beatmap difficulty cache with calc.
 blocking support

---
 .../TestSceneBeatmapMetadataDisplay.cs        | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
index 230822e070..271fbde5c3 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataDisplay.cs
@@ -4,12 +4,15 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.Play;
@@ -24,6 +27,9 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Resolved]
         private BeatmapManager manager { get; set; }
 
+        [Cached(typeof(BeatmapDifficultyCache))]
+        private readonly TestBeatmapDifficultyCache testDifficultyCache = new TestBeatmapDifficultyCache();
+
         [Test]
         public void TestLocal([Values("Beatmap", "Some long title and stuff")]
                               string title,
@@ -44,6 +50,27 @@ namespace osu.Game.Tests.Visual.SongSelect
             }));
         }
 
+        [Test]
+        public void TestDelayedStarRating()
+        {
+            AddStep("block calculation", () => testDifficultyCache.BlockCalculation = true);
+
+            showMetadataForBeatmap(() => CreateWorkingBeatmap(new Beatmap
+            {
+                BeatmapInfo =
+                {
+                    Metadata = new BeatmapMetadata
+                    {
+                        Title = "Heavy beatmap",
+                    },
+                    Version = "10k objects",
+                    StarDifficulty = 99.99f,
+                }
+            }));
+
+            AddStep("allow calculation", () => testDifficultyCache.BlockCalculation = false);
+        }
+
         [Test]
         public void TestRandomFromDatabase()
         {
@@ -68,8 +95,11 @@ namespace osu.Game.Tests.Visual.SongSelect
 
                 OsuLogo logo = new OsuLogo { Scale = new Vector2(0.15f) };
 
+                Remove(testDifficultyCache);
+
                 Children = new Drawable[]
                 {
+                    testDifficultyCache,
                     display = new BeatmapMetadataDisplay(getBeatmap(), new Bindable<IReadOnlyList<Mod>>(randomMods), logo)
                     {
                         Anchor = Anchor.Centre,
@@ -85,5 +115,37 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddStep("finish loading", () => display.Loading = false);
         }
+
+        private class TestBeatmapDifficultyCache : BeatmapDifficultyCache
+        {
+            private TaskCompletionSource<bool> calculationBlocker;
+
+            private bool blockCalculation;
+
+            public bool BlockCalculation
+            {
+                get => blockCalculation;
+                set
+                {
+                    if (value == blockCalculation)
+                        return;
+
+                    blockCalculation = value;
+
+                    if (value)
+                        calculationBlocker = new TaskCompletionSource<bool>();
+                    else
+                        calculationBlocker?.SetResult(false);
+                }
+            }
+
+            public override async Task<StarDifficulty> GetDifficultyAsync(BeatmapInfo beatmapInfo, RulesetInfo rulesetInfo = null, IEnumerable<Mod> mods = null, CancellationToken cancellationToken = default)
+            {
+                if (blockCalculation)
+                    await calculationBlocker.Task;
+
+                return await base.GetDifficultyAsync(beatmapInfo, rulesetInfo, mods, cancellationToken);
+            }
+        }
     }
 }

From 0dc3bfd0c11cc45f060ecb627cef78db1beb6f5c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 14 May 2021 15:55:26 +0300
Subject: [PATCH 3460/3722] Apply simple transforms to star rating display when
 ready if not

---
 .../Screens/Play/BeatmapMetadataDisplay.cs    | 30 ++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index 0164fe9179..6dd9900d8c 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -53,11 +53,12 @@ namespace osu.Game.Screens.Play
 
         private IBindable<StarDifficulty?> starDifficulty;
 
+        private FillFlowContainer versionFlow;
+        private StarRatingDisplay starRatingDisplay;
+
         [BackgroundDependencyLoader]
         private void load(BeatmapDifficultyCache difficultyCache)
         {
-            StarRatingDisplay starRatingDisplay;
-
             var metadata = beatmap.BeatmapInfo?.Metadata ?? new BeatmapMetadata();
 
             AutoSizeAxes = Axes.Both;
@@ -112,7 +113,7 @@ namespace osu.Game.Screens.Play
                                 loading = new LoadingLayer(true)
                             }
                         },
-                        new FillFlowContainer
+                        versionFlow = new FillFlowContainer
                         {
                             AutoSizeAxes = Axes.Both,
                             Anchor = Anchor.TopCentre,
@@ -178,11 +179,32 @@ namespace osu.Game.Screens.Play
             };
 
             starDifficulty = difficultyCache.GetBindableDifficulty(beatmap.BeatmapInfo);
-            starDifficulty.BindValueChanged(d => starRatingDisplay.Current.Value = d.NewValue, true);
 
             Loading = true;
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            if (starDifficulty.Value != null)
+                starRatingDisplay.Current.Value = starDifficulty.Value;
+            else
+            {
+                starRatingDisplay.Hide();
+
+                starDifficulty.ValueChanged += d =>
+                {
+                    starRatingDisplay.Current.Value = d.NewValue;
+
+                    versionFlow.AutoSizeDuration = 300;
+                    versionFlow.AutoSizeEasing = Easing.OutQuint;
+
+                    starRatingDisplay.FadeIn(300, Easing.InQuint);
+                };
+            }
+        }
+
         private class MetadataLineLabel : OsuSpriteText
         {
             public MetadataLineLabel(string text)

From 6cc678f497b1cdb1aa461ebd4749e145fdc5c80f Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 14 May 2021 16:01:25 +0300
Subject: [PATCH 3461/3722] Remove nullability and transition support from star
 rating display

---
 .../Ranking/TestSceneStarRatingDisplay.cs     | 23 +++++--------
 .../Ranking/Expanded/StarRatingDisplay.cs     | 33 +++++--------------
 2 files changed, 17 insertions(+), 39 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
index 7730d6868d..ef077970d6 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
@@ -33,33 +33,28 @@ namespace osu.Game.Tests.Visual.Ranking
             });
         }
 
-        [Test]
-        public void TestNullStarRatingDisplay()
-        {
-            AddStep("load null", () => Child = new StarRatingDisplay
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Scale = new Vector2(3f),
-            });
-        }
-
         [Test]
         public void TestChangingStarRatingDisplay()
         {
             StarRatingDisplay starRating = null;
 
-            AddStep("load display", () => Child = starRating = new StarRatingDisplay
+            AddStep("load display", () => Child = starRating = new StarRatingDisplay(new StarDifficulty(5.55, 1))
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 Scale = new Vector2(3f),
             });
 
-            AddRepeatStep("change display value", () =>
+            AddRepeatStep("set random value", () =>
             {
-                starRating.Current.Value = new StarDifficulty(RNG.NextDouble(0.0, 11.0), RNG.Next(2000));
+                starRating.Current.Value = new StarDifficulty(RNG.NextDouble(0.0, 11.0), 1);
             }, 10);
+
+            AddSliderStep("set exact stars", 0.0, 11.0, 5.55, d =>
+            {
+                if (starRating != null)
+                    starRating.Current.Value = new StarDifficulty(d, 1);
+            });
         }
     }
 }
diff --git a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
index 422833555f..625bdaf888 100644
--- a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Screens.Ranking.Expanded
     /// <summary>
     /// A pill that displays the star rating of a <see cref="BeatmapInfo"/>.
     /// </summary>
-    public class StarRatingDisplay : CompositeDrawable, IHasCurrentValue<StarDifficulty?>
+    public class StarRatingDisplay : CompositeDrawable, IHasCurrentValue<StarDifficulty>
     {
         private Box background;
         private OsuTextFlowContainer textFlow;
@@ -30,21 +30,14 @@ namespace osu.Game.Screens.Ranking.Expanded
         [Resolved]
         private OsuColour colours { get; set; }
 
-        private readonly BindableWithCurrent<StarDifficulty?> current = new BindableWithCurrent<StarDifficulty?>();
+        private readonly BindableWithCurrent<StarDifficulty> current = new BindableWithCurrent<StarDifficulty>();
 
-        public Bindable<StarDifficulty?> Current
+        public Bindable<StarDifficulty> Current
         {
             get => current.Current;
             set => current.Current = value;
         }
 
-        /// <summary>
-        /// Creates a new <see cref="StarRatingDisplay"/> without any <see cref="StarDifficulty"/> set, displaying a placeholder until <see cref="Current"/> is changed.
-        /// </summary>
-        public StarRatingDisplay()
-        {
-        }
-
         /// <summary>
         /// Creates a new <see cref="StarRatingDisplay"/> using an already computed <see cref="StarDifficulty"/>.
         /// </summary>
@@ -112,26 +105,16 @@ namespace osu.Game.Screens.Ranking.Expanded
 
         private void updateDisplay()
         {
-            const double duration = 400;
-            const Easing easing = Easing.OutQuint;
-
-            double stars = Current.Value?.Stars ?? 0.00f;
-
-            var starRatingParts = stars.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
+            var starRatingParts = Current.Value.Stars.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
             string wholePart = starRatingParts[0];
             string fractionPart = starRatingParts[1];
             string separator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
 
-            if (Current.Value == null)
-                background.FadeColour(Color4.SlateGray.Opacity(0.3f));
-            else
-            {
-                var rating = Current.Value.Value.DifficultyRating;
+            var rating = Current.Value.DifficultyRating;
 
-                background.FadeColour(rating == DifficultyRating.ExpertPlus
-                    ? ColourInfo.GradientVertical(Color4Extensions.FromHex("#C1C1C1"), Color4Extensions.FromHex("#595959"))
-                    : (ColourInfo)colours.ForDifficultyRating(rating), duration, easing);
-            }
+            background.Colour = rating == DifficultyRating.ExpertPlus
+                ? ColourInfo.GradientVertical(Color4Extensions.FromHex("#C1C1C1"), Color4Extensions.FromHex("#595959"))
+                : (ColourInfo)colours.ForDifficultyRating(rating);
 
             textFlow.Clear();
 

From 7c2fc9b412e5e5835ea0b949de5814224d201de7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 14 May 2021 16:12:25 +0300
Subject: [PATCH 3462/3722] Update usage due to nullability removal

---
 osu.Game/Screens/Play/BeatmapMetadataDisplay.cs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index 6dd9900d8c..e26dd24de7 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.Diagnostics;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -130,8 +131,9 @@ namespace osu.Game.Screens.Play
                                     Anchor = Anchor.TopCentre,
                                     Origin = Anchor.TopCentre,
                                 },
-                                starRatingDisplay = new StarRatingDisplay
+                                starRatingDisplay = new StarRatingDisplay(default)
                                 {
+                                    Alpha = 0f,
                                     Anchor = Anchor.TopCentre,
                                     Origin = Anchor.TopCentre,
                                 }
@@ -188,14 +190,19 @@ namespace osu.Game.Screens.Play
             base.LoadComplete();
 
             if (starDifficulty.Value != null)
-                starRatingDisplay.Current.Value = starDifficulty.Value;
+            {
+                starRatingDisplay.Current.Value = starDifficulty.Value.Value;
+                starRatingDisplay.Show();
+            }
             else
             {
                 starRatingDisplay.Hide();
 
                 starDifficulty.ValueChanged += d =>
                 {
-                    starRatingDisplay.Current.Value = d.NewValue;
+                    Debug.Assert(d.NewValue != null);
+
+                    starRatingDisplay.Current.Value = d.NewValue.Value;
 
                     versionFlow.AutoSizeDuration = 300;
                     versionFlow.AutoSizeEasing = Easing.OutQuint;

From 67dfeeb1b77eaa009aff89aa666fdf3ad12ec365 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Fri, 14 May 2021 21:23:56 +0800
Subject: [PATCH 3463/3722] Cleanup code in ModHidden

---
 .../Mods/CatchModHidden.cs                    |  2 +-
 osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs    | 14 ++++----
 osu.Game/Rulesets/Mods/ModHidden.cs           | 35 -------------------
 3 files changed, 8 insertions(+), 43 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs b/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
index bba42dea97..ba3e8f9a8f 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Rulesets.Catch.Mods
             var offset = hitObject.TimePreempt * fade_out_offset_multiplier;
             var duration = offset - hitObject.TimePreempt * fade_out_duration_multiplier;
 
-            using (drawable.BeginAbsoluteSequence(hitObject.StartTime - offset, true))
+            using (drawable.BeginAbsoluteSequence(hitObject.StartTime - offset))
                 drawable.FadeOut(duration);
         }
     }
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
index 45f314af7b..b0f3f49939 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
@@ -65,13 +65,13 @@ namespace osu.Game.Rulesets.Osu.Mods
             switch (drawableObject)
             {
                 case DrawableSliderTail _:
-                    using (drawableObject.BeginAbsoluteSequence(fadeOut.startTime, true))
+                    using (drawableObject.BeginAbsoluteSequence(fadeOut.startTime))
                         drawableObject.FadeOut(fadeOut.duration);
 
                     break;
 
                 case DrawableSliderRepeat sliderRepeat:
-                    using (drawableObject.BeginAbsoluteSequence(fadeOut.startTime, true))
+                    using (drawableObject.BeginAbsoluteSequence(fadeOut.startTime))
                         // only apply to circle piece – reverse arrow is not affected by hidden.
                         sliderRepeat.CirclePiece.FadeOut(fadeOut.duration);
 
@@ -88,22 +88,22 @@ namespace osu.Game.Rulesets.Osu.Mods
                     else
                     {
                         // we don't want to see the approach circle
-                        using (circle.BeginAbsoluteSequence(hitObject.StartTime - hitObject.TimePreempt, true))
+                        using (circle.BeginAbsoluteSequence(hitObject.StartTime - hitObject.TimePreempt))
                             circle.ApproachCircle.Hide();
                     }
 
-                    using (drawableObject.BeginAbsoluteSequence(fadeOut.startTime, true))
+                    using (drawableObject.BeginAbsoluteSequence(fadeOut.startTime))
                         fadeTarget.FadeOut(fadeOut.duration);
                     break;
 
                 case DrawableSlider slider:
-                    using (slider.BeginAbsoluteSequence(fadeOut.startTime, true))
+                    using (slider.BeginAbsoluteSequence(fadeOut.startTime))
                         slider.Body.FadeOut(fadeOut.duration, Easing.Out);
 
                     break;
 
                 case DrawableSliderTick sliderTick:
-                    using (sliderTick.BeginAbsoluteSequence(fadeOut.startTime, true))
+                    using (sliderTick.BeginAbsoluteSequence(fadeOut.startTime))
                         sliderTick.FadeOut(fadeOut.duration);
 
                     break;
@@ -112,7 +112,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                     // hide elements we don't care about.
                     // todo: hide background
 
-                    using (spinner.BeginAbsoluteSequence(fadeOut.startTime, true))
+                    using (spinner.BeginAbsoluteSequence(fadeOut.startTime))
                         spinner.FadeOut(fadeOut.duration);
 
                     break;
diff --git a/osu.Game/Rulesets/Mods/ModHidden.cs b/osu.Game/Rulesets/Mods/ModHidden.cs
index df421adbe5..03932baca9 100644
--- a/osu.Game/Rulesets/Mods/ModHidden.cs
+++ b/osu.Game/Rulesets/Mods/ModHidden.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.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Framework.Graphics.Sprites;
@@ -18,14 +17,6 @@ namespace osu.Game.Rulesets.Mods
         public override ModType Type => ModType.DifficultyIncrease;
         public override bool Ranked => true;
 
-        /// <summary>
-        /// Check whether the provided hitobject should be considered the "first" hideable object.
-        /// Can be used to skip spinners, for instance.
-        /// </summary>
-        /// <param name="hitObject">The hitobject to check.</param>
-        [Obsolete("Use IsFirstAdjustableObject() instead.")] // Can be removed 20210506
-        protected virtual bool IsFirstHideableObject(DrawableHitObject hitObject) => true;
-
         public void ApplyToScoreProcessor(ScoreProcessor scoreProcessor)
         {
             // Default value of ScoreProcessor's Rank in Hidden Mod should be SS+
@@ -49,36 +40,10 @@ namespace osu.Game.Rulesets.Mods
 
         protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
         {
-#pragma warning disable 618
-            ApplyFirstObjectIncreaseVisibilityState(hitObject, state);
-#pragma warning restore 618
         }
 
         protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
         {
-#pragma warning disable 618
-            ApplyHiddenState(hitObject, state);
-#pragma warning restore 618
-        }
-
-        /// <summary>
-        /// Apply a special visibility state to the first object in a beatmap, if the user chooses to turn on the "increase first object visibility" setting.
-        /// </summary>
-        /// <param name="hitObject">The hit object to apply the state change to.</param>
-        /// <param name="state">The state of the hit object.</param>
-        [Obsolete("Use ApplyIncreasedVisibilityState() instead.")] // Can be removed 20210506
-        protected virtual void ApplyFirstObjectIncreaseVisibilityState(DrawableHitObject hitObject, ArmedState state)
-        {
-        }
-
-        /// <summary>
-        /// Apply a hidden state to the provided object.
-        /// </summary>
-        /// <param name="hitObject">The hit object to apply the state change to.</param>
-        /// <param name="state">The state of the hit object.</param>
-        [Obsolete("Use ApplyNormalVisibilityState() instead.")] // Can be removed 20210506
-        protected virtual void ApplyHiddenState(DrawableHitObject hitObject, ArmedState state)
-        {
         }
     }
 }

From 393ac4fdd1d6ab2ea08b0658f9d907696f1937d1 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Fri, 14 May 2021 21:30:58 +0800
Subject: [PATCH 3464/3722] Destruct declaration

---
 osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
index b0f3f49939..4f1e91974a 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
@@ -60,20 +60,20 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             OsuHitObject hitObject = drawableOsuObject.HitObject;
 
-            (double startTime, double duration) fadeOut = getFadeOutParameters(drawableOsuObject);
+            (double startTime, double fadeDuration) = getFadeOutParameters(drawableOsuObject);
 
             switch (drawableObject)
             {
                 case DrawableSliderTail _:
-                    using (drawableObject.BeginAbsoluteSequence(fadeOut.startTime))
-                        drawableObject.FadeOut(fadeOut.duration);
+                    using (drawableObject.BeginAbsoluteSequence(startTime))
+                        drawableObject.FadeOut(fadeDuration);
 
                     break;
 
                 case DrawableSliderRepeat sliderRepeat:
-                    using (drawableObject.BeginAbsoluteSequence(fadeOut.startTime))
+                    using (drawableObject.BeginAbsoluteSequence(startTime))
                         // only apply to circle piece – reverse arrow is not affected by hidden.
-                        sliderRepeat.CirclePiece.FadeOut(fadeOut.duration);
+                        sliderRepeat.CirclePiece.FadeOut(fadeDuration);
 
                     break;
 
@@ -92,19 +92,19 @@ namespace osu.Game.Rulesets.Osu.Mods
                             circle.ApproachCircle.Hide();
                     }
 
-                    using (drawableObject.BeginAbsoluteSequence(fadeOut.startTime))
-                        fadeTarget.FadeOut(fadeOut.duration);
+                    using (drawableObject.BeginAbsoluteSequence(startTime))
+                        fadeTarget.FadeOut(fadeDuration);
                     break;
 
                 case DrawableSlider slider:
-                    using (slider.BeginAbsoluteSequence(fadeOut.startTime))
-                        slider.Body.FadeOut(fadeOut.duration, Easing.Out);
+                    using (slider.BeginAbsoluteSequence(startTime))
+                        slider.Body.FadeOut(fadeDuration, Easing.Out);
 
                     break;
 
                 case DrawableSliderTick sliderTick:
-                    using (sliderTick.BeginAbsoluteSequence(fadeOut.startTime))
-                        sliderTick.FadeOut(fadeOut.duration);
+                    using (sliderTick.BeginAbsoluteSequence(startTime))
+                        sliderTick.FadeOut(fadeDuration);
 
                     break;
 
@@ -112,14 +112,14 @@ namespace osu.Game.Rulesets.Osu.Mods
                     // hide elements we don't care about.
                     // todo: hide background
 
-                    using (spinner.BeginAbsoluteSequence(fadeOut.startTime))
-                        spinner.FadeOut(fadeOut.duration);
+                    using (spinner.BeginAbsoluteSequence(startTime))
+                        spinner.FadeOut(fadeDuration);
 
                     break;
             }
         }
 
-        private (double startTime, double duration) getFadeOutParameters(DrawableOsuHitObject drawableObject)
+        private (double startTime, double fadeDuration) getFadeOutParameters(DrawableOsuHitObject drawableObject)
         {
             switch (drawableObject)
             {
@@ -137,7 +137,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                     return getParameters(drawableObject.HitObject);
             }
 
-            static (double startTime, double duration) getParameters(OsuHitObject hitObject)
+            static (double startTime, double fadeDuration) getParameters(OsuHitObject hitObject)
             {
                 var fadeOutStartTime = hitObject.StartTime - hitObject.TimePreempt + hitObject.TimeFadeIn;
                 var fadeOutDuration = hitObject.TimePreempt * fade_out_duration_multiplier;

From a86a4bab9137ef6781404dc116101662c4c6d858 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Fri, 14 May 2021 21:53:59 +0800
Subject: [PATCH 3465/3722] Remove empty override

---
 osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs | 2 --
 osu.Game/Rulesets/Mods/ModHidden.cs        | 9 ---------
 2 files changed, 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
index 4f1e91974a..c2ddeb5fcc 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
@@ -43,13 +43,11 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
         {
-            base.ApplyIncreasedVisibilityState(hitObject, state);
             applyState(hitObject, true);
         }
 
         protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
         {
-            base.ApplyNormalVisibilityState(hitObject, state);
             applyState(hitObject, false);
         }
 
diff --git a/osu.Game/Rulesets/Mods/ModHidden.cs b/osu.Game/Rulesets/Mods/ModHidden.cs
index 03932baca9..238612b3d2 100644
--- a/osu.Game/Rulesets/Mods/ModHidden.cs
+++ b/osu.Game/Rulesets/Mods/ModHidden.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Graphics;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
@@ -37,13 +36,5 @@ namespace osu.Game.Rulesets.Mods
                     return rank;
             }
         }
-
-        protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
-        {
-        }
-
-        protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
-        {
-        }
     }
 }

From a4c1b9a1a7195dca0f4b5f5f078774f306c0c916 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Fri, 14 May 2021 21:56:13 +0800
Subject: [PATCH 3466/3722] Rename startTime to fadeStartTime

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

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
index c2ddeb5fcc..4168293749 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
@@ -58,18 +58,18 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             OsuHitObject hitObject = drawableOsuObject.HitObject;
 
-            (double startTime, double fadeDuration) = getFadeOutParameters(drawableOsuObject);
+            (double fadeStartTime, double fadeDuration) = getFadeOutParameters(drawableOsuObject);
 
             switch (drawableObject)
             {
                 case DrawableSliderTail _:
-                    using (drawableObject.BeginAbsoluteSequence(startTime))
+                    using (drawableObject.BeginAbsoluteSequence(fadeStartTime))
                         drawableObject.FadeOut(fadeDuration);
 
                     break;
 
                 case DrawableSliderRepeat sliderRepeat:
-                    using (drawableObject.BeginAbsoluteSequence(startTime))
+                    using (drawableObject.BeginAbsoluteSequence(fadeStartTime))
                         // only apply to circle piece – reverse arrow is not affected by hidden.
                         sliderRepeat.CirclePiece.FadeOut(fadeDuration);
 
@@ -90,18 +90,18 @@ namespace osu.Game.Rulesets.Osu.Mods
                             circle.ApproachCircle.Hide();
                     }
 
-                    using (drawableObject.BeginAbsoluteSequence(startTime))
+                    using (drawableObject.BeginAbsoluteSequence(fadeStartTime))
                         fadeTarget.FadeOut(fadeDuration);
                     break;
 
                 case DrawableSlider slider:
-                    using (slider.BeginAbsoluteSequence(startTime))
+                    using (slider.BeginAbsoluteSequence(fadeStartTime))
                         slider.Body.FadeOut(fadeDuration, Easing.Out);
 
                     break;
 
                 case DrawableSliderTick sliderTick:
-                    using (sliderTick.BeginAbsoluteSequence(startTime))
+                    using (sliderTick.BeginAbsoluteSequence(fadeStartTime))
                         sliderTick.FadeOut(fadeDuration);
 
                     break;
@@ -110,7 +110,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                     // hide elements we don't care about.
                     // todo: hide background
 
-                    using (spinner.BeginAbsoluteSequence(startTime))
+                    using (spinner.BeginAbsoluteSequence(fadeStartTime))
                         spinner.FadeOut(fadeDuration);
 
                     break;

From 8b4e6d29112db730e873dd5828bcb3cd6cda514c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 21:52:09 +0200
Subject: [PATCH 3467/3722] Remove no longer necessary `FinishTransforms(true)`
 call

As the component no longer has any transition transforms applied.
---
 osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
index 625bdaf888..7aba699216 100644
--- a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
@@ -100,7 +100,6 @@ namespace osu.Game.Screens.Ranking.Expanded
             base.LoadComplete();
 
             Current.BindValueChanged(_ => updateDisplay(), true);
-            FinishTransforms(true);
         }
 
         private void updateDisplay()

From 1c92b3a8f52af41f45d026c41a0d09ce890a7b2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 21:58:04 +0200
Subject: [PATCH 3468/3722] De-duplicate star rating display creation in test

---
 .../Ranking/TestSceneStarRatingDisplay.cs     | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
index ef077970d6..566452249f 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.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 NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -20,16 +21,20 @@ namespace osu.Game.Tests.Visual.Ranking
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-                Children = new Drawable[]
+                ChildrenEnumerable = new[]
                 {
-                    new StarRatingDisplay(new StarDifficulty(1.23, 0)) { Anchor = Anchor.Centre, Origin = Anchor.Centre },
-                    new StarRatingDisplay(new StarDifficulty(2.34, 0)) { Anchor = Anchor.Centre, Origin = Anchor.Centre },
-                    new StarRatingDisplay(new StarDifficulty(3.45, 0)) { Anchor = Anchor.Centre, Origin = Anchor.Centre },
-                    new StarRatingDisplay(new StarDifficulty(4.56, 0)) { Anchor = Anchor.Centre, Origin = Anchor.Centre },
-                    new StarRatingDisplay(new StarDifficulty(5.67, 0)) { Anchor = Anchor.Centre, Origin = Anchor.Centre },
-                    new StarRatingDisplay(new StarDifficulty(6.78, 0)) { Anchor = Anchor.Centre, Origin = Anchor.Centre },
-                    new StarRatingDisplay(new StarDifficulty(10.11, 0)) { Anchor = Anchor.Centre, Origin = Anchor.Centre },
-                }
+                    1.23,
+                    2.34,
+                    3.45,
+                    4.56,
+                    5.67,
+                    6.78,
+                    10.11,
+                }.Select(starRating => new StarRatingDisplay(new StarDifficulty(starRating, 0))
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre
+                })
             });
         }
 

From 876f53bf3beb7c2f212b1634579326a5b2c7c6e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 22:15:43 +0200
Subject: [PATCH 3469/3722] Fix copy-paste oversights in xmldoc & exception
 messages

---
 osu.Game/Skinning/ISkinnableTarget.cs         | 4 ++--
 osu.Game/Skinning/SkinnableTargetContainer.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Skinning/ISkinnableTarget.cs b/osu.Game/Skinning/ISkinnableTarget.cs
index 15cad2c817..8d4f4dd0c3 100644
--- a/osu.Game/Skinning/ISkinnableTarget.cs
+++ b/osu.Game/Skinning/ISkinnableTarget.cs
@@ -43,9 +43,9 @@ namespace osu.Game.Skinning
         void Add(ISkinnableDrawable drawable);
 
         /// <summary>
-        /// Remove an existing skinnable component to this target.
+        /// Remove an existing skinnable component from this target.
         /// </summary>
-        /// <param name="component">The component to add.</param>
+        /// <param name="component">The component to remove.</param>
         public void Remove(ISkinnableDrawable component);
     }
 }
diff --git a/osu.Game/Skinning/SkinnableTargetContainer.cs b/osu.Game/Skinning/SkinnableTargetContainer.cs
index f055fb2533..c195a5516f 100644
--- a/osu.Game/Skinning/SkinnableTargetContainer.cs
+++ b/osu.Game/Skinning/SkinnableTargetContainer.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Skinning
         public void Remove(ISkinnableDrawable component)
         {
             if (content == null)
-                throw new NotSupportedException("Attempting to add a new component to a target container which is not supported by the current skin.");
+                throw new NotSupportedException("Attempting to remove a new component from a target container which is not supported by the current skin.");
 
             if (!(component is Drawable drawable))
                 throw new ArgumentException($"Provided argument must be of type {nameof(Drawable)}.", nameof(drawable));

From 743b4fbff15bb8d506f4848b1c1ed9a803339253 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 22:16:37 +0200
Subject: [PATCH 3470/3722] Pass correct member name to `ArgumentException`s

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

diff --git a/osu.Game/Skinning/SkinnableTargetContainer.cs b/osu.Game/Skinning/SkinnableTargetContainer.cs
index c195a5516f..d454e199dc 100644
--- a/osu.Game/Skinning/SkinnableTargetContainer.cs
+++ b/osu.Game/Skinning/SkinnableTargetContainer.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Skinning
                 throw new NotSupportedException("Attempting to add a new component to a target container which is not supported by the current skin.");
 
             if (!(component is Drawable drawable))
-                throw new ArgumentException($"Provided argument must be of type {nameof(Drawable)}.", nameof(drawable));
+                throw new ArgumentException($"Provided argument must be of type {nameof(Drawable)}.", nameof(component));
 
             content.Add(drawable);
             components.Add(component);
@@ -67,7 +67,7 @@ namespace osu.Game.Skinning
                 throw new NotSupportedException("Attempting to remove a new component from a target container which is not supported by the current skin.");
 
             if (!(component is Drawable drawable))
-                throw new ArgumentException($"Provided argument must be of type {nameof(Drawable)}.", nameof(drawable));
+                throw new ArgumentException($"Provided argument must be of type {nameof(Drawable)}.", nameof(component));
 
             content.Remove(drawable);
             components.Remove(component);

From 3d3c5028e6df652f53706e24d7b8ee0f58d09c73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 22:33:26 +0200
Subject: [PATCH 3471/3722] Trim unnecessary array copy

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

diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index c594f8d271..f24b0c71c0 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -243,7 +243,7 @@ namespace osu.Game.Skinning.Editor
 
         public void DeleteItems(ISkinnableDrawable[] items)
         {
-            foreach (var item in items.ToArray())
+            foreach (var item in items)
                 availableTargets.FirstOrDefault(t => t.Components.Contains(item))?.Remove(item);
         }
     }

From 044770f1a265f6a7f1b4d34858384dee6a43c4a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 23:29:34 +0200
Subject: [PATCH 3472/3722] Locally suppress warning in `SerializationReader`

`SerializationReader` is not written in a form that would support
turning nullability checking on for the entire class. The biggest
problem there is the inner `DynamicDeserializer` static class, whose
members are initialised via an `initialize()` method, which the compiler
knows nothing about.

For this reason, just opt to suppress the single inspection about
returning a `null` from a method with a return type of `string` (rider
expects `string?`). It would have been also viable to enable nullability
checking for this one method, but that's pretty much the same thing and
adds no safety anyways, so just disable the warning to minimise
surprise.
---
 osu.Game/IO/Legacy/SerializationReader.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/IO/Legacy/SerializationReader.cs b/osu.Game/IO/Legacy/SerializationReader.cs
index 17cbd19838..00f90f78e3 100644
--- a/osu.Game/IO/Legacy/SerializationReader.cs
+++ b/osu.Game/IO/Legacy/SerializationReader.cs
@@ -38,6 +38,7 @@ namespace osu.Game.IO.Legacy
         /// <summary> Reads a string from the buffer.  Overrides the base implementation so it can cope with nulls. </summary>
         public override string ReadString()
         {
+            // ReSharper disable once AssignNullToNotNullAttribute
             if (ReadByte() == 0) return null;
 
             return base.ReadString();

From aaa7c7eb0593c9b04c728aee778ff1de5a08f6bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 23:33:17 +0200
Subject: [PATCH 3473/3722] Handle null case explicitly in
 `SpectatorState.Equals()`

Uses the usual pattern of two `ReferenceEquals` checks against `this`
and `null` before proceeding to inspect field values. Doing this causes
the compiler to infer that at the point that field values are checked,
`other` can no longer viably be `null`.
---
 osu.Game/Online/Spectator/SpectatorState.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/Spectator/SpectatorState.cs b/osu.Game/Online/Spectator/SpectatorState.cs
index 96a875bc14..ebb91e4dd2 100644
--- a/osu.Game/Online/Spectator/SpectatorState.cs
+++ b/osu.Game/Online/Spectator/SpectatorState.cs
@@ -24,7 +24,13 @@ namespace osu.Game.Online.Spectator
         [Key(2)]
         public IEnumerable<APIMod> Mods { get; set; } = Enumerable.Empty<APIMod>();
 
-        public bool Equals(SpectatorState other) => BeatmapID == other?.BeatmapID && Mods.SequenceEqual(other?.Mods) && RulesetID == other?.RulesetID;
+        public bool Equals(SpectatorState other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+
+            return BeatmapID == other.BeatmapID && Mods.SequenceEqual(other.Mods) && RulesetID == other.RulesetID;
+        }
 
         public override string ToString() => $"Beatmap:{BeatmapID} Mods:{string.Join(',', Mods)} Ruleset:{RulesetID}";
     }

From c9facf70f9503bd3928b3ddad35807d21df633b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 23:35:06 +0200
Subject: [PATCH 3474/3722] Use conditional nullability attribute

As it turns out, C# 8 provides an attribute that allows annotating that
an `out` parameter's nullability depends on the method's return value,
which is exactly what is desired here.
---
 osu.Game.Tests/Mods/ModUtilsTest.cs | 2 +-
 osu.Game/Utils/ModUtils.cs          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Mods/ModUtilsTest.cs b/osu.Game.Tests/Mods/ModUtilsTest.cs
index 7dcaabca3d..7384471c41 100644
--- a/osu.Game.Tests/Mods/ModUtilsTest.cs
+++ b/osu.Game.Tests/Mods/ModUtilsTest.cs
@@ -146,7 +146,7 @@ namespace osu.Game.Tests.Mods
             if (isValid)
                 Assert.IsNull(invalid);
             else
-                Assert.That(invalid?.Select(t => t.GetType()), Is.EquivalentTo(expectedInvalid));
+                Assert.That(invalid.Select(t => t.GetType()), Is.EquivalentTo(expectedInvalid));
         }
 
         public abstract class CustomMod1 : Mod
diff --git a/osu.Game/Utils/ModUtils.cs b/osu.Game/Utils/ModUtils.cs
index 596880f2e7..1c3558fc90 100644
--- a/osu.Game/Utils/ModUtils.cs
+++ b/osu.Game/Utils/ModUtils.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Utils
         /// <param name="mods">The mods to check.</param>
         /// <param name="invalidMods">Invalid mods, if any were found. Can be null if all mods were valid.</param>
         /// <returns>Whether the input mods were all valid. If false, <paramref name="invalidMods"/> will contain all invalid entries.</returns>
-        public static bool CheckValidForGameplay(IEnumerable<Mod> mods, out List<Mod>? invalidMods)
+        public static bool CheckValidForGameplay(IEnumerable<Mod> mods, [NotNullWhen(false)] out List<Mod>? invalidMods)
         {
             mods = mods.ToArray();
 

From f716fb09686682f8b9061b2b532866848db0fdf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 23:38:44 +0200
Subject: [PATCH 3475/3722] Remove bogus `InternalChildren` null-check

`InternalChildren` can't viably be `null`, and if it were, we have
bigger problems. The removed null-check was triggering false-positive
inspections further down.
---
 osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyTaikoScroller.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyTaikoScroller.cs b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyTaikoScroller.cs
index eb92097204..6fc59ea0e8 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyTaikoScroller.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/Legacy/LegacyTaikoScroller.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning.Legacy
             base.Update();
 
             // store X before checking wide enough so if we perform layout there is no positional discrepancy.
-            float currentX = (InternalChildren?.FirstOrDefault()?.X ?? 0) - (float)Clock.ElapsedFrameTime * 0.1f;
+            float currentX = (InternalChildren.FirstOrDefault()?.X ?? 0) - (float)Clock.ElapsedFrameTime * 0.1f;
 
             // ensure we have enough sprites
             if (!InternalChildren.Any()

From 483e0dd9431efe347f01ac38ef86e1190b8d8f6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 23:39:36 +0200
Subject: [PATCH 3476/3722] Pass placeholder hitobject instead of `null`

---
 .../Skinning/TestSceneTaikoScroller.cs                         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs
index 4ae3cbd418..14c3599fcd 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Skinning/TestSceneTaikoScroller.cs
@@ -5,6 +5,7 @@ using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Testing;
 using osu.Framework.Timing;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Skinning.Legacy;
 using osu.Game.Skinning;
@@ -27,7 +28,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
                 }));
 
             AddToggleStep("Toggle passing", passing => this.ChildrenOfType<LegacyTaikoScroller>().ForEach(s => s.LastResult.Value =
-                new JudgementResult(null, new Judgement()) { Type = passing ? HitResult.Great : HitResult.Miss }));
+                new JudgementResult(new HitObject(), new Judgement()) { Type = passing ? HitResult.Great : HitResult.Miss }));
 
             AddToggleStep("toggle playback direction", reversed => this.reversed = reversed);
         }

From f2d0f7db9928b60f84b23b14c07488751df86917 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 23:40:17 +0200
Subject: [PATCH 3477/3722] Remove list null-checks in `LogoTrackingContainer`
 test

If the null-checks were tripped, the test would crash anyway. It is not
possible to call `.Any()` and get a valid result instead of an exception
on a null reference.
---
 .../Visual/UserInterface/TestSceneLogoTrackingContainer.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLogoTrackingContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLogoTrackingContainer.cs
index 5582cc6826..b46d35a84d 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneLogoTrackingContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLogoTrackingContainer.cs
@@ -264,7 +264,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private void moveLogoFacade()
         {
-            if (!(logoFacade?.Transforms).Any() && !(transferContainer?.Transforms).Any())
+            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);

From 43c73f9583e31d55cc384ca8fa445011c449ec6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 23:42:56 +0200
Subject: [PATCH 3478/3722] Mark access to exception if task faulted as safe

There are seemingly no C#-side compile-time guarantees that it is safe,
but if the task's state is `Faulted` (as is checked right before), the
exception cannot be null as per the documentation.
---
 osu.Game/Extensions/TaskExtensions.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Extensions/TaskExtensions.cs b/osu.Game/Extensions/TaskExtensions.cs
index 76a76c0c52..17f1a491f8 100644
--- a/osu.Game/Extensions/TaskExtensions.cs
+++ b/osu.Game/Extensions/TaskExtensions.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using osu.Framework.Extensions.ObjectExtensions;
 
 namespace osu.Game.Extensions
 {
@@ -50,7 +51,7 @@ namespace osu.Game.Extensions
                         }
                         else if (continuationTask.IsFaulted)
                         {
-                            tcs.TrySetException(continuationTask.Exception);
+                            tcs.TrySetException(continuationTask.Exception.AsNonNull());
                         }
                         else
                         {

From 628e7a71edc56fb2ff2f1aec5d44646b3b1a343f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 23:45:58 +0200
Subject: [PATCH 3479/3722] Ignore possible nulls in `Type.GetType()` calls

They're mostly used in extensibility scenarios, so everything happens in
runtime. There is no better resolution than to crash with a null
reference exception.
---
 osu.Game/IO/Serialization/Converters/TypedListConverter.cs | 3 ++-
 osu.Game/Rulesets/RulesetInfo.cs                           | 3 ++-
 osu.Game/Rulesets/RulesetStore.cs                          | 3 ++-
 osu.Game/Skinning/SkinInfo.cs                              | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/osu.Game/IO/Serialization/Converters/TypedListConverter.cs b/osu.Game/IO/Serialization/Converters/TypedListConverter.cs
index 50b28ea74b..174fbf9983 100644
--- a/osu.Game/IO/Serialization/Converters/TypedListConverter.cs
+++ b/osu.Game/IO/Serialization/Converters/TypedListConverter.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using osu.Framework.Extensions.ObjectExtensions;
 
 namespace osu.Game.IO.Serialization.Converters
 {
@@ -60,7 +61,7 @@ namespace osu.Game.IO.Serialization.Converters
                     throw new JsonException("Expected $type token.");
 
                 var typeName = lookupTable[(int)tok["$type"]];
-                var instance = (T)Activator.CreateInstance(Type.GetType(typeName));
+                var instance = (T)Activator.CreateInstance(Type.GetType(typeName).AsNonNull());
                 serializer.Populate(itemReader, instance);
 
                 list.Add(instance);
diff --git a/osu.Game/Rulesets/RulesetInfo.cs b/osu.Game/Rulesets/RulesetInfo.cs
index 702bf35fa8..59ec9cdd7e 100644
--- a/osu.Game/Rulesets/RulesetInfo.cs
+++ b/osu.Game/Rulesets/RulesetInfo.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using Newtonsoft.Json;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Testing;
 
 namespace osu.Game.Rulesets
@@ -27,7 +28,7 @@ namespace osu.Game.Rulesets
         {
             if (!Available) return null;
 
-            var ruleset = (Ruleset)Activator.CreateInstance(Type.GetType(InstantiationInfo));
+            var ruleset = (Ruleset)Activator.CreateInstance(Type.GetType(InstantiationInfo).AsNonNull());
 
             // overwrite the pre-populated RulesetInfo with a potentially database attached copy.
             ruleset.RulesetInfo = this;
diff --git a/osu.Game/Rulesets/RulesetStore.cs b/osu.Game/Rulesets/RulesetStore.cs
index 4261ee3d47..0a34ca9598 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;
 using osu.Game.Database;
@@ -111,7 +112,7 @@ namespace osu.Game.Rulesets
                 {
                     try
                     {
-                        var instanceInfo = ((Ruleset)Activator.CreateInstance(Type.GetType(r.InstantiationInfo))).RulesetInfo;
+                        var instanceInfo = ((Ruleset)Activator.CreateInstance(Type.GetType(r.InstantiationInfo).AsNonNull())).RulesetInfo;
 
                         r.Name = instanceInfo.Name;
                         r.ShortName = instanceInfo.ShortName;
diff --git a/osu.Game/Skinning/SkinInfo.cs b/osu.Game/Skinning/SkinInfo.cs
index bc57a8e71c..55760876e3 100644
--- a/osu.Game/Skinning/SkinInfo.cs
+++ b/osu.Game/Skinning/SkinInfo.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.IO.Stores;
 using osu.Game.Configuration;
 using osu.Game.Database;
@@ -32,7 +33,7 @@ namespace osu.Game.Skinning
             var type = string.IsNullOrEmpty(InstantiationInfo)
                 // handle the case of skins imported before InstantiationInfo was added.
                 ? typeof(LegacySkin)
-                : Type.GetType(InstantiationInfo);
+                : Type.GetType(InstantiationInfo).AsNonNull();
 
             if (type == typeof(DefaultLegacySkin))
                 return (Skin)Activator.CreateInstance(type, this, legacyDefaultResources, resources);

From 5b2b701915f1c387856742d93a19a620a2ffb368 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 23:47:35 +0200
Subject: [PATCH 3480/3722] Ignore possible null in `GetResponseString()`

A null there indicates a deserialisation error and therefore due to the
catch block immediately succeeding the changed line everything will
continue to work as intended.
---
 osu.Game/Online/API/APIAccess.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index 944525c119..1686595512 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -270,7 +270,7 @@ namespace osu.Game.Online.API
             {
                 try
                 {
-                    return JObject.Parse(req.GetResponseString()).SelectToken("form_error", true).AsNonNull().ToObject<RegistrationRequest.RegistrationRequestErrors>();
+                    return JObject.Parse(req.GetResponseString().AsNonNull()).SelectToken("form_error", true).AsNonNull().ToObject<RegistrationRequest.RegistrationRequestErrors>();
                 }
                 catch
                 {

From fa6b5515b7752932c0ffb9f035659f3c2ab1aedb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 23:49:41 +0200
Subject: [PATCH 3481/3722] Ignore possible null from
 `JsonConvert.DeserializeObject()`

Nothing better can be done if a `null` is indeed returned.
---
 osu.Game/Skinning/Skin.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index 2944c7a8ec..f43283f624 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -8,6 +8,7 @@ using System.Text;
 using Newtonsoft.Json;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
@@ -57,7 +58,7 @@ namespace osu.Game.Skinning
 
                 string jsonContent = Encoding.UTF8.GetString(bytes);
 
-                DrawableComponentInfo[skinnableTarget] = JsonConvert.DeserializeObject<IEnumerable<SkinnableInfo>>(jsonContent).ToArray();
+                DrawableComponentInfo[skinnableTarget] = JsonConvert.DeserializeObject<IEnumerable<SkinnableInfo>>(jsonContent).AsNonNull().ToArray();
             }
         }
 

From b51d0380882c33bae1723af63036533f6ed2d8b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 23:50:25 +0200
Subject: [PATCH 3482/3722] Ignore possible path-related nulls

They're all in test code anyway, so any issue there will cause a test to
fail.
---
 osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs     | 3 ++-
 osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs    | 3 ++-
 osu.Game/Tests/Beatmaps/DifficultyCalculatorTest.cs | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
index 0c35e9471d..0d117f8755 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -12,6 +12,7 @@ using osu.Framework.Platform;
 using osu.Game.IPC;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
@@ -264,7 +265,7 @@ namespace osu.Game.Tests.Beatmaps.IO
 
                         // change filename
                         var firstFile = new FileInfo(Directory.GetFiles(extractedFolder).First());
-                        firstFile.MoveTo(Path.Combine(firstFile.DirectoryName, $"{firstFile.Name}-changed{firstFile.Extension}"));
+                        firstFile.MoveTo(Path.Combine(firstFile.DirectoryName.AsNonNull(), $"{firstFile.Name}-changed{firstFile.Extension}"));
 
                         using (var zip = ZipArchive.Create())
                         {
diff --git a/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs b/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
index 1c5e551042..a97f6defe9 100644
--- a/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
+++ b/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
@@ -9,6 +9,7 @@ using System.Reflection;
 using Newtonsoft.Json;
 using NUnit.Framework;
 using osu.Framework.Audio.Track;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Formats;
@@ -164,7 +165,7 @@ namespace osu.Game.Tests.Beatmaps
 
         private Stream openResource(string name)
         {
-            var localPath = Path.GetDirectoryName(Uri.UnescapeDataString(new UriBuilder(Assembly.GetExecutingAssembly().CodeBase).Path));
+            var localPath = Path.GetDirectoryName(Uri.UnescapeDataString(new UriBuilder(Assembly.GetExecutingAssembly().CodeBase).Path)).AsNonNull();
             return Assembly.LoadFrom(Path.Combine(localPath, $"{ResourceAssembly}.dll")).GetManifestResourceStream($@"{ResourceAssembly}.Resources.{name}");
         }
 
diff --git a/osu.Game/Tests/Beatmaps/DifficultyCalculatorTest.cs b/osu.Game/Tests/Beatmaps/DifficultyCalculatorTest.cs
index 748a52d1c5..e10bf08da4 100644
--- a/osu.Game/Tests/Beatmaps/DifficultyCalculatorTest.cs
+++ b/osu.Game/Tests/Beatmaps/DifficultyCalculatorTest.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Reflection;
 using NUnit.Framework;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.IO;
@@ -41,7 +42,7 @@ namespace osu.Game.Tests.Beatmaps
 
         private Stream openResource(string name)
         {
-            var localPath = Path.GetDirectoryName(Uri.UnescapeDataString(new UriBuilder(Assembly.GetExecutingAssembly().CodeBase).Path));
+            var localPath = Path.GetDirectoryName(Uri.UnescapeDataString(new UriBuilder(Assembly.GetExecutingAssembly().CodeBase).Path)).AsNonNull();
             return Assembly.LoadFrom(Path.Combine(localPath, $"{ResourceAssembly}.dll")).GetManifestResourceStream($@"{ResourceAssembly}.Resources.{name}");
         }
 

From e62e473bb262f368988dcfdbd417ca272f8a748a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 23:51:06 +0200
Subject: [PATCH 3483/3722] Ignore possible null in multiplayer test

A null value will fail the test anyhow.
---
 .../NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs b/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs
index 14589f8e6c..adc1d6aede 100644
--- a/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs
+++ b/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using Humanizer;
 using NUnit.Framework;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Testing;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Tests.Visual.Multiplayer;
@@ -34,7 +35,7 @@ namespace osu.Game.Tests.NonVisual.Multiplayer
             changeState(6, MultiplayerUserState.WaitingForLoad);
             checkPlayingUserCount(6);
 
-            AddStep("another user left", () => Client.RemoveUser(Client.Room?.Users.Last().User));
+            AddStep("another user left", () => Client.RemoveUser((Client.Room?.Users.Last().User).AsNonNull()));
             checkPlayingUserCount(5);
 
             AddStep("leave room", () => Client.LeaveRoom());

From d581e0a2524c6c584667d5017e9ab92e81a8de0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 23:52:16 +0200
Subject: [PATCH 3484/3722] Ignore possible nulls in
 `NotifyCollectionChangedArgs`

Safe to access by the virtue of the preceding case labels on
`args.Action`.  And they're in test code anyways.
---
 .../Visual/Online/TestSceneLeaderboardModSelector.cs         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneLeaderboardModSelector.cs b/osu.Game.Tests/Visual/Online/TestSceneLeaderboardModSelector.cs
index 54e655d4ec..fc438ce6dd 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneLeaderboardModSelector.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneLeaderboardModSelector.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
@@ -45,14 +46,14 @@ namespace osu.Game.Tests.Visual.Online
                 switch (args.Action)
                 {
                     case NotifyCollectionChangedAction.Add:
-                        args.NewItems.Cast<Mod>().ForEach(mod => selectedMods.Add(new OsuSpriteText
+                        args.NewItems.AsNonNull().Cast<Mod>().ForEach(mod => selectedMods.Add(new OsuSpriteText
                         {
                             Text = mod.Acronym,
                         }));
                         break;
 
                     case NotifyCollectionChangedAction.Remove:
-                        args.OldItems.Cast<Mod>().ForEach(mod =>
+                        args.OldItems.AsNonNull().Cast<Mod>().ForEach(mod =>
                         {
                             foreach (var selected in selectedMods)
                             {

From ae71389ebe18bcd3f3c1ca3793088c13fe041fcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 14 May 2021 23:53:37 +0200
Subject: [PATCH 3485/3722] Ignore possible nulls from stream reader in IPC

Any failures will be caught. They're not logged, but they also weren't
before. Error handling can be improved at a future date, this series of
changes is primarily intending to unblock a new inspection.
---
 osu.Game.Tournament/IPC/FileBasedIPC.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index 71417d1cc6..f538d4a7d9 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using JetBrains.Annotations;
 using Microsoft.Win32;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Framework.Threading;
@@ -77,8 +78,8 @@ namespace osu.Game.Tournament.IPC
                             using (var stream = IPCStorage.GetStream(file_ipc_filename))
                             using (var sr = new StreamReader(stream))
                             {
-                                var beatmapId = int.Parse(sr.ReadLine());
-                                var mods = int.Parse(sr.ReadLine());
+                                var beatmapId = int.Parse(sr.ReadLine().AsNonNull());
+                                var mods = int.Parse(sr.ReadLine().AsNonNull());
 
                                 if (lastBeatmapId != beatmapId)
                                 {
@@ -124,7 +125,7 @@ namespace osu.Game.Tournament.IPC
                             using (var stream = IPCStorage.GetStream(file_ipc_state_filename))
                             using (var sr = new StreamReader(stream))
                             {
-                                State.Value = (TourneyState)Enum.Parse(typeof(TourneyState), sr.ReadLine());
+                                State.Value = (TourneyState)Enum.Parse(typeof(TourneyState), sr.ReadLine().AsNonNull());
                             }
                         }
                         catch (Exception)

From 69fc072429bc31ad23a67a1dacf165cf341d6fde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 15 May 2021 01:01:27 +0200
Subject: [PATCH 3486/3722] Ignore skin component json data if deserialisation
 fails instead

Crashing was not really the best thing to do there given the preceding
code that already allowed a few continues in case of a missing file.
---
 osu.Game/Skinning/Skin.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/Skin.cs b/osu.Game/Skinning/Skin.cs
index f43283f624..b6cb8fc7a4 100644
--- a/osu.Game/Skinning/Skin.cs
+++ b/osu.Game/Skinning/Skin.cs
@@ -8,7 +8,6 @@ using System.Text;
 using Newtonsoft.Json;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
@@ -57,8 +56,12 @@ namespace osu.Game.Skinning
                     continue;
 
                 string jsonContent = Encoding.UTF8.GetString(bytes);
+                var deserializedContent = JsonConvert.DeserializeObject<IEnumerable<SkinnableInfo>>(jsonContent);
 
-                DrawableComponentInfo[skinnableTarget] = JsonConvert.DeserializeObject<IEnumerable<SkinnableInfo>>(jsonContent).AsNonNull().ToArray();
+                if (deserializedContent == null)
+                    continue;
+
+                DrawableComponentInfo[skinnableTarget] = deserializedContent.ToArray();
             }
         }
 

From 63ac430386a631ea683496527aa7f8cb47b5f065 Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sat, 15 May 2021 11:26:16 +0800
Subject: [PATCH 3487/3722] Rename startTime in parameters

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

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
index 4168293749..2752feb0a1 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
@@ -117,7 +117,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             }
         }
 
-        private (double startTime, double fadeDuration) getFadeOutParameters(DrawableOsuHitObject drawableObject)
+        private (double fadeStartTime, double fadeDuration) getFadeOutParameters(DrawableOsuHitObject drawableObject)
         {
             switch (drawableObject)
             {
@@ -135,7 +135,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                     return getParameters(drawableObject.HitObject);
             }
 
-            static (double startTime, double fadeDuration) getParameters(OsuHitObject hitObject)
+            static (double fadeStartTime, double fadeDuration) getParameters(OsuHitObject hitObject)
             {
                 var fadeOutStartTime = hitObject.StartTime - hitObject.TimePreempt + hitObject.TimeFadeIn;
                 var fadeOutDuration = hitObject.TimePreempt * fade_out_duration_multiplier;

From 6e5c4ed7c6c3e4890c1480d7ccac1d52b131c8cf Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sat, 15 May 2021 11:37:04 +0800
Subject: [PATCH 3488/3722] Revert "Remove empty override"

This reverts commit a86a4bab9137ef6781404dc116101662c4c6d858.
---
 osu.Game/Rulesets/Mods/ModHidden.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Rulesets/Mods/ModHidden.cs b/osu.Game/Rulesets/Mods/ModHidden.cs
index 238612b3d2..03932baca9 100644
--- a/osu.Game/Rulesets/Mods/ModHidden.cs
+++ b/osu.Game/Rulesets/Mods/ModHidden.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Graphics;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
@@ -36,5 +37,13 @@ namespace osu.Game.Rulesets.Mods
                     return rank;
             }
         }
+
+        protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
+        {
+        }
+
+        protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
+        {
+        }
     }
 }

From 166974506ea25739eb3ad48c7e9206370a684b4b Mon Sep 17 00:00:00 2001
From: PercyDan54 <50285552+PercyDan54@users.noreply.github.com>
Date: Sat, 15 May 2021 11:51:39 +0800
Subject: [PATCH 3489/3722] Duplicate implementions

---
 osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs         | 6 ++++--
 osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs | 9 +++++++++
 osu.Game.Rulesets.Taiko/Mods/TaikoModHidden.cs         | 9 +++++++++
 osu.Game/Rulesets/Mods/ModHidden.cs                    | 9 ---------
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs b/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
index ba3e8f9a8f..7bad4c79cb 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
@@ -28,10 +28,12 @@ namespace osu.Game.Rulesets.Catch.Mods
             catchPlayfield.CatcherArea.MovableCatcher.CatchFruitOnPlate = false;
         }
 
+        protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
+        {
+        }
+
         protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
         {
-            base.ApplyNormalVisibilityState(hitObject, state);
-
             if (!(hitObject is DrawableCatchHitObject catchDrawable))
                 return;
 
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs
index 87501d07a5..3c24e91d54 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModPlayfieldCover.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Mania.Mods
@@ -39,5 +40,13 @@ namespace osu.Game.Rulesets.Mania.Mods
                 }));
             }
         }
+
+        protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
+        {
+        }
+
+        protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
+        {
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModHidden.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModHidden.cs
index a6f902208c..7739ecaf5b 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModHidden.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModHidden.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Taiko.Mods
 {
@@ -10,5 +11,13 @@ namespace osu.Game.Rulesets.Taiko.Mods
         public override string Description => @"Beats fade out before you hit them!";
         public override double ScoreMultiplier => 1.06;
         public override bool HasImplementation => false;
+
+        protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
+        {
+        }
+
+        protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
+        {
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModHidden.cs b/osu.Game/Rulesets/Mods/ModHidden.cs
index 03932baca9..238612b3d2 100644
--- a/osu.Game/Rulesets/Mods/ModHidden.cs
+++ b/osu.Game/Rulesets/Mods/ModHidden.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Graphics;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
@@ -37,13 +36,5 @@ namespace osu.Game.Rulesets.Mods
                     return rank;
             }
         }
-
-        protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state)
-        {
-        }
-
-        protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state)
-        {
-        }
     }
 }

From 34d14907548cef21ae02cd8bf3eb7d26a3d16a3b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 15 May 2021 10:00:04 +0300
Subject: [PATCH 3490/3722] Remove null conditional

Shouldn't guard against that here.
---
 osu.Game/Screens/Play/BeatmapMetadataDisplay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index e26dd24de7..fd1150650c 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Screens.Play
         [BackgroundDependencyLoader]
         private void load(BeatmapDifficultyCache difficultyCache)
         {
-            var metadata = beatmap.BeatmapInfo?.Metadata ?? new BeatmapMetadata();
+            var metadata = beatmap.BeatmapInfo.Metadata;
 
             AutoSizeAxes = Axes.Both;
             Children = new Drawable[]

From e479db91864dd9a097aa90407940fd9b3639004b Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 15 May 2021 19:14:02 +0300
Subject: [PATCH 3491/3722] Clear transforms in PostsContainer for all children

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

diff --git a/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs b/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
index d6d7527a6c..85a06c8227 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
@@ -149,7 +149,7 @@ namespace osu.Game.Overlays.News.Sidebar
 
                 IsOpen.BindValueChanged(open =>
                 {
-                    ClearTransforms();
+                    ClearTransforms(true);
 
                     if (open.NewValue)
                     {

From 3e1b1c6c3ebb539c8bc9d8cbb3b5c709aab2b0fc Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 15 May 2021 19:14:58 +0300
Subject: [PATCH 3492/3722] Improve statement readability

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

diff --git a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
index 3851dea83a..837c661cbd 100644
--- a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
+++ b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Overlays.News.Sidebar
 
             var allPosts = metadata.NewValue.NewsPosts;
 
-            if (!allPosts?.Any() ?? true)
+            if (allPosts?.Any() != true)
                 return;
 
             var lookup = metadata.NewValue.NewsPosts.ToLookup(post => post.PublishedAt.Month);

From a91f2d3dbad5e4a41dec719fa57ba5279b64ccd2 Mon Sep 17 00:00:00 2001
From: Henry Lin <henry.ys.lin@gmail.com>
Date: Sun, 16 May 2021 10:17:04 +0800
Subject: [PATCH 3493/3722] Change "judgment" to "judgement"

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

diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index ea3eb5eb5c..8993a9b18a 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Rulesets.Osu.UI
 
             var hitWindows = new OsuHitWindows();
             foreach (var result in Enum.GetValues(typeof(HitResult)).OfType<HitResult>().Where(r => r > HitResult.None && hitWindows.IsHitResultAllowed(r)))
-                poolDictionary.Add(result, new DrawableJudgementPool(result, onJudgmentLoaded));
+                poolDictionary.Add(result, new DrawableJudgementPool(result, onJudgementLoaded));
 
             AddRangeInternal(poolDictionary.Values);
 
@@ -102,7 +102,7 @@ namespace osu.Game.Rulesets.Osu.UI
             }
         }
 
-        private void onJudgmentLoaded(DrawableOsuJudgement judgement)
+        private void onJudgementLoaded(DrawableOsuJudgement judgement)
         {
             judgementAboveHitObjectLayer.Add(judgement.GetProxyAboveHitObjectsContent());
         }

From 3519398a224ba44f2f2e91ba6dd3aa921741a6a9 Mon Sep 17 00:00:00 2001
From: Henry Lin <henry.ys.lin@gmail.com>
Date: Sun, 16 May 2021 11:16:12 +0800
Subject: [PATCH 3494/3722] Added "flip" mod for taiko

---
 osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs | 32 ++++++++++++++++++++
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs      |  2 +-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs

diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
new file mode 100644
index 0000000000..1f2f2c4784
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
@@ -0,0 +1,32 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Taiko.Beatmaps;
+using osu.Game.Rulesets.Taiko.Objects;
+
+namespace osu.Game.Rulesets.Taiko.Mods
+{
+    public class TaikoModFlip : Mod, IApplicableToBeatmap
+    {
+        public override string Name => "Flip";
+        public override string Acronym => "FP";
+        public override string Description => @"Dons become kats, kats become dons";
+        public override ModType Type => ModType.Conversion;
+        public override double ScoreMultiplier => 1;
+
+        public void ApplyToBeatmap(IBeatmap beatmap)
+        {
+            var taikoBeatmap = (TaikoBeatmap)beatmap;
+
+            foreach (var obj in taikoBeatmap.HitObjects)
+            {
+                if (obj is Hit hit)
+                    hit.Type = hit.Type == HitType.Centre ? HitType.Rim : HitType.Centre; 
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index f4e158ec32..26dc1bd416 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -133,7 +133,7 @@ namespace osu.Game.Rulesets.Taiko
                 case ModType.Conversion:
                     return new Mod[]
                     {
-                        new TaikoModRandom(),
+                        new MultiMod(new TaikoModFlip(), new TaikoModRandom()),
                         new TaikoModDifficultyAdjust(),
                         new TaikoModClassic(),
                     };

From da13be6dd0d9ec1dca90b46649e9a3e6a3f6c31d Mon Sep 17 00:00:00 2001
From: Henry Lin <henry.ys.lin@gmail.com>
Date: Sun, 16 May 2021 11:28:11 +0800
Subject: [PATCH 3495/3722] Trimmed trailing white space

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

diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
index 1f2f2c4784..e2de6ccc3d 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
             foreach (var obj in taikoBeatmap.HitObjects)
             {
                 if (obj is Hit hit)
-                    hit.Type = hit.Type == HitType.Centre ? HitType.Rim : HitType.Centre; 
+                    hit.Type = hit.Type == HitType.Centre ? HitType.Rim : HitType.Centre;
             }
         }
     }

From 3d83741a23c6c0be53c71000148a3d7531e580c2 Mon Sep 17 00:00:00 2001
From: Henry Lin <henry.ys.lin@gmail.com>
Date: Sun, 16 May 2021 12:03:03 +0800
Subject: [PATCH 3496/3722] Separate Flip and Random

---
 osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs   | 3 +++
 osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs | 3 +++
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs        | 3 ++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
index e2de6ccc3d..22e627ef06 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.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 System;
+using System.Linq;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
@@ -17,6 +19,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
         public override string Description => @"Dons become kats, kats become dons";
         public override ModType Type => ModType.Conversion;
         public override double ScoreMultiplier => 1;
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModRandom)).ToArray();
 
         public void ApplyToBeatmap(IBeatmap beatmap)
         {
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs
index 1cf19ac18e..e203bbc431 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.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 System;
+using System.Linq;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
@@ -12,6 +14,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
     public class TaikoModRandom : ModRandom, IApplicableToBeatmap
     {
         public override string Description => @"Shuffle around the colours!";
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(TaikoModFlip)).ToArray();
 
         public void ApplyToBeatmap(IBeatmap beatmap)
         {
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 26dc1bd416..52088b7ac4 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -133,7 +133,8 @@ namespace osu.Game.Rulesets.Taiko
                 case ModType.Conversion:
                     return new Mod[]
                     {
-                        new MultiMod(new TaikoModFlip(), new TaikoModRandom()),
+                        new TaikoModFlip(),
+                        new TaikoModRandom(),
                         new TaikoModDifficultyAdjust(),
                         new TaikoModClassic(),
                     };

From cbc2a38b590429ccf07d4aea7e8d4083899aba01 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 16 May 2021 13:21:06 +0900
Subject: [PATCH 3497/3722] Move new mod to end to avoid reordering

---
 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 52088b7ac4..9232ea63ee 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -133,10 +133,10 @@ namespace osu.Game.Rulesets.Taiko
                 case ModType.Conversion:
                     return new Mod[]
                     {
-                        new TaikoModFlip(),
                         new TaikoModRandom(),
                         new TaikoModDifficultyAdjust(),
                         new TaikoModClassic(),
+                        new TaikoModFlip(),
                     };
 
                 case ModType.Automation:

From 422a3b76b64532f69b1432ff01d2c0d39aa68f12 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 16 May 2021 13:21:19 +0900
Subject: [PATCH 3498/3722] Remove unused using statements

---
 osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
index 22e627ef06..bfab98fbf8 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
@@ -3,9 +3,7 @@
 
 using System;
 using System.Linq;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps;
-using osu.Game.Graphics;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Taiko.Beatmaps;
 using osu.Game.Rulesets.Taiko.Objects;

From 5972e43bc2a038df5e8c2c8f97e17ae28fe79399 Mon Sep 17 00:00:00 2001
From: Henry Lin <henry.ys.lin@gmail.com>
Date: Sun, 16 May 2021 12:51:40 +0800
Subject: [PATCH 3499/3722] Renamed TaikoModFlip to TaikoModInvert

---
 osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs   | 12 +-----------
 .../Mods/{TaikoModFlip.cs => TaikoModInvert.cs}  |  6 +-----
 osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs   |  2 +-
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs          |  2 +-
 osu.Game/Rulesets/Mods/ModInvert.cs              | 16 ++++++++++++++++
 5 files changed, 20 insertions(+), 18 deletions(-)
 rename osu.Game.Rulesets.Taiko/Mods/{TaikoModFlip.cs => TaikoModInvert.cs} (77%)
 create mode 100644 osu.Game/Rulesets/Mods/ModInvert.cs

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
index 1ea45c295c..0366c0f374 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Beatmaps;
@@ -13,19 +12,10 @@ using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
-    public class ManiaModInvert : Mod, IApplicableAfterBeatmapConversion
+    public class ManiaModInvert : ModInvert, IApplicableAfterBeatmapConversion
     {
-        public override string Name => "Invert";
-
-        public override string Acronym => "IN";
-        public override double ScoreMultiplier => 1;
-
         public override string Description => "Hold the keys. To the beat.";
 
-        public override IconUsage? Icon => FontAwesome.Solid.YinYang;
-
-        public override ModType Type => ModType.Conversion;
-
         public void ApplyToBeatmap(IBeatmap beatmap)
         {
             var maniaBeatmap = (ManiaBeatmap)beatmap;
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModInvert.cs
similarity index 77%
rename from osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
rename to osu.Game.Rulesets.Taiko/Mods/TaikoModInvert.cs
index bfab98fbf8..a6ccebaa61 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModInvert.cs
@@ -10,13 +10,9 @@ using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Mods
 {
-    public class TaikoModFlip : Mod, IApplicableToBeatmap
+    public class TaikoModInvert : ModInvert, IApplicableToBeatmap
     {
-        public override string Name => "Flip";
-        public override string Acronym => "FP";
         public override string Description => @"Dons become kats, kats become dons";
-        public override ModType Type => ModType.Conversion;
-        public override double ScoreMultiplier => 1;
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModRandom)).ToArray();
 
         public void ApplyToBeatmap(IBeatmap beatmap)
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs
index e203bbc431..a5ab176176 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
     public class TaikoModRandom : ModRandom, IApplicableToBeatmap
     {
         public override string Description => @"Shuffle around the colours!";
-        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(TaikoModFlip)).ToArray();
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(TaikoModInvert)).ToArray();
 
         public void ApplyToBeatmap(IBeatmap beatmap)
         {
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 9232ea63ee..8a716bf56e 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -136,7 +136,7 @@ namespace osu.Game.Rulesets.Taiko
                         new TaikoModRandom(),
                         new TaikoModDifficultyAdjust(),
                         new TaikoModClassic(),
-                        new TaikoModFlip(),
+                        new TaikoModInvert(),
                     };
 
                 case ModType.Automation:
diff --git a/osu.Game/Rulesets/Mods/ModInvert.cs b/osu.Game/Rulesets/Mods/ModInvert.cs
new file mode 100644
index 0000000000..6c211d2173
--- /dev/null
+++ b/osu.Game/Rulesets/Mods/ModInvert.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.Graphics.Sprites;
+
+namespace osu.Game.Rulesets.Mods
+{
+    public abstract class ModInvert : Mod
+    {
+        public override string Name => "Invert";
+        public override string Acronym => "IN";
+        public override ModType Type => ModType.Conversion;
+        public override IconUsage? Icon => FontAwesome.Solid.YinYang;
+        public override double ScoreMultiplier => 1;
+    }
+}

From c4ae70a82720a04a82502d8bacf158040ac412d9 Mon Sep 17 00:00:00 2001
From: Henry Lin <henry.ys.lin@gmail.com>
Date: Mon, 17 May 2021 10:59:56 +0800
Subject: [PATCH 3500/3722] Revert "Renamed TaikoModFlip to TaikoModInvert"

This reverts commit 5972e43bc2a038df5e8c2c8f97e17ae28fe79399.
---
 osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs   | 12 +++++++++++-
 .../Mods/{TaikoModInvert.cs => TaikoModFlip.cs}  |  6 +++++-
 osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs   |  2 +-
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs          |  2 +-
 osu.Game/Rulesets/Mods/ModInvert.cs              | 16 ----------------
 5 files changed, 18 insertions(+), 20 deletions(-)
 rename osu.Game.Rulesets.Taiko/Mods/{TaikoModInvert.cs => TaikoModFlip.cs} (77%)
 delete mode 100644 osu.Game/Rulesets/Mods/ModInvert.cs

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
index 0366c0f374..1ea45c295c 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModInvert.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Beatmaps;
@@ -12,10 +13,19 @@ using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
-    public class ManiaModInvert : ModInvert, IApplicableAfterBeatmapConversion
+    public class ManiaModInvert : Mod, IApplicableAfterBeatmapConversion
     {
+        public override string Name => "Invert";
+
+        public override string Acronym => "IN";
+        public override double ScoreMultiplier => 1;
+
         public override string Description => "Hold the keys. To the beat.";
 
+        public override IconUsage? Icon => FontAwesome.Solid.YinYang;
+
+        public override ModType Type => ModType.Conversion;
+
         public void ApplyToBeatmap(IBeatmap beatmap)
         {
             var maniaBeatmap = (ManiaBeatmap)beatmap;
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModInvert.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
similarity index 77%
rename from osu.Game.Rulesets.Taiko/Mods/TaikoModInvert.cs
rename to osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
index a6ccebaa61..bfab98fbf8 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModInvert.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
@@ -10,9 +10,13 @@ using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Mods
 {
-    public class TaikoModInvert : ModInvert, IApplicableToBeatmap
+    public class TaikoModFlip : Mod, IApplicableToBeatmap
     {
+        public override string Name => "Flip";
+        public override string Acronym => "FP";
         public override string Description => @"Dons become kats, kats become dons";
+        public override ModType Type => ModType.Conversion;
+        public override double ScoreMultiplier => 1;
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModRandom)).ToArray();
 
         public void ApplyToBeatmap(IBeatmap beatmap)
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs
index a5ab176176..e203bbc431 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
     public class TaikoModRandom : ModRandom, IApplicableToBeatmap
     {
         public override string Description => @"Shuffle around the colours!";
-        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(TaikoModInvert)).ToArray();
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(TaikoModFlip)).ToArray();
 
         public void ApplyToBeatmap(IBeatmap beatmap)
         {
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 8a716bf56e..9232ea63ee 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -136,7 +136,7 @@ namespace osu.Game.Rulesets.Taiko
                         new TaikoModRandom(),
                         new TaikoModDifficultyAdjust(),
                         new TaikoModClassic(),
-                        new TaikoModInvert(),
+                        new TaikoModFlip(),
                     };
 
                 case ModType.Automation:
diff --git a/osu.Game/Rulesets/Mods/ModInvert.cs b/osu.Game/Rulesets/Mods/ModInvert.cs
deleted file mode 100644
index 6c211d2173..0000000000
--- a/osu.Game/Rulesets/Mods/ModInvert.cs
+++ /dev/null
@@ -1,16 +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.Sprites;
-
-namespace osu.Game.Rulesets.Mods
-{
-    public abstract class ModInvert : Mod
-    {
-        public override string Name => "Invert";
-        public override string Acronym => "IN";
-        public override ModType Type => ModType.Conversion;
-        public override IconUsage? Icon => FontAwesome.Solid.YinYang;
-        public override double ScoreMultiplier => 1;
-    }
-}

From f34637ea9c06a7e3a00b45f3fc762a025548dfe5 Mon Sep 17 00:00:00 2001
From: Henry Lin <henry.ys.lin@gmail.com>
Date: Mon, 17 May 2021 11:04:01 +0800
Subject: [PATCH 3501/3722] Renamed TaikoModFlip to TaikoModSwap

---
 osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs              | 2 +-
 .../Mods/{TaikoModFlip.cs => TaikoModSwap.cs}               | 6 +++---
 osu.Game.Rulesets.Taiko/TaikoRuleset.cs                     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename osu.Game.Rulesets.Taiko/Mods/{TaikoModFlip.cs => TaikoModSwap.cs} (86%)

diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs
index e203bbc431..a22f189d5e 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModRandom.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Taiko.Mods
     public class TaikoModRandom : ModRandom, IApplicableToBeatmap
     {
         public override string Description => @"Shuffle around the colours!";
-        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(TaikoModFlip)).ToArray();
+        public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(TaikoModSwap)).ToArray();
 
         public void ApplyToBeatmap(IBeatmap beatmap)
         {
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModSwap.cs
similarity index 86%
rename from osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
rename to osu.Game.Rulesets.Taiko/Mods/TaikoModSwap.cs
index bfab98fbf8..3cb337c41d 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlip.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModSwap.cs
@@ -10,10 +10,10 @@ using osu.Game.Rulesets.Taiko.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Mods
 {
-    public class TaikoModFlip : Mod, IApplicableToBeatmap
+    public class TaikoModSwap : Mod, IApplicableToBeatmap
     {
-        public override string Name => "Flip";
-        public override string Acronym => "FP";
+        public override string Name => "Swap";
+        public override string Acronym => "SW";
         public override string Description => @"Dons become kats, kats become dons";
         public override ModType Type => ModType.Conversion;
         public override double ScoreMultiplier => 1;
diff --git a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
index 9232ea63ee..5854d4770c 100644
--- a/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoRuleset.cs
@@ -136,7 +136,7 @@ namespace osu.Game.Rulesets.Taiko
                         new TaikoModRandom(),
                         new TaikoModDifficultyAdjust(),
                         new TaikoModClassic(),
-                        new TaikoModFlip(),
+                        new TaikoModSwap(),
                     };
 
                 case ModType.Automation:

From 50e2b5a32761768102975a76511d099bc51180d0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 May 2021 16:00:36 +0900
Subject: [PATCH 3502/3722] SideBar -> Sidebar

---
 osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs | 6 +++---
 osu.Game/Overlays/News/Sidebar/NewsSideBar.cs        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
index b5405a979e..e376d9b1ed 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
@@ -13,15 +13,15 @@ using osu.Game.Overlays.News.Sidebar;
 
 namespace osu.Game.Tests.Visual.Online
 {
-    public class TestSceneNewsSideBar : OsuTestScene
+    public class TestSceneNewsSidebar : OsuTestScene
     {
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
 
-        private NewsSideBar sidebar;
+        private NewsSidebar sidebar;
 
         [SetUp]
-        public void SetUp() => Schedule(() => Child = sidebar = new NewsSideBar());
+        public void SetUp() => Schedule(() => Child = sidebar = new NewsSidebar());
 
         [Test]
         public void TestYearsPanelVisibility()
diff --git a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
index 837c661cbd..bad334cb2f 100644
--- a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
+++ b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
@@ -12,7 +12,7 @@ using System.Linq;
 
 namespace osu.Game.Overlays.News.Sidebar
 {
-    public class NewsSideBar : CompositeDrawable
+    public class NewsSidebar : CompositeDrawable
     {
         [Cached]
         public readonly Bindable<APINewsSidebar> Metadata = new Bindable<APINewsSidebar>();

From 22561cda1956e51f3747952f19fb1f59c9ebc9db Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 May 2021 16:02:21 +0900
Subject: [PATCH 3503/3722] MonthDropdown -> MonthSection

---
 osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs        | 2 +-
 .../News/Sidebar/{MonthDropdown.cs => MonthSection.cs}      | 4 ++--
 osu.Game/Overlays/News/Sidebar/NewsSideBar.cs               | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename osu.Game/Overlays/News/Sidebar/{MonthDropdown.cs => MonthSection.cs} (97%)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
index e376d9b1ed..5e8cd397bc 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Tests.Visual.Online
         public void TestMetadataWithNoPosts()
         {
             AddStep("Add data with no posts", () => sidebar.Metadata.Value = metadata_with_no_posts);
-            AddUntilStep("No dropdowns were created", () => !sidebar.ChildrenOfType<MonthDropdown>().Any());
+            AddUntilStep("No dropdowns were created", () => !sidebar.ChildrenOfType<MonthSection>().Any());
         }
 
         private YearsPanel yearsPanel => sidebar.ChildrenOfType<YearsPanel>().FirstOrDefault();
diff --git a/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs b/osu.Game/Overlays/News/Sidebar/MonthSection.cs
similarity index 97%
rename from osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
rename to osu.Game/Overlays/News/Sidebar/MonthSection.cs
index 85a06c8227..80c408bda5 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthDropdown.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthSection.cs
@@ -18,13 +18,13 @@ using System.Diagnostics;
 
 namespace osu.Game.Overlays.News.Sidebar
 {
-    public class MonthDropdown : CompositeDrawable
+    public class MonthSection : CompositeDrawable
     {
         private const int animation_duration = 250;
 
         public readonly BindableBool IsOpen = new BindableBool();
 
-        public MonthDropdown(int month, int year, IEnumerable<APINewsPost> posts)
+        public MonthSection(int month, int year, IEnumerable<APINewsPost> posts)
         {
             Debug.Assert(posts.All(p => p.PublishedAt.Month == month && p.PublishedAt.Year == year));
 
diff --git a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
index bad334cb2f..b8d283b7e2 100644
--- a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
+++ b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Overlays.News.Sidebar
         [Cached]
         public readonly Bindable<APINewsSidebar> Metadata = new Bindable<APINewsSidebar>();
 
-        private FillFlowContainer<MonthDropdown> monthsFlow;
+        private FillFlowContainer<MonthSection> monthsFlow;
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider)
@@ -49,7 +49,7 @@ namespace osu.Game.Overlays.News.Sidebar
                         Children = new Drawable[]
                         {
                             new YearsPanel(),
-                            monthsFlow = new FillFlowContainer<MonthDropdown>
+                            monthsFlow = new FillFlowContainer<MonthSection>
                             {
                                 AutoSizeAxes = Axes.Y,
                                 RelativeSizeAxes = Axes.X,
@@ -93,7 +93,7 @@ namespace osu.Game.Overlays.News.Sidebar
                 var month = sortedKeys[i];
                 var posts = lookup[month];
 
-                monthsFlow.Add(new MonthDropdown(month, year, posts)
+                monthsFlow.Add(new MonthSection(month, year, posts)
                 {
                     IsOpen = { Value = i == 0 }
                 });

From 032f60819d0836fdd24a6fe715b08a3835e454c2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 May 2021 16:11:46 +0900
Subject: [PATCH 3504/3722] Rename content container

---
 osu.Game/Overlays/News/Sidebar/YearsPanel.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
index 2d405e832b..932494f740 100644
--- a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Overlays.News.Sidebar
     {
         private readonly Bindable<APINewsSidebar> metadata = new Bindable<APINewsSidebar>();
 
-        private Container gridPlaceholder;
+        private Container gridContent;
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider, Bindable<APINewsSidebar> metadata)
@@ -38,7 +38,7 @@ namespace osu.Game.Overlays.News.Sidebar
                     RelativeSizeAxes = Axes.Both,
                     Colour = colourProvider.Background3
                 },
-                gridPlaceholder = new Container
+                gridContent = new Container
                 {
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
@@ -59,7 +59,7 @@ namespace osu.Game.Overlays.News.Sidebar
                     return;
                 }
 
-                gridPlaceholder.Child = new YearsGridContainer(m.NewValue.Years, m.NewValue.CurrentYear);
+                gridContent.Child = new YearsGridContainer(m.NewValue.Years, m.NewValue.CurrentYear);
                 Show();
             }, true);
         }
@@ -77,6 +77,7 @@ namespace osu.Game.Overlays.News.Sidebar
 
                 RelativeSizeAxes = Axes.X;
                 Height = 15;
+
                 Child = text = new OsuSpriteText
                 {
                     Anchor = Anchor.Centre,

From ae1e62288d57d1477155f439f4d2b094edd68447 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 May 2021 16:16:50 +0900
Subject: [PATCH 3505/3722] Reorder tests to not have the first test show
 nothing

---
 .../Visual/Online/TestSceneNewsSideBar.cs          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
index 5e8cd397bc..706de2b310 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
@@ -23,6 +23,13 @@ namespace osu.Game.Tests.Visual.Online
         [SetUp]
         public void SetUp() => Schedule(() => Child = sidebar = new NewsSidebar());
 
+        [Test]
+        public void TestMetadataWithNoPosts()
+        {
+            AddStep("Add data with no posts", () => sidebar.Metadata.Value = metadata_with_no_posts);
+            AddUntilStep("No dropdowns were created", () => !sidebar.ChildrenOfType<MonthSection>().Any());
+        }
+
         [Test]
         public void TestYearsPanelVisibility()
         {
@@ -31,13 +38,6 @@ namespace osu.Game.Tests.Visual.Online
             AddUntilStep("Years panel is visible", () => yearsPanel?.Alpha == 1);
         }
 
-        [Test]
-        public void TestMetadataWithNoPosts()
-        {
-            AddStep("Add data with no posts", () => sidebar.Metadata.Value = metadata_with_no_posts);
-            AddUntilStep("No dropdowns were created", () => !sidebar.ChildrenOfType<MonthSection>().Any());
-        }
-
         private YearsPanel yearsPanel => sidebar.ChildrenOfType<YearsPanel>().FirstOrDefault();
 
         private static readonly APINewsSidebar metadata = new APINewsSidebar

From abeeda5d04ddb2922629fba6fea2812ca5335c27 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 May 2021 16:24:43 +0900
Subject: [PATCH 3506/3722] Rewrite `YearsPanel` to not be insanely long

---
 osu.Game/Overlays/News/Sidebar/YearsPanel.cs | 49 ++++----------------
 1 file changed, 9 insertions(+), 40 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
index 932494f740..4573ae530f 100644
--- a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
@@ -1,17 +1,17 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Graphics.Containers;
+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.Containers;
 using osu.Game.Graphics.Sprites;
-using System.Collections.Generic;
-using osu.Game.Graphics;
-using osu.Framework.Bindables;
 using osu.Game.Online.API.Requests.Responses;
-using System;
 using osuTK.Graphics;
 
 namespace osu.Game.Overlays.News.Sidebar
@@ -77,6 +77,7 @@ namespace osu.Game.Overlays.News.Sidebar
 
                 RelativeSizeAxes = Axes.X;
                 Height = 15;
+                Padding = new MarginPadding { Vertical = 2.5f };
 
                 Child = text = new OsuSpriteText
                 {
@@ -99,39 +100,19 @@ namespace osu.Game.Overlays.News.Sidebar
         private class YearsGridContainer : GridContainer
         {
             private const int column_count = 4;
-            private const float spacing = 5f;
 
             private readonly int rowCount;
 
             public YearsGridContainer(int[] years, int currentYear)
             {
-                rowCount = (int)Math.Ceiling((float)years.Length / column_count);
+                rowCount = (years.Length + column_count - 1) / column_count;
 
                 RelativeSizeAxes = Axes.X;
                 AutoSizeAxes = Axes.Y;
-                RowDimensions = getRowDimensions();
-                ColumnDimensions = getColumnDimensions();
+                RowDimensions = Enumerable.Range(0, rowCount).Select(_ => new Dimension(GridSizeMode.AutoSize)).ToArray();
                 Content = createContent(years, currentYear);
             }
 
-            private Dimension[] getRowDimensions()
-            {
-                var rowDimensions = new Dimension[rowCount];
-                for (int i = 0; i < rowCount; i++)
-                    rowDimensions[i] = new Dimension(GridSizeMode.AutoSize);
-
-                return rowDimensions;
-            }
-
-            private Dimension[] getColumnDimensions()
-            {
-                var columnDimensions = new Dimension[column_count];
-                for (int i = 0; i < column_count; i++)
-                    columnDimensions[i] = new Dimension(GridSizeMode.Relative, size: 1f / column_count);
-
-                return columnDimensions;
-            }
-
             private Drawable[][] createContent(int[] years, int currentYear)
             {
                 var buttons = new Drawable[rowCount][];
@@ -153,19 +134,7 @@ namespace osu.Game.Overlays.News.Sidebar
                             var year = years[index];
                             var isCurrent = year == currentYear;
 
-                            buttons[i][j] = new Container
-                            {
-                                RelativeSizeAxes = Axes.X,
-                                AutoSizeAxes = Axes.Y,
-                                Padding = new MarginPadding
-                                {
-                                    Top = i == 0 ? 0 : spacing / 2,
-                                    Bottom = i == rowCount - 1 ? 0 : spacing / 2,
-                                    Left = j == 0 ? 0 : spacing / 2,
-                                    Right = j == column_count - 1 ? 0 : spacing / 2
-                                },
-                                Child = new YearButton(year, isCurrent)
-                            };
+                            buttons[i][j] = new YearButton(year, isCurrent);
                         }
                     }
                 }

From baa4089364f46eb59c1209dd94d2f2a78a2e718a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 May 2021 16:40:42 +0900
Subject: [PATCH 3507/3722] Expose method to adjust header text, not whole
 drawable

---
 .../Maintenance/DirectorySelectScreen.cs         | 16 +++++++++++-----
 .../Maintenance/MigrationSelectScreen.cs         |  9 ++-------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
index c2366ca209..e7c69e89fe 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
@@ -10,6 +10,7 @@ using osu.Game.Screens;
 using osuTK;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Localisation;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Framework.Screens;
@@ -22,7 +23,10 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
         private DirectorySelector directorySelector;
 
-        protected abstract OsuSpriteText CreateHeader();
+        /// <summary>
+        /// Text to display in the header to inform the user of what they are selecting.
+        /// </summary>
+        public abstract LocalisableString HeaderText { get; }
 
         /// <summary>
         /// Called upon selection of a directory by the user.
@@ -73,11 +77,13 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                         {
                             new Drawable[]
                             {
-                                CreateHeader().With(header =>
+                                new OsuSpriteText
                                 {
-                                    header.Origin = Anchor.Centre;
-                                    header.Anchor = Anchor.Centre;
-                                })
+                                    Text = HeaderText,
+                                    Font = OsuFont.Default.With(size: 40),
+                                    Origin = Anchor.Centre,
+                                    Anchor = Anchor.Centre,
+                                }
                             },
                             new Drawable[]
                             {
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
index 6334bffe94..1a60ab0638 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/MigrationSelectScreen.cs
@@ -4,11 +4,10 @@
 using System;
 using System.IO;
 using osu.Framework.Allocation;
+using osu.Framework.Localisation;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Framework.Screens;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Overlays.Settings.Sections.Maintenance
 {
@@ -25,11 +24,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
         public override bool HideOverlaysOnEnter => true;
 
-        protected override OsuSpriteText CreateHeader() => new OsuSpriteText
-        {
-            Text = "Please select a new location",
-            Font = OsuFont.Default.With(size: 40)
-        };
+        public override LocalisableString HeaderText => "Please select a new location";
 
         protected override void OnSelection(DirectoryInfo directory)
         {

From e754d2e59028940ff1a2e8b06cf66e88d1187299 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 17 May 2021 10:54:45 +0300
Subject: [PATCH 3508/3722] Simplify YearButton

---
 osu.Game/Overlays/News/Sidebar/YearsPanel.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
index 4573ae530f..2528d51331 100644
--- a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -66,9 +65,6 @@ namespace osu.Game.Overlays.News.Sidebar
 
         private class YearButton : OsuHoverContainer
         {
-            protected override IEnumerable<Drawable> EffectTargets => new[] { text };
-
-            private readonly OsuSpriteText text;
             private readonly bool isCurrent;
 
             public YearButton(int year, bool isCurrent)
@@ -79,7 +75,7 @@ namespace osu.Game.Overlays.News.Sidebar
                 Height = 15;
                 Padding = new MarginPadding { Vertical = 2.5f };
 
-                Child = text = new OsuSpriteText
+                Child = new OsuSpriteText
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,

From e3b8d8ee1875d357db0198894fb8c475969f090e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 17 May 2021 16:58:54 +0900
Subject: [PATCH 3509/3722] Add support for overlay-coloured links

---
 osu.Game/Online/Chat/DrawableLinkCompiler.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Chat/DrawableLinkCompiler.cs b/osu.Game/Online/Chat/DrawableLinkCompiler.cs
index d27a3fbffe..e7f47833a2 100644
--- a/osu.Game/Online/Chat/DrawableLinkCompiler.cs
+++ b/osu.Game/Online/Chat/DrawableLinkCompiler.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays;
 using osuTK;
 
 namespace osu.Game.Online.Chat
@@ -20,7 +21,10 @@ namespace osu.Game.Online.Chat
         /// <summary>
         /// Each word part of a chat link (split for word-wrap support).
         /// </summary>
-        public List<Drawable> Parts;
+        public readonly List<Drawable> Parts;
+
+        [Resolved(CanBeNull = true)]
+        private OverlayColourProvider overlayColourProvider { get; set; }
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Parts.Any(d => d.ReceivePositionalInputAt(screenSpacePos));
 
@@ -34,7 +38,7 @@ namespace osu.Game.Online.Chat
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            IdleColour = colours.Blue;
+            IdleColour = overlayColourProvider?.Light2 ?? colours.Blue;
         }
 
         protected override IEnumerable<Drawable> EffectTargets => Parts;

From 5059bfaef99e987293d6b3f3d3f5b7629dcab9d9 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 17 May 2021 11:17:02 +0300
Subject: [PATCH 3510/3722] Use FillFlowContainer in YearsPanel

---
 osu.Game/Overlays/News/Sidebar/YearsPanel.cs | 70 +++++---------------
 1 file changed, 18 insertions(+), 52 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
index 2528d51331..331a7e10e1 100644
--- a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/YearsPanel.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 osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -11,6 +10,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.API.Requests.Responses;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Overlays.News.Sidebar
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.News.Sidebar
     {
         private readonly Bindable<APINewsSidebar> metadata = new Bindable<APINewsSidebar>();
 
-        private Container gridContent;
+        private FillFlowContainer yearsFlow;
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider, Bindable<APINewsSidebar> metadata)
@@ -37,11 +37,17 @@ namespace osu.Game.Overlays.News.Sidebar
                     RelativeSizeAxes = Axes.Both,
                     Colour = colourProvider.Background3
                 },
-                gridContent = new Container
+                new Container
                 {
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
-                    Padding = new MarginPadding(5)
+                    Padding = new MarginPadding(5),
+                    Child = yearsFlow = new FillFlowContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Spacing = new Vector2(0, 5)
+                    }
                 }
             };
         }
@@ -52,13 +58,19 @@ namespace osu.Game.Overlays.News.Sidebar
 
             metadata.BindValueChanged(m =>
             {
+                yearsFlow.Clear();
+
                 if (m.NewValue == null)
                 {
                     Hide();
                     return;
                 }
 
-                gridContent.Child = new YearsGridContainer(m.NewValue.Years, m.NewValue.CurrentYear);
+                var currentYear = m.NewValue.CurrentYear;
+
+                foreach (var y in m.NewValue.Years)
+                    yearsFlow.Add(new YearButton(y, y == currentYear));
+
                 Show();
             }, true);
         }
@@ -72,8 +84,8 @@ namespace osu.Game.Overlays.News.Sidebar
                 this.isCurrent = isCurrent;
 
                 RelativeSizeAxes = Axes.X;
+                Width = 0.25f;
                 Height = 15;
-                Padding = new MarginPadding { Vertical = 2.5f };
 
                 Child = new OsuSpriteText
                 {
@@ -92,51 +104,5 @@ namespace osu.Game.Overlays.News.Sidebar
                 Action = () => { }; // Avoid button being disabled since there's no proper action assigned.
             }
         }
-
-        private class YearsGridContainer : GridContainer
-        {
-            private const int column_count = 4;
-
-            private readonly int rowCount;
-
-            public YearsGridContainer(int[] years, int currentYear)
-            {
-                rowCount = (years.Length + column_count - 1) / column_count;
-
-                RelativeSizeAxes = Axes.X;
-                AutoSizeAxes = Axes.Y;
-                RowDimensions = Enumerable.Range(0, rowCount).Select(_ => new Dimension(GridSizeMode.AutoSize)).ToArray();
-                Content = createContent(years, currentYear);
-            }
-
-            private Drawable[][] createContent(int[] years, int currentYear)
-            {
-                var buttons = new Drawable[rowCount][];
-
-                for (int i = 0; i < rowCount; i++)
-                {
-                    buttons[i] = new Drawable[column_count];
-
-                    for (int j = 0; j < column_count; j++)
-                    {
-                        var index = i * column_count + j;
-
-                        if (index >= years.Length)
-                        {
-                            buttons[i][j] = Empty();
-                        }
-                        else
-                        {
-                            var year = years[index];
-                            var isCurrent = year == currentYear;
-
-                            buttons[i][j] = new YearButton(year, isCurrent);
-                        }
-                    }
-                }
-
-                return buttons;
-            }
-        }
     }
 }

From c0cfbd11ddabc1c4544b3b54872e4e4c3458ce14 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 17 May 2021 11:20:31 +0300
Subject: [PATCH 3511/3722] Add tooltip and action for PostButton in
 MonthSection

---
 osu.Game/Overlays/News/Sidebar/MonthSection.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/MonthSection.cs b/osu.Game/Overlays/News/Sidebar/MonthSection.cs
index 80c408bda5..20c4d2e83e 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthSection.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthSection.cs
@@ -15,6 +15,7 @@ using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
 using System.Diagnostics;
+using osu.Framework.Platform;
 
 namespace osu.Game.Overlays.News.Sidebar
 {
@@ -99,9 +100,12 @@ namespace osu.Game.Overlays.News.Sidebar
             protected override IEnumerable<Drawable> EffectTargets => new[] { text };
 
             private readonly TextFlowContainer text;
+            private readonly APINewsPost post;
 
             public PostButton(APINewsPost post)
             {
+                this.post = post;
+
                 RelativeSizeAxes = Axes.X;
                 AutoSizeAxes = Axes.Y;
                 Child = text = new TextFlowContainer(t => t.Font = OsuFont.GetFont(size: 12))
@@ -113,11 +117,13 @@ namespace osu.Game.Overlays.News.Sidebar
             }
 
             [BackgroundDependencyLoader]
-            private void load(OverlayColourProvider colourProvider)
+            private void load(OverlayColourProvider colourProvider, GameHost host)
             {
                 IdleColour = colourProvider.Light2;
                 HoverColour = colourProvider.Light1;
-                Action = () => { }; // Avoid button being disabled since there's no proper action assigned.
+
+                TooltipText = "view in browser";
+                Action = () => host.OpenUrlExternally("https://osu.ppy.sh/home/news/" + post.Slug);
             }
         }
 

From 586c5c7365b3d0d0291447fb57b316b1e01b098e Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 17 May 2021 11:36:53 +0300
Subject: [PATCH 3512/3722] Emulate year changes in the test scene

---
 .../Visual/Online/TestSceneNewsSideBar.cs     | 47 +++++++++++++------
 osu.Game/Overlays/News/Sidebar/YearsPanel.cs  |  5 +-
 2 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
index 706de2b310..376c270689 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
@@ -10,6 +10,7 @@ using osu.Framework.Testing;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
 using osu.Game.Overlays.News.Sidebar;
+using static osu.Game.Overlays.News.Sidebar.YearsPanel;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -18,10 +19,10 @@ namespace osu.Game.Tests.Visual.Online
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
 
-        private NewsSidebar sidebar;
+        private TestNewsSidebar sidebar;
 
         [SetUp]
-        public void SetUp() => Schedule(() => Child = sidebar = new NewsSidebar());
+        public void SetUp() => Schedule(() => Child = sidebar = new TestNewsSidebar { YearChanged = onYearChanged });
 
         [Test]
         public void TestMetadataWithNoPosts()
@@ -34,15 +35,17 @@ namespace osu.Game.Tests.Visual.Online
         public void TestYearsPanelVisibility()
         {
             AddUntilStep("Years panel is hidden", () => yearsPanel?.Alpha == 0);
-            AddStep("Add data", () => sidebar.Metadata.Value = metadata);
+            AddStep("Add data", () => sidebar.Metadata.Value = getMetadata(2021));
             AddUntilStep("Years panel is visible", () => yearsPanel?.Alpha == 1);
         }
 
+        private void onYearChanged(int year) => sidebar.Metadata.Value = getMetadata(year);
+
         private YearsPanel yearsPanel => sidebar.ChildrenOfType<YearsPanel>().FirstOrDefault();
 
-        private static readonly APINewsSidebar metadata = new APINewsSidebar
+        private APINewsSidebar getMetadata(int year) => new APINewsSidebar
         {
-            CurrentYear = 2021,
+            CurrentYear = year,
             Years = new[]
             {
                 2021,
@@ -60,47 +63,47 @@ namespace osu.Game.Tests.Visual.Online
                 new APINewsPost
                 {
                     Title = "(Mar) Short title",
-                    PublishedAt = new DateTime(2021, 3, 1)
+                    PublishedAt = new DateTime(year, 3, 1)
                 },
                 new APINewsPost
                 {
                     Title = "(Mar) Oh boy that's a long post title I wonder if it will break anything",
-                    PublishedAt = new DateTime(2021, 3, 1)
+                    PublishedAt = new DateTime(year, 3, 1)
                 },
                 new APINewsPost
                 {
                     Title = "(Mar) Medium title, nothing to see here",
-                    PublishedAt = new DateTime(2021, 3, 1)
+                    PublishedAt = new DateTime(year, 3, 1)
                 },
                 new APINewsPost
                 {
                     Title = "(Feb) Short title",
-                    PublishedAt = new DateTime(2021, 2, 1)
+                    PublishedAt = new DateTime(year, 2, 1)
                 },
                 new APINewsPost
                 {
                     Title = "(Feb) Oh boy that's a long post title I wonder if it will break anything",
-                    PublishedAt = new DateTime(2021, 2, 1)
+                    PublishedAt = new DateTime(year, 2, 1)
                 },
                 new APINewsPost
                 {
                     Title = "(Feb) Medium title, nothing to see here",
-                    PublishedAt = new DateTime(2021, 2, 1)
+                    PublishedAt = new DateTime(year, 2, 1)
                 },
                 new APINewsPost
                 {
                     Title = "Short title",
-                    PublishedAt = new DateTime(2021, 1, 1)
+                    PublishedAt = new DateTime(year, 1, 1)
                 },
                 new APINewsPost
                 {
                     Title = "Oh boy that's a long post title I wonder if it will break anything",
-                    PublishedAt = new DateTime(2021, 1, 1)
+                    PublishedAt = new DateTime(year, 1, 1)
                 },
                 new APINewsPost
                 {
                     Title = "Medium title, nothing to see here",
-                    PublishedAt = new DateTime(2021, 1, 1)
+                    PublishedAt = new DateTime(year, 1, 1)
                 }
             }
         };
@@ -123,5 +126,21 @@ namespace osu.Game.Tests.Visual.Online
             },
             NewsPosts = Array.Empty<APINewsPost>()
         };
+
+        private class TestNewsSidebar : NewsSidebar
+        {
+            public Action<int> YearChanged;
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                Metadata.BindValueChanged(m =>
+                {
+                    foreach (var b in this.ChildrenOfType<YearButton>())
+                        b.Action = () => YearChanged?.Invoke(b.Year);
+                }, true);
+            }
+        }
     }
 }
diff --git a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
index 331a7e10e1..ffdb5cf22e 100644
--- a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
@@ -75,12 +75,15 @@ namespace osu.Game.Overlays.News.Sidebar
             }, true);
         }
 
-        private class YearButton : OsuHoverContainer
+        public class YearButton : OsuHoverContainer
         {
+            public int Year { get; }
+
             private readonly bool isCurrent;
 
             public YearButton(int year, bool isCurrent)
             {
+                Year = year;
                 this.isCurrent = isCurrent;
 
                 RelativeSizeAxes = Axes.X;

From 01090de1fd45bfd0d1a1c1b743847d089b521e93 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 17 May 2021 11:55:55 +0300
Subject: [PATCH 3513/3722] Fix filenames does not match contained type

---
 .../Visual/Online/TestSceneNewsSidebar.cs     | 146 ++++++++++++++++++
 osu.Game/Overlays/News/Sidebar/NewsSidebar.cs | 103 ++++++++++++
 2 files changed, 249 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Online/TestSceneNewsSidebar.cs
 create mode 100644 osu.Game/Overlays/News/Sidebar/NewsSidebar.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsSidebar.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsSidebar.cs
new file mode 100644
index 0000000000..376c270689
--- /dev/null
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsSidebar.cs
@@ -0,0 +1,146 @@
+// Copyright (c) ppy 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.Allocation;
+using osu.Framework.Testing;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Overlays;
+using osu.Game.Overlays.News.Sidebar;
+using static osu.Game.Overlays.News.Sidebar.YearsPanel;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public class TestSceneNewsSidebar : OsuTestScene
+    {
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
+
+        private TestNewsSidebar sidebar;
+
+        [SetUp]
+        public void SetUp() => Schedule(() => Child = sidebar = new TestNewsSidebar { YearChanged = onYearChanged });
+
+        [Test]
+        public void TestMetadataWithNoPosts()
+        {
+            AddStep("Add data with no posts", () => sidebar.Metadata.Value = metadata_with_no_posts);
+            AddUntilStep("No dropdowns were created", () => !sidebar.ChildrenOfType<MonthSection>().Any());
+        }
+
+        [Test]
+        public void TestYearsPanelVisibility()
+        {
+            AddUntilStep("Years panel is hidden", () => yearsPanel?.Alpha == 0);
+            AddStep("Add data", () => sidebar.Metadata.Value = getMetadata(2021));
+            AddUntilStep("Years panel is visible", () => yearsPanel?.Alpha == 1);
+        }
+
+        private void onYearChanged(int year) => sidebar.Metadata.Value = getMetadata(year);
+
+        private YearsPanel yearsPanel => sidebar.ChildrenOfType<YearsPanel>().FirstOrDefault();
+
+        private APINewsSidebar getMetadata(int year) => new APINewsSidebar
+        {
+            CurrentYear = year,
+            Years = new[]
+            {
+                2021,
+                2020,
+                2019,
+                2018,
+                2017,
+                2016,
+                2015,
+                2014,
+                2013
+            },
+            NewsPosts = new List<APINewsPost>
+            {
+                new APINewsPost
+                {
+                    Title = "(Mar) Short title",
+                    PublishedAt = new DateTime(year, 3, 1)
+                },
+                new APINewsPost
+                {
+                    Title = "(Mar) Oh boy that's a long post title I wonder if it will break anything",
+                    PublishedAt = new DateTime(year, 3, 1)
+                },
+                new APINewsPost
+                {
+                    Title = "(Mar) Medium title, nothing to see here",
+                    PublishedAt = new DateTime(year, 3, 1)
+                },
+                new APINewsPost
+                {
+                    Title = "(Feb) Short title",
+                    PublishedAt = new DateTime(year, 2, 1)
+                },
+                new APINewsPost
+                {
+                    Title = "(Feb) Oh boy that's a long post title I wonder if it will break anything",
+                    PublishedAt = new DateTime(year, 2, 1)
+                },
+                new APINewsPost
+                {
+                    Title = "(Feb) Medium title, nothing to see here",
+                    PublishedAt = new DateTime(year, 2, 1)
+                },
+                new APINewsPost
+                {
+                    Title = "Short title",
+                    PublishedAt = new DateTime(year, 1, 1)
+                },
+                new APINewsPost
+                {
+                    Title = "Oh boy that's a long post title I wonder if it will break anything",
+                    PublishedAt = new DateTime(year, 1, 1)
+                },
+                new APINewsPost
+                {
+                    Title = "Medium title, nothing to see here",
+                    PublishedAt = new DateTime(year, 1, 1)
+                }
+            }
+        };
+
+        private static readonly APINewsSidebar metadata_with_no_posts = new APINewsSidebar
+        {
+            CurrentYear = 2022,
+            Years = new[]
+            {
+                2022,
+                2021,
+                2020,
+                2019,
+                2018,
+                2017,
+                2016,
+                2015,
+                2014,
+                2013
+            },
+            NewsPosts = Array.Empty<APINewsPost>()
+        };
+
+        private class TestNewsSidebar : NewsSidebar
+        {
+            public Action<int> YearChanged;
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                Metadata.BindValueChanged(m =>
+                {
+                    foreach (var b in this.ChildrenOfType<YearButton>())
+                        b.Action = () => YearChanged?.Invoke(b.Year);
+                }, true);
+            }
+        }
+    }
+}
diff --git a/osu.Game/Overlays/News/Sidebar/NewsSidebar.cs b/osu.Game/Overlays/News/Sidebar/NewsSidebar.cs
new file mode 100644
index 0000000000..b8d283b7e2
--- /dev/null
+++ b/osu.Game/Overlays/News/Sidebar/NewsSidebar.cs
@@ -0,0 +1,103 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Framework.Graphics.Shapes;
+using osuTK;
+using System.Linq;
+
+namespace osu.Game.Overlays.News.Sidebar
+{
+    public class NewsSidebar : CompositeDrawable
+    {
+        [Cached]
+        public readonly Bindable<APINewsSidebar> Metadata = new Bindable<APINewsSidebar>();
+
+        private FillFlowContainer<MonthSection> monthsFlow;
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            RelativeSizeAxes = Axes.Y;
+            Width = 250;
+            InternalChildren = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = colourProvider.Background4
+                },
+                new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Padding = new MarginPadding
+                    {
+                        Vertical = 20,
+                        Left = 50,
+                        Right = 30
+                    },
+                    Child = new FillFlowContainer
+                    {
+                        Direction = FillDirection.Vertical,
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Spacing = new Vector2(0, 20),
+                        Children = new Drawable[]
+                        {
+                            new YearsPanel(),
+                            monthsFlow = new FillFlowContainer<MonthSection>
+                            {
+                                AutoSizeAxes = Axes.Y,
+                                RelativeSizeAxes = Axes.X,
+                                Direction = FillDirection.Vertical,
+                                Spacing = new Vector2(0, 10)
+                            }
+                        }
+                    }
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Metadata.BindValueChanged(onMetadataChanged, true);
+        }
+
+        private void onMetadataChanged(ValueChangedEvent<APINewsSidebar> metadata)
+        {
+            monthsFlow.Clear();
+
+            if (metadata.NewValue == null)
+                return;
+
+            var allPosts = metadata.NewValue.NewsPosts;
+
+            if (allPosts?.Any() != true)
+                return;
+
+            var lookup = metadata.NewValue.NewsPosts.ToLookup(post => post.PublishedAt.Month);
+
+            var keys = lookup.Select(kvp => kvp.Key);
+            var sortedKeys = keys.OrderByDescending(k => k).ToList();
+
+            var year = metadata.NewValue.CurrentYear;
+
+            for (int i = 0; i < sortedKeys.Count; i++)
+            {
+                var month = sortedKeys[i];
+                var posts = lookup[month];
+
+                monthsFlow.Add(new MonthSection(month, year, posts)
+                {
+                    IsOpen = { Value = i == 0 }
+                });
+            }
+        }
+    }
+}

From fc6e65b7dbaf9826f3a8a2832fade1a8521fb645 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 17 May 2021 12:02:06 +0300
Subject: [PATCH 3514/3722] Delete TestSceneNewsSideBar.cs

---
 .../Visual/Online/TestSceneNewsSideBar.cs     | 146 ------------------
 1 file changed, 146 deletions(-)
 delete mode 100644 osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
deleted file mode 100644
index 376c270689..0000000000
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsSideBar.cs
+++ /dev/null
@@ -1,146 +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.Linq;
-using NUnit.Framework;
-using osu.Framework.Allocation;
-using osu.Framework.Testing;
-using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Overlays;
-using osu.Game.Overlays.News.Sidebar;
-using static osu.Game.Overlays.News.Sidebar.YearsPanel;
-
-namespace osu.Game.Tests.Visual.Online
-{
-    public class TestSceneNewsSidebar : OsuTestScene
-    {
-        [Cached]
-        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
-
-        private TestNewsSidebar sidebar;
-
-        [SetUp]
-        public void SetUp() => Schedule(() => Child = sidebar = new TestNewsSidebar { YearChanged = onYearChanged });
-
-        [Test]
-        public void TestMetadataWithNoPosts()
-        {
-            AddStep("Add data with no posts", () => sidebar.Metadata.Value = metadata_with_no_posts);
-            AddUntilStep("No dropdowns were created", () => !sidebar.ChildrenOfType<MonthSection>().Any());
-        }
-
-        [Test]
-        public void TestYearsPanelVisibility()
-        {
-            AddUntilStep("Years panel is hidden", () => yearsPanel?.Alpha == 0);
-            AddStep("Add data", () => sidebar.Metadata.Value = getMetadata(2021));
-            AddUntilStep("Years panel is visible", () => yearsPanel?.Alpha == 1);
-        }
-
-        private void onYearChanged(int year) => sidebar.Metadata.Value = getMetadata(year);
-
-        private YearsPanel yearsPanel => sidebar.ChildrenOfType<YearsPanel>().FirstOrDefault();
-
-        private APINewsSidebar getMetadata(int year) => new APINewsSidebar
-        {
-            CurrentYear = year,
-            Years = new[]
-            {
-                2021,
-                2020,
-                2019,
-                2018,
-                2017,
-                2016,
-                2015,
-                2014,
-                2013
-            },
-            NewsPosts = new List<APINewsPost>
-            {
-                new APINewsPost
-                {
-                    Title = "(Mar) Short title",
-                    PublishedAt = new DateTime(year, 3, 1)
-                },
-                new APINewsPost
-                {
-                    Title = "(Mar) Oh boy that's a long post title I wonder if it will break anything",
-                    PublishedAt = new DateTime(year, 3, 1)
-                },
-                new APINewsPost
-                {
-                    Title = "(Mar) Medium title, nothing to see here",
-                    PublishedAt = new DateTime(year, 3, 1)
-                },
-                new APINewsPost
-                {
-                    Title = "(Feb) Short title",
-                    PublishedAt = new DateTime(year, 2, 1)
-                },
-                new APINewsPost
-                {
-                    Title = "(Feb) Oh boy that's a long post title I wonder if it will break anything",
-                    PublishedAt = new DateTime(year, 2, 1)
-                },
-                new APINewsPost
-                {
-                    Title = "(Feb) Medium title, nothing to see here",
-                    PublishedAt = new DateTime(year, 2, 1)
-                },
-                new APINewsPost
-                {
-                    Title = "Short title",
-                    PublishedAt = new DateTime(year, 1, 1)
-                },
-                new APINewsPost
-                {
-                    Title = "Oh boy that's a long post title I wonder if it will break anything",
-                    PublishedAt = new DateTime(year, 1, 1)
-                },
-                new APINewsPost
-                {
-                    Title = "Medium title, nothing to see here",
-                    PublishedAt = new DateTime(year, 1, 1)
-                }
-            }
-        };
-
-        private static readonly APINewsSidebar metadata_with_no_posts = new APINewsSidebar
-        {
-            CurrentYear = 2022,
-            Years = new[]
-            {
-                2022,
-                2021,
-                2020,
-                2019,
-                2018,
-                2017,
-                2016,
-                2015,
-                2014,
-                2013
-            },
-            NewsPosts = Array.Empty<APINewsPost>()
-        };
-
-        private class TestNewsSidebar : NewsSidebar
-        {
-            public Action<int> YearChanged;
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-
-                Metadata.BindValueChanged(m =>
-                {
-                    foreach (var b in this.ChildrenOfType<YearButton>())
-                        b.Action = () => YearChanged?.Invoke(b.Year);
-                }, true);
-            }
-        }
-    }
-}

From 555e3e2db30ac722b57a893799e7b8e63ab54550 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 17 May 2021 12:02:33 +0300
Subject: [PATCH 3515/3722] Delete NewsSideBar.cs

---
 osu.Game/Overlays/News/Sidebar/NewsSideBar.cs | 103 ------------------
 1 file changed, 103 deletions(-)
 delete mode 100644 osu.Game/Overlays/News/Sidebar/NewsSideBar.cs

diff --git a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs b/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
deleted file mode 100644
index b8d283b7e2..0000000000
--- a/osu.Game/Overlays/News/Sidebar/NewsSideBar.cs
+++ /dev/null
@@ -1,103 +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.Graphics.Containers;
-using osu.Framework.Graphics;
-using osu.Game.Online.API.Requests.Responses;
-using osu.Framework.Graphics.Shapes;
-using osuTK;
-using System.Linq;
-
-namespace osu.Game.Overlays.News.Sidebar
-{
-    public class NewsSidebar : CompositeDrawable
-    {
-        [Cached]
-        public readonly Bindable<APINewsSidebar> Metadata = new Bindable<APINewsSidebar>();
-
-        private FillFlowContainer<MonthSection> monthsFlow;
-
-        [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
-        {
-            RelativeSizeAxes = Axes.Y;
-            Width = 250;
-            InternalChildren = new Drawable[]
-            {
-                new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = colourProvider.Background4
-                },
-                new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding
-                    {
-                        Vertical = 20,
-                        Left = 50,
-                        Right = 30
-                    },
-                    Child = new FillFlowContainer
-                    {
-                        Direction = FillDirection.Vertical,
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Spacing = new Vector2(0, 20),
-                        Children = new Drawable[]
-                        {
-                            new YearsPanel(),
-                            monthsFlow = new FillFlowContainer<MonthSection>
-                            {
-                                AutoSizeAxes = Axes.Y,
-                                RelativeSizeAxes = Axes.X,
-                                Direction = FillDirection.Vertical,
-                                Spacing = new Vector2(0, 10)
-                            }
-                        }
-                    }
-                }
-            };
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            Metadata.BindValueChanged(onMetadataChanged, true);
-        }
-
-        private void onMetadataChanged(ValueChangedEvent<APINewsSidebar> metadata)
-        {
-            monthsFlow.Clear();
-
-            if (metadata.NewValue == null)
-                return;
-
-            var allPosts = metadata.NewValue.NewsPosts;
-
-            if (allPosts?.Any() != true)
-                return;
-
-            var lookup = metadata.NewValue.NewsPosts.ToLookup(post => post.PublishedAt.Month);
-
-            var keys = lookup.Select(kvp => kvp.Key);
-            var sortedKeys = keys.OrderByDescending(k => k).ToList();
-
-            var year = metadata.NewValue.CurrentYear;
-
-            for (int i = 0; i < sortedKeys.Count; i++)
-            {
-                var month = sortedKeys[i];
-                var posts = lookup[month];
-
-                monthsFlow.Add(new MonthSection(month, year, posts)
-                {
-                    IsOpen = { Value = i == 0 }
-                });
-            }
-        }
-    }
-}

From 0989aa336442e0bb15f8728ed517625320297d7a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 17 May 2021 18:07:50 +0900
Subject: [PATCH 3516/3722] Fix accuracy heatmap points changing colour

---
 osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
index 88c855d768..cb769c31b8 100644
--- a/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
+++ b/osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
@@ -166,7 +166,7 @@ namespace osu.Game.Rulesets.Osu.Statistics
 
                     var point = new HitPoint(pointType, this)
                     {
-                        Colour = pointType == HitPointType.Hit ? new Color4(102, 255, 204, 255) : new Color4(255, 102, 102, 255)
+                        BaseColour = pointType == HitPointType.Hit ? new Color4(102, 255, 204, 255) : new Color4(255, 102, 102, 255)
                     };
 
                     points[r][c] = point;
@@ -234,6 +234,11 @@ namespace osu.Game.Rulesets.Osu.Statistics
 
         private class HitPoint : Circle
         {
+            /// <summary>
+            /// The base colour which will be lightened/darkened depending on the value of this <see cref="HitPoint"/>.
+            /// </summary>
+            public Color4 BaseColour;
+
             private readonly HitPointType pointType;
             private readonly AccuracyHeatmap heatmap;
 
@@ -284,7 +289,7 @@ namespace osu.Game.Rulesets.Osu.Statistics
 
                 Alpha = Math.Min(amount / lighten_cutoff, 1);
                 if (pointType == HitPointType.Hit)
-                    Colour = ((Color4)Colour).Lighten(Math.Max(0, amount - lighten_cutoff));
+                    Colour = BaseColour.Lighten(Math.Max(0, amount - lighten_cutoff));
             }
         }
 

From 0d7a349500bfa123cf449b66b4b08f46b8a8963b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 17 May 2021 18:16:09 +0900
Subject: [PATCH 3517/3722] Exclude interfaces from skinnable types

---
 osu.Game/Skinning/Editor/SkinComponentToolbox.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
index 59420bfc87..4097624400 100644
--- a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
+++ b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
@@ -57,7 +57,10 @@ namespace osu.Game.Skinning.Editor
                 Spacing = new Vector2(20)
             };
 
-            var skinnableTypes = typeof(OsuGame).Assembly.GetTypes().Where(t => typeof(ISkinnableDrawable).IsAssignableFrom(t)).ToArray();
+            var skinnableTypes = typeof(OsuGame).Assembly.GetTypes()
+                                                .Where(t => !t.IsInterface)
+                                                .Where(t => typeof(ISkinnableDrawable).IsAssignableFrom(t))
+                                                .ToArray();
 
             foreach (var type in skinnableTypes)
             {

From 1f3ae901ce979247c717245dc204da822a9c431f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 May 2021 18:22:24 +0900
Subject: [PATCH 3518/3722] Expose `DrawableRuleset` for consupmtion by HUD
 components

---
 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 ac0c921ccf..7d3afe3043 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -198,6 +198,7 @@ namespace osu.Game.Screens.Play
                 LocalUserPlaying.BindTo(osuGame.LocalUserPlaying);
 
             DrawableRuleset = ruleset.CreateDrawableRulesetWith(playableBeatmap, Mods.Value);
+            dependencies.CacheAs(DrawableRuleset);
 
             ScoreProcessor = ruleset.CreateScoreProcessor();
             ScoreProcessor.ApplyBeatmap(playableBeatmap);

From da0913ca2d6771049c6fc8118f82dad5d36e7142 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 May 2021 18:26:15 +0900
Subject: [PATCH 3519/3722] Make `SongProgress` a skinnable component

---
 .../Visual/Gameplay/TestSceneAutoplay.cs      |  2 +-
 osu.Game/Screens/Play/Player.cs               |  5 ---
 osu.Game/Screens/Play/SongProgress.cs         | 42 ++++++++++++-------
 osu.Game/Skinning/DefaultSkin.cs              |  5 +++
 osu.Game/Skinning/HUDSkinComponents.cs        |  1 +
 osu.Game/Skinning/LegacySkin.cs               |  2 +
 6 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
index e198a8504b..e47c782bca 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private void seekToBreak(int breakIndex)
         {
             AddStep($"seek to break {breakIndex}", () => Player.GameplayClockContainer.Seek(destBreak().StartTime));
-            AddUntilStep("wait for seek to complete", () => Player.HUDOverlay.Progress.ReferenceClock.CurrentTime >= destBreak().StartTime);
+            AddUntilStep("wait for seek to complete", () => Player.DrawableRuleset.FrameStableClock.CurrentTime >= destBreak().StartTime);
 
             BreakPeriod destBreak() => Beatmap.Value.Beatmap.Breaks.ElementAt(breakIndex);
         }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 7d3afe3043..186e73ee4c 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -358,11 +358,6 @@ namespace osu.Game.Screens.Play
                             AlwaysVisible = { BindTarget = DrawableRuleset.HasReplayLoaded },
                             IsCounting = false
                         },
-                        RequestSeek = time =>
-                        {
-                            GameplayClockContainer.Seek(time);
-                            GameplayClockContainer.Start();
-                        },
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre
                     },
diff --git a/osu.Game/Screens/Play/SongProgress.cs b/osu.Game/Screens/Play/SongProgress.cs
index 4a0787bfae..dc349ddcc6 100644
--- a/osu.Game/Screens/Play/SongProgress.cs
+++ b/osu.Game/Screens/Play/SongProgress.cs
@@ -14,10 +14,11 @@ using osu.Framework.Timing;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.UI;
+using osu.Game.Skinning;
 
 namespace osu.Game.Screens.Play
 {
-    public class SongProgress : OverlayContainer
+    public class SongProgress : OverlayContainer, ISkinnableDrawable
     {
         private const int info_height = 20;
         private const int bottom_bar_height = 5;
@@ -39,9 +40,6 @@ namespace osu.Game.Screens.Play
 
         public readonly Bindable<bool> ShowGraph = new Bindable<bool>();
 
-        //TODO: this isn't always correct (consider mania where a non-last object may last for longer than the last in the list).
-        private double lastHitTime => objects.Last().GetEndTime() + 1;
-
         public override bool HandleNonPositionalInput => AllowSeeking.Value;
         public override bool HandlePositionalInput => AllowSeeking.Value;
 
@@ -49,6 +47,9 @@ namespace osu.Game.Screens.Play
 
         private double firstHitTime => objects.First().StartTime;
 
+        //TODO: this isn't always correct (consider mania where a non-last object may last for longer than the last in the list).
+        private double lastHitTime => objects.Last().GetEndTime() + 1;
+
         private IEnumerable<HitObject> objects;
 
         public IEnumerable<HitObject> Objects
@@ -67,10 +68,12 @@ namespace osu.Game.Screens.Play
 
         public IClock ReferenceClock;
 
-        private IClock gameplayClock;
-
         public SongProgress()
         {
+            RelativeSizeAxes = Axes.X;
+            Anchor = Anchor.BottomRight;
+            Origin = Anchor.BottomRight;
+
             Children = new Drawable[]
             {
                 new SongProgressDisplay
@@ -96,20 +99,34 @@ namespace osu.Game.Screens.Play
                         {
                             Anchor = Anchor.BottomLeft,
                             Origin = Anchor.BottomLeft,
-                            OnSeek = time => RequestSeek?.Invoke(time),
+                            OnSeek = seek,
                         },
                     }
                 },
             };
         }
 
+        private void seek(double time)
+        {
+            if (gameplayClock == null)
+                return;
+
+            // TODO: implement
+        }
+
+        [Resolved(canBeNull: true)]
+        private GameplayClock gameplayClock { get; set; }
+
         [BackgroundDependencyLoader(true)]
-        private void load(OsuColour colours, GameplayClock clock, OsuConfigManager config)
+        private void load(OsuColour colours, OsuConfigManager config, DrawableRuleset drawableRuleset)
         {
             base.LoadComplete();
 
-            if (clock != null)
-                gameplayClock = clock;
+            if (drawableRuleset != null)
+            {
+                AllowSeeking.BindTo(drawableRuleset.HasReplayLoaded);
+                Objects = drawableRuleset.Objects;
+            }
 
             config.BindWith(OsuSetting.ShowProgressGraph, ShowGraph);
 
@@ -124,11 +141,6 @@ namespace osu.Game.Screens.Play
             ShowGraph.BindValueChanged(_ => updateGraphVisibility(), true);
         }
 
-        public void BindDrawableRuleset(DrawableRuleset drawableRuleset)
-        {
-            AllowSeeking.BindTo(drawableRuleset.HasReplayLoaded);
-        }
-
         protected override void PopIn()
         {
             this.FadeIn(500, Easing.OutQuint);
diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index 9b4e32531a..d13ddcf22b 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -12,6 +12,7 @@ using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
 using osu.Game.Extensions;
 using osu.Game.IO;
+using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD;
 using osuTK;
 using osuTK.Graphics;
@@ -86,6 +87,7 @@ namespace osu.Game.Skinning
                                     GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreCounter)),
                                     GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.AccuracyCounter)),
                                     GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.HealthDisplay)),
+                                    GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.SongProgress)),
                                 }
                             };
 
@@ -109,6 +111,9 @@ namespace osu.Game.Skinning
 
                         case HUDSkinComponents.HealthDisplay:
                             return new DefaultHealthDisplay();
+
+                        case HUDSkinComponents.SongProgress:
+                            return new SongProgress();
                     }
 
                     break;
diff --git a/osu.Game/Skinning/HUDSkinComponents.cs b/osu.Game/Skinning/HUDSkinComponents.cs
index a345e060e5..2e6c3a9937 100644
--- a/osu.Game/Skinning/HUDSkinComponents.cs
+++ b/osu.Game/Skinning/HUDSkinComponents.cs
@@ -9,5 +9,6 @@ namespace osu.Game.Skinning
         ScoreCounter,
         AccuracyCounter,
         HealthDisplay,
+        SongProgress,
     }
 }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index a6f8f45c0f..6c8d6ee45a 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -17,6 +17,7 @@ using osu.Game.Audio;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.IO;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD;
 using osuTK.Graphics;
 
@@ -350,6 +351,7 @@ namespace osu.Game.Skinning
                                     GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.ScoreCounter)) ?? new DefaultScoreCounter(),
                                     GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.AccuracyCounter)) ?? new DefaultAccuracyCounter(),
                                     GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.HealthDisplay)) ?? new DefaultHealthDisplay(),
+                                    GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.SongProgress)) ?? new SongProgress(),
                                 }
                             };
 

From 0c433cda861a09d3a7e6ebaeb7fa4a15645cd48a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 May 2021 18:26:30 +0900
Subject: [PATCH 3520/3722] Update `HUDOverlay` logic to add automatic layout
 for bottom-aligned components

---
 osu.Game/Screens/Play/HUDOverlay.cs | 103 ++++++++++++----------------
 1 file changed, 43 insertions(+), 60 deletions(-)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index a10e91dae8..dcee64ff0d 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -35,8 +35,12 @@ namespace osu.Game.Screens.Play
         /// </summary>
         public float TopScoringElementsHeight { get; private set; }
 
+        /// <summary>
+        /// The total height of all the bottom of screen scoring elements.
+        /// </summary>
+        public float BottomScoringElementsHeight { get; private set; }
+
         public readonly KeyCounterDisplay KeyCounter;
-        public readonly SongProgress Progress;
         public readonly ModDisplay ModDisplay;
         public readonly HoldForMenuButton HoldToQuit;
         public readonly PlayerSettingsOverlay PlayerSettingsOverlay;
@@ -59,8 +63,6 @@ namespace osu.Game.Screens.Play
 
         private static bool hasShownNotificationOnce;
 
-        public Action<double> RequestSeek;
-
         private readonly FillFlowContainer bottomRightElements;
         private readonly FillFlowContainer topRightElements;
 
@@ -85,45 +87,22 @@ namespace osu.Game.Screens.Play
                 visibilityContainer = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Child = new GridContainer
+                    Children = new Drawable[]
                     {
-                        RelativeSizeAxes = Axes.Both,
-                        Content = new[]
+                        mainComponents = new SkinnableTargetContainer(SkinnableTarget.MainHUDComponents)
                         {
-                            new Drawable[]
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Children = new Drawable[]
                             {
-                                new Container
-                                {
-                                    RelativeSizeAxes = Axes.Both,
-                                    Children = new Drawable[]
-                                    {
-                                        mainComponents = new SkinnableTargetContainer(SkinnableTarget.MainHUDComponents)
-                                        {
-                                            RelativeSizeAxes = Axes.Both,
-                                        },
-                                        new Container
-                                        {
-                                            RelativeSizeAxes = Axes.Both,
-                                            Children = new Drawable[]
-                                            {
-                                                // still need to be migrated; a bit more involved.
-                                                new HitErrorDisplay(this.drawableRuleset?.FirstAvailableHitWindows),
-                                            }
-                                        },
-                                    }
-                                },
-                            },
-                            new Drawable[]
-                            {
-                                Progress = CreateProgress(),
+                                // still need to be migrated; a bit more involved.
+                                new HitErrorDisplay(this.drawableRuleset?.FirstAvailableHitWindows),
                             }
                         },
-                        RowDimensions = new[]
-                        {
-                            new Dimension(),
-                            new Dimension(GridSizeMode.AutoSize)
-                        }
-                    },
+                    }
                 },
                 topRightElements = new FillFlowContainer
                 {
@@ -164,10 +143,6 @@ namespace osu.Game.Screens.Play
             if (drawableRuleset != null)
             {
                 BindDrawableRuleset(drawableRuleset);
-
-                Progress.Objects = drawableRuleset.Objects;
-                Progress.RequestSeek = time => RequestSeek(time);
-                Progress.ReferenceClock = drawableRuleset.FrameStableClock;
             }
 
             ModDisplay.Current.Value = mods;
@@ -206,26 +181,43 @@ namespace osu.Game.Screens.Play
         {
             base.Update();
 
-            Vector2 lowestScreenSpace = Vector2.Zero;
+            Vector2? lowestTopScreenSpace = null;
+            Vector2? highestBottomScreenSpace = null;
 
             // LINQ cast can be removed when IDrawable interface includes Anchor / RelativeSizeAxes.
             foreach (var element in mainComponents.Components.Cast<Drawable>())
             {
                 // for now align top-right components with the bottom-edge of the lowest top-anchored hud element.
-                if (!element.Anchor.HasFlagFast(Anchor.TopRight) && !element.RelativeSizeAxes.HasFlagFast(Axes.X))
+                if (!element.RelativeSizeAxes.HasFlagFast(Axes.X))
                     continue;
 
-                // health bars are excluded for the sake of hacky legacy skins which extend the health bar to take up the full screen area.
-                if (element is LegacyHealthDisplay)
-                    continue;
+                if (element.Anchor.HasFlagFast(Anchor.TopRight))
+                {
+                    // health bars are excluded for the sake of hacky legacy skins which extend the health bar to take up the full screen area.
+                    if (element is LegacyHealthDisplay)
+                        continue;
 
-                var bottomRight = element.ScreenSpaceDrawQuad.BottomRight;
-                if (bottomRight.Y > lowestScreenSpace.Y)
-                    lowestScreenSpace = bottomRight;
+                    var bottomRight = element.ScreenSpaceDrawQuad.BottomRight;
+                    if (lowestTopScreenSpace == null || bottomRight.Y > lowestTopScreenSpace.Value.Y)
+                        lowestTopScreenSpace = bottomRight;
+                }
+                else if (element.Anchor.HasFlagFast(Anchor.y2))
+                {
+                    var topLeft = element.ScreenSpaceDrawQuad.TopLeft;
+                    if (highestBottomScreenSpace == null || topLeft.Y < highestBottomScreenSpace.Value.Y)
+                        highestBottomScreenSpace = topLeft;
+                }
             }
 
-            topRightElements.Y = TopScoringElementsHeight = ToLocalSpace(lowestScreenSpace).Y;
-            bottomRightElements.Y = -Progress.Height;
+            if (lowestTopScreenSpace.HasValue)
+                topRightElements.Y = TopScoringElementsHeight = ToLocalSpace(lowestTopScreenSpace.Value).Y;
+            else
+                topRightElements.Y = 0;
+
+            if (highestBottomScreenSpace.HasValue)
+                bottomRightElements.Y = BottomScoringElementsHeight = -(DrawHeight - ToLocalSpace(highestBottomScreenSpace.Value).Y);
+            else
+                bottomRightElements.Y = 0;
         }
 
         private void updateVisibility()
@@ -281,8 +273,6 @@ namespace osu.Game.Screens.Play
             (drawableRuleset as ICanAttachKeyCounter)?.Attach(KeyCounter);
 
             replayLoaded.BindTo(drawableRuleset.HasReplayLoaded);
-
-            Progress.BindDrawableRuleset(drawableRuleset);
         }
 
         protected FailingLayer CreateFailingLayer() => new FailingLayer
@@ -296,13 +286,6 @@ namespace osu.Game.Screens.Play
             Origin = Anchor.BottomRight,
         };
 
-        protected SongProgress CreateProgress() => new SongProgress
-        {
-            Anchor = Anchor.BottomLeft,
-            Origin = Anchor.BottomLeft,
-            RelativeSizeAxes = Axes.X,
-        };
-
         protected HoldForMenuButton CreateHoldForMenuButton() => new HoldForMenuButton
         {
             Anchor = Anchor.BottomRight,

From b80768b44afc84f0d4487afdbe308c62f5ccc3a8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 May 2021 18:41:56 +0900
Subject: [PATCH 3521/3722] Hook up seeking flow

---
 osu.Game/Screens/Play/Player.cs       |  6 ++++++
 osu.Game/Screens/Play/SongProgress.cs | 25 +++++++++++--------------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 186e73ee4c..d5807f6e18 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -562,6 +562,12 @@ namespace osu.Game.Screens.Play
             updateSampleDisabledState();
         }
 
+        /// <summary>
+        /// Seek to a specific time in gameplay.
+        /// </summary>
+        /// <param name="time">The destination time to seek to.</param>
+        public void Seek(double time) => GameplayClockContainer.Seek(time);
+
         /// <summary>
         /// Restart gameplay via a parent <see cref="PlayerLoader"/>.
         /// <remarks>This can be called from a child screen in order to trigger the restart process.</remarks>
diff --git a/osu.Game/Screens/Play/SongProgress.cs b/osu.Game/Screens/Play/SongProgress.cs
index dc349ddcc6..f95e6520cc 100644
--- a/osu.Game/Screens/Play/SongProgress.cs
+++ b/osu.Game/Screens/Play/SongProgress.cs
@@ -66,7 +66,13 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        public IClock ReferenceClock;
+        [Resolved(canBeNull: true)]
+        private Player player { get; set; }
+
+        [Resolved(canBeNull: true)]
+        private GameplayClock gameplayClock { get; set; }
+
+        private IClock referenceClock;
 
         public SongProgress()
         {
@@ -99,24 +105,13 @@ namespace osu.Game.Screens.Play
                         {
                             Anchor = Anchor.BottomLeft,
                             Origin = Anchor.BottomLeft,
-                            OnSeek = seek,
+                            OnSeek = time => player?.Seek(time),
                         },
                     }
                 },
             };
         }
 
-        private void seek(double time)
-        {
-            if (gameplayClock == null)
-                return;
-
-            // TODO: implement
-        }
-
-        [Resolved(canBeNull: true)]
-        private GameplayClock gameplayClock { get; set; }
-
         [BackgroundDependencyLoader(true)]
         private void load(OsuColour colours, OsuConfigManager config, DrawableRuleset drawableRuleset)
         {
@@ -125,6 +120,8 @@ namespace osu.Game.Screens.Play
             if (drawableRuleset != null)
             {
                 AllowSeeking.BindTo(drawableRuleset.HasReplayLoaded);
+
+                referenceClock = drawableRuleset.FrameStableClock;
                 Objects = drawableRuleset.Objects;
             }
 
@@ -159,7 +156,7 @@ namespace osu.Game.Screens.Play
                 return;
 
             double gameplayTime = gameplayClock?.CurrentTime ?? Time.Current;
-            double frameStableTime = ReferenceClock?.CurrentTime ?? gameplayTime;
+            double frameStableTime = referenceClock?.CurrentTime ?? gameplayTime;
 
             double progress = Math.Min(1, (frameStableTime - firstHitTime) / (lastHitTime - firstHitTime));
 

From ecf70c1707b300d56c16e7cc171fa2b527284ff0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 May 2021 18:55:18 +0900
Subject: [PATCH 3522/3722] Remove unnecessary container

---
 osu.Game/Screens/Play/SongProgress.cs | 58 +++++++++------------------
 1 file changed, 19 insertions(+), 39 deletions(-)

diff --git a/osu.Game/Screens/Play/SongProgress.cs b/osu.Game/Screens/Play/SongProgress.cs
index f95e6520cc..b7939b5e75 100644
--- a/osu.Game/Screens/Play/SongProgress.cs
+++ b/osu.Game/Screens/Play/SongProgress.cs
@@ -82,32 +82,26 @@ namespace osu.Game.Screens.Play
 
             Children = new Drawable[]
             {
-                new SongProgressDisplay
+                info = new SongProgressInfo
                 {
-                    Children = new Drawable[]
-                    {
-                        info = new SongProgressInfo
-                        {
-                            Origin = Anchor.BottomLeft,
-                            Anchor = Anchor.BottomLeft,
-                            RelativeSizeAxes = Axes.X,
-                            Height = info_height,
-                        },
-                        graph = new SongProgressGraph
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            Origin = Anchor.BottomLeft,
-                            Anchor = Anchor.BottomLeft,
-                            Height = graph_height,
-                            Margin = new MarginPadding { Bottom = bottom_bar_height },
-                        },
-                        bar = new SongProgressBar(bottom_bar_height, graph_height, handle_size)
-                        {
-                            Anchor = Anchor.BottomLeft,
-                            Origin = Anchor.BottomLeft,
-                            OnSeek = time => player?.Seek(time),
-                        },
-                    }
+                    Origin = Anchor.BottomLeft,
+                    Anchor = Anchor.BottomLeft,
+                    RelativeSizeAxes = Axes.X,
+                    Height = info_height,
+                },
+                graph = new SongProgressGraph
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Origin = Anchor.BottomLeft,
+                    Anchor = Anchor.BottomLeft,
+                    Height = graph_height,
+                    Margin = new MarginPadding { Bottom = bottom_bar_height },
+                },
+                bar = new SongProgressBar(bottom_bar_height, graph_height, handle_size)
+                {
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomLeft,
+                    OnSeek = time => player?.Seek(time),
                 },
             };
         }
@@ -188,19 +182,5 @@ namespace osu.Game.Screens.Play
             float finalMargin = bottom_bar_height + (AllowSeeking.Value ? handle_size.Y : 0) + (ShowGraph.Value ? graph_height : 0);
             info.TransformTo(nameof(info.Margin), new MarginPadding { Bottom = finalMargin }, transition_duration, Easing.In);
         }
-
-        public class SongProgressDisplay : Container
-        {
-            public SongProgressDisplay()
-            {
-                // TODO: move actual implementation into this.
-                // exists for skin customisation purposes (interface should be added to this container).
-
-                Masking = true;
-                RelativeSizeAxes = Axes.Both;
-                Anchor = Anchor.BottomCentre;
-                Origin = Anchor.BottomCentre;
-            }
-        }
     }
 }

From 60f3e628bcdfbf76602444f83ffa9577ef756f46 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 May 2021 19:05:22 +0900
Subject: [PATCH 3523/3722] Fix song progress being interactable inside toolbox
 button

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

diff --git a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
index 59420bfc87..acadaa3b74 100644
--- a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
+++ b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
@@ -92,6 +92,9 @@ namespace osu.Game.Skinning.Editor
 
         private class ToolboxComponentButton : OsuButton
         {
+            protected override bool ReceivePositionalInputAtSubTree(Vector2 screenSpacePos) => false;
+            public override bool PropagateNonPositionalInputSubTree => false;
+
             private readonly Drawable component;
 
             public Action<Type> RequestPlacement;

From 42d2711dc6ca0e6cac28bd70c95d4d75272be9b7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 May 2021 19:29:59 +0900
Subject: [PATCH 3524/3722] Use `ShouldBeConsideredForInput` instead of
 `ReceivePositionalInputAtSubTree`

---
 osu.Game/Skinning/Editor/SkinComponentToolbox.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
index acadaa3b74..471ed9c6ec 100644
--- a/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
+++ b/osu.Game/Skinning/Editor/SkinComponentToolbox.cs
@@ -92,7 +92,8 @@ namespace osu.Game.Skinning.Editor
 
         private class ToolboxComponentButton : OsuButton
         {
-            protected override bool ReceivePositionalInputAtSubTree(Vector2 screenSpacePos) => false;
+            protected override bool ShouldBeConsideredForInput(Drawable child) => false;
+
             public override bool PropagateNonPositionalInputSubTree => false;
 
             private readonly Drawable component;

From 7137315fa7612f02bbd963e55e6b2c6ac512b892 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 May 2021 19:46:50 +0900
Subject: [PATCH 3525/3722] Remove `HitErrorDisplay` container and hook up data

---
 osu.Game/Screens/Play/HUD/HitErrorDisplay.cs  | 127 ------------------
 .../HUD/HitErrorMeters/BarHitErrorMeter.cs    |  15 ++-
 .../HUD/HitErrorMeters/ColourHitErrorMeter.cs |   4 +-
 .../Play/HUD/HitErrorMeters/HitErrorMeter.cs  |  11 +-
 osu.Game/Screens/Play/HUDOverlay.cs           |  18 +--
 5 files changed, 20 insertions(+), 155 deletions(-)
 delete mode 100644 osu.Game/Screens/Play/HUD/HitErrorDisplay.cs

diff --git a/osu.Game/Screens/Play/HUD/HitErrorDisplay.cs b/osu.Game/Screens/Play/HUD/HitErrorDisplay.cs
deleted file mode 100644
index a24d9c10cb..0000000000
--- a/osu.Game/Screens/Play/HUD/HitErrorDisplay.cs
+++ /dev/null
@@ -1,127 +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.IEnumerableExtensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Configuration;
-using osu.Game.Rulesets.Scoring;
-using osu.Game.Screens.Play.HUD.HitErrorMeters;
-
-namespace osu.Game.Screens.Play.HUD
-{
-    public class HitErrorDisplay : Container<HitErrorMeter>
-    {
-        private const int fade_duration = 200;
-        private const int margin = 10;
-
-        private readonly Bindable<ScoreMeterType> type = new Bindable<ScoreMeterType>();
-
-        private readonly HitWindows hitWindows;
-
-        public HitErrorDisplay(HitWindows hitWindows)
-        {
-            this.hitWindows = hitWindows;
-
-            RelativeSizeAxes = Axes.Both;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
-        {
-            config.BindWith(OsuSetting.ScoreMeter, type);
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            type.BindValueChanged(typeChanged, true);
-        }
-
-        private void typeChanged(ValueChangedEvent<ScoreMeterType> type)
-        {
-            Children.ForEach(c => c.FadeOut(fade_duration, Easing.OutQuint));
-
-            if (hitWindows == null)
-                return;
-
-            switch (type.NewValue)
-            {
-                case ScoreMeterType.HitErrorBoth:
-                    createBar(Anchor.CentreLeft);
-                    createBar(Anchor.CentreRight);
-                    break;
-
-                case ScoreMeterType.HitErrorLeft:
-                    createBar(Anchor.CentreLeft);
-                    break;
-
-                case ScoreMeterType.HitErrorRight:
-                    createBar(Anchor.CentreRight);
-                    break;
-
-                case ScoreMeterType.HitErrorBottom:
-                    createBar(Anchor.BottomCentre);
-                    break;
-
-                case ScoreMeterType.ColourBoth:
-                    createColour(Anchor.CentreLeft);
-                    createColour(Anchor.CentreRight);
-                    break;
-
-                case ScoreMeterType.ColourLeft:
-                    createColour(Anchor.CentreLeft);
-                    break;
-
-                case ScoreMeterType.ColourRight:
-                    createColour(Anchor.CentreRight);
-                    break;
-
-                case ScoreMeterType.ColourBottom:
-                    createColour(Anchor.BottomCentre);
-                    break;
-            }
-        }
-
-        private void createBar(Anchor anchor)
-        {
-            bool rightAligned = (anchor & Anchor.x2) > 0;
-            bool bottomAligned = (anchor & Anchor.y2) > 0;
-
-            var display = new BarHitErrorMeter(hitWindows, rightAligned)
-            {
-                Margin = new MarginPadding(margin),
-                Anchor = anchor,
-                Origin = bottomAligned ? Anchor.CentreLeft : anchor,
-                Alpha = 0,
-                Rotation = bottomAligned ? 270 : 0
-            };
-
-            completeDisplayLoading(display);
-        }
-
-        private void createColour(Anchor anchor)
-        {
-            bool bottomAligned = (anchor & Anchor.y2) > 0;
-
-            var display = new ColourHitErrorMeter(hitWindows)
-            {
-                Margin = new MarginPadding(margin),
-                Anchor = anchor,
-                Origin = bottomAligned ? Anchor.CentreLeft : anchor,
-                Alpha = 0,
-                Rotation = bottomAligned ? 270 : 0
-            };
-
-            completeDisplayLoading(display);
-        }
-
-        private void completeDisplayLoading(HitErrorMeter display)
-        {
-            Add(display);
-            display.FadeInFromZero(fade_duration, Easing.OutQuint);
-        }
-    }
-}
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
index 0e147f9238..c303f3889d 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
@@ -43,10 +43,10 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 
         private double maxHitWindow;
 
-        public BarHitErrorMeter(HitWindows hitWindows, bool rightAligned = false)
-            : base(hitWindows)
+        public BarHitErrorMeter()
         {
-            alignment = rightAligned ? Anchor.x0 : Anchor.x2;
+            // todo: investigate.
+            alignment = false ? Anchor.x0 : Anchor.x2;
 
             AutoSizeAxes = Axes.Both;
         }
@@ -152,14 +152,17 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
         {
             var windows = HitWindows.GetAllAvailableWindows().ToArray();
 
-            maxHitWindow = windows.First().length;
+            // max to avoid div-by-zero.
+            maxHitWindow = Math.Max(1, windows.First().length);
 
             for (var i = 0; i < windows.Length; i++)
             {
                 var (result, length) = windows[i];
 
-                colourBarsEarly.Add(createColourBar(result, (float)(length / maxHitWindow), i == 0));
-                colourBarsLate.Add(createColourBar(result, (float)(length / maxHitWindow), i == 0));
+                var hitWindow = (float)(length / maxHitWindow);
+
+                colourBarsEarly.Add(createColourBar(result, hitWindow, i == 0));
+                colourBarsLate.Add(createColourBar(result, hitWindow, i == 0));
             }
 
             // a little nub to mark the centre point.
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
index 465439cf19..0eb2367f73 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
@@ -7,7 +7,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Scoring;
 using osuTK;
 using osuTK.Graphics;
 
@@ -19,8 +18,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 
         private readonly JudgementFlow judgementsFlow;
 
-        public ColourHitErrorMeter(HitWindows hitWindows)
-            : base(hitWindows)
+        public ColourHitErrorMeter()
         {
             AutoSizeAxes = Axes.Both;
             InternalChild = judgementsFlow = new JudgementFlow();
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
index 37e9ea43c5..b0f9928b13 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
@@ -6,13 +6,15 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.UI;
+using osu.Game.Skinning;
 using osuTK.Graphics;
 
 namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 {
-    public abstract class HitErrorMeter : CompositeDrawable
+    public abstract class HitErrorMeter : CompositeDrawable, ISkinnableDrawable
     {
-        protected readonly HitWindows HitWindows;
+        protected HitWindows HitWindows { get; private set; }
 
         [Resolved]
         private ScoreProcessor processor { get; set; }
@@ -20,9 +22,10 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
         [Resolved]
         private OsuColour colours { get; set; }
 
-        protected HitErrorMeter(HitWindows hitWindows)
+        [BackgroundDependencyLoader(true)]
+        private void load(DrawableRuleset drawableRuleset)
         {
-            HitWindows = hitWindows;
+            HitWindows = drawableRuleset?.FirstAvailableHitWindows ?? HitWindows.Empty;
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index dcee64ff0d..ab5b01cab6 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -87,22 +87,10 @@ namespace osu.Game.Screens.Play
                 visibilityContainer = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Children = new Drawable[]
+                    Child = mainComponents = new SkinnableTargetContainer(SkinnableTarget.MainHUDComponents)
                     {
-                        mainComponents = new SkinnableTargetContainer(SkinnableTarget.MainHUDComponents)
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                        },
-                        new Container
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Children = new Drawable[]
-                            {
-                                // still need to be migrated; a bit more involved.
-                                new HitErrorDisplay(this.drawableRuleset?.FirstAvailableHitWindows),
-                            }
-                        },
-                    }
+                        RelativeSizeAxes = Axes.Both,
+                    },
                 },
                 topRightElements = new FillFlowContainer
                 {

From 5d5b1e1f0e441de05c7c5fda27399d05a84415f9 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sat, 8 May 2021 11:00:22 +0200
Subject: [PATCH 3526/3722] Add StableImportManager

---
 osu.Game/Database/StableImportManager.cs      | 92 +++++++++++++++++++
 .../StableDirectorySelectScreen.cs            | 42 +++++++++
 2 files changed, 134 insertions(+)
 create mode 100644 osu.Game/Database/StableImportManager.cs
 create mode 100644 osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs

diff --git a/osu.Game/Database/StableImportManager.cs b/osu.Game/Database/StableImportManager.cs
new file mode 100644
index 0000000000..46c6aab2fe
--- /dev/null
+++ b/osu.Game/Database/StableImportManager.cs
@@ -0,0 +1,92 @@
+// Copyright (c) ppy 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.Text;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using osu.Framework.Allocation;
+using osu.Framework.Extensions.EnumExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Platform;
+using osu.Framework.Screens;
+using osu.Game.Beatmaps;
+using osu.Game.Collections;
+using osu.Game.IO;
+using osu.Game.Overlays.Settings.Sections.Maintenance;
+using osu.Game.Scoring;
+using osu.Game.Skinning;
+
+namespace osu.Game.Database
+{
+    public class StableImportManager : Component
+    {
+        [Resolved]
+        private SkinManager skins { get; set; }
+
+        [Resolved]
+        private BeatmapManager beatmaps { get; set; }
+
+        [Resolved]
+        private ScoreManager scores { get; set; }
+
+        [Resolved]
+        private CollectionManager collections { get; set; }
+
+        [Resolved]
+        private OsuGame game { get; set; }
+
+        [Resolved(CanBeNull = true)]
+        private DesktopGameHost desktopGameHost { get; set; }
+
+        private StableStorage cachedStorage;
+
+        public async Task ImportFromStableAsync(StableContent content)
+        {
+            //var stableStorage = await getStableStorage().ConfigureAwait(false);
+            var importTasks = new List<Task>();
+
+            if (content.HasFlagFast(StableContent.Beatmaps))
+                importTasks.Add(beatmaps.ImportFromStableAsync());
+
+            if (content.HasFlagFast(StableContent.Collections))
+                importTasks.Add(collections.ImportFromStableAsync());
+
+            if (content.HasFlagFast(StableContent.Scores))
+                importTasks.Add(scores.ImportFromStableAsync());
+
+            if (content.HasFlagFast(StableContent.Skins))
+                importTasks.Add(skins.ImportFromStableAsync());
+
+            await Task.WhenAll(importTasks.ToArray()).ConfigureAwait(false);
+        }
+
+        private async Task<StableStorage> getStableStorage()
+        {
+            var stableStorage = game.GetStorageForStableInstall();
+            if (stableStorage != null)
+                return stableStorage;
+
+            if (cachedStorage != null)
+                return cachedStorage;
+
+            var taskCompletionSource = new TaskCompletionSource<string>();
+            Schedule(() => game.PerformFromScreen(t => t.Push(new StableDirectorySelectScreen(taskCompletionSource))));
+            var stablePath = await taskCompletionSource.Task.ConfigureAwait(false);
+
+            return cachedStorage = new StableStorage(stablePath, desktopGameHost);
+        }
+
+    }
+
+    [Flags]
+    public enum StableContent
+    {
+        Beatmaps = 0x1,
+        Scores = 0x2,
+        Skins = 0x3,
+        Collections = 0x4,
+        All = Beatmaps | Scores | Skins | Collections
+    }
+}
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
new file mode 100644
index 0000000000..d935bcf526
--- /dev/null
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.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.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using osu.Framework.Screens;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+
+namespace osu.Game.Overlays.Settings.Sections.Maintenance
+{
+    public class StableDirectorySelectScreen : DirectorySelectScreen
+    {
+        private readonly TaskCompletionSource<string> taskCompletionSource;
+
+        protected override bool IsValidDirectory(DirectoryInfo info) => info?.GetFiles("osu!.*.cfg").Any() ?? false;
+
+        protected override OsuSpriteText CreateHeader() => new OsuSpriteText
+        {
+            Text = "Please select stable location",
+            Font = OsuFont.Default.With(size: 40)
+        };
+
+        public StableDirectorySelectScreen(TaskCompletionSource<string> taskCompletionSource)
+        {
+            this.taskCompletionSource = taskCompletionSource;
+        }
+
+        protected override void OnSelection(DirectoryInfo directory)
+        { 
+            taskCompletionSource.TrySetResult(directory.FullName);
+            this.Exit();
+        }
+
+        public override bool OnBackButton()
+        {
+            taskCompletionSource.TrySetCanceled();
+            return base.OnBackButton();
+        }
+    }
+}

From 851e33fd1542c21dea6717c4416db71ab1866f36 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 9 May 2021 17:12:58 +0200
Subject: [PATCH 3527/3722] Hook up  StableImportManager.

---
 osu.Game/Collections/CollectionManager.cs     | 12 ++++-----
 osu.Game/Database/ArchiveModelManager.cs      |  5 +---
 osu.Game/Database/StableImportManager.cs      | 25 ++++++++++---------
 osu.Game/OsuGame.cs                           |  4 +++
 .../Sections/Maintenance/GeneralSettings.cs   | 19 +++++++-------
 osu.Game/Screens/Select/SongSelect.cs         | 13 +++-------
 6 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/osu.Game/Collections/CollectionManager.cs b/osu.Game/Collections/CollectionManager.cs
index 9723409c79..fbd12cf672 100644
--- a/osu.Game/Collections/CollectionManager.cs
+++ b/osu.Game/Collections/CollectionManager.cs
@@ -15,6 +15,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Beatmaps;
+using osu.Game.IO;
 using osu.Game.IO.Legacy;
 using osu.Game.Overlays.Notifications;
 
@@ -38,8 +39,6 @@ namespace osu.Game.Collections
 
         public readonly BindableList<BeatmapCollection> Collections = new BindableList<BeatmapCollection>();
 
-        public bool SupportsImportFromStable => RuntimeInfo.IsDesktop;
-
         [Resolved]
         private GameHost host { get; set; }
 
@@ -104,17 +103,16 @@ namespace osu.Game.Collections
         /// <summary>
         /// This is a temporary method and will likely be replaced by a full-fledged (and more correctly placed) migration process in the future.
         /// </summary>
-        public Task ImportFromStableAsync()
+        public Task ImportFromStableAsync(StableStorage stableStorage)
         {
-            var stable = GetStableStorage?.Invoke();
 
-            if (stable == null)
+            if (stableStorage == null)
             {
                 Logger.Log("No osu!stable installation available!", LoggingTarget.Information, LogLevel.Error);
                 return Task.CompletedTask;
             }
 
-            if (!stable.Exists(database_name))
+            if (!stableStorage.Exists(database_name))
             {
                 // This handles situations like when the user does not have a collections.db file
                 Logger.Log($"No {database_name} available in osu!stable installation", LoggingTarget.Information, LogLevel.Error);
@@ -123,7 +121,7 @@ namespace osu.Game.Collections
 
             return Task.Run(async () =>
             {
-                using (var stream = stable.GetStream(database_name))
+                using (var stream = stableStorage.GetStream(database_name))
                     await Import(stream).ConfigureAwait(false);
             });
         }
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index e0f80d2743..38a6af4654 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -81,8 +81,6 @@ namespace osu.Game.Database
 
         public virtual IEnumerable<string> HandledExtensions => new[] { ".zip" };
 
-        public virtual bool SupportsImportFromStable => RuntimeInfo.IsDesktop;
-
         protected readonly FileStore Files;
 
         protected readonly IDatabaseContextFactory ContextFactory;
@@ -700,9 +698,8 @@ namespace osu.Game.Database
         /// <summary>
         /// This is a temporary method and will likely be replaced by a full-fledged (and more correctly placed) migration process in the future.
         /// </summary>
-        public Task ImportFromStableAsync()
+        public Task ImportFromStableAsync(StableStorage stableStorage)
         {
-            var stableStorage = GetStableStorage?.Invoke();
 
             if (stableStorage == null)
             {
diff --git a/osu.Game/Database/StableImportManager.cs b/osu.Game/Database/StableImportManager.cs
index 46c6aab2fe..8baf03b7a3 100644
--- a/osu.Game/Database/StableImportManager.cs
+++ b/osu.Game/Database/StableImportManager.cs
@@ -3,9 +3,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Threading.Tasks;
-using JetBrains.Annotations;
+using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
@@ -19,7 +18,7 @@ using osu.Game.Scoring;
 using osu.Game.Skinning;
 
 namespace osu.Game.Database
-{
+{    
     public class StableImportManager : Component
     {
         [Resolved]
@@ -42,22 +41,24 @@ namespace osu.Game.Database
 
         private StableStorage cachedStorage;
 
+        public bool SupportsImportFromStable => RuntimeInfo.IsDesktop;
+
         public async Task ImportFromStableAsync(StableContent content)
         {
-            //var stableStorage = await getStableStorage().ConfigureAwait(false);
+            var stableStorage = await getStableStorage().ConfigureAwait(false);
             var importTasks = new List<Task>();
 
             if (content.HasFlagFast(StableContent.Beatmaps))
-                importTasks.Add(beatmaps.ImportFromStableAsync());
+                importTasks.Add(beatmaps.ImportFromStableAsync(stableStorage));
 
             if (content.HasFlagFast(StableContent.Collections))
-                importTasks.Add(collections.ImportFromStableAsync());
+                importTasks.Add(collections.ImportFromStableAsync(stableStorage));
 
             if (content.HasFlagFast(StableContent.Scores))
-                importTasks.Add(scores.ImportFromStableAsync());
+                importTasks.Add(scores.ImportFromStableAsync(stableStorage));
 
             if (content.HasFlagFast(StableContent.Skins))
-                importTasks.Add(skins.ImportFromStableAsync());
+                importTasks.Add(skins.ImportFromStableAsync(stableStorage));
 
             await Task.WhenAll(importTasks.ToArray()).ConfigureAwait(false);
         }
@@ -83,10 +84,10 @@ namespace osu.Game.Database
     [Flags]
     public enum StableContent
     {
-        Beatmaps = 0x1,
-        Scores = 0x2,
-        Skins = 0x3,
-        Collections = 0x4,
+        Beatmaps = 1,
+        Scores = 2,
+        Skins = 4,
+        Collections = 8,
         All = Beatmaps | Scores | Skins | Collections
     }
 }
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index f860cd8dd2..1cfe8ace43 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -100,6 +100,9 @@ namespace osu.Game
         [Cached]
         private readonly DifficultyRecommender difficultyRecommender = new DifficultyRecommender();
 
+        [Cached]
+        private readonly StableImportManager stableImportManager = new StableImportManager();
+
         [Cached]
         private readonly ScreenshotManager screenshotManager = new ScreenshotManager();
 
@@ -694,6 +697,7 @@ namespace osu.Game
             }, Add, true);
 
             loadComponentSingleFile(difficultyRecommender, Add);
+            loadComponentSingleFile(stableImportManager, Add);
 
             loadComponentSingleFile(screenshotManager, Add);
 
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
index 848ce381a9..9bd360679e 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
@@ -8,6 +8,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Collections;
+using osu.Game.Database;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Scoring;
 using osu.Game.Skinning;
@@ -29,9 +30,9 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
         private TriangleButton undeleteButton;
 
         [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(BeatmapManager beatmaps, ScoreManager scores, SkinManager skins, [CanBeNull] CollectionManager collectionManager, DialogOverlay dialogOverlay)
+        private void load(BeatmapManager beatmaps, ScoreManager scores, SkinManager skins, [CanBeNull] CollectionManager collectionManager, StableImportManager stableImportManager, DialogOverlay dialogOverlay)
         {
-            if (beatmaps.SupportsImportFromStable)
+            if (stableImportManager.SupportsImportFromStable)
             {
                 Add(importBeatmapsButton = new SettingsButton
                 {
@@ -39,7 +40,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                     Action = () =>
                     {
                         importBeatmapsButton.Enabled.Value = false;
-                        beatmaps.ImportFromStableAsync().ContinueWith(t => Schedule(() => importBeatmapsButton.Enabled.Value = true));
+                        stableImportManager.ImportFromStableAsync(StableContent.Beatmaps).ContinueWith(t => Schedule(() => importBeatmapsButton.Enabled.Value = true));
                     }
                 });
             }
@@ -57,7 +58,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                 }
             });
 
-            if (scores.SupportsImportFromStable)
+            if (stableImportManager.SupportsImportFromStable)
             {
                 Add(importScoresButton = new SettingsButton
                 {
@@ -65,7 +66,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                     Action = () =>
                     {
                         importScoresButton.Enabled.Value = false;
-                        scores.ImportFromStableAsync().ContinueWith(t => Schedule(() => importScoresButton.Enabled.Value = true));
+                        stableImportManager.ImportFromStableAsync(StableContent.Scores).ContinueWith(t => Schedule(() => importScoresButton.Enabled.Value = true));
                     }
                 });
             }
@@ -83,7 +84,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                 }
             });
 
-            if (skins.SupportsImportFromStable)
+            if (stableImportManager.SupportsImportFromStable)
             {
                 Add(importSkinsButton = new SettingsButton
                 {
@@ -91,7 +92,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                     Action = () =>
                     {
                         importSkinsButton.Enabled.Value = false;
-                        skins.ImportFromStableAsync().ContinueWith(t => Schedule(() => importSkinsButton.Enabled.Value = true));
+                        stableImportManager.ImportFromStableAsync(StableContent.Skins).ContinueWith(t => Schedule(() => importSkinsButton.Enabled.Value = true));
                     }
                 });
             }
@@ -111,7 +112,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
             if (collectionManager != null)
             {
-                if (collectionManager.SupportsImportFromStable)
+                if (stableImportManager.SupportsImportFromStable)
                 {
                     Add(importCollectionsButton = new SettingsButton
                     {
@@ -119,7 +120,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                         Action = () =>
                         {
                             importCollectionsButton.Enabled.Value = false;
-                            collectionManager.ImportFromStableAsync().ContinueWith(t => Schedule(() => importCollectionsButton.Enabled.Value = true));
+                            stableImportManager.ImportFromStableAsync(StableContent.Collections).ContinueWith(t => Schedule(() => importCollectionsButton.Enabled.Value = true));
                         }
                     });
                 }
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 215700d87c..ff72f36c75 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -22,7 +22,6 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.Select.Options;
-using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
 using osuTK.Input;
@@ -35,9 +34,9 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Bindings;
 using osu.Game.Collections;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Scoring;
 using System.Diagnostics;
 using osu.Game.Screens.Play;
+using osu.Game.Database;
 
 namespace osu.Game.Screens.Select
 {
@@ -101,7 +100,7 @@ namespace osu.Game.Screens.Select
         private MusicController music { get; set; }
 
         [BackgroundDependencyLoader(true)]
-        private void load(AudioManager audio, DialogOverlay dialog, OsuColour colours, SkinManager skins, ScoreManager scores, CollectionManager collections, ManageCollectionsDialog manageCollectionsDialog, DifficultyRecommender recommender)
+        private void load(AudioManager audio, DialogOverlay dialog, OsuColour colours, StableImportManager stableImportManager, ManageCollectionsDialog manageCollectionsDialog, DifficultyRecommender recommender)
         {
             // initial value transfer is required for FilterControl (it uses our re-cached bindables in its async load for the initial filter).
             transferRulesetValue();
@@ -287,13 +286,7 @@ namespace osu.Game.Screens.Select
                     {
                         dialogOverlay.Push(new ImportFromStablePopup(() =>
                         {
-                            Task.Run(beatmaps.ImportFromStableAsync)
-                                .ContinueWith(_ =>
-                                {
-                                    Task.Run(scores.ImportFromStableAsync);
-                                    Task.Run(collections.ImportFromStableAsync);
-                                }, TaskContinuationOptions.OnlyOnRanToCompletion);
-                            Task.Run(skins.ImportFromStableAsync);
+                            Task.Run(() => stableImportManager.ImportFromStableAsync(StableContent.All));
                         }));
                     }
                 });

From 325a689d6553b9988c7c4378103135d960600376 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 9 May 2021 18:15:21 +0200
Subject: [PATCH 3528/3722] Order imports depending on beatmap imports if any
 is running.

---
 osu.Game/Database/StableImportManager.cs | 25 +++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Database/StableImportManager.cs b/osu.Game/Database/StableImportManager.cs
index 8baf03b7a3..24b8aa9f6a 100644
--- a/osu.Game/Database/StableImportManager.cs
+++ b/osu.Game/Database/StableImportManager.cs
@@ -48,18 +48,29 @@ namespace osu.Game.Database
             var stableStorage = await getStableStorage().ConfigureAwait(false);
             var importTasks = new List<Task>();
 
+            Task beatmapImportTask = default;
             if (content.HasFlagFast(StableContent.Beatmaps))
-                importTasks.Add(beatmaps.ImportFromStableAsync(stableStorage));
-
-            if (content.HasFlagFast(StableContent.Collections))
-                importTasks.Add(collections.ImportFromStableAsync(stableStorage));
-
-            if (content.HasFlagFast(StableContent.Scores))
-                importTasks.Add(scores.ImportFromStableAsync(stableStorage));
+                importTasks.Add(beatmapImportTask = beatmaps.ImportFromStableAsync(stableStorage));
 
             if (content.HasFlagFast(StableContent.Skins))
                 importTasks.Add(skins.ImportFromStableAsync(stableStorage));
 
+            if (content.HasFlagFast(StableContent.Collections))
+            {
+                if (beatmapImportTask != null)
+                    importTasks.Add(beatmapImportTask.ContinueWith(_ => collections.ImportFromStableAsync(stableStorage), TaskContinuationOptions.OnlyOnRanToCompletion));
+                else
+                    importTasks.Add(collections.ImportFromStableAsync(stableStorage));
+            }
+
+            if (content.HasFlagFast(StableContent.Scores))
+            {
+                if (beatmapImportTask != null)
+                    importTasks.Add(beatmapImportTask.ContinueWith(_ => scores.ImportFromStableAsync(stableStorage), TaskContinuationOptions.OnlyOnRanToCompletion));
+                else
+                    importTasks.Add(scores.ImportFromStableAsync(stableStorage));
+            }
+
             await Task.WhenAll(importTasks.ToArray()).ConfigureAwait(false);
         }
 

From 481b0a0125c68f311d4678f910f3cbf47bb3fef1 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 9 May 2021 19:50:43 +0200
Subject: [PATCH 3529/3722] Add StableDirectoryLocationDialog

---
 osu.Game/Database/StableImportManager.cs      | 10 ++---
 .../StableDirectoryLocationDialog.cs          | 38 +++++++++++++++++++
 2 files changed, 43 insertions(+), 5 deletions(-)
 create mode 100644 osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs

diff --git a/osu.Game/Database/StableImportManager.cs b/osu.Game/Database/StableImportManager.cs
index 24b8aa9f6a..09a08920dd 100644
--- a/osu.Game/Database/StableImportManager.cs
+++ b/osu.Game/Database/StableImportManager.cs
@@ -9,16 +9,16 @@ using osu.Framework.Allocation;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Platform;
-using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Collections;
 using osu.Game.IO;
+using osu.Game.Overlays;
 using osu.Game.Overlays.Settings.Sections.Maintenance;
 using osu.Game.Scoring;
 using osu.Game.Skinning;
 
 namespace osu.Game.Database
-{    
+{
     public class StableImportManager : Component
     {
         [Resolved]
@@ -34,7 +34,7 @@ namespace osu.Game.Database
         private CollectionManager collections { get; set; }
 
         [Resolved]
-        private OsuGame game { get; set; }
+        private DialogOverlay dialogOverlay { get; set; }
 
         [Resolved(CanBeNull = true)]
         private DesktopGameHost desktopGameHost { get; set; }
@@ -83,8 +83,8 @@ namespace osu.Game.Database
             if (cachedStorage != null)
                 return cachedStorage;
 
-            var taskCompletionSource = new TaskCompletionSource<string>();
-            Schedule(() => game.PerformFromScreen(t => t.Push(new StableDirectorySelectScreen(taskCompletionSource))));
+            var taskCompletionSource = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
+            dialogOverlay.Push(new StableDirectoryLocationDialog(taskCompletionSource));
             var stablePath = await taskCompletionSource.Task.ConfigureAwait(false);
 
             return cachedStorage = new StableStorage(stablePath, desktopGameHost);
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs
new file mode 100644
index 0000000000..273ee5dc89
--- /dev/null
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.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.Threading.Tasks;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Screens;
+using osu.Game.Overlays.Dialog;
+
+namespace osu.Game.Overlays.Settings.Sections.Maintenance
+{
+    public class StableDirectoryLocationDialog : PopupDialog
+    {
+        [Resolved]
+        private OsuGame game { get; set; }
+
+        public StableDirectoryLocationDialog(TaskCompletionSource<string> taskCompletionSource)
+        {
+            HeaderText = "Failed to automatically locate a stable installation.";
+            BodyText = "osu! failed to automatically locate a stable installation. Maybe you can tell osu! where it is located?";
+            Icon = FontAwesome.Solid.QuestionCircle;
+
+            Buttons = new PopupDialogButton[]
+            {
+                new PopupDialogOkButton
+                {
+                    Text = "Sure! I know where it is located!",
+                    Action = () => Schedule(() => game.PerformFromScreen(screen => screen.Push(new StableDirectorySelectScreen(taskCompletionSource))))
+                },
+                new PopupDialogCancelButton
+                {
+                    Text = "Actually I don't have osu!stable installed.",
+                    Action = () => taskCompletionSource.TrySetCanceled()
+                }
+            };
+        }
+    }
+}

From 8ba50b185445358419ed2b01508d4859e9273e8c Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 9 May 2021 19:52:26 +0200
Subject: [PATCH 3530/3722] Bring back injected dependency incorrectly marked
 as unused.

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

diff --git a/osu.Game/Database/StableImportManager.cs b/osu.Game/Database/StableImportManager.cs
index 09a08920dd..e4c89062f2 100644
--- a/osu.Game/Database/StableImportManager.cs
+++ b/osu.Game/Database/StableImportManager.cs
@@ -33,6 +33,9 @@ namespace osu.Game.Database
         [Resolved]
         private CollectionManager collections { get; set; }
 
+        [Resolved]
+        private OsuGame game { get; set; }
+
         [Resolved]
         private DialogOverlay dialogOverlay { get; set; }
 

From a7b740fd1de6cd6211c19d52697925f6b86e79fa Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 9 May 2021 21:29:41 +0200
Subject: [PATCH 3531/3722] Reword ImportFromStablePopup and display the popup
 regardless of whether a stable install is detected.

---
 osu.Game/Database/StableImportManager.cs         | 2 +-
 osu.Game/Screens/Select/ImportFromStablePopup.cs | 2 +-
 osu.Game/Screens/Select/SongSelect.cs            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Database/StableImportManager.cs b/osu.Game/Database/StableImportManager.cs
index e4c89062f2..475077c54e 100644
--- a/osu.Game/Database/StableImportManager.cs
+++ b/osu.Game/Database/StableImportManager.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Database
                 return cachedStorage;
 
             var taskCompletionSource = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
-            dialogOverlay.Push(new StableDirectoryLocationDialog(taskCompletionSource));
+            Schedule(() => dialogOverlay.Push(new StableDirectoryLocationDialog(taskCompletionSource)));
             var stablePath = await taskCompletionSource.Task.ConfigureAwait(false);
 
             return cachedStorage = new StableStorage(stablePath, desktopGameHost);
diff --git a/osu.Game/Screens/Select/ImportFromStablePopup.cs b/osu.Game/Screens/Select/ImportFromStablePopup.cs
index 8dab83b24c..e3a1505518 100644
--- a/osu.Game/Screens/Select/ImportFromStablePopup.cs
+++ b/osu.Game/Screens/Select/ImportFromStablePopup.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Screens.Select
         public ImportFromStablePopup(Action importFromStable)
         {
             HeaderText = @"You have no beatmaps!";
-            BodyText = "An existing copy of osu! was found, though.\nWould you like to import your beatmaps, skins, collections and scores?\nThis will create a second copy of all files on disk.";
+            BodyText = "You can import files from over a stable install, though.\nWould you like to import your beatmaps, skins, collections and scores?\nThis will create a second copy of all files on disk.";
 
             Icon = FontAwesome.Solid.Plane;
 
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index ff72f36c75..d8ad752151 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -281,8 +281,8 @@ namespace osu.Game.Screens.Select
             {
                 Schedule(() =>
                 {
-                    // if we have no beatmaps but osu-stable is found, let's prompt the user to import.
-                    if (!beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.Minimal).Any() && beatmaps.StableInstallationAvailable)
+                    // if we have no beatmaps, let's prompt the user to import from over a stable install if he has one.
+                    if (!beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.Minimal).Any() && stableImportManager.SupportsImportFromStable)
                     {
                         dialogOverlay.Push(new ImportFromStablePopup(() =>
                         {

From dabe8bd4c7f358e19edc3ac57130093c170d6d64 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 10 May 2021 12:21:51 +0200
Subject: [PATCH 3532/3722] Fix code inspections and remove now unused code.

---
 osu.Game/Collections/CollectionManager.cs           |  7 -------
 osu.Game/Database/ArchiveModelManager.cs            | 12 ------------
 osu.Game/Database/StableImportManager.cs            | 13 ++++---------
 osu.Game/OsuGame.cs                                 |  4 ----
 .../Maintenance/StableDirectorySelectScreen.cs      |  2 +-
 5 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/osu.Game/Collections/CollectionManager.cs b/osu.Game/Collections/CollectionManager.cs
index fbd12cf672..e707b463cb 100644
--- a/osu.Game/Collections/CollectionManager.cs
+++ b/osu.Game/Collections/CollectionManager.cs
@@ -8,7 +8,6 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -95,17 +94,11 @@ namespace osu.Game.Collections
         /// </summary>
         public Action<Notification> PostNotification { protected get; set; }
 
-        /// <summary>
-        /// Set a storage with access to an osu-stable install for import purposes.
-        /// </summary>
-        public Func<Storage> GetStableStorage { private get; set; }
-
         /// <summary>
         /// This is a temporary method and will likely be replaced by a full-fledged (and more correctly placed) migration process in the future.
         /// </summary>
         public Task ImportFromStableAsync(StableStorage stableStorage)
         {
-
             if (stableStorage == null)
             {
                 Logger.Log("No osu!stable installation available!", LoggingTarget.Information, LogLevel.Error);
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 38a6af4654..93e2880ba0 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -10,7 +10,6 @@ using System.Threading.Tasks;
 using Humanizer;
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
-using osu.Framework;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Extensions.IEnumerableExtensions;
@@ -667,16 +666,6 @@ namespace osu.Game.Database
 
         #region osu-stable import
 
-        /// <summary>
-        /// Set a storage with access to an osu-stable install for import purposes.
-        /// </summary>
-        public Func<StableStorage> GetStableStorage { private get; set; }
-
-        /// <summary>
-        /// Denotes whether an osu-stable installation is present to perform automated imports from.
-        /// </summary>
-        public bool StableInstallationAvailable => GetStableStorage?.Invoke() != null;
-
         /// <summary>
         /// The relative path from osu-stable's data directory to import items from.
         /// </summary>
@@ -700,7 +689,6 @@ namespace osu.Game.Database
         /// </summary>
         public Task ImportFromStableAsync(StableStorage stableStorage)
         {
-
             if (stableStorage == null)
             {
                 Logger.Log("No osu!stable installation available!", LoggingTarget.Information, LogLevel.Error);
diff --git a/osu.Game/Database/StableImportManager.cs b/osu.Game/Database/StableImportManager.cs
index 475077c54e..6f8225519d 100644
--- a/osu.Game/Database/StableImportManager.cs
+++ b/osu.Game/Database/StableImportManager.cs
@@ -60,18 +60,14 @@ namespace osu.Game.Database
 
             if (content.HasFlagFast(StableContent.Collections))
             {
-                if (beatmapImportTask != null)
-                    importTasks.Add(beatmapImportTask.ContinueWith(_ => collections.ImportFromStableAsync(stableStorage), TaskContinuationOptions.OnlyOnRanToCompletion));
-                else
-                    importTasks.Add(collections.ImportFromStableAsync(stableStorage));
+                importTasks.Add(beatmapImportTask?.ContinueWith(_ => collections.ImportFromStableAsync(stableStorage), TaskContinuationOptions.OnlyOnRanToCompletion)
+                                ?? collections.ImportFromStableAsync(stableStorage));
             }
 
             if (content.HasFlagFast(StableContent.Scores))
             {
-                if (beatmapImportTask != null)
-                    importTasks.Add(beatmapImportTask.ContinueWith(_ => scores.ImportFromStableAsync(stableStorage), TaskContinuationOptions.OnlyOnRanToCompletion));
-                else
-                    importTasks.Add(scores.ImportFromStableAsync(stableStorage));
+                importTasks.Add(beatmapImportTask?.ContinueWith(_ => scores.ImportFromStableAsync(stableStorage), TaskContinuationOptions.OnlyOnRanToCompletion)
+                                ?? scores.ImportFromStableAsync(stableStorage));
             }
 
             await Task.WhenAll(importTasks.ToArray()).ConfigureAwait(false);
@@ -92,7 +88,6 @@ namespace osu.Game.Database
 
             return cachedStorage = new StableStorage(stablePath, desktopGameHost);
         }
-
     }
 
     [Flags]
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 1cfe8ace43..06e0b6e9bf 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -569,14 +569,11 @@ namespace osu.Game
 
             // todo: all archive managers should be able to be looped here.
             SkinManager.PostNotification = n => notifications.Post(n);
-            SkinManager.GetStableStorage = GetStorageForStableInstall;
 
             BeatmapManager.PostNotification = n => notifications.Post(n);
-            BeatmapManager.GetStableStorage = GetStorageForStableInstall;
             BeatmapManager.PresentImport = items => PresentBeatmap(items.First());
 
             ScoreManager.PostNotification = n => notifications.Post(n);
-            ScoreManager.GetStableStorage = GetStorageForStableInstall;
             ScoreManager.PresentImport = items => PresentScore(items.First());
 
             // make config aware of how to lookup skins for on-screen display purposes.
@@ -693,7 +690,6 @@ namespace osu.Game
             loadComponentSingleFile(new CollectionManager(Storage)
             {
                 PostNotification = n => notifications.Post(n),
-                GetStableStorage = GetStorageForStableInstall
             }, Add, true);
 
             loadComponentSingleFile(difficultyRecommender, Add);
diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
index d935bcf526..6065122545 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
         }
 
         protected override void OnSelection(DirectoryInfo directory)
-        { 
+        {
             taskCompletionSource.TrySetResult(directory.FullName);
             this.Exit();
         }

From e15e8068d3bd33170fd19497f2d2d3a4a73f8365 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Thu, 13 May 2021 12:09:37 +0200
Subject: [PATCH 3533/3722] Reword StableDirectoryLocationDialog.

Co-authored-by: Dean Herbert <pe@ppy.sh>
---
 .../Sections/Maintenance/StableDirectoryLocationDialog.cs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs
index 273ee5dc89..298f7d2433 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
         public StableDirectoryLocationDialog(TaskCompletionSource<string> taskCompletionSource)
         {
-            HeaderText = "Failed to automatically locate a stable installation.";
+            HeaderText = "Failed to automatically locate an osu!stable installation.";
             BodyText = "osu! failed to automatically locate a stable installation. Maybe you can tell osu! where it is located?";
             Icon = FontAwesome.Solid.QuestionCircle;
 

From f60dbbfbbd2b53cb0d1207b82333b89bbb77ceef Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Thu, 13 May 2021 12:10:26 +0200
Subject: [PATCH 3534/3722] Reword import dialogs.

Co-authored-by: Dean Herbert <pe@ppy.sh>
---
 .../Sections/Maintenance/StableDirectoryLocationDialog.cs       | 2 +-
 osu.Game/Screens/Select/ImportFromStablePopup.cs                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs
index 298f7d2433..904c9deaae 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectoryLocationDialog.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
         public StableDirectoryLocationDialog(TaskCompletionSource<string> taskCompletionSource)
         {
             HeaderText = "Failed to automatically locate an osu!stable installation.";
-            BodyText = "osu! failed to automatically locate a stable installation. Maybe you can tell osu! where it is located?";
+            BodyText = "An existing install could not be located. If you know where it is, you can help locate it.";
             Icon = FontAwesome.Solid.QuestionCircle;
 
             Buttons = new PopupDialogButton[]
diff --git a/osu.Game/Screens/Select/ImportFromStablePopup.cs b/osu.Game/Screens/Select/ImportFromStablePopup.cs
index e3a1505518..d8137432bd 100644
--- a/osu.Game/Screens/Select/ImportFromStablePopup.cs
+++ b/osu.Game/Screens/Select/ImportFromStablePopup.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Screens.Select
         public ImportFromStablePopup(Action importFromStable)
         {
             HeaderText = @"You have no beatmaps!";
-            BodyText = "You can import files from over a stable install, though.\nWould you like to import your beatmaps, skins, collections and scores?\nThis will create a second copy of all files on disk.";
+            BodyText = "Would you like to import your beatmaps, skins, collections and scores from an existing osu!stable installation?\nThis will create a second copy of all files on disk.";
 
             Icon = FontAwesome.Solid.Plane;
 

From bec06cfac7827423bbea001dd9cd5fd039b8bb09 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Thu, 13 May 2021 15:17:33 +0200
Subject: [PATCH 3535/3722] Reword `StableDirectoryLocationDialog` header

Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
---
 .../Sections/Maintenance/StableDirectorySelectScreen.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
index 6065122545..f7c7934c63 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
         protected override OsuSpriteText CreateHeader() => new OsuSpriteText
         {
-            Text = "Please select stable location",
+            Text = "Please select your osu!stable install location",
             Font = OsuFont.Default.With(size: 40)
         };
 

From 41fafdf643f1a3858907559ff4bddbc5fa538f00 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Fri, 14 May 2021 17:24:36 +0200
Subject: [PATCH 3536/3722] Remove now unreachable code paths.

---
 osu.Game/Collections/CollectionManager.cs | 6 ------
 osu.Game/Database/ArchiveModelManager.cs  | 6 ------
 2 files changed, 12 deletions(-)

diff --git a/osu.Game/Collections/CollectionManager.cs b/osu.Game/Collections/CollectionManager.cs
index e707b463cb..3a63587b30 100644
--- a/osu.Game/Collections/CollectionManager.cs
+++ b/osu.Game/Collections/CollectionManager.cs
@@ -99,12 +99,6 @@ namespace osu.Game.Collections
         /// </summary>
         public Task ImportFromStableAsync(StableStorage stableStorage)
         {
-            if (stableStorage == null)
-            {
-                Logger.Log("No osu!stable installation available!", LoggingTarget.Information, LogLevel.Error);
-                return Task.CompletedTask;
-            }
-
             if (!stableStorage.Exists(database_name))
             {
                 // This handles situations like when the user does not have a collections.db file
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 93e2880ba0..550daf36b5 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -689,12 +689,6 @@ namespace osu.Game.Database
         /// </summary>
         public Task ImportFromStableAsync(StableStorage stableStorage)
         {
-            if (stableStorage == null)
-            {
-                Logger.Log("No osu!stable installation available!", LoggingTarget.Information, LogLevel.Error);
-                return Task.CompletedTask;
-            }
-
             var storage = PrepareStableStorage(stableStorage);
 
             if (!storage.ExistsDirectory(ImportFromStablePath))

From fe11426238eaf2713414ddc63b0499df4c4b66ba Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 16 May 2021 15:35:44 +0200
Subject: [PATCH 3537/3722] Disable appearance of the stable import prompt
 waiting for user interaction in tests, which caused them to fail.

---
 .../Navigation/TestScenePerformFromScreen.cs  | 21 ++++++++++++-------
 osu.Game/Screens/Select/SongSelect.cs         |  4 +++-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs b/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs
index 2791952b66..078bb817f8 100644
--- a/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs
@@ -37,17 +37,17 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestPerformAtSongSelect()
         {
-            PushAndConfirm(() => new PlaySongSelect());
+            PushAndConfirm(() => new TestPlaySongSelect());
 
-            AddStep("perform immediately", () => Game.PerformFromScreen(_ => actionPerformed = true, new[] { typeof(PlaySongSelect) }));
+            AddStep("perform immediately", () => Game.PerformFromScreen(_ => actionPerformed = true, new[] { typeof(TestPlaySongSelect) }));
             AddAssert("did perform", () => actionPerformed);
-            AddAssert("screen didn't change", () => Game.ScreenStack.CurrentScreen is PlaySongSelect);
+            AddAssert("screen didn't change", () => Game.ScreenStack.CurrentScreen is TestPlaySongSelect);
         }
 
         [Test]
         public void TestPerformAtMenuFromSongSelect()
         {
-            PushAndConfirm(() => new PlaySongSelect());
+            PushAndConfirm(() => new TestPlaySongSelect());
 
             AddStep("try to perform", () => Game.PerformFromScreen(_ => actionPerformed = true));
             AddUntilStep("returned to menu", () => Game.ScreenStack.CurrentScreen is MainMenu);
@@ -57,18 +57,18 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestPerformAtSongSelectFromPlayerLoader()
         {
-            PushAndConfirm(() => new PlaySongSelect());
+            PushAndConfirm(() => new TestPlaySongSelect());
             PushAndConfirm(() => new PlayerLoader(() => new SoloPlayer()));
 
-            AddStep("try to perform", () => Game.PerformFromScreen(_ => actionPerformed = true, new[] { typeof(PlaySongSelect) }));
-            AddUntilStep("returned to song select", () => Game.ScreenStack.CurrentScreen is PlaySongSelect);
+            AddStep("try to perform", () => Game.PerformFromScreen(_ => actionPerformed = true, new[] { typeof(TestPlaySongSelect) }));
+            AddUntilStep("returned to song select", () => Game.ScreenStack.CurrentScreen is TestPlaySongSelect);
             AddAssert("did perform", () => actionPerformed);
         }
 
         [Test]
         public void TestPerformAtMenuFromPlayerLoader()
         {
-            PushAndConfirm(() => new PlaySongSelect());
+            PushAndConfirm(() => new TestPlaySongSelect());
             PushAndConfirm(() => new PlayerLoader(() => new SoloPlayer()));
 
             AddStep("try to perform", () => Game.PerformFromScreen(_ => actionPerformed = true));
@@ -187,5 +187,10 @@ namespace osu.Game.Tests.Visual.Navigation
                 return base.OnExiting(next);
             }
         }
+
+        public class TestPlaySongSelect : PlaySongSelect
+        {
+            protected override bool DisplayStableImportPrompt => false;
+        }
     }
 }
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index d8ad752151..5a48ee7606 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -51,6 +51,8 @@ namespace osu.Game.Screens.Select
 
         protected virtual bool ShowFooter => true;
 
+        protected virtual bool DisplayStableImportPrompt => true;
+
         /// <summary>
         /// Can be null if <see cref="ShowFooter"/> is false.
         /// </summary>
@@ -282,7 +284,7 @@ namespace osu.Game.Screens.Select
                 Schedule(() =>
                 {
                     // if we have no beatmaps, let's prompt the user to import from over a stable install if he has one.
-                    if (!beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.Minimal).Any() && stableImportManager.SupportsImportFromStable)
+                    if (!beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.Minimal).Any() && stableImportManager.SupportsImportFromStable && DisplayStableImportPrompt)
                     {
                         dialogOverlay.Push(new ImportFromStablePopup(() =>
                         {

From ed4c025c7e79669b198eb331e8d6fcc20ec04a9e Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 16 May 2021 17:14:23 +0200
Subject: [PATCH 3538/3722] Fix other tests and move TestPlaySongSelect class
 declaration.

---
 .../Navigation/TestScenePerformFromScreen.cs  |  7 +---
 .../Navigation/TestSceneScreenNavigation.cs   | 34 ++++++++++---------
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs b/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs
index 078bb817f8..3cedaf9d45 100644
--- a/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs
@@ -11,8 +11,8 @@ using osu.Game.Overlays;
 using osu.Game.Screens;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.Play;
-using osu.Game.Screens.Select;
 using osuTK.Input;
+using static osu.Game.Tests.Visual.Navigation.TestSceneScreenNavigation;
 
 namespace osu.Game.Tests.Visual.Navigation
 {
@@ -187,10 +187,5 @@ namespace osu.Game.Tests.Visual.Navigation
                 return base.OnExiting(next);
             }
         }
-
-        public class TestPlaySongSelect : PlaySongSelect
-        {
-            protected override bool DisplayStableImportPrompt => false;
-        }
     }
 }
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index 859cefe3a9..253e448bb4 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -34,9 +34,9 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestExitSongSelectWithEscape()
         {
-            TestSongSelect songSelect = null;
+            TestPlaySongSelect songSelect = null;
 
-            PushAndConfirm(() => songSelect = new TestSongSelect());
+            PushAndConfirm(() => songSelect = new TestPlaySongSelect());
             AddStep("Show mods overlay", () => songSelect.ModSelectOverlay.Show());
             AddAssert("Overlay was shown", () => songSelect.ModSelectOverlay.State.Value == Visibility.Visible);
             pushEscape();
@@ -51,9 +51,9 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestOpenModSelectOverlayUsingAction()
         {
-            TestSongSelect songSelect = null;
+            TestPlaySongSelect songSelect = null;
 
-            PushAndConfirm(() => songSelect = new TestSongSelect());
+            PushAndConfirm(() => songSelect = new TestPlaySongSelect());
             AddStep("Show mods overlay", () => InputManager.Key(Key.F1));
             AddAssert("Overlay was shown", () => songSelect.ModSelectOverlay.State.Value == Visibility.Visible);
         }
@@ -63,7 +63,7 @@ namespace osu.Game.Tests.Visual.Navigation
         {
             Player player = null;
 
-            PushAndConfirm(() => new TestSongSelect());
+            PushAndConfirm(() => new TestPlaySongSelect());
 
             AddStep("import beatmap", () => ImportBeatmapTest.LoadQuickOszIntoOsu(Game).Wait());
 
@@ -89,7 +89,7 @@ namespace osu.Game.Tests.Visual.Navigation
 
             WorkingBeatmap beatmap() => Game.Beatmap.Value;
 
-            PushAndConfirm(() => new TestSongSelect());
+            PushAndConfirm(() => new TestPlaySongSelect());
 
             AddStep("import beatmap", () => ImportBeatmapTest.LoadQuickOszIntoOsu(Game).Wait());
 
@@ -113,7 +113,7 @@ namespace osu.Game.Tests.Visual.Navigation
 
             WorkingBeatmap beatmap() => Game.Beatmap.Value;
 
-            PushAndConfirm(() => new TestSongSelect());
+            PushAndConfirm(() => new TestPlaySongSelect());
 
             AddStep("import beatmap", () => ImportBeatmapTest.LoadOszIntoOsu(Game, virtualTrack: true).Wait());
 
@@ -139,9 +139,9 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestMenuMakesMusic()
         {
-            TestSongSelect songSelect = null;
+            TestPlaySongSelect songSelect = null;
 
-            PushAndConfirm(() => songSelect = new TestSongSelect());
+            PushAndConfirm(() => songSelect = new TestPlaySongSelect());
 
             AddUntilStep("wait for no track", () => Game.MusicController.CurrentTrack.IsDummyDevice);
 
@@ -153,9 +153,9 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestExitSongSelectWithClick()
         {
-            TestSongSelect songSelect = null;
+            TestPlaySongSelect songSelect = null;
 
-            PushAndConfirm(() => songSelect = new TestSongSelect());
+            PushAndConfirm(() => songSelect = new TestPlaySongSelect());
             AddStep("Show mods overlay", () => songSelect.ModSelectOverlay.Show());
             AddAssert("Overlay was shown", () => songSelect.ModSelectOverlay.State.Value == Visibility.Visible);
             AddStep("Move mouse to backButton", () => InputManager.MoveMouseTo(backButtonPosition));
@@ -213,9 +213,9 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestModSelectInput()
         {
-            TestSongSelect songSelect = null;
+            TestPlaySongSelect songSelect = null;
 
-            PushAndConfirm(() => songSelect = new TestSongSelect());
+            PushAndConfirm(() => songSelect = new TestPlaySongSelect());
 
             AddStep("Show mods overlay", () => songSelect.ModSelectOverlay.Show());
 
@@ -234,9 +234,9 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestBeatmapOptionsInput()
         {
-            TestSongSelect songSelect = null;
+            TestPlaySongSelect songSelect = null;
 
-            PushAndConfirm(() => songSelect = new TestSongSelect());
+            PushAndConfirm(() => songSelect = new TestPlaySongSelect());
 
             AddStep("Show options overlay", () => songSelect.BeatmapOptionsOverlay.Show());
 
@@ -312,11 +312,13 @@ namespace osu.Game.Tests.Visual.Navigation
             ConfirmAtMainMenu();
         }
 
-        private class TestSongSelect : PlaySongSelect
+        public class TestPlaySongSelect : PlaySongSelect
         {
             public ModSelectOverlay ModSelectOverlay => ModSelect;
 
             public BeatmapOptionsOverlay BeatmapOptionsOverlay => BeatmapOptions;
+
+            protected override bool DisplayStableImportPrompt => false;
         }
     }
 }

From db255e6814fa463c2a69893bde37cbcde0b58576 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 16 May 2021 17:49:49 +0200
Subject: [PATCH 3539/3722] Mark StableImportManager as potentially null in
 tests. (StableImportManager is added to the DI in OsuGame and not in the
 OsuGameBase)

---
 .../Settings/Sections/Maintenance/GeneralSettings.cs   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
index 9bd360679e..20fc0e962a 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
@@ -30,9 +30,9 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
         private TriangleButton undeleteButton;
 
         [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(BeatmapManager beatmaps, ScoreManager scores, SkinManager skins, [CanBeNull] CollectionManager collectionManager, StableImportManager stableImportManager, DialogOverlay dialogOverlay)
+        private void load(BeatmapManager beatmaps, ScoreManager scores, SkinManager skins, [CanBeNull] CollectionManager collectionManager, [CanBeNull] StableImportManager stableImportManager, DialogOverlay dialogOverlay)
         {
-            if (stableImportManager.SupportsImportFromStable)
+            if (stableImportManager?.SupportsImportFromStable ?? false)
             {
                 Add(importBeatmapsButton = new SettingsButton
                 {
@@ -58,7 +58,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                 }
             });
 
-            if (stableImportManager.SupportsImportFromStable)
+            if (stableImportManager?.SupportsImportFromStable ?? false)
             {
                 Add(importScoresButton = new SettingsButton
                 {
@@ -84,7 +84,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                 }
             });
 
-            if (stableImportManager.SupportsImportFromStable)
+            if (stableImportManager?.SupportsImportFromStable ?? false)
             {
                 Add(importSkinsButton = new SettingsButton
                 {
@@ -112,7 +112,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
             if (collectionManager != null)
             {
-                if (stableImportManager.SupportsImportFromStable)
+                if (stableImportManager?.SupportsImportFromStable ?? false)
                 {
                     Add(importCollectionsButton = new SettingsButton
                     {

From a38fc1a2e0bff4bcd36e34e926be4c98d3fcf7e3 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 17 May 2021 13:04:49 +0200
Subject: [PATCH 3540/3722] Override text header.

---
 .../Sections/Maintenance/StableDirectorySelectScreen.cs  | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
index f7c7934c63..4ea53a3fc1 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
@@ -4,9 +4,8 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
+using osu.Framework.Localisation;
 using osu.Framework.Screens;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Overlays.Settings.Sections.Maintenance
 {
@@ -16,11 +15,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
         protected override bool IsValidDirectory(DirectoryInfo info) => info?.GetFiles("osu!.*.cfg").Any() ?? false;
 
-        protected override OsuSpriteText CreateHeader() => new OsuSpriteText
-        {
-            Text = "Please select your osu!stable install location",
-            Font = OsuFont.Default.With(size: 40)
-        };
+        public override LocalisableString HeaderText => "Please select your osu!stable install location";
 
         public StableDirectorySelectScreen(TaskCompletionSource<string> taskCompletionSource)
         {

From 5ca4fd5ab4f53c61f88a4900b97c6c4150fb43b0 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 17 May 2021 13:28:59 +0200
Subject: [PATCH 3541/3722] Block overlays to prevent getting into a bad state.

---
 .../Sections/Maintenance/StableDirectorySelectScreen.cs     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
index 4ea53a3fc1..4aea05fb14 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/StableDirectorySelectScreen.cs
@@ -13,6 +13,8 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
     {
         private readonly TaskCompletionSource<string> taskCompletionSource;
 
+        protected override OverlayActivation InitialOverlayActivationMode => OverlayActivation.Disabled;
+
         protected override bool IsValidDirectory(DirectoryInfo info) => info?.GetFiles("osu!.*.cfg").Any() ?? false;
 
         public override LocalisableString HeaderText => "Please select your osu!stable install location";
@@ -28,10 +30,10 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
             this.Exit();
         }
 
-        public override bool OnBackButton()
+        public override bool OnExiting(IScreen next)
         {
             taskCompletionSource.TrySetCanceled();
-            return base.OnBackButton();
+            return base.OnExiting(next);
         }
     }
 }

From 6110a847aa82a2e0dd5c0bf90aa8c1db6bee1399 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 17 May 2021 16:30:13 +0200
Subject: [PATCH 3542/3722] Simplify import ordering logic by making
 beatmapImportTask non-nullable.

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

diff --git a/osu.Game/Database/StableImportManager.cs b/osu.Game/Database/StableImportManager.cs
index 6f8225519d..67f91d3bdb 100644
--- a/osu.Game/Database/StableImportManager.cs
+++ b/osu.Game/Database/StableImportManager.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Database
             var stableStorage = await getStableStorage().ConfigureAwait(false);
             var importTasks = new List<Task>();
 
-            Task beatmapImportTask = default;
+            Task beatmapImportTask = Task.CompletedTask;
             if (content.HasFlagFast(StableContent.Beatmaps))
                 importTasks.Add(beatmapImportTask = beatmaps.ImportFromStableAsync(stableStorage));
 
@@ -59,16 +59,10 @@ namespace osu.Game.Database
                 importTasks.Add(skins.ImportFromStableAsync(stableStorage));
 
             if (content.HasFlagFast(StableContent.Collections))
-            {
-                importTasks.Add(beatmapImportTask?.ContinueWith(_ => collections.ImportFromStableAsync(stableStorage), TaskContinuationOptions.OnlyOnRanToCompletion)
-                                ?? collections.ImportFromStableAsync(stableStorage));
-            }
+                importTasks.Add(beatmapImportTask.ContinueWith(_ => collections.ImportFromStableAsync(stableStorage), TaskContinuationOptions.OnlyOnRanToCompletion));
 
             if (content.HasFlagFast(StableContent.Scores))
-            {
-                importTasks.Add(beatmapImportTask?.ContinueWith(_ => scores.ImportFromStableAsync(stableStorage), TaskContinuationOptions.OnlyOnRanToCompletion)
-                                ?? scores.ImportFromStableAsync(stableStorage));
-            }
+                importTasks.Add(beatmapImportTask.ContinueWith(_ => scores.ImportFromStableAsync(stableStorage), TaskContinuationOptions.OnlyOnRanToCompletion));
 
             await Task.WhenAll(importTasks.ToArray()).ConfigureAwait(false);
         }

From 97952bc3f0fd105535999cd47a3f280640fa4c73 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 17 May 2021 18:39:04 +0200
Subject: [PATCH 3543/3722] Fix backwards stable install resolution logic.

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

diff --git a/osu.Game/Database/StableImportManager.cs b/osu.Game/Database/StableImportManager.cs
index 67f91d3bdb..331764f274 100644
--- a/osu.Game/Database/StableImportManager.cs
+++ b/osu.Game/Database/StableImportManager.cs
@@ -69,13 +69,13 @@ namespace osu.Game.Database
 
         private async Task<StableStorage> getStableStorage()
         {
-            var stableStorage = game.GetStorageForStableInstall();
-            if (stableStorage != null)
-                return stableStorage;
-
             if (cachedStorage != null)
                 return cachedStorage;
 
+            var stableStorage = game.GetStorageForStableInstall();
+            if (stableStorage != null)
+                return cachedStorage = stableStorage;
+
             var taskCompletionSource = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
             Schedule(() => dialogOverlay.Push(new StableDirectoryLocationDialog(taskCompletionSource)));
             var stablePath = await taskCompletionSource.Task.ConfigureAwait(false);

From 7befcf74ffbb54fc4783d22f9235667db6c0e1c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 17 May 2021 18:53:09 +0200
Subject: [PATCH 3544/3722] Split value change callbacks out to separate
 methods

---
 .../Overlays/News/Sidebar/MonthSection.cs     | 36 ++++++++++---------
 osu.Game/Overlays/News/Sidebar/YearsPanel.cs  | 28 ++++++++-------
 2 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/MonthSection.cs b/osu.Game/Overlays/News/Sidebar/MonthSection.cs
index 20c4d2e83e..77f09b750d 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthSection.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthSection.cs
@@ -153,28 +153,30 @@ namespace osu.Game.Overlays.News.Sidebar
             {
                 base.LoadComplete();
 
-                IsOpen.BindValueChanged(open =>
-                {
-                    ClearTransforms(true);
-
-                    if (open.NewValue)
-                    {
-                        AutoSizeAxes = Axes.Y;
-                        content.FadeIn(animation_duration, Easing.OutQuint);
-                    }
-                    else
-                    {
-                        AutoSizeAxes = Axes.None;
-                        this.ResizeHeightTo(0, animation_duration, Easing.OutQuint);
-
-                        content.FadeOut(animation_duration, Easing.OutQuint);
-                    }
-                }, true);
+                IsOpen.BindValueChanged(_ => updateState(), true);
 
                 // First state change should be instant.
                 FinishTransforms(true);
             }
 
+            private void updateState()
+            {
+                ClearTransforms(true);
+
+                if (IsOpen.Value)
+                {
+                    AutoSizeAxes = Axes.Y;
+                    content.FadeIn(animation_duration, Easing.OutQuint);
+                }
+                else
+                {
+                    AutoSizeAxes = Axes.None;
+                    this.ResizeHeightTo(0, animation_duration, Easing.OutQuint);
+
+                    content.FadeOut(animation_duration, Easing.OutQuint);
+                }
+            }
+
             private bool shouldUpdateAutosize = true;
 
             // Workaround to allow the dropdown to be opened immediately since FinishTransforms doesn't work for AutosizeDuration.
diff --git a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
index ffdb5cf22e..849cdbf659 100644
--- a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
@@ -56,23 +56,25 @@ namespace osu.Game.Overlays.News.Sidebar
         {
             base.LoadComplete();
 
-            metadata.BindValueChanged(m =>
+            metadata.BindValueChanged(_ => recreateDrawables(), true);
+        }
+
+        private void recreateDrawables()
+        {
+            yearsFlow.Clear();
+
+            if (metadata.Value == null)
             {
-                yearsFlow.Clear();
+                Hide();
+                return;
+            }
 
-                if (m.NewValue == null)
-                {
-                    Hide();
-                    return;
-                }
+            var currentYear = metadata.Value.CurrentYear;
 
-                var currentYear = m.NewValue.CurrentYear;
+            foreach (var y in metadata.Value.Years)
+                yearsFlow.Add(new YearButton(y, y == currentYear));
 
-                foreach (var y in m.NewValue.Years)
-                    yearsFlow.Add(new YearButton(y, y == currentYear));
-
-                Show();
-            }, true);
+            Show();
         }
 
         public class YearButton : OsuHoverContainer

From d614a47614218d9a6bc1406736ced7e2937d41e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 17 May 2021 18:54:17 +0200
Subject: [PATCH 3545/3722] Rename variable to better explain purpose

---
 osu.Game/Overlays/News/Sidebar/MonthSection.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/MonthSection.cs b/osu.Game/Overlays/News/Sidebar/MonthSection.cs
index 77f09b750d..166da97f93 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthSection.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthSection.cs
@@ -177,19 +177,19 @@ namespace osu.Game.Overlays.News.Sidebar
                 }
             }
 
-            private bool shouldUpdateAutosize = true;
+            private bool autoSizeTransitionApplied;
 
-            // Workaround to allow the dropdown to be opened immediately since FinishTransforms doesn't work for AutosizeDuration.
+            // Workaround to allow the dropdown to be opened immediately since FinishTransforms doesn't work for AutoSize{Duration,Easing}.
             protected override void UpdateAfterAutoSize()
             {
                 base.UpdateAfterAutoSize();
 
-                if (shouldUpdateAutosize)
+                if (!autoSizeTransitionApplied)
                 {
                     AutoSizeDuration = animation_duration;
                     AutoSizeEasing = Easing.OutQuint;
 
-                    shouldUpdateAutosize = false;
+                    autoSizeTransitionApplied = true;
                 }
             }
         }

From 400984457ca08221dbb99178fc6dcba920311a43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 17 May 2021 19:16:30 +0200
Subject: [PATCH 3546/3722] Fix weird behaviour in test scene

Due to a callback set up in another place, clicking away from the 2022
year after launching the test scene would remove the 2022 button
(because the callback was returning metadata without it). For simplicity
just trim the 2022 year to make sure both test scenes use the same
consistent set of years.
---
 osu.Game.Tests/Visual/Online/TestSceneNewsSidebar.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsSidebar.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsSidebar.cs
index 376c270689..6cd3bd7d51 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsSidebar.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsSidebar.cs
@@ -110,10 +110,9 @@ namespace osu.Game.Tests.Visual.Online
 
         private static readonly APINewsSidebar metadata_with_no_posts = new APINewsSidebar
         {
-            CurrentYear = 2022,
+            CurrentYear = 2021,
             Years = new[]
             {
-                2022,
                 2021,
                 2020,
                 2019,

From e2018f81f3c2f59d46e9261b0518d01677277625 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 17 May 2021 19:54:21 +0200
Subject: [PATCH 3547/3722] Use equality check for nullable types.

---
 .../Settings/Sections/Maintenance/GeneralSettings.cs      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
index 20fc0e962a..a38ca81e23 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
         [BackgroundDependencyLoader(permitNulls: true)]
         private void load(BeatmapManager beatmaps, ScoreManager scores, SkinManager skins, [CanBeNull] CollectionManager collectionManager, [CanBeNull] StableImportManager stableImportManager, DialogOverlay dialogOverlay)
         {
-            if (stableImportManager?.SupportsImportFromStable ?? false)
+            if (stableImportManager?.SupportsImportFromStable == true)
             {
                 Add(importBeatmapsButton = new SettingsButton
                 {
@@ -58,7 +58,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                 }
             });
 
-            if (stableImportManager?.SupportsImportFromStable ?? false)
+            if (stableImportManager?.SupportsImportFromStable == true)
             {
                 Add(importScoresButton = new SettingsButton
                 {
@@ -84,7 +84,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                 }
             });
 
-            if (stableImportManager?.SupportsImportFromStable ?? false)
+            if (stableImportManager?.SupportsImportFromStable == true)
             {
                 Add(importSkinsButton = new SettingsButton
                 {
@@ -112,7 +112,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
 
             if (collectionManager != null)
             {
-                if (stableImportManager?.SupportsImportFromStable ?? false)
+                if (stableImportManager?.SupportsImportFromStable == true)
                 {
                     Add(importCollectionsButton = new SettingsButton
                     {

From 8530b31e39ca3eb5d6e275cc5f88ae9d5baf8efa Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 17 May 2021 21:02:45 +0200
Subject: [PATCH 3548/3722] Use bitshifts for enum values instead of literal
 values.

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

diff --git a/osu.Game/Database/StableImportManager.cs b/osu.Game/Database/StableImportManager.cs
index 331764f274..63a6db35c0 100644
--- a/osu.Game/Database/StableImportManager.cs
+++ b/osu.Game/Database/StableImportManager.cs
@@ -87,10 +87,10 @@ namespace osu.Game.Database
     [Flags]
     public enum StableContent
     {
-        Beatmaps = 1,
-        Scores = 2,
-        Skins = 4,
-        Collections = 8,
+        Beatmaps = 1 << 0,
+        Scores = 1 << 1,
+        Skins = 1 << 2,
+        Collections = 1 << 3,
         All = Beatmaps | Scores | Skins | Collections
     }
 }

From 79740dd2d8f70645becc7edf5134b3ee3a7041f2 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 17 May 2021 22:01:05 +0200
Subject: [PATCH 3549/3722] Merge conditionnal expression.

---
 osu.Game/Screens/Select/SongSelect.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 5a48ee7606..729e25203f 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Screens.Select
 
         protected virtual bool ShowFooter => true;
 
-        protected virtual bool DisplayStableImportPrompt => true;
+        protected virtual bool DisplayStableImportPrompt => stableImportManager.SupportsImportFromStable;
 
         /// <summary>
         /// Can be null if <see cref="ShowFooter"/> is false.
@@ -85,6 +85,9 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 
+        [Resolved]
+        private StableImportManager stableImportManager { get; set; }
+
         protected ModSelectOverlay ModSelect { get; private set; }
 
         protected Sample SampleConfirm { get; private set; }
@@ -102,7 +105,7 @@ namespace osu.Game.Screens.Select
         private MusicController music { get; set; }
 
         [BackgroundDependencyLoader(true)]
-        private void load(AudioManager audio, DialogOverlay dialog, OsuColour colours, StableImportManager stableImportManager, ManageCollectionsDialog manageCollectionsDialog, DifficultyRecommender recommender)
+        private void load(AudioManager audio, DialogOverlay dialog, OsuColour colours, ManageCollectionsDialog manageCollectionsDialog, DifficultyRecommender recommender)
         {
             // initial value transfer is required for FilterControl (it uses our re-cached bindables in its async load for the initial filter).
             transferRulesetValue();
@@ -284,7 +287,7 @@ namespace osu.Game.Screens.Select
                 Schedule(() =>
                 {
                     // if we have no beatmaps, let's prompt the user to import from over a stable install if he has one.
-                    if (!beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.Minimal).Any() && stableImportManager.SupportsImportFromStable && DisplayStableImportPrompt)
+                    if (!beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.Minimal).Any() && DisplayStableImportPrompt)
                     {
                         dialogOverlay.Push(new ImportFromStablePopup(() =>
                         {

From 9d423245d8b797f6adad68afd718bda103202d19 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 18 May 2021 13:02:23 +0900
Subject: [PATCH 3550/3722] Fix up xmldocs
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/Edit/SelectionBlueprint.cs                   | 2 +-
 osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
index f59ad8bfa2..c7df2d1a76 100644
--- a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
@@ -105,7 +105,7 @@ namespace osu.Game.Rulesets.Edit
         protected override bool ShouldBeConsideredForInput(Drawable child) => State == SelectionState.Selected;
 
         /// <summary>
-        /// Selects this <see cref="HitObjectSelectionBlueprint"/>, causing it to become visible.
+        /// Selects this <see cref="SelectionBlueprint"/>, causing it to become visible.
         /// </summary>
         public void Select() => State = SelectionState.Selected;
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs b/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
index e32dcc81ee..8a052299ce 100644
--- a/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
@@ -7,7 +7,7 @@ using osuTK;
 namespace osu.Game.Screens.Edit.Compose.Components
 {
     /// <summary>
-    /// An event which occurs when a <see cref="HitObjectSelectionBlueprint"/> is moved.
+    /// An event which occurs when a <see cref="SelectionBlueprint"/> is moved.
     /// </summary>
     public class MoveSelectionEvent<T>
     {

From 06389c08dc19287fdece6019170de4257365e7d6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 May 2021 13:11:22 +0900
Subject: [PATCH 3551/3722] Add basic test to show data how one would expect it
 to be displayed

---
 osu.Game.Tests/Visual/Online/TestSceneNewsSidebar.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsSidebar.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsSidebar.cs
index 6cd3bd7d51..b000553a7b 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsSidebar.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsSidebar.cs
@@ -24,11 +24,18 @@ namespace osu.Game.Tests.Visual.Online
         [SetUp]
         public void SetUp() => Schedule(() => Child = sidebar = new TestNewsSidebar { YearChanged = onYearChanged });
 
+        [Test]
+        public void TestBasic()
+        {
+            AddStep("Add metadata", () => sidebar.Metadata.Value = getMetadata(2021));
+            AddUntilStep("Month sections exist", () => sidebar.ChildrenOfType<MonthSection>().Any());
+        }
+
         [Test]
         public void TestMetadataWithNoPosts()
         {
             AddStep("Add data with no posts", () => sidebar.Metadata.Value = metadata_with_no_posts);
-            AddUntilStep("No dropdowns were created", () => !sidebar.ChildrenOfType<MonthSection>().Any());
+            AddUntilStep("No month sections were created", () => !sidebar.ChildrenOfType<MonthSection>().Any());
         }
 
         [Test]
@@ -134,7 +141,7 @@ namespace osu.Game.Tests.Visual.Online
             {
                 base.LoadComplete();
 
-                Metadata.BindValueChanged(m =>
+                Metadata.BindValueChanged(metadata =>
                 {
                     foreach (var b in this.ChildrenOfType<YearButton>())
                         b.Action = () => YearChanged?.Invoke(b.Year);

From f1f3606fd0ce9e4fea87b72faa1b2697b226ab45 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 May 2021 13:11:58 +0900
Subject: [PATCH 3552/3722] Fix unresolved xmldocs

---
 osu.Game/Rulesets/Edit/SelectionBlueprint.cs                   | 2 +-
 osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
index c7df2d1a76..12ab89f79e 100644
--- a/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/SelectionBlueprint.cs
@@ -105,7 +105,7 @@ namespace osu.Game.Rulesets.Edit
         protected override bool ShouldBeConsideredForInput(Drawable child) => State == SelectionState.Selected;
 
         /// <summary>
-        /// Selects this <see cref="SelectionBlueprint"/>, causing it to become visible.
+        /// Selects this <see cref="SelectionBlueprint{T}"/>, causing it to become visible.
         /// </summary>
         public void Select() => State = SelectionState.Selected;
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs b/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
index 8a052299ce..2b71bb2f16 100644
--- a/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/MoveSelectionEvent.cs
@@ -7,7 +7,7 @@ using osuTK;
 namespace osu.Game.Screens.Edit.Compose.Components
 {
     /// <summary>
-    /// An event which occurs when a <see cref="SelectionBlueprint"/> is moved.
+    /// An event which occurs when a <see cref="SelectionBlueprint{T}"/> is moved.
     /// </summary>
     public class MoveSelectionEvent<T>
     {

From c71d53a0f9ce174dc65640879df256a55397b1c3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 May 2021 13:40:26 +0900
Subject: [PATCH 3553/3722] Fix text and button layout

---
 .../Maintenance/DirectorySelectScreen.cs      | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
index e7c69e89fe..349a112477 100644
--- a/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
+++ b/osu.Game/Overlays/Settings/Sections/Maintenance/DirectorySelectScreen.cs
@@ -11,9 +11,9 @@ using osuTK;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Localisation;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Framework.Screens;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays.Settings.Sections.Maintenance
 {
@@ -69,20 +69,24 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                         RelativeSizeAxes = Axes.Both,
                         RowDimensions = new[]
                         {
+                            new Dimension(GridSizeMode.AutoSize),
                             new Dimension(),
-                            new Dimension(GridSizeMode.Relative, 0.8f),
-                            new Dimension(),
+                            new Dimension(GridSizeMode.AutoSize),
                         },
                         Content = new[]
                         {
                             new Drawable[]
                             {
-                                new OsuSpriteText
+                                new OsuTextFlowContainer(cp =>
                                 {
-                                    Text = HeaderText,
-                                    Font = OsuFont.Default.With(size: 40),
-                                    Origin = Anchor.Centre,
-                                    Anchor = Anchor.Centre,
+                                    cp.Font = OsuFont.Default.With(size: 24);
+                                })
+                                {
+                                    Text = HeaderText.ToString(),
+                                    TextAnchor = Anchor.TopCentre,
+                                    Margin = new MarginPadding(10),
+                                    RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
                                 }
                             },
                             new Drawable[]
@@ -99,6 +103,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
                                     Anchor = Anchor.Centre,
                                     Origin = Anchor.Centre,
                                     Width = 300,
+                                    Margin = new MarginPadding(10),
                                     Text = "Select directory",
                                     Action = () => OnSelection(directorySelector.CurrentPath.Value)
                                 },

From e621cfc4ea6f3656ac47cca8ad61204e09cab8c4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 May 2021 14:14:10 +0900
Subject: [PATCH 3554/3722] Add Apply() method for applying new DHOs

---
 .../Blueprints/HoldNoteSelectionBlueprint.cs  | 21 ++++++++++++-------
 .../Sliders/SliderSelectionBlueprint.cs       |  9 ++++++++
 .../Edit/HitObjectSelectionBlueprint.cs       | 20 +++++++++++++++++-
 .../Components/ComposeBlueprintContainer.cs   |  2 +-
 .../Visual/SelectionBlueprintTestScene.cs     |  2 +-
 5 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs
index c7ee6097c6..ac821e504c 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
 using osuTK;
 
@@ -21,6 +22,9 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
+        private HoldNoteNoteSelectionBlueprint headBlueprint;
+        private HoldNoteNoteSelectionBlueprint tailBlueprint;
+
         [Resolved]
         private OsuColour colours { get; set; }
 
@@ -33,16 +37,11 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         private void load(IScrollingInfo scrollingInfo)
         {
             direction.BindTo(scrollingInfo.Direction);
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
 
             InternalChildren = new Drawable[]
             {
-                new HoldNoteNoteSelectionBlueprint(HitObject, HoldNotePosition.Start),
-                new HoldNoteNoteSelectionBlueprint(HitObject, HoldNotePosition.End),
+                headBlueprint = new HoldNoteNoteSelectionBlueprint(HitObject, HoldNotePosition.Start),
+                tailBlueprint = new HoldNoteNoteSelectionBlueprint(HitObject, HoldNotePosition.End),
                 new Container
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -59,6 +58,14 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             };
         }
 
+        public override void Apply(DrawableHitObject drawableObject)
+        {
+            base.Apply(drawableObject);
+
+            headBlueprint?.Apply(drawableObject);
+            tailBlueprint?.Apply(drawableObject);
+        }
+
         protected override void Update()
         {
             base.Update();
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 939f4cdc3e..21945853a8 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -14,6 +14,7 @@ using osu.Framework.Input.Events;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit;
@@ -77,6 +78,14 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             BodyPiece.UpdateFrom(HitObject);
         }
 
+        public override void Apply(DrawableHitObject drawableObject)
+        {
+            base.Apply(drawableObject);
+
+            HeadBlueprint?.Apply(drawableObject);
+            TailBlueprint?.Apply(drawableObject);
+        }
+
         public override bool HandleQuickDeletion()
         {
             var hoveredControlPoint = ControlPointVisualiser?.Pieces.FirstOrDefault(p => p.IsHovered);
diff --git a/osu.Game/Rulesets/Edit/HitObjectSelectionBlueprint.cs b/osu.Game/Rulesets/Edit/HitObjectSelectionBlueprint.cs
index 56434b1d82..6e9172c822 100644
--- a/osu.Game/Rulesets/Edit/HitObjectSelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectSelectionBlueprint.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Edit
         /// <summary>
         /// The <see cref="DrawableHitObject"/> which this <see cref="HitObjectSelectionBlueprint"/> applies to.
         /// </summary>
-        public DrawableHitObject DrawableObject { get; internal set; }
+        public virtual DrawableHitObject DrawableObject { get; private set; }
 
         /// <summary>
         /// Whether the blueprint should be shown even when the <see cref="DrawableObject"/> is not alive.
@@ -28,6 +28,24 @@ namespace osu.Game.Rulesets.Edit
         {
         }
 
+        protected override void LoadAsyncComplete()
+        {
+            // Must be done before base.LoadAsyncComplete() as this may affect children.
+            Apply(DrawableObject);
+
+            base.LoadAsyncComplete();
+        }
+
+        /// <summary>
+        /// Applies a <see cref="DrawableHitObject"/> to this <see cref="HitObjectSelectionBlueprint"/>.
+        /// The represented <see cref="HitObject"/> model does not change.
+        /// </summary>
+        /// <param name="drawableObject">The new <see cref="DrawableHitObject"/>.</param>
+        public virtual void Apply(DrawableHitObject drawableObject)
+        {
+            DrawableObject = drawableObject;
+        }
+
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => DrawableObject.ReceivePositionalInputAt(screenSpacePos);
 
         public override Vector2 ScreenSpaceSelectionPoint => DrawableObject.ScreenSpaceDrawQuad.Centre;
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 95f4069edb..b3773b9ec1 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -245,7 +245,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (drawable == null)
                 return null;
 
-            return CreateHitObjectBlueprintFor(item).With(b => b.DrawableObject = drawable);
+            return CreateHitObjectBlueprintFor(item).With(b => b.Apply(drawable));
         }
 
         public virtual HitObjectSelectionBlueprint CreateHitObjectBlueprintFor(HitObject hitObject) => null;
diff --git a/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs b/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs
index dc12a4999d..b518465c40 100644
--- a/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs
+++ b/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Visual
         {
             Add(blueprint.With(d =>
             {
-                d.DrawableObject = drawableObject;
+                d.Apply(drawableObject);
                 d.Depth = float.MinValue;
                 d.Select();
             }));

From 532c41c82eb8f0640f6ac58f24f00623784c9371 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 May 2021 14:19:11 +0900
Subject: [PATCH 3555/3722] Remove nested blueprints from sliders

---
 .../TestSceneSliderControlPointPiece.cs       | 10 +++++-----
 .../TestSceneSliderSelectionBlueprint.cs      | 14 +++++++-------
 ...ionBlueprint.cs => SliderCircleOverlay.cs} | 17 +++++++----------
 .../Sliders/SliderSelectionBlueprint.cs       | 19 +++++--------------
 4 files changed, 24 insertions(+), 36 deletions(-)
 rename osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/{SliderCircleSelectionBlueprint.cs => SliderCircleOverlay.cs} (53%)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
index fe0f2f8a87..24b947c854 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderControlPointPiece.cs
@@ -150,8 +150,8 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         private class TestSliderBlueprint : SliderSelectionBlueprint
         {
             public new SliderBodyPiece BodyPiece => base.BodyPiece;
-            public new TestSliderCircleBlueprint HeadBlueprint => (TestSliderCircleBlueprint)base.HeadBlueprint;
-            public new TestSliderCircleBlueprint TailBlueprint => (TestSliderCircleBlueprint)base.TailBlueprint;
+            public new TestSliderCircleOverlay HeadOverlay => (TestSliderCircleOverlay)base.HeadOverlay;
+            public new TestSliderCircleOverlay TailOverlay => (TestSliderCircleOverlay)base.TailOverlay;
             public new PathControlPointVisualiser ControlPointVisualiser => base.ControlPointVisualiser;
 
             public TestSliderBlueprint(Slider slider)
@@ -159,14 +159,14 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             {
             }
 
-            protected override SliderCircleSelectionBlueprint CreateCircleSelectionBlueprint(Slider slider, SliderPosition position) => new TestSliderCircleBlueprint(slider, position);
+            protected override SliderCircleOverlay CreateCircleOverlay(Slider slider, SliderPosition position) => new TestSliderCircleOverlay(slider, position);
         }
 
-        private class TestSliderCircleBlueprint : SliderCircleSelectionBlueprint
+        private class TestSliderCircleOverlay : SliderCircleOverlay
         {
             public new HitCirclePiece CirclePiece => base.CirclePiece;
 
-            public TestSliderCircleBlueprint(Slider slider, SliderPosition position)
+            public TestSliderCircleOverlay(Slider slider, SliderPosition position)
                 : base(slider, position)
             {
             }
diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
index 721bb1985d..0d828a79c8 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderSelectionBlueprint.cs
@@ -174,10 +174,10 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             AddAssert("body positioned correctly", () => blueprint.BodyPiece.Position == slider.StackedPosition);
 
             AddAssert("head positioned correctly",
-                () => Precision.AlmostEquals(blueprint.HeadBlueprint.CirclePiece.ScreenSpaceDrawQuad.Centre, drawableObject.HeadCircle.ScreenSpaceDrawQuad.Centre));
+                () => Precision.AlmostEquals(blueprint.HeadOverlay.CirclePiece.ScreenSpaceDrawQuad.Centre, drawableObject.HeadCircle.ScreenSpaceDrawQuad.Centre));
 
             AddAssert("tail positioned correctly",
-                () => Precision.AlmostEquals(blueprint.TailBlueprint.CirclePiece.ScreenSpaceDrawQuad.Centre, drawableObject.TailCircle.ScreenSpaceDrawQuad.Centre));
+                () => Precision.AlmostEquals(blueprint.TailOverlay.CirclePiece.ScreenSpaceDrawQuad.Centre, drawableObject.TailCircle.ScreenSpaceDrawQuad.Centre));
         }
 
         private void moveMouseToControlPoint(int index)
@@ -195,8 +195,8 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
         private class TestSliderBlueprint : SliderSelectionBlueprint
         {
             public new SliderBodyPiece BodyPiece => base.BodyPiece;
-            public new TestSliderCircleBlueprint HeadBlueprint => (TestSliderCircleBlueprint)base.HeadBlueprint;
-            public new TestSliderCircleBlueprint TailBlueprint => (TestSliderCircleBlueprint)base.TailBlueprint;
+            public new TestSliderCircleOverlay HeadOverlay => (TestSliderCircleOverlay)base.HeadOverlay;
+            public new TestSliderCircleOverlay TailOverlay => (TestSliderCircleOverlay)base.TailOverlay;
             public new PathControlPointVisualiser ControlPointVisualiser => base.ControlPointVisualiser;
 
             public TestSliderBlueprint(Slider slider)
@@ -204,14 +204,14 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
             {
             }
 
-            protected override SliderCircleSelectionBlueprint CreateCircleSelectionBlueprint(Slider slider, SliderPosition position) => new TestSliderCircleBlueprint(slider, position);
+            protected override SliderCircleOverlay CreateCircleOverlay(Slider slider, SliderPosition position) => new TestSliderCircleOverlay(slider, position);
         }
 
-        private class TestSliderCircleBlueprint : SliderCircleSelectionBlueprint
+        private class TestSliderCircleOverlay : SliderCircleOverlay
         {
             public new HitCirclePiece CirclePiece => base.CirclePiece;
 
-            public TestSliderCircleBlueprint(Slider slider, SliderPosition position)
+            public TestSliderCircleOverlay(Slider slider, SliderPosition position)
                 : base(slider, position)
             {
             }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleOverlay.cs
similarity index 53%
rename from osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleSelectionBlueprint.cs
rename to osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleOverlay.cs
index ff01c7a442..241ff70a18 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderCircleOverlay.cs
@@ -1,35 +1,32 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) 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.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components;
 using osu.Game.Rulesets.Osu.Objects;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 {
-    public class SliderCircleSelectionBlueprint : OsuSelectionBlueprint<Slider>
+    public class SliderCircleOverlay : CompositeDrawable
     {
         protected readonly HitCirclePiece CirclePiece;
 
+        private readonly Slider slider;
         private readonly SliderPosition position;
 
-        public SliderCircleSelectionBlueprint(Slider slider, SliderPosition position)
-            : base(slider)
+        public SliderCircleOverlay(Slider slider, SliderPosition position)
         {
+            this.slider = slider;
             this.position = position;
 
             InternalChild = CirclePiece = new HitCirclePiece();
-
-            Select();
         }
 
         protected override void Update()
         {
             base.Update();
 
-            CirclePiece.UpdateFrom(position == SliderPosition.Start ? (HitCircle)HitObject.HeadCircle : HitObject.TailCircle);
+            CirclePiece.UpdateFrom(position == SliderPosition.Start ? (HitCircle)slider.HeadCircle : slider.TailCircle);
         }
-
-        // Todo: This is temporary, since the slider circle masks don't do anything special yet. In the future they will handle input.
-        public override bool HandlePositionalInput => false;
     }
 }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index 21945853a8..ec97f1fd78 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -14,7 +14,6 @@ using osu.Framework.Input.Events;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit;
@@ -27,8 +26,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
     public class SliderSelectionBlueprint : OsuSelectionBlueprint<Slider>
     {
         protected SliderBodyPiece BodyPiece { get; private set; }
-        protected SliderCircleSelectionBlueprint HeadBlueprint { get; private set; }
-        protected SliderCircleSelectionBlueprint TailBlueprint { get; private set; }
+        protected SliderCircleOverlay HeadOverlay { get; private set; }
+        protected SliderCircleOverlay TailOverlay { get; private set; }
 
         [CanBeNull]
         protected PathControlPointVisualiser ControlPointVisualiser { get; private set; }
@@ -61,8 +60,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             InternalChildren = new Drawable[]
             {
                 BodyPiece = new SliderBodyPiece(),
-                HeadBlueprint = CreateCircleSelectionBlueprint(HitObject, SliderPosition.Start),
-                TailBlueprint = CreateCircleSelectionBlueprint(HitObject, SliderPosition.End),
+                HeadOverlay = CreateCircleOverlay(HitObject, SliderPosition.Start),
+                TailOverlay = CreateCircleOverlay(HitObject, SliderPosition.End),
             };
         }
 
@@ -78,14 +77,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             BodyPiece.UpdateFrom(HitObject);
         }
 
-        public override void Apply(DrawableHitObject drawableObject)
-        {
-            base.Apply(drawableObject);
-
-            HeadBlueprint?.Apply(drawableObject);
-            TailBlueprint?.Apply(drawableObject);
-        }
-
         public override bool HandleQuickDeletion()
         {
             var hoveredControlPoint = ControlPointVisualiser?.Pieces.FirstOrDefault(p => p.IsHovered);
@@ -250,6 +241,6 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
             BodyPiece.ReceivePositionalInputAt(screenSpacePos) || ControlPointVisualiser?.Pieces.Any(p => p.ReceivePositionalInputAt(screenSpacePos)) == true;
 
-        protected virtual SliderCircleSelectionBlueprint CreateCircleSelectionBlueprint(Slider slider, SliderPosition position) => new SliderCircleSelectionBlueprint(slider, position);
+        protected virtual SliderCircleOverlay CreateCircleOverlay(Slider slider, SliderPosition position) => new SliderCircleOverlay(slider, position);
     }
 }

From 72beddaadc2799ab2a0c72f2b9a7aae81b195a82 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 May 2021 14:25:07 +0900
Subject: [PATCH 3556/3722] Remove nested blueprints from hold notes

---
 .../Editor/TestSceneManiaHitObjectComposer.cs |  4 ++--
 ...ionBlueprint.cs => HoldNoteNoteOverlay.cs} | 23 ++++++++-----------
 .../Blueprints/HoldNoteSelectionBlueprint.cs  | 16 ++-----------
 3 files changed, 14 insertions(+), 29 deletions(-)
 rename osu.Game.Rulesets.Mania/Edit/Blueprints/{HoldNoteNoteSelectionBlueprint.cs => HoldNoteNoteOverlay.cs} (60%)

diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs
index aaf96c63a6..8474279b01 100644
--- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneManiaHitObjectComposer.cs
@@ -184,8 +184,8 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor
             AddAssert("head note positioned correctly", () => Precision.AlmostEquals(holdNote.ScreenSpaceDrawQuad.BottomLeft, holdNote.Head.ScreenSpaceDrawQuad.BottomLeft));
             AddAssert("tail note positioned correctly", () => Precision.AlmostEquals(holdNote.ScreenSpaceDrawQuad.TopLeft, holdNote.Tail.ScreenSpaceDrawQuad.BottomLeft));
 
-            AddAssert("head blueprint positioned correctly", () => this.ChildrenOfType<HoldNoteNoteSelectionBlueprint>().ElementAt(0).DrawPosition == holdNote.Head.DrawPosition);
-            AddAssert("tail blueprint positioned correctly", () => this.ChildrenOfType<HoldNoteNoteSelectionBlueprint>().ElementAt(1).DrawPosition == holdNote.Tail.DrawPosition);
+            AddAssert("head blueprint positioned correctly", () => this.ChildrenOfType<HoldNoteNoteOverlay>().ElementAt(0).DrawPosition == holdNote.Head.DrawPosition);
+            AddAssert("tail blueprint positioned correctly", () => this.ChildrenOfType<HoldNoteNoteOverlay>().ElementAt(1).DrawPosition == holdNote.Tail.DrawPosition);
         }
 
         private void setScrollStep(ScrollingDirection direction)
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteNoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteNoteOverlay.cs
similarity index 60%
rename from osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteNoteSelectionBlueprint.cs
rename to osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteNoteOverlay.cs
index 14c8d488a9..6933571be8 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteNoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteNoteOverlay.cs
@@ -2,35 +2,35 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Mania.Edit.Blueprints.Components;
-using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 {
-    public class HoldNoteNoteSelectionBlueprint : ManiaSelectionBlueprint<HoldNote>
+    public class HoldNoteNoteOverlay : CompositeDrawable
     {
-        protected new DrawableHoldNote DrawableObject => (DrawableHoldNote)base.DrawableObject;
-
+        private readonly HoldNoteSelectionBlueprint holdNoteBlueprint;
         private readonly HoldNotePosition position;
 
-        public HoldNoteNoteSelectionBlueprint(HoldNote holdNote, HoldNotePosition position)
-            : base(holdNote)
+        public HoldNoteNoteOverlay(HoldNoteSelectionBlueprint holdNoteBlueprint, HoldNotePosition position)
         {
+            this.holdNoteBlueprint = holdNoteBlueprint;
             this.position = position;
-            InternalChild = new EditNotePiece { RelativeSizeAxes = Axes.X };
 
-            Select();
+            InternalChild = new EditNotePiece { RelativeSizeAxes = Axes.X };
         }
 
         protected override void Update()
         {
             base.Update();
 
+            var drawableObject = holdNoteBlueprint.DrawableObject;
+
             // Todo: This shouldn't exist, mania should not reference the drawable hitobject directly.
-            if (DrawableObject.IsLoaded)
+            if (drawableObject.IsLoaded)
             {
-                DrawableNote note = position == HoldNotePosition.Start ? (DrawableNote)DrawableObject.Head : DrawableObject.Tail;
+                DrawableNote note = position == HoldNotePosition.Start ? (DrawableNote)drawableObject.Head : drawableObject.Tail;
 
                 Anchor = note.Anchor;
                 Origin = note.Origin;
@@ -39,8 +39,5 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
                 Position = note.DrawPosition;
             }
         }
-
-        // Todo: This is temporary, since the note masks don't do anything special yet. In the future they will handle input.
-        public override bool HandlePositionalInput => false;
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs
index ac821e504c..d04c5cd4aa 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNoteSelectionBlueprint.cs
@@ -10,7 +10,6 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
-using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
 using osuTK;
 
@@ -22,9 +21,6 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
-        private HoldNoteNoteSelectionBlueprint headBlueprint;
-        private HoldNoteNoteSelectionBlueprint tailBlueprint;
-
         [Resolved]
         private OsuColour colours { get; set; }
 
@@ -40,8 +36,8 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 
             InternalChildren = new Drawable[]
             {
-                headBlueprint = new HoldNoteNoteSelectionBlueprint(HitObject, HoldNotePosition.Start),
-                tailBlueprint = new HoldNoteNoteSelectionBlueprint(HitObject, HoldNotePosition.End),
+                new HoldNoteNoteOverlay(this, HoldNotePosition.Start),
+                new HoldNoteNoteOverlay(this, HoldNotePosition.End),
                 new Container
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -58,14 +54,6 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
             };
         }
 
-        public override void Apply(DrawableHitObject drawableObject)
-        {
-            base.Apply(drawableObject);
-
-            headBlueprint?.Apply(drawableObject);
-            tailBlueprint?.Apply(drawableObject);
-        }
-
         protected override void Update()
         {
             base.Update();

From 882d54a8f8692cdbd508614b7033cff898bd070d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 May 2021 14:26:26 +0900
Subject: [PATCH 3557/3722] Remove now unnecessary Apply() method

---
 .../Edit/HitObjectSelectionBlueprint.cs       | 20 +------------------
 .../Components/ComposeBlueprintContainer.cs   |  2 +-
 .../Visual/SelectionBlueprintTestScene.cs     |  2 +-
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectSelectionBlueprint.cs b/osu.Game/Rulesets/Edit/HitObjectSelectionBlueprint.cs
index 6e9172c822..56434b1d82 100644
--- a/osu.Game/Rulesets/Edit/HitObjectSelectionBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectSelectionBlueprint.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Edit
         /// <summary>
         /// The <see cref="DrawableHitObject"/> which this <see cref="HitObjectSelectionBlueprint"/> applies to.
         /// </summary>
-        public virtual DrawableHitObject DrawableObject { get; private set; }
+        public DrawableHitObject DrawableObject { get; internal set; }
 
         /// <summary>
         /// Whether the blueprint should be shown even when the <see cref="DrawableObject"/> is not alive.
@@ -28,24 +28,6 @@ namespace osu.Game.Rulesets.Edit
         {
         }
 
-        protected override void LoadAsyncComplete()
-        {
-            // Must be done before base.LoadAsyncComplete() as this may affect children.
-            Apply(DrawableObject);
-
-            base.LoadAsyncComplete();
-        }
-
-        /// <summary>
-        /// Applies a <see cref="DrawableHitObject"/> to this <see cref="HitObjectSelectionBlueprint"/>.
-        /// The represented <see cref="HitObject"/> model does not change.
-        /// </summary>
-        /// <param name="drawableObject">The new <see cref="DrawableHitObject"/>.</param>
-        public virtual void Apply(DrawableHitObject drawableObject)
-        {
-            DrawableObject = drawableObject;
-        }
-
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => DrawableObject.ReceivePositionalInputAt(screenSpacePos);
 
         public override Vector2 ScreenSpaceSelectionPoint => DrawableObject.ScreenSpaceDrawQuad.Centre;
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index b3773b9ec1..95f4069edb 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -245,7 +245,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (drawable == null)
                 return null;
 
-            return CreateHitObjectBlueprintFor(item).With(b => b.Apply(drawable));
+            return CreateHitObjectBlueprintFor(item).With(b => b.DrawableObject = drawable);
         }
 
         public virtual HitObjectSelectionBlueprint CreateHitObjectBlueprintFor(HitObject hitObject) => null;
diff --git a/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs b/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs
index b518465c40..dc12a4999d 100644
--- a/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs
+++ b/osu.Game/Tests/Visual/SelectionBlueprintTestScene.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Visual
         {
             Add(blueprint.With(d =>
             {
-                d.Apply(drawableObject);
+                d.DrawableObject = drawableObject;
                 d.Depth = float.MinValue;
                 d.Select();
             }));

From 829d326e36cdab8a4a1be3e9624a0003d4910d48 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 May 2021 14:50:10 +0900
Subject: [PATCH 3558/3722] Remove alignment logic completely for the time
 being

This was overly complex and does not play well with the new layout
customisation system. We can add it back as required.
---
 .../HUD/HitErrorMeters/BarHitErrorMeter.cs    | 56 +++++++++----------
 1 file changed, 25 insertions(+), 31 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
index c303f3889d..32d7f3525f 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
@@ -20,8 +20,6 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 {
     public class BarHitErrorMeter : HitErrorMeter
     {
-        private readonly Anchor alignment;
-
         private const int arrow_move_duration = 400;
 
         private const int judgement_line_width = 6;
@@ -45,9 +43,6 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 
         public BarHitErrorMeter()
         {
-            // todo: investigate.
-            alignment = false ? Anchor.x0 : Anchor.x2;
-
             AutoSizeAxes = Axes.Both;
         }
 
@@ -63,33 +58,42 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
                 Margin = new MarginPadding(2),
                 Children = new Drawable[]
                 {
-                    judgementsContainer = new Container
+                    new Container
                     {
-                        Anchor = Anchor.y1 | alignment,
-                        Origin = Anchor.y1 | alignment,
-                        Width = judgement_line_width,
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Width = chevron_size,
                         RelativeSizeAxes = Axes.Y,
+                        Child = arrow = new SpriteIcon
+                        {
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.Centre,
+                            RelativePositionAxes = Axes.Y,
+                            Y = 0.5f,
+                            Icon = FontAwesome.Solid.ChevronRight,
+                            Size = new Vector2(chevron_size),
+                        }
                     },
                     colourBars = new Container
                     {
                         Width = bar_width,
                         RelativeSizeAxes = Axes.Y,
-                        Anchor = Anchor.y1 | alignment,
-                        Origin = Anchor.y1 | alignment,
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
                         Children = new Drawable[]
                         {
                             colourBarsEarly = new Container
                             {
-                                Anchor = Anchor.y1 | alignment,
-                                Origin = alignment,
+                                Anchor = Anchor.CentreLeft,
+                                Origin = Anchor.x2,
                                 RelativeSizeAxes = Axes.Both,
                                 Height = 0.5f,
                                 Scale = new Vector2(1, -1),
                             },
                             colourBarsLate = new Container
                             {
-                                Anchor = Anchor.y1 | alignment,
-                                Origin = alignment,
+                                Anchor = Anchor.CentreLeft,
+                                Origin = Anchor.x2,
                                 RelativeSizeAxes = Axes.Both,
                                 Height = 0.5f,
                             },
@@ -115,21 +119,12 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
                             }
                         }
                     },
-                    new Container
+                    judgementsContainer = new Container
                     {
-                        Anchor = Anchor.y1 | alignment,
-                        Origin = Anchor.y1 | alignment,
-                        Width = chevron_size,
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Width = judgement_line_width,
                         RelativeSizeAxes = Axes.Y,
-                        Child = arrow = new SpriteIcon
-                        {
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.Centre,
-                            RelativePositionAxes = Axes.Y,
-                            Y = 0.5f,
-                            Icon = alignment == Anchor.x2 ? FontAwesome.Solid.ChevronRight : FontAwesome.Solid.ChevronLeft,
-                            Size = new Vector2(chevron_size),
-                        }
                     },
                 }
             };
@@ -167,7 +162,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 
             // a little nub to mark the centre point.
             var centre = createColourBar(windows.Last().result, 0.01f);
-            centre.Anchor = centre.Origin = Anchor.y1 | (alignment == Anchor.x2 ? Anchor.x0 : Anchor.x2);
+            centre.Anchor = centre.Origin = Anchor.CentreLeft;
             centre.Width = 2.5f;
             colourBars.Add(centre);
 
@@ -239,8 +234,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             judgementsContainer.Add(new JudgementLine
             {
                 Y = getRelativeJudgementPosition(judgement.TimeOffset),
-                Anchor = alignment == Anchor.x2 ? Anchor.x0 : Anchor.x2,
-                Origin = Anchor.y1 | (alignment == Anchor.x2 ? Anchor.x0 : Anchor.x2),
+                Origin = Anchor.CentreLeft,
             });
 
             arrow.MoveToY(

From c885ad87d5884105319658e0e2c476a45e759d3b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 May 2021 15:12:29 +0900
Subject: [PATCH 3559/3722] Update `HitErrorDisplay` tests

---
 .../Visual/Gameplay/TestSceneHitErrorMeter.cs | 71 +++++++++++++++----
 1 file changed, 58 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
index 6cefd01aab..2c5443fe08 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.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 System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -11,29 +14,35 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Catch.Scoring;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mania.Scoring;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Scoring;
+using osu.Game.Rulesets.UI;
+using osu.Game.Scoring;
 using osu.Game.Screens.Play.HUD.HitErrorMeters;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneHitErrorMeter : OsuTestScene
     {
-        private HitWindows hitWindows;
-
         [Cached]
         private ScoreProcessor scoreProcessor = new ScoreProcessor();
 
+        [Cached(typeof(DrawableRuleset))]
+        private TestDrawableRuleset drawableRuleset = new TestDrawableRuleset();
+
         public TestSceneHitErrorMeter()
         {
             recreateDisplay(new OsuHitWindows(), 5);
 
             AddRepeatStep("New random judgement", () => newJudgement(), 40);
 
-            AddRepeatStep("New max negative", () => newJudgement(-hitWindows.WindowFor(HitResult.Meh)), 20);
-            AddRepeatStep("New max positive", () => newJudgement(hitWindows.WindowFor(HitResult.Meh)), 20);
+            AddRepeatStep("New max negative", () => newJudgement(-drawableRuleset.HitWindows.WindowFor(HitResult.Meh)), 20);
+            AddRepeatStep("New max positive", () => newJudgement(drawableRuleset.HitWindows.WindowFor(HitResult.Meh)), 20);
             AddStep("New fixed judgement (50ms)", () => newJudgement(50));
 
             AddStep("Judgement barrage", () =>
@@ -83,10 +92,10 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void recreateDisplay(HitWindows hitWindows, float overallDifficulty)
         {
-            this.hitWindows = hitWindows;
-
             hitWindows?.SetDifficulty(overallDifficulty);
 
+            drawableRuleset.HitWindows = hitWindows;
+
             Clear();
 
             Add(new FillFlowContainer
@@ -103,40 +112,40 @@ namespace osu.Game.Tests.Visual.Gameplay
                 }
             });
 
-            Add(new BarHitErrorMeter(hitWindows, true)
+            Add(new BarHitErrorMeter
             {
                 Anchor = Anchor.CentreRight,
                 Origin = Anchor.CentreRight,
             });
 
-            Add(new BarHitErrorMeter(hitWindows, false)
+            Add(new BarHitErrorMeter
             {
                 Anchor = Anchor.CentreLeft,
                 Origin = Anchor.CentreLeft,
             });
 
-            Add(new BarHitErrorMeter(hitWindows, true)
+            Add(new BarHitErrorMeter
             {
                 Anchor = Anchor.BottomCentre,
                 Origin = Anchor.CentreLeft,
                 Rotation = 270,
             });
 
-            Add(new ColourHitErrorMeter(hitWindows)
+            Add(new ColourHitErrorMeter
             {
                 Anchor = Anchor.CentreRight,
                 Origin = Anchor.CentreRight,
                 Margin = new MarginPadding { Right = 50 }
             });
 
-            Add(new ColourHitErrorMeter(hitWindows)
+            Add(new ColourHitErrorMeter
             {
                 Anchor = Anchor.CentreLeft,
                 Origin = Anchor.CentreLeft,
                 Margin = new MarginPadding { Left = 50 }
             });
 
-            Add(new ColourHitErrorMeter(hitWindows)
+            Add(new ColourHitErrorMeter
             {
                 Anchor = Anchor.BottomCentre,
                 Origin = Anchor.CentreLeft,
@@ -147,11 +156,47 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void newJudgement(double offset = 0)
         {
-            scoreProcessor.ApplyResult(new JudgementResult(new HitCircle { HitWindows = hitWindows }, new Judgement())
+            scoreProcessor.ApplyResult(new JudgementResult(new HitCircle { HitWindows = drawableRuleset.HitWindows }, new Judgement())
             {
                 TimeOffset = offset == 0 ? RNG.Next(-150, 150) : offset,
                 Type = HitResult.Perfect,
             });
         }
+
+        [SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")]
+        private class TestDrawableRuleset : DrawableRuleset
+        {
+            public HitWindows HitWindows;
+
+            public override IEnumerable<HitObject> Objects => new[] { new HitCircle { HitWindows = HitWindows } };
+
+            public override event Action<JudgementResult> NewResult;
+            public override event Action<JudgementResult> RevertResult;
+
+            public override Playfield Playfield { get; }
+            public override Container Overlays { get; }
+            public override Container FrameStableComponents { get; }
+            public override IFrameStableClock FrameStableClock { get; }
+            public override IReadOnlyList<Mod> Mods { get; }
+
+            public override double GameplayStartTime { get; }
+            public override GameplayCursorContainer Cursor { get; }
+
+            public TestDrawableRuleset()
+                : base(new OsuRuleset())
+            {
+                // won't compile without this.
+                NewResult?.Invoke(null);
+                RevertResult?.Invoke(null);
+            }
+
+            public override void SetReplayScore(Score replayScore) => throw new NotImplementedException();
+
+            public override void SetRecordTarget(Score score) => throw new NotImplementedException();
+
+            public override void RequestResume(Action continueResume) => throw new NotImplementedException();
+
+            public override void CancelResume() => throw new NotImplementedException();
+        }
     }
 }

From 5acb708939776029f96e6ec7bca92cec86ca3a40 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 May 2021 15:50:14 +0900
Subject: [PATCH 3560/3722] Remove customisation of hit error via standard
 settings

---
 osu.Game/Configuration/OsuConfigManager.cs    |  2 -
 osu.Game/Configuration/ScoreMeterType.cs      | 37 -------------------
 .../Sections/Gameplay/GeneralSettings.cs      |  5 ---
 3 files changed, 44 deletions(-)
 delete mode 100644 osu.Game/Configuration/ScoreMeterType.cs

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 09412b1f1b..43bbd725c3 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -104,7 +104,6 @@ namespace osu.Game.Configuration
             SetDefault(OsuSetting.KeyOverlay, false);
             SetDefault(OsuSetting.PositionalHitSounds, true);
             SetDefault(OsuSetting.AlwaysPlayFirstComboBreak, true);
-            SetDefault(OsuSetting.ScoreMeter, ScoreMeterType.HitErrorBoth);
 
             SetDefault(OsuSetting.FloatingComments, false);
 
@@ -213,7 +212,6 @@ namespace osu.Game.Configuration
         KeyOverlay,
         PositionalHitSounds,
         AlwaysPlayFirstComboBreak,
-        ScoreMeter,
         FloatingComments,
         HUDVisibilityMode,
         ShowProgressGraph,
diff --git a/osu.Game/Configuration/ScoreMeterType.cs b/osu.Game/Configuration/ScoreMeterType.cs
deleted file mode 100644
index ddbd2327c2..0000000000
--- a/osu.Game/Configuration/ScoreMeterType.cs
+++ /dev/null
@@ -1,37 +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.ComponentModel;
-
-namespace osu.Game.Configuration
-{
-    public enum ScoreMeterType
-    {
-        [Description("None")]
-        None,
-
-        [Description("Hit Error (left)")]
-        HitErrorLeft,
-
-        [Description("Hit Error (right)")]
-        HitErrorRight,
-
-        [Description("Hit Error (left+right)")]
-        HitErrorBoth,
-
-        [Description("Hit Error (bottom)")]
-        HitErrorBottom,
-
-        [Description("Colour (left)")]
-        ColourLeft,
-
-        [Description("Colour (right)")]
-        ColourRight,
-
-        [Description("Colour (left+right)")]
-        ColourBoth,
-
-        [Description("Colour (bottom)")]
-        ColourBottom,
-    }
-}
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
index be464fa2b7..0b5ec4f338 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
@@ -73,11 +73,6 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                     LabelText = "Always play first combo break sound",
                     Current = config.GetBindable<bool>(OsuSetting.AlwaysPlayFirstComboBreak)
                 },
-                new SettingsEnumDropdown<ScoreMeterType>
-                {
-                    LabelText = "Score meter type",
-                    Current = config.GetBindable<ScoreMeterType>(OsuSetting.ScoreMeter)
-                },
                 new SettingsEnumDropdown<ScoringMode>
                 {
                     LabelText = "Score display mode",

From 10c730b37d569e13f0dc9c522b57911b6671d7b8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 May 2021 15:50:40 +0900
Subject: [PATCH 3561/3722] Add new default locations for hit bar error
 displays

---
 osu.Game/Screens/Play/SongProgress.cs  | 10 +++++++---
 osu.Game/Skinning/DefaultSkin.cs       | 26 ++++++++++++++++++++++++++
 osu.Game/Skinning/HUDSkinComponents.cs |  2 ++
 osu.Game/Skinning/LegacySkin.cs        | 16 ++++++++++++++++
 4 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/SongProgress.cs b/osu.Game/Screens/Play/SongProgress.cs
index b7939b5e75..cab44c7473 100644
--- a/osu.Game/Screens/Play/SongProgress.cs
+++ b/osu.Game/Screens/Play/SongProgress.cs
@@ -20,10 +20,14 @@ namespace osu.Game.Screens.Play
 {
     public class SongProgress : OverlayContainer, ISkinnableDrawable
     {
-        private const int info_height = 20;
-        private const int bottom_bar_height = 5;
+        public const float MAX_HEIGHT = info_height + bottom_bar_height + graph_height + handle_height;
+
+        private const float info_height = 20;
+        private const float bottom_bar_height = 5;
         private const float graph_height = SquareGraph.Column.WIDTH * 6;
-        private static readonly Vector2 handle_size = new Vector2(10, 18);
+        private const float handle_height = 18;
+
+        private static readonly Vector2 handle_size = new Vector2(10, handle_height);
 
         private const float transition_duration = 200;
 
diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index d13ddcf22b..84f40df0cf 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -14,6 +14,7 @@ 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;
 using osuTK.Graphics;
 
@@ -78,6 +79,23 @@ namespace osu.Game.Skinning
                                         combo.Position = new Vector2(accuracy.ScreenSpaceDeltaToParentSpace(score.ScreenSpaceDrawQuad.Size).X / 2 + horizontal_padding, vertical_offset + 5);
                                         combo.Anchor = Anchor.TopCentre;
                                     }
+
+                                    var hitError = container.OfType<HitErrorMeter>().FirstOrDefault();
+
+                                    if (hitError != null)
+                                    {
+                                        hitError.Anchor = Anchor.CentreLeft;
+                                        hitError.Origin = Anchor.CentreLeft;
+                                    }
+
+                                    var hitError2 = container.OfType<HitErrorMeter>().LastOrDefault();
+
+                                    if (hitError2 != null)
+                                    {
+                                        hitError2.Anchor = Anchor.CentreRight;
+                                        hitError2.Origin = Anchor.CentreLeft;
+                                        hitError2.Scale = new Vector2(-1, 1);
+                                    }
                                 }
                             })
                             {
@@ -88,6 +106,8 @@ namespace osu.Game.Skinning
                                     GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.AccuracyCounter)),
                                     GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.HealthDisplay)),
                                     GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.SongProgress)),
+                                    GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.BarHitErrorMeter)),
+                                    GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.BarHitErrorMeter)),
                                 }
                             };
 
@@ -114,6 +134,12 @@ namespace osu.Game.Skinning
 
                         case HUDSkinComponents.SongProgress:
                             return new SongProgress();
+
+                        case HUDSkinComponents.BarHitErrorMeter:
+                            return new BarHitErrorMeter();
+
+                        case HUDSkinComponents.ColourHitErrorMeter:
+                            return new ColourHitErrorMeter();
                     }
 
                     break;
diff --git a/osu.Game/Skinning/HUDSkinComponents.cs b/osu.Game/Skinning/HUDSkinComponents.cs
index 2e6c3a9937..ea39c98635 100644
--- a/osu.Game/Skinning/HUDSkinComponents.cs
+++ b/osu.Game/Skinning/HUDSkinComponents.cs
@@ -10,5 +10,7 @@ namespace osu.Game.Skinning
         AccuracyCounter,
         HealthDisplay,
         SongProgress,
+        BarHitErrorMeter,
+        ColourHitErrorMeter,
     }
 }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 6c8d6ee45a..7a64f38840 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -19,6 +19,7 @@ using osu.Game.IO;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD;
+using osu.Game.Screens.Play.HUD.HitErrorMeters;
 using osuTK.Graphics;
 
 namespace osu.Game.Skinning
@@ -342,6 +343,20 @@ namespace osu.Game.Skinning
                                 {
                                     accuracy.Y = container.ToLocalSpace(score.ScreenSpaceDrawQuad.BottomRight).Y;
                                 }
+
+                                var songProgress = container.OfType<SongProgress>().FirstOrDefault();
+
+                                var hitError = container.OfType<HitErrorMeter>().FirstOrDefault();
+
+                                if (hitError != null)
+                                {
+                                    hitError.Anchor = Anchor.BottomCentre;
+                                    hitError.Origin = Anchor.CentreLeft;
+                                    hitError.Rotation = -90;
+
+                                    if (songProgress != null)
+                                        hitError.Y -= SongProgress.MAX_HEIGHT;
+                                }
                             })
                             {
                                 Children = new[]
@@ -352,6 +367,7 @@ namespace osu.Game.Skinning
                                     GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.AccuracyCounter)) ?? new DefaultAccuracyCounter(),
                                     GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.HealthDisplay)) ?? new DefaultHealthDisplay(),
                                     GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.SongProgress)) ?? new SongProgress(),
+                                    GetDrawableComponent(new HUDSkinComponent(HUDSkinComponents.BarHitErrorMeter)) ?? new BarHitErrorMeter(),
                                 }
                             };
 

From ed957df162bbbfafdecaacab836ba6394c94e3a6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 May 2021 16:40:56 +0900
Subject: [PATCH 3562/3722] Add simple xmldoc to `TransferBlueprintFor` method

---
 .../Edit/Compose/Components/EditorBlueprintContainer.cs      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
index 6825e0f6a0..c62ea43331 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
@@ -84,6 +84,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
             base.AddBlueprintFor(item);
         }
 
+        /// <summary>
+        /// Invoked when a <see cref="HitObject"/> has been transferred to another <see cref="DrawableHitObject"/>.
+        /// </summary>
+        /// <param name="hitObject">The hit object which has been assigned to a new drawable.</param>
+        /// <param name="drawableObject">The new drawable that is representing the hit object.</param>
         protected virtual void TransferBlueprintFor(HitObject hitObject, DrawableHitObject drawableObject)
         {
         }

From 61a41d97a4a61df9e95f47489b2ba69b23891f2d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 May 2021 17:39:45 +0900
Subject: [PATCH 3563/3722] Add some xmldocs + comments

---
 .../Compose/HitObjectContainerEventQueue.cs   | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs b/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs
index 7c21573b18..363f08cb41 100644
--- a/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs
+++ b/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs
@@ -68,6 +68,9 @@ namespace osu.Game.Screens.Edit.Compose
 
             switch (existingEvent, newEvent)
             {
+                // This mostly exists as a safeguard to ensure that the sequence: Began -> { Finished -> Began } -> Finished, where { ... } indicates a transferral within a single frame,
+                // correctly leads into a final "Finished" state. It's unlikely for this to happen normally as it requires the hitobject usage to finish (for the final time)
+                // immediately after the HitObjectContainer updates lifetime, but it's not inconceivable to occur with the Editor's scheduling and execution order.
                 case (EventType.Transferred, EventType.Finished):
                     pendingEvents[hitObject] = EventType.Finished;
                     break;
@@ -117,8 +120,24 @@ namespace osu.Game.Screens.Edit.Compose
 
         private enum EventType
         {
+            /// <summary>
+            /// A <see cref="HitObject"/> has started being used by a <see cref="DrawableHitObject"/>.
+            /// </summary>
             Began,
+
+            /// <summary>
+            /// A <see cref="HitObject"/> has finished being used by a <see cref="DrawableHitObject"/>.
+            /// </summary>
             Finished,
+
+            /// <summary>
+            /// An internal intermediate state that occurs when a <see cref="HitObject"/> has finished being used by one <see cref="DrawableHitObject"/>
+            /// and started being used by another <see cref="DrawableHitObject"/> in the same frame. The <see cref="DrawableHitObject"/> may be the same instance in both cases.
+            /// </summary>
+            /// <remarks>
+            /// This usually occurs when a <see cref="HitObject"/> is transferred between <see cref="HitObjectContainer"/>s,
+            /// but also occurs if the <see cref="HitObject"/> dies and becomes alive again in the same frame within the same <see cref="HitObjectContainer"/>.
+            /// </remarks>
             Transferred
         }
     }

From c80e736712f396946fc755b700f89b3c72cf9863 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 May 2021 18:31:57 +0900
Subject: [PATCH 3564/3722] Change `SkinBlueprint` to use the origin point as
 the selection point

Not sure how this feels, but it makes using the same point throughout
the editor possible, which I think is the correct way forward for now.
---
 osu.Game/Skinning/Editor/SkinBlueprint.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/Editor/SkinBlueprint.cs b/osu.Game/Skinning/Editor/SkinBlueprint.cs
index 37659093e5..0a4bd1d75f 100644
--- a/osu.Game/Skinning/Editor/SkinBlueprint.cs
+++ b/osu.Game/Skinning/Editor/SkinBlueprint.cs
@@ -124,7 +124,7 @@ namespace osu.Game.Skinning.Editor
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => drawable.ReceivePositionalInputAt(screenSpacePos);
 
-        public override Vector2 ScreenSpaceSelectionPoint => drawable.ScreenSpaceDrawQuad.Centre;
+        public override Vector2 ScreenSpaceSelectionPoint => drawable.ToScreenSpace(drawable.OriginPosition);
 
         public override Quad SelectionQuad => drawable.ScreenSpaceDrawQuad;
     }

From d661e98fa612e1297c8994418d9f82350edd1ed0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 May 2021 18:34:06 +0900
Subject: [PATCH 3565/3722] Move common functionality out of
 `OsuSelectionHandler` and implement flip support

---
 .../Edit/OsuSelectionHandler.cs               | 68 ++++---------------
 .../Compose/Components/SelectionHandler.cs    | 50 ++++++++++++++
 .../Skinning/Editor/SkinSelectionHandler.cs   | 12 +++-
 3 files changed, 74 insertions(+), 56 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index c2c1f6d602..aaf3517c9c 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -12,12 +12,23 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit.Compose.Components;
-using osuTK;
+using Vector2 = osuTK.Vector2;
 
 namespace osu.Game.Rulesets.Osu.Edit
 {
     public class OsuSelectionHandler : EditorSelectionHandler
     {
+        /// <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.
+        /// </summary>
+        private List<PathType?> referencePathTypes;
+
         protected override void OnSelectionChanged()
         {
             base.OnSelectionChanged();
@@ -50,17 +61,6 @@ namespace osu.Game.Rulesets.Osu.Edit
             return true;
         }
 
-        /// <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.
-        /// </summary>
-        private List<PathType?> referencePathTypes;
-
         public override bool HandleReverse()
         {
             var hitObjects = EditorBeatmap.SelectedHitObjects;
@@ -114,24 +114,10 @@ namespace osu.Game.Rulesets.Osu.Edit
             var hitObjects = selectedMovableObjects;
 
             var selectedObjectsQuad = getSurroundingQuad(hitObjects);
-            var centre = selectedObjectsQuad.Centre;
 
             foreach (var h in hitObjects)
             {
-                var pos = h.Position;
-
-                switch (direction)
-                {
-                    case Direction.Horizontal:
-                        pos.X = centre.X - (pos.X - centre.X);
-                        break;
-
-                    case Direction.Vertical:
-                        pos.Y = centre.Y - (pos.Y - centre.Y);
-                        break;
-                }
-
-                h.Position = pos;
+                h.Position = GetFlippedPosition(direction, selectedObjectsQuad, h.Position);
 
                 if (h is Slider slider)
                 {
@@ -204,7 +190,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
             referencePathTypes ??= slider.Path.ControlPoints.Select(p => p.Type.Value).ToList();
 
-            Quad sliderQuad = getSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position.Value));
+            Quad sliderQuad = GetSurroundingQuad(slider.Path.ControlPoints.Select(p => p.Position.Value));
 
             // 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;
@@ -333,7 +319,7 @@ namespace osu.Game.Rulesets.Osu.Edit
         /// </summary>
         /// <param name="hitObjects">The hit objects to calculate a quad for.</param>
         private Quad getSurroundingQuad(OsuHitObject[] hitObjects) =>
-            getSurroundingQuad(hitObjects.SelectMany(h =>
+            GetSurroundingQuad(hitObjects.SelectMany(h =>
             {
                 if (h is IHasPath path)
                 {
@@ -348,30 +334,6 @@ namespace osu.Game.Rulesets.Osu.Edit
                 return new[] { h.Position };
             }));
 
-        /// <summary>
-        /// Returns a gamefield-space quad surrounding the provided points.
-        /// </summary>
-        /// <param name="points">The points to calculate a quad for.</param>
-        private Quad getSurroundingQuad(IEnumerable<Vector2> points)
-        {
-            if (!EditorBeatmap.SelectedHitObjects.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>
         /// All osu! hitobjects which can be moved/rotated/scaled.
         /// </summary>
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 6d8ae69812..bfd5ab7afa 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -350,5 +350,55 @@ namespace osu.Game.Screens.Edit.Compose.Components
             => Enumerable.Empty<MenuItem>();
 
         #endregion
+
+        #region Helper Methods
+
+        /// <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>
+        /// 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/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 7931a5ec41..2eb4ea107d 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -43,10 +43,16 @@ namespace osu.Game.Skinning.Editor
 
         public override bool HandleFlip(Direction direction)
         {
-            // TODO: this is temporary as well.
-            foreach (var c in SelectedBlueprints)
+            var selectionQuad = GetSurroundingQuad(SelectedBlueprints.Select(b => b.ScreenSpaceSelectionPoint));
+
+            foreach (var b in SelectedBlueprints)
             {
-                ((Drawable)c.Item).Scale *= new Vector2(
+                var drawableItem = (Drawable)b.Item;
+
+                drawableItem.Position =
+                    drawableItem.Parent.ToLocalSpace(GetFlippedPosition(direction, selectionQuad, b.ScreenSpaceSelectionPoint)) - drawableItem.AnchorPosition;
+
+                drawableItem.Scale *= new Vector2(
                     direction == Direction.Horizontal ? -1 : 1,
                     direction == Direction.Vertical ? -1 : 1
                 );

From a31a6947bb4771472686cfd195d69747d1106c0d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 May 2021 18:49:05 +0900
Subject: [PATCH 3566/3722] Add test

---
 .../TestSceneHitObjectContainerEventQueue.cs  | 168 ++++++++++++++++++
 osu.Game/Rulesets/UI/Playfield.cs             |   7 +-
 2 files changed, 173 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Tests/Editing/TestSceneHitObjectContainerEventQueue.cs

diff --git a/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventQueue.cs b/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventQueue.cs
new file mode 100644
index 0000000000..3f4d1b835f
--- /dev/null
+++ b/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventQueue.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 NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.UI;
+using osu.Game.Screens.Edit.Compose;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Tests.Editing
+{
+    public class TestSceneHitObjectContainerEventQueue : OsuTestScene
+    {
+        private readonly TestHitObject testObj = new TestHitObject();
+
+        private TestPlayfield playfield1;
+        private TestPlayfield playfield2;
+        private TestDrawable intermediateDrawable;
+        private HitObjectContainerEventQueue eventQueue;
+
+        private HitObject beganUsage;
+        private HitObject finishedUsage;
+        private HitObject transferredUsage;
+
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            reset();
+
+            if (eventQueue != null)
+            {
+                eventQueue.HitObjectUsageBegan -= onHitObjectUsageBegan;
+                eventQueue.HitObjectUsageFinished -= onHitObjectUsageFinished;
+                eventQueue.HitObjectUsageTransferred -= onHitObjectUsageTransferred;
+            }
+
+            var topPlayfield = new TestPlayfield();
+            topPlayfield.AddNested(playfield1 = new TestPlayfield());
+            topPlayfield.AddNested(playfield2 = new TestPlayfield());
+
+            eventQueue = new HitObjectContainerEventQueue(topPlayfield);
+            eventQueue.HitObjectUsageBegan += onHitObjectUsageBegan;
+            eventQueue.HitObjectUsageFinished += onHitObjectUsageFinished;
+            eventQueue.HitObjectUsageTransferred += onHitObjectUsageTransferred;
+
+            Children = new Drawable[]
+            {
+                topPlayfield,
+                intermediateDrawable = new TestDrawable(),
+                eventQueue
+            };
+        });
+
+        private void onHitObjectUsageBegan(HitObject obj) => beganUsage = obj;
+
+        private void onHitObjectUsageFinished(HitObject obj) => finishedUsage = obj;
+
+        private void onHitObjectUsageTransferred(HitObject obj, DrawableHitObject drawableObj) => transferredUsage = obj;
+
+        [Test]
+        public void TestUsageBeganAfterAdd()
+        {
+            AddStep("add hitobject", () => playfield1.Add(testObj));
+            addCheckStep(began: true);
+        }
+
+        [Test]
+        public void TestUsageFinishedAfterRemove()
+        {
+            AddStep("add hitobject", () => playfield1.Add(testObj));
+            addResetStep();
+            AddStep("remove hitobject", () => playfield1.Remove(testObj));
+            addCheckStep(finished: true);
+        }
+
+        [Test]
+        public void TestUsageTransferredWhenMovedBetweenPlayfields()
+        {
+            AddStep("add hitobject", () => playfield1.Add(testObj));
+            addResetStep();
+            AddStep("transfer hitobject to other playfield", () =>
+            {
+                playfield1.Remove(testObj);
+                playfield2.Add(testObj);
+            });
+
+            addCheckStep(transferred: true);
+        }
+
+        [Test]
+        public void TestRemoveImmediatelyAfterUsageBegan()
+        {
+            AddStep("add hitobject and schedule removal", () =>
+            {
+                playfield1.Add(testObj);
+                intermediateDrawable.Schedule(() => playfield1.Remove(testObj));
+            });
+
+            addCheckStep();
+        }
+
+        [Test]
+        public void TestRemoveImmediatelyAfterTransferred()
+        {
+            AddStep("add hitobject", () => playfield1.Add(testObj));
+            addResetStep();
+            AddStep("transfer hitobject to other playfield and schedule removal", () =>
+            {
+                playfield1.Remove(testObj);
+                playfield2.Add(testObj);
+                intermediateDrawable.Schedule(() => playfield2.Remove(testObj));
+            });
+
+            addCheckStep(finished: true);
+        }
+
+        private void addResetStep() => AddStep("reset", reset);
+
+        private void reset()
+        {
+            beganUsage = null;
+            finishedUsage = null;
+            transferredUsage = null;
+        }
+
+        private void addCheckStep(bool began = false, bool finished = false, bool transferred = false)
+            => AddAssert($"began = {began}, finished = {finished}, transferred = {transferred}",
+                () => (beganUsage == testObj) == began && (finishedUsage == testObj) == finished && (transferredUsage == testObj) == transferred);
+
+        private class TestPlayfield : Playfield
+        {
+            public TestPlayfield()
+            {
+                RegisterPool<TestHitObject, TestDrawableHitObject>(1);
+            }
+
+            public new void AddNested(Playfield playfield)
+            {
+                AddInternal(playfield);
+                base.AddNested(playfield);
+            }
+
+            protected override HitObjectLifetimeEntry CreateLifetimeEntry(HitObject hitObject)
+            {
+                var entry = base.CreateLifetimeEntry(hitObject);
+                entry.KeepAlive = true;
+                return entry;
+            }
+        }
+
+        private class TestHitObject : HitObject
+        {
+            public override string ToString() => "TestHitObject";
+        }
+
+        private class TestDrawableHitObject : DrawableHitObject
+        {
+        }
+
+        private class TestDrawable : Drawable
+        {
+            public new void Schedule(Action action) => base.Schedule(action);
+        }
+    }
+}
diff --git a/osu.Game/Rulesets/UI/Playfield.cs b/osu.Game/Rulesets/UI/Playfield.cs
index 17d3cf01a4..b154288dba 100644
--- a/osu.Game/Rulesets/UI/Playfield.cs
+++ b/osu.Game/Rulesets/UI/Playfield.cs
@@ -354,8 +354,11 @@ namespace osu.Game.Rulesets.UI
 
                     // If this is the first time this DHO is being used, then apply the DHO mods.
                     // This is done before Apply() so that the state is updated once when the hitobject is applied.
-                    foreach (var m in mods.OfType<IApplicableToDrawableHitObjects>())
-                        m.ApplyToDrawableHitObjects(dho.Yield());
+                    if (mods != null)
+                    {
+                        foreach (var m in mods.OfType<IApplicableToDrawableHitObjects>())
+                            m.ApplyToDrawableHitObjects(dho.Yield());
+                    }
                 }
 
                 if (!lifetimeEntryMap.TryGetValue(hitObject, out var entry))

From bfc0205e9bf378039a87d6d67c05102a7aa4fed3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 May 2021 18:49:11 +0900
Subject: [PATCH 3567/3722] Fix (began, finished) event

---
 .../Edit/Compose/HitObjectContainerEventQueue.cs   | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs b/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs
index 363f08cb41..6c1a3b06bb 100644
--- a/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs
+++ b/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs
@@ -68,14 +68,20 @@ namespace osu.Game.Screens.Edit.Compose
 
             switch (existingEvent, newEvent)
             {
-                // This mostly exists as a safeguard to ensure that the sequence: Began -> { Finished -> Began } -> Finished, where { ... } indicates a transferral within a single frame,
-                // correctly leads into a final "Finished" state. It's unlikely for this to happen normally as it requires the hitobject usage to finish (for the final time)
-                // immediately after the HitObjectContainer updates lifetime, but it's not inconceivable to occur with the Editor's scheduling and execution order.
+                // This exists as a safeguard to ensure that the sequence: { Began -> Finished }, where { ... } indicates a sequence within a single frame, does not trigger any events.
+                // This is unlikely to occur in practice as it requires the usage to finish immediately after the HitObjectContainer updates hitobject lifetimes,
+                // however, an Editor action scheduled somewhere between the lifetime update and this event queue's own Update() could cause this.
+                case (EventType.Began, EventType.Finished):
+                    pendingEvents.Remove(hitObject);
+                    break;
+
+                // This exists as a safeguard to ensure that the sequence: Began -> { Finished -> Began -> Finished }, where { ... } indicates a sequence within a single frame,
+                // correctly leads into a final "finished" state rather than remaining in the intermediate "transferred" state.
+                // As above, this is unlikely to occur in practice.
                 case (EventType.Transferred, EventType.Finished):
                     pendingEvents[hitObject] = EventType.Finished;
                     break;
 
-                case (EventType.Began, EventType.Finished):
                 case (EventType.Finished, EventType.Began):
                     pendingEvents[hitObject] = EventType.Transferred;
                     break;

From 633f841a0f691ecb89965cc4762c510e7f3cd4b8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 May 2021 18:57:02 +0900
Subject: [PATCH 3568/3722] Rename to HitObjectUsageEventBuffer

---
 .../TestSceneHitObjectContainerEventQueue.cs  | 20 +++++++++----------
 .../Components/EditorBlueprintContainer.cs    |  2 +-
 ...tQueue.cs => HitObjectUsageEventBuffer.cs} | 10 +++++-----
 3 files changed, 16 insertions(+), 16 deletions(-)
 rename osu.Game/Screens/Edit/Compose/{HitObjectContainerEventQueue.cs => HitObjectUsageEventBuffer.cs} (93%)

diff --git a/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventQueue.cs b/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventQueue.cs
index 3f4d1b835f..ebf98c4c56 100644
--- a/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventQueue.cs
+++ b/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventQueue.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Tests.Editing
         private TestPlayfield playfield1;
         private TestPlayfield playfield2;
         private TestDrawable intermediateDrawable;
-        private HitObjectContainerEventQueue eventQueue;
+        private HitObjectUsageEventBuffer eventBuffer;
 
         private HitObject beganUsage;
         private HitObject finishedUsage;
@@ -30,27 +30,27 @@ namespace osu.Game.Tests.Editing
         {
             reset();
 
-            if (eventQueue != null)
+            if (eventBuffer != null)
             {
-                eventQueue.HitObjectUsageBegan -= onHitObjectUsageBegan;
-                eventQueue.HitObjectUsageFinished -= onHitObjectUsageFinished;
-                eventQueue.HitObjectUsageTransferred -= onHitObjectUsageTransferred;
+                eventBuffer.HitObjectUsageBegan -= onHitObjectUsageBegan;
+                eventBuffer.HitObjectUsageFinished -= onHitObjectUsageFinished;
+                eventBuffer.HitObjectUsageTransferred -= onHitObjectUsageTransferred;
             }
 
             var topPlayfield = new TestPlayfield();
             topPlayfield.AddNested(playfield1 = new TestPlayfield());
             topPlayfield.AddNested(playfield2 = new TestPlayfield());
 
-            eventQueue = new HitObjectContainerEventQueue(topPlayfield);
-            eventQueue.HitObjectUsageBegan += onHitObjectUsageBegan;
-            eventQueue.HitObjectUsageFinished += onHitObjectUsageFinished;
-            eventQueue.HitObjectUsageTransferred += onHitObjectUsageTransferred;
+            eventBuffer = new HitObjectUsageEventBuffer(topPlayfield);
+            eventBuffer.HitObjectUsageBegan += onHitObjectUsageBegan;
+            eventBuffer.HitObjectUsageFinished += onHitObjectUsageFinished;
+            eventBuffer.HitObjectUsageTransferred += onHitObjectUsageTransferred;
 
             Children = new Drawable[]
             {
                 topPlayfield,
                 intermediateDrawable = new TestDrawable(),
-                eventQueue
+                eventBuffer
             };
         });
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
index c62ea43331..fdea26d92b 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 foreach (var obj in Composer.HitObjects)
                     AddBlueprintFor(obj.HitObject);
 
-                var eventQueue = new HitObjectContainerEventQueue(Composer.Playfield);
+                var eventQueue = new HitObjectUsageEventBuffer(Composer.Playfield);
                 eventQueue.HitObjectUsageBegan += AddBlueprintFor;
                 eventQueue.HitObjectUsageFinished += RemoveBlueprintFor;
                 eventQueue.HitObjectUsageTransferred += TransferBlueprintFor;
diff --git a/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs b/osu.Game/Screens/Edit/Compose/HitObjectUsageEventBuffer.cs
similarity index 93%
rename from osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs
rename to osu.Game/Screens/Edit/Compose/HitObjectUsageEventBuffer.cs
index 6c1a3b06bb..8c69e9e707 100644
--- a/osu.Game/Screens/Edit/Compose/HitObjectContainerEventQueue.cs
+++ b/osu.Game/Screens/Edit/Compose/HitObjectUsageEventBuffer.cs
@@ -13,9 +13,9 @@ using osu.Game.Rulesets.UI;
 namespace osu.Game.Screens.Edit.Compose
 {
     /// <summary>
-    /// A queue which processes events from the many <see cref="HitObjectContainer"/>s in a nested <see cref="Playfield"/> hierarchy.
+    /// Buffers events from the many <see cref="HitObjectContainer"/>s in a nested <see cref="Playfield"/> hierarchy.
     /// </summary>
-    internal class HitObjectContainerEventQueue : Component
+    internal class HitObjectUsageEventBuffer : Component
     {
         /// <summary>
         /// Invoked when a <see cref="HitObject"/> becomes used by a <see cref="DrawableHitObject"/>.
@@ -41,10 +41,10 @@ namespace osu.Game.Screens.Edit.Compose
         private readonly Playfield playfield;
 
         /// <summary>
-        /// Creates a new <see cref="HitObjectContainerEventQueue"/>.
+        /// Creates a new <see cref="HitObjectUsageEventBuffer"/>.
         /// </summary>
         /// <param name="playfield">The most top-level <see cref="Playfield"/>.</param>
-        public HitObjectContainerEventQueue([NotNull] Playfield playfield)
+        public HitObjectUsageEventBuffer([NotNull] Playfield playfield)
         {
             this.playfield = playfield;
 
@@ -70,7 +70,7 @@ namespace osu.Game.Screens.Edit.Compose
             {
                 // This exists as a safeguard to ensure that the sequence: { Began -> Finished }, where { ... } indicates a sequence within a single frame, does not trigger any events.
                 // This is unlikely to occur in practice as it requires the usage to finish immediately after the HitObjectContainer updates hitobject lifetimes,
-                // however, an Editor action scheduled somewhere between the lifetime update and this event queue's own Update() could cause this.
+                // however, an Editor action scheduled somewhere between the lifetime update and this buffer's own Update() could cause this.
                 case (EventType.Began, EventType.Finished):
                     pendingEvents.Remove(hitObject);
                     break;

From 97f4f7bbd1473b7664ab9d07cc8a38382b72391a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 May 2021 18:59:45 +0900
Subject: [PATCH 3569/3722] Remove Component inheritance

---
 ...TestSceneHitObjectContainerEventBuffer.cs} |  9 +++++++--
 .../Components/EditorBlueprintContainer.cs    | 19 ++++++++++++++-----
 .../Edit/Compose/HitObjectUsageEventBuffer.cs | 18 ++++++++----------
 3 files changed, 29 insertions(+), 17 deletions(-)
 rename osu.Game.Tests/Editing/{TestSceneHitObjectContainerEventQueue.cs => TestSceneHitObjectContainerEventBuffer.cs} (96%)

diff --git a/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventQueue.cs b/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventBuffer.cs
similarity index 96%
rename from osu.Game.Tests/Editing/TestSceneHitObjectContainerEventQueue.cs
rename to osu.Game.Tests/Editing/TestSceneHitObjectContainerEventBuffer.cs
index ebf98c4c56..30e72150f1 100644
--- a/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventQueue.cs
+++ b/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventBuffer.cs
@@ -12,7 +12,7 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Tests.Editing
 {
-    public class TestSceneHitObjectContainerEventQueue : OsuTestScene
+    public class TestSceneHitObjectContainerEventBuffer : OsuTestScene
     {
         private readonly TestHitObject testObj = new TestHitObject();
 
@@ -50,7 +50,6 @@ namespace osu.Game.Tests.Editing
             {
                 topPlayfield,
                 intermediateDrawable = new TestDrawable(),
-                eventBuffer
             };
         });
 
@@ -117,6 +116,12 @@ namespace osu.Game.Tests.Editing
             addCheckStep(finished: true);
         }
 
+        protected override void UpdateAfterChildren()
+        {
+            base.UpdateAfterChildren();
+            eventBuffer.Update();
+        }
+
         private void addResetStep() => AddStep("reset", reset);
 
         private void reset()
diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
index fdea26d92b..5a6f98f504 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
@@ -23,6 +23,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected readonly HitObjectComposer Composer;
 
+        private HitObjectUsageEventBuffer usageEventBuffer;
+
         protected EditorBlueprintContainer(HitObjectComposer composer)
         {
             Composer = composer;
@@ -46,14 +48,19 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 foreach (var obj in Composer.HitObjects)
                     AddBlueprintFor(obj.HitObject);
 
-                var eventQueue = new HitObjectUsageEventBuffer(Composer.Playfield);
-                eventQueue.HitObjectUsageBegan += AddBlueprintFor;
-                eventQueue.HitObjectUsageFinished += RemoveBlueprintFor;
-                eventQueue.HitObjectUsageTransferred += TransferBlueprintFor;
-                AddInternal(eventQueue);
+                usageEventBuffer = new HitObjectUsageEventBuffer(Composer.Playfield);
+                usageEventBuffer.HitObjectUsageBegan += AddBlueprintFor;
+                usageEventBuffer.HitObjectUsageFinished += RemoveBlueprintFor;
+                usageEventBuffer.HitObjectUsageTransferred += TransferBlueprintFor;
             }
         }
 
+        protected override void Update()
+        {
+            base.Update();
+            usageEventBuffer?.Update();
+        }
+
         protected override IEnumerable<SelectionBlueprint<HitObject>> SortForMovement(IReadOnlyList<SelectionBlueprint<HitObject>> blueprints)
             => blueprints.OrderBy(b => b.Item.StartTime);
 
@@ -145,6 +152,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 Beatmap.HitObjectAdded -= AddBlueprintFor;
                 Beatmap.HitObjectRemoved -= RemoveBlueprintFor;
             }
+
+            usageEventBuffer?.Dispose();
         }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/HitObjectUsageEventBuffer.cs b/osu.Game/Screens/Edit/Compose/HitObjectUsageEventBuffer.cs
index 8c69e9e707..cbaf9b4f26 100644
--- a/osu.Game/Screens/Edit/Compose/HitObjectUsageEventBuffer.cs
+++ b/osu.Game/Screens/Edit/Compose/HitObjectUsageEventBuffer.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
-using osu.Framework.Graphics;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
@@ -15,7 +14,7 @@ namespace osu.Game.Screens.Edit.Compose
     /// <summary>
     /// Buffers events from the many <see cref="HitObjectContainer"/>s in a nested <see cref="Playfield"/> hierarchy.
     /// </summary>
-    internal class HitObjectUsageEventBuffer : Component
+    internal class HitObjectUsageEventBuffer : IDisposable
     {
         /// <summary>
         /// Invoked when a <see cref="HitObject"/> becomes used by a <see cref="DrawableHitObject"/>.
@@ -91,10 +90,8 @@ namespace osu.Game.Screens.Edit.Compose
             }
         }
 
-        protected override void Update()
+        public void Update()
         {
-            base.Update();
-
             foreach (var (hitObject, e) in pendingEvents)
             {
                 switch (e)
@@ -116,12 +113,13 @@ namespace osu.Game.Screens.Edit.Compose
             pendingEvents.Clear();
         }
 
-        protected override void Dispose(bool isDisposing)
+        public void Dispose()
         {
-            base.Dispose(isDisposing);
-
-            playfield.HitObjectUsageBegan -= onHitObjectUsageBegan;
-            playfield.HitObjectUsageFinished -= onHitObjectUsageFinished;
+            if (playfield != null)
+            {
+                playfield.HitObjectUsageBegan -= onHitObjectUsageBegan;
+                playfield.HitObjectUsageFinished -= onHitObjectUsageFinished;
+            }
         }
 
         private enum EventType

From ab6a79f84cccfe9b72f7dcb9966010366f4b0cda Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 May 2021 19:10:45 +0900
Subject: [PATCH 3570/3722] Simplify

---
 .../TestSceneHitObjectContainerEventBuffer.cs |  4 +-
 .../Edit/Compose/HitObjectUsageEventBuffer.cs | 88 +++----------------
 2 files changed, 13 insertions(+), 79 deletions(-)

diff --git a/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventBuffer.cs b/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventBuffer.cs
index 30e72150f1..5233cbc0be 100644
--- a/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventBuffer.cs
+++ b/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventBuffer.cs
@@ -98,7 +98,7 @@ namespace osu.Game.Tests.Editing
                 intermediateDrawable.Schedule(() => playfield1.Remove(testObj));
             });
 
-            addCheckStep();
+            addCheckStep(began: true, finished: true);
         }
 
         [Test]
@@ -113,7 +113,7 @@ namespace osu.Game.Tests.Editing
                 intermediateDrawable.Schedule(() => playfield2.Remove(testObj));
             });
 
-            addCheckStep(finished: true);
+            addCheckStep(transferred: true, finished: true);
         }
 
         protected override void UpdateAfterChildren()
diff --git a/osu.Game/Screens/Edit/Compose/HitObjectUsageEventBuffer.cs b/osu.Game/Screens/Edit/Compose/HitObjectUsageEventBuffer.cs
index cbaf9b4f26..fce5aa42ac 100644
--- a/osu.Game/Screens/Edit/Compose/HitObjectUsageEventBuffer.cs
+++ b/osu.Game/Screens/Edit/Compose/HitObjectUsageEventBuffer.cs
@@ -51,66 +51,23 @@ namespace osu.Game.Screens.Edit.Compose
             playfield.HitObjectUsageFinished += onHitObjectUsageFinished;
         }
 
-        private readonly Dictionary<HitObject, EventType> pendingEvents = new Dictionary<HitObject, EventType>();
+        private readonly List<HitObject> usageFinishedHitObjects = new List<HitObject>();
 
-        private void onHitObjectUsageBegan(HitObject hitObject) => updateEvent(hitObject, EventType.Began);
-
-        private void onHitObjectUsageFinished(HitObject hitObject) => updateEvent(hitObject, EventType.Finished);
-
-        private void updateEvent(HitObject hitObject, EventType newEvent)
+        private void onHitObjectUsageBegan(HitObject hitObject)
         {
-            if (!pendingEvents.TryGetValue(hitObject, out EventType existingEvent))
-            {
-                pendingEvents[hitObject] = newEvent;
-                return;
-            }
-
-            switch (existingEvent, newEvent)
-            {
-                // This exists as a safeguard to ensure that the sequence: { Began -> Finished }, where { ... } indicates a sequence within a single frame, does not trigger any events.
-                // This is unlikely to occur in practice as it requires the usage to finish immediately after the HitObjectContainer updates hitobject lifetimes,
-                // however, an Editor action scheduled somewhere between the lifetime update and this buffer's own Update() could cause this.
-                case (EventType.Began, EventType.Finished):
-                    pendingEvents.Remove(hitObject);
-                    break;
-
-                // This exists as a safeguard to ensure that the sequence: Began -> { Finished -> Began -> Finished }, where { ... } indicates a sequence within a single frame,
-                // correctly leads into a final "finished" state rather than remaining in the intermediate "transferred" state.
-                // As above, this is unlikely to occur in practice.
-                case (EventType.Transferred, EventType.Finished):
-                    pendingEvents[hitObject] = EventType.Finished;
-                    break;
-
-                case (EventType.Finished, EventType.Began):
-                    pendingEvents[hitObject] = EventType.Transferred;
-                    break;
-
-                default:
-                    throw new ArgumentOutOfRangeException($"Unexpected event update ({existingEvent} => {newEvent}).");
-            }
+            if (usageFinishedHitObjects.Remove(hitObject))
+                HitObjectUsageTransferred?.Invoke(hitObject, playfield.AllHitObjects.Single(d => d.HitObject == hitObject));
+            else
+                HitObjectUsageBegan?.Invoke(hitObject);
         }
 
+        private void onHitObjectUsageFinished(HitObject hitObject) => usageFinishedHitObjects.Add(hitObject);
+
         public void Update()
         {
-            foreach (var (hitObject, e) in pendingEvents)
-            {
-                switch (e)
-                {
-                    case EventType.Began:
-                        HitObjectUsageBegan?.Invoke(hitObject);
-                        break;
-
-                    case EventType.Transferred:
-                        HitObjectUsageTransferred?.Invoke(hitObject, playfield.AllHitObjects.Single(d => d.HitObject == hitObject));
-                        break;
-
-                    case EventType.Finished:
-                        HitObjectUsageFinished?.Invoke(hitObject);
-                        break;
-                }
-            }
-
-            pendingEvents.Clear();
+            foreach (var hitObject in usageFinishedHitObjects)
+                HitObjectUsageFinished?.Invoke(hitObject);
+            usageFinishedHitObjects.Clear();
         }
 
         public void Dispose()
@@ -121,28 +78,5 @@ namespace osu.Game.Screens.Edit.Compose
                 playfield.HitObjectUsageFinished -= onHitObjectUsageFinished;
             }
         }
-
-        private enum EventType
-        {
-            /// <summary>
-            /// A <see cref="HitObject"/> has started being used by a <see cref="DrawableHitObject"/>.
-            /// </summary>
-            Began,
-
-            /// <summary>
-            /// A <see cref="HitObject"/> has finished being used by a <see cref="DrawableHitObject"/>.
-            /// </summary>
-            Finished,
-
-            /// <summary>
-            /// An internal intermediate state that occurs when a <see cref="HitObject"/> has finished being used by one <see cref="DrawableHitObject"/>
-            /// and started being used by another <see cref="DrawableHitObject"/> in the same frame. The <see cref="DrawableHitObject"/> may be the same instance in both cases.
-            /// </summary>
-            /// <remarks>
-            /// This usually occurs when a <see cref="HitObject"/> is transferred between <see cref="HitObjectContainer"/>s,
-            /// but also occurs if the <see cref="HitObject"/> dies and becomes alive again in the same frame within the same <see cref="HitObjectContainer"/>.
-            /// </remarks>
-            Transferred
-        }
     }
 }

From d93ac7ac9842d08a0f0995779e1c179ed031870e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 May 2021 19:13:13 +0900
Subject: [PATCH 3571/3722] Change class xmldoc a bit

---
 osu.Game/Screens/Edit/Compose/HitObjectUsageEventBuffer.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/HitObjectUsageEventBuffer.cs b/osu.Game/Screens/Edit/Compose/HitObjectUsageEventBuffer.cs
index fce5aa42ac..621c901fb9 100644
--- a/osu.Game/Screens/Edit/Compose/HitObjectUsageEventBuffer.cs
+++ b/osu.Game/Screens/Edit/Compose/HitObjectUsageEventBuffer.cs
@@ -12,7 +12,8 @@ using osu.Game.Rulesets.UI;
 namespace osu.Game.Screens.Edit.Compose
 {
     /// <summary>
-    /// Buffers events from the many <see cref="HitObjectContainer"/>s in a nested <see cref="Playfield"/> hierarchy.
+    /// Buffers events from the many <see cref="HitObjectContainer"/>s in a nested <see cref="Playfield"/> hierarchy
+    /// to ensure correct ordering of events.
     /// </summary>
     internal class HitObjectUsageEventBuffer : IDisposable
     {

From 2c65b8fa9366fded6ae5f3f2167b768a3017f3d5 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 18 May 2021 19:55:25 +0900
Subject: [PATCH 3572/3722] Revert "Fix uninitialized scrollLength value is
 used"

This reverts commit 73dfb04d
---
 .../Scrolling/ScrollingHitObjectContainer.cs  | 33 ++++++++++++++-----
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index 538d4d1d11..915bab9a51 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -185,6 +185,8 @@ namespace osu.Game.Rulesets.UI.Scrolling
             layoutComputed.Remove(hitObject);
         }
 
+        private float scrollLength;
+
         protected override void Update()
         {
             base.Update();
@@ -197,16 +199,29 @@ namespace osu.Game.Rulesets.UI.Scrolling
                 layoutComputed.Clear();
 
                 scrollingInfo.Algorithm.Reset();
+
+                switch (direction.Value)
+                {
+                    case ScrollingDirection.Up:
+                    case ScrollingDirection.Down:
+                        scrollLength = DrawSize.Y;
+                        break;
+
+                    default:
+                        scrollLength = DrawSize.X;
+                        break;
+                }
+
                 layoutCache.Validate();
             }
         }
 
-        // We need to calculate hit object positions (including nested hit objects) as soon as possible after lifetimes
-        // to prevent hit objects displayed in a wrong position for one frame.
         protected override void UpdateAfterChildrenLife()
         {
             base.UpdateAfterChildrenLife();
 
+            // We need to calculate hit object positions (including nested hit objects) as soon as possible after lifetimes
+            // to prevent hit objects displayed in a wrong position for one frame.
             // Only AliveObjects need to be considered for layout (reduces overhead in the case of scroll speed changes).
             foreach (var obj in AliveObjects)
             {
@@ -245,7 +260,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
                     break;
             }
 
-            entry.LifetimeStart = scrollingInfo.Algorithm.GetDisplayStartTime(entry.HitObject.StartTime, startOffset, timeRange.Value, getLength());
+            entry.LifetimeStart = scrollingInfo.Algorithm.GetDisplayStartTime(entry.HitObject.StartTime, startOffset, timeRange.Value, scrollLength);
         }
 
         private void updateLayoutRecursive(DrawableHitObject hitObject)
@@ -256,12 +271,12 @@ namespace osu.Game.Rulesets.UI.Scrolling
                 {
                     case ScrollingDirection.Up:
                     case ScrollingDirection.Down:
-                        hitObject.Height = scrollingInfo.Algorithm.GetLength(hitObject.HitObject.StartTime, e.EndTime, timeRange.Value, getLength());
+                        hitObject.Height = scrollingInfo.Algorithm.GetLength(hitObject.HitObject.StartTime, e.EndTime, timeRange.Value, scrollLength);
                         break;
 
                     case ScrollingDirection.Left:
                     case ScrollingDirection.Right:
-                        hitObject.Width = scrollingInfo.Algorithm.GetLength(hitObject.HitObject.StartTime, e.EndTime, timeRange.Value, getLength());
+                        hitObject.Width = scrollingInfo.Algorithm.GetLength(hitObject.HitObject.StartTime, e.EndTime, timeRange.Value, scrollLength);
                         break;
                 }
             }
@@ -280,19 +295,19 @@ namespace osu.Game.Rulesets.UI.Scrolling
             switch (direction.Value)
             {
                 case ScrollingDirection.Up:
-                    hitObject.Y = scrollingInfo.Algorithm.PositionAt(hitObject.HitObject.StartTime, currentTime, timeRange.Value, getLength());
+                    hitObject.Y = scrollingInfo.Algorithm.PositionAt(hitObject.HitObject.StartTime, currentTime, timeRange.Value, scrollLength);
                     break;
 
                 case ScrollingDirection.Down:
-                    hitObject.Y = -scrollingInfo.Algorithm.PositionAt(hitObject.HitObject.StartTime, currentTime, timeRange.Value, getLength());
+                    hitObject.Y = -scrollingInfo.Algorithm.PositionAt(hitObject.HitObject.StartTime, currentTime, timeRange.Value, scrollLength);
                     break;
 
                 case ScrollingDirection.Left:
-                    hitObject.X = scrollingInfo.Algorithm.PositionAt(hitObject.HitObject.StartTime, currentTime, timeRange.Value, getLength());
+                    hitObject.X = scrollingInfo.Algorithm.PositionAt(hitObject.HitObject.StartTime, currentTime, timeRange.Value, scrollLength);
                     break;
 
                 case ScrollingDirection.Right:
-                    hitObject.X = -scrollingInfo.Algorithm.PositionAt(hitObject.HitObject.StartTime, currentTime, timeRange.Value, getLength());
+                    hitObject.X = -scrollingInfo.Algorithm.PositionAt(hitObject.HitObject.StartTime, currentTime, timeRange.Value, scrollLength);
                     break;
             }
         }

From 84a1a86c6329ff60021190f4c070c28707e736c3 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 18 May 2021 19:55:31 +0900
Subject: [PATCH 3573/3722] Revert "Use entry to calculate lifetime in
 ScrollingHOC"

This reverts commit 632bb70e
---
 .../Scrolling/ScrollingHitObjectContainer.cs  | 60 +++++++++++--------
 1 file changed, 36 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index 915bab9a51..a9eaf3da68 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -5,9 +5,7 @@ using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Primitives;
 using osu.Framework.Layout;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osuTK;
@@ -19,18 +17,16 @@ namespace osu.Game.Rulesets.UI.Scrolling
         private readonly IBindable<double> timeRange = new BindableDouble();
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
+        /// <summary>
+        /// Hit objects which require lifetime computation in the next update call.
+        /// </summary>
+        private readonly HashSet<DrawableHitObject> toComputeLifetime = new HashSet<DrawableHitObject>();
+
         /// <summary>
         /// A set containing all <see cref="HitObjectContainer.AliveObjects"/> which have an up-to-date layout.
         /// </summary>
         private readonly HashSet<DrawableHitObject> layoutComputed = new HashSet<DrawableHitObject>();
 
-        /// <summary>
-        /// A conservative estimate of maximum bounding box of a <see cref="DrawableHitObject"/>
-        /// with respect to the start time position of the hit object.
-        /// It is used to calculate when the object appears inbound.
-        /// </summary>
-        protected virtual RectangleF GetDrawRectangle(HitObjectLifetimeEntry entry) => new RectangleF().Inflate(100);
-
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; }
 
@@ -58,6 +54,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
         {
             base.Clear();
 
+            toComputeLifetime.Clear();
             layoutComputed.Clear();
         }
 
@@ -169,6 +166,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
         private void onRemoveRecursive(DrawableHitObject hitObject)
         {
+            toComputeLifetime.Remove(hitObject);
             layoutComputed.Remove(hitObject);
 
             hitObject.DefaultsApplied -= invalidateHitObject;
@@ -177,11 +175,14 @@ namespace osu.Game.Rulesets.UI.Scrolling
                 onRemoveRecursive(nested);
         }
 
+        /// <summary>
+        /// Make this <see cref="DrawableHitObject"/> lifetime and layout computed in next update.
+        /// </summary>
         private void invalidateHitObject(DrawableHitObject hitObject)
         {
-            if (hitObject.ParentHitObject == null)
-                updateLifetime(hitObject.Entry);
-
+            // Lifetime computation is delayed until next update because
+            // when the hit object is not pooled this container is not loaded here and `scrollLength` cannot be computed.
+            toComputeLifetime.Add(hitObject);
             layoutComputed.Remove(hitObject);
         }
 
@@ -193,8 +194,13 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
             if (!layoutCache.IsValid)
             {
-                foreach (var entry in Entries)
-                    updateLifetime(entry);
+                toComputeLifetime.Clear();
+
+                foreach (var hitObject in Objects)
+                {
+                    if (hitObject.HitObject != null)
+                        toComputeLifetime.Add(hitObject);
+                }
 
                 layoutComputed.Clear();
 
@@ -214,6 +220,11 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
                 layoutCache.Validate();
             }
+
+            foreach (var hitObject in toComputeLifetime)
+                hitObject.LifetimeStart = computeOriginAdjustedLifetimeStart(hitObject);
+
+            toComputeLifetime.Clear();
         }
 
         protected override void UpdateAfterChildrenLife()
@@ -236,31 +247,32 @@ namespace osu.Game.Rulesets.UI.Scrolling
             }
         }
 
-        private void updateLifetime(HitObjectLifetimeEntry entry)
+        private double computeOriginAdjustedLifetimeStart(DrawableHitObject hitObject)
         {
-            var rectangle = GetDrawRectangle(entry);
-            float startOffset = 0;
+            float originAdjustment = 0.0f;
 
+            // calculate the dimension of the part of the hitobject that should already be visible
+            // when the hitobject origin first appears inside the scrolling container
             switch (direction.Value)
             {
-                case ScrollingDirection.Right:
-                    startOffset = rectangle.Right;
+                case ScrollingDirection.Up:
+                    originAdjustment = hitObject.OriginPosition.Y;
                     break;
 
                 case ScrollingDirection.Down:
-                    startOffset = rectangle.Bottom;
+                    originAdjustment = hitObject.DrawHeight - hitObject.OriginPosition.Y;
                     break;
 
                 case ScrollingDirection.Left:
-                    startOffset = -rectangle.Left;
+                    originAdjustment = hitObject.OriginPosition.X;
                     break;
 
-                case ScrollingDirection.Up:
-                    startOffset = -rectangle.Top;
+                case ScrollingDirection.Right:
+                    originAdjustment = hitObject.DrawWidth - hitObject.OriginPosition.X;
                     break;
             }
 
-            entry.LifetimeStart = scrollingInfo.Algorithm.GetDisplayStartTime(entry.HitObject.StartTime, startOffset, timeRange.Value, scrollLength);
+            return scrollingInfo.Algorithm.GetDisplayStartTime(hitObject.HitObject.StartTime, originAdjustment, timeRange.Value, scrollLength);
         }
 
         private void updateLayoutRecursive(DrawableHitObject hitObject)

From ee9fe3c4bef77f8c7e4c3d67882fa741e1d86932 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Tue, 18 May 2021 19:55:44 +0900
Subject: [PATCH 3574/3722] Revert "Add failing test showing lifetime not
 recomputed with pooled objects"

This reverts commit b88e5a31
---
 .../Gameplay/TestSceneDrawableScrollingRuleset.cs  | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
index 75a5eec6f7..9931ee4a45 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
@@ -90,20 +90,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             assertChildPosition(5);
         }
 
-        [TestCase("pooled")]
-        [TestCase("non-pooled")]
-        public void TestLifetimeRecomputedWhenTimeRangeChanges(string pooled)
-        {
-            var beatmap = createBeatmap(_ => pooled == "pooled" ? new TestPooledHitObject() : new TestHitObject());
-            beatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = time_range });
-            createTest(beatmap);
-
-            assertDead(3);
-
-            AddStep("increase time range", () => drawableRuleset.TimeRange.Value = 3 * time_range);
-            assertPosition(3, 1);
-        }
-
         [Test]
         public void TestRelativeBeatLengthScaleSingleTimingPoint()
         {

From 5f94b3bdacfcd6c7f4eb53e038767df905d234d1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 May 2021 21:03:59 +0900
Subject: [PATCH 3575/3722] Remove legacy playlist item ID handling

---
 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
index c0706b082d..7fe48d54b1 100644
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
@@ -92,10 +92,6 @@ namespace osu.Game.Online.Multiplayer
         [Resolved]
         private UserLookupCache userLookupCache { get; set; } = null!;
 
-        // Only exists for compatibility with old osu-server-spectator build.
-        // Todo: Can be removed on 2021/02/26.
-        private long defaultPlaylistItemId;
-
         private Room? apiRoom;
 
         [BackgroundDependencyLoader]
@@ -143,7 +139,6 @@ namespace osu.Game.Online.Multiplayer
                 {
                     Room = joinedRoom;
                     apiRoom = room;
-                    defaultPlaylistItemId = apiRoom.Playlist.FirstOrDefault()?.ID ?? 0;
                     foreach (var user in joinedRoom.Users)
                         updateUserPlayingState(user.UserID, user.State);
                 }, cancellationSource.Token).ConfigureAwait(false);
@@ -581,7 +576,7 @@ namespace osu.Game.Online.Multiplayer
 
             void updateItem(PlaylistItem item)
             {
-                item.ID = settings.PlaylistItemId == 0 ? defaultPlaylistItemId : settings.PlaylistItemId;
+                item.ID = settings.PlaylistItemId;
                 item.Beatmap.Value = beatmap;
                 item.Ruleset.Value = ruleset.RulesetInfo;
                 item.RequiredMods.Clear();

From c6160d53044b35abd0ee8168b0bb28344dd4d345 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 May 2021 21:17:33 +0900
Subject: [PATCH 3576/3722] Only ignore online score id for database import

---
 osu.Game/Screens/Play/Player.cs           | 17 ++++++++++++++---
 osu.Game/Screens/Play/SubmittingPlayer.cs |  7 +------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 890883f0d2..6317a41bec 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -929,11 +929,11 @@ namespace osu.Game.Screens.Play
         /// </summary>
         /// <param name="score">The <see cref="Score"/> to import.</param>
         /// <returns>The imported score.</returns>
-        protected virtual Task ImportScore(Score score)
+        protected virtual async Task ImportScore(Score score)
         {
             // Replays are already populated and present in the game's database, so should not be re-imported.
             if (DrawableRuleset.ReplayScore != null)
-                return Task.CompletedTask;
+                return;
 
             LegacyByteArrayReader replayReader;
 
@@ -943,7 +943,18 @@ namespace osu.Game.Screens.Play
                 replayReader = new LegacyByteArrayReader(stream.ToArray(), "replay.osr");
             }
 
-            return scoreManager.Import(score.ScoreInfo, replayReader);
+            // 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).
+            long? onlineScoreId = score.ScoreInfo.OnlineScoreID;
+            score.ScoreInfo.OnlineScoreID = null;
+
+            await scoreManager.Import(score.ScoreInfo, replayReader).ConfigureAwait(false);
+
+            // ... And restore the online ID for other processes to handle correctly (e.g. de-duplication for the results screen).
+            score.ScoreInfo.OnlineScoreID = onlineScoreId;
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/Play/SubmittingPlayer.cs b/osu.Game/Screens/Play/SubmittingPlayer.cs
index d5ad87c70c..23b9037244 100644
--- a/osu.Game/Screens/Play/SubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/SubmittingPlayer.cs
@@ -116,12 +116,7 @@ namespace osu.Game.Screens.Play
 
             request.Success += s =>
             {
-                // 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).
-                // score.ScoreInfo.OnlineScoreID = s.ID;
+                score.ScoreInfo.OnlineScoreID = s.ID;
                 tcs.SetResult(true);
             };
 

From 775e0fbde5e6de0a7d20558e105b251ed994f8da Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 18 May 2021 15:27:20 +0200
Subject: [PATCH 3577/3722] Mark StableImportManager as nullable.

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

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 729e25203f..74e10037ab 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Screens.Select
 
         protected virtual bool ShowFooter => true;
 
-        protected virtual bool DisplayStableImportPrompt => stableImportManager.SupportsImportFromStable;
+        protected virtual bool DisplayStableImportPrompt => stableImportManager?.SupportsImportFromStable == true;
 
         /// <summary>
         /// Can be null if <see cref="ShowFooter"/> is false.
@@ -85,7 +85,7 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 
-        [Resolved]
+        [Resolved(CanBeNull = true)]
         private StableImportManager stableImportManager { get; set; }
 
         protected ModSelectOverlay ModSelect { get; private set; }

From 76a377f3e09d88bde52e9309558633219f118e3f Mon Sep 17 00:00:00 2001
From: Vinicius Barbosa <vininew921@hotmail.com>
Date: Tue, 18 May 2021 15:30:45 +0200
Subject: [PATCH 3578/3722] Fixed applause sound stopping after switching
 scores

---
 .../Ranking/Expanded/Accuracy/AccuracyCircle.cs | 10 ----------
 osu.Game/Screens/Ranking/ResultsScreen.cs       | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
index bca3a07fa6..28829c4ed8 100644
--- a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
@@ -83,8 +83,6 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
         private Container<RankBadge> badges;
         private RankText rankText;
 
-        private SkinnableSound applauseSound;
-
         public AccuracyCircle(ScoreInfo score, bool withFlair)
         {
             this.score = score;
@@ -211,13 +209,6 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
                 },
                 rankText = new RankText(score.Rank)
             };
-
-            if (withFlair)
-            {
-                AddInternal(applauseSound = score.Rank >= ScoreRank.A
-                    ? new SkinnableSound(new SampleInfo("Results/rankpass", "applause"))
-                    : new SkinnableSound(new SampleInfo("Results/rankfail")));
-            }
         }
 
         private ScoreRank getRank(ScoreRank rank)
@@ -256,7 +247,6 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
 
                 using (BeginDelayedSequence(TEXT_APPEAR_DELAY, true))
                 {
-                    this.Delay(-1440).Schedule(() => applauseSound?.Play());
                     rankText.Appear();
                 }
             }
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index c1f5d92d17..20480c5367 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -12,6 +12,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Screens;
+using osu.Game.Audio;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
@@ -19,7 +20,9 @@ using osu.Game.Online.API;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
+using osu.Game.Screens.Ranking.Expanded.Accuracy;
 using osu.Game.Screens.Ranking.Statistics;
+using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Screens.Ranking
@@ -56,6 +59,8 @@ namespace osu.Game.Screens.Ranking
         private readonly bool allowRetry;
         private readonly bool allowWatchingReplay;
 
+        private SkinnableSound applauseSound;
+
         protected ResultsScreen(ScoreInfo score, bool allowRetry, bool allowWatchingReplay = true)
         {
             Score = score;
@@ -146,6 +151,13 @@ namespace osu.Game.Screens.Ranking
                 bool shouldFlair = player != null && !Score.Mods.Any(m => m is ModAutoplay);
 
                 ScorePanelList.AddScore(Score, shouldFlair);
+
+                if (shouldFlair)
+                {
+                    AddInternal(applauseSound = Score.Rank >= ScoreRank.A
+                        ? new SkinnableSound(new SampleInfo("Results/rankpass", "applause"))
+                        : new SkinnableSound(new SampleInfo("Results/rankfail")));
+                }
             }
 
             if (allowWatchingReplay)
@@ -183,6 +195,11 @@ namespace osu.Game.Screens.Ranking
                 api.Queue(req);
 
             statisticsPanel.State.BindValueChanged(onStatisticsStateChanged, true);
+
+            using(BeginDelayedSequence(AccuracyCircle.ACCURACY_TRANSFORM_DELAY + AccuracyCircle.TEXT_APPEAR_DELAY, true))
+            {
+                this.Delay(-1000).Schedule(() => applauseSound?.Play());
+            }
         }
 
         protected override void Update()

From 06fffc499b3dd28759e44af39a5ca66176fbd193 Mon Sep 17 00:00:00 2001
From: Vinicius Barbosa <vininew921@hotmail.com>
Date: Tue, 18 May 2021 16:56:07 +0200
Subject: [PATCH 3579/3722] Removed unused variables and directives

---
 osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs | 5 -----
 osu.Game/Screens/Ranking/ResultsScreen.cs                    | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
index 28829c4ed8..ec48a6313b 100644
--- a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
@@ -10,11 +10,9 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Utils;
-using osu.Game.Audio;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
-using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Screens.Ranking.Expanded.Accuracy
@@ -76,8 +74,6 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
 
         private readonly ScoreInfo score;
 
-        private readonly bool withFlair;
-
         private SmoothCircularProgress accuracyCircle;
         private SmoothCircularProgress innerMask;
         private Container<RankBadge> badges;
@@ -86,7 +82,6 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
         public AccuracyCircle(ScoreInfo score, bool withFlair)
         {
             this.score = score;
-            this.withFlair = withFlair;
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 20480c5367..ab065f7dd4 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -196,7 +196,7 @@ namespace osu.Game.Screens.Ranking
 
             statisticsPanel.State.BindValueChanged(onStatisticsStateChanged, true);
 
-            using(BeginDelayedSequence(AccuracyCircle.ACCURACY_TRANSFORM_DELAY + AccuracyCircle.TEXT_APPEAR_DELAY, true))
+            using (BeginDelayedSequence(AccuracyCircle.ACCURACY_TRANSFORM_DELAY + AccuracyCircle.TEXT_APPEAR_DELAY, true))
             {
                 this.Delay(-1000).Schedule(() => applauseSound?.Play());
             }

From ac5fe0c18cf50c2fa8b1bd112d0f9499b0516f18 Mon Sep 17 00:00:00 2001
From: timiimit <timi.korda@gmail.com>
Date: Tue, 18 May 2021 15:58:18 +0200
Subject: [PATCH 3580/3722] Change larger freemod selection overlay

---
 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 375aac729d..fa30826ee9 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
                     Origin = Anchor.BottomLeft,
                     Depth = float.MinValue,
                     RelativeSizeAxes = Axes.Both,
-                    Height = 0.5f,
+                    Height = 1.0f,
                     Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING },
                     Child = userModsSelectOverlay = new UserModSelectOverlay
                     {

From d05ffdf120c0f13080f43d71b16884efb9d5da8c Mon Sep 17 00:00:00 2001
From: Vinicius Barbosa <vininew921@hotmail.com>
Date: Tue, 18 May 2021 20:19:18 +0200
Subject: [PATCH 3581/3722] Added constants for delay value

---
 .../Visual/Ranking/TestSceneAccuracyCircle.cs  |  2 +-
 .../Expanded/Accuracy/AccuracyCircle.cs        |  7 ++++++-
 .../Expanded/ExpandedPanelMiddleContent.cs     |  2 +-
 osu.Game/Screens/Ranking/ResultsScreen.cs      |  2 +-
 osu.Game/Screens/Ranking/ScorePanel.cs         | 18 +++++++++---------
 5 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
index 2af15923a0..1e87893f39 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Tests.Visual.Ranking
                         }
                     }
                 },
-                new AccuracyCircle(score, true)
+                new AccuracyCircle(score)
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
index ec48a6313b..4fca4759f2 100644
--- a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
@@ -37,6 +37,11 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
         /// </summary>
         public const double ACCURACY_TRANSFORM_DURATION = 3000;
 
+        /// <summary>
+        /// Delay before the default applause sound is played to match the <see cref="rankText"/> timing
+        /// </summary>
+        public const double APPLAUSE_DELAY = 1440;
+
         /// <summary>
         /// Delay after <see cref="ACCURACY_TRANSFORM_DURATION"/> for the rank text (A/B/C/D/S/SS) to appear.
         /// </summary>
@@ -79,7 +84,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
         private Container<RankBadge> badges;
         private RankText rankText;
 
-        public AccuracyCircle(ScoreInfo score, bool withFlair)
+        public AccuracyCircle(ScoreInfo score)
         {
             this.score = score;
         }
diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index 6a6b39b61c..4895240314 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -122,7 +122,7 @@ namespace osu.Game.Screens.Ranking.Expanded
                                     Margin = new MarginPadding { Top = 40 },
                                     RelativeSizeAxes = Axes.X,
                                     Height = 230,
-                                    Child = new AccuracyCircle(score, withFlair)
+                                    Child = new AccuracyCircle(score)
                                     {
                                         Anchor = Anchor.Centre,
                                         Origin = Anchor.Centre,
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index ab065f7dd4..e25bbbe253 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -198,7 +198,7 @@ namespace osu.Game.Screens.Ranking
 
             using (BeginDelayedSequence(AccuracyCircle.ACCURACY_TRANSFORM_DELAY + AccuracyCircle.TEXT_APPEAR_DELAY, true))
             {
-                this.Delay(-1000).Schedule(() => applauseSound?.Play());
+                this.Delay(ScorePanel.RESIZE_DURATION + ScorePanel.TOP_LAYER_EXPAND_DELAY - AccuracyCircle.APPLAUSE_DELAY).Schedule(() => applauseSound?.Play());
             }
         }
 
diff --git a/osu.Game/Screens/Ranking/ScorePanel.cs b/osu.Game/Screens/Ranking/ScorePanel.cs
index df710e4eb8..f66a998db6 100644
--- a/osu.Game/Screens/Ranking/ScorePanel.cs
+++ b/osu.Game/Screens/Ranking/ScorePanel.cs
@@ -54,12 +54,12 @@ namespace osu.Game.Screens.Ranking
         /// <summary>
         /// Duration for the panel to resize into its expanded/contracted size.
         /// </summary>
-        private const double resize_duration = 200;
+        public const double RESIZE_DURATION = 200;
 
         /// <summary>
-        /// Delay after <see cref="resize_duration"/> before the top layer is expanded.
+        /// Delay after <see cref="RESIZE_DURATION"/> before the top layer is expanded.
         /// </summary>
-        private const double top_layer_expand_delay = 100;
+        public const double TOP_LAYER_EXPAND_DELAY = 100;
 
         /// <summary>
         /// Duration for the top layer expansion.
@@ -208,8 +208,8 @@ namespace osu.Game.Screens.Ranking
                 case PanelState.Expanded:
                     Size = new Vector2(EXPANDED_WIDTH, expanded_height);
 
-                    topLayerBackground.FadeColour(expanded_top_layer_colour, resize_duration, Easing.OutQuint);
-                    middleLayerBackground.FadeColour(expanded_middle_layer_colour, resize_duration, Easing.OutQuint);
+                    topLayerBackground.FadeColour(expanded_top_layer_colour, RESIZE_DURATION, Easing.OutQuint);
+                    middleLayerBackground.FadeColour(expanded_middle_layer_colour, RESIZE_DURATION, Easing.OutQuint);
 
                     topLayerContentContainer.Add(topLayerContent = new ExpandedPanelTopContent(Score.User).With(d => d.Alpha = 0));
                     middleLayerContentContainer.Add(middleLayerContent = new ExpandedPanelMiddleContent(Score, displayWithFlair).With(d => d.Alpha = 0));
@@ -221,20 +221,20 @@ namespace osu.Game.Screens.Ranking
                 case PanelState.Contracted:
                     Size = new Vector2(CONTRACTED_WIDTH, contracted_height);
 
-                    topLayerBackground.FadeColour(contracted_top_layer_colour, resize_duration, Easing.OutQuint);
-                    middleLayerBackground.FadeColour(contracted_middle_layer_colour, resize_duration, Easing.OutQuint);
+                    topLayerBackground.FadeColour(contracted_top_layer_colour, RESIZE_DURATION, Easing.OutQuint);
+                    middleLayerBackground.FadeColour(contracted_middle_layer_colour, RESIZE_DURATION, Easing.OutQuint);
 
                     topLayerContentContainer.Add(topLayerContent = new ContractedPanelTopContent(Score).With(d => d.Alpha = 0));
                     middleLayerContentContainer.Add(middleLayerContent = new ContractedPanelMiddleContent(Score).With(d => d.Alpha = 0));
                     break;
             }
 
-            content.ResizeTo(Size, resize_duration, Easing.OutQuint);
+            content.ResizeTo(Size, RESIZE_DURATION, Easing.OutQuint);
 
             bool topLayerExpanded = topLayerContainer.Y < 0;
 
             // If the top layer was already expanded, then we don't need to wait for the resize and can instead transform immediately. This looks better when changing the panel state.
-            using (BeginDelayedSequence(topLayerExpanded ? 0 : resize_duration + top_layer_expand_delay, true))
+            using (BeginDelayedSequence(topLayerExpanded ? 0 : RESIZE_DURATION + TOP_LAYER_EXPAND_DELAY, true))
             {
                 topLayerContainer.FadeIn();
 

From d70d37b7f46ec340113e0e531ac38f0975eccf63 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 18 May 2021 22:30:36 +0300
Subject: [PATCH 3582/3722] Remove convoluted autosize logic in MonthSection

---
 .../Overlays/News/Sidebar/MonthSection.cs     | 25 +++----------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/MonthSection.cs b/osu.Game/Overlays/News/Sidebar/MonthSection.cs
index 166da97f93..2fc88b3909 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthSection.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthSection.cs
@@ -139,24 +139,23 @@ namespace osu.Game.Overlays.News.Sidebar
             {
                 RelativeSizeAxes = Axes.X;
                 AutoSizeAxes = Axes.Y;
+                AutoSizeDuration = animation_duration;
+                AutoSizeEasing = Easing.Out;
                 InternalChild = content = new FillFlowContainer
                 {
                     Margin = new MarginPadding { Top = 5 },
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
                     Direction = FillDirection.Vertical,
-                    Spacing = new Vector2(0, 5)
+                    Spacing = new Vector2(0, 5),
+                    Alpha = 0
                 };
             }
 
             protected override void LoadComplete()
             {
                 base.LoadComplete();
-
                 IsOpen.BindValueChanged(_ => updateState(), true);
-
-                // First state change should be instant.
-                FinishTransforms(true);
             }
 
             private void updateState()
@@ -176,22 +175,6 @@ namespace osu.Game.Overlays.News.Sidebar
                     content.FadeOut(animation_duration, Easing.OutQuint);
                 }
             }
-
-            private bool autoSizeTransitionApplied;
-
-            // Workaround to allow the dropdown to be opened immediately since FinishTransforms doesn't work for AutoSize{Duration,Easing}.
-            protected override void UpdateAfterAutoSize()
-            {
-                base.UpdateAfterAutoSize();
-
-                if (!autoSizeTransitionApplied)
-                {
-                    AutoSizeDuration = animation_duration;
-                    AutoSizeEasing = Easing.OutQuint;
-
-                    autoSizeTransitionApplied = true;
-                }
-            }
         }
     }
 }

From 1fd00d1313bd7ff8c5acf828843170b5f287b283 Mon Sep 17 00:00:00 2001
From: timiimit <timi.korda@gmail.com>
Date: Tue, 18 May 2021 21:52:28 +0200
Subject: [PATCH 3583/3722] Change from fullscreen to 0.7

---
 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 fa30826ee9..7395b346a4 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
                     Origin = Anchor.BottomLeft,
                     Depth = float.MinValue,
                     RelativeSizeAxes = Axes.Both,
-                    Height = 1.0f,
+                    Height = 0.7f,
                     Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING },
                     Child = userModsSelectOverlay = new UserModSelectOverlay
                     {

From bde7f88eb3bbc69e0528cab118b698fa08600825 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 18 May 2021 14:23:22 -0700
Subject: [PATCH 3584/3722] Don't show warning screen when registering on dev
 server

---
 osu.Game/Overlays/AccountCreation/ScreenWarning.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/AccountCreation/ScreenWarning.cs b/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
index b2096968fe..ea5f1a6278 100644
--- a/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
+++ b/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
@@ -26,11 +26,14 @@ namespace osu.Game.Overlays.AccountCreation
         [Resolved(CanBeNull = true)]
         private IAPIProvider api { get; set; }
 
+        [Resolved]
+        private OsuGameBase game { get; set; }
+
         private const string help_centre_url = "/help/wiki/Help_Centre#login";
 
         public override void OnEntering(IScreen last)
         {
-            if (string.IsNullOrEmpty(api?.ProvidedUsername))
+            if (string.IsNullOrEmpty(api?.ProvidedUsername) || game.UseDevelopmentServer)
             {
                 this.FadeOut();
                 this.Push(new ScreenEntry());

From 4cc573690e7d366cf801a235c156350fda7a0261 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Tue, 18 May 2021 14:32:56 -0700
Subject: [PATCH 3585/3722] Move OsuGame out of load method

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

diff --git a/osu.Game/Overlays/AccountCreation/ScreenWarning.cs b/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
index ea5f1a6278..2605a0a6d6 100644
--- a/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
+++ b/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
@@ -26,8 +26,8 @@ namespace osu.Game.Overlays.AccountCreation
         [Resolved(CanBeNull = true)]
         private IAPIProvider api { get; set; }
 
-        [Resolved]
-        private OsuGameBase game { get; set; }
+        [Resolved(canBeNull: true)]
+        private OsuGame game { get; set; }
 
         private const string help_centre_url = "/help/wiki/Help_Centre#login";
 
@@ -44,7 +44,7 @@ namespace osu.Game.Overlays.AccountCreation
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(OsuColour colours, OsuGame game, TextureStore textures)
+        private void load(OsuColour colours, TextureStore textures)
         {
             if (string.IsNullOrEmpty(api?.ProvidedUsername))
                 return;

From e8bc2cac5bc058bdae888dcd0bc67e9d84b6fc47 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 19 May 2021 13:36:39 +0900
Subject: [PATCH 3586/3722] Fix test not being marked as headless

---
 .../Editing/TestSceneHitObjectContainerEventBuffer.cs           | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventBuffer.cs b/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventBuffer.cs
index 5233cbc0be..592971dbaf 100644
--- a/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventBuffer.cs
+++ b/osu.Game.Tests/Editing/TestSceneHitObjectContainerEventBuffer.cs
@@ -4,6 +4,7 @@
 using System;
 using NUnit.Framework;
 using osu.Framework.Graphics;
+using osu.Framework.Testing;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
@@ -12,6 +13,7 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Tests.Editing
 {
+    [HeadlessTest]
     public class TestSceneHitObjectContainerEventBuffer : OsuTestScene
     {
         private readonly TestHitObject testObj = new TestHitObject();

From 539e5179fe8ef9d9cd148882a063595295872815 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 May 2021 15:45:24 +0900
Subject: [PATCH 3587/3722] Tidy up content and bind event code

---
 .../Overlays/News/Sidebar/MonthSection.cs     | 22 +++++++++----------
 osu.Game/Overlays/News/Sidebar/YearsPanel.cs  |  4 ++--
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/MonthSection.cs b/osu.Game/Overlays/News/Sidebar/MonthSection.cs
index 2fc88b3909..9fc4f49bd3 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthSection.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthSection.cs
@@ -117,10 +117,10 @@ namespace osu.Game.Overlays.News.Sidebar
             }
 
             [BackgroundDependencyLoader]
-            private void load(OverlayColourProvider colourProvider, GameHost host)
+            private void load(OverlayColourProvider overlayColours, GameHost host)
             {
-                IdleColour = colourProvider.Light2;
-                HoverColour = colourProvider.Light1;
+                IdleColour = overlayColours.Light2;
+                HoverColour = overlayColours.Light1;
 
                 TooltipText = "view in browser";
                 Action = () => host.OpenUrlExternally("https://osu.ppy.sh/home/news/" + post.Slug);
@@ -131,9 +131,7 @@ namespace osu.Game.Overlays.News.Sidebar
         {
             public readonly BindableBool IsOpen = new BindableBool();
 
-            protected override Container<Drawable> Content => content;
-
-            private readonly FillFlowContainer content;
+            protected override Container<Drawable> Content { get; }
 
             public PostsContainer()
             {
@@ -141,7 +139,7 @@ namespace osu.Game.Overlays.News.Sidebar
                 AutoSizeAxes = Axes.Y;
                 AutoSizeDuration = animation_duration;
                 AutoSizeEasing = Easing.Out;
-                InternalChild = content = new FillFlowContainer
+                InternalChild = Content = new FillFlowContainer
                 {
                     Margin = new MarginPadding { Top = 5 },
                     RelativeSizeAxes = Axes.X,
@@ -155,24 +153,24 @@ namespace osu.Game.Overlays.News.Sidebar
             protected override void LoadComplete()
             {
                 base.LoadComplete();
-                IsOpen.BindValueChanged(_ => updateState(), true);
+                IsOpen.BindValueChanged(updateState, true);
             }
 
-            private void updateState()
+            private void updateState(ValueChangedEvent<bool> isOpen)
             {
                 ClearTransforms(true);
 
-                if (IsOpen.Value)
+                if (isOpen.NewValue)
                 {
                     AutoSizeAxes = Axes.Y;
-                    content.FadeIn(animation_duration, Easing.OutQuint);
+                    Content.FadeIn(animation_duration, Easing.OutQuint);
                 }
                 else
                 {
                     AutoSizeAxes = Axes.None;
                     this.ResizeHeightTo(0, animation_duration, Easing.OutQuint);
 
-                    content.FadeOut(animation_duration, Easing.OutQuint);
+                    Content.FadeOut(animation_duration, Easing.OutQuint);
                 }
             }
         }
diff --git a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
index 849cdbf659..b6bbdbb6d4 100644
--- a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Overlays.News.Sidebar
         private FillFlowContainer yearsFlow;
 
         [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider, Bindable<APINewsSidebar> metadata)
+        private void load(OverlayColourProvider overlayColours, Bindable<APINewsSidebar> metadata)
         {
             this.metadata.BindTo(metadata);
 
@@ -35,7 +35,7 @@ namespace osu.Game.Overlays.News.Sidebar
                 new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = colourProvider.Background3
+                    Colour = overlayColours.Background3
                 },
                 new Container
                 {

From 19a07b01073f821f4c02131f7834474396ea8d49 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 May 2021 15:48:31 +0900
Subject: [PATCH 3588/3722] IsOpen -> Expanded

---
 .../Overlays/News/Sidebar/MonthSection.cs     | 21 ++++++++++---------
 osu.Game/Overlays/News/Sidebar/NewsSidebar.cs |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/MonthSection.cs b/osu.Game/Overlays/News/Sidebar/MonthSection.cs
index 9fc4f49bd3..b300a755f9 100644
--- a/osu.Game/Overlays/News/Sidebar/MonthSection.cs
+++ b/osu.Game/Overlays/News/Sidebar/MonthSection.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Overlays.News.Sidebar
     {
         private const int animation_duration = 250;
 
-        public readonly BindableBool IsOpen = new BindableBool();
+        public readonly BindableBool Expanded = new BindableBool();
 
         public MonthSection(int month, int year, IEnumerable<APINewsPost> posts)
         {
@@ -32,6 +32,7 @@ namespace osu.Game.Overlays.News.Sidebar
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
             Masking = true;
+
             InternalChild = new FillFlowContainer
             {
                 RelativeSizeAxes = Axes.X,
@@ -41,11 +42,11 @@ namespace osu.Game.Overlays.News.Sidebar
                 {
                     new DropdownHeader(month, year)
                     {
-                        IsOpen = { BindTarget = IsOpen }
+                        Expanded = { BindTarget = Expanded }
                     },
                     new PostsContainer
                     {
-                        IsOpen = { BindTarget = IsOpen },
+                        Expanded = { BindTarget = Expanded },
                         Children = posts.Select(p => new PostButton(p)).ToArray()
                     }
                 }
@@ -54,7 +55,7 @@ namespace osu.Game.Overlays.News.Sidebar
 
         private class DropdownHeader : OsuClickableContainer
         {
-            public readonly BindableBool IsOpen = new BindableBool();
+            public readonly BindableBool Expanded = new BindableBool();
 
             private readonly SpriteIcon icon;
 
@@ -64,7 +65,7 @@ namespace osu.Game.Overlays.News.Sidebar
 
                 RelativeSizeAxes = Axes.X;
                 Height = 15;
-                Action = IsOpen.Toggle;
+                Action = Expanded.Toggle;
                 Children = new Drawable[]
                 {
                     new OsuSpriteText
@@ -88,7 +89,7 @@ namespace osu.Game.Overlays.News.Sidebar
             {
                 base.LoadComplete();
 
-                IsOpen.BindValueChanged(open =>
+                Expanded.BindValueChanged(open =>
                 {
                     icon.Scale = new Vector2(1, open.NewValue ? -1 : 1);
                 }, true);
@@ -129,7 +130,7 @@ namespace osu.Game.Overlays.News.Sidebar
 
         private class PostsContainer : Container
         {
-            public readonly BindableBool IsOpen = new BindableBool();
+            public readonly BindableBool Expanded = new BindableBool();
 
             protected override Container<Drawable> Content { get; }
 
@@ -153,14 +154,14 @@ namespace osu.Game.Overlays.News.Sidebar
             protected override void LoadComplete()
             {
                 base.LoadComplete();
-                IsOpen.BindValueChanged(updateState, true);
+                Expanded.BindValueChanged(updateState, true);
             }
 
-            private void updateState(ValueChangedEvent<bool> isOpen)
+            private void updateState(ValueChangedEvent<bool> expanded)
             {
                 ClearTransforms(true);
 
-                if (isOpen.NewValue)
+                if (expanded.NewValue)
                 {
                     AutoSizeAxes = Axes.Y;
                     Content.FadeIn(animation_duration, Easing.OutQuint);
diff --git a/osu.Game/Overlays/News/Sidebar/NewsSidebar.cs b/osu.Game/Overlays/News/Sidebar/NewsSidebar.cs
index b8d283b7e2..d14ad90ef4 100644
--- a/osu.Game/Overlays/News/Sidebar/NewsSidebar.cs
+++ b/osu.Game/Overlays/News/Sidebar/NewsSidebar.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Overlays.News.Sidebar
 
                 monthsFlow.Add(new MonthSection(month, year, posts)
                 {
-                    IsOpen = { Value = i == 0 }
+                    Expanded = { Value = i == 0 }
                 });
             }
         }

From cc5c702a92ddf6306e8b136699f299b1d1c7d484 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 May 2021 17:31:47 +0900
Subject: [PATCH 3589/3722] Apply all properties after cast (looks cleaner)

---
 osu.Game.Rulesets.Mania/UI/Column.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 57d3f54716..9b5893b268 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -116,9 +116,9 @@ namespace osu.Game.Rulesets.Mania.UI
         {
             base.OnNewDrawableHitObject(drawableHitObject);
 
-            drawableHitObject.AccentColour.Value = AccentColour;
-
             DrawableManiaHitObject maniaObject = (DrawableManiaHitObject)drawableHitObject;
+
+            maniaObject.AccentColour.Value = AccentColour;
             maniaObject.CheckHittable = hitPolicy.IsHittable;
         }
 

From a0f67ef3bc1bab4ae0d07115d6df97ef23bb88d8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 May 2021 18:57:52 +0900
Subject: [PATCH 3590/3722] Move scaling logic out of `OsuSelectionHandler` for
 reuse

---
 .../Edit/OsuSelectionHandler.cs               | 18 +----------------
 .../Compose/Components/SelectionHandler.cs    | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index aaf3517c9c..8cb86bc108 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
@@ -225,26 +225,10 @@ namespace osu.Game.Rulesets.Osu.Edit
         private void scaleHitObjects(OsuHitObject[] hitObjects, Anchor reference, Vector2 scale)
         {
             scale = getClampedScale(hitObjects, reference, scale);
-
-            // move the selection before scaling if dragging from top or left anchors.
-            float xOffset = ((reference & Anchor.x0) > 0) ? -scale.X : 0;
-            float yOffset = ((reference & Anchor.y0) > 0) ? -scale.Y : 0;
-
             Quad selectionQuad = getSurroundingQuad(hitObjects);
 
             foreach (var h in hitObjects)
-            {
-                var newPosition = h.Position;
-
-                // guard against no-ops and NaN.
-                if (scale.X != 0 && selectionQuad.Width > 0)
-                    newPosition.X = selectionQuad.TopLeft.X + xOffset + (h.X - selectionQuad.TopLeft.X) / selectionQuad.Width * (selectionQuad.Width + scale.X);
-
-                if (scale.Y != 0 && selectionQuad.Height > 0)
-                    newPosition.Y = selectionQuad.TopLeft.Y + yOffset + (h.Y - selectionQuad.TopLeft.Y) / selectionQuad.Height * (selectionQuad.Height + scale.Y);
-
-                h.Position = newPosition;
-            }
+                h.Position = GetScaledPosition(reference, scale, selectionQuad, h.Position);
         }
 
         private (bool X, bool Y) isQuadInBounds(Quad quad)
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index bfd5ab7afa..26328b4dc7 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -375,6 +375,26 @@ namespace osu.Game.Screens.Edit.Compose.Components
             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>

From b2c736b42a52c91f8780ad00602a0dd18d1e6b83 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 May 2021 18:09:46 +0900
Subject: [PATCH 3591/3722] Combine and move `const` closer to usage

---
 .../Ranking/Expanded/Accuracy/AccuracyCircle.cs       |  5 -----
 osu.Game/Screens/Ranking/ResultsScreen.cs             | 11 +++++++----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
index 4fca4759f2..c70b4dd35b 100644
--- a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
@@ -37,11 +37,6 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
         /// </summary>
         public const double ACCURACY_TRANSFORM_DURATION = 3000;
 
-        /// <summary>
-        /// Delay before the default applause sound is played to match the <see cref="rankText"/> timing
-        /// </summary>
-        public const double APPLAUSE_DELAY = 1440;
-
         /// <summary>
         /// Delay after <see cref="ACCURACY_TRANSFORM_DURATION"/> for the rank text (A/B/C/D/S/SS) to appear.
         /// </summary>
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index e25bbbe253..a0ea27b640 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -29,6 +29,11 @@ namespace osu.Game.Screens.Ranking
 {
     public abstract class ResultsScreen : ScreenWithBeatmapBackground, IKeyBindingHandler<GlobalAction>
     {
+        /// <summary>
+        /// Delay before the default applause sound should be played, in order to match the grade display timing in <see cref="AccuracyCircle"/>.
+        /// </summary>
+        public const double APPLAUSE_DELAY = AccuracyCircle.ACCURACY_TRANSFORM_DELAY + AccuracyCircle.TEXT_APPEAR_DELAY + ScorePanel.RESIZE_DURATION + ScorePanel.TOP_LAYER_EXPAND_DELAY - 1440;
+
         protected const float BACKGROUND_BLUR = 20;
         private static readonly float screen_height = 768 - TwoLayerButton.SIZE_EXTENDED.Y;
 
@@ -196,10 +201,8 @@ namespace osu.Game.Screens.Ranking
 
             statisticsPanel.State.BindValueChanged(onStatisticsStateChanged, true);
 
-            using (BeginDelayedSequence(AccuracyCircle.ACCURACY_TRANSFORM_DELAY + AccuracyCircle.TEXT_APPEAR_DELAY, true))
-            {
-                this.Delay(ScorePanel.RESIZE_DURATION + ScorePanel.TOP_LAYER_EXPAND_DELAY - AccuracyCircle.APPLAUSE_DELAY).Schedule(() => applauseSound?.Play());
-            }
+            using (BeginDelayedSequence(APPLAUSE_DELAY))
+                Schedule(() => applauseSound?.Play());
         }
 
         protected override void Update()

From 6c4709e7b4546faf39e7df98b4b143e461ebef9d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 May 2021 18:34:02 +0900
Subject: [PATCH 3592/3722] Fix `PlacementBlueprint` using the wrong beatmap
 when applying defaults

Closes #12855.
---
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index 4ad8c815fe..82e90399c9 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -36,7 +36,8 @@ namespace osu.Game.Rulesets.Edit
         [Resolved(canBeNull: true)]
         protected EditorClock EditorClock { get; private set; }
 
-        private readonly IBindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
+        [Resolved]
+        private EditorBeatmap beatmap { get; set; }
 
         private Bindable<double> startTimeBindable;
 
@@ -58,10 +59,8 @@ namespace osu.Game.Rulesets.Edit
         }
 
         [BackgroundDependencyLoader]
-        private void load(IBindable<WorkingBeatmap> beatmap)
+        private void load()
         {
-            this.beatmap.BindTo(beatmap);
-
             startTimeBindable = HitObject.StartTimeBindable.GetBoundCopy();
             startTimeBindable.BindValueChanged(_ => ApplyDefaultsToHitObject(), true);
         }
@@ -113,7 +112,7 @@ namespace osu.Game.Rulesets.Edit
         /// Invokes <see cref="Objects.HitObject.ApplyDefaults(ControlPointInfo,BeatmapDifficulty, CancellationToken)"/>,
         /// refreshing <see cref="Objects.HitObject.NestedHitObjects"/> and parameters for the <see cref="HitObject"/>.
         /// </summary>
-        protected void ApplyDefaultsToHitObject() => HitObject.ApplyDefaults(beatmap.Value.Beatmap.ControlPointInfo, beatmap.Value.Beatmap.BeatmapInfo.BaseDifficulty);
+        protected void ApplyDefaultsToHitObject() => HitObject.ApplyDefaults(beatmap.ControlPointInfo, beatmap.BeatmapInfo.BaseDifficulty);
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => Parent?.ReceivePositionalInputAt(screenSpacePos) ?? false;
 

From 6a3c58b9adfc6184f23ae0eefa6c39c38bbfdc47 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 May 2021 19:58:55 +0900
Subject: [PATCH 3593/3722] Implement proper scaling algorithms

---
 .../Skinning/Editor/SkinSelectionHandler.cs   | 98 +++++++++++++++++--
 1 file changed, 88 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 2eb4ea107d..18c9341db9 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -34,9 +34,94 @@ namespace osu.Game.Skinning.Editor
         {
             adjustScaleFromAnchor(ref scale, anchor);
 
-            foreach (var c in SelectedBlueprints)
-                // TODO: this is temporary and will be fixed with a separate refactor of selection transform logic.
-                ((Drawable)c.Item).Scale += scale * 0.02f;
+            if (SelectedBlueprints.Count > 1)
+            {
+                var selectionQuad = GetSurroundingQuad(SelectedBlueprints.SelectMany(b =>
+                    b.Item.ScreenSpaceDrawQuad.GetVertices().ToArray()));
+
+                // the selection quad is always upright, so use a rect to make mutating the values easier.
+                var adjustedRect = selectionQuad.AABBFloat;
+
+                // for now aspect lock scale adjustments that occur at corners.
+                if (!anchor.HasFlagFast(Anchor.x1) && !anchor.HasFlagFast(Anchor.y1))
+                    scale.Y = scale.X / selectionQuad.Width * selectionQuad.Height;
+
+                if (anchor.HasFlagFast(Anchor.x0))
+                {
+                    adjustedRect.X -= scale.X;
+                    adjustedRect.Width += scale.X;
+                }
+                else if (anchor.HasFlagFast(Anchor.x2))
+                {
+                    adjustedRect.Width += scale.X;
+                }
+
+                if (anchor.HasFlagFast(Anchor.y0))
+                {
+                    adjustedRect.Y -= scale.Y;
+                    adjustedRect.Height += scale.Y;
+                }
+                else if (anchor.HasFlagFast(Anchor.y2))
+                {
+                    adjustedRect.Height += scale.Y;
+                }
+
+                // scale adjust should match that of the quad itself.
+                var scaledDelta = new Vector2(
+                    adjustedRect.Width / selectionQuad.Width - 1,
+                    adjustedRect.Height / selectionQuad.Height - 1
+                );
+
+                foreach (var b in SelectedBlueprints)
+                {
+                    var drawableItem = (Drawable)b.Item;
+
+                    if (SelectedBlueprints.Count > 1)
+                    {
+                        // each drawable's relative position should be maintained in the scaled quad.
+                        var screenPosition = b.ScreenSpaceSelectionPoint;
+
+                        var relativePositionInOriginal =
+                            new Vector2(
+                                (screenPosition.X - selectionQuad.TopLeft.X) / selectionQuad.Width,
+                                (screenPosition.Y - selectionQuad.TopLeft.Y) / selectionQuad.Height
+                            );
+
+                        var newPositionInAdjusted = new Vector2(
+                            adjustedRect.TopLeft.X + adjustedRect.Width * relativePositionInOriginal.X,
+                            adjustedRect.TopLeft.Y + adjustedRect.Height * relativePositionInOriginal.Y
+                        );
+
+                        drawableItem.Position = drawableItem.Parent.ToLocalSpace(newPositionInAdjusted) - drawableItem.AnchorPosition;
+                        drawableItem.Scale += scaledDelta;
+                    }
+                }
+            }
+            else
+            {
+                var blueprint = SelectedBlueprints.First();
+                var drawableItem = (Drawable)blueprint.Item;
+
+                // the number of local "pixels" the drag operation resulted in.
+                // our goal is to increase the drawable's draw size by this amount.
+                var scaledDelta = drawableItem.ScreenSpaceDeltaToParentSpace(scale);
+
+                scaledDelta = new Vector2(
+                    scaledDelta.X / drawableItem.DrawWidth,
+                    scaledDelta.Y / drawableItem.DrawHeight
+                );
+
+                // handle the case where scaling with a centre origin needs double the adjustments to match
+                // user cursor movement.
+                if (drawableItem.Origin.HasFlagFast(Anchor.x1)) scaledDelta.X *= 2;
+                if (drawableItem.Origin.HasFlagFast(Anchor.y1)) scaledDelta.Y *= 2;
+
+                // for now aspect lock scale adjustments that occur at corners.
+                if (!anchor.HasFlagFast(Anchor.x1) && !anchor.HasFlagFast(Anchor.y1))
+                    scaledDelta.Y = scaledDelta.X;
+
+                drawableItem.Scale += scaledDelta;
+            }
 
             return true;
         }
@@ -158,13 +243,6 @@ namespace osu.Game.Skinning.Editor
             // reverse the scale direction if dragging from top or left.
             if ((reference & Anchor.x0) > 0) scale.X = -scale.X;
             if ((reference & Anchor.y0) > 0) scale.Y = -scale.Y;
-
-            // for now aspect lock scale adjustments that occur at corners.
-            if (!reference.HasFlagFast(Anchor.x1) && !reference.HasFlagFast(Anchor.y1))
-            {
-                // TODO: temporary implementation - only dragging the corner handles across the X axis changes size.
-                scale.Y = scale.X;
-            }
         }
 
         public class AnchorMenuItem : TernaryStateMenuItem

From 16ffedde8a8ac640e61f98c0949324c699a5b05f Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 19 May 2021 15:17:57 +0300
Subject: [PATCH 3594/3722] Add year parameter to GetNewsRequest

---
 osu.Game/Online/API/Requests/GetNewsRequest.cs      | 8 +++++++-
 osu.Game/Overlays/News/Displays/FrontPageDisplay.cs | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/API/Requests/GetNewsRequest.cs b/osu.Game/Online/API/Requests/GetNewsRequest.cs
index 36d9dc0652..3eb29f1292 100644
--- a/osu.Game/Online/API/Requests/GetNewsRequest.cs
+++ b/osu.Game/Online/API/Requests/GetNewsRequest.cs
@@ -8,10 +8,12 @@ namespace osu.Game.Online.API.Requests
 {
     public class GetNewsRequest : APIRequest<GetNewsResponse>
     {
+        private readonly int year;
         private readonly Cursor cursor;
 
-        public GetNewsRequest(Cursor cursor = null)
+        public GetNewsRequest(int year = 0, Cursor cursor = null)
         {
+            this.year = year;
             this.cursor = cursor;
         }
 
@@ -19,6 +21,10 @@ namespace osu.Game.Online.API.Requests
         {
             var req = base.CreateWebRequest();
             req.AddCursor(cursor);
+
+            if (year != 0)
+                req.AddParameter("year", year.ToString());
+
             return req;
         }
 
diff --git a/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs b/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs
index a1bc6c650b..45e11a6f15 100644
--- a/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs
+++ b/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Overlays.News.Displays
         {
             request?.Cancel();
 
-            request = new GetNewsRequest(lastCursor);
+            request = new GetNewsRequest(cursor: lastCursor);
             request.Success += response => Schedule(() => onSuccess(response));
             api.PerformAsync(request);
         }

From 150ed01c627e49e00a75f8c7b3a8a68e0bfea424 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 19 May 2021 15:22:55 +0300
Subject: [PATCH 3595/3722] Make NewsSidebar scrollable

---
 osu.Game/Overlays/News/Sidebar/NewsSidebar.cs | 60 +++++++++++++------
 1 file changed, 43 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/NewsSidebar.cs b/osu.Game/Overlays/News/Sidebar/NewsSidebar.cs
index d14ad90ef4..9e397e78c8 100644
--- a/osu.Game/Overlays/News/Sidebar/NewsSidebar.cs
+++ b/osu.Game/Overlays/News/Sidebar/NewsSidebar.cs
@@ -9,6 +9,7 @@ using osu.Game.Online.API.Requests.Responses;
 using osu.Framework.Graphics.Shapes;
 using osuTK;
 using System.Linq;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays.News.Sidebar
 {
@@ -31,30 +32,55 @@ namespace osu.Game.Overlays.News.Sidebar
                     RelativeSizeAxes = Axes.Both,
                     Colour = colourProvider.Background4
                 },
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Y,
+                    Width = OsuScrollContainer.SCROLL_BAR_HEIGHT,
+                    Anchor = Anchor.TopRight,
+                    Origin = Anchor.TopRight,
+                    Colour = colourProvider.Background3,
+                    Alpha = 0.5f
+                },
                 new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding
+                    Padding = new MarginPadding { Right = -3 }, // Compensate for scrollbar margin
+                    Child = new OsuScrollContainer
                     {
-                        Vertical = 20,
-                        Left = 50,
-                        Right = 30
-                    },
-                    Child = new FillFlowContainer
-                    {
-                        Direction = FillDirection.Vertical,
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Spacing = new Vector2(0, 20),
-                        Children = new Drawable[]
+                        RelativeSizeAxes = Axes.Both,
+                        Child = new Container
                         {
-                            new YearsPanel(),
-                            monthsFlow = new FillFlowContainer<MonthSection>
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Padding = new MarginPadding { Right = 3 }, // Addeded 3px back
+                            Child = new Container
                             {
-                                AutoSizeAxes = Axes.Y,
                                 RelativeSizeAxes = Axes.X,
-                                Direction = FillDirection.Vertical,
-                                Spacing = new Vector2(0, 10)
+                                AutoSizeAxes = Axes.Y,
+                                Padding = new MarginPadding
+                                {
+                                    Vertical = 20,
+                                    Left = 50,
+                                    Right = 30
+                                },
+                                Child = new FillFlowContainer
+                                {
+                                    Direction = FillDirection.Vertical,
+                                    RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
+                                    Spacing = new Vector2(0, 20),
+                                    Children = new Drawable[]
+                                    {
+                                        new YearsPanel(),
+                                        monthsFlow = new FillFlowContainer<MonthSection>
+                                        {
+                                            AutoSizeAxes = Axes.Y,
+                                            RelativeSizeAxes = Axes.X,
+                                            Direction = FillDirection.Vertical,
+                                            Spacing = new Vector2(0, 10)
+                                        }
+                                    }
+                                }
                             }
                         }
                     }

From 6cc4ffadabda1eb13d8b8d96a7a7d311f9314721 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 19 May 2021 15:28:12 +0300
Subject: [PATCH 3596/3722] Implement sticky container for sidebar in
 NewsOverlay

---
 osu.Game/Overlays/NewsOverlay.cs | 46 ++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index 5beb285216..ddd328c860 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.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 System;
 using System.Threading;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Overlays.News;
 using osu.Game.Overlays.News.Displays;
+using osu.Game.Overlays.News.Sidebar;
 
 namespace osu.Game.Overlays
 {
@@ -13,9 +16,44 @@ namespace osu.Game.Overlays
     {
         private readonly Bindable<string> article = new Bindable<string>(null);
 
+        protected override Container<Drawable> Content => content;
+
+        private readonly Container content;
+        private readonly Container sidebarContainer;
+
         public NewsOverlay()
             : base(OverlayColourScheme.Purple, false)
         {
+            base.Content.Add(new GridContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                RowDimensions = new[]
+                {
+                    new Dimension(GridSizeMode.AutoSize)
+                },
+                ColumnDimensions = new[]
+                {
+                    new Dimension(GridSizeMode.AutoSize),
+                    new Dimension()
+                },
+                Content = new[]
+                {
+                    new Drawable[]
+                    {
+                        sidebarContainer = new Container
+                        {
+                            AutoSizeAxes = Axes.X,
+                            Child = new NewsSidebar()
+                        },
+                        content = new Container
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y
+                        }
+                    }
+                }
+            });
         }
 
         protected override void LoadComplete()
@@ -90,6 +128,14 @@ namespace osu.Game.Overlays
             }, (cancellationToken = new CancellationTokenSource()).Token);
         }
 
+        protected override void UpdateAfterChildren()
+        {
+            base.UpdateAfterChildren();
+
+            sidebarContainer.Height = DrawHeight;
+            sidebarContainer.Y = Math.Clamp(ScrollFlow.Current - Header.DrawHeight, 0, Math.Max(ScrollFlow.ScrollContent.DrawHeight - DrawHeight - Header.DrawHeight, 0));
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             cancellationToken?.Cancel();

From e3ed9b8135b93c3b14685de298f1a6e25ec44f6b Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 19 May 2021 15:36:05 +0300
Subject: [PATCH 3597/3722] Implement sidebar metadata handling in NewsOverlay

---
 .../News/Displays/FrontPageDisplay.cs         | 20 ++++++++-
 osu.Game/Overlays/NewsOverlay.cs              | 44 ++++++++++++++++---
 2 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs b/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs
index 45e11a6f15..7691e4a901 100644
--- a/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs
+++ b/osu.Game/Overlays/News/Displays/FrontPageDisplay.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.Linq;
 using System.Threading;
 using osu.Framework.Allocation;
@@ -15,6 +16,8 @@ namespace osu.Game.Overlays.News.Displays
 {
     public class FrontPageDisplay : CompositeDrawable
     {
+        public Action<GetNewsResponse> ResponseReceived;
+
         [Resolved]
         private IAPIProvider api { get; set; }
 
@@ -24,6 +27,13 @@ namespace osu.Game.Overlays.News.Displays
         private GetNewsRequest request;
         private Cursor lastCursor;
 
+        private readonly int year;
+
+        public FrontPageDisplay(int year = 0)
+        {
+            this.year = year;
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -74,13 +84,15 @@ namespace osu.Game.Overlays.News.Displays
         {
             request?.Cancel();
 
-            request = new GetNewsRequest(cursor: lastCursor);
+            request = new GetNewsRequest(year, lastCursor);
             request.Success += response => Schedule(() => onSuccess(response));
             api.PerformAsync(request);
         }
 
         private CancellationTokenSource cancellationToken;
 
+        private bool initialLoad = true;
+
         private void onSuccess(GetNewsResponse response)
         {
             cancellationToken?.Cancel();
@@ -101,6 +113,12 @@ namespace osu.Game.Overlays.News.Displays
                 content.Add(loaded);
                 showMore.IsLoading = false;
                 showMore.Alpha = lastCursor == null ? 0 : 1;
+
+                if (initialLoad)
+                {
+                    ResponseReceived?.Invoke(response);
+                    initialLoad = false;
+                }
             }, (cancellationToken = new CancellationTokenSource()).Token);
         }
 
diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index ddd328c860..d3f407fc0f 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -20,6 +20,7 @@ namespace osu.Game.Overlays
 
         private readonly Container content;
         private readonly Container sidebarContainer;
+        private readonly NewsSidebar sidebar;
 
         public NewsOverlay()
             : base(OverlayColourScheme.Purple, false)
@@ -44,7 +45,7 @@ namespace osu.Game.Overlays
                         sidebarContainer = new Container
                         {
                             AutoSizeAxes = Axes.X,
-                            Child = new NewsSidebar()
+                            Child = sidebar = new NewsSidebar()
                         },
                         content = new Container
                         {
@@ -94,6 +95,12 @@ namespace osu.Game.Overlays
             Show();
         }
 
+        public void ShowYear(int year)
+        {
+            showYear(year);
+            Show();
+        }
+
         public void ShowArticle(string slug)
         {
             article.Value = slug;
@@ -102,6 +109,14 @@ namespace osu.Game.Overlays
 
         private CancellationTokenSource cancellationToken;
 
+        private void showYear(int year)
+        {
+            cancellationToken?.Cancel();
+            Loading.Show();
+
+            loadFrontPage(year);
+        }
+
         private void onArticleChanged(ValueChangedEvent<string> e)
         {
             cancellationToken?.Cancel();
@@ -109,13 +124,33 @@ namespace osu.Game.Overlays
 
             if (e.NewValue == null)
             {
-                Header.SetFrontPage();
-                LoadDisplay(new FrontPageDisplay());
+                loadFrontPage();
                 return;
             }
 
-            Header.SetArticle(e.NewValue);
+            loadArticle(e.NewValue);
+        }
+
+        private void loadFrontPage(int year = 0)
+        {
+            Header.SetFrontPage();
+
+            var page = new FrontPageDisplay(year);
+            page.ResponseReceived += r =>
+            {
+                sidebar.Metadata.Value = r.SidebarMetadata;
+                Loading.Hide();
+            };
+            LoadDisplay(page);
+        }
+
+        private void loadArticle(string article)
+        {
+            Header.SetArticle(article);
+
+            // Temporary, should be handled by ArticleDisplay later
             LoadDisplay(Empty());
+            Loading.Hide();
         }
 
         protected void LoadDisplay(Drawable display)
@@ -124,7 +159,6 @@ namespace osu.Game.Overlays
             LoadComponentAsync(display, loaded =>
             {
                 Child = loaded;
-                Loading.Hide();
             }, (cancellationToken = new CancellationTokenSource()).Token);
         }
 

From d60478851f8bf9a63aa158b29b9a3a3d784451c8 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 19 May 2021 15:38:53 +0300
Subject: [PATCH 3598/3722] Add proper action to YearButton

---
 osu.Game/Overlays/News/Sidebar/YearsPanel.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
index b6bbdbb6d4..232b995cd6 100644
--- a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
@@ -81,6 +81,9 @@ namespace osu.Game.Overlays.News.Sidebar
         {
             public int Year { get; }
 
+            [Resolved(canBeNull: true)]
+            private NewsOverlay overlay { get; set; }
+
             private readonly bool isCurrent;
 
             public YearButton(int year, bool isCurrent)
@@ -106,7 +109,7 @@ namespace osu.Game.Overlays.News.Sidebar
             {
                 IdleColour = isCurrent ? Color4.White : colourProvider.Light2;
                 HoverColour = isCurrent ? Color4.White : colourProvider.Light1;
-                Action = () => { }; // Avoid button being disabled since there's no proper action assigned.
+                Action = () => overlay?.ShowYear(Year);
             }
         }
     }

From 14af86d6c55ee8ccae7ae0b531b537eb0d9cbbb2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 May 2021 21:46:41 +0900
Subject: [PATCH 3599/3722] Use the same code path for all scaling

---
 .../Skinning/Editor/SkinSelectionHandler.cs   | 127 +++++++-----------
 1 file changed, 48 insertions(+), 79 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 18c9341db9..af013bfd52 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -34,92 +34,61 @@ namespace osu.Game.Skinning.Editor
         {
             adjustScaleFromAnchor(ref scale, anchor);
 
-            if (SelectedBlueprints.Count > 1)
+            var selectionQuad = GetSurroundingQuad(SelectedBlueprints.SelectMany(b =>
+                b.Item.ScreenSpaceDrawQuad.GetVertices().ToArray()));
+
+            // the selection quad is always upright, so use a rect to make mutating the values easier.
+            var adjustedRect = selectionQuad.AABBFloat;
+
+            // for now aspect lock scale adjustments that occur at corners.
+            if (!anchor.HasFlagFast(Anchor.x1) && !anchor.HasFlagFast(Anchor.y1))
+                scale.Y = scale.X / selectionQuad.Width * selectionQuad.Height;
+
+            if (anchor.HasFlagFast(Anchor.x0))
             {
-                var selectionQuad = GetSurroundingQuad(SelectedBlueprints.SelectMany(b =>
-                    b.Item.ScreenSpaceDrawQuad.GetVertices().ToArray()));
-
-                // the selection quad is always upright, so use a rect to make mutating the values easier.
-                var adjustedRect = selectionQuad.AABBFloat;
-
-                // for now aspect lock scale adjustments that occur at corners.
-                if (!anchor.HasFlagFast(Anchor.x1) && !anchor.HasFlagFast(Anchor.y1))
-                    scale.Y = scale.X / selectionQuad.Width * selectionQuad.Height;
-
-                if (anchor.HasFlagFast(Anchor.x0))
-                {
-                    adjustedRect.X -= scale.X;
-                    adjustedRect.Width += scale.X;
-                }
-                else if (anchor.HasFlagFast(Anchor.x2))
-                {
-                    adjustedRect.Width += scale.X;
-                }
-
-                if (anchor.HasFlagFast(Anchor.y0))
-                {
-                    adjustedRect.Y -= scale.Y;
-                    adjustedRect.Height += scale.Y;
-                }
-                else if (anchor.HasFlagFast(Anchor.y2))
-                {
-                    adjustedRect.Height += scale.Y;
-                }
-
-                // scale adjust should match that of the quad itself.
-                var scaledDelta = new Vector2(
-                    adjustedRect.Width / selectionQuad.Width - 1,
-                    adjustedRect.Height / selectionQuad.Height - 1
-                );
-
-                foreach (var b in SelectedBlueprints)
-                {
-                    var drawableItem = (Drawable)b.Item;
-
-                    if (SelectedBlueprints.Count > 1)
-                    {
-                        // each drawable's relative position should be maintained in the scaled quad.
-                        var screenPosition = b.ScreenSpaceSelectionPoint;
-
-                        var relativePositionInOriginal =
-                            new Vector2(
-                                (screenPosition.X - selectionQuad.TopLeft.X) / selectionQuad.Width,
-                                (screenPosition.Y - selectionQuad.TopLeft.Y) / selectionQuad.Height
-                            );
-
-                        var newPositionInAdjusted = new Vector2(
-                            adjustedRect.TopLeft.X + adjustedRect.Width * relativePositionInOriginal.X,
-                            adjustedRect.TopLeft.Y + adjustedRect.Height * relativePositionInOriginal.Y
-                        );
-
-                        drawableItem.Position = drawableItem.Parent.ToLocalSpace(newPositionInAdjusted) - drawableItem.AnchorPosition;
-                        drawableItem.Scale += scaledDelta;
-                    }
-                }
+                adjustedRect.X -= scale.X;
+                adjustedRect.Width += scale.X;
             }
-            else
+            else if (anchor.HasFlagFast(Anchor.x2))
             {
-                var blueprint = SelectedBlueprints.First();
-                var drawableItem = (Drawable)blueprint.Item;
+                adjustedRect.Width += scale.X;
+            }
 
-                // the number of local "pixels" the drag operation resulted in.
-                // our goal is to increase the drawable's draw size by this amount.
-                var scaledDelta = drawableItem.ScreenSpaceDeltaToParentSpace(scale);
+            if (anchor.HasFlagFast(Anchor.y0))
+            {
+                adjustedRect.Y -= scale.Y;
+                adjustedRect.Height += scale.Y;
+            }
+            else if (anchor.HasFlagFast(Anchor.y2))
+            {
+                adjustedRect.Height += scale.Y;
+            }
 
-                scaledDelta = new Vector2(
-                    scaledDelta.X / drawableItem.DrawWidth,
-                    scaledDelta.Y / drawableItem.DrawHeight
+            // scale adjust should match that of the quad itself.
+            var scaledDelta = new Vector2(
+                adjustedRect.Width / selectionQuad.Width - 1,
+                adjustedRect.Height / selectionQuad.Height - 1
+            );
+
+            foreach (var b in SelectedBlueprints)
+            {
+                var drawableItem = (Drawable)b.Item;
+
+                // each drawable's relative position should be maintained in the scaled quad.
+                var screenPosition = b.ScreenSpaceSelectionPoint;
+
+                var relativePositionInOriginal =
+                    new Vector2(
+                        (screenPosition.X - selectionQuad.TopLeft.X) / selectionQuad.Width,
+                        (screenPosition.Y - selectionQuad.TopLeft.Y) / selectionQuad.Height
+                    );
+
+                var newPositionInAdjusted = new Vector2(
+                    adjustedRect.TopLeft.X + adjustedRect.Width * relativePositionInOriginal.X,
+                    adjustedRect.TopLeft.Y + adjustedRect.Height * relativePositionInOriginal.Y
                 );
 
-                // handle the case where scaling with a centre origin needs double the adjustments to match
-                // user cursor movement.
-                if (drawableItem.Origin.HasFlagFast(Anchor.x1)) scaledDelta.X *= 2;
-                if (drawableItem.Origin.HasFlagFast(Anchor.y1)) scaledDelta.Y *= 2;
-
-                // for now aspect lock scale adjustments that occur at corners.
-                if (!anchor.HasFlagFast(Anchor.x1) && !anchor.HasFlagFast(Anchor.y1))
-                    scaledDelta.Y = scaledDelta.X;
-
+                drawableItem.Position = drawableItem.Parent.ToLocalSpace(newPositionInAdjusted) - drawableItem.AnchorPosition;
                 drawableItem.Scale += scaledDelta;
             }
 

From a55879e5115895c940411bc9d7000532e32d5219 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 01:47:31 +0900
Subject: [PATCH 3600/3722] Fix oversights in scale algorithm

---
 osu.Game/Skinning/Editor/SkinSelectionHandler.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index af013bfd52..2f9611ba65 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -32,6 +32,9 @@ namespace osu.Game.Skinning.Editor
 
         public override bool HandleScale(Vector2 scale, Anchor anchor)
         {
+            // convert scale to screen space
+            scale = ToScreenSpace(scale) - ToScreenSpace(Vector2.Zero);
+
             adjustScaleFromAnchor(ref scale, anchor);
 
             var selectionQuad = GetSurroundingQuad(SelectedBlueprints.SelectMany(b =>
@@ -66,8 +69,8 @@ namespace osu.Game.Skinning.Editor
 
             // scale adjust should match that of the quad itself.
             var scaledDelta = new Vector2(
-                adjustedRect.Width / selectionQuad.Width - 1,
-                adjustedRect.Height / selectionQuad.Height - 1
+                adjustedRect.Width / selectionQuad.Width,
+                adjustedRect.Height / selectionQuad.Height
             );
 
             foreach (var b in SelectedBlueprints)
@@ -89,7 +92,7 @@ namespace osu.Game.Skinning.Editor
                 );
 
                 drawableItem.Position = drawableItem.Parent.ToLocalSpace(newPositionInAdjusted) - drawableItem.AnchorPosition;
-                drawableItem.Scale += scaledDelta;
+                drawableItem.Scale *= scaledDelta;
             }
 
             return true;

From 00ed6993400e35f6ba5c7416219932e90e63bd08 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 01:53:24 +0900
Subject: [PATCH 3601/3722] Fix origin specifications using incorrect flags

---
 osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
index 32d7f3525f..5d0263772d 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
                             colourBarsEarly = new Container
                             {
                                 Anchor = Anchor.CentreLeft,
-                                Origin = Anchor.x2,
+                                Origin = Anchor.TopRight,
                                 RelativeSizeAxes = Axes.Both,
                                 Height = 0.5f,
                                 Scale = new Vector2(1, -1),
@@ -93,7 +93,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
                             colourBarsLate = new Container
                             {
                                 Anchor = Anchor.CentreLeft,
-                                Origin = Anchor.x2,
+                                Origin = Anchor.TopRight,
                                 RelativeSizeAxes = Axes.Both,
                                 Height = 0.5f,
                             },

From 22337e0fc79c6e45783eb5af137db8df93378244 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 01:59:30 +0900
Subject: [PATCH 3602/3722] Add comment explaining why origin is flipped

---
 osu.Game/Skinning/DefaultSkin.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index 84f40df0cf..ba31816a07 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -93,8 +93,9 @@ namespace osu.Game.Skinning
                                     if (hitError2 != null)
                                     {
                                         hitError2.Anchor = Anchor.CentreRight;
-                                        hitError2.Origin = Anchor.CentreLeft;
                                         hitError2.Scale = new Vector2(-1, 1);
+                                        // origin flipped to match scale above.
+                                        hitError2.Origin = Anchor.CentreLeft;
                                     }
                                 }
                             })

From eb5db8ff0357a0814491437a59d8b427d84bf2fd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 02:01:25 +0900
Subject: [PATCH 3603/3722] Disable border display on skin editor to avoid
 crashes

This wasn't being displayed correctly anyway, so rather than fixing
let's just remove it for now.

Closes #12868.
---
 osu.Game/Skinning/Editor/SkinEditorOverlay.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinEditorOverlay.cs b/osu.Game/Skinning/Editor/SkinEditorOverlay.cs
index 2d7cae71ff..88020896bb 100644
--- a/osu.Game/Skinning/Editor/SkinEditorOverlay.cs
+++ b/osu.Game/Skinning/Editor/SkinEditorOverlay.cs
@@ -65,8 +65,6 @@ namespace osu.Game.Skinning.Editor
             if (visibility.NewValue == Visibility.Visible)
             {
                 target.Masking = true;
-                target.BorderThickness = 5;
-                target.BorderColour = colours.Yellow;
                 target.AllowScaling = false;
                 target.RelativePositionAxes = Axes.Both;
 
@@ -75,7 +73,6 @@ namespace osu.Game.Skinning.Editor
             }
             else
             {
-                target.BorderThickness = 0;
                 target.AllowScaling = true;
 
                 target.ScaleTo(1, SkinEditor.TRANSITION_DURATION, Easing.OutQuint).OnComplete(_ => target.Masking = false);

From e9cab29134eec87685d6a343babcfb361b530b29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 19 May 2021 20:48:06 +0200
Subject: [PATCH 3604/3722] Cache editor beatmap in placement blueprint test
 scene

---
 osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs b/osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs
index 78a6bcc3db..2dc77fa72a 100644
--- a/osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs
+++ b/osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs
@@ -33,8 +33,12 @@ namespace osu.Game.Tests.Visual
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
         {
             var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+
             dependencies.CacheAs(new EditorClock());
 
+            var playable = Beatmap.Value.GetPlayableBeatmap(Beatmap.Value.BeatmapInfo.Ruleset);
+            dependencies.CacheAs(new EditorBeatmap(playable));
+
             return dependencies;
         }
 

From 85a3027f1ba4107bee90ee3d2c7492d93b1546f4 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Wed, 19 May 2021 13:58:41 -0700
Subject: [PATCH 3605/3722] Add failing test

---
 .../Visual/Online/TestSceneAccountCreationOverlay.cs       | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs
index 3d65e7e4ba..b120a9b4db 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs
@@ -1,12 +1,16 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.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.Overlays;
+using osu.Game.Overlays.AccountCreation;
+using osu.Game.Overlays.Settings;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Online
@@ -51,6 +55,9 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("show manually", () => accountCreation.Show());
             AddUntilStep("overlay is visible", () => accountCreation.State.Value == Visibility.Visible);
 
+            AddStep("click button", () => accountCreation.ChildrenOfType<SettingsButton>().Single().Click());
+            AddUntilStep("warning screen is present", () => accountCreation.ChildrenOfType<ScreenWarning>().Single().IsPresent);
+
             AddStep("log back in", () => API.Login("dummy", "password"));
             AddUntilStep("overlay is hidden", () => accountCreation.State.Value == Visibility.Hidden);
         }

From 3da2cdfd05314d975cf3a979709646729b4bca13 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Wed, 19 May 2021 14:06:21 -0700
Subject: [PATCH 3606/3722] Fix nullref in test

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

diff --git a/osu.Game/Overlays/AccountCreation/ScreenWarning.cs b/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
index 2605a0a6d6..6efbf8896f 100644
--- a/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
+++ b/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Overlays.AccountCreation
 
         public override void OnEntering(IScreen last)
         {
-            if (string.IsNullOrEmpty(api?.ProvidedUsername) || game.UseDevelopmentServer)
+            if (string.IsNullOrEmpty(api?.ProvidedUsername) || game?.UseDevelopmentServer == true)
             {
                 this.FadeOut();
                 this.Push(new ScreenEntry());

From f1fd40dcca30d348cbdad21ded8f6cef557a4fb8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 13:19:00 +0900
Subject: [PATCH 3607/3722] Fix test not working for various reasons

---
 .../Visual/Online/TestSceneAccountCreationOverlay.cs        | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs
index b120a9b4db..437c5b07c9 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs
@@ -40,8 +40,6 @@ namespace osu.Game.Tests.Visual.Online
         [BackgroundDependencyLoader]
         private void load()
         {
-            API.Logout();
-
             localUser = API.LocalUser.GetBoundCopy();
             localUser.BindValueChanged(user => { userPanelArea.Child = new UserGridPanel(user.NewValue) { Width = 200 }; }, true);
         }
@@ -50,13 +48,13 @@ namespace osu.Game.Tests.Visual.Online
         public void TestOverlayVisibility()
         {
             AddStep("start hidden", () => accountCreation.Hide());
-            AddStep("log out", API.Logout);
+            AddStep("log out", () => API.Logout());
 
             AddStep("show manually", () => accountCreation.Show());
             AddUntilStep("overlay is visible", () => accountCreation.State.Value == Visibility.Visible);
 
             AddStep("click button", () => accountCreation.ChildrenOfType<SettingsButton>().Single().Click());
-            AddUntilStep("warning screen is present", () => accountCreation.ChildrenOfType<ScreenWarning>().Single().IsPresent);
+            AddUntilStep("warning screen is present", () => accountCreation.ChildrenOfType<ScreenWarning>().SingleOrDefault()?.IsPresent == true);
 
             AddStep("log back in", () => API.Login("dummy", "password"));
             AddUntilStep("overlay is hidden", () => accountCreation.State.Value == Visibility.Hidden);

From 3c201fb8e78a2c04e541b03cd9b7a1435c98468e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 13:20:35 +0900
Subject: [PATCH 3608/3722] Standardise `canBeNull` specification

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

diff --git a/osu.Game/Overlays/AccountCreation/ScreenWarning.cs b/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
index 6efbf8896f..3d46e9ed94 100644
--- a/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
+++ b/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Overlays.AccountCreation
         private OsuTextFlowContainer multiAccountExplanationText;
         private LinkFlowContainer furtherAssistance;
 
-        [Resolved(CanBeNull = true)]
+        [Resolved(canBeNull: true)]
         private IAPIProvider api { get; set; }
 
         [Resolved(canBeNull: true)]

From 8f5b28d26452211a913f7e2a2b67aece638367a0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 13:51:08 +0900
Subject: [PATCH 3609/3722] Fix "folder missing" message showing incorrectly
 for beatmaps folder

---
 osu.Game/Beatmaps/BeatmapManager.cs      | 2 +-
 osu.Game/Database/ArchiveModelManager.cs | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index 5e975de77c..dcbfbf1332 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Beatmaps
 
         protected override string[] HashableFileTypes => new[] { ".osu" };
 
-        protected override string ImportFromStablePath => ".";
+        protected override string ImportFromStablePath => string.Empty;
 
         protected override Storage PrepareStableStorage(StableStorage stableStorage) => stableStorage.GetSongStorage();
 
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 550daf36b5..8efd451857 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -691,10 +691,12 @@ namespace osu.Game.Database
         {
             var storage = PrepareStableStorage(stableStorage);
 
+            // Handle situations like when the user does not have a Skins folder.
             if (!storage.ExistsDirectory(ImportFromStablePath))
             {
-                // This handles situations like when the user does not have a Skins folder
-                Logger.Log($"No {ImportFromStablePath} folder available in osu!stable installation", LoggingTarget.Information, LogLevel.Error);
+                string fullPath = storage.GetFullPath(ImportFromStablePath);
+
+                Logger.Log($"Folder \"{fullPath}\" not available in the target osu!stable installation to import {HumanisedModelName}s.", LoggingTarget.Information, LogLevel.Error);
                 return Task.CompletedTask;
             }
 

From 713f69ea5505d21359a34c3d9bb3c8980580709b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 14:11:42 +0900
Subject: [PATCH 3610/3722] Tidy up load process

---
 osu.Game/Overlays/NewsOverlay.cs | 34 ++++++++++++++------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index d3f407fc0f..f7294dd880 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -22,6 +22,8 @@ namespace osu.Game.Overlays
         private readonly Container sidebarContainer;
         private readonly NewsSidebar sidebar;
 
+        private CancellationTokenSource cancellationToken;
+
         public NewsOverlay()
             : base(OverlayColourScheme.Purple, false)
         {
@@ -97,7 +99,7 @@ namespace osu.Game.Overlays
 
         public void ShowYear(int year)
         {
-            showYear(year);
+            loadFrontPage(year);
             Show();
         }
 
@@ -107,32 +109,18 @@ namespace osu.Game.Overlays
             Show();
         }
 
-        private CancellationTokenSource cancellationToken;
-
-        private void showYear(int year)
-        {
-            cancellationToken?.Cancel();
-            Loading.Show();
-
-            loadFrontPage(year);
-        }
-
         private void onArticleChanged(ValueChangedEvent<string> e)
         {
-            cancellationToken?.Cancel();
-            Loading.Show();
-
             if (e.NewValue == null)
-            {
                 loadFrontPage();
-                return;
-            }
-
-            loadArticle(e.NewValue);
+            else
+                loadArticle(e.NewValue);
         }
 
         private void loadFrontPage(int year = 0)
         {
+            beginLoading();
+
             Header.SetFrontPage();
 
             var page = new FrontPageDisplay(year);
@@ -146,6 +134,8 @@ namespace osu.Game.Overlays
 
         private void loadArticle(string article)
         {
+            beginLoading();
+
             Header.SetArticle(article);
 
             // Temporary, should be handled by ArticleDisplay later
@@ -153,6 +143,12 @@ namespace osu.Game.Overlays
             Loading.Hide();
         }
 
+        private void beginLoading()
+        {
+            cancellationToken?.Cancel();
+            Loading.Show();
+        }
+
         protected void LoadDisplay(Drawable display)
         {
             ScrollFlow.ScrollToStart();

From ac8efdeabdceac44fd261febeae971bb2deaa087 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 14:12:34 +0900
Subject: [PATCH 3611/3722] Move private methods down

---
 osu.Game/Overlays/NewsOverlay.cs | 38 ++++++++++++++++----------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index f7294dd880..280e224255 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -24,6 +24,8 @@ namespace osu.Game.Overlays
 
         private CancellationTokenSource cancellationToken;
 
+        private bool displayUpdateRequired = true;
+
         public NewsOverlay()
             : base(OverlayColourScheme.Purple, false)
         {
@@ -72,8 +74,6 @@ namespace osu.Game.Overlays
             ShowFrontPage = ShowFrontPage
         };
 
-        private bool displayUpdateRequired = true;
-
         protected override void PopIn()
         {
             base.PopIn();
@@ -109,6 +109,23 @@ namespace osu.Game.Overlays
             Show();
         }
 
+        protected void LoadDisplay(Drawable display)
+        {
+            ScrollFlow.ScrollToStart();
+            LoadComponentAsync(display, loaded =>
+            {
+                Child = loaded;
+            }, (cancellationToken = new CancellationTokenSource()).Token);
+        }
+
+        protected override void UpdateAfterChildren()
+        {
+            base.UpdateAfterChildren();
+
+            sidebarContainer.Height = DrawHeight;
+            sidebarContainer.Y = Math.Clamp(ScrollFlow.Current - Header.DrawHeight, 0, Math.Max(ScrollFlow.ScrollContent.DrawHeight - DrawHeight - Header.DrawHeight, 0));
+        }
+
         private void onArticleChanged(ValueChangedEvent<string> e)
         {
             if (e.NewValue == null)
@@ -149,23 +166,6 @@ namespace osu.Game.Overlays
             Loading.Show();
         }
 
-        protected void LoadDisplay(Drawable display)
-        {
-            ScrollFlow.ScrollToStart();
-            LoadComponentAsync(display, loaded =>
-            {
-                Child = loaded;
-            }, (cancellationToken = new CancellationTokenSource()).Token);
-        }
-
-        protected override void UpdateAfterChildren()
-        {
-            base.UpdateAfterChildren();
-
-            sidebarContainer.Height = DrawHeight;
-            sidebarContainer.Y = Math.Clamp(ScrollFlow.Current - Header.DrawHeight, 0, Math.Max(ScrollFlow.ScrollContent.DrawHeight - DrawHeight - Header.DrawHeight, 0));
-        }
-
         protected override void Dispose(bool isDisposing)
         {
             cancellationToken?.Cancel();

From 673ca4c2a11252b24219222dd9f5f971fc523102 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 14:30:40 +0900
Subject: [PATCH 3612/3722] Tidy up content container specification

---
 osu.Game/Overlays/NewsOverlay.cs | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index 280e224255..b082614a6e 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -16,12 +16,11 @@ namespace osu.Game.Overlays
     {
         private readonly Bindable<string> article = new Bindable<string>(null);
 
-        protected override Container<Drawable> Content => content;
-
-        private readonly Container content;
         private readonly Container sidebarContainer;
         private readonly NewsSidebar sidebar;
 
+        private readonly Container content;
+
         private CancellationTokenSource cancellationToken;
 
         private bool displayUpdateRequired = true;
@@ -29,7 +28,7 @@ namespace osu.Game.Overlays
         public NewsOverlay()
             : base(OverlayColourScheme.Purple, false)
         {
-            base.Content.Add(new GridContainer
+            Child = new GridContainer
             {
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y,
@@ -58,7 +57,7 @@ namespace osu.Game.Overlays
                         }
                     }
                 }
-            });
+            };
         }
 
         protected override void LoadComplete()
@@ -112,16 +111,12 @@ namespace osu.Game.Overlays
         protected void LoadDisplay(Drawable display)
         {
             ScrollFlow.ScrollToStart();
-            LoadComponentAsync(display, loaded =>
-            {
-                Child = loaded;
-            }, (cancellationToken = new CancellationTokenSource()).Token);
+            LoadComponentAsync(display, loaded => content.Child = loaded, (cancellationToken = new CancellationTokenSource()).Token);
         }
 
         protected override void UpdateAfterChildren()
         {
             base.UpdateAfterChildren();
-
             sidebarContainer.Height = DrawHeight;
             sidebarContainer.Y = Math.Clamp(ScrollFlow.Current - Header.DrawHeight, 0, Math.Max(ScrollFlow.ScrollContent.DrawHeight - DrawHeight - Header.DrawHeight, 0));
         }

From 0489ae719de8109fdf1dc3cc26ffe65ccf609b7e Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 20 May 2021 14:53:33 +0900
Subject: [PATCH 3613/3722] Don't couple `PoolableDrawableWithLifetime`
 lifetime with its entry

It turns out the incompatibility with `LifetimeManagementContainer` causes more issues than anticipated.
---
 .../Pooling/PoolableDrawableWithLifetime.cs   | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs b/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
index ed0430012a..64e1ac16bd 100644
--- a/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
+++ b/osu.Game/Rulesets/Objects/Pooling/PoolableDrawableWithLifetime.cs
@@ -3,7 +3,6 @@
 
 #nullable enable
 
-using System;
 using System.Diagnostics;
 using osu.Framework.Graphics.Performance;
 using osu.Framework.Graphics.Pooling;
@@ -27,13 +26,14 @@ namespace osu.Game.Rulesets.Objects.Pooling
         /// </summary>
         protected bool HasEntryApplied { get; private set; }
 
+        // Drawable's lifetime gets out of sync with entry's lifetime if entry's lifetime is modified.
+        // We cannot delegate getter to `Entry.LifetimeStart` because it is incompatible with `LifetimeManagementContainer` due to how lifetime change is detected.
         public override double LifetimeStart
         {
-            get => Entry?.LifetimeStart ?? double.MinValue;
+            get => base.LifetimeStart;
             set
             {
-                if (Entry == null && LifetimeStart != value)
-                    throw new InvalidOperationException($"Cannot modify lifetime of {nameof(PoolableDrawableWithLifetime<TEntry>)} when entry is not set");
+                base.LifetimeStart = value;
 
                 if (Entry != null)
                     Entry.LifetimeStart = value;
@@ -42,11 +42,10 @@ namespace osu.Game.Rulesets.Objects.Pooling
 
         public override double LifetimeEnd
         {
-            get => Entry?.LifetimeEnd ?? double.MaxValue;
+            get => base.LifetimeEnd;
             set
             {
-                if (Entry == null && LifetimeEnd != value)
-                    throw new InvalidOperationException($"Cannot modify lifetime of {nameof(PoolableDrawableWithLifetime<TEntry>)} when entry is not set");
+                base.LifetimeEnd = value;
 
                 if (Entry != null)
                     Entry.LifetimeEnd = value;
@@ -80,7 +79,12 @@ namespace osu.Game.Rulesets.Objects.Pooling
                 free();
 
             Entry = entry;
+
+            base.LifetimeStart = entry.LifetimeStart;
+            base.LifetimeEnd = entry.LifetimeEnd;
+
             OnApply(entry);
+
             HasEntryApplied = true;
         }
 
@@ -112,7 +116,11 @@ namespace osu.Game.Rulesets.Objects.Pooling
             Debug.Assert(Entry != null && HasEntryApplied);
 
             OnFree(Entry);
+
             Entry = null;
+            base.LifetimeStart = double.MinValue;
+            base.LifetimeEnd = double.MaxValue;
+
             HasEntryApplied = false;
         }
     }

From 489caebf5996f1ca676e7d1700e44da8fd21110e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 15:15:19 +0900
Subject: [PATCH 3614/3722] Move bind `LoadComplete` code out of constructor

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

diff --git a/osu.Game/Overlays/News/NewsHeader.cs b/osu.Game/Overlays/News/NewsHeader.cs
index 63174128e7..94bfd62c32 100644
--- a/osu.Game/Overlays/News/NewsHeader.cs
+++ b/osu.Game/Overlays/News/NewsHeader.cs
@@ -19,13 +19,18 @@ namespace osu.Game.Overlays.News
         {
             TabControl.AddItem(front_page_string);
 
+            article.BindValueChanged(onArticleChanged, true);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
             Current.BindValueChanged(e =>
             {
                 if (e.NewValue == front_page_string)
                     ShowFrontPage?.Invoke();
             });
-
-            article.BindValueChanged(onArticleChanged, true);
         }
 
         public void SetFrontPage() => article.Value = null;

From d4530313aa8605f9071d9a40f8e1d0bf192d7014 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 15:15:46 +0900
Subject: [PATCH 3615/3722] Tidy event parameter naming

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

diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index b082614a6e..df564704fa 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -68,10 +68,7 @@ namespace osu.Game.Overlays
             article.BindValueChanged(onArticleChanged);
         }
 
-        protected override NewsHeader CreateHeader() => new NewsHeader
-        {
-            ShowFrontPage = ShowFrontPage
-        };
+        protected override NewsHeader CreateHeader() => new NewsHeader { ShowFrontPage = ShowFrontPage };
 
         protected override void PopIn()
         {
@@ -121,12 +118,12 @@ namespace osu.Game.Overlays
             sidebarContainer.Y = Math.Clamp(ScrollFlow.Current - Header.DrawHeight, 0, Math.Max(ScrollFlow.ScrollContent.DrawHeight - DrawHeight - Header.DrawHeight, 0));
         }
 
-        private void onArticleChanged(ValueChangedEvent<string> e)
+        private void onArticleChanged(ValueChangedEvent<string> article)
         {
-            if (e.NewValue == null)
+            if (article.NewValue == null)
                 loadFrontPage();
             else
-                loadArticle(e.NewValue);
+                loadArticle(article.NewValue);
         }
 
         private void loadFrontPage(int year = 0)

From 9267d23dc282976abbacebd82281da2ba71cfd3c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 15:23:49 +0900
Subject: [PATCH 3616/3722] Make year nullable rather than defaulting to zero

---
 osu.Game/Online/API/Requests/GetNewsRequest.cs            | 8 ++++----
 .../Displays/{FrontPageDisplay.cs => ArticleListing.cs}   | 0
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename osu.Game/Overlays/News/Displays/{FrontPageDisplay.cs => ArticleListing.cs} (100%)

diff --git a/osu.Game/Online/API/Requests/GetNewsRequest.cs b/osu.Game/Online/API/Requests/GetNewsRequest.cs
index 3eb29f1292..992ccc6d59 100644
--- a/osu.Game/Online/API/Requests/GetNewsRequest.cs
+++ b/osu.Game/Online/API/Requests/GetNewsRequest.cs
@@ -8,10 +8,10 @@ namespace osu.Game.Online.API.Requests
 {
     public class GetNewsRequest : APIRequest<GetNewsResponse>
     {
-        private readonly int year;
+        private readonly int? year;
         private readonly Cursor cursor;
 
-        public GetNewsRequest(int year = 0, Cursor cursor = null)
+        public GetNewsRequest(int? year = null, Cursor cursor = null)
         {
             this.year = year;
             this.cursor = cursor;
@@ -22,8 +22,8 @@ namespace osu.Game.Online.API.Requests
             var req = base.CreateWebRequest();
             req.AddCursor(cursor);
 
-            if (year != 0)
-                req.AddParameter("year", year.ToString());
+            if (year.HasValue)
+                req.AddParameter("year", year.Value.ToString());
 
             return req;
         }
diff --git a/osu.Game/Overlays/News/Displays/FrontPageDisplay.cs b/osu.Game/Overlays/News/Displays/ArticleListing.cs
similarity index 100%
rename from osu.Game/Overlays/News/Displays/FrontPageDisplay.cs
rename to osu.Game/Overlays/News/Displays/ArticleListing.cs

From 958d51141da905b123f6167a0a60d506862b5f86 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 15:24:01 +0900
Subject: [PATCH 3617/3722] Rename `FrontPageDisplay` to `ArticleListing`

---
 osu.Game/Overlays/News/Displays/ArticleListing.cs | 13 ++++++++++---
 osu.Game/Overlays/NewsOverlay.cs                  |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/News/Displays/ArticleListing.cs b/osu.Game/Overlays/News/Displays/ArticleListing.cs
index 7691e4a901..e713b3de84 100644
--- a/osu.Game/Overlays/News/Displays/ArticleListing.cs
+++ b/osu.Game/Overlays/News/Displays/ArticleListing.cs
@@ -14,7 +14,10 @@ using osuTK;
 
 namespace osu.Game.Overlays.News.Displays
 {
-    public class FrontPageDisplay : CompositeDrawable
+    /// <summary>
+    /// Lists articles in a vertical flow for a specified year.
+    /// </summary>
+    public class ArticleListing : CompositeDrawable
     {
         public Action<GetNewsResponse> ResponseReceived;
 
@@ -27,9 +30,13 @@ namespace osu.Game.Overlays.News.Displays
         private GetNewsRequest request;
         private Cursor lastCursor;
 
-        private readonly int year;
+        private readonly int? year;
 
-        public FrontPageDisplay(int year = 0)
+        /// <summary>
+        /// Instantiate a listing for the specified year.
+        /// </summary>
+        /// <param name="year">The year to load articles from. If null, will show the most recent articles.</param>
+        public ArticleListing(int? year = null)
         {
             this.year = year;
         }
diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index df564704fa..510cdba020 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -132,7 +132,7 @@ namespace osu.Game.Overlays
 
             Header.SetFrontPage();
 
-            var page = new FrontPageDisplay(year);
+            var page = new ArticleListing(year);
             page.ResponseReceived += r =>
             {
                 sidebar.Metadata.Value = r.SidebarMetadata;

From abf96db54535e8e24a818db00ee6d19e921217ce Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 20 May 2021 15:27:08 +0900
Subject: [PATCH 3618/3722] Add regression test for the pattern of using DHO
 proxy in `LifetimeManagementContainer`

---
 .../Gameplay/TestSceneProxyContainer.cs       | 85 +++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 osu.Game.Tests/Gameplay/TestSceneProxyContainer.cs

diff --git a/osu.Game.Tests/Gameplay/TestSceneProxyContainer.cs b/osu.Game.Tests/Gameplay/TestSceneProxyContainer.cs
new file mode 100644
index 0000000000..9975c65085
--- /dev/null
+++ b/osu.Game.Tests/Gameplay/TestSceneProxyContainer.cs
@@ -0,0 +1,85 @@
+// Copyright (c) ppy 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.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Framework.Timing;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.UI;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Tests.Gameplay
+{
+    [HeadlessTest]
+    public class TestSceneProxyContainer : OsuTestScene
+    {
+        private HitObjectContainer hitObjectContainer;
+        private ProxyContainer proxyContainer;
+        private readonly ManualClock clock = new ManualClock();
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            Child = new Container
+            {
+                Children = new Drawable[]
+                {
+                    hitObjectContainer = new HitObjectContainer(),
+                    proxyContainer = new ProxyContainer()
+                },
+                Clock = new FramedClock(clock)
+            };
+            clock.CurrentTime = 0;
+        });
+
+        [Test]
+        public void TestProxyLifetimeManagement()
+        {
+            AddStep("Add proxy drawables", () =>
+            {
+                addProxy(new TestDrawableHitObject(1000));
+                addProxy(new TestDrawableHitObject(3000));
+                addProxy(new TestDrawableHitObject(5000));
+            });
+
+            AddStep($"time = 1000", () => clock.CurrentTime = 1000);
+            AddAssert("One proxy is alive", () => proxyContainer.AliveChildren.Count == 1);
+            AddStep($"time = 5000", () => clock.CurrentTime = 5000);
+            AddAssert("One proxy is alive", () => proxyContainer.AliveChildren.Count == 1);
+            AddStep($"time = 6000", () => clock.CurrentTime = 6000);
+            AddAssert("No proxy is alive", () => proxyContainer.AliveChildren.Count == 0);
+        }
+
+        private void addProxy(DrawableHitObject drawableHitObject)
+        {
+            hitObjectContainer.Add(drawableHitObject);
+            proxyContainer.AddProxy(drawableHitObject);
+        }
+
+        private class ProxyContainer : LifetimeManagementContainer
+        {
+            public IReadOnlyList<Drawable> AliveChildren => AliveInternalChildren;
+
+            public void AddProxy(Drawable d) => AddInternal(d.CreateProxy());
+        }
+
+        private class TestDrawableHitObject : DrawableHitObject
+        {
+            protected override double InitialLifetimeOffset => 100;
+
+            public TestDrawableHitObject(double startTime)
+                : base(new HitObject { StartTime = startTime })
+            {
+            }
+
+            protected override void UpdateInitialTransforms()
+            {
+                LifetimeEnd = LifetimeStart + 500;
+            }
+        }
+    }
+}

From d197a7f6f5f539ec2e75f1bf2e7935bc8642d9a9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 May 2021 15:39:45 +0900
Subject: [PATCH 3619/3722] Rename multiplayer client classes

---
 .../Multiplayer/TestSceneMultiplayer.cs       |   2 +-
 .../Online/Multiplayer/MultiplayerClient.cs   | 645 +++++++++++++++---
 .../Multiplayer/OnlineMultiplayerClient.cs    | 158 +++++
 .../Multiplayer/StatefulMultiplayerClient.cs  | 642 -----------------
 osu.Game/OsuGameBase.cs                       |   4 +-
 .../CreateMultiplayerMatchButton.cs           |   2 +-
 .../Match/MultiplayerMatchSettingsOverlay.cs  |   2 +-
 .../OnlinePlay/Multiplayer/Multiplayer.cs     |   2 +-
 .../Multiplayer/MultiplayerLoungeSubScreen.cs |   2 +-
 .../Multiplayer/MultiplayerMatchSongSelect.cs |   2 +-
 .../Multiplayer/MultiplayerMatchSubScreen.cs  |   2 +-
 .../Multiplayer/MultiplayerPlayer.cs          |   2 +-
 .../Multiplayer/MultiplayerRoomComposite.cs   |   2 +-
 .../Multiplayer/MultiplayerRoomManager.cs     |   2 +-
 .../Participants/ParticipantsListHeader.cs    |   2 +-
 .../Spectate/MultiSpectatorScreen.cs          |   2 +-
 .../HUD/MultiplayerGameplayLeaderboard.cs     |   2 +-
 .../Multiplayer/MultiplayerTestScene.cs       |   2 +-
 .../Multiplayer/TestMultiplayerClient.cs      |   2 +-
 .../TestMultiplayerRoomContainer.cs           |   2 +-
 20 files changed, 742 insertions(+), 739 deletions(-)
 create mode 100644 osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
 delete mode 100644 osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
index bba7e2b391..424efb255b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
@@ -195,7 +195,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         private class TestMultiplayer : Screens.OnlinePlay.Multiplayer.Multiplayer
         {
-            [Cached(typeof(StatefulMultiplayerClient))]
+            [Cached(typeof(MultiplayerClient))]
             public readonly TestMultiplayerClient Client;
 
             public TestMultiplayer()
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 4529dfd0a7..2e65f7cf1c 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -3,132 +3,621 @@
 
 #nullable enable
 
+using System;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.SignalR.Client;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.ObjectExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Logging;
 using osu.Game.Beatmaps;
+using osu.Game.Database;
 using osu.Game.Online.API;
-using osu.Game.Online.API.Requests;
 using osu.Game.Online.Rooms;
+using osu.Game.Online.Rooms.RoomStatuses;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Users;
+using osu.Game.Utils;
 
 namespace osu.Game.Online.Multiplayer
 {
-    public class MultiplayerClient : StatefulMultiplayerClient
+    public abstract class MultiplayerClient : Component, IMultiplayerClient, IMultiplayerRoomServer
     {
-        private readonly string endpoint;
+        /// <summary>
+        /// Invoked when any change occurs to the multiplayer room.
+        /// </summary>
+        public event Action? RoomUpdated;
 
-        private IHubClientConnector? connector;
+        /// <summary>
+        /// Invoked when the multiplayer server requests the current beatmap to be loaded into play.
+        /// </summary>
+        public event Action? LoadRequested;
 
-        public override IBindable<bool> IsConnected { get; } = new BindableBool();
+        /// <summary>
+        /// Invoked when the multiplayer server requests gameplay to be started.
+        /// </summary>
+        public event Action? MatchStarted;
 
-        private HubConnection? connection => connector?.CurrentConnection;
+        /// <summary>
+        /// Invoked when the multiplayer server has finished collating results.
+        /// </summary>
+        public event Action? ResultsReady;
 
-        public MultiplayerClient(EndpointConfiguration endpoints)
+        /// <summary>
+        /// Whether the <see cref="MultiplayerClient"/> is currently connected.
+        /// This is NOT thread safe and usage should be scheduled.
+        /// </summary>
+        public abstract IBindable<bool> IsConnected { get; }
+
+        /// <summary>
+        /// The joined <see cref="MultiplayerRoom"/>.
+        /// </summary>
+        public MultiplayerRoom? Room { get; private set; }
+
+        /// <summary>
+        /// The users in the joined <see cref="Room"/> which are participating in the current gameplay loop.
+        /// </summary>
+        public readonly BindableList<int> CurrentMatchPlayingUserIds = new BindableList<int>();
+
+        public readonly Bindable<PlaylistItem?> CurrentMatchPlayingItem = new Bindable<PlaylistItem?>();
+
+        /// <summary>
+        /// The <see cref="MultiplayerRoomUser"/> corresponding to the local player, if available.
+        /// </summary>
+        public MultiplayerRoomUser? LocalUser => Room?.Users.SingleOrDefault(u => u.User?.Id == API.LocalUser.Value.Id);
+
+        /// <summary>
+        /// Whether the <see cref="LocalUser"/> is the host in <see cref="Room"/>.
+        /// </summary>
+        public bool IsHost
         {
-            endpoint = endpoints.MultiplayerEndpointUrl;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(IAPIProvider api)
-        {
-            connector = api.GetHubConnector(nameof(MultiplayerClient), endpoint);
-
-            if (connector != null)
+            get
             {
-                connector.ConfigureConnection = connection =>
-                {
-                    // this is kind of SILLY
-                    // https://github.com/dotnet/aspnetcore/issues/15198
-                    connection.On<MultiplayerRoomState>(nameof(IMultiplayerClient.RoomStateChanged), ((IMultiplayerClient)this).RoomStateChanged);
-                    connection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserJoined), ((IMultiplayerClient)this).UserJoined);
-                    connection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserLeft), ((IMultiplayerClient)this).UserLeft);
-                    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);
-                    connection.On(nameof(IMultiplayerClient.LoadRequested), ((IMultiplayerClient)this).LoadRequested);
-                    connection.On(nameof(IMultiplayerClient.MatchStarted), ((IMultiplayerClient)this).MatchStarted);
-                    connection.On(nameof(IMultiplayerClient.ResultsReady), ((IMultiplayerClient)this).ResultsReady);
-                    connection.On<int, IEnumerable<APIMod>>(nameof(IMultiplayerClient.UserModsChanged), ((IMultiplayerClient)this).UserModsChanged);
-                    connection.On<int, BeatmapAvailability>(nameof(IMultiplayerClient.UserBeatmapAvailabilityChanged), ((IMultiplayerClient)this).UserBeatmapAvailabilityChanged);
-                };
-
-                IsConnected.BindTo(connector.IsConnected);
+                var localUser = LocalUser;
+                return localUser != null && Room?.Host != null && localUser.Equals(Room.Host);
             }
         }
 
-        protected override Task<MultiplayerRoom> JoinRoom(long roomId)
-        {
-            if (!IsConnected.Value)
-                return Task.FromCanceled<MultiplayerRoom>(new CancellationToken(true));
+        [Resolved]
+        protected IAPIProvider API { get; private set; } = null!;
 
-            return connection.InvokeAsync<MultiplayerRoom>(nameof(IMultiplayerServer.JoinRoom), roomId);
+        [Resolved]
+        protected RulesetStore Rulesets { get; private set; } = null!;
+
+        [Resolved]
+        private UserLookupCache userLookupCache { get; set; } = null!;
+
+        private Room? apiRoom;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            IsConnected.BindValueChanged(connected =>
+            {
+                // clean up local room state on server disconnect.
+                if (!connected.NewValue && Room != null)
+                {
+                    Logger.Log("Connection to multiplayer server was lost.", LoggingTarget.Runtime, LogLevel.Important);
+                    LeaveRoom();
+                }
+            });
         }
 
-        protected override Task LeaveRoomInternal()
-        {
-            if (!IsConnected.Value)
-                return Task.FromCanceled(new CancellationToken(true));
+        private readonly TaskChain joinOrLeaveTaskChain = new TaskChain();
+        private CancellationTokenSource? joinCancellationSource;
 
-            return connection.InvokeAsync(nameof(IMultiplayerServer.LeaveRoom));
+        /// <summary>
+        /// Joins the <see cref="MultiplayerRoom"/> for a given API <see cref="Room"/>.
+        /// </summary>
+        /// <param name="room">The API <see cref="Room"/>.</param>
+        public async Task JoinRoom(Room room)
+        {
+            var cancellationSource = joinCancellationSource = new CancellationTokenSource();
+
+            await joinOrLeaveTaskChain.Add(async () =>
+            {
+                if (Room != null)
+                    throw new InvalidOperationException("Cannot join a multiplayer room while already in one.");
+
+                Debug.Assert(room.RoomID.Value != null);
+
+                // Join the server-side room.
+                var joinedRoom = await JoinRoom(room.RoomID.Value.Value).ConfigureAwait(false);
+                Debug.Assert(joinedRoom != null);
+
+                // Populate users.
+                Debug.Assert(joinedRoom.Users != null);
+                await Task.WhenAll(joinedRoom.Users.Select(PopulateUser)).ConfigureAwait(false);
+
+                // Update the stored room (must be done on update thread for thread-safety).
+                await scheduleAsync(() =>
+                {
+                    Room = joinedRoom;
+                    apiRoom = room;
+                    foreach (var user in joinedRoom.Users)
+                        updateUserPlayingState(user.UserID, user.State);
+                }, cancellationSource.Token).ConfigureAwait(false);
+
+                // Update room settings.
+                await updateLocalRoomSettings(joinedRoom.Settings, cancellationSource.Token).ConfigureAwait(false);
+            }, cancellationSource.Token).ConfigureAwait(false);
         }
 
-        public override Task TransferHost(int userId)
+        /// <summary>
+        /// Joins the <see cref="MultiplayerRoom"/> with a given ID.
+        /// </summary>
+        /// <param name="roomId">The room ID.</param>
+        /// <returns>The joined <see cref="MultiplayerRoom"/>.</returns>
+        protected abstract Task<MultiplayerRoom> JoinRoom(long roomId);
+
+        public Task LeaveRoom()
         {
-            if (!IsConnected.Value)
+            // The join may have not completed yet, so certain tasks that either update the room or reference the room should be cancelled.
+            // This includes the setting of Room itself along with the initial update of the room settings on join.
+            joinCancellationSource?.Cancel();
+
+            // Leaving rooms is expected to occur instantaneously whilst the operation is finalised in the background.
+            // However a few members need to be reset immediately to prevent other components from entering invalid states whilst the operation hasn't yet completed.
+            // For example, if a room was left and the user immediately pressed the "create room" button, then the user could be taken into the lobby if the value of Room is not reset in time.
+            var scheduledReset = scheduleAsync(() =>
+            {
+                apiRoom = null;
+                Room = null;
+                CurrentMatchPlayingUserIds.Clear();
+
+                RoomUpdated?.Invoke();
+            });
+
+            return joinOrLeaveTaskChain.Add(async () =>
+            {
+                await scheduledReset.ConfigureAwait(false);
+                await LeaveRoomInternal().ConfigureAwait(false);
+            });
+        }
+
+        protected abstract Task LeaveRoomInternal();
+
+        /// <summary>
+        /// Change the current <see cref="MultiplayerRoom"/> settings.
+        /// </summary>
+        /// <remarks>
+        /// A room must be joined for this to have any effect.
+        /// </remarks>
+        /// <param name="name">The new room name, if any.</param>
+        /// <param name="item">The new room playlist item, if any.</param>
+        public Task ChangeSettings(Optional<string> name = default, Optional<PlaylistItem> item = default)
+        {
+            if (Room == null)
+                throw new InvalidOperationException("Must be joined to a match to change settings.");
+
+            // A dummy playlist item filled with the current room settings (except mods).
+            var existingPlaylistItem = new PlaylistItem
+            {
+                Beatmap =
+                {
+                    Value = new BeatmapInfo
+                    {
+                        OnlineBeatmapID = Room.Settings.BeatmapID,
+                        MD5Hash = Room.Settings.BeatmapChecksum
+                    }
+                },
+                RulesetID = Room.Settings.RulesetID
+            };
+
+            return ChangeSettings(new MultiplayerRoomSettings
+            {
+                Name = name.GetOr(Room.Settings.Name),
+                BeatmapID = item.GetOr(existingPlaylistItem).BeatmapID,
+                BeatmapChecksum = item.GetOr(existingPlaylistItem).Beatmap.Value.MD5Hash,
+                RulesetID = item.GetOr(existingPlaylistItem).RulesetID,
+                RequiredMods = item.HasValue ? item.Value.AsNonNull().RequiredMods.Select(m => new APIMod(m)).ToList() : Room.Settings.RequiredMods,
+                AllowedMods = item.HasValue ? item.Value.AsNonNull().AllowedMods.Select(m => new APIMod(m)).ToList() : Room.Settings.AllowedMods,
+            });
+        }
+
+        /// <summary>
+        /// Toggles the <see cref="LocalUser"/>'s ready state.
+        /// </summary>
+        /// <exception cref="InvalidOperationException">If a toggle of ready state is not valid at this time.</exception>
+        public async Task ToggleReady()
+        {
+            var localUser = LocalUser;
+
+            if (localUser == null)
+                return;
+
+            switch (localUser.State)
+            {
+                case MultiplayerUserState.Idle:
+                    await ChangeState(MultiplayerUserState.Ready).ConfigureAwait(false);
+                    return;
+
+                case MultiplayerUserState.Ready:
+                    await ChangeState(MultiplayerUserState.Idle).ConfigureAwait(false);
+                    return;
+
+                default:
+                    throw new InvalidOperationException($"Cannot toggle ready when in {localUser.State}");
+            }
+        }
+
+        /// <summary>
+        /// Toggles the <see cref="LocalUser"/>'s spectating state.
+        /// </summary>
+        /// <exception cref="InvalidOperationException">If a toggle of the spectating state is not valid at this time.</exception>
+        public async Task ToggleSpectate()
+        {
+            var localUser = LocalUser;
+
+            if (localUser == null)
+                return;
+
+            switch (localUser.State)
+            {
+                case MultiplayerUserState.Idle:
+                case MultiplayerUserState.Ready:
+                    await ChangeState(MultiplayerUserState.Spectating).ConfigureAwait(false);
+                    return;
+
+                case MultiplayerUserState.Spectating:
+                    await ChangeState(MultiplayerUserState.Idle).ConfigureAwait(false);
+                    return;
+
+                default:
+                    throw new InvalidOperationException($"Cannot toggle spectate when in {localUser.State}");
+            }
+        }
+
+        public abstract Task TransferHost(int userId);
+
+        public abstract Task ChangeSettings(MultiplayerRoomSettings settings);
+
+        public abstract Task ChangeState(MultiplayerUserState newState);
+
+        public abstract Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability);
+
+        /// <summary>
+        /// Change the local user's mods in the currently joined room.
+        /// </summary>
+        /// <param name="newMods">The proposed new mods, excluding any required by the room itself.</param>
+        public Task ChangeUserMods(IEnumerable<Mod> newMods) => ChangeUserMods(newMods.Select(m => new APIMod(m)).ToList());
+
+        public abstract Task ChangeUserMods(IEnumerable<APIMod> newMods);
+
+        public abstract Task StartMatch();
+
+        Task IMultiplayerClient.RoomStateChanged(MultiplayerRoomState state)
+        {
+            if (Room == null)
                 return Task.CompletedTask;
 
-            return connection.InvokeAsync(nameof(IMultiplayerServer.TransferHost), userId);
+            Scheduler.Add(() =>
+            {
+                if (Room == null)
+                    return;
+
+                Debug.Assert(apiRoom != null);
+
+                Room.State = state;
+
+                switch (state)
+                {
+                    case MultiplayerRoomState.Open:
+                        apiRoom.Status.Value = new RoomStatusOpen();
+                        break;
+
+                    case MultiplayerRoomState.Playing:
+                        apiRoom.Status.Value = new RoomStatusPlaying();
+                        break;
+
+                    case MultiplayerRoomState.Closed:
+                        apiRoom.Status.Value = new RoomStatusEnded();
+                        break;
+                }
+
+                RoomUpdated?.Invoke();
+            }, false);
+
+            return Task.CompletedTask;
         }
 
-        public override Task ChangeSettings(MultiplayerRoomSettings settings)
+        async Task IMultiplayerClient.UserJoined(MultiplayerRoomUser user)
         {
-            if (!IsConnected.Value)
+            if (Room == null)
+                return;
+
+            await PopulateUser(user).ConfigureAwait(false);
+
+            Scheduler.Add(() =>
+            {
+                if (Room == null)
+                    return;
+
+                // for sanity, ensure that there can be no duplicate users in the room user list.
+                if (Room.Users.Any(existing => existing.UserID == user.UserID))
+                    return;
+
+                Room.Users.Add(user);
+
+                RoomUpdated?.Invoke();
+            }, false);
+        }
+
+        Task IMultiplayerClient.UserLeft(MultiplayerRoomUser user)
+        {
+            if (Room == null)
                 return Task.CompletedTask;
 
-            return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeSettings), settings);
+            Scheduler.Add(() =>
+            {
+                if (Room == null)
+                    return;
+
+                Room.Users.Remove(user);
+                CurrentMatchPlayingUserIds.Remove(user.UserID);
+
+                RoomUpdated?.Invoke();
+            }, false);
+
+            return Task.CompletedTask;
         }
 
-        public override Task ChangeState(MultiplayerUserState newState)
+        Task IMultiplayerClient.HostChanged(int userId)
         {
-            if (!IsConnected.Value)
+            if (Room == null)
                 return Task.CompletedTask;
 
-            return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeState), newState);
+            Scheduler.Add(() =>
+            {
+                if (Room == null)
+                    return;
+
+                Debug.Assert(apiRoom != null);
+
+                var user = Room.Users.FirstOrDefault(u => u.UserID == userId);
+
+                Room.Host = user;
+                apiRoom.Host.Value = user?.User;
+
+                RoomUpdated?.Invoke();
+            }, false);
+
+            return Task.CompletedTask;
         }
 
-        public override Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability)
+        Task IMultiplayerClient.SettingsChanged(MultiplayerRoomSettings newSettings)
         {
-            if (!IsConnected.Value)
+            updateLocalRoomSettings(newSettings);
+            return Task.CompletedTask;
+        }
+
+        Task IMultiplayerClient.UserStateChanged(int userId, MultiplayerUserState state)
+        {
+            if (Room == null)
                 return Task.CompletedTask;
 
-            return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeBeatmapAvailability), newBeatmapAvailability);
+            Scheduler.Add(() =>
+            {
+                if (Room == null)
+                    return;
+
+                Room.Users.Single(u => u.UserID == userId).State = state;
+
+                updateUserPlayingState(userId, state);
+
+                RoomUpdated?.Invoke();
+            }, false);
+
+            return Task.CompletedTask;
         }
 
-        public override Task ChangeUserMods(IEnumerable<APIMod> newMods)
+        Task IMultiplayerClient.UserBeatmapAvailabilityChanged(int userId, BeatmapAvailability beatmapAvailability)
         {
-            if (!IsConnected.Value)
+            if (Room == null)
                 return Task.CompletedTask;
 
-            return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeUserMods), newMods);
+            Scheduler.Add(() =>
+            {
+                var user = Room?.Users.SingleOrDefault(u => u.UserID == userId);
+
+                // errors here are not critical - beatmap availability state is mostly for display.
+                if (user == null)
+                    return;
+
+                user.BeatmapAvailability = beatmapAvailability;
+
+                RoomUpdated?.Invoke();
+            }, false);
+
+            return Task.CompletedTask;
         }
 
-        public override Task StartMatch()
+        public Task UserModsChanged(int userId, IEnumerable<APIMod> mods)
         {
-            if (!IsConnected.Value)
+            if (Room == null)
                 return Task.CompletedTask;
 
-            return connection.InvokeAsync(nameof(IMultiplayerServer.StartMatch));
+            Scheduler.Add(() =>
+            {
+                var user = Room?.Users.SingleOrDefault(u => u.UserID == userId);
+
+                // errors here are not critical - user mods are mostly for display.
+                if (user == null)
+                    return;
+
+                user.Mods = mods;
+
+                RoomUpdated?.Invoke();
+            }, false);
+
+            return Task.CompletedTask;
         }
 
-        protected override Task<BeatmapSetInfo> GetOnlineBeatmapSet(int beatmapId, CancellationToken cancellationToken = default)
+        Task IMultiplayerClient.LoadRequested()
         {
-            var tcs = new TaskCompletionSource<BeatmapSetInfo>();
-            var req = new GetBeatmapSetRequest(beatmapId, BeatmapSetLookupType.BeatmapId);
+            if (Room == null)
+                return Task.CompletedTask;
 
-            req.Success += res =>
+            Scheduler.Add(() =>
+            {
+                if (Room == null)
+                    return;
+
+                LoadRequested?.Invoke();
+            }, false);
+
+            return Task.CompletedTask;
+        }
+
+        Task IMultiplayerClient.MatchStarted()
+        {
+            if (Room == null)
+                return Task.CompletedTask;
+
+            Scheduler.Add(() =>
+            {
+                if (Room == null)
+                    return;
+
+                MatchStarted?.Invoke();
+            }, false);
+
+            return Task.CompletedTask;
+        }
+
+        Task IMultiplayerClient.ResultsReady()
+        {
+            if (Room == null)
+                return Task.CompletedTask;
+
+            Scheduler.Add(() =>
+            {
+                if (Room == null)
+                    return;
+
+                ResultsReady?.Invoke();
+            }, false);
+
+            return Task.CompletedTask;
+        }
+
+        /// <summary>
+        /// Populates the <see cref="User"/> for a given <see cref="MultiplayerRoomUser"/>.
+        /// </summary>
+        /// <param name="multiplayerUser">The <see cref="MultiplayerRoomUser"/> to populate.</param>
+        protected async Task PopulateUser(MultiplayerRoomUser multiplayerUser) => multiplayerUser.User ??= await userLookupCache.GetUserAsync(multiplayerUser.UserID).ConfigureAwait(false);
+
+        /// <summary>
+        /// Updates the local room settings with the given <see cref="MultiplayerRoomSettings"/>.
+        /// </summary>
+        /// <remarks>
+        /// This updates both the joined <see cref="MultiplayerRoom"/> and the respective API <see cref="Room"/>.
+        /// </remarks>
+        /// <param name="settings">The new <see cref="MultiplayerRoomSettings"/> to update from.</param>
+        /// <param name="cancellationToken">The <see cref="CancellationToken"/> to cancel the update.</param>
+        private Task updateLocalRoomSettings(MultiplayerRoomSettings settings, CancellationToken cancellationToken = default) => scheduleAsync(() =>
+        {
+            if (Room == null)
+                return;
+
+            Debug.Assert(apiRoom != null);
+
+            // Update a few properties of the room instantaneously.
+            Room.Settings = settings;
+            apiRoom.Name.Value = Room.Settings.Name;
+
+            // The current item update is delayed until an online beatmap lookup (below) succeeds.
+            // In-order for the client to not display an outdated beatmap, the current item is forcefully cleared here.
+            CurrentMatchPlayingItem.Value = null;
+
+            RoomUpdated?.Invoke();
+
+            GetOnlineBeatmapSet(settings.BeatmapID, cancellationToken).ContinueWith(set => Schedule(() =>
+            {
+                if (cancellationToken.IsCancellationRequested)
+                    return;
+
+                updatePlaylist(settings, set.Result);
+            }), TaskContinuationOptions.OnlyOnRanToCompletion);
+        }, cancellationToken);
+
+        private void updatePlaylist(MultiplayerRoomSettings settings, BeatmapSetInfo beatmapSet)
+        {
+            if (Room == null || !Room.Settings.Equals(settings))
+                return;
+
+            Debug.Assert(apiRoom != null);
+
+            var beatmap = beatmapSet.Beatmaps.Single(b => b.OnlineBeatmapID == settings.BeatmapID);
+            beatmap.MD5Hash = settings.BeatmapChecksum;
+
+            var ruleset = Rulesets.GetRuleset(settings.RulesetID).CreateInstance();
+            var mods = settings.RequiredMods.Select(m => m.ToMod(ruleset));
+            var allowedMods = settings.AllowedMods.Select(m => m.ToMod(ruleset));
+
+            // Try to retrieve the existing playlist item from the API room.
+            var playlistItem = apiRoom.Playlist.FirstOrDefault(i => i.ID == settings.PlaylistItemId);
+
+            if (playlistItem != null)
+                updateItem(playlistItem);
+            else
+            {
+                // An existing playlist item does not exist, so append a new one.
+                updateItem(playlistItem = new PlaylistItem());
+                apiRoom.Playlist.Add(playlistItem);
+            }
+
+            CurrentMatchPlayingItem.Value = playlistItem;
+
+            void updateItem(PlaylistItem item)
+            {
+                item.ID = settings.PlaylistItemId;
+                item.Beatmap.Value = beatmap;
+                item.Ruleset.Value = ruleset.RulesetInfo;
+                item.RequiredMods.Clear();
+                item.RequiredMods.AddRange(mods);
+                item.AllowedMods.Clear();
+                item.AllowedMods.AddRange(allowedMods);
+            }
+        }
+
+        /// <summary>
+        /// Retrieves a <see cref="BeatmapSetInfo"/> from an online source.
+        /// </summary>
+        /// <param name="beatmapId">The beatmap set ID.</param>
+        /// <param name="cancellationToken">A token to cancel the request.</param>
+        /// <returns>The <see cref="BeatmapSetInfo"/> retrieval task.</returns>
+        protected abstract Task<BeatmapSetInfo> GetOnlineBeatmapSet(int beatmapId, CancellationToken cancellationToken = default);
+
+        /// <summary>
+        /// For the provided user ID, update whether the user is included in <see cref="CurrentMatchPlayingUserIds"/>.
+        /// </summary>
+        /// <param name="userId">The user's ID.</param>
+        /// <param name="state">The new state of the user.</param>
+        private void updateUserPlayingState(int userId, MultiplayerUserState state)
+        {
+            bool wasPlaying = CurrentMatchPlayingUserIds.Contains(userId);
+            bool isPlaying = state >= MultiplayerUserState.WaitingForLoad && state <= MultiplayerUserState.FinishedPlay;
+
+            if (isPlaying == wasPlaying)
+                return;
+
+            if (isPlaying)
+                CurrentMatchPlayingUserIds.Add(userId);
+            else
+                CurrentMatchPlayingUserIds.Remove(userId);
+        }
+
+        private Task scheduleAsync(Action action, CancellationToken cancellationToken = default)
+        {
+            var tcs = new TaskCompletionSource<bool>();
+
+            Scheduler.Add(() =>
             {
                 if (cancellationToken.IsCancellationRequested)
                 {
@@ -136,20 +625,18 @@ namespace osu.Game.Online.Multiplayer
                     return;
                 }
 
-                tcs.SetResult(res.ToBeatmapSet(Rulesets));
-            };
-
-            req.Failure += e => tcs.SetException(e);
-
-            API.Queue(req);
+                try
+                {
+                    action();
+                    tcs.SetResult(true);
+                }
+                catch (Exception ex)
+                {
+                    tcs.SetException(ex);
+                }
+            });
 
             return tcs.Task;
         }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-            connector?.Dispose();
-        }
     }
 }
diff --git a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
new file mode 100644
index 0000000000..cf1e18e059
--- /dev/null
+++ b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
@@ -0,0 +1,158 @@
+// Copyright (c) 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
+
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.SignalR.Client;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Game.Beatmaps;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Online.Rooms;
+
+namespace osu.Game.Online.Multiplayer
+{
+    /// <summary>
+    /// A <see cref="MultiplayerClient"/> with online connectivity.
+    /// </summary>
+    public class OnlineMultiplayerClient : MultiplayerClient
+    {
+        private readonly string endpoint;
+
+        private IHubClientConnector? connector;
+
+        public override IBindable<bool> IsConnected { get; } = new BindableBool();
+
+        private HubConnection? connection => connector?.CurrentConnection;
+
+        public OnlineMultiplayerClient(EndpointConfiguration endpoints)
+        {
+            endpoint = endpoints.MultiplayerEndpointUrl;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(IAPIProvider api)
+        {
+            connector = api.GetHubConnector(nameof(OnlineMultiplayerClient), endpoint);
+
+            if (connector != null)
+            {
+                connector.ConfigureConnection = connection =>
+                {
+                    // this is kind of SILLY
+                    // https://github.com/dotnet/aspnetcore/issues/15198
+                    connection.On<MultiplayerRoomState>(nameof(IMultiplayerClient.RoomStateChanged), ((IMultiplayerClient)this).RoomStateChanged);
+                    connection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserJoined), ((IMultiplayerClient)this).UserJoined);
+                    connection.On<MultiplayerRoomUser>(nameof(IMultiplayerClient.UserLeft), ((IMultiplayerClient)this).UserLeft);
+                    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);
+                    connection.On(nameof(IMultiplayerClient.LoadRequested), ((IMultiplayerClient)this).LoadRequested);
+                    connection.On(nameof(IMultiplayerClient.MatchStarted), ((IMultiplayerClient)this).MatchStarted);
+                    connection.On(nameof(IMultiplayerClient.ResultsReady), ((IMultiplayerClient)this).ResultsReady);
+                    connection.On<int, IEnumerable<APIMod>>(nameof(IMultiplayerClient.UserModsChanged), ((IMultiplayerClient)this).UserModsChanged);
+                    connection.On<int, BeatmapAvailability>(nameof(IMultiplayerClient.UserBeatmapAvailabilityChanged), ((IMultiplayerClient)this).UserBeatmapAvailabilityChanged);
+                };
+
+                IsConnected.BindTo(connector.IsConnected);
+            }
+        }
+
+        protected override Task<MultiplayerRoom> JoinRoom(long roomId)
+        {
+            if (!IsConnected.Value)
+                return Task.FromCanceled<MultiplayerRoom>(new CancellationToken(true));
+
+            return connection.InvokeAsync<MultiplayerRoom>(nameof(IMultiplayerServer.JoinRoom), roomId);
+        }
+
+        protected override Task LeaveRoomInternal()
+        {
+            if (!IsConnected.Value)
+                return Task.FromCanceled(new CancellationToken(true));
+
+            return connection.InvokeAsync(nameof(IMultiplayerServer.LeaveRoom));
+        }
+
+        public override Task TransferHost(int userId)
+        {
+            if (!IsConnected.Value)
+                return Task.CompletedTask;
+
+            return connection.InvokeAsync(nameof(IMultiplayerServer.TransferHost), userId);
+        }
+
+        public override Task ChangeSettings(MultiplayerRoomSettings settings)
+        {
+            if (!IsConnected.Value)
+                return Task.CompletedTask;
+
+            return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeSettings), settings);
+        }
+
+        public override Task ChangeState(MultiplayerUserState newState)
+        {
+            if (!IsConnected.Value)
+                return Task.CompletedTask;
+
+            return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeState), newState);
+        }
+
+        public override Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability)
+        {
+            if (!IsConnected.Value)
+                return Task.CompletedTask;
+
+            return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeBeatmapAvailability), newBeatmapAvailability);
+        }
+
+        public override Task ChangeUserMods(IEnumerable<APIMod> newMods)
+        {
+            if (!IsConnected.Value)
+                return Task.CompletedTask;
+
+            return connection.InvokeAsync(nameof(IMultiplayerServer.ChangeUserMods), newMods);
+        }
+
+        public override Task StartMatch()
+        {
+            if (!IsConnected.Value)
+                return Task.CompletedTask;
+
+            return connection.InvokeAsync(nameof(IMultiplayerServer.StartMatch));
+        }
+
+        protected override Task<BeatmapSetInfo> GetOnlineBeatmapSet(int beatmapId, CancellationToken cancellationToken = default)
+        {
+            var tcs = new TaskCompletionSource<BeatmapSetInfo>();
+            var req = new GetBeatmapSetRequest(beatmapId, BeatmapSetLookupType.BeatmapId);
+
+            req.Success += res =>
+            {
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    tcs.SetCanceled();
+                    return;
+                }
+
+                tcs.SetResult(res.ToBeatmapSet(Rulesets));
+            };
+
+            req.Failure += e => tcs.SetException(e);
+
+            API.Queue(req);
+
+            return tcs.Task;
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            connector?.Dispose();
+        }
+    }
+}
diff --git a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs b/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
deleted file mode 100644
index 7fe48d54b1..0000000000
--- a/osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs
+++ /dev/null
@@ -1,642 +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 enable
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Framework.Extensions.ObjectExtensions;
-using osu.Framework.Graphics;
-using osu.Framework.Logging;
-using osu.Game.Beatmaps;
-using osu.Game.Database;
-using osu.Game.Online.API;
-using osu.Game.Online.Rooms;
-using osu.Game.Online.Rooms.RoomStatuses;
-using osu.Game.Rulesets;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Users;
-using osu.Game.Utils;
-
-namespace osu.Game.Online.Multiplayer
-{
-    public abstract class StatefulMultiplayerClient : Component, IMultiplayerClient, IMultiplayerRoomServer
-    {
-        /// <summary>
-        /// Invoked when any change occurs to the multiplayer room.
-        /// </summary>
-        public event Action? RoomUpdated;
-
-        /// <summary>
-        /// Invoked when the multiplayer server requests the current beatmap to be loaded into play.
-        /// </summary>
-        public event Action? LoadRequested;
-
-        /// <summary>
-        /// Invoked when the multiplayer server requests gameplay to be started.
-        /// </summary>
-        public event Action? MatchStarted;
-
-        /// <summary>
-        /// Invoked when the multiplayer server has finished collating results.
-        /// </summary>
-        public event Action? ResultsReady;
-
-        /// <summary>
-        /// Whether the <see cref="StatefulMultiplayerClient"/> is currently connected.
-        /// This is NOT thread safe and usage should be scheduled.
-        /// </summary>
-        public abstract IBindable<bool> IsConnected { get; }
-
-        /// <summary>
-        /// The joined <see cref="MultiplayerRoom"/>.
-        /// </summary>
-        public MultiplayerRoom? Room { get; private set; }
-
-        /// <summary>
-        /// The users in the joined <see cref="Room"/> which are participating in the current gameplay loop.
-        /// </summary>
-        public readonly BindableList<int> CurrentMatchPlayingUserIds = new BindableList<int>();
-
-        public readonly Bindable<PlaylistItem?> CurrentMatchPlayingItem = new Bindable<PlaylistItem?>();
-
-        /// <summary>
-        /// The <see cref="MultiplayerRoomUser"/> corresponding to the local player, if available.
-        /// </summary>
-        public MultiplayerRoomUser? LocalUser => Room?.Users.SingleOrDefault(u => u.User?.Id == API.LocalUser.Value.Id);
-
-        /// <summary>
-        /// Whether the <see cref="LocalUser"/> is the host in <see cref="Room"/>.
-        /// </summary>
-        public bool IsHost
-        {
-            get
-            {
-                var localUser = LocalUser;
-                return localUser != null && Room?.Host != null && localUser.Equals(Room.Host);
-            }
-        }
-
-        [Resolved]
-        protected IAPIProvider API { get; private set; } = null!;
-
-        [Resolved]
-        protected RulesetStore Rulesets { get; private set; } = null!;
-
-        [Resolved]
-        private UserLookupCache userLookupCache { get; set; } = null!;
-
-        private Room? apiRoom;
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            IsConnected.BindValueChanged(connected =>
-            {
-                // clean up local room state on server disconnect.
-                if (!connected.NewValue && Room != null)
-                {
-                    Logger.Log("Connection to multiplayer server was lost.", LoggingTarget.Runtime, LogLevel.Important);
-                    LeaveRoom();
-                }
-            });
-        }
-
-        private readonly TaskChain joinOrLeaveTaskChain = new TaskChain();
-        private CancellationTokenSource? joinCancellationSource;
-
-        /// <summary>
-        /// Joins the <see cref="MultiplayerRoom"/> for a given API <see cref="Room"/>.
-        /// </summary>
-        /// <param name="room">The API <see cref="Room"/>.</param>
-        public async Task JoinRoom(Room room)
-        {
-            var cancellationSource = joinCancellationSource = new CancellationTokenSource();
-
-            await joinOrLeaveTaskChain.Add(async () =>
-            {
-                if (Room != null)
-                    throw new InvalidOperationException("Cannot join a multiplayer room while already in one.");
-
-                Debug.Assert(room.RoomID.Value != null);
-
-                // Join the server-side room.
-                var joinedRoom = await JoinRoom(room.RoomID.Value.Value).ConfigureAwait(false);
-                Debug.Assert(joinedRoom != null);
-
-                // Populate users.
-                Debug.Assert(joinedRoom.Users != null);
-                await Task.WhenAll(joinedRoom.Users.Select(PopulateUser)).ConfigureAwait(false);
-
-                // Update the stored room (must be done on update thread for thread-safety).
-                await scheduleAsync(() =>
-                {
-                    Room = joinedRoom;
-                    apiRoom = room;
-                    foreach (var user in joinedRoom.Users)
-                        updateUserPlayingState(user.UserID, user.State);
-                }, cancellationSource.Token).ConfigureAwait(false);
-
-                // Update room settings.
-                await updateLocalRoomSettings(joinedRoom.Settings, cancellationSource.Token).ConfigureAwait(false);
-            }, cancellationSource.Token).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Joins the <see cref="MultiplayerRoom"/> with a given ID.
-        /// </summary>
-        /// <param name="roomId">The room ID.</param>
-        /// <returns>The joined <see cref="MultiplayerRoom"/>.</returns>
-        protected abstract Task<MultiplayerRoom> JoinRoom(long roomId);
-
-        public Task LeaveRoom()
-        {
-            // The join may have not completed yet, so certain tasks that either update the room or reference the room should be cancelled.
-            // This includes the setting of Room itself along with the initial update of the room settings on join.
-            joinCancellationSource?.Cancel();
-
-            // Leaving rooms is expected to occur instantaneously whilst the operation is finalised in the background.
-            // However a few members need to be reset immediately to prevent other components from entering invalid states whilst the operation hasn't yet completed.
-            // For example, if a room was left and the user immediately pressed the "create room" button, then the user could be taken into the lobby if the value of Room is not reset in time.
-            var scheduledReset = scheduleAsync(() =>
-            {
-                apiRoom = null;
-                Room = null;
-                CurrentMatchPlayingUserIds.Clear();
-
-                RoomUpdated?.Invoke();
-            });
-
-            return joinOrLeaveTaskChain.Add(async () =>
-            {
-                await scheduledReset.ConfigureAwait(false);
-                await LeaveRoomInternal().ConfigureAwait(false);
-            });
-        }
-
-        protected abstract Task LeaveRoomInternal();
-
-        /// <summary>
-        /// Change the current <see cref="MultiplayerRoom"/> settings.
-        /// </summary>
-        /// <remarks>
-        /// A room must be joined for this to have any effect.
-        /// </remarks>
-        /// <param name="name">The new room name, if any.</param>
-        /// <param name="item">The new room playlist item, if any.</param>
-        public Task ChangeSettings(Optional<string> name = default, Optional<PlaylistItem> item = default)
-        {
-            if (Room == null)
-                throw new InvalidOperationException("Must be joined to a match to change settings.");
-
-            // A dummy playlist item filled with the current room settings (except mods).
-            var existingPlaylistItem = new PlaylistItem
-            {
-                Beatmap =
-                {
-                    Value = new BeatmapInfo
-                    {
-                        OnlineBeatmapID = Room.Settings.BeatmapID,
-                        MD5Hash = Room.Settings.BeatmapChecksum
-                    }
-                },
-                RulesetID = Room.Settings.RulesetID
-            };
-
-            return ChangeSettings(new MultiplayerRoomSettings
-            {
-                Name = name.GetOr(Room.Settings.Name),
-                BeatmapID = item.GetOr(existingPlaylistItem).BeatmapID,
-                BeatmapChecksum = item.GetOr(existingPlaylistItem).Beatmap.Value.MD5Hash,
-                RulesetID = item.GetOr(existingPlaylistItem).RulesetID,
-                RequiredMods = item.HasValue ? item.Value.AsNonNull().RequiredMods.Select(m => new APIMod(m)).ToList() : Room.Settings.RequiredMods,
-                AllowedMods = item.HasValue ? item.Value.AsNonNull().AllowedMods.Select(m => new APIMod(m)).ToList() : Room.Settings.AllowedMods,
-            });
-        }
-
-        /// <summary>
-        /// Toggles the <see cref="LocalUser"/>'s ready state.
-        /// </summary>
-        /// <exception cref="InvalidOperationException">If a toggle of ready state is not valid at this time.</exception>
-        public async Task ToggleReady()
-        {
-            var localUser = LocalUser;
-
-            if (localUser == null)
-                return;
-
-            switch (localUser.State)
-            {
-                case MultiplayerUserState.Idle:
-                    await ChangeState(MultiplayerUserState.Ready).ConfigureAwait(false);
-                    return;
-
-                case MultiplayerUserState.Ready:
-                    await ChangeState(MultiplayerUserState.Idle).ConfigureAwait(false);
-                    return;
-
-                default:
-                    throw new InvalidOperationException($"Cannot toggle ready when in {localUser.State}");
-            }
-        }
-
-        /// <summary>
-        /// Toggles the <see cref="LocalUser"/>'s spectating state.
-        /// </summary>
-        /// <exception cref="InvalidOperationException">If a toggle of the spectating state is not valid at this time.</exception>
-        public async Task ToggleSpectate()
-        {
-            var localUser = LocalUser;
-
-            if (localUser == null)
-                return;
-
-            switch (localUser.State)
-            {
-                case MultiplayerUserState.Idle:
-                case MultiplayerUserState.Ready:
-                    await ChangeState(MultiplayerUserState.Spectating).ConfigureAwait(false);
-                    return;
-
-                case MultiplayerUserState.Spectating:
-                    await ChangeState(MultiplayerUserState.Idle).ConfigureAwait(false);
-                    return;
-
-                default:
-                    throw new InvalidOperationException($"Cannot toggle spectate when in {localUser.State}");
-            }
-        }
-
-        public abstract Task TransferHost(int userId);
-
-        public abstract Task ChangeSettings(MultiplayerRoomSettings settings);
-
-        public abstract Task ChangeState(MultiplayerUserState newState);
-
-        public abstract Task ChangeBeatmapAvailability(BeatmapAvailability newBeatmapAvailability);
-
-        /// <summary>
-        /// Change the local user's mods in the currently joined room.
-        /// </summary>
-        /// <param name="newMods">The proposed new mods, excluding any required by the room itself.</param>
-        public Task ChangeUserMods(IEnumerable<Mod> newMods) => ChangeUserMods(newMods.Select(m => new APIMod(m)).ToList());
-
-        public abstract Task ChangeUserMods(IEnumerable<APIMod> newMods);
-
-        public abstract Task StartMatch();
-
-        Task IMultiplayerClient.RoomStateChanged(MultiplayerRoomState state)
-        {
-            if (Room == null)
-                return Task.CompletedTask;
-
-            Scheduler.Add(() =>
-            {
-                if (Room == null)
-                    return;
-
-                Debug.Assert(apiRoom != null);
-
-                Room.State = state;
-
-                switch (state)
-                {
-                    case MultiplayerRoomState.Open:
-                        apiRoom.Status.Value = new RoomStatusOpen();
-                        break;
-
-                    case MultiplayerRoomState.Playing:
-                        apiRoom.Status.Value = new RoomStatusPlaying();
-                        break;
-
-                    case MultiplayerRoomState.Closed:
-                        apiRoom.Status.Value = new RoomStatusEnded();
-                        break;
-                }
-
-                RoomUpdated?.Invoke();
-            }, false);
-
-            return Task.CompletedTask;
-        }
-
-        async Task IMultiplayerClient.UserJoined(MultiplayerRoomUser user)
-        {
-            if (Room == null)
-                return;
-
-            await PopulateUser(user).ConfigureAwait(false);
-
-            Scheduler.Add(() =>
-            {
-                if (Room == null)
-                    return;
-
-                // for sanity, ensure that there can be no duplicate users in the room user list.
-                if (Room.Users.Any(existing => existing.UserID == user.UserID))
-                    return;
-
-                Room.Users.Add(user);
-
-                RoomUpdated?.Invoke();
-            }, false);
-        }
-
-        Task IMultiplayerClient.UserLeft(MultiplayerRoomUser user)
-        {
-            if (Room == null)
-                return Task.CompletedTask;
-
-            Scheduler.Add(() =>
-            {
-                if (Room == null)
-                    return;
-
-                Room.Users.Remove(user);
-                CurrentMatchPlayingUserIds.Remove(user.UserID);
-
-                RoomUpdated?.Invoke();
-            }, false);
-
-            return Task.CompletedTask;
-        }
-
-        Task IMultiplayerClient.HostChanged(int userId)
-        {
-            if (Room == null)
-                return Task.CompletedTask;
-
-            Scheduler.Add(() =>
-            {
-                if (Room == null)
-                    return;
-
-                Debug.Assert(apiRoom != null);
-
-                var user = Room.Users.FirstOrDefault(u => u.UserID == userId);
-
-                Room.Host = user;
-                apiRoom.Host.Value = user?.User;
-
-                RoomUpdated?.Invoke();
-            }, false);
-
-            return Task.CompletedTask;
-        }
-
-        Task IMultiplayerClient.SettingsChanged(MultiplayerRoomSettings newSettings)
-        {
-            updateLocalRoomSettings(newSettings);
-            return Task.CompletedTask;
-        }
-
-        Task IMultiplayerClient.UserStateChanged(int userId, MultiplayerUserState state)
-        {
-            if (Room == null)
-                return Task.CompletedTask;
-
-            Scheduler.Add(() =>
-            {
-                if (Room == null)
-                    return;
-
-                Room.Users.Single(u => u.UserID == userId).State = state;
-
-                updateUserPlayingState(userId, state);
-
-                RoomUpdated?.Invoke();
-            }, false);
-
-            return Task.CompletedTask;
-        }
-
-        Task IMultiplayerClient.UserBeatmapAvailabilityChanged(int userId, BeatmapAvailability beatmapAvailability)
-        {
-            if (Room == null)
-                return Task.CompletedTask;
-
-            Scheduler.Add(() =>
-            {
-                var user = Room?.Users.SingleOrDefault(u => u.UserID == userId);
-
-                // errors here are not critical - beatmap availability state is mostly for display.
-                if (user == null)
-                    return;
-
-                user.BeatmapAvailability = beatmapAvailability;
-
-                RoomUpdated?.Invoke();
-            }, false);
-
-            return Task.CompletedTask;
-        }
-
-        public Task UserModsChanged(int userId, IEnumerable<APIMod> mods)
-        {
-            if (Room == null)
-                return Task.CompletedTask;
-
-            Scheduler.Add(() =>
-            {
-                var user = Room?.Users.SingleOrDefault(u => u.UserID == userId);
-
-                // errors here are not critical - user mods are mostly for display.
-                if (user == null)
-                    return;
-
-                user.Mods = mods;
-
-                RoomUpdated?.Invoke();
-            }, false);
-
-            return Task.CompletedTask;
-        }
-
-        Task IMultiplayerClient.LoadRequested()
-        {
-            if (Room == null)
-                return Task.CompletedTask;
-
-            Scheduler.Add(() =>
-            {
-                if (Room == null)
-                    return;
-
-                LoadRequested?.Invoke();
-            }, false);
-
-            return Task.CompletedTask;
-        }
-
-        Task IMultiplayerClient.MatchStarted()
-        {
-            if (Room == null)
-                return Task.CompletedTask;
-
-            Scheduler.Add(() =>
-            {
-                if (Room == null)
-                    return;
-
-                MatchStarted?.Invoke();
-            }, false);
-
-            return Task.CompletedTask;
-        }
-
-        Task IMultiplayerClient.ResultsReady()
-        {
-            if (Room == null)
-                return Task.CompletedTask;
-
-            Scheduler.Add(() =>
-            {
-                if (Room == null)
-                    return;
-
-                ResultsReady?.Invoke();
-            }, false);
-
-            return Task.CompletedTask;
-        }
-
-        /// <summary>
-        /// Populates the <see cref="User"/> for a given <see cref="MultiplayerRoomUser"/>.
-        /// </summary>
-        /// <param name="multiplayerUser">The <see cref="MultiplayerRoomUser"/> to populate.</param>
-        protected async Task PopulateUser(MultiplayerRoomUser multiplayerUser) => multiplayerUser.User ??= await userLookupCache.GetUserAsync(multiplayerUser.UserID).ConfigureAwait(false);
-
-        /// <summary>
-        /// Updates the local room settings with the given <see cref="MultiplayerRoomSettings"/>.
-        /// </summary>
-        /// <remarks>
-        /// This updates both the joined <see cref="MultiplayerRoom"/> and the respective API <see cref="Room"/>.
-        /// </remarks>
-        /// <param name="settings">The new <see cref="MultiplayerRoomSettings"/> to update from.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/> to cancel the update.</param>
-        private Task updateLocalRoomSettings(MultiplayerRoomSettings settings, CancellationToken cancellationToken = default) => scheduleAsync(() =>
-        {
-            if (Room == null)
-                return;
-
-            Debug.Assert(apiRoom != null);
-
-            // Update a few properties of the room instantaneously.
-            Room.Settings = settings;
-            apiRoom.Name.Value = Room.Settings.Name;
-
-            // The current item update is delayed until an online beatmap lookup (below) succeeds.
-            // In-order for the client to not display an outdated beatmap, the current item is forcefully cleared here.
-            CurrentMatchPlayingItem.Value = null;
-
-            RoomUpdated?.Invoke();
-
-            GetOnlineBeatmapSet(settings.BeatmapID, cancellationToken).ContinueWith(set => Schedule(() =>
-            {
-                if (cancellationToken.IsCancellationRequested)
-                    return;
-
-                updatePlaylist(settings, set.Result);
-            }), TaskContinuationOptions.OnlyOnRanToCompletion);
-        }, cancellationToken);
-
-        private void updatePlaylist(MultiplayerRoomSettings settings, BeatmapSetInfo beatmapSet)
-        {
-            if (Room == null || !Room.Settings.Equals(settings))
-                return;
-
-            Debug.Assert(apiRoom != null);
-
-            var beatmap = beatmapSet.Beatmaps.Single(b => b.OnlineBeatmapID == settings.BeatmapID);
-            beatmap.MD5Hash = settings.BeatmapChecksum;
-
-            var ruleset = Rulesets.GetRuleset(settings.RulesetID).CreateInstance();
-            var mods = settings.RequiredMods.Select(m => m.ToMod(ruleset));
-            var allowedMods = settings.AllowedMods.Select(m => m.ToMod(ruleset));
-
-            // Try to retrieve the existing playlist item from the API room.
-            var playlistItem = apiRoom.Playlist.FirstOrDefault(i => i.ID == settings.PlaylistItemId);
-
-            if (playlistItem != null)
-                updateItem(playlistItem);
-            else
-            {
-                // An existing playlist item does not exist, so append a new one.
-                updateItem(playlistItem = new PlaylistItem());
-                apiRoom.Playlist.Add(playlistItem);
-            }
-
-            CurrentMatchPlayingItem.Value = playlistItem;
-
-            void updateItem(PlaylistItem item)
-            {
-                item.ID = settings.PlaylistItemId;
-                item.Beatmap.Value = beatmap;
-                item.Ruleset.Value = ruleset.RulesetInfo;
-                item.RequiredMods.Clear();
-                item.RequiredMods.AddRange(mods);
-                item.AllowedMods.Clear();
-                item.AllowedMods.AddRange(allowedMods);
-            }
-        }
-
-        /// <summary>
-        /// Retrieves a <see cref="BeatmapSetInfo"/> from an online source.
-        /// </summary>
-        /// <param name="beatmapId">The beatmap set ID.</param>
-        /// <param name="cancellationToken">A token to cancel the request.</param>
-        /// <returns>The <see cref="BeatmapSetInfo"/> retrieval task.</returns>
-        protected abstract Task<BeatmapSetInfo> GetOnlineBeatmapSet(int beatmapId, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// For the provided user ID, update whether the user is included in <see cref="CurrentMatchPlayingUserIds"/>.
-        /// </summary>
-        /// <param name="userId">The user's ID.</param>
-        /// <param name="state">The new state of the user.</param>
-        private void updateUserPlayingState(int userId, MultiplayerUserState state)
-        {
-            bool wasPlaying = CurrentMatchPlayingUserIds.Contains(userId);
-            bool isPlaying = state >= MultiplayerUserState.WaitingForLoad && state <= MultiplayerUserState.FinishedPlay;
-
-            if (isPlaying == wasPlaying)
-                return;
-
-            if (isPlaying)
-                CurrentMatchPlayingUserIds.Add(userId);
-            else
-                CurrentMatchPlayingUserIds.Remove(userId);
-        }
-
-        private Task scheduleAsync(Action action, CancellationToken cancellationToken = default)
-        {
-            var tcs = new TaskCompletionSource<bool>();
-
-            Scheduler.Add(() =>
-            {
-                if (cancellationToken.IsCancellationRequested)
-                {
-                    tcs.SetCanceled();
-                    return;
-                }
-
-                try
-                {
-                    action();
-                    tcs.SetResult(true);
-                }
-                catch (Exception ex)
-                {
-                    tcs.SetException(ex);
-                }
-            });
-
-            return tcs.Task;
-        }
-    }
-}
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index fbe4022cc1..656d6319b4 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -86,7 +86,7 @@ namespace osu.Game
         protected IAPIProvider API;
 
         private SpectatorStreamingClient spectatorStreaming;
-        private StatefulMultiplayerClient multiplayerClient;
+        private MultiplayerClient multiplayerClient;
 
         protected MenuCursorContainer MenuCursorContainer;
 
@@ -241,7 +241,7 @@ namespace osu.Game
             dependencies.CacheAs(API ??= new APIAccess(LocalConfig, endpoints, VersionHash));
 
             dependencies.CacheAs(spectatorStreaming = new SpectatorStreamingClient(endpoints));
-            dependencies.CacheAs(multiplayerClient = new MultiplayerClient(endpoints));
+            dependencies.CacheAs(multiplayerClient = new OnlineMultiplayerClient(endpoints));
 
             var defaultBeatmap = new DummyWorkingBeatmap(Audio, Textures);
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
index a13d2cf540..cc51b5b691 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         private IBindable<bool> operationInProgress;
 
         [Resolved]
-        private StatefulMultiplayerClient multiplayerClient { get; set; }
+        private MultiplayerClient multiplayerClient { get; set; }
 
         [Resolved]
         private OngoingOperationTracker ongoingOperationTracker { get; set; }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
index 3199232f6f..fe9979b161 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             private IRoomManager manager { get; set; }
 
             [Resolved]
-            private StatefulMultiplayerClient client { get; set; }
+            private MultiplayerClient client { get; set; }
 
             [Resolved]
             private Bindable<Room> currentRoom { get; set; }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
index 085c824bdc..a065d04f64 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
     public class Multiplayer : OnlinePlayScreen
     {
         [Resolved]
-        private StatefulMultiplayerClient client { get; set; }
+        private MultiplayerClient client { get; set; }
 
         public override void OnResuming(IScreen last)
         {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs
index 0a9a3f680f..4d20652465 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         protected override RoomSubScreen CreateRoomSubScreen(Room room) => new MultiplayerMatchSubScreen(room);
 
         [Resolved]
-        private StatefulMultiplayerClient client { get; set; }
+        private MultiplayerClient client { get; set; }
 
         public override void Open(Room room)
         {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
index c9f0f6de90..3733b85a5e 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
     public class MultiplayerMatchSongSelect : OnlinePlaySongSelect
     {
         [Resolved]
-        private StatefulMultiplayerClient client { get; set; }
+        private MultiplayerClient client { get; set; }
 
         private LoadingLayer loadingLayer;
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 783b8b4bf2..62ef70ed68 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         public override string ShortTitle => "room";
 
         [Resolved]
-        private StatefulMultiplayerClient client { get; set; }
+        private MultiplayerClient client { get; set; }
 
         [Resolved]
         private OngoingOperationTracker ongoingOperationTracker { get; set; }
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index ae2042fbe8..1bbe49a705 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         protected override bool CheckModsAllowFailure() => false;
 
         [Resolved]
-        private StatefulMultiplayerClient client { get; set; }
+        private MultiplayerClient client { get; set; }
 
         private IBindable<bool> isConnected;
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs
index 8030107ad8..d334c618f5 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         protected MultiplayerRoom Room => Client.Room;
 
         [Resolved]
-        protected StatefulMultiplayerClient Client { get; private set; }
+        protected MultiplayerClient Client { get; private set; }
 
         protected override void LoadComplete()
         {
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
index 1e57847f04..8526196902 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
     public class MultiplayerRoomManager : RoomManager
     {
         [Resolved]
-        private StatefulMultiplayerClient multiplayerClient { get; set; }
+        private MultiplayerClient multiplayerClient { get; set; }
 
         public readonly Bindable<double> TimeBetweenListingPolls = new Bindable<double>();
         public readonly Bindable<double> TimeBetweenSelectionPolls = new Bindable<double>();
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsListHeader.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsListHeader.cs
index 6c1a55a0eb..7e442c6568 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsListHeader.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsListHeader.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Participants
     public class ParticipantsListHeader : OverlinedHeader
     {
         [Resolved]
-        private StatefulMultiplayerClient client { get; set; }
+        private MultiplayerClient client { get; set; }
 
         public ParticipantsListHeader()
             : base("Participants")
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index 8c7b7bab01..a0245a1e59 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         private SpectatorStreamingClient spectatorClient { get; set; }
 
         [Resolved]
-        private StatefulMultiplayerClient multiplayerClient { get; set; }
+        private MultiplayerClient multiplayerClient { get; set; }
 
         private readonly PlayerArea[] instances;
         private MasterGameplayClockContainer masterClockContainer;
diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index 70de067784..bbb3c5ebb2 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Screens.Play.HUD
         private SpectatorStreamingClient streamingClient { get; set; }
 
         [Resolved]
-        private StatefulMultiplayerClient multiplayerClient { get; set; }
+        private MultiplayerClient multiplayerClient { get; set; }
 
         [Resolved]
         private UserLookupCache userLookupCache { get; set; }
diff --git a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
index db344b28dd..c76d1053b2 100644
--- a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         public const int PLAYER_1_ID = 55;
         public const int PLAYER_2_ID = 56;
 
-        [Cached(typeof(StatefulMultiplayerClient))]
+        [Cached(typeof(MultiplayerClient))]
         public TestMultiplayerClient Client { get; }
 
         [Cached(typeof(IRoomManager))]
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index 167cf705a7..b12bd8091d 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -20,7 +20,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestMultiplayerClient : StatefulMultiplayerClient
+    public class TestMultiplayerClient : MultiplayerClient
     {
         public override IBindable<bool> IsConnected => isConnected;
         private readonly Bindable<bool> isConnected = new Bindable<bool>(true);
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs
index e57411d04d..1abf4d8f5d 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomContainer.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         protected override Container<Drawable> Content => content;
         private readonly Container content;
 
-        [Cached(typeof(StatefulMultiplayerClient))]
+        [Cached(typeof(MultiplayerClient))]
         public readonly TestMultiplayerClient Client;
 
         [Cached(typeof(IRoomManager))]

From 6beeb7f7c433d636e30cc46f56d03b585c71d647 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 May 2021 15:55:07 +0900
Subject: [PATCH 3620/3722] Rename SpectatorStreamingClient -> SpectatorClient

---
 .../Visual/Gameplay/TestSceneSpectator.cs     | 14 ++++++-------
 .../Gameplay/TestSceneSpectatorPlayback.cs    | 14 ++++++-------
 .../TestSceneMultiSpectatorLeaderboard.cs     | 14 ++++++-------
 .../TestSceneMultiSpectatorScreen.cs          | 20 +++++++++----------
 ...TestSceneMultiplayerGameplayLeaderboard.cs | 18 ++++++++---------
 .../TestSceneCurrentlyPlayingDisplay.cs       | 14 ++++++-------
 ...rStreamingClient.cs => SpectatorClient.cs} |  6 +++---
 osu.Game/OsuGameBase.cs                       |  6 +++---
 .../Dashboard/CurrentlyPlayingDisplay.cs      |  4 ++--
 osu.Game/Rulesets/UI/ReplayRecorder.cs        |  8 ++++----
 .../Spectate/MultiSpectatorScreen.cs          |  2 +-
 .../HUD/MultiplayerGameplayLeaderboard.cs     | 14 ++++++-------
 osu.Game/Screens/Play/SpectatorPlayer.cs      | 10 +++++-----
 .../Screens/Play/SpectatorResultsScreen.cs    |  8 ++++----
 osu.Game/Screens/Spectate/SpectatorScreen.cs  |  2 +-
 ...eamingClient.cs => TestSpectatorClient.cs} |  4 ++--
 16 files changed, 79 insertions(+), 79 deletions(-)
 rename osu.Game/Online/Spectator/{SpectatorStreamingClient.cs => SpectatorClient.cs} (97%)
 rename osu.Game/Tests/Visual/Spectator/{TestSpectatorStreamingClient.cs => TestSpectatorClient.cs} (96%)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index a7ed217b4d..56a4ab8cba 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -27,8 +27,8 @@ namespace osu.Game.Tests.Visual.Gameplay
     {
         private readonly User streamingUser = new User { Id = MultiplayerTestScene.PLAYER_1_ID, Username = "Test user" };
 
-        [Cached(typeof(SpectatorStreamingClient))]
-        private TestSpectatorStreamingClient testSpectatorStreamingClient = new TestSpectatorStreamingClient();
+        [Cached(typeof(SpectatorClient))]
+        private TestSpectatorClient testSpectatorClient = new TestSpectatorClient();
 
         [Cached(typeof(UserLookupCache))]
         private UserLookupCache lookupCache = new TestUserLookupCache();
@@ -61,8 +61,8 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep("add streaming client", () =>
             {
-                Remove(testSpectatorStreamingClient);
-                Add(testSpectatorStreamingClient);
+                Remove(testSpectatorClient);
+                Add(testSpectatorClient);
             });
 
             finish();
@@ -212,9 +212,9 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void waitForPlayer() => AddUntilStep("wait for player", () => Stack.CurrentScreen is Player);
 
-        private void start(int? beatmapId = null) => AddStep("start play", () => testSpectatorStreamingClient.StartPlay(streamingUser.Id, beatmapId ?? importedBeatmapId));
+        private void start(int? beatmapId = null) => AddStep("start play", () => testSpectatorClient.StartPlay(streamingUser.Id, beatmapId ?? importedBeatmapId));
 
-        private void finish(int? beatmapId = null) => AddStep("end play", () => testSpectatorStreamingClient.EndPlay(streamingUser.Id, beatmapId ?? importedBeatmapId));
+        private void finish(int? beatmapId = null) => AddStep("end play", () => testSpectatorClient.EndPlay(streamingUser.Id, beatmapId ?? importedBeatmapId));
 
         private void checkPaused(bool state) =>
             AddUntilStep($"game is {(state ? "paused" : "playing")}", () => player.ChildrenOfType<DrawableRuleset>().First().IsPaused.Value == state);
@@ -223,7 +223,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("send frames", () =>
             {
-                testSpectatorStreamingClient.SendFrames(streamingUser.Id, nextFrame, count);
+                testSpectatorClient.SendFrames(streamingUser.Id, nextFrame, count);
                 nextFrame += count;
             });
         }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
index 9c763814f3..469f594fdc 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectatorPlayback.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private IAPIProvider api { get; set; }
 
         [Resolved]
-        private SpectatorStreamingClient streamingClient { get; set; }
+        private SpectatorClient spectatorClient { get; set; }
 
         [Cached]
         private GameplayBeatmap gameplayBeatmap = new GameplayBeatmap(new Beatmap());
@@ -69,7 +69,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             replay = new Replay();
 
-            users.BindTo(streamingClient.PlayingUsers);
+            users.BindTo(spectatorClient.PlayingUsers);
             users.BindCollectionChanged((obj, args) =>
             {
                 switch (args.Action)
@@ -80,7 +80,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                         foreach (int user in args.NewItems)
                         {
                             if (user == api.LocalUser.Value.Id)
-                                streamingClient.WatchUser(user);
+                                spectatorClient.WatchUser(user);
                         }
 
                         break;
@@ -91,14 +91,14 @@ namespace osu.Game.Tests.Visual.Gameplay
                         foreach (int user in args.OldItems)
                         {
                             if (user == api.LocalUser.Value.Id)
-                                streamingClient.StopWatchingUser(user);
+                                spectatorClient.StopWatchingUser(user);
                         }
 
                         break;
                 }
             }, true);
 
-            streamingClient.OnNewFrames += onNewFrames;
+            spectatorClient.OnNewFrames += onNewFrames;
 
             Add(new GridContainer
             {
@@ -189,7 +189,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
         }
 
-        private double latency = SpectatorStreamingClient.TIME_BETWEEN_SENDS;
+        private double latency = SpectatorClient.TIME_BETWEEN_SENDS;
 
         protected override void Update()
         {
@@ -233,7 +233,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("stop recorder", () =>
             {
                 recorder.Expire();
-                streamingClient.OnNewFrames -= onNewFrames;
+                spectatorClient.OnNewFrames -= onNewFrames;
             });
         }
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
index 263adc07e1..afd4401a63 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
@@ -23,8 +23,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneMultiSpectatorLeaderboard : MultiplayerTestScene
     {
-        [Cached(typeof(SpectatorStreamingClient))]
-        private TestSpectatorStreamingClient streamingClient = new TestSpectatorStreamingClient();
+        [Cached(typeof(SpectatorClient))]
+        private TestSpectatorClient spectatorClient = new TestSpectatorClient();
 
         [Cached(typeof(UserLookupCache))]
         private UserLookupCache lookupCache = new TestUserLookupCache();
@@ -42,7 +42,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             base.Content.AddRange(new Drawable[]
             {
-                streamingClient,
+                spectatorClient,
                 lookupCache,
                 content = new Container { RelativeSizeAxes = Axes.Both }
             });
@@ -59,7 +59,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
                 foreach (var (userId, clock) in clocks)
                 {
-                    streamingClient.EndPlay(userId, 0);
+                    spectatorClient.EndPlay(userId, 0);
                     clock.CurrentTime = 0;
                 }
             });
@@ -67,7 +67,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddStep("create leaderboard", () =>
             {
                 foreach (var (userId, _) in clocks)
-                    streamingClient.StartPlay(userId, 0);
+                    spectatorClient.StartPlay(userId, 0);
 
                 Beatmap.Value = CreateWorkingBeatmap(Ruleset.Value);
 
@@ -96,10 +96,10 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 // For player 2, send frames in sets of 10.
                 for (int i = 0; i < 100; i++)
                 {
-                    streamingClient.SendFrames(PLAYER_1_ID, i, 1);
+                    spectatorClient.SendFrames(PLAYER_1_ID, i, 1);
 
                     if (i % 10 == 0)
-                        streamingClient.SendFrames(PLAYER_2_ID, i, 10);
+                        spectatorClient.SendFrames(PLAYER_2_ID, i, 10);
                 }
             });
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
index 689c249d05..23095a1ea8 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
@@ -22,8 +22,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneMultiSpectatorScreen : MultiplayerTestScene
     {
-        [Cached(typeof(SpectatorStreamingClient))]
-        private TestSpectatorStreamingClient streamingClient = new TestSpectatorStreamingClient();
+        [Cached(typeof(SpectatorClient))]
+        private TestSpectatorClient spectatorClient = new TestSpectatorClient();
 
         [Cached(typeof(UserLookupCache))]
         private UserLookupCache lookupCache = new TestUserLookupCache();
@@ -59,14 +59,14 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             AddStep("add streaming client", () =>
             {
-                Remove(streamingClient);
-                Add(streamingClient);
+                Remove(spectatorClient);
+                Add(spectatorClient);
             });
 
             AddStep("finish previous gameplay", () =>
             {
                 foreach (var id in playingUserIds)
-                    streamingClient.EndPlay(id, importedBeatmapId);
+                    spectatorClient.EndPlay(id, importedBeatmapId);
                 playingUserIds.Clear();
             });
         }
@@ -87,11 +87,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
             loadSpectateScreen(false);
 
             AddWaitStep("wait a bit", 10);
-            AddStep("load player first_player_id", () => streamingClient.StartPlay(PLAYER_1_ID, importedBeatmapId));
+            AddStep("load player first_player_id", () => spectatorClient.StartPlay(PLAYER_1_ID, importedBeatmapId));
             AddUntilStep("one player added", () => spectatorScreen.ChildrenOfType<Player>().Count() == 1);
 
             AddWaitStep("wait a bit", 10);
-            AddStep("load player second_player_id", () => streamingClient.StartPlay(PLAYER_2_ID, importedBeatmapId));
+            AddStep("load player second_player_id", () => spectatorClient.StartPlay(PLAYER_2_ID, importedBeatmapId));
             AddUntilStep("two players added", () => spectatorScreen.ChildrenOfType<Player>().Count() == 2);
         }
 
@@ -251,7 +251,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 foreach (int id in userIds)
                 {
                     Client.CurrentMatchPlayingUserIds.Add(id);
-                    streamingClient.StartPlay(id, beatmapId ?? importedBeatmapId);
+                    spectatorClient.StartPlay(id, beatmapId ?? importedBeatmapId);
                     playingUserIds.Add(id);
                     nextFrame[id] = 0;
                 }
@@ -262,7 +262,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             AddStep("end play", () =>
             {
-                streamingClient.EndPlay(userId, beatmapId ?? importedBeatmapId);
+                spectatorClient.EndPlay(userId, beatmapId ?? importedBeatmapId);
                 playingUserIds.Remove(userId);
                 nextFrame.Remove(userId);
             });
@@ -276,7 +276,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             {
                 foreach (int id in userIds)
                 {
-                    streamingClient.SendFrames(id, nextFrame[id], count);
+                    spectatorClient.SendFrames(id, nextFrame[id], count);
                     nextFrame[id] += count;
                 }
             });
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
index 6813a6e7dd..80b9aa8228 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -28,8 +28,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
     {
         private const int users = 16;
 
-        [Cached(typeof(SpectatorStreamingClient))]
-        private TestMultiplayerStreaming streamingClient = new TestMultiplayerStreaming();
+        [Cached(typeof(SpectatorClient))]
+        private TestMultiplayerSpectatorClient spectatorClient = new TestMultiplayerSpectatorClient();
 
         [Cached(typeof(UserLookupCache))]
         private UserLookupCache lookupCache = new TestSceneCurrentlyPlayingDisplay.TestUserLookupCache();
@@ -44,7 +44,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             base.Content.Children = new Drawable[]
             {
-                streamingClient,
+                spectatorClient,
                 lookupCache,
                 Content
             };
@@ -71,10 +71,10 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 var playable = Beatmap.Value.GetPlayableBeatmap(Ruleset.Value);
 
                 for (int i = 0; i < users; i++)
-                    streamingClient.StartPlay(i, Beatmap.Value.BeatmapInfo.OnlineBeatmapID ?? 0);
+                    spectatorClient.StartPlay(i, Beatmap.Value.BeatmapInfo.OnlineBeatmapID ?? 0);
 
                 Client.CurrentMatchPlayingUserIds.Clear();
-                Client.CurrentMatchPlayingUserIds.AddRange(streamingClient.PlayingUsers);
+                Client.CurrentMatchPlayingUserIds.AddRange(spectatorClient.PlayingUsers);
 
                 Children = new Drawable[]
                 {
@@ -83,7 +83,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
                 scoreProcessor.ApplyBeatmap(playable);
 
-                LoadComponentAsync(leaderboard = new MultiplayerGameplayLeaderboard(scoreProcessor, streamingClient.PlayingUsers.ToArray())
+                LoadComponentAsync(leaderboard = new MultiplayerGameplayLeaderboard(scoreProcessor, spectatorClient.PlayingUsers.ToArray())
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -96,7 +96,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Test]
         public void TestScoreUpdates()
         {
-            AddRepeatStep("update state", () => streamingClient.RandomlyUpdateState(), 100);
+            AddRepeatStep("update state", () => spectatorClient.RandomlyUpdateState(), 100);
             AddToggleStep("switch compact mode", expanded => leaderboard.Expanded.Value = expanded);
         }
 
@@ -109,12 +109,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Test]
         public void TestChangeScoringMode()
         {
-            AddRepeatStep("update state", () => streamingClient.RandomlyUpdateState(), 5);
+            AddRepeatStep("update state", () => spectatorClient.RandomlyUpdateState(), 5);
             AddStep("change to classic", () => config.SetValue(OsuSetting.ScoreDisplayMode, ScoringMode.Classic));
             AddStep("change to standardised", () => config.SetValue(OsuSetting.ScoreDisplayMode, ScoringMode.Standardised));
         }
 
-        public class TestMultiplayerStreaming : TestSpectatorStreamingClient
+        public class TestMultiplayerSpectatorClient : TestSpectatorClient
         {
             private readonly Dictionary<int, FrameHeader> lastHeaders = new Dictionary<int, FrameHeader>();
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
index 8ae6398003..9bc0b32eee 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
@@ -19,8 +19,8 @@ namespace osu.Game.Tests.Visual.Online
 {
     public class TestSceneCurrentlyPlayingDisplay : OsuTestScene
     {
-        [Cached(typeof(SpectatorStreamingClient))]
-        private TestSpectatorStreamingClient testSpectatorStreamingClient = new TestSpectatorStreamingClient();
+        [Cached(typeof(SpectatorClient))]
+        private TestSpectatorClient testSpectatorClient = new TestSpectatorClient();
 
         private CurrentlyPlayingDisplay currentlyPlaying;
 
@@ -34,7 +34,7 @@ namespace osu.Game.Tests.Visual.Online
         {
             AddStep("add streaming client", () =>
             {
-                nestedContainer?.Remove(testSpectatorStreamingClient);
+                nestedContainer?.Remove(testSpectatorClient);
                 Remove(lookupCache);
 
                 Children = new Drawable[]
@@ -45,7 +45,7 @@ namespace osu.Game.Tests.Visual.Online
                         RelativeSizeAxes = Axes.Both,
                         Children = new Drawable[]
                         {
-                            testSpectatorStreamingClient,
+                            testSpectatorClient,
                             currentlyPlaying = new CurrentlyPlayingDisplay
                             {
                                 RelativeSizeAxes = Axes.Both,
@@ -55,15 +55,15 @@ namespace osu.Game.Tests.Visual.Online
                 };
             });
 
-            AddStep("Reset players", () => testSpectatorStreamingClient.PlayingUsers.Clear());
+            AddStep("Reset players", () => testSpectatorClient.PlayingUsers.Clear());
         }
 
         [Test]
         public void TestBasicDisplay()
         {
-            AddStep("Add playing user", () => testSpectatorStreamingClient.PlayingUsers.Add(2));
+            AddStep("Add playing user", () => testSpectatorClient.PlayingUsers.Add(2));
             AddUntilStep("Panel loaded", () => currentlyPlaying.ChildrenOfType<UserGridPanel>()?.FirstOrDefault()?.User.Id == 2);
-            AddStep("Remove playing user", () => testSpectatorStreamingClient.PlayingUsers.Remove(2));
+            AddStep("Remove playing user", () => testSpectatorClient.PlayingUsers.Remove(2));
             AddUntilStep("Panel no longer present", () => !currentlyPlaying.ChildrenOfType<UserGridPanel>().Any());
         }
 
diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
similarity index 97%
rename from osu.Game/Online/Spectator/SpectatorStreamingClient.cs
rename to osu.Game/Online/Spectator/SpectatorClient.cs
index ec6d1bf9d8..43115d577c 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -23,7 +23,7 @@ using osu.Game.Screens.Play;
 
 namespace osu.Game.Online.Spectator
 {
-    public class SpectatorStreamingClient : Component, ISpectatorClient
+    public class SpectatorClient : Component, ISpectatorClient
     {
         /// <summary>
         /// The maximum milliseconds between frame bundle sends.
@@ -80,7 +80,7 @@ namespace osu.Game.Online.Spectator
         /// </summary>
         public event Action<int, SpectatorState> OnUserFinishedPlaying;
 
-        public SpectatorStreamingClient(EndpointConfiguration endpoints)
+        public SpectatorClient(EndpointConfiguration endpoints)
         {
             endpoint = endpoints.SpectatorEndpointUrl;
         }
@@ -88,7 +88,7 @@ namespace osu.Game.Online.Spectator
         [BackgroundDependencyLoader]
         private void load(IAPIProvider api)
         {
-            connector = api.GetHubConnector(nameof(SpectatorStreamingClient), endpoint);
+            connector = api.GetHubConnector(nameof(SpectatorClient), endpoint);
 
             if (connector != null)
             {
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index fbe4022cc1..3707e3b7be 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -85,7 +85,7 @@ namespace osu.Game
 
         protected IAPIProvider API;
 
-        private SpectatorStreamingClient spectatorStreaming;
+        private SpectatorClient spectatorClient;
         private StatefulMultiplayerClient multiplayerClient;
 
         protected MenuCursorContainer MenuCursorContainer;
@@ -240,7 +240,7 @@ namespace osu.Game
 
             dependencies.CacheAs(API ??= new APIAccess(LocalConfig, endpoints, VersionHash));
 
-            dependencies.CacheAs(spectatorStreaming = new SpectatorStreamingClient(endpoints));
+            dependencies.CacheAs(spectatorClient = new SpectatorClient(endpoints));
             dependencies.CacheAs(multiplayerClient = new MultiplayerClient(endpoints));
 
             var defaultBeatmap = new DummyWorkingBeatmap(Audio, Textures);
@@ -313,7 +313,7 @@ namespace osu.Game
             // add api components to hierarchy.
             if (API is APIAccess apiAccess)
                 AddInternal(apiAccess);
-            AddInternal(spectatorStreaming);
+            AddInternal(spectatorClient);
             AddInternal(multiplayerClient);
 
             AddInternal(RulesetConfigCache);
diff --git a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
index 336430fd9b..3051ca7dbe 100644
--- a/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
+++ b/osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Overlays.Dashboard
         private FillFlowContainer<PlayingUserPanel> userFlow;
 
         [Resolved]
-        private SpectatorStreamingClient spectatorStreaming { get; set; }
+        private SpectatorClient spectatorClient { get; set; }
 
         [BackgroundDependencyLoader]
         private void load()
@@ -52,7 +52,7 @@ namespace osu.Game.Overlays.Dashboard
         {
             base.LoadComplete();
 
-            playingUsers.BindTo(spectatorStreaming.PlayingUsers);
+            playingUsers.BindTo(spectatorClient.PlayingUsers);
             playingUsers.BindCollectionChanged(onUsersChanged, true);
         }
 
diff --git a/osu.Game/Rulesets/UI/ReplayRecorder.cs b/osu.Game/Rulesets/UI/ReplayRecorder.cs
index 643ded4cad..d18e0f9541 100644
--- a/osu.Game/Rulesets/UI/ReplayRecorder.cs
+++ b/osu.Game/Rulesets/UI/ReplayRecorder.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.UI
         public int RecordFrameRate = 60;
 
         [Resolved(canBeNull: true)]
-        private SpectatorStreamingClient spectatorStreaming { get; set; }
+        private SpectatorClient spectatorClient { get; set; }
 
         [Resolved]
         private GameplayBeatmap gameplayBeatmap { get; set; }
@@ -49,13 +49,13 @@ namespace osu.Game.Rulesets.UI
 
             inputManager = GetContainingInputManager();
 
-            spectatorStreaming?.BeginPlaying(gameplayBeatmap, target);
+            spectatorClient?.BeginPlaying(gameplayBeatmap, target);
         }
 
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            spectatorStreaming?.EndPlaying();
+            spectatorClient?.EndPlaying();
         }
 
         protected override void Update()
@@ -98,7 +98,7 @@ namespace osu.Game.Rulesets.UI
             {
                 target.Replay.Frames.Add(frame);
 
-                spectatorStreaming?.HandleFrame(frame);
+                spectatorClient?.HandleFrame(frame);
             }
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index 8c7b7bab01..3ffaeb772a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         public bool AllPlayersLoaded => instances.All(p => p?.PlayerLoaded == true);
 
         [Resolved]
-        private SpectatorStreamingClient spectatorClient { get; set; }
+        private SpectatorClient spectatorClient { get; set; }
 
         [Resolved]
         private StatefulMultiplayerClient multiplayerClient { get; set; }
diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index 70de067784..7f59a836c2 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Screens.Play.HUD
         protected readonly Dictionary<int, TrackedUserData> UserScores = new Dictionary<int, TrackedUserData>();
 
         [Resolved]
-        private SpectatorStreamingClient streamingClient { get; set; }
+        private SpectatorClient spectatorClient { get; set; }
 
         [Resolved]
         private StatefulMultiplayerClient multiplayerClient { get; set; }
@@ -55,7 +55,7 @@ namespace osu.Game.Screens.Play.HUD
 
             foreach (var userId in playingUsers)
             {
-                streamingClient.WatchUser(userId);
+                spectatorClient.WatchUser(userId);
 
                 // probably won't be required in the final implementation.
                 var resolvedUser = userLookupCache.GetUserAsync(userId).Result;
@@ -88,7 +88,7 @@ namespace osu.Game.Screens.Play.HUD
             playingUsers.BindCollectionChanged(usersChanged);
 
             // this leaderboard should be guaranteed to be completely loaded before the gameplay starts (is a prerequisite in MultiplayerPlayer).
-            streamingClient.OnNewFrames += handleIncomingFrames;
+            spectatorClient.OnNewFrames += handleIncomingFrames;
         }
 
         private void usersChanged(object sender, NotifyCollectionChangedEventArgs e)
@@ -98,7 +98,7 @@ namespace osu.Game.Screens.Play.HUD
                 case NotifyCollectionChangedAction.Remove:
                     foreach (var userId in e.OldItems.OfType<int>())
                     {
-                        streamingClient.StopWatchingUser(userId);
+                        spectatorClient.StopWatchingUser(userId);
 
                         if (UserScores.TryGetValue(userId, out var trackedData))
                             trackedData.MarkUserQuit();
@@ -123,14 +123,14 @@ namespace osu.Game.Screens.Play.HUD
         {
             base.Dispose(isDisposing);
 
-            if (streamingClient != null)
+            if (spectatorClient != null)
             {
                 foreach (var user in playingUsers)
                 {
-                    streamingClient.StopWatchingUser(user);
+                    spectatorClient.StopWatchingUser(user);
                 }
 
-                streamingClient.OnNewFrames -= handleIncomingFrames;
+                spectatorClient.OnNewFrames -= handleIncomingFrames;
             }
         }
 
diff --git a/osu.Game/Screens/Play/SpectatorPlayer.cs b/osu.Game/Screens/Play/SpectatorPlayer.cs
index 9822f62dd8..a8125dfded 100644
--- a/osu.Game/Screens/Play/SpectatorPlayer.cs
+++ b/osu.Game/Screens/Play/SpectatorPlayer.cs
@@ -31,12 +31,12 @@ namespace osu.Game.Screens.Play
         }
 
         [Resolved]
-        private SpectatorStreamingClient spectatorStreaming { get; set; }
+        private SpectatorClient spectatorClient { get; set; }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            spectatorStreaming.OnUserBeganPlaying += userBeganPlaying;
+            spectatorClient.OnUserBeganPlaying += userBeganPlaying;
 
             AddInternal(new OsuSpriteText
             {
@@ -66,7 +66,7 @@ namespace osu.Game.Screens.Play
 
         public override bool OnExiting(IScreen next)
         {
-            spectatorStreaming.OnUserBeganPlaying -= userBeganPlaying;
+            spectatorClient.OnUserBeganPlaying -= userBeganPlaying;
             return base.OnExiting(next);
         }
 
@@ -84,8 +84,8 @@ namespace osu.Game.Screens.Play
         {
             base.Dispose(isDisposing);
 
-            if (spectatorStreaming != null)
-                spectatorStreaming.OnUserBeganPlaying -= userBeganPlaying;
+            if (spectatorClient != null)
+                spectatorClient.OnUserBeganPlaying -= userBeganPlaying;
         }
     }
 }
diff --git a/osu.Game/Screens/Play/SpectatorResultsScreen.cs b/osu.Game/Screens/Play/SpectatorResultsScreen.cs
index dabdf0a139..fd7af3af85 100644
--- a/osu.Game/Screens/Play/SpectatorResultsScreen.cs
+++ b/osu.Game/Screens/Play/SpectatorResultsScreen.cs
@@ -17,12 +17,12 @@ namespace osu.Game.Screens.Play
         }
 
         [Resolved]
-        private SpectatorStreamingClient spectatorStreaming { get; set; }
+        private SpectatorClient spectatorClient { get; set; }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            spectatorStreaming.OnUserBeganPlaying += userBeganPlaying;
+            spectatorClient.OnUserBeganPlaying += userBeganPlaying;
         }
 
         private void userBeganPlaying(int userId, SpectatorState state)
@@ -40,8 +40,8 @@ namespace osu.Game.Screens.Play
         {
             base.Dispose(isDisposing);
 
-            if (spectatorStreaming != null)
-                spectatorStreaming.OnUserBeganPlaying -= userBeganPlaying;
+            if (spectatorClient != null)
+                spectatorClient.OnUserBeganPlaying -= userBeganPlaying;
         }
     }
 }
diff --git a/osu.Game/Screens/Spectate/SpectatorScreen.cs b/osu.Game/Screens/Spectate/SpectatorScreen.cs
index bcebd51954..1cf7bc30ee 100644
--- a/osu.Game/Screens/Spectate/SpectatorScreen.cs
+++ b/osu.Game/Screens/Spectate/SpectatorScreen.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Screens.Spectate
         private RulesetStore rulesets { get; set; }
 
         [Resolved]
-        private SpectatorStreamingClient spectatorClient { get; set; }
+        private SpectatorClient spectatorClient { get; set; }
 
         [Resolved]
         private UserLookupCache userLookupCache { get; set; }
diff --git a/osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs b/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
similarity index 96%
rename from osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs
rename to osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
index cc8437479d..985e293981 100644
--- a/osu.Game/Tests/Visual/Spectator/TestSpectatorStreamingClient.cs
+++ b/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
@@ -12,7 +12,7 @@ using osu.Game.Scoring;
 
 namespace osu.Game.Tests.Visual.Spectator
 {
-    public class TestSpectatorStreamingClient : SpectatorStreamingClient
+    public class TestSpectatorClient : SpectatorClient
     {
         public new BindableList<int> PlayingUsers => (BindableList<int>)base.PlayingUsers;
         private readonly ConcurrentDictionary<int, byte> watchingUsers = new ConcurrentDictionary<int, byte>();
@@ -20,7 +20,7 @@ namespace osu.Game.Tests.Visual.Spectator
         private readonly Dictionary<int, int> userBeatmapDictionary = new Dictionary<int, int>();
         private readonly Dictionary<int, bool> userSentStateDictionary = new Dictionary<int, bool>();
 
-        public TestSpectatorStreamingClient()
+        public TestSpectatorClient()
             : base(new DevelopmentEndpointConfiguration())
         {
         }

From 3018a41ab5daf24a61671cc1684cc8f089049e8a Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Thu, 20 May 2021 16:00:49 +0900
Subject: [PATCH 3621/3722] Remove redundant string interpolation

---
 osu.Game.Tests/Gameplay/TestSceneProxyContainer.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneProxyContainer.cs b/osu.Game.Tests/Gameplay/TestSceneProxyContainer.cs
index 9975c65085..1264d575a4 100644
--- a/osu.Game.Tests/Gameplay/TestSceneProxyContainer.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneProxyContainer.cs
@@ -46,11 +46,11 @@ namespace osu.Game.Tests.Gameplay
                 addProxy(new TestDrawableHitObject(5000));
             });
 
-            AddStep($"time = 1000", () => clock.CurrentTime = 1000);
+            AddStep("time = 1000", () => clock.CurrentTime = 1000);
             AddAssert("One proxy is alive", () => proxyContainer.AliveChildren.Count == 1);
-            AddStep($"time = 5000", () => clock.CurrentTime = 5000);
+            AddStep("time = 5000", () => clock.CurrentTime = 5000);
             AddAssert("One proxy is alive", () => proxyContainer.AliveChildren.Count == 1);
-            AddStep($"time = 6000", () => clock.CurrentTime = 6000);
+            AddStep("time = 6000", () => clock.CurrentTime = 6000);
             AddAssert("No proxy is alive", () => proxyContainer.AliveChildren.Count == 0);
         }
 

From df80531a0a8d6a687b3875628732f67712c12682 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 May 2021 16:30:56 +0900
Subject: [PATCH 3622/3722] Split online connectivity into
 OnlineSpectatorClient

---
 .../Online/Spectator/OnlineSpectatorClient.cs |  89 +++++++++++
 osu.Game/Online/Spectator/SpectatorClient.cs  | 140 +++++++-----------
 osu.Game/OsuGameBase.cs                       |   2 +-
 3 files changed, 142 insertions(+), 89 deletions(-)
 create mode 100644 osu.Game/Online/Spectator/OnlineSpectatorClient.cs

diff --git a/osu.Game/Online/Spectator/OnlineSpectatorClient.cs b/osu.Game/Online/Spectator/OnlineSpectatorClient.cs
new file mode 100644
index 0000000000..753796158e
--- /dev/null
+++ b/osu.Game/Online/Spectator/OnlineSpectatorClient.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.
+
+#nullable enable
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.SignalR.Client;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Game.Online.API;
+
+namespace osu.Game.Online.Spectator
+{
+    public class OnlineSpectatorClient : SpectatorClient
+    {
+        private readonly string endpoint;
+
+        private IHubClientConnector? connector;
+
+        public override IBindable<bool> IsConnected { get; } = new BindableBool();
+
+        private HubConnection? connection => connector?.CurrentConnection;
+
+        public OnlineSpectatorClient(EndpointConfiguration endpoints)
+        {
+            endpoint = endpoints.SpectatorEndpointUrl;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(IAPIProvider api)
+        {
+            connector = api.GetHubConnector(nameof(SpectatorClient), endpoint);
+
+            if (connector != null)
+            {
+                connector.ConfigureConnection = connection =>
+                {
+                    // until strong typed client support is added, each method must be manually bound
+                    // (see https://github.com/dotnet/aspnetcore/issues/15198)
+                    connection.On<int, SpectatorState>(nameof(ISpectatorClient.UserBeganPlaying), ((ISpectatorClient)this).UserBeganPlaying);
+                    connection.On<int, FrameDataBundle>(nameof(ISpectatorClient.UserSentFrames), ((ISpectatorClient)this).UserSentFrames);
+                    connection.On<int, SpectatorState>(nameof(ISpectatorClient.UserFinishedPlaying), ((ISpectatorClient)this).UserFinishedPlaying);
+                };
+
+                IsConnected.BindTo(connector.IsConnected);
+            }
+        }
+
+        protected override Task BeginPlayingInternal(SpectatorState state)
+        {
+            if (!IsConnected.Value)
+                return Task.CompletedTask;
+
+            return connection.SendAsync(nameof(ISpectatorServer.BeginPlaySession), state);
+        }
+
+        protected override Task SendFramesInternal(FrameDataBundle data)
+        {
+            if (!IsConnected.Value)
+                return Task.CompletedTask;
+
+            return connection.SendAsync(nameof(ISpectatorServer.SendFrameData), data);
+        }
+
+        protected override Task EndPlayingInternal(SpectatorState state)
+        {
+            if (!IsConnected.Value)
+                return Task.CompletedTask;
+
+            return connection.SendAsync(nameof(ISpectatorServer.EndPlaySession), state);
+        }
+
+        protected override Task WatchUserInternal(int userId)
+        {
+            if (!IsConnected.Value)
+                return Task.CompletedTask;
+
+            return connection.SendAsync(nameof(ISpectatorServer.StartWatchingUser), userId);
+        }
+
+        protected override Task StopWatchingUserInternal(int userId)
+        {
+            if (!IsConnected.Value)
+                return Task.CompletedTask;
+
+            return connection.SendAsync(nameof(ISpectatorServer.EndWatchingUser), userId);
+        }
+    }
+}
diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
index 43115d577c..5ea31a49fb 100644
--- a/osu.Game/Online/Spectator/SpectatorClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -7,7 +7,6 @@ using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
-using Microsoft.AspNetCore.SignalR.Client;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -23,21 +22,18 @@ using osu.Game.Screens.Play;
 
 namespace osu.Game.Online.Spectator
 {
-    public class SpectatorClient : Component, ISpectatorClient
+    public abstract class SpectatorClient : Component, ISpectatorClient
     {
         /// <summary>
         /// The maximum milliseconds between frame bundle sends.
         /// </summary>
         public const double TIME_BETWEEN_SENDS = 200;
 
-        private readonly string endpoint;
-
-        [CanBeNull]
-        private IHubClientConnector connector;
-
-        private readonly IBindable<bool> isConnected = new BindableBool();
-
-        private HubConnection connection => connector?.CurrentConnection;
+        /// <summary>
+        /// Whether the <see cref="SpectatorClient"/> is currently connected.
+        /// This is NOT thread safe and usage should be scheduled.
+        /// </summary>
+        public abstract IBindable<bool> IsConnected { get; }
 
         private readonly List<int> watchingUsers = new List<int>();
 
@@ -63,7 +59,7 @@ namespace osu.Game.Online.Spectator
 
         private readonly SpectatorState currentState = new SpectatorState();
 
-        private bool isPlaying;
+        protected bool IsPlaying { get; private set; }
 
         /// <summary>
         /// Called whenever new frames arrive from the server.
@@ -80,59 +76,39 @@ namespace osu.Game.Online.Spectator
         /// </summary>
         public event Action<int, SpectatorState> OnUserFinishedPlaying;
 
-        public SpectatorClient(EndpointConfiguration endpoints)
-        {
-            endpoint = endpoints.SpectatorEndpointUrl;
-        }
-
         [BackgroundDependencyLoader]
-        private void load(IAPIProvider api)
+        private void load()
         {
-            connector = api.GetHubConnector(nameof(SpectatorClient), endpoint);
-
-            if (connector != null)
+            IsConnected.BindValueChanged(connected =>
             {
-                connector.ConfigureConnection = connection =>
+                if (connected.NewValue)
                 {
-                    // until strong typed client support is added, each method must be manually bound
-                    // (see https://github.com/dotnet/aspnetcore/issues/15198)
-                    connection.On<int, SpectatorState>(nameof(ISpectatorClient.UserBeganPlaying), ((ISpectatorClient)this).UserBeganPlaying);
-                    connection.On<int, FrameDataBundle>(nameof(ISpectatorClient.UserSentFrames), ((ISpectatorClient)this).UserSentFrames);
-                    connection.On<int, SpectatorState>(nameof(ISpectatorClient.UserFinishedPlaying), ((ISpectatorClient)this).UserFinishedPlaying);
-                };
+                    // get all the users that were previously being watched
+                    int[] users;
 
-                isConnected.BindTo(connector.IsConnected);
-                isConnected.BindValueChanged(connected =>
+                    lock (userLock)
+                    {
+                        users = watchingUsers.ToArray();
+                        watchingUsers.Clear();
+                    }
+
+                    // resubscribe to watched users.
+                    foreach (var userId in users)
+                        WatchUser(userId);
+
+                    // re-send state in case it wasn't received
+                    if (IsPlaying)
+                        BeginPlayingInternal(currentState);
+                }
+                else
                 {
-                    if (connected.NewValue)
+                    lock (userLock)
                     {
-                        // get all the users that were previously being watched
-                        int[] users;
-
-                        lock (userLock)
-                        {
-                            users = watchingUsers.ToArray();
-                            watchingUsers.Clear();
-                        }
-
-                        // resubscribe to watched users.
-                        foreach (var userId in users)
-                            WatchUser(userId);
-
-                        // re-send state in case it wasn't received
-                        if (isPlaying)
-                            beginPlaying();
+                        playingUsers.Clear();
+                        playingUserStates.Clear();
                     }
-                    else
-                    {
-                        lock (userLock)
-                        {
-                            playingUsers.Clear();
-                            playingUserStates.Clear();
-                        }
-                    }
-                }, true);
-            }
+                }
+            }, true);
         }
 
         Task ISpectatorClient.UserBeganPlaying(int userId, SpectatorState state)
@@ -176,10 +152,10 @@ namespace osu.Game.Online.Spectator
 
         public void BeginPlaying(GameplayBeatmap beatmap, Score score)
         {
-            if (isPlaying)
+            if (IsPlaying)
                 throw new InvalidOperationException($"Cannot invoke {nameof(BeginPlaying)} when already playing");
 
-            isPlaying = true;
+            IsPlaying = true;
 
             // transfer state at point of beginning play
             currentState.BeatmapID = beatmap.BeatmapInfo.OnlineBeatmapID;
@@ -189,36 +165,20 @@ namespace osu.Game.Online.Spectator
             currentBeatmap = beatmap.PlayableBeatmap;
             currentScore = score;
 
-            beginPlaying();
+            BeginPlayingInternal(currentState);
         }
 
-        private void beginPlaying()
-        {
-            Debug.Assert(isPlaying);
-
-            if (!isConnected.Value) return;
-
-            connection.SendAsync(nameof(ISpectatorServer.BeginPlaySession), currentState);
-        }
-
-        public void SendFrames(FrameDataBundle data)
-        {
-            if (!isConnected.Value) return;
-
-            lastSend = connection.SendAsync(nameof(ISpectatorServer.SendFrameData), data);
-        }
+        public void SendFrames(FrameDataBundle data) => lastSend = SendFramesInternal(data);
 
         public void EndPlaying()
         {
-            isPlaying = false;
+            IsPlaying = false;
             currentBeatmap = null;
 
-            if (!isConnected.Value) return;
-
-            connection.SendAsync(nameof(ISpectatorServer.EndPlaySession), currentState);
+            EndPlayingInternal(currentState);
         }
 
-        public virtual void WatchUser(int userId)
+        public void WatchUser(int userId)
         {
             lock (userLock)
             {
@@ -226,27 +186,31 @@ namespace osu.Game.Online.Spectator
                     return;
 
                 watchingUsers.Add(userId);
-
-                if (!isConnected.Value)
-                    return;
             }
 
-            connection.SendAsync(nameof(ISpectatorServer.StartWatchingUser), userId);
+            WatchUserInternal(userId);
         }
 
-        public virtual void StopWatchingUser(int userId)
+        public void StopWatchingUser(int userId)
         {
             lock (userLock)
             {
                 watchingUsers.Remove(userId);
-
-                if (!isConnected.Value)
-                    return;
             }
 
-            connection.SendAsync(nameof(ISpectatorServer.EndWatchingUser), userId);
+            StopWatchingUserInternal(userId);
         }
 
+        protected abstract Task BeginPlayingInternal(SpectatorState state);
+
+        protected abstract Task SendFramesInternal(FrameDataBundle data);
+
+        protected abstract Task EndPlayingInternal(SpectatorState state);
+
+        protected abstract Task WatchUserInternal(int userId);
+
+        protected abstract Task StopWatchingUserInternal(int userId);
+
         private readonly Queue<LegacyReplayFrame> pendingFrames = new Queue<LegacyReplayFrame>();
 
         private double lastSendTime;
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 3707e3b7be..41984839ab 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -240,7 +240,7 @@ namespace osu.Game
 
             dependencies.CacheAs(API ??= new APIAccess(LocalConfig, endpoints, VersionHash));
 
-            dependencies.CacheAs(spectatorClient = new SpectatorClient(endpoints));
+            dependencies.CacheAs(spectatorClient = new OnlineSpectatorClient(endpoints));
             dependencies.CacheAs(multiplayerClient = new MultiplayerClient(endpoints));
 
             var defaultBeatmap = new DummyWorkingBeatmap(Audio, Textures);

From 750a5c3ea96530fae27195fd5afb0fe89ff4dd0c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 May 2021 17:20:30 +0900
Subject: [PATCH 3623/3722] Fix test compilation error

---
 .../Visual/Spectator/TestSpectatorClient.cs   | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs b/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
index 985e293981..6bd9f1a920 100644
--- a/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
+++ b/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
@@ -1,11 +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 enable
+
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Threading.Tasks;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Utils;
-using osu.Game.Online;
+using osu.Game.Online.API;
 using osu.Game.Online.Spectator;
 using osu.Game.Replays.Legacy;
 using osu.Game.Scoring;
@@ -14,16 +18,16 @@ namespace osu.Game.Tests.Visual.Spectator
 {
     public class TestSpectatorClient : SpectatorClient
     {
+        public override IBindable<bool> IsConnected { get; } = new Bindable<bool>(true);
+
         public new BindableList<int> PlayingUsers => (BindableList<int>)base.PlayingUsers;
         private readonly ConcurrentDictionary<int, byte> watchingUsers = new ConcurrentDictionary<int, byte>();
 
         private readonly Dictionary<int, int> userBeatmapDictionary = new Dictionary<int, int>();
         private readonly Dictionary<int, bool> userSentStateDictionary = new Dictionary<int, bool>();
 
-        public TestSpectatorClient()
-            : base(new DevelopmentEndpointConfiguration())
-        {
-        }
+        [Resolved]
+        private IAPIProvider api { get; set; } = null!;
 
         public void StartPlay(int userId, int beatmapId)
         {
@@ -61,19 +65,25 @@ namespace osu.Game.Tests.Visual.Spectator
                 sendState(userId, userBeatmapDictionary[userId]);
         }
 
-        public override void WatchUser(int userId)
-        {
-            base.WatchUser(userId);
+        protected override Task BeginPlayingInternal(SpectatorState state) => ((ISpectatorClient)this).UserBeganPlaying(api.LocalUser.Value.Id, state);
 
+        protected override Task SendFramesInternal(FrameDataBundle data) => ((ISpectatorClient)this).UserSentFrames(api.LocalUser.Value.Id, data);
+
+        protected override Task EndPlayingInternal(SpectatorState state) => ((ISpectatorClient)this).UserFinishedPlaying(api.LocalUser.Value.Id, state);
+
+        protected override Task WatchUserInternal(int userId)
+        {
             // When newly watching a user, the server sends the playing state immediately.
             if (watchingUsers.TryAdd(userId, 0) && PlayingUsers.Contains(userId))
                 sendState(userId, userBeatmapDictionary[userId]);
+
+            return Task.CompletedTask;
         }
 
-        public override void StopWatchingUser(int userId)
+        protected override Task StopWatchingUserInternal(int userId)
         {
-            base.StopWatchingUser(userId);
             watchingUsers.TryRemove(userId, out _);
+            return Task.CompletedTask;
         }
 
         private void sendState(int userId, int beatmapId)

From 9d07749959aa346be7106918e9411999e1cd21d9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 May 2021 17:41:46 +0900
Subject: [PATCH 3624/3722] Improve implementation of TestSpectatorClient

There was a lot of weirdness here, such as storing the playing users,
clearing the playing users from test scenes (!!), and storing the users
being wathed.
This was all a thing because the previous implementation overrode the
base method implementations, which is no longer a thing.
---
 .../Visual/Gameplay/TestSceneSpectator.cs     |  2 +-
 .../TestSceneMultiSpectatorLeaderboard.cs     |  2 +-
 .../TestSceneMultiSpectatorScreen.cs          |  6 +-
 .../TestSceneCurrentlyPlayingDisplay.cs       |  8 ++-
 .../Visual/Spectator/TestSpectatorClient.cs   | 62 +++++++++++--------
 5 files changed, 46 insertions(+), 34 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index 56a4ab8cba..e9894ff469 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -214,7 +214,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void start(int? beatmapId = null) => AddStep("start play", () => testSpectatorClient.StartPlay(streamingUser.Id, beatmapId ?? importedBeatmapId));
 
-        private void finish(int? beatmapId = null) => AddStep("end play", () => testSpectatorClient.EndPlay(streamingUser.Id, beatmapId ?? importedBeatmapId));
+        private void finish() => AddStep("end play", () => testSpectatorClient.EndPlay(streamingUser.Id));
 
         private void checkPaused(bool state) =>
             AddUntilStep($"game is {(state ? "paused" : "playing")}", () => player.ChildrenOfType<DrawableRuleset>().First().IsPaused.Value == state);
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
index afd4401a63..5ad35be0ec 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
                 foreach (var (userId, clock) in clocks)
                 {
-                    spectatorClient.EndPlay(userId, 0);
+                    spectatorClient.EndPlay(userId);
                     clock.CurrentTime = 0;
                 }
             });
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
index 23095a1ea8..b91391c409 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddStep("finish previous gameplay", () =>
             {
                 foreach (var id in playingUserIds)
-                    spectatorClient.EndPlay(id, importedBeatmapId);
+                    spectatorClient.EndPlay(id);
                 playingUserIds.Clear();
             });
         }
@@ -258,11 +258,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
             });
         }
 
-        private void finish(int userId, int? beatmapId = null)
+        private void finish(int userId)
         {
             AddStep("end play", () =>
             {
-                spectatorClient.EndPlay(userId, beatmapId ?? importedBeatmapId);
+                spectatorClient.EndPlay(userId);
                 playingUserIds.Remove(userId);
                 nextFrame.Remove(userId);
             });
diff --git a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
index 9bc0b32eee..30785fd163 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCurrentlyPlayingDisplay.cs
@@ -19,6 +19,8 @@ namespace osu.Game.Tests.Visual.Online
 {
     public class TestSceneCurrentlyPlayingDisplay : OsuTestScene
     {
+        private readonly User streamingUser = new User { Id = 2, Username = "Test user" };
+
         [Cached(typeof(SpectatorClient))]
         private TestSpectatorClient testSpectatorClient = new TestSpectatorClient();
 
@@ -55,15 +57,15 @@ namespace osu.Game.Tests.Visual.Online
                 };
             });
 
-            AddStep("Reset players", () => testSpectatorClient.PlayingUsers.Clear());
+            AddStep("Reset players", () => testSpectatorClient.EndPlay(streamingUser.Id));
         }
 
         [Test]
         public void TestBasicDisplay()
         {
-            AddStep("Add playing user", () => testSpectatorClient.PlayingUsers.Add(2));
+            AddStep("Add playing user", () => testSpectatorClient.StartPlay(streamingUser.Id, 0));
             AddUntilStep("Panel loaded", () => currentlyPlaying.ChildrenOfType<UserGridPanel>()?.FirstOrDefault()?.User.Id == 2);
-            AddStep("Remove playing user", () => testSpectatorClient.PlayingUsers.Remove(2));
+            AddStep("Remove playing user", () => testSpectatorClient.EndPlay(streamingUser.Id));
             AddUntilStep("Panel no longer present", () => !currentlyPlaying.ChildrenOfType<UserGridPanel>().Any());
         }
 
diff --git a/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs b/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
index 6bd9f1a920..3a5ffa8770 100644
--- a/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
+++ b/osu.Game/Tests/Visual/Spectator/TestSpectatorClient.cs
@@ -3,8 +3,9 @@
 
 #nullable enable
 
-using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -20,33 +21,44 @@ namespace osu.Game.Tests.Visual.Spectator
     {
         public override IBindable<bool> IsConnected { get; } = new Bindable<bool>(true);
 
-        public new BindableList<int> PlayingUsers => (BindableList<int>)base.PlayingUsers;
-        private readonly ConcurrentDictionary<int, byte> watchingUsers = new ConcurrentDictionary<int, byte>();
-
         private readonly Dictionary<int, int> userBeatmapDictionary = new Dictionary<int, int>();
-        private readonly Dictionary<int, bool> userSentStateDictionary = new Dictionary<int, bool>();
 
         [Resolved]
         private IAPIProvider api { get; set; } = null!;
 
+        /// <summary>
+        /// Starts play for an arbitrary user.
+        /// </summary>
+        /// <param name="userId">The user to start play for.</param>
+        /// <param name="beatmapId">The playing beatmap id.</param>
         public void StartPlay(int userId, int beatmapId)
         {
             userBeatmapDictionary[userId] = beatmapId;
-            sendState(userId, beatmapId);
+            sendPlayingState(userId);
         }
 
-        public void EndPlay(int userId, int beatmapId)
+        /// <summary>
+        /// Ends play for an arbitrary user.
+        /// </summary>
+        /// <param name="userId">The user to end play for.</param>
+        public void EndPlay(int userId)
         {
+            if (!PlayingUsers.Contains(userId))
+                return;
+
             ((ISpectatorClient)this).UserFinishedPlaying(userId, new SpectatorState
             {
-                BeatmapID = beatmapId,
+                BeatmapID = userBeatmapDictionary[userId],
                 RulesetID = 0,
             });
-
-            userBeatmapDictionary.Remove(userId);
-            userSentStateDictionary.Remove(userId);
         }
 
+        /// <summary>
+        /// Sends frames for an arbitrary user.
+        /// </summary>
+        /// <param name="userId">The user to send frames for.</param>
+        /// <param name="index">The frame index.</param>
+        /// <param name="count">The number of frames to send.</param>
         public void SendFrames(int userId, int index, int count)
         {
             var frames = new List<LegacyReplayFrame>();
@@ -60,12 +72,16 @@ namespace osu.Game.Tests.Visual.Spectator
 
             var bundle = new FrameDataBundle(new ScoreInfo { Combo = index + count }, frames);
             ((ISpectatorClient)this).UserSentFrames(userId, bundle);
-
-            if (!userSentStateDictionary[userId])
-                sendState(userId, userBeatmapDictionary[userId]);
         }
 
-        protected override Task BeginPlayingInternal(SpectatorState state) => ((ISpectatorClient)this).UserBeganPlaying(api.LocalUser.Value.Id, state);
+        protected override Task BeginPlayingInternal(SpectatorState state)
+        {
+            // Track the local user's playing beatmap ID.
+            Debug.Assert(state.BeatmapID != null);
+            userBeatmapDictionary[api.LocalUser.Value.Id] = state.BeatmapID.Value;
+
+            return ((ISpectatorClient)this).UserBeganPlaying(api.LocalUser.Value.Id, state);
+        }
 
         protected override Task SendFramesInternal(FrameDataBundle data) => ((ISpectatorClient)this).UserSentFrames(api.LocalUser.Value.Id, data);
 
@@ -74,27 +90,21 @@ namespace osu.Game.Tests.Visual.Spectator
         protected override Task WatchUserInternal(int userId)
         {
             // When newly watching a user, the server sends the playing state immediately.
-            if (watchingUsers.TryAdd(userId, 0) && PlayingUsers.Contains(userId))
-                sendState(userId, userBeatmapDictionary[userId]);
+            if (PlayingUsers.Contains(userId))
+                sendPlayingState(userId);
 
             return Task.CompletedTask;
         }
 
-        protected override Task StopWatchingUserInternal(int userId)
-        {
-            watchingUsers.TryRemove(userId, out _);
-            return Task.CompletedTask;
-        }
+        protected override Task StopWatchingUserInternal(int userId) => Task.CompletedTask;
 
-        private void sendState(int userId, int beatmapId)
+        private void sendPlayingState(int userId)
         {
             ((ISpectatorClient)this).UserBeganPlaying(userId, new SpectatorState
             {
-                BeatmapID = beatmapId,
+                BeatmapID = userBeatmapDictionary[userId],
                 RulesetID = 0,
             });
-
-            userSentStateDictionary[userId] = true;
         }
     }
 }

From 6eff8d513e6c34b3efd8c88bdf17ea698a977943 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 May 2021 17:51:09 +0900
Subject: [PATCH 3625/3722] Annotate nullables

---
 osu.Game/Online/Spectator/SpectatorClient.cs | 24 +++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
index 5ea31a49fb..cb98b01bed 100644
--- a/osu.Game/Online/Spectator/SpectatorClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -1,12 +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 enable
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -45,36 +46,37 @@ namespace osu.Game.Online.Spectator
 
         private readonly Dictionary<int, SpectatorState> playingUserStates = new Dictionary<int, SpectatorState>();
 
-        [CanBeNull]
-        private IBeatmap currentBeatmap;
+        private IBeatmap? currentBeatmap;
 
-        [CanBeNull]
-        private Score currentScore;
+        private Score? currentScore;
 
         [Resolved]
-        private IBindable<RulesetInfo> currentRuleset { get; set; }
+        private IBindable<RulesetInfo> currentRuleset { get; set; } = null!;
 
         [Resolved]
-        private IBindable<IReadOnlyList<Mod>> currentMods { get; set; }
+        private IBindable<IReadOnlyList<Mod>> currentMods { get; set; } = null!;
 
         private readonly SpectatorState currentState = new SpectatorState();
 
+        /// <summary>
+        /// Whether the local user is playing.
+        /// </summary>
         protected bool IsPlaying { get; private set; }
 
         /// <summary>
         /// Called whenever new frames arrive from the server.
         /// </summary>
-        public event Action<int, FrameDataBundle> OnNewFrames;
+        public event Action<int, FrameDataBundle>? OnNewFrames;
 
         /// <summary>
         /// Called whenever a user starts a play session, or immediately if the user is being watched and currently in a play session.
         /// </summary>
-        public event Action<int, SpectatorState> OnUserBeganPlaying;
+        public event Action<int, SpectatorState>? OnUserBeganPlaying;
 
         /// <summary>
         /// Called whenever a user finishes a play session.
         /// </summary>
-        public event Action<int, SpectatorState> OnUserFinishedPlaying;
+        public event Action<int, SpectatorState>? OnUserFinishedPlaying;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -215,7 +217,7 @@ namespace osu.Game.Online.Spectator
 
         private double lastSendTime;
 
-        private Task lastSend;
+        private Task? lastSend;
 
         private const int max_pending_frames = 30;
 

From 27e81d6504aff75e4e0673496c878c8fb0698ac8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 18:21:16 +0900
Subject: [PATCH 3626/3722] Implement proper rotation algorithm for skin editor

---
 .../Edit/OsuSelectionHandler.cs               | 30 ++--------------
 .../Compose/Components/SelectionHandler.cs    | 24 +++++++++++++
 .../Skinning/Editor/SkinSelectionHandler.cs   | 34 ++++++++++++++++---
 3 files changed, 57 insertions(+), 31 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
index 8cb86bc108..57d0cd859d 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.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.Graphics;
@@ -12,7 +11,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit.Compose.Components;
-using Vector2 = osuTK.Vector2;
+using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Edit
 {
@@ -173,12 +172,12 @@ namespace osu.Game.Rulesets.Osu.Edit
 
             foreach (var h in hitObjects)
             {
-                h.Position = rotatePointAroundOrigin(h.Position, referenceOrigin.Value, delta);
+                h.Position = RotatePointAroundOrigin(h.Position, referenceOrigin.Value, delta);
 
                 if (h is IHasPath path)
                 {
                     foreach (var point in path.Path.ControlPoints)
-                        point.Position.Value = rotatePointAroundOrigin(point.Position.Value, Vector2.Zero, delta);
+                        point.Position.Value = RotatePointAroundOrigin(point.Position.Value, Vector2.Zero, delta);
                 }
             }
 
@@ -324,28 +323,5 @@ namespace osu.Game.Rulesets.Osu.Edit
         private OsuHitObject[] selectedMovableObjects => SelectedItems.OfType<OsuHitObject>()
                                                                       .Where(h => !(h is Spinner))
                                                                       .ToArray();
-
-        /// <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>
-        private 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;
-        }
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 26328b4dc7..8939be925a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -14,6 +14,7 @@ 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;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
@@ -353,6 +354,29 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         #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.
diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 2f9611ba65..cc4c120e23 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -18,16 +18,42 @@ namespace osu.Game.Skinning.Editor
 {
     public class SkinSelectionHandler : SelectionHandler<ISkinnableDrawable>
     {
+        private Vector2? referenceOrigin;
+
         [Resolved]
         private SkinEditor skinEditor { get; set; }
 
+        protected override void OnOperationEnded()
+        {
+            base.OnOperationEnded();
+            referenceOrigin = null;
+        }
+
         public override bool HandleRotation(float angle)
         {
-            // TODO: this doesn't correctly account for origin/anchor specs being different in a multi-selection.
-            foreach (var c in SelectedBlueprints)
-                ((Drawable)c.Item).Rotation += angle;
+            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 = GetSurroundingQuad(SelectedBlueprints.SelectMany(b =>
+                    b.Item.ScreenSpaceDrawQuad.GetVertices().ToArray()));
 
-            return base.HandleRotation(angle);
+                referenceOrigin ??= selectionQuad.Centre;
+
+                foreach (var b in SelectedBlueprints)
+                {
+                    var drawableItem = (Drawable)b.Item;
+
+                    drawableItem.Position = drawableItem.Parent.ToLocalSpace(RotatePointAroundOrigin(b.ScreenSpaceSelectionPoint, referenceOrigin.Value, angle)) - drawableItem.AnchorPosition;
+                    drawableItem.Rotation += angle;
+                }
+            }
+
+            // this isn't always the case but let's be lenient for now.
+            return true;
         }
 
         public override bool HandleScale(Vector2 scale, Anchor anchor)

From 95c78b918510e8c4ebbc68a95496e0956a676278 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 18:24:25 +0900
Subject: [PATCH 3627/3722] Split out common selection quad logic

---
 osu.Game/Skinning/Editor/SkinSelectionHandler.cs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index cc4c120e23..ec45830f94 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Extensions;
 using osu.Game.Graphics.UserInterface;
@@ -38,8 +39,7 @@ namespace osu.Game.Skinning.Editor
             }
             else
             {
-                var selectionQuad = GetSurroundingQuad(SelectedBlueprints.SelectMany(b =>
-                    b.Item.ScreenSpaceDrawQuad.GetVertices().ToArray()));
+                var selectionQuad = getSelectionQuad();
 
                 referenceOrigin ??= selectionQuad.Centre;
 
@@ -63,8 +63,7 @@ namespace osu.Game.Skinning.Editor
 
             adjustScaleFromAnchor(ref scale, anchor);
 
-            var selectionQuad = GetSurroundingQuad(SelectedBlueprints.SelectMany(b =>
-                b.Item.ScreenSpaceDrawQuad.GetVertices().ToArray()));
+            var selectionQuad = getSelectionQuad();
 
             // the selection quad is always upright, so use a rect to make mutating the values easier.
             var adjustedRect = selectionQuad.AABBFloat;
@@ -220,6 +219,13 @@ namespace osu.Game.Skinning.Editor
             }
         }
 
+        /// <summary>
+        /// A screen-space quad surrounding all selected drawables, accounting for their full displayed size.
+        /// </summary>
+        /// <returns></returns>
+        private Quad getSelectionQuad() =>
+            GetSurroundingQuad(SelectedBlueprints.SelectMany(b => b.Item.ScreenSpaceDrawQuad.GetVertices().ToArray()));
+
         private void applyAnchor(Anchor anchor)
         {
             foreach (var item in SelectedItems)

From 6f75c59760e3bca0110e772c4e48a65addd496a7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 18:31:51 +0900
Subject: [PATCH 3628/3722] Fix flip logic not using the full selection quad

---
 osu.Game/Skinning/Editor/SkinSelectionHandler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index ec45830f94..88372e23a3 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -125,7 +125,7 @@ namespace osu.Game.Skinning.Editor
 
         public override bool HandleFlip(Direction direction)
         {
-            var selectionQuad = GetSurroundingQuad(SelectedBlueprints.Select(b => b.ScreenSpaceSelectionPoint));
+            var selectionQuad = getSelectionQuad();
 
             foreach (var b in SelectedBlueprints)
             {

From 20f1ef43180b20c8ee310c62a262f0f06bf3b5c3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 18:35:13 +0900
Subject: [PATCH 3629/3722] Extract common implementation of updating drawable
 position from screen space pos

---
 osu.Game/Skinning/Editor/SkinSelectionHandler.cs | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 88372e23a3..bdb1d1c054 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -47,7 +47,8 @@ namespace osu.Game.Skinning.Editor
                 {
                     var drawableItem = (Drawable)b.Item;
 
-                    drawableItem.Position = drawableItem.Parent.ToLocalSpace(RotatePointAroundOrigin(b.ScreenSpaceSelectionPoint, referenceOrigin.Value, angle)) - drawableItem.AnchorPosition;
+                    var rotatedPosition = RotatePointAroundOrigin(b.ScreenSpaceSelectionPoint, referenceOrigin.Value, angle);
+                    updateDrawablePosition(drawableItem, rotatedPosition);
                     drawableItem.Rotation += angle;
                 }
             }
@@ -116,7 +117,7 @@ namespace osu.Game.Skinning.Editor
                     adjustedRect.TopLeft.Y + adjustedRect.Height * relativePositionInOriginal.Y
                 );
 
-                drawableItem.Position = drawableItem.Parent.ToLocalSpace(newPositionInAdjusted) - drawableItem.AnchorPosition;
+                updateDrawablePosition(drawableItem, newPositionInAdjusted);
                 drawableItem.Scale *= scaledDelta;
             }
 
@@ -131,8 +132,9 @@ namespace osu.Game.Skinning.Editor
             {
                 var drawableItem = (Drawable)b.Item;
 
-                drawableItem.Position =
-                    drawableItem.Parent.ToLocalSpace(GetFlippedPosition(direction, selectionQuad, b.ScreenSpaceSelectionPoint)) - drawableItem.AnchorPosition;
+                var flippedPosition = GetFlippedPosition(direction, selectionQuad, b.ScreenSpaceSelectionPoint);
+
+                updateDrawablePosition(drawableItem, flippedPosition);
 
                 drawableItem.Scale *= new Vector2(
                     direction == Direction.Horizontal ? -1 : 1,
@@ -207,6 +209,12 @@ namespace osu.Game.Skinning.Editor
             }
         }
 
+        private static void updateDrawablePosition(Drawable drawable, Vector2 screenSpacePosition)
+        {
+            drawable.Position =
+                drawable.Parent.ToLocalSpace(screenSpacePosition) - drawable.AnchorPosition;
+        }
+
         private void applyOrigin(Anchor anchor)
         {
             foreach (var item in SelectedItems)

From 10597f7e6a508de8db6aade5faf6664c22f26d46 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 May 2021 18:37:27 +0900
Subject: [PATCH 3630/3722] Remove locking from SpectatorClient

---
 osu.Game/Online/Spectator/SpectatorClient.cs | 66 +++++++-------------
 1 file changed, 23 insertions(+), 43 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
index cb98b01bed..f930328846 100644
--- a/osu.Game/Online/Spectator/SpectatorClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -38,8 +38,6 @@ namespace osu.Game.Online.Spectator
 
         private readonly List<int> watchingUsers = new List<int>();
 
-        private readonly object userLock = new object();
-
         public IBindableList<int> PlayingUsers => playingUsers;
 
         private readonly BindableList<int> playingUsers = new BindableList<int>();
@@ -81,18 +79,13 @@ namespace osu.Game.Online.Spectator
         [BackgroundDependencyLoader]
         private void load()
         {
-            IsConnected.BindValueChanged(connected =>
+            IsConnected.BindValueChanged(connected => Schedule(() =>
             {
                 if (connected.NewValue)
                 {
                     // get all the users that were previously being watched
-                    int[] users;
-
-                    lock (userLock)
-                    {
-                        users = watchingUsers.ToArray();
-                        watchingUsers.Clear();
-                    }
+                    int[] users = watchingUsers.ToArray();
+                    watchingUsers.Clear();
 
                     // resubscribe to watched users.
                     foreach (var userId in users)
@@ -104,18 +97,15 @@ namespace osu.Game.Online.Spectator
                 }
                 else
                 {
-                    lock (userLock)
-                    {
-                        playingUsers.Clear();
-                        playingUserStates.Clear();
-                    }
+                    playingUsers.Clear();
+                    playingUserStates.Clear();
                 }
-            }, true);
+            }), true);
         }
 
         Task ISpectatorClient.UserBeganPlaying(int userId, SpectatorState state)
         {
-            lock (userLock)
+            Schedule(() =>
             {
                 if (!playingUsers.Contains(userId))
                     playingUsers.Add(userId);
@@ -125,29 +115,29 @@ namespace osu.Game.Online.Spectator
                 // We don't want the user states to update unless the player is being watched, otherwise calling BindUserBeganPlaying() can lead to double invocations.
                 if (watchingUsers.Contains(userId))
                     playingUserStates[userId] = state;
-            }
 
-            OnUserBeganPlaying?.Invoke(userId, state);
+                OnUserBeganPlaying?.Invoke(userId, state);
+            });
 
             return Task.CompletedTask;
         }
 
         Task ISpectatorClient.UserFinishedPlaying(int userId, SpectatorState state)
         {
-            lock (userLock)
+            Schedule(() =>
             {
                 playingUsers.Remove(userId);
                 playingUserStates.Remove(userId);
-            }
 
-            OnUserFinishedPlaying?.Invoke(userId, state);
+                OnUserFinishedPlaying?.Invoke(userId, state);
+            });
 
             return Task.CompletedTask;
         }
 
         Task ISpectatorClient.UserSentFrames(int userId, FrameDataBundle data)
         {
-            OnNewFrames?.Invoke(userId, data);
+            Schedule(() => OnNewFrames?.Invoke(userId, data));
 
             return Task.CompletedTask;
         }
@@ -182,23 +172,17 @@ namespace osu.Game.Online.Spectator
 
         public void WatchUser(int userId)
         {
-            lock (userLock)
-            {
-                if (watchingUsers.Contains(userId))
-                    return;
+            if (watchingUsers.Contains(userId))
+                return;
 
-                watchingUsers.Add(userId);
-            }
+            watchingUsers.Add(userId);
 
             WatchUserInternal(userId);
         }
 
         public void StopWatchingUser(int userId)
         {
-            lock (userLock)
-            {
-                watchingUsers.Remove(userId);
-            }
+            watchingUsers.Remove(userId);
 
             StopWatchingUserInternal(userId);
         }
@@ -262,8 +246,7 @@ namespace osu.Game.Online.Spectator
         /// <returns><c>true</c> if successful (the user is playing), <c>false</c> otherwise.</returns>
         public bool TryGetPlayingUserState(int userId, out SpectatorState state)
         {
-            lock (userLock)
-                return playingUserStates.TryGetValue(userId, out state);
+            return playingUserStates.TryGetValue(userId, out state);
         }
 
         /// <summary>
@@ -274,16 +257,13 @@ namespace osu.Game.Online.Spectator
         public void BindUserBeganPlaying(Action<int, SpectatorState> callback, bool runOnceImmediately = false)
         {
             // The lock is taken before the event is subscribed to to prevent doubling of events.
-            lock (userLock)
-            {
-                OnUserBeganPlaying += callback;
+            OnUserBeganPlaying += callback;
 
-                if (!runOnceImmediately)
-                    return;
+            if (!runOnceImmediately)
+                return;
 
-                foreach (var (userId, state) in playingUserStates)
-                    callback(userId, state);
-            }
+            foreach (var (userId, state) in playingUserStates)
+                callback(userId, state);
         }
     }
 }

From f74dbb9e1f2abfafca3bfe4499c5488dc6198c49 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 May 2021 18:52:20 +0900
Subject: [PATCH 3631/3722] Remove locking from SpectatorScreen

---
 osu.Game/Screens/Spectate/SpectatorScreen.cs | 181 ++++++++-----------
 1 file changed, 78 insertions(+), 103 deletions(-)

diff --git a/osu.Game/Screens/Spectate/SpectatorScreen.cs b/osu.Game/Screens/Spectate/SpectatorScreen.cs
index 1cf7bc30ee..e6c9a0acd4 100644
--- a/osu.Game/Screens/Spectate/SpectatorScreen.cs
+++ b/osu.Game/Screens/Spectate/SpectatorScreen.cs
@@ -42,9 +42,6 @@ namespace osu.Game.Screens.Spectate
         [Resolved]
         private UserLookupCache userLookupCache { get; set; }
 
-        // A lock is used to synchronise access to spectator/gameplay states, since this class is a screen which may become non-current and stop receiving updates at any point.
-        private readonly object stateLock = new object();
-
         private readonly Dictionary<int, User> userMap = new Dictionary<int, User>();
         private readonly Dictionary<int, GameplayState> gameplayStates = new Dictionary<int, GameplayState>();
 
@@ -63,8 +60,11 @@ namespace osu.Game.Screens.Spectate
         {
             base.LoadComplete();
 
-            populateAllUsers().ContinueWith(_ => Schedule(() =>
+            getAllUsers().ContinueWith(users => Schedule(() =>
             {
+                foreach (var u in users.Result)
+                    userMap[u.Id] = u;
+
                 spectatorClient.BindUserBeganPlaying(userBeganPlaying, true);
                 spectatorClient.OnUserFinishedPlaying += userFinishedPlaying;
                 spectatorClient.OnNewFrames += userSentFrames;
@@ -72,27 +72,23 @@ namespace osu.Game.Screens.Spectate
                 managerUpdated = beatmaps.ItemUpdated.GetBoundCopy();
                 managerUpdated.BindValueChanged(beatmapUpdated);
 
-                lock (stateLock)
-                {
-                    foreach (var (id, _) in userMap)
-                        spectatorClient.WatchUser(id);
-                }
+                foreach (var (id, _) in userMap)
+                    spectatorClient.WatchUser(id);
             }));
         }
 
-        private Task populateAllUsers()
+        private Task<User[]> getAllUsers()
         {
-            var userLookupTasks = new List<Task>();
+            var userLookupTasks = new List<Task<User>>();
 
             foreach (var u in userIds)
             {
                 userLookupTasks.Add(userLookupCache.GetUserAsync(u).ContinueWith(task =>
                 {
                     if (!task.IsCompletedSuccessfully)
-                        return;
+                        return null;
 
-                    lock (stateLock)
-                        userMap[u] = task.Result;
+                    return task.Result;
                 }));
             }
 
@@ -104,16 +100,13 @@ namespace osu.Game.Screens.Spectate
             if (!e.NewValue.TryGetTarget(out var beatmapSet))
                 return;
 
-            lock (stateLock)
+            foreach (var (userId, _) in userMap)
             {
-                foreach (var (userId, _) in userMap)
-                {
-                    if (!spectatorClient.TryGetPlayingUserState(userId, out var userState))
-                        continue;
+                if (!spectatorClient.TryGetPlayingUserState(userId, out var userState))
+                    continue;
 
-                    if (beatmapSet.Beatmaps.Any(b => b.OnlineBeatmapID == userState.BeatmapID))
-                        updateGameplayState(userId);
-                }
+                if (beatmapSet.Beatmaps.Any(b => b.OnlineBeatmapID == userState.BeatmapID))
+                    updateGameplayState(userId);
             }
         }
 
@@ -122,101 +115,89 @@ namespace osu.Game.Screens.Spectate
             if (state.RulesetID == null || state.BeatmapID == null)
                 return;
 
-            lock (stateLock)
-            {
-                if (!userMap.ContainsKey(userId))
-                    return;
+            if (!userMap.ContainsKey(userId))
+                return;
 
-                // The user may have stopped playing.
-                if (!spectatorClient.TryGetPlayingUserState(userId, out _))
-                    return;
+            // The user may have stopped playing.
+            if (!spectatorClient.TryGetPlayingUserState(userId, out _))
+                return;
 
-                Schedule(() => OnUserStateChanged(userId, state));
+            Schedule(() => OnUserStateChanged(userId, state));
 
-                updateGameplayState(userId);
-            }
+            updateGameplayState(userId);
         }
 
         private void updateGameplayState(int userId)
         {
-            lock (stateLock)
+            Debug.Assert(userMap.ContainsKey(userId));
+
+            // The user may have stopped playing.
+            if (!spectatorClient.TryGetPlayingUserState(userId, out var spectatorState))
+                return;
+
+            var user = userMap[userId];
+
+            var resolvedRuleset = rulesets.AvailableRulesets.FirstOrDefault(r => r.ID == spectatorState.RulesetID)?.CreateInstance();
+            if (resolvedRuleset == null)
+                return;
+
+            var resolvedBeatmap = beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == spectatorState.BeatmapID);
+            if (resolvedBeatmap == null)
+                return;
+
+            var score = new Score
             {
-                Debug.Assert(userMap.ContainsKey(userId));
-
-                // The user may have stopped playing.
-                if (!spectatorClient.TryGetPlayingUserState(userId, out var spectatorState))
-                    return;
-
-                var user = userMap[userId];
-
-                var resolvedRuleset = rulesets.AvailableRulesets.FirstOrDefault(r => r.ID == spectatorState.RulesetID)?.CreateInstance();
-                if (resolvedRuleset == null)
-                    return;
-
-                var resolvedBeatmap = beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == spectatorState.BeatmapID);
-                if (resolvedBeatmap == null)
-                    return;
-
-                var score = new Score
+                ScoreInfo = new ScoreInfo
                 {
-                    ScoreInfo = new ScoreInfo
-                    {
-                        Beatmap = resolvedBeatmap,
-                        User = user,
-                        Mods = spectatorState.Mods.Select(m => m.ToMod(resolvedRuleset)).ToArray(),
-                        Ruleset = resolvedRuleset.RulesetInfo,
-                    },
-                    Replay = new Replay { HasReceivedAllFrames = false },
-                };
+                    Beatmap = resolvedBeatmap,
+                    User = user,
+                    Mods = spectatorState.Mods.Select(m => m.ToMod(resolvedRuleset)).ToArray(),
+                    Ruleset = resolvedRuleset.RulesetInfo,
+                },
+                Replay = new Replay { HasReceivedAllFrames = false },
+            };
 
-                var gameplayState = new GameplayState(score, resolvedRuleset, beatmaps.GetWorkingBeatmap(resolvedBeatmap));
+            var gameplayState = new GameplayState(score, resolvedRuleset, beatmaps.GetWorkingBeatmap(resolvedBeatmap));
 
-                gameplayStates[userId] = gameplayState;
-                Schedule(() => StartGameplay(userId, gameplayState));
-            }
+            gameplayStates[userId] = gameplayState;
+            Schedule(() => StartGameplay(userId, gameplayState));
         }
 
         private void userSentFrames(int userId, FrameDataBundle bundle)
         {
-            lock (stateLock)
+            if (!userMap.ContainsKey(userId))
+                return;
+
+            if (!gameplayStates.TryGetValue(userId, out var gameplayState))
+                return;
+
+            // The ruleset instance should be guaranteed to be in sync with the score via ScoreLock.
+            Debug.Assert(gameplayState.Ruleset != null && gameplayState.Ruleset.RulesetInfo.Equals(gameplayState.Score.ScoreInfo.Ruleset));
+
+            foreach (var frame in bundle.Frames)
             {
-                if (!userMap.ContainsKey(userId))
-                    return;
+                IConvertibleReplayFrame convertibleFrame = gameplayState.Ruleset.CreateConvertibleReplayFrame();
+                convertibleFrame.FromLegacy(frame, gameplayState.Beatmap.Beatmap);
 
-                if (!gameplayStates.TryGetValue(userId, out var gameplayState))
-                    return;
+                var convertedFrame = (ReplayFrame)convertibleFrame;
+                convertedFrame.Time = frame.Time;
 
-                // The ruleset instance should be guaranteed to be in sync with the score via ScoreLock.
-                Debug.Assert(gameplayState.Ruleset != null && gameplayState.Ruleset.RulesetInfo.Equals(gameplayState.Score.ScoreInfo.Ruleset));
-
-                foreach (var frame in bundle.Frames)
-                {
-                    IConvertibleReplayFrame convertibleFrame = gameplayState.Ruleset.CreateConvertibleReplayFrame();
-                    convertibleFrame.FromLegacy(frame, gameplayState.Beatmap.Beatmap);
-
-                    var convertedFrame = (ReplayFrame)convertibleFrame;
-                    convertedFrame.Time = frame.Time;
-
-                    gameplayState.Score.Replay.Frames.Add(convertedFrame);
-                }
+                gameplayState.Score.Replay.Frames.Add(convertedFrame);
             }
         }
 
         private void userFinishedPlaying(int userId, SpectatorState state)
         {
-            lock (stateLock)
-            {
-                if (!userMap.ContainsKey(userId))
-                    return;
+            if (!userMap.ContainsKey(userId))
+                return;
 
-                if (!gameplayStates.TryGetValue(userId, out var gameplayState))
-                    return;
+            if (!gameplayStates.TryGetValue(userId, out var gameplayState))
+                return;
 
-                gameplayState.Score.Replay.HasReceivedAllFrames = true;
+            gameplayState.Score.Replay.HasReceivedAllFrames = true;
 
-                gameplayStates.Remove(userId);
-                Schedule(() => EndGameplay(userId));
-            }
+            gameplayStates.Remove(userId);
+            Schedule(() => EndGameplay(userId));
         }
 
         /// <summary>
@@ -245,15 +226,12 @@ namespace osu.Game.Screens.Spectate
         /// <param name="userId">The user to stop spectating.</param>
         protected void RemoveUser(int userId)
         {
-            lock (stateLock)
-            {
-                userFinishedPlaying(userId, null);
+            userFinishedPlaying(userId, null);
 
-                userIds.Remove(userId);
-                userMap.Remove(userId);
+            userIds.Remove(userId);
+            userMap.Remove(userId);
 
-                spectatorClient.StopWatchingUser(userId);
-            }
+            spectatorClient.StopWatchingUser(userId);
         }
 
         protected override void Dispose(bool isDisposing)
@@ -266,11 +244,8 @@ namespace osu.Game.Screens.Spectate
                 spectatorClient.OnUserFinishedPlaying -= userFinishedPlaying;
                 spectatorClient.OnNewFrames -= userSentFrames;
 
-                lock (stateLock)
-                {
-                    foreach (var (userId, _) in userMap)
-                        spectatorClient.StopWatchingUser(userId);
-                }
+                foreach (var (userId, _) in userMap)
+                    spectatorClient.StopWatchingUser(userId);
             }
 
             managerUpdated?.UnbindAll();

From 89b4f695884ca229193dc8e7bd2b5d009847a55b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 May 2021 19:19:39 +0900
Subject: [PATCH 3632/3722] Expose playing user states as bindable dictionary

---
 osu.Game/Online/Spectator/SpectatorClient.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
index f930328846..810299e90d 100644
--- a/osu.Game/Online/Spectator/SpectatorClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -39,10 +39,10 @@ namespace osu.Game.Online.Spectator
         private readonly List<int> watchingUsers = new List<int>();
 
         public IBindableList<int> PlayingUsers => playingUsers;
-
         private readonly BindableList<int> playingUsers = new BindableList<int>();
 
-        private readonly Dictionary<int, SpectatorState> playingUserStates = new Dictionary<int, SpectatorState>();
+        public IBindableDictionary<int, SpectatorState> PlayingUserStates => playingUserStates;
+        private readonly BindableDictionary<int, SpectatorState> playingUserStates = new BindableDictionary<int, SpectatorState>();
 
         private IBeatmap? currentBeatmap;
 

From b515fe3cb1f9ee8732bd427dfc842cbefca3a9b8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 May 2021 19:19:58 +0900
Subject: [PATCH 3633/3722] Fix playing user state not removed on stop watching

---
 osu.Game/Online/Spectator/SpectatorClient.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
index 810299e90d..649af03bc4 100644
--- a/osu.Game/Online/Spectator/SpectatorClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -183,6 +183,7 @@ namespace osu.Game.Online.Spectator
         public void StopWatchingUser(int userId)
         {
             watchingUsers.Remove(userId);
+            playingUserStates.Remove(userId);
 
             StopWatchingUserInternal(userId);
         }

From 7ee81669f7a304982bb88cccf5cf354a9cc72131 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 May 2021 19:27:34 +0900
Subject: [PATCH 3634/3722] Remove bind helpers from SpectatorClient

---
 osu.Game/Online/Spectator/SpectatorClient.cs | 28 --------
 osu.Game/Screens/Spectate/SpectatorScreen.cs | 68 +++++++++++---------
 2 files changed, 39 insertions(+), 57 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
index 649af03bc4..04904f66ac 100644
--- a/osu.Game/Online/Spectator/SpectatorClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -238,33 +238,5 @@ namespace osu.Game.Online.Spectator
 
             lastSendTime = Time.Current;
         }
-
-        /// <summary>
-        /// Attempts to retrieve the <see cref="SpectatorState"/> for a currently-playing user.
-        /// </summary>
-        /// <param name="userId">The user.</param>
-        /// <param name="state">The current <see cref="SpectatorState"/> for the user, if they're playing. <c>null</c> if the user is not playing.</param>
-        /// <returns><c>true</c> if successful (the user is playing), <c>false</c> otherwise.</returns>
-        public bool TryGetPlayingUserState(int userId, out SpectatorState state)
-        {
-            return playingUserStates.TryGetValue(userId, out state);
-        }
-
-        /// <summary>
-        /// Bind an action to <see cref="OnUserBeganPlaying"/> with the option of running the bound action once immediately.
-        /// </summary>
-        /// <param name="callback">The action to perform when a user begins playing.</param>
-        /// <param name="runOnceImmediately">Whether the action provided in <paramref name="callback"/> should be run once immediately for all users currently playing.</param>
-        public void BindUserBeganPlaying(Action<int, SpectatorState> callback, bool runOnceImmediately = false)
-        {
-            // The lock is taken before the event is subscribed to to prevent doubling of events.
-            OnUserBeganPlaying += callback;
-
-            if (!runOnceImmediately)
-                return;
-
-            foreach (var (userId, state) in playingUserStates)
-                callback(userId, state);
-        }
     }
 }
diff --git a/osu.Game/Screens/Spectate/SpectatorScreen.cs b/osu.Game/Screens/Spectate/SpectatorScreen.cs
index e6c9a0acd4..0adc5b863f 100644
--- a/osu.Game/Screens/Spectate/SpectatorScreen.cs
+++ b/osu.Game/Screens/Spectate/SpectatorScreen.cs
@@ -9,6 +9,7 @@ using System.Threading.Tasks;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Game.Beatmaps;
 using osu.Game.Database;
 using osu.Game.Online.Spectator;
@@ -42,6 +43,8 @@ namespace osu.Game.Screens.Spectate
         [Resolved]
         private UserLookupCache userLookupCache { get; set; }
 
+        private readonly IBindableDictionary<int, SpectatorState> playingUserStates = new BindableDictionary<int, SpectatorState>();
+
         private readonly Dictionary<int, User> userMap = new Dictionary<int, User>();
         private readonly Dictionary<int, GameplayState> gameplayStates = new Dictionary<int, GameplayState>();
 
@@ -65,8 +68,9 @@ namespace osu.Game.Screens.Spectate
                 foreach (var u in users.Result)
                     userMap[u.Id] = u;
 
-                spectatorClient.BindUserBeganPlaying(userBeganPlaying, true);
-                spectatorClient.OnUserFinishedPlaying += userFinishedPlaying;
+                playingUserStates.BindTo(spectatorClient.PlayingUserStates);
+                playingUserStates.BindCollectionChanged(onPlayingUserStatesChanged, true);
+
                 spectatorClient.OnNewFrames += userSentFrames;
 
                 managerUpdated = beatmaps.ItemUpdated.GetBoundCopy();
@@ -102,7 +106,7 @@ namespace osu.Game.Screens.Spectate
 
             foreach (var (userId, _) in userMap)
             {
-                if (!spectatorClient.TryGetPlayingUserState(userId, out var userState))
+                if (!playingUserStates.TryGetValue(userId, out var userState))
                     continue;
 
                 if (beatmapSet.Beatmaps.Any(b => b.OnlineBeatmapID == userState.BeatmapID))
@@ -110,7 +114,23 @@ namespace osu.Game.Screens.Spectate
             }
         }
 
-        private void userBeganPlaying(int userId, SpectatorState state)
+        private void onPlayingUserStatesChanged(object sender, NotifyDictionaryChangedEventArgs<int, SpectatorState> e)
+        {
+            switch (e.Action)
+            {
+                case NotifyDictionaryChangedAction.Add:
+                    foreach (var (userId, state) in e.NewItems.AsNonNull())
+                        onUserStateAdded(userId, state);
+                    break;
+
+                case NotifyDictionaryChangedAction.Remove:
+                    foreach (var (userId, _) in e.OldItems.AsNonNull())
+                        onUserStateRemoved(userId);
+                    break;
+            }
+        }
+
+        private void onUserStateAdded(int userId, SpectatorState state)
         {
             if (state.RulesetID == null || state.BeatmapID == null)
                 return;
@@ -118,24 +138,30 @@ namespace osu.Game.Screens.Spectate
             if (!userMap.ContainsKey(userId))
                 return;
 
-            // The user may have stopped playing.
-            if (!spectatorClient.TryGetPlayingUserState(userId, out _))
+            Schedule(() => OnUserStateChanged(userId, state));
+            updateGameplayState(userId);
+        }
+
+        private void onUserStateRemoved(int userId)
+        {
+            if (!userMap.ContainsKey(userId))
                 return;
 
-            Schedule(() => OnUserStateChanged(userId, state));
+            if (!gameplayStates.TryGetValue(userId, out var gameplayState))
+                return;
 
-            updateGameplayState(userId);
+            gameplayState.Score.Replay.HasReceivedAllFrames = true;
+
+            gameplayStates.Remove(userId);
+            Schedule(() => EndGameplay(userId));
         }
 
         private void updateGameplayState(int userId)
         {
             Debug.Assert(userMap.ContainsKey(userId));
 
-            // The user may have stopped playing.
-            if (!spectatorClient.TryGetPlayingUserState(userId, out var spectatorState))
-                return;
-
             var user = userMap[userId];
+            var spectatorState = playingUserStates[userId];
 
             var resolvedRuleset = rulesets.AvailableRulesets.FirstOrDefault(r => r.ID == spectatorState.RulesetID)?.CreateInstance();
             if (resolvedRuleset == null)
@@ -186,20 +212,6 @@ namespace osu.Game.Screens.Spectate
             }
         }
 
-        private void userFinishedPlaying(int userId, SpectatorState state)
-        {
-            if (!userMap.ContainsKey(userId))
-                return;
-
-            if (!gameplayStates.TryGetValue(userId, out var gameplayState))
-                return;
-
-            gameplayState.Score.Replay.HasReceivedAllFrames = true;
-
-            gameplayStates.Remove(userId);
-            Schedule(() => EndGameplay(userId));
-        }
-
         /// <summary>
         /// Invoked when a spectated user's state has changed.
         /// </summary>
@@ -226,7 +238,7 @@ namespace osu.Game.Screens.Spectate
         /// <param name="userId">The user to stop spectating.</param>
         protected void RemoveUser(int userId)
         {
-            userFinishedPlaying(userId, null);
+            onUserStateRemoved(userId);
 
             userIds.Remove(userId);
             userMap.Remove(userId);
@@ -240,8 +252,6 @@ namespace osu.Game.Screens.Spectate
 
             if (spectatorClient != null)
             {
-                spectatorClient.OnUserBeganPlaying -= userBeganPlaying;
-                spectatorClient.OnUserFinishedPlaying -= userFinishedPlaying;
                 spectatorClient.OnNewFrames -= userSentFrames;
 
                 foreach (var (userId, _) in userMap)

From df5970fab4585e6649a2cec85f7d38e5ee47b264 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 19:34:53 +0900
Subject: [PATCH 3635/3722] Create base implementations of the two most common
 `TernaryStateMenuItem`s

---
 .../Components/PathControlPointVisualiser.cs  | 12 +---
 .../Edit/TaikoSelectionHandler.cs             |  4 +-
 .../TestSceneStatefulMenuItem.cs              | 56 +++++++++++++++++--
 .../UserInterface/TernaryStateMenuItem.cs     | 37 ++----------
 .../TernaryStateRadioMenuItem.cs              | 23 ++++++++
 .../TernaryStateToggleMenuItem.cs             | 42 ++++++++++++++
 .../Components/EditorSelectionHandler.cs      |  4 +-
 .../Carousel/DrawableCarouselBeatmapSet.cs    |  2 +-
 .../Skinning/Editor/SkinSelectionHandler.cs   | 14 +----
 9 files changed, 129 insertions(+), 65 deletions(-)
 create mode 100644 osu.Game/Graphics/UserInterface/TernaryStateRadioMenuItem.cs
 create mode 100644 osu.Game/Graphics/UserInterface/TernaryStateToggleMenuItem.cs

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 44c3056910..c36768baba 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -243,7 +243,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             int totalCount = Pieces.Count(p => p.IsSelected.Value);
             int countOfState = Pieces.Where(p => p.IsSelected.Value).Count(p => p.ControlPoint.Type.Value == type);
 
-            var item = new PathTypeMenuItem(type, () =>
+            var item = new TernaryStateRadioMenuItem(type == null ? "Inherit" : type.ToString().Humanize(), MenuItemType.Standard, _ =>
             {
                 foreach (var p in Pieces.Where(p => p.IsSelected.Value))
                     updatePathType(p, type);
@@ -258,15 +258,5 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 
             return item;
         }
-
-        private class PathTypeMenuItem : TernaryStateMenuItem
-        {
-            public PathTypeMenuItem(PathType? type, Action action)
-                : base(type == null ? "Inherit" : type.ToString().Humanize(), changeState, MenuItemType.Standard, _ => action?.Invoke())
-            {
-            }
-
-            private static TernaryState changeState(TernaryState state) => TernaryState.True;
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
index 48ee0d4cf4..a24130d6ac 100644
--- a/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
@@ -76,10 +76,10 @@ namespace osu.Game.Rulesets.Taiko.Edit
         protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint<HitObject>> selection)
         {
             if (selection.All(s => s.Item is Hit))
-                yield return new TernaryStateMenuItem("Rim") { State = { BindTarget = selectionRimState } };
+                yield return new TernaryStateToggleMenuItem("Rim") { State = { BindTarget = selectionRimState } };
 
             if (selection.All(s => s.Item is TaikoHitObject))
-                yield return new TernaryStateMenuItem("Strong") { State = { BindTarget = selectionStrongState } };
+                yield return new TernaryStateToggleMenuItem("Strong") { State = { BindTarget = selectionStrongState } };
 
             foreach (var item in base.GetContextMenuItemsForSelection(selection))
                 yield return item;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneStatefulMenuItem.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneStatefulMenuItem.cs
index 29aeb6a4b2..18ec631f37 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneStatefulMenuItem.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneStatefulMenuItem.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Tests.Visual.UserInterface
     public class TestSceneStatefulMenuItem : OsuManualInputManagerTestScene
     {
         [Test]
-        public void TestTernaryMenuItem()
+        public void TestTernaryRadioMenuItem()
         {
             OsuMenu menu = null;
 
@@ -30,9 +30,57 @@ namespace osu.Game.Tests.Visual.UserInterface
                     Origin = Anchor.Centre,
                     Items = new[]
                     {
-                        new TernaryStateMenuItem("First"),
-                        new TernaryStateMenuItem("Second") { State = { BindTarget = state } },
-                        new TernaryStateMenuItem("Third") { State = { Value = TernaryState.True } },
+                        new TernaryStateRadioMenuItem("First"),
+                        new TernaryStateRadioMenuItem("Second") { State = { BindTarget = state } },
+                        new TernaryStateRadioMenuItem("Third") { State = { Value = TernaryState.True } },
+                    }
+                };
+            });
+
+            checkState(TernaryState.Indeterminate);
+
+            click();
+            checkState(TernaryState.True);
+
+            click();
+            checkState(TernaryState.True);
+
+            click();
+            checkState(TernaryState.True);
+
+            AddStep("change state via bindable", () => state.Value = TernaryState.True);
+
+            void click() =>
+                AddStep("click", () =>
+                {
+                    InputManager.MoveMouseTo(menu.ScreenSpaceDrawQuad.Centre);
+                    InputManager.Click(MouseButton.Left);
+                });
+
+            void checkState(TernaryState expected)
+                => AddAssert($"state is {expected}", () => state.Value == expected);
+        }
+
+        [Test]
+        public void TestTernaryToggleMenuItem()
+        {
+            OsuMenu menu = null;
+
+            Bindable<TernaryState> state = new Bindable<TernaryState>(TernaryState.Indeterminate);
+
+            AddStep("create menu", () =>
+            {
+                state.Value = TernaryState.Indeterminate;
+
+                Child = menu = new OsuMenu(Direction.Vertical, true)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Items = new[]
+                    {
+                        new TernaryStateToggleMenuItem("First"),
+                        new TernaryStateToggleMenuItem("Second") { State = { BindTarget = state } },
+                        new TernaryStateToggleMenuItem("Third") { State = { Value = TernaryState.True } },
                     }
                 };
             });
diff --git a/osu.Game/Graphics/UserInterface/TernaryStateMenuItem.cs b/osu.Game/Graphics/UserInterface/TernaryStateMenuItem.cs
index acf4065f49..5c623150b7 100644
--- a/osu.Game/Graphics/UserInterface/TernaryStateMenuItem.cs
+++ b/osu.Game/Graphics/UserInterface/TernaryStateMenuItem.cs
@@ -9,28 +9,17 @@ namespace osu.Game.Graphics.UserInterface
     /// <summary>
     /// An <see cref="OsuMenuItem"/> with three possible states.
     /// </summary>
-    public class TernaryStateMenuItem : StatefulMenuItem<TernaryState>
+    public abstract class TernaryStateMenuItem : StatefulMenuItem<TernaryState>
     {
         /// <summary>
         /// Creates a new <see cref="TernaryStateMenuItem"/>.
         /// </summary>
         /// <param name="text">The text to display.</param>
+        /// <param name="nextStateFunction">A function to inform what the next state should be when this item is clicked.</param>
         /// <param name="type">The type of action which this <see cref="TernaryStateMenuItem"/> performs.</param>
         /// <param name="action">A delegate to be invoked when this <see cref="TernaryStateMenuItem"/> is pressed.</param>
-        public TernaryStateMenuItem(string text, MenuItemType type = MenuItemType.Standard, Action<TernaryState> action = null)
-            : this(text, getNextState, type, action)
-        {
-        }
-
-        /// <summary>
-        /// Creates a new <see cref="TernaryStateMenuItem"/>.
-        /// </summary>
-        /// <param name="text">The text to display.</param>
-        /// <param name="changeStateFunc">A function that mutates a state to another state after this <see cref="TernaryStateMenuItem"/> is pressed.</param>
-        /// <param name="type">The type of action which this <see cref="TernaryStateMenuItem"/> performs.</param>
-        /// <param name="action">A delegate to be invoked when this <see cref="TernaryStateMenuItem"/> is pressed.</param>
-        protected TernaryStateMenuItem(string text, Func<TernaryState, TernaryState> changeStateFunc, MenuItemType type, Action<TernaryState> action)
-            : base(text, changeStateFunc, type, action)
+        protected TernaryStateMenuItem(string text, Func<TernaryState, TernaryState> nextStateFunction, MenuItemType type = MenuItemType.Standard, Action<TernaryState> action = null)
+            : base(text, nextStateFunction, type, action)
         {
         }
 
@@ -47,23 +36,5 @@ namespace osu.Game.Graphics.UserInterface
 
             return null;
         }
-
-        private static TernaryState getNextState(TernaryState state)
-        {
-            switch (state)
-            {
-                case TernaryState.False:
-                    return TernaryState.True;
-
-                case TernaryState.Indeterminate:
-                    return TernaryState.True;
-
-                case TernaryState.True:
-                    return TernaryState.False;
-
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(state), state, null);
-            }
-        }
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/TernaryStateRadioMenuItem.cs b/osu.Game/Graphics/UserInterface/TernaryStateRadioMenuItem.cs
new file mode 100644
index 0000000000..aa83b0567b
--- /dev/null
+++ b/osu.Game/Graphics/UserInterface/TernaryStateRadioMenuItem.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.
+
+using System;
+
+namespace osu.Game.Graphics.UserInterface
+{
+    public class TernaryStateRadioMenuItem : TernaryStateMenuItem
+    {
+        /// <summary>
+        /// Creates a new <see cref="TernaryStateMenuItem"/>.
+        /// </summary>
+        /// <param name="text">The text to display.</param>
+        /// <param name="type">The type of action which this <see cref="TernaryStateMenuItem"/> performs.</param>
+        /// <param name="action">A delegate to be invoked when this <see cref="TernaryStateMenuItem"/> is pressed.</param>
+        public TernaryStateRadioMenuItem(string text, MenuItemType type = MenuItemType.Standard, Action<TernaryState> action = null)
+            : base(text, getNextState, type, action)
+        {
+        }
+
+        private static TernaryState getNextState(TernaryState state) => TernaryState.True;
+    }
+}
diff --git a/osu.Game/Graphics/UserInterface/TernaryStateToggleMenuItem.cs b/osu.Game/Graphics/UserInterface/TernaryStateToggleMenuItem.cs
new file mode 100644
index 0000000000..ce951984fd
--- /dev/null
+++ b/osu.Game/Graphics/UserInterface/TernaryStateToggleMenuItem.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;
+
+namespace osu.Game.Graphics.UserInterface
+{
+    /// <summary>
+    /// A ternary state menu item which toggles the state of this item <c>false</c> if clicked when <c>true</c>.
+    /// </summary>
+    public class TernaryStateToggleMenuItem : TernaryStateMenuItem
+    {
+        /// <summary>
+        /// Creates a new <see cref="TernaryStateToggleMenuItem"/>.
+        /// </summary>
+        /// <param name="text">The text to display.</param>
+        /// <param name="type">The type of action which this <see cref="TernaryStateMenuItem"/> performs.</param>
+        /// <param name="action">A delegate to be invoked when this <see cref="TernaryStateMenuItem"/> is pressed.</param>
+        public TernaryStateToggleMenuItem(string text, MenuItemType type = MenuItemType.Standard, Action<TernaryState> action = null)
+            : base(text, getNextState, type, action)
+        {
+        }
+
+        private static TernaryState getNextState(TernaryState state)
+        {
+            switch (state)
+            {
+                case TernaryState.False:
+                    return TernaryState.True;
+
+                case TernaryState.Indeterminate:
+                    return TernaryState.True;
+
+                case TernaryState.True:
+                    return TernaryState.False;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(state), state, null);
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
index 6ab4ca8267..2141c490df 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorSelectionHandler.cs
@@ -168,13 +168,13 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             if (SelectedBlueprints.All(b => b.Item is IHasComboInformation))
             {
-                yield return new TernaryStateMenuItem("New combo") { State = { BindTarget = SelectionNewComboState } };
+                yield return new TernaryStateToggleMenuItem("New combo") { State = { BindTarget = SelectionNewComboState } };
             }
 
             yield return new OsuMenuItem("Sound")
             {
                 Items = SelectionSampleStates.Select(kvp =>
-                    new TernaryStateMenuItem(kvp.Value.Description) { State = { BindTarget = kvp.Value } }).ToArray()
+                    new TernaryStateToggleMenuItem(kvp.Value.Description) { State = { BindTarget = kvp.Value } }).ToArray()
             };
         }
 
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index d7e901b71e..a3fca3d4e1 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -250,7 +250,7 @@ namespace osu.Game.Screens.Select.Carousel
             else
                 state = TernaryState.False;
 
-            return new TernaryStateMenuItem(collection.Name.Value, MenuItemType.Standard, s =>
+            return new TernaryStateToggleMenuItem(collection.Name.Value, MenuItemType.Standard, s =>
             {
                 foreach (var b in beatmapSet.Beatmaps)
                 {
diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 2eb4ea107d..2cfb9d0f96 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -100,7 +100,7 @@ namespace osu.Game.Skinning.Editor
             foreach (var item in base.GetContextMenuItemsForSelection(selection))
                 yield return item;
 
-            IEnumerable<AnchorMenuItem> createAnchorItems(Func<Drawable, Anchor> checkFunction, Action<Anchor> applyFunction)
+            IEnumerable<TernaryStateMenuItem> createAnchorItems(Func<Drawable, Anchor> checkFunction, Action<Anchor> applyFunction)
             {
                 var displayableAnchors = new[]
                 {
@@ -117,7 +117,7 @@ namespace osu.Game.Skinning.Editor
 
                 return displayableAnchors.Select(a =>
                 {
-                    return new AnchorMenuItem(a, selection, _ => applyFunction(a))
+                    return new TernaryStateRadioMenuItem(a.ToString(), MenuItemType.Standard, _ => applyFunction(a))
                     {
                         State = { Value = GetStateFromSelection(selection, c => checkFunction((Drawable)c.Item) == a) }
                     };
@@ -166,15 +166,5 @@ namespace osu.Game.Skinning.Editor
                 scale.Y = scale.X;
             }
         }
-
-        public class AnchorMenuItem : TernaryStateMenuItem
-        {
-            public AnchorMenuItem(Anchor anchor, IEnumerable<SelectionBlueprint<ISkinnableDrawable>> selection, Action<TernaryState> action)
-                : base(anchor.ToString(), getNextState, MenuItemType.Standard, action)
-            {
-            }
-
-            private static TernaryState getNextState(TernaryState state) => TernaryState.True;
-        }
     }
 }

From ee4bca9ed12d5f65cc55d3b24f1164851c89c746 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 May 2021 19:37:43 +0900
Subject: [PATCH 3636/3722] Handle collection changed event

---
 osu.Game/Screens/Spectate/SpectatorScreen.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Screens/Spectate/SpectatorScreen.cs b/osu.Game/Screens/Spectate/SpectatorScreen.cs
index 0adc5b863f..9a20bb58b8 100644
--- a/osu.Game/Screens/Spectate/SpectatorScreen.cs
+++ b/osu.Game/Screens/Spectate/SpectatorScreen.cs
@@ -127,6 +127,14 @@ namespace osu.Game.Screens.Spectate
                     foreach (var (userId, _) in e.OldItems.AsNonNull())
                         onUserStateRemoved(userId);
                     break;
+
+                case NotifyDictionaryChangedAction.Replace:
+                    foreach (var (userId, _) in e.OldItems.AsNonNull())
+                        onUserStateRemoved(userId);
+
+                    foreach (var (userId, state) in e.NewItems.AsNonNull())
+                        onUserStateAdded(userId, state);
+                    break;
             }
         }
 

From 5a8b8782d34e76faaad394c42cdd597289acf633 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 May 2021 19:44:43 +0900
Subject: [PATCH 3637/3722] Fix WatchUser being called asynchronously in BDL

---
 osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index ed83bbf693..c3bfe19b29 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -55,8 +55,6 @@ namespace osu.Game.Screens.Play.HUD
 
             foreach (var userId in playingUsers)
             {
-                spectatorClient.WatchUser(userId);
-
                 // probably won't be required in the final implementation.
                 var resolvedUser = userLookupCache.GetUserAsync(userId).Result;
 
@@ -80,6 +78,8 @@ namespace osu.Game.Screens.Play.HUD
             // BindableList handles binding in a really bad way (Clear then AddRange) so we need to do this manually..
             foreach (int userId in playingUsers)
             {
+                spectatorClient.WatchUser(userId);
+
                 if (!multiplayerClient.CurrentMatchPlayingUserIds.Contains(userId))
                     usersChanged(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, new[] { userId }));
             }

From 06c99e8c7c259e8ffb712ff5320163b38e0f4aa3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 May 2021 19:45:11 +0900
Subject: [PATCH 3638/3722] Fix race due to StopWatchingUser() being called
 asynchronously

---
 osu.Game/Online/Spectator/SpectatorClient.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
index f930328846..de5e57a1d0 100644
--- a/osu.Game/Online/Spectator/SpectatorClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -182,9 +182,13 @@ namespace osu.Game.Online.Spectator
 
         public void StopWatchingUser(int userId)
         {
-            watchingUsers.Remove(userId);
-
-            StopWatchingUserInternal(userId);
+            // This method is most commonly called via Dispose(), which is asynchronous.
+            // Todo: This should not be a thing, but requires framework changes.
+            Schedule(() =>
+            {
+                watchingUsers.Remove(userId);
+                StopWatchingUserInternal(userId);
+            });
         }
 
         protected abstract Task BeginPlayingInternal(SpectatorState state);

From 1848bd902d11f5053237b8aa15636a96931f3867 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 19:51:07 +0900
Subject: [PATCH 3639/3722] Fix skin editor context menus not dismissing when
 clicking away

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

diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index f24b0c71c0..07a94cac7a 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -19,7 +19,7 @@ using osuTK;
 namespace osu.Game.Skinning.Editor
 {
     [Cached(typeof(SkinEditor))]
-    public class SkinEditor : FocusedOverlayContainer
+    public class SkinEditor : VisibilityContainer
     {
         public const double TRANSITION_DURATION = 500;
 

From 0f4b502fdf8c1f9651d0b81dc6828f8358826d59 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 May 2021 20:09:22 +0900
Subject: [PATCH 3640/3722] Add missing xmldoc

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

diff --git a/osu.Game/Graphics/UserInterface/TernaryStateRadioMenuItem.cs b/osu.Game/Graphics/UserInterface/TernaryStateRadioMenuItem.cs
index aa83b0567b..46eda06294 100644
--- a/osu.Game/Graphics/UserInterface/TernaryStateRadioMenuItem.cs
+++ b/osu.Game/Graphics/UserInterface/TernaryStateRadioMenuItem.cs
@@ -5,6 +5,9 @@ using System;
 
 namespace osu.Game.Graphics.UserInterface
 {
+    /// <summary>
+    /// A ternary state menu item which will always set the item to <c>true</c> on click, even if already <c>true</c>.
+    /// </summary>
     public class TernaryStateRadioMenuItem : TernaryStateMenuItem
     {
         /// <summary>

From c48b5eebdd7346cbea7b37c727f925f12e173c37 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 20 May 2021 15:45:39 +0300
Subject: [PATCH 3641/3722] Don't reload the context when clicking selected
 year button

---
 osu.Game/Overlays/News/Sidebar/YearsPanel.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
index 232b995cd6..b07c9924b9 100644
--- a/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
+++ b/osu.Game/Overlays/News/Sidebar/YearsPanel.cs
@@ -109,7 +109,11 @@ namespace osu.Game.Overlays.News.Sidebar
             {
                 IdleColour = isCurrent ? Color4.White : colourProvider.Light2;
                 HoverColour = isCurrent ? Color4.White : colourProvider.Light1;
-                Action = () => overlay?.ShowYear(Year);
+                Action = () =>
+                {
+                    if (!isCurrent)
+                        overlay?.ShowYear(Year);
+                };
             }
         }
     }

From 40ca94cd7b9e16d32b81b199e7a24f22f191d6ce Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 20 May 2021 16:04:51 +0300
Subject: [PATCH 3642/3722] Fix incorrect year being passed on first load

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

diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index 510cdba020..af3fa9c3b0 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Overlays
                 loadArticle(article.NewValue);
         }
 
-        private void loadFrontPage(int year = 0)
+        private void loadFrontPage(int? year = null)
         {
             beginLoading();
 

From 092d0f9b7678a075011029b3300a07b5d111f70f Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 21 May 2021 01:20:18 +0700
Subject: [PATCH 3643/3722] add breadcrumb header test scene

---
 .../TestSceneBreadcrumbControlHeader.cs       | 86 +++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneBreadcrumbControlHeader.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBreadcrumbControlHeader.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBreadcrumbControlHeader.cs
new file mode 100644
index 0000000000..1439c65a14
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBreadcrumbControlHeader.cs
@@ -0,0 +1,86 @@
+// Copyright (c) ppy 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.Game.Overlays;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneBreadcrumbControlHeader : OsuTestScene
+    {
+        private static readonly string[] items = { "first", "second", "third", "fourth", "fifth" };
+
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Red);
+
+        private TestHeader header;
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            Child = header = new TestHeader
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            };
+        });
+
+        [Test]
+        public void TestAddAndRemoveItem()
+        {
+            foreach (var item in items.Skip(1))
+                AddStep($"Add {item} item", () => header.AddItem(item));
+
+            foreach (var item in items.Reverse().SkipLast(3))
+                AddStep($"Remove {item} item", () => header.RemoveItem(item));
+
+            AddStep($"Clear item", () => header.ClearItem());
+
+            foreach (var item in items)
+                AddStep($"Add {item} item", () => header.AddItem(item));
+
+            foreach (var item in items)
+                AddStep($"Remove {item} item", () => header.RemoveItem(item));
+        }
+
+        private class TestHeader : BreadcrumbControlOverlayHeader
+        {
+            public TestHeader()
+            {
+                TabControl.AddItem(items[0]);
+                Current.Value = items[0];
+            }
+
+            public void AddItem(string value)
+            {
+                TabControl.AddItem(value);
+                Current.Value = TabControl.Items.LastOrDefault();
+            }
+
+            public void RemoveItem(string value)
+            {
+                TabControl.RemoveItem(value);
+                Current.Value = TabControl.Items.LastOrDefault();
+            }
+
+            public void ClearItem()
+            {
+                TabControl.Clear();
+                Current.Value = null;
+            }
+
+            protected override OverlayTitle CreateTitle() => new TestTitle();
+        }
+
+        private class TestTitle : OverlayTitle
+        {
+            public TestTitle()
+            {
+                Title = "Test Title";
+            }
+        }
+    }
+}

From 236124496d208c9bcf554ee36ead97170f5705ce Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 21 May 2021 01:20:38 +0700
Subject: [PATCH 3644/3722] add missing accent colour in control tab item

---
 osu.Game/Overlays/BreadcrumbControlOverlayHeader.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BreadcrumbControlOverlayHeader.cs b/osu.Game/Overlays/BreadcrumbControlOverlayHeader.cs
index 81315f9638..443b3dcf01 100644
--- a/osu.Game/Overlays/BreadcrumbControlOverlayHeader.cs
+++ b/osu.Game/Overlays/BreadcrumbControlOverlayHeader.cs
@@ -26,7 +26,10 @@ namespace osu.Game.Overlays
                 AccentColour = colourProvider.Light2;
             }
 
-            protected override TabItem<string> CreateTabItem(string value) => new ControlTabItem(value);
+            protected override TabItem<string> CreateTabItem(string value) => new ControlTabItem(value)
+            {
+                AccentColour = AccentColour,
+            };
 
             private class ControlTabItem : BreadcrumbTabItem
             {

From b521405ec8f06393b2b1d841dd5ea4a7c148ae66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 20 May 2021 20:46:18 +0200
Subject: [PATCH 3645/3722] Trim redundant string interpolation

---
 .../Visual/UserInterface/TestSceneBreadcrumbControlHeader.cs    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBreadcrumbControlHeader.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBreadcrumbControlHeader.cs
index 1439c65a14..45868b2872 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBreadcrumbControlHeader.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBreadcrumbControlHeader.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             foreach (var item in items.Reverse().SkipLast(3))
                 AddStep($"Remove {item} item", () => header.RemoveItem(item));
 
-            AddStep($"Clear item", () => header.ClearItem());
+            AddStep("Clear item", () => header.ClearItem());
 
             foreach (var item in items)
                 AddStep($"Add {item} item", () => header.AddItem(item));

From f35a07fee729586abf7723a742a146164c866fd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 20 May 2021 20:47:50 +0200
Subject: [PATCH 3646/3722] Rename method for better comprehension

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

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBreadcrumbControlHeader.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBreadcrumbControlHeader.cs
index 45868b2872..90c3e142df 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBreadcrumbControlHeader.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBreadcrumbControlHeader.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             foreach (var item in items.Reverse().SkipLast(3))
                 AddStep($"Remove {item} item", () => header.RemoveItem(item));
 
-            AddStep("Clear item", () => header.ClearItem());
+            AddStep("Clear items", () => header.ClearItems());
 
             foreach (var item in items)
                 AddStep($"Add {item} item", () => header.AddItem(item));
@@ -66,7 +66,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                 Current.Value = TabControl.Items.LastOrDefault();
             }
 
-            public void ClearItem()
+            public void ClearItems()
             {
                 TabControl.Clear();
                 Current.Value = null;

From 895eb14c5ae222877b49cd322409f0ce3736f927 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 21 May 2021 14:09:30 +0900
Subject: [PATCH 3647/3722] Forcefully end playing to fix test failures

---
 osu.Game/Online/Spectator/SpectatorClient.cs | 3 +++
 osu.Game/Screens/Play/Player.cs              | 9 +++++++++
 2 files changed, 12 insertions(+)

diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
index cb98b01bed..3a29e73b8f 100644
--- a/osu.Game/Online/Spectator/SpectatorClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -174,6 +174,9 @@ namespace osu.Game.Online.Spectator
 
         public void EndPlaying()
         {
+            if (!IsPlaying)
+                return;
+
             IsPlaying = false;
             currentBeatmap = null;
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 6317a41bec..39f9e2d388 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -22,6 +22,7 @@ using osu.Game.Configuration;
 using osu.Game.Graphics.Containers;
 using osu.Game.IO.Archives;
 using osu.Game.Online.API;
+using osu.Game.Online.Spectator;
 using osu.Game.Overlays;
 using osu.Game.Replays;
 using osu.Game.Rulesets;
@@ -93,6 +94,9 @@ namespace osu.Game.Screens.Play
         [Resolved]
         private MusicController musicController { get; set; }
 
+        [Resolved]
+        private SpectatorClient spectatorClient { get; set; }
+
         private Sample sampleRestart;
 
         public BreakOverlay BreakOverlay;
@@ -882,6 +886,11 @@ namespace osu.Game.Screens.Play
                 return true;
             }
 
+            // EndPlaying() is typically called from ReplayRecorder.Dispose(). Disposal is currently asynchronous.
+            // To resolve test failures, forcefully end playing synchronously when this screen exits.
+            // Todo: Replace this with a more permanent solution once osu-framework has a synchronous cleanup method.
+            spectatorClient.EndPlaying();
+
             // GameplayClockContainer performs seeks / start / stop operations on the beatmap's track.
             // as we are no longer the current screen, we cannot guarantee the track is still usable.
             (GameplayClockContainer as MasterGameplayClockContainer)?.StopUsingBeatmapClock();

From c00e6e29a6f2c32da0ae882f98344afb94770812 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 May 2021 14:21:56 +0900
Subject: [PATCH 3648/3722] Remove `static` usage

---
 .../Edit/Blueprints/HitPlacementBlueprint.cs              | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Edit/Blueprints/HitPlacementBlueprint.cs b/osu.Game.Rulesets.Taiko/Edit/Blueprints/HitPlacementBlueprint.cs
index 17e7fb81f6..0d0fd136a7 100644
--- a/osu.Game.Rulesets.Taiko/Edit/Blueprints/HitPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Taiko/Edit/Blueprints/HitPlacementBlueprint.cs
@@ -14,10 +14,10 @@ namespace osu.Game.Rulesets.Taiko.Edit.Blueprints
     {
         private readonly HitPiece piece;
 
-        private static Hit hit;
+        public new Hit HitObject => (Hit)base.HitObject;
 
         public HitPlacementBlueprint()
-            : base(hit = new Hit())
+            : base(new Hit())
         {
             InternalChild = piece = new HitPiece
             {
@@ -30,12 +30,12 @@ namespace osu.Game.Rulesets.Taiko.Edit.Blueprints
             switch (e.Button)
             {
                 case MouseButton.Left:
-                    hit.Type = HitType.Centre;
+                    HitObject.Type = HitType.Centre;
                     EndPlacement(true);
                     return true;
 
                 case MouseButton.Right:
-                    hit.Type = HitType.Rim;
+                    HitObject.Type = HitType.Rim;
                     EndPlacement(true);
                     return true;
             }

From 40c8378d81a67b944c63d54a86b413ab70af7cb7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 May 2021 14:37:22 +0900
Subject: [PATCH 3649/3722] Fix type-to-sample mapping being applied too late

---
 .../Objects/Drawables/DrawableHit.cs          | 28 +----------------
 osu.Game.Rulesets.Taiko/Objects/Hit.cs        | 31 ++++++++++++++++++-
 2 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index 38cda69a46..948d2c2f69 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -55,16 +55,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             type.BindValueChanged(_ =>
             {
                 updateActionsFromType();
-
-                // will overwrite samples, should only be called on subsequent changes
-                // after the initial application.
-                updateSamplesFromTypeChange();
-
                 RecreatePieces();
-            });
-
-            // action update also has to happen immediately on application.
-            updateActionsFromType();
+            }, true);
 
             base.OnApply();
         }
@@ -92,24 +84,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             type.Value = getRimSamples().Any() ? HitType.Rim : HitType.Centre;
         }
 
-        private void updateSamplesFromTypeChange()
-        {
-            var rimSamples = getRimSamples();
-
-            bool isRimType = HitObject.Type == HitType.Rim;
-
-            if (isRimType != rimSamples.Any())
-            {
-                if (isRimType)
-                    HitObject.Samples.Add(new HitSampleInfo(HitSampleInfo.HIT_CLAP));
-                else
-                {
-                    foreach (var sample in rimSamples)
-                        HitObject.Samples.Remove(sample);
-                }
-            }
-        }
-
         private void updateActionsFromType()
         {
             HitActions =
diff --git a/osu.Game.Rulesets.Taiko/Objects/Hit.cs b/osu.Game.Rulesets.Taiko/Objects/Hit.cs
index 1b51288605..f4a66c39a8 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Hit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Hit.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.Linq;
 using osu.Framework.Bindables;
+using osu.Game.Audio;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
@@ -15,9 +17,36 @@ namespace osu.Game.Rulesets.Taiko.Objects
         public HitType Type
         {
             get => TypeBindable.Value;
-            set => TypeBindable.Value = value;
+            set
+            {
+                TypeBindable.Value = value;
+                updateSamplesFromType();
+            }
         }
 
+        private void updateSamplesFromType()
+        {
+            var rimSamples = getRimSamples();
+
+            bool isRimType = Type == HitType.Rim;
+
+            if (isRimType != rimSamples.Any())
+            {
+                if (isRimType)
+                    Samples.Add(new HitSampleInfo(HitSampleInfo.HIT_CLAP));
+                else
+                {
+                    foreach (var sample in rimSamples)
+                        Samples.Remove(sample);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns an array of any samples which would cause this object to be a "rim" type hit.
+        /// </summary>
+        private HitSampleInfo[] getRimSamples() => Samples.Where(s => s.Name == HitSampleInfo.HIT_CLAP || s.Name == HitSampleInfo.HIT_WHISTLE).ToArray();
+
         protected override StrongNestedHitObject CreateStrongNestedHit(double startTime) => new StrongNestedHit { StartTime = startTime };
 
         public class StrongNestedHit : StrongNestedHitObject

From f9d51656b6dff672eab55e46eb1bad287d70b84e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 May 2021 15:02:36 +0900
Subject: [PATCH 3650/3722] Fix scaling of rotated items not behaving in an
 understandable way

---
 .../Skinning/Editor/SkinSelectionHandler.cs   | 61 ++++++++++---------
 1 file changed, 33 insertions(+), 28 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 2f9611ba65..accb65483b 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -8,6 +8,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Utils;
 using osu.Game.Extensions;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
@@ -37,40 +38,44 @@ namespace osu.Game.Skinning.Editor
 
             adjustScaleFromAnchor(ref scale, anchor);
 
-            var selectionQuad = GetSurroundingQuad(SelectedBlueprints.SelectMany(b =>
-                b.Item.ScreenSpaceDrawQuad.GetVertices().ToArray()));
+            // the selection quad is always upright, so use an AABB rect to make mutating the values easier.
+            var selectionRect = GetSurroundingQuad(SelectedBlueprints.SelectMany(b =>
+                b.Item.ScreenSpaceDrawQuad.GetVertices().ToArray())).AABBFloat;
 
-            // the selection quad is always upright, so use a rect to make mutating the values easier.
-            var adjustedRect = selectionQuad.AABBFloat;
+            // copy to mutate, as we will need to compare to the original later on.
+            var adjustedRect = selectionRect;
 
-            // for now aspect lock scale adjustments that occur at corners.
-            if (!anchor.HasFlagFast(Anchor.x1) && !anchor.HasFlagFast(Anchor.y1))
-                scale.Y = scale.X / selectionQuad.Width * selectionQuad.Height;
+            // 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;
 
-            if (anchor.HasFlagFast(Anchor.x0))
+            bool shouldAspectLock =
+                // for now aspect lock scale adjustments that occur at corners..
+                (!anchor.HasFlagFast(Anchor.x1) && !anchor.HasFlagFast(Anchor.y1))
+                // ..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).
+                || SelectedBlueprints.Any(b => !Precision.AlmostEquals(((Drawable)b.Item).Rotation % 90, 0));
+
+            if (shouldAspectLock)
             {
-                adjustedRect.X -= scale.X;
-                adjustedRect.Width += scale.X;
-            }
-            else if (anchor.HasFlagFast(Anchor.x2))
-            {
-                adjustedRect.Width += scale.X;
+                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;
+                else
+                    // in all other cases (arbitrarily) use the horizontal component for aspect lock.
+                    scale.Y = scale.X / selectionRect.Width * selectionRect.Height;
             }
 
-            if (anchor.HasFlagFast(Anchor.y0))
-            {
-                adjustedRect.Y -= scale.Y;
-                adjustedRect.Height += scale.Y;
-            }
-            else if (anchor.HasFlagFast(Anchor.y2))
-            {
-                adjustedRect.Height += scale.Y;
-            }
+            if (anchor.HasFlagFast(Anchor.x0)) adjustedRect.X -= scale.X;
+            if (anchor.HasFlagFast(Anchor.y0)) adjustedRect.Y -= scale.Y;
 
-            // scale adjust should match that of the quad itself.
+            adjustedRect.Width += scale.X;
+            adjustedRect.Height += scale.Y;
+
+            // scale adjust applied to each individual item should match that of the quad itself.
             var scaledDelta = new Vector2(
-                adjustedRect.Width / selectionQuad.Width,
-                adjustedRect.Height / selectionQuad.Height
+                adjustedRect.Width / selectionRect.Width,
+                adjustedRect.Height / selectionRect.Height
             );
 
             foreach (var b in SelectedBlueprints)
@@ -82,8 +87,8 @@ namespace osu.Game.Skinning.Editor
 
                 var relativePositionInOriginal =
                     new Vector2(
-                        (screenPosition.X - selectionQuad.TopLeft.X) / selectionQuad.Width,
-                        (screenPosition.Y - selectionQuad.TopLeft.Y) / selectionQuad.Height
+                        (screenPosition.X - selectionRect.TopLeft.X) / selectionRect.Width,
+                        (screenPosition.Y - selectionRect.TopLeft.Y) / selectionRect.Height
                     );
 
                 var newPositionInAdjusted = new Vector2(

From 0d575f572866e84421829b7002ef0b695ad4e59f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 May 2021 15:06:53 +0900
Subject: [PATCH 3651/3722] Remove incorrect (and unintended) modulus logic

---
 osu.Game/Skinning/Editor/SkinSelectionHandler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index accb65483b..0b6d9222ce 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Skinning.Editor
                 (!anchor.HasFlagFast(Anchor.x1) && !anchor.HasFlagFast(Anchor.y1))
                 // ..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).
-                || SelectedBlueprints.Any(b => !Precision.AlmostEquals(((Drawable)b.Item).Rotation % 90, 0));
+                || SelectedBlueprints.Any(b => !Precision.AlmostEquals(((Drawable)b.Item).Rotation, 0));
 
             if (shouldAspectLock)
             {

From fbe4d7e03c2d9e8aca399adb1077f2bf2a47b8b5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 May 2021 15:41:31 +0900
Subject: [PATCH 3652/3722] Improve code quality around cursor and upwards
 passing of response data

---
 .../Overlays/News/Displays/ArticleListing.cs  | 30 +++++++------------
 osu.Game/Overlays/NewsOverlay.cs              |  6 ++--
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/osu.Game/Overlays/News/Displays/ArticleListing.cs b/osu.Game/Overlays/News/Displays/ArticleListing.cs
index e713b3de84..b49326a1f1 100644
--- a/osu.Game/Overlays/News/Displays/ArticleListing.cs
+++ b/osu.Game/Overlays/News/Displays/ArticleListing.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
+using osu.Game.Online.API.Requests.Responses;
 using osuTK;
 
 namespace osu.Game.Overlays.News.Displays
@@ -19,7 +20,7 @@ namespace osu.Game.Overlays.News.Displays
     /// </summary>
     public class ArticleListing : CompositeDrawable
     {
-        public Action<GetNewsResponse> ResponseReceived;
+        public Action<APINewsSidebar> SidebarMetadataUpdated;
 
         [Resolved]
         private IAPIProvider api { get; set; }
@@ -98,34 +99,23 @@ namespace osu.Game.Overlays.News.Displays
 
         private CancellationTokenSource cancellationToken;
 
-        private bool initialLoad = true;
-
         private void onSuccess(GetNewsResponse response)
         {
             cancellationToken?.Cancel();
 
+            // only needs to be updated on the initial load, as the content won't change during pagination.
+            if (lastCursor == null)
+                SidebarMetadataUpdated?.Invoke(response.SidebarMetadata);
+
+            // store cursor for next pagination request.
             lastCursor = response.Cursor;
 
-            var flow = new FillFlowContainer<NewsCard>
+            LoadComponentsAsync(response.NewsPosts.Select(p => new NewsCard(p)).ToList(), loaded =>
             {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
-                Direction = FillDirection.Vertical,
-                Spacing = new Vector2(0, 10),
-                Children = response.NewsPosts.Select(p => new NewsCard(p)).ToList()
-            };
+                content.AddRange(loaded);
 
-            LoadComponentAsync(flow, loaded =>
-            {
-                content.Add(loaded);
                 showMore.IsLoading = false;
-                showMore.Alpha = lastCursor == null ? 0 : 1;
-
-                if (initialLoad)
-                {
-                    ResponseReceived?.Invoke(response);
-                    initialLoad = false;
-                }
+                showMore.Alpha = response.Cursor != null ? 1 : 0;
             }, (cancellationToken = new CancellationTokenSource()).Token);
         }
 
diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index af3fa9c3b0..dd6de40ecb 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -133,11 +133,11 @@ namespace osu.Game.Overlays
             Header.SetFrontPage();
 
             var page = new ArticleListing(year);
-            page.ResponseReceived += r =>
+            page.SidebarMetadataUpdated += metadata => Schedule(() =>
             {
-                sidebar.Metadata.Value = r.SidebarMetadata;
+                sidebar.Metadata.Value = metadata;
                 Loading.Hide();
-            };
+            });
             LoadDisplay(page);
         }
 

From 2fdf8aa1aa49da528b1fb3d7811a957435b7be3d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 21 May 2021 15:57:31 +0900
Subject: [PATCH 3653/3722] Add update thread assertions

---
 osu.Game/Online/Spectator/SpectatorClient.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
index de5e57a1d0..b90fec09d6 100644
--- a/osu.Game/Online/Spectator/SpectatorClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -10,6 +10,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Development;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
@@ -144,6 +145,8 @@ namespace osu.Game.Online.Spectator
 
         public void BeginPlaying(GameplayBeatmap beatmap, Score score)
         {
+            Debug.Assert(ThreadSafety.IsUpdateThread);
+
             if (IsPlaying)
                 throw new InvalidOperationException($"Cannot invoke {nameof(BeginPlaying)} when already playing");
 
@@ -172,6 +175,8 @@ namespace osu.Game.Online.Spectator
 
         public void WatchUser(int userId)
         {
+            Debug.Assert(ThreadSafety.IsUpdateThread);
+
             if (watchingUsers.Contains(userId))
                 return;
 
@@ -219,6 +224,8 @@ namespace osu.Game.Online.Spectator
 
         public void HandleFrame(ReplayFrame frame)
         {
+            Debug.Assert(ThreadSafety.IsUpdateThread);
+
             if (frame is IConvertibleReplayFrame convertible)
                 pendingFrames.Enqueue(convertible.ToLegacy(currentBeatmap));
 

From 7f712a4d04b64b4f9801208048f30f2a272b0a4e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 21 May 2021 15:57:39 +0900
Subject: [PATCH 3654/3722] Fix EndPlaying potentially doing cross-thread
 mutation

---
 osu.Game/Online/Spectator/SpectatorClient.cs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
index b90fec09d6..48e2528528 100644
--- a/osu.Game/Online/Spectator/SpectatorClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -167,10 +167,15 @@ namespace osu.Game.Online.Spectator
 
         public void EndPlaying()
         {
-            IsPlaying = false;
-            currentBeatmap = null;
+            // This method is most commonly called via Dispose(), which is asynchronous.
+            // Todo: This should not be a thing, but requires framework changes.
+            Schedule(() =>
+            {
+                IsPlaying = false;
+                currentBeatmap = null;
 
-            EndPlayingInternal(currentState);
+                EndPlayingInternal(currentState);
+            });
         }
 
         public void WatchUser(int userId)

From 7c59fb37f10874db49102bf4e46e08406a385f60 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 21 May 2021 16:00:58 +0900
Subject: [PATCH 3655/3722] Move check into callback

---
 osu.Game/Online/Spectator/SpectatorClient.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorClient.cs b/osu.Game/Online/Spectator/SpectatorClient.cs
index 9f270a8345..0067a55fd8 100644
--- a/osu.Game/Online/Spectator/SpectatorClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorClient.cs
@@ -167,13 +167,13 @@ namespace osu.Game.Online.Spectator
 
         public void EndPlaying()
         {
-            if (!IsPlaying)
-                return;
-
             // This method is most commonly called via Dispose(), which is asynchronous.
             // Todo: This should not be a thing, but requires framework changes.
             Schedule(() =>
             {
+                if (!IsPlaying)
+                    return;
+
                 IsPlaying = false;
                 currentBeatmap = null;
 

From a5ca736e3729d7a57f414834634531d4c8372c28 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 May 2021 16:10:48 +0900
Subject: [PATCH 3656/3722] Fix `RecreatePieces` being called more than once

---
 .../Objects/Drawables/DrawableHit.cs                | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index 948d2c2f69..f2b1284a95 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -52,15 +52,18 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         protected override void OnApply()
         {
             type.BindTo(HitObject.TypeBindable);
-            type.BindValueChanged(_ =>
-            {
-                updateActionsFromType();
-                RecreatePieces();
-            }, true);
+            // this doesn't need to be run inline as RecreatePieces is called by the base call below.
+            type.BindValueChanged(_ => RecreatePieces());
 
             base.OnApply();
         }
 
+        protected override void RecreatePieces()
+        {
+            updateActionsFromType();
+            base.RecreatePieces();
+        }
+
         protected override void OnFree()
         {
             base.OnFree();

From 7bc8a4bb5fa9e65937340f06560d5ab27ad5ac80 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 May 2021 16:15:27 +0900
Subject: [PATCH 3657/3722] Apply same logic changes to `IsStrong` status

---
 .../Objects/Drawables/DrawableHit.cs          |  9 -----
 .../DrawableTaikoStrongableHitObject.cs       | 36 ++-----------------
 .../Objects/TaikoStrongableHitObject.cs       | 26 +++++++++++++-
 3 files changed, 27 insertions(+), 44 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index f2b1284a95..5cb2024bb7 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -78,15 +78,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             validActionPressed = pressHandledThisFrame = false;
         }
 
-        private HitSampleInfo[] getRimSamples() => HitObject.Samples.Where(s => s.Name == HitSampleInfo.HIT_CLAP || s.Name == HitSampleInfo.HIT_WHISTLE).ToArray();
-
-        protected override void LoadSamples()
-        {
-            base.LoadSamples();
-
-            type.Value = getRimSamples().Any() ? HitType.Rim : HitType.Centre;
-        }
-
         private void updateActionsFromType()
         {
             HitActions =
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs
index 4f1523eb3f..b4acfa9968 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.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.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Audio;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osuTK;
@@ -29,14 +27,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         protected override void OnApply()
         {
             isStrong.BindTo(HitObject.IsStrongBindable);
-            isStrong.BindValueChanged(_ =>
-            {
-                // will overwrite samples, should only be called on subsequent changes
-                // after the initial application.
-                updateSamplesFromStrong();
-
-                RecreatePieces();
-            });
+            // this doesn't need to be run inline as RecreatePieces is called by the base call below.
+            isStrong.BindValueChanged(_ => RecreatePieces());
 
             base.OnApply();
         }
@@ -50,30 +42,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             isStrong.UnbindEvents();
         }
 
-        private HitSampleInfo[] getStrongSamples() => HitObject.Samples.Where(s => s.Name == HitSampleInfo.HIT_FINISH).ToArray();
-
-        protected override void LoadSamples()
-        {
-            base.LoadSamples();
-            isStrong.Value = getStrongSamples().Any();
-        }
-
-        private void updateSamplesFromStrong()
-        {
-            var strongSamples = getStrongSamples();
-
-            if (isStrong.Value != strongSamples.Any())
-            {
-                if (isStrong.Value)
-                    HitObject.Samples.Add(new HitSampleInfo(HitSampleInfo.HIT_FINISH));
-                else
-                {
-                    foreach (var sample in strongSamples)
-                        HitObject.Samples.Remove(sample);
-                }
-            }
-        }
-
         protected override void RecreatePieces()
         {
             base.RecreatePieces();
diff --git a/osu.Game.Rulesets.Taiko/Objects/TaikoStrongableHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/TaikoStrongableHitObject.cs
index fcd055bcec..cac56d1269 100644
--- a/osu.Game.Rulesets.Taiko/Objects/TaikoStrongableHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/TaikoStrongableHitObject.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.Linq;
 using System.Threading;
 using osu.Framework.Bindables;
+using osu.Game.Audio;
 using osu.Game.Rulesets.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Objects
@@ -31,9 +33,31 @@ namespace osu.Game.Rulesets.Taiko.Objects
         public bool IsStrong
         {
             get => IsStrongBindable.Value;
-            set => IsStrongBindable.Value = value;
+            set
+            {
+                IsStrongBindable.Value = value;
+                updateSamplesFromStrong();
+            }
         }
 
+        private void updateSamplesFromStrong()
+        {
+            var strongSamples = getStrongSamples();
+
+            if (IsStrongBindable.Value != strongSamples.Any())
+            {
+                if (IsStrongBindable.Value)
+                    Samples.Add(new HitSampleInfo(HitSampleInfo.HIT_FINISH));
+                else
+                {
+                    foreach (var sample in strongSamples)
+                        Samples.Remove(sample);
+                }
+            }
+        }
+
+        private HitSampleInfo[] getStrongSamples() => Samples.Where(s => s.Name == HitSampleInfo.HIT_FINISH).ToArray();
+
         protected override void CreateNestedHitObjects(CancellationToken cancellationToken)
         {
             base.CreateNestedHitObjects(cancellationToken);

From 0bcd0cda6b1ed7facd0264fae35b133bff7f2f5c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 May 2021 16:41:39 +0900
Subject: [PATCH 3658/3722] Fix taiko drawable hit content not correctly being
 removed on regeneration

---
 .../Objects/Drawables/DrawableTaikoHitObject.cs               | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
index 6041eccb51..6a8d8a611c 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
@@ -137,7 +137,9 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         {
             Size = BaseSize = new Vector2(TaikoHitObject.DEFAULT_SIZE);
 
-            MainPiece?.Expire();
+            if (MainPiece != null)
+                Content.Remove(MainPiece);
+
             Content.Add(MainPiece = CreateMainPiece());
         }
 

From 6471ce902d44fce94676f7a8a73ee4e960a07d40 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 May 2021 16:45:28 +0900
Subject: [PATCH 3659/3722] Run `RecreatePieces` using `AddOnce` to avoid
 multiple unnecessary calls

---
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs        | 2 +-
 .../Objects/Drawables/DrawableTaikoStrongableHitObject.cs       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
index 5cb2024bb7..1e9fc187eb 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         {
             type.BindTo(HitObject.TypeBindable);
             // this doesn't need to be run inline as RecreatePieces is called by the base call below.
-            type.BindValueChanged(_ => RecreatePieces());
+            type.BindValueChanged(_ => Scheduler.AddOnce(RecreatePieces));
 
             base.OnApply();
         }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs
index b4acfa9968..70d4371e99 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoStrongableHitObject.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         {
             isStrong.BindTo(HitObject.IsStrongBindable);
             // this doesn't need to be run inline as RecreatePieces is called by the base call below.
-            isStrong.BindValueChanged(_ => RecreatePieces());
+            isStrong.BindValueChanged(_ => Scheduler.AddOnce(RecreatePieces));
 
             base.OnApply();
         }

From 0c504c3b7d0adad741bf4d6e0fe2f25538644e8c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 May 2021 17:24:22 +0900
Subject: [PATCH 3660/3722] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 90d131b117..57550cfb93 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.513.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.521.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 587bdaf622..1e3b77cd70 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.513.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.521.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
     <PackageReference Include="Sentry" Version="3.3.4" />
     <PackageReference Include="SharpCompress" Version="0.28.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 7ba7a554d6..a2a9ac35fc 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.513.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.521.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.513.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.521.0" />
     <PackageReference Include="SharpCompress" Version="0.28.2" />
     <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 8085a5420580065222be24b465fefcd26b1f60ed Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 May 2021 17:28:25 +0900
Subject: [PATCH 3661/3722] Add test coverage of different grade types to
 `TestSceneResultsScreen`

---
 .../Visual/Ranking/TestSceneAccuracyCircle.cs | 91 +++----------------
 .../Visual/Ranking/TestSceneResultsScreen.cs  | 36 +++++---
 2 files changed, 35 insertions(+), 92 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
index 1e87893f39..f305b7255e 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
@@ -22,82 +22,17 @@ namespace osu.Game.Tests.Visual.Ranking
 {
     public class TestSceneAccuracyCircle : OsuTestScene
     {
-        [Test]
-        public void TestLowDRank()
+        [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 TestRank(double accuracy, ScoreRank rank)
         {
-            var score = createScore();
-            score.Accuracy = 0.2;
-            score.Rank = ScoreRank.D;
-
-            addCircleStep(score);
-        }
-
-        [Test]
-        public void TestDRank()
-        {
-            var score = createScore();
-            score.Accuracy = 0.5;
-            score.Rank = ScoreRank.D;
-
-            addCircleStep(score);
-        }
-
-        [Test]
-        public void TestCRank()
-        {
-            var score = createScore();
-            score.Accuracy = 0.75;
-            score.Rank = ScoreRank.C;
-
-            addCircleStep(score);
-        }
-
-        [Test]
-        public void TestBRank()
-        {
-            var score = createScore();
-            score.Accuracy = 0.85;
-            score.Rank = ScoreRank.B;
-
-            addCircleStep(score);
-        }
-
-        [Test]
-        public void TestARank()
-        {
-            var score = createScore();
-            score.Accuracy = 0.925;
-            score.Rank = ScoreRank.A;
-
-            addCircleStep(score);
-        }
-
-        [Test]
-        public void TestSRank()
-        {
-            var score = createScore();
-            score.Accuracy = 0.975;
-            score.Rank = ScoreRank.S;
-
-            addCircleStep(score);
-        }
-
-        [Test]
-        public void TestAlmostSSRank()
-        {
-            var score = createScore();
-            score.Accuracy = 0.9999;
-            score.Rank = ScoreRank.S;
-
-            addCircleStep(score);
-        }
-
-        [Test]
-        public void TestSSRank()
-        {
-            var score = createScore();
-            score.Accuracy = 1;
-            score.Rank = ScoreRank.X;
+            var score = createScore(accuracy, rank);
 
             addCircleStep(score);
         }
@@ -129,7 +64,7 @@ namespace osu.Game.Tests.Visual.Ranking
             };
         });
 
-        private ScoreInfo createScore() => new ScoreInfo
+        private ScoreInfo createScore(double accuracy, ScoreRank rank) => new ScoreInfo
         {
             User = new User
             {
@@ -139,9 +74,9 @@ namespace osu.Game.Tests.Visual.Ranking
             Beatmap = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo,
             Mods = new Mod[] { new OsuModHardRock(), new OsuModDoubleTime() },
             TotalScore = 2845370,
-            Accuracy = 0.95,
+            Accuracy = accuracy,
             MaxCombo = 999,
-            Rank = ScoreRank.S,
+            Rank = rank,
             Date = DateTimeOffset.Now,
             Statistics =
             {
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
index b2be7cdf88..ba6b6bd529 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
@@ -29,13 +29,8 @@ namespace osu.Game.Tests.Visual.Ranking
     [TestFixture]
     public class TestSceneResultsScreen : OsuManualInputManagerTestScene
     {
-        private BeatmapManager beatmaps;
-
-        [BackgroundDependencyLoader]
-        private void load(BeatmapManager beatmaps)
-        {
-            this.beatmaps = beatmaps;
-        }
+        [Resolved]
+        private BeatmapManager beatmaps { get; set; }
 
         protected override void LoadComplete()
         {
@@ -46,10 +41,6 @@ namespace osu.Game.Tests.Visual.Ranking
                 Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmapInfo);
         }
 
-        private TestResultsScreen createResultsScreen() => new TestResultsScreen(new TestScoreInfo(new OsuRuleset().RulesetInfo));
-
-        private UnrankedSoloResultsScreen createUnrankedSoloResultsScreen() => new UnrankedSoloResultsScreen(new TestScoreInfo(new OsuRuleset().RulesetInfo));
-
         [Test]
         public void TestResultsWithoutPlayer()
         {
@@ -69,12 +60,25 @@ namespace osu.Game.Tests.Visual.Ranking
             AddAssert("retry overlay not present", () => screen.RetryOverlay == null);
         }
 
-        [Test]
-        public void TestResultsWithPlayer()
+        [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;
 
-            AddStep("load results", () => Child = new TestResultsContainer(screen = createResultsScreen()));
+            var score = new TestScoreInfo(new OsuRuleset().RulesetInfo)
+            {
+                Accuracy = accuracy,
+                Rank = rank
+            };
+
+            AddStep("load results", () => Child = new TestResultsContainer(screen = createResultsScreen(score)));
             AddUntilStep("wait for loaded", () => screen.IsLoaded);
             AddAssert("retry overlay present", () => screen.RetryOverlay != null);
         }
@@ -232,6 +236,10 @@ namespace osu.Game.Tests.Visual.Ranking
             AddAssert("download button is enabled", () => screen.ChildrenOfType<DownloadButton>().Last().Enabled.Value);
         }
 
+        private TestResultsScreen createResultsScreen(ScoreInfo score = null) => new TestResultsScreen(score ?? new TestScoreInfo(new OsuRuleset().RulesetInfo));
+
+        private UnrankedSoloResultsScreen createUnrankedSoloResultsScreen() => new UnrankedSoloResultsScreen(new TestScoreInfo(new OsuRuleset().RulesetInfo));
+
         private class TestResultsContainer : Container
         {
             [Cached(typeof(Player))]

From 41c4afb3d592e05ff1ab62003736e3716c7be856 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 May 2021 17:46:25 +0900
Subject: [PATCH 3662/3722] Restore path specification to `"."` for consistency

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

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index dcbfbf1332..5e975de77c 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Beatmaps
 
         protected override string[] HashableFileTypes => new[] { ".osu" };
 
-        protected override string ImportFromStablePath => string.Empty;
+        protected override string ImportFromStablePath => ".";
 
         protected override Storage PrepareStableStorage(StableStorage stableStorage) => stableStorage.GetSongStorage();
 

From abc96057b2cf50e02e0ec939645f6421684495d4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 May 2021 17:55:46 +0900
Subject: [PATCH 3663/3722] Remove relative height specification and use
 constant height

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs         | 3 ++-
 osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 754b260bf0..e31e307d4d 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -96,7 +96,8 @@ namespace osu.Game.Overlays.Mods
             Waves.ThirdWaveColour = Color4Extensions.FromHex(@"005774");
             Waves.FourthWaveColour = Color4Extensions.FromHex(@"003a4e");
 
-            RelativeSizeAxes = Axes.Both;
+            RelativeSizeAxes = Axes.X;
+            Height = HEIGHT;
 
             Padding = new MarginPadding { Horizontal = -OsuScreen.HORIZONTAL_OVERFLOW_PADDING };
 
diff --git a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
index 7395b346a4..a53e253581 100644
--- a/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
@@ -72,8 +72,8 @@ namespace osu.Game.Screens.OnlinePlay.Match
                     Anchor = Anchor.BottomLeft,
                     Origin = Anchor.BottomLeft,
                     Depth = float.MinValue,
-                    RelativeSizeAxes = Axes.Both,
-                    Height = 0.7f,
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
                     Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING },
                     Child = userModsSelectOverlay = new UserModSelectOverlay
                     {

From 0acf4cf85c861c7e144dee9ab1d0d3143dbb10f9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 May 2021 18:44:15 +0900
Subject: [PATCH 3664/3722] Translate remaining `ButtonSystem` strings and
 rename to match class name

---
 ...{MainMenu.ja.resx => ButtonSystem.ja.resx} |  0
 .../{MainMenu.resx => ButtonSystem.resx}      |  0
 osu.Game/Localisation/ButtonSystemStrings.cs  | 44 +++++++++++++++++++
 osu.Game/Localisation/MainMenuStrings.cs      | 24 ----------
 osu.Game/Screens/Menu/ButtonSystem.cs         | 14 +++---
 5 files changed, 51 insertions(+), 31 deletions(-)
 rename osu.Game/Localisation/{MainMenu.ja.resx => ButtonSystem.ja.resx} (100%)
 rename osu.Game/Localisation/{MainMenu.resx => ButtonSystem.resx} (100%)
 create mode 100644 osu.Game/Localisation/ButtonSystemStrings.cs
 delete mode 100644 osu.Game/Localisation/MainMenuStrings.cs

diff --git a/osu.Game/Localisation/MainMenu.ja.resx b/osu.Game/Localisation/ButtonSystem.ja.resx
similarity index 100%
rename from osu.Game/Localisation/MainMenu.ja.resx
rename to osu.Game/Localisation/ButtonSystem.ja.resx
diff --git a/osu.Game/Localisation/MainMenu.resx b/osu.Game/Localisation/ButtonSystem.resx
similarity index 100%
rename from osu.Game/Localisation/MainMenu.resx
rename to osu.Game/Localisation/ButtonSystem.resx
diff --git a/osu.Game/Localisation/ButtonSystemStrings.cs b/osu.Game/Localisation/ButtonSystemStrings.cs
new file mode 100644
index 0000000000..1d26a73360
--- /dev/null
+++ b/osu.Game/Localisation/ButtonSystemStrings.cs
@@ -0,0 +1,44 @@
+// Copyright (c) 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 ButtonSystemStrings
+    {
+        private const string prefix = @"osu.Game.Localisation.ButtonSystem";
+
+        /// <summary>
+        /// "solo"
+        /// </summary>
+        public static LocalisableString Solo => new TranslatableString(getKey(@"solo"), @"solo");
+
+        /// <summary>
+        /// "multi"
+        /// </summary>
+        public static LocalisableString Multi => new TranslatableString(getKey(@"multi"), @"multi");
+
+        /// <summary>
+        /// "playlists"
+        /// </summary>
+        public static LocalisableString Playlists => new TranslatableString(getKey(@"playlists"), @"playlists");
+
+        /// <summary>
+        /// "play"
+        /// </summary>
+        public static LocalisableString Play => new TranslatableString(getKey(@"play"), @"play");
+
+        /// <summary>
+        /// "edit"
+        /// </summary>
+        public static LocalisableString Edit => new TranslatableString(getKey(@"edit"), @"edit");
+
+        /// <summary>
+        /// "browse"
+        /// </summary>
+        public static LocalisableString Browse => new TranslatableString(getKey(@"browse"), @"browse");
+
+        private static string getKey(string key) => $@"{prefix}:{key}";
+    }
+}
diff --git a/osu.Game/Localisation/MainMenuStrings.cs b/osu.Game/Localisation/MainMenuStrings.cs
deleted file mode 100644
index fd9647467a..0000000000
--- a/osu.Game/Localisation/MainMenuStrings.cs
+++ /dev/null
@@ -1,24 +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 MainMenuStrings
-    {
-        private const string prefix = "osu.Game.Localisation.MainMenu";
-
-        /// <summary>
-        /// "solo"
-        /// </summary>
-        public static LocalisableString Solo => new TranslatableString(getKey("solo"), "solo");
-
-        /// <summary>
-        /// "multi"
-        /// </summary>
-        public static LocalisableString Multi => new TranslatableString(getKey("multi"), "multi");
-
-        private static string getKey(string key) => $"{prefix}:{key}";
-    }
-}
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index ff5ad37b9d..c60d1bd4e0 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -125,17 +125,17 @@ namespace osu.Game.Screens.Menu
         [BackgroundDependencyLoader(true)]
         private void load(AudioManager audio, IdleTracker idleTracker, GameHost host, LocalisationManager strings)
         {
-            buttonsPlay.Add(new Button(MainMenuStrings.Solo, @"button-solo-select", FontAwesome.Solid.User, new Color4(102, 68, 204, 255), () => OnSolo?.Invoke(), WEDGE_WIDTH, Key.P));
-            buttonsPlay.Add(new Button(MainMenuStrings.Multi, @"button-generic-select", FontAwesome.Solid.Users, new Color4(94, 63, 186, 255), onMultiplayer, 0, Key.M));
-            buttonsPlay.Add(new Button(@"playlists", @"button-generic-select", OsuIcon.Charts, new Color4(94, 63, 186, 255), onPlaylists, 0, Key.L));
+            buttonsPlay.Add(new Button(ButtonSystemStrings.Solo, @"button-solo-select", FontAwesome.Solid.User, new Color4(102, 68, 204, 255), () => OnSolo?.Invoke(), WEDGE_WIDTH, Key.P));
+            buttonsPlay.Add(new Button(ButtonSystemStrings.Multi, @"button-generic-select", FontAwesome.Solid.Users, new Color4(94, 63, 186, 255), onMultiplayer, 0, Key.M));
+            buttonsPlay.Add(new Button(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 Button(@"play", @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));
-            buttonsTopLevel.Add(new Button(@"edit", @"button-edit-select", OsuIcon.EditCircle, new Color4(238, 170, 0, 255), () => OnEdit?.Invoke(), 0, Key.E));
-            buttonsTopLevel.Add(new Button(@"browse", @"button-direct-select", OsuIcon.ChevronDownCircle, new Color4(165, 204, 0, 255), () => OnBeatmapListing?.Invoke(), 0, Key.D));
+            buttonsTopLevel.Add(new Button(ButtonSystemStrings.Play, @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));
+            buttonsTopLevel.Add(new Button(ButtonSystemStrings.Edit, @"button-edit-select", OsuIcon.EditCircle, new Color4(238, 170, 0, 255), () => OnEdit?.Invoke(), 0, Key.E));
+            buttonsTopLevel.Add(new Button(ButtonSystemStrings.Browse, @"button-direct-select", OsuIcon.ChevronDownCircle, new Color4(165, 204, 0, 255), () => OnBeatmapListing?.Invoke(), 0, Key.D));
 
             if (host.CanExit)
-                buttonsTopLevel.Add(new Button(@"exit", string.Empty, OsuIcon.CrossCircle, new Color4(238, 51, 153, 255), () => OnExit?.Invoke(), 0, Key.Q));
+                buttonsTopLevel.Add(new Button("exit", string.Empty, OsuIcon.CrossCircle, new Color4(238, 51, 153, 255), () => OnExit?.Invoke(), 0, Key.Q));
 
             buttonArea.AddRange(buttonsPlay);
             buttonArea.AddRange(buttonsTopLevel);

From bf4db60ef4b2ec73fdc114ad07716582027373dc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 May 2021 18:48:42 +0900
Subject: [PATCH 3665/3722] Remove placeholder translations

---
 osu.Game/Localisation/Common.ja.resx | 17 -----------------
 osu.Game/Localisation/Common.resx    | 17 -----------------
 2 files changed, 34 deletions(-)
 delete mode 100644 osu.Game/Localisation/Common.ja.resx
 delete mode 100644 osu.Game/Localisation/Common.resx

diff --git a/osu.Game/Localisation/Common.ja.resx b/osu.Game/Localisation/Common.ja.resx
deleted file mode 100644
index 174751c455..0000000000
--- a/osu.Game/Localisation/Common.ja.resx
+++ /dev/null
@@ -1,17 +0,0 @@
-<root>
-    <resheader name="resmimetype">
-        <value>text/microsoft-resx</value>
-    </resheader>
-    <resheader name="version">
-        <value>1.3</value>
-    </resheader>
-    <resheader name="reader">
-        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <resheader name="writer">
-        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <data name="cancel" xml:space="preserve">
-        <value>やめとくわ</value>
-    </data>
-</root>
diff --git a/osu.Game/Localisation/Common.resx b/osu.Game/Localisation/Common.resx
deleted file mode 100644
index f63fb90086..0000000000
--- a/osu.Game/Localisation/Common.resx
+++ /dev/null
@@ -1,17 +0,0 @@
-<root>
-    <resheader name="resmimetype">
-        <value>text/microsoft-resx</value>
-    </resheader>
-    <resheader name="version">
-        <value>1.3</value>
-    </resheader>
-    <resheader name="reader">
-        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <resheader name="writer">
-        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <data name="cancel" xml:space="preserve">
-        <value>Cancel</value>
-    </data>
-</root>

From cd3f5433942133703acaa0822b9d444efc9218ba Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 22 May 2021 02:32:55 +0900
Subject: [PATCH 3666/3722] Add LocalisationAnalyser package and tools

---
 .config/dotnet-tools.json | 8 +++++++-
 osu.Game/osu.Game.csproj  | 4 ++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 58c24181d3..54d9ff3077 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -31,6 +31,12 @@
       "commands": [
         "CodeFileSanity"
       ]
+    },
+    "ppy.localisationanalyser.tools": {
+      "version": "2021.521.1",
+      "commands": [
+        "localisation"
+      ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 587bdaf622..385aa5c7e1 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,6 +29,10 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="ppy.LocalisationAnalyser" Version="2021.521.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="ppy.osu.Framework" Version="2021.513.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
     <PackageReference Include="Sentry" Version="3.3.4" />

From 2fc53017fc11c428a552a5af273487a8147810d6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 22 May 2021 13:46:09 +0900
Subject: [PATCH 3667/3722] Generate initial resx files

---
 osu.Game/Localisation/ButtonSystem.resx  | 94 ++++++++++++++++++++----
 osu.Game/Localisation/Chat.resx          | 67 +++++++++++++++++
 osu.Game/Localisation/Common.resx        | 64 ++++++++++++++++
 osu.Game/Localisation/Notifications.resx | 67 +++++++++++++++++
 osu.Game/Localisation/NowPlaying.resx    | 67 +++++++++++++++++
 osu.Game/Localisation/Settings.resx      | 67 +++++++++++++++++
 6 files changed, 410 insertions(+), 16 deletions(-)
 create mode 100644 osu.Game/Localisation/Chat.resx
 create mode 100644 osu.Game/Localisation/Common.resx
 create mode 100644 osu.Game/Localisation/Notifications.resx
 create mode 100644 osu.Game/Localisation/NowPlaying.resx
 create mode 100644 osu.Game/Localisation/Settings.resx

diff --git a/osu.Game/Localisation/ButtonSystem.resx b/osu.Game/Localisation/ButtonSystem.resx
index 845b412d88..1c6f614c46 100644
--- a/osu.Game/Localisation/ButtonSystem.resx
+++ b/osu.Game/Localisation/ButtonSystem.resx
@@ -1,17 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
 <root>
-    <resheader name="resmimetype">
-        <value>text/microsoft-resx</value>
-    </resheader>
-    <resheader name="version">
-        <value>1.3</value>
-    </resheader>
-    <resheader name="reader">
-        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <resheader name="writer">
-        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-    </resheader>
-    <data name="solo" xml:space="preserve">
-        <value>solo</value>
-    </data>
-</root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.NetStandard.ResXResourceReader, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.NetStandard.ResXResourceWriter, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </resheader>
+  <data name="solo" xml:space="preserve">
+    <value>solo</value>
+  </data>
+  <data name="multi" xml:space="preserve">
+    <value>multi</value>
+  </data>
+  <data name="playlists" xml:space="preserve">
+    <value>playlists</value>
+  </data>
+  <data name="play" xml:space="preserve">
+    <value>play</value>
+  </data>
+  <data name="edit" xml:space="preserve">
+    <value>edit</value>
+  </data>
+  <data name="browse" xml:space="preserve">
+    <value>browse</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/osu.Game/Localisation/Chat.resx b/osu.Game/Localisation/Chat.resx
new file mode 100644
index 0000000000..3762f800c5
--- /dev/null
+++ b/osu.Game/Localisation/Chat.resx
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.NetStandard.ResXResourceReader, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.NetStandard.ResXResourceWriter, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </resheader>
+  <data name="header_title" xml:space="preserve">
+    <value>chat</value>
+  </data>
+  <data name="header_description" xml:space="preserve">
+    <value>join the real-time discussion</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/osu.Game/Localisation/Common.resx b/osu.Game/Localisation/Common.resx
new file mode 100644
index 0000000000..8a3ae29c77
--- /dev/null
+++ b/osu.Game/Localisation/Common.resx
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.NetStandard.ResXResourceReader, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.NetStandard.ResXResourceWriter, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </resheader>
+  <data name="cancel" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/osu.Game/Localisation/Notifications.resx b/osu.Game/Localisation/Notifications.resx
new file mode 100644
index 0000000000..d61e5744e4
--- /dev/null
+++ b/osu.Game/Localisation/Notifications.resx
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.NetStandard.ResXResourceReader, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.NetStandard.ResXResourceWriter, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </resheader>
+  <data name="header_title" xml:space="preserve">
+    <value>notifications</value>
+  </data>
+  <data name="header_description" xml:space="preserve">
+    <value>waiting for 'ya</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/osu.Game/Localisation/NowPlaying.resx b/osu.Game/Localisation/NowPlaying.resx
new file mode 100644
index 0000000000..71df15e488
--- /dev/null
+++ b/osu.Game/Localisation/NowPlaying.resx
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.NetStandard.ResXResourceReader, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.NetStandard.ResXResourceWriter, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </resheader>
+  <data name="header_title" xml:space="preserve">
+    <value>now playing</value>
+  </data>
+  <data name="header_description" xml:space="preserve">
+    <value>manage the currently playing track</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/osu.Game/Localisation/Settings.resx b/osu.Game/Localisation/Settings.resx
new file mode 100644
index 0000000000..1770147dd9
--- /dev/null
+++ b/osu.Game/Localisation/Settings.resx
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.NetStandard.ResXResourceReader, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.NetStandard.ResXResourceWriter, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </resheader>
+  <data name="header_title" xml:space="preserve">
+    <value>settings</value>
+  </data>
+  <data name="header_description" xml:space="preserve">
+    <value>change the way osu! behaves</value>
+  </data>
+</root>
\ No newline at end of file

From b6db9ef3346cf75a1b3c9fdaefebec7f76cd208e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 22 May 2021 13:54:52 +0900
Subject: [PATCH 3668/3722] Fill out Japanese localisation via resx

---
 osu.Game/Localisation/ButtonSystem.ja.resx | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Localisation/ButtonSystem.ja.resx b/osu.Game/Localisation/ButtonSystem.ja.resx
index 20c85110ad..54c956758c 100644
--- a/osu.Game/Localisation/ButtonSystem.ja.resx
+++ b/osu.Game/Localisation/ButtonSystem.ja.resx
@@ -14,4 +14,19 @@
     <data name="solo" xml:space="preserve">
         <value>ソロ</value>
     </data>
-</root>
\ No newline at end of file
+    <data name="playlists" xml:space="preserve">
+        <value>プレイリスト</value>
+    </data>
+    <data name="play" xml:space="preserve">
+        <value>遊ぶ</value>
+    </data>
+    <data name="multi" xml:space="preserve">
+        <value>マルチ</value>
+    </data>
+    <data name="edit" xml:space="preserve">
+        <value>エディット</value>
+    </data>
+    <data name="browse" xml:space="preserve">
+        <value>ブラウズ</value>
+    </data>
+</root>

From fb5672814d6e558881d0101fb5a68799aa047fd1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 22 May 2021 13:55:15 +0900
Subject: [PATCH 3669/3722] Add remaining strings for `ButtonSystem`

---
 osu.Game/Localisation/ButtonSystem.ja.resx   |  6 ++++++
 osu.Game/Localisation/ButtonSystem.resx      |  9 +++++++++
 osu.Game/Localisation/ButtonSystemStrings.cs | 17 ++++++++++++++++-
 osu.Game/Screens/Menu/ButtonSystem.cs        |  6 +++---
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Localisation/ButtonSystem.ja.resx b/osu.Game/Localisation/ButtonSystem.ja.resx
index 54c956758c..02f3e7ce2f 100644
--- a/osu.Game/Localisation/ButtonSystem.ja.resx
+++ b/osu.Game/Localisation/ButtonSystem.ja.resx
@@ -29,4 +29,10 @@
     <data name="browse" xml:space="preserve">
         <value>ブラウズ</value>
     </data>
+    <data name="exit" xml:space="preserve">
+        <value>閉じる</value>
+    </data>
+    <data name="settings" xml:space="preserve">
+        <value>設定</value>
+    </data>
 </root>
diff --git a/osu.Game/Localisation/ButtonSystem.resx b/osu.Game/Localisation/ButtonSystem.resx
index 1c6f614c46..e8f555b6c3 100644
--- a/osu.Game/Localisation/ButtonSystem.resx
+++ b/osu.Game/Localisation/ButtonSystem.resx
@@ -76,4 +76,13 @@
   <data name="browse" xml:space="preserve">
     <value>browse</value>
   </data>
+  <data name="settings" xml:space="preserve">
+    <value>settings</value>
+  </data>
+  <data name="back" xml:space="preserve">
+    <value>back</value>
+  </data>
+  <data name="exit" xml:space="preserve">
+    <value>exit</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/osu.Game/Localisation/ButtonSystemStrings.cs b/osu.Game/Localisation/ButtonSystemStrings.cs
index 1d26a73360..8083f80782 100644
--- a/osu.Game/Localisation/ButtonSystemStrings.cs
+++ b/osu.Game/Localisation/ButtonSystemStrings.cs
@@ -39,6 +39,21 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString Browse => new TranslatableString(getKey(@"browse"), @"browse");
 
+        /// <summary>
+        /// "settings"
+        /// </summary>
+        public static LocalisableString Settings => new TranslatableString(getKey(@"settings"), @"settings");
+
+        /// <summary>
+        /// "back"
+        /// </summary>
+        public static LocalisableString Back => new TranslatableString(getKey(@"back"), @"back");
+
+        /// <summary>
+        /// "exit"
+        /// </summary>
+        public static LocalisableString Exit => new TranslatableString(getKey(@"exit"), @"exit");
+
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
-}
+}
\ No newline at end of file
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index c60d1bd4e0..a836f7bf09 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -99,8 +99,8 @@ namespace osu.Game.Screens.Menu
 
             buttonArea.AddRange(new Drawable[]
             {
-                new Button(@"settings", string.Empty, FontAwesome.Solid.Cog, new Color4(85, 85, 85, 255), () => OnSettings?.Invoke(), -WEDGE_WIDTH, Key.O),
-                backButton = new Button(@"back", @"button-back-select", OsuIcon.LeftCircle, new Color4(51, 58, 94, 255), () => State = ButtonSystemState.TopLevel, -WEDGE_WIDTH)
+                new Button(ButtonSystemStrings.Settings, string.Empty, FontAwesome.Solid.Cog, new Color4(85, 85, 85, 255), () => OnSettings?.Invoke(), -WEDGE_WIDTH, Key.O),
+                backButton = new Button(ButtonSystemStrings.Back, @"button-back-select", OsuIcon.LeftCircle, new Color4(51, 58, 94, 255), () => State = ButtonSystemState.TopLevel, -WEDGE_WIDTH)
                 {
                     VisibleState = ButtonSystemState.Play,
                 },
@@ -135,7 +135,7 @@ namespace osu.Game.Screens.Menu
             buttonsTopLevel.Add(new Button(ButtonSystemStrings.Browse, @"button-direct-select", OsuIcon.ChevronDownCircle, new Color4(165, 204, 0, 255), () => OnBeatmapListing?.Invoke(), 0, Key.D));
 
             if (host.CanExit)
-                buttonsTopLevel.Add(new Button("exit", string.Empty, OsuIcon.CrossCircle, new Color4(238, 51, 153, 255), () => OnExit?.Invoke(), 0, Key.Q));
+                buttonsTopLevel.Add(new Button(ButtonSystemStrings.Exit, string.Empty, OsuIcon.CrossCircle, new Color4(238, 51, 153, 255), () => OnExit?.Invoke(), 0, Key.Q));
 
             buttonArea.AddRange(buttonsPlay);
             buttonArea.AddRange(buttonsTopLevel);

From 7d88a19d7f67bc540646eed0992ba909fd51990b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 22 May 2021 21:03:40 +0900
Subject: [PATCH 3670/3722] Remove unnecessary field storage of origin
 reference

---
 osu.Game/Skinning/Editor/SkinSelectionHandler.cs | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 7f04252c6b..7d9ed6b46c 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -20,17 +20,9 @@ namespace osu.Game.Skinning.Editor
 {
     public class SkinSelectionHandler : SelectionHandler<ISkinnableDrawable>
     {
-        private Vector2? referenceOrigin;
-
         [Resolved]
         private SkinEditor skinEditor { get; set; }
 
-        protected override void OnOperationEnded()
-        {
-            base.OnOperationEnded();
-            referenceOrigin = null;
-        }
-
         public override bool HandleRotation(float angle)
         {
             if (SelectedBlueprints.Count == 1)
@@ -42,13 +34,11 @@ namespace osu.Game.Skinning.Editor
             {
                 var selectionQuad = getSelectionQuad();
 
-                referenceOrigin ??= selectionQuad.Centre;
-
                 foreach (var b in SelectedBlueprints)
                 {
                     var drawableItem = (Drawable)b.Item;
 
-                    drawableItem.Position = drawableItem.Parent.ToLocalSpace(RotatePointAroundOrigin(b.ScreenSpaceSelectionPoint, referenceOrigin.Value, angle)) - drawableItem.AnchorPosition;
+                    drawableItem.Position = drawableItem.Parent.ToLocalSpace(RotatePointAroundOrigin(b.ScreenSpaceSelectionPoint, selectionQuad.Centre, angle)) - drawableItem.AnchorPosition;
                     drawableItem.Rotation += angle;
                 }
             }

From 2fd0038154082ec3d622aa3ddff0e25ee29684ad Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Sat, 22 May 2021 16:42:20 -0700
Subject: [PATCH 3671/3722] Fix checkmark being hidden after clicking current
 waveform opacity setting

---
 osu.Game/Screens/Edit/WaveformOpacityMenuItem.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/WaveformOpacityMenuItem.cs b/osu.Game/Screens/Edit/WaveformOpacityMenuItem.cs
index 053c2fa4b0..7e095f526e 100644
--- a/osu.Game/Screens/Edit/WaveformOpacityMenuItem.cs
+++ b/osu.Game/Screens/Edit/WaveformOpacityMenuItem.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Screens.Edit
     {
         private readonly Bindable<float> waveformOpacity;
 
-        private readonly Dictionary<float, ToggleMenuItem> menuItemLookup = new Dictionary<float, ToggleMenuItem>();
+        private readonly Dictionary<float, TernaryStateRadioMenuItem> menuItemLookup = new Dictionary<float, TernaryStateRadioMenuItem>();
 
         public WaveformOpacityMenuItem(Bindable<float> waveformOpacity)
             : base("Waveform opacity")
@@ -29,13 +29,13 @@ namespace osu.Game.Screens.Edit
             waveformOpacity.BindValueChanged(opacity =>
             {
                 foreach (var kvp in menuItemLookup)
-                    kvp.Value.State.Value = kvp.Key == opacity.NewValue;
+                    kvp.Value.State.Value = kvp.Key == opacity.NewValue ? TernaryState.True : TernaryState.False;
             }, true);
         }
 
-        private ToggleMenuItem createMenuItem(float opacity)
+        private TernaryStateRadioMenuItem createMenuItem(float opacity)
         {
-            var item = new ToggleMenuItem($"{opacity * 100}%", MenuItemType.Standard, _ => updateOpacity(opacity));
+            var item = new TernaryStateRadioMenuItem($"{opacity * 100}%", MenuItemType.Standard, _ => updateOpacity(opacity));
             menuItemLookup[opacity] = item;
             return item;
         }

From caa2c5638e2695dae4719613edcdf49e00c57cb0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 23 May 2021 16:46:32 +0900
Subject: [PATCH 3672/3722] Fix legacy combo counter not accounting for song
 progress bar

---
 osu.Game/Skinning/LegacySkin.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 7a64f38840..fb9cf47cb7 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -338,6 +338,7 @@ namespace osu.Game.Skinning
                             {
                                 var score = container.OfType<LegacyScoreCounter>().FirstOrDefault();
                                 var accuracy = container.OfType<GameplayAccuracyCounter>().FirstOrDefault();
+                                var combo = container.OfType<LegacyComboCounter>().FirstOrDefault();
 
                                 if (score != null && accuracy != null)
                                 {
@@ -353,9 +354,12 @@ namespace osu.Game.Skinning
                                     hitError.Anchor = Anchor.BottomCentre;
                                     hitError.Origin = Anchor.CentreLeft;
                                     hitError.Rotation = -90;
+                                }
 
-                                    if (songProgress != null)
-                                        hitError.Y -= SongProgress.MAX_HEIGHT;
+                                if (songProgress != null)
+                                {
+                                    if (hitError != null) hitError.Y -= SongProgress.MAX_HEIGHT;
+                                    if (combo != null) combo.Y -= SongProgress.MAX_HEIGHT;
                                 }
                             })
                             {

From b8a5b5aaf8b7097f0b1a0be57156a5fd15aefa0a Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Sun, 23 May 2021 17:22:31 +0700
Subject: [PATCH 3673/3722] add test for image block and inline image

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

diff --git a/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs
index 3731e7a782..67030631b0 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs
@@ -120,6 +120,29 @@ needs_cleanup: true
             });
         }
 
+        [Test]
+        public void TestBlockImage()
+        {
+            AddStep("Add paragraph with block image", () =>
+            {
+                markdownContainer.CurrentPath = "Interface/";
+                markdownContainer.Text = @"Line before image
+
+![play menu](img/play-menu.jpg ""Main Menu in osu!"")
+
+Line after image";
+            });
+        }
+
+        [Test]
+        public void TestInlineImage()
+        {
+            AddStep("Add inline image", () =>
+            {
+                markdownContainer.Text = "![osu! mode icon](/wiki/shared/mode/osu.png) osu!";
+            });
+        }
+
         private class TestMarkdownContainer : WikiMarkdownContainer
         {
             public LinkInline Link;

From bbfd7ea23f622f96bcec0f0d4713068bd1eda920 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 23 May 2021 21:20:08 +0900
Subject: [PATCH 3674/3722] Ensure `RegenerateAutoplay` is only run once per
 frame

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

diff --git a/osu.Game/Rulesets/Edit/DrawableEditorRulesetWrapper.cs b/osu.Game/Rulesets/Edit/DrawableEditorRulesetWrapper.cs
index 62e2539c2a..8166e6b8ce 100644
--- a/osu.Game/Rulesets/Edit/DrawableEditorRulesetWrapper.cs
+++ b/osu.Game/Rulesets/Edit/DrawableEditorRulesetWrapper.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Rulesets.Edit
             }
         }
 
-        private void updateReplay() => drawableRuleset.RegenerateAutoplay();
+        private void updateReplay() => Scheduler.AddOnce(drawableRuleset.RegenerateAutoplay);
 
         private void addHitObject(HitObject hitObject)
         {

From 6751d79ce8ef94b465360384c7d8ffbaca84330c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 23 May 2021 16:21:27 +0300
Subject: [PATCH 3675/3722] Fix oversight in HUD overlay components top
 positioning logic

---
 osu.Game/Screens/Play/HUDOverlay.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index ab5b01cab6..16285ab035 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -176,10 +176,7 @@ namespace osu.Game.Screens.Play
             foreach (var element in mainComponents.Components.Cast<Drawable>())
             {
                 // for now align top-right components with the bottom-edge of the lowest top-anchored hud element.
-                if (!element.RelativeSizeAxes.HasFlagFast(Axes.X))
-                    continue;
-
-                if (element.Anchor.HasFlagFast(Anchor.TopRight))
+                if (element.Anchor.HasFlagFast(Anchor.TopRight) || (element.Anchor.HasFlagFast(Anchor.y0) && element.RelativeSizeAxes == Axes.X))
                 {
                     // health bars are excluded for the sake of hacky legacy skins which extend the health bar to take up the full screen area.
                     if (element is LegacyHealthDisplay)

From d605b6bb8db010c73a59129d93185466a3ee3a8c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sun, 23 May 2021 16:22:51 +0300
Subject: [PATCH 3676/3722] Fix HUD overlay components bottom positioning logic
 accounting for combo

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

diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs
index 16285ab035..31bb640d17 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -186,7 +186,8 @@ namespace osu.Game.Screens.Play
                     if (lowestTopScreenSpace == null || bottomRight.Y > lowestTopScreenSpace.Value.Y)
                         lowestTopScreenSpace = bottomRight;
                 }
-                else if (element.Anchor.HasFlagFast(Anchor.y2))
+                // and align bottom-right components with the top-edge of the highest bottom-anchored hud element.
+                else if (element.Anchor.HasFlagFast(Anchor.BottomRight) || (element.Anchor.HasFlagFast(Anchor.y2) && element.RelativeSizeAxes == Axes.X))
                 {
                     var topLeft = element.ScreenSpaceDrawQuad.TopLeft;
                     if (highestBottomScreenSpace == null || topLeft.Y < highestBottomScreenSpace.Value.Y)

From 593fea0d5fe8ae8a9286a41b967833fab1443c2d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 May 2021 13:14:18 +0900
Subject: [PATCH 3677/3722] Limit automatically calculated HUD offsets to keep
 menu items on screen

---
 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 31bb640d17..676d7f10e1 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -196,12 +196,12 @@ namespace osu.Game.Screens.Play
             }
 
             if (lowestTopScreenSpace.HasValue)
-                topRightElements.Y = TopScoringElementsHeight = ToLocalSpace(lowestTopScreenSpace.Value).Y;
+                topRightElements.Y = TopScoringElementsHeight = Math.Max(0, ToLocalSpace(lowestTopScreenSpace.Value).Y);
             else
                 topRightElements.Y = 0;
 
             if (highestBottomScreenSpace.HasValue)
-                bottomRightElements.Y = BottomScoringElementsHeight = -(DrawHeight - ToLocalSpace(highestBottomScreenSpace.Value).Y);
+                bottomRightElements.Y = BottomScoringElementsHeight = -Math.Max(0, (DrawHeight - ToLocalSpace(highestBottomScreenSpace.Value).Y));
             else
                 bottomRightElements.Y = 0;
         }

From 83981b692eda95bf0ea97faedfc92381cf2fb370 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 May 2021 13:44:13 +0900
Subject: [PATCH 3678/3722] Also handle items exiting bounds on the opposite
 side

---
 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 676d7f10e1..ffe03815f5 100644
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@@ -196,12 +196,12 @@ namespace osu.Game.Screens.Play
             }
 
             if (lowestTopScreenSpace.HasValue)
-                topRightElements.Y = TopScoringElementsHeight = Math.Max(0, ToLocalSpace(lowestTopScreenSpace.Value).Y);
+                topRightElements.Y = TopScoringElementsHeight = MathHelper.Clamp(ToLocalSpace(lowestTopScreenSpace.Value).Y, 0, DrawHeight - topRightElements.DrawHeight);
             else
                 topRightElements.Y = 0;
 
             if (highestBottomScreenSpace.HasValue)
-                bottomRightElements.Y = BottomScoringElementsHeight = -Math.Max(0, (DrawHeight - ToLocalSpace(highestBottomScreenSpace.Value).Y));
+                bottomRightElements.Y = BottomScoringElementsHeight = -MathHelper.Clamp(DrawHeight - ToLocalSpace(highestBottomScreenSpace.Value).Y, 0, DrawHeight - bottomRightElements.DrawHeight);
             else
                 bottomRightElements.Y = 0;
         }

From 7494ddeef40293f989c412e51438e450dd93997b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 24 May 2021 14:07:40 +0900
Subject: [PATCH 3679/3722] Fix DHOs not receiving initial skin changed events

---
 .../Objects/Drawables/DrawableHitObject.cs       | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 86c733c392..cc663c37af 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -172,7 +172,13 @@ namespace osu.Game.Rulesets.Objects.Drawables
             base.AddInternal(Samples = new PausableSkinnableSound());
 
             CurrentSkin = skinSource;
-            CurrentSkin.SourceChanged += onSkinSourceChanged;
+            CurrentSkin.SourceChanged += skinSourceChanged;
+        }
+
+        protected override void LoadAsyncComplete()
+        {
+            base.LoadAsyncComplete();
+            skinChanged();
         }
 
         protected override void LoadComplete()
@@ -495,7 +501,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         protected ISkinSource CurrentSkin { get; private set; }
 
-        private void onSkinSourceChanged() => Scheduler.AddOnce(() =>
+        private void skinSourceChanged() => Scheduler.AddOnce(skinChanged);
+
+        private void skinChanged()
         {
             UpdateComboColour();
 
@@ -503,7 +511,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
             if (IsLoaded)
                 updateState(State.Value, true);
-        });
+        }
 
         protected void UpdateComboColour()
         {
@@ -747,7 +755,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             if (HitObject != null)
                 HitObject.DefaultsApplied -= onDefaultsApplied;
 
-            CurrentSkin.SourceChanged -= onSkinSourceChanged;
+            CurrentSkin.SourceChanged -= skinSourceChanged;
         }
     }
 

From 06fe0563d30d515a40729c7946ed326c41292ac7 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 24 May 2021 08:26:44 +0300
Subject: [PATCH 3680/3722] Move GetNewsRequest from ArticleListing to
 NewsOverlay

---
 .../Overlays/News/Displays/ArticleListing.cs  | 46 ++++------------
 osu.Game/Overlays/NewsOverlay.cs              | 54 ++++++++++++++++---
 2 files changed, 56 insertions(+), 44 deletions(-)

diff --git a/osu.Game/Overlays/News/Displays/ArticleListing.cs b/osu.Game/Overlays/News/Displays/ArticleListing.cs
index b49326a1f1..b554b462a9 100644
--- a/osu.Game/Overlays/News/Displays/ArticleListing.cs
+++ b/osu.Game/Overlays/News/Displays/ArticleListing.cs
@@ -8,9 +8,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
-using osu.Game.Online.API.Requests.Responses;
 using osuTK;
 
 namespace osu.Game.Overlays.News.Displays
@@ -20,26 +18,20 @@ namespace osu.Game.Overlays.News.Displays
     /// </summary>
     public class ArticleListing : CompositeDrawable
     {
-        public Action<APINewsSidebar> SidebarMetadataUpdated;
-
-        [Resolved]
-        private IAPIProvider api { get; set; }
+        public Action RequestMorePosts;
 
         private FillFlowContainer content;
         private ShowMoreButton showMore;
 
-        private GetNewsRequest request;
-        private Cursor lastCursor;
-
-        private readonly int? year;
+        private readonly GetNewsResponse initialResponse;
 
         /// <summary>
         /// Instantiate a listing for the specified year.
         /// </summary>
-        /// <param name="year">The year to load articles from. If null, will show the most recent articles.</param>
-        public ArticleListing(int? year = null)
+        /// <param name="initialResponse">Initial response to create articles from.</param>
+        public ArticleListing(GetNewsResponse initialResponse)
         {
-            this.year = year;
+            this.initialResponse = initialResponse;
         }
 
         [BackgroundDependencyLoader]
@@ -69,7 +61,8 @@ namespace osu.Game.Overlays.News.Displays
                         RelativeSizeAxes = Axes.X,
                         AutoSizeAxes = Axes.Y,
                         Direction = FillDirection.Vertical,
-                        Spacing = new Vector2(0, 10)
+                        Spacing = new Vector2(0, 10),
+                        Children = initialResponse.NewsPosts.Select(p => new NewsCard(p)).ToList()
                     },
                     showMore = new ShowMoreButton
                     {
@@ -79,37 +72,19 @@ namespace osu.Game.Overlays.News.Displays
                         {
                             Top = 15
                         },
-                        Action = performFetch,
-                        Alpha = 0
+                        Action = RequestMorePosts,
+                        Alpha = initialResponse.Cursor != null ? 1 : 0
                     }
                 }
             };
-
-            performFetch();
-        }
-
-        private void performFetch()
-        {
-            request?.Cancel();
-
-            request = new GetNewsRequest(year, lastCursor);
-            request.Success += response => Schedule(() => onSuccess(response));
-            api.PerformAsync(request);
         }
 
         private CancellationTokenSource cancellationToken;
 
-        private void onSuccess(GetNewsResponse response)
+        public void AddPosts(GetNewsResponse response)
         {
             cancellationToken?.Cancel();
 
-            // only needs to be updated on the initial load, as the content won't change during pagination.
-            if (lastCursor == null)
-                SidebarMetadataUpdated?.Invoke(response.SidebarMetadata);
-
-            // store cursor for next pagination request.
-            lastCursor = response.Cursor;
-
             LoadComponentsAsync(response.NewsPosts.Select(p => new NewsCard(p)).ToList(), loaded =>
             {
                 content.AddRange(loaded);
@@ -121,7 +96,6 @@ namespace osu.Game.Overlays.News.Displays
 
         protected override void Dispose(bool isDisposing)
         {
-            request?.Cancel();
             cancellationToken?.Cancel();
             base.Dispose(isDisposing);
         }
diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index dd6de40ecb..751ac1d10a 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -6,6 +6,8 @@ using System.Threading;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
 using osu.Game.Overlays.News;
 using osu.Game.Overlays.News.Displays;
 using osu.Game.Overlays.News.Sidebar;
@@ -18,9 +20,12 @@ namespace osu.Game.Overlays
 
         private readonly Container sidebarContainer;
         private readonly NewsSidebar sidebar;
-
         private readonly Container content;
 
+        private APIRequest lastRequest;
+        private Cursor lastCursor;
+        private int? year;
+
         private CancellationTokenSource cancellationToken;
 
         private bool displayUpdateRequired = true;
@@ -108,7 +113,11 @@ namespace osu.Game.Overlays
         protected void LoadDisplay(Drawable display)
         {
             ScrollFlow.ScrollToStart();
-            LoadComponentAsync(display, loaded => content.Child = loaded, (cancellationToken = new CancellationTokenSource()).Token);
+            LoadComponentAsync(display, loaded =>
+            {
+                content.Child = loaded;
+                Loading.Hide();
+            }, (cancellationToken = new CancellationTokenSource()).Token);
         }
 
         protected override void UpdateAfterChildren()
@@ -132,13 +141,41 @@ namespace osu.Game.Overlays
 
             Header.SetFrontPage();
 
-            var page = new ArticleListing(year);
-            page.SidebarMetadataUpdated += metadata => Schedule(() =>
+            this.year = year;
+            lastCursor = null;
+
+            performListingRequest(response =>
             {
-                sidebar.Metadata.Value = metadata;
-                Loading.Hide();
+                sidebar.Metadata.Value = response.SidebarMetadata;
+
+                var listing = new ArticleListing(response);
+                listing.RequestMorePosts += getMorePosts;
+
+                LoadDisplay(listing);
             });
-            LoadDisplay(page);
+        }
+
+        private void getMorePosts()
+        {
+            lastRequest?.Cancel();
+            performListingRequest(response =>
+            {
+                if (content.Child is ArticleListing listing)
+                    listing.AddPosts(response);
+            });
+        }
+
+        private void performListingRequest(Action<GetNewsResponse> onSuccess)
+        {
+            lastRequest = new GetNewsRequest(year, lastCursor);
+
+            ((GetNewsRequest)lastRequest).Success += response => Schedule(() =>
+            {
+                lastCursor = response.Cursor;
+                onSuccess?.Invoke(response);
+            });
+
+            API.PerformAsync(lastRequest);
         }
 
         private void loadArticle(string article)
@@ -149,17 +186,18 @@ namespace osu.Game.Overlays
 
             // Temporary, should be handled by ArticleDisplay later
             LoadDisplay(Empty());
-            Loading.Hide();
         }
 
         private void beginLoading()
         {
+            lastRequest?.Cancel();
             cancellationToken?.Cancel();
             Loading.Show();
         }
 
         protected override void Dispose(bool isDisposing)
         {
+            lastRequest?.Cancel();
             cancellationToken?.Cancel();
             base.Dispose(isDisposing);
         }

From 83364285746b651bd8ccd27be11e0aaa127b493b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 May 2021 15:10:33 +0900
Subject: [PATCH 3681/3722] Add regression test for spinner sample actually
 transforming its frequency

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs    | 14 +++++++++++++-
 .../Objects/Drawables/DrawableSpinner.cs           |  6 +++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
index f697a77d94..0a7ef443b1 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
@@ -5,12 +5,14 @@ using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
+using osu.Framework.Testing;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
@@ -32,6 +34,16 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddStep($"{term} Small", () => SetContents(() => testSingle(7, autoplay)));
         }
 
+        [Test]
+        public void TestSpinningSamplePitchShift()
+        {
+            AddStep("Add spinner", () => SetContents(() => testSingle(5, true, 4000)));
+            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"))));
+        }
+
         [TestCase(false)]
         [TestCase(true)]
         public void TestLongSpinner(bool autoplay)
@@ -93,7 +105,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 base.Update();
                 if (auto)
-                    RotationTracker.AddRotation((float)(Clock.ElapsedFrameTime * 3));
+                    RotationTracker.AddRotation((float)(Clock.ElapsedFrameTime * 2));
             }
         }
     }
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 3a4753761a..19cee61f26 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -39,6 +39,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         private Bindable<bool> isSpinning;
         private bool spinnerFrequencyModulate;
 
+        private const float spinning_sample_initial_frequency = 1.0f;
+        private const float spinning_sample_modulated_base_frequency = 0.5f;
+
         /// <summary>
         /// The amount of bonus score gained from spinning after the required number of spins, for display purposes.
         /// </summary>
@@ -106,9 +109,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             isSpinning.BindValueChanged(updateSpinningSample);
         }
 
-        private const float spinning_sample_initial_frequency = 1.0f;
-        private const float spinning_sample_modulated_base_frequency = 0.5f;
-
         protected override void OnFree()
         {
             base.OnFree();

From e5f586f2a6940679a41b87ebe3f58d818226795e Mon Sep 17 00:00:00 2001
From: Firmatorenio <smeshmunya@gmail.com>
Date: Mon, 24 May 2021 13:29:12 +0600
Subject: [PATCH 3682/3722] fix colour hit error meter not pushing misses when
 wrong colour note is hit in taiko

---
 .../Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
index 0eb2367f73..3a79183d34 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Scoring;
 using osuTK;
 using osuTK.Graphics;
 
@@ -24,7 +25,8 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             InternalChild = judgementsFlow = new JudgementFlow();
         }
 
-        protected override void OnNewJudgement(JudgementResult judgement) => judgementsFlow.Push(GetColourForHitResult(HitWindows.ResultFor(judgement.TimeOffset)));
+        //Taiko-specific: hitting a wrong colour note should result in a miss being pushed.
+        protected override void OnNewJudgement(JudgementResult judgement) => judgementsFlow.Push(judgement.Type == HitResult.Miss ? GetColourForHitResult(HitResult.Miss) : GetColourForHitResult(HitWindows.ResultFor(judgement.TimeOffset)));
 
         private class JudgementFlow : FillFlowContainer<HitErrorCircle>
         {

From 4fc6ba50b7beaf51c9ca1c22a87cfa7334a65bda Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 May 2021 17:03:54 +0900
Subject: [PATCH 3683/3722] Fix editor placement ending early if a blueprint
 becomes alive from a pool

Closes https://github.com/ppy/osu/issues/12630.
---
 .../Edit/Compose/Components/ComposeBlueprintContainer.cs   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index e231f7f648..3e97e15cca 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -61,6 +61,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
             inputManager = GetContainingInputManager();
 
+            Beatmap.HitObjectAdded += hitObjectAdded;
+
             // updates to selected are handled for us by SelectionHandler.
             NewCombo.BindTo(SelectionHandler.SelectionNewComboState);
 
@@ -259,10 +261,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         public virtual HitObjectSelectionBlueprint CreateHitObjectBlueprintFor(HitObject hitObject) => null;
 
-        protected override void OnBlueprintAdded(HitObject item)
+        private void hitObjectAdded(HitObject obj)
         {
-            base.OnBlueprintAdded(item);
-
+            // refresh the tool to handle the case of placement completing.
             refreshTool();
 
             // on successful placement, the new combo button should be reset as this is the most common user interaction.

From f8c615049379316b8fce79ac55e34d4a745f140f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 May 2021 17:11:01 +0900
Subject: [PATCH 3684/3722] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 57550cfb93..b3842a528d 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.521.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.524.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 87d1707420..ed033b3934 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -33,7 +33,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="ppy.osu.Framework" Version="2021.521.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.524.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
     <PackageReference Include="Sentry" Version="3.3.4" />
     <PackageReference Include="SharpCompress" Version="0.28.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index a2a9ac35fc..e35b1b5c42 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.521.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.524.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.422.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.521.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.524.0" />
     <PackageReference Include="SharpCompress" Version="0.28.2" />
     <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 3db995c7782c0f643239c97798c9bbc90aafd843 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 24 May 2021 17:15:57 +0900
Subject: [PATCH 3685/3722] Fix sliders jumping around the screen on movement

---
 .../Sliders/SliderSelectionBlueprint.cs         |  7 ++++++-
 .../Objects/Drawables/DrawableSlider.cs         | 17 +++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
index ec97f1fd78..e810d2fe0c 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderSelectionBlueprint.cs
@@ -16,6 +16,7 @@ using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Compose;
 using osuTK;
@@ -25,6 +26,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 {
     public class SliderSelectionBlueprint : OsuSelectionBlueprint<Slider>
     {
+        protected new DrawableSlider DrawableObject => (DrawableSlider)base.DrawableObject;
+
         protected SliderBodyPiece BodyPiece { get; private set; }
         protected SliderCircleOverlay HeadOverlay { get; private set; }
         protected SliderCircleOverlay TailOverlay { get; private set; }
@@ -236,7 +239,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             new OsuMenuItem("Add control point", MenuItemType.Standard, () => addControlPoint(rightClickPosition)),
         };
 
-        public override Vector2 ScreenSpaceSelectionPoint => BodyPiece.ToScreenSpace(BodyPiece.PathStartLocation);
+        // Always refer to the drawable object's slider body so subsequent movement deltas are calculated with updated positions.
+        public override Vector2 ScreenSpaceSelectionPoint => DrawableObject.SliderBody?.ToScreenSpace(DrawableObject.SliderBody.PathOffset)
+                                                             ?? BodyPiece.ToScreenSpace(BodyPiece.PathStartLocation);
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
             BodyPiece.ReceivePositionalInputAt(screenSpacePos) || ControlPointVisualiser?.Pieces.Any(p => p.ReceivePositionalInputAt(screenSpacePos)) == true;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 82b5492de6..0bec33bf77 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -34,7 +34,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public override bool DisplayResult => !HitObject.OnlyJudgeNestedObjects;
 
-        private PlaySliderBody sliderBody => Body.Drawable as PlaySliderBody;
+        [CanBeNull]
+        public PlaySliderBody SliderBody => Body.Drawable as PlaySliderBody;
 
         public IBindable<int> PathVersion => pathVersion;
         private readonly Bindable<int> pathVersion = new Bindable<int>();
@@ -215,16 +216,16 @@ 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(completionProgress);
 
             foreach (DrawableHitObject hitObject in NestedHitObjects)
             {
-                if (hitObject is ITrackSnaking s) s.UpdateSnakingPosition(HitObject.Path.PositionAt(sliderBody?.SnakedStart ?? 0), HitObject.Path.PositionAt(sliderBody?.SnakedEnd ?? 0));
+                if (hitObject is ITrackSnaking s) s.UpdateSnakingPosition(HitObject.Path.PositionAt(SliderBody?.SnakedStart ?? 0), HitObject.Path.PositionAt(SliderBody?.SnakedEnd ?? 0));
                 if (hitObject is IRequireTracking t) t.Tracking = Ball.Tracking;
             }
 
-            Size = sliderBody?.Size ?? Vector2.Zero;
-            OriginPosition = sliderBody?.PathOffset ?? Vector2.Zero;
+            Size = SliderBody?.Size ?? Vector2.Zero;
+            OriginPosition = SliderBody?.PathOffset ?? Vector2.Zero;
 
             if (DrawSize != Vector2.Zero)
             {
@@ -238,7 +239,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         public override void OnKilled()
         {
             base.OnKilled();
-            sliderBody?.RecyclePath();
+            SliderBody?.RecyclePath();
         }
 
         protected override void ApplySkin(ISkinSource skin, bool allowFallback)
@@ -324,7 +325,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             {
                 case ArmedState.Hit:
                     Ball.ScaleTo(HitObject.Scale * 1.4f, fade_out_time, Easing.Out);
-                    if (sliderBody?.SnakingOut.Value == true)
+                    if (SliderBody?.SnakingOut.Value == true)
                         Body.FadeOut(40); // short fade to allow for any body colour to smoothly disappear.
                     break;
             }
@@ -332,7 +333,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             this.FadeOut(fade_out_time, Easing.OutQuint).Expire();
         }
 
-        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => sliderBody?.ReceivePositionalInputAt(screenSpacePos) ?? base.ReceivePositionalInputAt(screenSpacePos);
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => SliderBody?.ReceivePositionalInputAt(screenSpacePos) ?? base.ReceivePositionalInputAt(screenSpacePos);
 
         private class DefaultSliderBody : PlaySliderBody
         {

From 7961dba1d3dccd79e6bd79b60de5d21f8a396de6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 May 2021 17:22:55 +0900
Subject: [PATCH 3686/3722] Reorder `OrderBy` for legibility

---
 osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs b/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
index cd8b486f23..23b09e8fb1 100644
--- a/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
+++ b/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
@@ -73,10 +73,11 @@ namespace osu.Game.Input.Bindings
             else
             {
                 KeyBindings = store.Query(ruleset?.ID, variant)
+                                   .OrderBy(b => defaults.FindIndex(d => (int)d.Action == b.IntAction))
                                    // this ordering is important to ensure that we read entries from the database in the order
                                    // enforced by DefaultKeyBindings. allow for song select to handle actions that may otherwise
                                    // have been eaten by the music controller due to query order.
-                                   .OrderBy(b => defaults.FindIndex(d => (int)d.Action == b.IntAction)).ToList();
+                                   .ToList();
             }
         }
     }

From 57640810b5023025b3b4ac933d35495663de39bb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 May 2021 17:23:09 +0900
Subject: [PATCH 3687/3722] Ignore certain banned `InputKey`s for gameplay
 purposes

---
 osu.Game/Input/KeyBindingStore.cs           | 22 +++++++++++++++++++++
 osu.Game/Rulesets/UI/RulesetInputManager.cs |  8 ++++++++
 2 files changed, 30 insertions(+)

diff --git a/osu.Game/Input/KeyBindingStore.cs b/osu.Game/Input/KeyBindingStore.cs
index 9d0cfedc03..1d20f0d2c3 100644
--- a/osu.Game/Input/KeyBindingStore.cs
+++ b/osu.Game/Input/KeyBindingStore.cs
@@ -16,6 +16,17 @@ namespace osu.Game.Input
     {
         public event Action KeyBindingChanged;
 
+        /// <summary>
+        /// Keys which should not be allowed for gameplay input purposes.
+        /// </summary>
+        private static readonly IEnumerable<InputKey> banned_keys = new[]
+        {
+            InputKey.MouseWheelDown,
+            InputKey.MouseWheelLeft,
+            InputKey.MouseWheelUp,
+            InputKey.MouseWheelRight
+        };
+
         public KeyBindingStore(DatabaseContextFactory contextFactory, RulesetStore rulesets, Storage storage = null)
             : base(contextFactory, storage)
         {
@@ -103,5 +114,16 @@ namespace osu.Game.Input
 
             KeyBindingChanged?.Invoke();
         }
+
+        public static bool CheckValidForGameplay(KeyCombination combination)
+        {
+            foreach (var key in banned_keys)
+            {
+                if (combination.Keys.Contains(key))
+                    return false;
+            }
+
+            return true;
+        }
     }
 }
diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index d6f002ea2c..75c3a4661c 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -13,6 +13,7 @@ using osu.Framework.Input.Events;
 using osu.Framework.Input.StateChanges.Events;
 using osu.Framework.Input.States;
 using osu.Game.Configuration;
+using osu.Game.Input;
 using osu.Game.Input.Bindings;
 using osu.Game.Input.Handlers;
 using osu.Game.Screens.Play;
@@ -169,6 +170,13 @@ namespace osu.Game.Rulesets.UI
                 : base(ruleset, variant, unique)
             {
             }
+
+            protected override void ReloadMappings()
+            {
+                base.ReloadMappings();
+
+                KeyBindings = KeyBindings.Where(b => KeyBindingStore.CheckValidForGameplay(b.KeyCombination)).ToList();
+            }
         }
     }
 

From deabce7140fea2922a1916b63f35ce98cbb18f7c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 May 2021 18:40:56 +0900
Subject: [PATCH 3688/3722] Disallow updating the database to an invalid value

---
 osu.Game/Input/KeyBindingStore.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Input/KeyBindingStore.cs b/osu.Game/Input/KeyBindingStore.cs
index 1d20f0d2c3..23b0e0c0d0 100644
--- a/osu.Game/Input/KeyBindingStore.cs
+++ b/osu.Game/Input/KeyBindingStore.cs
@@ -104,6 +104,10 @@ namespace osu.Game.Input
             using (ContextFactory.GetForWrite())
             {
                 var dbKeyBinding = (DatabasedKeyBinding)keyBinding;
+
+                if (dbKeyBinding.RulesetID != null && !CheckValidForGameplay(keyBinding.KeyCombination))
+                    return;
+
                 Refresh(ref dbKeyBinding);
 
                 if (dbKeyBinding.KeyCombination.Equals(keyBinding.KeyCombination))

From a00f226ab3566028bb2f0590d84caaeeeb32cb55 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 May 2021 18:41:39 +0900
Subject: [PATCH 3689/3722] Add assert on storing to database

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

diff --git a/osu.Game/Input/KeyBindingStore.cs b/osu.Game/Input/KeyBindingStore.cs
index 23b0e0c0d0..3ef9923487 100644
--- a/osu.Game/Input/KeyBindingStore.cs
+++ b/osu.Game/Input/KeyBindingStore.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Platform;
@@ -105,8 +106,7 @@ namespace osu.Game.Input
             {
                 var dbKeyBinding = (DatabasedKeyBinding)keyBinding;
 
-                if (dbKeyBinding.RulesetID != null && !CheckValidForGameplay(keyBinding.KeyCombination))
-                    return;
+                Debug.Assert(dbKeyBinding.RulesetID == null || CheckValidForGameplay(keyBinding.KeyCombination));
 
                 Refresh(ref dbKeyBinding);
 

From 471f17547aa12befa1fb5162be18c4a8d03afede Mon Sep 17 00:00:00 2001
From: Firmatorenio <smeshmunya@gmail.com>
Date: Mon, 24 May 2021 16:49:58 +0600
Subject: [PATCH 3690/3722] switch determining the hit result by offset to
 getting it from the judgement directly

---
 .../Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
index 3a79183d34..e9ccbcdae2 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
@@ -7,7 +7,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Scoring;
 using osuTK;
 using osuTK.Graphics;
 
@@ -25,8 +24,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             InternalChild = judgementsFlow = new JudgementFlow();
         }
 
-        //Taiko-specific: hitting a wrong colour note should result in a miss being pushed.
-        protected override void OnNewJudgement(JudgementResult judgement) => judgementsFlow.Push(judgement.Type == HitResult.Miss ? GetColourForHitResult(HitResult.Miss) : GetColourForHitResult(HitWindows.ResultFor(judgement.TimeOffset)));
+        protected override void OnNewJudgement(JudgementResult judgement) => judgementsFlow.Push(GetColourForHitResult(judgement.Type));
 
         private class JudgementFlow : FillFlowContainer<HitErrorCircle>
         {

From 02cdd0b2deff3a03ee3a020d6e5a46684b5daa17 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Mon, 24 May 2021 19:10:37 +0700
Subject: [PATCH 3691/3722] use drawable link compiler in markdown link

---
 .../Markdown/OsuMarkdownLinkText.cs           | 52 ++++++++++++-------
 1 file changed, 33 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownLinkText.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownLinkText.cs
index 2efb60d125..f44f818bf0 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownLinkText.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownLinkText.cs
@@ -1,48 +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 System.Collections.Generic;
 using Markdig.Syntax.Inlines;
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers.Markdown;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Input.Events;
+using osu.Game.Online.Chat;
 using osu.Game.Overlays;
 
 namespace osu.Game.Graphics.Containers.Markdown
 {
     public class OsuMarkdownLinkText : MarkdownLinkText
     {
-        [Resolved]
-        private OverlayColourProvider colourProvider { get; set; }
+        [Resolved(canBeNull: true)]
+        private OsuGame game { get; set; }
 
-        private SpriteText spriteText;
+        protected string Text;
+        protected string Title;
 
         public OsuMarkdownLinkText(string text, LinkInline linkInline)
             : base(text, linkInline)
         {
+            Text = text;
+            Title = linkInline.Title;
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(OverlayColourProvider colourProvider)
         {
-            spriteText.Colour = colourProvider.Light2;
+            var text = CreateSpriteText().With(t => t.Text = Text);
+            InternalChildren = new Drawable[]
+            {
+                text,
+                new OsuMarkdownLinkCompiler(new[] { text })
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Action = OnLinkPressed,
+                    TooltipText = Title ?? Url,
+                }
+            };
         }
 
-        public override SpriteText CreateSpriteText()
-        {
-            return spriteText = base.CreateSpriteText();
-        }
+        protected override void OnLinkPressed() => game?.HandleLink(Url);
 
-        protected override bool OnHover(HoverEvent e)
+        private class OsuMarkdownLinkCompiler : DrawableLinkCompiler
         {
-            spriteText.Colour = colourProvider.Light1;
-            return base.OnHover(e);
-        }
+            public OsuMarkdownLinkCompiler(IEnumerable<Drawable> parts)
+                : base(parts)
+            {
+            }
 
-        protected override void OnHoverLost(HoverLostEvent e)
-        {
-            spriteText.Colour = colourProvider.Light2;
-            base.OnHoverLost(e);
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                IdleColour = colourProvider.Light2;
+                HoverColour = colourProvider.Light1;
+            }
         }
     }
 }

From fe9abd5b8048b029b5c103cf5e35d1ec76bb318f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 24 May 2021 21:37:05 +0900
Subject: [PATCH 3692/3722] Upgrade packages and fix ResX files

---
 .config/dotnet-tools.json                | 4 ++--
 osu.Game/Localisation/ButtonSystem.resx  | 4 ++--
 osu.Game/Localisation/Chat.resx          | 4 ++--
 osu.Game/Localisation/Common.resx        | 4 ++--
 osu.Game/Localisation/Notifications.resx | 4 ++--
 osu.Game/Localisation/NowPlaying.resx    | 4 ++--
 osu.Game/Localisation/Settings.resx      | 4 ++--
 osu.Game/osu.Game.csproj                 | 2 +-
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 54d9ff3077..b51ecb4f7e 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -33,10 +33,10 @@
       ]
     },
     "ppy.localisationanalyser.tools": {
-      "version": "2021.521.1",
+      "version": "2021.524.0",
       "commands": [
         "localisation"
       ]
     }
   }
-}
+}
\ No newline at end of file
diff --git a/osu.Game/Localisation/ButtonSystem.resx b/osu.Game/Localisation/ButtonSystem.resx
index e8f555b6c3..d72ffff8be 100644
--- a/osu.Game/Localisation/ButtonSystem.resx
+++ b/osu.Game/Localisation/ButtonSystem.resx
@@ -53,10 +53,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.NetStandard.ResXResourceReader, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.NetStandard.ResXResourceWriter, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="solo" xml:space="preserve">
     <value>solo</value>
diff --git a/osu.Game/Localisation/Chat.resx b/osu.Game/Localisation/Chat.resx
index 3762f800c5..055e351463 100644
--- a/osu.Game/Localisation/Chat.resx
+++ b/osu.Game/Localisation/Chat.resx
@@ -53,10 +53,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.NetStandard.ResXResourceReader, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.NetStandard.ResXResourceWriter, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="header_title" xml:space="preserve">
     <value>chat</value>
diff --git a/osu.Game/Localisation/Common.resx b/osu.Game/Localisation/Common.resx
index 8a3ae29c77..59de16a037 100644
--- a/osu.Game/Localisation/Common.resx
+++ b/osu.Game/Localisation/Common.resx
@@ -53,10 +53,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.NetStandard.ResXResourceReader, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.NetStandard.ResXResourceWriter, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="cancel" xml:space="preserve">
     <value>Cancel</value>
diff --git a/osu.Game/Localisation/Notifications.resx b/osu.Game/Localisation/Notifications.resx
index d61e5744e4..08db240ba2 100644
--- a/osu.Game/Localisation/Notifications.resx
+++ b/osu.Game/Localisation/Notifications.resx
@@ -53,10 +53,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.NetStandard.ResXResourceReader, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.NetStandard.ResXResourceWriter, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="header_title" xml:space="preserve">
     <value>notifications</value>
diff --git a/osu.Game/Localisation/NowPlaying.resx b/osu.Game/Localisation/NowPlaying.resx
index 71df15e488..40fda3e25b 100644
--- a/osu.Game/Localisation/NowPlaying.resx
+++ b/osu.Game/Localisation/NowPlaying.resx
@@ -53,10 +53,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.NetStandard.ResXResourceReader, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.NetStandard.ResXResourceWriter, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="header_title" xml:space="preserve">
     <value>now playing</value>
diff --git a/osu.Game/Localisation/Settings.resx b/osu.Game/Localisation/Settings.resx
index 1770147dd9..85c224cedf 100644
--- a/osu.Game/Localisation/Settings.resx
+++ b/osu.Game/Localisation/Settings.resx
@@ -53,10 +53,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.NetStandard.ResXResourceReader, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.NetStandard.ResXResourceWriter, System.Resources.NetStandard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="header_title" xml:space="preserve">
     <value>settings</value>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index ed033b3934..fa2945db6a 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.LocalisationAnalyser" Version="2021.521.1">
+    <PackageReference Include="ppy.LocalisationAnalyser" Version="2021.524.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

From 6f155fbd08500f58ce3629a0b958b8d549546114 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 24 May 2021 21:54:55 +0900
Subject: [PATCH 3693/3722] Make inspection a hint

---
 osu.sln.DotSettings | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index 4ac796ccd0..62751cebb1 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -120,6 +120,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MultipleTypeMembersOnOneLine/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=NestedStringInterpolation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=NotAccessedField_002EGlobal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=NotOverriddenInSpecificCulture/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=OutdentIsOffPrevLevel/@EntryIndexedValue">WARNING</s:String>
 	<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>

From 62b6cadb64eefd23b8b1ffaaf37987bfbf4fd5cf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 May 2021 18:41:51 +0900
Subject: [PATCH 3694/3722] Ensure settings rows cannot set an invalid value in
 the first place

---
 osu.Game/Overlays/KeyBinding/KeyBindingRow.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
index 43942d2d52..9c09b6e7d0 100644
--- a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
+++ b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
@@ -16,6 +16,7 @@ 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;
 using osuTK.Graphics;
 using osuTK.Input;
@@ -445,6 +446,9 @@ namespace osu.Game.Overlays.KeyBinding
 
             public void UpdateKeyCombination(KeyCombination newCombination)
             {
+                if ((KeyBinding as DatabasedKeyBinding)?.RulesetID != null && !KeyBindingStore.CheckValidForGameplay(newCombination))
+                    return;
+
                 KeyBinding.KeyCombination = newCombination;
                 Text.Text = KeyBinding.KeyCombination.ReadableString();
             }

From 37f6ceef798eb47b5778884bc1d41187ee293e76 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 May 2021 21:56:47 +0900
Subject: [PATCH 3695/3722] Add test coverage

---
 .../Settings/TestSceneKeyBindingPanel.cs      | 66 +++++++++++++++++++
 osu.Game/Overlays/SettingsPanel.cs            |  2 +-
 2 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
index f495e0fb23..55c5b5b9c2 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Testing;
 using osu.Framework.Threading;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osu.Game.Overlays.KeyBinding;
 using osuTK.Input;
@@ -28,6 +29,39 @@ namespace osu.Game.Tests.Visual.Settings
             panel.Show();
         }
 
+        [SetUpSteps]
+        public void SetUpSteps()
+        {
+            AddStep("Scroll to top", () => panel.ChildrenOfType<SettingsPanel.SettingsSectionsContainer>().First().ScrollToTop());
+            AddWaitStep("wait for scroll", 5);
+        }
+
+        [Test]
+        public void TestBindingMouseWheelToNonGameplay()
+        {
+            scrollToAndStartBinding("Increase volume");
+            AddStep("press k", () => InputManager.Key(Key.K));
+            checkBinding("Increase volume", "K");
+
+            AddStep("click again", () => InputManager.Click(MouseButton.Left));
+            AddStep("scroll mouse wheel", () => InputManager.ScrollVerticalBy(1));
+
+            checkBinding("Increase volume", "Wheel Up");
+        }
+
+        [Test]
+        public void TestBindingMouseWheelToGameplay()
+        {
+            scrollToAndStartBinding("Left button");
+            AddStep("press k", () => InputManager.Key(Key.Z));
+            checkBinding("Left button", "Z");
+
+            AddStep("click again", () => InputManager.Click(MouseButton.Left));
+            AddStep("scroll mouse wheel", () => InputManager.ScrollVerticalBy(1));
+
+            checkBinding("Left button", "Z");
+        }
+
         [Test]
         public void TestClickTwiceOnClearButton()
         {
@@ -135,5 +169,37 @@ namespace osu.Game.Tests.Visual.Settings
 
             AddAssert("first binding selected", () => multiBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().First().IsBinding);
         }
+
+        private void checkBinding(string name, string keyName)
+        {
+            AddAssert($"Check {name} is bound to {keyName}", () =>
+            {
+                var firstRow = panel.ChildrenOfType<KeyBindingRow>().First(r => r.ChildrenOfType<OsuSpriteText>().Any(s => s.Text == name));
+                var firstButton = firstRow.ChildrenOfType<KeyBindingRow.KeyButton>().First();
+
+                return firstButton.Text.Text == keyName;
+            });
+        }
+
+        private void scrollToAndStartBinding(string name)
+        {
+            KeyBindingRow.KeyButton firstButton = null;
+
+            AddStep($"Scroll to {name}", () =>
+            {
+                var firstRow = panel.ChildrenOfType<KeyBindingRow>().First(r => r.ChildrenOfType<OsuSpriteText>().Any(s => s.Text == name));
+                firstButton = firstRow.ChildrenOfType<KeyBindingRow.KeyButton>().First();
+
+                panel.ChildrenOfType<SettingsPanel.SettingsSectionsContainer>().First().ScrollTo(firstButton);
+            });
+
+            AddWaitStep("wait for scroll", 5);
+
+            AddStep("click to bind", () =>
+            {
+                InputManager.MoveMouseTo(firstButton);
+                InputManager.Click(MouseButton.Left);
+            });
+        }
     }
 }
diff --git a/osu.Game/Overlays/SettingsPanel.cs b/osu.Game/Overlays/SettingsPanel.cs
index 8f3274b2b5..f0a11d67b7 100644
--- a/osu.Game/Overlays/SettingsPanel.cs
+++ b/osu.Game/Overlays/SettingsPanel.cs
@@ -191,7 +191,7 @@ namespace osu.Game.Overlays
             Padding = new MarginPadding { Top = GetToolbarHeight?.Invoke() ?? 0 };
         }
 
-        protected class SettingsSectionsContainer : SectionsContainer<SettingsSection>
+        public class SettingsSectionsContainer : SectionsContainer<SettingsSection>
         {
             public SearchContainer<SettingsSection> SearchContainer;
 

From 2e6d46390152f59efecfdc6a6e43fbfa36d175cf Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Mon, 24 May 2021 20:45:47 +0700
Subject: [PATCH 3696/3722] add test link with title

---
 .../UserInterface/TestSceneOsuMarkdownContainer.cs       | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
index dc41f184f2..931af7bc95 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOsuMarkdownContainer.cs
@@ -86,6 +86,15 @@ _**italic with underscore, bold with asterisk**_";
             });
         }
 
+        [Test]
+        public void TestLinkWithTitle()
+        {
+            AddStep("Add Link with title", () =>
+            {
+                markdownContainer.Text = "[wikipedia](https://www.wikipedia.org \"The Free Encyclopedia\")";
+            });
+        }
+
         [Test]
         public void TestInlineCode()
         {

From 728258d93a243e8c3655ba6655f36232deafa58e Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Tue, 25 May 2021 00:29:59 +0700
Subject: [PATCH 3697/3722] add website root url as document url

---
 .../Graphics/Containers/Markdown/OsuMarkdownContainer.cs  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index 6facf4e26c..9ecedba59a 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -6,11 +6,13 @@ using Markdig.Extensions.AutoIdentifiers;
 using Markdig.Extensions.Tables;
 using Markdig.Extensions.Yaml;
 using Markdig.Syntax;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Containers.Markdown;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Online.API;
 
 namespace osu.Game.Graphics.Containers.Markdown
 {
@@ -21,6 +23,12 @@ namespace osu.Game.Graphics.Containers.Markdown
             LineSpacing = 21;
         }
 
+        [BackgroundDependencyLoader]
+        private void load(IAPIProvider api)
+        {
+            DocumentUrl = api.WebsiteRootUrl;
+        }
+
         protected override void AddMarkdownComponent(IMarkdownObject markdownObject, FillFlowContainer container, int level)
         {
             switch (markdownObject)

From 65649e5a6264707f8079e5714931135431851cbf Mon Sep 17 00:00:00 2001
From: kamp <nbvdkamp@gmail.com>
Date: Mon, 24 May 2021 21:36:42 +0200
Subject: [PATCH 3698/3722] Prevent skin editor crash when scaling 0 area
 drawables

Some skinnable drawables can have 0 width or height in certain
cases, leading to division by 0 and a crash when the position is
updated.
---
 osu.Game/Skinning/Editor/SkinSelectionHandler.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 99bd22c0bf..7ef07541b4 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -59,6 +59,10 @@ namespace osu.Game.Skinning.Editor
             // the selection quad is always upright, so use an AABB rect to make mutating the values easier.
             var selectionRect = getSelectionQuad().AABBFloat;
 
+            // If the selection has no area we cannot scale it
+            if (selectionRect.Area == 0.0)
+                return false;
+
             // copy to mutate, as we will need to compare to the original later on.
             var adjustedRect = selectionRect;
 

From 9de07de46784c479fd32f6867eee3692f911693d Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Tue, 25 May 2021 12:14:07 +0700
Subject: [PATCH 3699/3722] move text flow container inside markdown container

---
 .../Overlays/Wiki/Markdown/WikiMarkdownContainer.cs |  6 ++++++
 .../Wiki/Markdown/WikiMarkdownTextFlowContainer.cs  | 13 -------------
 2 files changed, 6 insertions(+), 13 deletions(-)
 delete mode 100644 osu.Game/Overlays/Wiki/Markdown/WikiMarkdownTextFlowContainer.cs

diff --git a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs
index 81115293d4..d4ad0bee4d 100644
--- a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs
+++ b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs
@@ -3,6 +3,7 @@
 
 using Markdig.Extensions.Yaml;
 using Markdig.Syntax;
+using Markdig.Syntax.Inlines;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Containers.Markdown;
 using osu.Game.Graphics.Containers.Markdown;
@@ -35,5 +36,10 @@ namespace osu.Game.Overlays.Wiki.Markdown
         protected override MarkdownParagraph CreateParagraph(ParagraphBlock paragraphBlock, int level) => new WikiMarkdownParagraph(paragraphBlock);
 
         protected virtual FillFlowContainer CreateNotice(YamlFrontMatterBlock yamlFrontMatterBlock) => new WikiNoticeContainer(yamlFrontMatterBlock);
+
+        private class WikiMarkdownTextFlowContainer : OsuMarkdownTextFlowContainer
+        {
+            protected override void AddImage(LinkInline linkInline) => AddDrawable(new WikiMarkdownImage(linkInline));
+        }
     }
 }
diff --git a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownTextFlowContainer.cs b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownTextFlowContainer.cs
deleted file mode 100644
index 1c2b37a219..0000000000
--- a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownTextFlowContainer.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using Markdig.Syntax.Inlines;
-using osu.Game.Graphics.Containers.Markdown;
-
-namespace osu.Game.Overlays.Wiki.Markdown
-{
-    public class WikiMarkdownTextFlowContainer : OsuMarkdownTextFlowContainer
-    {
-        protected override void AddImage(LinkInline linkInline) => AddDrawable(new WikiMarkdownImage(linkInline));
-    }
-}

From 200592114f9e20d0f2ede64a70135f50f0319e00 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 May 2021 14:13:00 +0900
Subject: [PATCH 3700/3722] Make protected variables private

---
 .../Containers/Markdown/OsuMarkdownLinkText.cs  | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownLinkText.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownLinkText.cs
index f44f818bf0..840bf77348 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownLinkText.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownLinkText.cs
@@ -16,28 +16,29 @@ namespace osu.Game.Graphics.Containers.Markdown
         [Resolved(canBeNull: true)]
         private OsuGame game { get; set; }
 
-        protected string Text;
-        protected string Title;
+        private readonly string text;
+        private readonly string title;
 
         public OsuMarkdownLinkText(string text, LinkInline linkInline)
             : base(text, linkInline)
         {
-            Text = text;
-            Title = linkInline.Title;
+            this.text = text;
+            title = linkInline.Title;
         }
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider)
         {
-            var text = CreateSpriteText().With(t => t.Text = Text);
+            var textDrawable = CreateSpriteText().With(t => t.Text = text);
+
             InternalChildren = new Drawable[]
             {
-                text,
-                new OsuMarkdownLinkCompiler(new[] { text })
+                textDrawable,
+                new OsuMarkdownLinkCompiler(new[] { textDrawable })
                 {
                     RelativeSizeAxes = Axes.Both,
                     Action = OnLinkPressed,
-                    TooltipText = Title ?? Url,
+                    TooltipText = title ?? Url,
                 }
             };
         }

From 7b09955d59c7538b8ff6d526c71193e9943ead34 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 May 2021 14:17:40 +0900
Subject: [PATCH 3701/3722] Remove redundant default bindable value

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

diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index 751ac1d10a..d4ccf4970b 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Overlays
 {
     public class NewsOverlay : OnlineOverlay<NewsHeader>
     {
-        private readonly Bindable<string> article = new Bindable<string>(null);
+        private readonly Bindable<string> article = new Bindable<string>();
 
         private readonly Container sidebarContainer;
         private readonly NewsSidebar sidebar;

From 8ffa7f4a5ae5087e7c6f3e3e3f44f012fa95e1e3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 May 2021 14:28:20 +0900
Subject: [PATCH 3702/3722] Tidy up code

---
 osu.Game/Overlays/NewsOverlay.cs | 43 +++++++++++++++++---------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index d4ccf4970b..400505ba52 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -6,7 +6,6 @@ using System.Threading;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Overlays.News;
 using osu.Game.Overlays.News.Displays;
@@ -22,9 +21,14 @@ namespace osu.Game.Overlays
         private readonly NewsSidebar sidebar;
         private readonly Container content;
 
-        private APIRequest lastRequest;
+        private GetNewsRequest lastRequest;
+
         private Cursor lastCursor;
-        private int? year;
+
+        /// <summary>
+        /// The year currently being displayed. If null, the main listing is being displayed.
+        /// </summary>
+        private int? displayedYear;
 
         private CancellationTokenSource cancellationToken;
 
@@ -100,7 +104,7 @@ namespace osu.Game.Overlays
 
         public void ShowYear(int year)
         {
-            loadFrontPage(year);
+            loadListing(year);
             Show();
         }
 
@@ -130,18 +134,18 @@ namespace osu.Game.Overlays
         private void onArticleChanged(ValueChangedEvent<string> article)
         {
             if (article.NewValue == null)
-                loadFrontPage();
+                loadListing();
             else
                 loadArticle(article.NewValue);
         }
 
-        private void loadFrontPage(int? year = null)
+        private void loadListing(int? year = null)
         {
             beginLoading();
 
             Header.SetFrontPage();
 
-            this.year = year;
+            displayedYear = year;
             lastCursor = null;
 
             performListingRequest(response =>
@@ -165,19 +169,6 @@ namespace osu.Game.Overlays
             });
         }
 
-        private void performListingRequest(Action<GetNewsResponse> onSuccess)
-        {
-            lastRequest = new GetNewsRequest(year, lastCursor);
-
-            ((GetNewsRequest)lastRequest).Success += response => Schedule(() =>
-            {
-                lastCursor = response.Cursor;
-                onSuccess?.Invoke(response);
-            });
-
-            API.PerformAsync(lastRequest);
-        }
-
         private void loadArticle(string article)
         {
             beginLoading();
@@ -188,6 +179,18 @@ namespace osu.Game.Overlays
             LoadDisplay(Empty());
         }
 
+        private void performListingRequest(Action<GetNewsResponse> onSuccess)
+        {
+            lastRequest = new GetNewsRequest(displayedYear, lastCursor);
+            lastRequest.Success += response => Schedule(() =>
+            {
+                lastCursor = response.Cursor;
+                onSuccess?.Invoke(response);
+            });
+
+            API.PerformAsync(lastRequest);
+        }
+
         private void beginLoading()
         {
             lastRequest?.Cancel();

From 0f21510b8bc3a57347027c19ab9ecca306e32637 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 May 2021 14:29:46 +0900
Subject: [PATCH 3703/3722] Move code around

---
 osu.Game/Overlays/NewsOverlay.cs | 36 +++++++++++++++-----------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index 400505ba52..ede9432a17 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -74,7 +74,13 @@ namespace osu.Game.Overlays
             base.LoadComplete();
 
             // should not be run until first pop-in to avoid requesting data before user views.
-            article.BindValueChanged(onArticleChanged);
+            article.BindValueChanged(a =>
+            {
+                if (a.NewValue == null)
+                    loadListing();
+                else
+                    loadArticle(a.NewValue);
+            });
         }
 
         protected override NewsHeader CreateHeader() => new NewsHeader { ShowFrontPage = ShowFrontPage };
@@ -131,14 +137,6 @@ namespace osu.Game.Overlays
             sidebarContainer.Y = Math.Clamp(ScrollFlow.Current - Header.DrawHeight, 0, Math.Max(ScrollFlow.ScrollContent.DrawHeight - DrawHeight - Header.DrawHeight, 0));
         }
 
-        private void onArticleChanged(ValueChangedEvent<string> article)
-        {
-            if (article.NewValue == null)
-                loadListing();
-            else
-                loadArticle(article.NewValue);
-        }
-
         private void loadListing(int? year = null)
         {
             beginLoading();
@@ -159,16 +157,6 @@ namespace osu.Game.Overlays
             });
         }
 
-        private void getMorePosts()
-        {
-            lastRequest?.Cancel();
-            performListingRequest(response =>
-            {
-                if (content.Child is ArticleListing listing)
-                    listing.AddPosts(response);
-            });
-        }
-
         private void loadArticle(string article)
         {
             beginLoading();
@@ -179,6 +167,16 @@ namespace osu.Game.Overlays
             LoadDisplay(Empty());
         }
 
+        private void getMorePosts()
+        {
+            lastRequest?.Cancel();
+            performListingRequest(response =>
+            {
+                if (content.Child is ArticleListing listing)
+                    listing.AddPosts(response);
+            });
+        }
+
         private void performListingRequest(Action<GetNewsResponse> onSuccess)
         {
             lastRequest = new GetNewsRequest(displayedYear, lastCursor);

From d165a758233d355f9fc9e70ad94740da2d955ce1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 May 2021 14:37:52 +0900
Subject: [PATCH 3704/3722] Inline request flow to make it easier to understand

---
 osu.Game/Overlays/NewsOverlay.cs | 60 +++++++++++++++-----------------
 1 file changed, 29 insertions(+), 31 deletions(-)

diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index ede9432a17..8d0d242e39 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Overlays
         private readonly NewsSidebar sidebar;
         private readonly Container content;
 
-        private GetNewsRequest lastRequest;
+        private GetNewsRequest request;
 
         private Cursor lastCursor;
 
@@ -139,66 +139,64 @@ namespace osu.Game.Overlays
 
         private void loadListing(int? year = null)
         {
-            beginLoading();
-
             Header.SetFrontPage();
 
             displayedYear = year;
             lastCursor = null;
 
-            performListingRequest(response =>
+            beginLoading(true);
+
+            request = new GetNewsRequest(displayedYear);
+            request.Success += response => Schedule(() =>
             {
+                lastCursor = response.Cursor;
                 sidebar.Metadata.Value = response.SidebarMetadata;
 
-                var listing = new ArticleListing(response);
-                listing.RequestMorePosts += getMorePosts;
-
-                LoadDisplay(listing);
+                LoadDisplay(new ArticleListing(response)
+                {
+                    RequestMorePosts = getMorePosts
+                });
             });
-        }
 
-        private void loadArticle(string article)
-        {
-            beginLoading();
-
-            Header.SetArticle(article);
-
-            // Temporary, should be handled by ArticleDisplay later
-            LoadDisplay(Empty());
+            API.PerformAsync(request);
         }
 
         private void getMorePosts()
         {
-            lastRequest?.Cancel();
-            performListingRequest(response =>
+            beginLoading(false);
+
+            request = new GetNewsRequest(displayedYear, lastCursor);
+            request.Success += response => Schedule(() =>
             {
+                lastCursor = response.Cursor;
                 if (content.Child is ArticleListing listing)
                     listing.AddPosts(response);
             });
+
+            API.PerformAsync(request);
         }
 
-        private void performListingRequest(Action<GetNewsResponse> onSuccess)
+        private void loadArticle(string article)
         {
-            lastRequest = new GetNewsRequest(displayedYear, lastCursor);
-            lastRequest.Success += response => Schedule(() =>
-            {
-                lastCursor = response.Cursor;
-                onSuccess?.Invoke(response);
-            });
+            // This is not yet implemented nor called from anywhere.
+            beginLoading(true);
 
-            API.PerformAsync(lastRequest);
+            Header.SetArticle(article);
+            LoadDisplay(Empty());
         }
 
-        private void beginLoading()
+        private void beginLoading(bool showLoadingOverlay)
         {
-            lastRequest?.Cancel();
+            request?.Cancel();
             cancellationToken?.Cancel();
-            Loading.Show();
+
+            if (showLoadingOverlay)
+                Loading.Show();
         }
 
         protected override void Dispose(bool isDisposing)
         {
-            lastRequest?.Cancel();
+            request?.Cancel();
             cancellationToken?.Cancel();
             base.Dispose(isDisposing);
         }

From e4780abdfddf1642ff454e2fcad4e882adbe58e7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 May 2021 14:43:59 +0900
Subject: [PATCH 3705/3722] Split out `base` call from `switch` statement

---
 osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs
index d4ad0bee4d..b9037a5c77 100644
--- a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs
+++ b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs
@@ -23,12 +23,10 @@ namespace osu.Game.Overlays.Wiki.Markdown
             {
                 case YamlFrontMatterBlock yamlFrontMatterBlock:
                     container.Add(CreateNotice(yamlFrontMatterBlock));
-                    break;
-
-                default:
-                    base.AddMarkdownComponent(markdownObject, container, level);
-                    break;
+                    return;
             }
+
+            base.AddMarkdownComponent(markdownObject, container, level);
         }
 
         public override MarkdownTextFlowContainer CreateTextFlow() => new WikiMarkdownTextFlowContainer();

From b36b40cb3430e6bd511390f82c39ba23195dc8cb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 May 2021 15:20:47 +0900
Subject: [PATCH 3706/3722] Remove unnecessary double specification

---
 osu.Game/Skinning/Editor/SkinSelectionHandler.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
index 7ef07541b4..9cca0ba2c7 100644
--- a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
+++ b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Skinning.Editor
             var selectionRect = getSelectionQuad().AABBFloat;
 
             // If the selection has no area we cannot scale it
-            if (selectionRect.Area == 0.0)
+            if (selectionRect.Area == 0)
                 return false;
 
             // copy to mutate, as we will need to compare to the original later on.

From 04f16c07836e57ea8ae8ef571ef2769c86fba054 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Wed, 26 May 2021 13:55:16 +0700
Subject: [PATCH 3707/3722] Set `DocumentUrl` inside `CreateChildDependencies`

Co-authored-by: Dean Herbert <pe@ppy.sh>
---
 .../Graphics/Containers/Markdown/OsuMarkdownContainer.cs  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index 9ecedba59a..ad11a9625e 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -23,10 +23,14 @@ namespace osu.Game.Graphics.Containers.Markdown
             LineSpacing = 21;
         }
 
-        [BackgroundDependencyLoader]
-        private void load(IAPIProvider api)
+        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
         {
+            var api = parent.Get<IAPIProvider>();
+
+            // needs to be set before the base BDL call executes to avoid invalidating any already populated markdown content.
             DocumentUrl = api.WebsiteRootUrl;
+
+            return base.CreateChildDependencies(parent);
         }
 
         protected override void AddMarkdownComponent(IMarkdownObject markdownObject, FillFlowContainer container, int level)

From e02739a13608866df8391f515b7ab8f31e4d6f6b Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Wed, 26 May 2021 13:57:35 +0700
Subject: [PATCH 3708/3722] remove unused colour provider

---
 osu.Game/Graphics/Containers/Markdown/OsuMarkdownLinkText.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownLinkText.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownLinkText.cs
index 840bf77348..f91a0e40e3 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownLinkText.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownLinkText.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Graphics.Containers.Markdown
         }
 
         [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
+        private void load()
         {
             var textDrawable = CreateSpriteText().With(t => t.Text = text);
 

From eeb6647bc50986ff123e483888df59f1af4b721b Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Wed, 26 May 2021 14:59:36 +0700
Subject: [PATCH 3709/3722] remove schedule in set current path

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

diff --git a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs
index b9037a5c77..dfec437fe4 100644
--- a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs
+++ b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Overlays.Wiki.Markdown
     {
         public string CurrentPath
         {
-            set => Schedule(() => DocumentUrl += $"wiki/{value}");
+            set => DocumentUrl = $"{DocumentUrl}wiki/{value}";
         }
 
         protected override void AddMarkdownComponent(IMarkdownObject markdownObject, FillFlowContainer container, int level)

From 47cbbee4d12760107bfe8c1294c7035224759b01 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Wed, 26 May 2021 15:01:16 +0700
Subject: [PATCH 3710/3722] remove CreateNotice method and move implementation
 to local

---
 osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs
index dfec437fe4..fbfdc5feaf 100644
--- a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs
+++ b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Overlays.Wiki.Markdown
             switch (markdownObject)
             {
                 case YamlFrontMatterBlock yamlFrontMatterBlock:
-                    container.Add(CreateNotice(yamlFrontMatterBlock));
+                    container.Add(new WikiNoticeContainer(yamlFrontMatterBlock));
                     return;
             }
 
@@ -33,8 +33,6 @@ namespace osu.Game.Overlays.Wiki.Markdown
 
         protected override MarkdownParagraph CreateParagraph(ParagraphBlock paragraphBlock, int level) => new WikiMarkdownParagraph(paragraphBlock);
 
-        protected virtual FillFlowContainer CreateNotice(YamlFrontMatterBlock yamlFrontMatterBlock) => new WikiNoticeContainer(yamlFrontMatterBlock);
-
         private class WikiMarkdownTextFlowContainer : OsuMarkdownTextFlowContainer
         {
             protected override void AddImage(LinkInline linkInline) => AddDrawable(new WikiMarkdownImage(linkInline));

From 71f77eb902c8e680b31f1ae39e2d68e28de9f3b4 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Wed, 26 May 2021 15:04:04 +0700
Subject: [PATCH 3711/3722] fix image test

---
 .../Visual/Online/TestSceneWikiMarkdownContainer.cs   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs
index 67030631b0..ebabfc9479 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs
@@ -106,6 +106,7 @@ needs_cleanup: true
         {
             AddStep("Add absolute image", () =>
             {
+                markdownContainer.DocumentUrl = "https://osu.ppy.sh";
                 markdownContainer.Text = "![intro](/wiki/Interface/img/intro-screen.jpg)";
             });
         }
@@ -115,6 +116,7 @@ needs_cleanup: true
         {
             AddStep("Add relative image", () =>
             {
+                markdownContainer.DocumentUrl = "https://osu.ppy.sh";
                 markdownContainer.CurrentPath = "Interface/";
                 markdownContainer.Text = "![intro](img/intro-screen.jpg)";
             });
@@ -125,6 +127,7 @@ needs_cleanup: true
         {
             AddStep("Add paragraph with block image", () =>
             {
+                markdownContainer.DocumentUrl = "https://osu.ppy.sh";
                 markdownContainer.CurrentPath = "Interface/";
                 markdownContainer.Text = @"Line before image
 
@@ -139,6 +142,7 @@ Line after image";
         {
             AddStep("Add inline image", () =>
             {
+                markdownContainer.DocumentUrl = "https://osu.ppy.sh";
                 markdownContainer.Text = "![osu! mode icon](/wiki/shared/mode/osu.png) osu!";
             });
         }
@@ -147,6 +151,11 @@ Line after image";
         {
             public LinkInline Link;
 
+            public new string DocumentUrl
+            {
+                set => base.DocumentUrl = value;
+            }
+
             public override MarkdownTextFlowContainer CreateTextFlow() => new TestMarkdownTextFlowContainer
             {
                 UrlAdded = link => Link = link,
@@ -162,6 +171,8 @@ Line after image";
 
                     UrlAdded?.Invoke(linkInline);
                 }
+
+                protected override void AddImage(LinkInline linkInline) => AddDrawable(new WikiMarkdownImage(linkInline));
             }
         }
     }

From 9c31b8856d8d4dc2d91a344249f02590c7809e61 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Wed, 26 May 2021 15:10:09 +0700
Subject: [PATCH 3712/3722] change image url replace implementation

---
 .../Overlays/Wiki/Markdown/WikiMarkdownImage.cs | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownImage.cs b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownImage.cs
index 361aa2e95f..c2115efeb5 100644
--- a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownImage.cs
+++ b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownImage.cs
@@ -2,37 +2,28 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using Markdig.Syntax.Inlines;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Containers.Markdown;
 using osu.Framework.Graphics.Cursor;
-using osu.Game.Online.API;
 
 namespace osu.Game.Overlays.Wiki.Markdown
 {
     public class WikiMarkdownImage : MarkdownImage, IHasTooltip
     {
-        private readonly string url;
-
         public string TooltipText { get; }
 
         public WikiMarkdownImage(LinkInline linkInline)
             : base(linkInline.Url)
         {
-            url = linkInline.Url;
             TooltipText = linkInline.Title;
         }
 
-        [BackgroundDependencyLoader]
-        private void load(IAPIProvider api)
+        protected override ImageContainer CreateImageContainer(string url)
         {
-            // The idea is replace "{api.WebsiteRootUrl}/wiki/{path-to-image}" to "{api.WebsiteRootUrl}/wiki/images/{path-to-image}"
+            // The idea is replace "https://website.url/wiki/{path-to-image}" to "https://website.url/wiki/images/{path-to-image}"
             // "/wiki/images/*" is route to fetch wiki image from osu!web server (see: https://github.com/ppy/osu-web/blob/4205eb66a4da86bdee7835045e4bf28c35456e04/routes/web.php#L289)
-            // Currently all image in dev server (https://dev.ppy.sh/wiki/image/*) is 404
-            // So for now just replace "{api.WebsiteRootUrl}/wiki/*" to "https://osu.ppy.sh/wiki/images/*" for simplicity
-            var imageUrl = url.Replace($"{api.WebsiteRootUrl}/wiki", "https://osu.ppy.sh/wiki/images");
+            url = url.Replace("/wiki/", "/wiki/images/");
 
-            InternalChild = new DelayedLoadWrapper(CreateImageContainer(imageUrl));
+            return base.CreateImageContainer(url);
         }
     }
 }

From fbfbd992235b2a4ac2b7467521ae715f61795f4c Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Wed, 26 May 2021 19:20:39 +0700
Subject: [PATCH 3713/3722] change document url test to dev server

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

diff --git a/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs
index ebabfc9479..57bd8cd077 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs
@@ -106,7 +106,7 @@ needs_cleanup: true
         {
             AddStep("Add absolute image", () =>
             {
-                markdownContainer.DocumentUrl = "https://osu.ppy.sh";
+                markdownContainer.DocumentUrl = "https://dev.ppy.sh";
                 markdownContainer.Text = "![intro](/wiki/Interface/img/intro-screen.jpg)";
             });
         }
@@ -116,7 +116,7 @@ needs_cleanup: true
         {
             AddStep("Add relative image", () =>
             {
-                markdownContainer.DocumentUrl = "https://osu.ppy.sh";
+                markdownContainer.DocumentUrl = "https://dev.ppy.sh";
                 markdownContainer.CurrentPath = "Interface/";
                 markdownContainer.Text = "![intro](img/intro-screen.jpg)";
             });
@@ -127,7 +127,7 @@ needs_cleanup: true
         {
             AddStep("Add paragraph with block image", () =>
             {
-                markdownContainer.DocumentUrl = "https://osu.ppy.sh";
+                markdownContainer.DocumentUrl = "https://dev.ppy.sh";
                 markdownContainer.CurrentPath = "Interface/";
                 markdownContainer.Text = @"Line before image
 
@@ -142,7 +142,7 @@ Line after image";
         {
             AddStep("Add inline image", () =>
             {
-                markdownContainer.DocumentUrl = "https://osu.ppy.sh";
+                markdownContainer.DocumentUrl = "https://dev.ppy.sh";
                 markdownContainer.Text = "![osu! mode icon](/wiki/shared/mode/osu.png) osu!";
             });
         }

From 62fb09774a7588e9bb9babd29ded257c0325901d Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Wed, 26 May 2021 19:22:21 +0700
Subject: [PATCH 3714/3722] create WikiMarkdownImageBlock

---
 .../Wiki/Markdown/WikiMarkdownImageBlock.cs   | 49 +++++++++++++++++++
 .../Wiki/Markdown/WikiMarkdownParagraph.cs    | 40 ---------------
 2 files changed, 49 insertions(+), 40 deletions(-)
 create mode 100644 osu.Game/Overlays/Wiki/Markdown/WikiMarkdownImageBlock.cs
 delete mode 100644 osu.Game/Overlays/Wiki/Markdown/WikiMarkdownParagraph.cs

diff --git a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownImageBlock.cs b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownImageBlock.cs
new file mode 100644
index 0000000000..179762103a
--- /dev/null
+++ b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownImageBlock.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 Markdig.Syntax.Inlines;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Containers.Markdown;
+using osuTK;
+
+namespace osu.Game.Overlays.Wiki.Markdown
+{
+    public class WikiMarkdownImageBlock : FillFlowContainer
+    {
+        [Resolved]
+        private IMarkdownTextComponent parentTextComponent { get; set; }
+
+        private readonly LinkInline linkInline;
+
+        public WikiMarkdownImageBlock(LinkInline linkInline)
+        {
+            this.linkInline = linkInline;
+
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+            Direction = FillDirection.Vertical;
+            Spacing = new Vector2(0, 3);
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Children = new Drawable[]
+            {
+                new WikiMarkdownImage(linkInline)
+                {
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopCentre,
+                },
+                parentTextComponent.CreateSpriteText().With(t =>
+                {
+                    t.Text = linkInline.Title;
+                    t.Anchor = Anchor.TopCentre;
+                    t.Origin = Anchor.TopCentre;
+                }),
+            };
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownParagraph.cs b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownParagraph.cs
deleted file mode 100644
index 4a7ce24aba..0000000000
--- a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownParagraph.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.Linq;
-using Markdig.Syntax;
-using Markdig.Syntax.Inlines;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers.Markdown;
-using osuTK;
-
-namespace osu.Game.Overlays.Wiki.Markdown
-{
-    public class WikiMarkdownParagraph : MarkdownParagraph
-    {
-        private readonly ParagraphBlock paragraphBlock;
-
-        public WikiMarkdownParagraph(ParagraphBlock paragraphBlock)
-            : base(paragraphBlock)
-        {
-            this.paragraphBlock = paragraphBlock;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            MarkdownTextFlowContainer textFlow;
-            InternalChild = textFlow = CreateTextFlow();
-            textFlow.AddInlineText(paragraphBlock.Inline);
-
-            // Check if paragraph only contains an image.
-            if (paragraphBlock.Inline.Count() == 1 && paragraphBlock.Inline.FirstChild is LinkInline { IsImage: true } linkInline)
-            {
-                textFlow.TextAnchor = Anchor.TopCentre;
-                textFlow.Spacing = new Vector2(0, 5);
-                textFlow.AddText($"\n{linkInline.Title}");
-            }
-        }
-    }
-}

From 2344a1a411cf1778ffd21635e2167f13e0039f89 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Wed, 26 May 2021 19:22:33 +0700
Subject: [PATCH 3715/3722] use image block in markdown container

---
 .../Wiki/Markdown/WikiMarkdownContainer.cs        | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs
index fbfdc5feaf..4e671cca6d 100644
--- a/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs
+++ b/osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.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 Markdig.Extensions.Yaml;
 using Markdig.Syntax;
 using Markdig.Syntax.Inlines;
@@ -23,7 +24,17 @@ namespace osu.Game.Overlays.Wiki.Markdown
             {
                 case YamlFrontMatterBlock yamlFrontMatterBlock:
                     container.Add(new WikiNoticeContainer(yamlFrontMatterBlock));
-                    return;
+                    break;
+
+                case ParagraphBlock paragraphBlock:
+                    // Check if paragraph only contains an image
+                    if (paragraphBlock.Inline.Count() == 1 && paragraphBlock.Inline.FirstChild is LinkInline { IsImage: true } linkInline)
+                    {
+                        container.Add(new WikiMarkdownImageBlock(linkInline));
+                        return;
+                    }
+
+                    break;
             }
 
             base.AddMarkdownComponent(markdownObject, container, level);
@@ -31,8 +42,6 @@ namespace osu.Game.Overlays.Wiki.Markdown
 
         public override MarkdownTextFlowContainer CreateTextFlow() => new WikiMarkdownTextFlowContainer();
 
-        protected override MarkdownParagraph CreateParagraph(ParagraphBlock paragraphBlock, int level) => new WikiMarkdownParagraph(paragraphBlock);
-
         private class WikiMarkdownTextFlowContainer : OsuMarkdownTextFlowContainer
         {
             protected override void AddImage(LinkInline linkInline) => AddDrawable(new WikiMarkdownImage(linkInline));

From 1bde11a07e202e9c643d3602d66cd2948b83b807 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 26 May 2021 15:35:38 +0300
Subject: [PATCH 3716/3722] Refactor ArticleListing

---
 .../Overlays/News/Displays/ArticleListing.cs  | 58 ++++++++++++-------
 osu.Game/Overlays/NewsOverlay.cs              |  9 ++-
 2 files changed, 40 insertions(+), 27 deletions(-)

diff --git a/osu.Game/Overlays/News/Displays/ArticleListing.cs b/osu.Game/Overlays/News/Displays/ArticleListing.cs
index b554b462a9..4bbc80c5f3 100644
--- a/osu.Game/Overlays/News/Displays/ArticleListing.cs
+++ b/osu.Game/Overlays/News/Displays/ArticleListing.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.Collections.Specialized;
 using System.Linq;
 using System.Threading;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.API.Requests;
+using osu.Game.Online.API.Requests.Responses;
 using osuTK;
 
 namespace osu.Game.Overlays.News.Displays
@@ -20,20 +23,12 @@ namespace osu.Game.Overlays.News.Displays
     {
         public Action RequestMorePosts;
 
+        private readonly BindableList<APINewsPost> posts = new BindableList<APINewsPost>();
+        private bool showMoreButtonIsVisible;
+
         private FillFlowContainer content;
         private ShowMoreButton showMore;
 
-        private readonly GetNewsResponse initialResponse;
-
-        /// <summary>
-        /// Instantiate a listing for the specified year.
-        /// </summary>
-        /// <param name="initialResponse">Initial response to create articles from.</param>
-        public ArticleListing(GetNewsResponse initialResponse)
-        {
-            this.initialResponse = initialResponse;
-        }
-
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -45,7 +40,6 @@ namespace osu.Game.Overlays.News.Displays
                 Left = 30,
                 Right = 50
             };
-
             InternalChild = new FillFlowContainer
             {
                 RelativeSizeAxes = Axes.X,
@@ -61,8 +55,7 @@ namespace osu.Game.Overlays.News.Displays
                         RelativeSizeAxes = Axes.X,
                         AutoSizeAxes = Axes.Y,
                         Direction = FillDirection.Vertical,
-                        Spacing = new Vector2(0, 10),
-                        Children = initialResponse.NewsPosts.Select(p => new NewsCard(p)).ToList()
+                        Spacing = new Vector2(0, 10)
                     },
                     showMore = new ShowMoreButton
                     {
@@ -73,24 +66,45 @@ namespace osu.Game.Overlays.News.Displays
                             Top = 15
                         },
                         Action = RequestMorePosts,
-                        Alpha = initialResponse.Cursor != null ? 1 : 0
+                        Alpha = 0
                     }
                 }
             };
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            posts.BindCollectionChanged((sender, args) =>
+            {
+                switch (args.Action)
+                {
+                    case NotifyCollectionChangedAction.Add:
+                        addPosts(args.NewItems.Cast<APINewsPost>());
+                        break;
+
+                    default:
+                        throw new NotSupportedException(@"You can only add items to this list. Other actions are not supported.");
+                }
+            }, true);
+        }
+
+        public void AddPosts(IEnumerable<APINewsPost> posts, bool showMoreButtonIsVisible)
+        {
+            this.showMoreButtonIsVisible = showMoreButtonIsVisible;
+            this.posts.AddRange(posts);
+        }
+
         private CancellationTokenSource cancellationToken;
 
-        public void AddPosts(GetNewsResponse response)
+        private void addPosts(IEnumerable<APINewsPost> posts)
         {
-            cancellationToken?.Cancel();
-
-            LoadComponentsAsync(response.NewsPosts.Select(p => new NewsCard(p)).ToList(), loaded =>
+            LoadComponentsAsync(posts.Select(p => new NewsCard(p)).ToList(), loaded =>
             {
                 content.AddRange(loaded);
-
                 showMore.IsLoading = false;
-                showMore.Alpha = response.Cursor != null ? 1 : 0;
+                showMore.Alpha = showMoreButtonIsVisible ? 1 : 0;
             }, (cancellationToken = new CancellationTokenSource()).Token);
         }
 
diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index 8d0d242e39..34bacd5540 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -152,10 +152,9 @@ namespace osu.Game.Overlays
                 lastCursor = response.Cursor;
                 sidebar.Metadata.Value = response.SidebarMetadata;
 
-                LoadDisplay(new ArticleListing(response)
-                {
-                    RequestMorePosts = getMorePosts
-                });
+                var listing = new ArticleListing { RequestMorePosts = getMorePosts };
+                listing.AddPosts(response.NewsPosts, response.Cursor != null);
+                LoadDisplay(listing);
             });
 
             API.PerformAsync(request);
@@ -170,7 +169,7 @@ namespace osu.Game.Overlays
             {
                 lastCursor = response.Cursor;
                 if (content.Child is ArticleListing listing)
-                    listing.AddPosts(response);
+                    listing.AddPosts(response.NewsPosts, response.Cursor != null);
             });
 
             API.PerformAsync(request);

From 71de541245060ea4b48d38820c233e30d5ee29bb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 May 2021 22:35:11 +0900
Subject: [PATCH 3717/3722] Minor spacing / reformatting

---
 osu.Game/Overlays/News/Displays/ArticleListing.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/News/Displays/ArticleListing.cs b/osu.Game/Overlays/News/Displays/ArticleListing.cs
index 4bbc80c5f3..3524b8652c 100644
--- a/osu.Game/Overlays/News/Displays/ArticleListing.cs
+++ b/osu.Game/Overlays/News/Displays/ArticleListing.cs
@@ -34,12 +34,14 @@ namespace osu.Game.Overlays.News.Displays
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
+
             Padding = new MarginPadding
             {
                 Vertical = 20,
                 Left = 30,
                 Right = 50
             };
+
             InternalChild = new FillFlowContainer
             {
                 RelativeSizeAxes = Axes.X,
@@ -61,10 +63,7 @@ namespace osu.Game.Overlays.News.Displays
                     {
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.TopCentre,
-                        Margin = new MarginPadding
-                        {
-                            Top = 15
-                        },
+                        Margin = new MarginPadding { Top = 15 },
                         Action = RequestMorePosts,
                         Alpha = 0
                     }

From 9947867e8408e8f2d0d4296061c9f67ea3bf1ffe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 May 2021 22:46:43 +0900
Subject: [PATCH 3718/3722] Remove unnecessary bindable flow

---
 .../Overlays/News/Displays/ArticleListing.cs  | 42 +++----------------
 1 file changed, 6 insertions(+), 36 deletions(-)

diff --git a/osu.Game/Overlays/News/Displays/ArticleListing.cs b/osu.Game/Overlays/News/Displays/ArticleListing.cs
index 3524b8652c..48a3f5498a 100644
--- a/osu.Game/Overlays/News/Displays/ArticleListing.cs
+++ b/osu.Game/Overlays/News/Displays/ArticleListing.cs
@@ -3,11 +3,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
 using System.Threading;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
@@ -23,9 +21,6 @@ namespace osu.Game.Overlays.News.Displays
     {
         public Action RequestMorePosts;
 
-        private readonly BindableList<APINewsPost> posts = new BindableList<APINewsPost>();
-        private bool showMoreButtonIsVisible;
-
         private FillFlowContainer content;
         private ShowMoreButton showMore;
 
@@ -71,41 +66,16 @@ namespace osu.Game.Overlays.News.Displays
             };
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            posts.BindCollectionChanged((sender, args) =>
-            {
-                switch (args.Action)
-                {
-                    case NotifyCollectionChangedAction.Add:
-                        addPosts(args.NewItems.Cast<APINewsPost>());
-                        break;
-
-                    default:
-                        throw new NotSupportedException(@"You can only add items to this list. Other actions are not supported.");
-                }
-            }, true);
-        }
-
-        public void AddPosts(IEnumerable<APINewsPost> posts, bool showMoreButtonIsVisible)
-        {
-            this.showMoreButtonIsVisible = showMoreButtonIsVisible;
-            this.posts.AddRange(posts);
-        }
-
-        private CancellationTokenSource cancellationToken;
-
-        private void addPosts(IEnumerable<APINewsPost> posts)
-        {
+        public void AddPosts(IEnumerable<APINewsPost> posts, bool morePostsAvailable) => Schedule(() =>
             LoadComponentsAsync(posts.Select(p => new NewsCard(p)).ToList(), loaded =>
             {
                 content.AddRange(loaded);
                 showMore.IsLoading = false;
-                showMore.Alpha = showMoreButtonIsVisible ? 1 : 0;
-            }, (cancellationToken = new CancellationTokenSource()).Token);
-        }
+                showMore.Alpha = morePostsAvailable ? 1 : 0;
+            }, (cancellationToken = new CancellationTokenSource()).Token)
+        );
+
+        private CancellationTokenSource cancellationToken;
 
         protected override void Dispose(bool isDisposing)
         {

From 735e7b9c741e2bc0d4d29df6e880daf5ff44a665 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 May 2021 22:49:39 +0900
Subject: [PATCH 3719/3722] Pass fetch more action in via ctor to avoid
 potential nullref

---
 osu.Game/Overlays/News/Displays/ArticleListing.cs | 13 +++++++++----
 osu.Game/Overlays/NewsOverlay.cs                  |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/News/Displays/ArticleListing.cs b/osu.Game/Overlays/News/Displays/ArticleListing.cs
index 48a3f5498a..dc3b17b323 100644
--- a/osu.Game/Overlays/News/Displays/ArticleListing.cs
+++ b/osu.Game/Overlays/News/Displays/ArticleListing.cs
@@ -19,11 +19,18 @@ namespace osu.Game.Overlays.News.Displays
     /// </summary>
     public class ArticleListing : CompositeDrawable
     {
-        public Action RequestMorePosts;
+        private readonly Action fetchMorePosts;
 
         private FillFlowContainer content;
         private ShowMoreButton showMore;
 
+        private CancellationTokenSource cancellationToken;
+
+        public ArticleListing(Action fetchMorePosts)
+        {
+            this.fetchMorePosts = fetchMorePosts;
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -59,7 +66,7 @@ namespace osu.Game.Overlays.News.Displays
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.TopCentre,
                         Margin = new MarginPadding { Top = 15 },
-                        Action = RequestMorePosts,
+                        Action = fetchMorePosts,
                         Alpha = 0
                     }
                 }
@@ -75,8 +82,6 @@ namespace osu.Game.Overlays.News.Displays
             }, (cancellationToken = new CancellationTokenSource()).Token)
         );
 
-        private CancellationTokenSource cancellationToken;
-
         protected override void Dispose(bool isDisposing)
         {
             cancellationToken?.Cancel();
diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index 34bacd5540..12e3f81ca1 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -152,7 +152,7 @@ namespace osu.Game.Overlays
                 lastCursor = response.Cursor;
                 sidebar.Metadata.Value = response.SidebarMetadata;
 
-                var listing = new ArticleListing { RequestMorePosts = getMorePosts };
+                var listing = new ArticleListing(getMorePosts);
                 listing.AddPosts(response.NewsPosts, response.Cursor != null);
                 LoadDisplay(listing);
             });

From c0a8382175a55e0323ab11ed456f3584489ea356 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 27 May 2021 00:12:22 +0900
Subject: [PATCH 3720/3722] Remove local API construction

---
 .../Visual/Online/TestSceneWikiMarkdownContainer.cs   | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs
index 57bd8cd077..c423d46aa3 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs
@@ -23,9 +23,6 @@ namespace osu.Game.Tests.Visual.Online
         [Cached]
         private readonly OverlayColourProvider overlayColour = new OverlayColourProvider(OverlayColourScheme.Orange);
 
-        [Cached]
-        private readonly IAPIProvider api = new DummyAPIAccess();
-
         [SetUp]
         public void Setup() => Schedule(() =>
         {
@@ -55,16 +52,16 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("set current path", () => markdownContainer.CurrentPath = "Article_styling_criteria/");
 
             AddStep("set '/wiki/Main_Page''", () => markdownContainer.Text = "[wiki main page](/wiki/Main_Page)");
-            AddAssert("check url", () => markdownContainer.Link.Url == $"{api.WebsiteRootUrl}/wiki/Main_Page");
+            AddAssert("check url", () => markdownContainer.Link.Url == $"{API.WebsiteRootUrl}/wiki/Main_Page");
 
             AddStep("set '../FAQ''", () => markdownContainer.Text = "[FAQ](../FAQ)");
-            AddAssert("check url", () => markdownContainer.Link.Url == $"{api.WebsiteRootUrl}/wiki/FAQ");
+            AddAssert("check url", () => markdownContainer.Link.Url == $"{API.WebsiteRootUrl}/wiki/FAQ");
 
             AddStep("set './Writing''", () => markdownContainer.Text = "[wiki writing guidline](./Writing)");
-            AddAssert("check url", () => markdownContainer.Link.Url == $"{api.WebsiteRootUrl}/wiki/Article_styling_criteria/Writing");
+            AddAssert("check url", () => markdownContainer.Link.Url == $"{API.WebsiteRootUrl}/wiki/Article_styling_criteria/Writing");
 
             AddStep("set 'Formatting''", () => markdownContainer.Text = "[wiki formatting guidline](Formatting)");
-            AddAssert("check url", () => markdownContainer.Link.Url == $"{api.WebsiteRootUrl}/wiki/Article_styling_criteria/Formatting");
+            AddAssert("check url", () => markdownContainer.Link.Url == $"{API.WebsiteRootUrl}/wiki/Article_styling_criteria/Formatting");
         }
 
         [Test]

From 74fc0a17d5f668c3e178c428c2e6abb30e6871db Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 27 May 2021 00:55:05 +0900
Subject: [PATCH 3721/3722] Remove unused using statement

---
 osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs
index c423d46aa3..1e19af933a 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneWikiMarkdownContainer.cs
@@ -10,7 +10,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Containers.Markdown;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics.Containers.Markdown;
-using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Wiki.Markdown;
 

From 122bb05aa81d78af1671cf8e00f21e06134a5798 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 27 May 2021 15:20:35 +0900
Subject: [PATCH 3722/3722] Add a mention that `OnApply/OnFree` is performed
 after `ApplyDefaults`

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

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index cc663c37af..cca55819c5 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -311,6 +311,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         /// <summary>
         /// Invoked for this <see cref="DrawableHitObject"/> to take on any values from a newly-applied <see cref="HitObject"/>.
+        /// This is also fired after any changes which occurred via an <see cref="osu.Game.Rulesets.Objects.HitObject.ApplyDefaults"/> call.
         /// </summary>
         protected virtual void OnApply()
         {
@@ -318,6 +319,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         /// <summary>
         /// Invoked for this <see cref="DrawableHitObject"/> to revert any values previously taken on from the currently-applied <see cref="HitObject"/>.
+        /// This is also fired after any changes which occurred via an <see cref="osu.Game.Rulesets.Objects.HitObject.ApplyDefaults"/> call.
         /// </summary>
         protected virtual void OnFree()
         {